[gentoo-commits] proj/R_overlay:master commit in: config/simple-deprules.d/

[André Erdmann]

commit:     f08ec4d99dd1534efe8b8743fae4ace5ae9d9957
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Tue Aug 27 15:38:46 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Tue Aug 27 15:38:46 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=f08ec4d9

more dependency rules

---
 config/simple-deprules.d/R            |  1 +
 config/simple-deprules.d/dev          | 12 +++++++++++-
 config/simple-deprules.d/ignored_text |  8 ++++++++
 config/simple-deprules.d/media        | 10 +++++++++-
 config/simple-deprules.d/misc         |  9 +++++++++
 config/simple-deprules.d/sci          |  9 +++++++++
 config/simple-deprules.d/system.set   |  1 +
 7 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/config/simple-deprules.d/R b/config/simple-deprules.d/R
index ecb78fd..ceb82da 100644
--- a/config/simple-deprules.d/R
+++ b/config/simple-deprules.d/R
@@ -29,6 +29,7 @@ dev-lang/R[tk] {
 	grid
 	KernSmooth
 	lattice
+	libR
 	MASS
 	Matrix
 	methods

diff --git a/config/simple-deprules.d/dev b/config/simple-deprules.d/dev
index 01603a1..bed0153 100644
--- a/config/simple-deprules.d/dev
+++ b/config/simple-deprules.d/dev
@@ -39,7 +39,13 @@ dev-java/jdbc-postgresql:: PostgreSQL JDBCdriver
 dev-lang/lua :: lua version>= 5.1.4
 ~dev-lang/lua :: lua
 
-~dev-tex/pgf :: pgf
+~dev-tex/pgf {
+	pgf
+}
+
+>=dev-tex/pgf-2.10 {
+	pgf (>=2.10) (http://sourceforge.net/projects/pgf/)for the vignette
+}
 
 ~dev-tcltk/bwidget {
 	bwidget
@@ -53,10 +59,14 @@ dev-util/cmake {
 	cmake (http://www.cmake.org)
 }
 
+# FIXME: the jdk rules are not quite correct,
+#         virtual/jdk:1.6 (probably) works for some packages, too
+#
 # resolve "java 5", "java 1.5" ... as 'virtual/jdk:1.5'
 ~virtual/jdk:slotparts=i1.5:restrict=1.5,5.0 {
 	java
 	Java 1.4 or later
+	Java 1.5 or higher
 	Java version
 	java runtime
 }

diff --git a/config/simple-deprules.d/ignored_text b/config/simple-deprules.d/ignored_text
index a2567e2..bd4e8ae 100644
--- a/config/simple-deprules.d/ignored_text
+++ b/config/simple-deprules.d/ignored_text
@@ -57,8 +57,16 @@
 	its development files
 	library (version2.2.0 or later)
 	libraries(See README.REQ)
+	Google Chrome for Windows
+	for externalization
+	writing some graphicformats
+	available athttp://www.monetdb.org
+	it is used in the demos too).
 }
 
+# that's a hardware requirement
+! :: double-precision AMD or Nvidia GPU
+
 % :: Linux
 
 # ignore "Windows" in dependency fields:

diff --git a/config/simple-deprules.d/media b/config/simple-deprules.d/media
index 365455f..41d8a03 100644
--- a/config/simple-deprules.d/media
+++ b/config/simple-deprules.d/media
@@ -8,8 +8,13 @@ media-sound/csound {
 
 ~media-gfx/imagemagick {
 	imagemagick
+}
+
+#deptype all
+media-gfx/imagemagick {
 	Image Magick (for reading non PPM format)
 }
+#deptype sys
 
 media-gfx/graphviz :: dot from graphviz
 ~media-gfx/graphviz {
@@ -28,7 +33,10 @@ virtual/ffmpeg {
 	ffmpeg
 }
 
-media-gfx/dcraw :: dcraw(for reading RAW images).
+media-gfx/dcraw {
+	dcraw(for reading RAW images).
+	dcraw (for readingRAW images).
+}
 
 media-libs/fontconfig {
 	fontconfig

diff --git a/config/simple-deprules.d/misc b/config/simple-deprules.d/misc
index 9a1bae1..9157f64 100644
--- a/config/simple-deprules.d/misc
+++ b/config/simple-deprules.d/misc
@@ -5,3 +5,12 @@ dev-vcs/git {
 >=app-emulation/wine-1.5.26 {
    wine (>= wine-1.5.26)
 }
+
+
+# spGoogle 0.1.2 from CRAN wants "Google Chrome" or "Firefox"
+#  TODO: check whether this dep can be dropped/ignored or other browsers
+#        would suffice, too
+#
+|| ( www-client/google-chrome www-client/firefox www-client/firefox-bin ) {
+   Linux users orFirefox just for Linux users.
+}

diff --git a/config/simple-deprules.d/sci b/config/simple-deprules.d/sci
index 4e5363a..70521d9 100644
--- a/config/simple-deprules.d/sci
+++ b/config/simple-deprules.d/sci
@@ -62,6 +62,10 @@ sci-biology/ncbi-tools++ {
 	ncbi-tools++
 }
 
+sci-biology/kalign {
+	kalign
+}
+
 sci-mathematics/glpk {
 	libglpk-dev onDebian/Ubuntu)
 }
@@ -74,6 +78,11 @@ sci-mathematics/glpk {
 	glpk
 }
 
+#deptype pkg
+sci-mathematics/rstudio {
+	manipulate
+}
+
 #deptype sys
 
 # == misc ==

diff --git a/config/simple-deprules.d/system.set b/config/simple-deprules.d/system.set
index 828d995..78ae160 100644
--- a/config/simple-deprules.d/system.set
+++ b/config/simple-deprules.d/system.set
@@ -3,6 +3,7 @@
 # @system
 ! {
 	GNU Make
+	GNU Make forexternalization
 	andg++ GNU compiler (a nvcc-compatible version of g++ is needed
 	andg++ GNU compiler version 3.4 (version 4.4 is not yet compatiblewith nvcc).
 	chmod)