Merged from trunk 11334:11346

   Merged from trunk 11334:11346

   | 11335   | Fix breakage in elog function newline handling with causes   |
   | zmedico | blank/empty lines to get lost.                               |

   | 11336   | Remove redundant 'local line' definition from previous       |
   | zmedico | commit.                                                      |

   | 11337   | Fix `svn status` output parsing to account for "replaced"    |
   | zmedico | files indicated by "R". Thanks to Arfrever.                  |

   | 11338   | Remove the "ebuild.disjointed" check because it's obsolete   |
   | zmedico | since we've switched to manifest2 only. Thanks to Arfrever   |
   |         | for this patch.                                              |

   | 11339   | Replace call to `svn list` with a call to `svn status        |
   | zmedico | --depth=files --verbose` since the former contacts the       |
   |         | server while the latter does not. Thanks to Arfrever for     |
   |         | this patch.                                                  |

   | 11340   | In order to conserve some space, make _setitem() skip        |
   | zmedico | writing keys for which the value is empty.                   |

   | 11341   | Fix a bug in vardbapi.removeFromContents() which sometimes   |
   | zmedico | prevents the CONTENTS from being updated when it should.     |

   | 11342   | Add support in EAPI 2_pre2 for a function named "default" is |
   | zmedico | redefined for each phase so that it will call the default_*  |
   |         | function corresponding to the current phase. Thanks to       |
   |         | Thomas Anderson for the initial patch.                       |

   | 11343   | In order to properly preserve --jobs and --load-average      |
   | zmedico | settings for --resume operations, store resume options in    |
   |         | the mtimedb as a dict instead of a list. The dict type is    |
   |         | supported in >=portage-2.1.3_rc8 (2.1.4.4 is current stable) |
   |         | so people switching between stable/unstable will be fine.    |

   | 11344   | When testing containment of elem[:1] in "MR", filter         |
   | zmedico | potential empty string matches.                              |

   | 11345   | Shorten the scheduler status display in the xterm title by   |
   | zmedico | removing all consecutive spaces.                             |

   | 11346   | * Fix the default() implementation so that it maps the       |
   | zmedico | ebuild argument to the correct phase function. * Add         |
   |         | --exclude-init-phases option to save_ebuild_env() for        |
   |         | filtering out unnecessary functions and variables when       |
   |         | creating environment.bz2. * Add support for default() and    |
   |         | default_* functions that die in all ebuild phases so that    |
   |         | improper use of these functions is quickly discovered.       |

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