gentoo resync : 23.09.2020

11 files changed, 306 insertions, 238 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 8c83792c623a..44d74f823c73 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/atari800/Manifest b/games-emulation/atari800/Manifest
index e14f401d8c6b..b259d05b6d77 100644
--- a/games-emulation/atari800/Manifest
+++ b/games-emulation/atari800/Manifest
@@ -1,9 +1,6 @@
 AUX atari800-3.1.0-tgetent-detection.patch 690 BLAKE2B 49016e922f66214dadd0da179679e61f9359f93020d964f4ccd4b0b27da5ceb0fcdc0eedee6b891f8090bfe2c2d4fb23bbbc8130e660a1b84df8434101248f90 SHA512 dc045dc72b011fe2fab1b440a5fc50c3a34dcb4cd867efa9a8276cc770f21778732adf6c59e5a3daec0cd37364a83f877c739d1120d468af9372d088895850e5
 AUX atari800-4.2.0.cfg 682 BLAKE2B 78df9048da4010676e9b0b60705ccc4722e7b81602585c3040f846088a7acd6a04133b3cde163f01b0096997eb6182d96d3782e04d8611ba8dc0f81c1e67abdd SHA512 357eb14d270297a90b52d33da98958e434847b84a00896b0cf93257955cab1fb4a214ac0a2a081a8773def9e99a95c6a6ad127b3dd4e7ed9fcbdec57b66d6fad
-AUX atari800.cfg 467 BLAKE2B 76caa8d4f73d292adb36ce66186bf657a25f4ef5404f0dedc0456fa933bc672bc5a89819b92555d88033bc47bdff4cd5b376571de01339a1b60a82a3210dcd11 SHA512 17f43f9f1b8dcf1513eefc8b89e94ecdaeb3f4e324a669e09c1f8b180e3c545b474164f73bc4c319dde27dda8effa1f2786957854ade81d161221e081c87d358
-DIST atari800-3.1.0.tar.gz 1492289 BLAKE2B cad7a3111bf714321d01aff1f8b30408efc1eca0876d9b795395d62d18eabdf78b71d3b2af887e8ba03e33e3824fcd5b45070e39cddd0e5ad0bda2d853f724b1 SHA512 c8f035c9be000c67dd854a14a236d165e6e2d30b5138f8772c6ea5c5290b0410525570e3ed9dcb2f9bcb129f97a36e6eef5993f0a5ad3cc993c6b59b127bcabe
 DIST atari800-4.2.0-src.tgz 7047710 BLAKE2B eac4b2da03d2ff5ec9e18dda41e0345975ed16c1cee23d15d2633211b7d4835b7a26c79fbf1672bb9ce3b82d52c7273e717371a0065ba29807f76d823eeb9855 SHA512 1236a8e05bf878e4514ae8e9f1556e0961a7f11ff0333eef415af455d217f712d5c6ededdd343dff6ba1aab777e19997bf9ecb859408187d69fc141301ecba31
 DIST xf25.zip 188942 BLAKE2B c10b9108eebc571ac334ea6fca76d227e3d2fcde1595e8823a3d178dc31d9efa9b209572ee03875461289093615470192cf5c9a06cf0b4363d097a9eac201db4 SHA512 306612fc2af41ed10d76103af83e141cfd8bd3ba2ea3cbd1d0b81d4d5b0108c06948a5c626648c8a2424536757a42a3f8b9af1fb63fa3c31096447ffed0f9923
-EBUILD atari800-3.1.0-r1.ebuild 1923 BLAKE2B c45ea37a93eae7cc5210eff2881cf49551efc0ecb0a3389e01f87018d351d37c192b5eb7069632bb4bbed7798c6a22bf7195d45528d8ac90896f050d64098379 SHA512 1441786da84d3aef99245c94c266380faff56b3be2a34c767b023ef22467e5d450d7c8a99371ef187238cfa81bbb7a571535b8877cf6c650480b225b1792b833
 EBUILD atari800-4.2.0.ebuild 1362 BLAKE2B 1cf5f3dbecf4f7b5948ea7a619fdaec953c8743db55a2ec61df90b1444a74aebeeee0d6b9c84ea3fb833cb95d78bbadaea21d5a2716f1ae721699246ace0281e SHA512 d734f3b3e0eabbf7bbafbc32530478c3eab9619560c5aa38ddd76e20df1ce9007ff65464a0a5f013ae4a34fdef067d5358f14cd21922fd7e58b5a4da5fe49488
 MISC metadata.xml 1134 BLAKE2B 80b312e7a4f7c30291d48abfbd7e001b0c4a288326b65d7607715ac8353c8f78b8e2b0c18d0414f66c9deb2184fee90f5da774c07eb33a83d5e6d3618254eaf5 SHA512 ffdf180d2119072cab24fd96229a643cb4f3862fbfe20562a0d95263454cdef5c48fa20be80383cb3043802be02d2a1036684981bd885d6a691776903de96d34
diff --git a/games-emulation/atari800/atari800-3.1.0-r1.ebuild b/games-emulation/atari800/atari800-3.1.0-r1.ebuild
deleted file mode 100644
index 559671226b0e..000000000000
--- a/games-emulation/atari800/atari800-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop autotools
-
-DESCRIPTION="Atari 800 emulator"
-HOMEPAGE="https://atari800.github.io/"
-SRC_URI="https://sourceforge.net/projects/${PN}/files/${PN}/${PV}/${P}.tar.gz
-	https://sourceforge.net/projects/${PN}/files/ROM/Original%20XL%20ROM/xf25.zip"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ncurses oss opengl readline +sdl +sound"
-
-NOTSDL_DEPS="
-	sys-libs/ncurses:0=
-	sound? (
-		!oss? ( media-libs/libsdl[sound] )
-	)
-"
-RDEPEND="
-	sdl? ( >=media-libs/libsdl-1.2.0[opengl?,sound?,video] )
-	ncurses? ( ${NOTSDL_DEPS} )
-	!sdl? ( !ncurses? ( ${NOTSDL_DEPS} ) )
-	readline? (
-		sys-libs/readline:0=
-		sys-libs/ncurses:0= )
-	media-libs/libpng:0=
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-"
-
-src_prepare() {
-	default
-
-	# remove some not-so-interesting ones
-	rm -f DOC/{INSTALL.*,*.in,CHANGES.OLD} || die
-	sed -i \
-		-e '1s/ 1 / 6 /' \
-		src/atari800.man || die
-	sed "s:/usr/share/games:/usr/share:" \
-		"${FILESDIR}"/atari800.cfg > "${T}"/atari800.cfg || die
-
-	# Bug 544608
-	eapply "${FILESDIR}/${P}-tgetent-detection.patch"
-	pushd src > /dev/null && eautoreconf
-	popd > /dev/null
-}
-
-src_configure() {
-	local video="ncurses"
-	local sound=no
-
-	use sdl && video="sdl"
-	if use sound ; then
-		if use sdl ; then
-			sound=sdl
-		elif use oss ; then
-			sound=oss
-		else
-			echo
-			elog "Sound requested but neither sdl nor oss specified."
-			elog "Disabling sound suport."
-		fi
-	fi
-
-	cd src && \
-		econf \
-			$(use_with readline) \
-			--with-video=${video} \
-			--with-sound=${sound}
-}
-
-src_compile() {
-	emake -C src
-}
-
-src_install() {
-	dobin src/atari800
-	newman src/atari800.man atari800.6
-	dodoc README.1ST DOC/*
-	insinto "/usr/share/${PN}"
-	doins "${WORKDIR}/"*.ROM
-	insinto /etc
-	doins "${T}"/atari800.cfg
-	newicon data/atari2.svg ${PN}.svg
-	make_desktop_entry ${PN} "Atari 800 emulator"
-}
diff --git a/games-emulation/atari800/files/atari800.cfg b/games-emulation/atari800/files/atari800.cfg
deleted file mode 100644
index b31c67de0958..000000000000
--- a/games-emulation/atari800/files/atari800.cfg
+++ /dev/null
@@ -1,24 +0,0 @@
-Atari 800 Emulator, Version 1.2.2
-OS/A_ROM=atariosa.rom
-OS/B_ROM=/usr/share/games/atari800/ATARIOSB.ROM
-XL/XE_ROM=/usr/share/games/atari800/ATARIXL.ROM
-BASIC_ROM=/usr/share/games/atari800/ATARIBAS.ROM
-5200_ROM=
-DISK_DIR=
-ROM_DIR=
-H1_DIR=
-H2_DIR=
-H3_DIR=
-H4_DIR=
-HD_READ_ONLY=1
-EXE_DIR=
-STATE_DIR=
-PRINT_COMMAND=lpr %s
-SCREEN_REFRESH_RATIO=1
-MACHINE_TYPE=Atari OS/B
-RAM_SIZE=48
-DEFAULT_TV_MODE=NTSC
-DISABLE_BASIC=1
-ENABLE_SIO_PATCH=1
-ENABLE_H_PATCH=1
-ENABLE_P_PATCH=1
diff --git a/games-emulation/fceux/Manifest b/games-emulation/fceux/Manifest
index 05958cb740e5..5f57b352b562 100644
--- a/games-emulation/fceux/Manifest
+++ b/games-emulation/fceux/Manifest
@@ -1,6 +1,5 @@
 AUX fceux-2.2.2-warnings.patch 1174 BLAKE2B 5b2076015d005a75ab97b586bb2af022b53a8d1724ef0becac808606366f3ba2f64e97c7073bb3f152d337c248ea91cfb15df81e2d1c5f3ebaf94f0defea3ae1 SHA512 03f7ff47f18982eb5fc7b0c942313fb6328412fe64c9b07bf97a85e25eb73c926b362ce5da789ebc7dff70f9d3d11e9df9e033e5a3ddd8fdee6c712471806b97
 AUX fceux-2.2.3-python3.patch 4392 BLAKE2B a71d108fee4aa1881cede5ffe484f0940ed3d6d3416a4849e4e3db1636ffd4112533954602781e928dafcffaee1f835972f2adf9b9fb465429d6abaf238a4042 SHA512 ca1026e02107ad64a36498f2e6eb8c0b814a75bad2a43717098a229a239123a306778d2ec669a4f0948a144f206c684858fd923cc7256e698816b2a0471d4c8f
 DIST fceux-2.2.3.src.tar.gz 9292792 BLAKE2B 44412934a50f2cab581cb194932a079071e8c7c1cb4cb4d173e9d7cf4898806fe1b0948d6e86fd70d1265eb596c47f77f751e3a113f03aba9b95e1f5def9c2a8 SHA512 6deb83e9e773694f4040f5f325b0b5b4f45d58bb3481db67b4659c940d90c4c87e3ffeac712b72ddb3f5d089cd9fc7b55b497db61f708c23a7c43c17eda55c7b
-EBUILD fceux-2.2.3-r1.ebuild 1267 BLAKE2B e9d01faaa175d4eddbd269dead3629eac26baa8c167c35dc5ca5a8d3cbe17d6e378610cddadd2c51b7035bb83cddcdb3f4b99251d7f0217c6412095acd25c9a0 SHA512 fe10b5f2ab05b4bbba0115259b8fbc1f3583a41bd65fd6890bbfd7211d871e0bd1c9f40c89dacb7d9351da7a103bc00648492c61ceabd9f573b1e8a722d1af91
 EBUILD fceux-2.2.3-r2.ebuild 1310 BLAKE2B 8330d9015264d4cfcb68e07fe9c53c2d4b854e80a398bd9709308ab9d78724fc2f74d84d6b97cf9c046cf77f79c6a6bff1925bf821f914139a46519cae477586 SHA512 ffb0b5a4c3f02bebf44abd454db4beefe4786f98ead9e28d0e8660f933eec18cd17945b4baef139fb4c05a279338d9dc1b33d878384d4306877e80fc993549d3
 MISC metadata.xml 432 BLAKE2B 69c86fec99d0d08d0672142afbb39b2f2c352af4a8ff953516522f721e2482a4624b542593c8eac0be3570a75037cf27b0c48bd19033429d1c5d66e85fcdb952 SHA512 f6f073a198d89d195daa4da1c4c8bdf631258db0ff8cc5fefd9d8a6d93beb38081d37a70df0d0f62d7bf79f7595a3456d88ac0c724535d8c453f3096d2256b96
diff --git a/games-emulation/fceux/fceux-2.2.3-r1.ebuild b/games-emulation/fceux/fceux-2.2.3-r1.ebuild
deleted file mode 100644
index 67080c8115f9..000000000000
--- a/games-emulation/fceux/fceux-2.2.3-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1 desktop scons-utils toolchain-funcs
-
-DESCRIPTION="A portable Famicom/NES emulator, an evolution of the original FCE Ultra"
-HOMEPAGE="http://fceux.com/"
-SRC_URI="mirror://sourceforge/fceultra/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk logo +lua +opengl"
-
-RDEPEND="
-	lua? ( dev-lang/lua:0 )
-	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)
-
-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/gngeo/Manifest b/games-emulation/gngeo/Manifest
index 6d147332d635..54a5bbff5cf6 100644
--- a/games-emulation/gngeo/Manifest
+++ b/games-emulation/gngeo/Manifest
@@ -1,8 +1,9 @@
 AUX gngeo-0.8-cflags.patch 1946 BLAKE2B 208a35296c2d943c65dfdcb02b3724bbc9bad4823103f10ec2fb7b069793a7ca901a51a41543175458f9e4326518f075eed924cdc492b1310159914a8c88e074 SHA512 5df77d438efd9040efcae7f1a19c5939967ae158a50408592b1dd81db26776215ec7994c8173db0e6f9888f45fa2c043bd1338f41a4c535e886c2b0f633a38b7
 AUX gngeo-0.8-concurrentMake.patch 635 BLAKE2B 5f2e96d55ad902a4f9904a28c0de855cd4fe7a65677d5a106688b9194a678b7f4a4be066942839a45c36ae717da62e53be36cdd7832a5abe72bc148b498f1766 SHA512 1d84bac8ad5dbe3f95ff148284d24432aece67191b566927dedf040cab080bf59f2b70f5ae788ab02e5d549b1c56fe2c8f92d5255b8c670433a2efb17483e460
 AUX gngeo-0.8-execstacks.patch 2505 BLAKE2B db1d2bdfe1cc45c76be070c3243439adbebac47b10aba46c85f3d3059d85cc90133e9a75e329b4d3d3ce369018797b166782dd0c795bf18511772013a66bb92d SHA512 cfd0cc424ce0862fb49a1349ec53c65051a13dc031bf66f4df3d96b5d44d9a1a0768c1184b5d6e35d6e72bbf779c0e499989f6b57cde1e25d0ce50bbbdbefdea
+AUX gngeo-0.8-fcommon.patch 7790 BLAKE2B 908a30c0677520a5140b5f3237b3ce6d6eb47ba77cf9ab48a73e48a8213aa31bbe985de8094635181a6fc77c471071ab3d390f886f880ffcbda7bb807cd9906b SHA512 2f25c1ed1526d691847beabafb6cb0b72bdd477a56e0d297d9c3e68e7b059d4752bca8cb3b60369931784876a3a9ed66f2d47513b1b3ffb53c8649cf16e52115
 AUX gngeo-0.8-zlib.patch 335 BLAKE2B 4b18c076a3285659f7e199a6d86c3ea2a899fe8dade51b03b36035c4cf9378a1b80ae16aa81c12f75a51bf0053f7d44dfb3b1025f7d95274a79689737ce6d1cb SHA512 6f09ebb89173bc172dc035247727d5e046fb36b3b05789d4b8e98648a229a260f3749fa3e2e35065a418e339d8d80830411ca3614171ef7aadeba0147a4f6a70
 DIST gngeo-0.8.tar.gz 1043579 BLAKE2B b4d1ffdb53e32ea25ed743af113573ce9ebd9f864bff1fed88797573141aecd3a2f799731316ced19892b9e45a334c8a8b59593fce4ec5651754bf80196c9e13 SHA512 4301e0f48afd8686cdc45bd8c3e7b724f4ab7a2482567c7fe99ee8960f652dbcefb00fcdd7071d85b02636a9ae9795d03169ffc79e8ae6f4c5515a5a53c090c7
 DIST gngeo.png 1488 BLAKE2B e474aaec3f9d79b83ecb3519680b172cfecbca27931bb3a039d6ee46c53737557ca2c110b22d0f974840039e465b7bfafa364ae2076f9ea785858099fe402922 SHA512 bc0403cf06fd1095095d87e5e6b8cd8d9e018a2a5b20f7168935d0c48d288af55bd98a72150f3c6d6089646a0780b65ff24f135bf5a680690af160c9be8945e5
-EBUILD gngeo-0.8-r1.ebuild 1045 BLAKE2B 0b002644090a65142e44a40fa2b6437318281973c800bc416f7e70f3035194ea5fd70ac22f9df046c22917154a3b16aba85a05f09d41fbf770adba594d13160b SHA512 7193404f6a63cf323f910f132809e865ca9eb65a6406e39252fbcd55980136dfe0879366abeea048edab343ca1bc51115f47eee64cf1eadd736c8a8a7f845fc5
+EBUILD gngeo-0.8-r2.ebuild 1065 BLAKE2B 7d86cb78bd0a78b0e2c78981831314954b97df9118484d35e396c1187953b25c9244a360ea7a02f69f841dfa59483e23f5a3c21b03381ca0e82fc570acbbab44 SHA512 8755550ed846f75cb623dc62a000fc3e63862b2ef3aed31b6e1aa27c280c084b1cbbf8e2d85a524f7a1d2c0064ca10b9038e2b8776bbd1b6d4dc2b34815415c9
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-emulation/gngeo/files/gngeo-0.8-fcommon.patch b/games-emulation/gngeo/files/gngeo-0.8-fcommon.patch
new file mode 100644
index 000000000000..63e1ff097bb7
--- /dev/null
+++ b/games-emulation/gngeo/files/gngeo-0.8-fcommon.patch
@@ -0,0 +1,289 @@
+--- a/src/memory.h	2011-10-25 18:04:13.000000000 -0000
++++ b/src/memory.h	2020-09-15 23:02:48.114069895 -0000
+@@ -114,30 +114,30 @@ typedef struct neo_mem {
+ 	Uint32 watchdog;
+ } neo_mem;
+ 
+-neo_mem memory;
++extern neo_mem memory;
+ 
+ /* video related */
+ //extern int irq2start, irq2control;
+-Uint8 *current_pal;
+-Uint32 *current_pc_pal;
+-Uint8 *current_fix;
+-Uint8 *fix_usage;
++extern Uint8 *current_pal;
++extern Uint32 *current_pc_pal;
++extern Uint8 *current_fix;
++extern Uint8 *fix_usage;
+ 
+ /* sram */
+-Uint8 sram_lock;
++extern Uint8 sram_lock;
+ //Uint32 sram_protection_hack;
+ //int sram_protection_hack;
+ 
+ /* Sound control */
+-Uint8 sound_code;
+-Uint8 pending_command;
+-Uint8 result_code;
++extern Uint8 sound_code;
++extern Uint8 pending_command;
++extern Uint8 result_code;
+ 
+ 
+ /* 68k cpu Banking control */
+ extern Uint32 bankaddress;		/* current bank */
+ //Uint8 current_cpu_bank;
+-Uint16 z80_bank[4];
++extern Uint16 z80_bank[4];
+ 
+ /* misc utility func */
+ void update_all_pal(void);
+@@ -263,10 +263,10 @@ void mem68k_store_bk_kof2003_byte(Uint32
+ void mem68k_store_bk_kof2003_word(Uint32 addr, Uint16 data);
+ void mem68k_store_bk_kof2003_long(Uint32 addr, Uint32 data);
+ 
+-Uint8 (*mem68k_fetch_bksw_byte)(Uint32);
+-Uint16 (*mem68k_fetch_bksw_word)(Uint32);
+-Uint32 (*mem68k_fetch_bksw_long)(Uint32);
+-void (*mem68k_store_bksw_byte)(Uint32,Uint8);
+-void (*mem68k_store_bksw_word)(Uint32,Uint16);
+-void (*mem68k_store_bksw_long)(Uint32,Uint32);
++extern Uint8 (*mem68k_fetch_bksw_byte)(Uint32);
++extern Uint16 (*mem68k_fetch_bksw_word)(Uint32);
++extern Uint32 (*mem68k_fetch_bksw_long)(Uint32);
++extern void (*mem68k_store_bksw_byte)(Uint32,Uint8);
++extern void (*mem68k_store_bksw_word)(Uint32,Uint16);
++extern void (*mem68k_store_bksw_long)(Uint32,Uint32);
+ #endif
+--- a/src/video.h	2011-10-25 18:04:13.000000000 -0000
++++ b/src/video.h	2020-09-15 23:01:55.756521216 -0000
+@@ -67,7 +67,7 @@ typedef struct VIDEO {
+ 
+ #define RASTER_LINES 261
+ 
+-unsigned int neogeo_frame_counter;
++extern unsigned int neogeo_frame_counter;
+ extern unsigned int neogeo_frame_counter_speed;
+ 
+ void init_video(void);
+--- a/src/memory.c	2011-10-25 18:04:13.000000000 -0000
++++ b/src/memory.c	2020-09-15 23:08:31.083181700 -0000
+@@ -896,3 +896,19 @@ void mem68k_store_bk_normal_word(Uint32
+ 
+ LONG_STORE(mem68k_store_bk_normal)
+ ;
++Uint8* current_pal;
++Uint32 *current_pc_pal;
++Uint8 *current_fix;
++Uint8 *fix_usage;
++Uint8 sram_lock;
++Uint8 sound_code;
++Uint8 pending_command;
++Uint8 result_code;
++Uint16 z80_bank[4];
++Uint8 (*mem68k_fetch_bksw_byte)(Uint32);
++Uint16 (*mem68k_fetch_bksw_word)(Uint32);
++Uint32 (*mem68k_fetch_bksw_long)(Uint32);
++void (*mem68k_store_bksw_byte)(Uint32,Uint8);
++void (*mem68k_store_bksw_word)(Uint32,Uint16);
++void (*mem68k_store_bksw_long)(Uint32,Uint32);
++neo_mem memory;
+--- b/src/video.c	2011-10-25 18:04:13.000000000 -0000
++++ b/src/video.c	2020-09-15 23:09:15.113923583 -0000
+@@ -32,6 +32,7 @@
+ #include "transpack.h"
+ 
+ extern int neogeo_fix_bank_type;
++unsigned int neogeo_frame_counter;
+ 
+ 
+ #ifdef PROCESSOR_ARM
+--- a/src/screen.c	2011-10-25 18:04:13.000000000 -0000
++++ b/src2/screen.c	2020-09-15 23:14:14.508969030 -0000
+@@ -401,3 +401,14 @@ void screen_fullscreen() {
+ 	fullscreen ^= 1;
+ 	blitter[nblitter].fullscreen();
+ }
++SDL_Surface *screen;
++SDL_Surface *buffer, *sprbuf, *fps_buf, *scan, *fontbuf;
++SDL_Rect visible_area;
++int yscreenpadding;
++Uint8 interpolation;
++Uint8 nblitter;
++Uint8 neffect;
++Uint8 scale;
++Uint8 fullscreen;
++
++
+--- a/src/screen.h	2011-10-25 18:04:13.000000000 -0000
++++ b/src/screen.h	2020-09-15 23:14:14.085628561 -0000
+@@ -17,19 +17,19 @@ extern RGB2YUV rgb2yuv[65536];
+ 
+ void init_rgb2yuv_table(void);
+ 
+-SDL_Surface *screen;
+-SDL_Surface *buffer, *sprbuf, *fps_buf, *scan, *fontbuf;
++extern SDL_Surface *screen;
++extern SDL_Surface *buffer, *sprbuf, *fps_buf, *scan, *fontbuf;
+ //SDL_Surface *triplebuf[2];
+ 
+-SDL_Rect visible_area;
++extern SDL_Rect visible_area;
+ 
+-int yscreenpadding;
++extern int yscreenpadding;
+ 
+-Uint8 interpolation;
+-Uint8 nblitter;
+-Uint8 neffect;
+-Uint8 scale;
+-Uint8 fullscreen;
++extern Uint8 interpolation;
++extern Uint8 nblitter;
++extern Uint8 neffect;
++extern Uint8 scale;
++extern Uint8 fullscreen;
+ 
+ Uint8 get_effect_by_name(char *name);
+ Uint8 get_blitter_by_name(char *name);
+
+--- a/src/emu.c	2011-10-25 18:04:13.000000000 -0000
++++ b/src/emu.c	2020-09-15 23:55:31.560725467 -0000
+@@ -64,6 +64,11 @@ extern int irq2enable, irq2start, irq2re
+ extern int lastirq2line;
+ extern int irq2repeat_limit;
+ extern Uint32 irq2pos_value;
++Uint8 key[SDLK_LAST];
++Uint8 *joy_button[2];
++Sint32 *joy_axe[2];
++Uint32 joy_numaxes[2];
++conf_type conf;
+ 
+ void setup_misc_patch(char *name) {
+ 
+--- a/src/emu.h	2011-10-25 18:04:13.000000000 -0000
++++ b/src/emu.h	2020-09-15 23:55:31.067383834 -0000
+@@ -45,7 +45,7 @@ typedef enum COUNTRY {
+     CTY_MAX
+ } COUNTRY;
+ 
+-struct {
++typedef struct {
+     char *game;
+     Uint16 x_start;
+     Uint16 y_start;
+@@ -89,7 +89,8 @@ struct {
+ 
+     int p1_hotkey[4];
+     int p2_hotkey[4];
+-} conf;
++} conf_type;
++extern conf_type conf;
+ 
+ enum {
+     HOTKEY_MASK_A = 0x1,
+@@ -123,10 +124,10 @@ enum {
+ 
+ //config conf;
+ 
+-Uint8 key[SDLK_LAST];
+-Uint8 *joy_button[2];
+-Sint32 *joy_axe[2];
+-Uint32 joy_numaxes[2];
++extern Uint8 key[SDLK_LAST];
++extern Uint8 *joy_button[2];
++extern Sint32 *joy_axe[2];
++extern Uint32 joy_numaxes[2];
+ 
+ void debug_loop(void);
+ void main_loop(void);
+--- a/src/state.c	2011-10-25 18:04:13.000000000 -0000
++++ b/src/state.c	2020-09-15 23:51:12.333025158 -0000
+@@ -627,6 +627,7 @@ void clear_state_reg(void) {
+ 	st_mod[i].reglist=NULL;
+     }
+ }
++SDL_Surface *state_img;
+ 
+ void neogeo_init_save_state(void) {
+     int i;
+--- a/src/state.h	2011-10-25 18:04:13.000000000 -0000
++++ b/src/state.h	2020-09-15 23:50:09.751969676 -0000
+@@ -80,7 +80,7 @@ typedef struct NEOGEO_STATE {
+     Uint8 pal1[0x2000], pal2[0x2000];
+ }NEOGEO_STATE;
+ 
+-SDL_Surface *state_img;
++extern SDL_Surface *state_img;
+ 
+ #define STREAD  0
+ #define STWRITE 1
+--- a/src/event.c	2012-01-13 20:25:07.000000000 -0000
++++ b/src/event.c	2020-09-16 00:13:06.148468785 -0000
+@@ -10,6 +10,8 @@
+ #include "conf.h"
+ #include "emu.h"
+ #include "memory.h"
++JOYMAP *jmap;
++Uint8 joy_state[2][GN_MAX_KEY];
+ 
+ static int get_mapid(char *butid) {
+ 	printf("Get mapid %s\n",butid);
+--- a/src/event.h	2011-10-25 18:04:13.000000000 -0000
++++ b/src/event.h	2020-09-16 00:13:05.125118226 -0000
+@@ -41,8 +41,8 @@ typedef struct JOYMAP {
+ 	struct BUT_MAP **jhat;
+ }JOYMAP;
+ 
+-JOYMAP *jmap;
+-Uint8 joy_state[2][GN_MAX_KEY];
++extern JOYMAP *jmap;
++extern Uint8 joy_state[2][GN_MAX_KEY];
+ 
+ 
+ bool init_event(void);
+--- a/src/frame_skip.c	2011-10-25 18:04:13.000000000 -0000
++++ b/src/frame_skip.c	2020-09-16 00:14:09.792873267 -0000
+@@ -33,6 +33,7 @@
+ #ifndef uclock_t
+ #define uclock_t Uint32
+ #endif
++char fps_str[32];
+ 
+ #define TICKS_PER_SEC 1000000UL
+ //#define CPU_FPS 60
+--- a/src/frame_skip.h	2011-10-25 18:04:13.000000000 -0000
++++ b/src/frame_skip.h	2020-09-16 00:14:10.619553849 -0000
+@@ -22,7 +22,7 @@
+ 
+ extern char skip_next_frame;
+ 
+-char fps_str[32];
++extern char fps_str[32];
+ 
+ void reset_frame_skip(void);
+ int frame_skip(int init);
+--- a/src/transpack.c	2011-10-25 18:04:13.000000000 -0000
++++ b/src/transpack.c	2020-09-16 00:14:41.750077802 -0000
+@@ -26,6 +26,7 @@
+ #include <string.h>
+ 
+ #include "transpack.h"
++TRANS_PACK *tile_trans;
+ 
+ 
+ static void trans_pack_add(Uint32 begin,Uint32 end,Uint32 type)
+--- a/src/transpack.h	2011-10-25 18:04:13.000000000 -0000
++++ b/src/transpack.h	2020-09-16 00:14:41.073399747 -0000
+@@ -14,7 +14,7 @@ typedef struct TRANS_PACK {
+     Uint8 type;
+     struct TRANS_PACK *next;
+ } TRANS_PACK;
+-TRANS_PACK *tile_trans;
++extern TRANS_PACK *tile_trans;
+ 
+ TRANS_PACK* trans_pack_find(Uint32 tile);
+ void trans_pack_open(char *filename);
diff --git a/games-emulation/gngeo/gngeo-0.8-r1.ebuild b/games-emulation/gngeo/gngeo-0.8-r2.ebuild
index 3e7f2be86fc0..f4e1e906ad79 100644
--- a/games-emulation/gngeo/gngeo-0.8-r1.ebuild
+++ b/games-emulation/gngeo/gngeo-0.8-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit autotools desktop flag-o-matic
 
 DESCRIPTION="A NeoGeo emulator"
@@ -12,20 +13,24 @@ SRC_URI="https://gngeo.googlecode.com/files/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="virtual/opengl
+DEPEND="
 	media-libs/libsdl[joystick,opengl,sound,video]
-	sys-libs/zlib[minizip]"
+	sys-libs/zlib[minizip]
+	virtual/opengl
+"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-execstacks.patch
+	"${FILESDIR}"/${P}-zlib.patch
+	"${FILESDIR}"/${P}-concurrentMake.patch
+	"${FILESDIR}"/${P}-cflags.patch
+	"${FILESDIR}"/${P}-fcommon.patch
+)
+
 src_prepare() {
 	default
-	eapply \
-		"${FILESDIR}"/${P}-execstacks.patch \
-		"${FILESDIR}"/${P}-zlib.patch \
-		"${FILESDIR}"/${P}-concurrentMake.patch \
-		"${FILESDIR}"/${P}-cflags.patch
 	mv configure.in configure.ac || die
 	eautoreconf
 	append-cflags -std=gnu89 # build with gcc5 (bug #571056)
diff --git a/games-emulation/m64py/Manifest b/games-emulation/m64py/Manifest
index 1d2c041aebb3..57998a9001bd 100644
--- a/games-emulation/m64py/Manifest
+++ b/games-emulation/m64py/Manifest
@@ -1,5 +1,3 @@
-DIST m64py-0.2.4.tar.gz 209621 BLAKE2B 05fe7044ec096767ae1eb57aad9f326b157d67ea709ca0bb74cdd68ae16a23eb662a2842bef5e038d1b29cbf0a5252669ff54268d1227390f47e8c9029b63e6a SHA512 ab78565466c6dcfe604cdc00b7e63dee2f0f33514dbf4f9115af646b1f6562042516513d054bd5cb489ad89c9d30431e9ce531f8b27925ecb9c6f7b509836348
 DIST m64py-0.2.5.tar.gz 201868 BLAKE2B 95cbfe58ae2741caac5e05bcc06af563ee398d2916d07902ba4aaf4213277eea3c6219448db5958e0a2d0ea8ea3f65c88e63cfd2938a8b4ed33231ba57ae724f SHA512 338f5e96dc4657ba2230c32a40cf0e85c5efcccaa0d5fdbe4b4dcef020b910f5d2d88e5c224f8b496ec0378051aaf44358a0438de52fb03b4ece353f55abc61c
-EBUILD m64py-0.2.4.ebuild 1042 BLAKE2B fe84544eb7b564f86d36389c535fe83a845893eeda970c7fd225c46933641395bf32eeca69c5e27971aaf5b4384bac6b8f8be93a10fc357947105e69f3bef17a SHA512 d7c83240d5a747134efb50f9013e5f42dafed0f11ab12898c249e4474d83c6b6ac7dcfc7f9bd65642acd385452dde8f243cb78c62a9036dc93296ba181d0f501
 EBUILD m64py-0.2.5.ebuild 1043 BLAKE2B 96a9604565785fc680c7554cb8abec300eba99ae9ee64a7237a737fe6b86678c45b47a9715c84a9be6516cd803bf4cbfab74dbed0376c12994c4236e57465fb3 SHA512 8f57d7ceb16452973c53c8a639e0580ad7a2a70cc64ef0adb63b2aec8ab96c675e341ea32bf1b872dad2bb9348e5d1843106e348da28e460d89dcd51a8c3e749
 MISC metadata.xml 455 BLAKE2B 094f3f1db818c82e55c07512db2e94ed800bfd14595d70aa8ddca7d63e862807c5552210f9a71c01ea0fbcc61f3d46a139a762d1026d75b1f932e15ec7e0e589 SHA512 41d3ca220e71119ec7bf4ea8b1ea92289d901ba3a0058e75423dd50580d03a0cbc9aae2c368fc3c47793e0405c0e167fc546c65f039661b5b11fbb274846301b
diff --git a/games-emulation/m64py/m64py-0.2.4.ebuild b/games-emulation/m64py/m64py-0.2.4.ebuild
deleted file mode 100644
index be315cbc1541..000000000000
--- a/games-emulation/m64py/m64py-0.2.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="A frontend for Mupen64Plus"
-HOMEPAGE="http://m64py.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/project/m64py/${P}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3 public-domain GPL-2 BSD CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="7z rar"
-
-RDEPEND="
-	dev-python/PyQt5[gui,opengl,widgets,${PYTHON_USEDEP}]
-	dev-python/PySDL2[${PYTHON_USEDEP}]
-	media-libs/libsdl2[joystick,video]
-	>=games-emulation/mupen64plus-core-2.5:0/2-sdl2
-	7z? ( app-arch/p7zip )
-	rar? (
-		|| (
-			dev-python/rarfile[${PYTHON_USEDEP}]
-			app-arch/unrar
-			app-arch/rar
-		)
-	)"
-
-python_prepare_all() {
-	# set the correct search path
-	cat >> src/m64py/platform.py <<-_EOF_ || die
-		SEARCH_DIRS = ["/usr/$(get_libdir)/mupen64plus"]
-	_EOF_
-
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}