14 files changed, 422 insertions, 57 deletions
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 89607eed9a5c..e76bc68e8ba4 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/advancemame/Manifest b/games-emulation/advancemame/Manifest
index e86ce8412b6e..f4777b65da1e 100644
--- a/games-emulation/advancemame/Manifest
+++ b/games-emulation/advancemame/Manifest
@@ -6,5 +6,5 @@ AUX advancemame-3.9-pkgconfig_for_ncurses_and_slang.patch 4630 BLAKE2B 0655e2c87
 AUX advancemame-pic.patch 344 BLAKE2B 61e312fe33565171824e2e875a22187134bfc8905dfa2f6bc50b43427acd0f25502d1da1f7f591c1882e82f37d591c737af0aaaa98705c345637d786886e6c20 SHA512 5ae1a76a5e08e65efece7b295af7e177e8da7d65c7de9a03529d8a6909d38c6510d8c3e122bc4bc542760bc2cdf2e26a1edf56d27bcfa6b1fe25ea9c0f467360
 AUX advancemame-verboselog.patch 838 BLAKE2B 157d3797c5b92148d35f502fbc76aac9742c21b277d897308e4a074e1cba95b6fe1ea3e6b758be0a8d8b7e10fba5d33f5ac318d7c332f6bf622215627168646e SHA512 d34ff98ff2971a01dd46a66b322507afec4930f89afd2141e753233efeccdc582644dbf576eae08300c8e3be0336e09e56609983bcd602a69a47985ecd954e6e
 DIST advancemame-3.9.tar.gz 27287755 BLAKE2B 020a10a9b9fa207a733747273e749b4d9adabbd50104ae10b1568144bcdcb3694fe19e4ca5fd31119a02c64bca9872b1b3d1eb3ce305a611f006a8168f5bcb89 SHA512 43f9ba746f222b17ade2d213d6af7cc8fe6b3ee6008633f02b8877f4c7f75628bdf1cc9718db09f5f9a482d194c8ba94f9047334e8012d23c598454e5dab2eb3
-EBUILD advancemame-3.9.ebuild 1803 BLAKE2B 9ac6e1b7bcfc3b83384d75e144d50d127759012a053e767ec2cd5faaba232ad449b2b58f68b74ba27add865659e2f0195a9c7ce3c6713877ab91174222770aa1 SHA512 0b8c30d8acab957baf56f6d00a024fd927dd12be48d2106bcfe502e371d3f3b9fe08432b4661722720494d9002adb7a309ced9385bff3f585819de5ddb3f6ddb
+EBUILD advancemame-3.9.ebuild 1810 BLAKE2B c9150b7f792956f8708a99268d534911866e002b2547a933598128306a6a231593fc5ac549bc25caf29764283b399288d17ae67d18d5887b70322efc09428daf SHA512 a3932f684ea32e903473e98775753473ab04744b790f067aa50783d14ffd74140cc88e87ba9a226b1065cddf6f12db4ec4190fed9b51159e36a1e7fb9ef29c7a
 MISC metadata.xml 1139 BLAKE2B 0722cccd2aa4d9e24eb990e460c91d8df503c1adffa680ac5e1f2b900bdfc93099feb06aab43b43ce27defc3183c6b75c594ce99e7f1396f5512babfc9de68d0 SHA512 a9a85b10cfbf6c7a75c317db8d242d29655d14d9891b897171161af613221fe93ad776ddb53fcddd14f08295d1e02c3c3fbccdce027e2a0d1c434fe60e49f349
diff --git a/games-emulation/advancemame/advancemame-3.9.ebuild b/games-emulation/advancemame/advancemame-3.9.ebuild
index 2759ceac28f3..c7ee4e9a92d9 100644
--- a/games-emulation/advancemame/advancemame-3.9.ebuild
+++ b/games-emulation/advancemame/advancemame-3.9.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/amadvance/advancemame/releases/download/v${PV}/${P}.
 
 LICENSE="GPL-2 XMAME"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="alsa fbcon ncurses oss slang truetype"
 
 DEPEND="
diff --git a/games-emulation/advancescan/Manifest b/games-emulation/advancescan/Manifest
index cb18238da653..613718620540 100644
--- a/games-emulation/advancescan/Manifest
+++ b/games-emulation/advancescan/Manifest
@@ -1,5 +1,6 @@
+AUX advancescan-1.16-gcc11.patch 7709 BLAKE2B f1036183787c7c7e52c9bfe3c9ae064436d2d90001905d06b8cc2adf0fd23a97a84420d39740bbab6f427d6f56d10904a94c88fe15b418cb6df502b9bb372cda SHA512 dd540886454ffbc4b7ccefb61cf53a132b9eb9290bda05a3a91010c32bd6190c1cc7c11a6b5e1efca80400696b008eb37276cba59338803e95171eca79c669a7
 AUX advancescan-1.16-sys-expat.patch 1543 BLAKE2B 72143e1dec74c828c4051a5b198f706caf3385e1a982eca142fd6f2f4c7a2f3797fb732fd1086b4f3c5cf93560f67077720c14945f52ed388ce981db559230c4 SHA512 a9dc80b75a8b9dbad3fe6c156c4de0cafee171d820845ea7ff2f042b7f73fd6cd10d710c60fb8bf4cfdea139f527008958b445d01838a8fdf6c96d3e76c530f4
 DIST advancescan-1.16-gcc6.patch 24440 BLAKE2B bd7b25859798cc3935fedc6d60ea822189301232426e2b071665aaf6af3a85f16d93c22373e8ad1b46da96ab577fceebe681e86021452aa20e24b0e0fd9b2a8a SHA512 e758ba7d900f1ca5fd6f32c3572fbf4c2a7cf77877f926511bd724ec5ec8ddb9697244f5a582eeb5275188ae2c8a14e8388cac93365ac348e9cc60835884a499
 DIST advancescan-1.16.tar.gz 316895 BLAKE2B 1ce2ec88a80cca8ff8d1fa09cba7b9c5583e42a3419bfd561bb184b53fe071c011b864ee813f0107667881112ca4adf01cd2b8e8148712927af1c82bc73f43c1 SHA512 6d359c160d54a0a1cd13db10f5fc9986fae4f1151e205024e40c21b0f933723351907156faec22a92561ad523151e3b7d4ff70a6eebbb6152bd3767063a31031
-EBUILD advancescan-1.16-r1.ebuild 833 BLAKE2B 6b0ce1ea3af395cacf473fc9aa0a07af7c0a221ec421c0dd1e4aa1fe0d47e0dee9f4ab6ca3a0bb833281546cec7d3c05af41b1f3ee2c357c45ea1f6e538de456 SHA512 3224725f4f1174fe6418b887f084e7ada20c983552e017bb2036cfde5ed91ef435c577a1d9c39fb51d79824c5f177b11baf38e8d86c35a6d8f5fe6f8f802588f
+EBUILD advancescan-1.16-r1.ebuild 866 BLAKE2B 8b1bcdfc93688b49bef49b369fdd0db5e6ef7e946b2e159b72edabf7d99cd9caf608edafad8ba982e09c43eab616d27268e33610c116c7775c5086cfa9aa6f5d SHA512 3e32699024cc500284554f0a6f123f31fc4d264b4b40c847f9458d307129552f5e344f4387f7c8c5ea31481e3096803400a208960747db58e7030aea78bba988
 MISC metadata.xml 334 BLAKE2B 9c8f19757cfe814fe5650009b03d9eb653e3937cf30b4288dfa616a894560bdc81edba8b1ad235f34f5200a2c7ae8e9b19ba0e9f1e0ec5a2560b806ac9e184d8 SHA512 18cabfd831489b32b4449794c06a28425d91dab0c2868038fb48c94728fc16ccca268ae93a4f4a51be01c5901591582e6df2523460ba4ba98719436944577e1f
diff --git a/games-emulation/advancescan/advancescan-1.16-r1.ebuild b/games-emulation/advancescan/advancescan-1.16-r1.ebuild
index cebee4ad876a..6a0026200b4a 100644
--- a/games-emulation/advancescan/advancescan-1.16-r1.ebuild
+++ b/games-emulation/advancescan/advancescan-1.16-r1.ebuild
@@ -7,7 +7,8 @@ inherit autotools
 
 DESCRIPTION="A command line rom manager for MAME, MESS, AdvanceMAME, AdvanceMESS and Raine"
 HOMEPAGE="http://advancemame.sourceforge.net/scan-readme.html"
-SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz
+SRC_URI="
+	mirror://sourceforge/advancemame/${P}.tar.gz
 	https://dev.gentoo.org/~juippis/distfiles/tmp/advancescan-1.16-gcc6.patch"
 
 LICENSE="GPL-2"
@@ -16,13 +17,13 @@ KEYWORDS="~amd64 ~x86"
 
 DEPEND="
 	dev-libs/expat
-	sys-libs/zlib
-"
+	sys-libs/zlib"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-sys-expat.patch
 	"${DISTDIR}"/${P}-gcc6.patch
+	"${FILESDIR}"/${P}-gcc11.patch
 )
 
 src_prepare() {
diff --git a/games-emulation/advancescan/files/advancescan-1.16-gcc11.patch b/games-emulation/advancescan/files/advancescan-1.16-gcc11.patch
new file mode 100644
index 000000000000..eae86c192d63
--- /dev/null
+++ b/games-emulation/advancescan/files/advancescan-1.16-gcc11.patch
@@ -0,0 +1,252 @@
+--- a/conf.cc
++++ b/conf.cc
+@@ -28,7 +28,7 @@
+ 
+ using namespace std;
+ 
+-static void expand_tree(const string& path, filepath_container& ds) throw (error)
++static void expand_tree(const string& path, filepath_container& ds)
+ {
+ 	DIR* dir = opendir(path.c_str());
+ 	if (!dir)
+--- a/file.cc
++++ b/file.cc
+@@ -98,7 +98,7 @@
+ /**
+  * Check if a file exists.
+  */
+-bool file_exists(const string& path) throw (error)
++bool file_exists(const string& path)
+ {
+ 	struct stat s;
+ 	if (stat(path.c_str(), &s) != 0) {
+@@ -114,7 +114,7 @@
+ /**
+  * Write a whole file.
+  */
+-void file_write(const string& path, const char* data, unsigned size) throw (error)
++void file_write(const string& path, const char* data, unsigned size)
+ {
+ 	FILE* f = fopen(path.c_str(), "wb");
+ 	if (!f)
+@@ -134,7 +134,7 @@
+ /**
+  * Read a whole file.
+  */
+-void file_read(const string& path, char* data, unsigned size) throw (error)
++void file_read(const string& path, char* data, unsigned size)
+ {
+ 	file_read(path, data, 0, size);
+ }
+@@ -142,7 +142,7 @@
+ /**
+  * Read a whole file.
+  */
+-void file_read(const string& path, char* data, unsigned offset, unsigned size) throw (error)
++void file_read(const string& path, char* data, unsigned offset, unsigned size)
+ {
+ 	FILE* f = fopen(path.c_str(), "rb");
+ 	if (!f)
+@@ -166,7 +166,7 @@
+ /**
+  * Get the time of a file.
+  */
+-time_t file_time(const string& path) throw (error)
++time_t file_time(const string& path)
+ {
+ 	struct stat s;
+ 	if (stat(path.c_str(), &s)!=0)
+@@ -178,7 +178,7 @@
+ /**
+  * Set the time of a file.
+  */
+-void file_utime(const string& path, time_t tod) throw (error)
++void file_utime(const string& path, time_t tod)
+ {
+ 	struct utimbuf u;
+ 
+@@ -192,7 +192,7 @@
+ /**
+  * Get the size of a file.
+  */
+-unsigned file_size(const string& path) throw (error)
++unsigned file_size(const string& path)
+ {
+ 	struct stat s;
+ 	if (stat(path.c_str(), &s)!=0)
+@@ -204,7 +204,7 @@
+ /**
+  * Get the crc of a file.
+  */
+-crc_t file_crc(const string& path) throw (error)
++crc_t file_crc(const string& path)
+ {
+ 	unsigned size = file_size(path);
+ 
+@@ -227,7 +227,7 @@
+ /**
+  * Copy a file.
+  */
+-void file_copy(const string& path1, const string& path2) throw (error)
++void file_copy(const string& path1, const string& path2)
+ {
+ 	unsigned size;
+ 
+@@ -249,7 +249,7 @@
+ /**
+  * Move a file.
+  */
+-void file_move(const string& path1, const string& path2) throw (error)
++void file_move(const string& path1, const string& path2)
+ {
+ 	if (rename(path1.c_str(), path2.c_str())!=0
+ 		&& errno==EXDEV) {
+@@ -271,7 +271,7 @@
+ /**
+  * Remove a file.
+  */
+-void file_remove(const string& path1) throw (error)
++void file_remove(const string& path1)
+ {
+ 	if (remove(path1.c_str())!=0) {
+ 		throw error() << "Failed remove of " << path1;
+@@ -281,7 +281,7 @@
+ /**
+  * Rename a file.
+  */
+-void file_rename(const string& path1, const string& path2) throw (error)
++void file_rename(const string& path1, const string& path2)
+ {
+ 	if (rename(path1.c_str(), path2.c_str())!=0) {
+ 		throw error() << "Failed rename of " << path1 << " to " << path2;
+@@ -291,7 +291,7 @@
+ /**
+  * Randomize a name file.
+  */
+-string file_randomize(const string& path, int n) throw ()
++string file_randomize(const string& path, int n)
+ {
+ 	ostringstream os;
+ 
+@@ -310,7 +310,7 @@
+ /**
+  * Get the directory from a path.
+  */
+-string file_dir(const string& path) throw ()
++string file_dir(const string& path)
+ {
+ 	size_t pos = path.rfind('/');
+ 	if (pos == string::npos) {
+@@ -323,7 +323,7 @@
+ /**
+  * Get the file name from a path.
+  */
+-string file_name(const string& path) throw ()
++string file_name(const string& path)
+ {
+ 	size_t pos = path.rfind('/');
+ 	if (pos == string::npos) {
+@@ -336,7 +336,7 @@
+ /**
+  * Get the basepath (path without extension) from a path.
+  */
+-string file_basepath(const string& path) throw ()
++string file_basepath(const string& path)
+ {
+ 	size_t dot = path.rfind('.');
+ 	if (dot == string::npos)
+@@ -348,7 +348,7 @@
+ /**
+  * Get the basename (name without extension) from a path.
+  */
+-string file_basename(const string& path) throw ()
++string file_basename(const string& path)
+ { 
+ 	string name = file_name(path);
+ 	size_t dot = name.rfind('.');
+@@ -361,7 +361,7 @@
+ /**
+  * Get the extension from a path.
+  */
+-string file_ext(const string& path) throw ()
++string file_ext(const string& path)
+ { 
+ 	string name = file_name(path);
+ 	size_t dot = name.rfind('.');
+@@ -374,7 +374,7 @@
+ /**
+  * Compare two path.
+  */
+-int file_compare(const string& path1, const string& path2) throw ()
++int file_compare(const string& path1, const string& path2)
+ {
+ 	return strcasecmp(path1.c_str(), path2.c_str());
+ }
+@@ -382,7 +382,7 @@
+ /**
+  * Convert a path to the C format.
+  */
+-string file_adjust(const string& path) throw ()
++string file_adjust(const string& path)
+ {
+ 	string r;
+ 	for(unsigned i=0;i<path.length();++i) {
+@@ -400,7 +400,7 @@
+ /**
+  * Make a drectory tree.
+  */
+-void file_mktree(const std::string& path) throw (error)
++void file_mktree(const std::string& path)
+ {
+ 	string dir = file_dir(path);
+ 	string name = file_name(path);
+--- a/file.h
++++ b/file.h
+@@ -67,27 +67,27 @@
+ crc_t crc_compute(const char* data, unsigned len);
+ crc_t crc_compute(crc_t pred, const char* data, unsigned len);
+ 
+-bool file_exists(const std::string& file) throw (error);
+-void file_write(const std::string& path, const char* data, unsigned size) throw (error);
+-void file_read(const std::string& path, char* data, unsigned size) throw (error);
+-void file_read(const std::string& path, char* data, unsigned offset, unsigned size) throw (error);
+-time_t file_time(const std::string& path) throw (error);
+-void file_utime(const std::string& path, time_t tod) throw (error);
+-unsigned file_size(const std::string& path) throw (error);
+-crc_t file_crc(const std::string& path) throw (error);
+-void file_copy(const std::string& path1, const std::string& path2) throw (error);
+-void file_move(const std::string& path1, const std::string& path2) throw (error);
+-void file_remove(const std::string& path1) throw (error);
+-void file_mktree(const std::string& path1) throw (error);
++bool file_exists(const std::string& file);
++void file_write(const std::string& path, const char* data, unsigned size);
++void file_read(const std::string& path, char* data, unsigned size);
++void file_read(const std::string& path, char* data, unsigned offset, unsigned size);
++time_t file_time(const std::string& path);
++void file_utime(const std::string& path, time_t tod);
++unsigned file_size(const std::string& path);
++crc_t file_crc(const std::string& path);
++void file_copy(const std::string& path1, const std::string& path2);
++void file_move(const std::string& path1, const std::string& path2);
++void file_remove(const std::string& path1);
++void file_mktree(const std::string& path1);
+ 
+-std::string file_randomize(const std::string& path, int n) throw ();
+-std::string file_name(const std::string& file) throw ();
+-std::string file_dir(const std::string& file) throw ();
+-std::string file_basename(const std::string& file) throw ();
+-std::string file_basepath(const std::string& file) throw ();
+-std::string file_ext(const std::string& file) throw ();
+-int file_compare(const std::string& path1, const std::string& path2) throw ();
+-std::string file_adjust(const std::string& path) throw ();
++std::string file_randomize(const std::string& path, int n);
++std::string file_name(const std::string& file);
++std::string file_dir(const std::string& file);
++std::string file_basename(const std::string& file);
++std::string file_basepath(const std::string& file);
++std::string file_ext(const std::string& file);
++int file_compare(const std::string& path1, const std::string& path2);
++std::string file_adjust(const std::string& path);
+ 
+ #endif
+ 
diff --git a/games-emulation/fceux/Manifest b/games-emulation/fceux/Manifest
index b945b190645d..1fff737798c8 100644
--- a/games-emulation/fceux/Manifest
+++ b/games-emulation/fceux/Manifest
@@ -1,5 +1,7 @@
 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
-MISC metadata.xml 432 BLAKE2B 69c86fec99d0d08d0672142afbb39b2f2c352af4a8ff953516522f721e2482a4624b542593c8eac0be3570a75037cf27b0c48bd19033429d1c5d66e85fcdb952 SHA512 f6f073a198d89d195daa4da1c4c8bdf631258db0ff8cc5fefd9d8a6d93beb38081d37a70df0d0f62d7bf79f7595a3456d88ac0c724535d8c453f3096d2256b96
+EBUILD fceux-2.3.0.ebuild 1365 BLAKE2B 81727ead24f169c5f0c058a370a93eef45801cfbc40c8ab6b6fd5e010ad0ee98f6a7e24eb3f27cd00f442ec2c9b5283e740edca5888508018064648ba21e6e60 SHA512 74c253db00315b30b667ba055238519e6e01e98b8d04703f5c2e4f0e244b74d3e5bafe04a034c6560342dda5536a406817af2661d55aeba2086eb989c8f17d0b
+MISC metadata.xml 487 BLAKE2B 41b6ee780f57ccf7755027e6267ea0bffb92d971df83bd3d40580bb0e7f135c5dcb8e4bbb507b30e5a560cfc74abf0a2c1a0eb5aaefd1e34c11b4bf9e56803d1 SHA512 ce90a3403f05acd17ad52c7abbbec444c02e01b7ab2a8518f3a1978666a99af4684b36a7f4e7c2af79466879813cd7a667e4e37a65dfd434ea082377bf950132
diff --git a/games-emulation/fceux/fceux-2.3.0.ebuild b/games-emulation/fceux/fceux-2.3.0.ebuild
new file mode 100644
index 000000000000..94313a079d6c
--- /dev/null
+++ b/games-emulation/fceux/fceux-2.3.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 )
+
+inherit cmake lua-single xdg
+
+DESCRIPTION="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"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	${LUA_DEPS}
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	dev-qt/qtwidgets:5
+	media-libs/libglvnd
+	media-libs/libsdl2[joystick,sound,threads,video]
+	sys-libs/zlib:=[minizip]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.2-warnings.patch
+)
+DOCS=( README TODO-SDL changelog.txt documentation/. readme.md )
+
+src_prepare() {
+	cmake_src_prepare
+
+	# remove hardcoded paths and deprecated options from .desktop
+	sed -e '/^Exec=/s:=.*/:=:' \
+		-e '/^Icon=/s:=.*:=fceux1:' \
+		-e '/^OnlyShowIn=/d' \
+		-i fceux.desktop || die
+
+	# avoid QA notice if no git, returns empty strings either way
+	sed -i '/^GIT_/s:=.*:=:' scripts/genGitHdr.sh || die
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove unused/duplicate files
+	rm "${ED}"/usr/share/fceux/{lua5{1,.1}.dll,{fceux,taseditor}.chm} \
+		"${ED}"/usr/share/doc/${PF}/fceux{,-net-server}.6 \
+		"${ED}"/usr/share/man/man6/fceux-net-server.6 || die
+}
diff --git a/games-emulation/fceux/metadata.xml b/games-emulation/fceux/metadata.xml
index a6bb4cbf9bfa..4c416fd6a7a3 100644
--- a/games-emulation/fceux/metadata.xml
+++ b/games-emulation/fceux/metadata.xml
@@ -9,6 +9,7 @@
 		<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>
 	</upstream>
 </pkgmetadata>
diff --git a/games-emulation/mednafen/Manifest b/games-emulation/mednafen/Manifest
index 84bf63a99268..40c43864d74e 100644
--- a/games-emulation/mednafen/Manifest
+++ b/games-emulation/mednafen/Manifest
@@ -1,3 +1,5 @@
 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
diff --git a/games-emulation/mednafen/mednafen-1.26.1.ebuild b/games-emulation/mednafen/mednafen-1.26.1.ebuild
new file mode 100644
index 000000000000..1fb74cdae5ef
--- /dev/null
+++ b/games-emulation/mednafen/mednafen-1.26.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic pax-utils toolchain-funcs
+
+DESCRIPTION="Argument-driven multi-system emulator utilizing OpenGL and SDL"
+HOMEPAGE="https://mednafen.github.io/"
+SRC_URI="https://mednafen.github.io/releases/files/${P}.tar.xz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa cpu_flags_ppc_altivec jack +sndfile"
+
+RDEPEND="
+	dev-libs/lzo:2
+	dev-libs/trio
+	media-libs/libsdl2[joystick,opengl,video]
+	media-libs/tremor
+	media-sound/musepack-tools
+	sys-libs/zlib:=[minizip]
+	virtual/libintl
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	sndfile? ( media-libs/libsndfile )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# don't let the build system mess with CFLAGS more than necessary,
+	# most are questionable (see README.PORTING/configure.ac comments)
+	# -fwrapv: kept for bug #539992
+	sed -e '/CC_OPT.*CODEGEN_FLAGS/{/-fwrapv/!d}' \
+		-e '/CC_OPT.*NO_STACK_PROTECTOR_FLAGS/d' \
+		-e '/CC_OPT.*OPTIMIZER_FLAGS/c\:' \
+		-e '/CC_OPT.*-mtune.*SS_EXTRA_FLAGS/d' \
+		-i configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	# disable unnecessary warnings not to confuse users (see src/types.h)
+	append-cppflags -DMDFN_DISABLE_{NO_OPT,PICPIE}_ERRWARN
+
+	local myeconfargs=(
+		$(use_enable alsa)
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable jack)
+		$(use_with sndfile libsndfile)
+		--with-external-{lzo,mpcdec,tremor,trio}
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	local DOCS=(
+		ChangeLog
+		Documentation/{cheats.txt,fname_format.txt,modules.def,settings.def}
+	)
+	local HTML_DOCS=( Documentation/*.{css,html,png} )
+	default
+	pax-mark m "${ED}"/usr/bin/mednafen
+}
diff --git a/games-emulation/mednaffe/Manifest b/games-emulation/mednaffe/Manifest
index c5358cc1cb28..029799974bd8 100644
--- a/games-emulation/mednaffe/Manifest
+++ b/games-emulation/mednaffe/Manifest
@@ -1,3 +1,3 @@
-DIST mednaffe-0.8.7.tar.gz 304300 BLAKE2B 80a57f2afbea0e33ec547f16088b678fd9a319a124bbebe71fe7848497e1276ae77c0fb47718324d8549dbb69709685f46c970dedf982f48ac095f1923b42dbd SHA512 3495ecd3b87f19ab65d8760ea8adfa830c4dc9fe959f2e2f349216b36f58d9623c9cfd0c7e40fe5e8b7b90846fe85d9808c2a5885f36d5d8b16659b25cf8a3a1
-EBUILD mednaffe-0.8.7.ebuild 869 BLAKE2B b04ffa62a023f0c2f49babc8ebc88e70d8ab9ab24fea303db31d80aa4c66378659dca954df244c762b3273091b97edc5d16f2caab17a98d28422a988b44e6407 SHA512 ac868f6139863cdbec397523688b342640c5f2403fe6e1ceda3326fa04085f6e823b26e0049f4e49cf3114dcfa14f5afad0f264679f78a9c320bd12032341d91
+DIST mednaffe-0.9.1.tar.gz 2000069 BLAKE2B a87c49a3e2cf76b21b6c2522987f5773e519512b2cd192591542204224ce3fe009ebaf1b78d3a332e3a35293dd2a6021ccf34e280c98eaf4227690c57aa973a0 SHA512 02390e7960511756aafb925b77c9eebc099ac81623dfb640dbfcbb342061f885955599d2edbc1d84b8818f7ce459eac183917507235c58c27ce9ab2b3d8eb198
+EBUILD mednaffe-0.9.1.ebuild 515 BLAKE2B 50e37d606d28f37e7d9150d927012db393057b323f8ad40daf2a3e89d3dbf13b1608735343502e1b4420bb925d148b2ab467efb02e34daf68cbf3a13f6894c8a SHA512 e6fd7868192415994a9f4ca585326e372e1fef729854082a4aac0b7d202c9512c3a0cf11454626c83fdc6d4d3d41744bd10bc7f7e360e7ded4964a471ba13ab4
 MISC metadata.xml 336 BLAKE2B 36957f8dd3f83bd9fbbf5e504e5dd8b0fced6a57b51a4f31bc322b498ef16178641e13c9033cd6e3746677a6e9fe39e10b049f8a681ef04b0426a682ddec70b5 SHA512 5d0ade58e84b321f763690314eb9fa4d8aa2f8b06f4470466101e4213828d92ad200565d1cd5324a0a4e9ccd9daa0a13ff14f9574f6d6f639c92d0d9235dacb7
diff --git a/games-emulation/mednaffe/mednaffe-0.8.7.ebuild b/games-emulation/mednaffe/mednaffe-0.8.7.ebuild
deleted file mode 100644
index 904241ddac84..000000000000
--- a/games-emulation/mednaffe/mednaffe-0.8.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic gnome2-utils
-
-DESCRIPTION="A front-end (GUI) for mednafen emulator"
-HOMEPAGE="https://github.com/AmatCoder/mednaffe"
-SRC_URI="https://github.com/AmatCoder/mednaffe/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	games-emulation/mednafen[debugger]
-	>=x11-libs/gtk+-3.4:3
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	append-cflags -Wl,-export-dynamic
-	sed -i -e 's:$(datadir):/usr/share:' share/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --enable-gtk3
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-emulation/mednaffe/mednaffe-0.9.1.ebuild b/games-emulation/mednaffe/mednaffe-0.9.1.ebuild
new file mode 100644
index 000000000000..b8adfde93be4
--- /dev/null
+++ b/games-emulation/mednaffe/mednaffe-0.9.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg
+
+DESCRIPTION="Front-end (GUI) for mednafen emulator"
+HOMEPAGE="https://github.com/AmatCoder/mednaffe/"
+SRC_URI="https://github.com/AmatCoder/mednaffe/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-libs/glib:2
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3"
+RDEPEND="
+	${DEPEND}
+	>=games-emulation/mednafen-1.22.1"
+BDEPEND="virtual/pkgconfig"