Use minizip from system zlib #383845 by Dennis Schridde.

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

4 files changed, 53 insertions, 10 deletions

diff --git a/games-emulation/mupen64plus/ChangeLog b/games-emulation/mupen64plus/ChangeLog
index 4ed7aac33651..1aaf29aa14e7 100644
--- a/games-emulation/mupen64plus/ChangeLog
+++ b/games-emulation/mupen64plus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/mupen64plus
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus/ChangeLog,v 1.14 2011/07/13 06:55:27 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus/ChangeLog,v 1.15 2011/09/24 05:48:48 vapier Exp $
+
+  24 Sep 2011; Mike Frysinger <vapier@gentoo.org> mupen64plus-1.5-r2.ebuild,
+  +files/mupen64plus-1.5-minizip.patch:
+  Use minizip from system zlib #383845 by Dennis Schridde.
 
   13 Jul 2011; Tupone Alfredo <tupone@gentoo.org>
   files/mupen64plus-1.5-gcc46.patch:
diff --git a/games-emulation/mupen64plus/Manifest b/games-emulation/mupen64plus/Manifest
index 6f9d900f19af..220376c9fdf4 100644
--- a/games-emulation/mupen64plus/Manifest
+++ b/games-emulation/mupen64plus/Manifest
@@ -1,22 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX README.gentoo-patches-20091123 1355 RMD160 36a949e4205699623c4a5283abe38f4062783560 SHA1 d144cc1167d6c02008f0afb25ec3792e650f066c SHA256 472ca36495f5cd59c66a23d4660dff19e890c7bca9c389352a54371f9aae5b2e
 AUX README.gentoo-patches-20100507 1521 RMD160 1f5f8e1fa80816df8f39763f7e82e1f24d0236f3 SHA1 77c68a0cc466252561ce1e9cc23ca5a31eccb440 SHA256 c760661690d7f466bbd8640bae085b35f1e20b6c3ec882092b7547cbd32efccd
 AUX ftbfs-gvariant-type-conflicts.patch 828 RMD160 588773a037a037f83fcf25a94ed29cc7a161e614 SHA1 f43a04f16b555fe81935fc1ba1ced2d71cba72bf SHA256 14483751e07912daeabb35b31f1b2fdae454658e00ea1a10627de29bd43881c0
 AUX mupen64plus-1.5-gcc46.patch 335 RMD160 713ecdf2646f7156e47e5b6dc1816c2c31d3dd91 SHA1 8b8e4d11da101d5b57bca92bf879df6503e0ebc2 SHA256 47eb75a963d9138f2aecaada6c4486bb9b6beff5e6acc0afcc2f364a94db540e
 AUX mupen64plus-1.5-libpng14.patch 1404 RMD160 d6de12bd2922b79e7cbe2ead8b4419d94eabca8f SHA1 374915395ba7454da1e7a7e4839c5785f45dd62d SHA256 c0efb54eee809135dbb9429fc9869456a1d437a90929d9df09ab1102157d183f
+AUX mupen64plus-1.5-minizip.patch 806 RMD160 25513a7e6cd69b01ba3a05c746e5bb7297ecdfeb SHA1 277042f4dd07a014e370ac50ed570b55e9cca2e8 SHA256 fb46d61b99bcc6415e3f17bcf536e6cc4591f0761aeca1757275d59de9affe76
 DIST Mupen64Plus-1-5-src.tar.gz 2348443 RMD160 690d1e80d4a10a3a74e7d955c0ee23e3bd4ff996 SHA1 ef200d6ea2eb3faa969ba9c82d2a771236c3145d SHA256 58b2da6095ed8f3bcdcb5d7612bb0f1ba81cda1861ca784ef7e46991fd73cf3f
 DIST mupen64plus-1.5-patches-20091123.tar.bz2 25579 RMD160 4e956e66bedd944889c6b620a67c6a088c569bdb SHA1 dba1c3a2079cd96d5e2b8a06223ede21597ae958 SHA256 b4bebb8105d7ca083b1e3d96d23dea9f2170703d53b0ea75e09b428e73e43187
 DIST mupen64plus-1.5-patches-20100507.tar.bz2 33484 RMD160 33d1a605c4e63de079cd0182410d8b7c4db85d11 SHA1 0b72e8b56d3bb50ff94dda0d608de8e48e5aca5e SHA256 372e437ab9d53eda23fd63cede33be38114efe527f239ef41b0c904fe208e2ce
 EBUILD mupen64plus-1.5-r1.ebuild 3339 RMD160 0143efeef1abf4554b0cd4d8d7eefb1ed63cf4c6 SHA1 e2aac6c26db762b52852f09745b8bea5293a8376 SHA256 f658780a3e24f8187958b17f375b679b22e32b02573db794bee8d9bfd07dc73b
-EBUILD mupen64plus-1.5-r2.ebuild 3240 RMD160 2288549eb7bf9cc3263ba12aa05c9f8f7820003f SHA1 614cc2e8c3c880824c861cafb14239f508344ed6 SHA256 016f21d5e307effa2ea8901edcf68c385fe14064f7989a0d6b2db84442a5c131
-MISC ChangeLog 3204 RMD160 f9c73a27a666575d2d9b2c42107ab20de3906939 SHA1 276a563a4d4189d391bdb9c38424b6cfe9e1e271 SHA256 3b628d459f973847091a4e0adf7156d147b2a62ee653ad487b836326c60d3264
+EBUILD mupen64plus-1.5-r2.ebuild 3316 RMD160 62491c38dbbe0f2b5b8ab01bc1424b24baa48283 SHA1 8b5cc8288933da4d30f85978740c54b0fdde7a60 SHA256 cea2049a7efb0a8a9f7589cb3e5dc949e5201c21523951e4e57ac31d85bf1bdb
+MISC ChangeLog 3381 RMD160 890773ad0c4a58dfde76fd2692c4460d16e4a7ac SHA1 1883f1173d3cad1b07f31ee8e517689e0a3ea293 SHA256 1e1de4eb01647d9c3f64fe5a8be7b69702920a2b16835db677f5ba9bf8cb4245
 MISC metadata.xml 679 RMD160 a52b94f3dac0302970e9b6d9ead4341ca3722d5c SHA1 cddc937cadb60d9a67c578c815f192136b1dd701 SHA256 8cb8d6f4a9724cde575da81a562322e28c628a7bd7233de3424a3c001a006a2f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4dQXUACgkQIY77eQFFFC1ieACgzYU3SdqOSK8ac54hbXdHagp1
-FNAAn2miN5iyTNJwK6mrsMfKHrSXhn/W
-=ezWJ
+iF4EAREIAAYFAk59bykACgkQaC/OocHi7JbvswD9ES93PJu1PknUFM1F9kC0WKd4
+UurNK8/B/0QZmCyJp4sA/1fqV4IXWnthGzLJcaRmgwRwPJikaHR2my6e6jF1fsBG
+=iiHT
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/mupen64plus/files/mupen64plus-1.5-minizip.patch b/games-emulation/mupen64plus/files/mupen64plus-1.5-minizip.patch
new file mode 100644
index 000000000000..9ed3d7a0b256
--- /dev/null
+++ b/games-emulation/mupen64plus/files/mupen64plus-1.5-minizip.patch
@@ -0,0 +1,35 @@
+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-r2.ebuild b/games-emulation/mupen64plus/mupen64plus-1.5-r2.ebuild
index f49e897ef973..81c08ac5f16a 100644
--- a/games-emulation/mupen64plus/mupen64plus-1.5-r2.ebuild
+++ b/games-emulation/mupen64plus/mupen64plus-1.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus/mupen64plus-1.5-r2.ebuild,v 1.2 2011/04/15 11:45:26 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus/mupen64plus-1.5-r2.ebuild,v 1.3 2011/09/24 05:48:48 vapier Exp $
 
 EAPI="2"
 
@@ -26,7 +26,7 @@ RDEPEND="virtual/opengl
 	media-libs/libsdl
 	media-libs/sdl-ttf
 	media-fonts/dejavu
-	sys-libs/zlib
+	sys-libs/zlib[minizip]
 	x11-libs/gtk+:2
 	libsamplerate? ( media-libs/libsamplerate )
 	lirc? ( app-misc/lirc )
@@ -54,6 +54,9 @@ 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/:" \