* Replace config._iuse_implicit_re with a callable _iuse_implicit_match

  object that simply returns boolean, and update consumers.
* Make check_required_use() take a callable for the iuse parameter,
  and pass in Package.use.is_valid_flag or iuse.__contains__ as
   appropriate.

1 files changed, 6 insertions, 6 deletions

diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py
index 2941b273d..640f8bca1 100644
--- a/pym/_emerge/Package.py
+++ b/pym/_emerge/Package.py
@@ -201,11 +201,11 @@ class Package(Task):
 	class _iuse(object):
 
 		__slots__ = ("__weakref__", "all", "enabled", "disabled",
-			"tokens") + ("_iuse_implicit_regex",)
+			"tokens") + ("_iuse_implicit_match",)
 
-		def __init__(self, tokens, iuse_implicit_regex):
+		def __init__(self, tokens, iuse_implicit_match):
 			self.tokens = tuple(tokens)
-			self._iuse_implicit_regex = iuse_implicit_regex
+			self._iuse_implicit_match = iuse_implicit_match
 			enabled = []
 			disabled = []
 			other = []
@@ -231,7 +231,7 @@ class Package(Task):
 
 			for flag in flags:
 				if not flag in self.all and \
-					self._iuse_implicit_regex.match(flag) is None:
+					not self._iuse_implicit_match(flag):
 					return False
 			return True
 		
@@ -244,7 +244,7 @@ class Package(Task):
 			missing_iuse = []
 			for flag in flags:
 				if not flag in self.all and \
-					self._iuse_implicit_regex.match(flag) is None:
+					not self._iuse_implicit_match(flag):
 					missing_iuse.append(flag)
 			return missing_iuse
 
@@ -362,7 +362,7 @@ class _PackageMetadataWrapper(_PackageMetadataWrapperBase):
 
 	def _set_iuse(self, k, v):
 		self._pkg.iuse = self._pkg._iuse(
-			v.split(), self._pkg.root_config.settings._iuse_implicit_re)
+			v.split(), self._pkg.root_config.settings._iuse_implicit_match)
 
 	def _set_slot(self, k, v):
 		self._pkg.slot = v