Merge remote branch 'overlays-gentoo-org/master' into prefix

Conflicts:
	bin/ebuild-helpers/newins
	bin/ebuild-helpers/prepallman
	bin/ebuild-helpers/prepinfo
	bin/ebuild.sh

diff --cc bin/ebuild-helpers/doins
Simple merge

diff --cc bin/ebuild-helpers/ecompressdir
Simple merge

diff --cc bin/ebuild-helpers/newins
index a2326bb08f57bca6da432f11fc26bcc32aa6d212,065477f471307f041d89899de72ece96179085f9..d10c84f972a7eba889b6924b771d450b2bb4699a
--- 1/bin/ebuild-helpers/newins
--- 2/bin/ebuild-helpers/newins
+++ b/bin/ebuild-helpers/newins
@@@ -1,5 -1,5 +1,5 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2010 Gentoo Foundation
+ # Copyright 1999-2011 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
  source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh

diff --cc bin/ebuild-helpers/prepallman
index 6e95f0d20b516128c3f682e38dd9b3421d0f6f34,574ab6251e47bdef3f7649fff7b650cd5fcc496e..20880fb06ef2088a3311146e019bf949f681f6eb
--- 1/bin/ebuild-helpers/prepallman
--- 2/bin/ebuild-helpers/prepallman
+++ b/bin/ebuild-helpers/prepallman
@@@ -9,11 -9,9 +9,11 @@@ hasq "${EAPI}" 0 1 2 3 || exit 
  
  ret=0
  
 -find "${D}" -type d -name man > "${T}"/prepallman.filelist
 +[[ -d ${ED} ]] || exit ${ret}
 +
 +find "${ED}" -type d -name man > "${T}"/prepallman.filelist
- while read mandir ; do
+ while read -r mandir ; do
 -      mandir=${mandir#${D}}
 +      mandir=${mandir#${ED}}
        prepman "${mandir%/man}"
        ((ret|=$?))
  done < "${T}"/prepallman.filelist

diff --cc bin/ebuild-helpers/prepinfo
index 1349e459e347dd1eba1f3cba770f56d2210208cc,9552923a324934a72991761652e8486ea95b2a1f..94e67f0a4f8afdc2b188ef12429ff1bc65bd0cb7
--- 1/bin/ebuild-helpers/prepinfo
--- 2/bin/ebuild-helpers/prepinfo
+++ b/bin/ebuild-helpers/prepinfo
@@@ -23,7 -23,7 +23,7 @@@ if [[ ! -d ${ED}${infodir} ]] ; the
        fi
  fi
  
- find "${ED}${infodir}" -type d -print0 | while read -d $'\0' x ; do
 -find "${D}${infodir}" -type d -print0 | while read -r -d $'\0' x ; do
++find "${ED}${infodir}" -type d -print0 | while read -r -d $'\0' x ; do
        for f in "${x}"/.keepinfodir*; do
                [[ -e ${f} ]] && continue 2
        done

diff --cc bin/ebuild.sh
index fd87b9c49a6285b5af252f7f4df4eee001562961,35ac05243f200519e4aba6a1a6448d6cb823513e..de4e433f8458abf16a9bc56bf9400893eabd8565
--- 1/bin/ebuild.sh
--- 2/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@@ -507,12 -501,12 +507,12 @@@ econf() 
                        sed -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" -i "$ECONF_SOURCE/configure" || \
                                die "Substition of shebang in '$ECONF_SOURCE/configure' failed"
                fi
 -              if [ -e /usr/share/gnuconfig/ ]; then
 +              if [ -e "${EPREFIX}"/usr/share/gnuconfig/ ]; then
                        find "${WORKDIR}" -type f '(' \
                        -name config.guess -o -name config.sub ')' -print0 | \
-                       while read -d $'\0' x ; do
+                       while read -r -d $'\0' x ; do
 -                              vecho " * econf: updating ${x/${WORKDIR}\/} with /usr/share/gnuconfig/${x##*/}"
 -                              cp -f /usr/share/gnuconfig/"${x##*/}" "${x}"
 +                              vecho " * econf: updating ${x/${WORKDIR}\/} with ${EPREFIX}/usr/share/gnuconfig/${x##*/}"
 +                              cp -f "${EPREFIX}"/usr/share/gnuconfig/"${x##*/}" "${x}"
                        done
                fi
  

diff --cc bin/egencache
Simple merge

diff --cc bin/emerge-webrsync
Simple merge

diff --cc bin/etc-update
Simple merge

diff --cc bin/misc-functions.sh
index 332fbe0a9cfeb19a5b47ba11e66a987aea6ec716,46be5011cebd20945de34839f48686f8a6fa346e..125ebb48b4935f4a0b09f06727599748bf0c8359
mode 100644,100755..100644
--- 1/bin/misc-functions.sh
--- 2/bin/misc-functions.sh
+++ b/bin/misc-functions.sh

diff --cc pym/_emerge/Binpkg.py
Simple merge

diff --cc pym/_emerge/EbuildBuild.py
Simple merge

diff --cc pym/_emerge/Package.py
Simple merge

diff --cc pym/_emerge/depgraph.py
Simple merge

diff --cc pym/portage/__init__.py
Simple merge

diff --cc pym/portage/const.py
Simple merge

diff --cc pym/portage/dbapi/bintree.py
index 877a2bd4886bb0271fbdde0ea257d4f4e2416f05,2da7799e892d9c8adabb7841fc0719f9a4ce7d5f..1600eb18f6f91da590ee5ec8cc6bb01c4e562e65
--- 1/pym/portage/dbapi/bintree.py
--- 2/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@@ -23,9 -23,8 +23,9 @@@ from portage.cache.mappings import slot
  from portage.const import CACHE_PATH
  from portage.dbapi.virtual import fakedbapi
  from portage.dep import Atom, use_reduce, paren_enclose
- from portage.exception import InvalidPackageName, \
+ from portage.exception import AlarmSignal, InvalidPackageName, \
        PermissionDenied, PortageException
 +from portage.const import EAPI
  from portage.localization import _
  from portage import _movefile
  from portage import os

diff --cc pym/portage/dbapi/vartree.py
Simple merge

diff --cc pym/portage/package/ebuild/doebuild.py
Simple merge

diff --cc pym/portage/package/ebuild/fetch.py
index 031ddc8dd3f66bd105f9f9c2c82a5e3864e91aea,99e2a8645de02bef62219f38b58e849145f62d2f..cdfee08699502d71654eeb93a7604bd0ab161e6c
--- 1/pym/portage/package/ebuild/fetch.py
--- 2/pym/portage/package/ebuild/fetch.py
+++ b/pym/portage/package/ebuild/fetch.py
@@@ -26,10 -26,9 +26,10 @@@ portage.proxy.lazyimport.lazyimport(glo
  
  from portage import OrderedDict, os, selinux, _encodings, \
        _shell_quote, _unicode_encode
- from portage.checksum import perform_md5, verify_all
+ from portage.checksum import hashfunc_map, perform_md5, verify_all
  from portage.const import BASH_BINARY, CUSTOM_MIRRORS_FILE, \
        GLOBAL_CONFIG_PATH
 +from portage.const import rootgid
  from portage.data import portage_gid, portage_uid, secpass, userpriv_groups
  from portage.exception import FileNotFound, OperationNotPermitted, \
        PermissionDenied, PortageException, TryAgain

diff --cc pym/portage/process.py
Simple merge