Version bump.

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

5 files changed, 143 insertions, 8 deletions

diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog
index 83462464edc2..069eab35b663 100644
--- a/sys-libs/zlib/ChangeLog
+++ b/sys-libs/zlib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/zlib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.92 2011/05/01 09:52:06 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.93 2011/09/11 18:49:38 vapier Exp $
+
+*zlib-1.2.5.1 (11 Sep 2011)
+
+  11 Sep 2011; Mike Frysinger <vapier@gentoo.org> +zlib-1.2.5.1.ebuild,
+  +files/zlib-1.2.5.1-symlinks.patch, +files/zlib-1.2.5.1-version.patch:
+  Version bump.
 
   01 May 2011; Kacper Kowalik <xarthisius@gentoo.org> zlib-1.2.5-r2.ebuild:
   ppc64 stable wrt #359953
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index 030161a7a591..9e5f5a76651d 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
@@ -13,18 +13,20 @@ AUX zlib-1.2.3-visibility-support.patch 1016 RMD160 39492a1537bad731fd568a0af0ad
 AUX zlib-1.2.5-fbsd_chosts.patch 574 RMD160 6671a57d237db1ed78cdce8886c180aa4cf386d2 SHA1 f5a9b7c3127314720874fc7a00971db159808330 SHA256 a717f7d4f08a86f2ea4f0d926c2944b270948a879e3c5585a4f4fdef4fd95908
 AUX zlib-1.2.5-ldflags.patch 879 RMD160 027ea24420f1e768c2fac995136ca26c9d874faf SHA1 3b867f0d6b212f78a2d654cd8d4371d0453d7524 SHA256 4eedfead8dc883649050be09fc112ad6b67b45605ccf805dde292636e5b2b953
 AUX zlib-1.2.5-lfs-decls.patch 519 RMD160 2b9eee4022f6344c1bc61a4e2065651085979f4c SHA1 6cf544f50ac6fb8635725d253e24d531dc2bb203 SHA256 8953fea34d7eb2bf0a5393e5aeacb6c6c17f25fa2524c5f557f459184e2e20d8
+AUX zlib-1.2.5.1-symlinks.patch 1320 RMD160 8b7c4aa65f649dd0775cd1743aa32d9b694481b9 SHA1 26cd1659813aed965360dfbf986e42d113b728a5 SHA256 83dce33ee8679d0661c7859a7513aeaaf9c39cdd16d1d1b4e63676853592ebe2
+AUX zlib-1.2.5.1-version.patch 538 RMD160 83894076a97f0db0d88880ca745819ce89a91a91 SHA1 dacc50b2fa6e9caef1545f243c08b10525c29bf8 SHA256 bf1d70af57691720e9530fe7863e0f59188893c4d2c77e947a1ee999849b79f9
 DIST zlib-1.2.3.tar.bz2 425209 RMD160 cfba9984b354dcc38da49331457e6bfc861c6f51 SHA1 967e280f284d02284b0cd8872a8e2e04bfdc7283 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca
+DIST zlib-1.2.5.1.tar.gz 548499 RMD160 9f7d449167427c8add0b61a76a51bee164856592 SHA1 731b09322e18a3853e6b6b98b44175d7aed1e407 SHA256 c1f24a64f808528293cf04ba09a2dffbc3dd65ad7ebcee4737124ff8923756da
 DIST zlib-1.2.5.tar.bz2 486374 RMD160 c6c4c2a2a205061b21487e69234106f5517b4b32 SHA1 543fa9abff0442edca308772d6cef85557677e02 SHA256 239aead2f22f16bfcfa6a6a5150dcbd6d6f2e4d1eaa8727b5769ea014120b307
 EBUILD zlib-1.2.3-r1.ebuild 2108 RMD160 86035d0567fbd74c1e4f066a8650a235824527c1 SHA1 f329bb4098c9b4d526bed79ef2d3932d178004e7 SHA256 1826babce8086b210791956f9a698909e5aea6ad695d18a15d5fbb774e058552
 EBUILD zlib-1.2.5-r2.ebuild 1985 RMD160 51991cece3b068936d37ba832d51813536888d13 SHA1 785858d4dee04e3ac110f6bdfc29e2dc76276683 SHA256 0a99b2f2b02be7316b92390f0b7d2f3654b9e9e4cad2616f96a6c304ea3ac598
-MISC ChangeLog 13098 RMD160 6fa19090be0879c0e5fdccc5f67508b866ffcf60 SHA1 e26ca3749e8b212ae0a012f0ffabda0e7b431596 SHA256 0fd1858f7c06afc5d088c9445415bfc683eb603bf0e3b0c4f1644b6eea607a02
+EBUILD zlib-1.2.5.1.ebuild 1969 RMD160 fd7596c2f8d93859ae68329622b93b3c2cb3eca6 SHA1 4fb8715b7b760e8e8bd8d7558f2c61791dc1bf38 SHA256 6e6f0643c77d90a425c288f1e6097bff27cb5bac8ce2070ec3c0526d69ef6280
+MISC ChangeLog 13285 RMD160 7f53e3648177a799749a5e4b42efaebce23ae2a9 SHA1 6e1d09c0623f0772e35697d0dde45f511149388c SHA256 7e7854e5d9a9a8301c043d90fb1177295f2c81f2f41adb035fb6427336acf93b
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk29LUwACgkQIiMqcbOVdxTb5QP9EPcEd1G5PSjaopI37e2V/3jO
-MKOcN2F0TYvkpU0+BBg/w1va/veCdRz9Wt7Qg31MqDt9qkPdUe33pwC2XZeKBvv6
-wBPv5fuAMXhHJ0mag1xO5pidAdmm6sLVzkTvp492wkZmNMrFWmKOxKBTTdKNlWgk
-f9gM50JBoCUboA1mTmI=
-=czvN
+iF4EAREIAAYFAk5tA0cACgkQaC/OocHi7JahaQD/cgjr6TGrFNsfvgDOhIBaDRnG
+FoC/MvbRD4kdPrv4SMgA/0nhl5xEIs5I2Cp2rZEZ3AHJtHGPXE2i2EU+OFLr7CBV
+=l0Od
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/zlib/files/zlib-1.2.5.1-symlinks.patch b/sys-libs/zlib/files/zlib-1.2.5.1-symlinks.patch
new file mode 100644
index 000000000000..e747b01135a5
--- /dev/null
+++ b/sys-libs/zlib/files/zlib-1.2.5.1-symlinks.patch
@@ -0,0 +1,33 @@
+From e41d99c135935b849e1e639632937829ff2000d8 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 11 Sep 2011 14:32:53 -0400
+Subject: [PATCH] use relative symlinks for shared libs
+
+The DESTDIR should not be encoded into symlinks as it is only a
+temporary path.  Further, since we install the symlinks into the
+same dir as the files, let's use relative links so that they can
+always resolve.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ Makefile.in |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 861970d..299bd1d 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -176,8 +176,8 @@ install-libs: $(LIBS)
+ 	  chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
+ 	  echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV)"; \
+ 	  rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
+-	  ln -s $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \
+-	  ln -s $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
++	  ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \
++	  ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
+ 	  ($(LDCONFIG) || true)  >/dev/null 2>&1; \
+ 	fi
+ 	cp zlib.3 $(DESTDIR)$(man3dir)
+-- 
+1.7.6
+
diff --git a/sys-libs/zlib/files/zlib-1.2.5.1-version.patch b/sys-libs/zlib/files/zlib-1.2.5.1-version.patch
new file mode 100644
index 000000000000..afaa1f050518
--- /dev/null
+++ b/sys-libs/zlib/files/zlib-1.2.5.1-version.patch
@@ -0,0 +1,22 @@
+From 70386acb30b690fc9fcfdac9e01c8ca29ff20ef5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?T=C3=B6r=C3=B6k=20Edwin?= <edwintorok@gmail.com>
+Date: Sun, 11 Sep 2011 10:00:52 +0300
+Subject: [PATCH] fix ld error: unable to find version dependency `ZLIB_1.2.5'
+
+---
+ zlib.map |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/zlib.map b/zlib.map
+index 65bcf17..f65a125 100644
+--- a/zlib.map
++++ b/zlib.map
+@@ -69,4 +69,4 @@ ZLIB_1.2.3.5 {
+ 
+ ZLIB_1.2.5.1 {
+     deflatePending;
+-} ZLIB_1.2.5;
++} ZLIB_1.2.3.5;
+-- 
+1.7.5.4
+
diff --git a/sys-libs/zlib/zlib-1.2.5.1.ebuild b/sys-libs/zlib/zlib-1.2.5.1.ebuild
new file mode 100644
index 000000000000..73aaf68bfa74
--- /dev/null
+++ b/sys-libs/zlib/zlib-1.2.5.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2011 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.1.ebuild,v 1.1 2011/09/11 18:49:38 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.gz
+	http://www.zlib.net/current/beta/${P}.tar.gz"
+
+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}"
+	# 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
+
+	epatch "${FILESDIR}"/${P}-version.patch
+	epatch "${FILESDIR}"/${P}-symlinks.patch
+}
+
+echoit() { echo "$@"; "$@"; }
+src_compile() {
+	case ${CHOST} in
+	*-mingw*|mingw*)
+		emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}- || die
+		sed \
+			-e 's|@prefix@|/usr|g' \
+			-e 's|@exec_prefix@|${prefix}|g' \
+			-e 's|@libdir@|${exec_prefix}/'$(get_libdir)'|g' \
+			-e 's|@sharedlibdir@|${exec_prefix}/'$(get_libdir)'|g' \
+			-e 's|@includedir@|${prefix}/include|g' \
+			-e 's|@VERSION@|'${PV}'|g' \
+			zlib.pc.in > zlib.pc || die
+		;;
+	*)	# not an autoconf script, so can't use econf
+		echoit ./configure --shared --prefix=/usr --libdir=/usr/$(get_libdir) || die
+		emake || die
+		;;
+	esac
+}
+
+src_install() {
+	case ${CHOST} in
+	*-mingw*|mingw*)
+		emake -f win32/Makefile.gcc install \
+			BINARY_PATH="${D}/usr/bin" \
+			LIBRARY_PATH="${D}/usr/$(get_libdir)" \
+			INCLUDE_PATH="${D}/usr/include" \
+			SHARED_MODE=1 \
+			|| die
+		insinto /usr/share/pkgconfig
+		doins zlib.pc || die
+		;;
+
+	*)
+		emake install DESTDIR="${D}" LDCONFIG=: || die
+		gen_usr_ldscript -a z
+		;;
+	esac
+
+	dodoc FAQ README ChangeLog doc/*.txt
+}