diff options
| author |   André Erdmann <dywi@mailerd.de> | 2014-08-23 21:00:28 +0200 |
|---|---|---|
| committer | André Erdmann <dywi@mailerd.de> | 2014-08-23 21:00:28 +0200 |
| commit | effb06b81e11c20b04b1898d2e6111b72c1583b9 (patch) | |
| tree | e5e654b9b0b0699255bd529f6a51e567dd8a1293 | |
| parent | doc/rst: fix slot rule examples (diff) | |
| download | R_overlay-effb06b81e11c20b04b1898d2e6111b72c1583b9.tar.gz R_overlay-effb06b81e11c20b04b1898d2e6111b72c1583b9.tar.bz2 R_overlay-effb06b81e11c20b04b1898d2e6111b72c1583b9.zip | |
update generated files
| -rw-r--r-- | R-overlay.conf | 4 | ||||
| -rw-r--r-- | R-overlay.conf.others | 4 | ||||
| -rw-r--r-- | config/R-overlay.conf.install | 4 | ||||
| -rw-r--r-- | config/R-overlay.conf.install.others | 4 | ||||
| -rw-r--r-- | doc/html/usage.html | 8 | ||||
| -rw-r--r-- | files/licenses | 1 |
6 files changed, 21 insertions, 4 deletions
diff --git a/R-overlay.conf b/R-overlay.conf index e75b0a8..5ec0ad4 100644 --- a/R-overlay.conf +++ b/R-overlay.conf @@ -133,6 +133,10 @@ DISTDIR_STRATEGY="hardlink symlink" # Defaults to "no". #NOSYNC="yes" +# EAPI of the created ebuilds +# Defaults to "5". +#EBUILD_EAPI="5" + # Manifest file creation # Available choices are 'next' (internal, fast) # and 'ebuild' (using ebuild(1), slow, but failsafe). diff --git a/R-overlay.conf.others b/R-overlay.conf.others index fc7ad69..cf0cf13 100644 --- a/R-overlay.conf.others +++ b/R-overlay.conf.others @@ -138,6 +138,10 @@ CREATE_LICENSES_FILE="no" # Defaults to "no". #NOSYNC="yes" +# EAPI of the created ebuilds +# Defaults to "5". +#EBUILD_EAPI="5" + # Manifest file creation # Available choices are 'next' (internal, fast) # and 'ebuild' (using ebuild(1), slow, but failsafe). diff --git a/config/R-overlay.conf.install b/config/R-overlay.conf.install index fc4256d..3defb2b 100644 --- a/config/R-overlay.conf.install +++ b/config/R-overlay.conf.install @@ -125,6 +125,10 @@ DISTDIR_STRATEGY="hardlink symlink" # Defaults to "no". #NOSYNC="yes" +# EAPI of the created ebuilds +# Defaults to "5". +#EBUILD_EAPI="5" + # Manifest file creation # Available choices are 'next' (internal, fast) # and 'ebuild' (using ebuild(1), slow, but failsafe). diff --git a/config/R-overlay.conf.install.others b/config/R-overlay.conf.install.others index e66cc34..c2a6274 100644 --- a/config/R-overlay.conf.install.others +++ b/config/R-overlay.conf.install.others @@ -130,6 +130,10 @@ CREATE_LICENSES_FILE="no" # Defaults to "no". #NOSYNC="yes" +# EAPI of the created ebuilds +# Defaults to "5". +#EBUILD_EAPI="5" + # Manifest file creation # Available choices are 'next' (internal, fast) # and 'ebuild' (using ebuild(1), slow, but failsafe). diff --git a/doc/html/usage.html b/doc/html/usage.html index cf4bf46..a8075cb 100644 --- a/doc/html/usage.html +++ b/doc/html/usage.html @@ -1844,14 +1844,14 @@ slot. The following example resolves "fftw 2.1", "fftw 2.1.2" "fftw 2.1.3" as "sci-libs/fftw:2.1", "fftw 3.0" as "sci-libs/fftw:3.0" and so on:</p> <pre class="code text last literal-block"> -~sci-libs/fftw:s=0..1 :: fftw +~sci-libs/fftw:wide_match:s=0..1 :: fftw </pre> </dd> <dt>Example 6 - slot-restricted fuzzy slot rule</dt> <dd><p class="first">Similar to example 5, but this rule does not resolve anything unless the calculated slot is allowed.</p> <pre class="code text last literal-block"> -~sci-libs/fftw:s=0..1:restrict=2.1,3.0: :: fftw +~sci-libs/fftw:wide_match:s=0..1:restrict=2.1,3.0: :: fftw </pre> </dd> <dt>Example 7 - slot-restricted fuzzy slot rule with <em>immediate</em> value</dt> @@ -1859,7 +1859,7 @@ calculated slot is allowed.</p> for various versions from the 3.x range. The following rule resolves "fftw 3.0", ..., "fftw 3.3" as "sci-libs/fftw:3.0":</p> <pre class="code text last literal-block"> -~sci-libs/fftw:s=i3.0:restrict=3.0,3.1,3.2,3.3 :: fftw +~sci-libs/fftw:wide_match:s=i3.0:restrict=3.0,3.1,3.2,3.3 :: fftw </pre> </dd> </dl> @@ -5146,7 +5146,7 @@ becomes "loop until resolver closes".</p> </div> <div class="footer"> <hr class="footer" /> -Generated on: 2014-07-29. +Generated on: 2014-08-23. </div> </body> diff --git a/files/licenses b/files/licenses index d771692..4619ef4 100644 --- a/files/licenses +++ b/files/licenses @@ -494,6 +494,7 @@ openspml openssl Openwall OPERA-12 +OPERA-2014 OPL Oracle-BCLA-JavaSE oracle-java-documentation |