[gentoo-commits] proj/R_overlay:master commit in: roverlay/ebuild/

[André Erdmann]

commit:     f39267a36a595947e8b42191c663fc335a5c9be6
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Aug 28 09:37:43 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Aug 28 09:37:43 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=f39267a3

roverlay/ebuild/depres: add depstr_ignore functionality

---
 roverlay/ebuild/depres.py | 52 +++++++++++++++++++++++++++++++++++------------
 1 file changed, 39 insertions(+), 13 deletions(-)

diff --git a/roverlay/ebuild/depres.py b/roverlay/ebuild/depres.py
index fa3a5bb..9ce1ed8 100644
--- a/roverlay/ebuild/depres.py
+++ b/roverlay/ebuild/depres.py
@@ -222,24 +222,50 @@ class EbuildDepRes ( object ):
          )
          return True
 
-      desc = self.package_info ['desc_data']
+      desc           = self.package_info ['desc_data']
+      depconf        = self.package_info.depconf
+      depstr_ignore  = depconf.get ( 'depstr_ignore' ) if depconf else None
       self._channels = dict()
 
-      dep_type = desc_field = None
+      dep_type   = None
+      desc_field = None
 
-      for dep_type in FIELDS_TO_EVAR:
-         resolver = None
+      if depstr_ignore:
+         depstr_ignore_all = depstr_ignore.get ( 'all' )
 
-         for desc_field in FIELDS_TO_EVAR [dep_type]:
-            if desc_field in desc:
-               if not resolver:
-                  resolver = self._get_channel ( dep_type )
+         for dep_type, desc_fields in FIELDS_TO_EVAR.items():
+            resolver = None
+            # ignore based on evar name ([R]DEPEND/RSUGGESTS)
+            depstr_ignore_specific = depstr_ignore.get ( dep_type )
+
+            for desc_field in desc_fields:
+               if desc_field in desc:
+                  if resolver is None:
+                     resolver = self._get_channel ( dep_type )
+
+                  resolver.add_dependencies_filtered (
+                     dep_list           = desc [desc_field],
+                     deptype_mask       = FIELDS [desc_field],
+                     common_blacklist   = depstr_ignore_all,
+                     specific_blacklist = depstr_ignore_specific,
+                  )
+         # -- end for dep_type
+
+      else:
+         for dep_type, desc_fields in FIELDS_TO_EVAR.items():
+            resolver = None
+
+            for desc_field in desc_fields:
+               if desc_field in desc:
+                  if resolver is None:
+                     resolver = self._get_channel ( dep_type )
+
+                  resolver.add_dependencies (
+                     dep_list     = desc [desc_field],
+                     deptype_mask = FIELDS [desc_field]
+                  )
+         # -- end for dep_type
 
-               resolver.add_dependencies (
-                  dep_list     = desc [desc_field],
-                  deptype_mask = FIELDS [desc_field]
-               )
-      # -- for dep_type
    # --- end of _init_channels (...) ---
 
    def _close_channels ( self ):