Version bump #309623 by Samuli Suominen.

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

6 files changed, 204 insertions, 8 deletions

diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog
index 67baecdc0b06..96228f421b44 100644
--- a/sys-libs/zlib/ChangeLog
+++ b/sys-libs/zlib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/zlib
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.71 2009/10/10 17:01:04 vapier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.72 2010/03/16 00:35:09 vapier Exp $
+
+*zlib-1.2.4 (16 Mar 2010)
+
+  16 Mar 2010; Mike Frysinger <vapier@gentoo.org> +zlib-1.2.4.ebuild,
+  +files/zlib-1.2.4-LDFLAGS.patch, +files/zlib-1.2.4-build.patch,
+  +files/zlib-1.2.4-visibility-support.patch:
+  Version bump #309623 by Samuli Suominen.
 
   10 Oct 2009; Mike Frysinger <vapier@gentoo.org> zlib-1.2.3-r1.ebuild,
   +files/zlib-1.2.3-mingw-implib.patch:
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index 9234c6f30e6d..ba2cd25ab145 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 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
@@ -10,14 +10,19 @@ AUX zlib-1.2.3-build.patch 1525 RMD160 4282e2acca68f6c9301bd8881f6c2a12bfbe7820
 AUX zlib-1.2.3-mingw-implib.patch 245 RMD160 a80d95f2c3563e21f813f805e13a005c6e3832ec SHA1 5cc94c2ee9f0c66098721ca4b98a01a0b2f8c00b SHA256 27f8a0f15dd2a04771875e248fe311854d3880ef61fd9d2fbdcea8326427fd95
 AUX zlib-1.2.3-r1-bsd-soname.patch 572 RMD160 40351d687838d4889ee1cb47aa594f0f9beefca2 SHA1 fea13311c55b87ee17362e329517200c9e18af73 SHA256 20ad1fce102236f6fcec2d825cdd4261011b4cb01f4f57b91cdecac227f9600d
 AUX zlib-1.2.3-visibility-support.patch 1016 RMD160 39492a1537bad731fd568a0af0ad39e93ceb3a07 SHA1 326e03782ed533a480115b9bcd5e96773f7570df SHA256 77acaffa3dccf2d48cfde0f9a30d10a55b4d9aad7c9c3b51c50925b6dadc8df6
+AUX zlib-1.2.4-LDFLAGS.patch 1352 RMD160 e7679bcc555d9a7257f762efc4f9c24279ee8f11 SHA1 7f3171578fb975cfc496c9d65665d1d9b55b2278 SHA256 ba9414f01d9e130bda5967bf42286cbc8c8f6cd5b123edee1e349ce774bff2d5
+AUX zlib-1.2.4-build.patch 493 RMD160 ddde6573caeff6ef99081737d930b5acb5499a8b SHA1 41bea630448dd0a837339c78ddcd94c1bb41d575 SHA256 8ac2727670ddb58cfb4d254b74df8879dd1c9195668138615f1f99fc87ad4501
+AUX zlib-1.2.4-visibility-support.patch 1016 RMD160 27d1eee7281e0080c69c6ca04029bc59c0198880 SHA1 ff8e8351e1c7ac97522c523009e1800c5738537c SHA256 395080c33279993fcaf7f78d60a0460349b313d07d122ea8817419185fd08ad2
 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
 EBUILD zlib-1.2.3-r1.ebuild 2109 RMD160 e37d947f42dfbfd8e453feadd13cadf562871c0c SHA1 a583a5a0dc76b1f21cf6bbe38fc25587a451bc3f SHA256 114218e25aeb4bbbe39759f05e5d7d626a96077f0da963dd8249984d726f8bde
-MISC ChangeLog 9906 RMD160 317c7ff69296fee1eafc1b43c2fc26abbed9976f SHA1 71e7fb43b123e5585482db06dc0157d7ba449f0d SHA256 b0099288d1e48c002fdd2e100cd984d5967a829a39da713377b9502a9b73bc22
+EBUILD zlib-1.2.4.ebuild 1633 RMD160 dbc0ae5f95cdc219036881407400e8f6b668e0f8 SHA1 dac2fb24d708cf3daa67659f67bb3fe214efeb32 SHA256 26221e69508ddb1c73af0035ccd0715e035488aa02b17fc6e35bccb0f4acb69c
+MISC ChangeLog 10159 RMD160 81921f985b77144bf37e1c6ed3e0514a58ff7b90 SHA1 438f4ce7c82115dfbeb48ac90b23b198c1759b2a SHA256 42bb3a9899dbe9b02adeec89b384e9a0697397166a3aaa47ca964fdfbf668ca9
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkrQvdYACgkQlPl3HsVfCDolDACeOoMDexcrWh3GPuQB1cCoYjLC
-DoAAn3/BjvECTIJyhZ3sA+aBrN1Nwbyv
-=OqtX
+iF4EAREIAAYFAkue0kMACgkQTwhj9JtAlp5KIwD/fILvXdaJIFmh5SJxv7uuuZpx
+VHZC/A7771Sh4B9njZAA/AoqEOCNAc3fUDZ4eBJID3yB9TnapgbpZ0c1ZE/1qg07
+=Fv4Z
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/zlib/files/zlib-1.2.4-LDFLAGS.patch b/sys-libs/zlib/files/zlib-1.2.4-LDFLAGS.patch
new file mode 100644
index 000000000000..8b128bee1fed
--- /dev/null
+++ b/sys-libs/zlib/files/zlib-1.2.4-LDFLAGS.patch
@@ -0,0 +1,49 @@
+respect LDFLAGS !
+
+--- zlib-1.2.4/Makefile.in
++++ zlib-1.2.4/Makefile.in
+@@ -26,7 +26,6 @@
+ 
+ SFLAGS=-O
+ 
+-LDFLAGS=-L. libz.a
+ LDSHARED=$(CC)
+ CPP=$(CC) -E
+ 
+@@ -134,29 +133,29 @@
+ 	-@mv objs/$*.o $@
+ 
+ $(SHAREDLIBV): $(PIC_OBJS)
+-	$(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) -lc
++	$(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) -lc $(LDFLAGS)
+ 	rm -f $(SHAREDLIB) $(SHAREDLIBM)
+ 	ln -s $@ $(SHAREDLIB)
+ 	ln -s $@ $(SHAREDLIBM)
+ 	-@rmdir objs
+ 
+ example$(EXE): example.o $(STATICLIB)
+-	$(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)
++	$(CC) $(CFLAGS) -o $@ -L. $^ $(LDFLAGS)
+ 
+ minigzip$(EXE): minigzip.o $(STATICLIB)
+-	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
++	$(CC) $(CFLAGS) -o $@ -L. $^ $(LDFLAGS)
+ 
+ examplesh$(EXE): example.o $(SHAREDLIBV)
+-	$(CC) $(CFLAGS) -o $@ example.o -L. $(SHAREDLIBV)
++	$(CC) $(CFLAGS) -o $@ -L. $^ $(LDFLAGS)
+ 
+ minigzipsh$(EXE): minigzip.o $(SHAREDLIBV)
+-	$(CC) $(CFLAGS) -o $@ minigzip.o -L. $(SHAREDLIBV)
++	$(CC) $(CFLAGS) -o $@ -L. $^ $(LDFLAGS)
+ 
+ example64$(EXE): example64.o $(STATICLIB)
+-	$(CC) $(CFLAGS) -o $@ example64.o $(LDFLAGS)
++	$(CC) $(CFLAGS) -o $@ -L. $^ $(LDFLAGS)
+ 
+ minigzip64$(EXE): minigzip64.o $(STATICLIB)
+-	$(CC) $(CFLAGS) -o $@ minigzip64.o $(LDFLAGS)
++	$(CC) $(CFLAGS) -o $@ -L. $^ $(LDFLAGS)
+ 
+ install-libs: $(LIBS)
+ 	-@if [ ! -d $(DESTDIR)$(exec_prefix)  ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi
diff --git a/sys-libs/zlib/files/zlib-1.2.4-build.patch b/sys-libs/zlib/files/zlib-1.2.4-build.patch
new file mode 100644
index 000000000000..52b398cef055
--- /dev/null
+++ b/sys-libs/zlib/files/zlib-1.2.4-build.patch
@@ -0,0 +1,34 @@
+--- zlib-1.2.4/win32/Makefile.gcc
++++ zlib-1.2.4/win32/Makefile.gcc
+@@ -30,21 +30,23 @@
+ #LOC = -DASMV
+ #LOC = -DDEBUG -g
+ 
+-CC = gcc
+-CFLAGS = $(LOC) -O3 -Wall
++CC ?= gcc
++CFLAGS ?= $(LOC) -O3 -Wall
+ 
+-AS = $(CC)
+-ASFLAGS = $(LOC) -Wall
++AS ?= $(CC)
++ASFLAGS ?= $(LOC) -Wall
+ 
+ LD = $(CC)
+-LDFLAGS = $(LOC) -s
++LDFLAGS ?= $(LOC)
+ 
+-AR = ar
++AR ?= ar
+ ARFLAGS = rcs
+ 
+-RC = windres
++RC ?= windres
+ RCFLAGS = --define GCC_WINDRES
+ 
++DLLWRAP ?= dllwrap
++
+-STRIP = strip
++STRIP = #
+
+ CP = cp -fp
diff --git a/sys-libs/zlib/files/zlib-1.2.4-visibility-support.patch b/sys-libs/zlib/files/zlib-1.2.4-visibility-support.patch
new file mode 100644
index 000000000000..78c902abde6d
--- /dev/null
+++ b/sys-libs/zlib/files/zlib-1.2.4-visibility-support.patch
@@ -0,0 +1,45 @@
+Only export symbols that should be exported.
+
+Patch by Mike Frysinger
+
+http://bugs.gentoo.org/32764
+http://bugs.gentoo.org/149929
+
+--- zlib-1.2.4/configure
++++ zlib-1.2.4/configure
+@@ -209,6 +209,20 @@
+ fi
+ 
+ cat > $test.c <<EOF
++int foo __attribute__ ((visibility ("hidden")));
++int main()
++{
++  return 0;
++}
++EOF
++if ($CC -c -fvisibility=hidden $CFLAGS $test.c) 2>/dev/null; then
++  CFLAGS="$CFLAGS -DHAS_attribute_visibility -fvisibility=hidden"
++  echo "Checking for attribute(visibility) support... Yes."
++else
++  echo "Checking for attribute(visibility) support... No."
++fi
++
++cat > $test.c <<EOF
+ #include <stdio.h>
+ #include <stdarg.h>
+ #include "zconf.h"
+--- zlib-1.2.4/zconf.h.in
++++ zlib-1.2.4/zconf.h.in
+@@ -244,7 +244,11 @@
+ #endif
+ 
+ #ifndef ZEXTERN
+-#  define ZEXTERN extern
++#  if defined(ZLIB_INTERNAL) && defined(HAS_attribute_visibility)
++#    define ZEXTERN extern __attribute__ ((visibility("default")))
++#  else
++#    define ZEXTERN extern
++#  endif
+ #endif
+ #ifndef ZEXPORT
+ #  define ZEXPORT
diff --git a/sys-libs/zlib/zlib-1.2.4.ebuild b/sys-libs/zlib/zlib-1.2.4.ebuild
new file mode 100644
index 000000000000..840cbaaa8237
--- /dev/null
+++ b/sys-libs/zlib/zlib-1.2.4.ebuild
@@ -0,0 +1,56 @@
+# 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.4.ebuild,v 1.1 2010/03/16 00:35:09 vapier 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"
+# makes xmllint segfault ? #309623
+#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.2.4-build.patch
+	epatch "${FILESDIR}"/${PN}-1.2.4-visibility-support.patch #149929
+	epatch "${FILESDIR}"/${PN}-1.2.4-LDFLAGS.patch #126718
+	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|if test "`\(.*\) 2>&1`" = ""; then|if \1 2>/dev/null; then|' configure || die
+	sed -i -e '/ldconfig/d' Makefile* || die
+}
+
+src_compile() {
+	tc-export AR CC RANLIB RC DLLWRAP
+	case ${CHOST} in
+	*-mingw*|mingw*)
+		emake -f win32/Makefile.gcc prefix=/usr || 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}" || 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
+}