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

[André Erdmann]

commit:     86c8b9ce562b4cecab65c03d2cbd2cae983d1b57
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Jun  5 17:56:47 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Jun  5 17:56:47 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=86c8b9ce

support '->' in SRC_URI

---
 roverlay/ebuild/abstractcomponents.py | 34 ++++++++++++++++++----------------
 roverlay/ebuild/creation.py           |  7 ++++++-
 roverlay/ebuild/evars.py              | 33 ++++++++++++++++++++++++++++++---
 3 files changed, 54 insertions(+), 20 deletions(-)

diff --git a/roverlay/ebuild/abstractcomponents.py b/roverlay/ebuild/abstractcomponents.py
index ec3db04..f8c9aed 100644
--- a/roverlay/ebuild/abstractcomponents.py
+++ b/roverlay/ebuild/abstractcomponents.py
@@ -144,7 +144,7 @@ class ListValue ( object ):
       if self.empty_value is not None:
          self.value.append ( self.empty_value )
 
-      self.add_value ( value )
+      self.add ( value )
    # --- end of set_value (...) ---
 
    def add ( self, value ):
@@ -157,20 +157,22 @@ class ListValue ( object ):
          self.value.append ( value )
    # --- end of add (...) ---
 
-   add_value = add
+   def add_value ( self, *args, **kwargs ):
+      raise NotImplementedError ( "add_value() is deprecated - use add()!" )
+   # --- end of add_value (...) ---
+
+   def join_value_str ( self, join_str, quoted=False ):
+      return join_str.join (
+         get_value_str (
+            v,
+            quote_char = "'" if quoted else None
+         ) for v in self.value
+      )
+   # --- end of join_value_str (...) ---
 
    def to_str ( self ):
       """Returns a string representing this ListValue."""
 
-      def get_value_strings ( join_str, quoted=False ):
-         return join_str.join (
-            get_value_str (
-               v,
-               quote_char = "'" if quoted else None
-            ) for v in self.value
-         )
-      # --- end of get_value_strings (...) ---
-
       value_count = len ( self.value )
 
       if self.is_bash_array:
@@ -180,7 +182,7 @@ class ListValue ( object ):
 
          elif self.single_line or value_count == 1:
             # one value or several values in a single line
-            ret = "( " + get_value_strings ( ' ', True ) + " )"
+            ret = "( " + self.join_value_str ( ' ', True ) + " )"
 
          else:
             ret = "{head}{values}{tail}".format (
@@ -188,20 +190,20 @@ class ListValue ( object ):
                   ( '(\n' + self.val_indent )
                   if self.insert_leading_newline else '( '
                ),
-               values = get_value_strings ( self.line_join_str, True ),
+               values = self.join_value_str ( self.line_join_str, True ),
                tail   = '\n' + self.var_indent + ')\n'
             )
       else:
          if value_count == 0:
             ret = ""
          elif self.single_line or value_count == 1:
-            ret = get_value_strings ( ' ' )
+            ret = self.join_value_str ( ' ' )
          else:
             if self.insert_leading_newline:
                ret  = '\n' + self.val_indent
-               ret += get_value_strings ( self.line_join_str )
+               ret += self.join_value_str ( self.line_join_str )
             else:
-               ret  = get_value_strings ( self.line_join_str )
+               ret  = self.join_value_str ( self.line_join_str )
 
             if self.append_indented_newline:
                ret += '\n' + self.var_indent

diff --git a/roverlay/ebuild/creation.py b/roverlay/ebuild/creation.py
index 8ea1854..de5a358 100644
--- a/roverlay/ebuild/creation.py
+++ b/roverlay/ebuild/creation.py
@@ -153,7 +153,12 @@ class EbuildCreation ( object ):
          ebuild.use ( self._get_ebuild_description() )
 
          # SRC_URI
-         ebuild.use ( evars.SRC_URI ( self.package_info ['SRC_URI'] ) )
+         ebuild.use ( evars.SRC_URI (
+            src_uri      = self.package_info ['SRC_URI'],
+            src_uri_dest = self.package_info.get (
+               "src_uri_dest", do_fallback=True
+            )
+         ) )
 
          ebuild_text = ebuild.to_str()
 

diff --git a/roverlay/ebuild/evars.py b/roverlay/ebuild/evars.py
index 7bc461b..23f7e27 100644
--- a/roverlay/ebuild/evars.py
+++ b/roverlay/ebuild/evars.py
@@ -19,7 +19,7 @@ __all__ = [ 'DEPEND', 'DESCRIPTION', 'IUSE', 'MISSINGDEPS',
 
 import roverlay.strutil
 
-from roverlay.ebuild.abstractcomponents import ListValue, EbuildVar
+from roverlay.ebuild.abstractcomponents import ListValue, EbuildVar, get_value_str
 
 IUSE_SUGGESTS = 'R_suggests'
 RSUGGESTS_NAME = IUSE_SUGGESTS.upper()
@@ -68,11 +68,38 @@ class KEYWORDS ( EbuildVar ):
    # --- end of __init__ (...) ---
 
 
+class SRC_URI_ListValue ( ListValue ):
+   """List value that represents SRC_URI entries."""
+
+   def _accept_value ( self, value ): raise NotImplementedError()
+
+   def add ( self, value ):
+      """Adds/Appends a value."""
+      if value [0]:
+         self.value.append ( value )
+      else:
+         raise ValueError ( value )
+   # --- end of add (...) ---
+
+   def join_value_str ( self, join_str, quoted=False ):
+      return join_str.join (
+         get_value_str (
+            (
+               "{} -> {}".format ( v[0], v[1] ) if v[1] else str ( v[0] )
+            ),
+            quote_char=( "'" if quoted else None )
+         ) for v in self.value
+      )
+   # --- end of join_value_str (...) ---
+
+
 class SRC_URI ( EbuildVar ):
    """A SRC_URI="..." statement."""
-   def __init__ ( self, src_uri ):
+   def __init__ ( self, src_uri, src_uri_dest ):
       super ( SRC_URI, self ) . __init__ (
-         name='SRC_URI', value=src_uri, priority=90
+         name     = 'SRC_URI',
+         value    = SRC_URI_ListValue ( value=( src_uri, src_uri_dest ) ),
+         priority = 90
       )
 
    def _empty_str ( self ):