Merged from trunk -r14625:14635

   Merged from trunk -r14625:14635

   | 14626   | Inside dep_zapdeps(), detect cases such as || ( foo:1 foo:2  |
   | zmedico | ), where we want to prefer the atom which matches the higher |
   |         | version rather than the atom furthest to the left. Sorting   |
   |         | is done separately for each of choice_bins, so as not to     |
   |         | interfere with the ordering of the bins. Because of the bin  |
   |         | separation, the main function of this code is to allow       |
   |         | --depclean to remove old slots (rather than to pull in new   |
   |         | slots).                                                      |

   | 14627   | Fix repoman breakage from previous commit.                   |
   | zmedico |                                                              |

   | 14628   | Make cpv_getkey() use catpkgsplit() insead of a separate     |
   | zmedico | regex.                                                       |

   | 14629   | Bug #227225 - Add *DEPEND.badtilde warning for ~ operator    |
   | zmedico | used with non-zero revision. Thanks to David Leverton        |
   |         | <levertond@googlemail.com> for this patch.                   |

   | 14630   | Automatically create a fallback setconfig, so emerge isn't   |
   | zmedico | crippled due to misssing/corrupt/outdated sets.conf. This is |
   |         | especially important since WorldSet has been renamed to      |
   |         | WorldSelectedSet, and thus new and old sets.conf files are   |
   |         | incompatible.                                                |

   | 14631   | Call config._init_dirs() from emerge so that it's not called |
   | zmedico | every time the portage api is imported.                      |

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