--- portage.py~	2003-02-28 01:32:41.000000000 -0800
+++ portage.py	2003-02-28 01:33:37.000000000 -0800
@@ -1036,7 +1036,7 @@
 			print "!!! This probably means that this ebuild's files must be downloaded"
 			print "!!! manually.  See the comments in the ebuild for more information."
 			print
-			spawn("/usr/sbin/ebuild.sh nofetch")
+			spawn(ebuild_sh+"nofetch")
 			return 0
 		return 1
 	locations=mymirrors[:]
@@ -1223,7 +1223,7 @@
 			if retval:
 				return retval
 	# spawn ebuild.sh
-	mycommand="/usr/sbin/ebuild.sh "
+	mycommand=ebuild_sh
 	return spawn(mycommand + mydo,debug,
 				actionmap[mydo]["args"][0],
 				actionmap[mydo]["args"][1]
@@ -1311,7 +1311,7 @@
 
 	# get possible slot information from the deps file
 	if mydo=="depend":
-		myso=getstatusoutput("/usr/sbin/ebuild.sh depend")
+		myso=getstatusoutput(ebuild_sh+"depend")
 		if debug:
 			print myso[1]
 		return myso[0]
@@ -1378,7 +1378,7 @@
 	
 	# if any of these are being called, handle them -- running them out of the sandbox -- and stop now.
 	if mydo in ["help","clean","setup","prerm","postrm","preinst","postinst","config"]:
-		return spawn("/usr/sbin/ebuild.sh "+mydo,debug,free=1)
+		return spawn(ebuild_sh+mydo,debug,free=1)
 	
 	try: 
 		settings["SLOT"], settings["RESTRICT"], myuris = db["/"]["porttree"].dbapi.aux_get(mykey,["SLOT","RESTRICT","SRC_URI"])
@@ -4476,6 +4476,11 @@
 #,"porttree":portagetree(root,virts),"bintree":binarytree(root,virts)}
 features=settings["FEATURES"].split()
 
+ebuild_sh="/usr/lib/colorgcc/bin/ebuild.sh"
+if (not "colorgcc" in features) or (not os.path.exists(ebuild_sh)):
+    ebuild_sh = "/usr/sbin/ebuild.sh"
+ebuild_sh += " "
+
 # Defaults set at the top of perform_checksum.
 if spawn("/usr/sbin/prelink --version > /dev/null 2>&1",free=1) == 0:
 	prelink_capable=1