From: Fabian Groffen <grobian@gentoo.org>
Date: Wed, 9 Mar 2011 19:42:08 +0000 (+0100)
Subject: Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5fe6f8c536460d74097aa1b10eeffe115382fa03;p=portage.git

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

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

5fe6f8c536460d74097aa1b10eeffe115382fa03
diff --cc bin/ebuild-helpers/dodoc
index 073fa204a,65713db1a..41fc8f5ac
--- a/bin/ebuild-helpers/dodoc
+++ b/bin/ebuild-helpers/dodoc
@@@ -1,8 -1,8 +1,9 @@@
 +#!@PORTAGE_BASH@
- # Copyright 1999-2010 Gentoo Foundation
+ #!/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"