Use system zlib, bug #251109

Package-Manager: portage-2.2_rc30/cvs/Linux i686

4 files changed, 109 insertions, 7 deletions

diff --git a/games-util/dzip/ChangeLog b/games-util/dzip/ChangeLog
index e0738f418172..61fa84a58573 100644
--- a/games-util/dzip/ChangeLog
+++ b/games-util/dzip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-util/dzip
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/dzip/ChangeLog,v 1.9 2008/12/06 15:40:54 nyhm Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-util/dzip/ChangeLog,v 1.10 2009/04/14 16:59:19 nyhm Exp $
+
+*dzip-2.9-r2 (14 Apr 2009)
+
+  14 Apr 2009; Tristan Heaven <nyhm@gentoo.org>
+  +files/dzip-2.9-system-zlib.patch, +dzip-2.9-r2.ebuild:
+  Use system zlib, bug #251109
 
   06 Dec 2008; Tristan Heaven <nyhm@gentoo.org> dzip-2.9-r1.ebuild:
   Respect CC, bug #244120
diff --git a/games-util/dzip/Manifest b/games-util/dzip/Manifest
index fe166646e38b..98ce901be59c 100644
--- a/games-util/dzip/Manifest
+++ b/games-util/dzip/Manifest
@@ -2,14 +2,16 @@
 Hash: SHA1
 
 AUX dzip-2.9-scrub-names.patch 1816 RMD160 cceb47cd9fd785f7c2dc000cd9eb5e07f5a9d900 SHA1 98ebfbca21a0e561650456d14adad74866fef185 SHA256 a55eed49939cb4b5b2b8268562081d8ed4a4365424ad43482ebd3db7a573bebb
+AUX dzip-2.9-system-zlib.patch 1244 RMD160 b6eb2aae677d2f2a1162036993925603934f641e SHA1 f7c309e30b1f19c9fe5863c8a89c1da67a8c1aa6 SHA256 36a396bd4f1a55fbc0c8b402373a14853bb5734466b040a9cd6c87644bdf479d
 DIST dz29src.zip 100354 RMD160 4719785c312a577eb7b1aacad43a24b6fd8a4ed2 SHA1 64e7b0d07c55aaa22bbcf04066135b5a9968e5ee SHA256 de858f6a811096ebd099301cb4acd21eaf9eb1b3f95c1b21ec9e910bcf6f0f17
 EBUILD dzip-2.9-r1.ebuild 1025 RMD160 f5ba06aeb311fb0e7ec856bcdfd75c3d4d0ccd96 SHA1 25fec1435e37ab0f0d59effc194d73c387806bdb SHA256 d07615bfa011b5f8b538efb2215fad9d995a347e76638d2430dd60cbab1e6c49
-MISC ChangeLog 1145 RMD160 20c4c1b51dbe3d4046e8daa957f9ce3c85b04a56 SHA1 e7421ddcd66d5d66744a0fb959b9faf6cea967a4 SHA256 8d3faefb3dd47bf5dec0f3a63d784e0d7a54bcddf538c753b7304ec7d526f1d2
+EBUILD dzip-2.9-r2.ebuild 955 RMD160 054d92e01e893b7f4cdf06c76afe1f6a06b98c2e SHA1 ae41eded429bf71e632dffa3cb3cb5fb64780c74 SHA256 00ab600e04a38218c4b13d5281e3c766578fc2581947edf8a676c9b978411721
+MISC ChangeLog 1312 RMD160 7153e749fda0a20228dde922bbc6ef5ee70b8e74 SHA1 a08422adc92ed911b4c2af654efdbf437d103c8a SHA256 a57163ae736d49b0722126ff059e40d4ce1a7aa24121db345c6168bfacdd3f20
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkk6nQ0ACgkQdz7hIScOUREMsQCfQnQ9Mkntl9n0Ppt/UYWe9wvj
-IvUAn3DleSk9+iKURR0KGjNIcM+yKo5m
-=UouO
+iEYEARECAAYFAknkwO0ACgkQdz7hIScOUREQ4gCg4hmUFPPuZr8ea97mCpTM4gyQ
+8/EAoOa9IjmSaTeIjDNoy/wpb50ZrD1v
+=uIOk
 -----END PGP SIGNATURE-----
diff --git a/games-util/dzip/dzip-2.9-r2.ebuild b/games-util/dzip/dzip-2.9-r2.ebuild
new file mode 100644
index 000000000000..1ed47d7aff30
--- /dev/null
+++ b/games-util/dzip/dzip-2.9-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-util/dzip/dzip-2.9-r2.ebuild,v 1.1 2009/04/14 16:59:19 nyhm Exp $
+
+EAPI=2
+inherit eutils games
+
+DESCRIPTION="compressor/uncompressor for demo recordings from id's Quake"
+HOMEPAGE="http://speeddemosarchive.com/dzip/"
+SRC_URI="http://speeddemosarchive.com/dzip/dz${PV/./}src.zip"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S=${WORKDIR}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-system-zlib.patch \
+		"${FILESDIR}"/${P}-scrub-names.patch #93079
+	rm -rf zlib
+	mv -f Makefile{.linux,}
+}
+
+src_install () {
+	dogamesbin dzip || die "dogamesbin failed"
+	dodoc Readme || die "dodoc failed"
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	echo
+	elog "Demo files can be found at http://planetquake.com/sda/"
+	elog "and http://planetquake.com/qdq/"
+	echo
+}
diff --git a/games-util/dzip/files/dzip-2.9-system-zlib.patch b/games-util/dzip/files/dzip-2.9-system-zlib.patch
new file mode 100644
index 000000000000..f68304adf240
--- /dev/null
+++ b/games-util/dzip/files/dzip-2.9-system-zlib.patch
@@ -0,0 +1,52 @@
+--- dzip.h
++++ dzip.h
+@@ -2,7 +2,7 @@
+ #include <stdlib.h>

+ #include <string.h>

+ 

+-#include "zlib/zlib.h"

++#include <zlib.h>

+ 

+ typedef unsigned char uchar;

+ 

+@@ -177,4 +177,4 @@
+ #else

+ #define DIRCHAR '/'

+ #define WRONGCHAR '\\'

+-#endif
+\ No newline at end of file
++#endif

+--- Makefile.linux
++++ Makefile.linux
+@@ -1,18 +1,17 @@
+ # Makefile for linux

+ 

+-CC = gcc

+-CFLAGS = -Wall -O3

++CC ?= gcc

++CFLAGS ?= -O3

++CFLAGS += -Wall

+ TARGET = dzip

+ OBJECTS = main.o compress.o uncompress.o list.o crc32.o \

+-	  encode.o decode.o v1code.o conmain.o delete.o \

+-	  zlib/adler32.o zlib/deflate.o zlib/trees.o \

+-	  zlib/inflate.o zlib/infblock.o zlib/inftrees.o zlib/infcodes.o \

+-	  zlib/infutil.o zlib/inffast.o

++	  encode.o decode.o v1code.o conmain.o delete.o

++LIBS = -lz

+ 

+ TMPFILES = gmon.out frag*

+ 

+ $(TARGET): $(OBJECTS)

+-	$(CC) $(CFLAGS) $(OBJECTS) -o $(TARGET) $(LDFLAGS)

++	$(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS)

+ 

+ clean:

+ 	rm -f $(TARGET) $(OBJECTS) $(TMPFILES)

+@@ -24,4 +23,4 @@
+ encode.o: encode.c dzip.h

+ list.o: list.c dzip.h dzipcon.h

+ decode.o: decode.c dzip.h dzipcon.h

+-v1code.o: v1code.c dzip.h dzipcon.h
+\ No newline at end of file
++v1code.o: v1code.c dzip.h dzipcon.h