gentoo resync : 04.12.2017

13 files changed, 11 insertions, 530 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index d268a5e2d97b..225ef75ed2d3 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/higan/Manifest b/games-emulation/higan/Manifest
index fdab5a1a7c11..5e6902bab1b7 100644
--- a/games-emulation/higan/Manifest
+++ b/games-emulation/higan/Manifest
@@ -3,6 +3,6 @@ AUX higan-099-QA.patch 2597 BLAKE2B 0737dd216f1dc63620c43478e372a41736d47da6df5e
 AUX higan-wrapper 124 BLAKE2B 3b87ba7212551d8c5b4814ff41e2ecd647589dafe8abfac6f354970e1093cf2ef53e885c9f88f6755c8e2a72c08c61491da073819a19494dbb6a75f8ba413f8e SHA512 af3163d06f3bc14b14ec38cf84d11cc706eb6359727743eea35670b4f1ac120af40102ee5409695eba00ead70fcf964073c24d2f47d6824776391927ebbf3f45
 DIST higan_v094-source.tar.xz 882732 SHA256 5e149df9d50c1066eb97c0d66665428d75304da782bba5a87078b87fc311151b SHA512 e7e48c76cdc93d2d66db1fa0c71e64903cf4188571b2d5ecb8066dd4e2172a67da4dee68bed6fd0a532b6fd397fa4f537b97de58cc5043a9e970d48d0b66b0da WHIRLPOOL 42e2b628e83b6cb8d87ce82c2e91105b0be06790a1927aa7d52f0b1a181af5d627f467009d15daffd470e3c38a2bb7d67ba84919fb1aa9c8d06ad88ca3163641
 DIST higan_v099-source.7z 1012348 SHA256 1c62f2f1ec98da9d098c2df5c8b539a192b5a70eff0896c3e27d541fb4d28e86 SHA512 567f0c9841fb3fed1c78f2afcd9865cbfe06d04b995d4dc468269e459249b758daed949b461b5b8645ebab40edc1f4f28a566de5795325dae4f604190ca9eae6 WHIRLPOOL 096b4da32f9f030a402690e81dc64e0a242072fd7cb3aa1520783a3a69bd76ff73d3fbcfb3624ad9cf9396e5123777a9cd4fd13f04191fe7faf9ec385c1a929e
-EBUILD higan-094.ebuild 3596 BLAKE2B 0c1afa01465c4cfe8b7b72cf8d6aa80f99426116ee96598ed4f30a5694885f377b030fb06f13be82b0240b497548764a05ab302cb8065b54916adb7a12e01a94 SHA512 96b4c27f7a217c36476a1ab90891f151e124ca40b2e96042c9d5530f75742613c939311e71f57497368e3ad993e072684f64001a79fba19bb0903a904ea045c0
-EBUILD higan-099.ebuild 3321 BLAKE2B 7422c6bc6a36cb0bf824e2fdeed43a2de631c065ea6ab43ea8299fd8ea1fb9439960e371d460709350165e74d54690e1791fe7e5a626ac723d755980da6ef0ee SHA512 826e888abda2b7f5340277b0b6d2b470b553449cf36a1e7ff748b559df0ad69079ebff49770155529b8c314429d43ec15a03f3be69c599f407fa9782ddb270ca
+EBUILD higan-094.ebuild 3357 BLAKE2B eb354f770e0881677cca6aaa659b520b05e7f98afb1e83d5083d8d2b41b8b6f589ee9793239b31c521faa4101f3daad438d4eb4d09e649a9a7d036e931ea5ed1 SHA512 eae543c1705a3d7e2af1b0425a1839d3121cf3ff22c0b15a8a3564be6c088d7cf16798f5a74133b2b1681b0f2ba6009f8e456c0737ce102fba8faa6545002a38
+EBUILD higan-099.ebuild 3081 BLAKE2B ff75470da256db5e49f8313d87135af2def1d6bd185effa328bb49b97c783d23cc517e46160888707724a56c73ec1303fd2fd98638197e8f62c28f95ffac6e3b SHA512 3e7eff25fc8649bf2181eba3f383e824230c4d574643c5ef0c986fadcd1464f2db0c5db0b3fcb22ae2d26ebdc5504b24916ee5f91025d7fcdc2e0c9ba64f35d9
 MISC metadata.xml 636 BLAKE2B 445ca6a449f6972817e33eb020450420cee9af2f27d605e08764d43d9265d06ba8bb059936c5597f362032964631ffc3fe1b01c3970b23c29e6a988c00448187 SHA512 a835b9cb4fa482754349eaddee279a6bca17cbc070806c0a59c923502159375bbfb481964faae23bbee8379fdbe7e9f0e070cbc783e3c2e62ddd2d88f511170b
diff --git a/games-emulation/higan/higan-094.ebuild b/games-emulation/higan/higan-094.ebuild
index ec815cc3da6f..1401fc403ff3 100644
--- a/games-emulation/higan/higan-094.ebuild
+++ b/games-emulation/higan/higan-094.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,12 +14,13 @@ SRC_URI="http://byuu.org/files/${MY_P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ao +alsa openal opengl oss profile_accuracy +profile_balanced profile_performance pulseaudio qt4 +sdl udev xv"
+IUSE="ao +alsa openal opengl oss profile_accuracy +profile_balanced profile_performance pulseaudio +sdl udev xv"
 REQUIRED_USE="|| ( ao openal alsa pulseaudio oss )
 	|| ( xv opengl sdl )
 	|| ( profile_accuracy profile_balanced profile_performance )"
 
 RDEPEND="
+	x11-libs/gtk+:2
 	x11-libs/libX11
 	x11-libs/libXext
 	ao? ( media-libs/libao )
@@ -30,8 +31,7 @@ RDEPEND="
 	opengl? ( virtual/opengl )
 	sdl? ( media-libs/libsdl[X,joystick,video] )
 	udev? ( virtual/udev )
-	!qt4? ( x11-libs/gtk+:2 )
-	qt4? ( >=dev-qt/qtgui-4.5:4 )"
+"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
@@ -69,12 +69,6 @@ src_prepare() {
 	use sdl || disable_module input.sdl
 	use udev || disable_module input.udev
 
-	# regenerate .moc if needed
-	if use qt4; then
-		cd phoenix/qt || die
-		 "$(qt4_get_bindir)"/moc -i -I. -o platform.moc platform.moc.hpp || die
-	fi
-
 	for i in profile_accuracy profile_balanced profile_performance ; do
 		if use ${i} ; then
 			cp -dRP "${S}" "${S}_${i}" || die
@@ -85,11 +79,7 @@ src_prepare() {
 src_compile() {
 	local mytoolkit i
 
-	if use qt4; then
-		mytoolkit="qt"
-	else
-		mytoolkit="gtk"
-	fi
+	mytoolkit="gtk"
 
 	for i in profile_accuracy profile_balanced profile_performance ; do
 		if use ${i} ; then
diff --git a/games-emulation/higan/higan-099.ebuild b/games-emulation/higan/higan-099.ebuild
index 2a660f3b6e1e..7bea4f56b144 100644
--- a/games-emulation/higan/higan-099.ebuild
+++ b/games-emulation/higan/higan-099.ebuild
@@ -14,11 +14,12 @@ SRC_URI="http://download.byuu.org/${MY_P}.7z"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ao +alsa +icarus openal opengl oss pulseaudio qt4 +sdl udev xv"
+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
@@ -39,9 +40,7 @@ RDEPEND="
 	opengl? ( virtual/opengl )
 	sdl? ( media-libs/libsdl[X,joystick,video] )
 	udev? ( virtual/udev )
-	!qt4? ( x11-libs/gtk+:2 )
-	qt4? (  dev-qt/qtcore:4
-			>=dev-qt/qtgui-4.5:4 )"
+"
 DEPEND="${RDEPEND}
 	app-arch/p7zip
 	virtual/pkgconfig"
@@ -77,22 +76,12 @@ src_prepare() {
 	# input modules
 	use sdl || disable_module input.sdl
 	use udev || disable_module input.udev
-
-	# regenerate .moc if needed
-	if use qt4; then
-		cd hiro/qt || die
-		 "$(qt4_get_bindir)"/moc -i -I. -o qt.moc qt.hpp || die
-	fi
 }
 
 src_compile() {
 	local mytoolkit
 
-	if use qt4; then
-		mytoolkit="qt"
-	else
-		mytoolkit="gtk"
-	fi
+	mytoolkit="gtk"
 
 	if use icarus; then
 		cd "${S}/icarus" || die
diff --git a/games-emulation/mupen64plus/Manifest b/games-emulation/mupen64plus/Manifest
index f82f4329b949..8cfb51c92be6 100644
--- a/games-emulation/mupen64plus/Manifest
+++ b/games-emulation/mupen64plus/Manifest
@@ -1,14 +1,3 @@
-AUX README.gentoo-patches-20091123 1355 BLAKE2B 0923cd2f7f8bde730e9e472835d177911626ba16a10316f79eae8f4c99bb49a22b28c01a678abb852f8c61b0595baba83d0b25373506f1bc666b93d5945785b9 SHA512 a8c5783a44a631acfa33d6e534baa67f542b820a0d9bf48b3696f0188326c01c9061c5cc504f08e2d25abe8923043fdd4931c3feb6931ebd8bb31c0f8a5ea1bd
-AUX README.gentoo-patches-20100507 1521 BLAKE2B 878f72db26a4147cf2369a3beef3850b769f761adf59ef6093eb6c899768fda887791c413097a804c5918cdbd0109939c50859e04e3f1ed2c823c62c93bd1c4d SHA512 0808fb35ad32ec5747391de5e41cd49c381a0fefa0ba2d980ed6a7d786bb5b8d8bc4d51b383209d1003fa5b0f4275544f4348d5de89961a602474abc0d76f465
-AUX ftbfs-gvariant-type-conflicts.patch 828 BLAKE2B 4b670da8ba1d2319fcc4a7ec7664fd1d82eabe57f53b75446acfaa6018ecece2c6dcb6e1fc09aa565cd5e203eab8451ba878466cbd07b5a5f7853e178f93721b SHA512 a0f559276ae3251500bdcb8c30745d089e91628b73e09b8ef0cfbe15ed29d53197f4e87b8ae8038e1b238788cdd5e60e445a60c6372c2e859175b824a1767a7f
-AUX mupen64plus-1.5-gcc46.patch 335 BLAKE2B 7b531f33598ff919179d1458e1ed9085564f507e9b99d4ef41c53e8fdc15f1e245c100ff07eab745ffea8dd23d6f6dc54aea80f1d432462c3ef6ad4554de7fba SHA512 4a51e8aa654a1d17cbe45ebc22d80e5e43e140d98935e7d3b0b67baf500bde493a7fd3bed27afdcc36150863b78b112028b777e337f8f1a9191cfdcece4f0671
-AUX mupen64plus-1.5-libpng14.patch 1404 BLAKE2B ab76ec6125a12c4e85e781264510a9265fe6669469cf2725b7e02457bda0fb0abe0b51abfc751c392566395ab5f453d157624f4867b4b3552f12f675de6379be SHA512 92986174f22c8af493c2ad7d1052d6ab45e56c85fb0c2c6f8900c9061b33b21d95883225a1e1e547e7c2d648f0c81310b7b959687b519e02146d0176bc2cd5f1
-AUX mupen64plus-1.5-minizip.patch 806 BLAKE2B f00d66ff1ef9ee2065ea39301206c3533d0aca28dcc2e4e60bdacd9b288813df3366f600884e63eedf8945717fa68a042093df2ecd22eee21a7dfb8c783ee074 SHA512 d2831daba45c7431cc62acbcd4e3c55a4c112a48611f739966387a41b3ba9f91d3e73fb96d14166184f084dfe37bb17ff1d0ceea454ea9d219c44dd2c5c01190
-DIST Mupen64Plus-1-5-src.tar.gz 2348443 SHA256 58b2da6095ed8f3bcdcb5d7612bb0f1ba81cda1861ca784ef7e46991fd73cf3f SHA512 548be341e69eee543288a0a347ee117341847a032cc0a668a75ab7aaa881e876b6d143d2da9f8ec7580e4b1bbd2b36a3c8f99a0cb8c2301e4b03b593cdee5eb4 WHIRLPOOL fe5e63f07cc50676ef796a96d19e51eef38744f40e1626fd59471a65e530ac78109253ceb4f25cb9df2b4d33f4eecd47be1b9c7fa1a5d7a2304b98bdab0ef137
-DIST mupen64plus-1.5-patches-20091123.tar.bz2 25579 SHA256 b4bebb8105d7ca083b1e3d96d23dea9f2170703d53b0ea75e09b428e73e43187 SHA512 1fccfaed0d0a6d4bc3382a21b1529a173faa4fc718fd4dc6d94a850f5ad3788103041a202774c09f6db9a409b4de256a8b4a746f58860f13c8f69cc6243a9c3f WHIRLPOOL 5ed3fa14eb8a9c0b4fad71d70495125ebfe2313d23edf6155b7056fe9b583ceaeb860cf6b6df574caca315db54af786fda66871621bc1547f929f8f6e6161193
-DIST mupen64plus-1.5-patches-20100507.tar.bz2 33484 SHA256 372e437ab9d53eda23fd63cede33be38114efe527f239ef41b0c904fe208e2ce SHA512 f0265cbcc2e60bac906611a74bb7f5ea94a625d3abeee127fa105a308e9388258e2854ad91256fe14343f9b8837dfe43cb4eca16176a375f07c1259729045213 WHIRLPOOL c3fa3562bda7bd8a01fbc1644fbc7caa511bffec0efde7da479e40066bb8e31952bf98c718ab96b12211429835c458a9ab94c8fe8da540c301c83806e3bb1af1
-EBUILD mupen64plus-1.5-r1.ebuild 3241 BLAKE2B 6c8db5dc7a409b149282f8b3fce48b48cf3a80075f905a63f3c152182e91f500c09f4afa2fe264515f433b88f4c1fc9a9d81c51502f9b396538a42edb254dffb SHA512 e4d14dd20916e04abd47f2cd8472f06d6fc3b362cfad3ddde603620607c285298436f5449e9aed2e7865e4136629ed8f4a7ac9de52196927c30ee8fec7752c83
-EBUILD mupen64plus-1.5-r2.ebuild 3452 BLAKE2B c4723228ddd91ef27a56070d78379b7441fd104f00ccb060f22c1068c832ea858b6ac644cc91cd9fbd1f03bf2357c1e27c39ed4f9357dde9e4c844516d368352 SHA512 627aa5cd441909c24a458513c1c586636ceea58d4c62e4c76fd9dd66c6ae0b9bcb277d80e2b928bef782ec1e3cf836d3d756951f26d79998a99ddeb13cad49b3
 EBUILD mupen64plus-2.0.ebuild 797 BLAKE2B 9562f4b9d54e80dd5a20154318a41433c31082f71c334edf4ec0cc439380b0103db796fc380d13663a953799c1d9f48428e4165d4ccfb72911cf45a51c937df5 SHA512 6e2018392dd18c315b2b98aa329206630189df1121cc837c31e65d7a47c587262fa9f688dfeb0cff13b440f6728f7128ee39582c038119b8866d31d739ccb214
 EBUILD mupen64plus-2.5.ebuild 850 BLAKE2B c1079b7f95589a9d06483223ff372c2c48a2bf1324b961b537bef75b38339c40969b29f5c252e81c5bd5d7dfebba25c94a73eda1ff535e02e52a5c06c5193e22 SHA512 db172c94bc00f77f37ec07ef03b02f44185c6cd9506d989851a1a7decabe560187eaf460968f60482ec7e8a82e5e7f9ebf4aebf7fec4fdc17d3c360773d8d820
 MISC metadata.xml 1214 BLAKE2B 07743bcedcaa0fefd3758db77a7aef127fb984ca4e43d11fbd3a22bd58e82b2ef6e662096d58350a4c285d2e844d4b5a9b94c7a0ee489bf106d7dfdca3eb451f SHA512 769d0957ce40eca186ef3f2ac1fa85722c0a1ed510150a6cd9f48250b2662468bf6c1280959388f79070eb28a39353c46580057f8f1fd2e5d47a58291dacd1c0
diff --git a/games-emulation/mupen64plus/files/README.gentoo-patches-20091123 b/games-emulation/mupen64plus/files/README.gentoo-patches-20091123
deleted file mode 100644
index 96994d798b7a..000000000000
--- a/games-emulation/mupen64plus/files/README.gentoo-patches-20091123
+++ /dev/null
@@ -1,55 +0,0 @@
-All patches below 500 are from the Debian git repository (Nov 23 12:35 CET 2009):
-
-http://git.debian.org/?p=collab-maint/mupen64plus.git;a=tree;f=debian/patches;hb=master
-
-Patches included:
-=================
-
-fix-desktop-file.patch
-destdir.patch
-dejavu-font.patch
-as-needed.patch
-system-libpng.patch
-system-zlib.patch
-system-libbz2.patch
-remove-gln64.patch
-remove-nondfsg-icons.patch
-glide64-noasm.patch
-rice-texturepack-crash.patch
-rice-screenflickering.patch
-static-binutils-libs.patch
-fix-7z-subfolder.patch
-ftbfs-dynarec.patch
-ftbfs-kfreebsd.patch
-ftbfs-debugger.patch
-debian-archs.patch
-ftbfs-glibc210.patch
-version-string.patch
-default-optimisations.patch
-gtk-open-filter.patch
-noexecstack.patch
-fix_readpng.patch
-jttl_fix_romclosed.patch
-rice_nodebug.patch
-interpreter_x86_fldcw.patch
-correct_fpr32_mapping.patch
-load_aidacrate.patch
-load_vistatus.patch
-fix_r0_override.patch
-resume_on_start.patch
-osd-pause-crash.patch
-system-liblzma.patch
-- system-liblzma got changed to work without the droped xdg-basedir.patch
-
-Patches excluded:
-=================
-
-plugin-searchpath.patch
-xdg-basedir.patch
-- Because Gentoo uses different locations like /usr/games/lib(64) and /usr/share/games.
-  The usage of xdg patch location standards would ne nice though.
-
-A big thanks to all the authors of the patches.
-
-Have fun
-Christian Birchinger <joker@gentoo.org>
diff --git a/games-emulation/mupen64plus/files/README.gentoo-patches-20100507 b/games-emulation/mupen64plus/files/README.gentoo-patches-20100507
deleted file mode 100644
index e6b857a07d48..000000000000
--- a/games-emulation/mupen64plus/files/README.gentoo-patches-20100507
+++ /dev/null
@@ -1,59 +0,0 @@
-All patches below 500 are from the Debian git repository (May 07 2010):
-
-http://git.debian.org/?p=collab-maint/mupen64plus.git;a=tree;f=debian/patches;hb=master
-
-Patches included:
-=================
-
-fix-desktop-file.patch
-destdir.patch
-- dejavu-font.patch adjusted the font path to the font location on Gentoo systems
-as-needed.patch
-system-libpng.patch
-system-zlib.patch
-system-libbz2.patch
-remove-gln64.patch
-remove-nondfsg-icons.patch
-glide64-noasm.patch
-rice-texturepack-crash.patch
-rice-screenflickering.patch
-static-binutils-libs.patch
-fix-7z-subfolder.patch
-ftbfs-dynarec.patch
-ftbfs-kfreebsd.patch
-ftbfs-debugger.patch
-debian-archs.patch
-ftbfs-glibc210.patch
-version-string.patch
-default-optimisations.patch
-gtk-open-filter.patch
-noexecstack.patch
-fix_readpng.patch
-jttl_fix_romclosed.patch
-rice_nodebug.patch
-interpreter_x86_fldcw.patch
-correct_fpr32_mapping.patch
-load_aidacrate.patch
-load_vistatus.patch
-fix_r0_override.patch
-resume_on_start.patch
-osd-pause-crash.patch
-system-liblzma.patch
-ftbfs-gvariant-type-conflicts.path
-rsp_ucode2_reset.patch
-rsp_hle_bigendian.patch
-rice-crash-vendorstring.patch
-- system-liblzma got changed to work without the droped xdg-basedir.patch
-
-Patches excluded:
-=================
-
-plugin-searchpath.patch
-xdg-basedir.patch
-- Because Gentoo uses different locations like /usr/games/lib(64) and /usr/share/games.
-  The usage of xdg patch location standards would ne nice though.
-
-A big thanks to all the authors of the patches.
-
-Have fun
-Christian Birchinger <joker@gentoo.org>
diff --git a/games-emulation/mupen64plus/files/ftbfs-gvariant-type-conflicts.patch b/games-emulation/mupen64plus/files/ftbfs-gvariant-type-conflicts.patch
deleted file mode 100644
index e76da1707285..000000000000
--- a/games-emulation/mupen64plus/files/ftbfs-gvariant-type-conflicts.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Fix FTBFS due to glib gvariant type definitions
-Forwarded: not-needed
-Bug-Debian: http://bugs.debian.org/577329
-Author: Sven Eckelmann <sven.eckelmann@gmx.de>
-
----
-diff --git a/rice_video/typedefs.h b/rice_video/typedefs.h
-index 4cded542b06445f043fa1fabf77e4d20c9d52920..b7e16e9c4ba3248f9fed9762f79349c137ee2026 100644
---- a/rice_video/typedefs.h
-+++ b/rice_video/typedefs.h
-@@ -20,10 +20,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- #ifndef _TYPEDEFS_H_
- #define _TYPEDEFS_H_
- 
--#define uchar  unsigned char
--#define uint16 unsigned short
--#define uint32 unsigned int
--#define uint64 unsigned long long
-+#include <stdint.h>
-+
-+typedef uint8_t uchar;
-+typedef uint16_t uint16;
-+typedef uint32_t uint32;
-+typedef uint64_t uint64;
- 
- typedef unsigned char               uint8;
- 
diff --git a/games-emulation/mupen64plus/files/mupen64plus-1.5-gcc46.patch b/games-emulation/mupen64plus/files/mupen64plus-1.5-gcc46.patch
deleted file mode 100644
index 2608fcd32a77..000000000000
--- a/games-emulation/mupen64plus/files/mupen64plus-1.5-gcc46.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pre.mk.old	2011-04-14 20:39:21.000000000 +0200
-+++ pre.mk	2011-04-14 20:39:57.000000000 +0200
-@@ -319,7 +319,7 @@
-   # tweak flags for 32-bit build on 64-bit system
-   ifeq ($(ARCH), 64BITS_32)
-     CFLAGS += -m32
--    LDFLAGS += -m32 -m elf_i386
-+    LDFLAGS += -m32 -Wl,-m,elf_i386
-   endif
- endif
- ifeq ($(CPU_ENDIANNESS), BIG)
diff --git a/games-emulation/mupen64plus/files/mupen64plus-1.5-libpng14.patch b/games-emulation/mupen64plus/files/mupen64plus-1.5-libpng14.patch
deleted file mode 100644
index 8d0b447fe96b..000000000000
--- a/games-emulation/mupen64plus/files/mupen64plus-1.5-libpng14.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=308753
-
---- rice_video/liblinux/pngrw.c
-+++ rice_video/liblinux/pngrw.c
-@@ -136,9 +136,9 @@
-         if (end_info != NULL)
-             png_destroy_read_struct((png_structp *) &png_ptr, (png_infop *) &info_ptr, (png_infop *) &end_info);
-         else if (info_ptr != NULL)
--            png_destroy_read_struct((png_structp *) &png_ptr, (png_infop *) &info_ptr, png_infopp_NULL);
-+            png_destroy_read_struct((png_structp *) &png_ptr, (png_infop *) &info_ptr, NULL);
-         else if (png_ptr != NULL)
--            png_destroy_read_struct((png_structp *) &png_ptr, png_infopp_NULL, png_infopp_NULL);
-+            png_destroy_read_struct((png_structp *) &png_ptr, NULL, NULL);
-         if (rows)
-         {
-             if (rows[0])
-@@ -162,7 +162,7 @@
- 
-     /* check the signature */
-     fread( signature, 1, 8, file );
--    if ( !png_check_sig( signature, 8 ) )
-+    if ( png_sig_cmp( signature, 0, 8 ) )
-         longjmp( err_jmp, (int)errUnsupportedFileFormat );
- 
-     /* create a pointer to the png read structure */
-@@ -199,7 +199,7 @@
- 
-     /* extract the data we need to form the HBITMAP from the PNG header */
-     png_get_IHDR( png_ptr, info_ptr, &Width, &Height, &BitDepth, &ColorType,
--        &InterlaceType, int_p_NULL, int_p_NULL);
-+        &InterlaceType, (int *) NULL, (int *) NULL);
- 
-     img->width = Width;
-     img->height = Height;
diff --git a/games-emulation/mupen64plus/files/mupen64plus-1.5-minizip.patch b/games-emulation/mupen64plus/files/mupen64plus-1.5-minizip.patch
deleted file mode 100644
index 9ed3d7a0b256..000000000000
--- a/games-emulation/mupen64plus/files/mupen64plus-1.5-minizip.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-use minizip from system zlib
-
-https://bugs.gentoo.org/383845
-
---- a/Makefile
-+++ b/Makefile
-@@ -101,8 +101,6 @@
- 	main/plugin.o \
- 	main/rom.o \
- 	main/savestates.o \
--	main/zip/ioapi.o \
--	main/zip/unzip.o \
- 	main/7zip/7zAlloc.o \
- 	main/7zip/7zBuffer.o \
- 	main/7zip/7zCrc.o \
-@@ -229,7 +227,7 @@
- # set primary objects and libraries for all outputs
- ALL = mupen64plus $(PLUGINS)
- OBJECTS = $(OBJ_CORE) $(OBJ_DYNAREC) $(OBJ_OPENGL)
--LIBS = $(SDL_LIBS) $(LIBGL_LIBS) $(LZMA_LIBS) -lbz2
-+LIBS = $(SDL_LIBS) $(LIBGL_LIBS) $(LZMA_LIBS) -lbz2 -lminizip
- STATIC_LIBS =
- CFLAGS+= $(LZMA_FLAGS)
- 
---- a/main/rom.c
-+++ b/main/rom.c
-@@ -27,7 +27,7 @@
- #include <limits.h>
- #include <zlib.h>
- 
--#include "zip/unzip.h"
-+#include "minizip/unzip.h"
- #include <bzlib.h>
- #include <lzma.h>
- #include "7zip/7zExtract.h"
diff --git a/games-emulation/mupen64plus/mupen64plus-1.5-r1.ebuild b/games-emulation/mupen64plus/mupen64plus-1.5-r1.ebuild
deleted file mode 100644
index cda3eb2b2121..000000000000
--- a/games-emulation/mupen64plus/mupen64plus-1.5-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils flag-o-matic games
-
-MY_P="Mupen64Plus-${PV/./-}-src"
-
-PATCH_VERSION="20091123"
-
-DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator"
-HOMEPAGE="http://www.mupen64plus.org/"
-SRC_URI="https://mupen64plus.googlecode.com/files/${MY_P}.tar.gz mirror://gentoo/${P}-patches-${PATCH_VERSION}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+gtk libsamplerate lirc qt4 cpu_flags_x86_sse"
-
-# GTK+ is currently required by plugins even if no GUI support is enabled
-RDEPEND="virtual/opengl
-	media-libs/freetype:2
-	media-libs/libpng
-	media-libs/libsdl
-	media-libs/sdl-ttf
-	sys-libs/zlib
-	x11-libs/gtk+:2
-	libsamplerate? ( media-libs/libsamplerate )
-	lirc? ( app-misc/lirc )
-	qt4? ( dev-qt/qtgui:4
-		dev-qt/qtcore:4 )
-	app-arch/xz-utils"
-
-DEPEND="${RDEPEND}
-	dev-lang/yasm
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if ! use gtk && ! use qt4; then
-		ewarn "Building ${PN} without any GUI! To get one, enable USE=gtk or USE=qt4."
-	elif use gtk && use qt4; then
-		ewarn "Only one GUI can be built, using GTK+ one."
-	fi
-
-	games_pkg_setup
-}
-
-src_prepare() {
-	EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" \
-		epatch
-
-	epatch "${FILESDIR}"/${P}-libpng14.patch
-
-	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=577329
-	epatch "${FILESDIR}"/ftbfs-gvariant-type-conflicts.patch
-
-	sed -i \
-		-e "s:/usr/local/share/mupen64plus:${GAMES_DATADIR}/mupen64plus:" \
-		-e "s:%PUT_PLUGIN_PATH_HERE%:$(games_get_libdir)/${PN}/plugins/:" \
-		main/main.c || die "sed failed"
-
-	# Fix 010_all_fix-desktop-file.patch instead of using sed on the next major bump
-	sed -i \
-		-e "s:^Icon=mupen64plus-large.xpm:Icon=mupen64plus:" \
-		mupen64plus.desktop.in || die "sed failed"
-}
-
-get_opts() {
-	if use amd64 || use x86 ; then
-		echo -n "CPU=X86 ARCH=64BITS$(use x86 && echo -n _32) "
-	fi
-
-	use libsamplerate || echo -n "NO_RESAMP=1 "
-	use lirc && echo -n "LIRC=1 "
-	use cpu_flags_x86_sse || echo -n "NO_ASM=1 "
-
-	echo -n GUI=
-	if use gtk; then
-		echo -n GTK2
-	elif use qt4; then
-		echo -n QT4
-	else
-		echo -n NONE
-	fi
-}
-
-src_compile() {
-	use x86 && use cpu_flags_x86_sse && append-flags -fomit-frame-pointer
-	emake $(get_opts) DBGSYM=1 all || die "make failed"
-}
-
-src_install() {
-	# These are:
-	# 1) prefix - not used really, printed only
-	# 2) SHAREDIR
-	# 3) BINDIR
-	# 4) 'LIBDIR' - where to put plugins in
-	# 5) 'MANDIR' - exact directory to put man file in
-	# 6) APPLICATIONSDIR - where to put .desktop in
-
-	./install.sh "${D}" \
-		"${D}${GAMES_DATADIR}/${PN}" \
-		"${D}${GAMES_BINDIR}" \
-		"${D}$(games_get_libdir)/${PN}/plugins" \
-		"${D}/usr/share/man/man1" \
-		"${D}/usr/share/applications" \
-		|| or die "install.sh failed"
-
-	# Copy icon into system-wide location
-	newicon icons/mupen64plus-large.png ${PN}.png || die "newicon failed"
-
-	# 'Move' docs into correct dir
-	rm -r "${D}${GAMES_DATADIR}/${PN}/doc"
-	dodoc README RELEASE TODO doc/*.txt "${FILESDIR}/README.gentoo-patches-${PATCH_VERSION}" || die "dodoc failed"
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	if use lirc; then
-		elog "For lirc configuration see:"
-		elog "https://code.google.com/p/mupen64plus/wiki/LIRC"
-	fi
-}
diff --git a/games-emulation/mupen64plus/mupen64plus-1.5-r2.ebuild b/games-emulation/mupen64plus/mupen64plus-1.5-r2.ebuild
deleted file mode 100644
index da9baaa2206d..000000000000
--- a/games-emulation/mupen64plus/mupen64plus-1.5-r2.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils flag-o-matic games toolchain-funcs
-
-MY_P="Mupen64Plus-${PV/./-}-src"
-
-PATCH_VERSION="20100507"
-
-DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator"
-HOMEPAGE="http://www.mupen64plus.org/"
-SRC_URI="https://mupen64plus.googlecode.com/files/${MY_P}.tar.gz mirror://gentoo/${P}-patches-${PATCH_VERSION}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+gtk libsamplerate lirc qt4 cpu_flags_x86_sse"
-
-# GTK+ is currently required by plugins even if no GUI support is enabled
-RDEPEND="virtual/opengl
-	media-libs/freetype:2
-	media-libs/libpng
-	media-libs/libsdl
-	media-libs/sdl-ttf
-	media-fonts/dejavu
-	sys-libs/zlib[minizip]
-	x11-libs/gtk+:2
-	libsamplerate? ( media-libs/libsamplerate )
-	lirc? ( app-misc/lirc )
-	qt4? ( dev-qt/qtgui:4
-		dev-qt/qtcore:4 )
-	app-arch/xz-utils"
-
-DEPEND="${RDEPEND}
-	dev-lang/yasm
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if [[ ! $(tc-getCC) =~ gcc ]]; then
-		eerror
-		eerror "Compilers like clang and icc are not supported at this point"
-		eerror
-		die "You need gcc to build ${PN}"
-	fi
-
-	if ! use gtk && ! use qt4; then
-		ewarn "Building ${PN} without any GUI! To get one, enable USE=gtk or USE=qt4."
-	elif use gtk && use qt4; then
-		ewarn "Only one GUI can be built, using GTK+ one."
-	fi
-
-	games_pkg_setup
-}
-
-src_prepare() {
-	EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" \
-		epatch
-
-	rm -rf main/zip
-	epatch "${FILESDIR}"/${P}-minizip.patch #383845
-
-	sed -i \
-		-e "s:/usr/local/share/mupen64plus:${GAMES_DATADIR}/mupen64plus:" \
-		-e "s:%PUT_PLUGIN_PATH_HERE%:$(games_get_libdir)/${PN}/plugins/:" \
-		main/main.c || die "sed failed"
-
-	# Fix 010_all_fix-desktop-file.patch instead of using sed on the next major bump
-	sed -i \
-		-e "s:^Icon=mupen64plus-large.xpm:Icon=mupen64plus:" \
-		mupen64plus.desktop.in || die "sed failed"
-	epatch "${FILESDIR}"/${P}-gcc46.patch
-}
-
-get_opts() {
-	if use amd64 || use x86 ; then
-		echo -n "CPU=X86 ARCH=64BITS$(use x86 && echo -n _32) "
-	fi
-
-	use libsamplerate || echo -n "NO_RESAMP=1 "
-	use lirc && echo -n "LIRC=1 "
-	use cpu_flags_x86_sse || echo -n "NO_ASM=1 "
-
-	echo -n GUI=
-	if use gtk; then
-		echo -n GTK2
-	elif use qt4; then
-		echo -n QT4
-	else
-		echo -n NONE
-	fi
-}
-
-src_compile() {
-	tc-export CC CXX
-	use x86 && use cpu_flags_x86_sse && append-flags -fomit-frame-pointer
-	emake $(get_opts) DBGSYM=1 CC="${CC}" CXX="${CXX}" LD="${CC}" all || die "make failed"
-}
-
-src_install() {
-	# These are:
-	# 1) prefix - not used really, printed only
-	# 2) SHAREDIR
-	# 3) BINDIR
-	# 4) 'LIBDIR' - where to put plugins in
-	# 5) 'MANDIR' - exact directory to put man file in
-	# 6) APPLICATIONSDIR - where to put .desktop in
-
-	./install.sh "${D}" \
-		"${D}${GAMES_DATADIR}/${PN}" \
-		"${D}${GAMES_BINDIR}" \
-		"${D}$(games_get_libdir)/${PN}/plugins" \
-		"${D}/usr/share/man/man1" \
-		"${D}/usr/share/applications" \
-		|| or die "install.sh failed"
-
-	# Copy icon into system-wide location
-	newicon icons/mupen64plus-large.png ${PN}.png || die "newicon failed"
-
-	# 'Move' docs into correct dir
-	rm -r "${D}${GAMES_DATADIR}/${PN}/doc"
-	dodoc README RELEASE TODO doc/*.txt "${FILESDIR}/README.gentoo-patches-${PATCH_VERSION}" || die "dodoc failed"
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	if use lirc; then
-		elog "For lirc configuration see:"
-		elog "https://code.google.com/p/mupen64plus/wiki/LIRC"
-	fi
-}