From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 19 Nov 2010 23:21:53 +0000 (-0800)
Subject: Handle combination of incremental + USE_EXPAND
X-Git-Tag: v2.1.9.25~28
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cb75d06bf60016d26a4f7bd2c7e6a55d66194309;p=portage.git

Handle combination of incremental + USE_EXPAND

This fixes a corner case in the code from the previous commit.
---

diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index 33b57c5ba..a84e8fe84 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -1787,8 +1787,15 @@ class config(object):
 					if v is None:
 						continue
 					prefix = k.lower() + '_'
-					for x in v.split():
-						expand_use.append(prefix + x)
+					if k in myincrementals:
+						for x in v.split():
+							if x[:1] == '-':
+								expand_use.append('-' + prefix + x[1:])
+							else:
+								expand_use.append(prefix + x)
+					else:
+						for x in v.split():
+							expand_use.append(prefix + x)
 				if expand_use:
 					expand_use.append(use)
 					use  = ' '.join(expand_use)