Fix sed script that should fix CFLAGS thanks to ago (bug #386087).

Package-Manager: portage-2.2.0_alpha62/cvs/Linux i686

diff --git a/x11-misc/lsw/ChangeLog b/x11-misc/lsw/ChangeLog
index b165481e05a188a439028799acdc8d3e0176ec4f..ea5171daaf7d4edd98035180dba5a09f04913ada 100644 (file)
--- a/x11-misc/lsw/ChangeLog
+++ b/x11-misc/lsw/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/lsw
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lsw/ChangeLog,v 1.7 2011/07/11 10:19:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lsw/ChangeLog,v 1.8 2011/10/07 16:22:39 jer Exp $
+
+  07 Oct 2011; Jeroen Roovers <jer@gentoo.org> lsw-0.2-r1.ebuild:
+  Fix sed script that should fix CFLAGS thanks to ago (bug #386087).
 
 *lsw-0.2-r1 (11 Jul 2011)
 

diff --git a/x11-misc/lsw/Manifest b/x11-misc/lsw/Manifest
index 7f040bb033f47ab48b188b5543cfd1040bd5619f..a26cc96738723c1a68796d5ffdd712054dec4b82 100644 (file)
--- a/x11-misc/lsw/Manifest
+++ b/x11-misc/lsw/Manifest
@@ -4,13 +4,13 @@ Hash: SHA1
 DIST lsw-0.1.tar.gz 2570 RMD160 61175862ed67b09272b296ab9fcfbf0b8ec02861 SHA1 4511a2af63820b5fcc918e3d010fb112933d3603 SHA256 2391b4d5c5368e0c8ccc1e4706e3826bdf77bdc63050af10344446511ddb26d7
 DIST lsw-0.2.tar.gz 2946 RMD160 bc5689d9bbac37fb0aac38628a8a5ac12d79327a SHA1 ae32c246216094b748cb2c3edd5ec1a4612a5434 SHA256 307dcb49d5fd814ca58e3c7cae06008a0c68343b69847e59ddf0e34a555d5f60
 EBUILD lsw-0.1.ebuild 880 RMD160 964b99449e0cfbf3c7b9244303a08025d9a5d67f SHA1 52859ac0d74c675db63003395ba61f2b36e9ec8b SHA256 0f1ffcadfff4372803982ef06fde68ea106ff87a9ebd57902fbe423ba558f08f
-EBUILD lsw-0.2-r1.ebuild 763 RMD160 f6322319d88048fe77f11ebbcad530cb1e570865 SHA1 9eb86d42564b1b4e20170b98480541dabd11b299 SHA256 4941062136fdd46fbe79c4f4ce337d6016be84b736f0a4de9c3a8354b635f57b
-MISC ChangeLog 1029 RMD160 b777157f30174b74155737e3425ea78fef667a83 SHA1 c371f9d6c4e1965505ce1f0f2b591b13fac864bb SHA256 3170932a13864e06356256481e7b0e0ce04d88bb3bbd7f72c839c068961751af
+EBUILD lsw-0.2-r1.ebuild 759 RMD160 154adc9deeee0e8e3cdc2a9ec35fe7201e3eeedb SHA1 3312e67ea84ee81d4b97e7431c6ce68ac67e1e9c SHA256 37a87ab9525edba29a612657ce7a31fc1b6ba6d15664b4a6f25c102b9eb39bcc
+MISC ChangeLog 1165 RMD160 a63f5ff8bf38c2ad20ad8f3ce8866a66aeeac1c4 SHA1 b523ebd6cc45b33be625a05fd36ccbdd98a51656 SHA256 b826f11e920543430aa3063f378a52bb76f9fc10115834cd0e283ed2ae898e91
 MISC metadata.xml 264 RMD160 4a42dacaf8b7d3d015cc213529aeebb4c14c00b1 SHA1 a3102166478c00c9fa25b067d0d6bb6c77b796db SHA256 7c5d86dda58d2fef2a5bbf9eb560745a6c0586224b8d9f941f6eaca9e1552c84
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4azjsACgkQVWmRsqeSphN0YgCcDpk0fKSh/Vcz62yABKgTXFBG
-AMAAnib3e9H7UiwjDeJgGKP0oaqPiC2O
-=ef3L
+iEYEARECAAYFAk6PJ1gACgkQVWmRsqeSphMtdgCcDUV8fBbbyVwHvAwuVXRiBGVw
+lI4An3JipNvP+xnGp4HLZWEwzCgUOJNE
+=XooY
 -----END PGP SIGNATURE-----

diff --git a/x11-misc/lsw/lsw-0.2-r1.ebuild b/x11-misc/lsw/lsw-0.2-r1.ebuild
index ceb4cd9968d416287b5f0b86334b17fb03958224..e4cd47adb78b6f5c517a6f118b12ecb6b53c788f 100644 (file)
--- a/x11-misc/lsw/lsw-0.2-r1.ebuild
+++ b/x11-misc/lsw/lsw-0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lsw/lsw-0.2-r1.ebuild,v 1.1 2011/07/11 10:19:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lsw/lsw-0.2-r1.ebuild,v 1.2 2011/10/07 16:22:39 jer Exp $
 
 EAPI="4"
 
@@ -25,8 +25,8 @@ src_prepare() {
 
        sed -i config.mk \
                -e '/^CC/d' \
-               -e 's/CFLAGS = -Os/CFLAGS +=/' \
-               -e '/^LDFLAGS/{s| = | += |;s| -s | |}' || die
+               -e '/^CFLAGS/{s| -Os||;s|=|+=|}' \
+               -e '/^LDFLAGS/{s|=|+=|;s| -s||}' || die
 }
 
 src_compile() {