Merged from trunk -r11785:11791

   Merged from trunk -r11785:11791

   | 11786   | Bug #239015 - Disable unmerge operations for                 |
   | zmedico | EverythingSet/@installed.                                    |

   | 11787   | In Scheduler._calc_resume_list(), use self.pkgsettings       |
   | zmedico | instead of the the temportary depgraph's.                    |

   | 11788   | TODO: In case some elf files collide with blocked packages,  |
   | zmedico | ensure that NEEDED data from include_file overrides the      |
   |         | stale NEEDED data from the colliding files in the blocked    |
   |         | packages.                                                    |

   | 11789   | In _validate_deps(), show the ebuild version to clarify      |
   | zmedico | which ebuild the errors belong to.                           |

   | 11790   | In config.setcpv(), ensure that A and AA aren't in the env   |
   | zmedico | dict.                                                        |

   | 11791   | In SetConfig.getSetAtoms(), access self.psets directly in    |
   | zmedico | order to avoid making a copy and also to avoid potential     |
   |         | swallowing of an unexpected KeyError.                        |

svn path=/main/branches/prefix/; revision=11795