From: Fabian Groffen <grobian@gentoo.org>
Date: Fri, 23 Apr 2010 19:17:15 +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=80a2b2898552db45adc10e9380c1046904c3c36b;p=portage.git

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

Conflicts:
	bin/ebuild-helpers/doinfo
---

80a2b2898552db45adc10e9380c1046904c3c36b
diff --cc bin/ebuild-helpers/doinfo
index bae3e195a,96413aa6a..51f8a1d1d
--- a/bin/ebuild-helpers/doinfo
+++ b/bin/ebuild-helpers/doinfo
@@@ -1,7 -1,9 +1,9 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2007 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
+ 
  if [[ -z $1 ]] ; then
  	vecho "${0##*/}: at least one argument needed"
  	exit 1