--- /tmp/emerge 2003-04-03 13:27:55.000000000 -0800 +++ emerge 2003-04-13 10:24:29.000000000 -0700 @@ -691 +691 @@ - mycheck=portage.dep_check(depstring,self.mydbapi[myroot]) + mycheck=portage.dep_check(depstring,self.mydbapi[myroot],parent=myparent) @@ -930,0 +931 @@ + xs=portage.pkgsplit(x[2]) @@ -933,2 +934,2 @@ - 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)): @@ -936,2 +937 @@ - except ValueError: - if ebuild_iuse != "": + else: @@ -938,0 +939,4 @@ + elif (ebuild_iuse in portage.usesplit): + iuse=iuse+red("+"+ebuild_iuse)+" " + elif (ebuild_iuse != ""): + iuse=iuse+blue("-"+ebuild_iuse)+" " @@ -940 +943,0 @@ - xs=portage.pkgsplit(x[2]) @@ -1660,2 +1663,2 @@ - 'USE', 'COMPILER', 'CHOST', 'CFLAGS', 'CXXFLAGS','ACCEPT_KEYWORDS', - 'MAKEOPTS', 'AUTOCLEAN', 'SYNC', 'FEATURES'] + 'USE', 'PKGUSE', 'COMPILER', 'CHOST', 'CFLAGS', 'CXXFLAGS', + 'ACCEPT_KEYWORDS', 'MAKEOPTS', 'AUTOCLEAN', 'SYNC', 'FEATURES']