--- bin/emerge 2004-08-15 03:19:17.000000000 +0200 +++ bin.orig/emerge 2004-08-15 03:19:08.000000000 +0200 @@ -829,18 +823,9 @@ merging=2 if merging==1: mybigkey.append("merge") - self.mydbapi[myroot].cpv_inject(mykey) else: mybigkey.append("nomerge") - virts = portage.db[myroot]["porttree"].dbapi.aux_get(mykey, ["PROVIDE"])[0].split() - cp = portage.dep_getkey(mykey) - for virt in virts: - virt = portage.dep_getkey(virt) - while cp in portage.virts[virt]: - portage.virts[virt].remove(cp) - portage.virts[virt].insert(0, cp) - # whatever the case, we need to add the node to our digraph so # that children can depend upon it. self.digraph.addnode(string.join(mybigkey),myparent)