aha, i knew that diff was screwy, the mail to portage-commits and grep made it obviou...

svn path=/main/trunk/; revision=8247

diff --git a/bin/repoman b/bin/repoman
index 03dbb1d3e1c44aa15cc3ca8be545ca6904eba63d..622a7efa64b19a05b113291486d165a35d37a533 100755 (executable)
--- a/bin/repoman
+++ b/bin/repoman
@@ -1503,77 +1503,6 @@ for x in scanlist:
                                                        stats[mykey]=stats[mykey]+1
                                                        fails[mykey].append(x+"/"+y+".ebuild: "+keyword+"("+prof[0]+") "+repr(mydep[1]))
 
-               # uselist checks - global
-               myuse = []
-               default_use = []
-               for myflag in myaux["IUSE"].split():
-                       flag_name = myflag.lstrip("+-")
-                       if myflag != flag_name:
-                               default_use.append(myflag)
-                       if flag_name not in uselist:
-                               myuse.append(flag_name)
-
-               # uselist checks - local
-               mykey = portage.dep_getkey(catpkg)
-               if luselist.has_key(mykey):
-                       for mypos in range(len(myuse)-1,-1,-1):
-                               if myuse[mypos] and (myuse[mypos] in luselist[mykey]):
-                                       del myuse[mypos]
-               if default_use and myaux["EAPI"] == "0":
-                       myuse += default_use
-               for mypos in range(len(myuse)):
-                       stats["IUSE.invalid"]=stats["IUSE.invalid"]+1
-                       fails["IUSE.invalid"].append(x+"/"+y+".ebuild: %s" % myuse[mypos])      
-
-               # license checks
-               if not badlicsyntax:
-                       myuse = myaux["LICENSE"]
-                       # Parse the LICENSE variable, remove USE conditions and
-                       # flatten it.
-                       myuse=portage.dep.use_reduce(portage.dep.paren_reduce(myuse), matchall=1)
-                       myuse=portage.flatten(myuse)
-                       # Check each entry to ensure that it exists in PORTDIR's
-                       # license directory.
-                       for mypos in range(0,len(myuse)):
-                               # Need to check for "||" manually as no portage
-                               # function will remove it without removing values.
-                               if myuse[mypos] not in liclist and myuse[mypos] != "||":
-                                       stats["LICENSE.invalid"]=stats["LICENSE.invalid"]+1
-                                       fails["LICENSE.invalid"].append(x+"/"+y+".ebuild: %s" % myuse[mypos])
-
-               #keyword checks
-               myuse = myaux["KEYWORDS"].split()
-               for mykey in myuse:
-                       myskey=mykey[:]
-                       if myskey[0]=="-":
-                               myskey=myskey[1:]
-                       if myskey[0]=="~":
-                               myskey=myskey[1:]
-                       if mykey!="-*":
-                               if myskey not in kwlist:
-                                       stats["KEYWORDS.invalid"] += 1
-                                       fails["KEYWORDS.invalid"].append(x+"/"+y+".ebuild: %s" % mykey)
-                               elif not profiles.has_key(myskey):
-                                       stats["KEYWORDS.invalid"] += 1
-                                       fails["KEYWORDS.invalid"].append(x+"/"+y+".ebuild: %s (profile invalid)" % mykey)
-
-               #restrict checks
-               myrestrict = None
-               try:
-                       myrestrict = portage.dep.use_reduce(
-                               portage.dep.paren_reduce(myaux["RESTRICT"]), matchall=1)
-               except portage.exception.InvalidDependString, e:
-                       stats["RESTRICT.syntax"] = stats["RESTRICT.syntax"] + 1
-                       fails["RESTRICT.syntax"].append(mykey+".ebuild RESTRICT: "+str(e))
-                       del e
-               if myrestrict:
-                       myrestrict = set(portage.flatten(myrestrict))
-                       mybadrestrict = myrestrict.difference(valid_restrict)
-                       if mybadrestrict:
-                               stats["RESTRICT.invalid"] += len(mybadrestrict)
-                               for mybad in mybadrestrict:
-                                       fails["RESTRICT.invalid"].append(x+"/"+y+".ebuild: %s" % mybad)
-
        # Check for 'all unstable' or 'all masked' -- ACCEPT_KEYWORDS is stripped
        # XXX -- Needs to be implemented in dep code. Can't determine ~arch nicely.
        #if not portage.portdb.xmatch("bestmatch-visible",x):