gentoo resync : 29.12.2022

35 files changed, 104 insertions, 53 deletions

diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index 207b31599d75..6d4b8040d04b 100644
--- a/metadata/md5-cache/games-misc/Manifest.gz
+++ b/metadata/md5-cache/games-misc/Manifest.gz
diff --git a/metadata/md5-cache/games-misc/ballerburg-1.2.0-r1 b/metadata/md5-cache/games-misc/ballerburg-1.2.0-r1
index 462c67bd62ee..86ec6c8a7727 100644
--- a/metadata/md5-cache/games-misc/ballerburg-1.2.0-r1
+++ b/metadata/md5-cache/games-misc/ballerburg-1.2.0-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=media-libs/libsdl
 SLOT=0
 SRC_URI=https://download.tuxfamily.org/baller/ballerburg-1.2.0.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=74606a9c2c60361826ac78eb580778aa
diff --git a/metadata/md5-cache/games-misc/bsd-games-2.17_p28-r2 b/metadata/md5-cache/games-misc/bsd-games-2.17_p28-r2
index 1a0f8f9fabcb..613f1e64d509 100644
--- a/metadata/md5-cache/games-misc/bsd-games-2.17_p28-r2
+++ b/metadata/md5-cache/games-misc/bsd-games-2.17_p28-r2
@@ -4,10 +4,11 @@ DEPEND=sys-apps/miscfiles sys-libs/ncurses:0= !app-misc/banner !games-misc/wtf !
 DESCRIPTION=Collection of games from NetBSD
 EAPI=7
 HOMEPAGE=https://www.polyomino.org.uk/computer/software/bsd-games/
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha ~amd64 ~x86
 LICENSE=BSD
 RDEPEND=sys-apps/miscfiles sys-libs/ncurses:0= !app-misc/banner !games-misc/wtf !games-puzzle/hangman acct-group/gamestat
 SLOT=0
 SRC_URI=http://deb.debian.org/debian/pool/main/b/bsdgames/bsdgames_2.17.orig.tar.gz mirror://debian/pool/main/b/bsdgames/bsdgames_2.17-28.debian.tar.xz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5d5c00cb1b7d32f45559bef0d08ca781
diff --git a/metadata/md5-cache/games-misc/bsd-games-3.1-r2 b/metadata/md5-cache/games-misc/bsd-games-3.1-r2
index ebad257627c7..ece0f13e0c68 100644
--- a/metadata/md5-cache/games-misc/bsd-games-3.1-r2
+++ b/metadata/md5-cache/games-misc/bsd-games-3.1-r2
@@ -1,14 +1,15 @@
-BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig
+BDEPEND=sys-apps/which sys-devel/bison sys-devel/flex virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare
 DEPEND=sys-apps/miscfiles sys-libs/ncurses:=[unicode(+)] !games-puzzle/hangman !games-misc/wumpus
 DESCRIPTION=collection of games from NetBSD
 EAPI=7
 HOMEPAGE=https://www.polyomino.org.uk/computer/software/bsd-games/
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ~x86
+INHERIT=toolchain-funcs
+KEYWORDS=~alpha ~amd64 ~hppa ~mips ~riscv ~x86
 LICENSE=BSD
 RDEPEND=sys-apps/miscfiles sys-libs/ncurses:=[unicode(+)] !games-puzzle/hangman !games-misc/wumpus acct-group/gamestat
 RESTRICT=test
 SLOT=0/3
 SRC_URI=https://github.com/msharov/bsd-games/archive/refs/tags/v3.1.tar.gz -> bsd-games-3.1.tar.gz https://dev.gentoo.org/~sam/distfiles/games-misc/bsd-games/bsd-games-3.1-verbose-build.patch.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=cbfa9ce904c56447be530b217b7d5819
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=98f1584b6f8bc81cedcef71e59aaffd5
diff --git a/metadata/md5-cache/games-misc/bsd-games-3.2 b/metadata/md5-cache/games-misc/bsd-games-3.2
new file mode 100644
index 000000000000..f659e4f04c8b
--- /dev/null
+++ b/metadata/md5-cache/games-misc/bsd-games-3.2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare
+DEPEND=sys-apps/miscfiles sys-libs/ncurses:=[unicode(+)] !games-puzzle/hangman !games-misc/wumpus
+DESCRIPTION=collection of games from NetBSD
+EAPI=8
+HOMEPAGE=https://www.polyomino.org.uk/computer/software/bsd-games/
+INHERIT=toolchain-funcs
+KEYWORDS=~alpha ~amd64 ~hppa ~mips ~riscv ~x86
+LICENSE=BSD
+RDEPEND=sys-apps/miscfiles sys-libs/ncurses:=[unicode(+)] !games-puzzle/hangman !games-misc/wumpus acct-group/gamestat
+RESTRICT=test
+SLOT=0/3
+SRC_URI=https://github.com/msharov/bsd-games/archive/refs/tags/v3.2.tar.gz -> bsd-games-3.2.tar.gz https://dev.gentoo.org/~sam/distfiles/games-misc/bsd-games/bsd-games-3.1-verbose-build.patch.gz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=cd4759a8d995e98d5ad194e7b0be876c
diff --git a/metadata/md5-cache/games-misc/bsod-0.1-r1 b/metadata/md5-cache/games-misc/bsod-0.1-r1
index 9f42e4f19cd6..3f54d24ccd20 100644
--- a/metadata/md5-cache/games-misc/bsod-0.1-r1
+++ b/metadata/md5-cache/games-misc/bsod-0.1-r1
@@ -4,10 +4,11 @@ DEPEND=sys-libs/ncurses:0=
 DESCRIPTION=This program will let you experience the authentic Microsoft Windows experience
 EAPI=7
 HOMEPAGE=http://www.vanheusden.com/bsod/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=http://www.vanheusden.com/bsod/bsod-0.1.tgz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9745b26239b4fff2ae05c9aa647a172b
diff --git a/metadata/md5-cache/games-misc/c++robots-0-r1 b/metadata/md5-cache/games-misc/c++robots-0-r1
index cf13388483a0..a9752ed99ae8 100644
--- a/metadata/md5-cache/games-misc/c++robots-0-r1
+++ b/metadata/md5-cache/games-misc/c++robots-0-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
 DESCRIPTION=ongoing 'King of the Hill' (KotH) tournament
 EAPI=7
 HOMEPAGE=http://www.gamerz.net/c++robots/
+INHERIT=toolchain-funcs
 KEYWORDS=~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://gentoo/c++robots-0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b437b8c8f337d61510adb5d7f9810ad1
diff --git a/metadata/md5-cache/games-misc/doge-3.6.0-r1 b/metadata/md5-cache/games-misc/doge-3.6.0-r1
index fb8ffdb294b6..1f0a7b0db9dc 100644
--- a/metadata/md5-cache/games-misc/doge-3.6.0-r1
+++ b/metadata/md5-cache/games-misc/doge-3.6.0-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-process/procps python_single_target_python3_8? ( >=dev-lang/python-3
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/thiderman/doge/archive/3.6.0.tar.gz -> doge-3.6.0.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a67afb6445485e934ea57bd68274123b
diff --git a/metadata/md5-cache/games-misc/exult-sound-0-r2 b/metadata/md5-cache/games-misc/exult-sound-0-r2
index eacbeaf00838..7aede60ad2e1 100644
--- a/metadata/md5-cache/games-misc/exult-sound-0-r2
+++ b/metadata/md5-cache/games-misc/exult-sound-0-r2
@@ -3,8 +3,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Sound data for games-engines/exult
 EAPI=7
 HOMEPAGE=http://exult.sourceforge.net/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/exult/exult-data/exult_audio.zip
-_md5_=e08af2e18a35cd8ff65a75f9e79ab011
+_md5_=226490e2269901bc95b320dff9de0f1e
diff --git a/metadata/md5-cache/games-misc/fortune-mod-1.99.1-r3 b/metadata/md5-cache/games-misc/fortune-mod-1.99.1-r3
index 78bfd835e0ff..5ec8a3f3ccd0 100644
--- a/metadata/md5-cache/games-misc/fortune-mod-1.99.1-r3
+++ b/metadata/md5-cache/games-misc/fortune-mod-1.99.1-r3
@@ -3,11 +3,12 @@ DEPEND=app-text/recode:0=
 DESCRIPTION=The notorious fortune program
 EAPI=7
 HOMEPAGE=http://www.redellipse.net/code/fortune
+INHERIT=toolchain-funcs
 IUSE=offensive
 KEYWORDS=~alpha amd64 arm arm64 hppa ~m68k ~mips ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=app-text/recode:0=
 SLOT=0
 SRC_URI=http://www.redellipse.net/code/downloads/fortune-mod-1.99.1.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=94fa1586c66ed61f23a552f997d0f3c7
diff --git a/metadata/md5-cache/games-misc/fortune-mod-3.10.0 b/metadata/md5-cache/games-misc/fortune-mod-3.10.0
index 2a5dfc03a34c..e68aa6845048 100644
--- a/metadata/md5-cache/games-misc/fortune-mod-3.10.0
+++ b/metadata/md5-cache/games-misc/fortune-mod-3.10.0
@@ -1,4 +1,4 @@
-BDEPEND=app-text/App-XML-DocBook-Builder dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-text/App-XML-DocBook-Builder >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=app-text/recode:= !games-misc/fortune-mod-tao
 DESCRIPTION=The notorious fortune program
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=app-text/recode:= !games-misc/fortune-mod-tao
 SLOT=0
 SRC_URI=https://github.com/shlomif/fortune-mod/releases/download/fortune-mod-3.10.0/fortune-mod-3.10.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=c64348ba5016f7b9f0078d797ccdc91d
diff --git a/metadata/md5-cache/games-misc/fortune-mod-3.12.0 b/metadata/md5-cache/games-misc/fortune-mod-3.12.0
index 38e154b9cd64..bc00d2c75a46 100644
--- a/metadata/md5-cache/games-misc/fortune-mod-3.12.0
+++ b/metadata/md5-cache/games-misc/fortune-mod-3.12.0
@@ -1,4 +1,4 @@
-BDEPEND=app-text/App-XML-DocBook-Builder dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-text/App-XML-DocBook-Builder >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=app-text/recode:= !games-misc/fortune-mod-tao
 DESCRIPTION=The notorious fortune program
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=app-text/recode:= !games-misc/fortune-mod-tao
 SLOT=0
 SRC_URI=https://github.com/shlomif/fortune-mod/releases/download/fortune-mod-3.12.0/fortune-mod-3.12.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=adaa41df11ae4104751ffeeb7c53ed88
diff --git a/metadata/md5-cache/games-misc/fortune-mod-3.14.0 b/metadata/md5-cache/games-misc/fortune-mod-3.14.0
index db5b542b9452..c39428cbefaf 100644
--- a/metadata/md5-cache/games-misc/fortune-mod-3.14.0
+++ b/metadata/md5-cache/games-misc/fortune-mod-3.14.0
@@ -1,4 +1,4 @@
-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 ) dev-util/ninja >=dev-util/cmake-3.20.5
+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 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=The notorious fortune program
 EAPI=8
@@ -11,5 +11,5 @@ RDEPEND=app-text/recode:= !games-misc/fortune-mod-tao
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.shlomifish.org/open-source/projects/fortune-mod/arcs/fortune-mod-3.14.0.tar.xz https://github.com/shlomif/fortune-mod/releases/download/fortune-mod-3.14.0/fortune-mod-3.14.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1fd05ca94e7a09dedd35e54789474da6
diff --git a/metadata/md5-cache/games-misc/fortune-mod-3.6.1-r1 b/metadata/md5-cache/games-misc/fortune-mod-3.6.1-r1
index 45ca082fc41e..e076f299a8bd 100644
--- a/metadata/md5-cache/games-misc/fortune-mod-3.6.1-r1
+++ b/metadata/md5-cache/games-misc/fortune-mod-3.6.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-text/App-XML-DocBook-Builder dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-text/App-XML-DocBook-Builder >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=app-text/recode:= !games-misc/fortune-mod-tao
 DESCRIPTION=The notorious fortune program
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=app-text/recode:= !games-misc/fortune-mod-tao
 SLOT=0
 SRC_URI=https://github.com/shlomif/fortune-mod/releases/download/fortune-mod-3.6.1/fortune-mod-3.6.1.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=5ea7c6de35aad33282aad58a19c4ea52
diff --git a/metadata/md5-cache/games-misc/gBhed-0.17-r1 b/metadata/md5-cache/games-misc/gBhed-0.17-r1
index 5ba7179a0e3e..62f1e7153892 100644
--- a/metadata/md5-cache/games-misc/gBhed-0.17-r1
+++ b/metadata/md5-cache/games-misc/gBhed-0.17-r1
@@ -3,11 +3,12 @@ DEPEND=gtk? ( x11-libs/gtk+:2 )
 DESCRIPTION=An Al Bhed translator
 EAPI=7
 HOMEPAGE=http://liquidchile.net/software/gbhed/
+INHERIT=desktop
 IUSE=gtk
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=gtk? ( x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=http://liquidchile.net/software/gbhed/gBhed-0.17.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa
 _md5_=4d8a6d952d532a89327ef1e30c985d55
diff --git a/metadata/md5-cache/games-misc/gtklife-5.2 b/metadata/md5-cache/games-misc/gtklife-5.2
index ce81f69f09c9..fee96dabc95e 100644
--- a/metadata/md5-cache/games-misc/gtklife-5.2
+++ b/metadata/md5-cache/games-misc/gtklife-5.2
@@ -4,10 +4,11 @@ DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libX11 dev-util/desktop-file-uti
 DESCRIPTION=A Conway's Life simulator for Unix
 EAPI=7
 HOMEPAGE=http://ironphoenix.org/tril/gtklife/
+INHERIT=desktop xdg
 KEYWORDS=~amd64 ~hppa ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libX11
 SLOT=0
 SRC_URI=http://ironphoenix.org/tril/gtklife/gtklife-5.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=4baba1b8f33deb8c762db2b0ca227759
diff --git a/metadata/md5-cache/games-misc/little-inferno-20130509-r1 b/metadata/md5-cache/games-misc/little-inferno-20130509-r1
index 50666a7ffd3c..9aa71b28b991 100644
--- a/metadata/md5-cache/games-misc/little-inferno-20130509-r1
+++ b/metadata/md5-cache/games-misc/little-inferno-20130509-r1
@@ -2,11 +2,12 @@ DEFINED_PHASES=install nofetch unpack
 DESCRIPTION=Throw your toys into your fire, and play with them as they burn
 EAPI=7
 HOMEPAGE=https://tomorrowcorporation.com/littleinferno
+INHERIT=desktop unpacker wrapper
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=Gameplay-Group-EULA
 RDEPEND=media-libs/openal[abi_x86_32(-)] net-misc/curl[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)]
 RESTRICT=bindist fetch
 SLOT=0
 SRC_URI=LittleInferno-20130509.sh
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	697382d119fd3d195f110b7979184285	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	unpacker	697382d119fd3d195f110b7979184285	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=56db3791d44737233a39c52393d29977
diff --git a/metadata/md5-cache/games-misc/lolcat-100.0.1-r1 b/metadata/md5-cache/games-misc/lolcat-100.0.1-r1
index 5ce9bf90d11b..23932ec8ffcc 100644
--- a/metadata/md5-cache/games-misc/lolcat-100.0.1-r1
+++ b/metadata/md5-cache/games-misc/lolcat-100.0.1-r1
@@ -1,16 +1,17 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/optimist:3[ruby_targets_ruby26(-)] >=dev-ruby/paint-2.1:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/optimist:3[ruby_targets_ruby27(-)] >=dev-ruby/paint-2.1:0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/optimist:3[ruby_targets_ruby26(-)] >=dev-ruby/paint-2.1:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/optimist:3[ruby_targets_ruby27(-)] >=dev-ruby/paint-2.1:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/optimist:3[ruby_targets_ruby30(-)] >=dev-ruby/paint-2.1:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/optimist:3[ruby_targets_ruby31(-)] >=dev-ruby/paint-2.1:0[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 DESCRIPTION=Rainbows and unicorns!
 EAPI=7
 HOMEPAGE=https://github.com/busyloop/lolcat
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby26? ( dev-ruby/optimist:3[ruby_targets_ruby26(-)] >=dev-ruby/paint-2.1:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/optimist:3[ruby_targets_ruby27(-)] >=dev-ruby/paint-2.1:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RDEPEND=ruby_targets_ruby26? ( dev-ruby/optimist:3[ruby_targets_ruby26(-)] >=dev-ruby/paint-2.1:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/optimist:3[ruby_targets_ruby27(-)] >=dev-ruby/paint-2.1:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/optimist:3[ruby_targets_ruby30(-)] >=dev-ruby/paint-2.1:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/optimist:3[ruby_targets_ruby31(-)] >=dev-ruby/paint-2.1:0[ruby_targets_ruby31(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/lolcat-100.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=639783101ac74595f280afc0b7a9cbad
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=d3b9a92bafec8c1612689e627ba16e64
diff --git a/metadata/md5-cache/games-misc/lucidlife-0.9.2-r1 b/metadata/md5-cache/games-misc/lucidlife-0.9.2-r1
index fa1b809d2296..9ea8a3a13124 100644
--- a/metadata/md5-cache/games-misc/lucidlife-0.9.2-r1
+++ b/metadata/md5-cache/games-misc/lucidlife-0.9.2-r1
@@ -4,10 +4,11 @@ DEPEND=dev-libs/atk dev-libs/glib dev-libs/gobject-introspection media-libs/font
 DESCRIPTION=A Conway's Life simulator written in GTK+2 - fork from Gtklife
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=autotools
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/atk dev-libs/glib dev-libs/gobject-introspection media-libs/fontconfig media-libs/freetype x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango
 SLOT=0
 SRC_URI=mirror://gentoo/lucidlife-0.9.2.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1307ad6551510198e38a4d7974433b6e
diff --git a/metadata/md5-cache/games-misc/nyancat-1.5.2 b/metadata/md5-cache/games-misc/nyancat-1.5.2
index 731872bd3168..db95a542bbf3 100644
--- a/metadata/md5-cache/games-misc/nyancat-1.5.2
+++ b/metadata/md5-cache/games-misc/nyancat-1.5.2
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Nyancat in your terminal, rendered through ANSI escape sequences
 EAPI=7
 HOMEPAGE=https://nyancat.dakko.us/
+INHERIT=systemd toolchain-funcs
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=UoI-NCSA
 SLOT=0
 SRC_URI=https://github.com/klange/nyancat/archive/1.5.2.tar.gz -> nyancat-1.5.2.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=09c1740617887d9ed563880412dd20fc
diff --git a/metadata/md5-cache/games-misc/opengfx-7.1 b/metadata/md5-cache/games-misc/opengfx-7.1
index 73e96167901a..7d6093d9f225 100644
--- a/metadata/md5-cache/games-misc/opengfx-7.1
+++ b/metadata/md5-cache/games-misc/opengfx-7.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://cdn.openttd.org/opengfx-releases/7.1/opengfx-7.1-source.tar.xz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=d2b1c8d2d223bcc7888fa6bc4c479169
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=1eebbd5e304745fa1150267463a09639
diff --git a/metadata/md5-cache/games-misc/openmsx-0.4.2 b/metadata/md5-cache/games-misc/openmsx-0.4.2
index ab808676a9d5..d85b5a19eb3c 100644
--- a/metadata/md5-cache/games-misc/openmsx-0.4.2
+++ b/metadata/md5-cache/games-misc/openmsx-0.4.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://cdn.openttd.org/openmsx-releases/0.4.2/openmsx-0.4.2-source.tar.xz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=58b168d64108463ecb1b9058c970f86b
diff --git a/metadata/md5-cache/games-misc/opensfx-1.0.3 b/metadata/md5-cache/games-misc/opensfx-1.0.3
index 5cef7a579996..0ea2da843de2 100644
--- a/metadata/md5-cache/games-misc/opensfx-1.0.3
+++ b/metadata/md5-cache/games-misc/opensfx-1.0.3
@@ -7,4 +7,4 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=CC-BY-SA-3.0 CDDL-1.1 GPL-2+
 SLOT=0
 SRC_URI=https://cdn.openttd.org/opensfx-releases/1.0.3/opensfx-1.0.3-source.tar.xz
-_md5_=e3f4b062af8b89838703dd2cf22231f7
+_md5_=1401bcafa403341b40714393609d3605
diff --git a/metadata/md5-cache/games-misc/papers-please-1.1.65 b/metadata/md5-cache/games-misc/papers-please-1.1.65
index c8fc4a14dd97..a232bdc668bd 100644
--- a/metadata/md5-cache/games-misc/papers-please-1.1.65
+++ b/metadata/md5-cache/games-misc/papers-please-1.1.65
@@ -2,11 +2,12 @@ DEFINED_PHASES=install nofetch prepare
 DESCRIPTION=A Dystopian Document Thriller
 EAPI=7
 HOMEPAGE=http://papersplea.se
+INHERIT=desktop wrapper
 KEYWORDS=~amd64 ~x86
 LICENSE=PAPERS-PLEASE
 RDEPEND=amd64? ( >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXau-1.0.7-r1[abi_x86_32] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32] >=x11-libs/libdrm-2.4.46[abi_x86_32] >=x11-libs/libxcb-1.9.1[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] ) x86? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXxf86vm x11-libs/libdrm x11-libs/libxcb virtual/opengl )
 RESTRICT=fetch bindist
 SLOT=0
 SRC_URI=papers-please_1.1.65_i386.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=c565758ae918a351d9acf1248e067ab5
diff --git a/metadata/md5-cache/games-misc/ponysay-3.0.3 b/metadata/md5-cache/games-misc/ponysay-3.0.3
index d5d95f042e9a..0fe76ff97cc2 100644
--- a/metadata/md5-cache/games-misc/ponysay-3.0.3
+++ b/metadata/md5-cache/games-misc/ponysay-3.0.3
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) p
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/erkin/ponysay/archive/3.0.3.tar.gz -> ponysay-3.0.3.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8bcd923bd011747981edb31377dbf6a1
diff --git a/metadata/md5-cache/games-misc/robotfindskitten-2.7182818.701-r1 b/metadata/md5-cache/games-misc/robotfindskitten-2.7182818.701-r1
index 668fb77fc10a..2b3cfd47eb59 100644
--- a/metadata/md5-cache/games-misc/robotfindskitten-2.7182818.701-r1
+++ b/metadata/md5-cache/games-misc/robotfindskitten-2.7182818.701-r1
@@ -4,10 +4,11 @@ DEPEND=sys-libs/ncurses:0=
 DESCRIPTION=Help robot find kitten
 EAPI=7
 HOMEPAGE=http://robotfindskitten.org/
+INHERIT=autotools
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/rfk/robotfindskitten-2.7182818.701.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c63ea4360e37130cb7dda0d68e67d1ac
diff --git a/metadata/md5-cache/games-misc/sdljoytest-11102003 b/metadata/md5-cache/games-misc/sdljoytest-11102003
index 6e6d5f6a3cd9..15a55d684720 100644
--- a/metadata/md5-cache/games-misc/sdljoytest-11102003
+++ b/metadata/md5-cache/games-misc/sdljoytest-11102003
@@ -3,10 +3,11 @@ DEPEND=media-libs/libsdl[joystick,opengl,video] virtual/opengl media-libs/sdl-im
 DESCRIPTION=SDL app to test joysticks and game controllers
 EAPI=8
 HOMEPAGE=http://sdljoytest.sourceforge.net/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[joystick,opengl,video] virtual/opengl media-libs/sdl-image
 SLOT=0
 SRC_URI=mirror://sourceforge/sdljoytest/SDLJoytest-GL-11102003.tar.bz2
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=23a4b222c453619acbc1ee71d2ce0dae
diff --git a/metadata/md5-cache/games-misc/sex-1.0-r2 b/metadata/md5-cache/games-misc/sex-1.0-r2
index a1687ac4da04..0319bceb0a05 100644
--- a/metadata/md5-cache/games-misc/sex-1.0-r2
+++ b/metadata/md5-cache/games-misc/sex-1.0-r2
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Spouts silly mad-lib-style porn-like text
 EAPI=8
 HOMEPAGE=http://spatula.net/software/sex/
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha ~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 RDEPEND=!sci-astronomy/sextractor
 SLOT=0
 SRC_URI=http://spatula.net/software/sex/sex-1.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8b1297732d1b1f5abb39ac7368de54dd
diff --git a/metadata/md5-cache/games-misc/sound-of-sorting-0.6.6_pre20151107-r1 b/metadata/md5-cache/games-misc/sound-of-sorting-0.6.6_pre20151107-r1
index c83d28ad5f40..83daf3058a99 100644
--- a/metadata/md5-cache/games-misc/sound-of-sorting-0.6.6_pre20151107-r1
+++ b/metadata/md5-cache/games-misc/sound-of-sorting-0.6.6_pre20151107-r1
@@ -3,10 +3,11 @@ DEPEND=media-libs/libsdl x11-libs/wxGTK:3.0
 DESCRIPTION=Visualization and Audibilization of Sorting Algorithms
 EAPI=7
 HOMEPAGE=http://panthema.net/2013/sound-of-sorting/ https://github.com/bingmann/sound-of-sorting
+INHERIT=vcs-snapshot wxwidgets
 KEYWORDS=~amd64
 LICENSE=GPL-3
 RDEPEND=media-libs/libsdl x11-libs/wxGTK:3.0
 SLOT=0
 SRC_URI=https://github.com/bingmann/sound-of-sorting/archive/05db428c796a7006d63efdbe314f976e0aa881d6.tar.gz -> sound-of-sorting-0.6.6_pre20151107.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-snapshot	19dc666868420457132a7514d4621476	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-snapshot	19dc666868420457132a7514d4621476	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6
 _md5_=c087f116a273b11a1c5b4d9401150eed
diff --git a/metadata/md5-cache/games-misc/typespeed-0.6.5-r2 b/metadata/md5-cache/games-misc/typespeed-0.6.5-r2
index 8d0624289718..3d5b1602eb7d 100644
--- a/metadata/md5-cache/games-misc/typespeed-0.6.5-r2
+++ b/metadata/md5-cache/games-misc/typespeed-0.6.5-r2
@@ -4,11 +4,12 @@ DEPEND=sys-libs/ncurses:0= nls? ( virtual/libintl )
 DESCRIPTION=Test your typing speed, and get your fingers CPS
 EAPI=7
 HOMEPAGE=http://typespeed.sourceforge.net/
+INHERIT=autotools
 IUSE=nls
 KEYWORDS=~alpha ~amd64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/typespeed/typespeed-0.6.5.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6dee0fd03a25072c192866264373e1ec
diff --git a/metadata/md5-cache/games-misc/usolitaire-0.2.1 b/metadata/md5-cache/games-misc/usolitaire-0.2.1
index 7f64375dceec..606ca5c00406 100644
--- a/metadata/md5-cache/games-misc/usolitaire-0.2.1
+++ b/metadata/md5-cache/games-misc/usolitaire-0.2.1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/urwid[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/urwid[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=solitaire in your terminal
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/eliasdorneles/usolitaire
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=dev-python/urwid[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/urwid[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/eliasdorneles/usolitaire/archive/v0.2.1.tar.gz -> usolitaire-0.2.1.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=1f814cf9f78b7557844fd9549587c1ac
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=a5bc88f19581b3a3c7b3c0afe4650dea
diff --git a/metadata/md5-cache/games-misc/usolitaire-0.2.1-r1 b/metadata/md5-cache/games-misc/usolitaire-0.2.1-r1
new file mode 100644
index 000000000000..351474c851c6
--- /dev/null
+++ b/metadata/md5-cache/games-misc/usolitaire-0.2.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/urwid[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=solitaire in your terminal
+EAPI=8
+HOMEPAGE=https://github.com/eliasdorneles/usolitaire
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/urwid[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/eliasdorneles/usolitaire/archive/v0.2.1.tar.gz -> usolitaire-0.2.1.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=8e5a1cfee6b876098e0740d5e19afd63
diff --git a/metadata/md5-cache/games-misc/wumpus-1.4-r2 b/metadata/md5-cache/games-misc/wumpus-1.4-r2
index d172e4538b19..121bbc8cdd6e 100644
--- a/metadata/md5-cache/games-misc/wumpus-1.4-r2
+++ b/metadata/md5-cache/games-misc/wumpus-1.4-r2
@@ -3,10 +3,11 @@ DEPEND=sys-apps/less
 DESCRIPTION=Classic Hunt the Wumpus Adventure Game
 EAPI=7
 HOMEPAGE=http://cvsweb.netbsd.org/bsdweb.cgi/src/games/wump/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=sys-apps/less !games-misc/bsd-games:0/3
 SLOT=0
 SRC_URI=ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-release-1-6/src/games/wump/wump.c ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-release-1-6/src/games/wump/wump.6 ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-release-1-6/src/games/wump/wump.info
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d3922606c58dce0b7735507106251f0e
diff --git a/metadata/md5-cache/games-misc/xcowsay-1.6 b/metadata/md5-cache/games-misc/xcowsay-1.6
index a1c02968acf7..52349945260e 100644
--- a/metadata/md5-cache/games-misc/xcowsay-1.6
+++ b/metadata/md5-cache/games-misc/xcowsay-1.6
@@ -4,6 +4,7 @@ DEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-
 DESCRIPTION=Displays a cute cow and message on your desktop
 EAPI=8
 HOMEPAGE=https://github.com/nickg/xcowsay https://www.doof.me.uk/xcowsay/
+INHERIT=autotools
 IUSE=dbus fortune nls
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/nickg/xcowsay/releases/download/v1.6/xcowsay-1.6.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=29fb480dd65dfc7781c407092f0c816a
diff --git a/metadata/md5-cache/games-misc/xcruiser-0.30-r1 b/metadata/md5-cache/games-misc/xcruiser-0.30-r1
index 707b45a1547e..beaec1741f3f 100644
--- a/metadata/md5-cache/games-misc/xcruiser-0.30-r1
+++ b/metadata/md5-cache/games-misc/xcruiser-0.30-r1
@@ -4,11 +4,12 @@ DEPEND=x11-libs/libXaw
 DESCRIPTION=Fly about 3D-formed file system
 EAPI=7
 HOMEPAGE=http://xcruiser.sourceforge.net/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libXaw
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/xcruiser/xcruiser-0.30.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6a4aeb62cf251284f40448293759a7fd