gentoo resync : 30.04.2018

101 files changed, 897 insertions, 1152 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 9e59c28e443a..90b7f65ae3ca 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/advancemame/Manifest b/games-emulation/advancemame/Manifest
index 2032928d596c..52e3d74d5be6 100644
--- a/games-emulation/advancemame/Manifest
+++ b/games-emulation/advancemame/Manifest
@@ -1,5 +1,5 @@
 AUX advancemame-1.2-pic.patch 344 BLAKE2B 61e312fe33565171824e2e875a22187134bfc8905dfa2f6bc50b43427acd0f25502d1da1f7f591c1882e82f37d591c737af0aaaa98705c345637d786886e6c20 SHA512 5ae1a76a5e08e65efece7b295af7e177e8da7d65c7de9a03529d8a6909d38c6510d8c3e122bc4bc542760bc2cdf2e26a1edf56d27bcfa6b1fe25ea9c0f467360
 AUX advancemame-1.2-verboselog.patch 838 BLAKE2B 157d3797c5b92148d35f502fbc76aac9742c21b277d897308e4a074e1cba95b6fe1ea3e6b758be0a8d8b7e10fba5d33f5ac318d7c332f6bf622215627168646e SHA512 d34ff98ff2971a01dd46a66b322507afec4930f89afd2141e753233efeccdc582644dbf576eae08300c8e3be0336e09e56609983bcd602a69a47985ecd954e6e
-DIST advancemame-1.2.tar.gz 17508670 BLAKE2B 44b2d549e9ee6bb8d46815c083851b0b25fb6c7eda21a4ac28fe805306965ce5c07b2cfb679a43eebeb9aff4cc34ccfa12e554a008c2d2e70ee59bedc41d15d8 SHA512 6d9cf7ce0553ea6bc60c91bff7d55f282ebd671c5a48ebb25a8b0a41c575b3a8f0446f8f39ca0bccf93493ef28b331d4661987eb1f8adc5bd2c911674d1be583
-EBUILD advancemame-1.2.ebuild 1842 BLAKE2B 0453af02eec595d8032715d2ec362c9578a1a906eb801299a466aa48bf733ce9e6da7bcd779f4a8aa5492eadc0fcc7aff71307f29a487bf4e257aa7ee3b0e409 SHA512 44679f71b6ce157c8b9ed211d492049945a4e0f32b3e58877d00384a73907476761a0110d3d53cd0488126e2bbb128793977e089f9d6859bd4dc2425fa8f0473
+DIST advancemame-3.7.tar.gz 25616260 BLAKE2B 455004ff7ce3f7517c6b06767e9d1656bff6b93f822d363cbd42738e0f9ba988c243f600db5f20e24897c27faaf5c458072e2bc9c97cf92803f76299cf3010b8 SHA512 b5af59cdd3cf70dfae0769ed35eb6ce00a6f01d05eefcb687f322420faa2ee5aabf83394249c2ab7f7f1241d3fd09c2f0412666b2dbd27b91e7bc3622f925f74
+EBUILD advancemame-3.7.ebuild 1827 BLAKE2B 685e054241036197c4e387d16a0b89167a37f12f10e57c5965fb7e3ebdf369f985c4c35e07dee275574ae77c5128d3676b6e53a4df22346485f57995bda1c247 SHA512 99ea75cdcb038bfb36d1cdc625162767867b72031c0823ad09386664f00c9c283a25df2b2b65f1ec74e65e955a656de2c721af6b7a6984131fc8f9a32ae70e99
 MISC metadata.xml 1139 BLAKE2B 0722cccd2aa4d9e24eb990e460c91d8df503c1adffa680ac5e1f2b900bdfc93099feb06aab43b43ce27defc3183c6b75c594ce99e7f1396f5512babfc9de68d0 SHA512 a9a85b10cfbf6c7a75c317db8d242d29655d14d9891b897171161af613221fe93ad776ddb53fcddd14f08295d1e02c3c3fbccdce027e2a0d1c434fe60e49f349
diff --git a/games-emulation/advancemame/advancemame-1.2.ebuild b/games-emulation/advancemame/advancemame-3.7.ebuild
index 970717cff472..37773715f8e2 100644
--- a/games-emulation/advancemame/advancemame-1.2.ebuild
+++ b/games-emulation/advancemame/advancemame-3.7.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils flag-o-matic games
+EAPI=6
+inherit flag-o-matic
 
 DESCRIPTION="GNU/Linux port of the MAME emulator with GUI menu"
-HOMEPAGE="http://advancemame.sourceforge.net/"
-SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz"
+HOMEPAGE="http://www.advancemame.it/"
+SRC_URI="https://github.com/amadvance/advancemame/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2 XMAME"
 SLOT="0"
@@ -14,30 +14,31 @@ KEYWORDS="~amd64 ~x86"
 IUSE="alsa fbcon oss truetype"
 
 # sdl is required (bug #158417)
-RDEPEND="app-arch/unzip
+RDEPEND="
+	app-arch/unzip
 	app-arch/zip
 	dev-libs/expat
-	media-libs/libsdl
+	media-libs/libsdl2
 	sys-libs/zlib
 	alsa? ( media-libs/alsa-lib )
-	truetype? ( media-libs/freetype )"
+	truetype? ( media-libs/freetype:2 )
+"
 DEPEND="${RDEPEND}
 	virtual/os-headers
-	x86? ( >=dev-lang/nasm-0.98 )"
+	x86? ( >=dev-lang/nasm-0.98 )
+"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-pic.patch" \
-		"${FILESDIR}"/${P}-verboselog.patch
-
-	sed -i \
-		-e 's/"-s"//' \
-		configure || die "sed failed"
-
-	use x86 &&
-		ln -s $(type -P nasm) "${T}/${CHOST}-nasm"
-	ln -s $(type -P sdl-config) "${T}/${CHOST}-sdl-config"
-	use truetype &&
-		ln -s $(type -P freetype-config) "${T}/${CHOST}-freetype-config"
+	default
+
+	eapply "${FILESDIR}/${PN}-1.2-pic.patch" \
+		"${FILESDIR}"/${PN}-1.2-verboselog.patch
+
+	sed -i -e 's/"-s"//' configure || die
+
+	use x86 && ln -s $(type -P nasm) "${T}/${CHOST}-nasm"
+	ln -s $(type -P sdl2-config) "${T}/${CHOST}-sdl2-config"
+	use truetype && ln -s $(type -P freetype-config) "${T}/${CHOST}-freetype-config"
 }
 
 src_configure() {
@@ -47,9 +48,10 @@ src_configure() {
 	fi
 
 	PATH="${PATH}:${T}"
-	egamesconf \
+	econf \
 		--enable-expat \
-		--enable-sdl \
+		--enable-sdl2 \
+		--disable-sdl \
 		--enable-zlib \
 		--disable-slang \
 		--disable-svgalib \
@@ -58,8 +60,7 @@ src_configure() {
 		$(use_enable fbcon fb) \
 		$(use_enable oss) \
 		$(use_enable truetype freetype) \
-		$(use_enable x86 asm) \
-		--with-emu=${PN/advance}
+		$(use_enable x86 asm)
 }
 
 src_compile() {
@@ -71,21 +72,20 @@ src_install() {
 
 	for f in adv* ; do
 		if [[ -L "${f}" ]] ; then
-			dogamesbin "${f}"
+			dobin "${f}"
 		fi
 	done
 
-	insinto "${GAMES_DATADIR}/advance"
+	insinto "/usr/share/advance"
 	doins support/event.dat
-	keepdir "${GAMES_DATADIR}/advance/"{artwork,diff,image,rom,sample,snap}
+	keepdir "/usr/share/advance/"{artwork,diff,image,rom,sample,snap}
 
 	dodoc HISTORY README RELEASE
 	cd doc
 	dodoc *.txt
-	dohtml *.html
+	HTMLDOCS="*.html" einstalldocs
+
 	for f in *.1 ; do
 		newman ${f} ${f/1/6}
 	done
-
-	prepgamesdirs
 }
diff --git a/games-emulation/atari800/Manifest b/games-emulation/atari800/Manifest
index 48a77a5a6d95..5ebd2c1ca923 100644
--- a/games-emulation/atari800/Manifest
+++ b/games-emulation/atari800/Manifest
@@ -2,5 +2,5 @@ AUX atari800-3.1.0-tgetent-detection.patch 690 BLAKE2B 49016e922f66214dadd0da179
 AUX atari800.cfg 467 BLAKE2B 76caa8d4f73d292adb36ce66186bf657a25f4ef5404f0dedc0456fa933bc672bc5a89819b92555d88033bc47bdff4cd5b376571de01339a1b60a82a3210dcd11 SHA512 17f43f9f1b8dcf1513eefc8b89e94ecdaeb3f4e324a669e09c1f8b180e3c545b474164f73bc4c319dde27dda8effa1f2786957854ade81d161221e081c87d358
 DIST atari800-3.1.0.tar.gz 1492289 BLAKE2B cad7a3111bf714321d01aff1f8b30408efc1eca0876d9b795395d62d18eabdf78b71d3b2af887e8ba03e33e3824fcd5b45070e39cddd0e5ad0bda2d853f724b1 SHA512 c8f035c9be000c67dd854a14a236d165e6e2d30b5138f8772c6ea5c5290b0410525570e3ed9dcb2f9bcb129f97a36e6eef5993f0a5ad3cc993c6b59b127bcabe
 DIST xf25.zip 188942 BLAKE2B c10b9108eebc571ac334ea6fca76d227e3d2fcde1595e8823a3d178dc31d9efa9b209572ee03875461289093615470192cf5c9a06cf0b4363d097a9eac201db4 SHA512 306612fc2af41ed10d76103af83e141cfd8bd3ba2ea3cbd1d0b81d4d5b0108c06948a5c626648c8a2424536757a42a3f8b9af1fb63fa3c31096447ffed0f9923
-EBUILD atari800-3.1.0.ebuild 2057 BLAKE2B f36f88eb4a86814a1b1da2910a5aa9aeb7e4f55ee75664dbdd539a490d3f50e1e223bb51d022d31311390c3024172316a4dba4a657bfd9fcf4b959007d8aead7 SHA512 5b49044c8010149ca720dcbdda01fa4101d6f421f36f4dc9a821c038146e75d82433d86e94ec8bc018d5c00828ea536135343c58306e20653b75b697d5ae0e39
+EBUILD atari800-3.1.0-r1.ebuild 1860 BLAKE2B c286b79674f42d3a421be8e5e5c8ac02387c81ee5994fc7e9657e0732c46d1a38ee93ba240530f5072baaad88b648c28ed533114a9aa986a8b51a3f4e18ffede SHA512 ad3fc9d642d739fd8024c81db883d5b5bffa46e6e5b9967aa5dcbb1d45373eafb7cb399118e01354fbdb878b7ea49d5d76b38189d1bd643503a78ed2ed3ed0e4
 MISC metadata.xml 961 BLAKE2B 5f5e394a1ea4099f9d33f1e4f542b98ea31038e2855d839a86ea55fca18f02b9d99f2b0b554e0816142d80ca84adcbe2e1af1c664d773fb8df2794600fe21b48 SHA512 f31b0309a14446c07f11c72be8bb0cda851e5e0f424211f7a26eb5030935119a31eccfc1d81d80987cf6a6ef22d56e74edd258eba13d2635cccd584fadaaf123
diff --git a/games-emulation/atari800/atari800-3.1.0.ebuild b/games-emulation/atari800/atari800-3.1.0-r1.ebuild
index 662b234ea305..31aa318cdebb 100644
--- a/games-emulation/atari800/atari800-3.1.0.ebuild
+++ b/games-emulation/atari800/atari800-3.1.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit games autotools eutils
+EAPI=6
+inherit desktop autotools
 
 DESCRIPTION="Atari 800 emulator"
 HOMEPAGE="http://atari800.sourceforge.net/"
@@ -15,37 +15,38 @@ KEYWORDS="~amd64 ~x86"
 IUSE="ncurses oss opengl readline +sdl +sound"
 
 NOTSDL_DEPS="
-	sys-libs/ncurses:0
+	sys-libs/ncurses:0=
 	sound? (
 		!oss? ( media-libs/libsdl[sound] )
-	)"
-RDEPEND="sdl? ( >=media-libs/libsdl-1.2.0[opengl?,sound?,video] )
+	)
+"
+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"
+	readline? (
+		sys-libs/readline:0=
+		sys-libs/ncurses:0= )
+	media-libs/libpng:0=
+	sys-libs/zlib
+"
 DEPEND="${RDEPEND}
-	app-arch/unzip"
+	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 -i \
-		-e "/SYSTEM_WIDE_CFG_FILE/s:/etc:${GAMES_SYSCONFDIR}:" \
-		src/cfg.c || die
-	sed -i \
-		-e "/share/s:/usr/share:${GAMES_DATADIR}:" \
-		src/atari.c || die
-	sed "s:/usr/share/games:${GAMES_DATADIR}:" \
+	sed "s:/usr/share/games:/usr/share:" \
 		"${FILESDIR}"/atari800.cfg > "${T}"/atari800.cfg || die
 
 	# Bug 544608
-	epatch "${FILESDIR}/${P}-tgetent-detection.patch"
+	eapply "${FILESDIR}/${P}-tgetent-detection.patch"
 	pushd src > /dev/null && eautoreconf
 	popd > /dev/null
 }
@@ -67,12 +68,8 @@ src_configure() {
 		fi
 	fi
 
-	echo
-	elog "Building ${PN} with ${video} video and ${sound} sound"
-	echo
-
 	cd src && \
-		egamesconf \
+		econf \
 			$(use_with readline) \
 			--with-video=${video} \
 			--with-sound=${sound}
@@ -83,12 +80,13 @@ src_compile() {
 }
 
 src_install () {
-	dogamesbin src/atari800
+	dobin src/atari800
 	newman src/atari800.man atari800.6
 	dodoc README.1ST DOC/*
-	insinto "${GAMES_DATADIR}/${PN}"
+	insinto "/usr/share/${PN}"
 	doins "${WORKDIR}/"*.ROM
-	insinto "${GAMES_SYSCONFDIR}"
+	insinto /etc
 	doins "${T}"/atari800.cfg
-	prepgamesdirs
+	newicon data/atari2.svg ${PN}.svg
+	make_desktop_entry ${PN} "Atari 800 emulator"
 }
diff --git a/games-emulation/daphne/Manifest b/games-emulation/daphne/Manifest
index 092c29ade2c2..ed0bebb0665a 100644
--- a/games-emulation/daphne/Manifest
+++ b/games-emulation/daphne/Manifest
@@ -1,10 +1,10 @@
-AUX daphne-1.0-gcc43.patch 482 BLAKE2B 3a230feb2049dd2906dd4e1e0879c0b2c45369e3b1a6ea80efc9bd4cdd78431486ff5e580aacc33e8103a9d7f1f2c9aa923a01951504a6dbe561be95625fca40 SHA512 1346714f3fce3e7d73a4bfb00ff379d798c241d61f008116f283ee206bcd9952913eac98565b6acf1d8ba79b9c2f1095a7368c28c78e496615e37567a6352e77
-AUX daphne-1.0-ldflags.patch 612 BLAKE2B 8e3c23ab710d14e1d47a1105d2bd2e84d792f9394e21d760d3480f6eb7cd45c897dfa9e4cf6053400c8163021ab89c680b60d3aaab3aa07ba5ec2cbd34ad5612 SHA512 05176cff73a06e83df644854551e688f64f1d9fb82387847fc61735d9dea1eeda0d2cf1930350dfcc2dd98aebc9352f9e61b3d3aaca736fd62de6282154c98b4
-AUX daphne-1.0-system-lmpeg2.patch 1607 BLAKE2B 2281d20bc1563ccf3463667212e66049ce336870a8aa22f2f7d6cf185f42ecd7a404c87d8b12b2a5a2c400659209083dc19374e486ebe4f0a4ab063c8ae0922f SHA512 92a4d60db095deb8ddcdca23e89f82196f912d9c14202070b039443d328e436dd20714fac90db5ae20f88e955c2cef6f4d339b45d4fdf44115c619e7d5e8bb64
-AUX daphne-1.0-typefix.patch 1993 BLAKE2B 89b7ff4e2519f5c582fc4c32183bc9a46dfc35ff91204b880e109ba6b0479cf44fb7c149d45354c63652377ffb41b3ee9b77195b424c87036bdca775187abb15 SHA512 d8d084d1ef19526a49ed1a0a6e1c03a79bf4f90a6b1fcf99a4ec9b3137401b4a4aacdcaa9d166857dda649ece865e26c8538681822f19845b6c15a91618adb63
-AUX daphne-1.0-underlink.patch 403 BLAKE2B 936509f5c7b82eab3a64cbab97eb02a58b3de7b9d7382548f9cc54e92e30bbcc4dd1c085f08476bf1a4f92fa165cd4e45f920e89515bc1b7eaa2a3e0bf97e778 SHA512 752bc994977e7b8a179c1763cda6c89ffe0bad8bf35414de99d9d412ff82e6f6f8ce05856feca728654cb12d770b59bb5ac204ce86371f2515073c89a5c75962
-AUX daphne-1.0-vorbisfilefix.patch 521 BLAKE2B 7edb0be464a1024d9e4aa8caec49296d4b56e12f05146d7a24b0d5687251a92ff97a40bd280ec39ec3fdffbf00f38b5d9f654d4af0212ddec39acc099b987971 SHA512 fb0bd9d56536b5e2688b3398738ccb267ff76ebbe2baec52d80ae2246a1de63e95a85b7bfeb918a827c7fbc0ffa0c735b02d5f523337fc1f0107f1799de436f1
-AUX daphne-1.0-zlib.patch 356 BLAKE2B 1a209db483accfb04088b29bc3c718e5f8ee5327467c72db17e52aee53f5692632427307368d605f73ef4c530517808e0b26abeec62d89ae3356b03817fac8cb SHA512 56c64a616791734fdb77b3e3e22aa53285a9a2a241e6b1237edb486674182d16992b3d6fb36b7b5705c9b7acdd5da398638ca384f72f52862dedd85c4449ef6f
+AUX daphne-1.0-gcc43.patch 486 BLAKE2B 2f316f61b6386c3bbb3ddb4eae154953fcca2e38cd3f83b46c5d4c5cd77efce514540ddee385ebfebe172c921dc19522cd2996b8dfa57e386c2516538b5d9d1e SHA512 ab47c9d7c45191ff0b8b5dcb5de2553da0983785f5497cc4a683c1501cee5d1fde0bc70311a1fca68785ede36e410a367b0d1863c8c51b52d4501a4d14a57ac2
+AUX daphne-1.0-ldflags.patch 620 BLAKE2B f3603a7b4793e7e61ae6ead36c427046843b4723ac9e278d446956b6ee0eb228cc60bf479bf2cde3822f4e83825aeccc4869fcb765b96686e92478a9bfd1b7a0 SHA512 5dd63bd25b8fc583b95bf5be338ddad5e636f72e68f7a19052e84fa2c55da068bc6d9a449b693e69b87700d85e002731916f3cf9f0a6226e864112b4a3f3576a
+AUX daphne-1.0-system-lmpeg2.patch 1547 BLAKE2B d80c4a9ca8fc4cfe6aea555e6585220f149841b5887ef28ab73274664127e34ad26897f34d5a49acad9c2457a7b4c81844114ed27a3c56c3c329e004882aadfe SHA512 ffa1fd05c4a676b0f5342f10764b872b14ad0a6bdfabd7b6b6e306594ae1c4fd7827688906fdc123d1aaab889b1659441a03e16f758528f4e14117f9c8cba892
+AUX daphne-1.0-typefix.patch 1951 BLAKE2B f3f88058245db9b0b3beade18fa48f6aa21eb786935b768324f6287b1c06d800976bc061b038eebc35139f7af114a1288a00d82452db98ba3d971442d07de46a SHA512 b97a32e54d14e40b5857623065ded2985868abce8e26a21fcf2452a90bbcc2ebd7b0d6f24a36d62351a254cf3f66514c5c55014cfce03246ccf3f884a07f5352
+AUX daphne-1.0-underlink.patch 407 BLAKE2B c8583863874ce2dfac04fbb8832f0d1060200816dcd02a0ce63ea14ceeee03bfb435b8730d6cec55bcaf4b028925e729240d2c9f879219472ab822edf5c212db SHA512 ecbe457ea90aad322275b5b4ea29b7a3a28442afc87a1338987691799241350bc2583a9dc568c2215c489a21806ad918ebcb3091096ec827ac0f091a93451edb
+AUX daphne-1.0-vorbisfilefix.patch 500 BLAKE2B c8fa57b17b22392d4ef153e3ba7b27a8d5d3780c3d718852326aee28d33a41d93aa5e5e16ee870826cc1a2e6f71cf9066b381d043738420a670893f9134a57a8 SHA512 1fcea4e31f29a165da3746a35fe7a9c839caa0b6eabfe9247bd5b4f603985f114b3dec952cd680f3dc243c8014db012e4b0bc26c8721e8b74807271b80803433
+AUX daphne-1.0-zlib.patch 356 BLAKE2B 6130956ae52788c180330e653191a99a3b88c57431bd9e93c2ee599e699969b113bc26142bff3e747953c6034b5bf566932bc92ec504e7fc7507f7eed3bab562 SHA512 8c76ab069589fedceae114140eb845324f75c664dd76f257065293a8eecf57d9e2487c00af9d310afffe36f990b09c73c7648979b785886f3ca814f8a64d33e6
 DIST daphne-1.0-src.tar.gz 4316387 BLAKE2B 12063360931b36aaf301e6cd8169706f43456363140f9abbe9b09b711126a1c90f451cbbafc0f0d9fa23d538e01b3a99d2c50056e00ced51607572a1108621b8 SHA512 e15e3e86cd03b8eea410eedb667c878f9e2fb044a9bf2cc54e54db641f1c2c6fd99e889cfab308bf972336b577059e13d6cf2a353016ded8e28dae9ddedc0ad4
 EBUILD daphne-1.0.ebuild 1964 BLAKE2B 5a813b31b1cc4309a820b4de7f875e415f664ac230be813c3f3bb376a54db7641d515cbead8c9066efa5a7a0ae2d13f6e3beb04a0a5b457b24e6cde3c1626b6a SHA512 5aa88307cb2dda478879b64c40f1f728e717d7fb9849c1b95db26f8a24a7445d8dbbfed74b7512005524ce638dcd460b52162cf48b44710a556dc813f60c0134
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-emulation/daphne/files/daphne-1.0-gcc43.patch b/games-emulation/daphne/files/daphne-1.0-gcc43.patch
index 289757d4a50c..07c505c27814 100644
--- a/games-emulation/daphne/files/daphne-1.0-gcc43.patch
+++ b/games-emulation/daphne/files/daphne-1.0-gcc43.patch
@@ -1,5 +1,5 @@
---- Makefile.old        2009-01-19 16:22:07.000000000 +0100
-+++ Makefile    2009-01-19 16:22:17.000000000 +0100
+--- a/Makefile.old        2009-01-19 16:22:07.000000000 +0100
++++ b/Makefile    2009-01-19 16:22:17.000000000 +0100
 @@ -33,7 +33,7 @@
  endif
 
diff --git a/games-emulation/daphne/files/daphne-1.0-ldflags.patch b/games-emulation/daphne/files/daphne-1.0-ldflags.patch
index a5096a5b3927..245e8f5e216b 100644
--- a/games-emulation/daphne/files/daphne-1.0-ldflags.patch
+++ b/games-emulation/daphne/files/daphne-1.0-ldflags.patch
@@ -1,5 +1,5 @@
---- Makefile.old	2010-10-05 08:48:46.000000000 +0200
-+++ Makefile	2010-10-05 08:49:10.000000000 +0200
+--- a/Makefile.old	2010-10-05 08:48:46.000000000 +0200
++++ b/Makefile	2010-10-05 08:49:10.000000000 +0200
 @@ -43,7 +43,7 @@
  .SUFFIXES:	.cpp
  
@@ -9,8 +9,8 @@
  
  sub:
  	cd ldp-out && $(MAKE)
---- vldp2/Makefile.linux.old	2010-10-05 09:29:52.000000000 +0200
-+++ vldp2/Makefile.linux	2010-10-05 09:30:13.000000000 +0200
+--- a/vldp2/Makefile.linux.old	2010-10-05 09:29:52.000000000 +0200
++++ b/vldp2/Makefile.linux	2010-10-05 09:30:13.000000000 +0200
 @@ -33,7 +33,7 @@
  all:		vldp2
  
diff --git a/games-emulation/daphne/files/daphne-1.0-system-lmpeg2.patch b/games-emulation/daphne/files/daphne-1.0-system-lmpeg2.patch
index 7eed630d13f7..e82d2ecf0d40 100644
--- a/games-emulation/daphne/files/daphne-1.0-system-lmpeg2.patch
+++ b/games-emulation/daphne/files/daphne-1.0-system-lmpeg2.patch
@@ -1,14 +1,14 @@
 diff -ur v_1_0.old/src/vldp2/Makefile.am v_1_0/src/vldp2/Makefile.am
---- v_1_0.old/src/vldp2/Makefile.am	2009-12-29 18:04:15.000000000 +0200
-+++ v_1_0/src/vldp2/Makefile.am	2009-12-29 18:10:42.000000000 +0200
+--- a/vldp2/Makefile.am	2009-12-29 18:04:15.000000000 +0200
++++ b/vldp2/Makefile.am	2009-12-29 18:10:42.000000000 +0200
 @@ -1,3 +1,3 @@
 -SUBDIRS = autotools include libmpeg2 libvo doc src vc++ test
 +SUBDIRS = autotools
  
  EXTRA_DIST = bootstrap
 diff -ur v_1_0.old/src/vldp2/Makefile.in v_1_0/src/vldp2/Makefile.in
---- v_1_0.old/src/vldp2/Makefile.in	2009-12-29 18:04:15.000000000 +0200
-+++ v_1_0/src/vldp2/Makefile.in	2009-12-29 18:10:51.000000000 +0200
+--- a/vldp2/Makefile.in	2009-12-29 18:04:15.000000000 +0200
++++ b/vldp2/Makefile.in	2009-12-29 18:10:51.000000000 +0200
 @@ -128,7 +128,7 @@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
@@ -19,8 +19,8 @@ diff -ur v_1_0.old/src/vldp2/Makefile.in v_1_0/src/vldp2/Makefile.in
  EXTRA_DIST = bootstrap
  subdir = .
 diff -ur v_1_0.old/src/vldp2/Makefile.linux v_1_0/src/vldp2/Makefile.linux
---- v_1_0.old/src/vldp2/Makefile.linux	2009-12-29 18:04:15.000000000 +0200
-+++ v_1_0/src/vldp2/Makefile.linux	2009-12-29 18:13:12.000000000 +0200
+--- a/vldp2/Makefile.linux	2009-12-29 18:04:15.000000000 +0200
++++ b/vldp2/Makefile.linux	2009-12-29 18:13:12.000000000 +0200
 @@ -14,14 +14,9 @@
  DFLAGS = -O3 -march=i686 -fomit-frame-pointer -funroll-loops
  
diff --git a/games-emulation/daphne/files/daphne-1.0-typefix.patch b/games-emulation/daphne/files/daphne-1.0-typefix.patch
index f47511a0cd03..790d93a3af87 100644
--- a/games-emulation/daphne/files/daphne-1.0-typefix.patch
+++ b/games-emulation/daphne/files/daphne-1.0-typefix.patch
@@ -1,8 +1,8 @@
 amd64 does not like int pointers
 
 diff -ruN v_1_0.orig/src/ldp-in/ldv1000.cpp v_1_0/src/ldp-in/ldv1000.cpp
---- v_1_0.orig/src/ldp-in/ldv1000.cpp	2008-01-29 18:04:34.000000000 +0100
-+++ v_1_0/src/ldp-in/ldv1000.cpp	2008-09-19 14:29:40.000000000 +0200
+--- a/ldp-in/ldv1000.cpp	2008-01-29 18:04:34.000000000 +0100
++++ b/ldp-in/ldv1000.cpp	2008-09-19 14:29:40.000000000 +0200
 @@ -607,9 +607,9 @@
  
  void ldv1000_event_callback(void *eventType)
@@ -16,8 +16,8 @@ diff -ruN v_1_0.orig/src/ldp-in/ldv1000.cpp v_1_0/src/ldp-in/ldv1000.cpp
  	case LDV1000_EVENT_VSYNC_END:
  #ifdef DEBUG
 diff -ruN v_1_0.orig/src/vldp2/libvo/video_out_null.c v_1_0/src/vldp2/libvo/video_out_null.c
---- v_1_0.orig/src/vldp2/libvo/video_out_null.c	2008-01-29 18:04:43.000000000 +0100
-+++ v_1_0/src/vldp2/libvo/video_out_null.c	2008-09-19 14:30:03.000000000 +0200
+--- a/vldp2/libvo/video_out_null.c	2008-01-29 18:04:43.000000000 +0100
++++ b/vldp2/libvo/video_out_null.c	2008-09-19 14:30:03.000000000 +0200
 @@ -82,7 +82,7 @@
  				// this is the potentially expensive callback that gets the hardware overlay
  				// ready to be displayed, so we do this before we sleep
diff --git a/games-emulation/daphne/files/daphne-1.0-underlink.patch b/games-emulation/daphne/files/daphne-1.0-underlink.patch
index f04f3f6c5fd1..dd4c3d1467e2 100644
--- a/games-emulation/daphne/files/daphne-1.0-underlink.patch
+++ b/games-emulation/daphne/files/daphne-1.0-underlink.patch
@@ -1,5 +1,5 @@
---- Makefile.vars.linux_x86.old	2011-09-21 12:27:42.480566742 +0200
-+++ Makefile.vars.linux_x86	2011-09-21 12:27:57.490564959 +0200
+--- a/Makefile.vars.linux_x86.old	2011-09-21 12:27:42.480566742 +0200
++++ b/Makefile.vars.linux_x86	2011-09-21 12:27:57.490564959 +0200
 @@ -24,4 +24,4 @@
  	-DUSE_MMX -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DUSE_OPENGL
  
diff --git a/games-emulation/daphne/files/daphne-1.0-vorbisfilefix.patch b/games-emulation/daphne/files/daphne-1.0-vorbisfilefix.patch
index 49eb1aaab62d..05a0403a8af4 100644
--- a/games-emulation/daphne/files/daphne-1.0-vorbisfilefix.patch
+++ b/games-emulation/daphne/files/daphne-1.0-vorbisfilefix.patch
@@ -1,8 +1,8 @@
 Fix no sound issue with >=media-libs/libvorbis-1.2.0
 
 diff -ruN v_1_0.orig/src/ldp-out/ldp-vldp-audio.cpp v_1_0/src/ldp-out/ldp-vldp-audio.cpp
---- v_1_0.orig/src/ldp-out/ldp-vldp-audio.cpp	2008-01-29 18:04:07.000000000 +0100
-+++ v_1_0/src/ldp-out/ldp-vldp-audio.cpp	2008-09-19 13:43:10.000000000 +0200
+--- a/ldp-out/ldp-vldp-audio.cpp	2008-01-29 18:04:07.000000000 +0100
++++ b/ldp-out/ldp-vldp-audio.cpp	2008-09-19 13:43:10.000000000 +0200
 @@ -146,7 +146,7 @@
  	switch (whence)
  	{
diff --git a/games-emulation/daphne/files/daphne-1.0-zlib.patch b/games-emulation/daphne/files/daphne-1.0-zlib.patch
index dbae7b31fe9c..d94af3b174f4 100644
--- a/games-emulation/daphne/files/daphne-1.0-zlib.patch
+++ b/games-emulation/daphne/files/daphne-1.0-zlib.patch
@@ -1,5 +1,5 @@
---- io/unzip.h.old	2011-09-21 12:13:28.911668053 +0200
-+++ io/unzip.h	2011-09-21 12:14:53.074658064 +0200
+--- a/io/unzip.h	2011-09-21 12:13:28.911668053 +0200
++++ b/io/unzip.h	2011-09-21 12:14:53.074658064 +0200
 @@ -57,6 +57,10 @@
  #include "zlib.h"
  #endif
diff --git a/games-emulation/dgen-sdl/Manifest b/games-emulation/dgen-sdl/Manifest
index 82ebbf15d81e..27f46d59279b 100644
--- a/games-emulation/dgen-sdl/Manifest
+++ b/games-emulation/dgen-sdl/Manifest
@@ -1,4 +1,4 @@
-AUX dgen-sdl-1.33-joystick.patch 402 BLAKE2B b15bc3a273332ca3e5cd0efe99477d90d7d49bd2e6728b972a3c4f53c412d66be93d04060948911981d70bf50618cf0f7251360387489320b6641d6d3a44be73 SHA512 929e3779247bf8e852a129a48044c2e1a4df91811cabc799fd9fb87a8f4f18d0a0ec0c2186ceecf67bad0b6a45a84c41a0030b164d6e5bee942f1832159695f0
+AUX dgen-sdl-1.33-joystick.patch 406 BLAKE2B 175ac9aee89e657dc48f2c0d8f63019da310fc33dbde271dfb3d7cab79d9533136b02c4761063fc56f88764c0f6afacc687f13fe3e4a1acf99fbd0792694e76c SHA512 0057f4099b941cc1aa1fc4d2d260c3bb7601f8149542ab4a87b3306f839ec6e8306fd00d0f2f87d770cc956a60841ff608095ca7bbc3e0e143f6c057f4d21e58
 DIST dgen-sdl-1.33.tar.gz 939297 BLAKE2B e7d107425f8d2c396e37bd140c9ccebe96f7365ac729faac748e1ccf53ebae30fedc59f05070cdcb16d59a7870b6679e4f6e0dda83a697342c2a692c565a4d13 SHA512 c98ab8cdced62a5d26fd677ad36b031e756620114c946ac067599e84ae6ebcfab731554dd4337b6314c3b5db4601c8a6cc67c285d2aad136e659b9973c01a749
-EBUILD dgen-sdl-1.33.ebuild 911 BLAKE2B d6f75a4bcde150c02a3ee23ffbfd2dc704fcf8820b43e0ddb44c3f71771c7f38d520dccbcdbc2eb89ce8cc73ccdbdd9648cdd7b0432131c094445872213118bb SHA512 ccec04142daf95aa23439b20691c31f5821b8f07fe6804692f374b0088fa5592152f00e851597be04144f8917e234646a341b81a616e6bc6a345f4a4c9cf06f9
+EBUILD dgen-sdl-1.33-r1.ebuild 825 BLAKE2B 6094564d53612df217efc0d81040883390d4bac149c1630e09b6a1078d4157bfc4720c49af45042e44c1f4f3f02312d6efb5d8a4e475419a46119a91cb352376 SHA512 b9d088beb9a75205745f19a97557c20eae8c2c3318d85576a153a12e831ad578ada032d8ddfe6d05927bac0485c6ffeb04e38a349c39d19f26d057ae2faec6d2
 MISC metadata.xml 327 BLAKE2B c719679eeb00833778ba9a80981dd32cfba3e8d498b378b07eff877d65bbed1c878a0522abe25c5d60f78c89e637a23ae4bbd79a5200cf26677fe25a4e74020a SHA512 17031a8025df3d06c71dfb85bf2870eac32e84e86797296aa4a7e7cd24ac579a7305a7664d05e2054e4ad11da6c683011e8132dce0e6ea7dab0b8f70dc984a9b
diff --git a/games-emulation/dgen-sdl/dgen-sdl-1.33.ebuild b/games-emulation/dgen-sdl/dgen-sdl-1.33-r1.ebuild
index 34b23d178d9e..5d9acdc094b9 100644
--- a/games-emulation/dgen-sdl/dgen-sdl-1.33.ebuild
+++ b/games-emulation/dgen-sdl/dgen-sdl-1.33-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=6
 
 DESCRIPTION="A Linux/SDL-Port of the famous DGen MegaDrive/Genesis-Emulator"
 HOMEPAGE="http://dgen.sourceforge.net/"
@@ -13,19 +12,19 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="joystick opengl"
 
-RDEPEND="media-libs/libsdl[joystick?,opengl?]
+RDEPEND="
+	media-libs/libsdl[joystick?,opengl?]
 	app-arch/libarchive
-	opengl? ( virtual/opengl )"
+	opengl? ( virtual/opengl )
+"
 DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )"
+	x86? ( dev-lang/nasm )
+"
 
-src_prepare() {
-	# fix building with USE=-joystick
-	epatch "${FILESDIR}"/${P}-joystick.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-joystick.patch )
 
 src_configure() {
-	egamesconf \
+	econf \
 		$(use_enable x86 asm) \
 		$(use_enable joystick) \
 		$(use_enable opengl)
@@ -38,5 +37,4 @@ src_compile() {
 
 src_install() {
 	DOCS="AUTHORS ChangeLog README sample.dgenrc" default
-	prepgamesdirs
 }
diff --git a/games-emulation/dgen-sdl/files/dgen-sdl-1.33-joystick.patch b/games-emulation/dgen-sdl/files/dgen-sdl-1.33-joystick.patch
index 38cb962b690b..6cb4e936b35b 100644
--- a/games-emulation/dgen-sdl/files/dgen-sdl-1.33-joystick.patch
+++ b/games-emulation/dgen-sdl/files/dgen-sdl-1.33-joystick.patch
@@ -1,5 +1,5 @@
---- sdl/sdl.cpp.orig
-+++ sdl/sdl.cpp
+--- a/sdl/sdl.cpp.orig
++++ b/sdl/sdl.cpp
 @@ -6285,6 +6285,7 @@
  #endif
  	static unsigned long hide_mouse_when;
diff --git a/games-emulation/emutos/Manifest b/games-emulation/emutos/Manifest
index 17afd187aa63..9b9794dce74d 100644
--- a/games-emulation/emutos/Manifest
+++ b/games-emulation/emutos/Manifest
@@ -1,5 +1,5 @@
 DIST emutos-256k-0.9.4.zip 1600186 BLAKE2B 2c5243165d651a8f4f3b56d0b4bf30bbfd183e4c9d3ae2b1087c3864d540efe445cf10b68e98e862a12be9f34c388548959376a665aac91f09e05b4b39abce58 SHA512 ce7ce9e53c82f7861752ee454a4e3ce616bca73ce580e2b803deea22497de06e5ab49a69af6507ce98ab337312dbb879d258ba2acdf868443f406761caa69404
 DIST emutos-512k-0.9.4.zip 314877 BLAKE2B 69388ce090c56c05861b859061a9b47998354dc240a0b482f616c5a2c9440ee897abdad96b946f922f77f60ee7d781e37538a42bfc778a6e15ab82225596d91b SHA512 00c8718f364712f5d346859dc40ed83c1792521c9600520aacf199f7d6b24d5cf7a3e2533e1e343d6aa9e77ed3056f8636713bb7c3e9739254e0658c921a78a8
 DIST emutos-src-0.9.3.tar.gz 935570 BLAKE2B bcbf216e8bfbae681a404fdaa07e7bc00e1a865e4f6430bf70741ea9a92ee16ab90eef99140c29f3cf381bac93d72e20312e7f21b2e96bc23144c73af0b9191f SHA512 45e19a9f8ebbd1675059a78d1416d0571bc54c3979b36c684f2394f508f48f6f1dae10f4eb966e1757ff10698644302c788ee3e51bf42fe10d131d87508d9824
-EBUILD emutos-0.9.4.ebuild 672 BLAKE2B c3fa92b20314bdde05fb39b5aa1b7364c743d78e7b86d70d8507fe5acb1b832bcc05c1037d8b0541ce85f4247bfab4b2e152d808b9de7a710060696d3a058b60 SHA512 e288343d3c1369a1bfc25a43d975706f06f735065e0c4704e3c3ecbfb3862ed5093aea9027f40947ea704153e95698faeff00dab78b7e6509dfc9607a3296868
+EBUILD emutos-0.9.4-r1.ebuild 640 BLAKE2B 8a3f4bb6cfa1d3e87bb6d17f4d17e66d46c99f020824fb067dd865438414b28fb33f23d9a7d4bc2485403763aaf76fd7dbe5048bd54b4e2229eb8fe4dcb2f071 SHA512 2c5b4da9049091414ab55b0caf51953701fcec33742b66e0e78f1c030592d89d0fe51175bbf8275b2bb2956074091577522b92db4c88db258dd8b71ef8916d14
 MISC metadata.xml 329 BLAKE2B 3751df88821c56b414164dd686cc65be252f2968ecf92c93f2c6b3c6bd88a77bdc28a2fd33f4d08d2956e6e4d42c3304c0bc7a01226551850c44a438f1d2dd5e SHA512 5af91295f3ae78fb613b90a573aa870ac2e5e00623f305a00981637ac480320f2df7b16f35155e880344254521a0d08adf12ae92cffa15d4a3c3dab2aa8d661a
diff --git a/games-emulation/emutos/emutos-0.9.4.ebuild b/games-emulation/emutos/emutos-0.9.4-r1.ebuild
index 5a1df88c2436..0e2acfe94e1c 100644
--- a/games-emulation/emutos/emutos-0.9.4.ebuild
+++ b/games-emulation/emutos/emutos-0.9.4-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit games
+EAPI=6
 
 DESCRIPTION="Single-user single-tasking operating system for 32 bit Atari computer emulators"
 HOMEPAGE="http://emutos.sourceforge.net"
@@ -18,10 +17,9 @@ IUSE=""
 RDEPEND=""
 DEPEND="app-arch/unzip"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 src_install() {
-	dogameslib */*.img
+	dolib */*.img
 	dodoc emutos-512k-${PV}/{readme.txt,doc/{announce,authors,changelog,status}.txt}
-	prepgamesdirs
 }
diff --git a/games-emulation/fakenes/Manifest b/games-emulation/fakenes/Manifest
index c48f74761324..c74bf58a2a6b 100644
--- a/games-emulation/fakenes/Manifest
+++ b/games-emulation/fakenes/Manifest
@@ -1,5 +1,5 @@
-AUX fakenes-0.5.8-underlink.patch 190 BLAKE2B 311db00cd68d09a6832e1a34389da2cd31908f1c970446c075349d90be1879c507e23f9115cc08b3497f398f5d7fbeac24298151f58e1ce04ac68afb2b178d48 SHA512 8017f0a76ee7a529e8c63ddda68545fe9bdace91353061682d2cbc98eb76a316558ce538e9954d945196fcb7c34ad270f1072712cc137110fb110b4b5c23afdc
+AUX fakenes-0.5.8-underlink.patch 194 BLAKE2B f15bef6e75e4be31a7ea5aff318eeafa42b7c0aa0f4a9fe85ae81209edbf1e9b9203816e907fc8ee9be6d8272c61d784664f223b713d704e33e2392db6d4a09b SHA512 1c523353ebb40f12433dc13b9e003f5da95a2e67af5b0f29e438ba985942696061919fb5b8a41ded0f2c618871994b97070d05456e5b3607fe9f59536d772236
 AUX fakenes-0.5.8-zlib.patch 6297 BLAKE2B cedd715d31f552852c7271edb43c81019442bfbd0d10bbcc8b35c22f75b8ccfd4f23442a1f980ba5b7cbd242746bc6b729d26ce0d5900183c5ecf3707d24c5c2 SHA512 a152e8edffafb36b891bf1ee83ce9fd3c9248a82910d09019d4025c5c7fb77fe6c70cfc22b66e9b15da21081d6d14fcc175f051025c35730ba06fac0bb87556f
 DIST fakenes-0.5.8.tar.bz2 274503 BLAKE2B 64b410052e54c0cd1b474f5bacce220f39455c0de9024582cfc98ea307900b771428eeb9cb4e83e0cd72b0a221d10856f23f1c34b3058050a7dbc81b03e88c07 SHA512 2a22c51cf7171661a92584e083c3dfd69d009b586c22f8b5a4b4022065309ae4d6370a81997c035a9e19ff225e87d92e1b572b313585f2e05776cbf7c1c971aa
-EBUILD fakenes-0.5.8-r2.ebuild 1640 BLAKE2B a7c3c5caea2482c79715a644a0707d2dd7bbe3d63c07bae191d21124817a6b0ac988d24ea53291d5777bdf676ebb86243b4026689b20a7b15b7486a44d3afd33 SHA512 5ae7a09d971a4c3fe9651caa4e5672a47d8b252f29ca1cbe0ad503427781a04f8e6dd502df063b612105f56ff7e6b8ff2509403382cc3f22304ae0edace30dcd
+EBUILD fakenes-0.5.8-r3.ebuild 1586 BLAKE2B 0e83991a1377d0aa075e64778351d7bdcb8a15e8261ed3d292688d03a0d4e3678f66e7ac3337c7ae2a44d3bd83837e3408dfe344f13b2545ff92a95d9d7a4e73 SHA512 5e84382587a661c9932b1e7d5ce5772394489df434c58e9bcb6e2f000ecce44822b988868d8dd853871a752db9f6682e662d23407e0aadbd4a0c2ca12386e4c7
 MISC metadata.xml 330 BLAKE2B 31881a989488e32b8a6e034fbb1a1dd88722cf0fc512d40a2ddb53e0a92a68c9787c3a18557dbaed50863d3f4491c2df2617a21703d6777ccd8782978e6c33d2 SHA512 40a9b0382052203f7855ddedfed71e9db3fd128ab5ec0c45b6e6ea4170f919f1ffb3f285b0f708e80f9a37b7af53a584d1ee915ad1f776e99b816bcceb756753
diff --git a/games-emulation/fakenes/fakenes-0.5.8-r2.ebuild b/games-emulation/fakenes/fakenes-0.5.8-r3.ebuild
index eafa57d654f1..e8aeb3a8b2c0 100644
--- a/games-emulation/fakenes/fakenes-0.5.8-r2.ebuild
+++ b/games-emulation/fakenes/fakenes-0.5.8-r3.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+inherit desktop flag-o-matic toolchain-funcs gnome2-utils
 
-inherit eutils flag-o-matic toolchain-funcs gnome2-utils games
-
-DESCRIPTION="portable, Open Source NES emulator which is written mostly in C"
+DESCRIPTION="Portable, Open Source NES emulator which is written mostly in C"
 HOMEPAGE="http://fakenes.sourceforge.net/"
 SRC_URI="mirror://sourceforge/fakenes/${P}.tar.bz2"
 
@@ -14,17 +13,21 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="openal opengl zlib"
 
-RDEPEND=">=media-libs/allegro-4.4.1.1:0[opengl?]
+RDEPEND="
+	>=media-libs/allegro-4.4.1.1:0[opengl?]
 	dev-games/hawknl
 	openal? (
 		media-libs/openal
 		media-libs/freealut
 	)
-	zlib? ( sys-libs/zlib )"
+	zlib? ( sys-libs/zlib )
+"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 src_prepare() {
+	default
 	sed -i \
 		-e "s:openal-config:pkg-config openal:" \
 		build/openal.cbd || die
@@ -32,7 +35,7 @@ src_prepare() {
 	sed -i \
 		-e "s:LIBAGL = agl:LIBAGL = alleggl:" \
 		build/alleggl.cbd || die
-	epatch "${FILESDIR}"/${P}-{underlink,zlib}.patch
+	eapply "${FILESDIR}"/${P}-{underlink,zlib}.patch
 }
 
 src_compile() {
@@ -51,25 +54,21 @@ src_compile() {
 }
 
 src_install() {
-	dogamesbin fakenes
-	insinto "${GAMES_DATADIR}/${PN}"
+	dobin fakenes
+	insinto "/usr/share/${PN}"
 	doins support/*
-	dodoc docs/{CHANGES,README}
-	dohtml docs/faq.html
+
+	cd docs && HTML_DOCS="faq.html" einstalldocs && cd ..
 
 	newicon -s 32 support/icon-32x32.png ${PN}.png
 	make_desktop_entry ${PN} "FakeNES"
-
-	prepgamesdirs
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	gnome2_icon_cache_update
 }
 
diff --git a/games-emulation/fakenes/files/fakenes-0.5.8-underlink.patch b/games-emulation/fakenes/files/fakenes-0.5.8-underlink.patch
index a5f6f699fc7c..48f37a5fd83d 100644
--- a/games-emulation/fakenes/files/fakenes-0.5.8-underlink.patch
+++ b/games-emulation/fakenes/files/fakenes-0.5.8-underlink.patch
@@ -1,5 +1,5 @@
---- build/hawknl.cbd.old	2011-06-22 17:28:16.733408930 +0200
-+++ build/hawknl.cbd	2011-06-22 17:28:29.217203187 +0200
+--- a/build/hawknl.cbd.old	2011-06-22 17:28:16.733408930 +0200
++++ b/build/hawknl.cbd	2011-06-22 17:28:29.217203187 +0200
 @@ -22,4 +22,4 @@
  
  # --
diff --git a/games-emulation/fbzx/Manifest b/games-emulation/fbzx/Manifest
index 0fb2a0779e8d..8ca6b3508aed 100644
--- a/games-emulation/fbzx/Manifest
+++ b/games-emulation/fbzx/Manifest
@@ -1,4 +1,4 @@
 AUX fbzx-3.0.0-gentoo.patch 6372 BLAKE2B 0e218a83a4eee9f7fbb632f74eb64358149715835f566c4256cecfa5857c615d732073a1346b0e8f4998fb5c560d7c2d39a083e5c1ae99cf4c889b6de42b8cde SHA512 4de9830dcfe015833939c1795f016d37afa0d364b94de2cc64b941f8d4df2acbe7220be951fa403bab6eba0db4882a8c15c376eac108fe6331e67708515b876e
 DIST fbzx-3.0.0.tar.gz 435239 BLAKE2B 5105995a7972c7310628c0e4d3af7f1a749192bc24ac312e493d8821edf5ec329a65eedcbfa6c8479a4f4d134ca730acef7ee27ef2f89253f2e179c7cf8c2bf1 SHA512 cf2a01a1dde62da03c1f04e91f226859ae4cf06d099597dc1a1554c4ff9782dd287f9d924083829eee40cf0450c053d818f963f68381f9e16e0e61ca1f3d3083
-EBUILD fbzx-3.0.0.ebuild 876 BLAKE2B fb8d08243736ab6c6892aee2cd2362bda182c1d25a121141ec3c38831bde3c9bd71e5af1bbf912b97b9ad9e9edf7335313063ef566b3f6478cf52e93553c4923 SHA512 1b4f83367ee7fa3db37102c2e9ebb0f4552354eec9fa527d3eb4e33e617a76faae82436d6bb638d21d66cbb2a57b9639079406e9df412c71fb65e3e6f131687e
+EBUILD fbzx-3.0.0-r1.ebuild 852 BLAKE2B c2c32bf293dc5803cbbc21b56cc5baee95bfc28f6e258482c3b9499f94cbe2f909329869e86bd1b49a4a5d6fb24054cb999d4bfc1dbbe45dc60ab9a0065e57c0 SHA512 775bfb04e9ba7c1bf47aa69260d4413caa5270202ca12434dd15f870570657d584eb2dee11cb4abeba57765dde96b4df2352a60504429203fa0ff7f44532cebf
 MISC metadata.xml 469 BLAKE2B 9c35e70c04d622fbda873c4f3d225b5a7813627bfc6bb01e14ebf011869385d9449652d056e3f2a4ff175337b55e63f987234fa2b3b600576611ec42f01187ca SHA512 72d484a764834cd1691665dea6904f154af7a4a6f4c8dc43eaeafe71ec775c8bf0b62ffe42d3cf244829292ff4d0f8a677eccce1902110b94e6f1fdd31219a25
diff --git a/games-emulation/fbzx/fbzx-3.0.0.ebuild b/games-emulation/fbzx/fbzx-3.0.0-r1.ebuild
index e019ce4a1456..8fcb34dbfc9c 100644
--- a/games-emulation/fbzx/fbzx-3.0.0.ebuild
+++ b/games-emulation/fbzx/fbzx-3.0.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=6
+inherit desktop
 
 DESCRIPTION="Full Screen Sinclair Spectrum emulator"
 HOMEPAGE="https://github.com/rastersoft/fbzx"
@@ -13,23 +13,26 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="media-libs/libsdl[video]
+RDEPEND="
+	media-libs/libsdl[video]
 	media-sound/pulseaudio
-	media-libs/alsa-lib"
+	media-libs/alsa-lib
+"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 src_prepare() {
-	sed -i -e "s|/usr/share/|${GAMES_DATADIR}/${PN}/|g" src/llscreen.cpp || die
-	epatch "${FILESDIR}"/${P}-gentoo.patch
+	default
+	sed -i -e "s|/usr/share/|/usr/share/${PN}/|g" src/llscreen.cpp || die
+	eapply "${FILESDIR}"/${P}-gentoo.patch
 }
 
 src_install() {
-	dogamesbin src/fbzx
-	insinto "${GAMES_DATADIR}/${PN}"
+	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
-	prepgamesdirs
 }
diff --git a/games-emulation/fceux/Manifest b/games-emulation/fceux/Manifest
index 583b423c507d..7b3b3d33444a 100644
--- a/games-emulation/fceux/Manifest
+++ b/games-emulation/fceux/Manifest
@@ -1,4 +1,4 @@
 AUX fceux-2.2.2-warnings.patch 1306 BLAKE2B eb52e35f7933e1d194ca14b9d6a782f727e3b120ce8632f2b3db2036b06b7328d4dbf2f3e8fcd2cd27511f811b56e2840c943855076768598c0d899c59ffddc7 SHA512 75df61b98e94ce659a1cc9732a491cdcfe6b826ce9d8f9b22e5542217ade6074e86429cdcc326cb770a21fff049cf20760f8172c4b3ce52de1ee404ff5a7193a
-DIST fceux-2.2.2.src.tar.gz 9249858 BLAKE2B 9b6f788e2fc99f5ba728ac31c65da4a459f94e630b8a4b89d6dcfa62299d8170a147232731142fadd4a977f173464c94cb98ef4d1e0d1a2de28e8cf68bc74e55 SHA512 3d3b11c21232656492d962c21a93097f66e33fbd5adbbce6b771dc004393f30502c369eae83c23d988c7e447b4784740a10dfcb0811252854d4364c4b1face98
-EBUILD fceux-2.2.2-r1.ebuild 1196 BLAKE2B 825dc2c2b7046f7816c74a6bbfec54c46c1885348f9f6861844496ca10174862c2f82a54425b3d5fdfb73c04341ba6211a3de715b505a418e81d7c3a4999dc25 SHA512 dd56ccbbc9aa64552490442a6913585bf31a0be1332ccd77f75ab9b7b3a88627f310eb48de74669f8b140f0549fadf3e5f2c4e89427383b4e5ccaeba4950c45c
+DIST fceux-2.2.3.src.tar.gz 9292792 BLAKE2B 44412934a50f2cab581cb194932a079071e8c7c1cb4cb4d173e9d7cf4898806fe1b0948d6e86fd70d1265eb596c47f77f751e3a113f03aba9b95e1f5def9c2a8 SHA512 6deb83e9e773694f4040f5f325b0b5b4f45d58bb3481db67b4659c940d90c4c87e3ffeac712b72ddb3f5d089cd9fc7b55b497db61f708c23a7c43c17eda55c7b
+EBUILD fceux-2.2.3.ebuild 1191 BLAKE2B 6471d82ac2f1ef1d0fcf36fe59b5b5d29c103f6c32739242c244fb834bd2fde62bf12e0c7f7c1eb6b0b2e59bdf1aefcbdb1f911ef144146f903b8be795d82439 SHA512 793f5ce80df5e0ee4b116fd89c68b6923a2fbf02cd54f632cddd69345289e783b61a2c6a09464efa21de4881bb3d7446a6ba1b2dc29c518d4caa26b52f3fd81f
 MISC metadata.xml 432 BLAKE2B 69c86fec99d0d08d0672142afbb39b2f2c352af4a8ff953516522f721e2482a4624b542593c8eac0be3570a75037cf27b0c48bd19033429d1c5d66e85fcdb952 SHA512 f6f073a198d89d195daa4da1c4c8bdf631258db0ff8cc5fefd9d8a6d93beb38081d37a70df0d0f62d7bf79f7595a3456d88ac0c724535d8c453f3096d2256b96
diff --git a/games-emulation/fceux/fceux-2.2.2-r1.ebuild b/games-emulation/fceux/fceux-2.2.3.ebuild
index 6d6128d997ae..93ccbe28693f 100644
--- a/games-emulation/fceux/fceux-2.2.2-r1.ebuild
+++ b/games-emulation/fceux/fceux-2.2.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils scons-utils games
+inherit desktop epatch scons-utils
 
 DESCRIPTION="A portable Famicom/NES emulator, an evolution of the original FCE Ultra"
 HOMEPAGE="http://fceux.com/"
@@ -13,16 +13,18 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gtk logo +lua +opengl"
 
-DEPEND="lua? ( dev-lang/lua:0 )
+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]"
-RDEPEND=${DEPEND}
+	sys-libs/zlib[minizip]
+"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-warnings.patch
+	epatch "${FILESDIR}"/${PN}-2.2.2-warnings.patch
 }
 
 src_compile() {
@@ -38,7 +40,7 @@ src_compile() {
 }
 
 src_install() {
-	dogamesbin bin/fceux
+	dobin bin/fceux
 
 	doman documentation/fceux.6
 	docompress -x /usr/share/doc/${PF}/documentation /usr/share/doc/${PF}/fceux.chm
@@ -46,5 +48,4 @@ src_install() {
 	rm -f "${D}/usr/share/doc/${PF}/documentation/fceux.6"
 	make_desktop_entry fceux FCEUX
 	doicon fceux.png
-	prepgamesdirs
 }
diff --git a/games-emulation/gambatte/Manifest b/games-emulation/gambatte/Manifest
index 7a0bbb560735..a5191aaacb28 100644
--- a/games-emulation/gambatte/Manifest
+++ b/games-emulation/gambatte/Manifest
@@ -1,3 +1,3 @@
 DIST gambatte-0.5.0_p20131102.tar.xz 353212 BLAKE2B ad17289f29a00230d7ccec2825d6487ed994a6148a931254a9d5c941c5dbb643c5eb4dbd9f43decfcb86fb693f82358e795a4912c4d40258b27b0d8611961ec1 SHA512 9f27af85d2fceb128231eb3e5bf2806a1773c575990296f37eb3c0a14bca5c72f7f161cdf77f710f4ff85b2b3266db9ba098e5ef6772bc5bf7b2c97b8281999b
-EBUILD gambatte-0.5.0_p20131102-r1.ebuild 1671 BLAKE2B 67666777e3dac153208f18d99b2e271659f41b93192e9b332e58aa5473fecc40fc109ec485a4c52b138043de790ba6edca742598610ec18eeef0aab2db36ed89 SHA512 b05f7481fce21327aa7a596fa80351e1325a7fd45307c1b5c1e8a94ad0049b8167dfed111629db594a693aeb99b444e23c9691142bd0607feabd016cda8ac5be
+EBUILD gambatte-0.5.0_p20131102-r2.ebuild 1624 BLAKE2B 59fd76fbfc8afd9aaa57f77d3aca89277e0bdf96c5bfda0f098845b4e3b6d47ec629d0a8b1fc8e84583dbf8868c23772a0a581e65024d04625a0342d4a2ecd88 SHA512 ee9838bc274b9c6682af17b8c185d81d7ec1b176eec3d386e3da6e489489b3f5cc9b74d5c3aaa840ce7047bd83e52b87f4304a847437cf69d9a21a6d7a3bfb77
 MISC metadata.xml 331 BLAKE2B b739e6db5361a25503fed526b7417578fff92612b1ca90c4a6e8578bd678f3b3b69736238a9ad882a654c7c9bd66b8d1ac296899129610b23ab96918067012d8 SHA512 c46ee0b944bbf88420eb47c11f60d00a6516fe2bb28b5078e8f11857636f16381969cac9edb98d554d07d0894c224817e12560410092ca532da036e697433b1a
diff --git a/games-emulation/gambatte/gambatte-0.5.0_p20131102-r1.ebuild b/games-emulation/gambatte/gambatte-0.5.0_p20131102-r2.ebuild
index 5f6d72d5af7b..57ce854affa0 100644
--- a/games-emulation/gambatte/gambatte-0.5.0_p20131102-r1.ebuild
+++ b/games-emulation/gambatte/gambatte-0.5.0_p20131102-r2.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit scons-utils games
+EAPI=6
+inherit scons-utils
 
 DESCRIPTION="An accuracy-focused Gameboy / Gameboy Color emulator"
 HOMEPAGE="https://sourceforge.net/projects/gambatte"
@@ -16,9 +15,9 @@ IUSE=""
 
 RDEPEND="
 	media-libs/libsdl[X,sound,joystick,video]
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
 
 fix_scons() {
 	local i
@@ -48,6 +47,8 @@ END
 }
 
 src_prepare() {
+	default
+
 	# Fix zlib/minizip build error
 	sed -i \
 		-e '1i#define OF(x) x' \
@@ -68,9 +69,6 @@ src_compile() {
 }
 
 src_install() {
-	dogamesbin gambatte_sdl/gambatte_sdl
-
-	dodoc README changelog
-
-	prepgamesdirs
+	dobin gambatte_sdl/gambatte_sdl
+	einstalldocs
 }
diff --git a/games-emulation/gcube/Manifest b/games-emulation/gcube/Manifest
index d5fe4aba5096..9f1dd254f3bf 100644
--- a/games-emulation/gcube/Manifest
+++ b/games-emulation/gcube/Manifest
@@ -1,6 +1,6 @@
-AUX gcube-0.4-gcc47.patch 425 BLAKE2B fbcf0f7cb1b2669357c17b3000f679d7c0d6792bf06cd1c4a902c2d73f535add71f0123fa8cbda02a97acde4d246bc0cd2a6b3ebca74c0f0ab1b301f3244ef23 SHA512 efff9f47acb46cb406ef61f7125840200e6692fe94d26ed6f8c86cda9aa15fedae2d7cd673035849724bed1bee7d6116cf3467d66df94b322c746db33ac099ac
-AUX gcube-0.4-ldflags.patch 911 BLAKE2B 330ba6d03d8fd99c13e492a285f75f7d46ce0141e47f35c16e4153bdec2f110de973d3b791bf1d6188bc235a3247894cb71effe52a9f4fa76059755c2d21779f SHA512 c0ff07a641b1df088313406feac730dbbee74f4451dc1bf4c0c8e9c6e53206d3a93292bbfc09db70f3d791a654523b1ffdde51057f6d101c3b6e9c8e636c851d
-AUX gcube-0.4-underlink.patch 443 BLAKE2B 562bb007f0e6549794b7dec25dbc80848e2bd1c2e20a62620963a32d13b4f9a784b0333cfd93bf66a7fefbab1af62053115a2cbe320f4686aad14863176bad59 SHA512 c372ba4447fca9c4f28aab14da05d15780e45e98b061eace8bf1f5494185809f1466890fa0581e001a2886d6a9d34c2365e36ea94f3bc64fe1bdbecde94676e9
+AUX gcube-0.4-gcc47.patch 429 BLAKE2B 2da4477aa5fc8b33bae0404a5347e6a0bac493ed2c2ff54d743d1d1920a7055c89f2c3b4e9ebe29a42f88991cd45ad9702916070a91895bca2c465fb1c14d505 SHA512 e6cf8d03734d26b5051c50f9fbb3ae3d62f34ea2dc6a29177cac72426c9a5e5887acf88cff437c0b830eff5648ac30f477a9fea4e945cc53b9606788cff80889
+AUX gcube-0.4-ldflags.patch 915 BLAKE2B 7bc5425df1dd9a7afdc2844c7e4044f634c824c4b857c49162e73cad98f888049beda2963c353c7e9c412c680e5c49ebe91d57f94b4158338a322f542414f513 SHA512 62343ae3871a406e21c219a779e568b5a053cc474893b5ad690f8995b01c86cabecf5e1e9c55d91f0adab046f652f2f6d9b3c298edc92872d62976d6de2733f4
+AUX gcube-0.4-underlink.patch 447 BLAKE2B 05fea68713edaf3d38656fb5911a64d48b8ae7bda74c50153ddf63beabad8cdf36eb311dc40233728b5900d4797858f89d0b3ba0b3d57212603ae391b1dac4c3 SHA512 e916f3b3f901857f6c7af1bdbdf06ec9ae649d42ed9a166f146c4a319c67644312614550c17a7c4269dd116b6a5a03cf87a62acd5db8b29fc4fa4413b68ed36d
 DIST gcube-0.4-src.tar.bz2 803503 BLAKE2B a9f5db1b824d5319e89a5e865c1ca539a2f11458f4c542d34168c06b79f9f589ea928768ca26275f31aad51b01f51efe8453a1121ba947aaf067beb2f9dea13f SHA512 f73665386d547322f20ed5e358f4f394b07d74fd90bddbfe1158a7a5d896bff36dabc9833f2d820a7af7673b8c8af62490f7fa07b06a2bbca4df6356a1e3c91a
-EBUILD gcube-0.4-r1.ebuild 947 BLAKE2B bcb5296e20a69183576bc7ba35991283639dfd5ade14f36bed2c8e7c24fa92b035f13aa32a27d5b5b128d25b58b3d07b73b89bc4ec2038ed0cafd321f88dadd5 SHA512 2479d5d0ffa2278735fadacf0ba3b4ab693381fac62393b864f197ecd775fdb3d7037461112b7c2bc09c35bea522f1a83aa902838186692d30cc88b4b21e1f02
+EBUILD gcube-0.4-r2.ebuild 922 BLAKE2B fc74e6ce689ed888c61d254c1daa5102e0ed205a0609794ef5993914e7396e55bf88574817850daa8d9223cd3c17e8696044121054e80a603d5b4103e1de63d5 SHA512 e3515c29982ed53c204d7d8c09e081c3fd81adc085914249cf02b818055f8374a44d6884a5cf8335444ecb29875d9e0abf717337723013c903d69dfee34f3ccb
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-emulation/gcube/files/gcube-0.4-gcc47.patch b/games-emulation/gcube/files/gcube-0.4-gcc47.patch
index b459a4e24034..48ac167a1f0d 100644
--- a/games-emulation/gcube/files/gcube-0.4-gcc47.patch
+++ b/games-emulation/gcube/files/gcube-0.4-gcc47.patch
@@ -1,5 +1,5 @@
---- Makefile.rules.old	2012-10-23 14:06:54.417782365 +0200
-+++ Makefile.rules	2012-10-23 14:07:11.516377033 +0200
+--- a/Makefile.rules.old	2012-10-23 14:06:54.417782365 +0200
++++ b/Makefile.rules	2012-10-23 14:07:11.516377033 +0200
 @@ -1,6 +1,6 @@
  
  SDL_CONFIG=sdl-config
diff --git a/games-emulation/gcube/files/gcube-0.4-ldflags.patch b/games-emulation/gcube/files/gcube-0.4-ldflags.patch
index 169472ee1851..b4a64f16aede 100644
--- a/games-emulation/gcube/files/gcube-0.4-ldflags.patch
+++ b/games-emulation/gcube/files/gcube-0.4-ldflags.patch
@@ -1,5 +1,5 @@
---- Makefile.rules.old	2010-10-01 07:16:16.000000000 +0200
-+++ Makefile.rules	2010-10-01 07:18:04.000000000 +0200
+--- a/Makefile.rules.old	2010-10-01 07:16:16.000000000 +0200
++++ b/Makefile.rules	2010-10-01 07:18:04.000000000 +0200
 @@ -88,22 +88,22 @@
  profiler:	default
  
diff --git a/games-emulation/gcube/files/gcube-0.4-underlink.patch b/games-emulation/gcube/files/gcube-0.4-underlink.patch
index f1cff91cb158..f4b3d5b6969d 100644
--- a/games-emulation/gcube/files/gcube-0.4-underlink.patch
+++ b/games-emulation/gcube/files/gcube-0.4-underlink.patch
@@ -1,5 +1,5 @@
---- Makefile.rules.old	2011-06-10 14:14:08.372105234 +0200
-+++ Makefile.rules	2011-06-10 14:14:18.504746649 +0200
+--- a/Makefile.rules.old	2011-06-10 14:14:08.372105234 +0200
++++ b/Makefile.rules	2011-06-10 14:14:18.504746649 +0200
 @@ -1,6 +1,6 @@
  
  SDL_CONFIG=sdl-config
diff --git a/games-emulation/gcube/gcube-0.4-r1.ebuild b/games-emulation/gcube/gcube-0.4-r2.ebuild
index e55675696db2..6194fc6a2103 100644
--- a/games-emulation/gcube/gcube-0.4-r1.ebuild
+++ b/games-emulation/gcube/gcube-0.4-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils flag-o-matic games
+EAPI=6
+inherit flag-o-matic
 
 DESCRIPTION="Gamecube emulator"
 HOMEPAGE="http://gcube.exemu.net/"
@@ -13,31 +13,38 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="virtual/opengl
+RDEPEND="
+	virtual/opengl
 	media-libs/libsdl[joystick,opengl,sound,video]
 	virtual/jpeg:0
-	sys-libs/ncurses:0
-	sys-libs/zlib"
-RDEPEND=${DEPEND}
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${PV}
+S="${WORKDIR}/${PV}"
 
 src_prepare() {
+	default
+
 	sed -i -e '/^CFLAGS=-g/d' Makefile.rules || die
-	epatch "${FILESDIR}"/${P}-ldflags.patch \
+
+	eapply "${FILESDIR}"/${P}-ldflags.patch \
 		"${FILESDIR}"/${P}-underlink.patch \
 		"${FILESDIR}"/${P}-gcc47.patch
+
 	sed -i -e '/^CC=/d' Makefile || die
+
 	append-cflags -std=gnu89 # build with gcc5 (bug #570504)
 }
 
 src_install() {
 	local x
 
-	dogamesbin gcmap gcube
+	dobin gcmap gcube
 	for x in bin2dol isopack thpview tplx ; do
-		newgamesbin ${x} ${PN}-${x}
+		newbin ${x} ${PN}-${x}
 	done
-	dodoc ChangeLog README
-	prepgamesdirs
+
+	einstalldocs
 }
diff --git a/games-emulation/generator/Manifest b/games-emulation/generator/Manifest
index 015d5377d623..95dc701335c6 100644
--- a/games-emulation/generator/Manifest
+++ b/games-emulation/generator/Manifest
@@ -1,5 +1,6 @@
-AUX generator-0.35_p4-configure.patch 3630 BLAKE2B fa02f17cbb8b5ad891d447f529c7cdb338939e715894614b7af96b2a880becaea365af7cb7f39edd9d87c9121eb6ad1848aac7167cb70308e1398244949ad794 SHA512 ab863e180d8ffc3c57c40f1e99f7230c3894da7afa028205299550b9b8db01d1dc6bac9060e1488ecd48628843acb171260bc39d71a462f518b519139dff3cc5
-AUX generator-0.35_p4-underlink.patch 509 BLAKE2B 8b7133cac81ef107f4316c31e09520322b0bd3ef8015e0f8f882ef7d07c75591435e4eb438e324de3322fc94407b7e16145a275e6e0cab1748246c9a9988ee53 SHA512 075bd9e588aa9b230d446ece3661ae3236deee2175b0e0d25645c717846b0261341a30f4df239fe3b7092be0db612d26f504d7df6e2969e2889654cdc4decfd3
+AUX generator-0.35_p4-configure.patch 3634 BLAKE2B 726c133bb419bc8226d31043b851cceb6077e8a3dc7fd4a351d9117933b219012d812b25c6b96b0569e066191adc786e2ec02ed723b7eb14ca3e3e326188aa40 SHA512 bed25bc2d951d4c369265b4790754ba4e63d5beda803a655dc240ac76004b57ba1bc3823c4a35f6fa2ee5e5a9b22827c46e090f63536b4d6b959986cc016c1ed
+AUX generator-0.35_p4-inline.patch 465 BLAKE2B 8818f566ad1987e09fbc49eae5b216c5d620bfa989fdbed61e0c700862ee9fd6f20e6e0010284ee6854a8fc4299a685fde41937f2d5e32675298f3adf8615b4c SHA512 9776dbe2e8f725b8f542ae382fe8da193987c9e12d857c359de2c32402f4dee729c92837aa543efe4ba7c6c66d81e3e505496a783598621d20f724509d4358ba
+AUX generator-0.35_p4-underlink.patch 513 BLAKE2B 8424efa3326db4f627ffab9a8a6c8f55e0f5477f31a830fada195d6cfd3ded01734d70981ea27ca06341009385ea00cbe1ac3f7ffa23bdba5eb3f2c35f800820 SHA512 0947c6365ee33d15c136906385da761e0f6e4d92356b0e3eaf8c3cdcd82c87982d18e6bc35690ac448b9e9dab213358f5f55c0d3be2f3eaece7bdd776479319b
 DIST generator-0.35-cbiere-r4.tar.bz2 435289 BLAKE2B 962785fd5f87cfd03cba3238fb0d9d29b6ea42f2b44a5314c328c1c008f9fe005696556be79632e36e29948474612a8f3014dfecd47eca06014b1d7174787ed5 SHA512 73fd36d8004135c172025b3eb3385f731e294935413d7ac905672f1a88434ca332325821c5f15d5ae83fb1385fcde9f1e7f32242f8ac175bb96bd535b5d91620
-EBUILD generator-0.35_p4.ebuild 1075 BLAKE2B 95b93b363e25bddbf490eca2b9443879ad12e7c5c9a9e363d291784cabd958b7217176ed2038635c88d5213d1336dcfe9a5037db571ce85bf0b6a943a4e19ef9 SHA512 7199c212062e4eb29f4a1b17bed919cd26b6a22c0da48efd391ddfd3c956851c2bd0c8809baab44b243444f8e4b86e47afecc4cc718fe0cc24e733204c70a249
+EBUILD generator-0.35_p4-r1.ebuild 1092 BLAKE2B de4360b80c7109f3c8c0925a67f53a113bb2c48aa50ebdde7c3ade30363eff0ee2b007819936aab0ff8783c292158af9a699bc0cc70503365c7d040ef131240f SHA512 f54d48b13d10a30529a946a44f1a35ecb7dfcf032a578ceda75404affb15058def9ddadc3b2cf40b5b2f2a9922c926f978d108f63fbcc5cd34d410485ddb30e1
 MISC metadata.xml 326 BLAKE2B b5532fc7965a4b39312288491e98a48de5acdf76c1c5c92ddff370631484f6a57160eb2f983f6086d249b6cf9bba8b8dae47633c2bb38325e2d3faa175099253 SHA512 10d43e88d746f422d5751b87175a6ec76468d1f829d65aa554acced5075cfa39b6fd0d589a87d71a3127f70a718653e24444710f3e669dab3c0587a6b138ca67
diff --git a/games-emulation/generator/files/generator-0.35_p4-configure.patch b/games-emulation/generator/files/generator-0.35_p4-configure.patch
index 72ed087bd296..a918c4a97113 100644
--- a/games-emulation/generator/files/generator-0.35_p4-configure.patch
+++ b/games-emulation/generator/files/generator-0.35_p4-configure.patch
@@ -1,5 +1,5 @@
---- configure.ac.original	2008-03-17 13:07:48.000000000 -0400
-+++ configure.ac	2008-03-17 13:08:03.000000000 -0400
+--- a/configure.ac.original	2008-03-17 13:07:48.000000000 -0400
++++ b/configure.ac	2008-03-17 13:08:03.000000000 -0400
 @@ -28,15 +28,12 @@
    AC_ARG_WITH(tcltk,
                AS_HELP_STRING(--with-tcltk,Create tcltk version),
diff --git a/games-emulation/generator/files/generator-0.35_p4-inline.patch b/games-emulation/generator/files/generator-0.35_p4-inline.patch
new file mode 100644
index 000000000000..e7f09fa3689c
--- /dev/null
+++ b/games-emulation/generator/files/generator-0.35_p4-inline.patch
@@ -0,0 +1,12 @@
+diff -aur generator-0.35-cbiere-r4/ym2612/support.h generator-0.35-cbiere-r4-patched/ym2612/support.h
+--- generator-0.35-cbiere-r4/ym2612/support.h	2005-08-27 05:12:29.000000000 -0400
++++ generator-0.35-cbiere-r4-patched/ym2612/support.h	2018-03-26 11:49:36.000000000 -0400
+@@ -3,7 +3,7 @@
+ #include "config.h"
+ 
+ #define errorlog 0
+-#define INLINE inline
++#define INLINE
+ #define HAS_YM2612 1
+ #define YM2612UpdateRequest(x) 
+ #define AY8910_set_clock(chip,clock)
diff --git a/games-emulation/generator/files/generator-0.35_p4-underlink.patch b/games-emulation/generator/files/generator-0.35_p4-underlink.patch
index 964a6bea0883..b350e8b8a334 100644
--- a/games-emulation/generator/files/generator-0.35_p4-underlink.patch
+++ b/games-emulation/generator/files/generator-0.35_p4-underlink.patch
@@ -1,5 +1,5 @@
---- main/Makefile.am.old	2011-06-20 21:35:25.832460030 +0200
-+++ main/Makefile.am	2011-06-20 21:36:29.490503981 +0200
+--- a/main/Makefile.am.old	2011-06-20 21:35:25.832460030 +0200
++++ b/main/Makefile.am	2011-06-20 21:36:29.490503981 +0200
 @@ -7,7 +7,7 @@
  bin_PROGRAMS = @PROGRAM@
  EXTRA_PROGRAMS = generator-svgalib generator-tcltk generator-allegro \
diff --git a/games-emulation/generator/generator-0.35_p4.ebuild b/games-emulation/generator/generator-0.35_p4-r1.ebuild
index e77ec243163c..14ef210d58a8 100644
--- a/games-emulation/generator/generator-0.35_p4.ebuild
+++ b/games-emulation/generator/generator-0.35_p4-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils toolchain-funcs games
+EAPI=6
+inherit autotools toolchain-funcs
 
-MY_P=${PN}-${PV/_p/-cbiere-r}
+MY_P="${PN}-${PV/_p/-cbiere-r}"
 DESCRIPTION="Sega Genesis / Mega Drive emulator"
 HOMEPAGE="http://www.squish.net/generator/"
 SRC_URI="http://www.squish.net/generator/cbiere/generator/${MY_P}.tar.bz2"
@@ -14,24 +14,28 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+sdlaudio"
 
-DEPEND="virtual/jpeg:0
+RDEPEND="
+	virtual/jpeg:0
 	media-libs/libsdl[joystick,video]
-	sdlaudio? ( media-libs/libsdl[sound] )"
-RDEPEND=${DEPEND}
+	sdlaudio? ( media-libs/libsdl[sound] )
+"
+RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	epatch \
+	default
+	eapply \
 		"${FILESDIR}"/${P}-configure.patch \
-		"${FILESDIR}"/${P}-underlink.patch
+		"${FILESDIR}"/${P}-underlink.patch \
+		"${FILESDIR}"/${P}-inline.patch
 
 	sed -i -e 's/@GTK_CFLAGS@//g' main/Makefile.am || die
 	eautoreconf
 }
 
 src_configure() {
-	egamesconf \
+	econf \
 		--with-cmz80 \
 		--with-sdl \
 		--without-tcltk \
@@ -45,7 +49,6 @@ src_compile() {
 }
 
 src_install() {
-	dogamesbin main/generator-sdl
+	dobin main/generator-sdl
 	dodoc AUTHORS ChangeLog NEWS README TODO docs/*
-	prepgamesdirs
 }
diff --git a/games-emulation/gens/Manifest b/games-emulation/gens/Manifest
index 0d49e4248178..9d767dd2b427 100644
--- a/games-emulation/gens/Manifest
+++ b/games-emulation/gens/Manifest
@@ -1,7 +1,7 @@
-AUX gens-2.15.5-as-needed.patch 363 BLAKE2B 297d96f6c08bda407e9a8e7d3e518f177b85556855ccef7337215efb1378ed69d100ef36e34a926a108242809dab69d91d1c21e4a97eaeb47662a44e0f6f9b1c SHA512 f45c01cd60ac989123a226eb11341d5470dd2b0a4e03057cd4923b1314a08e88a5c2076363d1cb2321a016ae4073d90967b02acc29ca2f1a5e37f7c367efcea4
+AUX gens-2.15.5-as-needed.patch 367 BLAKE2B 145f1d54665e2a0a50a11c18bca22c9ec17b420d3439812f4d82ca259486ee4e3ffcf8b47a5cff7bd61a838ad6723ce9fa9d1d4448d3d51b5638861d5109f970 SHA512 be44bd13b869a9181d740f850dcb7a6f6cfc8660bf31cdf515beffa989fc64e120e7dc3b683f702ec6059805bc37f18a104f420fd3f84a438f26b09da82dd4a8
 AUX gens-2.15.5-gcc34.patch 1545 BLAKE2B c0a4b73fb0ead7ccd98660c8684e88dc8b04179cee114c3d984b9ab699a8f3f5c680b55068847d225645ea32f03eed21841e0e01aeb2c80d15f40d7ad52a5f13 SHA512 8af2946ac09a18adc2d35ea7797acfdb107b86b29b6bf412a87080e4cc66e45bb5a61823095766bde2ca3e95768a1ac243e39b1d06f9bd99f20b7fdec71d1ef0
-AUX gens-2.15.5-ovflfix.patch 577 BLAKE2B b7d10bfa565b98365e67e0fea94bf559972bc5ff44d37d98883ab62451b7fcb5c853207214aeb8c4812ea42d33c64c66f7723e78159429647c2c9be390e2ea46 SHA512 8c878b929f8a13bd8e33730cd09a4ebab4f47ed07ab02af88815ae8d02fd0d7a64ad44a4e369e2ad086022de207957dc88f99738bca737e50e18e951165f2631
-AUX gens-2.15.5-romsdir.patch 571 BLAKE2B e661b51378b24975885addd8535182098c4930d0276f6d5c604f4be47eb8261e3967184cf286c23469a0cd9218e506496fdd924199eeaa772da00bb0be9919af SHA512 02dbdb3410ce62fc17469f0e8b2ee4d14025b218c71c4b27af8dfe71d319d51710b111e2104009f06579a3b499971218b72d75a993862e2657388a5194caa73f
+AUX gens-2.15.5-ovflfix.patch 581 BLAKE2B a4b44f6b59e03021f9b68603b0011d88fc14284e3e817c970d97a2e8ebbc1454eef339869da680e0b5073b96a7786fb39a1fa997c0d0a6911837c0220a59b0b1 SHA512 cc21dfabeba4cf413853c8d7d0779448c9aab318c2bd83894622ea132eae645000b77d9ef803bb1643f5f6b1b11263f4dfaf66e50a905730e592a628654c33f7
+AUX gens-2.15.5-romsdir.patch 575 BLAKE2B 2af287d30b5ff6c28a306fb35733cd8a715ffe1ae20da117b5f9dd3520f54c39a906d9bcd6b6003ce2cb4bd09d55d10bf25164d71f9400548360b9736cb5aa06 SHA512 73b75f4b8087931b20b1b8c220ce64e957ca0cdeb91a59a90b29b4376420e567093f0ae6d6525cdf3930f555720b27c9f152ec5bbf0365743a0bac236da115e6
 DIST gens-2.15.5.tar.gz 741852 BLAKE2B 17501077737ea7320f9675c130c89cc0e078ad413e7af32c55c5db8d0fa2ba099db26d1272c32e09e86bb11fd49f364b0597540261414d366198afb24a10bc7a SHA512 7163f6a1e09bac420e0e4aa0f8f3ed255406d9aff3cc7366c40226e7fece78baca5428d0fe87daf0f12f6e10b428477a795b54d008db5e3dcbf7692ed9d9fe7d
-EBUILD gens-2.15.5.ebuild 993 BLAKE2B fcf8b645d84f9f77541252ff4cd80ef0070d4dc3b4ba9d0ecdee12b873bf08f282b083f57f71f680eb36ce941111c9cf8af50fc44edcecaba5c45aacee458c05 SHA512 0956f1f3ce76a9c7b1f0062add85a9e9954454534940f9695e24da24cd231d50240e0c1f91537a19829176da621d859ebd9e6f0b50902a1248c81c487cfecee8
+EBUILD gens-2.15.5-r1.ebuild 1039 BLAKE2B 3f45d90fe1ed3b9210a03fe33fec6d86d75854dde240aa45d6c9ccb3acdd013108280a40c81518eb5cb9e1ad26f9e88cd796a79f8d085dbc30adda55b4426679 SHA512 9a2486425226271ab06d8c5977590f86885748c63b51c35246e55ea5ffd69f22ee909214b8d2d084c6444e881857306f1729e1819b349d59ae2f0d1a079265ed
 MISC metadata.xml 327 BLAKE2B 2eb11640da9741a65ebe22b58a03e88d5432c69cef02a4db90801bc65d06987e3a8056401efca51ed70846666922d312bb1f38189cea7a53e9e0c1afbde55fa9 SHA512 651fefa76d513b3f2a0ecf865547bf7046605ef21fa689e620820464a28b3b2e5b288623e7ca71bcae93cc016871240025caf1fdb04a45a0695ec457098434b4
diff --git a/games-emulation/gens/files/gens-2.15.5-as-needed.patch b/games-emulation/gens/files/gens-2.15.5-as-needed.patch
index 02aed32b802c..2b58e7f94b33 100644
--- a/games-emulation/gens/files/gens-2.15.5-as-needed.patch
+++ b/games-emulation/gens/files/gens-2.15.5-as-needed.patch
@@ -1,5 +1,5 @@
---- configure.old       2009-02-04 14:41:40.000000000 +0100
-+++ configure   2009-02-04 14:48:52.000000000 +0100
+--- a/configure.old       2009-02-04 14:41:40.000000000 +0100
++++ b/configure   2009-02-04 14:48:52.000000000 +0100
 @@ -4929,7 +4929,7 @@
         { echo "$as_me:$LINENO: result: $with_opengl" >&5
  echo "${ECHO_T}$with_opengl" >&6; }
diff --git a/games-emulation/gens/files/gens-2.15.5-ovflfix.patch b/games-emulation/gens/files/gens-2.15.5-ovflfix.patch
index f5b98a54245f..fdbef69dba0a 100644
--- a/games-emulation/gens/files/gens-2.15.5-ovflfix.patch
+++ b/games-emulation/gens/files/gens-2.15.5-ovflfix.patch
@@ -1,5 +1,5 @@
---- src/gens/gens_core/cpu/68k/cpu_68k.c.old	2010-10-28 09:34:52.000000000 +0200
-+++ src/gens/gens_core/cpu/68k/cpu_68k.c	2010-10-28 09:35:53.000000000 +0200
+--- a/src/gens/gens_core/cpu/68k/cpu_68k.c.old	2010-10-28 09:34:52.000000000 +0200
++++ b/src/gens/gens_core/cpu/68k/cpu_68k.c	2010-10-28 09:35:53.000000000 +0200
 @@ -239,8 +239,8 @@
    memset (Ram_Word_2M, 0, 256 * 1024);
    memset (Ram_Word_1M, 0, 256 * 1024);
diff --git a/games-emulation/gens/files/gens-2.15.5-romsdir.patch b/games-emulation/gens/files/gens-2.15.5-romsdir.patch
index 606efe2dd6f9..c885552f12d5 100644
--- a/games-emulation/gens/files/gens-2.15.5-romsdir.patch
+++ b/games-emulation/gens/files/gens-2.15.5-romsdir.patch
@@ -1,6 +1,6 @@
 diff -ruN gens-rc3.5-opengl/src/gens/util/rom.c gens-rc3.5-opengl-patched/src/gens/util/rom.c
---- src/gens/util/file/rom.c	2005-01-10 22:24:01.000000000 +0100
-+++ src/gens/util/file/rom.c	2006-10-29 14:58:14.000000000 +0100
+--- a/src/gens/util/file/rom.c	2005-01-10 22:24:01.000000000 +0100
++++ b/src/gens/util/file/rom.c	2006-10-29 14:58:14.000000000 +0100
 @@ -411,6 +411,9 @@
      create_file_chooser_dialog ("Open Rom", GTK_FILE_CHOOSER_ACTION_OPEN);
  //      fileselection_set_dir (fd.filesel, Rom_Dir);
diff --git a/games-emulation/gens/gens-2.15.5.ebuild b/games-emulation/gens/gens-2.15.5-r1.ebuild
index 9d936ba15a39..de49e5ffa082 100644
--- a/games-emulation/gens/gens-2.15.5.ebuild
+++ b/games-emulation/gens/gens-2.15.5-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils flag-o-matic games
+EAPI=6
+inherit desktop flag-o-matic
 
 DESCRIPTION="A Sega Genesis/CD/32X emulator"
 HOMEPAGE="https://sourceforge.net/projects/gens/"
@@ -10,17 +10,21 @@ SRC_URI="mirror://sourceforge/gens/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="virtual/opengl
+RDEPEND="
+	virtual/opengl
 	>=media-libs/libsdl-1.2[joystick,video]
-	x11-libs/gtk+:2"
+	x11-libs/gtk+:2
+"
 DEPEND="${RDEPEND}
-	>=dev-lang/nasm-0.98"
+	>=dev-lang/nasm-0.98
+"
 
 src_prepare() {
-	epatch \
+	default
+	eapply \
 		"${FILESDIR}"/${P}-romsdir.patch \
 		"${FILESDIR}"/${P}-as-needed.patch \
 		"${FILESDIR}"/${P}-ovflfix.patch \
@@ -30,7 +34,8 @@ src_prepare() {
 }
 
 src_configure() {
-	egamesconf \
+	use amd64 && multilib_toolchain_setup x86 #441876
+	econf \
 		--disable-gtktest \
 		--disable-sdltest
 }
@@ -40,5 +45,4 @@ src_install() {
 		default
 	newicon pixmaps/gens_small.png ${PN}.png
 	make_desktop_entry "${PN}" "Gens"
-	prepgamesdirs
 }
diff --git a/games-emulation/gngb/Manifest b/games-emulation/gngb/Manifest
index cd1e60f55ac8..81b523314685 100644
--- a/games-emulation/gngb/Manifest
+++ b/games-emulation/gngb/Manifest
@@ -1,4 +1,11 @@
-AUX gngb-20060309-ovflfix.patch 473 BLAKE2B 79d4da7111606da1f601abf45015ba7334a0f28ababc3b96ed6e7c7d56eab35551f937fca4242f0f22e92eddbfad19e58b99220a7457836c411c47f6a7c5711f SHA512 b0d6630aaf693b8cc3f0384641e05125dd8c6cd6c26fd7a3856ff2c23d462c4eed1986108acf1bf9c269e7a008f9367f86eabf148b53064ebe7a4f39f3cdbc74
+AUX gngb-20060309-amd64.patch 982 BLAKE2B 767efcd0db8ae30296a2326ae74b16f2ea776bee490a77ae6c7960ed96ac127e54e6bb896cc4bcaca43a5c3a5508ebb0bcad17c5c7af3add1104c95540090811 SHA512 91f3782ecaeac60ad60c14b8e173099683e85917765f1d8e1ce92edbbba929042e0254c2d7f4432124c1dd2c8965603e88172076bf4e3c6b427e8c46f25c0312
+AUX gngb-20060309-gcc34.patch 623 BLAKE2B 8861c3224bc01d4ce1ec5c062d473bb2ad6f533e834550ba7d53f416d684c44580169d36aa016a65d916f8ffe05aa336f1b60da285e253b7aa288c33f8518860 SHA512 651a0771d1b43762083bece5eb12ecba5833774fb095bdb00c0031e20d11b4a59daae4bdd519a2840a2dd5aa5ea0a852d968da7cf96de8acd7ac1ddd90968167
+AUX gngb-20060309-gcc5.patch 818 BLAKE2B 8b937260859a3bed1339f3d3a253fcc58aff3991503f03fbdc529446666e7a0c344469d10793e6ab31dba42f9b4db4b29181e1e3bdaed23bc41175056cc5f747 SHA512 f61dd42c766ee9fcdd02228401011b38dc9ecc7e87044b34f6d726a4fc9862ebabb39223b83967fce247a675a6cfa8037747e49ead4077b9a0aff522f7377e79
+AUX gngb-20060309-gcc7.patch 1693 BLAKE2B a47637993a219502c6f81750987ea7679935cd07e7cb2ad8ffbdb648a8b11c329ca55585949f172c3b0ce2b18592572a37c4302d59b9172e4d481d1a81871644 SHA512 ff73a5344c1b3d090fbd16c774ffb535f4586cd2b876f71654d1e3e127c1527bb9abe096e24f6c8fb5cff2d19c29b12aa1e6f56e760b00362ff44755711ec433
+AUX gngb-20060309-inline.patch 463 BLAKE2B 8946f6bc81e518b482fb93bac335b3a15a728736a06bb753692d6ac896d1ffc4f550d3aff8b41dbd1bf5d79d38c5c3edf969b7686d9fb05e654e49384d65055b SHA512 6a1916555f7855abde4a1ce3a6ba19575c3b92cd8e3eb9283757b54e1747ee37dce7005c2311d9faaeb5059e8157c742abfba072c912b1c6d5e40555a28c2b25
+AUX gngb-20060309-joystick.patch 2162 BLAKE2B f2c9bf3aad5468e5a4e587489b0737270c07d743a7ee710aada49a041f73d6a8afbdf4b8f1efa7ec2a582603b7a39e75c5b33765d965f9b85538dc7a7ff87d01 SHA512 535fcccfc986fdb4e555d0edca7ad4cbe33ed656a904bd32d4de516a4735ecdc7743e58e38a20d2b6015f515f7dbed6260a974ec92797b497a111b0e5bb1c24c
+AUX gngb-20060309-ovflfix.patch 477 BLAKE2B 89899e797e0acce54bb7f7d70db54d01ac62aa5c7738f7d33f9986de0d4fa85b6fd517471955a391ef420b2a74a926e9a3c6e7c2b2520cc130f3682a99ef08e6 SHA512 d8b30c85187d84d54db6e1be2b41b21ccbab61d330f67354dc2b086ac15d80cb686fd5638efac925eb52bfad8c61f3168792da8ceada83869ee8c755e26d0c05
+AUX gngb-20060309-qwerty.patch 590 BLAKE2B 1042df2d545203547a691322ddfee05a76cd9a8a099e7ce14917f7b93ccee606ff9746a88c056409b838e4cd4a53703248bd1232be177d582a7774a80cf141af SHA512 756923c0d35b42adb69da6bf7c3c7cd89adc6402d758b8f2f50d2e527181841685b108cd9903c70a2e62b7ce3319dd1a784045866d50d9a21eabc870115779b9
 DIST gngb-20060309.tar.gz 168911 BLAKE2B 9377b107c3318041cf903de1661ec6a43078e1cade77b2899b6412616b2c5c32e217d5efc69fcc5324c75242f880493b1b3e678c5bc0a71a4a3ef2dbfd756b4c SHA512 169fdb94eac439240ff15fc2337908cb40e06259338d03c0193a0cb04acb9ee688832fc3157ec56e4e541a8889c4b1a4e7d0efb035b5829ffb856192b60d259f
-EBUILD gngb-20060309.ebuild 739 BLAKE2B be77d7561d948cb11c2b0bd18503e8306a4473bd1f6cceb0a985fa28c95d8a69cb97f5971cc551411cb708ddfb60c65ddab111664b632a503e1220c0670e6e49 SHA512 582218386a452d52a50cb1de5ba528daac42fe6682f589479a662372af7b1a289bde2257c1e4a0ae6c7b452d61e8dd4af5e2be50cc5d28538d360aa3343283c6
+EBUILD gngb-20060309-r1.ebuild 951 BLAKE2B ee37545f7f64fc3f75d464523e47768bfb24b27f633481518b66dcf28ac29d5986e8450895bd720950fc9b0f609f1f7267c9f88d161d43cfb59c688713e47797 SHA512 b83debaf3d28f5a7da50dd1cb10b7eaf339cfffdebbec798295dde6c23f520bea064a4ecb43e8e8e2591bbfde1ec9f7554aa7e7972c4bee2af084770c523a9de
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-emulation/gngb/files/gngb-20060309-amd64.patch b/games-emulation/gngb/files/gngb-20060309-amd64.patch
new file mode 100644
index 000000000000..1e63ee00dd26
--- /dev/null
+++ b/games-emulation/gngb/files/gngb-20060309-amd64.patch
@@ -0,0 +1,30 @@
+From: Chris Lamb <lamby@debian.org>
+Date: Wed, 16 Aug 2017 22:53:10 +0200
+Subject: reproducible build
+
+Bug-Debian: https://bugs.debian.org/831773
+---
+ configure.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 9b8aeec..145bd73 100644
+--- a/configure.in
++++ b/configure.in
+@@ -90,6 +90,7 @@ fi
+ dnl Arch
+ 
+ case `uname -m` in
++*x86_64) arch_info=x86_64 ;;
+ *686) arch_info=i686 ;;
+ *i586) arch_info=i586 ;;
+ *i486) arch_info=i486 ;;
+@@ -107,7 +108,7 @@ sys_info=`uname -s`
+ AC_MSG_RESULT(System: $sys_info)
+ 
+ case $arch_info in
+-i686|i586|i486|i386) OPT="-O3  -Wno-unused -funroll-loops -fstrength-reduce \
++x86_64|i686|i586|i486|i386) OPT="-O3  -Wno-unused -funroll-loops -fstrength-reduce \
+                           -ffast-math -falign-functions=2 -falign-jumps=2 \
+                           -falign-loops=2 -fomit-frame-pointer -Wall " ;;
+ sun4u)               OPT="-O3  -Wno-unused -funroll-loops -fstrength-reduce \
diff --git a/games-emulation/gngb/files/gngb-20060309-gcc34.patch b/games-emulation/gngb/files/gngb-20060309-gcc34.patch
new file mode 100644
index 000000000000..112569287fd3
--- /dev/null
+++ b/games-emulation/gngb/files/gngb-20060309-gcc34.patch
@@ -0,0 +1,22 @@
+From: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
+Date: Thu, 10 Aug 2017 19:06:35 +0000
+Subject: FTBFS_with_gcc-3.4_conflicting_types
+
+===================================================================
+---
+ src/save.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/save.c b/src/save.c
+index c7e4395..bf50bdf 100644
+--- a/src/save.c
++++ b/src/save.c
+@@ -404,6 +404,8 @@ int save_load_rt_info(GNGB_FILE * stream,char op) {
+   return 0;
+ }
+ 
++void movie_add_pad(Uint8 pad);
++
+ int save_load_pad_movie(GNGB_FILE * stream,char op) {
+   if (!op) {			/* Write */
+     PAD_SAVE *p=gngb_movie.first_pad;
diff --git a/games-emulation/gngb/files/gngb-20060309-gcc5.patch b/games-emulation/gngb/files/gngb-20060309-gcc5.patch
new file mode 100644
index 000000000000..72dd21a494fb
--- /dev/null
+++ b/games-emulation/gngb/files/gngb-20060309-gcc5.patch
@@ -0,0 +1,35 @@
+From: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
+Date: Thu, 10 Aug 2017 19:06:36 +0000
+Subject: gngb_fcc5_fix
+
+---
+ src/cpu.c  | 2 +-
+ src/vram.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/cpu.c b/src/cpu.c
+index f03a811..57bc209 100644
+--- a/src/cpu.c
++++ b/src/cpu.c
+@@ -2826,7 +2826,7 @@ __inline__ void rom_timer_inc(void) {
+   }
+ }
+ 
+-__inline__ void cpu_run(void) {
++extern __inline__ void cpu_run(void) {
+   static Uint32 divid_cycle;
+   int v=0;
+   Uint8 a;
+diff --git a/src/vram.c b/src/vram.c
+index 206b625..7213b4e 100644
+--- a/src/vram.c
++++ b/src/vram.c
+@@ -242,7 +242,7 @@ void switch_fullscreen(void) {
+   conf.fs^=1;
+ }
+ 
+-__inline__ Uint8 get_nb_spr(void)
++extern __inline__ Uint8 get_nb_spr(void)
+ {
+   Uint8 *sp=oam_space;
+   Sint16 no_tile,x,y,att;
diff --git a/games-emulation/gngb/files/gngb-20060309-gcc7.patch b/games-emulation/gngb/files/gngb-20060309-gcc7.patch
new file mode 100644
index 000000000000..557e69501dc9
--- /dev/null
+++ b/games-emulation/gngb/files/gngb-20060309-gcc7.patch
@@ -0,0 +1,73 @@
+From: Markus Koschany <apo@debian.org>
+Date: Thu, 10 Aug 2017 19:39:05 +0000
+Subject: gcc7
+
+Bug-Debian: https://bugs.debian.org/853425
+Forwarded: no
+---
+ src/cpu.c    | 10 +++++-----
+ src/memory.c |  2 +-
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/cpu.c b/src/cpu.c
+index 57bc209..5209548 100644
+--- a/src/cpu.c
++++ b/src/cpu.c
+@@ -61,7 +61,7 @@ static Uint8 a;
+ #define H (gbcpu->hl.b.h)
+ #define L (gbcpu->hl.b.l)
+ 
+-__inline__ Uint16 get_word(void)
++extern __inline__ Uint16 get_word(void)
+ {
+   //Uint16 v=((Uint16)(mem_read(PC)));
+   Uint16 v1,v2;
+@@ -74,7 +74,7 @@ __inline__ Uint16 get_word(void)
+   //return v;
+ }
+ 
+-__inline__ Uint8 get_byte(void)
++extern __inline__ Uint8 get_byte(void)
+ {
+   //Uint8 t=mem_read(PC);
+   Uint8 t;
+@@ -83,7 +83,7 @@ __inline__ Uint8 get_byte(void)
+   return t;
+ }
+ 
+-__inline__ void push_r(REG *r)
++extern __inline__ void push_r(REG *r)
+ {
+   //mem_write(--SP,(r)->b.h);
+   //mem_write(--SP,(r)->b.l);
+@@ -93,7 +93,7 @@ __inline__ void push_r(REG *r)
+   mem_write_fast(SP,(r)->b.l);
+ }
+ 
+-__inline__ void pop_r(REG *r)
++extern __inline__ void pop_r(REG *r)
+ {
+   //(r)->b.l=mem_read(SP);
+   mem_read_fast(SP,(r)->b.l);
+@@ -176,7 +176,7 @@ __inline__ Uint8 unknown(void){
+ 
+ 
+ 
+-__inline__ Uint8 gbcpu_exec_one(void)
++extern __inline__ Uint8 gbcpu_exec_one(void)
+ {
+ 	static Uint8 opcode;
+ 	if (gbcpu->ei_flag==1) {
+diff --git a/src/memory.c b/src/memory.c
+index 26e42d9..fd06738 100644
+--- a/src/memory.c
++++ b/src/memory.c
+@@ -737,7 +737,7 @@ Uint8 mem_read_default(Uint16 adr)
+   return 0xFF;
+ }
+ 
+-__inline__ void update_gb_pad(void) {
++extern __inline__ void update_gb_pad(void) {
+   gb_pad=0;
+   if (!conf.play_movie) {
+ 
diff --git a/games-emulation/gngb/files/gngb-20060309-inline.patch b/games-emulation/gngb/files/gngb-20060309-inline.patch
new file mode 100644
index 000000000000..d73ed4cb617b
--- /dev/null
+++ b/games-emulation/gngb/files/gngb-20060309-inline.patch
@@ -0,0 +1,24 @@
+From: Arthur Marble <arthur@info9.net>
+Date: Wed, 16 Aug 2017 23:49:59 +0200
+Subject: clang-ftbfs
+
+Bug-Debian: https://bugs.debian.org/757486
+---
+ src/global.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/global.h b/src/global.h
+index bb46387..6a6d2b3 100644
+--- a/src/global.h
++++ b/src/global.h
+@@ -22,5 +22,10 @@
+ #include <config.h>
+ #include <SDL.h>
+ 
++#ifdef __clang__
++#define __inline__
++#else
++#define __inline__ inline
++#endif
+ 
+ #endif
diff --git a/games-emulation/gngb/files/gngb-20060309-joystick.patch b/games-emulation/gngb/files/gngb-20060309-joystick.patch
new file mode 100644
index 000000000000..ec5003a52c61
--- /dev/null
+++ b/games-emulation/gngb/files/gngb-20060309-joystick.patch
@@ -0,0 +1,56 @@
+From: Markus Koschany <apo@debian.org>
+Date: Wed, 16 Aug 2017 23:25:30 +0200
+Subject: joystick axis
+
+Bug-Debian: https://bugs.debian.org/592777
+Forwarded: http://m.peponas.free.fr/gngb/news.html
+Origin: http://m.peponas.free.fr/gngb/download/memory.c.diff
+---
+ src/memory.c | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/src/memory.c b/src/memory.c
+index fd06738..9eaef1f 100644
+--- a/src/memory.c
++++ b/src/memory.c
+@@ -67,7 +67,11 @@ Uint8 ram_mask;
+ MEM_READ_ENTRY mem_read_tab[0x10];
+ MEM_WRITE_ENTRY mem_write_tab[0x10];
+ 
++/* doesn't work for negative joy_?_min */
++/*
+ Sint16 joy_x_min=0;joy_x_max=0;joy_y_min=0;joy_y_max=0;
++*/
++Sint16 joy_x_min=-32767;joy_x_max=32767;joy_y_min=-32767;joy_y_max=32767;
+ 
+ void (*select_rom_page)(Uint16 adr,Uint8 v);
+ void (*select_ram_page)(Uint16 adr,Uint8 v);
+@@ -755,15 +759,28 @@ extern __inline__ void update_gb_pad(void) {
+       Sint16 joy_x_pos=joy_axis[jmap[PAD_LEFT]];
+       Sint16 joy_y_pos=joy_axis[jmap[PAD_UP]];
+ 
++			/* unnecessary if joy_?_min and joy_?_max are minimum and maximum
++			 * values of Sint16
+       if (joy_x_pos>joy_x_max) joy_x_max=joy_x_pos;
+       if (joy_x_pos<joy_x_min) joy_x_min=joy_x_pos;
+       if (joy_y_pos>joy_y_max) joy_y_max=joy_y_pos;
+       if (joy_y_pos<joy_y_min) joy_y_min=joy_y_pos;
++      */
+ 
++			/* this doesn't work when joy_x_min or joy_y_min < 0 (mid should be ~0),
++			 * because ((+max) - (-min)) / 2 = ((+max) + (+min)) / 2
+       Sint16 joy_x_mid=(joy_x_max-joy_x_min) / 2;
+       Sint16 joy_y_mid=(joy_y_max-joy_y_min) / 2;
++      */
++      Sint16 joy_x_mid=(joy_x_max+joy_x_min) >> 1;
++      Sint16 joy_y_mid=(joy_y_max+joy_y_min) >> 1;
++      /* this doesn't work as joy_x_mid or joy_y_mid approaches 0
+       Sint16 joy_x_qua=joy_x_mid / 2;
+       Sint16 joy_y_qua=joy_y_mid / 2;
++      */
++      /* (difference) / 100 = 1% of possible values */
++      Sint16 joy_x_qua=(joy_x_max - joy_x_min) / 100;
++      Sint16 joy_y_qua=(joy_y_max - joy_y_min) / 100;
+ 
+       if ((joy_x_pos<(joy_x_mid-joy_x_qua)) || (key[kmap[PAD_LEFT]])) gb_pad|=0x20;
+       if ((joy_x_pos>(joy_x_mid+joy_x_qua)) || (key[kmap[PAD_RIGHT]])) gb_pad|=0x10;
diff --git a/games-emulation/gngb/files/gngb-20060309-ovflfix.patch b/games-emulation/gngb/files/gngb-20060309-ovflfix.patch
index d4cad523854e..0b638a1da9ab 100644
--- a/games-emulation/gngb/files/gngb-20060309-ovflfix.patch
+++ b/games-emulation/gngb/files/gngb-20060309-ovflfix.patch
@@ -1,5 +1,5 @@
---- src/serial.c.old	2010-10-28 14:40:23.000000000 +0200
-+++ src/serial.c	2010-10-28 14:41:07.000000000 +0200
+--- a/src/serial.c.old	2010-10-28 14:40:23.000000000 +0200
++++ b/src/serial.c	2010-10-28 14:41:07.000000000 +0200
 @@ -302,11 +302,11 @@
  /* Gbserial_read: Read a byte on the serial 
     This is a block function */
diff --git a/games-emulation/gngb/files/gngb-20060309-qwerty.patch b/games-emulation/gngb/files/gngb-20060309-qwerty.patch
new file mode 100644
index 000000000000..29f563b749e9
--- /dev/null
+++ b/games-emulation/gngb/files/gngb-20060309-qwerty.patch
@@ -0,0 +1,24 @@
+From: Markus Koschany <apo@debian.org>
+Date: Thu, 17 Aug 2017 00:15:26 +0200
+Subject: sample_gngbrc
+
+Bug-Debian: https://bugs.debian.org/597910
+Forwarded: no
+---
+ sample_gngbrc | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/sample_gngbrc b/sample_gngbrc
+index a76b465..d0fdd3f 100644
+--- a/sample_gngbrc
++++ b/sample_gngbrc
+@@ -65,6 +65,9 @@ map_joy     1,1,0,0,3,2,0,1
+ 
+ map_key      273,274,276,275,120,119,13,303
+ 
++# Key configuration qwerty example
++# map_key 273,274,276,275,122,120,13,303
++
+ 
+ # Normal GB palette (bright to dark)
+ pal_1 0xB8A68D,0x917D5E,0x635030,0x211A10
diff --git a/games-emulation/gngb/gngb-20060309-r1.ebuild b/games-emulation/gngb/gngb-20060309-r1.ebuild
new file mode 100644
index 000000000000..ebe0e3fb3b34
--- /dev/null
+++ b/games-emulation/gngb/gngb-20060309-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="Gameboy / Gameboy Color emulator"
+HOMEPAGE="http://m.peponas.free.fr/gngb/"
+SRC_URI="http://m.peponas.free.fr/gngb/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="opengl"
+
+RDEPEND="
+	media-libs/libsdl[sound,joystick,video]
+	sys-libs/zlib
+	app-arch/bzip2
+	opengl? ( virtual/opengl )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	# From Debian
+	"${FILESDIR}"/${P}-amd64.patch
+	"${FILESDIR}"/${P}-gcc34.patch
+	"${FILESDIR}"/${P}-gcc5.patch
+	"${FILESDIR}"/${P}-gcc7.patch
+	"${FILESDIR}"/${P}-inline.patch
+	"${FILESDIR}"/${P}-joystick.patch
+	"${FILESDIR}"/${P}-qwerty.patch
+)
+
+src_prepare() {
+	default
+	sed -i -e '70i#define OF(x) x' src/unzip.h || die
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable opengl gl)
+}
diff --git a/games-emulation/gngb/gngb-20060309.ebuild b/games-emulation/gngb/gngb-20060309.ebuild
deleted file mode 100644
index d54b529dd2f7..000000000000
--- a/games-emulation/gngb/gngb-20060309.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils games
-
-DESCRIPTION="Gameboy / Gameboy Color emulator"
-HOMEPAGE="http://m.peponas.free.fr/gngb/"
-SRC_URI="http://m.peponas.free.fr/gngb/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="opengl"
-
-DEPEND="media-libs/libsdl[sound,joystick,video]
-	sys-libs/zlib
-	app-arch/bzip2
-	opengl? ( virtual/opengl )"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ovflfix.patch
-	sed -i -e '70i#define OF(x) x' src/unzip.h || die
-	eautoreconf
-}
-
-src_configure() {
-	egamesconf $(use_enable opengl gl)
-}
-
-src_install() {
-	default
-	prepgamesdirs
-}
diff --git a/games-emulation/gngeo/Manifest b/games-emulation/gngeo/Manifest
index 64b597ad5c11..6d147332d635 100644
--- a/games-emulation/gngeo/Manifest
+++ b/games-emulation/gngeo/Manifest
@@ -1,7 +1,8 @@
-AUX gngeo-0.8-cflags.patch 1942 BLAKE2B 1c85a8a5b094c1771bf69459c7a9db04c42f4346e9053d2ce019bed5b36896d9c95ef0c5b08f2e550ba11f5c9d049df0440727678465bf23d5863e5e1764d900 SHA512 b777cffbdb6539bcf8d5f435dabe989ae29fc02051076ff8d761f2f9b6a8779c5a1666461f873f0b5c7638cf70de7c36f7614c24386ff72736bb4c1353f11f5b
-AUX gngeo-0.8-concurrentMake.patch 631 BLAKE2B 117a41c402e51910d2b15c544f516497fae388510df1c2338800b0a10c00ad82588dd208727e58429a93f8987fba2e1d9f85ce102eeff210f59ec56edd0106f9 SHA512 050de6034a799e7dad41ebb2a65fb9a7ad3dd39da96151dac376a2c58862c1eeed19bb8f9b3479ffc2b2248131370d3065a73a37ce0390e5839607a6f8df6c1c
-AUX gngeo-0.8-execstacks.patch 2465 BLAKE2B bba183440d8096df11e01b389ba727da1b365d7affa8965f3e15db1377a4b2ec44a4f50af811ae752956af7959670d0d6039c5a8dfc5b717fda96e3b512b1bb4 SHA512 0717568d9c967a4f314856ba490eb15efb2fe336cb7cf8eae8e918ba3e550d5704f5bca0a4a7163fae7c02257447eb783da80650f7496dd9cf81358287bd92ad
+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-zlib.patch 335 BLAKE2B 4b18c076a3285659f7e199a6d86c3ea2a899fe8dade51b03b36035c4cf9378a1b80ae16aa81c12f75a51bf0053f7d44dfb3b1025f7d95274a79689737ce6d1cb SHA512 6f09ebb89173bc172dc035247727d5e046fb36b3b05789d4b8e98648a229a260f3749fa3e2e35065a418e339d8d80830411ca3614171ef7aadeba0147a4f6a70
 DIST gngeo-0.8.tar.gz 1043579 BLAKE2B b4d1ffdb53e32ea25ed743af113573ce9ebd9f864bff1fed88797573141aecd3a2f799731316ced19892b9e45a334c8a8b59593fce4ec5651754bf80196c9e13 SHA512 4301e0f48afd8686cdc45bd8c3e7b724f4ab7a2482567c7fe99ee8960f652dbcefb00fcdd7071d85b02636a9ae9795d03169ffc79e8ae6f4c5515a5a53c090c7
-EBUILD gngeo-0.8.ebuild 1024 BLAKE2B 048d4fd723d0de810fd47616efe61c9b427bd19feea845f85694a385ae43288cbb4383f10dfb6c932068f52d18466fae01022be8f4f896e725176284d71e96f2 SHA512 6728ac93208e72a37452fb01008baca8a8861ad09d94ed6a74c341b964600033fc5e5803662fc00490c8a1f81b4170564b320bc1054a2c420ed08b846708e31e
+DIST gngeo.png 1488 BLAKE2B e474aaec3f9d79b83ecb3519680b172cfecbca27931bb3a039d6ee46c53737557ca2c110b22d0f974840039e465b7bfafa364ae2076f9ea785858099fe402922 SHA512 bc0403cf06fd1095095d87e5e6b8cd8d9e018a2a5b20f7168935d0c48d288af55bd98a72150f3c6d6089646a0780b65ff24f135bf5a680690af160c9be8945e5
+EBUILD gngeo-0.8-r1.ebuild 1045 BLAKE2B 0b002644090a65142e44a40fa2b6437318281973c800bc416f7e70f3035194ea5fd70ac22f9df046c22917154a3b16aba85a05f09d41fbf770adba594d13160b SHA512 7193404f6a63cf323f910f132809e865ca9eb65a6406e39252fbcd55980136dfe0879366abeea048edab343ca1bc51115f47eee64cf1eadd736c8a8a7f845fc5
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-emulation/gngeo/files/gngeo-0.8-cflags.patch b/games-emulation/gngeo/files/gngeo-0.8-cflags.patch
index 1a4892abae9e..0dcc3e7c5bf8 100644
--- a/games-emulation/gngeo/files/gngeo-0.8-cflags.patch
+++ b/games-emulation/gngeo/files/gngeo-0.8-cflags.patch
@@ -1,5 +1,5 @@
---- configure.in.orig	2016-03-31 04:15:45.913917791 -0400
-+++ configure.in	2016-03-31 04:16:23.447607551 -0400
+--- a/configure.in.orig	2016-03-31 04:15:45.913917791 -0400
++++ b/configure.in	2016-03-31 04:16:23.447607551 -0400
 @@ -236,20 +236,12 @@
             AC_DEFINE(PROCESSOR_INTEL, 1, [Define if you have an x86 processor])
             ALIGNLONGS=0
diff --git a/games-emulation/gngeo/files/gngeo-0.8-concurrentMake.patch b/games-emulation/gngeo/files/gngeo-0.8-concurrentMake.patch
index 1afc182c0988..f039ecf544d9 100644
--- a/games-emulation/gngeo/files/gngeo-0.8-concurrentMake.patch
+++ b/games-emulation/gngeo/files/gngeo-0.8-concurrentMake.patch
@@ -1,5 +1,5 @@
---- src/generator68k/Makefile.am.orig	2015-01-23 18:37:37.998723294 -0500
-+++ src/generator68k/Makefile.am	2015-01-23 18:38:39.995391133 -0500
+--- a/src/generator68k/Makefile.am.orig	2015-01-23 18:37:37.998723294 -0500
++++ b/src/generator68k/Makefile.am	2015-01-23 18:38:39.995391133 -0500
 @@ -71,9 +71,12 @@
  
  #def68k : def68k.c
diff --git a/games-emulation/gngeo/files/gngeo-0.8-execstacks.patch b/games-emulation/gngeo/files/gngeo-0.8-execstacks.patch
index 17c576b7d634..a3face06f35c 100644
--- a/games-emulation/gngeo/files/gngeo-0.8-execstacks.patch
+++ b/games-emulation/gngeo/files/gngeo-0.8-execstacks.patch
@@ -1,5 +1,5 @@
---- src/effect/2xsaimmx.asm
-+++ src/effect/2xsaimmx.asm
+--- a/src/effect/2xsaimmx.asm
++++ b/src/effect/2xsaimmx.asm
 @@ -2107,3 +2107,7 @@
  final1b       resb 8
  final2a       resb 8
@@ -8,8 +8,8 @@
 +%ifidn __OUTPUT_FORMAT__,elf
 +section .note.GNU-stack noalloc noexec nowrite progbits
 +%endif
---- src/effect/effect_i386.asm
-+++ src/effect/effect_i386.asm
+--- a/src/effect/effect_i386.asm
++++ b/src/effect/effect_i386.asm
 @@ -88,3 +88,7 @@
  	emms
  	
@@ -18,8 +18,8 @@
 +%ifidn __OUTPUT_FORMAT__,elf
 +section .note.GNU-stack noalloc noexec nowrite progbits
 +%endif
---- src/effect/hq2x16.asm
-+++ src/effect/hq2x16.asm
+--- a/src/effect/hq2x16.asm
++++ b/src/effect/hq2x16.asm
 @@ -1935,3 +1935,7 @@
      dd ..@cross8, ..@flag0,  ..@flag0,  ..@flag0,

      dd ..@flag0,  ..@flag0,  ..@flag0,  ..@flag0

@@ -28,8 +28,8 @@
 +%ifidn __OUTPUT_FORMAT__,elf
 +section .note.GNU-stack noalloc noexec nowrite progbits
 +%endif
---- src/effect/hq3x16.asm
-+++ src/effect/hq3x16.asm
+--- a/src/effect/hq3x16.asm
++++ b/src/effect/hq3x16.asm
 @@ -2520,3 +2520,7 @@
      dd ..@cross8, ..@flag0,  ..@flag0,  ..@flag0,

      dd ..@flag0,  ..@flag0,  ..@flag0,  ..@flag0

@@ -38,8 +38,8 @@
 +%ifidn __OUTPUT_FORMAT__,elf
 +section .note.GNU-stack noalloc noexec nowrite progbits
 +%endif
---- src/memcpy.S
-+++ src/memcpy.S
+--- a/src/memcpy.S
++++ b/src/memcpy.S
 @@ -495,4 +495,8 @@
  
  Lmemcpy_bsrcul1l4:
@@ -51,8 +51,8 @@
 +#ifdef __ELF__
 +.section .note.GNU-stack,"",@progbits
 +#endif
---- src/raze/Makefile.am
-+++ src/raze/Makefile.am
+--- a/src/raze/Makefile.am
++++ b/src/raze/Makefile.am
 @@ -20,7 +20,7 @@
  	$(srcdir)/strip_ $< $@
  
@@ -62,8 +62,8 @@
  
  # This assembles the file, once it's been pre-processed
  raze.o: raze2.asm
---- src/raze/raze.asm
-+++ src/raze/raze.asm
+--- a/src/raze/raze.asm
++++ b/src/raze/raze.asm
 @@ -4259,3 +4259,6 @@
  
  ;- the end ------------------------------------------------------------------;
@@ -71,8 +71,8 @@
 +%ifidn ___OUTPUT_FORMAT__,elf
 +section .note.GNU-stack noalloc noexec nowrite progbits
 +%endif
---- src/screen_i386.asm
-+++ src/screen_i386.asm
+--- a/src/screen_i386.asm
++++ b/src/screen_i386.asm
 @@ -96,3 +96,6 @@
  	endproc
  
@@ -80,8 +80,8 @@
 +%ifidn __OUTPUT_FORMAT__,elf
 +section .note.GNU-stack noalloc noexec nowrite progbits
 +%endif
---- src/star/star.c
-+++ src/star/star.c
+--- a/src/star/star.c
++++ b/src/star/star.c
 @@ -2431,6 +2431,10 @@
  */
  static void suffixes(void) {
@@ -93,8 +93,8 @@
  }
  
  /****************************************************************************
---- src/video_i386.asm
-+++ src/video_i386.asm
+--- a/src/video_i386.asm
++++ b/src/video_i386.asm
 @@ -86,3 +86,7 @@
  	
  	popa
diff --git a/games-emulation/gngeo/gngeo-0.8.ebuild b/games-emulation/gngeo/gngeo-0.8-r1.ebuild
index 1d34ff20ab76..3e7f2be86fc0 100644
--- a/games-emulation/gngeo/gngeo-0.8.ebuild
+++ b/games-emulation/gngeo/gngeo-0.8-r1.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils autotools flag-o-matic games
+EAPI=6
+inherit autotools desktop flag-o-matic
 
 DESCRIPTION="A NeoGeo emulator"
 HOMEPAGE="https://code.google.com/p/gngeo/"
-SRC_URI="https://gngeo.googlecode.com/files/${P}.tar.gz"
+SRC_URI="https://gngeo.googlecode.com/files/${P}.tar.gz
+	https://storage.googleapis.com/google-code-archive/v2/code.google.com/gngeo/logo.png -> ${PN}.png"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,10 +17,11 @@ IUSE=""
 DEPEND="virtual/opengl
 	media-libs/libsdl[joystick,opengl,sound,video]
 	sys-libs/zlib[minizip]"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}"
 
 src_prepare() {
-	epatch \
+	default
+	eapply \
 		"${FILESDIR}"/${P}-execstacks.patch \
 		"${FILESDIR}"/${P}-zlib.patch \
 		"${FILESDIR}"/${P}-concurrentMake.patch \
@@ -30,18 +32,12 @@ src_prepare() {
 }
 
 src_configure() {
-	egamesconf --disable-i386asm
+	econf --disable-i386asm
 }
 
 src_install() {
 	DOCS=( AUTHORS FAQ NEWS README* TODO sample_gngeorc )
 	default
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	echo
-	elog "A licensed NeoGeo BIOS copy is required to run the emulator."
-	echo
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN}
 }
diff --git a/games-emulation/gnuboy/Manifest b/games-emulation/gnuboy/Manifest
index e80727d52400..fc71139ab44c 100644
--- a/games-emulation/gnuboy/Manifest
+++ b/games-emulation/gnuboy/Manifest
@@ -1,6 +1,6 @@
-AUX gnuboy-1.0.3-exec-stack.patch 475 BLAKE2B ca4a84f4a7ba34d23a6fe378639a8c97b226525b6d4d3e1bcfe308e39e7a2156c2c3dd31a17db23b31c4d7a8d71b6df8b2cab2376a90da34134a043ef3c74d8e SHA512 801d217cb8dbe4fb6957e6acc31658bbfa90843178a7343cf52d84f1464787da67f6f579f6dcb1ab2c54fef50289d181014f8b179dfcac6c32949ccaeaaca364
+AUX gnuboy-1.0.3-exec-stack.patch 487 BLAKE2B 09cc0019eed65610d67b4c305588b990c9458f8d59349b98fb9ddb274b614c85548928ee38ef68db871db095be40da6450c1444d45f72eb997db9d348eae0332 SHA512 b579b15906bf104f9db86bb49452c26a3eff0cebe2a66349f3b308742d9fe29823879df7658ce542a2d7397b664b7ba5297eb3c266fab1ddfb32ad73da78a693
 AUX gnuboy-1.0.3-include.patch 350 BLAKE2B 30d5bd6fc959e56cd3f6a49b38b86f973cb2b119856921675cdd1c5b665e13e62e9fd675adbc5340c9e1ed715aead8445c50e63b78a31106497fdf08cbcb79a7 SHA512 9815515c39bf0a387b32e0038a050dd7ca51b5b47d539ee39fcb77b1908735890aac9abfd7d1fe03733d7c9359398b1688f401aa2170ac48d0ed6d2d50acf04d
-AUX gnuboy-1.0.3-linux-headers.patch 1685 BLAKE2B 11ccf8ca4104775c8ec3cb326818edc24de6b00332f7d3254b2ef6f1ef0331e2e549474e8b540ff99b8f350364b250c2ea7c0040380f02234e7c142e2e2ba849 SHA512 2cf51c37d7d4cfc230a7ec032c62c22c6fb33c6f05b78e38b8bd033cbcde37b45ab8bef68bfa72374fdcf85139c2504c808516648ae435f7f8f26efa9bd2a56e
+AUX gnuboy-1.0.3-linux-headers.patch 1721 BLAKE2B 2ce538da8270a7893ddeb4233954b9abc8237785ed085cef8129108eaef93d5c34e37b65db246c91c61b2b7e71bf452b0317ceb5ee7b5a169b764e5f1fb44790 SHA512 710fd830cabea8fee05ab07a6342470a1176d7ed1c5ed14c110f47218d7d3b57704c09e0887da6152b05ed1b12e5a6959efde865359c220756176290617b3917
 DIST gnuboy-1.0.3.tar.gz 187627 BLAKE2B 1fe01abceae56244d28544f10cc5659063cfe19ac491374bcb2b818f01385e065385fcba01e0038f51d4b29bcb3018f02402adb820c0a556c201334766595a51 SHA512 89e8075dac5ec17b375a5739367b46c55130211fb487a052be1cca49a5d86cc1a7f1619b2b2473d744fbe3c51fdb1a11110b15836cc9cc9de588932b91d258e6
-EBUILD gnuboy-1.0.3-r1.ebuild 1075 BLAKE2B e2e985799ffc184939eadadc41ab1ac0fe7bdd4bf0c07a9158829bf2ae7f45ab21c536500c906f892d9957ee97905d50c84c7d86abf0f89238905a397c5bbf21 SHA512 99f340116e15f8b5f736a1689b6a09c9320432555b4b821a79f64cf89208904f472a27298ce72742af27df713659b32291365b5579b2a510d3fcb403d4b57847
+EBUILD gnuboy-1.0.3-r2.ebuild 1089 BLAKE2B 9a60d2006a88ad5a77d8206c4c7d819f0b1125c368cc385c8f4144d8a0444d863f570717164e3353f072fe4910510bbe16ae589defcd483e41041886e7b0b3d4 SHA512 89672f1f34f21634d871fd7498ad3afdbc470524c918af0d5179ebe44050a8385ecdf08afbb6fcd9640d50d6078b7d03dc7b3fd145d1fa3e087b1613cc5553bb
 MISC metadata.xml 329 BLAKE2B 121873380b3adf5f6fc460d258de391a75a04f4d50b285c1f882e7461814133507981e7829ae1a783eddfc56933c328fdced934d04e5092a9c0e0f6eca7bfbdf SHA512 79c14f0442b618a82acc9b067360ef978d009fb61a44d869d0c6b4df375b005bc721ce8b90ac80be2bdb8e40e95e111b941a5ac9f006470eefc3b41459b52463
diff --git a/games-emulation/gnuboy/files/gnuboy-1.0.3-exec-stack.patch b/games-emulation/gnuboy/files/gnuboy-1.0.3-exec-stack.patch
index b8059f915f6f..a263ee49599e 100644
--- a/games-emulation/gnuboy/files/gnuboy-1.0.3-exec-stack.patch
+++ b/games-emulation/gnuboy/files/gnuboy-1.0.3-exec-stack.patch
@@ -1,5 +1,5 @@
---- asm/i386/cpu.s
-+++ asm/i386/cpu.s
+--- a/asm/i386/cpu.s
++++ b/asm/i386/cpu.s
 @@ -2428,3 +2428,6 @@
  
  
@@ -7,8 +7,8 @@
 +#if defined(__linux__) && defined(__ELF__)
 +.section .note.GNU-stack,"",%progbits
 +#endif
---- asm/i386/lcd.s
-+++ asm/i386/lcd.s
+--- a/asm/i386/lcd.s
++++ b/asm/i386/lcd.s
 @@ -288,3 +288,6 @@
  
  
@@ -16,8 +16,8 @@
 +#if defined(__linux__) && defined(__ELF__)
 +.section .note.GNU-stack,"",%progbits
 +#endif
---- asm/i386/refresh.s
-+++ asm/i386/refresh.s
+--- a/asm/i386/refresh.s
++++ b/asm/i386/refresh.s
 @@ -283,3 +283,6 @@
  
  
diff --git a/games-emulation/gnuboy/files/gnuboy-1.0.3-linux-headers.patch b/games-emulation/gnuboy/files/gnuboy-1.0.3-linux-headers.patch
index b0dd24a8e50e..543bd2434eed 100644
--- a/games-emulation/gnuboy/files/gnuboy-1.0.3-linux-headers.patch
+++ b/games-emulation/gnuboy/files/gnuboy-1.0.3-linux-headers.patch
@@ -1,7 +1,7 @@
 # -ansi breaks <linux/joystick.h>
 
---- configure.in
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -133,7 +133,7 @@
  if test "$enable_warnings" = yes ; then
  case "$CC" in *gcc*)
@@ -11,8 +11,8 @@
  *)
  AC_MSG_RESULT(disabling warnings for non-gcc compiler) ;;
  esac
---- loader.c
-+++ loader.c
+--- a/loader.c
++++ b/loader.c
 @@ -11,7 +11,6 @@
  #include <stdlib.h>
  #include <string.h>
@@ -21,8 +21,8 @@
  
  static int mbc_table[256] =
  {
---- main.c
-+++ main.c
+--- a/main.c
++++ b/main.c
 @@ -8,7 +8,6 @@
  #include <stdlib.h>
  #include <string.h>
@@ -31,8 +31,8 @@
  
  #include <stdarg.h>
  #include <signal.h>
---- path.c
-+++ path.c
+--- a/path.c
++++ b/path.c
 @@ -5,7 +5,6 @@
  #include <stdlib.h>
  #include <string.h>
@@ -41,8 +41,8 @@
  
  #ifdef ALT_PATH_SEP
  #define SEP ';'
---- rckeys.c
-+++ rckeys.c
+--- a/rckeys.c
++++ b/rckeys.c
 @@ -4,7 +4,6 @@
  #include <stdlib.h>
  #include <string.h>
@@ -51,8 +51,8 @@
  
  #include "defs.h"
  #include "rc.h"
---- rcvars.c
-+++ rcvars.c
+--- a/rcvars.c
++++ b/rcvars.c
 @@ -5,7 +5,6 @@
  #include <stdlib.h>
  #include <string.h>
@@ -61,8 +61,8 @@
  
  #include "defs.h"
  #include "rc.h"
---- sys/linux/fbdev.c
-+++ sys/linux/fbdev.c
+--- a/sys/linux/fbdev.c
++++ b/sys/linux/fbdev.c
 @@ -10,7 +10,6 @@
  
  #include <stdlib.h>
@@ -71,8 +71,8 @@
  #include <unistd.h>
  #include <sys/mman.h>
  #include <linux/fb.h>
---- sys/linux/joy.c
-+++ sys/linux/joy.c
+--- a/sys/linux/joy.c
++++ b/sys/linux/joy.c
 @@ -2,7 +2,6 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -81,8 +81,8 @@
  #include <linux/joystick.h>
  #include <sys/types.h>
  #include <sys/stat.h>
---- sys/oss/oss.c
-+++ sys/oss/oss.c
+--- a/sys/oss/oss.c
++++ b/sys/oss/oss.c
 @@ -2,7 +2,6 @@
  
  #include <stdlib.h>
diff --git a/games-emulation/gnuboy/gnuboy-1.0.3-r1.ebuild b/games-emulation/gnuboy/gnuboy-1.0.3-r2.ebuild
index 86111def6f70..3c4e37c07831 100644
--- a/games-emulation/gnuboy/gnuboy-1.0.3-r1.ebuild
+++ b/games-emulation/gnuboy/gnuboy-1.0.3-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils games
+EAPI=6
+inherit autotools
 
 DESCRIPTION="Gameboy emulator with multiple renderers"
 HOMEPAGE="https://sourceforge.net/projects/gnuboy/"
@@ -13,19 +13,25 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="X sdl"
 
-RDEPEND="sdl? ( media-libs/libsdl )
+RDEPEND="
+	sdl? ( media-libs/libsdl )
 	!X? ( media-libs/libsdl )
-	X? ( x11-libs/libXext )"
+	X? ( x11-libs/libXext )
+"
 DEPEND="${RDEPEND}
-	X? ( x11-proto/xextproto
-		x11-proto/xproto )"
+	X? (
+		x11-proto/xextproto
+		x11-proto/xproto )
+"
 
 src_prepare() {
-	epatch \
+	default
+	eapply \
 		"${FILESDIR}"/${P}-exec-stack.patch \
 		"${FILESDIR}"/${P}-linux-headers.patch \
 		"${FILESDIR}"/${P}-include.patch
 
+	mv configure.in configure.ac || die
 	eautoreconf
 }
 
@@ -36,7 +42,7 @@ src_configure() {
 		myconf="--with-sdl"
 	fi
 
-	egamesconf \
+	econf \
 		$(use_with X x) \
 		$(use_with sdl) \
 		$(use_enable x86 asm) \
@@ -49,9 +55,8 @@ src_install() {
 	for f in sdlgnuboy xgnuboy
 	do
 		if [[ -f ${f} ]] ; then
-			dogamesbin ${f}
+			dobin ${f}
 		fi
 	done
 	dodoc README docs/{CHANGES,CONFIG,CREDITS,FAQ,HACKING,WHATSNEW}
-	prepgamesdirs
 }
diff --git a/games-emulation/higan/Manifest b/games-emulation/higan/Manifest
index 486176ae50fc..0c1e7ec9c6bf 100644
--- a/games-emulation/higan/Manifest
+++ b/games-emulation/higan/Manifest
@@ -1,10 +1,7 @@
-AUX higan-099-QA.patch 2597 BLAKE2B 0737dd216f1dc63620c43478e372a41736d47da6df5e46118b8b8607f81746d3aa79767b0fcda34a1fab405e87b3ebdf15b9b5dfc9dc08b24def7bebc7ecbb6e SHA512 421584e9c26ae66117b5f4d95a7afb3b21674fd112ca33fca7cb0c33e7382f8dda100900536eab3f413a6a3cf0f98cc079644b8cee309f17f50c1bd99604728e
 AUX higan-106_p1-QA.patch 3708 BLAKE2B 25f3707c4336e423017eb879e9dfc02fee9660ee8c5e8390813906614eab8fd4306eabbe15e4330f7f00efed0231a335ec83a3682eb338bdc3f772546fd5d9b7 SHA512 ba5bf66a242baf7b2385ffd7a26c5a180589f917b5a636fa99dd488b4a733c09e6e3eb3ccc013b63817661c498149d943a53d3e536674251ae94f352516a4f44
 AUX higan-106_p1-header-locations.patch 598 BLAKE2B d7935edf4f241802ffc5200f8b4944fe1dff4596941993c7539e290f1640eb5e552a263d1a8d0c6db6b2d909b35bc34350aa84a4ba7ea9f8fb06d8466c59a673 SHA512 756893707d9048bf9f34818733ab812d7a81da329646c77536fc6feef74e97b6e3804dfdfd062e5899bba30c70343afdd3b62a5dfd1b79488b7fdec7bde57a91
 AUX higan-106_p1-wrapper 166 BLAKE2B 87659c19e485a4eca90178a9c2faf96214af7a13fb16c04a2175f3157dd4b522e6414fed9216a9acb293111f2f994837a9a496075ab0bebd2c78e3a5710330a4 SHA512 db297cfc9b6f5ff1553b52587a9988af46ad7d2aadbaa17743676250679e2bada68d97f85e934ce8c1eb7f57ac3f18c43a33eaca809a1f10f5a4f22c8cbe137a
 AUX higan-wrapper 124 BLAKE2B 3b87ba7212551d8c5b4814ff41e2ecd647589dafe8abfac6f354970e1093cf2ef53e885c9f88f6755c8e2a72c08c61491da073819a19494dbb6a75f8ba413f8e SHA512 af3163d06f3bc14b14ec38cf84d11cc706eb6359727743eea35670b4f1ac120af40102ee5409695eba00ead70fcf964073c24d2f47d6824776391927ebbf3f45
 DIST higan-106_p1.tar.bz2 954533 BLAKE2B e7ea44f97f7e2c3ce86b57b853aa59c4372f37185846f8a928ba659b525965aed39f7859721394a776990e53e2f671fc0e7071d17f9397973343d9a7adcf70ac SHA512 f4d8dbfacaa20b948bd382fd0ef48e89cbb21a0569a70b6a4beca6c0a2ba404efc4c28d14bfd3df14d4fd76c763ca1537166bb24d765a8da33423bbea32df4c3
-DIST higan_v099-source.7z 1012348 BLAKE2B db3eb7b8819532786e6f2dd664225abddc49d12cf5c525862578523240c76ab3ac2680537e04b347130ae7e821d1d98e6c4bf25cf47449567afd90887989aa0e SHA512 567f0c9841fb3fed1c78f2afcd9865cbfe06d04b995d4dc468269e459249b758daed949b461b5b8645ebab40edc1f4f28a566de5795325dae4f604190ca9eae6
-EBUILD higan-099.ebuild 3081 BLAKE2B ff75470da256db5e49f8313d87135af2def1d6bd185effa328bb49b97c783d23cc517e46160888707724a56c73ec1303fd2fd98638197e8f62c28f95ffac6e3b SHA512 3e7eff25fc8649bf2181eba3f383e824230c4d574643c5ef0c986fadcd1464f2db0c5db0b3fcb22ae2d26ebdc5504b24916ee5f91025d7fcdc2e0c9ba64f35d9
 EBUILD higan-106_p1-r1.ebuild 3213 BLAKE2B 0b7dfc5a07055b96c3d8cbd4c936acf6137bcc77d6f906c675910f3e426c169636752d1f9cf33452af2156d345976e4003168377bca172302624d253db7e8519 SHA512 ac879d774978c2804c067e2434296e6d9ed42da7d37dbd2c332506c5eded6cbabe6bd8fe3b07597036bcd3fe784b463442e53d3d389758c0af9f43ed108d7a96
 MISC metadata.xml 377 BLAKE2B aefc33327d342c730de8b2bdd95c2299692c894fd67a3f43d378964e7b776e467d2a4644777e7c8a1eb94b41ee300a65cad084decf64fc02abbac8c02de509c1 SHA512 2faa3ffcca01d5740a5ca1c4f554c51e90e81c6c19cde15cf817c448debb5585e09a1b784d94e3ecd06321ed28a740ce846f1afbd149bce590ca69ef5b1ce9f4
diff --git a/games-emulation/higan/files/higan-099-QA.patch b/games-emulation/higan/files/higan-099-QA.patch
deleted file mode 100644
index fd4eb13dd34e..000000000000
--- a/games-emulation/higan/files/higan-099-QA.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -Naur a/higan/GNUmakefile b/higan/GNUmakefile
---- a/higan/GNUmakefile	2016-06-17 18:56:06.414883957 +0200
-+++ b/higan/GNUmakefile	2016-06-17 18:56:19.075903050 +0200
-@@ -4,7 +4,7 @@
- # target := loki
- # console := true
- 
--flags += -I. -I.. -O3
-+flags += -I. -I..
- objects := libco audio video resource
- 
- # profile-guided optimization mode
-@@ -31,7 +31,7 @@
- else ifeq ($(platform),macosx)
-   flags += -march=native
- else ifneq ($(filter $(platform),linux bsd),)
--  flags += -march=native -fopenmp
-+  flags += -fopenmp
-   link += -fopenmp
-   link += -Wl,-export-dynamic
-   link += -lX11 -lXext
-@@ -42,9 +42,9 @@
- compile = \
-   $(strip \
-     $(if $(filter %.c,$<), \
--      $(compiler) $(cflags) $(flags) $1 -c $< -o $@, \
-+      $(compiler) $(cflags) $(flags) $(CFLAGS) $1 -c $< -o $@, \
-       $(if $(filter %.cpp,$<), \
--        $(compiler) $(cppflags) $(flags) $1 -c $< -o $@ \
-+        $(compiler) $(cppflags) $(flags) $(CXXFLAGS) $1 -c $< -o $@ \
-       ) \
-     ) \
-   )
-
---- a/higan/target-tomoko/GNUmakefile	2016-06-17 19:10:27.729182818 +0200
-+++ b/higan/target-tomoko/GNUmakefile	2016-06-17 19:14:34.034554246 +0200
-@@ -45,10 +45,10 @@
- objects := $(patsubst %,obj/%.o,$(objects))
- 
- obj/ruby.o: ../ruby/ruby.cpp $(call rwildcard,../ruby/)
--	$(compiler) $(rubyflags) -c $< -o $@
-+	$(compiler) $(rubyflags) $(CXXFLAGS) -c $< -o $@
- 
- obj/hiro.o: ../hiro/hiro.cpp $(call rwildcard,../hiro/)
--	$(compiler) $(hiroflags) -c $< -o $@
-+	$(compiler) $(hiroflags) $(CXXFLAGS) -c $< -o $@
- 
- obj/ui-tomoko.o: $(ui)/tomoko.cpp $(call rwildcard,$(ui)/)
- obj/ui-program.o: $(ui)/program/program.cpp $(call rwildcard,$(ui)/)
-@@ -64,7 +64,7 @@
- 
- # targets
- build: $(objects)
--	$(strip $(compiler) -o out/$(name) $(objects) $(link))
-+	$(strip $(CXX) $(CXXFLAGS) -o out/$(name) $(objects) $(link))
- ifeq ($(platform),macosx)
- 	@if [ -d out/$(name).app ]; then rm -r out/$(name).app; fi
- 	mkdir -p out/$(name).app/Contents/MacOS/
-
---- a/icarus/GNUmakefile	2016-07-05 16:42:09.198091772 +0200
-+++ b/icarus/GNUmakefile	2016-07-05 16:48:14.388351427 +0200
-@@ -2,7 +2,7 @@
- include ../hiro/GNUmakefile
- 
- name := icarus
--flags += -I.. -O3
-+flags += -I.. $(CXXFLAGS)
- link +=
- 
- ifeq ($(platform),windows)
-@@ -14,7 +14,7 @@
- objects += $(if $(call streq,$(platform),windows),obj/resource.o)
- 
- all: $(objects)
--	$(call unique,$(compiler) -o out/$(name) $(objects) $(link) $(hirolink))
-+	$(call unique,$(compiler) -o out/$(name) $(objects) $(link) $(hirolink) $(LDFLAGS))
- ifeq ($(platform),macosx)
- 	@if [ -d out/$(name).app ]; then rm -r out/$(name).app; fi
- 	mkdir -p out/$(name).app/Contents/MacOS/
diff --git a/games-emulation/higan/higan-099.ebuild b/games-emulation/higan/higan-099.ebuild
deleted file mode 100644
index 7bea4f56b144..000000000000
--- a/games-emulation/higan/higan-099.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils gnome2-utils toolchain-funcs qmake-utils games
-
-MY_P=${PN}_v${PV}-source
-
-DESCRIPTION="A Nintendo multi-system emulator formerly known as bsnes"
-HOMEPAGE="http://byuu.org/higan/ https://code.google.com/p/higan/"
-SRC_URI="http://download.byuu.org/${MY_P}.7z"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ao +alsa +icarus openal opengl oss pulseaudio +sdl udev xv"
-REQUIRED_USE="|| ( ao openal alsa pulseaudio oss )
-	|| ( xv opengl sdl )"
-
-RDEPEND="
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXext
-	icarus? ( x11-libs/gtksourceview:2.0
-			  x11-libs/gtk+:2
-			  x11-libs/pango
-			  dev-libs/atk
-			  x11-libs/cairo
-			  x11-libs/gdk-pixbuf
-			  dev-libs/glib:2
-			  media-libs/fontconfig
-			  media-libs/freetype
-			)
-	ao? ( media-libs/libao )
-	openal? ( media-libs/openal )
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )
-	xv? ( x11-libs/libXv )
-	opengl? ( virtual/opengl )
-	sdl? ( media-libs/libsdl[X,joystick,video] )
-	udev? ( virtual/udev )
-"
-DEPEND="${RDEPEND}
-	app-arch/p7zip
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-disable_module() {
-	sed -i \
-		-e "s|$1\b||" \
-		"${S}"/higan/target-tomoko/GNUmakefile || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-QA.patch
-
-	sed -i \
-		-e "/handle/s#/usr/local/lib#/usr/$(get_libdir)#" \
-		nall/dl.hpp || die "fixing libdir failed!"
-
-	# audio modules
-	use ao || disable_module audio.ao
-	use openal || disable_module audio.openal
-	use pulseaudio ||  { disable_module audio.pulseaudio
-		disable_module audio.pulseaudiosimple ;}
-	use oss || disable_module audio.oss
-	use alsa || disable_module audio.alsa
-
-	# video modules
-	use opengl || disable_module video.glx
-	use xv || disable_module video.xv
-	use sdl || disable_module video.sdl
-
-	# input modules
-	use sdl || disable_module input.sdl
-	use udev || disable_module input.udev
-}
-
-src_compile() {
-	local mytoolkit
-
-	mytoolkit="gtk"
-
-	if use icarus; then
-		cd "${S}/icarus" || die
-		emake \
-			platform="linux" \
-			compiler="$(tc-getCXX)"
-	fi
-
-	cd "${S}/higan" || die
-	emake \
-		platform="linux" \
-		compiler="$(tc-getCXX)" \
-		hiro="${mytoolkit}"
-
-	sed \
-		-e "s:%GAMES_DATADIR%:${GAMES_DATADIR}:" \
-		< "${FILESDIR}"/${PN}-wrapper \
-		> out/${PN}-wrapper || die "generating wrapper failed!"
-}
-
-src_install() {
-	if use icarus; then
-		newgamesbin "${S}"/icarus/out/icarus icarus
-	fi
-	newgamesbin "${S}"/higan/out/${PN} ${PN}.bin
-	newgamesbin "${S}"/higan/out/${PN}-wrapper ${PN}
-	make_desktop_entry "${PN}" "${PN}"
-
-	# copy home directory stuff to a global location
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r higan/data/cheats.bml higan/profile/*
-
-	doicon -s 512 higan/data/${PN}.png
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	#elog "optional dependencies:"
-	#elog "  dev-games/higan-ananke (extra rom load options)"
-	#elog "  games-util/higan-purify (Rom purifier)"
-
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-emulation/lxdream/Manifest b/games-emulation/lxdream/Manifest
index 9aa765b41699..227e0f3ec147 100644
--- a/games-emulation/lxdream/Manifest
+++ b/games-emulation/lxdream/Manifest
@@ -1,4 +1,4 @@
 AUX lxdream-0.9.1-glib-single-include.patch 10725 BLAKE2B 01a76a7e7a6477fcf8e9a9b9b44f7fff04b9c6c88fd361ff47b0ef9c754eb263c89c846b3919d2a48bfc2e4c79e123cc45fbb5008c2a7378772342a08ec7099d SHA512 1e8130ae228799f6b0b53895edb309579d47f93e1f5f7e88387bc9b2e97d201603f43eebc084604e8e5b2b3a93be68daa040c995a7eed59f7b3aaeb903b606dc
 DIST lxdream-0.9.1.tar.gz 2556802 BLAKE2B c69452e95d833c42c930f45e8a9d407e8d1246b2f67c21c2763ae5583d271caa9e28b111a0aa6ec7f5ff7ea9867c18d53ebe1a39bd37a2f47e68544e71c6f6e0 SHA512 f56119e99f82931bb22cc596938caba09f02da9a7e74b6c8ce79880214e3566a9a8091b31f89d5dc56f0802d00ac485ce22c3468350d44b2e1cf140f22983055
-EBUILD lxdream-0.9.1-r2.ebuild 1451 BLAKE2B f122b43132309ba95b71947d468312ce2af098d4ab711402134ba51fceb2daefd2a4ecc498e0c81dd52479d16647ad7c2b808cc97953d4f5b3829d99c6628241 SHA512 d6d140a0e01dcf3ed996eb28efe1678be84f202d32c29a6421852490c8d67a2ff1c7586b8ffc783ca14eda17e6b829393fc546739910c57204001e81866b4ea8
+EBUILD lxdream-0.9.1-r3.ebuild 1470 BLAKE2B f65c23e37f6cb99540aaf1c90b042eafdeef78d7004844a15c8ffb2174d89b5e96465d530b4be50a0eb2fa8bfd8eb3163cd6b7ba786b3703c9349d9d85b7e7dc SHA512 5e8d3d55615a3aec0b961b36263f587dc120381edf97f5bfb031ab1ab43e5136c7cf51ab3118b964976a54204204788dea536ae00f98a5d67396a49a562d199f
 MISC metadata.xml 379 BLAKE2B 9407fbbb5013bc923a712f50b05cfe8c14d7648bf673a28dcb798d591e52c34e105a95d196d8d95f348eaf0e0c710f6a7263acc51a0f643bdc546093cc159c7f SHA512 ec81121ea013b5ee3e2863c317bad1c4e6c324f44d41202be5f105b7d0416f52d8a5144a9ab354dceb8793c947bf7cc85b192aaee65b0e3f44cfae19340e9399
diff --git a/games-emulation/lxdream/lxdream-0.9.1-r2.ebuild b/games-emulation/lxdream/lxdream-0.9.1-r3.ebuild
index 38a59d36d6a5..a2024a899bc9 100644
--- a/games-emulation/lxdream/lxdream-0.9.1-r2.ebuild
+++ b/games-emulation/lxdream/lxdream-0.9.1-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils flag-o-matic games
+EAPI=6
+inherit flag-o-matic
 
 DESCRIPTION="An emulator for the Sega Dreamcast system"
 HOMEPAGE="http://www.lxdream.org/"
@@ -11,16 +11,19 @@ SRC_URI="http://www.lxdream.org/count.php?file=${P}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug lirc profile pulseaudio sdl"
+# lirc configure option is not recogniced
+IUSE="debug profile pulseaudio sdl" #lirc
+
+RDEPEND="
+	app-misc/lirc
 
-RDEPEND="lirc? ( app-misc/lirc )
 	media-libs/alsa-lib
-	media-libs/libpng:0
+	media-libs/libpng:0=
 	pulseaudio? ( media-sound/pulseaudio )
 	sdl? ( media-libs/libsdl[sound] )
 	virtual/opengl
-	x11-libs/gtk+:2"
-
+	x11-libs/gtk+:2
+"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	sys-devel/gettext
@@ -28,7 +31,9 @@ DEPEND="${RDEPEND}
 	!!gnustep-base/gnustep-gui" #377635
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.9.1-glib-single-include.patch"
+	default
+
+	eapply "${FILESDIR}/${PN}-0.9.1-glib-single-include.patch"
 
 	# Make .desktop file pass desktop-file-validate
 	sed -i \
@@ -46,18 +51,14 @@ src_prepare() {
 }
 
 src_configure() {
-	egamesconf \
-		--datadir="${GAMES_DATADIR_BASE}" \
+	# lirc configure option is not recognized
+	# $(use_with lirc) \
+	econf \
+		--datadir="/usr/share" \
 		$(use_enable debug trace) \
 		$(use_enable debug watch) \
 		$(use_enable profile profiled) \
-		$(use_with lirc) \
 		$(use_with pulseaudio pulse) \
 		$(use_with sdl) \
 		--without-esd
 }
-
-src_install() {
-	default
-	prepgamesdirs
-}
diff --git a/games-emulation/mamory/Manifest b/games-emulation/mamory/Manifest
index 95dda740e6c6..58b2d16d4e56 100644
--- a/games-emulation/mamory/Manifest
+++ b/games-emulation/mamory/Manifest
@@ -1,3 +1,3 @@
 DIST mamory-0.2.25.tar.gz 437223 BLAKE2B 2893595245ac3fde7c049448f7dc1cbe0ac24767a7efdcf22b5000154026961ef9b700844cc53d4808e7f90b5042f192d0d2a9338cb47e42d6f9d534f5946044 SHA512 d59539646fa61a3964e46123e0c8d09170f5561355e57b8c93dc89c11d99af1a2edeb60389e7f42b14f431c9c495c6ce20c70517ac4977ccaef62f0ed47f0d76
-EBUILD mamory-0.2.25.ebuild 999 BLAKE2B 6c25f19cb85a043961f22eb5bf89eda79f4f34417e2b7461e6066aa39917c776840962d4d5cb7d294ee296f41f965ee04b1758ecab30789e96313711c13a26c5 SHA512 61d71179b875203157bed19d145f458bd44e7bd378bc1769abd8b2247de3469d89c7111a0518a82204514737e30ac387d605bf69c7531ac31db7f1c99edae19c
+EBUILD mamory-0.2.25-r1.ebuild 1051 BLAKE2B ddb02d41af08032313a818b8f066645f28775331a5e08f846f3b8e8c9ac797fe2959bdd528711609e30701428d42987142cb6888cc5d7fb1aca1707951ad9ad5 SHA512 b917e62eb8f075291e5e9dec9c481a60a99eb333bfc8d02e66efee9da457068e92531bd4c743df35ce0fb5133e3f8dd00e47e70e3bbc52f10657bcd65df8278f
 MISC metadata.xml 329 BLAKE2B b6c6f06e91bfcd0d053f2f057b1651981d60204b07faad12072375b97d84808fa77d6c2549ca3dde5a92881840c4f475fe8af578e1c4c0e1320936ebb0fa9e18 SHA512 58aa61207f4409bc50a405342e2f68cf5d576e7819def22d5bd2788869225fc7d4d8769f1efebd78b40195a30e8a104e2d4107dca6bb1d11a66291353088a75c
diff --git a/games-emulation/mamory/mamory-0.2.25.ebuild b/games-emulation/mamory/mamory-0.2.25-r1.ebuild
index fbf75c2d3d00..cccd915c6f27 100644
--- a/games-emulation/mamory/mamory-0.2.25.ebuild
+++ b/games-emulation/mamory/mamory-0.2.25-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools flag-o-matic games
+EAPI=6
+inherit autotools flag-o-matic
 
 DESCRIPTION="ROM management tools and library"
 HOMEPAGE="http://mamory.sourceforge.net/"
@@ -14,9 +14,11 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-libs/expat"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}"
 
 src_prepare() {
+	default
+
 	# Make sure the system expat is used
 	sed -i \
 		-e 's/#ifdef.*SYSEXPAT/#if 1/' \
@@ -37,12 +39,12 @@ src_prepare() {
 }
 
 src_configure() {
-	egamesconf \
-		--includedir=/usr/include
+	econf \
+		--includedir=/usr/include \
+		--disable-static
 }
 
 src_install() {
-	default
-	dohtml DOCS/mamory.html
-	prepgamesdirs
+	HTML_DOCS="DOCS/mamory.html" default
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/games-emulation/mednaffe/Manifest b/games-emulation/mednaffe/Manifest
index eac4ee627f46..c5358cc1cb28 100644
--- a/games-emulation/mednaffe/Manifest
+++ b/games-emulation/mednaffe/Manifest
@@ -1,3 +1,3 @@
-DIST mednaffe-0.8.zip 311381 BLAKE2B cffa364f58c83dfed85141ed6e740b0e31b76524e8a336b332d79884f745e8d918cfd78658ded4c377b384ccb7dbb921aa883ff3bb0a0d413a2bb00365f0f4a0 SHA512 54747318da956616af2fedba5d9760629d0064140b4aa2bd652208c4fda8cb24dec60d869d6999aaa371d837adcaf0c6761f843277c999c33d98cfdd07bf3776
-EBUILD mednaffe-0.8.ebuild 962 BLAKE2B 9df36a3f4cdc487f26ccb2f35fa98407be4ab059d9a1ef07a014ded84fe99e219659e9fbf86b7b8e43ac4b1fe3f6c62912d5a3478ec28641d26b5e6386b67823 SHA512 35be5a150a876022dc1ce7167cba053b3665ab17b6c2ab6e05431eef6348ef88454f237dd90ebe84a88a11ad6ba8b329b7f31ede5a2f5a0e3f733abb913a2ff0
+DIST mednaffe-0.8.7.tar.gz 304300 BLAKE2B 80a57f2afbea0e33ec547f16088b678fd9a319a124bbebe71fe7848497e1276ae77c0fb47718324d8549dbb69709685f46c970dedf982f48ac095f1923b42dbd SHA512 3495ecd3b87f19ab65d8760ea8adfa830c4dc9fe959f2e2f349216b36f58d9623c9cfd0c7e40fe5e8b7b90846fe85d9808c2a5885f36d5d8b16659b25cf8a3a1
+EBUILD mednaffe-0.8.7.ebuild 869 BLAKE2B b04ffa62a023f0c2f49babc8ebc88e70d8ab9ab24fea303db31d80aa4c66378659dca954df244c762b3273091b97edc5d16f2caab17a98d28422a988b44e6407 SHA512 ac868f6139863cdbec397523688b342640c5f2403fe6e1ceda3326fa04085f6e823b26e0049f4e49cf3114dcfa14f5afad0f264679f78a9c320bd12032341d91
 MISC metadata.xml 336 BLAKE2B 36957f8dd3f83bd9fbbf5e504e5dd8b0fced6a57b51a4f31bc322b498ef16178641e13c9033cd6e3746677a6e9fe39e10b049f8a681ef04b0426a682ddec70b5 SHA512 5d0ade58e84b321f763690314eb9fa4d8aa2f8b06f4470466101e4213828d92ad200565d1cd5324a0a4e9ccd9daa0a13ff14f9574f6d6f639c92d0d9235dacb7
diff --git a/games-emulation/mednaffe/mednaffe-0.8.ebuild b/games-emulation/mednaffe/mednaffe-0.8.7.ebuild
index 921f899357cf..904241ddac84 100644
--- a/games-emulation/mednaffe/mednaffe-0.8.ebuild
+++ b/games-emulation/mednaffe/mednaffe-0.8.7.ebuild
@@ -1,47 +1,44 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools flag-o-matic gnome2-utils games
+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/archive/v$PV.zip -> ${P}.zip"
+SRC_URI="https://github.com/AmatCoder/mednaffe/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="app-arch/unzip
-	x11-libs/gtk+:3
-	virtual/pkgconfig"
-RDEPEND="x11-libs/gtk+:3
-	games-emulation/mednafen[debugger]"
+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 '/^CFLAGS=/d' configure.ac || die
 	sed -i -e 's:$(datadir):/usr/share:' share/Makefile.am || die
 	eautoreconf
 }
 
 src_configure() {
-	egamesconf --enable-gtk3
-}
-
-src_install() {
-	default
-	prepgamesdirs
+	econf --enable-gtk3
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	gnome2_icon_cache_update
 }
 
diff --git a/games-emulation/nestra/Manifest b/games-emulation/nestra/Manifest
index c351a7e1d3fb..f9cdd9ebcf3e 100644
--- a/games-emulation/nestra/Manifest
+++ b/games-emulation/nestra/Manifest
@@ -1,6 +1,6 @@
-AUX nestra-0.66-exec-stack.patch 235 BLAKE2B e5039dc07c79c706331e780b9f9f49d2f0038584218ce9588ed194d2bf47663963fd6480b9ebc3748fe9ee6b4b7a70d4d3098597427842e3f10fe22fe9a77b5b SHA512 a281f6c79de782982425f65cc4c54f35530d394caee4b0c58c9ef3f0f11b38d6ab6c31ecd6e708effb31ca530f1c9fb7ec60cf23d58f4a750dfc86a6c6e43b67
-AUX nestra-0.66-include.patch 1269 BLAKE2B 895df693d31ef78204b3148b31eee31de6637595707422fa71122fb9c324341a4b46afb80530a2090af0c74700d54f328c14ee910a8c15608d7b108b0884aeab SHA512 d2b53ca1b61c71ff6ad98aee15c2f5cfeb02eaa8b7544e9a0d23babe021ee53aede5ad935b0529c1d6d294424c7ca1a5ea6e390af6c4f40aac4da9b43b87b601
+AUX nestra-0.66-exec-stack.patch 239 BLAKE2B 47255490442da874ddea390664928aa77734c67d2dbe84cfe8be82e5fe6042408ca5650164f3c1e8aa396db71be9234933cc18a423b2c08f3c311f589675ec95 SHA512 a65ca4225707a496fcb3fbc968ba301b654c9357b33a6153cb19905080cf1f5ee76bbf6b5510e1886de8a2cfb2c5ebaed3a166d518db50aecfb5953c36ee9a43
+AUX nestra-0.66-include.patch 1297 BLAKE2B 98a52017fc1919fde5125771b267f0ef2b0c73ef29f81f3e2bac3672c6bab5be005028310d031486d143568efbd8ccf7c2d58c4d9bee9d5532e3ac872465fe83 SHA512 f95568a3433094555067a89c59a38519ee2bef6cdce8a0ba962976c5df6be3332fa18c0c4b6635c807ed2b22a40a75e22b9a26282b5e8190659f59c64f212389
 DIST nestra-0.66.tar.gz 49757 BLAKE2B 0ec8603cd9afc33a1b194e1c39cdc8d3173d1ad4c7c76e6e00214883cdfcd8f2cf35bfb4b74e131822aaf8c7864a50980d642bc87aca26372f06b8fab145a7cf SHA512 25f9d0c0359b46ddcd451552e7737b0f955a18e7a4ebd30d5494b12f787b9c45a49579207328c06c10efc7f8283bc688eb2061c538523ed257825b2394d978ce
 DIST nestra_0.66-10.diff.gz 2414 BLAKE2B 5b83ac9eee4d8c141dc473000b5f713ab4eb0a38707334d4fd044b9617f01b83c4a19670ef27874f6511f1f9b1d578ba35d5ba9ac244621b19ca3b9c00d5a30d SHA512 4ea1ad97f6c2eca0434dee4031e0486cc1c7c25237a467d4bf33bd0656b52441143855e07b29e1bdcf95514e19fe68ecb8f73d0972d17d9e3b6fd7a92d2db8c6
-EBUILD nestra-0.66-r2.ebuild 1085 BLAKE2B 57eb36f9fb36b107e4cb3485871a991187ea033c89b0c27633773dabdd5ce99a1daea6d6939a36c4990b875dfefbf771dd8288b7fae1a79e54733f624133ada3 SHA512 22c60c759776f49565d4e27284dbc886c2aa8bb5d8dd5aa0756925e8694aa142d1254253ac458ada1ff2f0b79f3a02c4392368ad921096390e4d1c72836e43ad
+EBUILD nestra-0.66-r3.ebuild 1046 BLAKE2B f36be92637c5125c5019b8c95ab8c8eb28a91999725c2a4de24ea76a46bfca945600dc0eab1b3ed4e8aa126ae7375192858f5d33d782fb087055043a1c77a0a4 SHA512 ae7ec1c29eb73c5cd9f478f84b517fae99dd0e7c3bc421e6850236577c260d35204fa37d6b78963012f1045b1ab30a3db1622feb1be156d93a159856093a4330
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-emulation/nestra/files/nestra-0.66-exec-stack.patch b/games-emulation/nestra/files/nestra-0.66-exec-stack.patch
index f5c662e22600..d9e9b3c61147 100644
--- a/games-emulation/nestra/files/nestra-0.66-exec-stack.patch
+++ b/games-emulation/nestra/files/nestra-0.66-exec-stack.patch
@@ -1,5 +1,5 @@
---- x86.S.orig	2006-01-09 20:02:58.000000000 -0500
-+++ x86.S	2006-01-09 20:03:38.000000000 -0500
+--- a/x86.S.orig	2006-01-09 20:02:58.000000000 -0500
++++ b/x86.S	2006-01-09 20:03:38.000000000 -0500
 @@ -1458,3 +1458,7 @@
   leal   0x1(%eax),%ebx
   popl   %eax
diff --git a/games-emulation/nestra/files/nestra-0.66-include.patch b/games-emulation/nestra/files/nestra-0.66-include.patch
index b4733b172bba..096fd18af47f 100644
--- a/games-emulation/nestra/files/nestra-0.66-include.patch
+++ b/games-emulation/nestra/files/nestra-0.66-include.patch
@@ -1,5 +1,5 @@
---- comptbl.c
-+++ comptbl.c
+--- a/comptbl.c
++++ b/comptbl.c
 @@ -9,6 +9,7 @@
  #include <stdio.h>
  #include <string.h>
@@ -8,8 +8,8 @@
  
  #define ALLOC_SIZE 0x400000 /* 4MB */
  #define TBL_BASE ((unsigned char *)0x10000000)
---- d6502.c
-+++ d6502.c
+--- a/d6502.c
++++ b/d6502.c
 @@ -1,6 +1,7 @@
  /* 6502 disassembler */
  /* Public Domain */
@@ -18,8 +18,8 @@
  #include "globals.h"
  
  char Opcodes_6502[256][4]={
---- emu.c
-+++ emu.c
+--- a/emu.c
++++ b/emu.c
 @@ -12,6 +12,7 @@
  #include <sys/mman.h>
  #include <stdio.h>
@@ -28,8 +28,8 @@
  
  #include "mapper.h"
  #include "io.h"
---- fb.c
-+++ fb.c
+--- a/fb.c
++++ b/fb.c
 @@ -2,6 +2,8 @@
  /* Framebuffer/pixmap rendering */
  /* Public Domain */
@@ -39,8 +39,8 @@
  #include <stdio.h>
  #include "mapper.h"
  #include "globals.h"
---- io.c
-+++ io.c
+--- a/io.c
++++ b/io.c
 @@ -5,6 +5,7 @@
     to do I/O operations. */
  
@@ -49,8 +49,8 @@
  #include "mapper.h"
  #include "io.h"
  #include "globals.h"
---- mapper.c
-+++ mapper.c
+--- a/mapper.c
++++ b/mapper.c
 @@ -1,6 +1,7 @@
  /* Nestra mapper.c */
  /* Public Domain */
@@ -59,8 +59,8 @@
  #include "mapper.h"
  #include "consts.h"
  
---- x11.c
-+++ x11.c
+--- a/x11.c
++++ b/x11.c
 @@ -1,6 +1,9 @@
  /* Nestra x11.c */
  /* Public Domain */
diff --git a/games-emulation/nestra/nestra-0.66-r2.ebuild b/games-emulation/nestra/nestra-0.66-r3.ebuild
index 0dabb4e9895f..44ca1daa1d33 100644
--- a/games-emulation/nestra/nestra-0.66-r2.ebuild
+++ b/games-emulation/nestra/nestra-0.66-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs flag-o-matic multilib games
+EAPI=6
+inherit epatch toolchain-funcs flag-o-matic
 
 PATCH="${P/-/_}-10.diff"
 DESCRIPTION="NES emulation for Linux/x86"
@@ -16,17 +16,19 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11[abi_x86_32(-)]"
-DEPEND=${RDEPEND}
+DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 src_prepare() {
-	epatch \
-		"${WORKDIR}"/${PATCH} \
-		"${FILESDIR}"/${P}-exec-stack.patch \
-		"${FILESDIR}"/${P}-include.patch
+	default
+	epatch "${WORKDIR}"/${PATCH}
+	eapply "${FILESDIR}"/${P}-exec-stack.patch
+	eapply "${FILESDIR}"/${P}-include.patch
+
 	append-ldflags -Wl,-z,noexecstack
 	use amd64 && multilib_toolchain_setup x86
+
 	sed -i \
 		-e "s:-L/usr/X11R6/lib:${LDFLAGS}:" \
 		-e 's:-O2 ::' \
@@ -37,12 +39,11 @@ src_prepare() {
 
 src_compile() {
 	use amd64 && multilib_toolchain_setup x86
-	games_src_compile
+	default
 }
 
 src_install() {
-	dogamesbin nestra
-	dodoc BUGS CHANGES README
+	dobin nestra
+	einstalldocs
 	doman nestra.6
-	prepgamesdirs
 }
diff --git a/games-emulation/openmsx/Manifest b/games-emulation/openmsx/Manifest
index 1ebf08c1fcea..a2465372542c 100644
--- a/games-emulation/openmsx/Manifest
+++ b/games-emulation/openmsx/Manifest
@@ -1,4 +1,3 @@
-AUX openmsx-0.9.1-verbose.patch 654 BLAKE2B e6c2fa739ef7714075fce989e61487b46f78a6b6094f7ff7c3a5ae7c26dfbb0a8fbc14d86f3f45e69e7d9672f296d7dc5f0346337521dadc041bc057c86b49ba SHA512 d895e5dd5ecf7748382ce213a0928fdb26d8957d2487eae94f64120746097b49edfcecf860ea33294fe1fa7d1af5b9332510af852fc816c9355336136e8d03f7
-DIST openmsx-0.9.1.tar.gz 2975351 BLAKE2B 6c571b1cc0039ea8e37af1d503260f21e6431d4403bb74a06fd60bfd1f1d3d0c1831c9e82ae2446dd8ff1bb7bd0cafcf8290306cb1d0bcc23cb7ba7cfebc3d1b SHA512 7c4d23963f33e3033dea1d0ad9351e4f38f7434e2e077b6f8fd00cf80e0160b45291ff19be71646178ecafa01e954267dfe4c815578d4abb14c8595a863f98ff
-EBUILD openmsx-0.9.1.ebuild 1483 BLAKE2B 2437285182ce4687dc80f63f90170adae37f5a2bb1f9d7be9c01636fc479d57f0be9109d0f3f4ae1905180692c9e089da6d616bb5014b315d57375f7dbefb646 SHA512 e463931cd16714a7a4caeaada52ebc7e3ebbc200d6e0ce0d03246e58e93bf3b106a46b8a5e1269e4a65e71ac7b381995ab685d3a3601ba10c32c26a3a117e34f
+DIST openmsx-0.14.0.tar.gz 3338719 BLAKE2B e9c09d29bb994f4f40e22271c090580688724cb7024910f0f829a59d0e65e6e70e1c037b943582aac644ee51a00b7e439e751bd84e5828168486b74ee09e8b78 SHA512 74a30de89b4a7cb4d8d5a0ad0c16ab6b58244251ebcbe470cc3cccec6a636492fa8779d1667d76646eabcf8d7d67c53094d5e0a313d452a4a679d797e9394a9b
+EBUILD openmsx-0.14.0.ebuild 1647 BLAKE2B 97b6ed516383c7162051dbf19ec1805b28b3df9a5845f44fd01a30a898b3078827a1a78026b3b113dd45f472f408d1d165e266b0bf2fa4746aa33e187f9cf27a SHA512 47f3bb94878edc3303c467a552262fed6c3aa0d539ef4a6981e9705b4e4166200126f6da93e1e1e6bcf78b38e102d5ebe22c2c5e9f93a0557cb21b2370e9fed9
 MISC metadata.xml 330 BLAKE2B 0557bfe5901a6eb7331ad400d19b438dd3125b0af9426dd7c5bc369e3e5769677e645529b71c19797a57b4e3a43440a94664e80fa941e414a2b29e209382190d SHA512 0e2cbbe9308c1a43be6617797af0abe91bfa1dbb604ef9bc96dfb7c6c7310799c689ff7450afd9eb5b66d7aaeda878e0d046b404a0220b69b5dcf38be346e422
diff --git a/games-emulation/openmsx/files/openmsx-0.9.1-verbose.patch b/games-emulation/openmsx/files/openmsx-0.9.1-verbose.patch
deleted file mode 100644
index 18ac6fdc83b6..000000000000
--- a/games-emulation/openmsx/files/openmsx-0.9.1-verbose.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- build/main.mk.old	2015-01-18 12:18:50.608153217 +0100
-+++ build/main.mk	2015-01-18 12:20:00.352861984 +0100
-@@ -541,10 +541,9 @@
- DEPEND_SUBST=$(patsubst $(SOURCES_PATH)/%.cc,$(DEPEND_PATH)/%.d,$<)
- $(OBJECTS_FULL): $(INIT_DUMMY_FILE)
- $(OBJECTS_FULL): $(OBJECTS_PATH)/%.o: $(SOURCES_PATH)/%.cc $(DEPEND_PATH)/%.d
--	@echo "Compiling $(patsubst $(SOURCES_PATH)/%,%,$<)..."
- 	@mkdir -p $(@D)
- 	@mkdir -p $(patsubst $(OBJECTS_PATH)%,$(DEPEND_PATH)%,$(@D))
--	@$(COMPILE_ENV) $(CXX) \
-+	$(COMPILE_ENV) $(CXX) \
- 		$(DEPEND_FLAGS) -MMD -MF $(DEPEND_SUBST) \
- 		-o $@ $(CXXFLAGS) $(COMPILE_FLAGS) -c $<
- 	@touch $@ # Force .o file to be newer than .d file.
diff --git a/games-emulation/openmsx/openmsx-0.14.0.ebuild b/games-emulation/openmsx/openmsx-0.14.0.ebuild
new file mode 100644
index 000000000000..8b39565b4be2
--- /dev/null
+++ b/games-emulation/openmsx/openmsx-0.14.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop readme.gentoo-r1
+
+DESCRIPTION="MSX emulator that aims for perfection"
+HOMEPAGE="http://openmsx.org/"
+SRC_URI="https://github.com/openMSX/openMSX/releases/download/RELEASE_0_14_0/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-lang/tcl:0=
+	dev-libs/libxml2
+	media-libs/libpng:0=
+	media-libs/libsdl[sound,video]
+	>=media-libs/glew-1.3.2:0=
+	media-libs/sdl-image[png]
+	media-libs/sdl-ttf
+	virtual/opengl
+"
+DEPEND="${RDEPEND}"
+
+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
+}
+
+src_compile() {
+	emake \
+		CXXFLAGS="${CXXFLAGS}" \
+		INSTALL_SHARE_DIR=/usr/share/${PN} \
+		V=1
+}
+
+src_install() {
+	emake \
+		V=1 \
+		INSTALL_BINARY_DIR="${ED}/usr/bin" \
+		INSTALL_SHARE_DIR="${ED}/usr/share/${PN}" \
+		INSTALL_DOC_DIR="${D}"/usr/share/doc/${PF} \
+		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
+}
diff --git a/games-emulation/openmsx/openmsx-0.9.1.ebuild b/games-emulation/openmsx/openmsx-0.9.1.ebuild
deleted file mode 100644
index db68c3dbc64d..000000000000
--- a/games-emulation/openmsx/openmsx-0.9.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils games
-
-DESCRIPTION="MSX emulator that aims for perfection"
-HOMEPAGE="http://openmsx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-lang/tcl:0=
-	dev-libs/libxml2
-	media-libs/libpng:0
-	media-libs/libsdl[sound,video]
-	media-libs/glew
-	media-libs/sdl-image[png]
-	media-libs/sdl-ttf
-	virtual/opengl"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	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
-	epatch "${FILESDIR}"/${P}-verbose.patch
-}
-
-src_compile() {
-	emake \
-		CXXFLAGS="${CXXFLAGS}" \
-		INSTALL_SHARE_DIR="${GAMES_DATADIR}"/${PN}
-}
-
-src_install() {
-	emake \
-		INSTALL_BINARY_DIR="${D}${GAMES_BINDIR}" \
-		INSTALL_SHARE_DIR="${D}${GAMES_DATADIR}"/${PN} \
-		INSTALL_DOC_DIR="${D}"/usr/share/doc/${PF} \
-		install
-	dodoc README
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	elog "If you want to if you want to emulate real MSX systems and not"
-	elog "only the free C-BIOS machines, put the system ROMs in one of"
-	elog "the following directories: ${GAMES_DATADIR}/${PN}/systemroms"
-	elog "or ~/.openMSX/share/systemroms"
-}
diff --git a/games-emulation/sdlmame/Manifest b/games-emulation/sdlmame/Manifest
deleted file mode 100644
index 6d83249d761d..000000000000
--- a/games-emulation/sdlmame/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX sdlmame-0.174-cxx14.patch 812 BLAKE2B 5c306e1f2d4f4a433bfb5e8efbef1bdfc7615cc3c58e52d2de5c0ee24718d5a0dc333daeb81634aca4e1f9e036cefc7f2a66697b293f7d7c8b0f662f0e64d4a3 SHA512 988eec1f288e2b82ce9aea863c2cf7368fc598ce6c3ccada1c50c0f05f0600d84d4bd0891a5ccd256810c2f0c4206ea0c4b37ad2de1193605de6b682a2afcbe5
-AUX sdlmame-0.174-qt.patch 829 BLAKE2B be945301fb35135f12bcd63eafaa72cc3b4d52f735097d59e62f59de61aba24d673c9214ac80af41c325ba346e249d18625d6a40ff7896bd3fe5048544d1d69e SHA512 68ce8a500acfda83152bdb6a2dd798ca29099c3671864f4a30557b3b878b2d4b71c6bbff18291a8e0a43a5a736ec0f0952385b5867bf7d6129ce154537aabd96
-AUX vector.ini 116 BLAKE2B 7dbc58708e0c371c6d8116891a37048d5477b1b92b61c26441f15fff81f8dd01bf8f49cc1bddd256c56ecba592a8dac5fb1674fab5f0adb488410dc6e1d13025 SHA512 6d84eb7b9c4e9f134b57e64ba9ae30dcaaa620296830f7c9858611fde9064f803bd7d230a989a5cce34d8b815b5a98d323b19d3eef3d4c688b5c32b96b299f5f
-DIST mame-0.174.zip 95944685 BLAKE2B e97027edf7be293e599499bd428c663c1fc13498e2fe10ee356aa56ef8ba85d6ea003ba65a8cbc41d1159246eed354585fc18bf9507b47dc1774b87f5737b48d SHA512 9db4d98fb5f5373529808f3bc41fddefa65ebbf7c26d946ebf886cab25e5abf7c4d539d96dfd6af5e62f4366b2bb0b0b59d40fe7a722698f3707eb8ea4c12a0b
-EBUILD sdlmame-0.174.ebuild 6334 BLAKE2B 4f9d9dca92e57a723bc1744d2977ee4562fd7b2c16aac9a9ebfa1b257c82537d1cd53d3e3fad4485f4294241f8a92cfb3b1038095d698baecc665c7f6d11da0d SHA512 e9b8a1e8e96f89470e456581e0d7a2cd4d51928ea6a333f1883e8cdf380d84d747a8b4f247d31339337f3f0fbf492e3b140517735b34f96c85d2066d0dfe727c
-MISC metadata.xml 1574 BLAKE2B 2d3e905abf49766f07570dcf385cd2001e7de8af5eaedca80a700208108c3eb7d59dd6a497469513e23f3734f8a7b64ad54f191847cc2fc8e3aed4752b5cf65f SHA512 390af6a62a54f4b49a669cc29a247fed9edc4c8ed6ddb973799ca4071e33c37a7f3eb6b64c6fbfb3e69266cd26da3c77762a37e2975724806b4352fa8ba124b5
diff --git a/games-emulation/sdlmame/files/sdlmame-0.174-cxx14.patch b/games-emulation/sdlmame/files/sdlmame-0.174-cxx14.patch
deleted file mode 100644
index bd88cb476e8a..000000000000
--- a/games-emulation/sdlmame/files/sdlmame-0.174-cxx14.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-# work around gcc-4.9.3's implementation of cxx14
-# bug  582576 with patch from Alexander Miller
-# https://bugs.gentoo.org/show_bug.cgi?id=582576
-
---- a/src/lib/util/strformat.h
-+++ b/src/lib/util/strformat.h
-@@ -185,9 +185,8 @@
- #include <type_traits>

- #include <utility>

- 

--#if defined(__GLIBCXX__) && (__GLIBCXX__ < 20150413)

--namespace std

--{

-+namespace std {

-+namespace mame_cxx14_compat {

- template<class _Container>

- 	inline constexpr auto

- 	cbegin(const _Container& __cont) noexcept(noexcept(std::begin(__cont)))-> decltype(std::begin(__cont))

-@@ -198,7 +197,8 @@
- 	cend(const _Container& __cont) noexcept(noexcept(std::end(__cont)))-> decltype(std::end(__cont))

- 	{ return std::end(__cont); }

- }

--#endif

-+using namespace mame_cxx14_compat;

-+}

- 

- namespace util {

- namespace detail {

diff --git a/games-emulation/sdlmame/files/sdlmame-0.174-qt.patch b/games-emulation/sdlmame/files/sdlmame-0.174-qt.patch
deleted file mode 100644
index f9c384d91cf8..000000000000
--- a/games-emulation/sdlmame/files/sdlmame-0.174-qt.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-No point in adding qt-related things to the compile line unless the qt debugger is wanted
-
---- scripts/src/osd/sdl_cfg.lua.orig
-+++ scripts/src/osd/sdl_cfg.lua
-@@ -115,14 +115,16 @@
- 	configuration { }

- 

- elseif _OPTIONS["targetos"]=="linux" then

--	if _OPTIONS["QT_HOME"]~=nil then

--		buildoptions {

--			"-I" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_HEADERS"),

--		}

--	else

--		buildoptions {

--			backtick("pkg-config --cflags Qt5Widgets"),

--		}

-+	if _OPTIONS["USE_QTDEBUG"]=="1" then

-+		if _OPTIONS["QT_HOME"]~=nil then

-+			buildoptions {

-+				"-I" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_HEADERS"),

-+			}

-+		else

-+			buildoptions {

-+				backtick("pkg-config --cflags Qt5Widgets"),

-+			}

-+		end

- 	end

- elseif _OPTIONS["targetos"]=="macosx" then

- 	defines {

diff --git a/games-emulation/sdlmame/files/vector.ini b/games-emulation/sdlmame/files/vector.ini
deleted file mode 100644
index d4906e34ccd7..000000000000
--- a/games-emulation/sdlmame/files/vector.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Specific options file for vector games
-#
-
-#
-# VIDEO OPTIONS
-#
-video               soft
-yuvmode             yv12
diff --git a/games-emulation/sdlmame/metadata.xml b/games-emulation/sdlmame/metadata.xml
deleted file mode 100644
index d94f41033e1b..000000000000
--- a/games-emulation/sdlmame/metadata.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <longdescription>
-SDLMAME is a port of the popular MAME[tm].
-
-There are a few principles that guide its development:
-
-1) run on Linux/Unix, Mac OS X, and other SDL supported operating systems with
-as few changes as possible to the base Win32 code. This means we can track
-changes faster than larger more conventional ports such as MacMAME, and we also
-maintain what I call "Firefox compatibility" where learning a major app only
-needs to be done once per application, and it then applies across many
-operating systems. If you can use the command-line Win32 MAME, you already know
-how to use SDLMAME on any platform you may encounter it on.
-
-2) MAME developers are important. By keeping quickly up to date, we make it
-easy for people on non-Windows platforms to make and submit changes to the core
-MAME code, and we offer native implementations of MAME's multi-window GUI
-debugger on both Linux/Unix and Mac OS X.
-  </longdescription>
-  <use>
-    <flag name="arcade">Enable the Multiple Arcade Machine Emulator for arcade games support</flag>
-    <flag name="tools">Build development tools shared between sdlmame and sdlmess</flag>
-    <flag name="mess">Enable the Multi Emulator Super System for game system support</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">mamedev/mame</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-emulation/sdlmame/sdlmame-0.174.ebuild b/games-emulation/sdlmame/sdlmame-0.174.ebuild
deleted file mode 100644
index d1f61aaf4edb..000000000000
--- a/games-emulation/sdlmame/sdlmame-0.174.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-any-r1 toolchain-funcs qmake-utils games
-
-MY_PV="${PV/.}"
-
-DESCRIPTION="Multiple Arcade Machine Emulator + Multi Emulator Super System (MESS)"
-HOMEPAGE="http://mamedev.org/"
-SRC_URI="https://github.com/mamedev/mame/releases/download/mame${MY_PV}/mame${MY_PV}s.zip -> mame-${PV}.zip"
-
-LICENSE="GPL-2+ BSD-2 MIT CC0-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa +arcade debug +mess opengl openmp tools"
-REQUIRED_USE="|| ( arcade mess )"
-
-# MESS (games-emulation/sdlmess) has been merged into MAME upstream since mame-0.162 (see below)
-#  MAME/MESS build combined (default)	+arcade +mess	(mame)
-#  MAME build only			+arcade -mess	(mamearcade)
-#  MESS build only			-arcade +mess	(mess)
-# games-emulation/sdlmametools is dropped and enabled instead by the 'tools' useflag
-RDEPEND="!games-emulation/sdlmametools
-	!games-emulation/sdlmess
-	dev-db/sqlite:3
-	dev-libs/expat
-	media-libs/fontconfig
-	media-libs/flac
-	media-libs/libsdl2[joystick,opengl?,sound,video,X]
-	media-libs/portaudio
-	media-libs/sdl2-ttf
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/opengl
-	alsa? ( media-libs/alsa-lib
-		media-libs/portmidi )
-	debug? ( dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5 )
-	x11-libs/libX11
-	x11-libs/libXinerama
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-arch/unzip
-	virtual/pkgconfig
-	x11-proto/xineramaproto"
-
-S=${WORKDIR}
-
-# Function to disable a makefile option
-disable_feature() {
-	sed -i -e "/^[ 	]*$1.*=/s:^:# :" makefile || die
-}
-
-# Function to enable a makefile option
-enable_feature() {
-	sed -i -e "/^#.*$1.*=/s:^#[ 	]*::"  makefile || die
-}
-
-pkg_setup() {
-	games_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-	unpack ./mame.zip
-	rm -f mame.zip || die
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-qt.patch \
-		"${FILESDIR}"/${P}-cxx14.patch
-	# Disable using bundled libraries
-	enable_feature USE_SYSTEM_LIB_EXPAT
-	enable_feature USE_SYSTEM_LIB_FLAC
-	enable_feature USE_SYSTEM_LIB_JPEG
-# Use bundled lua for now to ensure correct compilation (ref. b.g.o #407091)
-#	enable_feature USE_SYSTEM_LIB_LUA
-	enable_feature USE_SYSTEM_LIB_PORTAUDIO
-	enable_feature USE_SYSTEM_LIB_SQLITE3
-	enable_feature USE_SYSTEM_LIB_ZLIB
-
-	# Disable warnings being treated as errors and enable verbose build output
-	enable_feature NOWERROR
-	enable_feature VERBOSE
-
-	use amd64 && enable_feature PTR64
-	use debug && enable_feature DEBUG
-	use tools && enable_feature TOOLS
-	disable_feature NO_X11 # bgfx needs X
-	use openmp && enable_feature OPENMP
-
-	if use alsa ; then
-		enable_feature USE_SYSTEM_LIB_PORTMIDI
-	else
-		enable_feature NO_USE_MIDI
-	fi
-
-	sed -i \
-		-e 's/-Os//' \
-		-e '/^\(CC\|CXX\|AR\) /s/=/?=/' \
-		3rdparty/genie/build/gmake.linux/genie.make || die
-}
-
-src_compile() {
-	local targetargs
-	local qtdebug=$(usex debug 1 0)
-
-	use arcade && ! use mess && targetargs="SUBTARGET=arcade"
-	! use arcade && use mess && targetargs="SUBTARGET=mess"
-
-	function my_emake() {
-		# Workaround conflicting $ARCH variable used by both Gentoo's
-		# portage and by Mame's build scripts
-		PYTHON_EXECUTABLE=${PYTHON} \
-		OVERRIDE_CC=$(tc-getCC) \
-		OVERRIDE_CXX=$(tc-getCXX) \
-		OVERRIDE_LD=$(tc-getCXX) \
-		QT_HOME="$(qt5_get_libdir)/qt5" \
-		ARCH= \
-			emake "$@" \
-				AR=$(tc-getAR)
-	}
-	my_emake -j1 generate
-
-	my_emake ${targetargs} \
-		SDL_INI_PATH="\$\$\$\$HOME/.sdlmame;${GAMES_SYSCONFDIR}/${PN}" \
-		USE_QTDEBUG=${qtdebug}
-
-	if use tools ; then
-		my_emake -j1 TARGET=ldplayer USE_QTDEBUG=${qtdebug}
-	fi
-}
-
-src_install() {
-	local MAMEBIN
-	local suffix="$(use amd64 && echo 64)$(use debug && echo d)"
-	local f
-
-	function mess_install() {
-		dosym ${MAMEBIN} "${GAMES_BINDIR}"/mess${suffix}
-		dosym ${MAMEBIN} "${GAMES_BINDIR}"/sdlmess
-		newman docs/man/mess.6 sdlmess.6
-		doman docs/man/mess.6
-	}
-	if use arcade ; then
-		if use mess ; then
-			MAMEBIN="mame${suffix}"
-			mess_install
-		else
-			MAMEBIN="mamearcade${suffix}"
-		fi
-		doman docs/man/mame.6
-		newman docs/man/mame.6 ${PN}.6
-	elif use mess ; then
-		MAMEBIN="mess${suffix}"
-		mess_install
-	fi
-	dogamesbin ${MAMEBIN}
-	dosym ${MAMEBIN} "${GAMES_BINDIR}/${PN}"
-
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r keymaps $(use mess && echo hash)
-
-	# Create default mame.ini and inject Gentoo settings into it
-	#  Note that '~' does not work and '$HOME' must be used
-	./${MAMEBIN} -noreadconfig -showconfig > "${T}/mame.ini" || die
-	# -- Paths --
-	for f in {rom,hash,sample,art,font,crosshair} ; do
-		sed -i \
-			-e "s:\(${f}path\)[ \t]*\(.*\):\1 \t\t\$HOME/.${PN}/\2;${GAMES_DATADIR}/${PN}/\2:" \
-			"${T}/mame.ini" || die
-	done
-	for f in {ctrlr,cheat} ; do
-		sed -i \
-			-e "s:\(${f}path\)[ \t]*\(.*\):\1 \t\t\$HOME/.${PN}/\2;${GAMES_SYSCONFDIR}/${PN}/\2;${GAMES_DATADIR}/${PN}/\2:" \
-			"${T}/mame.ini" || die
-	done
-	# -- Directories
-	for f in {cfg,nvram,memcard,input,state,snapshot,diff,comment} ; do
-		sed -i \
-			-e "s:\(${f}_directory\)[ \t]*\(.*\):\1 \t\t\$HOME/.${PN}/\2:" \
-			"${T}/mame.ini" || die
-	done
-	# -- Keymaps --
-	sed -i \
-		-e "s:\(keymap_file\)[ \t]*\(.*\):\1 \t\t\$HOME/.${PN}/\2:" \
-		"${T}/mame.ini" || die
-	for f in keymaps/km*.map ; do
-		sed -i \
-			-e "/^keymap_file/a \#keymap_file \t\t${GAMES_DATADIR}/${PN}/keymaps/${f##*/}" \
-			"${T}/mame.ini" || die
-	done
-	insinto "${GAMES_SYSCONFDIR}/${PN}"
-	doins "${T}/mame.ini"
-
-	insinto "${GAMES_SYSCONFDIR}/${PN}"
-	doins "${FILESDIR}/vector.ini"
-
-	dodoc docs/{config,mame,newvideo}.txt
-	keepdir \
-		"${GAMES_DATADIR}/${PN}"/{ctrlr,cheat,roms,samples,artwork,crosshair} \
-		"${GAMES_SYSCONFDIR}/${PN}"/{ctrlr,cheat}
-
-	if use tools ; then
-		for f in castool chdman floptool imgtool jedutil ldresample ldverify romcmp ; do
-			newgamesbin ${f} ${PN}-${f}
-			newman docs/man/${f}.1 ${PN}-${f}.1
-		done
-		newgamesbin ldplayer${suffix} ${PN}-ldplayer
-		newman docs/man/ldplayer.1 ${PN}-ldplayer.1
-	fi
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	elog "It is strongly recommended to change either the system-wide"
-	elog "  ${GAMES_SYSCONFDIR}/${PN}/mame.ini or use a per-user setup at ~/.${PN}/mame.ini"
-	elog
-	if use opengl ; then
-		elog "You built ${PN} with opengl support and should set"
-		elog "\"video\" to \"opengl\" in mame.ini to take advantage of that"
-		elog
-		elog "For more info see http://wiki.mamedev.org"
-	fi
-}
diff --git a/games-emulation/stella/Manifest b/games-emulation/stella/Manifest
index a3f6a5704475..e504b14973d3 100644
--- a/games-emulation/stella/Manifest
+++ b/games-emulation/stella/Manifest
@@ -1,3 +1,3 @@
 DIST stella-4.7.2-src.tar.xz 1715332 BLAKE2B 7b397a4e662f8db247a67ddedb314c9b11ee4e99d55768b1cd8e2587b452fab9c5d45c840bf1577833712a2c96d42985d39437d1fac16e93c35762e015ddf445 SHA512 dcfaba9b554ab08c9ba79c8e95551bc688fae4ab0ab368df11c05f3dc7c9431d32068d5dd658ec4d1aa8cb826c7205fc4f301145a149d32369833409992455e2
-EBUILD stella-4.7.2.ebuild 1368 BLAKE2B 3d24724cb9cd50ae50e7d758d0ead4f7635fa78eb13a71c2e19205244a6f9d420900855d24e74eba55ff24878313995b039e2ee531f52c5d9023152c469de760 SHA512 897cfd1b772db34fccc1d4da35f68966fe42a804c6c6ceb4907f3527d0c5181d700f5dfa6b27341a2819035dfa433590bfb674cf6d1af26a467f7b5d561f3beb
+EBUILD stella-4.7.2-r1.ebuild 1327 BLAKE2B 5932b462fe8a66386fe6dcd5d1d91b46c584b943b3081e47bc0e33d34e409773cbb63034fbc55609c19649d760050833062fc7813f109677423e3b7775817baa SHA512 cc81a37cc9362b1c2e07fd4f7e6216523a45659c6395da0627089e6a5a17a47eb71432a718e32aa2911fa3f4279c2b15b948f49d742ce3776942e02930cc27cd
 MISC metadata.xml 329 BLAKE2B 3ee498d6ed1bda6ccdd1e6e6a7eae732766c005ae6bf4c02b09f8f5de417d9f4c20ae925a2d7d148204f0c43a4c4ef1310cd6d925dee4beb2ede0c74ae34b636 SHA512 80e6880e6edea2eab64504d6cdf4496f94f9bfb6a4ea63da347b9fb05ca3fa999d646406e22563799d8ba40c1d3d095094ea8d86a500bb490ce2034c3ff38182
diff --git a/games-emulation/stella/stella-4.7.2.ebuild b/games-emulation/stella/stella-4.7.2-r1.ebuild
index fdad7813c4b1..1412860717cd 100644
--- a/games-emulation/stella/stella-4.7.2.ebuild
+++ b/games-emulation/stella/stella-4.7.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils gnome2-utils games
+EAPI=6
+inherit desktop gnome2-utils
 
 DESCRIPTION="Stella Atari 2600 VCS Emulator"
 HOMEPAGE="http://stella.sourceforge.net/"
@@ -13,12 +13,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="joystick"
 
-DEPEND="media-libs/libsdl2[joystick?,opengl,video]
-	media-libs/libpng:0
-	sys-libs/zlib"
-RDEPEND=${DEPEND}
+RDEPEND="
+	media-libs/libsdl2[joystick?,opengl,video]
+	media-libs/libpng:0=
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
+	default
 	sed -i \
 		-e '/INSTALL/s/-s //' \
 		-e '/STRIP/d' \
@@ -33,9 +36,9 @@ src_configure() {
 	# not an autoconf script
 	./configure \
 		--prefix="/usr" \
-		--bindir="${GAMES_BINDIR}" \
+		--bindir="/usr/bin" \
 		--docdir="/usr/share/doc/${PF}" \
-		--datadir="${GAMES_DATADIR}" \
+		--datadir="/usr/share" \
 		$(use_enable joystick) \
 		|| die
 }
@@ -50,17 +53,14 @@ src_install() {
 		newicon -s ${i} src/common/stella-${i}x${i}.png stella.png
 	done
 	domenu src/unix/stella.desktop
-	dohtml -r docs/*
-	prepgamesdirs
+	HTML_DOCS="docs/*" einstalldocs
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	gnome2_icon_cache_update
 }
 
diff --git a/games-emulation/vgba/Manifest b/games-emulation/vgba/Manifest
index 84d164be9f89..b0343e38d6c9 100644
--- a/games-emulation/vgba/Manifest
+++ b/games-emulation/vgba/Manifest
@@ -1,3 +1,3 @@
 DIST VGBA48-Linux-Ubuntu-bin.tgz 219565 BLAKE2B 3c00fae6b807e5a63ee719581e1e8a14ad123fa819e1f05008169435b4e2f06187f544e42d6a8b94ef1eec7f914ad3c3dd1282cf8186c67e69c2ac53c2d6ac53 SHA512 02362bad94ef93c8aa34bd18d8e6588aadd7d4218ce1c6307468877ac1ddadec073bca001c3d392db2554d937bee51541a76a8b2b15ea35a3c6db5822d6191bc
-EBUILD vgba-4.8.ebuild 562 BLAKE2B b76feb50fbf2be2cb071fa952a828d38c5e02980ef9b45f444b9828474a47a925ee4f5172dfff3a84439d66e5e31987fd1aaea31076d3e19e2d4f456dccf47ac SHA512 ae8e4b810cd9a63ff68a521eb6c838d93e3fef7d15e79de2f37cf0e84ad1d088e9fb1d47ce384b6b9b5fd1febefc096bd2fd7fc6958788a030589c66808f63a2
+EBUILD vgba-4.8-r1.ebuild 529 BLAKE2B 0f2787b236d2f207233a2ec7ac786c7530a007af7639d0cbc9870e0404b66fe755b362de183ee43e9b085af731ab2c007af160b3624272fd3ae6d018a2ff26b5 SHA512 b62c015b2a51d6380a284031ab69d4a2f71fd0d7c25d3d61558ce3db648d8a956af0a99400bf153b71aa7e66215f843781c98757def6ca82ac66a345550a2df1
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-emulation/vgba/vgba-4.8.ebuild b/games-emulation/vgba/vgba-4.8-r1.ebuild
index 8b599b4ca912..b3a974dbfd82 100644
--- a/games-emulation/vgba/vgba-4.8.ebuild
+++ b/games-emulation/vgba/vgba-4.8-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit games
+EAPI=6
 
 DESCRIPTION="Gameboy Advance (GBA) emulator for Linux"
 HOMEPAGE="http://www.komkon.org/fms/VGBA/"
@@ -10,20 +9,21 @@ SRC_URI="http://fms.komkon.org/VGBA/VGBA${PV/.}-Linux-Ubuntu-bin.tgz"
 
 LICENSE="VGBA"
 SLOT="0"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* ~amd64 ~x86"
 RESTRICT="strip"
 IUSE=""
 
-RDEPEND="x11-libs/libXext
-	sys-libs/zlib"
+RDEPEND="
+	x11-libs/libXext
+	sys-libs/zlib
+"
 
-QA_PREBUILT="${GAMES_PREFIX_OPT:1}/bin/vgba"
+QA_PREBUILT="/opt/bin/vgba"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 src_install() {
-	into "${GAMES_PREFIX_OPT}"
+	into /opt
 	dobin vgba
-	dohtml VGBA.html
-	prepgamesdirs
+	HTML_DOCS="VGBA.html" einstalldocs
 }
diff --git a/games-emulation/zinc/Manifest b/games-emulation/zinc/Manifest
index c67a5c6a0e95..abb9d51aa400 100644
--- a/games-emulation/zinc/Manifest
+++ b/games-emulation/zinc/Manifest
@@ -1,3 +1,3 @@
 DIST zinc11-lnx.tar.bz2 305824 BLAKE2B d0328f1cdb1000eed54259bdd7801244b61d8936af8b95d8658c66241bdaacd7292095b4b86465f7617807870f2485b4ed11a8c203be917afcce6279d9d5e19a SHA512 8511ebb867347adfc00448a74548b4a22a2d854a14c663a626d33738e89d2cabd3248837a26d5ed099ef4dc40a0f451df639663774926e797ddc846a7270af4b
-EBUILD zinc-1.1.ebuild 784 BLAKE2B 4d66df0549dd96c3cb0953a79fe6515890aa137ee006d2cadddf719504ef3109d515f7b7a81452e8ae580c395bc88ad185185573e2730d1440dd3e0b39178e62 SHA512 be4b89586cf84d47e405cb16826065eb8b568f9e0cd2cfdc8bcbf9e4a223cccd3ce31b26f532f874a559ccbe8fa376ea95e8c1376030bb94eb7458b788a3f50c
+EBUILD zinc-1.1-r1.ebuild 720 BLAKE2B c2086d73effa22b485389aaabd826078b364a3bb6f161113c4ec1f0de4b149c34799da0f5b18a37e79aebf88fc7cc9950ea20ffc5dc321e171c8cd8f9949cc51 SHA512 19e5d82276e64769f857a85097435177bd50af5ef8da6bd90355f689ac58b2acd059922e8977d644c18b50d4065f04d93a844c3e593c249065c8f3819bf030c7
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-emulation/zinc/zinc-1.1.ebuild b/games-emulation/zinc/zinc-1.1-r1.ebuild
index 420a09388ff7..69f75f4b58ff 100644
--- a/games-emulation/zinc/zinc-1.1.ebuild
+++ b/games-emulation/zinc/zinc-1.1-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit games
+EAPI=6
 
 DESCRIPTION="An x86 binary-only emulator for Sony ZN-1, ZN-2, and Namco System 11 arcades"
 HOMEPAGE="http://caesar.logiqx.com/php/emulator.php?id=zinc_linux"
@@ -13,18 +12,18 @@ SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="strip"
-QA_PREBUILT="${GAMES_PREFIX_OPT:1}/bin/zinc /usr/lib*/*.so"
+QA_PREBUILT="/opt/bin/zinc /usr/lib*/*.so"
 
 RDEPEND="
 	x11-libs/libXext[abi_x86_32(-)]
-	virtual/opengl[abi_x86_32(-)]"
+	virtual/opengl[abi_x86_32(-)]
+"
 
-S=${WORKDIR}/zinc
+S="${WORKDIR}/zinc"
 
 src_install() {
-	exeinto "${GAMES_PREFIX_OPT}"/bin
+	exeinto /opt/bin
 	doexe zinc
 	dolib.so libcontrolznc.so librendererznc.so libsoundznc.so libs11player.so
-	dodoc readme.txt
-	prepgamesdirs
+	einstalldocs
 }
diff --git a/games-emulation/zsnes/Manifest b/games-emulation/zsnes/Manifest
index e88d7f3c3986..77fa9154ffbf 100644
--- a/games-emulation/zsnes/Manifest
+++ b/games-emulation/zsnes/Manifest
@@ -1,15 +1,15 @@
 AUX zsnes-1.51-CC-quotes.patch 740 BLAKE2B f41e66a5d2f9b54c8ed4f17fafc7afdd73e35202c083d1db375b26b89f03b991d36d279d10c7c17076f31b87d1fbad276e5c5c4ce333d2cb0f0fc7641b562845 SHA512 2347910158934a7c8b90a6739f923d7a1f94e963515dca42d45eb97e6165c5f80c30d28fd151537a7a80bba16d2462568ff1c1dac93a855990f0418aaf059776
-AUX zsnes-1.51-arch.patch 2480 BLAKE2B a47ff14031ad5265a2f9b8eb6c5a8ec548e0b609d9b8c2c408094f6af8092709c76567a340ad71233818cca7b7f4223140964f53b4612db997e6bbbb1651e8b5 SHA512 669e6a68978dc0ad27268dece47ff0a2027586534ce88ef08eeb51464137026afcb51ef4c1222013a75bcd430dfa022919aad0dce932035479ebb72408971eb8
-AUX zsnes-1.51-archopt-july-23-update.patch 12668 BLAKE2B 0948a0c970a58e054aedb2fa82a0ce884c8047cb1bbb1832e19a1059a74cad2daf7a8260c2fa2eee1082ed04e0396bc1833bf4ca17c3d76eb720752740892318 SHA512 a02ba164e2f06915b7de92032b7757f90b545e2afd4275805ea3466ddb6f1f9f0973fbc838c690441a10bbc70fb9be12fc95e5fde19c0505f4264cae2721c944
-AUX zsnes-1.51-buffer.patch 3157 BLAKE2B 7fe07cf2c48cf16ba3cccd7b4cdcb2e2fb8b92688413ef1a47af1c9d7577cefa21d7e2aad0c9625b66a766560e12ead7f49314624cc740808f0f24d8add06471 SHA512 b9a18c288f59413a7bd7f25622774440124de8ab356bfa48ea29b0db39ec6380d7df715eaca031bcff0fcb4f94dfc6f3b1f0770bf29cc9324e096ee5a6876f47
-AUX zsnes-1.51-cross-compile.patch 942 BLAKE2B 42bae81cad71ebba6932663958dc69cfe129277bba971ba6179e9ea1bdf274c16188039ceebffefdbe5d608fe907bbd96773e3b3bdc2fa5432954d35aee2e74e SHA512 3059c466f32b74f3a6d583fb425c3f23f7a295800474baa49c4baee69fc047ff5f49107225f3a9917aed76697b50ff07e474a2fe666402d1bcd032e00959e7be
+AUX zsnes-1.51-arch.patch 2484 BLAKE2B 036f749d832efc976a7225e47d6b7ac5e1b69af235a4196e9706fe46d447793a1e3f88e49fe34229cd71353b987b7ef123bbebf7c822ca32025c60b0c9813b57 SHA512 cc75584780e442d7fbcd4e26a9395d8e85570883f93f63b1fcb604d601acde88295861e15a6cee1d50bca836fc52efd4f5df9c84fb73fbe04fa76ec34ae3b4a1
+AUX zsnes-1.51-archopt-july-23-update.patch 12672 BLAKE2B d12246a4913d2355a7c2c26686714e61ff3791c29f93f473619225b9bd180d329c48d07123141d657faf3fe75de4e49d31b80b4577f9a646a531774abba24b4a SHA512 ac30370957721ccc4bc8681dc00110bd68dee6d65a2c3daa39df2fe45a4fa7106f9c3097b2bd9cc3dbc83e3c6344811e8719f48ba6e4896768c17357730c5719
+AUX zsnes-1.51-buffer.patch 3091 BLAKE2B a87e0b6547aeaa9f585d76a8ee080895573015fe42b0df2161268754ff01c046fd234997000ef484f66710dfd30e145d9d4db2f373a568e99deec2a8637db285 SHA512 0faf34338ff3fd85985dc16d2a58aa9e2ac1887db8d26bc210fc6965f6cc743c6c56b8b58bea72341d8ee1fed59c438db801000be5ae6bf4e26789e9bed89d25
+AUX zsnes-1.51-cross-compile.patch 934 BLAKE2B be18829454407c99aba00cb8126573f5f3e3ed8e18b2bb50811b855ba81137a16b90601c28cab9fce8d865e522cb66bb797d46a22090dd994c71aef672be99f2 SHA512 ece4a9f51314c7318babaf689fb44c1502ec5bc32808613211865daf1368cc1069b70ad4c1c4ec7b127cf707a0b093c356a8b50e5357099894656c78cf28738f
 AUX zsnes-1.51-depbuild.patch 559 BLAKE2B 38309177599aee8dafcbded6a027d66b991e85aac4c77fda0485b7777467c056386797041223a556b3cfff4b926e5a0b4004baae4264a765354a6dc2cb39ac75 SHA512 46955153ec6d2ecd5a295117c3ecc911a566de69f29f4d29decc98867d03e4a53a980a3c75d8ff19bbd1655eb291069fbbd598e002a73ebdbdc94c135f852c6e
 AUX zsnes-1.51-gcc43.patch 913 BLAKE2B 7ac3d5b8f556d577c1a1065bbe4e275742fdde0486411cc82f2dc552e8d90b82eb7dceefcdd87252633154b8249213f9dfe6724f4f0ee4eef3f8f691081355c7 SHA512 8684b9b8c01d2d9f27bf27a86e4705b3408a2891347045266040397b649eb162962e8384746930c9837ac9b21bfd626d6e241d8a6c73b46a0e348274dd8688d3
-AUX zsnes-1.51-gcc47.patch 316 BLAKE2B b13455647b3e527d36b30532c9b406e62869c4dc46ef2c36cd9a04969516b1c2110b3b30d690e78b6ee64dd4f5d3b7cb4e3dae8b74bef2eb9be5d78a749364a9 SHA512 3e9adecac963fd2769edcb979dde262ed54247f8d7f63b34d2f5f472e5d6eeb7bc3879de24210d312c5d1d4694abc32aeb9e853d3ab2ec7b7bad6794716e4da4
-AUX zsnes-1.51-libao-thread.patch 663 BLAKE2B dcd2a960d7dba58aa3dbe032010a7d97bd07f523d3a05a711b1d52cc6b497636d16f76f2ea443216ccdbaa140f5f691337c4d98b493ba53866c4bc79a1541078 SHA512 3b7dab3e8f7e55b5295ad728279aa116b0e1f63a9bfad398b55a2d7f5ba55c806311952311f3f3ac91803d903e91b724f6ceea53a15b5fe485a7b3c2e5dafbab
-AUX zsnes-1.51-libpng.patch 854 BLAKE2B 31a5e086fb108cd2a2c6004989974d053121b7fb4584fdf77e96e371d8ddc6a1dc949a47fca52d5a321b125915bc7e576eda8227f68b6c95adadae012c3a77e2 SHA512 210dcba006bdf6c18bb55e106e8bb2fcb9691deb89874fd4f9e034f2aaf9e8e96543b2177d31b94c121a811b80de6352b7b420fa8d0760055dc1d4df43bbaa68
+AUX zsnes-1.51-gcc47.patch 312 BLAKE2B 927c6179fbbcd3fb161b5b18e025090acce178eae0586b7c20e48cdba091572d30c224aa80bb8a49c16d29fb9045c0207b26692651a15a53c2b4b90780c3f0c2 SHA512 aa9f111359e96118729e684562618d72231c5c475e736c53862cfe9d21b8c4db29056ec0476dcc7e50dd501a77619671fb8834be093086c7e752100c917060fc
+AUX zsnes-1.51-libao-thread.patch 667 BLAKE2B 76bc0abf16f68c9752a727817cff209daa2c0c29f31e6045441e202083f47559cb50c1a6a998c12621a298fa3901bc1d52701b176b8fd594ca116f990d3c5208 SHA512 43c28d4539df5c8ea4d3d0415c65afec3eb9215971a5ff0532b3b147b2fa3f870aadf07eb1e643e986c39d56760c0292447d467418865826ddc8c7aea64cc005
+AUX zsnes-1.51-libpng.patch 858 BLAKE2B f0ad46176cf5729d0a5be9e4307a28628e38c3d18043f0ff897dfd1cf901f0f9fb7ff80d25095fdaa9b6b1be52fe3c95f4e28b65042b4c4aad33a27125c7eb02 SHA512 2c25fb3294357a38ed8e119d4b4d60f7bd6f28724b2274a620465962e96e008f2a29273f46d4813e91b9128879218f401bb91b1a6df4c156b9ff7856b26657b0
 AUX zsnes-1.51-libpng15.patch 510 BLAKE2B 6281a27c6029ee94947b282fe5c06a67e7670d3168d5f4ae90573d12e8e6d5c467a9691cdd161158f117e341466bc7a3e99d516b95624534773027279aba4f7a SHA512 4191987cad2f8dd7d7fd1d4f8f0c60de07059f18a60cb9bb94f1e5c35c06122032de9887762ebcf2d255f24c3e90aa5b4f6a7540a8e4dbdc4ce5f7d3b3e3b532
-AUX zsnes-1.51-stack-align.patch 305 BLAKE2B 41d4a152d6824138caf2a0d62ed5dbdabacda546ad5a6043abfa7c93bd07945e9e02fb14e5278426f7c0f65aa430c6f4234505c1ec17a2b35fd82880f73929bd SHA512 632016ee78c62b02266f81ddde77c06ffaaffbbaa95d56a28b7830aec1befa2dd6a836a589ff6785a9971608a212868bf73a6a41bef2b348ab138cd03834f37b
+AUX zsnes-1.51-stack-align.patch 283 BLAKE2B 2ae8aaf28975f0f88ed77eafb3977706bd662215a7e286c32ce6a138993bda00c05012bc92bd106b6607d524990ccccf094e647c44a350babf3755c2dc6bf3a6 SHA512 543876c459d7448bb7707677de432dd0140320ab77752f1d9fbee4f58ea34158f1e223f46d5aa9e2858b902513a915517f27e86e51f2263f667a6baea608fb55
 DIST zsnes151src.tar.bz2 1071712 BLAKE2B e942c699bd227942563deb23b105339aa9ffd8a5623200ca142a777508b4ebaf47859170016490f53a3af2bfb15293c17a99a7658e1f3f0afd7df8cd63200b9a SHA512 2cec9ad7762fc7a257c6b1d3e190b0ed53565dbafe42e1dee9eb182644392b7dd2c57faa846f63cd30ac079e5c05354d26ce0612d20481a1f54d760d62d95353
-EBUILD zsnes-1.51-r5.ebuild 3200 BLAKE2B 8399ddf8f386501b5f9322cb7aa47abbdaca29f46b6a25060f28e142eca7b2eaa7b3eb6643eeaba68a80bd1c358c8fbe8882592f340e6efd07803e9267e356cf SHA512 0493c4cbb3095d9231b668310e9bc64f09f8ce86f54ca3b05a0d5825f6405766bc2d7c1f91399d2406c46df864b44a073517c2da3751ecaa8414052957387285
+EBUILD zsnes-1.51-r6.ebuild 3198 BLAKE2B cf8d5505e5eef6c3d864cddc82dfd9af86ce32780c651536547994218e55658450ce8fb507126850ff16541fa342a6a99d13bf25d550d46072f07c338f8c14e0 SHA512 4a9a696fdfbc4f31c95fe5e81fd6a27b569771d8fe36b24a088594f0a36fbf13a6c30dc562e57a7e4842569b9b4a15a459f17bd24101f685160650232ccaddb6
 MISC metadata.xml 484 BLAKE2B ad2da7cec97ca32be7ae42000312cdebd1c5dc5fce4ccc6f99fd16e69208350a5e714201e0bc258e8d4eb980357fe2517cc9b177e3ad74507b44d31ecdc8fe27 SHA512 02318871d54bfa7d9c4ba2a64f3ed7c83bf45b04a5c66dda5659d935b943a2415e6eaad124ac34e3c4235ba57f21c1189b03fec4f622c19eec1873531727a622
diff --git a/games-emulation/zsnes/files/zsnes-1.51-arch.patch b/games-emulation/zsnes/files/zsnes-1.51-arch.patch
index 2c8b690587be..b39549871b7f 100644
--- a/games-emulation/zsnes/files/zsnes-1.51-arch.patch
+++ b/games-emulation/zsnes/files/zsnes-1.51-arch.patch
@@ -1,5 +1,5 @@
---- configure.in.orig
-+++ configure.in
+--- a/configure.in.orig
++++ b/configure.in
 @@ -233,72 +233,8 @@
    debug=no)
  AC_MSG_CHECKING(if you want gdb friendly executable)
diff --git a/games-emulation/zsnes/files/zsnes-1.51-archopt-july-23-update.patch b/games-emulation/zsnes/files/zsnes-1.51-archopt-july-23-update.patch
index ba118878a2bd..b3e466036f22 100644
--- a/games-emulation/zsnes/files/zsnes-1.51-archopt-july-23-update.patch
+++ b/games-emulation/zsnes/files/zsnes-1.51-archopt-july-23-update.patch
@@ -1,5 +1,5 @@
---- tools/archopt.c.old
-+++ tools/archopt.c
+--- a/tools/archopt.c.old
++++ b/tools/archopt.c
 @@ -1,8 +1,30 @@
 +/*
 +Copyright (C) 2005-2007 Nach, grinvader ( http://www.zsnes.com )
diff --git a/games-emulation/zsnes/files/zsnes-1.51-buffer.patch b/games-emulation/zsnes/files/zsnes-1.51-buffer.patch
index 5f3049b315ed..eb463682196d 100644
--- a/games-emulation/zsnes/files/zsnes-1.51-buffer.patch
+++ b/games-emulation/zsnes/files/zsnes-1.51-buffer.patch
@@ -1,5 +1,5 @@
---- zsnes_1_51/src/initc.c.fortify
-+++ zsnes_1_51/src/initc.c
+--- src/initc.c.fortify
++++ src/initc.c
 @@ -1464,8 +1464,8 @@
    clearmem2();
  }
@@ -38,8 +38,8 @@
  
      if (yesoutofmemory) { asm_call(outofmemfix); }
      asm_call(GUIDoReset);
---- zsnes_1_51/src/zstate.c.fortify
-+++ zsnes_1_51/src/zstate.c
+--- src/zstate.c.fortify
++++ src/zstate.c
 @@ -99,15 +99,15 @@
    copy_func(buffer, &cycpbl, 4);
    copy_func(buffer, &cycpblt, 4);
@@ -68,8 +68,8 @@
      }
      */
    }
---- zsnes_1_51/src/gblvars.h.fortify
-+++ zsnes_1_51/src/gblvars.h
+--- src/gblvars.h.fortify
++++ src/gblvars.h
 @@ -33,9 +33,9 @@
  extern unsigned int SfxR0, *setaramdata, ramsize, *sram, nmiprevaddrh;
  extern unsigned int tempesi, tempedi, tempedx, tempebp;
diff --git a/games-emulation/zsnes/files/zsnes-1.51-cross-compile.patch b/games-emulation/zsnes/files/zsnes-1.51-cross-compile.patch
index 5823c6aa6ade..5c412e3e649b 100644
--- a/games-emulation/zsnes/files/zsnes-1.51-cross-compile.patch
+++ b/games-emulation/zsnes/files/zsnes-1.51-cross-compile.patch
@@ -1,5 +1,5 @@
---- a/src/acinclude.m4
-+++ b/src/acinclude.m4
+--- src/acinclude.m4
++++ src/acinclude.m4
 @@ -107,7 +107,7 @@ int main (int argc, char *argv[])
    with_zlib=yes,
    with_zlib=no,
@@ -18,8 +18,8 @@
    ZLIB_CFLAGS=""
    ZLIB_LIBS=""
    ZLIB_VERSION=""
---- a/src/Makefile.in
-+++ b/src/Makefile.in
+--- src/Makefile.in
++++ src/Makefile.in
 @@ -103,8 +103,10 @@ main: makefile.dep $(Z_OBJS)
  	@ZC@ -o @ZSNESEXE@ $(Z_OBJS) @ZCFLAGS@ @LDFLAGS@
  	rm -f version.o
diff --git a/games-emulation/zsnes/files/zsnes-1.51-gcc47.patch b/games-emulation/zsnes/files/zsnes-1.51-gcc47.patch
index e58102415212..b3250fee679b 100644
--- a/games-emulation/zsnes/files/zsnes-1.51-gcc47.patch
+++ b/games-emulation/zsnes/files/zsnes-1.51-gcc47.patch
@@ -3,8 +3,8 @@ Bug #419635
 https://bugs.gentoo.org/show_bug.cgi?id=419635
 Submitted by Nikos Chantziaras
 
---- a/src/tools/depbuild.cpp
-+++ b/src/tools/depbuild.cpp
+--- src/tools/depbuild.cpp
++++ src/tools/depbuild.cpp
 @@ -25,6 +25,7 @@
  #include <string>
  #include <cstdio>
diff --git a/games-emulation/zsnes/files/zsnes-1.51-libao-thread.patch b/games-emulation/zsnes/files/zsnes-1.51-libao-thread.patch
index 880e08c698fe..1ae0a1467b3e 100644
--- a/games-emulation/zsnes/files/zsnes-1.51-libao-thread.patch
+++ b/games-emulation/zsnes/files/zsnes-1.51-libao-thread.patch
@@ -1,5 +1,5 @@
---- linux/audio.c.old   2007-01-09 20:19:12.000000000 -0500 
-+++ linux/audio.c   2007-12-30 20:33:07.000000000 -0500 
+--- a/linux/audio.c.old   2007-01-09 20:19:12.000000000 -0500 
++++ b/linux/audio.c   2007-12-30 20:33:07.000000000 -0500 
 @@ -177,11 +177,7 @@ 
    }
    else
diff --git a/games-emulation/zsnes/files/zsnes-1.51-libpng.patch b/games-emulation/zsnes/files/zsnes-1.51-libpng.patch
index 4e49054c0972..fd974e799e30 100644
--- a/games-emulation/zsnes/files/zsnes-1.51-libpng.patch
+++ b/games-emulation/zsnes/files/zsnes-1.51-libpng.patch
@@ -1,5 +1,5 @@
---- acinclude.m4
-+++ acinclude.m4
+--- a/acinclude.m4
++++ b/acinclude.m4
 @@ -163,21 +163,21 @@
    libpng_prefix="")
  
diff --git a/games-emulation/zsnes/files/zsnes-1.51-stack-align.patch b/games-emulation/zsnes/files/zsnes-1.51-stack-align.patch
index 32136643caec..5dcbf3ad9ebc 100644
--- a/games-emulation/zsnes/files/zsnes-1.51-stack-align.patch
+++ b/games-emulation/zsnes/files/zsnes-1.51-stack-align.patch
@@ -1,5 +1,5 @@
---- zsnes_1_51/src/linux/sdllink.c.old
-+++ zsnes_1_51/src/linux/sdllink.c
+--- src/linux/sdllink.c.old
++++ src/linux/sdllink.c
 @@ -773,11 +773,11 @@ BOOL InitInput()
  {
    InitJoystickInput();
diff --git a/games-emulation/zsnes/zsnes-1.51-r5.ebuild b/games-emulation/zsnes/zsnes-1.51-r6.ebuild
index 5787c4659bc4..bf1934226ab9 100644
--- a/games-emulation/zsnes/zsnes-1.51-r5.ebuild
+++ b/games-emulation/zsnes/zsnes-1.51-r6.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils autotools flag-o-matic toolchain-funcs multilib pax-utils games
+EAPI=6
+inherit autotools desktop flag-o-matic toolchain-funcs pax-utils
 
 DESCRIPTION="SNES (Super Nintendo) emulator that uses x86 assembly"
 HOMEPAGE="http://www.zsnes.com/ http://ipherswipsite.com/zsnes/"
@@ -17,16 +17,20 @@ RDEPEND="
 	media-libs/libsdl[sound,video,abi_x86_32(-)]
 	>=sys-libs/zlib-1.2.3-r1[abi_x86_32(-)]
 	ao? ( media-libs/libao[abi_x86_32(-)] )
-	debug? ( sys-libs/ncurses:0[abi_x86_32(-)] )
+	debug? ( sys-libs/ncurses:0=[abi_x86_32(-)] )
 	opengl? ( virtual/opengl[abi_x86_32(-)] )
-	png? ( media-libs/libpng:0[abi_x86_32(-)] )"
+	png? ( media-libs/libpng:0=[abi_x86_32(-)] )
+"
 DEPEND="${RDEPEND}
 	dev-lang/nasm
-	debug? ( virtual/pkgconfig )"
+	debug? ( virtual/pkgconfig )
+"
 
-S=${WORKDIR}/${PN}_${PV//./_}/src
+S="${WORKDIR}/${PN}_${PV//./_}/src"
 
 src_prepare() {
+	default
+
 	# Fixing compilation without libpng installed
 	# Fix bug #186111
 	# Fix bug #214697
@@ -36,7 +40,7 @@ src_prepare() {
 	# Fix buffer overwrite #257963
 	# Fix gcc47 compile #419635
 	# Fix stack alignment issue #503138
-	epatch \
+	eapply \
 		"${FILESDIR}"/${P}-libpng.patch \
 		"${FILESDIR}"/${P}-archopt-july-23-update.patch \
 		"${FILESDIR}"/${P}-gcc43.patch \
@@ -79,9 +83,9 @@ src_configure() {
 	use amd64 && multilib_toolchain_setup x86
 	use custom-cflags || strip-flags
 
-	append-flags -U_FORTIFY_SOURCE	#257963
+	append-cppflags -U_FORTIFY_SOURCE	#257963
 
-	egamesconf \
+	econf \
 		$(use_enable ao libao) \
 		$(use_enable debug debugger) \
 		$(use_enable png libpng) \
@@ -96,16 +100,18 @@ src_compile() {
 }
 
 src_install() {
-	dogamesbin zsnes
+	dobin zsnes
 	if use pax_kernel; then
 		pax-mark m "${D}""${GAMES_BINDIR}"/zsnes || die
 	fi
+
 	newman linux/zsnes.1 zsnes.6
+
 	dodoc \
 		../docs/{readme.1st,authors.txt,srcinfo.txt,stdards.txt,support.txt,thanks.txt,todo.txt,README.LINUX} \
 		../docs/readme.txt/*
-	dohtml -r ../docs/readme.htm/*
+	HTML_DOCS="../docs/readme.htm/*" einstalldocs
+
 	make_desktop_entry zsnes ZSNES
 	newicon icons/48x48x32.png ${PN}.png
-	prepgamesdirs
 }