| 1 |
commit: effb06b81e11c20b04b1898d2e6111b72c1583b9 |
| 2 |
Author: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 3 |
AuthorDate: Sat Aug 23 19:00:28 2014 +0000 |
| 4 |
Commit: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 5 |
CommitDate: Sat Aug 23 19:00:28 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=effb06b8 |
| 7 |
|
| 8 |
update generated files |
| 9 |
|
| 10 |
--- |
| 11 |
R-overlay.conf | 4 ++++ |
| 12 |
R-overlay.conf.others | 4 ++++ |
| 13 |
config/R-overlay.conf.install | 4 ++++ |
| 14 |
config/R-overlay.conf.install.others | 4 ++++ |
| 15 |
doc/html/usage.html | 8 ++++---- |
| 16 |
files/licenses | 1 + |
| 17 |
6 files changed, 21 insertions(+), 4 deletions(-) |
| 18 |
|
| 19 |
diff --git a/R-overlay.conf b/R-overlay.conf |
| 20 |
index e75b0a8..5ec0ad4 100644 |
| 21 |
--- a/R-overlay.conf |
| 22 |
+++ b/R-overlay.conf |
| 23 |
@@ -133,6 +133,10 @@ DISTDIR_STRATEGY="hardlink symlink" |
| 24 |
# Defaults to "no". |
| 25 |
#NOSYNC="yes" |
| 26 |
|
| 27 |
+# EAPI of the created ebuilds |
| 28 |
+# Defaults to "5". |
| 29 |
+#EBUILD_EAPI="5" |
| 30 |
+ |
| 31 |
# Manifest file creation |
| 32 |
# Available choices are 'next' (internal, fast) |
| 33 |
# and 'ebuild' (using ebuild(1), slow, but failsafe). |
| 34 |
|
| 35 |
diff --git a/R-overlay.conf.others b/R-overlay.conf.others |
| 36 |
index fc7ad69..cf0cf13 100644 |
| 37 |
--- a/R-overlay.conf.others |
| 38 |
+++ b/R-overlay.conf.others |
| 39 |
@@ -138,6 +138,10 @@ CREATE_LICENSES_FILE="no" |
| 40 |
# Defaults to "no". |
| 41 |
#NOSYNC="yes" |
| 42 |
|
| 43 |
+# EAPI of the created ebuilds |
| 44 |
+# Defaults to "5". |
| 45 |
+#EBUILD_EAPI="5" |
| 46 |
+ |
| 47 |
# Manifest file creation |
| 48 |
# Available choices are 'next' (internal, fast) |
| 49 |
# and 'ebuild' (using ebuild(1), slow, but failsafe). |
| 50 |
|
| 51 |
diff --git a/config/R-overlay.conf.install b/config/R-overlay.conf.install |
| 52 |
index fc4256d..3defb2b 100644 |
| 53 |
--- a/config/R-overlay.conf.install |
| 54 |
+++ b/config/R-overlay.conf.install |
| 55 |
@@ -125,6 +125,10 @@ DISTDIR_STRATEGY="hardlink symlink" |
| 56 |
# Defaults to "no". |
| 57 |
#NOSYNC="yes" |
| 58 |
|
| 59 |
+# EAPI of the created ebuilds |
| 60 |
+# Defaults to "5". |
| 61 |
+#EBUILD_EAPI="5" |
| 62 |
+ |
| 63 |
# Manifest file creation |
| 64 |
# Available choices are 'next' (internal, fast) |
| 65 |
# and 'ebuild' (using ebuild(1), slow, but failsafe). |
| 66 |
|
| 67 |
diff --git a/config/R-overlay.conf.install.others b/config/R-overlay.conf.install.others |
| 68 |
index e66cc34..c2a6274 100644 |
| 69 |
--- a/config/R-overlay.conf.install.others |
| 70 |
+++ b/config/R-overlay.conf.install.others |
| 71 |
@@ -130,6 +130,10 @@ CREATE_LICENSES_FILE="no" |
| 72 |
# Defaults to "no". |
| 73 |
#NOSYNC="yes" |
| 74 |
|
| 75 |
+# EAPI of the created ebuilds |
| 76 |
+# Defaults to "5". |
| 77 |
+#EBUILD_EAPI="5" |
| 78 |
+ |
| 79 |
# Manifest file creation |
| 80 |
# Available choices are 'next' (internal, fast) |
| 81 |
# and 'ebuild' (using ebuild(1), slow, but failsafe). |
| 82 |
|
| 83 |
diff --git a/doc/html/usage.html b/doc/html/usage.html |
| 84 |
index cf4bf46..a8075cb 100644 |
| 85 |
--- a/doc/html/usage.html |
| 86 |
+++ b/doc/html/usage.html |
| 87 |
@@ -1844,14 +1844,14 @@ slot. The following example resolves "fftw 2.1", "fftw 2.1.2" |
| 88 |
"fftw 2.1.3" as "sci-libs/fftw:2.1", "fftw 3.0" as "sci-libs/fftw:3.0" |
| 89 |
and so on:</p> |
| 90 |
<pre class="code text last literal-block"> |
| 91 |
-~sci-libs/fftw:s=0..1 :: fftw |
| 92 |
+~sci-libs/fftw:wide_match:s=0..1 :: fftw |
| 93 |
</pre> |
| 94 |
</dd> |
| 95 |
<dt>Example 6 - slot-restricted fuzzy slot rule</dt> |
| 96 |
<dd><p class="first">Similar to example 5, but this rule does not resolve anything unless the |
| 97 |
calculated slot is allowed.</p> |
| 98 |
<pre class="code text last literal-block"> |
| 99 |
-~sci-libs/fftw:s=0..1:restrict=2.1,3.0: :: fftw |
| 100 |
+~sci-libs/fftw:wide_match:s=0..1:restrict=2.1,3.0: :: fftw |
| 101 |
</pre> |
| 102 |
</dd> |
| 103 |
<dt>Example 7 - slot-restricted fuzzy slot rule with <em>immediate</em> value</dt> |
| 104 |
@@ -1859,7 +1859,7 @@ calculated slot is allowed.</p> |
| 105 |
for various versions from the 3.x range. The following rule resolves |
| 106 |
"fftw 3.0", ..., "fftw 3.3" as "sci-libs/fftw:3.0":</p> |
| 107 |
<pre class="code text last literal-block"> |
| 108 |
-~sci-libs/fftw:s=i3.0:restrict=3.0,3.1,3.2,3.3 :: fftw |
| 109 |
+~sci-libs/fftw:wide_match:s=i3.0:restrict=3.0,3.1,3.2,3.3 :: fftw |
| 110 |
</pre> |
| 111 |
</dd> |
| 112 |
</dl> |
| 113 |
@@ -5146,7 +5146,7 @@ becomes "loop until resolver closes".</p> |
| 114 |
</div> |
| 115 |
<div class="footer"> |
| 116 |
<hr class="footer" /> |
| 117 |
-Generated on: 2014-07-29. |
| 118 |
+Generated on: 2014-08-23. |
| 119 |
|
| 120 |
</div> |
| 121 |
</body> |
| 122 |
|
| 123 |
diff --git a/files/licenses b/files/licenses |
| 124 |
index d771692..4619ef4 100644 |
| 125 |
--- a/files/licenses |
| 126 |
+++ b/files/licenses |
| 127 |
@@ -494,6 +494,7 @@ openspml |
| 128 |
openssl |
| 129 |
Openwall |
| 130 |
OPERA-12 |
| 131 |
+OPERA-2014 |
| 132 |
OPL |
| 133 |
Oracle-BCLA-JavaSE |
| 134 |
oracle-java-documentation |
Archives