Tweak the sed on configure tests to cover more cases #310573 by Jan-Erik Skata.

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

diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog
index 05d054146786900c0682fa2bcef4822c082e19d2..c5e341c2cd7f1352ed4e1ae022f985a52c8b64db 100644 (file)
--- a/sys-libs/zlib/ChangeLog
+++ b/sys-libs/zlib/ChangeLog
@@ -1,6 +1,10 @@
 # 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.75 2010/03/20 18:21:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.76 2010/04/14 02:23:25 vapier Exp $
+
+  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
+  Skata.
 
   20 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
   files/zlib-1.2.4-configure-LANG.patch:

diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index a47217a60f387fde922469a96508bf342a2b1b52..dc736f1f666f44678210086636ecd5ab3675cda1 100644 (file)
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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
 AUX zlib-1.2.1-fPIC.patch 606 RMD160 eb8e4fbedada15a325b17e880d2757060d541ab4 SHA1 52f27eb898656bd47dc369328156a6f14e15e9af SHA256 ee63a55b3bed9422f03add48002310d8074527bf5ce5a70a69022ea77a23d8d6
@@ -14,6 +17,13 @@ AUX zlib-1.2.4-visibility-support.patch 1016 RMD160 27d1eee7281e0080c69c6ca04029
 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
-EBUILD zlib-1.2.4.ebuild 1699 RMD160 5695f696ea12fe4be5ac86ce30dd9bca546a6222 SHA1 e37dc5dbe003e8b2abd0a52ca1f167aab6350eeb SHA256 e4cf513afc6cb0b212e47046f8b6dffd3fed148248f797308cff6622f3147aa3
-MISC ChangeLog 10604 RMD160 889d9bc1324f4da4116c5938e0cf4eb262165f08 SHA1 dfdd052130ab06b202399073b8e804de4a456f26 SHA256 adab68628a1933ddd568ce16632cbe8eefb0343c171ff827e0ff688d2c4a2413
+EBUILD zlib-1.2.4.ebuild 1683 RMD160 067dbd6e887aadb8402f7617439bbf0d17c41a69 SHA1 b6026ab98ba060aa39dcd677c7f06591106e5c9a SHA256 1f3d629779e2450a7230caaa3597654904e1c341218e428ff5a8b536739fb707
+MISC ChangeLog 10755 RMD160 af61ae70868ede9f0afb0da02e670e5bbae930da SHA1 ca31e3ae34b6f0a609d901641f438ef01c7cd613 SHA256 f8f97e8a83f3837f08d00ef230da6d484e0e0935474dc822f24a124b469a3a7b
 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
+-----END PGP SIGNATURE-----

diff --git a/sys-libs/zlib/zlib-1.2.4.ebuild b/sys-libs/zlib/zlib-1.2.4.ebuild
index aa4e579c4692c622dc66ec8503f0645f4cd6b0db..5bb9ea1f7beba7406f15e6ba785dcd59563f8b05 100644 (file)
--- a/sys-libs/zlib/zlib-1.2.4.ebuild
+++ b/sys-libs/zlib/zlib-1.2.4.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.4.ebuild,v 1.3 2010/03/19 19:09:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.4.ebuild,v 1.4 2010/04/14 02:23:25 vapier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -27,7 +27,7 @@ src_unpack() {
        # 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 's|\<test "`\([^"]*\) 2>&1`" = ""|\1 2>/dev/null|' configure || die
        sed -i -e '/ldconfig/d' Makefile* || die
 }