gentoo resync : 21.01.2018

15 files changed, 427 insertions, 347 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 9807b9dc1809..bdad14cfd37f 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/higan/Manifest b/games-emulation/higan/Manifest
index 85385282019a..185cf6b091f5 100644
--- a/games-emulation/higan/Manifest
+++ b/games-emulation/higan/Manifest
@@ -1,5 +1,10 @@
 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.ebuild 3097 BLAKE2B 5805587f88044b44b3d6858c049a5e3769d786db5e00522c88bb7a40bf73d63a5eb9f3c40f0600b2160b7273de90c7f199bb52c88565fee2515e203435fd06f8 SHA512 1208b4d5283bb8deb64b77bf8bf0dd8afb536475a0ff489ec83a8c3def50239e62d0ec9f3d264e20552f4ce899c00ae16c481078932bd9ba5dd92aae47c56061
 MISC metadata.xml 377 BLAKE2B aefc33327d342c730de8b2bdd95c2299692c894fd67a3f43d378964e7b776e467d2a4644777e7c8a1eb94b41ee300a65cad084decf64fc02abbac8c02de509c1 SHA512 2faa3ffcca01d5740a5ca1c4f554c51e90e81c6c19cde15cf817c448debb5585e09a1b784d94e3ecd06321ed28a740ce846f1afbd149bce590ca69ef5b1ce9f4
diff --git a/games-emulation/higan/files/higan-106_p1-QA.patch b/games-emulation/higan/files/higan-106_p1-QA.patch
new file mode 100644
index 000000000000..140fdf9a48e7
--- /dev/null
+++ b/games-emulation/higan/files/higan-106_p1-QA.patch
@@ -0,0 +1,117 @@
+From 3ca37e53f22bfbb4ef436829904dc75b1f4940ec Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 21 Jan 2018 11:16:53 +0100
+Subject: [PATCH] Quickport higan-099-QA.patch to v106r1
+
+---
+ higan/GNUmakefile               |  5 ++---
+ higan/target-tomoko/GNUmakefile |  6 +++---
+ icarus/GNUmakefile              |  4 ++--
+ nall/GNUmakefile                | 19 -------------------
+ 4 files changed, 7 insertions(+), 27 deletions(-)
+
+diff --git a/higan/GNUmakefile b/higan/GNUmakefile
+index 5eac824..2616ed1 100644
+--- a/higan/GNUmakefile
++++ b/higan/GNUmakefile
+@@ -26,7 +26,6 @@ else ifneq ($(filter $(platform),linux bsd),)
+   flags += -fopenmp
+   link += -fopenmp
+   ifeq ($(binary),application)
+-    flags += -march=native
+     link += -Wl,-export-dynamic
+     link += -lX11 -lXext
+   else ifeq ($(binary),library)
+@@ -40,9 +39,9 @@ endif
+ 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 $@ \
+       ) \
+     ) \
+   )
+diff --git a/higan/target-tomoko/GNUmakefile b/higan/target-tomoko/GNUmakefile
+index bfdcbe2..bdb6d44 100644
+--- a/higan/target-tomoko/GNUmakefile
++++ b/higan/target-tomoko/GNUmakefile
+@@ -48,10 +48,10 @@ objects := $(ui_objects) $(objects)
+ 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)/)
+@@ -67,7 +67,7 @@ obj/ui-resource.o:
+ 
+ # targets
+ build: $(objects)
+-	$(strip $(compiler) -o out/$(name) $(objects) $(link))
++	$(strip $(compiler) $(CXXFLAGS) -o out/$(name) $(objects) $(link))
+ ifeq ($(platform),macos)
+ 	@if [ -d out/$(name).app ]; then rm -r out/$(name).app; fi
+ 	mkdir -p out/$(name).app/Contents/MacOS/
+diff --git a/icarus/GNUmakefile b/icarus/GNUmakefile
+index d01465e..999c004 100644
+--- a/icarus/GNUmakefile
++++ b/icarus/GNUmakefile
+@@ -3,7 +3,7 @@ include ../nall/GNUmakefile
+ include ../hiro/GNUmakefile
+ 
+ name := icarus
+-flags += -I..
++flags += -I.. $(CXXFLAGS)
+ link +=
+ 
+ ifeq ($(platform),windows)
+@@ -15,7 +15,7 @@ objects += obj/icarus.o
+ objects += $(if $(call streq,$(platform),windows),obj/resource.o)
+ 
+ all: $(objects)
+-	$(strip $(compiler) -o out/$(name) $(objects) $(link) $(hirolink))
++	$(strip $(compiler) -o out/$(name) $(objects) $(link) $(hirolink) $(LDFLAGS))
+ ifeq ($(platform),macos)
+ 	@if [ -d out/$(name).app ]; then rm -r out/$(name).app; fi
+ 	mkdir -p out/$(name).app/Contents/MacOS/
+diff --git a/nall/GNUmakefile b/nall/GNUmakefile
+index f9865de..f864cde 100644
+--- a/nall/GNUmakefile
++++ b/nall/GNUmakefile
+@@ -59,25 +59,6 @@ ifeq ($(compiler),)
+   endif
+ endif
+ 
+-# build settings
+-ifeq ($(build),optimize)
+-  flags += -O3
+-else ifeq ($(build),release)
+-  flags += -O2
+-else ifeq ($(build),stable)
+-  flags += -O1
+-else ifeq ($(build),debug)
+-  flags += -g
+-else ifeq ($(build),profile)
+-  flags += -pg
+-  link += -pg
+-else ifeq ($(build),instrument)
+-  flags += -O3 -fprofile-generate
+-  link += -lgcov
+-else ifeq ($(build),optimize)
+-  flags += -O3 -fprofile-use
+-endif
+-
+ # clang settings
+ ifeq ($(findstring clang++,$(compiler)),clang++)
+   flags += -fno-strict-aliasing -fwrapv
+-- 
+2.16.0.rc2
+
diff --git a/games-emulation/higan/files/higan-106_p1-header-locations.patch b/games-emulation/higan/files/higan-106_p1-header-locations.patch
new file mode 100644
index 000000000000..7f72a1311491
--- /dev/null
+++ b/games-emulation/higan/files/higan-106_p1-header-locations.patch
@@ -0,0 +1,24 @@
+From 420b10135f678367560621416799c48af0ef3764 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 21 Jan 2018 11:44:22 +0100
+Subject: [PATCH] Patch header locations for Gentoo
+
+---
+ nall/GNUmakefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/nall/GNUmakefile b/nall/GNUmakefile
+index f864cde..41fdc08 100644
+--- a/nall/GNUmakefile
++++ b/nall/GNUmakefile
+@@ -82,6 +82,7 @@ endif
+ 
+ # linux settings
+ ifeq ($(platform),linux)
++  flags += -I/usr/include/cairo/ -I/usr/include/gtk-2.0/ -I/usr/include/gtksourceview-2.0/
+   link += -ldl
+ endif
+ 
+-- 
+2.16.0.rc2
+
diff --git a/games-emulation/higan/files/higan-106_p1-wrapper b/games-emulation/higan/files/higan-106_p1-wrapper
new file mode 100644
index 000000000000..1de577fd1923
--- /dev/null
+++ b/games-emulation/higan/files/higan-106_p1-wrapper
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -e
+[ -e "${HOME}"/.local/share/higan ] || mkdir "${HOME}"/.local/share/higan
+cp -ru /usr/share/higan/* "${HOME}"/.local/share/higan/
+exec ${0}.bin "$@"
diff --git a/games-emulation/higan/higan-106_p1.ebuild b/games-emulation/higan/higan-106_p1.ebuild
new file mode 100644
index 000000000000..c0d5d2586aea
--- /dev/null
+++ b/games-emulation/higan/higan-106_p1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnome2-utils toolchain-funcs qmake-utils
+
+MY_COMMIT=41efdba45afa770db99bc7484a8ad340ccc597d2
+
+DESCRIPTION="A multi-system game emulator formerly known as bsnes"
+HOMEPAGE="https://byuu.org/emulation/higan/ https://gitlab.com/higan/higan"
+SRC_URI="https://gitlab.com/higan/higan/repository/${MY_COMMIT}/archive.tar.bz2 -> ${P}.tar.bz2"
+
+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}/${PN}-${MY_COMMIT}-${MY_COMMIT}
+
+disable_module() {
+	sed -i \
+		-e "s|$1\b||" \
+		"${S}"/higan/target-tomoko/GNUmakefile || die
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-header-locations.patch
+	epatch "${FILESDIR}"/${P}-QA.patch
+
+	sed -i \
+		-e "/handle/s#/usr/local/lib#/usr/$(get_libdir)#" \
+		nall/dl.hpp || die "fixing libdir failed!"
+
+	eapply_user
+
+	# 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.xvideo
+	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}"
+}
+
+src_install() {
+	if use icarus; then
+		newbin "${S}"/icarus/out/icarus icarus
+	fi
+	newbin "${S}"/higan/out/${PN} ${PN}.bin
+	newbin "${FILESDIR}"/${P}-wrapper ${PN}
+	make_desktop_entry "${PN}" "${PN}"
+
+	# copy home directory stuff to a global location (matching "${FILESDIR}"/${P}-wrapper)
+	insinto /usr/share/${PN}
+	doins -r higan/systems/*.sys
+
+	doicon -s 512 higan/data/${PN}.png
+	doicon        higan/data/${PN}.svg
+}
+
+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)"
+
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
index 1d56f4b93089..028f09a313c4 100644
--- a/games-emulation/snes9x/Manifest
+++ b/games-emulation/snes9x/Manifest
@@ -2,5 +2,7 @@ AUX snes9x-1.53-cross-compile.patch 892 BLAKE2B 9fb806ad16d48d5f07f1ab84feb5f7ea
 AUX snes9x-1.54.1-build.patch 1525 BLAKE2B a5c3307d2dc59b57a0bc44b80c017d0096f7e3331a041cec6cf899b660886d81617ec03e36f5d64ef104a8281f2923b7236ad21c9c26ab52fcdefc9ebeeb959c SHA512 846b72f0733c13d2f7fb943f670943d20963a9f7666c016fc7e8f4e62afeb1ad479523cfc14fa93752f175b8cd44d599e300ace7a981d604b0284052d0914d12
 AUX snes9x-1.54.1-system-zlib.patch 7925 BLAKE2B 231ede4d63b3de7eba6933c05b852f269e6333f1f6db1cc631e73a9bf96fad5bf63489ca6de40c23b4b4cb29feabfc2d3759435ad0c17684911b9334f3fc234e SHA512 02026d5e59f7e016583d15996694aac41fb777541dcf426c8266a9136b59c022c3f13ea211473408d01c76b040af78d70cc5bba9d94a945823674d7f68beb482
 DIST snes9x-1.54.1.tar.gz 2186737 BLAKE2B b433a167035577ab785901acb65b9df289218fa214f664494e7f0559a1a843c9211f81bfea3add73c64c6f87e974b0964a86fa43433fa1b5c6e20a724d3aa320 SHA512 2a8fddc0b9044c0b7e10711b35c06555e280c93ddde3c101c4084f859079947acb209f2632ca08937fa2ca47932094040c4a7a60b6188354fd92f72dbdf854ed
+DIST snes9x-1.55.tar.gz 2252841 BLAKE2B 52b2e3d5539d95df63ef6f90c974895bc3a3dbe1e89b3a9513a8504eab308d4827f116ebc13fd89ac9c01f7394067eeddf7fd6f640fd071ee8558a6a79f2b56c SHA512 61d1d6f9c1fc4fbf6253ac7a7d214c771563d7d60238197b2f1525a58f8f9011446f400767d39ec464c69d80574a7dcd78557c8f47605df992af28cb107c0f6e
 EBUILD snes9x-1.54.1.ebuild 2679 BLAKE2B 2fd6a90eb94a351fcba1e698bf3730cba4719156299d258f5e5eb7b320eb1ed722a8db38e9798a56768375b58dbd6e4df593983ebfabfd2fa62631da40c715be SHA512 e15f019f095854a39b237dcaf04c6e04ef71d6a1fe63c860e2c91aa3013da22813d6d35fe02f4529acf8bca7b995eb8175aae8f8948adfff1e43a92896b2d988
+EBUILD snes9x-1.55.ebuild 2542 BLAKE2B 4c06bc430cf7c25f6629c12f831dafc6dd5ec0cce555522c18c8f6de9dda8f0f15a23f6b90338f8b660d849dd3b7e328c5319ae481a7bd90220c98d095381b8a SHA512 78fd5fc48433eebec5d117702aebe04c44f433a32e1455a17ab3999b1281f1e6f983727ce8ea657caef2675b2f4b57c6b798a3db595ae86a9decf176786f3f25
 MISC metadata.xml 560 BLAKE2B ed9f05b3f484347825048ae3d45e9a880e5b7405b229b7e15f350dbc43bfec51691c21e558ae87f630ed392e19ddfa5eaf3d9d15ddb551476d13d9fbf224f97b SHA512 3922d16510b8818739e582c8faf84287dc265f810df5957dc923efab912e20f95b7fb9fc84023d481b44ce6c653f2bc00e83d6a150d9294feeb60dc8c3a2eeca
diff --git a/games-emulation/snes9x/snes9x-1.55.ebuild b/games-emulation/snes9x/snes9x-1.55.ebuild
new file mode 100644
index 000000000000..cf70b572d8cf
--- /dev/null
+++ b/games-emulation/snes9x/snes9x-1.55.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic gnome2-utils
+
+DESCRIPTION="Super Nintendo Entertainment System (SNES) emulator"
+HOMEPAGE="https://github.com/snes9xgit/snes9x"
+SRC_URI="https://github.com/snes9xgit/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Snes9x GPL-2 GPL-2+ LGPL-2.1 LGPL-2.1+ ISC MIT ZLIB Info-ZIP"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
+IUSE="alsa debug gtk joystick multilib netplay nls opengl oss png pulseaudio portaudio +xv +xrandr"
+RESTRICT="bindist"
+
+RDEPEND="
+	sys-libs/zlib:=[minizip]
+	x11-libs/libX11
+	x11-libs/libXext
+	png? ( media-libs/libpng:0= )
+	gtk? (
+		>=x11-libs/gtk+-2.10:2
+		x11-misc/xdg-utils
+		portaudio? ( >=media-libs/portaudio-19_pre )
+		joystick? ( >=media-libs/libsdl-1.2.12[joystick] )
+		opengl? ( virtual/opengl )
+		xv? ( x11-libs/libXv )
+		xrandr? ( x11-libs/libXrandr )
+		alsa? ( media-libs/alsa-lib )
+		pulseaudio? ( media-sound/pulseaudio )
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xproto
+	gtk? ( virtual/pkgconfig
+		xv? ( x11-proto/videoproto ) )
+	nls? ( dev-util/intltool )"
+
+S="${WORKDIR}/${P}/unix"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.53-cross-compile.patch )
+
+src_prepare() {
+	cd "${WORKDIR}"/${P} || die
+	rm -r unzip || die
+	default
+	cd unix || die
+	eautoreconf
+	if use gtk; then
+		cd ../gtk || die
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	append-ldflags -Wl,-z,noexecstack
+
+	# build breaks when zlib/zip support is disabled
+	econf \
+		--enable-gzip \
+		--enable-zip \
+		--with-system-zip \
+		$(use_enable joystick gamepad) \
+		$(use_enable debug debugger) \
+		$(use_enable netplay) \
+		$(use_enable png screenshot)
+
+	if use gtk; then
+		cd ../gtk || die
+		econf \
+			--with-zlib \
+			--with-system-zip \
+			$(use_enable nls) \
+			$(use_with opengl) \
+			$(use_with joystick) \
+			$(use_with xv) \
+			$(use_with xrandr) \
+			$(use_with netplay) \
+			$(use_with alsa) \
+			$(use_with oss) \
+			$(use_with pulseaudio) \
+			$(use_with portaudio) \
+			$(use_with png screenshot)
+	fi
+}
+
+src_compile() {
+	emake
+	use gtk && emake -C ../gtk
+}
+
+src_install() {
+	dobin ${PN}
+
+	dodoc ../docs/{snes9x.conf.default,{changes,control-inputs,controls,snapshots}.txt}
+
+	if use gtk; then
+		emake -C ../gtk DESTDIR="${D}" install
+		dodoc ../gtk/{AUTHORS,doc/README}
+	fi
+
+	docinto html
+	dodoc {.,..}/docs/*.html
+}
+
+pkg_preinst() {
+	use gtk && gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use gtk && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_icon_cache_update
+}
diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index 3c730fd5c90d..5a1d4154248f 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -1,11 +1,6 @@
-AUX vbam-2.0.0_beta2-fix-install-path-bin.patch 475 BLAKE2B a08a94cf0db76d7e70e89c5c1b19b226a167db2925c92d6df7f1f6b0c8f115f1f2c4a1a1d1e413c678bde458742e601ae7b5aa65e0e041575e8beaff10a877a8 SHA512 70a4dd2473a7156d1fdf5322f96827835423c615d83abe5ca7b7538f303f9f0d8daa2e8da153460939ed98883c77d26f288a00eaca8e94c73410247059879d8e
-AUX vbam-2.0.0_beta2-fix-zlib-macros.patch 238 BLAKE2B 777accae17b4ad82b62c23ce1683bafb7b8a7ed72914a1cc539e55a3092791b309e02bf79b8ab0d9e9172c7288162e902ec3e73d025d9f5995eca40395375eaf SHA512 ea591ea9d3a5a766a4f5345b54af2e8d8406e2854d2769449568d1355af333d11d95fbc8351202d7673adad89e31b4427a10a39f2361d679d8fbf3e88ffbb29c
-AUX vbam-2.0.0_beta2-remove-hardcoded-flags.patch 6368 BLAKE2B 491238ca2c2e45c73a4a2fef951df289274ffbf06e8bd0fb33c9650c3c3a550581a6acd0d8662b0aa6770b93c9d4d04a070c55408b0ea4ee96cc239ce958bd67 SHA512 b51c54e543b3a3fe0d3a66e1219aeefcc1ee58eac65a9df12a4a5a7ef14c702d47b3cdfeb8d7903444afe12d531a5b2ed77bd36ab2277960ef8af6faea2a40d4
 AUX vbam-2.0.1-changelog-update.patch 3547 BLAKE2B cd9c3aaab79e4342d7bdbc903331ef0d7fd54b63422715e8d0dfe27cbbfcc729804ec018beb434faa9b89ca5bce417f382debfc74b111a5dae4e8974e2cec38f SHA512 792ad5848a373a0a5040132417e7a9eb4cccf3155e31beda61b6236edc80ce74018ad8d7bd67829c981b60a8940904629c64b3d392ca25d0bb58461d64e228e3
 AUX vbam-2.0.1-read-version-from-changelog.patch 2701 BLAKE2B cf9c826bc75fb956becb99decadc36e41a1944b64095729826e732341c36aef1df9ef73b424501e9d0dcb9e8146d50c0b91641237b2b3c83e13d2bb2ab375311 SHA512 2a1793c8c4f0dff020337eccc9ff94c357b8f1ce2dde8aab612c4a06b5adbfbf3261b91643bfdab958ddf77f2e5f751997840cdcd89dd4d77744de8caf1f4285
-DIST vbam-2.0.0_beta2_p20161211.tar.gz 3075570 BLAKE2B 69b1272f5e048fe96a7a6798a3f934395a607439ba3ede992f8d49557a4ea8ea64ed512f11440200548eb039d3b1f4b4129603e5a897f3e04fac48d4d39906f1 SHA512 1130a976e6e9e504af96ec9218cd35af10ded7ab184ec468ba40b641faaefac47cbb225c6221278031015081632be04ae125a2653379d2b08877f162c6cb4a40
 DIST vbam-2.0.1.tar.gz 2926632 BLAKE2B 3a2d44b76a9b03eadcce530a955e6b2ebde48340d8462e1ad339f4a02b1d19b8f8fbd0d9671f12eb5ed14ee600dba6e6bb6d167f9ca1cfb192ffb734ace72752 SHA512 d6cdc1ab1fbc20f81483fb4dc316d65dc9d7c0f378d5c85c1c5ca1251fbd1e7aad9f2f6bd5ecc2ff0b832e42c010cc82b9b1ec68bbb0a49aa8e00683fb5264bb
-EBUILD vbam-2.0.0_beta2_p20161211-r1.ebuild 2580 BLAKE2B e2e69c1c1906088b1eff9bed1a9ff8a26082ed4cf8e90188cbb11a3f2e64fd79de7aa2ad87a3d1cdb9f04965adc0d74e075f1bfb33807dce091a0d5aeb00ec16 SHA512 feb01ee124b29500b73e44da4b319572fe8a6ac7fe1f2e66bb072007bf786a2b0d7f9b2a447817ef665d95ce68219020ed7538400c741485dcc8c167db7e5cd8
-EBUILD vbam-2.0.1.ebuild 2366 BLAKE2B 33bda59f7558d59101cf34cf74d445fc56e73f3bb299e364eddf982f6a37628dd4b23d316172b9ee6d564901b40a11a6d32847f9c7eadfca62104cf9815c41c4 SHA512 afd5b1028b4fc9adbe75100a25f93ab5596b155f52926c78bc4e78ab9e62a9a29162aeb210a81c1742d85872431dd1fd844a8ef781e4692b866211a4d72f825f
-EBUILD vbam-9999.ebuild 2177 BLAKE2B f37220942362e8e0e74095924a5235eb27b49342b52a8b9a3558eebb0ae2f35f049518bb43bf444663a870907e969a2c66e61f7913a2590b6ab73125fedacf61 SHA512 7f2b286d17ec25edcb3e0b2c2d9ef1500d973bf19afa514a7fc8fba7c976e72806fd1e070dff4e6cf68b03beb54c8582cb4000292f5899733d9d71dac1dd9a2c
+EBUILD vbam-2.0.1-r1.ebuild 2243 BLAKE2B b76bb006b86d23077c09481277340c18dd06275cd8ceb0ae374d0fa4075cdce036950013787f74babd8730539faca14afd83e0878503a9901f2552d473df3387 SHA512 c49c9d5c71cef41b194a5ed229c2ec6405b2268a83e86ff654e183e598c6170f74628a1f187bc89faf06a258738f7109df4a956718a9e830caea8648cc86299c
+EBUILD vbam-9999.ebuild 2133 BLAKE2B 7cb6802db60dfb7e6686d6daa6c52d9bfa477ffd78b77b78a8c3bd955a6563950eab13ba762d99c4f7a1f466cfe224927c884fceb5144afd6a44e7c7edf8e269 SHA512 2026cbe925ea3159a82b47c1be373ef37e5236661fe15bd1f4d191073da3fab04e23cf7fac5d6540f03f3b29066119787c5d95270baad23ab9b260087c288e6c
 MISC metadata.xml 479 BLAKE2B e5a7706e8db6c8c05cf4cf691d294c4bd54f3cc7aee5af270cce39c2d924cc81cc97a1b3d3612c1cf95d0b4b485181717d0f0daeef11a21b0c7ce0cf4d9eafda SHA512 6bd2212bd5ae35dd11f35322879f067981cac94c0c2d8f0c87e1e67170b5df245bd3616e5bb076d2892453c8b75537ee15aab49134029c0daa31d89d8aedf1d0
diff --git a/games-emulation/vbam/files/vbam-2.0.0_beta2-fix-install-path-bin.patch b/games-emulation/vbam/files/vbam-2.0.0_beta2-fix-install-path-bin.patch
deleted file mode 100644
index ceb7dd94a0d0..000000000000
--- a/games-emulation/vbam/files/vbam-2.0.0_beta2-fix-install-path-bin.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/wx/CMakeLists.txt
-+++ b/src/wx/CMakeLists.txt
-@@ -247,6 +247,7 @@
-     INSTALL(PROGRAMS ${PROJECT_BINARY_DIR}/visualboyadvance-m${CMAKE_EXECUTABLE_SUFFIX} DESTINATION ${CMAKE_BINARY_DIR})
- ENDIF(WIN32)
- IF(NOT WIN32 AND NOT APPLE)
-+    INSTALL(PROGRAMS ${PROJECT_BINARY_DIR}/visualboyadvance-m${CMAKE_EXECUTABLE_SUFFIX} DESTINATION bin)
-     INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/wxvbam.desktop DESTINATION share/applications)
- ENDIF(NOT WIN32 AND NOT APPLE)
- 
diff --git a/games-emulation/vbam/files/vbam-2.0.0_beta2-fix-zlib-macros.patch b/games-emulation/vbam/files/vbam-2.0.0_beta2-fix-zlib-macros.patch
deleted file mode 100644
index 57b2a2563b16..000000000000
--- a/games-emulation/vbam/files/vbam-2.0.0_beta2-fix-zlib-macros.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/src/common/memgzio.c
-+++ b/src/common/memgzio.c
-@@ -1,3 +1,4 @@
-+#define OF(x) x
- /* gzio.c -- IO on .gz files
-  * Copyright (C) 1995-2002 Jean-loup Gailly.
-  * For conditions of distribution and use, see copyright notice in zlib.h
diff --git a/games-emulation/vbam/files/vbam-2.0.0_beta2-remove-hardcoded-flags.patch b/games-emulation/vbam/files/vbam-2.0.0_beta2-remove-hardcoded-flags.patch
deleted file mode 100644
index 5afc73e6b930..000000000000
--- a/games-emulation/vbam/files/vbam-2.0.0_beta2-remove-hardcoded-flags.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-Remove hardcoded flags. This inhibits user flags, which is required by QA.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -3,10 +3,6 @@
- 
- cmake_minimum_required( VERSION 3.3.2 )
- 
--IF(CMAKE_BUILD_TYPE STREQUAL "")
--    SET(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build Type" FORCE)
--ENDIF()
--
- SET(ALL_TARGETS fex gvbam visualboyadvance-m vbamcore vbam)
- 
- if( COMMAND cmake_policy )
-@@ -28,6 +24,11 @@
- SET(ASM_SCALERS_DEFAULT OFF)
- SET(MMX_DEFAULT OFF)
- 
-+# Require C++11 support
-+SET(CMAKE_CXX_STANDARD 11)
-+SET(CMAKE_CXX_STANDARD_REQUIRED ON)
-+SET(CMAKE_CXX_EXTENSIONS OFF)
-+
- # turn asm on by default on 32bit x86
- IF(CMAKE_SYSTEM_PROCESSOR MATCHES "[xX]86|[aA][mM][dD]64|[xX]64")
-     IF(CMAKE_C_SIZEOF_DATA_PTR EQUAL 4) # 32 bit
-@@ -101,12 +102,6 @@
-     endif(EXISTS ${PROJECT_SOURCE_DIR}/.git)
- ENDIF( NOT VERSION )
- 
--IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
--    ADD_DEFINITIONS(-DDEBUG)
--ELSE()
--    ADD_DEFINITIONS(-DNDEBUG)
--ENDIF()
--
- # Add support for Homebrew, MacPorts and Fink on OS X
- IF(APPLE)
-     INCLUDE(MacPackageManagers)
-@@ -261,96 +256,9 @@
-     INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/dependencies/include")
- ENDIF()
- 
--# Compiler flags
--
--IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
--    SET(LTO_FLAG "")
--    IF(ENABLE_LTO)
--        IF(CMAKE_COMPILER_IS_GNUCXX)
--            SET(LTO_FLAG -flto=10)
--        ELSE()
--            SET(LTO_FLAG -flto)
--        ENDIF()
--    ENDIF(ENABLE_LTO)
--
--    # common optimization flags
--    SET(MY_C_AND_CXX_OPT_FLAGS -O2 -mtune=generic -fomit-frame-pointer ${LTO_FLAG})
--
--    # common debug flags
--    IF(CMAKE_COMPILER_IS_GNUCXX)
--        SET(MY_C_AND_CXX_DBG_FLAGS -ggdb3 -Og)
--    ELSE()
--        SET(MY_C_AND_CXX_DBG_FLAGS -g)
--    ENDIF()
--
--    # common flags
--    SET(MY_C_AND_CXX_FLAGS -pipe -fPIC -Wformat -Wformat-security -fstack-protector-strong --param ssp-buffer-size=4 -fexceptions -D_FORTIFY_SOURCE=2 -feliminate-unused-debug-types)
--
--    SET(MY_C_FLAGS   ${MY_C_FLAGS}   ${MY_C_AND_CXX_FLAGS})
--    SET(MY_CXX_FLAGS ${MY_CXX_FLAGS} ${MY_C_AND_CXX_FLAGS})
--
--    IF(MINGW)
--        SET(MY_C_FLAGS   ${MY_C_FLAGS}   -static-libgcc)
--        SET(MY_CXX_FLAGS ${MY_CXX_FLAGS} -static-libgcc -static-libstdc++)
--    ENDIF(MINGW)
--
--    IF(CMAKE_BUILD_TYPE STREQUAL Debug)
--        SET(MY_C_FLAGS   ${MY_C_FLAGS}   ${MY_C_AND_CXX_DBG_FLAGS} -Wall)
--        SET(MY_CXX_FLAGS ${MY_CXX_FLAGS} ${MY_C_AND_CXX_DBG_FLAGS} -Wall)
--    ELSE()
--        SET(MY_C_FLAGS   ${MY_C_FLAGS}   ${MY_C_AND_CXX_OPT_FLAGS} -Wno-error)
--        SET(MY_CXX_FLAGS ${MY_CXX_FLAGS} ${MY_C_AND_CXX_OPT_FLAGS} -Wno-error)
--    ENDIF()
--
--    FOREACH(C_COMPILE_FLAG ${MY_C_FLAGS})
--        ADD_COMPILE_OPTIONS($<$<COMPILE_LANGUAGE:C>:${C_COMPILE_FLAG}>)
--    ENDFOREACH()
--
--    FOREACH(CXX_COMPILE_FLAG ${MY_CXX_FLAGS})
--        ADD_COMPILE_OPTIONS($<$<COMPILE_LANGUAGE:CXX>:${CXX_COMPILE_FLAG}>)
--    ENDFOREACH()
--
--    # make a string of compile options to add to link flags
--    UNSET(C_COMPILE_FLAGS_STR)
--    UNSET(CXX_COMPILE_FLAGS_STR)
--
--    FOREACH(ARG ${MY_C_FLAGS})
--        SET(C_COMPILE_FLAGS_STR "${C_COMPILE_FLAGS_STR} ${ARG}")
--    ENDFOREACH()
--
--    FOREACH(ARG ${MY_CXX_FLAGS})
--        SET(CXX_COMPILE_FLAGS_STR "${CXX_COMPILE_FLAGS_STR} ${ARG}")
--    ENDFOREACH()
--
--    # need all flags for linking, because of -flto etc.
--    SET(CMAKE_C_LINK_EXECUTABLE   "${CMAKE_C_LINK_EXECUTABLE}   ${C_COMPILE_FLAGS_STR}")
--    SET(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} ${CXX_COMPILE_FLAGS_STR}")
--
--    # for the gcc -fstack-protector* flags we need libssp
--    # we also have to use the gcc- binutils for LTO to work
--    IF(CMAKE_COMPILER_IS_GNUCXX)
--        INCLUDE(UseGCCBinUtilsWrappers)
--
--        IF(WIN32)
--            SET(SSP_STATIC ON)
--        ENDIF(WIN32)
--
--        FIND_PACKAGE(SSP)
--
--        IF(SSP_LIBRARY)
--            SET(CMAKE_C_LINK_EXECUTABLE   "${CMAKE_C_LINK_EXECUTABLE}   ${SSP_LIBRARY}")
--            SET(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} ${SSP_LIBRARY}")
--        ENDIF(SSP_LIBRARY)
--
--        SET(CMAKE_C_LINK_EXECUTABLE   "${CMAKE_C_LINK_EXECUTABLE}   -Wl,-allow-multiple-definition")
--        SET(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} -Wl,-allow-multiple-definition")
--    ENDIF()
--ENDIF()
--
- # Assembler flags
--
- IF(ASM_ENABLED)
--    FOREACH(ASM_FLAG -I${CMAKE_SOURCE_DIR}/src/filters/hq/asm/ -O1 -w-orphan-labels)
-+    FOREACH(ASM_FLAG -I${CMAKE_SOURCE_DIR}/src/filters/hq/asm/ -w-orphan-labels)
-         ADD_COMPILE_OPTIONS($<$<COMPILE_LANGUAGE:ASM_NASM>:${ASM_FLAG}>)
-     ENDFOREACH()
- ENDIF(ASM_ENABLED)
---- a/src/gtk/CMakeLists.txt
-+++ b/src/gtk/CMakeLists.txt
-@@ -1,6 +1,3 @@
--#Do not use this file directly.  Always use the top level CMakeLists.txt file
--SET( CMAKE_CXX_FLAGS -std=gnu++11 )
--
- #GTK dependencies
- FIND_PACKAGE ( PkgConfig REQUIRED )
- FIND_PACKAGE ( Gettext REQUIRED )
---- a/src/wx/CMakeLists.txt
-+++ b/src/wx/CMakeLists.txt
-@@ -1,7 +1,3 @@
--#Do not use this file directly.  Always use the top level CMakeLists.txt file
--# This build is much easier if we just do it here.
--SET( CMAKE_CXX_FLAGS -std=gnu++11 )
--
- # not yet implemented
- SET(CAIRO_DEFAULT OFF)
- 
-@@ -46,15 +42,6 @@
-     ADD_DEFINITIONS (-DNO_OAL)
- endif(ENABLE_OPENAL)
- 
--IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
--    SET(wxWidgets_USE_DEBUG ON) # noop if wx is compiled with --disable-debug, like in Mac Homebrew atm
--
--    # and if this is the case, we can't set debug level without link failing
--    IF(NOT wxWidgets_DEFINITIONS MATCHES "-DwxDEBUG_LEVEL=0")
--        ADD_DEFINITIONS(-DwxDEBUG_LEVEL=1)
--    ENDIF()
--ENDIF()
--
- IF(APPLE)
-     SET(wxWidgets_USE_STATIC ON)
- ENDIF(APPLE)
-@@ -256,13 +243,6 @@
-     SET_PROPERTY(TARGET visualboyadvance-m APPEND PROPERTY MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/wxplist.in)
-     SET(MACOSX_BUNDLE_ICON_FILE ${VBAM_ICON})
-     SET_SOURCE_FILES_PROPERTIES(${VBAM_ICON_PATH} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
--
--    # budle dylibs and relink them for releasing .app
--    # but only in Release mode
--    IF(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
--        ADD_CUSTOM_COMMAND(TARGET visualboyadvance-m POST_BUILD
--            COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tools/osx/third_party_libs_tool "$<TARGET_FILE_DIR:visualboyadvance-m>/../..")
--    ENDIF()
- endif(APPLE)
- 
- SET(WX_EXE_NAME visualboyadvance-m-wx${CMAKE_EXECUTABLE_SUFFIX})
diff --git a/games-emulation/vbam/vbam-2.0.0_beta2_p20161211-r1.ebuild b/games-emulation/vbam/vbam-2.0.0_beta2_p20161211-r1.ebuild
deleted file mode 100644
index 21315294a29e..000000000000
--- a/games-emulation/vbam/vbam-2.0.0_beta2_p20161211-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-inherit cmake-utils wxwidgets gnome2-utils fdo-mime
-
-if [[ ${PV} == 9999 ]]; then
-	ESVN_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
-	inherit git
-else
-	SRC_URI="https://github.com/visualboyadvance-m/visualboyadvance-m/archive/c2165287938aea2306a75f0714744a6d23ba7dab.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
-	inherit vcs-snapshot
-fi
-
-DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
-HOMEPAGE="http://vba-m.com/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="cairo ffmpeg gtk link lirc nls openal +sdl wxwidgets"
-REQUIRED_USE="|| ( sdl gtk wxwidgets )"
-
-RDEPEND="media-libs/libpng:0=
-	media-libs/libsdl2[sound]
-	sys-libs/zlib
-	virtual/glu
-	virtual/opengl
-	link? ( >=media-libs/libsfml-2.0 )
-	ffmpeg? ( virtual/ffmpeg[-libav] )
-	lirc? ( app-misc/lirc )
-	nls? ( virtual/libintl )
-	sdl? ( media-libs/libsdl[joystick,opengl] )
-	gtk? ( >=dev-cpp/glibmm-2.4.0:2
-		>=dev-cpp/gtkmm-2.4.0:2.4
-		>=dev-cpp/gtkglextmm-1.2.0 )
-	wxwidgets? (
-		cairo? ( x11-libs/cairo )
-		openal? ( media-libs/openal )
-		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-	)"
-DEPEND="${RDEPEND}
-	wxwidgets? ( virtual/imagemagick-tools )
-	x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-PATCHES=(
-	# fix issue with zlib-1.2.5.1 macros (bug #383179)
-	"${FILESDIR}"/${PN}-2.0.0_beta2-fix-zlib-macros.patch
-	"${FILESDIR}"/${PN}-2.0.0_beta2-fix-install-path-bin.patch
-	"${FILESDIR}"/${PN}-2.0.0_beta2-remove-hardcoded-flags.patch
-)
-
-src_configure() {
-	use wxwidgets && setup-wxwidgets
-	local mycmakeargs=(
-		-DENABLE_CAIRO=$(usex cairo)
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_GTK=$(usex gtk)
-		-DENABLE_LINK=$(usex link)
-		-DENABLE_LIRC=$(usex lirc)
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_OPENAL=$(usex openal)
-		-DENABLE_SDL=$(usex sdl)
-		-DENABLE_WX=$(usex wxwidgets)
-		-DENABLE_ASM_CORE=$(usex x86)
-		-DENABLE_ASM_SCALERS=$(usex x86)
-		-DCMAKE_SKIP_RPATH=ON
-		-DDATA_INSTALL_DIR=share/${PN}
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use sdl && dodoc doc/ReadMe.SDL.txt
-}
-
-pkg_preinst() {
-	[[ ${PV} == *9999 ]] && subversion_pkg_preinst
-
-	if use gtk || use wxwidgets ; then
-		gnome2_icon_savelist
-	fi
-}
-
-pkg_postinst() {
-	if use gtk || use wxwidgets ; then
-		gnome2_icon_cache_update
-		use gtk && fdo-mime_desktop_database_update
-	fi
-}
-
-pkg_postrm() {
-	if use gtk || use wxwidgets ; then
-		gnome2_icon_cache_update
-		use gtk && fdo-mime_desktop_database_update
-	fi
-}
diff --git a/games-emulation/vbam/vbam-2.0.1.ebuild b/games-emulation/vbam/vbam-2.0.1-r1.ebuild
index c564e02df5d5..7895e9c087d2 100644
--- a/games-emulation/vbam/vbam-2.0.1.ebuild
+++ b/games-emulation/vbam/vbam-2.0.1-r1.ebuild
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-WX_GTK_VER="3.0"
-inherit cmake-utils wxwidgets gnome2-utils eutils xdg-utils
+
+WX_GTK_VER="3.0-gtk3"
+inherit gnome2-utils wxwidgets xdg-utils cmake-utils
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
@@ -22,13 +23,14 @@ SLOT="0"
 IUSE="ffmpeg link lirc nls openal +sdl wxwidgets"
 REQUIRED_USE="openal? ( wxwidgets ) || ( sdl wxwidgets )"
 
-RDEPEND=">=media-libs/libpng-1.4:0=
+RDEPEND="
+	>=media-libs/libpng-1.4:0=
 	media-libs/libsdl2[joystick]
 	link? ( >=media-libs/libsfml-2.0:= )
-	sys-libs/zlib
+	sys-libs/zlib:=
 	virtual/glu
 	virtual/opengl
-	ffmpeg? ( virtual/ffmpeg[-libav] )
+	ffmpeg? ( media-video/ffmpeg:= )
 	lirc? ( app-misc/lirc )
 	nls? ( virtual/libintl )
 	wxwidgets? (
@@ -36,23 +38,17 @@ RDEPEND=">=media-libs/libpng-1.4:0=
 		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
 	)"
 DEPEND="${RDEPEND}
+	app-arch/zip
 	wxwidgets? ( virtual/imagemagick-tools )
 	x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
 	nls? ( sys-devel/gettext )
 	virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/${P}-changelog-update.patch"
-	"${FILESDIR}/${P}-read-version-from-changelog.patch"
+	"${FILESDIR}"/${P}-changelog-update.patch
+	"${FILESDIR}"/${P}-read-version-from-changelog.patch
 )
 
-src_prepare() {
-	default
-
-	# fix desktop file QA warnings
-	edos2unix src/wx/wxvbam.desktop
-}
-
 src_configure() {
 	use wxwidgets && setup-wxwidgets
 	local mycmakeargs=(
@@ -70,10 +66,6 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
-src_compile() {
-	cmake-utils_src_compile
-}
-
 src_install() {
 	cmake-utils_src_install
 
diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-9999.ebuild
index 357c94893101..53f480e326ee 100644
--- a/games-emulation/vbam/vbam-9999.ebuild
+++ b/games-emulation/vbam/vbam-9999.ebuild
@@ -2,15 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-WX_GTK_VER="3.0"
-inherit cmake-utils wxwidgets gnome2-utils eutils xdg-utils
+
+WX_GTK_VER="3.0-gtk3"
+inherit gnome2-utils wxwidgets xdg-utils cmake-utils
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
 	inherit git-r3
 else
-	SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"
+	SRC_URI="https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/visualboyadvance-m-${PV}"
 fi
 
 DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
@@ -21,13 +23,14 @@ SLOT="0"
 IUSE="ffmpeg link lirc nls openal +sdl wxwidgets"
 REQUIRED_USE="openal? ( wxwidgets ) || ( sdl wxwidgets )"
 
-RDEPEND=">=media-libs/libpng-1.4:0=
+RDEPEND="
+	>=media-libs/libpng-1.4:0=
 	media-libs/libsdl2[joystick]
 	link? ( >=media-libs/libsfml-2.0:= )
-	sys-libs/zlib
+	sys-libs/zlib:=
 	virtual/glu
 	virtual/opengl
-	ffmpeg? ( virtual/ffmpeg[-libav] )
+	ffmpeg? ( media-video/ffmpeg:= )
 	lirc? ( app-misc/lirc )
 	nls? ( virtual/libintl )
 	wxwidgets? (
@@ -35,18 +38,12 @@ RDEPEND=">=media-libs/libpng-1.4:0=
 		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
 	)"
 DEPEND="${RDEPEND}
+	app-arch/zip
 	wxwidgets? ( virtual/imagemagick-tools )
 	x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
 	nls? ( sys-devel/gettext )
 	virtual/pkgconfig"
 
-src_prepare() {
-	default
-
-	# fix desktop file QA warnings
-	edos2unix src/wx/wxvbam.desktop
-}
-
 src_configure() {
 	use wxwidgets && setup-wxwidgets
 	local mycmakeargs=(
@@ -64,10 +61,6 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
-src_compile() {
-	cmake-utils_src_compile
-}
-
 src_install() {
 	cmake-utils_src_install