--- emerge.bak	2004-12-28 15:21:45.681875312 +0100
+++ emerge	2004-12-28 15:28:01.664717232 +0100
@@ -687,8 +687,7 @@
 			
 			masked=0
 			if self.searchre.search(match_string):
-				if not portage.portdb.xmatch("match-visible",package):
-					masked=1
+				# correct masked flag is checked in output()
 				self.matches["pkg"].append([package,masked])
 			elif self.searchdesc: # DESCRIPTION searching
 				full_package = portage.portdb.xmatch("bestmatch-visible",package)
@@ -719,6 +718,9 @@
 		for mtype in self.matches.keys():	
 			for match,masked in self.matches[mtype]:
 				if mtype=="pkg":
+					# check masked flag
+					if not portage.portdb.xmatch("match-visible",match):
+						masked=1
 					catpack=match
 					full_package = portage.portdb.xmatch("bestmatch-visible",match)
 					if not full_package: