Merged from trunk -r11477:11483

   Merged from trunk -r11477:11483

   | 11478   | In dep_zapdeps(), add a new choice category for choices that |
   | zmedico | have packages that aren't yet installed but have been added  |
   |         | to the graph. This category is given lower priority that the |
   |         | category for packages that are already installed. This helps |
   |         | dep_zapdeps() avoid making choices in some cases that would  |
   |         | result in an unsolvable circular dependency. Thanks to Diego |
   |         | "Flameeyes" Pettenò for reporting a circular dependency     |
   |         | issue involving that java overlay which is solved by this    |
   |         | patch. The particular issue was triggered when attempting to |
   |         | install dev-java/icedtea6 for the first time. A circular     |
   |         | dependency between dev-java/eclipse-ecj-3.2.2-r1 and         |
   |         | dev-java/icedtea6-1.2 occured since icedtea6 was chosen to   |
   |         | satisfy the jdk dependency of eclipse-ecj, even though       |
   |         | sun-jdk-1.6.0.07 was already installed and capable of        |
   |         | satisfying the dependency. This patch solves the issue by    |
   |         | causing sun-jdk to be properly selected to satisfy the jdk   |
   |         | dependency of eclipse-ecj.                                   |

   | 11479   | Add support for FEATURES="protect-owned" which is identical  |
   | zmedico | to the collision-protect feature except that files may be    |
   |         | overwritten if they are not explicitly listed in the         |
   |         | contents of a currently installed package. This is           |
   |         | particularly useful on systems that have lots of orphan      |
   |         | files that have been left behind by older versions of        |
   |         | portage that did not support the unmerge-orphans feature.    |
   |         | The additional tolerance makes this feature more suitable    |
   |         | than collision-protect for being enabled by default. In      |
   |         | order to ensure smooth operation of protect-owned in all     |
   |         | cases, we also have to set COLLISION_IGNORE="/lib/modules"   |
   |         | since files inside this directory are never unmerge. By      |
   |         | enabling protect-owned by default, users are protected from  |
   |         | problems that may occur due interactions with file           |
   |         | collisions and the unmerge-orphans feature which is also     |
   |         | enabled by default.                                          |

   | 11480   | Add a warning for emake -j1 calls which disable              |
   | zmedico | parallelization. Thanks to Diego "Flameeyes" Pettenò for    |
   |         | the suggestion.                                              |

   | 11481   | Check for calls to the deprecated bindnow-flags function.    |
   | zmedico | Thanks to Diego "Flameeyes" Pettenò for the suggestion.     |

   | 11482   | Adjust EMakeParallelDisabled.re to require at least one      |
   | zmedico | space after emake.                                           |

   | 11483   | Update PORTAGE_RSYNC_OPTS docs to reflect that               |
   | zmedico | --delete-after is no longer used by default.                 |

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