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

Conflicts:
	bin/ebuild-helpers/dodoc

diff --cc bin/ebuild
Simple merge

diff --cc bin/ebuild-helpers/dodoc
index 073fa204ad6c7cdb99ce8f756a23a0f00f76cb9a,65713db1a4b0778a0974a9d3723e3f658706973f..41fc8f5acfb22540e34796405cbc288524841ea4
--- 1/bin/ebuild-helpers/dodoc
--- 2/bin/ebuild-helpers/dodoc
+++ b/bin/ebuild-helpers/dodoc
@@@ -1,8 -1,8 +1,9 @@@
- # Copyright 1999-2010 Gentoo Foundation
 +#!@PORTAGE_BASH@
+ #!/bin/bash
+ # 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
 +source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
  
  if [ $# -lt 1 ] ; then
        helpers_die "${0##*/}: at least one argument needed"

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

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

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

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

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