From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 19 Nov 2010 20:50:54 +0000 (-0800)
Subject: emerge --info: Fix USE_EXPAND display
X-Git-Tag: v2.1.9.25~30
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9fe82c8079d1e386dd44064e9a73b701f39c4171;p=portage.git

emerge --info: Fix USE_EXPAND display

This makes the USE_EXPAND variables consistent with the USE flag
settings.
---

diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index 922116a5e..f927af4d3 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -1879,6 +1879,24 @@ class config(object):
 		myflags.difference_update(self.usemask)
 		self.configlist[-1]["USE"]= " ".join(sorted(myflags))
 
+		if self.mycpv is None:
+			# Generate global USE_EXPAND variables settings that are
+			# consistent with USE, for display by emerge --info. For
+			# package instances, these are instead generated via
+			# setcpv().
+			for k in use_expand:
+				prefix = k.lower() + '_'
+				prefix_len = len(prefix)
+				expand_flags = set( x[prefix_len:] for x in myflags \
+					if x[:prefix_len] == prefix )
+				var_split = use_expand_dict.get(k, '').split()
+				var_split = [ x for x in var_split if x in expand_flags ]
+				var_split.extend(sorted(expand_flags.difference(var_split)))
+				if var_split:
+					self.configlist[-1][k] = ' '.join(var_split)
+				elif k in self:
+					self.configlist[-1][k] = ''
+
 	@property
 	def virts_p(self):
 		warnings.warn("portage config.virts_p attribute " + \