Index: emerge =================================================================== RCS file: /var/cvsroot/gentoo-src/portage/bin/emerge,v retrieving revision 1.345.2.33 diff -u -r1.345.2.33 emerge --- emerge 2 Jun 2005 00:57:52 -0000 1.345.2.33 +++ emerge 17 Jun 2005 16:45:29 -0000 @@ -861,6 +861,20 @@ continue myline=myline[1:] mynewlines.append(myline.strip()) + + # Remove everything that is package.provided from our list + for myatom in mynewlines[:]: + mykey = portage.dep_getkey(myatom) + if portage.settings.virtuals.has_key(mykey): + for virtual in portage.settings.virtuals[mykey]: + if portage.settings.pprovideddict.has_key(virtual) and \ + portage.match_from_list(myatom.replace(mykey, virtual), portage.settings.pprovideddict[virtual]): + mynewlines.remove(myatom) + break + if myatom in mynewlines and portage.settings.pprovideddict.has_key(mykey) and \ + portage.match_from_list(myatom, portage.settings.pprovideddict[mykey]): + mynewlines.remove(myatom) + return mynewlines def genericdict(mylist):