Stop removing locale vars from environment #252802 by Harald van Dijk.

Package-Manager: portage-2.2_rc18/cvs/Linux 2.6.28 x86_64

4 files changed, 13 insertions, 15 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index b2242e7491a0..38cd2d8e649c 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.599 2008/12/27 04:20:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.600 2008/12/29 09:22:45 vapier Exp $
+
+  29 Dec 2008; Mike Frysinger <vapier@gentoo.org> files/eblits/common.eblit,
+  files/eblits/src_install.eblit:
+  Stop removing locale vars from environment #252802 by Harald van Dijk.
 
 *glibc-2.9_p20081201-r1 (27 Dec 2008)
 
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 470db4120db5..1cc0c88be90d 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -105,10 +105,10 @@ AUX 2.5/glibc-2.5-hardened-pie.patch 1569 RMD160 8746aeb9f9c68ca153d93cf92c9df93
 AUX 2.6/glibc-2.6-gentoo-stack_chk_fail.c 9545 RMD160 9a21c9deb6ebca5d2245e3bb50b53ce035967a5f SHA1 11ad52117fa55bbe51b429043df49767c7f58de0 SHA256 1410ded812be80d452eada5f9d6b9bd7bdb504c14f01cc27dce3e36b6f92b92a
 AUX 2.6/glibc-2.6-hardened-inittls-nosysenter.patch 8674 RMD160 f4e7df0cb25292afc13e18332569d2ca288fdf92 SHA1 7f34ef26d6607321e0ec5ad0f389cb1aedf5e0da SHA256 cf58ded8fbe9fcb3dc094521feec2588c1520ff2c632b20c69d6a210325c4fcf
 AUX 2.7/glibc-2.7-hardened-inittls-nosysenter.patch 8755 RMD160 b674894f3b16f63193bb8040f8a5657dce82e1f9 SHA1 79fb3a4454b85af70dac95dd79134be3fe3a9201 SHA256 b0b1bf0746f7160b89cf281502b95c38dec9cb948d6a50a907b84fd6230a2dc3
-AUX eblits/common.eblit 8778 RMD160 2229651e97b681934a810edf6615c6283e82bc7d SHA1 ad762b9d549f99bc8c93f68b2e5c30a4ae4e17ee SHA256 fd0f90128e913384cae041e25c5e705b83aa501428a6af3e82d3b68ffef1dd08
+AUX eblits/common.eblit 8670 RMD160 9bf0886b0a63f959bacfb09b01e83741d9276aad SHA1 3b8eb208b69da4c8a0ae15d03eba7e1bd964f480 SHA256 8f49bbc22edd38d40f82ff6d2fbc0707c580e39a928d7216aca7425c9314e851
 AUX eblits/src_compile.eblit 5275 RMD160 053edde7b9ed3b334515e1fbc118c008b7359135 SHA1 a96b8d1732b7eca1336b63ad77d061a6d42a662e SHA256 869f2eec38b883d357ecc63d726bc7fda442301823e88cf8afea10b76ee18e0f
 AUX eblits/src_install-2.6.eblit 7946 RMD160 6cc258a316b78212777ab328a3c0cb73de1616d4 SHA1 94895689b56fd712156e8ac84a2a639d8475da03 SHA256 54081c34217c230d0ff43c5df378897a37576e727fe41ee4d681767110667f3e
-AUX eblits/src_install.eblit 8003 RMD160 449ef3e55a832f8407d4a6fc9237ae32bca922dd SHA1 830f2a841996903a95754f446dbf2cf3acc079f7 SHA256 4b0807f5b716209053fe607f001e80f9d0f818d994f96c294c1cc813be8d9eeb
+AUX eblits/src_install.eblit 7893 RMD160 789a4518bbb0be8a028f331e2673e423d2717a93 SHA1 7288c1bcc7f05e8aa0d4f90d4c63be128a2d225d SHA256 d5f0cb0345c33f66a90d73e7e0264867d9bcf4a137190d6ae4008d63a3b7bd56
 AUX eblits/src_test.eblit 1162 RMD160 349db09c5f2c2e412a108b8c5371adf946e1a3f0 SHA1 357ef650e1dce62d5d688133426bc62b9085009d SHA256 bac1db2da478f6e6709275c36cc1f9a98fac7fcc2e80bd8831f2077207754962
 AUX eblits/src_unpack.eblit 4971 RMD160 64a210a53ca8b8048e9395ba5b716dd064abf755 SHA1 29b1936f649de5606feb12c29f726e312ed3401f SHA256 047d2b0cf9594333bedbfbf4954f939065e8632617151573edc230d3a5825152
 AUX fix-sysctl_h.patch 376 RMD160 b5dd68158224b09ddc42986be02351c74f81e0a0 SHA1 5601fbea6961368bcc192aef78e96ee2c5310713 SHA256 3a589f63fd1f3f6c5a00c66a10943d3d64630aefb1eb5b37e7f2a856fcea234a
@@ -197,12 +197,12 @@ EBUILD glibc-2.8_p20080602-r1.ebuild 12995 RMD160 712a2b49b8ee4ea10aba46420e52d8
 EBUILD glibc-2.8_p20080602.ebuild 13096 RMD160 130b6aa612187ae6bf6bc3bb9349619d9e3e664d SHA1 16f93a5e834cb3968e551c40d2225d671a2436c7 SHA256 53cd4bffa721bf489eb33b090e638dfd1420a9a3ac3ae87107f62a63906ab9c9
 EBUILD glibc-2.9_p20081201-r1.ebuild 13001 RMD160 1b5eed28c8d04cd40e66cf224a60b3a46ced37e7 SHA1 5c70898247fea2e735bb34ec1516aae95ed74933 SHA256 20211cd1eacc3ce29b576f023fa79d4e5915dfb40daa962175586387e9846e94
 EBUILD glibc-2.9_p20081201.ebuild 12992 RMD160 cd59777b34002951a50f87cfd9c314308bf3dc12 SHA1 8bf700b1d0ee5ad652d5808e1ffba2eeb0373adb SHA256 6d1e2c6aa9c55097317028b84ff6ada5e9d7ee869fa62be7ba8cbddaedb38717
-MISC ChangeLog 113215 RMD160 5faa8e32e49fb6452b4bfcad9d90ff2d5f296299 SHA1 98eea50eebaea9ed8d8ac6cd538aaaf486c78884 SHA256 1700b3adef61ac9f69a3b370edf2a3eb50e6478fc6ddba09799da05d1eb2d5d9
+MISC ChangeLog 113400 RMD160 dbb8ecd802f16484eef9781ad11716db7845e155 SHA1 07ad8724262e01f29ef56f42d62b3e90ae12fbc6 SHA256 f146d44bf15d629c33b2581bdd5a283e4c03809155414b0e0fc154ae61961119
 MISC metadata.xml 1112 RMD160 1aa9770356149948593ebe35a1bd3940dd72fca2 SHA1 40514cc45c26bab671d78aa1567441bf72b0c6cc SHA256 4acea698dc4f66c17f4f3f81b28cd6b32f5425fd49f380df4a016489f786b1f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklVrSoACgkQn/5bYzqsSmFrHQCgrT8V7VrN9CHNuNNvytri0mTV
-jGsAn0rahcS3ZFP11SgYdj1dlSxuUTzE
-=+53Y
+iEYEARECAAYFAklYlusACgkQn/5bYzqsSmFm4wCeJBYd03tiOphSswQVPDrPlk08
+VqwAoL2ETDU2yLe9KfB6aqVlokKsynUX
+=tSlH
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit
index b6673520554e..0f019e6930b9 100644
--- a/sys-libs/glibc/files/eblits/common.eblit
+++ b/sys-libs/glibc/files/eblits/common.eblit
@@ -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/sys-libs/glibc/files/eblits/common.eblit,v 1.7 2008/12/23 11:59:43 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.8 2008/12/29 09:22:45 vapier Exp $
 
 # We need to be able to set alternative headers for
 # compiling for non-native platform
@@ -251,8 +251,6 @@ use_multilib() {
 
 # Setup toolchain variables that would be defined in the profiles for these archs.
 setup_env() {
-	# These should not be set, else the zoneinfo do not always get installed ...
-	unset LANGUAGE LANG LC_ALL
 	# silly users
 	unset LD_RUN_PATH
 
diff --git a/sys-libs/glibc/files/eblits/src_install.eblit b/sys-libs/glibc/files/eblits/src_install.eblit
index 54465c4ae5ad..aa1d4e7ad490 100644
--- a/sys-libs/glibc/files/eblits/src_install.eblit
+++ b/sys-libs/glibc/files/eblits/src_install.eblit
@@ -1,12 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.6 2008/06/23 01:39:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.7 2008/12/29 09:22:45 vapier Exp $
 
 toolchain-glibc_src_install() {
-	# These should not be set, else the
-	# zoneinfo do not always get installed ...
-	unset LANGUAGE LANG LC_ALL
-
 	local GBUILDDIR
 	if want_linuxthreads ; then
 		GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-linuxthreads