Merged from trunk 6734:6751

   Merged from trunk 6734:6751

   +------------------------------------------------------------------------+
   | 6735    | Use user-provided $mv_opts for -5 (bug #47442)               |
   | genone  |                                                              |
   |---------+--------------------------------------------------------------|
   | 6736    | Remove duplicate entries from special variables processed by |
   | genone  | env_update() (bug #172194)                                   |
   |---------+--------------------------------------------------------------|
   | 6737    | When dblink.treewalk() looks for an installed instance in    |
   | zmedico | the same slot, make sure that it selects the one with the    |
   |         | highest COUNTER in case there are multiple matches.          |
   |---------+--------------------------------------------------------------|
   | 6738    | Fix typo, split SPACE_SEPARATED variables on whitespace.     |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 6739    | For bug #181021, preserve timestamps from ${D} during merge. |
   | zmedico | For replacement operations, the unmerge phase checks the     |
   |         | contents of the newer instance in order to prevent identical |
   |         | files in the newer instance from being unmerged.             |
   |---------+--------------------------------------------------------------|
   | 6740    | Comment in portage.movefile() that it's impossible to        |
   | zmedico | preserve timestamps of a symlink since utime() only works on |
   |         | the target.                                                  |
   |---------+--------------------------------------------------------------|
   | 6741    | For bug #153967, use -O ${DISTDIR}/${FILE} in the default    |
   | zmedico | FETCHCOMMAND.                                                |
   |---------+--------------------------------------------------------------|
   | 6742    | For bug #156536, update --resume docs to show that the       |
   | zmedico | resume history is capable of storing two merge lists.        |
   |---------+--------------------------------------------------------------|
   | 6743    | For bug #82378, only set permissions on PORT_LOGDIR if it is |
   | zmedico | created automatically.                                       |
   |---------+--------------------------------------------------------------|
   | 6745    | For bug #181021, don't compare attributes of contents        |
   | zmedico | entries when deciding which files not to unmerge. Simply     |
   |         | keep any file that's listed in the new contents in order to  |
   |         | avoid problematic scenarios such as those described in       |
   |         | comments #32 and #40 of bug #8423.                           |
   |---------+--------------------------------------------------------------|
   | 6746    | Return copies of the cached values from pkgsplit and         |
   | zmedico | catpkgsplit.                                                 |
   |---------+--------------------------------------------------------------|
   | 6747    | When using a pty for logging, use setsid() to create a new   |
   | zmedico | session and make the pty into the controlling terminal of    |
   |         | the new session. This makes interactive ebuild behave        |
   |         | properly in interactive cases like check_license() where     |
   |         | ${PAGER:-less} is invoked.                                   |
   |---------+--------------------------------------------------------------|
   | 6748    | Fix strange _DevNull instance has no attribute 'isatty'      |
   | zmedico | warnings that occur when epydoc generates docs.              |
   |---------+--------------------------------------------------------------|
   | 6749    | Make pkgsplit and catpkgsplit return imutable tuples instead |
   | zmedico | of mutable lists so that cached values can be safely         |
   |         | returned without cloning them first. Thanks to Brian Harring |
   |         | for the suggestion.                                          |
   |---------+--------------------------------------------------------------|
   | 6750    | Make all the python code respect USE conditionals in         |
   | zmedico | RESTRICT. It's already handled on the bash side since        |
   |         | RESTRICT is assigned the value of PORTAGE_RESTRICT.          |
   |---------+--------------------------------------------------------------|
   | 6751    | Ignore InvalidDependString exceptions from the RESTRICT of   |
   | zmedico | "nomerge" nodes.                                             |
   +------------------------------------------------------------------------+

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