Bug #330373: fix locale problems.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

5 files changed, 28 insertions, 6 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index 61701e294cc9..08bd8600ba55 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/lvm2
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.220 2010/08/03 18:00:50 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.221 2010/08/04 07:56:26 robbat2 Exp $
+
+  04 Aug 2010; Robin H. Johnson <robbat2@gentoo.org> lvm2-2.02.70.ebuild,
+  lvm2-2.02.70-r1.ebuild, +files/lvm2-2.02.70-locale-muck.patch,
+  lvm2-2.02.72.ebuild:
+  Bug #330373: fix locale problems.
 
 *lvm2-2.02.72 (03 Aug 2010)
 
diff --git a/sys-fs/lvm2/files/lvm2-2.02.70-locale-muck.patch b/sys-fs/lvm2/files/lvm2-2.02.70-locale-muck.patch
new file mode 100644
index 000000000000..fcde672cfdbc
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.02.70-locale-muck.patch
@@ -0,0 +1,11 @@
+--- make.tmpl.in.orig	2010-08-04 10:10:17.000000000 +0300
++++ make.tmpl.in	2010-08-04 10:10:33.000000000 +0300
+@@ -360,7 +360,7 @@
+ 	( cat $(srcdir)/.exported_symbols; \
+ 	  if test x$(EXPORTED_HEADER) != x; then \
+         	$(CC) -E -P $(EXPORTED_HEADER) | \
+-        	$(SED) -ne "/^typedef|}/!s/.*[ \*]\(\$(EXPORTED_FN_PREFIX)_[a-z0-9_]*\)(.*/\1/p"; \
++        	LC_ALL=C $(SED) -ne "/^typedef|}/!s/.*[ \*]\(\$(EXPORTED_FN_PREFIX)_[a-z0-9_]*\)(.*/\1/p"; \
+ 	  fi \
+ 	) > $@
+ 
diff --git a/sys-fs/lvm2/lvm2-2.02.70-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.70-r1.ebuild
index 8eab67fe4de1..b8ecb6164069 100644
--- a/sys-fs/lvm2/lvm2-2.02.70-r1.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.70-r1.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-fs/lvm2/lvm2-2.02.70-r1.ebuild,v 1.2 2010/08/03 18:00:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.70-r1.ebuild,v 1.3 2010/08/04 07:56:26 robbat2 Exp $
 
 EAPI=2
 inherit eutils multilib toolchain-funcs autotools linux-info
@@ -72,7 +72,9 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.02.64-dmeventd-libs.patch
 	# bug 301331
 	epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch
-
+	# bug 330373
+	epatch "${FILESDIR}"/${PN}-2.02.70-locale-muck.patch
+	# --as-needed
 	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch
 
 	eautoreconf
diff --git a/sys-fs/lvm2/lvm2-2.02.70.ebuild b/sys-fs/lvm2/lvm2-2.02.70.ebuild
index 3ccedd89f0cc..33f0e7063b7e 100644
--- a/sys-fs/lvm2/lvm2-2.02.70.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.70.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-fs/lvm2/lvm2-2.02.70.ebuild,v 1.2 2010/08/03 18:00:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.70.ebuild,v 1.3 2010/08/04 07:56:26 robbat2 Exp $
 
 EAPI=2
 inherit eutils multilib toolchain-funcs autotools linux-info
@@ -72,6 +72,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.02.64-dmeventd-libs.patch
 	# bug 301331
 	epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch
+	# bug 330373
+	epatch "${FILESDIR}"/${PN}-2.02.70-locale-muck.patch
 
 	eautoreconf
 }
diff --git a/sys-fs/lvm2/lvm2-2.02.72.ebuild b/sys-fs/lvm2/lvm2-2.02.72.ebuild
index 3ffc9cdb81f6..e293fc564bdd 100644
--- a/sys-fs/lvm2/lvm2-2.02.72.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.72.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-fs/lvm2/lvm2-2.02.72.ebuild,v 1.1 2010/08/03 18:00:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.72.ebuild,v 1.2 2010/08/04 07:56:26 robbat2 Exp $
 
 EAPI=2
 inherit eutils multilib toolchain-funcs autotools linux-info
@@ -72,7 +72,9 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.02.64-dmeventd-libs.patch
 	# bug 301331
 	epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch
-
+	# bug 330373
+	epatch "${FILESDIR}"/${PN}-2.02.70-locale-muck.patch
+	# --as-needed
 	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch
 
 	eautoreconf