Allow the depgraph to add old-style virtual providers but

prefer any pre-existing providers over new ones that are
added.

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

1 files changed, 16 insertions, 0 deletions

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 000e74d9e..9aaa7ee7c 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -1339,6 +1339,22 @@ class depgraph(object):
 				self.digraph.addnode(jbigkey, myparent,
 					priority=priority)
 
+			if mytype != "installed":
+				# Allow this package to satisfy old-style virtuals in case it
+				# doesn't already. Any pre-existing providers will be preferred
+				# over this one.
+				try:
+					pkgsettings.setinst(mykey, metadata)
+					# For consistency, also update the global virtuals.
+					settings = self.roots[myroot].settings
+					settings.unlock()
+					settings.setinst(mykey, metadata)
+					settings.lock()
+				except portage.exception.InvalidDependString, e:
+					show_invalid_depstring_notice(jbigkey, metadata["PROVIDE"], str(e))
+					del e
+					return 0
+
 		if arg:
 			self._set_nodes.add(jbigkey)