Set LC_ALL=C and LANG=C w.r.t. bug 255440. Use | as seperator in sed to not fail with legitimate CFLAGS.

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

3 files changed, 15 insertions, 6 deletions

diff --git a/dev-libs/xmlrpc-c/ChangeLog b/dev-libs/xmlrpc-c/ChangeLog
index adbd222ed5a1..4acee9ca1358 100644
--- a/dev-libs/xmlrpc-c/ChangeLog
+++ b/dev-libs/xmlrpc-c/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/xmlrpc-c
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/ChangeLog,v 1.87 2009/05/17 14:08:49 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/ChangeLog,v 1.88 2009/05/31 14:32:43 loki_val Exp $
+
+  31 May 2009; Peter Alfredsen <loki_val@gentoo.org>
+  xmlrpc-c-1.18.02.ebuild:
+  Set LC_ALL=C and LANG=C w.r.t. bug 255440. Use as seperator in sed to not
+  fail with legitimate CFLAGS.
 
   17 May 2009; Peter Alfredsen <loki_val@gentoo.org>
   -xmlrpc-c-1.14.07-r1.ebuild, -files/xmlrpc-c-1.14.07-abyss-disable.patch,
diff --git a/dev-libs/xmlrpc-c/Manifest b/dev-libs/xmlrpc-c/Manifest
index cc66fd21297e..cb950a2973dd 100644
--- a/dev-libs/xmlrpc-c/Manifest
+++ b/dev-libs/xmlrpc-c/Manifest
@@ -15,6 +15,6 @@ AUX xmlrpc-c-gcc43.patch 3386 RMD160 7260a649337849caa2784f0ecdbe9a64e31215a7 SH
 DIST xmlrpc-1.06.27.tgz 699510 RMD160 65803ad240331182ecdddf442c0da80669ae3292 SHA1 7dc857eb411b2acf04a127ee5623e0961633bfac SHA256 04e81ec9f4b0e586be41ccffd402f42b6c268ec2fc7875d44fcbb4ba7a660378
 DIST xmlrpc-c-1.18.02.tar.bz2 552233 RMD160 efe2f03ae37512636d33c7d285c46d9050e9296b SHA1 b815899dff10d245b31257f434230f8e45f2446a SHA256 b59845ebbad959f86a349873fda75af02a69105a4e5c6a7eb40225358677411a
 EBUILD xmlrpc-c-1.06.27.ebuild 2213 RMD160 f68f0248e88fc2dd5c77d30b5d25678f335c034e SHA1 9e2bb999540321c145b825ef4a9191554c4ebb2f SHA256 31cdbde6bdadb5b9912a6df373dbc8acb12865f8e9a88863bec7ce8855881a28
-EBUILD xmlrpc-c-1.18.02.ebuild 2244 RMD160 5eef79ed727335045728f759128a2be8083def59 SHA1 f2f961e598232edfa91746bbd523c21f37f0b720 SHA256 280763ab3900da384b4f944d01ff3c58bbcd867818b88a50460b363b8f06a58a
-MISC ChangeLog 14488 RMD160 512f6eb5018c5b9649201b1e1c2bd8b7a8089307 SHA1 65247759556a63fa4192aa78d0d7d67962d84b99 SHA256 f848ceb8b5a4aa17b005276379421ee321c1c3e93def50921653703ba9737d77
+EBUILD xmlrpc-c-1.18.02.ebuild 2288 RMD160 81b980d65364fb1c9dd068e6141674909f12381b SHA1 cb047b797d0d1ba2e0c913cbc95c77ec3838c388 SHA256 e8ab54d31c7e0ff48c173dc27bbf79cddab69d8bab4d2f9ff04f7cd8d74698aa
+MISC ChangeLog 14676 RMD160 6c4933b3e054aba802e68b97b4ce487fe69f1fe4 SHA1 e96c41f31a547a7558257c9c4af4f6a15f362257 SHA256 b342fa87333101121107e7c0418e5f313419040237d6b78990f2bb09c1463d8a
 MISC metadata.xml 499 RMD160 f9d1d3c58837e9713d01117b860658db99565b11 SHA1 66be7900342b06c05c2d951643d83f054a89924e SHA256 d012b1b4909db4b540a1c8f3f27732cf2feef8e3060d63e2ac211ae0880a7e8d
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.18.02.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.18.02.ebuild
index 9021ea8eba03..ee2d5fac3126 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.18.02.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.18.02.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/xmlrpc-c-1.18.02.ebuild,v 1.8 2009/05/04 17:38:39 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/xmlrpc-c-1.18.02.ebuild,v 1.9 2009/05/31 14:32:43 loki_val Exp $
 
 EAPI=2
 
@@ -30,6 +30,10 @@ pkg_setup() {
 #Bug 214137: We need to filter this.
 unset SRCDIR
 
+# Bug 255440
+export LC_ALL=C
+export LANG=C
+
 PATCHES=(
 	"${FILESDIR}/${P}/dumpvalue.patch"
 	"${FILESDIR}/${P}/cpp-depends.patch"
@@ -41,8 +45,8 @@ src_prepare() {
 
 	# Respect the user's CFLAGS/CXXFLAGS.
 	sed -i \
-		-e "/CFLAGS_COMMON/s:-g -O3$:${CFLAGS}:" \
-		-e "/CXXFLAGS_COMMON/s:-g$:${CXXFLAGS}:" \
+		-e "/CFLAGS_COMMON/s|-g -O3$|${CFLAGS}|" \
+		-e "/CXXFLAGS_COMMON/s|-g$|${CXXFLAGS}|" \
 		"${S}"/common.mk || die "404. File not found while sedding"
 }