Merged from trunk 10348:10359

   Merged from trunk 10348:10359

   | 10349   | Add back the "install new portage asap" behavior that got    |
   | zmedico | lost when that area of code was rewritten.                   |

   | 10350   | Fix th logic from the previous commit.                       |
   | zmedico |                                                              |

   | 10351   | Add the environment and some more files to the existing      |
   | zmedico | make.defaults variable substitution support. Variable        |
   |         | substitution occurs in the following order: * env.d * env *  |
   |         | make.globals * make.defaults * make.conf                     |

   | 10357   | Bug #222623 - Use "regardless" instead of "irregardless"     |
   | zmedico | since the latter is considered to be incorrect.              |

   | 10359   | * To avoid excessive IO on each call to                      |
   | zmedico | LinkageMap.rebuild(), cache NEEDED.* files via               |
   |         | vardbapi.aux_get(). * Make vardbapi.aux_get() preserve       |
   |         | newlines in multi-line metadata such as NEEDED.* and         |
   |         | CONTENTS.                                                    |
   |         | Prefix: hacked in MACHO cache support

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