1 |
commit: 759021cbd6f6e40e497995a6407e43cd9a438050 |
2 |
Author: André Erdmann <dywi <AT> mailerd <DOT> de> |
3 |
AuthorDate: Wed Jan 30 20:04:05 2013 +0000 |
4 |
Commit: André Erdmann <dywi <AT> mailerd <DOT> de> |
5 |
CommitDate: Wed Jan 30 20:04:05 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=759021cb |
7 |
|
8 |
ebuild/evars: KEYWORDS |
9 |
|
10 |
Added the KEYWORDS ebuild variable |
11 |
|
12 |
Also removed some param_expansion= keywords from the var constructors. |
13 |
|
14 |
--- |
15 |
roverlay/ebuild/evars.py | 22 +++++++++++++++++----- |
16 |
1 files changed, 17 insertions(+), 5 deletions(-) |
17 |
|
18 |
diff --git a/roverlay/ebuild/evars.py b/roverlay/ebuild/evars.py |
19 |
index d1a228c..cb3ec17 100644 |
20 |
--- a/roverlay/ebuild/evars.py |
21 |
+++ b/roverlay/ebuild/evars.py |
22 |
@@ -14,7 +14,7 @@ is printed as bash array. |
23 |
""" |
24 |
|
25 |
__all__ = [ 'DEPEND', 'DESCRIPTION', 'IUSE', 'MISSINGDEPS', |
26 |
- 'RDEPEND', 'R_SUGGESTS', 'SRC_URI', |
27 |
+ 'RDEPEND', 'R_SUGGESTS', 'SRC_URI', 'KEYWORDS', |
28 |
] |
29 |
|
30 |
from roverlay import strutil |
31 |
@@ -43,19 +43,32 @@ class DESCRIPTION ( EbuildVar ): |
32 |
priority=80, param_expansion=False |
33 |
) |
34 |
self.maxlen = 50 if maxlen is None else maxlen |
35 |
- self.use_param_expansion = False |
36 |
+ # --- end of __init__ (...) --- |
37 |
|
38 |
def _get_value_str ( self ): |
39 |
return strutil.shorten_str ( |
40 |
strutil.ascii_filter ( str ( self.value ) ), self.maxlen, SEE_METADATA |
41 |
) |
42 |
+ # --- end of _get_value_str (...) --- |
43 |
+ |
44 |
+ |
45 |
+class KEYWORDS ( EbuildVar ): |
46 |
+ """A KEYWORDS="amd64 -x86 ..." statement.""" |
47 |
+ def __init__ ( self, keywords ): |
48 |
+ super ( KEYWORDS, self ).__init__ ( |
49 |
+ name=self.__class__.__name__, |
50 |
+ value=keywords, |
51 |
+ priority=80 |
52 |
+ ) |
53 |
+ # --- end of __init__ (...) --- |
54 |
|
55 |
|
56 |
class SRC_URI ( EbuildVar ): |
57 |
"""A SRC_URI="..." statement.""" |
58 |
def __init__ ( self, src_uri ): |
59 |
super ( SRC_URI, self ) . __init__ ( |
60 |
- name='SRC_URI', value=src_uri, priority=90, param_expansion=False ) |
61 |
+ name='SRC_URI', value=src_uri, priority=90 |
62 |
+ ) |
63 |
|
64 |
def _empty_str ( self ): |
65 |
"""Called if this SRC_URI evar has no uri stored.""" |
66 |
@@ -89,7 +102,6 @@ class R_SUGGESTS ( EbuildVar ): |
67 |
name=RSUGGESTS_NAME, |
68 |
value=ListValue ( deps ), |
69 |
priority=140, |
70 |
- param_expansion=False |
71 |
) |
72 |
|
73 |
|
74 |
@@ -100,7 +112,7 @@ class DEPEND ( EbuildVar ): |
75 |
name='DEPEND', |
76 |
value=ListValue ( deps ), |
77 |
priority=150, |
78 |
- param_expansion=False |
79 |
+ param_expansion=True, |
80 |
) |