Use minizip from new zlib.

(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

3 files changed, 77 insertions, 5 deletions

diff --git a/dev-libs/tntnet/ChangeLog b/dev-libs/tntnet/ChangeLog
index 172a6d7ec53e..1304e0a43364 100644
--- a/dev-libs/tntnet/ChangeLog
+++ b/dev-libs/tntnet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/tntnet
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tntnet/ChangeLog,v 1.17 2011/01/21 15:51:53 hd_brummy Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tntnet/ChangeLog,v 1.18 2012/04/27 22:53:37 vapier Exp $
+
+  27 Apr 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/tntnet-2.0-zlib-minizip.patch, tntnet-2.0-r1.ebuild:
+  Use minizip from new zlib.
 
   21 Jan 2011; Joerg Bornkessel <hd_brummy@gentoo.org> metadata.xml:
   readded maintainer
diff --git a/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch b/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch
new file mode 100644
index 000000000000..07b4836319d4
--- /dev/null
+++ b/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch
@@ -0,0 +1,65 @@
+--- a/configure.in
++++ b/configure.in
+@@ -18,6 +18,7 @@
+ 
+ AC_PROG_CXX
+ AC_PROG_LIBTOOL
++PKG_PROG_PKG_CONFIG
+ 
+ AC_LANG(C++)
+ ACX_PTHREAD
+@@ -25,6 +26,12 @@
+ AC_CHECK_HEADER([zlib.h], , AC_MSG_ERROR([zlib not found]))
+ AC_CHECK_HEADER([cxxtools/net/tcpsocket.h], , AC_MSG_ERROR([cxxtools headers not found]))
+ 
++PKG_CHECK_MODULES([MINIZIP], [minizip],
++  [HAVE_MINIZIP=true], [HAVE_MINIZIP=false])
++AC_SUBST([MINIZIP_CFLAGS])
++AC_SUBST([MINIZIP_LIBS])
++AM_CONDITIONAL([HAVE_MINIZIP], [test $HAVE_MINIZIP = true])
++
+ AC_ARG_WITH([epoll],
+   AS_HELP_STRING([--with-epoll=yes|no|probe], [use epoll]),
+   [epoll_option=$withval],
+--- a/framework/common/Makefile.am
++++ b/framework/common/Makefile.am
+@@ -23,7 +23,6 @@ libtntnet_la_SOURCES = \
+ 	httpparser.cpp \
+ 	httprequest.cpp \
+ 	httpreply.cpp \
+-	ioapi.c \
+ 	job.cpp \
+ 	langlib.cpp \
+ 	listener.cpp \
+@@ -41,16 +40,13 @@ libtntnet_la_SOURCES = \
+ 	stringlessignorecase.cpp \
+ 	tntconfig.cpp \
+ 	tntnet.cpp \
+-	unzip.c \
+ 	unzipfile.cpp \
+ 	urlescostream.cpp \
+ 	urlmapper.cpp \
+ 	util.cpp \
+ 	worker.cpp \
+ 	zdata.cpp \
+-	crypt.h \
+-	ioapi.h \
+-	unzip.h
++	crypt.h
+ 
+ nobase_include_HEADERS = \
+ 	tnt/applicationunlocker.h \
+@@ -145,3 +141,13 @@ noinst_HEADERS += \
+ 	tnt/stressjob.h
+ endif
+ 
++if HAVE_MINIZIP
++libtntnet_la_CXXFLAGS += $(MINIZIP_CFLAGS)
++libtntnet_la_LDFLAGS += $(MINIZIP_LIBS)
++else
++libtntnet_la_SOURCES += \
++	ioapi.c \
++	ioapi.h \
++	unzip.c \
++	unzip.h
++endif
diff --git a/dev-libs/tntnet/tntnet-2.0-r1.ebuild b/dev-libs/tntnet/tntnet-2.0-r1.ebuild
index 0e738669917b..2fc97cbbc6d6 100644
--- a/dev-libs/tntnet/tntnet-2.0-r1.ebuild
+++ b/dev-libs/tntnet/tntnet-2.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tntnet/tntnet-2.0-r1.ebuild,v 1.1 2011/01/21 00:01:06 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tntnet/tntnet-2.0-r1.ebuild,v 1.2 2012/04/27 22:53:37 vapier Exp $
 
 EAPI="3"
 
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~sparc ~x86"
 IUSE="cgi doc examples gnutls server sdk ssl"
 
 RDEPEND=">=dev-libs/cxxtools-2.0
-	sys-libs/zlib
+	sys-libs/zlib[minizip]
 	ssl? (
 		gnutls? (
 			>=net-libs/gnutls-1.2.0
@@ -25,12 +25,15 @@ RDEPEND=">=dev-libs/cxxtools-2.0
 		!gnutls? ( dev-libs/openssl )
 	)"
 DEPEND="${RDEPEND}
+	dev-util/pkgconfig
 	examples? ( app-arch/zip )"
 
 src_prepare() {
 	# Both fixed in the next release
 	epatch "${FILESDIR}/${P}-as-needed.patch"
 	epatch "${FILESDIR}/${P}-gnutls.patch"
+	epatch "${FILESDIR}"/${P}-zlib-minizip.patch
+	rm framework/common/{ioapi,unzip}.[ch] || die
 
 	eautoreconf