Version bump #316343 by Samuli Suominen.

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

3 files changed, 65 insertions, 5 deletions

diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog
index c5e341c2cd7f..3d2c8df5e380 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.76 2010/04/14 02:23:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.77 2010/04/20 12:49:53 vapier Exp $
+
+*zlib-1.2.5 (20 Apr 2010)
+
+  20 Apr 2010; Mike Frysinger <vapier@gentoo.org> +zlib-1.2.5.ebuild:
+  Version bump #316343 by Samuli Suominen.
 
   14 Apr 2010; Mike Frysinger <vapier@gentoo.org> zlib-1.2.4.ebuild:
   Tweak the sed on configure tests to cover more cases #310573 by Jan-Erik
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index dc736f1f666f..deedd895c1f6 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -16,14 +16,16 @@ AUX zlib-1.2.4-configure-LANG.patch 1142 RMD160 566adf951015fe97e7ce5ff882c8057b
 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
+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
-MISC ChangeLog 10755 RMD160 af61ae70868ede9f0afb0da02e670e5bbae930da SHA1 ca31e3ae34b6f0a609d901641f438ef01c7cd613 SHA256 f8f97e8a83f3837f08d00ef230da6d484e0e0935474dc822f24a124b469a3a7b
+EBUILD zlib-1.2.5.ebuild 1484 RMD160 c6e3c936a03ddfb020a23a8f709d312c632f902e SHA1 30862168cdb0d49f394a734ff79c3f6be8cf6512 SHA256 74dca4979d606439ae475c9657a3ef46a339a208da43b6c15ae2d3798f3baafb
+MISC ChangeLog 10896 RMD160 4765f5c4097f6a4c300795db0217e57893a6797b SHA1 ee3f2798c7929cc5b1bc94ff9afc159fbb9bbbb4 SHA256 f59176615882069c66e5f85b7ef184169b1b353b313a9849533354275c07683c
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iF4EAREIAAYFAkvFJvAACgkQTwhj9JtAlp7ZbAD9FYYoUtZ/xGO7m4vM8vTaFjG6
-hiainN7vaeFr+TWoCMUA/3UmnMgp9Y1tJPpLWpe13uHZRrRKGoko7dnDtLrApaFi
-=ii4b
+iF4EAREIAAYFAkvNowQACgkQTwhj9JtAlp7QpgEAjLi7prkQI/AQziYg31v/B1bl
+0bHqw8hC4H/GCZm7AQUBAMZeV1EGzNFqjQUTaqhEAdzSvc1x5yeMuSnmmjz/RMsz
+=Pyv0
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/zlib/zlib-1.2.5.ebuild b/sys-libs/zlib/zlib-1.2.5.ebuild
new file mode 100644
index 000000000000..32198adbccf2
--- /dev/null
+++ b/sys-libs/zlib/zlib-1.2.5.ebuild
@@ -0,0 +1,53 @@
+# 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.ebuild,v 1.1 2010/04/20 12:49:53 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"
+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.4-visibility-support.patch #149929
+	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
+}
+
+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
+}