gentoo resync : 29.12.2022

19 files changed, 446 insertions, 16 deletions

diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 385138612a7b..c1031a300187 100644
--- a/games-misc/Manifest.gz
+++ b/games-misc/Manifest.gz
diff --git a/games-misc/bsd-games/Manifest b/games-misc/bsd-games/Manifest
index 5656629539fe..a469cffed01c 100644
--- a/games-misc/bsd-games/Manifest
+++ b/games-misc/bsd-games/Manifest
@@ -3,11 +3,15 @@ AUX bsd-games-2.17-bg.patch 660 BLAKE2B 7852051346beb6c33ef0728a64570a8a02c3883e
 AUX bsd-games-2.17-gcc4.patch 747 BLAKE2B ce3fdad6643efd29c5dd63e82241b5e2f209a682cebed2e696791580491c275c739c2e82e24469fb6efe26e75204bb7ad368db393f27f2beeb58d79f7d2903a7 SHA512 3ac710726807d2893befd0a3ef24ca9d329123c79b68880c2cb18ca4ccd63ceaaf7cf798d77b1026a440e4ed4e6de9d4745d0f5d6b4280a6c963d9b397b398f7
 AUX bsd-games-2.17-rename-getdate-clash.patch 767 BLAKE2B 164e73f598583f46df09b3b5f8651839d4fe878cd57a84830fc25596ae1b9752b0a6b1f7eee13f57b6e06101105a85114fb0574bc4491e7171205fc703460454 SHA512 50338cda948f4186ab9a6590b7177cce74c466a4098b06b396f893e1c63281f99e14a968ae38ce739148a4aeb930dcba2e9ee8ee7689174d14aad4c1f626ff2b
 AUX bsd-games-3.1-no-install-manpages-automatically.patch 295 BLAKE2B e0c02a1fda3a79e6263a52a2155075b286239ac58da3b84bab14d1e3c203806b75928968e89db80f02661011b19ee12758e6f2c6a848661ef7219ee704ca6d59 SHA512 266f523c7bdf46599f99f3bbbf728705a7fa6fbf71548033198dd361468dfe5e233e40c975235b166a099cba5fa4fe0fa88b05825935c3449c2c7e5f884198fd
+AUX bsd-games-3.2-no-strip.patch 1054 BLAKE2B 38d65b9f2b9357d0b2e95fb59bfa331586eafb0494694333e72f5eb36694ff4c40e8d2cbcab195432045018b989a7685a0f578aa23f0e928b37438151c507d3e SHA512 f0eef9ea37174de638389abc7c8751db80bc5ced7d406fab82be54f92af4cfadc58e2485187a928120f422d857e77c416fd578334425de12be27c23bb8f1519f
+AUX bsd-games-3.2-no-which.patch 1037 BLAKE2B 2d105e334d7a4f5248bd6dde0260c6a4e9267efce52f6fa5cf65591873ec1d25fb5c9ab33c9fe53e96b9cfa6f7b80ac0b98771ec1e0276073e69a986e0fa81c3 SHA512 e5a1362fb7260f6dc84ced322433d11b28d0e33055614296b0c5a73ae21b7145aa0dd37b3d9543f90fe3959d91d577cf132bfec6afa38b6d1893d07b6804d64a
 AUX config.params-gentoo 1204 BLAKE2B 638b52df3c92928a78a0e0833c2bc84a76906144b36d5a6b3523f4de24452aeeab355268afadb9d32933e5c0c19ab4145062bf3968a9d440af1a659a403b32c4 SHA512 b6734409235caec3deb531bbcdb37527b3090c41b803ccc11895ea403543722437f84bdfa044c6aa70b306384ce94a40979a347e6031bc1d937841c7222d6618
 DIST bsd-games-3.1-verbose-build.patch.gz 4633 BLAKE2B cc75175ac2ef9d476c03bdb08b8c054d13090d6cdd1a14dd44022d13290112c68a7663d0c03f9ca7535ea10f2bb5e49a84acca4f782f0ced59685f762efd5151 SHA512 120c0859bb73a026dae017bcc2bc7505ca156b454bf5f87c91b4887417d5ac62f3dec706af91b22b11be8b5bce11d168f9205d722a9fd30dea654f682a66b1c8
 DIST bsd-games-3.1.tar.gz 267636 BLAKE2B 116b340e383430fc56e9d2379a398494b43664aa124157bfa01f2c6a76ebdc90128cc676abae83b6d74680b0ad9396d24f1c0d11adcff1f552a3e68717b8cc8f SHA512 3f311e89481913b734a21fc7d0765628637af8251228d5a38349c27cc702c307240e81711785bbd7428e208a142bd07597630d29e97e2c7bf5bd9cac1ebc6ada
+DIST bsd-games-3.2.tar.gz 270345 BLAKE2B 3d984601a71e157dd65e4102e68b3cddc9552d13ec546c599d26a501361616e6223f5fba8990ad8c7ba4559b3982e89a7f1064ff7de2422d1eb71f6c8838bcf1 SHA512 cf5f5a9e5d215ee553486580f9a7dfc9801d254a2806172df201dfc42ecbb05326db7bc25b7624eb8a8e541ad61ec319d258687609bddae2bc07edcbade2291a
 DIST bsdgames_2.17-28.debian.tar.xz 58464 BLAKE2B 3f5a70322341b153a8b3cb8df81fea1e773971d0f3b79ba8fb0c0877e95c61c8e8689952333f8ac4263948d781c2dc64c8178f9dac6a1c09ae702f91794b9583 SHA512 7e2db9f830c0657f3fcd1371635bda4a87e7a68180e486e44752904740c0710c02271522ff2d4b606542b3c502dd28795fcecf883360c3ac5bea78c148281f6a
 DIST bsdgames_2.17.orig.tar.gz 2563311 BLAKE2B 9dfff4e70929e14a422c536c661cd95c5f1ac81d9112494525b9ef13d7a39b66bd59b6a264e614cfb29784fdb63364f56b12b4d284b125b5b3c12e92def07fb0 SHA512 cb2ee60474f164d42e3d47700270bbeeda3c8279d64da409c9cc05e36437ef95b92d0a85543298e97604635fcf3e068f3a5cc812e90b5c61fb8d146cf35bc38f
 EBUILD bsd-games-2.17_p28-r2.ebuild 4692 BLAKE2B 870cb4508d184ede3772dbe890fc146ef0c92d84f7e5db563f52b8087b5caac4c0b0dbf91e6fcc1d910e921624000aad06b3080f5c8026d628d15985cba971f1 SHA512 23d1e06cb44a363e2865563d40b795383e4e824c63e861cd0ac0361c4a0f4f125c3122d2ec1e76dc50bc524b735b8bbfde8f49fae4a37476bcfd70f6af2114d5
-EBUILD bsd-games-3.1-r2.ebuild 4525 BLAKE2B 6b69f897c94e8a438bd32587f0a96ba63c698a3ffa3294524c99141af065c716a08360142bc87dcbd38acb224ec3d1a84492d8340fe4a259e51bc6a787631153 SHA512 f1eeecdd34d5352bff0bb797ff93757b836bd9b666b5d96b18fe96f7a2a2d49e1edffe93de08b570edaa8388d5e8ebd8ccbc9b531e67586276e1a67e15c08206
+EBUILD bsd-games-3.1-r2.ebuild 4668 BLAKE2B f4f760e9239a68139469ebcc4456795d07831f36aa5b89113017fc65209f3505a5959dfa4d938386240f43f672d069e7687eb4db860bfbb12b279ce61dbf6b66 SHA512 0d964cfdf826320471801519ad61e50ad2e6aa0488a77ee5877b180be957632b2b1cbdbed4c2967e6d71ddaea7b1da48162071f6ecae4da5bf30df36e6e9df67
+EBUILD bsd-games-3.2.ebuild 4778 BLAKE2B 9d14e6646eb9a052a39b83d03af53b81ac109380f6be85c31759b9eaca233d3928454008269893aebe4c78e6dc00999e97f665efe79be32ea6d41b7c6f166da0 SHA512 c717297e6d3e1a490b080ef5aaa2efa53c7ba4467eec67a381cdfd7534c0fccd2c4a6f1137612db9ed45d71b7acb30b2efc810cda8440f8a5a08de6753dba01b
 MISC metadata.xml 327 BLAKE2B 89325403c47583b762175ec639c9183287ba2c38b14238a38536ab2084412efadb28bd89d0bee8fcada3b55f8691a096965f8fff0add08f157d4a2d723206045 SHA512 710f729c47be0e809ba982ed6d1845b8ccc374705e60ca7a85145d439e130496c7cd9ebcbe70fc0d4770bad5b420f815eb57cae25734d399bd93c38d61fd9352
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 748268ebe63e..71f27640e016 100644
--- a/games-misc/bsd-games/bsd-games-3.1-r2.ebuild
+++ b/games-misc/bsd-games/bsd-games-3.1-r2.ebuild
@@ -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="~alpha ~amd64 ~hppa ~mips ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~riscv ~x86"
 
 # 'check' target doesn't exist, nor do any actual tests
 # bug #779649
@@ -31,6 +31,7 @@ RDEPEND="
 	acct-group/gamestat
 "
 BDEPEND="
+	sys-apps/which
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
@@ -67,6 +68,9 @@ src_prepare() {
 	echo bsd_games_cfg_usrlibdir=\"$(get_libdir)\" >> ./config.params || die
 	echo bsd_games_cfg_build_dirs=\"${GAMES_TO_BUILD}\" >> ./config.params || die
 	echo bsd_games_cfg_docdir=\"/usr/share/doc/${PF}\" >> ./config.params || die
+	if use riscv; then
+		sed -i 's/${CC} ${ldflags} -o $@ $^/${CC} ${ldflags} -o $@ $^ -latomic/' ./*/Module.mk || die
+	fi
 }
 
 src_configure() {
diff --git a/games-misc/bsd-games/bsd-games-3.2.ebuild b/games-misc/bsd-games/bsd-games-3.2.ebuild
new file mode 100644
index 000000000000..a4e1f68fde8e
--- /dev/null
+++ b/games-misc/bsd-games/bsd-games-3.2.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="collection of games from NetBSD"
+HOMEPAGE="https://www.polyomino.org.uk/computer/software/bsd-games/"
+SRC_URI="https://github.com/msharov/bsd-games/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-3.1-verbose-build.patch.gz"
+
+LICENSE="BSD"
+# Subslot indicates the fork / new version
+# 3 doesn't include the same games as the classic variant, etc
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~riscv ~x86"
+
+# 'check' target doesn't exist, nor do any actual tests
+# bug #779649
+RESTRICT="test"
+
+DEPEND="
+	sys-apps/miscfiles
+	sys-libs/ncurses:=[unicode(+)]
+	!games-puzzle/hangman
+	!games-misc/wumpus
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/gamestat
+"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${WORKDIR}"/${PN}-3.1-verbose-build.patch
+	"${FILESDIR}"/${PN}-3.1-no-install-manpages-automatically.patch
+	"${FILESDIR}"/${PN}-3.2-no-which.patch
+	"${FILESDIR}"/${P}-no-strip.patch
+)
+
+# Set GAMES_TO_BUILD variable to whatever you want
+GAMES_TO_BUILD=${GAMES_TO_BUILD:=adventure atc battlestar caesar cribbage
+dab drop4 gofish gomoku hangman klondike robots sail snake spirhunt
+worm wump}
+
+src_prepare() {
+	default
+
+	# Use completely our own CFLAGS/LDFLAGS, no stripping and so on
+	sed -i \
+		-e 's/+= -std=c11 @pkgcflags@ ${CFLAGS}/= -std=c11 @pkgcflags@ ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}/' \
+		-e 's/+= @pkgldflags@ ${LDFLAGS}/= @pkgldflags@ ${LDFLAGS}/' \
+		-e s'/${INSTALL} -m 755 -s/${INSTALL} -m 755/' \
+		-e '/man[6]dir/d' \
+		Config.mk.in || die
+
+	# Yes, this stinks.
+	# Right now, the custom configure script calls pkg-config manually
+	# and seds it a bunch, and this is easier.
+	# Force looking for both ncurses and ncursesw
+	sed -i -e 's/pkgs="ncurses"/pkgs="ncursesw"/' configure || die
+
+	cp "${FILESDIR}"/config.params-gentoo config.params || die
+	echo bsd_games_cfg_usrlibdir=\"$(get_libdir)\" >> ./config.params || die
+	echo bsd_games_cfg_build_dirs=\"${GAMES_TO_BUILD}\" >> ./config.params || die
+	echo bsd_games_cfg_docdir=\"/usr/share/doc/${PF}\" >> ./config.params || die
+	if use riscv; then
+		sed -i 's/${CC} ${ldflags} -o $@ $^/${CC} ${ldflags} -o $@ $^ -latomic/' ./*/Module.mk || die
+	fi
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+
+	econf
+}
+
+src_compile() {
+	emake CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dodir /var/games
+	emake DESTDIR="${D}" install
+
+	_build_game() {
+		has ${1} ${GAMES_TO_BUILD}
+	}
+
+	_do_statefile() {
+		touch "${ED}"/var/games/${1} || die
+		chmod ug+rw "${ED}"/var/games/${1} || die
+	}
+
+	# set some binaries to run as games group (+S)
+	_build_game atc && fperms g+s /usr/bin/atc
+	_build_game battlestar && fperms g+s /usr/bin/battlestar
+	_build_game canfield && fperms g+s /usr/bin/canfield
+	_build_game cribbage && fperms g+s /usr/bin/cribbage
+	_build_game phantasia && fperms g+s /usr/bin/phantasia
+	_build_game robots && fperms g+s /usr/bin/robots
+	_build_game sail && fperms g+s /usr/bin/sail
+	_build_game snake && fperms g+s /usr/bin/snake
+	_build_game tetris && fperms g+s /usr/bin/tetris-bsd
+
+	# state files
+	_build_game atc && _do_statefile atc_score
+	_build_game battlestar && _do_statefile battlestar.log
+	_build_game canfield && _do_statefile cfscores
+	_build_game cribbage && _do_statefile criblog
+	_build_game hack && keepdir /var/games/hack
+	_build_game robots && _do_statefile robots_roll
+	_build_game sail && _do_statefile saillog
+	_build_game snake && _do_statefile snake.log && _do_statefile snakerawscores
+	_build_game tetris && _do_statefile tetris-bsd.scores
+
+	# extra docs
+	_build_game atc && docinto atc
+	_build_game boggle && { docinto boggle ; dodoc boggle/README; }
+	_build_game hack && { docinto hack ; dodoc hack/{OWNER,Original_READ_ME,READ_ME,help}; }
+	_build_game hunt && { docinto hunt ; dodoc hunt/README; }
+	_build_game phantasia && { docinto phantasia ; dodoc phantasia/{OWNER,README}; }
+
+	# Install the man pages manually to make life easier (circumventing compression)
+	local game
+	for game in ${GAMES_TO_BUILD[@]} ; do
+		if [[ -e ${game}/${game}.1 ]] ; then
+			doman ${game}/${game}.1
+		else
+			doman ${game}/${game}.6
+		fi
+	done
+
+	# Since factor is usually not installed, and primes.6 is a symlink to
+	# factor.6, make sure that primes.6 is ok ...
+	if _build_game primes && [[ ! $(_build_game factor) ]] ; then
+		rm -f "${ED}"/usr/share/man/man6/{factor,primes}.6 || die
+		newman factor/factor.6 primes.6
+	fi
+
+	# All of this needs to be owned by the gamestat group
+	fowners -R :gamestat /var/games/
+	# ... and so do the binaries
+	fowners -R :gamestat /usr/bin/
+
+	# State dirs
+	fperms -R ug+rw /var/games/
+}
diff --git a/games-misc/bsd-games/files/bsd-games-3.2-no-strip.patch b/games-misc/bsd-games/files/bsd-games-3.2-no-strip.patch
new file mode 100644
index 000000000000..1afd6772a8f3
--- /dev/null
+++ b/games-misc/bsd-games/files/bsd-games-3.2-no-strip.patch
@@ -0,0 +1,32 @@
+https://github.com/msharov/bsd-games/commit/b3d60ff0f7aa377594e6b9a2e1d1d8a509501beb
+
+From: Mike Sharov <msharov@users.sourceforge.net>
+Date: Sun, 3 Apr 2022 09:16:27 -0400
+Subject: [PATCH] Remove -s arg to install program
+
+If configure was not called with --with-debug, executables are already
+built stripped. Additional stripping during installation is not needed.
+--- a/Config.mk.in
++++ b/Config.mk.in
+@@ -7,7 +7,7 @@ AR		:= @AR@
+ RANLIB		:= @RANLIB@
+ INSTALL		:= @INSTALL@
+ INSTALL_DATA	:= ${INSTALL} -m 644
+-INSTALL_PROGRAM	:= ${INSTALL} -m 755 -s
++INSTALL_PROGRAM	:= ${INSTALL} -m 755
+ INSTALL_SCORE	:= ${INSTALL} -m 664 -g users /dev/null
+ 
+ ################ Destination #########################################
+
+diff --git a/Config.mk.in b/Config.mk.in
+index e069054..d9ee2cb 100644
+--- a/Config.mk.in
++++ b/Config.mk.in
+@@ -30,7 +30,6 @@ ifdef debug
+     ldflags	:= -g -rdynamic
+ else
+     cflags	:= -Os -g0 -DNDEBUG=1
+-    ldflags	:= -s
+ endif
+ CFLAGS		:= -Wall -Wextra -Wstrict-prototypes -Wshadow
+ cflags		+= -std=c11 @pkg_cflags@ ${CFLAGS}
diff --git a/games-misc/bsd-games/files/bsd-games-3.2-no-which.patch b/games-misc/bsd-games/files/bsd-games-3.2-no-which.patch
new file mode 100644
index 000000000000..c38dda4ef462
--- /dev/null
+++ b/games-misc/bsd-games/files/bsd-games-3.2-no-which.patch
@@ -0,0 +1,30 @@
+https://github.com/msharov/bsd-games/pull/12
+--- a/configure
++++ b/configure
+@@ -145,7 +145,7 @@ s/@builddir@/\$\{TMPDIR\}\/make/g"
+ 
+ #### Find headers, libs, programs, and subs ##########################
+ 
+-# Programs found using which
++# Programs found using command -v
+ for i in $progs; do
+     pname=$(expr $i : '\([^=]*\)')
+     pcall=$(expr $i : '[^=]*=\([^=]*\)')
+@@ -153,7 +153,7 @@ for i in $progs; do
+     # First check if an environment variable is set
+     [ -n "$ppath" ] && sub "s/@$pname@/$ppath/g"
+     # Check if the program exists
+-    ppath=$(which $pcall 2>/dev/null)
++    ppath=$(command -v $pcall 2>/dev/null)
+     [ -n "$ppath" ] && [ -x "$ppath" ] && sub "s/@$pname@/$pcall/g"
+ done
+ # If nothing found in first loop, set the first pair anyway
+@@ -164,7 +164,7 @@ for i in $progs; do
+ done
+ 
+ # Packages found using pkg-config
+-pkgconfig=$(which pkg-config 2>/dev/null)
++pkgconfig=$(command -v pkg-config 2>/dev/null)
+ if [ -n "$pkgconfig" ] && [ -x "$pkgconfig" ]; then
+     faildeps=""
+     for i in $pkgs; do
diff --git a/games-misc/exult-sound/Manifest b/games-misc/exult-sound/Manifest
index ec3e5397a0e3..956b0fd80e98 100644
--- a/games-misc/exult-sound/Manifest
+++ b/games-misc/exult-sound/Manifest
@@ -1,3 +1,3 @@
 DIST exult_audio.zip 48439905 BLAKE2B ad8a230d9ba92cef94b22b669644a10ae6fcfe92c4dbfc5c3f89535534b4bddfe7d9b69dbf05220033df92b6d172e83340e6571920f42b5e63e66a5417ffa8f4 SHA512 70374a079935b063f41a37aeb90315d55abb584e5542f7fa12c707318db6365e989a5848bba9045a2c2cca1ccd902cc1d31fec8c95511a986de7a75d322d0919
-EBUILD exult-sound-0-r2.ebuild 594 BLAKE2B e22a7f2439d80476e9242ebead9cbdf23ce41b689076e27b979e560577eb42c1ff4cf1e89145afb18f3240a1b3fb7dcbafd3867c289decb83aa1b4e453b6a561 SHA512 a0e98b18a70c8764f5e7016115969571e610170d665bac4e7554b3980d258bdd1d16c62d132ba93a3c4e1dfac762cac975223b30c0f2f3ba0ed7b490e6f04160
+EBUILD exult-sound-0-r2.ebuild 601 BLAKE2B 6706a506afef2008234f200628af4dc4359b8625f99ab4795f888d36bf19204d462cd180f1178269d7416a01c47420461e52e37ccc36e17dd27cd2d5b24e86e0 SHA512 d2a0a0985a86863dcafc321ab4ba1ef63e336a31691b33251308ed324d7ef56b5e7d10c7b24bd8071a624242ce441927f0817f42626cb9752abc3ed05425481b
 MISC metadata.xml 329 BLAKE2B f879cd6ee783aedd84f5f16852fd4f2ba368eaa26c64e7893a476f2067fe28d8c7281ae1da3c5a81b01b9f23fa49412b857f59fc6dee4c72ccda3a8fd8656b46 SHA512 84ef445bd11dbf3fda1b1c23195b14d0afca4205439a9481ee762adf56a7d7ac8d125c6bac2c3e6b2b1418a1b1709ce741773592482c15b13cde059315f0d2c7
diff --git a/games-misc/exult-sound/exult-sound-0-r2.ebuild b/games-misc/exult-sound/exult-sound-0-r2.ebuild
index 379625fd6db1..6583d1301935 100644
--- a/games-misc/exult-sound/exult-sound-0-r2.ebuild
+++ b/games-misc/exult-sound/exult-sound-0-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
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.sourceforge.net/exult/exult-data/exult_audio.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/games-misc/lolcat/Manifest b/games-misc/lolcat/Manifest
index f4e49041da14..7b59e704d4db 100644
--- a/games-misc/lolcat/Manifest
+++ b/games-misc/lolcat/Manifest
@@ -1,3 +1,3 @@
 DIST lolcat-100.0.1.gem 121344 BLAKE2B 0105987695990c93e2676babd238f10b586c8f742d40d35281cdf131b1db8ec019cd9c9c2cf1e6d8c248a9e9d2a7d5194aecc5b2fe09d04a11c7358b7d63bb61 SHA512 b257d264f8059e6722eaa66125b990414a77e8d67b47472a8e974418408bcf5fbc0a7c7f1e42517660280202ee2d669c3d3850d546356bd2f5e2e84e61af33ff
-EBUILD lolcat-100.0.1-r1.ebuild 699 BLAKE2B a6b30f416bf7eb66cfe2184b268245f0c425b2cf0bf5427b2f66c70395a8071bc28fd655616dab1ec7297607cc3a947b28fdfb78c771ba67cdac6906c387174c SHA512 0ac75f4edb7580c8c79c6933aef731f050dd01517a846ea8747147b3307944488ad2cec1fc39d582d0cdb2b9dec793ed37e8aa1e8381edcc1d81a587f1952667
+EBUILD lolcat-100.0.1-r1.ebuild 699 BLAKE2B dac78bf9ff06211af3d4560fbcbc979aad3e0c17e13ac2c102f5dc0d246162c478cdfbd09794131989ac12fc440e641cf0441d8bac652ff0f541dcc29fcf5e7f SHA512 d0bbc267725f93ea9e1e6487345184d46116ef8275bb317efafd1b9387cccba8b91899b9ff593f2f18bdbe591223191f4c19946d85f0e337fe9006b3e89ef597
 MISC metadata.xml 334 BLAKE2B 5a9eb97ff47cfb52ab6eeb149b29a4898929e8bd4d9eeea4d1fbfc6e93e0d7e29b28f1e83f70cb734aa9cdbd6cc4f1ce30024e5b46f05d31c7232e120f702228 SHA512 67fc345a154ea731b69b9eff553e679a264e3707126b5f9753f48948c3a7821f2523c11b3f685296546b9b81b0fc75b265aecc287ca4a222c09c45a3d75b8db7
diff --git a/games-misc/lolcat/lolcat-100.0.1-r1.ebuild b/games-misc/lolcat/lolcat-100.0.1-r1.ebuild
index cd9ab9f497c6..c6d1d0dba2b6 100644
--- a/games-misc/lolcat/lolcat-100.0.1-r1.ebuild
+++ b/games-misc/lolcat/lolcat-100.0.1-r1.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
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/games-misc/opengfx/Manifest b/games-misc/opengfx/Manifest
index 6821819cae08..af4551d4ec1f 100644
--- a/games-misc/opengfx/Manifest
+++ b/games-misc/opengfx/Manifest
@@ -1,3 +1,4 @@
+AUX opengfx-7.1-no-which.patch 997 BLAKE2B e0757dee3b729f7885b7b3bafdf5cc5a9f9588071c71bf2295d0287b879e7b2c5f76c76e5281ea2f4b6b2c9d06396341acc02f848c19fa5b64df5f6715aae371 SHA512 b5eff66bd5e656ef677a0749d90559c5d431a1a0a1c17adcd66a704a17563bce762a20843c61dabc24fbcf8046fc5e528f4db6f9855d0fee456f0619945fb106
 DIST opengfx-7.1-source.tar.xz 9828168 BLAKE2B a1d8305744b76924400cad8503af1a20991551323adea6d0d60d9f6d5ac6311e52cb8f028eb614bbda41106823ab9b912f1fb8af02953758a2eb2912066a38e9 SHA512 55079babcd78d4a36279cb7610b6800308aca8409ed3b9fa33cd4993b0c1f988d7afe270b17930b97609c4fdf8cf4e362e17c11bd85d2ef136d042256c98483f
-EBUILD opengfx-7.1.ebuild 1111 BLAKE2B 16059ae53cd6c764f035bead7a11c98b888140a7bdd83aed9c2ee97b14f355055396fe8d69475eebce2f289fb8b1e87a1a060e3120ba784ce212c9b4f063928d SHA512 897d7586e9024322e29ea183d3f1ec299063dfd656588332284879e2b6299bb929aa26d6cb5f0af9d148c5e6adc50e8e191576fa434a446ce43b07a001516e3d
+EBUILD opengfx-7.1.ebuild 1164 BLAKE2B eb3ba282be3ebf547a9e0dc01a5c602a8aa62c5258b161169d29e45b648edd863cc1785813cda1549c160c858504e2c4227993b014993a3d5e7aecaba308f2b1 SHA512 441fe972e62a72f31af9c0d7a6bbe1ad02a168855038a048fb0685ee2c49d53a8f8ec503cb152f25da5f72675bd082225324ab9b759aa91ac4f9955930df4fdc
 MISC metadata.xml 327 BLAKE2B c715ce68b2db10d38dd11434102f5345515dba779726012906aabc6169681605c615866328bf8d213ff80f77a7c7a4a7bbe7c3145c18b33abd8de553059e7e75 SHA512 c5f22f130e0506a7714b27dd2858f69d52a6f11854ebd82b4116d7045a57ef74b435dfe920bbb18c99eca7b139c276a56aef4b5e28396b376dad5ceba6686127
diff --git a/games-misc/opengfx/files/opengfx-7.1-no-which.patch b/games-misc/opengfx/files/opengfx-7.1-no-which.patch
new file mode 100644
index 000000000000..616d2af41078
--- /dev/null
+++ b/games-misc/opengfx/files/opengfx-7.1-no-which.patch
@@ -0,0 +1,30 @@
+https://github.com/OpenTTD/OpenGFX/pull/80
+--- a/Makefile
++++ b/Makefile
+@@ -97,7 +97,7 @@ GREP           ?= grep
+ PYTHON         ?= python
+ 
+ # Graphics processing
+-GIMP           ?= $(shell which gimp)
++GIMP           ?= $(shell command -v gimp)
+ GIMP_FLAGS     ?= -n -i
+ 
+ # NML
+@@ -116,7 +116,7 @@ ifdef PNML_FILES
+ endif
+ 
+ # GRF tools
+-GRFID          ?= $(shell which grfid)
++GRFID          ?= $(shell command -v grfid)
+ GRFID_FLAGS    ?= -m
+ MUSA           ?= musa.py
+ # The license is set via bananas.ini, do not supply a "custom" license.
+@@ -606,7 +606,7 @@ endif
+ ifeq ($(shell echo "$(OSTYPE)" | cut -d_ -f1),MINGW32)
+ # If CC has been set to the default implicit value (cc), check if it can be used. Otherwise use a saner default.
+ ifeq "$(origin CC)" "default"
+-	CC=$(shell which cc 2>/dev/null && echo "cc" || echo "gcc")
++	CC=$(shell command -v cc 2>/dev/null && echo "cc" || echo "gcc")
+ endif
+ WIN_VER = $(shell echo "$(OSTYPE)" | cut -d- -f2 | cut -d. -f1)
+ ifeq ($(WIN_VER),5)
diff --git a/games-misc/opengfx/opengfx-7.1.ebuild b/games-misc/opengfx/opengfx-7.1.ebuild
index 937e35cb1573..23ef30961b89 100644
--- a/games-misc/opengfx/opengfx-7.1.ebuild
+++ b/games-misc/opengfx/opengfx-7.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=8
@@ -24,6 +24,10 @@ DEPEND="
 
 DOCS=( "README.md" "changelog.txt" )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.1-no-which.patch
+)
+
 src_prepare() {
 	default
 
diff --git a/games-misc/opensfx/Manifest b/games-misc/opensfx/Manifest
index 05100259722b..235f8d9c76b5 100644
--- a/games-misc/opensfx/Manifest
+++ b/games-misc/opensfx/Manifest
@@ -1,3 +1,4 @@
+AUX opensfx-1.0.3-no-which.patch 5890 BLAKE2B f23d3fb9ba5d7ae30107b2f872fb59fa8bb5a1509680e601110f13ce0d227316fcd0f9be5d86eaf8b9e575b47929b81b692c3416d361649acaf673c12d59d671 SHA512 45a9768ce97934486f282f4f2ab3bcfaa9fc916f8978417042451b3f2847128ab4a30b8c5710cb709510168b9893cfcc0f3227e8e41ffd4d7e0ffe4cd73f6655
 DIST opensfx-1.0.3-source.tar.xz 9943616 BLAKE2B c266ec015c23d79b28e313ad3cb5a1613fe7c9674fd0192bf4a141adcd2a27594052f311710b63e6a173579ba5bebeed50799d2cb19eb3fd5b5ca28411b4b509 SHA512 a077fcb1676ba17aa5e9e2df32c2d69452fe54895e3ac64a80c2a6247aa3ea2ef37443e2391f88117768eeb3f808793c78c11727c69bb3df2fde57f67964dbff
-EBUILD opensfx-1.0.3.ebuild 594 BLAKE2B 35e08bdc510fbf67c86603987123a55b8984b6237f98398fabb7dfe42ef49344acec368267cb69a2b794d239e8c4d3184a0f0803bef47dda7994e55706064c0e SHA512 28d37d4ab90b5d865d98f72793bacf4d840e32e0585e5dea0f0ebe7be4971e3e3c962f6989dd568c40a1ea5cc22423e9ce62f0fcd9cd2463b0448798179c350f
+EBUILD opensfx-1.0.3.ebuild 649 BLAKE2B c60a6acb891315f32d89161c09042cf2b260143d3aad4d744c2e8f8fb421a0c57909291d31c54e295cbf9819bcf76e6eea41876dc95d83ea46445b2ee817cef2 SHA512 c3ab74a0064853fe309c85c8608f2ef0f9ec341ce50dce5fc7fd0d3bfa6cbcc60594de22c4798eefbe3a69146cd331aff2c3d605ccaa383437adbc64737803d4
 MISC metadata.xml 327 BLAKE2B 15e9be4cd0ae3a5594274fb0e018d4d3bca0ef5ffa2a83dfe29b9cf615a0070d3cf47fbfbfebf32866e1f7c3fead83622c7f49ab30649d1383f3236f6a94fbe7 SHA512 b8e8dec4960aa1913b4d8ee801916755ad20e408a62aae6291a650d0abca928123add122d95646e911c54665acf5d8c6fd928a9a1800f5520ebc36a8e0a9db18
diff --git a/games-misc/opensfx/files/opensfx-1.0.3-no-which.patch b/games-misc/opensfx/files/opensfx-1.0.3-no-which.patch
new file mode 100644
index 000000000000..c0b5dee198e3
--- /dev/null
+++ b/games-misc/opensfx/files/opensfx-1.0.3-no-which.patch
@@ -0,0 +1,146 @@
+https://github.com/OpenTTD/OpenSFX/pull/49
+--- a/Makefile
++++ b/Makefile
+@@ -98,7 +98,7 @@ all: $(GENERATE_GRF) $(GENERATE_DOC) bundle_tar
+ MAKE           ?= make
+ MAKE_FLAGS     ?= -r
+ 
+-NML            ?= $(shell which nmlc 2>/dev/null)
++NML            ?= $(shell command -v nmlc 2>/dev/null)
+ NML_FLAGS      ?= -c
+ ifdef REQUIRED_NML_BRANCH
+ 	NML_BRANCH = $(shell nmlc --version | head -n1 | cut -d. -f1-2)
+@@ -108,7 +108,7 @@ ifdef MIN_NML_REVISION
+ endif
+ 
+ ifdef MAIN_SRC_FILE
+-	CC             ?= $(shell which gcc 2>/dev/null)
++	CC             ?= $(shell command -v gcc 2>/dev/null)
+ 	CC_FLAGS       ?= -C -E -nostdinc -x c-header
+ endif
+ 
+@@ -116,11 +116,11 @@ AWK            ?= awk
+ 
+ GREP           ?= grep
+ 
+-GIT            ?= $(shell git status >/dev/null 2>/dev/null && which git 2>/dev/null)
++GIT            ?= $(shell git status >/dev/null 2>/dev/null && command -v git 2>/dev/null)
+ 
+ PYTHON         ?= python
+ 
+-UNIX2DOS       ?= $(shell which unix2dos 2>/dev/null)
++UNIX2DOS       ?= $(shell command -v unix2dos 2>/dev/null)
+ UNIX2DOS_FLAGS ?= $(shell [ -n $(UNIX2DOS) ] && $(UNIX2DOS) -q --version 1>&2 2>/dev/null && echo "-q" || echo "")
+ 
+ ################################################################
+@@ -191,7 +191,7 @@ ifdef GFX_SCRIPT_LIST_FILES
+ # include dependency file, if we generate graphics
+ -include Makefile_gfx.dep
+ 
+-GIMP           ?= $(shell [ `which gimp 2>/dev/null` ] && echo "gimp" || echo "")
++GIMP           ?= $(shell [ `command -v gimp 2>/dev/null` ] && echo "gimp" || echo "")
+ GIMP_FLAGS     ?= -n -i -b - <
+ 
+ %.scm: $(SCRIPT_DIR)/gimpscript $(SCRIPT_DIR)/gimp.sed
+@@ -309,26 +309,26 @@ clean::
+ # and the distribution bundles like bundle_tar, bundle_zip, ...
+ 
+ # Programme definitions
+-TAR            ?= $(shell which tar 2>/dev/null)
++TAR            ?= $(shell command -v tar 2>/dev/null)
+ TAR_FLAGS      ?= -cf
+ 
+-ZIP            ?= $(shell which zip 2>/dev/null)
++ZIP            ?= $(shell command -v zip 2>/dev/null)
+ ZIP_FLAGS      ?= -9rq
+ 
+-GZIP           ?= $(shell which gzip 2>/dev/null)
++GZIP           ?= $(shell command -v gzip 2>/dev/null)
+ GZIP_FLAGS     ?= -9f
+ 
+-BZIP           ?= $(shell which bzip2 2>/dev/null)
++BZIP           ?= $(shell command -v bzip2 2>/dev/null)
+ BZIP_FLAGS     ?= -9fk
+ 
+-XZ             ?= $(shell which xz 2>/dev/null)
++XZ             ?= $(shell command -v xz 2>/dev/null)
+ XZ_FLAGS       ?= -efk
+ 
+ # OSX has nice extended file attributes which create their own file within tars. We don't want those, thus don't copy them
+ CP_FLAGS       ?= $(shell [ "$(OSTYPE)" = "Darwin" ] && echo "-rfX" || echo "-rf")
+ 
+ # Use the grfID programme to find the checksum which OpenTTD checks
+-GRFID          ?= $(shell which grfid 2>/dev/null)
++GRFID          ?= $(shell command -v grfid 2>/dev/null)
+ GRFID_FLAGS    ?= -m
+ 
+ # Rules on how to generate filenames. Usually no need to change
+@@ -484,7 +484,7 @@ endif
+ ifeq ($(shell echo "$(OSTYPE)" | cut -d_ -f1),MINGW32)
+ # If CC has been set to the default implicit value (cc), check if it can be used. Otherwise use a saner default.
+ ifeq "$(origin CC)" "default"
+-	CC=$(shell which cc 2>/dev/null && echo "cc" || echo "gcc")
++	CC=$(shell command -v cc 2>/dev/null && echo "cc" || echo "gcc")
+ endif
+ WIN_VER = $(shell echo "$(OSTYPE)" | cut -d- -f2 | cut -d. -f1)
+ ifeq ($(WIN_VER),5)
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -9,7 +9,7 @@
+ 		> $@
+ 	$(_V) [ -z "$(UNIX2DOS)" ] || $(UNIX2DOS) $(UNIX2DOS_FLAGS) $@
+ 
+-MD5SUM         ?= $(shell which md5sum 2>/dev/null)
++MD5SUM         ?= $(shell command -v md5sum 2>/dev/null)
+ 
+ $(SOUND_FILE): $(SRC_DIR)/$(BASE_FILENAME).sfo $(SOUND_FILES) Makefile Makefile.in Makefile.config
+ # replace the place holders for version and name by the respective variables:
+@@ -18,7 +18,7 @@ $(SOUND_FILE): $(SRC_DIR)/$(BASE_FILENAME).sfo $(SOUND_FILES) Makefile Makefile.
+ 	$(_V) $(CATCODEC) $(CATCODEC_FLAGS) $(SRC_DIR)/$@
+ 	$(_V) cp $(SRC_DIR)/$@ .
+ 
+-ifneq ("$(shell which $(MD5SUM) 2>/dev/null)","")
++ifneq ("$(shell command -v $(MD5SUM) 2>/dev/null)","")
+ $(OBS_FILE): $(SOUND_FILE) $(LANG_FILES) Makefile Makefile.in Makefile.config
+ 	$(_E) "[Generating:] $@"
+ 	@echo "[metadata]" > $@
+--- a/Makefile.local.sample
++++ b/Makefile.local.sample
+@@ -57,7 +57,7 @@
+ # UNIX2DOS_FLAGS = -q
+ # NML_FLAGS      =
+ 
+-# NFORENUM       = $(shell [ `which nforenum 2>/dev/null` ] && echo "nforenum" || echo "renum")
++# NFORENUM       = $(shell [ `command -v nforenum 2>/dev/null` ] && echo "nforenum" || echo "renum")
+ # GRFCODEC       = grfcodec
+ # TAR            = tar
+ # ZIP            = zip
+@@ -67,7 +67,7 @@
+ # AWK            = awk
+ # GIT            = git
+ # MAKE           = make
+-# UNIX2DOS       = $(shell [ `which unix2dos 2>/dev/null` ] && echo "unix2dos" || echo "")
++# UNIX2DOS       = $(shell [ `command -v unix2dos 2>/dev/null` ] && echo "unix2dos" || echo "")
+ # MD5SUM         = $(shell [ "$(OSTYPE)" = "Darwin" ] && echo "md5 -r" || echo "md5sum")
+ # NML            = nml.py
+ 
+--- a/scripts/Makefile.def
++++ b/scripts/Makefile.def
+@@ -24,7 +24,7 @@ NML_FLAGS      ?=
+ CP_FLAGS       ?= $(shell [ "$(OSTYPE)" = "Darwin" ] && echo "-rfX" || echo "-rf")
+ 
+ 
+-NFORENUM       ?= $(shell [ `which nforenum 2>/dev/null` ] && echo "nforenum" || echo "renum")
++NFORENUM       ?= $(shell [ `command -v nforenum 2>/dev/null` ] && echo "nforenum" || echo "renum")
+ GRFCODEC       ?= grfcodec
+ CATCODEC       ?= catcodec
+ TAR            ?= tar
+@@ -35,7 +35,7 @@ CC             ?= gcc
+ AWK            ?= awk
+ GIT            ?= git
+ MAKE           ?= make
+-UNIX2DOS       ?= $(shell [ `which unix2dos 2>/dev/null` ] && echo "unix2dos" || echo "")
++UNIX2DOS       ?= $(shell [ `command -v unix2dos 2>/dev/null` ] && echo "unix2dos" || echo "")
+ # Macs have a different md5 command than linux or mingw envirnoment:
+ MD5SUM         ?= $(shell [ "$(OSTYPE)" = "Darwin" ] && echo "md5 -r" || echo "md5sum")
+ NML            ?= nml2nfo
diff --git a/games-misc/opensfx/opensfx-1.0.3.ebuild b/games-misc/opensfx/opensfx-1.0.3.ebuild
index 04d1840a5c05..e36280e714b0 100644
--- a/games-misc/opensfx/opensfx-1.0.3.ebuild
+++ b/games-misc/opensfx/opensfx-1.0.3.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
@@ -14,6 +14,10 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 DEPEND="games-util/catcodec"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.3-no-which.patch
+)
+
 src_install() {
 	emake INSTALL_DIR="${ED}/usr/share/openttd/baseset/" install
 	dodoc docs/{changelog.txt,readme.ptxt}
diff --git a/games-misc/usolitaire/Manifest b/games-misc/usolitaire/Manifest
index fccad6e2d87c..272a4f9e0c2f 100644
--- a/games-misc/usolitaire/Manifest
+++ b/games-misc/usolitaire/Manifest
@@ -1,3 +1,4 @@
 DIST usolitaire-0.2.1.tar.gz 118199 BLAKE2B 99b828d8aeb91897f5d070250a20c1a5f9b49b3be889781dcc3f2348e8f4946fde3ad07d915d87cbd309b2fa6b87777ab8ecd1bfaf65d76bc6989e36a0263785 SHA512 5bd7b222643e2decfc6e1f7749b8632bb0b99f5af28d49088f28746b8ffbd07443855b557e969f40f427ca71f8d2ac9386d8d90c2121880eb8bce5e3b5d4f4f4
-EBUILD usolitaire-0.2.1.ebuild 473 BLAKE2B d05d03f249673348d5524401984e6ed4f4e7a8aa58c4b08e888fdff6f9974497ec74834749abbc219baeb7453757b006fc4e24e9110eccc08820274cf6745fd8 SHA512 5a02400df53ef604340502b2e23413c5578189637f20d5147f87da7167489f13972e710e7236b6150eb147538e1a90909f5caa415419c301f2ee867ab4951226
+EBUILD usolitaire-0.2.1-r1.ebuild 507 BLAKE2B 034b8a0b394ca41b6f7542774fc2f04528e95c6eebe207458fad4ab30f41659ff8125e97b6e6f2997812e876fef7dd48c26e909b1bf59e02a242be6c07176e07 SHA512 d330e2a051ead52a0d72102ef60d9680f3656342b495a31c4c2d035d51f52a9edcdd08dd39cb788a21ac63cc7d6ccfa542c68bfcb61a61b4be1f52d15c2bf7ea
+EBUILD usolitaire-0.2.1.ebuild 473 BLAKE2B 40e68c79f0911edd9eb5d5b407db466b4f6ab7805a8bde42ea18884038c5b5d588106cda558c430c70cb699c8d654e933a67ec605bb16862caf7eb5dc99f8b2c SHA512 4e63671fdce7288b74b153c06247d106ed27a6077e7a34090cec311352717b6b7ab9a8416d957cc07a9e1f543dda5fcad37b1501b3082bbfdbba7a42d0bd2843
 MISC metadata.xml 414 BLAKE2B 3471f7a585441ffaa9cf1f78bbb557a04ba46d1704e77a0d387972963739e65a56ba08a521670ae009bc750523881f5b9c8f292a30aaad5e5a97da59315d81b6 SHA512 5bbeda40be60faa7d2409932dd62b1bd3f8b82c2944adfbf08b98685a863c40cf31867aad5083b58559e22a2289728d602488183ed3b05cc92e0a55bf43b158e
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 000000000000..04757b7a0cc6
--- /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 0b4637d2f299..63ad95ac1bf8 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"