Gentoo Archives: gentoo-commits

From: "André Erdmann" <dywi@×××××××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/R_overlay:master commit in: files/, doc/html/
Date: Tue, 29 Jul 2014 18:36:36
Message-Id: 1406658722.fa410f3c0d3e284d3efed0ad63b66362857c2389.dywi@gentoo
1 commit: fa410f3c0d3e284d3efed0ad63b66362857c2389
2 Author: André Erdmann <dywi <AT> mailerd <DOT> de>
3 AuthorDate: Tue Jul 29 18:32:02 2014 +0000
4 Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
5 CommitDate: Tue Jul 29 18:32:02 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=fa410f3c
7
8 update generated files
9
10 ---
11 doc/html/usage.html | 116 +++++++++++++++++++++++++++++++++++++++++++++++-----
12 files/licenses | 7 +++-
13 2 files changed, 112 insertions(+), 11 deletions(-)
14
15 diff --git a/doc/html/usage.html b/doc/html/usage.html
16 index 587e8a1..cf4bf46 100644
17 --- a/doc/html/usage.html
18 +++ b/doc/html/usage.html
19 @@ -921,6 +921,50 @@ This also tries to recreate the distmap.</td></tr>
20 <kbd><span class="option">--no-incremental</span></kbd></td>
21 </tr>
22 <tr><td>&nbsp;</td><td>Force recreation of existing ebuilds</td></tr>
23 +<tr><td class="option-group" colspan="2">
24 +<kbd><span class="option">--package-revbump <var>&lt;package&gt;</var></span></kbd></td>
25 +</tr>
26 +<tr><td>&nbsp;</td><td><p class="first">Enforces a revbump of <tt class="docutils literal">&lt;package&gt;</tt>.</p>
27 +<p><tt class="docutils literal">&lt;package&gt;</tt> can be a package name (<tt class="docutils literal">${PN}</tt>), a package name with
28 +version (<tt class="docutils literal">${P}</tt> or <tt class="docutils literal">${PF}</tt>), optionally prefixed with its category
29 +(<tt class="docutils literal"><span class="pre">${CATEGORY}/${PN}</span></tt>, <tt class="docutils literal"><span class="pre">${CATEGORY}/${PF}</span></tt> etc.).
30 +Wildcard characters (<tt class="docutils literal">*</tt>, <tt class="docutils literal">?</tt>) are supported, too.</p>
31 +<p class="last">Incremental overlay creation only.
32 +A revbump only occurs if the package exists in the overlay and is queued
33 +for overlay creation.</p>
34 +</td></tr>
35 +<tr><td class="option-group" colspan="2">
36 +<kbd><span class="option">--package-force-replace <var>&lt;package&gt;</var></span></kbd></td>
37 +</tr>
38 +<tr><td>&nbsp;</td><td><p class="first">Enforces a recreation of <tt class="docutils literal">&lt;package&gt;</tt>.</p>
39 +<p class="last">See <tt class="docutils literal"><span class="pre">--package-revbump</span></tt>.</p>
40 +</td></tr>
41 +<tr><td class="option-group" colspan="2">
42 +<kbd><span class="option">--package-replace-only <var>&lt;package&gt;</var></span></kbd></td>
43 +</tr>
44 +<tr><td>&nbsp;</td><td><p class="first">Forbids ebuild creation for <tt class="docutils literal">&lt;package&gt;</tt> if it does not exist in the
45 +overlay already.</p>
46 +<p>Useful in conjunction with <tt class="docutils literal"><span class="pre">--package-revbump</span></tt>, <tt class="docutils literal"><span class="pre">--package-replace</span></tt>,
47 +<tt class="docutils literal"><span class="pre">--package-list</span></tt> or <tt class="docutils literal"><span class="pre">--ebuild-list</span></tt>:</p>
48 +<pre class="code text last literal-block">
49 +roverlay --package-revbump &quot;sci-R/*&quot; --package-replace-only &quot;*&quot;
50 +</pre>
51 +</td></tr>
52 +<tr><td class="option-group" colspan="2">
53 +<kbd><span class="option">--package-list <var>&lt;file&gt;</var></span></kbd></td>
54 +</tr>
55 +<tr><td>&nbsp;</td><td><p class="first">A file that lists packages that should be revbumped.</p>
56 +<p>Same as specifying <tt class="docutils literal"><span class="pre">--package-replace-only</span> &lt;pkg&gt; <span class="pre">--package-revbump</span> &lt;pkg&gt;</tt>
57 +for each line in the file.</p>
58 +<p class="last">The file can also be in extended format. (TODO: NOT DOCUMENTED)</p>
59 +</td></tr>
60 +<tr><td class="option-group" colspan="2">
61 +<kbd><span class="option">--ebuild-list <var>&lt;file&gt;</var></span></kbd></td>
62 +</tr>
63 +<tr><td>&nbsp;</td><td><p class="first">Same as <tt class="docutils literal"><span class="pre">--package-list</span></tt>, but expects a file that lists ebuild files.</p>
64 +<p>Useful in combination with <tt class="docutils literal">grep <span class="pre">-rl</span> &lt;expr&gt; &lt;overlay&gt;</tt> scripts.</p>
65 +<p class="last">The file can also be in extended format. (TODO: NOT DOCUMENTED)</p>
66 +</td></tr>
67 <tr><td class="option-group">
68 <kbd><span class="option">--no-revbump</span></kbd></td>
69 <td>Disable revbump checks in incremental overlay creation mode</td></tr>
70 @@ -1931,20 +1975,30 @@ character <tt class="docutils literal">:</tt> to the <em>dependency string</em>
71 (as <em>rule option</em>) turns it into a slot rule.</p>
72 <p>Fuzzy slot rules accept even more options, each of them separated by one
73 colong char <tt class="docutils literal">:</tt>:</p>
74 +<ul>
75 +<li><p class="first">slot mode:</p>
76 <ul class="simple">
77 -<li>slot mode:<ul>
78 <li><tt class="docutils literal">default</tt>: calculate a slot value (<tt class="docutils literal"><span class="pre">&lt;cat&gt;/&lt;pkg&gt;:&lt;SLOT&gt;</span></tt>)</li>
79 <li><tt class="docutils literal">with_version</tt> or <tt class="docutils literal">+v</tt>: include version, too (<tt class="docutils literal"><span class="pre">=&lt;cat&gt;/&lt;pkg&gt;-&lt;pkgver&gt;:&lt;SLOT&gt;</span></tt>)</li>
80 <li><tt class="docutils literal">open</tt>: non-versioned slot (<tt class="docutils literal"><span class="pre">&lt;cat&gt;/&lt;pkg&gt;:*</span></tt> or <tt class="docutils literal"><span class="pre">&lt;cat&gt;/&lt;pkg&gt;:=</span></tt>)</li>
81 </ul>
82 </li>
83 -<li>accepted <em>calculated</em> slot values can be restricted with
84 -<tt class="docutils literal"><span class="pre">restrict=&lt;list</span> of accepted values</tt> or <tt class="docutils literal"><span class="pre">r=&lt;list&gt;</span></tt></li>
85 -<li>relevant slot parts can be set with <tt class="docutils literal"><span class="pre">slotparts=&lt;selection&gt;</span></tt> or
86 -<tt class="docutils literal"><span class="pre">s=&lt;selection&gt;</span></tt></li>
87 -<li>relevant subslot parts can be set with <tt class="docutils literal"><span class="pre">subslotparts=&lt;selection&gt;</span></tt> or
88 -<tt class="docutils literal">/&lt;selection&gt;</tt></li>
89 -<li>slot operator can be set to <tt class="docutils literal">*</tt> or <tt class="docutils literal">=</tt></li>
90 +<li><p class="first">match behavior</p>
91 +<p>By default, slot rules match <tt class="docutils literal">&lt;= &lt;version&gt;</tt> and <tt class="docutils literal">= &lt;version&gt;</tt>
92 +statements only.
93 +The <tt class="docutils literal">wide_match</tt> option allows to match <tt class="docutils literal">&gt;= &lt;version&gt;</tt>, too.</p>
94 +</li>
95 +<li><p class="first">accepted <em>calculated</em> slot values can be restricted with
96 +<tt class="docutils literal"><span class="pre">restrict=&lt;list</span> of accepted values</tt> or <tt class="docutils literal"><span class="pre">r=&lt;list&gt;</span></tt></p>
97 +</li>
98 +<li><p class="first">relevant slot parts can be set with <tt class="docutils literal"><span class="pre">slotparts=&lt;selection&gt;</span></tt> or
99 +<tt class="docutils literal"><span class="pre">s=&lt;selection&gt;</span></tt></p>
100 +</li>
101 +<li><p class="first">relevant subslot parts can be set with <tt class="docutils literal"><span class="pre">subslotparts=&lt;selection&gt;</span></tt> or
102 +<tt class="docutils literal">/&lt;selection&gt;</tt></p>
103 +</li>
104 +<li><p class="first">slot operator can be set to <tt class="docutils literal">*</tt> or <tt class="docutils literal">=</tt></p>
105 +</li>
106 </ul>
107 <p><tt class="docutils literal">&lt;selection&gt;</tt> can be an index (integer) range
108 <tt class="docutils literal"><span class="pre">[&lt;low&gt;:=0]..[&lt;high&gt;:=&lt;low&gt;]</span></tt> or a fixed value <tt class="docutils literal">i&lt;value&gt;</tt>.</p>
109 @@ -2118,6 +2172,31 @@ removed or replaced (e.g.,
110 <td><em>implicit</em></td>
111 <td><em>alias to ebuild_name</em></td>
112 </tr>
113 +<tr><td>version</td>
114 +<td><em>implicit</em></td>
115 +<td><p class="first">ebuild version <tt class="docutils literal">${PV}</tt></p>
116 +<p class="last">To be exact, matches the ebuild
117 +version with revision <tt class="docutils literal"><span class="pre">-rN</span></tt>
118 +(<tt class="docutils literal">${PVR}</tt>). <tt class="docutils literal"><span class="pre">-r0</span></tt> gets always
119 +omitted and all packages are
120 +initially <tt class="docutils literal"><span class="pre">-r0</span></tt>, so <em>version</em>
121 +effectively matches <tt class="docutils literal">${PV}</tt>.</p>
122 +</td>
123 +</tr>
124 +<tr><td>category</td>
125 +<td>exact-string</td>
126 +<td>the package's overlay category,
127 +which is unknown (represented by
128 +<tt class="docutils literal">&#64;default</tt>) unless it has been set
129 +by a package rule action</td>
130 +</tr>
131 +<tr><td>default_category</td>
132 +<td><em>n/a</em></td>
133 +<td><p class="first"><strong>pseudo-statement</strong></p>
134 +<p class="last">shorthand for
135 +<tt class="docutils literal">category == &#64;default</tt></p>
136 +</td>
137 +</tr>
138 </tbody>
139 </table>
140 <p>Note the <strong>implicit operator</strong>. It will be used whenever no explicit operator
141 @@ -2384,10 +2463,27 @@ information</td>
142 <td rowspan="2">none</td>
143 <td rowspan="2">does nothing
144 (can be used for
145 -improving readability)</td>
146 +better readability)</td>
147 </tr>
148 <tr><td>pass</td>
149 </tr>
150 +<tr><td>add-policy</td>
151 +<td>overlay creation</td>
152 +<td>&gt;= 1</td>
153 +<td><p class="first">sets the addition
154 +control policy</p>
155 +<p>Possible values are
156 +<em>force-deny</em>,
157 +<em>deny-replace</em>,
158 +<em>force-replace</em>,
159 +<em>replace-only</em>,
160 +<em>revbump-on-collision</em>,
161 +and <em>default</em></p>
162 +<p class="last">Not meant to be set
163 +hand-written rule
164 +files.</p>
165 +</td>
166 +</tr>
167 </tbody>
168 </table>
169 <p>The two-arg form of the set/rename/add keywords expect a &lt;key&gt; as first and
170 @@ -5050,7 +5146,7 @@ becomes &quot;loop until resolver closes&quot;.</p>
171 </div>
172 <div class="footer">
173 <hr class="footer" />
174 -Generated on: 2014-05-07.
175 +Generated on: 2014-07-29.
176
177 </div>
178 </body>
179
180 diff --git a/files/licenses b/files/licenses
181 index 5948b31..d771692 100644
182 --- a/files/licenses
183 +++ b/files/licenses
184 @@ -52,7 +52,6 @@ Artistic-2
185 ArxFatalisDemo
186 ArxFatalis-EULA-GOG
187 ArxFatalis-EULA-JoWooD
188 -as-is
189 ASRP
190 astrolog
191 atheros-hal
192 @@ -207,6 +206,7 @@ EUPL-1.1
193 exljbris-free
194 Exolab
195 FAH-EULA-2009
196 +FAH-EULA-2014
197 FAH-special-permission
198 fairuse
199 fasta
200 @@ -296,6 +296,8 @@ iASL
201 IBM
202 IBM-J1.5
203 IBM-J1.6
204 +IBM-J7.1
205 +IBM-J7.AIX
206 IBPP-1.1
207 icaclient
208 icu
209 @@ -686,6 +688,7 @@ tkMOO
210 tm-align
211 torque-2.5
212 totd
213 +Transmission-OpenSSL-exception
214 trf
215 truecrypt-3.0
216 tsm
217 @@ -697,6 +700,7 @@ unicode
218 Unicode_Fonts_for_Ancient_Scripts
219 Unlicense
220 unRAR
221 +unreal-tournament-strikeforce
222 UoI-NCSA
223 UPEK-SDK-EULA
224 urbanterror-4.1-maps
225 @@ -754,6 +758,7 @@ xv
226 xvt
227 yahoo-patent-license-1.2
228 YaTeX
229 +YDSLA
230 zchaff
231 ZLIB
232 zoo