Merged from trunk 7054:7078

   Merged from trunk 7054:7078

   +------------------------------------------------------------------------+
   | 7055    | Format $EBUILD_OVERLAY_ECLASSES output more like it was      |
   | zmedico | before.                                                      |
   |---------+--------------------------------------------------------------|
   | 7057    | Fix quoting.                                                 |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7059    | For bug #142473, account for $ROOT when deciding if a        |
   | zmedico | package is part of world or not.                             |
   |---------+--------------------------------------------------------------|
   | 7061    | Instead of just a list, use a cat/pkg dict for matching      |
   | zmedico | packages against args in the depgraph.                       |
   |---------+--------------------------------------------------------------|
   | 7063    | Improve tracking of correspondence between arguments and     |
   | zmedico | packages in the depgraph.                                    |
   |---------+--------------------------------------------------------------|
   | 7064    | Cache aux_get() metadata in depgraph.create() and use        |
   | zmedico | PROVIDE for matching packages to arguments.                  |
   |---------+--------------------------------------------------------------|
   | 7065    | Just use a containment test for matching pprovided args      |
   | zmedico | since it works correctly and match_to_list() isn't           |
   |         | appropriate for this.                                        |
   |---------+--------------------------------------------------------------|
   | 7067    | Discard "nomerge" nodes to speed up depgraph.altlist() since |
   | zmedico | those nodes aren't used and the --tree algorithm does a good |
   |         | job of regenerating them when appropriate.                   |
   |---------+--------------------------------------------------------------|
   | 7069    | For bug #144333, make the --reinstall option a single choice |
   | zmedico | type.                                                        |
   |---------+--------------------------------------------------------------|
   | 7071    | When filling in "nomerge" nodes for --tree display, stop at  |
   | zmedico | a node that is an argument or a direct member of a set that  |
   |         | has been specified as an argument (system or world).         |
   |---------+--------------------------------------------------------------|
   | 7073    | For bug #183431, catch a ParseError caused by a corrupt      |
   | zmedico | profile and dump an error message. This allows emerge to     |
   |         | continue with actions that don't require a valid profile,    |
   |         | such as --sync.                                              |
   |---------+--------------------------------------------------------------|
   | 7075    | For bug #142473, add 2 additional color classes for system   |
   | zmedico | packages and packages matched by arguments.                  |
   |---------+--------------------------------------------------------------|
   | 7076    | Don't colorize system package when in "world" mode.          |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7078    | Remove unused worldlist variable.                            |
   | zmedico |                                                              |
   +------------------------------------------------------------------------+

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