commit: daa3c7277f25c71620679fb439c763a0426ab7e7
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon May 28 08:26:46 2018 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon May 28 08:26:46 2018 +0000
URL: https://gitweb.gentoo.org/proj/R_overlay.git/commit/?id=daa3c727
Update default deprules.
config/simple-deprules.d/R | 19 -------------------
config/simple-deprules.d/app-text | 10 ++++++++++
config/simple-deprules.d/dev | 5 +++++
config/simple-deprules.d/dev-libs | 7 +++++++
config/simple-deprules.d/ignored_text | 6 ++++++
config/simple-deprules.d/net | 4 ++++
config/simple-deprules.d/sci-libs | 6 ++++++
config/simple-deprules.d/system.set | 12 +++++++++++-
config/simple-deprules.d/unknown | 2 ++
config/simple-deprules.d/virtual | 15 +++++++++++++++
10 files changed, 66 insertions(+), 20 deletions(-)
diff --git a/config/simple-deprules.d/R b/config/simple-deprules.d/R
index bf46e87..9106deb 100644
--- a/config/simple-deprules.d/R
+++ b/config/simple-deprules.d/R
@@ -32,25 +32,6 @@ dev-lang/R[tk] {
utils
}
-# recommended packages
-dev-lang/R[-minimal] {
- boot
- class
- cluster
- codetools
- foreign
- KernSmooth
- lattice
- MASS
- Matrix
- mgcv
- nlme
- nnet
- rpart
- spatial
- survival
-}
-
# FIXME, seems to be provided too
% {
stepfun
diff --git a/config/simple-deprules.d/app-text
b/config/simple-deprules.d/app-text
index d88fb1e..6e4cdd4 100644
--- a/config/simple-deprules.d/app-text
+++ b/config/simple-deprules.d/app-text
@@ -3,6 +3,7 @@
app-text/antiword {
Antiword (http://www.winfield.demon.nl/) forreading MS Word files
antiword for reading MS Word files
+ Antiword (<http://www.winfield.demon.nl/>) forreading MS Word files
}
~app-text/ghostscript-gpl :: ghostscript
@@ -23,3 +24,12 @@ app-text/texlive {
app-text/poppler {
pdfinfo
}
+
+
+~app-text/pandoc :: pandoc
+app-text/pandoc {
+ pandoc (>= 1.12.3) -http://johnmacfarlane.net/pandoc
+ pandoc with https support
+ 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).
+}
+
diff --git a/config/simple-deprules.d/dev b/config/simple-deprules.d/dev
index 891f264..89759fc 100644
--- a/config/simple-deprules.d/dev
+++ b/config/simple-deprules.d/dev
@@ -33,6 +33,7 @@ dev-java/jdbc-postgresql :: PostgreSQL JDBCdriver
# lowest python version in portage: 2.7 (2.6 masked)
dev-lang/python {
Python (>= 2.4) to run Asciidoc(http://www.python.org/)
+ Python 2.7.x or Python 3.2.x-3.4.x
}
@@ -59,6 +60,10 @@ dev-util/cmake {
cmake (http://www.cmake.org)
}
+~dev-python/numpy {
+ numpy
+}
+
# FIXME: the jdk rules are not quite correct,
# virtual/jdk:1.7 (probably) works for some packages, too
#
diff --git a/config/simple-deprules.d/dev-libs
b/config/simple-deprules.d/dev-libs
index b378a9b..b46d2a6 100644
--- a/config/simple-deprules.d/dev-libs
+++ b/config/simple-deprules.d/dev-libs
@@ -2,6 +2,8 @@
~dev-libs/atk :: ATK
+~dev-libs/openssl :: OpenSSL
+
~dev-libs/boost {
boost library
boost
@@ -86,3 +88,8 @@ dev-libs/quantlib {
dev-libs/geoip {
GeoIP from MaxMinds
}
+
+dev-libs/icu {
+ ICU4C (>= 50
+ ICU4C (>= 52
+}
diff --git a/config/simple-deprules.d/ignored_text
b/config/simple-deprules.d/ignored_text
index bd4e8ae..097f004 100644
--- a/config/simple-deprules.d/ignored_text
+++ b/config/simple-deprules.d/ignored_text
@@ -22,8 +22,10 @@
your mileage may vary)
optional)
heavily suggested)
+ and Windows
hence Windows or Linux
$distributions package thelibrary file separately from the executible
+ libraries(See the INSTALL file)
or INSTALL.windows under Windows
standard unix tools (e.g.
rgdal OSX binary packages are also available at the samesite.
@@ -40,6 +42,7 @@
so for instance on Debian and Ubuntuyou would need the
"libcsound64-dev" package.
For the MERLIN wrapper
Mac
+ Mac OSX
Mac OS X
Mac OS X binaries
Mac.Parallel HDF5
@@ -62,6 +65,8 @@
writing some graphicformats
available athttp://www.monetdb.org
it is used in the demos too).
+ headers
+ OpenCSW.
}
# that's a hardware requirement
@@ -87,6 +92,7 @@
Will use djmrgl or rgl packages for rendering ifpresent
Will use djmrgl or rgl packages for rendering if present
SYMPHONY for Windows (sources included for otherOSes)
+ SYMPHONY libraries
}
# ignore OSX recommendations
diff --git a/config/simple-deprules.d/net b/config/simple-deprules.d/net
index e99087e..ab87ea8 100644
--- a/config/simple-deprules.d/net
+++ b/config/simple-deprules.d/net
@@ -20,6 +20,10 @@ net-misc/curl {
# FIXME
net-libs/czmq :: libzmq
+net-libs/zeromq {
+ or ZeroMQ library >=4.0.4. Solaris 10 needs ZeroMQ library 4.0.7
+}
+
net-misc/s3cmd :: s3cmd
virtual/ssh {
diff --git a/config/simple-deprules.d/sci-libs
b/config/simple-deprules.d/sci-libs
index abd31d7..14da6a3 100644
--- a/config/simple-deprules.d/sci-libs
+++ b/config/simple-deprules.d/sci-libs
@@ -45,6 +45,12 @@ sci-libs/gsl {
}
~sci-libs/hdf5 :: hdf5
+sci-libs/hdf5[cxx] {
+ libhdf5 (>= 1.8.x) with C++ interface(--enable-cxx=yes)
+ libhdf5 (>= 1.8.12) with C++ interface(--enable-cxx=yes)
+}
+# remnant of hdf5
+! :: v18 API enabled
~sci-libs/itpp {
itpp
diff --git a/config/simple-deprules.d/system.set
b/config/simple-deprules.d/system.set
index 78ae160..54fc6a5 100644
--- a/config/simple-deprules.d/system.set
+++ b/config/simple-deprules.d/system.set
@@ -2,6 +2,7 @@
# @system
! {
+ GNU make
GNU Make
GNU Make forexternalization
andg++ GNU compiler (a nvcc-compatible version of g++ is needed
@@ -16,10 +17,18 @@
#sys-devel/gcc[cxx] :: g++ or Microsoft VC++
! :: g++ or Microsoft VC++
-
+! {
+ g++-4.6.* or later should be sufficient
+ g++-4.9.* or lateris preferred.
+ gcc (release >= 4.5).
+ C++11
+ C++11 (supporting at least std=c++0x)
+ A C++11 compiler. Version 4.6.* of g++ (ascurrently in Rtools) is
insufficient
+}
# always provided? (except for Gentoo/*BSD)
! {
+ Linux operating system
Linux operating system.
Linuxoperationg system
}
@@ -29,6 +38,7 @@
POSIX-compliant OS (essentially anything butWindows
POSIX-compliant OS (essentially anything butWindows)
Unix
+ 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.
}
# rpcgen is part of glibc
diff --git a/config/simple-deprules.d/unknown b/config/simple-deprules.d/unknown
index 939c77d..8d1549d 100644
--- a/config/simple-deprules.d/unknown
+++ b/config/simple-deprules.d/unknown
@@ -3,4 +3,6 @@
# FIXME: which library is meant?
! {
A C library with the fesetround/fegetroundfunctions.
+ library.
+ library
}
diff --git a/config/simple-deprules.d/virtual b/config/simple-deprules.d/virtual
new file mode 100644
index 0000000..33f0d74
--- /dev/null
+++ b/config/simple-deprules.d/virtual
@@ -0,0 +1,15 @@
+virtual/boot :: boot
+virtual/class :: class
+virtual/cluster :: cluster
+virtual/codetools :: codetools
+virtual/foreign :: foreign
+virtual/KernSmooth :: KernSmooth
+virtual/lattice :: lattice
+virtual/MASS :: MASS
+virtual/Matrix :: Matrix
+virtual/mgcv :: mgcv
+virtual/nlme :: nlme
+virtual/nnet :: nnet
+virtual/rpart :: rpart
+virtual/spatial :: spatial
+virtual/survival :: survival
