Merged from trunk -r14047:14057

   Merged from trunk -r14047:14057

   | 14048   | Revert r14042 since we're not going to use it.               |
   | zmedico |                                                              |

   | 14049   | In dblink._unmerge_pkgfiles(), if the package appears to     |
   | zmedico | have been merged with a different value of                   |
   |         | sys.getfilesystemencoding(), fall back to utf_8 if           |
   |         | appropriate.                                                 |

   | 14050   | Inside dblink.treewalk(), handle filenames with incorrect    |
   | zmedico | encoding like we do after src_install. The check needs to be |
   |         | repeated here for binary packages (it's inexpensive since we |
   |         | call os.walk() here anyway).                                 |

   | 14051   | Update imports to import portage.os (with unicode wrappers). |
   | zmedico |                                                              |

   | 14052   | Update imports to import portage.os (with unicode wrappers), |
   | zmedico | and use _unicode_encode() and _unicode_decode() where        |
   |         | appropriate.                                                 |

   | 14053   | Use portage._fs_encoding where applicable.                   |
   | zmedico |                                                              |

   | 14054   | Handle UnicodeDecodeError for os.walk() inside               |
   | zmedico | digestcheck().                                               |

   | 14055   | Use portage._fs_encoding where appropriage, and use strict   |
   | zmedico | handling for errors.                                         |

   | 14056   | Add a portage._content_encoding constant, set to utf_8.      |
   | zmedico |                                                              |

   | 14057   | Fix broken _selinux_merge definition.                        |
   | zmedico |                                                              |

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