1 |
Author: zmedico |
2 |
Date: 2008-07-28 22:36:08 +0000 (Mon, 28 Jul 2008) |
3 |
New Revision: 11253 |
4 |
|
5 |
Modified: |
6 |
main/trunk/doc/package/ebuild/eapi/2.docbook |
7 |
main/trunk/pym/portage/dep.py |
8 |
Log: |
9 |
Tweak the conditional USE deps examples. |
10 |
|
11 |
|
12 |
Modified: main/trunk/doc/package/ebuild/eapi/2.docbook |
13 |
=================================================================== |
14 |
--- main/trunk/doc/package/ebuild/eapi/2.docbook 2008-07-28 22:27:35 UTC (rev 11252) |
15 |
+++ main/trunk/doc/package/ebuild/eapi/2.docbook 2008-07-28 22:36:08 UTC (rev 11253) |
16 |
@@ -48,19 +48,19 @@ |
17 |
<tbody> |
18 |
<row> |
19 |
<entry>foo[bar?]</entry> |
20 |
- <entry>foo bar? ( foo[bar] )</entry> |
21 |
+ <entry>bar? ( foo[bar] ) !bar? ( foo )</entry> |
22 |
</row> |
23 |
<row> |
24 |
<entry>foo[-bar?]</entry> |
25 |
- <entry>foo !bar? ( foo[-bar] )</entry> |
26 |
+ <entry>bar? ( foo ) !bar? ( foo[-bar] )</entry> |
27 |
</row> |
28 |
<row> |
29 |
<entry>foo[bar=]</entry> |
30 |
- <entry>foo bar? ( foo[bar] ) !bar? ( foo[-bar] )</entry> |
31 |
+ <entry>bar? ( foo[bar] ) !bar? ( foo[-bar] )</entry> |
32 |
</row> |
33 |
<row> |
34 |
<entry>foo[bar!=]</entry> |
35 |
- <entry>foo bar? ( foo[-bar] ) !bar? ( foo[bar] )</entry> |
36 |
+ <entry>bar? ( foo[-bar] ) !bar? ( foo[bar] )</entry> |
37 |
</row> |
38 |
</tbody> |
39 |
</tgroup> |
40 |
|
41 |
Modified: main/trunk/pym/portage/dep.py |
42 |
=================================================================== |
43 |
--- main/trunk/pym/portage/dep.py 2008-07-28 22:27:35 UTC (rev 11252) |
44 |
+++ main/trunk/pym/portage/dep.py 2008-07-28 22:36:08 UTC (rev 11253) |
45 |
@@ -420,10 +420,10 @@ |
46 |
|
47 |
compact form equivalent expanded form |
48 |
|
49 |
- foo[bar?] foo bar? ( foo[bar] ) |
50 |
- foo[-bar?] foo !bar? ( foo[-bar] ) |
51 |
- foo[bar=] foo bar? ( foo[bar] ) !bar? ( foo[-bar] ) |
52 |
- foo[bar!=] foo bar? ( foo[-bar] ) !bar? ( foo[bar] ) |
53 |
+ foo[bar?] bar? ( foo[bar] ) !bar? ( foo ) |
54 |
+ foo[-bar?] bar? ( foo ) !bar? ( foo[-bar] ) |
55 |
+ foo[bar=] bar? ( foo[bar] ) !bar? ( foo[-bar] ) |
56 |
+ foo[bar!=] bar? ( foo[-bar] ) !bar? ( foo[bar] ) |
57 |
|
58 |
""" |
59 |
tokens = [] |