Merged from trunk 9909:9941

   Merged from trunk 9909:9941

   | 9910    | Inside dblink.unmerge(), call self.updateprotect() just in   |
   | zmedico | case anything has changed since the dblink instance was      |
   |         | constructed.                                                 |

   | 9912    | Handle potential InvalidDependString exceptions from         |
   | zmedico | visible().                                                   |

   | 9914    | Bug #217905 - Fix portdbapi.getfetchlist() to correctly      |
   | zmedico | calculate USE when the useflags parameter is not passed in.  |

   | 9916    | If the mysettings parameter is not passed in to              |
   | zmedico | portdbapi.getfetchlist() then substitue                      |
   |         | self.doebuild_settings since that one is mutable which is    |
   |         | necessary in case setcpv() needs to be called.               |

   | 9918    | Fix portdbapi.getfetchlist() so that it doesn't              |
   | zmedico | unnecessarily calculate USE when the "all" parameter is      |
   |         | True.                                                        |

   | 9920    | Remove redundant version sorting in _expand_new_virtuals()   |
   | zmedico | since the dbapi match results are already sorted.            |

   | 9922    | Make the ccache userpriv permission check from bug #162542   |
   | zmedico | less sensitive by skipping permission checks on files and    |
   |         | just checking the directories.                               |

   | 9924    | Bug #218202 - Make sure the spinner is quiet in --nodep      |
   | zmedico | mode.                                                        |

   | 9926    | Add a new part for "Dependency Resolution".                  |
   | zmedico |                                                              |

   | 9928    | Bug #218559 - Make portdbapi automatically add sandbox write |
   | zmedico | access to self.depcachedir when appropriate. This makes the  |
   |         | portageq blanket sandbox exemption unnecessary.              |

   | 9930    | * Make portdbapi.aux_get() automatically pull pre-generated  |
   | zmedico | metadata directly from the metadata/cache/ directory when    |
   |         | metadata-transfer is not enabled in FEATURES. This makes all |
   |         | cache modules behave similar to existing metadata_overlay    |
   |         | module, except when FEATURES="metadata-transfer" has been    |
   |         | explicitly enabled. * Remove metadata-transfer from FEATURES |
   |         | in make.globals so that it's no longer enabled by default.   |
   |         | Users will be happy about this since the "Updating Portage   |
   |         | cache" part of emerge --sync can be more time consuming than |
   |         | the rsync run itself. It's also nicer when when using        |
   |         | PORTDIR over nfs or bind mounted in a chroot since there's   |
   |         | no need to run emerge --metadata. * Update                   |
   |         | FEATURES="metadata-transfer" docs to warn users of the rsync |
   |         | tree to modify eclases in PORTDIR_OVERLAY if necessary       |
   |         | instead of doing it directly in the rsync tree. * Relevant   |
   |         | updates to /etc/portage/modules docs.                        |

   | 9932    | Fix portage version, should be >=2.1.5.                      |
   | zmedico |                                                              |

   | 9934    | Document FEATURES="metadata-transfer" changes some more.     |
   | zmedico |                                                              |

   | 9936    | In action_metadata(), properly put the source cache in       |
   | zmedico | readonly mode.                                               |

   | 9938    | In show_slot_collision_notice(), refer to the problem as a   |
   | zmedico | "slot conflict" since that's how I'm refering to it in the   |
   |         | docs.                                                        |

   | 9940    | Bug #218439 - Improve alignment in short emerge --help       |
   | zmedico | options output.                                              |

   | 9941    | Swap --nospinner and --oneshot for alphabetical ordering.    |
   | zmedico |                                                              |

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