Clean up patch documentation and fix parallel builds #319661 by Xake.

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

5 files changed, 44 insertions, 12 deletions

diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog
index cdd012c96e80..9a55405b49de 100644
--- a/sys-libs/zlib/ChangeLog
+++ b/sys-libs/zlib/ChangeLog
@@ -1,6 +1,11 @@
 # 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.81 2010/05/01 11:02:10 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.82 2010/07/07 21:24:14 vapier Exp $
+
+  07 Jul 2010; Mike Frysinger <vapier@gentoo.org> zlib-1.2.5-r2.ebuild,
+  files/zlib-1.2.5-fbsd_chosts.patch, +files/zlib-1.2.5-ldflags.patch,
+  files/zlib-1.2.5-lfs-decls.patch:
+  Clean up patch documentation and fix parallel builds #319661 by Xake.
 
   01 May 2010; Alexis Ballier <aballier@gentoo.org> zlib-1.2.5-r2.ebuild,
   +files/zlib-1.2.5-fbsd_chosts.patch:
diff --git a/sys-libs/zlib/files/zlib-1.2.5-fbsd_chosts.patch b/sys-libs/zlib/files/zlib-1.2.5-fbsd_chosts.patch
index 9a37f7488bc5..9b1f8331029d 100644
--- a/sys-libs/zlib/files/zlib-1.2.5-fbsd_chosts.patch
+++ b/sys-libs/zlib/files/zlib-1.2.5-fbsd_chosts.patch
@@ -1,5 +1,9 @@
---- zlib-1.2.5/configure.in	2010-05-01 12:45:30.000000000 +0200
-+++ zlib-1.2.5/configure	2010-05-01 12:45:55.000000000 +0200
+accept freebsd targets
+
+http://bugs.gentoo.org/316841
+
+--- zlib-1.2.5/configure
++++ zlib-1.2.5/configure
 @@ -118,7 +118,7 @@
      uname=`(uname -s || echo unknown) 2>/dev/null`
    fi
diff --git a/sys-libs/zlib/files/zlib-1.2.5-ldflags.patch b/sys-libs/zlib/files/zlib-1.2.5-ldflags.patch
new file mode 100644
index 000000000000..dff534b457c3
--- /dev/null
+++ b/sys-libs/zlib/files/zlib-1.2.5-ldflags.patch
@@ -0,0 +1,22 @@
+http://bugs.gentoo.org/319661
+
+LDFLAGS is only used with the shared lib, so dont link against the static zlib
+
+--- a/configure
++++ b/configure
+@@ -19,7 +19,6 @@
+ fi
+ 
+ STATICLIB=libz.a
+-LDFLAGS="${LDFLAGS} -L. ${STATICLIB}"
+ VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`
+ VER3=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\\.[0-9]*\).*/\1/p' < zlib.h`
+ VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h`
+@@ -174,7 +173,6 @@
+              LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so.1"} ;;
+   OSF1\ V4*) SFLAGS=${CFLAGS-"-O -std1"}
+              CFLAGS=${CFLAGS-"-O -std1"}
+-             LDFLAGS="${LDFLAGS} -Wl,-rpath,."
+              LDSHARED=${LDSHARED-"cc -shared  -Wl,-soname,libz.so -Wl,-msym -Wl,-rpath,$(libdir) -Wl,-set_version,${VER}:1.0"} ;;
+   OSF1*)     SFLAGS=${CFLAGS-"-O -std1"}
+              CFLAGS=${CFLAGS-"-O -std1"}
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
index 36e26af035a6..8d7343084059 100644
--- a/sys-libs/zlib/files/zlib-1.2.5-lfs-decls.patch
+++ b/sys-libs/zlib/files/zlib-1.2.5-lfs-decls.patch
@@ -1,8 +1,10 @@
-Index: zlib-1.2.5/zlib.h
-===================================================================
---- zlib-1.2.5.orig/zlib.h
+http://bugs.gentoo.org/316377
+
+try to unbreak over-eager LFS logic in zlib header
+
+--- zlib-1.2.5/zlib.h
 +++ zlib-1.2.5/zlib.h
-@@ -1578,7 +1578,7 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF(
+@@ -1578,7 +1578,7 @@
  #  define gzoffset gzoffset64
  #  define adler32_combine adler32_combine64
  #  define crc32_combine crc32_combine64
diff --git a/sys-libs/zlib/zlib-1.2.5-r2.ebuild b/sys-libs/zlib/zlib-1.2.5-r2.ebuild
index ccf962254c33..467396873b1e 100644
--- a/sys-libs/zlib/zlib-1.2.5-r2.ebuild
+++ b/sys-libs/zlib/zlib-1.2.5-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.2 2010/05/01 11:02:10 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.5-r2.ebuild,v 1.3 2010/07/07 21:24:14 vapier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -25,10 +25,9 @@ src_unpack() {
 	# +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
-	# bug #316841
-	epatch "${FILESDIR}"/${P}-fbsd_chosts.patch
+	epatch "${FILESDIR}"/${P}-ldflags.patch #319661
+	epatch "${FILESDIR}"/${P}-lfs-decls.patch #316377
+	epatch "${FILESDIR}"/${P}-fbsd_chosts.patch #316841
 }
 
 src_compile() {