Make depclean account for old-style virtuals so that it doesn't remove the providers.

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

1 files changed, 8 insertions, 1 deletions

diff --git a/bin/emerge b/bin/emerge
index 90ec7e435..740660881 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -3257,7 +3257,14 @@ def action_depclean(settings, trees, ldpath_mtimes,
 	sys_world_unversioned = set()
 	from itertools import chain
 	for x in chain(syslist, worldlist):
-		sys_world_unversioned.add(portage.dep_getkey(x))
+		mycp = portage.dep_getkey(x)
+		if mycp in settings.getvirtuals():
+			providers = []
+			for provider in settings.getvirtuals()[mycp]:
+				if vartree.dbapi.match(provider):
+					providers.append(provider)
+			sys_world_unversioned.update(providers)
+		sys_world_unversioned.add(mycp)
 
 	cleanlist=[]
 	for x in myvarlist: