Changed sed separators to fix bug when CXX contains a full path (bug #163828, thanks...

Package-Manager: portage-2.1.2-r1

diff --git a/dev-libs/STLport/ChangeLog b/dev-libs/STLport/ChangeLog
index 8869f7c7ff23a294e482a44f00d14b6c7229a650..2405fe7a5d863555e51fa76a739b7920d11c9feb 100644 (file)
--- a/dev-libs/STLport/ChangeLog
+++ b/dev-libs/STLport/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/STLport
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/ChangeLog,v 1.41 2007/01/13 21:20:56 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/ChangeLog,v 1.42 2007/01/26 21:40:04 dev-zero Exp $
+
+  26 Jan 2007; Tiziano Müller <dev-zero@gentoo.org> STLport-5.1.0.ebuild:
+  Changed sed separators to fix bug when CXX contains a full path (bug
+  #163828, thanks to truedfx).
 
   13 Jan 2007; Tiziano Müller <dev-zero@gentoo.org>
   +files/STLport-5.1.0-wrong_russian_currency_name.patch,

diff --git a/dev-libs/STLport/Manifest b/dev-libs/STLport/Manifest
index c136066c339437fb341bb337a032cff5ece85d1e..faca2469663b8d308adf5bd430d1efa192af9db1 100644 (file)
--- a/dev-libs/STLport/Manifest
+++ b/dev-libs/STLport/Manifest
@@ -37,14 +37,14 @@ EBUILD STLport-5.0.2.ebuild 1634 RMD160 2df8fc291866d9ddc74abc555fd3ee60bdc6b145
 MD5 1b4446022516f2fac4f5e5ff3aab1214 STLport-5.0.2.ebuild 1634
 RMD160 2df8fc291866d9ddc74abc555fd3ee60bdc6b145 STLport-5.0.2.ebuild 1634
 SHA256 88367ec5a6927a2d80244243452b37d46d69dfffe3b7d2cd42c62b045422dc67 STLport-5.0.2.ebuild 1634
-EBUILD STLport-5.1.0.ebuild 2682 RMD160 f87600dd8d5ca47ac7dcdcd3e3fa54cedff7fae6 SHA1 d5e48941fbc0172122f022d01cc9b846a4908242 SHA256 a6b9f9f790384e04d01c530ec81175233e41f4e7dec5d9b73ad429e292f44ac6
-MD5 71588f8b9e22c1260962891a5be98dcb STLport-5.1.0.ebuild 2682
-RMD160 f87600dd8d5ca47ac7dcdcd3e3fa54cedff7fae6 STLport-5.1.0.ebuild 2682
-SHA256 a6b9f9f790384e04d01c530ec81175233e41f4e7dec5d9b73ad429e292f44ac6 STLport-5.1.0.ebuild 2682
-MISC ChangeLog 5888 RMD160 d480718ff8015a855d428ce218b452413e22ab83 SHA1 6ba6e02d946025f0d5ea4961b6202e416d0b0f7b SHA256 b53cbc4beba35dbefde44dc1dd42fadf7f3ac2111e84d46b9b9487fe8ea20710
-MD5 d8a1a7f97567b9e292c9b9dfb29bc420 ChangeLog 5888
-RMD160 d480718ff8015a855d428ce218b452413e22ab83 ChangeLog 5888
-SHA256 b53cbc4beba35dbefde44dc1dd42fadf7f3ac2111e84d46b9b9487fe8ea20710 ChangeLog 5888
+EBUILD STLport-5.1.0.ebuild 2683 RMD160 a5dbeaddbc45b12e6db2c976566fa92e9e81d7f6 SHA1 6ff9dd85eb3289932cf71ea565af06a6a77cacb1 SHA256 c4eef17397bc0eb42003c704e76bec7fe1113e8253816627e4e1b0f2292baf61
+MD5 97f669dc3fe5cbdd0841b298095bd02c STLport-5.1.0.ebuild 2683
+RMD160 a5dbeaddbc45b12e6db2c976566fa92e9e81d7f6 STLport-5.1.0.ebuild 2683
+SHA256 c4eef17397bc0eb42003c704e76bec7fe1113e8253816627e4e1b0f2292baf61 STLport-5.1.0.ebuild 2683
+MISC ChangeLog 6066 RMD160 3c54bc2efcd2dde2e3272fa05aa6e133d44e0378 SHA1 9f34a91384b2970ccf5a172e405d4ea189da2aa2 SHA256 46f1d70338fe89ea7580a8b1d4ef3752082c003ea3ef9e465c5c6cee16703c8c
+MD5 89d0c805bae65adeab17dd442b81a6d1 ChangeLog 6066
+RMD160 3c54bc2efcd2dde2e3272fa05aa6e133d44e0378 ChangeLog 6066
+SHA256 46f1d70338fe89ea7580a8b1d4ef3752082c003ea3ef9e465c5c6cee16703c8c ChangeLog 6066
 MISC metadata.xml 156 RMD160 537178ef5a820896e97475fb9aded47d50474bef SHA1 2a4ef4879b918a28132d21cd6d1bbaa2a30dccde SHA256 0e8490f9c62cb74e5894b52f643a02de0024d97dbfebad43082dce6bcb39555f
 MD5 41d7ac32dc54956e937401bb5a2c3810 metadata.xml 156
 RMD160 537178ef5a820896e97475fb9aded47d50474bef metadata.xml 156

diff --git a/dev-libs/STLport/STLport-5.1.0.ebuild b/dev-libs/STLport/STLport-5.1.0.ebuild
index 65d525f9bea7c09d007b44a398c29b413904c084..4f7e3cfd80b75339e39111c47e89fc9d98a1d253 100644 (file)
--- a/dev-libs/STLport/STLport-5.1.0.ebuild
+++ b/dev-libs/STLport/STLport-5.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/STLport-5.1.0.ebuild,v 1.9 2007/01/13 21:20:56 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/STLport-5.1.0.ebuild,v 1.10 2007/01/26 21:40:04 dev-zero Exp $
 
 inherit eutils versionator eutils toolchain-funcs multilib flag-o-matic
 
@@ -41,10 +41,10 @@ src_compile() {
        EOF
 
        sed -i \
-               -e "s/\(CC :=\) gcc/\1 $(tc-getCC)/" \
-               -e "s/\(CXX :=\) c++/\1 $(tc-getCXX)/" \
-               -e "s/^\(CFLAGS = \)/\1 ${CFLAGS} /" \
-               -e "s/^\(CCFLAGS = \)/\1 ${CFLAGS} /" \
+               -e "s|\(CC :=\) gcc|\1 $(tc-getCC)|" \
+               -e "s|\(CXX :=\) c++|\1 $(tc-getCXX)|" \
+               -e "s|^\(CFLAGS = \)|\1 ${CFLAGS} |" \
+               -e "s|^\(CCFLAGS = \)|\1 ${CFLAGS} |" \
                build/Makefiles/gmake/gcc.mak || die "sed failed"
 
        local myconf