Revision bump, add patch from bug #316377.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 95 insertions, 1 deletions

diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog
index 5772e79066a2..1fe6b5820f2a 100644
--- a/sys-libs/zlib/ChangeLog
+++ b/sys-libs/zlib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/zlib
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.78 2010/04/20 20:34:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.79 2010/04/25 22:41:11 flameeyes Exp $
+
+*zlib-1.2.5-r1 (25 Apr 2010)
+
+  25 Apr 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  +zlib-1.2.5-r1.ebuild, +files/zlib-1.2.5-lfs-decls.patch:
+  Revision bump, add patch from bug #316377.
 
   20 Apr 2010; Mike Frysinger <vapier@gentoo.org> zlib-1.2.5.ebuild:
   Drop now unnecessary visibility patch #316343 by Alon Bar-Lev.
diff --git a/sys-libs/zlib/files/zlib-1.2.5-lfs-decls.patch b/sys-libs/zlib/files/zlib-1.2.5-lfs-decls.patch
new file mode 100644
index 000000000000..8e0e1bc2748d
--- /dev/null
+++ b/sys-libs/zlib/files/zlib-1.2.5-lfs-decls.patch
@@ -0,0 +1,33 @@
+diff -urNp zlib-1.2.5/zlib.h zlib-1.2.5-new/zlib.h
+--- zlib-1.2.5/zlib.h	2010-04-20 09:42:48.000000000 +0530
++++ zlib-1.2.5-new/zlib.h	2010-04-21 13:44:40.105742649 +0530
+@@ -1571,21 +1571,20 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF(
+    ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
+ #endif
+ 
+-#if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0
++#if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && \
++    _LFS64_LARGEFILE-0 && _LARGEFILE64_SOURCE
+ #  define gzopen gzopen64
+ #  define gzseek gzseek64
+ #  define gztell gztell64
+ #  define gzoffset gzoffset64
+ #  define adler32_combine adler32_combine64
+ #  define crc32_combine crc32_combine64
+-#  ifdef _LARGEFILE64_SOURCE
+-     ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+-     ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
+-     ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
+-     ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
+-     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
+-     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
+-#  endif
++   ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
++   ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
++   ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
++   ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
++   ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
++   ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
+ #else
+    ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
+    ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));
diff --git a/sys-libs/zlib/zlib-1.2.5-r1.ebuild b/sys-libs/zlib/zlib-1.2.5-r1.ebuild
new file mode 100644
index 000000000000..44ecd869245f
--- /dev/null
+++ b/sys-libs/zlib/zlib-1.2.5-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.5-r1.ebuild,v 1.1 2010/04/25 22:41:11 flameeyes Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Standard (de)compression library"
+HOMEPAGE="http://www.zlib.net/"
+SRC_URI="http://www.gzip.org/zlib/${P}.tar.bz2
+	http://www.zlib.net/${P}.tar.bz2"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="!<dev-libs/libxml2-2.7.7" #309623
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.2.3-mingw-implib.patch #288212
+	# trust exit status of the compiler rather than stderr #55434
+	# -if test "`(...) 2>&1`" = ""; then
+	# +if (...) 2>/dev/null; then
+	sed -i 's|\<test "`\([^"]*\) 2>&1`" = ""|\1 2>/dev/null|' configure || die
+
+	# bug #316377
+	epatch "${FILESDIR}"/${P}-lfs-decls.patch
+}
+
+src_compile() {
+	case ${CHOST} in
+	*-mingw*|mingw*)
+		emake -f win32/Makefile.gcc prefix=/usr STRIP= PREFIX=${CHOST}- || die
+		;;
+	*)	# not an autoconf script, so cant use econf
+		./configure --shared --prefix=/usr --libdir=/usr/$(get_libdir) || die
+		emake || die
+		;;
+	esac
+}
+
+src_install() {
+	emake install DESTDIR="${D}" LDCONFIG=: || die
+	dodoc FAQ README ChangeLog doc/*.txt
+
+	case ${CHOST} in
+	*-mingw*|mingw*)
+		dobin zlib1.dll || die
+		dolib libz.dll.a || die
+		;;
+	*) gen_usr_ldscript -a z ;;
+	esac
+}