gentoo resync : 15.06.2021

40 files changed, 549 insertions, 662 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 43ce230fd05e..b2d8bae33c43 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/desmume/Manifest b/games-emulation/desmume/Manifest
index 146a19854425..2fc5c0e9b415 100644
--- a/games-emulation/desmume/Manifest
+++ b/games-emulation/desmume/Manifest
@@ -1,6 +1,4 @@
-AUX desmume-0.9.11-fix-pointer-conversion-warning.diff 370 BLAKE2B 8e019cf69a13b3669166f1ee04d26e6538a392e494d356b2eeabd43ac69fe9489ddeda146054ab5d1f821b3a52719d58ae493ca870f46461eacaab26ffb9eba1 SHA512 f7d5f4ac4d96f244aa6ee81a90f64e754aceebf075f1c4ff84dde2d1d2beaf617631569c5aa9a8afb40ae4499067e2233ba00a4b9d606a9608915714766d0bff
-AUX desmume-0.9.11-gcc6.patch 1991 BLAKE2B ffb0a58f7317aa50fe17c4abe1ba6c9bbf9cb937736479214b86187c32af8c1659aa719eccce184a5f0fa1b31f15634276fb676bf97ec64feba603fa89ee289f SHA512 e9249a613f1bf3b6d72dcce47cbc39daeadb1b4f7b9be2748b537ec3389a61f46b5f15f5a10d55bc4b1dbd69dd87526b5ce79e58b539cf432679da9bc803e0cd
-AUX desmume-0.9.11-gcc7.patch 832 BLAKE2B 80accd7e22d22163692be58f2da288db4b4009603f9cf9fca4d709e44dfae4496c9b7610c82bf6bfc47c470837dccec83a95e124c3ad9a8cead654cd389a3476 SHA512 9c9b0452a6aaf860583ad97737fb7142601a5ff6f4b720037c9b4d2aeab533c12ffbb1a216753f7e9e4f04350a4e276c5606624ab633f4c2bea517ec0233db8f
-DIST desmume-0.9.11.tar.gz 5359305 BLAKE2B 31764dcb2d0facf32eddd5c66f40e2268f8afd5c2562bf246b93bb60c191d7888587991732014dee11417016515a4367bda9acf79f699703754aa904dcaeeb01 SHA512 160cb6ec0ede04ad1fbddde2b7b04aa41fa464c8338d7eb9d7536196a82d8d716889b40be4fb831a22e3fe8532b947f7f0b41311601b6842be2516dff7cae46c
-EBUILD desmume-0.9.11-r2.ebuild 778 BLAKE2B 43c3a3e4e773015deb7298a27c89afd385ee51f17609aae9690e429e70d81ab4db1123184f42fa0136fd6c6a1502e7e6f89a2f0067d0ab329d19820bc57c17ad SHA512 d8cedd2e9fc22ac1b57b3537387ea500055fc70bf07fc0e347af93a686f0867e9921a74dc44a3c01c60ebe344f8693ef65cdd2a74592ec173b8444c7f684e6b5
-MISC metadata.xml 330 BLAKE2B eb079764905cfeea2e4851dcf8b3cc66f0be8181abe0a0e103bfcfc1da46231d257c60946d165f87d231446f18cfa1ee53e0593e2f7788f60d587da8684e0936 SHA512 169091ef557b69e2f43fd21e696ce662d3c65a1b22ff6b9b7f3e452a8d065f20c2904b0e5f85058d03ca93a73c1acb4ae0f3426b9f3727486897847ff29ac8ba
+AUX desmume-0.9.11_p20210409-fix-gtk-cliopts.patch 2969 BLAKE2B 8aa75d966e74a1d274f923636c9984558a738566b9e3bb101c30182d5929753c2ce528341708a69ab5db68c348e34a79590c79e8b8a6181f639248eb5381edb6 SHA512 a438cbebb2ba06ab66b9643df9ec9b1e922f02478a50d5cdc81cdb18ff688f48ea28fc289305dc5daa2f553760dcd0b1a02c729d48e9fd9b35f03a79a9096c07
+DIST desmume-0.9.11_p20210409.tar.gz 13157043 BLAKE2B f8e582005555357cb632478ba8d2730e51a5cb8dbbee05d4af138df19a015ced6cff721fb53f87224774aed8287f91a01da5600f5548189fd0e264e5b3037fd8 SHA512 1897b3b35c7e997876ff53a36849a39b85bd49c737dab61f68c376e3cb294486f9edded98924275e8ee91e5b008e9d3814987edaab7306217c17dbc094f69348
+EBUILD desmume-0.9.11_p20210409.ebuild 1090 BLAKE2B 932b88d648771a739f98d3d3b82acb74a76dc4385392872c61cf1493d3a71341d8e084ffe7b05263e8caf7db89fa19ab0ab2364a9bc980c408605b46eceab5c4 SHA512 6f06b5e559298d6feaf74a19d12e825f03882fb137fd5280653df0b0fa5f4103e83f8e9bcb47232b0ca26813768eacfc140788871cda3bf71898d2f17651d185
+MISC metadata.xml 633 BLAKE2B 052f681fd7ff8b6a3d4dd64e5a9fea8fd5db7e782864a913cd382c1da3d984e09033f3d272a4bb966aab14f3d9026b673a730e03565b56c1a68a03a7391ad8c2 SHA512 a41bf6b90e75336de2819de1bf3be17e40a38e4d13ee782b8a6c951b80bedab7f0739c0c11977a5587aa906ba7da72ce8024b5d4b63338af53266a59ae6f0fa7
diff --git a/games-emulation/desmume/desmume-0.9.11-r2.ebuild b/games-emulation/desmume/desmume-0.9.11-r2.ebuild
deleted file mode 100644
index 964f794fb7f2..000000000000
--- a/games-emulation/desmume/desmume-0.9.11-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg
-
-DESCRIPTION="Nintendo DS emulator"
-HOMEPAGE="http://desmume.org/"
-SRC_URI="mirror://sourceforge/desmume/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/zziplib
-	gnome-base/libglade
-	media-libs/libsdl[joystick,opengl,video]
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/agg
-	>=x11-libs/gtk+-2.8.0:2"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog README README.LIN )
-
-# fix QA compiler warning, see
-# https://sourceforge.net/p/desmume/patches/172/
-PATCHES=(
-	"${FILESDIR}/${P}-fix-pointer-conversion-warning.diff"
-	"${FILESDIR}/${P}-gcc6.patch"
-	"${FILESDIR}/${P}-gcc7.patch"
-)
diff --git a/games-emulation/desmume/desmume-0.9.11_p20210409.ebuild b/games-emulation/desmume/desmume-0.9.11_p20210409.ebuild
new file mode 100644
index 000000000000..752de42b7cbf
--- /dev/null
+++ b/games-emulation/desmume/desmume-0.9.11_p20210409.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson xdg
+
+MY_COMMIT="e8f619c44a23ebba06be1fb4442483d481477b81"
+
+DESCRIPTION="Nintendo DS emulator"
+HOMEPAGE="https://desmume.org/"
+SRC_URI="https://github.com/TASVideos/desmume/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gdb +gui openal wifi"
+
+RDEPEND="
+	dev-libs/glib:2
+	media-libs/alsa-lib
+	media-libs/libsdl2[X,opengl,sound,video]
+	media-libs/libsoundtouch:=
+	net-libs/libpcap
+	sys-libs/zlib:=
+	virtual/opengl
+	x11-libs/agg
+	x11-libs/libX11
+	gui? ( x11-libs/gtk+:3 )
+	openal? ( media-libs/openal )"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-gtk-cliopts.patch
+)
+DOCS=( ${PN}/{AUTHORS,ChangeLog,README,README.LIN,doc/.} )
+
+src_configure() {
+	local EMESON_SOURCE="${S}/${PN}/src/frontend/posix"
+	local emesonargs=(
+		$(meson_use gdb gdb-stub)
+		$(meson_use gui frontend-gtk)
+		$(meson_use openal)
+		$(meson_use wifi)
+	)
+	meson_src_configure
+}
diff --git a/games-emulation/desmume/files/desmume-0.9.11-fix-pointer-conversion-warning.diff b/games-emulation/desmume/files/desmume-0.9.11-fix-pointer-conversion-warning.diff
deleted file mode 100644
index 8975085133ff..000000000000
--- a/games-emulation/desmume/files/desmume-0.9.11-fix-pointer-conversion-warning.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/path.h	2015-02-14 16:05:26.000000000 +0100
-+++ b/src/path.h	2016-07-11 12:09:59.591987169 +0200
-@@ -375,7 +375,7 @@
- 				else if (strchr(strftimeArgs, *p))

- 				{

- 					char tmp[MAX_PATH];

--					char format[] = { '%', *p, NULL };

-+					char format[] = { '%', *p, '\0' };

- 					strftime(tmp, MAX_PATH, format, time_struct);

- 					file.append(tmp);

- 		}

diff --git a/games-emulation/desmume/files/desmume-0.9.11-gcc6.patch b/games-emulation/desmume/files/desmume-0.9.11-gcc6.patch
deleted file mode 100644
index 761ccef045cf..000000000000
--- a/games-emulation/desmume/files/desmume-0.9.11-gcc6.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/src/wifi.cpp
-+++ b/src/wifi.cpp
-@@ -314,9 +314,9 @@
- 
- #if (WIFI_LOGGING_LEVEL >= 1)
- 	#if WIFI_LOG_USE_LOGC
--		#define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) LOGC(8, "WIFI: "__VA_ARGS__);
-+		#define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) LOGC(8, "WIFI: " __VA_ARGS__);
- 	#else
--		#define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) printf("WIFI: "__VA_ARGS__);
-+		#define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) printf("WIFI: " __VA_ARGS__);
- 	#endif
- #else
- #define WIFI_LOG(level, ...) {}
---- a/src/MMU_timing.h
-+++ b/src/MMU_timing.h
-@@ -155,8 +155,8 @@
- 	enum { ASSOCIATIVITY = 1 << ASSOCIATIVESHIFT };

- 	enum { BLOCKSIZE = 1 << BLOCKSIZESHIFT };

- 	enum { TAGSHIFT = SIZESHIFT - ASSOCIATIVESHIFT };

--	enum { TAGMASK = (u32)(~0 << TAGSHIFT) };

--	enum { BLOCKMASK = ((u32)~0 >> (32 - TAGSHIFT)) & (u32)(~0 << BLOCKSIZESHIFT) };

-+	enum { TAGMASK = (u32)(~0U << TAGSHIFT) };

-+	enum { BLOCKMASK = ((u32)~0U >> (32 - TAGSHIFT)) & (u32)(~0U << BLOCKSIZESHIFT) };

-	enum { WORDSIZE = sizeof(u32) };

- 	enum { WORDSPERBLOCK = (1 << BLOCKSIZESHIFT) / WORDSIZE };

- 	enum { DATAPERWORD = WORDSIZE * ASSOCIATIVITY };

---- a/src/ctrlssdl.cpp
-+++ b/src/ctrlssdl.cpp
-@@ -200,7 +200,7 @@
-           break;
-         case SDL_JOYAXISMOTION:
-           /* Dead zone of 50% */
--          if( (abs(event.jaxis.value) >> 14) != 0 )
-+          if( ((u32)abs(event.jaxis.value) >> 14) != 0 )
-             {
-               key = ((event.jaxis.which & 15) << 12) | JOY_AXIS << 8 | ((event.jaxis.axis & 127) << 1);
-               if (event.jaxis.value > 0) {
-@@ -370,7 +370,7 @@
-          Note: button constants have a 1bit offset. */
-     case SDL_JOYAXISMOTION:
-       key_code = ((event->jaxis.which & 15) << 12) | JOY_AXIS << 8 | ((event->jaxis.axis & 127) << 1);
--      if( (abs(event->jaxis.value) >> 14) != 0 )
-+      if( ((u32)abs(event->jaxis.value) >> 14) != 0 )
-         {
-           if (event->jaxis.value > 0)
-             key_code |= 1;
diff --git a/games-emulation/desmume/files/desmume-0.9.11-gcc7.patch b/games-emulation/desmume/files/desmume-0.9.11-gcc7.patch
deleted file mode 100644
index 8b8a67f2291a..000000000000
--- a/games-emulation/desmume/files/desmume-0.9.11-gcc7.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Bug: https://bugs.gentoo.org/646352
-Patch: https://sources.debian.org/data/main/d/desmume/0.9.11-3/debian/patches/gcc7_fixes.patch
-
-From e1f7039f1b06add4fb75b2f8774000b8f05574af Mon Sep 17 00:00:00 2001
-From: rogerman <rogerman@users.sf.net>
-Date: Mon, 17 Aug 2015 21:15:04 +0000
-Subject: Fix bug with libfat string handling.
-
-diff --git a/src/utils/libfat/directory.cpp b/src/utils/libfat/directory.cpp
-index 765d7ae5..b6d7f01f 100644
---- a/src/utils/libfat/directory.cpp
-+++ b/src/utils/libfat/directory.cpp
-@@ -139,7 +139,7 @@ static size_t _FAT_directory_mbstoucs2 (ucs2_t* dst, const char* src, size_t len
- 	int bytes;
- 	size_t count = 0;
- 
--	while (count < len-1 && src != '\0') {
-+	while (count < len-1 && *src != '\0') {
- 		bytes = mbrtowc (&tempChar, src, MB_CUR_MAX, &ps);
- 		if (bytes > 0) {
- 			*dst = (ucs2_t)tempChar;
diff --git a/games-emulation/desmume/files/desmume-0.9.11_p20210409-fix-gtk-cliopts.patch b/games-emulation/desmume/files/desmume-0.9.11_p20210409-fix-gtk-cliopts.patch
new file mode 100644
index 000000000000..f773385748af
--- /dev/null
+++ b/games-emulation/desmume/files/desmume-0.9.11_p20210409-fix-gtk-cliopts.patch
@@ -0,0 +1,91 @@
+Fix unusable command line options since GTK+:3 migration.
+
+https://github.com/TASVideos/desmume/pull/416
+From: Ingo Saitz <Ingo.Saitz@stud.uni-hannover.de>
+Date: Sun, 3 Jan 2021 16:00:38 +0100
+--- a/desmume/src/commandline.cpp
++++ b/desmume/src/commandline.cpp
+@@ -41,7 +41,8 @@
+ , _load_to_memory(-1)
+-, _play_movie_file(0)
+-, _record_movie_file(0)
+-, _cflash_image(0)
+-, _cflash_path(0)
+-, _gbaslot_rom(0)
++, nds_file("")
++, play_movie_file("")
++, record_movie_file("")
++, cflash_image("")
++, cflash_path("")
++, gbaslot_rom("")
+ , _bios_arm9(NULL)
+@@ -60,4 +61,4 @@
+ , _texture_smooth(-1)
+-, _slot1(NULL)
+-, _slot1_fat_dir(NULL)
++, slot1("")
++, slot1_fat_dir("")
+ , _slot1_fat_dir_type(false)
+@@ -68,3 +69,3 @@
+ #endif
+-, _console_type(NULL)
++, console_type("")
+ , _advanscene_import(NULL)
+@@ -360,4 +361,4 @@
+ 		case OPT_SLOT2_CFLASH_IMAGE: cflash_image = optarg; break;
+-		case OPT_SLOT2_CFLASH_DIR: _cflash_path = optarg; break;
+-		case OPT_SLOT2_GBAGAME: _gbaslot_rom = optarg; break;
++		case OPT_SLOT2_CFLASH_DIR: cflash_path = optarg; break;
++		case OPT_SLOT2_GBAGAME: gbaslot_rom = optarg; break;
+ 
+@@ -520,4 +521,5 @@
+ 
+-	if((_cflash_image && _gbaslot_rom) || (_cflash_path && _gbaslot_rom)) {
++	if((cflash_image != "" && gbaslot_rom != "") || (cflash_path != "" && gbaslot_rom != "")) {
+ 		printerror("Cannot specify both cflash and gbaslot rom (both occupy SLOT-2)\n");
++		return false;
+ 	}
+--- a/desmume/src/commandline.h
++++ b/desmume/src/commandline.h
+@@ -88,7 +88,2 @@
+ private:

+-	char* _play_movie_file;

+-	char* _record_movie_file;

+-	char* _cflash_image;

+-	char* _cflash_path;

+-	char* _gbaslot_rom;

+ 	char* _bios_arm9, *_bios_arm7;

+@@ -109,5 +104,2 @@
+ #endif

+-	char* _slot1;

+-	char *_slot1_fat_dir;

+-	char* _console_type;

+ 	char* _advanscene_import;

+--- a/desmume/src/frontend/posix/gtk/main.cpp
++++ b/desmume/src/frontend/posix/gtk/main.cpp
+@@ -3555,12 +3555,9 @@
+ 
+-static void
+-handle_open(GApplication *application,
+-            GFile **files,
+-            gint n_files,
+-            const gchar *hint,
++static gint
++ignore_command_line(GApplication *application,
++            GApplicationCommandLine *command_line,
+             gpointer user_data)
+ {
+-    configured_features *my_config = static_cast<configured_features*>(user_data);
+-    my_config->nds_file = g_file_get_path(files[0]);
+     common_gtk_main(application, user_data);
++    return 0;
+ }
+@@ -3584,6 +3581,5 @@
+ 
+-  // TODO: pass G_APPLICATION_HANDLES_COMMAND_LINE instead.
+-  GtkApplication *app = gtk_application_new("org.desmume.DeSmuME", G_APPLICATION_HANDLES_OPEN);
++  GtkApplication *app = gtk_application_new("org.desmume.DeSmuME", G_APPLICATION_HANDLES_COMMAND_LINE);
+   g_signal_connect (app, "activate", G_CALLBACK(common_gtk_main), &my_config);
+-  g_signal_connect (app, "open", G_CALLBACK(handle_open), &my_config);
++  g_signal_connect (app, "command-line", G_CALLBACK(ignore_command_line), &my_config);
+   g_action_map_add_action_entries(G_ACTION_MAP(app),
diff --git a/games-emulation/desmume/metadata.xml b/games-emulation/desmume/metadata.xml
index 7b0fa88f32e9..52b0e3d68a46 100644
--- a/games-emulation/desmume/metadata.xml
+++ b/games-emulation/desmume/metadata.xml
@@ -5,7 +5,13 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
+	<use>
+		<flag name="gdb">Enable support for the remote GDB stub</flag>
+		<flag name="openal">Use <pkg>media-libs/openal</pkg> for microphone input</flag>
+		<flag name="wifi">Enable support for Wi-Fi (experimental and discouraged)</flag>
+	</use>
 	<upstream>
+		<remote-id type="github">TASVideos/desmume</remote-id>
 		<remote-id type="sourceforge">desmume</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index d44756fd1a07..d03f635ae11c 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1,6 +1,6 @@
 DIST dolphin-5.0_p20200705.tar.gz 41580877 BLAKE2B 78fce8cb10543857633d66789999b0ebb8f195e10652b9316f3346d5c84797dea96a31f509f86cb9470b4b9677ca58c4a865494121277cd0bc7dcc93932da9f4 SHA512 8b1aed8c98ff7205d7b1716aea3faad0bfa3d1ff3fe3a616431a421ae62592a57887e18295276b7a0fee52d19e641b72d5dc00e071cefea7fbe40adc9f3f01a1
 DIST dolphin-5.0_p20210506.tar.gz 42098693 BLAKE2B bb9e5b5eb344bd944753c0198d5835109399fdfae46e6858833e5f279ff1979d39e0c512bedb96a91a1241fff525c6f945d16ce1a6b6cc22798490d73b853862 SHA512 5d23e9356995011a0e7b07622d58c8dddc5134a4ec83b3d9343b9eca8d0d2c200ea8c9a299c6aa2550ca74d8e28e258531368f7c167fe620053eb2a0f73b1f2f
 EBUILD dolphin-5.0_p20200705.ebuild 4421 BLAKE2B b0598e6e1ab9d723c8fb0c8cf55c3f7ea10025be78c8c184ab8bd50d42995a84d9fe918fe187c24f955139033db80fe8ac30bfdacbbe32d97b9b007e43a3092b SHA512 79b8dd2d3fb337c67e7d59784f97ae26ca6575fc192fdef7307c3061fe4e620d597c753e6692f84341738b437c3d1a53dcf733113f6708eae44c0595d4628200
-EBUILD dolphin-5.0_p20210506.ebuild 4777 BLAKE2B 63029795ac224659226c921ddde2c395698017d009049363e38d191730915188863d623a88e5d0e5a9a88141c5aeb8d23fb7b5f3c900d4681c78a1d8b94a6363 SHA512 2606cf299d49f5e0108f62bfb3aa3670ee66393605313499375b63fde425d95760b75b67003296e0a89f8e9feaceabe05bcdb2f1837274dc4856321a22d2ac83
+EBUILD dolphin-5.0_p20210506.ebuild 4776 BLAKE2B c57e99a792364b830e2e341cdac7810a0fd1d3df80e46b04767be72f710010543c67d780194552df739eedbd553bd1382a89114be9c2b51843bee19d6809614e SHA512 9e3d28ac322cbe22059e579f280113c3c673f2dba81b8a059f3f54154c958eaa7850e61deb1fc6debf344b7c03fe12e0a7abfc9453a8e3ac6793964fc06cfb36
 EBUILD dolphin-9999.ebuild 4790 BLAKE2B 7265a71932941ab75c1836237b380be893563c532e45e414d6880cb8d2e446ff53718a3b961b6eb1a3a04724a9e058f2cf432854d608e0ff6a79e8f01b87b638 SHA512 535fcef911387f2ee2f271a0b42ca36065030640728d745b96cdaae2c4744eda626c171576459d29abb6ee7d0ece31d64417029f39cd166ce7197945973bc5bc
 MISC metadata.xml 856 BLAKE2B 982e3d9ee65ed158e831ccb72d144944eaab8efd8f535f120f2d9e14f8332a980244bb23ee7fe0ca6c1ca8b6f2cdc6c1c766439b4416e17fc8df93fc24ca7655 SHA512 994efa4a7b1504a2d02f4d470382c212f0b9c2f929bbc67483b1a4efa4e68d4422216737dca65977ad99afd26fb6772224f6b1902a0eb6b869f155cf010aff33
diff --git a/games-emulation/dolphin/dolphin-5.0_p20210506.ebuild b/games-emulation/dolphin/dolphin-5.0_p20210506.ebuild
index 9ca2ed316a3a..2a9debffb0ff 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20210506.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20210506.ebuild
@@ -16,7 +16,7 @@ else
 	inherit vcs-snapshot
 	commit=eb5cd9be78c76b9ccbab9e5fbd1721ef6876cd68
 	SRC_URI="https://github.com/dolphin-emu/dolphin/archive/${commit}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="amd64 ~arm64"
 fi
 
 DESCRIPTION="Gamecube and Wii game emulator"
diff --git a/games-emulation/emutos/Manifest b/games-emulation/emutos/Manifest
index 177a4b5aa1b7..10b54eaaa18c 100644
--- a/games-emulation/emutos/Manifest
+++ b/games-emulation/emutos/Manifest
@@ -1,6 +1,6 @@
-DIST emutos-192k-0.9.12.zip 1655923 BLAKE2B 2bc874c761d77d6b80e0ebf35e487951db866ce30c74bc91df155b3e6f58ec004de9fbb6e8402504eda2c3369ed783b8b53f8e80e7fcf05652c14dacd11eedc3 SHA512 7e75f645ff72a2dc7574cf005234261411b39af77113b329835d0d398e60c51d7451dd949f0cecdbdc4adc03561b43bb0449d1460f0dec547894b7bde29b01d1
-DIST emutos-256k-0.9.12.zip 2038241 BLAKE2B e287357877efe2346bd1936768f6c56e655e4b7d249545f4e3827e02c295817e6586477b68058e95690562c65a9085fa9e712da540727d93e12789f5bde325aa SHA512 18f43d2fc215e686fabafe0413b88d3593dc7ef931191541690527fbe7fcb4ff08ee946f75ceadf25d09c05fb69ae7d71230cc5b36ec42c7774fc5770b8a276d
-DIST emutos-512k-0.9.12.zip 301555 BLAKE2B 6341b4ac4fad707d81ab621e2952b2a92b139947b0ebc522983163fa86f308c595482f8b6caa23472bb022f1380f0a5963532b119c53676fe65b5115cde6d413 SHA512 0c68c76dede7d9a36c408f3a1bced2b710b1ad87fee5ba204e1b8c19a48ef1c51942eb766355c20f5cf95cc885423fd2750dc212c5dffe25b1d28620cc117854
-DIST emutos-aranym-0.9.12.zip 273147 BLAKE2B 863da12081f32ee665180d4536666a6558b475c6413e4f95aacd333f3a7d9a42820a04376b1b0484a975177abc3d41b2765c9147231829724e721dd477ebd328 SHA512 351104f097e5812be21fb30c41c829e62f127da39cc190ca60d26d20d94fedfb21493265b6b7113b9babb262dc30e0b87f1e235c90339f221b559578eacc5c44
-EBUILD emutos-0.9.12.ebuild 802 BLAKE2B 18feff9d978793736da6fe6e85b0dbd985540e7d68d0a5b41d2aa8224b8bc4b1cb4556900f6bbe14568f3ee62f54c6358babfbd72be0f3d1267b601fc2b57a5b SHA512 b2bdfb086a0d78fcec282ead3a7ac0033cddc24331e2b129979c2ec8f5ed2398e416e30e0fb2f1dd3c14f206429a928196e623c27ecd6fa8f5ae4262b740e6b4
-MISC metadata.xml 329 BLAKE2B 3751df88821c56b414164dd686cc65be252f2968ecf92c93f2c6b3c6bd88a77bdc28a2fd33f4d08d2956e6e4d42c3304c0bc7a01226551850c44a438f1d2dd5e SHA512 5af91295f3ae78fb613b90a573aa870ac2e5e00623f305a00981637ac480320f2df7b16f35155e880344254521a0d08adf12ae92cffa15d4a3c3dab2aa8d661a
+DIST emutos-192k-1.0.1.zip 1794284 BLAKE2B 77742519f04d98f8fe6bf22f04bb73944370e58596d9001c2c24726cb1fc172fef4ad982a555e2f1a4c4b539028900320fb40cf96ec0cb87aa618d9f7b14ed7e SHA512 30c965f40b66879cc0e5f0b6801485d2362751d22f0deba1e12dddff05bb526c972c7cafdee7cb81866160a1b97fe56e28f5d5ad4b9c01c68adb840a3c27e355
+DIST emutos-256k-1.0.1.zip 2239148 BLAKE2B db1e6eafa44e76ad50efe1cffe60c22b20e40de60e1ca67bd9f2f491aa0fba10aae60e6bfbbb16327b2184d104d2bd4e0d036174b8fe5f510dd6a9fcb481fa72 SHA512 c185e0dcc6fae8bd4a3788f2271330cbe5e49834ae51cbafbad04160895bae9c0210cf05d77bd80bdfd22d29aab85048083c471eefd5092d2e19465c897c48a3
+DIST emutos-512k-1.0.1.zip 316348 BLAKE2B bf3f3c932df8e87655006abd7a142765f0905942f9709d02c705a7269c5a4c3a3795d6afed007848c54734c80f3d6c08549a641908f2ead99f0c55a564515982 SHA512 8e3f63d218bc82aa3739c74ab8f9fdad92661de478b2953f60b07de3233a855c2e4dfb14a9bb3cfb81a1915d6d4295736dd74ea50f0af055aa3fc5336fc4f04f
+DIST emutos-aranym-1.0.1.zip 287821 BLAKE2B 96581289a1be8f598db4676aa275ce79f3affd36e0dc53466d275f0cd01871ab48b73440e18cba1bf74fa9a35a4ad72d84804231fbc1e11cd151db2139f25b2d SHA512 2178d646e0ab6c128fcf2eaf690597514d26e8dddd7e2b599ee05fa4bd18589489315f11777fdf1f20fadaa63d5c32dc116988d92149cb7f826c72e66fe9fcd8
+EBUILD emutos-1.0.1.ebuild 760 BLAKE2B 6855071804f6f987b8e1c7c296d0ae7459d486c85d32c5ae238a0e0d3356054326217551bf917e792fe4f167c069f9c525df0d46b5c72103b303bfece8ee1449 SHA512 8c585135d2ffb9b0d00f8bc6dbd09c56b04dd356293ba4d591c989e7500c0f4b29e2dcfb3bf29e6eb233f42c84f0087fa85c9a2175cfaf0768c0f4bee4485549
+MISC metadata.xml 353 BLAKE2B a8a802a56394060c7b6a9d5988f2e0eb22675cdea797ca03ef089cdce9173b78128687fea6360286c72b2f0bdd52323a458589bafd119514fc28eeca206f310e SHA512 bf5f0534406234f01cb8f1ea9caa1dfa107f0ae5c412bc2ba401512258ff000fe922d41815db5cf7d32d0b096a7c42a21f4e628e9284e3fc04778764e3cdfb1d
diff --git a/games-emulation/emutos/emutos-0.9.12.ebuild b/games-emulation/emutos/emutos-1.0.1.ebuild
index 1a35e794e98f..5772fe464518 100644
--- a/games-emulation/emutos/emutos-0.9.12.ebuild
+++ b/games-emulation/emutos/emutos-1.0.1.ebuild
@@ -11,28 +11,24 @@ VERSIONS=(
 )
 
 DESCRIPTION="Single-user single-tasking operating system for 32-bit Atari computer emulators"
-HOMEPAGE="http://emutos.sourceforge.net"
+HOMEPAGE="https://emutos.sourceforge.net"
 SRC_URI=$(printf "mirror://sourceforge/emutos/${PN}-%s-${PV}.zip\n" "${VERSIONS[@]}")
+S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug"
 
 BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}"
-
 src_install() {
 	insinto /usr/share/${PN}
+	doins */*.{img,sym}
 
-	doins */*.img
-	use debug && doins */*.sym
-
-	local VERSION
-	for VERSION in "${VERSIONS[@]}"; do
-		newdoc "${PN}-${VERSION}-${PV}"/readme.txt readme-"${VERSION}".txt
+	local version
+	for version in "${VERSIONS[@]}"; do
+		newdoc ${PN}-${version}-${PV}/readme.txt readme-${version}.txt
 	done
 
-	dodoc "${PN}-512k-${PV}"/doc/{announce,authors,bugs,changelog,emudesk,incompatible,status,todo,xhdi}.txt
+	dodoc ${PN}-512k-${PV}/doc/{announce,authors,bugs,changelog,emudesk,incompatible,status,todo,xhdi}.txt
 }
diff --git a/games-emulation/emutos/metadata.xml b/games-emulation/emutos/metadata.xml
index 3f4ee01ee5eb..d806a97d1162 100644
--- a/games-emulation/emutos/metadata.xml
+++ b/games-emulation/emutos/metadata.xml
@@ -5,6 +5,7 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="sourceforge">emutos</remote-id>
 	</upstream>
diff --git a/games-emulation/fbzx/Manifest b/games-emulation/fbzx/Manifest
index 2a060d525b5e..21ca6a10fd1a 100644
--- a/games-emulation/fbzx/Manifest
+++ b/games-emulation/fbzx/Manifest
@@ -1,4 +1,4 @@
-AUX fbzx-3.0.0-gentoo.patch 6059 BLAKE2B 60850bd4bf8ca51ba2dcb251f0216107eb7887e0e2346b460e0968fc4c87ae83ef0de0333ecde9e485a5949569e87254cfa81a96b6a9521234cc8a5811dc534f SHA512 5a4b48cbc75f14bbc24b693792510f8837670a1ee6de40c7be15c2ffc7ac05be20c1170b514539907517527eef0be496efaa7b407e3f13dc120dd7894a3cd7fe
-DIST fbzx-3.0.0.tar.gz 435239 BLAKE2B 5105995a7972c7310628c0e4d3af7f1a749192bc24ac312e493d8821edf5ec329a65eedcbfa6c8479a4f4d134ca730acef7ee27ef2f89253f2e179c7cf8c2bf1 SHA512 cf2a01a1dde62da03c1f04e91f226859ae4cf06d099597dc1a1554c4ff9782dd287f9d924083829eee40cf0450c053d818f963f68381f9e16e0e61ca1f3d3083
-EBUILD fbzx-3.0.0-r1.ebuild 888 BLAKE2B 476e145cba1d21d8bd4aa1a533cc7548e6666ad73127dbbfeda9f4bbdb7d8d5e9bc7561705907f98c9f1fab65542c3312e28f9fef09d5c545ad7ab4b4e1a5cf9 SHA512 dee4af74a2bf67953cd1aed76b4e209683660102f807f3b93efe681dab8fb557b8c12877a259c9d88096774e2ae5a2209de1ee13ff6ec99ed3f37d767cf0a391
-MISC metadata.xml 333 BLAKE2B b7e32a98bd1f4530fd7ea419607e8ff57998633131c3cde906f698e91810af4b6750e5c70b3a17e1ebaa532022952bd8d0bd915a41fb755d30ca1759b3c0c189 SHA512 d865ef840f0a446091249c24b36dc7d5cca2aaeac727d0f1d45bf8699e7d55d396cca469b02e84e26cc056f506051bb81557c0cf33d74a5a01a8d114ed3f3554
+AUX fbzx-4.6.0-makefile.patch 2519 BLAKE2B 313833b48099a835ec52662867aec920eda1c04f441497ccb8725d92959412cc1f97d57de15e655d7a5b93ff5b4721ded0569340d6ab5fc3e0d00c46a25510e7 SHA512 05e5138aa5c959438a8d5f1122cf3d8a9b836e95aa491c1ae97629ce7d128a087fbe68ba02578390a51f1f18fc4c5d878cda6a5c426f8dce8c0fe36c2cf7a01b
+DIST fbzx_4.8.0.tar.bz2 307530 BLAKE2B 465bac143e034604b9f7fb8cf87ef4dcdcec09e7208873350c0c2c63b560c2fc130fa1a665e91156e88563600222a1dc801fcc02c532009f2ebccb5e7946ca14 SHA512 f56a9083a741f98a77e2b9673e569341816cef943973c65c1aa6cb01ad6c2bcd5b663d3db35193196770c3eb046e8a8c15d83c2c122700d2116ad34c5d796cdc
+EBUILD fbzx-4.8.0.ebuild 1111 BLAKE2B b80fefc0a9648506ce3d5021337bb4b8e1f02bf97c1cb4ab9245a24677244fb8fad44819c5f509118e0e31d77e7d3c38bb2c952e7380258efa457fa78c10e745 SHA512 2cd81bcd6b8c127d8020393e09ddec179cc8876f1b160cffaee981b554668306a47b7966d9c82c15116129f52299e23ec0f68a90e7a7995150e1f78c5ec9ad92
+MISC metadata.xml 333 BLAKE2B 2349daccfe2d6e50e25772dea78c17f7600fdc0373c3790a6c756d2f46fb18e9ec815e50dfb487c4b8ab40dbf51379985ab81c43e9d16095917edd99b01f8072 SHA512 5bb05f9408aa3974b309cc18abeab587606ed1627f72aa8bcbd15e67d7ebc5e5bc8d393179cc7a3f0a4c0659bbfb2e74b6afb4af53af3525edae7fe641d0ecf6
diff --git a/games-emulation/fbzx/fbzx-3.0.0-r1.ebuild b/games-emulation/fbzx/fbzx-3.0.0-r1.ebuild
deleted file mode 100644
index ffe2b98753cb..000000000000
--- a/games-emulation/fbzx/fbzx-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop toolchain-funcs
-
-DESCRIPTION="Full Screen Sinclair Spectrum emulator"
-HOMEPAGE="https://github.com/rastersoft/fbzx"
-SRC_URI="https://github.com/rastersoft/fbzx/archive/3.0.0.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	media-libs/libsdl[video]
-	media-sound/pulseaudio
-	media-libs/alsa-lib
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-)
-
-src_prepare() {
-	sed -i -e "s|/usr/share/|/usr/share/${PN}/|g" src/llscreen.cpp || die
-
-	tc-export PKG_CONFIG
-
-	default
-}
-
-src_install() {
-	dobin src/fbzx
-
-	insinto /usr/share/${PN}
-	doins -r data/{keymap.bmp,spectrum-roms}
-
-	dodoc AMSTRAD CAPABILITIES FAQ PORTING README* TODO VERSIONS
-	doicon data/fbzx.svg
-	make_desktop_entry fbzx FBZX
-}
diff --git a/games-emulation/fbzx/fbzx-4.8.0.ebuild b/games-emulation/fbzx/fbzx-4.8.0.ebuild
new file mode 100644
index 000000000000..b69852a2a19c
--- /dev/null
+++ b/games-emulation/fbzx/fbzx-4.8.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Full Screen Sinclair Spectrum emulator"
+HOMEPAGE="http://www.rastersoft.com/programas/fbzx.html"
+SRC_URI="http://www.rastersoft.com/descargas/fbzx/${PN}_${PV}.tar.bz2"
+S="${WORKDIR}/${PN}_${PV}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa pulseaudio"
+
+RDEPEND="
+	media-libs/libsdl2[joystick,video]
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.6.0-makefile.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i "s|/usr/share|${EPREFIX}/usr/share/${PN}|" src/llscreen.cpp || die
+}
+
+src_compile() {
+	tc-export CXX PKG_CONFIG
+
+	emake ALSA=$(usex alsa) PULSE=$(usex pulseaudio)
+}
+
+src_install() {
+	dobin src/${PN}
+	dodoc AMSTRAD CAPABILITIES FAQ HISTORY.md README.{TZX,md} TODO
+	doicon data/${PN}.svg
+	domenu data/${PN}.desktop
+
+	insinto /usr/share/${PN}
+	doins -r data/spectrum-roms
+
+	insinto /usr/share/${PN}/${PN}
+	doins data/keymap.bmp
+}
diff --git a/games-emulation/fbzx/files/fbzx-3.0.0-gentoo.patch b/games-emulation/fbzx/files/fbzx-3.0.0-gentoo.patch
deleted file mode 100644
index f9751d7486dd..000000000000
--- a/games-emulation/fbzx/files/fbzx-3.0.0-gentoo.patch
+++ /dev/null
@@ -1,116 +0,0 @@
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -1,78 +1,74 @@
--CC=g++ -c -O2
--CPP=g++ -c -O2
--LN=g++ -O2
--
- CFLAGS += `pkg-config --cflags sdl libpulse-simple alsa` -D D_SOUND_PULSE -D D_SOUND_ALSA -D D_SOUND_OSS
--CPPFLAGS += `pkg-config --cflags sdl libpulse-simple alsa` -D D_SOUND_PULSE -D D_SOUND_ALSA -D D_SOUND_OSS
-+CXXFLAGS += `${PKG_CONFIG} --cflags sdl libpulse-simple alsa` -D D_SOUND_PULSE -D D_SOUND_ALSA -D D_SOUND_OSS
- LDFLAGS += `pkg-config --libs sdl libpulse-simple alsa`
- 
- 
- fbzx: cargador.o cmdline.o computer.o emulator.o keyboard.o llscreen.o llsound.o menus.o microdrive.o osd.o screen.o signals.o spk_ay.o tape.o Z80free.o Z80free_codes.o Z80free_codesCB.o Z80free_codesED.o Z80free_codesDD.o Z80free_codesFD.o Z80free_codesDDCB.o Z80free_codesFDCB.o 
--	$(LN) -o fbzx cargador.o cmdline.o computer.o emulator.o keyboard.o llscreen.o llsound.o menus.o microdrive.o osd.o screen.o signals.o spk_ay.o tape.o Z80free.o Z80free_codes.o Z80free_codesCB.o Z80free_codesED.o Z80free_codesDD.o Z80free_codesFD.o Z80free_codesDDCB.o Z80free_codesFDCB.o  $(LDFLAGS)
-+	$(CXX) -o fbzx cargador.o cmdline.o computer.o emulator.o keyboard.o llscreen.o llsound.o menus.o microdrive.o osd.o screen.o signals.o spk_ay.o tape.o Z80free.o Z80free_codes.o Z80free_codesCB.o Z80free_codesED.o Z80free_codesDD.o Z80free_codesFD.o Z80free_codesDDCB.o Z80free_codesFDCB.o $(LDFLAGS)
- 
- Z80free.o: z80free/Z80free.c z80free/Z80free.h
--	$(CC) -o Z80free.o z80free/Z80free.c
-+	$(CXX) -c $(CFLAGS) -o Z80free.o z80free/Z80free.c
- 
- Z80free_codes.o: z80free/Z80free_codes.c z80free/Z80free.h
--	$(CC) -o Z80free_codes.o z80free/Z80free_codes.c
-+	$(CXX) -c $(CFLAGS) -o Z80free_codes.o z80free/Z80free_codes.c
- 	
- Z80free_codesCB.o: z80free/Z80free_codesCB.c z80free/Z80free.h
--	$(CC) -o Z80free_codesCB.o z80free/Z80free_codesCB.c
-+	$(CXX) -c $(CFLAGS) -o Z80free_codesCB.o z80free/Z80free_codesCB.c
- 
- Z80free_codesED.o: z80free/Z80free_codesED.c z80free/Z80free.h
--	$(CC) -o Z80free_codesED.o z80free/Z80free_codesED.c
-+	$(CXX) -c $(CFLAGS) -o Z80free_codesED.o z80free/Z80free_codesED.c
- 	
- Z80free_codesDD.o: z80free/Z80free_codesDD.c z80free/Z80free.h
--	$(CC) -o Z80free_codesDD.o z80free/Z80free_codesDD.c
-+	$(CXX) -c $(CFLAGS) -o Z80free_codesDD.o z80free/Z80free_codesDD.c
- 	
- Z80free_codesFD.o: z80free/Z80free_codesFD.c z80free/Z80free.h
--	$(CC) -o Z80free_codesFD.o z80free/Z80free_codesFD.c
-+	$(CXX) -c $(CFLAGS) -o Z80free_codesFD.o z80free/Z80free_codesFD.c
- 
- Z80free_codesDDCB.o: z80free/Z80free_codesDDCB.c z80free/Z80free.h
--	$(CC) -o Z80free_codesDDCB.o z80free/Z80free_codesDDCB.c
-+	$(CXX) -c $(CFLAGS) -o Z80free_codesDDCB.o z80free/Z80free_codesDDCB.c
- 	
- Z80free_codesFDCB.o: z80free/Z80free_codesFDCB.c z80free/Z80free.h
--	$(CC) -o Z80free_codesFDCB.o z80free/Z80free_codesFDCB.c
-+	$(CXX) -c $(CFLAGS) -o Z80free_codesFDCB.o z80free/Z80free_codesFDCB.c
- 
- cargador.o: cargador.cpp spk_ay.hh keyboard.hh emulator.hh screen.hh osd.hh z80free/Z80free.h computer.hh signals.hh llscreen.hh tape.hh cargador.hh
--	$(CPP) $(CPPFLAGS) -o cargador.o cargador.cpp
-+	$(CXX) -c $(CXXFLAGS) -o cargador.o cargador.cpp
- 
- cmdline.o: cmdline.cpp cmdline.hh
--	$(CPP) $(CPPFLAGS) -o cmdline.o cmdline.cpp
-+	$(CXX) -c $(CXXFLAGS) -o cmdline.o cmdline.cpp
- 
- computer.o: computer.cpp z80free/Z80free.h llsound.hh keyboard.hh computer.hh screen.hh signals.hh llscreen.hh tape.hh emulator.hh osd.hh spk_ay.hh microdrive.hh menus.hh
--	$(CPP) $(CPPFLAGS) -o computer.o computer.cpp
-+	$(CXX) -c $(CXXFLAGS) -o computer.o computer.cpp
- 
- emulator.o: emulator.cpp spk_ay.hh keyboard.hh llsound.hh cmdline.hh computer.hh screen.hh signals.hh llscreen.hh z80free/Z80free.h tape.hh emulator.hh osd.hh microdrive.hh menus.hh cargador.hh
--	$(CPP) $(CPPFLAGS) -o emulator.o emulator.cpp
-+	$(CXX) -c $(CXXFLAGS) -o emulator.o emulator.cpp
- 
- keyboard.o: keyboard.cpp menus.hh llscreen.hh llsound.hh computer.hh screen.hh signals.hh z80free/Z80free.h tape.hh emulator.hh osd.hh keyboard.hh
--	$(CPP) $(CPPFLAGS) -o keyboard.o keyboard.cpp
-+	$(CXX) -c $(CXXFLAGS) -o keyboard.o keyboard.cpp
- 
- llscreen.o: llscreen.cpp osd.hh font.h llscreen.hh
--	$(CPP) $(CPPFLAGS) -o llscreen.o llscreen.cpp
-+	$(CXX) -c $(CXXFLAGS) -o llscreen.o llscreen.cpp
- 
- llsound.o: llsound.cpp emulator.hh screen.hh osd.hh z80free/Z80free.h computer.hh signals.hh llscreen.hh tape.hh llsound.hh
--	$(CPP) $(CPPFLAGS) -o llsound.o llsound.cpp
-+	$(CXX) -c $(CXXFLAGS) -o llsound.o llsound.cpp
- 
- menus.o: menus.cpp spk_ay.hh microdrive.hh z80free/Z80free.h keyboard.hh llsound.hh llscreen.hh menus.hh tape.hh signals.hh emulator.hh screen.hh osd.hh computer.hh cargador.hh
--	$(CPP) $(CPPFLAGS) -o menus.o menus.cpp
-+	$(CXX) -c $(CXXFLAGS) -o menus.o menus.cpp
- 
- microdrive.o: microdrive.cpp osd.hh emulator.hh screen.hh z80free/Z80free.h computer.hh signals.hh llscreen.hh tape.hh microdrive.hh
--	$(CPP) $(CPPFLAGS) -o microdrive.o microdrive.cpp
-+	$(CXX) -c $(CXXFLAGS) -o microdrive.o microdrive.cpp
- 
- osd.o: osd.cpp osd.hh
--	$(CPP) $(CPPFLAGS) -o osd.o osd.cpp
-+	$(CXX) -c $(CXXFLAGS) -o osd.o osd.cpp
- 
- screen.o: screen.cpp keyboard.hh computer.hh screen.hh signals.hh llscreen.hh z80free/Z80free.h tape.hh emulator.hh osd.hh
--	$(CPP) $(CPPFLAGS) -o screen.o screen.cpp
-+	$(CXX) -c $(CXXFLAGS) -o screen.o screen.cpp
- 
- signals.o: signals.cpp signals.hh
--	$(CPP) $(CPPFLAGS) -o signals.o signals.cpp
-+	$(CXX) -c $(CXXFLAGS) -o signals.o signals.cpp
- 
- spk_ay.o: spk_ay.cpp spk_ay.hh llsound.hh computer.hh screen.hh signals.hh llscreen.hh z80free/Z80free.h tape.hh emulator.hh osd.hh
--	$(CPP) $(CPPFLAGS) -o spk_ay.o spk_ay.cpp
-+	$(CXX) -c $(CXXFLAGS) -o spk_ay.o spk_ay.cpp
- 
- tape.o: tape.cpp z80free/Z80free.h tape.hh signals.hh emulator.hh screen.hh osd.hh computer.hh llscreen.hh
--	$(CPP) $(CPPFLAGS) -o tape.o tape.cpp
-+	$(CXX) -c $(CXXFLAGS) -o tape.o tape.cpp
- 
---- a/src/menus.cpp
-+++ b/src/menus.cpp
-@@ -1691,7 +1691,7 @@
- 
- void keyboard_menu() {
- 
--	llscreen->paint_picture("fbzx/keymap.bmp");
-+	llscreen->paint_picture("keymap.bmp");
- 	print_copy();
- 	wait_key();
- 	llscreen->clear_screen();
diff --git a/games-emulation/fbzx/files/fbzx-4.6.0-makefile.patch b/games-emulation/fbzx/files/fbzx-4.6.0-makefile.patch
new file mode 100644
index 000000000000..b6936ecb39e2
--- /dev/null
+++ b/games-emulation/fbzx/files/fbzx-4.6.0-makefile.patch
@@ -0,0 +1,60 @@
+Respect CXX, CXXFLAGS, CPPFLAGS, and PKG_CONFIG.
+Add way to choose audio backend (alsa, pulse, or neither).
+
+Alternatively, cmake migration has been proposed upstream:
+https://gitlab.com/rastersoft/fbzx/-/merge_requests/10
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -3,8 +3,14 @@
+ CC=g++ -c $(FLAGS)
+-CXX=g++ -c $(FLAGS)
+-LN=g++
++LN=$(CXX)
+ 
+-CFLAGS += `pkg-config --cflags sdl2 libpulse-simple alsa` -D D_SOUND_PULSE -D D_SOUND_ALSA
+-CXXFLAGS += `pkg-config --cflags sdl2 libpulse-simple alsa` -D D_SOUND_PULSE -D D_SOUND_ALSA
+-LDFLAGS += `pkg-config --libs sdl2 libpulse-simple alsa`
++CXXFLAGS:=-c $(CXXFLAGS) $(CPPFLAGS) $(shell $(PKG_CONFIG) --cflags sdl2)
++LDFLAGS:=$(LDFLAGS) $(shell $(PKG_CONFIG) --libs sdl2)
++ifeq ($(ALSA),yes)
++	CXXFLAGS+=$(shell $(PKG_CONFIG) --cflags alsa) -DD_SOUND_ALSA
++	LDFLAGS+=$(shell $(PKG_CONFIG) --libs alsa)
++endif
++ifeq ($(PULSE),yes)
++	CXXFLAGS+=$(shell $(PKG_CONFIG) --cflags libpulse-simple) -DD_SOUND_PULSE
++	LDFLAGS+=$(shell $(PKG_CONFIG) --libs libpulse-simple)
++endif
+ 
+@@ -15,24 +21,24 @@
+ Z80free.o: z80free/Z80free.c z80free/Z80free.h
+-	$(CXX) -o Z80free.o z80free/Z80free.c
++	$(CXX) $(CXXFLAGS) -o Z80free.o z80free/Z80free.c
+ 
+ Z80free_codes.o: z80free/Z80free_codes.c z80free/Z80free.h
+-	$(CXX) -o Z80free_codes.o z80free/Z80free_codes.c
++	$(CXX) $(CXXFLAGS) -o Z80free_codes.o z80free/Z80free_codes.c
+ 
+ Z80free_codesCB.o: z80free/Z80free_codesCB.c z80free/Z80free.h
+-	$(CXX) -o Z80free_codesCB.o z80free/Z80free_codesCB.c
++	$(CXX) $(CXXFLAGS) -o Z80free_codesCB.o z80free/Z80free_codesCB.c
+ 
+ Z80free_codesED.o: z80free/Z80free_codesED.c z80free/Z80free.h
+-	$(CXX) -o Z80free_codesED.o z80free/Z80free_codesED.c
++	$(CXX) $(CXXFLAGS) -o Z80free_codesED.o z80free/Z80free_codesED.c
+ 
+ Z80free_codesDD.o: z80free/Z80free_codesDD.c z80free/Z80free.h
+-	$(CXX) -o Z80free_codesDD.o z80free/Z80free_codesDD.c
++	$(CXX) $(CXXFLAGS) -o Z80free_codesDD.o z80free/Z80free_codesDD.c
+ 
+ Z80free_codesFD.o: z80free/Z80free_codesFD.c z80free/Z80free.h
+-	$(CXX) -o Z80free_codesFD.o z80free/Z80free_codesFD.c
++	$(CXX) $(CXXFLAGS) -o Z80free_codesFD.o z80free/Z80free_codesFD.c
+ 
+ Z80free_codesDDCB.o: z80free/Z80free_codesDDCB.c z80free/Z80free.h
+-	$(CXX) -o Z80free_codesDDCB.o z80free/Z80free_codesDDCB.c
++	$(CXX) $(CXXFLAGS) -o Z80free_codesDDCB.o z80free/Z80free_codesDDCB.c
+ 
+ Z80free_codesFDCB.o: z80free/Z80free_codesFDCB.c z80free/Z80free.h
+-	$(CXX) -o Z80free_codesFDCB.o z80free/Z80free_codesFDCB.c
++	$(CXX) $(CXXFLAGS) -o Z80free_codesFDCB.o z80free/Z80free_codesFDCB.c
+ 
diff --git a/games-emulation/fbzx/metadata.xml b/games-emulation/fbzx/metadata.xml
index 865a8b592e90..4af766d38aac 100644
--- a/games-emulation/fbzx/metadata.xml
+++ b/games-emulation/fbzx/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">rastersoft/fbzx</remote-id>
+		<remote-id type="gitlab">rastersoft/fbzx</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-emulation/fceux/Manifest b/games-emulation/fceux/Manifest
index 1fff737798c8..d8e200ebc7a0 100644
--- a/games-emulation/fceux/Manifest
+++ b/games-emulation/fceux/Manifest
@@ -1,7 +1,4 @@
 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
 DIST fceux-2.3.0.src.tar.gz 20779030 BLAKE2B 0d9a0e1f326bdcde4e360a03755c9d807a59e3f3826017e2923527f3ec214bec4c9737f98a8abc4e4971098d127ce8e95eb4142fa8d0bd71109190e6d2c93861 SHA512 46b53f0c4c790ae4f7d5e800adf81cce3c7ccf4b06f972d46e29c0170485e291516709a8c28b26c762d535453e280a6c6de935869c7674bb135c3dca2e266407
-EBUILD fceux-2.2.3-r100.ebuild 1461 BLAKE2B fb9e6e142dde088ba609a2fbaeb735656b9db3959cd6cee1ca8ea62c50b2833af1834382ddf2d259b2ddb8da3f02fce79e0a9ad50b251aa72c8419e6c24c12ae SHA512 f0c5f23a10685695b49a90f793db8096ea5f0e5fef75951ebeb1bd7f9dca778a1fd5adfacacd5e7c21c9f0de16358436eea95da6e4b01a2604ff5038722c1ba9
-EBUILD fceux-2.3.0.ebuild 1365 BLAKE2B 81727ead24f169c5f0c058a370a93eef45801cfbc40c8ab6b6fd5e010ad0ee98f6a7e24eb3f27cd00f442ec2c9b5283e740edca5888508018064648ba21e6e60 SHA512 74c253db00315b30b667ba055238519e6e01e98b8d04703f5c2e4f0e244b74d3e5bafe04a034c6560342dda5536a406817af2661d55aeba2086eb989c8f17d0b
-MISC metadata.xml 487 BLAKE2B 41b6ee780f57ccf7755027e6267ea0bffb92d971df83bd3d40580bb0e7f135c5dcb8e4bbb507b30e5a560cfc74abf0a2c1a0eb5aaefd1e34c11b4bf9e56803d1 SHA512 ce90a3403f05acd17ad52c7abbbec444c02e01b7ab2a8518f3a1978666a99af4684b36a7f4e7c2af79466879813cd7a667e4e37a65dfd434ea082377bf950132
+EBUILD fceux-2.3.0.ebuild 1378 BLAKE2B ce4eec0490df5b30a26ad8411bf8ca4c3687db5258c3b10f9660544bf922a15422deaa14be9d8b14f77e1308bd810976b9a8843bffe80c4e27ccd670101c980d SHA512 341834e56f3fa6a81c335364a0bc072bd1fe2b18a005b8a8996d62c263c208ead299de6ca69bd2724d5dd20a9b6671bd80c9f02bfddfb9266d16bfb748af04e7
+MISC metadata.xml 386 BLAKE2B 7d677f544e044d228273e576a0c61685180b3dbf785d58b1ec8c4b70b5c88ba741aba1e2c293a47e73a14834e83645e3455bb74207c67e6858bab5c9ab0dfb44 SHA512 376ec02a252d5915d5752f85924ce821d38e3da0f62ea18627bb00848aafd846e5c86cdc6cae824e08897b997ed90e1481ab1b831c23d0f4ceb5c5c9c0e35bfa
diff --git a/games-emulation/fceux/fceux-2.2.3-r100.ebuild b/games-emulation/fceux/fceux-2.2.3-r100.ebuild
deleted file mode 100644
index 710e02367ead..000000000000
--- a/games-emulation/fceux/fceux-2.2.3-r100.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 )
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit python-any-r1 desktop lua-single scons-utils toolchain-funcs
-
-DESCRIPTION="A portable Famicom/NES emulator, an evolution of the original FCE Ultra"
-HOMEPAGE="https://fceux.com/"
-SRC_URI="mirror://sourceforge/fceultra/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk logo +lua +opengl"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-RDEPEND="
-	lua? ( ${LUA_DEPS} )
-	media-libs/libsdl[opengl?,video]
-	logo? ( media-libs/gd[png] )
-	opengl? ( virtual/opengl )
-	gtk? ( x11-libs/gtk+:3 )
-	sys-libs/zlib[minizip]
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.2-warnings.patch
-	"${FILESDIR}/${P}-python3.patch"
-)
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	tc-export CC CXX
-}
-
-src_compile() {
-	escons \
-		GTK=0 \
-		CREATE_AVI=1 \
-		SYSTEM_LUA=1 \
-		SYSTEM_MINIZIP=1 \
-		GTK3=$(usex gtk 1 0) \
-		LOGO=$(usex logo 1 0) \
-		OPENGL=$(usex opengl 1 0) \
-		LUA=$(usex lua 1 0)
-}
-
-src_install() {
-	dobin bin/fceux
-
-	doman documentation/fceux.6
-	docompress -x /usr/share/doc/${PF}/documentation /usr/share/doc/${PF}/fceux.chm
-	dodoc -r Authors changelog.txt TODO-SDL bin/fceux.chm documentation
-	rm -f "${D}/usr/share/doc/${PF}/documentation/fceux.6"
-	make_desktop_entry fceux FCEUX
-	doicon fceux.png
-}
diff --git a/games-emulation/fceux/fceux-2.3.0.ebuild b/games-emulation/fceux/fceux-2.3.0.ebuild
index 94313a079d6c..c62cda8abd5f 100644
--- a/games-emulation/fceux/fceux-2.3.0.ebuild
+++ b/games-emulation/fceux/fceux-2.3.0.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	${LUA_DEPS}
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
-	dev-qt/qtopengl:5
+	dev-qt/qtopengl:5[-gles2-only]
 	dev-qt/qtwidgets:5
 	media-libs/libglvnd
 	media-libs/libsdl2[joystick,sound,threads,video]
diff --git a/games-emulation/fceux/files/fceux-2.2.3-python3.patch b/games-emulation/fceux/files/fceux-2.2.3-python3.patch
deleted file mode 100644
index c08c67058d22..000000000000
--- a/games-emulation/fceux/files/fceux-2.2.3-python3.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-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/fceux/metadata.xml b/games-emulation/fceux/metadata.xml
index 4c416fd6a7a3..87755bab0ade 100644
--- a/games-emulation/fceux/metadata.xml
+++ b/games-emulation/fceux/metadata.xml
@@ -5,9 +5,6 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<use>
-		<flag name="logo">Enable the ability to add a logo screen when creating AVIs</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">TASVideos/fceux</remote-id>
 		<remote-id type="sourceforge">fceultra</remote-id>
diff --git a/games-emulation/hatari/Manifest b/games-emulation/hatari/Manifest
index 032b982332b4..a8b801bff3b2 100644
--- a/games-emulation/hatari/Manifest
+++ b/games-emulation/hatari/Manifest
@@ -1,5 +1,7 @@
 AUX hatari-2.2.1-default-rom.patch 698 BLAKE2B 5830bf75aa9039f0fda3f354bef50fa5dc6c7bea658c2f540a39f21f9b52fbb51447d1f1819ca3eebd248a93f7d255e9ef98a912aa908fbb15277a9ed106b853 SHA512 24659ea52cccb641010b08778608d87b4849b605b2825804f63f1285483605fdc2559f6ce6e17a5a71f801981c7bcf5d429dfc84f6dc6e5ed4cad9f1d957482f
 AUX hatari-2.2.1-joystick.patch 2172 BLAKE2B 67be6915d79612d851bcd617637e05d076f8a498194957a21ee6213c77fc0c7b718220afb0749bb2ccfa9322af34b020391fd8be9540dd1f7ed694f510215c2d SHA512 54b73d294dcc061abc4e037515f18bd0aa2e311c97010b687fce5cd90e427aac431bf820a1dd9ce2b2632e1662496e423582d80b1d55f23eef0734f03adfb2b8
-DIST hatari-2.2.1.tar.bz2 4162798 BLAKE2B 51938a649957779652b0debf7f867b2abe2d54fd3bb31086542f9f5970d01a120455e4381a9cb173724fbc7c45359d4009377bfe99038b338142fa5b82723533 SHA512 0e4c148a355a53c9cf79bdd28e5d7bb5f3389c780576017c6ebe2b69465d67522f373945f0e51681120ece24f5f08442265515486d2d7df7a02d9cd94cc44f1e
-EBUILD hatari-2.2.1-r1.ebuild 2161 BLAKE2B 3c1fd9de60d4b7fe8e79e49b0e42e31a57a7aa40357756678f8bdddec7a200886989d2821914b73e585f96b9b87af855a03160526d22a4b5fb2fcc3c994c17db SHA512 29b2311a64c968f6050825ec5a5ab050aaf45f2218ec2918fcbbb2d8f2c2b4203cff1312a66e8d61d8eb4e88a75c5c955e89642fca9208b721e59248a32f1e23
-MISC metadata.xml 619 BLAKE2B 452a04b03222a27e8790a2ce0b38d81899baaf65c9fcdeb22dcec9950cc0fddf027525b23bdb7739fee45ed1daec47071b3d1262006fc3f10c6ff07a8b1bd148 SHA512 6d87d6ab08072cc43e1f42160d0df993dfba7b2f5480261024bdb637f3169062e530029a248c7bee514c604629f6c04c80dd5c609d23bca639a5ef720c266e42
+AUX hatari-2.3.1-caps5-include-path.patch 500 BLAKE2B 9462c680cf22368e06f37d313d0d0917b5904977ab0001fc3427bb8532d611481e0414c7a9c76a83f8c3a00691dd702c22a4c27eb3d1ef0a8bfbd5d48d636895 SHA512 53230cfbfc1904fba1af3d9a7554425d76e75f4a4fa51906ebfe12c9f178633bc63334036f3192643dfa2a3d51e5729c7932a58ca009902585a1653b44c28457
+AUX hatari-2.3.1-cmake-include-checksym.patch 388 BLAKE2B 45bc03fc6be8feae6d16083ea6fd5c2fbe1f63103c8a274e9e2104d39cb4050dd5cb0ac51e679fbb65c17d0e2df080245e0e5800f14578e956cbff2dd6c3e9f5 SHA512 b9afa6022e7be9dfe9ab47b791d5e7a64e835ae2098f5b04737b2ffc952598bc0e90a181609629d03f9568c8dcd4e5772cb96bd1416531ccba6c66a1d33c439e
+DIST hatari-2.3.1.tar.bz2 4334129 BLAKE2B f309a31cbf181135b02858ebefa4d70116e66d252ef5de03cffa8254c0e86e4eeebfbf626613103790fb803d08028b318721020b292ea748c79e4d008e6d503d SHA512 78a6c7d80bfcd9b3a85a82754f4180cfd906eb95c6a44c8fbb92c2a648dc9c21c74c9dd18db4783d87259a3061b39e639c54cdd6c033d83de1252afef811382f
+EBUILD hatari-2.3.1.ebuild 2449 BLAKE2B 32ba57e52127c2bb01541fac8178e542398e92315a68749d7decc544eee620c14a344fe1ea0c7d90286a6351ea0460d3687b365bbc16ae58cca69ddbbd929c44 SHA512 66ecbe53cc3792b1a06b6664f3480366514e2f807b6be01e5aaff7c2a304a3fb7ea1d5baf8a125cd11ae09bb74f48822a8f7d5130d08280f8638b7fbacd533ce
+MISC metadata.xml 563 BLAKE2B e3361a33fead8a835f7eebab0c8ec6be82f43a12dfb053643b82368a03b123a25841ae76e2f4c1e7046721f2b21895762603ce1b0ec6a3ca4decc4db5747d1ab SHA512 9ba66a561368fafa4298886a2a055c71ddbf4991ce114645fa9123077a32d0e0ea3b264f260f4700c9037b0710721f1bae948ede50fee2fc75ea4033ece39b6c
diff --git a/games-emulation/hatari/files/hatari-2.3.1-caps5-include-path.patch b/games-emulation/hatari/files/hatari-2.3.1-caps5-include-path.patch
new file mode 100644
index 000000000000..a12207b09583
--- /dev/null
+++ b/games-emulation/hatari/files/hatari-2.3.1-caps5-include-path.patch
@@ -0,0 +1,18 @@
+Gentoo's spsdeclib ebuild installs headers in caps5/
+while upstream now expects them in caps/
+
+See: https://github.com/hatari/hatari/commit/367a87b
+--- a/cmake/FindCapsImage.cmake
++++ b/cmake/FindCapsImage.cmake
+@@ -6,3 +6,3 @@
+ 
+-SET(CAPSIMAGE_DIR caps)
++SET(CAPSIMAGE_DIR caps5)
+ FIND_PATH(CAPSIMAGE_INCLUDE_DIR ${CAPSIMAGE_DIR}/CapsAPI.h)
+--- a/src/floppy_ipf.c
++++ b/src/floppy_ipf.c
+@@ -34,3 +34,3 @@
+ #endif
+-#include <caps/CapsLibAll.h>
++#include <caps5/CapsLibAll.h>
+ #define CapsLong SDWORD
diff --git a/games-emulation/hatari/files/hatari-2.3.1-cmake-include-checksym.patch b/games-emulation/hatari/files/hatari-2.3.1-cmake-include-checksym.patch
new file mode 100644
index 000000000000..39da11ea307d
--- /dev/null
+++ b/games-emulation/hatari/files/hatari-2.3.1-cmake-include-checksym.patch
@@ -0,0 +1,12 @@
+Fix edge case build failure triggered by passing every
+DISABLE_FIND_PACKAGE, including disabling the normally
+always-enabled readline.
+
+CMake Error at CMakeLists.txt:229 (check_symbol_exists):
+  Unknown CMake command "check_symbol_exists".
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -12,2 +12,3 @@
+ include(CheckStructHasMember)
++include(CheckSymbolExists)
+ include(CheckCCompilerFlag)
diff --git a/games-emulation/hatari/hatari-2.2.1-r1.ebuild b/games-emulation/hatari/hatari-2.3.1.ebuild
index 25be1987275d..2512ca06655f 100644
--- a/games-emulation/hatari/hatari-2.2.1-r1.ebuild
+++ b/games-emulation/hatari/hatari-2.3.1.ebuild
@@ -3,80 +3,88 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit cmake python-single-r1 xdg
 
 DESCRIPTION="Atari ST emulator"
 HOMEPAGE="https://hatari.tuxfamily.org/"
 SRC_URI="https://download.tuxfamily.org/hatari/${PV}/${P}.tar.bz2"
+
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="capsimage microphone png portmidi readline +sdl2 udev zlib"
+IUSE="capsimage gui microphone png portmidi readline udev zlib"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
 	${PYTHON_DEPS}
+	media-libs/libsdl2[sound,video]
 	capsimage? ( >=dev-libs/spsdeclib-5.1-r1 )
 	microphone? ( media-libs/portaudio )
-	png? ( media-libs/libpng:0= )
+	png? ( media-libs/libpng:= )
 	portmidi? ( media-libs/portmidi )
-	readline? ( sys-libs/readline:0= )
-	sdl2? ( media-libs/libsdl2[sound,video,X] )
-	!sdl2? ( media-libs/libsdl[sound,video,X] )
+	readline? ( sys-libs/readline:= )
 	udev? ( virtual/udev )
-	zlib? ( sys-libs/zlib )
-"
-
+	zlib? ( sys-libs/zlib:= )"
 RDEPEND="
 	${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-	')
-	>=games-emulation/emutos-0.9.9.1
-"
-
+	gui? (
+		$(python_gen_cond_dep '
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+		')
+		x11-libs/gtk+:3[introspection]
+	)
+	>=games-emulation/emutos-0.9.9.1"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.1-default-rom.patch
-	"${FILESDIR}"/${PN}-2.2.1-joystick.patch
+	"${FILESDIR}"/${P}-caps5-include-path.patch
+	"${FILESDIR}"/${P}-cmake-include-checksym.patch
 )
-
 DOCS=(
 	readme.txt
-	doc/{changelog,coding,scsi-driver,thanks,video-recording}.txt
+	doc/{bugs,changelog,scsi-driver,thanks,video-recording}.txt
 )
 
 src_prepare() {
-	xdg_environment_reset
 	cmake_src_prepare
 
 	sed -i "s/\.1\.gz\b/.1/g;T;s/gzip[^\$]*/cat /g" {*/,}*/CMakeLists.txt || die
-	sed -i "s:\"doc\" + sep + \"hatari\":\"doc/${PF}\":" python-ui/uihelpers.py || die
-	sed -i "s/python/${EPYTHON}/" tools/atari-hd-image.sh || die
+	sed -i "s:doc/${PN}:doc/${PF}:" python-ui/uihelpers.py || die
+	# Note: >2.3.1 renames /python/ to /python3/, update accordingly
+	sed -i "s/python/${EPYTHON}/;s/dosfs/fs.fat/" tools/atari-hd-image.sh || die
 
 	# Use emutos package rather than bundled ROM.
 	rm src/tos.img || die
+	cat <<-EOF > hatari.cfg || die
+		[ROM]
+		szTosImageFileName = ${EPREFIX}/usr/share/emutos/etos512k.img
+	EOF
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=OFF
-		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}
-		-DENABLE_SDL2=$(usex sdl2)
 		-DCMAKE_DISABLE_FIND_PACKAGE_CapsImage=$(usex !capsimage)
+		-DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png)
 		-DCMAKE_DISABLE_FIND_PACKAGE_PortAudio=$(usex !microphone)
 		-DCMAKE_DISABLE_FIND_PACKAGE_PortMidi=$(usex !portmidi)
-		-DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Readline=$(usex !readline)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Udev=$(usex !udev)
 		-DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=$(usex !zlib)
+		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}
+		-DETCDIR="${EPREFIX}"/etc
+		$(usex gui '' -DPYTHON_EXECUTABLE=false) # disables python-ui/
 	)
 	cmake_src_configure
 }
 
 src_install() {
 	cmake_src_install
-	python_fix_shebang "${ED}"/usr/share/${PN}/
+
+	insinto /etc
+	doins hatari.cfg
+
+	python_fix_shebang "${ED}"/usr/bin
+	use gui && python_fix_shebang "${ED}"/usr/share/${PN}/${PN}ui
 }
diff --git a/games-emulation/hatari/metadata.xml b/games-emulation/hatari/metadata.xml
index f17253687ee3..848e8b086ce0 100644
--- a/games-emulation/hatari/metadata.xml
+++ b/games-emulation/hatari/metadata.xml
@@ -9,6 +9,5 @@
 	<flag name="capsimage">Use <pkg>dev-libs/spsdeclib</pkg> to read .IPF, .RAW, and .CTR disk images</flag>
 	<flag name="microphone">Use <pkg>media-libs/portaudio</pkg> for Falcon microphone handling</flag>
 	<flag name="portmidi">Use <pkg>media-libs/portmidi</pkg> as an alternative MIDI backend</flag>
-	<flag name="sdl2">Use libsdl2 instead of libsdl</flag>
 </use>
 </pkgmetadata>
diff --git a/games-emulation/libretro-snes9x/Manifest b/games-emulation/libretro-snes9x/Manifest
index f31be3b6708c..5874790cec70 100644
--- a/games-emulation/libretro-snes9x/Manifest
+++ b/games-emulation/libretro-snes9x/Manifest
@@ -1,6 +1,7 @@
+AUX libretro-snes9x-0.0.2_pre20200107-gcc11-const.patch 2019 BLAKE2B 3e86e0b1178d9780fe9090c873772358ecf9b17dac148b62bc97c69e1dd1d5332fed166b2279377e74607a941456b9019e0c9df77efe26dc540cd6ed6053b030 SHA512 1c0abd17516f30b6f4cef1be22963bf24e3087e7f39a9c65a2aa3435b61e5e58f661bb781f13aab721c7002303d763002f2073d50880cefb223999af5f694219
 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-0.0.2_pre20200107.ebuild 668 BLAKE2B 5d169311cab51ffd9976cdd789f57e9ea10f04f3e26b346f26dc10d7d91ce902d4d70afa6097bd54a67430261a008deda94184ae5ab957814939fcae63751515 SHA512 f1aedd4875adf0b307445b452f3a0520f44f5cd59c1909dbf4f487c7d326070e86d03f8733f07fef8217ef120fbab83076f7e77b71518955030d3f9a84d826f6
 EBUILD libretro-snes9x-9999.ebuild 392 BLAKE2B fd1bc621877fe6190fde609240b52c5ee40c2793eafc3b531136d57c4c123be717b6ef10f6aaf0eaa0a1fc2444ab2908179053419fe541ff5a9d7117771a7f68 SHA512 eebd8624b5b40240b329c85f3610a1f4103a08268c5139995c0788a8331a6153408b73c9926494b7afb82f17471b28bf3e485b4cf88cea3d77a73ed4107cf899
 MISC metadata.xml 358 BLAKE2B 6a960a74de698329d703dcd28412ad106aa8cc9de47322e43c78d1f293fda597732b56f300d5fe9de05117461e70a4e43d4c7af801e39c9b6ef18222f67eafc4 SHA512 0c1c977269bab10c8dc15c1344b13738e5d5b23f28e31b67f6cec953c1d3b53a190f43cb087bc84b8347398e23a4e8fea3513f057f00d0aabec1dcb54f3bb350
diff --git a/games-emulation/libretro-snes9x/files/libretro-snes9x-0.0.2_pre20200107-gcc11-const.patch b/games-emulation/libretro-snes9x/files/libretro-snes9x-0.0.2_pre20200107-gcc11-const.patch
new file mode 100644
index 000000000000..2fce97d6434c
--- /dev/null
+++ b/games-emulation/libretro-snes9x/files/libretro-snes9x-0.0.2_pre20200107-gcc11-const.patch
@@ -0,0 +1,52 @@
+https://bugs.gentoo.org/787116
+https://github.com/libretro/snes9x/commit/da1fc9a69d8fc776f1b13b080bc27cf329c52a1f
+
+From da1fc9a69d8fc776f1b13b080bc27cf329c52a1f Mon Sep 17 00:00:00 2001
+From: Alberto Fustinoni <alberto@aftnet.net>
+Date: Thu, 10 Sep 2020 22:22:46 +0900
+Subject: [PATCH] Build fix
+
+---
+ conffile.cpp | 2 +-
+ conffile.h   | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/conffile.cpp b/conffile.cpp
+index 817afae7f..5e121e2cc 100644
+--- a/conffile.cpp
++++ b/conffile.cpp
+@@ -452,7 +452,7 @@ void ConfigFile::ClearLines()
+     }
+ }
+ 
+-bool ConfigFile::ConfigEntry::section_then_key_less::operator()(const ConfigEntry &a, const ConfigEntry &b) {
++bool ConfigFile::ConfigEntry::section_then_key_less::operator()(const ConfigEntry &a, const ConfigEntry &b) const {
+ 	if(curConfigFile && a.section!=b.section){
+ 		const int sva = curConfigFile->GetSectionSize(a.section);
+ 		const int svb = curConfigFile->GetSectionSize(b.section);
+diff --git a/conffile.h b/conffile.h
+index ba69812df..c09cea362 100644
+--- a/conffile.h
++++ b/conffile.h
+@@ -90,18 +90,18 @@ class ConfigFile {
+ 		mutable bool used;
+ 
+         struct section_then_key_less {
+-            bool operator()(const ConfigEntry &a, const ConfigEntry &b);
++            bool operator()(const ConfigEntry &a, const ConfigEntry &b) const;
+         };
+ 
+         struct key_less {
+-            bool operator()(const ConfigEntry &a, const ConfigEntry &b) const{
++            bool operator()(const ConfigEntry &a, const ConfigEntry &b) const {
+                 if(a.section!=b.section) return a.section<b.section;
+                 return a.key<b.key;
+             }
+         };
+ 
+         struct line_less {
+-            bool operator()(const ConfigEntry &a, const ConfigEntry &b){
++            bool operator()(const ConfigEntry &a, const ConfigEntry &b) const {
+ 				if(a.line==b.line) return (b.val.empty() && !a.val.empty()) || a.key<b.key;
+                 if(b.line<0) return true;
+                 if(a.line<0) return false;
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
index e96b4cd5b53b..80a05e3fd38d 100644
--- a/games-emulation/libretro-snes9x/libretro-snes9x-0.0.2_pre20200107.ebuild
+++ b/games-emulation/libretro-snes9x/libretro-snes9x-0.0.2_pre20200107.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,3 +15,11 @@ 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"
+
+src_prepare() {
+	cd .. || die
+	eapply "${FILESDIR}"/${PN}-0.0.2_pre20200107-gcc11-const.patch
+	cd "${S}" || die
+
+	libretro-core_src_prepare
+}
diff --git a/games-emulation/mastergear-bin/Manifest b/games-emulation/mastergear-bin/Manifest
index c210ebe2dda6..4320d0df1602 100644
--- a/games-emulation/mastergear-bin/Manifest
+++ b/games-emulation/mastergear-bin/Manifest
@@ -1,3 +1,3 @@
-DIST MG47-Ubuntu-x86-bin.tgz 173067 BLAKE2B 2fe5b02f5f3e631e13018f3b6dc1174f00e81cc38696aed35bddbce30e22795184d71a837ce801d13a4bb100b85dfdcdd8ba213b2f447aa24d9962b1adecace5 SHA512 340038a161df1593f4ce8daa0ccf3a8cd562cf1d92d33926d3e2cf53eb6c7dd778d4c504b82f3b36394ea4beb28e7e51490e22e117dde5752a460988f0776914
-EBUILD mastergear-bin-4.7.ebuild 615 BLAKE2B 3702dcdb507d7d6056f9e1734f8284a56a1fbe12f5291af620a336e9eb33be8b390ed5330f695655ef2f742959ed4cf36cba4c30009d8fb97dc6b4dcdd9527b2 SHA512 215d2dee5297dbdeef32758c130a537fce08d65b18fd8ee66b12198313f03a7dbb89660a9726ca3373cb9ae26025bb0b0fa6cf6df598c2b0ed0712d88e9d7f45
+DIST MG49-Ubuntu-x86-bin.tgz 174277 BLAKE2B e3057f82b651bf0925512f18aa1f9da418e56af1e3d38cb2aaa884a68f080c86f6077154bfe80a3ce98219c0e651081eee2499af9e96cb727b9307c3bfe5a80d SHA512 b6c1a9d9c1b522ca0c5cd347de9c6ed1fa04992e13a80e687159f50396d5bf746ace8b066bcf9f09ead35d618acb39ff06ec4150467101b86215a403a656377f
+EBUILD mastergear-bin-4.9.ebuild 602 BLAKE2B 66013cd0c96892fca855db47653e250c9f1ba60ab5e6cd81e2b9a884dc0b4c333ac17826d46736fbdbd2a5446af3570dfeee55bc8ae543e238e19ca85377ca5e SHA512 dfcc4ad07584a158535f9bd5f73084e1940173c20ce0207f109d997de4a9c9d0a2f2fd851194b3082c17387d1a1b2d9398421625f88bfb7c9dc499af194cb063
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-emulation/mastergear-bin/mastergear-bin-4.7.ebuild b/games-emulation/mastergear-bin/mastergear-bin-4.9.ebuild
index f366832012d4..80ee8bfc6bfb 100644
--- a/games-emulation/mastergear-bin/mastergear-bin-4.7.ebuild
+++ b/games-emulation/mastergear-bin/mastergear-bin-4.9.ebuild
@@ -5,24 +5,28 @@ EAPI=7
 
 DESCRIPTION="SEGA Master System / Game Gear emulator"
 HOMEPAGE="https://fms.komkon.org/MG/"
-SRC_URI="https://fms.komkon.org/MG/MG${PV//\./}-Ubuntu-x86-bin.tgz"
+SRC_URI="https://fms.komkon.org/MG/MG${PV/./}-Ubuntu-x86-bin.tgz"
+S="${WORKDIR}"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="bindist mirror strip"
+KEYWORDS="-* ~amd64"
+RESTRICT="bindist mirror"
 
-RDEPEND=">=sys-libs/glibc-2.15
-	sys-libs/zlib
+RDEPEND="
+	|| (
+		media-sound/pulseaudio
+		media-sound/apulse[sdk]
+	)
+	sys-libs/zlib:=
 	x11-libs/libX11
-	x11-libs/libXext
-	|| ( media-sound/pulseaudio media-sound/apulse )"
+	x11-libs/libXext"
 
-S="${WORKDIR}"
 QA_PREBUILT="usr/bin/mastergear"
 
 src_install() {
 	newbin mg mastergear
+
 	docinto html
 	dodoc MG.html
 }
diff --git a/games-emulation/mednafen/Manifest b/games-emulation/mednafen/Manifest
index 40c43864d74e..9458f74aa3db 100644
--- a/games-emulation/mednafen/Manifest
+++ b/games-emulation/mednafen/Manifest
@@ -1,5 +1,3 @@
-DIST mednafen-0.9.46.tar.xz 3187988 BLAKE2B c33da02bfb0cce37e9029efc98d11e233686c41c7ecb51110a3fe805b3a13f2fef293dd86b7bc7a3ff172f7f0f507e07804a2927e5b41c1927ca52673f068dfb SHA512 ea624f076922570001393d5d04cc1b20b3d005d31de4095ee5c7a985be2b61e8d3aa5e78c64e751e8233adc89a31be955372caeb2818d0a5cc71ba9380931620
 DIST mednafen-1.26.1.tar.xz 3319756 BLAKE2B d306a0754ed0c64a99cee4eacfa47f5f46ca059026bfc2ef6bfff4be82e914a2882a864538c8cb6bb948cdb9bd53651d931b033446015ad06be309893a2bfef7 SHA512 c91db3967c09a475fcd3410eb6892a99f3cf2ca2c5a78173669aa52c2e588819595d1d140e0c1888f48885327a9381c64cfb8f2074be8067984a4414c6f282bf
-EBUILD mednafen-0.9.46.ebuild 3312 BLAKE2B 6f867ea2ed167526f127fd6c2cd5c1c58f0815fcfc807c4482cae10b44fcbe8a5f91daa0f6b0629e199400bc46f79ece4c3df4f9e106d595e7971e3063aeffdd SHA512 87b7573e651a9782df7db7f307794ddad797d41f16c95dda6c5d172439702a70d5d6f0e258092d20a5e8850680643b3cd849324a0a328adb9835834b0b164df2
 EBUILD mednafen-1.26.1.ebuild 1840 BLAKE2B 76cf933b913f945bd4b294bd62fed963d7be591c2b96573b4c305f270d3afe13f2b17d8ac188a7744157db70cf764784feddcf0fca3311c241295d5a0fe61d5a SHA512 7f238e60c44156bc5a4fe31f3e9b4cb66a813ff1e06cb2ebc03417cd92a18172fd7efed7b1f5e8c49bc4c663b44ab521736153ee8c4c1d3c4bef6a4499bf7391
-MISC metadata.xml 406 BLAKE2B 54ce3d4189c9227c8ae3d61113110ebfcde92aad331cf849b484bc4451ca383b0d8c31fe8070ddf9dcf9eeb4580bd291161077828682fe963fa24d6040e3e1e2 SHA512 2f3f2126024f80d69a52d73eb1b61f8b800470d6fdf488011c29889a2cfb77f8ad890de3475798672aca2171a435733230d1c7506cb202d29c3c8145b0e7f3da
+MISC metadata.xml 331 BLAKE2B a6dd34f1551387663808754c93520d4fd44d6c157c3d8d8ad60cf001b983d4d90f1ccd08110a83bec70418affcbd8eac831d8fcc19b62790fc90ee5a294242bb SHA512 f6259726b46f1e16136941bbaae5c46e4627a9fc428d43232efd59abe0678caf226acf43ea484f668b4dbf82658d2f4b2828402eb2305006189b50d4fd7691e3
diff --git a/games-emulation/mednafen/mednafen-0.9.46.ebuild b/games-emulation/mednafen/mednafen-0.9.46.ebuild
deleted file mode 100644
index e789c94b3240..000000000000
--- a/games-emulation/mednafen/mednafen-0.9.46.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic pax-utils
-
-DESCRIPTION="Argument-driven multi-system emulator utilizing OpenGL and SDL"
-HOMEPAGE="https://mednafen.github.io/"
-SRC_URI="https://mednafen.github.io/releases/files/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa altivec cjk debugger jack nls"
-
-RDEPEND="
-	dev-libs/libcdio
-	>=dev-libs/lzo-2.10
-	media-libs/libsdl[sound,joystick,opengl,video]
-	media-libs/libsndfile
-	sys-libs/zlib[minizip]
-	virtual/opengl
-	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${PN}
-
-pkg_pretend() {
-	if has ccache ${FEATURES}; then
-		ewarn
-		ewarn "If you experience build failure, try turning off ccache in FEATURES."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Unfortunately, upstream is insane and thinks mucking with CFLAGS is okay, if
-	# it prevents "users who don't understand the consequences of what they're doing".
-	# We use sed's here, as they're more forward-compatible than patches which need to
-	# be constantly rebased. DO NOT REPLACE THEM UNLESS YOU HAVE PERMISSION FROM GAMES.
-	sed -e '/-fno-fast-math/d' \
-		-e '/-fno-unsafe-math-optimizations/d' \
-		-e '/-fno-aggressive-loop-optimizations/d' \
-		-e '/-fno-ipa-icf/d' \
-		-e '/-fno-printf-return-value/d' \
-		-e '/-fomit-frame-pointer/d' \
-		-e '/-fno-pic/d' \
-		-e '/-fno-pie/d' \
-		-e '/-fno-PIC/d' \
-		-e '/-fno-PIE/d' \
-		-e '/-nopie/d' \
-		-e '/-no-pie/d' \
-		-e '/-fno-stack-protector/d' \
-		-e '/-fno-stack-protector-all/d' \
-		-e '/-fno-stack-protector-strong/d' \
-		-e '/-mtune=haswell/d' \
-		-i configure.ac || die
-
-	# Furthermore, upstream is also insane about bundling libraries and considers it
-	# "an aesthetics issue" and is even unwilling to make unbundling optional.
-	# Libs to unbundle: minilzo, minizip
-	sed -e '/PKG_PROG_PKG_CONFIG/a PKG_CHECK_MODULES([LZO], [lzo2])' \
-		-i configure.ac || die
-	sed -e '/bin_PROGRAMS/a mednafen_CPPFLAGS = \$(LZO_CFLAGS)' \
-		-i src/Makefile.am || die
-	sed -e 's:"compress/minilzo.h":<lzo1x.h>:' \
-		-i src/{mednafen,qtrecord}.cpp || die
-	sed -e 's:compress/ioapi.c::' \
-		-e 's:compress/unzip.c::' \
-		-e 's:compress/minilzo.c::' \
-		-i src/compress/Makefile.am.inc || die
-	sed -e 's:"compress/unzip.h":<minizip/unzip.h>:' \
-		-i src/file.cpp || die
-	sed -e 's:\(mednafen_LDADD.*trio/libtrio\.a\):\1 -lminizip \$(LZO_LIBS):' \
-		-i src/Makefile.am || die
-	# delete bundled files just to be sure...
-	rm src/compress/{ioapi.?,*lzo*,unzip.?} || die
-
-	# The insanity continues... upstream now believes it needs to
-	# warn users when compiling with -fPIC/-fPIE enabled
-	sed -e '/Compiling with position-independent code generation enabled is not recommended, for performance reasons/d' \
-		-i src/types.h || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# very dodgy code (bug #539992)
-	strip-flags
-	append-flags -fomit-frame-pointer -fwrapv
-
-	econf \
-		$(use_enable alsa) \
-		$(use_enable altivec) \
-		$(use_enable cjk cjk-fonts) \
-		$(use_enable debugger) \
-		$(use_enable jack) \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-	dodoc Documentation/cheats.txt
-	pax-mark m "${ED}"usr/bin/mednafen
-}
diff --git a/games-emulation/mednafen/metadata.xml b/games-emulation/mednafen/metadata.xml
index 5c1044a50bb7..8c07f220d0d7 100644
--- a/games-emulation/mednafen/metadata.xml
+++ b/games-emulation/mednafen/metadata.xml
@@ -5,9 +5,6 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<use>
-		<flag name="debugger">Build with internal debugger</flag>
-	</use>
 	<upstream>
 		<remote-id type="sourceforge">mednafen</remote-id>
 	</upstream>
diff --git a/games-emulation/openmsx/Manifest b/games-emulation/openmsx/Manifest
index 37c9cb44bd99..4487aa8d6d42 100644
--- a/games-emulation/openmsx/Manifest
+++ b/games-emulation/openmsx/Manifest
@@ -1,4 +1,6 @@
 AUX openmsx-16.0-libsdl-joystick-fix.patch 2101 BLAKE2B b2381fe41d014106f87a11ccc8f5f301bf033d4ff281a11280b4b8459cf62f81c29a2d07220466ab7cb59005f14157857f3ff566e1f00ddfc104ba68b199dfd5 SHA512 f2aa3b1e69879db9a315e6485db67382228827caa2d362f9f1843a76741d2bb6f909ed05664d88608c01910914e3c40d2e5600a78b276111e242f51145e3c9cb
 DIST openmsx-16.0.tar.gz 3997584 BLAKE2B 040bb3f6ff0338740b5212aae21db2c97fcee0e8c8ada1bc84a59d94b1b72180c4b2d5eff8cc4ae84dd95bc77f121e15c2f818f1f2e05ba7dc4781b63770db38 SHA512 a06ec56a8a768356b628e59e587ec85898643b04379da5c72bbbd8e48a0533da34a451b7e4d2a2f540f14e6bbcf833534a1bdac9014ce0c35dfd4ca179618f48
+DIST openmsx-17.0.tar.gz 4045461 BLAKE2B 46c70ce3f853aecebf8bdeddc5786903634d88d013497383490d79b0dbf455f48a70b3658b9913db197cf7e66cbc6f4da37da58b1b24d77c75b731e842c663df SHA512 4fc87efd2bfbcd12bebb4e005b18b1cb2048f5d8f3188ef9b55f1e003c8d021fb47bd67d647137daa6a8640b5656b0db363f3b62158d690ddb5f7bf1af3459e1
 EBUILD openmsx-16.0-r1.ebuild 2940 BLAKE2B 63a22b96330eb87055d2910d910aa5ee31f30354a3aa87ad290572975b77401613eb18e9986ca3e2456fb4c15b0ad2922215968eb0c65fdf7767fe64742068ce SHA512 46be0450204bb95639a0822f6bf90824c8b728ceae2c67e79731da1b52f6a82ca0c62fe8fe41ef3a0dcf4bc71535e54c46d09976d90d12d18efe14713814dab6
+EBUILD openmsx-17.0.ebuild 2882 BLAKE2B 2aa8a567b5080dd487b9c7c69138df9acf2e3523fe57a57d5cfa74a7659028d1d8eba3aaa04696f941865c8878f175b8bc8249dda1dc5884b61a959c6dc12834 SHA512 4ce326368598aa63b83eb8da63f6f4f5250f4b8c5ba2bc078e4c2fbaaa26a14b9b261885e729c1f16d152fb66ec37c9a4fc36e5200acbde404c9659e824aa896
 MISC metadata.xml 441 BLAKE2B bf3b3c54e5f7f516be2e3a275aa4bf7bccd83a868fae021f2d7d0c7b4fe007708d3e45c2c47ed6b0b02ddf7fc84f770c739e16c53d1e7ca17107511b9c2f83ac SHA512 240545c7c338a6b69134a851ee14f3657e2463fe5f6bc47ddba64beb3dc3b037146e81d10a712fc5addbe54507e2269a2b7bd58a2f0d6133cd4fe5327f266c4c
diff --git a/games-emulation/openmsx/openmsx-17.0.ebuild b/games-emulation/openmsx/openmsx-17.0.ebuild
new file mode 100644
index 000000000000..e64f1d8a6d6c
--- /dev/null
+++ b/games-emulation/openmsx/openmsx-17.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit desktop flag-o-matic python-any-r1 readme.gentoo-r1 toolchain-funcs xdg
+
+DESCRIPTION="MSX emulator that aims for perfection"
+HOMEPAGE="https://openmsx.org/"
+SRC_URI="https://github.com/openMSX/openMSX/releases/download/RELEASE_${PV//./_}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+joystick"
+
+RDEPEND="dev-lang/tcl:0=
+	media-libs/alsa-lib
+	media-libs/libogg
+	media-libs/libpng:0=
+	media-libs/libsdl2[joystick=,sound,video]
+	media-libs/libtheora
+	media-libs/libvorbis
+	media-libs/sdl2-ttf
+	>=media-libs/glew-1.3.2:0=
+	sys-libs/zlib
+	virtual/opengl"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}"
+
+DOC_CONTENTS="
+If you want to if you want to emulate real MSX systems and not
+only the free C-BIOS machines, put the system ROMs in one of
+the following directories: /usr/share/${PN}/systemroms
+or ~/.openMSX/share/systemroms
+"
+
+src_prepare() {
+	default
+	sed -i \
+		-e '/^LDFLAGS:=/d' \
+		-e '/LINK_FLAGS_PREFIX/d' \
+		-e '/LINK_FLAGS+=/s/-s//' \
+		-e '/LINK_FLAGS+=\$(TARGET_FLAGS)/s/$/ $(LDFLAGS)/' \
+		build/main.mk \
+		|| die
+	sed -i -e '/SYMLINK/s:true:false:' build/custom.mk || die
+	sed -i -e 's/GPL.txt//' doc/node.mk || die
+
+	# Build system only configured to use bundled version - but not from the
+	# directory it's distributed in
+	cp "${S}/Contrib/catch2/catch.hpp" "${S}/src/unittest" || die
+}
+
+src_configure() {
+	tc-export CXX
+
+	# Doesn't compile without this, and build system doesn't consistently add
+	# it properly for all compilers
+	append-cxxflags '-std=c++17'
+
+	default
+}
+
+src_compile() {
+	emake \
+		CXXFLAGS="${CXXFLAGS}" \
+		INSTALL_SHARE_DIR="${EPREFIX}/usr/share/${PN}" \
+		V=1
+}
+
+src_test() {
+	# To get tests, we need to build with OPENMSX_FLAVOUR=unittest and then the
+	# build is stored in a directory of the pattern
+	# ${WORKDIR}/derived/*-unittest/. This is separate from the actual build,
+	# stored in ${WORKDIR}/derived/*-opt. The unittest binary and the workdir
+	# binary are in each of these directories under their `bin` directories.
+	emake \
+		V=1 \
+		CXXFLAGS="${CXXFLAGS}" \
+		OPENMSX_FLAVOUR=unittest
+
+	# There will only ever be one *-unittest directory
+	"${S}"/derived/*-unittest/bin/openmsx || die
+}
+
+src_install() {
+	# To guarantee installing the proper binary in case tests were built,
+	# specify the default OPENMSX_FLAVOUR
+	emake \
+		V=1 \
+		INSTALL_BINARY_DIR="${ED}/usr/bin" \
+		INSTALL_SHARE_DIR="${ED}/usr/share/${PN}" \
+		INSTALL_DOC_DIR="${ED}/usr/share/doc/${PF}" \
+		OPENMSX_FLAVOUR=opt \
+		install
+
+	einstalldocs
+	readme.gentoo_create_doc
+
+	for i in 16 32 48 64 128 256 ; do
+		newicon -s "${i}" "share/icons/openMSX-logo-${i}.png" "${PN}.png"
+	done
+	make_desktop_entry "${PN}" "openMSX"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	xdg_pkg_postinst
+}