gentoo resync : 04.08.2018

37 files changed, 220 insertions, 715 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index ec608e46c17a..8cbf84d9e57a 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/advancemenu/Manifest b/games-emulation/advancemenu/Manifest
deleted file mode 100644
index 09387f7aa4b8..000000000000
--- a/games-emulation/advancemenu/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX advancemenu-2.7-alsa-pkg-config.patch 458 BLAKE2B 74b2d6bc6d5aca8cb2ea70b51ecbe3acfdb735f8dea5bc28696079c28a83877296dcbfc57457822a87ac25d25538af0d4d9726d3e026335f6f3cb1e489771b6c SHA512 d1a97d71ea9e5e412db22925a613f59848486586f5635a60fb0acce376b8c6217ef09a6228dfc39b604294b99e3136a849cb9124b55606e32d9e10c48cb9111e
-AUX advancemenu-2.7-pic.patch 272 BLAKE2B 9e486e8d1eb5e1073252e4484ff02dcbe1b2cceab1b4defb678ef6190e3e5604e3d06142dc9da55b16bb82a069f979943fb460d2b352b66fd55cb96ef9b6bfc8 SHA512 600ac7607374ab2e7654303b8205ac737c7b7aae41c23ea1bd005943361df5579207a91658ec4f3ab9f5f802d87d65336efed71894e2e87c0ce19200c769df9b
-AUX advancemenu-2.9-destdir.patch 3419 BLAKE2B 816edf68becb74022e879ea8812d2ba56d2071cdd6167b556c0805566e49c0025051272c951180f609e13f76afc596e3c7af93c00afa240626399c910e714051 SHA512 8fcf78ae0c1eebe672f0f823a98cdd8afef4efa1fccaa10f50131c577629a1f013c397267c6f990537efc5f6491726454e886c5db1c88245cad0a30b6c8c809f
-DIST advancemenu-2.7.tar.gz 2371297 BLAKE2B 43b468f963ecc2ef99766cf9177d7da2edb4c7497f62d9344e80f6c54f2c082ddef294697b7f6438b2959eefc27ca2c05e5744019c55c9f88f59155507622582 SHA512 72aa75b189e4507ce0fe1c5203476833fd04ec9238102631061ed82c2894890044ae40c82154a76533b6ba0a255c42cdfe2ab5c0f497d595783fa13ea32c71bb
-DIST advancemenu-2.9-use_pkgconfig_for_freetype_and_sdl.patch 18514 BLAKE2B b20922280c72ec151c3611ab3247391bd85785ee3db92d4bbd88ed0f0e50a8351a2b0cc63c2bf10aabba8a2bf57bcc5392230af1ed0eaabbfb28f5e34bc4785c SHA512 f68c2b42b48a9e768ecda54b0319148ed5503670f19be5cd4b23f150c6df9a43a053a0e64c8906836f461b49986c650f7e9f3952a5cf1309db66a79ea061123c
-DIST advancemenu-2.9.tar.gz 2515021 BLAKE2B caccbd311b43699766f2928c78983e7c3c45149d8733ea0795212c4f204828a8f4f22d05becd891947d9adce90d009e4d9b01ebfb0b5698ee9411a09d51c26b7 SHA512 ad19970ac9682b03fcfac36ab71cac1ce43aa88b7323ab6ce3a13ae45a29161cd654ce516115e6a441987055b0e9a47d15abae8ca9875753b81f5d7799908386
-EBUILD advancemenu-2.7.ebuild 2294 BLAKE2B a51023d7f931bb1b3ef47bcade4971bc8cfaae9a765c05b674de241a3155248e8faddf2437499818b866896f21a621069ffe5cc1bb78aa05ac98e09e3e47fb51 SHA512 2185634d2eeccb14800fddd08e88c39aab3c09acd1811ce5ebb161eee12e86933645dbdbdbb75af81146dadd1d54068393923602dfeb03c8fa6d0f4461f5dcec
-EBUILD advancemenu-2.9.ebuild 2237 BLAKE2B a8c0fe65acfcdb17e0d2610e8cf62018cc47557a7026f223deef2d125dacacb748859a0e39003d1c1f01c16e9a414f604d4ceb8c1a1dbe889c8ccced0e6d05ac SHA512 b657f77cbd4ca97be357a0ca56a30b84898a193d2440432c81769acc44f822e0969fb6aeaf620e4ee84515ef3c72dea78cd0b9d39215ca53e32304c6bc5e2046
-MISC metadata.xml 334 BLAKE2B 9c8f19757cfe814fe5650009b03d9eb653e3937cf30b4288dfa616a894560bdc81edba8b1ad235f34f5200a2c7ae8e9b19ba0e9f1e0ec5a2560b806ac9e184d8 SHA512 18cabfd831489b32b4449794c06a28425d91dab0c2868038fb48c94728fc16ccca268ae93a4f4a51be01c5901591582e6df2523460ba4ba98719436944577e1f
diff --git a/games-emulation/advancemenu/advancemenu-2.7.ebuild b/games-emulation/advancemenu/advancemenu-2.7.ebuild
deleted file mode 100644
index 52e1f2e5ecd9..000000000000
--- a/games-emulation/advancemenu/advancemenu-2.7.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils games
-
-DESCRIPTION="Frontend for AdvanceMAME, MAME, MESS, RAINE and any other emulator"
-HOMEPAGE="http://advancemame.sourceforge.net/menu-readme.html"
-SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug fbcon ncurses oss sdl slang truetype"
-
-RDEPEND="dev-libs/expat
-	alsa? ( media-libs/alsa-lib )
-	ncurses? ( sys-libs/ncurses:0 )
-	sdl? ( media-libs/libsdl )
-	slang? ( >=sys-libs/slang-1.4 )
-	!sdl? ( ( !fbcon? ( media-libs/libsdl ) ) )
-	truetype? ( >=media-libs/freetype-2 )"
-DEPEND="${RDEPEND}
-	x86? ( >=dev-lang/nasm-0.98 )
-	fbcon? ( virtual/os-headers )"
-
-src_prepare() {
-	# pic patch - bug #142021
-	epatch \
-		"${FILESDIR}"/${P}-alsa-pkg-config.patch \
-		"${FILESDIR}"/${P}-pic.patch
-	sed -i -e 's/"-s"//' configure.ac || die
-
-	use x86 && ln -s $(type -P nasm) "${T}/${CHOST}-nasm"
-	use sdl && ln -s $(type -P sdl-config) "${T}/${CHOST}-sdl-config"
-	use !sdl && use !fbcon && ln -s $(type -P sdl-config) "${T}/${CHOST}-sdl-config"
-	use truetype && ln -s $(type -P freetype-config) "${T}/${CHOST}-freetype-config"
-	eautoreconf
-}
-
-src_configure() {
-	export PATH="${PATH}:${T}"
-	egamesconf \
-		--enable-expat \
-		--enable-zlib \
-		--disable-svgalib \
-		--disable-static \
-		$(use_enable alsa) \
-		$(use_enable debug) \
-		$(use_enable fbcon fb) \
-		$(use_enable ncurses) \
-		$(use_enable truetype freetype) \
-		$(use_enable oss) \
-		$(use_enable sdl) \
-		$(use_enable slang) \
-		$(use !sdl && use !fbcon && echo --enable-sdl) \
-		$(use_enable x86 asm)
-}
-
-src_compile() {
-	STRIPPROG=true emake
-}
-
-src_install() {
-	dogamesbin advmenu
-	dodoc HISTORY README RELEASE doc/*.txt
-	doman doc/{advmenu,advdev}.1
-	dohtml doc/*.html
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	echo
-	elog "Execute:"
-	elog "     advmenu -default"
-	elog "to generate a config file"
-	elog
-	elog "An example emulator config found in advmenu.rc:"
-	elog "     emulator \"snes9x\" generic \"${GAMES_BINDIR}/snes9x\" \"%f\""
-	elog "     emulator_roms \"snes9x\" \"/home/user/myroms\""
-	elog "     emulator_roms_filter \"snes9x\" \"*.smc;*.sfc\""
-	elog
-	elog "For more information, see the advmenu man page."
-}
diff --git a/games-emulation/advancemenu/advancemenu-2.9.ebuild b/games-emulation/advancemenu/advancemenu-2.9.ebuild
deleted file mode 100644
index 532a8cfeca85..000000000000
--- a/games-emulation/advancemenu/advancemenu-2.9.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="Frontend for AdvanceMAME, MAME, MESS, RAINE and any other emulator"
-HOMEPAGE="http://advancemame.sourceforge.net/menu-readme.html"
-SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz"
-
-# Too big to put into FILESDIR
-SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${PN}-2.9-use_pkgconfig_for_freetype_and_sdl.patch"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug fbcon ncurses oss sdl slang truetype"
-
-RDEPEND="dev-libs/expat
-	alsa? ( media-libs/alsa-lib )
-	ncurses? ( sys-libs/ncurses:0 )
-	sdl? ( media-libs/libsdl )
-	slang? ( >=sys-libs/slang-1.4 )
-	!sdl? ( ( !fbcon? ( media-libs/libsdl ) ) )
-	truetype? ( >=media-libs/freetype-2 )"
-DEPEND="${RDEPEND}
-	x86? ( >=dev-lang/nasm-0.98 )
-	fbcon? ( virtual/os-headers )"
-
-PATCHES=(
-	# pic patch - bug #142021
-	"${FILESDIR}"/${PN}-2.7-pic.patch
-	"${FILESDIR}/${PN}-2.9-destdir.patch"
-	"${DISTDIR}/${PN}-2.9-use_pkgconfig_for_freetype_and_sdl.patch"
-)
-
-src_prepare() {
-	default
-	sed -i -e 's/"-s"//' configure.ac || die
-
-	use x86 && ln -s $(type -P nasm) "${T}/${CHOST}-nasm"
-	eautoreconf
-}
-
-src_configure() {
-	export PATH="${PATH}:${T}"
-	local myeconfargs=(
-		--enable-expat
-		--enable-zlib
-		--disable-svgalib
-		$(use_enable alsa)
-		$(use_enable debug)
-		$(use_enable fbcon fb)
-		$(use_enable ncurses)
-		$(use_enable truetype freetype)
-		$(use_enable oss)
-		$(use_enable sdl)
-		$(use_enable slang)
-		$(use !sdl && use !fbcon && echo --enable-sdl)
-		$(use_enable x86 asm)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	STRIPPROG=true emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc HISTORY README RELEASE doc/*.txt
-	doman doc/{advmenu,advdev}.1
-	docinto html
-	dodoc doc/*.html
-}
-
-pkg_postinst() {
-	echo
-	elog "Execute:"
-	elog "     advmenu -default"
-	elog "to generate a config file"
-	elog
-	elog "An example emulator config found in advmenu.rc:"
-	elog "     emulator \"snes9x\" generic \"${GAMES_BINDIR}/snes9x\" \"%f\""
-	elog "     emulator_roms \"snes9x\" \"/home/user/myroms\""
-	elog "     emulator_roms_filter \"snes9x\" \"*.smc;*.sfc\""
-	elog
-	elog "For more information, see the advmenu man page."
-}
diff --git a/games-emulation/advancemenu/files/advancemenu-2.7-alsa-pkg-config.patch b/games-emulation/advancemenu/files/advancemenu-2.7-alsa-pkg-config.patch
deleted file mode 100644
index 1b0f8a8df9cb..000000000000
--- a/games-emulation/advancemenu/files/advancemenu-2.7-alsa-pkg-config.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- advancemenu-2.6.orig/configure.ac
-+++ advancemenu-2.6/configure.ac
-@@ -512,7 +512,7 @@
- 		[snd_pcm_open],
- 		[ac_lib_alsa=yes],
- 		[ac_lib_alsa=no],
--		[-lm]
-+		[`pkg-config alsa --libs`]
- 	)
- 	if test $ac_lib_alsa = yes; then
- 		AC_MSG_CHECKING([for ALSA])
-@@ -531,7 +531,7 @@
- 		[snd_pcm_open],
- 		[],
- 		[AC_MSG_ERROR([the ALSA library is missing])],
--		[-lm]
-+		[`pkg-config alsa --libs`]
- 	)
- 	AC_MSG_CHECKING([for ALSA version])
- 	AC_TRY_COMPILE([
diff --git a/games-emulation/advancemenu/files/advancemenu-2.7-pic.patch b/games-emulation/advancemenu/files/advancemenu-2.7-pic.patch
deleted file mode 100644
index 62f073bed83b..000000000000
--- a/games-emulation/advancemenu/files/advancemenu-2.7-pic.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./advance/blit/blit.c.orig
-+++ ./advance/blit/blit.c
-@@ -28,6 +28,10 @@
-  * do so, delete this exception statement from your version.
-  */
- 
-+#if defined(USE_ASM_INLINE) && defined(__PIC__)
-+# undef USE_ASM_INLINE
-+#endif
-+
- #include "portable.h"
- 
- #include "blit.h"
diff --git a/games-emulation/advancemenu/files/advancemenu-2.9-destdir.patch b/games-emulation/advancemenu/files/advancemenu-2.9-destdir.patch
deleted file mode 100644
index 9ebef883ae25..000000000000
--- a/games-emulation/advancemenu/files/advancemenu-2.9-destdir.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- advancemenu-2.9/advance/advance.mak
-+++ advancemenu-2.9/advance/advance.mak
-@@ -284,45 +284,45 @@
- # Common install
- 
- pkgdir = $(datadir)/advance
--pkgdocdir = $(docdir)/advance
-+pkgdocdir = $(docdir)
- 
- install-dirs:
--	-$(INSTALL_PROGRAM_DIR) $(bindir)
--	-$(INSTALL_DATA_DIR) $(pkgdir)
--	-$(INSTALL_DATA_DIR) $(pkgdocdir)
--	-$(INSTALL_MAN_DIR) $(mandir)/man1
-+	-$(INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir)
-+	-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)
-+	-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdocdir)
-+	-$(INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man1
- ifneq ($(wildcard $(EMUSRC)),)
--	-$(INSTALL_DATA_DIR) $(pkgdir)/rom
--	-$(INSTALL_DATA_DIR) $(pkgdir)/sample
--	-$(INSTALL_DATA_DIR) $(pkgdir)/artwork
--	-$(INSTALL_DATA_DIR) $(pkgdir)/image
--	-$(INSTALL_DATA_DIR) $(pkgdir)/crc
--	-$(INSTALL_DATA_DIR) $(pkgdir)/snap
-+	-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/rom
-+	-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/sample
-+	-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/artwork
-+	-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/image
-+	-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/crc
-+	-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/snap
- endif
- 
- install-data: $(INSTALL_DATAFILES) $(INSTALL_ROMFILES) $(INSTALL_SAMPLEFILES) $(INSTALL_SNAPFILES)
- ifdef INSTALL_DATAFILES
- 	@for i in $(INSTALL_DATAFILES); do \
- 		echo "$(INSTALL_DATA) $$i $(pkgdir)"; \
--		$(INSTALL_DATA) $$i $(pkgdir); \
-+		$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir); \
- 	done
- endif
- ifdef INSTALL_ROMFILES
- 	@for i in $(INSTALL_ROMFILES); do \
- 		echo "$(INSTALL_DATA) $$i $(pkgdir)/rom"; \
--		$(INSTALL_DATA) $$i $(pkgdir)/rom; \
-+		$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/rom; \
- 	done
- endif
- ifdef INSTALL_SAMPLEFILES
- 	@for i in $(INSTALL_SAMPLEFILES); do \
- 		echo "$(INSTALL_DATA) $$i $(pkgdir)/sample"; \
--		$(INSTALL_DATA) $$i $(pkgdir)/sample; \
-+		$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/sample; \
- 	done
- endif
- ifdef INSTALL_SNAPFILES
- 	@for i in $(INSTALL_SNAPFILES); do \
- 		echo "$(INSTALL_DATA) $$i $(pkgdir)/snap"; \
--		$(INSTALL_DATA) $$i $(pkgdir)/snap; \
-+		$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/snap; \
- 	done
- endif
- 
-@@ -351,7 +351,7 @@
- install-bin: $(INSTALL_BINFILES)
- 	@for i in $(INSTALL_BINFILES); do \
- 		echo "$(INSTALL_PROGRAM) $$i $(bindir)"; \
--		$(INSTALL_PROGRAM) $$i $(bindir); \
-+		$(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir); \
- 	done
- 
- uninstall-bin:
-@@ -363,7 +363,7 @@
- ifdef INSTALL_DOCFILES
- 	@for i in $(INSTALL_DOCFILES); do \
- 		echo "$(INSTALL_DATA) $$i $(pkgdocdir)"; \
--		$(INSTALL_DATA) $$i $(pkgdocdir); \
-+		$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdocdir); \
- 	done
- endif
- 
-@@ -378,7 +378,7 @@
- ifdef INSTALL_MANFILES
- 	@for i in $(INSTALL_MANFILES); do \
- 		echo "$(INSTALL_DATA) $$i $(mandir)/man1"; \
--		$(INSTALL_DATA) $$i $(mandir)/man1; \
-+		$(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/man1; \
- 	done
- endif
- 
-@@ -401,7 +401,7 @@
- 	-rmdir $(pkgdocdir)
- endif
- 
--install: install-dirs install-bin install-data install-doc install-man
-+install: install-dirs install-bin install-data
- 
- uninstall: uninstall-bin uninstall-data uninstall-doc uninstall-man uninstall-dirs
- 
---- advancemenu-2.9/configure.ac
-+++ advancemenu-2.9/configure.ac
-@@ -1158,8 +1158,8 @@
- 
- dnl Final
- AC_SUBST([CONF_LIB_DIRECT],[$ac_lib_direct_flag])
--AC_SUBST([mandir],['${prefix}/man'])
--AC_SUBST([docdir],['${prefix}/doc'])
-+AC_SUBST([mandir],['${prefix}/share/man'])
-+AC_SUBST([docdir],['${prefix}/share/doc/${PF}'])
- AC_CONFIG_FILES([Makefile])
- AC_OUTPUT
- 
diff --git a/games-emulation/advancemenu/metadata.xml b/games-emulation/advancemenu/metadata.xml
deleted file mode 100644
index 879ee3497adc..000000000000
--- a/games-emulation/advancemenu/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-	<upstream>
-		<remote-id type="sourceforge">advancemame</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index 41198106b068..e349dec51066 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1,5 +1,7 @@
 AUX dolphin-5.0-CHAR_WIDTH-collision.patch 2043 BLAKE2B d29f1f9ff360d79105d7020174bfc5063ad18c544d17056dca055174d8d0c837671f5d04f95de98e140d8634651f869e1a0d9e79b834f0f039ce59900c0696b0 SHA512 47c25a3fd5e6c47e34fe23d5faa71ea316c708fa2bbcbc5136a415fc25a0b207c4d18bfedb2d7c4e2a71394581d1e41fd7d4cca3544d34e3f4a6a84fee360314
+AUX dolphin-5.0-no-pie.patch 1068 BLAKE2B e941c7002b7adaaefc5c9ea2433a1362c1698b325c2804a31eac616c1185205c27b10466a9f4f1f3e2c2e3773f24f5cae6afb849cbf18a574dfbe08622f88ffa SHA512 8deacd47896003687e25117d758cba6423a6729e6bd54c1bdf39e904f6659ee42d5740338fd94301ef98befaaf02697e32d5fecb604ddc38186b1f81285aec56
+AUX dolphin-5.0-xgetbv.patch 1137 BLAKE2B d736d25127fae4c552c1e28b0c152037a2c0a16c59dbec873596e1488f9a9872672684f23517c6ceeef0c8b50e0f1914882a1ccd123660e4458fc9e73d1e07bd SHA512 d627829270acc69ed3dc420c57762c6a68713482c29fd0b33a38864558380c5d9547ace9ab054d2892108ccfe7751147e51c0d5495a57d02fa29c02ac93ef391
 DIST dolphin-5.0.zip 41802909 BLAKE2B 57fb7741e86b8b5194c9ccaf99e60be0202429209ce98d08aec4ed1d6f47fb347d9149509de7ac1e4bb28435cba35e357b87cf5d29efe2867706dbb3b903c886 SHA512 36c4f371e066537331a9a8ec4a17befa278465cdebe258e1cbf1157752ba69bff9c1b8a6e8698bbb650aa257bd48b6b42ee9f61357904b09fd01738af8223d3a
-EBUILD dolphin-5.0.ebuild 4538 BLAKE2B 2cdf537c696d52e637b644500fac6b5528f863104f9ffe8b8c30d9bcefd91a6309854ed744f8174766281266b3beac403ebeaa707749fbd03b1750990ec331c1 SHA512 8c3dff0ac08c394f05256b0736209425ec4e4a8d87299bd788e5b1df9ae01aafff61c6b4484b3f064b13d5fc0e999fc434aa162b2d70268d4293b6ab138c80ce
-EBUILD dolphin-9999.ebuild 4591 BLAKE2B ef1c50ccf6887336ba8aa86ff7e3e4a8c601d6ff15b54ee2ae9f0001dc5de1dae09a195bc224f8dbac51e261eb5f99dceb372ded1fe78ed81404231c49c6a77e SHA512 569cb7d38d0cc1900a52b0fec1fb1a82071d8923adf9bec703ffd6e935fbe471b9cd314babf2de2d569009d706367d4c93a198bb7e0fc187af3d822da5370635
-MISC metadata.xml 836 BLAKE2B 786a1a9f4e7d76c0111bd9755f784a0bba5607465e2693986c6e2f37e0a32f9ceea84c902464ea47b66f84c183660d5767f569ae933c6b8774d47a15de4c6f30 SHA512 7bdcb2ba2f3a1fa247080a08da495274bea1f61bec1a88e824ebd44fb7e21e74e7ef52855c1c6fba07f12b278df19c0014ba98a5b6ec50f62c08b0ee31e5fc6b
+EBUILD dolphin-5.0.ebuild 4610 BLAKE2B f10b2979143b167887758b6d70db658ce0fe4d9c0bdc57ccc87b16b5682ddebd23f9e14d5fb000b250767bd11487fa13e988b76fd6958cfa56a396c2e5adea4e SHA512 d45ab963c14353014fd9178b61ebecdb017e67ea8e99b252712acbd9732ddb31ae5125ffeaef6cd66276b526dc74955904141a88252682cf34ea3df184ac6746
+EBUILD dolphin-9999.ebuild 4543 BLAKE2B 882e74a625f99b126af0c8ff5c047b0bc659d16f313f8a6b045eb5e746c7058e5f60b8506e1baa7979039e5a0c4a12476fed490752ad8663e92c7eb81b4dd063 SHA512 7a4578076ae71146edc596d1e67d6f6e4f290a3d33edffb980664bae3ec1aae1a2e04887ca95c71a3cd972059cc63dd3b638faf05904978739a1e3062e4a906c
+MISC metadata.xml 825 BLAKE2B 47bce78aa687f194ff5fb0252f3cdaf76336ab5460cdf72ddaa2913f36dd69aa916cbfc7684ae276248e14d092d8107ab67c7d8c37b71bfca15778b171d725f2 SHA512 33a3c378f2ed7fd25a155b29a03dd3b87730e9c910e7b2d35148a7f6eafbb75e96eab0a0f9608a9ae34e1aa2ccb5d6cc849d895cd28912c88193640a8ac5a6b5
diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild b/games-emulation/dolphin/dolphin-5.0.ebuild
index 6110f03b0a04..491d92991bef 100644
--- a/games-emulation/dolphin/dolphin-5.0.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0.ebuild
@@ -17,7 +17,9 @@ HOMEPAGE="https://www.dolphin-emu.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa ao bluetooth doc egl +evdev ffmpeg libav llvm log lto openal +pch portaudio profile pulseaudio qt5 sdl upnp +wxwidgets"
+IUSE="alsa ao bluetooth doc egl +evdev ffmpeg libav log lto openal +pch portaudio profile pulseaudio qt5 sdl upnp +wxwidgets"
+
+RESTRICT=test
 
 RDEPEND="
 	>=media-libs/libsfml-2.1
@@ -44,7 +46,6 @@ RDEPEND="
 		libav? ( media-video/libav:= )
 		!libav? ( media-video/ffmpeg:= )
 	)
-	llvm? ( sys-devel/llvm:* )
 	openal? (
 		media-libs/openal
 		media-libs/libsoundtouch
@@ -70,7 +71,11 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}"/${P}-CHAR_WIDTH-collision.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-CHAR_WIDTH-collision.patch
+	"${FILESDIR}"/${P}-xgetbv.patch
+	"${FILESDIR}"/${P}-no-pie.patch
+)
 
 src_prepare() {
 	cmake-utils_src_prepare
@@ -85,9 +90,10 @@ src_prepare() {
 	if use !bluetooth; then
 		sed -i -e '/check_lib(BLUEZ/d' CMakeLists.txt || die
 	fi
-	if use !llvm; then
-		sed -i -e '/include(FindLLVM/d' CMakeLists.txt || die
-	fi
+
+	# Unconditionally disable LLVM disassembler.
+	sed -i -e '/include(FindLLVM/d' CMakeLists.txt || die
+
 	if use !openal; then
 		sed -i -e '/include(FindOpenAL/d' CMakeLists.txt || die
 	fi
diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild
index 78c1cdbac9d0..b8b2dd91a858 100644
--- a/games-emulation/dolphin/dolphin-9999.ebuild
+++ b/games-emulation/dolphin/dolphin-9999.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-PLOCALES="ar ca cs da_DK de el en es fa fr hr hu it ja ko ms_MY nb nl pl pt pt_BR ro_RO ru sr sv tr zh_CN zh_TW"
+PLOCALES="ar ca cs da de el en es fa fr hr hu it ja ko ms nb nl pl pt pt_BR ro ru sr sv tr zh_CN zh_TW"
 PLOCALE_BACKUP="en"
-WX_GTK_VER="3.0"
 
-inherit cmake-utils desktop gnome2-utils l10n pax-utils toolchain-funcs versionator wxwidgets
+inherit cmake-utils desktop gnome2-utils l10n pax-utils
 
 if [[ ${PV} == *9999 ]]
 then
@@ -23,16 +22,19 @@ HOMEPAGE="https://www.dolphin-emu.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa ao bluetooth doc egl +evdev ffmpeg libav llvm log lto openal +pch portaudio profile pulseaudio qt5 sdl upnp +wxwidgets"
+IUSE="alsa ao bluetooth discord-presence doc egl +evdev ffmpeg libav log lto openal portaudio profile pulseaudio +qt5 sdl systemd upnp"
 
 RDEPEND="
 	>=media-libs/libsfml-2.1
 	>net-libs/enet-1.3.7
 	>=net-libs/mbedtls-2.1.1:=
-	dev-libs/lzo
+	dev-libs/hidapi:0=
+	dev-libs/lzo:2=
+	dev-libs/pugixml:0=
 	media-libs/libpng:0=
+	net-misc/curl:0=
 	sys-libs/readline:0=
-	sys-libs/zlib:=
+	sys-libs/zlib:0=
 	x11-libs/libXext
 	x11-libs/libXi
 	x11-libs/libXrandr
@@ -50,7 +52,6 @@ RDEPEND="
 		libav? ( media-video/libav:= )
 		!libav? ( media-video/ffmpeg:= )
 	)
-	llvm? ( sys-devel/llvm:* )
 	openal? (
 		media-libs/openal
 		media-libs/libsoundtouch
@@ -64,14 +65,12 @@ RDEPEND="
 		dev-qt/qtwidgets:5
 	)
 	sdl? ( media-libs/libsdl2[haptic,joystick] )
+	systemd? ( sys-apps/systemd:0= )
 	upnp? ( >=net-libs/miniupnpc-1.7 )
-	wxwidgets? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-		x11-libs/wxGTK:${WX_GTK_VER}[opengl,X]
-	)"
+"
 DEPEND="${RDEPEND}
 	app-arch/zip
+	dev-util/vulkan-headers
 	media-libs/freetype
 	sys-devel/gettext
 	virtual/pkgconfig"
@@ -89,9 +88,6 @@ src_prepare() {
 	if use !bluetooth; then
 		sed -i -e '/check_lib(BLUEZ/d' CMakeLists.txt || die
 	fi
-	if use !llvm; then
-		sed -i -e '/include(FindLLVM/d' CMakeLists.txt || die
-	fi
 	if use !openal; then
 		sed -i -e '/include(FindOpenAL/d' CMakeLists.txt || die
 	fi
@@ -102,20 +98,33 @@ src_prepare() {
 		sed -i -e '/check_lib(PULSEAUDIO/d' CMakeLists.txt || die
 	fi
 
-	# Remove ALL the bundled libraries, aside from:
-	# - SOIL: The sources are not public.
-	# - Bochs-disasm: Don't know what it is.
-	# - gtest: Their build set up solely relies on the build in gtest.
-	# - xxhash: Not on the tree.
-	mv Externals/SOIL . || die
-	mv Externals/Bochs_disasm . || die
-	mv Externals/gtest . || die
-	mv Externals/xxhash . || die
+	# Remove all the bundled libraries that support system-installed
+	# preference. See CMakeLists.txt for conditional 'add_subdirectory' calls.
+	local KEEP_SOURCES=(
+		Bochs_disasm
+		cpp-optparse
+		glslang
+		# FIXME: xxhash can't be found by cmake
+		xxhash
+		# soundtouch uses shorts, not floats
+		soundtouch
+		cubeb
+		discord-rpc
+		# Their build set up solely relies on the build in gtest.
+		gtest
+		# gentoo's version requires exception support.
+		# dolphin disables exceptions and fails the build.
+		picojson
+	)
+	local s
+	for s in "${KEEP_SOURCES[@]}"; do
+		mv -v "Externals/${s}" . || die
+	done
+	einfo "removing sources: $(echo Externals/*)"
 	rm -r Externals/* || die "Failed to delete Externals dir."
-	mv Bochs_disasm Externals || die
-	mv SOIL Externals || die
-	mv gtest Externals || die
-	mv xxhash Externals || die
+	for s in "${KEEP_SOURCES[@]}"; do
+		mv -v "${s}" "Externals/" || die
+	done
 
 	remove_locale() {
 		# Ensure preservation of the backup locale when no valid LINGUA is set
@@ -131,23 +140,21 @@ src_prepare() {
 }
 
 src_configure() {
-	if use wxwidgets; then
-		need-wxwidgets unicode
-	fi
-
 	local mycmakeargs=(
 		-DUSE_SHARED_ENET=ON
-		$( cmake-utils_use ffmpeg ENCODE_FRAMEDUMPS )
-		$( cmake-utils_use log FASTLOG )
-		$( cmake-utils_use profile OPROFILING )
-		$( cmake-utils_use_disable wxwidgets WX )
-		$( cmake-utils_use_enable evdev EVDEV )
-		$( cmake-utils_use_enable lto LTO )
-		$( cmake-utils_use_enable pch PCH )
-		$( cmake-utils_use_enable qt5 QT2 )
-		$( cmake-utils_use_enable sdl SDL )
-		$( cmake-utils_use_use egl EGL )
-		$( cmake-utils_use_use upnp UPNP )
+		-DUSE_DISCORD_PRESENCE=$(usex discord-presence)
+		-DENCODE_FRAMEDUMPS=$(usex ffmpeg)
+		-DFASTLOG=$(usex log)
+		-DOPROFILING=$(usex profile)
+
+		-DENABLE_EVDEV=$(usex evdev)
+		-DENABLE_LLVM=OFF
+		-DENABLE_LTO=$(usex lto)
+		-DENABLE_QT=$(usex qt5)
+		-DENABLE_SDL=$(usex sdl)
+
+		-DUSE_EGL=$(usex egl)
+		-DUSE_UPNP=$(usex upnp)
 	)
 
 	cmake-utils_src_configure
diff --git a/games-emulation/dolphin/files/dolphin-5.0-no-pie.patch b/games-emulation/dolphin/files/dolphin-5.0-no-pie.patch
new file mode 100644
index 000000000000..949e42e50de9
--- /dev/null
+++ b/games-emulation/dolphin/files/dolphin-5.0-no-pie.patch
@@ -0,0 +1,26 @@
+Disable PIE-compatible code generation via -fno-pie.
+
+Before upstream fix:
+https://github.com/dolphin-emu/dolphin/commit/daa03cd1060cc826aca93a1dffc6e94bc6af6d5f
+dolphin assumed executable image to be in low addresses (<2GB)
+and hardcoded 32-bit absolute addresses during JIT phase.
+
+PIE-compatible code does not have this restriction and
+allows mapping binaries above 2GB area (and breaks dolphin's JIT).
+
+Strictly speaking -no-pie (link-time flag) does not or guarantee
+or require low address mapping for binary if it was already built
+as PIC/PIE.
+
+But -fno-pie imposes additional restrictions on generated code by GCC
+and makes -no-pie to take effect.
+Bug: https://bugs.gentoo.org/640124
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -189,4 +189,4 @@ if(NOT ENABLE_GENERIC)
+ 			set(_M_X86_64 1)
+-			add_definitions(-D_M_X86=1 -D_M_X86_64=1 -msse2)
+-			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fno-pie")
++			add_definitions(-D_M_X86=1 -D_M_X86_64=1 -msse2 -fno-pie)
++			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fno-pie -no-pie")
+ 		else()
diff --git a/games-emulation/dolphin/files/dolphin-5.0-xgetbv.patch b/games-emulation/dolphin/files/dolphin-5.0-xgetbv.patch
new file mode 100644
index 000000000000..ffa7cc81c13e
--- /dev/null
+++ b/games-emulation/dolphin/files/dolphin-5.0-xgetbv.patch
@@ -0,0 +1,24 @@
+Workaround collision of _xgetbv intrinsic redeclaration:
+
+Source/Core/Common/x64CPUDetect.cpp:45:12: error: ambiguating new declaration of ‘u64 _xgetbv(u32)’
+ static u64 _xgetbv(u32 index)
+            ^~~~~~~
+In file included from /usr/lib/gcc/x86_64-pc-linux-gnu/8.1.0/include/x86intrin.h:74,
+                 from Source/Core/Common/Intrinsics.h:12,
+                 from Source/Core/Common/x64CPUDetect.cpp:10:
+/usr/lib/gcc/x86_64-pc-linux-gnu/8.1.0/include/xsaveintrin.h:60:1: note: old declaration ‘long long int _xgetbv(unsigned int)’
+ _xgetbv (unsigned int __A)
+ ^~~~~~~
+
+Upstream fied it in
+    commit 823fdda30c38be953c3d425874f2adeabed2b5a8
+    intrinsics: stop defining _xgetbv/_XCR_XFEATURE_ENABLED_MASK, which are reserved
+
+--- a/Source/Core/Common/x64CPUDetect.cpp
++++ b/Source/Core/Common/x64CPUDetect.cpp
+@@ -45 +45 @@ static inline void __cpuid(int info[4], int function_id)
+-static u64 _xgetbv(u32 index)
++static u64 _xgetbv_dolphin(u32 index)
+@@ -137 +137 @@ void CPUInfo::Detect()
+-			if ((_xgetbv(_XCR_XFEATURE_ENABLED_MASK) & 0x6) == 0x6)
++			if ((_xgetbv_dolphin(_XCR_XFEATURE_ENABLED_MASK) & 0x6) == 0x6)
diff --git a/games-emulation/dolphin/metadata.xml b/games-emulation/dolphin/metadata.xml
index e5f72fa203b6..34a2a16ae8ed 100644
--- a/games-emulation/dolphin/metadata.xml
+++ b/games-emulation/dolphin/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>slyfox@gentoo.org</email>
+	</maintainer>
 	<use>
+		<flag name="discord-presence">Enables Discord Rich Presence, show the current game on Discord</flag>
 		<flag name="egl">Enable EGL support</flag>
 		<flag name="evdev">Enable evdev input support</flag>
-		<flag name="llvm">Enable the LLVM-based disassembler for debugger mode</flag>
 		<flag name="log">Increase logging output</flag>
 		<flag name="lto">Add support for link-time optimizations.</flag>
 	</use>
@@ -12,10 +15,6 @@
 Dolphin is a Gamecube and Wii emulator. Most games run perfectly or with minor
 bugs. Games are playable at HD quality, with 1080p and more.
 	</longdescription>
-	<maintainer type="person">
-		<email>twitch153@gentoo.org</email>
-		<name>Devan Franchini</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">dolphin-emu/dolphin</remote-id>
 	</upstream>
diff --git a/games-emulation/gfceux/Manifest b/games-emulation/gfceux/Manifest
deleted file mode 100644
index 74a7bb36002e..000000000000
--- a/games-emulation/gfceux/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fceux-2.1.1.src.tar.bz2 3263945 BLAKE2B 96c1dfcf51f34eff273c948d7467c4c5503079423d839c6e52596f5a47bb7a2c148a1603fbd784d838c62476e71818418615f4d10f9d04669d319466b379f078 SHA512 19a1253a3ff1d88baec5636dbebab287b106e5e114081ab4040f52dfcda28b878af748a759e08dc2fe1381eb8f59e728d36993a9aca9ce184ed8760114cf3149
-EBUILD gfceux-2.1.1-r1.ebuild 1258 BLAKE2B 125f8cc0c48c208f9d689be19aba0640d440f295d261f8be796b08497e94f8ae1d6e397f157aa8a8b6ba354d5aed2ef7898e5efbb9986ea983c35476fd0bfa26 SHA512 f95bedd06faf08fc9ffb28a9d229d6dfd20ee298025f8b06c349641d4fe8de23d860b48532fb8171af43e1f4a546a48d669d374bc761dffc2ddc8af7d27d274b
-MISC metadata.xml 331 BLAKE2B b36952158ee85e8e6614447dca54480d07a8e2fc23b059d16ede28fa9b31f65d21b606e0515e073c0d42d770a68cadcfec8965c6e9bd1343ef484f914e977434 SHA512 c64be39c5960c471c673a706561fc8962a9badcd31912280acbc999ec6617f72eaf432e0bd6f148fae4967f6c83770d8468c990cd191376f919207ae85037fa7
diff --git a/games-emulation/gfceux/gfceux-2.1.1-r1.ebuild b/games-emulation/gfceux/gfceux-2.1.1-r1.ebuild
deleted file mode 100644
index faf11fdaf183..000000000000
--- a/games-emulation/gfceux/gfceux-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils gnome2-utils distutils-r1 games
-
-DESCRIPTION="A graphical frontend for the FCEUX emulator"
-HOMEPAGE="http://fceux.com"
-SRC_URI="mirror://sourceforge/fceultra/fceux-${PV}.src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/pygtk"
-RDEPEND="${DEPEND}
-	games-emulation/fceux"
-
-S=${WORKDIR}/${PN}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	sed -i \
-		-e "s#data/gfceux.glade#${GAMES_DATADIR}/${PN}/gfceux.glade#" \
-		src/main.py || die
-}
-
-python_install() {
-	distutils-r1_python_install --install-scripts="${GAMES_BINDIR}"
-}
-
-src_prepare() {
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doicon -s 48 data/${PN}.png
-	newicon -s 128 data/${PN}_big.png ${PN}.png
-
-	# respect games variables
-	dodir "${GAMES_DATADIR}"/${PN}
-	mv "${ED}"/usr/share/${PN}/* "${ED}${GAMES_DATADIR}"/${PN}/ || die
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-emulation/gfceux/metadata.xml b/games-emulation/gfceux/metadata.xml
deleted file mode 100644
index 3c71f364aead..000000000000
--- a/games-emulation/gfceux/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-	<upstream>
-		<remote-id type="sourceforge">fceultra</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/hugo/Manifest b/games-emulation/hugo/Manifest
deleted file mode 100644
index c4c2fe97a3af..000000000000
--- a/games-emulation/hugo/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX hugo-2.12-gcc41.patch 306 BLAKE2B 8539b43f23bbf008f3c000e7fc86480ffba3cd096297bf38b97ff8efe3ee4efe1ac9c6b09361a8a39214103751652362af0ae25e9bc5c8ac706fc77806a66553 SHA512 5b8203867dd6f524ef6f6e70f158b02de45f70aa4f0ac5bd85c171580a7def6c14cd93afe98c90717e10a77fa040ee3d613812ebda6b1768149c8621365ff782
-DIST hugo-2.12.tar.gz 456991 BLAKE2B 21bcb1fbab1020cbc26039b0f9a49ef653ee21409c84a61747940437dd57c39a453772dbbf82d3e74b18b477ed6a505402108fb1969e56279b650a734b91a40b SHA512 38342e6e7a130caeac711de4f72138a5159c2a34e443ce5e16bcb7ac02fbefd085fa5c48583550d8089bfe3528785853df1863e7d1b32652a7f88300ad09d21d
-EBUILD hugo-2.12.ebuild 727 BLAKE2B c057f1963bea30d576f1c93d22c55a5a7eba9d5f36f8f57dfa52b2057cdf9eacb2789e7082191bf9d19d806c5d4d5a6b1fcf6d22629d094965e6cb13cb9dc66d SHA512 1d464f5fa48cfc0726ec2ea7bcc6d285b773bf2efb98214fc4c92c6171b80774d7f355d1d66bd98e57eac5be11a8295c77b5a174db293f4e8b4eb3795dc566dd
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-emulation/hugo/files/hugo-2.12-gcc41.patch b/games-emulation/hugo/files/hugo-2.12-gcc41.patch
deleted file mode 100644
index 14050cc79f16..000000000000
--- a/games-emulation/hugo/files/hugo-2.12-gcc41.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pce.h.old	2006-05-02 20:06:13.000000000 +0200
-+++ pce.h	2006-05-02 20:06:33.000000000 +0200
-@@ -196,7 +196,7 @@
- extern UChar language;
- // the current language
- 
--extern int BaseClock, UPeriod;
-+extern int UPeriod;
- 
- extern UChar US_encoded_card;
- // Do we have to swap even and odd bytes in the rom
diff --git a/games-emulation/hugo/hugo-2.12.ebuild b/games-emulation/hugo/hugo-2.12.ebuild
deleted file mode 100644
index 86bcffd6e456..000000000000
--- a/games-emulation/hugo/hugo-2.12.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic games
-
-DESCRIPTION="PC-Engine (Turbografx16) emulator for linux"
-HOMEPAGE="http://www.zeograd.com/"
-SRC_URI="http://www.zeograd.com/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	media-libs/libsdl[video]
-	media-libs/libvorbis"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}"-gcc41.patch
-	append-cppflags $(pkg-config sdl --cflags)
-
-}
-
-src_install() {
-	dogamesbin hugo
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r pixmaps
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	dohtml doc/*html
-	prepgamesdirs
-}
diff --git a/games-emulation/hugo/metadata.xml b/games-emulation/hugo/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-emulation/hugo/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/games-emulation/jrommanager/Manifest b/games-emulation/jrommanager/Manifest
new file mode 100644
index 000000000000..69eb38e7f14b
--- /dev/null
+++ b/games-emulation/jrommanager/Manifest
@@ -0,0 +1,3 @@
+DIST JRomManager-1.6b20.zip 9284236 BLAKE2B a874837e90bdd8ec6c55850fd0e61cabeb767f4b4eba6517a11f3de036a6fd95f7507593da7b5247824c38077b12ac52c490f5ec0e72077bd972c78810c58ebd SHA512 5d4a98989bd9eb2ba94dd50fe451308d9a628414e33cdc84814c55bf9679c3779253a8fab895e2f7922e3b837949e8065f2799707aeaab94d79a12ba73d83638
+EBUILD jrommanager-1.6_p20-r1.ebuild 975 BLAKE2B e0c596f31ce3b26f834bd9005583b2169ee58b808074e740c697ed58d8bf8ec2fa99b63adaa0a202810ce606f471cb4a1a626929c063d64e20c49cbafee2bcc7 SHA512 a46bca65f51962fe62ce45c1bb9de81c5f5d8076a56126a83a1681aad0602453f826c266401d0424bee312c99295310a2aa1c980a200e60299d99134f00bf451
+MISC metadata.xml 831 BLAKE2B 814a9b1567202d8a7cf26370e0670a726ded26886231f46358a13b4538d4b4a048d09f116e1d6a743be16790b3aec8fc35911a2446fc851d8af48446255de334 SHA512 c7516078eb437a57048567be0d904c643a0860d6fee189cc92de1e300d15be1fc5143e42d2c2f8d412e893c8a00edc1db72fc7ef1c852ede33b120d84bf8986e
diff --git a/games-emulation/jrommanager/jrommanager-1.6_p20-r1.ebuild b/games-emulation/jrommanager/jrommanager-1.6_p20-r1.ebuild
new file mode 100644
index 000000000000..6db4f6fa4a94
--- /dev/null
+++ b/games-emulation/jrommanager/jrommanager-1.6_p20-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=JRomManager
+MY_PV=${PV/_p/b}
+MY_P="${MY_PN}-${MY_PV}"
+
+inherit desktop
+
+DESCRIPTION="A Mame and Retrogaming Rom Manager, Java alternative to ClrMamePro"
+HOMEPAGE="https://github.com/optyfr/JRomManager"
+SRC_URI="https://github.com/optyfr/${MY_PN}/releases/download/${MY_PV}/${MY_P}.zip"
+QA_PREBUILT="*"
+
+S="${WORKDIR}"
+
+LICENSE="GPL-3 GPL-2-with-classpath-exception BSD-2 MIT Apache-2.0 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8"
+DEPEND="${DEPEND}
+	app-arch/unzip"
+
+src_prepare() {
+	default
+
+	sed -e "/dir=.*/s:.*:cd \"${EROOT}/usr/share/${PN}\" || exit:" -i *.sh || die "sed failed!"
+	unzip -j ${MY_PN}.jar "jrm/resources/rom.png" || die
+}
+
+src_install() {
+	insinto "/usr/share/${PN}"
+	doins *.jar
+	doins -r lib
+	newbin "${MY_PN}-multi.sh" "${PN}"
+	newicon "rom.png" "${PN}.png"
+	make_desktop_entry "${PN}" '' '' 'Utility'
+}
diff --git a/games-emulation/jrommanager/metadata.xml b/games-emulation/jrommanager/metadata.xml
new file mode 100644
index 000000000000..0387c7c893ea
--- /dev/null
+++ b/games-emulation/jrommanager/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>opty@hotmail.fr</email>
+    <name>optyfr</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <longdescription>
+    JRomManager is a Rom manager made to work mostly anywhere, 
+    with decent performance and minimal memory footprint, 
+    some attention was also made to work correctly over shared networks.
+    It has also been made available open source to permit enhancements
+    from the retro gaming community. The main focus is to support MAME
+    and derivatives, but should work well with any Dat file from other
+    roms sets.
+  </longdescription>
+</pkgmetadata>
diff --git a/games-emulation/kigb/Manifest b/games-emulation/kigb/Manifest
deleted file mode 100644
index f9d0a07f0470..000000000000
--- a/games-emulation/kigb/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX kigb 328 BLAKE2B 203e8a844831400c1b4569c9faa4b59a48a5ddd4ca9084c3967298b2aaca204b1490165c3b2b8dfe22fd1a24b22857e97925e474e735059788682ff0c690cc4d SHA512 4316e4b6ece9ce9d1f8e36a1d69d4a3c33ee635c4758ce8e4a6b85b3a13a1cae703340e2479e6615b655312db33c21d8d7ee84233049e63716e83efed1cc3128
-DIST kigb_lin.tar.gz 477324 BLAKE2B 4e15c77bd5a0e1ff0740bd6af53548e54c3dfc7d27ba07290201d11793e38015f12266e169969511f3852cf8742055ea491ce57213e7aefde5ed8b99b1f2e985 SHA512 ca8b10cc05884c92157dde2b034c7e95f28ed7eed771d0383265f942f0cacea791284516b551e96ba07a035068a7039c8faa19ec417ee117b6a350692bbff01d
-EBUILD kigb-2.02.ebuild 863 BLAKE2B bd855bafb96aeb48eab2850042a3830f15e3c6f8df8526cb0e4a7b3c8e1ec8dd652553a9d180c0fed24992346096cfcb763869c36c17fed2334454d9a1469630 SHA512 63f5dfa4e78caf5ec72a06a3d447eb290371237444c4594ffc1acef8d4cc9a8dab99e4f870c6d610807f6d7f3c9ca7b8e1afff72405d4ab92b10071e076a4969
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-emulation/kigb/files/kigb b/games-emulation/kigb/files/kigb
deleted file mode 100644
index c07095bb53ee..000000000000
--- a/games-emulation/kigb/files/kigb
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-kigb_dir="${HOME}/.kigb"
-
-if [[ ! -d "${kigb_dir}" ]] ; then
-	mkdir -p "${kigb_dir}"
-	cd "${kigb_dir}"
-	mkdir cfg inp rom save snap state
-	ln -s GENTOODIR/kigb/kigb kigb
-fi
-
-cd "${kigb_dir}"
-exec ./kigb "$@"
diff --git a/games-emulation/kigb/kigb-2.02.ebuild b/games-emulation/kigb/kigb-2.02.ebuild
deleted file mode 100644
index bbccc19ef464..000000000000
--- a/games-emulation/kigb/kigb-2.02.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit games
-
-DESCRIPTION="A Gameboy (GB, SGB, GBA) Emulator for Linux"
-HOMEPAGE="http://kigb.emuunlim.com/"
-SRC_URI="http://kigb.emuunlim.com/${PN}_lin.tar.gz"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~x86"
-IUSE=""
-RESTRICT="mirror bindist strip"
-
-RDEPEND="x11-libs/libXext
-	sys-libs/zlib
-	dev-games/hawknl
-	=virtual/libstdc++-3*"
-
-S=${WORKDIR}
-
-src_prepare() {
-	# use the system version
-	rm -f libNL.so*
-	# wrapper script creates these in the users' home directories.
-	rm -rf cfg inp snap state rom save
-	cp "${FILESDIR}/kigb" "${T}/" || die
-	sed -i \
-		-e "s:GENTOODIR:${GAMES_PREFIX_OPT}:" "${T}/kigb" || die
-}
-
-src_install() {
-	dogamesbin "${T}/kigb"
-	exeinto "${GAMES_PREFIX_OPT}/${PN}"
-	doexe kigb
-	dodoc doc/*
-	prepgamesdirs
-}
diff --git a/games-emulation/kigb/metadata.xml b/games-emulation/kigb/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-emulation/kigb/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index ed229fa815d8..f2d253252596 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,5 +1,6 @@
 AUX pcsx2-1.4.0-gcc5.patch 694 BLAKE2B d523ed4b60730d38febceda5a4ddea3aad96788184cbc19e1d983a37524d63618ce45009fba555f31f75c8a325156ae0cbfff74531c469add6c867ffc73f47e8 SHA512 c95b5abd255f4d0a1d9efa8b45126fea2c57ed2110358687a14d44c5ccc8f670f33a5e9b56bd9e3ea4806ad2429a84b70d796bec9c909262379bba5914e7d51d
+AUX pcsx2-1.4.0-xgetbv.patch 1361 BLAKE2B f6e28703f59dbf79c38812e9a61828f1c40b00982e86b7f3d8b507c54a331b38febbafc98012bc43a84b5ba077af56d73cfb9f1c036c0b619ace1129b91ad031 SHA512 03bc1059dbca73382c3d708e92eef270bbf7958736010d8ffcb92c81972e34e1603007b2aad41b70694791760f9323353815f3468392e39e3893c06327824022
 DIST pcsx2-1.4.0.tar.gz 15108326 BLAKE2B 6601019f9bd038d8cb3ed5ebd47daa5b645e537d028581c1235f9ab03f59d281639913ef037be3ef380a76bd48ea4f8728b0339fafcd331b4cfa41681dbcabd0 SHA512 87ae8bdebcaf015ba03c23056bcab32b13d6726a6c3f05e62ef54f472114399debfcfcda4208b066519c2d20345a1bb8c55582eb342dccc168f410687f3766fb
-EBUILD pcsx2-1.4.0.ebuild 2863 BLAKE2B 8f3db9fbbf1062dc9f0c8e795c6030bb1e2408e37f26e0d4fc08d3a68f53fea3cce300d3097ab2ae870bc5038023618f9ff9345d8bc4af6b56259c35ddc322cf SHA512 4d1e1c48d64b8c2e538adf546ac8f9767224d3fdf4d326b72546602e464b6ceced4b0defcd140e6934b5df69ac29a38179ebe12476b6278c60916aafaab7da0a
+EBUILD pcsx2-1.4.0.ebuild 2897 BLAKE2B 29580f7dcc52243cfba39b6cff4c0cec2105d0517fb12686d4fa2643a8899b341b40f8cf2a8da33a7d77d2bd3f5f6e47e3648fe16b4eb902d5f01cfaef31e0c2 SHA512 a015bc26554976d1c5f9a3903cd090aaf4eec5f6aa4ce9a0d991fc2dcb71371f0ce8ee358b20d3f0f7e9f40fd82a87197601cc64694f2df8839641e08713e991
 EBUILD pcsx2-9999.ebuild 2748 BLAKE2B 7269d9dfe2be80399909b3399ca0a2918e6711cea0a95400e338b6ea1bb2ca688a91d67ec222969487ca17298540496caa33a65a3779d459ac244644b62a98fa SHA512 9f05e4bab5761623335212e94d73a1f12135309c78d846d7d8b13090d3ee365e98fb4dcc305463e82e635485b1e9a75e240e6e7d63fad2224366984bfd7d0f01
 MISC metadata.xml 502 BLAKE2B 26415faa56f60d794446f9354475331a0006a25cfa380fc69aabd3adc01622c425b934ebd94bbc283d749f7a06ef9ddcc123371aefc33b4b6ae0ce5b14c907d3 SHA512 1b095d48c5f126e53f865b982fa337dc25ce736ffda219c0812d86d9120c928d577b588a4587b9eea4c0315bfec67fbd4b281b224182ef2cb8ffb0c231dd83d3
diff --git a/games-emulation/pcsx2/files/pcsx2-1.4.0-xgetbv.patch b/games-emulation/pcsx2/files/pcsx2-1.4.0-xgetbv.patch
new file mode 100644
index 000000000000..e90b0df9b6e2
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.4.0-xgetbv.patch
@@ -0,0 +1,26 @@
+From 171e7f016dc9e132f9faf40a22f0312d45d356a5 Mon Sep 17 00:00:00 2001
+From: Jonathan Li <jonathan.li@hotmail.co.uk>
+Date: Fri, 11 May 2018 01:42:27 +0100
+Subject: [PATCH] common: Work around GCC8 _xgetbv bug
+
+clang and earlier GCC versions do not provide the _xgetbv intrinsic.
+GCC8 does, but unfortunately it's broken.
+(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85684).
+
+Re-use our _xgetbv implementation to avoid the bug, but rename it to
+avoid compilation errors as well.
+---
+ common/include/x86emitter/x86_intrin.h | 7 ++++---
+ common/src/x86emitter/cpudetect.cpp    | 2 +-
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+--- a/common/include/intrin_x86.h
++++ b/common/include/intrin_x86.h
+@@ -107 +107 @@ static __inline__ __attribute__((always_inline)) void __cpuidex(int CPUInfo[], c
+-static __inline__ __attribute__((always_inline)) unsigned long long _xgetbv(unsigned int index)
++static __inline__ __attribute__((always_inline)) unsigned long long _xgetbv_pcsx2(unsigned int index)
+--- a/common/src/x86emitter/cpudetect.cpp
++++ b/common/src/x86emitter/cpudetect.cpp
+@@ -273 +276 @@ void x86capabilities::Identify()
+-		if((_xgetbv(0) & 6) == 6) // XFEATURE_ENABLED_MASK[2:1] = '11b' (XMM state and YMM state are enabled by OS).
++		if((_xgetbv_pcsx2(0) & 6) == 6) // XFEATURE_ENABLED_MASK[2:1] = '11b' (XMM state and YMM state are enabled by OS).
diff --git a/games-emulation/pcsx2/pcsx2-1.4.0.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0.ebuild
index cfd1606f91af..ac18cbd565e4 100644
--- a/games-emulation/pcsx2/pcsx2-1.4.0.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -43,7 +43,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
-PATCHES=( "${FILESDIR}"/${P}-gcc5.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc5.patch
+	"${FILESDIR}"/${P}-xgetbv.patch
+)
 
 clean_locale() {
 	rm -R "${S}"/locales/"${1}" || die
diff --git a/games-emulation/raine/Manifest b/games-emulation/raine/Manifest
deleted file mode 100644
index 458c32e8cc7e..000000000000
--- a/games-emulation/raine/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX raine-0.51.9-ldflags.patch 436 BLAKE2B c74bce3d761358d4ff0e469b197e4eb8b1632d59ae2508ff54061b8fd14daba8547079866b91dd7149ad581222672ffdee028955fe26ee006d75f75079e9e993 SHA512 d4b6e1ce4a6ede3c17f0b6aac5a556e52eada51c75381bca7c0fbb48ec105d0a332392837de0182ab361f6e7a44258a2bf87c0010301ef201a22980f055d9e6e
-AUX raine-0.51.9-libpng15.patch 296 BLAKE2B 464b855426c405ba7d98e17c9df2cf89d395aa61ddb179252da300de378e6fd6c2d6b8e5223ed796d9680d6bcf7bb8cc2339c7e8912f464d17c7dbb1b04ba377 SHA512 6e15b001a2a113605ae5c7d026865b8aaef38cbfe57b471624687de1f904fd26618ef1b1156d3d50ad5f39710d2122a4f90ae9f30358f3d955a4a9ea223db1b2
-AUX raine-0.51.9-underlink.patch 483 BLAKE2B cf6759591fe406a65a6466b9cbf1bcb4bf3ab7fc1236dcbe0c7a729e0047e51302abd528b8fdecdf2d8704d24a80f35eb1d4200cb3ba3c298bc92964858d6cb4 SHA512 72ded715c9e1c7b92d6cb8e3e6ccc339de050a36fe777681db39e8910e6f7734ba6f6e80708f93f6f8f078f268412b4f27fcd877c7b012ed3a630ee0d94ba023
-DIST raines-0.51.9.tar.bz2 2095980 BLAKE2B df83e0869229fc832e356d5cd122c737bfafe3b4ee8b8914cb14e30b9f48b97145123f989e36a2a01243bc62d2f49f50e5e43f2da2a433751410f72a23edd315 SHA512 e21346d72c63d8ba1bc6832bd885fa9ec0865c788742e572ef9941d3a4fd3f23710d076253d7a50878ef512ff3024e57098c0ba28c0c794bdefa994b8b7780bf
-EBUILD raine-0.51.9.ebuild 1331 BLAKE2B 7093b566c9c3a38360ba8909ca3f58f74121599bb55fa6aa65133451894d51a5c3421492711ff4a3ffa13d618d8f63b782d1682b3135d82356b05812b776e5a5 SHA512 9f6224b331a030825873736c2952e754b7732117339d973f4a950d387f3a4b6918332b380dfbcb6cc9eba570c1dd6d47356a87941a7a0d4cd46d93724d598130
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-emulation/raine/files/raine-0.51.9-ldflags.patch b/games-emulation/raine/files/raine-0.51.9-ldflags.patch
deleted file mode 100644
index f011cd6a1e5c..000000000000
--- a/games-emulation/raine/files/raine-0.51.9-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- makefile.old	2010-10-08 10:04:46.000000000 +0200
-+++ makefile	2010-10-08 10:05:25.000000000 +0200
-@@ -995,7 +995,7 @@
- else
- 	@echo Linking Raine...
- endif
--	$(LDV) $(LFLAGS) -g -Wall -Wno-write-strings -o $(RAINE_EXE) $(OBJS) $(LIBS) -lstdc++
-+	$(LDV) $(LDFLAGS) $(LFLAGS) -g -Wall -Wno-write-strings -o $(RAINE_EXE) $(OBJS) $(LIBS) -lstdc++
- 
- converter: source/bonus/converter.c
- 	$(CCV) $(CFLAGS) -c $< -o $(OBJDIR)/converter.o
diff --git a/games-emulation/raine/files/raine-0.51.9-libpng15.patch b/games-emulation/raine/files/raine-0.51.9-libpng15.patch
deleted file mode 100644
index 675df24801dc..000000000000
--- a/games-emulation/raine/files/raine-0.51.9-libpng15.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/388255
-
---- source/savepng.c
-+++ source/savepng.c
-@@ -203,7 +203,7 @@
- 	goto Error;
- 
-     /* Set error handling. */
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
- 	/* If we get here, we had a problem reading the file. */
- 	goto Error;
-     }
diff --git a/games-emulation/raine/files/raine-0.51.9-underlink.patch b/games-emulation/raine/files/raine-0.51.9-underlink.patch
deleted file mode 100644
index e9eb42bedbb3..000000000000
--- a/games-emulation/raine/files/raine-0.51.9-underlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- makefile.old	2011-06-16 08:25:35.000000000 +0200
-+++ makefile	2011-06-16 08:25:57.000000000 +0200
-@@ -294,7 +294,7 @@
-    LIBS_DEBUG = -lz `allegro-config --libs ` `libpng-config --ldflags` 
-    LIBS_STATIC = -lz `allegro-config --static` `libpng-config --static --ldflags`
- else
--   LIBS = -lz `libpng-config --ldflags` 
-+   LIBS = -lz -lm `libpng-config --ldflags` 
-    LIBS_DEBUG = -lz `libpng-config --ldflags`
-    LIBS_STATIC = -lz `libpng-config --static --ldflags`
- endif
diff --git a/games-emulation/raine/metadata.xml b/games-emulation/raine/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-emulation/raine/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/games-emulation/raine/raine-0.51.9.ebuild b/games-emulation/raine/raine-0.51.9.ebuild
deleted file mode 100644
index 5aaef97c6506..000000000000
--- a/games-emulation/raine/raine-0.51.9.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic eutils games
-
-DESCRIPTION="R A I N E  M680x0 Arcade Emulation"
-HOMEPAGE="http://rainemu.swishparty.co.uk/"
-SRC_URI="http://rainemu.swishparty.co.uk/html/archive/raines-${PV}.tar.bz2"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="dev-cpp/muParser
-	media-libs/libsdl[sound,joystick,video]
-	sys-libs/zlib
-	media-libs/sdl-image[png]
-	media-libs/sdl-ttf"
-DEPEND="${RDEPEND}
-	dev-lang/nasm
-	app-arch/unzip"
-
-src_prepare() {
-	echo > detect-cpu
-	echo > cpuinfo
-	sed -i \
-		-e "/^NEO/s:^:#:" \
-		-e "s:nasmw:nasm:" \
-		-e "/bindir/s:=.*:=\$(DESTDIR)${GAMES_BINDIR}:" \
-		-e "/sharedir =/s:=.*:=\$(DESTDIR)${GAMES_DATADIR}:" \
-		-e "/mandir/s:=.*:=\$(DESTDIR)/usr/share/man/man6:" \
-		makefile || die
-	epatch "${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-underlink.patch \
-		"${FILESDIR}"/${P}-libpng15.patch
-	has_version '>=sys-libs/zlib-1.2.5.1-r1' && \
-		sed -i -e '1i#define OF(x) x' source/mini-unzip/ioapi.h
-	append-ldflags -Wl,-z,noexecstack
-}
-
-src_compile() {
-	local myopts
-
-	emake \
-		_MARCH="${CFLAGS}" \
-		VERBOSE=1 \
-		${myopts}
-}
-
-src_install() {
-	default
-	keepdir "${GAMES_DATADIR}"/${PN}/{roms,artwork,emudx,scripts/raine}
-	dodoc docs/readme.txt
-	prepgamesdirs
-}