--- /usr/lib/portage/bin/emaint	2005-12-27 19:34:41.000000000 -0500
+++ emaint.py	2005-12-27 23:42:31.000000000 -0500
@@ -1,11 +1,11 @@
 #!/usr/bin/python -O
 
+# Python imports
 import sys
 from copy import copy
 from optparse import OptionParser, OptionValueError
 
-
-
+# Portage imports
 import os, portage, portage_const
 class WorldHandler(object):
 
@@ -26,10 +26,13 @@
 				self.invalid.append(atom)
 			elif not portage.db["/"]["vartree"].dbapi.match(atom):
 				self.not_installed.append(atom)
+			# Non Fatal Errors, should remain in the world file
 			elif not portage.db["/"]["porttree"].dbapi.xmatch("match-all", atom):
 				self.unavailable.append(atom)
-			elif not portage.db["/"]["porttree"].dbapi.match("match-visible", atom):
+				self.okay.append(atom)
+			elif not portage.db["/"]["porttree"].dbapi.match(atom):
 				self.masked.append(atom)
+				self.okay.append(atom)
 			else:
 				self.okay.append(atom)
 
@@ -41,7 +44,7 @@
 			errors += map(lambda x: "'%s' is masked (manually fix by adding to package.keywords)" % x, self.masked)
 			errors += map(lambda x: "'%s' has no ebuilds available" % x, self.unavailable)
 			if self.masked:
-				errors += "Masked ebuilds can be manually unmasked with package.keywords or package.unmask"
+				errors.append("Masked ebuilds can be manually unmasked with package.keywords or package.unmask")
 		else:
 			errors.append(portage_const.WORLD_FILE + " could not be opened for reading")
 		return errors