gentoo resync : 20.03.2022

32 files changed, 666 insertions, 371 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index c2d422ecadbc..eb83f00fc223 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/fceux/Manifest b/games-emulation/fceux/Manifest
index 12715ee18ce9..1e1f695eb28d 100644
--- a/games-emulation/fceux/Manifest
+++ b/games-emulation/fceux/Manifest
@@ -1,6 +1,6 @@
 AUX fceux-2.2.2-warnings.patch 1174 BLAKE2B 5b2076015d005a75ab97b586bb2af022b53a8d1724ef0becac808606366f3ba2f64e97c7073bb3f152d337c248ea91cfb15df81e2d1c5f3ebaf94f0defea3ae1 SHA512 03f7ff47f18982eb5fc7b0c942313fb6328412fe64c9b07bf97a85e25eb73c926b362ce5da789ebc7dff70f9d3d11e9df9e033e5a3ddd8fdee6c712471806b97
 AUX fceux-2.4.0-desktop.patch 447 BLAKE2B c9dc55fc34d990de50a1897cc9d1fe8abb5060336ae7b227ac1b07e28ef89d15e202be790ec3f8ff0f8280a64b81ae28c98ce1a22e54f57d93b2e3bb04a24b59 SHA512 00a2af80e5dc6f5ddff8e5fc28b94bc2e249798ec44f5f0b9ed414dc8438e1937058f9bab65cbb5b2c9c6dec85af1a51e58f68405dd758db4ec293efbdaf5398
 AUX fceux-2.4.0-no-git.patch 377 BLAKE2B 8b0be40a0eba5249f73942ea774dc0a37e73ac71fe1684d01551cd96876878d53219c0744ba0e6789c3663c56e58fccc2a2a450b03207219c76e2c10b04ea679 SHA512 6c67d5b823a2b70d6982d9f911edab65c0bcf2cf5faf1ae00004201aefe99d5feae4592204c2586eaa43affff6d05f2e6e3b9274add4713073c0e1cfb519465d
-DIST fceux-2.6.1.tar.gz 23326768 BLAKE2B 8a0907871af229cb8017845b444a8cc4ebe65dff0799483de488e984741fc89a885a9ecd421fef3a25175cc8f0855da68001fb6ea24f8e6955b2e1a02dc3f7d2 SHA512 f086003f676054a5527e3c1b81f9abdb76669e2b3935e7625f99d99ad0b122391646e8a186ca6a2840d5f03fff908630c11481b5166325ca91c08c2e46836f8d
-EBUILD fceux-2.6.1.ebuild 1550 BLAKE2B 26ad580addd456693cf339d0e6353138ce0702a0d8058b775109ed1ea613ca23bdb9fec13bd91fad2a098918d40f9e1a7288c0a48c846b31ed07f16762efebb9 SHA512 1fcebcb6226c7f2f04ced2c7f139a20dcf73c3a14cd4c34006484994f77cb8cf3733ad7302fe9d20872c92189bb5871c24c0d1c5dd479929c89a3b6bb20ba5c3
+DIST fceux-2.6.3.tar.gz 23355815 BLAKE2B 49984aec5d3d8ca5fcc040bac16cf4af406fce2dbc4cf4a02e386195be5eca09c4b297e73c438b10b865bcd42e8c8b7e33971a30be285c315e183dc018c5b97e SHA512 446a7cd45afb703e2268f3f6d71dc1a0d9da5f67e1121026258c960fdd360775f31dcab97c1da2755abeef10e9c6757c0af2f3cc67ccb63314c84ef6a4700b2b
+EBUILD fceux-2.6.3.ebuild 1551 BLAKE2B 052cbd39c0cd19b1576e1b9b33dc262c770d53594b189379d8bb0a389f9eeadc8813cb70a1373a486ff8a8f83e85c26d889cf5962cfe970ef7e79c111ad5b551 SHA512 9d6f908b97c1c0981fa0849e31c71a0b7d3e1922ab1e68ada8534e7d5fcaaa6f7620f3401261b3fe25c113b976f8e0288219fa9547f84be304fdba519ace243b
 MISC metadata.xml 570 BLAKE2B 2a0e6410b932f5445cfcbf2878212b022310e9e059c2a05da52ab55dc1c24f52fc31a51b70c63a2c8226989dad08afcbc0002255753c757d93cf0235c6f94ec0 SHA512 db6acd8c7c1beea1c86e56fd5e2caa7489848be6513c798e186739edf7fc47dd78a126037734dad255966e80e2d257f73915fdd7e7085472b775ad98a5b3e336
diff --git a/games-emulation/fceux/fceux-2.6.1.ebuild b/games-emulation/fceux/fceux-2.6.3.ebuild
index b7b998d9eb64..ac55ef93a2b4 100644
--- a/games-emulation/fceux/fceux-2.6.1.ebuild
+++ b/games-emulation/fceux/fceux-2.6.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Portable Famicom/NES emulator, an evolution of the original FCE Ult
 HOMEPAGE="https://fceux.com/"
 SRC_URI="mirror://sourceforge/fceultra/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="ffmpeg x264 x265"
diff --git a/games-emulation/mednafen/Manifest b/games-emulation/mednafen/Manifest
index ec78f61ea0d9..52aaddae66c2 100644
--- a/games-emulation/mednafen/Manifest
+++ b/games-emulation/mednafen/Manifest
@@ -1,5 +1,3 @@
-DIST mednafen-1.27.1.tar.xz 3363540 BLAKE2B f74c251300af2348db00d68ef2cd998bdf4d6fb06873e03e0027d836b5b1217901b1e2cf922877b1db4c278ba4cc2674e4875a17fff52a3b8be5a447670a6385 SHA512 f55d86baa8c77fc98aae63a38235eb64f64131f180c40ed1ac7cd2ad845230348fbba05643eb5e6af203e56c39c8011b632d2bcecbd2c9f2c19b2447f6b99e83
 DIST mednafen-1.29.0.tar.xz 3512784 BLAKE2B bea5ecfe00f97d1cf81eccfe4264d8fea666c9c8543449ca8c1e4e064f89a100f6bbe77b23d42d5d9c4a7e005792006d599852a201f1d95a756742bc58ecda81 SHA512 375f0fb4f12907faf56b4e9ecdc44c1655b0660a3773240fe3118f2b261e171479b8eb254299f899fc442b54041c941eab2a5f343aec559d9731c3e92cde0569
-EBUILD mednafen-1.27.1.ebuild 1823 BLAKE2B 81c33f8a2e85ede29f08b00f6e17bfba4fdd0f6ec3a907b819369d56f593dfbb470a758d517f33e83af992782725b1ba45c61df88b976429fe8eef35c138210c SHA512 d31c0792213c3f0afee5e10e1739be73e5da3279cf06665dc6f1f638a0637d705eec22f6a8fef83d340377050450bd2ea08d3d3823dcaa57c558e87c496b7f87
 EBUILD mednafen-1.29.0.ebuild 1924 BLAKE2B 0a0877e1467d10cc5171605032fe6dd874067c92d8d2eb77904156b5d598f517b3bfa3652ae18a7c68d00f284af9fa530c48943555eaa3269b593212d77cd856 SHA512 2b574be5e4284e7439aedef14f2f9f8d0c66c58781b91a64768dcdde601ac6dd93a18cd8334140705ef1770b3565d7fc968b747f9376752d00d64749912c0b45
 MISC metadata.xml 332 BLAKE2B 94c24607fd634ac943de538dd00b5511e4976e2eb9d1724dd4b7e9fff1508b146caac910eb5fab93ef2049e2dc95598d787d738b1613d59739a1772b3bd58f9e SHA512 6c80eda23e81013c2cc990aea57ad62d592a777d8afbf0f767bb1eef2efc13103b3917b14f9d080db67e8b5899de7882d8bf2adc568274dae1014fa6b94f27df
diff --git a/games-emulation/mednafen/mednafen-1.27.1.ebuild b/games-emulation/mednafen/mednafen-1.27.1.ebuild
deleted file mode 100644
index ff0f36561a36..000000000000
--- a/games-emulation/mednafen/mednafen-1.27.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic pax-utils toolchain-funcs
-
-DESCRIPTION="Argument-driven multi-system emulator utilizing OpenGL and SDL"
-HOMEPAGE="https://mednafen.github.io/"
-SRC_URI="https://mednafen.github.io/releases/files/${P}.tar.xz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa cpu_flags_ppc_altivec flac jack"
-
-RDEPEND="
-	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 )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	# don't let the build system mess with CFLAGS more than necessary,
-	# most are questionable (see README.PORTING/configure.ac comments)
-	# -fwrapv: kept for bug #539992
-	sed -e '/CC_OPT.*CODEGEN_FLAGS/{/-fwrapv/!d}' \
-		-e '/CC_OPT.*NO_STACK_PROTECTOR_FLAGS/d' \
-		-e '/CC_OPT.*OPTIMIZER_FLAGS/c\:' \
-		-e '/CC_OPT.*-mtune.*SS_EXTRA_FLAGS/d' \
-		-i configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	# disable unnecessary warnings not to confuse users (see src/types.h)
-	append-cppflags -DMDFN_DISABLE_{NO_OPT,PICPIE}_ERRWARN
-
-	local myeconfargs=(
-		$(use_enable alsa)
-		$(use_enable cpu_flags_ppc_altivec altivec)
-		$(use_enable jack)
-		$(use_with flac libflac)
-		--with-external-{lzo,mpcdec,tremor,trio}
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	local DOCS=(
-		ChangeLog
-		Documentation/{cheats.txt,fname_format.txt,modules.def,settings.def}
-	)
-	local HTML_DOCS=( Documentation/*.{css,html,png} )
-
-	default
-
-	pax-mark m "${ED}"/usr/bin/mednafen
-}
diff --git a/games-emulation/melonds/Manifest b/games-emulation/melonds/Manifest
index c4a2103c6734..adbc81424684 100644
--- a/games-emulation/melonds/Manifest
+++ b/games-emulation/melonds/Manifest
@@ -1,4 +1,7 @@
+AUX melonds-system-teakra.patch 492 BLAKE2B 56c7a55ee08c79b9468f62b676f0e97f443b065577cb6053167be04aaf03aa2a656d0c60a877a05500ec7a596368900806817d05dc2a1f652b8562fad8c8ae43 SHA512 7f2c1d8fdda5ac76a6b9311bb002a0544ef6d8863b62b77d9806fe73b64218353aaad5aa808a2de8d10870054f0eb968b05520dac22eb8d311711e7f65fbeced
 DIST melonDS-0.9.3.tar.gz 2241325 BLAKE2B 0ea7fbcce039a60a0553ae45d11f0b1550bfec2300faf1c99c3ee531bd5949c7293bec187fbf53e400bbb6280df29db141b2d1bcb294a8abf2eabb71993db686 SHA512 37f26f3a9784873ce1664645cea70049725367f5fe62f7c58842ebd5da2c73ffe423695dddb0ffd444bdf59df2a3fcd778cdf95b2bb083014b961fed282953f5
-EBUILD melonds-0.9.3-r1.ebuild 1687 BLAKE2B e9877ebda5bfdabec8d913096c93719474220b615c73ddeb2c905464d035cf05889399cf938cf137670c1485bd957beca7b11663d3df3a30281fcaba6c926f35 SHA512 142b857f3f5daee2031367d4bfe6bd96531f88f7a7aca5f7b5a3067e08c880576418d4533c120fab75a9a96a34cca61799db33301cfd3b46c701efb8ce4d1520
-EBUILD melonds-9999.ebuild 1687 BLAKE2B e9877ebda5bfdabec8d913096c93719474220b615c73ddeb2c905464d035cf05889399cf938cf137670c1485bd957beca7b11663d3df3a30281fcaba6c926f35 SHA512 142b857f3f5daee2031367d4bfe6bd96531f88f7a7aca5f7b5a3067e08c880576418d4533c120fab75a9a96a34cca61799db33301cfd3b46c701efb8ce4d1520
+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
 MISC metadata.xml 404 BLAKE2B e9abe00b5ee8196030846be4e7a9e224c0fb7356f88a39949b219bb7355bcac50f6ca28b299a40f056e5a105903cb156aed77731fb3ed61d2ef88becf35d0dc3 SHA512 6e2926035441d9c93759ad92cb2c026a10d28b8354e90d56361b4afc1aa6e7f0e4bb49900ad9f6025f8f9b7070df5691583074f30620196f1305919bd7cfdbdb
diff --git a/games-emulation/melonds/files/melonds-system-teakra.patch b/games-emulation/melonds/files/melonds-system-teakra.patch
new file mode 100644
index 000000000000..b59c31e4ba9a
--- /dev/null
+++ b/games-emulation/melonds/files/melonds-system-teakra.patch
@@ -0,0 +1,23 @@
+index 7288b54..6525f11 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -110,7 +110,6 @@ if (ENABLE_JIT)
+ 	endif()
+ endif()
+ 
+-add_subdirectory(teakra EXCLUDE_FROM_ALL)
+ target_link_libraries(core teakra)
+ 
+ 
+index c889aff..a6339d9 100644
+--- a/src/DSi_DSP.cpp
++++ b/src/DSi_DSP.cpp
+@@ -16,7 +16,7 @@
+     with melonDS. If not, see http://www.gnu.org/licenses/.
+ */
+ 
+-#include "teakra/include/teakra/teakra.h"
++#include "teakra/teakra.h"
+ 
+ #include "DSi.h"
+ #include "DSi_DSP.h"
diff --git a/games-emulation/melonds/melonds-0.9.3-r1.ebuild b/games-emulation/melonds/melonds-0.9.3-r2.ebuild
index 0d497e9b94fc..0cde97c7b287 100644
--- a/games-emulation/melonds/melonds-0.9.3-r1.ebuild
+++ b/games-emulation/melonds/melonds-0.9.3-r2.ebuild
@@ -1,15 +1,12 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# NOTICE:
-# melonds bundles teakra, its upstream haven't had a release since 2020
-
 EAPI=8
 
 MY_PN="melonDS"
 MY_P="${MY_PN}-${PV}"
 
-inherit cmake flag-o-matic readme.gentoo-r1 toolchain-funcs xdg
+inherit cmake readme.gentoo-r1 toolchain-funcs xdg
 
 DESCRIPTION="Nintendo DS emulator, sorta"
 HOMEPAGE="
@@ -32,6 +29,7 @@ SLOT="0"
 
 DEPEND="
 	app-arch/libarchive
+	dev-libs/teakra
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
@@ -55,7 +53,11 @@ 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
 }
 
@@ -73,16 +75,11 @@ src_compile() {
 }
 
 src_install() {
-	# install teakra
-	dolib.so "${BUILD_DIR}/src/teakra/src/libteakra.so"
-
 	cmake_src_install
-
 	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
 	xdg_pkg_postinst
-
 	readme.gentoo_print_elog
 }
diff --git a/games-emulation/melonds/melonds-0.9.4_p1-r1.ebuild b/games-emulation/melonds/melonds-0.9.4_p1-r1.ebuild
new file mode 100644
index 000000000000..706876b372f2
--- /dev/null
+++ b/games-emulation/melonds/melonds-0.9.4_p1-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="melonDS"
+MY_P="${MY_PN}-${PV}"
+
+inherit cmake readme.gentoo-r1 toolchain-funcs xdg
+
+DESCRIPTION="Nintendo DS emulator, sorta"
+HOMEPAGE="
+	http://melonds.kuribo64.net
+	https://github.com/Arisotura/melonDS
+"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Arisotura/${MY_PN}.git"
+else
+	SRC_URI="https://github.com/Arisotura/${MY_PN}/archive/0.9.4.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}"/${MY_PN}-0.9.4
+fi
+
+IUSE="+jit +opengl"
+LICENSE="BSD-2 GPL-2 GPL-3 Unlicense"
+SLOT="0"
+
+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 )
+"
+RDEPEND="${DEPEND}"
+
+# used for JIT recompiler
+QA_EXECSTACK="usr/bin/melonDS"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="You need the following files in order to run melonDS:
+- bios7.bin
+- bios9.bin
+- firmware.bin
+- romlist.bin
+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)
+		-DENABLE_OGLRENDERER=$(usex opengl)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	tc-export AR
+	cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/games-emulation/melonds/melonds-9999.ebuild b/games-emulation/melonds/melonds-9999.ebuild
index 0d497e9b94fc..0cde97c7b287 100644
--- a/games-emulation/melonds/melonds-9999.ebuild
+++ b/games-emulation/melonds/melonds-9999.ebuild
@@ -1,15 +1,12 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# NOTICE:
-# melonds bundles teakra, its upstream haven't had a release since 2020
-
 EAPI=8
 
 MY_PN="melonDS"
 MY_P="${MY_PN}-${PV}"
 
-inherit cmake flag-o-matic readme.gentoo-r1 toolchain-funcs xdg
+inherit cmake readme.gentoo-r1 toolchain-funcs xdg
 
 DESCRIPTION="Nintendo DS emulator, sorta"
 HOMEPAGE="
@@ -32,6 +29,7 @@ SLOT="0"
 
 DEPEND="
 	app-arch/libarchive
+	dev-libs/teakra
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
@@ -55,7 +53,11 @@ 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
 }
 
@@ -73,16 +75,11 @@ src_compile() {
 }
 
 src_install() {
-	# install teakra
-	dolib.so "${BUILD_DIR}/src/teakra/src/libteakra.so"
-
 	cmake_src_install
-
 	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
 	xdg_pkg_postinst
-
 	readme.gentoo_print_elog
 }
diff --git a/games-emulation/mgba/Manifest b/games-emulation/mgba/Manifest
index 822691e9bd92..2ab4b7fa5b8e 100644
--- a/games-emulation/mgba/Manifest
+++ b/games-emulation/mgba/Manifest
@@ -1,6 +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
diff --git a/games-emulation/mgba/files/mgba-0.9.3-ffmpeg5.patch b/games-emulation/mgba/files/mgba-0.9.3-ffmpeg5.patch
new file mode 100644
index 000000000000..cf4f6f56a2d4
--- /dev/null
+++ b/games-emulation/mgba/files/mgba-0.9.3-ffmpeg5.patch
@@ -0,0 +1,117 @@
+From cdc753516798882a805db1d2042dbce8313382bf Mon Sep 17 00:00:00 2001
+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 @@
+  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ #include "ffmpeg-decoder.h"
+ 
++#include <libavcodec/avcodec.h>
+ #include <libswscale/swscale.h>
+ 
+ void FFmpegDecoderInit(struct FFmpegDecoder* decoder) {
+@@ -38,7 +39,7 @@ bool FFmpegDecoderOpen(struct FFmpegDecoder* decoder, const char* infile) {
+ #else
+ 		enum AVMediaType type = decoder->context->streams[i]->codec->codec_type;
+ #endif
+-		struct AVCodec* codec;
++		const struct AVCodec* codec;
+ 		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 @@
+ 
+ #include <libavcodec/version.h>
+ #include <libavcodec/avcodec.h>
++#if LIBAVCODEC_VERSION_MAJOR >= 58
++#include <libavcodec/bsf.h>
++#endif
+ 
+ #include <libavfilter/buffersink.h>
+ #include <libavfilter/buffersrc.h>
+@@ -121,7 +124,7 @@ bool FFmpegEncoderSetAudio(struct FFmpegEncoder* encoder, const char* acodec, un
+ 		return true;
+ 	}
+ 
+-	AVCodec* codec = avcodec_find_encoder_by_name(acodec);
++	const AVCodec* codec = avcodec_find_encoder_by_name(acodec);
+ 	if (!codec) {
+ 		return false;
+ 	}
+@@ -193,7 +196,7 @@ bool FFmpegEncoderSetVideo(struct FFmpegEncoder* encoder, const char* vcodec, in
+ 		return true;
+ 	}
+ 
+-	AVCodec* codec = avcodec_find_encoder_by_name(vcodec);
++	const AVCodec* codec = avcodec_find_encoder_by_name(vcodec);
+ 	if (!codec) {
+ 		return false;
+ 	}
+@@ -213,7 +216,7 @@ bool FFmpegEncoderSetVideo(struct FFmpegEncoder* encoder, const char* vcodec, in
+ 	if (encoder->pixFormat == AV_PIX_FMT_NONE) {
+ 		return false;
+ 	}
+-	if (vbr < 0 && !av_opt_find(&codec->priv_class, "crf", NULL, 0, 0)) {
++	if (vbr < 0 && !av_opt_find((void*) &codec->priv_class, "crf", NULL, 0, 0)) {
+ 		return false;
+ 	}
+ 	encoder->videoCodec = vcodec;
+@@ -223,7 +226,7 @@ bool FFmpegEncoderSetVideo(struct FFmpegEncoder* encoder, const char* vcodec, in
+ }
+ 
+ bool FFmpegEncoderSetContainer(struct FFmpegEncoder* encoder, const char* container) {
+-	AVOutputFormat* oformat = av_guess_format(container, 0, 0);
++	const AVOutputFormat* oformat = av_guess_format(container, 0, 0);
+ 	if (!oformat) {
+ 		return false;
+ 	}
+@@ -241,9 +244,9 @@ void FFmpegEncoderSetLooping(struct FFmpegEncoder* encoder, bool loop) {
+ }
+ 
+ bool FFmpegEncoderVerifyContainer(struct FFmpegEncoder* encoder) {
+-	AVOutputFormat* oformat = av_guess_format(encoder->containerFormat, 0, 0);
+-	AVCodec* acodec = avcodec_find_encoder_by_name(encoder->audioCodec);
+-	AVCodec* vcodec = avcodec_find_encoder_by_name(encoder->videoCodec);
++	const AVOutputFormat* oformat = av_guess_format(encoder->containerFormat, 0, 0);
++	const AVCodec* acodec = avcodec_find_encoder_by_name(encoder->audioCodec);
++	const AVCodec* vcodec = avcodec_find_encoder_by_name(encoder->videoCodec);
+ 	if ((encoder->audioCodec && !acodec) || (encoder->videoCodec && !vcodec) || !oformat || (!acodec && !vcodec)) {
+ 		return false;
+ 	}
+@@ -257,8 +260,8 @@ bool FFmpegEncoderVerifyContainer(struct FFmpegEncoder* encoder) {
+ }
+ 
+ bool FFmpegEncoderOpen(struct FFmpegEncoder* encoder, const char* outfile) {
+-	AVCodec* acodec = avcodec_find_encoder_by_name(encoder->audioCodec);
+-	AVCodec* vcodec = avcodec_find_encoder_by_name(encoder->videoCodec);
++	const AVCodec* acodec = avcodec_find_encoder_by_name(encoder->audioCodec);
++	const AVCodec* vcodec = avcodec_find_encoder_by_name(encoder->videoCodec);
+ 	if ((encoder->audioCodec && !acodec) || (encoder->videoCodec && !vcodec) || !FFmpegEncoderVerifyContainer(encoder)) {
+ 		return false;
+ 	}
+@@ -272,9 +275,9 @@ bool FFmpegEncoderOpen(struct FFmpegEncoder* encoder, const char* outfile) {
+ 	encoder->currentVideoFrame = 0;
+ 	encoder->skipResidue = 0;
+ 
+-	AVOutputFormat* oformat = av_guess_format(encoder->containerFormat, 0, 0);
++	const AVOutputFormat* oformat = av_guess_format(encoder->containerFormat, 0, 0);
+ #ifndef USE_LIBAV
+-	avformat_alloc_output_context2(&encoder->context, oformat, 0, outfile);
++	avformat_alloc_output_context2(&encoder->context, (AVOutputFormat*) oformat, 0, outfile);
+ #else
+ 	encoder->context = avformat_alloc_context();
+ 	strncpy(encoder->context->filename, outfile, sizeof(encoder->context->filename) - 1);
diff --git a/games-emulation/mgba/mgba-0.9.3-r1.ebuild b/games-emulation/mgba/mgba-0.9.3-r1.ebuild
new file mode 100644
index 000000000000..f2e1ddb6dd3b
--- /dev/null
+++ b/games-emulation/mgba/mgba-0.9.3-r1.ebuild
@@ -0,0 +1,132 @@
+# 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 )
+"
+
+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/nestopia/Manifest b/games-emulation/nestopia/Manifest
index e683057e783f..56afeef7dad3 100644
--- a/games-emulation/nestopia/Manifest
+++ b/games-emulation/nestopia/Manifest
@@ -1,4 +1,4 @@
-DIST nestopia-1.50.tar.gz 1529804 BLAKE2B ef2fdf6ffb6ff9bb5f222730869d6deadb892c0a3996e97750afee692ec1d3b997e2bfe353a4fe26b9771781f659de83dda5e4676e221f4b9beaa512d6873ca4 SHA512 6ea389d4891c7cfa36517495735ea0f34ba9427e51757113d0fe2b72d5ce5b11d7e6b7c02fd1e4e347a13bba06823e334800ff15036872e09b8561c10c7cb568
-EBUILD nestopia-1.50.ebuild 916 BLAKE2B ff9e3110417dc77a4edd3c8d12f2d12d148fb83241a67420b0b94fe95a0a3f7272ca78d0e0f08cb8616499a6efbd6b3dbef4c27055405811e0b8bc6ebeda4ab0 SHA512 77855ee12a890cc5293f08686616f80cf384bb2bdccd0e00b907188039ffff4e4f5d7f9fb66d881f585ad9c5f9323699464e5f667926601092d5efed81e03e15
-EBUILD nestopia-9999.ebuild 779 BLAKE2B 2a242f3ce4b6b3005cc336103044b641a3cd25f27600c565c542edd6329e4beb187ca7a106a93370f34acc8762eefbef193cb1e79ec753ea8add9c0bd6363327 SHA512 46ebaf1a1ee09238d26154003be235ff840ef9076c331602c4e08ce3d87c3219630523f3de843991c4f4a1015ca9a05cfedc8d3316884b60bd08d35401512e26
-MISC metadata.xml 392 BLAKE2B 57f9de0581c66772bcadb104d845f59945f78856fa12cba959e4905b719ff30bb5c9ac38d826c94b1ae4b9c9ef321bf7aaac645803f12b095d80df62771f27f4 SHA512 a9ead3d8c3c265f20ad7813aea66aeb0c2710b0f9b0f8f0c5448b8ce98d0242159f38894a171c397f2b24a262f437d66e733516ed15a79c5b4637ee01254bade
+DIST nestopia-1.51.1.tar.gz 1578970 BLAKE2B 5db7a380239c207843d5edadf5a174059d4566cd7b68aca01515db4940be3a6f6d02421f1499df28d4ac026ec435650452eb43306d1e49487063a06bce16b961 SHA512 68da5e9ab7b848d895a8893a18ef50d90758258fbf7f86ca5df0fe95e74bad761aa436dca79b402439a12fd4dd1430b22e45ee202168be3f9f751190a7ae6131
+EBUILD nestopia-1.51.1.ebuild 910 BLAKE2B 238ed320de4c45cf6407d53af3bc527c8c9ddc0f49b56d353f31cd010a25341bcead6dbdca62666d1540b5771d0459a40c0dbfd35db7a6ec7dc696650a1b8dd2 SHA512 c6755c63518cda53f4aa18f785233dcf91713c309ce4a7096eb138b0388330d201f5e60d21c526e349e155c5bdbb986a0dce005fe3f94d497d93652dc403decf
+EBUILD nestopia-9999.ebuild 811 BLAKE2B c0a41d59d5fc01a5dc482db6bcfe9168c1ff0712970b689ef3d50cb99579948e42a8adfe93657a4ff02a65e19741023ea8b0befcffa4a4f79518488f6200d6f9 SHA512 a1de1ff37dd2c334233c059cf2671310129d3fab9275ae1dc15ec33713cad6e6f867ae99b23d608b91db7b459b9dee7739aa65857b47e9882605acb50210105e
+MISC metadata.xml 336 BLAKE2B a4797bc2d4937f6e37f6f8136a35e4088d9682e1b8571e13f5a84e7300c2533b74b237a8a9c983ce75ac073b0d261e9a0fcd35ce7acd6c1e2fac30a7a5aaade3 SHA512 9ee7bf3a223dea8e590bf8f9d9776a3a88c63ae74e78e02b0a79a30a220417639920e004c8078dca2cc9bbdee95546e703aa3a93891bf388f9c7d998c8c6bd5f
diff --git a/games-emulation/nestopia/metadata.xml b/games-emulation/nestopia/metadata.xml
index 29276c3824a5..57d2149abd0f 100644
--- a/games-emulation/nestopia/metadata.xml
+++ b/games-emulation/nestopia/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">rdanbrook/nestopia</remote-id>
-		<remote-id type="sourceforge">nestopiaue</remote-id>
+		<remote-id type="github">0ldsk00l/nestopia</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-emulation/nestopia/nestopia-1.50.ebuild b/games-emulation/nestopia/nestopia-1.50.ebuild
deleted file mode 100644
index a6d4fc185a4e..000000000000
--- a/games-emulation/nestopia/nestopia-1.50.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools xdg
-
-DESCRIPTION="A portable Nintendo Entertainment System emulator written in C++"
-HOMEPAGE="http://0ldsk00l.ca/nestopia/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/0ldsk00l/nestopia.git"
-else
-	SRC_URI="https://github.com/0ldsk00l/nestopia/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="ao doc gui jack"
-
-RDEPEND="
-	app-arch/libarchive:=
-	media-libs/libepoxy
-	media-libs/libsdl2[sound,joystick,video]
-	sys-libs/zlib
-	ao? ( media-libs/libao )
-	gui? ( x11-libs/gtk+:3 )
-	jack? ( virtual/jack )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with ao) \
-		$(use_with jack) \
-		$(use_enable doc) \
-		$(use_enable gui)
-}
diff --git a/games-emulation/nestopia/nestopia-1.51.1.ebuild b/games-emulation/nestopia/nestopia-1.51.1.ebuild
new file mode 100644
index 000000000000..ebab0b9b149b
--- /dev/null
+++ b/games-emulation/nestopia/nestopia-1.51.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic xdg
+
+DESCRIPTION="Portable Nintendo Entertainment System emulator written in C++"
+HOMEPAGE="http://0ldsk00l.ca/nestopia/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/0ldsk00l/nestopia.git"
+else
+	SRC_URI="https://github.com/0ldsk00l/nestopia/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="
+	app-arch/libarchive:=
+	media-libs/libglvnd
+	media-libs/libsdl2[joystick,sound]
+	sys-libs/zlib:=
+	x11-libs/fltk:1[opengl]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/autoconf-archive
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# silence the narrowing warnings on clang (#830469)
+	append-cxxflags -Wno-narrowing
+
+	econf $(use_enable doc)
+}
diff --git a/games-emulation/nestopia/nestopia-9999.ebuild b/games-emulation/nestopia/nestopia-9999.ebuild
index 98f2f70517d9..c6bdbe0d6fb8 100644
--- a/games-emulation/nestopia/nestopia-9999.ebuild
+++ b/games-emulation/nestopia/nestopia-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools xdg
 
-DESCRIPTION="A portable Nintendo Entertainment System emulator written in C++"
+DESCRIPTION="Portable Nintendo Entertainment System emulator written in C++"
 HOMEPAGE="http://0ldsk00l.ca/nestopia/"
 
-if [[ ${PV} == *9999 ]]; then
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/0ldsk00l/nestopia.git"
 else
@@ -22,15 +22,18 @@ IUSE="doc"
 
 RDEPEND="
 	app-arch/libarchive:=
-	media-libs/libepoxy
-	media-libs/libsdl2[sound,joystick,video]
-	sys-libs/zlib
-	x11-libs/gtk+:3"
+	media-libs/libglvnd
+	media-libs/libsdl2[joystick,sound]
+	sys-libs/zlib:=
+	x11-libs/fltk:1[opengl]"
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+	sys-devel/autoconf-archive
+	virtual/pkgconfig"
 
 src_prepare() {
 	default
+
 	eautoreconf
 }
 
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index eadeb2708c51..9a14c95b102e 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,5 +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-r2.ebuild 2808 BLAKE2B f947a2cb7ec6a2ba32514a622317913a3b63fc4063c7b7a1aa36012ecefb8bae327a8673e9b1d66002f6f059cd0d08faf3de4d79566fe451305a47b2de615ced SHA512 cf504517c5dac9cfff4adaf7fe7425e468acd7f1e5a8c7ff0670040ed5e8970dd8e304d716831e8cea4c1fc015a499e4db791fd0df4913f28ed25cc89664433a
-EBUILD pcsx2-9999.ebuild 2809 BLAKE2B 967a29c69976ed96b7dabcf5f9bda82fa90f8a10ba18853b1968dcb61155d012672f373933b8a59c56d94405d3eb7d88d6d52b4cef3a38b4463ba312f6f539f5 SHA512 9dccea1357fa2705faec7a37418a951228c91cb7de8d74128bd1895693ed3986148e7094966f440509776bbe1ebd05fea0ed777b409399010bccd657a610ad07
+EBUILD pcsx2-1.6.0-r3.ebuild 2756 BLAKE2B b62ba422f2856bc9b6a6f0e3961495e8cd88ce67a80228dfde200d9f62b71e41fef52836a5d80ceb2bdf4a11323935d37a566127387437abb133c361ff3c5dfe SHA512 892d63d5b60495ffd2459cec294e50eff2b9b83fe153d650f809a539bc4521e80fad64d229fe6af05ff21faad3e57a10d06b10f6053d42c254102da0f8036fed
+EBUILD pcsx2-9999.ebuild 2867 BLAKE2B 2e6eafc0c9b9c747e48ad745b4b186bd27927ccb8db4a3c80b7c9cfe7e5f8ee08bdba372af3460f205eeab8e113d162861d722dcacb8aacc3c65a4503189edf1 SHA512 75c9fc8a4a385cfabf30d34aa889da186d2d06ff410ee32e18eb52797ca07e95e94d5429214f881366583aaeed8ea614482d730241f2ed1baa3821f81665e61f
 MISC metadata.xml 533 BLAKE2B 6133475168a5df84979b4ce8a195451abcc28f6cc910b937bc9de5b31f4f149c251602786d05d256a0c863d4a49ba5b47c8bbc957d1f87e5019ea78e8e3a5295 SHA512 9be0d69ebad684eeaad115e7b3e5ab66093e87a48523ef5b0cf6dff30ff5b0be9fdfc93aa755767e55a2e1a74fbc34316242acb24148560ae4a7382586eac1a5
diff --git a/games-emulation/pcsx2/files/pcsx2-1.6.0-wx-config.patch b/games-emulation/pcsx2/files/pcsx2-1.6.0-wx-config.patch
new file mode 100644
index 000000000000..bfa12b893dcd
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.6.0-wx-config.patch
@@ -0,0 +1,20 @@
+Don't attempt to use /usr/bin/wx-config-3.0 which can point to the
+wrong wx-config depending on eselect'ed wxGTK profile. Furthermore
+that path does not use ESYSROOT.
+
+If unset, FindwxWidgets.cmake will use WX_CONFIG environment
+set by the wxwidgets eclass.
+--- a/cmake/SearchForStuff.cmake
++++ b/cmake/SearchForStuff.cmake
+@@ -50,4 +50,5 @@
+ # lib32-wx3.0 => /usr/bin/wx-config32-3.0
+ # FindwxWidgets only searches for wx-config.
++#[[
+ if(CMAKE_CROSSCOMPILING)
+     # May need to fix the filenames for lib32-wx3.0.
+@@ -71,4 +72,5 @@
+     endif()
+ endif()
++#]]
+ 
+ find_package(wxWidgets COMPONENTS base core adv)
diff --git a/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild
index a9b0dc2b9ffb..8a6662ae3aa4 100644
--- a/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild
@@ -46,6 +46,7 @@ FILECAPS=(
 
 PATCHES=(
 	"${FILESDIR}/${P}-disable-setcap.patch"
+	"${FILESDIR}/${P}-wx-config.patch"
 )
 
 pkg_setup() {
@@ -68,12 +69,6 @@ src_configure() {
 	# if it something other than "Devel|Debug|Release"
 	local CMAKE_BUILD_TYPE="Release"
 
-	if use amd64; then
-		# Passing correct CMAKE_TOOLCHAIN_FILE for amd64
-		# https://github.com/PCSX2/pcsx2/pull/422
-		local MYCMAKEARGS=(-DCMAKE_TOOLCHAIN_FILE=cmake/linux-compiler-i386-multilib.cmake)
-	fi
-
 	local mycmakeargs=(
 		-DARCH_FLAG=
 		-DDISABLE_BUILD_DATE=TRUE
@@ -93,6 +88,9 @@ src_configure() {
 		# wxGTK must be built against same sdl version
 		-DSDL2_API=TRUE
 		-DUSE_VTUNE=FALSE
+
+		# mimic old toolchain file behavior (bug #833100 comment #20)
+		-DCMAKE_SYSTEM_IGNORE_PATH="${ESYSROOT}"/usr/lib64
 	)
 
 	setup-wxwidgets
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index f5543f61bed1..bdd694c0a1c5 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -75,6 +75,7 @@ src_prepare() {
 	# unbundle, use sed over patch for less chances to break -9999
 	sed -e '/add_subdir.*cubeb/c\find_package(cubeb REQUIRED)' \
 		-e '/add_subdir.*libchdr/c\pkg_check_modules(chdr REQUIRED IMPORTED_TARGET libchdr)' \
+		-e '/compile_options(\(cubeb\|chdr-static\|speex\)/d' \
 		-i cmake/SearchForStuff.cmake || die
 	sed -i 's/chdr-static/PkgConfig::chdr/' pcsx2/CMakeLists.txt || die
 
diff --git a/games-emulation/ppsspp/Manifest b/games-emulation/ppsspp/Manifest
index bbb78405b0f1..377d66efc657 100644
--- a/games-emulation/ppsspp/Manifest
+++ b/games-emulation/ppsspp/Manifest
@@ -28,7 +28,7 @@ DIST ppsspp-1.12.3-ext_native_tools_prebuilt.tar.gz 897571 BLAKE2B b1c959a0cd1c6
 DIST ppsspp-1.12.3-ext_rapidjson.tar.gz 1054419 BLAKE2B 40b8ba0884943de2179b21d7a56716efed2ec5b4098aa33c061e52703b0952930fe2f1bda8cb6ec4a75b947753011e9d06fda953a3862e321d2a0187cd60385d SHA512 3472e129e710bf5343b8b27a61581a1480c8096493e466440b62702d8b5353745d561931f72b5405a736ad92525be3843ea1cf4b5ea5839721cc6d6b358f19bc
 DIST ppsspp-1.12.3-ext_zstd.tar.gz 1868621 BLAKE2B abbd48a18c587fc6c413c3df32aa6b74a1c3d0ed02eacb2e7ad23a4fdab059b092e8df4356cbc799641b42e99587238decc2ae27862142fd8d7be7959ad1fd5e SHA512 659576d0f52d2271b6b53f638b407b873888b1cffe4f014c3149d33a961653c2fcf7ff270bc669a5647205b573ef2809907645a4c89ab6c030ad65bce15547ae
 DIST ppsspp-1.12.3.tar.gz 31693022 BLAKE2B a3378efaad9c8aa7b6141e454b6663892fb357c264845edd4ebf3e25fc8f9d76d8cc5a45d220ba0549036dd8d06e825105bb72182c4ba621e7618563d4f806c5 SHA512 fe5f5b150cc06ecca68c592fa19396d9a6e573c67da9be0ba98a3db975b0efcb6de694ac224543beaea2a3eb4952d45459e850d6c2f0fe6668536325dd449d38
-EBUILD ppsspp-1.11.3.ebuild 3383 BLAKE2B e7965bb10149f462062a40b2b8733af337a9fef8e03103be39c0a1c2329a3d4fe84e95f6024c69485ffa5e73ef0d18875d0b46e00751794412f35841a2f4abd2 SHA512 e802d25db5db6cab4944de324da7efd26de67442afe3d3fe0023530ba6165773389d21789dac527f026715a3473e2c8a4aed6663e4263a05416bf3395b183275
-EBUILD ppsspp-1.11.3_p20210627-r1.ebuild 3045 BLAKE2B 1cf0f192a8d2b49fbd56fed743860d714df6b04a38aa0eff56f3c02304adf7423260ad706bb43b55d04befa266899ba48a7cd48a660533b54adb3ddfa3216b33 SHA512 f666f4034b44f2e5d3bdac524efb82f93ffee435bfaf7af22e6e7380ced864390e3331b0d6ca6279c6575e76632c949a1c93c9323f6e80dba445d9e57da210aa
-EBUILD ppsspp-1.12.3.ebuild 2951 BLAKE2B 484e27815faec73b2b7cd05a786839c13f06c2e30adb03d175b31b62936d45705715a7ead0d38cc5593113a88f9c0d84636b0134f5f621b6b8ae8b337d8ddff0 SHA512 1c1817a6306e4f21322831015977a61f99b37e338c015ef478eef0020b104dcd31d4fa20078c9f7c9420efbeca00986c422853061d053631ea9ecd2aefc82c14
+EBUILD ppsspp-1.11.3-r1.ebuild 3392 BLAKE2B 1da8ceb90ab29005ecde4f2a102b8793c1bc5e38de84214b40210a3de6dae83af52d8721d1fcc6c4c3fa7dab963e52569dee34c4527a45832e0868696261c1ba SHA512 da657d03e789af965acb55382379bbe2b8cc4ba6add953ea1abffd23678c057ad63d9493f01513057b069f739b809690ec8e631c012fbaf1beead1e1459b27dc
+EBUILD ppsspp-1.11.3_p20210627-r2.ebuild 3054 BLAKE2B 8ca37316d56bd8af3608f841f559e0c4e6ede699d9d800f1b5bd47ebea7ea279d4790329616bbfcd91fce36a2a21ade079de200d735006e145021efaa8c524d6 SHA512 902a956249dbcead560594b174f5e7d525bfbde2852133f643d939854f94b0dfc4bc8609a225137668adb0cc2d6eaf342b219973335a791c10012ea19ab5a67a
+EBUILD ppsspp-1.12.3-r1.ebuild 2960 BLAKE2B 1acd9ad12a4703b3bbcfb45518ade6475b0db80e45804dc3564318eb9791f5089f73a4132ba0edf463cc61580b25c1939be9164a39985969002396808cf189c5 SHA512 4c9b07f9eba1e5c8f70ece68bfe8764e59a3a8bfafcde44820040be8e8fb8a3302cc629e7872b202c3d9bbb0807ecc1d31753a7ce151330fd52cdda7b7e1c3c0
 MISC metadata.xml 634 BLAKE2B 28ec3f1c61837373f50fe759676acfb42ab0b4dcc8634ceac7313eb47c5db4b9996c8dd542217fbb0e8e6a8894d2c159ba2ffc5ca7470996b54125964aefe18e SHA512 3946e60ae6a08f8c1e53c44f3263c594584cf147405b8ab8c7397dab9dc3630cc4c8c6da430fc57d7f02cd39fa163806949c76764bfdea95f93bef7d5a970aca
diff --git a/games-emulation/ppsspp/ppsspp-1.11.3.ebuild b/games-emulation/ppsspp/ppsspp-1.11.3-r1.ebuild
index c833ea0b5f4a..0e56f4eb3423 100644
--- a/games-emulation/ppsspp/ppsspp-1.11.3.ebuild
+++ b/games-emulation/ppsspp/ppsspp-1.11.3-r1.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
@@ -35,7 +35,7 @@ RDEPEND="
 	sys-libs/zlib:=
 	virtual/opengl
 	sdl? ( media-libs/libsdl2 )
-	system-ffmpeg? ( media-video/ffmpeg:= )
+	system-ffmpeg? ( media-video/ffmpeg:0/56.58.58 )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5[-gles2-only]
diff --git a/games-emulation/ppsspp/ppsspp-1.11.3_p20210627-r1.ebuild b/games-emulation/ppsspp/ppsspp-1.11.3_p20210627-r2.ebuild
index a6d35611d326..f423958a6178 100644
--- a/games-emulation/ppsspp/ppsspp-1.11.3_p20210627-r1.ebuild
+++ b/games-emulation/ppsspp/ppsspp-1.11.3_p20210627-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,7 +36,7 @@ RDEPEND="
 	media-libs/glew:=
 	media-libs/libpng:=
 	media-libs/libsdl2[joystick]
-	media-video/ffmpeg:=
+	media-video/ffmpeg:0/56.58.58
 	sys-libs/zlib:=
 	virtual/opengl
 	qt5? (
diff --git a/games-emulation/ppsspp/ppsspp-1.12.3.ebuild b/games-emulation/ppsspp/ppsspp-1.12.3-r1.ebuild
index 74faf99b6397..aa3ff5031252 100644
--- a/games-emulation/ppsspp/ppsspp-1.12.3.ebuild
+++ b/games-emulation/ppsspp/ppsspp-1.12.3-r1.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
@@ -33,7 +33,7 @@ RDEPEND="
 	media-libs/glew:=
 	media-libs/libpng:=
 	media-libs/libsdl2[joystick]
-	media-video/ffmpeg:=
+	media-video/ffmpeg:0/56.58.58
 	sys-libs/zlib:=
 	virtual/opengl
 	qt5? (
diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
index 3e089ab165e3..f6f754f0e5b2 100644
--- a/games-emulation/snes9x/Manifest
+++ b/games-emulation/snes9x/Manifest
@@ -1,6 +1,8 @@
 AUX snes9x-1.53-cross-compile.patch 892 BLAKE2B 9fb806ad16d48d5f07f1ab84feb5f7eafa52a1157eb25675650f08c8fbab8a42318d3277efbdd45f03250df2e9187c76df43312f7ffb2f226423e757b5f6e91c SHA512 4867b9a3e3f2a65684157b26e4b0b63971d37ad5abb16125567e89bc4116482488416ca51d30f639ef63886b05431c56b75978fe073a4755c48988f5ea9eaee5
 AUX snes9x-1.59-build-system.patch 1303 BLAKE2B 48a349bc5d56fcf154faab76cf76fcbb98808ce7933ff5e6da2cbf2b22d62819367e2ac1224f66735108de44419375d6f6eb2c2a4a104a4d492148866b6e829e SHA512 abbd0bfea5ad23f652e8249adbdf1118a4efa2ed43301b1786bbd91a253e98fb7ff99f68ff62c128972fe0af47aee9fa48fa9e3218b0a33c9e68f468fbe2b9e8
-AUX snes9x-1.60-gcc11.patch 1805 BLAKE2B 0639b425266be59ac472f92154ce488bf0b6f631f00c2025104f6dfb31f1c72d1202657d182e47a47198606ce92a55bf8769662c9a4e81add171be547b7ced08 SHA512 600291b2c32e4099207eb31e7b6b19d4ec043b43d88b9eb5efe935c971ae8bcb02e821a6653246417481db0d46c5a3e1a4af3ea8c17894549b293e588f6fab79
-DIST snes9x-1.60.tar.gz 2863228 BLAKE2B 0ac3bdd2403221f1013e2b5438aacc4e7d361e943ac7edc56f8ef22827d81484e0b162b84f739ce0f68fe58021124275fd908ccdde99e1e1d6d6c9c0a6e3d17b SHA512 840b006a8fbd479fd5ceb2d94af4ef6470c5e27a3e6c8ddb0dffc8d3e51f465669144cd428bfce28b2ed4f68e70d8f252f2d8a2cae602ba797791d7e483c14c9
-EBUILD snes9x-1.60.ebuild 3029 BLAKE2B 2e8b7ab81a10a48aad64a09cbaae2ab2e7c8706af990ae18425be76ff6de2a58800563990f2de320cd959fcc1bcdb893595b47839a8d218244c8a7b7e6471e40 SHA512 bdc32f1d423acfce19d9672f057a228e763c8276333de0db4184eb53780edaa4af721a824d1c65dff04c7c14008ec1592139513694db6b68582e8b064bb72d12
-MISC metadata.xml 541 BLAKE2B 947726495e8cc2ced852a3f5b749abfb1bca7744ed82f42997ca97670ce58ebf4a6c49b4d382686fd948789c67c2ec381bfb1b164bddfa547b16389cb938e5b1 SHA512 a8e52524b33aff38cc2ebd41040cde80bcca815305d234b3708297899286657ac8786248af3a6c5df0b4c894af31aa29bf3d0cdb427e889c5d7f145d643331d4
+AUX snes9x-1.61-libretro-flags.patch 693 BLAKE2B 4f027c9278f866476ba0d2f0884fe105da31e40e7362dfece81d0cddaf74e411f8e6b1a59e4fbb41389a2829695e39ce29c5de29ae055f744feb9320fc9ef255 SHA512 b0851e9da76e9a05f1893014564e8833c72cf7025c4c9f9f44665374f1f69e44fd5400125459bca1656c7920e033b11e33e0a1a3fb0af8a25c1bd0b3db6870da
+DIST snes9x-1.61-glslang.tar.gz 3188787 BLAKE2B 36ed327fbb2aec3657fe300b98f2e45cfe039596a64bca3076ecb079f7c33aa14ac09a96e5a174ad51faf0c4d585d82aaadec3d8209cf8d3ca55d70e316b1642 SHA512 de2ebc0cd89d22582c079006ac45a812e3aaaad9a44c77c68530aa1468fbc840c6ae25a4356d4e9fc697524cd721d26506d85bc35eac98452eabce0bc098b5a4
+DIST snes9x-1.61-spirv.tar.gz 676662 BLAKE2B ab18406c99e4e04c6c497b5f447dcaccb7d5a60f42bf1cea31afee04ee664e74916b32736c1aea1e7106494154e48e5cbe9b5d6a0652667c4d0e2020814cd9bd SHA512 bfa3cc944450db59a57a685eea12b0ed0b5059d55a092ac5cdf6f4dc03c1e2d2e62fa5a576156c772340e12136b10d7ed790bb35b4aece2ee8405e64f826e31b
+DIST snes9x-1.61.tar.gz 3016890 BLAKE2B 3e94dee5172bf48d2461a3a1403fc7e7fc8069df6dddf5b5e1da59ee140297bd0b7cee6948b5eb154c1eec38aebe3ab29a9fae3dfb4abdce41769d2ace43dee1 SHA512 8b644f5b7136e89fd222bcb430fc736c74a3e383d7e6c7f0880235f6fa4c0f77abbf02493f8d654a12e87701111643e33877bc21bb3dfcc9b82a056fa1b1d880
+EBUILD snes9x-1.61.ebuild 3519 BLAKE2B aed7717315000d6ca7fbb25336b859b54a45a9af51ce7a5948dd28251ee98f6ea540d3390b75e2bed6e180fa80334e3fef757f37d61054252fc1cacabfb48bbb SHA512 eba8d739a0a7c2ad84714a0b5bc6f596fe676789d4d1447ceaf8121316a6b96b09a46f748f8b0a051c454479cce524f751615bf1776bcd4daf28168abb86a07f
+MISC metadata.xml 608 BLAKE2B 9e770ccbcf8a5c12fccf33febd962f5f64f3378d9eabacaea208c28bed78fd909004a822e221bb6155bef1e2fd8908544075e57d3f48232fff2fb7c2c93cb7e4 SHA512 21718e0e03cad23eabd7e360ba347e77fef1e4af97945e3436b6d494cf5c1f8c7336d5987eda79c4b8359057ebe3d56fc41c0de66d227183470a19c34e393ff9
diff --git a/games-emulation/snes9x/files/snes9x-1.60-gcc11.patch b/games-emulation/snes9x/files/snes9x-1.60-gcc11.patch
deleted file mode 100644
index 453771f5139c..000000000000
--- a/games-emulation/snes9x/files/snes9x-1.60-gcc11.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 7f6d9d6432d912cd90763c64f7c92270b3e6c182 Mon Sep 17 00:00:00 2001
-From: gocha <gochaism@gmail.com>
-Date: Sun, 19 Jan 2020 12:48:06 +0900
-Subject: [PATCH] win32: fix compilation error in vs2019
-
----
- conffile.cpp | 2 +-
- conffile.h   | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/conffile.cpp b/conffile.cpp
-index 817afae7f..fa7de3fa2 100644
---- a/conffile.cpp
-+++ b/conffile.cpp
-@@ -452,7 +452,7 @@ void ConfigFile::ClearLines()
-     }
- }
- 
--bool ConfigFile::ConfigEntry::section_then_key_less::operator()(const ConfigEntry &a, const ConfigEntry &b) {
-+bool ConfigFile::ConfigEntry::section_then_key_less::operator()(const ConfigEntry &a, const ConfigEntry &b) const{
- 	if(curConfigFile && a.section!=b.section){
- 		const int sva = curConfigFile->GetSectionSize(a.section);
- 		const int svb = curConfigFile->GetSectionSize(b.section);
-diff --git a/conffile.h b/conffile.h
-index ba69812df..d92128cba 100644
---- a/conffile.h
-+++ b/conffile.h
-@@ -90,7 +90,7 @@ class ConfigFile {
- 		mutable bool used;
- 
-         struct section_then_key_less {
--            bool operator()(const ConfigEntry &a, const ConfigEntry &b);
-+            bool operator()(const ConfigEntry &a, const ConfigEntry &b) const;
-         };
- 
-         struct key_less {
-@@ -101,8 +101,8 @@ class ConfigFile {
-         };
- 
-         struct line_less {
--            bool operator()(const ConfigEntry &a, const ConfigEntry &b){
--				if(a.line==b.line) return (b.val.empty() && !a.val.empty()) || a.key<b.key;
-+            bool operator()(const ConfigEntry &a, const ConfigEntry &b) const{
-+                if(a.line==b.line) return (b.val.empty() && !a.val.empty()) || a.key<b.key;
-                 if(b.line<0) return true;
-                 if(a.line<0) return false;
-                 return a.line<b.line;
diff --git a/games-emulation/snes9x/files/snes9x-1.61-libretro-flags.patch b/games-emulation/snes9x/files/snes9x-1.61-libretro-flags.patch
new file mode 100644
index 000000000000..297c7d78257d
--- /dev/null
+++ b/games-emulation/snes9x/files/snes9x-1.61-libretro-flags.patch
@@ -0,0 +1,25 @@
+CXXFLAGS is used as a "common" flags variable and passed to CFLAGS,
+but want to use user's CFLAGS for CC rather than CXXFLAGS. Workaround
+with a temporary variable and also drop -O3/lto from defaults.
+--- a/libretro/Makefile
++++ b/libretro/Makefile
+@@ -4,3 +4,5 @@
+ 
+-LTO ?= -flto
++LTO :=
++ORIG_CXXFLAGS := $(CXXFLAGS)
++CXXFLAGS :=
+ SPACE :=
+@@ -580,4 +582,4 @@
+ else
+-   CFLAGS += -O3 -DNDEBUG
+-   CXXFLAGS += -O3 -DNDEBUG
++   CFLAGS += -DNDEBUG
++   CXXFLAGS += -DNDEBUG
+ endif
+@@ -612,3 +614,4 @@
+ CXXFLAGS	+= -DRIGHTSHIFT_IS_SAR -D__LIBRETRO__ -DALLOW_CPU_OVERCLOCK
+-CFLAGS		:= $(CXXFLAGS)
++CFLAGS		:= $(CXXFLAGS) $(CFLAGS)
++CXXFLAGS	+= $(ORIG_CXXFLAGS)
+ CFLAGS          += -DHAVE_STDINT_H
diff --git a/games-emulation/snes9x/metadata.xml b/games-emulation/snes9x/metadata.xml
index 2d24d25eb987..8f63c2fe45fa 100644
--- a/games-emulation/snes9x/metadata.xml
+++ b/games-emulation/snes9x/metadata.xml
@@ -6,8 +6,9 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<use>
-		<flag name="netplay">Enable playing ROMs over the network (not recommended)</flag>
+		<flag name="glslang">Build support for slang-type shaders</flag>
 		<flag name="libretro">Build libretro port</flag>
+		<flag name="netplay">Enable playing ROMs over the network (not recommended)</flag>
 	</use>
 	<upstream>
 		<remote-id type="google-code">snes9x-gtk</remote-id>
diff --git a/games-emulation/snes9x/snes9x-1.60.ebuild b/games-emulation/snes9x/snes9x-1.60.ebuild
deleted file mode 100644
index b44ac4ece5bf..000000000000
--- a/games-emulation/snes9x/snes9x-1.60.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic meson xdg
-
-DESCRIPTION="Super Nintendo Entertainment System (SNES) emulator"
-HOMEPAGE="https://github.com/snes9xgit/snes9x"
-SRC_URI="https://github.com/snes9xgit/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Snes9x GPL-2 GPL-2+ LGPL-2.1 LGPL-2.1+ ISC MIT ZLIB Info-ZIP"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="alsa debug gtk libretro multilib netplay opengl oss png pulseaudio portaudio wayland xinerama +xv"
-RESTRICT="bindist"
-
-RDEPEND="
-	gtk? (
-		dev-libs/glib:2
-		media-libs/libsdl2[joystick]
-		>=x11-libs/gtk+-3.22:3[wayland?]
-		x11-libs/libXrandr
-		x11-misc/xdg-utils
-		alsa? ( media-libs/alsa-lib )
-		opengl? (
-			media-libs/libepoxy
-			virtual/opengl
-		)
-		portaudio? ( >=media-libs/portaudio-19_pre )
-		pulseaudio? ( media-sound/pulseaudio )
-		xv? ( x11-libs/libXv )
-		wayland? ( dev-libs/wayland )
-	)
-	!gtk? ( x11-libs/libXv )
-	libretro? ( !!games-emulation/libretro-snes9x )
-	png? ( media-libs/libpng:0= )
-	sys-libs/zlib:=[minizip]
-	xinerama? ( x11-libs/libXinerama )
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/libX11
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${P}/unix"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.53-cross-compile.patch
-	"${FILESDIR}"/${PN}-1.59-build-system.patch
-	"${FILESDIR}"/${PN}-1.60-gcc11.patch
-)
-
-src_prepare() {
-	cd "${WORKDIR}/${P}" || die
-	rm -r unzip || die
-	default
-	cd unix || die
-	eautoreconf
-	if use gtk ; then
-		export EMESON_SOURCE="${WORKDIR}/${P}/gtk"
-	fi
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-
-	# build breaks when zlib/zip support is disabled
-	local myeconfargs=(
-		--enable-gamepad
-		--enable-gzip
-		--enable-zip
-		--with-system-zip
-		$(use_enable debug debugger)
-		$(use_enable netplay)
-		$(use_enable png screenshot)
-		$(use_enable xinerama)
-	)
-	econf "${myeconfargs[@]}"
-
-	if use gtk; then
-		local emesonargs=(
-			-Dalsa="$(usex alsa true false)"
-			-Ddebugger="$(usex debug true false)"
-			-Dgtk2=false
-			-Dgtk3=true
-			-Dopengl="$(usex opengl true false)"
-			-Doss="$(usex oss true false)"
-			-Dportaudio="$(usex portaudio true false)"
-			-Dpulseaudio="$(usex pulseaudio true false)"
-			-Dscreenshot="$(usex png true false)"
-			-Dsystem-zip=true
-			-Dxv="$(usex xv true false)"
-			-Dzlib=true
-			-Dwayland="$(usex wayland true false)"
-		)
-		meson_src_configure
-	fi
-}
-
-src_compile() {
-	use libretro && emake -C ../libretro
-	emake
-	use gtk && meson_src_compile
-}
-
-src_install() {
-	dobin ${PN}
-
-	dodoc ../docs/{changes,control-inputs,controls,snapshots}.txt
-	dodoc snes9x.conf.default
-
-	if use libretro ; then
-		cd "${WORKDIR}/${PF}/libretro/"
-		dolib.so snes9x_libretro.so
-	fi
-
-	if use gtk ; then
-		meson_src_install
-		dodoc ../gtk/AUTHORS
-	fi
-
-	HTML_DOCS="${WORKDIR}/${PF}/docs/*.html"
-	einstalldocs
-}
-
-pkg_preinst() {
-	use gtk && xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	use gtk && xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	use gtk && xdg_pkg_postrm
-}
diff --git a/games-emulation/snes9x/snes9x-1.61.ebuild b/games-emulation/snes9x/snes9x-1.61.ebuild
new file mode 100644
index 000000000000..7300fb65bb2a
--- /dev/null
+++ b/games-emulation/snes9x/snes9x-1.61.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools meson toolchain-funcs xdg
+
+GLSLANG_COMMIT="bcf6a2430e99e8fc24f9f266e99316905e6d5134"
+SPIRV_COMMIT="1458bae62ec67ea7d12c5a13b740e23ed4bb226c"
+
+DESCRIPTION="Super Nintendo Entertainment System (SNES) emulator"
+HOMEPAGE="https://github.com/snes9xgit/snes9x/"
+SRC_URI="
+	https://github.com/snes9xgit/snes9x/archive/${PV}.tar.gz -> ${P}.tar.gz
+	gui? ( glslang? (
+		https://github.com/KhronosGroup/glslang/archive/${GLSLANG_COMMIT}.tar.gz -> ${P}-glslang.tar.gz
+		https://github.com/KhronosGroup/SPIRV-Cross/archive/${SPIRV_COMMIT}.tar.gz -> ${P}-spirv.tar.gz
+	) )"
+
+LICENSE="
+	Snes9x GPL-2 GPL-2+ LGPL-2.1 LGPL-2.1+ ISC MIT ZLIB
+	gui? ( glslang? ( Apache-2.0 BSD ) )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="alsa debug glslang gui libretro netplay opengl oss png portaudio pulseaudio wayland xinerama +xv"
+REQUIRED_USE="glslang? ( gui opengl )"
+RESTRICT="bindist test" # has no tests but can lead to bug #737044
+
+RDEPEND="
+	sys-libs/zlib:=[minizip]
+	x11-libs/libX11
+	x11-libs/libXext
+	alsa? ( media-libs/alsa-lib )
+	gui? (
+		dev-cpp/cairomm:0
+		dev-cpp/glibmm:2
+		dev-cpp/gtkmm:3.0[wayland?]
+		dev-libs/glib:2
+		dev-libs/libsigc++:2
+		media-libs/libsdl2[joystick]
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3[wayland?]
+		x11-libs/libXrandr
+		x11-misc/xdg-utils
+		opengl? ( media-libs/libepoxy )
+		portaudio? ( media-libs/portaudio )
+		pulseaudio? ( media-sound/pulseaudio )
+		wayland? ( dev-libs/wayland )
+	)
+	libretro? ( !games-emulation/libretro-snes9x )
+	png? ( media-libs/libpng:= )
+	xinerama? ( x11-libs/libXinerama )
+	xv? ( x11-libs/libXv )"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+	opengl? ( media-libs/libglvnd )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.53-cross-compile.patch
+	"${FILESDIR}"/${PN}-1.59-build-system.patch
+	"${FILESDIR}"/${PN}-1.61-libretro-flags.patch
+)
+
+src_prepare() {
+	if use gui && use glslang; then
+		rmdir shaders/{glslang,SPIRV-Cross} || die
+		mv ../glslang-${GLSLANG_COMMIT} shaders/glslang || die
+		mv ../SPIRV-Cross-${SPIRV_COMMIT} shaders/SPIRV-Cross || die
+	fi
+
+	default
+
+	rm -r unzip || die
+
+	cd unix || die
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC CXX # for libretro
+
+	local econfargs=(
+		$(use_enable alsa sound-alsa)
+		$(use_enable debug debugger)
+		$(use_enable netplay)
+		$(use_enable png screenshot)
+		$(use_enable xinerama)
+		$(use_enable xv xvideo)
+		--enable-gamepad
+		--enable-gzip
+		--enable-zip
+		--with-system-zip
+	)
+
+	cd unix || die
+	econf "${econfargs[@]}"
+
+	if use gui; then
+		local emesonargs=(
+			$(meson_use alsa)
+			$(meson_use debug debugger)
+			$(meson_use glslang slang) # TODO?: unbundle
+			$(meson_use opengl)
+			$(meson_use oss)
+			$(meson_use png screenshot)
+			$(meson_use portaudio)
+			$(meson_use pulseaudio)
+			$(meson_use wayland)
+			$(meson_use xv)
+			-Dsystem-zip=true
+			-Dzlib=true
+		)
+
+		EMESON_SOURCE=${S}/gtk
+		meson_src_configure
+	fi
+}
+
+src_compile() {
+	if use libretro; then
+		emake -C libretro
+		# rebuild objects given libretro uses different defines (bug #791475)
+		rm *.o || die
+	fi
+
+	emake -C unix
+
+	use gui && meson_src_compile
+}
+
+src_install() {
+	if use libretro; then
+		exeinto /usr/$(get_libdir)/libretro
+		doexe libretro/snes9x_libretro.so
+	fi
+
+	dobin unix/${PN}
+
+	local DOCS=(
+		README.md
+		docs/{changes,control-inputs,controls,snapshots}.txt
+		unix/snes9x.conf.default
+	)
+	einstalldocs
+
+	if use gui; then
+		meson_src_install
+		dodoc gtk/AUTHORS
+	fi
+}