Merged from trunk -r11593:11602

   Merged from trunk -r11593:11602

   | 11594   | For compatibility with long-standing --columns behavior, do  |
   | zmedico | not display "uninstall" or satsified "blocks" nodes in the   |
   |         | merge list when --columns is enabled. Thanks to solar for    |
   |         | the suggestion.                                              |

   | 11595   | make sure that cli-defined sets aren't added to @world       |
   | genone  |                                                              |

   | 11596   | allow selection of metadata source for VariableSet           |
   | genone  |                                                              |

   | 11597   | remove the 'repository' option from CategorySet in favor of  |
   | genone  | the generic 'intersect' option                               |

   | 11598   | Add a new DummyPackageSet handler to make set operators      |
   | genone  | easier to use                                                |

   | 11599   | allow the portage.sets. prefix to be omitted in 'class'      |
   | genone  | options of set definitions                                   |

   | 11600   | Bug #239006 - In FakeVartree._aux_get_wrapper(), fall back   |
   | zmedico | to vdb metadata if the live ebuild's EAPI is unsupported.    |

   | 11601   | Now that elog_base() uses 'echo -e' to expand escape codes   |
   | zmedico | prior to using 'read' to split on newlines, it's safe to use |
   |         | newlines as delimiters in the log file since 'read' is       |
   |         | guaranteed to split any newlines contained in the arguments. |

   | 11602   | Handle InvalidDependString from portdbapi.getFetchMap()      |
   | zmedico | inside search.output(). Thanks to agaffney for reporting.    |

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