Merged from trunk -r12396:12404

   Merged from trunk -r12396:12404

   | 12397   | Bug #253745 - Note that you need to ensure that neither      |
   | zmedico | protect-owned nor collision-protect are enabled if you want  |
   |         | to disable collision protection completely.                  |

   | 12398   | Bug #253800 - Fix FETCHCOMMAND examples for SRC_URI arrow    |
   | zmedico | compatibility.                                               |

   | 12399   | Bug #253745 - Remove collision-protect from the sample       |
   | zmedico | FEATURES list since protect-owned is enabled by default now. |

   | 12400   | Add some blank lines around the messages that suggest        |
   | zmedico | --without-mask and --include-dev. Thanks to Ryan Hill        |
   |         | <dirtyepic@g.o> for the suggestion.                          |

   | 12401   | Bug #253563 - Replace hardcoded green/red color strings with |
   | zmedico | GOOD/BAD. Thanks to Vsevolod Kozlov <sevakda@gmail.com> for  |
   |         | the initial patch.                                           |

   | 12402   | Make die() to show a message indicating the repository that  |
   | zmedico | an ebuild came from, and do it during any phase for both     |
   |         | ebuilds and binary packages. Now PORTAGE_REPO_NAME is        |
   |         | initialized inside config.setcpv() for both ebuilds and      |
   |         | binary packages, so it's always available inside ebuild.sh.  |

   | 12403   | When merging a package from an overlay, append 'from         |
   | zmedico | $repository' to the '>>> Emerging' message (where            |
   |         | $repository is the repo_name of the source repository).      |
   |         | Thanks to Jeroen Roovers <jer@g.o> for the suggestion.       |

   | 12404   | Don't assume that the package metadata contains a            |
   | zmedico | "repository" key.                                            |

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