* [gentoo-commits] proj/R_overlay:master commit in: files/, doc/html/
@ 2014-06-05 22:09 André Erdmann
0 siblings, 0 replies; 3+ messages in thread
From: André Erdmann @ 2014-06-05 22:09 UTC (permalink / raw
To: gentoo-commits
commit: c2086a88dd05639666f57cc69f373348b5b62e22
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed May 7 01:28:53 2014 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed May 7 01:28:53 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=c2086a88
update generated files
---
doc/html/usage.html | 4 ++--
files/licenses | 9 +++++++++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/doc/html/usage.html b/doc/html/usage.html
index 2892bcb..587e8a1 100644
--- a/doc/html/usage.html
+++ b/doc/html/usage.html
@@ -4614,7 +4614,7 @@ would require variable interpolation, e.g. for <tt class="docutils literal">${PN
that tries to create an ebuild for it.</p>
<p>An <em>EbuildCreationJob</em> does the following steps:</p>
<ol class="arabic simple">
-<li>Read the DESCRIPTION file of <em>p</em> R package tarball and stores the
+<li>Read the DESCRIPTION file of <em>p</em>'s R package tarball and store the
data in an associative array ('DESCRIPTION field' -> 'data')</li>
<li>Call <a class="reference internal" href="#dependency-resolution">dependency resolution</a></li>
<li>If dependency resolution was successful and any <a class="reference internal" href="#selfdeps">selfdeps</a> found
@@ -5050,7 +5050,7 @@ becomes "loop until resolver closes".</p>
</div>
<div class="footer">
<hr class="footer" />
-Generated on: 2014-04-01.
+Generated on: 2014-05-07.
</div>
</body>
diff --git a/files/licenses b/files/licenses
index bd8fd1d..5948b31 100644
--- a/files/licenses
+++ b/files/licenses
@@ -74,6 +74,7 @@ bea.ri.jsr173
BEER-WARE
bertini
bestcrypt
+bf1942-lnxded
BigelowHolmes
bioapi
BitstreamCyberbit
@@ -460,12 +461,14 @@ ngrep
Nokia-Qt-LGPL-Exception-1.1
nomachine
NOSA
+no-source-code
noweb
NPL-1.1
NTED_FONT
NVIDIA-CUDA
NVIDIA-r1
NVIDIA-r2
+nwmovies
NWN-EULA
OAL-1.0.1
oasis
@@ -478,6 +481,7 @@ OGL-1.0a
Old-MIT
olivia
openafs-krb5-a
+Open-CASCADE-LGPL-2.1-Exception-1.0
Open-CASCADE-Technology-Public-License-6.5
Open-CASCADE-Technology-Public-License-6.6
Opendylan
@@ -541,6 +545,7 @@ PSTT
psutils
public-domain
PUEL
+PyGUI
pymol
PYTHON
Q2EULA
@@ -554,6 +559,8 @@ QPL
QPL-1.0
qpopper
quake1-demodata
+quake1-killer
+quake1-teamfortress
quake1-textures
quake2-demodata
QUAKE4
@@ -586,6 +593,7 @@ selfhtml
Sendmail
Sendmail-Open-Source
SFI-SCLA
+sgb2ns
SGI-B-2.0
SGMLUG
shmux
@@ -678,6 +686,7 @@ tkMOO
tm-align
torque-2.5
totd
+trf
truecrypt-3.0
tsm
ttf2pt1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: files/, doc/html/
@ 2014-07-29 18:36 André Erdmann
2014-08-23 19:03 ` André Erdmann
0 siblings, 1 reply; 3+ messages in thread
From: André Erdmann @ 2014-07-29 18:36 UTC (permalink / raw
To: gentoo-commits
commit: fa410f3c0d3e284d3efed0ad63b66362857c2389
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Tue Jul 29 18:32:02 2014 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Tue Jul 29 18:32:02 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=fa410f3c
update generated files
---
doc/html/usage.html | 116 +++++++++++++++++++++++++++++++++++++++++++++++-----
files/licenses | 7 +++-
2 files changed, 112 insertions(+), 11 deletions(-)
diff --git a/doc/html/usage.html b/doc/html/usage.html
index 587e8a1..cf4bf46 100644
--- a/doc/html/usage.html
+++ b/doc/html/usage.html
@@ -921,6 +921,50 @@ This also tries to recreate the distmap.</td></tr>
<kbd><span class="option">--no-incremental</span></kbd></td>
</tr>
<tr><td> </td><td>Force recreation of existing ebuilds</td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">--package-revbump <var><package></var></span></kbd></td>
+</tr>
+<tr><td> </td><td><p class="first">Enforces a revbump of <tt class="docutils literal"><package></tt>.</p>
+<p><tt class="docutils literal"><package></tt> can be a package name (<tt class="docutils literal">${PN}</tt>), a package name with
+version (<tt class="docutils literal">${P}</tt> or <tt class="docutils literal">${PF}</tt>), optionally prefixed with its category
+(<tt class="docutils literal"><span class="pre">${CATEGORY}/${PN}</span></tt>, <tt class="docutils literal"><span class="pre">${CATEGORY}/${PF}</span></tt> etc.).
+Wildcard characters (<tt class="docutils literal">*</tt>, <tt class="docutils literal">?</tt>) are supported, too.</p>
+<p class="last">Incremental overlay creation only.
+A revbump only occurs if the package exists in the overlay and is queued
+for overlay creation.</p>
+</td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">--package-force-replace <var><package></var></span></kbd></td>
+</tr>
+<tr><td> </td><td><p class="first">Enforces a recreation of <tt class="docutils literal"><package></tt>.</p>
+<p class="last">See <tt class="docutils literal"><span class="pre">--package-revbump</span></tt>.</p>
+</td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">--package-replace-only <var><package></var></span></kbd></td>
+</tr>
+<tr><td> </td><td><p class="first">Forbids ebuild creation for <tt class="docutils literal"><package></tt> if it does not exist in the
+overlay already.</p>
+<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>,
+<tt class="docutils literal"><span class="pre">--package-list</span></tt> or <tt class="docutils literal"><span class="pre">--ebuild-list</span></tt>:</p>
+<pre class="code text last literal-block">
+roverlay --package-revbump "sci-R/*" --package-replace-only "*"
+</pre>
+</td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">--package-list <var><file></var></span></kbd></td>
+</tr>
+<tr><td> </td><td><p class="first">A file that lists packages that should be revbumped.</p>
+<p>Same as specifying <tt class="docutils literal"><span class="pre">--package-replace-only</span> <pkg> <span class="pre">--package-revbump</span> <pkg></tt>
+for each line in the file.</p>
+<p class="last">The file can also be in extended format. (TODO: NOT DOCUMENTED)</p>
+</td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">--ebuild-list <var><file></var></span></kbd></td>
+</tr>
+<tr><td> </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>
+<p>Useful in combination with <tt class="docutils literal">grep <span class="pre">-rl</span> <expr> <overlay></tt> scripts.</p>
+<p class="last">The file can also be in extended format. (TODO: NOT DOCUMENTED)</p>
+</td></tr>
<tr><td class="option-group">
<kbd><span class="option">--no-revbump</span></kbd></td>
<td>Disable revbump checks in incremental overlay creation mode</td></tr>
@@ -1931,20 +1975,30 @@ character <tt class="docutils literal">:</tt> to the <em>dependency string</em>
(as <em>rule option</em>) turns it into a slot rule.</p>
<p>Fuzzy slot rules accept even more options, each of them separated by one
colong char <tt class="docutils literal">:</tt>:</p>
+<ul>
+<li><p class="first">slot mode:</p>
<ul class="simple">
-<li>slot mode:<ul>
<li><tt class="docutils literal">default</tt>: calculate a slot value (<tt class="docutils literal"><span class="pre"><cat>/<pkg>:<SLOT></span></tt>)</li>
<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">=<cat>/<pkg>-<pkgver>:<SLOT></span></tt>)</li>
<li><tt class="docutils literal">open</tt>: non-versioned slot (<tt class="docutils literal"><span class="pre"><cat>/<pkg>:*</span></tt> or <tt class="docutils literal"><span class="pre"><cat>/<pkg>:=</span></tt>)</li>
</ul>
</li>
-<li>accepted <em>calculated</em> slot values can be restricted with
-<tt class="docutils literal"><span class="pre">restrict=<list</span> of accepted values</tt> or <tt class="docutils literal"><span class="pre">r=<list></span></tt></li>
-<li>relevant slot parts can be set with <tt class="docutils literal"><span class="pre">slotparts=<selection></span></tt> or
-<tt class="docutils literal"><span class="pre">s=<selection></span></tt></li>
-<li>relevant subslot parts can be set with <tt class="docutils literal"><span class="pre">subslotparts=<selection></span></tt> or
-<tt class="docutils literal">/<selection></tt></li>
-<li>slot operator can be set to <tt class="docutils literal">*</tt> or <tt class="docutils literal">=</tt></li>
+<li><p class="first">match behavior</p>
+<p>By default, slot rules match <tt class="docutils literal"><= <version></tt> and <tt class="docutils literal">= <version></tt>
+statements only.
+The <tt class="docutils literal">wide_match</tt> option allows to match <tt class="docutils literal">>= <version></tt>, too.</p>
+</li>
+<li><p class="first">accepted <em>calculated</em> slot values can be restricted with
+<tt class="docutils literal"><span class="pre">restrict=<list</span> of accepted values</tt> or <tt class="docutils literal"><span class="pre">r=<list></span></tt></p>
+</li>
+<li><p class="first">relevant slot parts can be set with <tt class="docutils literal"><span class="pre">slotparts=<selection></span></tt> or
+<tt class="docutils literal"><span class="pre">s=<selection></span></tt></p>
+</li>
+<li><p class="first">relevant subslot parts can be set with <tt class="docutils literal"><span class="pre">subslotparts=<selection></span></tt> or
+<tt class="docutils literal">/<selection></tt></p>
+</li>
+<li><p class="first">slot operator can be set to <tt class="docutils literal">*</tt> or <tt class="docutils literal">=</tt></p>
+</li>
</ul>
<p><tt class="docutils literal"><selection></tt> can be an index (integer) range
<tt class="docutils literal"><span class="pre">[<low>:=0]..[<high>:=<low>]</span></tt> or a fixed value <tt class="docutils literal">i<value></tt>.</p>
@@ -2118,6 +2172,31 @@ removed or replaced (e.g.,
<td><em>implicit</em></td>
<td><em>alias to ebuild_name</em></td>
</tr>
+<tr><td>version</td>
+<td><em>implicit</em></td>
+<td><p class="first">ebuild version <tt class="docutils literal">${PV}</tt></p>
+<p class="last">To be exact, matches the ebuild
+version with revision <tt class="docutils literal"><span class="pre">-rN</span></tt>
+(<tt class="docutils literal">${PVR}</tt>). <tt class="docutils literal"><span class="pre">-r0</span></tt> gets always
+omitted and all packages are
+initially <tt class="docutils literal"><span class="pre">-r0</span></tt>, so <em>version</em>
+effectively matches <tt class="docutils literal">${PV}</tt>.</p>
+</td>
+</tr>
+<tr><td>category</td>
+<td>exact-string</td>
+<td>the package's overlay category,
+which is unknown (represented by
+<tt class="docutils literal">@default</tt>) unless it has been set
+by a package rule action</td>
+</tr>
+<tr><td>default_category</td>
+<td><em>n/a</em></td>
+<td><p class="first"><strong>pseudo-statement</strong></p>
+<p class="last">shorthand for
+<tt class="docutils literal">category == @default</tt></p>
+</td>
+</tr>
</tbody>
</table>
<p>Note the <strong>implicit operator</strong>. It will be used whenever no explicit operator
@@ -2384,10 +2463,27 @@ information</td>
<td rowspan="2">none</td>
<td rowspan="2">does nothing
(can be used for
-improving readability)</td>
+better readability)</td>
</tr>
<tr><td>pass</td>
</tr>
+<tr><td>add-policy</td>
+<td>overlay creation</td>
+<td>>= 1</td>
+<td><p class="first">sets the addition
+control policy</p>
+<p>Possible values are
+<em>force-deny</em>,
+<em>deny-replace</em>,
+<em>force-replace</em>,
+<em>replace-only</em>,
+<em>revbump-on-collision</em>,
+and <em>default</em></p>
+<p class="last">Not meant to be set
+hand-written rule
+files.</p>
+</td>
+</tr>
</tbody>
</table>
<p>The two-arg form of the set/rename/add keywords expect a <key> as first and
@@ -5050,7 +5146,7 @@ becomes "loop until resolver closes".</p>
</div>
<div class="footer">
<hr class="footer" />
-Generated on: 2014-05-07.
+Generated on: 2014-07-29.
</div>
</body>
diff --git a/files/licenses b/files/licenses
index 5948b31..d771692 100644
--- a/files/licenses
+++ b/files/licenses
@@ -52,7 +52,6 @@ Artistic-2
ArxFatalisDemo
ArxFatalis-EULA-GOG
ArxFatalis-EULA-JoWooD
-as-is
ASRP
astrolog
atheros-hal
@@ -207,6 +206,7 @@ EUPL-1.1
exljbris-free
Exolab
FAH-EULA-2009
+FAH-EULA-2014
FAH-special-permission
fairuse
fasta
@@ -296,6 +296,8 @@ iASL
IBM
IBM-J1.5
IBM-J1.6
+IBM-J7.1
+IBM-J7.AIX
IBPP-1.1
icaclient
icu
@@ -686,6 +688,7 @@ tkMOO
tm-align
torque-2.5
totd
+Transmission-OpenSSL-exception
trf
truecrypt-3.0
tsm
@@ -697,6 +700,7 @@ unicode
Unicode_Fonts_for_Ancient_Scripts
Unlicense
unRAR
+unreal-tournament-strikeforce
UoI-NCSA
UPEK-SDK-EULA
urbanterror-4.1-maps
@@ -754,6 +758,7 @@ xv
xvt
yahoo-patent-license-1.2
YaTeX
+YDSLA
zchaff
ZLIB
zoo
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: files/, doc/html/
2014-07-29 18:36 [gentoo-commits] proj/R_overlay:master commit in: files/, doc/html/ André Erdmann
@ 2014-08-23 19:03 ` André Erdmann
0 siblings, 0 replies; 3+ messages in thread
From: André Erdmann @ 2014-08-23 19:03 UTC (permalink / raw
To: gentoo-commits
commit: fa410f3c0d3e284d3efed0ad63b66362857c2389
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Tue Jul 29 18:32:02 2014 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Tue Jul 29 18:32:02 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=fa410f3c
update generated files
---
doc/html/usage.html | 116 +++++++++++++++++++++++++++++++++++++++++++++++-----
files/licenses | 7 +++-
2 files changed, 112 insertions(+), 11 deletions(-)
diff --git a/doc/html/usage.html b/doc/html/usage.html
index 587e8a1..cf4bf46 100644
--- a/doc/html/usage.html
+++ b/doc/html/usage.html
@@ -921,6 +921,50 @@ This also tries to recreate the distmap.</td></tr>
<kbd><span class="option">--no-incremental</span></kbd></td>
</tr>
<tr><td> </td><td>Force recreation of existing ebuilds</td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">--package-revbump <var><package></var></span></kbd></td>
+</tr>
+<tr><td> </td><td><p class="first">Enforces a revbump of <tt class="docutils literal"><package></tt>.</p>
+<p><tt class="docutils literal"><package></tt> can be a package name (<tt class="docutils literal">${PN}</tt>), a package name with
+version (<tt class="docutils literal">${P}</tt> or <tt class="docutils literal">${PF}</tt>), optionally prefixed with its category
+(<tt class="docutils literal"><span class="pre">${CATEGORY}/${PN}</span></tt>, <tt class="docutils literal"><span class="pre">${CATEGORY}/${PF}</span></tt> etc.).
+Wildcard characters (<tt class="docutils literal">*</tt>, <tt class="docutils literal">?</tt>) are supported, too.</p>
+<p class="last">Incremental overlay creation only.
+A revbump only occurs if the package exists in the overlay and is queued
+for overlay creation.</p>
+</td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">--package-force-replace <var><package></var></span></kbd></td>
+</tr>
+<tr><td> </td><td><p class="first">Enforces a recreation of <tt class="docutils literal"><package></tt>.</p>
+<p class="last">See <tt class="docutils literal"><span class="pre">--package-revbump</span></tt>.</p>
+</td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">--package-replace-only <var><package></var></span></kbd></td>
+</tr>
+<tr><td> </td><td><p class="first">Forbids ebuild creation for <tt class="docutils literal"><package></tt> if it does not exist in the
+overlay already.</p>
+<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>,
+<tt class="docutils literal"><span class="pre">--package-list</span></tt> or <tt class="docutils literal"><span class="pre">--ebuild-list</span></tt>:</p>
+<pre class="code text last literal-block">
+roverlay --package-revbump "sci-R/*" --package-replace-only "*"
+</pre>
+</td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">--package-list <var><file></var></span></kbd></td>
+</tr>
+<tr><td> </td><td><p class="first">A file that lists packages that should be revbumped.</p>
+<p>Same as specifying <tt class="docutils literal"><span class="pre">--package-replace-only</span> <pkg> <span class="pre">--package-revbump</span> <pkg></tt>
+for each line in the file.</p>
+<p class="last">The file can also be in extended format. (TODO: NOT DOCUMENTED)</p>
+</td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">--ebuild-list <var><file></var></span></kbd></td>
+</tr>
+<tr><td> </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>
+<p>Useful in combination with <tt class="docutils literal">grep <span class="pre">-rl</span> <expr> <overlay></tt> scripts.</p>
+<p class="last">The file can also be in extended format. (TODO: NOT DOCUMENTED)</p>
+</td></tr>
<tr><td class="option-group">
<kbd><span class="option">--no-revbump</span></kbd></td>
<td>Disable revbump checks in incremental overlay creation mode</td></tr>
@@ -1931,20 +1975,30 @@ character <tt class="docutils literal">:</tt> to the <em>dependency string</em>
(as <em>rule option</em>) turns it into a slot rule.</p>
<p>Fuzzy slot rules accept even more options, each of them separated by one
colong char <tt class="docutils literal">:</tt>:</p>
+<ul>
+<li><p class="first">slot mode:</p>
<ul class="simple">
-<li>slot mode:<ul>
<li><tt class="docutils literal">default</tt>: calculate a slot value (<tt class="docutils literal"><span class="pre"><cat>/<pkg>:<SLOT></span></tt>)</li>
<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">=<cat>/<pkg>-<pkgver>:<SLOT></span></tt>)</li>
<li><tt class="docutils literal">open</tt>: non-versioned slot (<tt class="docutils literal"><span class="pre"><cat>/<pkg>:*</span></tt> or <tt class="docutils literal"><span class="pre"><cat>/<pkg>:=</span></tt>)</li>
</ul>
</li>
-<li>accepted <em>calculated</em> slot values can be restricted with
-<tt class="docutils literal"><span class="pre">restrict=<list</span> of accepted values</tt> or <tt class="docutils literal"><span class="pre">r=<list></span></tt></li>
-<li>relevant slot parts can be set with <tt class="docutils literal"><span class="pre">slotparts=<selection></span></tt> or
-<tt class="docutils literal"><span class="pre">s=<selection></span></tt></li>
-<li>relevant subslot parts can be set with <tt class="docutils literal"><span class="pre">subslotparts=<selection></span></tt> or
-<tt class="docutils literal">/<selection></tt></li>
-<li>slot operator can be set to <tt class="docutils literal">*</tt> or <tt class="docutils literal">=</tt></li>
+<li><p class="first">match behavior</p>
+<p>By default, slot rules match <tt class="docutils literal"><= <version></tt> and <tt class="docutils literal">= <version></tt>
+statements only.
+The <tt class="docutils literal">wide_match</tt> option allows to match <tt class="docutils literal">>= <version></tt>, too.</p>
+</li>
+<li><p class="first">accepted <em>calculated</em> slot values can be restricted with
+<tt class="docutils literal"><span class="pre">restrict=<list</span> of accepted values</tt> or <tt class="docutils literal"><span class="pre">r=<list></span></tt></p>
+</li>
+<li><p class="first">relevant slot parts can be set with <tt class="docutils literal"><span class="pre">slotparts=<selection></span></tt> or
+<tt class="docutils literal"><span class="pre">s=<selection></span></tt></p>
+</li>
+<li><p class="first">relevant subslot parts can be set with <tt class="docutils literal"><span class="pre">subslotparts=<selection></span></tt> or
+<tt class="docutils literal">/<selection></tt></p>
+</li>
+<li><p class="first">slot operator can be set to <tt class="docutils literal">*</tt> or <tt class="docutils literal">=</tt></p>
+</li>
</ul>
<p><tt class="docutils literal"><selection></tt> can be an index (integer) range
<tt class="docutils literal"><span class="pre">[<low>:=0]..[<high>:=<low>]</span></tt> or a fixed value <tt class="docutils literal">i<value></tt>.</p>
@@ -2118,6 +2172,31 @@ removed or replaced (e.g.,
<td><em>implicit</em></td>
<td><em>alias to ebuild_name</em></td>
</tr>
+<tr><td>version</td>
+<td><em>implicit</em></td>
+<td><p class="first">ebuild version <tt class="docutils literal">${PV}</tt></p>
+<p class="last">To be exact, matches the ebuild
+version with revision <tt class="docutils literal"><span class="pre">-rN</span></tt>
+(<tt class="docutils literal">${PVR}</tt>). <tt class="docutils literal"><span class="pre">-r0</span></tt> gets always
+omitted and all packages are
+initially <tt class="docutils literal"><span class="pre">-r0</span></tt>, so <em>version</em>
+effectively matches <tt class="docutils literal">${PV}</tt>.</p>
+</td>
+</tr>
+<tr><td>category</td>
+<td>exact-string</td>
+<td>the package's overlay category,
+which is unknown (represented by
+<tt class="docutils literal">@default</tt>) unless it has been set
+by a package rule action</td>
+</tr>
+<tr><td>default_category</td>
+<td><em>n/a</em></td>
+<td><p class="first"><strong>pseudo-statement</strong></p>
+<p class="last">shorthand for
+<tt class="docutils literal">category == @default</tt></p>
+</td>
+</tr>
</tbody>
</table>
<p>Note the <strong>implicit operator</strong>. It will be used whenever no explicit operator
@@ -2384,10 +2463,27 @@ information</td>
<td rowspan="2">none</td>
<td rowspan="2">does nothing
(can be used for
-improving readability)</td>
+better readability)</td>
</tr>
<tr><td>pass</td>
</tr>
+<tr><td>add-policy</td>
+<td>overlay creation</td>
+<td>>= 1</td>
+<td><p class="first">sets the addition
+control policy</p>
+<p>Possible values are
+<em>force-deny</em>,
+<em>deny-replace</em>,
+<em>force-replace</em>,
+<em>replace-only</em>,
+<em>revbump-on-collision</em>,
+and <em>default</em></p>
+<p class="last">Not meant to be set
+hand-written rule
+files.</p>
+</td>
+</tr>
</tbody>
</table>
<p>The two-arg form of the set/rename/add keywords expect a <key> as first and
@@ -5050,7 +5146,7 @@ becomes "loop until resolver closes".</p>
</div>
<div class="footer">
<hr class="footer" />
-Generated on: 2014-05-07.
+Generated on: 2014-07-29.
</div>
</body>
diff --git a/files/licenses b/files/licenses
index 5948b31..d771692 100644
--- a/files/licenses
+++ b/files/licenses
@@ -52,7 +52,6 @@ Artistic-2
ArxFatalisDemo
ArxFatalis-EULA-GOG
ArxFatalis-EULA-JoWooD
-as-is
ASRP
astrolog
atheros-hal
@@ -207,6 +206,7 @@ EUPL-1.1
exljbris-free
Exolab
FAH-EULA-2009
+FAH-EULA-2014
FAH-special-permission
fairuse
fasta
@@ -296,6 +296,8 @@ iASL
IBM
IBM-J1.5
IBM-J1.6
+IBM-J7.1
+IBM-J7.AIX
IBPP-1.1
icaclient
icu
@@ -686,6 +688,7 @@ tkMOO
tm-align
torque-2.5
totd
+Transmission-OpenSSL-exception
trf
truecrypt-3.0
tsm
@@ -697,6 +700,7 @@ unicode
Unicode_Fonts_for_Ancient_Scripts
Unlicense
unRAR
+unreal-tournament-strikeforce
UoI-NCSA
UPEK-SDK-EULA
urbanterror-4.1-maps
@@ -754,6 +758,7 @@ xv
xvt
yahoo-patent-license-1.2
YaTeX
+YDSLA
zchaff
ZLIB
zoo
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-08-23 19:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-29 18:36 [gentoo-commits] proj/R_overlay:master commit in: files/, doc/html/ André Erdmann
2014-08-23 19:03 ` André Erdmann
-- strict thread matches above, loose matches on Subject: below --
2014-06-05 22:09 André Erdmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox