From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 7 Feb 2011 22:19:33 +0000 (-0800)
Subject: expand_new_virtuals: fix last commit USE handling
X-Git-Tag: v2.1.9.38~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7f2874ee2366a1a94534e9b3d97bd2f43573d4d4;p=portage.git

expand_new_virtuals: fix last commit USE handling
---

diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py
index 60896c06e..9373ecbbc 100644
--- a/pym/portage/dep/dep_check.py
+++ b/pym/portage/dep/dep_check.py
@@ -124,8 +124,11 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/",
 			if x.unevaluated_atom.use:
 				virt_atom += str(x.unevaluated_atom.use)
 				virt_atom = Atom(virt_atom)
-				virt_atom = virt_atom.evaluate_conditionals(
-					pkg_use_enabled(graph_parent))
+				if graph_parent is None:
+					virt_atom = virt_atom.evaluate_conditionals(myuse)
+				else:
+					virt_atom = virt_atom.evaluate_conditionals(
+						pkg_use_enabled(graph_parent))
 			else:
 				virt_atom = Atom(virt_atom)
 			# According to GLEP 37, RDEPEND is the only dependency