Merged from trunk -r11515:11531

   Merged from trunk -r11515:11531

   | 11516   | Fix typo in from previous commit.                            |
   | zmedico |                                                              |

   | 11517   | Implement the new EAPI 2 blocker behavior, including !!atom  |
   | zmedico | sytax which forbids temporary simultaneous installation of   |
   |         | conflicting packages.                                        |

   | 11518   | Document the --debug option. Thanks to Jeremy Olexa          |
   | zmedico | <darkside@g.o> suggesting.                                   |

   | 11519   | Define __all__ and clean up unused imports found by          |
   | zmedico | pyflakes.                                                    |

   | 11520   | Bug #238157 - Update http_proxy/ftp_proxy docs to show       |
   | zmedico | protocol://, for compat with rubygems.                       |

   | 11521   | Document the --ignore-default-opts and --skip-manifest       |
   | zmedico | options.                                                     |

   | 11522   | Implement SRC_URI arrows for EAPI 2. The                     |
   | zmedico | portdbapi.getfetchlist() method is now deprecated and there  |
   |         | is a new getFetchMap() method that returns a dict which maps |
   |         | each file name to a set of alternative URIs. The             |
   |         | portage.fetch() function uses introspection to detect when   |
   |         | such a dict is passed in and handles it appropriately, while |
   |         | maintaining backward compatibility if a list of uris is      |
   |         | passed in.                                                   |

   | 11523   | Add a "EAPI 2_pre3" section to show what's changed.          |
   | zmedico |                                                              |

   | 11524   | Add test cases for SRC_URI validation.                       |
   | zmedico |                                                              |

   | 11525   | Fix some broken logic inside portdbapi.getFetchMap().        |
   | zmedico |                                                              |

   | 11526   | More SRC_URI validation.                                     |
   | zmedico |                                                              |

   | 11527   | As requested by jmbsvicetto, add support to StaticFileSet    |
   | zmedico | for sets within subdirectories. This makes it possible to    |
   |         | create a set name foo/bar by placing a file named bar inside |
   |         | a directory named foo. By allowing sets to be organized in   |
   |         | subdirectories, it will allow us to avoid overcrowding as    |
   |         | the number of sets grows.                                    |

   | 11528   | Fix erroneous variable references in the multiset            |
   | zmedico | 'Redefinition of set' message.                               |

   | 11529   | Bug #238251 - Use 'read' instead of $IFS for splitting       |
   | zmedico | newlines in e* functions, since using $IFS causes spurious   |
   |         | newlines to be inserted in the message when the e* function  |
   |         | is called with more than one argument.                       |

   | 11530   | Always call `cd "$WORKDIR"` to ensure that $CWD is sane      |
   | zmedico | whenever possible.                                           |

   | 11531   | Add a new --list-sets action, as requested by jmbsvicetto.   |
   | zmedico |                                                              |

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