[gentoo-portage-dev] [PATCH 2/2] EAPI 6: Enforce LC_COLLATE=C in ebuild environment

[Michał Górny]

---
 pym/portage/eapi.py                    |  9 +++++++--
 pym/portage/package/ebuild/doebuild.py |  8 +++++++-
 pym/portage/util/locale.py             | 21 +++++++++++++++++++++
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/pym/portage/eapi.py b/pym/portage/eapi.py
index 4f77910..1709026 100644
--- a/pym/portage/eapi.py
+++ b/pym/portage/eapi.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2012 Gentoo Foundation
+# Copyright 2010-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 import collections
@@ -68,6 +68,10 @@ def eapi_has_required_use_at_most_one_of(eapi):
 def eapi_has_use_dep_defaults(eapi):
 	return eapi not in ("0", "1", "2", "3")
 
+def eapi_requires_posixish_locale(eapi):
+	return eapi not in ("0", "1", "2", "3", "4", "4-python", "4-slot-abi",
+			"5", "5-progress", "5-hdepend")
+
 def eapi_has_repo_deps(eapi):
 	return eapi in ("4-python", "5-progress")
 
@@ -98,7 +102,7 @@ def eapi_has_targetroot(eapi):
 _eapi_attrs = collections.namedtuple('_eapi_attrs',
 	'dots_in_PN dots_in_use_flags exports_EBUILD_PHASE_FUNC '
 	'feature_flag_test feature_flag_targetroot '
-	'hdepend iuse_defaults iuse_effective '
+	'hdepend iuse_defaults iuse_effective posixish_locale '
 	'repo_deps required_use required_use_at_most_one_of slot_operator slot_deps '
 	'src_uri_arrows strong_blocks use_deps use_dep_defaults')
 
@@ -129,6 +133,7 @@ def _get_eapi_attrs(eapi):
 		hdepend = (eapi is not None and eapi_has_hdepend(eapi)),
 		iuse_defaults = (eapi is None or eapi_has_iuse_defaults(eapi)),
 		iuse_effective = (eapi is not None and eapi_has_iuse_effective(eapi)),
+		posixish_locale = (eapi is not None and eapi_requires_posixish_locale(eapi)),
 		repo_deps = (eapi is None or eapi_has_repo_deps(eapi)),
 		required_use = (eapi is None or eapi_has_required_use(eapi)),
 		required_use_at_most_one_of = (eapi is None or eapi_has_required_use_at_most_one_of(eapi)),
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index ff8958e..67704cc 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -33,6 +33,7 @@ portage.proxy.lazyimport.lazyimport(globals(),
 	'portage.package.ebuild.fetch:fetch',
 	'portage.package.ebuild._ipc.QueryCommand:QueryCommand',
 	'portage.dep._slot_operator:evaluate_slot_operator_equal_deps',
+	'portage.eapi:eapi_requires_posixish_locale',
 	'portage.package.ebuild._spawn_nofetch:spawn_nofetch',
 	'portage.util.elf.header:ELFHeader',
 	'portage.dep.soname.multilib_category:compute_multilib_category',
@@ -42,7 +43,8 @@ portage.proxy.lazyimport.lazyimport(globals(),
 	'portage.util._async.SchedulerInterface:SchedulerInterface',
 	'portage.util._eventloop.EventLoop:EventLoop',
 	'portage.util._eventloop.global_event_loop:global_event_loop',
-	'portage.util.ExtractKernelVersion:ExtractKernelVersion'
+	'portage.util.ExtractKernelVersion:ExtractKernelVersion',
+	'portage.util.locale:split_LC_ALL',
 )
 
 from portage import bsd_chflags, \
@@ -433,6 +435,10 @@ def doebuild_environment(myebuild, mydo, myroot=None, settings=None,
 	if not eapi_is_supported(eapi):
 		raise UnsupportedAPIException(mycpv, eapi)
 
+	if eapi_requires_posixish_locale(eapi):
+		split_LC_ALL(mysettings)
+		mysettings["LC_COLLATE"] = "C"
+
 	if eapi_exports_REPOSITORY(eapi) and "PORTAGE_REPO_NAME" in mysettings.configdict["pkg"]:
 		mysettings.configdict["pkg"]["REPOSITORY"] = mysettings.configdict["pkg"]["PORTAGE_REPO_NAME"]
 
diff --git a/pym/portage/util/locale.py b/pym/portage/util/locale.py
index 6919ceb..570f6f0 100644
--- a/pym/portage/util/locale.py
+++ b/pym/portage/util/locale.py
@@ -16,6 +16,15 @@ from portage.util import writemsg_level
 from portage.util._ctypes import find_library, LoadLibrary
 
 
+locale_categories = (
+	'LC_COLLATE', 'LC_CTYPE', 'LC_MONETARY', 'LC_MESSAGES',
+	'LC_NUMERIC', 'LC_TIME',
+	# GNU extensions
+	'LC_ADDRESS', 'LC_IDENTIFICATION', 'LC_MEASUREMENT', 'LC_NAME',
+	'LC_PAPER', 'LC_TELEPHONE',
+)
+
+
 def check_locale():
 	"""
 	Check whether the locale is sane. Returns True if it is, prints
@@ -61,3 +70,15 @@ def check_locale():
 		return False
 
 	return True
+
+
+def split_LC_ALL(env):
+	"""
+	Replace LC_ALL with split-up LC_* variables if it is defined.
+	Works on the passed environment (or settings instance).
+	"""
+	lc_all = env.get("LC_ALL")
+	if lc_all is not None:
+		for c in locale_categories:
+			env[c] = lc_all
+		del env["LC_ALL"]
-- 
2.6.3