Unbundle minizip and raise zlib deps accordingly, bug 383349

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

3 files changed, 48 insertions, 6 deletions

diff --git a/dev-db/virtuoso-server/ChangeLog b/dev-db/virtuoso-server/ChangeLog
index d4c915bbf64d..e55cb43ca1d3 100644
--- a/dev-db/virtuoso-server/ChangeLog
+++ b/dev-db/virtuoso-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/virtuoso-server
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/ChangeLog,v 1.23 2011/09/21 19:39:12 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/ChangeLog,v 1.24 2011/09/21 22:25:23 reavertm Exp $
+
+  21 Sep 2011; Maciej Mrozowski <reavertm@gentoo.org>
+  virtuoso-server-6.1.3-r1.ebuild,
+  +files/virtuoso-server-6.1.3-unbundle-minizip.patch:
+  Unbundle minizip and raise zlib deps accordingly, bug 383349
 
   21 Sep 2011; Maciej Mrozowski <reavertm@gentoo.org>
   virtuoso-server-6.1.2.ebuild, virtuoso-server-6.1.3.ebuild,
diff --git a/dev-db/virtuoso-server/files/virtuoso-server-6.1.3-unbundle-minizip.patch b/dev-db/virtuoso-server/files/virtuoso-server-6.1.3-unbundle-minizip.patch
new file mode 100644
index 000000000000..e68903a2230e
--- /dev/null
+++ b/dev-db/virtuoso-server/files/virtuoso-server-6.1.3-unbundle-minizip.patch
@@ -0,0 +1,36 @@
+diff -ruN virtuoso-opensource-6.1.3/configure.in new/configure.in
+--- virtuoso-opensource-6.1.3/configure.in	2011-03-30 01:20:19.000000000 +0200
++++ new/configure.in	2011-09-21 23:04:42.372977092 +0200
+@@ -1568,14 +1568,15 @@
+ then
+     AC_CHECK_HEADER(zlib.h)
+     AC_CHECK_LIB(z, main, [with_zlib=yes], [with_zlib=internal])
++    AC_CHECK_LIB(minizip, main, [with_zlib=yes], [with_zlib=internal])
+ fi
+ if test "x$with_zlib" = "xinternal"
+ then
+     ZLIB_INC='-I$(top_srcdir)/libsrc/zlib'
+     ZLIB_LIB='$(top_builddir)/libsrc/zlib/libz.la'
+ else
+-    ZLIB_INC=""
+-    ZLIB_LIB="-lz"
++    ZLIB_INC=`pkg-config --cflags zlib minizip`
++    ZLIB_LIB=`pkg-config --libs zlib minizip`
+ fi
+ AC_SUBST(ZLIB_INC)
+ AC_SUBST(ZLIB_LIB)
+diff -ruN virtuoso-opensource-6.1.3/libsrc/Wi/bif_file.c new/libsrc/Wi/bif_file.c
+--- virtuoso-opensource-6.1.3/libsrc/Wi/bif_file.c	2011-02-14 13:30:56.000000000 +0100
++++ new/libsrc/Wi/bif_file.c	2011-09-21 22:44:52.638977417 +0200
+@@ -6139,10 +6139,7 @@
+   return NULL;
+ }
+ 
+-
+-#include "zlib/contrib/minizip/unzip.h"
+-#include "zlib/contrib/minizip/ioapi.c"
+-#include "zlib/contrib/minizip/unzip.c"
++#include "unzip.h"
+ 
+ static caddr_t
+ bif_unzip_file (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
diff --git a/dev-db/virtuoso-server/virtuoso-server-6.1.3-r1.ebuild b/dev-db/virtuoso-server/virtuoso-server-6.1.3-r1.ebuild
index 00b5a9dcb6c4..cd773a2ddecb 100644
--- a/dev-db/virtuoso-server/virtuoso-server-6.1.3-r1.ebuild
+++ b/dev-db/virtuoso-server/virtuoso-server-6.1.3-r1.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/dev-db/virtuoso-server/virtuoso-server-6.1.3-r1.ebuild,v 1.2 2011/09/21 19:39:12 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/virtuoso-server-6.1.3-r1.ebuild,v 1.3 2011/09/21 22:25:23 reavertm Exp $
 
 EAPI=4
 
@@ -14,15 +14,13 @@ IUSE="kerberos ldap readline"
 # Bug 305077
 #RESTRICT="test"
 
-# Version restriction on sys-libs/zlib, bug #383349
-
 # zeroconf support looks like broken - disabling - last checked around 5.0.12
 # mono support fetches mono source and compiles it manually - disabling for now
 # mono? ( dev-lang/mono )
 COMMON_DEPEND="
 	dev-libs/libxml2:2
 	>=dev-libs/openssl-0.9.7i:0
-	<sys-libs/zlib-1.2.5.1-r1:0
+	>=sys-libs/zlib-1.2.5.1-r2:0[minizip]
 	kerberos? ( app-crypt/mit-krb5 )
 	ldap? ( net-nds/openldap )
 	readline? ( sys-libs/readline:0 )
@@ -51,7 +49,10 @@ VOS_EXTRACT="
 
 DOCS=(AUTHORS ChangeLog CREDITS INSTALL NEWS README)
 
-PATCHES=( "${FILESDIR}/${P}-unicode.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-unicode.patch"
+	"${FILESDIR}/${P}-unbundle-minizip.patch"
+)
 
 src_prepare() {
 	sed -e '/^lib_LTLIBRARIES\s*=.*/s/lib_/noinst_/' -i binsrc/virtuoso/Makefile.am \