gentoo resync : 18.11.2018

9 files changed, 205 insertions, 56 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index e08a52e39851..a79c2ea52cb3 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
index 7e0cf5fad416..cb6e231a98c8 100644
--- a/games-emulation/snes9x/Manifest
+++ b/games-emulation/snes9x/Manifest
@@ -1,8 +1,8 @@
 AUX snes9x-1.53-cross-compile.patch 892 BLAKE2B 9fb806ad16d48d5f07f1ab84feb5f7eafa52a1157eb25675650f08c8fbab8a42318d3277efbdd45f03250df2e9187c76df43312f7ffb2f226423e757b5f6e91c SHA512 4867b9a3e3f2a65684157b26e4b0b63971d37ad5abb16125567e89bc4116482488416ca51d30f639ef63886b05431c56b75978fe073a4755c48988f5ea9eaee5
 AUX snes9x-1.55-build-system.patch 1825 BLAKE2B eb9bf6da1d9728c3bd657701d66da72caf185facbfc51030baf532f4757a8562319bf0b4daf9ac79068c63ef9d4fbb0df5681a71ea081effd826dceae6d32448 SHA512 afbd2b70eff128f89d231b7e623775746ad52d29a3f9b9a8dbbb38aff3f5ca7dbef1f938535c69ff9578a6467a25b441215dfab275dd22f2fbd5b22ebfa19731
 AUX snes9x-1.56-build-system.patch 1633 BLAKE2B 4a0ae3a90a15e29aea8d937f874aed9aa8b29c25eb03a90c9a0bf2b50f8c6271fcc43c7d61c2898e5d99128c0ab663d31de0e3498a5e16ba865d9c5572f12e6e SHA512 3ddc7272dab74ba3125409dbbf427160d08330cfc84c7f3393fbb68884f6129849efe042943899fbf3dca65ac326e15579722e757c3e30ebd4b452b784f1bf59
-DIST snes9x-1.55.tar.gz 2252841 BLAKE2B 52b2e3d5539d95df63ef6f90c974895bc3a3dbe1e89b3a9513a8504eab308d4827f116ebc13fd89ac9c01f7394067eeddf7fd6f640fd071ee8558a6a79f2b56c SHA512 61d1d6f9c1fc4fbf6253ac7a7d214c771563d7d60238197b2f1525a58f8f9011446f400767d39ec464c69d80574a7dcd78557c8f47605df992af28cb107c0f6e
 DIST snes9x-1.56.tar.gz 2876904 BLAKE2B b58dd5c31627cbb374183adb5fe0328739bbebda8c6907ab7f9153085c45d612e51c91ad3223cc10694c9c36a00f69c303c5865d3b022f2769353884056a91b2 SHA512 b8c9438a451ed9a52a66dc04e2bea841aaa9403a2fd266e7042555f93a159ced76061233220eb6fac0f106cea08835c13ef008b2432f6d658689e0fa8ee563e6
-EBUILD snes9x-1.55.ebuild 2628 BLAKE2B 48b8a8c0e9388c0f11e3ffa5d919c0bb731ebb33a7f456012c7d508aca5096de7f919d168d5f2eac04a5b9190c9f8bba568ce1a4fd041abcb0f2c4b5f0b36a35 SHA512 e3f14efadcd4915991a97d90e26dccf159ebc47e25b9070c358670e1231a1fe831977042c08d7bc80ca9b84163a5fb0a560936f36a11dbf54c7ba45c34bc57eb
+DIST snes9x-1.57.tar.gz 2959157 BLAKE2B 6307976247eb3a3bcb506028d75d9054ea853db5c629870a89832fd93ee2fe256799b9191922c67fcd8ef1ed2344d16326212001661c5038a88f290346b9f35c SHA512 d17ec45eeae8f57c618a51243ac54bc3a2a3f09632e4e50c51781cf8557362dbfa7856d9d4ecdebeea344041c2686e2256f6bcd2dcc71660fcf336cf887dcb1c
 EBUILD snes9x-1.56.ebuild 2789 BLAKE2B 23180ff3ded88ad924eff4e9bebf5745c6e479e91552738b0afb5389d8dadc2bb22edd814d33f9d3fb01eeac2bf344d85dc159812b982b2e1b93e64c60efd991 SHA512 e121f01eba1b46e3b22cf5f2cf8878863a279aa4516ac71a46a30a5380f6fb75ad7979ac96a848f4e399191ac4ebdbed7844d4ee2c509c0baa8b359a1c72b017
-MISC metadata.xml 560 BLAKE2B ed9f05b3f484347825048ae3d45e9a880e5b7405b229b7e15f350dbc43bfec51691c21e558ae87f630ed392e19ddfa5eaf3d9d15ddb551476d13d9fbf224f97b SHA512 3922d16510b8818739e582c8faf84287dc265f810df5957dc923efab912e20f95b7fb9fc84023d481b44ce6c653f2bc00e83d6a150d9294feeb60dc8c3a2eeca
+EBUILD snes9x-1.57.ebuild 2860 BLAKE2B d829620d8308791ea4c31dcc07c061baef25ea7203ab8a536db841a5b5a8213e98b939d990ec0ee071c83e12942ea2c4ef8dba36519f25b04cc7eb4de457c92a SHA512 b01974ee1d46b4e929890a81f847632ec73a364218da4e03a9c4030345e513ef8a3644c2d2e6d822a6ac7928aefb4147314aa6fdf38d1a570025752c574e3318
+MISC metadata.xml 489 BLAKE2B 3cb6bc463e0eb5ca5203722cc2320eba2bc2e000fbd42e1386fcef807df3aa6e853bbff49fb6b323ae012b44b6add2c354530df0ebc56d232aa89188297426cc SHA512 805a8089e2e324dcf14ca5d25b168fdd79dc72113710b820904982ce9b2c49e2876095cd461ed52f4905041c14b25626f4540db7e1b38e47a9d55bbac98ebbfc
diff --git a/games-emulation/snes9x/metadata.xml b/games-emulation/snes9x/metadata.xml
index 197a5fc2e9d4..7bbb65b9c765 100644
--- a/games-emulation/snes9x/metadata.xml
+++ b/games-emulation/snes9x/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="netplay">Enable playing ROMs over the network (not recommended)</flag>
-		<flag name="xrandr">Enable support for the X xrandr extension</flag>
 	</use>
 	<upstream>
 		<remote-id type="google-code">snes9x-gtk</remote-id>
diff --git a/games-emulation/snes9x/snes9x-1.55.ebuild b/games-emulation/snes9x/snes9x-1.57.ebuild
index 639a39ffc5c6..5792fa5ac7e7 100644
--- a/games-emulation/snes9x/snes9x-1.55.ebuild
+++ b/games-emulation/snes9x/snes9x-1.57.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ 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"
+IUSE="alsa debug gtk joystick multilib netplay nls opengl oss png pulseaudio portaudio wayland xinerama +xv"
 RESTRICT="bindist"
 
 RDEPEND="
@@ -21,16 +21,23 @@ RDEPEND="
 	x11-libs/libXext
 	png? ( media-libs/libpng:0= )
 	gtk? (
-		>=x11-libs/gtk+-2.10:2
+		dev-libs/glib:2
+		dev-libs/libxml2
+		>=x11-libs/gtk+-3.22:3[wayland?]
+		x11-libs/libXrandr
 		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 )
+		joystick? ( media-libs/libsdl2[joystick] )
+		opengl? (
+			media-libs/libepoxy
+			virtual/opengl
+		)
+		portaudio? ( >=media-libs/portaudio-19_pre )
 		pulseaudio? ( media-sound/pulseaudio )
-	)"
+		xv? ( x11-libs/libXv )
+		wayland? ( dev-libs/wayland )
+	)
+	xinerama? ( x11-libs/libXinerama )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	x11-base/xorg-proto
@@ -40,7 +47,7 @@ S="${WORKDIR}/${P}/unix"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.53-cross-compile.patch
-	"${FILESDIR}"/${PN}-1.55-build-system.patch
+	"${FILESDIR}"/${PN}-1.56-build-system.patch
 )
 
 src_prepare() {
@@ -59,31 +66,38 @@ 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) \
+	local myeconfargs=(
+		--enable-gzip
+		--enable-zip
+		--with-system-zip
+		$(use_enable joystick gamepad)
+		$(use_enable debug debugger)
+		$(use_enable netplay)
 		$(use_enable png screenshot)
+		$(use_enable xinerama)
+	)
+	econf "${myeconfargs[@]}"
 
 	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) \
+		myeconfargs=(
+			--with-gtk3
+			--with-zlib
+			--with-system-zip
+			--without-gtk2
+			$(use_enable nls)
+			$(use_with opengl)
+			$(use_with joystick)
+			$(use_with xv)
+			$(use_with netplay)
+			$(use_with alsa)
+			$(use_with oss)
+			$(use_with pulseaudio)
+			$(use_with portaudio)
 			$(use_with png screenshot)
+			$(use_with wayland)
+		)
+		econf "${myeconfargs[@]}"
 	fi
 }
 
diff --git a/games-emulation/stella/Manifest b/games-emulation/stella/Manifest
index e504b14973d3..c510de7b2fa7 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-r1.ebuild 1327 BLAKE2B 5932b462fe8a66386fe6dcd5d1d91b46c584b943b3081e47bc0e33d34e409773cbb63034fbc55609c19649d760050833062fc7813f109677423e3b7775817baa SHA512 cc81a37cc9362b1c2e07fd4f7e6216523a45659c6395da0627089e6a5a17a47eb71432a718e32aa2911fa3f4279c2b15b948f49d742ce3776942e02930cc27cd
+DIST stella-5.1.3-src.tar.xz 1828448 BLAKE2B 1588e4da3c21ab51d967aa3fae49b14ef5f3121e3907aa83629dbabeab5c190660ad5a53319429f721cc93560c212f530a58675b7c543c9a3fed3e395669c145 SHA512 9aaf6118c999e90e4947e490f61ccebb82ba1ebeccb29b2e4ec1226bdeef83bb36d944791d6f915522c5c6fec74a0bd17ac5ce8fcc5f369281f9cedf06a380a5
+EBUILD stella-5.1.3.ebuild 1350 BLAKE2B f938bfa80bd4e21f41ebff69554507479c75103ebdcde52bb84fcbc9fc2d6c9b764c87855544cfaf935f7a2d5e269a90d90ee051505ed5516dee8f95e89f2dd4 SHA512 e476fb7de2eac50aa874cc44e44b10a6ad25d6d78da19cc25c6b48937c147ea3397c06c8ebc420cc5737ff06a93326da326a27f3a2d91324606bcc6343764dde
 MISC metadata.xml 329 BLAKE2B 3ee498d6ed1bda6ccdd1e6e6a7eae732766c005ae6bf4c02b09f8f5de417d9f4c20ae925a2d7d148204f0c43a4c4ef1310cd6d925dee4beb2ede0c74ae34b636 SHA512 80e6880e6edea2eab64504d6cdf4496f94f9bfb6a4ea63da347b9fb05ca3fa999d646406e22563799d8ba40c1d3d095094ea8d86a500bb490ce2034c3ff38182
diff --git a/games-emulation/stella/stella-4.7.2-r1.ebuild b/games-emulation/stella/stella-5.1.3.ebuild
index 1412860717cd..13fede1c7973 100644
--- a/games-emulation/stella/stella-4.7.2-r1.ebuild
+++ b/games-emulation/stella/stella-5.1.3.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit desktop gnome2-utils
 
-DESCRIPTION="Stella Atari 2600 VCS Emulator"
-HOMEPAGE="http://stella.sourceforge.net/"
-SRC_URI="mirror://sourceforge/stella/${P}-src.tar.xz"
+inherit desktop flag-o-matic gnome2-utils
+
+DESCRIPTION="Multi-platform Atari 2600 VCS Emulator"
+HOMEPAGE="https://stella-emu.github.io"
+SRC_URI="https://github.com/stella-emu/${PN}/releases/download/${PV}/${P}-src.tar.xz"
 
 LICENSE="GPL-2+ BSD"
 SLOT="0"
@@ -20,6 +21,9 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+DOCS=(Announce.txt Changes.txt Copyright.txt README-SDL.txt Readme.txt Todo.txt)
+HTML_DOCS=(docs/.)
+
 src_prepare() {
 	default
 	sed -i \
@@ -34,6 +38,7 @@ src_prepare() {
 
 src_configure() {
 	# not an autoconf script
+	CXX=$(tc-getCXX) \
 	./configure \
 		--prefix="/usr" \
 		--bindir="/usr/bin" \
@@ -44,26 +49,15 @@ src_configure() {
 }
 
 src_install() {
+	default
 	local i
 
-	DOCS="Announce.txt Changes.txt Copyright.txt README-SDL.txt Readme.txt Todo.txt" \
-		default
-
 	for i in 16 22 24 32 48 64 128 ; do
 		newicon -s ${i} src/common/stella-${i}x${i}.png stella.png
 	done
 	domenu src/unix/stella.desktop
-	HTML_DOCS="docs/*" einstalldocs
+	einstalldocs
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index 56c2716bb884..4e1178ae603d 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -1,4 +1,7 @@
+AUX vbam-2.1.0-performance_fixup.patch 1515 BLAKE2B fdc77976e24c1df0bb3be97f709874d768a68b238111281f2ffa0edec205bf0f7de831dd5d96e7ac77a6fa47a02781b2e248cba00d767da42c291bdc0255ffb8 SHA512 1b6cc31d6a7ef66eadc4150bf8c42edc6dbad3f08f2b508e9a62159373b218e130eeeb4afed87d2696a15d4b41775f1348f567d74d6debb3bb665b75949d2aa8
 DIST vbam-2.0.2.tar.gz 2959204 BLAKE2B 79b288e59a843d2065eac63e74984bf134d9f5dadbc687da245030ad16b138125baab0fe1fb19acac9c117e30b95e57f1880b43817f75361600fb62efd1d5272 SHA512 9aafb8ef307fbbfbc5ae6dc35bc3042934e25a30069a71949e4c8e777fd862d94ec60c189823f4acdea4cb1338098fa85a55e090fa6023c07368cbb7638dd910
+DIST vbam-2.1.0.tar.gz 2977888 BLAKE2B 48884b10d13cdeddfae1dc5a94a4576ebfd7aab263225650a7d4f7138854da3c8bbffa4a8f08e9da001cd967f0e85a7beb82f86350031264a66bfdd5403d36dd SHA512 e4489c84880a7a70e7e94104ffbbdd805e9f15d5c962c0c13a7470496d2fdad8e21c1ddb161b776eb0b1a0c7583182df5838da5a523ce31dac620aa2a7842321
 EBUILD vbam-2.0.2.ebuild 2137 BLAKE2B 765893d09675d51571ec9e701752c9151edb772e8ca576f4276de885b946ba9a28aa7dad858ef2934b2de63131a726c89644ae5ae30b1d774adf049273b11ec9 SHA512 85a98700c08db6d07109a3ca560b5f2df4db6cc2a7832fd50f82891c823e7f2c44863b09b48edeca110055d373b88ea363b7526949ce3469aedea0f4c5fed365
+EBUILD vbam-2.1.0.ebuild 2191 BLAKE2B 5ca4979634d3f9d04f6424b674d94ffe0dc868d831175f29ddc8943d445bd79bf378fad97ee8207ae3b65e08db17a7b1660d07e61e02eb3fab6f78ddeb535240 SHA512 a64571b4c5f9d03922a14b283ecb73bf59f03082abe12ba8427d159864fecac5b4c045ff107f5acc163473333655dd56318a9597115cece0a48a88f8e76e1bba
 EBUILD vbam-9999.ebuild 2137 BLAKE2B 765893d09675d51571ec9e701752c9151edb772e8ca576f4276de885b946ba9a28aa7dad858ef2934b2de63131a726c89644ae5ae30b1d774adf049273b11ec9 SHA512 85a98700c08db6d07109a3ca560b5f2df4db6cc2a7832fd50f82891c823e7f2c44863b09b48edeca110055d373b88ea363b7526949ce3469aedea0f4c5fed365
 MISC metadata.xml 479 BLAKE2B e5a7706e8db6c8c05cf4cf691d294c4bd54f3cc7aee5af270cce39c2d924cc81cc97a1b3d3612c1cf95d0b4b485181717d0f0daeef11a21b0c7ce0cf4d9eafda SHA512 6bd2212bd5ae35dd11f35322879f067981cac94c0c2d8f0c87e1e67170b5df245bd3616e5bb076d2892453c8b75537ee15aab49134029c0daa31d89d8aedf1d0
diff --git a/games-emulation/vbam/files/vbam-2.1.0-performance_fixup.patch b/games-emulation/vbam/files/vbam-2.1.0-performance_fixup.patch
new file mode 100644
index 000000000000..c99f829bdc08
--- /dev/null
+++ b/games-emulation/vbam/files/vbam-2.1.0-performance_fixup.patch
@@ -0,0 +1,43 @@
+From a8d0508cf299a58b2a659d6017b049db121de8ba Mon Sep 17 00:00:00 2001
+From: Rafael Kitover <rkitover@gmail.com>
+Date: Mon, 2 Jul 2018 18:32:18 -0700
+Subject: [PATCH] use GetWindow()->Refresh() in Wayland only
+
+Some people are reporting stuttering, and @retro-wertz tested both
+DrawArea() and Refresh() on wxgtk3 under xorg and found that the
+Refresh() method produces more stuttering.
+
+Change the compile check for wxgtk2 to a runtime check for wayland, and
+use Refresh() under Wayland only.
+---
+ src/wx/panel.cpp | 11 ++++-------
+ 1 file changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/src/wx/panel.cpp b/src/wx/panel.cpp
+index e4b86301..faaf6e4d 100644
+--- a/src/wx/panel.cpp
++++ b/src/wx/panel.cpp
+@@ -1817,19 +1817,16 @@ void DrawingPanelBase::DrawArea(uint8_t** data)
+     }
+ 
+     // next, draw the frame (queue a PaintEv) Refresh must be used under
+-    // Wayland or nothing is drawn, however it causes high CPU usage with GTK2,
+-    // so use the old method in that case
+-#if !defined(__WXGTK__) || defined(__WXGTK3__)
+-    GetWindow()->Refresh();
+-#else
+-    {
++    // Wayland or nothing is drawn.
++    if (wxGetApp().UsingWayland())
++        GetWindow()->Refresh();
++    else {
+         DrawingPanelBase* panel = wxGetApp().frame->GetPanel()->panel;
+         if (panel) {
+             wxClientDC dc(panel->GetWindow());
+             panel->DrawArea(dc);
+         }
+     }
+-#endif
+ 
+     // finally, draw on-screen text using wx method, if possible
+     // this method flickers too much right now
diff --git a/games-emulation/vbam/vbam-2.1.0.ebuild b/games-emulation/vbam/vbam-2.1.0.ebuild
new file mode 100644
index 000000000000..3d0c2496b2e0
--- /dev/null
+++ b/games-emulation/vbam/vbam-2.1.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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://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"
+HOMEPAGE="https://github.com/visualboyadvance-m/visualboyadvance-m"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ffmpeg link lirc nls openal +sdl wxwidgets"
+REQUIRED_USE="openal? ( wxwidgets ) || ( sdl wxwidgets )"
+
+RDEPEND="
+	>=media-libs/libpng-1.4:0=
+	media-libs/libsdl2[joystick]
+	link? ( >=media-libs/libsfml-2.0:= )
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/opengl
+	ffmpeg? ( =media-video/ffmpeg-3*:= )
+	lirc? ( app-misc/lirc )
+	nls? ( virtual/libintl )
+	wxwidgets? (
+		openal? ( media-libs/openal )
+		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}-performance_fixup.patch"
+)
+
+src_configure() {
+	use wxwidgets && setup-wxwidgets
+	local mycmakeargs=(
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-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
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use sdl ; then
+		dodoc doc/ReadMe.SDL.txt
+		doman src/debian/vbam.6
+	fi
+	use wxwidgets && doman src/debian/visualboyadvance-m.6
+}
+
+pkg_preinst() {
+	if use wxwidgets ; then
+		gnome2_icon_savelist
+	fi
+}
+
+pkg_postinst() {
+	if use wxwidgets ; then
+		gnome2_icon_cache_update
+		xdg_desktop_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use wxwidgets ; then
+		gnome2_icon_cache_update
+		xdg_desktop_database_update
+	fi
+}