Bug #330373: fix locale problems.

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

6 files changed, 33 insertions, 14 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/Manifest b/sys-fs/lvm2/Manifest
index 973f03ddc9ef..c3fda6c6580d 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -42,6 +42,7 @@ AUX lvm2-2.02.63-always-make-static-libdm.patch 1420 RMD160 16079ddc546aa6dc6a21
 AUX lvm2-2.02.64-dmeventd-libs.patch 618 RMD160 c030db2d971e0287fa9c65ab9bede9198501369d SHA1 76a3905e45609cc699221d6c32be8edbbcd2efec SHA256 1b8c281212b3c7edf456b38679c2c7ed838dd55789125c11cde691c2ccf62ace
 AUX lvm2-2.02.67-createinitrd.patch 660 RMD160 8d95b2fdbc8d3eb9e173fd5326d78b78968ef8a2 SHA1 a6c86564cfd17452af8766f4b70c55c8cbcf8bdf SHA256 d59f5642fff9d9575227bfd0b3d103d928a6f7b08b417d6c458704171f11da39
 AUX lvm2-2.02.70-asneeded.patch 326 RMD160 725f7705903d4cc9ba94c8b1c8f76905ec3d9832 SHA1 3332b8671a31f255626299af894d89b0a972c4c4 SHA256 b0f84dadc213a9daaa97ae7815f624f0bcdc883d627659c7fcf8b7131538b43e
+AUX lvm2-2.02.70-locale-muck.patch 477 RMD160 60d3e1f1e49c6f27a20a0a0b6962d0791b236657 SHA1 99974c59b58572e367fc82bca18d317a28045a1e SHA256 95d92e13ca1c926ff6da2b10bf12da63555a21463bb2f8118c722a7394ca5e13
 AUX lvm2-start.sh 1025 RMD160 fa27385e4640d59c33f2ca42db9d38f80def3977 SHA1 83a86ff292192b3f62e4686b70bbbfcc39158b53 SHA256 8c7da13b6326a383888110b25f53a4902cbec7d0dace274b9c5f1d6b0a775039
 AUX lvm2-start.sh-2.02.28-r2 1180 RMD160 3ec85899a19c56d4d49e4654e1b05f53bc7d9c93 SHA1 80fce53cc1925990fbb103e57314b3c1740de6ed SHA256 a891855ed04d4c59f17fc0b19dc61813a4ca3cc183166867606d92cb58498460
 AUX lvm2-start.sh-2.02.49-r1 1200 RMD160 b88e37e7e228fecdedf359c1132723077a3d4c94 SHA1 85eb83a83c598b3ea405ec4c597a9c77364e7fb4 SHA256 94d15b5dbeabb275b4d91b284b3113cd812b7e7c90ec3018693803b3e91d9535
@@ -100,12 +101,8 @@ EBUILD lvm2-2.02.64.ebuild 7926 RMD160 ad843ab85e71c5752096d60446c8db5061e6b681
 EBUILD lvm2-2.02.67-r1.ebuild 8258 RMD160 7d74055508cbbbc0f520efd3f1439ecdbde1d3fb SHA1 c88ba5d5710d8a892b9adea3e628911c928826b4 SHA256 30f308896f9ec401b6a1f673837e2d9159d4f49c56795c1461af1b2daab0eb47
 EBUILD lvm2-2.02.67-r2.ebuild 8333 RMD160 33c46a1219980bcee972d630d1ce5dd5a4cbd155 SHA1 216af9c7f86e0051fa4836d1e905cf8213bfa43c SHA256 16d9845292a9d52f9f7aceb8efeccbbe50bafd1a6d142bfaf601bcc008391d72
 EBUILD lvm2-2.02.67.ebuild 8252 RMD160 9da463656087e984efe4adecdc6649ba05068d5f SHA1 bac7dbfc373755a7ff3e1ac99196e0088f2e3901 SHA256 3d6d8b185354003c610216cdfd0390b8b951387e9ab31b6c6a2b1dd37c857730
-EBUILD lvm2-2.02.70-r1.ebuild 8388 RMD160 c8a7b8ecef2dee4bb5cbd41450deb8d6af3a64c3 SHA1 cb20558f6f5b3746286a557e56f797cbc77882a2 SHA256 29bed331fcf2f6a8a7ebba091a3006352fee478d525e0c43939f527336ed5feb
-EBUILD lvm2-2.02.70.ebuild 8333 RMD160 c8aba640d2b0459c0925b10e847feed73b8feac3 SHA1 651cf96b401c3ea0321088c4847f0c3025d26113 SHA256 e08c967261235d0a14f447c426b1c34a3e9417b35e8acf582092ea7582952519
-EBUILD lvm2-2.02.72.ebuild 8385 RMD160 1a6df70db717d8fdcd9a3ec3baca327382596b0e SHA1 c50c7f040e11492a05c7f265379d2ae07210d280 SHA256 517ffcb71d1d0ca1a16d7c8bfa3c500985712c2f4392e53ea7584635d2b7c5fd
-MISC ChangeLog 39772 RMD160 3518847273e5f91cac636fdca2fad836d3a8180d SHA1 55f3a044197d650b23d19e0001a09b1a644fe416 SHA256 d2c866aea0ba728f178b099c3c4d5fdb9cb515783fd57db8bf2eed40a43067d8
-MISC lvm2-2.02.67-r1.ebuild.orig 8116 RMD160 e364ae957d7644b8db1145c8bbe021c084eabd61 SHA1 f3ab30befa52fe8775ac1e11dbbe0e67559fbcd3 SHA256 db68e52639f4509bbd24bb4a8fd97be82be54be3caa7e94f06fbd020e2cc0b64
-MISC lvm2-2.02.67-r2.ebuild.orig 8189 RMD160 269d6cb4a5384d7af4f085303fd584aad3fb3308 SHA1 cf671d108a456a2ac54c5f6d90d2ef868c46debb SHA256 d18f075a072fd5adad786a76ef727776bf5a08347b38d4cbceba1f44861ba40d
-MISC lvm2-2.02.67.ebuild.orig 8110 RMD160 aaf4a019266f6f63091e3fbb8de92bc5ce26f99a SHA1 0ba61b30d452f19563d186df511828de3d08a06b SHA256 85f7d288549b04e66f2a6cdb0db85e4f787bd331e819312a6a69729f206cd801
-MISC lvm2-2.02.70.ebuild.orig 8191 RMD160 ba0d3dde9ee6e4bdfa364067d55ed0eb89cdaff4 SHA1 a81dcb981ff2bc762c0f867a710712a465ac545b SHA256 e8d57b3aabac66e950f07da49f66a9ebc0599e7cb8b023341a1253700041c08d
+EBUILD lvm2-2.02.70-r1.ebuild 8470 RMD160 7c11815d265b3303750b7046a4125dd34e1cd5f9 SHA1 550847924c0162a852bf6cbd94e836fcadb21213 SHA256 478ee7870d4ef032ee835bcd473358773e57ee652b90827c8737eec5af812833
+EBUILD lvm2-2.02.70.ebuild 8401 RMD160 3493a62e42f11e3afc16ed8f2c185c9885f6c811 SHA1 9bc476b6f607c6bac0263202dc6a7dbb5d06fee9 SHA256 83a2c5435ec9f38dfc2ef053471654b09788f3f492649667b1a2f319a87e5989
+EBUILD lvm2-2.02.72.ebuild 8467 RMD160 041f280aa257dbc627272b41557444c21bd36044 SHA1 2a60c84f568e648b685906a68c7935299f69ff88 SHA256 80ed86ee5536a70958c12d26415a7e01bce9525a5a2ed4c9d2a6657f583faecc
+MISC ChangeLog 39971 RMD160 96044f06109bdc2259dcbda1626101ae44fe665a SHA1 1a9c7c45775c4f577fae3edf605e6cc91a8df48b SHA256 3af17f23c87d055922bfe71c3bf6000de810fe5dc58debd4fb27b51fc7747685
 MISC metadata.xml 792 RMD160 f60db9169ee273ca2f97fa5e69d4e5329e988164 SHA1 42f85f30477c65a164a11e172db7e250f442dca5 SHA256 87ced5a3a6102985f7c2a619dd52f65e62ae916f8921c8e7115a25452cd44b7f
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