--- emerge.old	2008-08-30 17:29:40.000000000 +0400
+++ /usr/bin/emerge	2008-08-30 17:36:11.000000000 +0400
@@ -2123,8 +2123,8 @@
 		xinfo = xinfo.replace("null/", "")
 		if myparent:
 			xfrom = '(dependency required by '+ \
-				green('"%s"' % myparent[2]) + \
-				red(' [%s]' % myparent[0]) + ')'
+				colorize("GOOD",'"%s"' % myparent[2]) + \
+				colorize("BAD",' [%s]' % myparent[0]) + ')'
 		masked_packages = []
 		missing_licenses = []
 		have_eapi_mask = False
@@ -2159,7 +2159,7 @@
 					(root_config, pkgsettings, cpv, metadata, mreasons))
 
 		if masked_packages:
-			print "\n!!! "+red("All ebuilds that could satisfy ")+green(xinfo)+red(" have been masked.")
+			print "\n!!! "+colorize("BAD","All ebuilds that could satisfy ")+green(xinfo)+colorize("BAD"," have been masked.")
 			print "!!! One of the following masked packages is required to complete your request:"
 			have_eapi_mask = show_masked_packages(masked_packages)
 			if have_eapi_mask:
@@ -4772,9 +4772,9 @@
 						regen_infodirs.append(inforoot)
 
 		if not regen_infodirs:
-			portage.writemsg_stdout(" "+green("*")+" GNU info directory index is up-to-date.\n")
+			portage.writemsg_stdout(" "+colorize("GOOD","*")+" GNU info directory index is up-to-date.\n")
 		else:
-			portage.writemsg_stdout(" "+green("*")+" Regenerating GNU info directory index...\n")
+			portage.writemsg_stdout(" "+colorize("GOOD","*")+" Regenerating GNU info directory index...\n")
 
 			dir_extensions = ("", ".gz", ".bz2")
 			icount=0
@@ -4855,11 +4855,11 @@
 				prev_mtimes[inforoot] = long(os.stat(inforoot).st_mtime)
 
 			if badcount:
-				print " "+yellow("*")+" Processed",icount,"info files;",badcount,"errors."
+				print " "+colorize("WARN","*")+" Processed",icount,"info files;",badcount,"errors."
 				print errmsg
 			else:
 				if icount > 0:
-					print " "+green("*")+" Processed",icount,"info files."
+					print " "+colorize("GOOD","*")+" Processed",icount,"info files."
 
 
 def post_emerge(settings, mtimedb, retval):
@@ -5340,23 +5340,23 @@
 		elif (exitcode>0):
 			print
 			if exitcode==1:
-				print darkred("!!!")+green(" Rsync has reported that there is a syntax error. Please ensure")
-				print darkred("!!!")+green(" that your SYNC statement is proper.")
-				print darkred("!!!")+green(" SYNC="+settings["SYNC"])
+				print colorize("BAD","!!!")+green(" Rsync has reported that there is a syntax error. Please ensure")
+				print colorize("BAD","!!!")+green(" that your SYNC statement is proper.")
+				print colorize("BAD","!!!")+green(" SYNC="+settings["SYNC"])
 			elif exitcode==11:
-				print darkred("!!!")+green(" Rsync has reported that there is a File IO error. Normally")
-				print darkred("!!!")+green(" this means your disk is full, but can be caused by corruption")
-				print darkred("!!!")+green(" on the filesystem that contains PORTDIR. Please investigate")
-				print darkred("!!!")+green(" and try again after the problem has been fixed.")
-				print darkred("!!!")+green(" PORTDIR="+settings["PORTDIR"])
+				print colorize("BAD","!!!")+green(" Rsync has reported that there is a File IO error. Normally")
+				print colorize("BAD","!!!")+green(" this means your disk is full, but can be caused by corruption")
+				print colorize("BAD","!!!")+green(" on the filesystem that contains PORTDIR. Please investigate")
+				print colorize("BAD","!!!")+green(" and try again after the problem has been fixed.")
+				print colorize("BAD","!!!")+green(" PORTDIR="+settings["PORTDIR"])
 			elif exitcode==20:
-				print darkred("!!!")+green(" Rsync was killed before it finished.")
+				print colorize("BAD","!!!")+green(" Rsync was killed before it finished.")
 			else:
-				print darkred("!!!")+green(" Rsync has not successfully finished. It is recommended that you keep")
-				print darkred("!!!")+green(" trying or that you use the 'emerge-webrsync' option if you are unable")
-				print darkred("!!!")+green(" to use rsync due to firewall or other restrictions. This should be a")
-				print darkred("!!!")+green(" temporary problem unless complications exist with your network")
-				print darkred("!!!")+green(" (and possibly your system's filesystem) configuration.")
+				print colorize("BAD","!!!")+green(" Rsync has not successfully finished. It is recommended that you keep")
+				print colorize("BAD","!!!")+green(" trying or that you use the 'emerge-webrsync' option if you are unable")
+				print colorize("BAD","!!!")+green(" to use rsync due to firewall or other restrictions. This should be a")
+				print colorize("BAD","!!!")+green(" temporary problem unless complications exist with your network")
+				print colorize("BAD","!!!")+green(" (and possibly your system's filesystem) configuration.")
 			print
 			sys.exit(exitcode)
 	elif syncuri[:6]=="cvs://":