gentoo resync : 25.08.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
commit: 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree: c513fe68548b40365c1c2ebfe35c58ad431cdd77 /games-emulation
parent: 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
58 files changed, 854 insertions, 1125 deletions
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index a61ae96cc323..090668337a87 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/dgen-sdl/Manifest b/games-emulation/dgen-sdl/Manifest
index 27f46d59279b..b1b1aa169e65 100644
--- a/games-emulation/dgen-sdl/Manifest
+++ b/games-emulation/dgen-sdl/Manifest
@@ -1,4 +1,6 @@
+AUX dgen-sdl-1.33-AM_PROG_AR.patch 186 BLAKE2B 92d05ca07800625bc06b03b1d589df4ee6451f0ad314709fcd4ab6fc56d55b264b18d172cea3fc238b5e63fe6a1f550d7cc01e345ecb5f79424a34071dbac46d SHA512 1a249b69271fbaef5339b3eb81e6eaa9991fc803dbbd72aa83cca198ca17e9f29169ed558e80e4ac0572b366128d453c5310af61cb4f4949a2b418b59ceee7ac
+AUX dgen-sdl-1.33-clang-c++11.patch 472 BLAKE2B dc6e1e93c28a5d7f830d74b86be8b4c42aac37f11137c008a26c200f742d8223cf09cd2578b874fd0009437ee7ef74fabbf61dd51113b9f0eebeb8026685f652 SHA512 e5fdbccfcbd434c4974e387f59718530895d180daaf7a33c3c702f1435ca6bfc070829dceb57abbb7fdfecb89221a86fa1a3abab4c8490ae4dbff561207ad5ee
 AUX dgen-sdl-1.33-joystick.patch 406 BLAKE2B 175ac9aee89e657dc48f2c0d8f63019da310fc33dbde271dfb3d7cab79d9533136b02c4761063fc56f88764c0f6afacc687f13fe3e4a1acf99fbd0792694e76c SHA512 0057f4099b941cc1aa1fc4d2d260c3bb7601f8149542ab4a87b3306f839ec6e8306fd00d0f2f87d770cc956a60841ff608095ca7bbc3e0e143f6c057f4d21e58
 DIST dgen-sdl-1.33.tar.gz 939297 BLAKE2B e7d107425f8d2c396e37bd140c9ccebe96f7365ac729faac748e1ccf53ebae30fedc59f05070cdcb16d59a7870b6679e4f6e0dda83a697342c2a692c565a4d13 SHA512 c98ab8cdced62a5d26fd677ad36b031e756620114c946ac067599e84ae6ebcfab731554dd4337b6314c3b5db4601c8a6cc67c285d2aad136e659b9973c01a749
-EBUILD dgen-sdl-1.33-r1.ebuild 825 BLAKE2B 6094564d53612df217efc0d81040883390d4bac149c1630e09b6a1078d4157bfc4720c49af45042e44c1f4f3f02312d6efb5d8a4e475419a46119a91cb352376 SHA512 b9d088beb9a75205745f19a97557c20eae8c2c3318d85576a153a12e831ad578ada032d8ddfe6d05927bac0485c6ffeb04e38a349c39d19f26d057ae2faec6d2
+EBUILD dgen-sdl-1.33-r1.ebuild 940 BLAKE2B d1dd33a3319628e87d26503e9895ba2a1ad9a693d910e06a7baf006e14c40b854b2c7ae26f09bd8951bd4ae2f84560512d034ccd8077075d324db1fe6ae840c6 SHA512 d957b3a91f26b520dfaf6ae4d63114e376416ada0e50800c27a9dc6e7db08f1dd2cb9ea0855b2cd8362eb7d23fab44393811719b842c1819712a0caa1fce41e9
 MISC metadata.xml 327 BLAKE2B c719679eeb00833778ba9a80981dd32cfba3e8d498b378b07eff877d65bbed1c878a0522abe25c5d60f78c89e637a23ae4bbd79a5200cf26677fe25a4e74020a SHA512 17031a8025df3d06c71dfb85bf2870eac32e84e86797296aa4a7e7cd24ac579a7305a7664d05e2054e4ad11da6c683011e8132dce0e6ea7dab0b8f70dc984a9b
diff --git a/games-emulation/dgen-sdl/dgen-sdl-1.33-r1.ebuild b/games-emulation/dgen-sdl/dgen-sdl-1.33-r1.ebuild
index 5d9acdc094b9..3d541bd2cb8c 100644
--- a/games-emulation/dgen-sdl/dgen-sdl-1.33-r1.ebuild
+++ b/games-emulation/dgen-sdl/dgen-sdl-1.33-r1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="A Linux/SDL-Port of the famous DGen MegaDrive/Genesis-Emulator"
 HOMEPAGE="http://dgen.sourceforge.net/"
@@ -15,13 +17,20 @@ IUSE="joystick opengl"
 RDEPEND="
 	media-libs/libsdl[joystick?,opengl?]
 	app-arch/libarchive
-	opengl? ( virtual/opengl )
-"
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )
-"
-
-PATCHES=( "${FILESDIR}"/${P}-joystick.patch )
+	opengl? ( virtual/opengl )"
+DEPEND="${RDEPEND}"
+BDEPEND="x86? ( dev-lang/nasm )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-joystick.patch
+	"${FILESDIR}"/${P}-AM_PROG_AR.patch
+	"${FILESDIR}"/${P}-clang-c++11.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_configure() {
 	econf \
@@ -36,5 +45,6 @@ src_compile() {
 }
 
 src_install() {
-	DOCS="AUTHORS ChangeLog README sample.dgenrc" default
+	default
+	dodoc sample.dgenrc
 }
diff --git a/games-emulation/dgen-sdl/files/dgen-sdl-1.33-AM_PROG_AR.patch b/games-emulation/dgen-sdl/files/dgen-sdl-1.33-AM_PROG_AR.patch
new file mode 100644
index 000000000000..e04efcc01f38
--- /dev/null
+++ b/games-emulation/dgen-sdl/files/dgen-sdl-1.33-AM_PROG_AR.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,6 +25,7 @@
+ AC_PROG_CXXCPP
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
++AM_PROG_AR
+ AC_PROG_RANLIB
+ 
+ dnl Set the value of make, if make doesn't already.
diff --git a/games-emulation/dgen-sdl/files/dgen-sdl-1.33-clang-c++11.patch b/games-emulation/dgen-sdl/files/dgen-sdl-1.33-clang-c++11.patch
new file mode 100644
index 000000000000..55810b004f2c
--- /dev/null
+++ b/games-emulation/dgen-sdl/files/dgen-sdl-1.33-clang-c++11.patch
@@ -0,0 +1,20 @@
+--- a/main.cpp
++++ b/main.cpp
+@@ -82,7 +82,7 @@
+ static void help()
+ {
+   printf(
+-  "DGen/SDL v"VER"\n"
++  "DGen/SDL v" VER "\n"
+   "Usage: dgen [options] [romname [...]]\n\n"
+   "Where options are:\n"
+   "    -v              Print version number and exit.\n"
+@@ -256,7 +256,7 @@
+ 	{
+ 	case 'v':
+ 	  // Show version and exit
+-	  printf("DGen/SDL version "VER"\n");
++	  printf("DGen/SDL version " VER "\n");
+ 	  return 0;
+ 	case 'r':
+ 	  // Parse another RC file or stdin
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index e2f42d47ee56..ac9926dedc66 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1,8 +1,4 @@
-AUX dolphin-5.0-CHAR_WIDTH-collision.patch 2043 BLAKE2B d29f1f9ff360d79105d7020174bfc5063ad18c544d17056dca055174d8d0c837671f5d04f95de98e140d8634651f869e1a0d9e79b834f0f039ce59900c0696b0 SHA512 47c25a3fd5e6c47e34fe23d5faa71ea316c708fa2bbcbc5136a415fc25a0b207c4d18bfedb2d7c4e2a71394581d1e41fd7d4cca3544d34e3f4a6a84fee360314
-AUX dolphin-5.0-no-pie.patch 1068 BLAKE2B e941c7002b7adaaefc5c9ea2433a1362c1698b325c2804a31eac616c1185205c27b10466a9f4f1f3e2c2e3773f24f5cae6afb849cbf18a574dfbe08622f88ffa SHA512 8deacd47896003687e25117d758cba6423a6729e6bd54c1bdf39e904f6659ee42d5740338fd94301ef98befaaf02697e32d5fecb604ddc38186b1f81285aec56
-AUX dolphin-5.0-soundtouch-exceptions.patch 591 BLAKE2B 7a5f25041214f58e99f8e6d50544392be6f1336a070e812b8f4675c777a3e53482c49fdf578781d2a8bb6f7eb6517f6dde087965482756e7b156958c25c815fb SHA512 df9d1832ea2d844ec7ca79b01a3fe8463e21feb089105b79c91218db0d6426e1fc489d3b40688e02a13bef8782b80c50f09f0d0603822c035e8ed99b559a0f39
-AUX dolphin-5.0-xgetbv.patch 1137 BLAKE2B d736d25127fae4c552c1e28b0c152037a2c0a16c59dbec873596e1488f9a9872672684f23517c6ceeef0c8b50e0f1914882a1ccd123660e4458fc9e73d1e07bd SHA512 d627829270acc69ed3dc420c57762c6a68713482c29fd0b33a38864558380c5d9547ace9ab054d2892108ccfe7751147e51c0d5495a57d02fa29c02ac93ef391
-DIST dolphin-5.0.tar.gz 38246344 BLAKE2B 540eb5d0d3f2250d0b562caaef113bcae66ea47c3b6c2884f5612f36f990592d2c83ad0348cb83d71f5329414580f6cbf07081bdef2661bd277ee2f7613dc661 SHA512 8de76f811abfb82e19502336734e86ba600c11d9fa95bcf7f70a2a525165d07ead826854c39377602aab7856a057af9ba91bff458cf2dd008712527290489d3a
-EBUILD dolphin-5.0.ebuild 4596 BLAKE2B 81fe5abe2b7779f189346605b6b3900066c6463d0e89be39984ee3ce92046c0ae3fff747e19467b3a105826ab5f1955d89a4e611d56111a15b173e0c77f01bad SHA512 6bf62074ba5f228119d19e23cac7621b96d63191367e60900ca5c82ae7deb5329c3eeb1cf2b898ca38e14d307f4f91703dcde53b753e85c841610070b9f2f382
-EBUILD dolphin-9999.ebuild 4238 BLAKE2B 9520643739ca295e5f4aaa2e02182de8382f485330c5b3ae733599b2cb0f1f8f6f0df7501b4ec79ee20227d835eea9762edbad03352c2b964684a7d3236e77f3 SHA512 ef5c0c081c8f55c38aa22b831f42aed57bf22e2e0e37a68cf9c710a0bb2129aa69e0bf20e899a92a753ec707fd568f4304aa4df2f74beb6c3758d034b49e24f1
-MISC metadata.xml 825 BLAKE2B 47bce78aa687f194ff5fb0252f3cdaf76336ab5460cdf72ddaa2913f36dd69aa916cbfc7684ae276248e14d092d8107ab67c7d8c37b71bfca15778b171d725f2 SHA512 33a3c378f2ed7fd25a155b29a03dd3b87730e9c910e7b2d35148a7f6eafbb75e96eab0a0f9608a9ae34e1aa2ccb5d6cc849d895cd28912c88193640a8ac5a6b5
+DIST dolphin-5.0_p20200705.tar.gz 41580877 BLAKE2B 78fce8cb10543857633d66789999b0ebb8f195e10652b9316f3346d5c84797dea96a31f509f86cb9470b4b9677ca58c4a865494121277cd0bc7dcc93932da9f4 SHA512 8b1aed8c98ff7205d7b1716aea3faad0bfa3d1ff3fe3a616431a421ae62592a57887e18295276b7a0fee52d19e641b72d5dc00e071cefea7fbe40adc9f3f01a1
+EBUILD dolphin-5.0_p20200705.ebuild 4420 BLAKE2B 4e7be2832c1723532c59fa0268e9c62bd68754296b26bea8728bbf2c3967e58678cc9421f0a3810c30bf83ac14c1c9ce674c44bceda179ae704ca7345fb68e1d SHA512 a52a06306f6e8482fa2acfd41f308b5a583e5fe1e5a51ab31b1504a1d8c0b6e70e7f9419ee4adeea9e33ffbd116c993e931c9f17891475921d8ce2110a825b3f
+EBUILD dolphin-9999.ebuild 4421 BLAKE2B e147a08b0c7f9a1a8c8de714d4a0ecd8d325e5280efd000bf756007ccf999e039dd1190adb73a5a9248329f97b144150b0378723da53fb49fae9f7ca61de24cb SHA512 80ff62160b4d7740fc852e37728147029b898a02f305ef759239e9e6b012b409c9d756904bed2ef712b89193b25887366c8af243d22323d32f26d0df16216ca9
+MISC metadata.xml 780 BLAKE2B 554ecd30630f134ee9fef10c2bf3eea47bad771a0847f826c27325abe4d3737c3341b56001cec03d81e0153097aa51ec55cb7925550205489d17f6c7c82507b9 SHA512 e7820ec9adff748a38fcea3f078aa1a918ec1d6ecc230e8994b18b36a31649f2418b1839d7ebf447e3aa4684d38f074873f004d571d448c3fec847b50e9f1414
diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild b/games-emulation/dolphin/dolphin-5.0.ebuild
deleted file mode 100644
index 156b83d9fd20..000000000000
--- a/games-emulation/dolphin/dolphin-5.0.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PLOCALES="ar ca cs da_DK de el en es fa fr hr hu it ja ko ms_MY nb nl pl pt pt_BR ro_RO ru sr sv tr zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-WX_GTK_VER="3.0"
-
-inherit cmake-utils desktop gnome2-utils l10n pax-utils toolchain-funcs wxwidgets
-
-SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64"
-
-DESCRIPTION="Gamecube and Wii game emulator"
-HOMEPAGE="https://www.dolphin-emu.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="alsa ao bluetooth doc egl +evdev ffmpeg log lto openal +pch portaudio profile pulseaudio qt5 sdl upnp +wxwidgets"
-
-RESTRICT=test
-
-RDEPEND="
-	>=media-libs/libsfml-2.1
-	>net-libs/enet-1.3.7
-	>=net-libs/mbedtls-2.1.1:0=
-	dev-libs/lzo
-	media-libs/libpng:0=
-	sys-libs/readline:0=
-	sys-libs/zlib:=
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrandr
-	virtual/libusb:1
-	virtual/opengl
-	alsa? ( media-libs/alsa-lib )
-	ao? ( media-libs/libao )
-	bluetooth? ( net-wireless/bluez )
-	egl? ( media-libs/mesa[egl] )
-	evdev? (
-		dev-libs/libevdev
-		virtual/udev
-	)
-	ffmpeg? ( media-video/ffmpeg:= )
-	openal? (
-		media-libs/openal
-		media-libs/libsoundtouch
-	)
-	portaudio? ( media-libs/portaudio )
-	profile? ( dev-util/oprofile )
-	pulseaudio? ( media-sound/pulseaudio )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	sdl? ( media-libs/libsdl2[haptic,joystick] )
-	upnp? ( >=net-libs/miniupnpc-1.7 )
-	wxwidgets? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-		x11-libs/wxGTK:${WX_GTK_VER}[opengl,X]
-	)"
-DEPEND="${RDEPEND}
-	app-arch/zip
-	media-libs/freetype
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-CHAR_WIDTH-collision.patch
-	"${FILESDIR}"/${P}-xgetbv.patch
-	"${FILESDIR}"/${P}-no-pie.patch
-	"${FILESDIR}"/${P}-soundtouch-exceptions.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Remove automatic dependencies to prevent building without flags enabled.
-	if use !alsa; then
-		sed -i -e '/include(FindALSA/d' CMakeLists.txt || die
-	fi
-	if use !ao; then
-		sed -i -e '/check_lib(AO/d' CMakeLists.txt || die
-	fi
-	if use !bluetooth; then
-		sed -i -e '/check_lib(BLUEZ/d' CMakeLists.txt || die
-	fi
-
-	# Unconditionally disable LLVM disassembler.
-	sed -i -e '/include(FindLLVM/d' CMakeLists.txt || die
-
-	if use !openal; then
-		sed -i -e '/include(FindOpenAL/d' CMakeLists.txt || die
-	fi
-	if use !portaudio; then
-		sed -i -e '/CMAKE_REQUIRED_LIBRARIES portaudio/d' CMakeLists.txt || die
-	fi
-	if use !pulseaudio; then
-		sed -i -e '/check_lib(PULSEAUDIO/d' CMakeLists.txt || die
-	fi
-
-	# Remove ALL the bundled libraries, aside from:
-	# - SOIL: The sources are not public.
-	# - Bochs-disasm: Don't know what it is.
-	# - gtest: Their build set up solely relies on the build in gtest.
-	# - xxhash: Not on the tree.
-	mv Externals/SOIL . || die
-	mv Externals/Bochs_disasm . || die
-	mv Externals/gtest . || die
-	mv Externals/xxhash . || die
-	rm -r Externals/* || die "Failed to delete Externals dir."
-	mv Bochs_disasm Externals || die
-	mv SOIL Externals || die
-	mv gtest Externals || die
-	mv xxhash Externals || die
-
-	remove_locale() {
-		# Ensure preservation of the backup locale when no valid LINGUA is set
-		if [[ "${PLOCALE_BACKUP}" == "${1}" ]] && [[ "${PLOCALE_BACKUP}" == "$(l10n_get_locales)" ]]; then
-			return
-		else
-			rm "Languages/po/${1}.po" || die
-		fi
-	}
-
-	l10n_find_plocales_changes "Languages/po/" "" '.po'
-	l10n_for_each_disabled_locale_do remove_locale
-}
-
-src_configure() {
-	if use wxwidgets; then
-		need-wxwidgets unicode
-	fi
-
-	local mycmakeargs=(
-		-DUSE_SHARED_ENET=ON
-		$( cmake-utils_use ffmpeg ENCODE_FRAMEDUMPS )
-		$( cmake-utils_use log FASTLOG )
-		$( cmake-utils_use profile OPROFILING )
-		$( cmake-utils_use_disable wxwidgets WX )
-		$( cmake-utils_use_enable evdev EVDEV )
-		$( cmake-utils_use_enable lto LTO )
-		$( cmake-utils_use_enable pch PCH )
-		$( cmake-utils_use_enable qt5 QT2 )
-		$( cmake-utils_use_enable sdl SDL )
-		$( cmake-utils_use_use egl EGL )
-		$( cmake-utils_use_use upnp UPNP )
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_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
-
-	if ! use portaudio; then
-		ewarn "If you want microphone capabilities in dolphin-emu, rebuild with"
-		ewarn "USE=\"portaudio\""
-	fi
-
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild b/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild
new file mode 100644
index 000000000000..1b2cd79579d2
--- /dev/null
+++ b/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="ar ca cs da de el en es fa fr hr hu it ja ko ms nb nl pl pt pt_BR ro ru sr sv tr zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit cmake desktop xdg-utils l10n pax-utils
+
+if [[ ${PV} == *9999 ]]
+then
+	EGIT_REPO_URI="https://github.com/dolphin-emu/dolphin"
+	inherit git-r3
+else
+	inherit vcs-snapshot
+	commit=0dbe8fb2eaa608a6540df3d269648a596c29cf4b
+	SRC_URI="https://github.com/dolphin-emu/dolphin/archive/${commit}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64"
+fi
+
+DESCRIPTION="Gamecube and Wii game emulator"
+HOMEPAGE="https://www.dolphin-emu.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg log lto profile pulseaudio +qt5 systemd upnp"
+
+RDEPEND="
+	dev-libs/hidapi:0=
+	dev-libs/libfmt:0=
+	dev-libs/lzo:2=
+	dev-libs/pugixml:0=
+	media-libs/libpng:0=
+	media-libs/libsfml
+	media-libs/mesa[egl]
+	net-libs/enet:1.3
+	net-libs/mbedtls:0=
+	net-misc/curl:0=
+	sys-libs/readline:0=
+	sys-libs/zlib:0=
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr
+	virtual/libusb:1
+	virtual/opengl
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	evdev? (
+		dev-libs/libevdev
+		virtual/udev
+	)
+	ffmpeg? ( media-video/ffmpeg:= )
+	profile? ( dev-util/oprofile )
+	pulseaudio? ( media-sound/pulseaudio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	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="${RDEPEND}
+	media-libs/vulkan-loader"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Remove all the bundled libraries that support system-installed
+	# preference. See CMakeLists.txt for conditional 'add_subdirectory' calls.
+	local KEEP_SOURCES=(
+		Bochs_disasm
+		FreeSurround
+
+		# 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
+
+		cpp-optparse
+		# no support for for using system library
+		glslang
+		imgui
+		# FIXME: xxhash can't be found by cmake
+		xxhash
+		# no support for for using system library
+		minizip
+		# soundtouch uses shorts, not floats
+		soundtouch
+		cubeb
+		discord-rpc
+		# Their build set up solely relies on the build in gtest.
+		gtest
+		# gentoo's version requires exception support.
+		# dolphin disables exceptions and fails the build.
+		picojson
+		# No code to detect shared library.
+		zstd
+	)
+	local s
+	for s in "${KEEP_SOURCES[@]}"; do
+		mv -v "Externals/${s}" . || die
+	done
+	einfo "removing sources: $(echo Externals/*)"
+	rm -r Externals/* || die "Failed to delete Externals dir."
+	for s in "${KEEP_SOURCES[@]}"; do
+		mv -v "${s}" "Externals/" || die
+	done
+
+	remove_locale() {
+		# Ensure preservation of the backup locale when no valid LINGUA is set
+		if [[ "${PLOCALE_BACKUP}" == "${1}" ]] && [[ "${PLOCALE_BACKUP}" == "$(l10n_get_locales)" ]]; then
+			return
+		else
+			rm "Languages/po/${1}.po" || die
+		fi
+	}
+
+	l10n_find_plocales_changes "Languages/po/" "" '.po'
+	l10n_for_each_disabled_locale_do remove_locale
+}
+
+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_BLUEZ=$(usex bluetooth)
+		-DENABLE_EVDEV=$(usex evdev)
+		-DENCODE_FRAMEDUMPS=$(usex ffmpeg)
+		-DENABLE_LLVM=OFF
+		-DENABLE_LTO=$(usex lto)
+		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
+		-DENABLE_QT=$(usex qt5)
+		-DENABLE_SDL=OFF # not supported: #666558
+		-DFASTLOG=$(usex log)
+		-DOPROFILING=$(usex profile)
+		-DUSE_DISCORD_PRESENCE=$(usex discord-presence)
+		-DUSE_SHARED_ENET=ON
+		-DUSE_UPNP=$(usex upnp)
+
+		# Undo cmake-utils.eclass's defaults.
+		# All dolphin's libraries are private
+		# and rely on circular dependency resolution.
+		-DBUILD_SHARED_LIBS=OFF
+	)
+
+	cmake_src_configure
+}
+
+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 55392d47b0fd..56655d4613a0 100644
--- a/games-emulation/dolphin/dolphin-9999.ebuild
+++ b/games-emulation/dolphin/dolphin-9999.ebuild
@@ -1,19 +1,21 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PLOCALES="ar ca cs da de el en es fa fr hr hu it ja ko ms nb nl pl pt pt_BR ro ru sr sv tr zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit cmake-utils desktop gnome2-utils l10n pax-utils
+inherit cmake desktop xdg-utils l10n pax-utils
 
 if [[ ${PV} == *9999 ]]
 then
 	EGIT_REPO_URI="https://github.com/dolphin-emu/dolphin"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.zip -> ${P}.zip"
+	inherit vcs-snapshot
+	commit=0dbe8fb2eaa608a6540df3d269648a596c29cf4b
+	SRC_URI="https://github.com/dolphin-emu/dolphin/archive/${commit}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
@@ -59,9 +61,8 @@ RDEPEND="
 	systemd? ( sys-apps/systemd:0= )
 	upnp? ( net-libs/miniupnpc )
 "
-DEPEND="${RDEPEND}
-	app-arch/zip
-	media-libs/freetype
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig"
 
@@ -71,7 +72,7 @@ RDEPEND="${RDEPEND}
 	media-libs/vulkan-loader"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# Remove all the bundled libraries that support system-installed
 	# preference. See CMakeLists.txt for conditional 'add_subdirectory' calls.
@@ -146,13 +147,18 @@ src_configure() {
 		-DUSE_DISCORD_PRESENCE=$(usex discord-presence)
 		-DUSE_SHARED_ENET=ON
 		-DUSE_UPNP=$(usex upnp)
+
+		# Undo cmake-utils.eclass's defaults.
+		# All dolphin's libraries are private
+		# and rely on circular dependency resolution.
+		-DBUILD_SHARED_LIBS=OFF
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	dodoc Readme.md
 	if use doc; then
@@ -167,9 +173,9 @@ src_install() {
 pkg_postinst() {
 	# Add pax markings for hardened systems
 	pax-mark -m "${EPREFIX}"/usr/games/bin/"${PN}"-emu
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/games-emulation/dolphin/files/dolphin-5.0-CHAR_WIDTH-collision.patch b/games-emulation/dolphin/files/dolphin-5.0-CHAR_WIDTH-collision.patch
deleted file mode 100644
index d6e4c7a2dc0e..000000000000
--- a/games-emulation/dolphin/files/dolphin-5.0-CHAR_WIDTH-collision.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Avoid clash with TS 18661-1:2014 macros
-https://bugs.gentoo.org/637986
-
---- a/Source/Core/VideoBackends/OGL/RasterFont.cpp
-+++ b/Source/Core/VideoBackends/OGL/RasterFont.cpp
-@@ -15,7 +15,7 @@
- namespace OGL
- {
- 
--static const int CHAR_WIDTH = 8;
-+static const int DOLPHIN_CHAR_WIDTH = 8;
- static const int CHAR_HEIGHT = 13;
- static const int CHAR_OFFSET = 32;
- static const int CHAR_COUNT = 95;
-@@ -146,20 +146,20 @@
- 	glGenTextures(1, &texture);
- 	glActiveTexture(GL_TEXTURE8);
- 	glBindTexture(GL_TEXTURE_2D, texture);
--	std::vector<u32> texture_data(CHAR_WIDTH * CHAR_COUNT * CHAR_HEIGHT);
-+	std::vector<u32> texture_data(DOLPHIN_CHAR_WIDTH * CHAR_COUNT * CHAR_HEIGHT);
- 	for (int y = 0; y < CHAR_HEIGHT; y++)
- 	{
- 		for (int c = 0; c < CHAR_COUNT; c++)
- 		{
--			for (int x = 0; x < CHAR_WIDTH; x++)
-+			for (int x = 0; x < DOLPHIN_CHAR_WIDTH; x++)
- 			{
--				bool pixel = (0 != (rasters[c][y] & (1 << (CHAR_WIDTH - x - 1))));
--				texture_data[CHAR_WIDTH * CHAR_COUNT * y + CHAR_WIDTH * c + x] = pixel ? -1 : 0;
-+				bool pixel = (0 != (rasters[c][y] & (1 << (DOLPHIN_CHAR_WIDTH - x - 1))));
-+				texture_data[DOLPHIN_CHAR_WIDTH * CHAR_COUNT * y + DOLPHIN_CHAR_WIDTH * c + x] = pixel ? -1 : 0;
- 			}
- 		}
- 	}
- 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
--	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, CHAR_WIDTH * CHAR_COUNT, CHAR_HEIGHT, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture_data.data());
-+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, DOLPHIN_CHAR_WIDTH * CHAR_COUNT, CHAR_HEIGHT, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture_data.data());
- 
- 	// generate shader
- 	ProgramShaderCache::CompileShader(s_shader, s_vertexShaderSrc, s_fragmentShaderSrc);
-@@ -196,7 +196,7 @@
- 	std::vector<GLfloat> vertices(text.length() * 6 * 4);
- 
- 	int usage = 0;
--	GLfloat delta_x = GLfloat(2 * CHAR_WIDTH) / GLfloat(bbWidth);
-+	GLfloat delta_x = GLfloat(2 * DOLPHIN_CHAR_WIDTH) / GLfloat(bbWidth);
- 	GLfloat delta_y = GLfloat(2 * CHAR_HEIGHT) / GLfloat(bbHeight);
- 	GLfloat border_x = 2.0f / GLfloat(bbWidth);
- 	GLfloat border_y = 4.0f / GLfloat(bbHeight);
diff --git a/games-emulation/dolphin/files/dolphin-5.0-no-pie.patch b/games-emulation/dolphin/files/dolphin-5.0-no-pie.patch
deleted file mode 100644
index 949e42e50de9..000000000000
--- a/games-emulation/dolphin/files/dolphin-5.0-no-pie.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Disable PIE-compatible code generation via -fno-pie.
-
-Before upstream fix:
-https://github.com/dolphin-emu/dolphin/commit/daa03cd1060cc826aca93a1dffc6e94bc6af6d5f
-dolphin assumed executable image to be in low addresses (<2GB)
-and hardcoded 32-bit absolute addresses during JIT phase.
-
-PIE-compatible code does not have this restriction and
-allows mapping binaries above 2GB area (and breaks dolphin's JIT).
-
-Strictly speaking -no-pie (link-time flag) does not or guarantee
-or require low address mapping for binary if it was already built
-as PIC/PIE.
-
-But -fno-pie imposes additional restrictions on generated code by GCC
-and makes -no-pie to take effect.
-Bug: https://bugs.gentoo.org/640124
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -189,4 +189,4 @@ if(NOT ENABLE_GENERIC)
- 			set(_M_X86_64 1)
--			add_definitions(-D_M_X86=1 -D_M_X86_64=1 -msse2)
--			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fno-pie")
-+			add_definitions(-D_M_X86=1 -D_M_X86_64=1 -msse2 -fno-pie)
-+			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fno-pie -no-pie")
- 		else()
diff --git a/games-emulation/dolphin/files/dolphin-5.0-soundtouch-exceptions.patch b/games-emulation/dolphin/files/dolphin-5.0-soundtouch-exceptions.patch
deleted file mode 100644
index ffd07cf0697f..000000000000
--- a/games-emulation/dolphin/files/dolphin-5.0-soundtouch-exceptions.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://bugs.gentoo.org/686752
-
-Description: Fix FTBFS with SoundTouch 2.1.2
- Explicitly disable exceptions in SoundTouch headers because Dolphin
- is compiled with -fno-exceptions.
-Author: James Cowgill <jcowgill@debian.org>
-Bug-Debian: https://bugs.debian.org/917671
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/Source/Core/AudioCommon/OpenALStream.h
-+++ b/Source/Core/AudioCommon/OpenALStream.h
-@@ -32,6 +32,7 @@
- #define BOOL SoundTouch_BOOL
- #endif
- 
-+#define ST_NO_EXCEPTION_HANDLING
- #include <soundtouch/SoundTouch.h>
- #include <soundtouch/STTypes.h>
- 
diff --git a/games-emulation/dolphin/files/dolphin-5.0-xgetbv.patch b/games-emulation/dolphin/files/dolphin-5.0-xgetbv.patch
deleted file mode 100644
index ffa7cc81c13e..000000000000
--- a/games-emulation/dolphin/files/dolphin-5.0-xgetbv.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Workaround collision of _xgetbv intrinsic redeclaration:
-
-Source/Core/Common/x64CPUDetect.cpp:45:12: error: ambiguating new declaration of ‘u64 _xgetbv(u32)’
- static u64 _xgetbv(u32 index)
-            ^~~~~~~
-In file included from /usr/lib/gcc/x86_64-pc-linux-gnu/8.1.0/include/x86intrin.h:74,
-                 from Source/Core/Common/Intrinsics.h:12,
-                 from Source/Core/Common/x64CPUDetect.cpp:10:
-/usr/lib/gcc/x86_64-pc-linux-gnu/8.1.0/include/xsaveintrin.h:60:1: note: old declaration ‘long long int _xgetbv(unsigned int)’
- _xgetbv (unsigned int __A)
- ^~~~~~~
-
-Upstream fied it in
-    commit 823fdda30c38be953c3d425874f2adeabed2b5a8
-    intrinsics: stop defining _xgetbv/_XCR_XFEATURE_ENABLED_MASK, which are reserved
-
---- a/Source/Core/Common/x64CPUDetect.cpp
-+++ b/Source/Core/Common/x64CPUDetect.cpp
-@@ -45 +45 @@ static inline void __cpuid(int info[4], int function_id)
--static u64 _xgetbv(u32 index)
-+static u64 _xgetbv_dolphin(u32 index)
-@@ -137 +137 @@ void CPUInfo::Detect()
--			if ((_xgetbv(_XCR_XFEATURE_ENABLED_MASK) & 0x6) == 0x6)
-+			if ((_xgetbv_dolphin(_XCR_XFEATURE_ENABLED_MASK) & 0x6) == 0x6)
diff --git a/games-emulation/dolphin/metadata.xml b/games-emulation/dolphin/metadata.xml
index 34a2a16ae8ed..6c45a6966333 100644
--- a/games-emulation/dolphin/metadata.xml
+++ b/games-emulation/dolphin/metadata.xml
@@ -6,7 +6,6 @@
 	</maintainer>
 	<use>
 		<flag name="discord-presence">Enables Discord Rich Presence, show the current game on Discord</flag>
-		<flag name="egl">Enable EGL support</flag>
 		<flag name="evdev">Enable evdev input support</flag>
 		<flag name="log">Increase logging output</flag>
 		<flag name="lto">Add support for link-time optimizations.</flag>
diff --git a/games-emulation/dosbox-staging/Manifest b/games-emulation/dosbox-staging/Manifest
index 8a709520b6e9..c8f8b33ce1d8 100644
--- a/games-emulation/dosbox-staging/Manifest
+++ b/games-emulation/dosbox-staging/Manifest
@@ -1,3 +1,7 @@
+AUX dosbox-staging-0.75.1-pthread.patch 378 BLAKE2B d0b5fe1e9927592fac4d87863587f8a5e53089e1f52db234ceca975034768e8b84ca3976ddf66943fa42ed2c9644f109b015ba35677151bc70b6ffa9ffee80c8 SHA512 8decb24a22fdceeebe45fcff73d99ae1eeebf8f9c679f25cb049c804c5ea74ed297593839aef509ea63afc0a36f5821750be93c14cb5872af163f5c815156b30
 DIST dosbox-staging-0.75.0.tar.gz 1805354 BLAKE2B e376006a2c3890d98efdaa8041634bfca8b95f6c6471f36f8fdd53e319aad8d37f20bd195a20264bade1e6974327f1f888dec6050da493fc8a6e6bb6c5739150 SHA512 2e049ed44928ad4adeaca73d328cf8f415bcb8c1a399306b1e8a5fd2b7cd7c3d3fe10017b47e5d2f3e54c34042ee901b98486f5b47a3d2eaf43f4e13891f8b70
-EBUILD dosbox-staging-0.75.0.ebuild 1049 BLAKE2B c9c3e22d38d50438b48b4d44dcbf1899827972c9fc8c09ea0464117c53edb4c4c7922f1ce18c058128f1cb48055d3dd52dfcb718c7f5bca2b014b058e9c14c3e SHA512 e3763ad4c8f64d773635019df560d80ec64b86447e6b171db17ac357ea6432e7cdc5cd62beecf159d5ef30b27ea7bf4485a40218f2ed2c4b957b71bbc5065be6
-MISC metadata.xml 550 BLAKE2B 6a9d71dc50af11effc4ddbc97225c70cf7e26ad8268151a22c42f243db366fd06a5c5d7698e4cd2cd7158613dfb9effa765afbee1eb2bbd727bc673a644a6ddd SHA512 df7863f358c9830a70ef57112255c49a8e70393c2b98e268ff727c500a16bfe68981285d2554ca2437bee187af36a8b395758fde9b74a09e49a6cf3c050fdefa
+DIST dosbox-staging-0.75.1.tar.gz 1806471 BLAKE2B 5f9f8038327eb46c2c2b5035ca8e2cc93660bb6ce1dfa9572bf67278f14455db723104c0ab4e90b805cc7dbf253f61528ad6a31edb574af57e106f613958aede SHA512 3e14354e4eb697514c4348af2e73e9f2fb84cc3796b5cfea37faac355bd93a54b0f9c717bf0ab75d824cf34e3ee0d40546e2bbf80bc924a37bd8f981f054e4e9
+EBUILD dosbox-staging-0.75.0.ebuild 1049 BLAKE2B 177b6ea5ff84054f8c1d8fff96c9285dcd568eb16cc3dac46e4300640cd2e95813a3cae882096dbf1d0c389cfc2245265dc1d13105a6f13aed71fb98ab40c3f1 SHA512 89b941f8bb32a7a6143f6d73ed5237c17bd6329aa0db52b8aed2f7cc4ee61bd2e372eb6ad09ae6aaf1ac9d382eed0d4ae7030e7a45fc82aec2e68cbaa6f21eb9
+EBUILD dosbox-staging-0.75.1-r1.ebuild 1143 BLAKE2B 1f33243b1456d1d2fb5115e5df6dbac30e3a64a0878da6959e0bacc5e432a8d4e2c87cef20fe60ca0336cf80600c0e530aac72711beaea3b02796e2e8052b046 SHA512 269e2f0cb924dac13326a916c24039a94b467da5599c84584253811d1911810d9bd57c010ff430f7a2fc3f909113dc9e9d8cadd8a060f5c7f91982470c05b8dd
+EBUILD dosbox-staging-0.75.1.ebuild 1095 BLAKE2B d5c6bf5e1c7bec8e04a9582cc1f97e108e4d40fdaf5673004e839ef0174b092d5368a6a725665eb80f9c035b061f35d255035c8853091806cd75db57cc817310 SHA512 ab5b0baf7f037c143db13a01002f1ba6672d6c64c3dd1a5f783aea509ecc2d5f22c53b6d8b331156c719fc2111ead5fa5718a9c944f3ba5419f1acfc667eaf53
+MISC metadata.xml 620 BLAKE2B 6d3e457fdeda6a756be2a0e8360af6c680fa29f24979bb838330a427c637d29d908fd42711dd561be823b726a94db2de29f0772118f30146638d48c8bfd2722b SHA512 630dbd73aa1f06464bcfd44bec97b1dda5afe21de38876d6cbfb2a506e3fbe461766d2eec6d8df4afdc8ec9badc2239da91b589e08425f91f4bc0ea99455bb9e
diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.75.0.ebuild b/games-emulation/dosbox-staging/dosbox-staging-0.75.0.ebuild
index fb71bdee846b..45521a91d417 100644
--- a/games-emulation/dosbox-staging/dosbox-staging-0.75.0.ebuild
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.75.0.ebuild
@@ -16,7 +16,7 @@ IUSE="alsa debug dynrec opengl opus"
 RDEPEND="alsa? ( media-libs/alsa-lib )
 	debug? ( sys-libs/ncurses:0= )
 	opengl? ( virtual/opengl )
-	opus? ( media-libs/opus )
+	opus? ( media-libs/opusfile )
 	media-libs/libpng:0=
 	media-libs/libsdl2[joystick,opengl?,video,X]
 	media-libs/sdl-net
@@ -43,5 +43,5 @@ src_configure() {
 src_install() {
 	default
 	doicon contrib/icons/${PN}.svg
-	make_desktop_entry dosbox DOSBox-staging ${PN}.svg
+	make_desktop_entry dosbox DOSBox-staging ${PN}
 }
diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r1.ebuild b/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r1.ebuild
new file mode 100644
index 000000000000..dbebde3b22e9
--- /dev/null
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools desktop
+
+DESCRIPTION="Modernized DOSBox soft-fork"
+HOMEPAGE="https://dosbox-staging.github.io/"
+SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug dynrec network opengl opus"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	debug? ( sys-libs/ncurses:0= )
+	network? ( media-libs/sdl2-net )
+	opengl? ( virtual/opengl )
+	opus? ( media-libs/opusfile )
+	media-libs/libpng:0=
+	media-libs/libsdl2[joystick,opengl?,video,X]
+	sys-libs/zlib
+	!games-emulation/dosbox"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+PATCHES=( "${FILESDIR}"/${P}-pthread.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable alsa alsa-midi) \
+		$(use_enable debug) \
+		$(use_enable !dynrec dynamic-x86) \
+		$(use_enable dynrec) \
+		$(use_enable network) \
+		$(use_enable opengl) \
+		$(use_enable opus opus-cdda)
+}
+
+src_install() {
+	default
+	doicon contrib/icons/${PN}.svg
+	make_desktop_entry dosbox DOSBox-staging ${PN}
+}
diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.75.1.ebuild b/games-emulation/dosbox-staging/dosbox-staging-0.75.1.ebuild
new file mode 100644
index 000000000000..3ace52dd1429
--- /dev/null
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.75.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools desktop
+
+DESCRIPTION="Modernized DOSBox soft-fork"
+HOMEPAGE="https://dosbox-staging.github.io/"
+SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug dynrec opengl opus"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	debug? ( sys-libs/ncurses:0= )
+	opengl? ( virtual/opengl )
+	opus? ( media-libs/opusfile )
+	media-libs/libpng:0=
+	media-libs/libsdl2[joystick,opengl?,video,X]
+	media-libs/sdl-net
+	sys-libs/zlib
+	!games-emulation/dosbox"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+PATCHES=( "${FILESDIR}"/${P}-pthread.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable alsa alsa-midi) \
+		$(use_enable debug) \
+		$(use_enable !dynrec dynamic-x86) \
+		$(use_enable dynrec) \
+		$(use_enable opengl) \
+		$(use_enable opus opus-cdda)
+}
+
+src_install() {
+	default
+	doicon contrib/icons/${PN}.svg
+	make_desktop_entry dosbox DOSBox-staging ${PN}
+}
diff --git a/games-emulation/dosbox-staging/files/dosbox-staging-0.75.1-pthread.patch b/games-emulation/dosbox-staging/files/dosbox-staging-0.75.1-pthread.patch
new file mode 100644
index 000000000000..1aa7de682bd2
--- /dev/null
+++ b/games-emulation/dosbox-staging/files/dosbox-staging-0.75.1-pthread.patch
@@ -0,0 +1,11 @@
+--- dosbox-staging-0.75.1/configure.ac.orig	2020-08-20 14:25:41.295432272 +0200
++++ dosbox-staging-0.75.1/configure.ac	2020-08-20 14:26:00.614461707 +0200
+@@ -37,7 +37,7 @@
+             :,
+ 	    AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])
+ )
+-LIBS="$LIBS $SDL_LIBS"
++LIBS="$LIBS -lpthread $SDL_LIBS"
+ CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
+ 
+ dnl Checks for header files.
diff --git a/games-emulation/dosbox-staging/metadata.xml b/games-emulation/dosbox-staging/metadata.xml
index ea78ea742a79..91406d636bc1 100644
--- a/games-emulation/dosbox-staging/metadata.xml
+++ b/games-emulation/dosbox-staging/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="dynrec">Use recompiling cpu core instead of dynamic x86/x64 specific cpu core</flag>
+		<flag name="network">Enable networking features (modem, ipx)</flag>
 		<flag name="opus">Support compressed audio tracks (.opus) used with CDROM images</flag>
 	</use>
 	<upstream>
diff --git a/games-emulation/fceux/Manifest b/games-emulation/fceux/Manifest
index f147272c7ab0..05958cb740e5 100644
--- a/games-emulation/fceux/Manifest
+++ b/games-emulation/fceux/Manifest
@@ -1,5 +1,6 @@
 AUX fceux-2.2.2-warnings.patch 1174 BLAKE2B 5b2076015d005a75ab97b586bb2af022b53a8d1724ef0becac808606366f3ba2f64e97c7073bb3f152d337c248ea91cfb15df81e2d1c5f3ebaf94f0defea3ae1 SHA512 03f7ff47f18982eb5fc7b0c942313fb6328412fe64c9b07bf97a85e25eb73c926b362ce5da789ebc7dff70f9d3d11e9df9e033e5a3ddd8fdee6c712471806b97
+AUX fceux-2.2.3-python3.patch 4392 BLAKE2B a71d108fee4aa1881cede5ffe484f0940ed3d6d3416a4849e4e3db1636ffd4112533954602781e928dafcffaee1f835972f2adf9b9fb465429d6abaf238a4042 SHA512 ca1026e02107ad64a36498f2e6eb8c0b814a75bad2a43717098a229a239123a306778d2ec669a4f0948a144f206c684858fd923cc7256e698816b2a0471d4c8f
 DIST fceux-2.2.3.src.tar.gz 9292792 BLAKE2B 44412934a50f2cab581cb194932a079071e8c7c1cb4cb4d173e9d7cf4898806fe1b0948d6e86fd70d1265eb596c47f77f751e3a113f03aba9b95e1f5def9c2a8 SHA512 6deb83e9e773694f4040f5f325b0b5b4f45d58bb3481db67b4659c940d90c4c87e3ffeac712b72ddb3f5d089cd9fc7b55b497db61f708c23a7c43c17eda55c7b
 EBUILD fceux-2.2.3-r1.ebuild 1267 BLAKE2B e9d01faaa175d4eddbd269dead3629eac26baa8c167c35dc5ca5a8d3cbe17d6e378610cddadd2c51b7035bb83cddcdb3f4b99251d7f0217c6412095acd25c9a0 SHA512 fe10b5f2ab05b4bbba0115259b8fbc1f3583a41bd65fd6890bbfd7211d871e0bd1c9f40c89dacb7d9351da7a103bc00648492c61ceabd9f573b1e8a722d1af91
-EBUILD fceux-2.2.3.ebuild 1191 BLAKE2B 6471d82ac2f1ef1d0fcf36fe59b5b5d29c103f6c32739242c244fb834bd2fde62bf12e0c7f7c1eb6b0b2e59bdf1aefcbdb1f911ef144146f903b8be795d82439 SHA512 793f5ce80df5e0ee4b116fd89c68b6923a2fbf02cd54f632cddd69345289e783b61a2c6a09464efa21de4881bb3d7446a6ba1b2dc29c518d4caa26b52f3fd81f
+EBUILD fceux-2.2.3-r2.ebuild 1310 BLAKE2B 8330d9015264d4cfcb68e07fe9c53c2d4b854e80a398bd9709308ab9d78724fc2f74d84d6b97cf9c046cf77f79c6a6bff1925bf821f914139a46519cae477586 SHA512 ffb0b5a4c3f02bebf44abd454db4beefe4786f98ead9e28d0e8660f933eec18cd17945b4baef139fb4c05a279338d9dc1b33d878384d4306877e80fc993549d3
 MISC metadata.xml 432 BLAKE2B 69c86fec99d0d08d0672142afbb39b2f2c352af4a8ff953516522f721e2482a4624b542593c8eac0be3570a75037cf27b0c48bd19033429d1c5d66e85fcdb952 SHA512 f6f073a198d89d195daa4da1c4c8bdf631258db0ff8cc5fefd9d8a6d93beb38081d37a70df0d0f62d7bf79f7595a3456d88ac0c724535d8c453f3096d2256b96
diff --git a/games-emulation/fceux/fceux-2.2.3.ebuild b/games-emulation/fceux/fceux-2.2.3-r2.ebuild
index 93ccbe28693f..d276a08bf540 100644
--- a/games-emulation/fceux/fceux-2.2.3.ebuild
+++ b/games-emulation/fceux/fceux-2.2.3-r2.ebuild
@@ -1,8 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit desktop epatch scons-utils
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit python-any-r1 desktop scons-utils toolchain-funcs
 
 DESCRIPTION="A portable Famicom/NES emulator, an evolution of the original FCE Ultra"
 HOMEPAGE="http://fceux.com/"
@@ -23,8 +26,15 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.2-warnings.patch
+	"${FILESDIR}/${P}-python3.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.2.2-warnings.patch
+	default
+
+	tc-export CC CXX
 }
 
 src_compile() {
@@ -33,10 +43,10 @@ src_compile() {
 		CREATE_AVI=1 \
 		SYSTEM_LUA=1 \
 		SYSTEM_MINIZIP=1 \
-		$(use_scons gtk GTK3) \
-		$(use_scons logo LOGO) \
-		$(use_scons opengl OPENGL) \
-		$(use_scons lua LUA)
+		GTK3=$(usex gtk 1 0) \
+		LOGO=$(usex logo 1 0) \
+		OPENGL=$(usex opengl 1 0) \
+		LUA=$(usex lua 1 0)
 }
 
 src_install() {
diff --git a/games-emulation/fceux/files/fceux-2.2.3-python3.patch b/games-emulation/fceux/files/fceux-2.2.3-python3.patch
new file mode 100644
index 000000000000..c08c67058d22
--- /dev/null
+++ b/games-emulation/fceux/files/fceux-2.2.3-python3.patch
@@ -0,0 +1,115 @@
+This is upstream's patch to fix Python 3 building, modified to apply against 2.2.3.
+
+https://github.com/TASVideos/fceux/commit/878245fedf028f8c9373be128dbea01f65d4a8b7
+
+diff --git a/SConstruct b/SConstruct
+index be84421..4b60484 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -46,30 +46,30 @@ if platform.system == "ppc":
+ # Default compiler flags:
+ env.Append(CCFLAGS = ['-Wall', '-Wno-write-strings', '-Wno-sign-compare'])
+ 
+-if os.environ.has_key('PLATFORM'):
++if 'PLATFORM' in os.environ:
+   env.Replace(PLATFORM = os.environ['PLATFORM'])
+-if os.environ.has_key('CC'):
++if 'CC' in os.environ:
+   env.Replace(CC = os.environ['CC'])
+-if os.environ.has_key('CXX'):
++if 'CXX' in os.environ:
+   env.Replace(CXX = os.environ['CXX'])
+-if os.environ.has_key('WINDRES'):
++if 'WINDRES' in os.environ:
+   env.Replace(WINDRES = os.environ['WINDRES'])
+-if os.environ.has_key('CFLAGS'):
++if 'CFLAGS' in os.environ:
+   env.Append(CCFLAGS = os.environ['CFLAGS'].split())
+-if os.environ.has_key('CXXFLAGS'):
++if 'CXXFLAGS' in os.environ:
+   env.Append(CXXFLAGS = os.environ['CXXFLAGS'].split())
+-if os.environ.has_key('CPPFLAGS'):
++if 'CPPFLAGS' in os.environ:
+   env.Append(CPPFLAGS = os.environ['CPPFLAGS'].split())
+-if os.environ.has_key('LDFLAGS'):
++if 'LDFLAGS' in os.environ:
+   env.Append(LINKFLAGS = os.environ['LDFLAGS'].split())
+-if os.environ.has_key('PKG_CONFIG_PATH'):
++if 'PKG_CONFIG_PATH' in os.environ:
+   env['ENV']['PKG_CONFIG_PATH'] = os.environ['PKG_CONFIG_PATH']
+-if not os.environ.has_key('PKG_CONFIG_PATH') and env['PLATFORM'] == 'darwin':
++if 'PKG_CONFIG_PATH' not in os.environ and env['PLATFORM'] == 'darwin':
+   env['ENV']['PKG_CONFIG_PATH'] = "/usr/local/lib/pkgconfig:/opt/X11/lib/pkgconfig"
+-if os.environ.has_key('PKG_CONFIG_LIBDIR'):
++if 'PKG_CONFIG_LIBDIR' in os.environ:
+   env['ENV']['PKG_CONFIG_LIBDIR'] = os.environ['PKG_CONFIG_LIBDIR']
+ 
+-print "platform: ", env['PLATFORM']
++print("platform: ", env['PLATFORM'])
+ 
+ # compile with clang
+ if env['CLANG']:
+@@ -103,18 +103,18 @@ else:
+     assert conf.CheckLibWithHeader('z', 'zlib.h', 'c', 'inflate;', 1), "please install: zlib"
+   if env['SDL2']:
+     if not conf.CheckLib('SDL2'):
+-      print 'Did not find libSDL2 or SDL2.lib, exiting!'
++      print('Did not find libSDL2 or SDL2.lib, exiting!')
+       Exit(1)
+     env.Append(CPPDEFINES=["_SDL2"])
+     env.ParseConfig('pkg-config sdl2 --cflags --libs')
+   else:
+     if not conf.CheckLib('SDL'):
+-      print 'Did not find libSDL or SDL.lib, exiting!'
++      print('Did not find libSDL or SDL.lib, exiting!')
+       Exit(1)
+     env.ParseConfig('sdl-config --cflags --libs')
+   if env['GTK']:
+     if not conf.CheckLib('gtk-x11-2.0'):
+-      print 'Could not find libgtk-2.0, exiting!'
++      print('Could not find libgtk-2.0, exiting!')
+       Exit(1)
+     # Add compiler and linker flags from pkg-config
+     config_string = 'pkg-config --cflags --libs gtk+-2.0'
+@@ -153,7 +153,7 @@ else:
+         env.Append(CCFLAGS = ["-I/usr/include/lua"])
+         lua_available = True
+       if lua_available == False:
+-        print 'Could not find liblua, exiting!'
++        print('Could not find liblua, exiting!')
+         Exit(1)
+     else:
+       env.Append(CCFLAGS = ["-Isrc/lua/src"])
+@@ -167,7 +167,7 @@ else:
+     gd = conf.CheckLib('gd', autoadd=1)
+     if gd == 0:
+       env['LOGO'] = 0
+-      print 'Did not find libgd, you won\'t be able to create a logo screen for your avis.'
++      print('Did not find libgd, you won\'t be able to create a logo screen for your avis.')
+    
+   if env['OPENGL'] and conf.CheckLibWithHeader('GL', 'GL/gl.h', 'c', autoadd=1):
+     conf.env.Append(CCFLAGS = "-DOPENGL")
+@@ -181,8 +181,8 @@ if sys.byteorder == 'little' or env['PLATFORM'] == 'win32':
+ if env['FRAMESKIP']:
+   env.Append(CPPDEFINES = ['FRAMESKIP'])
+ 
+-print "base CPPDEFINES:",env['CPPDEFINES']
+-print "base CCFLAGS:",env['CCFLAGS']
++print("base CPPDEFINES:",env['CPPDEFINES'])
++print("base CCFLAGS:",env['CCFLAGS'])
+ 
+ if env['DEBUG']:
+   env.Append(CPPDEFINES=["_DEBUG"], CCFLAGS = ['-g', '-O0'])
+diff --git a/src/SConscript b/src/SConscript
+index 4713e15..2001146 100644
+--- a/src/SConscript
++++ b/src/SConscript
+@@ -33,7 +33,7 @@ else:
+   platform_files = SConscript('drivers/sdl/SConscript')
+ file_list.append(platform_files)
+ 
+-print env['LINKFLAGS']
++print(env['LINKFLAGS'])
+ 
+ if env['PLATFORM'] == 'win32':
+   fceux = env.Program('fceux.exe', file_list)
diff --git a/games-emulation/generator/Manifest b/games-emulation/generator/Manifest
index fdc7077ee71a..e83283aa9239 100644
--- a/games-emulation/generator/Manifest
+++ b/games-emulation/generator/Manifest
@@ -1,7 +1,6 @@
-AUX generator-0.35_p4-configure.patch 3634 BLAKE2B 726c133bb419bc8226d31043b851cceb6077e8a3dc7fd4a351d9117933b219012d812b25c6b96b0569e066191adc786e2ec02ed723b7eb14ca3e3e326188aa40 SHA512 bed25bc2d951d4c369265b4790754ba4e63d5beda803a655dc240ac76004b57ba1bc3823c4a35f6fa2ee5e5a9b22827c46e090f63536b4d6b959986cc016c1ed
-AUX generator-0.35_p4-gcc-9.patch 910 BLAKE2B 3ce9f860d426eec544d15661009b163a3987007faacbc94f336442d46217559b0f427494a08a0cda7e4390f005f9d1f7f4cde0917c41535f5ac6a5344d501d6e SHA512 407adae63334745dce89d8432a2b3142ebc7ca57b040fc104bfe1bdd6e03bdd3b82c9605ddb247e7b4ce1102ce71486b463e7ec92eb4b4c40fe9527198a280ca
-AUX generator-0.35_p4-inline.patch 465 BLAKE2B 8818f566ad1987e09fbc49eae5b216c5d620bfa989fdbed61e0c700862ee9fd6f20e6e0010284ee6854a8fc4299a685fde41937f2d5e32675298f3adf8615b4c SHA512 9776dbe2e8f725b8f542ae382fe8da193987c9e12d857c359de2c32402f4dee729c92837aa543efe4ba7c6c66d81e3e505496a783598621d20f724509d4358ba
-AUX generator-0.35_p4-underlink.patch 513 BLAKE2B 8424efa3326db4f627ffab9a8a6c8f55e0f5477f31a830fada195d6cfd3ded01734d70981ea27ca06341009385ea00cbe1ac3f7ffa23bdba5eb3f2c35f800820 SHA512 0947c6365ee33d15c136906385da761e0f6e4d92356b0e3eaf8c3cdcd82c87982d18e6bc35690ac448b9e9dab213358f5f55c0d3be2f3eaece7bdd776479319b
+AUX generator-0.35_p4-autoconf.patch 3689 BLAKE2B f9d2a2314c143bb534fdcd587503b5cfa583bc9c213d48a3beb5ba6f0b0afba2d11b8b68c1eb5d449b95923bf6b99933140701c080ffe13e649101948a7f5b97 SHA512 914d6281957ea259b7f0683aa900699fa11e96aafccd68cff3056e6704fbaab829052db517baee39c5f55e83c5d5788dca7f79a83f4387344afb5784d39e493c
+AUX generator-0.35_p4-automake.patch 950 BLAKE2B 5ce5a77c865610448b4e187a944ecee93e45bcfbb6a34caa9bc2f573e3ba64b6f613923c3e4c75c5da79e0818912bdfc9bd1e83ed0dbeed423073ad59277db1e SHA512 7833d0bf75936e6049d9096b29779e3c2354701e699fa5b720cdd450efa0260cf661767ea203c1cf4b60656c1ea6fa0c2508b7ffb0efbdf70d8029df2aff63c1
+AUX generator-0.35_p4-gcc.patch 1677 BLAKE2B a3a44721007ee9f8996a220f88d2264ff301f1a77ebc2dbfd092bf989d00b4a48b0379510a6438468a93b2b5ed6b976a4f1f3562eb028be8f9d08091ae166b66 SHA512 7cdc78d9455bf9fc8dc643c74d200ffcefb45016400002d0c55d76dcf81af7278cb1dc1fe34a7c0228cbf595835e30000a1fccf60ca622a3700391ad6aa12afe
 DIST generator-0.35-cbiere-r4.tar.bz2 435289 BLAKE2B 962785fd5f87cfd03cba3238fb0d9d29b6ea42f2b44a5314c328c1c008f9fe005696556be79632e36e29948474612a8f3014dfecd47eca06014b1d7174787ed5 SHA512 73fd36d8004135c172025b3eb3385f731e294935413d7ac905672f1a88434ca332325821c5f15d5ae83fb1385fcde9f1e7f32242f8ac175bb96bd535b5d91620
-EBUILD generator-0.35_p4-r1.ebuild 1052 BLAKE2B 5e25180dbdb16d8299ba76c919b9c4c53a4ba3aff09de9099f6145e8aaf79c69f3cfcbacf554d71744690bb76ddddb1bef5b5341d6d04c33ccd241dfd59ed0f7 SHA512 855734a1f005384237080a1692dcfa4c1ebce956fbd0482f9680b77e17076e9c044624fdd919ed07f224ec44e0b204e14a9f108af09adb7425d507830edd6714
+EBUILD generator-0.35_p4-r1.ebuild 943 BLAKE2B 241623f535b5622e82ba12dcc8e98233054d5bf1673104161ced8c9b8df2cfe3fce52140fea22e8c30a505f6790ea0479c144fd4dce7602dfb73156e50ae6382 SHA512 7b58c77fa58cdff5a0e8a1cc96183a2cf367355f40f2774cf9c32fadaa0983d6f8b400df245cada725ff26e8153d475c0248a3c62f2cc2a8f331bfbffe34a208
 MISC metadata.xml 326 BLAKE2B b5532fc7965a4b39312288491e98a48de5acdf76c1c5c92ddff370631484f6a57160eb2f983f6086d249b6cf9bba8b8dae47633c2bb38325e2d3faa175099253 SHA512 10d43e88d746f422d5751b87175a6ec76468d1f829d65aa554acced5075cfa39b6fd0d589a87d71a3127f70a718653e24444710f3e669dab3c0587a6b138ca67
diff --git a/games-emulation/generator/files/generator-0.35_p4-configure.patch b/games-emulation/generator/files/generator-0.35_p4-autoconf.patch
index a918c4a97113..ccc9655a2a72 100644
--- a/games-emulation/generator/files/generator-0.35_p4-configure.patch
+++ b/games-emulation/generator/files/generator-0.35_p4-autoconf.patch
@@ -1,5 +1,5 @@
---- a/configure.ac.original	2008-03-17 13:07:48.000000000 -0400
-+++ b/configure.ac	2008-03-17 13:08:03.000000000 -0400
+--- a/configure.ac
++++ b/configure.ac
 @@ -28,15 +28,12 @@
    AC_ARG_WITH(tcltk,
                AS_HELP_STRING(--with-tcltk,Create tcltk version),
@@ -68,7 +68,15 @@
    AC_CHECK_LIB(jpeg, jpeg_start_compress, 
      [ MY_LIBS="-ljpeg $MY_LIBS"; AC_DEFINE(JPEG, 1, [JPEG features]) ])
  
-@@ -272,14 +225,7 @@
+@@ -259,6 +212,7 @@
+   AC_PROG_CC
+   AC_PROG_CPP
+   AC_PROG_RANLIB
++  AM_PROG_AR
+   AC_PROG_MAKE_SET
+   AC_ISC_POSIX
+   AC_PROG_INSTALL
+@@ -272,14 +226,7 @@
  
    AC_PATH_XTRA
  
@@ -84,7 +92,7 @@
      MY_SUBDIRS="gtkopts $MY_SUBDIRS"
      AM_PATH_SDL(1.2.6,,AC_MSG_ERROR(Generator needs sdk 1.2.6 or later))
  
-@@ -305,6 +251,7 @@
+@@ -305,6 +252,7 @@
    AC_CHECK_SIZEOF(unsigned long, 4)
    AC_CHECK_SIZEOF(unsigned long long, 8)
    AC_CHECK_HEADERS(sys/param.h)
diff --git a/games-emulation/generator/files/generator-0.35_p4-automake.patch b/games-emulation/generator/files/generator-0.35_p4-automake.patch
new file mode 100644
index 000000000000..e04ed94b9be8
--- /dev/null
+++ b/games-emulation/generator/files/generator-0.35_p4-automake.patch
@@ -0,0 +1,26 @@
+--- a/cpu68k/Makefile.am
++++ b/cpu68k/Makefile.am
+@@ -29,6 +29,7 @@
+ 
+ gen68k_SOURCES = gen68k.c tab68k.c
+ gen68k_DEPENDENCIES = def68k-iibs.h
++BUILT_SOURCES = def68k-iibs.h
+ 
+ noinst_LIBRARIES = lib68k.a
+ lib68k_a_SOURCES = cpu68k-0.c cpu68k-1.c cpu68k-2.c cpu68k-3.c \
+--- a/main/Makefile.am
++++ b/main/Makefile.am
+@@ -3,11 +3,11 @@
+ INCLUDES = -I../hdr -I. -I../cpu68k -I../ym2612 -I../raze -I../cmz80 \
+            -I../sn76496 -I../gtkopts \
+            -DFNAME_TCLSCRIPT=\"${datadir}/generator/gen.tcl\" \
+-           @GTK_CFLAGS@ @SDL_CFLAGS@
++           @SDL_CFLAGS@
+ bin_PROGRAMS = @PROGRAM@
+ EXTRA_PROGRAMS = generator-svgalib generator-tcltk generator-allegro \
+                  generator-gtk generator-sdl
+-LDADD = ../cpu68k/lib68k.a ../ym2612/libym2612.a @MY_LIBS@ \
++LDADD = ../cpu68k/lib68k.a ../ym2612/libym2612.a @MY_LIBS@ -lm \
+         ../sn76496/libsn76496.a
+ 
+ ## this should be generator_tcltk_DATA but it won't let me do that
diff --git a/games-emulation/generator/files/generator-0.35_p4-gcc-9.patch b/games-emulation/generator/files/generator-0.35_p4-gcc-9.patch
deleted file mode 100644
index 7b8eeafb7154..000000000000
--- a/games-emulation/generator/files/generator-0.35_p4-gcc-9.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/698944
-
---- a/main/vdp.c
-+++ b/main/vdp.c
-@@ -87,7 +87,7 @@ void vdp_describe(void);
- void vdp_eventinit(void);
- void vdp_layer_simple(unsigned int layer, unsigned int priority,
-                       uint8 *fielddata, unsigned int lineoffset);
--inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
-+static void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
-                          uint8 *cellloc, unsigned int lineoffset);
- void vdp_sprites(unsigned int line, uint8 *pridata, uint8 *outdata);
- int vdp_sprite_simple(unsigned int priority, uint8 *framedata,
-@@ -1733,7 +1733,7 @@ void vdp_endfield(void)
-      vdp_event_endline); */
- }
- 
--inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
-+static void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
-                          uint8 *cellloc, unsigned int lineoffset)
- {
-   int y, x;
diff --git a/games-emulation/generator/files/generator-0.35_p4-gcc.patch b/games-emulation/generator/files/generator-0.35_p4-gcc.patch
new file mode 100644
index 000000000000..e82512f0e3fb
--- /dev/null
+++ b/games-emulation/generator/files/generator-0.35_p4-gcc.patch
@@ -0,0 +1,53 @@
+--- a/hdr/cpuz80.h
++++ b/hdr/cpuz80.h
+@@ -5,7 +5,7 @@
+ #  include "raze.h"
+ #else
+ #  include "cmz80.h"
+-CONTEXTMZ80 cpuz80_z80; /* extern'd for save state code */
++extern CONTEXTMZ80 cpuz80_z80; /* extern'd for save state code */
+ #endif
+ 
+ #define LEN_SRAM 0x2000
+--- a/main/event.c
++++ b/main/event.c
+@@ -15,7 +15,7 @@
+ 
+ /* time for next event - update vdp_event - return when to call again */
+ 
+-inline void event_nextevent(void)
++void event_nextevent(void)
+ {
+   /* call this when it *is* time for the next event as dictated by vdp_event,
+      so we switch on it and update vdp_event at the same time */
+--- a/main/vdp.c
++++ b/main/vdp.c
+@@ -87,7 +87,7 @@
+ void vdp_eventinit(void);
+ void vdp_layer_simple(unsigned int layer, unsigned int priority,
+                       uint8 *fielddata, unsigned int lineoffset);
+-inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
++static void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
+                          uint8 *cellloc, unsigned int lineoffset);
+ void vdp_sprites(unsigned int line, uint8 *pridata, uint8 *outdata);
+ int vdp_sprite_simple(unsigned int priority, uint8 *framedata,
+@@ -1733,7 +1733,7 @@
+      vdp_event_endline); */
+ }
+ 
+-inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
++static void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
+                          uint8 *cellloc, unsigned int lineoffset)
+ {
+   int y, x;
+--- a/ym2612/support.h
++++ b/ym2612/support.h
+@@ -3,7 +3,7 @@
+ #include "config.h"
+ 
+ #define errorlog 0
+-#define INLINE inline
++#define INLINE
+ #define HAS_YM2612 1
+ #define YM2612UpdateRequest(x) 
+ #define AY8910_set_clock(chip,clock)
diff --git a/games-emulation/generator/files/generator-0.35_p4-inline.patch b/games-emulation/generator/files/generator-0.35_p4-inline.patch
deleted file mode 100644
index e7f09fa3689c..000000000000
--- a/games-emulation/generator/files/generator-0.35_p4-inline.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur generator-0.35-cbiere-r4/ym2612/support.h generator-0.35-cbiere-r4-patched/ym2612/support.h
---- generator-0.35-cbiere-r4/ym2612/support.h	2005-08-27 05:12:29.000000000 -0400
-+++ generator-0.35-cbiere-r4-patched/ym2612/support.h	2018-03-26 11:49:36.000000000 -0400
-@@ -3,7 +3,7 @@
- #include "config.h"
- 
- #define errorlog 0
--#define INLINE inline
-+#define INLINE
- #define HAS_YM2612 1
- #define YM2612UpdateRequest(x) 
- #define AY8910_set_clock(chip,clock)
diff --git a/games-emulation/generator/files/generator-0.35_p4-underlink.patch b/games-emulation/generator/files/generator-0.35_p4-underlink.patch
deleted file mode 100644
index b350e8b8a334..000000000000
--- a/games-emulation/generator/files/generator-0.35_p4-underlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/main/Makefile.am.old	2011-06-20 21:35:25.832460030 +0200
-+++ b/main/Makefile.am	2011-06-20 21:36:29.490503981 +0200
-@@ -7,7 +7,7 @@
- bin_PROGRAMS = @PROGRAM@
- EXTRA_PROGRAMS = generator-svgalib generator-tcltk generator-allegro \
-                  generator-gtk generator-sdl
--LDADD = ../cpu68k/lib68k.a ../ym2612/libym2612.a @MY_LIBS@ \
-+LDADD = ../cpu68k/lib68k.a ../ym2612/libym2612.a @MY_LIBS@ -lm \
-         ../sn76496/libsn76496.a
- 
- ## this should be generator_tcltk_DATA but it won't let me do that
diff --git a/games-emulation/generator/generator-0.35_p4-r1.ebuild b/games-emulation/generator/generator-0.35_p4-r1.ebuild
index 54614d750d78..4b25e85945f4 100644
--- a/games-emulation/generator/generator-0.35_p4-r1.ebuild
+++ b/games-emulation/generator/generator-0.35_p4-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit autotools toolchain-funcs
 
 MY_P="${PN}-${PV/_p/-cbiere-r}"
@@ -14,26 +15,22 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+sdlaudio"
 
-DEPEND="
+RDEPEND="
 	virtual/jpeg:0
 	media-libs/libsdl[joystick,video]
-	sdlaudio? ( media-libs/libsdl[sound] )
-"
-RDEPEND="${DEPEND}"
+	sdlaudio? ( media-libs/libsdl[sound] )"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-configure.patch
-	"${FILESDIR}"/${P}-underlink.patch
-	"${FILESDIR}"/${P}-inline.patch
-	"${FILESDIR}"/${P}-gcc-9.patch
+	"${FILESDIR}"/${P}-autoconf.patch
+	"${FILESDIR}"/${P}-automake.patch
+	"${FILESDIR}"/${P}-gcc.patch
 )
 
 src_prepare() {
 	default
-
-	sed -i -e 's/@GTK_CFLAGS@//g' main/Makefile.am || die
 	eautoreconf
 }
 
@@ -48,5 +45,7 @@ src_configure() {
 
 src_install() {
 	dobin main/generator-sdl
-	dodoc AUTHORS ChangeLog NEWS README TODO docs/*
+
+	einstalldocs
+	dodoc -r docs/.
 }
diff --git a/games-emulation/libretro-snes9x/Manifest b/games-emulation/libretro-snes9x/Manifest
index c94b17a34e33..5227ca3b66ee 100644
--- a/games-emulation/libretro-snes9x/Manifest
+++ b/games-emulation/libretro-snes9x/Manifest
@@ -1,4 +1,6 @@
 DIST libretro-snes9x-0.0.1_pre20180723.tar.gz 515094 BLAKE2B 3f684a6ece8c2a09e3e8aa01d1dde99c9ebf079d38e2d165bd5c53c5c93ce637ff657253df7a2a07f3c51d5fc1a1a8ced5a5e4c6a6a78d3d410245aae7484327 SHA512 5fbc44988d244bf7483877d4fbb5799101da43dcb56196bae8d602caab43199509b63d77b573675df9e54108646b5ba52dd5f6ad6582d929367236c2ec4116b4
+DIST libretro-snes9x-0.0.2_pre20200107.tar.gz 2885345 BLAKE2B 594f719a031634b002ffe7d72a5f19d1ef35c52f76f83f8acd085b42af9f50eb26d61fe5409019b21e71738ef76419f3df7f182527d3235664a6ff9ab4784247 SHA512 2a33e89ee2cb86113138833f5aaaf880d4a6bb325764f3bd4bf999e78bf0bd7a8633c2d521fdf7920b4c60c3e4eb397a354b72666675669bc3a4338d6bd5a431
 EBUILD libretro-snes9x-0.0.1_pre20180723.ebuild 478 BLAKE2B d9e54756ac7e1816b372e635b91972436e14345f72f91f49d3bc09fc2d000f06f20983b181fe5637552e5eb87cccd9d01633ffecbb7cfa8893702cdcc013b1e6 SHA512 44a954068781a409b833b71509d1ce14fef6c047da6c3efce56c000fa066b3d36c7862a88f62a991450844fdc34ba72621debcedde2086c4d98f006992a1de6e
+EBUILD libretro-snes9x-0.0.2_pre20200107.ebuild 525 BLAKE2B 57e985b179fb8ad40c80d388422fcc7f57ceac1cba8ed9a0a23bfeca0d64dce6f173c00f3c8e5f168b9a1e60c34b23ce62f81df86af203d56a94025c655b1651 SHA512 9346f475abc1c69f7bbc5fa19a75f20367bb9f2cc5f6d392466c7836cf7545c235077655d69c39b2ffbaf48a3ad706358166fffafbcf65e8664f5532d9f278d7
 EBUILD libretro-snes9x-9999.ebuild 392 BLAKE2B fd1bc621877fe6190fde609240b52c5ee40c2793eafc3b531136d57c4c123be717b6ef10f6aaf0eaa0a1fc2444ab2908179053419fe541ff5a9d7117771a7f68 SHA512 eebd8624b5b40240b329c85f3610a1f4103a08268c5139995c0788a8331a6153408b73c9926494b7afb82f17471b28bf3e485b4cf88cea3d77a73ed4107cf899
 MISC metadata.xml 418 BLAKE2B d724d803aa0531ef69a65cb110edba2d5e6bcb464c062ccd86d392529617e2f814d3d5e0f552fb5dcf53651c83d7913d6884b21d1cebf6f61f794c02f62a3724 SHA512 7871d33dc58c46edc597c0f0ef5cb0db86bd256590187fe2fb04f17c307af821a30ba79a943efe2a75e1b60a3200da1b8583f185be322965cdd8716c009381fb
diff --git a/games-emulation/libretro-snes9x/libretro-snes9x-0.0.2_pre20200107.ebuild b/games-emulation/libretro-snes9x/libretro-snes9x-0.0.2_pre20200107.ebuild
new file mode 100644
index 000000000000..e96b4cd5b53b
--- /dev/null
+++ b/games-emulation/libretro-snes9x/libretro-snes9x-0.0.2_pre20200107.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LIBRETRO_REPO_NAME="libretro/snes9x"
+LIBRETRO_COMMIT_SHA="6db918cfe32b157239da44096091c212fdfb3b60"
+KEYWORDS="~amd64 ~x86"
+inherit libretro-core
+DEPEND="!>=games-emulation/snes9x-1.60[libretro]"
+S="${S}/libretro"
+LIBRETRO_CORE_LIB_FILE="${S}/${LIBRETRO_CORE_NAME}_libretro.so"
+
+DESCRIPTION="Snes9x libretro port"
+LICENSE="Snes9x GPL-2 GPL-2+ LGPL-2.1 LGPL-2.1+ ISC MIT ZLIB Info-ZIP"
+RESTRICT="bindist"
+SLOT="0"
diff --git a/games-emulation/m64py/Manifest b/games-emulation/m64py/Manifest
index 70e5f3393482..1d2c041aebb3 100644
--- a/games-emulation/m64py/Manifest
+++ b/games-emulation/m64py/Manifest
@@ -1,3 +1,5 @@
 DIST m64py-0.2.4.tar.gz 209621 BLAKE2B 05fe7044ec096767ae1eb57aad9f326b157d67ea709ca0bb74cdd68ae16a23eb662a2842bef5e038d1b29cbf0a5252669ff54268d1227390f47e8c9029b63e6a SHA512 ab78565466c6dcfe604cdc00b7e63dee2f0f33514dbf4f9115af646b1f6562042516513d054bd5cb489ad89c9d30431e9ce531f8b27925ecb9c6f7b509836348
-EBUILD m64py-0.2.4.ebuild 1096 BLAKE2B 8a109c7cb3c42db942e3486deb33779f6b58f1c451348233b753feb046e807a3f2ace1e8d73094e4cc17ef72483ce00bd0f3ca8907f6bf0e2b79af86d0373b76 SHA512 ab4056f01f15b99bb37d57452f693006094ba7955fa4d36bf4159e101e2a38773214ad5fa63be11cc80623ed05794953eabf762c29d0bd5af0089f748a620479
+DIST m64py-0.2.5.tar.gz 201868 BLAKE2B 95cbfe58ae2741caac5e05bcc06af563ee398d2916d07902ba4aaf4213277eea3c6219448db5958e0a2d0ea8ea3f65c88e63cfd2938a8b4ed33231ba57ae724f SHA512 338f5e96dc4657ba2230c32a40cf0e85c5efcccaa0d5fdbe4b4dcef020b910f5d2d88e5c224f8b496ec0378051aaf44358a0438de52fb03b4ece353f55abc61c
+EBUILD m64py-0.2.4.ebuild 1042 BLAKE2B fe84544eb7b564f86d36389c535fe83a845893eeda970c7fd225c46933641395bf32eeca69c5e27971aaf5b4384bac6b8f8be93a10fc357947105e69f3bef17a SHA512 d7c83240d5a747134efb50f9013e5f42dafed0f11ab12898c249e4474d83c6b6ac7dcfc7f9bd65642acd385452dde8f243cb78c62a9036dc93296ba181d0f501
+EBUILD m64py-0.2.5.ebuild 1043 BLAKE2B 96a9604565785fc680c7554cb8abec300eba99ae9ee64a7237a737fe6b86678c45b47a9715c84a9be6516cd803bf4cbfab74dbed0376c12994c4236e57465fb3 SHA512 8f57d7ceb16452973c53c8a639e0580ad7a2a70cc64ef0adb63b2aec8ab96c675e341ea32bf1b872dad2bb9348e5d1843106e348da28e460d89dcd51a8c3e749
 MISC metadata.xml 455 BLAKE2B 094f3f1db818c82e55c07512db2e94ed800bfd14595d70aa8ddca7d63e862807c5552210f9a71c01ea0fbcc61f3d46a139a762d1026d75b1f932e15ec7e0e589 SHA512 41d3ca220e71119ec7bf4ea8b1ea92289d901ba3a0058e75423dd50580d03a0cbc9aae2c368fc3c47793e0405c0e167fc546c65f039661b5b11fbb274846301b
diff --git a/games-emulation/m64py/m64py-0.2.4.ebuild b/games-emulation/m64py/m64py-0.2.4.ebuild
index 7655373b07f9..be315cbc1541 100644
--- a/games-emulation/m64py/m64py-0.2.4.ebuild
+++ b/games-emulation/m64py/m64py-0.2.4.ebuild
@@ -21,12 +21,7 @@ RDEPEND="
 	dev-python/PySDL2[${PYTHON_USEDEP}]
 	media-libs/libsdl2[joystick,video]
 	>=games-emulation/mupen64plus-core-2.5:0/2-sdl2
-	7z? (
-		|| (
-			dev-python/pylzma[${PYTHON_USEDEP}]
-			app-arch/p7zip
-		)
-	)
+	7z? ( app-arch/p7zip )
 	rar? (
 		|| (
 			dev-python/rarfile[${PYTHON_USEDEP}]
diff --git a/games-emulation/m64py/m64py-0.2.5.ebuild b/games-emulation/m64py/m64py-0.2.5.ebuild
new file mode 100644
index 000000000000..39a8b3b3e879
--- /dev/null
+++ b/games-emulation/m64py/m64py-0.2.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="A frontend for Mupen64Plus"
+HOMEPAGE="http://m64py.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/project/m64py/${P}/${P}.tar.gz"
+
+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
+		)
+	)"
+
+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
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/games-emulation/mgba/Manifest b/games-emulation/mgba/Manifest
index 3afe76bc11ab..a1167e626e22 100644
--- a/games-emulation/mgba/Manifest
+++ b/games-emulation/mgba/Manifest
@@ -1,8 +1,8 @@
 DIST mgba-0.7.3.tar.gz 11228977 BLAKE2B 2b70bb97470558e6c10391b782f0f80e0466b2f16df07971ed378801d359157692ce56c61f4432640ed679d43dc2445a1ea45b3402c1b488fb534213d8594271 SHA512 131f850699f17a7496f7428b85b50f38b99acec4c87d5d28ba4e3af94f095a1b6d177ea731838b2971362b46c52accef9cbec98433ecfaccc080371092c7d789
-DIST mgba-0.8.1.tar.gz 11893993 BLAKE2B 0b5db35927111a23defaf33ea67b00613c01302940db8bfe6c21aab4ec39bdb089ddbd6238ca7ccd35010724b058f78cee3ca3cbc6d7fbe0047f25a152b208fa SHA512 7873bde6a74e8a1509a3b5bba602da1c747ca1eff72adcf11f7b2572298d94766570fea0b920cb28c8b63a7d8237a15876b9feb9169edbf331b2d72f340734e2
 DIST mgba-0.8.2.tar.gz 12014352 BLAKE2B 5a22d186b2732ba66698ac3fe47cd6ce841ca36ba856e5344948cf14a73aa9368658d94f0e6fb4fd78ae0a454c6d534182ecce221b3b24d62dde511c0aaa02a2 SHA512 181abab9e94964e2027cb039ded6128af1364e1442c418b8703263c9e0c5befeb7aca4d925fb44f3e25e8711a2cc22b198ea00483c42aea3b1c7ba077223d426
+DIST mgba-0.8.3.tar.gz 12013512 BLAKE2B 750c1bcb5cfe30e6e0965a16dbdb91b4dbf9f6b1068b7a9c343932c9b7b08c2b6aef4f7f4f38ee5d4e3ebb73d0f55222c78654be777858f36bd452b5f732e76c SHA512 8154cec08f9ab4fc7cedc7988ed8ee320ad076666e2958b4fa0620801398081aa4808b61dbafd2e7c4b9ff0edfbb761e013fd7117206e81478a6c09ef91e2a5a
 EBUILD mgba-0.7.3.ebuild 2425 BLAKE2B cfa4b58b92702bf6a5e9d29f1f2428c78c9523b553a752ed8ff3707b5bcb1bb618b8bc2276eea95aa608172fe7b8bb579040d6e2838d2b38cd084d41144d6a13 SHA512 4e6332c4ac92832354ae6509b8d8ab512d6353e6df30e73ae9e1158fa907a9c96e214417cdebec51506e89e482504cb254cd8cdd1d37de3903d7f00c2b932d7a
-EBUILD mgba-0.8.1.ebuild 2471 BLAKE2B b3cb801563d30d76ae973fc34ed752620463918d36f3ccdbab67dd7999656264dd26cbc7be1be450ee1d2571473f97d0b26d21d33a189f5a7b35cd2fe517885c SHA512 a94de95d49f83096808b4b0ba927ad751dfbf0951c84d3698fa51f25377e5946b488b02ab96f866e8460524ee8bef456ee9c9087fc41da27cd1b9913df4138d4
-EBUILD mgba-0.8.2.ebuild 2471 BLAKE2B b3cb801563d30d76ae973fc34ed752620463918d36f3ccdbab67dd7999656264dd26cbc7be1be450ee1d2571473f97d0b26d21d33a189f5a7b35cd2fe517885c SHA512 a94de95d49f83096808b4b0ba927ad751dfbf0951c84d3698fa51f25377e5946b488b02ab96f866e8460524ee8bef456ee9c9087fc41da27cd1b9913df4138d4
-EBUILD mgba-9999.ebuild 2471 BLAKE2B b3cb801563d30d76ae973fc34ed752620463918d36f3ccdbab67dd7999656264dd26cbc7be1be450ee1d2571473f97d0b26d21d33a189f5a7b35cd2fe517885c SHA512 a94de95d49f83096808b4b0ba927ad751dfbf0951c84d3698fa51f25377e5946b488b02ab96f866e8460524ee8bef456ee9c9087fc41da27cd1b9913df4138d4
-MISC metadata.xml 504 BLAKE2B c297828f1153ba0fa214bd849c22af964f8d5c0134f361956c80ea6239424aeb5eeb83f98a65dc7c924f9f7238223064fa25b3ee048e0e456fb9cdc432500b17 SHA512 2f481e401b55e4aa7089851c9869ec9aee349321a0f720b038e673f3f815c59be9c4cd0db667330ca1273bc7ebaf9671733e2b53e9f2fc34bc655709fbebca15
+EBUILD mgba-0.8.2.ebuild 2478 BLAKE2B ae2b1fb101e62f538e83fac4845ab6cc885ece3d05fc16871c65bfb87819d752833b8e59c0f09469911e984281e569ba543374c02f72203827e4d5090e5b634f SHA512 0db7779ea1470074491b0372475a2cd2b06e4f0dd765e662a228ef8df5adba0e648848cbe2db08c1d188657375eb12511762d41d40497b58e98fef508b53a1e5
+EBUILD mgba-0.8.3.ebuild 2624 BLAKE2B cccd71c843afb5f1028757a04b706303a4641ff0b30cf1157ebf3b12e0bcbead88a3d7a6593aa1d75bd44180edaf2cf38d964bd5fcd0c17aa013aa0a9fede16e SHA512 57891dead8324bfb0812e10131da5051b428b5071aaa2f9baa4e930fec5f20396fff965b9d25b273ab7cd4d44b328fc79ca9ba1ee39f6705e0065b3fffe45a05
+EBUILD mgba-9999.ebuild 2624 BLAKE2B cccd71c843afb5f1028757a04b706303a4641ff0b30cf1157ebf3b12e0bcbead88a3d7a6593aa1d75bd44180edaf2cf38d964bd5fcd0c17aa013aa0a9fede16e SHA512 57891dead8324bfb0812e10131da5051b428b5071aaa2f9baa4e930fec5f20396fff965b9d25b273ab7cd4d44b328fc79ca9ba1ee39f6705e0065b3fffe45a05
+MISC metadata.xml 630 BLAKE2B fdf7e92057360a0292fa7d512b55a7493df4030d0b0a4e64fcc43fec8b530f2fd5ed33bd1a81c3847ac8db28b22a3e90a9fa0b906731730b1a7c37fdb62a96e5 SHA512 2dab9ea38d95993b9f69f7a039f158d9702279edaba0239b453cc96668167f83e9cb458247422e623ce3d2d45daeedd93fd1133f90ab691a0af11484d986e16b
diff --git a/games-emulation/mgba/metadata.xml b/games-emulation/mgba/metadata.xml
index d65ffa04f67d..3a30f098b0d0 100644
--- a/games-emulation/mgba/metadata.xml
+++ b/games-emulation/mgba/metadata.xml
@@ -8,6 +8,8 @@
   <use>
     <flag name="discord">Enable Discord RPC support</flag>
     <flag name="elf">Enable the use of elf utils via <pkg>dev-libs/elfutils</pkg></flag>
+    <flag name="gles2">Build OpenGL ES 2.x RenderSystem</flag>
+    <flag name="gles3">Build OpenGL ES 3.x RenderSystem</flag>
   </use>
   <upstream>
     <remote-id type="github">mgba-emu/mgba</remote-id>
diff --git a/games-emulation/mgba/mgba-0.8.2.ebuild b/games-emulation/mgba/mgba-0.8.2.ebuild
index be2689f439b2..b94cca7aa9cc 100644
--- a/games-emulation/mgba/mgba-0.8.2.ebuild
+++ b/games-emulation/mgba/mgba-0.8.2.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 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 	S="${WORKDIR}/${PN}-${MY_PV}"
 fi
 LICENSE="MPL-2.0"
diff --git a/games-emulation/mgba/mgba-0.8.1.ebuild b/games-emulation/mgba/mgba-0.8.3.ebuild
index be2689f439b2..d1d5df90464f 100644
--- a/games-emulation/mgba/mgba-0.8.1.ebuild
+++ b/games-emulation/mgba/mgba-0.8.3.ebuild
@@ -14,12 +14,12 @@ 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 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 	S="${WORKDIR}/${PN}-${MY_PV}"
 fi
 LICENSE="MPL-2.0"
 SLOT="0"
-IUSE="debug discord elf ffmpeg opengl qt5 +sdl sqlite"
+IUSE="debug discord elf ffmpeg gles2 gles3 opengl qt5 +sdl sqlite"
 REQUIRED_USE="|| ( qt5 sdl )
 		qt5? ( opengl )"
 
@@ -28,7 +28,7 @@ RDEPEND="
 	sys-libs/zlib[minizip]
 	elf? ( dev-libs/elfutils )
 	ffmpeg? ( media-video/ffmpeg:= )
-	opengl? ( virtual/opengl )
+	opengl? ( media-libs/libglvnd )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
@@ -39,7 +39,10 @@ RDEPEND="
 	sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] )
 	sqlite? ( dev-db/sqlite:3 )
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	gles2? ( media-libs/libglvnd )
+	gles3? ( media-libs/libglvnd )
+"
 
 src_prepare() {
 	xdg_environment_reset
@@ -55,6 +58,8 @@ 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)"
diff --git a/games-emulation/mgba/mgba-9999.ebuild b/games-emulation/mgba/mgba-9999.ebuild
index be2689f439b2..d1d5df90464f 100644
--- a/games-emulation/mgba/mgba-9999.ebuild
+++ b/games-emulation/mgba/mgba-9999.ebuild
@@ -14,12 +14,12 @@ 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 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 	S="${WORKDIR}/${PN}-${MY_PV}"
 fi
 LICENSE="MPL-2.0"
 SLOT="0"
-IUSE="debug discord elf ffmpeg opengl qt5 +sdl sqlite"
+IUSE="debug discord elf ffmpeg gles2 gles3 opengl qt5 +sdl sqlite"
 REQUIRED_USE="|| ( qt5 sdl )
 		qt5? ( opengl )"
 
@@ -28,7 +28,7 @@ RDEPEND="
 	sys-libs/zlib[minizip]
 	elf? ( dev-libs/elfutils )
 	ffmpeg? ( media-video/ffmpeg:= )
-	opengl? ( virtual/opengl )
+	opengl? ( media-libs/libglvnd )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
@@ -39,7 +39,10 @@ RDEPEND="
 	sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] )
 	sqlite? ( dev-db/sqlite:3 )
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	gles2? ( media-libs/libglvnd )
+	gles3? ( media-libs/libglvnd )
+"
 
 src_prepare() {
 	xdg_environment_reset
@@ -55,6 +58,8 @@ 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)"
diff --git a/games-emulation/mupen64plus-core/Manifest b/games-emulation/mupen64plus-core/Manifest
index 4561fb0d5570..3ae4201eccf7 100644
--- a/games-emulation/mupen64plus-core/Manifest
+++ b/games-emulation/mupen64plus-core/Manifest
@@ -1,4 +1,4 @@
 AUX mupen64plus-core-2.5.9-fix-gcc10-fno-common.patch 520 BLAKE2B 1a72237a46105840d90e25a551e5ffab3f35f8df9f975da6f65c135847aac71fbf2e7fb9899c05720cb29b31ea85a15d86167c95993b93d763fea585ae0a4bff SHA512 95860397c764a6a21faaab45e13f68aa6b5da15ff1b96a430a263aaac918495b27a923c639166a9f124c0e3f3d2af6a3947aed34c3a590abc2e3033ef8460bd9
 DIST mupen64plus-core-src-2.5.9.tar.gz 1618486 BLAKE2B 6d43789873c6866dc7d268e4a2cc1febc4a8ce6615a51e4dabfc3d3715aaaa6bf8d7c157ddccd45ae3b57852388c591b86d1cf401c7d78962ec6780272ef912d SHA512 8087211eb3301e356e1529c1702c965aca5e9191a5a3efe604f2e2f7470da44c8c3be506ba1f0aa96b209baa8faf011ca153566540e96c278fe63a330b791f20
-EBUILD mupen64plus-core-2.5.9-r2.ebuild 2544 BLAKE2B cf26c31daf09cf89065b7413e311ed88def0359973e2103d3abc9445b89b7a256975e3036f4fffbbaff1b849b7f10d80695b51322c69ab2954ca23ccbe3c80c3 SHA512 0a036738de5f0b16c124c7ffbc06fb5bf403d22f47dfbe19941093f5f1441ff14c8154715920ae0134d38dba86feb3c7de60f4734bf20c634c8b3d2e4d3b34a9
+EBUILD mupen64plus-core-2.5.9-r2.ebuild 2593 BLAKE2B 4e1cf823fdaefbe1888ca9f01159ce5e36cd67d9bde15b9d965d14f15cb08625e6768be0b97bb536f148de6bc53b4fe8428b07e13be9f3324e22e6d67fc3a117 SHA512 bc962b6acc9a06104a19bf7ee5a44ab7df8fdf374bdf6ad253371be85d683ad74ce976028ec5d1e731e80c9da294518f1e5a54123f8bd7e0a4a4d9eb15005b27
 MISC metadata.xml 986 BLAKE2B b3af4fa2d51776a6d5262490ea9b5d4a9fad211261f43cb02fffbf973a90ee515c6042e94931f07b440930aaca82ed15ffa17484fa2cde082655fadc5f1766ca SHA512 ec66e37a84c3ab9d66f00235cb8d430ffa31be0e76e56c3ca05900ed2aa9f33671626b70b9ce3fe936b836498a164217ead0f8637929d9d719979a1e7473b5e5
diff --git a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r2.ebuild b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r2.ebuild
index 99d93cc23581..21de520cdfe3 100644
--- a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r2.ebuild
+++ b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r2.ebuild
@@ -27,7 +27,9 @@ RDEPEND="media-libs/libpng:0=
 		virtual/opengl:0=
 		virtual/glu:0=
 	)"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
+	cpu_flags_x86_sse? ( dev-lang/nasm )
 	virtual/pkgconfig"
 
 REQUIRED_USE="gles2-only? ( !osd )"
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 4b69c1fce179..0d97d31ca983 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -2,7 +2,6 @@ AUX pcsx2-1.4.0-gcc5.patch 694 BLAKE2B d523ed4b60730d38febceda5a4ddea3aad9678818
 AUX pcsx2-1.4.0-xgetbv.patch 1361 BLAKE2B f6e28703f59dbf79c38812e9a61828f1c40b00982e86b7f3d8b507c54a331b38febbafc98012bc43a84b5ba077af56d73cfb9f1c036c0b619ace1129b91ad031 SHA512 03bc1059dbca73382c3d708e92eef270bbf7958736010d8ffcb92c81972e34e1603007b2aad41b70694791760f9323353815f3468392e39e3893c06327824022
 DIST pcsx2-1.4.0.tar.gz 15108326 BLAKE2B 6601019f9bd038d8cb3ed5ebd47daa5b645e537d028581c1235f9ab03f59d281639913ef037be3ef380a76bd48ea4f8728b0339fafcd331b4cfa41681dbcabd0 SHA512 87ae8bdebcaf015ba03c23056bcab32b13d6726a6c3f05e62ef54f472114399debfcfcda4208b066519c2d20345a1bb8c55582eb342dccc168f410687f3766fb
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
-EBUILD pcsx2-1.4.0-r1.ebuild 2832 BLAKE2B ef3c11ebaba4a40d2f483628e266d312585fb8ed3366bf19a8fbcb45ebab6709483d4b4b32e20d4e77741257637f29d3891188c5dac58b372708b848d13aa684 SHA512 8b7cbbbca5b5dce6542571f52549600eb38679d74f2d6388533f08d5d8a0a59af136ac83c803894ea723528050e8638bd2b66a6434bdd33efec5fac497aa113c
 EBUILD pcsx2-1.4.0-r2.ebuild 2116 BLAKE2B c270c39b91613938a4d9eb3fc2742277521eb28d00d1c68877ab8322ede629be362cc6869d3229a13a4e99720b46068686acbd62f521ee8adc616426aaec0ec8 SHA512 905240f48058af46d6abe65c2c173fa463cff58a3d12cf074d282ede0d59044653a499db04e3ec96ae460da45189c3c67f9d2fac1a488bcdd671e03d5a779574
 EBUILD pcsx2-1.6.0.ebuild 2700 BLAKE2B a1e54394c31cf5882ef2c681b69471da8d9eb5c155f6a410bc4c008e55abeb7045b539009e74c8829ae4c5f06eff263446e935efcfec305001093dabfab3608c SHA512 c55576bfc01aea39bd8550df4fcc9643176389046a1b6d68fad0a08d4e6dbc151464a07a0089ef81578335b2a44e470f92ef8b640295845c62a8ad8925af9814
 EBUILD pcsx2-9999.ebuild 2622 BLAKE2B 85b0c2becfb06ee1fabcc2a5a8ad3e05d571e3e4999b37543af9f79ca9113a7d9b39b7da3a1a65c9eada8d5fe2aa551b4e39735d9d511a89c1e56805f2529b01 SHA512 1c41b0b891571e849f5c4ef3394c7ac46fdef14adcc0db116bd585faf829814191d4fbf4bcd5a89dd99937ebadf4d6be88e9dd9b1aa7b4cc784e4e6c10f2ec54
diff --git a/games-emulation/pcsx2/pcsx2-1.4.0-r1.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0-r1.ebuild
deleted file mode 100644
index 09a4415c3fa1..000000000000
--- a/games-emulation/pcsx2/pcsx2-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PLOCALES="ar_SA ca_ES cs_CZ de_DE es_ES fi_FI fr_FR hr_HR hu_HU id_ID it_IT ja_JP ko_KR ms_MY nb_NO pl_PL pt_BR ru_RU sv_SE th_TH tr_TR zh_CN zh_TW"
-MY_PV="${PV/_/-}"
-
-inherit cmake-utils l10n multilib toolchain-funcs wxwidgets
-
-DESCRIPTION="A PlayStation 2 emulator"
-HOMEPAGE="https://www.pcsx2.net"
-SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-RDEPEND="
-	app-arch/bzip2[abi_x86_32(-)]
-	app-arch/xz-utils[abi_x86_32(-)]
-	dev-libs/libaio[abi_x86_32(-)]
-	media-libs/alsa-lib[abi_x86_32(-)]
-	media-libs/libpng:=[abi_x86_32(-)]
-	media-libs/libsdl[abi_x86_32(-),joystick,sound]
-	media-libs/libsoundtouch[abi_x86_32(-)]
-	media-libs/portaudio[abi_x86_32(-)]
-	>=sys-libs/zlib-1.2.4[abi_x86_32(-)]
-	virtual/opengl[abi_x86_32(-)]
-	x11-libs/gtk+:2[abi_x86_32(-)]
-	x11-libs/libICE[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXext[abi_x86_32(-)]
-	x11-libs/wxGTK:3.0[abi_x86_32(-),X]
-"
-# Ensure no incompatible headers from eselect-opengl are installed, bug #510730
-DEPEND="${RDEPEND}
-	>=app-eselect/eselect-opengl-1.3.1
-	dev-cpp/pngpp
-	>=dev-cpp/sparsehash-1.5
-"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc5.patch
-	"${FILESDIR}"/${P}-xgetbv.patch
-)
-
-clean_locale() {
-	rm -R "${S}"/locales/"${1}" || die
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then
-		if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 8 ]] ; then
-			die "${PN} does not compile with gcc less than 4.8"
-		fi
-	fi
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	l10n_for_each_disabled_locale_do clean_locale
-}
-
-src_configure() {
-	multilib_toolchain_setup x86
-
-	# pcsx2 build scripts will force CMAKE_BUILD_TYPE=Devel
-	# 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
-		-DDISABLE_PCSX2_WRAPPER=TRUE
-		-DEXTRA_PLUGINS=FALSE
-		-DOPTIMIZATION_FLAG=
-		-DPACKAGE_MODE=TRUE
-		-DXDG_STD=TRUE
-
-		-DCMAKE_LIBRARY_PATH="/usr/$(get_libdir)/${PN}"
-		-DDOC_DIR=/usr/share/doc/"${PF}"
-		-DEGL_API=FALSE
-		-DGTK3_API=FALSE
-		-DPLUGIN_DIR="/usr/$(get_libdir)/${PN}"
-		# wxGTK must be built against same sdl version
-		-DSDL2_API=FALSE
-		-DWX28_API=FALSE
-	)
-
-	WX_GTK_VER="3.0" need-wxwidgets unicode
-	cmake-utils_src_configure
-}
-
-src_install() {
-	# Upstream issue: https://github.com/PCSX2/pcsx2/issues/417
-	QA_TEXTRELS="usr/$(get_libdir)/pcsx2/*"
-
-	cmake-utils_src_install
-}
diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
index fcec1a8e1eb9..049de16dc52f 100644
--- a/games-emulation/snes9x/Manifest
+++ b/games-emulation/snes9x/Manifest
@@ -3,5 +3,5 @@ AUX snes9x-1.59-build-system.patch 1303 BLAKE2B 48a349bc5d56fcf154faab76cf76fcbb
 DIST snes9x-1.59.2.tar.gz 2819803 BLAKE2B 3e077fe68dbc6ae9acf7625c1371971300cfb72143e0e98841dc8d75be5ccc45812d79d7810d28d1a5dc5c17a69cf0f9483e9c69e91437d864a4cbaf34852b35 SHA512 84d2dfc12a991b77b30ba9a591d285ecd4cc5fbb418282900209db9191d61611123ffa7d715b7abeed9b891e9af88ab4c46616502523a881127e2ede008236e4
 DIST snes9x-1.60.tar.gz 2863228 BLAKE2B 0ac3bdd2403221f1013e2b5438aacc4e7d361e943ac7edc56f8ef22827d81484e0b162b84f739ce0f68fe58021124275fd908ccdde99e1e1d6d6c9c0a6e3d17b SHA512 840b006a8fbd479fd5ceb2d94af4ef6470c5e27a3e6c8ddb0dffc8d3e51f465669144cd428bfce28b2ed4f68e70d8f252f2d8a2cae602ba797791d7e483c14c9
 EBUILD snes9x-1.59.2.ebuild 2723 BLAKE2B e365643b7c13bae7577eeda034963a946e3dd78153696f09f95503d0c758115294f4295d797b6b7be2950c0e584afcb3aeaea57d55683f7988ca286aa7b70f96 SHA512 9a474aba0c8fd071f090bec4694ebc036733b6831cfb01e35a9b1fffea049340fe2cc0b1fe840dae93df03b3740faf65ac000ec58d71adfd465d11767cf917d7
-EBUILD snes9x-1.60.ebuild 2723 BLAKE2B 76a612ec32ebf70698c2d6996d58e05e1191c1505b6bdca6c047aef5d5b7a2781644d9e2ab1fa00f2baa071471f61c10029523e5d13ebc7707d6e07ada68ea13 SHA512 7ee4da1e9d2ce81a419490802d375c39d53d86cd05239bc6815a8e36924d9905bc749080e400b0d0370dbff8f48477c7b182f946e8cd9310c1de220b89e2e67c
-MISC metadata.xml 489 BLAKE2B 3cb6bc463e0eb5ca5203722cc2320eba2bc2e000fbd42e1386fcef807df3aa6e853bbff49fb6b323ae012b44b6add2c354530df0ebc56d232aa89188297426cc SHA512 805a8089e2e324dcf14ca5d25b168fdd79dc72113710b820904982ce9b2c49e2876095cd461ed52f4905041c14b25626f4540db7e1b38e47a9d55bbac98ebbfc
+EBUILD snes9x-1.60.ebuild 2991 BLAKE2B 9a2d5693b97f433019ae14e810e0af21ecc555db588529c6a2e8134fd59ffd40376d7f34f04eb354c580aa4a32c0c00f2663203cdd6f9ba0ac49d64639916a7d SHA512 3d78def81d6043e51dbc1a3ce764d71d3c9830bf7691bf3c20f0f986e3fb4c1d54b5b3d0ed5cefb76eee1e76072ed40463c96a0b02c588a43d3aa81b129fac9e
+MISC metadata.xml 540 BLAKE2B 8304002a086f6f81fec68536747dbf2b94b422b96995278716b1fb45857f57c78cd4d607eca32dae5a055656ae8e24d3a33159a9967786aec6b21bfc5c5e7088 SHA512 0ed9371d537f977352ae79852442e760669a93394728c17b3bf17c9ea59d906ddcca1e56d04b38bf3059dbcb3563a8830e1e836b7bd72751f2bb5d196f481651
diff --git a/games-emulation/snes9x/metadata.xml b/games-emulation/snes9x/metadata.xml
index 7bbb65b9c765..50035d2edc74 100644
--- a/games-emulation/snes9x/metadata.xml
+++ b/games-emulation/snes9x/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="netplay">Enable playing ROMs over the network (not recommended)</flag>
+		<flag name="libretro">Build libretro port</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
index 1460433e5d76..14b09f9d7545 100644
--- a/games-emulation/snes9x/snes9x-1.60.ebuild
+++ b/games-emulation/snes9x/snes9x-1.60.ebuild
@@ -12,14 +12,10 @@ 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 multilib netplay opengl oss png pulseaudio portaudio wayland xinerama +xv"
+IUSE="alsa debug gtk libretro multilib netplay opengl oss png pulseaudio portaudio wayland xinerama +xv"
 RESTRICT="bindist"
 
 RDEPEND="
-	sys-libs/zlib:=[minizip]
-	x11-libs/libX11
-	x11-libs/libXext
-	png? ( media-libs/libpng:0= )
 	gtk? (
 		dev-libs/glib:2
 		media-libs/libsdl2[joystick]
@@ -36,7 +32,15 @@ RDEPEND="
 		xv? ( x11-libs/libXv )
 		wayland? ( dev-libs/wayland )
 	)
-	xinerama? ( x11-libs/libXinerama )"
+	!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"
@@ -96,6 +100,7 @@ src_configure() {
 }
 
 src_compile() {
+	use libretro && emake -C ../libretro
 	emake
 	use gtk && meson_src_compile
 }
@@ -106,13 +111,18 @@ src_install() {
 	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
 
-	docinto html
-	dodoc {.,..}/docs/*.html
+	HTML_DOCS="${WORKDIR}/${PF}/docs/*.html"
+	einstalldocs
 }
 
 pkg_preinst() {
diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index 81207139e2d2..99bd0e723bc2 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -1,5 +1,5 @@
 AUX vbam-2.1.4-cmake_fix.patch 5436 BLAKE2B 4af1b32f33c99cb66f7b551853fc49a402f860918214efcabb57bd1138bbe2977659fa50432f371cb443456cc0b75cbcd4f917936ae5246e1bb72a8868833cdf SHA512 3d33468003820d83b0a64fd4c086369293757a88c7883eaaf255f3fbc7aa438f08f249345a582b5eeb5269a6bf0bf0df1274aafed54931cafebda4c4c7112247
 DIST vbam-2.1.4.tar.gz 3891574 BLAKE2B 5255fe814ab583c433f273c31b36933c09301330b47b2deefa453453c1d127c29a1b9de2e945e6706b1f9d9ec517444989818f3db329b96c106bf5d51ec71ae3 SHA512 9070715797c6be1648661019f236eb9328eb409f52e80e15aac52d814cf4155cf1ea37c230557c1288f152f0d27d838b11bee38679787a8d5198ca81f173d896
-EBUILD vbam-2.1.4.ebuild 2108 BLAKE2B 0690b124ff95e094bc70ccc998f1d61cd6ea40abf3ea676b917e253ec7935dfbbdc10e9d26c3e91e3fec24ce67f48a72ce35921b53ccb44983a0859e6bd1b929 SHA512 425ede509cbb110316e91b59813aa616a282c89095e6fbcdd98dfb5b4ffe2e533e00e5f966134e51b503400871ec5695255742110f19805d5cd542d8c1aa685f
-EBUILD vbam-9999.ebuild 2059 BLAKE2B 7d74be9bb34f503d1e897e70cb355b6c084b0738e35f8779af46a42de124c23ccc9427d72a226dece88725de4e15a1cbafb454b328db0685627469aa71369286 SHA512 81b4e727bd38a2cb3f39cae6b7f70ce5cf62319cbb142cf5a9255b6e842ef98cbef68a4d4d5d63afa2d20bcc50a3c3950ec022d9187ea99ff017bb46739d534a
+EBUILD vbam-2.1.4.ebuild 2149 BLAKE2B 8cc1362c5ad1b905115d8024d7d185e43101cccc1dcd2f85c7ef9157c9b527aeaea0c57ba38f7e241c670c9fd725d85e5b40e46e1dcee6137b722c19c5e96009 SHA512 b61b5149be580247c7558182b3495c744b2b2906339dc051ad89ea64e52e66cbe3f8c4d6d8298b34aa3ffc9feaa4be3220f742cd6848f5647aa904a35e2d8ec3
+EBUILD vbam-9999.ebuild 2100 BLAKE2B f99640353927edd15ffa5ffb4f6a862c7ce5f4c464709fa081379988f5c6f5d4cea95f248b8e3bebda491d2191d656f21ac7642fba1b178b4a86322527921940 SHA512 73aae4570ddda4974d815be247ec6593484bdd6deb503d7d74953c5a4c4ce7846c31d609a8848d1c34f54c0ae07588ad714a93baafda9c4592b71307fe984a7f
 MISC metadata.xml 479 BLAKE2B e5a7706e8db6c8c05cf4cf691d294c4bd54f3cc7aee5af270cce39c2d924cc81cc97a1b3d3612c1cf95d0b4b485181717d0f0daeef11a21b0c7ce0cf4d9eafda SHA512 6bd2212bd5ae35dd11f35322879f067981cac94c0c2d8f0c87e1e67170b5df245bd3616e5bb076d2892453c8b75537ee15aab49134029c0daa31d89d8aedf1d0
diff --git a/games-emulation/vbam/vbam-2.1.4.ebuild b/games-emulation/vbam/vbam-2.1.4.ebuild
index 4cddf8bc249d..f006bb998fac 100644
--- a/games-emulation/vbam/vbam-2.1.4.ebuild
+++ b/games-emulation/vbam/vbam-2.1.4.ebuild
@@ -21,7 +21,12 @@ HOMEPAGE="https://github.com/visualboyadvance-m/visualboyadvance-m"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="ffmpeg link lirc nls openal +sdl wxwidgets"
-REQUIRED_USE="openal? ( wxwidgets ) || ( sdl wxwidgets )"
+
+REQUIRED_USE="
+	ffmpeg? ( wxwidgets )
+	openal? ( wxwidgets )
+	|| ( sdl wxwidgets )
+"
 
 RDEPEND="
 	>=media-libs/libpng-1.4:0=
@@ -30,19 +35,24 @@ RDEPEND="
 	sys-libs/zlib:=
 	virtual/glu
 	virtual/opengl
-	ffmpeg? ( =media-video/ffmpeg-3*:= )
 	lirc? ( app-misc/lirc )
 	nls? ( virtual/libintl )
 	wxwidgets? (
+		ffmpeg? ( media-video/ffmpeg:= )
 		openal? ( media-libs/openal )
 		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-	)"
-DEPEND="${RDEPEND}
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
 	app-arch/zip
 	wxwidgets? ( virtual/imagemagick-tools )
 	x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
 	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-cmake_fix.patch
diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-9999.ebuild
index fa211e451c18..31465821c5d9 100644
--- a/games-emulation/vbam/vbam-9999.ebuild
+++ b/games-emulation/vbam/vbam-9999.ebuild
@@ -21,7 +21,12 @@ HOMEPAGE="https://github.com/visualboyadvance-m/visualboyadvance-m"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="ffmpeg link lirc nls openal +sdl wxwidgets"
-REQUIRED_USE="openal? ( wxwidgets ) || ( sdl wxwidgets )"
+
+REQUIRED_USE="
+	ffmpeg? ( wxwidgets )
+	openal? ( wxwidgets )
+	|| ( sdl wxwidgets )
+"
 
 RDEPEND="
 	>=media-libs/libpng-1.4:0=
@@ -30,19 +35,24 @@ RDEPEND="
 	sys-libs/zlib:=
 	virtual/glu
 	virtual/opengl
-	ffmpeg? ( =media-video/ffmpeg-3*:= )
 	lirc? ( app-misc/lirc )
 	nls? ( virtual/libintl )
 	wxwidgets? (
+		ffmpeg? ( media-video/ffmpeg:= )
 		openal? ( media-libs/openal )
 		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-	)"
-DEPEND="${RDEPEND}
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
 	app-arch/zip
 	wxwidgets? ( virtual/imagemagick-tools )
 	x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
 	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 src_configure() {
 	use wxwidgets && setup-wxwidgets
diff --git a/games-emulation/yabause/Manifest b/games-emulation/yabause/Manifest
index c3ef419d9e40..21c5a77c8b78 100644
--- a/games-emulation/yabause/Manifest
+++ b/games-emulation/yabause/Manifest
@@ -1,5 +1,5 @@
 AUX yabause-0.9.15-RWX.patch 556 BLAKE2B e64fbcb60ad606ec64f712f99fc73a449fb13a30adec7b21a73370c8c9059ebf8320e7a1fe392837e8ed583ac3e3fc3dc27f19290e8673e8f51d009bfd1793e9 SHA512 18407541de268afe34eb3110c072fae0859c8cc1e7937e435e043eedff13d075b104c38cb09cadca303b62992984fbf2340d33941fc829f58f2aa249c0a1e078
 AUX yabause-0.9.15-qt-5.11.patch 1716 BLAKE2B a0d696ffc186e21758110546e17b421dd4fe4a661b037ee2eb342f0fccc9259d289612c64cde5eb4ff4fa1c45d40a9c9ad1ad8d0e46d4a5234f170bb779f65ec SHA512 93e9da7bfc80b03352fbbb25ac50c48104dadf4e4a45741addcd54fefc9c7ce75ce89ff191ca6c7e3aa7f519b8e77ccaa8f71e9126625aa16be978e1c3b2b0ec
 DIST yabause-0.9.15.tar.gz 2481650 BLAKE2B c211f4372c1cb3c8dc757d60b2106898a637c6852c19856d3cb619fed4a04788d70c132ff78be4382e67c7ce368b8939c039d057c4597e27e4349c7caa01950d SHA512 f7e992e3326e68aca1c0ce6dd0d382eea00cd3e47492c045d17526909356198448c533b00568af3ab311307e6b3d47a28708a8c0ff74e5b6c98d62da8c01a3c7
-EBUILD yabause-0.9.15.ebuild 1153 BLAKE2B ecd51468dd20f9aa35066770c2d70b102aeb856922470219f3f6e63f9af4ba75d8def33e2ba7aeeba4430955236caaeab78324987a5ff840ecca4aefe86afcd8 SHA512 0c76d3f95f1e2271b5a32a575acf37cf0f0b6d85e0f31d6d298893977a2fe72304c34e4bd02f619fa480fb5da9f3d3211125ac26e95ec64649ca57f64c3f4c8f
+EBUILD yabause-0.9.15.ebuild 1192 BLAKE2B bc727af689ec524d8ee95ec34ea559d886dd9e3a1be11fe1646252e3ea3f24db346a97faea5df742d63318eef4094264f925dece15ec9f3eb8241c465d0ff159 SHA512 63d8b76aaf27e7a20c6dc07f5e4b29f4cda180c5f8de40418a91c7e3f950069dd605455c87cf3303b568b6a33803177cb4dc90aa7e99a7e000d6b3cd6ee1f2ee
 MISC metadata.xml 333 BLAKE2B 5dcf088b796127de03a35a6c6a646d9d8501a4083489dab6d5e72a4bf8ea7f6fde1e79b30d7313120bea0a3848e8c127a1dd69017bef53f98b579efc67d099a0 SHA512 11e9e94bb7bd43f1ea7a5e203b2540055da973ed2d094a40494ab7b7c6f4bf862bb2604e4742e2cb566d35e7db6a6cf026284977c54dd4644523a47f05995fba
diff --git a/games-emulation/yabause/yabause-0.9.15.ebuild b/games-emulation/yabause/yabause-0.9.15.ebuild
index 7a9c578d68ac..cc176432448d 100644
--- a/games-emulation/yabause/yabause-0.9.15.ebuild
+++ b/games-emulation/yabause/yabause-0.9.15.ebuild
@@ -43,6 +43,7 @@ PATCHES=(
 
 src_configure() {
 	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF # bug 705338
 		-DYAB_NETWORK=ON
 		-DYAB_USE_CXX=ON
 		-DYAB_USE_SCSP2=OFF # breaks build
diff --git a/games-emulation/zsnes/Manifest b/games-emulation/zsnes/Manifest
index 3474dcbe2026..97b2c4fe5fa3 100644
--- a/games-emulation/zsnes/Manifest
+++ b/games-emulation/zsnes/Manifest
@@ -1,19 +1,17 @@
 AUX zsnes-1.51-CC-quotes.patch 740 BLAKE2B f41e66a5d2f9b54c8ed4f17fafc7afdd73e35202c083d1db375b26b89f03b991d36d279d10c7c17076f31b87d1fbad276e5c5c4ce333d2cb0f0fc7641b562845 SHA512 2347910158934a7c8b90a6739f923d7a1f94e963515dca42d45eb97e6165c5f80c30d28fd151537a7a80bba16d2462568ff1c1dac93a855990f0418aaf059776
 AUX zsnes-1.51-arch.patch 2484 BLAKE2B 036f749d832efc976a7225e47d6b7ac5e1b69af235a4196e9706fe46d447793a1e3f88e49fe34229cd71353b987b7ef123bbebf7c822ca32025c60b0c9813b57 SHA512 cc75584780e442d7fbcd4e26a9395d8e85570883f93f63b1fcb604d601acde88295861e15a6cee1d50bca836fc52efd4f5df9c84fb73fbe04fa76ec34ae3b4a1
-AUX zsnes-1.51-archopt-july-23-update.patch 12672 BLAKE2B d12246a4913d2355a7c2c26686714e61ff3791c29f93f473619225b9bd180d329c48d07123141d657faf3fe75de4e49d31b80b4577f9a646a531774abba24b4a SHA512 ac30370957721ccc4bc8681dc00110bd68dee6d65a2c3daa39df2fe45a4fa7106f9c3097b2bd9cc3dbc83e3c6344811e8719f48ba6e4896768c17357730c5719
 AUX zsnes-1.51-buffer.patch 3091 BLAKE2B a87e0b6547aeaa9f585d76a8ee080895573015fe42b0df2161268754ff01c046fd234997000ef484f66710dfd30e145d9d4db2f373a568e99deec2a8637db285 SHA512 0faf34338ff3fd85985dc16d2a58aa9e2ac1887db8d26bc210fc6965f6cc743c6c56b8b58bea72341d8ee1fed59c438db801000be5ae6bf4e26789e9bed89d25
+AUX zsnes-1.51-c++17.patch 2520 BLAKE2B 0295b0e211e2ec8f4988f42299a78d477ba29128519fdb6542f3495d7770b44c245d76264d3dbf97008a9a857da270ce753b90974b705af4b6a319f3389b47dd SHA512 abb9dd3cbc24ace02f132e44a44c3454402c34dcbcf40b2d3118befbe7553e71111382bd48ce281f05ecf2832ce814001f17b1598d155b9abb20943500ab5e99
 AUX zsnes-1.51-cross-compile.patch 934 BLAKE2B be18829454407c99aba00cb8126573f5f3e3ed8e18b2bb50811b855ba81137a16b90601c28cab9fce8d865e522cb66bb797d46a22090dd994c71aef672be99f2 SHA512 ece4a9f51314c7318babaf689fb44c1502ec5bc32808613211865daf1368cc1069b70ad4c1c4ec7b127cf707a0b093c356a8b50e5357099894656c78cf28738f
 AUX zsnes-1.51-depbuild.patch 559 BLAKE2B 38309177599aee8dafcbded6a027d66b991e85aac4c77fda0485b7777467c056386797041223a556b3cfff4b926e5a0b4004baae4264a765354a6dc2cb39ac75 SHA512 46955153ec6d2ecd5a295117c3ecc911a566de69f29f4d29decc98867d03e4a53a980a3c75d8ff19bbd1655eb291069fbbd598e002a73ebdbdc94c135f852c6e
 AUX zsnes-1.51-gcc-10.patch 409 BLAKE2B 4508e17379148a504a171110ddb121df3666dc9430a477d67b33fbd3544dff6799b159c9fe1f8c51fe2ffdf6d5c3fd1d809181942b774639cb7aad03fdaa2929 SHA512 28f1e215c0b85ffaae8f5128a79778532119bb51a89f7e4a6ee655aee0bcf520086f25c60ff303a5a3f8ea0b976aa4c29a3f68db0d320109ecd4349311bfedfe
 AUX zsnes-1.51-gcc43-20071031.patch 739 BLAKE2B 798bb1b45bd82a7e25c5923a2653aa61e2f2b197e26ca1e6cecdf5d55ecd83263c5aae17aee18419d0a14f58c6a24b02d0c31212189561d4a355d9f3e2fc386e SHA512 0ab19c1fadaf0ac07a7641366a56c5a2f7227e2fc39fe904e27954596ebee64174242b98a873abf6ee52b8e8335ce277189606e7a376ae02d4a95498cce24a40
-AUX zsnes-1.51-gcc43.patch 913 BLAKE2B 7ac3d5b8f556d577c1a1065bbe4e275742fdde0486411cc82f2dc552e8d90b82eb7dceefcdd87252633154b8249213f9dfe6724f4f0ee4eef3f8f691081355c7 SHA512 8684b9b8c01d2d9f27bf27a86e4705b3408a2891347045266040397b649eb162962e8384746930c9837ac9b21bfd626d6e241d8a6c73b46a0e348274dd8688d3
 AUX zsnes-1.51-gcc47.patch 312 BLAKE2B 927c6179fbbcd3fb161b5b18e025090acce178eae0586b7c20e48cdba091572d30c224aa80bb8a49c16d29fb9045c0207b26692651a15a53c2b4b90780c3f0c2 SHA512 aa9f111359e96118729e684562618d72231c5c475e736c53862cfe9d21b8c4db29056ec0476dcc7e50dd501a77619671fb8834be093086c7e752100c917060fc
 AUX zsnes-1.51-libao-thread.patch 667 BLAKE2B 76bc0abf16f68c9752a727817cff209daa2c0c29f31e6045441e202083f47559cb50c1a6a998c12621a298fa3901bc1d52701b176b8fd594ca116f990d3c5208 SHA512 43c28d4539df5c8ea4d3d0415c65afec3eb9215971a5ff0532b3b147b2fa3f870aadf07eb1e643e986c39d56760c0292447d467418865826ddc8c7aea64cc005
 AUX zsnes-1.51-libpng.patch 858 BLAKE2B f0ad46176cf5729d0a5be9e4307a28628e38c3d18043f0ff897dfd1cf901f0f9fb7ff80d25095fdaa9b6b1be52fe3c95f4e28b65042b4c4aad33a27125c7eb02 SHA512 2c25fb3294357a38ed8e119d4b4d60f7bd6f28724b2274a620465962e96e008f2a29273f46d4813e91b9128879218f401bb91b1a6df4c156b9ff7856b26657b0
 AUX zsnes-1.51-libpng15.patch 510 BLAKE2B 6281a27c6029ee94947b282fe5c06a67e7670d3168d5f4ae90573d12e8e6d5c467a9691cdd161158f117e341466bc7a3e99d516b95624534773027279aba4f7a SHA512 4191987cad2f8dd7d7fd1d4f8f0c60de07059f18a60cb9bb94f1e5c35c06122032de9887762ebcf2d255f24c3e90aa5b4f6a7540a8e4dbdc4ce5f7d3b3e3b532
 AUX zsnes-1.51-stack-align-v2.patch 1451 BLAKE2B b4570fa9d614d516375f1b7d2a9b3b7c9bf432f453425d2ee3035e78d8d946355551044d712528907c3a1f29b3531034b5949224398801e04270df85ada5ab00 SHA512 c3be01f36973615c55c643d1d916742f8e3a34e9957b42d1d7224a99790713025bb154e5e8c2833fd1e8d26240c6251a70c8a9f36fefe661480077b1b06871c8
 DIST zsnes-1.51-20071031.tar.bz2 1072340 BLAKE2B d67c92e382ca130d4138d21fbb2effc06539d1c7e3aabf0339c9b7e773521daf2d3cb0bcef75991e1a4453fcc86903d3dead48d90806489c8b4bf7677f8ebf3b SHA512 b10373cf81b201a33dc60c728431d4f69d36de31fcf6f137b623ea206a2998f722dcd6132daec1d0bf14a05ae52f3ee9ecee4334517039be554db85c9f7b8274
-DIST zsnes151src.tar.bz2 1071712 BLAKE2B e942c699bd227942563deb23b105339aa9ffd8a5623200ca142a777508b4ebaf47859170016490f53a3af2bfb15293c17a99a7658e1f3f0afd7df8cd63200b9a SHA512 2cec9ad7762fc7a257c6b1d3e190b0ed53565dbafe42e1dee9eb182644392b7dd2c57faa846f63cd30ac079e5c05354d26ce0612d20481a1f54d760d62d95353
-EBUILD zsnes-1.51-r7.ebuild 3226 BLAKE2B a5f1e0480df9f23cc17dd87cf033d9c750961dd3028d601ac6d8f58e0849ce65b4291f0ab151470351cd473e1ec807980dc4904971944bb87d8887dc82149324 SHA512 82a0e10da417343361948e18fed08fdc5da7283540563b450c8897bf76d08f9ba05436810aeabe5ec43a82ff5a7632892cea7cc06d5d59ba7093f13c997e3c68
 EBUILD zsnes-1.51-r8.ebuild 3211 BLAKE2B e6d0c1a02743df48f3aacd130559ecc1d0b0d6002ce927bb73747149eb3a8da200365dbeb3b926f091ffc23514f73c14b13e3f9ad742d55983dacfbde451c9a7 SHA512 bef59012c2fb36aef65dcdebe2450a6b52f036fa13fe0c7ede478caafdf67084129d5a6c38fa68fad3f083e054a0af6cda13a3622a32211b59bb0c7b67621463
+EBUILD zsnes-1.51-r9.ebuild 3243 BLAKE2B 988d654c846b770dd0486bb0cfa6bab4444293e9e86fb3387ab9ce84c8dd0f8d4c5731dd3fd62f805f97da05008b777597865ac6e9960e2d6bc6d9001fd50ee6 SHA512 4711041845575e2e5aaaa146ab50731cc678957a783b16b2152a396bf6e29a06e21cca6024abc8e0560f1f4feea264264426aaf4a0d64ff881dd98910b85e502
 MISC metadata.xml 413 BLAKE2B 4e4199d8263368534eb4e2971fd30f0ef32af1537a7131ff150c6aee178c6a804083536c3ec249547f0826064ffe476e6c777b8c0aa519fc99d9d3d6284052c0 SHA512 235a3739eb5641eb444fb9ae47c661f05140c3b348173b65b342971850c2e0e7e32c416315904e48fcd8fa9241c93b0e0cc030851b61074c78566d3603f41973
diff --git a/games-emulation/zsnes/files/zsnes-1.51-archopt-july-23-update.patch b/games-emulation/zsnes/files/zsnes-1.51-archopt-july-23-update.patch
deleted file mode 100644
index b3e466036f22..000000000000
--- a/games-emulation/zsnes/files/zsnes-1.51-archopt-july-23-update.patch
+++ /dev/null
@@ -1,502 +0,0 @@
---- a/tools/archopt.c.old
-+++ b/tools/archopt.c
-@@ -1,8 +1,30 @@
-+/*
-+Copyright (C) 2005-2007 Nach, grinvader ( http://www.zsnes.com )
-+
-+This program is free software; you can redistribute it and/or
-+modify it under the terms of the GNU General Public License
-+version 2 as published by the Free Software Foundation.
-+
-+This program is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with this program; if not, write to the Free Software
-+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+*/
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
- #include <ctype.h>
- 
-+#ifdef _M_X64
-+#define __x86_64__
-+#endif
-+
-+#ifdef __GNUC__
- #ifdef __x86_64__
- #define cpuid(in, a, b, c, d) asm volatile("cpuid": "=a" (a), "=b" (b), "=c" (c), "=d" (d) : "a" (in));
- #else
-@@ -13,6 +35,22 @@
-   movl %%ebx,%%edi;\
-   popl %%ebx": "=a" (a), "=D" (b), "=c" (c), "=d" (d) : "a" (in));
- #endif
-+#else
-+char cpubuf[256];
-+int z_in, z_a, z_b, z_c, z_d;
-+void cpuid_run()
-+{
-+  _asm {
-+    mov eax,z_in
-+    cpuid
-+    mov z_a,eax
-+    mov z_b,ebx
-+    mov z_c,ecx
-+    mov z_d,edx
-+  };
-+}
-+#define cpuid(in, a, b, c, d) z_in = in; cpuid_run(); a = z_a; b = z_b; c = z_c; d = z_d;
-+#endif
- 
- char *x86_flags[] =
- {      "fpu",        "vme",        "de",         "pse",        "tsc",    "msr",      "pae",    "mce",
-@@ -62,6 +100,7 @@
- {
-   int have = 0x200000;
-   #ifndef __x86_64__
-+  #ifdef __GNUC__
-   asm volatile
-   (
-   "  pushfl;"
-@@ -76,6 +115,23 @@
-     : "=a" (have)
-     : "c" (have)
-   );
-+  #else
-+  z_c = have;
-+  _asm {
-+    mov ecx,z_c
-+    pushfd
-+    pop eax
-+    mov edx,eax
-+    xor eax,ecx
-+    push eax
-+    popfd
-+    pushfd
-+    pop eax
-+    xor eax,edx
-+    mov z_a,eax
-+  };
-+  have = z_a;
-+  #endif
-   #endif
-   return(have);
- }
-@@ -196,238 +252,268 @@
-   cpu = "native";
- #endif
- #endif
--
--  if (!cpu && *cpu_family && *vendor_id)
-+  if (!cpu)
-   {
--    if (!strcmp(vendor_id, "AuthenticAMD") || strstr(model_name, "AMD"))
-+    if (!cpu && *cpu_family && *vendor_id)
-     {
--      if (strstr(flags, " mmx "))
-+      #ifdef __GNUC__
-+      if (!strcmp(vendor_id, "AuthenticAMD") || strstr(model_name, "AMD"))
-       {
--        #if __GNUC__ > 2
--        if (strstr(flags, " 3dnow "))
-+        if (strstr(flags, " mmx "))
-         {
--          if (strstr(flags, " 3dnowext ") && (atoi(cpu_family) > 5))
-+          #if __GNUC__ > 2
-+          if (strstr(flags, " 3dnow "))
-           {
--            #if __GNUC__ > 3 || __GNUC_MINOR__ > 0
--            if (strstr(flags, " sse "))
-+            if (strstr(flags, " 3dnowext ") && (atoi(cpu_family) > 5))
-             {
--              #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
--              if (strstr(flags, " sse2 ") && strstr(flags, " lm ")) //Need two checks to protect Semprons
-+              #if __GNUC__ > 3 || __GNUC_MINOR__ > 0
-+              if (strstr(flags, " sse "))
-               {
--                if (strstr(model_name, "Opteron"))
--                {
--                  cpu = "opteron";
--                }
--                else if (strstr(model_name, "Athlon(tm) 64")) //Also athlon-fx
-+                #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
-+                if (strstr(flags, " sse2 ") && strstr(flags, " lm ")) //Need two checks to protect Semprons
-                 {
--                  cpu = "athlon64";
-+                  if (strstr(model_name, "Opteron"))
-+                  {
-+                    cpu = "opteron";
-+                  }
-+                  else if (strstr(model_name, "Athlon(tm) 64")) //Also athlon-fx
-+                  {
-+                    cpu = "athlon64";
-+                  }
-+                  else
-+                  {
-+                    cpu = "k8";
-+                  }
-                 }
--                else
-+                #endif
-+                if (!cpu)
-                 {
--                  cpu = "k8";
-+                  if (strstr(model_name, "Athlon(tm) 4"))
-+                  {
-+                    cpu = "athlon-4";
-+                  }
-+                  else if (strstr(model_name, "Athlon(tm) MP"))
-+                  {
-+                    cpu = "athlon-mp";
-+                  }
-+                  else
-+                  {
-+                    cpu = "athlon-xp";
-+                  }
-                 }
-               }
-+
-+              if (!cpu && (atoi(model) > 3))
-+              {
-+                cpu = "athlon-tbird";
-+              }
-               #endif
-+
-               if (!cpu)
-               {
--                if (strstr(model_name, "Athlon(tm) 4"))
--                {
--                  cpu = "athlon-4";
--                }
--                else if (strstr(model_name, "Athlon(tm) MP"))
--                {
--                  cpu = "athlon-mp";
--                }
--                else
--                {
--                  cpu = "athlon-xp";
--                }
-+                cpu = "athlon";
-               }
-             }
- 
--            if (!cpu && (atoi(model) > 3))
--            {
--              cpu = "athlon-tbird";
--            }
--            #endif
--
-+            #if __GNUC__ > 3 || __GNUC_MINOR__ > 0
-             if (!cpu)
-             {
--              cpu = "athlon";
-+              int model_num = atoi(model);
-+              if ((model_num == 9) || (model_num >= 13))
-+              {
-+                cpu = "k6-3";
-+              }
-+              else
-+              {
-+                cpu = "k6-2";
-+              }
-             }
-+            #endif
-           }
-+          #endif
- 
--          #if __GNUC__ > 3 || __GNUC_MINOR__ > 0
-           if (!cpu)
-           {
--            int model_num = atoi(model);
--            if ((model_num == 9) || (model_num >= 13))
--            {
--              cpu = "k6-3";
--            }
--            else
--            {
--              cpu = "k6-2";
--            }
-+            cpu = "k6";
-           }
--          #endif
--        }
--        #endif
--
--        if (!cpu)
--        {
--          cpu = "k6";
-         }
-       }
--    }
--    else if (!strcmp(vendor_id, "GenuineIntel") || strstr(model_name, "Intel"))
--    {
--      #if __GNUC__ > 2
--      if (strstr(flags, " mmx "))
-+      else if (!strcmp(vendor_id, "GenuineIntel") || strstr(model_name, "Intel"))
-       {
--        if (strstr(flags, " sse "))
-+        #if __GNUC__ > 2
-+        if (strstr(flags, " mmx "))
-         {
--          if (strstr(flags, " sse2 "))
-+          if (strstr(flags, " sse "))
-           {
--            #if __GNUC__ > 3 || __GNUC_MINOR__ > 2
--            if (strstr(flags, " pni ") && strcmp(cpu_family, "6"))
-+            if (strstr(flags, " sse2 "))
-             {
--              if (strstr(flags, " lm "))
-+              #if __GNUC__ > 3 || __GNUC_MINOR__ > 2
-+              if (strstr(flags, " pni ") && strcmp(cpu_family, "6"))
-               {
--                cpu = "nocona";
-+                if (strstr(flags, " lm "))
-+                {
-+                  cpu = "nocona";
-+                }
-+                else
-+                {
-+                  cpu = "prescott";
-+                }
-               }
--              else
-+              #endif
-+
-+              if (!cpu)
-               {
--                cpu = "prescott";
-+                if (!strcmp(cpu_family, "6"))
-+                {
-+                  #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
-+                  cpu = "pentium-m";
-+                  #else
-+                  cpu = "pentium3";
-+                  #endif
-+                }
-+                else
-+                {
-+                  #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
-+                  if (strstr(model_name, "Mobile"))
-+                  {
-+                    cpu = "pentium4m";
-+                  }
-+                  #endif
-+
-+                  if (!cpu)
-+                  {
-+                    cpu = "pentium4";
-+                  }
-+                }
-               }
-             }
--            #endif
--
--            if (!cpu)
-+            else
-             {
--              if (!strcmp(cpu_family, "6"))
-+              #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
-+              if (strstr(model_name, "Mobile"))
-               {
--                #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
--                cpu = "pentium-m";
--                #else
--                cpu = "pentium3";
--                #endif
-+                cpu = "pentium3m";
-               }
--              else
--              {
--                #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
--                if (strstr(model_name, "Mobile"))
--                {
--                  cpu = "pentium4m";
--                }
--                #endif
-+              #endif
- 
--                if (!cpu)
--                {
--                  cpu = "pentium4";
--                }
-+              if (!cpu)
-+              {
-+                cpu = "pentium3";
-               }
-             }
-           }
-           else
-           {
--            #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
--            if (strstr(model_name, "Mobile"))
-+            if (!strcmp(cpu_family, "6"))
-             {
--              cpu = "pentium3m";
-+              cpu = "pentium2";
-             }
--            #endif
--
--            if (!cpu)
-+            else
-             {
--              cpu = "pentium3";
-+              cpu = "pentium-mmx";
-             }
-           }
-         }
--        else
-+        #endif
-+
-+        if (!cpu)
-+        {
-+          int family = atoi(cpu_family);
-+          if (family > 5)
-+          {
-+            cpu = "pentiumpro";
-+          }
-+          else if (family == 5)
-+          {
-+            cpu = "pentium";
-+          }
-+        }
-+      }
-+      #if __GNUC__ > 2
-+      #if __GNUC__ > 3 || __GNUC_MINOR__ > 2
-+      else if (!strcmp(vendor_id, "CentaurHauls") && strstr(flags, " mmx "))
-+      {
-+        if (strstr(flags, " 3dnow "))
-         {
--          if (!strcmp(cpu_family, "6"))
-+          if (atoi(cpu_family) > 5)
-           {
--            cpu = "pentium2";
-+            cpu = "c3";
-           }
-           else
-           {
--            cpu = "pentium-mmx";
-+            cpu = "winchip2";
-           }
-         }
-+        #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
-+        else if (strstr(flags, " sse "))
-+        {
-+          cpu = "c3-2";
-+        }
-+        #endif
-+
-+        if (!cpu)
-+        {
-+          cpu = "winchip-c6";
-+        }
-       }
-       #endif
-+      #endif
- 
-       if (!cpu)
-       {
-         int family = atoi(cpu_family);
-         if (family > 5)
-         {
--          cpu = "pentiumpro";
-+          cpu = "i686";
-         }
-         else if (family == 5)
-         {
--          cpu = "pentium";
-+          cpu = "i586";
-         }
--      }
--    }
--    #if __GNUC__ > 2
--    #if __GNUC__ > 3 || __GNUC_MINOR__ > 2
--    else if (!strcmp(vendor_id, "CentaurHauls") && strstr(flags, " mmx "))
--    {
--      if (strstr(flags, " 3dnow "))
--      {
--        if (atoi(cpu_family) > 5)
-+        else if (family == 4)
-         {
--          cpu = "c3";
-+          cpu = "i486";
-         }
-         else
-         {
--          cpu = "winchip2";
-+          cpu = "i386";
-         }
-       }
--      #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
-+      #else //MSVC
-+      cpu = cpubuf;
-+      *cpu = 0;
-+
-+      if (strstr(flags, " sse2 "))
-+      {
-+        strcat(cpu, " /arch:SSE2");
-+      }
-       else if (strstr(flags, " sse "))
-       {
--        cpu = "c3-2";
-+        strcat(cpu, " /arch:SSE");
-       }
--      #endif
- 
--      if (!cpu)
-+      #ifdef __x86_64__
-+      if (strstr(flags, " lm ")) //64 bit
-       {
--        cpu = "winchip-c6";
-+        if (!strcmp(vendor_id, "AuthenticAMD") || strstr(model_name, "AMD"))
-+        {
-+          strcat(cpu, " /favor:AMD64");
-+        }
-+        else if (!strcmp(vendor_id, "GenuineIntel") || strstr(model_name, "Intel"))
-+        {
-+          strcat(cpu, " /favor:EM64T");
-+        }
-       }
-+      #endif
-+      #endif
-     }
--    #endif
--    #endif
--
--    if (!cpu)
-+    else
-     {
--      int family = atoi(cpu_family);
--      if (family > 5)
--      {
--        cpu = "i686";
--      }
--      else if (family == 5)
--      {
--        cpu = "i586";
--      }
--      else if (family == 4)
--      {
--        cpu = "i486";
--      }
--      else
--      {
--        cpu = "i386";
--      }
-+      puts("Could not open /proc/cpuinfo, and CPUID instruction not available.");
-+      return(1);
-     }
--    puts(cpu);
--  }
--  else
--  {
--    puts("Could not open /proc/cpuinfo, and CPUID instruction not available.");
--    return(1);
-   }
-+  puts(cpu);
- 
-   return(0);
- }
diff --git a/games-emulation/zsnes/files/zsnes-1.51-c++17.patch b/games-emulation/zsnes/files/zsnes-1.51-c++17.patch
new file mode 100644
index 000000000000..537f32540c58
--- /dev/null
+++ b/games-emulation/zsnes/files/zsnes-1.51-c++17.patch
@@ -0,0 +1,76 @@
+--- a/jma/jma.cpp
++++ b/jma/jma.cpp
+@@ -48,7 +48,7 @@ namespace JMA
+ 
+ 
+   //Retreive the file block, what else?
+-  void jma_open::retrieve_file_block() throw(jma_errors)
++  void jma_open::retrieve_file_block()
+   {
+     unsigned char uint_buffer[UINT_SIZE];
+     unsigned char ushort_buffer[USHORT_SIZE];
+@@ -168,7 +168,7 @@ namespace JMA
+   }
+ 
+   //Constructor for opening JMA files for reading
+-  jma_open::jma_open(const char *compressed_file_name) throw (jma_errors)
++  jma_open::jma_open(const char *compressed_file_name)
+   {
+     decompressed_buffer = 0;
+     compressed_buffer = 0;
+@@ -229,7 +229,7 @@ namespace JMA
+   }
+ 
+   //Skip forward a given number of chunks
+-  void jma_open::chunk_seek(unsigned int chunk_num) throw(jma_errors)
++  void jma_open::chunk_seek(unsigned int chunk_num)
+   {
+     //Check the stream is open
+     if (!stream.is_open())
+@@ -257,7 +257,7 @@ namespace JMA
+ 
+   //Return a vector of pointers to each file in the JMA, the buffer to hold all the files
+   //must be initilized outside.
+-  vector<unsigned char *> jma_open::get_all_files(unsigned char *buffer) throw(jma_errors)
++  vector<unsigned char *> jma_open::get_all_files(unsigned char *buffer)
+   {
+     //If there's no stream we can't read from it, so exit
+     if (!stream.is_open())
+@@ -396,7 +396,7 @@ namespace JMA
+   }
+ 
+   //Extracts the file with a given name found in the archive to the given buffer
+-  void jma_open::extract_file(string& name, unsigned char *buffer) throw(jma_errors)
++  void jma_open::extract_file(string& name, unsigned char *buffer)
+   {
+     if (!stream.is_open())
+     {
+--- a/jma/jma.h
++++ b/jma/jma.h
+@@ -64,12 +64,12 @@ namespace JMA
+   class jma_open
+   {
+     public:
+-    jma_open(const char *) throw(jma_errors);
++    jma_open(const char *);
+     ~jma_open();
+ 
+     std::vector<jma_public_file_info> get_files_info();
+-    std::vector<unsigned char *> get_all_files(unsigned char *) throw(jma_errors);
+-    void extract_file(std::string& name, unsigned char *) throw(jma_errors);
++    std::vector<unsigned char *> get_all_files(unsigned char *);
++    void extract_file(std::string& name, unsigned char *);
+     bool is_solid();
+ 
+     private:
+@@ -79,8 +79,8 @@ namespace JMA
+     unsigned char *decompressed_buffer;
+     unsigned char *compressed_buffer;
+ 
+-    void chunk_seek(unsigned int) throw(jma_errors);
+-    void retrieve_file_block() throw(jma_errors);
++    void chunk_seek(unsigned int);
++    void retrieve_file_block();
+   };
+ 
+   const char *jma_error_text(jma_errors);
diff --git a/games-emulation/zsnes/files/zsnes-1.51-gcc43.patch b/games-emulation/zsnes/files/zsnes-1.51-gcc43.patch
deleted file mode 100644
index 4650bc12a7d1..000000000000
--- a/games-emulation/zsnes/files/zsnes-1.51-gcc43.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- src/parsegen.cpp
-+++ src/parsegen.cpp
-@@ -31,6 +31,7 @@
- #include <sstream>
- #include <set>
- #include <stack>
-+#include <cstring>
- using namespace std;
- 
- #include <errno.h>
-@@ -1828,7 +1829,7 @@
-   }
- }
- 
--int main(size_t argc, const char **argv)
-+int main(int argc, const char **argv)
- {
-   const char *cheader_file = 0;
-   bool compile = false;
---- src/tools/depbuild.cpp
-+++ src/tools/depbuild.cpp
-@@ -24,6 +24,7 @@
- #include <iostream>
- #include <string>
- #include <cstdio>
-+#include <cstdlib>
- using namespace std;
- 
- #include "fileutil.h"
-@@ -183,7 +184,7 @@
-   }
- }
- 
--int main(size_t argc, const char *const *const argv)
-+int main(int argc, const char *const *const argv)
- {
-   if (argc < 5)
-   {
---- src/tools/strutil.h
-+++ src/tools/strutil.h
-@@ -25,6 +25,7 @@
- #include <string>
- #include <vector>
- #include <cctype>
-+#include <cstring>
- 
- struct ci_char_traits : public std::char_traits<char>
- {
diff --git a/games-emulation/zsnes/zsnes-1.51-r7.ebuild b/games-emulation/zsnes/zsnes-1.51-r9.ebuild
index f06068a089fe..a56e1e85d8de 100644
--- a/games-emulation/zsnes/zsnes-1.51-r7.ebuild
+++ b/games-emulation/zsnes/zsnes-1.51-r9.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit autotools desktop flag-o-matic toolchain-funcs pax-utils
 
 DESCRIPTION="SNES (Super Nintendo) emulator that uses x86 assembly"
 HOMEPAGE="https://www.zsnes.com/ http://ipherswipsite.com/zsnes/"
-SRC_URI="mirror://sourceforge/zsnes/${PN}${PV//./}src.tar.bz2"
+SRC_URI="mirror://sourceforge/zsnes/${PN}${PV//./}src.tar.bz2 -> ${P}-20071031.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -36,8 +36,7 @@ PATCHES=(
 	# Fix bug #214697
 	# Fix bug #170108
 	# Fix bug #260247
-	"${FILESDIR}"/${P}-archopt-july-23-update.patch
-	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-gcc43-20071031.patch
 	"${FILESDIR}"/${P}-libao-thread.patch
 	"${FILESDIR}"/${P}-depbuild.patch
 	"${FILESDIR}"/${P}-CC-quotes.patch
@@ -56,6 +55,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-arch.patch
 
 	"${FILESDIR}"/${P}-gcc-10.patch
+	"${FILESDIR}"/${P}-c++17.patch
 )
 
 src_prepare() {
author	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
commit	3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree	c513fe68548b40365c1c2ebfe35c58ad431cdd77 /games-emulation
parent	05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)