gentoo resync : 29.12.2022

78 files changed, 224 insertions, 107 deletions

diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 518135a4871c..b585087d4c1d 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/advancemame-3.9 b/metadata/md5-cache/games-emulation/advancemame-3.9
index 7ab7118d93eb..3d4a963122b7 100644
--- a/metadata/md5-cache/games-emulation/advancemame-3.9
+++ b/metadata/md5-cache/games-emulation/advancemame-3.9
@@ -4,11 +4,12 @@ DEPEND=dev-libs/expat media-libs/libsdl2[video] sys-libs/zlib alsa? ( media-libs
 DESCRIPTION=GNU/Linux port of the MAME emulator with GUI menu
 EAPI=7
 HOMEPAGE=http://www.advancemame.it/
+INHERIT=autotools flag-o-matic
 IUSE=alsa fbcon ncurses oss slang truetype
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-2 XMAME
 RDEPEND=dev-libs/expat media-libs/libsdl2[video] sys-libs/zlib alsa? ( media-libs/alsa-lib ) ncurses? ( sys-libs/ncurses:= ) slang? ( sys-libs/slang ) truetype? ( media-libs/freetype:2 ) app-arch/unzip app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/amadvance/advancemame/releases/download/v3.9/advancemame-3.9.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=0a8ac24d1b4dd809e057adca35c1859f
diff --git a/metadata/md5-cache/games-emulation/advancescan-1.16-r1 b/metadata/md5-cache/games-emulation/advancescan-1.16-r1
index f1c9f2a48020..33fff5b063f4 100644
--- a/metadata/md5-cache/games-emulation/advancescan-1.16-r1
+++ b/metadata/md5-cache/games-emulation/advancescan-1.16-r1
@@ -4,10 +4,11 @@ DEPEND=dev-libs/expat sys-libs/zlib
 DESCRIPTION=A command line rom manager for MAME, MESS, AdvanceMAME, AdvanceMESS and Raine
 EAPI=7
 HOMEPAGE=http://advancemame.sourceforge.net/scan-readme.html
+INHERIT=autotools
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/expat sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://sourceforge/advancemame/advancescan-1.16.tar.gz https://dev.gentoo.org/~juippis/distfiles/tmp/advancescan-1.16-gcc6.patch
-_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_=65a1d46f6ec209779bcfbcb0daf1011b
diff --git a/metadata/md5-cache/games-emulation/atari800-4.2.0-r1 b/metadata/md5-cache/games-emulation/atari800-4.2.0-r1
index ee73d4b5f084..67b9e05a45af 100644
--- a/metadata/md5-cache/games-emulation/atari800-4.2.0-r1
+++ b/metadata/md5-cache/games-emulation/atari800-4.2.0-r1
@@ -4,6 +4,7 @@ DEPEND=sdl? ( >=media-libs/libsdl-1.2.0[joystick,opengl?,sound?,video] ) !sdl? (
 DESCRIPTION=Atari 800 emulator
 EAPI=7
 HOMEPAGE=https://atari800.github.io/
+INHERIT=autotools desktop
 IUSE=opengl readline +sdl +sound
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
@@ -11,5 +12,5 @@ RDEPEND=sdl? ( >=media-libs/libsdl-1.2.0[joystick,opengl?,sound?,video] ) !sdl?
 REQUIRED_USE=opengl? ( sdl )
 SLOT=0
 SRC_URI=https://github.com/atari800/atari800/releases/download/ATARI800_4_2_0/atari800-4.2.0-src.tgz https://sourceforge.net/projects/atari800/files/ROM/Original%20XL%20ROM/xf25.zip
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5e7a7e8362bd7d4067ffba874e403065
diff --git a/metadata/md5-cache/games-emulation/atari800-5.0.0 b/metadata/md5-cache/games-emulation/atari800-5.0.0
new file mode 100644
index 000000000000..8a8d79cb6b08
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/atari800-5.0.0
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=encode-mp3? ( media-sound/lame ) sdl? ( >=media-libs/libsdl-1.2.0[joystick,opengl?,sound?,video] ) !sdl? ( sys-libs/ncurses:= ) readline? ( sys-libs/readline:= sys-libs/ncurses:= ) media-libs/libpng:= sys-libs/zlib
+DESCRIPTION=Atari 800 emulator
+EAPI=7
+HOMEPAGE=https://atari800.github.io/
+INHERIT=autotools desktop
+IUSE=encode-mp3 opengl readline +sdl +sound
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=encode-mp3? ( media-sound/lame ) sdl? ( >=media-libs/libsdl-1.2.0[joystick,opengl?,sound?,video] ) !sdl? ( sys-libs/ncurses:= ) readline? ( sys-libs/readline:= sys-libs/ncurses:= ) media-libs/libpng:= sys-libs/zlib
+REQUIRED_USE=encode-mp3? ( sound ) opengl? ( sdl )
+SLOT=0
+SRC_URI=https://github.com/atari800/atari800/releases/download/ATARI800_5_0_0/atari800-5.0.0-src.tgz https://sourceforge.net/projects/atari800/files/ROM/Original%20XL%20ROM/xf25.zip
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=505cf670fadb006d62261ac7e23eaf90
diff --git a/metadata/md5-cache/games-emulation/desmume-0.9.11_p20211119 b/metadata/md5-cache/games-emulation/desmume-0.9.11_p20211119
index 923904ea15ae..df866d3bc63b 100644
--- a/metadata/md5-cache/games-emulation/desmume-0.9.11_p20211119
+++ b/metadata/md5-cache/games-emulation/desmume-0.9.11_p20211119
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 media-libs/libsdl2[X,opengl,sound,video] media-libs/libsoundtouch:= net-libs/libpcap sys-libs/zlib:= virtual/opengl x11-libs/agg x11-libs/libX11 gui? ( x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 ) openal? ( media-libs/openal ) !openal? ( media-libs/alsa-lib )
 SLOT=0
 SRC_URI=https://github.com/TASVideos/desmume/archive/b4080b2cae2f8e2700e318b97e369915e8995796.tar.gz -> desmume-0.9.11_p20211119.tar.gz
-_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=35f489dfef0c46e1a70d03092f6a4426
diff --git a/metadata/md5-cache/games-emulation/desmume-0.9.13 b/metadata/md5-cache/games-emulation/desmume-0.9.13
new file mode 100644
index 000000000000..145da91063fe
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/desmume-0.9.13
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=dev-libs/glib:2 media-libs/libsdl2[X,opengl,sound,video] media-libs/libsoundtouch:= net-libs/libpcap sys-libs/zlib:= x11-libs/agg x11-libs/libX11 gui? ( media-libs/libglvnd[X] x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 ) openal? ( media-libs/openal ) !openal? ( media-libs/alsa-lib ) x11-base/xorg-proto
+DESCRIPTION=Nintendo DS emulator
+EAPI=8
+HOMEPAGE=https://desmume.org/
+INHERIT=meson xdg
+IUSE=gdb +gui openal wifi
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 media-libs/libsdl2[X,opengl,sound,video] media-libs/libsoundtouch:= net-libs/libpcap sys-libs/zlib:= x11-libs/agg x11-libs/libX11 gui? ( media-libs/libglvnd[X] x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 ) openal? ( media-libs/openal ) !openal? ( media-libs/alsa-lib )
+SLOT=0
+SRC_URI=https://github.com/TASEmulators/desmume/releases/download/release_0_9_13/desmume-0.9.13.tar.xz
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=f6dcd0e8747571b18441d4a926f36a7d
diff --git a/metadata/md5-cache/games-emulation/dgen-sdl-1.33-r1 b/metadata/md5-cache/games-emulation/dgen-sdl-1.33-r1
index f4e687406cee..a290217da076 100644
--- a/metadata/md5-cache/games-emulation/dgen-sdl-1.33-r1
+++ b/metadata/md5-cache/games-emulation/dgen-sdl-1.33-r1
@@ -4,11 +4,12 @@ DEPEND=media-libs/libsdl[joystick?,opengl?] app-arch/libarchive opengl? ( virtua
 DESCRIPTION=A Linux/SDL-Port of the famous DGen MegaDrive/Genesis-Emulator
 EAPI=7
 HOMEPAGE=http://dgen.sourceforge.net/
+INHERIT=autotools
 IUSE=joystick opengl
 KEYWORDS=~amd64 ~x86
 LICENSE=dgen-sdl BSD BSD-2 free-noncomm LGPL-2.1+ GPL-2+
 RDEPEND=media-libs/libsdl[joystick?,opengl?] app-arch/libarchive opengl? ( virtual/opengl )
 SLOT=0
 SRC_URI=mirror://sourceforge/dgen/files/dgen-sdl-1.33.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_=fb234e7833daf9bb32614398e52c3669
diff --git a/metadata/md5-cache/games-emulation/dolphin-5.0_p20210506-r3 b/metadata/md5-cache/games-emulation/dolphin-5.0_p20210506-r3
index 34ae254a8ec6..e8ebda290f82 100644
--- a/metadata/md5-cache/games-emulation/dolphin-5.0_p20210506-r3
+++ b/metadata/md5-cache/games-emulation/dolphin-5.0_p20210506-r3
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gettext virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=sys-devel/gettext virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=dev-libs/hidapi:0= <dev-libs/libfmt-8.1:0= dev-libs/lzo:2= dev-libs/pugixml:0= media-libs/libpng:0= media-libs/libsfml media-libs/mesa[egl(+)] net-libs/enet:1.3 net-libs/mbedtls:0= net-misc/curl:0= sys-libs/readline:0= sys-libs/zlib:0= x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( media-video/ffmpeg:= ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd:0= ) upnp? ( net-libs/miniupnpc )
 DESCRIPTION=Gamecube and Wii game emulator
@@ -11,5 +11,5 @@ LICENSE=GPL-2+ Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT ZLIB
 RDEPEND=dev-libs/hidapi:0= <dev-libs/libfmt-8.1:0= dev-libs/lzo:2= dev-libs/pugixml:0= media-libs/libpng:0= media-libs/libsfml media-libs/mesa[egl(+)] net-libs/enet:1.3 net-libs/mbedtls:0= net-misc/curl:0= sys-libs/readline:0= sys-libs/zlib:0= x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( media-video/ffmpeg:= ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd:0= ) upnp? ( net-libs/miniupnpc ) vulkan? ( media-libs/vulkan-loader )
 SLOT=0
 SRC_URI=https://github.com/dolphin-emu/dolphin/archive/eb5cd9be78c76b9ccbab9e5fbd1721ef6876cd68.tar.gz -> dolphin-5.0_p20210506.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=62a540a6d21749182768b93318b630f5
diff --git a/metadata/md5-cache/games-emulation/dolphin-5.0_p20220520 b/metadata/md5-cache/games-emulation/dolphin-5.0_p20220520
new file mode 100644
index 000000000000..9a2d970efc52
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/dolphin-5.0_p20220520
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-arch/zstd:= dev-libs/hidapi:= >=dev-libs/libfmt-8:= dev-libs/lzo:= dev-libs/pugixml:= media-libs/cubeb:= media-libs/libpng:= media-libs/libsfml media-libs/mesa[egl(+)] net-libs/enet:1.3 net-libs/mbedtls:= net-misc/curl:= sys-libs/readline:= sys-libs/zlib:=[minizip] x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( media-video/ffmpeg:= ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd:0= ) upnp? ( net-libs/miniupnpc )
+DESCRIPTION=Gamecube and Wii game emulator
+EAPI=7
+HOMEPAGE=https://dolphin-emu.org/
+INHERIT=cmake desktop xdg-utils pax-utils
+IUSE=alsa bluetooth discord-presence doc +evdev ffmpeg +gui log mgba profile pulseaudio systemd upnp vulkan
+KEYWORDS=~amd64 ~arm64
+LICENSE=GPL-2+ BSD BSD-2 LGPL-2.1+ MIT ZLIB
+RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-arch/zstd:= dev-libs/hidapi:= >=dev-libs/libfmt-8:= dev-libs/lzo:= dev-libs/pugixml:= media-libs/cubeb:= media-libs/libpng:= media-libs/libsfml media-libs/mesa[egl(+)] net-libs/enet:1.3 net-libs/mbedtls:= net-misc/curl:= sys-libs/readline:= sys-libs/zlib:=[minizip] x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( media-video/ffmpeg:= ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd:0= ) upnp? ( net-libs/miniupnpc ) vulkan? ( media-libs/vulkan-loader )
+SLOT=0
+SRC_URI=https://github.com/dolphin-emu/dolphin/archive/0f2540a0d1133950467845f20b1e003181147781.tar.gz -> dolphin-5.0_p20220520.tar.gz mgba? ( https://github.com/mgba-emu/mgba/archive/40d4c430fc36caeb7ea32fd39624947ed487d2f2.tar.gz -> mgba-40d4c430fc36caeb7ea32fd39624947ed487d2f2.tar.gz )
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=d486b8b62b7ac3375d09c75c964c6c37
diff --git a/metadata/md5-cache/games-emulation/dolphin-9999 b/metadata/md5-cache/games-emulation/dolphin-9999
index a14bbceea5db..5f6a50bce101 100644
--- a/metadata/md5-cache/games-emulation/dolphin-9999
+++ b/metadata/md5-cache/games-emulation/dolphin-9999
@@ -1,14 +1,14 @@
-BDEPEND=sys-devel/gettext virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/gettext virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/hidapi:0= >=dev-libs/libfmt-7.1:0= dev-libs/lzo:2= dev-libs/pugixml:0= media-libs/libpng:0= media-libs/libsfml media-libs/mesa[egl(+)] net-libs/enet:1.3 net-libs/mbedtls:0= net-misc/curl:0= sys-libs/readline:0= sys-libs/zlib:0= x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( media-video/ffmpeg:= ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd:0= ) upnp? ( net-libs/miniupnpc )
+DEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-arch/zstd:= dev-libs/hidapi:= >=dev-libs/libfmt-8:= dev-libs/lzo:= dev-libs/pugixml:= media-libs/cubeb:= media-libs/libpng:= media-libs/libsfml media-libs/mesa[egl(+)] net-libs/enet:1.3 net-libs/mbedtls:= net-misc/curl:= sys-libs/readline:= sys-libs/zlib:=[minizip] x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( media-video/ffmpeg:= ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd:0= ) upnp? ( net-libs/miniupnpc )
 DESCRIPTION=Gamecube and Wii game emulator
 EAPI=7
 HOMEPAGE=https://dolphin-emu.org/
 INHERIT=cmake desktop xdg-utils pax-utils git-r3
 IUSE=alsa bluetooth discord-presence doc +evdev ffmpeg +gui log mgba profile pulseaudio systemd upnp vulkan
-LICENSE=GPL-2+ Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 ZLIB
+LICENSE=GPL-2+ BSD BSD-2 LGPL-2.1+ MIT ZLIB
 PROPERTIES=live
-RDEPEND=dev-libs/hidapi:0= >=dev-libs/libfmt-7.1:0= dev-libs/lzo:2= dev-libs/pugixml:0= media-libs/libpng:0= media-libs/libsfml media-libs/mesa[egl(+)] net-libs/enet:1.3 net-libs/mbedtls:0= net-misc/curl:0= sys-libs/readline:0= sys-libs/zlib:0= x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( media-video/ffmpeg:= ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd:0= ) upnp? ( net-libs/miniupnpc ) vulkan? ( media-libs/vulkan-loader )
+RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-arch/zstd:= dev-libs/hidapi:= >=dev-libs/libfmt-8:= dev-libs/lzo:= dev-libs/pugixml:= media-libs/cubeb:= media-libs/libpng:= media-libs/libsfml media-libs/mesa[egl(+)] net-libs/enet:1.3 net-libs/mbedtls:= net-misc/curl:= sys-libs/readline:= sys-libs/zlib:=[minizip] x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( media-video/ffmpeg:= ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd:0= ) upnp? ( net-libs/miniupnpc ) vulkan? ( media-libs/vulkan-loader )
 SLOT=0
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3ebd831c781ee31e035206c79d667273
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=d486b8b62b7ac3375d09c75c964c6c37
diff --git a/metadata/md5-cache/games-emulation/dosbox-0.74.3 b/metadata/md5-cache/games-emulation/dosbox-0.74.3
index 503776b6b1e1..1115dc3f3a27 100644
--- a/metadata/md5-cache/games-emulation/dosbox-0.74.3
+++ b/metadata/md5-cache/games-emulation/dosbox-0.74.3
@@ -4,11 +4,12 @@ DEPEND=alsa? ( media-libs/alsa-lib ) opengl? ( virtual/glu virtual/opengl ) debu
 DESCRIPTION=DOS emulator
 EAPI=7
 HOMEPAGE=https://www.dosbox.com/
+INHERIT=autotools desktop
 IUSE=alsa +core-inline debug hardened opengl X
 KEYWORDS=amd64 ~arm ~ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=alsa? ( media-libs/alsa-lib ) opengl? ( virtual/glu virtual/opengl ) debug? ( sys-libs/ncurses:0= ) X? ( x11-libs/libX11 ) media-libs/libpng:0= media-libs/libsdl[joystick,opengl?,video,X?] media-libs/sdl-net media-libs/sdl-sound sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://sourceforge/dosbox/dosbox-0.74-3.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5b07692396fea72205a5013515887ecd
diff --git a/metadata/md5-cache/games-emulation/dosbox-0.75_pre4302 b/metadata/md5-cache/games-emulation/dosbox-0.75_pre4302
index f5b69e57fdce..cdabcfdd9e93 100644
--- a/metadata/md5-cache/games-emulation/dosbox-0.75_pre4302
+++ b/metadata/md5-cache/games-emulation/dosbox-0.75_pre4302
@@ -4,11 +4,12 @@ DEPEND=alsa? ( media-libs/alsa-lib ) glide? ( media-libs/openglide ) opengl? ( v
 DESCRIPTION=DOS emulator
 EAPI=7
 HOMEPAGE=https://www.dosbox.com/
+INHERIT=autotools desktop flag-o-matic
 IUSE=alsa +core-inline debug glide hardened opengl X
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=alsa? ( media-libs/alsa-lib ) glide? ( media-libs/openglide ) opengl? ( virtual/glu virtual/opengl ) debug? ( sys-libs/ncurses:0= ) X? ( x11-libs/libX11 ) media-libs/libpng:0= media-libs/libsdl[joystick,opengl?,video,X?] media-libs/sdl-net media-libs/sdl-sound sys-libs/zlib
 SLOT=0
 SRC_URI=https://sourceforge.net/code-snapshots/svn/d/do/dosbox/code-0/dosbox-code-0-r4302-dosbox-trunk.zip glide? ( https://raw.githubusercontent.com/voyageur/openglide/841e1071597b64ead14dd08c25a03206b2d1d1b6/platform/dosbox/dosbox_glide.diff -> dosbox_glide-841e1071597b64ead14dd08c25a03206b2d1d1b6.diff )
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=9a42b8a26b42c98e80d38164d46afafc
diff --git a/metadata/md5-cache/games-emulation/dosbox-9999 b/metadata/md5-cache/games-emulation/dosbox-9999
index 2202802f28a4..5ae5c12debe9 100644
--- a/metadata/md5-cache/games-emulation/dosbox-9999
+++ b/metadata/md5-cache/games-emulation/dosbox-9999
@@ -4,11 +4,12 @@ DEPEND=alsa? ( media-libs/alsa-lib ) glide? ( media-libs/openglide ) opengl? ( v
 DESCRIPTION=DOS emulator
 EAPI=7
 HOMEPAGE=https://www.dosbox.com/
+INHERIT=autotools desktop flag-o-matic subversion
 IUSE=alsa +core-inline debug glide hardened opengl X
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=alsa? ( media-libs/alsa-lib ) glide? ( media-libs/openglide ) opengl? ( virtual/glu virtual/opengl ) debug? ( sys-libs/ncurses:0= ) X? ( x11-libs/libX11 ) media-libs/libpng:0= media-libs/libsdl[joystick,opengl?,video,X?] media-libs/sdl-net media-libs/sdl-sound sys-libs/zlib
 SLOT=0
 SRC_URI=glide? ( https://raw.githubusercontent.com/voyageur/openglide/6a01f554fad979cf34d3ff07c9579192c88086c3/platform/dosbox/dosbox_glide.diff -> dosbox_glide-6a01f554fad979cf34d3ff07c9579192c88086c3.diff )
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	subversion	dee31e56422214d05644c2a3c900a148	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	subversion	dee31e56422214d05644c2a3c900a148	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=c73fe8a42f4ed90f6e363be899e2f162
diff --git a/metadata/md5-cache/games-emulation/dosbox-staging-0.76.0 b/metadata/md5-cache/games-emulation/dosbox-staging-0.76.0
index cf131054e7a9..9494b7c7e959 100644
--- a/metadata/md5-cache/games-emulation/dosbox-staging-0.76.0
+++ b/metadata/md5-cache/games-emulation/dosbox-staging-0.76.0
@@ -4,11 +4,12 @@ DEPEND=alsa? ( media-libs/alsa-lib ) debug? ( sys-libs/ncurses:0= ) fluidsynth?
 DESCRIPTION=Modernized DOSBox soft-fork
 EAPI=7
 HOMEPAGE=https://dosbox-staging.github.io/
+INHERIT=autotools desktop flag-o-matic xdg
 IUSE=+alsa debug dynrec +fluidsynth network opengl opus
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=alsa? ( media-libs/alsa-lib ) debug? ( sys-libs/ncurses:0= ) fluidsynth? ( media-sound/fluid-soundfont media-sound/fluidsynth ) network? ( media-libs/sdl2-net ) opengl? ( virtual/opengl ) opus? ( media-libs/opusfile ) media-libs/libpng:0= media-libs/libsdl2[joystick,opengl?,video,X] sys-libs/zlib !games-emulation/dosbox
 SLOT=0
 SRC_URI=https://github.com/dosbox-staging/dosbox-staging/archive/v0.76.0.tar.gz -> dosbox-staging-0.76.0.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=780c9ba6d1638261f1d41e803dbedbae
diff --git a/metadata/md5-cache/games-emulation/dosbox-staging-0.77.0-r1 b/metadata/md5-cache/games-emulation/dosbox-staging-0.77.0-r1
index fc2eddda5889..2f0ec5c4ce2e 100644
--- a/metadata/md5-cache/games-emulation/dosbox-staging-0.77.0-r1
+++ b/metadata/md5-cache/games-emulation/dosbox-staging-0.77.0-r1
@@ -11,5 +11,5 @@ LICENSE=GPL-2+
 RDEPEND=alsa? ( media-libs/alsa-lib ) debug? ( sys-libs/ncurses:0= ) fluidsynth? ( media-sound/fluid-soundfont media-sound/fluidsynth ) mt-32? ( media-libs/munt-mt32emu ) network? ( media-libs/sdl2-net ) opengl? ( virtual/opengl ) media-libs/libpng:0= media-libs/libsdl2[joystick,opengl?,video,X] media-libs/opusfile sys-libs/zlib !games-emulation/dosbox
 SLOT=0
 SRC_URI=https://github.com/dosbox-staging/dosbox-staging/archive/v0.77.0.tar.gz -> dosbox-staging-0.77.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=557cc0ac63eeec6fcbc07838a76a6ed1
diff --git a/metadata/md5-cache/games-emulation/dosbox-staging-0.77.1 b/metadata/md5-cache/games-emulation/dosbox-staging-0.77.1
index b9f0247972ad..4c4232e739d3 100644
--- a/metadata/md5-cache/games-emulation/dosbox-staging-0.77.1
+++ b/metadata/md5-cache/games-emulation/dosbox-staging-0.77.1
@@ -12,5 +12,5 @@ RDEPEND=alsa? ( media-libs/alsa-lib ) debug? ( sys-libs/ncurses:0= ) fluidsynth?
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dosbox-staging/dosbox-staging/archive/v0.77.1.tar.gz -> dosbox-staging-0.77.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=4c00706a9423e60361ee575cc1a9bdd4
diff --git a/metadata/md5-cache/games-emulation/dosbox-staging-0.78.0 b/metadata/md5-cache/games-emulation/dosbox-staging-0.78.0
index ed56bef0fbc6..5bc15ad9db58 100644
--- a/metadata/md5-cache/games-emulation/dosbox-staging-0.78.0
+++ b/metadata/md5-cache/games-emulation/dosbox-staging-0.78.0
@@ -12,5 +12,5 @@ RDEPEND=alsa? ( media-libs/alsa-lib ) debug? ( sys-libs/ncurses:0= ) fluidsynth?
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dosbox-staging/dosbox-staging/archive/v0.78.0.tar.gz -> dosbox-staging-0.78.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=9a8b174cf7acc9e44c3cafff84215de4
diff --git a/metadata/md5-cache/games-emulation/dosbox-staging-0.78.1 b/metadata/md5-cache/games-emulation/dosbox-staging-0.78.1
index 0c1ef7a9c655..502f38fc0677 100644
--- a/metadata/md5-cache/games-emulation/dosbox-staging-0.78.1
+++ b/metadata/md5-cache/games-emulation/dosbox-staging-0.78.1
@@ -12,5 +12,5 @@ RDEPEND=alsa? ( media-libs/alsa-lib ) debug? ( sys-libs/ncurses:0= ) fluidsynth?
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dosbox-staging/dosbox-staging/archive/v0.78.1.tar.gz -> dosbox-staging-0.78.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=c2f343e01df3a33e0a6a5babba75cc35
diff --git a/metadata/md5-cache/games-emulation/fbzx-4.8.0 b/metadata/md5-cache/games-emulation/fbzx-4.8.0
index 5415040b5f1c..62e16e75d323 100644
--- a/metadata/md5-cache/games-emulation/fbzx-4.8.0
+++ b/metadata/md5-cache/games-emulation/fbzx-4.8.0
@@ -4,11 +4,12 @@ DEPEND=media-libs/libsdl2[joystick,video] alsa? ( media-libs/alsa-lib ) pulseaud
 DESCRIPTION=Full Screen Sinclair Spectrum emulator
 EAPI=7
 HOMEPAGE=http://www.rastersoft.com/programas/fbzx.html
+INHERIT=desktop toolchain-funcs
 IUSE=alsa pulseaudio
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=media-libs/libsdl2[joystick,video] alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio )
 SLOT=0
 SRC_URI=http://www.rastersoft.com/descargas/fbzx/fbzx_4.8.0.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=37989593b02e6022026091a15738fd49
diff --git a/metadata/md5-cache/games-emulation/fceux-2.6.4 b/metadata/md5-cache/games-emulation/fceux-2.6.4
index bb354823f249..c4bc57d9a728 100644
--- a/metadata/md5-cache/games-emulation/fceux-2.6.4
+++ b/metadata/md5-cache/games-emulation/fceux-2.6.4
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
 DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5[-gles2-only] dev-qt/qtwidgets:5 media-libs/libglvnd media-libs/libsdl2[joystick,sound,threads,video] sys-libs/zlib:=[minizip] ffmpeg? ( media-video/ffmpeg:= ) x264? ( media-libs/x264:= ) x265? ( media-libs/x265:= )
 DESCRIPTION=Portable Famicom/NES emulator, an evolution of the original FCE Ultra
@@ -12,5 +12,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-qt/qtcore:5 dev-qt/qt
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/fceultra/fceux-2.6.4.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=0c9468382109229893d38bf5e67c088a
diff --git a/metadata/md5-cache/games-emulation/gcube-0.4-r2 b/metadata/md5-cache/games-emulation/gcube-0.4-r2
index e25352c4ab59..e78c641e9bb8 100644
--- a/metadata/md5-cache/games-emulation/gcube-0.4-r2
+++ b/metadata/md5-cache/games-emulation/gcube-0.4-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=virtual/opengl media-libs/libsdl[joystick,opengl,sound,video] virtual/jpeg:0 sys-libs/ncurses:0= sys-libs/zlib
 SLOT=0
 SRC_URI=http://gcube.exemu.net/downloads/gcube-0.4-src.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=cd56f5f6313b06c3ae2b570f495e0ea3
diff --git a/metadata/md5-cache/games-emulation/generator-0.35_p4-r1 b/metadata/md5-cache/games-emulation/generator-0.35_p4-r1
index 45ccb3db9eea..ab4cdac9dcce 100644
--- a/metadata/md5-cache/games-emulation/generator-0.35_p4-r1
+++ b/metadata/md5-cache/games-emulation/generator-0.35_p4-r1
@@ -4,11 +4,12 @@ DEPEND=virtual/jpeg:0 media-libs/libsdl[joystick,video] sdlaudio? ( media-libs/l
 DESCRIPTION=Sega Genesis / Mega Drive emulator
 EAPI=7
 HOMEPAGE=http://www.squish.net/generator/
+INHERIT=autotools toolchain-funcs
 IUSE=+sdlaudio
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/jpeg:0 media-libs/libsdl[joystick,video] sdlaudio? ( media-libs/libsdl[sound] )
 SLOT=0
 SRC_URI=http://www.squish.net/generator/cbiere/generator/generator-0.35-cbiere-r4.tar.bz2
-_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_=047a7649103a9ebf3cb39a6439e1988a
diff --git a/metadata/md5-cache/games-emulation/gens-2.15.5-r2 b/metadata/md5-cache/games-emulation/gens-2.15.5-r2
index 4dd18f08da99..4c59837f4574 100644
--- a/metadata/md5-cache/games-emulation/gens-2.15.5-r2
+++ b/metadata/md5-cache/games-emulation/gens-2.15.5-r2
@@ -4,10 +4,11 @@ DEPEND=media-libs/libsdl[abi_x86_32(-),joystick,video] sys-libs/zlib:=[abi_x86_3
 DESCRIPTION=Sega Genesis/CD/32X emulator
 EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/gens/
+INHERIT=desktop flag-o-matic multilib
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[abi_x86_32(-),joystick,video] sys-libs/zlib:=[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/gtk+:2[abi_x86_32(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/gens/gens-2.15.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6cdb545f3b84b24e0ff87e515bdbccb7
diff --git a/metadata/md5-cache/games-emulation/gngb-20060309-r1 b/metadata/md5-cache/games-emulation/gngb-20060309-r1
index 3e62c6b7179c..a9d596bfa04e 100644
--- a/metadata/md5-cache/games-emulation/gngb-20060309-r1
+++ b/metadata/md5-cache/games-emulation/gngb-20060309-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[sound,joystick,video] sys-libs/zlib app-arch/bzip2 opengl? ( virtual/opengl )
 SLOT=0
 SRC_URI=http://m.peponas.free.fr/gngb/download/gngb-20060309.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=f43ddc01ad1899d49718eceaec333475
diff --git a/metadata/md5-cache/games-emulation/gngeo-0.8-r2 b/metadata/md5-cache/games-emulation/gngeo-0.8-r2
index 3e84aaa5265b..21b0047c5e0b 100644
--- a/metadata/md5-cache/games-emulation/gngeo-0.8-r2
+++ b/metadata/md5-cache/games-emulation/gngeo-0.8-r2
@@ -4,10 +4,11 @@ DEPEND=media-libs/libsdl[joystick,opengl,sound,video] sys-libs/zlib[minizip] vir
 DESCRIPTION=A NeoGeo emulator
 EAPI=7
 HOMEPAGE=https://code.google.com/p/gngeo/
+INHERIT=autotools desktop flag-o-matic
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[joystick,opengl,sound,video] sys-libs/zlib[minizip] virtual/opengl
 SLOT=0
 SRC_URI=https://gngeo.googlecode.com/files/gngeo-0.8.tar.gz https://storage.googleapis.com/google-code-archive/v2/code.google.com/gngeo/logo.png -> gngeo.png
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=386d81bc4fd77522f9b9b42e57f181cd
diff --git a/metadata/md5-cache/games-emulation/gnuboy-1.0.3-r4 b/metadata/md5-cache/games-emulation/gnuboy-1.0.3-r4
index a42e80d1b611..084a6ea0e956 100644
--- a/metadata/md5-cache/games-emulation/gnuboy-1.0.3-r4
+++ b/metadata/md5-cache/games-emulation/gnuboy-1.0.3-r4
@@ -4,6 +4,7 @@ DEPEND=X? ( x11-libs/libX11 x11-libs/libXext ) sdl? ( media-libs/libsdl[joystick
 DESCRIPTION=Gameboy emulator with multiple renderers
 EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/gnuboy/
+INHERIT=autotools
 IUSE=X +sdl
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -11,5 +12,5 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libXext ) sdl? ( media-libs/libsdl[joystic
 REQUIRED_USE=!X? ( sdl )
 SLOT=0
 SRC_URI=mirror://gentoo/gnuboy-1.0.3.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_=8e6149bc64a7f1b0067b6c6aa6ff5a0f
diff --git a/metadata/md5-cache/games-emulation/hatari-2.3.1-r1 b/metadata/md5-cache/games-emulation/hatari-2.3.1-r1
index f29fbd5a1e79..44e264d2bcba 100644
--- a/metadata/md5-cache/games-emulation/hatari-2.3.1-r1
+++ b/metadata/md5-cache/games-emulation/hatari-2.3.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
 DEPEND=media-libs/libsdl2[X?,joystick,sound,video] X? ( x11-libs/libX11 ) capsimage? ( >=dev-libs/spsdeclib-5.1-r1 ) microphone? ( media-libs/portaudio ) png? ( media-libs/libpng:= ) portmidi? ( media-libs/portmidi ) readline? ( sys-libs/readline:= ) udev? ( virtual/udev ) zlib? ( sys-libs/zlib:= ) X? ( x11-base/xorg-proto )
 DESCRIPTION=Atari ST emulator
@@ -12,5 +12,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://download.tuxfamily.org/hatari/2.3.1/hatari-2.3.1.tar.bz2
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d920f2a21496404fcede57170a8b1f72
diff --git a/metadata/md5-cache/games-emulation/higan-116_pre20210818 b/metadata/md5-cache/games-emulation/higan-116_pre20210818
index 2142661a921c..a4a73ff2a6a2 100644
--- a/metadata/md5-cache/games-emulation/higan-116_pre20210818
+++ b/metadata/md5-cache/games-emulation/higan-116_pre20210818
@@ -4,11 +4,12 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr alsa? ( media-libs/al
 DESCRIPTION=Multi-system emulator focused on accuracy, preservation, and configurability
 EAPI=8
 HOMEPAGE=https://github.com/higan-emu/higan
+INHERIT=desktop toolchain-funcs
 IUSE=alsa ao +gtk openal +opengl oss +pulseaudio +sdl udev xv
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+ ISC
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2[joystick] ) udev? ( virtual/libudev:= ) xv? ( x11-libs/libXv ) gtk? ( dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/gtksourceview:3.0= x11-libs/pango ) !gtk? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 SLOT=0
 SRC_URI=https://github.com/higan-emu/higan/archive/9bf1b3314b2bcc73cbc11d344b369c31562aff10.tar.gz -> higan-116_pre20210818.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b8a09200de380eea94f0f999638e4e76
diff --git a/metadata/md5-cache/games-emulation/jrommanager-1.8_p27-r1 b/metadata/md5-cache/games-emulation/jrommanager-1.8_p27-r1
index f9f21a067677..df76577b696a 100644
--- a/metadata/md5-cache/games-emulation/jrommanager-1.8_p27-r1
+++ b/metadata/md5-cache/games-emulation/jrommanager-1.8_p27-r1
@@ -4,10 +4,11 @@ DEPEND=>=virtual/jre-1.8:1.8
 DESCRIPTION=A Mame and Retrogaming Rom Manager, Java alternative to ClrMamePro
 EAPI=7
 HOMEPAGE=https://github.com/optyfr/JRomManager
+INHERIT=desktop
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 GPL-2-with-classpath-exception BSD-2 MIT Apache-2.0 LGPL-2.1 unRAR
 RDEPEND=>=virtual/jre-1.8:1.8
 SLOT=0
 SRC_URI=https://github.com/optyfr/JRomManager/releases/download/1.8b27/JRomManager-1.8b27.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa
 _md5_=e21ee76a40de37cd67bbc0b2d37ba9dc
diff --git a/metadata/md5-cache/games-emulation/libretro-bnes-0.0.1_pre20180723 b/metadata/md5-cache/games-emulation/libretro-bnes-0.0.1_pre20180723
index 2b9f98dc6275..141c8f686f53 100644
--- a/metadata/md5-cache/games-emulation/libretro-bnes-0.0.1_pre20180723
+++ b/metadata/md5-cache/games-emulation/libretro-bnes-0.0.1_pre20180723
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install prepare unpack
 DESCRIPTION=bNES libretro port
 EAPI=7
 HOMEPAGE=https://github.com/libretro/bnes-libretro
+INHERIT=libretro-core
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 SLOT=0
 SRC_URI=https://github.com/libretro/bnes-libretro/archive/18384086d58fd09de3844e2c5f3b2a77b5d490dc.tar.gz -> libretro-bnes-0.0.1_pre20180723.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	libretro-core	d5f30fa5171e2dbcc07c0b8d1b4f83a2	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	libretro-core	d5f30fa5171e2dbcc07c0b8d1b4f83a2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=33ea712d8c0b638a6c2dbecc837c117e
diff --git a/metadata/md5-cache/games-emulation/libretro-bnes-9999 b/metadata/md5-cache/games-emulation/libretro-bnes-9999
index c4d8c1736e49..f916296ae069 100644
--- a/metadata/md5-cache/games-emulation/libretro-bnes-9999
+++ b/metadata/md5-cache/games-emulation/libretro-bnes-9999
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile install prepare unpack
 DESCRIPTION=bNES libretro port
 EAPI=7
 HOMEPAGE=https://github.com/libretro/bnes-libretro
+INHERIT=libretro-core
 IUSE=debug
 LICENSE=GPL-3+
 PROPERTIES=live
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	libretro-core	d5f30fa5171e2dbcc07c0b8d1b4f83a2	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	libretro-core	d5f30fa5171e2dbcc07c0b8d1b4f83a2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=aaa4e5e8928d82ced7f00039d36ac02a
diff --git a/metadata/md5-cache/games-emulation/libretro-dosbox-0.0.1_pre20180723 b/metadata/md5-cache/games-emulation/libretro-dosbox-0.0.1_pre20180723
index 4e81b1db5850..a7a0192e1462 100644
--- a/metadata/md5-cache/games-emulation/libretro-dosbox-0.0.1_pre20180723
+++ b/metadata/md5-cache/games-emulation/libretro-dosbox-0.0.1_pre20180723
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install prepare unpack
 DESCRIPTION=DOSBox libretro port
 EAPI=7
 HOMEPAGE=https://github.com/libretro/dosbox-libretro
+INHERIT=flag-o-matic libretro-core
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://github.com/libretro/dosbox-libretro/archive/169d476437ec813b462a47254f24cf78473389c8.tar.gz -> libretro-dosbox-0.0.1_pre20180723.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	libretro-core	d5f30fa5171e2dbcc07c0b8d1b4f83a2	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	libretro-core	d5f30fa5171e2dbcc07c0b8d1b4f83a2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=4a06b3832b9ff38a7b304938725cf1a6
diff --git a/metadata/md5-cache/games-emulation/libretro-dosbox-9999 b/metadata/md5-cache/games-emulation/libretro-dosbox-9999
index abb6ffc74756..f0a6f9c47772 100644
--- a/metadata/md5-cache/games-emulation/libretro-dosbox-9999
+++ b/metadata/md5-cache/games-emulation/libretro-dosbox-9999
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile install prepare unpack
 DESCRIPTION=DOSBox libretro port
 EAPI=7
 HOMEPAGE=https://github.com/libretro/dosbox-libretro
+INHERIT=libretro-core flag-o-matic
 IUSE=debug
 LICENSE=GPL-2+
 PROPERTIES=live
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	libretro-core	d5f30fa5171e2dbcc07c0b8d1b4f83a2	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	libretro-core	d5f30fa5171e2dbcc07c0b8d1b4f83a2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=d22fcfe3f79a258c1598350153df7e8c
diff --git a/metadata/md5-cache/games-emulation/libretro-fceumm-0.0.1_pre20180723 b/metadata/md5-cache/games-emulation/libretro-fceumm-0.0.1_pre20180723
index baea89a10058..3fc3ec05de1a 100644
--- a/metadata/md5-cache/games-emulation/libretro-fceumm-0.0.1_pre20180723
+++ b/metadata/md5-cache/games-emulation/libretro-fceumm-0.0.1_pre20180723
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install prepare unpack
 DESCRIPTION=FCEUmm libretro port
 EAPI=7
 HOMEPAGE=https://github.com/libretro/libretro-fceumm
+INHERIT=libretro-core
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://github.com/libretro/libretro-fceumm/archive/67c072617b700560acbfea54f2779cb290dbf827.tar.gz -> libretro-fceumm-0.0.1_pre20180723.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	libretro-core	d5f30fa5171e2dbcc07c0b8d1b4f83a2	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	libretro-core	d5f30fa5171e2dbcc07c0b8d1b4f83a2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=667a9b4787f67b3656ffb8b617de493c
diff --git a/metadata/md5-cache/games-emulation/libretro-fceumm-9999 b/metadata/md5-cache/games-emulation/libretro-fceumm-9999
index 7c3a7c86922d..9620c74907a9 100644
--- a/metadata/md5-cache/games-emulation/libretro-fceumm-9999
+++ b/metadata/md5-cache/games-emulation/libretro-fceumm-9999
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile install prepare unpack
 DESCRIPTION=FCEUmm libretro port
 EAPI=7
 HOMEPAGE=https://github.com/libretro/libretro-fceumm
+INHERIT=libretro-core
 IUSE=debug
 LICENSE=GPL-2+
 PROPERTIES=live
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	libretro-core	d5f30fa5171e2dbcc07c0b8d1b4f83a2	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	libretro-core	d5f30fa5171e2dbcc07c0b8d1b4f83a2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=ffc8e5e57460a2faf7fe37cb34de1fbc
diff --git a/metadata/md5-cache/games-emulation/libretro-nestopia-0.0.1_pre20180723 b/metadata/md5-cache/games-emulation/libretro-nestopia-0.0.1_pre20180723
index bea241f27f7d..de9c7a44b1d4 100644
--- a/metadata/md5-cache/games-emulation/libretro-nestopia-0.0.1_pre20180723
+++ b/metadata/md5-cache/games-emulation/libretro-nestopia-0.0.1_pre20180723
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install prepare unpack
 DESCRIPTION=Nestopia libretro port
 EAPI=7
 HOMEPAGE=https://github.com/libretro/nestopia
+INHERIT=libretro-core
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://github.com/libretro/nestopia/archive/9c335527c5dfa11dfa29bc22ee4ba6efa23c8890.tar.gz -> libretro-nestopia-0.0.1_pre20180723.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	libretro-core	d5f30fa5171e2dbcc07c0b8d1b4f83a2	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	libretro-core	d5f30fa5171e2dbcc07c0b8d1b4f83a2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=659d7dbc03d372028607845cbc413fd2
diff --git a/metadata/md5-cache/games-emulation/libretro-nestopia-9999 b/metadata/md5-cache/games-emulation/libretro-nestopia-9999
index cc6417643035..aa1319a55b16 100644
--- a/metadata/md5-cache/games-emulation/libretro-nestopia-9999
+++ b/metadata/md5-cache/games-emulation/libretro-nestopia-9999
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile install prepare unpack
 DESCRIPTION=Nestopia libretro port
 EAPI=7
 HOMEPAGE=https://github.com/libretro/nestopia
+INHERIT=libretro-core
 IUSE=debug
 LICENSE=GPL-2+
 PROPERTIES=live
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	libretro-core	d5f30fa5171e2dbcc07c0b8d1b4f83a2	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	libretro-core	d5f30fa5171e2dbcc07c0b8d1b4f83a2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=8269d3d24493d6e263aef16908c8a39b
diff --git a/metadata/md5-cache/games-emulation/libretro-snes9x-0.0.2_pre20200107 b/metadata/md5-cache/games-emulation/libretro-snes9x-0.0.2_pre20200107
index a605c3100093..7ab2439a2f3b 100644
--- a/metadata/md5-cache/games-emulation/libretro-snes9x-0.0.2_pre20200107
+++ b/metadata/md5-cache/games-emulation/libretro-snes9x-0.0.2_pre20200107
@@ -3,11 +3,12 @@ DEPEND=!>=games-emulation/snes9x-1.60[libretro]
 DESCRIPTION=Snes9x libretro port
 EAPI=7
 HOMEPAGE=https://github.com/libretro/snes9x
+INHERIT=libretro-core
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=Snes9x GPL-2 GPL-2+ LGPL-2.1 LGPL-2.1+ ISC MIT ZLIB Info-ZIP
 RESTRICT=bindist
 SLOT=0
 SRC_URI=https://github.com/libretro/snes9x/archive/6db918cfe32b157239da44096091c212fdfb3b60.tar.gz -> libretro-snes9x-0.0.2_pre20200107.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	libretro-core	d5f30fa5171e2dbcc07c0b8d1b4f83a2	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	libretro-core	d5f30fa5171e2dbcc07c0b8d1b4f83a2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=194205f1d1f8991a9d9696119a657692
diff --git a/metadata/md5-cache/games-emulation/libretro-snes9x-9999 b/metadata/md5-cache/games-emulation/libretro-snes9x-9999
index 691c7445caaa..6e2459860a8a 100644
--- a/metadata/md5-cache/games-emulation/libretro-snes9x-9999
+++ b/metadata/md5-cache/games-emulation/libretro-snes9x-9999
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile install prepare unpack
 DESCRIPTION=Snes9x libretro port
 EAPI=7
 HOMEPAGE=https://github.com/libretro/snes9x
+INHERIT=libretro-core
 IUSE=debug
 LICENSE=Snes9x GPL-2 GPL-2+ LGPL-2.1 LGPL-2.1+ ISC MIT ZLIB Info-ZIP
 PROPERTIES=live
 RESTRICT=bindist
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	libretro-core	d5f30fa5171e2dbcc07c0b8d1b4f83a2	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	libretro-core	d5f30fa5171e2dbcc07c0b8d1b4f83a2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=f424f2ed2816132b3026851d20c8fb66
diff --git a/metadata/md5-cache/games-emulation/libretro-twentyfortyeight-0.0.1_pre20180723 b/metadata/md5-cache/games-emulation/libretro-twentyfortyeight-0.0.1_pre20180723
index b05cab0a7607..8469d6059132 100644
--- a/metadata/md5-cache/games-emulation/libretro-twentyfortyeight-0.0.1_pre20180723
+++ b/metadata/md5-cache/games-emulation/libretro-twentyfortyeight-0.0.1_pre20180723
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install prepare unpack
 DESCRIPTION=Port of 2048 puzzle game to the libretro API
 EAPI=7
 HOMEPAGE=https://github.com/libretro/libretro-2048
+INHERIT=libretro-core
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=Unlicense
 SLOT=0
 SRC_URI=https://github.com/libretro/libretro-2048/archive/45655d3662e4cbcd8afb28e2ee3f5494a75888de.tar.gz -> libretro-twentyfortyeight-0.0.1_pre20180723.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	libretro-core	d5f30fa5171e2dbcc07c0b8d1b4f83a2	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	libretro-core	d5f30fa5171e2dbcc07c0b8d1b4f83a2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=2812a724e4a6a6e21d3e78a867e92734
diff --git a/metadata/md5-cache/games-emulation/libretro-twentyfortyeight-9999 b/metadata/md5-cache/games-emulation/libretro-twentyfortyeight-9999
index d3a841603bd3..025c8651e500 100644
--- a/metadata/md5-cache/games-emulation/libretro-twentyfortyeight-9999
+++ b/metadata/md5-cache/games-emulation/libretro-twentyfortyeight-9999
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile install prepare unpack
 DESCRIPTION=Port of 2048 puzzle game to the libretro API
 EAPI=7
 HOMEPAGE=https://github.com/libretro/libretro-2048
+INHERIT=libretro-core
 IUSE=debug
 LICENSE=Unlicense
 PROPERTIES=live
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	libretro-core	d5f30fa5171e2dbcc07c0b8d1b4f83a2	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	libretro-core	d5f30fa5171e2dbcc07c0b8d1b4f83a2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=2710e91eaac217872b577cb988b862ef
diff --git a/metadata/md5-cache/games-emulation/lxdream-0.9.1-r3 b/metadata/md5-cache/games-emulation/lxdream-0.9.1-r3
index a40304b51902..64c2ef6b54d4 100644
--- a/metadata/md5-cache/games-emulation/lxdream-0.9.1-r3
+++ b/metadata/md5-cache/games-emulation/lxdream-0.9.1-r3
@@ -4,11 +4,12 @@ DEPEND=app-misc/lirc media-libs/alsa-lib media-libs/libpng:0= virtual/opengl x11
 DESCRIPTION=An emulator for the Sega Dreamcast system
 EAPI=7
 HOMEPAGE=https://github.com/lxdream/lxdream
+INHERIT=flag-o-matic xdg
 IUSE=debug profile pulseaudio sdl
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-misc/lirc media-libs/alsa-lib media-libs/libpng:0= virtual/opengl x11-libs/gtk+:2 pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl[sound] )
 SLOT=0
 SRC_URI=http://www.lxdream.org/count.php?file=lxdream-0.9.1.tar.gz -> lxdream-0.9.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=5801b7c4f82e8e7da44cbbf84e7097e9
diff --git a/metadata/md5-cache/games-emulation/m64py-0.2.5 b/metadata/md5-cache/games-emulation/m64py-0.2.5
index 08869d90ce8a..4e042e074209 100644
--- a/metadata/md5-cache/games-emulation/m64py-0.2.5
+++ b/metadata/md5-cache/games-emulation/m64py-0.2.5
@@ -11,5 +11,5 @@ RDEPEND=dev-python/PyQt5[gui,opengl,widgets,python_targets_python3_8(-)?,python_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/m64py/m64py-0.2.5/m64py-0.2.5.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	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=2587d552a08416f0303f666d1c225731
diff --git a/metadata/md5-cache/games-emulation/m64py-0.2.5_p20211222 b/metadata/md5-cache/games-emulation/m64py-0.2.5_p20211222
new file mode 100644
index 000000000000..547515cd3141
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/m64py-0.2.5_p20211222
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/linguist-tools:5 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 postinst postrm prepare test
+DESCRIPTION=A frontend for Mupen64Plus
+EAPI=8
+HOMEPAGE=http://m64py.sourceforge.net/ https://github.com/mupen64plus/mupen64plus-ui-python/
+INHERIT=distutils-r1 qmake-utils xdg-utils
+IUSE=7z rar python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 LGPL-3 public-domain GPL-2 BSD CC-BY-SA-3.0
+RDEPEND=dev-python/PyQt5[gui,opengl,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PySDL2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/libsdl2[joystick,video] >=games-emulation/mupen64plus-core-2.5:0/2-sdl2 7z? ( app-arch/p7zip ) rar? ( || ( dev-python/rarfile[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] app-arch/unrar app-arch/rar ) ) 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 )
+SLOT=0
+SRC_URI=https://github.com/mupen64plus/mupen64plus-ui-python/archive/e24679436a93e8aae0aa664dc4b2dea40d8236c1.tar.gz -> mupen64plus-ui-python-e24679436a93e8aae0aa664dc4b2dea40d8236c1.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=a3cbd89b4f42b7b9a69a1dbef4865439
diff --git a/metadata/md5-cache/games-emulation/mamory-0.2.25-r1 b/metadata/md5-cache/games-emulation/mamory-0.2.25-r1
index d67448563dd7..27d53e9b3de7 100644
--- a/metadata/md5-cache/games-emulation/mamory-0.2.25-r1
+++ b/metadata/md5-cache/games-emulation/mamory-0.2.25-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/expat
 SLOT=0
 SRC_URI=mirror://sourceforge/mamory/mamory-0.2.25.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=91c81601ac19179dc51415972b680514
diff --git a/metadata/md5-cache/games-emulation/mednafen-1.29.0 b/metadata/md5-cache/games-emulation/mednafen-1.29.0
index 89fffaf3d49f..d491ee19d50a 100644
--- a/metadata/md5-cache/games-emulation/mednafen-1.29.0
+++ b/metadata/md5-cache/games-emulation/mednafen-1.29.0
@@ -4,11 +4,12 @@ DEPEND=app-arch/zstd:= dev-libs/lzo:2 dev-libs/trio media-libs/libsdl2[joystick,
 DESCRIPTION=Argument-driven multi-system emulator utilizing OpenGL and SDL
 EAPI=8
 HOMEPAGE=https://mednafen.github.io/
+INHERIT=autotools flag-o-matic pax-utils toolchain-funcs
 IUSE=alsa cpu_flags_ppc_altivec flac jack
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-arch/zstd:= dev-libs/lzo:2 dev-libs/trio media-libs/libsdl2[joystick,opengl,video] media-libs/tremor media-sound/musepack-tools sys-libs/zlib:=[minizip] virtual/libintl alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) jack? ( virtual/jack )
 SLOT=0
 SRC_URI=https://mednafen.github.io/releases/files/mednafen-1.29.0.tar.xz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=161a89ae3506c4feca20577c02544383
diff --git a/metadata/md5-cache/games-emulation/melonds-0.9.3-r2 b/metadata/md5-cache/games-emulation/melonds-0.9.3-r2
index 10b3e8b5239d..6cc7d1806924 100644
--- a/metadata/md5-cache/games-emulation/melonds-0.9.3-r2
+++ b/metadata/md5-cache/games-emulation/melonds-0.9.3-r2
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=app-arch/libarchive dev-libs/teakra dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libsdl2[sound,video] net-libs/libpcap net-libs/libslirp opengl? ( media-libs/libepoxy )
 DESCRIPTION=Nintendo DS emulator, sorta
@@ -11,5 +11,5 @@ LICENSE=BSD-2 GPL-2 GPL-3 Unlicense
 RDEPEND=app-arch/libarchive dev-libs/teakra dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libsdl2[sound,video] net-libs/libpcap net-libs/libslirp opengl? ( media-libs/libepoxy )
 SLOT=0
 SRC_URI=https://github.com/Arisotura/melonDS/archive/0.9.3.tar.gz -> melonDS-0.9.3.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=8dad3bf9c0ed5477142b08592d0708f6
diff --git a/metadata/md5-cache/games-emulation/melonds-0.9.4_p1-r1 b/metadata/md5-cache/games-emulation/melonds-0.9.4_p1-r1
index b45c47def36f..80d5f8460187 100644
--- a/metadata/md5-cache/games-emulation/melonds-0.9.4_p1-r1
+++ b/metadata/md5-cache/games-emulation/melonds-0.9.4_p1-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=app-arch/libarchive dev-libs/teakra dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libsdl2[sound,video] net-libs/libpcap net-libs/libslirp opengl? ( media-libs/libepoxy )
 DESCRIPTION=Nintendo DS emulator, sorta
@@ -11,5 +11,5 @@ LICENSE=BSD-2 GPL-2 GPL-3 Unlicense
 RDEPEND=app-arch/libarchive dev-libs/teakra dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libsdl2[sound,video] net-libs/libpcap net-libs/libslirp opengl? ( media-libs/libepoxy )
 SLOT=0
 SRC_URI=https://github.com/Arisotura/melonDS/archive/0.9.4.tar.gz -> melonDS-0.9.4_p1.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=82aeb535d957116e6d0a2ed9bb81f5c7
diff --git a/metadata/md5-cache/games-emulation/melonds-9999 b/metadata/md5-cache/games-emulation/melonds-9999
index c6d73e930401..b60ec34d95e0 100644
--- a/metadata/md5-cache/games-emulation/melonds-9999
+++ b/metadata/md5-cache/games-emulation/melonds-9999
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
 DEPEND=app-arch/libarchive dev-libs/teakra dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libsdl2[sound,video] net-libs/libpcap net-libs/libslirp opengl? ( media-libs/libepoxy )
 DESCRIPTION=Nintendo DS emulator, sorta
@@ -10,5 +10,5 @@ LICENSE=BSD-2 GPL-2 GPL-3 Unlicense
 PROPERTIES=live
 RDEPEND=app-arch/libarchive dev-libs/teakra dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libsdl2[sound,video] net-libs/libpcap net-libs/libslirp opengl? ( media-libs/libepoxy )
 SLOT=0
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8dad3bf9c0ed5477142b08592d0708f6
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=304874adb3c376bc9d4b4c98ce77fc62
diff --git a/metadata/md5-cache/games-emulation/mgba-0.9.2 b/metadata/md5-cache/games-emulation/mgba-0.9.2
index 05f3782bddc7..4e9a4bcef372 100644
--- a/metadata/md5-cache/games-emulation/mgba-0.9.2
+++ b/metadata/md5-cache/games-emulation/mgba-0.9.2
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=media-libs/libpng:0= sys-libs/zlib[minizip] debug? ( dev-libs/libedit ) elf? ( dev-libs/elfutils ) ffmpeg? ( media-video/ffmpeg:= ) opengl? ( media-libs/libglvnd ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] ) sqlite? ( dev-db/sqlite:3 ) gles2? ( media-libs/libglvnd ) gles3? ( media-libs/libglvnd ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Game Boy Advance emulator written in C
@@ -12,5 +12,5 @@ RDEPEND=media-libs/libpng:0= sys-libs/zlib[minizip] debug? ( dev-libs/libedit )
 REQUIRED_USE=|| ( qt5 sdl ) qt5? ( opengl )
 SLOT=0
 SRC_URI=https://github.com/mgba-emu/mgba/archive/0.9.2.tar.gz -> mgba-0.9.2.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4dd94f5cc3f8be6012af7d3f373401ef
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=f44ede5575a10211da8f51a2de7b42ed
diff --git a/metadata/md5-cache/games-emulation/mgba-0.9.3 b/metadata/md5-cache/games-emulation/mgba-0.9.3
index 872c1dce72a5..4b94dc1bda08 100644
--- a/metadata/md5-cache/games-emulation/mgba-0.9.3
+++ b/metadata/md5-cache/games-emulation/mgba-0.9.3
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=media-libs/libpng:0= sys-libs/zlib[minizip] debug? ( dev-libs/libedit ) elf? ( dev-libs/elfutils ) ffmpeg? ( media-video/ffmpeg:= ) opengl? ( media-libs/libglvnd ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] ) sqlite? ( dev-db/sqlite:3 ) gles2? ( media-libs/libglvnd ) gles3? ( media-libs/libglvnd )
 DESCRIPTION=Game Boy Advance emulator written in C
@@ -12,5 +12,5 @@ RDEPEND=media-libs/libpng:0= sys-libs/zlib[minizip] debug? ( dev-libs/libedit )
 REQUIRED_USE=|| ( qt5 sdl ) qt5? ( opengl )
 SLOT=0
 SRC_URI=https://github.com/mgba-emu/mgba/archive/0.9.3.tar.gz -> mgba-0.9.3.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c525aa3a2d3700bbca9bedd8bc6b447d
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=db5c517667073775ef99ba1f6b69047a
diff --git a/metadata/md5-cache/games-emulation/mgba-0.9.3-r1 b/metadata/md5-cache/games-emulation/mgba-0.9.3-r1
index 1a756ec80e31..94941f63859b 100644
--- a/metadata/md5-cache/games-emulation/mgba-0.9.3-r1
+++ b/metadata/md5-cache/games-emulation/mgba-0.9.3-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=media-libs/libpng:0= sys-libs/zlib[minizip] debug? ( dev-libs/libedit ) elf? ( dev-libs/elfutils ) ffmpeg? ( media-video/ffmpeg:= ) opengl? ( media-libs/libglvnd ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] ) sqlite? ( dev-db/sqlite:3 ) gles2? ( media-libs/libglvnd ) gles3? ( media-libs/libglvnd )
 DESCRIPTION=Game Boy Advance emulator written in C
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://mgba.io
 INHERIT=cmake desktop xdg
 IUSE=debug discord elf ffmpeg gles2 gles3 opengl qt5 +sdl sqlite
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=MPL-2.0
 RDEPEND=media-libs/libpng:0= sys-libs/zlib[minizip] debug? ( dev-libs/libedit ) elf? ( dev-libs/elfutils ) ffmpeg? ( media-video/ffmpeg:= ) opengl? ( media-libs/libglvnd ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] ) sqlite? ( dev-db/sqlite:3 )
 REQUIRED_USE=|| ( qt5 sdl ) qt5? ( opengl )
 SLOT=0
 SRC_URI=https://github.com/mgba-emu/mgba/archive/0.9.3.tar.gz -> mgba-0.9.3.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2666fbc028bd5e716cff3dcfd2e3d992
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=fbe3fe4a92f251607de811caa7b95163
diff --git a/metadata/md5-cache/games-emulation/mgba-9999 b/metadata/md5-cache/games-emulation/mgba-9999
index 959da2df81fb..a774f66b7237 100644
--- a/metadata/md5-cache/games-emulation/mgba-9999
+++ b/metadata/md5-cache/games-emulation/mgba-9999
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
 DEPEND=media-libs/libpng:0= sys-libs/zlib[minizip] debug? ( dev-libs/libedit ) elf? ( dev-libs/elfutils ) ffmpeg? ( media-video/ffmpeg:= ) opengl? ( media-libs/libglvnd ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] ) sqlite? ( dev-db/sqlite:3 ) gles2? ( media-libs/libglvnd ) gles3? ( media-libs/libglvnd )
 DESCRIPTION=Game Boy Advance emulator written in C
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=media-libs/libpng:0= sys-libs/zlib[minizip] debug? ( dev-libs/libedit ) elf? ( dev-libs/elfutils ) ffmpeg? ( media-video/ffmpeg:= ) opengl? ( media-libs/libglvnd ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] ) sqlite? ( dev-db/sqlite:3 )
 REQUIRED_USE=|| ( qt5 sdl ) qt5? ( opengl )
 SLOT=0
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c525aa3a2d3700bbca9bedd8bc6b447d
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=db5c517667073775ef99ba1f6b69047a
diff --git a/metadata/md5-cache/games-emulation/mupen64plus-audio-sdl-2.5.9 b/metadata/md5-cache/games-emulation/mupen64plus-audio-sdl-2.5.9
index 9a98b0a804ef..6bd35bd22b34 100644
--- a/metadata/md5-cache/games-emulation/mupen64plus-audio-sdl-2.5.9
+++ b/metadata/md5-cache/games-emulation/mupen64plus-audio-sdl-2.5.9
@@ -4,11 +4,12 @@ DEPEND=>=games-emulation/mupen64plus-core-2.5.9:= media-libs/libsdl2:0=[sound] l
 DESCRIPTION=A fork of Mupen64 Nintendo 64 emulator, SDL audio plugin
 EAPI=7
 HOMEPAGE=https://www.mupen64plus.org/
+INHERIT=toolchain-funcs
 IUSE=libsamplerate oss speex
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=games-emulation/mupen64plus-core-2.5.9:= media-libs/libsdl2:0=[sound] libsamplerate? ( media-libs/libsamplerate:= ) speex? ( media-libs/speex:= media-libs/speexdsp:= )
 SLOT=0
 SRC_URI=https://github.com/mupen64plus/mupen64plus-audio-sdl/releases/download/2.5.9/mupen64plus-audio-sdl-src-2.5.9.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=38778bb95f9af52da522158ed5b59bcb
diff --git a/metadata/md5-cache/games-emulation/mupen64plus-core-2.5.9-r2 b/metadata/md5-cache/games-emulation/mupen64plus-core-2.5.9-r2
index e3fac5f5d707..63c13fc5404d 100644
--- a/metadata/md5-cache/games-emulation/mupen64plus-core-2.5.9-r2
+++ b/metadata/md5-cache/games-emulation/mupen64plus-core-2.5.9-r2
@@ -4,6 +4,7 @@ DEPEND=media-libs/libpng:0= media-libs/libsdl2:0=[joystick,opengl,video] sys-lib
 DESCRIPTION=A fork of Mupen64 Nintendo 64 emulator, core library
 EAPI=7
 HOMEPAGE=https://www.mupen64plus.org/
+INHERIT=toolchain-funcs
 IUSE=debugger gles2-only lirc new-dynarec opencv +osd cpu_flags_x86_sse
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
@@ -11,5 +12,5 @@ RDEPEND=media-libs/libpng:0= media-libs/libsdl2:0=[joystick,opengl,video] sys-li
 REQUIRED_USE=gles2-only? ( !osd )
 SLOT=0/2-sdl2
 SRC_URI=https://github.com/mupen64plus/mupen64plus-core/releases/download/2.5.9/mupen64plus-core-src-2.5.9.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d99c06c3c393f408c64a45d862e65f9d
diff --git a/metadata/md5-cache/games-emulation/mupen64plus-input-sdl-2.5.9 b/metadata/md5-cache/games-emulation/mupen64plus-input-sdl-2.5.9
index d72f654dbeb5..a1f845fe267c 100644
--- a/metadata/md5-cache/games-emulation/mupen64plus-input-sdl-2.5.9
+++ b/metadata/md5-cache/games-emulation/mupen64plus-input-sdl-2.5.9
@@ -4,10 +4,11 @@ DEPEND=>=games-emulation/mupen64plus-core-2.5.9:0= media-libs/libsdl2:0=[joystic
 DESCRIPTION=A fork of Mupen64 Nintendo 64 emulator, SDL input plugin
 EAPI=7
 HOMEPAGE=https://www.mupen64plus.org/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=games-emulation/mupen64plus-core-2.5.9:0= media-libs/libsdl2:0=[joystick]
 SLOT=0
 SRC_URI=https://github.com/mupen64plus/mupen64plus-input-sdl/releases/download/2.5.9/mupen64plus-input-sdl-src-2.5.9.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d96f935a251d0fc17de0ea9420dad0b8
diff --git a/metadata/md5-cache/games-emulation/mupen64plus-rsp-hle-2.5.9 b/metadata/md5-cache/games-emulation/mupen64plus-rsp-hle-2.5.9
index cd845d7157b6..e57373cf3cb0 100644
--- a/metadata/md5-cache/games-emulation/mupen64plus-rsp-hle-2.5.9
+++ b/metadata/md5-cache/games-emulation/mupen64plus-rsp-hle-2.5.9
@@ -4,10 +4,11 @@ DEPEND=>=games-emulation/mupen64plus-core-2.5.9:0=
 DESCRIPTION=A fork of Mupen64 Nintendo 64 emulator, HLE RSP plugin
 EAPI=7
 HOMEPAGE=https://www.mupen64plus.org/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=games-emulation/mupen64plus-core-2.5.9:0=
 SLOT=0
 SRC_URI=https://github.com/mupen64plus/mupen64plus-rsp-hle/releases/download/2.5.9/mupen64plus-rsp-hle-src-2.5.9.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=250183d8dfdcd92b570df20704919861
diff --git a/metadata/md5-cache/games-emulation/mupen64plus-ui-console-2.5.9 b/metadata/md5-cache/games-emulation/mupen64plus-ui-console-2.5.9
index 82646ca20377..4aef393acf74 100644
--- a/metadata/md5-cache/games-emulation/mupen64plus-ui-console-2.5.9
+++ b/metadata/md5-cache/games-emulation/mupen64plus-ui-console-2.5.9
@@ -4,10 +4,11 @@ DEPEND=>=games-emulation/mupen64plus-core-2.5.9:0= media-libs/libsdl2:0=
 DESCRIPTION=A fork of Mupen64 Nintendo 64 emulator, console UI
 EAPI=7
 HOMEPAGE=https://www.mupen64plus.org/
+INHERIT=toolchain-funcs xdg-utils
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=games-emulation/mupen64plus-core-2.5.9:0= media-libs/libsdl2:0=
 SLOT=0
 SRC_URI=https://github.com/mupen64plus/mupen64plus-ui-console/releases/download/2.5.9/mupen64plus-ui-console-src-2.5.9.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=ad67fec13e13241d19813fc0dbda4fc6
diff --git a/metadata/md5-cache/games-emulation/mupen64plus-video-glide64mk2-2.5.9-r2 b/metadata/md5-cache/games-emulation/mupen64plus-video-glide64mk2-2.5.9-r2
index b529aada8066..ade3e1efc95b 100644
--- a/metadata/md5-cache/games-emulation/mupen64plus-video-glide64mk2-2.5.9-r2
+++ b/metadata/md5-cache/games-emulation/mupen64plus-video-glide64mk2-2.5.9-r2
@@ -4,11 +4,12 @@ DEPEND=>=games-emulation/mupen64plus-core-2.5:0=[gles2-only=] media-libs/libpng:
 DESCRIPTION=A fork of Mupen64 Nintendo 64 emulator, glide64mk2 video plugin
 EAPI=7
 HOMEPAGE=https://www.mupen64plus.org/
+INHERIT=toolchain-funcs
 IUSE=gles2-only hires cpu_flags_x86_sse
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=games-emulation/mupen64plus-core-2.5:0=[gles2-only=] media-libs/libpng:0= media-libs/libsdl2:0=[video] sys-libs/zlib:0= virtual/opengl:0= gles2-only? ( media-libs/libsdl2:0[gles2] ) hires? ( dev-libs/boost:0= )
 SLOT=0
 SRC_URI=https://github.com/mupen64plus/mupen64plus-video-glide64mk2/releases/download/2.5.9/mupen64plus-video-glide64mk2-src-2.5.9.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=fb67eda5db049f37ddc75ac4a23648b3
diff --git a/metadata/md5-cache/games-emulation/mupen64plus-video-rice-2.5.9-r2 b/metadata/md5-cache/games-emulation/mupen64plus-video-rice-2.5.9-r2
index a54a6a18cde4..5bcccd1d191d 100644
--- a/metadata/md5-cache/games-emulation/mupen64plus-video-rice-2.5.9-r2
+++ b/metadata/md5-cache/games-emulation/mupen64plus-video-rice-2.5.9-r2
@@ -4,11 +4,12 @@ DEPEND=>=games-emulation/mupen64plus-core-2.5:0=[gles2-only=] media-libs/libpng:
 DESCRIPTION=A fork of Mupen64 Nintendo 64 emulator, rice video plugin
 EAPI=7
 HOMEPAGE=https://www.mupen64plus.org/
+INHERIT=toolchain-funcs
 IUSE=gles2-only cpu_flags_x86_sse
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=games-emulation/mupen64plus-core-2.5:0=[gles2-only=] media-libs/libpng:0= media-libs/libsdl2:0=[video] virtual/opengl:0= gles2-only? ( media-libs/libsdl2:0[gles2] )
 SLOT=0
 SRC_URI=https://github.com/mupen64plus/mupen64plus-video-rice/releases/download/2.5.9/mupen64plus-video-rice-src-2.5.9.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=65c335bf381c6b88de4c2a3741d3982a
diff --git a/metadata/md5-cache/games-emulation/nestopia-1.51.1 b/metadata/md5-cache/games-emulation/nestopia-1.51.1
index 5d312cc9ee1d..8e7a292f90a4 100644
--- a/metadata/md5-cache/games-emulation/nestopia-1.51.1
+++ b/metadata/md5-cache/games-emulation/nestopia-1.51.1
@@ -4,11 +4,12 @@ DEPEND=app-arch/libarchive:= media-libs/libglvnd media-libs/libsdl2[joystick,sou
 DESCRIPTION=Portable Nintendo Entertainment System emulator written in C++
 EAPI=8
 HOMEPAGE=http://0ldsk00l.ca/nestopia/
+INHERIT=autotools flag-o-matic xdg
 IUSE=doc
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=app-arch/libarchive:= media-libs/libglvnd media-libs/libsdl2[joystick,sound] sys-libs/zlib:= x11-libs/fltk:1[opengl]
 SLOT=0
 SRC_URI=https://github.com/0ldsk00l/nestopia/archive/1.51.1.tar.gz -> nestopia-1.51.1.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=60b294aa621cdbd34ef94a456f1952f2
diff --git a/metadata/md5-cache/games-emulation/nestopia-9999 b/metadata/md5-cache/games-emulation/nestopia-9999
index 0f78955307e9..554299eaf7c1 100644
--- a/metadata/md5-cache/games-emulation/nestopia-9999
+++ b/metadata/md5-cache/games-emulation/nestopia-9999
@@ -4,10 +4,11 @@ DEPEND=app-arch/libarchive:= media-libs/libglvnd media-libs/libsdl2[joystick,sou
 DESCRIPTION=Portable Nintendo Entertainment System emulator written in C++
 EAPI=8
 HOMEPAGE=http://0ldsk00l.ca/nestopia/
+INHERIT=autotools xdg git-r3
 IUSE=doc
 LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=app-arch/libarchive:= media-libs/libglvnd media-libs/libsdl2[joystick,sound] sys-libs/zlib:= x11-libs/fltk:1[opengl]
 SLOT=0
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=0dc7540ce27da491fccb28903511f3e3
diff --git a/metadata/md5-cache/games-emulation/openmsx-17.0 b/metadata/md5-cache/games-emulation/openmsx-17.0
index 81fde6e25d25..134e89bdcccd 100644
--- a/metadata/md5-cache/games-emulation/openmsx-17.0
+++ b/metadata/md5-cache/games-emulation/openmsx-17.0
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/tcl:0= media-libs/alsa-lib media-libs/libogg media-libs/libpng:0= media-libs/libsdl2[joystick=,sound,video] media-libs/libtheora media-libs/libvorbis media-libs/sdl2-ttf >=media-libs/glew-1.3.2:0= sys-libs/zlib virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/openMSX/openMSX/releases/download/RELEASE_17_0/openmsx-17.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=f8267e074ef42ee23c4131354722ac91
diff --git a/metadata/md5-cache/games-emulation/pcsx2-1.6.0-r3 b/metadata/md5-cache/games-emulation/pcsx2-1.6.0-r3
index f8e0a91a1be8..b2a4f3986811 100644
--- a/metadata/md5-cache/games-emulation/pcsx2-1.6.0-r3
+++ b/metadata/md5-cache/games-emulation/pcsx2-1.6.0-r3
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 filecaps? ( sys-libs/libcap )
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 filecaps? ( sys-libs/libcap )
 DEFINED_PHASES=compile configure install postinst prepare setup test
 DEPEND=app-arch/bzip2[abi_x86_32(-)] app-arch/xz-utils[abi_x86_32(-)] dev-libs/libaio[abi_x86_32(-)] dev-libs/libxml2:2[abi_x86_32(-)] media-libs/alsa-lib[abi_x86_32(-)] media-libs/libpng:=[abi_x86_32(-)] media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound] media-libs/libsoundtouch[abi_x86_32(-)] media-libs/portaudio[abi_x86_32(-)] net-libs/libpcap[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] virtual/libudev[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/gtk+:3[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/wxGTK:3.0-gtk3[abi_x86_32(-),X]
 DESCRIPTION=A PlayStation 2 emulator
@@ -11,5 +11,5 @@ LICENSE=GPL-3
 RDEPEND=app-arch/bzip2[abi_x86_32(-)] app-arch/xz-utils[abi_x86_32(-)] dev-libs/libaio[abi_x86_32(-)] dev-libs/libxml2:2[abi_x86_32(-)] media-libs/alsa-lib[abi_x86_32(-)] media-libs/libpng:=[abi_x86_32(-)] media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound] media-libs/libsoundtouch[abi_x86_32(-)] media-libs/portaudio[abi_x86_32(-)] net-libs/libpcap[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] virtual/libudev[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/gtk+:3[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/wxGTK:3.0-gtk3[abi_x86_32(-),X] filecaps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=https://github.com/PCSX2/pcsx2/archive/v1.6.0.tar.gz -> pcsx2-1.6.0.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	babe6282ea5c195981bd302af1adaf3a	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=7c8cf84e61161dee8fb0de6362715692
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	babe6282ea5c195981bd302af1adaf3a	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=54165b748b7e3546bc6e6f5449e2bfea
diff --git a/metadata/md5-cache/games-emulation/pcsx2-9999 b/metadata/md5-cache/games-emulation/pcsx2-9999
index 6176d6012ece..b444a7b5385a 100644
--- a/metadata/md5-cache/games-emulation/pcsx2-9999
+++ b/metadata/md5-cache/games-emulation/pcsx2-9999
@@ -1,6 +1,6 @@
-BDEPEND=test? ( dev-cpp/gtest ) dev-util/ninja >=dev-util/cmake-3.20.5 filecaps? ( sys-libs/libcap ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( dev-cpp/gtest ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 filecaps? ( sys-libs/libcap ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=app-arch/xz-utils dev-cpp/rapidyaml:= dev-libs/glib:2 dev-libs/libaio dev-libs/libchdr >=dev-libs/libfmt-7.1.3:= dev-libs/libxml2:2 dev-libs/libzip:=[zstd] media-libs/alsa-lib media-libs/cubeb media-libs/freetype media-libs/libglvnd media-libs/libpng:= media-libs/libsamplerate media-libs/libsdl2[haptic,joystick,sound] media-libs/libsoundtouch:= net-libs/libpcap sys-libs/zlib virtual/libudev:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libICE x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/wxGTK:3.0-gtk3[X] pulseaudio? ( media-sound/pulseaudio ) x11-base/xorg-proto
+DEPEND=app-arch/xz-utils app-arch/zstd:= dev-cpp/rapidyaml:= dev-libs/glib:2 dev-libs/libaio dev-libs/libchdr >=dev-libs/libfmt-7.1.3:= dev-libs/libxml2:2 dev-libs/libzip:=[zstd] media-libs/alsa-lib media-libs/cubeb media-libs/freetype media-libs/libglvnd media-libs/libpng:= media-libs/libsamplerate media-libs/libsdl2[haptic,joystick,sound] media-libs/libsoundtouch:= net-libs/libpcap sys-libs/zlib virtual/libudev:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libICE x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/wxGTK:3.0-gtk3[X] pulseaudio? ( media-sound/pulseaudio ) x11-base/xorg-proto
 DESCRIPTION=A PlayStation 2 emulator
 EAPI=7
 HOMEPAGE=https://pcsx2.net/
@@ -8,8 +8,8 @@ INHERIT=cmake fcaps flag-o-matic git-r3 toolchain-funcs wxwidgets
 IUSE=pulseaudio test +filecaps
 LICENSE=GPL-3 Apache-2.0 OFL-1.1
 PROPERTIES=live
-RDEPEND=app-arch/xz-utils dev-cpp/rapidyaml:= dev-libs/glib:2 dev-libs/libaio dev-libs/libchdr >=dev-libs/libfmt-7.1.3:= dev-libs/libxml2:2 dev-libs/libzip:=[zstd] media-libs/alsa-lib media-libs/cubeb media-libs/freetype media-libs/libglvnd media-libs/libpng:= media-libs/libsamplerate media-libs/libsdl2[haptic,joystick,sound] media-libs/libsoundtouch:= net-libs/libpcap sys-libs/zlib virtual/libudev:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libICE x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/wxGTK:3.0-gtk3[X] pulseaudio? ( media-sound/pulseaudio ) filecaps? ( sys-libs/libcap )
+RDEPEND=app-arch/xz-utils app-arch/zstd:= dev-cpp/rapidyaml:= dev-libs/glib:2 dev-libs/libaio dev-libs/libchdr >=dev-libs/libfmt-7.1.3:= dev-libs/libxml2:2 dev-libs/libzip:=[zstd] media-libs/alsa-lib media-libs/cubeb media-libs/freetype media-libs/libglvnd media-libs/libpng:= media-libs/libsamplerate media-libs/libsdl2[haptic,joystick,sound] media-libs/libsoundtouch:= net-libs/libpcap sys-libs/zlib virtual/libudev:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libICE x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/wxGTK:3.0-gtk3[X] pulseaudio? ( media-sound/pulseaudio ) filecaps? ( sys-libs/libcap )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	babe6282ea5c195981bd302af1adaf3a	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b2d08cb0b28db4eb5a1472b10d2e334c
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	babe6282ea5c195981bd302af1adaf3a	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=578ab6b6d208ea453e2477ec902289d9
diff --git a/metadata/md5-cache/games-emulation/pcsxr-1.9.94_p20190306 b/metadata/md5-cache/games-emulation/pcsxr-1.9.94_p20190306
index 4cde4997a0e8..06a3a6b537d8 100644
--- a/metadata/md5-cache/games-emulation/pcsxr-1.9.94_p20190306
+++ b/metadata/md5-cache/games-emulation/pcsxr-1.9.94_p20190306
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/unzip dev-util/intltool sys-devel/gettext:0 dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-arch/unzip dev-util/intltool sys-devel/gettext:0 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=dev-libs/glib:2 media-libs/libsdl2[joystick] sys-libs/zlib:= x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXtst x11-libs/libXv x11-libs/libXxf86vm virtual/libintl virtual/opengl archive? ( app-arch/libarchive:= ) alsa? ( media-libs/alsa-lib:= ) cdio? ( dev-libs/libcdio:= ) ccdda? ( >=media-video/ffmpeg-3:= ) openal? ( media-libs/openal:= ) pulseaudio? ( media-sound/pulseaudio:= ) sdl? ( media-libs/libsdl2:=[sound] ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=PCSX-Reloaded: a fork of PCSX, the discontinued Playstation emulator
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/glib:2 media-libs/libsdl2[joystick] sys-libs/zlib:= x11-libs/gt
 REQUIRED_USE=?? ( alsa openal oss pulseaudio sdl )
 SLOT=0
 SRC_URI=https://github.com/iCatButler/pcsxr/archive/62467b86871aee3d70c7445f3cb79f0858ec566e.tar.gz -> pcsxr-62467b86871aee3d70c7445f3cb79f0858ec566e.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	6024fbc93167fad782e2032933654857	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	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=7b99f8d7a0effaf3fe0c2fba1a490b77
diff --git a/metadata/md5-cache/games-emulation/pcsxr-9999 b/metadata/md5-cache/games-emulation/pcsxr-9999
index 617089a0df84..64950db425ad 100644
--- a/metadata/md5-cache/games-emulation/pcsxr-9999
+++ b/metadata/md5-cache/games-emulation/pcsxr-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/unzip dev-util/intltool sys-devel/gettext:0 dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-arch/unzip dev-util/intltool sys-devel/gettext:0 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
 DEPEND=dev-libs/glib:2 media-libs/libsdl2[joystick] sys-libs/zlib:= x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXtst x11-libs/libXv x11-libs/libXxf86vm virtual/libintl virtual/opengl archive? ( app-arch/libarchive:= ) alsa? ( media-libs/alsa-lib:= ) cdio? ( dev-libs/libcdio:= ) ccdda? ( >=media-video/ffmpeg-3:= ) openal? ( media-libs/openal:= ) pulseaudio? ( media-sound/pulseaudio:= ) sdl? ( media-libs/libsdl2:=[sound] ) x11-base/xorg-proto
 DESCRIPTION=PCSX-Reloaded: a fork of PCSX, the discontinued Playstation emulator
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/glib:2 media-libs/libsdl2[joystick] sys-libs/zlib:= x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXtst x11-libs/libXv x11-libs/libXxf86vm virtual/libintl virtual/opengl archive? ( app-arch/libarchive:= ) alsa? ( media-libs/alsa-lib:= ) cdio? ( dev-libs/libcdio:= ) ccdda? ( >=media-video/ffmpeg-3:= ) openal? ( media-libs/openal:= ) pulseaudio? ( media-sound/pulseaudio:= ) sdl? ( media-libs/libsdl2:=[sound] )
 REQUIRED_USE=?? ( alsa openal oss pulseaudio sdl )
 SLOT=0
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	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	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=b843beecebd61e1728099da87755878d
diff --git a/metadata/md5-cache/games-emulation/ppsspp-1.11.3-r1 b/metadata/md5-cache/games-emulation/ppsspp-1.11.3-r1
index 0d4bc759294b..78fb50a5875b 100644
--- a/metadata/md5-cache/games-emulation/ppsspp-1.11.3-r1
+++ b/metadata/md5-cache/games-emulation/ppsspp-1.11.3-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
 DEPEND=app-arch/snappy:= dev-libs/libzip:= dev-util/glslang:= media-libs/glew:= sys-libs/zlib:= virtual/opengl sdl? ( media-libs/libsdl2 ) system-ffmpeg? ( media-video/ffmpeg:0/56.58.58 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtmultimedia:5[-gles2-only] dev-qt/qtopengl:5[-gles2-only] dev-qt/qtwidgets:5[-gles2-only] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A PSP emulator written in C++
@@ -13,5 +13,5 @@ REQUIRED_USE=!qt5? ( sdl )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hrydgard/ppsspp/archive/v1.11.3.tar.gz -> ppsspp-1.11.3.tar.gz https://github.com/KhronosGroup/SPIRV-Cross/archive/a1f7c8dc8ea2f94443951ee27003bffa562c1f13.tar.gz -> ppsspp-1.11.3-ext_SPIRV-Cross.tar.gz https://github.com/Kingcom/armips/archive/7885552b208493a6a0f21663770c446c3ba65576.tar.gz -> ppsspp-1.11.3-ext_armips.tar.gz https://github.com/Tencent/rapidjson/archive/73063f5002612c6bf64fe24f851cd5cc0d83eef9.tar.gz -> ppsspp-1.11.3-ext_rapidjson.tar.gz https://github.com/hrydgard/glslang/archive/d0850f875ec392a130ccf00018dab458b546f27c.tar.gz -> ppsspp-1.11.3-ext_glslang.tar.gz https://github.com/hrydgard/miniupnp/archive/7e229ddd635933239583ab190d9b614bde018157.tar.gz -> ppsspp-1.11.3-ext_miniupnp.tar.gz https://github.com/hrydgard/ppsspp-freetype/archive/cbea79dc8fef4d9210e2bac7e7b9b5ff3388197a.tar.gz -> ppsspp-1.11.3-ext_native_tools_prebuilt.tar.gz https://github.com/hrydgard/ppsspp-lang/archive/6bd5b4bc983917ea8402f73c726b46e36f3de0b4.tar.gz -> ppsspp-1.11.3-assets_lang.tar.gz !system-ffmpeg? ( https://github.com/hrydgard/ppsspp-ffmpeg/archive/0b28335acea4f429ae798c5e75232e54881bf164.tar.gz -> ppsspp-1.11.3-ffmpeg.tar.gz ) discord? ( https://github.com/discordapp/discord-rpc/archive/3d3ae7129d17643bc706da0a2eea85aafd10ab3a.tar.gz -> ppsspp-1.11.3-ext_discord-rpc.tar.gz )
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=a5b9467d737dd182d8f59de065a61533
diff --git a/metadata/md5-cache/games-emulation/ppsspp-1.11.3_p20210627-r2 b/metadata/md5-cache/games-emulation/ppsspp-1.11.3_p20210627-r2
index 4977ae75e5e3..d25272f2dacf 100644
--- a/metadata/md5-cache/games-emulation/ppsspp-1.11.3_p20210627-r2
+++ b/metadata/md5-cache/games-emulation/ppsspp-1.11.3_p20210627-r2
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
 DEPEND=app-arch/snappy:= dev-libs/libzip:= dev-util/glslang:= media-libs/glew:= media-libs/libpng:= media-libs/libsdl2[joystick] media-video/ffmpeg:0/56.58.58 sys-libs/zlib:= virtual/opengl qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtmultimedia:5[-gles2-only] dev-qt/qtopengl:5[-gles2-only] dev-qt/qtwidgets:5[-gles2-only] ) !qt5? ( media-libs/libsdl2[X,opengl,sound,video] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A PSP emulator written in C++
@@ -12,5 +12,5 @@ RDEPEND=app-arch/snappy:= dev-libs/libzip:= dev-util/glslang:= media-libs/glew:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hrydgard/ppsspp/archive/ff2a6eeda2d00210f1a1f7bc0ab0ad99e7bc60b6.tar.gz -> ppsspp-1.11.3_p20210627.tar.gz https://github.com/KhronosGroup/SPIRV-Cross/archive/9acb9ec31f5a8ef80ea6b994bb77be787b08d3d1.tar.gz -> ppsspp-1.11.3_p20210627-ext_SPIRV-Cross.tar.gz https://github.com/Kingcom/armips/archive/7885552b208493a6a0f21663770c446c3ba65576.tar.gz -> ppsspp-1.11.3_p20210627-ext_armips.tar.gz https://github.com/Tencent/rapidjson/archive/73063f5002612c6bf64fe24f851cd5cc0d83eef9.tar.gz -> ppsspp-1.11.3_p20210627-ext_rapidjson.tar.gz https://github.com/facebook/zstd/archive/56421f34e4ab5c17cbac0832bd12413e4f27ecf9.tar.gz -> ppsspp-1.11.3_p20210627-ext_zstd.tar.gz https://github.com/hrydgard/glslang/archive/dc11adde23c455a24e13dd54de9b4ede8bdd7db8.tar.gz -> ppsspp-1.11.3_p20210627-ext_glslang.tar.gz https://github.com/hrydgard/miniupnp/archive/3a87be33e797ba947b2b2a5f8d087f6c3ff4d93e.tar.gz -> ppsspp-1.11.3_p20210627-ext_miniupnp.tar.gz https://github.com/hrydgard/ppsspp-freetype/archive/cbea79dc8fef4d9210e2bac7e7b9b5ff3388197a.tar.gz -> ppsspp-1.11.3_p20210627-ext_native_tools_prebuilt.tar.gz https://github.com/hrydgard/ppsspp-lang/archive/3bf6b18eb0ae68861fbfbb7b43cd764771ca42a9.tar.gz -> ppsspp-1.11.3_p20210627-assets_lang.tar.gz discord? ( https://github.com/discordapp/discord-rpc/archive/963aa9f3e5ce81a4682c6ca3d136cddda614db33.tar.gz -> ppsspp-1.11.3_p20210627-ext_discord-rpc.tar.gz )
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=8464c96983bf62f664e6833031a04066
diff --git a/metadata/md5-cache/games-emulation/ppsspp-1.12.3-r1 b/metadata/md5-cache/games-emulation/ppsspp-1.12.3-r1
index 9433592d0d5a..878f6338d1af 100644
--- a/metadata/md5-cache/games-emulation/ppsspp-1.12.3-r1
+++ b/metadata/md5-cache/games-emulation/ppsspp-1.12.3-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
 DEPEND=app-arch/snappy:= dev-libs/libzip:= dev-util/glslang:= media-libs/glew:= media-libs/libpng:= media-libs/libsdl2[joystick] media-video/ffmpeg:0/56.58.58 sys-libs/zlib:= virtual/opengl qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtmultimedia:5[-gles2-only] dev-qt/qtopengl:5[-gles2-only] dev-qt/qtwidgets:5[-gles2-only] ) !qt5? ( media-libs/libsdl2[X,opengl,sound,video] )
 DESCRIPTION=A PSP emulator written in C++
@@ -12,5 +12,5 @@ RDEPEND=app-arch/snappy:= dev-libs/libzip:= dev-util/glslang:= media-libs/glew:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hrydgard/ppsspp/archive/v1.12.3.tar.gz -> ppsspp-1.12.3.tar.gz https://github.com/KhronosGroup/SPIRV-Cross/archive/9acb9ec31f5a8ef80ea6b994bb77be787b08d3d1.tar.gz -> ppsspp-1.12.3-ext_SPIRV-Cross.tar.gz https://github.com/Kingcom/armips/archive/7885552b208493a6a0f21663770c446c3ba65576.tar.gz -> ppsspp-1.12.3-ext_armips.tar.gz https://github.com/Tencent/rapidjson/archive/73063f5002612c6bf64fe24f851cd5cc0d83eef9.tar.gz -> ppsspp-1.12.3-ext_rapidjson.tar.gz https://github.com/facebook/zstd/archive/a488ba114ec17ea1054b9057c26a046fc122b3b6.tar.gz -> ppsspp-1.12.3-ext_zstd.tar.gz https://github.com/hrydgard/glslang/archive/dc11adde23c455a24e13dd54de9b4ede8bdd7db8.tar.gz -> ppsspp-1.12.3-ext_glslang.tar.gz https://github.com/hrydgard/miniupnp/archive/3a87be33e797ba947b2b2a5f8d087f6c3ff4d93e.tar.gz -> ppsspp-1.12.3-ext_miniupnp.tar.gz https://github.com/hrydgard/ppsspp-freetype/archive/cbea79dc8fef4d9210e2bac7e7b9b5ff3388197a.tar.gz -> ppsspp-1.12.3-ext_native_tools_prebuilt.tar.gz https://github.com/hrydgard/ppsspp-lang/archive/3bf6b18eb0ae68861fbfbb7b43cd764771ca42a9.tar.gz -> ppsspp-1.12.3-assets_lang.tar.gz discord? ( https://github.com/discordapp/discord-rpc/archive/963aa9f3e5ce81a4682c6ca3d136cddda614db33.tar.gz -> ppsspp-1.12.3-ext_discord-rpc.tar.gz )
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=998bbd321a8b0aea0f1865f15d75e4eb
diff --git a/metadata/md5-cache/games-emulation/snes9x-1.61 b/metadata/md5-cache/games-emulation/snes9x-1.61
index a000474f7dff..cf86dcac703f 100644
--- a/metadata/md5-cache/games-emulation/snes9x-1.61
+++ b/metadata/md5-cache/games-emulation/snes9x-1.61
@@ -13,5 +13,5 @@ REQUIRED_USE=glslang? ( gui opengl )
 RESTRICT=bindist test
 SLOT=0
 SRC_URI=https://github.com/snes9xgit/snes9x/archive/1.61.tar.gz -> snes9x-1.61.tar.gz gui? ( glslang? ( https://github.com/KhronosGroup/glslang/archive/bcf6a2430e99e8fc24f9f266e99316905e6d5134.tar.gz -> snes9x-1.61-glslang.tar.gz https://github.com/KhronosGroup/SPIRV-Cross/archive/1458bae62ec67ea7d12c5a13b740e23ed4bb226c.tar.gz -> snes9x-1.61-spirv.tar.gz ) )
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=151700eef3a29645bf6d94a16939dd21
diff --git a/metadata/md5-cache/games-emulation/stella-6.6 b/metadata/md5-cache/games-emulation/stella-6.6
index 5a08f71289e6..5406502113ba 100644
--- a/metadata/md5-cache/games-emulation/stella-6.6
+++ b/metadata/md5-cache/games-emulation/stella-6.6
@@ -3,6 +3,7 @@ DEPEND=media-libs/libsdl2[joystick?,opengl,sound,video] png? ( media-libs/libpng
 DESCRIPTION=Multi-platform Atari 2600 VCS Emulator
 EAPI=8
 HOMEPAGE=https://stella-emu.github.io
+INHERIT=toolchain-funcs xdg
 IUSE=+joystick png zlib
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ BSD MIT
@@ -10,5 +11,5 @@ RDEPEND=media-libs/libsdl2[joystick?,opengl,sound,video] png? ( media-libs/libpn
 REQUIRED_USE=png? ( zlib )
 SLOT=0
 SRC_URI=https://github.com/stella-emu/stella/releases/download/6.6/stella-6.6-src.tar.xz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=4429aee8474dda119dd7ca12f7d2c0cf
diff --git a/metadata/md5-cache/games-emulation/stella-6.7 b/metadata/md5-cache/games-emulation/stella-6.7
new file mode 100644
index 000000000000..2a16e99a3dee
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/stella-6.7
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=dev-db/sqlite:3 media-libs/libsdl2[joystick?,opengl,sound,video] png? ( media-libs/libpng:= ) zlib? ( sys-libs/zlib:= )
+DESCRIPTION=Multi-platform Atari 2600 VCS Emulator
+EAPI=8
+HOMEPAGE=https://stella-emu.github.io/
+INHERIT=toolchain-funcs xdg
+IUSE=+joystick png zlib
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ BSD MIT
+RDEPEND=dev-db/sqlite:3 media-libs/libsdl2[joystick?,opengl,sound,video] png? ( media-libs/libpng:= ) zlib? ( sys-libs/zlib:= )
+REQUIRED_USE=png? ( zlib )
+SLOT=0
+SRC_URI=https://github.com/stella-emu/stella/releases/download/6.7/stella-6.7-src.tar.xz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=3e7326f6bab6ddcbc8fda523491b51a0
diff --git a/metadata/md5-cache/games-emulation/vbam-2.1.4 b/metadata/md5-cache/games-emulation/vbam-2.1.4
index cadc3d1e8c39..c1d38ea48536 100644
--- a/metadata/md5-cache/games-emulation/vbam-2.1.4
+++ b/metadata/md5-cache/games-emulation/vbam-2.1.4
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/zip wxwidgets? ( virtual/imagemagick-tools ) x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-arch/zip wxwidgets? ( virtual/imagemagick-tools ) x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=>=media-libs/libpng-1.4:0= media-libs/libsdl2[joystick] link? ( >=media-libs/libsfml-2.0:= ) sys-libs/zlib:= virtual/glu virtual/opengl lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) wxwidgets? ( ffmpeg? ( media-video/ffmpeg:= ) openal? ( media-libs/openal ) x11-libs/wxGTK:3.0-gtk3[X,opengl] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance
@@ -12,5 +12,5 @@ RDEPEND=>=media-libs/libpng-1.4:0= media-libs/libsdl2[joystick] link? ( >=media-
 REQUIRED_USE=ffmpeg? ( wxwidgets ) openal? ( wxwidgets ) || ( sdl wxwidgets )
 SLOT=0
 SRC_URI=https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v2.1.4.tar.gz -> vbam-2.1.4.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	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	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	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=dc484156096fe65e80ca8b4a2c7bedf2
diff --git a/metadata/md5-cache/games-emulation/vbam-9999 b/metadata/md5-cache/games-emulation/vbam-9999
index 39a7703722a6..04e96dee3dee 100644
--- a/metadata/md5-cache/games-emulation/vbam-9999
+++ b/metadata/md5-cache/games-emulation/vbam-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/zip wxwidgets? ( virtual/imagemagick-tools ) x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-arch/zip wxwidgets? ( virtual/imagemagick-tools ) x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
 DEPEND=>=media-libs/libpng-1.4:0= media-libs/libsdl2[joystick] link? ( >=media-libs/libsfml-2.0:= ) sys-libs/zlib:= virtual/glu virtual/opengl lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) wxwidgets? ( ffmpeg? ( media-video/ffmpeg:= ) openal? ( media-libs/openal ) x11-libs/wxGTK:3.0-gtk3[X,opengl] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=>=media-libs/libpng-1.4:0= media-libs/libsdl2[joystick] link? ( >=media-libs/libsfml-2.0:= ) sys-libs/zlib:= virtual/glu virtual/opengl lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) wxwidgets? ( ffmpeg? ( media-video/ffmpeg:= ) openal? ( media-libs/openal ) x11-libs/wxGTK:3.0-gtk3[X,opengl] )
 REQUIRED_USE=ffmpeg? ( wxwidgets ) openal? ( wxwidgets ) || ( sdl wxwidgets )
 SLOT=0
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=b9a48a351dc47839a9da3d88740dd735
diff --git a/metadata/md5-cache/games-emulation/yabause-0.9.15 b/metadata/md5-cache/games-emulation/yabause-0.9.15
index 1bf9653bf8d3..a042b624ca0e 100644
--- a/metadata/md5-cache/games-emulation/yabause-0.9.15
+++ b/metadata/md5-cache/games-emulation/yabause-0.9.15
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 sys-libs/zlib x11-libs/libXrandr x11-libs/libX11 openal? ( media-libs/openal ) opengl? ( dev-qt/qtopengl:5 media-libs/freeglut virtual/glu virtual/opengl ) sdl? ( media-libs/libsdl2[opengl?,video] )
 DESCRIPTION=Sega Saturn emulator
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 sys-libs/zlib x11-libs/libXrandr x11-libs/libX11 openal? ( media-libs/openal ) opengl? ( dev-qt/qtopengl:5 media-libs/freeglut virtual/glu virtual/opengl ) sdl? ( media-libs/libsdl2[opengl?,video] )
 SLOT=0
 SRC_URI=https://download.tuxfamily.org/yabause/releases/0.9.15/yabause-0.9.15.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_=28e7b1cfc5fe6a1148b9e23291618804
diff --git a/metadata/md5-cache/games-emulation/zsnes-2.0.9 b/metadata/md5-cache/games-emulation/zsnes-2.0.9
index 91691284c0f7..31e39d78778e 100644
--- a/metadata/md5-cache/games-emulation/zsnes-2.0.9
+++ b/metadata/md5-cache/games-emulation/zsnes-2.0.9
@@ -4,11 +4,12 @@ DEPEND=media-libs/libpng:=[abi_x86_32(-)] media-libs/libsdl[abi_x86_32(-),joysti
 DESCRIPTION=Fork of the classic Super Nintendo emulator
 EAPI=8
 HOMEPAGE=https://github.com/xyproto/zsnes/ https://www.zsnes.com/
+INHERIT=desktop flag-o-matic multilib toolchain-funcs
 IUSE=custom-cflags
 KEYWORDS=-* ~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=media-libs/libpng:=[abi_x86_32(-)] media-libs/libsdl[abi_x86_32(-),joystick,opengl,sound,video] sys-libs/zlib:=[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)]
 SLOT=0
 SRC_URI=https://github.com/xyproto/zsnes/archive/2.0.9.tar.gz -> zsnes-2.0.9.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8d1801eeeeec078928c79334c67c0226