added R language component

component/gcc/software.cfg

+# A minimal software release to test the r-language component.
+
 [buildout]
 extends = 
   ../../stack/slapos.cfg

component/libatlas/buildout.cfg

@@ -49,5 +49,4 @@ install_cmd =
 #  make ptcheck  # sanity check parallel
   make time     # check if lib is fast
   make install  # copy libs to install dir 
-update_cmd = ${:install_cmd}
 

component/r-language/buildout.cfg

+[buildout]
+extends =
+  ../gcc/buildout.cfg
+
+parts =
+  gcc-fortran
+  r-language
+
+[r-language]
+recipe = slapos.recipe.cmmi
+url = http://cran.irsn.fr/src/base/R-3/R-3.1.0.tar.gz
+md5sum = a1ee52446bee81820409661e6d114ab1
+configure-options =
+  --with-readline=no
+  --with-x=no
+  --enable-R-shlib
+environment =
+  CC=${gcc-fortran:location}/bin/gcc
+  F77=${gcc-fortran:location}/bin/gfortran
+  LDFLAGS=-L${gcc-fortran:location}/lib64 -Wl,-rpath=${gcc-fortran:location}/lib64
+

component/r-language/software.cfg

+# A minimal software release to test the r-language component (depends on gfortran).
+
+[buildout]
+extends = 
+  ../../stack/slapos.cfg
+  ../../component/gcc/buildout.cfg
+  ../../component/r-language/buildout.cfg
+
+parts =
+  eggs
+  gcc-fortran
+  r-language
+
+[eggs]
+recipe = zc.recipe.egg
+eggs =
+  ${lxml-python:egg}
+  slapos.cookbook
+

software/dream/software.cfg

 [buildout]
 
+# A proper SR for Dream with no external dependecies (fortran, etc),
+# but which uses a virtualenv to ease packaging on the python side.
+
 extends = 
   ../../stack/slapos.cfg
   ../../component/git/buildout.cfg
   ../../component/gcc/buildout.cfg
   ../../component/libatlas/buildout.cfg
   ../../component/libblas/buildout.cfg
+  ../../component/r-language/buildout.cfg
 
 parts =
   python2.7-virtualenv
@@ -13,13 +17,10 @@ parts =
   gcc-fortran
   libatlas
   libblas
+  r-language
+  sh-dream-environment
+  scikit-env
 
-#  scikit-env
-
-# XXX ideally, libatlas should use this version
-#[gcc-download]
-#url = http://www.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-4.7.0/gcc-4.7.0.tar.bz2
-#md5sum = 2a0f1d99fda235c29d40b561f81d9a77
 
 [eggs]
 recipe = zc.recipe.egg
@@ -50,11 +51,31 @@ install_cmd =
   pip install flask
   pip install pyparsing==1.5.7
   pip install pydot
-  #export LDFLAGS="-lncurses"
-  pip install rpy2
+  # export LDFLAGS="-lncurses"
+  export PATH=${r-language:location}/bin:$PATH
+  # pip install rpy2
+  # clone repo for:
+  #   bug fix - https://bitbucket.org/lgautier/rpy2/issue/183
+  # (may switch to released egg later)
+  pip install mercurial
+  hg clone -b version_2.4.x https://marco.mariani@bitbucket.org/marco.mariani/rpy2
+  cd rpy2
+  python setup.py install
   git clone http://git.erp5.org/repos/dream.git -b marco
   cd dream
   python setup.py install
+update_cmd = ${:install_cmd}
+
+
+
+[sh-dream-environment]
+# environment needed for running/debugging the applications, exported to a shell script to be sourced.
+recipe = collective.recipe.template
+output = ${buildout:directory}/environment.sh
+input = inline:
+  export PATH="${r-language:location}/bin:$PATH"
+  export LD_LIBRARY_PATH="${r-language:location}/lib/R/lib:$LD_LIBRARY_PATH"
+
 
 
 [versions]

software/scikit/software.cfg

 [buildout]
 
+# Dream Software Release with external dependencies.
+# Depends on gfortran, libatlas, r-base-dev, etc... installed by apt-get.
+
 extends = 
   ../../stack/slapos.cfg
   ../../component/git/buildout.cfg
-#  ../../component/libatlas/buildout.cfg
 
 parts =
   python2.7-virtualenv