1 |
commit: daa3c7277f25c71620679fb439c763a0426ab7e7 |
2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 28 08:26:46 2018 +0000 |
4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 28 08:26:46 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/R_overlay.git/commit/?id=daa3c727 |
7 |
|
8 |
Update default deprules. |
9 |
|
10 |
config/simple-deprules.d/R | 19 ------------------- |
11 |
config/simple-deprules.d/app-text | 10 ++++++++++ |
12 |
config/simple-deprules.d/dev | 5 +++++ |
13 |
config/simple-deprules.d/dev-libs | 7 +++++++ |
14 |
config/simple-deprules.d/ignored_text | 6 ++++++ |
15 |
config/simple-deprules.d/net | 4 ++++ |
16 |
config/simple-deprules.d/sci-libs | 6 ++++++ |
17 |
config/simple-deprules.d/system.set | 12 +++++++++++- |
18 |
config/simple-deprules.d/unknown | 2 ++ |
19 |
config/simple-deprules.d/virtual | 15 +++++++++++++++ |
20 |
10 files changed, 66 insertions(+), 20 deletions(-) |
21 |
|
22 |
diff --git a/config/simple-deprules.d/R b/config/simple-deprules.d/R |
23 |
index bf46e87..9106deb 100644 |
24 |
--- a/config/simple-deprules.d/R |
25 |
+++ b/config/simple-deprules.d/R |
26 |
@@ -32,25 +32,6 @@ dev-lang/R[tk] { |
27 |
utils |
28 |
} |
29 |
|
30 |
-# recommended packages |
31 |
-dev-lang/R[-minimal] { |
32 |
- boot |
33 |
- class |
34 |
- cluster |
35 |
- codetools |
36 |
- foreign |
37 |
- KernSmooth |
38 |
- lattice |
39 |
- MASS |
40 |
- Matrix |
41 |
- mgcv |
42 |
- nlme |
43 |
- nnet |
44 |
- rpart |
45 |
- spatial |
46 |
- survival |
47 |
-} |
48 |
- |
49 |
# FIXME, seems to be provided too |
50 |
% { |
51 |
stepfun |
52 |
|
53 |
diff --git a/config/simple-deprules.d/app-text b/config/simple-deprules.d/app-text |
54 |
index d88fb1e..6e4cdd4 100644 |
55 |
--- a/config/simple-deprules.d/app-text |
56 |
+++ b/config/simple-deprules.d/app-text |
57 |
@@ -3,6 +3,7 @@ |
58 |
app-text/antiword { |
59 |
Antiword (http://www.winfield.demon.nl/) forreading MS Word files |
60 |
antiword for reading MS Word files |
61 |
+ Antiword (<http://www.winfield.demon.nl/>) forreading MS Word files |
62 |
} |
63 |
|
64 |
~app-text/ghostscript-gpl :: ghostscript |
65 |
@@ -23,3 +24,12 @@ app-text/texlive { |
66 |
app-text/poppler { |
67 |
pdfinfo |
68 |
} |
69 |
+ |
70 |
+ |
71 |
+~app-text/pandoc :: pandoc |
72 |
+app-text/pandoc { |
73 |
+ pandoc (>= 1.12.3) -http://johnmacfarlane.net/pandoc |
74 |
+ pandoc with https support |
75 |
+ Package vignettes based on R Markdown v2 requirePandoc (http://pandoc.org). The function rst2pdf() andvignettes based on reStructuredText require rst2pdf(https://github.com/rst2pdf/rst2pdf). |
76 |
+} |
77 |
+ |
78 |
|
79 |
diff --git a/config/simple-deprules.d/dev b/config/simple-deprules.d/dev |
80 |
index 891f264..89759fc 100644 |
81 |
--- a/config/simple-deprules.d/dev |
82 |
+++ b/config/simple-deprules.d/dev |
83 |
@@ -33,6 +33,7 @@ dev-java/jdbc-postgresql :: PostgreSQL JDBCdriver |
84 |
# lowest python version in portage: 2.7 (2.6 masked) |
85 |
dev-lang/python { |
86 |
Python (>= 2.4) to run Asciidoc(http://www.python.org/) |
87 |
+ Python 2.7.x or Python 3.2.x-3.4.x |
88 |
} |
89 |
|
90 |
|
91 |
@@ -59,6 +60,10 @@ dev-util/cmake { |
92 |
cmake (http://www.cmake.org) |
93 |
} |
94 |
|
95 |
+~dev-python/numpy { |
96 |
+ numpy |
97 |
+} |
98 |
+ |
99 |
# FIXME: the jdk rules are not quite correct, |
100 |
# virtual/jdk:1.7 (probably) works for some packages, too |
101 |
# |
102 |
|
103 |
diff --git a/config/simple-deprules.d/dev-libs b/config/simple-deprules.d/dev-libs |
104 |
index b378a9b..b46d2a6 100644 |
105 |
--- a/config/simple-deprules.d/dev-libs |
106 |
+++ b/config/simple-deprules.d/dev-libs |
107 |
@@ -2,6 +2,8 @@ |
108 |
|
109 |
~dev-libs/atk :: ATK |
110 |
|
111 |
+~dev-libs/openssl :: OpenSSL |
112 |
+ |
113 |
~dev-libs/boost { |
114 |
boost library |
115 |
boost |
116 |
@@ -86,3 +88,8 @@ dev-libs/quantlib { |
117 |
dev-libs/geoip { |
118 |
GeoIP from MaxMinds |
119 |
} |
120 |
+ |
121 |
+dev-libs/icu { |
122 |
+ ICU4C (>= 50 |
123 |
+ ICU4C (>= 52 |
124 |
+} |
125 |
|
126 |
diff --git a/config/simple-deprules.d/ignored_text b/config/simple-deprules.d/ignored_text |
127 |
index bd4e8ae..097f004 100644 |
128 |
--- a/config/simple-deprules.d/ignored_text |
129 |
+++ b/config/simple-deprules.d/ignored_text |
130 |
@@ -22,8 +22,10 @@ |
131 |
your mileage may vary) |
132 |
optional) |
133 |
heavily suggested) |
134 |
+ and Windows |
135 |
hence Windows or Linux |
136 |
$distributions package thelibrary file separately from the executible |
137 |
+ libraries(See the INSTALL file) |
138 |
or INSTALL.windows under Windows |
139 |
standard unix tools (e.g. |
140 |
rgdal OSX binary packages are also available at the samesite. |
141 |
@@ -40,6 +42,7 @@ |
142 |
so for instance on Debian and Ubuntuyou would need the "libcsound64-dev" package. |
143 |
For the MERLIN wrapper |
144 |
Mac |
145 |
+ Mac OSX |
146 |
Mac OS X |
147 |
Mac OS X binaries |
148 |
Mac.Parallel HDF5 |
149 |
@@ -62,6 +65,8 @@ |
150 |
writing some graphicformats |
151 |
available athttp://www.monetdb.org |
152 |
it is used in the demos too). |
153 |
+ headers |
154 |
+ OpenCSW. |
155 |
} |
156 |
|
157 |
# that's a hardware requirement |
158 |
@@ -87,6 +92,7 @@ |
159 |
Will use djmrgl or rgl packages for rendering ifpresent |
160 |
Will use djmrgl or rgl packages for rendering if present |
161 |
SYMPHONY for Windows (sources included for otherOSes) |
162 |
+ SYMPHONY libraries |
163 |
} |
164 |
|
165 |
# ignore OSX recommendations |
166 |
|
167 |
diff --git a/config/simple-deprules.d/net b/config/simple-deprules.d/net |
168 |
index e99087e..ab87ea8 100644 |
169 |
--- a/config/simple-deprules.d/net |
170 |
+++ b/config/simple-deprules.d/net |
171 |
@@ -20,6 +20,10 @@ net-misc/curl { |
172 |
# FIXME |
173 |
net-libs/czmq :: libzmq |
174 |
|
175 |
+net-libs/zeromq { |
176 |
+ or ZeroMQ library >=4.0.4. Solaris 10 needs ZeroMQ library 4.0.7 |
177 |
+} |
178 |
+ |
179 |
net-misc/s3cmd :: s3cmd |
180 |
|
181 |
virtual/ssh { |
182 |
|
183 |
diff --git a/config/simple-deprules.d/sci-libs b/config/simple-deprules.d/sci-libs |
184 |
index abd31d7..14da6a3 100644 |
185 |
--- a/config/simple-deprules.d/sci-libs |
186 |
+++ b/config/simple-deprules.d/sci-libs |
187 |
@@ -45,6 +45,12 @@ sci-libs/gsl { |
188 |
} |
189 |
|
190 |
~sci-libs/hdf5 :: hdf5 |
191 |
+sci-libs/hdf5[cxx] { |
192 |
+ libhdf5 (>= 1.8.x) with C++ interface(--enable-cxx=yes) |
193 |
+ libhdf5 (>= 1.8.12) with C++ interface(--enable-cxx=yes) |
194 |
+} |
195 |
+# remnant of hdf5 |
196 |
+! :: v18 API enabled |
197 |
|
198 |
~sci-libs/itpp { |
199 |
itpp |
200 |
|
201 |
diff --git a/config/simple-deprules.d/system.set b/config/simple-deprules.d/system.set |
202 |
index 78ae160..54fc6a5 100644 |
203 |
--- a/config/simple-deprules.d/system.set |
204 |
+++ b/config/simple-deprules.d/system.set |
205 |
@@ -2,6 +2,7 @@ |
206 |
|
207 |
# @system |
208 |
! { |
209 |
+ GNU make |
210 |
GNU Make |
211 |
GNU Make forexternalization |
212 |
andg++ GNU compiler (a nvcc-compatible version of g++ is needed |
213 |
@@ -16,10 +17,18 @@ |
214 |
|
215 |
#sys-devel/gcc[cxx] :: g++ or Microsoft VC++ |
216 |
! :: g++ or Microsoft VC++ |
217 |
- |
218 |
+! { |
219 |
+ g++-4.6.* or later should be sufficient |
220 |
+ g++-4.9.* or lateris preferred. |
221 |
+ gcc (release >= 4.5). |
222 |
+ C++11 |
223 |
+ C++11 (supporting at least std=c++0x) |
224 |
+ A C++11 compiler. Version 4.6.* of g++ (ascurrently in Rtools) is insufficient |
225 |
+} |
226 |
|
227 |
# always provided? (except for Gentoo/*BSD) |
228 |
! { |
229 |
+ Linux operating system |
230 |
Linux operating system. |
231 |
Linuxoperationg system |
232 |
} |
233 |
@@ -29,6 +38,7 @@ |
234 |
POSIX-compliant OS (essentially anything butWindows |
235 |
POSIX-compliant OS (essentially anything butWindows) |
236 |
Unix |
237 |
+ A 64-bit POSIX OS such as Linux or OS X with IANAtime zone data in /usr/share/zoneinfo as well as a C++11compiler. |
238 |
} |
239 |
|
240 |
# rpcgen is part of glibc |
241 |
|
242 |
diff --git a/config/simple-deprules.d/unknown b/config/simple-deprules.d/unknown |
243 |
index 939c77d..8d1549d 100644 |
244 |
--- a/config/simple-deprules.d/unknown |
245 |
+++ b/config/simple-deprules.d/unknown |
246 |
@@ -3,4 +3,6 @@ |
247 |
# FIXME: which library is meant? |
248 |
! { |
249 |
A C library with the fesetround/fegetroundfunctions. |
250 |
+ library. |
251 |
+ library |
252 |
} |
253 |
|
254 |
diff --git a/config/simple-deprules.d/virtual b/config/simple-deprules.d/virtual |
255 |
new file mode 100644 |
256 |
index 0000000..33f0d74 |
257 |
--- /dev/null |
258 |
+++ b/config/simple-deprules.d/virtual |
259 |
@@ -0,0 +1,15 @@ |
260 |
+virtual/boot :: boot |
261 |
+virtual/class :: class |
262 |
+virtual/cluster :: cluster |
263 |
+virtual/codetools :: codetools |
264 |
+virtual/foreign :: foreign |
265 |
+virtual/KernSmooth :: KernSmooth |
266 |
+virtual/lattice :: lattice |
267 |
+virtual/MASS :: MASS |
268 |
+virtual/Matrix :: Matrix |
269 |
+virtual/mgcv :: mgcv |
270 |
+virtual/nlme :: nlme |
271 |
+virtual/nnet :: nnet |
272 |
+virtual/rpart :: rpart |
273 |
+virtual/spatial :: spatial |
274 |
+virtual/survival :: survival |