Merged from trunk -r15320:15333

   Merged from trunk -r15320:15333

   | 15321   | Bug #303445 - Fix getmaskingreason() to reset comment state  |
   | zmedico | when looping to the next package.mask file.                  |

   | 15322   | Bug #303401 - Fix emerge.log disabling code that's been      |
   | zmedico | broken since portage-2.1.7 when the _emerge module got split |
   |         | up.                                                          |

   | 15323   | Add an optional 'categories' parameter to                    |
   | zmedico | portdbapi.cp_all(), for listing a subset of categories.      |
   |         | Thanks to dol-sen for the suggestion.                        |

   | 15324   | Fix deprecated reference to portdbapi.mysettings.            |
   | zmedico |                                                              |

   | 15325   | Add a portdbapi.getRepositoryName() method which is the      |
   | zmedico | inverse of getRepositoryPath().                              |

   | 15326   | Import portage.StringIO for ImportError handling.            |
   | zmedico |                                                              |

   | 15327   | Skip atom validation in WorldHandler since WorldSelectedSet  |
   | zmedico | handles this already, and use Atom.cp instead of             |
   |         | dep_getkey().                                                |

   | 15328   | Make Glsa constructor raise GlsaFormatException when a       |
   | zmedico | package name attribute is invalid.                           |

   | 15329   | Use cpv_getkey() instead of dep_getkey() where appropriate.  |
   | zmedico |                                                              |

   | 15330   | Use Atom.cp instead of dep_getkey(), and use cpv_getkey()    |
   | zmedico | instead of dep_getkey() where appropriate.                   |

   | 15331   | Use Atom.cp instead of dep_getkey().                         |
   | zmedico |                                                              |

   | 15332   | Bug #298479 - Filter $USER from the ebuild environment since |
   | zmedico | it's inaccurate with FEATURES=userpriv.                      |

   | 15333   | Bug #303211 - Discard invalid SIZE metadata when using the   |
   | zmedico | old binhost protocol.                                        |

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