--- emerge.orig	2003-07-31 15:48:19.000000000 -0700
+++ emerge	2003-07-31 15:44:17.000000000 -0700
@@ -740,7 +740,7 @@
 			print "Depstring:",depstring
 		if not arg:
 			#processing dependencies
-			mycheck=portage.dep_check(depstring,self.mydbapi[myroot])
+			mycheck=portage.dep_check(depstring,self.mydbapi[myroot],parent=myparent)
 			if not mycheck[0]:
 				return 0
 			mymerge=mycheck[1]
@@ -1001,14 +1001,19 @@
 
 				iuse=""
 				if "--verbose" in myopts:
+					myiuse=[]
+					for mypkg in portage.pkgusesplit:
+						if portage.portdb.xmatch("bestmatch-list",mypkg,None,None,[x[2]]):
+							myiuse.extend(portage.pkgusesplit[mypkg])
 					for ebuild_iuse in string.split(portage.portdb.aux_get(x[2],["IUSE"])[0], " "):
-						try:
-							if (portage.usesplit.index(ebuild_iuse) >= 0) :
-								iuse=iuse+red("+"+ebuild_iuse)+" "
-						except ValueError:
-							if ebuild_iuse != "":
-								iuse=iuse+blue("-"+ebuild_iuse)+" "
-
+						if ebuild_iuse in myiuse:
+							iuse=iuse+darkred("+"+ebuild_iuse)+" "
+						elif "-"+ebuild_iuse in myiuse:
+							iuse=iuse+darkblue("-"+ebuild_iuse)+" "
+						elif ebuild_iuse in portage.usesplit:
+							iuse=iuse+red("+"+ebuild_iuse)+" "
+						elif ebuild_iuse != "":
+							iuse=iuse+blue("-"+ebuild_iuse)+" "
 				xs=portage.pkgsplit(x[2])
 				if xs[2]=="r0":
 					xs[2]=""
@@ -1752,8 +1757,8 @@
 	else:
 		myvars=['GENTOO_MIRRORS', 'CONFIG_PROTECT', 'CONFIG_PROTECT_MASK',
 				'PORTDIR', 'DISTDIR', 'PKGDIR', 'PORTAGE_TMPDIR', 'PORTDIR_OVERLAY',
-				'USE', 'COMPILER', 'CHOST', 'CFLAGS', 'CXXFLAGS','ACCEPT_KEYWORDS', 
-				'MAKEOPTS', 'AUTOCLEAN', 'SYNC', 'FEATURES']
+				'USE', 'PKGUSE', 'COMPILER', 'CHOST', 'CFLAGS', 'CXXFLAGS',
+				'ACCEPT_KEYWORDS', 'MAKEOPTS', 'AUTOCLEAN', 'SYNC', 'FEATURES']
 	for x in myvars:
 		print x+'="'+portage.settings[x]+'"'
 	#print portage.settings.keys()