gentoo resync : 29.12.2022

25 files changed, 611 insertions, 95 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 0a83c1aff205..fcccce3814c9 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/atari800/Manifest b/games-emulation/atari800/Manifest
index 22060dacdf86..478fccc0e448 100644
--- a/games-emulation/atari800/Manifest
+++ b/games-emulation/atari800/Manifest
@@ -2,6 +2,8 @@ AUX atari800-3.1.0-tgetent-detection.patch 671 BLAKE2B 53a2e53316957849c9d5e2bb7
 AUX atari800-4.2.0-bashisms.patch 1582 BLAKE2B deb25311acf1ace15168d0af4e010bd94bb9a675a8f78df3a2490a0cb9e9cb65418640080111dfee5bb3737bc2ade75dc007a4f3c9bbf48221f241c8682c975b SHA512 c48f853d078b15ba10c9b20a56e349f8705840d9da5ee04bf6d1d6b6ca1c9068b50467729a3e63672304246f1f20958c8e8bef4ec7d83c0c91b750b67656991c
 AUX atari800-4.2.0.cfg 682 BLAKE2B 78df9048da4010676e9b0b60705ccc4722e7b81602585c3040f846088a7acd6a04133b3cde163f01b0096997eb6182d96d3782e04d8611ba8dc0f81c1e67abdd SHA512 357eb14d270297a90b52d33da98958e434847b84a00896b0cf93257955cab1fb4a214ac0a2a081a8773def9e99a95c6a6ad127b3dd4e7ed9fcbdec57b66d6fad
 DIST atari800-4.2.0-src.tgz 7047710 BLAKE2B eac4b2da03d2ff5ec9e18dda41e0345975ed16c1cee23d15d2633211b7d4835b7a26c79fbf1672bb9ce3b82d52c7273e717371a0065ba29807f76d823eeb9855 SHA512 1236a8e05bf878e4514ae8e9f1556e0961a7f11ff0333eef415af455d217f712d5c6ededdd343dff6ba1aab777e19997bf9ecb859408187d69fc141301ecba31
+DIST atari800-5.0.0-src.tgz 1847596 BLAKE2B 315afa4fc8d88c2267c3da04f50a541a871f2d9d0867030b30e8f5d22b421f73f89de85ea1c7d6bc41202304de43d482f5d0fd9a081b4e493b3bba1363ce1e71 SHA512 2469561cdfe185ad26fd0fff8d589c528ca267e0195dab58a0fe739674f7445b53c21070f6bcb838c1d776b9803b1e2874ecf58a36b2d6df04bd9eb38855bfac
 DIST xf25.zip 188942 BLAKE2B c10b9108eebc571ac334ea6fca76d227e3d2fcde1595e8823a3d178dc31d9efa9b209572ee03875461289093615470192cf5c9a06cf0b4363d097a9eac201db4 SHA512 306612fc2af41ed10d76103af83e141cfd8bd3ba2ea3cbd1d0b81d4d5b0108c06948a5c626648c8a2424536757a42a3f8b9af1fb63fa3c31096447ffed0f9923
 EBUILD atari800-4.2.0-r1.ebuild 1502 BLAKE2B e880601e15c1581698677ec856581bed8a3509b14d9fe007f9e64ca487265eb537fb9662e2a5687aa76036d2fa670c3bf2d6bdf49dd3385f290f53235b3cde58 SHA512 de527a7266603ff75a7f41511915110d14b83533056045d863d0401112886239a3d5db5436ee9342ad8d359fd8198e4945022f7dbaf184d334a8df6575add5ac
-MISC metadata.xml 1135 BLAKE2B a4d83f853b08f2aedd00234eaba300788f775c560a32121edf2abb050a5a6025e74551b6be2985aeb9fca08ab0dc2de45220efc9a3ee410d81ad0e25fab03c24 SHA512 0f93d4cb3db5b3b03dc86f03266edead9cecb65b446fa45d17e402c99c4f4adebfcc4e6973737c85585062398882f8f627a6ad2f0d34006ccaf92289198e8915
+EBUILD atari800-5.0.0.ebuild 1521 BLAKE2B 7a5a9e29f5eef6d5f6bdeee17f3118c063fe7d3b62e552bb168a145e3740b8be45ad64bcae711b022744b88612de2d22a8001848819f46c74cc9b220c857126b SHA512 d16ae73013a8effc849b3ac256100c1aa744877e0545d08a1f5bf825122c59452cb864e77ca0f05018c906a1992601141baccf89440a533051224c8dd8da815a
+MISC metadata.xml 1227 BLAKE2B fa307ac2eff2aab0a1d9225bd5b263fa5844967ce541ec96dd0a54b64a5c496938b58627cbe83d75e3b62ac7d3302155ce94fc1dede2a9ecdbc7e8d39bab016b SHA512 012fbb9b4131002f94067a7c43c457f74a101d7f4ee139baa00a665924037888d0579079e58121af518d327060545511467f4e9c4f01edd32233d547d01e830e
diff --git a/games-emulation/atari800/atari800-5.0.0.ebuild b/games-emulation/atari800/atari800-5.0.0.ebuild
new file mode 100644
index 000000000000..8ad5a7e21a69
--- /dev/null
+++ b/games-emulation/atari800/atari800-5.0.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop
+
+DESCRIPTION="Atari 800 emulator"
+HOMEPAGE="https://atari800.github.io/"
+SRC_URI="
+	https://github.com/atari800/atari800/releases/download/ATARI800_${PV//./_}/${P}-src.tgz
+	https://sourceforge.net/projects/${PN}/files/ROM/Original%20XL%20ROM/xf25.zip"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="encode-mp3 opengl readline +sdl +sound"
+REQUIRED_USE="
+	encode-mp3? ( sound )
+	opengl? ( sdl )
+"
+
+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
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	app-arch/unzip
+"
+
+src_prepare() {
+	local PATCHES=(
+		# Bug 544608
+		"${FILESDIR}"/atari800-3.1.0-tgetent-detection.patch
+	)
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local video=ncurses
+	local sound=no
+
+	if use sdl; then
+		video=sdl
+		use sound && sound=sdl
+	elif use sound; then
+		sound=oss
+	fi
+
+	local myconf=(
+		$(use_with opengl)
+		$(use_with readline)
+		$(use_with encode-mp3 mp3)
+		--with-video=${video}
+		--with-sound=${sound}
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	insinto "/usr/share/${PN}"
+	doins "${WORKDIR}/"*.ROM
+	insinto /etc
+	newins "${FILESDIR}"/atari800-4.2.0.cfg atari800.cfg
+	newicon data/atari2.svg ${PN}.svg
+	make_desktop_entry ${PN} "Atari 800 emulator"
+}
diff --git a/games-emulation/atari800/metadata.xml b/games-emulation/atari800/metadata.xml
index 93a5cf72aa74..70220fb60e13 100644
--- a/games-emulation/atari800/metadata.xml
+++ b/games-emulation/atari800/metadata.xml
@@ -26,9 +26,12 @@ ways :
     * SDL (many different platforms and systems)
     * WinCE
     * MacOS X
-</longdescription>
+  </longdescription>
   <upstream>
     <remote-id type="sourceforge">atari800</remote-id>
     <remote-id type="github">atari800/atari800</remote-id>
   </upstream>
+  <use>
+    <flag name="encode-mp3">Support recording sound in MP3 format</flag>
+  </use>
 </pkgmetadata>
diff --git a/games-emulation/desmume/Manifest b/games-emulation/desmume/Manifest
index 09da8743f77b..70124f7c1047 100644
--- a/games-emulation/desmume/Manifest
+++ b/games-emulation/desmume/Manifest
@@ -1,5 +1,7 @@
 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.13.ebuild b/games-emulation/desmume/desmume-0.9.13.ebuild
new file mode 100644
index 000000000000..f4edfb4b5a3e
--- /dev/null
+++ b/games-emulation/desmume/desmume-0.9.13.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+DESCRIPTION="Nintendo DS emulator"
+HOMEPAGE="https://desmume.org/"
+SRC_URI="https://github.com/TASEmulators/desmume/releases/download/release_$(ver_rs 1- _)/${P}.tar.xz"
+
+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:=
+	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 )"
+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 78cefd74f64c..7881d8c3950e 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1,5 +1,8 @@
 AUX dolphin-5.0_p20210506-musl.patch 779 BLAKE2B 5f962082cf58377801a266ec987417b731332e31ce6d79bb8e66204f6299dc1912aea760a9545ac671b090e6a3625c54b9e00583695790bd5c51ba54d524e0d7 SHA512 7a611de89b84e0f706c37d2aacdfb62cb4115098ad1b31daa4e40bd47e3793ab59f626fced184965361ba776891a63d02d66a54f8b69f675b6b88047a283bd9e
 DIST dolphin-5.0_p20210506.tar.gz 42098693 BLAKE2B bb9e5b5eb344bd944753c0198d5835109399fdfae46e6858833e5f279ff1979d39e0c512bedb96a91a1241fff525c6f945d16ce1a6b6cc22798490d73b853862 SHA512 5d23e9356995011a0e7b07622d58c8dddc5134a4ec83b3d9343b9eca8d0d2c200ea8c9a299c6aa2550ca74d8e28e258531368f7c167fe620053eb2a0f73b1f2f
+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-9999.ebuild 4581 BLAKE2B d4f3db6f02d525e954df6d0e702794561388164333b3a8fe1ff87b20055b41e5d85908769cf2e2d9f8c9b470525636cf64b426bba6d764c4d4e58bfd828d06f9 SHA512 541ceff0c46f76d6de91dbbf2e83be76dbc729fa65debe2a2c7980687d6a5e60de1e225b9380ea21d0bad17d7f4bb1d587201fc9d5e9df9c64f4692d6e58e421
+EBUILD dolphin-5.0_p20220520.ebuild 4571 BLAKE2B afa711f5ea6044f935ac0d964215a95681fbc809d79451fbc356293e7faaef0804b18c845da7392183ea04ceafbca4968c5c2a129b00dd8a08506ff2b2bf262c SHA512 0c74f4c42217f4b03f8a5dd58157fda88c8467fa15235b7a5146335a9ade5751613e9f056d92b34513cd740753f13c70fb5bacbeef10b99dd87e41ad5bbe6275
+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
new file mode 100644
index 000000000000..d888afe15b4d
--- /dev/null
+++ b/games-emulation/dolphin/dolphin-5.0_p20220520.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop xdg-utils pax-utils
+
+if [[ ${PV} == *9999 ]]
+then
+	EGIT_REPO_URI="https://github.com/dolphin-emu/dolphin"
+	EGIT_SUBMODULES=( Externals/mGBA/mgba )
+	inherit git-r3
+else
+	EGIT_COMMIT=0f2540a0d1133950467845f20b1e003181147781
+	MGBA_COMMIT=40d4c430fc36caeb7ea32fd39624947ed487d2f2
+	SRC_URI="
+		https://github.com/dolphin-emu/dolphin/archive/${EGIT_COMMIT}.tar.gz
+			-> ${P}.tar.gz
+		mgba? (
+			https://github.com/mgba-emu/mgba/archive/${MGBA_COMMIT}.tar.gz
+				-> mgba-${MGBA_COMMIT}.tar.gz
+		)
+	"
+	S=${WORKDIR}/${PN}-${EGIT_COMMIT}
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+DESCRIPTION="Gamecube and Wii game emulator"
+HOMEPAGE="https://dolphin-emu.org/"
+
+LICENSE="GPL-2+ BSD BSD-2 LGPL-2.1+ MIT ZLIB"
+SLOT="0"
+IUSE="
+	alsa bluetooth discord-presence doc +evdev ffmpeg +gui log mgba
+	profile pulseaudio systemd upnp vulkan
+"
+
+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 )
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+# vulkan-loader required for vulkan backend which can be selected
+# at runtime.
+RDEPEND+="
+	vulkan? ( media-libs/vulkan-loader )
+"
+
+# [directory]=license
+declare -A KEEP_BUNDLED=(
+	# please keep this list in CMakeLists.txt order
+
+	[Bochs_disasm]=LGPL-2.1+
+	[cpp-optparse]=MIT
+	[imgui]=MIT
+	[glslang]=BSD
+
+	# FIXME: xxhash can't be found by cmake
+	[xxhash]=BSD-2
+
+	# FIXME: requires minizip-ng
+	#[minizip]=ZLIB
+
+	[FreeSurround]=GPL-2+
+	[soundtouch]=LGPL-2.1+
+
+	# FIXME: discord-rpc not packaged
+	[discord-rpc]=MIT
+
+	[mGBA]=MPL-2.0
+
+	[picojson]=BSD-2
+	[rangeset]=ZLIB
+	[gtest]= # (build-time only)
+)
+
+src_prepare() {
+	if use mgba && [[ ${PV} != *9999 ]]; then
+		rmdir Externals/mGBA/mgba || die
+		mv "${WORKDIR}/mgba-${MGBA_COMMIT}" Externals/mGBA/mgba || die
+	fi
+
+	cmake_src_prepare
+
+	local s remove=()
+	for s in Externals/*; do
+		[[ -f ${s} ]] && continue
+		if ! has "${s#Externals/}" "${!KEEP_BUNDLED[@]}"; then
+			remove+=( "${s}" )
+		fi
+	done
+
+	einfo "removing sources: ${remove[*]}"
+	rm -r "${remove[@]}" || die
+
+	# About 50% compile-time speedup
+	if ! use vulkan; then
+		sed -i -e '/Externals\/glslang/d' CMakeLists.txt || die
+	fi
+
+	# Allow regular minizip.
+	sed -i -e '/minizip/s:>=2[.]0[.]0::' CMakeLists.txt || die
+
+	# Remove dirty suffix: needed for netplay
+	sed -i -e 's/--dirty/&=""/' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# Use ccache only when user did set FEATURES=ccache (or similar)
+		# not when ccache binary is present in system (automagic).
+		-DCCACHE_BIN=CCACHE_BIN-NOTFOUND
+		-DENABLE_ALSA=$(usex alsa)
+		-DENABLE_AUTOUPDATE=OFF
+		-DENABLE_BLUEZ=$(usex bluetooth)
+		-DENABLE_EVDEV=$(usex evdev)
+		-DENCODE_FRAMEDUMPS=$(usex ffmpeg)
+		-DENABLE_LLVM=OFF
+		# just adds -flto, user can do that via flags
+		-DENABLE_LTO=OFF
+		-DUSE_MGBA=$(usex mgba)
+		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
+		-DENABLE_QT=$(usex gui)
+		-DENABLE_SDL=OFF # not supported: #666558
+		-DENABLE_VULKAN=$(usex vulkan)
+		-DFASTLOG=$(usex log)
+		-DOPROFILING=$(usex profile)
+		-DUSE_DISCORD_PRESENCE=$(usex discord-presence)
+		-DUSE_SHARED_ENET=ON
+		-DUSE_UPNP=$(usex upnp)
+
+		# Undo cmake.eclass's defaults.
+		# All dolphin's libraries are private
+		# and rely on circular dependency resolution.
+		-DBUILD_SHARED_LIBS=OFF
+
+		# Avoid warning spam around unset variables.
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build unittests
+}
+
+src_install() {
+	cmake_src_install
+
+	dodoc Readme.md
+	if use doc; then
+		dodoc -r docs/ActionReplay docs/DSP docs/WiiMote
+	fi
+
+	doicon -s 48 Data/dolphin-emu.png
+	doicon -s scalable Data/dolphin-emu.svg
+	doicon Data/dolphin-emu.svg
+}
+
+pkg_postinst() {
+	# Add pax markings for hardened systems
+	pax-mark -m "${EPREFIX}"/usr/games/bin/"${PN}"-emu
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild
index c62f0305347a..d888afe15b4d 100644
--- a/games-emulation/dolphin/dolphin-9999.ebuild
+++ b/games-emulation/dolphin/dolphin-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,10 +11,16 @@ then
 	EGIT_SUBMODULES=( Externals/mGBA/mgba )
 	inherit git-r3
 else
-	EGIT_COMMIT=eb5cd9be78c76b9ccbab9e5fbd1721ef6876cd68
+	EGIT_COMMIT=0f2540a0d1133950467845f20b1e003181147781
+	MGBA_COMMIT=40d4c430fc36caeb7ea32fd39624947ed487d2f2
 	SRC_URI="
 		https://github.com/dolphin-emu/dolphin/archive/${EGIT_COMMIT}.tar.gz
-			-> ${P}.tar.gz"
+			-> ${P}.tar.gz
+		mgba? (
+			https://github.com/mgba-emu/mgba/archive/${MGBA_COMMIT}.tar.gz
+				-> mgba-${MGBA_COMMIT}.tar.gz
+		)
+	"
 	S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 	KEYWORDS="~amd64 ~arm64"
 fi
@@ -22,24 +28,30 @@ fi
 DESCRIPTION="Gamecube and Wii game emulator"
 HOMEPAGE="https://dolphin-emu.org/"
 
-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"
 SLOT="0"
-IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg +gui log mgba
-	profile pulseaudio systemd upnp vulkan"
+IUSE="
+	alsa bluetooth discord-presence doc +evdev ffmpeg +gui log mgba
+	profile pulseaudio systemd upnp vulkan
+"
 
 RDEPEND="
-	dev-libs/hidapi:0=
-	>=dev-libs/libfmt-7.1:0=
-	dev-libs/lzo:2=
-	dev-libs/pugixml:0=
-	media-libs/libpng:0=
+	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:0=
-	net-misc/curl:0=
-	sys-libs/readline:0=
-	sys-libs/zlib:0=
+	net-libs/mbedtls:=
+	net-misc/curl:=
+	sys-libs/readline:=
+	sys-libs/zlib:=[minizip]
 	x11-libs/libXext
 	x11-libs/libXi
 	x11-libs/libXrandr
@@ -62,55 +74,54 @@ RDEPEND="
 	systemd? ( sys-apps/systemd:0= )
 	upnp? ( net-libs/miniupnpc )
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+"
 BDEPEND="
 	sys-devel/gettext
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 # vulkan-loader required for vulkan backend which can be selected
 # at runtime.
-RDEPEND="${RDEPEND}
-	vulkan? ( media-libs/vulkan-loader )"
+RDEPEND+="
+	vulkan? ( media-libs/vulkan-loader )
+"
 
 # [directory]=license
 declare -A KEEP_BUNDLED=(
-	[Bochs_disasm]=LGPL-2.1+
-	[FreeSurround]=GPL-2+
-
-	# vulkan's API is not backwards-compatible:
-	# new release dropped VK_PRESENT_MODE_RANGE_SIZE_KHR
-	# but dolphin still relies on it, bug #729832
-	[Vulkan]=Apache-2.0
+	# please keep this list in CMakeLists.txt order
 
+	[Bochs_disasm]=LGPL-2.1+
 	[cpp-optparse]=MIT
-	# no support for for using system library
-	[glslang]=BSD
 	[imgui]=MIT
-
-	# not packaged, tiny header library
-	[rangeset]=ZLIB
+	[glslang]=BSD
 
 	# FIXME: xxhash can't be found by cmake
 	[xxhash]=BSD-2
-	# no support for for using system library
-	[minizip]=ZLIB
-	# soundtouch uses shorts, not floats
+
+	# FIXME: requires minizip-ng
+	#[minizip]=ZLIB
+
+	[FreeSurround]=GPL-2+
 	[soundtouch]=LGPL-2.1+
-	[cubeb]=ISC
+
+	# FIXME: discord-rpc not packaged
 	[discord-rpc]=MIT
-	# Their build set up solely relies on the build in gtest.
-	[gtest]= # (build-time only)
-	# gentoo's version requires exception support.
-	# dolphin disables exceptions and fails the build.
-	[picojson]=BSD-2
-	# No code to detect shared library.
-	[zstd]=BSD
 
-	# This is a stripped-down mGBA for integrated GBA support
 	[mGBA]=MPL-2.0
+
+	[picojson]=BSD-2
+	[rangeset]=ZLIB
+	[gtest]= # (build-time only)
 )
 
 src_prepare() {
+	if use mgba && [[ ${PV} != *9999 ]]; then
+		rmdir Externals/mGBA/mgba || die
+		mv "${WORKDIR}/mgba-${MGBA_COMMIT}" Externals/mGBA/mgba || die
+	fi
+
 	cmake_src_prepare
 
 	local s remove=()
@@ -129,6 +140,9 @@ src_prepare() {
 		sed -i -e '/Externals\/glslang/d' CMakeLists.txt || die
 	fi
 
+	# Allow regular minizip.
+	sed -i -e '/minizip/s:>=2[.]0[.]0::' CMakeLists.txt || die
+
 	# Remove dirty suffix: needed for netplay
 	sed -i -e 's/--dirty/&=""/' CMakeLists.txt || die
 }
@@ -139,6 +153,7 @@ src_configure() {
 		# not when ccache binary is present in system (automagic).
 		-DCCACHE_BIN=CCACHE_BIN-NOTFOUND
 		-DENABLE_ALSA=$(usex alsa)
+		-DENABLE_AUTOUPDATE=OFF
 		-DENABLE_BLUEZ=$(usex bluetooth)
 		-DENABLE_EVDEV=$(usex evdev)
 		-DENCODE_FRAMEDUMPS=$(usex ffmpeg)
diff --git a/games-emulation/m64py/Manifest b/games-emulation/m64py/Manifest
index 7667a41af109..38b034dbad38 100644
--- a/games-emulation/m64py/Manifest
+++ b/games-emulation/m64py/Manifest
@@ -1,3 +1,5 @@
 DIST m64py-0.2.5.tar.gz 201868 BLAKE2B 95cbfe58ae2741caac5e05bcc06af563ee398d2916d07902ba4aaf4213277eea3c6219448db5958e0a2d0ea8ea3f65c88e63cfd2938a8b4ed33231ba57ae724f SHA512 338f5e96dc4657ba2230c32a40cf0e85c5efcccaa0d5fdbe4b4dcef020b910f5d2d88e5c224f8b496ec0378051aaf44358a0438de52fb03b4ece353f55abc61c
+DIST mupen64plus-ui-python-e24679436a93e8aae0aa664dc4b2dea40d8236c1.gh.tar.gz 14669412 BLAKE2B 08232599557503d606db9e44bdd6dbb30b3fa125bfd9b9bcc2cbc4b6ea71b567f5af4338d03e7580707db522249d9426ec4d64dc1e941a43076b2d21bc974b67 SHA512 2ba865041827a7f47d5151db6123abd62c964c024c14356aa5434619736b19ce150178d536cff1c84e93d0544823e173c67c0f08054c13e01f085912a9b8c2c6
 EBUILD m64py-0.2.5.ebuild 1043 BLAKE2B 111eb56dc00476b82232271139fd901953a4cee509240cf7886a70edd13dab7e45670c0ff7d122dd844971ffd0a3319c5ab36ed7845b2fda9b875eb46bd55680 SHA512 937341ce08af29ff6dedb16fba2a8ce96619c204e21ebf8baed379c9149a790390f31a0e164e109a3ff6045344559592afba9e0a32931af6141d988aa5a7acd0
+EBUILD m64py-0.2.5_p20211222.ebuild 1442 BLAKE2B 41e2821f3b454027e6cace327bed022fdb7e9b5091cd42d1482da9d47589063d799f213bf87638fb7c9df7d945c4a71d172f09b17d849a83801c296818ab6643 SHA512 685bd315a10a0ed97a98cf0a3d475caf7a2b207bea1de176c406cd156b1420edc71b3aa9736dc5bc0888ab57f68f6639be07a89c05a717582f98330410a56b59
 MISC metadata.xml 456 BLAKE2B 2dd1c7b525e4d6f4cd36d5802de988a44de85e13cdc692bf97d570ca34d51046f26e78f3e3d7162449f10aaa1c44f17f60f5b607a86995a87b24399093f3b759 SHA512 fca6b42d62404f72c4fd223d60f1a7ea7f7d5e5a5a31d0a38c1eae88b53f3ade5a515088fb6e97a86effe36bc76ae652119bbdeb404188f09df61b6f5562004f
diff --git a/games-emulation/m64py/m64py-0.2.5_p20211222.ebuild b/games-emulation/m64py/m64py-0.2.5_p20211222.ebuild
new file mode 100644
index 000000000000..7f6898ba649b
--- /dev/null
+++ b/games-emulation/m64py/m64py-0.2.5_p20211222.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 qmake-utils xdg-utils
+
+EGIT_COMMIT="e24679436a93e8aae0aa664dc4b2dea40d8236c1"
+MY_P=mupen64plus-ui-python-${EGIT_COMMIT}
+
+DESCRIPTION="A frontend for Mupen64Plus"
+HOMEPAGE="
+	http://m64py.sourceforge.net/
+	https://github.com/mupen64plus/mupen64plus-ui-python/
+"
+SRC_URI="
+	https://github.com/mupen64plus/mupen64plus-ui-python/archive/${EGIT_COMMIT}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-3 LGPL-3 public-domain GPL-2 BSD CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="7z rar"
+
+RDEPEND="
+	dev-python/PyQt5[gui,opengl,widgets,${PYTHON_USEDEP}]
+	dev-python/PySDL2[${PYTHON_USEDEP}]
+	media-libs/libsdl2[joystick,video]
+	>=games-emulation/mupen64plus-core-2.5:0/2-sdl2
+	7z? (
+		app-arch/p7zip
+	)
+	rar? (
+		|| (
+			dev-python/rarfile[${PYTHON_USEDEP}]
+			app-arch/unrar
+			app-arch/rar
+		)
+	)
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+
+python_prepare_all() {
+	# set the correct search path
+	cat >> src/m64py/platform.py <<-_EOF_ || die
+		SEARCH_DIRS = ["/usr/$(get_libdir)/mupen64plus"]
+	_EOF_
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	local -x PATH=$(qt5_get_bindir):${PATH}
+	distutils-r1_python_compile
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/games-emulation/melonds/Manifest b/games-emulation/melonds/Manifest
index adbc81424684..dfbd80aa4742 100644
--- a/games-emulation/melonds/Manifest
+++ b/games-emulation/melonds/Manifest
@@ -3,5 +3,5 @@ DIST melonDS-0.9.3.tar.gz 2241325 BLAKE2B 0ea7fbcce039a60a0553ae45d11f0b1550bfec
 DIST melonDS-0.9.4_p1.tar.gz 2330696 BLAKE2B f118d067505d740fef2c9f3a7761580981d43c6c63f9bfb34f48cbc5c6932e5410ee31259845787262412b040a66c85cdd4298645e2060fc6c8821a89b314711 SHA512 76886ecfbabd00ae9261c33fcd4074b20e989f4357575bf68139538136fb0ba728d7590310ce4ae9c45670ee01ec315046f03f54e7ca9a359be202709b030f6d
 EBUILD melonds-0.9.3-r2.ebuild 1617 BLAKE2B 4e4b06cea14e29a1317db43ed044013f11f4088df93ad59d82f02750e4a95918b99df9e069a4a5d90467bd3dd85f2cbb755f8e7bca327480f8d94be32feb1d11 SHA512 071aab8b56491a54a67b729917ed295355a3c3cbd86497d6676c8b5a11e906999615b6d9ed62518b7d75c6d54387c448c091311b932106707ab6c04d4c6a292a
 EBUILD melonds-0.9.4_p1-r1.ebuild 1624 BLAKE2B 452b7aae4d8e34f199adfba85b0c3af63abf93a1716f543892116736010de5db1a0fb225e9203391822a8d01405c020b91cff8aa0a3291ffa54428e4bd2dca53 SHA512 707330dca3c8764a7619ce2268617aa8946ef2376ebf398ff6bcfbbfe7f95aaadb0e4535066c1a63abbd946827db8f2a6fe737688fc05a7ddcc38fb56cc100d5
-EBUILD melonds-9999.ebuild 1617 BLAKE2B 4e4b06cea14e29a1317db43ed044013f11f4088df93ad59d82f02750e4a95918b99df9e069a4a5d90467bd3dd85f2cbb755f8e7bca327480f8d94be32feb1d11 SHA512 071aab8b56491a54a67b729917ed295355a3c3cbd86497d6676c8b5a11e906999615b6d9ed62518b7d75c6d54387c448c091311b932106707ab6c04d4c6a292a
+EBUILD melonds-9999.ebuild 1496 BLAKE2B 097c2453b0dd20d52e7106394a2fac239e091c1dc4f957a5149de7f1670f6acf702e42b7b37adf134a05d019f47e4d7131db15b026b2e80cf6cad331e53e5996 SHA512 f25554b072d9e1fb0e8969a59151accd25d354bd44980cbce13cdb7890eded7a1ac4a9dffba40c80ccdcbc7d2ff77fc88b989277afd97341246d0c1e37578964
 MISC metadata.xml 404 BLAKE2B e9abe00b5ee8196030846be4e7a9e224c0fb7356f88a39949b219bb7355bcac50f6ca28b299a40f056e5a105903cb156aed77731fb3ed61d2ef88becf35d0dc3 SHA512 6e2926035441d9c93759ad92cb2c026a10d28b8354e90d56361b4afc1aa6e7f0e4bb49900ad9f6025f8f9b7070df5691583074f30620196f1305919bd7cfdbdb
diff --git a/games-emulation/melonds/melonds-9999.ebuild b/games-emulation/melonds/melonds-9999.ebuild
index 0cde97c7b287..2cec9318a988 100644
--- a/games-emulation/melonds/melonds-9999.ebuild
+++ b/games-emulation/melonds/melonds-9999.ebuild
@@ -53,14 +53,6 @@ DOC_CONTENTS="You need the following files in order to run melonDS:
 Place them in ~/.config/melonDS
 Those files can be found somewhere on the Internet ;-)"
 
-PATCHES=( "${FILESDIR}"/melonds-system-teakra.patch )
-
-src_prepare() {
-	rm -r ./src/teakra || die
-
-	cmake_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_JIT=$(usex jit)
diff --git a/games-emulation/mgba/Manifest b/games-emulation/mgba/Manifest
index 2ab4b7fa5b8e..7875b19e01e3 100644
--- a/games-emulation/mgba/Manifest
+++ b/games-emulation/mgba/Manifest
@@ -1,8 +1,8 @@
 AUX mgba-0.9.3-ffmpeg5.patch 4952 BLAKE2B a6f03faafb0316516aba79bb5c6e7c474124ea4259c34456bc28cb4aa86543da7ddfed363256160294293f4882e3116076400c042caf7e1f31811739f8fd86dd SHA512 5badf11d8d24ed2cb13c45e7ff9d56159c63b2557076fe92ade4d0b7051bfcd0f8b9fc3c8bf95faf5612789c9aa6609fc8e0c11b6e9a00816f2a17b72a3c183c
 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 2659 BLAKE2B f5f2ab5f770ff8ba4ec4667ce7a40d262692cf2a52e2644591735ecd1f780478d4b3184d3ec453321950c7cd57a8817b1f8916c697d6f1382f9fd39da53d2d37 SHA512 92c02e4d249228bd4e3e5a3142877cdda4999e20db8b65f458af275f867d6f1e8d58af50f6f2b35d2bf2ebdce4f750d62704bdeffd5d8980ba64806d21f14112
-EBUILD mgba-0.9.3-r1.ebuild 2716 BLAKE2B 011b8c8779a085630be9c1b93be4318225de01e64e69799398917dc35a41a054fccbb67937eb76e4d43af5efd1a1b27545e7a410cd66b5f8af5749c88030258c SHA512 c005cd6346a2530aae1691608a436912e29ab4c5413662ae1d09a12f4e5fb76f225221e61385bf6226c51a88814294e0d5d2288ee57f6fafa8ce3384569ce2e1
-EBUILD mgba-0.9.3.ebuild 2661 BLAKE2B 84e11e71873217013a106be1744dbf990d0e15167458457a1e6c86bf958ef752e02dae28b49f22faeff9971126683416a634b5f41ea894b9bf2d04a13bf9319c SHA512 904b060cd5198257b22b88593c20d4aa156f38ae88e15a78f5467dac34ec961c27fe0be579d35d8c0f180f9fda1cefd81ac5031d71664634216f5f50ff72d988
-EBUILD mgba-9999.ebuild 2661 BLAKE2B 84e11e71873217013a106be1744dbf990d0e15167458457a1e6c86bf958ef752e02dae28b49f22faeff9971126683416a634b5f41ea894b9bf2d04a13bf9319c SHA512 904b060cd5198257b22b88593c20d4aa156f38ae88e15a78f5467dac34ec961c27fe0be579d35d8c0f180f9fda1cefd81ac5031d71664634216f5f50ff72d988
-MISC metadata.xml 631 BLAKE2B f54017bc3de8d00be3405495cf08f4d9f9ba9bc723a205c783a3e71c239835ee68044cb88d22df6d6f33174e2b4a20c350363145df6c0e9f54ca9585ef3eee9d SHA512 c71bc82f75a7a68e59c46eaadcf173a9b8274167e2f3a3f69dd5cdc0e9822c93c442f75e6817168cfc1470c411bec0fcb5f9695913816326b719a81f915f75b8
+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
diff --git a/games-emulation/mgba/metadata.xml b/games-emulation/mgba/metadata.xml
index c85568f4a2e3..e99f6fd576d4 100644
--- a/games-emulation/mgba/metadata.xml
+++ b/games-emulation/mgba/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
+  <maintainer type="project">
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
   </maintainer>
   <use>
     <flag name="discord">Enable Discord RPC support</flag>
diff --git a/games-emulation/mgba/mgba-0.9.2.ebuild b/games-emulation/mgba/mgba-0.9.2.ebuild
index cef008e8c593..971993505d7e 100644
--- a/games-emulation/mgba/mgba-0.9.2.ebuild
+++ b/games-emulation/mgba/mgba-0.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -94,7 +94,7 @@ src_compile() {
 
 src_install() {
 	if use qt5 ; then
-		dobin ${BUILD_DIR}/qt/${PN}-qt
+		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
@@ -103,10 +103,10 @@ src_install() {
 	fi
 	if use sdl ; then
 		doman doc/${PN}.6
-		newbin ${BUILD_DIR}/sdl/${PN} ${PN}-sdl
+		newbin "${BUILD_DIR}"/sdl/${PN} ${PN}-sdl
 	fi
 
-	dolib.so ${BUILD_DIR}/lib${PN}.so*
+	dolib.so "${BUILD_DIR}"/lib${PN}.so*
 }
 
 pkg_preinst() {
diff --git a/games-emulation/mgba/mgba-0.9.3-r1.ebuild b/games-emulation/mgba/mgba-0.9.3-r1.ebuild
index f2e1ddb6dd3b..8ac2d817bb04 100644
--- a/games-emulation/mgba/mgba-0.9.3-r1.ebuild
+++ b/games-emulation/mgba/mgba-0.9.3-r1.ebuild
@@ -14,7 +14,7 @@ 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"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 	S="${WORKDIR}/${PN}-${MY_PV}"
 fi
 LICENSE="MPL-2.0"
@@ -98,7 +98,7 @@ src_compile() {
 
 src_install() {
 	if use qt5 ; then
-		dobin ${BUILD_DIR}/qt/${PN}-qt
+		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
@@ -107,10 +107,10 @@ src_install() {
 	fi
 	if use sdl ; then
 		doman doc/${PN}.6
-		newbin ${BUILD_DIR}/sdl/${PN} ${PN}-sdl
+		newbin "${BUILD_DIR}"/sdl/${PN} ${PN}-sdl
 	fi
 
-	dolib.so ${BUILD_DIR}/lib${PN}.so*
+	dolib.so "${BUILD_DIR}"/lib${PN}.so*
 }
 
 pkg_preinst() {
diff --git a/games-emulation/mgba/mgba-0.9.3.ebuild b/games-emulation/mgba/mgba-0.9.3.ebuild
index e9baa50b1056..bfc1bea7e039 100644
--- a/games-emulation/mgba/mgba-0.9.3.ebuild
+++ b/games-emulation/mgba/mgba-0.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -94,7 +94,7 @@ src_compile() {
 
 src_install() {
 	if use qt5 ; then
-		dobin ${BUILD_DIR}/qt/${PN}-qt
+		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
@@ -103,10 +103,10 @@ src_install() {
 	fi
 	if use sdl ; then
 		doman doc/${PN}.6
-		newbin ${BUILD_DIR}/sdl/${PN} ${PN}-sdl
+		newbin "${BUILD_DIR}"/sdl/${PN} ${PN}-sdl
 	fi
 
-	dolib.so ${BUILD_DIR}/lib${PN}.so*
+	dolib.so "${BUILD_DIR}"/lib${PN}.so*
 }
 
 pkg_preinst() {
diff --git a/games-emulation/mgba/mgba-9999.ebuild b/games-emulation/mgba/mgba-9999.ebuild
index e9baa50b1056..bfc1bea7e039 100644
--- a/games-emulation/mgba/mgba-9999.ebuild
+++ b/games-emulation/mgba/mgba-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -94,7 +94,7 @@ src_compile() {
 
 src_install() {
 	if use qt5 ; then
-		dobin ${BUILD_DIR}/qt/${PN}-qt
+		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
@@ -103,10 +103,10 @@ src_install() {
 	fi
 	if use sdl ; then
 		doman doc/${PN}.6
-		newbin ${BUILD_DIR}/sdl/${PN} ${PN}-sdl
+		newbin "${BUILD_DIR}"/sdl/${PN} ${PN}-sdl
 	fi
 
-	dolib.so ${BUILD_DIR}/lib${PN}.so*
+	dolib.so "${BUILD_DIR}"/lib${PN}.so*
 }
 
 pkg_preinst() {
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 86a8ca80e510..819b2d41f9e5 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,6 +1,6 @@
 AUX pcsx2-1.6.0-disable-setcap.patch 2783 BLAKE2B 8840d64feeb042c8442fae30c40fa05e5de19f0b5da9f383bb097e8f092bbabcaf529424e11eb99bb3af81ac8407cd207f846683cd359ac9ea11f8d40a4a72dd SHA512 463ef253a192d3531b1733c4006bd5870aaa31ae58e54d188edd889bb0c3e3eb7d2e76442461c68105ff51753b29add02a673aad4eb5ed27a0b9a66345fea08d
 AUX pcsx2-1.6.0-wx-config.patch 613 BLAKE2B e5ff17ae5bddde776990cace4735883e8869f6c125dcdf171bb67b9392921d7a006f4b96075086b3927ecede027ff0b2efa40982b10e121c2e1096e36fcbe8bc SHA512 14f0eddbd9c72600f47733a5137c171abf05723b55aedf37438ed89730a9684b67a20d79dea3864531521421c1436922a19667353d7e51253ad3449a99b7b21a
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
-EBUILD pcsx2-1.6.0-r3.ebuild 2756 BLAKE2B b62ba422f2856bc9b6a6f0e3961495e8cd88ce67a80228dfde200d9f62b71e41fef52836a5d80ceb2bdf4a11323935d37a566127387437abb133c361ff3c5dfe SHA512 892d63d5b60495ffd2459cec294e50eff2b9b83fe153d650f809a539bc4521e80fad64d229fe6af05ff21faad3e57a10d06b10f6053d42c254102da0f8036fed
-EBUILD pcsx2-9999.ebuild 3071 BLAKE2B 1ae32681db094aa92dfd357165cbcca54468cb06245abb552cc63e8d8a498d1719bbba99eb7c653a8e139b38a9c29dcdb787bd22b24b5ba37a4bf9db2d56ca2f SHA512 b25200c43d214020715b9b117ed9d43bb5ec83a8f13f3e56cf86383bc38cf7fafb83ed4850d753ad3da9b13b0a9361dfbd0f899eb8b3091bb66f29b81582301c
-MISC metadata.xml 533 BLAKE2B 6133475168a5df84979b4ce8a195451abcc28f6cc910b937bc9de5b31f4f149c251602786d05d256a0c863d4a49ba5b47c8bbc957d1f87e5019ea78e8e3a5295 SHA512 9be0d69ebad684eeaad115e7b3e5ab66093e87a48523ef5b0cf6dff30ff5b0be9fdfc93aa755767e55a2e1a74fbc34316242acb24148560ae4a7382586eac1a5
+EBUILD pcsx2-1.6.0-r3.ebuild 2647 BLAKE2B 7d7a0e595d3d8297f3ae0049b3c376f404eeb5a6f477486076e5ac2b72dae6065c97b845f715f4e7e52af158b9dfbe6bbc5cf4f10d051838eafe44553f76efd3 SHA512 18b6131c6ff0b292f4dde4a54b4a5c698a403860ab332e01f181e18931e5ac14cc131ce140de563125f63eeb8b3523b51c6df4f4ecf2086a00e000d4e3d0289b
+EBUILD pcsx2-9999.ebuild 3042 BLAKE2B 1602d87ba0278ed4866b594b256ec41a3171927fb10e565c410ca7e9d827c117ab4daa5294bb6dcb1f11397c58d18d9b0ed60fbadb029facbe51567814c8b190 SHA512 f72b467b484a23b54161fa18f92df6c97c67402adc4252b207c1ac934224d2b34221313c3183fd607265df73488b1fff0b212e79f9583cf0cd0c4a6263003d15
+MISC metadata.xml 647 BLAKE2B 506f329d6430ac9d3646a71ad9d0fc3a41689480c1539381f21c042f584e3b4fa8564a31d4c664220549b8271732039791c63c75ae7b1697c5a07d68e9bd5b58 SHA512 713b4466ba59a4a0cd7d1f08686198fe6a37067c1eedea3f1d72323efa6c9d914f5d7bf2de24ca37b31cc3788a689071b09116539f20fb5c80a23397285a2f12
diff --git a/games-emulation/pcsx2/metadata.xml b/games-emulation/pcsx2/metadata.xml
index 347ab91abc92..0d8f2efac4cd 100644
--- a/games-emulation/pcsx2/metadata.xml
+++ b/games-emulation/pcsx2/metadata.xml
@@ -9,6 +9,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<bugs-to>https://github.com/PCSX2/pcsx2/issues</bugs-to>
 		<remote-id type="github">PCSX2/pcsx2</remote-id>
diff --git a/games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild
index 8a6662ae3aa4..763aa3e53529 100644
--- a/games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild
@@ -53,9 +53,7 @@ pkg_setup() {
 	if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then
 		# -mxsave flag is needed when GCC >= 8.2 is used
 		# https://bugs.gentoo.org/685156
-		if [[ $(gcc-major-version) -gt 8 || $(gcc-major-version) == 8 && $(gcc-minor-version) -ge 2 ]]; then
-			append-flags -mxsave
-		fi
+		append-flags -mxsave
 	fi
 }
 
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 8c462bcb79c6..14345f880fa8 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -24,6 +24,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-arch/xz-utils
+	app-arch/zstd:=
 	dev-cpp/rapidyaml:=
 	dev-libs/glib:2
 	dev-libs/libaio
@@ -64,9 +65,7 @@ pkg_setup() {
 	if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then
 		# -mxsave flag is needed when GCC >= 8.2 is used
 		# https://bugs.gentoo.org/685156
-		if [[ $(gcc-major-version) -gt 8 || $(gcc-major-version) == 8 && $(gcc-minor-version) -ge 2 ]]; then
-			append-flags -mxsave
-		fi
+		append-flags -mxsave
 	fi
 }
 
@@ -74,14 +73,12 @@ src_prepare() {
 	cmake_src_prepare
 
 	# unbundle, use sed over patch for less chances to break -9999
-	# (zstd is only used by libzip, so can remove entirely)
+	# note: gentoo's zstd lacks a cmake module which upstream tries to use
 	sed -e '/add_subdir.*cubeb/c\find_package(cubeb REQUIRED)' \
-		-e '/add_subdir.*libchdr/c\pkg_check_modules(chdr REQUIRED IMPORTED_TARGET libchdr)' \
-		-e '/add_subdir.*libzip/c\find_package(libzip REQUIRED)' \
-		-e '/add_subdir.*zstd/d' \
+		-e '/add_subdir.*libchdr/c\pkg_check_modules(chdr REQUIRED IMPORTED_TARGET libchdr)\nalias_library(chdr-static PkgConfig::chdr)' \
+		-e '/system_library.*zstd/,/endif()/c\pkg_check_modules(zstd REQUIRED IMPORTED_TARGET libzstd)\nalias_library(Zstd::Zstd PkgConfig::zstd)' \
 		-e '/compile_options(\(cubeb\|chdr-static\|speex\)/d' \
 		-i cmake/SearchForStuff.cmake || die
-	sed -i 's/chdr-static/PkgConfig::chdr/' pcsx2/CMakeLists.txt || die
 
 	# pulseaudio is only used for usb-mic, not audio output
 	use pulseaudio || > cmake/FindPulseAudio.cmake || die
@@ -103,9 +100,9 @@ src_configure() {
 		-DDISABLE_SETCAP=TRUE
 		-DENABLE_TESTS=$(usex test)
 		-DPACKAGE_MODE=TRUE
-		-DQT_BUILD=FALSE # TODO
+		-DQT_BUILD=FALSE # TODO when qt6 is in tree
 		-DSDL2_API=TRUE # conditionally needed if wxGTK[sdl], cmake/ApiValidation.cmake
-		-DUSE_SYSTEM_YAML=TRUE
+		-DUSE_SYSTEM_LIBS=TRUE
 		-DUSE_VTUNE=FALSE
 		-DXDG_STD=TRUE
 	)
diff --git a/games-emulation/stella/Manifest b/games-emulation/stella/Manifest
index a3fb56b3ccba..115a4cea3477 100644
--- a/games-emulation/stella/Manifest
+++ b/games-emulation/stella/Manifest
@@ -1,3 +1,5 @@
 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.7.ebuild b/games-emulation/stella/stella-6.7.ebuild
new file mode 100644
index 000000000000..db68632d57ca
--- /dev/null
+++ b/games-emulation/stella/stella-6.7.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 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="
+	dev-db/sqlite:3
+	media-libs/libsdl2[joystick?,opengl,sound,video]
+	png? ( media-libs/libpng:= )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	sed -i 's/pkg-config/${PKG_CONFIG}/' configure || die
+	sed -i '/CXXFLAGS+=/s/-fomit-frame-pointer//' Makefile || die
+}
+
+src_configure() {
+	tc-export CC CXX PKG_CONFIG
+
+	# not autotools-based
+	local configure=(
+		./configure
+		--host=${CHOST}
+		--prefix="${EPREFIX}"/usr
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}/html
+		--use-system-sqlite
+		$(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
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 6.7; then
+		elog "With version >=6.7, because of fixes to JSON handling, all remappings"
+		elog "will be reset to defaults. If you had custom mappings, they will need"
+		elog "to be re-entered again."
+		elog
+		elog "Furthermore, because of internal changes, all old state files are invalid."
+	fi
+}