Merged from trunk 6608:6620

   Merged from trunk 6608:6620

   +------------------------------------------------------------------------+
   | 6609    | Add more relevant package metadata to the Packages index,    |
   | zmedico | including dependencies with USE conditionals collapsed.      |
   |---------+--------------------------------------------------------------|
   | 6610    | Fix paren_normalize logic.                                   |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 6611    | Make PackageIndex.write() alphabetize the metadata keys.     |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 6612    | Remember to call the superclass constructor.                 |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 6613    | Make PackageIndex.write() omit USE when appropriate.         |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 6615    | Fix the ignore-previously-merged option so that it compares  |
   | zmedico | the original files, since mrgconf can be identical to        |
   |         | conf['current'] even when conf['new'] is different from the  |
   |         | archived .dist version (due to diff3 merging).               |
   |         | (prefix: use tabs instead of spaces to avoid IndentErrors)   |
   |---------+--------------------------------------------------------------|
   | 6617    | Don't treat KEYWORDS="-*" like KEYWORDS="*", because it's    |
   | zmedico | never been that way and the * behavior was already annoying  |
   |         | enough.                                                      |
   |---------+--------------------------------------------------------------|
   | 6618    | Skip fetching of metadata.dtd when mymode == "manifest".     |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 6620    | To ease the namespace transition, automatically translate    |
   | zmedico | cache.* to portage.cache.* if an ImportError occurs.         |
   +------------------------------------------------------------------------+

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