diff --git a/i/intltool/intltool-0.51.0.eb b/i/intltool/intltool-0.51.0.eb
new file mode 100644
index 00000000..84ac508d
--- /dev/null
+++ b/i/intltool/intltool-0.51.0.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'intltool'
+version = '0.51.0'
+
+homepage = 'http://freedesktop.org/wiki/Software/intltool/'
+description = """intltool is a set of tools to centralize translation of
+ many different file formats using GNU gettext-compatible PO files."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = ['http://launchpad.net/intltool/trunk/%(version)s/+download/']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('XML-Parser', '2.44'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/intltool%s' % x for x in ['-extract', '-merge', '-prepare', '-update', 'ize']],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/l/libX11/libX11-1.6.3.eb b/l/libX11/libX11-1.6.3.eb
index ab607e7e..d6950952 100644
--- a/l/libX11/libX11-1.6.3.eb
+++ b/l/libX11/libX11-1.6.3.eb
@@ -11,18 +11,9 @@ toolchain = {'name': 'dummy', 'version': ''}
 sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
 
-builddependencies = [
-    ('xextproto', '7.3.0'),
-    ('xcb-proto', '1.11'),
-    ('inputproto', '2.3'),
-    ('xproto', '7.0.28'),
-    ('libpthread-stubs', '0.3'),
-    ('kbproto', '1.0.6'),
-    ('xtrans', '1.3.5'),
-]
-
 dependencies = [
     ('libxcb', '1.11.1'),
+    ('fontconfig', '2.11.1'),
 ]
 
 sanity_check_paths = {
diff --git a/l/libepoxy/libepoxy-1.4.3.eb b/l/libepoxy/libepoxy-1.4.3.eb
index 6fca731c..09c7986c 100644
--- a/l/libepoxy/libepoxy-1.4.3.eb
+++ b/l/libepoxy/libepoxy-1.4.3.eb
@@ -18,8 +18,8 @@ source_urls = ['https://github.com/anholt/libepoxy/releases/download/%(version)s
 configopts = '--enable-egl=no'
 
 sanity_check_paths = {
-    'files': ['include/epoxy/common.h', 'include/epoxy/gl.h', 'include/epoxy/glx.h'
-		'lib/libepoxy.la', '/lib/libepoxy.so'],
+    'files': ['include/epoxy/common.h', 'include/epoxy/gl.h', 'include/epoxy/glx.h',
+		'lib/libepoxy.la', 'lib/libepoxy.so'],
     'dirs': ['lib', 'include'],
 }
 
diff --git a/results/SALOMON-not_installed.txt b/results/SALOMON-not_installed.txt
index 6e5c5330..7490ae71 100644
--- a/results/SALOMON-not_installed.txt
+++ b/results/SALOMON-not_installed.txt
@@ -35,6 +35,8 @@ ALLPATHS-LG/46968-goolf-1.4.10
 ALPS/2.3.0-foss-2016b-Python-2.7.12
 ALPS/2.3.0-foss-2016b-Python-3.5.2
 ASHS/rev103_20140612
+ATLAS/3.10.2-GCC-5.4.0-2.26-LAPACK-3.6.1
+ATLAS/3.10.3-GCC-5.4.0-2.26-LAPACK-3.6.1
 Allinea/4.1-32834-Redhat-5.7-x86_64
 Allinea/4.1-32834-Redhat-6.0-x86_64
 Allinea/6.1.1-Ubuntu-14.04-x86_64
@@ -52,20 +54,20 @@ BCFtools/1.3.1-goolf-1.7.20
 Bison/2.7-foss-2016a
 Bison/3.0.2-GCC-4.8.3
 Bison/3.0.4-foss-2017a
+Boost/1.61.0-intel-2016b
 Boost/1.49.0-goolf-1.5.16-Python-2.7.3
-Boost/1.60.0-CrayGNU-2016.03-Python-2.7.11
 Boost/1.60.0-foss-2015a
 Boost/1.60.0-foss-2015b
-Boost/1.60.0-foss-2016a-Python-2.7.11
 Boost/1.60.0-foss-2016a
-Boost/1.60.0-intel-2016a-Python-2.7.11
 Boost/1.60.0-intel-2016a
-Boost/1.61.0-foss-2016a-Python-3.5.2
 Boost/1.61.0-intel-2016a-Python-2.7.11
+Boost/1.62.0-intel-2016b-Python-2.7.12
+Boost/1.60.0-CrayGNU-2016.03-Python-2.7.11
+Boost/1.60.0-foss-2016a-Python-2.7.11
+Boost/1.60.0-intel-2016a-Python-2.7.11
+Boost/1.61.0-foss-2016a-Python-3.5.2
 Boost/1.61.0-intel-2016a
 Boost/1.61.0-intel-2016b-Python-2.7.12
-Boost/1.61.0-intel-2016b
-Boost/1.62.0-intel-2016b-Python-2.7.12
 binutils/2.24-intel-2014b
 byacc/20160606
 BBMap/35.82-foss-2015b-Java-1.8.0_66
@@ -170,7 +172,6 @@ CFITSIO/3.350-ictce-5.5.0
 CFITSIO/3.37-intel-2015a
 CFITSIO/3.38-foss-2016a
 CFITSIO/3.38-intel-2016a
-CGAL/4.8.1-intel-2017a
 CLooG/0.18.1-GCC-4.8.2
 CP2K/2.5.1-goolf-1.5.16
 CP2K/2.5.1-ictce-5.5.0
@@ -182,6 +183,7 @@ CUDA/5.0.35-1
 CUDA/5.0.35-GCC-4.6.4-1
 CUDA/7.5.18-iccifort-2015.3.187-GNU-4.9.3-2.25
 CUDA/7.5.18-iccifort-2016.3.210-GCC-4.9.3-2.25
+CUDA/7.5.18
 CUDA/8.0.44-intel-2017.00
 CUDA/8.0.44
 CVXOPT/1.1.5-goolf-1.4.10-Python-2.7.3
@@ -193,6 +195,7 @@ Commet/20150415-foss-2016a-Python-2.7.11
 ConnectomeWorkbench/1.2.2
 CrayPGI/2016.04
 CrossTalkZ/1.4-foss-2016a
+Cube/4.3.4
 Cython/0.16-goolf-1.4.10-Python-2.7.3
 Cython/0.16-ictce-5.3.0-Python-2.7.3
 Cython/0.19.1-goolf-1.4.10-Python-2.7.3
@@ -205,6 +208,7 @@ cclib/1.5-foss-2016b-Python-3.5.2
 cramtools/2.0-Java-1.7.0_80
 cramtools/3.0-Java-1.7.0_80
 ctffind/4.0.17-intel-2015b
+cuDNN/5.1-CUDA-7.5.18
 cuDNN/5.1-CUDA-8.0.44
 cutadapt/1.5-goolf-1.4.10-Python-2.7.10
 cutadapt/1.9.1-foss-2016a-Python-2.7.11
@@ -226,11 +230,13 @@ ELPA/2013.11-ictce-5.3.0
 ELPA/2013.11-ictce-5.5.0
 EMBOSS/6.5.7-goolf-1.4.10
 EMBOSS/6.5.7-ictce-5.3.0
-Eigen/3.2.9
 ea-utils/27a4809-foss-2016a
 ea-utils/27a4809-foss-2016b
 eudev/3.1.5-foss-2015g
 FFTW/2.1.5-gompi-1.5.12
+FFTW/3.3.6-gompi-2017a-it4i
+Forge/7.0.0
+Forge/7.0.1
 flex/2.5.38-GCC-4.8.2
 flex/2.5.39-CrayGNU-2015.06
 flex/2.5.39-CrayGNU-2015.11
@@ -318,6 +324,9 @@ GC3Pie/2.2.3
 GC3Pie/2.3
 GC3Pie/2.4.0
 GC3Pie/2.4.1
+GCC/4.9.2-binutils-2.25
+GCC/4.9.2
+GCC/5.3.0-binutils-2.25
 GCC/4.8.1-CLooG
 GCC/4.8.1
 GCC/4.8.2-CLooG-multilib
@@ -337,10 +346,12 @@ GCC/4.9.1-CLooG
 GCC/4.9.1
 GCC/4.9.2-CLooG-multilib
 GCC/4.9.2-CLooG
+GCC/4.9.3-experimental
 GCC/5.1.0
 GCC/5.3.0
 GCCcore/4.9.2
 GCCcore/6.1.0
+GDAL/2.1.3-intel-2017a-Python-2.7.13
 GEOS/3.5.0-foss-2015a-Python-2.7.11
 GLib/2.40.0-GCC-4.4.7-system
 GLib/2.40.0-GCC-4.9.3-binutils-2.25
@@ -349,7 +360,6 @@ GLib/2.48.0-foss-2016a
 GLib/2.48.0-intel-2016a
 GLib/2.49.5-foss-2016b
 GLib/2.49.5-intel-2016b
-GMP/6.1.1
 GROMACS/4.6.7-CrayGNU-2015.06-mpi
 GROMACS/4.6.7-CrayGNU-2015.11-mpi
 GROMACS/4.6.7-CrayIntel-2015.11-mpi
@@ -381,7 +391,6 @@ gettext/0.19.4-GCC-4.4.7-system
 gettext/0.19.4-GCC-4.9.2
 gettext/0.19.4-foss-2015a
 gettext/0.19.4-intel-2015a
-gettext/0.19.4
 gettext/0.19.6-GNU-4.9.3-2.25
 gettext/0.19.6-gimkl-2.11.5
 gettext/0.19.6-intel-2015b
@@ -400,6 +409,7 @@ git/1.7.12-ictce-5.3.0
 git/1.8.2-goolf-1.4.10
 git/1.8.3.1-goolf-1.4.10
 git/2.11.0-GNU-4.9.3-2.25
+git/2.12.2
 git/2.7.3-GNU-4.9.3-2.25
 git/2.7.3-foss-2015g
 gompi/2016.07
@@ -439,6 +449,8 @@ Gurobi/Optimizer-7.0.0
 gencore_variant_detection/1.0
 gensim/0.13.2-foss-2016a-Python-2.7.11
 git-lfs/1.1.1
+gnuplot/5.0.5
+gnuplot/5.0.6
 gnutls/3.1.8-goalf-1.1.0-no-OFED
 gnutls/3.1.8-goolf-1.4.10
 gnutls/3.3.21-intel-2016a
@@ -473,920 +485,105 @@ hanythingondemand/3.1.2-cli
 hanythingondemand/3.1.3-cli
 hanythingondemand/3.1.4-cli
 hanythingondemand/3.2.0-cli
+Inspector/2013_update6
+Inspector/2013_update7
+Inspector/2016_update3
+Inspector/2017_update1
+Inspector/2017_update2
+icc/11.1.073-32bit
+icc/11.1.073
+icc/11.1.075
+icc/2011.10.319
+icc/2011.13.367
+icc/2011.3.174
+icc/2011.6.233
+icc/2013.1.117
+icc/2013.2.146
+icc/2013.3.163
+icc/2013.4.183
+icc/2013_sp1.0.080
+icc/2013_sp1.1.106
+icc/2013_sp1.2.144
+icc/2013_sp1.3.174
+icc/2013_sp1.4.211
+icc/2015.0.090-GCC-4.9.2
+icc/2015.0.090
+icc/2015.1.133-GCC-4.9.2
+icc/2015.1.133
+icc/2015.2.164-GCC-4.9.2
+icc/2015.5.223-GCC-4.9.3-2.25
+icc/2016.0.109-GCC-4.9.3-2.25
 icc/2016.0.109-GCC-5.2.0
 icc/2016.0.109
+icc/2016.2.181-GCC-4.9.3-2.25
+icc/2016.2.181-GCC-5.3.0-2.26
+icc/2016.3.210-GCC-4.9.3-2.25
+icc/2016.3.210-GCC-5.4.0-2.26
+icc/2017.2.174-GCC-6.3.0-2.27-test
 iccifort/2016.0.109-GCC-5.2.0
+ifort/11.1.073-32bit
+ifort/11.1.073
+ifort/11.1.075
+ifort/2011.10.319
+ifort/2011.13.367
+ifort/2011.3.174
+ifort/2011.6.233
+ifort/2013.1.117
+ifort/2013.2.146
+ifort/2013.3.163
+ifort/2013.4.183
+ifort/2013_sp1.0.080
+ifort/2013_sp1.1.106
+ifort/2013_sp1.2.144
+ifort/2013_sp1.3.174
+ifort/2013_sp1.4.211
+ifort/2015.0.090-GCC-4.9.2
+ifort/2015.0.090
+ifort/2015.1.133-GCC-4.9.2
+ifort/2015.1.133
+ifort/2015.2.164-GCC-4.9.2
+ifort/2015.5.223-GCC-4.9.3-2.25
 ifort/2016.0.109-GCC-4.9.3-2.25
 ifort/2016.0.109-GCC-5.2.0
 ifort/2016.0.109
 ifort/2016.2.181-GCC-4.9.3-2.25
 ifort/2016.2.181-GCC-5.3.0-2.26
 ifort/2016.3.210-GCC-4.9.3-2.25
+ifort/2016.3.210-GCC-5.4.0-2.26
 iimpi/2016.00-GCC-5.2.0
+imkl/10.2.6.038-32bit
+imkl/10.2.6.038
+imkl/10.3.10.319
 imkl/10.3.12.361-MVAPICH2-1.9
 imkl/10.3.12.361-OpenMPI-1.6.3
+imkl/10.3.12.361
+imkl/10.3.6.233
+imkl/11.0.1.117
+imkl/11.0.2.146-iimpi-5.2.0
+imkl/11.0.2.146
+imkl/11.0.3.163-iimpi-5.3.0
+imkl/11.0.3.163
+imkl/11.0.4.183-iimpi-5.4.0
+imkl/11.0.4.183
+imkl/11.0.5.192
+imkl/11.1.0.080
+imkl/11.1.1.106-iimpi-6.1.5
+imkl/11.1.1.106
+imkl/11.1.2.144-2013.5.192-GCC-4.8.3
+imkl/11.1.2.144-GCC-4.8.3
+imkl/11.1.2.144-OpenMPI-1.6.5
+imkl/11.1.2.144-iimpi-5.5.3-GCC-4.8.3
+imkl/11.1.2.144-iimpi-6.2.5
+imkl/11.1.2.144-iompi-2015.01
+imkl/11.1.2.144
+imkl/11.1.3.174
+imkl/11.2.0.090-iimpi-7.1.2-GCC-4.9.2
+imkl/11.2.0.090-iimpi-7.1.2
+imkl/11.2.1.133-iimpi-7.2.3-GCC-4.9.2
+imkl/11.2.2.164-iimpi-7.2.5-GCC-4.9.2
+imkl/11.2.2.164-iompi-2015.02
+imkl/11.2.3.187-gimpi-2.11.5
+imkl/11.2.3.187-iimpi-7.3.5-GNU-4.9.3-2.25
+imkl/11.3.0.109-iimpi-2016.00-GCC-4.9.3-2.25
 imkl/11.3.0.109-iimpi-2016.00-GCC-5.2.0
-impi/4.1.1.036
-impi/5.1.1.109-iccifort-2016.0.109-GCC-5.2.0
-ipp/2017.2.174-GCC-6.3.0-2.27
-I-TASSER/4.0
-I-TASSER/4.2
-IGV/2.3.68-Java-1.7.0_80
-IMB/4.1-foss-2016a
-IOR/3.0.1-foss-2016a-mpiio
-IOzone/3.434-foss-2016a
-IPython/4.2.0-goolf-1.7.20-Python-2.7.11
-IPython/4.2.0-intel-2016a-Python-2.7.11
-IPython/5.1.0-foss-2016b-Python-2.7.12
-IPython/5.1.0-intel-2016b-Python-2.7.12
-ImageMagick/6.9.4-8-intel-2016a
-ImageMagick/7.0.1-6-intel-2016a
-ImageMagick/7.0.1-9-intel-2016a
-ImageMagick/7.0.2-9-intel-2016a
-ImageMagick/7.0.3-1-intel-2016b
-Infernal/1.1-goolf-1.4.10
-Infernal/1.1-ictce-5.3.0
-Infernal/1.1rc1-goolf-1.4.10
-Infernal/1.1rc1-ictce-5.3.0
-intelcuda/2016.10
-iomkl/2015.03
-Julia/snapshot-foss-2015g-Python-2.7.9
-Julia/snapshot-intel-2015b-Python-2.7.9
-jModelTest/2.1.9r20160115-goolf-1.4.10-Java-1.7.0_75
-Kraken/0.10.5-beta-foss-2016a-Perl-5.22.1
-Kraken/0.10.5-beta-foss-2016b-Perl-5.24.0
-LibTIFF/4.0.3-intel-2015a
-libGLU/9.0.0-intel-2017a
-libICE/1.0.9-foss-2016a
-libICE/1.0.9-intel-2016a
-libSM/1.2.2-foss-2016a
-libSM/1.2.2-intel-2016a
-libX11/1.6.3
-libX11/1.6.3-intel-2015b-Python-2.7.9
-libXt/1.1.5-foss-2016a
-libXt/1.1.5-intel-2016a
-libctl/3.2.1-goalf-1.1.0-no-OFED
-libctl/3.2.1-goolf-1.4.10
-libctl/3.2.1-ictce-4.0.6
-libctl/3.2.1-ictce-5.3.0
-libctl/3.2.2-intel-2015a
-libffi/3.2.1-GCC-4.4.7-system
-libffi/3.2.1
-libgdiplus/3.12-GCC-4.8.3
-libmatheval/1.1.11-foss-2015b
-libmatheval/1.1.11-intel-2015b
-libmatheval/1.1.8-foss-2017a
-libmatheval/1.1.8-goalf-1.1.0-no-OFED
-libmatheval/1.1.8-goolf-1.4.10
-libmatheval/1.1.8-ictce-4.0.6
-libmatheval/1.1.8-ictce-5.3.0
-libreadline/6.2-goolf-1.5.16
-libreadline/6.3-GCC-4.8.2
-libtool/2.4.6-foss-2017a
-libxc/2.0.1-goolf-1.4.10
-libxc/2.0.1-ictce-5.3.0
-libxc/2.0.1-ictce-5.5.0
-libxc/2.0.1-intel-2014b
-libxc/2.0.2-goolf-1.4.10
-libxc/2.0.2-ictce-5.3.0
-libxc/2.0.3-goolf-1.4.10
-libxc/2.2.0-goolf-1.5.16
-libxc/2.2.0-ictce-5.5.0
-libxc/2.2.0-intel-2014b
-libxc/2.2.1-CrayGNU-2015.06
-libxc/2.2.1-CrayGNU-2015.11
-libxc/2.2.1-intel-2015a
-libxc/2.2.2-CrayGNU-2015.11
-libxc/2.2.2-foss-2015b
-libxc/2.2.2-intel-2015a
-libxc/2.2.2-intel-2015b
-libxc/2.2.3-foss-2016b
-libxc/2.2.3-intel-2016a
-libxc/2.2.3-intel-2016b
-libxc/3.0.0-intel-2016a
-libxc/3.0.0-intel-2016b
-libxcb/1.10-foss-2014b-Python-2.7.8
-libxml2/2.8.0-goalf-1.1.0-no-OFED-Python-2.7.3
-libxml2/2.8.0-goalf-1.1.0-no-OFED
-libxml2/2.8.0-goolf-1.4.10-Python-2.7.3
-libxml2/2.8.0-goolf-1.4.10
-libxml2/2.8.0-ictce-4.0.6-Python-2.7.3
-libxml2/2.8.0-ictce-4.0.6
-libxml2/2.8.0-ictce-4.1.13-Python-2.7.3
-libxml2/2.8.0-ictce-5.3.0-Python-2.7.3
-libxml2/2.8.0-ictce-5.3.0
-libxml2/2.8.0-intel-2015a-Python-2.7.3
-libxml2/2.9.0-goalf-1.1.0-no-OFED
-libxml2/2.9.0-goolf-1.4.10
-libxml2/2.9.0-ictce-4.0.6
-libxml2/2.9.0-ictce-4.1.13
-libxml2/2.9.0-ictce-5.3.0
-libxml2/2.9.1-foss-2015b
-libxml2/2.9.1-gmpolf-1.4.8
-libxml2/2.9.1-goalf-1.1.0-no-OFED
-libxml2/2.9.1-goalf-1.5.12-no-OFED
-libxml2/2.9.1-gompi-1.4.12-no-OFED
-libxml2/2.9.1-goolf-1.4.10-Python-2.7.5
-libxml2/2.9.1-goolf-1.4.10
-libxml2/2.9.1-goolf-1.5.14
-libxml2/2.9.1-ictce-4.0.6
-libxml2/2.9.1-ictce-4.1.13
-libxml2/2.9.1-ictce-5.2.0
-libxml2/2.9.1-ictce-5.3.0
-libxml2/2.9.1-ictce-5.5.0-Python-2.7.6
-libxml2/2.9.1-ictce-5.5.0
-libxml2/2.9.1-ictce-7.1.2
-libxml2/2.9.1-intel-2014b
-libxml2/2.9.2-GCC-4.4.7-system
-libxml2/2.9.2-GCC-4.9.2
-libxml2/2.9.2-foss-2015a
-libxml2/2.9.2-goolf-1.5.14
-libxml2/2.9.2-goolf-1.5.16
-libxml2/2.9.2-goolf-1.7.20
-libxml2/2.9.2-intel-2014.06
-libxml2/2.9.2-intel-2014b
-libxml2/2.9.2-intel-2015a-Python-2.7.10
-libxml2/2.9.2-intel-2015a-Python-2.7.9
-libxml2/2.9.2-intel-2015a
-libxml2/2.9.3-GCC-4.9.3-2.25
-libxml2/2.9.3-foss-2015a-Python-2.7.11
-libxml2/2.9.3-foss-2015a
-libxml2/2.9.3-foss-2016a-Python-2.7.11
-libxml2/2.9.3-gimkl-2.11.5
-libxml2/2.9.3-goolf-1.7.20
-libxml2/2.9.3-intel-2015b-Python-2.7.10
-libxml2/2.9.3-intel-2015b-Python-2.7.11
-libxml2/2.9.3-intel-2016a-Python-2.7.11
-likwid/4.0.1-intel-2015b
-likwid/4.1.0-GCCcore-4.9.3
-LAPACKE/3.5.0
-LeadIT/2.1.9
-LevelDB/1.18-foss-2016a
-Libint/1.1.4-CrayGNU-2015.06
-Libint/1.1.4-CrayGNU-2015.11
-Libint/1.1.4-goolf-1.5.16
-Loki/0.1.7-foss-2016a
-Loki/0.1.7-foss-2016b
-Loki/0.1.7-intel-2016a
-Loki/0.1.7-intel-2016b
-lftp/4.4.1-goalf-1.1.0-no-OFED
-lftp/4.4.1-goolf-1.4.10
-lftp/4.6.4-GNU-4.9.3-2.25
-libXcursor/1.1.14-foss-2016a
-libXcursor/1.1.14-intel-2016a
-libXft/2.3.2-foss-2016a
-libXft/2.3.2-intel-2016a-fontconfig-2.11.95
-libXft/2.3.2-intel-2016a
-libXft/2.3.2
-libXi/1.7.6-foss-2016a
-libXi/1.7.6-intel-2016a
-libXinerama/1.1.3-foss-2016a
-libXinerama/1.1.3-intel-2016a
-libXrandr/1.5.0-foss-2016a
-libXrandr/1.5.0-intel-2016a
-libXrender/0.9.9-foss-2016a
-libXrender/0.9.9-intel-2016a
-libdrm/2.4.70-foss-2016b
-libdrm/2.4.70-intel-2016b
-libelf/0.8.13-GCC-4.9.2
-libevent/2.0.22-GCC-4.9.2
-libevent/2.0.22-GCCcore-4.9.3
-libevent/2.0.22-GNU-4.9.3-2.25
-libpsortb/1.0-foss-2016a
-libsodium/1.0.3-intel-2015a
-libxkbcommon/0.6.1-foss-2016a
-libxkbcommon/0.6.1-intel-2016a
-lynx/2.8.7-goolf-1.4.10
-lynx/2.8.7-ictce-5.3.0
-M4/1.4.17-CrayGNU-2015.06
-M4/1.4.17-CrayGNU-2015.11
-M4/1.4.17-GCC-4.7.2
-M4/1.4.17-GCC-4.8.2
-M4/1.4.17-GCC-4.8.3
-M4/1.4.17-GCC-4.8.4
-M4/1.4.17-GCC-4.9.2-binutils-2.25
-M4/1.4.17-GCC-4.9.2
-M4/1.4.17-GCC-4.9.3
-M4/1.4.17-GCCcore-4.9.2
-M4/1.4.17-GNU-4.9.2-2.25
-M4/1.4.17-foss-2014b
-M4/1.4.17-foss-2015a
-M4/1.4.17-gimkl-2.11.5
-M4/1.4.17-ictce-5.4.0
-M4/1.4.17-ictce-5.5.0
-M4/1.4.17-ictce-7.1.2
-M4/1.4.17-intel-2014b
-M4/1.4.17-intel-2015a
-M4/1.4.17-intel-2016.02-GCC-4.9
-M4/1.4.17-intel-2017a
-M4/1.4.17-intel-para-2014.12
-M4/1.4.18
-MATIO/1.5.2-goolf-1.4.10
-MATIO/1.5.2-intel-2015b
-METIS/5.1.0
-MPFR/3.1.4-intel-2017a
-MVAPICH2/1.7-GCC-4.6.3-hwloc-chkpt
-MVAPICH2/1.9-GNU-5.1.0-2.25
-MVAPICH2/1.9-intel-2015b
-Meep/1.2-goalf-1.1.0-no-OFED
-Meep/1.2-goolf-1.4.10
-Meep/1.2-ictce-4.0.6
-Meep/1.2-ictce-5.3.0
-Meep/1.3-intel-2015a
-Mercurial/2.3.2-goolf-1.4.10-Python-2.7.3
-Mercurial/2.3.2-ictce-5.3.0-Python-2.7.3
-Mercurial/2.5.2-goolf-1.4.10-Python-2.7.3
-Mercurial/2.5.2-ictce-5.3.0-Python-2.7.3
-Mercurial/3.2.4-foss-2015a-Python-2.7.9
-Mercurial/3.5-intel-2015b-Python-2.7.9
-Mesa/10.4.5-intel-2015a-Python-2.7.9
-Mesa/10.5.5-intel-2015a-Python-2.7.10
-Mesa/11.0.2-intel-2015b-Python-2.7.10
-Mesa/11.0.8-intel-2015b-Python-2.7.11
-Mesa/11.1.2-foss-2016a
-Mesa/11.1.2-gimkl-2.11.5
-Mesa/11.1.2-intel-2016a
-Mesa/11.1.2-intel-2017a
-Mesa/11.2.1-intel-2016a
-Mesa/12.0.2-foss-2016b
-Mesa/12.0.2-intel-2016b
-Mesa/13.0.0-foss-2016a
-Mesa/7.11.2-foss-2015g-Python-2.7.9
-Mono/2.10.6-intel-2016b
-Mono/3.12.1-GCC-4.8.3
-Mono/3.12.1-GNU-5.1.0-2.25
-Mono/4.6.2.7-intel-2016b
-Mono/4.6.2.7
-MATLAB/2013a
-MDSplus/7.0.67-foss-2016a-Java-1.7.0_79-Python-2.7.11
-MDSplus/7.0.67-goolf-1.5.16-Java-1.7.0_79-Python-2.7.9
-MEME/4.8.0-goolf-1.4.10
-MEME/4.8.0-ictce-5.3.0
-MIGRATE-N/4.2.8-foss-2016a
-MLD2P4/2.0-rc4
-MOSAIK/2.2.28-goolf-1.4.10-20140425-24cf06
-MOSAIK/2.2.28-ictce-6.2.5-20140425-24cf06
-MPJ-Express/0.44-foss-2016a-Java-1.8.0_92
-MPJ-Express/0.44-goolf-1.4.10-Java-1.7.0_75
-MaCH/1.0.18.c-goolf-1.4.10
-MaCH/1.0.18.c-ictce-6.2.5
-MariaDB/10.1.13-intel-2016a
-Maven/3.2.3
-Maven/3.3.3
-Mawk/1.3.4-goolf-1.4.10-20150503
-Metal/2011-03-25-foss-2016a
-Minimac2/2014.9.15-goolf-1.7.20
-Molpro/2012.1.27-intel-2015a
-Molpro/mpp-2010.1.23.Linux_x86_64
-Molpro/mpp-2015.1.0.linux_x86_64_intel
-Molpro/mpp-2015.1.10.linux_x86_64_openmp
-Molpro/mpp-2015.1.3.linux_x86_64_openmp
-MrBayes/3.1.2-goolf-1.4.10
-MrBayes/3.1.2-ictce-5.3.0
-MrBayes/3.2.0-goolf-1.4.10
-MrBayes/3.2.0-ictce-5.3.0
-MrBayes/3.2.5-intel-2015a
-MuTect/1.1.4-Java-1.7.0_76
-MuTect/1.1.4-Java-1.7.0_80
-MuTect/1.1.7-Java-1.7.0_80
-magma/2.0.0-CrayGNU-2015.11
-mutil/1.822.3-intel-2016a
-ncurses/6.0-GNU-4.9.3-2.25
-ncurses/6.0-intel-2016.02-GCC-4.9
-ncurses/6.1-intel-2017a
-netCDF/4.1.3-goolf-1.4.10
-netCDF/4.1.3-ictce-5.3.0
-netCDF/4.2-ictce-5.4.0
-netCDF/4.2-intel-2014b
-netCDF/4.2.1.1-ictce-5.4.0
-netCDF/4.2.1.1-ictce-6.1.5
-numpy/1.9.2-intel-2015b-Python-3.4.3
-numpy/1.9.2-intel-2016b-Python-2.7.12
-NAMD/2.10b1-ictce-5.5.0-ibverbs
-NAMD/2.10b1-ictce-5.5.0-mpi
-NAMD/2.9-gmvapich2-1.7.12-ibverbs
-NAMD/2.9-gmvolf-1.7.12-ibverbs
-NAMD/2.9-goolf-1.4.10-ibverbs
-NAMD/2.9-ictce-5.5.0-ibverbs
-NAMD/2.9-ictce-5.5.0-mpi
-NFFT/3.3.0-CrayGNU-2015.06
-NFFT/3.3.0-CrayGNU-2015.11
-NWChem/6.5.revision26243-intel-2014b-2014-09-10-Python-2.7.8
-netCDF-Fortran/4.2-ictce-6.1.5
-networkx/1.11-foss-2016a-Python-2.7.11
-networkx/1.11-foss-2016a-Python-3.5.1
-OPARI2/1.1.4-ictce-7.3.5
-ORCA/2_9_1-linux_x86-64
-ORCA/3_0_0-linux_x86-64_openmpi_165
-ORCA/3_0_2-linux_x86-64-OpenMPI-1.8.8-iccifort-2015.3.187-GNU-4.9.3-2.25
-ORCA/3_0_2-linux_x86-64
-ORCA/3_0_3-linux_x86-64-OpenMPI-1.8.8-iccifort-2015.3.187-GNU-4.9.3-2.25
-OTF2/1.4-ictce-5.5.0
-Octave/3.8.2-gimkl-2.11.5
-Octave/3.8.2-intel-2014.06
-Octave/4.0.1-gimkl-2.11.5
-Octave/4.0.1-intel-2016.01
-OpenBLAS/0.2.12-GCC-4.9.2-LAPACK-3.5.0
-OpenBLAS/0.2.13-GCC-4.8.4-LAPACK-3.5.0
-OpenBLAS/0.2.13-GCC-4.9.2-LAPACK-3.5.0
-OpenBLAS/0.2.13-gompi-1.5.16-LAPACK-3.5.0
-OpenBLAS/0.2.14-GNU-4.9.2-2.25-LAPACK-3.5.0
-OpenBLAS/0.2.15-GCC-5.1.0-binutils-2.25-LAPACK-3.6.0
-OpenBLAS/0.2.18-GCC-4.9.4-2.25-LAPACK-3.6.0
-OpenBLAS/0.2.18-GCC-5.4.0-2.26-LAPACK-3.6.0
-OpenBLAS/0.2.18-GCC-5.4.0-2.26-LAPACK-3.6.1
-OpenBLAS/0.2.6-gompi-1.4.10-LAPACK-3.4.2
-OpenBLAS/0.2.6-ictce-5.3.0-LAPACK-3.4.2
-OpenBLAS/0.2.8-gompi-1.5.12-LAPACK-3.5.0
-OpenBLAS/0.2.8-gompi-1.5.14-LAPACK-3.5.0
-OpenBLAS/0.2.8-gompi-1.6.10-LAPACK-3.4.2
-OpenBLAS/0.2.8-ictce-5.3.0-LAPACK-3.4.2
-OpenBLAS/0.2.9-GCC-4.8.3-LAPACK-3.5.0
-OpenCV/3.1.0-foss-2016a
-OpenCV/3.1.0-intel-2016a
-OpenCV/3.1.0-intel-2016b
-OpenCoarrays/1.4.0
-OpenMPI/1.10.2-GCC-6.1.0-2.27
-OpenMPI/1.10.2-PGI-16.3-GCC-4.9.3-2.25
-OpenMPI/1.10.2-PGI-16.4-GCC-5.3.0-2.26
-OpenMPI/1.10.3-GCC-4.9.3-2.25
-OpenMPI/1.10.3-GCC-6.1.0-2.27
-OpenMPI/1.10.4-PGI-16.7-GCC-5.4.0-2.26
-OpenMPI/1.6.5-GCC-4.8.3
-OpenMPI/1.8.6-GNU-4.4.7-system
-OpenMPI/1.8.6-GNU-4.9.3-2.25
-OpenMPI/2.0.0-GCC-5.2.0
-OpenMPI/2.0.1-GCC-6.2.0-2.27
-OpenMPI/2.0.1-gcccuda-2016.10
-OpenMPI/2.0.1
-OBITools/1.2.9-foss-2016a-Python-2.7.11
-Octopus/5.0.0-intel-2015b-mpi
-OpenFOAM/4.1-intel-2017a
-OpenPGM/5.2.122-foss-2015a
-OpenPGM/5.2.122-foss-2016a
-OpenPGM/5.2.122-goolf-1.4.10
-OpenPGM/5.2.122-goolf-1.7.20
-OpenPGM/5.2.122-ictce-5.3.0
-OpenPGM/5.2.122-ictce-5.5.0
-OpenPGM/5.2.122-intel-2015a
-OpenPGM/5.2.122-intel-2015b
-OpenPGM/5.2.122-intel-2016a
-orthomcl/2.0.8-goolf-1.4.10-Perl-5.16.3
-orthomcl/2.0.8-ictce-5.3.0-Perl-5.16.3
-PAPI/5.4.0-ictce-5.5.0
-PCRE/8.36-intel-2014.06
-PCRE2/10.21-foss-2016a
-PETSc/3.3-p2-goolf-1.4.10-Python-2.7.3
-PETSc/3.3-p2-ictce-5.3.0-Python-2.7.3
-PETSc/3.5.1-intel-2014b-Python-2.7.8
-PETSc/3.5.3-intel-2015b-Python-2.7.9
-PGI/17.3-GCC-6.3.0-2.28
-PGI/15.10-GCC-4.9.3-2.25
-PGI/15.7-GNU-4.9.2-2.25
-PGI/15.7-GNU-4.9.3-2.25
-PLUMED/2.1.3-foss-2015b
-PLUMED/2.1.3-intel-2015b
-PLUMED/2.3b-intel-2015b
-ParMETIS/3.1.1-goolf-1.4.10
-ParMETIS/3.1.1-ictce-5.3.0
-ParMETIS/3.2.0-goolf-1.4.10
-ParMETIS/3.2.0-ictce-6.2.5
-ParMETIS/4.0.2-goolf-1.4.10
-ParMETIS/4.0.2-goolf-1.5.16
-ParMETIS/4.0.2-ictce-5.3.0
-ParMETIS/4.0.3-foss-2016a
-ParMETIS/4.0.3-gimkl-2.11.5
-ParMETIS/4.0.3-goolf-1.4.10
-ParMETIS/4.0.3-ictce-5.5.0
-ParMETIS/4.0.3-intel-2014b
-ParMETIS/4.0.3-intel-2015a
-ParMETIS/4.0.3-intel-2016a
-Perl/5.24.0-GCC-4.9.3-2.25-bare
-Perl/5.22.2-bare
-Perl/5.22.2-intel-2016a
-Perl/5.24.0-GCC-5.4.0-2.26
-Perl/5.24.0-GCC-5.4.0-bare
-Perl/5.24.0-GCCcore-4.9.3
-Perl/5.24.0-bare
-Perl/5.24.0-foss-2016b
-Perl/5.24.0-intel-2016b
-Python/2.5.6-goolf-1.4.10-bare
-Python/2.5.6-ictce-5.2.0-bare
-Python/2.5.6-ictce-5.3.0-bare
-Python/2.7.10-foss-2015a
-Python/2.7.10-foss-2015b
-Python/2.7.10-gimkl-2.11.5
-Python/2.7.10-goolf-1.4.10
-Python/2.7.10-goolf-1.7.20
-Python/2.7.10-intel-2015a
-Python/2.7.10-intel-2015b
-Python/2.7.11-CrayGNU-2015.11
-Python/2.7.11-CrayGNU-2016.03
-Python/2.7.11-foss-2015a
-Python/2.7.11-gimkl-2.11.5
-Python/2.7.11-goolf-1.7.20
-Python/2.7.11-intel-2016.02-GCC-4.9
-Python/2.7.11-intel-2016a-libX11-1.6.3
-Python/2.7.11-iomkl-2016.07
-Python/2.7.11-iomkl-2016.09-GCC-4.9.3-2.25
-Python/2.7.12-GCCcore-4.9.3-bare
-Python/2.7.12
-Python/2.7.3-cgmpolf-1.1.6
-Python/2.7.3-cgmvolf-1.1.12rc1
-Python/2.7.3-cgmvolf-1.2.7
-Python/2.7.3-cgoolf-1.1.7
-Python/2.7.3-foss-2015b
-Python/2.7.3-gmpolf-1.4.8
-Python/2.7.3-gmvolf-1.7.12
-Python/2.7.3-gmvolf-1.7.12rc1
-Python/2.7.3-goalf-1.1.0-no-OFED
-Python/2.7.3-goolf-1.4.10
-Python/2.7.3-goolf-1.5.14
-Python/2.7.3-goolf-1.5.16
-Python/2.7.3-ictce-4.0.6
-Python/2.7.3-ictce-4.1.13
-Python/2.7.3-ictce-5.2.0
-Python/2.7.3-ictce-5.3.0
-Python/2.7.3-intel-2015a
-Python/2.7.3-iomkl-4.6.13
-Python/2.7.3-iqacml-3.7.3
-Python/2.7.5-goalf-1.5.12-no-OFED
-Python/2.7.5-goolf-1.4.10
-Python/2.7.5-ictce-4.1.13
-Python/2.7.5-ictce-5.3.0
-Python/2.7.5-ictce-5.5.0
-Python/2.7.5-iqacml-3.7.3
-Python/2.7.6-goolf-1.4.10
-Python/2.7.6-ictce-4.1.13
-Python/2.7.6-ictce-5.5.0
-Python/2.7.8-foss-2014b
-Python/2.7.8-goolf-1.5.14
-Python/2.7.8-ictce-7.1.2
-Python/2.7.8-intel-2014.06
-Python/2.7.8-intel-2014b
-Python/2.7.8-intel-2015a
-Python/2.7.9-CrayGNU-2015.06-bare
-Python/2.7.9-CrayGNU-2015.06
-Python/2.7.9-CrayGNU-2015.11-bare
-Python/2.7.9-CrayGNU-2015.11
-Python/2.7.9-GCC-4.8.4-bare
-Python/2.7.9-GCC-4.9.2-bare
-Python/2.7.9-foss-2015.05
-Python/2.7.9-foss-2015a-bare
-Python/2.7.9-foss-2015a
-Python/2.7.9-gompi-1.5.16-bare
-Python/2.7.9-goolf-1.5.14
-Python/2.7.9-goolf-1.5.16
-Python/2.7.9-goolf-1.7.20
-Python/2.7.9-intel-2015a-bare
-Python/2.7.9-intel-2015a
-Python/3.2.3-goalf-1.1.0-no-OFED
-Python/3.2.3-goolf-1.4.10
-Python/3.2.3-ictce-4.0.6
-Python/3.2.3-ictce-5.3.0
-Python/3.3.2-goolf-1.4.10
-Python/3.3.2-ictce-5.3.0
-Python/3.4.1-intel-2014b
-Python/3.4.1-intel-2015a
-Python/3.4.3-intel-2015a
-Python/3.5.0-intel-2015b
-Python/3.5.1-foss-2015a
-Python/3.5.1-foss-2016a
-Python/3.5.1-intel-2016a
-Python/3.5.2-foss-2016.04
-phono3py/0.9.14-Python-2.7.9-ictce-7.3.5
-phono3py/0.9.14-Python-3.5.2-ictce-7.3.5
-phono3py/1.11.9.1-Python-2.7.9-ictce-7.3.5
-phonopy/1.11.2-intel-2017.00-Python-3.5.2
-pkg-config/0.27.1-goolf-1.4.10
-pkg-config/0.27.1-ictce-5.3.0
-pkg-config/0.27.1-ictce-5.5.0
-pkg-config/0.27.1-intel-2015a
-pkg-config/0.28-GCC-4.8.2
-pkg-config/0.28-GCC-4.9.2
-pkg-config/0.28-GNU-4.9.3-2.25
-pkg-config/0.28-ictce-5.5.0
-pkg-config/0.28-intel-2015a
-pkg-config/0.29-gimkl-2.11.5
-pkg-config/0.29-intel-2015a
-pkg-config/0.29-intel-2015b
-protobuf/2.5.0-goolf-1.4.10
-PARI-GP/2.7.6-foss-2016a
-PCC/20131024
-PCMSolver/20160205-intel-2016a-Python-2.7.11
-PGDSpider/2.1.0.3-Java-1.7.0_80
-PHYLIP/3.696-foss-2016a
-PHYLIP/3.696-intel-2016a
-PLAST/2.3.1-foss-2016a-Java-1.8.0_92
-PRINSEQ/0.20.4-foss-2015b-Perl-5.20.3
-PRINSEQ/0.20.4-goolf-1.4.10-Perl-5.16.3
-PSBLAS/3.3.4-3-GCC-4.9.3-2.25
-PSBLAS/ext-1.0-4
-PSI/4.0b4-ictce-5.3.0-mt
-PSI/4.0b4-ictce-5.3.0
-PSI/4.0b5-ictce-5.3.0-mt
-PSI/4.0b5-ictce-5.3.0
-PSI/4.0b5-ictce-5.5.0-mt
-PSI/4.0b5-ictce-5.5.0
-PSI/4.0b5-intel-2015a-mt-maxam7-Python-2.7.10
-PSI/4.0b6-20160201-intel-2016a-mt-Python-2.7.11
-PSI4/1.0-intel-2016a-Python-2.7.11
-PSORTb/3.0.4-foss-2016a-Perl-5.22.1
-ParaView/4.3.1-intel-2015a-Python-2.7.10-mpi
-ParaView/4.3.1-intel-2015a-Python-2.7.10
-ParaView/4.4.0-gimkl-2.11.5-mpi
-ParaView/4.4.0-intel-2015b-mpi
-ParaView/4.4.0-intel-2015b
-ParaView/4.4.0-intel-2016a
-ParaView/5.1.2-intel-2017a-mpi
-Paraver/4.4.5-GCC-4.7.3
-Paraver/4.5.6-foss-2015a
-Paraview/4.3-intel-2016.01-OSPRay
-Paraview/5.0.0-binary
-Paraview/5.0.0-foss-2015g
-Pasha/1.0.5-ictce-5.3.0
-PhyloBayes-MPI/20161021-intel-2017.00
-Pillow/3.2.0-foss-2016a-Python-2.7.11-freetype-2.6.3
-Pillow/3.2.0-intel-2016a-Python-2.7.11
-Platanus/1.2.4-goolf-1.7.20
-PostgreSQL/9.3.5-intel-2014b
-PostgreSQL/9.4.7-intel-2016a-Python-2.7.11
-PostgreSQL/9.5.2-intel-2016a-Python-2.7.11
-PostgreSQL/9.6.0-intel-2016b-Python-2.7.12
-Postgres-XL/9.5r1-intel-2016a-Python-2.7.11
-ProbABEL/0.5.0
-PyGTS/0.3.1-foss-2016a-Python-2.7.11
-PyGTS/0.3.1-foss-2016b-Python-2.7.12
-PyGTS/0.3.1-intel-2016a-Python-2.7.11
-PyGTS/0.3.1-intel-2016b-Python-2.7.12
-Pysam/0.9.0-goolf-1.7.20-Python-2.7.11
-p4vasp/GNU-4.9.3-2.25
-paycheck/1.0.2-goolf-1.4.10-Python-2.7.3
-paycheck/1.0.2-ictce-5.3.0-Python-2.7.3
-petsc4py/3.3-goolf-1.4.10-Python-2.7.3
-petsc4py/3.3-ictce-5.3.0-Python-2.7.3
-pftoolsV3/20160324-foss-2016a
-picard/1.119-Java-1.7.0_79
-picard/2.0.1-Java-1.8.0_66
-picard/2.1.0-Java-1.7.0_79
-picard/2.1.0-Java-1.8.0_74
-picard/2.1.1-Java-1.8.0_74
-pigz/2.3.1-goolf-1.4.10
-pigz/2.3.1-ictce-6.2.5
-pigz/2.3.3-foss-2015b
-pigz/2.3.3
-prompt-toolkit/1.0.3-foss-2016a-Python-2.7.11
-prompt-toolkit/1.0.3-foss-2016a-Python-3.5.1
-prompt-toolkit/1.0.6-foss-2016b-Python-2.7.12
-prompt-toolkit/1.0.6-intel-2016b-Python-2.7.12
-prompt-toolkit/1.0.6-intel-2016b-Python-3.5.2
-protobuf-python/3.0.2-foss-2016a-Python-2.7.11
-protobuf-python/3.0.2-foss-2016a-Python-3.5.1
-protobuf-python/3.2.0-intel-2016b-Python-2.7.12
-protobuf-python/3.2.0-intel-2016b-Python-3.5.2
-pscom/5.0.43-GCC-4.8.2
-pscom/5.0.44-1-GCC-4.9.2
-pscom/5.0.44-1-iccifort-2015.1.133
-pscom/5.0.48-1
-psmc/0.6.5-foss-2016a
-pyGIMLi/20160803-foss-2016a-Python-2.7.11
-pyGIMLi/20160803-foss-2016a-Python-3.5.1
-pyTables/3.0.0-ictce-5.5.0-Python-2.7.6
-pyTables/3.2.2-intel-2015b-Python-2.7.10
-pyplusplus/20160707-foss-2016a-Python-2.7.11
-pyplusplus/20160707-foss-2016a-Python-3.5.1
-python-dateutil/2.1-goolf-1.4.10-Python-2.7.3
-Qemu/2.1.2-GCC-4.4.7-system-VDE2
-Qemu/2.1.2-GCC-4.4.7-system
-Qemu/2.1.2-GCC-4.8.3-VDE2
-Qemu/2.1.2-GCC-4.9.3-binutils-2.25
-Qemu/2.1.2-foss-2015b
-Qemu/2.1.2-intel-2015b
-Qt/4.8.7-foss-2016a-GLib-2.48.0
-Qt/4.8.7-intel-2016a-GLib-2.48.0
-QuantumESPRESSO/5.4.0-foss-2016b-hybrid
-QuantumESPRESSO/6.0-intel-2017.00
-QScintilla/2.9.1-foss-2015b
-Qt5/5.6.0-foss-2016a
-Qt5/5.6.0-intel-2016a
-Qt5/5.7.0-intel-2017a
-R/2.15.2-goolf-1.4.10-bare
-R/2.15.2-goolf-1.4.10
-R/2.15.2-ictce-5.3.0-bare
-R/2.15.2-ictce-5.3.0
-R/2.15.3-goolf-1.4.10
-R/2.15.3-ictce-5.3.0
-R/3.0.1-goolf-1.4.10-bare
-R/3.0.1-ictce-5.3.0-bare
-R/3.0.2-goolf-1.4.10
-R/3.0.2-ictce-5.3.0-bare
-R/3.0.2-ictce-5.3.0
-R/3.0.2-ictce-5.5.0
-R/3.1.1-ictce-5.5.0
-R/3.1.1-ictce-6.2.5-bare-mt
-R/3.1.1-ictce-6.2.5-default-mt
-R/3.1.2-intel-2015b
-R/3.2.0-goolf-1.7.20
-R/3.2.3-foss-2016a
-R/3.2.3-foss-2016b
-R/3.2.3-intel-2015b
-R/3.2.3-intel-2016a-libX11-1.6.3
-R/3.2.3-intel-2016a
-R/3.3.1-foss-2016a
-R/3.3.1-foss-2016b
-R/3.3.1-intel-2016b
-R/3.3.2-intel-2017.00
-R-bundle-Bioconductor/3.2-foss-2016a-R-3.2.3
-R-bundle-Bioconductor/3.2-intel-2016a-R-3.2.3
-RAxML/7.2.6-goolf-1.4.10-hybrid-sse3
-RAxML/7.2.6-goolf-1.4.10-mpi-sse3
-RAxML/7.2.6-goolf-1.4.10-mt-sse3
-RAxML/7.2.6-goolf-1.4.10-seq-sse3
-RAxML/7.2.6-ictce-5.3.0-hybrid-sse3
-RAxML/7.2.6-ictce-5.3.0-mpi-sse3
-RAxML/7.2.6-ictce-5.3.0-mt-sse3
-RAxML/7.2.6-ictce-5.3.0-seq-sse3
-RAxML/7.7.5-goolf-1.4.10-hybrid-sse3
-RAxML/7.7.5-goolf-1.4.10-mpi-sse3
-RAxML/7.7.5-goolf-1.4.10-mt-sse3
-RAxML/7.7.5-goolf-1.4.10-seq-sse3
-RAxML/7.7.5-ictce-5.3.0-hybrid-sse3
-RAxML/7.7.5-ictce-5.3.0-mpi-sse3
-RAxML/7.7.5-ictce-5.3.0-mt-sse3
-RAxML/7.7.5-ictce-5.3.0-seq-sse3
-ROOT/v5.30.06-goolf-1.4.10
-ROOT/v5.34.01-goolf-1.4.10
-ROOT/v5.34.01-intel-2015a
-ROOT/v5.34.13-ictce-5.5.0
-ROOT/v5.34.18-ictce-5.5.0
-ROOT/v5.34.26-intel-2015a
-ROOT/v5.34.34-intel-2015b-Python-2.7.10
-ROOT/v5.34.34-intel-2016a-Python-2.7.11
-ROOT/v5.34.36-intel-2016a-Python-2.7.11
-RSEM/1.2.30-foss-2016a
-RSEM/1.2.30-intel-2016b
-RSEM/1.3.0-foss-2016b
-Racket/6.1.1-GCC-4.8.3
-Reads2snp/2.0
-Rosetta/2015.31.58019-intel-2015a
-Rosetta/2016.13.58602-foss-2016a
-Rust/1.12.0-foss-2016b
-Rust/1.12.1-foss-2016b
-rainbow/2.0.4-goolf-1.4.10
-randrproto/1.5.0-foss-2016a
-randrproto/1.5.0-intel-2016a
-SCOTCH/5.1.12b_esmumps-goolf-1.5.16
-SIONlib/1.6.1-tools-intel-2015b
-SQLite/3.13.0
-SQLite/3.14.1-GCCcore-4.9.3
-SQLite/3.8.10.2-foss-2015a
-SQLite/3.8.10.2-foss-2015b
-SQLite/3.8.10.2-gimkl-2.11.5
-SQLite/3.8.10.2-goolf-1.4.10
-SQLite/3.8.10.2-goolf-1.7.20
-SQLite/3.8.10.2-intel-2015a
-SQLite/3.8.10.2-intel-2015b
-SQLite/3.8.4.1-goolf-1.4.10
-SQLite/3.9.2-CrayGNU-2015.11
-SQLite/3.9.2-CrayGNU-2016.03
-SQLite/3.9.2-gimkl-2.11.5
-SQLite/3.9.2-goolf-1.7.20
-SQLite/3.9.2-intel-2016.02-GCC-4.9
-SQLite/3.9.2-iomkl-2016.07
-SQLite/3.9.2-iomkl-2016.09-GCC-4.9.3-2.25
-SWIG/3.0.7-intel-2015b-Python-2.7.9
-ScaLAPACK/2.0.2-gompi-1.5.12-OpenBLAS-0.2.8-LAPACK-3.5.0
-ScaLAPACK/2.0.2-gompi-2016a-OpenBLAS-0.2.15-LAPACK-3.6.0-GCC-5.1.0-binutils-2.25
-ScientificPython/2.9.4-foss-2016a-Python-2.7.11
-ScientificPython/2.9.4-intel-2017.00-Python-3.5.2
-Singularity/2.2-GCC-6.3.0-2.27
-Spark/1.3.0
-SuiteSparse/3.7.0-goolf-1.5.16-withparmetis
-Szip/2.1-CrayGNU-2015.06
-Szip/2.1-CrayGNU-2015.11
-Szip/2.1-goolf-1.5.12
-Szip/2.1-iomkl-2016.07
-spGPU/master
-sympy/1.0-foss-2016a-Python-2.7.11
-sympy/1.0-intel-2016a-Python-2.7.11
-S-Lang/2.3.0-GCC-4.9.2
-SCons/2.3.6-intel-2015b-Python-2.7.9
-SHORE/0.9.3-foss-2016a
-SLEPc/3.3-p1-goolf-1.4.10-Python-2.7.3
-SLEPc/3.3-p1-ictce-5.3.0-Python-2.7.3
-SLEPc/3.5.3-intel-2015a-Python-2.7.9
-SLEPc/3.6.2-intel-2015b-Python-2.7.11
-SPRNG/2.0a-goolf-1.4.10
-SPRNG/2.0a-ictce-5.3.0
-SPRNG/2.0a-ictce-5.5.0
-SPRNG/2.0b-foss-2016a
-SPRNG/2.0b-goolf-1.4.10
-SPRNG/2.0b-ictce-5.3.0
-SPRNG/2.0b-ictce-5.5.0
-STAR-Fusion/0.6.0-goolf-1.4.10-Perl-5.16.3
-STAR/2.5.0a-GNU-4.9.3-2.25
-STAR/2.5.0a-goolf-1.4.10
-STAR/2.5.1b-foss-2015b
-STAR/2.5.1b-goolf-1.4.10
-STAR/2.5.2a-foss-2016a
-STAR/2.5.2a-goolf-1.7.20
-STREAM/5.10-intel-2015a
-SUMACLUST/1.0.20-foss-2016a
-SUMATRA/1.0.20-foss-2016a
-SWASH/3.14-intel-2015b-mpi
-SWASH/3.14-intel-2015b-mt
-SWASH/3.14-intel-2015b-serial
-Saxon-HE/9.7.0.4-Java-1.7.0_79
-SeqPrep/1.2-goolf-1.7.20
-Serf/1.3.8-foss-2015a
-SnpEff/4.1_G-Java-7.0_79
-SortMeRNA/2.1-foss-2016a
-Sphinx/1.4.8-foss-2016a-Python-2.7.11
-Sphinx/1.4.8-foss-2016a-Python-3.5.1
-Stacks/1.03-goolf-1.4.10
-Stacks/1.03-ictce-5.3.0
-Stacks/1.40-foss-2016a
-Stacks/1.42-foss-2016a
-StringTie/1.2.2-goolf-1.4.10
-StringTie/1.3.0-intel-2016b
-Subversion/1.8.14-foss-2015a
-scipy/0.16.0-intel-2016b-Python-2.7.12
-segemehl/0.2.0-goolf-1.4.10
-stemming/1.0-ictce-5.5.0-Python-2.7.6
-Tcl/8.6.5
-Tcl/8.3.5-ictce-5.5.0
-Tcl/8.5.12-foss-2014b
-Tcl/8.5.12-goolf-1.4.10
-Tcl/8.5.12-ictce-5.3.0
-Tcl/8.5.12-ictce-5.5.0
-Tcl/8.5.12-intel-2014b
-Tcl/8.5.14-goolf-1.4.10
-Tcl/8.5.14-ictce-5.3.0
-Tcl/8.5.15-ictce-5.3.0
-Tcl/8.5.16-ictce-5.5.0
-Tcl/8.6.1-goolf-1.4.10
-Tcl/8.6.1-ictce-5.3.0
-Tcl/8.6.2-ictce-5.5.0
-Tcl/8.6.2-intel-2014b
-Tcl/8.6.3-GCC-4.9.2
-Tcl/8.6.3-foss-2015.05
-Tcl/8.6.3-foss-2015a
-Tcl/8.6.3-gompi-1.5.16
-Tcl/8.6.3-goolf-1.5.14
-Tcl/8.6.3-goolf-1.5.16
-Tcl/8.6.3-goolf-1.7.20
-Tcl/8.6.3-intel-2015a
-Tcl/8.6.4-foss-2015a
-Tcl/8.6.4-gimkl-2.11.5
-Tcl/8.6.4-goolf-1.4.10
-Tcl/8.6.4-goolf-1.7.20
-Tcl/8.6.4-ictce-7.3.5
-Tcl/8.6.4-intel-2015a
-Tcl/8.6.4-intel-2016.02-GCC-4.9
-Tk/8.6.4
-Tk/8.6.3-GCC-4.9.2-no-X11
-Tk/8.6.3-foss-2015.05-no-X11
-Tk/8.6.3-foss-2015a-no-X11
-Tk/8.6.3-foss-2015b-no-X11
-Tk/8.6.3-gompi-1.5.16-no-X11
-Tk/8.6.3-goolf-1.5.14-no-X11
-Tk/8.6.3-goolf-1.5.16-no-X11
-Tk/8.6.3-goolf-1.7.20-no-X11
-Tk/8.6.3-intel-2015a-no-X11
-Tk/8.6.4-foss-2015a-no-X11
-Tk/8.6.4-gimkl-2.11.5-no-X11
-Tk/8.6.4-goolf-1.4.10-no-X11
-Tk/8.6.4-goolf-1.7.20-no-X11
-Tk/8.6.4-ictce-7.3.5-no-X11
-Tk/8.6.4-intel-2015a-no-X11
-Tk/8.6.4-intel-2016.02-GCC-4.9-no-X11
-Tk/8.6.5
-Trimmomatic/0.32-Java-1.7.0_80
-tbb/4.0.0.233
-tbb/4.0.5.339
-tbb/4.3.6.211
-tmux/1.9a-GCC-4.9.2
-tmux/2.2-GCCcore-4.9.3
-TAU/2.22.2-goolf-1.5.14
-Tensorflow/0.12.1-intel-2017.00-Python-2.7.11
-TotalView/8.11.0-0-linux-x86-64
-TotalView/8.11.0-2-linux-x86-64
-TotalView/8.12.0-0-linux-x86-64
-Trilinos/10.12.2-goolf-1.5.16-Python-2.7.3
-Trilinos/12.10.1-intel-2017a-Python-2.7.11
-Trilinos/12.4.2-intel-2017a-Python-2.7.11
-Trilinos/12.8.1-intel-2017a-Python-2.7.11
-Trinity/2.1.1-intel-2015b
-Trinity/2.2.0-foss-2016a
-Trinity/2012-10-05-goolf-1.4.10
-tabix/0.2.6-goolf-1.4.10
-tabix/0.2.6-intel-2014b
-tecplot360ex/linux64
-texinfo/4.13a
-texinfo/5.2-GCC-4.8.2
-util-linux/2.26.1-goolf-1.4.10
-util-linux/2.26.1-intel-2015b
-UFL/1.0.0-goolf-1.4.10-Python-2.7.3
-UFL/1.0.0-ictce-5.3.0-Python-2.7.3
-USEARCH/5.2.236-i86linux32
-USEARCH/6.1.544-i86linux32
-USPEX/9.4.4-intel-2016b-Python-2.7.12
-VTune/2013_update10
-VTune/2013_update6
-VTune/2013_update8
-VTune/2013_update9
-VASP/5.4.1-24Jun15-intel-2015b-TEST
-VASP/5.4.1-24Jun15-intel-2015b-UV2000
-VASP/5.4.1-24Jun15-intel-2015b
-VASP/5.4.1-24Jun15-intel-2017.00
-VASP/5.4.1-24Jun15-intel-2017a
-VASP/5.4.1-intel-2016.02-GCC-4.9
-VCFtools/0.1.14-goolf-1.4.10-Perl-5.16.3
-VCFtools/0.1.14-goolf-1.7.20-Perl-5.22.2
-VarScan/2.3.6-Java-1.7.0_80
-VarScan/2.4.1-Java-1.7.0_80
-ViennaRNA/2.0.7-goolf-1.4.10
-ViennaRNA/2.0.7-ictce-5.3.0
-ViennaRNA/2.1.6-ictce-5.5.0
-vt/0.577-goolf-1.7.20
-WRF/3.8.0-intel-2016a-dmpar
-WEKA/3.6.12-Java-1.7.0_80
-WEKA/3.7.0-Java-1.7.0_80
-Whoosh/2.7.0-goolf-1.4.10-Python-2.7.3
-wget/1.17.1-foss-2016a
-wkhtmltopdf/0.12.3-Linux-x86_64
-wxPython/3.0.2.0-intel-2016a-Python-2.7.11
-XZ/5.0.5-GCC-4.8.2
-XZ/5.0.5-goolf-1.4.10
-XZ/5.0.5-ictce-5.3.0
-XZ/5.2.0-GCC-4.9.2
-XZ/5.2.2-GCC-5.4.0-2.26
-XZ/5.2.2-GCCcore-4.9.3
-XZ/5.2.2-foss-2015a
-XZ/5.2.2-foss-2016.04
-XZ/5.2.2-foss-2016a-gettext-0.19.7
-XZ/5.2.2-foss-2016b
-XZ/5.2.2-goolf-1.4.10
-XZ/5.2.2-ictce-5.3.0
-XZ/5.2.2-intel-2016a-gettext-0.19.7
-XZ/5.2.2-intel-2016a
-XZ/5.2.2-intel-2016b
-xcb-util-image/0.4.0
-xcb-util-image/0.4.0-foss-2016a
-xcb-util-image/0.4.0-intel-2015b
-xcb-util-image/0.4.0-intel-2016a
-xcb-util-keysyms/0.4.0
-xcb-util-keysyms/0.4.0-foss-2016a
-xcb-util-keysyms/0.4.0-intel-2016a
-xcb-util-renderutil/0.3.9
-xcb-util-renderutil/0.3.9-foss-2016a
-xcb-util-renderutil/0.3.9-intel-2016a
-xcb-util-wm/0.4.1
-xcb-util-wm/0.4.1-foss-2016a
-xcb-util-wm/0.4.1-intel-2015b-Python-2.7.11
-xcb-util-wm/0.4.1-intel-2015b
-xcb-util-wm/0.4.1-intel-2016a
-xcb-util/0.4.0
-xcb-util/0.4.0-foss-2016a
-xcb-util/0.4.0-intel-2016a
-xdrfile/1.1.4-intel-2015b
-xineramaproto/1.2.1-foss-2016a
-xineramaproto/1.2.1-intel-2016a
-xproto/7.0.23-goolf-1.4.10
-xproto/7.0.23-goolf-1.5.14
-xproto/7.0.23-ictce-5.3.0
-xproto/7.0.26-foss-2014b
-xproto/7.0.26-intel-2014b
-xproto/7.0.27-goolf-1.5.14
-xproto/7.0.27-intel-2015a
-xproto/7.0.28-gimkl-2.11.5
-xproto/7.0.28-intel-2015a
-xproto/7.0.28-intel-2015b
-X11/20160819-foss-2015a
-X11/20160819-foss-2016b
-X11/20160819-intel-2016b
-XKeyboardConfig/2.17-foss-2016a
-XKeyboardConfig/2.17-intel-2016a
-XQilla/2.3.0-foss-2015a
-XQilla/2.3.0-intel-2015a
-XQilla/2.3.2-foss-2015a
-XQilla/2.3.2-goolf-1.7.20
-XQilla/2.3.2-intel-2015a
-Xmipp/3.1-foss-2015a-Python-2.7.9
-Xmipp/3.1-goolf-1.4.10-with-incl-deps
-Xmipp/3.1-intel-2015a-Python-2.7.9
-zlib/1.2.7-goolf-1.5.16
-zlib/1.2.8-CrayGNU-2015.06
-zlib/1.2.8-CrayGNU-2015.11
-zlib/1.2.8-CrayGNU-2016.03
-zlib/1.2.8-GCC-4.4.7-system
-ZeroMQ/4.2.0-foss-2016b
-ZeroMQ/4.2.0-intel-2016b
-YAML-Syck/1.27-goolf-1.4.10-Perl-5.16.3
-YAML-Syck/1.27-ictce-4.1.13-Perl-5.16.3
-YAML-Syck/1.27-ictce-5.3.0-Perl-5.16.3
-Yade/1.20.0-foss-2016a-Python-2.7.11
-Yade/1.20.0-intel-2016a-Python-2.7.11
-Yade/2016.06a-foss-2016b-Python-2.7.12
-Yade/2016.06a-intel-2016b-Python-2.7.12
-Yambo/3.4.2-intel-2016.02-GCC-4.9
+imkl/11.3.1.150-iimpi-7.5.5-GCC-4.9.3-2.25
diff --git a/results/SALOMON-warning.txt b/results/SALOMON-warning.txt
index 10f9a952..49ec8ca2 100644
--- a/results/SALOMON-warning.txt
+++ b/results/SALOMON-warning.txt
@@ -1,3 +1,4 @@
+Bazel/0.5.0-GCC-7.1.0-2.28
 CMake/3.6.2-intel-2017.00
 GC3Pie/2.4.2
 git/2.10.2
@@ -6,4 +7,3 @@ git/2.8.0-GNU-4.9.3-2.25
 git/2.8.0-intel-2017.00
 git/2.8.0
 imkl/11.3.1.150-iimpi-2016.01-GCC-4.9.3
-Mesa/13.0.0-intel-2016a
diff --git a/x/X11/X11-20170314-test.eb b/x/X11/X11-20170314-test.eb
index 25a802bc..c045246d 100644
--- a/x/X11/X11-20170314-test.eb
+++ b/x/X11/X11-20170314-test.eb
@@ -15,6 +15,7 @@ source_urls = [
     'http://xcb.freedesktop.org/dist/',
     'http://xkbcommon.org/download/',
     'http://cgit.freedesktop.org/xorg/util/macros/snapshot',
+    'http://www.x.org/pub/individual/data',
 ]
 
 dependencies = [
@@ -117,6 +118,7 @@ components = [
     ('xcb-util-renderutil', '0.3.9', common_specs),         # 2014-06-13
     ('xcb-util-wm', '0.4.1', common_specs),                 # 2014-02-19
     ('xcb-util-cursor', '0.1.3', common_specs),             # 2016-05-12
+    ('xcursor-themes', '1.0.4', common_specs),
 ]
 
 # Python is required for xcb-proto
diff --git a/x/XKeyboardConfig/XKeyboardConfig-2.21.eb b/x/XKeyboardConfig/XKeyboardConfig-2.21.eb
new file mode 100644
index 00000000..e93c35b5
--- /dev/null
+++ b/x/XKeyboardConfig/XKeyboardConfig-2.21.eb
@@ -0,0 +1,35 @@
+easyblock = 'ConfigureMake'
+
+name = 'XKeyboardConfig'
+version = '2.21'
+
+homepage = 'http://www.freedesktop.org/wiki/Software/XKeyboardConfig/'
+description = """The non-arch keyboard configuration database for X Window.
+ The goal is to provide the consistent, well-structured,
+ frequently released open source of X keyboard configuration data
+ for X Window System implementations (free, open source and commercial).
+ The project is targeted to XKB-based systems."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = ['http://ftp.x.org/pub/individual/data/xkeyboard-config/']
+sources = ['xkeyboard-config-%(version)s.tar.bz2']
+
+builddependencies = [
+    ('X11', '20170314'),
+    ('libX11', '1.6.3'),
+]
+
+dependencies = [
+    ('intltool', '0.51.0')
+]
+
+# see http://www.linuxfromscratch.org/blfs/view/svn/x/xkeyboard-config.html
+configopts = '--with-xkb-rules-symlink=xorg '
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['share/X11/xkb']
+}
+
+moduleclass = 'devel'
diff --git a/x/XML-Parser/XML-Parser-2.44-foss-2016a-Perl-5.22.1.eb b/x/XML-Parser/XML-Parser-2.44-foss-2016a-Perl-5.22.1.eb
new file mode 100644
index 00000000..71416dbf
--- /dev/null
+++ b/x/XML-Parser/XML-Parser-2.44-foss-2016a-Perl-5.22.1.eb
@@ -0,0 +1,27 @@
+easyblock = 'PerlModule'
+
+name = 'XML-Parser'
+version = '2.44'
+versionsuffix = '-Perl-%(perlver)s'
+
+homepage = 'http://search.cpan.org/~toddr/XML-Parser-2.41/'
+description = """This is a Perl extension interface to James Clark's XML parser, expat."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://cpan.metacpan.org/authors/id/T/TO/TODDR/']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Perl', '5.22.1'),
+    ('expat', '2.1.1')
+]
+
+options = {'modulename': 'XML::Parser'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/perl5/site_perl/%(perlver)s/x86_64-linux-thread-multi/XML'],
+}
+
+moduleclass = 'data'
diff --git a/x/XML-Parser/XML-Parser-2.44.eb b/x/XML-Parser/XML-Parser-2.44.eb
new file mode 100644
index 00000000..358d4502
--- /dev/null
+++ b/x/XML-Parser/XML-Parser-2.44.eb
@@ -0,0 +1,25 @@
+easyblock = 'PerlModule'
+
+name = 'XML-Parser'
+version = '2.44'
+
+homepage = 'http://search.cpan.org/~toddr/XML-Parser-2.41/'
+description = """This is a Perl extension interface to James Clark's XML parser, expat."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = ['http://cpan.metacpan.org/authors/id/T/TO/TODDR/']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('expat', '2.2.0')
+]
+
+options = {'modulename': 'XML::Parser'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib64/perl5/XML'],
+}
+
+moduleclass = 'data'
diff --git a/x/xf86-video-dummy/xf86-video-dummy-0.3.5.eb b/x/xf86-video-dummy/xf86-video-dummy-0.3.8-intel-2017a.eb
similarity index 68%
rename from x/xf86-video-dummy/xf86-video-dummy-0.3.5.eb
rename to x/xf86-video-dummy/xf86-video-dummy-0.3.8-intel-2017a.eb
index 1911b93c..67ea3ec6 100644
--- a/x/xf86-video-dummy/xf86-video-dummy-0.3.5.eb
+++ b/x/xf86-video-dummy/xf86-video-dummy-0.3.8-intel-2017a.eb
@@ -1,7 +1,7 @@
 easyblock = 'ConfigureMake'
 
 name = 'xf86-video-dummy'
-version = '0.3.5'
+version = '0.3.8'
 
 homepage = "http://www.x.org/wiki/"
 description = """The xprop utility is for displaying window and font properties in an X server.
@@ -9,23 +9,23 @@ description = """The xprop utility is for displaying window and font properties
  in the case of a window, by clicking on the desired window. A list of
  properties is then given, possibly with formatting information."""
 
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = {'name': 'intel', 'version': '2017a'}
 
 sources = [SOURCE_TAR_GZ]
 source_urls = ['https://www.x.org/archive/individual/driver/']
 
-#preconfigopts = './autogen.sh && '
+preconfigopts = 'sed -i -e "/mibstore.h/d" -e "/miInitializeBackingStore/d" src/dummy_driver.c && '
 
 #builddependencies = [
 #   ('xorg-macros', '1.19.1'),
 #]
 
 dependencies = [
-    ('X11', '20170314'),
+    ('xorg-server', '1.19.3'),
 ]
 
 sanity_check_paths = {
-    'files': ['bin/xprop'],
+    'files': ['lib/xorg/modules/drivers/dummy_drv.la', 'lib/xorg/modules/drivers/dummy_drv.so'],
     'dirs': [],
 }
 
diff --git a/x/xf86-video-fbdev/xf86-video-fbdev-0.4.4.eb b/x/xf86-video-fbdev/xf86-video-fbdev-0.4.4.eb
deleted file mode 100644
index 24a39e1c..00000000
--- a/x/xf86-video-fbdev/xf86-video-fbdev-0.4.4.eb
+++ /dev/null
@@ -1,32 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'xf86-video-fbdev'
-version = '0.4.4'
-
-homepage = "http://www.x.org/wiki/"
-description = """The xprop utility is for displaying window and font properties in an X server.
- One window or font is selected using the command line arguments or possibly
- in the case of a window, by clicking on the desired window. A list of
- properties is then given, possibly with formatting information."""
-
-toolchain = {'name': 'dummy', 'version': ''}
-
-sources = [SOURCE_TAR_GZ]
-source_urls = ['https://www.x.org/archive/individual/driver/']
-
-#preconfigopts = './autogen.sh && '
-
-#builddependencies = [
-#   ('xorg-macros', '1.19.1'),
-#]
-
-dependencies = [
-    ('X11', '20170314'),
-]
-
-sanity_check_paths = {
-    'files': ['bin/xprop'],
-    'dirs': [],
-}
-
-moduleclass = 'vis'
diff --git a/x/xorg-fonts/xorg-fonts-20170314.eb b/x/xorg-fonts/xorg-fonts-20170314.eb
new file mode 100644
index 00000000..72bf4e2e
--- /dev/null
+++ b/x/xorg-fonts/xorg-fonts-20170314.eb
@@ -0,0 +1,137 @@
+easyblock = 'Bundle'
+
+name = 'xorg-fonts'
+version = '20170314'
+
+homepage = 'https://www.x.org'
+description = "The Xorg font packages provide some scalable fonts and supporting packages for Xorg applications."
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = [
+    'https://www.x.org/pub/individual/font/',
+]
+
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('fontconfig', '2.12.1', '-libpng-1.6.29'),
+    ('freetype', '2.7.1', '-libpng-1.6.29'),
+    ('zlib', '1.2.11'),
+]
+builddependencies = [
+    ('Autotools', '20150215'),
+    ('Bison', '3.0.4'),
+    ('gettext', '0.19.8.1'),
+    ('pkg-config', '0.29.2'),
+    # use same binutils version that was used when building GCCcore toolchain
+    ('binutils', '2.27', '', True),
+]
+
+default_easyblock = 'ConfigureMake'
+
+common_specs = {
+    'sources': [SOURCE_TAR_GZ],
+    'start_dir': '%(name)s-%(version)s',
+}
+components = [
+    ('xorg-macros', '1.19.1', {                             # 2017-01-29
+        'sources': ['util-macros-%(version)s.tar.gz'],
+        'start_dir': 'util-macros-%(version)s',
+    }),
+    ('libpthread-stubs', '0.4', common_specs),              # 2017-03-14
+    ('bigreqsproto', '1.1.2', common_specs),                # 2012-03-23
+    ('compositeproto', '0.4.2', common_specs),              # 2010-10-30
+    ('damageproto', '1.2.1', common_specs),                 # 2010-10-30
+    ('dmxproto', '2.3.1', common_specs),                    # 2011-01-06
+    ('dri2proto', '2.8', common_specs),                     # 2012-07-11
+    ('dri3proto', '1.0', common_specs),                     # 2013-11-01
+    ('fixesproto', '5.0', common_specs),                    # 2011-03-08
+    ('fontsproto', '2.1.3', common_specs),                  # 2014-04-14
+    ('glproto', '1.4.17', common_specs),                    # 2013-12-10
+    ('inputproto', '2.3.2', common_specs),                  # 2016-04-04
+    ('kbproto', '1.0.7', common_specs),                     # 2015-05-01
+    ('presentproto', '1.1', common_specs),                  # 2017-01-26
+    ('randrproto', '1.5.0', common_specs),                  # 2015-05-17
+    ('recordproto', '1.14.2', common_specs),                # 2012-03-23
+    ('renderproto', '0.11.1', common_specs),                # 2010-08-10
+    ('resourceproto', '1.2.0', common_specs),               # 2011-05-28
+    ('scrnsaverproto', '1.2.2', common_specs),              # 2012-03-23
+    ('videoproto', '2.3.3', common_specs),                  # 2016-03-11
+    ('xcmiscproto', '1.2.2', common_specs),                 # 2012-03-23
+    ('xextproto', '7.3.0', common_specs),                   # 2013-12-27
+    ('xf86bigfontproto', '1.2.0', common_specs),            # 2009-08-27
+    ('xf86dgaproto', '2.1', common_specs),                  # 2009-10-01
+    ('xf86driproto', '2.1.1', common_specs),                # 2011-01-06
+    ('xf86vidmodeproto', '2.3.1', common_specs),            # 2011-01-06
+    ('xineramaproto', '1.2.1', common_specs),               # 2011-01-06
+    ('xproto', '7.0.31', common_specs),                     # 2016-09-23
+    ('libXau', '1.0.8', common_specs),                      # 2013-05-24
+    ('libXdmcp', '1.1.2', common_specs),                    # 2015-03-21
+    ('xcb-proto', '1.12', common_specs),                    # 2016-05-18
+    ('libxcb', '1.12', common_specs),                       # 2016-05-18
+    ('xtrans', '1.3.5', common_specs),                      # 2014-09-22
+    ('libxkbcommon', '0.7.1', {                             # 2017-01-18
+        'sources': ['libxkbcommon-%(version)s.tar.xz'],
+        'start_dir': 'libxkbcommon-%(version)s',
+    }),
+    ('libX11', '1.6.5', common_specs),                      # 2017-02-26
+    ('libXext', '1.3.3', common_specs),                     # 2014-07-24
+    ('libFS', '1.0.7', common_specs),                       # 2015-05-01
+    ('libICE', '1.0.9', common_specs),                      # 2014-06-07
+    ('libSM', '1.2.2', common_specs),                       # 2013-09-08
+    ('libXScrnSaver', '1.2.2', common_specs),               # 2012-03-08
+    ('libXt', '1.1.5', common_specs),                       # 2015-05-01
+    ('libXmu', '1.1.2', common_specs),                      # 2013-09-08
+    ('libXpm', '3.5.12', common_specs),                     # 2016-12-15
+    ('libXaw', '1.0.13', common_specs),                     # 2015-05-01
+    ('libXfixes', '5.0.3', common_specs),                   # 2016-10-04
+    ('libXcomposite', '0.4.4', common_specs),               # 2013-01-03
+    ('libXrender', '0.9.10', common_specs),                 # 2016-10-04
+    ('libXcursor', '1.1.14', common_specs),                 # 2013-05-30
+    ('libXdamage', '1.1.4', common_specs),                  # 2013-01-03
+    ('libfontenc', '1.1.3', common_specs),                  # 2015-05-01
+    ('libXfont', '1.5.2', common_specs),                    # 2016-08-31
+    ('libXfont2', '2.0.1', common_specs),                   # 2015-12-11
+    ('libXft', '2.3.2', common_specs),                      # 2014-06-06
+    ('libXi', '1.7.9', common_specs),                       # 2017-01-23
+    ('libXinerama', '1.1.3', common_specs),                 # 2013-05-31
+    ('libXrandr', '1.5.1', common_specs),                   # 2016-10-04
+    ('libXres', '1.0.7', common_specs),                     # 2013-05-31
+    ('libXtst', '1.2.3', common_specs),                     # 2016-10-04
+    ('libXv', '1.0.11', common_specs),                      # 2016-10-04
+    ('libXvMC', '1.0.10', common_specs),                    # 2016-10-04
+    ('libXxf86dga', '1.1.4', common_specs),                 # 2013-05-31
+    ('libXxf86vm', '1.1.4', common_specs),                  # 2015-02-24
+    ('libdmx', '1.1.3', common_specs),                      # 2013-05-28
+    ('libpciaccess', '0.13.4', common_specs),               # 2015-05-01
+    ('libxkbfile', '1.0.9', common_specs),                  # 2015-05-01
+    ('libxshmfence', '1.2', common_specs),                  # 2015-01-02
+    ('xcb-util', '0.4.0', common_specs),                    # 2014-10-15
+    ('xcb-util-image', '0.4.0', common_specs),              # 2014-10-15
+    ('xcb-util-keysyms', '0.4.0', common_specs),            # 2014-10-01
+    ('xcb-util-renderutil', '0.3.9', common_specs),         # 2014-06-13
+    ('xcb-util-wm', '0.4.1', common_specs),                 # 2014-02-19
+    ('xcb-util-cursor', '0.1.3', common_specs),             # 2016-05-12
+]
+
+# Python is required for xcb-proto
+allow_system_deps = [('Python', SYS_PYTHON_VERSION)]
+pyshortver = '.'.join(SYS_PYTHON_VERSION.split('.')[0:2])
+
+preconfigopts = "if [ ! -f configure ]; then ./autogen.sh; fi && "
+
+#xkbcommon configuration dir
+postinstallcmds = [
+	'ln -s %(installdir)s/share/xcb %(installdir)s/share/X11/xkb'
+]
+
+# specify that Bundle easyblock should run a full sanity check, rather than just trying to load the module
+full_sanity_check = True
+
+sanity_check_paths = {
+    'files': ['include/X11/Xlib.h', 'include/X11/Xutil.h'],
+    'dirs': ['include/GL', 'include/X11', 'include/X11/extensions', 'lib',
+             'lib/python%s/site-packages/xcbgen' % pyshortver, 'lib/pkgconfig', 'share/pkgconfig'],
+}
+
+moduleclass = 'vis'
diff --git a/x/xorg-server/xorg-server-1.19.3-intel-2017a.eb b/x/xorg-server/xorg-server-1.19.3-intel-2017a.eb
new file mode 100644
index 00000000..5f497b71
--- /dev/null
+++ b/x/xorg-server/xorg-server-1.19.3-intel-2017a.eb
@@ -0,0 +1,32 @@
+easyblock = 'ConfigureMake'
+
+name = 'xorg-server'
+version = '1.19.3'
+
+homepage = "http://www.x.org/wiki/"
+description = "The Xorg Server is the core of the X Window system."
+
+toolchain = {'name': 'intel', 'version': '2017a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://www.x.org/archive/individual/xserver/']
+
+configopts = '--disable-glamor --enable-suid-wrapper --disable-systemd-logind'
+
+#builddependencies = [
+#   ('xorg-macros', '1.19.1'),
+#]
+
+dependencies = [
+    ('Mesa', '17.0.2'),
+    ('X11', '20170314', '', True),
+    ('nettle', '3.3'),
+    ('XKeyboardConfig', '2.21', '', True)
+]
+
+sanity_check_paths = {
+    'files': ['bin/Xorg', 'bin/Xvfb', 'bin/Xnest'],
+    'dirs': ['bin', 'lib', 'include'],
+}
+
+moduleclass = 'vis'
diff --git a/x/xorg-server/xorg-server-1.19.3.eb b/x/xorg-server/xorg-server-1.19.3.eb
deleted file mode 100644
index b8e79675..00000000
--- a/x/xorg-server/xorg-server-1.19.3.eb
+++ /dev/null
@@ -1,32 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'xorg-server'
-version = '1.19.3'
-
-homepage = "http://www.x.org/wiki/"
-description = """The xprop utility is for displaying window and font properties in an X server.
- One window or font is selected using the command line arguments or possibly
- in the case of a window, by clicking on the desired window. A list of
- properties is then given, possibly with formatting information."""
-
-toolchain = {'name': 'dummy', 'version': ''}
-
-sources = [SOURCE_TAR_GZ]
-source_urls = ['https://www.x.org/archive/individual/xserver/']
-
-#preconfigopts = './autogen.sh && '
-
-#builddependencies = [
-#   ('xorg-macros', '1.19.1'),
-#]
-
-dependencies = [
-    ('X11', '20170314'),
-]
-
-sanity_check_paths = {
-    'files': ['bin/xprop'],
-    'dirs': [],
-}
-
-moduleclass = 'vis'