Merged from trunk -r12277:12282

   Merged from trunk -r12277:12282

   | 12278   | Bug #252167 - If the ebuild no longer exists or it's         |
   | zmedico | keywords have been dropped, reject built instances           |
   |         | (installed or binary). If --usepkgonly is enabled, assume    |
   |         | that the ebuild status should be ignored.                    |

   | 12279   | Simplify the code from bug #218854. Also, ensure that the    |
   | zmedico | set of visible packages thats used by                        |
   |         | depgraph._iter_atoms_for_pkg() is consistent with the        |
   |         | packages that have been selected by                          |
   |         | depgraph._select_pkg_highest_available(). This should        |
   |         | correct potential inconstencies introduced by the package    |
   |         | selection changes from bug #252167.                          |

   | 12280   | Bug #252243 - Fix binarytree.prevent_collision() so that it  |
   | zmedico | won't create a circular symlink if there happens to be a     |
   |         | symlink in $PKGDIR/All for some reason.                      |

   | 12281   | Fix typo.                                                    |
   | zmedico |                                                              |

   | 12282   | When removing entries with duplicate paths inside            |
   | zmedico | binarytree.inject(), handle path collisions in $PKGDIR/All   |
   |         | when CPV is not identical.                                   |

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