53 files changed, 398 insertions, 251 deletions
diff --git a/games-misc/bsd-games/bsd-games-3.1-r2.ebuild b/games-misc/bsd-games/bsd-games-3.1-r2.ebuild
index 120178db7fa..748268ebe63 100644
--- a/games-misc/bsd-games/bsd-games-3.1-r2.ebuild
+++ b/games-misc/bsd-games/bsd-games-3.1-r2.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
@@ -14,7 +14,7 @@ LICENSE="BSD"
 # Subslot indicates the fork / new version
 # 3 doesn't include the same games as the classic variant, etc
 SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~x86"
 
 # 'check' target doesn't exist, nor do any actual tests
 # bug #779649
diff --git a/games-misc/cowsay/cowsay-3.7.0.ebuild b/games-misc/cowsay/cowsay-3.7.0.ebuild
index 46747419c8a..2c836214fe5 100644
--- a/games-misc/cowsay/cowsay-3.7.0.ebuild
+++ b/games-misc/cowsay/cowsay-3.7.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=8
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/cowsay-org/cowsay/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc64 ~x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~mips ppc64 ~riscv x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="dev-lang/perl"
 BDEPEND="${RDEPEND}"
diff --git a/games-misc/doge/doge-3.6.0.ebuild b/games-misc/doge/doge-3.6.0-r1.ebuild
index 15f74121337..29007318d9f 100644
--- a/games-misc/doge/doge-3.6.0.ebuild
+++ b/games-misc/doge/doge-3.6.0-r1.ebuild
@@ -1,15 +1,15 @@
-# 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,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+EAPI=8
 
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="wow very terminal doge"
-HOMEPAGE="https://github.com/thiderman/doge https://pypi.org/project/doge/"
+HOMEPAGE="https://pypi.org/project/doge/"
 SRC_URI="https://github.com/thiderman/doge/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/games-misc/fortune-mod-all/fortune-mod-all-5.ebuild b/games-misc/fortune-mod-all/fortune-mod-all-5.ebuild
new file mode 100644
index 00000000000..ea902a929d9
--- /dev/null
+++ b/games-misc/fortune-mod-all/fortune-mod-all-5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Meta package for all fortune-mod packages"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86"
+IUSE="l10n_cs l10n_de l10n_it"
+
+RDEPEND=">=games-misc/fortune-mod-3.6.1-r1
+	games-misc/fortune-mod-bofh-excuses
+	games-misc/fortune-mod-chucknorris
+	games-misc/fortune-mod-flashrider
+	games-misc/fortune-mod-kernelcookies
+	games-misc/fortune-mod-mormon
+	games-misc/fortune-mod-osfortune
+	games-misc/fortune-mod-scriptures
+	games-misc/fortune-mod-taow
+	games-misc/fortune-mod-zx-error
+	l10n_cs? ( games-misc/fortune-mod-cs )
+	l10n_de? (
+		games-misc/fortune-mod-at-linux
+		games-misc/fortune-mod-fvl
+		games-misc/fortune-mod-norbert-tretkowski
+		games-misc/fortune-mod-thomas-ogrisegg
+		games-misc/fortune-mod-rss
+	)
+	l10n_it? ( games-misc/fortune-mod-it )"
diff --git a/games-misc/fortune-mod-all/metadata.xml b/games-misc/fortune-mod-all/metadata.xml
index 1c3ba213c49..5539242c2fb 100644
--- a/games-misc/fortune-mod-all/metadata.xml
+++ b/games-misc/fortune-mod-all/metadata.xml
@@ -1,8 +1,9 @@
 <?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>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-at-linux/metadata.xml b/games-misc/fortune-mod-at-linux/metadata.xml
index a347f48849b..89592474095 100644
--- a/games-misc/fortune-mod-at-linux/metadata.xml
+++ b/games-misc/fortune-mod-at-linux/metadata.xml
@@ -5,6 +5,7 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="sourceforge">fortune-mod-fvl</remote-id>
 	</upstream>
diff --git a/games-misc/fortune-mod-bofh-excuses/metadata.xml b/games-misc/fortune-mod-bofh-excuses/metadata.xml
index 1c3ba213c49..5539242c2fb 100644
--- a/games-misc/fortune-mod-bofh-excuses/metadata.xml
+++ b/games-misc/fortune-mod-bofh-excuses/metadata.xml
@@ -1,8 +1,9 @@
 <?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>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-chucknorris/metadata.xml b/games-misc/fortune-mod-chucknorris/metadata.xml
index 1c3ba213c49..5539242c2fb 100644
--- a/games-misc/fortune-mod-chucknorris/metadata.xml
+++ b/games-misc/fortune-mod-chucknorris/metadata.xml
@@ -1,8 +1,9 @@
 <?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>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-cs/metadata.xml b/games-misc/fortune-mod-cs/metadata.xml
index 1c3ba213c49..5539242c2fb 100644
--- a/games-misc/fortune-mod-cs/metadata.xml
+++ b/games-misc/fortune-mod-cs/metadata.xml
@@ -1,8 +1,9 @@
 <?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>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-flashrider/fortune-mod-flashrider-1.10-r1.ebuild b/games-misc/fortune-mod-flashrider/fortune-mod-flashrider-1.10-r1.ebuild
index 7aee3a13c70..f688c99760a 100644
--- a/games-misc/fortune-mod-flashrider/fortune-mod-flashrider-1.10-r1.ebuild
+++ b/games-misc/fortune-mod-flashrider/fortune-mod-flashrider-1.10-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="games-misc/fortune-mod"
 
diff --git a/games-misc/fortune-mod-flashrider/metadata.xml b/games-misc/fortune-mod-flashrider/metadata.xml
index 9de68a7b798..5539242c2fb 100644
--- a/games-misc/fortune-mod-flashrider/metadata.xml
+++ b/games-misc/fortune-mod-flashrider/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-fvl/metadata.xml b/games-misc/fortune-mod-fvl/metadata.xml
index a347f48849b..89592474095 100644
--- a/games-misc/fortune-mod-fvl/metadata.xml
+++ b/games-misc/fortune-mod-fvl/metadata.xml
@@ -5,6 +5,7 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="sourceforge">fortune-mod-fvl</remote-id>
 	</upstream>
diff --git a/games-misc/fortune-mod-it/metadata.xml b/games-misc/fortune-mod-it/metadata.xml
index 1c3ba213c49..5539242c2fb 100644
--- a/games-misc/fortune-mod-it/metadata.xml
+++ b/games-misc/fortune-mod-it/metadata.xml
@@ -1,8 +1,9 @@
 <?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>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-kernelcookies/metadata.xml b/games-misc/fortune-mod-kernelcookies/metadata.xml
index 1c3ba213c49..5539242c2fb 100644
--- a/games-misc/fortune-mod-kernelcookies/metadata.xml
+++ b/games-misc/fortune-mod-kernelcookies/metadata.xml
@@ -1,8 +1,9 @@
 <?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>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild b/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild
index 305f5a69627..a70de476d45 100644
--- a/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild
+++ b/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mormon/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
 	games-misc/fortune-mod
diff --git a/games-misc/fortune-mod-mormon/metadata.xml b/games-misc/fortune-mod-mormon/metadata.xml
index 729236cbb37..6356e285931 100644
--- a/games-misc/fortune-mod-mormon/metadata.xml
+++ b/games-misc/fortune-mod-mormon/metadata.xml
@@ -9,6 +9,7 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="sourceforge">mormon</remote-id>
 	</upstream>
diff --git a/games-misc/fortune-mod-norbert-tretkowski/metadata.xml b/games-misc/fortune-mod-norbert-tretkowski/metadata.xml
index a347f48849b..89592474095 100644
--- a/games-misc/fortune-mod-norbert-tretkowski/metadata.xml
+++ b/games-misc/fortune-mod-norbert-tretkowski/metadata.xml
@@ -5,6 +5,7 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="sourceforge">fortune-mod-fvl</remote-id>
 	</upstream>
diff --git a/games-misc/fortune-mod-osfortune/metadata.xml b/games-misc/fortune-mod-osfortune/metadata.xml
index 1c3ba213c49..5539242c2fb 100644
--- a/games-misc/fortune-mod-osfortune/metadata.xml
+++ b/games-misc/fortune-mod-osfortune/metadata.xml
@@ -1,8 +1,9 @@
 <?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>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-rss/metadata.xml b/games-misc/fortune-mod-rss/metadata.xml
index a347f48849b..89592474095 100644
--- a/games-misc/fortune-mod-rss/metadata.xml
+++ b/games-misc/fortune-mod-rss/metadata.xml
@@ -5,6 +5,7 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="sourceforge">fortune-mod-fvl</remote-id>
 	</upstream>
diff --git a/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild b/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild
index baf0811bae4..856ad71c9b6 100644
--- a/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild
+++ b/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mormon/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="games-misc/fortune-mod"
 
diff --git a/games-misc/fortune-mod-scriptures/metadata.xml b/games-misc/fortune-mod-scriptures/metadata.xml
index 729236cbb37..6356e285931 100644
--- a/games-misc/fortune-mod-scriptures/metadata.xml
+++ b/games-misc/fortune-mod-scriptures/metadata.xml
@@ -9,6 +9,7 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="sourceforge">mormon</remote-id>
 	</upstream>
diff --git a/games-misc/fortune-mod-tao/fortune-mod-tao-1.ebuild b/games-misc/fortune-mod-tao/fortune-mod-tao-1-r1.ebuild
index 0cc42e1fd9b..9c6b18260bc 100644
--- a/games-misc/fortune-mod-tao/fortune-mod-tao-1.ebuild
+++ b/games-misc/fortune-mod-tao/fortune-mod-tao-1-r1.ebuild
@@ -13,7 +13,8 @@ LICENSE="GPL-1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
-RDEPEND="games-misc/fortune-mod"
+RDEPEND="games-misc/fortune-mod
+	!>=games-misc/fortune-mod-3.6.1"
 
 src_install() {
 	insinto /usr/share/fortune
diff --git a/games-misc/fortune-mod-tao/metadata.xml b/games-misc/fortune-mod-tao/metadata.xml
index 1c3ba213c49..5539242c2fb 100644
--- a/games-misc/fortune-mod-tao/metadata.xml
+++ b/games-misc/fortune-mod-tao/metadata.xml
@@ -1,8 +1,9 @@
 <?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>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-taow/fortune-mod-taow-1.0.ebuild b/games-misc/fortune-mod-taow/fortune-mod-taow-1.0.ebuild
index 014f9b151d5..0fe19e2b79d 100644
--- a/games-misc/fortune-mod-taow/fortune-mod-taow-1.0.ebuild
+++ b/games-misc/fortune-mod-taow/fortune-mod-taow-1.0.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="games-misc/fortune-mod"
 
diff --git a/games-misc/fortune-mod-taow/metadata.xml b/games-misc/fortune-mod-taow/metadata.xml
index 1c3ba213c49..5539242c2fb 100644
--- a/games-misc/fortune-mod-taow/metadata.xml
+++ b/games-misc/fortune-mod-taow/metadata.xml
@@ -1,8 +1,9 @@
 <?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>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-thomas-ogrisegg/metadata.xml b/games-misc/fortune-mod-thomas-ogrisegg/metadata.xml
index a347f48849b..89592474095 100644
--- a/games-misc/fortune-mod-thomas-ogrisegg/metadata.xml
+++ b/games-misc/fortune-mod-thomas-ogrisegg/metadata.xml
@@ -5,6 +5,7 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="sourceforge">fortune-mod-fvl</remote-id>
 	</upstream>
diff --git a/games-misc/fortune-mod-zx-error/metadata.xml b/games-misc/fortune-mod-zx-error/metadata.xml
index 1c3ba213c49..5539242c2fb 100644
--- a/games-misc/fortune-mod-zx-error/metadata.xml
+++ b/games-misc/fortune-mod-zx-error/metadata.xml
@@ -1,8 +1,9 @@
 <?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>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod/Manifest b/games-misc/fortune-mod/Manifest
index a1cd8b646e0..45fff48026f 100644
--- a/games-misc/fortune-mod/Manifest
+++ b/games-misc/fortune-mod/Manifest
@@ -1 +1,5 @@
 DIST fortune-mod-1.99.1.tar.gz 1812089 BLAKE2B a5df4a5a518021073ee95ac7e110ac75b961feb1b4dfcc3a40165ea98859f93e6d002ee4906d3f03a40762503ae475b61399a2bd4144609fa4d9815a1a85fa84 SHA512 4c06ea37532dd59f0251d7c49538bee703852c60a3247aba7c516f4f0d4b8ab15b9d7495d004a6423acd74c4dd7532e3dbe1679d6904ab373b617a3386205cde
+DIST fortune-mod-3.10.0.tar.xz 1429132 BLAKE2B e2dcfccee0c8d897971e742e4a5e345f9e825ba73479e2dc056891e16f005dc1d1f843573565741d1b35e4e1d1020cd382db9706f34b0caa4000d265a2c4dd30 SHA512 cb4d171405324a8ebac55ca5c7c8d8f5c06b594c2ded1b1c97fb599a4eaf638317f613fbeee4b3ca9ba7060ba4eeff7e678acddac12d49555a33d33017a90f4d
+DIST fortune-mod-3.12.0.tar.xz 1427848 BLAKE2B 3a3b0c28a0f7c297294b1788c57e01eb78d5083578aba877b896f41b854d2c34f65c9b46a1efe8bfef669f7ced6bb5e8ba667e3df1391a3cd3e5fed22e9058b6 SHA512 3a25d276219bb4f8a3015cd24b43462844d3be481815b587a365acd31dde31afee110dc5a658dd4df43bc6ba7d19e85afeffb215bd8c8f34640d658edb335089
+DIST fortune-mod-3.14.0.tar.xz 1428984 BLAKE2B 9b7df93cd7ced677a391ed30a84503cbd36689de406bbeb346bc9e465420908c9115b0d58e8e0b245f554557f032a014cc52418da4a69281e3844412c8e9641d SHA512 289f11923bd91ac0c46d8879c57c1f4da20ef2ef165be2eea9635b3aca5fc18bfc2438e85bfbc2a872671f41658b68bb3f7dd74bef7e4268889371ff702d7cae
+DIST fortune-mod-3.6.1.tar.xz 1419132 BLAKE2B 0ff684ee8aaf5eaabd75f187a3bff533ab4ee6e66c47c57fc700d2671006c8dff42f732fde78b40516f8ee907a52fc1965fb0ff257b12563d645f97c5ebc0031 SHA512 3f35bf35d62c46dfeaca450a127a7444bb870f6345c92afe626f81548ac375d21306c00a56d31982b8e25129acd6f829402d5afaec676e1200ad5bf586f7a8f1
diff --git a/games-misc/fortune-mod/files/fortune-mod-3.14.0-valgrind-tests.patch b/games-misc/fortune-mod/files/fortune-mod-3.14.0-valgrind-tests.patch
new file mode 100644
index 00000000000..166f8dfcd5b
--- /dev/null
+++ b/games-misc/fortune-mod/files/fortune-mod-3.14.0-valgrind-tests.patch
@@ -0,0 +1,24 @@
+https://git.exherbo.org/arbor.git/plain/packages/games-misc/fortune-mod/files/fortune-mod-Don-t-run-tests-involving-valgrind.patch?id=4c04c9e10bfee01e4c7cc3278c452efb6863d549
+
+Upstream: no
+Reason: Test wants to install stuff, doesn't work and saves us the dep
+
+From eabc85921ccb8ffda14d34d26f6486700bf63b8f Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Wed, 15 Dec 2021 17:11:31 +0100
+Subject: [PATCH] Don't run tests involving valgrind
+
+--- a/run-tests.pl
++++ b/run-tests.pl
+@@ -35,11 +35,6 @@ sub do_system
+     }
+ }
+ 
+-do_system(
+-    {
+-        cmd => [ $^X, "$src_dir/tests/scripts/split-valgrind.pl", ]
+-    }
+-);
+ do_system(
+     {
+         cmd => [
diff --git a/games-misc/fortune-mod/fortune-mod-1.99.1-r3.ebuild b/games-misc/fortune-mod/fortune-mod-1.99.1-r3.ebuild
index 2c5dd2971c7..d8e680cebc9 100644
--- a/games-misc/fortune-mod/fortune-mod-1.99.1-r3.ebuild
+++ b/games-misc/fortune-mod/fortune-mod-1.99.1-r3.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,8 +11,8 @@ SRC_URI="http://www.redellipse.net/code/downloads/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~m68k ~mips ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="offensive elibc_glibc"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="offensive"
 
 DEPEND="app-text/recode:0="
 RDEPEND="${DEPEND}"
@@ -34,7 +34,6 @@ src_prepare() {
 		Makefile || die "sed Makefile failed"
 
 	if ! use elibc_glibc ; then
-		[[ ${CHOST} == *-*bsd* ]] && local reglibs="-lcompat"
 		[[ ${CHOST} == *-darwin* ]] && local reglibs="-lc"
 		has_version "app-text/recode[nls]" && reglibs="${reglibs} -lintl"
 		sed -i \
diff --git a/games-misc/fortune-mod/fortune-mod-3.10.0.ebuild b/games-misc/fortune-mod/fortune-mod-3.10.0.ebuild
new file mode 100644
index 00000000000..fd1f66e99c5
--- /dev/null
+++ b/games-misc/fortune-mod/fortune-mod-3.10.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="The notorious fortune program"
+HOMEPAGE="https://www.shlomifish.org/open-source/projects/fortune-mod/ http://www.redellipse.net/code/fortune"
+SRC_URI="https://github.com/shlomif/fortune-mod/releases/download/${P}/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86"
+IUSE="offensive"
+
+DEPEND="app-text/recode:=
+	!games-misc/fortune-mod-tao"
+RDEPEND="${DEPEND}"
+BDEPEND="app-text/App-XML-DocBook-Builder"
+
+# TODO: Get tests running?
+
+src_configure() {
+	local mycmakeargs=(
+		-DNO_OFFENSIVE=$(usex !offensive)
+		-DLOCALDIR="/usr/share/fortune"
+		-DCOOKIEDIR="/usr/share/fortune"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	mkdir -p "${ED}"/usr/bin || die
+	mv "${ED}"/usr/games/fortune "${ED}"/usr/bin/fortune || die
+	rm -rf "${ED}"/usr/games || die
+
+	dodoc ChangeLog INDEX Notes Offensive README TODO cookie-files
+}
diff --git a/games-misc/fortune-mod/fortune-mod-3.12.0.ebuild b/games-misc/fortune-mod/fortune-mod-3.12.0.ebuild
new file mode 100644
index 00000000000..203ee916b25
--- /dev/null
+++ b/games-misc/fortune-mod/fortune-mod-3.12.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="The notorious fortune program"
+HOMEPAGE="https://www.shlomifish.org/open-source/projects/fortune-mod/ http://www.redellipse.net/code/fortune"
+SRC_URI="https://github.com/shlomif/fortune-mod/releases/download/${P}/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc64 ~riscv ~sparc x86"
+IUSE="offensive"
+
+DEPEND="app-text/recode:=
+	!games-misc/fortune-mod-tao"
+RDEPEND="${DEPEND}"
+BDEPEND="app-text/App-XML-DocBook-Builder"
+
+# TODO: Get tests running?
+
+src_configure() {
+	local mycmakeargs=(
+		-DNO_OFFENSIVE=$(usex !offensive)
+		-DLOCALDIR="/usr/share/fortune"
+		-DCOOKIEDIR="/usr/share/fortune"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	mkdir -p "${ED}"/usr/bin || die
+	mv "${ED}"/usr/games/fortune "${ED}"/usr/bin/fortune || die
+	rm -rf "${ED}"/usr/games || die
+
+	dodoc ChangeLog INDEX Notes Offensive README TODO cookie-files
+}
diff --git a/games-misc/fortune-mod/fortune-mod-3.14.0.ebuild b/games-misc/fortune-mod/fortune-mod-3.14.0.ebuild
new file mode 100644
index 00000000000..121927e8d61
--- /dev/null
+++ b/games-misc/fortune-mod/fortune-mod-3.14.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="The notorious fortune program"
+HOMEPAGE="https://www.shlomifish.org/open-source/projects/fortune-mod/ http://www.redellipse.net/code/fortune"
+SRC_URI="https://www.shlomifish.org/open-source/projects/${PN}/arcs/${P}.tar.xz
+	https://github.com/shlomif/fortune-mod/releases/download/${P}/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~sparc ~x86"
+IUSE="offensive test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-text/recode:=
+	!games-misc/fortune-mod-tao"
+DEPEND="${DEPEND}"
+BDEPEND="app-text/App-XML-DocBook-Builder
+	test? (
+		dev-perl/File-Find-Object
+		dev-perl/IO-All
+		dev-perl/Test-Differences
+		dev-perl/Test-Trap
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.14.0-valgrind-tests.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DNO_OFFENSIVE=$(usex !offensive)
+		-DLOCALDIR="/usr/share/fortune"
+		-DCOOKIEDIR="/usr/share/fortune"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_src_compile check
+}
+
+src_install() {
+	cmake_src_install
+
+	mkdir -p "${ED}"/usr/bin || die
+	mv "${ED}"/usr/games/fortune "${ED}"/usr/bin/fortune || die
+	rm -rf "${ED}"/usr/games || die
+
+	dodoc ChangeLog INDEX Notes Offensive README TODO cookie-files
+}
diff --git a/games-misc/fortune-mod/fortune-mod-3.6.1-r1.ebuild b/games-misc/fortune-mod/fortune-mod-3.6.1-r1.ebuild
new file mode 100644
index 00000000000..070bc906922
--- /dev/null
+++ b/games-misc/fortune-mod/fortune-mod-3.6.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="The notorious fortune program"
+HOMEPAGE="https://www.shlomifish.org/open-source/projects/fortune-mod/ http://www.redellipse.net/code/fortune"
+SRC_URI="https://github.com/shlomif/fortune-mod/releases/download/${P}/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86"
+IUSE="offensive"
+
+DEPEND="app-text/recode:=
+	!games-misc/fortune-mod-tao"
+RDEPEND="${DEPEND}"
+BDEPEND="app-text/App-XML-DocBook-Builder"
+
+src_configure() {
+	local mycmakeargs=(
+		-DNO_OFFENSIVE=$(usex !offensive)
+		-DLOCALDIR="/usr/share/fortune"
+		-DCOOKIEDIR="/usr/share/fortune"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	mkdir -p "${ED}"/usr/bin || die
+	mv "${ED}"/usr/games/fortune "${ED}"/usr/bin/fortune || die
+	rm -rf "${ED}"/usr/games || die
+
+	dodoc ChangeLog INDEX Notes Offensive README TODO cookie-files
+}
diff --git a/games-misc/funny-manpages/Manifest b/games-misc/funny-manpages/Manifest
index e18a3bd40f8..1e98ae12de5 100644
--- a/games-misc/funny-manpages/Manifest
+++ b/games-misc/funny-manpages/Manifest
@@ -1,3 +1 @@
-DIST funny-manpages_1.3-5.diff.gz 2639 BLAKE2B 2234a963be3292e33fadeb12213b11a6a9b81157f60c505df3e9d097cc99cb90a5b180bc1b64636d423a04d44a67fdd2ea8478ac83ce984f6a799896e2251036 SHA512 69110989da9071321a8d8e9ea4f09bd7635704caeaccbdbf7fb2fb1abd540632f19d63d15de3232fabbc35e76dfe2eefb64ce84b6f4606d8dbe581e15f83d24c
-DIST funny-manpages_1.3.orig.tar.gz 22691 BLAKE2B 2b54879992a3c9254e39b175adb060cbcf0ad65597454659fe66bb694ba5be70e97a3e7356ec79d6cd42cfc64f1b5adffd8328edc200a79987687a1227328bc8 SHA512 83c753540d9a9829017246f4a9de22ba09965fa5b8af8276f55ef141129876ca3e641b367ebc31ca99301f37a56132c07eee1ebc9616c954a2e84387fe62383d
 DIST funny-manpages_2.3.orig.tar.gz 23949 BLAKE2B 27f3dc4f548b6012c6830d303980c6871c0079cd123b706bdda75cdc49c90e66171a096b24ef3ba448f3d8e0c6a48f316b8c2783cfa6cc0087ef755311bb5ac3 SHA512 7920e9a62972f8ea0649b50d0b108936a6e0a5d5b68baccadded4999d0219af3f4685349dd881aded9e762e0d1f00575f382d155db0969f7e51a4a1963f0519e
diff --git a/games-misc/funny-manpages/funny-manpages-1.3_rc5-r1.ebuild b/games-misc/funny-manpages/funny-manpages-1.3_rc5-r1.ebuild
deleted file mode 100644
index b215501cbb2..00000000000
--- a/games-misc/funny-manpages/funny-manpages-1.3_rc5-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_R=${PV:0-1}
-MY_P=${PN}_${PV/_rc?/}
-DESCRIPTION="Funny manpages collected from various sources"
-HOMEPAGE="https://www.debian.org/"
-SRC_URI="mirror://debian/pool/main/f/funny-manpages/${MY_P}.orig.tar.gz
-	mirror://debian/pool/main/f/funny-manpages/${MY_P}-${MY_R}.diff.gz"
-S="${WORKDIR}"/${MY_P/_/-}.orig
-
-LICENSE="freedist" #465704
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~x86"
-
-RDEPEND="virtual/man"
-
-PATCHES=(
-	"${WORKDIR}"/${MY_P}-${MY_R}.diff
-)
-
-src_prepare() {
-	default
-
-	for f in *.[0-57-9]fun ; do
-		mv ${f} ${f/.?fun/.6fun} || die "renaming ${f} failed"
-	done
-}
-
-src_install() {
-	doman *.6fun
-}
diff --git a/games-misc/funny-manpages/metadata.xml b/games-misc/funny-manpages/metadata.xml
index 1c3ba213c49..5539242c2fb 100644
--- a/games-misc/funny-manpages/metadata.xml
+++ b/games-misc/funny-manpages/metadata.xml
@@ -1,8 +1,9 @@
 <?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>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/games-misc/nyancat/nyancat-1.5.2.ebuild b/games-misc/nyancat/nyancat-1.5.2.ebuild
index 19dce0d65b5..1cbd085411f 100644
--- a/games-misc/nyancat/nyancat-1.5.2.ebuild
+++ b/games-misc/nyancat/nyancat-1.5.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 @@ SRC_URI="https://github.com/klange/nyancat/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 src_compile() {
 	emake CC="$(tc-getCC)"
diff --git a/games-misc/opengfx/Manifest b/games-misc/opengfx/Manifest
index ae42e141d9f..6ddd407d5c9 100644
--- a/games-misc/opengfx/Manifest
+++ b/games-misc/opengfx/Manifest
@@ -1,2 +1 @@
-DIST opengfx-0.6.1-source.tar.xz 9690748 BLAKE2B faa3ca805166a1716f8a235048506620bbb98a4265c72571b3a33e88f3375caff75b5576b64ef451e99dea734145f3be748a9109c7003d1ad9043a90cdd34dad SHA512 4ba3528dbdddea1baa2875f917f959034659c8205fbda2b2a67c5fe80161235d15c25dab323e6da8cba2711b7b4f0c9a96d4187fd2de61ae9a2ff9fd077b063b
 DIST opengfx-7.1-source.tar.xz 9828168 BLAKE2B a1d8305744b76924400cad8503af1a20991551323adea6d0d60d9f6d5ac6311e52cb8f028eb614bbda41106823ab9b912f1fb8af02953758a2eb2912066a38e9 SHA512 55079babcd78d4a36279cb7610b6800308aca8409ed3b9fa33cd4993b0c1f988d7afe270b17930b97609c4fdf8cf4e362e17c11bd85d2ef136d042256c98483f
diff --git a/games-misc/opengfx/opengfx-0.6.1.ebuild b/games-misc/opengfx/opengfx-0.6.1.ebuild
deleted file mode 100644
index 95f257d7145..00000000000
--- a/games-misc/opengfx/opengfx-0.6.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit python-any-r1
-
-DESCRIPTION="OpenGFX data files for OpenTTD"
-HOMEPAGE="https://wiki.openttd.org/en/Basesets/OpenGFX https://github.com/OpenTTD/OpenGFX"
-SRC_URI="https://cdn.openttd.org/${PN}-releases/${PV}/${P}-source.tar.xz"
-S="${WORKDIR}/${P}-source"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-DEPEND="
-	games-util/grfcodec
-	games-util/nml
-	${PYTHON_DEPS}
-"
-
-DOCS=( "README.md" "changelog.txt" )
-
-src_prepare() {
-	default
-
-	python-any-r1_pkg_setup
-}
-
-src_compile() {
-	local myemakeargs=(
-		GIMP=""
-		PYTHON="${EPYTHON}"
-	)
-
-	emake "${myemakeargs[@]}" all
-}
-
-src_test() {
-	local myemakeargs=(
-		GIMP=""
-		PYTHON="${EPYTHON}"
-	)
-
-	emake "${myemakeargs[@]}" check
-}
-
-src_install() {
-	local myemakeargs=(
-		DO_NOT_INSTALL_README="true"
-		DO_NOT_INSTALL_LICENSE="true"
-		DO_NOT_INSTALL_CHANGELOG="true"
-		GIMP=""
-		INSTALL_DIR="${ED}/usr/share/openttd/baseset/"
-		PYTHON="${EPYTHON}"
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	einstalldocs
-}
diff --git a/games-misc/openmsx/Manifest b/games-misc/openmsx/Manifest
index 10c66a3c2bb..573f92970b0 100644
--- a/games-misc/openmsx/Manifest
+++ b/games-misc/openmsx/Manifest
@@ -1,2 +1 @@
-DIST openmsx-0.4.0-source.tar.xz 114608 BLAKE2B e693b206cf350ee46b1fc5b7bf4d2a666ae7bee0fea1e2df3a29cfcfd3dbddd58d7d20d8184d6d367d377869ee5e2f970a8721cc1a1ec39babf1352a600bc759 SHA512 9a34a2f7fd9529d8b2d03f47c307a6818ecd753e8f8205c18c966d7425bf8d4a4409cd365b9d1a04d4b00d994da9e73d4270e29af3a388f48f07d3d83486e225
 DIST openmsx-0.4.2-source.tar.xz 114804 BLAKE2B 6936fed13d4e2cbd29902c3546693d32171828ef55cacb0a123d144a7dc51f0f01dac6ceae1d57d1bfcb0d926ff800f5aed5ee1ae3733cea32b5d5c35ec58212 SHA512 72258276c81070ea931c26ed153ce26b762663af7fc349f2fb7dcefc49d4ea5914ce726700e06beed80c5d3e1e39040e0c1eecc17daf35b4fa37c27f7ca4730a
diff --git a/games-misc/openmsx/openmsx-0.4.0.ebuild b/games-misc/openmsx/openmsx-0.4.0.ebuild
deleted file mode 100644
index ce151bce280..00000000000
--- a/games-misc/openmsx/openmsx-0.4.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit python-any-r1
-
-DESCRIPTION="Open source music base set for OpenTTD"
-HOMEPAGE="https://wiki.openttd.org/en/Basesets/OpenMSX https://github.com/OpenTTD/OpenMSX"
-SRC_URI="https://cdn.openttd.org/openmsx-releases/${PV}/${P}-source.tar.xz"
-S="${WORKDIR}/${P}-source"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-BDEPEND="${PYTHON_DEPS}"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_install() {
-	insinto "/usr/share/openttd/baseset/${P}"
-	doins ${P}/{*.mid,openmsx.obm}
-	dodoc ${P}/{changelog,readme}.txt
-}
diff --git a/games-misc/ponysay/ponysay-3.0.3.ebuild b/games-misc/ponysay/ponysay-3.0.3.ebuild
index a209a7a5ec5..cc2080eb00b 100644
--- a/games-misc/ponysay/ponysay-3.0.3.ebuild
+++ b/games-misc/ponysay/ponysay-3.0.3.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
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 inherit bash-completion-r1 python-single-r1
 
 DESCRIPTION="cowsay reimplemention for ponies"
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/erkin/ponysay"
 SRC_URI="https://github.com/erkin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~m68k ~x86"
 IUSE="doc +non-free bash-completion fish-completion zsh-completion"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/games-misc/sdljoytest/sdljoytest-11102003.ebuild b/games-misc/sdljoytest/sdljoytest-11102003.ebuild
index 8519be5e183..50d329f815e 100644
--- a/games-misc/sdljoytest/sdljoytest-11102003.ebuild
+++ b/games-misc/sdljoytest/sdljoytest-11102003.ebuild
@@ -1,26 +1,25 @@
-# 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 toolchain-funcs
 
 DESCRIPTION="SDL app to test joysticks and game controllers"
 HOMEPAGE="http://sdljoytest.sourceforge.net/"
 SRC_URI="mirror://sourceforge/sdljoytest/SDLJoytest-GL-${PV}.tar.bz2"
+S="${WORKDIR}"/SDLJoytest-GL
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="media-libs/libsdl[joystick,opengl,video]
 	virtual/opengl
 	media-libs/sdl-image"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/SDLJoytest-GL
-
-PATCHES=("${FILESDIR}"/${P}-no-common.patch)
+PATCHES=( "${FILESDIR}"/${P}-no-common.patch )
 
 src_prepare() {
 	default
@@ -31,7 +30,7 @@ src_prepare() {
 
 src_compile() {
 	emake \
-		CC=$(tc-getCC) \
+		CC="$(tc-getCC)" \
 		CFLAGS="$(sdl-config --cflags) ${CFLAGS}" \
 		LDFLAGS="$(sdl-config --libs) -lGL ${LDFLAGS}"
 }
diff --git a/games-misc/usolitaire/usolitaire-0.2.1-r1.ebuild b/games-misc/usolitaire/usolitaire-0.2.1-r1.ebuild
new file mode 100644
index 00000000000..04757b7a0cc
--- /dev/null
+++ b/games-misc/usolitaire/usolitaire-0.2.1-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="solitaire in your terminal"
+HOMEPAGE="https://github.com/eliasdorneles/usolitaire"
+SRC_URI="https://github.com/eliasdorneles/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/urwid[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/games-misc/usolitaire/usolitaire-0.2.1.ebuild b/games-misc/usolitaire/usolitaire-0.2.1.ebuild
index 0b4637d2f29..63ad95ac1bf 100644
--- a/games-misc/usolitaire/usolitaire-0.2.1.ebuild
+++ b/games-misc/usolitaire/usolitaire-0.2.1.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
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="solitaire in your terminal"
diff --git a/games-misc/wtf/wtf-20210416.ebuild b/games-misc/wtf/wtf-20210416.ebuild
index ac5ded279ab..10676a8aa07 100644
--- a/games-misc/wtf/wtf-20210416.ebuild
+++ b/games-misc/wtf/wtf-20210416.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 @@ SRC_URI="https://sourceforge.net/projects/bsd${PN}/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="!<=games-misc/bsd-games-3"
 
diff --git a/games-misc/xcowsay/Manifest b/games-misc/xcowsay/Manifest
index a9444f62857..b5e8498a39b 100644
--- a/games-misc/xcowsay/Manifest
+++ b/games-misc/xcowsay/Manifest
@@ -1 +1 @@
-DIST xcowsay-1.5.1.tar.gz 101281 BLAKE2B 568f6ad7225cd859c37d79bf3ddf66c184f47d8feb6dedbafbd29ca4e05d97d883c6d6e4f4d60cebe107f1527e1ff01e17ec61430a3e55e2f504c2c00e402488 SHA512 55c165b5b2c01b11463af0eeb13fd646ea50138e2938ddfc25d44f1a704b7473d047bc7c95165f449a600de51ee005904f007843e33a8ef02c725b827eaec616
+DIST xcowsay-1.6.tar.gz 292845 BLAKE2B 88597063616928edfc74830171b287b676163faca0b3545dc4495cb0faee810ca7867f36223bba726074866de7fb3458621670265250c846ce94c035a0ad0828 SHA512 53016e1b2790b8bc213702f1b99a0ca0cacc57ef1c2cf821814ecb4aff68df05c98b279a1f39718f4fcee771e1397b27ad43123314b1f04dd442ddc0520a9f98
diff --git a/games-misc/xcowsay/xcowsay-1.5.1.ebuild b/games-misc/xcowsay/xcowsay-1.6.ebuild
index 53da3b690e1..12b92df226d 100644
--- a/games-misc/xcowsay/xcowsay-1.5.1.ebuild
+++ b/games-misc/xcowsay/xcowsay-1.6.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-MY_PV="r${PV}"
+EAPI=8
 
 inherit autotools
 
@@ -12,8 +10,7 @@ HOMEPAGE="
 	https://github.com/nickg/xcowsay
 	https://www.doof.me.uk/xcowsay/
 "
-SRC_URI="https://github.com/nickg/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
+SRC_URI="https://github.com/nickg/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
@@ -24,6 +21,7 @@ RESTRICT="test"
 RDEPEND="
 	dev-libs/glib:2
 	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:3
 	x11-libs/pango
 	dbus? (	dev-libs/dbus-glib )
diff --git a/games-misc/xpenguins/Manifest b/games-misc/xpenguins/Manifest
index d00548dcab5..f940e6b828b 100644
--- a/games-misc/xpenguins/Manifest
+++ b/games-misc/xpenguins/Manifest
@@ -1,2 +1 @@
-DIST xpenguins-2.2.tar.gz 275210 BLAKE2B e9d20cf8fe210f00dcdaf7789d7fb5f477c6623b81e2ae4071367bc2d645f2e8d719d4ecb59e34642a26a3626ba97bbdc5b2abf632f32935d7cf38c6457c5539 SHA512 cb24e17a5a19df0de162b2214dec2fbfc07396cdea9d138b8426d8fc38e248b1faba65ebfb8ba74a5cf515063ba8f4032c4588586b23b5be6aa0a208cfcfebf1
-DIST xpenguins_themes-1.0.tar.gz 215487 BLAKE2B 922d360ed38959bc3e0452949c68f3438d4e2bfa3f8abce997888e2e288e420cae92ef51ebad17a88bd71bbc9f86d8a65d2d49d302d85b6927551144e4cf7cfb SHA512 577dedccfff8f4581c9285deb809d43a09631e15461783bfb5f00d2bf0e687d54f04ad3bcf1051113777d74f57c94c278b99749265a3efe8ebc6aabb1501eaf8
+DIST xpenguins-3.2.1.tar.gz 411421 BLAKE2B f12cbd907479b02a1e25d10ab48f29d6643a209bb424b3a4536f946f4a49b3fdac9a8f0598b63265ed10be45e623ecc98296eda36dc7e91f47d0c16174c5fb7e SHA512 de1382ff054a7c2dbf99f0c7004bde82aef2725981515954095d776208310c18130ffb5c16285f6190c68c498bb55b26af3bf783475ad703c211d1f9fd7d1a0b
diff --git a/games-misc/xpenguins/metadata.xml b/games-misc/xpenguins/metadata.xml
index 1c3ba213c49..9e11e30cb08 100644
--- a/games-misc/xpenguins/metadata.xml
+++ b/games-misc/xpenguins/metadata.xml
@@ -1,8 +1,11 @@
 <?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>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">xpenguins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/games-misc/xpenguins/xpenguins-2.2-r2.ebuild b/games-misc/xpenguins/xpenguins-2.2-r2.ebuild
deleted file mode 100644
index d3d5a27a083..00000000000
--- a/games-misc/xpenguins/xpenguins-2.2-r2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-THEMES_VERSION="1.0"
-DESCRIPTION="Cute little penguins invading your desktop"
-HOMEPAGE="http://xpenguins.seul.org/"
-SRC_URI="http://xpenguins.seul.org/${P}.tar.gz
-	http://xpenguins.seul.org/xpenguins_themes-${THEMES_VERSION}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_install() {
-	default
-	insinto /usr/share/${PN}
-	doins -r ../themes/
-}
diff --git a/games-misc/xpenguins/xpenguins-3.2.1.ebuild b/games-misc/xpenguins/xpenguins-3.2.1.ebuild
new file mode 100644
index 00000000000..4318f0b2f2a
--- /dev/null
+++ b/games-misc/xpenguins/xpenguins-3.2.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Cute little penguins invading your desktop"
+HOMEPAGE="https://ratrabbit.nl/ratrabbit/software/xpenguins/"
+SRC_URI="mirror://sourceforge/xpenguins/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"