Revision bump, add patch from bug #316377.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 103 insertions, 7 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/Manifest b/sys-libs/zlib/Manifest
index 209e0367ce4c..8265f09a4845 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX zlib-1.2.1-build-fPIC.patch 2211 RMD160 c0283f640411a8a2c64073ea1833642cafff6fc9 SHA1 496fc5ad5341d81239a4e7b9d203aecbbaac0114 SHA256 c02fce932ea57fc417a51f5f0676abdcecc890e67a3c3cda510c0c151e2be88b
 AUX zlib-1.2.1-configure.patch 3149 RMD160 45a6e8fd83be0488bdf59f8965d394fc3be84246 SHA1 9c9165bbf4a009fb1629601da262e0497050b0c2 SHA256 ca0d5f7e50a90e6cafa554c85a9b19a8e2cbbb8c8f1de47fdd257ebfac4595aa
@@ -14,18 +14,20 @@ AUX zlib-1.2.4-LDFLAGS.patch 1352 RMD160 e7679bcc555d9a7257f762efc4f9c24279ee8f1
 AUX zlib-1.2.4-build.patch 493 RMD160 ddde6573caeff6ef99081737d930b5acb5499a8b SHA1 41bea630448dd0a837339c78ddcd94c1bb41d575 SHA256 8ac2727670ddb58cfb4d254b74df8879dd1c9195668138615f1f99fc87ad4501
 AUX zlib-1.2.4-configure-LANG.patch 1142 RMD160 566adf951015fe97e7ce5ff882c8057bd755dcb1 SHA1 ca05f1e512e8ac3985e6be236235c05771e51d7f SHA256 205e4066cdbf85d2455bb7a9220b6d8322e9fdb0dfee9c62750510d197650966
 AUX zlib-1.2.4-visibility-support.patch 1016 RMD160 27d1eee7281e0080c69c6ca04029bc59c0198880 SHA1 ff8e8351e1c7ac97522c523009e1800c5738537c SHA256 395080c33279993fcaf7f78d60a0460349b313d07d122ea8817419185fd08ad2
+AUX zlib-1.2.5-lfs-decls.patch 1663 RMD160 0d0ab697c13f27f563d2dc67d18ea712d4aec420 SHA1 62ab38bd628c7e6fcb5302d75ad56297fc2a4710 SHA256 c4dd85ab8ad6c2b7a0a2cbb8bcb7ba282cb854ea13ca4182cd862ea11e126187
 DIST zlib-1.2.3.tar.bz2 425209 RMD160 cfba9984b354dcc38da49331457e6bfc861c6f51 SHA1 967e280f284d02284b0cd8872a8e2e04bfdc7283 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca
 DIST zlib-1.2.4.tar.bz2 483564 RMD160 8f0f17e33e36fa1427f8186b6d12cf5b2240294a SHA1 8cf10521c1927daa5e12efc5e1725a0d70e579f3 SHA256 d0fc3433bb3ff5bbf1d2db57a328c0be39ac4a74d4b39887af522acf7ecd5ecc
 DIST zlib-1.2.5.tar.bz2 486374 RMD160 c6c4c2a2a205061b21487e69234106f5517b4b32 SHA1 543fa9abff0442edca308772d6cef85557677e02 SHA256 239aead2f22f16bfcfa6a6a5150dcbd6d6f2e4d1eaa8727b5769ea014120b307
 EBUILD zlib-1.2.3-r1.ebuild 2109 RMD160 e37d947f42dfbfd8e453feadd13cadf562871c0c SHA1 a583a5a0dc76b1f21cf6bbe38fc25587a451bc3f SHA256 114218e25aeb4bbbe39759f05e5d7d626a96077f0da963dd8249984d726f8bde
 EBUILD zlib-1.2.4.ebuild 1683 RMD160 067dbd6e887aadb8402f7617439bbf0d17c41a69 SHA1 b6026ab98ba060aa39dcd677c7f06591106e5c9a SHA256 1f3d629779e2450a7230caaa3597654904e1c341218e428ff5a8b536739fb707
+EBUILD zlib-1.2.5-r1.ebuild 1482 RMD160 4d2392d6055c067fb3678ad94b74728933f5e708 SHA1 6516fcbeea1b0386cccf2064ce1d0df0ac4bb3c5 SHA256 24294c582234fae9268981a76bb68a4497796720ac219c12dc3b3171250b1af7
 EBUILD zlib-1.2.5.ebuild 1417 RMD160 2e29976fd45df00f3e9baeea6e2889920ad51291 SHA1 9d8b2632fd361e4f1e48419feed8a07e58c2c27d SHA256 911f3f41415dac202c1819aea8b5cf21dcc7f91d4c573022f6aede9181e388ef
-MISC ChangeLog 11031 RMD160 fe1908af412047855c6b34f9239b400e6169ccba SHA1 b1b90cf44e66e246c1d0686b69af69240da6c8e3 SHA256 708f456b6e7a4d5835f83d4ed947fe14cb5947a166cb7a6e1018893f2aa19cf9
+MISC ChangeLog 11226 RMD160 cb2462ce1bd999472b63d70a7f798b7561ff9039 SHA1 9d046061d65670c7bb6bb2561e0e6cc3f0f2929d SHA256 cf987a8c3044be6d23749de5c5086316b1c937bcdc4c72b03ca4cc238714a9da
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iF0EAREIAAYFAkvOEAQACgkQTwhj9JtAlp59wQEAu9katFsUr+rRCrgf9PugNYxx
-alWrmtVSQiMd7Kn0TkAA+N1MTecTdsPfcDbNZODg9RFsg0SQuLFCMUfIr8Rc3wE=
-=zjdQ
+iEYEARECAAYFAkvUxRUACgkQAiZjviIA2XgocACeJuiIh402YWeAGyDFTIIN9spy
+3BYAoNJwnvkKHYu/1eVSUrf+WvWTKYnk
+=Pr+e
 -----END PGP SIGNATURE-----
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
+}