gentoo resync : 09.07.2022

18 files changed, 345 insertions, 483 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index fcccce3814c9..6eafaac300dd 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/desmume/Manifest b/games-emulation/desmume/Manifest
index 70124f7c1047..4666bdc08b18 100644
--- a/games-emulation/desmume/Manifest
+++ b/games-emulation/desmume/Manifest
@@ -1,7 +1,5 @@
 AUX desmume-0.9.11_p20210409-fix-gtk-cliopts.patch 2969 BLAKE2B 8aa75d966e74a1d274f923636c9984558a738566b9e3bb101c30182d5929753c2ce528341708a69ab5db68c348e34a79590c79e8b8a6181f639248eb5381edb6 SHA512 a438cbebb2ba06ab66b9643df9ec9b1e922f02478a50d5cdc81cdb18ff688f48ea28fc289305dc5daa2f553760dcd0b1a02c729d48e9fd9b35f03a79a9096c07
 AUX desmume-0.9.11_p20210409-openal-automagic.patch 315 BLAKE2B cf203d506460deb88b6bc366d993e2376ebb6b2ac6d4e9c1d8eeda3aba0e0ab4ffe994c5855cf58babd2d25f86807289dbe48a37cace30732ecdc47363cdcbba SHA512 5d584a18595584ec8f23b74ceef5e3667d4e91a3b35def7cab715a9325a797f1b457dcff4dc804088aa047be49b0f828a28800a4713929ac4073bdf7a99b3b25
-DIST desmume-0.9.11_p20211119.tar.gz 13266678 BLAKE2B 0af12f9fd7f3448d4f18a61ec65f1a64926f402827bd9eb8af4a06766390dc626940c327e2bb0ff17d4d62eefe1171c4a836e98dbbbc34bf5d4e9e6d886189a0 SHA512 53553771b51741c2c553e47befec1eb90bdaa3c9ff239bdb301054dbaf5c483c768dac440fece797c9756f3c1490ad61da59b3b5728328b7f23aaa5e1de40625
 DIST desmume-0.9.13.tar.xz 10437780 BLAKE2B d5ca5ec66aceff3d5aa5adf338a44cced4d30104f288172f4438a88402f9af0c161d1f0cd0401d184fa66ebbde684d4cd206179a7f6377d27e4dd9ae3d3e7bcd SHA512 b756c5a5d79479e38c6135e4dcff3bdbaf78a4860699320305c81056bd6e7b8ba4db3c3d3879e2ac226b095783357b9f579c0486cafbbbdcee8456e1469efd9e
-EBUILD desmume-0.9.11_p20211119.ebuild 1240 BLAKE2B a0dae55b4757560002918fca5899a391b1ddfc548ed22aa8aed410343d3192c2e10ce03daddd4101021e399a1118a13d677e12ff2d709a9a84e03a8518199ba4 SHA512 4aa6d6e1f550c5c91391f2243bb3bffd71a278b4b33ccdef04d2d796a385c5e70af7413244f284ee35508ac51cafee26445a9be301536333710a5f72eee431fe
 EBUILD desmume-0.9.13.ebuild 1161 BLAKE2B b7cee8744702dee47e3a3af912a36cfbd719cdc270fedde283f9c6e7dad2f6f355adf37137306395645f29e6e3292979e08ec28f703d9d22793cad1ed5b6ec15 SHA512 6771f8f9b398e048030ffc217279df562af74f965bb12a8a90bd25469e7487e55dc75772c3d9c4389ad17542f51e3cdab82fd7ac14822feba456b0ae06aa6f7b
 MISC metadata.xml 634 BLAKE2B 91988d51bd4fc569685d68014de840113a5c046c33fe07f638af08d57c35cb92976a5004c23047e1fdcab2349426a70e2411ca654b46b639a335ee2a1d58a97f SHA512 28e671fab8e8aaef4d6573fe8d5cf490d1e1288d756240b27370eb58a631af96c2078a2fdbdc17320515b28c86cd90f3399299f7d00f9af6f1c91ce7312a8301
diff --git a/games-emulation/desmume/desmume-0.9.11_p20211119.ebuild b/games-emulation/desmume/desmume-0.9.11_p20211119.ebuild
deleted file mode 100644
index 053083d697f1..000000000000
--- a/games-emulation/desmume/desmume-0.9.11_p20211119.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson xdg
-
-DESMUME_COMMIT="b4080b2cae2f8e2700e318b97e369915e8995796"
-
-DESCRIPTION="Nintendo DS emulator"
-HOMEPAGE="https://desmume.org/"
-SRC_URI="https://github.com/TASVideos/desmume/archive/${DESMUME_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${DESMUME_COMMIT}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gdb +gui openal wifi"
-
-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 )"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.11_p20210409-fix-gtk-cliopts.patch
-	"${FILESDIR}"/${PN}-0.9.11_p20210409-openal-automagic.patch
-)
-
-DOCS=( ${PN}/{AUTHORS,ChangeLog,README,README.LIN,doc/.} )
-
-src_configure() {
-	local EMESON_SOURCE=${S}/${PN}/src/frontend/posix
-	local emesonargs=(
-		$(meson_use gdb gdb-stub)
-		$(meson_use gui frontend-gtk)
-		$(meson_use openal)
-		$(meson_use wifi)
-	)
-	meson_src_configure
-}
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index 7881d8c3950e..093c1fd0fd9b 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -3,6 +3,6 @@ DIST dolphin-5.0_p20210506.tar.gz 42098693 BLAKE2B bb9e5b5eb344bd944753c0198d583
 DIST dolphin-5.0_p20220520.tar.gz 34880474 BLAKE2B 925cddfe8a5d6febced5721bea6ced7c8d2855619f74ca8940b95dc78ea523b4a1083b9ef6efe3561d833b8e9ecb742cb2adf5a1864c06b629b3ecd9e92cc871 SHA512 4993cb10061b142f6627c96493885a5f9d88857d8949c2e8e8d5df5ba6e19b4f98d199da5e641d3d61294884e1cbbe8191bc5b4445c60bf80723046b2524aad5
 DIST mgba-40d4c430fc36caeb7ea32fd39624947ed487d2f2.tar.gz 12921593 BLAKE2B 8c5cf7b9b53f897f6248ad6bc51efafaa8a9d5df137d42d30f4b042b6d1527049644595938626c8cae1385d329bc45bf42db8dcc4424b963a3899e0df53246eb SHA512 26d7b60cbc7415652bb9ca2a42ccd532856867db57bf6dd91d8204551970109b6b9f4a96c42d643ea96b9d071d6aec924d3c1bb79c251c95183b7fb8536456c9
 EBUILD dolphin-5.0_p20210506-r3.ebuild 4464 BLAKE2B 55c1c06f54b6f1b0cb97d17bfc79e88fe639f0a11c4d6c67e77b51576b4cab883a9f64410805ebb99ffdcb70b75bad1e0abfe9b621f3e10e46202b194873d153 SHA512 2078b5dd79e4828ef4685351cd5764ca0dfdceec6c3db11405d1636e1385d8536b1bd06f5a571f8f460304c398164c458e52994f3a31f6e741bd726aca130aa3
-EBUILD dolphin-5.0_p20220520.ebuild 4571 BLAKE2B afa711f5ea6044f935ac0d964215a95681fbc809d79451fbc356293e7faaef0804b18c845da7392183ea04ceafbca4968c5c2a129b00dd8a08506ff2b2bf262c SHA512 0c74f4c42217f4b03f8a5dd58157fda88c8467fa15235b7a5146335a9ade5751613e9f056d92b34513cd740753f13c70fb5bacbeef10b99dd87e41ad5bbe6275
+EBUILD dolphin-5.0_p20220520.ebuild 4571 BLAKE2B 019018582bb7ce3044bb5458b3f12c545d433905369a4986cae6917c71aee2609014b8da9b26b96ecaa1edf20dc59f5ba98706bec69470c917fe94dfee38a35c SHA512 deae8339205052387caf129b1164fbb15e96ae0bbb49000aaff194babfe9a07edbeeebf1ccd322efa6f0cef3908a72bba29ed572c296c7b03215081d2d354b84
 EBUILD dolphin-9999.ebuild 4571 BLAKE2B afa711f5ea6044f935ac0d964215a95681fbc809d79451fbc356293e7faaef0804b18c845da7392183ea04ceafbca4968c5c2a129b00dd8a08506ff2b2bf262c SHA512 0c74f4c42217f4b03f8a5dd58157fda88c8467fa15235b7a5146335a9ade5751613e9f056d92b34513cd740753f13c70fb5bacbeef10b99dd87e41ad5bbe6275
 MISC metadata.xml 1014 BLAKE2B dd84038010d16d37449491e1df7236b95a7dc30097264a9f9d1a542b59feffe3b1e6a6dba318fe856eaac7b7470a1c316c5378dabcccd8ef6f7f101f5ee683c5 SHA512 87b4cb7475697d7fad526c3dcae604aa9d4f8facf68b0bcdbb1c931a839c998a34977acdd1aec9cacfa7f9a8b7d3f9e33d6f1253a0f1899fa2e3439f1ebc08a6
diff --git a/games-emulation/dolphin/dolphin-5.0_p20220520.ebuild b/games-emulation/dolphin/dolphin-5.0_p20220520.ebuild
index d888afe15b4d..381435640b8f 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20220520.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20220520.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
 	app-arch/xz-utils:=
 	app-arch/zstd:=
 	dev-libs/hidapi:=
-	>=dev-libs/libfmt-8:=
+	=dev-libs/libfmt-8*:=
 	dev-libs/lzo:=
 	dev-libs/pugixml:=
 	media-libs/cubeb:=
diff --git a/games-emulation/mgba/Manifest b/games-emulation/mgba/Manifest
index 7875b19e01e3..80df47a8a742 100644
--- a/games-emulation/mgba/Manifest
+++ b/games-emulation/mgba/Manifest
@@ -1,8 +1,7 @@
-AUX mgba-0.9.3-ffmpeg5.patch 4952 BLAKE2B a6f03faafb0316516aba79bb5c6e7c474124ea4259c34456bc28cb4aa86543da7ddfed363256160294293f4882e3116076400c042caf7e1f31811739f8fd86dd SHA512 5badf11d8d24ed2cb13c45e7ff9d56159c63b2557076fe92ade4d0b7051bfcd0f8b9fc3c8bf95faf5612789c9aa6609fc8e0c11b6e9a00816f2a17b72a3c183c
+AUX mgba-0.9.3-ffmpeg5.patch 4576 BLAKE2B ffce6592f2ff469a97831dd9ed8ede27bbe070ba0434545b4ff477f0f8652a15d320b205d227d3b21043127e60a4f7f326ea6c062d8bc04645b87d9af71cebdd SHA512 cce9ddd1d5bed70f1b996948afb31b5c827ccb0e2878fb032a65543551925e4a6d6a7f72a0380156b1f8a6e3720d3479d5e5e45026f7860c29fba022fd4df3d5
 DIST mgba-0.9.2.tar.gz 12761919 BLAKE2B f0f3ca5f47d38c8018541426a229d52a2ebc9e47dc07fe4b739bde3f7ef2a4d75e6db5ca5f8dfaee01ae9648035f24c9d02556078b0b5eb51aefecfc9305432d SHA512 ea9868c104996c44a2fcfdf9d3f4d6177b853dec478ab7a2dd19a0f127b597a887150200bfbf14de593328217ff5493ca675bfcb4f0b2ee6a5097e0cdf0e2997
 DIST mgba-0.9.3.tar.gz 12763090 BLAKE2B 7d9ff6fc7bdff5d734540b74893a888d400b4bb6e1ce5b3b2a856239db8798ac76b8535dc770330d0451e2568a6d402558eeef27d643c0d5d3454441f45cf09b SHA512 da65b3c7ec32d732163f129c4fd38949ae2da2980beb3257bf6def5e35534a27b6d30309bb3c9a8d651642f99e1a45db7a8577c8dbf5472153d4551167471b3a
 EBUILD mgba-0.9.2.ebuild 2665 BLAKE2B e51a4a1dc11165c34f868fcb158d17993ce353340347753a30c29e8b154e64fca74ace2f62f669cac8cdec75712a29ac9ca776921a41c14a1630a130e3e491f3 SHA512 b1c3537ec21c54f620106f738099ada4f987cce85021f1b74d91e8966be9a423d38ffc0970c94beac604a4bcadcb21a8f53c59c82852a4915ac22a2c3747c363
-EBUILD mgba-0.9.3-r1.ebuild 2729 BLAKE2B 7986a68ce6802698b0a1f5e95887d8906bfb513f6f716bf9748633492a63b6f7877c2332d3bcbe8f12d7dca28bea5c59c16cb66ea02291a7482375bf2854b16b SHA512 bb866d0984c0b718a4f34c6409569ae99deb21b8f7aa64219ce6969124c6f11231f09e1664f1bfac5282acd8fccd18a2d1700b28b7060427b29c224047902981
-EBUILD mgba-0.9.3.ebuild 2667 BLAKE2B 6ecc15660f152df0260a517a385ec261e6902be59193e8b0cb8bdfe53d3d480e9150402e9350fa72603bd4004d08a8bc25d334b1253688c2ff46aad9b01d5253 SHA512 cc35bed7f09990ccbbc881acfd1a7e2673012e7e04aadd3fa9e739b123a7eef8989ed6893b729ce0a69642ccba8c692b780899d931881240178666821af444f0
-EBUILD mgba-9999.ebuild 2667 BLAKE2B 6ecc15660f152df0260a517a385ec261e6902be59193e8b0cb8bdfe53d3d480e9150402e9350fa72603bd4004d08a8bc25d334b1253688c2ff46aad9b01d5253 SHA512 cc35bed7f09990ccbbc881acfd1a7e2673012e7e04aadd3fa9e739b123a7eef8989ed6893b729ce0a69642ccba8c692b780899d931881240178666821af444f0
-MISC metadata.xml 633 BLAKE2B b875463eced72f4eaf75479126cac68bd9eebbdf4607852afe1906d1760ac03a2f4ab130f72998390923953f6a42b8ebc8889e3c02ad8d33fd8dc30de5055b44 SHA512 e69b1ace1cfe6aef1ba7df73b5846782f623aad78c5f62cabce380d0e12639c782b8828bf72826ecea695e84277a64609d6007ab37e5a00b2479ec8605ca9b5a
+EBUILD mgba-0.9.3-r2.ebuild 2200 BLAKE2B e71cd0e5bd55406a48a723b8fba9d3f3fa2c627d0e8f8b6b3be7f85259e3200e0aeb84c12dbe32c7629b68b49e5dff1154213b119a490b100082147110797c4c SHA512 93eeb2b17b614f6a16e13a556e3781d13f53eda6da0e4c895e30758df3abb22282c024dd7730aca19928d22f26698cac694a8f13c94f83ccdfbf7042919a2572
+EBUILD mgba-9999.ebuild 2483 BLAKE2B 8ed68ea62f61ea0446de6af955230f351cf958ecde411ccdb79bfebe0c7e9ea652afbbd33e26efc422bbd158e00cc29324073f378acd2c7d7aa15cbb6cad5778 SHA512 c026ff1d8c75e5ac8e3aa9576c1967e9e9d3835fab7210e47bf19ce76ca5eec6ec1691bfac2d22ceb4c5c134d60e9a3b8eeb68179cd3f01c80a66ad4f071e71c
+MISC metadata.xml 686 BLAKE2B 14edb52fcb9e889ba151f05141d2f0b866a27ddb87943ee99a71223c747ae72423cbda0a8646b32ea175c13a67305bbba01c5062e3f73efba636f2d4a744de55 SHA512 3d671e43a9c0991131cce93bcc4b3c4da32fd67ebdbc57b404eafc4f235b3ad7af1417801bd84578d76553829b3ebfeb29d5a7f9871d11812e681759a2232698
diff --git a/games-emulation/mgba/files/mgba-0.9.3-ffmpeg5.patch b/games-emulation/mgba/files/mgba-0.9.3-ffmpeg5.patch
index cf4f6f56a2d4..6b8d55c377ea 100644
--- a/games-emulation/mgba/files/mgba-0.9.3-ffmpeg5.patch
+++ b/games-emulation/mgba/files/mgba-0.9.3-ffmpeg5.patch
@@ -1,15 +1,9 @@
-From cdc753516798882a805db1d2042dbce8313382bf Mon Sep 17 00:00:00 2001
+https://bugs.gentoo.org/834374
+
+https://github.com/mgba-emu/mgba/commit/cdc753516798882a805db1d2042dbce8313382bf
 From: Ryan Tandy <ryan@nardis.ca>
 Date: Thu, 3 Feb 2022 19:02:52 -0800
 Subject: [PATCH] FFmpeg: Support FFmpeg 5.0
-
----
- src/feature/ffmpeg/ffmpeg-decoder.c |  3 ++-
- src/feature/ffmpeg/ffmpeg-encoder.c | 25 ++++++++++++++-----------
- 2 files changed, 16 insertions(+), 12 deletions(-)
-
-diff --git a/src/feature/ffmpeg/ffmpeg-decoder.c b/src/feature/ffmpeg/ffmpeg-decoder.c
-index c3bb6d1c5c..daa47fbf2c 100644
 --- a/src/feature/ffmpeg/ffmpeg-decoder.c
 +++ b/src/feature/ffmpeg/ffmpeg-decoder.c
 @@ -5,6 +5,7 @@
@@ -29,8 +23,6 @@ index c3bb6d1c5c..daa47fbf2c 100644
  		struct AVCodecContext* context = NULL;
  		if (type == AVMEDIA_TYPE_VIDEO && decoder->videoStream < 0) {
  			decoder->video = avcodec_alloc_context3(NULL);
-diff --git a/src/feature/ffmpeg/ffmpeg-encoder.c b/src/feature/ffmpeg/ffmpeg-encoder.c
-index ad76ca57b2..be6bd3af5e 100644
 --- a/src/feature/ffmpeg/ffmpeg-encoder.c
 +++ b/src/feature/ffmpeg/ffmpeg-encoder.c
 @@ -12,6 +12,9 @@
diff --git a/games-emulation/mgba/metadata.xml b/games-emulation/mgba/metadata.xml
index e99f6fd576d4..9e784de51af0 100644
--- a/games-emulation/mgba/metadata.xml
+++ b/games-emulation/mgba/metadata.xml
@@ -10,6 +10,7 @@
     <flag name="elf">Enable the use of elf utils via <pkg>dev-libs/elfutils</pkg></flag>
     <flag name="gles2">Build OpenGL ES 2.x RenderSystem</flag>
     <flag name="gles3">Build OpenGL ES 3.x RenderSystem</flag>
+    <flag name="libretro">Build libretro port</flag>
   </use>
   <upstream>
     <remote-id type="github">mgba-emu/mgba</remote-id>
diff --git a/games-emulation/mgba/mgba-0.9.3-r1.ebuild b/games-emulation/mgba/mgba-0.9.3-r1.ebuild
deleted file mode 100644
index 8ac2d817bb04..000000000000
--- a/games-emulation/mgba/mgba-0.9.3-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop xdg
-
-DESCRIPTION="Game Boy Advance emulator written in C"
-HOMEPAGE="https://mgba.io"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mgba-emu/mgba.git"
-else
-	MY_PV="${PV/_beta/-b}"
-	SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	[[ "${PV}" == *_beta* ]] || \
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-LICENSE="MPL-2.0"
-SLOT="0"
-IUSE="debug discord elf ffmpeg gles2 gles3 opengl qt5 +sdl sqlite"
-REQUIRED_USE="|| ( qt5 sdl )
-		qt5? ( opengl )"
-
-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 )
-"
-DEPEND="${RDEPEND}
-	gles2? ( media-libs/libglvnd )
-	gles3? ( media-libs/libglvnd )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-ffmpeg5.patch" #834374
-)
-
-src_prepare() {
-	xdg_environment_reset
-	cmake_src_prepare
-
-	# Get rid of any bundled stuff we don't want
-	local pkg
-	for pkg in libpng lzma sqlite3 zlib ; do
-		rm -r src/third-party/${pkg} || die
-	done
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_GL="$(usex opengl)"
-		-DBUILD_GLES2="$(usex gles2)"
-		-DBUILD_GLES3="$(usex gles3)"
-		-DBUILD_PYTHON=OFF
-		-DBUILD_QT="$(usex qt5)"
-		-DBUILD_SDL="$(usex sdl)"
-		-DBUILD_SHARED=ON
-		# test suite fails to build (>=0.6.0)
-		-DBUILD_SUITE=OFF
-		-DBUILD_TEST=OFF
-		-DM_CORE_GB=ON
-		-DM_CORE_GBA=ON
-		-DUSE_DEBUGGERS="$(usex debug)"
-		-DUSE_DISCORD_RPC="$(usex discord)"
-		-DUSE_EDITLINE="$(usex debug)"
-		-DUSE_ELF="$(usex elf)"
-		-DUSE_EPOXY=OFF
-		-DUSE_FFMPEG="$(usex ffmpeg)"
-		-DUSE_GDB_STUB="$(usex debug)"
-		-DUSE_LIBZIP=OFF
-		-DUSE_LZMA=OFF
-		-DUSE_MINIZIP=ON
-		-DUSE_PNG=ON
-		-DUSE_SQLITE3="$(usex sqlite)"
-		-DUSE_ZLIB=ON
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_install() {
-	if use qt5 ; then
-		dobin "${BUILD_DIR}"/qt/${PN}-qt
-		doman doc/${PN}-qt.6
-		domenu res/${PN}-qt.desktop
-		for size in 16 24 32 48 64 96 128 256 ; do
-			newicon -s ${size} res/${PN}-${size}.png ${PN}.png
-		done
-	fi
-	if use sdl ; then
-		doman doc/${PN}.6
-		newbin "${BUILD_DIR}"/sdl/${PN} ${PN}-sdl
-	fi
-
-	dolib.so "${BUILD_DIR}"/lib${PN}.so*
-}
-
-pkg_preinst() {
-	if use qt5 ; then
-		xdg_pkg_preinst
-	fi
-}
-
-pkg_postinst() {
-	if use qt5 ; then
-		xdg_pkg_postinst
-	fi
-}
-
-pkg_postrm() {
-	if use qt5 ; then
-		xdg_pkg_postrm
-	fi
-}
diff --git a/games-emulation/mgba/mgba-0.9.3-r2.ebuild b/games-emulation/mgba/mgba-0.9.3-r2.ebuild
new file mode 100644
index 000000000000..4d806f22f62f
--- /dev/null
+++ b/games-emulation/mgba/mgba-0.9.3-r2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mgba-emu/mgba.git"
+else
+	SRC_URI="https://github.com/mgba-emu/mgba/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Game Boy Advance Emulator"
+HOMEPAGE="https://mgba.io/"
+
+LICENSE="MPL-2.0 BSD LGPL-2.1+ public-domain discord? ( MIT )"
+SLOT="0/9"
+IUSE="debug discord elf ffmpeg gles2 gles3 gui libretro opengl +sdl sqlite test"
+# gles2/gles3 opengl require can be lifted in next version (bug #835039)
+REQUIRED_USE="
+	|| ( gui sdl )
+	gles2? ( opengl )
+	gles3? ( opengl )
+	gui? ( || ( gles2 opengl ) )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	media-libs/libpng:=
+	sys-libs/zlib:=[minizip]
+	debug? ( dev-libs/libedit )
+	elf? ( dev-libs/elfutils )
+	ffmpeg? ( media-video/ffmpeg:= )
+	gles2? ( media-libs/libglvnd )
+	gles3? ( media-libs/libglvnd )
+	opengl? ( media-libs/libglvnd )
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+	)
+	sdl? ( media-libs/libsdl2[sound,joystick,opengl?,video] )
+	sqlite? ( dev-db/sqlite:3 )"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cmocka )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-ffmpeg5.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CINEMA=$(usex test)
+		-DBUILD_GL=$(usex opengl)
+		-DBUILD_GLES2=$(usex gles2)
+		-DBUILD_GLES3=$(usex gles3)
+		-DBUILD_LIBRETRO=$(usex libretro)
+		-DBUILD_QT=$(usex gui)
+		-DBUILD_SDL=$(usex sdl)
+		-DBUILD_SUITE=$(usex test)
+		-DMARKDOWN=OFF #752048
+		-DUSE_DEBUGGERS=$(usex debug)
+		-DUSE_DISCORD_RPC=$(usex discord)
+		-DUSE_EDITLINE=$(usex debug)
+		-DUSE_ELF=$(usex elf)
+		-DUSE_EPOXY=OFF
+		-DUSE_FFMPEG=$(usex ffmpeg)
+		-DUSE_GDB_STUB=$(usex debug)
+		-DUSE_LIBZIP=OFF
+		-DUSE_LZMA=ON
+		-DUSE_MINIZIP=ON
+		-DUSE_PNG=ON
+		-DUSE_SQLITE3=$(usex sqlite)
+		-DUSE_ZLIB=ON
+		$(usev libretro -DLIBRETRO_LIBDIR="${EPREFIX}"/usr/$(get_libdir)/libretro)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	use !test || rm "${ED}"/usr/bin/mgba-cinema || die
+
+	rm -r "${ED}"/usr/share/doc/${PF}/{LICENSE,licenses} || die
+}
diff --git a/games-emulation/mgba/mgba-0.9.3.ebuild b/games-emulation/mgba/mgba-0.9.3.ebuild
deleted file mode 100644
index bfc1bea7e039..000000000000
--- a/games-emulation/mgba/mgba-0.9.3.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop xdg
-
-DESCRIPTION="Game Boy Advance emulator written in C"
-HOMEPAGE="https://mgba.io"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mgba-emu/mgba.git"
-else
-	MY_PV="${PV/_beta/-b}"
-	SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	[[ "${PV}" == *_beta* ]] || \
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-LICENSE="MPL-2.0"
-SLOT="0"
-IUSE="debug discord elf ffmpeg gles2 gles3 opengl qt5 +sdl sqlite"
-REQUIRED_USE="|| ( qt5 sdl )
-		qt5? ( opengl )"
-
-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 )
-"
-DEPEND="${RDEPEND}
-	gles2? ( media-libs/libglvnd )
-	gles3? ( media-libs/libglvnd )
-"
-
-src_prepare() {
-	xdg_environment_reset
-	cmake_src_prepare
-
-	# Get rid of any bundled stuff we don't want
-	local pkg
-	for pkg in libpng lzma sqlite3 zlib ; do
-		rm -r src/third-party/${pkg} || die
-	done
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_GL="$(usex opengl)"
-		-DBUILD_GLES2="$(usex gles2)"
-		-DBUILD_GLES3="$(usex gles3)"
-		-DBUILD_PYTHON=OFF
-		-DBUILD_QT="$(usex qt5)"
-		-DBUILD_SDL="$(usex sdl)"
-		-DBUILD_SHARED=ON
-		# test suite fails to build (>=0.6.0)
-		-DBUILD_SUITE=OFF
-		-DBUILD_TEST=OFF
-		-DM_CORE_GB=ON
-		-DM_CORE_GBA=ON
-		-DUSE_DEBUGGERS="$(usex debug)"
-		-DUSE_DISCORD_RPC="$(usex discord)"
-		-DUSE_EDITLINE="$(usex debug)"
-		-DUSE_ELF="$(usex elf)"
-		-DUSE_EPOXY=OFF
-		-DUSE_FFMPEG="$(usex ffmpeg)"
-		-DUSE_GDB_STUB="$(usex debug)"
-		-DUSE_LIBZIP=OFF
-		-DUSE_LZMA=OFF
-		-DUSE_MINIZIP=ON
-		-DUSE_PNG=ON
-		-DUSE_SQLITE3="$(usex sqlite)"
-		-DUSE_ZLIB=ON
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_install() {
-	if use qt5 ; then
-		dobin "${BUILD_DIR}"/qt/${PN}-qt
-		doman doc/${PN}-qt.6
-		domenu res/${PN}-qt.desktop
-		for size in 16 24 32 48 64 96 128 256 ; do
-			newicon -s ${size} res/${PN}-${size}.png ${PN}.png
-		done
-	fi
-	if use sdl ; then
-		doman doc/${PN}.6
-		newbin "${BUILD_DIR}"/sdl/${PN} ${PN}-sdl
-	fi
-
-	dolib.so "${BUILD_DIR}"/lib${PN}.so*
-}
-
-pkg_preinst() {
-	if use qt5 ; then
-		xdg_pkg_preinst
-	fi
-}
-
-pkg_postinst() {
-	if use qt5 ; then
-		xdg_pkg_postinst
-	fi
-}
-
-pkg_postrm() {
-	if use qt5 ; then
-		xdg_pkg_postrm
-	fi
-}
diff --git a/games-emulation/mgba/mgba-9999.ebuild b/games-emulation/mgba/mgba-9999.ebuild
index bfc1bea7e039..c7121c11ef4a 100644
--- a/games-emulation/mgba/mgba-9999.ebuild
+++ b/games-emulation/mgba/mgba-9999.ebuild
@@ -3,126 +3,100 @@
 
 EAPI=8
 
-inherit cmake desktop xdg
+LUA_COMPAT=( lua5-{3..4} )
+inherit cmake lua-single xdg
 
-DESCRIPTION="Game Boy Advance emulator written in C"
-HOMEPAGE="https://mgba.io"
-if [[ "${PV}" == 9999 ]] ; then
+if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/mgba-emu/mgba.git"
 else
-	MY_PV="${PV/_beta/-b}"
-	SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	[[ "${PV}" == *_beta* ]] || \
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	S="${WORKDIR}/${PN}-${MY_PV}"
+	SRC_URI="https://github.com/mgba-emu/mgba/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
-LICENSE="MPL-2.0"
-SLOT="0"
-IUSE="debug discord elf ffmpeg gles2 gles3 opengl qt5 +sdl sqlite"
-REQUIRED_USE="|| ( qt5 sdl )
-		qt5? ( opengl )"
+
+DESCRIPTION="Game Boy Advance Emulator"
+HOMEPAGE="https://mgba.io/"
+
+LICENSE="MPL-2.0 BSD LGPL-2.1+ public-domain discord? ( MIT )"
+SLOT="0/10"
+IUSE="debug discord elf ffmpeg gles2 gles3 gui libretro lua opengl +sdl sqlite test"
+REQUIRED_USE="
+	|| ( gui sdl )
+	gui? ( || ( gles2 gles3 opengl ) )
+	lua? ( ${LUA_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
-	media-libs/libpng:0=
-	sys-libs/zlib[minizip]
+	media-libs/libpng:=
+	sys-libs/zlib:=[minizip]
 	debug? ( dev-libs/libedit )
 	elf? ( dev-libs/elfutils )
 	ffmpeg? ( media-video/ffmpeg:= )
+	gles2? ( media-libs/libglvnd )
+	gles3? ( media-libs/libglvnd )
+	lua? ( ${LUA_DEPS} )
 	opengl? ( media-libs/libglvnd )
-	qt5? (
+	gui? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
 		dev-qt/qtmultimedia:5
+		dev-qt/qtnetwork:5
 		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
 	)
-	sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] )
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${RDEPEND}
-	gles2? ( media-libs/libglvnd )
-	gles3? ( media-libs/libglvnd )
-"
-
-src_prepare() {
-	xdg_environment_reset
-	cmake_src_prepare
+	sdl? ( media-libs/libsdl2[sound,joystick,opengl?,video] )
+	sqlite? ( dev-db/sqlite:3 )"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cmocka )"
+BDEPEND="lua? ( virtual/pkgconfig )"
 
-	# Get rid of any bundled stuff we don't want
-	local pkg
-	for pkg in libpng lzma sqlite3 zlib ; do
-		rm -r src/third-party/${pkg} || die
-	done
+pkg_setup() {
+	use lua && lua-single_pkg_setup
 }
 
 src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_GL="$(usex opengl)"
-		-DBUILD_GLES2="$(usex gles2)"
-		-DBUILD_GLES3="$(usex gles3)"
-		-DBUILD_PYTHON=OFF
-		-DBUILD_QT="$(usex qt5)"
-		-DBUILD_SDL="$(usex sdl)"
-		-DBUILD_SHARED=ON
-		# test suite fails to build (>=0.6.0)
-		-DBUILD_SUITE=OFF
-		-DBUILD_TEST=OFF
-		-DM_CORE_GB=ON
-		-DM_CORE_GBA=ON
-		-DUSE_DEBUGGERS="$(usex debug)"
-		-DUSE_DISCORD_RPC="$(usex discord)"
-		-DUSE_EDITLINE="$(usex debug)"
-		-DUSE_ELF="$(usex elf)"
+		-DBUILD_CINEMA=$(usex test)
+		-DBUILD_GL=$(usex opengl)
+		-DBUILD_GLES2=$(usex gles2)
+		-DBUILD_GLES3=$(usex gles3)
+		-DBUILD_LIBRETRO=$(usex libretro)
+		-DBUILD_QT=$(usex gui)
+		-DBUILD_SDL=$(usex sdl)
+		-DBUILD_SUITE=$(usex test)
+		-DENABLE_SCRIPTING=$(usex lua)
+		-DMARKDOWN=OFF #752048
+		-DUSE_DEBUGGERS=$(usex debug)
+		-DUSE_DISCORD_RPC=$(usex discord)
+		-DUSE_EDITLINE=$(usex debug)
+		-DUSE_ELF=$(usex elf)
 		-DUSE_EPOXY=OFF
-		-DUSE_FFMPEG="$(usex ffmpeg)"
-		-DUSE_GDB_STUB="$(usex debug)"
+		-DUSE_FFMPEG=$(usex ffmpeg)
+		-DUSE_GDB_STUB=$(usex debug)
 		-DUSE_LIBZIP=OFF
-		-DUSE_LZMA=OFF
+		-DUSE_LZMA=ON
 		-DUSE_MINIZIP=ON
 		-DUSE_PNG=ON
-		-DUSE_SQLITE3="$(usex sqlite)"
+		-DUSE_SQLITE3=$(usex sqlite)
 		-DUSE_ZLIB=ON
+		$(usev libretro -DLIBRETRO_LIBDIR="${EPREFIX}"/usr/$(get_libdir)/libretro)
 	)
-	cmake_src_configure
-}
+	use lua && mycmakeargs+=( -DUSE_LUA=$(ver_cut 1-2 $(lua_get_version)) )
 
-src_compile() {
-	cmake_src_compile
+	cmake_src_configure
 }
 
-src_install() {
-	if use qt5 ; then
-		dobin "${BUILD_DIR}"/qt/${PN}-qt
-		doman doc/${PN}-qt.6
-		domenu res/${PN}-qt.desktop
-		for size in 16 24 32 48 64 96 128 256 ; do
-			newicon -s ${size} res/${PN}-${size}.png ${PN}.png
-		done
-	fi
-	if use sdl ; then
-		doman doc/${PN}.6
-		newbin "${BUILD_DIR}"/sdl/${PN} ${PN}-sdl
-	fi
+src_test() {
+	# CMakeLists.txt forces SKIP_RPATH=ON when PREFIX=/usr
+	local -x LD_LIBRARY_PATH=${BUILD_DIR}:${LD_LIBRARY_PATH}
 
-	dolib.so "${BUILD_DIR}"/lib${PN}.so*
+	cmake_src_test
 }
 
-pkg_preinst() {
-	if use qt5 ; then
-		xdg_pkg_preinst
-	fi
-}
+src_install() {
+	cmake_src_install
 
-pkg_postinst() {
-	if use qt5 ; then
-		xdg_pkg_postinst
-	fi
-}
+	use !test || rm "${ED}"/usr/bin/mgba-cinema || die
 
-pkg_postrm() {
-	if use qt5 ; then
-		xdg_pkg_postrm
-	fi
+	rm -r "${ED}"/usr/share/doc/${PF}/{LICENSE,licenses} || die
 }
diff --git a/games-emulation/openmsx/Manifest b/games-emulation/openmsx/Manifest
index 67f919db52fd..115feb36c2ff 100644
--- a/games-emulation/openmsx/Manifest
+++ b/games-emulation/openmsx/Manifest
@@ -1,3 +1,5 @@
 DIST openmsx-17.0.tar.gz 4045461 BLAKE2B 46c70ce3f853aecebf8bdeddc5786903634d88d013497383490d79b0dbf455f48a70b3658b9913db197cf7e66cbc6f4da37da58b1b24d77c75b731e842c663df SHA512 4fc87efd2bfbcd12bebb4e005b18b1cb2048f5d8f3188ef9b55f1e003c8d021fb47bd67d647137daa6a8640b5656b0db363f3b62158d690ddb5f7bf1af3459e1
+DIST openmsx-18.0.tar.gz 4151084 BLAKE2B 0d5b4e4745c12689e4227408481367b4b4faaa4c7c2830ec0c4b9a5eb90c4b415628cd21834384d39fa4a820c725431848e98f7ef722c437f7bb4f96ae7b14c4 SHA512 f395fae8eac3bcb9334251c1c266a8c4d2951d6510a7c4885ddbc95aaed39f4ef8ae12a177d4a9ff44745ca368055f55f9983029b47441f4fd9731696f79809f
 EBUILD openmsx-17.0.ebuild 2882 BLAKE2B 2aa8a567b5080dd487b9c7c69138df9acf2e3523fe57a57d5cfa74a7659028d1d8eba3aaa04696f941865c8878f175b8bc8249dda1dc5884b61a959c6dc12834 SHA512 4ce326368598aa63b83eb8da63f6f4f5250f4b8c5ba2bc078e4c2fbaaa26a14b9b261885e729c1f16d152fb66ec37c9a4fc36e5200acbde404c9659e824aa896
+EBUILD openmsx-18.0-r1.ebuild 2904 BLAKE2B 127580092641849cb6c0c06dff3c5e4f440f8b0ce23cf4129ed9eb57dd0d1f9540530df69d7d8f62bb44dfa287514175c9d69894e0243e2d48201b6c422f9e0c SHA512 a93334f586608e408e5867eed271a80708f94d356afa0559c606881ef689326af2d9d81bf7f857f95dac097e22a2cb40f98b19fec9dbe8d43e1f8b8825b1d39a
 MISC metadata.xml 442 BLAKE2B 579f3b84332385ce6f79c1f927bb3d4b1b112954695bd30425849946ec3994158a855fc9dbff8407775ad532a105e518ba30b4e72f3e42d3b64e2cadffaa9220 SHA512 a24a4c4cef293439f8ea46ad1261507160ea5024cbc53947915e6306a1356d5682440fa1eb230a98e715214c53024fa7ffe4aa97f1bb3f385c66c1ee69b8323f
diff --git a/games-emulation/openmsx/openmsx-18.0-r1.ebuild b/games-emulation/openmsx/openmsx-18.0-r1.ebuild
new file mode 100644
index 000000000000..74a4c7604b70
--- /dev/null
+++ b/games-emulation/openmsx/openmsx-18.0-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9,10,11} )
+
+inherit desktop flag-o-matic python-any-r1 readme.gentoo-r1 toolchain-funcs xdg
+
+DESCRIPTION="MSX emulator that aims for perfection"
+HOMEPAGE="https://openmsx.org/"
+SRC_URI="https://github.com/openMSX/openMSX/releases/download/RELEASE_${PV//./_}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+joystick"
+
+RDEPEND="dev-lang/tcl:0=
+	media-libs/alsa-lib
+	media-libs/harfbuzz:=
+	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"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}"
+
+DOC_CONTENTS="
+If you want to if you want to emulate real MSX systems and not
+only the free C-BIOS machines, put the system ROMs in one of
+the following directories: /usr/share/${PN}/systemroms
+or ~/.openMSX/share/systemroms
+"
+
+src_prepare() {
+	default
+	sed -i \
+		-e '/^LDFLAGS:=/d' \
+		-e '/LINK_FLAGS_PREFIX/d' \
+		-e '/LINK_FLAGS+=/s/-s//' \
+		-e '/LINK_FLAGS+=\$(TARGET_FLAGS)/s/$/ $(LDFLAGS)/' \
+		build/main.mk \
+		|| die
+	sed -i -e '/SYMLINK/s:true:false:' build/custom.mk || die
+	sed -i -e 's/GPL.txt//' doc/node.mk || die
+
+	# Build system only configured to use bundled version - but not from the
+	# directory it's distributed in
+	cp "${S}/Contrib/catch2/catch.hpp" "${S}/src/unittest" || die
+}
+
+src_configure() {
+	tc-export CXX
+
+	# Doesn't compile without this, and build system doesn't consistently add
+	# it properly for all compilers
+	append-cxxflags '-std=c++17'
+
+	default
+}
+
+src_compile() {
+	emake \
+		CXXFLAGS="${CXXFLAGS}" \
+		INSTALL_SHARE_DIR="${EPREFIX}/usr/share/${PN}" \
+		V=1
+}
+
+src_test() {
+	# To get tests, we need to build with OPENMSX_FLAVOUR=unittest and then the
+	# build is stored in a directory of the pattern
+	# ${WORKDIR}/derived/*-unittest/. This is separate from the actual build,
+	# stored in ${WORKDIR}/derived/*-opt. The unittest binary and the workdir
+	# binary are in each of these directories under their `bin` directories.
+	emake \
+		V=1 \
+		CXXFLAGS="${CXXFLAGS}" \
+		OPENMSX_FLAVOUR=unittest
+
+	# There will only ever be one *-unittest directory
+	"${S}"/derived/*-unittest/bin/openmsx || die
+}
+
+src_install() {
+	# To guarantee installing the proper binary in case tests were built,
+	# specify the default OPENMSX_FLAVOUR
+	emake \
+		V=1 \
+		INSTALL_BINARY_DIR="${ED}/usr/bin" \
+		INSTALL_SHARE_DIR="${ED}/usr/share/${PN}" \
+		INSTALL_DOC_DIR="${ED}/usr/share/doc/${PF}" \
+		OPENMSX_FLAVOUR=opt \
+		install
+
+	einstalldocs
+	readme.gentoo_create_doc
+
+	for i in 16 32 48 64 128 256 ; do
+		newicon -s "${i}" "share/icons/openMSX-logo-${i}.png" "${PN}.png"
+	done
+	make_desktop_entry "${PN}" "openMSX"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	xdg_pkg_postinst
+}
diff --git a/games-emulation/stella/Manifest b/games-emulation/stella/Manifest
index 115a4cea3477..4a3e27fee389 100644
--- a/games-emulation/stella/Manifest
+++ b/games-emulation/stella/Manifest
@@ -1,5 +1,3 @@
-DIST stella-6.6-src.tar.xz 10035924 BLAKE2B bb1b6a5d7ea9ada8aac24084f508692472f78a6e04528f57a88ca7ac76d23f0dfe1050a1f013103463b2ee2d7b842a9b30e1b36b2aefc183ce1a39682eb867fa SHA512 89aea0cec9c2f22f276c1c4b36b76deb1ef9fb913c959f93f8cbcac300acdb23d2e3e66981d3263ea1ccfd72aaab1aa47218136b82b5e12aa8fbf352959743ab
 DIST stella-6.7-src.tar.xz 10280224 BLAKE2B da2920384b6b254edd8f615c665ea1eef79030afffdf1b442f490f026c6f577ba4f7329531159767ba720207aeeb14388b5970bdd3e250b0db54e12d5f791396 SHA512 c20a2e9d98e1330f151e5f7d0e7cf15b2279b0d5f1175269f4084bf4964337b998118800615ae62eabf9d0f8abe0bb9cd02bddd1ee827121a49131888b4946ff
-EBUILD stella-6.6.ebuild 1191 BLAKE2B 25857f5c7510d9015088b56454995d09f96b88ea3e811ba0941717fceed635cee4aa00a57fdf79ef20c315fa6d94e8e160537020b1070df0832e5fbb8ae7cec3 SHA512 4910fd86b9559b1fb78a7ed2b2d7b103a737206a550f0de94d53521c6311bcf1fef91bb7dcdd50dc8da4b7819f8bf4e7f7f2e054e9cd3682ef886c3d78b0226d
 EBUILD stella-6.7.ebuild 1716 BLAKE2B eb3a1367b952b21d18647e19748b5c365c3d55ee5a7497a3688d9a3f1e80442277694511d2cafe70583b7f49ff279bbf2d7fbb8916352d611ac974cc47158ccd SHA512 ad7934501414e426ba8e979341e3636675ac93504c1aeb08d25270e564e52d91d0f1da04d3841906e235209cb1915e3da818b88ac21cf3d554a1717a86bc66b7
 MISC metadata.xml 387 BLAKE2B b0a5ff1a423343613aa6a17767261d65d644401f6945fb7f806363e3cfc291aa68927cc3640db016ca2d4ca1c8d830e9911f115759dd6613b53f2b30f1e6ba4b SHA512 3cdd0d8c089ef1f2635a88204abc739940ab1676699d579e0b2395cd02586d9cb7a4a70bd717724bf9e8a0fea68bccf3dc1060caab180ae6407b013138d6f269
diff --git a/games-emulation/stella/stella-6.6.ebuild b/games-emulation/stella/stella-6.6.ebuild
deleted file mode 100644
index 0524aef2872c..000000000000
--- a/games-emulation/stella/stella-6.6.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs xdg
-
-DESCRIPTION="Multi-platform Atari 2600 VCS Emulator"
-HOMEPAGE="https://stella-emu.github.io"
-SRC_URI="https://github.com/stella-emu/stella/releases/download/${PV}/${P}-src.tar.xz"
-
-LICENSE="GPL-2+ BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+joystick png zlib"
-REQUIRED_USE="png? ( zlib )"
-
-RDEPEND="
-	media-libs/libsdl2[joystick?,opengl,sound,video]
-	png? ( media-libs/libpng:= )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	sed -i '/CXXFLAGS+=/s/-fomit-frame-pointer//' Makefile || die
-}
-
-src_configure() {
-	tc-export CC CXX
-
-	# not an autotools generated script
-	local configure=(
-		./configure
-		--host=${CHOST}
-		--prefix="${EPREFIX}"/usr
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}/html
-		$(use_enable joystick)
-		$(use_enable png)
-		$(use_enable zlib zip)
-		${EXTRA_ECONF}
-	)
-
-	echo ${configure[*]}
-	"${configure[@]}" || die
-}
-
-src_install() {
-	local DOCS=(
-		Announce.txt Changes.txt README-SDL.txt
-		Readme.txt docs/R77_readme.txt Todo.txt
-	)
-
-	default
-
-	rm "${ED}"/usr/share/doc/${PF}/html/*.txt || die
-}
diff --git a/games-emulation/zsnes/Manifest b/games-emulation/zsnes/Manifest
index 3fb9332efcca..60f40266236a 100644
--- a/games-emulation/zsnes/Manifest
+++ b/games-emulation/zsnes/Manifest
@@ -1,5 +1,7 @@
 AUX zsnes-2.0.9-cc-quotes.patch 375 BLAKE2B 8d9295648dbed975c36494f6d8f8253d40e03b21d41ee41d306439411fb989962ea787c231b00b0f61ddeef459b7cead357b01c49df281380cd8a10b3983fc32 SHA512 554b3634edb5a4d542b359e4a3bd248ecaa3888e273d04d846389716b637bb167e1b8eb19abcaf025051a31a1b459d3fb84a648f413f0654265d1ca30c0e5448
 AUX zsnes-2.0.9-gentoo-zlib.patch 310 BLAKE2B de05b0595eb37fad0eebed9b4c667bc4f21c3b1445864c0c9e2142d457ee7adda87ff283ad183698bc60ceb4a40766804da21640ec600a9af5100796405ee9de SHA512 5f7852a818ae55e15f7d81df34be56f756e2c4a7c2c4084a417cdba847ea50a94f04a184c85305005400a285f05966d08e234c16c0ec3c7508e9c6741e84459e
+DIST zsnes-2.0.10.tar.gz 926347 BLAKE2B b9ab4701290ae802cb35045e0a3d4ff5268f96f7dc84614f39e950a6273a8477d5e2dca0598e3448744486de31caf692d44d36fe284f6f20697a5b4e92c908f8 SHA512 513e350198a944af47accedc6d3c14405898c753bb8168871d323c11f8c1253d8d7e247759a13e40a3b5eda195824e4862bb1fc093a3db9a75c8bb2e0bef728e
 DIST zsnes-2.0.9.tar.gz 935183 BLAKE2B a9b72ed15b2ed6d9e4631b4f12b2291ddca76a7236da008eba0f8b3ee27c94b98f00ff16a4929929adf484bc16554474b942b9f8306f46ab713e8a40e1f64624 SHA512 ea9244e98a175db9bceddf14e8212b3474ddaba1f508d698d8cfc43270fa3dabf51dca43dd30255272aba3cd061bf450bef04e005ce8087d550400e66faea565
+EBUILD zsnes-2.0.10.ebuild 1826 BLAKE2B a4070075f430d25cf5e03aa6209d4a695cf903d6590dd7544403ae43dca1be5fb88a2df2daf8bb049a55400b21745feadf8d0125f909c986aebc17376b0087e1 SHA512 a590167075d01469287074e85f4daef2cab72bd9445d23764860cdbba72f921ed0329e5af280a2c5751ed393b81b153765e4aef26c7e9446b49960c12a8b605d
 EBUILD zsnes-2.0.9.ebuild 1761 BLAKE2B 82f2fd40b0b20f2fe6977b0b86788bd6524dd02337fd8816cd7cc788a8a732284820864bf9da5ed84674465c9d86d994871d8a3012a351ae13d7e82c554297e6 SHA512 e60f4b88e425d46cec5e32b3ec0b5bf82fd0e1b95f67c100fbef26874b3af44a7287902448fd5daf0b68d358bdf0965c263ed12ab36c8bfbb214720f3fb771c4
 MISC metadata.xml 382 BLAKE2B 7e932fa492112a2a6b697f1abe12fda2c22992e079211e561fa6c0ea0ae0949503251193975a10848c6ba464e82e3306edb594269bea681e2106872304d26614 SHA512 16503e242acdd3ac96aaffc2df7521f936e5eaebccac4b409ecd4780cf5fb823a3a851df387b0035db749a2cf4d2e05276ffe7075d5f4834b1cf63f39adb8988
diff --git a/games-emulation/zsnes/zsnes-2.0.10.ebuild b/games-emulation/zsnes/zsnes-2.0.10.ebuild
new file mode 100644
index 000000000000..38c0c2f51af8
--- /dev/null
+++ b/games-emulation/zsnes/zsnes-2.0.10.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Fork of the classic Super Nintendo emulator"
+HOMEPAGE="https://github.com/xyproto/zsnes/ https://www.zsnes.com/"
+SRC_URI="https://github.com/xyproto/zsnes/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="custom-cflags"
+
+RDEPEND="
+	media-libs/libglvnd[X,abi_x86_32(-)]
+	media-libs/libpng:=[abi_x86_32(-)]
+	media-libs/libsdl[abi_x86_32(-),joystick,opengl,sound,video]
+	sys-libs/zlib:=[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="
+	dev-lang/nasm
+	sys-libs/zlib
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.9-cc-quotes.patch
+	"${FILESDIR}"/${PN}-2.0.9-gentoo-zlib.patch
+)
+
+src_compile() {
+	# Makefile forces many CFLAGS that are questionable, but zsnes' ancient x86
+	# asm is fragile, not pic safe (bug #427104), broken by F_S=3 (formerly
+	# broken with =2 as well), and can be affected by -march=* and similar.
+	# Stick to upstream's choices, this is non-portable either way.
+	if use !custom-cflags; then
+		strip-flags
+		append-cppflags -U_FORTIFY_SOURCE # to disable =3, Makefile enables =2
+	fi
+
+	# used to build and run parsegen at build time (uses zlib wrt BDEPEND)
+	tc-export_build_env BUILD_CXX
+	local buildcxx="${BUILD_CXX} ${BUILD_CXXFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS}"
+
+	use amd64 && multilib_toolchain_setup x86
+	tc-export CC CXX
+	append-cflags "${CPPFLAGS}"
+	append-cxxflags "${CPPFLAGS}"
+
+	emake CXX_HOST="${buildcxx}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+
+	dodoc README.md TODO.md
+
+	newicon icons/64x64x32.png ${PN}.png
+	make_desktop_entry ${PN} ${PN^^}
+}