--- emerge.orig	2003-05-21 08:57:45.000000000 -0700
+++ emerge	2003-05-21 08:56:30.000000000 -0700
@@ -732,7 +732,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]
@@ -980,16 +980,18 @@
 					myoldbest=blue("["+myoldbest+"]")
 
 				iuse=""
+				xs=portage.pkgsplit(x[2])
 				if "--verbose" in myopts:
 					for ebuild_iuse in string.split(portage.portdb.aux_get(x[2],["IUSE"])[0], " "):
-						try:
-							if (portage.usesplit.index(ebuild_iuse) >= 0) :
+						if (portage.pkgusesplit.has_key(xs[0])):
+							if (ebuild_iuse in portage.pkgusesplit[xs[0]] or ("-"+ebuild_iuse not in portage.pkgusesplit[xs[0]] and ebuild_iuse in portage.usesplit)):
 								iuse=iuse+red("+"+ebuild_iuse)+" "
-						except ValueError:
-							if ebuild_iuse != "":
+							else:
 								iuse=iuse+blue("-"+ebuild_iuse)+" "
-
-				xs=portage.pkgsplit(x[2])
+						elif (ebuild_iuse in portage.usesplit):
+							iuse=iuse+red("+"+ebuild_iuse)+" "
+						elif (ebuild_iuse != ""):
+							iuse=iuse+blue("-"+ebuild_iuse)+" "
 				if xs[2]=="r0":
 					xs[2]=""
 				else:
@@ -1728,8 +1730,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()