gentoo resync : 16.06.2018

5 files changed, 112 insertions, 406 deletions

diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
index 0fb7c35e8233..7e0cf5fad416 100644
--- a/games-emulation/snes9x/Manifest
+++ b/games-emulation/snes9x/Manifest
@@ -1,9 +1,8 @@
 AUX snes9x-1.53-cross-compile.patch 892 BLAKE2B 9fb806ad16d48d5f07f1ab84feb5f7eafa52a1157eb25675650f08c8fbab8a42318d3277efbdd45f03250df2e9187c76df43312f7ffb2f226423e757b5f6e91c SHA512 4867b9a3e3f2a65684157b26e4b0b63971d37ad5abb16125567e89bc4116482488416ca51d30f639ef63886b05431c56b75978fe073a4755c48988f5ea9eaee5
-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
 AUX snes9x-1.55-build-system.patch 1825 BLAKE2B eb9bf6da1d9728c3bd657701d66da72caf185facbfc51030baf532f4757a8562319bf0b4daf9ac79068c63ef9d4fbb0df5681a71ea081effd826dceae6d32448 SHA512 afbd2b70eff128f89d231b7e623775746ad52d29a3f9b9a8dbbb38aff3f5ca7dbef1f938535c69ff9578a6467a25b441215dfab275dd22f2fbd5b22ebfa19731
-DIST snes9x-1.54.1.tar.gz 2186737 BLAKE2B b433a167035577ab785901acb65b9df289218fa214f664494e7f0559a1a843c9211f81bfea3add73c64c6f87e974b0964a86fa43433fa1b5c6e20a724d3aa320 SHA512 2a8fddc0b9044c0b7e10711b35c06555e280c93ddde3c101c4084f859079947acb209f2632ca08937fa2ca47932094040c4a7a60b6188354fd92f72dbdf854ed
+AUX snes9x-1.56-build-system.patch 1633 BLAKE2B 4a0ae3a90a15e29aea8d937f874aed9aa8b29c25eb03a90c9a0bf2b50f8c6271fcc43c7d61c2898e5d99128c0ab663d31de0e3498a5e16ba865d9c5572f12e6e SHA512 3ddc7272dab74ba3125409dbbf427160d08330cfc84c7f3393fbb68884f6129849efe042943899fbf3dca65ac326e15579722e757c3e30ebd4b452b784f1bf59
 DIST snes9x-1.55.tar.gz 2252841 BLAKE2B 52b2e3d5539d95df63ef6f90c974895bc3a3dbe1e89b3a9513a8504eab308d4827f116ebc13fd89ac9c01f7394067eeddf7fd6f640fd071ee8558a6a79f2b56c SHA512 61d1d6f9c1fc4fbf6253ac7a7d214c771563d7d60238197b2f1525a58f8f9011446f400767d39ec464c69d80574a7dcd78557c8f47605df992af28cb107c0f6e
-EBUILD snes9x-1.54.1.ebuild 2623 BLAKE2B df02581127ce64319caa21fcb5d2e39504d10062c150af5b0a0f27a372bc4365c22df1aefa1cb21ec8fe2b38ff89676a4f4884e23408e988f83dd52a8b5ec3c6 SHA512 aff9791602aa30e892c88d97bfe0c8cc316d64b7cf10299f2647da293c749215da2f7aece3d6918166879eb3c2e6f082180dd4a745bbac9322c78bb51eeb70bf
+DIST snes9x-1.56.tar.gz 2876904 BLAKE2B b58dd5c31627cbb374183adb5fe0328739bbebda8c6907ab7f9153085c45d612e51c91ad3223cc10694c9c36a00f69c303c5865d3b022f2769353884056a91b2 SHA512 b8c9438a451ed9a52a66dc04e2bea841aaa9403a2fd266e7042555f93a159ced76061233220eb6fac0f106cea08835c13ef008b2432f6d658689e0fa8ee563e6
 EBUILD snes9x-1.55.ebuild 2628 BLAKE2B 48b8a8c0e9388c0f11e3ffa5d919c0bb731ebb33a7f456012c7d508aca5096de7f919d168d5f2eac04a5b9190c9f8bba568ce1a4fd041abcb0f2c4b5f0b36a35 SHA512 e3f14efadcd4915991a97d90e26dccf159ebc47e25b9070c358670e1231a1fe831977042c08d7bc80ca9b84163a5fb0a560936f36a11dbf54c7ba45c34bc57eb
+EBUILD snes9x-1.56.ebuild 2789 BLAKE2B 23180ff3ded88ad924eff4e9bebf5745c6e479e91552738b0afb5389d8dadc2bb22edd814d33f9d3fb01eeac2bf344d85dc159812b982b2e1b93e64c60efd991 SHA512 e121f01eba1b46e3b22cf5f2cf8878863a279aa4516ac71a46a30a5380f6fb75ad7979ac96a848f4e399191ac4ebdbed7844d4ee2c509c0baa8b359a1c72b017
 MISC metadata.xml 560 BLAKE2B ed9f05b3f484347825048ae3d45e9a880e5b7405b229b7e15f350dbc43bfec51691c21e558ae87f630ed392e19ddfa5eaf3d9d15ddb551476d13d9fbf224f97b SHA512 3922d16510b8818739e582c8faf84287dc265f810df5957dc923efab912e20f95b7fb9fc84023d481b44ce6c653f2bc00e83d6a150d9294feeb60dc8c3a2eeca
diff --git a/games-emulation/snes9x/files/snes9x-1.54.1-build.patch b/games-emulation/snes9x/files/snes9x-1.54.1-build.patch
deleted file mode 100644
index 945b5f1890b2..000000000000
--- a/games-emulation/snes9x/files/snes9x-1.54.1-build.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- snes9x-1.54.1/gtk/configure.ac
-+++ snes9x-1.54.1/gtk/configure.ac
-@@ -33,7 +33,7 @@
- 
- AM_GLIB_GNU_GETTEXT
- 
--snes9xlocaledir='${prefix}/${DATADIRNAME}/locale'
-+snes9xlocaledir='/usr/share/locale'
- AC_SUBST(snes9xlocaledir)
- 
- AC_ARG_WITH(debug,
---- snes9x-1.54.1/unix/configure.ac
-+++ snes9x-1.54.1/unix/configure.ac
-@@ -56,20 +56,6 @@
- # *** Execution begins here ***
- # *****************************
- 
--# Remove -g and -O2 flags manually.
--
--if test "x$CFLAGS" != "x"; then
--	CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-g//'`"
--	CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-O2//'`"
--fi
--
--if test "x$CXXFLAGS" != "x"; then
--	CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-g//'`"
--	CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-O2//'`"
--fi
--
--# Test what compiler flags we should use.
--
- AC_ARG_ENABLE([debug],
- 	[AS_HELP_STRING([--enable-debug],
- 		[leave debug information in the final binary (default: no)])],
-@@ -79,9 +65,6 @@
- 	AC_S9X_COMPILER_FLAG([-g],  [g])
- 	AC_S9X_COMPILER_FLAG([-O0], [o0])
- else
--	AC_S9X_COMPILER_FLAG([-O3], [o3], [
--		AC_S9X_COMPILER_FLAG([-O2], [o2], [
--			AC_S9X_COMPILER_FLAG([-O1], [o1])])])
- 	AC_S9X_COMPILER_FLAG([-fomit-frame-pointer], [omit_frame_pointer])
- fi
- 
---- snes9x-1.54.1/unix/Makefile.in
-+++ snes9x-1.54.1/unix/Makefile.in
-@@ -47,7 +47,7 @@
- 	exit 1
- 
- snes9x: $(OBJECTS)
--	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) -lm @S9XLIBS@
-+	$(CCC) $(LDFLAGS) $(INCLUDES) -o $@ $(OBJECTS) -lm @S9XLIBS@
- 
- ../jma/s9x-jma.o: ../jma/s9x-jma.cpp
- 	$(CCC) $(INCLUDES) -c $(CCFLAGS) -fexceptions $*.cpp -o $@
diff --git a/games-emulation/snes9x/files/snes9x-1.54.1-system-zlib.patch b/games-emulation/snes9x/files/snes9x-1.54.1-system-zlib.patch
deleted file mode 100644
index 26025829442c..000000000000
--- a/games-emulation/snes9x/files/snes9x-1.54.1-system-zlib.patch
+++ /dev/null
@@ -1,307 +0,0 @@
-From def3936a5353924fb7b9ffa30b8c1c96c9175ca7 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Fri, 11 Nov 2016 17:52:07 +0100
-Subject: [PATCH] Introduce --with-system-zip configure flag to use system zip
- (minizip)
-
-if available.
----
- conffile.h        |  6 +++++-
- gtk/Makefile.am   |  6 +++++-
- gtk/configure.ac  | 28 +++++++++++++++++++++++++++-
- loadzip.cpp       |  4 ++++
- memmap.cpp        |  6 +++++-
- stream.cpp        |  6 +++++-
- stream.h          |  7 +++++--
- unix/Makefile.in  |  9 +++++++--
- unix/configure.ac | 47 +++++++++++++++++++++++++++++++++++++++--------
- 9 files changed, 102 insertions(+), 17 deletions(-)
-
-diff --git a/conffile.h b/conffile.h
-index ed8a13b..366706f 100644
---- a/conffile.h
-+++ b/conffile.h
-@@ -197,7 +197,11 @@
- #include <string>
- 
- #ifdef UNZIP_SUPPORT
--#include "unzip/unzip.h"
-+#  ifdef SYSTEM_ZIP
-+#    include <minizip/unzip.h>
-+#  else
-+#    include "unzip/unzip.h"
-+#  endif
- #endif
- #include "snes9x.h"
- 
-diff --git a/gtk/Makefile.am b/gtk/Makefile.am
-index fad1cf2..57f00fb 100644
---- a/gtk/Makefile.am
-+++ b/gtk/Makefile.am
-@@ -196,12 +196,16 @@ snes9x_gtk_SOURCES += \
-     ../server.cpp
- endif
- 
-+
- # Zip support is nonconfigurable.
- snes9x_gtk_SOURCES += \
--    ../loadzip.cpp \
-+    ../loadzip.cpp
-+if ! SYSTEM_ZIP
-+snes9x_gtk_SOURCES += \
-     ../unzip/unzip.c \
-     ../unzip/ioapi.c \
-     ../unzip/zip.c
-+endif
- UNZIPDEFINES=-DUNZIP_SUPPORT
- 
- if JMA
-diff --git a/gtk/configure.ac b/gtk/configure.ac
-index 4d21792..e3bab4e 100644
---- a/gtk/configure.ac
-+++ b/gtk/configure.ac
-@@ -138,6 +138,12 @@ AC_ARG_WITH(zlib,
-   [],
-   [with_zlib=yes])
- 
-+AC_ARG_WITH(system-zip,
-+  [AS_HELP_STRING([--with(out)-system-zip],
-+    [Use system zip])],
-+  [],
-+  [system_zip=check])
-+
- AC_ARG_WITH(screenshot,
-   [AS_HELP_STRING([--with(out)-screenshot],
-     [Screenshot support through libpng if available (default: with)])],
-@@ -313,6 +319,25 @@ if test yes = "$with_screenshot"; then
-     ])
- fi
- 
-+SYSTEM_ZIP=0
-+SYSTEM_ZIP_CFLAGS=""
-+SYSTEM_ZIP_LIBS=""
-+ZIP_CFLAGS="-I../unzip"
-+if test no != "$with_system_zip" && test yes = "$with_zlib" ; then
-+    PKG_CHECK_MODULES([SYSTEM_ZIP],[minizip],[
-+	ZIP_CFLAGS=""
-+	SYSTEM_ZIP=yes
-+	CFLAGS="$CFLAGS $SYSTEM_ZIP_CFLAGS -DSYSTEM_ZIP"
-+	LIBS="$LIBS $SYSTEM_ZIP_LIBS"
-+    ],[
-+	if test check = "$with_system_zip"; then
-+	    AC_MSG_WARN(Cannot find SYSTEM_ZIP)
-+	else
-+	    AC_MSG_ERROR(--with-system-zip given but cannot find proper zlib)
-+	fi
-+    ])
-+fi
-+
- if test yes = "$with_hq2x" ; then
-     HQ2X=yes
-     CFLAGS="$CFLAGS -DUSE_HQ2X"
-@@ -440,7 +465,7 @@ if test $ac_cv_my_sar_int8 = yes && \
-   CFLAGS="$CFLAGS -DRIGHTSHIFT_IS_SAR"
- fi
- 
--CFLAGS="$CFLAGS -DUNZIP_SUPPORT -DSPC700_C -I. -I.. -I../unzip"
-+CFLAGS="$CFLAGS -DUNZIP_SUPPORT -DSPC700_C -I. -I.. $ZIP_CFLAGS"
- 
- CXXFLAGS="$CFLAGS"
- 
-@@ -462,6 +487,7 @@ AM_CONDITIONAL(ALSA, [test yes = "$ALSA"])
- AM_CONDITIONAL(PULSEAUDIO, [test yes = "$PULSEAUDIO"])
- AM_CONDITIONAL(HQ2X, [test yes = "$HQ2X"])
- AM_CONDITIONAL(XBRZ, [test yes = "$XBRZ"])
-+AM_CONDITIONAL(SYSTEM_ZIP, [test yes = "$SYSTEM_ZIP"])
- 
- AC_SUBST(NASM)
- AC_SUBST(NASM_FLAGS)
-diff --git a/loadzip.cpp b/loadzip.cpp
-index 024bc79..dab2504 100644
---- a/loadzip.cpp
-+++ b/loadzip.cpp
-@@ -192,7 +192,11 @@
- 
- #include <assert.h>
- #include <ctype.h>
-+#ifdef SYSTEM_ZIP
-+#include <minizip/unzip.h>
-+#else
- #include "unzip/unzip.h"
-+#endif
- #include "snes9x.h"
- #include "memmap.h"
- 
-diff --git a/memmap.cpp b/memmap.cpp
-index 19df95c..98de319 100644
---- a/memmap.cpp
-+++ b/memmap.cpp
-@@ -193,7 +193,11 @@
- #include <assert.h>
- 
- #ifdef UNZIP_SUPPORT
--#include "unzip/unzip.h"
-+#  ifdef SYSTEM_ZIP
-+#    include <minizip/unzip.h>
-+#  else
-+#    include "unzip/unzip.h"
-+#  endif
- #endif
- 
- #ifdef JMA_SUPPORT
-diff --git a/stream.cpp b/stream.cpp
-index 37051c3..bb64113 100644
---- a/stream.cpp
-+++ b/stream.cpp
-@@ -192,7 +192,11 @@
- 
- #include <string>
- #ifdef UNZIP_SUPPORT
--#include "unzip.h"
-+#  ifdef SYSTEM_ZIP
-+#    include <minizip/unzip.h>
-+#  else
-+#    include "unzip.h"
-+#  endif
- #endif
- #include "snes9x.h"
- #include "stream.h"
-diff --git a/stream.h b/stream.h
-index b03dea9..ea22df0 100644
---- a/stream.h
-+++ b/stream.h
-@@ -229,8 +229,11 @@ class fStream : public Stream
- };
- 
- #ifdef UNZIP_SUPPORT
--
--#include "unzip.h"
-+#  ifdef SYSTEM_ZIP
-+#    include <minizip/unzip.h>
-+#  else
-+#    include "unzip.h"
-+#  endif
- 
- #define unz_BUFFSIZ	1024
- 
-diff --git a/unix/Makefile.in b/unix/Makefile.in
-index 5849568..aecad31 100644
---- a/unix/Makefile.in
-+++ b/unix/Makefile.in
-@@ -2,6 +2,7 @@
- @S9XNETPLAY@
- @S9XZIP@
- @S9XJMA@
-+@S9X_SYSTEM_ZIP@
- 
- # Fairly good and special-char-safe descriptor of the os being built on.
- OS         = `uname -s -r -m|sed \"s/ /-/g\"|tr \"[A-Z]\" \"[a-z]\"|tr \"/()\" \"___\"`
-@@ -19,7 +20,11 @@ OBJECTS   += ../netplay.o ../server.o
- endif
- 
- ifdef S9XZIP
--OBJECTS   += ../loadzip.o ../unzip/ioapi.o ../unzip/unzip.o
-+OBJECTS   += ../loadzip.o
-+ifndef SYSTEM_ZIP
-+OBJECTS   += ../unzip/ioapi.o ../unzip/unzip.o
-+INCLUDES   = -I../unzip/
-+endif
- endif
- 
- ifdef S9XJMA
-@@ -29,7 +34,7 @@ endif
- CCC        = @CXX@
- CC         = @CC@
- GASM       = @CXX@
--INCLUDES   = -I. -I.. -I../apu/ -I../apu/bapu -I../unzip/ -I../jma/ -I../filter/
-+INCLUDES   += -I. -I.. -I../apu/ -I../apu/bapu -I../jma/ -I../filter/
- 
- CCFLAGS    = @S9XFLGS@ @S9XDEFS@ $(DEFS)
- CFLAGS     = $(CCFLAGS)
-diff --git a/unix/configure.ac b/unix/configure.ac
-index 3c851dc..47f3780 100644
---- a/unix/configure.ac
-+++ b/unix/configure.ac
-@@ -201,16 +201,43 @@ AC_ARG_ENABLE([zip],
- 		[enable ZIP support through zlib (default: yes)])],
- 	[], [enable_zip="yes"])
- 
-+S9X_SYSTEM_ZIP="#SYSTEM_ZIP=1"
-+
-+AC_ARG_WITH([system-zip],
-+	[AS_HELP_STRING([--with-system-zip],
-+		[Use system zip (default: check)])],
-+	[], [with_system_zip="check"])
-+
- if test "x$enable_zip" = "xyes"; then
--	if test "x$snes9x_cv_zlib" = "xyes"; then
--		S9XZIP="S9XZIP=1"
--		S9XDEFS="$S9XDEFS -DUNZIP_SUPPORT"
--		if test "x$enable_gzip" = "xno"; then 
--			S9XLIBS="$S9XLIBS -lz"
--		fi
-+	if test "x$with_system_zip" != "xno"; then
-+		PKG_CHECK_MODULES(
-+			SYSTEM_ZIP,
-+			minizip,
-+			S9XZIP="S9XZIP=1"
-+			S9XDEFS="$S9XDEFS -DUNZIP_SUPPORT"
-+			S9X_SYSTEM_ZIP="SYSTEM_ZIP=1"
-+			S9XLIBS="$S9XLIBS $SYSTEM_ZIP_LIBS"
-+			if test "x$enable_gzip" = "xno"; then
-+				S9XLIBS="$S9XLIBS -lz"
-+			fi
-+			S9XDEFS="$S9XDEFS -DSYSTEM_ZIP",
-+			if test "x${with_system_zip}" != "xcheck"; then
-+				AC_MSG_ERROR([--with-system-zip requested but no proper zlib found.])
-+			else
-+				AC_MSG_WARN([zlib not found. Build without SYSTEM_ZIP support.])
-+			fi
-+		)
- 	else
--		AC_MSG_WARN([zlib not found. Build without ZIP support.])
--		enable_zip="no"
-+		if test "x$snes9x_cv_zlib" = "xyes"; then
-+			S9XZIP="S9XZIP=1"
-+			S9XDEFS="$S9XDEFS -DUNZIP_SUPPORT"
-+			if test "x$enable_gzip" = "xno"; then
-+				S9XLIBS="$S9XLIBS -lz"
-+			fi
-+		else
-+			AC_MSG_WARN([zlib not found. Build without ZIP support.])
-+			enable_zip="no"
-+		fi
- 	fi
- fi
- 
-@@ -427,9 +454,11 @@ S9XLIBS="$LIBS $S9XLIBS"
- S9XFLGS="`echo \"$S9XFLGS\" | sed -e 's/  */ /g'`"
- S9XDEFS="`echo \"$S9XDEFS\" | sed -e 's/  */ /g'`"
- S9XLIBS="`echo \"$S9XLIBS\" | sed -e 's/  */ /g'`"
-+S9X_SYSTEM_ZIP="`echo \"$S9X_SYSTEM_ZIP\" | sed -e 's/  */ /g'`"
- S9XFLGS="`echo \"$S9XFLGS\" | sed -e 's/^  *//'`"
- S9XDEFS="`echo \"$S9XDEFS\" | sed -e 's/^  *//'`"
- S9XLIBS="`echo \"$S9XLIBS\" | sed -e 's/^  *//'`"
-+S9X_SYSTEM_ZIP="`echo \"$S9X_SYSTEM_ZIP\" | sed -e 's/^  *//'`"
- 
- AC_SUBST(S9XFLGS)
- AC_SUBST(S9XDEFS)
-@@ -439,6 +468,7 @@ AC_SUBST(S9XDEBUGGER)
- AC_SUBST(S9XNETPLAY)
- AC_SUBST(S9XZIP)
- AC_SUBST(S9XJMA)
-+AC_SUBST(S9X_SYSTEM_ZIP)
- 
- rm config.info 2>/dev/null
- 
-@@ -459,6 +489,7 @@ netplay support...... $enable_netplay
- gamepad support...... $enable_gamepad
- GZIP support......... $enable_gzip
- ZIP support.......... $enable_zip
-+SYSTEM_ZIP........... $with_system_zip
- JMA support.......... $enable_jma
- debugger............. $enable_debugger
- 
--- 
-2.10.2
-
diff --git a/games-emulation/snes9x/files/snes9x-1.56-build-system.patch b/games-emulation/snes9x/files/snes9x-1.56-build-system.patch
new file mode 100644
index 000000000000..d2ee182cb7cd
--- /dev/null
+++ b/games-emulation/snes9x/files/snes9x-1.56-build-system.patch
@@ -0,0 +1,53 @@
+--- snes9x-1.56/gtk/configure.ac
++++ snes9x-1.56/gtk/configure.ac
+@@ -33,8 +33,8 @@
+ 
+ AM_GLIB_GNU_GETTEXT
+ 
+-snes9xlocaledir='${prefix}/${DATADIRNAME}/locale'
+-snes9xdatadir='${prefix}/${DATADIRNAME}/snes9x'
++snes9xlocaledir='$(localedir)'
++snes9xdatadir='$(datadir)/snes9x'
+ 
+ AC_SUBST(snes9xlocaledir)
+ AC_SUBST(snes9xdatadir)
+--- snes9x-1.56/unix/configure.ac
++++ snes9x-1.56/unix/configure.ac
+@@ -56,37 +56,6 @@
+ # *** Execution begins here ***
+ # *****************************
+ 
+-# Test what compiler flags we should use.
+-
+-AC_ARG_ENABLE([debug],
+-	[AS_HELP_STRING([--enable-debug],
+-		[leave debug information in the final binary (default: no)])],
+-	[], [enable_debug="no"])
+-
+-if test "x$enable_debug" = "xyes"; then
+-	AC_S9X_COMPILER_FLAG([-g],  [g])
+-	AC_S9X_COMPILER_FLAG([-O0], [o0])
+-else
+-	AC_S9X_COMPILER_FLAG([-O3], [o3], [
+-		AC_S9X_COMPILER_FLAG([-O2], [o2], [
+-			AC_S9X_COMPILER_FLAG([-O1], [o1])])])
+-	AC_S9X_COMPILER_FLAG([-fomit-frame-pointer], [omit_frame_pointer])
+-fi
+-
+-AC_ARG_ENABLE([mtune],
+-	[AS_HELP_STRING([--enable-mtune],
+-		[use the specified value for the -mtune/-mcpu flag (default: no)])],
+-	[], [enable_mtune="no"])
+-
+-if test "x$enable_mtune" != "xno"; then
+-	AC_S9X_COMPILER_FLAG([-mtune="$enable_mtune"], [mtune],
+-	[
+-		AC_MSG_WARN([-mtune failed, trying -mcpu...])
+-		AC_S9X_COMPILER_FLAG([-mcpu="$enable_mtune"], [mcpu],
+-			[AC_MSG_ERROR([Please specify a working value for --enable-mtune.])])
+-	])
+-fi
+-
+ AC_S9X_COMPILER_FLAG([-fno-exceptions],       [no_exceptions])
+ AC_S9X_COMPILER_FLAG([-fno-rtti],             [no_rtti])
+ AC_S9X_COMPILER_FLAG([-pedantic],             [pedantic])
diff --git a/games-emulation/snes9x/snes9x-1.54.1.ebuild b/games-emulation/snes9x/snes9x-1.56.ebuild
index 972c9db684b9..652a1c859215 100644
--- a/games-emulation/snes9x/snes9x-1.54.1.ebuild
+++ b/games-emulation/snes9x/snes9x-1.56.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils flag-o-matic multilib gnome2-utils
+
+inherit autotools flag-o-matic gnome2-utils xdg-utils
 
 DESCRIPTION="Super Nintendo Entertainment System (SNES) emulator"
 HOMEPAGE="https://github.com/snes9xgit/snes9x"
@@ -11,24 +12,31 @@ 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 xinerama +xv"
 RESTRICT="bindist"
 
 RDEPEND="
-	sys-libs/zlib[minizip]
+	sys-libs/zlib:=[minizip]
 	x11-libs/libX11
 	x11-libs/libXext
-	png? ( >=media-libs/libpng-1.2.43:0 )
-	gtk? ( >=x11-libs/gtk+-2.10:2
+	png? ( media-libs/libpng:0= )
+	gtk? (
+		dev-libs/glib:2
+		dev-libs/libxml2
+		>=x11-libs/gtk+-3.0:3
+		x11-libs/libXrandr
 		x11-misc/xdg-utils
+		alsa? ( media-libs/alsa-lib )
+		joystick? ( media-libs/libsdl2[joystick] )
+		opengl? (
+			media-libs/libepoxy
+			virtual/opengl
+		)
 		portaudio? ( >=media-libs/portaudio-19_pre )
-		joystick? ( >=media-libs/libsdl-1.2.12[joystick] )
-		opengl? ( virtual/opengl )
+		pulseaudio? ( media-sound/pulseaudio )
 		xv? ( x11-libs/libXv )
-		xrandr? ( x11-libs/libXrandr )
-		alsa? ( media-libs/alsa-lib )
-		pulseaudio? ( media-sound/pulseaudio ) )
-"
+	)
+	xinerama? ( x11-libs/libXinerama )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	x11-base/xorg-proto
@@ -37,16 +45,15 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${P}/unix"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.54.1-build.patch
 	"${FILESDIR}"/${PN}-1.53-cross-compile.patch
-	"${FILESDIR}"/${PN}-1.54.1-system-zlib.patch
+	"${FILESDIR}"/${PN}-1.56-build-system.patch
 )
 
 src_prepare() {
 	cd "${WORKDIR}"/${P} || die
 	rm -r unzip || die
 	default
-	cd unix
+	cd unix || die
 	eautoreconf
 	if use gtk; then
 		cd ../gtk || die
@@ -58,40 +65,43 @@ 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 \
-			--datadir=/usr/share \
-			--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)
+		)
+		econf "${myeconfargs[@]}"
 	fi
 }
 
 src_compile() {
 	emake
-	if use gtk; then
-		emake -C ../gtk
-	fi
+	use gtk && emake -C ../gtk
 }
 
 src_install() {
@@ -113,9 +123,15 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	use gtk && gnome2_icon_cache_update
+	if use gtk ; then
+		gnome2_icon_cache_update
+		xdg_desktop_database_update
+	fi
 }
 
 pkg_postrm() {
-	use gtk && gnome2_icon_cache_update
+	if use gtk ; then
+		gnome2_icon_cache_update
+		xdg_desktop_database_update
+	fi
 }