Merged from trunk -r13677:13688

   Merged from trunk -r13677:13688

   | 13678   | Fix imports for _emerge submodules.                          |
   | zmedico |                                                              |

   | 13679   | Bug #275237 - If a directory exists in a location where a    |
   | zmedico | normal file is to be merged, generate a config-protect       |
   |         | filename for the file and merge it that way. Thanks to Jonas |
   |         | Bernoulli <jonas@bernoulli.cc> for this patch.               |

   | 13680   | In binarytree.inject(), when a symlink is created for the    |
   | zmedico | current package and it overwrites another package, delete    |
   |         | the corresponding metadata from the Packages file. Thanks to |
   |         | Eitan Mosenkis <eitan@mosenkis.net> for reporting.           |

   | 13681   | Add support to `portageq owners` for querying paths matching |
   | zmedico | a given basename. It is natural to support this since the    |
   |         | vartree already maintains a basename -> owner index anyway.  |
   |         | There are plans for the packagekit backend is to support     |
   |         | this type of search.                                         |

   | 13685   | Bug #275217 - Part 3 - Splits depgraph.select_files into     |
   | zmedico | select_files and _resolve. Thanks to Sebastian Mingramm      |
   |         | (few) <s.mingramm@gmx.de> for this patch.                    |

   | 13686   | * Make Package.metadata['USE'] access trigger USE            |
   | zmedico | calculation for unbuilt ebuilds. * Make                      |
   |         | Package.metadata['LICENSE'] access trigger USE conditional   |
   |         | evaluation. * Make Package.metadata['PROVIDE'] access        |
   |         | trigger USE conditional evaluation. * Initialize             |
   |         | Package.metadata['CHOST'] in the Package constructor for     |
   |         | unbuilt ebuilds.                                             |

   | 13687   | Remove obsolete Package.metadata['CHOST'] initialization.    |
   | zmedico |                                                              |

   | 13688   | Use depgraph._pkg() to construct Package instances inside    |
   | zmedico | _select_pkg_highest_available_imp().                         |

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