From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 11 Apr 2008 20:11:31 +0000 (-0000)
Subject: When dep_check() expands new-style virtuals, use USE flags from aux_get
X-Git-Tag: v2.2_pre6~188
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=882da0c75eee6d517f51835f16d11a6e50858769;p=portage.git

When dep_check() expands new-style virtuals, use USE flags from aux_get
calls to evaluate any conditionals that the depstrings might contain. This
works properly for ebuilds now that aux_get() is backed by Package instances
containing the correct USE.

svn path=/main/trunk/; revision=9839
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 0a240002b..b5227b1e0 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -5364,12 +5364,16 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/",
 		else:
 			a = ['||']
 		for y in pkgs:
-			depstring = " ".join(y[2].aux_get(y[0], dep_keys))
+			cpv, pv_split, db = y
+			depstring = " ".join(db.aux_get(cpv, dep_keys))
+			use_split = db.aux_get(cpv, ["USE"])[0].split()
+			pkg_kwargs = kwargs.copy()
+			pkg_kwargs["myuse"] = use_split
 			if edebug:
 				print "Virtual Parent:   ", y[0]
 				print "Virtual Depstring:", depstring
 			mycheck = dep_check(depstring, mydbapi, mysettings, myroot=myroot,
-				trees=trees, **kwargs)
+				trees=trees, **pkg_kwargs)
 			if not mycheck[0]:
 				raise portage.exception.ParseError(
 					"%s: %s '%s'" % (y[0], mycheck[1], depstring))