From 6c3c1b0cf62e59eaad40d425fee97f33ff3b639a Mon Sep 17 00:00:00 2001
From: Marius Mauch <genone@gentoo.org>
Date: Sun, 13 Nov 2005 14:49:21 +0000
Subject: Add slightly modified elog_base patch containing the basic framework
 for ebuild logging.

svn path=/main/trunk/; revision=2306
---
 bin/ebuild.sh | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'bin/ebuild.sh')

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 8b0d5e9ba..80d915a4b 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -50,14 +50,9 @@ fi
 export PATH="/sbin:/usr/sbin:/usr/lib/portage/bin:/bin:/usr/bin:${ROOTPATH}"
 [ ! -z "$PREROOTPATH" ] && export PATH="${PREROOTPATH%%:}:$PATH"
 
-if [ -e /etc/init.d/functions.sh ]; then
-	source /etc/init.d/functions.sh  &>/dev/null
-elif [ -e /etc/rc.d/config/functions ];	then
-	source /etc/rc.d/config/functions &>/dev/null
-else
-	#Mac OS X
-	source /usr/lib/portage/bin/functions.sh &>/dev/null
-fi
+source /usr/lib/portage/bin/isolated-functions.sh  &>/dev/null
+# TODO: make this conditional on config settings, fix any remaining stuff
+set_colors
 
 # the sandbox is disabled by default except when overridden in the relevant stages
 export SANDBOX_ON="0"
-- 
cgit v1.2.3-1-g7c22