Merged from trunk -r13733:13743

   Merged from trunk -r13733:13743

   | 13735   | Move code from bug #258773 to dep_zapdeps, since the parent  |
   | zmedico | always needs to be passed in for atom validation in order to |
   |         | solve bug #275821.                                           |

   | 13736   | Bug #275821 - Make emerge reject !!atom blockers for EAPI 0  |
   | zmedico | and 1.                                                       |

   | 13737   | Bug #275796 - Prefer packages selected for install over      |
   | zmedico | installed packages. This helps automatically solve cases     |
   |         | such as the upgrade to the new bluez package which requires  |
   |         | uninstallation of the older bluez-libs and bluez-utils       |
   |         | packages. Thanks to Sebastian Mingramm (few)                 |
   |         | <s.mingramm@gmx.de> for this patch.                          |

   | 13738   | Use a finally blocker to ensure _expand_new_virtuals         |
   | zmedico | properly resets eapi state when an exception is raised.      |

   | 13739   | Fix virtual blocker code inside _expand_new_virtuals to      |
   | zmedico | correctly handle !!atom blockers.                            |

   | 13740   | Remove the upgrade selection code inside dep_zapdeps (from   |
   | zmedico | bug #171840 and bug #159360) since the code in               |
   |         | depgraph._dep_check_composite_db._visible() from bug #253904 |
   |         | now masks choices that do not match the highest available    |
   |         | version in the slot. This means that such undesirable        |
   |         | choices automatically go into the dep_zapdeps "other"        |
   |         | category.                                                    |

   | 13741   | In _expand_new_virtuals, don't expand old-style virtuals     |
   | zmedico | when there is a new-style match.                             |

   | 13742   | Bug #82488 - In _expand_new_virtuals(), check PROVIDE before |
   | zmedico | expanding old-style virtuals.                                |

   | 13743   | Bug #275901 - Make emerge bail out for USE deps in EAPI 0    |
   | zmedico | and 1.                                                       |

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