From b925fbf66d62634be351293cb92ed5b4283979af Mon Sep 17 00:00:00 2001
From: Balazs Hajgato <hajgato@vub.ac.be>
Date: Thu, 3 Mar 2016 14:50:49 +0100
Subject: [PATCH 1/6] {lang}[intel-2016a] R 3.2.3 with libX11 1.6.3 (WIP)

---
 .../cairo-1.14.6-intel-2016a-libX11-1.6.3.eb  |  56 +++
 .../GDAL-2.0.2-intel-2016a-libX11-1.6.3.eb    |  30 ++
 .../GLib-2.47.5-intel-2016a-libX11-1.6.3.eb   |  39 ++
 ...-intel-2016a-Python-2.7.11-libX11-1.6.3.eb |  29 ++
 .../r/R/R-3.2.3-intel-2016a-libX11-1.6.3.eb   | 453 ++++++++++++++++++
 5 files changed, 607 insertions(+)
 create mode 100644 easybuild/easyconfigs/c/cairo/cairo-1.14.6-intel-2016a-libX11-1.6.3.eb
 create mode 100644 easybuild/easyconfigs/g/GDAL/GDAL-2.0.2-intel-2016a-libX11-1.6.3.eb
 create mode 100644 easybuild/easyconfigs/g/GLib/GLib-2.47.5-intel-2016a-libX11-1.6.3.eb
 create mode 100644 easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-intel-2016a-Python-2.7.11-libX11-1.6.3.eb
 create mode 100644 easybuild/easyconfigs/r/R/R-3.2.3-intel-2016a-libX11-1.6.3.eb

diff --git a/easybuild/easyconfigs/c/cairo/cairo-1.14.6-intel-2016a-libX11-1.6.3.eb b/easybuild/easyconfigs/c/cairo/cairo-1.14.6-intel-2016a-libX11-1.6.3.eb
new file mode 100644
index 000000000000..6db4212fb31d
--- /dev/null
+++ b/easybuild/easyconfigs/c/cairo/cairo-1.14.6-intel-2016a-libX11-1.6.3.eb
@@ -0,0 +1,56 @@
+easyblock = 'ConfigureMake'
+
+name = 'cairo'
+version = '1.14.6'
+
+libx11 = 'libX11'
+libxver = '1.6.3' 
+versionsuffix = '-%s-%s' % (libx11, libxver)
+
+homepage = 'http://cairographics.org'
+description = """Cairo is a 2D graphics library with support for multiple output devices.
+ Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers,
+ PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://cairographics.org/releases/']
+sources = [SOURCE_TAR_XZ]
+
+glibver = '2.47.5'
+
+builddependencies = [
+    ('renderproto', '0.11'),
+]
+
+dependencies = [
+    (libx11, libxver),
+    ('libXrender', '0.9.9'),
+    ('libdrm', '2.4.67'),
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.8'),
+    ('libpng', '1.6.21'),
+    ('freetype', '2.6.2'),
+    ('pixman', '0.34.0'),
+    ('fontconfig', '2.11.94'),
+    ('expat', '2.1.0'),
+    ('GLib', glibver, versionsuffix),
+]
+
+# disable symbol lookup, which requires -lbfd, to avoid link issues with (non-PIC) libiberty.a provided by GCC
+configopts = "--enable-symbol-lookup=no --enable-gobject=yes --enable-svg=yes --enable-tee=yes "
+
+# workaround for "hidden symbol .* in .* is referenced by DSO" and "ld: final link failed: Bad value"
+buildopts = 'LD="$CC" LDFLAGS="$LDFLAGS -shared-intel"'
+
+sanity_check_paths = {
+    'files': ['bin/cairo-trace', 'lib/cairo/libcairo-trace.so', 'lib/cairo/libcairo-trace.a',
+              'lib/libcairo.a', 'lib/libcairo-gobject.a', 'lib/libcairo-script-interpreter.a',
+              'lib/libcairo-gobject.so', 'lib/libcairo-script-interpreter.so', 'lib/libcairo.so'] +
+             ['include/cairo/cairo%s.h' % x for x in ['', '-deprecated', '-features', '-ft', '-gobject', '-pdf', '-ps',
+                                                      '-script', '-script-interpreter', '-svg', '-version', '-xcb',
+                                                      '-xlib', '-xlib-xrender']],
+    'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GDAL/GDAL-2.0.2-intel-2016a-libX11-1.6.3.eb b/easybuild/easyconfigs/g/GDAL/GDAL-2.0.2-intel-2016a-libX11-1.6.3.eb
new file mode 100644
index 000000000000..78e94ccbb60f
--- /dev/null
+++ b/easybuild/easyconfigs/g/GDAL/GDAL-2.0.2-intel-2016a-libX11-1.6.3.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'GDAL'
+version = '2.0.2'
+versionsuffix = '-libX11-1.6.3'
+
+homepage = 'http://www.gdal.org/'
+description = """GDAL is a translator library for raster geospatial data formats that is released under an X/MIT style
+ Open Source license by the Open Source Geospatial Foundation. As a library, it presents a single abstract data model
+ to the calling application for all supported formats. It also comes with a variety of useful commandline utilities for
+ data translation and processing."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://download.osgeo.org/gdal/%(version)s/']
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [
+    ('netCDF', '4.3.3.1'),
+    ('expat', '2.1.0'),
+    ('libxml2', '2.9.3', '-Python-2.7.11%s' % versionsuffix),
+    ('zlib', '1.2.8'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libgdal.%s' % SHLIB_EXT, 'lib/libgdal.a'],
+    'dirs': ['bin', 'include']
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/g/GLib/GLib-2.47.5-intel-2016a-libX11-1.6.3.eb b/easybuild/easyconfigs/g/GLib/GLib-2.47.5-intel-2016a-libX11-1.6.3.eb
new file mode 100644
index 000000000000..a93ed50f9f26
--- /dev/null
+++ b/easybuild/easyconfigs/g/GLib/GLib-2.47.5-intel-2016a-libX11-1.6.3.eb
@@ -0,0 +1,39 @@
+easyblock = 'ConfigureMake'
+
+name = 'GLib'
+version = '2.47.5'
+
+versionsuffix = '-libX11-1.6.3'
+
+homepage = 'http://www.gtk.org/'
+description = """GLib is one of the base libraries of the GTK+ project"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = [FTPGNOME_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+pyver = '2.7.11'
+pyshortver = '.'.join(pyver.split('.')[:2])
+pysuffix = '-Python-%s%s' % (pyver, versionsuffix)
+
+dependencies = [
+    ('libffi', '3.2.1'),
+    ('gettext', '0.19.6'),
+    ('libxml2', '2.9.3', pysuffix),
+    ('PCRE', '8.38'),
+]
+
+builddependencies = [('Python', pyver)]
+
+configopts = "--disable-maintainer-mode --disable-silent-rules --disable-libelf --enable-static --enable-shared"
+
+postinstallcmds = ["sed -i -e 's|#!.*python|#!/usr/bin/env python|' %(installdir)s/bin/*"]
+
+sanity_check_paths = {
+    'files': ['lib/libglib-%(version_major)s.0.a', 'lib/libglib-%%(version_major)s.0.%s' % SHLIB_EXT],
+    'dirs': ['bin', 'include'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-intel-2016a-Python-2.7.11-libX11-1.6.3.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-intel-2016a-Python-2.7.11-libX11-1.6.3.eb
new file mode 100644
index 000000000000..230d903622d9
--- /dev/null
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-intel-2016a-Python-2.7.11-libX11-1.6.3.eb
@@ -0,0 +1,29 @@
+name = 'libxml2'
+version = '2.9.3'
+
+homepage = 'http://xmlsoft.org/'
+description = """Libxml2 is the XML C parser and toolchain developed for the Gnome project (but usable
+ outside of the Gnome platform)."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+source_urls = [
+    'http://xmlsoft.org/sources/',
+    'http://xmlsoft.org/sources/old/'
+]
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB'
+
+pyver = '2.7.11'
+pyshortver = '.'.join(pyver.split('.')[:2])
+libx11suffix = '-libX11-1.6.3'
+versionsuffix = '-Python-%s%s' % (pyver, libx11suffix)
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('Python', pyver, libx11suffix),
+]
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/r/R/R-3.2.3-intel-2016a-libX11-1.6.3.eb b/easybuild/easyconfigs/r/R/R-3.2.3-intel-2016a-libX11-1.6.3.eb
new file mode 100644
index 000000000000..e0608b0939a5
--- /dev/null
+++ b/easybuild/easyconfigs/r/R/R-3.2.3-intel-2016a-libX11-1.6.3.eb
@@ -0,0 +1,453 @@
+name = 'R'
+version = '3.2.3'
+
+libx11 = 'libX11'
+libxver = '1.6.3'
+versionsuffix = '-%s-%s' % (libx11, libxver)
+
+homepage = 'http://www.r-project.org/'
+description = """R is a free software environment for statistical computing and graphics."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://cran.us.r-project.org/src/base/R-%(version_major)s']
+
+preconfigopts = 'BLAS_LIBS="$LIBBLAS" LAPACK_LIBS="$LIBLAPACK"'
+configopts = "--with-lapack --with-blas --with-pic --enable-threads --with-x=yes --enable-R-shlib"
+#Actually use Tcl/Tk
+configopts += ' --with-tcl-config=$EBROOTTCL/lib/tclConfig.sh --with-tk-config=$EBROOTTK/lib/tkConfig.sh '
+# Enable graphics capabilities for plotting.
+configopts += " --with-cairo --with-libpng --with-jpeglib --with-libtiff"
+# some recommended packages may fail in a parallel build (e.g. Matrix), and we're installing them anyway below
+configopts += " --with-recommended-packages=no"
+
+dependencies = [
+    (libx11, libxver),
+    ('libreadline', '6.3'),
+    ('ncurses', '6.0'),
+    ('libpng', '1.6.21'),  # for plotting in R
+    ('libjpeg-turbo', '1.4.2'),  # for plottting in R
+    ('LibTIFF', '4.0.6'), # for plotting in R
+    ('cairo', '1.14.6', versionsuffix), # for plotting in R
+    ('Java', '1.8.0_72', '', True),  # Java bindings are built if Java is found, might as well provide it
+    ('Tcl', '8.6.4'),  # for tcltk
+    ('Tk', '8.6.4', versionsuffix),  # for tcltk
+    ('cURL', '7.47.0'),  # for RCurl
+    ('libxml2', '2.9.3', '-Python-2.7.11%s' % versionsuffix),  # for XML
+    ('GDAL', '2.0.2', versionsuffix),  # for rgdal
+    ('PROJ', '4.9.2'), # for rgdal
+]
+
+name_tmpl = '%(name)s_%(version)s.tar.gz'
+ext_options = {
+    'source_urls': [
+        'http://cran.r-project.org/src/contrib/Archive/%(name)s',  # package archive
+        'http://cran.r-project.org/src/contrib/',  # current version of packages
+        'http://cran.freestatistics.org/src/contrib',  # mirror alternative for current packages
+    ],
+    'source_tmpl': name_tmpl,
+}
+
+
+# !! order of packages is important !!
+# packages updated on January 21st 2016
+exts_list = [
+    # default libraries, only here to sanity check their presence
+    'base',
+    'datasets',
+    'graphics',
+    'grDevices',
+    'grid',
+    'methods',
+    'splines',
+    'stats',
+    'stats4',
+    'tools',
+    'utils',
+    # non-standard libraries, should be specified with fixed versions!
+    ('Rmpi', '0.6-5', dict(ext_options.items() + [('patches', ['Rmpi-0.6-5_impi5.patch'])])),
+    ('abind', '1.4-3', ext_options),
+    ('magic', '1.5-6', ext_options),
+    ('geometry', '0.3-6', dict(ext_options.items() + [('patches', ['geometry-0.3-4-icc.patch'])])),
+    ('bit', '1.1-12', ext_options),
+    ('filehash', '2.3', ext_options),
+    ('ff', '2.2-13', ext_options),
+    ('bnlearn', '3.9', ext_options),
+    ('bootstrap', '2015.2', ext_options),
+    ('combinat', '0.0-8', ext_options),
+    ('deal', '1.2-37', ext_options),
+    ('fdrtool', '1.2.15', ext_options),
+    ('formatR', '1.2.1', ext_options),
+    ('gtools', '3.5.0', ext_options),
+    ('gdata', '2.17.0', ext_options),
+    ('GSA', '1.03', ext_options),
+    ('highr', '0.5.1', ext_options),
+    ('infotheo', '1.2.0', ext_options),
+    ('lars', '1.2', ext_options),
+    ('lazy', '1.2-15', ext_options),
+    ('kernlab', '0.9-22', ext_options),
+    ('mime', '0.4', ext_options),
+    ('markdown', '0.7.7', ext_options),
+    ('mlbench', '2.1-1', ext_options),
+    ('NLP', '0.1-8', ext_options),
+    ('mclust', '5.1', ext_options),
+    ('RANN', '2.5', ext_options),
+    ('rmeta', '2.16', ext_options),
+    ('segmented', '0.5-1.4', ext_options),
+    ('som', '0.3-5', ext_options),
+    ('SuppDists', '1.1-9.1', ext_options),
+    ('stabledist', '0.7-0', ext_options),
+    ('survivalROC', '1.0.3', ext_options),
+    ('pspline', '1.0-17', ext_options),
+    ('timeDate', '3012.100', ext_options),
+    ('longmemo', '1.0-0', ext_options),
+    ('ADGofTest', '0.3', ext_options),
+    ('ade4', '1.7-3', ext_options),
+    ('AlgDesign', '1.1-7.3', ext_options),
+    ('base64enc', '0.1-3', ext_options),
+    ('BH', '1.60.0-1', ext_options),
+    ('brew', '1.0-6', ext_options),
+    ('Brobdingnag', '1.2-4', ext_options),
+    ('corpcor', '1.6.8', ext_options),
+    ('longitudinal', '1.1.12', ext_options),
+    ('checkmate', '1.6.3', ext_options),
+    ('cubature', '1.1-2', ext_options),
+    ('DEoptimR', '1.0-4', ext_options),
+    ('digest', '0.6.8', ext_options),
+    ('fastmatch', '1.0-4', ext_options),
+    ('ffbase', '0.12.1', ext_options),
+    ('iterators', '1.0.8', ext_options),
+    ('maps', '3.0.2', ext_options),
+    ('nnls', '1.4', ext_options),
+    ('sendmailR', '1.2-1', ext_options),
+    ('spam', '1.3-0', ext_options),
+    ('subplex', '1.1-6', ext_options),
+    ('stringi', '1.0-1', ext_options),
+    ('magrittr', '1.5', ext_options),
+    ('stringr', '1.0.0', ext_options),
+    ('evaluate', '0.8', ext_options),
+    ('logspline', '2.1.8', ext_options),
+    ('ncbit', '2013.03.29', ext_options),
+    ('permute', '0.8-4', ext_options),
+    ('plotrix', '3.6-1', ext_options),
+    ('randomForest', '4.6-12', ext_options),
+    ('scatterplot3d', '0.3-36', ext_options),
+    ('SparseM', '1.7', ext_options),
+    ('tripack', '1.3-7', ext_options),
+    ('irace', '1.07', ext_options),
+    ('rJava', '0.9-7', ext_options),
+    ('lattice', '0.20-33', ext_options),
+    ('RColorBrewer', '1.1-2', ext_options),
+    ('latticeExtra', '0.6-26', ext_options),
+    ('Matrix', '1.2-3', ext_options),
+    ('png', '0.1-7', ext_options),
+    ('Rcpp', '0.12.2', ext_options),
+    ('RcppArmadillo', '0.6.400.2.2', ext_options),
+    ('plyr', '1.8.3', ext_options),
+    ('pROC', '1.8', ext_options),
+    ('quadprog', '1.5-5', ext_options),
+    ('BB', '2014.10-1', ext_options),
+    ('BBmisc', '1.9', ext_options),
+    ('fail', '1.3', ext_options),
+    ('rlecuyer', '0.3-4', ext_options),
+    ('snow', '0.4-1', ext_options),
+    ('MASS', '7.3-45', ext_options),
+    ('tree', '1.0-36', ext_options),
+    ('pls', '2.5-0', ext_options),
+    ('class', '7.3-14', ext_options),
+    ('e1071', '1.6-7', ext_options),
+    ('nnet', '7.3-11', ext_options),
+    ('nlme', '3.1-122', ext_options),
+    ('minqa', '1.2.4', ext_options),
+    ('RcppEigen', '0.3.2.5.1', ext_options),
+    ('MatrixModels', '0.4-1', ext_options),
+    ('quantreg', '5.19', ext_options),
+    ('mgcv', '1.8-10', ext_options),
+    ('colorspace', '1.2-6', ext_options),
+    ('robustbase', '0.92-5', ext_options),
+    ('sp', '1.2-1', ext_options),
+    ('zoo', '1.7-12', ext_options),
+    ('lmtest', '0.9-34', ext_options),
+    ('vcd', '1.4-1', ext_options),
+    ('snowfall', '1.84-6.1', ext_options),
+    ('rpart', '4.1-10', ext_options),
+    ('survival', '2.38-3', ext_options),
+    ('mice', '2.25', ext_options),
+    ('urca', '1.2-8', ext_options),
+    ('fracdiff', '1.4-2', ext_options),
+    ('logistf', '1.21', ext_options), 
+    ('akima', '0.5-12', ext_options),
+    ('bitops', '1.0-6', ext_options),
+    ('boot', '1.3-17', ext_options),
+    ('mixtools', '1.0.3', ext_options),
+    ('cluster', '2.0.3', ext_options),
+    ('gclus', '1.3.1', ext_options),
+    ('coda', '0.18-1', ext_options),
+    ('codetools', '0.2-14', ext_options),
+    ('foreach', '1.4.3', ext_options),
+    ('doMC', '1.3.4', ext_options),
+    ('DBI', '0.3.1', ext_options),
+    ('foreign', '0.8-66', ext_options),
+    ('gam', '1.12', ext_options),
+    ('gamlss.data', '4.3-2', ext_options),
+    ('gamlss.dist', '4.3-5', ext_options),
+    ('hwriter', '1.3.2', ext_options),
+    ('KernSmooth', '2.23-15', ext_options),
+    ('xts', '0.9-7', ext_options),
+    ('TTR', '0.23-0', ext_options),
+    ('quantmod', '0.4-5', ext_options),
+    ('mnormt', '1.5-3', ext_options),
+    ('mvtnorm', '1.0-3', ext_options),
+    ('pcaPP', '1.9-60', ext_options),
+    ('numDeriv', '2014.2-1', ext_options),
+    ('lava', '1.4.1', ext_options),
+    ('prodlim', '1.5.7', ext_options),
+    ('pscl', '1.4.9', ext_options),
+    ('RSQLite', '1.0.0', ext_options),
+    ('BatchJobs', '1.6', ext_options),
+    ('sandwich', '2.3-4', ext_options),
+    ('sfsmisc', '1.0-28', ext_options),
+    ('spatial', '7.3-11', ext_options),
+    ('VGAM', '1.0-0', ext_options),
+    ('waveslim', '1.7.5', ext_options),
+    ('xtable', '1.8-0', ext_options),
+    ('profileModel', '0.5-9', ext_options),
+    ('brglm', '0.5-9', ext_options),
+    ('deSolve', '1.12', ext_options),
+    ('tseriesChaos', '0.1-13', ext_options),
+    ('tseries', '0.10-34', ext_options),
+    ('fastICA', '1.2-0', ext_options),
+    ('R.methodsS3', '1.7.0', ext_options),
+    ('R.oo', '1.19.0', ext_options),
+    ('cgdsr', '1.2.5', ext_options),
+    ('R.utils', '2.2.0', ext_options),
+    ('R.matlab', '3.3.0', ext_options),
+    ('gbm', '2.1.1', ext_options),
+    ('dichromat', '2.0-0', ext_options),
+    ('Formula', '1.2-1', ext_options),
+    ('acepack', '1.3-3.3', ext_options),
+    ('reshape2', '1.4.1', ext_options),
+    ('gtable', '0.1.2', ext_options),
+    ('munsell', '0.4.2', ext_options),
+    ('labeling', '0.3', ext_options),
+    ('scales', '0.3.0', ext_options),
+    ('proto', '0.3-10', ext_options),
+    ('ggplot2', '2.0.0', ext_options),
+    ('gridExtra', '2.0.0', ext_options),
+    ('Hmisc', '3.17-1', ext_options),
+    ('fastcluster', '1.1.16', ext_options),
+    ('chron', '2.3-47', ext_options),
+    ('data.table', '1.9.6', ext_options),
+    ('registry', '0.3', ext_options),
+    ('pkgmaker', '0.22', ext_options),
+    ('rngtools', '1.2.4', ext_options),
+    ('doParallel', '1.0.10', ext_options),
+    ('gridBase', '0.4-7', ext_options),
+    ('NMF', '0.20.6', ext_options),
+    ('irlba', '2.0.0', ext_options),
+    ('igraph', '1.0.1', ext_options),
+    ('GeneNet', '1.2.13', ext_options),
+    ('ape', '3.4', ext_options),
+    ('htmltools', '0.3', ext_options),
+    ('RJSONIO', '1.3-0', ext_options),
+    ('caTools', '1.17.1', ext_options),
+    ('gplots', '2.17.0', ext_options),
+    ('ROCR', '1.0-7', ext_options),
+    ('httpuv', '1.3.3', ext_options),
+    ('R6', '2.1.1', ext_options),
+    ('jsonlite', '0.9.19', ext_options),
+    ('rjson', '0.2.15', ext_options),
+    ('shiny', '0.12.2', ext_options),
+    ('seqinr', '3.1-3', ext_options),
+    ('LearnBayes', '2.15', ext_options),
+    ('deldir', '0.1-9', ext_options),
+    ('spdep', '0.5-92', ext_options),
+    ('assertthat', '0.1', ext_options),
+    ('lazyeval', '0.1.10', ext_options),
+    ('dplyr', '0.4.3', ext_options),
+    ('adegenet', '2.0.0', ext_options),
+    ('rncl', '0.6.0', ext_options),
+    ('XML', '3.98-1.3', ext_options),
+    ('memoise', '0.2.1', ext_options),
+    ('crayon', '1.3.1', ext_options),
+    ('praise', '1.0.0', ext_options),
+    ('testthat', '0.11.0', ext_options),
+    ('yaml', '2.1.13', ext_options),
+    ('knitr', '1.11', ext_options),
+    ('rmarkdown', '0.9.2', ext_options),
+    ('curl', '0.9.4', ext_options),
+    ('httr', '1.0.0', ext_options),
+    ('reshape', '0.8.5', ext_options),
+    ('bold', '0.3.0', ext_options),
+    ('taxize', '0.7.0', ext_options),
+    ('tidyr', '0.3.1', ext_options),
+    ('uuid', '0.1-2', ext_options),
+    ('RNeXML', '2.0.5', ext_options),
+    ('phylobase', '0.8.0', ext_options),
+    ('adephylo', '1.1-6', ext_options),
+    ('animation', '2.4', ext_options),
+    ('bigmemory.sri', '0.1.3', ext_options),
+    ('bigmemory', '4.5.8', dict(ext_options.items() + [('patches', ['bigmemory-4.5.8_icpc-wd308.patch'])])),
+    ('calibrate', '1.7.2', ext_options),
+    ('clusterGeneration', '1.3.4', ext_options),
+    ('raster', '2.5-2', ext_options),
+    ('dismo', '1.0-12', ext_options),
+    ('expm', '0.999-0', ext_options),
+    ('extrafontdb', '1.0', ext_options),
+    ('Rttf2pt1', '1.3.3', ext_options),
+    ('extrafont', '0.17', ext_options),
+    ('fields', '8.3-6', ext_options),
+    ('shapefiles', '0.7', ext_options),
+    ('fossil', '0.3.7', ext_options),
+    ('geiger', '2.0.6', ext_options),
+    ('glmnet', '2.0-2', ext_options),
+    ('rgl', '0.95.1441', ext_options),
+    ('labdsv', '1.7-0', ext_options),
+    ('stabs', '0.5-1', ext_options),
+    ('mboost', '2.5-0', ext_options),
+    ('msm', '1.6', ext_options),
+    ('nor1mix', '1.2-1', ext_options),
+    ('np', '0.60-2', ext_options),
+    ('polynom', '1.3-8', ext_options),
+    ('polspline', '1.1.12', ext_options),
+    ('TH.data', '1.0-6', ext_options),
+    ('multcomp', '1.4-1', ext_options),
+    ('rms', '4.4-1', ext_options),
+    ('RWekajars', '3.7.12-1', ext_options),
+    ('RWeka', '0.4-24', ext_options),
+    ('slam', '0.1-32', ext_options),
+    ('tm', '0.6-2', ext_options),
+    ('TraMineR', '1.8-11', ext_options),
+    ('chemometrics', '1.3.9', ext_options),
+    ('FNN', '1.1', ext_options),
+    ('ipred', '0.9-5', ext_options),
+    ('statmod', '1.4.23', ext_options),
+    ('miscTools', '0.6-16', ext_options),
+    ('maxLik', '1.3-4', ext_options),
+    ('mlogit', '0.2-4', ext_options),
+    ('getopt', '1.20.0', ext_options),
+    ('gsalib', '2.1', ext_options),
+    ('optparse', '1.3.2', ext_options),
+    ('klaR', '0.6-12', ext_options),
+    ('neuRosim', '0.2-12', ext_options),
+    ('locfit', '1.5-9.1', ext_options),
+    ('GGally', '1.0.0', ext_options),
+    ('beanplot', '1.2', ext_options),
+    ('clValid', '0.6-6', ext_options),
+    ('matrixStats', '0.50.1', ext_options),
+    ('DiscriMiner', '0.1-29', ext_options),
+    ('ellipse', '0.3-8', ext_options),
+    ('leaps', '2.9', ext_options),
+    ('nloptr', '1.0.4', ext_options),
+    ('lme4', '1.1-10', ext_options),
+    ('pbkrtest', '0.4-4', ext_options),
+    ('car', '2.1-1', ext_options),
+    ('flashClust', '1.01-2', ext_options),
+    ('FactoMineR', '1.31.4', ext_options),
+    ('modeltools', '0.2-21', ext_options),
+    ('flexclust', '1.3-4', ext_options),
+    ('flexmix', '2.3-13', ext_options),
+    ('prabclus', '2.2-6', ext_options),
+    ('diptest', '0.75-7', ext_options),
+    ('trimcluster', '0.1-2', ext_options),
+    ('fpc', '2.1-10', ext_options),
+    ('BiasedUrn', '1.07', ext_options),
+    ('TeachingDemos', '2.9', ext_options),
+    ('kohonen', '2.0.19', ext_options),
+    ('base64', '1.1', ext_options),
+    ('doRNG', '1.6', ext_options),
+    ('nleqslv', '2.9.1', ext_options),
+    ('RGCCA', '2.0', ext_options),
+    ('pheatmap', '1.0.8', ext_options),
+    ('openxlsx', '3.0.0', ext_options),
+    ('pvclust', '2.0-0', ext_options),
+    ('RCircos', '1.1.3', ext_options),
+    ('lambda.r', '1.1.7', ext_options),
+    ('futile.options', '1.0.0', ext_options),
+    ('futile.logger', '1.4.1', ext_options),
+    ('VennDiagram', '1.6.16', ext_options),
+    ('xlsxjars', '0.6.1', ext_options),
+    ('xlsx', '0.5.7', ext_options),
+    ('vegan', '2.3-2', ext_options),
+    ('forecast', '6.1', dict(ext_options.items() + [('patches', ['forecast-6.1_icpc-wd308.patch'])])),
+    ('fma', '2.01', ext_options),
+    ('expsmooth', '2.3', ext_options),
+    ('fpp', '0.5', ext_options),
+    ('maptools', '0.8-37', ext_options),
+    ('deldir', '0.1-9', ext_options),
+    ('tensor', '1.5', ext_options),
+    ('polyclip', '1.3-2', ext_options),
+    ('goftest', '1.0-3', ext_options),
+    ('spatstat', '1.44-1', ext_options),
+    ('rgdal', '1.1-3', ext_options),
+    ('gdalUtils', '2.0.1.7', ext_options),
+    ('pracma', '1.8.8', ext_options),
+    ('RCurl', '1.95-4.7', ext_options),
+    ('bio3d', '2.2-4', ext_options),
+    ('AUC', '0.3.0', ext_options),
+    ('interpretR', '0.2.3', ext_options),
+    ('SuperLearner', '2.0-15', ext_options),
+    ('lpSolve', '5.6.13', ext_options),
+    ('mediation', '4.4.5', ext_options),
+    ('caret', '6.0-64', ext_options),
+    ('adabag', '4.1', ext_options),
+    ('parallelMap', '1.3', ext_options),
+    ('ParamHelpers', '1.6', ext_options),
+    ('ggvis', '0.4.2', ext_options),
+    ('mlr', '2.7', ext_options),
+    ('unbalanced', '2.0', ext_options),
+    ('RSNNS', '0.4-7', ext_options),
+    ('abc.data', '1.0', ext_options),
+    ('abc', '2.1', ext_options),
+    ('lhs', '0.10', ext_options),
+    ('tensorA', '0.36', ext_options),
+    ('EasyABC', '1.5', ext_options),
+    ('shape', '1.4.2', ext_options),
+    ('whisker', '0.3-2', ext_options),
+    ('rstudioapi', '0.4.0', ext_options),
+    ('roxygen2', '5.0.1', ext_options),
+    ('git2r', '0.13.1', ext_options),
+    ('xml2', '0.1.2', ext_options),
+    ('rversions', '1.0.2', ext_options),
+    ('devtools', '1.9.1', ext_options),
+    ('Rook', '1.1-1', ext_options),
+    ('rjson', '0.2.15', ext_options),
+    ('Cairo', '1.5-9', ext_options),
+    ('RMTstat', '0.3', ext_options),
+    ('Lmoments', '1.1-6', ext_options),
+    ('distillery', '1.0-2', ext_options),
+    ('extRemes', '2.0-7', ext_options),
+    ('pixmap', '0.4-11', ext_options),
+    ('tkrplot', '0.0-23', ext_options),
+    ('misc3d', '0.8-4', ext_options),
+    ('multicool', '0.1-9', dict(ext_options.items() + [('patches', [('multicool-0.1-9_icpc-wd308.patch', 1)])])),
+    ('ks', '1.10.1', ext_options),
+    ('logcondens', '2.1.4', ext_options),
+    ('Iso', '0.0-17', ext_options),
+    ('penalized', '0.9-45', ext_options),
+    ('coin', '1.1-2', ext_options),
+    ('clusterRepro', '0.5-1.1', ext_options),
+    ('randomForestSRC', '2.0.7', ext_options),
+    ('sm', '2.2-5.4', ext_options),
+    ('psych', '1.5.8', ext_options),
+    ('pbivnorm', '0.6.0', ext_options),
+    ('lavaan', '0.5-20', ext_options),
+    ('matrixcalc', '1.0-3', ext_options),
+    ('arm', '1.8-6', ext_options),
+    ('mi', '1.0', ext_options),
+    ('htmlwidgets', '0.6', ext_options),
+    ('visNetwork', '0.2.1', ext_options),
+    ('DiagrammeR', '0.8.2', ext_options),
+    ('sem', '3.1-6', ext_options),
+    ('jpeg', '0.1-8', ext_options),
+    ('sna', '2.3-2', ext_options),
+    ('glasso', '1.8', dict(ext_options.items() + [('patches', [('glasso-1.8-ifort-no-fixed.patch', 1)])])),
+    ('huge', '1.2.7', ext_options),
+    ('d3Network', '0.5.2.1', ext_options),
+    ('ggm', '2.3', ext_options),
+    ('qgraph', '1.3.2', ext_options),
+    ('diveRsity', '1.9.89', ext_options),
+]
+
+moduleclass = 'lang'

From 9a96199c4192b0b8fee1479c25a43b14b630a5fd Mon Sep 17 00:00:00 2001
From: Balazs Hajgato <hajgato@vub.ac.be>
Date: Fri, 4 Mar 2016 10:18:25 +0100
Subject: [PATCH 2/6] X libs are fixed

---
 .../l/libXmu/libXmu-1.1.2-intel-2016a.eb      | 25 +++++++++++++++++++
 .../l/libXpm/libXpm-3.5.11-intel-2016a.eb     | 22 ++++++++++++++++
 .../r/R/R-3.2.3-intel-2016a-libX11-1.6.3.eb   |  2 ++
 3 files changed, 49 insertions(+)
 create mode 100644 easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-intel-2016a.eb
 create mode 100644 easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-intel-2016a.eb

diff --git a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-intel-2016a.eb b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-intel-2016a.eb
new file mode 100644
index 000000000000..5611aadb4b8f
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-intel-2016a.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'libXmu'
+version = '1.1.2'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """libXmu provides a set of miscellaneous utility convenience functions for X libraries to use.
+ libXmuu is a lighter-weight version that does not depend on libXt or libXext"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'optarch': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+dependencies = [
+    ('libXt', '1.1.5'),
+    ('libXpm', '3.5.11'),
+]
+sanity_check_paths = {
+    'files': ['lib/%s' % x for x in ['%(name)s.a', '%%(name)s.%s' % SHLIB_EXT]],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-intel-2016a.eb b/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-intel-2016a.eb
new file mode 100644
index 000000000000..80b08e79227d
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-intel-2016a.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'libXpm'
+version = '3.5.11'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """libXp provides the X print library."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'optarch': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+builddependencies = [('gettext', '0.19.6')]
+
+sanity_check_paths = {
+    'files': ['lib/%s' % x for x in ['libXpm.a', 'libXpm.%s' % SHLIB_EXT]],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/r/R/R-3.2.3-intel-2016a-libX11-1.6.3.eb b/easybuild/easyconfigs/r/R/R-3.2.3-intel-2016a-libX11-1.6.3.eb
index e0608b0939a5..61bf28051c3c 100644
--- a/easybuild/easyconfigs/r/R/R-3.2.3-intel-2016a-libX11-1.6.3.eb
+++ b/easybuild/easyconfigs/r/R/R-3.2.3-intel-2016a-libX11-1.6.3.eb
@@ -24,6 +24,8 @@ configopts += " --with-recommended-packages=no"
 
 dependencies = [
     (libx11, libxver),
+    ('libXt', '1.1.5'),
+    ('libXmu', '1.1.2'),
     ('libreadline', '6.3'),
     ('ncurses', '6.0'),
     ('libpng', '1.6.21'),  # for plotting in R

From 8aa7badee4c785afcbf70c2cf8351efb7a0826fc Mon Sep 17 00:00:00 2001
From: Balazs Hajgato <hajgato@vub.ac.be>
Date: Fri, 4 Mar 2016 10:41:31 +0100
Subject: [PATCH 3/6] GLib builddependency fixed (to use Python with X)

---
 .../easyconfigs/g/GLib/GLib-2.47.5-intel-2016a-libX11-1.6.3.eb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/easybuild/easyconfigs/g/GLib/GLib-2.47.5-intel-2016a-libX11-1.6.3.eb b/easybuild/easyconfigs/g/GLib/GLib-2.47.5-intel-2016a-libX11-1.6.3.eb
index a93ed50f9f26..3ae73ffc007d 100644
--- a/easybuild/easyconfigs/g/GLib/GLib-2.47.5-intel-2016a-libX11-1.6.3.eb
+++ b/easybuild/easyconfigs/g/GLib/GLib-2.47.5-intel-2016a-libX11-1.6.3.eb
@@ -15,7 +15,6 @@ source_urls = [FTPGNOME_SOURCE]
 sources = [SOURCELOWER_TAR_XZ]
 
 pyver = '2.7.11'
-pyshortver = '.'.join(pyver.split('.')[:2])
 pysuffix = '-Python-%s%s' % (pyver, versionsuffix)
 
 dependencies = [
@@ -25,7 +24,7 @@ dependencies = [
     ('PCRE', '8.38'),
 ]
 
-builddependencies = [('Python', pyver)]
+builddependencies = [('Python', pyver, versionsuffix)]
 
 configopts = "--disable-maintainer-mode --disable-silent-rules --disable-libelf --enable-static --enable-shared"
 

From 16dfb07be9d450b2658fdee641b29c0657aeae2f Mon Sep 17 00:00:00 2001
From: Balazs Hajgato <hajgato@vub.ac.be>
Date: Fri, 4 Mar 2016 19:50:01 +0100
Subject: [PATCH 4/6] Glib libxml2 dep without Python

---
 .../cairo-1.14.6-intel-2016a-libX11-1.6.3.eb  | 56 -------------------
 .../GDAL-2.0.2-intel-2016a-libX11-1.6.3.eb    | 30 ----------
 .../GLib-2.47.5-intel-2016a-libX11-1.6.3.eb   | 38 -------------
 ...-intel-2016a-Python-2.7.11-libX11-1.6.3.eb | 29 ----------
 .../r/R/R-3.2.3-intel-2016a-libX11-1.6.3.eb   |  6 +-
 5 files changed, 3 insertions(+), 156 deletions(-)
 delete mode 100644 easybuild/easyconfigs/c/cairo/cairo-1.14.6-intel-2016a-libX11-1.6.3.eb
 delete mode 100644 easybuild/easyconfigs/g/GDAL/GDAL-2.0.2-intel-2016a-libX11-1.6.3.eb
 delete mode 100644 easybuild/easyconfigs/g/GLib/GLib-2.47.5-intel-2016a-libX11-1.6.3.eb
 delete mode 100644 easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-intel-2016a-Python-2.7.11-libX11-1.6.3.eb

diff --git a/easybuild/easyconfigs/c/cairo/cairo-1.14.6-intel-2016a-libX11-1.6.3.eb b/easybuild/easyconfigs/c/cairo/cairo-1.14.6-intel-2016a-libX11-1.6.3.eb
deleted file mode 100644
index 6db4212fb31d..000000000000
--- a/easybuild/easyconfigs/c/cairo/cairo-1.14.6-intel-2016a-libX11-1.6.3.eb
+++ /dev/null
@@ -1,56 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'cairo'
-version = '1.14.6'
-
-libx11 = 'libX11'
-libxver = '1.6.3' 
-versionsuffix = '-%s-%s' % (libx11, libxver)
-
-homepage = 'http://cairographics.org'
-description = """Cairo is a 2D graphics library with support for multiple output devices.
- Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers,
- PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB"""
-
-toolchain = {'name': 'intel', 'version': '2016a'}
-
-source_urls = ['http://cairographics.org/releases/']
-sources = [SOURCE_TAR_XZ]
-
-glibver = '2.47.5'
-
-builddependencies = [
-    ('renderproto', '0.11'),
-]
-
-dependencies = [
-    (libx11, libxver),
-    ('libXrender', '0.9.9'),
-    ('libdrm', '2.4.67'),
-    ('bzip2', '1.0.6'),
-    ('zlib', '1.2.8'),
-    ('libpng', '1.6.21'),
-    ('freetype', '2.6.2'),
-    ('pixman', '0.34.0'),
-    ('fontconfig', '2.11.94'),
-    ('expat', '2.1.0'),
-    ('GLib', glibver, versionsuffix),
-]
-
-# disable symbol lookup, which requires -lbfd, to avoid link issues with (non-PIC) libiberty.a provided by GCC
-configopts = "--enable-symbol-lookup=no --enable-gobject=yes --enable-svg=yes --enable-tee=yes "
-
-# workaround for "hidden symbol .* in .* is referenced by DSO" and "ld: final link failed: Bad value"
-buildopts = 'LD="$CC" LDFLAGS="$LDFLAGS -shared-intel"'
-
-sanity_check_paths = {
-    'files': ['bin/cairo-trace', 'lib/cairo/libcairo-trace.so', 'lib/cairo/libcairo-trace.a',
-              'lib/libcairo.a', 'lib/libcairo-gobject.a', 'lib/libcairo-script-interpreter.a',
-              'lib/libcairo-gobject.so', 'lib/libcairo-script-interpreter.so', 'lib/libcairo.so'] +
-             ['include/cairo/cairo%s.h' % x for x in ['', '-deprecated', '-features', '-ft', '-gobject', '-pdf', '-ps',
-                                                      '-script', '-script-interpreter', '-svg', '-version', '-xcb',
-                                                      '-xlib', '-xlib-xrender']],
-    'dirs': ['lib/pkgconfig'],
-}
-
-moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GDAL/GDAL-2.0.2-intel-2016a-libX11-1.6.3.eb b/easybuild/easyconfigs/g/GDAL/GDAL-2.0.2-intel-2016a-libX11-1.6.3.eb
deleted file mode 100644
index 78e94ccbb60f..000000000000
--- a/easybuild/easyconfigs/g/GDAL/GDAL-2.0.2-intel-2016a-libX11-1.6.3.eb
+++ /dev/null
@@ -1,30 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'GDAL'
-version = '2.0.2'
-versionsuffix = '-libX11-1.6.3'
-
-homepage = 'http://www.gdal.org/'
-description = """GDAL is a translator library for raster geospatial data formats that is released under an X/MIT style
- Open Source license by the Open Source Geospatial Foundation. As a library, it presents a single abstract data model
- to the calling application for all supported formats. It also comes with a variety of useful commandline utilities for
- data translation and processing."""
-
-toolchain = {'name': 'intel', 'version': '2016a'}
-
-source_urls = ['http://download.osgeo.org/gdal/%(version)s/']
-sources = [SOURCELOWER_TAR_XZ]
-
-dependencies = [
-    ('netCDF', '4.3.3.1'),
-    ('expat', '2.1.0'),
-    ('libxml2', '2.9.3', '-Python-2.7.11%s' % versionsuffix),
-    ('zlib', '1.2.8'),
-]
-
-sanity_check_paths = {
-    'files': ['lib/libgdal.%s' % SHLIB_EXT, 'lib/libgdal.a'],
-    'dirs': ['bin', 'include']
-}
-
-moduleclass = 'data'
diff --git a/easybuild/easyconfigs/g/GLib/GLib-2.47.5-intel-2016a-libX11-1.6.3.eb b/easybuild/easyconfigs/g/GLib/GLib-2.47.5-intel-2016a-libX11-1.6.3.eb
deleted file mode 100644
index 3ae73ffc007d..000000000000
--- a/easybuild/easyconfigs/g/GLib/GLib-2.47.5-intel-2016a-libX11-1.6.3.eb
+++ /dev/null
@@ -1,38 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'GLib'
-version = '2.47.5'
-
-versionsuffix = '-libX11-1.6.3'
-
-homepage = 'http://www.gtk.org/'
-description = """GLib is one of the base libraries of the GTK+ project"""
-
-toolchain = {'name': 'intel', 'version': '2016a'}
-toolchainopts = {'optarch': True, 'pic': True}
-
-source_urls = [FTPGNOME_SOURCE]
-sources = [SOURCELOWER_TAR_XZ]
-
-pyver = '2.7.11'
-pysuffix = '-Python-%s%s' % (pyver, versionsuffix)
-
-dependencies = [
-    ('libffi', '3.2.1'),
-    ('gettext', '0.19.6'),
-    ('libxml2', '2.9.3', pysuffix),
-    ('PCRE', '8.38'),
-]
-
-builddependencies = [('Python', pyver, versionsuffix)]
-
-configopts = "--disable-maintainer-mode --disable-silent-rules --disable-libelf --enable-static --enable-shared"
-
-postinstallcmds = ["sed -i -e 's|#!.*python|#!/usr/bin/env python|' %(installdir)s/bin/*"]
-
-sanity_check_paths = {
-    'files': ['lib/libglib-%(version_major)s.0.a', 'lib/libglib-%%(version_major)s.0.%s' % SHLIB_EXT],
-    'dirs': ['bin', 'include'],
-}
-
-moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-intel-2016a-Python-2.7.11-libX11-1.6.3.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-intel-2016a-Python-2.7.11-libX11-1.6.3.eb
deleted file mode 100644
index 230d903622d9..000000000000
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-intel-2016a-Python-2.7.11-libX11-1.6.3.eb
+++ /dev/null
@@ -1,29 +0,0 @@
-name = 'libxml2'
-version = '2.9.3'
-
-homepage = 'http://xmlsoft.org/'
-description = """Libxml2 is the XML C parser and toolchain developed for the Gnome project (but usable
- outside of the Gnome platform)."""
-
-toolchain = {'name': 'intel', 'version': '2016a'}
-toolchainopts = {'pic': True}
-
-source_urls = [
-    'http://xmlsoft.org/sources/',
-    'http://xmlsoft.org/sources/old/'
-]
-sources = [SOURCELOWER_TAR_GZ]
-
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB'
-
-pyver = '2.7.11'
-pyshortver = '.'.join(pyver.split('.')[:2])
-libx11suffix = '-libX11-1.6.3'
-versionsuffix = '-Python-%s%s' % (pyver, libx11suffix)
-
-dependencies = [
-    ('zlib', '1.2.8'),
-    ('Python', pyver, libx11suffix),
-]
-
-moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/r/R/R-3.2.3-intel-2016a-libX11-1.6.3.eb b/easybuild/easyconfigs/r/R/R-3.2.3-intel-2016a-libX11-1.6.3.eb
index 61bf28051c3c..8df021253b09 100644
--- a/easybuild/easyconfigs/r/R/R-3.2.3-intel-2016a-libX11-1.6.3.eb
+++ b/easybuild/easyconfigs/r/R/R-3.2.3-intel-2016a-libX11-1.6.3.eb
@@ -31,13 +31,13 @@ dependencies = [
     ('libpng', '1.6.21'),  # for plotting in R
     ('libjpeg-turbo', '1.4.2'),  # for plottting in R
     ('LibTIFF', '4.0.6'), # for plotting in R
-    ('cairo', '1.14.6', versionsuffix), # for plotting in R
+    ('cairo', '1.14.6'), # for plotting in R
     ('Java', '1.8.0_72', '', True),  # Java bindings are built if Java is found, might as well provide it
     ('Tcl', '8.6.4'),  # for tcltk
     ('Tk', '8.6.4', versionsuffix),  # for tcltk
     ('cURL', '7.47.0'),  # for RCurl
-    ('libxml2', '2.9.3', '-Python-2.7.11%s' % versionsuffix),  # for XML
-    ('GDAL', '2.0.2', versionsuffix),  # for rgdal
+    ('libxml2', '2.9.3'),  # for XML
+    ('GDAL', '2.0.2'),  # for rgdal
     ('PROJ', '4.9.2'), # for rgdal
 ]
 

From c1dbd131ac40d265ea7549d5973e94535fa2c4ad Mon Sep 17 00:00:00 2001
From: Balazs Hajgato <hajgato@vub.ac.be>
Date: Fri, 4 Mar 2016 19:59:36 +0100
Subject: [PATCH 5/6] extra empty line deleted

---
 easybuild/easyconfigs/r/R/R-3.2.3-intel-2016a-libX11-1.6.3.eb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/easybuild/easyconfigs/r/R/R-3.2.3-intel-2016a-libX11-1.6.3.eb b/easybuild/easyconfigs/r/R/R-3.2.3-intel-2016a-libX11-1.6.3.eb
index 8df021253b09..60dfecc0d6dd 100644
--- a/easybuild/easyconfigs/r/R/R-3.2.3-intel-2016a-libX11-1.6.3.eb
+++ b/easybuild/easyconfigs/r/R/R-3.2.3-intel-2016a-libX11-1.6.3.eb
@@ -51,7 +51,6 @@ ext_options = {
     'source_tmpl': name_tmpl,
 }
 
-
 # !! order of packages is important !!
 # packages updated on January 21st 2016
 exts_list = [

From ffad529c31ea9063db8f1c77be441b4ff544589b Mon Sep 17 00:00:00 2001
From: Balazs Hajgato <hajgato@vub.ac.be>
Date: Tue, 8 Mar 2016 21:04:16 +0100
Subject: [PATCH 6/6] diSNOW added

---
 easybuild/easyconfigs/r/R/R-3.2.3-intel-2016a-libX11-1.6.3.eb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/easybuild/easyconfigs/r/R/R-3.2.3-intel-2016a-libX11-1.6.3.eb b/easybuild/easyconfigs/r/R/R-3.2.3-intel-2016a-libX11-1.6.3.eb
index 60dfecc0d6dd..49fadf4c1f30 100644
--- a/easybuild/easyconfigs/r/R/R-3.2.3-intel-2016a-libX11-1.6.3.eb
+++ b/easybuild/easyconfigs/r/R/R-3.2.3-intel-2016a-libX11-1.6.3.eb
@@ -449,6 +449,7 @@ exts_list = [
     ('ggm', '2.3', ext_options),
     ('qgraph', '1.3.2', ext_options),
     ('diveRsity', '1.9.89', ext_options),
+    ('doSNOW', '1.0.14', ext_options),
 ]
 
 moduleclass = 'lang'