Add repoman support for package.use.mask.

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

diff --git a/bin/repoman b/bin/repoman
index 44e3e2e813bdaa022056f62cf64fba5209712c98..9b052ff1255c472df35946def9b5fd14cec34164 100755 (executable)
--- a/bin/repoman
+++ b/bin/repoman
@@ -1158,7 +1158,7 @@ for x in scanlist:
        
                                        if prof[1] == "dev":
                                                suffix=suffix+"indev"
-                                       
+                                       dep_settings.setcpv("/".join((catdir, y)))
                                        for mytype,mypos in [["DEPEND",len(missingvars)],["RDEPEND",len(missingvars)+1],["PDEPEND",len(missingvars)+2]]:
                                                
                                                mykey=mytype+".bad"+suffix

diff --git a/pym/portage.py b/pym/portage.py
index 5c450d3e214e3fb034763474fd580b1e33a736fd..aba4c224c7942feffd594f2b9c819c3656169754 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -3455,7 +3455,8 @@ def dep_check(depstring, mydbapi, mysettings, use="yes", mode=None, myuse=None,
                #if use=="all":
                #       mymasks=archlist[:]
                #else:
-               mymasks = mysettings.usemask + mysettings.archlist()
+               mymasks = mysettings.usemask + list(mysettings.pusemask) + \
+                       mysettings.archlist()
 
                while mysettings["ARCH"] in mymasks:
                        del mymasks[mymasks.index(mysettings["ARCH"])]