Merged from trunk 10833:10843

   Merged from trunk 10833:10843

   | 10834   | Use the EbuildMerge class instead of portage.merge().        |
   | zmedico |                                                              |

   | 10835   | Bug #229859 - Make portageq check atom validity when         |
   | zmedico | has_version() and best_version() are called from inside the  |
   |         | ebuild environment.                                          |

   | 10836   | Copy portageq exit code validation from has_version() to     |
   | zmedico | best_version().                                              |

   | 10837   | Bug #229859 - Also add atom validation to match().           |
   | zmedico |                                                              |

   | 10838   | * Remove unused EbuildBuild.pretend attribute. * Add TODO    |
   | zmedico | not about asynchronous execution.                            |

   | 10839   | Make EbuildBinpkg delegate everything up to src_install() to |
   | zmedico | the EbuildBuild class.                                       |

   | 10840   | Handle re.error exceptions raised from re.compile() when     |
   | zmedico | ACCEPT_CHOSTS is invalid. Thanks to solar for reporting.     |

   | 10841   | Split out an EbuildBuildDir class to handle locking of the   |
   | zmedico | build dir.                                                   |

   | 10842   | Instead of calling the ebuild "clean" phase in               |
   | zmedico | MergeTask.merge(), move it inside doebuild() where it can be |
   |         | tied into the actionmap_deps framework.                      |

   | 10843   | Move clean code, from the previous commit, from doebuild()   |
   | zmedico | to EbuildBuild.execute() where it fits better.               |

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