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

Conflicts:
	bin/ebuild-helpers/4/dodoc

diff --cc bin/ebuild-helpers/4/dodoc
index 48dc4d6e07bc071988186bfb538e02eb50855e79,d32343c71308864671963bbc515bd0f19751a53c..96e81986601fa0429b81fc2de149ba8e3bdc48fa
--- 1/bin/ebuild-helpers/4/dodoc
--- 2/bin/ebuild-helpers/4/dodoc
+++ b/bin/ebuild-helpers/4/dodoc
@@@ -1,8 -1,8 +1,8 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2009 Gentoo Foundation
+ # Copyright 1999-2010 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
        die "${0##*/}: at least one argument needed"

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

diff --cc bin/ebuild-helpers/prepalldocs
index 5c8b8e939bef039075a1e96cc55894c1474e3c6c,fdc735d6fc35ed7630d5d41b344674169575f4cb..ab4166efe78ad20eb7afcb7362bb6c77ea332845
--- 1/bin/ebuild-helpers/prepalldocs
--- 2/bin/ebuild-helpers/prepalldocs
+++ b/bin/ebuild-helpers/prepalldocs
@@@ -2,13 -2,8 +2,8 @@@
  # Copyright 1999-2010 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 ! hasq "${EAPI}" 0 1 2 3; then
-       eqawarn "QA Notice: Deprecated call to 'prepalldocs'"
-       exit 0
- fi
- 
  if [[ -n $1 ]] ; then
        vecho "${0##*/}: invalid usage; takes no arguments" 1>&2
  fi