Unbundle minizip and raise zlib deps accordingly, bug 383349

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

4 files changed, 54 insertions, 11 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/Manifest b/dev-db/virtuoso-server/Manifest
index 9ed06c4c3dbf..393355f4df49 100644
--- a/dev-db/virtuoso-server/Manifest
+++ b/dev-db/virtuoso-server/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX virtuoso-server-6.1.3-unbundle-minizip.patch 1239 RMD160 d42e80924d643c4dfa08ed6f55aa811d8f8e00a3 SHA1 025c9f8d85ac7616bbab09b62a9bf1f9f3553a14 SHA256 54d628c1d2e4748ec16e1a4e98fb5da4b5257c0dd49bb73621cff80669d02056
 AUX virtuoso-server-6.1.3-unicode.patch 850 RMD160 06b449b58f768be1d11fbf496adef5f40edf277d SHA1 8b9ad92b605a8bfcbd50c8684bde89a6ad22a9ee SHA256 7feea9e5b730dc0716b284fa968ef7121ba5897aafdece16d07ee5e135947d26
 DIST VOS-genpatches-6.1.2.tar.bz2 1080 RMD160 f7ac395fa271cf08fd14c4709d5a5aa7b0d3876a SHA1 be40a0aae399c1dde6b9a09c081aa378495356ef SHA256 7f2078e18702bf078ee6af81a4b83e7fedee1250e192e0ab986dcb535319267a
 DIST VOS-genpatches-6.1.3.tar.bz2 1224 RMD160 5eb64921dbcfe88b2edbd93bb0cb8dca51643ce6 SHA1 7a53a74df02246fed27aafd1afca590ecba118ed SHA256 005d960017363d7f0c9807da6f706ec991e48d2c479f92798ee7df9003b7848a
 DIST virtuoso-opensource-6.1.2.tar.gz 72303185 RMD160 3aaeeca67fa5ac7d6c60017b58c0f830afc9ce7e SHA1 fdcc79c230aaa6f63d2796659ec96ebfc571ac97 SHA256 6838e41a6ee688f08d92e7299eaf75f9c63a4b9f6f6a27eace9a9921b008ad56
 DIST virtuoso-opensource-6.1.3.tar.gz 75082765 RMD160 eaae429e90c6735e7b6c06b838e56b031802d37f SHA1 27e0b29e690ddf766941067ef861a7bf166aeac5 SHA256 420f28d6e639eed6c3c722097b5bb4a6830435fc703dfb15a577452d71124666
 EBUILD virtuoso-server-6.1.2.ebuild 1930 RMD160 02bd84383d9ea09ccf008e8c569e0f3d4859904b SHA1 3a59b582fb632d19202c3b0805ddf334d62b660b SHA256 62ad55003426e375bf83183a02875b280621f3fd481f68218c437a517c9ab8e9
-EBUILD virtuoso-server-6.1.3-r1.ebuild 1982 RMD160 186229334348c2d42a83b8cde0ca356533e9e6cb SHA1 3b9e424f66b64f409a688172fc973a7a38711fc7 SHA256 8fa6e152a70a62111d02312dd6d0ad78c6bcb0e15f9a05c1cb9cea8037b33f38
+EBUILD virtuoso-server-6.1.3-r1.ebuild 1983 RMD160 5eb18eefbd424ac281f3fb59367cba9ad9feb7f9 SHA1 991f631b0ff173bbfebbc594d7227013c0302877 SHA256 188afbcf69e270a19ef21af2c3044377bea30baac315260d9b74311d7c9d1576
 EBUILD virtuoso-server-6.1.3.ebuild 1932 RMD160 792e2140a34314f621858f0f8f5ede02cf92e04c SHA1 7c409fe62a705b4c0fa8c02eb3be4a044979d623 SHA256 6e602734f0ee40fc04e18e3c367a69f0a7f42148c7e6dd340d6b28cee7eb95ec
-MISC ChangeLog 3503 RMD160 9fe36b4e839f214bbac3716b06394edc00e20954 SHA1 02fdbd0e0fbbb98e855ce70c0adf1de4296977a6 SHA256 4eb99042c6fa82737502f513b65936cd6e0ff07360f0b29d308d9b3318881c1b
+MISC ChangeLog 3711 RMD160 be6e7a468c09add5cb85efc08c1c93699b6af196 SHA1 9b94ae92e19c03cfc73b56db5ba32bec535a150f SHA256 4623614a45837ae33976c06a41fb207ba0e212d5d2a15835492f00631e2ff7d3
 MISC metadata.xml 776 RMD160 8fd1645181fcb1b15dc92abd6ab04353c8875d6f SHA1 1bd47782d6572dc306feb87f55874cd4d82c6c65 SHA256 4ed0f7b3a3499245c57ec212a148bbb28fec2b14bde2e49a890ba86a3ddbaca6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk56PWMACgkQFuHa/bHpVds6cgCgl+znr1apgYPJDaMLE1oV81CP
-8mIAoLCd/6+Eo0mekrmMMe6v+5XpDFdC
-=g6Ns
+iEYEARECAAYFAk56ZFYACgkQFuHa/bHpVdt3rwCfar+XA3MpCeYVXxkwsasKM+X9
+McIAoJOjYMvhZSIg/x6Ury4LwGqG2KGP
+=ihq1
 -----END PGP SIGNATURE-----
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 \