Merged from trunk 10208:10241

   Merged from trunk 10208:10241

   | 10210   | Cache results for Task.__hash__() calls.                     |
   | zmedico |                                                              |

   | 10212   | Use find -path -or -name to match basenames of files in      |
   | zmedico | INSTALL_MASK as suggested by solar in bug #219286, comment   |
   |         | #8.                                                          |

   | 10214   | Display satisfied blockers in green and show a small "b"     |
   | zmedico | instead of a big "B" (similar to "f" for satisfied fetch     |
   |         | restrictions).                                               |

   | 10216   | For consistency with the merge list display, show "block"    |
   | zmedico | instead of "blocker" in the summary.                         |

   | 10218   | Make satisfied blockers "darkblue" by default.               |
   | zmedico |                                                              |

   | 10220   | In install_mask(), discard stderr messages from the 'find'   |
   | zmedico | command since some tokens from INSTALL_MASK can trigger lots |
   |         | of warnings and errors that are irrelevant for our purposes. |

   | 10222   | Fix spelling of "SATISFIED". Thanks to Arfrever.             |
   | zmedico |                                                              |

   | 10224   | Tolerate InvalidDependString exceptions when checking        |
   | zmedico | visibility of installed packages.                            |

   | 10225   | Instead of doing automatic uninstalls in advance, install    |
   | zmedico | conflicting packages first and then do the uninstall         |
   |         | afterwards. This requires special handling for file          |
   |         | collisions occur, but it's preferred because it ensures that |
   |         | package files remain installed in a usable state whenever    |
   |         | possible. When file collisions occur between conflicting     |
   |         | packages, the contents entries for those files are removed   |
   |         | from the packages that are scheduled for uninstallation.     |
   |         | This prevents uninstallation operations from removing        |
   |         | overlapping files that have been claimed by conflicting      |
   |         | packages.                                                    |

   | 10229   | Fix findInstalledBlockers() to check for blockers in both    |
   | zmedico | directions.                                                  |

   | 10231   | Don't use try/finally to close atomic_ofstream since we      |
   | zmedico | don't want to call close() on this stream if an error        |
   |         | occurs.                                                      |

   | 10233   | Bug #220689 - Fix package selection logic so that it doesn't |
   | zmedico | trigger the code path from bug 219369 in some unwanted       |
   |         | cases.                                                       |

   | 10235   | Bug #220775 - Source isolated-functions.sh before trying to  |
   | zmedico | call vecho.                                                  |

   | 10237   | Bug #220341 - USE=multislot can make an installed package    |
   | zmedico | appear as if it doesn't satisfy a slot dependency.           |
   |         | Rebuilding the ebuild won't do any good as long as           |
   |         | USE=multislot is enabled since the newly built package still |
   |         | won't have the expected slot. Therefore, assume that such    |
   |         | SLOT dependencies are already satisfied rather than forcing  |
   |         | a rebuild.                                                   |

   | 10239   | Don't save "uninstall" tasks in the resume list since        |
   | zmedico | they'll be regenerated by dependency calculations upon       |
   |         | resume.                                                      |

   | 10241   | Remove unnecessary BlockerDB and BlockerCache                |
   | zmedico | _installed_pkgs attributes.                                  |

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