From: Fabian Groffen <grobian@gentoo.org>
Date: Sun, 5 Sep 2010 13:49:13 +0000 (+0200)
Subject: Merge remote branch 'overlays-gentoo-org/master' into prefix
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=1df19cd3f17ffc10edeb1263fe1687947338f5ad;p=portage.git

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

Conflicts:
	bin/ebuild-helpers/4/dodoc
---

1df19cd3f17ffc10edeb1263fe1687947338f5ad
diff --cc bin/ebuild-helpers/4/dodoc
index 48dc4d6e0,d32343c71..96e819866
--- a/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/prepalldocs
index 5c8b8e939,fdc735d6f..ab4166efe
--- a/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