USE_EXPAND: rename flags, read flag desc file

* the USE_EXPAND flags can now be renamed by dict-like entries in a
  USE_EXTEND_RENAME file
* the USE_EXPAND_DESC file can be used to provide flag descriptions

2 files changed, 7 insertions, 3 deletions

diff --git a/roverlay/ebuild/depres.py b/roverlay/ebuild/depres.py
index eeea67c..ac65e31 100644
--- a/roverlay/ebuild/depres.py
+++ b/roverlay/ebuild/depres.py
@@ -53,7 +53,10 @@ FIELDS = {
 
 def create_use_expand_var ( *args, **kwargs ):
    return evars.R_SUGGESTS_USE_EXPAND (
-      config.get_or_fail ( "EBUILD.USE_EXPAND.name" ), *args, **kwargs
+      config.get_or_fail ( "EBUILD.USE_EXPAND.name" ),
+      *args,
+      use_expand_map=config.access().get_use_expand_map(),
+      **kwargs
    )
 
 EBUILDVARS = {
diff --git a/roverlay/ebuild/evars.py b/roverlay/ebuild/evars.py
index 8cafaef..ef5016b 100644
--- a/roverlay/ebuild/evars.py
+++ b/roverlay/ebuild/evars.py
@@ -55,7 +55,7 @@ class UseExpandListValue (
          **kw
       )
       self.insert_leading_newline = True
-      self.alias_map              = alias_map
+      self.alias_map              = alias_map or None
       self.basename               = basename.rstrip ( '_' ).lower()
       self.sort_flags             = True
 
@@ -63,10 +63,11 @@ class UseExpandListValue (
    # --- end of __init__ (...) ---
 
    def _get_depstr_key ( self, depstr ):
+      # tries to get the use flag name from depstr
       match = self.__class__.RE_USENAME.match ( depstr )
       if match:
          return self._get_use_key (
-            match.group ( "pn" ) or match.group ( "pf" )
+            ( match.group ( "pn" ) or match.group ( "pf" ) ).lower()
          )
       else:
          raise ValueError (