Bug #244947 - Add repoman support for checking masked and forced flags on

conditional USE deps.

svn path=/main/trunk/; revision=11769

1 files changed, 11 insertions, 4 deletions

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 68b7a35ca..4b9457ae9 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -6110,7 +6110,7 @@ def dep_virtual(mysplit, mysettings):
 	return newsplit
 
 def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/",
-	trees=None, **kwargs):
+	trees=None, use_mask=None, use_force=None, **kwargs):
 	"""Recursively expand new-style virtuals so as to collapse one or more
 	levels of indirection.  In dep_zapdeps, new-style virtuals will be assigned
 	zero cost regardless of whether or not they are currently installed. Virtual
@@ -6146,8 +6146,14 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/",
 					raise portage.exception.ParseError(
 						"invalid atom: '%s'" % x)
 
-		# Repoman only checks IUSE for USE deps, so there's
-		# no need to evaluate conditionals.
+		if repoman and x.use and x.use.conditional:
+			evaluated_atom = portage.dep.remove_slot(x)
+			if x.slot:
+				evaluated_atom += ":%s" % x.slot
+			evaluated_atom += str(x.use._eval_qa_conditionals(
+				use_mask, use_force))
+			x = portage.dep.Atom(evaluated_atom)
+
 		if not repoman and \
 			myuse is not None and isinstance(x, portage.dep.Atom) and x.use:
 			if x.use.conditional:
@@ -6538,7 +6544,8 @@ def dep_check(depstring, mydbapi, mysettings, use="yes", mode=None, myuse=None,
 	# collapse one or more levels of indirection.
 	try:
 		mysplit = _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings,
-			use=use, mode=mode, myuse=myuse, use_cache=use_cache,
+			use=use, mode=mode, myuse=myuse,
+			use_force=useforce, use_mask=mymasks, use_cache=use_cache,
 			use_binaries=use_binaries, myroot=myroot, trees=trees)
 	except portage.exception.ParseError, e:
 		return [0, str(e)]