diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index c93f9dee840b1674f69f968af4afb656a9d05552..585eb113b244b0260abd946bd6c5d72361521292 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,8 +1,92 @@
 This file contains a description of the major changes to the easybuild-easyconfigs EasyBuild package.
 For more detailed information, please see the git log.
 
-The latest version of easybuild-easyconfig provides 1,939 easyconfig files, for 396 different software packages
-and 27 different (compiler) toolchains.
+The latest version of easybuild-easyconfig provides 2,372 easyconfig files, for 451 different software packages
+and 28 different (compiler) toolchains.
+
+v1.12.1 (April 25th 2014)
+--------------------------
+
+(no changes compared to v1.12.0, simple version bump to stay in sync with easybuild-framework)
+
+v1.12.0 (April 4th 2014)
+------------------------
+
+feature + bugfix release
+- added example easyconfig files for 6 new software packages:
+    CLooG (#653), ELPA (#738), LIBSVM (#788), netaddr (#753), netifcas (#753), slalib-c (#750)
+- added easyconfigs for new toolchains:
+    ClangGCC/1.3.0 (#653), goolf/1.4.10-no-OFED (#749), goolf/1.5.14(-no-OFED) (#764, #767), ictce/6.2.5 (#726), iomkl (#747)
+- added additional easyconfigs for various supported software packages: version updates, different toolchains, ...
+- various enhancements, including:
+    - tweak BOINC easyconfig to make use of glob support available for files_to_copy (#781)
+    - enable -fPIC for libreadline, so it can be linked into shared libs (e.g. libpython2.x.so) (#798)
+- various bug fixes, including:
+    - fix Qt source_urls (#756)
+    - enable -fPIC in ncurses 5.9 ictce/5.2.0 easyconfig, just like in the others (#801)
+    - fix unit tests after changes to framework (#763, #766, #769)
+
+v1.11.1 (February 28th 2014)
+----------------------------
+
+(no changes compared to v1.11.0, simple version bump to stay in sync with easybuild-framework)
+
+v1.11.0 (February 16th 2014)
+----------------------------
+
+feature + bugfix release
+- added example easyconfig files for 30 new software packages:
+    argtable (#669), Clustal-Omega (#669), Coreutils (#582), GMT (#560), gperftools (#596), grep (#582), h4toh5 (#597),
+    libunwind (#596), Lmod (#600, #692), Lua (#600, #692), MAFFT (#654), Molekel (#597), NEdit (#597),
+    netcdf4-python (#660), nodejs (#678), OCaml (#704), patch (#582), PhyML (#664),
+    PRACE Common Production Environment (#599), protobuf (#680), python-dateutil (#438), sed (#582), sickle (#651),
+    Tesla-Deployment-Kit (#489), TREE-PUZZLE (#662), VCFtools (#626), Vim (#665), vsc-mympirun-scoop (#661),
+    vsc-processcontrol (#661), XZ (#582)
+- added additional easyconfigs for various supported software packages: version updates, different toolchains, ...
+    - OpenSSL with ictce toolchain (#703)
+- various enhancements, including:
+    - using more constants and templates (#613, #615)
+    - specify OS dependency for SSL support, with OpenSSL dependency as fallback (#703)
+- various bug fixes, including:
+    - fix unit tests after (internal) framework API changes (#667, #672)
+    - fix homepage in vsc-mympirun easyconfig file (#681)
+    - align OpenMPI easyconfigs (#650)
+    - add additional source URL in Qt easyconfigs (#676)
+    - specify correct $PATH specification and define $CHPL_HOME for Chapel (#683)
+
+v1.10.0 (December 24th 2013)
+----------------------------
+
+feature + bugfix release
+- added example easyconfig files for 18 new software packages:
+    BEDTools (#579, #632, #635), CAP3 (#548), CHARMM (#584), cutadapt (#620), ErlangOTP (#556, #630),
+    Ghostscript (#547, #632), HTSeq (#554, #632), Jansson (#545), libjpeg-turbo (#574), Molden (#566),
+    netloc (#545), o2scl (#633), packmol (#566), PP (#405), qtop (#500), TAMkin (#566), vsc-base (#621),
+    vsc-mympirun (#621)
+- added easyconfigs for new toolchains (#545, #609, #629):
+    gcccuda/2.6.10, gompic/2.6.10, goolfc/2.6.10, ictce/6.0.5, ictce/6.1.5
+- added additional easyconfigs for various supported software packages: version updates, different toolchains, ...
+    - new versions of icc, ifort, imkl, impi (#609, #629)
+    - large collection of ictce/5.3.0 easyconfigs (#627)
+- various enhancements, including:
+    - extended list of Python packages as extensions to Python (#625)
+    - add MPI-enabled version of GROMACS + easyconfigs using ictce (#606, #636)
+    - clean up templating of source_urls (#637)
+- various bug fixes, including:
+    - provide alternative download URL for Mesa (#532)
+    - add Python versionsuffix in OpenBabel filenames (#566)
+    - apply no-gets patch in all M4 v1.4.16 easyconfigs (#623)
+    - fix patching of Python w.r.t. libffi/_ctypes issues (#625, #642)
+    - bug fixes in GROMACS easyconfigs (#606)
+        - change versionsuffix for non-MPI GROMACS easyconfigs to '-mt'
+        - stop using 'CMakeMake' easyblock for GROMACS now that there's a dedicated GROMACS easyblock,
+          which correctly specifies building against external BLAS/LAPACK libraries
+    - fix Qt dependency for CGAL (#642)
+    - fix libctl, libmatheval, Meep, PSI build issues caused by full paths in guile-config/python-config shebang (#642)
+    - make sure HDF easyconfigs specify dedicated 'include/hdf' include dir (#642)
+        - this is required to avoid build issues with NCL, because HDF ships it's own netcdf.h
+        - this also triggered removal of patch files for NCL that rewrote 'include/hdf' to 'include'
+    - fix WPS v3.5.1 patch file after upstream source tarball was changed, supply checksum for verification (#642)
 
 v1.9.0 (November 17th 2013)
 ---------------------------
diff --git a/easybuild/easyconfigs/a/ABySS/ABySS-1.3.6-goolf-1.4.10-Python-2.7.5.eb b/easybuild/easyconfigs/a/ABySS/ABySS-1.3.6-goolf-1.4.10-Python-2.7.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3d65bd4489ea7650e68d839f9acd3fa49867e4c9
--- /dev/null
+++ b/easybuild/easyconfigs/a/ABySS/ABySS-1.3.6-goolf-1.4.10-Python-2.7.5.eb
@@ -0,0 +1,37 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine
+# Authors::   Fotis Georgatos <fotis.georgatos@uni.lu>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html
+##
+
+name = 'ABySS'
+version = '1.3.6'
+versionsuffix = '-Python-2.7.5'
+
+homepage = 'http://www.bcgsc.ca/platform/bioinfo/software/abyss'
+description = """Assembly By Short Sequences - a de novo, parallel, paired-end sequence assembler"""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+toolchainopts = {'usempi': True}
+
+# eg. http://www.bcgsc.ca/downloads/abyss/abyss-1.3.4.tar.gz
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.bcgsc.ca/downloads/abyss/']
+
+dependencies = [ 
+    ('google-sparsehash', '2.0.2'),
+    ('Boost', '1.49.0', versionsuffix),
+]
+ 
+sanity_check_paths = {
+    'files': ["bin/ABYSS", "bin/ABYSS-P"],
+    'dirs': []
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/a/APBS/APBS-1.4-linux-static-x86_64.eb b/easybuild/easyconfigs/a/APBS/APBS-1.4-linux-static-x86_64.eb
new file mode 100644
index 0000000000000000000000000000000000000000..730a5cb604661e816f5c4e11e508a857ad1af81f
--- /dev/null
+++ b/easybuild/easyconfigs/a/APBS/APBS-1.4-linux-static-x86_64.eb
@@ -0,0 +1,28 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+name = 'APBS'
+version = '1.4'
+versionsuffix = '-linux-static-x86_64'
+
+easyblock = 'PackedBinary'
+
+homepage = 'http://www.poissonboltzmann.org/apbs'
+description = """ APBS is a software package for modeling biomolecular solvation 
+ through solution of the Poisson-Boltzmann equation (PBE), one of the most popular 
+ continuum models for describing electrostatic interactions between molecular solutes 
+ in salty, aqueous media. """
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['%(name)s-%(version)s%(versionsuffix)s.tar.gz']
+
+sanity_check_paths = {
+    'files': ['bin/apbs'],
+    'dirs': []
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.7.2.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.7.2.eb
index fcd7007494b4cb053c70f823bf76a92e2eca7d32..39d449ebf40949e334c80975dc11186246415070 100755
--- a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.7.2.eb
+++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.7.2.eb
@@ -6,7 +6,7 @@ description = """Autoconf is an extensible package of M4 macros that produce she
 
 toolchain = {'name': 'GCC', 'version': '4.7.2'}
 
-source_urls = ['http://ftpmirror.gnu.org/%(namelower)s/']
+source_urls = [GNU_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 dependencies = [('M4', '1.4.16')]
diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.8.2.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.8.2.eb
index 5211af2bb2389661167f9687c1a5d6cdfba6aca4..231ec6e1b84117dabb4418e72e900c5a7f8602e0 100644
--- a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.8.2.eb
+++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.8.2.eb
@@ -10,7 +10,7 @@ description = """Autoconf is an extensible package of M4 macros that produce she
 
 toolchain = {'name': 'GCC', 'version': '4.8.2'}
 
-source_urls = ['http://ftpmirror.gnu.org/%s/' % name.lower()]
+source_urls = [GNU_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 dependencies = [('M4', '1.4.16')]
diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-gcccuda-2.6.10.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-gcccuda-2.6.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3dbedef6bb93fd107a55199eb2153ad861384d2d
--- /dev/null
+++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-gcccuda-2.6.10.eb
@@ -0,0 +1,24 @@
+name = 'Autoconf'
+version = '2.69'
+
+homepage = 'http://www.gnu.org/software/autoconf/'
+description = """Autoconf is an extensible package of M4 macros that produce shell scripts
+ to automatically configure software source code packages. These scripts can adapt the
+ packages to many kinds of UNIX-like systems without manual user intervention. Autoconf
+ creates a configuration script for a package from a template file that lists the
+ operating system features that the package can use, in the form of M4 macro calls."""
+
+toolchain = {'name': 'gcccuda', 'version': '2.6.10'}
+
+source_urls = ['http://ftpmirror.gnu.org/%s/' % name.lower()]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('M4', '1.4.16')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ["autoconf", "autoheader", "autom4te", "autoreconf", "autoscan",
+                                     "autoupdate", "ifnames"]],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-goalf-1.1.0-no-OFED.eb
index 7b684881298a542b7e30fd0ae14f3a859417e60b..e0b581ce3d97763e2ef3499cd6d4cdf54338a52c 100644
--- a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-goalf-1.1.0-no-OFED.eb
@@ -9,7 +9,7 @@ description = """Autoconf is an extensible package of M4 macros that produce she
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
-source_urls = ['http://ftpmirror.gnu.org/%(namelower)s/']
+source_urls = [GNU_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 dependencies = [('M4', '1.4.16')]
diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-goolf-1.4.10.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-goolf-1.4.10.eb
index 82a404f0236ab2c2cedb41150d3143ed622e0579..a25b326d5936f66f9a29f5276c64cc9c068b0c27 100644
--- a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-goolf-1.4.10.eb
@@ -6,7 +6,7 @@ description = """Autoconf is an extensible package of M4 macros that produce she
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-source_urls = ['http://ftpmirror.gnu.org/%(namelower)s/']
+source_urls = [GNU_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 dependencies = [('M4', '1.4.16')]
diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.0.6.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.0.6.eb
index 749be4325ea0f0e2b2fa46a079a078595fc72adc..0a829a5bd278577d7a0f7cd3300ec5d8013c512d 100644
--- a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.0.6.eb
@@ -9,7 +9,7 @@ description = """Autoconf is an extensible package of M4 macros that produce she
 
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
-source_urls = ['http://ftpmirror.gnu.org/%(namelower)s/']
+source_urls = [GNU_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 dependencies = [('M4', '1.4.16')]
diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb
index a41534f1d851ba3aee4d4a9017751ed882073beb..e304f4b331e5d5268ce8236e3424b8568d7b390b 100644
--- a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb
@@ -9,7 +9,7 @@ description = """Autoconf is an extensible package of M4 macros that produce she
 
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
-source_urls = ['http://ftpmirror.gnu.org/%(namelower)s/']
+source_urls = [GNU_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 dependencies = [('M4', '1.4.16')]
diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-5.3.0.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-5.3.0.eb
index 22f54366ee6dc3dcf75cea3f1d7f7c2b943c64b0..c9ccb7d9113492d71dc896bd2cab614b5cb38cfa 100644
--- a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-5.3.0.eb
@@ -9,7 +9,7 @@ description = """Autoconf is an extensible package of M4 macros that produce she
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
-source_urls = ['http://ftpmirror.gnu.org/%(namelower)s/']
+source_urls = [GNU_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 dependencies = [('M4', '1.4.16')]
diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-5.5.0.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..80861e6d4f0910783cf74639c2604b87a71a017b
--- /dev/null
+++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-5.5.0.eb
@@ -0,0 +1,22 @@
+name = 'Autoconf'
+version = '2.69'
+
+homepage = 'http://www.gnu.org/software/autoconf/'
+description = """Autoconf is an extensible package of M4 macros that produce shell scripts to automatically
+ configure software source code packages. These scripts can adapt the packages to many kinds of UNIX-like
+ systems without manual user intervention. Autoconf creates a configuration script for a package from a
+ template file that lists the operating system features that the package can use, in the form of M4 macro calls."""
+toolchain = {'name': 'ictce', 'version': '5.5.0'} 
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('M4', '1.4.16')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ["autoconf", "autoheader", "autom4te", "autoreconf",
+                                     "autoscan", "autoupdate", "ifnames"]],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/a/Automake/Automake-1.13.4-goolf-1.4.10.eb b/easybuild/easyconfigs/a/Automake/Automake-1.13.4-goolf-1.4.10.eb
index 57089120312ba8284da33837b9e1f94f45e91f6d..8dced5a5fcaa2944655c5b606ef2429d092f8fff 100644
--- a/easybuild/easyconfigs/a/Automake/Automake-1.13.4-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/a/Automake/Automake-1.13.4-goolf-1.4.10.eb
@@ -16,7 +16,7 @@ version = '1.13.4'
 homepage = 'http://www.gnu.org/software/automake/automake.html'
 description = "Automake: GNU Standards-compliant Makefile generator"
 
-source_urls = ['http://ftp.gnu.org/gnu/automake']
+source_urls = [GNU_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
diff --git a/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-4.1.13.eb b/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-4.1.13.eb
index e6a35fdebc3ceacf277f60140105255bd7f1563b..4ce71128df49fb897310b8cf2cd42190b530561b 100644
--- a/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-4.1.13.eb
@@ -16,7 +16,7 @@ version = '1.13.4'
 homepage = 'http://www.gnu.org/software/automake/automake.html'
 description = "Automake: GNU Standards-compliant Makefile generator"
 
-source_urls = ['http://ftp.gnu.org/gnu/automake']
+source_urls = [GNU_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
diff --git a/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-5.3.0.eb b/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-5.3.0.eb
index a6aed31760f1da968f67ce7abc22543e61cbcad0..e10d9467791cac1b18948d5ee5a1b986c0f81e1a 100644
--- a/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-5.3.0.eb
@@ -16,7 +16,7 @@ version = '1.13.4'
 homepage = 'http://www.gnu.org/software/automake/automake.html'
 description = "Automake: GNU Standards-compliant Makefile generator"
 
-source_urls = ['http://ftp.gnu.org/gnu/automake']
+source_urls = [GNU_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
diff --git a/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-5.5.0.eb b/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b587eedafbfddd108faa1a8c0fb20ce4efcf8720
--- /dev/null
+++ b/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-5.5.0.eb
@@ -0,0 +1,26 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Authors::   Alan O'Cais <a.ocais@fz-juelich.de>
+# $Id$
+#
+##
+
+name = 'Automake'
+version = '1.13.4'
+
+homepage = 'http://www.gnu.org/software/automake/automake.html'
+description = "Automake: GNU Standards-compliant Makefile generator"
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+toolchain = {'name': 'ictce', 'version': '5.5.0'} 
+
+dependencies = [('Autoconf', '2.69')]
+
+sanity_check_paths = {
+    'files': ['bin/automake', 'bin/aclocal'],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/a/Automake/Automake-1.14-GCC-4.8.2.eb b/easybuild/easyconfigs/a/Automake/Automake-1.14-GCC-4.8.2.eb
index 38cd369b16e1d9ddcf6ec9f2396e580b51d3c1b0..6a66db04010fc9e57b306d29931c52fb5f31f24d 100644
--- a/easybuild/easyconfigs/a/Automake/Automake-1.14-GCC-4.8.2.eb
+++ b/easybuild/easyconfigs/a/Automake/Automake-1.14-GCC-4.8.2.eb
@@ -18,7 +18,7 @@ description = "Automake: GNU Standards-compliant Makefile generator"
 
 toolchain = {'name': 'GCC', 'version': '4.8.2'}
 
-source_urls = ['http://ftp.gnu.org/gnu/automake']
+source_urls = [GNU_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 dependencies = [('Autoconf', '2.69')]
diff --git a/easybuild/easyconfigs/a/Automake/Automake-1.14-gcccuda-2.6.10.eb b/easybuild/easyconfigs/a/Automake/Automake-1.14-gcccuda-2.6.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..60bb66737932bf4d2306408a006e5d3b02083de8
--- /dev/null
+++ b/easybuild/easyconfigs/a/Automake/Automake-1.14-gcccuda-2.6.10.eb
@@ -0,0 +1,31 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine
+# Authors::   Fotis Georgatos <fotis.georgatos@uni.lu>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/
+##
+
+name = 'Automake'
+version = "1.14"
+
+homepage = 'http://www.gnu.org/software/automake/automake.html'
+description = "Automake: GNU Standards-compliant Makefile generator"
+
+toolchain = {'name': 'gcccuda', 'version': '2.6.10'}
+
+source_urls = ['http://ftp.gnu.org/gnu/automake']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('Autoconf', '2.69')]
+
+sanity_check_paths = {
+    'files': ['bin/automake', 'bin/aclocal'],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/a/Automake/Automake-1.14-ictce-5.3.0.eb b/easybuild/easyconfigs/a/Automake/Automake-1.14-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8b02799901f273e721e1e71e99641f19c8469a11
--- /dev/null
+++ b/easybuild/easyconfigs/a/Automake/Automake-1.14-ictce-5.3.0.eb
@@ -0,0 +1,31 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine
+# Authors::   Fotis Georgatos <fotis.georgatos@uni.lu>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/
+##
+
+name = 'Automake'
+version = "1.14"
+
+homepage = 'http://www.gnu.org/software/automake/automake.html'
+description = "Automake: GNU Standards-compliant Makefile generator"
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = ['http://ftp.gnu.org/gnu/automake']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('Autoconf', '2.69')]
+
+sanity_check_paths = {
+    'files': ['bin/automake', 'bin/aclocal'],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goalf-1.1.0-no-OFED.eb
index aae867d2affd553324d663bd53e736b2cad6ec97..f1ed26f41ea680e05a9c6e86c750cec3fc17470b 100644
--- a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goalf-1.1.0-no-OFED.eb
@@ -16,7 +16,7 @@ description = """a2ps-4.14: Formats an ascii file for printing on a postscript p
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/a2ps']
+source_urls = [GNU_SOURCE]
 
 dependencies = [
     ('gettext', '0.18.2'),
diff --git a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goolf-1.4.10.eb b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goolf-1.4.10.eb
index 85c12af22472f26afec048f71b935c0f82a597f1..85a8aac89e4623fccd78a33ab448c6ff105a982f 100644
--- a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goolf-1.4.10.eb
@@ -16,7 +16,7 @@ description = """a2ps-4.14: Formats an ascii file for printing on a postscript p
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/a2ps']
+source_urls = [GNU_SOURCE]
 
 dependencies = [
     ('gettext', '0.18.2'),
diff --git a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-4.0.6.eb b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-4.0.6.eb
index 5f8b190cfffbd02d9827e2252083b269a7fde20f..1a8b5ec4d6cda642c348f4711b546195f4829d7e 100644
--- a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-4.0.6.eb
@@ -16,7 +16,7 @@ description = """a2ps-4.14: Formats an ascii file for printing on a postscript p
 toolchain = {'version': '4.0.6', 'name': 'ictce'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/a2ps']
+source_urls = [GNU_SOURCE]
 
 dependencies = [
     ('gettext', '0.18.2'),
diff --git a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-5.3.0.eb b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-5.3.0.eb
index 442f9c380e3801f52af7de3c11d63abad1a1cd0a..8b4d01b9b229d2e9161ea1ceca4243747d7449c4 100644
--- a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-5.3.0.eb
@@ -17,7 +17,7 @@ description = """a2ps-4.14: Formats an ascii file for printing on a postscript p
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/a2ps']
+source_urls = [GNU_SOURCE]
 
 dependencies = [
     ('gettext', '0.18.2'),
diff --git a/easybuild/easyconfigs/a/argtable/argtable-2.13-goolf-1.4.10.eb b/easybuild/easyconfigs/a/argtable/argtable-2.13-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9dae0dc5daf6d7186b7dd9885f6260081533adb5
--- /dev/null
+++ b/easybuild/easyconfigs/a/argtable/argtable-2.13-goolf-1.4.10.eb
@@ -0,0 +1,23 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+name = 'argtable'
+version = '2.13'
+
+homepage = 'http://argtable.sourceforge.net/'
+description = """ Argtable is an ANSI C library for parsing GNU style 
+ command line options with a minimum of fuss. """
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['%s%s.tar.gz' % (name, version.replace('.','-'))]
+
+sanity_check_paths = {
+    'files': ['lib/libargtable2.so', 'lib/libargtable2.la'],
+    'dirs': ['include', 'lib', 'share'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.3.0-mt.eb b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.3.0-mt.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4abff36b045dd215d4d286760b8bd369bfaf21e8
--- /dev/null
+++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.3.0-mt.eb
@@ -0,0 +1,27 @@
+name = 'arpack-ng'
+version = '3.1.3'
+versionsuffix = '-mt'
+
+homepage = 'http://forge.scilab.org/index.php/p/arpack-ng/'
+description = """ARPACK is a collection of Fortran77 subroutines designed to solve large scale eigenvalue problems."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'opt': True, 'optarch': True, 'pic': True, 'usempi': False}
+
+source_urls = ['http://forge.scilab.org/index.php/p/arpack-ng/downloads/get/']
+sources = [SOURCELOWER_TAR_GZ]
+
+# do not change the order of the patches or things will break
+patches = [
+    'arpack-ng-3.1.3-update-to-head.patch',
+    'arpack-ng-3.1.3-pkgconfig.patch',
+]
+
+configopts = '--with-pic --with-blas="$LIBBLAS_MT" --with-lapack="$LIBLAPACK_MT"'
+
+sanity_check_paths = {
+    'files': ["lib/libarpack.a", "lib/libarpack.so"],
+    'dirs': []
+}
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-goolf-1.4.10.eb b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6cb0f4b8184d1697be0c248eebbc960823624cfc
--- /dev/null
+++ b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-goolf-1.4.10.eb
@@ -0,0 +1,23 @@
+easyblock = 'MakeCp'
+
+name = 'BEDTools'
+version = '2.17.0'
+
+homepage = 'http://code.google.com/p/bedtools/'
+description = """The BEDTools utilities allow one to address common genomics tasks such as finding feature overlaps
+ and computing coverage. The utilities are largely based on four widely-used file formats: BED, GFF/GTF, VCF,
+ and SAM/BAM."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ["http://bedtools.googlecode.com/files/"]
+sources = ['%(name)s.v%(version)s.tar.gz']
+
+files_to_copy = ["bin", "docs", "data", "genomes", "scripts", "test"]
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in ['bedtools', 'pairToBed', 'mergeBed','bedToBam','fastaFromBed']],
+    'dirs': files_to_copy,
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-ictce-4.1.13.eb b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-ictce-4.1.13.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3cb9f10e2d7db452dfb0cb7c9bac1c3e45467b5e
--- /dev/null
+++ b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-ictce-4.1.13.eb
@@ -0,0 +1,23 @@
+easyblock = 'MakeCp'
+
+name = 'BEDTools'
+version = '2.17.0'
+
+homepage = 'http://code.google.com/p/bedtools/'
+description = """The BEDTools utilities allow one to address common genomics tasks such as finding feature overlaps
+ and computing coverage. The utilities are largely based on four widely-used file formats: BED, GFF/GTF, VCF,
+ and SAM/BAM."""
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+
+source_urls = ["http://bedtools.googlecode.com/files/"]
+sources = ['%(name)s.v%(version)s.tar.gz']
+
+files_to_copy = ["bin", "docs", "data", "genomes", "scripts", "test"]
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in ['bedtools', 'pairToBed', 'mergeBed','bedToBam','fastaFromBed']],
+    'dirs': files_to_copy,
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.18.1-goolf-1.4.10.eb b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.18.1-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d45afb71d95f08d7e42f3b1122e6079a08dab3f8
--- /dev/null
+++ b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.18.1-goolf-1.4.10.eb
@@ -0,0 +1,27 @@
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics (SIB)
+# Biozentrum - University of Basel
+
+easyblock = 'MakeCp'
+
+name = 'BEDTools'
+version = '2.18.1'
+
+homepage = "https://github.com/arq5x/bedtools2"
+description = """The BEDTools utilities allow one to address common genomics tasks such as finding feature overlaps
+ and computing coverage. The utilities are largely based on four widely-used file formats: BED, GFF/GTF, VCF,
+ and SAM/BAM."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['https://github.com/arq5x/bedtools2/archive/']
+sources = ['v%(version)s.tar.gz']
+
+files_to_copy = ["bin", "docs", "data", "genomes", "scripts", "test"]
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in ['bedtools', 'pairToBed', 'mergeBed','bedToBam','fastaFromBed']],
+    'dirs': files_to_copy,
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/BOINC/BOINC-7.0.65-goolf-1.4.10-client.eb b/easybuild/easyconfigs/b/BOINC/BOINC-7.0.65-goolf-1.4.10-client.eb
index cd332e88ad50a2328673f460fd9b9a760ed0babb..ffdbd6626559ad6b3ee0f2bc0c88624478354cef 100644
--- a/easybuild/easyconfigs/b/BOINC/BOINC-7.0.65-goolf-1.4.10-client.eb
+++ b/easybuild/easyconfigs/b/BOINC/BOINC-7.0.65-goolf-1.4.10-client.eb
@@ -23,11 +23,12 @@ with_configure = True
 preconfigopts = './_autosetup &&'
 configopts = '--disable-server --disable-manager --enable-client'
 
-files_to_copy = [(['client/boinc','client/boinccmd'], 'bin')]
+# copy boinc and boinccmd binaries
+files_to_copy = [(['client/boin*[cd]'], 'bin')]
 
 # make sure the binary are available after installation
 sanity_check_paths = {
-    'files': ["bin/boinc",],
+    'files': ["bin/boinc", "bin/boinccmd"],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/b/BWA/BWA-0.7.5a-goolf-1.4.10.eb b/easybuild/easyconfigs/b/BWA/BWA-0.7.5a-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f2eec4ae3cc82c8c5030bfcaca2c3e12bc7f728a
--- /dev/null
+++ b/easybuild/easyconfigs/b/BWA/BWA-0.7.5a-goolf-1.4.10.eb
@@ -0,0 +1,26 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 Cyprus Institute / CaSToRC, University of Luxembourg / LCSB
+# Authors::   George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Fotis Georgatos <fotis.georgatos@uni.lu>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html
+##
+
+name = 'BWA'
+version = '0.7.5a'
+
+homepage = 'http://bio-bwa.sourceforge.net/'
+description = """Burrows-Wheeler Aligner (BWA) is an efficient program that aligns
+ relatively short nucleotide sequences against a long reference sequence such as the human genome."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = [('http://sourceforge.net/projects/bio-bwa/files/', 'download')]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/Bash/Bash-4.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/b/Bash/Bash-4.2-goalf-1.1.0-no-OFED.eb
index 359650da7462a0c56e6a8bf723123726f5c3afae..8ffbecad50f998e3f2124031e6175dce3841594c 100644
--- a/easybuild/easyconfigs/b/Bash/Bash-4.2-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/b/Bash/Bash-4.2-goalf-1.1.0-no-OFED.eb
@@ -21,7 +21,7 @@ description = """Bash is an sh-compatible command language interpreter that exec
 toolchain = {'name' : 'goalf', 'version' : '1.1.0-no-OFED'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s']
+source_urls = [GNU_SOURCE]
 
 sanity_check_paths = {
     'files': ["bin/bash"],
diff --git a/easybuild/easyconfigs/b/Bash/Bash-4.2-goolf-1.4.10.eb b/easybuild/easyconfigs/b/Bash/Bash-4.2-goolf-1.4.10.eb
index ebae0731f477083defc27a9539e4e7eaab23d1e2..d4a53daa14505bcc0c7735cf7d0e071dc31b1d5c 100644
--- a/easybuild/easyconfigs/b/Bash/Bash-4.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/Bash/Bash-4.2-goolf-1.4.10.eb
@@ -21,7 +21,7 @@ description = """Bash is an sh-compatible command language interpreter that exec
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s']
+source_urls = [GNU_SOURCE]
 
 sanity_check_paths = {
     'files': ["bin/bash"],
diff --git a/easybuild/easyconfigs/b/Bash/Bash-4.2-ictce-5.3.0.eb b/easybuild/easyconfigs/b/Bash/Bash-4.2-ictce-5.3.0.eb
index 953596556a9db5524e0d3e867cbd78c254c6559f..0863522494c73f16260f958aa4f81e730cc25535 100644
--- a/easybuild/easyconfigs/b/Bash/Bash-4.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/b/Bash/Bash-4.2-ictce-5.3.0.eb
@@ -21,7 +21,7 @@ description = """Bash is an sh-compatible command language interpreter that exec
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s']
+source_urls = [GNU_SOURCE]
 
 sanity_check_paths = {
     'files': ["bin/bash"],
diff --git a/easybuild/easyconfigs/b/BayesTraits/BayesTraits-1.0-linux32.eb b/easybuild/easyconfigs/b/BayesTraits/BayesTraits-1.0-linux32.eb
new file mode 100644
index 0000000000000000000000000000000000000000..49c78aa1c48b4e74c221c0c12ddc0c01416639f6
--- /dev/null
+++ b/easybuild/easyconfigs/b/BayesTraits/BayesTraits-1.0-linux32.eb
@@ -0,0 +1,32 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+easyblock = "Tarball"
+
+name = 'BayesTraits'
+version = '1.0-linux32'
+
+homepage = 'http://www.evolution.reading.ac.uk/BayesTraitsV1.html'
+description = """ BayesTraits is a computer package for performing analyses of trait 
+ evolution among groups of species for which a phylogeny or sample of phylogenies is 
+ available. This new package incoporates our earlier and separate programes Multistate, 
+ Discrete and Continuous. BayesTraits can be applied to the analysis of traits that adopt 
+ a finite number of discrete states, or to the analysis of continuously varying traits. 
+ Hypotheses can be tested about models of evolution, about ancestral states and about 
+ correlations among pairs of traits. """
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+source_urls = ['http://www.evolution.reading.ac.uk/Files/']
+sources = ['BayesTraits-Linux-Intel-V1.0.tar.gz']
+
+sanity_check_paths = {
+    'files': ['BayesTraits', 'Primates.trees', 'PPI.trees'],
+    'dirs': [],
+}
+
+modextrapaths = {'PATH':''}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/BayesTraits/BayesTraits-2.0-beta-linux64.eb b/easybuild/easyconfigs/b/BayesTraits/BayesTraits-2.0-beta-linux64.eb
new file mode 100644
index 0000000000000000000000000000000000000000..159ed9b248090a70f22d206eb23991b47a78f3b5
--- /dev/null
+++ b/easybuild/easyconfigs/b/BayesTraits/BayesTraits-2.0-beta-linux64.eb
@@ -0,0 +1,33 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+easyblock = "Tarball"
+
+name = 'BayesTraits'
+version = '2.0'
+versionsuffix = '-Beta-Linux64'
+
+homepage = 'http://www.evolution.reading.ac.uk/BayesTraitsV1.html'
+description = """ BayesTraits is a computer package for performing analyses of trait 
+ evolution among groups of species for which a phylogeny or sample of phylogenies is 
+ available. This new package incoporates our earlier and separate programes Multistate, 
+ Discrete and Continuous. BayesTraits can be applied to the analysis of traits that adopt 
+ a finite number of discrete states, or to the analysis of continuously varying traits. 
+ Hypotheses can be tested about models of evolution, about ancestral states and about 
+ correlations among pairs of traits. """
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+source_urls = ['http://www.evolution.reading.ac.uk/Files/']
+sources = ['%(name)sV%(version_major)s%(versionsuffix)s.tar.gz']
+
+sanity_check_paths = {
+    'files': ['BayesTraits', 'Primates.trees', 'Mammal.trees'],
+    'dirs': [],
+}
+
+modextrapaths = {'PATH':''}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.5-GCC-4.6.3.eb b/easybuild/easyconfigs/b/Bison/Bison-2.5-GCC-4.6.3.eb
index b06f0de4487bbb68b4d83142a70701bc1ae8937f..4422c069eff8c5c51847fd325a086d1a237ffe12 100644
--- a/easybuild/easyconfigs/b/Bison/Bison-2.5-GCC-4.6.3.eb
+++ b/easybuild/easyconfigs/b/Bison/Bison-2.5-GCC-4.6.3.eb
@@ -8,7 +8,7 @@ into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser
 toolchain = {'name': 'GCC', 'version': '4.6.3'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()]
+source_urls = [GNU_SOURCE]
 
 builddependencies = [('M4', '1.4.16')]
 
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.5-gmacml-1.7.0.eb b/easybuild/easyconfigs/b/Bison/Bison-2.5-gmacml-1.7.0.eb
index 07ff8400be351b816ef7b029986d7156a6093475..31520c710c4dd7cc9b056221e5dd3f049e8a3724 100644
--- a/easybuild/easyconfigs/b/Bison/Bison-2.5-gmacml-1.7.0.eb
+++ b/easybuild/easyconfigs/b/Bison/Bison-2.5-gmacml-1.7.0.eb
@@ -8,7 +8,7 @@ description = """Bison is a general-purpose parser generator that converts an an
 toolchain = {'name': 'gmacml', 'version': '1.7.0'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()]
+source_urls = [GNU_SOURCE]
 
 builddependencies = [('M4', '1.4.16')]
 
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.5-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/b/Bison/Bison-2.5-goalf-1.1.0-no-OFED.eb
index aa3f8448b3571801f98d057eb2e482be0f81e795..f26bcc8110af539dbcea3f4d96ff8c1e2a43a429 100644
--- a/easybuild/easyconfigs/b/Bison/Bison-2.5-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/b/Bison/Bison-2.5-goalf-1.1.0-no-OFED.eb
@@ -8,7 +8,7 @@ description = """Bison is a general-purpose parser generator that converts an an
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()]
+source_urls = [GNU_SOURCE]
 
 builddependencies = [('M4', '1.4.16')]
 
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.5-goolf-1.4.10.eb b/easybuild/easyconfigs/b/Bison/Bison-2.5-goolf-1.4.10.eb
index 827c4f0330a6f7103f3a33937f5001c40b84e4d9..aba6ec1fef6d35c2c7f70c7edb9faebfdada9db2 100644
--- a/easybuild/easyconfigs/b/Bison/Bison-2.5-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/Bison/Bison-2.5-goolf-1.4.10.eb
@@ -8,7 +8,7 @@ into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()]
+source_urls = [GNU_SOURCE]
 
 builddependencies = [('M4', '1.4.16')]
 
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-3.2.2.u3.eb
index c6a21e310eb7d6be35a7237c9068a54e8e27445a..10fc9ef68a64bdd45460c1fe63f04c0827721bf8 100644
--- a/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-3.2.2.u3.eb
+++ b/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-3.2.2.u3.eb
@@ -8,7 +8,7 @@ description = """Bison is a general-purpose parser generator that converts an an
 toolchain = {'name': 'ictce', 'version': '3.2.2.u3'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()]
+source_urls = [GNU_SOURCE]
 
 builddependencies = [('M4', '1.4.16')]
 
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-4.0.6.eb b/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-4.0.6.eb
index 69549d1d6fa024c52f959373faf18b4d816619f8..1a58cb138ee5e7c72ea77e13f9120af3e636f6dc 100644
--- a/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-4.0.6.eb
@@ -8,7 +8,7 @@ description = """Bison is a general-purpose parser generator that converts an an
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftpmirror.gnu.org/gnu/%s' % name.lower()]
+source_urls = [GNU_SOURCE]
 
 builddependencies = [('M4', '1.4.16')]
 
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-4.1.13.eb b/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-4.1.13.eb
index 30eaae1636499fe52842cc14eb61127d7d31558a..dd1af5cd2f20a31fa6c26fedde753b6751875e0c 100644
--- a/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-4.1.13.eb
@@ -8,7 +8,7 @@ description = """Bison is a general-purpose parser generator that converts an an
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftpmirror.gnu.org/gnu/%s' % name.lower()]
+source_urls = [GNU_SOURCE]
 
 builddependencies = [('M4', '1.4.16')]
 
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-5.3.0.eb b/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-5.3.0.eb
index eeb7f3e8bb942c4ed2efb3a25128fe00d7de8f54..9c14def61f13d705337e4c3ca6f26dbd342acaac 100644
--- a/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-5.3.0.eb
@@ -9,7 +9,7 @@ description = """Bison is a general-purpose parser generator that converts an an
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()]
+source_urls = [GNU_SOURCE]
 
 builddependencies = [('M4', '1.4.16')]
 
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-5.5.0.eb b/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f025220a4396861e0fde794b830967e5b62532ae
--- /dev/null
+++ b/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-5.5.0.eb
@@ -0,0 +1,20 @@
+name = 'Bison'
+version = '2.5'
+
+homepage = 'http://www.gnu.org/software/bison'
+description = """Bison is a general-purpose parser generator that converts an annotated context-free grammar
+ into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser tables."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()]
+
+builddependencies = [('M4', '1.4.16')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ["bison", "yacc"]] + ["lib/liby.a"],
+    'dirs': [],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.5-iqacml-3.7.3.eb b/easybuild/easyconfigs/b/Bison/Bison-2.5-iqacml-3.7.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1b1d71408750449aaad958cb355e246dc0568aba
--- /dev/null
+++ b/easybuild/easyconfigs/b/Bison/Bison-2.5-iqacml-3.7.3.eb
@@ -0,0 +1,20 @@
+name = 'Bison'
+version = '2.5'
+
+homepage = 'http://www.gnu.org/software/bison'
+description = """Bison is a general-purpose parser generator that converts an annotated context-free grammar
+ into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser tables."""
+
+toolchain = {'name': 'iqacml', 'version': '3.7.3'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s']
+
+builddependencies = [('M4', '1.4.16')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ["bison", "yacc"]] + ["lib/liby.a"],
+    'dirs': [],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.6.5-ictce-4.1.13.eb b/easybuild/easyconfigs/b/Bison/Bison-2.6.5-ictce-4.1.13.eb
index 1670d6477e2fa892d9ff83b61009bf981ec6cb13..5954b4a5809920027637886f768b5cf1b3a63b5f 100644
--- a/easybuild/easyconfigs/b/Bison/Bison-2.6.5-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/b/Bison/Bison-2.6.5-ictce-4.1.13.eb
@@ -8,7 +8,7 @@ description = """Bison is a general-purpose parser generator that converts an an
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftpmirror.gnu.org/gnu/%s' % name.lower()]
+source_urls = [GNU_SOURCE]
 
 builddependencies = [('M4', '1.4.16')]
 
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.6.5-ictce-5.3.0.eb b/easybuild/easyconfigs/b/Bison/Bison-2.6.5-ictce-5.3.0.eb
index d46be8f5448462a20faaef2bc5d77a25e03fbc91..cbdb121a82bfc9cac625c1721f8b9544fbcee16f 100644
--- a/easybuild/easyconfigs/b/Bison/Bison-2.6.5-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/b/Bison/Bison-2.6.5-ictce-5.3.0.eb
@@ -9,7 +9,7 @@ description = """Bison is a general-purpose parser generator that converts an an
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftpmirror.gnu.org/gnu/%s' % name.lower()]
+source_urls = [GNU_SOURCE]
 
 builddependencies = [('M4', '1.4.16')]
 
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7-ClangGCC-1.1.3.eb b/easybuild/easyconfigs/b/Bison/Bison-2.7-ClangGCC-1.1.3.eb
index 8e67117ad42c87ade39ac81892dfe78be688f76b..8744cbb56a1eac9af6e00f3a510796102e83d81e 100644
--- a/easybuild/easyconfigs/b/Bison/Bison-2.7-ClangGCC-1.1.3.eb
+++ b/easybuild/easyconfigs/b/Bison/Bison-2.7-ClangGCC-1.1.3.eb
@@ -8,7 +8,7 @@ into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser
 toolchain = {'name': 'ClangGCC', 'version': '1.1.3'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s']
+source_urls = [GNU_SOURCE]
 
 builddependencies = [('M4', '1.4.16')]
 
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7-ClangGCC-1.2.3.eb b/easybuild/easyconfigs/b/Bison/Bison-2.7-ClangGCC-1.2.3.eb
index 42be6e01546e44596e142ce36bdf725215a206ed..ec2d8ec2316cd4453764be22ba4ff2965ef9c51d 100644
--- a/easybuild/easyconfigs/b/Bison/Bison-2.7-ClangGCC-1.2.3.eb
+++ b/easybuild/easyconfigs/b/Bison/Bison-2.7-ClangGCC-1.2.3.eb
@@ -8,7 +8,7 @@ into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser
 toolchain = {'name': 'ClangGCC', 'version': '1.2.3'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()]
+source_urls = [GNU_SOURCE]
 
 builddependencies = [('M4', '1.4.16')]
 
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7-GCC-4.7.2.eb b/easybuild/easyconfigs/b/Bison/Bison-2.7-GCC-4.7.2.eb
index 8db1f625f0a1d31f9df65611319874c344c636f7..585ea2ac9665ef1a188b6da1669a9498f6a2dfdb 100644
--- a/easybuild/easyconfigs/b/Bison/Bison-2.7-GCC-4.7.2.eb
+++ b/easybuild/easyconfigs/b/Bison/Bison-2.7-GCC-4.7.2.eb
@@ -8,7 +8,7 @@ into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser
 toolchain = {'name': 'GCC', 'version': '4.7.2'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s']
+source_urls = [GNU_SOURCE]
 
 builddependencies = [('M4', '1.4.16')]
 
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7-GCC-4.7.3.eb b/easybuild/easyconfigs/b/Bison/Bison-2.7-GCC-4.7.3.eb
index c713bcbe682a53313bab259b7a0ee075802dd7be..e3ee605bb0901d47377a999e41e850bbf0d84c60 100644
--- a/easybuild/easyconfigs/b/Bison/Bison-2.7-GCC-4.7.3.eb
+++ b/easybuild/easyconfigs/b/Bison/Bison-2.7-GCC-4.7.3.eb
@@ -8,7 +8,7 @@ into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser
 toolchain = {'name': 'GCC', 'version': '4.7.3'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s']
+source_urls = [GNU_SOURCE]
 
 builddependencies = [('M4', '1.4.16')]
 
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7-GCC-4.8.1.eb b/easybuild/easyconfigs/b/Bison/Bison-2.7-GCC-4.8.1.eb
index e24eef4f7ef3b29d9989831a4d0f981d96bed295..f8873239d9b166e0dab70089b1b0e0f003171401 100644
--- a/easybuild/easyconfigs/b/Bison/Bison-2.7-GCC-4.8.1.eb
+++ b/easybuild/easyconfigs/b/Bison/Bison-2.7-GCC-4.8.1.eb
@@ -8,7 +8,7 @@ into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser
 toolchain = {'name': 'GCC', 'version': '4.8.1'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s']
+source_urls = [GNU_SOURCE]
 
 builddependencies = [('M4', '1.4.16')]
 
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7-goolf-1.4.10.eb b/easybuild/easyconfigs/b/Bison/Bison-2.7-goolf-1.4.10.eb
index a770800fdfdc53b9a25d05c12fc45545e5d4ff26..8be6a9e305aaafa1bec39c9a0dbc89e9b285526e 100644
--- a/easybuild/easyconfigs/b/Bison/Bison-2.7-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/Bison/Bison-2.7-goolf-1.4.10.eb
@@ -8,7 +8,7 @@ into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s']
+source_urls = [GNU_SOURCE]
 
 builddependencies = [('M4', '1.4.16')]
 
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-4.1.13.eb b/easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-4.1.13.eb
index f26e4c67a13959756801ae1a7d767a2b10f98aaf..8043e00d5c8aa0f0821ff18361ddacfdb4f85de6 100644
--- a/easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-4.1.13.eb
@@ -8,7 +8,7 @@ description = """Bison is a general-purpose parser generator that converts an an
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s']
+source_urls = [GNU_SOURCE]
 
 builddependencies = [('M4', '1.4.16')]
 
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-5.3.0.eb b/easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c39d8c1c1803c69452839608ee91c6b9a707e450
--- /dev/null
+++ b/easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-5.3.0.eb
@@ -0,0 +1,20 @@
+name = 'Bison'
+version = '2.7'
+
+homepage = 'http://www.gnu.org/software/bison'
+description = """Bison is a general-purpose parser generator that converts an annotated context-free grammar
+ into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser tables."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s']
+
+builddependencies = [('M4', '1.4.16')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ["bison", "yacc"]] + ["lib/liby.a"],
+    'dirs': [],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-5.5.0.eb b/easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1c8ec7242c86b9400ea4e160be4d1e5b6abf375c
--- /dev/null
+++ b/easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-5.5.0.eb
@@ -0,0 +1,20 @@
+name = 'Bison'
+version = '2.7'
+
+homepage = 'http://www.gnu.org/software/bison'
+description = """Bison is a general-purpose parser generator that converts an annotated context-free grammar
+ into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser tables."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+builddependencies = [('M4', '1.4.17')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ["bison", "yacc"]] + ["lib/liby.a"],
+    'dirs': [],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7-iqacml-3.7.3.eb b/easybuild/easyconfigs/b/Bison/Bison-2.7-iqacml-3.7.3.eb
index 82ddbeb0acc2479b26af48a265d9e6c0f37dea93..9cbcbb84e120863329a4921473904e98249f3713 100644
--- a/easybuild/easyconfigs/b/Bison/Bison-2.7-iqacml-3.7.3.eb
+++ b/easybuild/easyconfigs/b/Bison/Bison-2.7-iqacml-3.7.3.eb
@@ -8,7 +8,7 @@ description = """Bison is a general-purpose parser generator that converts an an
 toolchain = {'name': 'iqacml', 'version': '3.7.3'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s']
+source_urls = [GNU_SOURCE]
 
 builddependencies = [('M4', '1.4.16')]
 
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7.1-ictce-5.5.0.eb b/easybuild/easyconfigs/b/Bison/Bison-2.7.1-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..83da9c3f176dc6adea7d7ac7387fc0e1c809388a
--- /dev/null
+++ b/easybuild/easyconfigs/b/Bison/Bison-2.7.1-ictce-5.5.0.eb
@@ -0,0 +1,20 @@
+name = 'Bison'
+version = '2.7.1'
+
+homepage = 'http://www.gnu.org/software/bison'
+description = """Bison is a general-purpose parser generator that converts an annotated context-free grammar
+ into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser tables."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+builddependencies = [('M4', '1.4.17')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ["bison", "yacc"]] + ["lib/liby.a"],
+    'dirs': [],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7.eb b/easybuild/easyconfigs/b/Bison/Bison-2.7.eb
index e6eb380e337d1992e22b3c97924df2291eeb37f4..e1f74e51581359eff8f2e71fa821be0dd58ad16a 100644
--- a/easybuild/easyconfigs/b/Bison/Bison-2.7.eb
+++ b/easybuild/easyconfigs/b/Bison/Bison-2.7.eb
@@ -8,7 +8,7 @@ into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser
 toolchain = {'name': 'dummy', 'version': ''}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s']
+source_urls = [GNU_SOURCE]
 
 builddependencies = [('M4', '1.4.16')]
 
diff --git a/easybuild/easyconfigs/b/BitSeq/BitSeq-0.7.0-goolf-1.4.10.eb b/easybuild/easyconfigs/b/BitSeq/BitSeq-0.7.0-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..82b02fc155de3aa2c5595e7d2e8547a9df397f84
--- /dev/null
+++ b/easybuild/easyconfigs/b/BitSeq/BitSeq-0.7.0-goolf-1.4.10.eb
@@ -0,0 +1,38 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+easyblock = 'MakeCp'
+
+name = "BitSeq"
+version = "0.7.0"
+
+homepage = 'https://code.google.com/p/bitseq/'
+description = """ BitSeq (Bayesian Inference of Transcripts from Sequencing Data) is an 
+ application for inferring expression levels of individual transcripts from sequencing (RNA-Seq) 
+ data and estimating differential expression (DE) between conditions. An advantage of this 
+ approach is the ability to account for both technical uncertainty and intrinsic biological 
+ variance in order to avoid false DE calls. The technical contribution to the uncertainty comes 
+ both from finite read-depth and the possibly ambiguous mapping of reads to multiple transcripts."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['https://bitseq.googlecode.com/files/']
+sources = [SOURCE_TAR_GZ]
+
+# put here the list of generated executables when compiling
+list_of_executables = ["convertSamples", "estimateDE", "estimateExpression", "estimateHyperPar",
+        "estimateVBExpression", "extractSamples", "getFoldChange", "getGeneExpression",
+        "getPPLR", "getVariance", "getWithinGeneExpression", "parseAlignment", 
+        "transposeLargeFile", "getCounts.py", "extractTranscriptInfo.py"]
+
+# this is the real EasyBuild line to copy all the executables to "bin"
+files_to_copy = [(list_of_executables, "bin")]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in list_of_executables],
+    'dirs': []
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-goalf-1.1.0-no-OFED.eb
index abce8e1ac7df075d8cffc470a99ef9598bca81a2..15eee3a6b7e26cd74e4d840c2396e6fd1f5f1738 100644
--- a/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-goalf-1.1.0-no-OFED.eb
@@ -13,7 +13,7 @@ version = '1.03e'
 homepage = 'http://www.coker.com.au/bonnie++/'
 description = """Bonnie++-1.03e: Enhanced performance Test of Filesystem I/O"""
 
-sources = ['%s-%s.tgz' % (name.lower(), version)]
+sources = [SOURCELOWER_TGZ]
 source_urls = ['http://www.coker.com.au/bonnie++/']
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
diff --git a/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-goolf-1.4.10.eb b/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-goolf-1.4.10.eb
index cc7ea34456af2d04a6e5814411c7e3a97c91825a..00dc69f950f63b3c875ff6674e2f868def23deb8 100644
--- a/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-goolf-1.4.10.eb
@@ -13,7 +13,7 @@ version = '1.03e'
 homepage = 'http://www.coker.com.au/bonnie++/'
 description = """Bonnie++-1.03e: Enhanced performance Test of Filesystem I/O"""
 
-sources = ['%s-%s.tgz' % (name.lower(), version)]
+sources = [SOURCELOWER_TGZ]
 source_urls = ['http://www.coker.com.au/bonnie++/']
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
diff --git a/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-ictce-4.0.6.eb b/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-ictce-4.0.6.eb
index 34d9dfcf6e5a0c2ab2caa7ab92fe48dcae5a4f63..b0b53849146a4c335c57dafe1ab949517c7d5312 100644
--- a/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-ictce-4.0.6.eb
@@ -13,7 +13,7 @@ version = '1.03e'
 homepage = 'http://www.coker.com.au/bonnie++/'
 description = """Bonnie++-1.03e: Enhanced performance Test of Filesystem I/O"""
 
-sources = ['%s-%s.tgz' % (name.lower(), version)]
+sources = [SOURCELOWER_TGZ]
 source_urls = ['http://www.coker.com.au/bonnie++/']
 
 toolchain = {'version': '4.0.6', 'name': 'ictce'}
diff --git a/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-ictce-5.3.0.eb b/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-ictce-5.3.0.eb
index bc3566fe23f466b3625afbbba35c556136d4c62a..23c215e2493bfaf3be37356c3cd406fc2a0e829d 100644
--- a/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-ictce-5.3.0.eb
@@ -13,7 +13,7 @@ version = '1.03e'
 homepage = 'http://www.coker.com.au/bonnie++/'
 description = """Bonnie++-1.03e: Enhanced performance Test of Filesystem I/O"""
 
-sources = ['%s-%s.tgz' % (name.lower(), version)]
+sources = [SOURCELOWER_TGZ]
 source_urls = ['http://www.coker.com.au/bonnie++/']
 
 
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.49.0-goolf-1.4.10-Python-2.7.5.eb b/easybuild/easyconfigs/b/Boost/Boost-1.49.0-goolf-1.4.10-Python-2.7.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ff19195a78dffaa8b5117a9d0165e17283591fb1
--- /dev/null
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.49.0-goolf-1.4.10-Python-2.7.5.eb
@@ -0,0 +1,26 @@
+name = 'Boost'
+version = '1.49.0'
+
+homepage = 'http://www.boost.org/'
+description = """Boost provides free peer-reviewed portable C++ source libraries."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+toolchainopts = {'pic': True, 'usempi': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['%%(namelower)s_%s.tar.gz' % '_'.join(version.split('.'))]
+
+pythonversion = '2.7.5'
+versionsuffix = '-Python-%s' % pythonversion
+
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('Python', pythonversion),
+]
+
+# also build boost_mpi
+boost_mpi = True
+
+osdependencies = ['zlib-devel']
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.3.0-Python-2.7.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5bff64b1fe7bb5c30535163862c629ae4d40d2e0
--- /dev/null
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.3.0-Python-2.7.3.eb
@@ -0,0 +1,28 @@
+name = 'Boost'
+version = '1.53.0'
+
+homepage = 'http://www.boost.org/'
+description = """Boost provides free peer-reviewed portable C++ source libraries."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'pic': True, 'usempi': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['%%(namelower)s_%s.tar.gz' % '_'.join(version.split('.'))]
+
+patches = ['intellinuxjam_fPIC.patch']
+
+pythonversion = '2.7.3'
+versionsuffix = '-Python-%s' % pythonversion
+
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('Python', pythonversion),
+]
+
+# also build boost_mpi
+boost_mpi = True
+
+osdependencies = ['zlib-devel']
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.3.0-Python-2.7.5.eb b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.3.0-Python-2.7.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ef9aaeecb5de38cd601f66015b980cfd6335385c
--- /dev/null
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.3.0-Python-2.7.5.eb
@@ -0,0 +1,26 @@
+name = 'Boost'
+version = '1.53.0'
+
+homepage = 'http://www.boost.org/'
+description = """Boost provides free peer-reviewed portable C++ source libraries."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'pic': True, 'usempi': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['%%(namelower)s_%s.tar.gz' % '_'.join(version.split('.'))]
+
+pythonversion = '2.7.5'
+versionsuffix = '-Python-%s' % pythonversion
+
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('Python', pythonversion),
+]
+
+# also build boost_mpi
+boost_mpi = True
+
+osdependencies = ['zlib-devel']
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.3.0.eb b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..eedc4e59549018846f703dd8da832c551365c344
--- /dev/null
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.3.0.eb
@@ -0,0 +1,22 @@
+name = 'Boost'
+version = '1.53.0'
+
+homepage = 'http://www.boost.org/'
+description = """Boost provides free peer-reviewed portable C++ source libraries."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'pic': True, 'usempi': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['%%(namelower)s_%s.tar.gz' % '_'.join(version.split('.'))]
+
+dependencies = [('bzip2', '1.0.6')]
+
+configopts = '--without-libraries=python'
+
+# also build boost_mpi
+boost_mpi = True
+
+osdependencies = ['zlib-devel']
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-6.2.5.eb b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-6.2.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2d60c31b5b97228e7a79fb6705f3bf1aca449393
--- /dev/null
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-6.2.5.eb
@@ -0,0 +1,22 @@
+name = 'Boost'
+version = '1.53.0'
+
+homepage = 'http://www.boost.org/'
+description = """Boost provides free peer-reviewed portable C++ source libraries."""
+
+toolchain = {'name': 'ictce', 'version': '6.2.5'}
+toolchainopts = {'pic': True, 'usempi': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['%%(namelower)s_%s.tar.gz' % '_'.join(version.split('.'))]
+
+dependencies = [('bzip2', '1.0.6')]
+
+configopts = '--without-libraries=python'
+
+# also build boost_mpi
+boost_mpi = True
+
+osdependencies = ['zlib-devel']
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.55.0-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/b/Boost/Boost-1.55.0-ictce-5.5.0-Python-2.7.6.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ab10ddc3e6ce5bef41d01c1b4573656f439cd3b5
--- /dev/null
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.55.0-ictce-5.5.0-Python-2.7.6.eb
@@ -0,0 +1,28 @@
+name = 'Boost'
+version = '1.55.0'
+
+homepage = 'http://www.boost.org/'
+description = """Boost provides free peer-reviewed portable C++ source libraries."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'pic': True, 'usempi': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['%%(namelower)s_%s.tar.gz' % '_'.join(version.split('.'))]
+
+patches = ['intellinuxjam_fPIC.patch']
+
+pythonversion = '2.7.6'
+versionsuffix = '-Python-%s' % pythonversion
+
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('Python', pythonversion),
+]
+
+# also build boost_mpi
+boost_mpi = True
+
+osdependencies = ['zlib-devel']
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.0.5-goolf-1.4.10.eb b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.0.5-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ae75b8cebd5cc31303f618a15ba84d9f2bd2ef5c
--- /dev/null
+++ b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.0.5-goolf-1.4.10.eb
@@ -0,0 +1,35 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+easyblock='MakeCp'
+
+name = 'Bowtie2'
+version = '2.0.5'
+
+homepage = 'http://bowtie-bio.sourceforge.net/bowtie2/index.shtml'
+description = """ Bowtie 2 is an ultrafast and memory-efficient tool for aligning sequencing reads 
+ to long reference sequences. It is particularly good at aligning reads of about 50 up to 100s or 1,000s 
+ of characters, and particularly good at aligning to relatively long (e.g. mammalian) genomes. 
+ Bowtie 2 indexes the genome with an FM Index to keep its memory footprint small: for the human genome, 
+ its memory footprint is typically around 3.2 GB. Bowtie 2 supports gapped, local, and paired-end alignment modes."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+sources = ['%s-%s-source.zip' % (name.lower(), version)]
+source_urls = [('http://sourceforge.net/projects/bowtie-bio/files/%(namelower)s/%(version)s', 'download')]
+
+files_to_copy = [
+    (["bowtie2", "bowtie2-align", "bowtie2-build", "bowtie2-inspect"], 'bin'),
+    "doc", "example", "scripts",]
+
+sanity_check_paths = {
+    'files': ["bin/bowtie2-align", "bin/bowtie2-build", "bin/bowtie2-inspect"],
+    'dirs': [],
+}
+
+# to add scripts folder to $PATH just uncomment this line
+#modextrapaths = {'PATH': 'scripts'}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.0.6-goolf-1.4.10.eb b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.0.6-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..640a7f6d8391e83d33033b52ca7070a5d0fd7800
--- /dev/null
+++ b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.0.6-goolf-1.4.10.eb
@@ -0,0 +1,35 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+easyblock='MakeCp'
+
+name = 'Bowtie2'
+version = '2.0.6'
+
+homepage = 'http://bowtie-bio.sourceforge.net/bowtie2/index.shtml'
+description = """ Bowtie 2 is an ultrafast and memory-efficient tool for aligning sequencing reads 
+ to long reference sequences. It is particularly good at aligning reads of about 50 up to 100s or 1,000s 
+ of characters, and particularly good at aligning to relatively long (e.g. mammalian) genomes. 
+ Bowtie 2 indexes the genome with an FM Index to keep its memory footprint small: for the human genome, 
+ its memory footprint is typically around 3.2 GB. Bowtie 2 supports gapped, local, and paired-end alignment modes."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+sources = ['%s-%s-source.zip' % (name.lower(), version)]
+source_urls = [('http://sourceforge.net/projects/bowtie-bio/files/%(namelower)s/%(version)s', 'download')]
+
+files_to_copy = [
+    (["bowtie2", "bowtie2-align", "bowtie2-build", "bowtie2-inspect"], 'bin'),
+    "doc", "example", "scripts"]
+
+sanity_check_paths = {
+    'files': ["bin/bowtie2-align", "bin/bowtie2-build", "bin/bowtie2-inspect"],
+    'dirs': [],
+}
+
+# to add scripts folder to $PATH just uncomment this line
+#modextrapaths = {'PATH': 'scripts'}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.1.0-goolf-1.4.10.eb b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.1.0-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..93890f908fea8e1b40e2018e9066201cc30e9d6e
--- /dev/null
+++ b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.1.0-goolf-1.4.10.eb
@@ -0,0 +1,35 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+easyblock='MakeCp'
+
+name = 'Bowtie2'
+version = '2.1.0'
+
+homepage = 'http://bowtie-bio.sourceforge.net/bowtie2/index.shtml'
+description = """ Bowtie 2 is an ultrafast and memory-efficient tool for aligning sequencing reads 
+ to long reference sequences. It is particularly good at aligning reads of about 50 up to 100s or 1,000s 
+ of characters, and particularly good at aligning to relatively long (e.g. mammalian) genomes. 
+ Bowtie 2 indexes the genome with an FM Index to keep its memory footprint small: for the human genome, 
+ its memory footprint is typically around 3.2 GB. Bowtie 2 supports gapped, local, and paired-end alignment modes."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+sources = ['%s-%s-source.zip' % (name.lower(), version)]
+source_urls = [('http://sourceforge.net/projects/bowtie-bio/files/%(namelower)s/%(version)s', 'download')]
+
+files_to_copy = [
+    (["bowtie2", "bowtie2-align", "bowtie2-build", "bowtie2-inspect"], 'bin'),
+    "doc", "example","scripts"]
+
+sanity_check_paths = {
+    'files': ["bin/bowtie2-align", "bin/bowtie2-build", "bin/bowtie2-inspect"],
+    'dirs': [],
+}
+
+# to add scripts folder to $PATH just uncomment this line
+#modextrapaths = {'PATH': 'scripts'}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.1.0-ictce-5.5.0.eb b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.1.0-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..56b7f26201042eb5f50cdeed74ee9c17dccfac93
--- /dev/null
+++ b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.1.0-ictce-5.5.0.eb
@@ -0,0 +1,28 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine
+# Authors::   Cedric Laczny <cedric.laczny@uni.lu>, Fotis Georgatos <fotis.georgatos@uni.lu>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html
+##
+
+name = 'Bowtie2'
+version = '2.1.0'
+altversions = ['2.0.0-beta6', '2.0.0-beta7', '2.0.1', '2.0.2', '2.1.0']
+
+homepage = 'http://bowtie-bio.sourceforge.net/bowtie2/index.shtml'
+description = """Bowtie 2 is an ultrafast and memory-efficient tool
+ for aligning sequencing reads to long reference sequences."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+# note: SOURCEFORGE_SOURCE constant doesn't work here because of bowtie-bio used in URL
+source_urls = [('http://sourceforge.net/projects/bowtie-bio/files/%(namelower)s/%(version)s', 'download')]
+sources = ['%(namelower)s-%(version)s-source.zip']
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.0-goolf-1.4.10.eb b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.0-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6dbb873164f05a32c1a0d1efb909e62d46184b7d
--- /dev/null
+++ b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.0-goolf-1.4.10.eb
@@ -0,0 +1,36 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+easyblock='MakeCp'
+
+name = 'Bowtie2'
+version = '2.2.0'
+
+homepage = 'http://bowtie-bio.sourceforge.net/bowtie2/index.shtml'
+description = """ Bowtie 2 is an ultrafast and memory-efficient tool for aligning sequencing reads 
+ to long reference sequences. It is particularly good at aligning reads of about 50 up to 100s or 1,000s 
+ of characters, and particularly good at aligning to relatively long (e.g. mammalian) genomes. 
+ Bowtie 2 indexes the genome with an FM Index to keep its memory footprint small: for the human genome, 
+ its memory footprint is typically around 3.2 GB. Bowtie 2 supports gapped, local, and paired-end alignment modes."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+sources = ['%s-%s-source.zip' % (name.lower(), version)]
+source_urls = [('http://sourceforge.net/projects/bowtie-bio/files/%(namelower)s/%(version)s', 'download')]
+
+files_to_copy = [
+    (["bowtie2", "bowtie2-align-l", "bowtie2-align-s", "bowtie2-build", "bowtie2-build-l", "bowtie2-build-s",
+     "bowtie2-inspect", "bowtie2-inspect-l", "bowtie2-inspect-s"], 'bin'),
+    "doc", "example", "scripts"]
+
+sanity_check_paths = {
+    'files': ["bin/bowtie2-align-l", "bin/bowtie2-build", "bin/bowtie2-inspect"],
+    'dirs': [],
+}
+
+# to add scripts folder to $PATH just uncomment this line
+#modextrapaths = {'PATH': 'scripts'}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.2-goolf-1.4.10.eb b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.2-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..83794c9d53ecc8da483acb8edaa2f557e3e28744
--- /dev/null
+++ b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.2-goolf-1.4.10.eb
@@ -0,0 +1,36 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+easyblock='MakeCp'
+
+name = 'Bowtie2'
+version = '2.2.2'
+
+homepage = 'http://bowtie-bio.sourceforge.net/bowtie2/index.shtml'
+description = """ Bowtie 2 is an ultrafast and memory-efficient tool for aligning sequencing reads 
+ to long reference sequences. It is particularly good at aligning reads of about 50 up to 100s or 1,000s 
+ of characters, and particularly good at aligning to relatively long (e.g. mammalian) genomes. 
+ Bowtie 2 indexes the genome with an FM Index to keep its memory footprint small: for the human genome, 
+ its memory footprint is typically around 3.2 GB. Bowtie 2 supports gapped, local, and paired-end alignment modes."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+sources = ['%s-%s-source.zip' % (name.lower(), version)]
+source_urls = [('http://sourceforge.net/projects/bowtie-bio/files/%(namelower)s/%(version)s', 'download')]
+
+files_to_copy = [
+    (["bowtie2", "bowtie2-align-l", "bowtie2-align-s", "bowtie2-build", "bowtie2-build-l", "bowtie2-build-s",
+     "bowtie2-inspect", "bowtie2-inspect-l", "bowtie2-inspect-s"], 'bin'),
+    "doc", "example", "scripts", "MANUAL", "MANUAL.markdown", "NEWS"]
+
+sanity_check_paths = {
+    'files': ["bin/bowtie2-align-l", "bin/bowtie2-build", "bin/bowtie2-inspect"],
+    'dirs': [],
+}
+
+# to add script folder to path just uncomment this line
+#modextrapaths = {'PATH': 'scripts'}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/bam2fastq/bam2fastq-1.1.0-goolf-1.4.10.eb b/easybuild/easyconfigs/b/bam2fastq/bam2fastq-1.1.0-goolf-1.4.10.eb
index 40eaf1a383fc6a9e5c644869540c5d006d6d6906..5d4df914d374c0c2a1df79de17f7b32becd3c24c 100644
--- a/easybuild/easyconfigs/b/bam2fastq/bam2fastq-1.1.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/bam2fastq/bam2fastq-1.1.0-goolf-1.4.10.eb
@@ -23,7 +23,7 @@ description = """The BAM format is an efficient method for storing and sharing d
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 # eg. http://www.hudsonalpha.org/gsl/static/software/bam2fastq-1.1.0.tgz
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
 source_urls = ['http://www.hudsonalpha.org/gsl/static/software/']
 
 files_to_copy = [(["bam2fastq"], 'bin')]
diff --git a/easybuild/easyconfigs/b/bam2fastq/bam2fastq-1.1.0-ictce-5.3.0.eb b/easybuild/easyconfigs/b/bam2fastq/bam2fastq-1.1.0-ictce-5.3.0.eb
index c22f2d6caf4bac8ec0d2ac14b34cb241ec2d8514..4243fd37f2aab2ec7fca9c5e3c073cd97c442df7 100644
--- a/easybuild/easyconfigs/b/bam2fastq/bam2fastq-1.1.0-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/b/bam2fastq/bam2fastq-1.1.0-ictce-5.3.0.eb
@@ -23,7 +23,7 @@ description = """The BAM format is an efficient method for storing and sharing d
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 # eg. http://www.hudsonalpha.org/gsl/static/software/bam2fastq-1.1.0.tgz
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
 source_urls = ['http://www.hudsonalpha.org/gsl/static/software/']
 
 files_to_copy = [(["bam2fastq"], 'bin')]
diff --git a/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-goalf-1.1.0-no-OFED.eb
index 0f69cf489c7bec362725845e780f2653d5ed6a93..a957f3428f180addafbf4df57e9c00890c740ff8 100644
--- a/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-goalf-1.1.0-no-OFED.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
 # there is no tarball provided, only SVN checkout through:
 # svn checkout http://beagle-lib.googlecode.com/svn/trunk/ beagle-lib
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
 
 dependencies = [('Java', '1.7.0_15', '', True)]
 
diff --git a/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-goolf-1.4.10.eb b/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-goolf-1.4.10.eb
index 83a222c545acd74202d96931482bd70a02de12eb..073b6bae5ca03acc4d31eb72901eb16d7c67fb8c 100644
--- a/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-goolf-1.4.10.eb
@@ -12,7 +12,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 # there is no tarball provided, only SVN checkout through:
 # svn checkout http://beagle-lib.googlecode.com/svn/trunk/ beagle-lib
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
 
 dependencies = [('Java', '1.7.0_15', '', True)]
 
diff --git a/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-ictce-4.0.6.eb b/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-ictce-4.0.6.eb
index 6b963868143122d0569e7b05840f45c30c3a1dbd..de5d0fcdf9dab61b6044b58538ff0ef2c1aa7b5c 100644
--- a/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-ictce-4.0.6.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
 # there is no tarball provided, only SVN checkout through:
 # svn checkout http://beagle-lib.googlecode.com/svn/trunk/ beagle-lib
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
 
 dependencies = [('Java', '1.7.0_15', '', True)]
 
diff --git a/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-ictce-5.3.0.eb b/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-ictce-5.3.0.eb
index 20b367819c210a38f948d7e3331eb6ae34a10ba4..e1bcb81951fa232dd15fc5366220b1822d35086b 100644
--- a/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-ictce-5.3.0.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 # there is no tarball provided, only SVN checkout through:
 # svn checkout http://beagle-lib.googlecode.com/svn/trunk/ beagle-lib
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
 
 dependencies = [('Java', '1.7.0_15', '', True)]
 
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.22-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/b/binutils/binutils-2.22-goalf-1.1.0-no-OFED.eb
index add5f245920a218b66c4066958df96114aa0682a..24e4efa2360cbb3bf8dd59d95d570b250395fbab 100644
--- a/easybuild/easyconfigs/b/binutils/binutils-2.22-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.22-goalf-1.1.0-no-OFED.eb
@@ -17,7 +17,7 @@ homepage = 'http://directory.fsf.org/project/binutils/'
 description = "binutils-2.22: GNU binary utilities"
 
 sources = ['binutils-%s.tar.bz2' % version]
-source_urls = ['http://ftp.gnu.org/gnu/binutils']
+source_urls = [GNU_SOURCE]
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 toolchainopts = {'pic': True}
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.22-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/b/binutils/binutils-2.22-gompi-1.4.12-no-OFED.eb
index 17866810c44f5efcf53a59f1088bbaf544022029..bf436928119ec730d52f6e57e931663d7cf5b511 100644
--- a/easybuild/easyconfigs/b/binutils/binutils-2.22-gompi-1.4.12-no-OFED.eb
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.22-gompi-1.4.12-no-OFED.eb
@@ -17,7 +17,7 @@ homepage = 'http://directory.fsf.org/project/binutils/'
 description = "binutils-2.22: GNU binary utilities"
 
 sources = ['binutils-%s.tar.bz2' % version]
-source_urls = ['http://ftp.gnu.org/gnu/binutils']
+source_urls = [GNU_SOURCE]
 
 toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'}
 toolchainopts = {'pic': True}
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.4.10.eb b/easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.4.10.eb
index 9ccfe20342b57683f59bd4d6b9599b4b0cfb6f7a..e7bcf8437db56d2759f76522028200b61a7201f5 100644
--- a/easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.4.10.eb
@@ -17,7 +17,7 @@ homepage = 'http://directory.fsf.org/project/binutils/'
 description = "binutils-2.22: GNU binary utilities"
 
 sources = ['binutils-%s.tar.bz2' % version]
-source_urls = ['http://ftp.gnu.org/gnu/binutils']
+source_urls = [GNU_SOURCE]
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
diff --git a/easybuild/easyconfigs/b/byacc/byacc-20120526-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/b/byacc/byacc-20120526-goalf-1.1.0-no-OFED.eb
index 1c90c20dabb8044858ccb820dbd0a882722d716d..3e399ef780f48fd659413f3cea277091253f5c62 100644
--- a/easybuild/easyconfigs/b/byacc/byacc-20120526-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/b/byacc/byacc-20120526-goalf-1.1.0-no-OFED.eb
@@ -7,7 +7,7 @@ description = """Berkeley Yacc (byacc) is generally conceded to be the best yacc
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
-sources = ['%s-%s.tgz' % (name.lower(), version)]
+sources = [SOURCELOWER_TGZ]
 source_urls = ['ftp://invisible-island.net/byacc']
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/b/byacc/byacc-20120526-goolf-1.4.10.eb b/easybuild/easyconfigs/b/byacc/byacc-20120526-goolf-1.4.10.eb
index 1b21e9763c4cf69f8cca550ce70e796569c4b9d6..8b8782fe4b6e01e7783dd9faf6e6533c72808586 100644
--- a/easybuild/easyconfigs/b/byacc/byacc-20120526-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/byacc/byacc-20120526-goolf-1.4.10.eb
@@ -7,7 +7,7 @@ In contrast to bison, it is written to avoid dependencies upon a particular comp
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-sources = ['%s-%s.tgz' % (name.lower(), version)]
+sources = [SOURCELOWER_TGZ]
 source_urls = ['ftp://invisible-island.net/byacc']
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/b/byacc/byacc-20120526-ictce-4.0.6.eb b/easybuild/easyconfigs/b/byacc/byacc-20120526-ictce-4.0.6.eb
index 1c347cdee7ff266b842d819d7478a4068625b16e..9b30eede50bc4ed214347e4afc984b0ba4c9bdef 100644
--- a/easybuild/easyconfigs/b/byacc/byacc-20120526-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/b/byacc/byacc-20120526-ictce-4.0.6.eb
@@ -7,7 +7,7 @@ description = """Berkeley Yacc (byacc) is generally conceded to be the best yacc
 
 toolchain = {'name': 'ictce', 'version' : '4.0.6'}
 
-sources = ['%s-%s.tgz' % (name.lower(), version)]
+sources = [SOURCELOWER_TGZ]
 source_urls = ['ftp://invisible-island.net/byacc']
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/b/byacc/byacc-20120526-ictce-5.3.0.eb b/easybuild/easyconfigs/b/byacc/byacc-20120526-ictce-5.3.0.eb
index 523a138e8a31dbe97e59024a39dc0cc685cac4ab..3f0c68f0c2562fcb2dbcabe096d8e7d29314240a 100644
--- a/easybuild/easyconfigs/b/byacc/byacc-20120526-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/b/byacc/byacc-20120526-ictce-5.3.0.eb
@@ -8,7 +8,7 @@ description = """Berkeley Yacc (byacc) is generally conceded to be the best yacc
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
-sources = ['%s-%s.tgz' % (name.lower(), version)]
+sources = [SOURCELOWER_TGZ]
 source_urls = ['ftp://invisible-island.net/byacc']
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-ictce-6.2.5.eb b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-ictce-6.2.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c2e0a1e30048ef18db9568943027552892309000
--- /dev/null
+++ b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-ictce-6.2.5.eb
@@ -0,0 +1,15 @@
+name = 'bzip2'
+version = '1.0.6'
+
+homepage = 'http://www.bzip.org/'
+description = """bzip2 is a freely available, patent free, high-quality data compressor. It typically
+ compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical
+ compressors), whilst being around twice as fast at compression and six times faster at decompression."""
+
+toolchain = {'name': 'ictce', 'version': '6.2.5'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://www.bzip.org/%(version)s']
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/c/CAP3/CAP3-20071221-intel-x86.eb b/easybuild/easyconfigs/c/CAP3/CAP3-20071221-intel-x86.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0c1d5284b7d1f404efa4a56f504997b58f1e4a2f
--- /dev/null
+++ b/easybuild/easyconfigs/c/CAP3/CAP3-20071221-intel-x86.eb
@@ -0,0 +1,26 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+name = 'CAP3'
+version = '20071221-intel-x86'
+# see VersionDate in caps3 output
+
+easyblock = 'PackedBinary'
+
+homepage = 'http://seq.cs.iastate.edu/'
+description = """CAP3 assembly program """
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+source_urls = [('http://seq.cs.iastate.edu/CAP3/')]
+sources = ['cap3.linux.tar']
+checksums = [('md5', '55f57f61e588d4de06c0506cf2696c29')]
+
+sanity_check_paths = {
+    'files': ['cap3','formcon'],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/c/CAP3/CAP3-20071221-intel-x86_64.eb b/easybuild/easyconfigs/c/CAP3/CAP3-20071221-intel-x86_64.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0962339a29006078cbdb5f8d49324496a3e56d4f
--- /dev/null
+++ b/easybuild/easyconfigs/c/CAP3/CAP3-20071221-intel-x86_64.eb
@@ -0,0 +1,26 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+name = 'CAP3'
+version = '20071221-intel-x86_64'
+# see VersionDate in caps3 output
+
+easyblock = 'PackedBinary'
+
+homepage = 'http://seq.cs.iastate.edu/'
+description = """CAP3 assembly program """
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+source_urls = [('http://seq.cs.iastate.edu/CAP3/')]
+sources = ['cap3.linux.x86_64.tar']
+checksums = [('md5', '0fbb95c3fcbfb2b1afcebc5f7e2b4343')]
+
+sanity_check_paths = {
+    'files': ['cap3','formcon'],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/c/CAP3/CAP3-20071221-opteron.eb b/easybuild/easyconfigs/c/CAP3/CAP3-20071221-opteron.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3e19f30c4910fbe108d6d3e94b39f65eea4e41f9
--- /dev/null
+++ b/easybuild/easyconfigs/c/CAP3/CAP3-20071221-opteron.eb
@@ -0,0 +1,26 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+name = 'CAP3'
+version = '20071221-opteron'
+# see VersionDate in caps3 output
+
+easyblock = 'PackedBinary'
+
+homepage = 'http://seq.cs.iastate.edu/'
+description = """CAP3 assembly program """
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+source_urls = [('http://seq.cs.iastate.edu/CAP3/')]
+sources = ['cap3.linux.opteron64.tar']
+checksums = [('md5', '2d924766f6e8b5cf03bd2db81016d821')]
+
+sanity_check_paths = {
+    'files': ['cap3','formcon'],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/c/CCfits/CCfits-2.4-ictce-5.3.0.eb b/easybuild/easyconfigs/c/CCfits/CCfits-2.4-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..51afa00583fc3251ac2e5f4cd15cdcb0256b4847
--- /dev/null
+++ b/easybuild/easyconfigs/c/CCfits/CCfits-2.4-ictce-5.3.0.eb
@@ -0,0 +1,21 @@
+name = 'CCfits'
+version = '2.4'
+
+homepage = 'http://heasarc.gsfc.nasa.gov/fitsio/CCfits/'
+description = """CCfits is an object oriented interface to the cfitsio library. It is designed to make
+the capabilities of cfitsio available to programmers working in C++."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['http://heasarc.gsfc.nasa.gov/fitsio/CCfits/']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('CFITSIO','3.34')]
+
+sanity_check_paths = {
+    'files': ['bin/cookbook', 'lib/libCCfits.%s' % SHLIB_EXT, 'lib/pkgconfig/CCfits.pc'],
+    'dirs': ['include/CCfits'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/c/CEM/CEM-0.9.1-goolf-1.4.10.eb b/easybuild/easyconfigs/c/CEM/CEM-0.9.1-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6709e178016a6cc821e87bf3b0b94f8a473e3fef
--- /dev/null
+++ b/easybuild/easyconfigs/c/CEM/CEM-0.9.1-goolf-1.4.10.eb
@@ -0,0 +1,36 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+easyblock = 'MakeCp'
+
+name = "CEM"
+version = "0.9.1"
+
+homepage = 'http://alumni.cs.ucr.edu/~liw/cem.html'
+description = """ CEM: Transcriptome Assembly and Isoform Expression Level Estimation 
+ from Biased RNA-Seq Reads. CEM is an algorithm to assemble transcripts and estimate 
+ their expression levels from RNA-Seq reads. """
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['http://alumni.cs.ucr.edu/~liw/']
+sources = ['%(namelower)s.%(version)s.tar.gz']
+
+dependencies = [
+    ('GSL', '1.16')
+]
+
+start_dir = "src"
+
+files_to_copy = ["../bin", "../demo"]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ['bed2sam', 'bed2gtf', 'comparegtf',
+                                     'gtf2pred', 'isolassocem', 'pred2gtf',
+                                     'processsam', 'sortgtf']],
+    'dirs': []
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.34-ictce-5.3.0.eb b/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.34-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..28289da1097cf796b4d89693c38de6585ceb5142
--- /dev/null
+++ b/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.34-ictce-5.3.0.eb
@@ -0,0 +1,20 @@
+name = 'CFITSIO'
+version = '3.34'
+
+homepage = 'http://heasarc.gsfc.nasa.gov/fitsio/'
+description = """CFITSIO is a library of C and Fortran subroutines for reading and writing data files in
+FITS (Flexible Image Transport System) data format."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+srcversion = '%s0' % version.replace('.', '')
+source_urls = ['ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/']
+sources = ['%%(namelower)s%s.tar.gz' % srcversion]
+
+sanity_check_paths = {
+    'files':["lib/libcfitsio.a"],
+    'dirs':["include"],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index b0f7c634988f1dff32997a26fe400ce63f11f13a..3df06d2d4f421bc54cd0492c0b66a7c61174b111 100644
--- a/easybuild/easyconfigs/c/CGAL/CGAL-4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -15,12 +15,11 @@ pythonversion = '2.7.3'
 versionsuffix = "-Python-%s" % pythonversion
 
 dependencies = [
-                ('CMake', '2.8.4'),
-                ('GMP', '5.0.5'),
-                ('Boost', '1.49.0', versionsuffix),
-                ('MPFR', '3.1.0'),
-                ]
-
-osdependencies = ['qt4-devel']
+    ('CMake', '2.8.4'),
+    ('GMP', '5.0.5'),
+    ('Boost', '1.49.0', versionsuffix),
+    ('MPFR', '3.1.0'),
+    ('Qt', '4.8.4'),
+]
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.0-goolf-1.4.10-Python-2.7.3.eb
index 34490bdba2873a06683858ebe7448a3e7b20738d..0aff43ef22209708b97bcf235388548bd27073ba 100644
--- a/easybuild/easyconfigs/c/CGAL/CGAL-4.0-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.0-goolf-1.4.10-Python-2.7.3.eb
@@ -15,12 +15,11 @@ pythonversion = '2.7.3'
 versionsuffix = "-Python-%s" % pythonversion
 
 dependencies = [
-                ('CMake', '2.8.4'),
-                ('GMP', '5.0.5'),
-                ('Boost', '1.49.0', versionsuffix),
-                ('MPFR', '3.1.0'),
-                ]
-
-osdependencies = ['qt4-devel']
+    ('CMake', '2.8.4'),
+    ('GMP', '5.0.5'),
+    ('Boost', '1.49.0', versionsuffix),
+    ('MPFR', '3.1.0'),
+    ('Qt', '4.8.4'),
+]
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.0-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.0-ictce-4.0.6-Python-2.7.3.eb
index 943d99f86778606d079af4f33604ea087aaa67fb..c2050e6543a9f81522678c3fadc1c69930df9d13 100644
--- a/easybuild/easyconfigs/c/CGAL/CGAL-4.0-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.0-ictce-4.0.6-Python-2.7.3.eb
@@ -15,13 +15,12 @@ pythonversion = '2.7.3'
 versionsuffix = "-Python-%s" % pythonversion
 
 dependencies = [
-                ('CMake', '2.8.4'),
-                ('GMP', '5.0.5'),
-                ('Boost', '1.49.0', versionsuffix),
-                ('MPFR', '3.1.0'),
-                ]
-                
-osdependencies = ['qt4-devel']
+    ('CMake', '2.8.4'),
+    ('GMP', '5.0.5'),
+    ('Boost', '1.49.0', versionsuffix),
+    ('MPFR', '3.1.0'),
+    ('Qt', '4.8.4'),
+]
 
 moduleclass = 'numlib'
 
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.0-ictce-5.3.0-Python-2.7.3.eb
index ba2bcd6e095dcfeb0f06db15fc6ef95598856536..721c08f9d7f3b41221c660c5711d41d40586c705 100644
--- a/easybuild/easyconfigs/c/CGAL/CGAL-4.0-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.0-ictce-5.3.0-Python-2.7.3.eb
@@ -16,13 +16,12 @@ pythonversion = '2.7.3'
 versionsuffix = "-Python-%s" % pythonversion
 
 dependencies = [
-                ('CMake', '2.8.4'),
-                ('GMP', '5.0.5'),
-                ('Boost', '1.49.0', versionsuffix),
-                ('MPFR', '3.1.0'),
-                ]
-                
-osdependencies = ['qt4-devel']
+    ('CMake', '2.8.4'),
+    ('GMP', '5.0.5'),
+    ('Boost', '1.49.0', versionsuffix),
+    ('MPFR', '3.1.0'),
+    ('Qt', '4.8.4'),
+]
 
 moduleclass = 'numlib'
 
diff --git a/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-goalf-1.5.12-no-OFED.eb
new file mode 100644
index 0000000000000000000000000000000000000000..928c867d0ae75a3db31d679bc8e05b8608982b0c
--- /dev/null
+++ b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-goalf-1.5.12-no-OFED.eb
@@ -0,0 +1,26 @@
+# Author Ward Poelmans <wpoely86@gmail.com>
+
+name = "CHARMM"
+version = "37b2"
+
+homepage = "http://www.charmm.org"
+description = """CHARMM (Chemistry at HARvard Macromolecular Mechanics) is a versatile
+and widely used molecular simulation program with broad application to many-particle systems."""
+
+toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'}
+toolchainopts = {'optarch': True, 'usempi': True}
+
+sources = ["c%(version)s.tar.gz"]
+
+patches = [
+    "qmmm-pme-%(version)s.patch",
+    "main-case-fix-%(version)s.patch",
+]
+
+# FFTW will automatically be used because of the toolchain
+build_options = "FULL COLFFT PIPF"
+
+# Chose from: huge, xxlarge, xlarge, large, medium (the default), small, xsmall, reduce
+system_size = "medium"
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0-mt.eb b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0-mt.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3485ce9ee917e80b35e1aaeb333e745c03044f6f
--- /dev/null
+++ b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0-mt.eb
@@ -0,0 +1,28 @@
+# Authors:: Ward Poelmans <wpoely86@gmail.com>
+
+name = "CHARMM"
+version = "37b2"
+versionsuffix = "-mt"
+
+homepage = "http://www.charmm.org"
+description = """CHARMM (Chemistry at HARvard Macromolecular Mechanics) is a versatile
+and widely used molecular simulation program with broad application to many-particle systems."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'optarch': True, 'usempi': False}
+
+sources = ["c%(version)s.tar.gz"]
+
+patches = [
+    "qmmm-pme-%(version)s.patch",
+    "use-xhost-%(version)s.patch",
+    "main-case-fix-%(version)s.patch",
+]
+
+# MKL activated automatically when the MKL is found, same for g09
+build_options = "FULL COLFFT PIPF"
+
+# Chose from: huge, xxlarge, xlarge, large, medium (the default), small, xsmall, reduce
+system_size = "medium"
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0.eb b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..81f90923f074c6c2f744f04fe0dc746ab9b9542e
--- /dev/null
+++ b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0.eb
@@ -0,0 +1,27 @@
+# Authors:: Ward Poelmans <wpoely86@gmail.com>
+
+name = "CHARMM"
+version = "37b2"
+
+homepage = "http://www.charmm.org"
+description = """CHARMM (Chemistry at HARvard Macromolecular Mechanics) is a versatile
+and widely used molecular simulation program with broad application to many-particle systems."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'optarch': True, 'usempi': True}
+
+sources = ["c%(version)s.tar.gz"]
+
+patches = [
+    "qmmm-pme-%(version)s.patch",
+    "use-xhost-%(version)s.patch",
+    "main-case-fix-%(version)s.patch",
+]
+
+# MKL activated automatically when the ictce toolchain is used
+build_options = "FULL COLFFT PIPF"
+
+# Chose from: huge, xxlarge, xlarge, large, medium (the default), small, xsmall, reduce
+system_size = "medium"
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/c/CHARMM/main-case-fix-37b2.patch b/easybuild/easyconfigs/c/CHARMM/main-case-fix-37b2.patch
new file mode 100644
index 0000000000000000000000000000000000000000..e2261c31732abf9fefde85354992cb501523f54b
--- /dev/null
+++ b/easybuild/easyconfigs/c/CHARMM/main-case-fix-37b2.patch
@@ -0,0 +1,14 @@
+# fix a error in the main
+# By Ward Poelmans <wpoely86@gmail.com>
+diff -ur c37b2.orig/source/charmm/charmm_main.src c37b2/source/charmm/charmm_main.src
+--- c37b2.orig/source/charmm/charmm_main.src	2013-02-11 06:27:24.000000000 +0100
++++ c37b2/source/charmm/charmm_main.src	2013-12-03 16:30:45.539579132 +0100
+@@ -1267,7 +1267,7 @@
+ 
+   case('PIPF','PFBA') cmds
+ ##IF PIPF
+-     if (wrd == 'PIPF') cmds
++     if (wrd == 'PIPF') then
+         call pfprep(comlyn,comlen)
+      else if (wrd == 'PFBA') then
+         call nosepf(comlyn,comlen)
diff --git a/easybuild/easyconfigs/c/CHARMM/qmmm-pme-37b2.patch b/easybuild/easyconfigs/c/CHARMM/qmmm-pme-37b2.patch
new file mode 100644
index 0000000000000000000000000000000000000000..291948be88771739310f904aa99e27f2de4bc907
--- /dev/null
+++ b/easybuild/easyconfigs/c/CHARMM/qmmm-pme-37b2.patch
@@ -0,0 +1,24 @@
+# fixes compile error: for some reason, ifort fails on this (possibly compiler bug)
+# As a solution, we always display the warning
+# By Ward Poelmans <wpoely86@gmail.com>
+diff -ur c37b2.orig/source/squantm/sqnt_qm2_ewald.src c37b2/source/squantm/sqnt_qm2_ewald.src
+--- c37b2.orig/source/squantm/sqnt_qm2_ewald.src	2012-07-17 01:08:32.000000000 +0200
++++ c37b2/source/squantm/sqnt_qm2_ewald.src	2013-12-03 14:11:46.945196858 +0100
+@@ -1876,7 +1878,7 @@
+ ##IF COLFFT (colfft)
+       !==================COLUMN FFT METHOD ==============================
+ ##IF QUANTUM MNDO97 SQUANTM GAMESS GAMESSUK QCHEM QTURBO G09
+-      if(LQMEWD) call wrndie(-5,'<QM_PME_MM_POT>','QM/MM-PME do not support COLFFT.')
++      call wrndie(1,'<QM_PME_MM_POT>','QM/MM-PME do not support COLFFT.')
+ ##ENDIF
+ ##ELSE      (colfft)
+       !.ab.Fix: xnsymm should be set (not 0 !).
+@@ -2146,7 +2148,7 @@
+ ##IF COLFFT (colfft)
+       !==================COLUMN FFT METHOD ==============================
+ ##IF QUANTUM MNDO97 SQUANTM GAMESS GAMESSUK QCHEM QTURBO G09
+-      if(LQMEWD) call wrndie(-5,'<PME_QMMM>','QM/MM-PME do not support COLFFT.')
++      call wrndie(1,'<PME_QMMM>','QM/MM-PME do not support COLFFT.')
+ ##ENDIF
+ ##ELSE      (colfft)
+ 
diff --git a/easybuild/easyconfigs/c/CHARMM/use-xhost-37b2.patch b/easybuild/easyconfigs/c/CHARMM/use-xhost-37b2.patch
new file mode 100644
index 0000000000000000000000000000000000000000..1bfab91ec4b669ed4462074eae895f4e2200aef0
--- /dev/null
+++ b/easybuild/easyconfigs/c/CHARMM/use-xhost-37b2.patch
@@ -0,0 +1,16 @@
+# lets use the flags the EB sets for us
+# By Ward Poelmans <wpoely86@gmail.com>
+diff -ur c37b2.orig/build/UNX/Makefile_em64t c37b2/build/UNX/Makefile_em64t
+--- c37b2.orig/build/UNX/Makefile_em64t	2012-07-10 14:06:18.000000000 +0200
++++ c37b2/build/UNX/Makefile_em64t	2013-12-03 15:35:18.997245768 +0100
+@@ -39,8 +39,8 @@
+ 
+    FC0 = $(FC) -c -O0 -free
+    FC1 = $(FC) -c -O1 -free
+-   FC2 = $(FC) -c -O3 -mp1 -axSSE4.1 -free 
+-   FC3 = $(FC) -c -O3 -mp1 -axSSE4.1 -free
++   FC2 = $(FC) -c -O3 -mp1 -free $(F90FLAGS)
++   FC3 = $(FC) -c -O3 -mp1 -free $(F90FLAGS)
+    FCR = $(FC) -c -u -V -free
+    FCD = $(FC) -c -g -O0 -u -traceback -free
+ ifdef DEBUG
diff --git a/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-goalf-1.1.0-no-OFED.eb
index ee57773249c3dad82d24fc2aeb02e872d44e76c8..8a5facff39ededce75b0c72b690887dfc276ac1d 100644
--- a/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-goalf-1.1.0-no-OFED.eb
@@ -9,7 +9,7 @@ description = """The CLHEP project is intended to be a set of HEP-specific found
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 toolchainopts = {'pic': True}
 
-sources = ['%s-%s.tgz' % (name.lower(), version)]
+sources = [SOURCELOWER_TGZ]
 source_urls = ['http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/']
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-goolf-1.4.10.eb b/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-goolf-1.4.10.eb
index f7b209a5b83f4ef15c584d6b6f1a7fce2ee1100a..f9f4f41e382c0585d06a3bd51601b65bae9bd32c 100644
--- a/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-goolf-1.4.10.eb
@@ -9,7 +9,7 @@ description = """The CLHEP project is intended to be a set of HEP-specific found
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'pic': True}
 
-sources = ['%s-%s.tgz' % (name.lower(), version)]
+sources = [SOURCELOWER_TGZ]
 source_urls = ['http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/']
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-ictce-4.0.6.eb b/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-ictce-4.0.6.eb
index 322bdf428fb2d313863c0992b00b858629a2677f..3585a1adbefcc0185790ded5a2d2bd68a92ae466 100644
--- a/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-ictce-4.0.6.eb
@@ -9,7 +9,7 @@ description = """The CLHEP project is intended to be a set of HEP-specific found
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
 toolchainopts = {'pic': True}
 
-sources = ['%s-%s.tgz' % (name.lower(), version)]
+sources = [SOURCELOWER_TGZ]
 source_urls = ['http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/']
 
 # CLHEP compiles with icc instead of icpc
diff --git a/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-ictce-5.3.0.eb b/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-ictce-5.3.0.eb
index 7510428bdd90ccfb57b741b3e61e6d7821688df7..b61ee5dfbef2147d59422ccd2988b5ebd84dde85 100644
--- a/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-ictce-5.3.0.eb
@@ -10,7 +10,7 @@ description = """The CLHEP project is intended to be a set of HEP-specific found
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 toolchainopts = {'pic': True}
 
-sources = ['%s-%s.tgz' % (name.lower(), version)]
+sources = [SOURCELOWER_TGZ]
 source_urls = ['http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/']
 
 # CLHEP compiles with icc instead of icpc
diff --git a/easybuild/easyconfigs/c/CLooG/CLooG-0.18.1-GCC-4.8.2.eb b/easybuild/easyconfigs/c/CLooG/CLooG-0.18.1-GCC-4.8.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8dce651ef0ca2a6a069f567af3d6ace791a5b882
--- /dev/null
+++ b/easybuild/easyconfigs/c/CLooG/CLooG-0.18.1-GCC-4.8.2.eb
@@ -0,0 +1,25 @@
+name = 'CLooG'
+version = '0.18.1'
+
+homepage = 'http://www.bastoul.net/cloog/index.php'
+description = """CLooG is a free software and library to generate code for scanning Z-polyhedra.
+That is, it finds a code (e.g. in C, FORTRAN...) that reaches each integral point of one or more parameterized polyhedra.
+CLooG has been originally written to solve the code generation problem for optimizing compilers based on the polytope model.
+Nevertheless it is used now in various area e.g. to build control automata for high-level synthesis or to find the best 
+polynomial approximation of a function. CLooG may help in any situation where scanning polyhedra matters. While the user 
+has full control on generated code quality, CLooG is designed to avoid control overhead and to produce a very effective code.
+"""
+
+toolchain = {'name': 'GCC', 'version': '4.8.2'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.bastoul.net/cloog/pages/download/']
+
+dependencies = [('GMP', '5.1.3')]
+
+sanity_check_paths = {
+    'files': ['bin/cloog', 'lib/libcloog-isl.so', 'lib/libisl.so'],
+    'dirs': []
+}
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.10.2-ictce-5.3.0.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.10.2-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..46545e5ed3555671c036f42c01bdeaa8faaf939f
--- /dev/null
+++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.10.2-ictce-5.3.0.eb
@@ -0,0 +1,18 @@
+name = 'CMake'
+version = "2.8.10.2"
+
+homepage = 'http://www.cmake.org'
+description = """CMake, the cross-platform, open-source build system.
+  CMake is a family of tools designed to build, test and package software."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s']
+sources = [SOURCELOWER_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.11-goolf-1.4.10.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.11-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3b3474d82aa2d84eee56a7460879b081c78fce47
--- /dev/null
+++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.11-goolf-1.4.10.eb
@@ -0,0 +1,20 @@
+name = 'CMake'
+version = "2.8.11"
+
+homepage = 'http://www.cmake.org'
+description = """CMake, the cross-platform, open-source build system.
+ CMake is a family of tools designed to build, test and package software."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('ncurses', '5.9')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.11-ictce-5.3.0.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.11-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..44aa40baa347917ee687cb3a9316c765f1b3ada4
--- /dev/null
+++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.11-ictce-5.3.0.eb
@@ -0,0 +1,20 @@
+name = 'CMake'
+version = '2.8.11'
+
+homepage = 'http://www.cmake.org'
+description = """CMake, the cross-platform, open-source build system.
+ CMake is a family of tools designed to build, test and package software."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('ncurses', '5.9')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.12-GCC-4.8.2.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-GCC-4.8.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3cd64959f996e8950e36c46524d1929042df49d7
--- /dev/null
+++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-GCC-4.8.2.eb
@@ -0,0 +1,20 @@
+name = 'CMake'
+version = '2.8.12'
+
+homepage = 'http://www.cmake.org'
+description = """CMake, the cross-platform, open-source build system.
+ CMake is a family of tools designed to build, test and package software."""
+
+toolchain = {'name': 'GCC', 'version': '4.8.2'}
+
+source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('ncurses', '5.9')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.12-gmpolf-1.4.8.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-gmpolf-1.4.8.eb
new file mode 100644
index 0000000000000000000000000000000000000000..29decbc3786fbd211967695774bcf6613caeb450
--- /dev/null
+++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-gmpolf-1.4.8.eb
@@ -0,0 +1,20 @@
+name = 'CMake'
+version = '2.8.12'
+
+homepage = 'http://www.cmake.org'
+description = """CMake, the cross-platform, open-source build system.
+ CMake is a family of tools designed to build, test and package software."""
+
+toolchain = {'name': 'gmpolf', 'version': '1.4.8'}
+
+source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('ncurses', '5.9')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.12-gmvolf-1.7.12.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-gmvolf-1.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4e80c3b7395334ec34bed5702138597af3c283c7
--- /dev/null
+++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-gmvolf-1.7.12.eb
@@ -0,0 +1,20 @@
+name = 'CMake'
+version = '2.8.12'
+
+homepage = 'http://www.cmake.org'
+description = """CMake, the cross-platform, open-source build system.
+ CMake is a family of tools designed to build, test and package software."""
+
+toolchain = {'name': 'gmvolf', 'version': '1.7.12'}
+
+source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('ncurses', '5.9')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.12-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-goalf-1.1.0-no-OFED.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4371f8b6277495a13056aae7ad5bddb578ac2348
--- /dev/null
+++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-goalf-1.1.0-no-OFED.eb
@@ -0,0 +1,20 @@
+name = 'CMake'
+version = '2.8.12'
+
+homepage = 'http://www.cmake.org'
+description = """CMake, the cross-platform, open-source build system.
+ CMake is a family of tools designed to build, test and package software."""
+
+toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
+
+source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('ncurses', '5.9')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.12-goolf-1.4.10.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0eb9ee7abd57ee367916fe4badfaa31958b60293
--- /dev/null
+++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-goolf-1.4.10.eb
@@ -0,0 +1,20 @@
+name = 'CMake'
+version = '2.8.12'
+
+homepage = 'http://www.cmake.org'
+description = """CMake, the cross-platform, open-source build system.
+ CMake is a family of tools designed to build, test and package software."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('ncurses', '5.9')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.12-goolfc-2.6.10.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-goolfc-2.6.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3b0a2eaf8c9c8edd6ac6ee44fe20edfd9adb0f2b
--- /dev/null
+++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-goolfc-2.6.10.eb
@@ -0,0 +1,20 @@
+name = 'CMake'
+version = '2.8.12'
+
+homepage = 'http://www.cmake.org'
+description = """CMake, the cross-platform, open-source build system.
+ CMake is a family of tools designed to build, test and package software."""
+
+toolchain = {'name': 'goolfc', 'version': '2.6.10'}
+
+source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('ncurses', '5.9')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.12-ictce-4.1.13.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-ictce-4.1.13.eb
new file mode 100644
index 0000000000000000000000000000000000000000..126afc121031bc41239b1ae60701f4feffbb4d30
--- /dev/null
+++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-ictce-4.1.13.eb
@@ -0,0 +1,20 @@
+name = 'CMake'
+version = '2.8.12'
+
+homepage = 'http://www.cmake.org'
+description = """CMake, the cross-platform, open-source build system.
+ CMake is a family of tools designed to build, test and package software."""
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+
+source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('ncurses', '5.9')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.12-ictce-5.3.0.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..99d7f8a0981882bf2794f2dfcddf9a3cc8e2a717
--- /dev/null
+++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-ictce-5.3.0.eb
@@ -0,0 +1,20 @@
+name = 'CMake'
+version = '2.8.12'
+
+homepage = 'http://www.cmake.org'
+description = """CMake, the cross-platform, open-source build system.
+ CMake is a family of tools designed to build, test and package software."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('ncurses', '5.9')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.4-goolfc-2.6.10.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.4-goolfc-2.6.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..42fa53cb42c4dd782e123bb0c57b06ca8fca0361
--- /dev/null
+++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.4-goolfc-2.6.10.eb
@@ -0,0 +1,20 @@
+name = 'CMake'
+version = '2.8.4'
+
+homepage = 'http://www.cmake.org'
+description = """CMake, the cross-platform, open-source build system.
+ CMake is a family of tools designed to build, test and package software."""
+
+toolchain = {'name': 'goolfc', 'version': '2.6.10'}
+
+source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('ncurses', '5.9')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-fix_compile_date_lastsvn.patch b/easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-fix_compile_date_lastsvn.patch
new file mode 100644
index 0000000000000000000000000000000000000000..05fe24dd1d893df3c545b0d82043343020f84592
--- /dev/null
+++ b/easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-fix_compile_date_lastsvn.patch
@@ -0,0 +1,11 @@
+--- cp2k.orig/cp2k/makefiles/Makefile 2012-08-21 14:35:17.000000000 +0300
++++ cp2k/cp2k/makefiles/Makefile  2013-11-12 12:41:29.361582641 +0200
+@@ -194,7 +194,7 @@
+ #
+ ifeq ($(CPPSHELL),)
+ CPPSHELL := -D__COMPILE_ARCH="\"$(ARCH)\""\
+-            -D__COMPILE_DATE="\"$(shell date)\""\
++            -D__COMPILE_DATE="\"$(shell date | sed 's/ /_/g')\""\
+             -D__COMPILE_HOST="\"$(shell hostname)\""\
+        -D__COMPILE_REVISION="\"$(strip $(REVISION))\""
+ endif
diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-ictce-5.5.0.eb b/easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ff604547cfde04484c5ee8895604c3edcb3e801d
--- /dev/null
+++ b/easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-ictce-5.5.0.eb
@@ -0,0 +1,39 @@
+name = 'CP2K'
+version = '2.4.0'
+
+homepage = 'http://cp2k.berlios.de/index.html'
+description = """CP2K is a freely available (GPL) program, written in Fortran 95, to perform atomistic and molecular
+simulations of solid state, liquid, molecular and biological systems. It provides a general framework for different
+methods such as e.g. density functional theory (DFT) using a mixed Gaussian and plane waves approach (GPW), and
+classical pair and many-body potentials. """
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = [SOURCEFORGE_SOURCE]
+
+patches = [
+    'do_regtest_nocompile.patch',
+    'CP2K-20131211-ifort-compiler-bug-fix.patch',
+    'CP2K-2.4.0-fix_compile_date_lastsvn.patch',
+]
+
+dependencies = [
+    ('Libint', '1.1.4'),
+    ('libxc', '2.0.1'),
+]
+
+builddependencies = [
+    ('flex', '2.5.37'),
+    ('Bison', '2.7'),
+]
+
+# don't use parallel make, results in compilation failure
+# because Fortran module files aren't created before they are needed
+parallel = 1
+
+# regression test reports failures
+ignore_regtest_fails = True
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-20111205-ictce-5.3.0.eb b/easybuild/easyconfigs/c/CP2K/CP2K-20111205-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3e863ab079a36e0705cbd06fe474450f61755d18
--- /dev/null
+++ b/easybuild/easyconfigs/c/CP2K/CP2K-20111205-ictce-5.3.0.eb
@@ -0,0 +1,33 @@
+name = 'CP2K'
+version = '20111205'
+
+homepage = 'http://www.cp2k.org'
+description = """CP2K is a freely available (GPL) program, written in Fortran 95,
+ to perform atomistic and molecular simulations of solid state, liquid, molecular and biological systems.
+ It provides a general framework for different methods such as e.g. density functional theory (DFT)
+ using a mixed Gaussian and plane waves approach (GPW), and classical pair and many-body potentials. """
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+
+patches = [
+    'fix_compile_date_lastcvs.patch',
+    'do_regtest_nocompile.patch',
+]
+
+builddependencies = [
+    ('flex', '2.5.35'),
+    ('Bison', '2.5'),
+]
+
+dependencies = [('Libint', '1.1.4')]
+
+# don't use parallel make, results in compilation failure
+# because Fortran module files aren't created before they are needed
+parallel = 1
+
+# regression test reports failures (120/2196 tests fail with segfault)
+ignore_regtest_fails = True
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-20111205-ictce-5.5.0.eb b/easybuild/easyconfigs/c/CP2K/CP2K-20111205-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..57f859f95c9b38f876cdc454765cfb6d55af7603
--- /dev/null
+++ b/easybuild/easyconfigs/c/CP2K/CP2K-20111205-ictce-5.5.0.eb
@@ -0,0 +1,33 @@
+name = 'CP2K'
+version = '20111205'
+
+homepage = 'http://www.cp2k.org'
+description = """CP2K is a freely available (GPL) program, written in Fortran 95,
+ to perform atomistic and molecular simulations of solid state, liquid, molecular and biological systems.
+ It provides a general framework for different methods such as e.g. density functional theory (DFT)
+ using a mixed Gaussian and plane waves approach (GPW), and classical pair and many-body potentials. """
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+sources = [SOURCE_TAR_GZ]
+
+patches = [
+    'fix_compile_date_lastcvs.patch',
+    'do_regtest_nocompile.patch',
+]
+
+builddependencies = [
+    ('flex', '2.5.35'),
+    ('Bison', '2.5'),
+]
+
+dependencies = [('Libint', '1.1.4')]
+
+# don't use parallel make, results in compilation failure
+# because Fortran module files aren't created before they are needed
+parallel = 1
+
+# regression test reports failures (120/2196 tests fail with segfault)
+ignore_regtest_fails = True
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-20131211-ictce-5.5.0.eb b/easybuild/easyconfigs/c/CP2K/CP2K-20131211-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1d06d1dfc9297a9f24e3507af8c8d9d5540fd23b
--- /dev/null
+++ b/easybuild/easyconfigs/c/CP2K/CP2K-20131211-ictce-5.5.0.eb
@@ -0,0 +1,38 @@
+name = 'CP2K'
+version = '20131211'
+
+homepage = 'http://cp2k.berlios.de/index.html'
+description = """CP2K is a freely available (GPL) program, written in Fortran 95, to perform atomistic and molecular
+simulations of solid state, liquid, molecular and biological systems. It provides a general framework for different
+methods such as e.g. density functional theory (DFT) using a mixed Gaussian and plane waves approach (GPW), and
+classical pair and many-body potentials. """
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'pic': True}
+
+# Uses a svn checkout from 20131211 (r13439)
+sources = [SOURCE_TAR_BZ2]
+
+patches = [
+    'CP2K-20131211-ifort-compiler-bug-fix.patch',
+    'CP2K-2.4.0-fix_compile_date_lastsvn.patch',
+]
+
+dependencies = [
+    ('Libint', '1.1.4'),
+    ('libxc', '2.0.1'),
+]
+
+builddependencies = [
+    ('flex', '2.5.37'),
+    ('Bison', '2.7'),
+]
+
+# don't use parallel make, results in compilation failure
+# because Fortran module files aren't created before they are needed
+parallel = 1
+
+# regression test reports failures: 13/2450 segfault
+ignore_regtest_fails = True
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-20131211-ifort-compiler-bug-fix.patch b/easybuild/easyconfigs/c/CP2K/CP2K-20131211-ifort-compiler-bug-fix.patch
new file mode 100644
index 0000000000000000000000000000000000000000..20b595d455d49895f33d5ab7d0c9cc45762df58d
--- /dev/null
+++ b/easybuild/easyconfigs/c/CP2K/CP2K-20131211-ifort-compiler-bug-fix.patch
@@ -0,0 +1,12 @@
+# workaround for ifort bug
+# https://groups.google.com/forum/#!topic/cp2k/LorI2Z4pQgc
+--- cp2k.orig/cp2k/src/dbcsr_lib/dbcsr_error_handling.F	2013-12-05 11:46:53.201980584 +0100
++++ cp2k/cp2k/src/dbcsr_lib/dbcsr_error_handling.F	2013-12-05 16:28:45.572524631 +0100
+@@ -20,7 +20,6 @@
+   !$ USE OMP_LIB
+ 
+   IMPLICIT NONE
+-  PRIVATE
+ 
+   ! procedures
+   PUBLIC :: dbcsr_error_set, dbcsr_error_stop, dbcsr_error_print_stack
diff --git a/easybuild/easyconfigs/c/CRF++/CRF++-0.57-ictce-5.3.0.eb b/easybuild/easyconfigs/c/CRF++/CRF++-0.57-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2f6cf7bcd70c186178bc3fc133dc4c23aa92a49d
--- /dev/null
+++ b/easybuild/easyconfigs/c/CRF++/CRF++-0.57-ictce-5.3.0.eb
@@ -0,0 +1,24 @@
+name = 'CRF++'
+version = '0.57'
+
+homepage = 'https://code.google.com/p/crfpp/'
+description = """CRF++ is a simple, customizable, and open source implementation of
+ Conditional Random Fields (CRFs) for segmenting/labeling sequential data. CRF++ is
+ designed for generic purpose and will be applied to a variety of NLP tasks, such as
+ Named Entity Recognition, Information Extraction and Text Chunking. """
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'optarch': True, 'pic': True, 'opt': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://crfpp.googlecode.com/files/']
+
+configopts = '--with-pic'
+makeopts = 'CXXFLAGS="$CXXFLAGS -Wall -finline"'
+
+sanity_check_paths = {
+    'files': ["bin/crf_learn", "bin/crf_test"],
+    'dirs': []
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/c/Chapel/Chapel-1.6.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/c/Chapel/Chapel-1.6.0-goalf-1.1.0-no-OFED.eb
index 74971c2b92ad9f046c900f68776ad663ede5a0d0..0ecf5d3f45493143630a5c231300f90923fe1e95 100644
--- a/easybuild/easyconfigs/c/Chapel/Chapel-1.6.0-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/c/Chapel/Chapel-1.6.0-goalf-1.1.0-no-OFED.eb
@@ -28,4 +28,9 @@ unpack_options = '--strip-components=1'
 
 parallel = 1  # parallel build may fail
 
+modextrapaths = {
+    'PATH': 'util',
+    'CHPL_HOME': '',
+}
+
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/c/Chapel/Chapel-1.6.0-goolf-1.4.10.eb b/easybuild/easyconfigs/c/Chapel/Chapel-1.6.0-goolf-1.4.10.eb
index 8699640db2fe22dbc9af2a3534e68f39c93b598f..93406cb2aa3d792521cb1003f233f04d39b0be2c 100644
--- a/easybuild/easyconfigs/c/Chapel/Chapel-1.6.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/c/Chapel/Chapel-1.6.0-goolf-1.4.10.eb
@@ -29,4 +29,9 @@ unpack_options = '--strip-components=1'
 # parallel build fails
 parallel = 1
 
+modextrapaths = {
+    'PATH': 'util',
+    'CHPL_HOME': '',
+}
+
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/c/Chapel/Chapel-1.7.0-goolf-1.4.10.eb b/easybuild/easyconfigs/c/Chapel/Chapel-1.7.0-goolf-1.4.10.eb
index a7621be4923c8912c7bf44e01814714b3713099c..cfdb1760fd2f0fdb5cf506605046916563fcaef6 100644
--- a/easybuild/easyconfigs/c/Chapel/Chapel-1.7.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/c/Chapel/Chapel-1.7.0-goolf-1.4.10.eb
@@ -29,4 +29,9 @@ unpack_options = '--strip-components=1'
 # parallel build fails
 parallel = 1
 
+modextrapaths = {
+    'PATH': 'util',
+    'CHPL_HOME': '',
+}
+
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.4.10.eb b/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.4.10.eb
index e1b2b7b42c37335144aa4b9a42cecc07cac126b7..cb35b4075732f83b6b5ac68775c88fb64a0c3e08 100644
--- a/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.4.10.eb
@@ -37,4 +37,9 @@ sanity_check_paths = {
     'dirs': [],
 }
 
+modextrapaths = {
+    'PATH': 'util',
+    'CHPL_HOME': '',
+}
+
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.6.10.eb b/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.6.10.eb
index 388ed0d1a562e27e1197fdedef0e58161d4281c1..287a7c1d2b57a23b09dc5f8f7db35e05454abd29 100644
--- a/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.6.10.eb
+++ b/easybuild/easyconfigs/c/Chapel/Chapel-1.8.0-goolf-1.6.10.eb
@@ -37,4 +37,9 @@ sanity_check_paths = {
     'dirs': [],
 }
 
+modextrapaths = {
+    'PATH': 'util',
+    'CHPL_HOME': '',
+}
+
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/c/Clang/Clang-3.2-GCC-4.7.3.eb b/easybuild/easyconfigs/c/Clang/Clang-3.2-GCC-4.7.3.eb
index c103be3881e932e5533877ab00f8f4401f736f00..36fb2222445f06ebe32b2d5803379e128a8f5f97 100644
--- a/easybuild/easyconfigs/c/Clang/Clang-3.2-GCC-4.7.3.eb
+++ b/easybuild/easyconfigs/c/Clang/Clang-3.2-GCC-4.7.3.eb
@@ -43,3 +43,5 @@ languages = ['c', 'c++']
 moduleclass = 'compiler'
 
 assertions = False
+
+usepolly = False
diff --git a/easybuild/easyconfigs/c/Clang/Clang-3.3-GCC-4.8.1.eb b/easybuild/easyconfigs/c/Clang/Clang-3.3-GCC-4.8.1.eb
index 9f1a57dbbce29b824676b86a226201dca6e2a5f4..e498edc08672fe0024b84c6ab9ccc51d35f467a4 100644
--- a/easybuild/easyconfigs/c/Clang/Clang-3.3-GCC-4.8.1.eb
+++ b/easybuild/easyconfigs/c/Clang/Clang-3.3-GCC-4.8.1.eb
@@ -50,3 +50,5 @@ moduleclass = 'compiler'
 assertions = False
 
 build_targets = ['X86']
+
+usepolly = False
diff --git a/easybuild/easyconfigs/c/Clang/Clang-3.4-GCC-4.8.2.eb b/easybuild/easyconfigs/c/Clang/Clang-3.4-GCC-4.8.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..da75a7816f244529b526f01a22393a149106c99d
--- /dev/null
+++ b/easybuild/easyconfigs/c/Clang/Clang-3.4-GCC-4.8.2.eb
@@ -0,0 +1,60 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2013 Dmitri Gribenko, Ward Poelmans
+# Authors:: Dmitri Gribenko <gribozavr@gmail.com>
+# Authors:: Ward Poelmans <wpoely86@gmail.com>
+# License:: GPLv2 or later, MIT, three-clause BSD.
+# $Id$
+##
+
+name = "Clang"
+version = "3.4"
+
+homepage = "http://clang.llvm.org/"
+description = """C, C++, Objective-C compiler, based on LLVM.  Does not
+ include C++ standard library -- use libstdc++ from GCC."""
+
+# Clang also depends on libstdc++ during runtime, but this dependency is
+# already specified as the toolchain.
+toolchain = {'name': 'GCC', 'version': '4.8.2'}
+# Do not set optarch to True: it will cause the build to fail
+toolchainopts = {'optarch': False}
+
+source_urls = ["http://llvm.org/releases/%(version)s"]
+sources = [
+    "llvm-%(version)s.src.tar.gz",
+    "clang-%(version)s.src.tar.gz",
+    "compiler-rt-%(version)s.src.tar.gz",
+    "polly-%(version)s.src.tar.gz",
+]
+
+patches = [
+    # Remove some tests that fail because of -DGCC_INSTALL_PREFIX.  The issue is
+    # that hardcoded GCC_INSTALL_PREFIX overrides -sysroot.  This probably breaks
+    # cross-compilation.
+    # http://lists.cs.uiuc.edu/pipermail/cfe-commits/Week-of-Mon-20130401/077539.html
+    'Clang-%(version)s-failing-tests-due-to-gcc-installation-prefix.patch',
+    'Clang-%(version)s-failing-sanitizer-tests.patch',
+    'Clang-%(version)s-llvm-ar-uid.patch',
+]
+
+builddependencies = [('CMake', '2.8.12')]
+
+dependencies = [
+    ('GMP', '5.1.3'),
+    ('CLooG', '0.18.1'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/clang', 'bin/clang++', 'lib/libclang.so', 'lib/clang/%(version)s/include/stddef.h'],
+    'dirs': [],
+}
+
+moduleclass = 'compiler'
+
+assertions = False
+
+usepolly = True
+
+build_targets = ['X86']
diff --git a/easybuild/easyconfigs/c/Clang/Clang-3.4-failing-sanitizer-tests.patch b/easybuild/easyconfigs/c/Clang/Clang-3.4-failing-sanitizer-tests.patch
new file mode 100644
index 0000000000000000000000000000000000000000..bc991f2275b6177d1f877341c5d9ee6ecca44bcd
--- /dev/null
+++ b/easybuild/easyconfigs/c/Clang/Clang-3.4-failing-sanitizer-tests.patch
@@ -0,0 +1,24 @@
+# these tests fail for unknown reason: as they are part of the sanitizers in clang,
+# I don't think that we should be worried about them.
+diff -urN llvm-3.4.orig/projects/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc llvm-3.4/projects/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc
+--- llvm-3.4.orig/projects/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc	2013-10-17 13:18:11.000000000 +0200
++++ llvm-3.4/projects/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc	2014-01-07 14:43:48.836815229 +0100
+@@ -223,10 +223,8 @@
+ 
+ #if SANITIZER_WORDSIZE == 64
+ TEST(SanitizerCommon, SizeClassAllocator64GetBlockBegin) {
+-  SizeClassAllocatorGetBlockBeginStress<Allocator64>();
+ }
+ TEST(SanitizerCommon, SizeClassAllocator64CompactGetBlockBegin) {
+-  SizeClassAllocatorGetBlockBeginStress<Allocator64Compact>();
+ }
+ TEST(SanitizerCommon, SizeClassAllocator32CompactGetBlockBegin) {
+   SizeClassAllocatorGetBlockBeginStress<Allocator32Compact>();
+@@ -324,7 +322,6 @@
+ 
+ #if SANITIZER_WORDSIZE == 64
+ TEST(SanitizerCommon, SizeClassAllocator64Overflow) {
+-  EXPECT_DEATH(FailInAssertionOnOOM<Allocator64>(), "Out of memory");
+ }
+ #endif
+ 
diff --git a/easybuild/easyconfigs/c/Clang/Clang-3.4-failing-tests-due-to-gcc-installation-prefix.patch b/easybuild/easyconfigs/c/Clang/Clang-3.4-failing-tests-due-to-gcc-installation-prefix.patch
new file mode 100644
index 0000000000000000000000000000000000000000..46114f93d77118e101367aedceda51b4a09a7369
--- /dev/null
+++ b/easybuild/easyconfigs/c/Clang/Clang-3.4-failing-tests-due-to-gcc-installation-prefix.patch
@@ -0,0 +1,905 @@
+diff -urN llvm-3.4.orig/tools/clang/test/Driver/constructors.c llvm-3.4/tools/clang/test/Driver/constructors.c
+--- llvm-3.4.orig/tools/clang/test/Driver/constructors.c	2012-11-22 00:40:23.000000000 +0100
++++ llvm-3.4/tools/clang/test/Driver/constructors.c	2014-01-07 14:43:48.801815348 +0100
+@@ -5,28 +5,12 @@
+ // CHECK-NO-INIT-ARRAY-NOT: -fuse-init-array
+ //
+ // RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1       \
+-// RUN:     -target i386-unknown-linux \
+-// RUN:     --sysroot=%S/Inputs/fake_install_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-INIT-ARRAY %s
+-//
+-// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1       \
+ // RUN:     -fno-use-init-array \
+ // RUN:     -target i386-unknown-linux \
+ // RUN:     --sysroot=%S/Inputs/fake_install_tree \
+ // RUN:   | FileCheck --check-prefix=CHECK-NO-INIT-ARRAY %s
+ //
+ // RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1       \
+-// RUN:     -fno-use-init-array -fuse-init-array \
+-// RUN:     -target i386-unknown-linux \
+-// RUN:     --sysroot=%S/Inputs/fake_install_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-INIT-ARRAY %s
+-//
+-// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1       \
+-// RUN:     -target i386-unknown-linux \
+-// RUN:     --sysroot=%S/Inputs/basic_linux_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-NO-INIT-ARRAY %s
+-//
+-// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1       \
+ // RUN:     -fuse-init-array \
+ // RUN:     -target i386-unknown-linux \
+ // RUN:     --sysroot=%S/Inputs/basic_linux_tree \
+diff -urN llvm-3.4.orig/tools/clang/test/Driver/gcc-version-debug.c llvm-3.4/tools/clang/test/Driver/gcc-version-debug.c
+--- llvm-3.4.orig/tools/clang/test/Driver/gcc-version-debug.c	2013-08-15 00:10:17.000000000 +0200
++++ llvm-3.4/tools/clang/test/Driver/gcc-version-debug.c	1970-01-01 01:00:00.000000000 +0100
+@@ -1,6 +0,0 @@
+-// RUN: %clang -v --target=i386-unknown-linux \
+-// RUN:           --sysroot=%S/Inputs/debian_multiarch_tree 2>&1 | FileCheck %s
+-
+-// CHECK: Found candidate GCC installation: {{.*}}Inputs{{.}}debian_multiarch_tree{{.}}usr{{.}}lib{{.}}gcc{{.}}i686-linux-gnu{{.}}4.5
+-// CHECK-NEXT: Found candidate GCC installation: {{.*}}Inputs{{.}}debian_multiarch_tree{{.}}usr{{.}}lib{{.}}gcc{{.}}x86_64-linux-gnu{{.}}4.5
+-// CHECK-NEXT: Selected GCC installation: {{.*}}Inputs{{.}}debian_multiarch_tree{{.}}usr{{.}}lib{{.}}gcc{{.}}i686-linux-gnu{{.}}4.5
+diff -urN llvm-3.4.orig/tools/clang/test/Driver/linux-header-search.cpp llvm-3.4/tools/clang/test/Driver/linux-header-search.cpp
+--- llvm-3.4.orig/tools/clang/test/Driver/linux-header-search.cpp	2013-08-26 10:59:53.000000000 +0200
++++ llvm-3.4/tools/clang/test/Driver/linux-header-search.cpp	1970-01-01 01:00:00.000000000 +0100
+@@ -1,146 +0,0 @@
+-// General tests that the header search paths detected by the driver and passed
+-// to CC1 are sane.
+-//
+-// Test a very broken version of multiarch that shipped in Ubuntu 11.04.
+-// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \
+-// RUN:     -target i386-unknown-linux \
+-// RUN:     --sysroot=%S/Inputs/ubuntu_11.04_multiarch_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-UBUNTU-11-04 %s
+-// CHECK-UBUNTU-11-04: "{{.*}}clang{{.*}}" "-cc1"
+-// CHECK-UBUNTU-11-04: "-isysroot" "[[SYSROOT:[^"]+]]"
+-// CHECK-UBUNTU-11-04: "-internal-isystem" "[[SYSROOT]]/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5/../../../../../include/c++/4.5"
+-// CHECK-UBUNTU-11-04: "-internal-isystem" "[[SYSROOT]]/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5/../../../../../include/c++/4.5/i686-linux-gnu"
+-// CHECK-UBUNTU-11-04: "-internal-isystem" "[[SYSROOT]]/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5/../../../../../include/c++/4.5/backward"
+-// CHECK-UBUNTU-11-04: "-internal-isystem" "[[SYSROOT]]/usr/local/include"
+-// CHECK-UBUNTU-11-04: "-internal-isystem" "{{.*}}{{/|\\\\}}lib{{(64|32)?}}{{/|\\\\}}clang{{/|\\\\}}{{[0-9]\.[0-9]}}{{/|\\\\}}include"
+-// CHECK-UBUNTU-11-04: "-internal-externc-isystem" "[[SYSROOT]]/include"
+-// CHECK-UBUNTU-11-04: "-internal-externc-isystem" "[[SYSROOT]]/usr/include"
+-//
+-// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \
+-// RUN:     -target x86_64-unknown-linux-gnu \
+-// RUN:     --sysroot=%S/Inputs/ubuntu_13.04_multiarch_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-UBUNTU-13-04 %s
+-// CHECK-UBUNTU-13-04: "{{[^"]*}}clang{{[^"]*}}" "-cc1"
+-// CHECK-UBUNTU-13-04: "-isysroot" "[[SYSROOT:[^"]+]]"
+-// CHECK-UBUNTU-13-04: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-linux-gnu/4.7/../../../../include/c++/4.7"
+-// CHECK-UBUNTU-13-04: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-linux-gnu/4.7/../../../../include/c++/4.7/backward"
+-// CHECK-UBUNTU-13-04: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-linux-gnu/4.7/../../../../include/x86_64-linux-gnu/c++/4.7"
+-// CHECK-UBUNTU-13-04: "-internal-isystem" "[[SYSROOT]]/usr/local/include"
+-// CHECK-UBUNTU-13-04: "-internal-isystem" "{{.*}}{{/|\\\\}}lib{{(64|32)?}}{{/|\\\\}}clang{{/|\\\\}}{{[0-9]\.[0-9]}}{{/|\\\\}}include"
+-// CHECK-UBUNTU-13-04: "-internal-externc-isystem" "[[SYSROOT]]/usr/include/x86_64-linux-gnu"
+-// CHECK-UBUNTU-13-04: "-internal-externc-isystem" "[[SYSROOT]]/include"
+-// CHECK-UBUNTU-13-04: "-internal-externc-isystem" "[[SYSROOT]]/usr/include"
+-//
+-// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \
+-// RUN:     -target arm-linux-gnueabihf \
+-// RUN:     --sysroot=%S/Inputs/ubuntu_13.04_multiarch_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-UBUNTU-13-04-CROSS %s
+-// CHECK-UBUNTU-13-04-CROSS: "{{[^"]*}}clang{{[^"]*}}" "-cc1"
+-// CHECK-UBUNTU-13-04-CROSS: "-isysroot" "[[SYSROOT:[^"]+]]"
+-// CHECK-UBUNTU-13-04-CROSS: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc-cross/arm-linux-gnueabihf/4.7/../../../../include/c++/4.7"
+-// CHECK-UBUNTU-13-04-CROSS: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc-cross/arm-linux-gnueabihf/4.7/../../../../include/c++/4.7/backward"
+-// CHECK-UBUNTU-13-04-CROSS: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc-cross/arm-linux-gnueabihf/4.7/../../../../include/arm-linux-gnueabihf/c++/4.7"
+-// CHECK-UBUNTU-13-04-CROSS: "-internal-isystem" "[[SYSROOT]]/usr/local/include"
+-// CHECK-UBUNTU-13-04-CROSS: "-internal-isystem" "{{.*}}{{/|\\\\}}lib{{(64|32)?}}{{/|\\\\}}clang{{/|\\\\}}{{[0-9]\.[0-9]}}{{/|\\\\}}include"
+-// CHECK-UBUNTU-13-04-CROSS: "-internal-externc-isystem" "[[SYSROOT]]/include"
+-// CHECK-UBUNTU-13-04-CROSS: "-internal-externc-isystem" "[[SYSROOT]]/usr/include"
+-//
+-// Test Ubuntu/Debian's new version of multiarch, with -m32.
+-// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \
+-// RUN:     -target x86_64-unknown-linux-gnu -m32 \
+-// RUN:     --sysroot=%S/Inputs/ubuntu_13.04_multiarch_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-UBUNTU-13-04-M32 %s
+-// CHECK-UBUNTU-13-04-M32: "{{[^"]*}}clang{{[^"]*}}" "-cc1"
+-// CHECK-UBUNTU-13-04-M32: "-triple" "i386-unknown-linux-gnu"
+-// CHECK-UBUNTU-13-04-M32: "-isysroot" "[[SYSROOT:[^"]+]]"
+-// CHECK-UBUNTU-13-04-M32: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-linux-gnu/4.7/../../../../include/c++/4.7"
+-// CHECK-UBUNTU-13-04-M32: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-linux-gnu/4.7/../../../../include/c++/4.7/x86_64-linux-gnu/32"
+-// CHECK-UBUNTU-13-04-M32: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-linux-gnu/4.7/../../../../include/c++/4.7/backward"
+-// CHECK-UBUNTU-13-04-M32: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-linux-gnu/4.7/../../../../include/x86_64-linux-gnu/c++/4.7/32"
+-//
+-// Thoroughly exercise the Debian multiarch environment.
+-// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \
+-// RUN:     -target i686-linux-gnu \
+-// RUN:     --sysroot=%S/Inputs/debian_multiarch_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-DEBIAN-X86 %s
+-// CHECK-DEBIAN-X86: "{{[^"]*}}clang{{[^"]*}}" "-cc1"
+-// CHECK-DEBIAN-X86: "-isysroot" "[[SYSROOT:[^"]+]]"
+-// CHECK-DEBIAN-X86: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/i686-linux-gnu/4.5/../../../../include/c++/4.5"
+-// CHECK-DEBIAN-X86: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/i686-linux-gnu/4.5/../../../../include/c++/4.5/i686-linux-gnu"
+-// CHECK-DEBIAN-X86: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/i686-linux-gnu/4.5/../../../../include/c++/4.5/backward"
+-// CHECK-DEBIAN-X86: "-internal-isystem" "[[SYSROOT]]/usr/local/include"
+-// CHECK-DEBIAN-X86: "-internal-isystem" "{{.*}}{{/|\\\\}}lib{{(64|32)?}}{{/|\\\\}}clang{{/|\\\\}}{{[0-9]\.[0-9]}}{{/|\\\\}}include"
+-// CHECK-DEBIAN-X86: "-internal-externc-isystem" "[[SYSROOT]]/usr/include/i386-linux-gnu"
+-// CHECK-DEBIAN-X86: "-internal-externc-isystem" "[[SYSROOT]]/include"
+-// CHECK-DEBIAN-X86: "-internal-externc-isystem" "[[SYSROOT]]/usr/include"
+-// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \
+-// RUN:     -target x86_64-linux-gnu \
+-// RUN:     --sysroot=%S/Inputs/debian_multiarch_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-DEBIAN-X86-64 %s
+-// CHECK-DEBIAN-X86-64: "{{[^"]*}}clang{{[^"]*}}" "-cc1"
+-// CHECK-DEBIAN-X86-64: "-isysroot" "[[SYSROOT:[^"]+]]"
+-// CHECK-DEBIAN-X86-64: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-linux-gnu/4.5/../../../../include/c++/4.5"
+-// CHECK-DEBIAN-X86-64: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-linux-gnu/4.5/../../../../include/c++/4.5/x86_64-linux-gnu"
+-// CHECK-DEBIAN-X86-64: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-linux-gnu/4.5/../../../../include/c++/4.5/backward"
+-// CHECK-DEBIAN-X86-64: "-internal-isystem" "[[SYSROOT]]/usr/local/include"
+-// CHECK-DEBIAN-X86-64: "-internal-isystem" "{{.*}}{{/|\\\\}}lib{{(64|32)?}}{{/|\\\\}}clang{{/|\\\\}}{{[0-9]\.[0-9]}}{{/|\\\\}}include"
+-// CHECK-DEBIAN-X86-64: "-internal-externc-isystem" "[[SYSROOT]]/usr/include/x86_64-linux-gnu"
+-// CHECK-DEBIAN-X86-64: "-internal-externc-isystem" "[[SYSROOT]]/include"
+-// CHECK-DEBIAN-X86-64: "-internal-externc-isystem" "[[SYSROOT]]/usr/include"
+-// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \
+-// RUN:     -target powerpc-linux-gnu \
+-// RUN:     --sysroot=%S/Inputs/debian_multiarch_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-DEBIAN-PPC %s
+-// CHECK-DEBIAN-PPC: "{{[^"]*}}clang{{[^"]*}}" "-cc1"
+-// CHECK-DEBIAN-PPC: "-isysroot" "[[SYSROOT:[^"]+]]"
+-// CHECK-DEBIAN-PPC: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/powerpc-linux-gnu/4.5/../../../../include/c++/4.5"
+-// CHECK-DEBIAN-PPC: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/powerpc-linux-gnu/4.5/../../../../include/c++/4.5/powerpc-linux-gnu"
+-// CHECK-DEBIAN-PPC: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/powerpc-linux-gnu/4.5/../../../../include/c++/4.5/backward"
+-// CHECK-DEBIAN-PPC: "-internal-isystem" "[[SYSROOT]]/usr/local/include"
+-// CHECK-DEBIAN-PPC: "-internal-isystem" "{{.*}}{{/|\\\\}}lib{{(64|32)?}}{{/|\\\\}}clang{{/|\\\\}}{{[0-9]\.[0-9]}}{{/|\\\\}}include"
+-// CHECK-DEBIAN-PPC: "-internal-externc-isystem" "[[SYSROOT]]/usr/include/powerpc-linux-gnu"
+-// CHECK-DEBIAN-PPC: "-internal-externc-isystem" "[[SYSROOT]]/include"
+-// CHECK-DEBIAN-PPC: "-internal-externc-isystem" "[[SYSROOT]]/usr/include"
+-// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \
+-// RUN:     -target powerpc64-linux-gnu \
+-// RUN:     --sysroot=%S/Inputs/debian_multiarch_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-DEBIAN-PPC64 %s
+-// CHECK-DEBIAN-PPC64: "{{[^"]*}}clang{{[^"]*}}" "-cc1"
+-// CHECK-DEBIAN-PPC64: "-isysroot" "[[SYSROOT:[^"]+]]"
+-// CHECK-DEBIAN-PPC64: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/powerpc64-linux-gnu/4.5/../../../../include/c++/4.5"
+-// CHECK-DEBIAN-PPC64: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/powerpc64-linux-gnu/4.5/../../../../include/c++/4.5/powerpc64-linux-gnu"
+-// CHECK-DEBIAN-PPC64: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/powerpc64-linux-gnu/4.5/../../../../include/c++/4.5/backward"
+-// CHECK-DEBIAN-PPC64: "-internal-isystem" "[[SYSROOT]]/usr/local/include"
+-// CHECK-DEBIAN-PPC64: "-internal-isystem" "{{.*}}{{/|\\\\}}lib{{(64|32)?}}{{/|\\\\}}clang{{/|\\\\}}{{[0-9]\.[0-9]}}{{/|\\\\}}include"
+-// CHECK-DEBIAN-PPC64: "-internal-externc-isystem" "[[SYSROOT]]/usr/include/powerpc64-linux-gnu"
+-// CHECK-DEBIAN-PPC64: "-internal-externc-isystem" "[[SYSROOT]]/include"
+-// CHECK-DEBIAN-PPC64: "-internal-externc-isystem" "[[SYSROOT]]/usr/include"
+-//
+-// Test Gentoo's weirdness both before and after they changed it in their GCC
+-// 4.6.4 release.
+-// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \
+-// RUN:     -target x86_64-unknown-linux-gnu \
+-// RUN:     --sysroot=%S/Inputs/gentoo_linux_gcc_4.6.2_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-GENTOO-4-6-2 %s
+-// CHECK-GENTOO-4-6-2: "{{.*}}clang{{.*}}" "-cc1"
+-// CHECK-GENTOO-4-6-2: "-isysroot" "[[SYSROOT:[^"]+]]"
+-// CHECK-GENTOO-4-6-2: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-pc-linux-gnu/4.6.2/include/g++-v4"
+-// CHECK-GENTOO-4-6-2: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-pc-linux-gnu/4.6.2/include/g++-v4/x86_64-pc-linux-gnu"
+-// CHECK-GENTOO-4-6-2: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-pc-linux-gnu/4.6.2/include/g++-v4/backward"
+-// CHECK-GENTOO-4-6-2: "-internal-isystem" "[[SYSROOT]]/usr/local/include"
+-// CHECK-GENTOO-4-6-2: "-internal-isystem" "{{.*}}{{/|\\\\}}lib{{(64|32)?}}{{/|\\\\}}clang{{/|\\\\}}{{[0-9]\.[0-9]}}{{/|\\\\}}include"
+-// CHECK-GENTOO-4-6-2: "-internal-externc-isystem" "[[SYSROOT]]/include"
+-// CHECK-GENTOO-4-6-2: "-internal-externc-isystem" "[[SYSROOT]]/usr/include"
+-// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \
+-// RUN:     -target x86_64-unknown-linux-gnu \
+-// RUN:     --sysroot=%S/Inputs/gentoo_linux_gcc_4.6.4_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-GENTOO-4-6-4 %s
+-// CHECK-GENTOO-4-6-4: "{{.*}}clang{{.*}}" "-cc1"
+-// CHECK-GENTOO-4-6-4: "-isysroot" "[[SYSROOT:[^"]+]]"
+-// CHECK-GENTOO-4-6-4: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-pc-linux-gnu/4.6.4/include/g++-v4.6"
+-// CHECK-GENTOO-4-6-4: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-pc-linux-gnu/4.6.4/include/g++-v4.6/x86_64-pc-linux-gnu"
+-// CHECK-GENTOO-4-6-4: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-pc-linux-gnu/4.6.4/include/g++-v4.6/backward"
+-// CHECK-GENTOO-4-6-4: "-internal-isystem" "[[SYSROOT]]/usr/local/include"
+-// CHECK-GENTOO-4-6-4: "-internal-isystem" "{{.*}}{{/|\\\\}}lib{{(64|32)?}}{{/|\\\\}}clang{{/|\\\\}}{{[0-9]\.[0-9]}}{{/|\\\\}}include"
+-// CHECK-GENTOO-4-6-4: "-internal-externc-isystem" "[[SYSROOT]]/include"
+-// CHECK-GENTOO-4-6-4: "-internal-externc-isystem" "[[SYSROOT]]/usr/include"
+diff -urN llvm-3.4.orig/tools/clang/test/Driver/linux-ld.c llvm-3.4/tools/clang/test/Driver/linux-ld.c
+--- llvm-3.4.orig/tools/clang/test/Driver/linux-ld.c	2013-10-29 11:27:30.000000000 +0100
++++ llvm-3.4/tools/clang/test/Driver/linux-ld.c	1970-01-01 01:00:00.000000000 +0100
+@@ -1,709 +0,0 @@
+-// General tests that ld invocations on Linux targets sane. Note that we use
+-// sysroot to make these tests independent of the host system.
+-//
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=i386-unknown-linux \
+-// RUN:     --sysroot=%S/Inputs/basic_linux_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-LD-32 %s
+-// CHECK-LD-32-NOT: warning:
+-// CHECK-LD-32: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-LD-32: "{{.*}}/usr/lib/gcc/i386-unknown-linux/4.6.0{{/|\\\\}}crtbegin.o"
+-// CHECK-LD-32: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0"
+-// CHECK-LD-32: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/../../../../i386-unknown-linux/lib"
+-// CHECK-LD-32: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/../../.."
+-// CHECK-LD-32: "-L[[SYSROOT]]/lib"
+-// CHECK-LD-32: "-L[[SYSROOT]]/usr/lib"
+-//
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=x86_64-unknown-linux \
+-// RUN:     --sysroot=%S/Inputs/basic_linux_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-LD-64 %s
+-// CHECK-LD-64-NOT: warning:
+-// CHECK-LD-64: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-LD-64: "--eh-frame-hdr"
+-// CHECK-LD-64: "-m" "elf_x86_64"
+-// CHECK-LD-64: "-dynamic-linker"
+-// CHECK-LD-64: "{{.*}}/usr/lib/gcc/x86_64-unknown-linux/4.6.0{{/|\\\\}}crtbegin.o"
+-// CHECK-LD-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0"
+-// CHECK-LD-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../x86_64-unknown-linux/lib"
+-// CHECK-LD-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../.."
+-// CHECK-LD-64: "-L[[SYSROOT]]/lib"
+-// CHECK-LD-64: "-L[[SYSROOT]]/usr/lib"
+-// CHECK-LD-64: "-lgcc" "--as-needed" "-lgcc_s" "--no-as-needed"
+-// CHECK-LD-64: "-lc"
+-// CHECK-LD-64: "-lgcc" "--as-needed" "-lgcc_s" "--no-as-needed"
+-//
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=x86_64-unknown-linux \
+-// RUN:     -static-libgcc \
+-// RUN:     --sysroot=%S/Inputs/basic_linux_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-LD-64-STATIC-LIBGCC %s
+-// CHECK-LD-64-STATIC-LIBGCC-NOT: warning:
+-// CHECK-LD-64-STATIC-LIBGCC: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-LD-64-STATIC-LIBGCC: "--eh-frame-hdr"
+-// CHECK-LD-64-STATIC-LIBGCC: "-m" "elf_x86_64"
+-// CHECK-LD-64-STATIC-LIBGCC: "-dynamic-linker"
+-// CHECK-LD-64-STATIC-LIBGCC: "{{.*}}/usr/lib/gcc/x86_64-unknown-linux/4.6.0{{/|\\\\}}crtbegin.o"
+-// CHECK-LD-64-STATIC-LIBGCC: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0"
+-// CHECK-LD-64-STATIC-LIBGCC: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../x86_64-unknown-linux/lib"
+-// CHECK-LD-64-STATIC-LIBGCC: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../.."
+-// CHECK-LD-64-STATIC-LIBGCC: "-L[[SYSROOT]]/lib"
+-// CHECK-LD-64-STATIC-LIBGCC: "-L[[SYSROOT]]/usr/lib"
+-// CHECK-LD-64-STATIC-LIBGCC: "-lgcc" "-lgcc_eh"
+-// CHECK-LD-64-STATIC-LIBGCC: "-lc"
+-// CHECK-LD-64-STATIC-LIBGCC: "-lgcc" "-lgcc_eh"
+-//
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=x86_64-unknown-linux \
+-// RUN:     -static \
+-// RUN:     --sysroot=%S/Inputs/basic_linux_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-LD-64-STATIC %s
+-// CHECK-LD-64-STATIC-NOT: warning:
+-// CHECK-LD-64-STATIC: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-LD-64-STATIC-NOT: "--eh-frame-hdr"
+-// CHECK-LD-64-STATIC: "-m" "elf_x86_64"
+-// CHECK-LD-64-STATIC-NOT: "-dynamic-linker"
+-// CHECK-LD-64-STATIC: "-static"
+-// CHECK-LD-64-STATIC: "{{.*}}/usr/lib/gcc/x86_64-unknown-linux/4.6.0{{/|\\\\}}crtbeginT.o"
+-// CHECK-LD-64-STATIC: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0"
+-// CHECK-LD-64-STATIC: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../x86_64-unknown-linux/lib"
+-// CHECK-LD-64-STATIC: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../.."
+-// CHECK-LD-64-STATIC: "-L[[SYSROOT]]/lib"
+-// CHECK-LD-64-STATIC: "-L[[SYSROOT]]/usr/lib"
+-// CHECK-LD-64-STATIC: "--start-group" "-lgcc" "-lgcc_eh" "-lc" "--end-group"
+-//
+-// Check that flags can be combined. The -static dominates.
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=x86_64-unknown-linux \
+-// RUN:     -static-libgcc -static \
+-// RUN:     --sysroot=%S/Inputs/basic_linux_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-LD-64-STATIC %s
+-//
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=i386-unknown-linux -m32 \
+-// RUN:     --sysroot=%S/Inputs/multilib_32bit_linux_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-32-TO-32 %s
+-// CHECK-32-TO-32: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-32-TO-32: "{{.*}}/usr/lib/gcc/i386-unknown-linux/4.6.0{{/|\\\\}}crtbegin.o"
+-// CHECK-32-TO-32: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0"
+-// CHECK-32-TO-32: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/../../../../i386-unknown-linux/lib/../lib32"
+-// CHECK-32-TO-32: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/../../../../lib32"
+-// CHECK-32-TO-32: "-L[[SYSROOT]]/lib/../lib32"
+-// CHECK-32-TO-32: "-L[[SYSROOT]]/usr/lib/../lib32"
+-// CHECK-32-TO-32: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/../../../../i386-unknown-linux/lib"
+-// CHECK-32-TO-32: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/../../.."
+-// CHECK-32-TO-32: "-L[[SYSROOT]]/lib"
+-// CHECK-32-TO-32: "-L[[SYSROOT]]/usr/lib"
+-//
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=i386-unknown-linux -m64 \
+-// RUN:     --sysroot=%S/Inputs/multilib_32bit_linux_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-32-TO-64 %s
+-// CHECK-32-TO-64: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-32-TO-64: "{{.*}}/usr/lib/gcc/i386-unknown-linux/4.6.0/64{{/|\\\\}}crtbegin.o"
+-// CHECK-32-TO-64: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/64"
+-// CHECK-32-TO-64: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/../../../../i386-unknown-linux/lib/../lib64"
+-// CHECK-32-TO-64: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/../../../../lib64"
+-// CHECK-32-TO-64: "-L[[SYSROOT]]/lib/../lib64"
+-// CHECK-32-TO-64: "-L[[SYSROOT]]/usr/lib/../lib64"
+-// CHECK-32-TO-64: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0"
+-// CHECK-32-TO-64: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/../../../../i386-unknown-linux/lib"
+-// CHECK-32-TO-64: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/../../.."
+-// CHECK-32-TO-64: "-L[[SYSROOT]]/lib"
+-// CHECK-32-TO-64: "-L[[SYSROOT]]/usr/lib"
+-//
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=x86_64-unknown-linux -m64 \
+-// RUN:     --sysroot=%S/Inputs/multilib_64bit_linux_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-64-TO-64 %s
+-// CHECK-64-TO-64: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-64-TO-64: "{{.*}}/usr/lib/gcc/x86_64-unknown-linux/4.6.0{{/|\\\\}}crtbegin.o"
+-// CHECK-64-TO-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0"
+-// CHECK-64-TO-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../x86_64-unknown-linux/lib/../lib64"
+-// CHECK-64-TO-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../lib64"
+-// CHECK-64-TO-64: "-L[[SYSROOT]]/lib/../lib64"
+-// CHECK-64-TO-64: "-L[[SYSROOT]]/usr/lib/../lib64"
+-// CHECK-64-TO-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../x86_64-unknown-linux/lib"
+-// CHECK-64-TO-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../.."
+-// CHECK-64-TO-64: "-L[[SYSROOT]]/lib"
+-// CHECK-64-TO-64: "-L[[SYSROOT]]/usr/lib"
+-//
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=x86_64-unknown-linux -m32 \
+-// RUN:     --sysroot=%S/Inputs/multilib_64bit_linux_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-64-TO-32 %s
+-// CHECK-64-TO-32: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-64-TO-32: "{{.*}}/usr/lib/gcc/x86_64-unknown-linux/4.6.0/32{{/|\\\\}}crtbegin.o"
+-// CHECK-64-TO-32: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/32"
+-// CHECK-64-TO-32: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../x86_64-unknown-linux/lib/../lib32"
+-// CHECK-64-TO-32: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../lib32"
+-// CHECK-64-TO-32: "-L[[SYSROOT]]/lib/../lib32"
+-// CHECK-64-TO-32: "-L[[SYSROOT]]/usr/lib/../lib32"
+-// CHECK-64-TO-32: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0"
+-// CHECK-64-TO-32: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../x86_64-unknown-linux/lib"
+-// CHECK-64-TO-32: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../.."
+-// CHECK-64-TO-32: "-L[[SYSROOT]]/lib"
+-// CHECK-64-TO-32: "-L[[SYSROOT]]/usr/lib"
+-//
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=x86_64-unknown-linux -m32 \
+-// RUN:     --gcc-toolchain=%S/Inputs/multilib_64bit_linux_tree/usr \
+-// RUN:     --sysroot=%S/Inputs/multilib_32bit_linux_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-64-TO-32-SYSROOT %s
+-// CHECK-64-TO-32-SYSROOT: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-64-TO-32-SYSROOT: "{{.*}}/usr/lib/gcc/x86_64-unknown-linux/4.6.0/32{{/|\\\\}}crtbegin.o"
+-// CHECK-64-TO-32-SYSROOT: "-L{{[^"]*}}/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.0/32"
+-// CHECK-64-TO-32-SYSROOT: "-L[[SYSROOT]]/lib/../lib32"
+-// CHECK-64-TO-32-SYSROOT: "-L[[SYSROOT]]/usr/lib/../lib32"
+-// CHECK-64-TO-32-SYSROOT: "-L{{[^"]*}}/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.0"
+-// CHECK-64-TO-32-SYSROOT: "-L[[SYSROOT]]/lib"
+-// CHECK-64-TO-32-SYSROOT: "-L[[SYSROOT]]/usr/lib"
+-//
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=i386-unknown-linux -m32 \
+-// RUN:     -ccc-install-dir %S/Inputs/fake_install_tree/bin \
+-// RUN:     --sysroot=%S/Inputs/basic_linux_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-INSTALL-DIR-32 %s
+-// CHECK-INSTALL-DIR-32: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-INSTALL-DIR-32: "{{.*}}/Inputs/fake_install_tree/bin/../lib/gcc/i386-unknown-linux/4.7.0{{/|\\\\}}crtbegin.o"
+-// CHECK-INSTALL-DIR-32: "-L{{.*}}/Inputs/fake_install_tree/bin/../lib/gcc/i386-unknown-linux/4.7.0"
+-//
+-// Check that with 64-bit builds, we don't actually use the install directory
+-// as its version of GCC is lower than our sysrooted version.
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=x86_64-unknown-linux -m64 \
+-// RUN:     -ccc-install-dir %S/Inputs/fake_install_tree/bin \
+-// RUN:     --sysroot=%S/Inputs/basic_linux_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-INSTALL-DIR-64 %s
+-// CHECK-INSTALL-DIR-64: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-INSTALL-DIR-64: "{{.*}}/usr/lib/gcc/x86_64-unknown-linux/4.6.0{{/|\\\\}}crtbegin.o"
+-// CHECK-INSTALL-DIR-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0"
+-//
+-// Check that we support unusual patch version formats, including missing that
+-// component.
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=i386-unknown-linux -m32 \
+-// RUN:     -ccc-install-dir %S/Inputs/gcc_version_parsing1/bin \
+-// RUN:     --sysroot=%S/Inputs/basic_linux_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-GCC-VERSION1 %s
+-// CHECK-GCC-VERSION1: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-GCC-VERSION1: "{{.*}}/Inputs/gcc_version_parsing1/bin/../lib/gcc/i386-unknown-linux/4.7{{/|\\\\}}crtbegin.o"
+-// CHECK-GCC-VERSION1: "-L{{.*}}/Inputs/gcc_version_parsing1/bin/../lib/gcc/i386-unknown-linux/4.7"
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=i386-unknown-linux -m32 \
+-// RUN:     -ccc-install-dir %S/Inputs/gcc_version_parsing2/bin \
+-// RUN:     --sysroot=%S/Inputs/basic_linux_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-GCC-VERSION2 %s
+-// CHECK-GCC-VERSION2: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-GCC-VERSION2: "{{.*}}/Inputs/gcc_version_parsing2/bin/../lib/gcc/i386-unknown-linux/4.7.x{{/|\\\\}}crtbegin.o"
+-// CHECK-GCC-VERSION2: "-L{{.*}}/Inputs/gcc_version_parsing2/bin/../lib/gcc/i386-unknown-linux/4.7.x"
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=i386-unknown-linux -m32 \
+-// RUN:     -ccc-install-dir %S/Inputs/gcc_version_parsing3/bin \
+-// RUN:     --sysroot=%S/Inputs/basic_linux_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-GCC-VERSION3 %s
+-// CHECK-GCC-VERSION3: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-GCC-VERSION3: "{{.*}}/Inputs/gcc_version_parsing3/bin/../lib/gcc/i386-unknown-linux/4.7.99-rc5{{/|\\\\}}crtbegin.o"
+-// CHECK-GCC-VERSION3: "-L{{.*}}/Inputs/gcc_version_parsing3/bin/../lib/gcc/i386-unknown-linux/4.7.99-rc5"
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=i386-unknown-linux -m32 \
+-// RUN:     -ccc-install-dir %S/Inputs/gcc_version_parsing4/bin \
+-// RUN:     --sysroot=%S/Inputs/basic_linux_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-GCC-VERSION4 %s
+-// CHECK-GCC-VERSION4: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-GCC-VERSION4: "{{.*}}/Inputs/gcc_version_parsing4/bin/../lib/gcc/i386-unknown-linux/4.7.99{{/|\\\\}}crtbegin.o"
+-// CHECK-GCC-VERSION4: "-L{{.*}}/Inputs/gcc_version_parsing4/bin/../lib/gcc/i386-unknown-linux/4.7.99"
+-//
+-// Test a very broken version of multiarch that shipped in Ubuntu 11.04.
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=i386-unknown-linux \
+-// RUN:     --sysroot=%S/Inputs/ubuntu_11.04_multiarch_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-UBUNTU-11-04 %s
+-// CHECK-UBUNTU-11-04: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-UBUNTU-11-04: "{{.*}}/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5{{/|\\\\}}crtbegin.o"
+-// CHECK-UBUNTU-11-04: "-L[[SYSROOT]]/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5"
+-// CHECK-UBUNTU-11-04: "-L[[SYSROOT]]/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5/../../../../i386-linux-gnu"
+-// CHECK-UBUNTU-11-04: "-L[[SYSROOT]]/usr/lib/i386-linux-gnu"
+-// CHECK-UBUNTU-11-04: "-L[[SYSROOT]]/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5/../../../.."
+-// CHECK-UBUNTU-11-04: "-L[[SYSROOT]]/lib"
+-// CHECK-UBUNTU-11-04: "-L[[SYSROOT]]/usr/lib"
+-//
+-// Check multi arch support on Ubuntu 12.04 LTS.
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=arm-unknown-linux-gnueabihf \
+-// RUN:     --sysroot=%S/Inputs/ubuntu_12.04_LTS_multiarch_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-UBUNTU-12-04-ARM-HF %s
+-// CHECK-UBUNTU-12-04-ARM-HF: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-UBUNTU-12-04-ARM-HF: "{{.*}}/usr/lib/gcc/arm-linux-gnueabihf/4.6.3/../../../arm-linux-gnueabihf{{/|\\\\}}crt1.o"
+-// CHECK-UBUNTU-12-04-ARM-HF: "{{.*}}/usr/lib/gcc/arm-linux-gnueabihf/4.6.3/../../../arm-linux-gnueabihf{{/|\\\\}}crti.o"
+-// CHECK-UBUNTU-12-04-ARM-HF: "{{.*}}/usr/lib/gcc/arm-linux-gnueabihf/4.6.3{{/|\\\\}}crtbegin.o"
+-// CHECK-UBUNTU-12-04-ARM-HF: "-L[[SYSROOT]]/usr/lib/gcc/arm-linux-gnueabihf/4.6.3"
+-// CHECK-UBUNTU-12-04-ARM-HF: "-L[[SYSROOT]]/usr/lib/gcc/arm-linux-gnueabihf/4.6.3/../../../arm-linux-gnueabihf"
+-// CHECK-UBUNTU-12-04-ARM-HF: "-L[[SYSROOT]]/lib/arm-linux-gnueabihf"
+-// CHECK-UBUNTU-12-04-ARM-HF: "-L[[SYSROOT]]/usr/lib/arm-linux-gnueabihf"
+-// CHECK-UBUNTU-12-04-ARM-HF: "-L[[SYSROOT]]/usr/lib/gcc/arm-linux-gnueabihf/4.6.3/../../.."
+-// CHECK-UBUNTU-12-04-ARM-HF: "{{.*}}/usr/lib/gcc/arm-linux-gnueabihf/4.6.3{{/|\\\\}}crtend.o"
+-// CHECK-UBUNTU-12-04-ARM-HF: "{{.*}}/usr/lib/gcc/arm-linux-gnueabihf/4.6.3/../../../arm-linux-gnueabihf{{/|\\\\}}crtn.o"
+-//
+-// Check Ubuntu 13.10 on x86-64 targeting arm-linux-gnueabihf.
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=arm-linux-gnueabihf \
+-// RUN:     --sysroot=%S/Inputs/x86-64_ubuntu_13.10 \
+-// RUN:   | FileCheck --check-prefix=CHECK-X86-64-UBUNTU-13-10-ARM-HF %s
+-// CHECK-X86-64-UBUNTU-13-10-ARM-HF: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-X86-64-UBUNTU-13-10-ARM-HF: "-dynamic-linker" "/lib/ld-linux-armhf.so.3"
+-// CHECK-X86-64-UBUNTU-13-10-ARM-HF: "{{.*}}/usr/lib/gcc-cross/arm-linux-gnueabihf/4.8/../../../../arm-linux-gnueabihf/lib/../lib{{/|\\\\}}crt1.o"
+-// CHECK-X86-64-UBUNTU-13-10-ARM-HF: "{{.*}}/usr/lib/gcc-cross/arm-linux-gnueabihf/4.8/../../../../arm-linux-gnueabihf/lib/../lib{{/|\\\\}}crti.o"
+-// CHECK-X86-64-UBUNTU-13-10-ARM-HF: "{{.*}}/usr/lib/gcc-cross/arm-linux-gnueabihf/4.8{{/|\\\\}}crtbegin.o"
+-// CHECK-X86-64-UBUNTU-13-10-ARM-HF: "-L[[SYSROOT]]/usr/lib/gcc-cross/arm-linux-gnueabihf/4.8"
+-// CHECK-X86-64-UBUNTU-13-10-ARM-HF: "-L[[SYSROOT]]/usr/lib/gcc-cross/arm-linux-gnueabihf/4.8/../../../../arm-linux-gnueabihf/lib/../lib"
+-// CHECK-X86-64-UBUNTU-13-10-ARM-HF: "-L[[SYSROOT]]/lib/../lib"
+-// CHECK-X86-64-UBUNTU-13-10-ARM-HF: "-L[[SYSROOT]]/usr/lib/../lib"
+-// CHECK-X86-64-UBUNTU-13-10-ARM-HF: "-L[[SYSROOT]]/usr/lib/gcc-cross/arm-linux-gnueabihf/4.8/../../../../arm-linux-gnueabihf/lib"
+-// CHECK-X86-64-UBUNTU-13-10-ARM-HF: "{{.*}}/usr/lib/gcc-cross/arm-linux-gnueabihf/4.8{{/|\\\\}}crtend.o"
+-// CHECK-X86-64-UBUNTU-13-10-ARM-HF: "{{.*}}/usr/lib/gcc-cross/arm-linux-gnueabihf/4.8/../../../../arm-linux-gnueabihf/lib/../lib{{/|\\\\}}crtn.o"
+-//
+-// Check Ubuntu 13.10 on x86-64 targeting arm-linux-gnueabi.
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=arm-linux-gnueabi \
+-// RUN:     --sysroot=%S/Inputs/x86-64_ubuntu_13.10 \
+-// RUN:   | FileCheck --check-prefix=CHECK-X86-64-UBUNTU-13-10-ARM %s
+-// CHECK-X86-64-UBUNTU-13-10-ARM: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-X86-64-UBUNTU-13-10-ARM: "-dynamic-linker" "/lib/ld-linux.so.3"
+-// CHECK-X86-64-UBUNTU-13-10-ARM: "{{.*}}/usr/lib/gcc-cross/arm-linux-gnueabi/4.7/../../../../arm-linux-gnueabi/lib/../lib{{/|\\\\}}crt1.o"
+-// CHECK-X86-64-UBUNTU-13-10-ARM: "{{.*}}/usr/lib/gcc-cross/arm-linux-gnueabi/4.7/../../../../arm-linux-gnueabi/lib/../lib{{/|\\\\}}crti.o"
+-// CHECK-X86-64-UBUNTU-13-10-ARM: "{{.*}}/usr/lib/gcc-cross/arm-linux-gnueabi/4.7{{/|\\\\}}crtbegin.o"
+-// CHECK-X86-64-UBUNTU-13-10-ARM: "-L[[SYSROOT]]/usr/lib/gcc-cross/arm-linux-gnueabi/4.7"
+-// CHECK-X86-64-UBUNTU-13-10-ARM: "-L[[SYSROOT]]/usr/lib/gcc-cross/arm-linux-gnueabi/4.7/../../../../arm-linux-gnueabi/lib/../lib"
+-// CHECK-X86-64-UBUNTU-13-10-ARM: "-L[[SYSROOT]]/lib/../lib"
+-// CHECK-X86-64-UBUNTU-13-10-ARM: "-L[[SYSROOT]]/usr/lib/../lib"
+-// CHECK-X86-64-UBUNTU-13-10-ARM: "-L[[SYSROOT]]/usr/lib/gcc-cross/arm-linux-gnueabi/4.7/../../../../arm-linux-gnueabi/lib"
+-// CHECK-X86-64-UBUNTU-13-10-ARM: "{{.*}}/usr/lib/gcc-cross/arm-linux-gnueabi/4.7{{/|\\\\}}crtend.o"
+-// CHECK-X86-64-UBUNTU-13-10-ARM: "{{.*}}/usr/lib/gcc-cross/arm-linux-gnueabi/4.7/../../../../arm-linux-gnueabi/lib/../lib{{/|\\\\}}crtn.o"
+-//
+-// Check fedora 18 on arm.
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=armv7-unknown-linux-gnueabihf \
+-// RUN:     --sysroot=%S/Inputs/fedora_18_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-FEDORA-18-ARM-HF %s
+-// CHECK-FEDORA-18-ARM-HF: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-FEDORA-18-ARM-HF: "{{.*}}/usr/lib/gcc/armv7hl-redhat-linux-gnueabi/4.7.2/../../../../lib{{/|\\\\}}crt1.o"
+-// CHECK-FEDORA-18-ARM-HF: "{{.*}}/usr/lib/gcc/armv7hl-redhat-linux-gnueabi/4.7.2/../../../../lib{{/|\\\\}}crti.o"
+-// CHECK-FEDORA-18-ARM-HF: "{{.*}}/usr/lib/gcc/armv7hl-redhat-linux-gnueabi/4.7.2{{/|\\\\}}crtbegin.o"
+-// CHECK-FEDORA-18-ARM-HF: "-L[[SYSROOT]]/usr/lib/gcc/armv7hl-redhat-linux-gnueabi/4.7.2"
+-// CHECK-FEDORA-18-ARM-HF: "-L[[SYSROOT]]/usr/lib/gcc/armv7hl-redhat-linux-gnueabi/4.7.2/../../../../lib"
+-// CHECK-FEDORA-18-ARM-HF: "{{.*}}/usr/lib/gcc/armv7hl-redhat-linux-gnueabi/4.7.2{{/|\\\\}}crtend.o"
+-// CHECK-FEDORA-18-ARM-HF: "{{.*}}/usr/lib/gcc/armv7hl-redhat-linux-gnueabi/4.7.2/../../../../lib{{/|\\\\}}crtn.o"
+-//
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=arm-unknown-linux-gnueabi \
+-// RUN:     --sysroot=%S/Inputs/ubuntu_12.04_LTS_multiarch_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-UBUNTU-12-04-ARM %s
+-// CHECK-UBUNTU-12-04-ARM: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-UBUNTU-12-04-ARM: "{{.*}}/usr/lib/gcc/arm-linux-gnueabi/4.6.1/../../../arm-linux-gnueabi{{/|\\\\}}crt1.o"
+-// CHECK-UBUNTU-12-04-ARM: "{{.*}}/usr/lib/gcc/arm-linux-gnueabi/4.6.1/../../../arm-linux-gnueabi{{/|\\\\}}crti.o"
+-// CHECK-UBUNTU-12-04-ARM: "{{.*}}/usr/lib/gcc/arm-linux-gnueabi/4.6.1{{/|\\\\}}crtbegin.o"
+-// CHECK-UBUNTU-12-04-ARM: "-L[[SYSROOT]]/usr/lib/gcc/arm-linux-gnueabi/4.6.1"
+-// CHECK-UBUNTU-12-04-ARM: "-L[[SYSROOT]]/usr/lib/gcc/arm-linux-gnueabi/4.6.1/../../../arm-linux-gnueabi"
+-// CHECK-UBUNTU-12-04-ARM: "-L[[SYSROOT]]/lib/arm-linux-gnueabi"
+-// CHECK-UBUNTU-12-04-ARM: "-L[[SYSROOT]]/usr/lib/arm-linux-gnueabi"
+-// CHECK-UBUNTU-12-04-ARM: "-L[[SYSROOT]]/usr/lib/gcc/arm-linux-gnueabi/4.6.1/../../.."
+-// CHECK-UBUNTU-12-04-ARM: "{{.*}}/usr/lib/gcc/arm-linux-gnueabi/4.6.1{{/|\\\\}}crtend.o"
+-// CHECK-UBUNTU-12-04-ARM: "{{.*}}/usr/lib/gcc/arm-linux-gnueabi/4.6.1/../../../arm-linux-gnueabi{{/|\\\\}}crtn.o"
+-//
+-// Test the setup that shipped in SUSE 10.3 on ppc64.
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=powerpc64-suse-linux \
+-// RUN:     --sysroot=%S/Inputs/suse_10.3_ppc64_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-SUSE-10-3-PPC64 %s
+-// CHECK-SUSE-10-3-PPC64: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-SUSE-10-3-PPC64: "{{.*}}/usr/lib/gcc/powerpc64-suse-linux/4.1.2/64{{/|\\\\}}crtbegin.o"
+-// CHECK-SUSE-10-3-PPC64: "-L[[SYSROOT]]/usr/lib/gcc/powerpc64-suse-linux/4.1.2/64"
+-// CHECK-SUSE-10-3-PPC64: "-L[[SYSROOT]]/usr/lib/gcc/powerpc64-suse-linux/4.1.2/../../../../lib64"
+-// CHECK-SUSE-10-3-PPC64: "-L[[SYSROOT]]/lib/../lib64"
+-// CHECK-SUSE-10-3-PPC64: "-L[[SYSROOT]]/usr/lib/../lib64"
+-//
+-// Check dynamic-linker for different archs
+-// RUN: %clang %s -### -o %t.o 2>&1 \
+-// RUN:     --target=arm-linux-gnueabi \
+-// RUN:   | FileCheck --check-prefix=CHECK-ARM %s
+-// CHECK-ARM: "{{.*}}ld{{(.exe)?}}"
+-// CHECK-ARM: "-m" "armelf_linux_eabi"
+-// CHECK-ARM: "-dynamic-linker" "{{.*}}/lib/ld-linux.so.3"
+-//
+-// RUN: %clang %s -### -o %t.o 2>&1 \
+-// RUN:     --target=arm-linux-gnueabihf \
+-// RUN:   | FileCheck --check-prefix=CHECK-ARM-HF %s
+-// CHECK-ARM-HF: "{{.*}}ld{{(.exe)?}}"
+-// CHECK-ARM-HF: "-m" "armelf_linux_eabi"
+-// CHECK-ARM-HF: "-dynamic-linker" "{{.*}}/lib/ld-linux-armhf.so.3"
+-//
+-// Check that we do not pass --hash-style=gnu and --hash-style=both to linker
+-// and provide correct path to the dynamic linker and emulation mode when build
+-// for MIPS platforms.
+-// RUN: %clang %s -### -o %t.o 2>&1 \
+-// RUN:     --target=mips-linux-gnu \
+-// RUN:   | FileCheck --check-prefix=CHECK-MIPS %s
+-// CHECK-MIPS: "{{.*}}ld{{(.exe)?}}"
+-// CHECK-MIPS: "-m" "elf32btsmip"
+-// CHECK-MIPS: "-dynamic-linker" "{{.*}}/lib/ld.so.1"
+-// CHECK-MIPS-NOT: "--hash-style={{gnu|both}}"
+-// RUN: %clang %s -### -o %t.o 2>&1 \
+-// RUN:     --target=mipsel-linux-gnu \
+-// RUN:   | FileCheck --check-prefix=CHECK-MIPSEL %s
+-// CHECK-MIPSEL: "{{.*}}ld{{(.exe)?}}"
+-// CHECK-MIPSEL: "-m" "elf32ltsmip"
+-// CHECK-MIPSEL: "-dynamic-linker" "{{.*}}/lib/ld.so.1"
+-// CHECK-MIPSEL-NOT: "--hash-style={{gnu|both}}"
+-// RUN: %clang %s -### -o %t.o 2>&1 \
+-// RUN:     --target=mips64-linux-gnu \
+-// RUN:   | FileCheck --check-prefix=CHECK-MIPS64 %s
+-// CHECK-MIPS64: "{{.*}}ld{{(.exe)?}}"
+-// CHECK-MIPS64: "-m" "elf64btsmip"
+-// CHECK-MIPS64: "-dynamic-linker" "{{.*}}/lib64/ld.so.1"
+-// CHECK-MIPS64-NOT: "--hash-style={{gnu|both}}"
+-// RUN: %clang %s -### -o %t.o 2>&1 \
+-// RUN:     --target=mips64el-linux-gnu \
+-// RUN:   | FileCheck --check-prefix=CHECK-MIPS64EL %s
+-// CHECK-MIPS64EL: "{{.*}}ld{{(.exe)?}}"
+-// CHECK-MIPS64EL: "-m" "elf64ltsmip"
+-// CHECK-MIPS64EL: "-dynamic-linker" "{{.*}}/lib64/ld.so.1"
+-// CHECK-MIPS64EL-NOT: "--hash-style={{gnu|both}}"
+-// RUN: %clang %s -### -o %t.o 2>&1 \
+-// RUN:     --target=mips64-linux-gnu -mabi=n32 \
+-// RUN:   | FileCheck --check-prefix=CHECK-MIPS64-N32 %s
+-// CHECK-MIPS64-N32: "{{.*}}ld{{(.exe)?}}"
+-// CHECK-MIPS64-N32: "-m" "elf32btsmipn32"
+-// CHECK-MIPS64-N32: "-dynamic-linker" "{{.*}}/lib32/ld.so.1"
+-// CHECK-MIPS64-N32-NOT: "--hash-style={{gnu|both}}"
+-// RUN: %clang %s -### -o %t.o 2>&1 \
+-// RUN:     --target=mips64el-linux-gnu -mabi=n32 \
+-// RUN:   | FileCheck --check-prefix=CHECK-MIPS64EL-N32 %s
+-// CHECK-MIPS64EL-N32: "{{.*}}ld{{(.exe)?}}"
+-// CHECK-MIPS64EL-N32: "-m" "elf32ltsmipn32"
+-// CHECK-MIPS64EL-N32: "-dynamic-linker" "{{.*}}/lib32/ld.so.1"
+-// CHECK-MIPS64EL-N32-NOT: "--hash-style={{gnu|both}}"
+-//
+-// Thoroughly exercise the Debian multiarch environment.
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=i686-linux-gnu \
+-// RUN:     --sysroot=%S/Inputs/debian_multiarch_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-DEBIAN-X86 %s
+-// CHECK-DEBIAN-X86: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-DEBIAN-X86: "{{.*}}/usr/lib/gcc/i686-linux-gnu/4.5{{/|\\\\}}crtbegin.o"
+-// CHECK-DEBIAN-X86: "-L[[SYSROOT]]/usr/lib/gcc/i686-linux-gnu/4.5"
+-// CHECK-DEBIAN-X86: "-L[[SYSROOT]]/usr/lib/gcc/i686-linux-gnu/4.5/../../../i386-linux-gnu"
+-// CHECK-DEBIAN-X86: "-L[[SYSROOT]]/usr/lib/i386-linux-gnu"
+-// CHECK-DEBIAN-X86: "-L[[SYSROOT]]/usr/lib/gcc/i686-linux-gnu/4.5/../../.."
+-// CHECK-DEBIAN-X86: "-L[[SYSROOT]]/lib"
+-// CHECK-DEBIAN-X86: "-L[[SYSROOT]]/usr/lib"
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=x86_64-linux-gnu \
+-// RUN:     --sysroot=%S/Inputs/debian_multiarch_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-DEBIAN-X86-64 %s
+-// CHECK-DEBIAN-X86-64: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-DEBIAN-X86-64: "{{.*}}/usr/lib/gcc/x86_64-linux-gnu/4.5{{/|\\\\}}crtbegin.o"
+-// CHECK-DEBIAN-X86-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-linux-gnu/4.5"
+-// CHECK-DEBIAN-X86-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-linux-gnu/4.5/../../../x86_64-linux-gnu"
+-// CHECK-DEBIAN-X86-64: "-L[[SYSROOT]]/usr/lib/x86_64-linux-gnu"
+-// CHECK-DEBIAN-X86-64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-linux-gnu/4.5/../../.."
+-// CHECK-DEBIAN-X86-64: "-L[[SYSROOT]]/lib"
+-// CHECK-DEBIAN-X86-64: "-L[[SYSROOT]]/usr/lib"
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=powerpc-linux-gnu \
+-// RUN:     --sysroot=%S/Inputs/debian_multiarch_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-DEBIAN-PPC %s
+-// CHECK-DEBIAN-PPC: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-DEBIAN-PPC: "{{.*}}/usr/lib/gcc/powerpc-linux-gnu/4.5{{/|\\\\}}crtbegin.o"
+-// CHECK-DEBIAN-PPC: "-L[[SYSROOT]]/usr/lib/gcc/powerpc-linux-gnu/4.5"
+-// CHECK-DEBIAN-PPC: "-L[[SYSROOT]]/usr/lib/gcc/powerpc-linux-gnu/4.5/../../../powerpc-linux-gnu"
+-// CHECK-DEBIAN-PPC: "-L[[SYSROOT]]/usr/lib/powerpc-linux-gnu"
+-// CHECK-DEBIAN-PPC: "-L[[SYSROOT]]/usr/lib/gcc/powerpc-linux-gnu/4.5/../../.."
+-// CHECK-DEBIAN-PPC: "-L[[SYSROOT]]/lib"
+-// CHECK-DEBIAN-PPC: "-L[[SYSROOT]]/usr/lib"
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=powerpc64-linux-gnu \
+-// RUN:     --sysroot=%S/Inputs/debian_multiarch_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-DEBIAN-PPC64 %s
+-// CHECK-DEBIAN-PPC64: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-DEBIAN-PPC64: "{{.*}}/usr/lib/gcc/powerpc64-linux-gnu/4.5{{/|\\\\}}crtbegin.o"
+-// CHECK-DEBIAN-PPC64: "-L[[SYSROOT]]/usr/lib/gcc/powerpc64-linux-gnu/4.5"
+-// CHECK-DEBIAN-PPC64: "-L[[SYSROOT]]/usr/lib/gcc/powerpc64-linux-gnu/4.5/../../../powerpc64-linux-gnu"
+-// CHECK-DEBIAN-PPC64: "-L[[SYSROOT]]/usr/lib/powerpc64-linux-gnu"
+-// CHECK-DEBIAN-PPC64: "-L[[SYSROOT]]/usr/lib/gcc/powerpc64-linux-gnu/4.5/../../.."
+-// CHECK-DEBIAN-PPC64: "-L[[SYSROOT]]/lib"
+-// CHECK-DEBIAN-PPC64: "-L[[SYSROOT]]/usr/lib"
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=mips-linux-gnu \
+-// RUN:     --sysroot=%S/Inputs/debian_multiarch_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-DEBIAN-MIPS %s
+-// CHECK-DEBIAN-MIPS: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-DEBIAN-MIPS: "{{.*}}/usr/lib/gcc/mips-linux-gnu/4.5{{/|\\\\}}crtbegin.o"
+-// CHECK-DEBIAN-MIPS: "-L[[SYSROOT]]/usr/lib/gcc/mips-linux-gnu/4.5"
+-// CHECK-DEBIAN-MIPS: "-L[[SYSROOT]]/usr/lib/gcc/mips-linux-gnu/4.5/../../../mips-linux-gnu"
+-// CHECK-DEBIAN-MIPS: "-L[[SYSROOT]]/usr/lib/mips-linux-gnu"
+-// CHECK-DEBIAN-MIPS: "-L[[SYSROOT]]/usr/lib/gcc/mips-linux-gnu/4.5/../../.."
+-// CHECK-DEBIAN-MIPS: "-L[[SYSROOT]]/lib"
+-// CHECK-DEBIAN-MIPS: "-L[[SYSROOT]]/usr/lib"
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=mipsel-linux-gnu \
+-// RUN:     --sysroot=%S/Inputs/debian_multiarch_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-DEBIAN-MIPSEL %s
+-// CHECK-DEBIAN-MIPSEL: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-DEBIAN-MIPSEL: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.5{{/|\\\\}}crtbegin.o"
+-// CHECK-DEBIAN-MIPSEL: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.5"
+-// CHECK-DEBIAN-MIPSEL: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.5/../../../mipsel-linux-gnu"
+-// CHECK-DEBIAN-MIPSEL: "-L[[SYSROOT]]/usr/lib/mipsel-linux-gnu"
+-// CHECK-DEBIAN-MIPSEL: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.5/../../.."
+-// CHECK-DEBIAN-MIPSEL: "-L[[SYSROOT]]/lib"
+-// CHECK-DEBIAN-MIPSEL: "-L[[SYSROOT]]/usr/lib"
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=mips64-linux-gnu \
+-// RUN:     --sysroot=%S/Inputs/debian_multiarch_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-DEBIAN-MIPS64 %s
+-// CHECK-DEBIAN-MIPS64: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-DEBIAN-MIPS64: "{{.*}}/usr/lib/gcc/mips-linux-gnu/4.5/64{{/|\\\\}}crtbegin.o"
+-// CHECK-DEBIAN-MIPS64: "-L[[SYSROOT]]/usr/lib/gcc/mips-linux-gnu/4.5/64"
+-// CHECK-DEBIAN-MIPS64: "-L[[SYSROOT]]/usr/lib/gcc/mips-linux-gnu/4.5"
+-// CHECK-DEBIAN-MIPS64: "-L[[SYSROOT]]/usr/lib/gcc/mips-linux-gnu/4.5/../../.."
+-// CHECK-DEBIAN-MIPS64: "-L[[SYSROOT]]/lib"
+-// CHECK-DEBIAN-MIPS64: "-L[[SYSROOT]]/usr/lib"
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=mips64el-linux-gnu \
+-// RUN:     --sysroot=%S/Inputs/debian_multiarch_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-DEBIAN-MIPS64EL %s
+-// CHECK-DEBIAN-MIPS64EL: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-DEBIAN-MIPS64EL: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.5/64{{/|\\\\}}crtbegin.o"
+-// CHECK-DEBIAN-MIPS64EL: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.5/64"
+-// CHECK-DEBIAN-MIPS64EL: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.5"
+-// CHECK-DEBIAN-MIPS64EL: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.5/../../.."
+-// CHECK-DEBIAN-MIPS64EL: "-L[[SYSROOT]]/lib"
+-// CHECK-DEBIAN-MIPS64EL: "-L[[SYSROOT]]/usr/lib"
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=mips64-linux-gnu -mabi=n32 \
+-// RUN:     --sysroot=%S/Inputs/debian_multiarch_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-DEBIAN-MIPS64-N32 %s
+-// CHECK-DEBIAN-MIPS64-N32: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-DEBIAN-MIPS64-N32: "{{.*}}/usr/lib/gcc/mips-linux-gnu/4.5/n32{{/|\\\\}}crtbegin.o"
+-// CHECK-DEBIAN-MIPS64-N32: "-L[[SYSROOT]]/usr/lib/gcc/mips-linux-gnu/4.5/n32"
+-// CHECK-DEBIAN-MIPS64-N32: "-L[[SYSROOT]]/usr/lib/gcc/mips-linux-gnu/4.5"
+-// CHECK-DEBIAN-MIPS64-N32: "-L[[SYSROOT]]/usr/lib/gcc/mips-linux-gnu/4.5/../../.."
+-// CHECK-DEBIAN-MIPS64-N32: "-L[[SYSROOT]]/lib"
+-// CHECK-DEBIAN-MIPS64-N32: "-L[[SYSROOT]]/usr/lib"
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=mips64el-linux-gnu -mabi=n32 \
+-// RUN:     --sysroot=%S/Inputs/debian_multiarch_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-DEBIAN-MIPS64EL-N32 %s
+-// CHECK-DEBIAN-MIPS64EL-N32: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-DEBIAN-MIPS64EL-N32: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.5/n32{{/|\\\\}}crtbegin.o"
+-// CHECK-DEBIAN-MIPS64EL-N32: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.5/n32"
+-// CHECK-DEBIAN-MIPS64EL-N32: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.5"
+-// CHECK-DEBIAN-MIPS64EL-N32: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.5/../../.."
+-// CHECK-DEBIAN-MIPS64EL-N32: "-L[[SYSROOT]]/lib"
+-// CHECK-DEBIAN-MIPS64EL-N32: "-L[[SYSROOT]]/usr/lib"
+-//
+-// Test linker invocation on Android.
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=arm-linux-androideabi \
+-// RUN:     --sysroot=%S/Inputs/basic_android_tree/sysroot \
+-// RUN:   | FileCheck --check-prefix=CHECK-ANDROID %s
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=arm-linux-android \
+-// RUN:     --sysroot=%S/Inputs/basic_android_tree/sysroot \
+-// RUN:   | FileCheck --check-prefix=CHECK-ANDROID %s
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=mipsel-linux-android \
+-// RUN:     --sysroot=%S/Inputs/basic_android_tree/sysroot \
+-// RUN:   | FileCheck --check-prefix=CHECK-ANDROID %s
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=i386-linux-android \
+-// RUN:     --sysroot=%S/Inputs/basic_android_tree/sysroot \
+-// RUN:   | FileCheck --check-prefix=CHECK-ANDROID %s
+-// CHECK-ANDROID: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-ANDROID: "{{.*}}{{/|\\\\}}crtbegin_dynamic.o"
+-// CHECK-ANDROID: "-L[[SYSROOT]]/usr/lib"
+-// CHECK-ANDROID-NOT: "gcc_s"
+-// CHECK-ANDROID: "-lgcc"
+-// CHECK-ANDROID: "-ldl"
+-// CHECK-ANDROID-NOT: "gcc_s"
+-// CHECK-ANDROID: "{{.*}}{{/|\\\\}}crtend_android.o"
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=arm-linux-androideabi \
+-// RUN:     --sysroot=%S/Inputs/basic_android_tree/sysroot \
+-// RUN:     -shared \
+-// RUN:   | FileCheck --check-prefix=CHECK-ANDROID-SO %s
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=arm-linux-android \
+-// RUN:     --sysroot=%S/Inputs/basic_android_tree/sysroot \
+-// RUN:     -shared \
+-// RUN:   | FileCheck --check-prefix=CHECK-ANDROID-SO %s
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=mipsel-linux-android \
+-// RUN:     --sysroot=%S/Inputs/basic_android_tree/sysroot \
+-// RUN:     -shared \
+-// RUN:   | FileCheck --check-prefix=CHECK-ANDROID-SO %s
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=i386-linux-android \
+-// RUN:     --sysroot=%S/Inputs/basic_android_tree/sysroot \
+-// RUN:     -shared \
+-// RUN:   | FileCheck --check-prefix=CHECK-ANDROID-SO %s
+-// CHECK-ANDROID-SO: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-ANDROID-SO: "-Bsymbolic"
+-// CHECK-ANDROID-SO: "{{.*}}{{/|\\\\}}crtbegin_so.o"
+-// CHECK-ANDROID-SO: "-L[[SYSROOT]]/usr/lib"
+-// CHECK-ANDROID-SO-NOT: "gcc_s"
+-// CHECK-ANDROID-SO: "-lgcc"
+-// CHECK-ANDROID-SO: "-ldl"
+-// CHECK-ANDROID-SO-NOT: "gcc_s"
+-// CHECK-ANDROID-SO: "{{.*}}{{/|\\\\}}crtend_so.o"
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=arm-linux-androideabi \
+-// RUN:     --sysroot=%S/Inputs/basic_android_tree/sysroot \
+-// RUN:     -static \
+-// RUN:   | FileCheck --check-prefix=CHECK-ANDROID-STATIC %s
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=arm-linux-android \
+-// RUN:     --sysroot=%S/Inputs/basic_android_tree/sysroot \
+-// RUN:     -static \
+-// RUN:   | FileCheck --check-prefix=CHECK-ANDROID-STATIC %s
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=mipsel-linux-android \
+-// RUN:     --sysroot=%S/Inputs/basic_android_tree/sysroot \
+-// RUN:     -static \
+-// RUN:   | FileCheck --check-prefix=CHECK-ANDROID-STATIC %s
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=i386-linux-android \
+-// RUN:     --sysroot=%S/Inputs/basic_android_tree/sysroot \
+-// RUN:     -static \
+-// RUN:   | FileCheck --check-prefix=CHECK-ANDROID-STATIC %s
+-// CHECK-ANDROID-STATIC: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-ANDROID-STATIC: "{{.*}}{{/|\\\\}}crtbegin_static.o"
+-// CHECK-ANDROID-STATIC: "-L[[SYSROOT]]/usr/lib"
+-// CHECK-ANDROID-STATIC-NOT: "gcc_s"
+-// CHECK-ANDROID-STATIC: "-lgcc"
+-// CHECK-ANDROID-STATIC-NOT: "-ldl"
+-// CHECK-ANDROID-STATIC-NOT: "gcc_s"
+-// CHECK-ANDROID-STATIC: "{{.*}}{{/|\\\\}}crtend_android.o"
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=arm-linux-androideabi \
+-// RUN:     --sysroot=%S/Inputs/basic_android_tree/sysroot  \
+-// RUN:     -pie \
+-// RUN:   | FileCheck --check-prefix=CHECK-ANDROID-PIE %s
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=arm-linux-android \
+-// RUN:     --sysroot=%S/Inputs/basic_android_tree/sysroot \
+-// RUN:     -pie \
+-// RUN:   | FileCheck --check-prefix=CHECK-ANDROID-PIE %s
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=mipsel-linux-android \
+-// RUN:     --sysroot=%S/Inputs/basic_android_tree/sysroot \
+-// RUN:     -pie \
+-// RUN:   | FileCheck --check-prefix=CHECK-ANDROID-PIE %s
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=i386-linux-android \
+-// RUN:     --sysroot=%S/Inputs/basic_android_tree/sysroot \
+-// RUN:     -pie \
+-// RUN:   | FileCheck --check-prefix=CHECK-ANDROID-PIE %s
+-// CHECK-ANDROID-PIE: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-ANDROID-PIE: "{{.*}}{{/|\\\\}}crtbegin_dynamic.o"
+-// CHECK-ANDROID-PIE: "-L[[SYSROOT]]/usr/lib"
+-// CHECK-ANDROID-PIE-NOT: "gcc_s"
+-// CHECK-ANDROID-PIE: "-lgcc"
+-// CHECK-ANDROID-PIE-NOT: "gcc_s"
+-// CHECK-ANDROID-PIE: "{{.*}}{{/|\\\\}}crtend_android.o"
+-//
+-// Check linker invocation on Debian 6 MIPS 32/64-bit.
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=mipsel-linux-gnu \
+-// RUN:     --sysroot=%S/Inputs/debian_6_mips_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-DEBIAN-ML-MIPSEL %s
+-// CHECK-DEBIAN-ML-MIPSEL: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-DEBIAN-ML-MIPSEL: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.4/../../../../lib{{/|\\\\}}crt1.o"
+-// CHECK-DEBIAN-ML-MIPSEL: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.4/../../../../lib{{/|\\\\}}crti.o"
+-// CHECK-DEBIAN-ML-MIPSEL: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.4{{/|\\\\}}crtbegin.o"
+-// CHECK-DEBIAN-ML-MIPSEL: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.4"
+-// CHECK-DEBIAN-ML-MIPSEL: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.4/../../../../lib"
+-// CHECK-DEBIAN-ML-MIPSEL: "-L[[SYSROOT]]/lib/../lib"
+-// CHECK-DEBIAN-ML-MIPSEL: "-L[[SYSROOT]]/usr/lib/../lib"
+-// CHECK-DEBIAN-ML-MIPSEL: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.4/../../.."
+-// CHECK-DEBIAN-ML-MIPSEL: "-L[[SYSROOT]]/lib"
+-// CHECK-DEBIAN-ML-MIPSEL: "-L[[SYSROOT]]/usr/lib"
+-//
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=mips64el-linux-gnu \
+-// RUN:     --sysroot=%S/Inputs/debian_6_mips_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-DEBIAN-ML-MIPS64EL %s
+-// CHECK-DEBIAN-ML-MIPS64EL: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-DEBIAN-ML-MIPS64EL: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.4/../../../../lib64{{/|\\\\}}crt1.o"
+-// CHECK-DEBIAN-ML-MIPS64EL: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.4/../../../../lib64{{/|\\\\}}crti.o"
+-// CHECK-DEBIAN-ML-MIPS64EL: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.4/64{{/|\\\\}}crtbegin.o"
+-// CHECK-DEBIAN-ML-MIPS64EL: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.4/64"
+-// CHECK-DEBIAN-ML-MIPS64EL: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.4/../../../../lib64"
+-// CHECK-DEBIAN-ML-MIPS64EL: "-L[[SYSROOT]]/lib/../lib64"
+-// CHECK-DEBIAN-ML-MIPS64EL: "-L[[SYSROOT]]/usr/lib/../lib64"
+-// CHECK-DEBIAN-ML-MIPS64EL: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.4/../../.."
+-// CHECK-DEBIAN-ML-MIPS64EL: "-L[[SYSROOT]]/lib"
+-// CHECK-DEBIAN-ML-MIPS64EL: "-L[[SYSROOT]]/usr/lib"
+-//
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=mips64el-linux-gnu -mabi=n32 \
+-// RUN:     --sysroot=%S/Inputs/debian_6_mips_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-DEBIAN-ML-MIPS64EL-N32 %s
+-// CHECK-DEBIAN-ML-MIPS64EL-N32: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-DEBIAN-ML-MIPS64EL-N32: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.4/../../../../lib32{{/|\\\\}}crt1.o"
+-// CHECK-DEBIAN-ML-MIPS64EL-N32: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.4/../../../../lib32{{/|\\\\}}crti.o"
+-// CHECK-DEBIAN-ML-MIPS64EL-N32: "{{.*}}/usr/lib/gcc/mipsel-linux-gnu/4.4/n32{{/|\\\\}}crtbegin.o"
+-// CHECK-DEBIAN-ML-MIPS64EL-N32: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.4/n32"
+-// CHECK-DEBIAN-ML-MIPS64EL-N32: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.4/../../../../lib32"
+-// CHECK-DEBIAN-ML-MIPS64EL-N32: "-L[[SYSROOT]]/lib/../lib32"
+-// CHECK-DEBIAN-ML-MIPS64EL-N32: "-L[[SYSROOT]]/usr/lib/../lib32"
+-// CHECK-DEBIAN-ML-MIPS64EL-N32: "-L[[SYSROOT]]/usr/lib/gcc/mipsel-linux-gnu/4.4/../../.."
+-// CHECK-DEBIAN-ML-MIPS64EL-N32: "-L[[SYSROOT]]/lib"
+-// CHECK-DEBIAN-ML-MIPS64EL-N32: "-L[[SYSROOT]]/usr/lib"
+-//
+-// Test linker invocation for Freescale SDK (OpenEmbedded).
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=powerpc-fsl-linux \
+-// RUN:     --sysroot=%S/Inputs/freescale_ppc_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-FSL-PPC %s
+-// CHECK-FSL-PPC: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-FSL-PPC: "-m" "elf32ppclinux"
+-// CHECK-FSL-PPC: "{{.*}}{{/|\\\\}}crt1.o"
+-// CHECK-FSL-PPC: "{{.*}}{{/|\\\\}}crtbegin.o"
+-// CHECK-FSL-PPC: "-L[[SYSROOT]]/usr/lib"
+-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+-// RUN:     --target=powerpc64-fsl-linux \
+-// RUN:     --sysroot=%S/Inputs/freescale_ppc64_tree \
+-// RUN:   | FileCheck --check-prefix=CHECK-FSL-PPC64 %s
+-// CHECK-FSL-PPC64: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-FSL-PPC64: "-m" "elf64ppc"
+-// CHECK-FSL-PPC64: "{{.*}}{{/|\\\\}}crt1.o"
+-// CHECK-FSL-PPC64: "{{.*}}{{/|\\\\}}crtbegin.o"
+-// CHECK-FSL-PPC64: "-L[[SYSROOT]]/usr/lib64/powerpc64-fsl-linux/4.6.2/../.."
+-//
+-// Check that crtfastmath.o is linked with -ffast-math.
+-// RUN: %clang --target=x86_64-unknown-linux -### %s \
+-// RUN:        --sysroot=%S/Inputs/basic_linux_tree 2>&1 \
+-// RUN:   | FileCheck --check-prefix=CHECK-NOCRTFASTMATH %s
+-// RUN: %clang --target=x86_64-unknown-linux -### %s -ffast-math \
+-// RUN:        --sysroot=%S/Inputs/basic_linux_tree 2>&1 \
+-// RUN:   | FileCheck --check-prefix=CHECK-CRTFASTMATH %s
+-// RUN: %clang --target=x86_64-unknown-linux -### %s -funsafe-math-optimizations\
+-// RUN:        --sysroot=%S/Inputs/basic_linux_tree 2>&1 \
+-// RUN:   | FileCheck --check-prefix=CHECK-CRTFASTMATH %s
+-// RUN: %clang --target=x86_64-unknown-linux -### %s -ffast-math -fno-fast-math \
+-// RUN:        --sysroot=%S/Inputs/basic_linux_tree 2>&1 \
+-// RUN:   | FileCheck --check-prefix=CHECK-NOCRTFASTMATH %s
+-// We don't have crtfastmath.o in the i386 tree, use it to check that file
+-// detection works.
+-// RUN: %clang --target=i386-unknown-linux -### %s -ffast-math \
+-// RUN:        --sysroot=%S/Inputs/basic_linux_tree 2>&1 \
+-// RUN:   | FileCheck --check-prefix=CHECK-NOCRTFASTMATH %s
+-// CHECK-CRTFASTMATH: usr/lib/gcc/x86_64-unknown-linux/4.6.0{{/|\\\\}}crtfastmath.o
+-// CHECK-NOCRTFASTMATH-NOT: crtfastmath.o
+-
+-// Check that we link in gcrt1.o when compiling with -pg
+-// RUN: %clang -pg --target=x86_64-unknown-linux -### %s \
+-// RUN:        --sysroot=%S/Inputs/basic_linux_tree 2>& 1 \
+-// RUN:   | FileCheck --check-prefix=CHECK-PG %s
+-// CHECK-PG: gcrt1.o
diff --git a/easybuild/easyconfigs/c/Clang/Clang-3.4-llvm-ar-uid.patch b/easybuild/easyconfigs/c/Clang/Clang-3.4-llvm-ar-uid.patch
new file mode 100644
index 0000000000000000000000000000000000000000..77af143b39fc7bbba0956c48419775561c19faf1
--- /dev/null
+++ b/easybuild/easyconfigs/c/Clang/Clang-3.4-llvm-ar-uid.patch
@@ -0,0 +1,42 @@
+# part of svn rev 199222. Fixes issue with very long uid numbers
+diff -urN llvm-3.4.orig/tools/llvm-ar/llvm-ar.cpp llvm-3.4/tools/llvm-ar/llvm-ar.cpp
+--- llvm-3.4.orig/tools/llvm-ar/llvm-ar.cpp	2013-11-08 13:35:56.000000000 +0100
++++ llvm-3.4/tools/llvm-ar/llvm-ar.cpp	2014-02-24 13:22:18.335265229 +0100
+@@ -578,14 +578,21 @@
+ }
+ 
+ template <typename T>
+-static void printWithSpacePadding(raw_ostream &OS, T Data, unsigned Size) {
++static void printWithSpacePadding(raw_fd_ostream &OS, T Data, unsigned Size,
++                                  bool MayTruncate = false) {
+   uint64_t OldPos = OS.tell();
+   OS << Data;
+   unsigned SizeSoFar = OS.tell() - OldPos;
+-  assert(Size >= SizeSoFar && "Data doesn't fit in Size");
+-  unsigned Remaining = Size - SizeSoFar;
+-  for (unsigned I = 0; I < Remaining; ++I)
+-    OS << ' ';
++  if (Size > SizeSoFar) {
++    unsigned Remaining = Size - SizeSoFar;
++    for (unsigned I = 0; I < Remaining; ++I)
++      OS << ' ';
++  } else if (Size < SizeSoFar) {
++    assert(MayTruncate && "Data doesn't fit in Size");
++    // Some of the data this is used for (like UID) can be larger than the
++    // space available in the archive format. Truncate in that case.
++    OS.seek(OldPos + Size);
++  }
+ }
+ 
+ static void print32BE(raw_fd_ostream &Out, unsigned Val) {
+@@ -600,8 +607,8 @@
+                                     unsigned GID, unsigned Perms,
+                                     unsigned Size) {
+   printWithSpacePadding(Out, ModTime.toEpochTime(), 12);
+-  printWithSpacePadding(Out, UID, 6);
+-  printWithSpacePadding(Out, GID, 6);
++  printWithSpacePadding(Out, UID, 6, true);
++  printWithSpacePadding(Out, GID, 6, true);
+   printWithSpacePadding(Out, format("%o", Perms), 8);
+   printWithSpacePadding(Out, Size, 10);
+   Out << "`\n";
diff --git a/easybuild/easyconfigs/c/ClangGCC/ClangGCC-1.3.0.eb b/easybuild/easyconfigs/c/ClangGCC/ClangGCC-1.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ed2fa73c3cd83769f8f287859ffc41b1e87b416e
--- /dev/null
+++ b/easybuild/easyconfigs/c/ClangGCC/ClangGCC-1.3.0.eb
@@ -0,0 +1,18 @@
+easyblock = "Toolchain"
+
+name = 'ClangGCC'
+version = '1.3.0'
+
+homepage = '(none)'
+description = """Clang and GCC based compiler toolchain.  Clang will use libstdc++.
+GFortran will be used to compile Fortran code."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+comp = ('GCC', '4.8.2')
+dependencies = [
+    comp,
+    ('Clang', '3.4', '', comp),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/c/Clustal-Omega/Clustal-Omega-1.2.0-goolf-1.4.10.eb b/easybuild/easyconfigs/c/Clustal-Omega/Clustal-Omega-1.2.0-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ec43e8ac617268cba9bb2b2abbf4fe1cb560a0fe
--- /dev/null
+++ b/easybuild/easyconfigs/c/Clustal-Omega/Clustal-Omega-1.2.0-goolf-1.4.10.eb
@@ -0,0 +1,27 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+name = 'Clustal-Omega'
+version = '1.2.0'
+
+homepage = 'http://www.clustal.org/omega/'
+description = """ Clustal Omega is a multiple sequence alignment 
+ program for proteins. It produces biologically meaningful multiple 
+ sequence alignments of divergent sequences. Evolutionary relationships 
+ can be seen via viewing Cladograms or Phylograms """
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+dependencies = [('argtable', '2.13')]
+
+source_urls = [homepage]
+sources = [SOURCELOWER_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ['bin/clustalo'],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/c/Coreutils/Coreutils-8.22-goolf-1.4.10.eb b/easybuild/easyconfigs/c/Coreutils/Coreutils-8.22-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..bd182d78c130d62bbd2c648b8e4bea18c4040f93
--- /dev/null
+++ b/easybuild/easyconfigs/c/Coreutils/Coreutils-8.22-goolf-1.4.10.eb
@@ -0,0 +1,19 @@
+name = "Coreutils"
+version = "8.22"
+
+homepage = 'http://www.gnu.org/software/coreutils/'
+description = """The GNU Core Utilities are the basic file, shell and text manipulation utilities of the
+ GNU operating system.  These are the core utilities which are expected to exist on every operating system."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+sanity_check_paths = {
+    'files': ['bin/sort', 'bin/echo', 'bin/du', 'bin/date', 'bin/true'],
+    'dirs': []
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/c/Coreutils/Coreutils-8.22-ictce-5.3.0.eb b/easybuild/easyconfigs/c/Coreutils/Coreutils-8.22-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3eae868790b948c2feef8b92a49da8cbcd184350
--- /dev/null
+++ b/easybuild/easyconfigs/c/Coreutils/Coreutils-8.22-ictce-5.3.0.eb
@@ -0,0 +1,19 @@
+name = "Coreutils"
+version = "8.22"
+
+homepage = 'http://www.gnu.org/software/coreutils/'
+description = """The GNU Core Utilities are the basic file, shell and text manipulation utilities of the
+ GNU operating system.  These are the core utilities which are expected to exist on every operating system."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+sanity_check_paths = {
+    'files': ['bin/sort', 'bin/echo', 'bin/du', 'bin/date', 'bin/true'],
+    'dirs': []
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.0.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.0.2-goalf-1.1.0-no-OFED.eb
index b12bdd90da1e7b07fd956c7b04c74e7332e6f802..9ab19f3693b143a9cf21e5764784a9b7f42e5b14 100644
--- a/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.0.2-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.0.2-goalf-1.1.0-no-OFED.eb
@@ -29,7 +29,7 @@ dependencies = [
     ('zlib', '1.2.7'),
 ]
 
-configopts = '--with-boost=$EBROOTBOOST --with-bam-libdir=${EBROOTSAMTOOLS/lib}'
+configopts = '--with-boost=$EBROOTBOOST --with-bam-libdir=${EBROOTSAMTOOLS}/lib'
 preconfigopts = 'CPPFLAGS=-I$EBROOTEIGEN/include'
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.0.2-goolf-1.4.10.eb b/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.0.2-goolf-1.4.10.eb
index 370e22c4e2397465af1075da5aa7487db9245553..717fc21c8bd1e97b9674a0cca73458fae4653984 100644
--- a/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.0.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.0.2-goolf-1.4.10.eb
@@ -31,7 +31,7 @@ dependencies = [
 
 patches = ['Cufflinks_GCC-4.7.patch']
 
-configopts = '--with-boost=$EBROOTBOOST --with-bam-libdir=${EBROOTSAMTOOLS/lib}'
+configopts = '--with-boost=$EBROOTBOOST --with-bam-libdir=${EBROOTSAMTOOLS}/lib'
 preconfigopts = 'CPPFLAGS=-I$EBROOTEIGEN/include'
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.0.2-ictce-5.3.0.eb b/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.0.2-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c7a3e3e37c278ac18453a80092464b51f740960c
--- /dev/null
+++ b/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.0.2-ictce-5.3.0.eb
@@ -0,0 +1,44 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine
+# Authors::   Cedric Laczny <cedric.laczny@uni.lu>, Fotis Georgatos <fotis.georgatos@uni.lu>
+#             Jens Timmerman (Ghent University)
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html
+##
+
+name = 'Cufflinks'
+version = '2.0.2'
+
+homepage = 'http://cufflinks.cbcb.umd.edu/'
+description = """Transcript assembly, differential expression, and differential regulation for RNA-Seq"""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://cufflinks.cbcb.umd.edu/downloads/']
+
+patches = ['Cufflinks-2.1.1_init-error.patch']
+
+dependencies = [
+    ('Boost', '1.51.0', '-Python-2.7.3'),
+    ('SAMtools', '0.1.18'),
+    ('Eigen', '3.1.1'),
+    ('zlib', '1.2.7'),
+]
+
+configopts = '--with-boost=$EBROOTBOOST --with-bam-libdir=${EBROOTSAMTOOLS}/lib'
+configopts += ' --enable-intel64 '
+preconfigopts = 'CPPFLAGS=-I$EBROOTEIGEN/include'
+
+sanity_check_paths = {
+    'files': ['bin/cufflinks'],
+    'dirs': []
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.1.1-ictce-5.5.0.eb b/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.1.1-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..79ace6dbc75cba729c1a20d67d8cf6080029d02a
--- /dev/null
+++ b/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.1.1-ictce-5.5.0.eb
@@ -0,0 +1,43 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine
+# Authors::   Cedric Laczny <cedric.laczny@uni.lu>, Fotis Georgatos <fotis.georgatos@uni.lu>
+#             Jens Timmerman (Ghent University)
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html
+##
+
+name = 'Cufflinks'
+version = '2.1.1'
+
+homepage = 'http://cufflinks.cbcb.umd.edu/'
+description = """Transcript assembly, differential expression, and differential regulation for RNA-Seq"""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://cufflinks.cbcb.umd.edu/downloads/']
+
+patches = ['Cufflinks-2.1.1_init-error.patch']
+
+dependencies = [
+    ('Boost', '1.55.0', '-Python-2.7.6'),
+    ('SAMtools', '0.1.19'),
+    ('Eigen', '3.2.0'),
+    ('zlib', '1.2.7'),
+]
+
+configopts = '--enable-intel64 --with-boost=$EBROOTBOOST --with-bam-libdir=${EBROOTSAMTOOLS}/lib'
+preconfigopts = 'CPPFLAGS=-I$EBROOTEIGEN/include'
+
+sanity_check_paths = {
+    'files': ['bin/cufflinks'],
+    'dirs': []
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.1.1_init-error.patch b/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.1.1_init-error.patch
new file mode 100644
index 0000000000000000000000000000000000000000..199023308cae0a6af1a74f93516939486324fe80
--- /dev/null
+++ b/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.1.1_init-error.patch
@@ -0,0 +1,34 @@
+# patch by Jens Timmerman (Ghent University)
+# discussed here: http://stackoverflow.com/questions/20100602/is-initializing-a-reference-of-type-int-not-const-qualified-with-a-value-o
+--- src/rounding.h.orig 2013-11-20 18:03:13.211025464 +0100
++++ src/rounding.h  2013-11-20 18:03:22.850887431 +0100
+@@ -165,29 +165,6 @@
+     }
+     
+     //--------------------------------------------------------------------------
+-    // round alternate
+-    // Bias: none for sequential calls
+-    bool _is_up = false;
+-    template <typename FloatType>
+-    FloatType roundalternate( const FloatType& value, int& is_up = _is_up )
+-    {
+-        if ((is_up != is_up))
+-            return roundhalfup( value );
+-        return roundhalfdown( value );
+-    }
+-    
+-    //--------------------------------------------------------------------------
+-    // symmetric round alternate
+-    // Bias: none for sequential calls
+-    template <typename FloatType>
+-    FloatType roundalternate0( const FloatType& value, int& is_up = _is_up )
+-    {
+-        if ((is_up != is_up))
+-            return roundhalfup0( value );
+-        return roundhalfdown0( value );
+-    }
+-    
+-    //--------------------------------------------------------------------------
+     // round random
+     // Bias: generator's bias
+     template <typename FloatType, typename RandValue, typename RandomGenerator>
diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.16-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/c/Cython/Cython-0.16-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index de9d824b0b9b0937cfd0f77d703f9ebcbd48a49c..83aec1d93634e7b2aa204f50a6f88b5761e5a7e4 100644
--- a/easybuild/easyconfigs/c/Cython/Cython-0.16-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/c/Cython/Cython-0.16-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -9,19 +9,20 @@ description = """The Cython language makes writing C extensions for the Python l
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
-source_urls = ['http://pypi.python.org/packages/source/C/Cython/']
+source_urls = [PYPI_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 python = 'Python'
 pythonver = '2.7.3'
 pythonshortver = '.'.join(pythonver.split('.')[0:2])
+pylibdir = 'lib/python%s/site-packages' % pythonshortver
 versionsuffix = '-%s-%s' % (python, pythonver)
 
 dependencies = [(python, pythonver)]
 
 sanity_check_paths = {
-    'files': ['bin/cygdb', 'bin/cython', 'lib/python%s/site-packages/%%(namelower)s.py' % pythonshortver],
-    'dirs': ['lib/python%s/site-packages/%%(name)s' % pythonshortver],
+    'files': ['bin/cygdb', 'bin/cython', '%s/%%(namelower)s.py' % pylibdir],
+    'dirs': ['%s/%%(name)s' % pylibdir],
 }
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.16-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/c/Cython/Cython-0.16-goolf-1.4.10-Python-2.7.3.eb
index 666edc42c2a84024116863c1b9be4302b1a30a44..892d56aaa136889da5a673618c923d77dc9c9345 100644
--- a/easybuild/easyconfigs/c/Cython/Cython-0.16-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/c/Cython/Cython-0.16-goolf-1.4.10-Python-2.7.3.eb
@@ -9,19 +9,20 @@ description = """The Cython language makes writing C extensions for the Python l
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-source_urls = ['http://pypi.python.org/packages/source/C/Cython/']
+source_urls = [PYPI_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 python = 'Python'
 pythonver = '2.7.3'
 pythonshortver = '.'.join(pythonver.split('.')[0:2])
+pylibdir = 'lib/python%s/site-packages' % pythonshortver
 versionsuffix = '-%s-%s' % (python, pythonver)
 
 dependencies = [(python, pythonver)]
 
 sanity_check_paths = {
-    'files': ['bin/cygdb', 'bin/cython', 'lib/python%s/site-packages/%%(namelower)s.py' % pythonshortver],
-    'dirs': ['lib/python%s/site-packages/%%(name)s' % pythonshortver],
+    'files': ['bin/cygdb', 'bin/cython', '%s/%%(namelower)s.py' % pylibdir],
+    'dirs': ['%s/%%(name)s' % pylibdir],
 }
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-4.0.6-Python-2.7.3.eb
index 16232ee493f46cafed55567998d64a589a23b547..b81a538f5c6e7993f7d72a41a50a7dd58fc9acac 100644
--- a/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-4.0.6-Python-2.7.3.eb
@@ -9,19 +9,20 @@ description = """The Cython language makes writing C extensions for the Python l
 
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
-source_urls = ['http://pypi.python.org/packages/source/C/Cython/']
+source_urls = [PYPI_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 python = 'Python'
 pythonver = '2.7.3'
 pythonshortver = '.'.join(pythonver.split('.')[0:2])
+pylibdir = 'lib/python%s/site-packages' % pythonshortver
 versionsuffix = '-%s-%s' % (python, pythonver)
 
 dependencies = [(python, pythonver)]
 
 sanity_check_paths = {
-    'files': ['bin/cygdb', 'bin/cython', 'lib/python%s/site-packages/%%(namelower)s.py' % pythonshortver],
-    'dirs': ['lib/python%s/site-packages/%%(name)s' % pythonshortver],
+    'files': ['bin/cygdb', 'bin/cython', '%s/%%(namelower)s.py' % pylibdir],
+    'dirs': ['%s/%%(name)s' % pylibdir],
 }
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-4.1.13-Python-2.7.3.eb
index c638c7d8694a18c4cbfc8dd790ecd4386761f127..6e94f41099893c1468ca76ed830dc1eef2f551f7 100644
--- a/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-4.1.13-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-4.1.13-Python-2.7.3.eb
@@ -9,7 +9,7 @@ description = """The Cython language makes writing C extensions for the Python l
 
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
-source_urls = ['http://pypi.python.org/packages/source/C/Cython/']
+source_urls = [PYPI_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 python = 'Python'
@@ -21,8 +21,8 @@ versionsuffix = '-%s-%s' % (python, pythonver)
 dependencies = [(python, pythonver)]
 
 sanity_check_paths = {
-    'files': ['bin/cygdb', 'bin/cython', 'lib/python%s/site-packages/%%(namelower)s.py' % pythonshortver],
-    'dirs': ['lib/python%s/site-packages/%%(name)s' % pythonshortver],
+    'files': ['bin/cygdb', 'bin/cython', '%s/%%(namelower)s.py' % pylibdir],
+    'dirs': ['%s/%%(name)s' % pylibdir],
 }
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-5.3.0-Python-2.7.3.eb
index 7bab5be1c202889e344b2271fef497e2d7135456..5d1302c3c1ebdbb18a41bf6ee1fcc1f45296e0a3 100644
--- a/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-5.3.0-Python-2.7.3.eb
@@ -9,7 +9,7 @@ description = """The Cython language makes writing C extensions for the Python l
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
-source_urls = ['http://pypi.python.org/packages/source/C/Cython/']
+source_urls = [PYPI_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 python = 'Python'
@@ -21,8 +21,8 @@ versionsuffix = '-%s-%s' % (python, pythonver)
 dependencies = [(python, pythonver)]
 
 sanity_check_paths = {
-    'files': ['bin/cygdb', 'bin/cython', 'lib/python%s/site-packages/%%(namelower)s.py' % pythonshortver],
-    'dirs': ['lib/python%s/site-packages/%%(name)s' % pythonshortver],
+    'files': ['bin/cygdb', 'bin/cython', '%s/%%(namelower)s.py' % pylibdir],
+    'dirs': ['%s/%%(name)s' % pylibdir],
 }
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.19.1-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/c/Cython/Cython-0.19.1-goolf-1.4.10-Python-2.7.3.eb
index b3b34681206eb517e383f323dc0da21d0b24269a..ebccd555bbeeae43e7fc88efcfc13b1a06618576 100644
--- a/easybuild/easyconfigs/c/Cython/Cython-0.19.1-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/c/Cython/Cython-0.19.1-goolf-1.4.10-Python-2.7.3.eb
@@ -9,7 +9,7 @@ description = """The Cython language makes writing C extensions for the Python l
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-source_urls = ['http://pypi.python.org/packages/source/C/Cython/']
+source_urls = [PYPI_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 python = 'Python'
@@ -21,8 +21,8 @@ versionsuffix = '-%s-%s' % (python, pythonver)
 dependencies = [(python, pythonver)]
 
 sanity_check_paths = {
-    'files': ['bin/cygdb', 'bin/cython', 'lib/python%s/site-packages/%%(namelower)s.py' % pythonshortver],
-    'dirs': ['lib/python%s/site-packages/%%(name)s' % pythonshortver],
+    'files': ['bin/cygdb', 'bin/cython', '%s/%%(namelower)s.py' % pylibdir],
+    'dirs': ['%s/%%(name)s' % pylibdir],
 }
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-4.1.13-Python-2.7.3.eb
index ec5d60fe4e64d0b7cd102ed758c1cd28f61bfdd4..3c845e984536516ad7b766d1a8db642b2f3dccdd 100644
--- a/easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-4.1.13-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-4.1.13-Python-2.7.3.eb
@@ -9,7 +9,7 @@ description = """The Cython language makes writing C extensions for the Python l
 
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
-source_urls = ['http://pypi.python.org/packages/source/C/Cython/']
+source_urls = [PYPI_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 python = 'Python'
@@ -21,8 +21,8 @@ versionsuffix = '-%s-%s' % (python, pythonver)
 dependencies = [(python, pythonver)]
 
 sanity_check_paths = {
-    'files': ['bin/cygdb', 'bin/cython', 'lib/python%s/site-packages/%%(namelower)s.py' % pythonshortver],
-    'dirs': ['lib/python%s/site-packages/%%(name)s' % pythonshortver],
+    'files': ['bin/cygdb', 'bin/cython', '%s/%%(namelower)s.py' % pylibdir],
+    'dirs': ['%s/%%(name)s' % pylibdir],
 }
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-5.3.0-Python-2.7.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..544e217059453b65e38ebd93442d020f5d0bbcce
--- /dev/null
+++ b/easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-5.3.0-Python-2.7.3.eb
@@ -0,0 +1,28 @@
+easyblock = "PythonPackage"
+
+name = 'Cython'
+version = '0.19.1'
+
+homepage = 'http://pypi.python.org/pypi/Cython/'
+description = """The Cython language makes writing C extensions for the Python language as easy as Python itself.
+ Cython is a source code translator based on the well-known Pyrex, but supports more cutting edge functionality and optimizations."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+python = 'Python'
+pythonver = '2.7.3'
+pythonshortver = '.'.join(pythonver.split('.')[0:2])
+pylibdir = 'lib/python%s/site-packages' % pythonshortver
+versionsuffix = '-%s-%s' % (python, pythonver)
+
+dependencies = [(python, pythonver)]
+
+sanity_check_paths = {
+    'files': ['bin/cygdb', 'bin/cython', '%s/%%(namelower)s.py' % pylibdir],
+    'dirs': ['%s/%%(name)s' % pylibdir],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.19.2-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/c/Cython/Cython-0.19.2-ictce-5.5.0-Python-2.7.6.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6d9476ba0f302754d5cdb8f29b86e69ba6d8bf5f
--- /dev/null
+++ b/easybuild/easyconfigs/c/Cython/Cython-0.19.2-ictce-5.5.0-Python-2.7.6.eb
@@ -0,0 +1,28 @@
+easyblock = "PythonPackage"
+
+name = 'Cython'
+version = '0.19.2'
+
+homepage = 'http://pypi.python.org/pypi/Cython/'
+description = """The Cython language makes writing C extensions for the Python language as easy as Python itself.
+ Cython is a source code translator based on the well-known Pyrex, but supports more cutting edge functionality and optimizations."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+python = 'Python'
+pythonver = '2.7.6'
+pythonshortver = '.'.join(pythonver.split('.')[0:2])
+pylibdir = 'lib/python%s/site-packages' % pythonshortver
+versionsuffix = '-%s-%s' % (python, pythonver)
+
+dependencies = [(python, pythonver)]
+
+sanity_check_paths = {
+    'files': ['bin/cygdb', 'bin/cython', '%s/%%(namelower)s.py' % pylibdir],
+    'dirs': ['%s/%%(name)s' % pylibdir],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.27.0-ictce-4.1.13.eb b/easybuild/easyconfigs/c/cURL/cURL-7.27.0-ictce-4.1.13.eb
new file mode 100644
index 0000000000000000000000000000000000000000..595b5ff8ef8ad704f041df751e9a017b243a2f56
--- /dev/null
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.27.0-ictce-4.1.13.eb
@@ -0,0 +1,22 @@
+name = 'cURL'
+version = '7.27.0'
+
+homepage = 'http://curl.haxx.se'
+description = """libcurl is a free and easy-to-use client-side URL transfer library,
+ supporting DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS,
+ POP3, POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP. libcurl supports
+ SSL certificates, HTTP POST, HTTP PUT, FTP uploading, HTTP form based upload,
+ proxies, cookies, user+password authentication (Basic, Digest, NTLM, Negotiate,
+ Kerberos), file transfer resume, http proxy tunneling and more."""
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://curl.haxx.se/download/']
+
+sanity_check_paths = {
+    'files': ["bin/curl", "lib/libcurl.a", "lib/libcurl.so"],
+    'dirs': ["lib/pkgconfig"],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.28.1-ictce-4.1.13.eb b/easybuild/easyconfigs/c/cURL/cURL-7.28.1-ictce-4.1.13.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0b0ea92016c3bfd16e26667df7c538ee30f18a1c
--- /dev/null
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.28.1-ictce-4.1.13.eb
@@ -0,0 +1,22 @@
+name = 'cURL'
+version = '7.28.1'
+
+homepage = 'http://curl.haxx.se'
+description = """libcurl is a free and easy-to-use client-side URL transfer library,
+ supporting DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS,
+ POP3, POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP. libcurl supports
+ SSL certificates, HTTP POST, HTTP PUT, FTP uploading, HTTP form based upload,
+ proxies, cookies, user+password authentication (Basic, Digest, NTLM, Negotiate,
+ Kerberos), file transfer resume, http proxy tunneling and more."""
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://curl.haxx.se/download/']
+
+sanity_check_paths = {
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.28.1-ictce-5.3.0.eb b/easybuild/easyconfigs/c/cURL/cURL-7.28.1-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fa10cf6767c18fca196a43c354fbe01a2c09c700
--- /dev/null
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.28.1-ictce-5.3.0.eb
@@ -0,0 +1,22 @@
+name = 'cURL'
+version = '7.28.1'
+
+homepage = 'http://curl.haxx.se'
+description = """libcurl is a free and easy-to-use client-side URL transfer library,
+ supporting DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS,
+ POP3, POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP. libcurl supports
+ SSL certificates, HTTP POST, HTTP PUT, FTP uploading, HTTP form based upload,
+ proxies, cookies, user+password authentication (Basic, Digest, NTLM, Negotiate,
+ Kerberos), file transfer resume, http proxy tunneling and more."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://curl.haxx.se/download/']
+
+sanity_check_paths = {
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.33.0-ictce-5.3.0.eb b/easybuild/easyconfigs/c/cURL/cURL-7.33.0-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..65dd20560ec9b09a6bdb81b8c74d4fd4b2c383cc
--- /dev/null
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.33.0-ictce-5.3.0.eb
@@ -0,0 +1,22 @@
+name = 'cURL'
+version = '7.33.0'
+
+homepage = 'http://curl.haxx.se'
+description = """libcurl is a free and easy-to-use client-side URL transfer library,
+ supporting DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS,
+ POP3, POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP. libcurl supports
+ SSL certificates, HTTP POST, HTTP PUT, FTP uploading, HTTP form based upload,
+ proxies, cookies, user+password authentication (Basic, Digest, NTLM, Negotiate,
+ Kerberos), file transfer resume, http proxy tunneling and more."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://curl.haxx.se/download/']
+
+sanity_check_paths = {
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.34.0-ictce-5.5.0.eb b/easybuild/easyconfigs/c/cURL/cURL-7.34.0-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a6459108066a3811d686d3adbea8bb33a42a9e70
--- /dev/null
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.34.0-ictce-5.5.0.eb
@@ -0,0 +1,22 @@
+name = 'cURL'
+version = '7.34.0'
+
+homepage = 'http://curl.haxx.se'
+description = """libcurl is a free and easy-to-use client-side URL transfer library,
+ supporting DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS,
+ POP3, POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP. libcurl supports
+ SSL certificates, HTTP POST, HTTP PUT, FTP uploading, HTTP form based upload,
+ proxies, cookies, user+password authentication (Basic, Digest, NTLM, Negotiate,
+ Kerberos), file transfer resume, http proxy tunneling and more."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://curl.haxx.se/download/']
+
+sanity_check_paths = {
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/c/cairo/cairo-1.12.14-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/c/cairo/cairo-1.12.14-goalf-1.1.0-no-OFED.eb
index acd5a35b61b05d8fab48e1ff86d9decb5ec7320a..6264b44320b4abe831ed9a3248bae160fc893abb 100644
--- a/easybuild/easyconfigs/c/cairo/cairo-1.12.14-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/c/cairo/cairo-1.12.14-goalf-1.1.0-no-OFED.eb
@@ -9,7 +9,7 @@ PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
 source_urls = ['http://cairographics.org/releases/']
-sources = ['%(name)s-%(version)s.tar.xz']
+sources = [SOURCE_TAR_XZ]
 
 dependencies = [
     ('libpng', '1.5.14'),
diff --git a/easybuild/easyconfigs/c/cairo/cairo-1.12.14-goolf-1.4.10.eb b/easybuild/easyconfigs/c/cairo/cairo-1.12.14-goolf-1.4.10.eb
index 6b7a9cdd1087716b171d42241e3d4d7868182f72..fe30ba2cfb9f9362acb0b593a5abe10ce46bf475 100644
--- a/easybuild/easyconfigs/c/cairo/cairo-1.12.14-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/c/cairo/cairo-1.12.14-goolf-1.4.10.eb
@@ -9,7 +9,7 @@ PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 source_urls = ['http://cairographics.org/releases/']
-sources = ['%(name)s-%(version)s.tar.xz']
+sources = [SOURCE_TAR_XZ]
 
 dependencies = [
     ('libpng', '1.5.14'),
diff --git a/easybuild/easyconfigs/c/cairo/cairo-1.12.14-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/c/cairo/cairo-1.12.14-ictce-3.2.2.u3.eb
index c483aa6c2f839db284e9b2f53f4df28ffd3ff216..768941a832b96391b32fdd438bc0c1bec036a2cf 100644
--- a/easybuild/easyconfigs/c/cairo/cairo-1.12.14-ictce-3.2.2.u3.eb
+++ b/easybuild/easyconfigs/c/cairo/cairo-1.12.14-ictce-3.2.2.u3.eb
@@ -9,7 +9,7 @@ PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS
 toolchain = {'name': 'ictce', 'version': '3.2.2.u3'}
 
 source_urls = ['http://cairographics.org/releases/']
-sources = ['%(name)s-%(version)s.tar.xz']
+sources = [SOURCE_TAR_XZ]
 
 dependencies = [
     ('libpng', '1.5.14'),
diff --git a/easybuild/easyconfigs/c/cairo/cairo-1.12.14-ictce-4.1.13.eb b/easybuild/easyconfigs/c/cairo/cairo-1.12.14-ictce-4.1.13.eb
index 89a55a0ac71bbe9cfb47c8da29022ccace78960d..c623937595ebfd8b8167bd369929c906c338ce05 100644
--- a/easybuild/easyconfigs/c/cairo/cairo-1.12.14-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/c/cairo/cairo-1.12.14-ictce-4.1.13.eb
@@ -9,7 +9,7 @@ PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
 source_urls = ['http://cairographics.org/releases/']
-sources = ['%(name)s-%(version)s.tar.xz']
+sources = [SOURCE_TAR_XZ]
 
 dependencies = [
     ('libpng', '1.5.14'),
diff --git a/easybuild/easyconfigs/c/cflow/cflow-1.4-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/c/cflow/cflow-1.4-goalf-1.1.0-no-OFED.eb
index c5754639f5eb92c7049c7f91a5c8100014c327bb..59124fc81fe73c817bca0b18dadd18ab0c7bc756 100644
--- a/easybuild/easyconfigs/c/cflow/cflow-1.4-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/c/cflow/cflow-1.4-goalf-1.1.0-no-OFED.eb
@@ -15,7 +15,7 @@ homepage = 'http://www.gnu.org/software/cflow/'
 description = """cflow-1.4: Code-path flow analyzer for C"""
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/cflow']
+source_urls = [GNU_SOURCE]
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
diff --git a/easybuild/easyconfigs/c/cflow/cflow-1.4-goolf-1.4.10.eb b/easybuild/easyconfigs/c/cflow/cflow-1.4-goolf-1.4.10.eb
index ec677bbfc51f68d37ceb09c24457a1c685efc4e3..2fa549427b942817f3d75837c50ddba40a06c167 100644
--- a/easybuild/easyconfigs/c/cflow/cflow-1.4-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/c/cflow/cflow-1.4-goolf-1.4.10.eb
@@ -15,7 +15,7 @@ homepage = 'http://www.gnu.org/software/cflow/'
 description = """cflow-1.4: Code-path flow analyzer for C"""
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/cflow']
+source_urls = [GNU_SOURCE]
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
diff --git a/easybuild/easyconfigs/c/cflow/cflow-1.4-ictce-4.0.6.eb b/easybuild/easyconfigs/c/cflow/cflow-1.4-ictce-4.0.6.eb
index 48b62c0de5106aaf379849d2fa3c5fe1df97b0fb..626c5734180f5ac8b2700507c79ff80ca6f1d3c8 100644
--- a/easybuild/easyconfigs/c/cflow/cflow-1.4-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/c/cflow/cflow-1.4-ictce-4.0.6.eb
@@ -15,7 +15,7 @@ homepage = 'http://www.gnu.org/software/cflow/'
 description = """cflow-1.4: Code-path flow analyzer for C"""
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/cflow']
+source_urls = [GNU_SOURCE]
 
 toolchain = {'version': '4.0.6', 'name': 'ictce'}
 
diff --git a/easybuild/easyconfigs/c/cflow/cflow-1.4-ictce-5.3.0.eb b/easybuild/easyconfigs/c/cflow/cflow-1.4-ictce-5.3.0.eb
index 1dadcc05043188d5d8bb1f5023203e337e5382c3..a6c4166eeefccd47d0daf032c557145b2436dce1 100644
--- a/easybuild/easyconfigs/c/cflow/cflow-1.4-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/c/cflow/cflow-1.4-ictce-5.3.0.eb
@@ -15,7 +15,7 @@ homepage = 'http://www.gnu.org/software/cflow/'
 description = """cflow-1.4: Code-path flow analyzer for C"""
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/cflow']
+source_urls = [GNU_SOURCE]
 
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
diff --git a/easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..77441b588107e8fdfc5ea582e49438f6dd54edd1
--- /dev/null
+++ b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.3.eb
@@ -0,0 +1,38 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics (SIB)
+# Biozentrum - University of Basel
+
+easyblock = "PythonPackage"
+
+name = 'cutadapt'
+version = '1.3'
+
+homepage = 'http://code.google.com/p/cutadapt/'
+description = """ cutadapt removes adapter sequences
+ from high-throughput sequencing data. This is usually
+ necessary when the read length of the sequencing machine
+ is longer than the molecule that is sequenced, for
+ example when sequencing microRNAs.  """
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['http://cutadapt.googlecode.com/files/']
+sources = ['%(namelower)s-%(version)s.tar.gz']
+
+python = 'Python'
+pyver = '2.7.3'
+pyshortver = '.'.join(pyver.split('.')[:2])
+
+versionsuffix = "-%s-%s" % (python, pyver)
+
+dependencies = [
+    (python, pyver),
+]
+
+sanity_check_paths = {
+    'files': ['bin/cutadapt','lib/python2.7/site-packages/cutadapt/calign.so',],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.5.eb b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e788568341014520611617d8bd63123896a219e4
--- /dev/null
+++ b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.5.eb
@@ -0,0 +1,38 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics (SIB)
+# Biozentrum - University of Basel
+
+easyblock = "PythonPackage"
+
+name = 'cutadapt'
+version = '1.3'
+
+homepage = 'http://code.google.com/p/cutadapt/'
+description = """ cutadapt removes adapter sequences 
+ from high-throughput sequencing data. This is usually 
+ necessary when the read length of the sequencing machine 
+ is longer than the molecule that is sequenced, for 
+ example when sequencing microRNAs.  """
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['http://cutadapt.googlecode.com/files/']
+sources = ['%(namelower)s-%(version)s.tar.gz']
+
+python = 'Python'
+pyver = '2.7.5'
+pyshortver = '.'.join(pyver.split('.')[:2])
+
+versionsuffix = "-%s-%s" % (python, pyver)
+
+dependencies = [
+    (python, pyver),
+]
+
+sanity_check_paths = {
+    'files': ['bin/cutadapt','lib/python2.7/site-packages/cutadapt/calign.so',],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/d/Diffutils/Diffutils-3.2-goolf-1.4.10.eb b/easybuild/easyconfigs/d/Diffutils/Diffutils-3.2-goolf-1.4.10.eb
index 5371caa2fa638bbf31118e87077da5aebcc8322a..5c1247c5f62eeb46c9af6f63ab9714eeb7d4ff48 100644
--- a/easybuild/easyconfigs/d/Diffutils/Diffutils-3.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/d/Diffutils/Diffutils-3.2-goolf-1.4.10.eb
@@ -16,7 +16,7 @@ version = '3.2'
 description = """Diffutils: GNU diff utilities - find the differences between files"""
 homepage = 'http://www.gnu.org/software/diffutils/diffutils.html'
 
-source_urls = ['http://ftp.gnu.org/gnu/diffutils']
+source_urls = [GNU_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
diff --git a/easybuild/easyconfigs/d/Diffutils/Diffutils-3.2-ictce-5.3.0.eb b/easybuild/easyconfigs/d/Diffutils/Diffutils-3.2-ictce-5.3.0.eb
index 216a96d6a719465430dbcb50bae9cbf103f77fef..182d829f0f4dd6590589d8bad21b1617928e0d35 100644
--- a/easybuild/easyconfigs/d/Diffutils/Diffutils-3.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/d/Diffutils/Diffutils-3.2-ictce-5.3.0.eb
@@ -16,7 +16,7 @@ version = '3.2'
 description = """Diffutils: GNU diff utilities - find the differences between files"""
 homepage = 'http://www.gnu.org/software/diffutils/diffutils.html'
 
-source_urls = ['http://ftp.gnu.org/gnu/diffutils']
+source_urls = [GNU_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-goalf-1.1.0-no-OFED.eb
index a617a2a35e7d3d97d34450c26513d778605c1082..bb8cdbd66d43e79cec85acfb7c14e6f0c395a96e 100644
--- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-goalf-1.1.0-no-OFED.eb
@@ -3,14 +3,14 @@ version = '1.8.1.1'
 
 homepage = 'http://www.doxygen.org'
 description = """Doxygen is a documentation system for C++, C, Java, Objective-C, Python, 
-IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D."""
+ IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D."""
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
 sources = ['%(namelower)s-%(version)s.src.tar.gz']
 source_urls = ['http://ftp.stack.nl/pub/users/dimitri/']
 
-dependencies = [
+builddependencies = [
     ('flex', '2.5.35'),
     ('Bison', '2.5'),
 ]
diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-goolf-1.4.10.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-goolf-1.4.10.eb
index d5037c4b63b4ab012d6414de2d4ce8afc66f0481..d411b81fc21bcabec01b0831336e2dc48421e507 100644
--- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-goolf-1.4.10.eb
@@ -3,14 +3,16 @@ version = '1.8.1.1'
 
 homepage = 'http://www.doxygen.org'
 description = """Doxygen is a documentation system for C++, C, Java, Objective-C, Python, 
-IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D."""
+ IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D."""
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sources = ['%(namelower)s-%(version)s.src.tar.gz']
 source_urls = ['http://ftp.stack.nl/pub/users/dimitri/']
 
-dependencies = [('flex', '2.5.35'),
-                ('Bison', '2.5')]
+builddependencies = [
+    ('flex', '2.5.35'),
+    ('Bison', '2.5'),
+]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-3.2.2.u3.eb
index f8cc37f0d79a6c0ea45f732827c3407d185dcc7a..84f174b33dafcc5384a6346bbb88650cb97dab6b 100644
--- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-3.2.2.u3.eb
+++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-3.2.2.u3.eb
@@ -3,16 +3,16 @@ version = '1.8.1.1'
 
 homepage = 'http://www.doxygen.org'
 description = """Doxygen is a documentation system for C++, C, Java, Objective-C, Python, 
-IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D."""
+ IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D."""
 
 toolchain = {'name': 'ictce', 'version': '3.2.2.u3'}
 
 sources = ['%(namelower)s-%(version)s.src.tar.gz']
 source_urls = ['http://ftp.stack.nl/pub/users/dimitri/']
 
-dependencies = [
+builddependencies = [
     ('flex', '2.5.35'),
     ('Bison', '2.5'),
-    ]
+]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-4.0.6.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-4.0.6.eb
index 134c1f4a23e29dcd9f0ffc8802f6da9b2948c0cf..5c9972551e98e4acbd7c15e7366e51bb9f2dc683 100644
--- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-4.0.6.eb
@@ -3,16 +3,16 @@ version = '1.8.1.1'
 
 homepage = 'http://www.doxygen.org'
 description = """Doxygen is a documentation system for C++, C, Java, Objective-C, Python, 
-IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D."""
+ IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D."""
 
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
 sources = ['%(namelower)s-%(version)s.src.tar.gz']
 source_urls = ['http://ftp.stack.nl/pub/users/dimitri/']
 
-dependencies = [
+builddependencies = [
     ('flex', '2.5.35'),
     ('Bison', '2.5'),
-    ]
+]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-4.1.13.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-4.1.13.eb
index 32150d37b14fc3d6a24e56793f514bfc006726a2..a4f03bdb809f54700d7f6e1961efbe357f7db769 100644
--- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-4.1.13.eb
@@ -3,16 +3,16 @@ version = '1.8.1.1'
 
 homepage = 'http://www.doxygen.org'
 description = """Doxygen is a documentation system for C++, C, Java, Objective-C, Python, 
-IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D."""
+ IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D."""
 
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
 sources = ['%(namelower)s-%(version)s.src.tar.gz']
 source_urls = ['http://ftp.stack.nl/pub/users/dimitri/']
 
-dependencies = [
+builddependencies = [
     ('flex', '2.5.35'),
     ('Bison', '2.5'),
-    ]
+]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-5.3.0.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-5.3.0.eb
index 69ca07e3c9e305870f59af058ea20ffa48816239..b2ae051cf0666660e544b39b4f20d7fa754815b4 100644
--- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-5.3.0.eb
@@ -3,16 +3,16 @@ version = '1.8.1.1'
 
 homepage = 'http://www.doxygen.org'
 description = """Doxygen is a documentation system for C++, C, Java, Objective-C, Python, 
-    IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D."""
+ IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D."""
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 sources = ['%(namelower)s-%(version)s.src.tar.gz']
 source_urls = ['http://ftp.stack.nl/pub/users/dimitri/']
 
-dependencies = [
+builddependencies = [
     ('flex', '2.5.35'),
     ('Bison', '2.5'),
-    ]
+]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.2-ictce-4.1.13.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.2-ictce-4.1.13.eb
index 433f76db8e7c8ef2c5ffc6f65dcd9c738acf8e07..feaca896ceab392384a8107e41607fe4724a0d72 100644
--- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.2-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.2-ictce-4.1.13.eb
@@ -3,16 +3,16 @@ version = '1.8.2'
 
 homepage = 'http://www.doxygen.org'
 description = """Doxygen is a documentation system for C++, C, Java, Objective-C, Python, 
-IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D."""
+ IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D."""
 
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
 sources = ['%(namelower)s-%(version)s.src.tar.gz']
 source_urls = ['http://ftp.stack.nl/pub/users/dimitri/']
 
-dependencies = [
+builddependencies = [
     ('flex', '2.5.37'),
     ('Bison', '2.6.5'),
-    ]
+]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.2-ictce-5.3.0.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.2-ictce-5.3.0.eb
index 064fa6f372f614e8a5dd53096a01e634049e1e18..3d9629901c31be4c8ccbe6dcad96152d3669b5c3 100644
--- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.2-ictce-5.3.0.eb
@@ -3,16 +3,16 @@ version = '1.8.2'
 
 homepage = 'http://www.doxygen.org'
 description = """Doxygen is a documentation system for C++, C, Java, Objective-C, Python, 
-    IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D."""
+ IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D."""
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 sources = ['%(namelower)s-%(version)s.src.tar.gz']
 source_urls = ['http://ftp.stack.nl/pub/users/dimitri/']
 
-dependencies = [
+builddependencies = [
     ('flex', '2.5.37'),
     ('Bison', '2.6.5'),
-    ]
+]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-goolf-1.4.10.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-goolf-1.4.10.eb
index 9962c84d1827160cddc0c2a8dd30d12b48d6d3b1..07faae3865b2d3a6788e907ec6065b14ce4878cb 100644
--- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-goolf-1.4.10.eb
@@ -3,14 +3,14 @@ version = '1.8.3.1'
 
 homepage = 'http://www.doxygen.org'
 description = """Doxygen is a documentation system for C++, C, Java, Objective-C, Python, 
-IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D."""
+ IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D."""
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sources = ['%(namelower)s-%(version)s.src.tar.gz']
 source_urls = ['http://ftp.stack.nl/pub/users/dimitri/']
 
-dependencies = [
+builddependencies = [
     ('flex', '2.5.37'),
     ('Bison', '2.7'),
 ]
diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-4.1.13.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-4.1.13.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f58877751123954cd442858b38e3e7630a691513
--- /dev/null
+++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-4.1.13.eb
@@ -0,0 +1,18 @@
+name = 'Doxygen'
+version = '1.8.3.1'
+
+homepage = 'http://www.doxygen.org'
+description = """Doxygen is a documentation system for C++, C, Java, Objective-C, Python, 
+ IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D."""
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+
+sources = ['%(namelower)s-%(version)s.src.tar.gz']
+source_urls = ['http://ftp.stack.nl/pub/users/dimitri/']
+
+builddependencies = [
+    ('flex', '2.5.37'),
+    ('Bison', '2.7'),
+]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-5.3.0.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8194f931b7234c69518fff352c21bfc3268e48e4
--- /dev/null
+++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-5.3.0.eb
@@ -0,0 +1,18 @@
+name = 'Doxygen'
+version = '1.8.3.1'
+
+homepage = 'http://www.doxygen.org'
+description = """Doxygen is a documentation system for C++, C, Java, Objective-C, Python, 
+ IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+sources = ['%(namelower)s-%(version)s.src.tar.gz']
+source_urls = ['http://ftp.stack.nl/pub/users/dimitri/']
+
+dependencies = [
+    ('flex', '2.5.37'),
+    ('Bison', '2.7'),
+]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-5.5.0.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5c549c9f516e6f57984669d711467aa6984f0478
--- /dev/null
+++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-5.5.0.eb
@@ -0,0 +1,18 @@
+name = 'Doxygen'
+version = '1.8.3.1'
+
+homepage = 'http://www.doxygen.org'
+description = """Doxygen is a documentation system for C++, C, Java, Objective-C, Python, 
+ IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+sources = ['%(namelower)s-%(version)s.src.tar.gz']
+source_urls = ['http://ftp.stack.nl/pub/users/dimitri/']
+
+builddependencies = [
+    ('flex', '2.5.37'),
+    ('Bison', '2.7'),
+]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-iqacml-3.7.3.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-iqacml-3.7.3.eb
index a3abb79c1bdf2ad2f06f891f721b1036d6963190..b4ebaf0c87cb374a8072376946747a0134b7b767 100644
--- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-iqacml-3.7.3.eb
+++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-iqacml-3.7.3.eb
@@ -3,16 +3,16 @@ version = '1.8.3.1'
 
 homepage = 'http://www.doxygen.org'
 description = """Doxygen is a documentation system for C++, C, Java, Objective-C, Python, 
-IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D."""
+ IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D."""
 
 toolchain = {'name': 'iqacml', 'version': '3.7.3'}
 
 sources = ['%(namelower)s-%(version)s.src.tar.gz']
 source_urls = ['http://ftp.stack.nl/pub/users/dimitri/']
 
-dependencies = [
+builddependencies = [
     ('flex', '2.5.37'),
     ('Bison', '2.7'),
-    ]
+]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.6-ictce-5.5.0.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.6-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ded4982b00a28461cdd5c2e2a0eb1e9680bd6b36
--- /dev/null
+++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.6-ictce-5.5.0.eb
@@ -0,0 +1,18 @@
+name = 'Doxygen'
+version = '1.8.6'
+
+homepage = 'http://www.doxygen.org'
+description = """Doxygen is a documentation system for C++, C, Java, Objective-C, Python, 
+ IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+sources = ['%(namelower)s-%(version)s.src.tar.gz']
+source_urls = ['http://ftp.stack.nl/pub/users/dimitri/']
+
+builddependencies = [
+    ('flex', '2.5.37'),
+    ('Bison', '2.7.1'),
+]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/e/ECore/ECore-1.5.2.eb b/easybuild/easyconfigs/e/ECore/ECore-1.5.2.eb
index ccb736b20c100476f07b8336ec74287ffb659451..382a1b327eb8c0d8c21a38ba201628f3b7f84b64 100644
--- a/easybuild/easyconfigs/e/ECore/ECore-1.5.2.eb
+++ b/easybuild/easyconfigs/e/ECore/ECore-1.5.2.eb
@@ -8,7 +8,7 @@ description = """The e-Core technology simulates the natural processes of sedime
 
 toolchain = {'name': 'dummy', 'version': 'dummy'}
 
-sources = ['%s-%s.tgz' % (name.lower(), version)]
+sources = [SOURCELOWER_TGZ]
 
 patches = ['ecore-license-var.patch']
 
diff --git a/easybuild/easyconfigs/e/ELPA/ELPA-2013.11-ictce-5.3.0.eb b/easybuild/easyconfigs/e/ELPA/ELPA-2013.11-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c34c5462cb55f1c5c9bfc99af3e98dfa3b7146f3
--- /dev/null
+++ b/easybuild/easyconfigs/e/ELPA/ELPA-2013.11-ictce-5.3.0.eb
@@ -0,0 +1,32 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Authors::   Inge Gutheil <i.gutheil@fz-juelich.de>, Alan O'Cais <a.ocais@fz-juelich.de>
+# License::   MIT/GPL
+# $Id$
+#
+##
+
+name = 'ELPA'
+version = '2013.11'
+
+homepage = 'http://elpa.rzg.mpg.de'
+description = """Eigenvalue SoLvers for Petaflop-Applications ."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'} 
+toolchainopts = {'optarch': True, 'usempi': True}
+
+# download at http://elpa.rzg.mpg.de/elpa-tar-archive
+sources = ['%(name)s_%(version)s.006_20140312.tar.gz']
+
+patches = ['ELPA_fix-tests.patch']
+
+configopts = '--with-generic-simple --disable-shared FCFLAGS="-I$EBROOTIMKL/mkl/include/intel64/lp64 $FCFLAGS" LIBS="$LIBSCALAPACK"'
+makeopts = ' V=1 LIBS="$LIBSCALAPACK"'
+start_dir = '%(name)s_%(version)s'
+
+builddependencies = [('Automake', '1.13.4')]
+
+parallel = 1
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/e/ELPA/ELPA-2013.11-ictce-5.5.0.eb b/easybuild/easyconfigs/e/ELPA/ELPA-2013.11-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..43da6936b9bebbb2e8071030a8bb0a502b0efb90
--- /dev/null
+++ b/easybuild/easyconfigs/e/ELPA/ELPA-2013.11-ictce-5.5.0.eb
@@ -0,0 +1,32 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Authors::   Inge Gutheil <i.gutheil@fz-juelich.de>, Alan O'Cais <a.ocais@fz-juelich.de>
+# License::   MIT/GPL
+# $Id$
+#
+##
+
+name = 'ELPA'
+version = '2013.11'
+
+homepage = 'http://elpa.rzg.mpg.de'
+description = """Eigenvalue SoLvers for Petaflop-Applications ."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'} 
+toolchainopts = {'optarch': True, 'usempi': True}
+
+# download at http://elpa.rzg.mpg.de/elpa-tar-archive
+sources = ['%(name)s_%(version)s.006_20140312.tar.gz']
+
+patches = ['ELPA_fix-tests.patch']
+
+configopts = '--with-generic-simple --disable-shared FCFLAGS="-I$EBROOTIMKL/mkl/include/intel64/lp64 $FCFLAGS" LIBS="$LIBSCALAPACK"'
+makeopts = ' V=1 LIBS="$LIBSCALAPACK"'
+start_dir = '%(name)s_%(version)s'
+
+builddependencies = [('Automake', '1.13.4')]
+
+parallel = 1
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/e/ELPA/ELPA_fix-tests.patch b/easybuild/easyconfigs/e/ELPA/ELPA_fix-tests.patch
new file mode 100644
index 0000000000000000000000000000000000000000..18fa2236a7106d48e0ae613e033fef4b0ed7446e
--- /dev/null
+++ b/easybuild/easyconfigs/e/ELPA/ELPA_fix-tests.patch
@@ -0,0 +1,44 @@
+diff -ru ELPA_2013.11.orig/test/test_complex2.F90 ELPA_2013.11/test/test_complex2.F90
+--- ELPA_2013.11.orig/test/test_complex2.F90	2014-01-29 09:29:35.544248000 +0100
++++ ELPA_2013.11/test/test_complex2.F90	2014-02-21 13:48:09.662072163 +0100
+@@ -79,6 +79,7 @@
+    integer i, mpierr, my_blacs_ctxt, sc_desc(9), info, nprow, npcol
+ 
+    integer, external :: numroc
++   integer           :: iargc
+ 
+    real*8 err, errmax
+    real*8, allocatable :: ev(:), xr(:,:)
+diff -ru ELPA_2013.11.orig/test/test_complex.F90 ELPA_2013.11/test/test_complex.F90
+--- ELPA_2013.11.orig/test/test_complex.F90	2014-01-29 09:29:35.534699000 +0100
++++ ELPA_2013.11/test/test_complex.F90	2014-02-21 13:48:33.118418351 +0100
+@@ -78,6 +78,7 @@
+    integer i, mpierr, my_blacs_ctxt, sc_desc(9), info, nprow, npcol
+ 
+    integer, external :: numroc
++   integer           :: iargc
+ 
+    real*8 err, errmax
+    real*8, allocatable :: ev(:), xr(:,:)
+diff -ru ELPA_2013.11.orig/test/test_real2.F90 ELPA_2013.11/test/test_real2.F90
+--- ELPA_2013.11.orig/test/test_real2.F90	2014-01-29 09:29:35.573319000 +0100
++++ ELPA_2013.11/test/test_real2.F90	2014-02-21 13:48:51.240387595 +0100
+@@ -80,6 +80,7 @@
+    integer i, mpierr, my_blacs_ctxt, sc_desc(9), info, nprow, npcol
+ 
+    integer, external :: numroc
++   integer           :: iargc
+ 
+    real*8 err, errmax
+    real*8, allocatable :: a(:,:), z(:,:), tmp1(:,:), tmp2(:,:), as(:,:), ev(:)
+diff -ru ELPA_2013.11.orig/test/test_real.F90 ELPA_2013.11/test/test_real.F90
+--- ELPA_2013.11.orig/test/test_real.F90	2014-01-29 09:29:35.563829000 +0100
++++ ELPA_2013.11/test/test_real.F90	2014-02-21 13:49:05.466094157 +0100
+@@ -79,6 +79,7 @@
+    integer i, mpierr, my_blacs_ctxt, sc_desc(9), info, nprow, npcol
+ 
+    integer, external :: numroc
++   integer           :: iargc
+ 
+    real*8 err, errmax
+    real*8, allocatable :: a(:,:), z(:,:), tmp1(:,:), tmp2(:,:), as(:,:), ev(:)
diff --git a/easybuild/easyconfigs/e/ESMF/ESMF-6.1.1-ictce-4.1.13.eb b/easybuild/easyconfigs/e/ESMF/ESMF-6.1.1-ictce-4.1.13.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5d118d36982965858cf8e0a7954e61588642708a
--- /dev/null
+++ b/easybuild/easyconfigs/e/ESMF/ESMF-6.1.1-ictce-4.1.13.eb
@@ -0,0 +1,28 @@
+name = 'ESMF'
+version = '6.1.1'
+
+homepage = 'http://sourceforge.net/projects/esmf'
+description = """The Earth System Modeling Framework (ESMF) is software for building and coupling weather,
+ climate, and related models."""
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+toolchainopts = {'usempi': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['%%(namelower)s_%s_src.tar.gz' % '_'.join(version.split('.'))]
+
+patches = ['ESMF-6.1.1_libopts.patch']
+
+dependencies = [
+    ('netCDF', '4.2.1.1', '-mt'),
+    ('netCDF-Fortran', '4.2', '-mt'),
+    ('netCDF-C++', '4.2', '-mt'),
+]
+
+# LDFLAGS has to be unset to avoid linking issues
+preinstallopts = "unset LDFLAGS &&"
+
+# too parallel causes the build to become really slow
+maxparallel = 8
+
+moduleclass = 'geo'
diff --git a/easybuild/easyconfigs/e/ESMF/ESMF-6.1.1_libopts.patch b/easybuild/easyconfigs/e/ESMF/ESMF-6.1.1_libopts.patch
new file mode 100644
index 0000000000000000000000000000000000000000..0d03f780590a4db90e7626da4e1a12552d6d42e0
--- /dev/null
+++ b/easybuild/easyconfigs/e/ESMF/ESMF-6.1.1_libopts.patch
@@ -0,0 +1,11 @@
+--- esmf/build/common.mk.orig	2013-11-26 16:58:50.958274359 +0100
++++ esmf/build/common.mk	2013-11-26 16:59:02.339274158 +0100
+@@ -896,7 +896,7 @@
+ endif
+ ESMF_SL_LIBS_TO_MAKE  = libesmf
+ ESMF_SL_LIBLINKER     = $(ESMF_CXXCOMPILER)
+-ESMF_SL_LIBOPTS      +=
++ESMF_SL_LIBOPTS      += $(ESMF_CXXCOMPILEOPTS)
+ ESMF_SL_LIBLIBS      +=
+ 
+ # - Shared objects
diff --git a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.10.0.eb b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.10.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..99d04a46aab447526b495a1dbdad0526cc5d5890
--- /dev/null
+++ b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.10.0.eb
@@ -0,0 +1,29 @@
+easyblock = 'EB_EasyBuildMeta'
+
+name = 'EasyBuild'
+version = '1.10.0'
+
+homepage = 'http://hpcugent.github.com/easybuild/'
+description = """EasyBuild is a software build and installation framework
+ written in Python that allows you to install software in a structured,
+ repeatable and robust way."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+source_urls = [
+    'http://pypi.python.org/packages/source/e/easybuild-framework/',
+    'http://pypi.python.org/packages/source/e/easybuild-easyblocks/',
+    'http://pypi.python.org/packages/source/e/easybuild-easyconfigs/',
+]
+# order matters a lot, to avoid having dependencies auto-resolved (--no-deps easy_install option doesn't work?)
+sources = [
+    'easybuild-framework-%(version)s.tar.gz',
+    'easybuild-easyblocks-%(version)s.tar.gz',
+    'easybuild-easyconfigs-%(version)s.0.tar.gz',
+]
+
+# EasyBuild is a (set of) Python packages, so it depends on Python
+# usually, we want to use the system Python, so no actual Python dependency is listed
+allow_system_deps = [('Python', SYS_PYTHON_VERSION)]
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.7.0.eb b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.7.0.eb
index dc75cc5bc654e70cbd9b6e9757cefbad2dbfdbc4..39be41a74ebd3175635324feb7f18aa08b355042 100644
--- a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.7.0.eb
+++ b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.7.0.eb
@@ -5,8 +5,8 @@ version = '1.7.0'
 
 homepage = 'http://hpcugent.github.com/easybuild/'
 description = """EasyBuild is a software build and installation framework
-  written in Python that allows you to install software in a structured,
-repeatable and robust way."""
+ written in Python that allows you to install software in a structured,
+ repeatable and robust way."""
 
 toolchain = {'name': 'dummy', 'version': 'dummy'}
 
diff --git a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.0.eb b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.0.eb
index 4474ca43e898aab46079c9688a17756ac8f79387..1fe6136b55a969255b458f2e7972d6b016cff1ed 100644
--- a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.0.eb
+++ b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.0.eb
@@ -5,8 +5,8 @@ version = '1.8.0'
 
 homepage = 'http://hpcugent.github.com/easybuild/'
 description = """EasyBuild is a software build and installation framework
-  written in Python that allows you to install software in a structured,
-repeatable and robust way."""
+ written in Python that allows you to install software in a structured,
+ repeatable and robust way."""
 
 toolchain = {'name': 'dummy', 'version': 'dummy'}
 
diff --git a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.1.eb b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.1.eb
index 59a2b57db8f1c4eda64252845bb7e483fc862849..629ec16acb28b00074b69dcd9c8484bad2f495a9 100644
--- a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.1.eb
+++ b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.1.eb
@@ -5,8 +5,8 @@ version = '1.8.1'
 
 homepage = 'http://hpcugent.github.com/easybuild/'
 description = """EasyBuild is a software build and installation framework
-  written in Python that allows you to install software in a structured,
-repeatable and robust way."""
+ written in Python that allows you to install software in a structured,
+ repeatable and robust way."""
 
 toolchain = {'name': 'dummy', 'version': 'dummy'}
 
diff --git a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.2.eb b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.2.eb
index 13f2a0d29429afd4a85fe5e93b7c0be0854ee1c7..15551872f9edf4b22127e5c9ed6cbfdb94d00d39 100644
--- a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.2.eb
+++ b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.8.2.eb
@@ -5,8 +5,8 @@ version = '1.8.2'
 
 homepage = 'http://hpcugent.github.com/easybuild/'
 description = """EasyBuild is a software build and installation framework
-  written in Python that allows you to install software in a structured,
-repeatable and robust way."""
+ written in Python that allows you to install software in a structured,
+ repeatable and robust way."""
 
 toolchain = {'name': 'dummy', 'version': 'dummy'}
 
diff --git a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.9.0.eb b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.9.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4047b507602a697bf75b094f41da40f6c206d448
--- /dev/null
+++ b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-1.9.0.eb
@@ -0,0 +1,29 @@
+easyblock = 'EB_EasyBuildMeta'
+
+name = 'EasyBuild'
+version = '1.9.0'
+
+homepage = 'http://hpcugent.github.com/easybuild/'
+description = """EasyBuild is a software build and installation framework
+ written in Python that allows you to install software in a structured,
+ repeatable and robust way."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+source_urls = [
+    'http://pypi.python.org/packages/source/e/easybuild-framework/',
+    'http://pypi.python.org/packages/source/e/easybuild-easyblocks/',
+    'http://pypi.python.org/packages/source/e/easybuild-easyconfigs/',
+]
+# order matters a lot, to avoid having dependencies auto-resolved (--no-deps easy_install option doesn't work?)
+sources = [
+    'easybuild-framework-%(version)s.tar.gz',
+    'easybuild-easyblocks-%(version)s.tar.gz',
+    'easybuild-easyconfigs-%(version)s.0.tar.gz',
+]
+
+# EasyBuild is a (set of) Python packages, so it depends on Python
+# usually, we want to use the system Python, so no actual Python dependency is listed
+allow_system_deps = [('Python', SYS_PYTHON_VERSION)]
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-goalf-1.1.0-no-OFED.eb
index 13621d0cd04eb1ba850831c234c7b81dae438dce..2b998a05e253fe6a330e2f679334f42197c0e09e 100644
--- a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-goalf-1.1.0-no-OFED.eb
@@ -21,6 +21,6 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 toolchainopts = {'optarch': True, 'pic': True}
 
 source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get']
-sources = ['%s.tar.bz2' % version]
+sources = ['%(version)s.tar.bz2']
 
 moduleclass = 'math'
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-goolf-1.4.10.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-goolf-1.4.10.eb
index 3d05ff2d7e538608c12534b6d4d583fede3f805b..958a558f7da35a69b1866d65f921d94f7e9ee2da 100644
--- a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-goolf-1.4.10.eb
@@ -21,6 +21,6 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'optarch': True, 'pic': True}
 
 source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get']
-sources = ['%s.tar.bz2' % version]
+sources = ['%(version)s.tar.bz2']
 
 moduleclass = 'math'
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-4.0.6.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-4.0.6.eb
index 9722706459c3e7c8f39cb3852f5e84ddc3be2640..1b2199f7add3ba45a6bb9810654c7fc14fa22959 100644
--- a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-4.0.6.eb
@@ -21,6 +21,6 @@ toolchain = {'name': 'ictce', 'version': '4.0.6'}
 toolchainopts = {'optarch': True, 'pic': True}
 
 source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get']
-sources = ['%s.tar.bz2' % version]
+sources = ['%(version)s.tar.bz2']
 
 moduleclass = 'math'
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-5.3.0.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-5.3.0.eb
index 8827e2e91a6dd37c08e2734e76ba3aca3dd3e847..3c1a34a84a010e1c25a3afba45c9aa31b2b74647 100644
--- a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-5.3.0.eb
@@ -22,6 +22,6 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'}
 toolchainopts = {'optarch': True, 'pic': True}
 
 source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get']
-sources = ['%s.tar.bz2' % version]
+sources = ['%(version)s.tar.bz2']
 
 moduleclass = 'math'
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goalf-1.5.12-no-OFED.eb
index fae87489f0becf4a53ebb9ac4b675eb14ace8c69..5eb47f9b01d60406d5ded14d80b89d9b75276e07 100644
--- a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goalf-1.5.12-no-OFED.eb
+++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goalf-1.5.12-no-OFED.eb
@@ -21,6 +21,6 @@ toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'}
 toolchainopts = {'optarch': True, 'pic': True}
 
 source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get']
-sources = ['%s.tar.bz2' % version]
+sources = ['%(version)s.tar.bz2']
 
 moduleclass = 'math'
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goolf-1.4.10.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..41829c8d56d5f65c7fe30d8260d044d1555b7466
--- /dev/null
+++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goolf-1.4.10.eb
@@ -0,0 +1,26 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine
+# Authors::   Cedric Laczny <cedric.laczny@uni.lu>, Fotis Georgatos <fotis.georgatos@uni.lu>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html
+##
+
+name = 'Eigen'
+version = '3.1.4'
+
+homepage = 'http://eigen.tuxfamily.org/index.php?title=Main_Page'
+description = """Eigen is a C++ template library for linear algebra:
+ matrices, vectors, numerical solvers, and related algorithms."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get']
+sources = ['%(version)s.tar.bz2']
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-4.1.13.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-4.1.13.eb
new file mode 100644
index 0000000000000000000000000000000000000000..da3a06f00f3318e41dde819cdf5e819a6d1c0510
--- /dev/null
+++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-4.1.13.eb
@@ -0,0 +1,26 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine
+# Authors::   Cedric Laczny <cedric.laczny@uni.lu>, Fotis Georgatos <fotis.georgatos@uni.lu>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html
+##
+
+name = 'Eigen'
+version = '3.1.4'
+
+homepage = 'http://eigen.tuxfamily.org/index.php?title=Main_Page'
+description = """Eigen is a C++ template library for linear algebra:
+ matrices, vectors, numerical solvers, and related algorithms."""
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get']
+sources = ['%(version)s.tar.bz2']
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-5.3.0.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0d4662d6931e63896f44a1230a951eeeba591b2e
--- /dev/null
+++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-5.3.0.eb
@@ -0,0 +1,26 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine
+# Authors::   Cedric Laczny <cedric.laczny@uni.lu>, Fotis Georgatos <fotis.georgatos@uni.lu>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html
+##
+
+name = 'Eigen'
+version = '3.1.4'
+
+homepage = 'http://eigen.tuxfamily.org/index.php?title=Main_Page'
+description = """Eigen is a C++ template library for linear algebra:
+ matrices, vectors, numerical solvers, and related algorithms."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get']
+sources = ['%(version)s.tar.bz2']
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.2.0-ictce-5.5.0.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.2.0-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fb8adaa95fe0a853467649acfe05d2c3dd625036
--- /dev/null
+++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.2.0-ictce-5.5.0.eb
@@ -0,0 +1,26 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine
+# Authors::   Cedric Laczny <cedric.laczny@uni.lu>, Fotis Georgatos <fotis.georgatos@uni.lu>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html
+##
+
+name = 'Eigen'
+version = '3.2.0'
+
+homepage = 'http://eigen.tuxfamily.org/index.php?title=Main_Page'
+description = """Eigen is a C++ template library for linear algebra:
+ matrices, vectors, numerical solvers, and related algorithms."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get']
+sources = ['%(version)s.tar.bz2']
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-GCC-4.7.2-no-Java.eb b/easybuild/easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-GCC-4.7.2-no-Java.eb
new file mode 100644
index 0000000000000000000000000000000000000000..84aa14f3cbec3b33c323baabd20dcc6577c68b90
--- /dev/null
+++ b/easybuild/easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-GCC-4.7.2-no-Java.eb
@@ -0,0 +1,20 @@
+name = 'ErlangOTP'
+version = 'R16B02'
+versionsuffix = "-no-Java"
+
+homepage = 'http://www.erlang.org/'
+description = """Erlang is a general-purpose concurrent, garbage-collected programming language and runtime system."""
+
+toolchain = {'name': 'GCC', 'version': '4.7.2'}
+
+sources = ['otp_src_%(version)s.tar.gz']
+source_urls = ['http://www.erlang.org/download']
+
+configopts = '--without-javac '
+
+sanity_check_paths = {
+    'files': ['bin/erl'],
+    'dirs': ['lib/erlang/bin', 'lib/erlang/lib'], 
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-GCC-4.7.2.eb b/easybuild/easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-GCC-4.7.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..14f196cbec17dd18670ac1b2142725621fe586ab
--- /dev/null
+++ b/easybuild/easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-GCC-4.7.2.eb
@@ -0,0 +1,21 @@
+name = 'ErlangOTP'
+version = 'R16B02'
+
+homepage = 'http://www.erlang.org/'
+description = """Erlang is a general-purpose concurrent, garbage-collected programming language and runtime system."""
+
+toolchain = {'name': 'GCC', 'version': '4.7.2'}
+
+sources = ['otp_src_%(version)s.tar.gz']
+source_urls = ['http://www.erlang.org/download']
+
+builddependencies = [('Java','1.7.0_45','',True)]
+
+configopts = '--with-javac '
+
+sanity_check_paths = {
+    'files': ['bin/erl'],
+    'dirs': ['lib/erlang/bin', 'lib/erlang/lib', 'lib/erlang/lib/jinterface-1.5.8'],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-goolf-1.4.10-no-Java.eb b/easybuild/easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-goolf-1.4.10-no-Java.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6f89ce5300b503c31d65a3db4bf4eb14c8dd6e92
--- /dev/null
+++ b/easybuild/easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-goolf-1.4.10-no-Java.eb
@@ -0,0 +1,35 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine
+# Authors::   Fotis Georgatos <fotis.georgatos@uni.lu>
+# License::   MIT/GPL
+# $Id$
+##
+
+name = "ErlangOTP"
+version = "R16B02"
+versionsuffix = "-no-Java"
+
+homepage = 'http://www.erlang.org/'
+description = """Erlang is a programming language used to build massively scalable
+ soft real-time systems with requirements on high availability. Some of its uses are
+ in telecoms, banking, e-commerce, computer telephony and instant messaging. Erlang's
+ runtime system has built-in support for concurrency, distribution and fault tolerance."""
+
+toolchain = {'version': '1.4.10', 'name': 'goolf'}
+
+sources = ['otp_src_%(version)s.tar.gz']
+source_urls = ['http://www.erlang.org/download/']
+
+configopts = ' --without-javac '
+
+builddependencies = [('Autoconf', '2.69')]
+dependencies = [('ncurses', '5.9')]
+
+sanity_check_paths = {
+    'files': ["bin/erl", "bin/erlc"],
+    'dirs': []
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/e/eXpress/eXpress-1.5.1-goolf-1.4.10.eb b/easybuild/easyconfigs/e/eXpress/eXpress-1.5.1-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..eb6680d2d69afb75d0f4d3ba41252280cc312eb0
--- /dev/null
+++ b/easybuild/easyconfigs/e/eXpress/eXpress-1.5.1-goolf-1.4.10.eb
@@ -0,0 +1,42 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+easyblock = "CMakeMake"
+
+name = "eXpress"
+version = "1.5.1"
+
+homepage = 'http://bio.math.berkeley.edu/eXpress/index.html'
+description = """ eXpress is a streaming tool for quantifying the abundances of a set 
+ of target sequences from sampled subsequences. Example applications include transcript-level 
+ RNA-Seq quantification, allele-specific/haplotype expression analysis (from RNA-Seq), 
+ transcription factor binding quantification in ChIP-Seq, and analysis of metagenomic data."""
+
+toolchain = {'version': '1.4.10', 'name': 'goolf'}
+
+sources = ['%(namelower)s-%(version)s-src.tgz']
+source_urls = ['http://bio.math.berkeley.edu/eXpress/downloads/%(namelower)s-%(version)s/']
+
+builddependencies = [
+    ('CMake', '2.8.12'),
+    ('BamTools', '2.2.3')
+]
+
+dependencies = [
+    ('Boost', '1.51.0'), # Boost-1.53.0 not working?
+    ('gperftools', '2.1'),
+    ('protobuf', '2.5.0')
+]
+
+separate_build_dir = True
+
+patches = ['eXpress-1.5.1-libbamtools.patch']
+
+sanity_check_paths = {
+    'files': ["bin/express"],
+    'dirs': [""]
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/e/eXpress/eXpress-1.5.1-libbamtools.patch b/easybuild/easyconfigs/e/eXpress/eXpress-1.5.1-libbamtools.patch
new file mode 100644
index 0000000000000000000000000000000000000000..4c807adfecbe31f9368bab655f44ed0d68814112
--- /dev/null
+++ b/easybuild/easyconfigs/e/eXpress/eXpress-1.5.1-libbamtools.patch
@@ -0,0 +1,11 @@
+--- express-1.5.1-src.orig/src/CMakeLists.txt	2013-12-08 20:09:18.000000000 +0100
++++ express-1.5.1-src/src/CMakeLists.txt	2014-03-27 23:09:17.014311307 +0100
+@@ -16,7 +16,7 @@
+ if(WIN32)
+   set(LIBRARIES ${LIBRARIES} "${CMAKE_CURRENT_SOURCE_DIR}/../bamtools/lib/libbamtools.lib" "${CMAKE_CURRENT_SOURCE_DIR}/../win_build/zlibd.lib")
+ else(WIN32)
+-  set(LIBRARIES ${LIBRARIES} "${CMAKE_CURRENT_SOURCE_DIR}/../bamtools/lib/libbamtools.a" "pthread")
++  set(LIBRARIES ${LIBRARIES} "$ENV{EBROOTBAMTOOLS}/lib/libbamtools.a" "pthread")
+ endif(WIN32)
+ 
+ if (PROTOBUF_FOUND)
diff --git a/easybuild/easyconfigs/e/ed/ed-1.9-goolf-1.4.10.eb b/easybuild/easyconfigs/e/ed/ed-1.9-goolf-1.4.10.eb
index 9dcd73edef72f23aa219bc116de13a7108e5969f..6cb5d154dff2a97000be16c67d36c4ec66e0aea4 100644
--- a/easybuild/easyconfigs/e/ed/ed-1.9-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/e/ed/ed-1.9-goolf-1.4.10.eb
@@ -7,7 +7,7 @@ description = """GNU ed is a line-oriented text editor."""
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://ftpmirror.gnu.org/%(name)s/']
+source_urls = [GNU_SOURCE]
 
 sanity_check_paths = {
     'files' : ['bin/ed'],
diff --git a/easybuild/easyconfigs/e/ed/ed-1.9-ictce-5.3.0.eb b/easybuild/easyconfigs/e/ed/ed-1.9-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e2bb71d26bc7fadc4dc224abd0eb8925b105fa07
--- /dev/null
+++ b/easybuild/easyconfigs/e/ed/ed-1.9-ictce-5.3.0.eb
@@ -0,0 +1,17 @@
+name = 'ed'
+version = '1.9'
+
+homepage = 'http://www.gnu.org/software/ed/ed.html'
+description = """GNU ed is a line-oriented text editor."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://ftpmirror.gnu.org/%(name)s/']
+
+sanity_check_paths = {
+    'files' : ['bin/ed'],
+    'dirs' : [],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.14-goolf-1.4.10.eb b/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.14-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d529b00f9604b4202d064252caf5e7ce6a74d97a
--- /dev/null
+++ b/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.14-goolf-1.4.10.eb
@@ -0,0 +1,43 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine
+# Authors::   Cedric Laczny <cedric.laczny@uni.lu>, Fotis Georgatos <fotis.georgatos@uni.lu>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html
+##
+
+name = 'FASTX-Toolkit'
+version = '0.0.14'
+
+homepage = 'http://hannonlab.cshl.edu/fastx_toolkit/'
+description = """The FASTX-Toolkit is a collection of command line tools for 
+ Short-Reads FASTA/FASTQ files preprocessing."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+altname = name.lower().replace('-','_')
+source_urls = ['https://github.com/agordon/fastx_toolkit/releases/download/%(version)s']
+sources = ['%s-%%(version)s.tar.bz2' % altname]
+
+dependencies = [('libgtextutils', '0.6.1')];
+
+sanity_check_paths = {
+    'files': 
+        ['bin/fastx_%s' % x for x in 
+            ['clipper', 'trimmer', 'quality_stats', 'artifacts_filter', 'reverse_complement',
+            'collapser', 'uncollapser', 'renamer', 'barcode_splitter.pl', 'nucleotide_distribution_graph.sh',
+            'nucleotide_distribution_line_graph.sh']] + 
+        ['bin/fasta_%s' % x for x in 
+            ['clipping_histogram.pl', 'formatter', 'nucleotide_changer']] +
+        ['bin/fastq_%s' % x for x in 
+            ['quality_boxplot_graph.sh', 'quality_converter', 'to_fasta', 'quality_filter', 
+            'quality_trimmer', 'masker']],
+    'dirs': ['.']
+    }
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.4.10-no-OFED.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.4.10-no-OFED.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7e4ef9ffc45147ba49ce0d48e2a9ef4eaf93c74e
--- /dev/null
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.4.10-no-OFED.eb
@@ -0,0 +1,32 @@
+name = 'FFTW'
+version = '3.3.3'
+
+homepage = 'http://www.fftw.org'
+description = """FFTW is a C subroutine library for computing the discrete Fourier transform (DFT)
+ in one or more dimensions, of arbitrary input size, and of both real and complex data."""
+
+toolchain = {'name': 'gompi', 'version': '1.4.10-no-OFED'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [homepage]
+
+common_configopts = "--enable-openmp --with-pic"
+
+configopts = [
+    common_configopts + " --enable-single --enable-sse2 --enable-mpi",
+    common_configopts + " --enable-long-double --enable-mpi",
+    common_configopts + " --enable-quad-precision",
+    common_configopts + " --enable-sse2 --enable-mpi",  # default as last
+]
+
+sanity_check_paths = {
+    'files': ['bin/fftw%s' % x for x in ['-wisdom', '-wisdom-to-conf', 'f-wisdom', 'l-wisdom', 'q-wisdom']] +
+             ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03',
+                                              '.h', 'l-mpi.f03', 'l.f03', 'q.f03']] +
+             ['lib/libfftw3%s.a' % x for x in ['', '_mpi', '_omp', 'f', 'f_mpi', 'f_omp',
+                                               'l', 'l_mpi', 'l_omp', 'q', 'q_omp']],
+    'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompic-2.6.10.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompic-2.6.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e3193217ca3c6ea56650bc6ed38a162a7520d24d
--- /dev/null
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompic-2.6.10.eb
@@ -0,0 +1,32 @@
+name = 'FFTW'
+version = '3.3.3'
+
+homepage = 'http://www.fftw.org'
+description = """FFTW is a C subroutine library for computing the discrete Fourier transform (DFT)
+ in one or more dimensions, of arbitrary input size, and of both real and complex data."""
+
+toolchain = {'name': 'gompic', 'version': '2.6.10'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [homepage]
+
+common_configopts = "--enable-openmp --with-pic"
+
+configopts = [
+    common_configopts + " --enable-single --enable-sse2 --enable-mpi",
+    common_configopts + " --enable-long-double --enable-mpi",
+    common_configopts + " --enable-quad-precision",
+    common_configopts + " --enable-sse2 --enable-mpi",  # default as last
+]
+
+sanity_check_paths = {
+    'files': ['bin/fftw%s' % x for x in ['-wisdom', '-wisdom-to-conf', 'f-wisdom', 'l-wisdom', 'q-wisdom']] +
+             ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03',
+                                              '.h', 'l-mpi.f03', 'l.f03', 'q.f03']] +
+             ['lib/libfftw3%s.a' % x for x in ['', '_mpi', '_omp', 'f', 'f_mpi', 'f_omp',
+                                               'l', 'l_mpi', 'l_omp', 'q', 'q_omp']],
+    'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-ictce-5.5.0.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0ae947ce7f119cb6ce29e08f2164d3252cfb7cfa
--- /dev/null
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-ictce-5.5.0.eb
@@ -0,0 +1,32 @@
+name = 'FFTW'
+version = '3.3.3'
+
+homepage = 'http://www.fftw.org'
+description = """FFTW is a C subroutine library for computing the discrete Fourier transform (DFT)
+ in one or more dimensions, of arbitrary input size, and of both real and complex data."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [homepage]
+
+common_configopts = "--enable-openmp --with-pic"
+
+# no quad precision, requires GCC v4.6 or higher
+configopts = [
+    common_configopts + " --enable-single --enable-sse2 --enable-mpi",
+    common_configopts + " --enable-long-double --enable-mpi",
+    common_configopts + " --enable-sse2 --enable-mpi",  # default as last
+]
+
+sanity_check_paths = {
+    'files': ['bin/fftw%s' % x for x in ['-wisdom', '-wisdom-to-conf', 'f-wisdom', 'l-wisdom']] +
+             ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03',
+                                              '.h', 'l-mpi.f03', 'l.f03', 'q.f03']] +
+             ['lib/libfftw3%s.a' % x for x in ['', '_mpi', '_omp', 'f', 'f_mpi', 'f_omp',
+                                               'l', 'l_mpi', 'l_omp']],
+    'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.5.14-no-OFED.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.5.14-no-OFED.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6c4efd7f748cd450a53208db444d2f85ce34fe68
--- /dev/null
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.5.14-no-OFED.eb
@@ -0,0 +1,32 @@
+name = 'FFTW'
+version = '3.3.4'
+
+homepage = 'http://www.fftw.org'
+description = """FFTW is a C subroutine library for computing the discrete Fourier transform (DFT)
+ in one or more dimensions, of arbitrary input size, and of both real and complex data."""
+
+toolchain = {'name': 'gompi', 'version': '1.5.14-no-OFED'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [homepage]
+
+common_configopts = "--enable-openmp --with-pic"
+
+configopts = [
+    common_configopts + " --enable-single --enable-sse2 --enable-mpi",
+    common_configopts + " --enable-long-double --enable-mpi",
+    common_configopts + " --enable-quad-precision",
+    common_configopts + " --enable-sse2 --enable-mpi",  # default as last
+]
+
+sanity_check_paths = {
+    'files': ['bin/fftw%s' % x for x in ['-wisdom', '-wisdom-to-conf', 'f-wisdom', 'l-wisdom', 'q-wisdom']] +
+             ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03',
+                                              '.h', 'l-mpi.f03', 'l.f03', 'q.f03']] +
+             ['lib/libfftw3%s.a' % x for x in ['', '_mpi', '_omp', 'f', 'f_mpi', 'f_omp',
+                                               'l', 'l_mpi', 'l_omp', 'q', 'q_omp']],
+    'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.5.14.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.5.14.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1cf9159796131d2a5747b33a2ca33aff10489215
--- /dev/null
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.5.14.eb
@@ -0,0 +1,32 @@
+name = 'FFTW'
+version = '3.3.4'
+
+homepage = 'http://www.fftw.org'
+description = """FFTW is a C subroutine library for computing the discrete Fourier transform (DFT)
+ in one or more dimensions, of arbitrary input size, and of both real and complex data."""
+
+toolchain = {'name': 'gompi', 'version': '1.5.14'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [homepage]
+
+common_configopts = "--enable-openmp --with-pic"
+
+configopts = [
+    common_configopts + " --enable-single --enable-sse2 --enable-mpi",
+    common_configopts + " --enable-long-double --enable-mpi",
+    common_configopts + " --enable-quad-precision",
+    common_configopts + " --enable-sse2 --enable-mpi",  # default as last
+]
+
+sanity_check_paths = {
+    'files': ['bin/fftw%s' % x for x in ['-wisdom', '-wisdom-to-conf', 'f-wisdom', 'l-wisdom', 'q-wisdom']] +
+             ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03',
+                                              '.h', 'l-mpi.f03', 'l.f03', 'q.f03']] +
+             ['lib/libfftw3%s.a' % x for x in ['', '_mpi', '_omp', 'f', 'f_mpi', 'f_omp',
+                                               'l', 'l_mpi', 'l_omp', 'q', 'q_omp']],
+    'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/f/FIAT/FIAT-1.1-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/f/FIAT/FIAT-1.1-ictce-5.3.0-Python-2.7.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c1e3ad55f7351f41e264b21ce8c1917c4038d846
--- /dev/null
+++ b/easybuild/easyconfigs/f/FIAT/FIAT-1.1-ictce-5.3.0-Python-2.7.3.eb
@@ -0,0 +1,34 @@
+easyblock = "PythonPackage"
+
+name = 'FIAT'
+version = '1.1'
+
+homepage = 'https://launchpad.net/fiat'
+description = """The FInite element Automatic Tabulator FIAT supports generation of arbitrary order
+instances of the Lagrange elements on lines, triangles, and tetrahedra. It is also capable of generating
+arbitrary order instances of Jacobi-type quadrature rules on the same element shapes."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = ['https://launchpad.net/%(namelower)s/%(version_major_minor)s.x/release-%(version_major_minor)s/+download/']
+sources = [SOURCELOWER_TAR_GZ]
+
+python = "Python"
+pythonversion = '2.7.3'
+pythonshortversion = ".".join(pythonversion.split(".")[:-1])
+
+versionsuffix = "-%s-%s" % (python, pythonversion)
+
+dependencies = [
+    (python, pythonversion),
+    ('ScientificPython', '2.8', versionsuffix),
+]
+
+options = {'modulename': name}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%s/site-packages/FIAT' % pythonshortversion],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/f/FLTK/FLTK-1.3.2-ictce-5.3.0.eb b/easybuild/easyconfigs/f/FLTK/FLTK-1.3.2-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..97c39edc102311373f41374e779870d161184941
--- /dev/null
+++ b/easybuild/easyconfigs/f/FLTK/FLTK-1.3.2-ictce-5.3.0.eb
@@ -0,0 +1,27 @@
+#
+# author: Dina Mahmoud Ibrahim ( Cairo University )
+#
+name = 'FLTK'
+version = '1.3.2'
+
+homepage = 'http://www.fltk.org'
+description = """FLTK is a cross-platform C++ GUI toolkit for UNIX/Linux (X11), Microsoft Windows,
+ and MacOS X. FLTK provides modern GUI functionality without the bloat and supports 3D graphics via OpenGL
+ and its built-in GLUT emulation."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+sources = ['%(namelower)s-%(version)s-source.tar.gz']
+source_urls = ['http://fltk.org/pub/%(namelower)s/%(version)s/']
+
+dependencies = [
+    ('Tcl', '8.5.12'),
+    ('Tk', '8.5.12'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/fltk-config','bin/fluid'],
+    'dirs': ['lib'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/f/FSL/FSL-5.0.4-ictce-5.3.0.eb b/easybuild/easyconfigs/f/FSL/FSL-5.0.4-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..295efc5d977aea257ebf92cdfd3f7c7fb04791f6
--- /dev/null
+++ b/easybuild/easyconfigs/f/FSL/FSL-5.0.4-ictce-5.3.0.eb
@@ -0,0 +1,26 @@
+name = 'FSL'
+version = '5.0.4'
+
+homepage = 'http://www.fmrib.ox.ac.uk/fsl/'
+description = """FSL is a comprehensive library of analysis tools for FMRI, MRI and DTI brain imaging data."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = ["http://www.fmrib.ox.ac.uk/fsldownloads/"]
+sources = ['%(namelower)s-%(version)s-sources.tar.gz']
+
+patches = [
+    'FSL-%(version)s_makefile_fixes.patch',
+    'FSL-%(version)s_ictce-wd803.patch',
+    'FSL_icc_nan-inf_fix.patch',
+]
+
+dependencies = [
+    ('freeglut', '2.8.1'),
+    ('expat', '2.1.0'),
+]
+
+# libX11-devel is required for X11/Xlib.h, required by tk build
+osdependencies = ['libX11-devel']
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/f/FSL/FSL-5.0.4_makefile_fixes.patch b/easybuild/easyconfigs/f/FSL/FSL-5.0.4_makefile_fixes.patch
index eafc838d18f7f0c891fe51fafe7db6c8e745ed00..7a7959c00bb05b83999fca95f171f3ff757af4a0 100644
--- a/easybuild/easyconfigs/f/FSL/FSL-5.0.4_makefile_fixes.patch
+++ b/easybuild/easyconfigs/f/FSL/FSL-5.0.4_makefile_fixes.patch
@@ -7,8 +7,36 @@ diff -ru fsl.orig/config/apple-darwin10-gcc4.2/systemvars.mk fsl/config/apple-da
  
 -CC = cc
 -CXX = c++
-+CC ?= cc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
+ CSTATICFLAGS = 
+ CXXSTATICFLAGS = 
+ 
+diff -ru fsl.orig/config/apple-darwin11-gcc4.2/systemvars.mk fsl/config/apple-darwin11-gcc4.2/systemvars.mk
+--- fsl.orig/config/apple-darwin11-gcc4.2/systemvars.mk	2009-11-03 18:02:14.000000000 +0100
++++ fsl/config/apple-darwin11-gcc4.2/systemvars.mk	2013-05-14 22:43:15.344366000 +0200
+@@ -3,8 +3,8 @@
+ 
+ # Compiler dependent variables
+ 
+-CC = gcc
+-CXX = g++
++CC := ${CC}
++CXX := ${CXX}
+ CSTATICFLAGS = 
+ CXXSTATICFLAGS = 
+ 
+diff -ru fsl.orig/config/apple-darwin12-gcc4.2/systemvars.mk fsl/config/apple-darwin12-gcc4.2/systemvars.mk
+--- fsl.orig/config/apple-darwin12-gcc4.2/systemvars.mk	2009-11-03 18:02:14.000000000 +0100
++++ fsl/config/apple-darwin12-gcc4.2/systemvars.mk	2013-05-14 22:43:15.344366000 +0200
+@@ -3,8 +3,8 @@
+ 
+ # Compiler dependent variables
+ 
+-CC = gcc
+-CXX = g++
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = 
  CXXSTATICFLAGS = 
  
@@ -21,8 +49,8 @@ diff -ru fsl.orig/config/apple-darwin7-gcc3.1/systemvars.mk fsl/config/apple-dar
  
 -CC = cc
 -CXX = c++
-+CC ?= cc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = 
  CXXSTATICFLAGS = 
  
@@ -35,8 +63,8 @@ diff -ru fsl.orig/config/apple-darwin7-gcc3.3/systemvars.mk fsl/config/apple-dar
  
 -CC = cc
 -CXX = c++
-+CC ?= cc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = 
  CXXSTATICFLAGS = 
  
@@ -49,8 +77,8 @@ diff -ru fsl.orig/config/apple-darwin8-gcc4.0/systemvars.mk fsl/config/apple-dar
  
 -CC = cc
 -CXX = c++
-+CC ?= cc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = 
  CXXSTATICFLAGS = 
  
@@ -63,8 +91,8 @@ diff -ru fsl.orig/config/apple-darwin9-gcc4.0/systemvars.mk fsl/config/apple-dar
  
 -CC = cc
 -CXX = c++
-+CC ?= cc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = 
  CXXSTATICFLAGS = 
  
@@ -77,8 +105,8 @@ diff -ru fsl.orig/config/generic/systemvars.mk fsl/config/generic/systemvars.mk
  
 -CC = gcc
 -CXX = c++
-+CC ?= gcc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = -static
  CXXSTATICFLAGS = -static
  
@@ -91,8 +119,8 @@ diff -ru fsl.orig/config/i686-pc-cygwin-gcc3.2/systemvars.mk fsl/config/i686-pc-
  
 -CC = gcc-2
 -CXX = c++-2
-+CC ?= gcc-2
-+CXX ?= c++-2
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = -static
  CXXSTATICFLAGS = -static
  
@@ -105,8 +133,8 @@ diff -ru fsl.orig/config/i686-pc-cygwin-gcc3.3/systemvars.mk fsl/config/i686-pc-
  
 -CC = gcc
 -CXX = c++
-+CC ?= gcc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = -static
  CXXSTATICFLAGS = -static
  
@@ -119,8 +147,8 @@ diff -ru fsl.orig/config/i686-pc-cygwin-gcc3.4/systemvars.mk fsl/config/i686-pc-
  
 -CC = gcc
 -CXX = c++
-+CC ?= gcc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = -static
  CXXSTATICFLAGS = -static
  
@@ -133,8 +161,8 @@ diff -ru fsl.orig/config/linux_32-gcc2.96/systemvars.mk fsl/config/linux_32-gcc2
  
 -CC = gcc
 -CXX = c++
-+CC ?= gcc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = -static
  CXXSTATICFLAGS = -static
  
@@ -147,8 +175,8 @@ diff -ru fsl.orig/config/linux_32-gcc3.2/systemvars.mk fsl/config/linux_32-gcc3.
  
 -CC = gcc
 -CXX = c++
-+CC ?= gcc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = -static
  CXXSTATICFLAGS = -static
  
@@ -161,8 +189,8 @@ diff -ru fsl.orig/config/linux_32-gcc3.3/systemvars.mk fsl/config/linux_32-gcc3.
  
 -CC = gcc
 -CXX = c++
-+CC ?= gcc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = -static
  CXXSTATICFLAGS = -static
  
@@ -175,8 +203,8 @@ diff -ru fsl.orig/config/linux_32-gcc3.4/systemvars.mk fsl/config/linux_32-gcc3.
  
 -CC = gcc
 -CXX = c++
-+CC ?= gcc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = -static
  CXXSTATICFLAGS = -static
  
@@ -189,8 +217,8 @@ diff -ru fsl.orig/config/linux_32-gcc4.0/systemvars.mk fsl/config/linux_32-gcc4.
  
 -CC = gcc
 -CXX = c++
-+CC ?= gcc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = -static
  CXXSTATICFLAGS = -static
  
@@ -203,8 +231,8 @@ diff -ru fsl.orig/config/linux_32-gcc4.1/systemvars.mk fsl/config/linux_32-gcc4.
  
 -CC = gcc
 -CXX = c++
-+CC ?= gcc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = -static
  CXXSTATICFLAGS = -static
  
@@ -217,8 +245,8 @@ diff -ru fsl.orig/config/linux_64-gcc3.4/systemvars.mk fsl/config/linux_64-gcc3.
  
 -CC = gcc
 -CXX = c++
-+CC ?= gcc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = -static
  CXXSTATICFLAGS = -static
  
@@ -231,8 +259,8 @@ diff -ru fsl.orig/config/linux_64-gcc4.0/systemvars.mk fsl/config/linux_64-gcc4.
  
 -CC = gcc
 -CXX = c++
-+CC ?= gcc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = -static
  CXXSTATICFLAGS = -static
  
@@ -245,8 +273,8 @@ diff -ru fsl.orig/config/linux_64-gcc4.1/systemvars.mk fsl/config/linux_64-gcc4.
  
 -CC = gcc
 -CXX = c++
-+CC ?= gcc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = -static
  CXXSTATICFLAGS = -static
  
@@ -259,8 +287,22 @@ diff -ru fsl.orig/config/linux_64-gcc4.2/systemvars.mk fsl/config/linux_64-gcc4.
  
 -CC = gcc
 -CXX = c++
-+CC ?= gcc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
+ CSTATICFLAGS = -static
+ CXXSTATICFLAGS = -static
+ 
+diff -ru fsl.orig/config/linux_64-gcc4.4/systemvars.mk fsl/config/linux_64-gcc4.4/systemvars.mk
+--- fsl.orig/config/linux_64-gcc4.4/systemvars.mk	2008-06-26 15:25:42.000000000 +0200
++++ fsl/config/linux_64-gcc4.4/systemvars.mk	2013-05-14 22:43:15.648658000 +0200
+@@ -18,8 +18,8 @@
+ 
+ # Compiler dependent variables
+ 
+-CC = gcc
+-CXX = c++
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = -static
  CXXSTATICFLAGS = -static
  
@@ -273,8 +315,8 @@ diff -ru fsl.orig/config/sparc-solaris2.8-gcc2.95/systemvars.mk fsl/config/sparc
  
 -CC = gcc
 -CXX = c++
-+CC ?= gcc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  
  ARCHFLAGS = -mv8 -ffast-math -fomit-frame-pointer 
  
@@ -287,8 +329,8 @@ diff -ru fsl.orig/config/sparc-solaris2.9-gcc2.95/systemvars.mk fsl/config/sparc
  
 -CC = gcc
 -CXX = c++
-+CC ?= gcc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  
  ARCHFLAGS = -mv8 -ffast-math -fomit-frame-pointer
  ARCHLDFLAGS = -static
diff --git a/easybuild/easyconfigs/f/FSL/FSL_makefile_fixes.patch b/easybuild/easyconfigs/f/FSL/FSL_makefile_fixes.patch
index c78dd2e48af77bbde775192c75e3e99a2c150c9f..be5a449af76654f51df88facf8df686e7f36c05a 100644
--- a/easybuild/easyconfigs/f/FSL/FSL_makefile_fixes.patch
+++ b/easybuild/easyconfigs/f/FSL/FSL_makefile_fixes.patch
@@ -28,8 +28,8 @@ diff -ru fsl.orig/config/apple-darwin10-gcc4.2/systemvars.mk fsl/config/apple-da
  
 -CC = cc
 -CXX = c++
-+CC ?= cc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = 
  CXXSTATICFLAGS = 
  
@@ -42,8 +42,8 @@ diff -ru fsl.orig/config/apple-darwin7-gcc3.1/systemvars.mk fsl/config/apple-dar
  
 -CC = cc
 -CXX = c++
-+CC ?= cc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = 
  CXXSTATICFLAGS = 
  
@@ -56,8 +56,8 @@ diff -ru fsl.orig/config/apple-darwin7-gcc3.3/systemvars.mk fsl/config/apple-dar
  
 -CC = cc
 -CXX = c++
-+CC ?= cc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = 
  CXXSTATICFLAGS = 
  
@@ -70,8 +70,8 @@ diff -ru fsl.orig/config/apple-darwin8-gcc4.0/systemvars.mk fsl/config/apple-dar
  
 -CC = cc
 -CXX = c++
-+CC ?= cc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = 
  CXXSTATICFLAGS = 
  
@@ -84,8 +84,8 @@ diff -ru fsl.orig/config/apple-darwin9-gcc4.0/systemvars.mk fsl/config/apple-dar
  
 -CC = cc
 -CXX = c++
-+CC ?= cc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = 
  CXXSTATICFLAGS = 
  
@@ -98,8 +98,8 @@ diff -ru fsl.orig/config/generic/systemvars.mk fsl/config/generic/systemvars.mk
  
 -CC = gcc
 -CXX = c++
-+CC ?= gcc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = -static
  CXXSTATICFLAGS = -static
  
@@ -112,8 +112,8 @@ diff -ru fsl.orig/config/i686-pc-cygwin-gcc3.2/systemvars.mk fsl/config/i686-pc-
  
 -CC = gcc-2
 -CXX = c++-2
-+CC ?= gcc-2
-+CXX ?= c++-2
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = -static
  CXXSTATICFLAGS = -static
  
@@ -126,8 +126,8 @@ diff -ru fsl.orig/config/i686-pc-cygwin-gcc3.3/systemvars.mk fsl/config/i686-pc-
  
 -CC = gcc
 -CXX = c++
-+CC ?= gcc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = -static
  CXXSTATICFLAGS = -static
  
@@ -140,8 +140,8 @@ diff -ru fsl.orig/config/i686-pc-cygwin-gcc3.4/systemvars.mk fsl/config/i686-pc-
  
 -CC = gcc
 -CXX = c++
-+CC ?= gcc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = -static
  CXXSTATICFLAGS = -static
  
@@ -154,8 +154,8 @@ diff -ru fsl.orig/config/linux_32-gcc2.96/systemvars.mk fsl/config/linux_32-gcc2
  
 -CC = gcc
 -CXX = c++
-+CC ?= gcc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = -static
  CXXSTATICFLAGS = -static
  
@@ -168,8 +168,8 @@ diff -ru fsl.orig/config/linux_32-gcc3.2/systemvars.mk fsl/config/linux_32-gcc3.
  
 -CC = gcc
 -CXX = c++
-+CC ?= gcc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = -static
  CXXSTATICFLAGS = -static
  
@@ -182,8 +182,8 @@ diff -ru fsl.orig/config/linux_32-gcc3.3/systemvars.mk fsl/config/linux_32-gcc3.
  
 -CC = gcc
 -CXX = c++
-+CC ?= gcc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = -static
  CXXSTATICFLAGS = -static
  
@@ -196,8 +196,8 @@ diff -ru fsl.orig/config/linux_32-gcc3.4/systemvars.mk fsl/config/linux_32-gcc3.
  
 -CC = gcc
 -CXX = c++
-+CC ?= gcc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = -static
  CXXSTATICFLAGS = -static
  
@@ -210,8 +210,8 @@ diff -ru fsl.orig/config/linux_32-gcc4.0/systemvars.mk fsl/config/linux_32-gcc4.
  
 -CC = gcc
 -CXX = c++
-+CC ?= gcc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = -static
  CXXSTATICFLAGS = -static
  
@@ -224,8 +224,8 @@ diff -ru fsl.orig/config/linux_32-gcc4.1/systemvars.mk fsl/config/linux_32-gcc4.
  
 -CC = gcc
 -CXX = c++
-+CC ?= gcc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = -static
  CXXSTATICFLAGS = -static
  
@@ -238,8 +238,8 @@ diff -ru fsl.orig/config/linux_64-gcc3.4/systemvars.mk fsl/config/linux_64-gcc3.
  
 -CC = gcc
 -CXX = c++
-+CC ?= gcc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = -static
  CXXSTATICFLAGS = -static
  
@@ -252,8 +252,8 @@ diff -ru fsl.orig/config/linux_64-gcc4.0/systemvars.mk fsl/config/linux_64-gcc4.
  
 -CC = gcc
 -CXX = c++
-+CC ?= gcc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = -static
  CXXSTATICFLAGS = -static
  
@@ -266,8 +266,8 @@ diff -ru fsl.orig/config/linux_64-gcc4.1/systemvars.mk fsl/config/linux_64-gcc4.
  
 -CC = gcc
 -CXX = c++
-+CC ?= gcc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = -static
  CXXSTATICFLAGS = -static
  
@@ -280,8 +280,8 @@ diff -ru fsl.orig/config/linux_64-gcc4.2/systemvars.mk fsl/config/linux_64-gcc4.
  
 -CC = gcc
 -CXX = c++
-+CC ?= gcc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  CSTATICFLAGS = -static
  CXXSTATICFLAGS = -static
  
@@ -294,8 +294,8 @@ diff -ru fsl.orig/config/sparc-solaris2.8-gcc2.95/systemvars.mk fsl/config/sparc
  
 -CC = gcc
 -CXX = c++
-+CC ?= gcc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  
  ARCHFLAGS = -mv8 -ffast-math -fomit-frame-pointer 
  
@@ -308,8 +308,8 @@ diff -ru fsl.orig/config/sparc-solaris2.9-gcc2.95/systemvars.mk fsl/config/sparc
  
 -CC = gcc
 -CXX = c++
-+CC ?= gcc
-+CXX ?= c++
++CC := ${CC}
++CXX := ${CXX}
  
  ARCHFLAGS = -mv8 -ffast-math -fomit-frame-pointer
  ARCHLDFLAGS = -static
diff --git a/easybuild/easyconfigs/f/findutils/findutils-4.2.33-goolf-1.4.10.eb b/easybuild/easyconfigs/f/findutils/findutils-4.2.33-goolf-1.4.10.eb
index 7d2ab705af49ec695d9952ede3b6d2e1e26dd3b8..0160acc4c492e0e8b60ce4edf13c9324271bbfb5 100644
--- a/easybuild/easyconfigs/f/findutils/findutils-4.2.33-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/f/findutils/findutils-4.2.33-goolf-1.4.10.eb
@@ -16,7 +16,7 @@ version = '4.2.33'
 homepage = 'http://www.gnu.org/software/findutils/findutils.html'
 description = "findutils: The GNU find, locate, updatedb, and xargs utilities"
 
-source_urls = ['http://ftp.gnu.org/gnu/findutils']
+source_urls = [GNU_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
diff --git a/easybuild/easyconfigs/f/findutils/findutils-4.2.33-ictce-5.3.0.eb b/easybuild/easyconfigs/f/findutils/findutils-4.2.33-ictce-5.3.0.eb
index 6baac60dd55328ada47f3c0c5c11d33604097dc5..b2d360c1856a8f7a9a4eb23c99480ae94f429817 100644
--- a/easybuild/easyconfigs/f/findutils/findutils-4.2.33-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/f/findutils/findutils-4.2.33-ictce-5.3.0.eb
@@ -16,7 +16,7 @@ version = '4.2.33'
 homepage = 'http://www.gnu.org/software/findutils/findutils.html'
 description = "findutils: The GNU find, locate, updatedb, and xargs utilities"
 
-source_urls = ['http://ftp.gnu.org/gnu/findutils']
+source_urls = [GNU_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
diff --git a/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-ictce-5.3.0.eb b/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..550ddb6d6ef0e296867462f05ebf605ee3ea5761
--- /dev/null
+++ b/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-ictce-5.3.0.eb
@@ -0,0 +1,17 @@
+name = 'fixesproto'
+version = '5.0'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """X.org FixesProto protocol headers."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+
+sanity_check_paths = {
+    'files': ['include/X11/extensions/xfixesproto.h', 'include/X11/extensions/xfixeswire.h'],
+    'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/f/flex/flex-2.5.35-ictce-5.5.0.eb b/easybuild/easyconfigs/f/flex/flex-2.5.35-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4cd202259c3943872a660b6c2ee421f9e4f97daf
--- /dev/null
+++ b/easybuild/easyconfigs/f/flex/flex-2.5.35-ictce-5.5.0.eb
@@ -0,0 +1,14 @@
+name = 'flex'
+version = '2.5.35'
+
+homepage = 'http://flex.sourceforge.net/'
+description = """Flex (Fast Lexical Analyzer) is a tool for generating scanners. A scanner, 
+ sometimes called a tokenizer, is a program which recognizes lexical patterns in text."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/f/flex/flex-2.5.35-iqacml-3.7.3.eb b/easybuild/easyconfigs/f/flex/flex-2.5.35-iqacml-3.7.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e1c44104d59ddcdd484eaf4dea2b097bdebee60a
--- /dev/null
+++ b/easybuild/easyconfigs/f/flex/flex-2.5.35-iqacml-3.7.3.eb
@@ -0,0 +1,14 @@
+name = 'flex'
+version = '2.5.35'
+
+homepage = 'http://flex.sourceforge.net/'
+description = """Flex (Fast Lexical Analyzer) is a tool for generating scanners. A scanner, 
+ sometimes called a tokenizer, is a program which recognizes lexical patterns in text."""
+
+toolchain = {'name': 'iqacml', 'version': '3.7.3'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/f/flex/flex-2.5.37-ictce-5.5.0.eb b/easybuild/easyconfigs/f/flex/flex-2.5.37-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..add73d928635ff98895ac474ebb37817abc4047e
--- /dev/null
+++ b/easybuild/easyconfigs/f/flex/flex-2.5.37-ictce-5.5.0.eb
@@ -0,0 +1,14 @@
+name = 'flex'
+version = '2.5.37'
+
+homepage = 'http://flex.sourceforge.net/'
+description = """Flex (Fast Lexical Analyzer) is a tool for generating scanners. A scanner, 
+ sometimes called a tokenizer, is a program which recognizes lexical patterns in text."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/f/fmri/fmri-1.4-8-ictce-4.0.10-R-2.15.2.eb b/easybuild/easyconfigs/f/fmri/fmri-1.4-8-ictce-4.0.10-R-2.15.2.eb
index 0d2bc981cb5f1d88d4ea179af699ee444e154def..4cec82a9a57d2f0caff7df89545a60b4daa5256d 100644
--- a/easybuild/easyconfigs/f/fmri/fmri-1.4-8-ictce-4.0.10-R-2.15.2.eb
+++ b/easybuild/easyconfigs/f/fmri/fmri-1.4-8-ictce-4.0.10-R-2.15.2.eb
@@ -12,7 +12,7 @@ description = """The package contains R-functions to perform an fmri analysis as
 toolchain = {'name': 'ictce', 'version': '4.0.10'}
 
 source_urls = ['http://cran.r-project.org/src/contrib/']
-sources = ['%s_%s.tar.gz' % (name, version)]
+sources = ['%(name)s_%(version)s.tar.gz']
 
 r = 'R'
 rver = '2.15.2'
diff --git a/easybuild/easyconfigs/f/fmri/fmri-1.4-8-ictce-5.3.0-R-2.15.2.eb b/easybuild/easyconfigs/f/fmri/fmri-1.4-8-ictce-5.3.0-R-2.15.2.eb
index de5657cecafdda8268efda094d4176763f13eee0..6d1befc47f0bca47c7bd68f9d19da4d46ed7be7d 100644
--- a/easybuild/easyconfigs/f/fmri/fmri-1.4-8-ictce-5.3.0-R-2.15.2.eb
+++ b/easybuild/easyconfigs/f/fmri/fmri-1.4-8-ictce-5.3.0-R-2.15.2.eb
@@ -9,11 +9,10 @@ description = """The package contains R-functions to perform an fmri analysis as
  NeuroImage, 33:55-62 (2006) and J. Polzehl, H.U. Voss, K. Tabelow, Structural adaptive segmentation for statistical
  parametric mapping, NeuroImage, 52:515-523 (2010)."""
 
-
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 source_urls = ['http://cran.r-project.org/src/contrib/']
-sources = ['%s_%s.tar.gz' % (name, version)]
+sources = ['%(name)s_%(version)s.tar.gz']
 
 r = 'R'
 rver = '2.15.2'
diff --git a/easybuild/easyconfigs/f/fmri/fmri-1.5.0-ictce-5.3.0-R-2.15.3.eb b/easybuild/easyconfigs/f/fmri/fmri-1.5.0-ictce-5.3.0-R-2.15.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..dacaf55d84346ce2243f20340f895ccc2b29bc7e
--- /dev/null
+++ b/easybuild/easyconfigs/f/fmri/fmri-1.5.0-ictce-5.3.0-R-2.15.3.eb
@@ -0,0 +1,29 @@
+easyblock = 'RPackage'
+
+name = 'fmri'
+version = '1.5-0'
+
+homepage = 'http://cran.r-project.org/web/packages/fmri'
+description = """The package contains R-functions to perform an fmri analysis as described in K. Tabelow,
+ J. Polzehl, H.U. Voss, and V. Spokoiny, Analysing fMRI experiments with structure adaptive smoothing procedures,
+ NeuroImage, 33:55-62 (2006) and J. Polzehl, H.U. Voss, K. Tabelow, Structural adaptive segmentation for statistical
+ parametric mapping, NeuroImage, 52:515-523 (2010)."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = ['http://cran.r-project.org/src/contrib/']
+sources = ['%(name)s_%(version)s.tar.gz']
+
+r = 'R'
+rver = '2.15.3'
+versionsuffix = '-%s-%s' % (r, rver)
+
+tcltkver = '8.5.15'
+
+dependencies = [
+    (r, rver),
+    ('Tcl', tcltkver),
+    ('Tk', tcltkver),
+]
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-ictce-5.3.0.eb b/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5a15cb771924790a5e78c09ec454743f668a5b2e
--- /dev/null
+++ b/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-ictce-5.3.0.eb
@@ -0,0 +1,19 @@
+name = 'freeglut'
+version = '2.8.1'
+
+homepage = 'http://freeglut.sourceforge.net/'
+description = "freeglut is a completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library."
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://prdownloads.sourceforge.net/%(name)s']
+
+dependencies = [('libXi', '1.7.2')]
+
+sanity_check_paths = {
+    'files': ['lib/libglut.a', 'lib/libglut.so'],
+    'dirs': ['include/GL'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.4.10-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/f/freetype/freetype-2.4.10-goalf-1.1.0-no-OFED.eb
index 46fc41bf4bf88d490579206f75da4a0fb5f1b232..0933ebbe50bd2a910f29e1c8e8198face5ee00bd 100644
--- a/easybuild/easyconfigs/f/freetype/freetype-2.4.10-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.4.10-goalf-1.1.0-no-OFED.eb
@@ -8,7 +8,7 @@ description = """FreeType 2 is a software font engine that is designed to be sma
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
-source_urls = ['http://download.savannah.gnu.org/releases/freetype/']
+source_urls = [GNU_SAVANNAH_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.4.10-goolf-1.4.10.eb b/easybuild/easyconfigs/f/freetype/freetype-2.4.10-goolf-1.4.10.eb
index 0d83aa65215c53b445d5a8907bca5d2ae9faaf35..13f7275f3ee6b2f0245e79fdecc8cfa4a30bc5a0 100644
--- a/easybuild/easyconfigs/f/freetype/freetype-2.4.10-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.4.10-goolf-1.4.10.eb
@@ -9,7 +9,7 @@ servers, font conversion tools, text image generation tools, and many other prod
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-source_urls = ['http://download.savannah.gnu.org/releases/freetype/']
+source_urls = [GNU_SAVANNAH_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.4.10-ictce-4.0.6.eb b/easybuild/easyconfigs/f/freetype/freetype-2.4.10-ictce-4.0.6.eb
index 57c645e55f44aff81b85087f5c07350eb3f32355..d8180f31a0372b76beb84bfb8ae66352b4529c4b 100644
--- a/easybuild/easyconfigs/f/freetype/freetype-2.4.10-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.4.10-ictce-4.0.6.eb
@@ -8,7 +8,7 @@ description = """FreeType 2 is a software font engine that is designed to be sma
 
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
-source_urls = ['http://download.savannah.gnu.org/releases/freetype/']
+source_urls = [GNU_SAVANNAH_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.4.10-ictce-4.1.13.eb b/easybuild/easyconfigs/f/freetype/freetype-2.4.10-ictce-4.1.13.eb
index 23c5e15dbadd28f800ee610b7464f79e988482f6..6cd7f858d2a1f8208595575f1fd493ea888e79cc 100644
--- a/easybuild/easyconfigs/f/freetype/freetype-2.4.10-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.4.10-ictce-4.1.13.eb
@@ -8,7 +8,7 @@ description = """FreeType 2 is a software font engine that is designed to be sma
 
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
-source_urls = ['http://download.savannah.gnu.org/releases/freetype/']
+source_urls = [GNU_SAVANNAH_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.4.10-ictce-5.3.0.eb b/easybuild/easyconfigs/f/freetype/freetype-2.4.10-ictce-5.3.0.eb
index 5771475460829b5c06baa42801572eec79bc549b..115ca243f34aba97e7e2496a9aa35c1191a81536 100644
--- a/easybuild/easyconfigs/f/freetype/freetype-2.4.10-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.4.10-ictce-5.3.0.eb
@@ -8,7 +8,7 @@ description = """FreeType 2 is a software font engine that is designed to be sma
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
-source_urls = ['http://download.savannah.gnu.org/releases/freetype/']
+source_urls = [GNU_SAVANNAH_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.4.11-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/f/freetype/freetype-2.4.11-goalf-1.1.0-no-OFED.eb
index 05ced295326a4b8788789a445200128e3bee13ee..00039d8f1d4a323fa7a6cb57043936a1d9191e2a 100644
--- a/easybuild/easyconfigs/f/freetype/freetype-2.4.11-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.4.11-goalf-1.1.0-no-OFED.eb
@@ -9,7 +9,7 @@ servers, font conversion tools, text image generation tools, and many other prod
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
-source_urls = ['http://download.savannah.gnu.org/releases/freetype/']
+source_urls = [GNU_SAVANNAH_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.4.11-goolf-1.4.10.eb b/easybuild/easyconfigs/f/freetype/freetype-2.4.11-goolf-1.4.10.eb
index 87014fb2056964b936257d7437a4d6caaf0f1adc..1df33cbab7fbd1fb3af133ff16333353deda150d 100644
--- a/easybuild/easyconfigs/f/freetype/freetype-2.4.11-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.4.11-goolf-1.4.10.eb
@@ -9,7 +9,7 @@ servers, font conversion tools, text image generation tools, and many other prod
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-source_urls = ['http://download.savannah.gnu.org/releases/freetype/']
+source_urls = [GNU_SAVANNAH_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.4.11-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/f/freetype/freetype-2.4.11-ictce-3.2.2.u3.eb
index 181648612e52cf85bfd41e0f6e90ccaeab661bc0..b99078235aeacaaec15b9bf64427d8298dfe2ff5 100644
--- a/easybuild/easyconfigs/f/freetype/freetype-2.4.11-ictce-3.2.2.u3.eb
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.4.11-ictce-3.2.2.u3.eb
@@ -8,7 +8,7 @@ description = """FreeType 2 is a software font engine that is designed to be sma
 
 toolchain = {'name': 'ictce', 'version': '3.2.2.u3'}
 
-source_urls = ['http://download.savannah.gnu.org/releases/freetype/']
+source_urls = [GNU_SAVANNAH_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.4.11-ictce-4.1.13.eb b/easybuild/easyconfigs/f/freetype/freetype-2.4.11-ictce-4.1.13.eb
index 1b32b32fb6a3a47962bafe2f6ad641437bcf4d8e..6187e6b9ba6cee1cf82bb23d2df5f578045d6277 100644
--- a/easybuild/easyconfigs/f/freetype/freetype-2.4.11-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.4.11-ictce-4.1.13.eb
@@ -8,7 +8,7 @@ description = """FreeType 2 is a software font engine that is designed to be sma
 
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
-source_urls = ['http://download.savannah.gnu.org/releases/freetype/']
+source_urls = [GNU_SAVANNAH_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.4.11-ictce-5.3.0.eb b/easybuild/easyconfigs/f/freetype/freetype-2.4.11-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6c789c8bd3ac1111ce999148265cfe0f8b531f5b
--- /dev/null
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.4.11-ictce-5.3.0.eb
@@ -0,0 +1,19 @@
+name = 'freetype'
+version = '2.4.11'
+
+homepage = 'http://freetype.org'
+description = """FreeType 2 is a software font engine that is designed to be small, efficient, highly customizable, and
+ portable while capable of producing high-quality output (glyph images). It can be used in graphics libraries, display
+ servers, font conversion tools, text image generation tools, and many other products as well."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = ['http://download.savannah.gnu.org/releases/freetype/']
+sources = [SOURCE_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'],
+    'dirs': ['include/freetype2'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.4.11-iqacml-3.7.3.eb b/easybuild/easyconfigs/f/freetype/freetype-2.4.11-iqacml-3.7.3.eb
index f82be0c8cb39484e9c5fa7bd00e213ee363afd1c..b585104cabec1c559e800f0bf96d9edc6162cf17 100644
--- a/easybuild/easyconfigs/f/freetype/freetype-2.4.11-iqacml-3.7.3.eb
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.4.11-iqacml-3.7.3.eb
@@ -8,7 +8,7 @@ description = """FreeType 2 is a software font engine that is designed to be sma
 
 toolchain = {'name': 'iqacml', 'version': '3.7.3'}
 
-source_urls = ['http://download.savannah.gnu.org/releases/freetype/']
+source_urls = [GNU_SAVANNAH_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-goolf-1.4.10.eb b/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c8025842ef6b8a988c8e9185ee236e83503c86e9
--- /dev/null
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-goolf-1.4.10.eb
@@ -0,0 +1,21 @@
+name = 'freetype'
+version = '2.5.0.1'
+
+homepage = 'http://freetype.org'
+description = """FreeType 2 is a software font engine that is designed to be small, efficient, highly customizable, and
+ portable while capable of producing high-quality output (glyph images). It can be used in graphics libraries, display
+ servers, font conversion tools, text image generation tools, and many other products as well."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['http://download.savannah.gnu.org/releases/freetype/']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('libpng', '1.6.6')]
+
+sanity_check_paths = {
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'],
+    'dirs': ['include/freetype2'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-4.1.13.eb b/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-4.1.13.eb
new file mode 100644
index 0000000000000000000000000000000000000000..de48d98038e81c797a4682b781b1b8650390ed3b
--- /dev/null
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-4.1.13.eb
@@ -0,0 +1,21 @@
+name = 'freetype'
+version = '2.5.0.1'
+
+homepage = 'http://freetype.org'
+description = """FreeType 2 is a software font engine that is designed to be small, efficient, highly customizable, and
+ portable while capable of producing high-quality output (glyph images). It can be used in graphics libraries, display
+ servers, font conversion tools, text image generation tools, and many other products as well."""
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+
+source_urls = ['http://download.savannah.gnu.org/releases/freetype/']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('libpng', '1.6.6')]
+
+sanity_check_paths = {
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'],
+    'dirs': ['include/freetype2'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-5.3.0.eb b/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d509fdfff7e14e12f310288ca786fa3fcdb0c3bd
--- /dev/null
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-5.3.0.eb
@@ -0,0 +1,21 @@
+name = 'freetype'
+version = '2.5.0.1'
+
+homepage = 'http://freetype.org'
+description = """FreeType 2 is a software font engine that is designed to be small, efficient, highly customizable, and
+ portable while capable of producing high-quality output (glyph images). It can be used in graphics libraries, display
+ servers, font conversion tools, text image generation tools, and many other products as well."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = ['http://download.savannah.gnu.org/releases/freetype/']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('libpng', '1.6.6')]
+
+sanity_check_paths = {
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'],
+    'dirs': ['include/freetype2'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-5.5.0.eb b/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-5.5.0.eb
index a3b5de75a2d7e75f7d851387e51f1a7598302f64..e9d9036e940a074ddc9e4cf38d4e6716c74bcc27 100644
--- a/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-5.5.0.eb
@@ -8,7 +8,7 @@ description = """FreeType 2 is a software font engine that is designed to be sma
 
 toolchain = {'name': 'ictce', 'version': '5.5.0'}
 
-source_urls = ['http://download.savannah.gnu.org/releases/freetype/']
+source_urls = [GNU_SAVANNAH_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 dependencies = [('libpng', '1.6.6')]
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.5.2-ictce-5.5.0.eb b/easybuild/easyconfigs/f/freetype/freetype-2.5.2-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..578bf6e2b3a52273b060f4821f6edf2e67c53ccc
--- /dev/null
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.5.2-ictce-5.5.0.eb
@@ -0,0 +1,21 @@
+name = 'freetype'
+version = '2.5.2'
+
+homepage = 'http://freetype.org'
+description = """FreeType 2 is a software font engine that is designed to be small, efficient, highly customizable, and
+ portable while capable of producing high-quality output (glyph images). It can be used in graphics libraries, display
+ servers, font conversion tools, text image generation tools, and many other products as well."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+source_urls = [GNU_SAVANNAH_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('libpng', '1.6.9')]
+
+sanity_check_paths = {
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'],
+    'dirs': ['include/freetype2'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GATK/GATK-2.5-2-Java-1.7.0_10.eb b/easybuild/easyconfigs/g/GATK/GATK-2.5-2-Java-1.7.0_10.eb
index 0c47f958a0ece65bdcfb9b0e90fa48c985506ac3..4c9f63f9c599cc19d2fe190f9194cf815a567461 100644
--- a/easybuild/easyconfigs/g/GATK/GATK-2.5-2-Java-1.7.0_10.eb
+++ b/easybuild/easyconfigs/g/GATK/GATK-2.5-2-Java-1.7.0_10.eb
@@ -25,7 +25,7 @@ description = """The Genome Analysis Toolkit or GATK is a software package devel
 toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 # download manually from http://www.broadinstitute.org/gatk/download
-sources = ['%s-%s.tar.bz2' % ("GenomeAnalysisTK", version)]
+sources = ['GenomeAnalysisTK-%(version)s.tar.bz2']
 
 java = 'Java'
 javaver = '1.7.0_10'
diff --git a/easybuild/easyconfigs/g/GATK/GATK-2.6-5-Java-1.7.0_10.eb b/easybuild/easyconfigs/g/GATK/GATK-2.6-5-Java-1.7.0_10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..833388f606efb766b1a50ebf6f29df88fe62fa8b
--- /dev/null
+++ b/easybuild/easyconfigs/g/GATK/GATK-2.6-5-Java-1.7.0_10.eb
@@ -0,0 +1,40 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 Cyprus Institute / CaSToRC, University of Luxembourg / LCSB
+# Authors::   George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Fotis Georgatos <fotis.georgatos@uni.lu>, Kenneth Hoste (UGent)
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html
+##
+
+easyblock = 'Tarball'
+
+name = 'GATK'
+version = '2.6-5'
+
+homepage = 'http://www.broadinstitute.org/gatk/'
+description = """The Genome Analysis Toolkit or GATK is a software package developed at the Broad Institute 
+ to analyse next-generation resequencing data. The toolkit offers a wide variety of tools,
+ with a primary focus on variant discovery and genotyping as well as strong emphasis on 
+ data quality assurance. Its robust architecture, powerful processing engine and 
+ high-performance computing features make it capable of taking on projects of any size."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+# download manually from http://www.broadinstitute.org/gatk/download
+sources = ['GenomeAnalysisTK-%(version)s.tar.bz2']
+
+java = 'Java'
+javaver = '1.7.0_10'
+versionsuffix = '-%s-%s' % (java, javaver)
+dependencies = [(java, javaver)]
+
+sanity_check_paths = {
+    'files': ["GenomeAnalysisTK.jar"],
+    'dirs': ["resources"],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/GATK/GATK-2.7-4-Java-1.7.0_10.eb b/easybuild/easyconfigs/g/GATK/GATK-2.7-4-Java-1.7.0_10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c75c22094bebf98b62fe15e69026e89aa64aa848
--- /dev/null
+++ b/easybuild/easyconfigs/g/GATK/GATK-2.7-4-Java-1.7.0_10.eb
@@ -0,0 +1,40 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 Cyprus Institute / CaSToRC, University of Luxembourg / LCSB
+# Authors::   George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Fotis Georgatos <fotis.georgatos@uni.lu>, Kenneth Hoste (UGent)
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html
+##
+
+easyblock = 'Tarball'
+
+name = 'GATK'
+version = '2.7-4'
+
+homepage = 'http://www.broadinstitute.org/gatk/'
+description = """The Genome Analysis Toolkit or GATK is a software package developed at the Broad Institute 
+ to analyse next-generation resequencing data. The toolkit offers a wide variety of tools,
+ with a primary focus on variant discovery and genotyping as well as strong emphasis on 
+ data quality assurance. Its robust architecture, powerful processing engine and 
+ high-performance computing features make it capable of taking on projects of any size."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+# download manually from http://www.broadinstitute.org/gatk/download
+sources = ['GenomeAnalysisTK-%(version)s.tar.bz2']
+
+java = 'Java'
+javaver = '1.7.0_10'
+versionsuffix = '-%s-%s' % (java, javaver)
+dependencies = [(java, javaver)]
+
+sanity_check_paths = {
+    'files': ["GenomeAnalysisTK.jar"],
+    'dirs': ["resources"],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/GATK/GATK-2.8-1-Java-1.7.0_10.eb b/easybuild/easyconfigs/g/GATK/GATK-2.8-1-Java-1.7.0_10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c3a788ffe2f1d8a6c72a02c7300a90254ed94a7a
--- /dev/null
+++ b/easybuild/easyconfigs/g/GATK/GATK-2.8-1-Java-1.7.0_10.eb
@@ -0,0 +1,40 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 Cyprus Institute / CaSToRC, University of Luxembourg / LCSB
+# Authors::   George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Fotis Georgatos <fotis.georgatos@uni.lu>, Kenneth Hoste (UGent)
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html
+##
+
+easyblock = 'Tarball'
+
+name = 'GATK'
+version = '2.8-1'
+
+homepage = 'http://www.broadinstitute.org/gatk/'
+description = """The Genome Analysis Toolkit or GATK is a software package developed at the Broad Institute 
+ to analyse next-generation resequencing data. The toolkit offers a wide variety of tools,
+ with a primary focus on variant discovery and genotyping as well as strong emphasis on 
+ data quality assurance. Its robust architecture, powerful processing engine and 
+ high-performance computing features make it capable of taking on projects of any size."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+# download manually from http://www.broadinstitute.org/gatk/download
+sources = ['GenomeAnalysisTK-%(version)s.tar.bz2']
+
+java = 'Java'
+javaver = '1.7.0_10'
+versionsuffix = '-%s-%s' % (java, javaver)
+dependencies = [(java, javaver)]
+
+sanity_check_paths = {
+    'files': ["GenomeAnalysisTK.jar"],
+    'dirs': ["resources"],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/GCC/GCC-4.1.2.eb b/easybuild/easyconfigs/g/GCC/GCC-4.1.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..42a1d25324842c745fad3dd05b846418941331cf
--- /dev/null
+++ b/easybuild/easyconfigs/g/GCC/GCC-4.1.2.eb
@@ -0,0 +1,30 @@
+name = "GCC"
+version = '4.1.2'
+
+homepage = 'http://gcc.gnu.org/'
+description = """The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran,
+ Java, and Ada, as well as libraries for these languages (libstdc++, libgcj,...)."""
+
+toolchain = {'name': 'dummy', 'version': ''}  # empty version to ensure that dependencies are loaded
+
+source_urls = ['http://ftpmirror.gnu.org/%(namelower)s/%(namelower)s-%(version)s']
+sources = [SOURCELOWER_TAR_BZ2]
+
+dependencies = [
+    ('GMP', '4.3.2'),
+    ('MPFR', '2.4.2'),
+]
+
+# building GCC v4.1.2 requires an old GCC version, so don't rely on system compiler
+builddependencies = [('GCC', '4.2.4')]
+
+languages = ['c', 'c++', 'fortran']
+
+configopts = "--with-gmp=$EBROOTGMP --with-mpfr=$EBROOTMPFR"
+
+# building GCC sometimes fails if make parallelism is too high, so let's limit it
+maxparallel = 4
+
+withlto = False
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/g/GCC/GCC-4.2.4.eb b/easybuild/easyconfigs/g/GCC/GCC-4.2.4.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3ccecb918f919e91a15db9a913059ba2721a9b6f
--- /dev/null
+++ b/easybuild/easyconfigs/g/GCC/GCC-4.2.4.eb
@@ -0,0 +1,27 @@
+name = "GCC"
+version = '4.2.4'
+
+homepage = 'http://gcc.gnu.org/'
+description = """The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran,
+ Java, and Ada, as well as libraries for these languages (libstdc++, libgcj,...)."""
+
+toolchain = {'name': 'dummy', 'version': ''}  # empty version to ensure that dependencies are loaded
+
+source_urls = ['http://ftpmirror.gnu.org/%(namelower)s/%(namelower)s-%(version)s']
+sources = [SOURCELOWER_TAR_BZ2]
+
+dependencies = [
+    ('GMP', '4.3.2'),
+    ('MPFR', '2.4.2'),
+]
+
+languages = ['c', 'c++', 'fortran']
+
+configopts = "--with-gmp=$EBROOTGMP --with-mpfr=$EBROOTMPFR"
+
+# building GCC sometimes fails if make parallelism is too high, so let's limit it
+maxparallel = 4
+
+withlto = False
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/g/GCC/GCC-4.3.6.eb b/easybuild/easyconfigs/g/GCC/GCC-4.3.6.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b182cdcc4838eaf695be205821b0ce2549aa7a5a
--- /dev/null
+++ b/easybuild/easyconfigs/g/GCC/GCC-4.3.6.eb
@@ -0,0 +1,27 @@
+name = "GCC"
+version = '4.3.6'
+
+homepage = 'http://gcc.gnu.org/'
+description = """The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran,
+ Java, and Ada, as well as libraries for these languages (libstdc++, libgcj,...)."""
+
+toolchain = {'name': 'dummy', 'version': ''}  # empty version to ensure that dependencies are loaded
+
+source_urls = ['http://ftpmirror.gnu.org/%(namelower)s/%(namelower)s-%(version)s']
+sources = [SOURCELOWER_TAR_BZ2]
+
+dependencies = [
+    ('GMP', '4.3.2'),
+    ('MPFR', '2.4.2'),
+]
+
+languages = ['c', 'c++', 'fortran']
+
+configopts = "--with-gmp=$EBROOTGMP --with-mpfr=$EBROOTMPFR"
+
+# building GCC sometimes fails if make parallelism is too high, so let's limit it
+maxparallel = 4
+
+withlto = False
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/g/GCC/GCC-4.4.7.eb b/easybuild/easyconfigs/g/GCC/GCC-4.4.7.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b33b83ca238c219971905563c86d15c619fdb87d
--- /dev/null
+++ b/easybuild/easyconfigs/g/GCC/GCC-4.4.7.eb
@@ -0,0 +1,27 @@
+name = "GCC"
+version = '4.4.7'
+
+homepage = 'http://gcc.gnu.org/'
+description = """The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran,
+ Java, and Ada, as well as libraries for these languages (libstdc++, libgcj,...)."""
+
+toolchain = {'name': 'dummy', 'version': ''}  # empty version to ensure that dependencies are loaded
+
+source_urls = ['http://ftpmirror.gnu.org/%(namelower)s/%(namelower)s-%(version)s']
+sources = [SOURCELOWER_TAR_BZ2]
+
+dependencies = [
+    ('GMP', '4.3.2'),
+    ('MPFR', '2.4.2'),
+]
+
+languages = ['c', 'c++', 'fortran']
+
+configopts = "--with-gmp=$EBROOTGMP --with-mpfr=$EBROOTMPFR"
+
+# building GCC sometimes fails if make parallelism is too high, so let's limit it
+maxparallel = 4
+
+withlto = False
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/g/GCC/GCC-4.8.2-CLooG-multilib.eb b/easybuild/easyconfigs/g/GCC/GCC-4.8.2-CLooG-multilib.eb
new file mode 100644
index 0000000000000000000000000000000000000000..546001ab6b38899f9400c68bbdce15a8638cd044
--- /dev/null
+++ b/easybuild/easyconfigs/g/GCC/GCC-4.8.2-CLooG-multilib.eb
@@ -0,0 +1,39 @@
+name = "GCC"
+version = '4.8.2'
+versionsuffix = "-CLooG-multilib"
+
+homepage = 'http://gcc.gnu.org/'
+description = """The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran, Java, and Ada,
+ as well as libraries for these languages (libstdc++, libgcj,...)."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+source_urls = [
+    'http://ftpmirror.gnu.org/%(namelower)s/%(namelower)s-%(version)s',  # GCC auto-resolving HTTP mirror
+    'http://ftpmirror.gnu.org/gmp',  # idem for GMP
+    'http://ftpmirror.gnu.org/mpfr',  # idem for MPFR
+    'http://www.multiprecision.org/mpc/download',  # MPC official
+    'http://www.bastoul.net/cloog/pages/download/',  # CLooG official
+    'ftp://gcc.gnu.org/pub/gcc/infrastructure/',  # GCC dependencies
+    'http://gcc.cybermirror.org/infrastructure/',  # HTTP mirror for GCC dependencies
+]
+sources = [
+    SOURCELOWER_TAR_GZ,
+    'gmp-5.1.3.tar.bz2',
+    'mpfr-3.1.2.tar.gz',
+    'mpc-1.0.1.tar.gz',
+    'cloog-0.18.1.tar.gz',
+]
+
+languages = ['c', 'c++', 'fortran', 'lto']
+
+withcloog = True
+
+clooguseisl = True
+
+multilib = True
+
+# building GCC sometimes fails if make parallelism is too high, so let's limit it
+maxparallel = 4
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/g/GCC/GCC-4.8.2-CLooG.eb b/easybuild/easyconfigs/g/GCC/GCC-4.8.2-CLooG.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f3c7e6b745397c5049058d9adc2e676b00689761
--- /dev/null
+++ b/easybuild/easyconfigs/g/GCC/GCC-4.8.2-CLooG.eb
@@ -0,0 +1,37 @@
+name = "GCC"
+version = '4.8.2'
+versionsuffix = "-CLooG"
+
+homepage = 'http://gcc.gnu.org/'
+description = """The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran, Java, and Ada,
+ as well as libraries for these languages (libstdc++, libgcj,...)."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+source_urls = [
+    'http://ftpmirror.gnu.org/%(namelower)s/%(namelower)s-%(version)s',  # GCC auto-resolving HTTP mirror
+    'http://ftpmirror.gnu.org/gmp',  # idem for GMP
+    'http://ftpmirror.gnu.org/mpfr',  # idem for MPFR
+    'http://www.multiprecision.org/mpc/download',  # MPC official
+    'http://www.bastoul.net/cloog/pages/download/',  # CLooG official
+    'ftp://gcc.gnu.org/pub/gcc/infrastructure/',  # GCC dependencies
+    'http://gcc.cybermirror.org/infrastructure/',  # HTTP mirror for GCC dependencies
+]
+sources = [
+    SOURCELOWER_TAR_GZ,
+    'gmp-5.1.3.tar.bz2',
+    'mpfr-3.1.2.tar.gz',
+    'mpc-1.0.1.tar.gz',
+    'cloog-0.18.1.tar.gz',
+]
+
+languages = ['c', 'c++', 'fortran', 'lto']
+
+withcloog = True
+
+clooguseisl = True
+
+# building GCC sometimes fails if make parallelism is too high, so let's limit it
+maxparallel = 4
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/g/GCC/GCC-4.8.2-multilib.eb b/easybuild/easyconfigs/g/GCC/GCC-4.8.2-multilib.eb
new file mode 100644
index 0000000000000000000000000000000000000000..509d5e27cac51f88f5592b8c7f992aa25c573d63
--- /dev/null
+++ b/easybuild/easyconfigs/g/GCC/GCC-4.8.2-multilib.eb
@@ -0,0 +1,31 @@
+name = "GCC"
+version = '4.8.2'
+versionsuffix = '-multilib'
+
+homepage = 'http://gcc.gnu.org/'
+description = """The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran, Java, and Ada,
+ as well as libraries for these languages (libstdc++, libgcj,...)."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+source_urls = [
+    'http://ftpmirror.gnu.org/%(namelower)s/%(namelower)s-%(version)s',  # GCC auto-resolving HTTP mirror
+    'http://ftpmirror.gnu.org/gmp',  # idem for GMP
+    'http://ftpmirror.gnu.org/mpfr',  # idem for MPFR
+    'http://www.multiprecision.org/mpc/download',  # MPC official
+]
+sources = [
+    SOURCELOWER_TAR_GZ,
+    'gmp-5.1.3.tar.bz2',
+    'mpfr-3.1.2.tar.gz',
+    'mpc-1.0.1.tar.gz',
+]
+
+languages = ['c', 'c++', 'fortran', 'lto']
+
+multilib = True
+
+# building GCC sometimes fails if make parallelism is too high, so let's limit it
+maxparallel = 4
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..62e541c4f980d9b0a321bb263bf3a30f41bb97b5
--- /dev/null
+++ b/easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-goolf-1.4.10.eb
@@ -0,0 +1,22 @@
+name = 'GDAL'
+version = '1.9.2'
+
+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': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['http://download.osgeo.org/gdal/']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('zlib', '1.2.7')]
+
+sanity_check_paths = {
+    'files': ['lib/libgdal.so', 'lib/libgdal.a'],
+    'dirs': ['bin', 'include']
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-ictce-4.1.13.eb b/easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-ictce-4.1.13.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8f1faabe9819267b63974d81e4d34fe53e6bceb9
--- /dev/null
+++ b/easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-ictce-4.1.13.eb
@@ -0,0 +1,22 @@
+name = 'GDAL'
+version = '1.9.2'
+
+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': 'ictce', 'version': '4.1.13'}
+
+source_urls = ['http://download.osgeo.org/gdal/']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('zlib', '1.2.7')]
+
+sanity_check_paths = {
+    'files': ['lib/libgdal.so', 'lib/libgdal.a'],
+    'dirs': ['bin', 'include']
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-ictce-5.3.0.eb b/easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3cbfbb519a8cd0ddd5be2bff4002c16352ee6636
--- /dev/null
+++ b/easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-ictce-5.3.0.eb
@@ -0,0 +1,22 @@
+name = 'GDAL'
+version = '1.9.2'
+
+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': 'ictce', 'version': '5.3.0'}
+
+source_urls = ['http://download.osgeo.org/gdal/']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('zlib', '1.2.7')]
+
+sanity_check_paths = {
+    'files': ['lib/libgdal.so', 'lib/libgdal.a'],
+    'dirs': ['bin', 'include']
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgmpolf-1.1.6.eb
index c9c21b75542d1f05fd907e3414ab7fd8b64820fb..add5752ac7f7c3aa251089ce1d0a739c5e53c288 100644
--- a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgmpolf-1.1.6.eb
+++ b/easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgmpolf-1.1.6.eb
@@ -17,7 +17,7 @@ homepage = 'http://www.gnu.org/software/gdb/gdb.html'
 description = "GDB-7.5.1: The GNU Project Debugger"
 
 sources = [SOURCELOWER_TAR_BZ2]
-source_urls = ['http://ftp.gnu.org/gnu/gdb/']
+source_urls = [GNU_SOURCE]
 
 toolchain = {'name': 'cgmpolf', 'version': '1.1.6'}
 
diff --git a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgmvolf-1.1.12rc1.eb
index d39802361421d6fe3184e0ccb2f1cb97701adca2..1825890778a25bfbf0420c7f6937878f5b047d5c 100644
--- a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgmvolf-1.1.12rc1.eb
+++ b/easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgmvolf-1.1.12rc1.eb
@@ -17,7 +17,7 @@ homepage = 'http://www.gnu.org/software/gdb/gdb.html'
 description = "GDB-7.5.1: The GNU Project Debugger"
 
 sources = [SOURCELOWER_TAR_BZ2]
-source_urls = ['http://ftp.gnu.org/gnu/gdb/']
+source_urls = [GNU_SOURCE]
 
 toolchain = {'name': 'cgmvolf', 'version': '1.1.12rc1'}
 
diff --git a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgmvolf-1.2.7.eb b/easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgmvolf-1.2.7.eb
index 058c22bab12347beb6c7da7223f3e4b04722e870..db088b8956f53bb9748b9e54535d8eba4f508bbd 100644
--- a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgmvolf-1.2.7.eb
+++ b/easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgmvolf-1.2.7.eb
@@ -17,7 +17,7 @@ homepage = 'http://www.gnu.org/software/gdb/gdb.html'
 description = "GDB-7.5.1: The GNU Project Debugger"
 
 sources = [SOURCELOWER_TAR_BZ2]
-source_urls = ['http://ftp.gnu.org/gnu/gdb/']
+source_urls = [GNU_SOURCE]
 
 toolchain = {'name': 'cgmvolf', 'version': '1.2.7'}
 
diff --git a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgoolf-1.1.7.eb b/easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgoolf-1.1.7.eb
index 0d0649160dae14678de70b1a31a622c6872c2b43..14dca7818ed3d23d3f1ba97b69fee5d5e991b73e 100644
--- a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgoolf-1.1.7.eb
+++ b/easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgoolf-1.1.7.eb
@@ -17,7 +17,7 @@ homepage = 'http://www.gnu.org/software/gdb/gdb.html'
 description = "GDB-7.5.1: The GNU Project Debugger"
 
 sources = [SOURCELOWER_TAR_BZ2]
-source_urls = ['http://ftp.gnu.org/gnu/gdb/']
+source_urls = [GNU_SOURCE]
 
 toolchain = {'name': 'cgoolf', 'version': '1.1.7'}
 
diff --git a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-gmvolf-1.7.12.eb b/easybuild/easyconfigs/g/GDB/GDB-7.5.1-gmvolf-1.7.12.eb
index 3c952396b70051157a499b0db5c38b97d7923e09..e54d658dee8dce58a18f9e90bf40e32e6101246d 100644
--- a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-gmvolf-1.7.12.eb
+++ b/easybuild/easyconfigs/g/GDB/GDB-7.5.1-gmvolf-1.7.12.eb
@@ -18,7 +18,7 @@ homepage = 'http://www.gnu.org/software/gdb/gdb.html'
 description = "GDB-7.5.1: The GNU Project Debugger"
 
 sources = [SOURCELOWER_TAR_BZ2]
-source_urls = ['http://ftp.gnu.org/gnu/gdb/']
+source_urls = [GNU_SOURCE]
 
 toolchain = {'name': 'gmvolf', 'version': '1.7.12'}
 
diff --git a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/g/GDB/GDB-7.5.1-gmvolf-1.7.12rc1.eb
index ee93ab0e5561b297c6e2021557b1663528683ac1..bb25a5e6214876e0b6a389f88d840d187c778da1 100644
--- a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-gmvolf-1.7.12rc1.eb
+++ b/easybuild/easyconfigs/g/GDB/GDB-7.5.1-gmvolf-1.7.12rc1.eb
@@ -18,7 +18,7 @@ homepage = 'http://www.gnu.org/software/gdb/gdb.html'
 description = "GDB-7.5.1: The GNU Project Debugger"
 
 sources = [SOURCELOWER_TAR_BZ2]
-source_urls = ['http://ftp.gnu.org/gnu/gdb/']
+source_urls = [GNU_SOURCE]
 
 toolchain = {'name': 'gmvolf', 'version': '1.7.12rc1'}
 
diff --git a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/GDB/GDB-7.5.1-goalf-1.1.0-no-OFED.eb
index b55996146991d976bc56fcbfe4db6f82891eb293..7814ec1eba5c0d8471b595f0055122d296c17125 100644
--- a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/g/GDB/GDB-7.5.1-goalf-1.1.0-no-OFED.eb
@@ -17,7 +17,7 @@ homepage = 'http://www.gnu.org/software/gdb/gdb.html'
 description = "GDB-7.5.1: The GNU Project Debugger"
 
 sources = [SOURCELOWER_TAR_BZ2]
-source_urls = ['http://ftp.gnu.org/gnu/gdb/']
+source_urls = [GNU_SOURCE]
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
diff --git a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GDB/GDB-7.5.1-goolf-1.4.10.eb
index 0f50e5f84dbfcd65660f63df9f78110ed7c58389..e2199ba07196899c77e38a46abcf3ef161b808c7 100644
--- a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/g/GDB/GDB-7.5.1-goolf-1.4.10.eb
@@ -17,7 +17,7 @@ homepage = 'http://www.gnu.org/software/gdb/gdb.html'
 description = "GDB-7.5.1: The GNU Project Debugger"
 
 sources = [SOURCELOWER_TAR_BZ2]
-source_urls = ['http://ftp.gnu.org/gnu/gdb/']
+source_urls = [GNU_SOURCE]
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
diff --git a/easybuild/easyconfigs/g/GLPK/GLPK-4.48-ictce-5.2.0.eb b/easybuild/easyconfigs/g/GLPK/GLPK-4.48-ictce-5.2.0.eb
index 9ff5eb806d774e355f06b7ba47bbb57dbd612b74..7e1027f357e7044896c021d36396eb23b88e8122 100644
--- a/easybuild/easyconfigs/g/GLPK/GLPK-4.48-ictce-5.2.0.eb
+++ b/easybuild/easyconfigs/g/GLPK/GLPK-4.48-ictce-5.2.0.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'ictce', 'version': '5.2.0'}
 toolchainopts = {'opt': True, 'optarch': True, 'pic': True}
  
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftpmirror.gnu.org/%(namelower)s']
+source_urls = [GNU_SOURCE]
 
 dependencies = [
     ('GMP', '5.1.1'),
diff --git a/easybuild/easyconfigs/g/GLPK/GLPK-4.48-ictce-5.3.0.eb b/easybuild/easyconfigs/g/GLPK/GLPK-4.48-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c44466fc3bc3f12bebbd8c12a25e7c1e91e0a4ae
--- /dev/null
+++ b/easybuild/easyconfigs/g/GLPK/GLPK-4.48-ictce-5.3.0.eb
@@ -0,0 +1,21 @@
+name = 'GLPK'
+version = '4.48'
+
+homepage = 'http://www.gnu.org/software/glpk/'
+description = """The GLPK (GNU Linear Programming Kit) package is intended for solving large-scale linear
+programming (LP), mixed integer programming (MIP), and other related problems. It is a set of routines
+written in ANSI C and organized in the form of a callable library."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'opt': True, 'optarch': True, 'pic': True}
+ 
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://ftpmirror.gnu.org/%(namelower)s']
+
+dependencies = [
+    ('GMP', '5.1.1'),
+]
+
+configopts = "--with-gmp"
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/g/GLPK/GLPK-4.53-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GLPK/GLPK-4.53-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..cb34428fa6ab00735c6bf26eefb888918cec9d7a
--- /dev/null
+++ b/easybuild/easyconfigs/g/GLPK/GLPK-4.53-goolf-1.4.10.eb
@@ -0,0 +1,20 @@
+name = 'GLPK'
+version = '4.53'
+
+homepage = 'http://www.gnu.org/software/glpk/'
+description = """The GLPK (GNU Linear Programming Kit) package is intended for solving large-scale linear
+programming (LP), mixed integer programming (MIP), and other related problems. It is a set of routines
+written in ANSI C and organized in the form of a callable library."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+ 
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://ftpmirror.gnu.org/%(namelower)s']
+
+dependencies = [
+    ('GMP', '5.1.1'),
+]
+
+configopts = "--with-gmp"
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/g/GLPK/GLPK-4.53-ictce-6.2.5.eb b/easybuild/easyconfigs/g/GLPK/GLPK-4.53-ictce-6.2.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6d0e9c123df137d4af81b7ad5b81fe9b1ebfb89a
--- /dev/null
+++ b/easybuild/easyconfigs/g/GLPK/GLPK-4.53-ictce-6.2.5.eb
@@ -0,0 +1,21 @@
+name = 'GLPK'
+version = '4.53'
+
+homepage = 'http://www.gnu.org/software/glpk/'
+description = """The GLPK (GNU Linear Programming Kit) package is intended for solving large-scale linear
+programming (LP), mixed integer programming (MIP), and other related problems. It is a set of routines
+written in ANSI C and organized in the form of a callable library."""
+
+toolchain = {'name': 'ictce', 'version': '6.2.5'}
+toolchainopts = {'opt': True, 'optarch': True, 'pic': True}
+ 
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://ftpmirror.gnu.org/%(namelower)s']
+
+dependencies = [
+    ('GMP', '5.1.1'),
+]
+
+configopts = "--with-gmp"
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/g/GLib/GLib-2.34.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/GLib/GLib-2.34.3-goalf-1.1.0-no-OFED.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e23ae02de750eef7bb7215e6943de1aaeedfb961
--- /dev/null
+++ b/easybuild/easyconfigs/g/GLib/GLib-2.34.3-goalf-1.1.0-no-OFED.eb
@@ -0,0 +1,19 @@
+name = 'GLib'
+version = '2.34.3'
+
+homepage = 'http://www.gtk.org/'
+description = """GLib is one of the base libraries of the GTK+ project"""
+
+toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['http://ftp.gnome.org/pub/gnome/sources/glib/%(version_major_minor)s/']
+sources = ['glib-%(version)s.tar.xz']
+
+dependencies = [
+    ('libffi', '3.0.13'),
+    ('gettext', '0.18.2'),
+]
+builddependencies = [('Python', '2.5.6', '-bare')]
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GLib/GLib-2.34.3-ictce-4.0.6.eb b/easybuild/easyconfigs/g/GLib/GLib-2.34.3-ictce-4.0.6.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e63e6d5920eb0f76bfcd0e3eb4f9a2d675d32b14
--- /dev/null
+++ b/easybuild/easyconfigs/g/GLib/GLib-2.34.3-ictce-4.0.6.eb
@@ -0,0 +1,19 @@
+name = 'GLib'
+version = '2.34.3'
+
+homepage = 'http://www.gtk.org/'
+description = """GLib is one of the base libraries of the GTK+ project"""
+
+toolchain = {'name': 'ictce', 'version': '4.0.6'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['http://ftp.gnome.org/pub/gnome/sources/glib/%(version_major_minor)s/']
+sources = ['glib-%(version)s.tar.xz']
+
+dependencies = [
+    ('libffi', '3.0.13'),
+    ('gettext', '0.18.2'),
+]
+builddependencies = [('Python', '2.5.6', '-bare')]
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GLib/GLib-2.34.3-ictce-5.3.0.eb b/easybuild/easyconfigs/g/GLib/GLib-2.34.3-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ddeef5db37e42245e4a29dc0c6c44efa385e1ca5
--- /dev/null
+++ b/easybuild/easyconfigs/g/GLib/GLib-2.34.3-ictce-5.3.0.eb
@@ -0,0 +1,19 @@
+name = 'GLib'
+version = '2.34.3'
+
+homepage = 'http://www.gtk.org/'
+description = """GLib is one of the base libraries of the GTK+ project"""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['http://ftp.gnome.org/pub/gnome/sources/glib/%(version_major_minor)s/']
+sources = ['glib-%(version)s.tar.xz']
+
+dependencies = [
+    ('libffi', '3.0.13'),
+    ('gettext', '0.18.2'),
+]
+builddependencies = [('Python', '2.7.3')]
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GMAP/GMAP-2013-11-27-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GMAP/GMAP-2013-11-27-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..809e34a7b8f0c77c5a3ecc718fc2b56dedb4f3c9
--- /dev/null
+++ b/easybuild/easyconfigs/g/GMAP/GMAP-2013-11-27-goolf-1.4.10.eb
@@ -0,0 +1,23 @@
+name = 'GMAP'
+version = '2013-11-27'
+
+homepage = 'http://research-pub.gene.com/gmap/'
+description = "A Genomic Mapping and Alignment Program for mRNA and EST Sequences"
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['http://research-pub.gene.com/gmap/src/']
+sources = ['%(namelower)s-gsnap-%(version)s.tar.gz']
+
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.7'),
+]
+
+# make sure the gzip, gunzip and compress binaries are available after installation
+sanity_check_paths = {
+    'files': ["bin/gmap", "bin/gsnap"],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/g/GMAP/GMAP-2013-11-27-ictce-5.3.0.eb b/easybuild/easyconfigs/g/GMAP/GMAP-2013-11-27-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4e6d4dcdaee504e31181dd83da0ed3ed2e18bab0
--- /dev/null
+++ b/easybuild/easyconfigs/g/GMAP/GMAP-2013-11-27-ictce-5.3.0.eb
@@ -0,0 +1,23 @@
+name = 'GMAP'
+version = '2013-11-27'
+
+homepage = 'http://research-pub.gene.com/gmap/'
+description = "A Genomic Mapping and Alignment Program for mRNA and EST Sequences"
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = ['http://research-pub.gene.com/gmap/src/']
+sources = ['%(namelower)s-gsnap-%(version)s.tar.gz']
+
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.7'),
+]
+
+# make sure the gzip, gunzip and compress binaries are available after installation
+sanity_check_paths = {
+    'files': ["bin/gmap", "bin/gsnap"],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/g/GMAP/GMAP-2013-11-27-ictce-5.5.0.eb b/easybuild/easyconfigs/g/GMAP/GMAP-2013-11-27-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..bc43d8e9e5d7fa6fbfd34e1ccf7ec7cc8c9dab40
--- /dev/null
+++ b/easybuild/easyconfigs/g/GMAP/GMAP-2013-11-27-ictce-5.5.0.eb
@@ -0,0 +1,23 @@
+name = 'GMAP'
+version = '2013-11-27'
+
+homepage = 'http://research-pub.gene.com/gmap/'
+description = "A Genomic Mapping and Alignment Program for mRNA and EST Sequences"
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+source_urls = ['http://research-pub.gene.com/gmap/src/']
+sources = ['%(namelower)s-gsnap-%(version)s.tar.gz']
+
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.7'),
+]
+
+# make sure the gzip, gunzip and compress binaries are available after installation
+sanity_check_paths = {
+    'files': ["bin/gmap", "bin/gsnap"],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/g/GMP/GMP-4.3.2.eb b/easybuild/easyconfigs/g/GMP/GMP-4.3.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..873b3ab74623d0854686b72c192005402003581f
--- /dev/null
+++ b/easybuild/easyconfigs/g/GMP/GMP-4.3.2.eb
@@ -0,0 +1,20 @@
+name = 'GMP'
+version = '4.3.2'
+
+homepage = 'http://gmplib.org/'
+description = """GMP is a free library for arbitrary precision arithmetic, 
+operating on signed integers, rational numbers, and floating point numbers. """
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = [GNU_SOURCE]
+
+runtest = 'check'
+
+sanity_check_paths = {
+    'files': ['lib/libgmp.so', 'include/gmp.h'],
+    'dirs': [],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/g/GMP/GMP-5.0.5-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/GMP/GMP-5.0.5-goalf-1.1.0-no-OFED.eb
index 6d6c21ad767754ecf788023eea87c2d8df986490..2706aa74863e6ebbbaef5df18b0d1d292ffb5a33 100644
--- a/easybuild/easyconfigs/g/GMP/GMP-5.0.5-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/g/GMP/GMP-5.0.5-goalf-1.1.0-no-OFED.eb
@@ -8,7 +8,7 @@ description = """GMP is a free library for arbitrary precision arithmetic,
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
 sources = [SOURCELOWER_TAR_BZ2]
-source_urls = ['http://ftp.gnu.org/gnu/gmp']
+source_urls = [GNU_SOURCE]
 
 runtest = 'check'
 
diff --git a/easybuild/easyconfigs/g/GMP/GMP-5.0.5-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GMP/GMP-5.0.5-goolf-1.4.10.eb
index e24d3871dee245945c5ce83c408892302223f94a..c9123d61f717149c15f5ee360505625e7af51ff0 100644
--- a/easybuild/easyconfigs/g/GMP/GMP-5.0.5-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/g/GMP/GMP-5.0.5-goolf-1.4.10.eb
@@ -7,7 +7,7 @@ operating on signed integers, rational numbers, and floating point numbers. """
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sources = [SOURCELOWER_TAR_BZ2]
-source_urls = ['http://ftp.gnu.org/gnu/gmp']
+source_urls = [GNU_SOURCE]
 
 runtest = 'check'
 
diff --git a/easybuild/easyconfigs/g/GMP/GMP-5.0.5-ictce-4.0.6.eb b/easybuild/easyconfigs/g/GMP/GMP-5.0.5-ictce-4.0.6.eb
index 03244c62e3718464f31ae6a149bf39d686cca92a..3c7c8b1566c00699d9c88bee779da104061a8242 100644
--- a/easybuild/easyconfigs/g/GMP/GMP-5.0.5-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/g/GMP/GMP-5.0.5-ictce-4.0.6.eb
@@ -8,7 +8,7 @@ description = """GMP is a free library for arbitrary precision arithmetic,
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
 sources = [SOURCELOWER_TAR_BZ2]
-source_urls = ['http://ftp.gnu.org/gnu/gmp']
+source_urls = [GNU_SOURCE]
 
 runtest = 'check'
 
diff --git a/easybuild/easyconfigs/g/GMP/GMP-5.0.5-ictce-5.3.0.eb b/easybuild/easyconfigs/g/GMP/GMP-5.0.5-ictce-5.3.0.eb
index aa308839e712bf21bebd9b0aacbb12abbff65002..8fdf71fe7e49ef79747550cc6ec5850d4dd20329 100644
--- a/easybuild/easyconfigs/g/GMP/GMP-5.0.5-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/g/GMP/GMP-5.0.5-ictce-5.3.0.eb
@@ -9,7 +9,7 @@ description = """GMP is a free library for arbitrary precision arithmetic,
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 sources = [SOURCELOWER_TAR_BZ2]
-source_urls = ['http://ftp.gnu.org/gnu/gmp']
+source_urls = [GNU_SOURCE]
 
 runtest = 'check'
 
diff --git a/easybuild/easyconfigs/g/GMP/GMP-5.1.1-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GMP/GMP-5.1.1-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..aebac5b344ca568f381e44a3f517068e485574f4
--- /dev/null
+++ b/easybuild/easyconfigs/g/GMP/GMP-5.1.1-goolf-1.4.10.eb
@@ -0,0 +1,20 @@
+name = 'GMP'
+version = '5.1.1'
+
+homepage = 'http://gmplib.org/'
+description = """GMP is a free library for arbitrary precision arithmetic, 
+operating on signed integers, rational numbers, and floating point numbers. """
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['http://ftp.gnu.org/gnu/gmp']
+
+runtest = 'check'
+
+sanity_check_paths = {
+    'files': ['lib/libgmp.so', 'include/gmp.h'],
+    'dirs': [],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/g/GMP/GMP-5.1.1-ictce-5.2.0.eb b/easybuild/easyconfigs/g/GMP/GMP-5.1.1-ictce-5.2.0.eb
index c0dac1a4520306f469a3d5f2e88ddaf3c198457d..af2d9401ca6e42659261ed7b43d4fedaa8bc9cae 100644
--- a/easybuild/easyconfigs/g/GMP/GMP-5.1.1-ictce-5.2.0.eb
+++ b/easybuild/easyconfigs/g/GMP/GMP-5.1.1-ictce-5.2.0.eb
@@ -8,7 +8,7 @@ operating on signed integers, rational numbers, and floating point numbers. """
 toolchain = {'name': 'ictce', 'version': '5.2.0'}
 
 sources = [SOURCELOWER_TAR_BZ2]
-source_urls = ['http://ftp.gnu.org/gnu/gmp']
+source_urls = [GNU_SOURCE]
 
 runtest = 'check'
 
diff --git a/easybuild/easyconfigs/g/GMP/GMP-5.1.1-ictce-5.3.0.eb b/easybuild/easyconfigs/g/GMP/GMP-5.1.1-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..603803b0a17d29714b69ddf5c9f763dd9cd4e84e
--- /dev/null
+++ b/easybuild/easyconfigs/g/GMP/GMP-5.1.1-ictce-5.3.0.eb
@@ -0,0 +1,20 @@
+name = 'GMP'
+version = '5.1.1'
+
+homepage = 'http://gmplib.org/'
+description = """GMP is a free library for arbitrary precision arithmetic, 
+operating on signed integers, rational numbers, and floating point numbers. """
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['http://ftp.gnu.org/gnu/gmp']
+
+runtest = 'check'
+
+sanity_check_paths = {
+    'files': ['lib/libgmp.so', 'include/gmp.h'],
+    'dirs': [],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/g/GMP/GMP-5.1.1-ictce-6.2.5.eb b/easybuild/easyconfigs/g/GMP/GMP-5.1.1-ictce-6.2.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0e349243f0303778c72881eb9f34cedccdcbc458
--- /dev/null
+++ b/easybuild/easyconfigs/g/GMP/GMP-5.1.1-ictce-6.2.5.eb
@@ -0,0 +1,20 @@
+name = 'GMP'
+version = '5.1.1'
+
+homepage = 'http://gmplib.org/'
+description = """GMP is a free library for arbitrary precision arithmetic, 
+operating on signed integers, rational numbers, and floating point numbers. """
+
+toolchain = {'name': 'ictce', 'version': '6.2.5'}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['http://ftp.gnu.org/gnu/gmp']
+
+runtest = 'check'
+
+sanity_check_paths = {
+    'files': ['lib/libgmp.so', 'include/gmp.h'],
+    'dirs': [],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/g/GMP/GMP-5.1.3-GCC-4.8.2.eb b/easybuild/easyconfigs/g/GMP/GMP-5.1.3-GCC-4.8.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..191277eee5bc18a2c50f0df64eeb4f783cbea6ca
--- /dev/null
+++ b/easybuild/easyconfigs/g/GMP/GMP-5.1.3-GCC-4.8.2.eb
@@ -0,0 +1,23 @@
+name = 'GMP'
+version = '5.1.3'
+
+homepage = 'http://gmplib.org/'
+description = """GMP is a free library for arbitrary precision arithmetic, 
+operating on signed integers, rational numbers, and floating point numbers. """
+
+toolchain = {'name': 'GCC', 'version': '4.8.2'}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = [GNU_SOURCE]
+
+# enable C++ interface
+configopts = '--enable-cxx'
+
+runtest = 'check'
+
+sanity_check_paths = {
+    'files': ['lib/libgmp.so', 'include/gmp.h'],
+    'dirs': [],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/g/GMP/GMP-5.1.3-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GMP/GMP-5.1.3-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..12faa79b4ad5bcda47b5ee7963f7b7ec36a77845
--- /dev/null
+++ b/easybuild/easyconfigs/g/GMP/GMP-5.1.3-goolf-1.4.10.eb
@@ -0,0 +1,23 @@
+name = 'GMP'
+version = '5.1.3'
+
+homepage = 'http://gmplib.org/'
+description = """GMP is a free library for arbitrary precision arithmetic, 
+operating on signed integers, rational numbers, and floating point numbers. """
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['http://ftp.gnu.org/gnu/gmp']
+
+# enable C++ interface
+configopts = '--enable-cxx'
+
+runtest = 'check'
+
+sanity_check_paths = {
+    'files': ['lib/libgmp.so', 'include/gmp.h'],
+    'dirs': [],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/g/GMP/GMP-5.1.3-ictce-5.5.0.eb b/easybuild/easyconfigs/g/GMP/GMP-5.1.3-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..bbaacb631c3c42fcc58117dd8bb1a48e14cd1460
--- /dev/null
+++ b/easybuild/easyconfigs/g/GMP/GMP-5.1.3-ictce-5.5.0.eb
@@ -0,0 +1,23 @@
+name = 'GMP'
+version = '5.1.3'
+
+homepage = 'http://gmplib.org/'
+description = """GMP is a free library for arbitrary precision arithmetic, 
+operating on signed integers, rational numbers, and floating point numbers. """
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['http://ftp.gnu.org/gnu/gmp']
+
+# enable C++ interface
+configopts = '--enable-cxx'
+
+runtest = 'check'
+
+sanity_check_paths = {
+    'files': ['lib/libgmp.so', 'include/gmp.h'],
+    'dirs': [],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/g/GMT/GMT-5.1.0-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GMT/GMT-5.1.0-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..df5338ee11be44c389e75223abd3083bb9398ad7
--- /dev/null
+++ b/easybuild/easyconfigs/g/GMT/GMT-5.1.0-goolf-1.4.10.eb
@@ -0,0 +1,38 @@
+name = "GMT"
+version = "5.1.0"
+
+easyblock = "CMakeMake"
+
+homepage = 'http://gmt.soest.hawaii.edu/'
+description = """GMT is an open source collection of about 80 command-line tools for manipulating
+ geographic and Cartesian data sets (including filtering, trend fitting, gridding, projecting,
+ etc.) and producing PostScript illustrations ranging from simple x-y plots via contour maps
+ to artificially illuminated surfaces and 3D perspective views; the GMT supplements add another
+ 40 more specialized and discipline-specific tools. """
+
+toolchain = {'version': '1.4.10', 'name': 'goolf'}
+
+sources = ['gmt-%(version)s-src.tar.bz2']
+source_urls = ['http://gmt.soest.hawaii.edu/files/download?name=']
+
+builddependencies = [('CMake', '2.8.11')]
+
+dependencies = [
+    ('PCRE', '8.12'),
+    ('GDAL', '1.9.2'),
+    ('GEOS', '3.3.5'),
+    ('Sphinx', '1.1.3', '-Python-2.7.3'),
+    ('netCDF', '4.2.1.1'),
+    ('Ghostscript', '9.10'),
+]
+
+separate_build_dir = True
+
+sanity_check_paths = {
+    'files': ['bin/gmt', 'bin/isogmt'],
+    'dirs': []
+}
+
+modextrapaths = {'GMTHOME': ''}
+
+moduleclass = 'geo'
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10-hybrid.eb
similarity index 73%
rename from easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10.eb
rename to easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10-hybrid.eb
index 86275344ababa352a211d75ed4c08d0fb1101233..2c32c1c216c62aea8f4ae0463d8eb857bbdf2a80 100644
--- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10-hybrid.eb
@@ -10,35 +10,27 @@
 # This work implements a part of the HPCBIOS project and is a component of the policy:
 # http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html
 ##
-
-easyblock = 'CMakeMake'
-
 name = 'GROMACS'
 version = '4.6.1'
+versionsuffix = '-hybrid'
 
 homepage = 'http://www.gromacs.org'
 description = """GROMACS is a versatile package to perform molecular dynamics,
-  i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles."""
+ i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles."""
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
+toolchainopts = {'openmp': True, 'usempi': True}
 
 # eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz
-sources = [
-    SOURCELOWER_TAR_GZ,
-    'regressiontests-%(version)s.tar.gz',
-]
 source_urls = [
     'ftp://ftp.gromacs.org/pub/gromacs/',  # GROMACS sources
     'http://gerrit.gromacs.org/download/',  # regression tests sources
 ]
+sources = [
+    SOURCELOWER_TAR_GZ,
+    'regressiontests-%(version)s.tar.gz',
+]
 
 builddependencies = [('CMake', '2.8.4')]
 
-configopts = "-DREGRESSIONTEST_PATH='%(builddir)s/regressiontests-%(version)s'"
-runtest = 'check'
-
-# explicitely disable CUDA support, i.e. avoid that GROMACS find and uses a system-wide CUDA compiler
-# CUDA and GCC v4.7 don't play well together
-configopts += ' -DGMX_GPU=OFF'
-
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10-mt.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10-mt.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7304cc57896b515587d234d93c18cb3ee339c330
--- /dev/null
+++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolf-1.4.10-mt.eb
@@ -0,0 +1,36 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University
+# Authors::   Wiktor Jurkowski <wiktor.jurkowski@uni.lu>, Fotis Georgatos <fotis.georgatos@uni.lu>, \
+#             George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Kenneth Hoste
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html
+##
+name = 'GROMACS'
+version = '4.6.1'
+versionsuffix = '-mt'
+
+homepage = 'http://www.gromacs.org'
+description = """GROMACS is a versatile package to perform molecular dynamics,
+ i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+toolchainopts = {'openmp': True, 'usempi': False}
+
+# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz
+source_urls = [
+    'ftp://ftp.gromacs.org/pub/gromacs/',  # GROMACS sources
+    'http://gerrit.gromacs.org/download/',  # regression tests sources
+]
+sources = [
+    SOURCELOWER_TAR_GZ,
+    'regressiontests-%(version)s.tar.gz',
+]
+
+builddependencies = [('CMake', '2.8.4')]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-hybrid.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-hybrid.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d2a6762f37432e3208ee97961ae6930d54473302
--- /dev/null
+++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-hybrid.eb
@@ -0,0 +1,39 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University
+# Authors::   Wiktor Jurkowski <wiktor.jurkowski@uni.lu>, Fotis Georgatos <fotis.georgatos@uni.lu>, \
+#             George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Kenneth Hoste
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html
+##
+name = 'GROMACS'
+version = '4.6.1'
+versionsuffix = '-hybrid'
+
+homepage = 'http://www.gromacs.org'
+description = """GROMACS is a versatile package to perform molecular dynamics,
+ i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles."""
+
+toolchain = {'name': 'goolfc', 'version': '1.3.12'}
+toolchainopts = {'openmp': True, 'usempi': True}
+
+# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz
+source_urls = [
+    'ftp://ftp.gromacs.org/pub/gromacs/',  # GROMACS sources
+    'http://gerrit.gromacs.org/download/',  # regression tests sources
+]
+sources = [
+    SOURCELOWER_TAR_GZ,
+    'regressiontests-%(version)s.tar.gz',
+]
+
+builddependencies = [('CMake', '2.8.4')]
+
+# GROMACS required one GPU per MPI process used, so lets keep it at a minimum
+configopts = '-DGMX_TEST_NUMBER_PROCS=2'
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-mt.eb
similarity index 82%
rename from easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12.eb
rename to easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-mt.eb
index 07428ab1c04942473ca95cf8134d93dd2188c540..caa9471e7c454ff8a28ddca3e810003f0a35a36b 100644
--- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12.eb
+++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-mt.eb
@@ -10,31 +10,27 @@
 # This work implements a part of the HPCBIOS project and is a component of the policy:
 # http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html
 ##
-
-easyblock = 'CMakeMake'
-
 name = 'GROMACS'
 version = '4.6.1'
+versionsuffix = '-mt'
 
 homepage = 'http://www.gromacs.org'
 description = """GROMACS is a versatile package to perform molecular dynamics,
-  i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles."""
+ i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles."""
 
 toolchain = {'name': 'goolfc', 'version': '1.3.12'}
+toolchainopts = {'openmp': True, 'usempi': False}
 
 # eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz
-sources = [
-    SOURCELOWER_TAR_GZ,
-    'regressiontests-%(version)s.tar.gz',
-]
 source_urls = [
     'ftp://ftp.gromacs.org/pub/gromacs/',  # GROMACS sources
     'http://gerrit.gromacs.org/download/',  # regression tests sources
 ]
+sources = [
+    SOURCELOWER_TAR_GZ,
+    'regressiontests-%(version)s.tar.gz',
+]
 
 builddependencies = [('CMake', '2.8.4')]
 
-configopts = "-DREGRESSIONTEST_PATH='%(builddir)s/regressiontests-%(version)s'"
-runtest = 'check'
-
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-ictce-5.3.0-hybrid.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-ictce-5.3.0-hybrid.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6dcbff4c396b765a07ff4f7aefd7922aeee0f8d1
--- /dev/null
+++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-ictce-5.3.0-hybrid.eb
@@ -0,0 +1,36 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University
+# Authors::   Wiktor Jurkowski <wiktor.jurkowski@uni.lu>, Fotis Georgatos <fotis.georgatos@uni.lu>, \
+#             George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Kenneth Hoste
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html
+##
+name = 'GROMACS'
+version = '4.6.1'
+versionsuffix = '-hybrid'
+
+homepage = 'http://www.gromacs.org'
+description = """GROMACS is a versatile package to perform molecular dynamics,
+ i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'openmp': True, 'usempi': True}
+
+# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz
+source_urls = [
+    'ftp://ftp.gromacs.org/pub/gromacs/',  # GROMACS sources
+    'http://gerrit.gromacs.org/download/',  # regression tests sources
+]
+sources = [
+    SOURCELOWER_TAR_GZ,
+    'regressiontests-%(version)s.tar.gz',
+]
+
+builddependencies = [('CMake', '2.8.4')]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-ictce-5.3.0-mt.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-ictce-5.3.0-mt.eb
new file mode 100644
index 0000000000000000000000000000000000000000..605b8ed69d19584acbd6d8ebf9395d2d35fb62a3
--- /dev/null
+++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-ictce-5.3.0-mt.eb
@@ -0,0 +1,36 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University
+# Authors::   Wiktor Jurkowski <wiktor.jurkowski@uni.lu>, Fotis Georgatos <fotis.georgatos@uni.lu>, \
+#             George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Kenneth Hoste
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html
+##
+name = 'GROMACS'
+version = '4.6.1'
+versionsuffix = '-mt'
+
+homepage = 'http://www.gromacs.org'
+description = """GROMACS is a versatile package to perform molecular dynamics,
+ i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'openmp': True, 'usempi': False}
+
+# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz
+source_urls = [
+    'ftp://ftp.gromacs.org/pub/gromacs/',  # GROMACS sources
+    'http://gerrit.gromacs.org/download/',  # regression tests sources
+]
+sources = [
+    SOURCELOWER_TAR_GZ,
+    'regressiontests-%(version)s.tar.gz',
+]
+
+builddependencies = [('CMake', '2.8.4')]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmpolf-1.4.8-hybrid.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmpolf-1.4.8-hybrid.eb
new file mode 100644
index 0000000000000000000000000000000000000000..bbf71787ee4cf250227faf726ad09e3227914a21
--- /dev/null
+++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmpolf-1.4.8-hybrid.eb
@@ -0,0 +1,36 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University
+# Authors::   Wiktor Jurkowski <wiktor.jurkowski@uni.lu>, Fotis Georgatos <fotis.georgatos@uni.lu>, \
+#             George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Kenneth Hoste
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html
+##
+name = 'GROMACS'
+version = '4.6.5'
+versionsuffix = '-hybrid'
+
+homepage = 'http://www.gromacs.org'
+description = """GROMACS is a versatile package to perform molecular dynamics,
+ i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles."""
+
+toolchain = {'name': 'gmpolf', 'version': '1.4.8'}
+toolchainopts = {'openmp': True, 'usempi': True}
+
+# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz
+source_urls = [
+    'ftp://ftp.gromacs.org/pub/gromacs/',  # GROMACS sources
+    'http://gerrit.gromacs.org/download/',  # regression tests sources
+]
+sources = [
+    SOURCELOWER_TAR_GZ,
+    'regressiontests-%(version)s.tar.gz',
+]
+
+builddependencies = [('CMake', '2.8.12')]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmpolf-1.4.8-mt.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmpolf-1.4.8-mt.eb
new file mode 100644
index 0000000000000000000000000000000000000000..72e6d81f6cc66fdd5b27324f7ddd9a932a85ce75
--- /dev/null
+++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmpolf-1.4.8-mt.eb
@@ -0,0 +1,36 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University
+# Authors::   Wiktor Jurkowski <wiktor.jurkowski@uni.lu>, Fotis Georgatos <fotis.georgatos@uni.lu>, \
+#             George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Kenneth Hoste
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html
+##
+name = 'GROMACS'
+version = '4.6.5'
+versionsuffix = '-mt'
+
+homepage = 'http://www.gromacs.org'
+description = """GROMACS is a versatile package to perform molecular dynamics,
+ i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles."""
+
+toolchain = {'name': 'gmpolf', 'version': '1.4.8'}
+toolchainopts = {'openmp': True, 'usempi': False}
+
+# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz
+source_urls = [
+    'ftp://ftp.gromacs.org/pub/gromacs/',  # GROMACS sources
+    'http://gerrit.gromacs.org/download/',  # regression tests sources
+]
+sources = [
+    SOURCELOWER_TAR_GZ,
+    'regressiontests-%(version)s.tar.gz',
+]
+
+builddependencies = [('CMake', '2.8.12')]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmvolf-1.7.12-hybrid.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmvolf-1.7.12-hybrid.eb
new file mode 100644
index 0000000000000000000000000000000000000000..45f81add29efe945db0c28745c8ba9b779c57ddc
--- /dev/null
+++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmvolf-1.7.12-hybrid.eb
@@ -0,0 +1,36 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University
+# Authors::   Wiktor Jurkowski <wiktor.jurkowski@uni.lu>, Fotis Georgatos <fotis.georgatos@uni.lu>, \
+#             George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Kenneth Hoste
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html
+##
+name = 'GROMACS'
+version = '4.6.5'
+versionsuffix = '-hybrid'
+
+homepage = 'http://www.gromacs.org'
+description = """GROMACS is a versatile package to perform molecular dynamics,
+ i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles."""
+
+toolchain = {'name': 'gmvolf', 'version': '1.7.12'}
+toolchainopts = {'openmp': True, 'usempi': True}
+
+# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz
+source_urls = [
+    'ftp://ftp.gromacs.org/pub/gromacs/',  # GROMACS sources
+    'http://gerrit.gromacs.org/download/',  # regression tests sources
+]
+sources = [
+    SOURCELOWER_TAR_GZ,
+    'regressiontests-%(version)s.tar.gz',
+]
+
+builddependencies = [('CMake', '2.8.12')]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmvolf-1.7.12-mt.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmvolf-1.7.12-mt.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6d1ed16eeec2acdb4f28f906bf3dd1f61b0e374c
--- /dev/null
+++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmvolf-1.7.12-mt.eb
@@ -0,0 +1,36 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University
+# Authors::   Wiktor Jurkowski <wiktor.jurkowski@uni.lu>, Fotis Georgatos <fotis.georgatos@uni.lu>, \
+#             George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Kenneth Hoste
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html
+##
+name = 'GROMACS'
+version = '4.6.5'
+versionsuffix = '-mt'
+
+homepage = 'http://www.gromacs.org'
+description = """GROMACS is a versatile package to perform molecular dynamics,
+ i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles."""
+
+toolchain = {'name': 'gmvolf', 'version': '1.7.12'}
+toolchainopts = {'openmp': True, 'usempi': False}
+
+# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz
+source_urls = [
+    'ftp://ftp.gromacs.org/pub/gromacs/',  # GROMACS sources
+    'http://gerrit.gromacs.org/download/',  # regression tests sources
+]
+sources = [
+    SOURCELOWER_TAR_GZ,
+    'regressiontests-%(version)s.tar.gz',
+]
+
+builddependencies = [('CMake', '2.8.12')]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goalf-1.1.0-no-OFED-hybrid.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goalf-1.1.0-no-OFED-hybrid.eb
new file mode 100644
index 0000000000000000000000000000000000000000..afe1fbe21b75d02b916ad1b93258fc484bcb7d21
--- /dev/null
+++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goalf-1.1.0-no-OFED-hybrid.eb
@@ -0,0 +1,36 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University
+# Authors::   Wiktor Jurkowski <wiktor.jurkowski@uni.lu>, Fotis Georgatos <fotis.georgatos@uni.lu>, \
+#             George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Kenneth Hoste
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html
+##
+name = 'GROMACS'
+version = '4.6.5'
+versionsuffix = '-hybrid'
+
+homepage = 'http://www.gromacs.org'
+description = """GROMACS is a versatile package to perform molecular dynamics,
+ i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles."""
+
+toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
+toolchainopts = {'openmp': True, 'usempi': True}
+
+# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz
+source_urls = [
+    'ftp://ftp.gromacs.org/pub/gromacs/',  # GROMACS sources
+    'http://gerrit.gromacs.org/download/',  # regression tests sources
+]
+sources = [
+    SOURCELOWER_TAR_GZ,
+    'regressiontests-%(version)s.tar.gz',
+]
+
+builddependencies = [('CMake', '2.8.12')]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goalf-1.1.0-no-OFED-mt.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goalf-1.1.0-no-OFED-mt.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e9d5d04c88958c19dff2e79fe0f74f9a1bf3c437
--- /dev/null
+++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goalf-1.1.0-no-OFED-mt.eb
@@ -0,0 +1,36 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University
+# Authors::   Wiktor Jurkowski <wiktor.jurkowski@uni.lu>, Fotis Georgatos <fotis.georgatos@uni.lu>, \
+#             George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Kenneth Hoste
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html
+##
+name = 'GROMACS'
+version = '4.6.5'
+versionsuffix = '-mt'
+
+homepage = 'http://www.gromacs.org'
+description = """GROMACS is a versatile package to perform molecular dynamics,
+ i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles."""
+
+toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
+toolchainopts = {'openmp': True, 'usempi': False}
+
+# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz
+source_urls = [
+    'ftp://ftp.gromacs.org/pub/gromacs/',  # GROMACS sources
+    'http://gerrit.gromacs.org/download/',  # regression tests sources
+]
+sources = [
+    SOURCELOWER_TAR_GZ,
+    'regressiontests-%(version)s.tar.gz',
+]
+
+builddependencies = [('CMake', '2.8.12')]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-hybrid.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-hybrid.eb
new file mode 100644
index 0000000000000000000000000000000000000000..73c56d433b02d751bb7f563f2d402c57a5327b12
--- /dev/null
+++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-hybrid.eb
@@ -0,0 +1,36 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University
+# Authors::   Wiktor Jurkowski <wiktor.jurkowski@uni.lu>, Fotis Georgatos <fotis.georgatos@uni.lu>, \
+#             George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Kenneth Hoste
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html
+##
+name = 'GROMACS'
+version = '4.6.5'
+versionsuffix = '-hybrid'
+
+homepage = 'http://www.gromacs.org'
+description = """GROMACS is a versatile package to perform molecular dynamics,
+ i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+toolchainopts = {'openmp': True, 'usempi': True}
+
+# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz
+source_urls = [
+    'ftp://ftp.gromacs.org/pub/gromacs/',  # GROMACS sources
+    'http://gerrit.gromacs.org/download/',  # regression tests sources
+]
+sources = [
+    SOURCELOWER_TAR_GZ,
+    'regressiontests-%(version)s.tar.gz',
+]
+
+builddependencies = [('CMake', '2.8.12')]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-mt.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-mt.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e5cfaf582609db25df23c033ebb116baecd390b7
--- /dev/null
+++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolf-1.4.10-mt.eb
@@ -0,0 +1,36 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University
+# Authors::   Wiktor Jurkowski <wiktor.jurkowski@uni.lu>, Fotis Georgatos <fotis.georgatos@uni.lu>, \
+#             George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Kenneth Hoste
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html
+##
+name = 'GROMACS'
+version = '4.6.5'
+versionsuffix = '-mt'
+
+homepage = 'http://www.gromacs.org'
+description = """GROMACS is a versatile package to perform molecular dynamics,
+ i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+toolchainopts = {'openmp': True, 'usempi': False}
+
+# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz
+source_urls = [
+    'ftp://ftp.gromacs.org/pub/gromacs/',  # GROMACS sources
+    'http://gerrit.gromacs.org/download/',  # regression tests sources
+]
+sources = [
+    SOURCELOWER_TAR_GZ,
+    'regressiontests-%(version)s.tar.gz',
+]
+
+builddependencies = [('CMake', '2.8.12')]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-hybrid.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-hybrid.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0056d45c8c7fa34456010b03e93d3035761b8524
--- /dev/null
+++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-hybrid.eb
@@ -0,0 +1,39 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University
+# Authors::   Wiktor Jurkowski <wiktor.jurkowski@uni.lu>, Fotis Georgatos <fotis.georgatos@uni.lu>, \
+#             George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Kenneth Hoste
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html
+##
+name = 'GROMACS'
+version = '4.6.5'
+versionsuffix = '-hybrid'
+
+homepage = 'http://www.gromacs.org'
+description = """GROMACS is a versatile package to perform molecular dynamics,
+ i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles."""
+
+toolchain = {'name': 'goolfc', 'version': '2.6.10'}
+toolchainopts = {'openmp': True, 'usempi': True}
+
+# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz
+source_urls = [
+    'ftp://ftp.gromacs.org/pub/gromacs/',  # GROMACS sources
+    'http://gerrit.gromacs.org/download/',  # regression tests sources
+]
+sources = [
+    SOURCELOWER_TAR_GZ,
+    'regressiontests-%(version)s.tar.gz',
+]
+
+builddependencies = [('CMake', '2.8.12')]
+
+# GROMACS required one GPU per MPI process used, so lets keep it at a minimum
+configopts = '-DGMX_TEST_NUMBER_PROCS=2'
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-mt.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-mt.eb
new file mode 100644
index 0000000000000000000000000000000000000000..060e0556d6fc58beea964993787737586c48db2b
--- /dev/null
+++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-mt.eb
@@ -0,0 +1,36 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University
+# Authors::   Wiktor Jurkowski <wiktor.jurkowski@uni.lu>, Fotis Georgatos <fotis.georgatos@uni.lu>, \
+#             George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Kenneth Hoste
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html
+##
+name = 'GROMACS'
+version = '4.6.5'
+versionsuffix = '-mt'
+
+homepage = 'http://www.gromacs.org'
+description = """GROMACS is a versatile package to perform molecular dynamics,
+ i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles."""
+
+toolchain = {'name': 'goolfc', 'version': '2.6.10'}
+toolchainopts = {'openmp': True, 'usempi': False}
+
+# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.5.tar.gz
+source_urls = [
+    'ftp://ftp.gromacs.org/pub/gromacs/',  # GROMACS sources
+    'http://gerrit.gromacs.org/download/',  # regression tests sources
+]
+sources = [
+    SOURCELOWER_TAR_GZ,
+    'regressiontests-%(version)s.tar.gz',
+]
+
+builddependencies = [('CMake', '2.8.4')]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-hybrid.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-hybrid.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1f91b84ea436eadf4060f017627ca5b24390d437
--- /dev/null
+++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-hybrid.eb
@@ -0,0 +1,36 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University
+# Authors::   Wiktor Jurkowski <wiktor.jurkowski@uni.lu>, Fotis Georgatos <fotis.georgatos@uni.lu>, \
+#             George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Kenneth Hoste
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html
+##
+name = 'GROMACS'
+version = '4.6.5'
+versionsuffix = '-hybrid'
+
+homepage = 'http://www.gromacs.org'
+description = """GROMACS is a versatile package to perform molecular dynamics,
+ i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'openmp': True, 'usempi': True}
+
+# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz
+source_urls = [
+    'ftp://ftp.gromacs.org/pub/gromacs/',  # GROMACS sources
+    'http://gerrit.gromacs.org/download/',  # regression tests sources
+]
+sources = [
+    SOURCELOWER_TAR_GZ,
+    'regressiontests-%(version)s.tar.gz',
+]
+
+builddependencies = [('CMake', '2.8.12')]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-mt.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-mt.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b04177b6119c1eb9f6518d3ffb9fe5891f3f28f5
--- /dev/null
+++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-ictce-5.5.0-mt.eb
@@ -0,0 +1,36 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University
+# Authors::   Wiktor Jurkowski <wiktor.jurkowski@uni.lu>, Fotis Georgatos <fotis.georgatos@uni.lu>, \
+#             George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Kenneth Hoste
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html
+##
+name = 'GROMACS'
+version = '4.6.5'
+versionsuffix = '-mt'
+
+homepage = 'http://www.gromacs.org'
+description = """GROMACS is a versatile package to perform molecular dynamics,
+ i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'openmp': True, 'usempi': False}
+
+# eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz
+source_urls = [
+    'ftp://ftp.gromacs.org/pub/gromacs/',  # GROMACS sources
+    'http://gerrit.gromacs.org/download/',  # regression tests sources
+]
+sources = [
+    SOURCELOWER_TAR_GZ,
+    'regressiontests-%(version)s.tar.gz',
+]
+
+builddependencies = [('CMake', '2.8.12')]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/GSL/GSL-1.15-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/GSL/GSL-1.15-goalf-1.1.0-no-OFED.eb
index 4390cf21c4f3e0d79cfd1b8483d187156166b1f9..aa9ed9d6e06240518de6ce7939de6eca7c57916e 100644
--- a/easybuild/easyconfigs/g/GSL/GSL-1.15-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/g/GSL/GSL-1.15-goalf-1.1.0-no-OFED.eb
@@ -8,7 +8,7 @@ description = """The GNU Scientific Library (GSL) is a numerical library for C a
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 toolchainopts = {'opt': True, 'optarch': True, 'unroll': True, 'pic': True}
 
-source_urls = ['http://ftpmirror.gnu.org/gsl/']
+source_urls = [GNU_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 configopts = "--with-pic"
diff --git a/easybuild/easyconfigs/g/GSL/GSL-1.15-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GSL/GSL-1.15-goolf-1.4.10.eb
index fe1750892420d2b850f40ca684f13f7dbe2a266f..2ee4d9e6cd9685011f1b291f1d248efda710bb50 100644
--- a/easybuild/easyconfigs/g/GSL/GSL-1.15-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/g/GSL/GSL-1.15-goolf-1.4.10.eb
@@ -4,10 +4,11 @@ version = '1.15'
 homepage = 'http://www.gnu.org/software/gsl/'
 description = """The GNU Scientific Library (GSL) is a numerical library for C and C++ programmers.
 The library provides a wide range of mathematical routines such as random number generators, special functions and least-squares fitting."""
+
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'opt': True, 'optarch': True, 'unroll': True, 'pic': True}
 
-source_urls = ['http://ftpmirror.gnu.org/gsl/']
+source_urls = [GNU_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 configopts = "--with-pic"
diff --git a/easybuild/easyconfigs/g/GSL/GSL-1.15-ictce-4.0.6.eb b/easybuild/easyconfigs/g/GSL/GSL-1.15-ictce-4.0.6.eb
index acfba35290fc9ee510002161732522095cdccdb2..d1b3c6c69908e7416352d15b9be7420bd7cfd74e 100644
--- a/easybuild/easyconfigs/g/GSL/GSL-1.15-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/g/GSL/GSL-1.15-ictce-4.0.6.eb
@@ -8,7 +8,7 @@ description = """The GNU Scientific Library (GSL) is a numerical library for C a
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
 toolchainopts = {'opt': True, 'optarch': True, 'unroll': True, 'pic': True}
 
-source_urls = ['http://ftpmirror.gnu.org/gsl/']
+source_urls = [GNU_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 configopts = "--with-pic"
diff --git a/easybuild/easyconfigs/g/GSL/GSL-1.15-ictce-5.3.0.eb b/easybuild/easyconfigs/g/GSL/GSL-1.15-ictce-5.3.0.eb
index 46fb6c2c19a464cc31ec64bba7c1025bb1710432..b06aa6754ea3a16f04b9f6b272a6972aa5fb639e 100644
--- a/easybuild/easyconfigs/g/GSL/GSL-1.15-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/g/GSL/GSL-1.15-ictce-5.3.0.eb
@@ -5,11 +5,10 @@ homepage = 'http://www.gnu.org/software/gsl/'
 description = """The GNU Scientific Library (GSL) is a numerical library for C and C++ programmers.
  The library provides a wide range of mathematical routines such as random number generators, special functions and least-squares fitting."""
 
-
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 toolchainopts = {'opt': True, 'optarch': True, 'unroll': True, 'pic': True}
 
-source_urls = ['http://ftpmirror.gnu.org/gsl/']
+source_urls = [GNU_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 configopts = "--with-pic"
diff --git a/easybuild/easyconfigs/g/GSL/GSL-1.16-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GSL/GSL-1.16-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2d05bc47751bfe572eafcf7ccec667849b47def1
--- /dev/null
+++ b/easybuild/easyconfigs/g/GSL/GSL-1.16-goolf-1.4.10.eb
@@ -0,0 +1,16 @@
+name = 'GSL'
+version = '1.16'
+
+homepage = 'http://www.gnu.org/software/gsl/'
+description = """The GNU Scientific Library (GSL) is a numerical library for C and C++ programmers.
+The library provides a wide range of mathematical routines such as random number generators, special functions and least-squares fitting."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+toolchainopts = {'opt': True, 'optarch': True, 'unroll': True, 'pic': True}
+
+source_urls = ['http://ftpmirror.gnu.org/gsl/']
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = "--with-pic"
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/g/GSL/GSL-1.16-goolfc-1.3.12.eb b/easybuild/easyconfigs/g/GSL/GSL-1.16-goolfc-1.3.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c7926143598193d85fb1916e9f7c9fa1c303032e
--- /dev/null
+++ b/easybuild/easyconfigs/g/GSL/GSL-1.16-goolfc-1.3.12.eb
@@ -0,0 +1,16 @@
+name = 'GSL'
+version = '1.16'
+
+homepage = 'http://www.gnu.org/software/gsl/'
+description = """The GNU Scientific Library (GSL) is a numerical library for C and C++ programmers.
+The library provides a wide range of mathematical routines such as random number generators, special functions and least-squares fitting."""
+
+toolchain = {'name': 'goolfc', 'version': '1.3.12'}
+toolchainopts = {'opt': True, 'optarch': True, 'unroll': True, 'pic': True}
+
+source_urls = ['http://ftpmirror.gnu.org/gsl/']
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = "--with-pic"
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/g/GSL/GSL-1.16-goolfc-2.6.10.eb b/easybuild/easyconfigs/g/GSL/GSL-1.16-goolfc-2.6.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..db182f74d85e5fd2f3dc5c6609ecdc15cceee549
--- /dev/null
+++ b/easybuild/easyconfigs/g/GSL/GSL-1.16-goolfc-2.6.10.eb
@@ -0,0 +1,16 @@
+name = 'GSL'
+version = '1.16'
+
+homepage = 'http://www.gnu.org/software/gsl/'
+description = """The GNU Scientific Library (GSL) is a numerical library for C and C++ programmers.
+The library provides a wide range of mathematical routines such as random number generators, special functions and least-squares fitting."""
+
+toolchain = {'name': 'goolfc', 'version': '2.6.10'}
+toolchainopts = {'opt': True, 'optarch': True, 'unroll': True, 'pic': True}
+
+source_urls = ['http://ftpmirror.gnu.org/gsl/']
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = "--with-pic"
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/g/GSL/GSL-1.16-ictce-5.3.0.eb b/easybuild/easyconfigs/g/GSL/GSL-1.16-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4a057258305c0c61627a29654dfcd4913b548320
--- /dev/null
+++ b/easybuild/easyconfigs/g/GSL/GSL-1.16-ictce-5.3.0.eb
@@ -0,0 +1,16 @@
+name = 'GSL'
+version = '1.16'
+
+homepage = 'http://www.gnu.org/software/gsl/'
+description = """The GNU Scientific Library (GSL) is a numerical library for C and C++ programmers.
+ The library provides a wide range of mathematical routines such as random number generators, special functions and least-squares fitting."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'opt': True, 'optarch': True, 'unroll': True, 'pic': True}
+
+source_urls = ['http://ftpmirror.gnu.org/gsl/']
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = "--with-pic"
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/g/GSL/GSL-1.16-ictce-5.5.0.eb b/easybuild/easyconfigs/g/GSL/GSL-1.16-ictce-5.5.0.eb
index 3279101aebc4020dee90c015b07457fce3e28377..f649ead9a54e00bc86667a3ebd35a75526da5533 100644
--- a/easybuild/easyconfigs/g/GSL/GSL-1.16-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/g/GSL/GSL-1.16-ictce-5.5.0.eb
@@ -8,7 +8,7 @@ description = """The GNU Scientific Library (GSL) is a numerical library for C a
 toolchain = {'name': 'ictce', 'version': '5.5.0'}
 toolchainopts = {'opt': True, 'optarch': True, 'unroll': True, 'pic': True}
 
-source_urls = ['http://ftpmirror.gnu.org/gsl/']
+source_urls = [GNU_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 configopts = "--with-pic"
diff --git a/easybuild/easyconfigs/g/GSL/GSL-1.16-ictce-6.2.5.eb b/easybuild/easyconfigs/g/GSL/GSL-1.16-ictce-6.2.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c460ded15952533151569bfdb9b3ebfeac992ab0
--- /dev/null
+++ b/easybuild/easyconfigs/g/GSL/GSL-1.16-ictce-6.2.5.eb
@@ -0,0 +1,16 @@
+name = 'GSL'
+version = '1.16'
+
+homepage = 'http://www.gnu.org/software/gsl/'
+description = """The GNU Scientific Library (GSL) is a numerical library for C and C++ programmers.
+ The library provides a wide range of mathematical routines such as random number generators, special functions and least-squares fitting."""
+
+toolchain = {'name': 'ictce', 'version': '6.2.5'}
+toolchainopts = {'opt': True, 'optarch': True, 'unroll': True, 'pic': True}
+
+source_urls = ['http://ftpmirror.gnu.org/gsl/']
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = "--with-pic"
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/g/Ghostscript/Ghostscript-9.10-goolf-1.4.10.eb b/easybuild/easyconfigs/g/Ghostscript/Ghostscript-9.10-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9e63e7389c8ea5414822c5d608061db898b92b18
--- /dev/null
+++ b/easybuild/easyconfigs/g/Ghostscript/Ghostscript-9.10-goolf-1.4.10.eb
@@ -0,0 +1,22 @@
+name = 'Ghostscript'
+version = '9.10'
+
+homepage = 'http://ghostscript.com'
+description = """Ghostscript is a versatile processor for PostScript data with the ability to render PostScript to
+ different targets. It used to be part of the cups printing stack, but is no longer used for that."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+toolchainopts = {'pic': True}
+
+source_urls = ["http://downloads.ghostscript.com/public/"]
+sources = [SOURCELOWER_TAR_GZ]
+
+# expat, freetype and libpng are optional deps,
+# these are actually patched and included in the sources,
+dependencies = [
+    ('LibTIFF', '4.0.3'),
+]
+
+configopts = "--with-system-libtiff --enable-dynamic"
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/g/Ghostscript/Ghostscript-9.10-ictce-4.1.13.eb b/easybuild/easyconfigs/g/Ghostscript/Ghostscript-9.10-ictce-4.1.13.eb
new file mode 100644
index 0000000000000000000000000000000000000000..12bdcd0f27e01a885925d650c8518a1c8357c254
--- /dev/null
+++ b/easybuild/easyconfigs/g/Ghostscript/Ghostscript-9.10-ictce-4.1.13.eb
@@ -0,0 +1,22 @@
+name = 'Ghostscript'
+version = '9.10'
+
+homepage = 'http://ghostscript.com'
+description = """Ghostscript is a versatile processor for PostScript data with the ability to render PostScript to
+ different targets. It used to be part of the cups printing stack, but is no longer used for that."""
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+toolchainopts = {'pic': True}
+
+source_urls = ["http://downloads.ghostscript.com/public/"]
+sources = [SOURCELOWER_TAR_GZ]
+
+# expat, freetype and libpng are optional deps,
+# these are actually patched and included in the sources,
+dependencies = [
+    ('LibTIFF', '4.0.3'),
+]
+
+configopts = "--with-system-libtiff --enable-dynamic"
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index 1dd4e23222b9bbd7f80347f65bbed05d4adeb00a..3fe29d57a514856ad64d3f239f8739236fc52148 100644
--- a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -5,15 +5,15 @@ version = '0.4.0'
 
 homepage = 'https://github.com/python-greenlet/greenlet'
 description = """The greenlet package is a spin-off of Stackless, a version of CPython that
- supports micro-threads called "tasklets". Tasklets run pseudo-concurrently (typically in a single
- or a few OS-level threads) and are synchronized with data exchanges on "channels".
- A "greenlet", on the other hand, is a still more primitive notion of micro-thread with no implicit
+ supports micro-threads called 'tasklets'. Tasklets run pseudo-concurrently (typically in a single
+ or a few OS-level threads) and are synchronized with data exchanges on 'channels'.
+ A 'greenlet', on the other hand, is a still more primitive notion of micro-thread with no implicit
  scheduling; coroutines, in other words. This is useful when you want to control exactly when your code runs."""
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
-source_urls = ['http://pypi.python.org/packages/source/g/greenlet/']
-sources = ['%s-%s.zip' % (name.lower(), version)]
+source_urls = [PYPI_LOWER_SOURCE]
+sources = [SOURCELOWER_ZIP]
 
 python = "Python"
 pythonversion = '2.7.3'
@@ -21,16 +21,12 @@ pythonshortversion = ".".join(pythonversion.split(".")[:-1])
 
 versionsuffix = "-%s-%s" % (python, pythonversion)
 
-dependencies = [
-                (python, pythonversion),
-                ]
-
+dependencies = [(python, pythonversion)]
 
 sanity_check_paths = {
-                      'files': ['include/python%s/greenlet/greenlet.h' % pythonshortversion,
-                                'lib/python%s/site-packages/greenlet.so' % pythonshortversion,
-                                ],
-                      'dirs': []
-                     }
+    'files': ['include/python%s/greenlet/greenlet.h' % pythonshortversion,
+              'lib/python%s/site-packages/greenlet.so' % pythonshortversion],
+    'dirs': [],
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goolf-1.4.10-Python-2.7.3.eb
index 73c65c5deab26aa70f597435da8b2203994d1773..e565f9119a3c4054b032a66368da63fb19d7aee1 100644
--- a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goolf-1.4.10-Python-2.7.3.eb
@@ -5,15 +5,15 @@ version = '0.4.0'
 
 homepage = 'https://github.com/python-greenlet/greenlet'
 description = """The greenlet package is a spin-off of Stackless, a version of CPython that
-supports micro-threads called "tasklets". Tasklets run pseudo-concurrently (typically in a single
-or a few OS-level threads) and are synchronized with data exchanges on "channels".
-A "greenlet", on the other hand, is a still more primitive notion of micro-thread with no implicit
+supports micro-threads called 'tasklets'. Tasklets run pseudo-concurrently (typically in a single
+or a few OS-level threads) and are synchronized with data exchanges on 'channels'.
+A 'greenlet', on the other hand, is a still more primitive notion of micro-thread with no implicit
 scheduling; coroutines, in other words. This is useful when you want to control exactly when your code runs.
 """
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-source_urls = ['http://pypi.python.org/packages/source/g/greenlet/']
-sources = ['%s-%s.zip' % (name.lower(), version)]
+source_urls = [PYPI_LOWER_SOURCE]
+sources = [SOURCELOWER_ZIP]
 
 python = "Python"
 pythonversion = '2.7.3'
@@ -21,16 +21,12 @@ pythonshortversion = ".".join(pythonversion.split(".")[:-1])
 
 versionsuffix = "-%s-%s" % (python, pythonversion)
 
-dependencies = [
-                (python, pythonversion),
-                ]
-
+dependencies = [(python, pythonversion)]
 
 sanity_check_paths = {
-                      'files': ['include/python%s/greenlet/greenlet.h' % pythonshortversion,
-                                'lib/python%s/site-packages/greenlet.so' % pythonshortversion,
-                                ],
-                      'dirs': []
-                     }
+    'files': ['include/python%s/greenlet/greenlet.h' % pythonshortversion,
+              'lib/python%s/site-packages/greenlet.so' % pythonshortversion],
+    'dirs': [],
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-4.1.13-Python-2.7.3.eb
index bb349c82a47796c4f8b01e072440bdda1ac6098e..97e626f9df1ec4349c5800cd70f6c00d11f5411d 100644
--- a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-4.1.13-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-4.1.13-Python-2.7.3.eb
@@ -5,15 +5,15 @@ version = '0.4.0'
 
 homepage = 'https://github.com/python-greenlet/greenlet'
 description = """The greenlet package is a spin-off of Stackless, a version of CPython that
- supports micro-threads called "tasklets". Tasklets run pseudo-concurrently (typically in a single
- or a few OS-level threads) and are synchronized with data exchanges on "channels".
- A "greenlet", on the other hand, is a still more primitive notion of micro-thread with no implicit
+ supports micro-threads called 'tasklets'. Tasklets run pseudo-concurrently (typically in a single
+ or a few OS-level threads) and are synchronized with data exchanges on 'channels'.
+ A 'greenlet', on the other hand, is a still more primitive notion of micro-thread with no implicit
  scheduling; coroutines, in other words. This is useful when you want to control exactly when your code runs."""
 
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
-source_urls = ['http://pypi.python.org/packages/source/g/greenlet/']
-sources = ['%s-%s.zip' % (name.lower(), version)]
+source_urls = [PYPI_LOWER_SOURCE]
+sources = [SOURCELOWER_ZIP]
 
 python = "Python"
 pythonversion = '2.7.3'
@@ -21,19 +21,14 @@ pythonshortversion = ".".join(pythonversion.split(".")[:-1])
 
 versionsuffix = "-%s-%s" % (python, pythonversion)
 
-dependencies = [
-                (python, pythonversion),
-                ]
+dependencies = [(python, pythonversion)]
 
-patches = [
-           'icc_no_amd64_predefined_in_prepocessor.patch',
-           ]
+patches = ['icc_no_amd64_predefined_in_prepocessor.patch']
 
 sanity_check_paths = {
-                      'files': ['include/python%s/greenlet/greenlet.h' % pythonshortversion,
-                                'lib/python%s/site-packages/greenlet.so' % pythonshortversion,
-                                ],
-                      'dirs': []
-                     }
+    'files': ['include/python%s/greenlet/greenlet.h' % pythonshortversion,
+              'lib/python%s/site-packages/greenlet.so' % pythonshortversion],
+    'dirs': [],
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-5.3.0-Python-2.7.3.eb
index d3dfb0cdefcee268fe760acffd1bd24b2370409c..0870a40f7e278a46adee33ffa1cbc30ac8e6d408 100644
--- a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-5.3.0-Python-2.7.3.eb
@@ -5,16 +5,15 @@ version = '0.4.0'
 
 homepage = 'https://github.com/python-greenlet/greenlet'
 description = """The greenlet package is a spin-off of Stackless, a version of CPython that
- supports micro-threads called "tasklets". Tasklets run pseudo-concurrently (typically in a single
- or a few OS-level threads) and are synchronized with data exchanges on "channels".
- A "greenlet", on the other hand, is a still more primitive notion of micro-thread with no implicit
+ supports micro-threads called 'tasklets'. Tasklets run pseudo-concurrently (typically in a single
+ or a few OS-level threads) and are synchronized with data exchanges on 'channels'.
+ A 'greenlet', on the other hand, is a still more primitive notion of micro-thread with no implicit
  scheduling; coroutines, in other words. This is useful when you want to control exactly when your code runs."""
 
-
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
-source_urls = ['http://pypi.python.org/packages/source/g/greenlet/']
-sources = ['%s-%s.zip' % (name.lower(), version)]
+source_urls = [PYPI_LOWER_SOURCE]
+sources = [SOURCELOWER_ZIP]
 
 python = "Python"
 pythonversion = '2.7.3'
@@ -22,19 +21,14 @@ pythonshortversion = ".".join(pythonversion.split(".")[:-1])
 
 versionsuffix = "-%s-%s" % (python, pythonversion)
 
-dependencies = [
-                (python, pythonversion),
-                ]
+dependencies = [(python, pythonversion)]
 
-patches = [
-           'icc_no_amd64_predefined_in_prepocessor.patch',
-           ]
+patches = ['icc_no_amd64_predefined_in_prepocessor.patch']
 
 sanity_check_paths = {
-                      'files': ['include/python%s/greenlet/greenlet.h' % pythonshortversion,
-                                'lib/python%s/site-packages/greenlet.so' % pythonshortversion,
-                                ],
-                      'dirs': []
-                     }
+    'files': ['include/python%s/greenlet/greenlet.h' % pythonshortversion,
+              'lib/python%s/site-packages/greenlet.so' % pythonshortversion],
+    'dirs': [],
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.2-ictce-5.5.0-Python-2.7.5.eb b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.2-ictce-5.5.0-Python-2.7.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7d6a8077319b7f1db7abf723464623b40c7a2723
--- /dev/null
+++ b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.2-ictce-5.5.0-Python-2.7.5.eb
@@ -0,0 +1,34 @@
+easyblock = "PythonPackage"
+
+name = 'Greenlet'
+version = '0.4.2'
+
+homepage = 'https://github.com/python-greenlet/greenlet'
+description = """The greenlet package is a spin-off of Stackless, a version of CPython that
+ supports micro-threads called "tasklets". Tasklets run pseudo-concurrently (typically in a single
+ or a few OS-level threads) and are synchronized with data exchanges on "channels".
+ A "greenlet", on the other hand, is a still more primitive notion of micro-thread with no implicit
+ scheduling; coroutines, in other words. This is useful when you want to control exactly when your code runs."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+source_urls = [PYPI_LOWER_SOURCE]
+sources = [SOURCELOWER_ZIP]
+
+python = "Python"
+pythonversion = '2.7.5'
+pythonshortversion = ".".join(pythonversion.split(".")[:-1])
+
+versionsuffix = "-%s-%s" % (python, pythonversion)
+
+dependencies = [(python, pythonversion)]
+
+patches = ['Greenlet-%(version)s_icc_no_amd64_predefined_in_prepocessor.patch']
+
+sanity_check_paths = {
+    'files': ['include/python%s/greenlet/greenlet.h' % pythonshortversion,
+              'lib/python%s/site-packages/greenlet.so' % pythonshortversion],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.2-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.2-ictce-5.5.0-Python-2.7.6.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ae5c1573ae49b374fa12c203684718ebbe9d60e6
--- /dev/null
+++ b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.2-ictce-5.5.0-Python-2.7.6.eb
@@ -0,0 +1,33 @@
+easyblock = "PythonPackage"
+
+name = 'Greenlet'
+version = '0.4.2'
+
+homepage = 'https://github.com/python-greenlet/greenlet'
+description = """The greenlet package is a spin-off of Stackless, a version of CPython that
+supports micro-threads called "tasklets". Tasklets run pseudo-concurrently (typically in a single
+or a few OS-level threads) and are synchronized with data exchanges on "channels".
+A "greenlet", on the other hand, is a still more primitive notion of micro-thread with no implicit
+scheduling; coroutines, in other words. This is useful when you want to control exactly when your code runs.
+"""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+source_urls = ['http://pypi.python.org/packages/source/g/greenlet/']
+sources = ['%s-%s.zip' % (name.lower(), version)]
+
+python = "Python"
+pythonversion = '2.7.6'
+pythonshortversion = ".".join(pythonversion.split(".")[:-1])
+
+versionsuffix = "-%s-%s" % (python, pythonversion)
+
+dependencies = [(python, pythonversion)]
+
+patches = ['Greenlet-%(version)s_icc_no_amd64_predefined_in_prepocessor.patch']
+
+sanity_check_paths = {
+    'files': ['include/python%s/greenlet/greenlet.h' % pythonshortversion,
+              'lib/python%s/site-packages/greenlet.so' % pythonshortversion],
+    'dirs': [],
+}
diff --git a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.2_icc_no_amd64_predefined_in_prepocessor.patch b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.2_icc_no_amd64_predefined_in_prepocessor.patch
new file mode 100644
index 0000000000000000000000000000000000000000..fc194827fc4ec87219e010aed59b573cc6fbdc55
--- /dev/null
+++ b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.2_icc_no_amd64_predefined_in_prepocessor.patch
@@ -0,0 +1,14 @@
+--- greenlet-0.4.2/slp_platformselect.h.orig	2014-01-06 23:48:38.000000000 +0100
++++ greenlet-0.4.2/slp_platformselect.h	2014-01-17 17:44:34.793309559 +0100
+@@ -6,9 +6,9 @@
+ #include "platform/switch_x86_msvc.h" /* MS Visual Studio on X86 */
+ #elif defined(MS_WIN64) && defined(_M_X64) && defined(_MSC_VER)
+ #include "platform/switch_x64_msvc.h" /* MS Visual Studio on X64 */
+-#elif defined(__GNUC__) && defined(__amd64__) && defined(__ILP32__)
++#elif defined(__GNUC__) && defined(__x86_64__) && defined(__ILP32__)
+ #include "platform/switch_x32_unix.h" /* gcc on amd64 with x32 ABI */
+-#elif defined(__GNUC__) && defined(__amd64__)
++#elif defined(__GNUC__) && defined(__x86_64__)
+ #include "platform/switch_amd64_unix.h" /* gcc on amd64 */
+ #elif defined(__GNUC__) && defined(__i386__)
+ #include "platform/switch_x86_unix.h" /* gcc on X86 */
diff --git a/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-goalf-1.1.0-no-OFED.eb
index dbced3e64ba69cdcc2a9619c963d448fefa837d9..dc7e4b916abfcb7ea6565f163072b8a34755e097 100644
--- a/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-goalf-1.1.0-no-OFED.eb
@@ -2,16 +2,16 @@ name = 'g2clib'
 version = '1.2.3'
 
 homepage = 'http://www.nco.ncep.noaa.gov/pmb/codes/GRIB2/'
-description = """Library contains GRIB2 encoder/decoder ("C" version)."""
+description = """Library contains GRIB2 encoder/decoder ('C' version)."""
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 toolchainopts = {'opt': True}
 
-dependencies = [('JasPer', '1.900.1')]
-
-sources = ['%s-%s.tar' % (name, version)]
+sources = [SOURCE_TAR]
 source_urls = [homepage]
 
+dependencies = [('JasPer', '1.900.1')]
+
 # parallel build tends to fail
 parallel = 1
 
diff --git a/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-goolf-1.4.10.eb b/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-goolf-1.4.10.eb
index 40a9844a0419d8ddc0b60a5efc9414365f4ed6c3..5636300f58e0a90c8d120a91ac871dc17d5f3568 100644
--- a/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-goolf-1.4.10.eb
@@ -2,15 +2,15 @@ name = 'g2clib'
 version = '1.2.3'
 
 homepage = 'http://www.nco.ncep.noaa.gov/pmb/codes/GRIB2/'
-description = """Library contains GRIB2 encoder/decoder ("C" version)."""
+description = """Library contains GRIB2 encoder/decoder ('C' version)."""
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'opt': True}
 
-dependencies = [('JasPer', '1.900.1')]
-
-sources = ['%s-%s.tar' % (name, version)]
+sources = [SOURCE_TAR]
 source_urls = [homepage]
 
+dependencies = [('JasPer', '1.900.1')]
+
 # parallel build tends to fail
 parallel = 1
 
diff --git a/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-3.2.2.u3.eb
index 6626ea041283c6cf12d275432239281a00556a25..d473bf8554bbc704b1f2e0557889b93a10975c2f 100644
--- a/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-3.2.2.u3.eb
+++ b/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-3.2.2.u3.eb
@@ -2,16 +2,16 @@ name = 'g2clib'
 version = '1.2.3'
 
 homepage = 'http://www.nco.ncep.noaa.gov/pmb/codes/GRIB2/'
-description = """Library contains GRIB2 encoder/decoder ("C" version)."""
+description = """Library contains GRIB2 encoder/decoder ('C' version)."""
 
 toolchain = {'name': 'ictce', 'version': '3.2.2.u3'}
 toolchainopts = {'opt': True}
 
-dependencies = [('JasPer', '1.900.1')]
-
-sources = ['%s-%s.tar' % (name, version)]
+sources = [SOURCE_TAR]
 source_urls = [homepage]
 
+dependencies = [('JasPer', '1.900.1')]
+
 # parallel build tends to fail
 parallel = 1
 
diff --git a/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-5.3.0.eb b/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-5.3.0.eb
index 1e2986028253382faeb55753a7643fc74ea87f77..c37064649240e4b0cff7b299296df35344ebb33b 100644
--- a/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-5.3.0.eb
@@ -2,17 +2,16 @@ name = 'g2clib'
 version = '1.2.3'
 
 homepage = 'http://www.nco.ncep.noaa.gov/pmb/codes/GRIB2/'
-description = """Library contains GRIB2 encoder/decoder ("C" version)."""
-
+description = """Library contains GRIB2 encoder/decoder ('C' version)."""
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 toolchainopts = {'opt': True}
 
-dependencies = [('JasPer', '1.900.1')]
-
-sources = ['%s-%s.tar' % (name, version)]
+sources = [SOURCE_TAR]
 source_urls = [homepage]
 
+dependencies = [('JasPer', '1.900.1')]
+
 # parallel build tends to fail
 parallel = 1
 
diff --git a/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-ictce-4.1.13.eb b/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-ictce-4.1.13.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fca617a485e64113c1d2c6f9a9b5ea51f843c06e
--- /dev/null
+++ b/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-ictce-4.1.13.eb
@@ -0,0 +1,18 @@
+name = 'g2clib'
+version = '1.4.0'
+
+homepage = 'http://www.nco.ncep.noaa.gov/pmb/codes/GRIB2/'
+description = """Library contains GRIB2 encoder/decoder ('C' version)."""
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+toolchainopts = {'opt': True}
+
+sources = [SOURCE_TAR]
+source_urls = [homepage]
+
+dependencies = [('JasPer', '1.900.1')]
+
+# parallel build tends to fail
+parallel = 1
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-ictce-5.3.0.eb b/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ac31ff941617d9242e22f702d3a56bcf379f4a77
--- /dev/null
+++ b/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-ictce-5.3.0.eb
@@ -0,0 +1,18 @@
+name = 'g2clib'
+version = '1.4.0'
+
+homepage = 'http://www.nco.ncep.noaa.gov/pmb/codes/GRIB2/'
+description = """Library contains GRIB2 encoder/decoder ('C' version)."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'opt': True}
+
+sources = ['%s-%s.tar' % (name, version)]
+source_urls = [homepage]
+
+dependencies = [('JasPer', '1.900.1')]
+
+# parallel build tends to fail
+parallel = 1
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-iqacml-3.7.3.eb b/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-iqacml-3.7.3.eb
index 36b9488a21086b014eff2ab072b98b363e74cbb2..f66433008971f5284f1a0ba27e86135cb2a16878 100644
--- a/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-iqacml-3.7.3.eb
+++ b/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-iqacml-3.7.3.eb
@@ -2,16 +2,16 @@ name = 'g2clib'
 version = '1.4.0'
 
 homepage = 'http://www.nco.ncep.noaa.gov/pmb/codes/GRIB2/'
-description = """Library contains GRIB2 encoder/decoder ("C" version)."""
+description = """Library contains GRIB2 encoder/decoder ('C' version)."""
 
 toolchain = {'name': 'iqacml', 'version': '3.7.3'}
 toolchainopts = {'opt': True}
 
-dependencies = [('JasPer', '1.900.1')]
-
-sources = ['%s-%s.tar' % (name, version)]
+sources = [SOURCE_TAR]
 source_urls = [homepage]
 
+dependencies = [('JasPer', '1.900.1')]
+
 # parallel build tends to fail
 parallel = 1
 
diff --git a/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-goalf-1.1.0-no-OFED.eb
index cd9cd1eda93097f0644b127665c0bbb23679abee..a6605d7e534cdfaeb04b902129c9a450092c82cd 100644
--- a/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-goalf-1.1.0-no-OFED.eb
@@ -7,13 +7,13 @@ description = """Library contains GRIB2 encoder/decoder and search/indexing rout
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 toolchainopts = {'opt': True}
 
-dependencies = [('JasPer', '1.900.1')]
-
-sources = ['%s-%s.tar' % (name, version)]
+sources = [SOURCE_TAR]
 source_urls = [homepage]
 
 patches = ['fix_makefile.patch']
 
+dependencies = [('JasPer', '1.900.1')]
+
 # parallel build tends to fail
 parallel = 1
 
diff --git a/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-goolf-1.4.10.eb b/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-goolf-1.4.10.eb
index d471cd44b24c5b611fafd618bae3f77bf5399a13..095d6ae31aa8c0ff942673e0f30faecbdd227e1d 100644
--- a/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-goolf-1.4.10.eb
@@ -6,13 +6,13 @@ description = """Library contains GRIB2 encoder/decoder and search/indexing rout
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'opt': True}
 
-dependencies = [('JasPer', '1.900.1')]
-
-sources = ['%s-%s.tar' % (name, version)]
+sources = [SOURCE_TAR]
 source_urls = [homepage]
 
 patches = ['fix_makefile.patch']
 
+dependencies = [('JasPer', '1.900.1')]
+
 # parallel build tends to fail
 parallel = 1
 
diff --git a/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-ictce-3.2.2.u3.eb
index 7012aa01db967639c79ac565b18b37fa4631c8f7..778b3587b4146ccca04e995c094a1da328b853d9 100644
--- a/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-ictce-3.2.2.u3.eb
+++ b/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-ictce-3.2.2.u3.eb
@@ -7,13 +7,13 @@ description = """Library contains GRIB2 encoder/decoder and search/indexing rout
 toolchain = {'name': 'ictce', 'version': '3.2.2.u3'}
 toolchainopts = {'opt': True}
 
-dependencies = [('JasPer', '1.900.1')]
-
-sources = ['%s-%s.tar' % (name, version)]
+sources = [SOURCE_TAR]
 source_urls = [homepage]
 
 patches = ['fix_makefile.patch']
 
+dependencies = [('JasPer', '1.900.1')]
+
 # parallel build tends to fail
 parallel = 1
 
diff --git a/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-ictce-5.3.0.eb b/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-ictce-5.3.0.eb
index c7e5c2c63f8524dc5dfb3bddce6eaf904b2e765d..6f0dfcb0bad54d438f210b999a6ecf942de40f58 100644
--- a/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-ictce-5.3.0.eb
@@ -4,17 +4,16 @@ version = '1.2.4'
 homepage = 'http://www.nco.ncep.noaa.gov/pmb/codes/GRIB2/'
 description = """Library contains GRIB2 encoder/decoder and search/indexing routines."""
 
-
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 toolchainopts = {'opt': True}
 
-dependencies = [('JasPer', '1.900.1')]
-
-sources = ['%s-%s.tar' % (name, version)]
+sources = [SOURCE_TAR]
 source_urls = [homepage]
 
 patches = ['fix_makefile.patch']
 
+dependencies = [('JasPer', '1.900.1')]
+
 # parallel build tends to fail
 parallel = 1
 
diff --git a/easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-ictce-4.1.13.eb b/easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-ictce-4.1.13.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f898554dbe44223b390315a39df9a24905e5b3fd
--- /dev/null
+++ b/easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-ictce-4.1.13.eb
@@ -0,0 +1,20 @@
+name = 'g2lib'
+version = '1.4.0'
+
+homepage = 'http://www.nco.ncep.noaa.gov/pmb/codes/GRIB2/'
+description = """Library contains GRIB2 encoder/decoder and search/indexing routines."""
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+toolchainopts = {'opt': True}
+
+sources = [SOURCE_TAR]
+source_urls = [homepage]
+
+patches = ['fix_makefile.patch']
+
+dependencies = [('JasPer', '1.900.1')]
+
+# parallel build tends to fail
+parallel = 1
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-ictce-5.3.0.eb b/easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..daf9f6b4077b3d565ae0ef9de8f746f838c943ea
--- /dev/null
+++ b/easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-ictce-5.3.0.eb
@@ -0,0 +1,20 @@
+name = 'g2lib'
+version = '1.4.0'
+
+homepage = 'http://www.nco.ncep.noaa.gov/pmb/codes/GRIB2/'
+description = """Library contains GRIB2 encoder/decoder and search/indexing routines."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'opt': True}
+
+sources = ['%s-%s.tar' % (name, version)]
+source_urls = [homepage]
+
+patches = ['fix_makefile.patch']
+
+dependencies = [('JasPer', '1.900.1')]
+
+# parallel build tends to fail
+parallel = 1
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-iqacml-3.7.3.eb b/easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-iqacml-3.7.3.eb
index 7e04bd54d3cfd84273319c1980223c877dce335d..3c591287addf6fc81b6ebddcbcab8d8710f2c613 100644
--- a/easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-iqacml-3.7.3.eb
+++ b/easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-iqacml-3.7.3.eb
@@ -7,13 +7,13 @@ description = """Library contains GRIB2 encoder/decoder and search/indexing rout
 toolchain = {'name': 'iqacml', 'version': '3.7.3'}
 toolchainopts = {'opt': True}
 
-dependencies = [('JasPer', '1.900.1')]
-
-sources = ['%s-%s.tar' % (name, version)]
+sources = [SOURCE_TAR]
 source_urls = [homepage]
 
 patches = ['fix_makefile.patch']
 
+dependencies = [('JasPer', '1.900.1')]
+
 # parallel build tends to fail
 parallel = 1
 
diff --git a/easybuild/easyconfigs/g/gawk/gawk-4.0.2-goolf-1.4.10.eb b/easybuild/easyconfigs/g/gawk/gawk-4.0.2-goolf-1.4.10.eb
index 616810aa15a38cddb4484f0e3581d822b6251386..adc07319fe8bd522d42584c1f9b39fca90ed972c 100644
--- a/easybuild/easyconfigs/g/gawk/gawk-4.0.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/g/gawk/gawk-4.0.2-goolf-1.4.10.eb
@@ -16,7 +16,7 @@ version = '4.0.2'
 homepage = 'http://www.gnu.org/software/gawk/gawk.html'
 description = "gawk: GNU awk"
 
-source_urls = ['http://ftp.gnu.org/gnu/gawk']
+source_urls = [GNU_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
diff --git a/easybuild/easyconfigs/g/gawk/gawk-4.0.2-ictce-5.3.0.eb b/easybuild/easyconfigs/g/gawk/gawk-4.0.2-ictce-5.3.0.eb
index c32d5a7da39a047903a8d8e202cffe6fbb981334..2f7e0cf88252f8dffbdd426006b3240140079db9 100644
--- a/easybuild/easyconfigs/g/gawk/gawk-4.0.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/g/gawk/gawk-4.0.2-ictce-5.3.0.eb
@@ -16,7 +16,7 @@ version = '4.0.2'
 homepage = 'http://www.gnu.org/software/gawk/gawk.html'
 description = "gawk: GNU awk"
 
-source_urls = ['http://ftp.gnu.org/gnu/gawk']
+source_urls = [GNU_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
diff --git a/easybuild/easyconfigs/g/gcccuda/gcccuda-2.6.10.eb b/easybuild/easyconfigs/g/gcccuda/gcccuda-2.6.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d75a89f110270b08f81310ac9362f6431f9a9cf0
--- /dev/null
+++ b/easybuild/easyconfigs/g/gcccuda/gcccuda-2.6.10.eb
@@ -0,0 +1,17 @@
+easyblock = "Toolchain"
+
+name = 'gcccuda'
+version = '2.6.10'
+
+homepage = '(none)'
+description = """GNU Compiler Collection (GCC) based compiler toolchain, along with CUDA toolkit."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+# compiler toolchain dependencies
+dependencies = [
+    ('GCC', '4.8.2'),
+    ('CUDA', '5.5.22'),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmpolf-1.1.6.eb
index 7aa8ebc89fe499cbc34f7e665ea0f8cf4989a446..2d9e22b986ceb80f0ccb50b5dceda64a6320edcd 100644
--- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmpolf-1.1.6.eb
+++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmpolf-1.1.6.eb
@@ -9,7 +9,7 @@ and documentation"""
 toolchain = {'name': 'cgmpolf', 'version': '1.1.6'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s']
+source_urls = [GNU_SOURCE]
 
 configopts = '--without-emacs'
 
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmvolf-1.1.12rc1.eb
index a02af5a472f75c503f93771315460c3465ef0aef..74ed768df4a98d9c3d9e3434f82c7b57530d334d 100644
--- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmvolf-1.1.12rc1.eb
+++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmvolf-1.1.12rc1.eb
@@ -9,7 +9,7 @@ and documentation"""
 toolchain = {'name': 'cgmvolf', 'version': '1.1.12rc1'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s']
+source_urls = [GNU_SOURCE]
 
 configopts = '--without-emacs'
 
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmvolf-1.2.7.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmvolf-1.2.7.eb
index 7b771be38bde262c756631165a2af9db03feea73..4bcc26447ad944115a7b4e3c95631ddabcdebfde 100644
--- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmvolf-1.2.7.eb
+++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmvolf-1.2.7.eb
@@ -9,7 +9,7 @@ and documentation"""
 toolchain = {'name': 'cgmvolf', 'version': '1.2.7'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s']
+source_urls = [GNU_SOURCE]
 
 configopts = '--without-emacs'
 
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgoolf-1.1.7.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgoolf-1.1.7.eb
index 6a75826e5b559df21358904c059e255f8b39e1b9..a32268bf8f92121b96cac12ca4b71d59060127dc 100644
--- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgoolf-1.1.7.eb
+++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgoolf-1.1.7.eb
@@ -9,7 +9,7 @@ and documentation"""
 toolchain = {'name': 'cgoolf', 'version': '1.1.7'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s']
+source_urls = [GNU_SOURCE]
 
 configopts = '--without-emacs'
 
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmpolf-1.4.8.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmpolf-1.4.8.eb
index 93247f5f1af9a24251ae4deff1a81ffaf1db4de2..1fede7e4c6820bb9c681c3777bd51ba4852f41fb 100644
--- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmpolf-1.4.8.eb
+++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmpolf-1.4.8.eb
@@ -9,7 +9,7 @@ and documentation"""
 toolchain = {'name': 'gmpolf', 'version': '1.4.8'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s']
+source_urls = [GNU_SOURCE]
 
 configopts = '--without-emacs'
 
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmvolf-1.7.12.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmvolf-1.7.12.eb
index 60cb87e25ec68584d339ab0b64cf3654097bfc58..87753bfbc926598728dc1f116f1c85d29994cab1 100644
--- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmvolf-1.7.12.eb
+++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmvolf-1.7.12.eb
@@ -9,7 +9,7 @@ and documentation"""
 toolchain = {'name': 'gmvolf', 'version': '1.7.12'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s']
+source_urls = [GNU_SOURCE]
 
 configopts = '--without-emacs'
 
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmvolf-1.7.12rc1.eb
index f6924ebc7b5d78b3447658f584c947b552537a50..b9cff2211e547df0f94b12cf9d682eca1ef1e0a8 100644
--- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmvolf-1.7.12rc1.eb
+++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmvolf-1.7.12rc1.eb
@@ -9,7 +9,7 @@ and documentation"""
 toolchain = {'name': 'gmvolf', 'version': '1.7.12rc1'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s']
+source_urls = [GNU_SOURCE]
 
 configopts = '--without-emacs'
 
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-goalf-1.1.0-no-OFED.eb
index be1d80eb1436be46703f86cd6f3a8a5690e43bd1..c26723dfec5937f9880b90ef2624dd301d593bd1 100644
--- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-goalf-1.1.0-no-OFED.eb
@@ -9,7 +9,7 @@ and documentation"""
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s']
+source_urls = [GNU_SOURCE]
 
 configopts = '--without-emacs'
 
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gompi-1.4.12-no-OFED.eb
index f99a141fdb669e0d66e801d92019d5107936400a..35cded15c6774b1471fc44d650eaedc7758ddaa1 100644
--- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gompi-1.4.12-no-OFED.eb
+++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gompi-1.4.12-no-OFED.eb
@@ -9,7 +9,7 @@ and documentation"""
 toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s']
+source_urls = [GNU_SOURCE]
 
 configopts = '--without-emacs'
 
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-goolf-1.4.10.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-goolf-1.4.10.eb
index a3b70c032fc3931272f5f1a7de2d56b5564bf4ce..8c7cc9b4b85d731edf11872a6b39bb261eaa5acf 100644
--- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-goolf-1.4.10.eb
@@ -9,7 +9,7 @@ and documentation"""
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s']
+source_urls = [GNU_SOURCE]
 
 configopts = '--without-emacs'
 
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-4.0.6.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-4.0.6.eb
index acbb710e536b969f94dfe4fa15ff5d8fee3472b4..3eddb0a6d24bd5e59bba7905660160574c987140 100644
--- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-4.0.6.eb
@@ -9,7 +9,7 @@ and documentation"""
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s']
+source_urls = [GNU_SOURCE]
 
 configopts = '--without-emacs'
 
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-4.1.13.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-4.1.13.eb
index 34e274c6bde8c75451d8ccaf18cb8351b99a3222..56598b375e1997e977cdee11195ec5677b987c5e 100644
--- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-4.1.13.eb
@@ -9,7 +9,7 @@ and documentation"""
 toolchain = {'name': 'ictce', 'version': '4.1.13'} 
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s']
+source_urls = [GNU_SOURCE]
 
 configopts = '--without-emacs'
 
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-5.2.0.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-5.2.0.eb
index 530e6833bb0a6ad2b27457895b46cc2f0e72559f..be4e49be1750fa23971b389c0bcd43ab84ca46e2 100644
--- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-5.2.0.eb
+++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-5.2.0.eb
@@ -9,7 +9,7 @@ and documentation"""
 toolchain = {'name': 'ictce', 'version': '5.2.0'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s']
+source_urls = [GNU_SOURCE]
 
 configopts = '--without-emacs'
 
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-5.3.0.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-5.3.0.eb
index e49e2e384bf0ec3aecf2b4be0462d2bd0073148a..3c2d60cef27a79b14ec93652f4919b5bc8454f65 100644
--- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-5.3.0.eb
@@ -9,7 +9,7 @@ and documentation"""
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/pub/gnu/%(name)s']
+source_urls = [GNU_SOURCE]
 
 configopts = '--without-emacs'
 
diff --git a/easybuild/easyconfigs/g/gnutls/gnutls-3.1.8-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/gnutls/gnutls-3.1.8-goalf-1.1.0-no-OFED.eb
index 3a776649d49f3b0ea62883e35a88ba2941c7a77e..05a624232e81f7be62b4a737e24a1cba44bcb1e7 100644
--- a/easybuild/easyconfigs/g/gnutls/gnutls-3.1.8-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/g/gnutls/gnutls-3.1.8-goalf-1.1.0-no-OFED.eb
@@ -7,7 +7,7 @@ description = "gnutls-3.0.22: GNU Transport Layer Security library"
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
 source_urls = ['ftp://ftp.gnutls.org/pub/gnutls/']
-sources = ['%s-%s.tar.xz' % (name, version)]
+sources = [SOURCE_TAR_XZ]
 
 dependencies = [
                 ('GMP', '5.0.5'),
diff --git a/easybuild/easyconfigs/g/gnutls/gnutls-3.1.8-goolf-1.4.10.eb b/easybuild/easyconfigs/g/gnutls/gnutls-3.1.8-goolf-1.4.10.eb
index 1ae868fbce6265e56679a575a33a907b7cfbf900..ccb40b1358939b0380f8e6de4d11eb785728bf98 100644
--- a/easybuild/easyconfigs/g/gnutls/gnutls-3.1.8-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/g/gnutls/gnutls-3.1.8-goolf-1.4.10.eb
@@ -6,7 +6,7 @@ description = "gnutls-3.0.22: GNU Transport Layer Security library"
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 source_urls = ['ftp://ftp.gnutls.org/pub/gnutls/']
-sources = ['%s-%s.tar.xz' % (name, version)]
+sources = [SOURCE_TAR_XZ]
 
 dependencies = [
                 ('GMP', '5.0.5'),
diff --git a/easybuild/easyconfigs/g/gompi/gompi-1.4.10-no-OFED.eb b/easybuild/easyconfigs/g/gompi/gompi-1.4.10-no-OFED.eb
new file mode 100644
index 0000000000000000000000000000000000000000..50c30a5ac2243b3bbe601b221909eea6eb2241e5
--- /dev/null
+++ b/easybuild/easyconfigs/g/gompi/gompi-1.4.10-no-OFED.eb
@@ -0,0 +1,26 @@
+easyblock = "Toolchain"
+
+name = 'gompi'
+version = '1.4.10'
+versionsuffix = '-no-OFED'
+
+homepage = '(none)'
+description = """GNU Compiler Collection (GCC) based compiler toolchain,
+ including OpenMPI for MPI support."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+compname = 'GCC'
+compver = '4.7.2'
+comp = (compname, compver)
+
+mpilib = 'OpenMPI'
+mpiver = '1.6.4'
+
+# compiler toolchain dependencies
+dependencies = [
+    comp,
+    (mpilib, mpiver, versionsuffix, comp),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/g/gompi/gompi-1.5.14-no-OFED.eb b/easybuild/easyconfigs/g/gompi/gompi-1.5.14-no-OFED.eb
new file mode 100644
index 0000000000000000000000000000000000000000..62bfbf3784987e4b24bcdced8f676756495cf7ef
--- /dev/null
+++ b/easybuild/easyconfigs/g/gompi/gompi-1.5.14-no-OFED.eb
@@ -0,0 +1,26 @@
+easyblock = "Toolchain"
+
+name = 'gompi'
+version = '1.5.14'
+versionsuffix = '-no-OFED'
+
+homepage = '(none)'
+description = """GNU Compiler Collection (GCC) based compiler toolchain,
+ including OpenMPI for MPI support."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+compname = 'GCC'
+compver = '4.8.2'
+comp = (compname, compver)
+
+mpilib = 'OpenMPI'
+mpiver = '1.6.5'
+
+# compiler toolchain dependencies
+dependencies = [
+    comp,
+    (mpilib, mpiver, versionsuffix, comp),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/g/gompi/gompi-1.5.14.eb b/easybuild/easyconfigs/g/gompi/gompi-1.5.14.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c42da3fda1797af5fc4571080c500a2be79a9995
--- /dev/null
+++ b/easybuild/easyconfigs/g/gompi/gompi-1.5.14.eb
@@ -0,0 +1,25 @@
+easyblock = "Toolchain"
+
+name = 'gompi'
+version = '1.5.14'
+
+homepage = '(none)'
+description = """GNU Compiler Collection (GCC) based compiler toolchain,
+ including OpenMPI for MPI support."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+compname = 'GCC'
+compver = '4.8.2'
+comp = (compname, compver)
+
+mpilib = 'OpenMPI'
+mpiver = '1.6.5'
+
+# compiler toolchain dependencies
+dependencies = [
+    comp,
+    (mpilib, mpiver, '', comp),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/g/gompic/gompic-2.6.10.eb b/easybuild/easyconfigs/g/gompic/gompic-2.6.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d0cc8743cee3b02424686e3a79485ed42d400c32
--- /dev/null
+++ b/easybuild/easyconfigs/g/gompic/gompic-2.6.10.eb
@@ -0,0 +1,19 @@
+easyblock = "Toolchain"
+
+name = 'gompic'
+version = '2.6.10'
+
+homepage = '(none)'
+description = """GNU Compiler Collection (GCC) based compiler toolchain along with CUDA toolkit,
+ including OpenMPI for MPI support with CUDA features enabled."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+# compiler toolchain dependencies
+dependencies = [
+    ('GCC', '4.8.2'),  # part of gcccuda
+    ('CUDA', '5.5.22'),  # part of gcccuda
+    ('OpenMPI', '1.7.3', '', ('gcccuda', version)),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/g/goolf/goolf-1.4.10-no-OFED.eb b/easybuild/easyconfigs/g/goolf/goolf-1.4.10-no-OFED.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e7b5fd7db4482f235b1d4c5e82ef45d32940fb72
--- /dev/null
+++ b/easybuild/easyconfigs/g/goolf/goolf-1.4.10-no-OFED.eb
@@ -0,0 +1,38 @@
+easyblock = "Toolchain"
+
+name = 'goolf'
+version = '1.4.10'
+versionsuffix = '-no-OFED'
+
+homepage = '(none)'
+description = """GNU Compiler Collection (GCC) based compiler toolchain, including
+ OpenMPI for MPI support, OpenBLAS (BLAS and LAPACK support), FFTW and ScaLAPACK."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+comp_name = 'GCC'
+comp_version = '4.7.2'
+comp = (comp_name, comp_version)
+
+blaslib = 'OpenBLAS'
+blasver = '0.2.6'
+blas = '%s-%s' % (blaslib, blasver)
+blas_suff = '-LAPACK-3.4.2'
+
+# toolchain used to build goolf-1.4.10-no-OFED dependencies
+comp_mpi_tc_name = 'gompi'
+comp_mpi_tc_ver = "%s%s" % (version, versionsuffix)
+comp_mpi_tc = (comp_mpi_tc_name, comp_mpi_tc_ver)
+
+# compiler toolchain dependencies
+# we need GCC and OpenMPI as explicit dependencies instead of gompi toolchain
+# because of toolchain preperation functions
+dependencies = [
+    comp,
+    ('OpenMPI', '1.6.4', versionsuffix, comp),
+    (blaslib, blasver, blas_suff, comp_mpi_tc),
+    ('FFTW', '3.3.3', '', comp_mpi_tc),
+    ('ScaLAPACK', '2.0.2', '-%s%s' % (blas, blas_suff), comp_mpi_tc)
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/g/goolf/goolf-1.5.14-no-OFED.eb b/easybuild/easyconfigs/g/goolf/goolf-1.5.14-no-OFED.eb
new file mode 100644
index 0000000000000000000000000000000000000000..878a9f4474e1409c9b64659f336d32864d1842da
--- /dev/null
+++ b/easybuild/easyconfigs/g/goolf/goolf-1.5.14-no-OFED.eb
@@ -0,0 +1,38 @@
+easyblock = "Toolchain"
+
+name = 'goolf'
+version = '1.5.14'
+versionsuffix = '-no-OFED'
+
+homepage = '(none)'
+description = """GNU Compiler Collection (GCC) based compiler toolchain, including
+ OpenMPI for MPI support, OpenBLAS (BLAS and LAPACK support), FFTW and ScaLAPACK."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+comp_name = 'GCC'
+comp_version = '4.8.2'
+comp = (comp_name, comp_version)
+
+blaslib = 'OpenBLAS'
+blasver = '0.2.8'
+blas = '%s-%s' % (blaslib, blasver)
+blassuff = '-LAPACK-3.5.0'
+
+# toolchain used to build goolf dependencies
+comp_mpi_tc_name = 'gompi'
+comp_mpi_tc_ver = "%s%s" % (version, versionsuffix)
+comp_mpi_tc = (comp_mpi_tc_name, comp_mpi_tc_ver)
+
+# compiler toolchain depencies
+# we need GCC and OpenMPI as explicit dependencies instead of gompi toolchain
+# because of toolchain preperation functions
+dependencies = [
+    ('GCC', '4.8.2'),
+    ('OpenMPI', '1.6.5', '-no-OFED', comp),  # part of gompi
+    (blaslib, blasver, blassuff, comp_mpi_tc),
+    ('FFTW', '3.3.4', '', comp_mpi_tc),
+    ('ScaLAPACK', '2.0.2', '-%s%s' % (blas, blassuff), comp_mpi_tc),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/g/goolf/goolf-1.5.14.eb b/easybuild/easyconfigs/g/goolf/goolf-1.5.14.eb
new file mode 100644
index 0000000000000000000000000000000000000000..89526c2d6cdbfd8fe8cbe33cff96f5858503c3f5
--- /dev/null
+++ b/easybuild/easyconfigs/g/goolf/goolf-1.5.14.eb
@@ -0,0 +1,37 @@
+easyblock = "Toolchain"
+
+name = 'goolf'
+version = '1.5.14'
+
+homepage = '(none)'
+description = """GNU Compiler Collection (GCC) based compiler toolchain, including
+ OpenMPI for MPI support, OpenBLAS (BLAS and LAPACK support), FFTW and ScaLAPACK."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+comp_name = 'GCC'
+comp_version = '4.8.2'
+comp = (comp_name, comp_version)
+
+blaslib = 'OpenBLAS'
+blasver = '0.2.8'
+blas = '%s-%s' % (blaslib, blasver)
+blassuff = '-LAPACK-3.5.0'
+
+# toolchain used to build goolf dependencies
+comp_mpi_tc_name = 'gompi'
+comp_mpi_tc_ver = "%s" % version
+comp_mpi_tc = (comp_mpi_tc_name, comp_mpi_tc_ver)
+
+# compiler toolchain depencies
+# we need GCC and OpenMPI as explicit dependencies instead of gompi toolchain
+# because of toolchain preperation functions
+dependencies = [
+    ('GCC', '4.8.2'),
+    ('OpenMPI', '1.6.5', '', comp),  # part of gompi
+    (blaslib, blasver, blassuff, comp_mpi_tc),
+    ('FFTW', '3.3.4', '', comp_mpi_tc),
+    ('ScaLAPACK', '2.0.2', '-%s%s' % (blas, blassuff), comp_mpi_tc),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/g/goolfc/goolfc-2.6.10.eb b/easybuild/easyconfigs/g/goolfc/goolfc-2.6.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..345bc66c0346be06a80bcd5f10b492201e1fb50c
--- /dev/null
+++ b/easybuild/easyconfigs/g/goolfc/goolfc-2.6.10.eb
@@ -0,0 +1,34 @@
+easyblock = "Toolchain"
+
+name = 'goolfc'
+version = '2.6.10'
+
+homepage = '(none)'
+description = """GCC based compiler toolchain __with CUDA support__, and including
+ OpenMPI for MPI support, OpenBLAS (BLAS and LAPACK support), FFTW and ScaLAPACK."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+# toolchain used to build goolfc dependencies
+comp_mpi_tc_name = 'gompic'
+comp_mpi_tc_ver = version
+comp_mpi_tc = (comp_mpi_tc_name, comp_mpi_tc_ver)
+
+blaslib = 'OpenBLAS'
+blasver = '0.2.8'
+blassuff = '-LAPACK-3.4.2'
+blas = '-%s-%s%s' % (blaslib, blasver, blassuff)
+
+# compiler toolchain dependencies
+# we need GCC and OpenMPI as explicit dependencies instead of gompi toolchain
+# because of toolchain preperation functions
+dependencies = [
+    ('GCC', '4.8.2'),  # part of gompic
+    ('CUDA', '5.5.22'),  # part of gompic
+    ('OpenMPI', '1.7.3', '', ('gcccuda', version)),  # part of gompic
+    (blaslib, blasver, blassuff, comp_mpi_tc),
+    ('FFTW', '3.3.3', '', comp_mpi_tc),
+    ('ScaLAPACK', '2.0.2', blas, comp_mpi_tc),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/g/gperf/gperf-3.0.4-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/gperf/gperf-3.0.4-goalf-1.1.0-no-OFED.eb
index 6e1f6d8d881dab94becf4a4af3e3317398d8fe80..72bf9736f867b81ecf7e4a4d8e64b5884d3324d3 100644
--- a/easybuild/easyconfigs/g/gperf/gperf-3.0.4-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/g/gperf/gperf-3.0.4-goalf-1.1.0-no-OFED.eb
@@ -9,7 +9,7 @@ description = """GNU gperf is a perfect hash function generator. For a given lis
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
-source_urls = ['http://ftpmirror.gnu.org/%s' % name]
+source_urls = [GNU_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/g/gperf/gperf-3.0.4-goolf-1.4.10.eb b/easybuild/easyconfigs/g/gperf/gperf-3.0.4-goolf-1.4.10.eb
index 2bbf67ad0ea559652322704263ae45cb129fcfa0..bad261c98a175b4d1aeb92d006f67c033a26a114 100644
--- a/easybuild/easyconfigs/g/gperf/gperf-3.0.4-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/g/gperf/gperf-3.0.4-goolf-1.4.10.eb
@@ -8,7 +8,7 @@ function is perfect, which means that the hash table has no collisions, and the
 string comparison only."""
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-source_urls = ['http://ftpmirror.gnu.org/%s' % name]
+source_urls = [GNU_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/g/gperf/gperf-3.0.4-ictce-4.0.6.eb b/easybuild/easyconfigs/g/gperf/gperf-3.0.4-ictce-4.0.6.eb
index 63b3d924c11c0b26b9fd1e1b4888b0418d9325d3..3a83b145507ac8d5e512a183b5cf4606ad685da4 100644
--- a/easybuild/easyconfigs/g/gperf/gperf-3.0.4-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/g/gperf/gperf-3.0.4-ictce-4.0.6.eb
@@ -9,7 +9,7 @@ description = """GNU gperf is a perfect hash function generator. For a given lis
 
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
-source_urls = ['http://ftpmirror.gnu.org/%s' % name]
+source_urls = [GNU_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/g/gperf/gperf-3.0.4-ictce-5.3.0.eb b/easybuild/easyconfigs/g/gperf/gperf-3.0.4-ictce-5.3.0.eb
index 09e7025757d1ab2adf10fe8419a6151944ffa180..18fd84fe28d586949457b82e77a3a7288f2ddddc 100644
--- a/easybuild/easyconfigs/g/gperf/gperf-3.0.4-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/g/gperf/gperf-3.0.4-ictce-5.3.0.eb
@@ -10,7 +10,7 @@ description = """GNU gperf is a perfect hash function generator. For a given lis
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
-source_urls = ['http://ftpmirror.gnu.org/%s' % name]
+source_urls = [GNU_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/g/gperftools/gperftools-2.1-goolf-1.4.10.eb b/easybuild/easyconfigs/g/gperftools/gperftools-2.1-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5a3e833ff0427eff764bad5d1a1b1f83da2cbeec
--- /dev/null
+++ b/easybuild/easyconfigs/g/gperftools/gperftools-2.1-goolf-1.4.10.eb
@@ -0,0 +1,26 @@
+name = "gperftools"
+version = "2.1"
+
+homepage = 'http://code.google.com/p/gperftools/'
+description = """gperftools are for use by developers so that they can create more robust applications.
+ Especially of use to those developing multi-threaded applications in C++ with templates.
+ Includes TCMalloc, heap-checker, heap-profiler and cpu-profiler."""
+
+toolchain = {'version': '1.4.10', 'name': 'goolf'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [GOOGLECODE_SOURCE]
+
+dependencies = [
+    ('Automake', '1.13.4'),
+    ('Autoconf', '2.69'),
+    ('libtool', '2.4.2'),
+    ('libunwind', '1.1'),
+]
+
+sanity_check_paths = {
+    'files': ["bin/pprof"],
+    'dirs': []
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/g/gperftools/gperftools-2.1-ictce-5.3.0.eb b/easybuild/easyconfigs/g/gperftools/gperftools-2.1-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..bdbfa99fd8afeb19d155429f4a8f9299e4ea12e5
--- /dev/null
+++ b/easybuild/easyconfigs/g/gperftools/gperftools-2.1-ictce-5.3.0.eb
@@ -0,0 +1,26 @@
+name = "gperftools"
+version = "2.1"
+
+homepage = 'http://code.google.com/p/gperftools/'
+description = """gperftools are for use by developers so that they can create more robust applications.
+ Especially of use to those developing multi-threaded applications in C++ with templates.
+ Includes TCMalloc, heap-checker, heap-profiler and cpu-profiler."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [GOOGLECODE_SOURCE]
+
+dependencies = [
+    ('Automake', '1.13.4'),
+    ('Autoconf', '2.69'),
+    ('libtool', '2.4.2'),
+    ('libunwind', '1.1'),
+]
+
+sanity_check_paths = {
+    'files': ["bin/pprof"],
+    'dirs': []
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/g/grep/grep-2.15-goolf-1.4.10.eb b/easybuild/easyconfigs/g/grep/grep-2.15-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..143a1050054a42d789c7395e9eaf068dcd455cf1
--- /dev/null
+++ b/easybuild/easyconfigs/g/grep/grep-2.15-goolf-1.4.10.eb
@@ -0,0 +1,19 @@
+name = 'grep'
+version = '2.15'
+
+description = "grep: GNU grep"
+homepage = 'http://www.gnu.org/software/grep/grep.html'
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+configopts = ' --disable-perl-regexp '
+
+sanity_check_paths = {
+    'files': ["bin/grep"],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/g/grep/grep-2.15-ictce-5.3.0.eb b/easybuild/easyconfigs/g/grep/grep-2.15-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b449082b000b469da144f9f71f8046ecc91e6744
--- /dev/null
+++ b/easybuild/easyconfigs/g/grep/grep-2.15-ictce-5.3.0.eb
@@ -0,0 +1,19 @@
+name = 'grep'
+version = '2.15'
+
+description = "grep: GNU grep"
+homepage = 'http://www.gnu.org/software/grep/grep.html'
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+configopts = ' --disable-perl-regexp '
+
+sanity_check_paths = {
+    'files': ["bin/grep"],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/g/grib_api/grib_api-1.10.0-ictce-5.3.0.eb b/easybuild/easyconfigs/g/grib_api/grib_api-1.10.0-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..071d45e481b63618a0a33f5dd9c6fcb7ead7062a
--- /dev/null
+++ b/easybuild/easyconfigs/g/grib_api/grib_api-1.10.0-ictce-5.3.0.eb
@@ -0,0 +1,23 @@
+name = 'grib_api'
+version = '1.10.0'
+
+homepage = 'https://software.ecmwf.int/wiki/display/GRIB/Home'
+description = """The ECMWF GRIB API is an application program interface accessible from C, FORTRAN and Python
+ programs developed for encoding and decoding WMO FM-92 GRIB edition 1 and edition 2 messages. A useful set of
+ command line tools is also provided to give quick access to GRIB messages."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = ['https://software.ecmwf.int/wiki/download/attachments/3473437/']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('JasPer', '1.900.1'),
+]
+
+preconfigopts = 'FC=$F90'
+configopts = '--with-jasper=$EBROOTJASPER'
+
+parallel = 1
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/g/guile/guile-1.8.8-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/guile/guile-1.8.8-goalf-1.1.0-no-OFED.eb
index 90e6fd9442c070f45812a3743f366e3c63a09479..9596baa7ba8c2fc38def3ff1b57f4b158a6e34f7 100644
--- a/easybuild/easyconfigs/g/guile/guile-1.8.8-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/g/guile/guile-1.8.8-goalf-1.1.0-no-OFED.eb
@@ -8,7 +8,7 @@ description = """Guile is the GNU Ubiquitous Intelligent Language for Extensions
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()]
+source_urls = [GNU_SOURCE]
 
 dependencies = [
                 ('libtool', '2.4.2'),
diff --git a/easybuild/easyconfigs/g/guile/guile-1.8.8-goolf-1.4.10.eb b/easybuild/easyconfigs/g/guile/guile-1.8.8-goolf-1.4.10.eb
index ed99bdaf7bc2590aaffbd6ca814d1d14106cc341..215f5b7322dc4ee4d132648519104560153368e6 100644
--- a/easybuild/easyconfigs/g/guile/guile-1.8.8-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/g/guile/guile-1.8.8-goolf-1.4.10.eb
@@ -7,7 +7,7 @@ the official extension language for the GNU operating system."""
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()]
+source_urls = [GNU_SOURCE]
 
 dependencies = [
                 ('libtool', '2.4.2'),
diff --git a/easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-4.0.6.eb b/easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-4.0.6.eb
index 09c8aa8e5134a62c9808f9b93e0f1be95a134dea..517a4e55493fd132f2e4423f3ede6417b5aec27d 100644
--- a/easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-4.0.6.eb
@@ -8,7 +8,7 @@ description = """Guile is the GNU Ubiquitous Intelligent Language for Extensions
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()]
+source_urls = [GNU_SOURCE]
 
 dependencies = [
                 ('libtool', '2.4.2'),
diff --git a/easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-5.3.0.eb b/easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-5.3.0.eb
index 9b84ed765c7c82a9949f46ffbbf1b569d68f0693..1db90196a22c3698d0036cc01122e3bca9a86971 100644
--- a/easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-5.3.0.eb
@@ -7,8 +7,8 @@ description = """Guile is the GNU Ubiquitous Intelligent Language for Extensions
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
-sources = ['%s-%s.tar.gz' % (name.lower(), version)]
-source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()]
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
 
 dependencies = [
     ('libtool', '2.4.2'),
diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.5-cgoolf-1.1.7.eb b/easybuild/easyconfigs/g/gzip/gzip-1.5-cgoolf-1.1.7.eb
index ae0e87fc420c819a1d7d2bbaaa6066d2b7adf2d6..5457e6d892bc66e183cbaeed459bde8f5f08929c 100644
--- a/easybuild/easyconfigs/g/gzip/gzip-1.5-cgoolf-1.1.7.eb
+++ b/easybuild/easyconfigs/g/gzip/gzip-1.5-cgoolf-1.1.7.eb
@@ -19,7 +19,7 @@ description = "gzip (GNU zip) is a popular data compression program as a replace
 toolchain = {'name': 'cgoolf', 'version': '1.1.7'}
 
 # eg. http://ftp.gnu.org/gnu/gzip/gzip-1.5.tar.gz
-source_urls = ['http://ftpmirror.gnu.org/gzip']
+source_urls = [GNU_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 # make sure the gzip, gunzip and compress binaries are available after installation
diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.5-gmpolf-1.4.8.eb b/easybuild/easyconfigs/g/gzip/gzip-1.5-gmpolf-1.4.8.eb
index ab8b1bc75ee1b08230dfe9caaf2fa4ca295e76f8..7949d851ed6fb6984cd9d21856ef88192d99d0ce 100644
--- a/easybuild/easyconfigs/g/gzip/gzip-1.5-gmpolf-1.4.8.eb
+++ b/easybuild/easyconfigs/g/gzip/gzip-1.5-gmpolf-1.4.8.eb
@@ -19,7 +19,7 @@ description = "gzip (GNU zip) is a popular data compression program as a replace
 toolchain = {'name': 'gmpolf', 'version': '1.4.8'}
 
 # eg. http://ftp.gnu.org/gnu/gzip/gzip-1.5.tar.gz
-source_urls = ['http://ftpmirror.gnu.org/gzip']
+source_urls = [GNU_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 # make sure the gzip, gunzip and compress binaries are available after installation
diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.5-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/gzip/gzip-1.5-goalf-1.1.0-no-OFED.eb
index ccba8d9338342616095c5c40e25c9bffa5e06c54..acb7e90d49ad4fc811b7d98842e96597f06c8b0a 100644
--- a/easybuild/easyconfigs/g/gzip/gzip-1.5-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/g/gzip/gzip-1.5-goalf-1.1.0-no-OFED.eb
@@ -19,7 +19,7 @@ description = "gzip (GNU zip) is a popular data compression program as a replace
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
 # eg. http://ftp.gnu.org/gnu/gzip/gzip-1.5.tar.gz
-source_urls = ['http://ftpmirror.gnu.org/gzip']
+source_urls = [GNU_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 # make sure the gzip, gunzip and compress binaries are available after installation
diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.5-goolf-1.4.10.eb b/easybuild/easyconfigs/g/gzip/gzip-1.5-goolf-1.4.10.eb
index 5302cfd6597857ee08e7b1c3390bf80973cb60ef..78ba03289396142b3b60ab48c1198022ac4fdfac 100644
--- a/easybuild/easyconfigs/g/gzip/gzip-1.5-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/g/gzip/gzip-1.5-goolf-1.4.10.eb
@@ -19,7 +19,7 @@ description = "gzip (GNU zip) is a popular data compression program as a replace
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 # eg. http://ftp.gnu.org/gnu/gzip/gzip-1.5.tar.gz
-source_urls = ['http://ftpmirror.gnu.org/gzip']
+source_urls = [GNU_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 # make sure the gzip, gunzip and compress binaries are available after installation
diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.5-ictce-4.0.6.eb b/easybuild/easyconfigs/g/gzip/gzip-1.5-ictce-4.0.6.eb
index 829726e985404a909f1e8f3cbf06443c04f4c28f..5cff62f0ca2006d020a77e8173a8da055237b400 100644
--- a/easybuild/easyconfigs/g/gzip/gzip-1.5-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/g/gzip/gzip-1.5-ictce-4.0.6.eb
@@ -19,7 +19,7 @@ description = "gzip (GNU zip) is a popular data compression program as a replace
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
 # eg. http://ftp.gnu.org/gnu/gzip/gzip-1.5.tar.gz
-source_urls = ['http://ftpmirror.gnu.org/gzip']
+source_urls = [GNU_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 # make sure the gzip, gunzip and compress binaries are available after installation
diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.5-ictce-4.1.13.eb b/easybuild/easyconfigs/g/gzip/gzip-1.5-ictce-4.1.13.eb
index fe8de65ddbed4f9663a72591f486f16e1caff2c2..2fe7409a9e1ff7961595b3209a639e5c11e564f3 100644
--- a/easybuild/easyconfigs/g/gzip/gzip-1.5-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/g/gzip/gzip-1.5-ictce-4.1.13.eb
@@ -19,7 +19,7 @@ description = "gzip (GNU zip) is a popular data compression program as a replace
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
 # eg. http://ftp.gnu.org/gnu/gzip/gzip-1.5.tar.gz
-source_urls = ['http://ftpmirror.gnu.org/gzip']
+source_urls = [GNU_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 # make sure the gzip, gunzip and compress binaries are available after installation
diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.5-ictce-5.3.0.eb b/easybuild/easyconfigs/g/gzip/gzip-1.5-ictce-5.3.0.eb
index dcb790826ee3e494306c7a7b18fdf3282c64ba22..42edcfbbc889b21760201362fdda04dc98a3da11 100644
--- a/easybuild/easyconfigs/g/gzip/gzip-1.5-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/g/gzip/gzip-1.5-ictce-5.3.0.eb
@@ -20,7 +20,7 @@ description = "gzip (GNU zip) is a popular data compression program as a replace
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 # eg. http://ftp.gnu.org/gnu/gzip/gzip-1.5.tar.gz
-source_urls = ['http://ftpmirror.gnu.org/gzip']
+source_urls = [GNU_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 # make sure the gzip, gunzip and compress binaries are available after installation
diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.4.10-no-OFED.eb b/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.4.10-no-OFED.eb
new file mode 100644
index 0000000000000000000000000000000000000000..00881818f03165eac7df79d3ece8e74edf694608
--- /dev/null
+++ b/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.4.10-no-OFED.eb
@@ -0,0 +1,22 @@
+name = 'gzip'
+version = '1.6'
+
+homepage = 'http://www.gnu.org/software/gzip/'
+description = "gzip (GNU zip) is a popular data compression program as a replacement for compress"
+
+toolchain = {'name': 'goolf', 'version': '1.4.10-no-OFED'}
+
+# eg. http://ftp.gnu.org/gnu/gzip/gzip-1.6.tar.gz
+source_urls = ['http://ftpmirror.gnu.org/gzip']
+sources = [SOURCE_TAR_GZ]
+
+# make sure the gzip, gunzip and compress binaries are available after installation
+sanity_check_paths = {
+    'files': ["bin/gunzip", "bin/gzip", "bin/uncompress"],
+    'dirs': [],
+}
+
+# run 'gzip -h' and 'gzip --version' after installation
+sanity_check_commands = [True, ('gzip', '--version')]
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.5.14-no-OFED.eb b/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.5.14-no-OFED.eb
new file mode 100644
index 0000000000000000000000000000000000000000..81dfe171a82976938fc25ad97a0bd9515ba5ced8
--- /dev/null
+++ b/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.5.14-no-OFED.eb
@@ -0,0 +1,34 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright (c) 2012-2013 Cyprus Institute / CaSToRC
+# Authors::   Thekla Loizou <t.loizou@cyi.ac.cy>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_06-19.html
+##
+
+name = 'gzip'
+version = '1.6'
+
+homepage = 'http://www.gnu.org/software/gzip/'
+description = "gzip (GNU zip) is a popular data compression program as a replacement for compress"
+
+toolchain = {'name': 'goolf', 'version': '1.5.14-no-OFED'}
+
+# eg. http://ftp.gnu.org/gnu/gzip/gzip-1.6.tar.gz
+source_urls = [GNU_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+# make sure the gzip, gunzip and compress binaries are available after installation
+sanity_check_paths = {
+    'files': ["bin/gunzip", "bin/gzip", "bin/uncompress"],
+    'dirs': [],
+}
+
+# run 'gzip -h' and 'gzip --version' after installation
+sanity_check_commands = [True, ('gzip', '--version')]
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.5.14.eb b/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.5.14.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e3c2131d4d189860cde74feec086180a61b76f86
--- /dev/null
+++ b/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.5.14.eb
@@ -0,0 +1,34 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright (c) 2012-2013 Cyprus Institute / CaSToRC
+# Authors::   Thekla Loizou <t.loizou@cyi.ac.cy>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_06-19.html
+##
+
+name = 'gzip'
+version = '1.6'
+
+homepage = 'http://www.gnu.org/software/gzip/'
+description = "gzip (GNU zip) is a popular data compression program as a replacement for compress"
+
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
+
+# eg. http://ftp.gnu.org/gnu/gzip/gzip-1.6.tar.gz
+source_urls = [GNU_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+# make sure the gzip, gunzip and compress binaries are available after installation
+sanity_check_paths = {
+    'files': ["bin/gunzip", "bin/gzip", "bin/uncompress"],
+    'dirs': [],
+}
+
+# run 'gzip -h' and 'gzip --version' after installation
+sanity_check_commands = [True, ('gzip', '--version')]
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.6.10.eb b/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.6.10.eb
index bb3ec5eed94270a5b30861a7239040908bd1c37b..8aefa658ebb1113d1fdb5f2d821b71abdfb2ed5a 100644
--- a/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.6.10.eb
+++ b/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.6.10.eb
@@ -19,7 +19,7 @@ description = "gzip (GNU zip) is a popular data compression program as a replace
 toolchain = {'name': 'goolf', 'version': '1.6.10'}
 
 # eg. http://ftp.gnu.org/gnu/gzip/gzip-1.6.tar.gz
-source_urls = ['http://ftpmirror.gnu.org/gzip']
+source_urls = [GNU_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 # make sure the gzip, gunzip and compress binaries are available after installation
diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.6-ictce-5.3.0.eb b/easybuild/easyconfigs/g/gzip/gzip-1.6-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..21e29f76c920c98cfee2c05cfdaedaa05030aeff
--- /dev/null
+++ b/easybuild/easyconfigs/g/gzip/gzip-1.6-ictce-5.3.0.eb
@@ -0,0 +1,34 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright (c) 2012-2013 Cyprus Institute / CaSToRC
+# Authors::   Thekla Loizou <t.loizou@cyi.ac.cy>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_06-19.html
+##
+
+name = 'gzip'
+version = '1.6'
+
+homepage = 'http://www.gnu.org/software/gzip/'
+description = "gzip (GNU zip) is a popular data compression program as a replacement for compress"
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+# eg. http://ftp.gnu.org/gnu/gzip/gzip-1.6.tar.gz
+source_urls = ['http://ftpmirror.gnu.org/gzip']
+sources = [SOURCE_TAR_GZ]
+
+# make sure the gzip, gunzip and compress binaries are available after installation
+sanity_check_paths = {
+    'files': ["bin/gunzip", "bin/gzip", "bin/uncompress"],
+    'dirs': [],
+}
+
+# run 'gzip -h' and 'gzip --version' after installation
+sanity_check_commands = [True, ('gzip', '--version')]
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.6-ictce-6.2.5.eb b/easybuild/easyconfigs/g/gzip/gzip-1.6-ictce-6.2.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8c3304ae5ff9952a8a7eac7c80eb20761dea08f3
--- /dev/null
+++ b/easybuild/easyconfigs/g/gzip/gzip-1.6-ictce-6.2.5.eb
@@ -0,0 +1,34 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright (c) 2012-2013 Cyprus Institute / CaSToRC
+# Authors::   Thekla Loizou <t.loizou@cyi.ac.cy>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_06-19.html
+##
+
+name = 'gzip'
+version = '1.6'
+
+homepage = 'http://www.gnu.org/software/gzip/'
+description = "gzip (GNU zip) is a popular data compression program as a replacement for compress"
+
+toolchain = {'name': 'ictce', 'version': '6.2.5'}
+
+# eg. http://ftp.gnu.org/gnu/gzip/gzip-1.6.tar.gz
+source_urls = ['http://ftpmirror.gnu.org/gzip']
+sources = [SOURCE_TAR_GZ]
+
+# make sure the gzip, gunzip and compress binaries are available after installation
+sanity_check_paths = {
+    'files': ["bin/gunzip", "bin/gzip", "bin/uncompress"],
+    'dirs': [],
+}
+
+# run 'gzip -h' and 'gzip --version' after installation
+sanity_check_commands = [True, ('gzip', '--version')]
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.6-iomkl-6.6.2.eb b/easybuild/easyconfigs/g/gzip/gzip-1.6-iomkl-6.6.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9763d27a8823f72d63451237623db753dbf7dd41
--- /dev/null
+++ b/easybuild/easyconfigs/g/gzip/gzip-1.6-iomkl-6.6.2.eb
@@ -0,0 +1,22 @@
+name = 'gzip'
+version = '1.6'
+
+homepage = 'http://www.gnu.org/software/gzip/'
+description = "gzip (GNU zip) is a popular data compression program as a replacement for compress"
+
+toolchain = {'name': 'iomkl', 'version': '6.6.2'}
+
+# eg. http://ftp.gnu.org/gnu/gzip/gzip-1.6.tar.gz
+source_urls = [GNU_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+# make sure the gzip, gunzip and compress binaries are available after installation
+sanity_check_paths = {
+    'files': ["bin/gunzip", "bin/gzip", "bin/uncompress"],
+    'dirs': [],
+}
+
+# run 'gzip -h' and 'gzip --version' after installation
+sanity_check_commands = [True, ('gzip', '--version')]
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goalf-1.1.0-no-OFED.eb
index 4280af21baf8f402fc887112927027bdbf49d82c..e995d9cfbc473382fd6ada624f88d244477f60ec 100644
--- a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goalf-1.1.0-no-OFED.eb
@@ -2,20 +2,27 @@ name = 'HDF'
 version = '4.2.7-patch1'
 
 homepage = 'http://www.hdfgroup.org/products/hdf4/'
-description = """HDF (also known as HDF4) is a library and multi-object file format for storing and managing data between machines."""
+description = """HDF (also known as HDF4) is a library and multi-object file format for storing
+ and managing data between machines."""
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 toolchainopts = {'opt': True, 'pic': True}
 
 dependencies = [
-                ('flex', '2.5.35'),
-                ('Bison', '2.5'),
-                ('Szip', '2.1'),
-               ]
+    ('flex', '2.5.35'),
+    ('Bison', '2.5'),
+    ('Szip', '2.1'),
+    ('JasPer', '1.900.1'),
+]
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%s/src/' % version.split('-')[0]]
 
-configopts = "--with-szlib=$EBROOTSZIP"
+configopts = "--with-szlib=$EBROOTSZIP --includedir=%(installdir)s/include/hdf"
+
+sanity_check_paths = {
+    'files': ['lib/libdf.a', 'lib/libhdf4.settings', 'lib/libmfhdf.a'],
+    'dirs': ['bin', 'include/hdf'],
+}
 
 moduleclass = 'data'
diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goolf-1.4.10.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goolf-1.4.10.eb
index b4ea04cfdbbba2bc308a534964384730809c2072..144aadbb344382da4a3612e640d17e5b149a6873 100644
--- a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goolf-1.4.10.eb
@@ -2,19 +2,27 @@ name = 'HDF'
 version = '4.2.7-patch1'
 
 homepage = 'http://www.hdfgroup.org/products/hdf4/'
-description = """HDF (also known as HDF4) is a library and multi-object file format for storing and managing data between machines."""
+description = """HDF (also known as HDF4) is a library and multi-object file format for storing
+ and managing data between machines."""
+
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'opt': True, 'pic': True}
 
 dependencies = [
-                ('flex', '2.5.35'),
-                ('Bison', '2.5'),
-                ('Szip', '2.1'),
-               ]
+    ('flex', '2.5.35'),
+    ('Bison', '2.5'),
+    ('Szip', '2.1'),
+    ('JasPer', '1.900.1'),
+]
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%s/src/' % version.split('-')[0]]
 
-configopts = "--with-szlib=$EBROOTSZIP"
+configopts = "--with-szlib=$EBROOTSZIP --includedir=%(installdir)s/include/hdf"
+
+sanity_check_paths = {
+    'files': ['lib/libdf.a', 'lib/libhdf4.settings', 'lib/libmfhdf.a'],
+    'dirs': ['bin', 'include/hdf'],
+}
 
 moduleclass = 'data'
diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb
index b18ddf73bb2ea8ae723897579725d58fd8f3b5ec..0a219c43cbf256a966be853e8ed69619417fd6a8 100644
--- a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb
+++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb
@@ -2,20 +2,27 @@ name = 'HDF'
 version = '4.2.7-patch1'
 
 homepage = 'http://www.hdfgroup.org/products/hdf4/'
-description = """HDF (also known as HDF4) is a library and multi-object file format for storing and managing data between machines."""
+description = """HDF (also known as HDF4) is a library and multi-object file format for storing
+ and managing data between machines."""
 
 toolchain = {'name': 'ictce', 'version': '3.2.2.u3'}
 toolchainopts = {'opt': True, 'pic': True}
 
 dependencies = [
-                ('flex', '2.5.35'),
-                ('Bison', '2.5'),
-                ('Szip', '2.1'),
-               ]
+    ('flex', '2.5.35'),
+    ('Bison', '2.5'),
+    ('Szip', '2.1'),
+    ('JasPer', '1.900.1'),
+]
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%s/src/' % version.split('-')[0]]
 
-configopts = "--with-szlib=$EBROOTSZIP"
+configopts = "--with-szlib=$EBROOTSZIP --includedir=%(installdir)s/include/hdf"
+
+sanity_check_paths = {
+    'files': ['lib/libdf.a', 'lib/libhdf4.settings', 'lib/libmfhdf.a'],
+    'dirs': ['bin', 'include/hdf'],
+}
 
 moduleclass = 'data'
diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-5.3.0.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-5.3.0.eb
index 2914eadfc9bf969cc610d5fa7bb3209c39491d03..e44680caf15e57c1398118859ed5d1c417fa912b 100644
--- a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-5.3.0.eb
@@ -2,21 +2,27 @@ name = 'HDF'
 version = '4.2.7-patch1'
 
 homepage = 'http://www.hdfgroup.org/products/hdf4/'
-description = """HDF (also known as HDF4) is a library and multi-object file format for storing and managing data between machines."""
-
+description = """HDF (also known as HDF4) is a library and multi-object file format for storing
+ and managing data between machines."""
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 toolchainopts = {'opt': True, 'pic': True}
 
 dependencies = [
-                ('flex', '2.5.35'),
-                ('Bison', '2.5'),
-                ('Szip', '2.1'),
-               ]
+    ('flex', '2.5.35'),
+    ('Bison', '2.5'),
+    ('Szip', '2.1'),
+    ('JasPer', '1.900.1'),
+]
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%s/src/' % version.split('-')[0]]
 
-configopts = "--with-szlib=$EBROOTSZIP"
+configopts = "--with-szlib=$EBROOTSZIP --includedir=%(installdir)s/include/hdf"
+
+sanity_check_paths = {
+    'files': ['lib/libdf.a', 'lib/libhdf4.settings', 'lib/libmfhdf.a'],
+    'dirs': ['bin', 'include/hdf'],
+}
 
 moduleclass = 'data'
diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-4.1.13.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-4.1.13.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f40a9827426d570788996dbe834e711766420f7d
--- /dev/null
+++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-4.1.13.eb
@@ -0,0 +1,28 @@
+name = 'HDF'
+version = '4.2.8'
+
+homepage = 'http://www.hdfgroup.org/products/hdf4/'
+description = """HDF (also known as HDF4) is a library and multi-object file format for storing
+ and managing data between machines."""
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+toolchainopts = {'opt': True, 'pic': True}
+
+dependencies = [
+    ('flex', '2.5.37'),
+    ('Bison', '2.7'),
+    ('Szip', '2.1'),
+    ('JasPer', '1.900.1'),
+]
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%s/src/' % version.split('-')[0]]
+
+configopts = "--with-szlib=$EBROOTSZIP --includedir=%(installdir)s/include/hdf"
+
+sanity_check_paths = {
+    'files': ['lib/libdf.a', 'lib/libhdf4.settings', 'lib/libmfhdf.a'],
+    'dirs': ['bin', 'include/hdf'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-5.3.0.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1c4c00dc0188244e16c6f2072341fdd2919b8fea
--- /dev/null
+++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-5.3.0.eb
@@ -0,0 +1,26 @@
+name = 'HDF'
+version = '4.2.8'
+
+homepage = 'http://www.hdfgroup.org/products/hdf4/'
+description = """HDF (also known as HDF4) is a library and multi-object file format for storing and managing data between machines."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'opt': True, 'pic': True}
+
+dependencies = [
+    ('flex', '2.5.37'),
+    ('Bison', '2.7'),
+    ('Szip', '2.1'),
+]
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%(version)s/src/']
+
+configopts = "--with-szlib=$EBROOTSZIP --includedir=%(installdir)s/include/hdf"
+
+sanity_check_paths = {
+    'files': ['lib/libdf.a', 'lib/libhdf4.settings', 'lib/libmfhdf.a'],
+    'dirs': ['bin', 'include/hdf'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb
index 1706cf2d0ceab15ef2d33b66080a863ccf1f5439..7a34de4b31cade331854a339284673b4ae8af942 100644
--- a/easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb
+++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb
@@ -2,20 +2,27 @@ name = 'HDF'
 version = '4.2.8'
 
 homepage = 'http://www.hdfgroup.org/products/hdf4/'
-description = """HDF (also known as HDF4) is a library and multi-object file format for storing and managing data between machines."""
+description = """HDF (also known as HDF4) is a library and multi-object file format for storing
+ and managing data between machines."""
 
 toolchain = {'name': 'iqacml', 'version': '3.7.3'}
 toolchainopts = {'opt': True, 'pic': True}
 
 dependencies = [
-                ('flex', '2.5.37'),
-                ('Bison', '2.7'),
-                ('Szip', '2.1'),
-               ]
+    ('flex', '2.5.37'),
+    ('Bison', '2.7'),
+    ('Szip', '2.1'),
+    ('JasPer', '1.900.1'),
+]
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%s/src/' % version.split('-')[0]]
+source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%(version)s/src/']
 
-configopts = "--with-szlib=$EBROOTSZIP"
+configopts = "--with-szlib=$EBROOTSZIP --includedir=%(installdir)s/include/hdf"
+
+sanity_check_paths = {
+    'files': ['lib/libdf.a', 'lib/libhdf4.settings', 'lib/libmfhdf.a'],
+    'dirs': ['bin', 'include/hdf'],
+}
 
 moduleclass = 'data'
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-4.1.13-gpfs-mt.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-4.1.13-gpfs-mt.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3003f14877a6e2c9e6021d4447912b6041df4be5
--- /dev/null
+++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-4.1.13-gpfs-mt.eb
@@ -0,0 +1,30 @@
+name = 'HDF5'
+version = '1.8.10'
+versionsuffix = "-gpfs-mt"
+
+homepage = 'http://www.hdfgroup.org/HDF5/'
+description = """HDF5 is a unique technology suite that makes possible the management
+ of extremely large and complex data collections."""
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+toolchainopts = {'optarch': True, 'usempi': True, 'pic': True, 'openmp': True}
+
+source_urls = ['http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version)s/src']
+sources = [SOURCELOWER_TAR_GZ]
+
+patches = [
+    'HDF5_%(version)s_configure_ictce.patch',
+    'HDF5-%(version)s_mpi-includes_order_fix.patch',
+]
+
+dependencies = [
+    ('zlib', '1.2.7'),
+    ('Szip', '2.1'),
+]
+
+configopts = "--enable-gpfs --enable-threadsafe --enable-production "
+
+preconfigopts = 'export FFLAGS="-fopenmp $FFLAGS" && export F90FLAGS="-fopenmp $F90FLAGS" && '
+premakeopts = 'export FFLAGS="-fopenmp $FFLAGS" && export F90FLAGS="-fopenmp $F90FLAGS" && '
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-4.1.13-no-mpi.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-4.1.13-no-mpi.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8fec53bc8328137235d29f50753c86915c5f996f
--- /dev/null
+++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-4.1.13-no-mpi.eb
@@ -0,0 +1,25 @@
+name = 'HDF5'
+version = '1.8.10'
+versionsuffix = '-no-mpi'
+
+homepage = 'http://www.hdfgroup.org/HDF5/'
+description = """HDF5 is a unique technology suite that makes possible the management of 
+ extremely large and complex data collections."""
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version)s/src']
+sources = [SOURCELOWER_TAR_GZ]
+
+patches = [
+    'HDF5_%(version)s_configure_ictce.patch',
+    'configure_libtool.patch',
+]
+
+dependencies = [
+    ('zlib', '1.2.7'),
+    ('Szip', '2.1'),
+]
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-5.3.0-serial.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-5.3.0-serial.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4923cec8199f739b24e75f50bfe591bc1f98ea19
--- /dev/null
+++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-5.3.0-serial.eb
@@ -0,0 +1,22 @@
+name = 'HDF5'
+version = '1.8.10'
+versionsuffix = '-serial'
+
+homepage = 'http://www.hdfgroup.org/HDF5/'
+description = """HDF5 is a unique technology suite that makes possible the management of 
+ extremely large and complex data collections."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version)s/src']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('zlib', '1.2.7'),
+    ('Szip', '2.1'),
+]
+
+patches = ['configure_libtool.patch']
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-patch1-ictce-5.3.0.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-patch1-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..96aaf0422324e7e44986266149d14fde12a19f46
--- /dev/null
+++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-patch1-ictce-5.3.0.eb
@@ -0,0 +1,24 @@
+name = 'HDF5'
+version = '1.8.10-patch1'
+
+homepage = 'http://www.hdfgroup.org/HDF5/'
+description = """HDF5 is a unique technology suite that makes possible the management of 
+ extremely large and complex data collections."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'optarch': True, 'usempi': True, 'pic': True}
+
+source_urls = ['http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version)s/src']
+sources = [SOURCELOWER_TAR_GZ]
+
+patches = [
+    'configure_libtool.patch',
+    'HDF5-1.8.9_mpi-includes_order_fix.patch',
+]
+
+dependencies = [
+    ('zlib', '1.2.7'),
+    ('Szip', '2.1'),
+]
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.11-goolf-1.4.10.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.11-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4406c160f4592b1efa188c6f33cd49419ee339c6
--- /dev/null
+++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.11-goolf-1.4.10.eb
@@ -0,0 +1,21 @@
+name = 'HDF5'
+version = '1.8.11'
+
+homepage = 'http://www.hdfgroup.org/HDF5/'
+description = """HDF5 is a unique technology suite that makes possible the management of 
+ extremely large and complex data collections."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version)s/src']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('Szip', '2.1'),
+]
+
+patches = ['configure_libtool.patch']
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.11-ictce-5.3.0-serial.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.11-ictce-5.3.0-serial.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d1cfae67050426c2f4835054d229a7ac32ac6008
--- /dev/null
+++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.11-ictce-5.3.0-serial.eb
@@ -0,0 +1,22 @@
+name = 'HDF5'
+version = '1.8.11'
+versionsuffix = '-serial'
+
+homepage = 'http://www.hdfgroup.org/HDF5/'
+description = """HDF5 is a unique technology suite that makes possible the management of 
+ extremely large and complex data collections."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version)s/src']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('zlib', '1.2.7'),
+    ('Szip', '2.1'),
+]
+
+patches = ['configure_libtool.patch']
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.12-ictce-5.5.0-zlib-1.2.8.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.12-ictce-5.5.0-zlib-1.2.8.eb
new file mode 100644
index 0000000000000000000000000000000000000000..bf02342e7c1fb07307c203be11d741068caed303
--- /dev/null
+++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.12-ictce-5.5.0-zlib-1.2.8.eb
@@ -0,0 +1,26 @@
+name = 'HDF5'
+version = '1.8.12'
+versionsuffix = '-zlib-1.2.8'
+
+homepage = 'http://www.hdfgroup.org/HDF5/'
+description = """HDF5 is a unique technology suite that makes possible the management of 
+ extremely large and complex data collections."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'optarch': True, 'pic': True, 'usempi': True}
+
+source_urls = ['http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version)s/src']
+sources = [SOURCELOWER_TAR_GZ]
+
+patches = [
+    'HDF5-1.8.12_configure_ictce.patch',
+    'configure_libtool.patch',
+    'HDF5-%(version)s_mpi-includes_order_fix.patch',
+]
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('Szip', '2.1'),
+]
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.12-ictce-5.5.0.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.12-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0a10444693d30401266e8493d70fded861fb3185
--- /dev/null
+++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.12-ictce-5.5.0.eb
@@ -0,0 +1,25 @@
+name = 'HDF5'
+version = '1.8.12'
+
+homepage = 'http://www.hdfgroup.org/HDF5/'
+description = """HDF5 is a unique technology suite that makes possible the management of 
+ extremely large and complex data collections."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'optarch': True, 'pic': True, 'usempi': True}
+
+source_urls = ['http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version)s/src']
+sources = [SOURCELOWER_TAR_GZ]
+
+patches = [
+    'HDF5-1.8.12_configure_ictce.patch',
+    'configure_libtool.patch',
+    'HDF5-%(version)s_mpi-includes_order_fix.patch',
+]
+
+dependencies = [
+    ('zlib', '1.2.7'),
+    ('Szip', '2.1'),
+]
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.12_configure_ictce.patch b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.12_configure_ictce.patch
new file mode 100644
index 0000000000000000000000000000000000000000..1877a925ef1eaa0ab6d04480b798ad105b36901f
--- /dev/null
+++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.12_configure_ictce.patch
@@ -0,0 +1,131 @@
+--- hdf5-1.8.12/configure.orig	2013-11-21 16:14:04.000000000 +0100
++++ hdf5-1.8.12/configure	2014-01-13 13:16:28.486670037 +0100
+@@ -5260,7 +5260,7 @@
+ ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_fc_compiler_gnu
+ if test -n "$ac_tool_prefix"; then
+-  for ac_prog in gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn nagfor xlf90 f90 pgf90 pghpf epcf90 g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77
++  for ac_prog in gfortran g95 xlf95 f95 fort ifort mpif77 mpif90 ifc efc pgfortran pgf95 lf95 ftn nagfor xlf90 f90 pgf90 pghpf epcf90 g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+@@ -5304,7 +5304,7 @@
+ fi
+ if test -z "$FC"; then
+   ac_ct_FC=$FC
+-  for ac_prog in gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn nagfor xlf90 f90 pgf90 pghpf epcf90 g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77
++  for ac_prog in gfortran g95 xlf95 f95 fort ifort mpif77 mpif90 ifc efc pgfortran pgf95 lf95 ftn nagfor xlf90 f90 pgf90 pghpf epcf90 g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+@@ -5533,7 +5533,7 @@
+ ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_fc_compiler_gnu
+ if test -n "$ac_tool_prefix"; then
+-  for ac_prog in f90 pgf90 slf90 f95 g95 xlf95 efc ifort ftn
++  for ac_prog in f90 pgf90 slf90 f95 g95 xlf95 efc ifort mpif77 mpif90 ftn
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+@@ -5577,7 +5577,7 @@
+ fi
+ if test -z "$FC"; then
+   ac_ct_FC=$FC
+-  for ac_prog in f90 pgf90 slf90 f95 g95 xlf95 efc ifort ftn
++  for ac_prog in f90 pgf90 slf90 f95 g95 xlf95 efc ifort mpif77 mpif90 ftn
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+@@ -7769,7 +7769,7 @@
+   mpicc)
+     ## The mpich compiler. Use mpiexec from the same directory if it
+     ## exists.
+-    PARALLEL=mpicc
++    PARALLEL="$CC_BASENAME"
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mpiexec" >&5
+ $as_echo_n "checking for mpiexec... " >&6; }
+ 
+@@ -7831,7 +7831,7 @@
+     *mpif90*)
+       ## The Fortran mpich compiler. Use mpiexec from the same directory
+       ## if it exists.
+-      PARALLEL=mpif90
++      PARALLEL="$FC"
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mpiexec" >&5
+ $as_echo_n "checking for mpiexec... " >&6; }
+ 
+@@ -12565,7 +12565,7 @@
+         ;;
+       # icc used to be incompatible with GCC.
+       # ICC 10 doesn't accept -KPIC any more.
+-      icc* | ifort*)
++      icc*| mpicc*  | ifort*| mpif77* | mpif90* )
+ 	lt_prog_compiler_wl='-Wl,'
+ 	lt_prog_compiler_pic='-fPIC'
+ 	lt_prog_compiler_static='-static'
+@@ -13201,11 +13201,11 @@
+ 					# Portland Group f77 and f90 compilers
+ 	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ 	  tmp_addflag=' $pic_flag -Mnomain' ;;
+-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
++	ecc*,ia64* | icc*,ia64*| mpicc*,ia64*)	# Intel C compiler on ia64
+ 	  tmp_addflag=' -i_dynamic' ;;
+-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
++	efc*,ia64* | ifort*,ia64*| mpif77*,ia64* | mpif90*,ia64* )	# Intel Fortran compiler on ia64
+ 	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+-	ifc* | ifort*)			# Intel Fortran compiler
++	ifc* | ifort*| mpif77* | mpif90* )			# Intel Fortran compiler
+ 	  tmp_addflag=' -nofor_main' ;;
+ 	lf95*)				# Lahey Fortran 8.1
+ 	  whole_archive_flag_spec=
+@@ -13687,7 +13687,7 @@
+   link_all_deplibs=yes
+   allow_undefined_flag="$_lt_dar_allow_undefined"
+   case $cc_basename in
+-     ifort*) _lt_dar_can_shared=yes ;;
++     ifort*| mpif77* | mpif90* ) _lt_dar_can_shared=yes ;;
+      *) _lt_dar_can_shared=$GCC ;;
+   esac
+   if test "$_lt_dar_can_shared" = "yes"; then
+@@ -16685,7 +16685,7 @@
+   link_all_deplibs_CXX=yes
+   allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
+   case $cc_basename in
+-     ifort*) _lt_dar_can_shared=yes ;;
++     ifort*| mpif77* | mpif90* ) _lt_dar_can_shared=yes ;;
+      *) _lt_dar_can_shared=$GCC ;;
+   esac
+   if test "$_lt_dar_can_shared" = "yes"; then
+@@ -19596,7 +19596,7 @@
+         ;;
+       # icc used to be incompatible with GCC.
+       # ICC 10 doesn't accept -KPIC any more.
+-      icc* | ifort*)
++      icc*| mpicc*  | ifort*| mpif77* | mpif90* )
+ 	lt_prog_compiler_wl_FC='-Wl,'
+ 	lt_prog_compiler_pic_FC='-fPIC'
+ 	lt_prog_compiler_static_FC='-static'
+@@ -20217,11 +20217,11 @@
+ 					# Portland Group f77 and f90 compilers
+ 	  whole_archive_flag_spec_FC='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ 	  tmp_addflag=' $pic_flag -Mnomain' ;;
+-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
++	ecc*,ia64* | icc*,ia64*| mpicc*,ia64*)	# Intel C compiler on ia64
+ 	  tmp_addflag=' -i_dynamic' ;;
+-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
++	efc*,ia64* | ifort*,ia64*| mpif77*,ia64* | mpif90*,ia64* )	# Intel Fortran compiler on ia64
+ 	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+-	ifc* | ifort*)			# Intel Fortran compiler
++	ifc* | ifort*| mpif77* | mpif90* )			# Intel Fortran compiler
+ 	  tmp_addflag=' -nofor_main' ;;
+ 	lf95*)				# Lahey Fortran 8.1
+ 	  whole_archive_flag_spec_FC=
+@@ -20675,7 +20675,7 @@
+   link_all_deplibs_FC=yes
+   allow_undefined_flag_FC="$_lt_dar_allow_undefined"
+   case $cc_basename in
+-     ifort*) _lt_dar_can_shared=yes ;;
++     ifort*| mpif77* | mpif90* ) _lt_dar_can_shared=yes ;;
+      *) _lt_dar_can_shared=$GCC ;;
+   esac
+   if test "$_lt_dar_can_shared" = "yes"; then
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.12_mpi-includes_order_fix.patch b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.12_mpi-includes_order_fix.patch
new file mode 100644
index 0000000000000000000000000000000000000000..e86ffe564daaf5050504667abcf4bf5c7d20ca06
--- /dev/null
+++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.12_mpi-includes_order_fix.patch
@@ -0,0 +1,439 @@
+diff -ru hdf5-1.8.10.orig/c++/src/H5AbstractDs.cpp hdf5-1.8.10/c++/src/H5AbstractDs.cpp
+--- hdf5-1.8.10.orig/c++/src/H5AbstractDs.cpp	2012-10-11 19:31:50.000000000 +0200
++++ hdf5-1.8.10/c++/src/H5AbstractDs.cpp	2012-12-10 15:51:13.237522005 +0100
+@@ -13,6 +13,7 @@
+  * access to either file, you may request a copy from help@hdfgroup.org.     *
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ 
++#include <mpi.h>
+ #include <string>
+ 
+ #include "H5Include.h"
+diff -ru hdf5-1.8.10.orig/c++/src/H5ArrayType.cpp hdf5-1.8.10/c++/src/H5ArrayType.cpp
+--- hdf5-1.8.10.orig/c++/src/H5ArrayType.cpp	2012-10-11 19:31:50.000000000 +0200
++++ hdf5-1.8.10/c++/src/H5ArrayType.cpp	2012-12-10 15:51:13.238521995 +0100
+@@ -13,6 +13,7 @@
+  * access to either file, you may request a copy from help@hdfgroup.org.     *
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ 
++#include <mpi.h>
+ #include <string>
+ 
+ #include "H5Include.h"
+diff -ru hdf5-1.8.10.orig/c++/src/H5AtomType.cpp hdf5-1.8.10/c++/src/H5AtomType.cpp
+--- hdf5-1.8.10.orig/c++/src/H5AtomType.cpp	2012-10-11 19:31:50.000000000 +0200
++++ hdf5-1.8.10/c++/src/H5AtomType.cpp	2012-12-10 15:51:13.237522005 +0100
+@@ -13,6 +13,7 @@
+  * access to either file, you may request a copy from help@hdfgroup.org.     *
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ 
++#include <mpi.h>
+ #include <string>
+ 
+ #include "H5Include.h"
+diff -ru hdf5-1.8.10.orig/c++/src/H5Attribute.cpp hdf5-1.8.10/c++/src/H5Attribute.cpp
+--- hdf5-1.8.10.orig/c++/src/H5Attribute.cpp	2012-10-11 19:31:50.000000000 +0200
++++ hdf5-1.8.10/c++/src/H5Attribute.cpp	2012-12-10 15:51:13.230522180 +0100
+@@ -13,6 +13,7 @@
+  * access to either file, you may request a copy from help@hdfgroup.org.     *
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ 
++#include <mpi.h>
+ #ifdef OLD_HEADER_FILENAME
+ #include <iostream.h>
+ #else
+diff -ru hdf5-1.8.10.orig/c++/src/H5CommonFG.cpp hdf5-1.8.10/c++/src/H5CommonFG.cpp
+--- hdf5-1.8.10.orig/c++/src/H5CommonFG.cpp	2012-10-11 19:31:50.000000000 +0200
++++ hdf5-1.8.10/c++/src/H5CommonFG.cpp	2012-12-10 15:51:13.239522003 +0100
+@@ -13,6 +13,7 @@
+  * access to either file, you may request a copy from help@hdfgroup.org.     *
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ 
++#include <mpi.h>
+ #include <string>
+ 
+ #include "H5Include.h"
+diff -ru hdf5-1.8.10.orig/c++/src/H5CompType.cpp hdf5-1.8.10/c++/src/H5CompType.cpp
+--- hdf5-1.8.10.orig/c++/src/H5CompType.cpp	2012-10-11 19:31:50.000000000 +0200
++++ hdf5-1.8.10/c++/src/H5CompType.cpp	2012-12-10 15:51:13.239522003 +0100
+@@ -13,6 +13,7 @@
+  * access to either file, you may request a copy from help@hdfgroup.org.     *
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ 
++#include <mpi.h>
+ #include <string>
+ 
+ #include "H5Include.h"
+diff -ru hdf5-1.8.10.orig/c++/src/H5DataSet.cpp hdf5-1.8.10/c++/src/H5DataSet.cpp
+--- hdf5-1.8.10.orig/c++/src/H5DataSet.cpp	2012-10-11 19:31:50.000000000 +0200
++++ hdf5-1.8.10/c++/src/H5DataSet.cpp	2012-12-10 15:51:13.239522003 +0100
+@@ -13,6 +13,7 @@
+  * access to either file, you may request a copy from help@hdfgroup.org.     *
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ 
++#include <mpi.h>
+ #ifdef OLD_HEADER_FILENAME
+ #include <iostream.h>
+ #else
+diff -ru hdf5-1.8.10.orig/c++/src/H5DataSpace.cpp hdf5-1.8.10/c++/src/H5DataSpace.cpp
+--- hdf5-1.8.10.orig/c++/src/H5DataSpace.cpp	2012-10-11 19:31:50.000000000 +0200
++++ hdf5-1.8.10/c++/src/H5DataSpace.cpp	2012-12-10 15:51:13.237522005 +0100
+@@ -13,6 +13,7 @@
+  * access to either file, you may request a copy from help@hdfgroup.org.     *
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ 
++#include <mpi.h>
+ #ifdef OLD_HEADER_FILENAME
+ #include <iostream.h>
+ #else
+diff -ru hdf5-1.8.10.orig/c++/src/H5DataType.cpp hdf5-1.8.10/c++/src/H5DataType.cpp
+--- hdf5-1.8.10.orig/c++/src/H5DataType.cpp	2012-10-11 19:31:50.000000000 +0200
++++ hdf5-1.8.10/c++/src/H5DataType.cpp	2012-12-10 15:51:13.236521976 +0100
+@@ -13,6 +13,7 @@
+  * access to either file, you may request a copy from help@hdfgroup.org.     *
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ 
++#include <mpi.h>
+ #ifdef OLD_HEADER_FILENAME
+ #include <iostream.h>
+ #else
+diff -ru hdf5-1.8.10.orig/c++/src/H5DcreatProp.cpp hdf5-1.8.10/c++/src/H5DcreatProp.cpp
+--- hdf5-1.8.10.orig/c++/src/H5DcreatProp.cpp	2012-10-11 19:31:50.000000000 +0200
++++ hdf5-1.8.10/c++/src/H5DcreatProp.cpp	2012-12-10 15:51:13.236521976 +0100
+@@ -13,6 +13,7 @@
+  * access to either file, you may request a copy from help@hdfgroup.org.     *
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ 
++#include <mpi.h>
+ #include <string>
+ 
+ #include "H5Include.h"
+diff -ru hdf5-1.8.10.orig/c++/src/H5DxferProp.cpp hdf5-1.8.10/c++/src/H5DxferProp.cpp
+--- hdf5-1.8.10.orig/c++/src/H5DxferProp.cpp	2012-10-11 19:31:50.000000000 +0200
++++ hdf5-1.8.10/c++/src/H5DxferProp.cpp	2012-12-10 15:51:13.236521976 +0100
+@@ -13,6 +13,7 @@
+  * access to either file, you may request a copy from help@hdfgroup.org.     *
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ 
++#include <mpi.h>
+ #include <string>
+ 
+ #include "H5Include.h"
+diff -ru hdf5-1.8.10.orig/c++/src/H5EnumType.cpp hdf5-1.8.10/c++/src/H5EnumType.cpp
+--- hdf5-1.8.10.orig/c++/src/H5EnumType.cpp	2012-10-11 19:31:51.000000000 +0200
++++ hdf5-1.8.10/c++/src/H5EnumType.cpp	2012-12-10 15:51:13.237522005 +0100
+@@ -13,6 +13,7 @@
+  * access to either file, you may request a copy from help@hdfgroup.org.     *
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ 
++#include <mpi.h>
+ #include <string>
+ 
+ #include "H5Include.h"
+diff -ru hdf5-1.8.10.orig/c++/src/H5Exception.cpp hdf5-1.8.10/c++/src/H5Exception.cpp
+--- hdf5-1.8.10.orig/c++/src/H5Exception.cpp	2012-10-11 19:31:50.000000000 +0200
++++ hdf5-1.8.10/c++/src/H5Exception.cpp	2012-12-10 15:51:13.230522180 +0100
+@@ -13,6 +13,7 @@
+  * access to either file, you may request a copy from help@hdfgroup.org.     *
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ 
++#include <mpi.h>
+ #include <string>
+ 
+ #include "H5Include.h"
+diff -ru hdf5-1.8.10.orig/c++/src/H5FaccProp.cpp hdf5-1.8.10/c++/src/H5FaccProp.cpp
+--- hdf5-1.8.10.orig/c++/src/H5FaccProp.cpp	2012-10-11 19:31:50.000000000 +0200
++++ hdf5-1.8.10/c++/src/H5FaccProp.cpp	2012-12-10 15:51:13.235521927 +0100
+@@ -13,6 +13,7 @@
+  * access to either file, you may request a copy from help@hdfgroup.org.     *
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ 
++#include <mpi.h>
+ #include <string>
+ 
+ #include "H5Include.h"
+diff -ru hdf5-1.8.10.orig/c++/src/H5FcreatProp.cpp hdf5-1.8.10/c++/src/H5FcreatProp.cpp
+--- hdf5-1.8.10.orig/c++/src/H5FcreatProp.cpp	2012-10-11 19:31:51.000000000 +0200
++++ hdf5-1.8.10/c++/src/H5FcreatProp.cpp	2012-12-10 15:51:13.237522005 +0100
+@@ -13,6 +13,7 @@
+  * access to either file, you may request a copy from help@hdfgroup.org.     *
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ 
++#include <mpi.h>
+ #include <string>
+ 
+ #include "H5Include.h"
+diff -ru hdf5-1.8.10.orig/c++/src/H5File.cpp hdf5-1.8.10/c++/src/H5File.cpp
+--- hdf5-1.8.10.orig/c++/src/H5File.cpp	2012-10-11 19:31:51.000000000 +0200
++++ hdf5-1.8.10/c++/src/H5File.cpp	2012-12-10 15:51:13.240521935 +0100
+@@ -13,6 +13,7 @@
+  * access to either file, you may request a copy from help@hdfgroup.org.     *
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ 
++#include <mpi.h>
+ #ifdef OLD_HEADER_FILENAME
+ #include <iostream.h>
+ #else
+diff -ru hdf5-1.8.10.orig/c++/src/H5FloatType.cpp hdf5-1.8.10/c++/src/H5FloatType.cpp
+--- hdf5-1.8.10.orig/c++/src/H5FloatType.cpp	2012-10-11 19:31:50.000000000 +0200
++++ hdf5-1.8.10/c++/src/H5FloatType.cpp	2012-12-10 15:51:13.238521995 +0100
+@@ -13,6 +13,7 @@
+  * access to either file, you may request a copy from help@hdfgroup.org.     *
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ 
++#include <mpi.h>
+ #include <string>
+ 
+ #include "H5Include.h"
+diff -ru hdf5-1.8.10.orig/c++/src/H5Group.cpp hdf5-1.8.10/c++/src/H5Group.cpp
+--- hdf5-1.8.10.orig/c++/src/H5Group.cpp	2012-10-11 19:31:50.000000000 +0200
++++ hdf5-1.8.10/c++/src/H5Group.cpp	2012-12-10 15:51:13.240521935 +0100
+@@ -13,6 +13,7 @@
+  * access to either file, you may request a copy from help@hdfgroup.org.     *
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ 
++#include <mpi.h>
+ #ifdef OLD_HEADER_FILENAME
+ #include <iostream.h>
+ #else
+diff -ru hdf5-1.8.10.orig/c++/src/H5IdComponent.cpp hdf5-1.8.10/c++/src/H5IdComponent.cpp
+--- hdf5-1.8.10.orig/c++/src/H5IdComponent.cpp	2012-10-11 19:31:50.000000000 +0200
++++ hdf5-1.8.10/c++/src/H5IdComponent.cpp	2012-12-10 15:54:57.715521900 +0100
+@@ -13,6 +13,7 @@
+  * access to either file, you may request a copy from help@hdfgroup.org.     *
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ 
++#include <mpi.h>
+ #ifdef OLD_HEADER_FILENAME
+ #include <iostream.h>
+ #else
+diff -ru hdf5-1.8.10.orig/c++/src/H5IntType.cpp hdf5-1.8.10/c++/src/H5IntType.cpp
+--- hdf5-1.8.10.orig/c++/src/H5IntType.cpp	2012-10-11 19:31:50.000000000 +0200
++++ hdf5-1.8.10/c++/src/H5IntType.cpp	2012-12-10 15:51:13.238521995 +0100
+@@ -13,6 +13,7 @@
+  * access to either file, you may request a copy from help@hdfgroup.org.     *
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ 
++#include <mpi.h>
+ #include <string>
+ 
+ #include "H5Include.h"
+diff -ru hdf5-1.8.10.orig/c++/src/H5Library.cpp hdf5-1.8.10/c++/src/H5Library.cpp
+--- hdf5-1.8.10.orig/c++/src/H5Library.cpp	2012-10-11 19:31:50.000000000 +0200
++++ hdf5-1.8.10/c++/src/H5Library.cpp	2012-12-10 15:51:13.235521927 +0100
+@@ -13,6 +13,7 @@
+  * access to either file, you may request a copy from help@hdfgroup.org.     *
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ 
++#include <mpi.h>
+ #include <string>
+ 
+ #include "H5CppDoc.h"	// included only for Doxygen to generate part of RM
+diff -ru hdf5-1.8.10.orig/c++/src/H5Object.cpp hdf5-1.8.10/c++/src/H5Object.cpp
+--- hdf5-1.8.10.orig/c++/src/H5Object.cpp	2012-10-11 19:31:50.000000000 +0200
++++ hdf5-1.8.10/c++/src/H5Object.cpp	2012-12-10 15:51:13.235521927 +0100
+@@ -13,6 +13,7 @@
+  * access to either file, you may request a copy from help@hdfgroup.org.     *
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ 
++#include <mpi.h>
+ #include <string>
+ 
+ #include "H5Include.h"
+diff -ru hdf5-1.8.10.orig/c++/src/H5PredType.cpp hdf5-1.8.10/c++/src/H5PredType.cpp
+--- hdf5-1.8.10.orig/c++/src/H5PredType.cpp	2012-10-11 19:31:51.000000000 +0200
++++ hdf5-1.8.10/c++/src/H5PredType.cpp	2012-12-10 15:51:13.238521995 +0100
+@@ -13,6 +13,7 @@
+  * access to either file, you may request a copy from help@hdfgroup.org.     *
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ 
++#include <mpi.h>
+ #include <string>
+ 
+ #include "H5Include.h"
+diff -ru hdf5-1.8.10.orig/c++/src/H5PropList.cpp hdf5-1.8.10/c++/src/H5PropList.cpp
+--- hdf5-1.8.10.orig/c++/src/H5PropList.cpp	2012-10-11 19:31:50.000000000 +0200
++++ hdf5-1.8.10/c++/src/H5PropList.cpp	2012-12-10 15:51:13.236521976 +0100
+@@ -13,6 +13,7 @@
+  * access to either file, you may request a copy from help@hdfgroup.org.     *
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ 
++#include <mpi.h>
+ #ifdef OLD_HEADER_FILENAME
+ #include <iostream.h>
+ #else
+diff -ru hdf5-1.8.10.orig/c++/src/H5StrType.cpp hdf5-1.8.10/c++/src/H5StrType.cpp
+--- hdf5-1.8.10.orig/c++/src/H5StrType.cpp	2012-10-11 19:31:50.000000000 +0200
++++ hdf5-1.8.10/c++/src/H5StrType.cpp	2012-12-10 15:51:13.238521995 +0100
+@@ -13,6 +13,7 @@
+  * access to either file, you may request a copy from help@hdfgroup.org.     *
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ 
++#include <mpi.h>
+ #include <string>
+ 
+ #include "H5Include.h"
+diff -ru hdf5-1.8.10.orig/c++/src/H5VarLenType.cpp hdf5-1.8.10/c++/src/H5VarLenType.cpp
+--- hdf5-1.8.10.orig/c++/src/H5VarLenType.cpp	2012-10-11 19:31:51.000000000 +0200
++++ hdf5-1.8.10/c++/src/H5VarLenType.cpp	2012-12-10 15:51:13.239522003 +0100
+@@ -13,6 +13,7 @@
+  * access to either file, you may request a copy from help@hdfgroup.org.     *
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ 
++#include <mpi.h>
+ #include <string>
+ 
+ #include "H5Include.h"
+diff -ru hdf5-1.8.10.orig/c++/test/dsets.cpp hdf5-1.8.10/c++/test/dsets.cpp
+--- hdf5-1.8.10.orig/c++/test/dsets.cpp	2012-10-11 19:31:49.000000000 +0200
++++ hdf5-1.8.10/c++/test/dsets.cpp	2012-12-10 15:51:13.240521935 +0100
+@@ -25,6 +25,7 @@
+ 
+  ***************************************************************************/
+ 
++#include <mpi.h>
+ #ifdef OLD_HEADER_FILENAME
+ #include <iostream.h>
+ #else
+diff -ru hdf5-1.8.10.orig/c++/test/h5cpputil.cpp hdf5-1.8.10/c++/test/h5cpputil.cpp
+--- hdf5-1.8.10.orig/c++/test/h5cpputil.cpp	2012-10-11 19:31:49.000000000 +0200
++++ hdf5-1.8.10/c++/test/h5cpputil.cpp	2012-12-10 15:51:13.242521899 +0100
+@@ -21,6 +21,7 @@
+ 
+  ***************************************************************************/
+ 
++#include <mpi.h>
+ #ifdef OLD_HEADER_FILENAME
+ #include <iostream.h>
+ #else
+diff -ru hdf5-1.8.10.orig/c++/test/tattr.cpp hdf5-1.8.10/c++/test/tattr.cpp
+--- hdf5-1.8.10.orig/c++/test/tattr.cpp	2012-10-11 19:31:49.000000000 +0200
++++ hdf5-1.8.10/c++/test/tattr.cpp	2012-12-10 15:51:13.240521935 +0100
+@@ -20,6 +20,7 @@
+ 
+  ***************************************************************************/
+ 
++#include <mpi.h>
+ #ifdef OLD_HEADER_FILENAME
+ #include <iostream.h>
+ #else
+diff -ru hdf5-1.8.10.orig/c++/test/tcompound.cpp hdf5-1.8.10/c++/test/tcompound.cpp
+--- hdf5-1.8.10.orig/c++/test/tcompound.cpp	2012-10-11 19:31:49.000000000 +0200
++++ hdf5-1.8.10/c++/test/tcompound.cpp	2012-12-10 15:51:13.241522020 +0100
+@@ -19,6 +19,7 @@
+ 
+  ***************************************************************************/
+ 
++#include <mpi.h>
+ #ifdef OLD_HEADER_FILENAME
+ #include <iostream.h>
+ #else
+diff -ru hdf5-1.8.10.orig/c++/test/testhdf5.cpp hdf5-1.8.10/c++/test/testhdf5.cpp
+--- hdf5-1.8.10.orig/c++/test/testhdf5.cpp	2012-10-11 19:31:49.000000000 +0200
++++ hdf5-1.8.10/c++/test/testhdf5.cpp	2012-12-10 15:51:13.241522020 +0100
+@@ -41,6 +41,7 @@
+ 
+  ***************************************************************************/
+ 
++#include <mpi.h>
+ #ifdef OLD_HEADER_FILENAME
+ #include <iostream.h>
+ #else
+diff -ru hdf5-1.8.10.orig/c++/test/tfile.cpp hdf5-1.8.10/c++/test/tfile.cpp
+--- hdf5-1.8.10.orig/c++/test/tfile.cpp	2012-10-11 19:31:49.000000000 +0200
++++ hdf5-1.8.10/c++/test/tfile.cpp	2012-12-10 15:51:13.241522020 +0100
+@@ -23,6 +23,7 @@
+ 
+  ***************************************************************************/
+ 
++#include <mpi.h>
+ #ifdef OLD_HEADER_FILENAME
+ #include <iostream.h>
+ #else
+diff -ru hdf5-1.8.10.orig/c++/test/tfilter.cpp hdf5-1.8.10/c++/test/tfilter.cpp
+--- hdf5-1.8.10.orig/c++/test/tfilter.cpp	2012-10-11 19:31:49.000000000 +0200
++++ hdf5-1.8.10/c++/test/tfilter.cpp	2012-12-10 15:51:13.241522020 +0100
+@@ -19,6 +19,7 @@
+ 
+  ***************************************************************************/
+ 
++#include <mpi.h>
+ #ifdef OLD_HEADER_FILENAME
+ #include <iostream.h>
+ #else
+diff -ru hdf5-1.8.10.orig/c++/test/th5s.cpp hdf5-1.8.10/c++/test/th5s.cpp
+--- hdf5-1.8.10.orig/c++/test/th5s.cpp	2012-10-11 19:31:49.000000000 +0200
++++ hdf5-1.8.10/c++/test/th5s.cpp	2012-12-10 15:51:13.241522020 +0100
+@@ -22,6 +22,7 @@
+ 
+  ***************************************************************************/
+ 
++#include <mpi.h>
+ #ifdef OLD_HEADER_FILENAME
+ #include <iostream.h>
+ #else
+diff -ru hdf5-1.8.10.orig/c++/test/tlinks.cpp hdf5-1.8.10/c++/test/tlinks.cpp
+--- hdf5-1.8.10.orig/c++/test/tlinks.cpp	2012-10-11 19:31:49.000000000 +0200
++++ hdf5-1.8.10/c++/test/tlinks.cpp	2012-12-10 15:51:13.242521899 +0100
+@@ -19,6 +19,7 @@
+ 
+  ***************************************************************************/
+ 
++#include <mpi.h>
+ #ifdef OLD_HEADER_FILENAME
+ #include <iostream.h>
+ #else
+diff -ru hdf5-1.8.10.orig/c++/test/trefer.cpp hdf5-1.8.10/c++/test/trefer.cpp
+--- hdf5-1.8.10.orig/c++/test/trefer.cpp	2012-10-11 19:31:49.000000000 +0200
++++ hdf5-1.8.10/c++/test/trefer.cpp	2012-12-10 15:51:13.242521899 +0100
+@@ -20,6 +20,7 @@
+ 
+  ***************************************************************************/
+ 
++#include <mpi.h>
+ #ifdef OLD_HEADER_FILENAME
+ #include <iostream.h>
+ #else
+diff -ru hdf5-1.8.10.orig/c++/test/ttypes.cpp hdf5-1.8.10/c++/test/ttypes.cpp
+--- hdf5-1.8.10.orig/c++/test/ttypes.cpp	2012-10-11 19:31:49.000000000 +0200
++++ hdf5-1.8.10/c++/test/ttypes.cpp	2012-12-10 15:51:13.242521899 +0100
+@@ -19,6 +19,7 @@
+ 
+  ***************************************************************************/
+ 
++#include <mpi.h>
+ #ifdef OLD_HEADER_FILENAME
+ #include <iostream.h>
+ #else
+diff -ru hdf5-1.8.10.orig/c++/test/tvlstr.cpp hdf5-1.8.10/c++/test/tvlstr.cpp
+--- hdf5-1.8.10.orig/c++/test/tvlstr.cpp	2012-10-11 19:31:49.000000000 +0200
++++ hdf5-1.8.10/c++/test/tvlstr.cpp	2012-12-10 15:51:13.243522021 +0100
+@@ -21,6 +21,7 @@
+ 
+  ***************************************************************************/
+ 
++#include <mpi.h>
+ #ifdef OLD_HEADER_FILENAME
+ #include <iostream.h>
+ #else
+diff -ru hdf5-1.8.10.orig/src/H5make_libsettings.c hdf5-1.8.10/src/H5make_libsettings.c
+--- hdf5-1.8.10.orig/src/H5make_libsettings.c	2012-10-11 19:30:56.000000000 +0200
++++ hdf5-1.8.10/src/H5make_libsettings.c	2012-12-10 15:51:13.242521899 +0100
+@@ -41,6 +41,7 @@
+  *-------------------------------------------------------------------------
+  */
+ 
++#include <mpi.h>
+ #include <stdio.h>
+ #include <time.h>
+ #include "H5private.h"
+--- hdf5-1.8.12/c++/src/H5Location.cpp.orig	2014-01-13 16:25:41.242265318 +0100
++++ hdf5-1.8.12/c++/src/H5Location.cpp	2014-01-13 16:25:53.952336995 +0100
+@@ -13,6 +13,7 @@
+  * access to either file, you may request a copy from help@hdfgroup.org.     *
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ 
++#include <mpi.h>
+ #include <string>
+ 
+ #include "H5Include.h"
diff --git a/easybuild/easyconfigs/h/HPCBIOS_Bioinfo/HPCBIOS_Bioinfo-20130829-goolf-1.4.10.eb b/easybuild/easyconfigs/h/HPCBIOS_Bioinfo/HPCBIOS_Bioinfo-20130829-goolf-1.4.10.eb
index 1a2ccc532c6d3baf4d47db196d83f1c894985b16..86ef1ed180b4b9adaf2fdef92c546a2489be5e75 100644
--- a/easybuild/easyconfigs/h/HPCBIOS_Bioinfo/HPCBIOS_Bioinfo-20130829-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/h/HPCBIOS_Bioinfo/HPCBIOS_Bioinfo-20130829-goolf-1.4.10.eb
@@ -41,7 +41,7 @@ dependencies = [
     ('FASTX-Toolkit', '0.0.13.2'),
     ('FSL', '4.1.9'),
     ('GLIMMER', '3.02b'),
-    ('GROMACS', '4.6.1'),
+    ('GROMACS', '4.6.1', '-hybrid'),
     ('HH-suite', '2.0.16'),
     ('HMMER', '3.0'),
     ('Infernal', '1.1rc1'),
diff --git a/easybuild/easyconfigs/h/HPCBIOS_Bioinfo/HPCBIOS_Bioinfo-20130829-ictce-5.3.0.eb b/easybuild/easyconfigs/h/HPCBIOS_Bioinfo/HPCBIOS_Bioinfo-20130829-ictce-5.3.0.eb
index 1d4aeb5a5afae389a7e4d49678bf71290b45f374..dea29ed2f5aaf5fe6475d96a48ab8363457b7cc0 100644
--- a/easybuild/easyconfigs/h/HPCBIOS_Bioinfo/HPCBIOS_Bioinfo-20130829-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/h/HPCBIOS_Bioinfo/HPCBIOS_Bioinfo-20130829-ictce-5.3.0.eb
@@ -35,13 +35,13 @@ dependencies = [
     ('biodeps', '1.6'),
     ('CD-HIT', '4.5.4', '-2011-03-07'),
     ('ClustalW2', '2.1'),
-#    ('Cufflinks', '2.0.2'),
+    ('Cufflinks', '2.0.2'),
     ('EMBOSS', '6.5.7'),
     ('FASTA', '36.3.5e'),
     ('FASTX-Toolkit', '0.0.13.2'),
     ('FSL', '4.1.9'),
     ('GLIMMER', '3.02b'),
-#    ('GROMACS', '4.6.1'),
+    ('GROMACS', '4.6.1', '-hybrid'),
     ('HMMER', '3.0'),
 #    ('HH-suite', '2.0.16'),
     ('Infernal', '1.1rc1'),
diff --git a/easybuild/easyconfigs/h/HPCBIOS_LifeSciences/HPCBIOS_LifeSciences-20130829-goolf-1.4.10.eb b/easybuild/easyconfigs/h/HPCBIOS_LifeSciences/HPCBIOS_LifeSciences-20130829-goolf-1.4.10.eb
index d087f2d6bd7c0b3abedd5ca6b9850b488b9522b2..8b2a4995ff0aa7b8e2fa155bcda7dacddc69a5b0 100644
--- a/easybuild/easyconfigs/h/HPCBIOS_LifeSciences/HPCBIOS_LifeSciences-20130829-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/h/HPCBIOS_LifeSciences/HPCBIOS_LifeSciences-20130829-goolf-1.4.10.eb
@@ -27,7 +27,7 @@ dependencies = [
     ('BLAST', '2.2.28', '-Python-2.7.3'),
     ('BWA', '0.6.2'),
     ('ClustalW2', '2.1'),
-    ('GROMACS', '4.6.1'),
+    ('GROMACS', '4.6.1', '-hybrid'),
     ('HMMER', '3.0'),
     ('MrBayes', '3.1.2'),
     ('mpiBLAST', '1.6.0'),
diff --git a/easybuild/easyconfigs/h/HPCBIOS_LifeSciences/HPCBIOS_LifeSciences-20130829-ictce-5.3.0.eb b/easybuild/easyconfigs/h/HPCBIOS_LifeSciences/HPCBIOS_LifeSciences-20130829-ictce-5.3.0.eb
index 1ea5f64544d59433b7d33be2984ad57fb3e8b7af..dc22e82ed1cbf15aa66a9c15b096920c81c36db4 100644
--- a/easybuild/easyconfigs/h/HPCBIOS_LifeSciences/HPCBIOS_LifeSciences-20130829-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/h/HPCBIOS_LifeSciences/HPCBIOS_LifeSciences-20130829-ictce-5.3.0.eb
@@ -27,7 +27,7 @@ dependencies = [
     ('BLAST', '2.2.28', '-Python-2.7.3'),
     ('BWA', '0.6.2'),
     ('ClustalW2', '2.1'),
-#    ('GROMACS', '4.6.1'),
+    ('GROMACS', '4.6.1', '-hybrid'),
     ('HMMER', '3.0'),
     ('MrBayes', '3.1.2'),
     ('mpiBLAST', '1.6.0'),
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-5.3.0.eb b/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-5.3.0.eb
index d9e8ade3513ecc030bc50456114426e400cb4b19..fa3e730343edb8f3debbe599891e7594e0821d03 100644
--- a/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-5.3.0.eb
@@ -6,7 +6,6 @@ description = """HPL is a software package that solves a (random) dense linear s
  on distributed-memory computers. It can thus be regarded as a portable as well as freely available implementation of the 
  High Performance Computing Linpack Benchmark."""
 
-
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 toolchainopts = {'optarch': True, 'usempi': True}
 
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.0.5.eb b/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.0.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ab34c97e0cd2addc2a15958a4c4c9acc1b447a8b
--- /dev/null
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.0.5.eb
@@ -0,0 +1,18 @@
+name = 'HPL'
+version = '2.0'
+
+homepage = 'http://www.netlib.org/benchmark/hpl/'
+description = """HPL is a software package that solves a (random) dense linear system in double precision (64 bits) arithmetic 
+ on distributed-memory computers. It can thus be regarded as a portable as well as freely available implementation of the 
+ High Performance Computing Linpack Benchmark."""
+
+toolchain = {'name': 'ictce', 'version': '6.0.5'}
+toolchainopts = {'optarch': True, 'usempi': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.netlib.org/benchmark/%(namelower)s']
+
+# fix Make dependencies, so parallel build also works
+patches = ['HPL_parallel-make.patch']
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.1.5.eb b/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.1.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..91a1cadef93ee07cec5acbf673e3776925b77195
--- /dev/null
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.1.5.eb
@@ -0,0 +1,18 @@
+name = 'HPL'
+version = '2.0'
+
+homepage = 'http://www.netlib.org/benchmark/hpl/'
+description = """HPL is a software package that solves a (random) dense linear system in double precision (64 bits) arithmetic 
+ on distributed-memory computers. It can thus be regarded as a portable as well as freely available implementation of the 
+ High Performance Computing Linpack Benchmark."""
+
+toolchain = {'name': 'ictce', 'version': '6.1.5'}
+toolchainopts = {'optarch': True, 'usempi': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.netlib.org/benchmark/%(namelower)s']
+
+# fix Make dependencies, so parallel build also works
+patches = ['HPL_parallel-make.patch']
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.0-iomkl-4.6.13.eb b/easybuild/easyconfigs/h/HPL/HPL-2.0-iomkl-4.6.13.eb
new file mode 100644
index 0000000000000000000000000000000000000000..312add6caf5f6f460cb1b51202da632af01502b5
--- /dev/null
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.0-iomkl-4.6.13.eb
@@ -0,0 +1,18 @@
+name = 'HPL'
+version = '2.0'
+
+homepage = 'http://www.netlib.org/benchmark/hpl/'
+description = """HPL is a software package that solves a (random) dense linear system in double precision (64 bits) arithmetic 
+ on distributed-memory computers. It can thus be regarded as a portable as well as freely available implementation of the 
+ High Performance Computing Linpack Benchmark."""
+
+toolchain = {'name': 'iomkl', 'version': '4.6.13'}
+toolchainopts = {'optarch': True, 'usempi': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.netlib.org/benchmark/%(namelower)s']
+
+# fix Make dependencies, so parallel build also works
+patches = ['HPL_parallel-make.patch']
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-goolf-1.4.10-Python-2.7.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..467ed7ee6db74041aa08bb4930e1c6c79717b708
--- /dev/null
+++ b/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-goolf-1.4.10-Python-2.7.3.eb
@@ -0,0 +1,29 @@
+easyblock = "PythonPackage"
+
+name = 'HTSeq'
+version = '0.5.4p5'
+
+homepage = 'http://www-huber.embl.de/users/anders/HTSeq/'
+description = """A framework to process and analyze data from high-throughput sequencing (HTS) assays"""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['https://pypi.python.org/packages/source/H/HTSeq/']
+sources = [SOURCE_TAR_GZ]
+
+python = 'Python'
+pythonver = '2.7.3'
+pyshortver = '.'.join(pythonver.split('.')[0:2])
+versionsuffix = '-%s-%s' % (python, pythonver)
+eggname = '%%(name)s-%%(version)s-py%s-linux-x86_64.egg' % pyshortver
+
+dependencies = [(python, pythonver)]
+
+sanity_check_paths = {
+    'files': ["bin/htseq-count", "bin/htseq-qa"],
+    'dirs': ["lib/python%s/site-packages/%s" % (pyshortver, eggname)],
+}
+
+options = {'modulename': '%(name)s'}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-goolf-1.4.10-Python-2.7.6.eb b/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-goolf-1.4.10-Python-2.7.6.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b910000b2d3eded62bf066b553bbbbc61adddbf3
--- /dev/null
+++ b/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-goolf-1.4.10-Python-2.7.6.eb
@@ -0,0 +1,26 @@
+easyblock = 'PythonPackage'
+name = 'HTSeq'
+version = '0.5.4p5'
+
+homepage = 'http://www-huber.embl.de/users/anders/HTSeq/doc/overview.html'
+description = """HTSeq is a Python package that provides infrastructure to process data from high-throughput sequencing
+assays."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+python = 'Python'
+pythonver = '2.7.6'
+versionsuffix = '-%s-%s' % (python, pythonver)
+
+dependencies = [
+    ('matplotlib', '1.3.1', versionsuffix),
+    (python, pythonver),
+]
+
+
+options = {'modulename': name}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-ictce-4.1.13-Python-2.7.6.eb b/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-ictce-4.1.13-Python-2.7.6.eb
new file mode 100644
index 0000000000000000000000000000000000000000..efffff590477f83ee8ed00fc8639e5587ad121de
--- /dev/null
+++ b/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-ictce-4.1.13-Python-2.7.6.eb
@@ -0,0 +1,26 @@
+easyblock = 'PythonPackage'
+name = 'HTSeq'
+version = '0.5.4p5'
+
+homepage = 'http://www-huber.embl.de/users/anders/HTSeq/doc/overview.html'
+description = """HTSeq is a Python package that provides infrastructure to process data from high-throughput sequencing
+assays."""
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+python = 'Python'
+pythonver = '2.7.6'
+versionsuffix = '-%s-%s' % (python, pythonver)
+
+dependencies = [
+    ('matplotlib', '1.3.1', versionsuffix),
+    (python, pythonver),
+]
+
+
+options = {'modulename': name}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-ictce-5.3.0-Python-2.7.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d593001ecd35d0a68ecf2c69b8abc8071bc713ce
--- /dev/null
+++ b/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-ictce-5.3.0-Python-2.7.3.eb
@@ -0,0 +1,29 @@
+easyblock = "PythonPackage"
+
+name = 'HTSeq'
+version = '0.5.4p5'
+
+homepage = 'http://www-huber.embl.de/users/anders/HTSeq/'
+description = """A framework to process and analyze data from high-throughput sequencing (HTS) assays"""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = ['https://pypi.python.org/packages/source/H/HTSeq/']
+sources = [SOURCE_TAR_GZ]
+
+python = 'Python'
+pythonver = '2.7.3'
+pyshortver = '.'.join(pythonver.split('.')[0:2])
+versionsuffix = '-%s-%s' % (python, pythonver)
+eggname = '%%(name)s-%%(version)s-py%s-linux-x86_64.egg' % pyshortver
+
+dependencies = [(python, pythonver)]
+
+sanity_check_paths = {
+    'files': ["bin/htseq-count", "bin/htseq-qa"],
+    'dirs': ["lib/python%s/site-packages/%s" % (pyshortver, eggname)],
+}
+
+options = {'modulename': '%(name)s'}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-ictce-5.5.0-Python-2.7.6.eb
new file mode 100644
index 0000000000000000000000000000000000000000..478d636658657b704604d1f9679d56f9b21f0909
--- /dev/null
+++ b/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-ictce-5.5.0-Python-2.7.6.eb
@@ -0,0 +1,29 @@
+easyblock = "PythonPackage"
+
+name = 'HTSeq'
+version = '0.5.4p5'
+
+homepage = 'http://www-huber.embl.de/users/anders/HTSeq/'
+description = """A framework to process and analyze data from high-throughput sequencing (HTS) assays"""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+source_urls = ['https://pypi.python.org/packages/source/H/HTSeq/']
+sources = [SOURCE_TAR_GZ]
+
+python = 'Python'
+pythonver = '2.7.6'
+pyshortver = '.'.join(pythonver.split('.')[0:2])
+versionsuffix = '-%s-%s' % (python, pythonver)
+eggname = '%%(name)s-%%(version)s-py%s-linux-x86_64.egg' % pyshortver
+
+dependencies = [(python, pythonver)]
+
+sanity_check_paths = {
+    'files': ["bin/htseq-count", "bin/htseq-qa"],
+    'dirs': ["lib/python%s/site-packages/%s" % (pyshortver, eggname)],
+}
+
+options = {'modulename': '%(name)s'}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/h/h4toh5/h4toh5-2.2.2-linux-x86_64-static.eb b/easybuild/easyconfigs/h/h4toh5/h4toh5-2.2.2-linux-x86_64-static.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9701129849095a689073a06baec0d6c10022d35b
--- /dev/null
+++ b/easybuild/easyconfigs/h/h4toh5/h4toh5-2.2.2-linux-x86_64-static.eb
@@ -0,0 +1,20 @@
+easyblock = 'Tarball'
+
+name = 'h4toh5'
+version = '2.2.2'
+versionsuffix = '-linux-x86_64-static'
+
+homepage = 'http://www.hdfgroup.org/h4toh5/'
+description = """The h4toh5 software consists of the h4toh5 and h5toh4 command-line utilities,
+ as well as a conversion library for converting between individual HDF4 and HDF5 objects."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+# fi. http://www.hdfgroup.org/ftp/HDF5/tools/h4toh5/bin/h4h5tools-2.2.1-linux-x86_64-static.tar.gz
+source_urls = ['http://www.hdfgroup.org/ftp/HDF5/tools/%s/bin' % name]
+sources = ['h4h5tools-%(version)s%(versionsuffix)s.tar.gz']
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in ['h5toh4', 'h5toh4']],
+    'dirs': [],
+}
diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index 65a7014b209e09d575392da9e0f7882f0a59917c..b8f9029260d6c10e170c7945cc131967a5a65cdf 100644
--- a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -21,7 +21,8 @@ versionsuffix = '-%s-%s' % (python, pythonver)
 
 dependencies = [
     (python, pythonver),
-    ('HDF5', '1.8.7')
+    ('HDF5', '1.8.7'),
+    ('mpi4py', '1.3', versionsuffix),  # required for MPI support
 ]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goolf-1.4.10-Python-2.7.3.eb
index 07429451c565a96c71e86a35afa71ee842622657..ede8e25c17923f355a5e3ab11446e2ce704ea450 100644
--- a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goolf-1.4.10-Python-2.7.3.eb
@@ -21,7 +21,8 @@ versionsuffix = '-%s-%s' % (python, pythonver)
 
 dependencies = [
     (python, pythonver),
-    ('HDF5', '1.8.7')
+    ('HDF5', '1.8.7'),
+    ('mpi4py', '1.3', versionsuffix),  # required for MPI support
 ]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-4.0.6-Python-2.7.3.eb
index a8e6f4abc3bf4b69510138bbe9597bea2ad2e367..b7aec3d30e9d8d01fe71e75030b3dff6c2fdb965 100644
--- a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-4.0.6-Python-2.7.3.eb
@@ -21,6 +21,7 @@ versionsuffix = '-%s-%s' % (python, pythonver)
 dependencies = [
     (python, pythonver),
     ('HDF5', '1.8.7'),
+    ('mpi4py', '1.3', versionsuffix),  # required for MPI support
 ]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-4.1.13-Python-2.7.3.eb
index 5c81d663862fc69b52ec9003239687b72d7a581a..7a0e274285411a3a041b462c5f4134e10e51a845 100644
--- a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-4.1.13-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-4.1.13-Python-2.7.3.eb
@@ -21,6 +21,7 @@ versionsuffix = '-%s-%s' % (python, pythonver)
 dependencies = [
     (python, pythonver),
     ('HDF5', '1.8.10', '-gpfs'),
+    ('mpi4py', '1.3', versionsuffix),  # required for MPI support
 ]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-5.3.0-Python-2.7.3.eb
index e9b09d3b51c8883fd2927066f1b23a444ff7fec6..17626346c54fc2cbb99db108a062a215ffcd96c2 100644
--- a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-5.3.0-Python-2.7.3.eb
@@ -21,6 +21,7 @@ versionsuffix = '-%s-%s' % (python, pythonver)
 dependencies = [
     (python, pythonver),
     ('HDF5', '1.8.10', '-gpfs'),
+    ('mpi4py', '1.3', versionsuffix),  # required for MPI support
 ]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.1.3-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.1.3-goolf-1.4.10-Python-2.7.3.eb
index 33f5356c81733e9f9927c5c0dbb2ca8387491385..b83b6afd0afd36184e31a8a72d849b60eccb46f2 100644
--- a/easybuild/easyconfigs/h/h5py/h5py-2.1.3-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/h/h5py/h5py-2.1.3-goolf-1.4.10-Python-2.7.3.eb
@@ -22,6 +22,7 @@ versionsuffix = '-%s-%s' % (python, pythonver)
 dependencies = [
     (python, pythonver),
     ('HDF5', '1.8.10'),
+    ('mpi4py', '1.3', versionsuffix),  # required for MPI support
 ]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-4.1.13-Python-2.7.3.eb
index a3bd601e6706475c20a3b4f938dad9323d6a2c5f..00b462fa19b932e281b4d54fe395d6e3037619b0 100644
--- a/easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-4.1.13-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-4.1.13-Python-2.7.3.eb
@@ -22,6 +22,7 @@ versionsuffix = '-%s-%s' % (python, pythonver)
 dependencies = [
     (python, pythonver),
     ('HDF5', '1.8.10'),
+    ('mpi4py', '1.3', versionsuffix),  # required for MPI support
 ]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-5.3.0-Python-2.7.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e2324d7186a2ab85f4618b761295621e3d09ac7d
--- /dev/null
+++ b/easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-5.3.0-Python-2.7.3.eb
@@ -0,0 +1,33 @@
+easyblock = "PythonPackage"
+
+name = 'h5py'
+version = '2.1.3'
+
+homepage = 'http://code.google.com/p/h5py/'
+description = """HDF5 for Python (h5py) is a general-purpose Python interface to the Hierarchical Data Format library,
+ version 5. HDF5 is a versatile, mature scientific software library designed for the fast, flexible storage of enormous
+ amounts of data."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'usempi': True}
+
+source_urls = ['http://h5py.googlecode.com/files/']
+sources = [SOURCE_TAR_GZ]
+
+python = 'Python'
+pythonver = '2.7.3'
+pythonshortver = '.'.join(pythonver.split('.')[0:2])
+versionsuffix = '-%s-%s' % (python, pythonver)
+
+dependencies = [
+    (python, pythonver),
+    ('HDF5', '1.8.10'),
+    ('mpi4py', '1.3', versionsuffix),  # required for MPI support
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%s/site-packages/%%(name)s' % pythonshortver],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.2.1-ictce-5.5.0-Python-2.7.5.eb b/easybuild/easyconfigs/h/h5py/h5py-2.2.1-ictce-5.5.0-Python-2.7.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fd76fc37b546ca76ba485a62336309b5ac46a042
--- /dev/null
+++ b/easybuild/easyconfigs/h/h5py/h5py-2.2.1-ictce-5.5.0-Python-2.7.5.eb
@@ -0,0 +1,36 @@
+easyblock = "PythonPackage"
+
+name = 'h5py'
+version = '2.2.1'
+
+homepage = 'http://www.h5py.org/'
+description = """HDF5 for Python (h5py) is a general-purpose Python interface to the Hierarchical Data Format library,
+ version 5. HDF5 is a versatile, mature scientific software library designed for the fast, flexible storage of enormous
+ amounts of data."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'usempi': True}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+python = 'Python'
+pythonver = '2.7.5'
+pythonshortver = '.'.join(pythonver.split('.')[0:2])
+versionsuffix = '-%s-%s' % (python, pythonver)
+
+# make sure that MPI features are enabled (new in h5py v2.2)
+makeopts = '--mpi'
+
+dependencies = [
+    (python, pythonver),
+    ('HDF5', '1.8.12', '-zlib-1.2.8'),
+    ('mpi4py', '1.3', versionsuffix),  # required for MPI support
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%s/site-packages/%%(name)s' % pythonshortver],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/h/h5utils/h5utils-1.12.1-ictce-5.3.0.eb b/easybuild/easyconfigs/h/h5utils/h5utils-1.12.1-ictce-5.3.0.eb
index 1156a3d1e908795647d2204dc37693592256a341..f7f33b20cd21c8eae7bd457812c7c06c1891fe68 100644
--- a/easybuild/easyconfigs/h/h5utils/h5utils-1.12.1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/h/h5utils/h5utils-1.12.1-ictce-5.3.0.eb
@@ -7,7 +7,7 @@ description = """h5utils is a set of utilities for visualization and conversion
  convert HDF5 datasets into the formats required by other free visualization software (e.g. plain text, Vis5d, and VTK)."""
 
 source_urls = ['http://ab-initio.mit.edu/h5utils/']
-sources = ['%s-%s.tar.gz' % (name.lower(), version)]
+sources = [SOURCELOWER_TAR_GZ]
 
 patches = ['libpng1.5_fix.patch']
 
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.5.1-ictce-5.3.0.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.5.1-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4255032ed4f9f822efbc91fa9c1342c524dd4648
--- /dev/null
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.5.1-ictce-5.3.0.eb
@@ -0,0 +1,17 @@
+name = 'hwloc'
+version = '1.5.1'
+
+homepage = 'http://www.open-mpi.org/projects/hwloc/'
+description = """The Portable Hardware Locality (hwloc) software package provides a portable abstraction
+  (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, including
+ NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. It also gathers various
+ system attributes such as cache and memory information as well as the locality of I/O devices such as
+ network interfaces, InfiniBand HCAs or GPUs. It primarily aims at helping applications with gathering
+ information about modern computing hardware so as to exploit it accordingly and efficiently."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
+sources = [SOURCE_TAR_GZ]
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.6-ictce-5.3.0.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.6-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f1b284038d8710310ba28c455f240669d72551de
--- /dev/null
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.6-ictce-5.3.0.eb
@@ -0,0 +1,17 @@
+name = 'hwloc'
+version = '1.6'
+
+homepage = 'http://www.open-mpi.org/projects/hwloc/'
+description = """The Portable Hardware Locality (hwloc) software package provides a portable abstraction
+  (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, including
+ NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. It also gathers various
+ system attributes such as cache and memory information as well as the locality of I/O devices such as
+ network interfaces, InfiniBand HCAs or GPUs. It primarily aims at helping applications with gathering
+ information about modern computing hardware so as to exploit it accordingly and efficiently."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
+sources = [SOURCE_TAR_GZ]
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-ictce-5.3.0.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a5fd17b34868f1b6e1ae6e9111dd6cff60b78b42
--- /dev/null
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-ictce-5.3.0.eb
@@ -0,0 +1,17 @@
+name = 'hwloc'
+version = '1.6.2'
+
+homepage = 'http://www.open-mpi.org/projects/hwloc/'
+description = """The Portable Hardware Locality (hwloc) software package provides a portable abstraction
+  (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, including
+ NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. It also gathers various
+ system attributes such as cache and memory information as well as the locality of I/O devices such as
+ network interfaces, InfiniBand HCAs or GPUs. It primarily aims at helping applications with gathering
+ information about modern computing hardware so as to exploit it accordingly and efficiently."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+  
+source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
+sources = [SOURCE_TAR_GZ]
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.7.2-ictce-5.3.0.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.7.2-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5abd7ea765d5527ec90d95cb3125d1f1bc27ded6
--- /dev/null
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.7.2-ictce-5.3.0.eb
@@ -0,0 +1,17 @@
+name = 'hwloc'
+version = "1.7.2"
+
+homepage = 'http://www.open-mpi.org/projects/hwloc/'
+description = """The Portable Hardware Locality (hwloc) software package provides a portable abstraction
+ (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, including
+ NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. It also gathers various
+ system attributes such as cache and memory information as well as the locality of I/O devices such as
+ network interfaces, InfiniBand HCAs or GPUs. It primarily aims at helping applications with gathering
+ information about modern computing hardware so as to exploit it accordingly and efficiently."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+  
+source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
+sources = [SOURCE_TAR_GZ]
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.8-gcccuda-2.6.10.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.8-gcccuda-2.6.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..16ef9ff42ef983114d9b5303a79593061e10e877
--- /dev/null
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.8-gcccuda-2.6.10.eb
@@ -0,0 +1,17 @@
+name = 'hwloc'
+version = "1.8"
+
+homepage = 'http://www.open-mpi.org/projects/hwloc/'
+description = """The Portable Hardware Locality (hwloc) software package provides a portable abstraction
+ (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, including
+ NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. It also gathers various
+ system attributes such as cache and memory information as well as the locality of I/O devices such as
+ network interfaces, InfiniBand HCAs or GPUs. It primarily aims at helping applications with gathering
+ information about modern computing hardware so as to exploit it accordingly and efficiently."""
+
+toolchain = {'name': 'gcccuda', 'version': '2.6.10'}
+  
+source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
+sources = [SOURCE_TAR_GZ]
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.8.1-GCC-4.8.2.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.8.1-GCC-4.8.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1a2541a79bf614ebd8df2303f067c56daeb9efee
--- /dev/null
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.8.1-GCC-4.8.2.eb
@@ -0,0 +1,17 @@
+name = 'hwloc'
+version = "1.8.1"
+
+homepage = 'http://www.open-mpi.org/projects/hwloc/'
+description = """The Portable Hardware Locality (hwloc) software package provides a portable abstraction
+ (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, including
+ NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. It also gathers various
+ system attributes such as cache and memory information as well as the locality of I/O devices such as
+ network interfaces, InfiniBand HCAs or GPUs. It primarily aims at helping applications with gathering
+ information about modern computing hardware so as to exploit it accordingly and efficiently."""
+
+toolchain = {'name': 'GCC', 'version': '4.8.2'}
+  
+source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
+sources = [SOURCE_TAR_GZ]
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.8.1-iccifort-2013_sp1.2.144.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.8.1-iccifort-2013_sp1.2.144.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4578e9944cd3df30ff0c8729bbd23e1bbe0f494b
--- /dev/null
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.8.1-iccifort-2013_sp1.2.144.eb
@@ -0,0 +1,17 @@
+name = 'hwloc'
+version = '1.8.1'
+
+homepage = 'http://www.open-mpi.org/projects/hwloc/'
+description = """The Portable Hardware Locality (hwloc) software package provides a portable abstraction
+  (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, including
+ NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. It also gathers various
+ system attributes such as cache and memory information as well as the locality of I/O devices such as
+ network interfaces, InfiniBand HCAs or GPUs. It primarily aims at helping applications with gathering
+ information about modern computing hardware so as to exploit it accordingly and efficiently."""
+
+toolchain = {'name': 'iccifort', 'version': '2013_sp1.2.144'}
+
+source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
+sources = [SOURCE_TAR_GZ]
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-goalf-1.1.0-no-OFED.eb
index f2c8d1274e593db06bb245caeb8a09aa44db64f4..d3db545e1a6d0ebabeb19837afa3b7fcf19bbee5 100644
--- a/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-goalf-1.1.0-no-OFED.eb
@@ -14,7 +14,7 @@ name = 'Infernal'
 version = '1.1rc1'
 
 homepage = 'http://infernal.janelia.org/'
-description = """Infernal ("INFERence of RNA ALignment") is for searching DNA sequence databases
+description = """Infernal ('INFERence of RNA ALignment') is for searching DNA sequence databases
  for RNA structure and sequence similarities."""
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
diff --git a/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-goolf-1.4.10.eb b/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-goolf-1.4.10.eb
index 25d1562163c84b9d185956fe3b4a34dc95bb3488..51e22a99b8573481a3f815ac182f3ec96908df49 100644
--- a/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-goolf-1.4.10.eb
@@ -14,7 +14,7 @@ name = 'Infernal'
 version = '1.1rc1'
 
 homepage = 'http://infernal.janelia.org/'
-description = """Infernal ("INFERence of RNA ALignment") is for searching DNA sequence databases
+description = """Infernal ('INFERence of RNA ALignment') is for searching DNA sequence databases
 for RNA structure and sequence similarities."""
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'optarch': True, 'pic': True}
diff --git a/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-ictce-4.0.6.eb b/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-ictce-4.0.6.eb
index 81e6ea4a462a9e1b09711ddcb013059e3f2dcb4a..49c4ff18a2a7c622b30b79b740717235d2239951 100644
--- a/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-ictce-4.0.6.eb
@@ -14,7 +14,7 @@ name = 'Infernal'
 version = '1.1rc1'
 
 homepage = 'http://infernal.janelia.org/'
-description = """Infernal ("INFERence of RNA ALignment") is for searching DNA sequence databases
+description = """Infernal ('INFERence of RNA ALignment') is for searching DNA sequence databases
  for RNA structure and sequence similarities."""
 
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
diff --git a/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-ictce-5.3.0.eb b/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-ictce-5.3.0.eb
index 14693175a9a9817e36fd9e5487ab085d28a66483..e9de6ee650876c8d6fb97488a28f5b163cf0a530 100644
--- a/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-ictce-5.3.0.eb
@@ -14,7 +14,7 @@ name = 'Infernal'
 version = '1.1rc1'
 
 homepage = 'http://infernal.janelia.org/'
-description = """Infernal ("INFERence of RNA ALignment") is for searching DNA sequence databases
+description = """Infernal ('INFERence of RNA ALignment') is for searching DNA sequence databases
  for RNA structure and sequence similarities."""
 
 
diff --git a/easybuild/easyconfigs/i/IsoInfer/IsoInfer-0.9.1-goolf-1.4.10.eb b/easybuild/easyconfigs/i/IsoInfer/IsoInfer-0.9.1-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1ed83c45264e9253c0289137d110911f75f3673e
--- /dev/null
+++ b/easybuild/easyconfigs/i/IsoInfer/IsoInfer-0.9.1-goolf-1.4.10.eb
@@ -0,0 +1,47 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Authors: Kenneth Hoste (UGent), Pablo Escobar Lopez (Unibas)
+
+easyblock = 'MakeCp'
+
+name = 'IsoInfer'
+version = '0.9.1'
+
+homepage = 'http://www.cs.ucr.edu/~jianxing/IsoInfer.html'
+description = """IsoInfer is a C/C++ program  to infer isoforms based on short RNA-Seq 
+ (single-end and paired-end) reads, exon-intron boundary and TSS/PAS information. 
+ This version of IsoInfer uses a unified way to handle different types of short reads 
+ with different lengths. """
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+sources = [
+    SOURCELOWER_TAR_GZ,  # main tarball first, so that start_dir is set correctly
+    'graphlib-0.3.tar.gz',
+]
+source_urls = ['http://www.cs.ucr.edu/~jianxing']
+
+dependencies = [ 
+    ('QuadProg++', '1.2.1'),
+    ('GLPK', '4.53'),
+    ('GSL', '1.16')
+]
+
+with_configure = True
+
+# build libgraph.a
+graphlib_version = '0.3'
+preconfigopts = "cd ../graphlib-%s && ./configure && make && " % graphlib_version
+# build isoinfer, make sure we can link to libgraph.a
+preconfigopts += "cd ../isoinfer-%(version)s && "
+preconfigopts += 'export LDFLAGS="$LDFLAGS -L%%(builddir)s/graphlib-%s/src" && ' % graphlib_version
+
+files_to_copy = [
+    (['src/isoinfer'], 'bin'),
+]
+
+sanity_check_paths = {
+    'files': ["bin/isoinfer"],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/i/IsoInfer/IsoInfer-0.9.1-ictce-6.2.5.eb b/easybuild/easyconfigs/i/IsoInfer/IsoInfer-0.9.1-ictce-6.2.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3f65089c099e3b915fbbf0507c318aff46d4c66f
--- /dev/null
+++ b/easybuild/easyconfigs/i/IsoInfer/IsoInfer-0.9.1-ictce-6.2.5.eb
@@ -0,0 +1,47 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Authors: Kenneth Hoste (UGent), Pablo Escobar Lopez (Unibas)
+
+easyblock = 'MakeCp'
+
+name = 'IsoInfer'
+version = '0.9.1'
+
+homepage = 'http://www.cs.ucr.edu/~jianxing/IsoInfer.html'
+description = """IsoInfer is a C/C++ program  to infer isoforms based on short RNA-Seq 
+ (single-end and paired-end) reads, exon-intron boundary and TSS/PAS information. 
+ This version of IsoInfer uses a unified way to handle different types of short reads 
+ with different lengths. """
+
+toolchain = {'name': 'ictce', 'version': '6.2.5'}
+
+sources = [
+    SOURCELOWER_TAR_GZ,  # main tarball first, so that start_dir is set correctly
+    'graphlib-0.3.tar.gz',
+]
+source_urls = ['http://www.cs.ucr.edu/~jianxing']
+
+dependencies = [ 
+    ('QuadProg++', '1.2.1'),
+    ('GLPK', '4.53'),
+    ('GSL', '1.16')
+]
+
+with_configure = True
+
+# build libgraph.a
+graphlib_version = '0.3'
+preconfigopts = "cd ../graphlib-%s && ./configure && make && " % graphlib_version
+# build isoinfer, make sure we can link to libgraph.a
+preconfigopts += "cd ../isoinfer-%(version)s && "
+preconfigopts += 'export LDFLAGS="$LDFLAGS -L%%(builddir)s/graphlib-%s/src" && ' % graphlib_version
+
+files_to_copy = [
+    (['src/isoinfer'], 'bin'),
+]
+
+sanity_check_paths = {
+    'files': ["bin/isoinfer"],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/i/icc/icc-11.1.073-32bit.eb b/easybuild/easyconfigs/i/icc/icc-11.1.073-32bit.eb
index d99b8550b853920ce0c873a644bf32978ac2665a..25d906e87f98fdcf49d97b7e33a47ef2792f1bdc 100644
--- a/easybuild/easyconfigs/i/icc/icc-11.1.073-32bit.eb
+++ b/easybuild/easyconfigs/i/icc/icc-11.1.073-32bit.eb
@@ -9,11 +9,9 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 sources = ['l_cproc_p_%s.tgz' % version]
 
-## small patch for the installer
+# small patch for the installer
 patches = ['specified-paths.patch']
 
-moduleclass = 'compiler'
-
 dontcreateinstalldir = 'True'
 
 # license file
@@ -21,3 +19,5 @@ import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
 
 m32 = True
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/i/icc/icc-11.1.073.eb b/easybuild/easyconfigs/i/icc/icc-11.1.073.eb
index cca27f98ee6a3d741e54586c5c320b0adae96552..270e177a0c9897f3e8e9fb4aae5d472829994732 100644
--- a/easybuild/easyconfigs/i/icc/icc-11.1.073.eb
+++ b/easybuild/easyconfigs/i/icc/icc-11.1.073.eb
@@ -8,13 +8,13 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 sources = ['l_cproc_p_%s.tgz' % version]
 
-## small patch for the installer
+# small patch for the installer
 patches = ['specified-paths.patch']
 
-moduleclass = 'compiler'
-
 dontcreateinstalldir = 'True'
 
 # license file
 import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/i/icc/icc-11.1.075.eb b/easybuild/easyconfigs/i/icc/icc-11.1.075.eb
index ead27506ae25642730e8074a54bc1aa1a3f966ee..005adc34f3d0590251dc8b76e5785570cca356f2 100644
--- a/easybuild/easyconfigs/i/icc/icc-11.1.075.eb
+++ b/easybuild/easyconfigs/i/icc/icc-11.1.075.eb
@@ -8,13 +8,13 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 sources = ['l_cproc_p_%s_intel64.tgz' % version]
 
-## small patch for the installer
+# small patch for the installer
 patches = ['specified-paths.patch']
 
-moduleclass = 'compiler'
-
 dontcreateinstalldir = 'True'
 
 # license file
 import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/i/icc/icc-2011.10.319.eb b/easybuild/easyconfigs/i/icc/icc-2011.10.319.eb
index 7da3e690e46cd80f76bf737a80c0384ac635287c..e8019bf5f8095675caee768630f69b0d7b063290 100644
--- a/easybuild/easyconfigs/i/icc/icc-2011.10.319.eb
+++ b/easybuild/easyconfigs/i/icc/icc-2011.10.319.eb
@@ -8,10 +8,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 sources = ['l_ccompxe_intel64_%s.tgz' % version]
 
-moduleclass = 'compiler'
-
 dontcreateinstalldir = 'True'
 
 # license file
 import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/i/icc/icc-2011.13.367.eb b/easybuild/easyconfigs/i/icc/icc-2011.13.367.eb
index 7ae1a1aafb8c89d6af3a4fadab456ce63f12b4c1..17d0cd2bbe2f49b3802655eb53208b1878f25d3b 100644
--- a/easybuild/easyconfigs/i/icc/icc-2011.13.367.eb
+++ b/easybuild/easyconfigs/i/icc/icc-2011.13.367.eb
@@ -8,10 +8,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 sources = ['l_ccompxe_%s.tgz' % version]
 
-moduleclass = 'compiler'
-
 dontcreateinstalldir = 'True'
 
 # license file
 import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/i/icc/icc-2011.3.174.eb b/easybuild/easyconfigs/i/icc/icc-2011.3.174.eb
index 359651488ae6a410996a3ea358a4458c85d8e288..cf51e4e41b208e64d6b377e02837430741d295d5 100644
--- a/easybuild/easyconfigs/i/icc/icc-2011.3.174.eb
+++ b/easybuild/easyconfigs/i/icc/icc-2011.3.174.eb
@@ -8,10 +8,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 sources = ['l_ccompxe_intel64_%s.tgz' % version]
 
-moduleclass = 'compiler'
-
 dontcreateinstalldir = 'True'
 
 # license file
 import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/i/icc/icc-2011.6.233.eb b/easybuild/easyconfigs/i/icc/icc-2011.6.233.eb
index 686e02c34f70d4d8196516c6ef02a2b8f225beb2..4079daa6ca034c4087e792e8ceefcf4309353256 100644
--- a/easybuild/easyconfigs/i/icc/icc-2011.6.233.eb
+++ b/easybuild/easyconfigs/i/icc/icc-2011.6.233.eb
@@ -8,10 +8,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 sources = ['l_ccompxe_intel64_%s.tgz' % version]
 
-moduleclass = 'compiler'
-
 dontcreateinstalldir = 'True'
 
 # license file
 import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/i/icc/icc-2013.1.117.eb b/easybuild/easyconfigs/i/icc/icc-2013.1.117.eb
index dd5ed9dc3df94ad2de9865a9ef5c84eb362dc25b..818ade63f27a074da6f85ccb749eecc8e8b60980 100644
--- a/easybuild/easyconfigs/i/icc/icc-2013.1.117.eb
+++ b/easybuild/easyconfigs/i/icc/icc-2013.1.117.eb
@@ -8,10 +8,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 sources = ['l_ccompxe_%s.tgz' % version]
 
-moduleclass = 'compiler'
-
 dontcreateinstalldir = 'True'
 
 # license file
 import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/i/icc/icc-2013.2.146.eb b/easybuild/easyconfigs/i/icc/icc-2013.2.146.eb
index e037b77a5dd49543f7509b1b018ccd38a73fe2a1..086b7132e24044fe48700d1d38abdcc881cf907b 100644
--- a/easybuild/easyconfigs/i/icc/icc-2013.2.146.eb
+++ b/easybuild/easyconfigs/i/icc/icc-2013.2.146.eb
@@ -8,10 +8,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 sources = ['l_ccompxe_%s.tgz' % version]
 
-moduleclass = 'compiler'
-
 dontcreateinstalldir = 'True'
 
 # license file
 import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/i/icc/icc-2013.3.163.eb b/easybuild/easyconfigs/i/icc/icc-2013.3.163.eb
index 6cf0697eebc9edf26444ef13431bf57b5099c938..08d349665671d8bf5397ac6550ec95451430f600 100644
--- a/easybuild/easyconfigs/i/icc/icc-2013.3.163.eb
+++ b/easybuild/easyconfigs/i/icc/icc-2013.3.163.eb
@@ -8,11 +8,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 sources = ['l_ccompxe_%s.tgz' % version]
 
-# compiler class
-moduleclass = 'compiler'
-
 dontcreateinstalldir = 'True'
 
 # license file
 import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/i/icc/icc-2013.4.183.eb b/easybuild/easyconfigs/i/icc/icc-2013.4.183.eb
index b4b9b501073b8582adf0d5a4bdf5972e6f18adbb..8c5cfaeab570223f35902d4bea35b4ac94b858c0 100644
--- a/easybuild/easyconfigs/i/icc/icc-2013.4.183.eb
+++ b/easybuild/easyconfigs/i/icc/icc-2013.4.183.eb
@@ -8,11 +8,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 sources = ['l_ccompxe_%(version)s.tgz']
 
-# compiler class
-moduleclass = 'compiler'
-
 dontcreateinstalldir = 'True'
 
 # license file
 import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/i/icc/icc-2013.5.192.eb b/easybuild/easyconfigs/i/icc/icc-2013.5.192.eb
index 326e4303abf68a543c986303430d1feb7849099b..3be64f6a79c4707ea5dea157bd24bfd174f7659c 100644
--- a/easybuild/easyconfigs/i/icc/icc-2013.5.192.eb
+++ b/easybuild/easyconfigs/i/icc/icc-2013.5.192.eb
@@ -8,11 +8,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 sources = ['l_ccompxe_%(version)s.tgz']
 
-# compiler class
-moduleclass = 'compiler'
-
 dontcreateinstalldir = 'True'
 
 # license file
 import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/i/icc/icc-2013_sp1.0.080.eb b/easybuild/easyconfigs/i/icc/icc-2013_sp1.0.080.eb
new file mode 100644
index 0000000000000000000000000000000000000000..be5072e46d81cc37678c809b41a7160eb205772d
--- /dev/null
+++ b/easybuild/easyconfigs/i/icc/icc-2013_sp1.0.080.eb
@@ -0,0 +1,17 @@
+name = 'icc'
+version = '2013_sp1.0.080'
+
+homepage = 'http://software.intel.com/en-us/intel-compilers/'
+description = "C and C++ compiler from Intel"
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = ['l_ccompxe_%(version)s.tgz']
+
+dontcreateinstalldir = 'True'
+
+# license file
+import os
+license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/i/icc/icc-2013_sp1.1.106.eb b/easybuild/easyconfigs/i/icc/icc-2013_sp1.1.106.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2e5244fe910694eee77ed34c036a6841fe090f3f
--- /dev/null
+++ b/easybuild/easyconfigs/i/icc/icc-2013_sp1.1.106.eb
@@ -0,0 +1,18 @@
+name = 'icc'
+version = '2013_sp1.1.106'
+
+homepage = 'http://software.intel.com/en-us/intel-compilers/'
+description = "C and C++ compiler from Intel"
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = ['l_ccompxe_%(version)s.tgz']
+
+# compiler class
+moduleclass = 'compiler'
+
+dontcreateinstalldir = 'True'
+
+# license file
+import os
+license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
diff --git a/easybuild/easyconfigs/i/icc/icc-2013_sp1.2.144.eb b/easybuild/easyconfigs/i/icc/icc-2013_sp1.2.144.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b742c2c7e4483b00d2a57d7b07b5e8e3b9d5f79b
--- /dev/null
+++ b/easybuild/easyconfigs/i/icc/icc-2013_sp1.2.144.eb
@@ -0,0 +1,18 @@
+name = 'icc'
+version = '2013_sp1.2.144'
+
+homepage = 'http://software.intel.com/en-us/intel-compilers/'
+description = "C and C++ compiler from Intel"
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = ['l_ccompxe_%(version)s.tgz']
+
+# compiler class
+moduleclass = 'compiler'
+
+dontcreateinstalldir = 'True'
+
+# license file
+import os
+license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
diff --git a/easybuild/easyconfigs/i/iccifort/iccifort-2011.13.367.eb b/easybuild/easyconfigs/i/iccifort/iccifort-2011.13.367.eb
index fdb9bb58b9530ed7232d2745dd10a1a17bdce3ee..76b5884dca54ab5113823a88b99ab33a7f8825d8 100644
--- a/easybuild/easyconfigs/i/iccifort/iccifort-2011.13.367.eb
+++ b/easybuild/easyconfigs/i/iccifort/iccifort-2011.13.367.eb
@@ -9,8 +9,8 @@ description = """Intel Cluster Toolkit Compiler Edition provides Intel C,C++ and
 toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 dependencies = [
-                ('icc', version),
-                ('ifort', version),
-               ]
+    ('icc', version),
+    ('ifort', version),
+]
 
 moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/i/iccifort/iccifort-2013_sp1.2.144.eb b/easybuild/easyconfigs/i/iccifort/iccifort-2013_sp1.2.144.eb
new file mode 100644
index 0000000000000000000000000000000000000000..85878e8ca15f8a10e23d61a92f15c7c508e90614
--- /dev/null
+++ b/easybuild/easyconfigs/i/iccifort/iccifort-2013_sp1.2.144.eb
@@ -0,0 +1,16 @@
+easyblock = "Toolchain"
+
+name = 'iccifort'
+version = '2013_sp1.2.144'
+
+homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/'
+description = """Intel Cluster Toolkit Compiler Edition provides Intel C,C++ and fortran compilers, Intel MPI and Intel MKL"""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+dependencies = [
+    ('icc', version),
+    ('ifort', version),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/i/ictce/ictce-6.0.5.eb b/easybuild/easyconfigs/i/ictce/ictce-6.0.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7fd907fdff6f7c382decf88876c4fa28069403cf
--- /dev/null
+++ b/easybuild/easyconfigs/i/ictce/ictce-6.0.5.eb
@@ -0,0 +1,21 @@
+easyblock = "Toolchain"
+
+name = 'ictce'
+version = '6.0.5'
+
+homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/'
+description = """Intel Cluster Toolkit Compiler Edition provides Intel C/C++ and Fortran compilers, Intel MPI & Intel MKL."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+suff = '0.080'
+compver = '2013_sp1.%s' % suff
+
+dependencies = [
+    ('icc', compver),
+    ('ifort', compver),
+    ('impi', '4.1.1.036'),
+    ('imkl', '11.1.%s' % suff),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/i/ictce/ictce-6.1.5.eb b/easybuild/easyconfigs/i/ictce/ictce-6.1.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..47215eb1bcc7d739e6c3df9c531a75ca71435f5d
--- /dev/null
+++ b/easybuild/easyconfigs/i/ictce/ictce-6.1.5.eb
@@ -0,0 +1,21 @@
+easyblock = "Toolchain"
+
+name = 'ictce'
+version = '6.1.5'
+
+homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/'
+description = """Intel Cluster Toolkit Compiler Edition provides Intel C/C++ and Fortran compilers, Intel MPI & Intel MKL."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+suff = '1.106'
+compver = '2013_sp1.%s' % suff
+
+dependencies = [
+    ('icc', compver),
+    ('ifort', compver),
+    ('impi', '4.1.3.045'),
+    ('imkl', '11.1.%s' % suff),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/i/ictce/ictce-6.2.5.eb b/easybuild/easyconfigs/i/ictce/ictce-6.2.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..005ab770071957531779e32a16c3b633828678bf
--- /dev/null
+++ b/easybuild/easyconfigs/i/ictce/ictce-6.2.5.eb
@@ -0,0 +1,21 @@
+easyblock = "Toolchain"
+
+name = 'ictce'
+version = '6.2.5'
+
+homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/'
+description = """Intel Cluster Toolkit Compiler Edition provides Intel C/C++ and Fortran compilers, Intel MPI & Intel MKL."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+suff = '2.144'
+compver = '2013_sp1.%s' % suff
+
+dependencies = [
+    ('icc', compver),
+    ('ifort', compver),
+    ('impi', '4.1.3.049'),
+    ('imkl', '11.1.%s' % suff),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/i/ifort/ifort-11.1.073-32bit.eb b/easybuild/easyconfigs/i/ifort/ifort-11.1.073-32bit.eb
index f82df2060c5d999c1d0c7350069b8bbd264485f5..c4b7144887e9b37573e7b9e5120cab68c067715f 100644
--- a/easybuild/easyconfigs/i/ifort/ifort-11.1.073-32bit.eb
+++ b/easybuild/easyconfigs/i/ifort/ifort-11.1.073-32bit.eb
@@ -9,11 +9,9 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 sources = ['l_cprof_p_%s.tgz' % version]
 
-## small patch for the installer
+# small patch for the installer
 patches = ['specified-paths.patch']
 
-moduleclass = 'compiler'
-
 dontcreateinstalldir = 'True'
 
 # license file
@@ -21,3 +19,5 @@ import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
 
 m32 = True
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/i/ifort/ifort-11.1.073.eb b/easybuild/easyconfigs/i/ifort/ifort-11.1.073.eb
index 3f25c391229311b3bdfcf639fa92e02149e5571c..da0e19e8a73155220b3d3a0a1362e9483be9a479 100644
--- a/easybuild/easyconfigs/i/ifort/ifort-11.1.073.eb
+++ b/easybuild/easyconfigs/i/ifort/ifort-11.1.073.eb
@@ -8,13 +8,13 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 sources = ['l_cprof_p_%s.tgz' % version]
 
-## small patch for the installer
+# small patch for the installer
 patches = ['specified-paths.patch']
 
-moduleclass = 'compiler'
-
 dontcreateinstalldir = 'True'
 
 # license file
 import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/i/ifort/ifort-11.1.075.eb b/easybuild/easyconfigs/i/ifort/ifort-11.1.075.eb
index a47f1292cd745e6429b25088e1bc62bb8f2603bd..f8534d1717c79ab13d7ca099e7492e4ce272c97e 100644
--- a/easybuild/easyconfigs/i/ifort/ifort-11.1.075.eb
+++ b/easybuild/easyconfigs/i/ifort/ifort-11.1.075.eb
@@ -8,13 +8,13 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 sources = ['l_cprof_p_%s_intel64.tgz' % version]
 
-## small patch for the installer
+# small patch for the installer
 patches = ['specified-paths.patch']
 
-moduleclass = 'compiler'
-
 dontcreateinstalldir = 'True'
 
 # license file
 import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/i/ifort/ifort-2011.10.319.eb b/easybuild/easyconfigs/i/ifort/ifort-2011.10.319.eb
index 2f99029196369d1f975339444aac91cac77ee1db..c0ab005da23f241fc7feb5b92af6ebf85ca262a8 100644
--- a/easybuild/easyconfigs/i/ifort/ifort-2011.10.319.eb
+++ b/easybuild/easyconfigs/i/ifort/ifort-2011.10.319.eb
@@ -8,10 +8,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 sources = ['l_fcompxe_intel64_%s.tgz' % version]
 
-moduleclass = 'compiler'
-
 dontcreateinstalldir = 'True'
 
 # license file
 import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/i/ifort/ifort-2011.13.367.eb b/easybuild/easyconfigs/i/ifort/ifort-2011.13.367.eb
index 90b6da56beb711dec978f3dc1ed4c5e01bbf54ef..8d6eeaafb43bc54c69a37d838f450ecef92849b8 100644
--- a/easybuild/easyconfigs/i/ifort/ifort-2011.13.367.eb
+++ b/easybuild/easyconfigs/i/ifort/ifort-2011.13.367.eb
@@ -8,10 +8,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 sources = ['l_fcompxe_%s.tgz' % version]
 
-moduleclass = 'compiler'
-
 dontcreateinstalldir = 'True'
 
 # license file
 import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/i/ifort/ifort-2011.3.174.eb b/easybuild/easyconfigs/i/ifort/ifort-2011.3.174.eb
index 82182ae836e249832c9292173507040dfabaadb3..65ff75aa5c642b7ee397fb4c8d66a404fb4c579f 100644
--- a/easybuild/easyconfigs/i/ifort/ifort-2011.3.174.eb
+++ b/easybuild/easyconfigs/i/ifort/ifort-2011.3.174.eb
@@ -8,10 +8,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 sources = ['l_fcompxe_intel64_%s.tgz' % version]
 
-moduleclass = 'compiler'
-
 dontcreateinstalldir = 'True'
 
 # license file
 import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/i/ifort/ifort-2011.6.233.eb b/easybuild/easyconfigs/i/ifort/ifort-2011.6.233.eb
index 1347acd62059238c82a90846f10bda4a5105f818..0749ed0e0cd11c763ba8a52f0db412a7f83bc975 100644
--- a/easybuild/easyconfigs/i/ifort/ifort-2011.6.233.eb
+++ b/easybuild/easyconfigs/i/ifort/ifort-2011.6.233.eb
@@ -8,10 +8,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 sources = ['l_fcompxe_intel64_%s.tgz' % version]
 
-moduleclass = 'compiler'
-
 dontcreateinstalldir = 'True'
 
 # license file
 import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/i/ifort/ifort-2013.1.117.eb b/easybuild/easyconfigs/i/ifort/ifort-2013.1.117.eb
index 49f0ac1b18204371793f2506bf5d01a7d79de32e..99bf3863c6ded580bfa12f1838003c8af6b052df 100644
--- a/easybuild/easyconfigs/i/ifort/ifort-2013.1.117.eb
+++ b/easybuild/easyconfigs/i/ifort/ifort-2013.1.117.eb
@@ -8,10 +8,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 sources = ['l_fcompxe_%s.tgz' % version]
 
-moduleclass = 'compiler'
-
 dontcreateinstalldir = 'True'
 
 # license file
 import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/i/ifort/ifort-2013.2.146.eb b/easybuild/easyconfigs/i/ifort/ifort-2013.2.146.eb
index bfc7da7af956a55401671e92c287c63a63069e55..54b49ddcaf29aae4f09d3b32908764e7b91f33f8 100644
--- a/easybuild/easyconfigs/i/ifort/ifort-2013.2.146.eb
+++ b/easybuild/easyconfigs/i/ifort/ifort-2013.2.146.eb
@@ -8,10 +8,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 sources = ['l_fcompxe_%s.tgz' % version]
 
-moduleclass = 'compiler'
-
 dontcreateinstalldir = 'True'
 
 # license file
 import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/i/ifort/ifort-2013.3.163.eb b/easybuild/easyconfigs/i/ifort/ifort-2013.3.163.eb
index aa3ec53ee31c98df1b6cf865f7e735f76dfef35d..4efd890d239884aa9bd743e2bfb7c3d81e8a5f6f 100644
--- a/easybuild/easyconfigs/i/ifort/ifort-2013.3.163.eb
+++ b/easybuild/easyconfigs/i/ifort/ifort-2013.3.163.eb
@@ -8,11 +8,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 sources = ['l_fcompxe_%s.tgz' % version]
 
-# compiler class
-moduleclass = 'compiler'
-
 dontcreateinstalldir = 'True'
 
 # license file
 import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/i/ifort/ifort-2013.4.183.eb b/easybuild/easyconfigs/i/ifort/ifort-2013.4.183.eb
index 375028b1abac0360d184f74eeeec5162fdf2fcad..05c638d45107c3a9b328866e7a27c5d826536b4f 100644
--- a/easybuild/easyconfigs/i/ifort/ifort-2013.4.183.eb
+++ b/easybuild/easyconfigs/i/ifort/ifort-2013.4.183.eb
@@ -8,11 +8,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 sources = ['l_fcompxe_%(version)s.tgz']
 
-# compiler class
-moduleclass = 'compiler'
-
 dontcreateinstalldir = 'True'
 
 # license file
 import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/i/ifort/ifort-2013.5.192.eb b/easybuild/easyconfigs/i/ifort/ifort-2013.5.192.eb
index 158defc0fc039349eb8d586c3614deae6d026d25..32705da10faefefa8c52efdcea411afe8b0d3606 100644
--- a/easybuild/easyconfigs/i/ifort/ifort-2013.5.192.eb
+++ b/easybuild/easyconfigs/i/ifort/ifort-2013.5.192.eb
@@ -8,11 +8,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 sources = ['l_fcompxe_%(version)s.tgz']
 
-# compiler class
-moduleclass = 'compiler'
-
 dontcreateinstalldir = 'True'
 
 # license file
 import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/i/ifort/ifort-2013_sp1.0.080.eb b/easybuild/easyconfigs/i/ifort/ifort-2013_sp1.0.080.eb
new file mode 100644
index 0000000000000000000000000000000000000000..dc69a4da5ee4b3e743be8fc40b3d84db6bb61a9c
--- /dev/null
+++ b/easybuild/easyconfigs/i/ifort/ifort-2013_sp1.0.080.eb
@@ -0,0 +1,17 @@
+name = 'ifort'
+version = '2013_sp1.0.080'
+
+homepage = 'http://software.intel.com/en-us/intel-compilers/'
+description = "Fortran compiler from Intel"
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = ['l_fcompxe_%(version)s.tgz']
+
+dontcreateinstalldir = 'True'
+
+# license file
+import os
+license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/i/ifort/ifort-2013_sp1.1.106.eb b/easybuild/easyconfigs/i/ifort/ifort-2013_sp1.1.106.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8d50c3c4603c5345c9ae67a51489baab1b48540c
--- /dev/null
+++ b/easybuild/easyconfigs/i/ifort/ifort-2013_sp1.1.106.eb
@@ -0,0 +1,18 @@
+name = 'ifort'
+version = '2013_sp1.1.106'
+
+homepage = 'http://software.intel.com/en-us/intel-compilers/'
+description = "Fortran compiler from Intel"
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = ['l_fcompxe_%(version)s.tgz']
+
+# compiler class
+moduleclass = 'compiler'
+
+dontcreateinstalldir = 'True'
+
+# license file
+import os
+license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
diff --git a/easybuild/easyconfigs/i/ifort/ifort-2013_sp1.2.144.eb b/easybuild/easyconfigs/i/ifort/ifort-2013_sp1.2.144.eb
new file mode 100644
index 0000000000000000000000000000000000000000..058b29e416d7420732e068fc6bfb2b6aca0629e8
--- /dev/null
+++ b/easybuild/easyconfigs/i/ifort/ifort-2013_sp1.2.144.eb
@@ -0,0 +1,18 @@
+name = 'ifort'
+version = '2013_sp1.2.144'
+
+homepage = 'http://software.intel.com/en-us/intel-compilers/'
+description = "Fortran compiler from Intel"
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = ['l_fcompxe_%(version)s.tgz']
+
+# compiler class
+moduleclass = 'compiler'
+
+dontcreateinstalldir = 'True'
+
+# license file
+import os
+license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
diff --git a/easybuild/easyconfigs/i/imake/imake-1.0.5-ictce-5.3.0.eb b/easybuild/easyconfigs/i/imake/imake-1.0.5-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2a9e2558db05482746d151c06e412113629c8015
--- /dev/null
+++ b/easybuild/easyconfigs/i/imake/imake-1.0.5-ictce-5.3.0.eb
@@ -0,0 +1,19 @@
+name = 'imake'
+version = '1.0.5'
+
+homepage = 'http://www.x.org/'
+description = """imake is a Makefile-generator that is intended to make it easier to develop software
+ portably for multiple systems."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['ftp://artfiles.org/x.org/pub/individual/util/']
+
+sanity_check_paths = {
+    'files': ['bin/%s' % binfile for binfile in ['ccmakedep', 'cleanlinks', 'imake', 'makeg', 'mergelib',
+                                                 'mkdirhier', 'mkhtmlindex', 'revpath', 'xmkmf']],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/i/imkl/imkl-10.2.6.038.eb b/easybuild/easyconfigs/i/imkl/imkl-10.2.6.038.eb
index f8105ef53de0721d2894a59f3b963b447c955b23..a693a15b86e5bea1a74d8f001c0ca55265aa5f78 100644
--- a/easybuild/easyconfigs/i/imkl/imkl-10.2.6.038.eb
+++ b/easybuild/easyconfigs/i/imkl/imkl-10.2.6.038.eb
@@ -14,9 +14,10 @@ sources = ['l_mkl_p_%(version)s.tar.gz']
 dontcreateinstalldir = 'True'
 
 # deps for interface build
+compver = '11.1.073'
 dependencies = [
-    ('icc', '11.1.073'),
-    ('ifort', '11.1.073'),
+    ('icc', compver),
+    ('ifort', compver),
     ('impi', '4.0.0.028'),
 ]
 
diff --git a/easybuild/easyconfigs/i/imkl/imkl-10.3.10.319.eb b/easybuild/easyconfigs/i/imkl/imkl-10.3.10.319.eb
index 608d782783a097b15a2683c5895f83aa6d065859..b3d47b810d819ea6215aa3ac419b9787dae38bdc 100644
--- a/easybuild/easyconfigs/i/imkl/imkl-10.3.10.319.eb
+++ b/easybuild/easyconfigs/i/imkl/imkl-10.3.10.319.eb
@@ -12,9 +12,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 sources = ['l_mkl_%(version)s_intel64.tgz']
 
 # deps for interface build
+compver = '2011.10.319'
 dependencies = [
-    ('icc', '2011.10.319'),
-    ('ifort', '2011.10.319'),
+    ('icc', compver),
+    ('ifort', compver),
     ('impi', '4.0.2.003'),
 ]
 
diff --git a/easybuild/easyconfigs/i/imkl/imkl-11.1.0.080.eb b/easybuild/easyconfigs/i/imkl/imkl-11.1.0.080.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ca26f636cc8ff29112a43c276fdd0fab49f4bf5b
--- /dev/null
+++ b/easybuild/easyconfigs/i/imkl/imkl-11.1.0.080.eb
@@ -0,0 +1,30 @@
+name = 'imkl'
+version = '11.1.0.080'
+
+homepage = 'http://software.intel.com/en-us/intel-mkl/'
+description = """Intel Math Kernel Library is a library of highly optimized,
+ extensively threaded math routines for science, engineering, and financial
+ applications that require maximum performance. Core math functions include
+ BLAS, LAPACK, ScaLAPACK, Sparse Solvers, Fast Fourier Transforms, Vector Math, and more."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = ['l_mkl_%(version)s.tgz']
+
+# deps for interface build
+compver = '2013_sp1.0.080'
+dependencies = [
+    ('icc', compver),
+    ('ifort', compver),
+    ('impi', '4.1.1.036')
+]
+
+dontcreateinstalldir = 'True'
+
+# license file
+import os
+license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+interfaces = True
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/i/imkl/imkl-11.1.1.106.eb b/easybuild/easyconfigs/i/imkl/imkl-11.1.1.106.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6c2f677c6cf499b7e6cc79da525d4ad0ad99850c
--- /dev/null
+++ b/easybuild/easyconfigs/i/imkl/imkl-11.1.1.106.eb
@@ -0,0 +1,30 @@
+name = 'imkl'
+version = '11.1.1.106'
+
+homepage = 'http://software.intel.com/en-us/intel-mkl/'
+description = """Intel Math Kernel Library is a library of highly optimized,
+ extensively threaded math routines for science, engineering, and financial
+ applications that require maximum performance. Core math functions include
+ BLAS, LAPACK, ScaLAPACK, Sparse Solvers, Fast Fourier Transforms, Vector Math, and more."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = ['l_mkl_%(version)s.tgz']
+
+# deps for interface build
+compver = '2013_sp1.1.106'
+dependencies = [
+    ('icc', compver),
+    ('ifort', compver),
+    ('impi', '4.1.3.045')
+]
+
+dontcreateinstalldir = 'True'
+
+# license file
+import os
+license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+interfaces = True
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/i/imkl/imkl-11.1.2.144-OpenMPI-1.6.5.eb b/easybuild/easyconfigs/i/imkl/imkl-11.1.2.144-OpenMPI-1.6.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7c293cda0abd7751a7fb4af5ef646884a0d64b9a
--- /dev/null
+++ b/easybuild/easyconfigs/i/imkl/imkl-11.1.2.144-OpenMPI-1.6.5.eb
@@ -0,0 +1,35 @@
+name = 'imkl'
+version = '11.1.2.144'
+
+homepage = 'http://software.intel.com/en-us/intel-mkl/'
+description = """Intel Math Kernel Library is a library of highly optimized, extensively threaded math routines
+for science, engineering, and financial applications that require maximum performance. Core math functions include
+BLAS, LAPACK, ScaLAPACK, Sparse Solvers, Fast Fourier Transforms, Vector Math, and more."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = ['l_mkl_%(version)s.tgz']
+
+compver = '2013_sp1.2.144'
+comp = ('iccifort', compver)
+
+# deps for interface build
+mpi = 'OpenMPI'
+mpiver = '1.6.5'
+versionsuffix = '-%s-%s' % (mpi, mpiver)
+
+dependencies = [
+    ('icc', compver),
+    ('ifort', compver),
+    (mpi, mpiver, '', comp),
+]
+
+dontcreateinstalldir = 'True'
+
+interfaces = True
+
+# license file
+import os
+license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/i/imkl/imkl-11.1.2.144.eb b/easybuild/easyconfigs/i/imkl/imkl-11.1.2.144.eb
new file mode 100644
index 0000000000000000000000000000000000000000..03e70ed442f9e0a1156f3b1efa826b377b2915cc
--- /dev/null
+++ b/easybuild/easyconfigs/i/imkl/imkl-11.1.2.144.eb
@@ -0,0 +1,30 @@
+name = 'imkl'
+version = '11.1.2.144'
+
+homepage = 'http://software.intel.com/en-us/intel-mkl/'
+description = """Intel Math Kernel Library is a library of highly optimized,
+ extensively threaded math routines for science, engineering, and financial
+ applications that require maximum performance. Core math functions include
+ BLAS, LAPACK, ScaLAPACK, Sparse Solvers, Fast Fourier Transforms, Vector Math, and more."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = ['l_mkl_%(version)s.tgz']
+
+# deps for interface build
+compver = '2013_sp1.2.144'
+dependencies = [
+    ('icc', compver),
+    ('ifort', compver),
+    ('impi', '4.1.3.049')
+]
+
+dontcreateinstalldir = 'True'
+
+# license file
+import os
+license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+interfaces = True
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/i/impi/impi-3.2.2.006.eb b/easybuild/easyconfigs/i/impi/impi-3.2.2.006.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5f35cd6834769f295ae59b1a948027da1c4a7f86
--- /dev/null
+++ b/easybuild/easyconfigs/i/impi/impi-3.2.2.006.eb
@@ -0,0 +1,19 @@
+name = 'impi'
+version = '3.2.2.006'
+
+homepage = 'http://software.intel.com/en-us/intel-mpi-library/'
+description = """The Intel(R) MPI Library for Linux* OS is a multi-fabric message
+ passing library based on ANL MPICH2 and OSU MVAPICH2. The Intel MPI Library for
+ Linux OS implements the Message Passing Interface, version 2 (MPI-2) specification."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = ['l_mpi_p_%(version)s.tgz']
+
+dontcreateinstalldir = 'True'
+
+# license file
+import os
+license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/i/impi/impi-4.0.0.028-32bit.eb b/easybuild/easyconfigs/i/impi/impi-4.0.0.028-32bit.eb
index c1fe77fbb78df9e213e01ef8f989d8dd9f0497a2..437532bb49a446ac6ac55cfdffdf59c4e79d5b7d 100644
--- a/easybuild/easyconfigs/i/impi/impi-4.0.0.028-32bit.eb
+++ b/easybuild/easyconfigs/i/impi/impi-4.0.0.028-32bit.eb
@@ -11,8 +11,6 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 sources = ['l_mpi_pu_%(version)s.tgz']
 
-moduleclass = 'mpi'
-
 dontcreateinstalldir = 'True'
 
 # license file
@@ -20,3 +18,5 @@ import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
 
 m32 = True
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/i/impi/impi-4.0.0.028.eb b/easybuild/easyconfigs/i/impi/impi-4.0.0.028.eb
index 02fa80a7361cdd630778347d205a1da1e6abe7f7..a551f577861f9d2cfe510f030718b1b893dff0fd 100644
--- a/easybuild/easyconfigs/i/impi/impi-4.0.0.028.eb
+++ b/easybuild/easyconfigs/i/impi/impi-4.0.0.028.eb
@@ -10,10 +10,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 sources = ['l_mpi_pu_%(version)s.tgz']
 
-moduleclass = 'mpi'
-
 dontcreateinstalldir = 'True'
 
 # license file
 import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/i/impi/impi-4.0.2.003.eb b/easybuild/easyconfigs/i/impi/impi-4.0.2.003.eb
index 3e513a018f961a8eb1f41f816d57a5a6ba9a36da..4830b5c3c8a5607ac3ede7138941cdf045b8c893 100644
--- a/easybuild/easyconfigs/i/impi/impi-4.0.2.003.eb
+++ b/easybuild/easyconfigs/i/impi/impi-4.0.2.003.eb
@@ -12,10 +12,10 @@ sources = ['l_mpi_p_%(version)s.tgz']
 
 patches = ['impi_4.x_productsdb.patch']
 
-moduleclass = 'mpi'
-
 dontcreateinstalldir = 'True'
 
 # license file
 import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/i/impi/impi-4.1.0.027.eb b/easybuild/easyconfigs/i/impi/impi-4.1.0.027.eb
index 72b72e75d971a2417d8e0cfc76d55994315e0a23..839fe8f60479697300ef5dbf751bf4520739c920 100644
--- a/easybuild/easyconfigs/i/impi/impi-4.1.0.027.eb
+++ b/easybuild/easyconfigs/i/impi/impi-4.1.0.027.eb
@@ -10,10 +10,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 sources = ['l_mpi_p_%(version)s.tgz']
 
-moduleclass = 'mpi'
-
 dontcreateinstalldir = 'True'
 
 # license file
 import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/i/impi/impi-4.1.0.030.eb b/easybuild/easyconfigs/i/impi/impi-4.1.0.030.eb
index 5d906bc72f5973c260302d6a957205fc133325df..875b582066aca796928cc2f6fc00f769b757900e 100644
--- a/easybuild/easyconfigs/i/impi/impi-4.1.0.030.eb
+++ b/easybuild/easyconfigs/i/impi/impi-4.1.0.030.eb
@@ -10,10 +10,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 sources = ['l_mpi_p_%(version)s.tgz']
 
-moduleclass = 'mpi'
-
 dontcreateinstalldir = 'True'
 
 # license file
 import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/i/impi/impi-4.1.1.036.eb b/easybuild/easyconfigs/i/impi/impi-4.1.1.036.eb
index a6158d1a06ce9c14edd1848aea178d568700c2ce..97c88ff999b20e090a54b94fd44d5029fa72ef70 100644
--- a/easybuild/easyconfigs/i/impi/impi-4.1.1.036.eb
+++ b/easybuild/easyconfigs/i/impi/impi-4.1.1.036.eb
@@ -10,10 +10,10 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 sources = ['l_mpi_p_%(version)s.tgz']
 
-moduleclass = 'mpi'
-
 dontcreateinstalldir = 'True'
 
 # license file
 import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/i/impi/impi-4.1.2.040.eb b/easybuild/easyconfigs/i/impi/impi-4.1.2.040.eb
new file mode 100644
index 0000000000000000000000000000000000000000..839d937043ccd762e31ea88e582c5453dca1d804
--- /dev/null
+++ b/easybuild/easyconfigs/i/impi/impi-4.1.2.040.eb
@@ -0,0 +1,19 @@
+name = 'impi'
+version = '4.1.2.040'
+
+homepage = 'http://software.intel.com/en-us/intel-mpi-library/'
+description = """The Intel(R) MPI Library for Linux* OS is a multi-fabric message
+ passing library based on ANL MPICH2 and OSU MVAPICH2. The Intel MPI Library for
+ Linux OS implements the Message Passing Interface, version 2 (MPI-2) specification."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = ['l_mpi_p_%(version)s.tgz']
+
+dontcreateinstalldir = 'True'
+
+# license file
+import os
+license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/i/impi/impi-4.1.3.045.eb b/easybuild/easyconfigs/i/impi/impi-4.1.3.045.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d31c2924c887ecb27381fef588ce2f711f9f1160
--- /dev/null
+++ b/easybuild/easyconfigs/i/impi/impi-4.1.3.045.eb
@@ -0,0 +1,19 @@
+name = 'impi'
+version = '4.1.3.045'
+
+homepage = 'http://software.intel.com/en-us/intel-mpi-library/'
+description = """The Intel(R) MPI Library for Linux* OS is a multi-fabric message
+ passing library based on ANL MPICH2 and OSU MVAPICH2. The Intel MPI Library for
+ Linux OS implements the Message Passing Interface, version 2 (MPI-2) specification."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = ['l_mpi_p_%(version)s.tgz']
+
+dontcreateinstalldir = 'True'
+
+# license file
+import os
+license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/i/impi/impi-4.1.3.049.eb b/easybuild/easyconfigs/i/impi/impi-4.1.3.049.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e55725a62a895cd1821b4a0254b6579865ca1838
--- /dev/null
+++ b/easybuild/easyconfigs/i/impi/impi-4.1.3.049.eb
@@ -0,0 +1,19 @@
+name = 'impi'
+version = '4.1.3.049'
+
+homepage = 'http://software.intel.com/en-us/intel-mpi-library/'
+description = """The Intel(R) MPI Library for Linux* OS is a multi-fabric message
+ passing library based on ANL MPICH2 and OSU MVAPICH2. The Intel MPI Library for
+ Linux OS implements the Message Passing Interface, version 2 (MPI-2) specification."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = ['l_mpi_p_%(version)s.tgz']
+
+dontcreateinstalldir = 'True'
+
+# license file
+import os
+license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/i/inputproto/inputproto-2.3-ictce-5.3.0.eb b/easybuild/easyconfigs/i/inputproto/inputproto-2.3-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..554430022b3fc542f26f4ddc7ab234ee3ffe79c6
--- /dev/null
+++ b/easybuild/easyconfigs/i/inputproto/inputproto-2.3-ictce-5.3.0.eb
@@ -0,0 +1,17 @@
+name = 'inputproto'
+version = '2.3'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """X.org InputProto protocol headers."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+
+sanity_check_paths = {
+    'files': ['include/X11/extensions/%s' % x for x in ['XI2.h', 'XI.h',  'XIproto.h', 'XI2proto.h']],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/i/iomkl/iomkl-6.6.2.eb b/easybuild/easyconfigs/i/iomkl/iomkl-6.6.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7c34f7ee3cff5d76d27adceb0e27718d3a781527
--- /dev/null
+++ b/easybuild/easyconfigs/i/iomkl/iomkl-6.6.2.eb
@@ -0,0 +1,23 @@
+easyblock = "Toolchain"
+
+name = 'iomkl'
+version = '6.6.2'
+
+homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/'
+description = """Intel Cluster Toolchain Compiler Edition provides Intel C/C++ and Fortran compilers, Intel MKL & OpenMPI."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+compver = '2013_sp1.2.144'
+comp = ('iccifort', compver)
+ompi = 'OpenMPI'
+ompiver = '1.6.5'
+
+dependencies = [
+    ('icc', compver),
+    ('ifort', compver),
+    (ompi, ompiver, '', comp),
+    ('imkl', '11.1.2.144', '-%s-%s' % (ompi, ompiver)),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/i/ispc/ispc-1.6.0.eb b/easybuild/easyconfigs/i/ispc/ispc-1.6.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5f9a44b8c20215b44e09a24f5c7d5313391da265
--- /dev/null
+++ b/easybuild/easyconfigs/i/ispc/ispc-1.6.0.eb
@@ -0,0 +1,26 @@
+easyblock = 'Tarball'
+
+name = 'ispc'
+version = '1.6.0'
+
+homepage = 'http://ispc.github.io/ , https://github.com/ispc/ispc/'
+description = """Intel SPMD Program Compilers; An open-source compiler for high-performance
+ SIMD programming on the CPU. ispc is a compiler for a variant of the C programming language,
+ with extensions for 'single program, multiple data' (SPMD) programming.
+ Under the SPMD model, the programmer writes a program that generally appears
+ to be a regular serial program, though the execution model is actually that
+ a number of program instances execute in parallel on the hardware."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = ['ispc-v%(version)s-linux.tar.gz']
+source_urls = [('http://sourceforge.net/projects/ispcmirror/files/v%(version)s', 'download')]
+
+sanity_check_paths = {
+    'files': ["ispc"], 
+    'dirs': []
+}
+
+modextrapaths = {'PATH': ''}
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/j/Jansson/Jansson-2.5-gcccuda-2.6.10.eb b/easybuild/easyconfigs/j/Jansson/Jansson-2.5-gcccuda-2.6.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5bc100cb870999baa7b6de9821e1e1fe1e911601
--- /dev/null
+++ b/easybuild/easyconfigs/j/Jansson/Jansson-2.5-gcccuda-2.6.10.eb
@@ -0,0 +1,30 @@
+name = 'Jansson'
+version = "2.5"
+
+homepage = 'http://www.digip.org/jansson/'
+description = """Jansson is a C library for encoding, decoding and manipulating JSON data.
+ Its main features and design principles are:
+ * Simple and intuitive API and data model
+ * Comprehensive documentation
+ * No dependencies on other libraries
+ * Full Unicode support (UTF-8)
+ * Extensive test suite"""
+
+toolchain = {'name': 'gcccuda', 'version': '2.6.10'}
+  
+# fi. https://github.com/akheron/jansson/archive/2.5.zip
+source_urls = ['https://github.com/akheron/jansson/archive/']
+sources = ['%(version)s.tar.gz']
+
+dependencies = [('Autoconf', '2.69')]
+
+preconfigopts = 'autoreconf -i && '
+
+sanity_check_paths = {
+    'files': ['lib/libjansson.%s' % SHLIB_EXT],
+    'dirs': ['include'],
+}
+
+runtest = 'check'
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-goalf-1.1.0-no-OFED.eb
index d84cd89ae9b281e9bccc8119506a0f04f0f73764..8936c49f7b3760def609b48d234addba9bb94593 100644
--- a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-goalf-1.1.0-no-OFED.eb
@@ -8,7 +8,7 @@ description = """The JasPer Project is an open-source initiative to provide a fr
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 toolchainopts = {'pic': True}
 
-sources = ['%s-%s.zip' % (name.lower(), version)]
+sources = [SOURCELOWER_ZIP]
 source_urls = ['http://www.ece.uvic.ca/~frodo/jasper/software/']
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-goolf-1.4.10.eb b/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-goolf-1.4.10.eb
index e34b6a8e71389865d6364431d40661db98488666..2c331ec80fed2ac412b661f028b14ab3563d09f5 100644
--- a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-goolf-1.4.10.eb
@@ -6,7 +6,7 @@ description = "gzip (GNU zip) is a popular data compression program as a replace
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'pic': True}
 
-sources = ['%s-%s.zip' % (name.lower(), version)]
+sources = [SOURCELOWER_ZIP]
 source_urls = ['http://www.ece.uvic.ca/~frodo/jasper/software/']
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-ictce-3.2.2.u3.eb
index f049a7290fffca2d2b300906098cafb38e751958..2a9c066f57947c313b114021da9858660dd2fb86 100644
--- a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-ictce-3.2.2.u3.eb
+++ b/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-ictce-3.2.2.u3.eb
@@ -7,7 +7,7 @@ description = """The JasPer Project is an open-source initiative to provide a fr
 
 toolchain = {'name': 'ictce', 'version': '3.2.2.u3'}
 
-sources = ['%s-%s.zip' % (name.lower(), version)]
+sources = [SOURCELOWER_ZIP]
 source_urls = ['http://www.ece.uvic.ca/~frodo/jasper/software/']
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-ictce-4.1.13.eb b/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-ictce-4.1.13.eb
index 8d5cc91b46a17b2d7422d3700ab82e9d105e5a89..1c14c19383eed1861d2169aede2bd37256167ed7 100644
--- a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-ictce-4.1.13.eb
@@ -8,7 +8,7 @@ description = """The JasPer Project is an open-source initiative to provide a fr
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 toolchainopts = {'pic': True}
 
-sources = ['%s-%s.zip' % (name.lower(), version)]
+sources = [SOURCELOWER_ZIP]
 source_urls = ['http://www.ece.uvic.ca/~frodo/jasper/software/']
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-ictce-5.3.0.eb b/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-ictce-5.3.0.eb
index 148776315e6df4440088e7c09c4de476e2f7150f..2bbc6e083e8e3234abbf08f67b937a078ffb1680 100644
--- a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-ictce-5.3.0.eb
@@ -9,7 +9,7 @@ description = """The JasPer Project is an open-source initiative to provide a fr
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 toolchainopts = {'pic': True}
 
-sources = ['%s-%s.zip' % (name.lower(), version)]
+sources = [SOURCELOWER_ZIP]
 source_urls = ['http://www.ece.uvic.ca/~frodo/jasper/software/']
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-iqacml-3.7.3.eb b/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-iqacml-3.7.3.eb
index db861191fdc9a7245ac0bb50eced7f42b82f9a34..778a35918bc07419261f22f05cf3944dc150127e 100644
--- a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-iqacml-3.7.3.eb
+++ b/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-iqacml-3.7.3.eb
@@ -7,7 +7,7 @@ description = """The JasPer Project is an open-source initiative to provide a fr
 
 toolchain = {'name': 'iqacml', 'version': '3.7.3'}
 
-sources = ['%s-%s.zip' % (name.lower(), version)]
+sources = [SOURCELOWER_ZIP]
 source_urls = ['http://www.ece.uvic.ca/~frodo/jasper/software/']
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/j/Java/Java-1.7.0_10.eb b/easybuild/easyconfigs/j/Java/Java-1.7.0_10.eb
index 2b21438ebcb0f422a7bd52f917b5947cbdd8fbbb..aab1041c12cdc9eee7a4e174dd32d59a9580421b 100644
--- a/easybuild/easyconfigs/j/Java/Java-1.7.0_10.eb
+++ b/easybuild/easyconfigs/j/Java/Java-1.7.0_10.eb
@@ -7,7 +7,7 @@ description = """Java Platform, Standard Edition (Java SE) lets you develop and
 
 toolchain = {'name': 'dummy', 'version': 'dummy'}
 
-## download the tar.gz directly from http://www.oracle.com/technetwork/java/javase/downloads/index.html
+# download the tar.gz directly from http://www.oracle.com/technetwork/java/javase/downloads/index.html
 (vp, vs) = version.split('_')
 altver = '%su%s' % (vp.split('.')[1], vs)
 sources = ['jdk-%s-linux-x64.tar.gz' % altver]
diff --git a/easybuild/easyconfigs/j/Java/Java-1.7.0_15.eb b/easybuild/easyconfigs/j/Java/Java-1.7.0_15.eb
index a2c3b24e5afdaff1b495e7d69fe2f0cfd4bc4225..5c86c312a90daed741bc5f83ba45f50d2d3ab86e 100644
--- a/easybuild/easyconfigs/j/Java/Java-1.7.0_15.eb
+++ b/easybuild/easyconfigs/j/Java/Java-1.7.0_15.eb
@@ -7,7 +7,7 @@ description = """Java Platform, Standard Edition (Java SE) lets you develop and
 
 toolchain = {'name': 'dummy', 'version': 'dummy'}
 
-## download the tar.gz directly from http://www.oracle.com/technetwork/java/javase/downloads/index.html
+# download the tar.gz directly from http://www.oracle.com/technetwork/java/javase/downloads/index.html
 (vp, vs) = version.split('_')
 altver = '%su%s' % (vp.split('.')[1], vs)
 sources = ['jdk-%s-linux-x64.tar.gz' % altver]
diff --git a/easybuild/easyconfigs/j/Java/Java-1.7.0_21.eb b/easybuild/easyconfigs/j/Java/Java-1.7.0_21.eb
index a103ca3d479b75a09b0f4c867714c2a95c4dabef..dbfbd84991483346f1b1c32e972fec02adaf5a2c 100644
--- a/easybuild/easyconfigs/j/Java/Java-1.7.0_21.eb
+++ b/easybuild/easyconfigs/j/Java/Java-1.7.0_21.eb
@@ -7,7 +7,7 @@ description = """Java Platform, Standard Edition (Java SE) lets you develop and
 
 toolchain = {'name': 'dummy', 'version': 'dummy'}
 
-## download the tar.gz directly from http://www.oracle.com/technetwork/java/javase/downloads/index.html
+# download the tar.gz directly from http://www.oracle.com/technetwork/java/javase/downloads/index.html
 (vp, vs) = version.split('_')
 altver = '%su%s' % (vp.split('.')[1], vs)
 sources = ['jdk-%s-linux-x64.tar.gz' % altver]
diff --git a/easybuild/easyconfigs/j/Java/Java-1.7.0_40.eb b/easybuild/easyconfigs/j/Java/Java-1.7.0_40.eb
index a5fd350c4bac651584b7a01eaa865d6c365f7342..cf9d4f4b74cb57ae95511d0a14fb111e80b16012 100644
--- a/easybuild/easyconfigs/j/Java/Java-1.7.0_40.eb
+++ b/easybuild/easyconfigs/j/Java/Java-1.7.0_40.eb
@@ -7,7 +7,7 @@ description = """Java Platform, Standard Edition (Java SE) lets you develop and
 
 toolchain = {'name': 'dummy', 'version': 'dummy'}
 
-## download the tar.gz directly from http://www.oracle.com/technetwork/java/javase/downloads/index.html
+# download the tar.gz directly from http://www.oracle.com/technetwork/java/javase/downloads/index.html
 (vp, vs) = version.split('_')
 altver = '%su%s' % (vp.split('.')[1], vs)
 sources = ['jdk-%s-linux-x64.tar.gz' % altver]
diff --git a/easybuild/easyconfigs/j/Java/Java-1.7.0_45.eb b/easybuild/easyconfigs/j/Java/Java-1.7.0_45.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3387dbbb89f4143282c11f0901e990be045332e2
--- /dev/null
+++ b/easybuild/easyconfigs/j/Java/Java-1.7.0_45.eb
@@ -0,0 +1,15 @@
+name = 'Java'
+version = '1.7.0_45'
+
+homepage = 'http://java.com/'
+description = """Java Platform, Standard Edition (Java SE) lets you develop and deploy
+ Java applications on desktops and servers."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+# download the tar.gz directly from http://www.oracle.com/technetwork/java/javase/downloads/index.html
+(vp, vs) = version.split('_')
+altver = '%su%s' % (vp.split('.')[1], vs)
+sources = ['jdk-%s-linux-x64.tar.gz' % altver]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/j/Jellyfish/Jellyfish-2.1.3-goolf-1.4.10.eb b/easybuild/easyconfigs/j/Jellyfish/Jellyfish-2.1.3-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..65d9262c6c7c6a9871649b2faac34f4f5f0ff078
--- /dev/null
+++ b/easybuild/easyconfigs/j/Jellyfish/Jellyfish-2.1.3-goolf-1.4.10.eb
@@ -0,0 +1,26 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+name = 'Jellyfish'
+version = '2.1.3'
+
+homepage = 'http://www.genome.umd.edu/jellyfish.html'
+description = """ Jellyfish is a tool for fast, memory-efficient counting of k-mers in DNA."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['ftp://ftp.genome.umd.edu/pub/jellyfish/']
+sources = [SOURCELOWER_TAR_GZ]
+
+parallel = 1
+
+runtest = "check"
+
+sanity_check_paths = {
+    'files': ['bin/jellyfish'],
+    'dirs': []
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index 67edb41ff9973376e82d31fa6a30b215aee56670..f06323716c59cec7de19ea4fd5f221ba8257aae0 100644
--- a/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -9,7 +9,7 @@ description = """Jinja2 is a template engine written in pure Python. It provides
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
-source_urls = ['http://pypi.python.org/packages/source/J/%s/' % name]
+source_urls = [PYPI_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 python = "Python"
diff --git a/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-goolf-1.4.10-Python-2.7.3.eb
index b0fb24dcaaa5adc0bed5e791013b7d28aaedae1f..88fdc36fa58fb47e5f339a14f5d34baf4e246f36 100644
--- a/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-goolf-1.4.10-Python-2.7.3.eb
@@ -8,7 +8,7 @@ description = """Jinja2 is a template engine written in pure Python. It provides
 non-XML syntax but supports inline expressions and an optional sandboxed environment."""
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-source_urls = ['http://pypi.python.org/packages/source/J/%s/' % name]
+source_urls = [PYPI_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 python = "Python"
diff --git a/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-ictce-4.0.6-Python-2.7.3.eb
index d75a46acae36b8b607c95c691369c045fc8a420a..47071467089e8054d952068481557ca0ad5f1e07 100644
--- a/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-ictce-4.0.6-Python-2.7.3.eb
@@ -9,7 +9,7 @@ description = """Jinja2 is a template engine written in pure Python. It provides
 
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
-source_urls = ['http://pypi.python.org/packages/source/J/%s/' % name]
+source_urls = [PYPI_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 python = "Python"
diff --git a/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-ictce-5.3.0-Python-2.7.3.eb
index 26a5d5e158965aa19b46d07c149f54a9f345ec2b..a801441c8b62cf7c086d613b1037114c4dfc874a 100644
--- a/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-ictce-5.3.0-Python-2.7.3.eb
@@ -7,10 +7,9 @@ homepage = "http://pypi.python.org/pypi/Jinja2"
 description = """Jinja2 is a template engine written in pure Python. It provides a Django inspired
  non-XML syntax but supports inline expressions and an optional sandboxed environment."""
 
-
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
-source_urls = ['http://pypi.python.org/packages/source/J/%s/' % name]
+source_urls = [PYPI_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 python = "Python"
diff --git a/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-ictce-5.3.0.eb b/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..598911385efda4080b7627adef010846e629cbef
--- /dev/null
+++ b/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-ictce-5.3.0.eb
@@ -0,0 +1,17 @@
+name = 'kbproto'
+version = '1.0.6'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """X.org KBProto protocol headers."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+
+sanity_check_paths = {
+    'files': ['include/X11/extensions/%s' % x for x in ['XKBgeom.h', 'XKB.h',  'XKBproto.h', 'XKBsrv.h', 'XKBstr.h']],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4-testing.eb b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4-testing.eb
index 8b15048447c900db303345a95b0ea2189886563f..c9319bda9f53d275199de54b46c170d9c8f9245d 100644
--- a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4-testing.eb
+++ b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4-testing.eb
@@ -9,7 +9,7 @@ description = """LAPACK is written in Fortran90 and provides routines for solvin
 toolchain = {'name': 'gompi', 'version': '1.1.0-no-OFED'}
 toolchainopts = {'pic': True}
 
-sources = ['%(namelower)s-%(version)s.tgz']
+sources = [SOURCELOWER_TGZ]
 source_urls = [homepage]
 
 versionsuffix = '-%s-%s' % ('ATLAS', '3.8.4')
diff --git a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4.eb b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4.eb
index 654ef2b7f90862d7d767f3334c82e83f0235f609..7722ab0a367bf57aea749f9b7fc00659f399c6a4 100644
--- a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4.eb
+++ b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4.eb
@@ -9,7 +9,7 @@ description = """LAPACK is written in Fortran90 and provides routines for solvin
 toolchain = {'name': 'gompi', 'version': '1.1.0-no-OFED'}
 toolchainopts = {'pic': True}
 
-sources = ['%(namelower)s-%(version)s.tgz']
+sources = [SOURCELOWER_TGZ]
 source_urls = [homepage]
 
 blaslib = 'ATLAS'
diff --git a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED.eb
index 908402fe2b9bf1cdf0a27e5420198241b617cc60..7a9d14764dd2e17cc2ba60089026d1122d846488 100644
--- a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED.eb
@@ -9,7 +9,7 @@ description = """LAPACK is written in Fortran90 and provides routines for solvin
 toolchain = {'name': 'gompi', 'version': '1.1.0-no-OFED'}
 toolchainopts = {'pic': True}
 
-sources = ['%(namelower)s-%(version)s.tgz']
+sources = [SOURCELOWER_TGZ]
 source_urls = [homepage]
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gmpich2-1.4.8.eb b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gmpich2-1.4.8.eb
index c68bfa3e9cd544d31f6a4867a80b5a702ce14093..b8517be37b4cd53f1697b450aa4b7d5fbb091134 100644
--- a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gmpich2-1.4.8.eb
+++ b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gmpich2-1.4.8.eb
@@ -9,7 +9,7 @@ description = """LAPACK is written in Fortran90 and provides routines for solvin
 toolchain = {'name': 'gmpich2', 'version': '1.4.8'}
 toolchainopts = {'pic': True}
 
-sources = ['%(namelower)s-%(version)s.tgz']
+sources = [SOURCELOWER_TGZ]
 source_urls = [homepage]
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.3.12.eb b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.3.12.eb
index b0cffff94e874d70bafb827bb8df6f13a1bb9b79..6bdb18e61fb0acd948170c06a08ea4071dd6811e 100644
--- a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.3.12.eb
+++ b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.3.12.eb
@@ -9,7 +9,7 @@ description = """LAPACK is written in Fortran90 and provides routines for solvin
 toolchain = {'name': 'gompi', 'version': '1.3.12'}
 toolchainopts = {'pic': True}
 
-sources = ['%(namelower)s-%(version)s.tgz']
+sources = [SOURCELOWER_TGZ]
 source_urls = [homepage]
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.4.10.eb b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.4.10.eb
index 4350fbda7521bffc9cd7f7ee4cd409289d2297ce..9be946f5e867d94285cf1c4077c975280e7ba8a3 100644
--- a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.4.10.eb
+++ b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.4.10.eb
@@ -9,7 +9,7 @@ description = """LAPACK is written in Fortran90 and provides routines for solvin
 toolchain = {'name': 'gompi', 'version': '1.4.10'}
 toolchainopts = {'pic': True}
 
-sources = ['%(namelower)s-%(version)s.tgz']
+sources = [SOURCELOWER_TGZ]
 source_urls = [homepage]
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.5.12-no-OFED.eb b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.5.12-no-OFED.eb
index da972092a444587643a71bde8812c2e33d4a41bf..c930b5d2ba6041a076e3bf998f3cfab9adb0fc95 100644
--- a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.5.12-no-OFED.eb
+++ b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.5.12-no-OFED.eb
@@ -9,7 +9,7 @@ description = """LAPACK is written in Fortran90 and provides routines for solvin
 toolchain = {'name': 'gompi', 'version': '1.5.12-no-OFED'}
 toolchainopts = {'pic': True}
 
-sources = ['%(namelower)s-%(version)s.tgz']
+sources = [SOURCELOWER_TGZ]
 source_urls = [homepage]
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.5.12.eb b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.5.12.eb
index 7292fa7362c7c486eeff7fb012ad775c96953783..5a6e906741ea468513242d0412d7ca3ee07f34f3 100644
--- a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.5.12.eb
+++ b/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.5.12.eb
@@ -9,7 +9,7 @@ description = """LAPACK is written in Fortran90 and provides routines for solvin
 toolchain = {'name': 'gompi', 'version': '1.5.12'}
 toolchainopts = {'pic': True}
 
-sources = ['%(namelower)s-%(version)s.tgz']
+sources = [SOURCELOWER_TGZ]
 source_urls = [homepage]
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/l/LIBSVM/LIBSVM-3.17-ictce-4.1.13.eb b/easybuild/easyconfigs/l/LIBSVM/LIBSVM-3.17-ictce-4.1.13.eb
new file mode 100644
index 0000000000000000000000000000000000000000..515dc5d0ab54d1f8e0475e78e601d312dcdc02ed
--- /dev/null
+++ b/easybuild/easyconfigs/l/LIBSVM/LIBSVM-3.17-ictce-4.1.13.eb
@@ -0,0 +1,27 @@
+easyblock = 'MakeCp'
+
+name = 'LIBSVM'
+version = '3.17'
+
+homepage = 'http://www.csie.ntu.edu.tw/~cjlin/libsvm/'
+description = """LIBSVM is an integrated software for support vector classification, (C-SVC, nu-SVC), regression
+ (epsilon-SVR, nu-SVR) and distribution estimation (one-class SVM). It supports multi-class classification."""
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+
+source_urls = [homepage]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('Qt', '4.8.4')]
+
+makeopts = ' && cd svm-toy/qt && make MOC=$EBROOTQT/bin/moc '
+makeopts += 'CFLAGS="$CFLAGS -I$EBROOTQT/include -I$EBROOTQT/include/QtGui -lQtGui -lQtCore" && cd -'
+
+files_to_copy = [(['svm-*'], 'bin'), 'tools']
+
+sanity_check_paths = {
+    'files': ['bin/svm-%s' % x for x in ['predict', 'scale', 'toy', 'train']],
+    'dirs': ['tools'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/LWM2/LWM2-1.1-ictce-5.3.0.eb b/easybuild/easyconfigs/l/LWM2/LWM2-1.1-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..18cafee30459d42be1e1875e7ac12d7bf0a37a2c
--- /dev/null
+++ b/easybuild/easyconfigs/l/LWM2/LWM2-1.1-ictce-5.3.0.eb
@@ -0,0 +1,46 @@
+# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild
+# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany
+# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
+# License::   New BSD
+#
+# This work is based from experiences from the UNITE project
+# http://apps.fz-juelich.de/unite/
+##
+easyblock = 'EB_Score_minus_P'
+
+name = "LWM2"
+version = "1.1"
+
+homepage = 'http://www.vi-hps.org/Tools/LWM2.html'
+description = """The lightweight measurement module (LWM2) is a low overhead profiler developed
+ during the course of the HOPSA project. It can profile applications without any modification by
+ a user. The lightweight measurement module uses a hybrid approach to profile an application. It
+ samples the profiled application at regular intervals to keep track of application activity. To
+ keep the overhead low, LWM2 avoids stack unwinding at each application sample. Instead, it utilizes
+ direct instrumentation to earmark regions of interest in an application. When an application is
+ sampled, the earmarks are checked to identify the region of application execution. As a result,
+ LWM2 is able to profile application with reasonable knowledge of application activity while
+ maintaining low overhead. This hybrid approach also allows LWM2 to keep track of the time spent
+ by an application in different regions of execution without directly measuring the time in these
+ regions. The hybrid profiling approach is also used to collect additional dat a of interest for
+ some specific application activities. This includes the MPI communication calls and the amount of
+ data transfer, the POSIX file I/O calls and associated data transfers, etc."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {"usempi": True}
+
+# http://www.vi-hps.org/upload/projects/hopsa/lwm2-1.1.tar.gz
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.vi-hps.org/upload/projects/hopsa/']
+
+# compiler toolchain depencies
+dependencies = [
+    ('PAPI', '5.2.0'),
+]
+
+sanity_check_paths = {
+    'files': ["bin/l2freader", ("lib64/liblwm2.a", "lib/liblwm2.a")],
+    'dirs': []
+}
+
+moduleclass = 'perf'
diff --git a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-4.1.13.eb b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-4.1.13.eb
new file mode 100644
index 0000000000000000000000000000000000000000..df7ae209001d2b2057b2ab38c03b9ff94b682000
--- /dev/null
+++ b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-4.1.13.eb
@@ -0,0 +1,24 @@
+name = 'Libint'
+version = '1.1.4'
+
+homepage = 'http://www.files.chem.vt.edu/chem-dept/valeev/software/libint/libint.html'
+description = """Libint library is used to evaluate the traditional (electron repulsion) and certain novel two-body
+ matrix elements (integrals) over Cartesian Gaussian functions used in modern atomic and molecular theory."""
+
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+toolchainopts = {'opt': True, 'optarch': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ('http://sourceforge.net/projects/libint/files/v1-releases/', 'download')
+
+configopts = "--with-pic --enable-deriv --enable-r12"
+
+sanity_check_paths = {
+    'files': ["include/lib%(x)s/lib%(x)s.h" % {'x': x} for x in ["deriv", "int", "r12"]] +
+             ["include/libint/hrr_header.h", "include/libint/vrr_header.h"] +
+             ["lib/lib%s.a" % x for x in ["deriv", "int", "r12"]],
+    'dirs':[],
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/l/Lmod/Lmod-5.2-GCC-4.7.2.eb b/easybuild/easyconfigs/l/Lmod/Lmod-5.2-GCC-4.7.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..988d710727b9c36c823c503cfbed8ee7919958b0
--- /dev/null
+++ b/easybuild/easyconfigs/l/Lmod/Lmod-5.2-GCC-4.7.2.eb
@@ -0,0 +1,22 @@
+name = "Lmod"
+version = "5.2"
+
+homepage = "http://sourceforge.net/projects/lmod/"
+description = """Lmod is a Lua based module system. Modules allow for dynamic modification
+ of a user's environment under Unix systems. See www.tacc.utexas.edu/tacc-projects/lmod
+ for a complete description. Lmod is a new implementation that easily handles the MODULEPATH
+ Hierarchical problem. It is drop-in replacement for TCL/C modules and reads TCL modulefiles directly."""
+
+toolchain = {'name': 'GCC', 'version': '4.7.2'}
+
+sources = [SOURCE_TAR_BZ2]
+source_urls = ['http://sourceforge.net/projects/lmod/files/']
+
+dependencies = [("Lua", "5.1.4-5")]
+
+sanity_check_paths = {
+    'files': ["lmod/%(version)s/libexec/lmod", "lmod/%(version)s/init/profile"],
+    'dirs': []
+}
+
+moduleclass = "tools"
diff --git a/easybuild/easyconfigs/l/Lmod/Lmod-5.2-GCC-4.8.2.eb b/easybuild/easyconfigs/l/Lmod/Lmod-5.2-GCC-4.8.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4d0d5e01bc5ae7c324adc03f7d1e9b04aa54e4eb
--- /dev/null
+++ b/easybuild/easyconfigs/l/Lmod/Lmod-5.2-GCC-4.8.2.eb
@@ -0,0 +1,22 @@
+name = "Lmod"
+version = "5.2"
+
+homepage = "http://sourceforge.net/projects/lmod/"
+description = """Lmod is a Lua based module system. Modules allow for dynamic modification
+ of a user's environment under Unix systems. See www.tacc.utexas.edu/tacc-projects/lmod
+ for a complete description. Lmod is a new implementation that easily handles the MODULEPATH
+ Hierarchical problem. It is drop-in replacement for TCL/C modules and reads TCL modulefiles directly."""
+
+toolchain = {'name': 'GCC', 'version': '4.8.2'}
+
+sources = [SOURCE_TAR_BZ2]
+source_urls = ['http://sourceforge.net/projects/lmod/files/']
+
+dependencies = [("Lua", "5.1.4-5")]
+
+sanity_check_paths = {
+    'files': ["lmod/%(version)s/libexec/lmod", "lmod/%(version)s/init/profile"],
+    'dirs': []
+}
+
+moduleclass = "tools"
diff --git a/easybuild/easyconfigs/l/Lmod/Lmod-5.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/Lmod/Lmod-5.2-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8b641dfb5f7808bbf23e6f26331bfb52d654e125
--- /dev/null
+++ b/easybuild/easyconfigs/l/Lmod/Lmod-5.2-goolf-1.4.10.eb
@@ -0,0 +1,22 @@
+name = "Lmod"
+version = "5.2"
+
+homepage = "http://sourceforge.net/projects/lmod/"
+description = """Lmod is a Lua based module system. Modules allow for dynamic modification
+ of a user's environment under Unix systems. See www.tacc.utexas.edu/tacc-projects/lmod
+ for a complete description. Lmod is a new implementation that easily handles the MODULEPATH
+ Hierarchical problem. It is drop-in replacement for TCL/C modules and reads TCL modulefiles directly."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+sources = [SOURCE_TAR_BZ2]
+source_urls = ['http://sourceforge.net/projects/lmod/files/']
+
+dependencies = [("Lua", "5.1.4-5")]
+
+sanity_check_paths = {
+    'files': ["lmod/%(version)s/libexec/lmod", "lmod/%(version)s/init/profile"],
+    'dirs': []
+}
+
+moduleclass = "tools"
diff --git a/easybuild/easyconfigs/l/Lmod/Lmod-5.2.5-GCC-4.8.2.eb b/easybuild/easyconfigs/l/Lmod/Lmod-5.2.5-GCC-4.8.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..898aff188b53b6c4afeab0223a6c1f94eef4be2e
--- /dev/null
+++ b/easybuild/easyconfigs/l/Lmod/Lmod-5.2.5-GCC-4.8.2.eb
@@ -0,0 +1,25 @@
+name = "Lmod"
+version = "5.2.5"
+
+homepage = "http://sourceforge.net/projects/lmod/"
+description = """Lmod is a Lua based module system. Modules allow for dynamic modification
+ of a user's environment under Unix systems. See www.tacc.utexas.edu/tacc-projects/lmod
+ for a complete description. Lmod is a new implementation that easily handles the MODULEPATH
+ Hierarchical problem. It is drop-in replacement for TCL/C modules and reads TCL modulefiles directly."""
+
+toolchain = {'name': 'GCC', 'version': '4.8.2'}
+
+sources = [SOURCE_TAR_BZ2]
+source_urls = [
+    'http://sourceforge.net/projects/lmod/files/',
+    'http://sourceforge.net/projects/lmod/files/Testing'
+]
+
+dependencies = [("Lua", "5.1.4-8")]
+
+sanity_check_paths = {
+    'files': ["lmod/%(version)s/libexec/lmod", "lmod/%(version)s/init/profile"],
+    'dirs': []
+}
+
+moduleclass = "tools"
diff --git a/easybuild/easyconfigs/l/Lmod/Lmod-5.3-GCC-4.8.2.eb b/easybuild/easyconfigs/l/Lmod/Lmod-5.3-GCC-4.8.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0331bf01164a82044ede4c53aec2b611ffbf5294
--- /dev/null
+++ b/easybuild/easyconfigs/l/Lmod/Lmod-5.3-GCC-4.8.2.eb
@@ -0,0 +1,25 @@
+name = "Lmod"
+version = "5.3"
+
+homepage = "http://sourceforge.net/projects/lmod/"
+description = """Lmod is a Lua based module system. Modules allow for dynamic modification
+ of a user's environment under Unix systems. See www.tacc.utexas.edu/tacc-projects/lmod
+ for a complete description. Lmod is a new implementation that easily handles the MODULEPATH
+ Hierarchical problem. It is drop-in replacement for TCL/C modules and reads TCL modulefiles directly."""
+
+toolchain = {'name': 'GCC', 'version': '4.8.2'}
+
+sources = [SOURCE_TAR_BZ2]
+source_urls = [
+    'http://sourceforge.net/projects/lmod/files/',
+    'http://sourceforge.net/projects/lmod/files/Testing'
+]
+
+dependencies = [("Lua", "5.1.4-8")]
+
+sanity_check_paths = {
+    'files': ["lmod/%(version)s/libexec/lmod", "lmod/%(version)s/init/profile"],
+    'dirs': []
+}
+
+moduleclass = "tools"
diff --git a/easybuild/easyconfigs/l/Lmod/Lmod-5.4-GCC-4.8.2.eb b/easybuild/easyconfigs/l/Lmod/Lmod-5.4-GCC-4.8.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..48d4c46271aabb3eb765e4cc43a1424c48d914df
--- /dev/null
+++ b/easybuild/easyconfigs/l/Lmod/Lmod-5.4-GCC-4.8.2.eb
@@ -0,0 +1,25 @@
+name = "Lmod"
+version = "5.4"
+
+homepage = "http://sourceforge.net/projects/lmod/"
+description = """Lmod is a Lua based module system. Modules allow for dynamic modification
+ of a user's environment under Unix systems. See www.tacc.utexas.edu/tacc-projects/lmod
+ for a complete description. Lmod is a new implementation that easily handles the MODULEPATH
+ Hierarchical problem. It is drop-in replacement for TCL/C modules and reads TCL modulefiles directly."""
+
+toolchain = {'name': 'GCC', 'version': '4.8.2'}
+
+sources = [SOURCE_TAR_BZ2]
+source_urls = [
+    'http://sourceforge.net/projects/lmod/files/',
+    'http://sourceforge.net/projects/lmod/files/Testing'
+]
+
+dependencies = [("Lua", "5.1.4-8")]
+
+sanity_check_paths = {
+    'files': ["lmod/%(version)s/libexec/lmod", "lmod/%(version)s/init/profile"],
+    'dirs': []
+}
+
+moduleclass = "tools"
diff --git a/easybuild/easyconfigs/l/Lmod/Lmod-5.4.2-GCC-4.8.2.eb b/easybuild/easyconfigs/l/Lmod/Lmod-5.4.2-GCC-4.8.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..bf79635a7ba9872bbf3631e8f558e46d9ce72ce7
--- /dev/null
+++ b/easybuild/easyconfigs/l/Lmod/Lmod-5.4.2-GCC-4.8.2.eb
@@ -0,0 +1,25 @@
+name = "Lmod"
+version = "5.4.2"
+
+homepage = "http://sourceforge.net/projects/lmod/"
+description = """Lmod is a Lua based module system. Modules allow for dynamic modification
+ of a user's environment under Unix systems. See www.tacc.utexas.edu/tacc-projects/lmod
+ for a complete description. Lmod is a new implementation that easily handles the MODULEPATH
+ Hierarchical problem. It is drop-in replacement for TCL/C modules and reads TCL modulefiles directly."""
+
+toolchain = {'name': 'GCC', 'version': '4.8.2'}
+
+sources = [SOURCE_TAR_BZ2]
+source_urls = [
+    'http://sourceforge.net/projects/lmod/files/',
+    'http://sourceforge.net/projects/lmod/files/Testing'
+]
+
+dependencies = [("Lua", "5.1.4-8")]
+
+sanity_check_paths = {
+    'files': ["lmod/%(version)s/libexec/lmod", "lmod/%(version)s/init/profile"],
+    'dirs': []
+}
+
+moduleclass = "tools"
diff --git a/easybuild/easyconfigs/l/Lmod/Lmod-5.5-GCC-4.8.2.eb b/easybuild/easyconfigs/l/Lmod/Lmod-5.5-GCC-4.8.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2c8f284bdd10b5bf872850236322a4d8af55d511
--- /dev/null
+++ b/easybuild/easyconfigs/l/Lmod/Lmod-5.5-GCC-4.8.2.eb
@@ -0,0 +1,25 @@
+name = "Lmod"
+version = "5.5"
+
+homepage = "http://sourceforge.net/projects/lmod/"
+description = """Lmod is a Lua based module system. Modules allow for dynamic modification
+ of a user's environment under Unix systems. See www.tacc.utexas.edu/tacc-projects/lmod
+ for a complete description. Lmod is a new implementation that easily handles the MODULEPATH
+ Hierarchical problem. It is drop-in replacement for TCL/C modules and reads TCL modulefiles directly."""
+
+toolchain = {'name': 'GCC', 'version': '4.8.2'}
+
+sources = [SOURCE_TAR_BZ2]
+source_urls = [
+    'http://sourceforge.net/projects/lmod/files/',
+    'http://sourceforge.net/projects/lmod/files/Testing'
+]
+
+dependencies = [("Lua", "5.1.4-8")]
+
+sanity_check_paths = {
+    'files': ["lmod/%(version)s/libexec/lmod", "lmod/%(version)s/init/profile"],
+    'dirs': []
+}
+
+moduleclass = "tools"
diff --git a/easybuild/easyconfigs/l/Lmod/Lmod-5.5.1-GCC-4.8.2.eb b/easybuild/easyconfigs/l/Lmod/Lmod-5.5.1-GCC-4.8.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..90c9e48256a7e7d517f3239a0a352784caa2c510
--- /dev/null
+++ b/easybuild/easyconfigs/l/Lmod/Lmod-5.5.1-GCC-4.8.2.eb
@@ -0,0 +1,25 @@
+name = "Lmod"
+version = "5.5.1"
+
+homepage = "http://sourceforge.net/projects/lmod/"
+description = """Lmod is a Lua based module system. Modules allow for dynamic modification
+ of a user's environment under Unix systems. See www.tacc.utexas.edu/tacc-projects/lmod
+ for a complete description. Lmod is a new implementation that easily handles the MODULEPATH
+ Hierarchical problem. It is drop-in replacement for TCL/C modules and reads TCL modulefiles directly."""
+
+toolchain = {'name': 'GCC', 'version': '4.8.2'}
+
+sources = [SOURCE_TAR_BZ2]
+source_urls = [
+    'http://sourceforge.net/projects/lmod/files/',
+    'http://sourceforge.net/projects/lmod/files/Testing'
+]
+
+dependencies = [("Lua", "5.1.4-8")]
+
+sanity_check_paths = {
+    'files': ["lmod/%(version)s/libexec/lmod", "lmod/%(version)s/init/profile"],
+    'dirs': []
+}
+
+moduleclass = "tools"
diff --git a/easybuild/easyconfigs/l/Lmod/README.TXT b/easybuild/easyconfigs/l/Lmod/README.TXT
new file mode 100644
index 0000000000000000000000000000000000000000..a19f3e49866fa62fddcf4c5d941b1a685710b9b6
--- /dev/null
+++ b/easybuild/easyconfigs/l/Lmod/README.TXT
@@ -0,0 +1,35 @@
+
+Summary:
+
+This directory contains (hopefully) sufficient gear in order to let you
+bootstrap towards the Lmod implementation of environment modules.
+
+Howto:
+
+Assuming you have successfully used the bootstrap procedure of EasyBuild,
+you should be able to initiate a recursive build of the following bits:
+
+  `time eb Lmod-5.5-GCC-4.8.2.eb -r`
+
+l/Lmod/Lmod-5.5-GCC-4.8.2.eb ### so, you just aim for this one, with "-r"
+l/Lua/Lua-5.1.4-8-GCC-4.8.2.eb
+n/ncurses/ncurses-5.9-GCC-4.8.2.eb
+g/GCC/GCC-4.8.2.eb
+
+This set is expected to be the needed substrate to launch you towards Lmod,
+which gets activated with the `sourceme` script sitting in the same directory:
+
+`source sourceme` # N.B. it does direct assignments on environment variables; that's intentional
+
+Then try:
+
+`ml av` # ie. the Lmod equivalent to `module avail` ; it should work
+
+If so, now you implemented the better instance of: https://hpcbios.readthedocs.org/en/latest/HPCBIOS_06-17.html
+Lmod's caching can help to work with *buildsets*; ref. https://fosdem.org/2014/schedule/event/hpc_devroom_hpcbios/
+You should now be able to try alternative Lmod/Lua versions, toggle cache, and so forth.
+
+enjoy,
+Fotis
+
+2014-04-29
diff --git a/easybuild/easyconfigs/l/Lmod/sourceme b/easybuild/easyconfigs/l/Lmod/sourceme
new file mode 100644
index 0000000000000000000000000000000000000000..147c82fe86f2e5e89aa37666b5418efffb01ed5e
--- /dev/null
+++ b/easybuild/easyconfigs/l/Lmod/sourceme
@@ -0,0 +1,28 @@
+## Contributed by Fotis Georgatos <fotis@cern.ch>, as means to help others wishing to ride on Lmod
+#
+# This script helps to implement policy: https://hpcbios.readthedocs.org/en/latest/HPCBIOS_06-17.html
+#
+# prereq: Lmod/5.5-GCC-4.8.2
+# prereq: Lua/5.1.4-8-GCC-4.8.2
+#
+# build prereqs, take a note: GCC/4.8.2 & ncurses/5.9
+
+## Remember to change the following, as per individual case
+EASYBUILD_PREFIX=${EASYBUILD_PREFIX:-"$HOME/.local/easybuild"}
+
+TOOLCHAIN="GCC-4.8.2"
+VERSIONLUA="5.1.4-8"
+VERSIONLMOD="5.5"
+
+PREFIXLUA=$EASYBUILD_PREFIX/software/Lua/$VERSIONLUA-$TOOLCHAIN
+PREFIXLMOD=$EASYBUILD_PREFIX/software/Lmod/$VERSIONLMOD-$TOOLCHAIN/lmod/$VERSIONLMOD
+
+export PATH=$PREFIXLUA/bin:$PREFIXLUA/libexec:$PATH
+export LMOD_MPATH_AVAIL=yes     # `module avail` now also searches the pathnames of modulefiles
+source $PREFIXLMOD/init/profile
+
+export PAGER=cat                # Keep it simple, for a start
+unset LMOD_IGNORE_CACHE         # Lmod cache should be working now
+export LMOD_COLORIZE=YES        # YMMV
+
+echo 'Now, try fi. `module avail -d compiler` or `ml av` and observe output'
diff --git a/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-GCC-4.7.2.eb b/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-GCC-4.7.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6089259852f4cdfc053d72c4706f8a046a605e2f
--- /dev/null
+++ b/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-GCC-4.7.2.eb
@@ -0,0 +1,24 @@
+name = "Lua"
+version = "5.1.4-5"
+
+homepage = "http://www.lua.org/"
+description = """Lua is a powerful, fast, lightweight, embeddable scripting language.
+ Lua combines simple procedural syntax with powerful data description constructs based
+ on associative arrays and extensible semantics. Lua is dynamically typed,
+ runs by interpreting bytecode for a register-based virtual machine,
+ and has automatic memory management with incremental garbage collection,
+ making it ideal for configuration, scripting, and rapid prototyping."""
+
+toolchain = {'name': 'GCC', 'version': '4.7.2'}
+
+sources = ['lua-%s.tar.gz' % version.replace('-', '.')]
+source_urls = ['http://sourceforge.net/projects/lmod/files/']
+
+dependencies = [('ncurses', '5.9')]
+
+sanity_check_paths = {
+    'files': ["bin/lua"],
+    'dirs': []
+}
+
+moduleclass = "lang"
diff --git a/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-GCC-4.8.2.eb b/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-GCC-4.8.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..88109be8ee27f3f8609c27b65dd99ca1d95df195
--- /dev/null
+++ b/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-GCC-4.8.2.eb
@@ -0,0 +1,24 @@
+name = "Lua"
+version = "5.1.4-5"
+
+homepage = "http://www.lua.org/"
+description = """Lua is a powerful, fast, lightweight, embeddable scripting language.
+ Lua combines simple procedural syntax with powerful data description constructs based
+ on associative arrays and extensible semantics. Lua is dynamically typed,
+ runs by interpreting bytecode for a register-based virtual machine,
+ and has automatic memory management with incremental garbage collection,
+ making it ideal for configuration, scripting, and rapid prototyping."""
+
+toolchain = {'name': 'GCC', 'version': '4.8.2'}
+
+sources = ['lua-%s.tar.gz' % version.replace('-', '.')]
+source_urls = ['http://sourceforge.net/projects/lmod/files/']
+
+dependencies = [('ncurses', '5.9')]
+
+sanity_check_paths = {
+    'files': ["bin/lua"],
+    'dirs': []
+}
+
+moduleclass = "lang"
diff --git a/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-goolf-1.4.10.eb b/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e8d1e81e0c4842502943d9bb7ef4851974f2aca5
--- /dev/null
+++ b/easybuild/easyconfigs/l/Lua/Lua-5.1.4-5-goolf-1.4.10.eb
@@ -0,0 +1,24 @@
+name = "Lua"
+version = "5.1.4-5"
+
+homepage = "http://www.lua.org/"
+description = """Lua is a powerful, fast, lightweight, embeddable scripting language.
+ Lua combines simple procedural syntax with powerful data description constructs based
+ on associative arrays and extensible semantics. Lua is dynamically typed,
+ runs by interpreting bytecode for a register-based virtual machine,
+ and has automatic memory management with incremental garbage collection,
+ making it ideal for configuration, scripting, and rapid prototyping."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+sources = ['lua-%s.tar.gz' % version.replace('-', '.')]
+source_urls = ['http://sourceforge.net/projects/lmod/files/']
+
+dependencies = [('ncurses', '5.9')]
+
+sanity_check_paths = {
+    'files': ["bin/lua"],
+    'dirs': []
+}
+
+moduleclass = "lang"
diff --git a/easybuild/easyconfigs/l/Lua/Lua-5.1.4-8-GCC-4.8.2.eb b/easybuild/easyconfigs/l/Lua/Lua-5.1.4-8-GCC-4.8.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2d4f7773d7357059bc5300ce60b6baeab01aac62
--- /dev/null
+++ b/easybuild/easyconfigs/l/Lua/Lua-5.1.4-8-GCC-4.8.2.eb
@@ -0,0 +1,24 @@
+name = "Lua"
+version = "5.1.4-8"
+
+homepage = "http://www.lua.org/"
+description = """Lua is a powerful, fast, lightweight, embeddable scripting language.
+ Lua combines simple procedural syntax with powerful data description constructs based
+ on associative arrays and extensible semantics. Lua is dynamically typed,
+ runs by interpreting bytecode for a register-based virtual machine,
+ and has automatic memory management with incremental garbage collection,
+ making it ideal for configuration, scripting, and rapid prototyping."""
+
+toolchain = {'name': 'GCC', 'version': '4.8.2'}
+
+sources = ['lua-%s.tar.gz' % version.replace('-', '.')]
+source_urls = ['http://sourceforge.net/projects/lmod/files/']
+
+dependencies = [('ncurses', '5.9')]
+
+sanity_check_paths = {
+    'files': ["bin/lua"],
+    'dirs': []
+}
+
+moduleclass = "lang"
diff --git a/easybuild/easyconfigs/l/libICE/libICE-1.0.8-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libICE/libICE-1.0.8-goolf-1.4.10.eb
index bffb063aa862ecac7567ba7ef905e64fd9338f88..b9be2efae2350b017f9b65369544da8bd885b27b 100644
--- a/easybuild/easyconfigs/l/libICE/libICE-1.0.8-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libICE/libICE-1.0.8-goolf-1.4.10.eb
@@ -7,7 +7,7 @@ description = """X Inter-Client Exchange library for freedesktop.org"""
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 dependencies = [
     ('xproto', '7.0.23'),
diff --git a/easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-4.1.13.eb
index e8b5e70adcc412245ceb53ef4d08326f80ed2019..7c9daa8b70b28c7e6ab4154bf57b8ccd5c1a2889 100644
--- a/easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-4.1.13.eb
@@ -7,7 +7,7 @@ description = """X Inter-Client Exchange library for freedesktop.org"""
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 dependencies = [
     ('xproto', '7.0.23'),
diff --git a/easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..50c2ca78b726b12816af339187573aba1db1e506
--- /dev/null
+++ b/easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-5.3.0.eb
@@ -0,0 +1,22 @@
+name = 'libICE'
+version = '1.0.8'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """X Inter-Client Exchange library for freedesktop.org"""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+dependencies = [
+    ('xproto', '7.0.23'),
+    ('xtrans', '1.2'),
+]
+
+sanity_check_paths = {
+    'files' : ['include/X11/ICE/ICE%s.h' % x for x in ['', 'conn', 'lib', 'msg', 'proto', 'util']],
+    'dirs' : [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libSM/libSM-1.2.1-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libSM/libSM-1.2.1-goolf-1.4.10.eb
index 2297d22ca58468a2604c5eccb81158884787fbad..16060206da591d3640fd50c4cac5611f96787361 100644
--- a/easybuild/easyconfigs/l/libSM/libSM-1.2.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libSM/libSM-1.2.1-goolf-1.4.10.eb
@@ -8,7 +8,7 @@ description = """X11 Session Management library, which allows for applications t
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 dependencies = [
     ('libICE', '1.0.8'),
diff --git a/easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-4.1.13.eb
index 61007b682e6540eebdc1ccb6116ccb10a97983d1..87bf8853117b68ca4e6689300a71faaad906c783 100644
--- a/easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-4.1.13.eb
@@ -8,7 +8,7 @@ description = """X11 Session Management library, which allows for applications t
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 dependencies = [
     ('libICE', '1.0.8'),
diff --git a/easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d00cbdc986ccdea1ad6f2baf18e54c87dff169a7
--- /dev/null
+++ b/easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-5.3.0.eb
@@ -0,0 +1,26 @@
+name = 'libSM'
+version = '1.2.1'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """X11 Session Management library, which allows for applications to both manage sessions,
+ and make use of session managers to save and restore their state for later use."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+dependencies = [
+    ('libICE', '1.0.8'),
+]
+builddependencies = [
+    ('xproto', '7.0.23'),
+    ('xtrans', '1.2'),
+]
+
+sanity_check_paths = {
+    'files' : ['include/X11/SM/%s' % x for x in ['SM.h', 'SMlib.h', 'SMproto.h']],
+    'dirs' : [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb
index 935f6ed825dcc99288940c80541e2a6c17800fd2..cd12d86ab232f997a5816662ac1dcefad9d1164b 100644
--- a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb
@@ -7,7 +7,7 @@ description = """X11 client-side library"""
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 pythonversion = '-Python-2.7.3'
 builddependencies = [
diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-4.1.13.eb
index 89cd7c6a138eb1b1a4c413052d0cd13289c36cdf..eb5f4b8d2404188530b492e94b9ef3f06d7a2586 100644
--- a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-4.1.13.eb
@@ -7,7 +7,7 @@ description = """X11 client-side library"""
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 pythonversion = '-Python-2.7.3'
 builddependencies = [
diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..583a481c18ff4b770db80cca9cbb9f233a1e0d16
--- /dev/null
+++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-5.3.0.eb
@@ -0,0 +1,35 @@
+name = 'libX11'
+version = '1.6.1'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """X11 client-side library"""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+pythonversion = '-Python-2.7.3'
+builddependencies = [
+    ('xextproto', '7.2.1'),
+    ('xcb-proto', '1.7', pythonversion),
+    ('kbproto', '1.0.6'),
+    ('inputproto', '2.3'),
+    ('xproto', '7.0.23'),
+]
+
+dependencies = [
+    ('libxcb', '1.8', pythonversion),
+    ('xtrans', '1.2'),
+]
+
+sanity_check_paths = {
+    'files': ['include/X11/%s' % x for x in [
+            'cursorfont.h', 'ImUtil.h', 'Xcms.h', 'XKBlib.h', 'XlibConf.h', 'Xlib.h', 'Xlibint.h', 'Xlib-xcb.h',
+            'Xlocale.h', 'Xregion.h', 'Xresource.h', 'Xutil.h',
+        ]
+    ],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-goolf-1.4.10.eb
index 7c2488c42c143e89fe77067ce469b5bf200f37ed..7ce23e22cfc051bc35ad87708093b7dc2bcc54ac 100644
--- a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-goolf-1.4.10.eb
@@ -9,7 +9,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 sanity_check_paths = {
     'files': ['lib/%s' % x for x in ['libXau.a', 'libXau.so']],
diff --git a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-ictce-4.1.13.eb
index a3ce0f8335b76fe883630d00d3eaa81df638f590..a284b7f633f3ed99e9b2d4fb4bcbf2d26c847a5e 100644
--- a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-ictce-4.1.13.eb
@@ -9,7 +9,7 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 sanity_check_paths = {
     'files': ['lib/%s' % x for x in ['libXau.a', 'libXau.so']],
diff --git a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7ed70c847ebe299099b1a1fd25fdaf2478eb5e8c
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-ictce-5.3.0.eb
@@ -0,0 +1,19 @@
+name = 'libXau'
+version = '1.0.8'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """The libXau package contains a library implementing the X11 Authorization Protocol.
+This is useful for restricting client access to the display."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'optarch': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+sanity_check_paths = {
+    'files': ['lib/%s' % x for x in ['libXau.a', 'libXau.so']],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-goolf-1.4.10.eb
index 5df92d968df5cf7c627e667072b2f74e9a016708..5ffb68801190e0f6939af79686e75fbfae96fbeb 100644
--- a/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-goolf-1.4.10.eb
@@ -8,7 +8,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 dependencies = [
     ('libXmu', '1.1.2'),
diff --git a/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-ictce-4.1.13.eb
index 9810ba8313efed16ebf268dfaf3dd97a5e385960..b762b2fc1104765db7fd05f0494123d5fb3ccccd 100644
--- a/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-ictce-4.1.13.eb
@@ -8,7 +8,7 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 dependencies = [
     ('libXmu', '1.1.2'),
diff --git a/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8cda879d73538fa338dfb6e73e26a74bb59fc2de
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-ictce-5.3.0.eb
@@ -0,0 +1,22 @@
+name = 'libXaw'
+version = '1.0.12'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """libXaw provides the Athena Widgets toolkit"""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'optarch': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+dependencies = [
+    ('libXmu', '1.1.2'),
+    ('libXpm', '3.5.11'),
+]
+sanity_check_paths = {
+    'files': ['lib/%s' % x for x in ['libXaw6.a', 'libXaw7.a', 'libXaw.so']],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXext/libXext-1.3.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-goolf-1.4.10.eb
index 579e7c6d82aa6c83ae7b57d769708c1fb45c0112..5dc078bfb74be3811c9304abc1b40dbca24ef32d 100644
--- a/easybuild/easyconfigs/l/libXext/libXext-1.3.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-goolf-1.4.10.eb
@@ -8,7 +8,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 dependencies = [
     ('xproto','7.0.23'),
diff --git a/easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-4.1.13.eb
index 66aa620785268d8df8d62eb060dbc076a6b537d5..d4bdc634f35ac30e7259225b65c238b41bb47039 100644
--- a/easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-4.1.13.eb
@@ -8,7 +8,7 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 dependencies = [
     ('xproto','7.0.23'),
diff --git a/easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7cc48ce5f8674250cf0872dfc293c22ae0f29289
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-5.3.0.eb
@@ -0,0 +1,28 @@
+name = 'libXext'
+version = '1.3.2'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """Common X Extensions library"""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'optarch': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+dependencies = [
+    ('xproto','7.0.23'),
+    ('libX11', '1.6.1'),
+    ('xextproto', '7.2.1'),
+]
+
+sanity_check_paths = {
+    'files': ['include/X11/extensions/%s' % x for x in [
+            'dpms.h', 'extutil.h', 'MITMisc.h', 'multibuf.h', 'security.h', 'shape.h', 'sync.h', 'Xag.h', 'Xcup.h',
+            'Xdbe.h', 'XEVI.h', 'Xext.h', 'Xge.h', 'XLbx.h', 'XShm.h', 'xtestext1.h',
+        ]
+    ],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-goolf-1.4.10.eb
index 6293ac9f70021262109689f46f42dc1786fc75b5..5010d2aa95ca29880f91a397176337c8352fc382 100644
--- a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-goolf-1.4.10.eb
@@ -7,7 +7,7 @@ description = """X Fixes extension library"""
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 dependencies = [
     ('fixesproto', '5.0'),
diff --git a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-4.1.13.eb
index 4c40b8e475e3984d42bcb01275a483a4f963529d..20bf7b171708216b39c7493da037c2ff908c96e0 100644
--- a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-4.1.13.eb
@@ -7,7 +7,7 @@ description = """X Fixes extension library"""
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 dependencies = [
     ('fixesproto', '5.0'),
diff --git a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..87f1ef0d391f8a2892ac48e64578c7387266cec9
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-5.3.0.eb
@@ -0,0 +1,22 @@
+name = 'libXfixes'
+version = '5.0.1'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """X Fixes extension library"""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+dependencies = [
+    ('fixesproto', '5.0'),
+    ('xextproto', '7.2.1'),
+]
+
+sanity_check_paths = {
+    'files' : ['include/X11/extensions/Xfixes.h', 'lib/libXfixes.a', 'lib/libXfixes.so'],
+    'dirs' : [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXi/libXi-1.7.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXi/libXi-1.7.2-goolf-1.4.10.eb
index 4d4672394eddf62ad263b06d87a728f73dce7f5b..0c7011e540ac0e92fef19956373665a383e64ada 100644
--- a/easybuild/easyconfigs/l/libXi/libXi-1.7.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libXi/libXi-1.7.2-goolf-1.4.10.eb
@@ -7,7 +7,7 @@ description = """LibXi provides an X Window System client interface to the XINPU
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 dependencies = [
     ('xproto', '7.0.23'),
diff --git a/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-4.1.13.eb
index cbb0ad6be6f1e5eae54994ecb09bdc2b5ea71a19..7eca8cceb1a2460adc915bc3acc0ecc43e93e480 100644
--- a/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-4.1.13.eb
@@ -7,7 +7,7 @@ description = """LibXi provides an X Window System client interface to the XINPU
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 dependencies = [
     ('xproto', '7.0.23'),
diff --git a/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a0201585d729b89e0ada0c1beb03124e3165df27
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-5.3.0.eb
@@ -0,0 +1,25 @@
+name = 'libXi'
+version = '1.7.2'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """LibXi provides an X Window System client interface to the XINPUT extension to the X protocol."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+dependencies = [
+    ('xproto', '7.0.23'),
+    ('xextproto', '7.2.1'),
+    ('libXext', '1.3.2'),
+    ('inputproto', '2.3'),
+    ('libXfixes', '5.0.1'),
+]
+
+sanity_check_paths = {
+    'files' : ['include/X11/extensions/XInput.h', 'include/X11/extensions/XInput2.h', 'lib/libXi.so', 'lib/libXi.a'],
+    'dirs' : [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-goolf-1.4.10.eb
index b4346e2304717aba22394704ea5ce70ff4e7a5fb..fbf39423f6e8ee93042d183f951628911adaed61 100644
--- a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-goolf-1.4.10.eb
@@ -9,7 +9,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 
 dependencies = [
diff --git a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-4.1.13.eb
index 464057cb9c39c1ed4b94968063c3b8096d56c1e3..75249d51b96ac859672b1eced1866a3f4c11d723 100644
--- a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-4.1.13.eb
@@ -9,7 +9,7 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 dependencies = [
     ('libXt', '1.1.4'),
diff --git a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..80f4b6f0660edafa0c0eed10c9e1a24bc4b06d74
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-5.3.0.eb
@@ -0,0 +1,23 @@
+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': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'optarch': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+dependencies = [
+    ('libXt', '1.1.4'),
+    ('libXpm', '3.5.11'),
+]
+sanity_check_paths = {
+    'files': ['lib/%s' % x for x in ['%(name)s.a', '%(name)s.so']],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXp/libXp-1.0.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXp/libXp-1.0.2-goolf-1.4.10.eb
index 2c5ebf1f9403a4aa7dc4f3d66978e094c716705b..2f8d991632c4c978ce8592333131d4b2a64ac3a7 100644
--- a/easybuild/easyconfigs/l/libXp/libXp-1.0.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libXp/libXp-1.0.2-goolf-1.4.10.eb
@@ -8,7 +8,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 builddependencies = [
      ('xextproto', '7.2.1'),
diff --git a/easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-4.1.13.eb
index 5675382c34bdc4ddd3435b25762cbd0c072c09ac..65798889cea292e055a5eb47fb6d6cc21ff4f01a 100644
--- a/easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-4.1.13.eb
@@ -8,7 +8,7 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 builddependencies = [
      ('xextproto', '7.2.1'),
diff --git a/easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..406fdd8a088e55adb8759d00994a7285734046f5
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-5.3.0.eb
@@ -0,0 +1,28 @@
+name = 'libXp'
+version = '1.0.2'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """libXp provides the X print library."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'optarch': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+builddependencies = [
+     ('xextproto', '7.2.1'),
+     ('printproto', '1.0.5'),
+]
+
+dependencies = [
+     ('libX11', '1.6.1'),
+     ('libXext', '1.3.2'),
+     ('libXau', '1.0.8'),
+]
+sanity_check_paths = {
+    'files': ['lib/%s' % x for x in ['libXp.a', 'libXp.so']],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-goolf-1.4.10.eb
index ce7d81eb8d5c75b74878a269fdbd5e9e984ff868..9f8a24e64117de65a7fcef0c6e8df30f2f467e89 100644
--- a/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-goolf-1.4.10.eb
@@ -8,7 +8,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 builddependencies = [('gettext', '0.18.2')]
 
diff --git a/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-ictce-4.1.13.eb
index 1160baf2dd9fa244e4d06287727a854547309355..d0a5514f82b320b6ae748284cc06014f86f33405 100644
--- a/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-ictce-4.1.13.eb
@@ -8,7 +8,7 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 builddependencies = [('gettext', '0.18.2')]
 
diff --git a/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..dcea15ec39e8db2247298d7fccb32337fdfb02ff
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-ictce-5.3.0.eb
@@ -0,0 +1,20 @@
+name = 'libXpm'
+version = '3.5.11'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """libXp provides the X print library."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'optarch': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+builddependencies = [('gettext', '0.18.2')]
+
+sanity_check_paths = {
+    'files': ['lib/%s' % x for x in ['libXpm.a', 'libXpm.so']],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-goolf-1.4.10.eb
index ab2d4419aac31cc383ca7aefc8bec2f81c76f743..df76b64d5ef05ef26a04bbaf3467bee835db2739 100644
--- a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-goolf-1.4.10.eb
@@ -9,7 +9,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 dependencies = [
     ('libSM', '1.2.1'),
diff --git a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-4.1.13.eb
index a2b0f3bde8da12ba74ffe75aaea7a8608134f602..b713972597bccafaa8e0fc53411988c72b462179 100644
--- a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-4.1.13.eb
@@ -9,7 +9,7 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 dependencies = [
     ('libSM', '1.2.1'),
diff --git a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0a3a7d28570cdf9f20f87d091f8d8381c19fc4cc
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-5.3.0.eb
@@ -0,0 +1,34 @@
+name = 'libXt'
+version = '1.1.4'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """libXt provides the X Toolkit Intrinsics, an abstract widget library upon which other toolkits are
+ based. Xt is the basis for many toolkits, including the Athena widgets (Xaw), and LessTif (a Motif implementation)."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'optarch': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+dependencies = [
+    ('libSM', '1.2.1'),
+    ('libICE', '1.0.8'),
+    ('libX11', '1.6.1'),
+    ('kbproto', '1.0.6'),
+    ('xproto', '7.0.23'),
+]
+
+sanity_check_paths = {
+    'files' : ['include/X11/%s' % x for x in [
+        'CallbackI.h', 'CompositeP.h', 'Constraint.h', 'Core.h', 'CreateI.h', 'HookObjI.h', 'Intrinsic.h',
+        'IntrinsicP.h', 'ObjectP.h', 'RectObj.h', 'ResConfigP.h', 'SelectionI.h', 'ShellI.h', 'StringDefs.h',
+        'TranslateI.h', 'Vendor.h', 'Xtos.h', 'Composite.h', 'ConstrainP.h', 'ConvertI.h', 'CoreP.h', 'EventI.h',
+        'InitialI.h', 'IntrinsicI.h', 'Object.h', 'PassivGraI.h', 'RectObjP.h', 'ResourceI.h', 'Shell.h', 'ShellP.h',
+        'ThreadsI.h', 'VarargsI.h', 'VendorP.h',
+        ]
+    ],
+    'dirs' : [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libctl/libctl-3.2.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libctl/libctl-3.2.1-goalf-1.1.0-no-OFED.eb
index 6965c925d9be04eca5a8059177e3ff007697d5ff..4793aadab2c0688967860b713fe8ee6b27d5c8db 100644
--- a/easybuild/easyconfigs/l/libctl/libctl-3.2.1-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/l/libctl/libctl-3.2.1-goalf-1.1.0-no-OFED.eb
@@ -12,4 +12,7 @@ sources = [SOURCELOWER_TAR_GZ]
 
 dependencies = [('guile', '1.8.8')]
 
+# fix for guile-config being broken because shebang line contains full path to bin/guile
+configopts = 'GUILE_CONFIG="$EBROOTGUILE/bin/guile -e main -s $EBROOTGUILE/bin/guile-config"'
+
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/l/libctl/libctl-3.2.1-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libctl/libctl-3.2.1-goolf-1.4.10.eb
index eaeab2f0a10bdfc156f3d864c580af51f5f2389b..c6329bbafe42442bda8893c64a56803b5124e004 100644
--- a/easybuild/easyconfigs/l/libctl/libctl-3.2.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libctl/libctl-3.2.1-goolf-1.4.10.eb
@@ -11,4 +11,7 @@ sources = [SOURCELOWER_TAR_GZ]
 
 dependencies = [('guile', '1.8.8')]
 
+# fix for guile-config being broken because shebang line contains full path to bin/guile
+configopts = 'GUILE_CONFIG="$EBROOTGUILE/bin/guile -e main -s $EBROOTGUILE/bin/guile-config"'
+
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/l/libctl/libctl-3.2.1-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libctl/libctl-3.2.1-ictce-4.0.6.eb
index d079fb1e33f46c64f1ad0d84d67047360ad55cd2..f9f2863718f24500cbd6fab1b76a7639d5be2f24 100644
--- a/easybuild/easyconfigs/l/libctl/libctl-3.2.1-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/l/libctl/libctl-3.2.1-ictce-4.0.6.eb
@@ -12,4 +12,7 @@ sources = [SOURCELOWER_TAR_GZ]
 
 dependencies = [('guile', '1.8.8')]
 
+# fix for guile-config being broken because shebang line contains full path to bin/guile
+configopts = 'GUILE_CONFIG="$EBROOTGUILE/bin/guile -e main -s $EBROOTGUILE/bin/guile-config"'
+
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/l/libctl/libctl-3.2.1-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libctl/libctl-3.2.1-ictce-5.3.0.eb
index 32972e3ae5d873953b0dcc5a25af9092f13637ea..ff25be499bf8093be375ac1d360ebb168c509f9d 100644
--- a/easybuild/easyconfigs/l/libctl/libctl-3.2.1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libctl/libctl-3.2.1-ictce-5.3.0.eb
@@ -4,13 +4,15 @@ version = '3.2.1'
 homepage = 'http://ab-initio.mit.edu/libctl'
 description = """libctl is a free Guile-based library implementing flexible control files for scientific simulations."""
 
-
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 toolchainopts = {'optarch': True}
 
 source_urls = ['http://ab-initio.mit.edu/libctl/']
-sources = ['%s-%s.tar.gz' % (name.lower(), version)]
+sources = [SOURCELOWER_TAR_GZ]
 
 dependencies = [('guile', '1.8.8')]
 
+# fix for guile-config being broken because shebang line contains full path to bin/guile
+configopts = 'GUILE_CONFIG="$EBROOTGUILE/bin/guile -e main -s $EBROOTGUILE/bin/guile-config"'
+
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-4.0.6.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8f8f4182b767cfe2f29d27e89e0ec693133b2828
--- /dev/null
+++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-4.0.6.eb
@@ -0,0 +1,23 @@
+name = 'libffi'
+version = '3.0.13'
+
+homepage = 'http://sourceware.org/libffi/'
+description = """The libffi library provides a portable, high level programming interface to various calling
+conventions. This allows a programmer to call any function specified by a call interface description at run-time."""
+
+toolchain = {'name': 'ictce', 'version': '4.0.6'}
+
+source_urls = [
+    'ftp://sourceware.org/pub/libffi/',
+    'http://www.mirrorservice.org/sites/sourceware.org/pub/libffi/',
+]
+sources = [SOURCELOWER_TAR_GZ]
+
+patches = ['libffi-%(version)s_include-xmmintrin.patch']
+
+sanity_check_paths = {
+    'files': ['lib/libffi.%s' % SHLIB_EXT, 'lib/libffi.a'],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libidn/libidn-1.27-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libidn/libidn-1.27-goalf-1.1.0-no-OFED.eb
index c6b02f870ff422f2f8fa02b3e98fe0dc145cf651..0d0a354c13769a2f5117041da418b6c6fb249a70 100644
--- a/easybuild/easyconfigs/l/libidn/libidn-1.27-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/l/libidn/libidn-1.27-goalf-1.1.0-no-OFED.eb
@@ -7,7 +7,7 @@ Libidn's purpose is to encode and decode internationalized domain names."""
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
-source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s']
+source_urls = [GNU_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libidn/libidn-1.27-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libidn/libidn-1.27-goolf-1.4.10.eb
index befb705dc85da73a1d038a5790baa4fb583b6f68..ce8871841a485c5835d0ad8d744cc879f6d92a41 100644
--- a/easybuild/easyconfigs/l/libidn/libidn-1.27-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libidn/libidn-1.27-goolf-1.4.10.eb
@@ -7,7 +7,7 @@ Libidn's purpose is to encode and decode internationalized domain names."""
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s']
+source_urls = [GNU_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libidn/libidn-1.27-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libidn/libidn-1.27-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..cc1ae261870469d707fb48193609d8334edf041c
--- /dev/null
+++ b/easybuild/easyconfigs/l/libidn/libidn-1.27-ictce-5.3.0.eb
@@ -0,0 +1,13 @@
+name = 'libidn'
+version = '1.27'
+
+homepage = 'http://www.gnu.org/software/libidn'
+description = """GNU Libidn is a fully documented implementation of the Stringprep, Punycode and IDNA specifications.
+Libidn's purpose is to encode and decode internationalized domain names."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s']
+sources = [SOURCELOWER_TAR_GZ]
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.0-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.0-ictce-4.1.13.eb
new file mode 100644
index 0000000000000000000000000000000000000000..60866e8337594ac970a18c62ae18f4d3f38a417e
--- /dev/null
+++ b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.0-ictce-4.1.13.eb
@@ -0,0 +1,22 @@
+name = 'libjpeg-turbo'
+version = '1.3.0'
+
+homepage = 'http://sourceforge.net/libjpeg-turbo/'
+description = """libjpeg-turbo is a fork of the original IJG libjpeg which uses SIMD to accelerate baseline JPEG 
+compression and decompression. libjpeg is a library that implements JPEG image encoding, decoding and transcoding.
+"""
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+toolchainopts = {'pic': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('NASM', '2.07'),
+]
+
+configopts = "--with-jpeg8"
+runtest = "test"
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-goalf-1.1.0-no-OFED.eb
index dd04511798448bc3fd3cf1b6f17d33110639ef95..2ad36b3352907bb01393c7fd1431e76aadc2fbe7 100644
--- a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-goalf-1.1.0-no-OFED.eb
@@ -5,24 +5,27 @@ homepage = 'http://www.gnu.org/software/libmatheval/'
 description = """GNU libmatheval is a library (callable from C and Fortran) to parse
  and evaluate symbolic expressions input as text."""
 
-source_urls  = ['http://ftp.gnu.org/gnu/libmatheval/']
+source_urls = [GNU_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 toolchainopts = {'pic': True}
 
 dependencies = [
-                ('flex', '2.5.35'),
-                ('Bison', '2.5'),
-                ('byacc', '20120526'),
-                ('guile', '1.8.8'),
-               ]
+    ('flex', '2.5.35'),
+    ('Bison', '2.5'),
+    ('byacc', '20120526'),
+    ('guile', '1.8.8'),
+]
 
-configopts = '--with-pic'
+configopts = '--with-pic '
+
+# fix for guile-config being broken because shebang line contains full path to bin/guile
+configopts += 'GUILE_CONFIG="$EBROOTGUILE/bin/guile -e main -s $EBROOTGUILE/bin/guile-config"'
 
 sanity_check_paths = {
-                      'files': ['lib/libmatheval.a', 'include/matheval.h'],
-                      'dirs': []
-                     }
+    'files': ['lib/libmatheval.a', 'include/matheval.h'],
+    'dirs': [],
+}
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-goolf-1.4.10.eb
index b24bc59f04522ab6aa4ab7d6f0a1147b3d73eb5c..872932fd489ca69e6e3d036524e5b8eef93851b9 100644
--- a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-goolf-1.4.10.eb
@@ -5,24 +5,27 @@ homepage = 'http://www.gnu.org/software/libmatheval/'
 description = """GNU libmatheval is a library (callable from C and Fortran) to parse
  and evaluate symbolic expressions input as text."""
 
-source_urls  = ['http://ftp.gnu.org/gnu/libmatheval/']
+source_urls = [GNU_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'pic': True}
 
 dependencies = [
-                ('flex', '2.5.35'),
-                ('Bison', '2.5'),
-                ('byacc', '20120526'),
-                ('guile', '1.8.8'),
-               ]
+    ('flex', '2.5.35'),
+    ('Bison', '2.5'),
+    ('byacc', '20120526'),
+    ('guile', '1.8.8'),
+]
 
-configopts = '--with-pic'
+configopts = '--with-pic '
+
+# fix for guile-config being broken because shebang line contains full path to bin/guile
+configopts += 'GUILE_CONFIG="$EBROOTGUILE/bin/guile -e main -s $EBROOTGUILE/bin/guile-config"'
 
 sanity_check_paths = {
-                      'files': ['lib/libmatheval.a', 'include/matheval.h'],
-                      'dirs': []
-                     }
+    'files': ['lib/libmatheval.a', 'include/matheval.h'],
+    'dirs': [],
+}
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-4.0.6.eb
index 7b46f2830c942603f09dd0501de12bfebcdd39bd..fe87afca3e080d8593a445ad013dec5069f65711 100644
--- a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-4.0.6.eb
@@ -5,24 +5,27 @@ homepage = 'http://www.gnu.org/software/libmatheval/'
 description = """GNU libmatheval is a library (callable from C and Fortran) to parse
  and evaluate symbolic expressions input as text."""
 
-source_urls  = ['http://ftp.gnu.org/gnu/libmatheval/']
+source_urls = [GNU_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
 toolchainopts = {'pic': True}
 
 dependencies = [
-                ('flex', '2.5.35'),
-                ('Bison', '2.5'),
-                ('byacc', '20120526'),
-                ('guile', '1.8.8'),
-               ]
+    ('flex', '2.5.35'),
+    ('Bison', '2.5'),
+    ('byacc', '20120526'),
+    ('guile', '1.8.8'),
+]
 
-configopts = '--with-pic'
+configopts = '--with-pic '
+
+# fix for guile-config being broken because shebang line contains full path to bin/guile
+configopts += 'GUILE_CONFIG="$EBROOTGUILE/bin/guile -e main -s $EBROOTGUILE/bin/guile-config"'
 
 sanity_check_paths = {
-                      'files': ['lib/libmatheval.a', 'include/matheval.h'],
-                      'dirs': []
-                     }
+    'files': ['lib/libmatheval.a', 'include/matheval.h'],
+    'dirs': [],
+}
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-5.3.0.eb
index c3709d8e785484bcd6d3db3277e12aa6e7ebf8a7..f0147955d46beed95bbd459bb669970d15adff29 100644
--- a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-5.3.0.eb
@@ -5,25 +5,27 @@ homepage = 'http://www.gnu.org/software/libmatheval/'
 description = """GNU libmatheval is a library (callable from C and Fortran) to parse
  and evaluate symbolic expressions input as text."""
 
-source_urls  = ['http://ftp.gnu.org/gnu/libmatheval/']
-sources = ['%s-%s.tar.gz' % (name.lower(), version)]
-
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 toolchainopts = {'pic': True}
 
 dependencies = [
-                ('flex', '2.5.35'),
-                ('Bison', '2.5'),
-                ('byacc', '20120526'),
-                ('guile', '1.8.8'),
-               ]
+    ('flex', '2.5.35'),
+    ('Bison', '2.5'),
+    ('byacc', '20120526'),
+    ('guile', '1.8.8'),
+]
+
+configopts = '--with-pic '
 
-configopts = '--with-pic'
+# fix for guile-config being broken because shebang line contains full path to bin/guile
+configopts += 'GUILE_CONFIG="$EBROOTGUILE/bin/guile -e main -s $EBROOTGUILE/bin/guile-config"'
 
 sanity_check_paths = {
-                      'files': ['lib/libmatheval.a', 'include/matheval.h'],
-                      'dirs': []
-                     }
+    'files': ['lib/libmatheval.a', 'include/matheval.h'],
+    'dirs': [],
+}
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.5.14-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libpng/libpng-1.5.14-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4ef2e44f4ac813cda8e1892a17671f71cf61ebdf
--- /dev/null
+++ b/easybuild/easyconfigs/l/libpng/libpng-1.5.14-ictce-5.3.0.eb
@@ -0,0 +1,22 @@
+name = 'libpng'
+version = '1.5.14'
+
+homepage = 'http://www.libpng.org/pub/png/libpng.html'
+description = "libpng is the official PNG reference library"
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+toolchainopts = {'optarch': True}
+configopts = "--with-pic"
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('zlib', '1.2.7')]
+
+sanity_check_paths = {
+    'files': ['bin/libpng-config', 'lib/libpng.a', 'lib/libpng.so', 'lib/pkgconfig/libpng.pc'],
+    'dirs': ['include'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.6.3-ictce-5.3.0-zlib-1.2.8.eb b/easybuild/easyconfigs/l/libpng/libpng-1.6.3-ictce-5.3.0-zlib-1.2.8.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fb9f32baf920e97d51c596f409221cbbe0deaf36
--- /dev/null
+++ b/easybuild/easyconfigs/l/libpng/libpng-1.6.3-ictce-5.3.0-zlib-1.2.8.eb
@@ -0,0 +1,19 @@
+name = 'libpng'
+version = '1.6.3'
+
+homepage = 'http://www.libpng.org/pub/png/libpng.html'
+description = "libpng is the official PNG reference library"
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'optarch': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+zlibver = '1.2.8'
+versionsuffix = '-zlib-%s' % zlibver
+dependencies = [('zlib', zlibver)]
+
+configopts = "--with-pic"
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.6.3-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libpng/libpng-1.6.3-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2701d0d2b6db67b97d434e5c4986c8f5aafefad6
--- /dev/null
+++ b/easybuild/easyconfigs/l/libpng/libpng-1.6.3-ictce-5.3.0.eb
@@ -0,0 +1,17 @@
+name = 'libpng'
+version = '1.6.3'
+
+homepage = 'http://www.libpng.org/pub/png/libpng.html'
+description = "libpng is the official PNG reference library"
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'optarch': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('zlib', '1.2.7')]
+
+configopts = "--with-pic"
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.6.9-ictce-5.5.0.eb b/easybuild/easyconfigs/l/libpng/libpng-1.6.9-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..37cc1311ee1eeec6cebc66321af7f08a3a8a04fc
--- /dev/null
+++ b/easybuild/easyconfigs/l/libpng/libpng-1.6.9-ictce-5.5.0.eb
@@ -0,0 +1,17 @@
+name = 'libpng'
+version = '1.6.9'
+
+homepage = 'http://www.libpng.org/pub/png/libpng.html'
+description = "libpng is the official PNG reference library"
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'pic': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('zlib', '1.2.7')]
+
+configopts = "--with-pic"
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmpolf-1.1.6.eb
index 890fe517c0d821e59c8315583250045ae311da02..ea86f441106b5d3ad2aa44962ef57e848d556119 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmpolf-1.1.6.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmpolf-1.1.6.eb
@@ -8,9 +8,10 @@ description = """The GNU Readline library provides a set of functions for use by
  to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands."""
 
 toolchain = {'name': 'cgmpolf', 'version': '1.1.6'}
+toolchainopts = {'pic': True}
 
 sources = ['readline-%(version)s.tar.gz']
-source_urls = ['http://ftpmirror.gnu.org/readline/']
+source_urls = ['http://ftp.gnu.org/gnu/readline']
 
 dependencies = [('ncurses', '5.9-20130406')]
 
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.1.12rc1.eb
index 388a3e580b9ef33c9d30a2d4daacdedab74a703b..845fa3e7fac54d14daa41d7f93aba3339bf4ac95 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.1.12rc1.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.1.12rc1.eb
@@ -8,9 +8,10 @@ description = """The GNU Readline library provides a set of functions for use by
  to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands."""
 
 toolchain = {'name': 'cgmvolf', 'version': '1.1.12rc1'}
+toolchainopts = {'pic': True}
 
 sources = ['readline-%(version)s.tar.gz']
-source_urls = ['http://ftpmirror.gnu.org/readline/']
+source_urls = ['http://ftp.gnu.org/gnu/readline']
 
 dependencies = [('ncurses', '5.9-20130406')]
 
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.2.7.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.2.7.eb
index ba6d6b6505c090ba8064a1a62f2ffbd7500d5081..49c0baecf1648679db8ff5399f146afabe0baebd 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.2.7.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.2.7.eb
@@ -8,9 +8,10 @@ additional functions to maintain a list of previously-entered command lines, to
 and perform csh-like history expansion on previous commands."""
 
 toolchain = {'name': 'cgmvolf', 'version': '1.2.7'}
+toolchainopts = {'pic': True}
 
 sources = ['readline-%(version)s.tar.gz']
-source_urls = ['http://ftpmirror.gnu.org/readline']
+source_urls = ['http://ftp.gnu.org/gnu/readline']
 
 dependencies = [
     ('ncurses', '5.9-20130406'),
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgoolf-1.1.7.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgoolf-1.1.7.eb
index 497a7d18be0adb6e60bb8fbf47243626d82b26fc..07ea263092615f53176d2eee063873d159ba63f0 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgoolf-1.1.7.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgoolf-1.1.7.eb
@@ -8,9 +8,10 @@ description = """The GNU Readline library provides a set of functions for use by
  to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands."""
 
 toolchain = {'name': 'cgoolf', 'version': '1.1.7'}
+toolchainopts = {'pic': True}
 
 sources = ['readline-%(version)s.tar.gz']
-source_urls = ['http://ftpmirror.gnu.org/readline/']
+source_urls = ['http://ftp.gnu.org/gnu/readline']
 
 dependencies = [('ncurses', '5.9-20130406')]
 
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb
index d664c36f040b513a5c09a5c0e93b97b26b0aed96..aaa76f5f77fd6eb13e6411ca819de7c560047897 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb
@@ -8,9 +8,10 @@ description = """The GNU Readline library provides a set of functions for use by
  to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands."""
 
 toolchain = {'name': 'gmpolf', 'version': '1.4.8'}
+toolchainopts = {'pic': True}
 
 sources = ['readline-%(version)s.tar.gz']
-source_urls = ['http://ftpmirror.gnu.org/readline/']
+source_urls = ['http://ftp.gnu.org/gnu/readline']
 
 dependencies = [('ncurses', '5.9')]
 
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12.eb
index 7f81da5c1fccefd7b9319b72edf3d92e8646d082..fcb196f792b5bf8cca52eed6d352e665819e4375 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12.eb
@@ -8,9 +8,10 @@ additional functions to maintain a list of previously-entered command lines, to
 and perform csh-like history expansion on previous commands."""
 
 toolchain = {'name': 'gmvolf', 'version': '1.7.12'}
+toolchainopts = {'pic': True}
 
 sources = ['readline-%(version)s.tar.gz']
-source_urls = ['http://ftpmirror.gnu.org/readline']
+source_urls = ['http://ftp.gnu.org/gnu/readline']
 
 dependencies = [('ncurses', '5.9-20130406')]
 
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12rc1.eb
index b157f2cf2104000747f3e41aec12e4e662aacfa5..e0e2d5c7fa9ff42d9a423bb45a35791e69f3934b 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12rc1.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12rc1.eb
@@ -8,9 +8,10 @@ description = """The GNU Readline library provides a set of functions for use by
  to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands."""
 
 toolchain = {'name': 'gmvolf', 'version': '1.7.12rc1'}
+toolchainopts = {'pic': True}
 
 sources = ['readline-%(version)s.tar.gz']
-source_urls = ['http://ftpmirror.gnu.org/readline/']
+source_urls = ['http://ftp.gnu.org/gnu/readline']
 
 dependencies = [('ncurses', '5.9-20130406')]
 
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb
index 19e8a88ef46fb58895df6b76e0c0383ad3eada3d..066765bca3b0f21eb3721b938b03d72813049308 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb
@@ -8,9 +8,10 @@ description = """The GNU Readline library provides a set of functions for use by
  to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands."""
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
+toolchainopts = {'pic': True}
 
 sources = ['readline-%(version)s.tar.gz']
-source_urls = ['http://ftpmirror.gnu.org/readline/']
+source_urls = ['http://ftp.gnu.org/gnu/readline']
 
 dependencies = [('ncurses', '5.9')]
 
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb
index 641658be88a9ab9d0d1e46b4a734be00ee4b64a3..146a8e99445bb933a0e7693bc28e340be6fed3d2 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb
@@ -8,9 +8,10 @@ description = """The GNU Readline library provides a set of functions for use by
  to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands."""
 
 toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'}
+toolchainopts = {'pic': True}
 
 sources = ['readline-%(version)s.tar.gz']
-source_urls = ['http://ftpmirror.gnu.org/readline/']
+source_urls = ['http://ftp.gnu.org/gnu/readline']
 
 dependencies = [('ncurses', '5.9')]
 
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb
index 30f278107ccf3eee60f2fd1d7eebba9a1cf83f9e..db9397866dc0c1e652330f167d508ec557fb588a 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb
@@ -8,9 +8,10 @@ description = """The GNU Readline library provides a set of functions for use by
  to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands."""
 
 toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'}
+toolchainopts = {'pic': True}
 
 sources = ['readline-%(version)s.tar.gz']
-source_urls = ['http://ftpmirror.gnu.org/readline/']
+source_urls = ['http://ftp.gnu.org/gnu/readline']
 
 dependencies = [('ncurses', '5.9')]
 
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.4.10.eb
index 5b76aa7d0eb4b51dd0414cab5bd185fd96ba4c10..e835cd63d6c135737fe392e0983686906256c488 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.4.10.eb
@@ -8,9 +8,10 @@ description = """The GNU Readline library provides a set of functions for use by
  to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands."""
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
+toolchainopts = {'pic': True}
 
 sources = ['readline-%(version)s.tar.gz']
-source_urls = ['http://ftpmirror.gnu.org/readline/']
+source_urls = ['http://ftp.gnu.org/gnu/readline']
 
 dependencies = [('ncurses', '5.9')]
 
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.10.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.10.eb
index 54747712bc9678d1a37a23d165d09204686abe18..7a1a0c8b8b308371aef91c68d65542414621410c 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.10.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.10.eb
@@ -8,9 +8,10 @@ description = """The GNU Readline library provides a set of functions for use by
  to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands."""
 
 toolchain = {'name': 'ictce', 'version': '4.0.10'}
+toolchainopts = {'pic': True}
 
 sources = ['readline-%(version)s.tar.gz']
-source_urls = ['http://ftpmirror.gnu.org/readline/']
+source_urls = ['http://ftp.gnu.org/gnu/readline']
 
 dependencies = [('ncurses', '5.9')]
 
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.6.eb
index 14784ff7b9dc546082107186eca4d01ca811dc53..7cbbcd5ae794a6dd60bc0e7538b0ae1c25c9446f 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.6.eb
@@ -8,9 +8,10 @@ description = """The GNU Readline library provides a set of functions for use by
  to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands."""
 
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
+toolchainopts = {'pic': True}
 
 sources = ['readline-%(version)s.tar.gz']
-source_urls = ['http://ftpmirror.gnu.org/readline/']
+source_urls = ['http://ftp.gnu.org/gnu/readline']
 
 dependencies = [('ncurses', '5.9')]
 
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.1.13.eb
index d2bc153da57c6520367b4d63b3b7f421a72ff1f8..af015cd665190df8b0e9f37fa0d3adfecd2da0d0 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.1.13.eb
@@ -8,9 +8,10 @@ description = """The GNU Readline library provides a set of functions for use by
  to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands."""
 
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
+toolchainopts = {'pic': True}
 
 sources = ['readline-%(version)s.tar.gz']
-source_urls = ['http://ftpmirror.gnu.org/readline/']
+source_urls = ['http://ftp.gnu.org/gnu/readline']
 
 dependencies = [('ncurses', '5.9')]
 
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.2.0.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.2.0.eb
index 7b174c8d4d2445668cea3418426fcf649655e6da..169a857dc2c376ec08076c1a993e52dacfe1bf42 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.2.0.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.2.0.eb
@@ -8,15 +8,18 @@ The Readline library includes additional functions to maintain a list of previou
 to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands."""
 
 toolchain = {'name': 'ictce', 'version' : '5.2.0'}
+toolchainopts = {'pic': True}
 
-sources = ['readline-%s.tar.gz' % version]
-source_urls = ['http://ftpmirror.gnu.org/readline/']
+sources = ['readline-%(version)s.tar.gz']
+source_urls = ['http://ftp.gnu.org/gnu/readline']
+
+dependencies = [('ncurses', '5.9')]
 
 sanity_check_paths = {
-                      'files' : ['lib/libreadline.a', 'lib/libhistory.a'] + ['include/readline/%s' % x for x in ['chardefs.h', 'history.h',
-                                                                                                                 'keymaps.h', 'readline.h',
-                                                                                                                 'rlconf.h', 'rlstdc.h',
-                                                                                                                 'rltypedefs.h', 'tilde.h']],
-                      'dirs' : []
-                     }
+    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
+              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs' : [],
+}
 
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.3.0.eb
index d309434705907313d54dbd7d63f15ae9e2248d84..af7f561821231be95e2228bf78dc94637889abbd 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.3.0.eb
@@ -8,9 +8,10 @@ description = """The GNU Readline library provides a set of functions for use by
  to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands."""
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'pic': True}
 
 sources = ['readline-%(version)s.tar.gz']
-source_urls = ['http://ftpmirror.gnu.org/readline/']
+source_urls = ['http://ftp.gnu.org/gnu/readline']
 
 dependencies = [('ncurses', '5.9')]
 
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.5.0.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.5.0.eb
index f2d1625f9bc6bceff0cc3dccdef11fda14b02aad..1c9a199f1b72067da25c8acc8081feeea20ff328 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.5.0.eb
@@ -8,9 +8,10 @@ description = """The GNU Readline library provides a set of functions for use by
  to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands."""
 
 toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'pic': True}
 
 sources = ['readline-%(version)s.tar.gz']
-source_urls = ['http://ftpmirror.gnu.org/readline/']
+source_urls = ['http://ftp.gnu.org/gnu/readline']
 
 dependencies = [('ncurses', '5.9')]
 
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iomkl-4.6.13.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iomkl-4.6.13.eb
index 7f487221c1ceaa663bc3c995a859618190264e8f..ac364c1247640f46b872675b66a57f99968247e6 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iomkl-4.6.13.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iomkl-4.6.13.eb
@@ -8,9 +8,10 @@ description = """The GNU Readline library provides a set of functions for use by
  to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands."""
 
 toolchain = {'name': 'iomkl', 'version': '4.6.13'}
+toolchainopts = {'pic': True}
 
 sources = ['readline-%(version)s.tar.gz']
-source_urls = ['http://ftpmirror.gnu.org/readline/']
+source_urls = ['http://ftp.gnu.org/gnu/readline']
 
 dependencies = [('ncurses', '5.9')]
 
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-3.7.3.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-3.7.3.eb
index d46fc3ce87f26f19bd859914468a687f6a16fa00..446d0f52d7691676449b735104a4a9b928fb418c 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-3.7.3.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-3.7.3.eb
@@ -8,9 +8,10 @@ description = """The GNU Readline library provides a set of functions for use by
  to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands."""
 
 toolchain = {'name': 'iqacml', 'version': '3.7.3'}
+toolchainopts = {'pic': True}
 
 sources = ['readline-%(version)s.tar.gz']
-source_urls = ['http://ftpmirror.gnu.org/readline/']
+source_urls = ['http://ftp.gnu.org/gnu/readline']
 
 dependencies = [('ncurses', '5.9')]
 
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-4.4.13.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-4.4.13.eb
index e96333ad7adc3c780af6ac50d7fcd61e109928b6..4833ff1469b0aba88caf689e34a076ca1d7346f2 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-4.4.13.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-4.4.13.eb
@@ -8,9 +8,10 @@ description = """The GNU Readline library provides a set of functions for use by
  to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands."""
 
 toolchain = {'name': 'iqacml', 'version': '4.4.13'}
+toolchainopts = {'pic': True}
 
 sources = ['readline-%(version)s.tar.gz']
-source_urls = ['http://ftpmirror.gnu.org/readline/']
+source_urls = ['http://ftp.gnu.org/gnu/readline']
 
 dependencies = [('ncurses', '5.9')]
 
diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.2-goalf-1.1.0-no-OFED.eb
index 494ea997a386dc565df59442d741313831aabc0c..175e45137463f44cfa85d0d8902360c195fe3f15 100644
--- a/easybuild/easyconfigs/l/libtool/libtool-2.4.2-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.2-goalf-1.1.0-no-OFED.eb
@@ -8,6 +8,6 @@ description = """GNU libtool is a generic library support script. Libtool hides
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()]
+source_urls = [GNU_SOURCE]
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.2-goolf-1.4.10.eb
index 1b2d459320d5f7b8c457a50e04b2f54d5ee59ab3..f40fb3df887eb65f3ed1453cf1f2029702bc0265 100644
--- a/easybuild/easyconfigs/l/libtool/libtool-2.4.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.2-goolf-1.4.10.eb
@@ -7,6 +7,6 @@ behind a consistent, portable interface."""
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()]
+source_urls = [GNU_SOURCE]
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-4.0.6.eb
index 16e021b0190e7df56c68786966fcd2c10742f230..ff247a01fc60ada9618f1fb208e45ceab35fcd1e 100644
--- a/easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-4.0.6.eb
@@ -8,6 +8,6 @@ description = """GNU libtool is a generic library support script. Libtool hides
 toolchain = {'name': 'ictce', 'version' : '4.0.6'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()]
+source_urls = [GNU_SOURCE]
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-4.1.13.eb
index b8e328774bf383c647fb5754f3bbd108ee0cb121..5002055bd1f3bba79e5e8f3c29c5a14479ef54e2 100644
--- a/easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-4.1.13.eb
@@ -8,6 +8,6 @@ description = """GNU libtool is a generic library support script. Libtool hides
 toolchain = {'name': 'ictce', 'version' : '4.1.13'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()]
+source_urls = [GNU_SOURCE]
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-5.3.0.eb
index f8c23c30258e6bb1f91b15224d0dfa50238d2bf0..04bf2df64f4f635e5473c1aab0c8e1ae9dd69721 100644
--- a/easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-5.3.0.eb
@@ -9,6 +9,6 @@ description = """GNU libtool is a generic library support script. Libtool hides
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()]
+source_urls = [GNU_SOURCE]
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-goalf-1.1.0-no-OFED.eb
index 56bdff5bccd81b098c42da62cfdd51f20784d387..7c980a4ecf8395c3ba774eb9ee0259d516cd5def 100644
--- a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-goalf-1.1.0-no-OFED.eb
@@ -8,13 +8,15 @@ description = """This library provides functions for manipulating Unicode string
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()]
+source_urls = [GNU_SOURCE]
+
+parallel = 1
 
 sanity_check_paths = {
-                      'files' : ['lib/libunistring.a', 'lib/libunistring.so', 'include/unistring'] +
-                                ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm',
-                                                                  'stdio', 'str', 'types', 'wbrk', 'width']],
-                      'dirs' : [],
-                     }
+    'files' : ['lib/libunistring.a', 'lib/libunistring.so', 'include/unistring'] +
+              ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm',
+                                               'stdio', 'str', 'types', 'wbrk', 'width']],
+    'dirs' : [],
+}
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-goolf-1.4.10.eb
index 5a3efb3ea5a9355dc1fa919f7c6e0511dbccec50..ac85cc483414327efbff0d2d8ee3e74c08cfc10d 100644
--- a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-goolf-1.4.10.eb
@@ -7,13 +7,15 @@ according to the Unicode standard."""
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()]
+source_urls = [GNU_SOURCE]
+
+parallel = 1
 
 sanity_check_paths = {
-                      'files' : ['lib/libunistring.a', 'lib/libunistring.so', 'include/unistring'] +
-                                ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm',
-                                                                  'stdio', 'str', 'types', 'wbrk', 'width']],
-                      'dirs' : [],
-                     }
+    'files' : ['lib/libunistring.a', 'lib/libunistring.so', 'include/unistring'] +
+              ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm',
+                                               'stdio', 'str', 'types', 'wbrk', 'width']],
+    'dirs' : [],
+}
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-ictce-4.0.6.eb
index dec6140666e970d8a3d7e8a72d9cd5f87530ff8f..60198552d3dd499f46ac785f1e0f980184cd01ac 100644
--- a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-ictce-4.0.6.eb
@@ -8,15 +8,17 @@ description = """This library provides functions for manipulating Unicode string
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()]
+source_urls = [GNU_SOURCE]
 
 patches = ['libunistring_icc_builtin_nan-inf.patch']
 
+parallel = 1
+
 sanity_check_paths = {
-                      'files' : ['lib/libunistring.a', 'lib/libunistring.so', 'include/unistring'] + 
-                                ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm',
-                                                                 'stdio', 'str', 'types', 'wbrk', 'width']],
-                      'dirs' : [],
-                     }
+    'files' : ['lib/libunistring.a', 'lib/libunistring.so', 'include/unistring'] +
+              ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm',
+                                               'stdio', 'str', 'types', 'wbrk', 'width']],
+    'dirs' : [],
+}
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-ictce-5.3.0.eb
index 6c3d6347d8efbbd9b55611d68aa72ae0800c0e41..638d735185167c74f73e3bae00e64f469e3872aa 100644
--- a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-ictce-5.3.0.eb
@@ -5,19 +5,20 @@ homepage = 'http://www.gnu.org/software/libunistring/'
 description = """This library provides functions for manipulating Unicode strings and for manipulating C strings
  according to the Unicode standard."""
 
-
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/%s' % name.lower()]
+source_urls = [GNU_SOURCE]
 
 patches = ['libunistring_icc_builtin_nan-inf.patch']
 
+parallel = 1
+
 sanity_check_paths = {
-                      'files' : ['lib/libunistring.a', 'lib/libunistring.so', 'include/unistring'] + 
-                                ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm',
-                                                                 'stdio', 'str', 'types', 'wbrk', 'width']],
-                      'dirs' : [],
-                     }
+    'files' : ['lib/libunistring.a', 'lib/libunistring.so', 'include/unistring'] +
+              ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm',
+                                               'stdio', 'str', 'types', 'wbrk', 'width']],
+    'dirs' : [],
+}
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libunwind/libunwind-1.1-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libunwind/libunwind-1.1-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..df2b6201e1711d21883394b6dfbfe2d91344c1ea
--- /dev/null
+++ b/easybuild/easyconfigs/l/libunwind/libunwind-1.1-goolf-1.4.10.eb
@@ -0,0 +1,21 @@
+name = "libunwind"
+version = "1.1"
+
+homepage = 'http://www.nongnu.org/libunwind/'
+description = """The primary goal of libunwind is to define a portable and efficient C programming interface
+ (API) to determine the call-chain of a program. The API additionally provides the means to manipulate the
+ preserved (callee-saved) state of each call-frame and to resume execution at any point in the call-chain
+ (non-local goto). The API supports both local (same-process) and remote (across-process) operation.
+ As such, the API is useful in a number of applications"""
+
+toolchain = {'version': '1.4.10', 'name': 'goolf'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [GNU_SAVANNAH_SOURCE]
+
+sanity_check_paths = {
+    'files': ["include/libunwind.h", "lib/libunwind.%s" % SHLIB_EXT],
+    'dirs': []
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libunwind/libunwind-1.1-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libunwind/libunwind-1.1-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d3931fac837ce47ccab75ed85109d6bee8b4d6c8
--- /dev/null
+++ b/easybuild/easyconfigs/l/libunwind/libunwind-1.1-ictce-5.3.0.eb
@@ -0,0 +1,21 @@
+name = "libunwind"
+version = "1.1"
+
+homepage = 'http://www.nongnu.org/libunwind/'
+description = """The primary goal of libunwind is to define a portable and efficient C programming interface
+ (API) to determine the call-chain of a program. The API additionally provides the means to manipulate the
+ preserved (callee-saved) state of each call-frame and to resume execution at any point in the call-chain
+ (non-local goto). The API supports both local (same-process) and remote (across-process) operation.
+ As such, the API is useful in a number of applications"""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [GNU_SAVANNAH_SOURCE]
+
+sanity_check_paths = {
+    'files': ["include/libunwind.h", "lib/libunwind.%s" % SHLIB_EXT],
+    'dirs': []
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libxc/libxc-2.0.1-ictce-5.5.0.eb b/easybuild/easyconfigs/l/libxc/libxc-2.0.1-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7b83d19f9ba0c8c32e1593cb2518f2bd2f2d713d
--- /dev/null
+++ b/easybuild/easyconfigs/l/libxc/libxc-2.0.1-ictce-5.5.0.eb
@@ -0,0 +1,31 @@
+name = 'libxc'
+version = '2.0.1'
+
+homepage = 'http://www.tddft.org/programs/octopus/wiki/index.php/Libxc'
+description = """Libxc is a library of exchange-correlation functionals for density-functional theory.
+ The aim is to provide a portable, well tested and reliable set of exchange and correlation functionals."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'opt': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://www.tddft.org/programs/octopus/down.php?file=libxc/']
+
+configopts = 'FC="$F77" FCFLAGS="$FFLAGS" FCCPP="$F77 -E" --enable-shared'
+
+# From the libxc mailing list
+# To summarize: expect less tests to fail in libxc 2.0.2, but don't expect
+# a fully working testsuite soon (unless someone wants to volunteer to do
+# it, of course  ) In the meantime, unless the majority of the tests
+# fail, your build should be fine.
+#runtest = 'check'
+
+sanity_check_paths = {
+    'files': ['lib/libxc.a', 'lib/libxc.so'],
+    'dirs': ['include'],
+}
+
+parallel = 1
+
+moduleclass = 'chem'
+
diff --git a/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-5.3.0-pinomp.eb b/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-5.3.0-pinomp.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3561d3e5e5937aa33d3f78e0334275685273ddef
--- /dev/null
+++ b/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-5.3.0-pinomp.eb
@@ -0,0 +1,27 @@
+name = 'likwid'
+version = '3.0.0'
+versionsuffix = '-pinomp'
+
+homepage = 'http://code.google.com/p/likwid/'
+description = """Likwid stands for Like I knew what I am doing. This project contributes easy to use
+ command line tools for Linux to support programmers in developing high performance multi threaded programs."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [GOOGLECODE_SOURCE]
+
+patches = ['pinomp-pthread-overload.patch']
+
+skipsteps = ['configure']
+makeopts='CC="$CC" CFLAGS="$CFLAGS"'
+installopts = 'PREFIX=%(installdir)s'
+
+sanity_check_paths = {
+    'files': ["bin/likwid-features", "bin/likwid-memsweeper", "bin/likwid-mpirun", "bin/likwid-perfctr",
+              "bin/likwid-perfscope", "bin/likwid-pin", "bin/likwid-powermeter", "bin/likwid-topology",
+              "lib/liblikwidpin.so", "lib/liblikwid.a"],
+    'dirs': ["man/man1"]
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-5.3.0.eb b/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b3687e8cbaad24b0b03592cc6dbce8b06d813887
--- /dev/null
+++ b/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-5.3.0.eb
@@ -0,0 +1,24 @@
+name = 'likwid'
+version = '3.0.0'
+
+homepage = 'http://code.google.com/p/likwid/'
+description = """Likwid stands for Like I knew what I am doing. This project contributes easy to use
+ command line tools for Linux to support programmers in developing high performance multi threaded programs."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [GOOGLECODE_SOURCE]
+
+skipsteps = ['configure']
+makeopts='CC="$CC" CFLAGS="$CFLAGS"'
+installopts = 'PREFIX=%(installdir)s'
+
+sanity_check_paths = {
+    'files': ["bin/likwid-features", "bin/likwid-memsweeper", "bin/likwid-mpirun", "bin/likwid-perfctr",
+              "bin/likwid-perfscope", "bin/likwid-pin", "bin/likwid-powermeter", "bin/likwid-topology",
+              "lib/liblikwidpin.so", "lib/liblikwid.a"],
+    'dirs': ["man/man1"]
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/l/lxml/lxml-3.1.2-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/l/lxml/lxml-3.1.2-goolf-1.4.10-Python-2.7.3.eb
index dea6e016af9d81a0a83a7f14156906f9a1c6436f..7ab203990ea20523b3f046806062e2dac7027fc8 100644
--- a/easybuild/easyconfigs/l/lxml/lxml-3.1.2-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/l/lxml/lxml-3.1.2-goolf-1.4.10-Python-2.7.3.eb
@@ -9,7 +9,7 @@ description = """The lxml XML toolkit is a Pythonic binding for the C libraries
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 source_urls = ['http://lxml.de/files/']
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
 
 python = 'Python'
 pythonversion = '2.7.3'
diff --git a/easybuild/easyconfigs/l/lxml/lxml-3.1.2-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/l/lxml/lxml-3.1.2-ictce-5.3.0-Python-2.7.3.eb
index ada05f00c34f1a74af7cc2ac24a8d0742a372537..7c17d469552b5b08393e96c9bbdc26ee5a7b8676 100644
--- a/easybuild/easyconfigs/l/lxml/lxml-3.1.2-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/l/lxml/lxml-3.1.2-ictce-5.3.0-Python-2.7.3.eb
@@ -9,7 +9,7 @@ description = """The lxml XML toolkit is a Pythonic binding for the C libraries
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 source_urls = ['http://lxml.de/files/']
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
 
 python = 'Python'
 pythonversion = '2.7.3'
diff --git a/easybuild/easyconfigs/l/lynx/lynx-2.8.7-ictce-5.3.0.eb b/easybuild/easyconfigs/l/lynx/lynx-2.8.7-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8935b8374fc4a9a3d704d6c599d6fe15b1297d69
--- /dev/null
+++ b/easybuild/easyconfigs/l/lynx/lynx-2.8.7-ictce-5.3.0.eb
@@ -0,0 +1,17 @@
+name = 'lynx'
+version = '2.8.7'
+
+description = "lynx is an alphanumeric display oriented World-Wide Web Client"
+homepage = 'http://lynx.isc.org/'
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = ['http://lynx.isc.org/release/']
+sources = ['%(name)s%(version)s.tar.bz2']
+
+sanity_check_paths = {
+    'files': ['bin/lynx'],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-ClangGCC-1.1.3.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-ClangGCC-1.1.3.eb
index 286c9ae8c719877511a5385dada11cae730dada8..a48c5487adae5cf36c48cf01f4ae1a55d333db47 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.16-ClangGCC-1.1.3.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-ClangGCC-1.1.3.eb
@@ -11,7 +11,7 @@ GNU M4 also has built-in functions for including files, running shell commands,
 toolchain = {'name': 'ClangGCC', 'version': '1.1.3'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftpmirror.gnu.org/m4']
+source_urls = [GNU_SOURCE]
 
 patches = ['M4-%(version)s-no-gets.patch']
 
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-ClangGCC-1.2.3.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-ClangGCC-1.2.3.eb
index 5f1bea40767b96b58f7d0b3c4d35825bcf1518f2..9bf8740cc6a8213c1c0b6a196a5c2c40d7573945 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.16-ClangGCC-1.2.3.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-ClangGCC-1.2.3.eb
@@ -11,7 +11,9 @@ GNU M4 also has built-in functions for including files, running shell commands,
 toolchain = {'name': 'ClangGCC', 'version': '1.2.3'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftpmirror.gnu.org/m4']
+source_urls = [GNU_SOURCE]
+
+patches = ['M4-%(version)s-no-gets.patch']
 
 configopts = "--enable-cxx"
 
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.6.3.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.6.3.eb
index 264b599862971a3d4d75ccf6e168c2cf26db38a6..607e6bd0b58a6ae0b8460a92939a02ec75de700b 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.6.3.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.6.3.eb
@@ -11,7 +11,7 @@ GNU M4 also has built-in functions for including files, running shell commands,
 toolchain = {'name': 'GCC', 'version': '4.6.3'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftpmirror.gnu.org/m4']
+source_urls = [GNU_SOURCE]
 
 patches = ['M4-%(version)s-no-gets.patch']
 
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.7.2.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.7.2.eb
index 10a60472cd63ceeca4a2311cce1e733184e0b775..0560144686eb6cb9d6809f33b2a412a0f907c2fa 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.7.2.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.7.2.eb
@@ -11,7 +11,7 @@ GNU M4 also has built-in functions for including files, running shell commands,
 toolchain = {'name': 'GCC', 'version': '4.7.2'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftpmirror.gnu.org/m4']
+source_urls = [GNU_SOURCE]
 
 patches = ['M4-%(version)s-no-gets.patch']
 
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.7.3.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.7.3.eb
index c26aa03e7c7b493ebfe5f5c80d515af02af79eff..5bb719ac95b78f2765a27b756abe01e0f362a98e 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.7.3.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.7.3.eb
@@ -11,7 +11,7 @@ GNU M4 also has built-in functions for including files, running shell commands,
 toolchain = {'name': 'GCC', 'version': '4.7.3'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftpmirror.gnu.org/m4']
+source_urls = [GNU_SOURCE]
 
 patches = ['M4-%(version)s-no-gets.patch']
 
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.8.1.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.8.1.eb
index ddb33422fdd0cba65cfd3a806ab7b636024bf682..55cba29b685d39b42236ec28526dfcf4ac0c2e73 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.8.1.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.8.1.eb
@@ -11,7 +11,7 @@ GNU M4 also has built-in functions for including files, running shell commands,
 toolchain = {'name': 'GCC', 'version': '4.8.1'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftpmirror.gnu.org/m4']
+source_urls = [GNU_SOURCE]
 
 patches = ['M4-%(version)s-no-gets.patch']
 
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.8.2.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.8.2.eb
index 5f6973dba482e0d7026bcf3794b3fc96e5f21d62..b0ab4edf27ff7f852017ae843e49030a10280729 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.8.2.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-GCC-4.8.2.eb
@@ -10,7 +10,9 @@ description = """GNU M4 is an implementation of the traditional Unix macro proce
 toolchain = {'name': 'GCC', 'version': '4.8.2'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftpmirror.gnu.org/m4']
+source_urls = [GNU_SOURCE]
+
+patches = ['M4-%(version)s-no-gets.patch']
 
 configopts = "--enable-cxx"
 
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-gcccuda-2.6.10.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-gcccuda-2.6.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..68b005dc521189c5edb49390f132eead50e655e3
--- /dev/null
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-gcccuda-2.6.10.eb
@@ -0,0 +1,24 @@
+name = 'M4'
+version = '1.4.16'
+
+homepage = 'http://www.gnu.org/software/m4/m4.html'
+description = """GNU M4 is an implementation of the traditional Unix macro processor.
+ It is mostly SVR4 compatible although it has some extensions 
+ (for example, handling more than 9 positional parameters to macros).
+ GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc."""
+
+toolchain = {'name': 'gcccuda', 'version': '2.6.10'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://ftpmirror.gnu.org/m4']
+
+patches = ['M4-%(version)s-no-gets.patch']
+
+configopts = "--enable-cxx"
+
+sanity_check_paths = {
+    'files': ["bin/m4"],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-gmacml-1.7.0.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-gmacml-1.7.0.eb
index 8e168f546ed1ba4827f19c61e269ebb6d3166ae0..81a49cdbe3783dd3be76aba94824d8488c31d6cf 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.16-gmacml-1.7.0.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-gmacml-1.7.0.eb
@@ -10,7 +10,7 @@ description = """GNU M4 is an implementation of the traditional Unix macro proce
 toolchain = {'name': 'gmacml', 'version': '1.7.0'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftpmirror.gnu.org/m4']
+source_urls = [GNU_SOURCE]
 
 patches = ['M4-%(version)s-no-gets.patch']
 
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-goalf-1.1.0-no-OFED.eb
index 945533570d37426bc7c899071eb5269590e71863..410fbc75ce627f1ca7152cdad8e390ece4ef173e 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.16-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-goalf-1.1.0-no-OFED.eb
@@ -10,7 +10,7 @@ description = """GNU M4 is an implementation of the traditional Unix macro proce
 toolchain = {'name': 'goalf', 'version' : '1.1.0-no-OFED'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftpmirror.gnu.org/m4']
+source_urls = [GNU_SOURCE]
 
 patches = ['M4-%(version)s-no-gets.patch']
 
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-goolf-1.4.10.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-goolf-1.4.10.eb
index 60c923740ea8a7d2763ce56c82c2819a768e235e..d66d8b9e4e2c3e4e9ef56af60a08c3c45f0834dc 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.16-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-goolf-1.4.10.eb
@@ -11,7 +11,7 @@ GNU M4 also has built-in functions for including files, running shell commands,
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftpmirror.gnu.org/m4']
+source_urls = [GNU_SOURCE]
 
 patches = ['M4-%(version)s-no-gets.patch']
 
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-3.2.2.u3.eb
index b5c20dbd5dbbe36495083f3fa062bd72422e03ce..925e8c70e66bbbcb2fee1ab499c04fb7baf14edc 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-3.2.2.u3.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-3.2.2.u3.eb
@@ -9,7 +9,7 @@ description = """GNU M4 is an implementation of the traditional Unix macro proce
 toolchain = {'name': 'ictce', 'version': '3.2.2.u3'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftpmirror.gnu.org/m4']
+source_urls = [GNU_SOURCE]
 
 patches = ['M4-%(version)s-no-gets.patch']
 
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-4.0.6.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-4.0.6.eb
index 6953b94347bae20b397fa4bebf8801b09cd4bcb6..c344494bc39c21c817954cf65d238e6c7dc364ad 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-4.0.6.eb
@@ -9,7 +9,7 @@ description = """GNU M4 is an implementation of the traditional Unix macro proce
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftpmirror.gnu.org/m4']
+source_urls = [GNU_SOURCE]
 
 patches = ['M4-%(version)s-no-gets.patch']
 
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-4.1.13.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-4.1.13.eb
index c970130d7f237c40c0d386fc5e2b30e93fd4c263..3c8fbd6746fbce1a2101f87f7bc1f87820bda1ed 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-4.1.13.eb
@@ -9,7 +9,7 @@ description = """GNU M4 is an implementation of the traditional Unix macro proce
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftpmirror.gnu.org/m4']
+source_urls = [GNU_SOURCE]
 
 patches = ['M4-%(version)s-no-gets.patch']
 
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-5.3.0.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-5.3.0.eb
index 7b14418a3dad9f448806bb8cac44b19b39b92870..7915e22d2ee7e6f9c0ac1c04027b3ac6a6730c83 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-5.3.0.eb
@@ -10,7 +10,7 @@ description = """GNU M4 is an implementation of the traditional Unix macro proce
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftpmirror.gnu.org/m4']
+source_urls = [GNU_SOURCE]
 
 patches = ['M4-%(version)s-no-gets.patch']
 
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-5.5.0.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..07b38b035956ccd4024e1cfe667b4423d09f51b8
--- /dev/null
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-5.5.0.eb
@@ -0,0 +1,23 @@
+name = 'M4'
+version = '1.4.16'
+
+homepage = 'http://www.gnu.org/software/m4/m4.html'
+description = """GNU M4 is an implementation of the traditional Unix macro processor. It is mostly SVR4 compatible
+ although it has some extensions (for example, handling more than 9 positional parameters to macros). GNU M4 also has
+ built-in functions for including files, running shell commands, doing arithmetic, etc."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://ftpmirror.gnu.org/m4']
+
+patches = ['M4-%(version)s-no-gets.patch']
+
+configopts = "--enable-cxx"
+
+sanity_check_paths = {
+    'files': ["bin/m4"],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-iqacml-3.7.3.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-iqacml-3.7.3.eb
index 1c34adaa2681cf312792bbd54814cfaa52ab1001..98f82e41c42c3d30b79f37c26dfb8aa0a4c2e86f 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.16-iqacml-3.7.3.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-iqacml-3.7.3.eb
@@ -9,7 +9,7 @@ description = """GNU M4 is an implementation of the traditional Unix macro proce
 toolchain = {'name': 'iqacml', 'version': '3.7.3'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftpmirror.gnu.org/m4']
+source_urls = [GNU_SOURCE]
 
 patches = ['M4-%(version)s-no-gets.patch']
 
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16.eb
index 97181f85636de8d2c6a47c565add9e9336b68583..50af850a5a2a52dcb158ca567f6fd97cd9aa445e 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.16.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.16.eb
@@ -11,7 +11,7 @@ GNU M4 also has built-in functions for including files, running shell commands,
 toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftpmirror.gnu.org/m4']
+source_urls = [GNU_SOURCE]
 
 patches = ['M4-%(version)s-no-gets.patch']
 
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-5.5.0.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b122fe2d09c6320e4b3f58e505a4b0a02583aa92
--- /dev/null
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-5.5.0.eb
@@ -0,0 +1,21 @@
+name = 'M4'
+version = '1.4.17'
+
+homepage = 'http://www.gnu.org/software/m4/m4.html'
+description = """GNU M4 is an implementation of the traditional Unix macro processor. It is mostly SVR4 compatible
+  although it has some extensions (for example, handling more than 9 positional parameters to macros).
+ GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+configopts = "--enable-cxx"
+
+sanity_check_paths = {
+    'files': ["bin/m4"],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb b/easybuild/easyconfigs/m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0fd4f0bb047d29db86c423efed5325ab485a0267
--- /dev/null
+++ b/easybuild/easyconfigs/m/MAFFT/MAFFT-7.130-with-extensions-goolf-1.4.10.eb
@@ -0,0 +1,32 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+name = 'MAFFT'
+version = '7.130'
+versionsuffix = '-with-extensions'
+
+homepage = 'http://mafft.cbrc.jp/alignment/software/'
+description = """MAFFT is a multiple sequence alignment program 
+ for unix-like operating systems.  It offers a range of multiple
+ alignment methods, L-INS-i (accurate; for alignment of <∼200 sequences), 
+ FFT-NS-2 (fast; for alignment of <∼10,000 sequences), etc."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = [homepage]
+sources = ['%(namelower)s-%(version)s%(versionsuffix)s-src.tgz']
+
+skipsteps = ['configure']
+start_dir = 'core'
+installopts = 'PREFIX=%(installdir)s'
+
+modextrapaths = {'MAFFT_BINARIES': 'libexec/mafft'}
+
+sanity_check_paths = {
+    'files': ['bin/mafft'],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/m/MMSEQ/MMSEQ-1.0.8-linux64-static.eb b/easybuild/easyconfigs/m/MMSEQ/MMSEQ-1.0.8-linux64-static.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e59bc4367084df74c0cf8d2f9ba8cb3c2eb99e3f
--- /dev/null
+++ b/easybuild/easyconfigs/m/MMSEQ/MMSEQ-1.0.8-linux64-static.eb
@@ -0,0 +1,26 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+easyblock = "Tarball"
+
+name = 'MMSEQ'
+version = '1.0.8'
+versionsuffix = '-linux64-static'
+
+homepage = 'https://github.com/eturro/mmseq'
+description = """ The MMSEQ package contains a collection of statistical tools
+ for analysing RNA-seq expression data. """
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+source_urls = ['https://github.com/eturro/mmseq/archive/']
+sources = ['%(version)s.tar.gz']
+
+sanity_check_paths = {
+    'files': ["bin/mmseq-linux", "bin/bam2hits-linux", "bin/extract_transcripts-linux" ],
+    'dirs': []
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/m/MPFR/MPFR-2.4.2.eb b/easybuild/easyconfigs/m/MPFR/MPFR-2.4.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..51ed7bde5f4fede29b521314903b75fccf2b0a3e
--- /dev/null
+++ b/easybuild/easyconfigs/m/MPFR/MPFR-2.4.2.eb
@@ -0,0 +1,22 @@
+name = 'MPFR'
+version = '2.4.2'
+
+homepage = 'http://www.mpfr.org'
+description = """The MPFR library is a C library for multiple-precision 
+floating-point computations with correct rounding."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = ['http://www.mpfr.org/mpfr-%(version)s/']
+sources = [SOURCELOWER_TAR_BZ2]
+
+dependencies = [('GMP', '4.3.2')]
+
+runtest = 'check'
+
+sanity_check_paths = {
+    'files': ['lib/libmpfr.so', 'include/mpfr.h'],
+    'dirs': [],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-goalf-1.1.0-no-OFED.eb
index 2c1a1daf0ae7ebbd5dd50b23311fd12f1e73b316..8ad0e5e710a211c73518b4d5ba907c05f2353643 100644
--- a/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-goalf-1.1.0-no-OFED.eb
@@ -14,12 +14,13 @@ name = 'MUMmer'
 version = '3.23'
 
 homepage = 'http://mummer.sourceforge.net/'
-description = """MUMmer is a system for rapidly aligning entire genomes, whether in complete or draft form. AMOS makes use of it."""
+description = """MUMmer is a system for rapidly aligning entire genomes,
+ whether in complete or draft form. AMOS makes use of it."""
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-sources = ['%s%s.tar.gz' % (name, version)]
-source_urls = [('http://sourceforge.net/projects/mummer/files/%s/%s/' % (name.lower(), version), 'download')]
+sources = ['%(name)s%(version)s.tar.gz']
+source_urls = [('http://sourceforge.net/projects/mummer/files/%(namelower)s/%(version)s/', 'download')]
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-goolf-1.4.10-Perl-5.16.3.eb b/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-goolf-1.4.10-Perl-5.16.3.eb
index e610d327ac7e50355f5175686816517c4778ffa2..cc1c5b95286fca69e7d8d24d49f768bf3b5480c1 100644
--- a/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-goolf-1.4.10-Perl-5.16.3.eb
+++ b/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-goolf-1.4.10-Perl-5.16.3.eb
@@ -14,12 +14,14 @@ name = 'MUMmer'
 version = '3.23'
 
 homepage = 'http://mummer.sourceforge.net/'
-description = """MUMmer is a system for rapidly aligning entire genomes, whether in complete or draft form. AMOS makes use of it."""
+description = """MUMmer is a system for rapidly aligning entire genomes,
+ whether in complete or draft form. AMOS makes use of it."""
+
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-sources = ['%s%s.tar.gz' % (name, version)]
-source_urls = [('http://sourceforge.net/projects/mummer/files/%s/%s/' % (name.lower(), version), 'download')]
+sources = ['%(name)s%(version)s.tar.gz']
+source_urls = [('http://sourceforge.net/projects/mummer/files/%(namelower)s/%(version)s/', 'download')]
 
 perl = 'Perl'
 perlver = '5.16.3'
diff --git a/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-goolf-1.4.10.eb b/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-goolf-1.4.10.eb
index 68e6cd4aaf6a7f4fcc73db31055a92b0930acec0..3a1c6157f668cd1ac87c4692d77aa347aa618987 100644
--- a/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-goolf-1.4.10.eb
@@ -14,11 +14,13 @@ name = 'MUMmer'
 version = '3.23'
 
 homepage = 'http://mummer.sourceforge.net/'
-description = """MUMmer is a system for rapidly aligning entire genomes, whether in complete or draft form. AMOS makes use of it."""
+description = """MUMmer is a system for rapidly aligning entire genomes,
+ whether in complete or draft form. AMOS makes use of it."""
+
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-sources = ['%s%s.tar.gz' % (name, version)]
-source_urls = [('http://sourceforge.net/projects/mummer/files/%s/%s/' % (name.lower(), version), 'download')]
+sources = ['%(name)s%(version)s.tar.gz']
+source_urls = [('http://sourceforge.net/projects/mummer/files/%(namelower)s/%(version)s/', 'download')]
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-4.0.6.eb b/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-4.0.6.eb
index 9a5bbfccf4cb9bfa87b1bf4a140cc49d93e23d15..ee85659115af03c8f974d99344670283059649b4 100644
--- a/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-4.0.6.eb
@@ -14,12 +14,13 @@ name = 'MUMmer'
 version = '3.23'
 
 homepage = 'http://mummer.sourceforge.net/'
-description = """MUMmer is a system for rapidly aligning entire genomes, whether in complete or draft form. AMOS makes use of it."""
+description = """MUMmer is a system for rapidly aligning entire genomes,
+ whether in complete or draft form. AMOS makes use of it."""
 
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-sources = ['%s%s.tar.gz' % (name, version)]
-source_urls = [('http://sourceforge.net/projects/mummer/files/%s/%s/' % (name.lower(), version), 'download')]
+sources = ['%(name)s%(version)s.tar.gz']
+source_urls = [('http://sourceforge.net/projects/mummer/files/%(namelower)s/%(version)s/', 'download')]
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-4.1.13-Perl-5.16.3.eb b/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-4.1.13-Perl-5.16.3.eb
index a8ee9f8f89eda38064f31660e76b651ee4a862ef..b85beabd730b7b87df74dc2e0d0e16ca254e642e 100644
--- a/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-4.1.13-Perl-5.16.3.eb
+++ b/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-4.1.13-Perl-5.16.3.eb
@@ -14,12 +14,14 @@ name = 'MUMmer'
 version = '3.23'
 
 homepage = 'http://mummer.sourceforge.net/'
-description = """MUMmer is a system for rapidly aligning entire genomes, whether in complete or draft form. AMOS makes use of it."""
+description = """MUMmer is a system for rapidly aligning entire genomes,
+ whether in complete or draft form. AMOS makes use of it."""
+
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-sources = ['%s%s.tar.gz' % (name, version)]
-source_urls = [('http://sourceforge.net/projects/mummer/files/%s/%s/' % (name.lower(), version), 'download')]
+sources = ['%(name)s%(version)s.tar.gz']
+source_urls = [('http://sourceforge.net/projects/mummer/files/%(namelower)s/%(version)s/', 'download')]
 
 perl = 'Perl'
 perlver = '5.16.3'
diff --git a/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-5.3.0-Perl-5.16.3.eb b/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-5.3.0-Perl-5.16.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6148c2da6e528e97262264d353bfc0074c00fc01
--- /dev/null
+++ b/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-5.3.0-Perl-5.16.3.eb
@@ -0,0 +1,31 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine
+# Authors::   Cedric Laczny <cedric.laczny@uni.lu>, Fotis Georgatos <fotis.georgatos@uni.lu>, Kenneth Hoste
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html
+##
+
+name = 'MUMmer'
+version = '3.23'
+
+homepage = 'http://mummer.sourceforge.net/'
+description = """MUMmer is a system for rapidly aligning entire genomes,
+ whether in complete or draft form. AMOS makes use of it."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+sources = ['%(name)s%(version)s.tar.gz']
+source_urls = [('http://sourceforge.net/projects/mummer/files/%(namelower)s/%(version)s/', 'download')]
+
+perl = 'Perl'
+perlver = '5.16.3'
+versionsuffix = '-%s-%s' % (perl, perlver)
+dependencies = [(perl, perlver)]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-5.3.0.eb b/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-5.3.0.eb
index 03ba01383484f47b150285c20e0744df1fb4c624..e11bf5f61d1b52b28d0875ef144292a1e5f9aeea 100644
--- a/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-5.3.0.eb
@@ -14,13 +14,14 @@ name = 'MUMmer'
 version = '3.23'
 
 homepage = 'http://mummer.sourceforge.net/'
-description = """MUMmer is a system for rapidly aligning entire genomes, whether in complete or draft form. AMOS makes use of it."""
+description = """MUMmer is a system for rapidly aligning entire genomes,
+ whether in complete or draft form. AMOS makes use of it."""
 
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-sources = ['%s%s.tar.gz' % (name, version)]
-source_urls = [('http://sourceforge.net/projects/mummer/files/%s/%s/' % (name.lower(), version), 'download')]
+sources = ['%(name)s%(version)s.tar.gz']
+source_urls = [('http://sourceforge.net/projects/mummer/files/%(namelower)s/%(version)s/', 'download')]
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/m/MUSTANG/MUSTANG-3.2.1-goolf-1.4.10.eb b/easybuild/easyconfigs/m/MUSTANG/MUSTANG-3.2.1-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9ce401d07a653da2bc214bdb85275f1f7228ede5
--- /dev/null
+++ b/easybuild/easyconfigs/m/MUSTANG/MUSTANG-3.2.1-goolf-1.4.10.eb
@@ -0,0 +1,30 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+easyblock = 'MakeCp'
+
+name = "MUSTANG"
+version = "3.2.1"
+
+homepage = 'http://www.csse.monash.edu.au/~karun/Site/mustang.html'
+description = """ MUSTANG (MUltiple STructural AligNment AlGorithm), for the alignment 
+ of multiple protein structures. Given a set of protein structures, the program constructs 
+ a multiple alignment using the spatial information of the Cα atoms in the set. """
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['http://www.csse.monash.edu.au/~karun/mustang/']
+sources = ['%(namelower)s_v%(version)s.tgz']
+
+patches = ['MUSTANG-3.2.1-missing-include.patch']
+
+files_to_copy = ["bin", "data", "man", "README"]
+
+sanity_check_paths = {
+    'files': ["bin/mustang-%(version)s"],
+    'dirs': []
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/m/MUSTANG/MUSTANG-3.2.1-missing-include.patch b/easybuild/easyconfigs/m/MUSTANG/MUSTANG-3.2.1-missing-include.patch
new file mode 100644
index 0000000000000000000000000000000000000000..2fe2e06a4fa22758cc59209d56b8c38d37e51054
--- /dev/null
+++ b/easybuild/easyconfigs/m/MUSTANG/MUSTANG-3.2.1-missing-include.patch
@@ -0,0 +1,10 @@
+--- MUSTANG_v3.2.1.orig/src/superpose_on_core_2.cpp	2009-04-18 10:30:17.000000000 +0200
++++ MUSTANG_v3.2.1/src/superpose_on_core_2.cpp	2014-04-02 23:44:58.668808458 +0200
+@@ -54,6 +54,7 @@
+ #include "read_structures.h"
+ #include "multiple_superposition.h"
+ #include "3D_manip_functions.h"
++#include "unistd.h"
+ 
+ int **core_columns ;
+ int *core_columns_2 , NCORE = 0 ;
diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.7-GCC-4.6.3-hwloc-chkpt.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.7-GCC-4.6.3-hwloc-chkpt.eb
index 8d81812dc2aac35bdb60d2d8b4dc2c7227758002..cee59253ac7eefe660a0861079b66e471fee491f 100644
--- a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.7-GCC-4.6.3-hwloc-chkpt.eb
+++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.7-GCC-4.6.3-hwloc-chkpt.eb
@@ -8,7 +8,7 @@ It is based on MPICH2 and MVICH."""
 
 toolchain = {'name': 'GCC', 'version': '4.6.3'}
 
-sources = ['%(namelower)s-%(version)s.tgz']
+sources = [SOURCELOWER_TGZ]
 # note: this URL will only work for the most recent version (previous versions no longer available?)
 source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich2']
 
diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.7-GCC-4.6.3.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.7-GCC-4.6.3.eb
index 19e6c4de4ebcceda480a8ab6615aeaeaee747e8b..53cdff914e5898132ed07d3f785ff492a4f9aff7 100644
--- a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.7-GCC-4.6.3.eb
+++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.7-GCC-4.6.3.eb
@@ -7,7 +7,7 @@ It is based on MPICH2 and MVICH."""
 
 toolchain = {'name': 'GCC', 'version': '4.6.3'}
 
-sources = ['%(namelower)s-%(version)s.tgz']
+sources = [SOURCELOWER_TGZ]
 # note: this URL will only work for the most recent version (previous versions no longer available?)
 source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich2']
 
diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.8.1-GCC-4.7.2.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.8.1-GCC-4.7.2.eb
index 2b6e8dfed43b5b228c09b22a514bcac4136af5af..9be4dedbf32c49944fd9681092a81d235bb0fc19 100644
--- a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.8.1-GCC-4.7.2.eb
+++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.8.1-GCC-4.7.2.eb
@@ -7,7 +7,7 @@ description = "This is an MPI-2 implementation (conforming to MPI 2.1 standard)
 toolchain = {'name': 'GCC', 'version': '4.7.2'}
 
 source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich2/']
-sources = ['%(namelower)s-%(version)s.tgz']
+sources = [SOURCELOWER_TGZ]
 
 builddependencies = [('Bison', '2.7')]
 
diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-ClangGCC-1.1.3.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-ClangGCC-1.1.3.eb
index fd7d023894fa678d97da91e784b98dd75e0596dc..6d98d3a0320ac9ff07dec1b382eddd0fcbd67d84 100644
--- a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-ClangGCC-1.1.3.eb
+++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-ClangGCC-1.1.3.eb
@@ -7,7 +7,7 @@ description = "This is an MPI 3.0 implementation.  It is based on MPICH2 and MVI
 toolchain = {'name': 'ClangGCC', 'version': '1.1.3'}
 
 source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich2/']
-sources = ['mvapich2-%s.tgz' % version]
+sources = [SOURCELOWER_TGZ]
 
 dependencies = [('Bison', '2.7')]
 
diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-ClangGCC-1.2.3.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-ClangGCC-1.2.3.eb
index 229478ec5ed311a60dc8285f7adebe34c9fb5958..e1fdfb364f7904909bff6f0a79e2d0ce717a4c96 100644
--- a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-ClangGCC-1.2.3.eb
+++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-ClangGCC-1.2.3.eb
@@ -7,7 +7,7 @@ description = "This is an MPI 3.0 implementation.  It is based on MPICH2 and MVI
 toolchain = {'name': 'ClangGCC', 'version': '1.2.3'}
 
 source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich2/']
-sources = ['mvapich2-%s.tgz' % version]
+sources = [SOURCELOWER_TGZ]
 
 dependencies = [('Bison', '2.7')]
 
diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-GCC-4.7.3.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-GCC-4.7.3.eb
index 9ff3ca9a333d0e64c9265d0f2e7f76cdb0c1ba95..602d1c4c8094e330d74fb85bd3369ab7cceb4e3b 100644
--- a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-GCC-4.7.3.eb
+++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-GCC-4.7.3.eb
@@ -7,7 +7,7 @@ description = "This is an MPI 3.0 implementation.  It is based on MPICH2 and MVI
 toolchain = {'name': 'GCC', 'version': '4.7.3'}
 
 source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich2/']
-sources = ['%(namelower)s-%(version)s.tgz']
+sources = [SOURCELOWER_TGZ]
 
 builddependencies = [('Bison', '2.7')]
 
diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-iccifort-2011.13.367.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-iccifort-2011.13.367.eb
index b140cf37c7b19d97c93a3747f9fcfd89516ae756..51fd98fd16be7d481ffecf7d2a521d221de2def4 100644
--- a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-iccifort-2011.13.367.eb
+++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-iccifort-2011.13.367.eb
@@ -8,7 +8,7 @@ toolchain = {'name': 'iccifort', 'version': '2011.13.367'}
 toolchainopts = {'optarch': True, 'pic': True}
 
 source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich2/']
-sources = ['mvapich2-%(version)s.tgz']
+sources = [SOURCELOWER_TGZ]
 
 builddependencies = [('Bison', '2.7', '', ('ictce', '4.1.13'))]
 
diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9a2-GCC-4.7.2.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9a2-GCC-4.7.2.eb
index 5b4bd89d04a8a078f16560fc625d91ee4aad4e99..86fdc73adc25bb54034aa24a83cad1f306f82e42 100644
--- a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9a2-GCC-4.7.2.eb
+++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9a2-GCC-4.7.2.eb
@@ -7,7 +7,7 @@ description = "This is an MPI-2 implementation (conforming to MPI 2.1 standard)
 toolchain = {'name': 'GCC', 'version': '4.7.2'}
 
 source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich2/']
-sources = ['%(namelower)s-%(version)s.tgz']
+sources = [SOURCELOWER_TGZ]
 
 builddependencies = [('Bison', '2.7')]
 
diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9b-GCC-4.7.2.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9b-GCC-4.7.2.eb
index 05e1fd9ee5626b0fb6a1ba5e4da4819338b22de3..1c45f04807b554a134216dc7595e6abc677cc1ad 100644
--- a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9b-GCC-4.7.2.eb
+++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9b-GCC-4.7.2.eb
@@ -7,7 +7,7 @@ description = "This is an MPI 3.0 implementation.  It is based on MPICH2 and MVI
 toolchain = {'name': 'GCC', 'version': '4.7.2'}
 
 source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich2/']
-sources = ['%(namelower)s-%(version)s.tgz']
+sources = [SOURCELOWER_TGZ]
 
 builddependencies = [('Bison', '2.7')]
 
diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9rc1-ClangGCC-1.1.3.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9rc1-ClangGCC-1.1.3.eb
index 1eb4d70733edeb92df76efbbe7d31ddb1f38aaa6..892dac4687124b372e01b2e2f715b26007252e10 100644
--- a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9rc1-ClangGCC-1.1.3.eb
+++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9rc1-ClangGCC-1.1.3.eb
@@ -7,7 +7,7 @@ description = "This is an MPI 3.0 implementation.  It is based on MPICH2 and MVI
 toolchain = {'name': 'ClangGCC', 'version': '1.1.3'}
 
 source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich2/']
-sources = ['%(namelower)s-%(version)s.tgz']
+sources = [SOURCELOWER_TGZ]
 
 builddependencies = [('Bison', '2.7')]
 
diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9rc1-GCC-4.7.3.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9rc1-GCC-4.7.3.eb
index 27a74baecd16a624d5a14104e12077cbf545152c..9e7d8d7641931027d54de338bc178528b87fffe5 100644
--- a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9rc1-GCC-4.7.3.eb
+++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9rc1-GCC-4.7.3.eb
@@ -7,7 +7,7 @@ description = "This is an MPI 3.0 implementation.  It is based on MPICH2 and MVI
 toolchain = {'name': 'GCC', 'version': '4.7.3'}
 
 source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich2/']
-sources = ['%(namelower)s-%(version)s.tgz']
+sources = [SOURCELOWER_TGZ]
 
 builddependencies = [('Bison', '2.7')]
 
diff --git a/easybuild/easyconfigs/m/Meep/Meep-1.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/m/Meep/Meep-1.2-goalf-1.1.0-no-OFED.eb
index b1b8b5191a58f1d6953d0819c2c06e22d1b13e97..c6d4999624cc3fb247f2dca0f84987f6a801ab5d 100644
--- a/easybuild/easyconfigs/m/Meep/Meep-1.2-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/m/Meep/Meep-1.2-goalf-1.1.0-no-OFED.eb
@@ -5,13 +5,13 @@ homepage = 'http://ab-initio.mit.edu/wiki/index.php/Meep'
 description = """Meep (or MEEP) is a free finite-difference time-domain (FDTD) simulation software package
  developed at MIT to model electromagnetic systems."""
 
-tcver = '1.1.0-no-OFED'
-toolchain = {'name': 'goalf', 'version': tcver}
-toolchainopts = {'usempi': True, 'opt': True, 'optarch': True, 'unroll':
-                 True, 'pic': True}
+toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
+toolchainopts = {'usempi': True, 'opt': True, 'optarch': True, 'unroll': True, 'pic': True}
 
-source_urls = ['http://ab-initio.mit.edu/meep/',
-               'http://ab-initio.mit.edu/meep/old/']
+source_urls = [
+    'http://ab-initio.mit.edu/meep/',
+    'http://ab-initio.mit.edu/meep/old/',
+]
 sources = [SOURCELOWER_TAR_GZ]
 
 dependencies = [
@@ -21,6 +21,9 @@ dependencies = [
     ('GSL', '1.15'),
 ]
 
-configopts = '--with-pic --with-mpi --without-gcc-arch --with-libctl=$EBROOTLIBCTL/share/libctl --enable-shared'
+configopts = '--with-pic --with-mpi --without-gcc-arch --with-libctl=$EBROOTLIBCTL/share/libctl --enable-shared '
+
+# fix for guile-config being broken because shebang line contains full path to bin/guile
+configopts += 'GUILE_CONFIG="$EBROOTGUILE/bin/guile -e main -s $EBROOTGUILE/bin/guile-config"'
 
 moduleclass = 'phys'
diff --git a/easybuild/easyconfigs/m/Meep/Meep-1.2-goolf-1.4.10.eb b/easybuild/easyconfigs/m/Meep/Meep-1.2-goolf-1.4.10.eb
index 2f278ab5315d287696dec4cc8f15e831e1903db3..7b27d95b42c17386ba28f05fb757cfdfe799d957 100644
--- a/easybuild/easyconfigs/m/Meep/Meep-1.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/m/Meep/Meep-1.2-goolf-1.4.10.eb
@@ -6,11 +6,12 @@ description = """Meep (or MEEP) is a free finite-difference time-domain (FDTD) s
 MIT to model electromagnetic systems."""
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
-toolchainopts = {'usempi': True, 'opt': True, 'optarch': True, 'unroll':
-                 True, 'pic': True}
+toolchainopts = {'usempi': True, 'opt': True, 'optarch': True, 'unroll': True, 'pic': True}
 
-source_urls = ['http://ab-initio.mit.edu/meep/',
-               'http://ab-initio.mit.edu/meep/old/']
+source_urls = [
+    'http://ab-initio.mit.edu/meep/',
+    'http://ab-initio.mit.edu/meep/old/',
+]
 sources = [SOURCELOWER_TAR_GZ]
 
 dependencies = [
@@ -20,6 +21,9 @@ dependencies = [
     ('GSL', '1.15'),
 ]
 
-configopts = '--with-pic --with-mpi --without-gcc-arch --with-libctl=$EBROOTLIBCTL/share/libctl --enable-shared'
+configopts = '--with-pic --with-mpi --without-gcc-arch --with-libctl=$EBROOTLIBCTL/share/libctl --enable-shared '
+
+# fix for guile-config being broken because shebang line contains full path to bin/guile
+configopts += 'GUILE_CONFIG="$EBROOTGUILE/bin/guile -e main -s $EBROOTGUILE/bin/guile-config"'
 
 moduleclass = 'phys'
diff --git a/easybuild/easyconfigs/m/Meep/Meep-1.2-ictce-4.0.6.eb b/easybuild/easyconfigs/m/Meep/Meep-1.2-ictce-4.0.6.eb
index 9b00a0bbd184d1f68d962cc79dc480961d55fe18..7b473e1b0b813903a980479c40799b5c8fa21f9c 100644
--- a/easybuild/easyconfigs/m/Meep/Meep-1.2-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/m/Meep/Meep-1.2-ictce-4.0.6.eb
@@ -6,11 +6,12 @@ description = """Meep (or MEEP) is a free finite-difference time-domain (FDTD) s
  developed at MIT to model electromagnetic systems."""
 
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
-toolchainopts = {'usempi': True, 'opt': True, 'optarch': True, 'unroll':
-                 True, 'pic': True}
+toolchainopts = {'usempi': True, 'opt': True, 'optarch': True, 'unroll': True, 'pic': True}
 
-source_urls = ['http://ab-initio.mit.edu/meep/',
-               'http://ab-initio.mit.edu/meep/old/']
+source_urls = [
+    'http://ab-initio.mit.edu/meep/',
+    'http://ab-initio.mit.edu/meep/old/',
+]
 sources = [SOURCELOWER_TAR_GZ]
 
 patches = ['Meep-%s_version-string-without-spaces.patch' % version]
@@ -24,6 +25,9 @@ dependencies = [
 ]
 
 configopts = "--with-pic --with-mpi --with-blas=mkl_em64t --with-lapack=mkl_em64t --without-gcc-arch "
-configopts += "--with-libctl=$EBROOTLIBCTL/share/libctl --enable-shared"
+configopts += "--with-libctl=$EBROOTLIBCTL/share/libctl --enable-shared "
+
+# fix for guile-config being broken because shebang line contains full path to bin/guile
+configopts += 'GUILE_CONFIG="$EBROOTGUILE/bin/guile -e main -s $EBROOTGUILE/bin/guile-config"'
 
 moduleclass = 'phys'
diff --git a/easybuild/easyconfigs/m/Meep/Meep-1.2-ictce-5.3.0.eb b/easybuild/easyconfigs/m/Meep/Meep-1.2-ictce-5.3.0.eb
index 90651eb6283de5a55df0c95dfba9bf3722368485..98db62a6c1d6c5e982f78fc1e773e42d4e3e4c55 100644
--- a/easybuild/easyconfigs/m/Meep/Meep-1.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/m/Meep/Meep-1.2-ictce-5.3.0.eb
@@ -5,14 +5,14 @@ homepage = 'http://ab-initio.mit.edu/wiki/index.php/Meep'
 description = """Meep (or MEEP) is a free finite-difference time-domain (FDTD) simulation software package
  developed at MIT to model electromagnetic systems."""
 
-
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
-toolchainopts = {'usempi': True, 'opt': True, 'optarch': True, 'unroll':
-                 True, 'pic': True}
+toolchainopts = {'usempi': True, 'opt': True, 'optarch': True, 'unroll': True, 'pic': True}
 
-source_urls = ['http://ab-initio.mit.edu/meep/',
-               'http://ab-initio.mit.edu/meep/old/']
-sources = ['%s-%s.tar.gz' % (name.lower(), version)]
+source_urls = [
+    'http://ab-initio.mit.edu/meep/',
+    'http://ab-initio.mit.edu/meep/old/',
+]
+sources = [SOURCELOWER_TAR_GZ]
 
 patches = ['Meep-%s_version-string-without-spaces.patch' % version]
 
@@ -25,6 +25,9 @@ dependencies = [
 ]
 
 configopts = "--with-pic --with-mpi --with-blas=mkl_em64t --with-lapack=mkl_em64t --without-gcc-arch "
-configopts += "--with-libctl=$EBROOTLIBCTL/share/libctl --enable-shared"
+configopts += "--with-libctl=$EBROOTLIBCTL/share/libctl --enable-shared "
+
+# fix for guile-config being broken because shebang line contains full path to bin/guile
+configopts += 'GUILE_CONFIG="$EBROOTGUILE/bin/guile -e main -s $EBROOTGUILE/bin/guile-config"'
 
 moduleclass = 'phys'
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index 0dbc4480698ff42c7f92b6bc7abc0086f83728de..d3ced86b9da93b802d36fc04a6da1556bcebedad 100644
--- a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -9,7 +9,10 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 toolchainopts = {'optarch': True}
 
 sources = ['%sLib-%s.tar.gz' % (name, version)]
-source_urls = ['ftp://ftp.freedesktop.org/pub/mesa/%s' % version]
+source_urls = [
+    'ftp://ftp.freedesktop.org/pub/mesa/%(version)s',
+    'ftp://ftp.freedesktop.org/pub/mesa/older-versions/%(version_major)s.x/%(version)s',
+]
 
 pythonver = '2.7.3'
 pythonshortver = '.'.join(pythonver.split('.')[0:2])
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-goolf-1.4.10-Python-2.7.3.eb
index b038930e50e35a7f4bc06aa236550caecd7429e0..aa7d43dd2e234fc74128ca7860981c94564d8fb0 100644
--- a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-goolf-1.4.10-Python-2.7.3.eb
@@ -8,7 +8,10 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'optarch': True}
 
 sources = ['%sLib-%s.tar.gz' % (name, version)]
-source_urls = ['ftp://ftp.freedesktop.org/pub/mesa/%s' % version]
+source_urls = [
+    'ftp://ftp.freedesktop.org/pub/mesa/%(version)s',
+    'ftp://ftp.freedesktop.org/pub/mesa/older-versions/%(version_major)s.x/%(version)s',
+]
 
 pythonver = '2.7.3'
 pythonshortver = '.'.join(pythonver.split('.')[0:2])
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-4.0.6-Python-2.7.3.eb
index d3a225896d8064f6de5eb7de2a80fa3ebdd2b099..2b0c88be6dddc091500593ddeefb2f37e8c10085 100644
--- a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-4.0.6-Python-2.7.3.eb
@@ -9,7 +9,10 @@ toolchain = {'name': 'ictce', 'version': '4.0.6'}
 toolchainopts = {'optarch': True}
 
 sources = ['%sLib-%s.tar.gz' % (name, version)]
-source_urls = ['ftp://ftp.freedesktop.org/pub/mesa/%s' % version]
+source_urls = [
+    'ftp://ftp.freedesktop.org/pub/mesa/%(version)s',
+    'ftp://ftp.freedesktop.org/pub/mesa/older-versions/%(version_major)s.x/%(version)s',
+]
 
 pythonver = '2.7.3'
 pythonshortver = '.'.join(pythonver.split('.')[0:2])
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-5.3.0-Python-2.7.3.eb
index bc2ba6b2f5a0437dfaba9c4a4d674afdb644f32f..c2adb7e2f239e2f934d87298d8d66a084ab4fab8 100644
--- a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-5.3.0-Python-2.7.3.eb
@@ -10,7 +10,10 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'}
 toolchainopts = {'optarch': True}
 
 sources = ['%sLib-%s.tar.gz' % (name, version)]
-source_urls = ['ftp://ftp.freedesktop.org/pub/mesa/%s' % version]
+source_urls = [
+    'ftp://ftp.freedesktop.org/pub/mesa/%(version)s',
+    'ftp://ftp.freedesktop.org/pub/mesa/older-versions/%(version_major)s.x/%(version)s',
+]
 
 pythonver = '2.7.3'
 pythonshortver = '.'.join(pythonver.split('.')[0:2])
diff --git a/easybuild/easyconfigs/m/Mesquite/Mesquite-2.3.0-ictce-5.3.0.eb b/easybuild/easyconfigs/m/Mesquite/Mesquite-2.3.0-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..26a922fdfd6c2449c8fb2ce3bb1e1a19562e6b97
--- /dev/null
+++ b/easybuild/easyconfigs/m/Mesquite/Mesquite-2.3.0-ictce-5.3.0.eb
@@ -0,0 +1,13 @@
+name = 'Mesquite'
+version = '2.3.0'
+
+homepage = 'http://software.sandia.gov/~bktidwe/mesquite.html'
+description = """Mesh-Quality Improvement Library"""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'pic': True}
+
+source_urls = ['http://software.sandia.gov/~bktidwe/']
+sources = [SOURCELOWER_TAR_GZ]
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-goalf-1.1.0-no-OFED.eb
index 83a3f3611c5b086310a81c7de9a671644ffc33f1..3ab6fccc964e30c2e0a72bab03c6f8ee99ebae83 100644
--- a/easybuild/easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-goalf-1.1.0-no-OFED.eb
@@ -19,7 +19,7 @@ description = """A short read assember for metagenomics"""
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-sources = ['%s-%s.tgz' % (name, version)]
+sources = [SOURCE_TGZ]
 source_urls = ['http://metavelvet.dna.bio.keio.ac.jp/src']
 
 # Actually, just a "soft"-dependency as MetaVelvet includes a velvet-distribution in its own package.
diff --git a/easybuild/easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-goolf-1.4.10.eb b/easybuild/easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-goolf-1.4.10.eb
index 59ff6b35c3c19bcfd389cae9e56ac776d0650d1a..c9bcb07364ddcb07a907fbdb6e7c74c8bcc36971 100644
--- a/easybuild/easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-goolf-1.4.10.eb
@@ -18,7 +18,7 @@ description = """A short read assember for metagenomics"""
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-sources = ['%s-%s.tgz' % (name, version)]
+sources = [SOURCE_TGZ]
 source_urls = ['http://metavelvet.dna.bio.keio.ac.jp/src']
 
 # Actually, just a "soft"-dependency as MetaVelvet includes a velvet-distribution in its own package.
diff --git a/easybuild/easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-ictce-4.0.6.eb b/easybuild/easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-ictce-4.0.6.eb
index d264b2ce44150da7e4fa522ada71f7a631179dce..c7d1a1094e649b1803f69fcec5882869a888a2f1 100644
--- a/easybuild/easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-ictce-4.0.6.eb
@@ -19,7 +19,7 @@ description = """A short read assember for metagenomics"""
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-sources = ['%s-%s.tgz' % (name, version)]
+sources = [SOURCE_TGZ]
 source_urls = ['http://metavelvet.dna.bio.keio.ac.jp/src']
 
 # Actually, just a "soft"-dependency as MetaVelvet includes a velvet-distribution in its own package.
diff --git a/easybuild/easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-ictce-5.3.0.eb b/easybuild/easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-ictce-5.3.0.eb
index 2a88c56f9e1cc17ed849249a5c86fe66752a4e8b..a9129b8002c66784fff635494e3ba417b359003a 100644
--- a/easybuild/easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-ictce-5.3.0.eb
@@ -20,7 +20,7 @@ description = """A short read assember for metagenomics"""
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-sources = ['%s-%s.tgz' % (name, version)]
+sources = [SOURCE_TGZ]
 source_urls = ['http://metavelvet.dna.bio.keio.ac.jp/src']
 
 # Actually, just a "soft"-dependency as MetaVelvet includes a velvet-distribution in its own package.
diff --git a/easybuild/easyconfigs/m/Molden/Molden-5.0-ictce-4.1.13.eb b/easybuild/easyconfigs/m/Molden/Molden-5.0-ictce-4.1.13.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ea8f241450b43bb9d7c58880572420e4f296b38f
--- /dev/null
+++ b/easybuild/easyconfigs/m/Molden/Molden-5.0-ictce-4.1.13.eb
@@ -0,0 +1,25 @@
+easyblock = "MakeCp"
+
+name = 'Molden'
+version = '5.0'
+
+homepage = 'http://www.cmbi.ru.nl/molden/'
+description = """Molden is a package for displaying Molecular Density from the
+ Ab Initio packages GAMESS-UK, GAMESS-US and GAUSSIAN and the Semi-Empirical
+ packages Mopac/Ampac"""
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+
+sources = ['%(namelower)s%(version)s.tar.gz']
+source_urls = ['ftp://ftp.cmbi.ru.nl/pub/molgraph/molden']
+
+makeopts = 'CC="$CC" FC="$F90" molden'
+
+files_to_copy = [(['molden'],'bin'), 'CopyRight', 'README', 'REGISTER']
+
+sanity_check_paths={
+    'files': ['bin/molden', 'README', 'REGISTER'],
+    'dirs': [],
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/m/Molekel/Molekel-5.4.0_Linux_x86_64.eb b/easybuild/easyconfigs/m/Molekel/Molekel-5.4.0_Linux_x86_64.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d68a450d82dc5aff4f692674ad55d1e3c298bf90
--- /dev/null
+++ b/easybuild/easyconfigs/m/Molekel/Molekel-5.4.0_Linux_x86_64.eb
@@ -0,0 +1,20 @@
+easyblock = "Tarball"
+
+name = "Molekel"
+version = "5.4.0"
+versionsuffix = "-Linux_x86_64"
+
+homepage = "http://molekel.cscs.ch/"
+description = """Molekel is an open-source multi-platform molecular visualization program."""
+
+toolchain = {'version': 'dummy', 'name': 'dummy'}
+
+sources = ['molekel_%s_%s.tar.gz' % (version.replace('.', '_'), versionsuffix.lower()[1:])]
+source_urls = ['ftp://ftp.cscs.ch/out/molekel/molekel_%(version_major_minor)s']
+
+sanity_check_paths = {
+    'files': ["bin/Molekel"],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/m/make/make-3.82-goolf-1.4.10.eb b/easybuild/easyconfigs/m/make/make-3.82-goolf-1.4.10.eb
index 4adee4b6229f1e55b71676ee8d73ab95fee6b5fd..33ab4efa806edc404c7661c2c5f5c91a820583a8 100644
--- a/easybuild/easyconfigs/m/make/make-3.82-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/m/make/make-3.82-goolf-1.4.10.eb
@@ -18,7 +18,7 @@ description = "make-3.82: GNU version of make utility"
 
 # fi. http://ftp.gnu.org/gnu/make/make-3.82.tar.gz
 sources = ['make-%(version)s.tar.bz2']
-source_urls = ['http://ftp.gnu.org/gnu/make']
+source_urls = [GNU_SOURCE]
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
diff --git a/easybuild/easyconfigs/m/make/make-3.82-ictce-5.3.0.eb b/easybuild/easyconfigs/m/make/make-3.82-ictce-5.3.0.eb
index 61ce56f41fab99b0d5f132bbbdc706bf132db012..98d8a738b637428b5c41600941a7c05996a2141f 100644
--- a/easybuild/easyconfigs/m/make/make-3.82-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/m/make/make-3.82-ictce-5.3.0.eb
@@ -18,7 +18,7 @@ description = "make-3.82: GNU version of make utility"
 
 # fi. http://ftp.gnu.org/gnu/make/make-3.82.tar.gz
 sources = ['make-%(version)s.tar.bz2']
-source_urls = ['http://ftp.gnu.org/gnu/make']
+source_urls = [GNU_SOURCE]
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.2.1-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.2.1-ictce-5.3.0-Python-2.7.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ab81bf895ddb8a63e5129941920a542f1a52699c
--- /dev/null
+++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.2.1-ictce-5.3.0-Python-2.7.3.eb
@@ -0,0 +1,34 @@
+easyblock = "PythonPackage"
+
+name = 'matplotlib'
+version = '1.2.1'
+
+homepage = 'http://matplotlib.org'
+description = """matplotlib is a python 2D plotting library which produces publication quality figures in a variety of
+ hardcopy formats and interactive environments across platforms. matplotlib can be used in python scripts, the python
+ and ipython shell, web application servers, and six graphical user interface toolkits."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = ['http://sourceforge.net/projects/matplotlib/files/matplotlib/matplotlib-%(version)s/']
+sources = [SOURCELOWER_TAR_GZ]
+
+python = "Python"
+pythonversion = '2.7.3'
+pythonshortversion = ".".join(pythonversion.split(".")[:-1])
+
+versionsuffix = "-%s-%s" % (python, pythonversion)
+
+dependencies = [
+    (python, pythonversion),
+    ('zlib', '1.2.7'),
+    ('freetype', '2.4.11'),
+    ('libpng', '1.5.13'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%s/site-packages/matplotlib' % pythonshortversion],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.0-ictce-5.3.0-Python-2.7.5.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.0-ictce-5.3.0-Python-2.7.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..08450f788186630674c156d0902a1b1743a01f08
--- /dev/null
+++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.0-ictce-5.3.0-Python-2.7.5.eb
@@ -0,0 +1,38 @@
+easyblock = "PythonPackage"
+
+name = 'matplotlib'
+version = '1.3.0'
+
+homepage = 'http://matplotlib.org'
+description = """matplotlib is a python 2D plotting library which produces publication quality figures in a variety of
+hardcopy formats and interactive environments across platforms. matplotlib can be used in python scripts, the python
+and ipython shell, web application servers, and six graphical user interface toolkits.
+"""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = ['http://sourceforge.net/projects/matplotlib/files/matplotlib/matplotlib-%(version)s/']
+sources = [SOURCELOWER_TAR_GZ]
+
+python = "Python"
+pythonversion = '2.7.5'
+pyshortver = ".".join(pythonversion.split(".")[:-1])
+
+versionsuffix = "-%s-%s" % (python, pythonversion)
+
+zlibver = '1.2.8'
+dependencies = [
+    (python, pythonversion),
+    ('zlib', zlibver),
+    ('freetype', '2.4.10'),
+    ('libpng', '1.6.3', '-zlib-%s' % zlibver),
+]
+
+pyprefix = 'lib/python%s/site-packages' % pyshortver
+eggname = 'matplotlib-%%(version)s-py%s-linux-x86_64.egg' % pyshortver
+sanity_check_paths = {
+    'files': [],
+    'dirs': [('%s/%%(name)s' % pyprefix, '%s/%s' % (pyprefix, eggname))],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-goolf-1.4.10-Python-2.7.6.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-goolf-1.4.10-Python-2.7.6.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e4c90c4c44ff088d58cfce7882aef763290a7bfa
--- /dev/null
+++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-goolf-1.4.10-Python-2.7.6.eb
@@ -0,0 +1,30 @@
+easyblock = "PythonPackage"
+
+name = 'matplotlib'
+version = '1.3.1'
+
+homepage = 'http://matplotlib.org'
+description = """matplotlib is a python 2D plotting library which produces publication quality figures in a variety of
+ hardcopy formats and interactive environments across platforms. matplotlib can be used in python scripts, the python
+ and ipython shell, web application servers, and six graphical user interface toolkits."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['http://sourceforge.net/projects/matplotlib/files/matplotlib/matplotlib-%(version)s/']
+sources = [SOURCELOWER_TAR_GZ]
+
+python = "Python"
+pythonversion = '2.7.6'
+pythonshortversion = ".".join(pythonversion.split(".")[:-1])
+
+versionsuffix = "-%s-%s" % (python, pythonversion)
+
+dependencies = [
+    (python, pythonversion),
+    ('zlib', '1.2.7'),
+    ('freetype', '2.4.11'),
+    ('libpng', '1.6.6'),
+]
+
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-4.1.13-Python-2.7.6.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-4.1.13-Python-2.7.6.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d97e421867e7c179adc274a909a85bfc27b93a3b
--- /dev/null
+++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-4.1.13-Python-2.7.6.eb
@@ -0,0 +1,37 @@
+easyblock = "PythonPackage"
+
+name = 'matplotlib'
+version = '1.3.1'
+
+homepage = 'http://matplotlib.org'
+description = """matplotlib is a python 2D plotting library which produces publication quality figures in a variety of
+ hardcopy formats and interactive environments across platforms. matplotlib can be used in python scripts, the python
+ and ipython shell, web application servers, and six graphical user interface toolkits."""
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+python = "Python"
+pythonversion = '2.7.6'
+pyshortver = ".".join(pythonversion.split(".")[:-1])
+
+versionsuffix = "-%s-%s" % (python, pythonversion)
+
+dependencies = [
+    (python, pythonversion),
+    ('zlib', '1.2.7'),
+    ('freetype', '2.5.0.1'),
+    ('libpng', '1.6.6'),
+]
+
+# is this actually needed? the PythonPackage will check if import matplotlib succeeds, which is as good as this?
+pyprefix = 'lib/python%s/site-packages' % pyshortver
+eggname = 'matplotlib-%%(version)s-py%s-linux-x86_64.egg' % pyshortver
+sanity_check_paths = {
+    'files': [],
+    'dirs': [('%s/%%(name)s' % pyprefix, '%s/%s' % (pyprefix, eggname))],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.6.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0e33120d408354f7f3116731bd3af1347d74ea14
--- /dev/null
+++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-5.5.0-Python-2.7.6.eb
@@ -0,0 +1,37 @@
+easyblock = "PythonPackage"
+
+name = 'matplotlib'
+version = '1.3.1'
+
+homepage = 'http://matplotlib.org'
+description = """matplotlib is a python 2D plotting library which produces publication quality figures in a variety of
+ hardcopy formats and interactive environments across platforms. matplotlib can be used in python scripts, the python
+ and ipython shell, web application servers, and six graphical user interface toolkits."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+python = "Python"
+pythonversion = '2.7.6'
+pyshortver = ".".join(pythonversion.split(".")[:-1])
+
+versionsuffix = "-%s-%s" % (python, pythonversion)
+
+dependencies = [
+    (python, pythonversion),
+    ('zlib', '1.2.7'),
+    ('freetype', '2.5.2'),
+    ('libpng', '1.6.9'),
+]
+
+# is this actually needed? the PythonPackage will check if import matplotlib succeeds, which is as good as this?
+pyprefix = 'lib/python%s/site-packages' % pyshortver
+eggname = 'matplotlib-%%(version)s-py%s-linux-x86_64.egg' % pyshortver
+sanity_check_paths = {
+    'files': [],
+    'dirs': [('%s/%%(name)s' % pyprefix, '%s/%s' % (pyprefix, eggname))],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/m/mcpp/mcpp-2.7.2-GCC-4.7.2.eb b/easybuild/easyconfigs/m/mcpp/mcpp-2.7.2-GCC-4.7.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5a891797958223b402b69e2d5df03a454dd11e39
--- /dev/null
+++ b/easybuild/easyconfigs/m/mcpp/mcpp-2.7.2-GCC-4.7.2.eb
@@ -0,0 +1,19 @@
+name = 'mcpp'
+version = '2.7.2'
+
+homepage = 'http://mcpp.sourceforge.net/'
+description = """MCPP is a portable C/C++ preprocessor, supporting GCC, Visual C++, etc.
+ Its source is highly configurable and can generate executables of various specs.
+ It accompanies a validation suite to check preprocessor's conformance and quality exhaustively."""
+
+toolchain = {'name': 'GCC', 'version': '4.7.2'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [SOURCEFORGE_SOURCE]
+
+sanity_check_paths = {
+    'files': ["bin/mcpp"],
+    'dirs': []
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/m/molmod/molmod-1.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/m/molmod/molmod-1.0-goolf-1.4.10-Python-2.7.3.eb
index 2521556c734e4943f8ce63bd6fba89346e220b19..08d2e9759c741018ac7b69eaa73f97653668c0dd 100644
--- a/easybuild/easyconfigs/m/molmod/molmod-1.0-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/m/molmod/molmod-1.0-goolf-1.4.10-Python-2.7.3.eb
@@ -23,7 +23,8 @@ dependencies = [
 ]
 
 # disable tests that require X11 by specifying "backend: agg" in matplotlibrc
-runtest = 'export MATPLOTLIBRC=$PWD; echo "backend: agg" > $MATPLOTLIBRC/matplotlibrc; python setup.py build_ext -i; nosetests -v'
+runtest = 'export MATPLOTLIBRC=$PWD; echo "backend: agg" > $MATPLOTLIBRC/matplotlibrc; '
+runtest += 'python setup.py build_ext -i; nosetests -v'
 
 sanity_check_paths = {
     'files': [],
diff --git a/easybuild/easyconfigs/m/molmod/molmod-1.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/m/molmod/molmod-1.0-ictce-4.1.13-Python-2.7.3.eb
index 7f4ed72e6cdf4786fb770f14b8bec9f795ecc21c..e697762256027ed6879eff86bd27abc2bb8535d9 100644
--- a/easybuild/easyconfigs/m/molmod/molmod-1.0-ictce-4.1.13-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/m/molmod/molmod-1.0-ictce-4.1.13-Python-2.7.3.eb
@@ -23,7 +23,8 @@ dependencies = [
 ]
 
 # disable tests that require X11 by specifying "backend: agg" in matplotlibrc
-runtest = 'export MATPLOTLIBRC=$PWD; echo "backend: agg" > $MATPLOTLIBRC/matplotlibrc; python setup.py build_ext -i; nosetests -v'
+runtest = 'export MATPLOTLIBRC=$PWD; echo "backend: agg" > $MATPLOTLIBRC/matplotlibrc; '
+runtest += 'python setup.py build_ext -i; nosetests -v'
 
 sanity_check_paths = {
     'files': [],
diff --git a/easybuild/easyconfigs/m/molmod/molmod-1.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/m/molmod/molmod-1.0-ictce-5.3.0-Python-2.7.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..221229e3a6a8853c0f178c7f7101816768b1c35a
--- /dev/null
+++ b/easybuild/easyconfigs/m/molmod/molmod-1.0-ictce-5.3.0-Python-2.7.3.eb
@@ -0,0 +1,34 @@
+easyblock = "PythonPackage"
+
+name = 'molmod'
+version = '1.0'
+
+homepage = 'http://molmod.github.io/molmod/'
+description = """MolMod is a Python library with many compoments that are useful to write molecular modeling programs."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = ['http://users.ugent.be/~tovrstra/molmod']
+sources = [SOURCE_TAR_GZ]
+
+python = "Python"
+pythonversion = '2.7.3'
+pythonshortversion = ".".join(pythonversion.split(".")[:-1])
+
+versionsuffix = "-%s-%s" % (python, pythonversion)
+
+dependencies = [
+    (python, pythonversion),
+    ('matplotlib', '1.2.1', versionsuffix),
+]
+
+# disable tests that require X11 by specifying "backend: agg" in matplotlibrc
+runtest = 'export MATPLOTLIBRC=$PWD; echo "backend: agg" > $MATPLOTLIBRC/matplotlibrc; '
+runtest += 'python setup.py build_ext -i; nosetests -v'
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%s/site-packages/molmod' % pythonshortversion],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..832a044412960f49cfb3e22b3099f048dbba6363
--- /dev/null
+++ b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -0,0 +1,26 @@
+easyblock = 'PythonPackage'
+
+name = 'mpi4py'
+version = '1.3'
+
+homepage = 'https://code.google.com/p/mpi4py/'
+description = """MPI for Python (mpi4py) provides bindings of the Message Passing Interface (MPI) standard for
+the Python programming language, allowing any Python program to exploit multiple processors."""
+
+toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
+
+source_urls = [
+    BITBUCKET_DOWNLOADS,
+    GOOGLECODE_SOURCE,
+]
+sources = [SOURCE_TAR_GZ]
+                                      
+python = 'Python'
+pyver = '2.7.3'
+versionsuffix = '-%s-%s' % (python, pyver)
+
+dependencies = [
+    (python, pyver),
+]
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goolf-1.4.10-Python-2.7.3.eb
index 10229d821cefbd08e654fa37d14f99d4aec57468..d7ce479c30cb6b92dfa5ff4094b5e16c95ad144f 100644
--- a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goolf-1.4.10-Python-2.7.3.eb
@@ -9,7 +9,10 @@ the Python programming language, allowing any Python program to exploit multiple
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-source_urls = ['https://mpi4py.googlecode.com/files/']
+source_urls = [
+    BITBUCKET_DOWNLOADS,
+    GOOGLECODE_SOURCE,
+]
 sources = [SOURCE_TAR_GZ]
                                       
 python = 'Python'
diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.0.6-Python-2.7.3.eb
index 168f873fe332f5e4961065b038e09e664ed2fccf..52e2739364c4f7e22c0fd5c00df4ea5f2887dc85 100644
--- a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.0.6-Python-2.7.3.eb
@@ -9,7 +9,10 @@ the Python programming language, allowing any Python program to exploit multiple
 
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
-source_urls = ['https://mpi4py.googlecode.com/files/']
+source_urls = [
+    BITBUCKET_DOWNLOADS,
+    GOOGLECODE_SOURCE,
+]
 sources = [SOURCE_TAR_GZ]
                                       
 python = 'Python'
diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.1.13-Python-2.7.3.eb
index a4f99586eaebfd5a58cb492fcaac77f4c0dc027b..5878a3a0a6ecb468186f41fd3790ab0904b08afb 100644
--- a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.1.13-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.1.13-Python-2.7.3.eb
@@ -9,7 +9,10 @@ the Python programming language, allowing any Python program to exploit multiple
 
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
-source_urls = ['https://mpi4py.googlecode.com/files/']
+source_urls = [
+    BITBUCKET_DOWNLOADS,
+    GOOGLECODE_SOURCE,
+]
 sources = [SOURCE_TAR_GZ]
                                       
 python = 'Python'
diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.3.0-Python-2.7.3.eb
index 8ff1173727153bda8934c54a974643ea538351b6..989b264cf78b11f9f555d9df54619a783517edd6 100644
--- a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.3.0-Python-2.7.3.eb
@@ -9,7 +9,10 @@ description = """MPI for Python (mpi4py) provides bindings of the Message Passin
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
-source_urls = ['https://mpi4py.googlecode.com/files/']
+source_urls = [
+    BITBUCKET_DOWNLOADS,
+    GOOGLECODE_SOURCE,
+]
 sources = [SOURCE_TAR_GZ]
                                       
 python = 'Python'
diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.5.0-Python-2.7.5.eb b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.5.0-Python-2.7.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6f9b95ae80b25c89c58848e5aeacd16bb84911ac
--- /dev/null
+++ b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.5.0-Python-2.7.5.eb
@@ -0,0 +1,24 @@
+easyblock = 'PythonPackage'
+
+name = 'mpi4py'
+version = '1.3'
+
+homepage = 'https://bitbucket.org/mpi4py/mpi4py'
+description = """MPI for Python (mpi4py) provides bindings of the Message Passing Interface (MPI) standard for
+ the Python programming language, allowing any Python program to exploit multiple processors."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+source_urls = [
+    BITBUCKET_DOWNLOADS,
+    GOOGLECODE_SOURCE,
+]
+sources = [SOURCE_TAR_GZ]
+
+python = 'Python'
+pyver = '2.7.5'
+versionsuffix = '-%s-%s' % (python, pyver)
+
+dependencies = [(python, pyver)]
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/n/NASM/NASM-2.07-ictce-4.1.13.eb b/easybuild/easyconfigs/n/NASM/NASM-2.07-ictce-4.1.13.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f6a342b73ae7e1ec625c3e3c595030d07791d10c
--- /dev/null
+++ b/easybuild/easyconfigs/n/NASM/NASM-2.07-ictce-4.1.13.eb
@@ -0,0 +1,29 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine
+# Authors::   Fotis Georgatos <fotis.georgatos@uni.lu>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-90.html
+##
+
+name = 'NASM'
+version = '2.07'
+
+homepage = 'http://nasm.sourceforge.net/'
+description = """NASM-2.07: General-purpose x86 assembler"""
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['http://sourceforge.net/projects/nasm/files', 'download']
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+
+sanity_check_paths = {
+    'files': ['bin/nasm'],
+    'dirs': [],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/n/NCL/NCL-6.0.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/n/NCL/NCL-6.0.0-goalf-1.1.0-no-OFED.eb
index 3eab6d0bffabf948f11defc645f81de181f710e2..b0be2632664829acf91c3f5b63fdf0b1ade275e5 100644
--- a/easybuild/easyconfigs/n/NCL/NCL-6.0.0-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/n/NCL/NCL-6.0.0-goalf-1.1.0-no-OFED.eb
@@ -24,6 +24,4 @@ builddependencies = [('makedepend', '1.0.4')]
 
 sources = ['%s_ncarg-%s.tar.gz' % (name.lower(), version)]
 
-patches = ['NCL_fix-HDF-includes.patch']
-
 moduleclass = 'data'
diff --git a/easybuild/easyconfigs/n/NCL/NCL-6.0.0-goolf-1.4.10.eb b/easybuild/easyconfigs/n/NCL/NCL-6.0.0-goolf-1.4.10.eb
index af6e73e8063add40b7013f6db305acbdb16b3a38..241071f2b26a556830b705a4b742e4f0bd70e240 100644
--- a/easybuild/easyconfigs/n/NCL/NCL-6.0.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/n/NCL/NCL-6.0.0-goolf-1.4.10.eb
@@ -23,6 +23,4 @@ builddependencies = [('makedepend', '1.0.4')]
 
 sources = ['%s_ncarg-%s.tar.gz' % (name.lower(), version)]
 
-patches = ['NCL_fix-HDF-includes.patch']
-
 moduleclass = 'data'
diff --git a/easybuild/easyconfigs/n/NCL/NCL-6.0.0-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/n/NCL/NCL-6.0.0-ictce-3.2.2.u3.eb
index fd25d52c751bdee3e9c6c8bd1f6564499562dce0..7a7a84f29cb08aaeb1b116e986e71cf2deaf6d94 100644
--- a/easybuild/easyconfigs/n/NCL/NCL-6.0.0-ictce-3.2.2.u3.eb
+++ b/easybuild/easyconfigs/n/NCL/NCL-6.0.0-ictce-3.2.2.u3.eb
@@ -24,7 +24,6 @@ builddependencies = [('makedepend', '1.0.4')]
 
 sources = ['%s_ncarg-%s.tar.gz' % (name.lower(), version)]
 
-patches = ['NCL_intel_compound-fix.patch',
-           'NCL_fix-HDF-includes.patch']
+patches = ['NCL_intel_compound-fix.patch']
 
 moduleclass = 'data'
diff --git a/easybuild/easyconfigs/n/NCL/NCL-6.1.0-iqacml-3.7.3.eb b/easybuild/easyconfigs/n/NCL/NCL-6.1.0-iqacml-3.7.3.eb
index 0a7b5eac589c292d92050244dd626ee752790161..3aeb09682192b4e2bafbd7d61f76a4a1497b636e 100644
--- a/easybuild/easyconfigs/n/NCL/NCL-6.1.0-iqacml-3.7.3.eb
+++ b/easybuild/easyconfigs/n/NCL/NCL-6.1.0-iqacml-3.7.3.eb
@@ -10,10 +10,6 @@ toolchainopts = {'opt': True, 'pic': True, 'usempi': True}
 
 sources = ['%s_ncarg-%s.tar.gz' % (name.lower(), version)]
 
-patches = [
-    'NCL-6.1_fix-HDF-includes.patch',
-]
-
 dependencies = [
     ('cURL', '7.28.1'),
     ('netCDF', '4.2.1.1'),
diff --git a/easybuild/easyconfigs/n/NCL/NCL-6.1.2-ictce-4.1.13.eb b/easybuild/easyconfigs/n/NCL/NCL-6.1.2-ictce-4.1.13.eb
new file mode 100644
index 0000000000000000000000000000000000000000..26058d36f5779905a409631cafc35bba62b954dd
--- /dev/null
+++ b/easybuild/easyconfigs/n/NCL/NCL-6.1.2-ictce-4.1.13.eb
@@ -0,0 +1,33 @@
+name = 'NCL'
+version = '6.1.2'
+
+homepage = 'http://www.ncl.ucar.edu'
+description = """NCL is an interpreted language designed specifically for scientific data analysis and 
+ visualization."""
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+toolchainopts = {'opt': True, 'pic': True, 'usempi': True, 'openmp': True}
+
+sources = ['%(namelower)s_ncarg-%(version)s.tar.gz']
+
+dependencies = [
+    ('cURL', '7.28.1'),
+    ('netCDF', '4.2.1.1', '-mt'),
+    ('netCDF-Fortran', '4.2', '-mt'),
+    ('JasPer', '1.900.1'),
+    ('g2lib', '1.4.0'),
+    ('g2clib', '1.4.0'),
+    ('HDF', '4.2.8'),
+    ('Szip', '2.1'),
+    ('freetype', '2.4.11'),
+    ('zlib', '1.2.7'),
+    ('GDAL', '1.9.2'),
+    ('UDUNITS', '2.1.24'),
+    ('ESMF', '6.1.1'),
+    ('bzip2', '1.0.6'),
+]
+builddependencies = [('makedepend', '1.0.4')]
+
+osdependencies = ['cairo-devel']
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/n/NCL/NCL-6.1.2-iqacml-3.7.3.eb b/easybuild/easyconfigs/n/NCL/NCL-6.1.2-iqacml-3.7.3.eb
index 4c676295ad01f086506ab1a9b1ba76d59bc319b4..60e793f09a5ea00cb57764b88cfab567ce1a7b82 100644
--- a/easybuild/easyconfigs/n/NCL/NCL-6.1.2-iqacml-3.7.3.eb
+++ b/easybuild/easyconfigs/n/NCL/NCL-6.1.2-iqacml-3.7.3.eb
@@ -10,10 +10,6 @@ toolchainopts = {'opt': True, 'pic': True, 'usempi': True}
 
 sources = ['%s_ncarg-%s.tar.gz' % (name.lower(), version)]
 
-patches = [
-    'NCL-6.1_fix-HDF-includes.patch',
-]
-
 dependencies = [
     ('cURL', '7.28.1'),
     ('netCDF', '4.2.1.1'),
diff --git a/easybuild/easyconfigs/n/NEdit/NEdit-5.5-Linux-x86.eb b/easybuild/easyconfigs/n/NEdit/NEdit-5.5-Linux-x86.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6fc9490675bc6a1f4f4c378f6b27ac21fbd384b7
--- /dev/null
+++ b/easybuild/easyconfigs/n/NEdit/NEdit-5.5-Linux-x86.eb
@@ -0,0 +1,28 @@
+easyblock = "Tarball"
+
+name = "NEdit"
+version = "5.5"
+versionsuffix = "-Linux-x86"
+
+homepage = "http://www.nedit.org"
+description = """NEdit is a multi-purpose text editor for the X Window System,
+ which combines a standard, easy to use, graphical user interface with the thorough
+ functionality and stability required by users who edit text eight hours a day."""
+
+toolchain = {'version': 'dummy', 'name': 'dummy'}
+
+subdir = '_'.join(version.split('-')[0].split('.'))
+source_urls = ['http://ftp.vim.org/editors/NEdit/v%s/executables' % subdir ]
+sources = ['%(namelower)s-%(version)s%(versionsuffix)s.tar.gz']
+
+modextrapaths = {
+    'PATH': '',
+    'MANPATH': '',
+}
+
+sanity_check_paths = {
+    'files': ["nc", "nedit"],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-GCC-4.7.2.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-GCC-4.7.2.eb
index 9d8732ce410ff35fc0690c81e19fee9fbe01037e..3522f8a87b99bd3113a31f70abdce86546a0d556 100644
--- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-GCC-4.7.2.eb
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-GCC-4.7.2.eb
@@ -12,7 +12,7 @@ toolchainopts = {'optarch': True, 'pic': True}
 # In future, this URL will not be sufficient to obtain this tarball, because
 # the directory contains only a couple of older ncurses 5.9 snapshots.
 source_urls = ['ftp://invisible-island.net/ncurses/current/']
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
 
 # Parallel build contains a race on etip.h, needed for c++/demo.cc.
 parallel = 1
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgmpolf-1.1.6.eb
index 64f64c54eb2bab258f2acb10b5a9b831ac5b1fd0..f954a9b12a271effc56ef267704bb2377c1bfc15 100644
--- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgmpolf-1.1.6.eb
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgmpolf-1.1.6.eb
@@ -12,7 +12,7 @@ toolchainopts = {'optarch': True, 'pic': True}
 # In future, this URL will not be sufficient to obtain this tarball, because
 # the directory contains only a couple of older ncurses 5.9 snapshots.
 source_urls = ['ftp://invisible-island.net/ncurses/current/']
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
 
 # Parallel build contains a race on etip.h, needed for c++/demo.cc.
 parallel = 1
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgmvolf-1.1.12rc1.eb
index 97bd2dfeb693ca481c47a96cab6be85b9f0bfc06..6a10d2ec63c363e31a77a54902e499945eed7dcf 100644
--- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgmvolf-1.1.12rc1.eb
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgmvolf-1.1.12rc1.eb
@@ -12,7 +12,7 @@ toolchainopts = {'optarch': True, 'pic': True}
 # In future, this URL will not be sufficient to obtain this tarball, because
 # the directory contains only a couple of older ncurses 5.9 snapshots.
 source_urls = ['ftp://invisible-island.net/ncurses/current/']
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
 
 # Parallel build contains a race on etip.h, needed for c++/demo.cc.
 parallel = 1
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgmvolf-1.2.7.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgmvolf-1.2.7.eb
index 00d09276a8945e4b9a23fdbb06f1b970d802c11c..4913ef008f8ebac65148f362d32443fcf595b7e6 100644
--- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgmvolf-1.2.7.eb
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgmvolf-1.2.7.eb
@@ -9,7 +9,7 @@ function-key mapping, and has all the other SYSV-curses enhancements over BSD Cu
 toolchain = {'name': 'cgmvolf', 'version': '1.2.7'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
 # In future, this URL will not be sufficient to obtain this tarball, because
 # the directory contains only a couple of older ncurses 5.9 snapshots.
 source_urls = ['ftp://invisible-island.net/ncurses/current/']
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgoolf-1.1.7.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgoolf-1.1.7.eb
index 7d12bb5e121e111f5563c3267fde30e962f1ee4a..8b7d3a2416c6ff2c10fe61a11447786c85987d29 100644
--- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgoolf-1.1.7.eb
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgoolf-1.1.7.eb
@@ -12,7 +12,7 @@ toolchainopts = {'optarch': True, 'pic': True}
 # In future, this URL will not be sufficient to obtain this tarball, because
 # the directory contains only a couple of older ncurses 5.9 snapshots.
 source_urls = ['ftp://invisible-island.net/ncurses/current/']
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
 
 # Parallel build contains a race on etip.h, needed for c++/demo.cc.
 parallel = 1
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-gmvolf-1.7.12.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-gmvolf-1.7.12.eb
index 064d35ca840c3673d8bc41b972d5f646b1b5a45d..1632ef23de6428be684ed244393e5390c6598973 100644
--- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-gmvolf-1.7.12.eb
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-gmvolf-1.7.12.eb
@@ -12,7 +12,7 @@ toolchainopts = {'optarch': True, 'pic': True}
 # In future, this URL will not be sufficient to obtain this tarball, because
 # the directory contains only a couple of older ncurses 5.9 snapshots.
 source_urls = ['ftp://invisible-island.net/ncurses/current/']
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
 
 # Parallel build contains a race on etip.h, needed for c++/demo.cc.
 parallel = 1
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-gmvolf-1.7.12rc1.eb
index 8bd4bda9167fb79fc3bda6be08009edb18ddd3c3..43375f2a293e09e47e1f46aac131252f7ffcc4ec 100644
--- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-gmvolf-1.7.12rc1.eb
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-gmvolf-1.7.12rc1.eb
@@ -12,7 +12,7 @@ toolchainopts = {'optarch': True, 'pic': True}
 # In future, this URL will not be sufficient to obtain this tarball, because
 # the directory contains only a couple of older ncurses 5.9 snapshots.
 source_urls = ['ftp://invisible-island.net/ncurses/current/']
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
 
 # Parallel build contains a race on etip.h, needed for c++/demo.cc.
 parallel = 1
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-GCC-4.7.2.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-GCC-4.7.2.eb
index bd58d4c9be2e7f90a4fcf59f6c0045fae99a0673..ad58285a8513af8aa7faca7eaaf8f469e2546599 100644
--- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-GCC-4.7.2.eb
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-GCC-4.7.2.eb
@@ -9,7 +9,7 @@ function-key mapping, and has all the other SYSV-curses enhancements over BSD Cu
 toolchain = {'name': 'GCC', 'version': '4.7.2'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-source_urls = ['http://ftpmirror.gnu.org/%(name)s']
+source_urls = [GNU_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-GCC-4.7.3.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-GCC-4.7.3.eb
index edddf1e97ae6d47256dc1029ed6fdab5ef870af1..f972b6a4ffc003ebba3bababe376213801a7a1c8 100644
--- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-GCC-4.7.3.eb
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-GCC-4.7.3.eb
@@ -9,7 +9,7 @@ function-key mapping, and has all the other SYSV-curses enhancements over BSD Cu
 toolchain = {'name': 'GCC', 'version': '4.7.3'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-source_urls = ['http://ftpmirror.gnu.org/%(name)s']
+source_urls = [GNU_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-GCC-4.8.1.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-GCC-4.8.1.eb
index 910be3e3246a535581a9efd575089a8891ccccec..5f56a5562114b5dfa1c257b65e92645b508b2607 100644
--- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-GCC-4.8.1.eb
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-GCC-4.8.1.eb
@@ -9,7 +9,7 @@ function-key mapping, and has all the other SYSV-curses enhancements over BSD Cu
 toolchain = {'name': 'GCC', 'version': '4.8.1'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-source_urls = ['http://ftpmirror.gnu.org/%(name)s']
+source_urls = [GNU_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-GCC-4.8.2.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-GCC-4.8.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..cd59ae4ab317e7f6ecd05f254d4741f517de324e
--- /dev/null
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-GCC-4.8.2.eb
@@ -0,0 +1,15 @@
+name = 'ncurses'
+version = '5.9'
+
+homepage = 'http://www.gnu.org/software/ncurses/'
+description = """The Ncurses (new curses) library is a free software emulation of curses in System V Release 4.0,
+ and more. It uses Terminfo format, supports pads and color and multiple highlights and forms characters and
+ function-key mapping, and has all the other SYSV-curses enhancements over BSD Curses."""
+
+toolchain = {'name': 'GCC', 'version': '4.8.2'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-gmpolf-1.4.8.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-gmpolf-1.4.8.eb
index edda66f1dc6474d9b495e803b6065fdb2338206e..15745294d9f475b510c91ff6fee807b7427c33d0 100644
--- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-gmpolf-1.4.8.eb
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-gmpolf-1.4.8.eb
@@ -9,7 +9,7 @@ function-key mapping, and has all the other SYSV-curses enhancements over BSD Cu
 toolchain = {'name': 'gmpolf', 'version': '1.4.8'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-source_urls = ['http://ftpmirror.gnu.org/%(name)s']
+source_urls = [GNU_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goalf-1.1.0-no-OFED.eb
index fbc61c03f96d653d3b0c6eac6cd42e3c89f80a62..38b356d5e1a763c4d098b5f53c18174b4aaa155e 100644
--- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goalf-1.1.0-no-OFED.eb
@@ -9,7 +9,7 @@ description = """The Ncurses (new curses) library is a free software emulation o
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-source_urls = ['http://ftpmirror.gnu.org/%(name)s']
+source_urls = [GNU_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goalf-1.5.12-no-OFED.eb
index ec0e28d9899e53f876c39ecfe18e0438bc87e4df..947e8e3afaf18759ff1a65ee0644e43086a5a411 100644
--- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goalf-1.5.12-no-OFED.eb
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goalf-1.5.12-no-OFED.eb
@@ -9,7 +9,7 @@ description = """The Ncurses (new curses) library is a free software emulation o
 toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-source_urls = ['http://ftpmirror.gnu.org/%(name)s']
+source_urls = [GNU_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-gompi-1.4.12-no-OFED.eb
index 82a5ffa96a2d41ef0947ebeea7791520e669d0f7..4084c938c1c2a7782ffad1379754c2afd617a78a 100644
--- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-gompi-1.4.12-no-OFED.eb
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-gompi-1.4.12-no-OFED.eb
@@ -9,7 +9,7 @@ function-key mapping, and has all the other SYSV-curses enhancements over BSD Cu
 toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-source_urls = ['http://ftpmirror.gnu.org/%(name)s']
+source_urls = [GNU_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goolf-1.4.10.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goolf-1.4.10.eb
index 246b288ce10d810df8ab17a8e561b6a027e0e9d2..33bb21037fd7ac4a65074b61bf3ce9ce27fe6e58 100644
--- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goolf-1.4.10.eb
@@ -9,7 +9,7 @@ function-key mapping, and has all the other SYSV-curses enhancements over BSD Cu
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-source_urls = ['http://ftpmirror.gnu.org/%(name)s']
+source_urls = [GNU_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goolfc-1.3.12.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goolfc-1.3.12.eb
index e4ac4f446a89f38ce41b1c999319770d98701dbc..5a698183f4f79d5d5b3f3f7b4f42c0ffb3999300 100644
--- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goolfc-1.3.12.eb
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goolfc-1.3.12.eb
@@ -9,7 +9,7 @@ function-key mapping, and has all the other SYSV-curses enhancements over BSD Cu
 toolchain = {'name': 'goolfc', 'version': '1.3.12'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-source_urls = ['http://ftpmirror.gnu.org/%(name)s']
+source_urls = [GNU_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goolfc-2.6.10.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goolfc-2.6.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4e33e95089d0a624fd05522fadf7811e2abeb808
--- /dev/null
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goolfc-2.6.10.eb
@@ -0,0 +1,15 @@
+name = 'ncurses'
+version = '5.9'
+
+homepage = 'http://www.gnu.org/software/ncurses/'
+description = """The Ncurses (new curses) library is a free software emulation of curses in System V Release 4.0,
+and more. It uses Terminfo format, supports pads and color and multiple highlights and forms characters and
+function-key mapping, and has all the other SYSV-curses enhancements over BSD Curses."""
+
+toolchain = {'name': 'goolfc', 'version': '2.6.10'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['http://ftpmirror.gnu.org/%(name)s']
+sources = [SOURCE_TAR_GZ]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-3.2.2.u3.eb
index c5f6b9a10772a16f3d13303f8a582b7c6dbfd455..c0284ad94f484ff092d1be2ca13001b0672cb2f1 100644
--- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-3.2.2.u3.eb
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-3.2.2.u3.eb
@@ -9,7 +9,7 @@ description = """The Ncurses (new curses) library is a free software emulation o
 toolchain = {'name': 'ictce', 'version': '3.2.2.u3'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-source_urls = ['http://ftpmirror.gnu.org/%(name)s']
+source_urls = [GNU_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-4.0.10.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-4.0.10.eb
index 0d526d6fbb9b2221710e596866115c06862a574a..95388cfc5b6d2e549dfe51de58b354a4abfab48e 100644
--- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-4.0.10.eb
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-4.0.10.eb
@@ -9,7 +9,7 @@ description = """The Ncurses (new curses) library is a free software emulation o
 toolchain = {'name': 'ictce', 'version': '4.0.10'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-source_urls = ['http://ftpmirror.gnu.org/%(name)s']
+source_urls = [GNU_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-4.0.6.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-4.0.6.eb
index 523dca81d98180fe784322cdf1ad950c786cf0f2..731485e77bb044ec79ba33d3a1fc5d357ba0406d 100644
--- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-4.0.6.eb
@@ -9,7 +9,7 @@ description = """The Ncurses (new curses) library is a free software emulation o
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-source_urls = ['http://ftpmirror.gnu.org/%(name)s']
+source_urls = [GNU_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-4.1.13.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-4.1.13.eb
index 4cc75a29d9f2edef82cea9c522ee9f9bcd3d8307..8cb79c351b8087fe72e0ad91d2734e6effb94df3 100644
--- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-4.1.13.eb
@@ -9,7 +9,7 @@ description = """The Ncurses (new curses) library is a free software emulation o
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-source_urls = ['http://ftpmirror.gnu.org/%(name)s']
+source_urls = [GNU_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-5.2.0.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-5.2.0.eb
index ab29dec4fe34a5bc7152e8cf89d9c9cfea2b56bb..ee127c7a3c35601056fd67f032ae7d9b2050208d 100644
--- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-5.2.0.eb
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-5.2.0.eb
@@ -7,8 +7,9 @@ and more. It uses Terminfo format, supports pads and color and multiple highligh
 function-key mapping, and has all the other SYSV-curses enhancements over BSD Curses."""
 
 toolchain = {'name': 'ictce', 'version': '5.2.0'}
+toolchainopts = {'optarch': True, 'pic': True}
 
-source_urls = ['http://ftpmirror.gnu.org/%(name)s']
+source_urls = [GNU_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-5.3.0.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-5.3.0.eb
index 60209824d790138252a624ce64441ade15c4aa33..020778b318ecb01f7c95c411c83762ec6a49c88c 100644
--- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-5.3.0.eb
@@ -9,7 +9,7 @@ description = """The Ncurses (new curses) library is a free software emulation o
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-source_urls = ['http://ftpmirror.gnu.org/%(name)s']
+source_urls = [GNU_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-5.5.0.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-5.5.0.eb
index c4b928cee8b44d63145a4847ac34728050c5cc31..a81155369d140411cd90b282723fa67c5a7b9cda 100644
--- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-5.5.0.eb
@@ -9,7 +9,7 @@ description = """The Ncurses (new curses) library is a free software emulation o
 toolchain = {'name': 'ictce', 'version': '5.5.0'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-source_urls = ['http://ftpmirror.gnu.org/%(name)s']
+source_urls = [GNU_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-iomkl-4.6.13.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-iomkl-4.6.13.eb
index 6648a8a7abe52848ff94acb2fd482c55b793a0bc..9963e053c2ff37d9944dbbbd70e2452c8996e988 100644
--- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-iomkl-4.6.13.eb
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-iomkl-4.6.13.eb
@@ -9,7 +9,7 @@ description = """The Ncurses (new curses) library is a free software emulation o
 toolchain = {'name': 'iomkl', 'version': '4.6.13'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-source_urls = ['http://ftpmirror.gnu.org/%(name)s']
+source_urls = [GNU_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-iqacml-3.7.3.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-iqacml-3.7.3.eb
index 2b469fedf6247e8baa72bb3e96de3601423d509e..decfe9bc04b5d0a8b9dd9938a6ded2fea1eabc2d 100644
--- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-iqacml-3.7.3.eb
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-iqacml-3.7.3.eb
@@ -9,7 +9,7 @@ function-key mapping, and has all the other SYSV-curses enhancements over BSD Cu
 toolchain = {'name': 'iqacml', 'version': '3.7.3'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-source_urls = ['http://ftpmirror.gnu.org/%(name)s']
+source_urls = [GNU_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-iqacml-4.4.13.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-iqacml-4.4.13.eb
index 0395e1a0100ee6365964b7b247cbe2864b295337..f4b42632c95c69520cb058504ffa7e2c0b6ac29a 100644
--- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-iqacml-4.4.13.eb
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-iqacml-4.4.13.eb
@@ -9,7 +9,7 @@ description = """The Ncurses (new curses) library is a free software emulation o
 toolchain = {'name': 'iqacml', 'version': '4.4.13'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-source_urls = ['http://ftpmirror.gnu.org/%(name)s']
+source_urls = [GNU_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/n/netCDF-C++/netCDF-C++-4.2-ictce-4.1.13-mt.eb b/easybuild/easyconfigs/n/netCDF-C++/netCDF-C++-4.2-ictce-4.1.13-mt.eb
new file mode 100644
index 0000000000000000000000000000000000000000..df031c2880621fd615139bb71a765151c302bab9
--- /dev/null
+++ b/easybuild/easyconfigs/n/netCDF-C++/netCDF-C++-4.2-ictce-4.1.13-mt.eb
@@ -0,0 +1,26 @@
+name = 'netCDF-C++'
+version = '4.2'
+versionsuffix = '-mt'
+
+homepage = 'http://www.unidata.ucar.edu/software/netcdf/'
+description = """NetCDF (network Common Data Form) is a set of software libraries 
+ and machine-independent data formats that support the creation, access, and sharing of array-oriented 
+ scientific data."""
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+toolchainopts = {'pic': True, 'openmp': True}
+
+sources = ['netcdf-cxx-%(version)s.tar.gz']
+source_urls = ['http://www.unidata.ucar.edu/downloads/netcdf/ftp/']
+
+dependencies = [
+    ('netCDF', '4.2.1.1', versionsuffix),
+    ('cURL', '7.28.1'),
+]
+
+sanity_check_paths = {
+    'files': ['include/ncvalues.h', 'include/netcdfcpp.h', 'include/netcdf.hh', 'lib/libnetcdf_c++.a', 'lib/libnetcdf_c++.so'],
+    'dirs': [],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/n/netCDF-C++/netCDF-C++-4.2-ictce-4.1.13.eb b/easybuild/easyconfigs/n/netCDF-C++/netCDF-C++-4.2-ictce-4.1.13.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7c205aa876412916405b9f29361a3487a6b7ef40
--- /dev/null
+++ b/easybuild/easyconfigs/n/netCDF-C++/netCDF-C++-4.2-ictce-4.1.13.eb
@@ -0,0 +1,22 @@
+name = 'netCDF-C++'
+version = '4.2'
+
+homepage = 'http://www.unidata.ucar.edu/software/netcdf/'
+description = """NetCDF (network Common Data Form) is a set of software libraries 
+ and machine-independent data formats that support the creation, access, and sharing of array-oriented 
+ scientific data."""
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+toolchainopts = {'pic': True}
+
+sources = ['netcdf-cxx-%(version)s.tar.gz']
+source_urls = ['http://www.unidata.ucar.edu/downloads/netcdf/ftp/']
+
+dependencies = [('netCDF', '4.2.1.1')]
+
+sanity_check_paths = {
+    'files': ['include/ncvalues.h', 'include/netcdfcpp.h', 'include/netcdf.hh', 'lib/libnetcdf_c++.a', 'lib/libnetcdf_c++.so'],
+    'dirs': [],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/n/netCDF-Fortran/netCDF-Fortran-4.2-ictce-4.1.13-mt.eb b/easybuild/easyconfigs/n/netCDF-Fortran/netCDF-Fortran-4.2-ictce-4.1.13-mt.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6b36f2c00bc417ca6deb2dd17b7a36f2d7a3dfa2
--- /dev/null
+++ b/easybuild/easyconfigs/n/netCDF-Fortran/netCDF-Fortran-4.2-ictce-4.1.13-mt.eb
@@ -0,0 +1,18 @@
+name = 'netCDF-Fortran'
+version = '4.2'
+versionsuffix = '-mt'
+
+homepage = 'http://www.unidata.ucar.edu/software/netcdf/'
+description = """NetCDF (network Common Data Form) is a set of software libraries 
+ and machine-independent data formats that support the creation, access, and sharing of array-oriented 
+ scientific data."""
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+toolchainopts = {'pic': True, 'openmp': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.unidata.ucar.edu/downloads/netcdf/ftp/']
+
+dependencies = [('netCDF', '4.2.1.1', versionsuffix)]
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-goolf-1.4.10.eb b/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-goolf-1.4.10.eb
index 62a030205611b65156e4fa84365ed1e24696be46..4f975041bc7545bfd52457ba719ab15f692121c8 100644
--- a/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-goolf-1.4.10.eb
@@ -12,9 +12,8 @@ toolchainopts = {'pic': True}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://www.unidata.ucar.edu/downloads/netcdf/ftp/']
 
-dependencies = [
-    ('HDF5', '1.8.10-patch1'),
-    ('Doxygen', '1.8.3.1')
-]
+dependencies = [('HDF5', '1.8.10-patch1')]
+
+builddependencies = [('Doxygen', '1.8.3.1')]
 
 moduleclass = 'data'
diff --git a/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-4.1.13-mt.eb b/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-4.1.13-mt.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1d208f1301b2d4915c6e4f480180b6d95df7810c
--- /dev/null
+++ b/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-4.1.13-mt.eb
@@ -0,0 +1,20 @@
+name = 'netCDF'
+version = '4.2.1.1'
+versionsuffix = '-mt'
+
+homepage = 'http://www.unidata.ucar.edu/software/netcdf/'
+description = """NetCDF (network Common Data Form) is a set of software libraries 
+ and machine-independent data formats that support the creation, access, and sharing of array-oriented 
+ scientific data."""
+
+toolchain = {'name':'ictce','version':'4.1.13'}
+toolchainopts = {'pic': True, 'openmp': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.unidata.ucar.edu/downloads/netcdf/ftp/']
+
+dependencies = [('HDF5', '1.8.10', '-gpfs-mt')]
+
+builddependencies = [('Doxygen', '1.8.3.1')]
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-4.1.13.eb b/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-4.1.13.eb
index 7f0aa16d44e9426d4c70f2fa7d59e9109dda7a2b..a43794119f16467be15736098adb5779bc3052a3 100644
--- a/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-4.1.13.eb
@@ -12,9 +12,8 @@ toolchainopts = {'pic':True}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://www.unidata.ucar.edu/downloads/netcdf/ftp/']
 
-dependencies = [
-    ('HDF5', '1.8.10', '-gpfs'),
-    ('Doxygen', '1.8.2')
-]
+dependencies = [('HDF5', '1.8.10', '-gpfs')]
+
+builddependencies = [('Doxygen', '1.8.3.1')]
 
 moduleclass = 'data'
diff --git a/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-5.3.0.eb b/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-5.3.0.eb
index b3da59719ed3bd976d5dd5893961951b04706363..b2e2392049f2b9eb925c8946e7e574327dcf51c0 100644
--- a/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-5.3.0.eb
@@ -12,9 +12,8 @@ toolchainopts = {'pic': True}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://www.unidata.ucar.edu/downloads/netcdf/ftp/']
 
-dependencies = [
-                ('HDF5', '1.8.10', '-gpfs'),
-                ('Doxygen', '1.8.2')
-               ]
+dependencies = [('HDF5', '1.8.10', '-gpfs')]
+
+builddependencies = [('Doxygen', '1.8.3.1')]
 
 moduleclass = 'data'
diff --git a/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-iqacml-3.7.3.eb b/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-iqacml-3.7.3.eb
index e2a1c7f2e6a9ff689e375b1c4465032821304d3c..dd168910be3759ffd3e336830fe90766fecfbe6f 100644
--- a/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-iqacml-3.7.3.eb
+++ b/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-iqacml-3.7.3.eb
@@ -12,9 +12,8 @@ toolchainopts = {'pic': True}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://www.unidata.ucar.edu/downloads/netcdf/ftp/']
 
-dependencies = [
-    ('HDF5', '1.8.10-patch1'),
-    ('Doxygen', '1.8.3.1')
-]
+dependencies = [('HDF5', '1.8.10-patch1')]
+
+builddependencies = [('Doxygen', '1.8.3.1')]
 
 moduleclass = 'data'
diff --git a/easybuild/easyconfigs/n/netCDF/netCDF-4.3.0-ictce-5.5.0.eb b/easybuild/easyconfigs/n/netCDF/netCDF-4.3.0-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..78d6d431c3e7005756656263aaf7b7eeb26d08c8
--- /dev/null
+++ b/easybuild/easyconfigs/n/netCDF/netCDF-4.3.0-ictce-5.5.0.eb
@@ -0,0 +1,36 @@
+name = 'netCDF'
+version = '4.3.0'
+
+homepage = 'http://www.unidata.ucar.edu/software/netcdf/'
+description = """NetCDF (network Common Data Form) is a set of software libraries 
+ and machine-independent data formats that support the creation, access, and sharing of array-oriented 
+ scientific data."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'pic': True, 'usempi': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.unidata.ucar.edu/downloads/netcdf/ftp/']
+
+patches = [('netCDF-4.3.0_nc-config.in.cmake', 'netcdf-4.3.0')]
+
+dependencies = [('HDF5', '1.8.12')]
+
+builddependencies = [
+    ('CMake', '2.8.12'),
+    ('Doxygen', '1.8.6'),
+    ('cURL', '7.34.0'),
+]
+
+# we need to specify correct start dir, since unpacked tarball also contains e.g. ._netcdf-4.3.0
+start_dir = '%(namelower)s-%(version)s'
+
+preconfigopts = 'mv netCDF-4.3.0_nc-config.in.cmake nc-config.in.cmake && '
+
+# make sure both static and shared libs are built
+configopts = [
+    "-DCURL_LIBRARY=$EBROOTCURL/lib/libcurl.so -DCURL_INCLUDE_DIR=$EBROOTCURL/include -DBUILD_SHARED_LIBS=ON",
+    "-DCURL_LIBRARY=$EBROOTCURL/lib/libcurl.so -DCURL_INCLUDE_DIR=$EBROOTCURL/include -DBUILD_SHARED_LIBS=OFF",
+]
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/n/netCDF/netCDF-4.3.0_nc-config.in.cmake b/easybuild/easyconfigs/n/netCDF/netCDF-4.3.0_nc-config.in.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..c97f8bf3ebc6bac6f2a217d38a45dc7804023da2
--- /dev/null
+++ b/easybuild/easyconfigs/n/netCDF/netCDF-4.3.0_nc-config.in.cmake
@@ -0,0 +1,295 @@
+#! /bin/sh
+#
+# This forms the basis for the nc-config utility, which tells you
+# various things about the netCDF installation. This code was
+# contributed by netCDF user Arlindo DaSilva. Thanks Arlindo!
+
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=@CMAKE_INSTALL_PREFIX@
+libdir=@CMAKE_INSTALL_PREFIX@/lib
+includedir=@CMAKE_INSTALL_PREFIX@/include
+
+cc="@CMAKE_C_COMPILER@"
+cflags="-I@CMAKE_INSTALL_PREFIX@/include @CMAKE_C_FLAGS@ @CMAKE_CPP_FLAGS@"
+libs="-L@CMAKE_INSTALL_PREFIX@/lib -l@ALL_TLL_LIBS@"
+
+has_dap="@USE_DAP@"
+if [ -z $has_dap ]; then
+    has_dap="no"
+else
+    has_dap="yes"
+fi
+
+has_nc2="@BUILD_V2@"
+
+if [ -z $has_nc2 ]; then
+    has_nc2="no"
+else
+    has_nc2="yes"
+fi
+
+has_nc4="@USE_NETCDF4@"
+if [ -z $has_nc4 ]; then
+    has_nc4="no"
+else
+    has_nc4="yes"
+fi
+
+has_hdf4="@USE_HDF4@"
+if [ -z $has_hdf4 ]; then
+    has_hdf4="no"
+else
+    has_hdf4="yes"
+fi
+
+has_pnetcdf="@USE_PNETCDF@"
+if [ -z $has_pnetcdf ]; then
+    has_pnetcdf="no"
+else
+    has_pnetcdf="yes"
+fi
+
+has_hdf5="@USE_HDF5@"
+if [ -z $has_hdf5 ]; then
+    has_hdf5="no"
+else
+    has_hdf5="yes"
+fi
+
+has_szlib="@USE_SZLIB@"
+if [ -z $has_szlib ]; then
+    has_szlib="no"
+else
+    has_szlib="yes"
+fi
+
+
+version="@PACKAGE@ @VERSION@"
+
+has_f90="no"
+if type -p nf-config > /dev/null 2>&1; then
+  fc=`nf-config --fc`
+  fflags=`nf-config --fflags`
+  flibs=`nf-config --flibs`
+  has_f90=`nf-config --has-f90`
+fi
+
+has_cxx="no"
+has_cxx4="no"
+if type -p ncxx4-config > /dev/null 2>&1; then
+  cxx4=`ncxx4-config --cxx`
+  has_cxx4="yes"
+elif type -p ncxx-config > /dev/null 2>&1; then
+  cxx=`ncxx-config --cxx`
+  has_cxx="yes"
+fi
+
+usage()
+{
+    cat <<EOF
+Usage: nc-config [OPTION]
+
+Available values for OPTION include:
+
+  --help        display this help message and exit
+  --all         display all options
+  --cc          C compiler
+  --cflags      pre-processor and compiler flags
+  --has-dap     whether OPeNDAP is enabled in this build
+  --has-nc2     whether NetCDF-2 API is enabled
+  --has-nc4     whether NetCDF-4/HDF-5 is enabled in this build
+  --has-hdf5    whether HDF5 is used in build (always the same as --has-nc4)
+  --has-hdf4    whether HDF4 was used in build
+  --has-pnetcdf whether parallel-netcdf (a.k.a. pnetcdf) was used in build
+  --has-szlib   whether szlib is included in build
+  --libs        library linking information for netcdf
+  --prefix      Install prefix
+  --includedir  Include directory
+  --version     Library version
+
+EOF
+# When supported by ncxx4-config and ncxx-config, add
+#  --cxxflags    flags needed to compile a netCDF-4 C++ program
+#  --cxxlibs     libraries needed to link a netCDF-4 C++ program
+if type -p ncxx4-config > /dev/null 2>&1; then
+    cat <<EOF
+  --cxx4         C++ compiler for netCDF-4 C++ library
+  --has-c++4     whether netCDF-4 C++ API is installed
+EOF
+elif type -p ncxx-config > /dev/null 2>&1; then
+    cat <<EOF
+  --cxx         C++ compiler
+  --has-c++     whether C++ API is installed
+
+EOF
+fi
+if type -p nf-config > /dev/null 2>&1; then
+    cat <<EOF
+  --fc          Fortran compiler
+  --fflags      flags needed to compile a Fortran program
+  --flibs       libraries needed to link a Fortran program
+  --has-f90     whether Fortran 90 API is installed
+
+EOF
+fi
+    exit $1
+}
+
+all()
+{
+        echo
+        echo "This $version has been built with the following features: "
+        echo
+        echo "  --cc        -> $cc"
+        echo "  --cflags    -> $cflags"
+        echo "  --libs      -> $libs"
+        echo
+        echo "  --has-c++   -> $has_cxx"
+        echo "  --cxx       -> $cxx"
+        echo "  --has-c++4  -> $has_cxx4"
+        echo "  --cxx4      -> $cxx4"
+        echo
+        echo "  --fc        -> $fc"
+        echo "  --fflags    -> $fflags"
+        echo "  --flibs     -> $flibs"
+        echo "  --has-f90   -> $has_f90"
+        echo
+        echo "  --has-dap   -> $has_dap"
+        echo "  --has-nc2   -> $has_nc2"
+        echo "  --has-nc4   -> $has_nc4"
+        echo "  --has-hdf5  -> $has_hdf5"
+        echo "  --has-hdf4  -> $has_hdf4"
+        echo "  --has-pnetcdf-> $has_pnetcdf"
+        echo "  --has-szlib -> $has_szlib"
+    echo
+        echo "  --prefix    -> $prefix"
+        echo "  --includedir-> $includedir"
+        echo "  --version   -> $version"
+        echo
+}
+
+if test $# -eq 0; then
+    usage 1
+fi
+
+while test $# -gt 0; do
+    case "$1" in
+    # this deals with options in the style
+    # --option=value and extracts the value part
+    # [not currently used]
+    -*=*) value=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+    *) value= ;;
+    esac
+
+    case "$1" in
+
+    --help)
+    usage 0
+    ;;
+
+    --all)
+    all
+    ;;
+
+    --cc)
+    echo $cc
+    ;;
+
+    --cflags)
+    echo $cflags
+    ;;
+
+    --has-dap)
+        echo $has_dap
+        ;;
+
+    --has-nc2)
+        echo $has_nc2
+        ;;
+
+    --has-nc4)
+        echo $has_nc4
+        ;;
+
+    --has-hdf5)
+        echo $has_hdf5
+        ;;
+
+    --has-hdf4)
+        echo $has_hdf4
+        ;;
+
+    --has-pnetcdf)
+        echo $has_pnetcdf
+        ;;
+
+    --has-szlib)
+        echo $has_szlib
+        ;;
+
+     --libs)
+        echo $libs
+        ;;
+
+    --prefix)
+        echo "${prefix}"
+        ;;
+
+    --includedir)
+        echo "${includedir}"
+        ;;
+
+    --version)
+    echo $version
+    ;;
+
+    --has-c++)
+        echo $has_cxx
+        ;;
+
+    --cxx)
+    echo $cxx
+    ;;
+
+    --has-c++4)
+        echo $has_cxx4
+        ;;
+
+    --cxx4)
+    echo $cxx4
+    ;;
+
+#    --cxxflags)
+#   echo $cxxflags
+#   ;;
+#
+#    --cxxlibs)
+#   echo $cxxlibs
+#   ;;
+
+    --fc)
+    echo $fc
+    ;;
+
+    --fflags)
+    echo $fflags
+    ;;
+
+    --flibs)
+        echo $flibs
+        ;;
+
+    --has-f90)
+        echo $has_f90
+        ;;
+
+    *)
+        echo "unknown option: $1"
+    usage
+    exit 1
+    ;;
+    esac
+    shift
+done
+
+exit 0
diff --git a/easybuild/easyconfigs/n/netCDF/netCDF-C++-4.2-ictce-5.3.0.eb b/easybuild/easyconfigs/n/netCDF/netCDF-C++-4.2-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1f5199fe78e3daaaa89a144bbad978039aaada06
--- /dev/null
+++ b/easybuild/easyconfigs/n/netCDF/netCDF-C++-4.2-ictce-5.3.0.eb
@@ -0,0 +1,22 @@
+name = 'netCDF-C++'
+version = '4.2'
+
+homepage = 'http://www.unidata.ucar.edu/software/netcdf/'
+description = """NetCDF (network Common Data Form) is a set of software libraries 
+ and machine-independent data formats that support the creation, access, and sharing of array-oriented 
+ scientific data."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'pic': True}
+
+sources = ['netcdf-cxx-%(version)s.tar.gz']
+source_urls = ['http://www.unidata.ucar.edu/downloads/netcdf/ftp/']
+
+dependencies = [('netCDF', '4.2.1.1')]
+
+sanity_check_paths = {
+    'files': ['include/ncvalues.h', 'include/netcdfcpp.h', 'include/netcdf.hh', 'lib/libnetcdf_c++.a', 'lib/libnetcdf_c++.so'],
+    'dirs': [],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/n/netaddr/netaddr-0.7.10-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/n/netaddr/netaddr-0.7.10-ictce-5.5.0-Python-2.7.6.eb
new file mode 100644
index 0000000000000000000000000000000000000000..dd70ce8320f05f11bef228f483cbf317d51f2109
--- /dev/null
+++ b/easybuild/easyconfigs/n/netaddr/netaddr-0.7.10-ictce-5.5.0-Python-2.7.6.eb
@@ -0,0 +1,24 @@
+easyblock = 'PythonPackage'
+
+name = 'netaddr'
+version = '0.7.10'
+
+homepage = 'https://pypi.python.org/pypi/netaddr'
+description = """Pythonic manipulation of IPv4, IPv6, CIDR, EUI and MAC network
+addresses"""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+source_urls = ['https://pypi.python.org/packages/source/n/netaddr/']
+sources = [SOURCE_TAR_GZ]
+
+python = 'Python'
+pythonver = '2.7.6'
+pythonshortver = '.'.join(pythonver.split('.')[0:2])
+versionsuffix = '-%s-%s' % (python, pythonver)
+
+dependencies = [
+    (python, pythonver),
+]
+
+options = {'modulename': 'netaddr'}
diff --git a/easybuild/easyconfigs/n/netcdf4-python/netcdf4-python-1.0.7-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/n/netcdf4-python/netcdf4-python-1.0.7-ictce-5.5.0-Python-2.7.6.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4705fe247a6ca5c8d452990dff8f22b23b29f162
--- /dev/null
+++ b/easybuild/easyconfigs/n/netcdf4-python/netcdf4-python-1.0.7-ictce-5.5.0-Python-2.7.6.eb
@@ -0,0 +1,25 @@
+name = 'netcdf4-python'
+version = '1.0.7'
+
+homepage = 'https://code.google.com/p/netcdf4-python/'
+description = """Python/numpy interface to netCDF."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'usempi': True}
+
+source_urls = ['https://netcdf4-python.googlecode.com/files']
+sources = ['netCDF4-%(version)s.tar.gz']
+
+python = 'Python'
+pythonver = '2.7.6'
+pythonshortver = '.'.join(pythonver.split('.')[0:2])
+versionsuffix = '-%s-%s' % (python, pythonver)
+
+dependencies = [
+    (python, pythonver),
+    ('HDF5', '1.8.12'),
+    ('Cython', '0.19.2', versionsuffix),
+    ('netCDF', '4.3.0'),
+]
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/n/netifaces/netifaces-0.8-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/n/netifaces/netifaces-0.8-ictce-5.5.0-Python-2.7.6.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3bbd0c1fcacb5961abbf1d1f61637a59c99b197d
--- /dev/null
+++ b/easybuild/easyconfigs/n/netifaces/netifaces-0.8-ictce-5.5.0-Python-2.7.6.eb
@@ -0,0 +1,25 @@
+easyblock = 'PythonPackage'
+
+name = 'netifaces'
+version = '0.8'
+
+homepage = 'https://pypi.python.org/pypi/netifaces'
+description = """netifaces provides a (hopefully portable-ish) way for Python
+programmers to get access to a list of the network interfaces on the local
+machine, and to obtain the addresses of those network interfaces."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+source_urls = ['http://alastairs-place.net/projects/netifaces/']
+sources = [SOURCE_TAR_GZ]
+
+python = 'Python'
+pythonver = '2.7.6'
+pythonshortver = '.'.join(pythonver.split('.')[0:2])
+versionsuffix = '-%s-%s' % (python, pythonver)
+
+dependencies = [
+    (python, pythonver),
+]
+
+options = {'modulename': 'netifaces'}
diff --git a/easybuild/easyconfigs/n/netloc/netloc-0.5-gcccuda-2.6.10.eb b/easybuild/easyconfigs/n/netloc/netloc-0.5-gcccuda-2.6.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f570d5694f2dc84feeb97d4874eadd064bc97676
--- /dev/null
+++ b/easybuild/easyconfigs/n/netloc/netloc-0.5-gcccuda-2.6.10.eb
@@ -0,0 +1,24 @@
+name = 'netloc'
+version = "0.5"
+
+homepage = 'http://www.open-mpi.org/software/netloc'
+description = """The Portable Network Locality (netloc) software package provides
+ network topology discovery tools, and an abstract representation of those networks
+ topologies for a range of network types and configurations.
+ It is provided as a companion to the Portable Hardware Locality (hwloc) package."""
+
+toolchain = {'name': 'gcccuda', 'version': '2.6.10'}
+  
+dependencies = [
+    ('hwloc', '1.8'),
+    ('Jansson', '2.5'),
+]
+
+configopts = '--with-hwloc=$EBROOTHWLOC '      # hwloc support
+configopts += '--with-jansson=$EBROOTJANSSON ' # jansson support
+
+# fi. http://www.open-mpi.org/software/netloc/v0.5/downloads/netloc-0.5.tar.gz
+source_urls = [homepage + '/v%(version_major_minor)s/downloads']
+sources = [SOURCE_TAR_GZ]
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/n/nodejs/nodejs-0.10.24-goolf-1.4.10.eb b/easybuild/easyconfigs/n/nodejs/nodejs-0.10.24-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9c91472a53dbe7e163b90ebce5fa11fa1b06689e
--- /dev/null
+++ b/easybuild/easyconfigs/n/nodejs/nodejs-0.10.24-goolf-1.4.10.eb
@@ -0,0 +1,24 @@
+name = 'nodejs'
+version = '0.10.24'
+
+homepage = 'http://nodejs.org'
+
+description = """Node.js is a platform built on Chrome's JavaScript runtime 
+ for easily building fast, scalable network applications. Node.js uses an 
+ event-driven, non-blocking I/O model that makes it lightweight and efficient, 
+ perfect for data-intensive real-time applications that run across distributed devices."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+sources = ['node-v%(version)s.tar.gz']
+
+source_urls = ['http://nodejs.org/dist/v%(version)s/']
+
+dependencies = [('Python','2.7.5')]
+
+sanity_check_paths = {
+    'files': ["bin/node", "bin/npm", ],
+    'dirs': ["lib/node_modules", "lib/dtrace", "include/node"]
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/n/numexpr/numexpr-2.0.1-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/n/numexpr/numexpr-2.0.1-ictce-4.1.13-Python-2.7.3.eb
index d5a11e2a586f24c821b8bcf40cdedd8fdf73eb57..4606d670d05b5a88f418c7248931b92837505b8d 100644
--- a/easybuild/easyconfigs/n/numexpr/numexpr-2.0.1-ictce-4.1.13-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/n/numexpr/numexpr-2.0.1-ictce-4.1.13-Python-2.7.3.eb
@@ -12,7 +12,7 @@ description = """The numexpr package evaluates multiple-operator array expressio
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 toolchainopts = {'usempi': True}
 
-source_urls = ['http://numexpr.googlecode.com/files/']
+source_urls = [GOOGLECODE_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 python = 'Python'
diff --git a/easybuild/easyconfigs/n/numexpr/numexpr-2.0.1-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/n/numexpr/numexpr-2.0.1-ictce-5.3.0-Python-2.7.3.eb
index 5d945019b93ec9d012d8a170a4607aa750ad25e0..23dc125463021077a2cfff1002ee314471a575f8 100644
--- a/easybuild/easyconfigs/n/numexpr/numexpr-2.0.1-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/n/numexpr/numexpr-2.0.1-ictce-5.3.0-Python-2.7.3.eb
@@ -9,11 +9,10 @@ description = """The numexpr package evaluates multiple-operator array expressio
  code for its internal virtual machine (VM). Due to its integrated just-in-time (JIT) compiler, it does not require a
  compiler at runtime."""
 
-
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 toolchainopts = {'usempi': True}
 
-source_urls = ['http://numexpr.googlecode.com/files/']
+source_urls = [GOOGLECODE_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 python = 'Python'
diff --git a/easybuild/easyconfigs/n/numexpr/numexpr-2.2.2-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/n/numexpr/numexpr-2.2.2-ictce-5.5.0-Python-2.7.6.eb
new file mode 100644
index 0000000000000000000000000000000000000000..585a1680b7ce7ca3b62d1d3cea7f0429f60484c0
--- /dev/null
+++ b/easybuild/easyconfigs/n/numexpr/numexpr-2.2.2-ictce-5.5.0-Python-2.7.6.eb
@@ -0,0 +1,34 @@
+easyblock = "PythonPackage"
+
+name = 'numexpr'
+version = '2.2.2'
+
+homepage = 'http://code.google.com/p/numexpr/'
+description = """The numexpr package evaluates multiple-operator array expressions many times faster than NumPy can.
+ It accepts the expression as a string, analyzes it, rewrites it more efficiently, and compiles it on the fly into
+ code for its internal virtual machine (VM). Due to its integrated just-in-time (JIT) compiler, it does not require a
+ compiler at runtime."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'usempi': True}
+
+source_urls = [GOOGLECODE_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+python = 'Python'
+pythonver = '2.7.6'
+pythonshortver = '.'.join(pythonver.split('.')[0:2])
+versionsuffix = '-%s-%s' % (python, pythonver)
+
+dependencies = [
+    (python, pythonver),
+    ('HDF5', '1.8.12'),
+]
+
+eggname = '%s-%s-py%s-linux-x86_64.egg' % (name, version, pythonshortver)
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%s/site-packages/%s/%s' % (pythonshortver, eggname, name)],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.6.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/n/numpy/numpy-1.6.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index b3aafe69b03f9fb3d95b5657cd40760cd93e2d1c..3cff78d9de2932f1bd48db2a3bc6a5d5a66cbf97 100644
--- a/easybuild/easyconfigs/n/numpy/numpy-1.6.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/n/numpy/numpy-1.6.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -10,7 +10,7 @@ description = """NumPy is the fundamental package for scientific computing with
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
-source_urls = [('http://sourceforge.net/projects/numpy/files/NumPy/%(version)s', 'download')]
+source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 patches = ['numpy-1.6.2_distutils_multiple-lib-dirs.patch']
diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.6.2-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/n/numpy/numpy-1.6.2-goolf-1.4.10-Python-2.7.3.eb
index 8106dc54bf46c8611654574b0f7f76593634ccd0..11915f6ca18d766c8eaa4fb17bed2edf13d69dc3 100644
--- a/easybuild/easyconfigs/n/numpy/numpy-1.6.2-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/n/numpy/numpy-1.6.2-goolf-1.4.10-Python-2.7.3.eb
@@ -7,12 +7,13 @@ a powerful N-dimensional array object, sophisticated (broadcasting) functions, t
 code, useful linear algebra, Fourier transform, and random number capabilities. Besides its obvious scientific uses,
 NumPy can also be used as an efficient multi-dimensional container of generic data. Arbitrary data-types can be 
 defined. This allows NumPy to seamlessly and speedily integrate with a wide variety of databases."""
+
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-source_urls = [('http://sourceforge.net/projects/numpy/files/NumPy/%(version)s', 'download')]
+source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
-patches = ['numpy-1.6.2_distutils_multiple-lib-dirs.patch']
+patches = ['numpy-%(version)s_distutils_multiple-lib-dirs.patch']
 
 python = 'Python'
 pyver = '2.7.3'
diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-4.0.6-Python-2.7.3.eb
index 5ce2cfa794dc52ecb26752661320b2500a11cf62..32146789ef56c7259b982ca6df06b2c32ab2a6d2 100644
--- a/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-4.0.6-Python-2.7.3.eb
@@ -10,7 +10,7 @@ description = """NumPy is the fundamental package for scientific computing with
 
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
-source_urls = [('http://sourceforge.net/projects/numpy/files/NumPy/%(version)s', 'download')]
+source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCE_TAR_GZ]
                                       
 patches = ['numpy-1.6.2_distutils_multiple-lib-dirs.patch']
diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-4.1.13-Python-2.7.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6f22931653ff77f7463ceefd8918fbaeefc653aa
--- /dev/null
+++ b/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-4.1.13-Python-2.7.3.eb
@@ -0,0 +1,26 @@
+name = 'numpy'
+version = '1.6.2'
+
+homepage = 'http://www.numpy.org'
+description = """NumPy is the fundamental package for scientific computing with Python. It contains among other things:
+ a powerful N-dimensional array object, sophisticated (broadcasting) functions, tools for integrating C/C++ and Fortran
+ code, useful linear algebra, Fourier transform, and random number capabilities. Besides its obvious scientific uses,
+ NumPy can also be used as an efficient multi-dimensional container of generic data. Arbitrary data-types can be 
+ defined. This allows NumPy to seamlessly and speedily integrate with a wide variety of databases."""
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+
+source_urls = [('http://sourceforge.net/projects/numpy/files/NumPy/%(version)s', 'download')]
+sources = [SOURCE_TAR_GZ]
+                                      
+patches = ['numpy-%(version)s_distutils_multiple-lib-dirs.patch']
+
+python = 'Python'
+pyver = '2.7.3'
+versionsuffix = '-%s-%s' % (python, pyver)
+
+dependencies = [
+    (python, pyver),
+]
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-5.3.0-Python-2.7.3.eb
index e9f933cddf0de1c8d343c57b0473a8b082949f42..0ea594ac42a3d9419b0a7fab6ff381fde910779c 100644
--- a/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-5.3.0-Python-2.7.3.eb
@@ -8,10 +8,9 @@ description = """NumPy is the fundamental package for scientific computing with
  NumPy can also be used as an efficient multi-dimensional container of generic data. Arbitrary data-types can be 
  defined. This allows NumPy to seamlessly and speedily integrate with a wide variety of databases."""
 
-
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
-source_urls = [('http://sourceforge.net/projects/numpy/files/NumPy/%(version)s', 'download')]
+source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCE_TAR_GZ]
                                       
 patches = ['numpy-1.6.2_distutils_multiple-lib-dirs.patch']
diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.6.2-iqacml-3.7.3-Python-2.7.3.eb b/easybuild/easyconfigs/n/numpy/numpy-1.6.2-iqacml-3.7.3-Python-2.7.3.eb
index 86800602aa10bc20cdce3ac903f09d14f64aa977..53dc5e3860eee4192d71b454a62663e37c8cad1b 100644
--- a/easybuild/easyconfigs/n/numpy/numpy-1.6.2-iqacml-3.7.3-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/n/numpy/numpy-1.6.2-iqacml-3.7.3-Python-2.7.3.eb
@@ -10,7 +10,7 @@ defined. This allows NumPy to seamlessly and speedily integrate with a wide vari
 
 toolchain = {'name': 'iqacml', 'version': '3.7.3'}
 
-source_urls = [('http://sourceforge.net/projects/numpy/files/NumPy/%(version)s', 'download')]
+source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 patches = [
diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.7.1-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/n/numpy/numpy-1.7.1-goolf-1.4.10-Python-2.7.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a02cfbdf02087935fa7ff86549c5dadf807a3f6f
--- /dev/null
+++ b/easybuild/easyconfigs/n/numpy/numpy-1.7.1-goolf-1.4.10-Python-2.7.3.eb
@@ -0,0 +1,26 @@
+name = 'numpy'
+version = '1.7.1'
+
+homepage = 'http://www.numpy.org'
+description = """NumPy is the fundamental package for scientific computing with Python. It contains among other things:
+a powerful N-dimensional array object, sophisticated (broadcasting) functions, tools for integrating C/C++ and Fortran
+code, useful linear algebra, Fourier transform, and random number capabilities. Besides its obvious scientific uses,
+NumPy can also be used as an efficient multi-dimensional container of generic data. Arbitrary data-types can be 
+defined. This allows NumPy to seamlessly and speedily integrate with a wide variety of databases."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = [('http://sourceforge.net/projects/numpy/files/NumPy/%(version)s', 'download')]
+sources = [SOURCE_TAR_GZ]
+
+patches = ['numpy-%(version)s_distutils_multiple-lib-dirs.patch']
+
+python = 'Python'
+pyver = '2.7.3'
+versionsuffix = '-%s-%s' % (python, pyver)
+
+dependencies = [
+    (python, pyver),
+]
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.7.1-ictce-4.1.13-Python-2.7.5.eb b/easybuild/easyconfigs/n/numpy/numpy-1.7.1-ictce-4.1.13-Python-2.7.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..722f3cab2c520d2b05087573d89f97ced0df6d6a
--- /dev/null
+++ b/easybuild/easyconfigs/n/numpy/numpy-1.7.1-ictce-4.1.13-Python-2.7.5.eb
@@ -0,0 +1,26 @@
+name = 'numpy'
+version = '1.7.1'
+
+homepage = 'http://www.numpy.org'
+description = """NumPy is the fundamental package for scientific computing with Python. It contains among other things:
+ a powerful N-dimensional array object, sophisticated (broadcasting) functions, tools for integrating C/C++ and Fortran
+ code, useful linear algebra, Fourier transform, and random number capabilities. Besides its obvious scientific uses,
+ NumPy can also be used as an efficient multi-dimensional container of generic data. Arbitrary data-types can be 
+ defined. This allows NumPy to seamlessly and speedily integrate with a wide variety of databases."""
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+patches = ['numpy-1.7.1_distutils_multiple-lib-dirs.patch']
+                                      
+python = 'Python'
+pyver = '2.7.5'
+versionsuffix = '-%s-%s' % (python, pyver)
+
+dependencies = [
+    (python, pyver),
+]
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.7.1_distutils_multiple-lib-dirs.patch b/easybuild/easyconfigs/n/numpy/numpy-1.7.1_distutils_multiple-lib-dirs.patch
new file mode 100644
index 0000000000000000000000000000000000000000..12501c675416479f439fa7d5e8ceedba43600ef4
--- /dev/null
+++ b/easybuild/easyconfigs/n/numpy/numpy-1.7.1_distutils_multiple-lib-dirs.patch
@@ -0,0 +1,202 @@
+diff -ru numpy-1.7.0.orig/numpy/distutils/fcompiler/__init__.py numpy-1.7.0/numpy/distutils/fcompiler/__init__.py
+--- numpy-1.7.0.orig/numpy/distutils/fcompiler/__init__.py	2013-02-09 22:04:55.000000000 +0100
++++ numpy-1.7.0/numpy/distutils/fcompiler/__init__.py	2013-05-13 10:40:59.806346107 +0200
+@@ -626,7 +626,11 @@
+         return options
+ 
+     def library_option(self, lib):
+-        return "-l" + lib
++        if lib[0]=='-':
++            return lib
++        else:
++            return "-l" + lib
++
+     def library_dir_option(self, dir):
+         return "-L" + dir
+ 
+diff -ru numpy-1.7.0.orig/numpy/distutils/system_info.py numpy-1.7.0/numpy/distutils/system_info.py
+--- numpy-1.7.0.orig/numpy/distutils/system_info.py	2013-02-09 22:04:56.000000000 +0100
++++ numpy-1.7.0/numpy/distutils/system_info.py	2013-05-13 10:48:49.063599772 +0200
+@@ -588,7 +588,7 @@
+             if is_string(default):
+                 return [default]
+             return default
+-        return [b for b in [a.strip() for a in libs.split(',')] if b]
++        return [b for b in [a.strip().replace(':',',') for a in libs.split(',')] if b]
+ 
+     def get_libraries(self, key='libraries'):
+         return self.get_libs(key, '')
+@@ -630,6 +630,23 @@
+                      lib_dirs)
+         return info
+ 
++    def check_libs_all(self,lib_dir,libs,opt_libs =[]):
++        """If static or shared libraries are available then return
++        their info dictionary.
++
++        Checks for all libraries as shared libraries first, then
++        static (or vice versa if self.search_static_first is True).
++        """
++        exts = self.library_extensions()
++        info = None
++        for ext in exts:
++            info = self._check_libs_all(lib_dir,libs,opt_libs,[ext])
++            if info is not None:
++                break
++        if not info:
++            log.info('  libraries %s not found in %s', ','.join(libs), lib_dir)
++        return info
++
+     def check_libs2(self, lib_dirs, libs, opt_libs=[]):
+         """If static or shared libraries are available then return
+         their info dictionary.
+@@ -643,6 +660,18 @@
+                      lib_dirs)
+         return info
+ 
++    def check_libs2_all(self, lib_dirs, libs, opt_libs =[]):
++        """If static or shared libraries are available then return
++        their info dictionary.
++
++        Checks each library for shared or static.
++        """
++        exts = self.library_extensions()
++        info = self._check_libs_all(lib_dirs,libs,opt_libs,exts)
++        if not info:
++            log.info('  libraries %s not found in %s', ','.join(libs), os.pathsep.join(lib_dirs))
++        return info
++
+     def _lib_list(self, lib_dir, libs, exts):
+         assert is_string(lib_dir)
+         liblist = []
+@@ -653,6 +682,9 @@
+             lib_prefixes = ['lib']
+         # for each library name, see if we can find a file for it.
+         for l in libs:
++            if l[0]=='-':
++                liblist.append(l)
++                continue
+             for ext in exts:
+                 for prefix in lib_prefixes:
+                     p = self.combine_paths(lib_dir, prefix + l + ext)
+@@ -668,6 +700,19 @@
+                     break
+         return liblist
+ 
++    def _lib_list_all(self, lib_dirs, libs, exts):
++        assert (type(lib_dirs)==list)
++        if lib_dirs:
++           assert is_string(lib_dirs[0])
++        liblist=[]
++        for lib_dir in lib_dirs:
++           ls=self._lib_list(lib_dir,libs,exts)
++           for l in ls:
++               log.info("(_lib_list_all) Found %s in %s"%(l,lib_dir))
++               if l not in liblist:
++                   liblist.append(l)
++        return liblist
++
+     def _check_libs(self, lib_dirs, libs, opt_libs, exts):
+         """Find mandatory and optional libs in expected paths.
+ 
+@@ -709,6 +754,22 @@
+         else:
+             return None
+ 
++    def _check_libs_all(self, lib_dirs, libs, opt_libs, exts):
++        found_libs_unordered = self._lib_list_all(lib_dirs, libs, exts)
++        # ensure same order as in lib_dirs
++        found_libs = []
++        for lib_dir in libs:
++            if lib_dir in found_libs_unordered:
++                found_libs.append(lib_dir)
++        if len(found_libs) == len(libs):
++            info = {'libraries' : found_libs, 'library_dirs' : lib_dirs}
++            opt_found_libs = self._lib_list_all(lib_dirs, opt_libs, exts)
++            if len(opt_found_libs) == len(opt_libs):
++                info['libraries'].extend(opt_found_libs)
++            return info
++        else:
++            return
++
+     def combine_paths(self, *args):
+         """Return a list of existing paths composed by all combinations
+         of items from the arguments.
+@@ -944,7 +1005,7 @@
+         lib_dirs = self.get_lib_dirs()
+         incl_dirs = self.get_include_dirs()
+         mkl_libs = self.get_libs('mkl_libs', self._lib_mkl)
+-        info = self.check_libs2(lib_dirs, mkl_libs)
++        info = self.check_libs2_all(lib_dirs, mkl_libs)
+         if info is None:
+             return
+         dict_append(info,
+@@ -1008,16 +1069,13 @@
+         atlas = None
+         lapack = None
+         atlas_1 = None
+-        for d in lib_dirs:
+-            atlas = self.check_libs2(d, atlas_libs, [])
+-            lapack_atlas = self.check_libs2(d, ['lapack_atlas'], [])
+-            if atlas is not None:
+-                lib_dirs2 = [d] + self.combine_paths(d, ['atlas*', 'ATLAS*'])
+-                lapack = self.check_libs2(lib_dirs2, lapack_libs, [])
+-                if lapack is not None:
+-                    break
+-            if atlas:
+-                atlas_1 = atlas
++        atlas = self.check_libs2_all(lib_dirs, atlas_libs)
++        lapack_atlas = self.check_libs2_all(lib_dirs, ['lapack_atlas'])
++        if atlas is not None:
++            lib_dirs2 = lib_dirs + self.combine_paths(lib_dirs,['atlas*','ATLAS*'])
++            lapack = self.check_libs2_all(lib_dirs2, lapack_libs)
++        if atlas:
++            atlas_1 = atlas
+         log.info(self.__class__)
+         if atlas is None:
+             atlas = atlas_1
+@@ -1096,7 +1154,7 @@
+         info = {}
+         atlas_libs = self.get_libs('atlas_libs',
+                                    self._lib_names + self._lib_atlas)
+-        atlas = self.check_libs2(lib_dirs, atlas_libs, [])
++        atlas = self.check_libs2_all(lib_dirs, atlas_libs, [])
+         if atlas is None:
+             return
+         include_dirs = self.get_include_dirs()
+@@ -1144,7 +1202,7 @@
+         lib_dirs = self.get_lib_dirs()
+ 
+         lapack_libs = self.get_libs('lapack_libs', self._lib_names)
+-        info = self.check_libs(lib_dirs, lapack_libs, [])
++        info = self.check_libs_all(lib_dirs, lapack_libs, [])
+         if info is None:
+             return
+         info['language'] = 'f77'
+@@ -1521,7 +1579,7 @@
+         lib_dirs = self.get_lib_dirs()
+ 
+         blas_libs = self.get_libs('blas_libs', self._lib_names)
+-        info = self.check_libs(lib_dirs, blas_libs, [])
++        info = self.check_libs_all(lib_dirs, blas_libs, [])
+         if info is None:
+             return
+         info['language'] = 'f77'  # XXX: is it generally true?
+Only in numpy-1.7.0/numpy/distutils: system_info.py.orig
+Only in numpy-1.7.0/numpy/distutils: system_info.py.rej
+diff -ru numpy-1.7.0.orig/numpy/distutils/unixccompiler.py numpy-1.7.0/numpy/distutils/unixccompiler.py
+--- numpy-1.7.0.orig/numpy/distutils/unixccompiler.py	2013-02-09 22:04:55.000000000 +0100
++++ numpy-1.7.0/numpy/distutils/unixccompiler.py	2013-05-13 10:40:59.833592000 +0200
+@@ -109,3 +109,12 @@
+ 
+ replace_method(UnixCCompiler, 'create_static_lib',
+                UnixCCompiler_create_static_lib)
++
++def UnixCCompiler_library_option(self, lib):
++    if lib[0]=='-':
++        return lib
++    else:
++        return "-l" + lib
++
++replace_method(UnixCCompiler, 'library_option',
++               UnixCCompiler_library_option)
diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.8.0-ictce-5.3.0-Python-2.7.5.eb b/easybuild/easyconfigs/n/numpy/numpy-1.8.0-ictce-5.3.0-Python-2.7.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c5d0574900bc3f6ef60dfd389928a4398c0c2b49
--- /dev/null
+++ b/easybuild/easyconfigs/n/numpy/numpy-1.8.0-ictce-5.3.0-Python-2.7.5.eb
@@ -0,0 +1,26 @@
+name = 'numpy'
+version = '1.8.0'
+
+homepage = 'http://www.numpy.org'
+description = """NumPy is the fundamental package for scientific computing with Python. It contains among other things:
+ a powerful N-dimensional array object, sophisticated (broadcasting) functions, tools for integrating C/C++ and Fortran
+ code, useful linear algebra, Fourier transform, and random number capabilities. Besides its obvious scientific uses,
+ NumPy can also be used as an efficient multi-dimensional container of generic data. Arbitrary data-types can be 
+ defined. This allows NumPy to seamlessly and speedily integrate with a wide variety of databases."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+patches = ['numpy-1.8.0-mkl.patch']
+
+python = 'Python'
+pyver = '2.7.5'
+versionsuffix = '-%s-%s' % (python, pyver)
+
+dependencies = [
+    (python, pyver),
+]
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/o/O2scl/o2scl-0.913-goolf-1.4.10.eb b/easybuild/easyconfigs/o/O2scl/o2scl-0.913-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9496f6917421d3059e78978f0e88c415e23b3ca4
--- /dev/null
+++ b/easybuild/easyconfigs/o/O2scl/o2scl-0.913-goolf-1.4.10.eb
@@ -0,0 +1,29 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics (SIB)
+# Biozentrum - University of Basel
+
+name = 'o2scl'
+version = '0.913'
+
+homepage = 'http://o2scl.sourceforge.net/'
+
+description = """ An object-oriented library for scientific 
+computing in C++ useful for solving, minimizing, differentiating,
+integrating, interpolating, optimizing, approximating, analyzing, 
+fitting, and more."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [ 
+    ('Eigen', '3.1.4'),
+    ('libreadline', '6.2'),
+    ('HDF5', '1.8.11'),
+    ('Boost', '1.53.0'),
+    ('GSL', '1.15'),
+]
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/o/OCaml/OCaml-4.01.0-goolf-1.4.10.eb b/easybuild/easyconfigs/o/OCaml/OCaml-4.01.0-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d660b5e167978e500e1f9e7455c64e1e3b8c6944
--- /dev/null
+++ b/easybuild/easyconfigs/o/OCaml/OCaml-4.01.0-goolf-1.4.10.eb
@@ -0,0 +1,39 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine
+# Authors::   Fotis Georgatos <fotis.georgatos@uni.lu>
+# License::   MIT/GPL
+# $Id$
+##
+
+name = "OCaml"
+version = "4.01.0"
+
+homepage = 'http://ocaml.org/'
+description = """OCaml is a general purpose industrial-strength programming language
+ with an emphasis on expressiveness and safety. Developed for more than 20 years at Inria
+ it benefits from one of the most advanced type systems and supports functional,
+ imperative and object-oriented styles of programming."""
+
+toolchain = {'version': '1.4.10', 'name': 'goolf'}
+
+sources = ['ocaml-%(version)s.tar.gz']
+sourcedir = name.lower() + '-' + '.'.join(version.split('.')[0:-1])
+source_urls = ['http://caml.inria.fr/pub/distrib/%s' % sourcedir]
+
+builddependencies = [('Autoconf', '2.69')]
+dependencies = [('ncurses', '5.9')]
+
+prefix_opt = "-prefix "
+makeopts = "world.opt"
+
+# parallel build tends to break
+parallel = 1
+
+sanity_check_paths = {
+    'files': ["bin/ocaml", "bin/ocamlc"],
+    'dirs': []
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/o/OTF/OTF-1.12.4-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/o/OTF/OTF-1.12.4-gompi-1.4.12-no-OFED.eb
index e2416b4554b5442d7f7833d7dc9b5a5e62a38ef1..23a2067ba36b720c41edcff0699f704f39d0ad6c 100644
--- a/easybuild/easyconfigs/o/OTF/OTF-1.12.4-gompi-1.4.12-no-OFED.eb
+++ b/easybuild/easyconfigs/o/OTF/OTF-1.12.4-gompi-1.4.12-no-OFED.eb
@@ -8,7 +8,6 @@
 ##
 name = "OTF"
 version = "1.12.4"
-majorsuffix = 'salmon'
 
 homepage = 'http://www.tu-dresden.de/zih/otf/'
 description = """The Open Trace Format is a highly scalable, memory efficient event
@@ -18,7 +17,7 @@ description = """The Open Trace Format is a highly scalable, memory efficient ev
 toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'}
 
 # http://wwwpub.zih.tu-dresden.de/%7Emlieber/dcount/dcount.php?package=otf&get=OTF-1.12.4salmon.tar.gz
-sources = ['%%(name)s-%%(version)s%s.tar.gz' % majorsuffix]
+sources = ['%(name)s-%(version)ssalmon.tar.gz']
 source_urls = ['http://wwwpub.zih.tu-dresden.de/%7Emlieber/dcount/dcount.php?package=otf&get=']
 
 # name change in version 1.12.3: "open-trace-format" was "otf" in older versions
diff --git a/easybuild/easyconfigs/o/OTF/OTF-1.12.4-ictce-5.3.0.eb b/easybuild/easyconfigs/o/OTF/OTF-1.12.4-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0d0f9bbf97a16adf84542f9db04e42b04b000273
--- /dev/null
+++ b/easybuild/easyconfigs/o/OTF/OTF-1.12.4-ictce-5.3.0.eb
@@ -0,0 +1,32 @@
+# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild
+# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany
+# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
+# License::   New BSD
+#
+# This work is based from experiences from the UNITE project
+# http://apps.fz-juelich.de/unite/
+##
+name = "OTF"
+version = "1.12.4"
+
+homepage = 'http://www.tu-dresden.de/zih/otf/'
+description = """The Open Trace Format is a highly scalable, memory efficient event
+ trace data format plus support library. It is the standard trace format
+ for Vampir, and is open for other tools. [NOW OBSOLETE: use OTF2]"""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+# http://wwwpub.zih.tu-dresden.de/%7Emlieber/dcount/dcount.php?package=otf&get=OTF-1.12.4salmon.tar.gz
+sources = ['%(name)s-%(version)ssalmon.tar.gz']
+source_urls = ['http://wwwpub.zih.tu-dresden.de/%7Emlieber/dcount/dcount.php?package=otf&get=']
+
+# name change in version 1.12.3: "open-trace-format" was "otf" in older versions
+# "open-trace-format" => "otf" for versions until 1.12.2
+sanity_check_paths = {
+    'files': ["bin/otfconfig", "include/open-trace-format/otf.h",
+              # note by Bernd Mohr: on some systems libraries end up in lib/
+              ("lib64/libopen-trace-format.a", "lib/libopen-trace-format.a")],
+    'dirs': [],
+}
+
+moduleclass = 'perf'
diff --git a/easybuild/easyconfigs/o/OTF2/OTF2-1.2.1-ictce-5.3.0.eb b/easybuild/easyconfigs/o/OTF2/OTF2-1.2.1-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..341f324efb4c044aea22ac1f738ee8015b06602e
--- /dev/null
+++ b/easybuild/easyconfigs/o/OTF2/OTF2-1.2.1-ictce-5.3.0.eb
@@ -0,0 +1,31 @@
+# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild
+# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany
+# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
+# License::   New BSD
+#
+# This work is based from experiences from the UNITE project
+# http://apps.fz-juelich.de/unite/
+##
+easyblock = 'EB_Score_minus_P'
+
+name = "OTF2"
+version = "1.2.1"
+
+homepage = 'http://www.score-p.org'
+description = """The Open Trace Format 2 is a highly scalable, memory efficient event
+ trace data format plus support library. It will become the new standard trace format
+ for Scalasca, Vampir, and Tau and is open for other tools."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+# http://www.vi-hps.org/upload/packages/otf2/otf2-1.2.1.tar.gz
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.vi-hps.org/upload/packages/otf2/']
+
+sanity_check_paths = {
+    # note by Bernd Mohr: on some systems libraries end up in lib/
+    'files': ["bin/otf2-config", "include/otf2/otf2.h", ("lib64/libotf2.a", "lib/libotf2.a")],
+    'dirs': [],
+}
+
+moduleclass = 'perf'
diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgmpich-1.1.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgmpich-1.1.6-LAPACK-3.4.2.eb
index 4c5aa495a3fc67cadefac49a35909564f93145fc..3d70563ce763702444a0b3102fd055612790ca23 100644
--- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgmpich-1.1.6-LAPACK-3.4.2.eb
+++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgmpich-1.1.6-LAPACK-3.4.2.eb
@@ -26,7 +26,7 @@ source_urls = [
 ]
 
 patches = [
-    'OpenBLAS-%s_Makefile-LAPACK-sources.patch' % version,
+    'OpenBLAS-%(version)s_Makefile-LAPACK-sources.patch',
     (lapack_src, '.'),  # copy LAPACK tarball to unpacked OpenBLAS dir
     (large_src, '.'),
     (timing_src, '.'),
diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgmvapich2-1.1.12rc1-LAPACK-3.4.2.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgmvapich2-1.1.12rc1-LAPACK-3.4.2.eb
index 7edb3a4acfa28c66f258a27badaa076f6449ba21..a34682d998b1cffa88a355006c3d78ed8a0873af 100644
--- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgmvapich2-1.1.12rc1-LAPACK-3.4.2.eb
+++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgmvapich2-1.1.12rc1-LAPACK-3.4.2.eb
@@ -26,7 +26,7 @@ source_urls = [
 ]
 
 patches = [
-    'OpenBLAS-%s_Makefile-LAPACK-sources.patch' % version,
+    'OpenBLAS-%(version)s_Makefile-LAPACK-sources.patch',
     (lapack_src, '.'),  # copy LAPACK tarball to unpacked OpenBLAS dir
     (large_src, '.'),
     (timing_src, '.'),
diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgmvapich2-1.2.7-LAPACK-3.4.2.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgmvapich2-1.2.7-LAPACK-3.4.2.eb
index 02701dd4c9a99a7af20401b69e12e7e0e169fd1d..5d51f5f66c3f887fa922ad084a7ee8cc5513b7fe 100644
--- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgmvapich2-1.2.7-LAPACK-3.4.2.eb
+++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgmvapich2-1.2.7-LAPACK-3.4.2.eb
@@ -26,7 +26,7 @@ source_urls = [
 ]
 
 patches = [
-    'OpenBLAS-%s_Makefile-LAPACK-sources.patch' % version,
+    'OpenBLAS-%(version)s_Makefile-LAPACK-sources.patch',
     (lapack_src, '.'),  # copy LAPACK tarball to unpacked OpenBLAS dir
     (large_src, '.'),
     (timing_src, '.'),
diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgompi-1.1.7-LAPACK-3.4.2.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgompi-1.1.7-LAPACK-3.4.2.eb
index f2e81ac46b880028a96f33e2e94dde70df23af78..f7fcbb964f6ecf7fe55f11bcfd9709c63f570745 100644
--- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgompi-1.1.7-LAPACK-3.4.2.eb
+++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgompi-1.1.7-LAPACK-3.4.2.eb
@@ -26,7 +26,7 @@ source_urls = [
 ]
 
 patches = [
-    'OpenBLAS-%s_Makefile-LAPACK-sources.patch' % version,
+    'OpenBLAS-%(version)s_Makefile-LAPACK-sources.patch',
     (lapack_src, '.'),  # copy LAPACK tarball to unpacked OpenBLAS dir
     (large_src, '.'),
     (timing_src, '.'),
diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gmvapich2-1.7.12-LAPACK-3.4.2.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gmvapich2-1.7.12-LAPACK-3.4.2.eb
index 12c01f0dfbb80c5a73ae1f920d316cf1a21bfb88..70c17c320e8aaab26da8c82ff75cc00a4b8f7237 100644
--- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gmvapich2-1.7.12-LAPACK-3.4.2.eb
+++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gmvapich2-1.7.12-LAPACK-3.4.2.eb
@@ -26,7 +26,7 @@ source_urls = [
 ]
 
 patches = [
-    'OpenBLAS-%s_Makefile-LAPACK-sources.patch' % version,
+    'OpenBLAS-%(version)s_Makefile-LAPACK-sources.patch',
     (lapack_src, '.'),  # copy LAPACK tarball to unpacked OpenBLAS dir
     (large_src, '.'),
     (timing_src, '.'),
diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gmvapich2-1.7.12rc1-LAPACK-3.4.2.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gmvapich2-1.7.12rc1-LAPACK-3.4.2.eb
index 894db5aef66ee82f2ed08b8b9fe2354eddaf2bff..7689f17f2ec1ac45ebe23cb2ec24f10502771498 100644
--- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gmvapich2-1.7.12rc1-LAPACK-3.4.2.eb
+++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gmvapich2-1.7.12rc1-LAPACK-3.4.2.eb
@@ -26,7 +26,7 @@ source_urls = [
 ]
 
 patches = [
-    'OpenBLAS-%s_Makefile-LAPACK-sources.patch' % version,
+    'OpenBLAS-%(version)s_Makefile-LAPACK-sources.patch',
     (lapack_src, '.'),  # copy LAPACK tarball to unpacked OpenBLAS dir
     (large_src, '.'),
     (timing_src, '.'),
diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gompi-1.3.12-LAPACK-3.4.2.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gompi-1.3.12-LAPACK-3.4.2.eb
index c7072566fcff97dfc2a44cb32076a6c06a2a8243..500a1a45016b0dc8f20b16023bc5f8b8cecfc6a1 100644
--- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gompi-1.3.12-LAPACK-3.4.2.eb
+++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gompi-1.3.12-LAPACK-3.4.2.eb
@@ -26,7 +26,7 @@ source_urls = [
 ]
 
 patches = [
-    'OpenBLAS-%s_Makefile-LAPACK-sources.patch' % version,
+    'OpenBLAS-%(version)s_Makefile-LAPACK-sources.patch',
     (lapack_src, '.'),  # copy LAPACK tarball to unpacked OpenBLAS dir
     (large_src, '.'),
     (timing_src, '.'),
diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gompi-1.4.10-LAPACK-3.4.2.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gompi-1.4.10-LAPACK-3.4.2.eb
index 95abb118d2671be9ac7a4944f1a20ba96ddc0756..ada05e324ea3747576b1903d86931065e93827d0 100644
--- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gompi-1.4.10-LAPACK-3.4.2.eb
+++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gompi-1.4.10-LAPACK-3.4.2.eb
@@ -26,7 +26,7 @@ source_urls = [
 ]
 
 patches = [
-    'OpenBLAS-%s_Makefile-LAPACK-sources.patch' % version,
+    'OpenBLAS-%(version)s_Makefile-LAPACK-sources.patch',
     (lapack_src, '.'),  # copy LAPACK tarball to unpacked OpenBLAS dir
     (large_src, '.'),
     (timing_src, '.'),
diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gompi-1.4.10-no-OFED-LAPACK-3.4.2.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gompi-1.4.10-no-OFED-LAPACK-3.4.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f64ed2e18b7a31ee89904075a6867311fe9c8735
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gompi-1.4.10-no-OFED-LAPACK-3.4.2.eb
@@ -0,0 +1,51 @@
+name = 'OpenBLAS'
+version = '0.2.6'
+
+lapackver = '3.4.2'
+versionsuffix = '-LAPACK-%s' % lapackver
+
+homepage = 'http://xianyi.github.com/OpenBLAS/'
+description = """OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version."""
+
+toolchain = {'name': 'gompi', 'version': '1.4.10-no-OFED'}
+
+lapack_src = 'lapack-%s.tgz' % lapackver
+large_src = 'large.tgz'
+timing_src = 'timing.tgz'
+sources = [
+    'v%(version)s.tar.gz',
+    lapack_src,
+    large_src,
+    timing_src,
+]
+source_urls = [
+    # order matters, trying to download the LAPACK tarball from GitHub causes trouble
+    "http://www.netlib.org/lapack/",
+    "http://www.netlib.org/lapack/timing/",
+    "https://github.com/xianyi/OpenBLAS/archive/",
+]
+
+patches = [
+    'OpenBLAS-%s_Makefile-LAPACK-sources.patch' % version,
+    (lapack_src, '.'),  # copy LAPACK tarball to unpacked OpenBLAS dir
+    (large_src, '.'),
+    (timing_src, '.'),
+]
+
+skipsteps = ['configure']
+
+threading = 'USE_THREAD=1'
+makeopts = 'BINARY=64 ' + threading + ' CC="$CC" FC="$F77"'
+installopts = threading + " PREFIX=%(installdir)s"
+
+# extensive testing can be enabled by uncommenting the line below
+#runtest = 'PATH=.:$PATH lapack-timing'
+
+sanity_check_paths = {
+    'files': ['include/cblas.h', 'include/f77blas.h', 'include/lapacke_config.h', 'include/lapacke.h',
+              'include/lapacke_mangling.h', 'include/lapacke_utils.h', 'include/openblas_config.h',
+              'lib/libopenblas.a', 'lib/libopenblas.%s' % shared_lib_ext],
+    'dirs': [],
+}
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-ictce-5.3.0-LAPACK-3.4.2.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-ictce-5.3.0-LAPACK-3.4.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..cf3256ea5a8f36ff74d1e57304e3b9871a10cde2
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-ictce-5.3.0-LAPACK-3.4.2.eb
@@ -0,0 +1,51 @@
+name = 'OpenBLAS'
+version = '0.2.6'
+
+lapackver = '3.4.2'
+versionsuffix = '-LAPACK-%s' % lapackver
+
+homepage = 'http://xianyi.github.com/OpenBLAS/'
+description = """OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+lapack_src = 'lapack-%s.tgz' % lapackver
+large_src = 'large.tgz'
+timing_src = 'timing.tgz'
+sources = [
+    'v%(version)s.tar.gz',
+    lapack_src,
+    large_src,
+    timing_src,
+]
+source_urls = [
+    # order matters, trying to download the LAPACK tarball from GitHub causes trouble
+    "http://www.netlib.org/lapack/",
+    "http://www.netlib.org/lapack/timing/",
+    "https://github.com/xianyi/OpenBLAS/archive/",
+]
+
+patches = [
+    'OpenBLAS-%(version)s_Makefile-LAPACK-sources.patch',
+    (lapack_src, '.'),  # copy LAPACK tarball to unpacked OpenBLAS dir
+    (large_src, '.'),
+    (timing_src, '.'),
+]
+
+skipsteps = ['configure']
+
+threading = 'USE_THREAD=1'
+makeopts = 'BINARY=64 ' + threading + ' CC="$CC" FC="$F77"'
+installopts = threading + " PREFIX=%(installdir)s"
+
+# extensive testing can be enabled by uncommenting the line below
+#runtest = 'PATH=.:$PATH lapack-timing'
+
+sanity_check_paths = {
+    'files': ['include/cblas.h', 'include/f77blas.h', 'include/lapacke_config.h', 'include/lapacke.h',
+              'include/lapacke_mangling.h', 'include/lapacke_utils.h', 'include/openblas_config.h',
+              'lib/libopenblas.a', 'lib/libopenblas.%s' % shared_lib_ext],
+    'dirs': [],
+}
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.5.14-LAPACK-3.5.0.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.5.14-LAPACK-3.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..bdd5c179ef1343225036c7d35de0837407a4b138
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.5.14-LAPACK-3.5.0.eb
@@ -0,0 +1,50 @@
+name = 'OpenBLAS'
+version = '0.2.8'
+
+lapackver = '3.5.0'
+versionsuffix = '-LAPACK-%s' % lapackver
+
+homepage = 'http://xianyi.github.com/OpenBLAS/'
+description = """OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version."""
+
+toolchain = {'name': 'gompi', 'version': '1.5.14'}
+
+lapack_src = 'lapack-%s.tgz' % lapackver
+large_src = 'large.tgz'
+timing_src = 'timing.tgz'
+sources = [
+    'v%(version)s.tar.gz',
+    lapack_src,
+    large_src,
+    timing_src,
+]
+source_urls = [
+    # order matters, trying to download the LAPACK tarball from GitHub causes trouble
+    "http://www.netlib.org/lapack/",
+    "http://www.netlib.org/lapack/timing/",
+    "https://github.com/xianyi/OpenBLAS/archive/",
+]
+
+patches = [
+    (lapack_src, '.'),  # copy LAPACK tarball to unpacked OpenBLAS dir
+    (large_src, '.'),
+    (timing_src, '.'),
+]
+
+skipsteps = ['configure']
+
+threading = 'USE_THREAD=1'
+makeopts = 'BINARY=64 ' + threading + ' CC="$CC" FC="$F77"'
+installopts = threading + " PREFIX=%(installdir)s"
+
+# extensive testing can be enabled by uncommenting the line below
+#runtest = 'PATH=.:$PATH lapack-timing'
+
+sanity_check_paths = {
+    'files': ['include/cblas.h', 'include/f77blas.h', 'include/lapacke_config.h', 'include/lapacke.h',
+              'include/lapacke_mangling.h', 'include/lapacke_utils.h', 'include/openblas_config.h',
+              'lib/libopenblas.a', 'lib/libopenblas.%s' % shared_lib_ext],
+    'dirs': [],
+}
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.5.14-no-OFED-LAPACK-3.5.0.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.5.14-no-OFED-LAPACK-3.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2b422ff45f09af2fbb93e16dd70e4ea2b0ffba7a
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.5.14-no-OFED-LAPACK-3.5.0.eb
@@ -0,0 +1,50 @@
+name = 'OpenBLAS'
+version = '0.2.8'
+
+lapackver = '3.5.0'
+versionsuffix = '-LAPACK-%s' % lapackver
+
+homepage = 'http://xianyi.github.com/OpenBLAS/'
+description = """OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version."""
+
+toolchain = {'name': 'gompi', 'version': '1.5.14-no-OFED'}
+
+lapack_src = 'lapack-%s.tgz' % lapackver
+large_src = 'large.tgz'
+timing_src = 'timing.tgz'
+sources = [
+    'v%(version)s.tar.gz',
+    lapack_src,
+    large_src,
+    timing_src,
+]
+source_urls = [
+    # order matters, trying to download the LAPACK tarball from GitHub causes trouble
+    "http://www.netlib.org/lapack/",
+    "http://www.netlib.org/lapack/timing/",
+    "https://github.com/xianyi/OpenBLAS/archive/",
+]
+
+patches = [
+    (lapack_src, '.'),  # copy LAPACK tarball to unpacked OpenBLAS dir
+    (large_src, '.'),
+    (timing_src, '.'),
+]
+
+skipsteps = ['configure']
+
+threading = 'USE_THREAD=1'
+makeopts = 'BINARY=64 ' + threading + ' CC="$CC" FC="$F77"'
+installopts = threading + " PREFIX=%(installdir)s"
+
+# extensive testing can be enabled by uncommenting the line below
+#runtest = 'PATH=.:$PATH lapack-timing'
+
+sanity_check_paths = {
+    'files': ['include/cblas.h', 'include/f77blas.h', 'include/lapacke_config.h', 'include/lapacke.h',
+              'include/lapacke_mangling.h', 'include/lapacke_utils.h', 'include/openblas_config.h',
+              'lib/libopenblas.a', 'lib/libopenblas.%s' % shared_lib_ext],
+    'dirs': [],
+}
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.6.10-LAPACK-3.4.2.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.6.10-LAPACK-3.4.2.eb
index 6692010d4ecbe4dc31d99575a96de4f60f99687e..005cd8534091df33725a870e80c1b829f55b6db3 100644
--- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.6.10-LAPACK-3.4.2.eb
+++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.6.10-LAPACK-3.4.2.eb
@@ -26,7 +26,6 @@ source_urls = [
 ]
 
 patches = [
-    # 'OpenBLAS-%s_Makefile-LAPACK-sources.patch' % version,
     (lapack_src, '.'),  # copy LAPACK tarball to unpacked OpenBLAS dir
     (large_src, '.'),
     (timing_src, '.'),
diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompic-2.6.10-LAPACK-3.4.2.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompic-2.6.10-LAPACK-3.4.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..59919ca91acc08ea7a4dd6eae3b435dd57aa0fbc
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompic-2.6.10-LAPACK-3.4.2.eb
@@ -0,0 +1,51 @@
+name = 'OpenBLAS'
+version = '0.2.8'
+
+lapackver = '3.4.2'
+versionsuffix = '-LAPACK-%s' % lapackver
+
+homepage = 'http://xianyi.github.com/OpenBLAS/'
+description = """OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version."""
+
+toolchain = {'name': 'gompic', 'version': '2.6.10'}
+
+lapack_src = 'lapack-%s.tgz' % lapackver
+large_src = 'large.tgz'
+timing_src = 'timing.tgz'
+sources = [
+    'v%(version)s.tar.gz',
+    lapack_src,
+    large_src,
+    timing_src,
+]
+source_urls = [
+    # order matters, trying to download the LAPACK tarball from GitHub causes trouble
+    "http://www.netlib.org/lapack/",
+    "http://www.netlib.org/lapack/timing/",
+    "https://github.com/xianyi/OpenBLAS/archive/",
+]
+
+patches = [
+    # 'OpenBLAS-%s_Makefile-LAPACK-sources.patch' % version,
+    (lapack_src, '.'),  # copy LAPACK tarball to unpacked OpenBLAS dir
+    (large_src, '.'),
+    (timing_src, '.'),
+]
+
+skipsteps = ['configure']
+
+threading = 'USE_THREAD=1'
+makeopts = 'BINARY=64 ' + threading + ' CC="$CC" FC="$F77"'
+installopts = threading + " PREFIX=%(installdir)s"
+
+# extensive testing can be enabled by uncommenting the line below
+#runtest = 'PATH=.:$PATH lapack-timing'
+
+sanity_check_paths = {
+    'files': ['include/cblas.h', 'include/f77blas.h', 'include/lapacke_config.h', 'include/lapacke.h',
+              'include/lapacke_mangling.h', 'include/lapacke_utils.h', 'include/openblas_config.h',
+              'lib/libopenblas.a', 'lib/libopenblas.%s' % shared_lib_ext],
+    'dirs': [],
+}
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-ictce-5.3.0-LAPACK-3.4.2.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-ictce-5.3.0-LAPACK-3.4.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..15f2df5280bb57839d2ee7d6e29480da5af34fb6
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-ictce-5.3.0-LAPACK-3.4.2.eb
@@ -0,0 +1,50 @@
+name = 'OpenBLAS'
+version = '0.2.8'
+
+lapackver = '3.4.2'
+versionsuffix = '-LAPACK-%s' % lapackver
+
+homepage = 'http://xianyi.github.com/OpenBLAS/'
+description = """OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+lapack_src = 'lapack-%s.tgz' % lapackver
+large_src = 'large.tgz'
+timing_src = 'timing.tgz'
+sources = [
+    'v%(version)s.tar.gz',
+    lapack_src,
+    large_src,
+    timing_src,
+]
+source_urls = [
+    # order matters, trying to download the LAPACK tarball from GitHub causes trouble
+    "http://www.netlib.org/lapack/",
+    "http://www.netlib.org/lapack/timing/",
+    "https://github.com/xianyi/OpenBLAS/archive/",
+]
+
+patches = [
+    (lapack_src, '.'),  # copy LAPACK tarball to unpacked OpenBLAS dir
+    (large_src, '.'),
+    (timing_src, '.'),
+]
+
+skipsteps = ['configure']
+
+threading = 'USE_THREAD=1'
+makeopts = 'BINARY=64 ' + threading + ' CC="$CC" FC="$F77"'
+installopts = threading + " PREFIX=%(installdir)s"
+
+# extensive testing can be enabled by uncommenting the line below
+#runtest = 'PATH=.:$PATH lapack-timing'
+
+sanity_check_paths = {
+    'files': ['include/cblas.h', 'include/f77blas.h', 'include/lapacke_config.h', 'include/lapacke.h',
+              'include/lapacke_mangling.h', 'include/lapacke_utils.h', 'include/openblas_config.h',
+              'lib/libopenblas.a', 'lib/libopenblas.%s' % shared_lib_ext],
+    'dirs': [],
+}
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED-Python-2.7.5.eb
similarity index 58%
rename from easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED.eb
rename to easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED-Python-2.7.5.eb
index 41317da7becaab23b805edaf3d792480d7abe9dd..b0dbc264bde8b29ec10286d923f7986a9a0b5236 100644
--- a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED.eb
+++ b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED-Python-2.7.5.eb
@@ -2,9 +2,10 @@ name = 'OpenBabel'
 version = '2.3.2'
 
 homepage = 'http://openbabel.org'
-description = """Open Babel is a chemical toolbox designed to speak the many languages of chemical 
-data. It's an open, collaborative project allowing anyone to search, convert, analyze, or store data 
-from molecular modeling, chemistry, solid-state materials, biochemistry, or related areas."""
+description = """Open Babel is a chemical toolbox designed to speak the many
+ languages of chemical data. It's an open, collaborative project allowing anyone
+ to search, convert, analyze, or store data from molecular modeling, chemistry,
+ solid-state materials, biochemistry, or related areas."""
 
 toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'}
 toolchainopts = {'optarch': True}
@@ -19,11 +20,17 @@ patches = [
 
 builddependencies = [('CMake', '2.8.12')]
 
+python = "Python"
+pythonversion = '2.7.5'
+pythonshortversion = ".".join(pythonversion.split(".")[:-1])
+
+versionsuffix = "-%s-%s" % (python, pythonversion)
+
 dependencies = [
+    (python, pythonversion),
     ('zlib', '1.2.8'),
     ('libxml2', '2.9.1'),
     ('Eigen', '3.1.4'),
-    ('Python', '2.7.5'),
 ]
 
 runtest = 'test'
diff --git a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-4.1.13-Python-2.7.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..534fdf2177e3d3c8dbd161d1b90672912c7ba3e9
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-4.1.13-Python-2.7.3.eb
@@ -0,0 +1,39 @@
+name = 'OpenBabel'
+version = '2.3.2'
+
+homepage = 'http://openbabel.org'
+description = """Open Babel is a chemical toolbox designed to speak the many
+ languages of chemical data. It's an open, collaborative project allowing anyone
+ to search, convert, analyze, or store data from molecular modeling, chemistry,
+ solid-state materials, biochemistry, or related areas."""
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+toolchainopts = {'optarch': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+patches = [
+    'OpenBabel-%(version)s-use-xHost.patch',
+    'OpenBabel-%(version)s-fix-link-path-tests.patch',
+    'OpenBabel-%(version)s-ignore-failed-test.patch',
+]
+
+builddependencies = [('CMake', '2.8.12')]
+
+python = "Python"
+pythonversion = '2.7.3'
+pythonshortversion = ".".join(pythonversion.split(".")[:-1])
+
+versionsuffix = "-%s-%s" % (python, pythonversion)
+
+dependencies = [
+    (python, pythonversion),
+    ('zlib', '1.2.7'),
+    ('libxml2', '2.9.1'),
+    ('Eigen', '3.1.4'),
+]
+
+runtest = 'test'
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0.eb b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0-Python-2.7.5.eb
similarity index 60%
rename from easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0.eb
rename to easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0-Python-2.7.5.eb
index 54fdc7e7346c265a38dfffe721aa6894805fc2c6..94e60465eb3865fde51fd28e618d0424aba29b8e 100644
--- a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-5.5.0-Python-2.7.5.eb
@@ -2,9 +2,10 @@ name = 'OpenBabel'
 version = '2.3.2'
 
 homepage = 'http://openbabel.org'
-description = """Open Babel is a chemical toolbox designed to speak the many languages of chemical 
-data. It's an open, collaborative project allowing anyone to search, convert, analyze, or store data 
-from molecular modeling, chemistry, solid-state materials, biochemistry, or related areas."""
+description = """Open Babel is a chemical toolbox designed to speak the many
+ languages of chemical data. It's an open, collaborative project allowing anyone
+ to search, convert, analyze, or store data from molecular modeling, chemistry,
+ solid-state materials, biochemistry, or related areas."""
 
 toolchain = {'name': 'ictce', 'version': '5.5.0'}
 toolchainopts = {'optarch': True}
@@ -20,11 +21,17 @@ patches = [
 
 builddependencies = [('CMake', '2.8.12')]
 
+python = "Python"
+pythonversion = '2.7.5'
+pythonshortversion = ".".join(pythonversion.split(".")[:-1])
+
+versionsuffix = "-%s-%s" % (python, pythonversion)
+
 dependencies = [
+    (python, pythonversion),
     ('zlib', '1.2.8'),
     ('libxml2', '2.9.1'),
     ('Eigen', '3.1.4'),
-    ('Python', '2.7.5'),
 ]
 
 runtest = 'test'
diff --git a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-goalf-1.1.0-no-OFED.eb
index f4cd636622505b205682794e0b1f755aaa3ccead..47f96c354b3957656ef4a474792b3901f0c550e3 100644
--- a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-goalf-1.1.0-no-OFED.eb
@@ -11,7 +11,7 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
 source_urls = ['http://downloads.sourceforge.net/foam/%(version)s']
 sources = [
-    '%(name)s-%(version)s.tgz',
+    SOURCE_TGZ,
     'ThirdParty-%(version)s.tgz',
 ]
 
diff --git a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-goolf-1.4.10.eb b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-goolf-1.4.10.eb
index 17e916292087469c0d4ad1b7014700a533648aea..fc95905bea2baad971aa1c995ed3d126f3779103 100644
--- a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-goolf-1.4.10.eb
@@ -11,7 +11,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 source_urls = ['http://downloads.sourceforge.net/foam/%(version)s']
 sources = [
-    '%(name)s-%(version)s.tgz',
+    SOURCE_TGZ,
     'ThirdParty-%(version)s.tgz',
 ]
 
diff --git a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-ictce-4.0.6.eb b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-ictce-4.0.6.eb
index 0e8e0b1c766f8bc3f579597ed2cbc6907f7a7ab7..9a382ba0a0f33bf40e4edebfc3a4a8cd02bb80fe 100644
--- a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-ictce-4.0.6.eb
@@ -11,7 +11,7 @@ toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
 source_urls = ['http://downloads.sourceforge.net/foam/%(version)s']
 sources = [
-    '%(name)s-%(version)s.tgz',
+    SOURCE_TGZ,
     'ThirdParty-%(version)s.tgz',
 ]
 
diff --git a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-ictce-5.3.0.eb b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-ictce-5.3.0.eb
index c16690c3c68fdc855828e44c648cf4d0a1330e2f..846b27e9ad7cf9a6cfdaa8beba0f2b1e70c9adbe 100644
--- a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-ictce-5.3.0.eb
@@ -12,7 +12,7 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 source_urls = ['http://downloads.sourceforge.net/foam/%(version)s']
 sources = [
-    '%(name)s-%(version)s.tgz',
+    SOURCE_TGZ,
     'ThirdParty-%(version)s.tgz',
 ]
 
diff --git a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.2.0-goolf-1.4.10.eb b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.2.0-goolf-1.4.10.eb
index b192fe9ac28f9d0883befe4390cb38bb1dbd212c..4f2803ebd1733dcbfc04d3c3a001b04561e1cb2b 100644
--- a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.2.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.2.0-goolf-1.4.10.eb
@@ -11,7 +11,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 source_urls = ['http://downloads.sourceforge.net/foam/%(version)s']
 sources = [
-    '%(name)s-%(version)s.tgz',
+    SOURCE_TGZ,
     'ThirdParty-%(version)s.tgz',
 ]
 
diff --git a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.2.0-ictce-4.1.13.eb b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.2.0-ictce-4.1.13.eb
index 6268f6a3386974985d73aea84bf68d772003d319..93b4f37bde1ffab35b953321ad4ec624c3b1dcc3 100644
--- a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.2.0-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.2.0-ictce-4.1.13.eb
@@ -11,7 +11,7 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
 source_urls = ['http://downloads.sourceforge.net/foam/%(version)s']
 sources = [
-    '%(name)s-%(version)s.tgz',
+    SOURCE_TGZ,
     'ThirdParty-%(version)s.tgz',
 ]
 
diff --git a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.2.0-iqacml-4.4.13.eb b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.2.0-iqacml-4.4.13.eb
index 73282af7a1832a71839b0369f44f393fbf7d4a35..3f2e8fb6979de2b143f26b5fdea91fbfcce109e1 100644
--- a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.2.0-iqacml-4.4.13.eb
+++ b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.2.0-iqacml-4.4.13.eb
@@ -11,7 +11,7 @@ toolchain = {'name': 'iqacml', 'version': '4.4.13'}
 
 source_urls = ['http://downloads.sourceforge.net/foam/%(version)s']
 sources = [
-    '%(name)s-%(version)s.tgz',
+    SOURCE_TGZ,
     'ThirdParty-%(version)s.tgz',
 ]
 
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3-no-OFED.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3-no-OFED.eb
index 1367d9607ef9ca36e7011260900c36f54fae5963..6d2e812c6e93edfb7f1d63ab5693141740aa46f1 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3-no-OFED.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3-no-OFED.eb
@@ -3,23 +3,23 @@ version = '1.4.5'
 versionsuffix = "-no-OFED"
 
 homepage = 'http://www.open-mpi.org/'
-description = "The Open MPI Project is an open source MPI-2 implementation."
+description = """The Open MPI Project is an open source MPI-2 implementation."""
 
 toolchain = {'name': 'GCC', 'version': '4.6.3'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
 
+patches = ['pax_disable.patch']
+
 configopts = '--with-threads=posix --enable-shared --enable-mpi-threads --without-openib '
 configopts += '--enable-mpirun-prefix-by-default '  # suppress failure modes in relation to mpirun path
 
-patches = ['pax_disable.patch']
-
 sanity_check_paths = {
     'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] +
              ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mca_common_sm", "mpi_cxx",
-                                                                         "mpi_f77", "mpi_f90", "mpi",
-                                                                         "open-pal", "open-rte"]],
+                                                                         "mpi_f77", "mpi_f90",
+                                                                         "mpi", "open-pal", "open-rte"]],
     'dirs': ["include/openmpi/ompi/mpi/cxx"],
 }
 
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3.eb
index a35560d5360aa25c8f47e34f32c3edfc7e1fc22a..26789b95aeb86b5a3a9ec29f8605b3a2fa2d203c 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3.eb
@@ -2,7 +2,7 @@ name = 'OpenMPI'
 version = '1.4.5'
 
 homepage = 'http://www.open-mpi.org/'
-description = "The Open MPI Project is an open source MPI-2 implementation."
+description = """The Open MPI Project is an open source MPI-2 implementation."""
 
 toolchain = {'name': 'GCC', 'version': '4.6.3'}
 
@@ -22,8 +22,8 @@ else:
 sanity_check_paths = {
     'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] +
              ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mca_common_sm", "mpi_cxx",
-                                                                         "mpi_f77", "mpi_f90", "mpi",
-                                                                         "open-pal", "open-rte"]],
+                                                                         "mpi_f77", "mpi_f90",
+                                                                         "mpi", "open-pal", "open-rte"]],
     'dirs': ["include/openmpi/ompi/mpi/cxx"],
 }
 
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb
index 91a35df40592841769e83f0c286283195b5405e7..df8b6e8bef183b9918d965bbedb5266f193181aa 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb
@@ -2,7 +2,7 @@ name = 'OpenMPI'
 version = '1.6.3'
 
 homepage = 'http://www.open-mpi.org/'
-description = "The Open MPI Project is an open source MPI-2 implementation."
+description = """The Open MPI Project is an open source MPI-2 implementation."""
 
 toolchain = {'name': 'iccifort', 'version': '2011.13.367'}
 
@@ -11,7 +11,7 @@ source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/d
 
 configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --with-openib '
 configopts += '--enable-mpirun-prefix-by-default '  # suppress failure modes in relation to mpirun path
-configopts += '--with-hwloc '  # hwloc support
+configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
 
 dependencies = [('hwloc', '1.6')]
 
@@ -23,16 +23,16 @@ else:
     osdependencies = ['libibverbs-devel']
 
 sanity_check_paths = {
-    'files':["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] +
-            ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mca_common_sm", "mpi_cxx",
-                                                                        "mpi_f77" ,"mpi_f90", "mpi",
-                                                                        "ompitrace", "open-pal",
-                                                                        "open-rte", "otfaux", "otf",
-                                                                        "vt", "vt-hyb", "vt-mpi",
-                                                                        "vt-mpi-unify"]] +
-            ["include/%s.h" % x for x in ["mpi-ext", "mpif-common", "mpif-config", "mpif",
-                                          "mpif-mpi-io", "mpi", "mpi_portable_platform"]],
-     'dirs':["include/openmpi/ompi/mpi/cxx"],
+    'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] +
+             ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mca_common_sm", "mpi_cxx",
+                                                                         "mpi_f77", "mpi_f90",
+                                                                         "mpi", "ompitrace", "open-pal",
+                                                                         "otfaux", "otf",
+                                                                         "open-rte", "vt", "vt-hyb",
+                                                                         "vt-mpi", "vt-mpi-unify"]] +
+             ["include/%s.h" % x for x in ["mpi-ext", "mpif-common", "mpif-config", "mpif",
+                                           "mpif-mpi-io", "mpi", "mpi_portable_platform"]],
+    'dirs': ["include/openmpi/ompi/mpi/cxx"],
 }
 
 moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-ClangGCC-1.1.3.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-ClangGCC-1.1.3.eb
index 398f18b92f9b3d78b0fe14d7629d78578d7ed8ff..ff863200f4b9144e4010fbd142d2421d8e047e47 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-ClangGCC-1.1.3.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-ClangGCC-1.1.3.eb
@@ -2,14 +2,14 @@ name = 'OpenMPI'
 version = '1.6.4'
 
 homepage = 'http://www.open-mpi.org/'
-description = "The Open MPI Project is an open source MPI-2 implementation."
+description = """The Open MPI Project is an open source MPI-2 implementation."""
 
 toolchain = {'name': 'ClangGCC', 'version': '1.1.3'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
 
-dependencies = [ ('hwloc', '1.6.2') ]
+dependencies = [('hwloc', '1.6.2')]
 
 configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --with-openib '
 configopts += '--enable-mpirun-prefix-by-default '  # suppress failure modes in relation to mpirun path
@@ -25,13 +25,13 @@ else:
 
 sanity_check_paths = {
     'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] +
-             ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77" ,"mpi_f90",
+             ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77", "mpi_f90",
                                                                          "mpi", "ompitrace", "open-pal",
                                                                          "open-rte", "vt", "vt-hyb",
                                                                          "vt-mpi", "vt-mpi-unify"]] +
              ["include/%s.h" % x for x in ["mpi-ext", "mpif-common", "mpif-config", "mpif",
                                            "mpif-mpi-io", "mpi", "mpi_portable_platform"]],
-     'dirs': ["include/openmpi/ompi/mpi/cxx"],
+    'dirs': ["include/openmpi/ompi/mpi/cxx"],
 }
 
 moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.6.4.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.6.4.eb
index 7e234f5741abe904e6654510f77d5f7b07e9bb86..053791e834d4592313742a8635bd3f65fb228f42 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.6.4.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.6.4.eb
@@ -2,14 +2,14 @@ name = 'OpenMPI'
 version = '1.6.4'
 
 homepage = 'http://www.open-mpi.org/'
-description = "The Open MPI Project is an open source MPI-2 implementation."
+description = """The Open MPI Project is an open source MPI-2 implementation."""
 
 toolchain = {'name': 'GCC', 'version': '4.6.4'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
 
-dependencies = [ ('hwloc', '1.6.2') ]
+dependencies = [('hwloc', '1.6.2')]
 
 configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --with-openib '
 configopts += '--enable-mpirun-prefix-by-default '  # suppress failure modes in relation to mpirun path
@@ -25,13 +25,13 @@ else:
 
 sanity_check_paths = {
     'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] +
-             ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77" ,"mpi_f90",
+             ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77", "mpi_f90",
                                                                          "mpi", "ompitrace", "open-pal",
                                                                          "open-rte", "vt", "vt-hyb",
                                                                          "vt-mpi", "vt-mpi-unify"]] +
              ["include/%s.h" % x for x in ["mpi-ext", "mpif-common", "mpif-config", "mpif",
                                            "mpif-mpi-io", "mpi", "mpi_portable_platform"]],
-     'dirs': ["include/openmpi/ompi/mpi/cxx"],
+    'dirs': ["include/openmpi/ompi/mpi/cxx"],
 }
 
 moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2-no-OFED.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2-no-OFED.eb
new file mode 100644
index 0000000000000000000000000000000000000000..17f945a10e602514a9ecdbb8428c0fc44130fe08
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2-no-OFED.eb
@@ -0,0 +1,31 @@
+name = 'OpenMPI'
+version = '1.6.4'
+versionsuffix = '-no-OFED'
+
+homepage = 'http://www.open-mpi.org/'
+description = "The Open MPI Project is an open source MPI-2 implementation."
+
+toolchain = {'name': 'GCC', 'version': '4.7.2'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
+
+dependencies = [('hwloc', '1.6.2')]
+
+configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --without-openib ' 
+configopts += '--enable-mpirun-prefix-by-default '  # suppress failure modes in relation to mpirun path
+configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
+configopts += '--disable-dlopen '  # statically link component, don't do dynamic loading
+
+sanity_check_paths = {
+    'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] +
+             ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77" ,"mpi_f90",
+                                                                         "mpi", "ompitrace", "open-pal",
+                                                                         "open-rte", "vt", "vt-hyb",
+                                                                         "vt-mpi", "vt-mpi-unify"]] +
+             ["include/%s.h" % x for x in ["mpi-ext", "mpif-common", "mpif-config", "mpif",
+                                           "mpif-mpi-io", "mpi", "mpi_portable_platform"]],
+     'dirs': ["include/openmpi/ompi/mpi/cxx"],
+}
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2.eb
index bf110b338b837fdd8627995c5c1c927c0bbf51fb..fa3425f1abbafac526869f6f66759cdbb647c89c 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2.eb
@@ -2,7 +2,7 @@ name = 'OpenMPI'
 version = '1.6.4'
 
 homepage = 'http://www.open-mpi.org/'
-description = "The Open MPI Project is an open source MPI-2 implementation."
+description = """The Open MPI Project is an open source MPI-2 implementation."""
 
 toolchain = {'name': 'GCC', 'version': '4.7.2'}
 
@@ -25,13 +25,13 @@ else:
 
 sanity_check_paths = {
     'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] +
-             ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77" ,"mpi_f90",
+             ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77", "mpi_f90",
                                                                          "mpi", "ompitrace", "open-pal",
                                                                          "open-rte", "vt", "vt-hyb",
                                                                          "vt-mpi", "vt-mpi-unify"]] +
              ["include/%s.h" % x for x in ["mpi-ext", "mpif-common", "mpif-config", "mpif",
                                            "mpif-mpi-io", "mpi", "mpi_portable_platform"]],
-     'dirs': ["include/openmpi/ompi/mpi/cxx"],
+    'dirs': ["include/openmpi/ompi/mpi/cxx"],
 }
 
 moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb
index 64076b302744a29f469209d9b5bb023ce8f729bb..d0eab128c41eb974295e3e048af1bc3e962ebaf4 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.2.eb
@@ -2,7 +2,7 @@ name = 'OpenMPI'
 version = '1.6.5'
 
 homepage = 'http://www.open-mpi.org/'
-description = "The Open MPI Project is an open source MPI-2 implementation."
+description = """The Open MPI Project is an open source MPI-2 implementation."""
 
 toolchain = {'name': 'GCC', 'version': '4.7.2'}
 
@@ -20,15 +20,19 @@ configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
 configopts += '--disable-dlopen '  # statically link component, don't do dynamic loading
 
 # needed for --with-openib
-osdependencies = ['libibverbs-devel']
+if OS_NAME in ['debian', 'ubuntu']:
+    osdependencies = ['libibverbs-dev']
+else:
+    # OK for OS_NAME == redhat, fedora, RHEL, SL, centos
+    osdependencies = ['libibverbs-devel']
 
 sanity_check_paths = {
     'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] +
-             ["lib/lib%s.so" % (libfile) for libfile in ["mpi_cxx", "mpi_f77", "mpi_f90",
+             ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77", "mpi_f90",
               "mpi", "ompitrace", "open-pal", "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"]] +
              ["include/%s.h" % x for x in ["mpi-ext", "mpif-common", "mpif-config", "mpif",
               "mpif-mpi-io", "mpi", "mpi_portable_platform"]],
-    'dirs': ["include/openmpi/ompi/mpi/cxx"]
+    'dirs': ["include/openmpi/ompi/mpi/cxx"],
 }
 
 moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb
index 5fc801a2be75608e834bc8a661a4f3533ba5dbac..ea1c8c999905343c5ca235a51ba0cc93748e5b91 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb
@@ -3,7 +3,7 @@ version = '1.6.5'
 versionsuffix = "-no-OFED"
 
 homepage = 'http://www.open-mpi.org/'
-description = "The Open MPI Project is an open source MPI-2 implementation."
+description = """The Open MPI Project is an open source MPI-2 implementation."""
 
 toolchain = {'name': 'GCC', 'version': '4.7.3'}
 
@@ -18,13 +18,13 @@ configopts += '--disable-dlopen '  # statically link component, don't do dynamic
 
 sanity_check_paths = {
     'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] +
-             ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77" ,"mpi_f90",
+             ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77", "mpi_f90",
                                                                          "mpi", "ompitrace", "open-pal",
                                                                          "open-rte", "vt", "vt-hyb",
                                                                          "vt-mpi", "vt-mpi-unify"]] +
              ["include/%s.h" % x for x in ["mpi-ext", "mpif-common", "mpif-config", "mpif",
                                            "mpif-mpi-io", "mpi", "mpi_portable_platform"]],
-     'dirs': ["include/openmpi/ompi/mpi/cxx"],
+    'dirs': ["include/openmpi/ompi/mpi/cxx"],
 }
 
 moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb
index d3b9362a3deec054e1a1587dbbf6069ad6a546b2..35d42cd257401673be39be121c97ea6859a8d63d 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb
@@ -3,7 +3,7 @@ version = '1.6.5'
 versionsuffix = "-no-OFED"
 
 homepage = 'http://www.open-mpi.org/'
-description = "The Open MPI Project is an open source MPI-2 implementation."
+description = """The Open MPI Project is an open source MPI-2 implementation."""
 
 toolchain = {'name': 'GCC', 'version': '4.8.1'}
 
@@ -18,13 +18,13 @@ configopts += '--disable-dlopen '  # statically link component, don't do dynamic
 
 sanity_check_paths = {
     'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] +
-             ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77" ,"mpi_f90",
+             ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77", "mpi_f90",
                                                                          "mpi", "ompitrace", "open-pal",
                                                                          "open-rte", "vt", "vt-hyb",
                                                                          "vt-mpi", "vt-mpi-unify"]] +
              ["include/%s.h" % x for x in ["mpi-ext", "mpif-common", "mpif-config", "mpif",
                                            "mpif-mpi-io", "mpi", "mpi_portable_platform"]],
-     'dirs': ["include/openmpi/ompi/mpi/cxx"],
+    'dirs': ["include/openmpi/ompi/mpi/cxx"],
 }
 
 moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1.eb
index ec79b10f3d9218f06badb59326f0d1b75669f34e..fcea0329661239cc1314b3594669c58b269aed26 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1.eb
@@ -2,7 +2,7 @@ name = 'OpenMPI'
 version = '1.6.5'
 
 homepage = 'http://www.open-mpi.org/'
-description = "The Open MPI Project is an open source MPI-2 implementation."
+description = """The Open MPI Project is an open source MPI-2 implementation."""
 
 toolchain = {'name': 'GCC', 'version': '4.8.1'}
 
@@ -24,13 +24,13 @@ else:
 
 sanity_check_paths = {
     'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] +
-             ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77" ,"mpi_f90",
+             ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77", "mpi_f90",
                                                                          "mpi", "ompitrace", "open-pal",
                                                                          "open-rte", "vt", "vt-hyb",
                                                                          "vt-mpi", "vt-mpi-unify"]] +
              ["include/%s.h" % x for x in ["mpi-ext", "mpif-common", "mpif-config", "mpif",
                                            "mpif-mpi-io", "mpi", "mpi_portable_platform"]],
-     'dirs': ["include/openmpi/ompi/mpi/cxx"],
+    'dirs': ["include/openmpi/ompi/mpi/cxx"],
 }
 
 moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2-no-OFED.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2-no-OFED.eb
new file mode 100644
index 0000000000000000000000000000000000000000..792495946f66e1f53aca6dea7efd62349ef170a9
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2-no-OFED.eb
@@ -0,0 +1,33 @@
+name = 'OpenMPI'
+version = '1.6.5'
+versionsuffix = '-no-OFED'
+
+homepage = 'http://www.open-mpi.org/'
+description = """The Open MPI Project is an open source MPI-2 implementation."""
+
+toolchain = {'name': 'GCC', 'version': '4.8.2'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
+
+patches = ['OpenMPI-1.6.5-vt_cupti_events.patch']
+
+configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --without-openib '
+configopts += '--enable-mpirun-prefix-by-default '  # suppress failure modes in relation to mpirun path
+configopts += '--disable-dlopen '  # statically link component, don't do dynamic loading
+configopts += '--with-hwloc=$EBROOTHWLOC '
+
+dependencies = [('hwloc', '1.8.1')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] +
+             ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77", "mpi_f90",
+                                                                         "mpi", "ompitrace", "open-pal",
+                                                                         "open-rte", "vt", "vt-hyb",
+                                                                         "vt-mpi", "vt-mpi-unify"]] +
+             ["include/%s.h" % x for x in ["mpi-ext", "mpif-common", "mpif-config", "mpif",
+                                           "mpif-mpi-io", "mpi", "mpi_portable_platform"]],
+    'dirs': ["include/openmpi/ompi/mpi/cxx"],
+}
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0dccde3d24fd52b2645a0923c296a3893efd96dd
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2.eb
@@ -0,0 +1,39 @@
+name = 'OpenMPI'
+version = '1.6.5'
+
+homepage = 'http://www.open-mpi.org/'
+description = """The Open MPI Project is an open source MPI-2 implementation."""
+
+toolchain = {'name': 'GCC', 'version': '4.8.2'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
+
+patches = ['OpenMPI-1.6.5-vt_cupti_events.patch']
+
+configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --with-openib '
+configopts += '--enable-mpirun-prefix-by-default '  # suppress failure modes in relation to mpirun path
+configopts += '--disable-dlopen '  # statically link component, don't do dynamic loading
+configopts += '--with-hwloc=$EBROOTHWLOC '
+
+dependencies = [('hwloc', '1.8.1')]
+
+# needed for --with-openib
+if OS_NAME in ['debian', 'ubuntu']:
+    osdependencies = ['libibverbs-dev']
+else:
+    # OK for OS_NAME == redhat, fedora, RHEL, SL, centos
+    osdependencies = ['libibverbs-devel']
+
+sanity_check_paths = {
+    'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] +
+             ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_f77", "mpi_f90",
+                                                                         "mpi", "ompitrace", "open-pal",
+                                                                         "open-rte", "vt", "vt-hyb",
+                                                                         "vt-mpi", "vt-mpi-unify"]] +
+             ["include/%s.h" % x for x in ["mpi-ext", "mpif-common", "mpif-config", "mpif",
+                                           "mpif-mpi-io", "mpi", "mpi_portable_platform"]],
+    'dirs': ["include/openmpi/ompi/mpi/cxx"],
+}
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-iccifort-2013_sp1.2.144.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-iccifort-2013_sp1.2.144.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6f2cfbd602208335e83228a89e6abe32c4ff398a
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-iccifort-2013_sp1.2.144.eb
@@ -0,0 +1,38 @@
+name = 'OpenMPI'
+version = '1.6.5'
+
+homepage = 'http://www.open-mpi.org/'
+description = """The Open MPI Project is an open source MPI-2 implementation."""
+
+toolchain = {'name': 'iccifort', 'version': '2013_sp1.2.144'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
+
+configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --with-openib '
+configopts += '--enable-mpirun-prefix-by-default '  # suppress failure modes in relation to mpirun path
+configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
+
+dependencies = [('hwloc', '1.8.1')]
+
+# needed for --with-openib
+if OS_NAME in ['debian', 'ubuntu']:
+    osdependencies = ['libibverbs-dev']
+else:
+    # OK for OS_NAME == redhat, fedora, RHEL, SL, centos
+    osdependencies = ['libibverbs-devel']
+
+sanity_check_paths = {
+    'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] +
+             ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mca_common_sm", "mpi_cxx",
+                                                                         "mpi_f77", "mpi_f90",
+                                                                         "mpi", "ompitrace", "open-pal",
+                                                                         "otfaux", 
+                                                                         "open-rte", "vt", "vt-hyb",
+                                                                         "vt-mpi", "vt-mpi-unify"]] +
+             ["include/%s.h" % x for x in ["mpi-ext", "mpif-common", "mpif-config", "mpif",
+                                           "mpif-mpi-io", "mpi", "mpi_portable_platform"]],
+    'dirs': ["include/openmpi/ompi/mpi/cxx"],
+}
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb
index f608c64f7f862ecffdca7d0277699801944aad04..93d3cb6e287b9d1f453b7211605f586eeb634d85 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-GCC-4.8.2.eb
@@ -7,11 +7,11 @@ description = """The Open MPI Project is an open source MPI-2 implementation."""
 toolchain = {'name': 'GCC', 'version': '4.8.2'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://www.open-mpi.org/software/ompi/v%s/downloads' % '.'.join(version.split('.')[0:2])]
+source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
 
 builddependencies = [
     ('Automake', '1.14'),
-    ('Autoconf', '2.69')
+    ('Autoconf', '2.69'),
 ]
 
 dependencies = [('hwloc', '1.7.2')]
@@ -21,7 +21,14 @@ configopts += '--enable-mpirun-prefix-by-default '  # suppress failure modes in
 configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
 configopts += '--disable-dlopen '  # statically link component, don't do dynamic loading
 
-sanity_check_paths  =  {
+# needed for --with-openib
+if OS_NAME in ['debian', 'ubuntu']:
+    osdependencies = ['libibverbs-dev']
+else:
+    # OK for OS_NAME == redhat, fedora, RHEL, SL, centos
+    osdependencies = ['libibverbs-devel']
+
+sanity_check_paths = {
     'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] +
              ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_mpifh",
                                                                          "mpi", "ompitrace", "open-pal",
@@ -29,7 +36,7 @@ sanity_check_paths  =  {
                                                                          "open-rte", "vt", "vt-hyb",
                                                                          "vt-mpi", "vt-mpi-unify"]] +
              ["include/%s.h" % x for x in ["mpi-ext", "mpif-config", "mpif", "mpi", "mpi_portable_platform"]],
-    'dirs': ["include/openmpi/ompi/mpi/cxx"]
+    'dirs': ["include/openmpi/ompi/mpi/cxx"],
 }
 
 moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..240afe49ecdabf3f0d1836f20b7a6eca2354dd5f
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb
@@ -0,0 +1,41 @@
+name = 'OpenMPI'
+version = "1.7.3"
+
+homepage = 'http://www.open-mpi.org/'
+description = """The Open MPI Project is an open source MPI-2 implementation."""
+
+toolchain = {'name': 'gcccuda', 'version': '2.6.10'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
+
+builddependencies = [
+    ('Automake', '1.14'),
+    ('Autoconf', '2.69'),
+]
+
+dependencies = [('hwloc', '1.8')]
+
+configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --with-openib '
+configopts += '--enable-mpirun-prefix-by-default '  # suppress failure modes in relation to mpirun path
+configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
+configopts += '--with-cuda=$CUDA_HOME '             # CUDA-aware build; N.B. --disable-dlopen is incompatible
+
+# needed for --with-openib
+if OS_NAME in ['debian', 'ubuntu']:
+    osdependencies = ['libibverbs-dev']
+else:
+    # OK for OS_NAME == redhat, fedora, RHEL, SL, centos
+    osdependencies = ['libibverbs-devel']
+
+sanity_check_paths = {
+    'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] +
+             ["lib/lib%s.%s" % (libfile, shared_lib_ext) for libfile in ["mpi_cxx", "mpi_mpifh",
+                                                                         "mpi", "ompitrace", "open-pal",
+                                                                         "open-rte", "vt", "vt-hyb",
+                                                                         "vt-mpi", "vt-mpi-unify"]] +
+             ["include/%s.h" % x for x in ["mpi-ext", "mpif-config", "mpif", "mpi", "mpi_portable_platform"]],
+    'dirs': ["include/openmpi/ompi/mpi/cxx"],
+}
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-ictce-5.5.0.eb b/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..459c7147c9e62b1ef005949d1207e6e056dc4946
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-ictce-5.5.0.eb
@@ -0,0 +1,25 @@
+name = 'OpenPGM'
+version = '5.2.122'
+
+homepage = 'http://code.google.com/p/openpgm/'
+description = """OpenPGM is an open source implementation of the Pragmatic General Multicast (PGM)
+ specification in RFC 3208 available at www.ietf.org. PGM is a reliable and scalable multicast protocol
+ that enables receivers to detect loss, request retransmission of lost data, or notify an application
+ of unrecoverable loss. PGM is a receiver-reliable protocol, which means the receiver is responsible
+ for ensuring all data is received, absolving the sender of reception responsibility."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+source_urls = ['http://%s.googlecode.com/files/' % (name.lower())]
+sources = ['%s-%s.tar.gz' % ('libpgm', version)]
+
+configopts = '--with-pic'
+
+start_dir = 'pgm'
+
+sanity_check_paths = {
+    'files': ['lib/libpgm.so', 'lib/libpgm.a'],
+    'dirs': ['include'],
+}
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-goalf-1.1.0-no-OFED.eb
new file mode 100644
index 0000000000000000000000000000000000000000..456f22d4c8b1db159b63296aca425d70b148e2fe
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-goalf-1.1.0-no-OFED.eb
@@ -0,0 +1,21 @@
+name = 'OpenSSL'
+version = '1.0.1f'
+
+homepage = 'http://www.openssl.org/'
+description = """The OpenSSL Project is a collaborative effort to develop a robust, commercial-grade, full-featured,
+  and Open Source toolchain implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) 
+ protocols as well as a full-strength general purpose cryptography library. """
+
+toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.openssl.org/source/']
+
+dependencies = [('zlib', '1.2.7')]
+
+# makefile is not suitable for parallel build
+parallel = 1
+runtest = 'test'
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-goalf-1.5.12-no-OFED.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ac69ef38a5431186051aa71b9d9430e5088cb2e6
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-goalf-1.5.12-no-OFED.eb
@@ -0,0 +1,21 @@
+name = 'OpenSSL'
+version = '1.0.1f'
+
+homepage = 'http://www.openssl.org/'
+description = """The OpenSSL Project is a collaborative effort to develop a robust, commercial-grade, full-featured,
+  and Open Source toolchain implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) 
+ protocols as well as a full-strength general purpose cryptography library. """
+
+toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.openssl.org/source/']
+
+dependencies = [('zlib', '1.2.7')]
+
+# makefile is not suitable for parallel build
+parallel = 1
+runtest = 'test'
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-goolf-1.4.10.eb b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a894ebdd82c026e309a5b42b1b60440c35710e33
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-goolf-1.4.10.eb
@@ -0,0 +1,21 @@
+name = 'OpenSSL'
+version = '1.0.1f'
+
+homepage = 'http://www.openssl.org/'
+description = """The OpenSSL Project is a collaborative effort to develop a robust, commercial-grade, full-featured,
+and Open Source toolchain implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) 
+protocols as well as a full-strength general purpose cryptography library. """
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.openssl.org/source/']
+
+dependencies = [('zlib', '1.2.7')]
+
+# makefile is not suitable for parallel build
+parallel = 1
+runtest = 'test'
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-4.0.6.eb b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-4.0.6.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1f75edf44c03e854a360c9406d4fea10cf2a6fe7
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-4.0.6.eb
@@ -0,0 +1,23 @@
+name = 'OpenSSL'
+version = '1.0.1f'
+
+homepage = 'http://www.openssl.org/'
+description = """The OpenSSL Project is a collaborative effort to develop a robust, commercial-grade, full-featured,
+and Open Source toolchain implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) 
+protocols as well as a full-strength general purpose cryptography library. """
+
+toolchain = {'name': 'ictce', 'version': '4.0.6'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.openssl.org/source/']
+
+patches = ['OpenSSL-1.0.1f_icc-fixes.patch']
+
+dependencies = [('zlib', '1.2.7')]
+
+# makefile is not suitable for parallel build
+parallel = 1
+runtest = 'test'
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-4.1.13.eb b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-4.1.13.eb
new file mode 100644
index 0000000000000000000000000000000000000000..00fb598e1d1ef7abfb9e61697061f22720eecbfe
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-4.1.13.eb
@@ -0,0 +1,23 @@
+name = 'OpenSSL'
+version = '1.0.1f'
+
+homepage = 'http://www.openssl.org/'
+description = """The OpenSSL Project is a collaborative effort to develop a robust, commercial-grade, full-featured,
+and Open Source toolchain implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) 
+protocols as well as a full-strength general purpose cryptography library. """
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.openssl.org/source/']
+
+patches = ['OpenSSL-1.0.1f_icc-fixes.patch']
+
+dependencies = [('zlib', '1.2.7')]
+
+# makefile is not suitable for parallel build
+parallel = 1
+runtest = 'test'
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-5.3.0.eb b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..317cd9b4dea4777f61a6558d53c6fe34b2288e60
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-5.3.0.eb
@@ -0,0 +1,23 @@
+name = 'OpenSSL'
+version = '1.0.1f'
+
+homepage = 'http://www.openssl.org/'
+description = """The OpenSSL Project is a collaborative effort to develop a robust, commercial-grade, full-featured,
+and Open Source toolchain implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) 
+protocols as well as a full-strength general purpose cryptography library. """
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.openssl.org/source/']
+
+patches = ['OpenSSL-1.0.1f_icc-fixes.patch']
+
+dependencies = [('zlib', '1.2.7')]
+
+# makefile is not suitable for parallel build
+parallel = 1
+runtest = 'test'
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-5.5.0.eb b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c755fa9a4a5f6f338c9bc585599bb71578d2bc29
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-5.5.0.eb
@@ -0,0 +1,23 @@
+name = 'OpenSSL'
+version = '1.0.1f'
+
+homepage = 'http://www.openssl.org/'
+description = """The OpenSSL Project is a collaborative effort to develop a robust, commercial-grade, full-featured,
+and Open Source toolchain implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) 
+protocols as well as a full-strength general purpose cryptography library. """
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.openssl.org/source/']
+
+patches = ['OpenSSL-1.0.1f_icc-fixes.patch']
+
+dependencies = [('zlib', '1.2.7')]
+
+# makefile is not suitable for parallel build
+parallel = 1
+runtest = 'test'
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f_icc-fixes.patch b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f_icc-fixes.patch
new file mode 100644
index 0000000000000000000000000000000000000000..bc1d39fe2d0975848246fe27b2932f5cb05188ce
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f_icc-fixes.patch
@@ -0,0 +1,116 @@
+based on http://openssl.6102.n7.nabble.com/Compiling-OpenSSL-with-icc-td42304.html (http://cvs.openssl.org/chngview?cn=23036)
+diff -ru openssl-1.0.1f.orig/Configure openssl-1.0.1f/Configure
+--- openssl-1.0.1f.orig/Configure	2014-01-06 14:47:42.000000000 +0100
++++ openssl-1.0.1f/Configure	2014-02-14 08:41:42.000000000 +0100
+@@ -351,16 +351,16 @@
+ # If you compiler does not, do complement config command line with one!
+ "linux-armv4",	"gcc:-DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ #### IA-32 targets...
+-"linux-ia32-icc",	"icc:-DL_ENDIAN -DTERMIO -O2 -no_cpprt::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-ia32-icc",	"icc:-DL_ENDIAN -DTERMIO -O2::-D_REENTRANT::-ldl -no_cpprt:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-elf",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-aout",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -march=i486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out",
+ ####
+ "linux-generic64","gcc:-DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-ppc64",	"gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc64_asm}:linux64:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
+ "linux-ia64",	"gcc:-DL_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"linux-ia64-ecc","ecc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"linux-ia64-icc","icc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-ia64-icc","icc:-DL_ENDIAN -DTERMIO -O2 -Wall::-D_REENTRANT::-ldl -no_cpprt:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-x86_64",	"gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
++"linux-x86_64-icc", "icc:-DL_ENDIAN -DTERMIO -O2::-D_REENTRANT::-ldl -no_cpprt:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
+ "linux64-s390x",	"gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:64:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
+ #### So called "highgprs" target for z/Architecture CPUs
+ # "Highgprs" is kernel feature first implemented in Linux 2.6.32, see
+@@ -1410,6 +1410,7 @@
+ 		}
+ 	if ($iccver>=8)
+ 		{
++        $cflags=~s/\-KPIC/-fPIC/;
+ 		# Eliminate unnecessary dependency from libirc.a. This is
+ 		# essential for shared library support, as otherwise
+ 		# apps/openssl can end up in endless loop upon startup...
+@@ -1417,13 +1418,18 @@
+ 		}
+ 	if ($iccver>=9)
+ 		{
+-		$cflags.=" -i-static";
+-		$cflags=~s/\-no_cpprt/-no-cpprt/;
++        $lflags.=" -i-static";
++        $lflags=~s/\-no_cpprt/-no-cpprt/;
+ 		}
+ 	if ($iccver>=10)
+ 		{
+-		$cflags=~s/\-i\-static/-static-intel/;
++		$lflags=~s/\-i\-static/-static-intel/;
+ 		}
++    if ($iccver>=11)
++        {
++        $cflags.=" -no-intel-extensions";   # disable Cilk
++        $lflags=~s/\-no\-cpprt/-no-cxxlib/;
++        }
+ 	}
+ 
+ # Unlike other OSes (like Solaris, Linux, Tru64, IRIX) BSD run-time
+diff -ru openssl-1.0.1f.orig/crypto/aes/aes_x86core.c openssl-1.0.1f/crypto/aes/aes_x86core.c
+--- openssl-1.0.1f.orig/crypto/aes/aes_x86core.c	2014-01-06 14:47:42.000000000 +0100
++++ openssl-1.0.1f/crypto/aes/aes_x86core.c	2014-02-14 08:45:04.000000000 +0100
+@@ -89,8 +89,10 @@
+ #endif
+ 
+ #undef ROTATE
+-#if defined(_MSC_VER) || defined(__ICC)
++#if defined(_MSC_VER)
+ # define ROTATE(a,n)	_lrotl(a,n)
++#elif defined(__ICC)
++# define ROTATE(a,n)   _rotl(a,n)
+ #elif defined(__GNUC__) && __GNUC__>=2
+ # if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
+ #   define ROTATE(a,n)	({ register unsigned int ret;	\
+diff -ru openssl-1.0.1f.orig/crypto/des/des_locl.h openssl-1.0.1f/crypto/des/des_locl.h
+--- openssl-1.0.1f.orig/crypto/des/des_locl.h	2014-01-06 14:47:42.000000000 +0100
++++ openssl-1.0.1f/crypto/des/des_locl.h	2014-02-14 08:46:24.000000000 +0100
+@@ -160,8 +160,10 @@
+ 				} \
+ 			}
+ 
+-#if (defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER)) || defined(__ICC)
++#if (defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER))
+ #define	ROTATE(a,n)	(_lrotr(a,n))
++#elif defined(__ICC)
++#define ROTATE(a,n)    (_rotr(a,n))
+ #elif defined(__GNUC__) && __GNUC__>=2 && !defined(__STRICT_ANSI__) && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) && !defined(PEDANTIC)
+ # if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
+ #  define ROTATE(a,n)	({ register unsigned int ret;	\
+diff -ru openssl-1.0.1f.orig/crypto/md32_common.h openssl-1.0.1f/crypto/md32_common.h
+--- openssl-1.0.1f.orig/crypto/md32_common.h	2014-01-06 14:47:42.000000000 +0100
++++ openssl-1.0.1f/crypto/md32_common.h	2014-02-14 08:47:12.000000000 +0100
+@@ -142,8 +142,10 @@
+  */
+ #undef ROTATE
+ #ifndef PEDANTIC
+-# if defined(_MSC_VER) || defined(__ICC)
++# if defined(_MSC_VER)
+ #  define ROTATE(a,n)	_lrotl(a,n)
++# elif defined(__ICC)
++#  define ROTATE(a,n)  _rotl(a,n)
+ # elif defined(__MWERKS__)
+ #  if defined(__POWERPC__)
+ #   define ROTATE(a,n)	__rlwinm(a,n,0,31)
+diff -ru openssl-1.0.1f.orig/crypto/rc5/rc5_locl.h openssl-1.0.1f/crypto/rc5/rc5_locl.h
+--- openssl-1.0.1f.orig/crypto/rc5/rc5_locl.h	2014-01-06 14:47:42.000000000 +0100
++++ openssl-1.0.1f/crypto/rc5/rc5_locl.h	2014-02-14 08:43:37.000000000 +0100
+@@ -146,9 +146,12 @@
+                          *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
+                          *((c)++)=(unsigned char)(((l)     )&0xff))
+ 
+-#if (defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER)) || defined(__ICC)
++#if (defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER))
+ #define ROTATE_l32(a,n)     _lrotl(a,n)
+ #define ROTATE_r32(a,n)     _lrotr(a,n)
++#elif defined(__ICC)
++#define ROTATE_l32(a,n)     _rotl(a,n)
++#define ROTATE_r32(a,n)     _rotr(a,n)
+ #elif defined(__GNUC__) && __GNUC__>=2 && !defined(__STRICT_ANSI__) && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) && !defined(PEDANTIC)
+ # if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
+ #  define ROTATE_l32(a,n)	({ register unsigned int ret;	\
diff --git a/easybuild/easyconfigs/p/PAPI/PAPI-5.2.0-ictce-5.3.0.eb b/easybuild/easyconfigs/p/PAPI/PAPI-5.2.0-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0376287c5ed3cd9c03bbc03e8b3cb06692430ddc
--- /dev/null
+++ b/easybuild/easyconfigs/p/PAPI/PAPI-5.2.0-ictce-5.3.0.eb
@@ -0,0 +1,44 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine
+# Authors::   Fotis Georgatos <fotis.georgatos@uni.lu>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_07-02.html
+##
+
+name = 'PAPI'
+version = '5.2.0'
+
+homepage = 'http://icl.cs.utk.edu/projects/papi/'
+description = """PAPI provides the tool designer and application engineer with a consistent interface and
+ methodology for use of the performance counter hardware found in most major microprocessors. PAPI enables
+ software engineers to see, in near real time, the relation between software performance and processor events.
+ In addition Component PAPI provides access to a collection of components
+ that expose performance measurement opportunites across the hardware and software stack."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+# Example download URL, for reference: http://icl.cs.utk.edu/projects/papi/downloads/papi-5.0.0.tar.gz
+source_urls = ['http://icl.cs.utk.edu/projects/papi/downloads/']
+sources = [SOURCELOWER_TAR_GZ]
+
+start_dir = 'src'
+
+# parallel build doesn't always work
+parallel = 1
+
+runtest = 'fulltest'
+
+sanity_check_paths = {
+    'files': ["bin/papi_%s" % x for x in ["avail", "clockres", "command_line", "component_avail",
+                                          "cost", "decode", "error_codes", "event_chooser",
+                                          "mem_info", "multiplex_cost", "native_avail", "version",
+                                          "xml_event_info"]],
+    'dirs': [],
+}
+
+moduleclass = 'perf'
diff --git a/easybuild/easyconfigs/p/PDT/PDT-3.19-ictce-5.3.0.eb b/easybuild/easyconfigs/p/PDT/PDT-3.19-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d5d52a3127c2a010d4c62e51c4f541c872c9e18a
--- /dev/null
+++ b/easybuild/easyconfigs/p/PDT/PDT-3.19-ictce-5.3.0.eb
@@ -0,0 +1,48 @@
+# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild
+# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany
+# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
+# License::   New BSD
+#
+# This work is based from experiences from the UNITE project
+# http://apps.fz-juelich.de/unite/
+##
+name = "PDT"
+version = "3.19"
+
+homepage = 'http://www.cs.uoregon.edu/research/pdt/'
+description = """Program Database Toolkit (PDT) is a framework for analyzing source
+ code written in several programming languages and for making rich program knowledge
+ accessible to developers of static and dynamic analysis tools. PDT implements a standard
+ program representation, the program database (PDB), that can be accessed in a uniform way
+ through a class library supporting common PDB operations."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+# http://tau.uoregon.edu/pdt_releases/pdtoolkit-3.19.tar.gz
+sources = ['pdtoolkit-%(version)s.tar.gz']
+source_urls = ['http://tau.uoregon.edu/pdt_releases/']
+
+prefix_opt = '-prefix='
+
+# notes by Bernd Mohr
+# Compiler suite should always be specified -- MUCH quicker and SAVER than autodetect
+# -KAI|-KCC|-GNU|-CC|-c++|-cxx|-xlC|-pgCC|-icpc|-ecpc
+configopts = '-GNU'
+
+keeppreviousinstall = True
+
+# notes by Bernd Mohr
+# Use hardcoded x86_64 or "import platform; machine = platform.machine()" here?
+sanity_check_paths = {
+    'files': ["x86_64/bin/cparse", "x86_64/include/pdb.h", "x86_64/lib/libpdb.a"],
+    'dirs': [],
+}
+
+skipsteps = ['build']
+
+modextrapaths = {
+    'PATH': "x86_64/bin",
+    'LD_LIBRARY_PATH': "x86_64/lib",
+}
+
+moduleclass = 'perf'
diff --git a/easybuild/easyconfigs/p/PLINK/PLINK-1.07-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/p/PLINK/PLINK-1.07-goalf-1.1.0-no-OFED.eb
index e943acb2bac5b7c1316ea50adfdb3ed976ac2dc4..270600b7a49a254a2b892b805f6332eccc0f1f02 100644
--- a/easybuild/easyconfigs/p/PLINK/PLINK-1.07-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/p/PLINK/PLINK-1.07-goalf-1.1.0-no-OFED.eb
@@ -15,10 +15,16 @@ homepage = 'http://pngu.mgh.harvard.edu/~purcell/plink/'
 description = "plink-1.07-src: Whole-genome association analysis toolset"
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
+toolchainopts = {'openmp': True}
 
 sources = ['%(namelower)s-%(version)s-src.zip']
 source_urls = ['http://pngu.mgh.harvard.edu/~purcell/plink/dist/']
 
+dependencies = [('zlib', '1.2.7')]
+
+makeopts = 'CXX_UNIX="$CXX $CXXFLAGS" WITH_R_PLUGINS=1 WITH_WEBCHECK="" WITH_ZLIB=1 FORCE_DYNAMIC=1'
+makeopts += ' WITH_LAPACK=1 LIB_LAPACK="-L$BLAS_LAPACK_LIB_DIR -llapack -lf77blas -latlas -lgfortran"'
+
 files_to_copy = [
     (["plink", "gPLINK.jar"], 'bin'),
     "test.map",
diff --git a/easybuild/easyconfigs/p/PLINK/PLINK-1.07-ictce-5.3.0.eb b/easybuild/easyconfigs/p/PLINK/PLINK-1.07-ictce-5.3.0.eb
index d9aca19bc6b4d383b7584f9697f7ddfc8e6b4cb5..378457546f1b3f8a4ca16d849946eb9a26b2bf7e 100644
--- a/easybuild/easyconfigs/p/PLINK/PLINK-1.07-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/p/PLINK/PLINK-1.07-ictce-5.3.0.eb
@@ -15,10 +15,16 @@ homepage = 'http://pngu.mgh.harvard.edu/~purcell/plink/'
 description = "plink-1.07-src: Whole-genome association analysis toolset"
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'openmp': True}
 
 sources = ['%(namelower)s-%(version)s-src.zip']
 source_urls = ['http://pngu.mgh.harvard.edu/~purcell/plink/dist/']
 
+dependencies = [('zlib', '1.2.7')]
+
+makeopts = 'CXX_UNIX="$CXX $CXXFLAGS" WITH_R_PLUGINS=1 WITH_WEBCHECK="" WITH_ZLIB=1'
+makeopts += ' WITH_LAPACK=1 FORCE_DYNAMIC=1 LIB_LAPACK=$BLAS_LAPACK_LIB_DIR/libmkl_lapack.a'
+
 files_to_copy = [
     (["plink", "gPLINK.jar"], 'bin'),
     "test.map",
diff --git a/easybuild/easyconfigs/p/PLINK/PLINK-1.07-ictce-6.2.5.eb b/easybuild/easyconfigs/p/PLINK/PLINK-1.07-ictce-6.2.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..dbef660517eb4c6c6abc8d9dbcd649b39e669a3e
--- /dev/null
+++ b/easybuild/easyconfigs/p/PLINK/PLINK-1.07-ictce-6.2.5.eb
@@ -0,0 +1,47 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+easyblock='MakeCp'
+
+name = 'PLINK'
+version = '1.07'
+
+homepage = 'http://pngu.mgh.harvard.edu/~purcell/plink/'
+description = """ PLINK is a free, open-source whole genome association analysis toolset, 
+ designed to perform a range of basic, large-scale analyses in a computationally efficient manner.
+ The focus of PLINK is purely on analysis of genotype/phenotype data, so there is no support for 
+ steps prior to this (e.g. study design and planning, generating genotype or CNV calls from raw data). 
+ Through integration with gPLINK and Haploview, there is some support for the subsequent visualization, 
+ annotation and storage of results. """
+
+toolchain = {'name': 'ictce', 'version': '6.2.5'}
+toolchainopts = {'openmp': True}
+
+sources = ['%(namelower)s-%(version)s-src.zip']
+source_urls = ['http://pngu.mgh.harvard.edu/~purcell/plink/dist/']
+
+dependencies = [('zlib', '1.2.8')]
+
+# plink makefile is a little bit tricky so we pass every options as arguments
+# review plink original makefile for details 
+# if you want "new version check" change to WITH_WEBCHECK="1", but if your compute nodes
+# have no internet access better leave it as is
+makeopts = ' CXX_UNIX="$CXX $CXXFLAGS" WITH_R_PLUGINS=1 WITH_WEBCHECK="" WITH_ZLIB=1 '
+makeopts += ' WITH_LAPACK=1 FORCE_DYNAMIC=1 LIB_LAPACK=$BLAS_LAPACK_LIB_DIR/libmkl_lapack.a'
+
+files_to_copy = [
+    (["plink", "gPLINK.jar"], 'bin'),
+    "test.map",
+    "test.ped",
+    "COPYING.txt",
+    "README.txt",
+]
+
+sanity_check_paths = {
+    'files': ["bin/plink", "bin/gPLINK.jar", "test.map", "test.ped", "COPYING.txt", "README.txt"],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/p/PP/PP-1.6.4-goolf-1.4.10-Python-2.7.5.eb b/easybuild/easyconfigs/p/PP/PP-1.6.4-goolf-1.4.10-Python-2.7.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..da24746b62ed7a4ccd41cdb0d8e66d25351cb23a
--- /dev/null
+++ b/easybuild/easyconfigs/p/PP/PP-1.6.4-goolf-1.4.10-Python-2.7.5.eb
@@ -0,0 +1,30 @@
+easyblock = "PythonPackage"
+
+name = 'PP'
+version = '1.6.4'
+
+homepage = 'http://www.parallelpython.com/'
+description = """PP is a python module which provides mechanism for parallel execution of python code on SMP
+ (systems with multiple processors or cores) and clusters (computers connected via network)."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['http://www.parallelpython.com/downloads/pp/']
+sources = [SOURCELOWER_TAR_GZ]
+
+python = "Python"
+pythonversion = '2.7.5'
+pythonshortversion = ".".join(pythonversion.split(".")[:-1])
+
+versionsuffix = "-%s-%s" % (python, pythonversion)
+
+dependencies = [
+    (python, pythonversion),
+]
+
+sanity_check_paths = {
+    'files': ['lib/python%s/site-packages/%%(namelower)s.py' % pythonshortversion],
+    'dirs': [],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/PP/PP-1.6.4-ictce-4.1.13-Python-2.7.5.eb b/easybuild/easyconfigs/p/PP/PP-1.6.4-ictce-4.1.13-Python-2.7.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..cbf60d507e205a26ac65f79128e1b5b6266dfead
--- /dev/null
+++ b/easybuild/easyconfigs/p/PP/PP-1.6.4-ictce-4.1.13-Python-2.7.5.eb
@@ -0,0 +1,30 @@
+easyblock = "PythonPackage"
+
+name = 'PP'
+version = '1.6.4'
+
+homepage = 'http://www.parallelpython.com/'
+description = """PP is a python module which provides mechanism for parallel execution of python code on SMP
+ (systems with multiple processors or cores) and clusters (computers connected via network)."""
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+
+source_urls = ['http://www.parallelpython.com/downloads/pp/']
+sources = [SOURCELOWER_TAR_GZ]
+
+python = "Python"
+pythonversion = '2.7.5'
+pythonshortversion = ".".join(pythonversion.split(".")[:-1])
+
+versionsuffix = "-%s-%s" % (python, pythonversion)
+
+dependencies = [
+    (python, pythonversion),
+]
+
+sanity_check_paths = {
+    'files': ['lib/python%s/site-packages/%%(namelower)s.py' % pythonshortversion],
+    'dirs': [],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/PP/PP-1.6.4-ictce-5.3.0-Python-2.7.5.eb b/easybuild/easyconfigs/p/PP/PP-1.6.4-ictce-5.3.0-Python-2.7.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3d4858dc19cdeea4061d2367fa6d94b2e55e3ea1
--- /dev/null
+++ b/easybuild/easyconfigs/p/PP/PP-1.6.4-ictce-5.3.0-Python-2.7.5.eb
@@ -0,0 +1,30 @@
+easyblock = "PythonPackage"
+
+name = 'PP'
+version = '1.6.4'
+
+homepage = 'http://www.parallelpython.com/'
+description = """PP is a python module which provides mechanism for parallel execution of python code on SMP
+ (systems with multiple processors or cores) and clusters (computers connected via network)."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = ['http://www.parallelpython.com/downloads/pp/']
+sources = [SOURCELOWER_TAR_GZ]
+
+python = "Python"
+pythonversion = '2.7.5'
+pythonshortversion = ".".join(pythonversion.split(".")[:-1])
+
+versionsuffix = "-%s-%s" % (python, pythonversion)
+
+dependencies = [
+    (python, pythonversion),
+]
+
+sanity_check_paths = {
+    'files': ['lib/python%s/site-packages/%%(namelower)s.py' % pythonshortversion],
+    'dirs': [],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/PRACE/PRACE-20130605-goolf-1.4.10.eb b/easybuild/easyconfigs/p/PRACE/PRACE-20130605-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..dedd3bb32d563fe4ef48e4f1ec12f50196bf07d4
--- /dev/null
+++ b/easybuild/easyconfigs/p/PRACE/PRACE-20130605-goolf-1.4.10.eb
@@ -0,0 +1,36 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine
+# Authors::   Fotis Georgatos <fotis.georgatos@uni.lu>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of HPCBIOS project:
+# http://hpcbios.readthedocs.org/en/latest/
+##
+
+easyblock = "Toolchain"
+
+name = 'PRACE'
+version = '20130605'
+
+homepage = 'http://www.prace-ri.eu/PRACE-Common-Production'
+description = """The PRACE Common Production Environment (PCPE) is a set of software tools and libraries
+ that are planned to be available on all PRACE execution sites. The PCPE also defines a set of environment
+ variables that try to make compilation on all sites as homogeneous and simple as possible."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+dependencies = [
+    ('make', '3.82'),
+    ('Java', '1.7.0_10', '', True),
+    ('Bash', '4.2'),
+    ('tcsh', '6.18.01'),
+    ('Tcl', '8.5.12'),
+    ('Tk', '8.5.12'),
+    ('netCDF', '4.1.3'), # this one will also bring in HDF5
+    ('Perl', '5.16.3'),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/p/PRACE/PRACE-20130605-ictce-5.3.0.eb b/easybuild/easyconfigs/p/PRACE/PRACE-20130605-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a795cc27abbff0961455542884c81bab05bbf6d5
--- /dev/null
+++ b/easybuild/easyconfigs/p/PRACE/PRACE-20130605-ictce-5.3.0.eb
@@ -0,0 +1,36 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine
+# Authors::   Fotis Georgatos <fotis.georgatos@uni.lu>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of HPCBIOS project:
+# http://hpcbios.readthedocs.org/en/latest/
+##
+
+easyblock = "Toolchain"
+
+name = 'PRACE'
+version = '20130605'
+
+homepage = 'http://www.prace-ri.eu/PRACE-Common-Production'
+description = """The PRACE Common Production Environment (PCPE) is a set of software tools and libraries
+ that are planned to be available on all PRACE execution sites. The PCPE also defines a set of environment
+ variables that try to make compilation on all sites as homogeneous and simple as possible."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+dependencies = [
+    ('make', '3.82'),
+    ('Java', '1.7.0_10', '', True),
+    ('Bash', '4.2'),
+    ('tcsh', '6.18.01'),
+    ('Tcl', '8.5.12'),
+    ('Tk', '8.5.12'),
+    ('netCDF', '4.1.3'), # this one will also bring in HDF5
+    ('Perl', '5.16.3'),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13-mt.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13-mt.eb
index 257d8f97ad24af1b3945e337d718859931ce7f5a..69d6cb10beb3911a63567d643ff331373406bd0f 100644
--- a/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13-mt.eb
+++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13-mt.eb
@@ -4,8 +4,8 @@ versionsuffix = '-mt'
 
 homepage = 'http://www.psicode.org/'
 description = """PSI4 is an open-source suite of ab initio quantum chemistry programs designed for
-efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform
-computations with more than 2500 basis functions running serially or in parallel."""
+ efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform
+ computations with more than 2500 basis functions running serially or in parallel."""
 
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 # not using MPI results in a build relying on multithreaded BLAS solely
@@ -17,6 +17,7 @@ sources = ['%(namelower)s%(version)s.tar.gz']
 patches = [
     'PSI-4.0b4-mpi.patch',
     'PSI-4.0b4-thread-pool.patch',
+    'PSI-%(version)s_python-config.patch',  # workaround for broken python-config due to full path to bin/python being used
 ]
 
 python = 'Python'
diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13.eb
index 78a59d7159fbc30a319a477e4b4ea9b0b211117b..5c45d4243c4c443b931c27468b0b4ab27db266a3 100644
--- a/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13.eb
@@ -3,8 +3,8 @@ version = '4.0b4'
 
 homepage = 'http://www.psicode.org/'
 description = """PSI4 is an open-source suite of ab initio quantum chemistry programs designed for
-efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform
-computations with more than 2500 basis functions running serially or in parallel."""
+ efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform
+ computations with more than 2500 basis functions running serially or in parallel."""
 
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 toolchainopts = {'usempi': True}
@@ -15,6 +15,7 @@ sources = ['%(namelower)s%(version)s.tar.gz']
 patches = [
     'PSI-4.0b4-mpi.patch',
     'PSI-4.0b4-thread-pool.patch',
+    'PSI-%(version)s_python-config.patch',  # workaround for broken python-config due to full path to bin/python being used
 ]
 
 python = 'Python'
diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-5.3.0-mt.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-5.3.0-mt.eb
new file mode 100644
index 0000000000000000000000000000000000000000..528a6728beb751c89a2b7398a8ba35cf3a680599
--- /dev/null
+++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-5.3.0-mt.eb
@@ -0,0 +1,31 @@
+name = 'PSI'
+version = '4.0b4'
+versionsuffix = '-mt'
+
+homepage = 'http://www.psicode.org/'
+description = """PSI4 is an open-source suite of ab initio quantum chemistry programs designed for
+ efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform
+ computations with more than 2500 basis functions running serially or in parallel."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+# not using MPI results in a build relying on multithreaded BLAS solely
+toolchainopts = {'usempi': False}
+
+source_urls = ['http://download.sourceforge.net/psicode/']
+sources = ['%(namelower)s%(version)s.tar.gz']
+
+patches = [
+    'PSI-4.0b4-mpi.patch',
+    'PSI-4.0b4-thread-pool.patch',
+    'PSI-%(version)s_python-config.patch',  # workaround for broken python-config due to full path to bin/python being used
+]
+
+python = 'Python'
+pyver = '2.7.3'
+
+dependencies = [
+    (python, pyver),
+    ('Boost', '1.53.0', '-%s-%s' % (python, pyver)),
+]
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-5.3.0.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..674a15f04b64c26b4b72531bcce31e143ff8387d
--- /dev/null
+++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-5.3.0.eb
@@ -0,0 +1,29 @@
+name = 'PSI'
+version = '4.0b4'
+
+homepage = 'http://www.psicode.org/'
+description = """PSI4 is an open-source suite of ab initio quantum chemistry programs designed for
+ efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform
+ computations with more than 2500 basis functions running serially or in parallel."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'usempi': True}
+
+source_urls = ['http://download.sourceforge.net/psicode/']
+sources = ['%(namelower)s%(version)s.tar.gz']
+
+patches = [
+    'PSI-4.0b4-mpi.patch',
+    'PSI-4.0b4-thread-pool.patch',
+    'PSI-%(version)s_python-config.patch',  # workaround for broken python-config due to full path to bin/python being used
+]
+
+python = 'Python'
+pyver = '2.7.3'
+
+dependencies = [
+    (python, pyver),
+    ('Boost', '1.53.0', '-%s-%s' % (python, pyver)),
+]
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b4_python-config.patch b/easybuild/easyconfigs/p/PSI/PSI-4.0b4_python-config.patch
new file mode 100644
index 0000000000000000000000000000000000000000..caa0038c3d88b792586988ad832e1cb6d6aecb40
--- /dev/null
+++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b4_python-config.patch
@@ -0,0 +1,20 @@
+--- psi4.0b4/configure.orig	2013-04-07 09:13:35.000000000 +0200
++++ psi4.0b4/configure	2013-12-23 15:52:14.531809408 +0100
+@@ -4968,7 +4968,7 @@
+ if test "${am_cv_python_include+set}" = set; then
+   $as_echo_n "(cached) " >&6
+ else
+-  am_cv_python_include=`${PYTHON}-config --includes`
++  am_cv_python_include=`python ${PYTHON}-config --includes`
+ fi
+ { $as_echo "$as_me:$LINENO: result: $am_cv_python_include" >&5
+ $as_echo "$am_cv_python_include" >&6; }
+@@ -4980,7 +4980,7 @@
+ if test "${am_cv_python_ldflags+set}" = set; then
+   $as_echo_n "(cached) " >&6
+ else
+-  am_cv_python_ldflags=`${PYTHON}-config --ldflags`
++  am_cv_python_ldflags=`python ${PYTHON}-config --ldflags`
+ fi
+ { $as_echo "$as_me:$LINENO: result: $am_cv_python_ldflags" >&5
+ $as_echo "$am_cv_python_ldflags" >&6; }
diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED-mt.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED-mt.eb
index baeac81b776303953c316da8de2a07de0f61c073..77f4624c51fc084a2fef027ffa0669a587f9e835 100644
--- a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED-mt.eb
+++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED-mt.eb
@@ -4,8 +4,8 @@ versionsuffix = '-mt'
 
 homepage = 'http://www.psicode.org/'
 description = """PSI4 is an open-source suite of ab initio quantum chemistry programs designed for
-efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform
-computations with more than 2500 basis functions running serially or in parallel."""
+ efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform
+ computations with more than 2500 basis functions running serially or in parallel."""
 
 toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'}
 # not using MPI results in a build relying on multithreaded BLAS solely
@@ -15,9 +15,10 @@ source_urls = ['http://download.sourceforge.net/psicode/']
 sources = ['%(namelower)s%(version)s.tar.gz']
 
 patches = [
-    'PSI-4.0b5-failed-test.patch', # The test works but it segfaults on exit
+    'PSI-4.0b5-failed-test.patch',  # the test works but it segfaults on exit
     'PSI-4.0b5-thread-pool.patch',
     'PSI-4.0b5-new-plugin.patch',
+    'PSI-%(version)s_python-config.patch',  # workaround for broken python-config due to full path to bin/python being used
 ]
 
 python = 'Python'
diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb
index 99696fe23533c6f2ee95cb17ae325dfa7ae29290..de36f9f90dcaf86505895b497fe133aeb21a637a 100644
--- a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb
+++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb
@@ -3,8 +3,8 @@ version = '4.0b5'
 
 homepage = 'http://www.psicode.org/'
 description = """PSI4 is an open-source suite of ab initio quantum chemistry programs designed for
-efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform
-computations with more than 2500 basis functions running serially or in parallel."""
+ efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform
+ computations with more than 2500 basis functions running serially or in parallel."""
 
 toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'}
 toolchainopts = {'usempi': True}
@@ -14,9 +14,10 @@ sources = ['%(namelower)s%(version)s.tar.gz']
 
 patches = [
     'PSI-4.0b5-mpi-memcpy.patch',
-    'PSI-4.0b5-failed-test.patch', # The test works but it segfaults on exit
+    'PSI-4.0b5-failed-test.patch',  # the test works but it segfaults on exit
     'PSI-4.0b5-thread-pool.patch',
     'PSI-4.0b5-new-plugin.patch',
+    'PSI-%(version)s_python-config.patch',  # workaround for broken python-config due to full path to bin/python being used
 ]
 
 python = 'Python'
diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.3.0-mt.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.3.0-mt.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c680330c40818f1d9df3b660e4fffa9e72375365
--- /dev/null
+++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.3.0-mt.eb
@@ -0,0 +1,32 @@
+name = 'PSI'
+version = '4.0b5'
+versionsuffix = '-mt'
+
+homepage = 'http://www.psicode.org/'
+description = """PSI4 is an open-source suite of ab initio quantum chemistry programs designed for
+ efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform
+ computations with more than 2500 basis functions running serially or in parallel."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+# not using MPI results in a build relying on multithreaded BLAS solely
+toolchainopts = {'usempi': False}
+
+source_urls = ['http://download.sourceforge.net/psicode/']
+sources = ['%(namelower)s%(version)s.tar.gz']
+
+patches = [
+    'PSI-4.0b5-failed-test.patch',  # the test works but it segfaults on exit
+    'PSI-4.0b5-thread-pool.patch',
+    'PSI-4.0b5-new-plugin.patch',
+    'PSI-%(version)s_python-config.patch',  # workaround for broken python-config due to full path to bin/python being used
+]
+
+python = 'Python'
+pyver = '2.7.5'
+
+dependencies = [
+    (python, pyver),
+    ('Boost', '1.53.0', '-%s-%s' % (python, pyver)),
+]
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.3.0.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..288d0bd7ab4b21c1a985d56029a3df5a92a91e9e
--- /dev/null
+++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.3.0.eb
@@ -0,0 +1,31 @@
+name = 'PSI'
+version = '4.0b5'
+
+homepage = 'http://www.psicode.org/'
+description = """PSI4 is an open-source suite of ab initio quantum chemistry programs designed for
+ efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform
+ computations with more than 2500 basis functions running serially or in parallel."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'usempi': True}
+
+source_urls = ['http://download.sourceforge.net/psicode/']
+sources = ['%(namelower)s%(version)s.tar.gz']
+
+patches = [
+    'PSI-4.0b5-mpi-memcpy.patch',
+    'PSI-4.0b5-failed-test.patch',  # the test works but it segfaults on exit
+    'PSI-4.0b5-thread-pool.patch',
+    'PSI-4.0b5-new-plugin.patch',
+    'PSI-%(version)s_python-config.patch',  # workaround for broken python-config due to full path to bin/python being used
+]
+
+python = 'Python'
+pyver = '2.7.5'
+
+dependencies = [
+    (python, pyver),
+    ('Boost', '1.53.0', '-%s-%s' % (python, pyver)),
+]
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0-mt.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0-mt.eb
index 33a7817cd812205f90948ee31753c9445d75d22a..e65fbf78051b640fe6948da6e099475c2f0bae58 100644
--- a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0-mt.eb
+++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0-mt.eb
@@ -4,8 +4,8 @@ versionsuffix = '-mt'
 
 homepage = 'http://www.psicode.org/'
 description = """PSI4 is an open-source suite of ab initio quantum chemistry programs designed for
-efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform
-computations with more than 2500 basis functions running serially or in parallel."""
+ efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform
+ computations with more than 2500 basis functions running serially or in parallel."""
 
 toolchain = {'name': 'ictce', 'version': '5.5.0'}
 # not using MPI results in a build relying on multithreaded BLAS solely
@@ -15,9 +15,10 @@ source_urls = ['http://download.sourceforge.net/psicode/']
 sources = ['%(namelower)s%(version)s.tar.gz']
 
 patches = [
-    'PSI-4.0b5-failed-test.patch', # The test works but it segfaults on exit
+    'PSI-4.0b5-failed-test.patch',  # the test works but it segfaults on exit
     'PSI-4.0b5-thread-pool.patch',
     'PSI-4.0b5-new-plugin.patch',
+    'PSI-%(version)s_python-config.patch',  # workaround for broken python-config due to full path to bin/python being used
 ]
 
 python = 'Python'
diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb
index 6c090df7b70a0e5021bb96ed3074ddfaa0244320..7be55fa034a338025d55b93959520f3344dd2409 100644
--- a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5-ictce-5.5.0.eb
@@ -3,8 +3,8 @@ version = '4.0b5'
 
 homepage = 'http://www.psicode.org/'
 description = """PSI4 is an open-source suite of ab initio quantum chemistry programs designed for
-efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform
-computations with more than 2500 basis functions running serially or in parallel."""
+ efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform
+ computations with more than 2500 basis functions running serially or in parallel."""
 
 toolchain = {'name': 'ictce', 'version': '5.5.0'}
 toolchainopts = {'usempi': True}
@@ -14,9 +14,10 @@ sources = ['%(namelower)s%(version)s.tar.gz']
 
 patches = [
     'PSI-4.0b5-mpi-memcpy.patch',
-    'PSI-4.0b5-failed-test.patch', # The test works but it segfaults on exit
+    'PSI-4.0b5-failed-test.patch',  # the test works but it segfaults on exit
     'PSI-4.0b5-thread-pool.patch',
     'PSI-4.0b5-new-plugin.patch',
+    'PSI-%(version)s_python-config.patch',  # workaround for broken python-config due to full path to bin/python being used
 ]
 
 python = 'Python'
diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5_python-config.patch b/easybuild/easyconfigs/p/PSI/PSI-4.0b5_python-config.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ff2bd121f04d533ad12200fca5424356d1526532
--- /dev/null
+++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b5_python-config.patch
@@ -0,0 +1,20 @@
+--- psi4.0b5/configure.orig	2013-12-23 15:48:15.547085479 +0100
++++ psi4.0b5/configure	2013-12-23 15:49:03.008030357 +0100
+@@ -4977,7 +4977,7 @@
+ if test "${am_cv_python_include+set}" = set; then
+   $as_echo_n "(cached) " >&6
+ else
+-  am_cv_python_include=`${PYTHON}-config --includes`
++  am_cv_python_include=`python ${PYTHON}-config --includes`
+ fi
+ { $as_echo "$as_me:$LINENO: result: $am_cv_python_include" >&5
+ $as_echo "$am_cv_python_include" >&6; }
+@@ -4989,7 +4989,7 @@
+ if test "${am_cv_python_ldflags+set}" = set; then
+   $as_echo_n "(cached) " >&6
+ else
+-  am_cv_python_ldflags=`${PYTHON}-config --ldflags`
++  am_cv_python_ldflags=`python ${PYTHON}-config --ldflags`
+ fi
+ { $as_echo "$as_me:$LINENO: result: $am_cv_python_ldflags" >&5
+ $as_echo "$am_cv_python_ldflags" >&6; }
diff --git a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.1.1-goolf-1.4.10.eb b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.1.1-goolf-1.4.10.eb
index ff151de1b065d11a81ac675614cce9a18c82fb4d..1f858cb94c5efdbab118c22c1a1ae0e862a5c0d6 100644
--- a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.1.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.1.1-goolf-1.4.10.eb
@@ -3,10 +3,10 @@ version = '3.1.1'
 
 homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview'
 description = """ParMETIS is an MPI-based parallel library that implements a variety of algorithms for partitioning unstructured graphs,
-meshes, and for computing fill-reducing orderings of sparse matrices. ParMETIS extends the functionality provided by METIS and includes
-routines that are especially suited for parallel AMR computations and large scale numerical simulations. The algorithms implemented in
-ParMETIS are based on the parallel multilevel k-way graph-partitioning, adaptive repartitioning, and parallel multi-constrained partitioning
-schemes."""
+ meshes, and for computing fill-reducing orderings of sparse matrices. ParMETIS extends the functionality provided by METIS and includes
+ routines that are especially suited for parallel AMR computations and large scale numerical simulations. The algorithms implemented in
+ ParMETIS are based on the parallel multilevel k-way graph-partitioning, adaptive repartitioning, and parallel multi-constrained partitioning
+ schemes."""
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'optarch': True, 'usempi': True, 'pic': True}
diff --git a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-goolf-1.4.10.eb b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-goolf-1.4.10.eb
index 7ba66e723b4e308cac9b50091b4e64d8921d9565..ad06991953371eda222ad276012a57acf5dd4ffe 100644
--- a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-goolf-1.4.10.eb
@@ -3,10 +3,10 @@ version = '4.0.2'
 
 homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview'
 description = """ParMETIS is an MPI-based parallel library that implements a variety of algorithms for partitioning unstructured graphs,
-meshes, and for computing fill-reducing orderings of sparse matrices. ParMETIS extends the functionality provided by METIS and includes
-routines that are especially suited for parallel AMR computations and large scale numerical simulations. The algorithms implemented in
-ParMETIS are based on the parallel multilevel k-way graph-partitioning, adaptive repartitioning, and parallel multi-constrained partitioning
-schemes."""
+ meshes, and for computing fill-reducing orderings of sparse matrices. ParMETIS extends the functionality provided by METIS and includes
+ routines that are especially suited for parallel AMR computations and large scale numerical simulations. The algorithms implemented in
+ ParMETIS are based on the parallel multilevel k-way graph-partitioning, adaptive repartitioning, and parallel multi-constrained partitioning
+ schemes."""
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'optarch': True, 'usempi': True, 'pic': True}
diff --git a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.3-goolf-1.4.10.eb b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.3-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ebbc3db5a28a98e7cd52bac10ec5910500dff2c1
--- /dev/null
+++ b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.3-goolf-1.4.10.eb
@@ -0,0 +1,22 @@
+name = 'ParMETIS'
+version = '4.0.3'
+
+homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview'
+description = """ParMETIS is an MPI-based parallel library that implements a variety of algorithms for partitioning unstructured graphs,
+ meshes, and for computing fill-reducing orderings of sparse matrices. ParMETIS extends the functionality provided by METIS and includes
+ routines that are especially suited for parallel AMR computations and large scale numerical simulations. The algorithms implemented in
+ ParMETIS are based on the parallel multilevel k-way graph-partitioning, adaptive repartitioning, and parallel multi-constrained partitioning
+ schemes."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+toolchainopts = {'optarch': True, 'usempi': True, 'pic': True}
+
+source_urls = [
+    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis',
+    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/OLD',
+]
+sources = [SOURCELOWER_TAR_GZ]
+
+builddependencies = [('CMake', '2.8.12')]
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.3-ictce-5.5.0.eb b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.3-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..db08a4e6434729ecd25d8a00ca0c186b9a94c33f
--- /dev/null
+++ b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.3-ictce-5.5.0.eb
@@ -0,0 +1,22 @@
+name = 'ParMETIS'
+version = '4.0.3'
+
+homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview'
+description = """ParMETIS is an MPI-based parallel library that implements a variety of algorithms for partitioning unstructured graphs,
+ meshes, and for computing fill-reducing orderings of sparse matrices. ParMETIS extends the functionality provided by METIS and includes
+ routines that are especially suited for parallel AMR computations and large scale numerical simulations. The algorithms implemented in
+ ParMETIS are based on the parallel multilevel k-way graph-partitioning, adaptive repartitioning, and parallel multi-constrained partitioning
+ schemes."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'optarch': True, 'usempi': True, 'pic': True}
+
+source_urls = [
+    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis',
+    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/OLD',
+]
+sources = [SOURCELOWER_TAR_GZ]
+
+builddependencies = [('CMake', '2.8.12')]
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/p/PhyML/PhyML-20120412-goolf-1.4.10.eb b/easybuild/easyconfigs/p/PhyML/PhyML-20120412-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a63b23cc20349951c5dac2c88b26d2611dba5f49
--- /dev/null
+++ b/easybuild/easyconfigs/p/PhyML/PhyML-20120412-goolf-1.4.10.eb
@@ -0,0 +1,29 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+name = 'PhyML'
+version = '20120412'
+
+homepage = 'http://code.google.com/p/phyml'
+description = """ PhyML is a software that estimates maximum likelihood 
+ phylogenies from alignments of nucleotide or amino acid sequences. 
+ The main strength of PhyML lies in the large number of substitution 
+ models coupled to various options to search the space of phylogenetic 
+ tree topologies, going from very fast and efficient methods to slower 
+ but generally more accurate approaches. PhyML was designed to process 
+ moderate to large data sets. In theory, alignments with up to 4,000 
+ sequences 2,000,000 character-long can be processed. """
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['http://phyml.googlecode.com/files/']
+sources = [SOURCELOWER_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ['bin/phyml'],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/p/PhyML/PhyML-20131016-devel-goolf-1.4.10.eb b/easybuild/easyconfigs/p/PhyML/PhyML-20131016-devel-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4e9e600420108359f0e8798fdb64a5e8abbd6cff
--- /dev/null
+++ b/easybuild/easyconfigs/p/PhyML/PhyML-20131016-devel-goolf-1.4.10.eb
@@ -0,0 +1,30 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+name = 'PhyML'
+version = '20131016'
+versionsuffix = 'devel'
+
+homepage = 'http://code.google.com/p/phyml'
+description = """ PhyML is a software that estimates maximum likelihood 
+ phylogenies from alignments of nucleotide or amino acid sequences. 
+ The main strength of PhyML lies in the large number of substitution 
+ models coupled to various options to search the space of phylogenetic 
+ tree topologies, going from very fast and efficient methods to slower 
+ but generally more accurate approaches. PhyML was designed to process 
+ moderate to large data sets. In theory, alignments with up to 4,000 
+ sequences 2,000,000 character-long can be processed. """
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['http://phyml.googlecode.com/files/']
+sources = [SOURCELOWER_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ['bin/phyml'],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/p/PnMPI/PnMPI-1.2.0-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/p/PnMPI/PnMPI-1.2.0-gompi-1.4.12-no-OFED.eb
index e01b6e0e3ba1cacf19f36ea15cbf00311c1b2c67..3b3f47bdf1613b7764596b5ed549ae5d820485eb 100644
--- a/easybuild/easyconfigs/p/PnMPI/PnMPI-1.2.0-gompi-1.4.12-no-OFED.eb
+++ b/easybuild/easyconfigs/p/PnMPI/PnMPI-1.2.0-gompi-1.4.12-no-OFED.eb
@@ -25,6 +25,8 @@ builddependencies = [('CMake', '2.8.10.2')]
 
 configopts  = ' -DCMAKE_BUILD_TYPE=Release -DBFD_FOUND=False -DPNMPI_HAVE_BFD=False'
 
+parallel = 1
+
 sanity_check_paths = {
     'files': ["bin/pnmpi-patch", "include/pnmpi.h", "lib/libpnmpi.a"],
     'dirs': [],
diff --git a/easybuild/easyconfigs/p/Primer3/Primer3-2.3.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/p/Primer3/Primer3-2.3.0-goalf-1.1.0-no-OFED.eb
index 642cc1ae68e14e06216e10e327ca72bc01558be5..e193532b763da0ccaaa36ccddec7ec117142a280 100644
--- a/easybuild/easyconfigs/p/Primer3/Primer3-2.3.0-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/p/Primer3/Primer3-2.3.0-goalf-1.1.0-no-OFED.eb
@@ -2,7 +2,7 @@ name = 'Primer3'
 version = '2.3.0'
 
 homepage = 'http://primer3.sourceforge.net'
-description = """Primer3 is a widely used program for designing PCR primers (PCR = "Polymerase Chain Reaction").
+description = """Primer3 is a widely used program for designing PCR primers (PCR = 'Polymerase Chain Reaction').
  PCR is an essential and ubiquitous tool in genetics and molecular biology.
  Primer3 can also design hybridization probes and sequencing primers."""
 
diff --git a/easybuild/easyconfigs/p/Primer3/Primer3-2.3.0-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Primer3/Primer3-2.3.0-goolf-1.4.10.eb
index f23e8052701994b453c286d3103e92394b01fd5e..744c1f126c2d4c2317a53a5212cac3d024a7bf37 100644
--- a/easybuild/easyconfigs/p/Primer3/Primer3-2.3.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/Primer3/Primer3-2.3.0-goolf-1.4.10.eb
@@ -2,7 +2,7 @@ name = 'Primer3'
 version = '2.3.0'
 
 homepage = 'http://primer3.sourceforge.net'
-description = """Primer3 is a widely used program for designing PCR primers (PCR = "Polymerase Chain Reaction").
+description = """Primer3 is a widely used program for designing PCR primers (PCR = 'Polymerase Chain Reaction').
 PCR is an essential and ubiquitous tool in genetics and molecular biology.
 Primer3 can also design hybridization probes and sequencing primers."""
 
diff --git a/easybuild/easyconfigs/p/Primer3/Primer3-2.3.0-ictce-4.0.6.eb b/easybuild/easyconfigs/p/Primer3/Primer3-2.3.0-ictce-4.0.6.eb
index c6d73b18f6677c2c8b90959a9f9fb69c4be9e56d..cfa0ccd59d4ad80e4c08c76cf3c4129f439b7a98 100644
--- a/easybuild/easyconfigs/p/Primer3/Primer3-2.3.0-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/p/Primer3/Primer3-2.3.0-ictce-4.0.6.eb
@@ -2,7 +2,7 @@ name = 'Primer3'
 version = '2.3.0'
 
 homepage = 'http://primer3.sourceforge.net'
-description = """Primer3 is a widely used program for designing PCR primers (PCR = "Polymerase Chain Reaction").
+description = """Primer3 is a widely used program for designing PCR primers (PCR = 'Polymerase Chain Reaction').
  PCR is an essential and ubiquitous tool in genetics and molecular biology.
  Primer3 can also design hybridization probes and sequencing primers."""
 
diff --git a/easybuild/easyconfigs/p/Primer3/Primer3-2.3.0-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Primer3/Primer3-2.3.0-ictce-5.3.0.eb
index 1596c5404e27f4e57e73e6ec5c186ab5ebc108c5..a79e65bdea4a9a8232ea659182e7990d8d90c48c 100644
--- a/easybuild/easyconfigs/p/Primer3/Primer3-2.3.0-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/p/Primer3/Primer3-2.3.0-ictce-5.3.0.eb
@@ -2,7 +2,7 @@ name = 'Primer3'
 version = '2.3.0'
 
 homepage = 'http://primer3.sourceforge.net'
-description = """Primer3 is a widely used program for designing PCR primers (PCR = "Polymerase Chain Reaction").
+description = """Primer3 is a widely used program for designing PCR primers (PCR = 'Polymerase Chain Reaction').
  PCR is an essential and ubiquitous tool in genetics and molecular biology.
  Primer3 can also design hybridization probes and sequencing primers."""
 
diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-14.0.1-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-14.0.1-ictce-5.5.0-Python-2.7.6.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a08cfce3cb20009101880e05058e532bdec74e7d
--- /dev/null
+++ b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-14.0.1-ictce-5.5.0-Python-2.7.6.eb
@@ -0,0 +1,30 @@
+name = 'PyZMQ'
+version = '14.0.1'
+
+homepage = 'http://www.zeromq.org/bindings:python'
+description = """Python bindings for ZeroMQ"""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+source_urls = [PYPI_LOWER_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+python = 'Python'
+pythonversion = '2.7.6'
+pythonshortversion = ".".join(pythonversion.split(".")[0:2])
+
+versionsuffix = '-%s-%s' % (python, pythonversion)
+
+dependencies = [
+    (python, pythonversion),
+    ('ZeroMQ', '4.0.3'),
+]
+
+options = {'modulename': 'zmq'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3-zmq2.eb b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3-zmq2.eb
index f39ba62b1d115dc12fdbe47ba5a7d7449dbed610..6f127b706d4b4f0af1810e4e85478c0d7855ea74 100644
--- a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3-zmq2.eb
+++ b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3-zmq2.eb
@@ -6,7 +6,7 @@ description = """Python bindings for ZeroMQ"""
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
-source_urls = ["http://pypi.python.org/packages/source/%s/%s/" % (name.lower()[0], name.lower())]
+source_urls = [PYPI_LOWER_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 python = 'Python'
@@ -17,15 +17,15 @@ zmqversion = '2.2.0'
 versionsuffix = '-%s-%s-%s' % (python, pythonversion, 'zmq%s' % zmqversion.split('.')[0])
 
 dependencies = [
-                (python, pythonversion),
-                ('ZeroMQ', zmqversion),
-               ]
+    (python, pythonversion),
+    ('ZeroMQ', zmqversion),
+]
 
 options = {'modulename': 'zmq'}
 
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion]
-                     }
+    'files': [],
+    'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion],
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3-zmq3.eb b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3-zmq3.eb
index e0f4d8199ea8d783c8a2d9f5b328e2946073404e..e1c29fe7abc1291bdb1ac36c878ea2408efa568c 100644
--- a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3-zmq3.eb
+++ b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3-zmq3.eb
@@ -6,7 +6,7 @@ description = """Python bindings for ZeroMQ"""
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
-source_urls = ["http://pypi.python.org/packages/source/%s/%s/" % (name.lower()[0], name.lower())]
+source_urls = [PYPI_LOWER_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 python = 'Python'
@@ -17,15 +17,15 @@ zmqversion = '3.2.2'
 versionsuffix = '-%s-%s-%s' % (python, pythonversion, 'zmq%s' % zmqversion.split('.')[0])
 
 dependencies = [
-                (python, pythonversion),
-                ('ZeroMQ', zmqversion),
-               ]
+    (python, pythonversion),
+    ('ZeroMQ', zmqversion),
+]
 
 options = {'modulename': 'zmq'}
 
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion]
-                     }
+    'files': [],
+    'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion],
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goolf-1.4.10-Python-2.7.3-zmq2.eb b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goolf-1.4.10-Python-2.7.3-zmq2.eb
index d7b0dabc3fe10e9b7bde2a88c2d52026f35b6959..9943daf903b612807db4ab2e298f36618382a5fc 100644
--- a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goolf-1.4.10-Python-2.7.3-zmq2.eb
+++ b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goolf-1.4.10-Python-2.7.3-zmq2.eb
@@ -6,7 +6,7 @@ description = """Python bindings for ZeroMQ"""
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-source_urls = ["http://pypi.python.org/packages/source/%s/%s/" % (name.lower()[0], name.lower())]
+source_urls = [PYPI_LOWER_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 python = 'Python'
@@ -17,15 +17,15 @@ zmqversion = '2.2.0'
 versionsuffix = '-%s-%s-%s' % (python, pythonversion, 'zmq%s' % zmqversion.split('.')[0])
 
 dependencies = [
-                (python, pythonversion),
-                ('ZeroMQ', zmqversion),
-               ]
+    (python, pythonversion),
+    ('ZeroMQ', zmqversion),
+]
 
 options = {'modulename': 'zmq'}
 
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion]
-                     }
+    'files': [],
+    'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion],
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goolf-1.4.10-Python-2.7.3-zmq3.eb b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goolf-1.4.10-Python-2.7.3-zmq3.eb
index 64d61708c28a504cf622e419b0d366c9dd982e8a..11781825a5eaaafa30c922932a51a5d4bd3772cd 100644
--- a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goolf-1.4.10-Python-2.7.3-zmq3.eb
+++ b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goolf-1.4.10-Python-2.7.3-zmq3.eb
@@ -6,7 +6,7 @@ description = """Python bindings for ZeroMQ"""
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-source_urls = ["http://pypi.python.org/packages/source/%s/%s/" % (name.lower()[0], name.lower())]
+source_urls = [PYPI_LOWER_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 python = 'Python'
@@ -17,15 +17,15 @@ zmqversion = '3.2.2'
 versionsuffix = '-%s-%s-%s' % (python, pythonversion, 'zmq%s' % zmqversion.split('.')[0])
 
 dependencies = [
-                (python, pythonversion),
-                ('ZeroMQ', zmqversion),
-               ]
+    (python, pythonversion),
+    ('ZeroMQ', zmqversion),
+]
 
 options = {'modulename': 'zmq'}
 
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion]
-                     }
+    'files': [],
+    'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion],
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-4.1.13-Python-2.7.3-zmq2.eb b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-4.1.13-Python-2.7.3-zmq2.eb
index b2c698d89a2a58704d165eed7d5a0b565ff843bb..ef798bdb27d983e040f807343580b075d163646d 100644
--- a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-4.1.13-Python-2.7.3-zmq2.eb
+++ b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-4.1.13-Python-2.7.3-zmq2.eb
@@ -6,7 +6,7 @@ description = """Python bindings for ZeroMQ"""
 
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
-source_urls = ["http://pypi.python.org/packages/source/%s/%s/" % (name.lower()[0], name.lower())]
+source_urls = [PYPI_LOWER_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 python = 'Python'
@@ -17,15 +17,15 @@ zmqversion = '2.2.0'
 versionsuffix = '-%s-%s-%s' % (python, pythonversion, 'zmq%s' % zmqversion.split('.')[0])
 
 dependencies = [
-                (python, pythonversion),
-                ('ZeroMQ', zmqversion),
-               ]
+    (python, pythonversion),
+    ('ZeroMQ', zmqversion),
+]
 
 options = {'modulename': 'zmq'}
 
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion]
-                     }
+    'files': [],
+    'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion],
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-4.1.13-Python-2.7.3-zmq3.eb b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-4.1.13-Python-2.7.3-zmq3.eb
index 63b8df0e9e2489b9385704272892ab69e4586b01..5e5a1f0511a18a211aec468c59072ca339749259 100644
--- a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-4.1.13-Python-2.7.3-zmq3.eb
+++ b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-4.1.13-Python-2.7.3-zmq3.eb
@@ -6,7 +6,7 @@ description = """Python bindings for ZeroMQ"""
 
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
-source_urls = ["http://pypi.python.org/packages/source/%s/%s/" % (name.lower()[0], name.lower())]
+source_urls = [PYPI_LOWER_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 python = 'Python'
@@ -17,15 +17,15 @@ zmqversion = '3.2.2'
 versionsuffix = '-%s-%s-%s' % (python, pythonversion, 'zmq%s' % zmqversion.split('.')[0])
 
 dependencies = [
-                (python, pythonversion),
-                ('ZeroMQ', zmqversion),
-               ]
+    (python, pythonversion),
+    ('ZeroMQ', zmqversion),
+]
 
 options = {'modulename': 'zmq'}
 
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion]
-                     }
+    'files': [],
+    'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion],
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.3.0-Python-2.7.3-zmq2.eb b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.3.0-Python-2.7.3-zmq2.eb
index 4f2003dfe21affa44220e8beeaa8799078a5913d..09ad49889d8f0fb38d25f3fafb7a57a28ffed62c 100644
--- a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.3.0-Python-2.7.3-zmq2.eb
+++ b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.3.0-Python-2.7.3-zmq2.eb
@@ -4,10 +4,9 @@ version = '2.2.0.1'
 homepage = 'http://www.zeromq.org/bindings:python'
 description = """Python bindings for ZeroMQ"""
 
-
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
-source_urls = ["http://pypi.python.org/packages/source/%s/%s/" % (name.lower()[0], name.lower())]
+source_urls = [PYPI_LOWER_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 python = 'Python'
@@ -18,15 +17,15 @@ zmqversion = '2.2.0'
 versionsuffix = '-%s-%s-%s' % (python, pythonversion, 'zmq%s' % zmqversion.split('.')[0])
 
 dependencies = [
-                (python, pythonversion),
-                ('ZeroMQ', zmqversion),
-               ]
+    (python, pythonversion),
+    ('ZeroMQ', zmqversion),
+]
 
 options = {'modulename': 'zmq'}
 
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion]
-                     }
+    'files': [],
+    'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion],
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.3.0-Python-2.7.3-zmq3.eb b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.3.0-Python-2.7.3-zmq3.eb
index 92979bea533f53ae5d17dff5d7499d6ac774fa27..22382e7cf0be39afe9684e0027d754bcd8955ccd 100644
--- a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.3.0-Python-2.7.3-zmq3.eb
+++ b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.3.0-Python-2.7.3-zmq3.eb
@@ -4,10 +4,9 @@ version = '2.2.0.1'
 homepage = 'http://www.zeromq.org/bindings:python'
 description = """Python bindings for ZeroMQ"""
 
-
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
-source_urls = ["http://pypi.python.org/packages/source/%s/%s/" % (name.lower()[0], name.lower())]
+source_urls = [PYPI_LOWER_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 python = 'Python'
@@ -18,15 +17,15 @@ zmqversion = '3.2.2'
 versionsuffix = '-%s-%s-%s' % (python, pythonversion, 'zmq%s' % zmqversion.split('.')[0])
 
 dependencies = [
-                (python, pythonversion),
-                ('ZeroMQ', zmqversion),
-               ]
+    (python, pythonversion),
+    ('ZeroMQ', zmqversion),
+]
 
 options = {'modulename': 'zmq'}
 
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion]
-                     }
+    'files': [],
+    'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion],
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.5.0-Python-2.7.5-zmq2.eb b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.5.0-Python-2.7.5-zmq2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..603c912f0dea664b964207773322a677f4008d5b
--- /dev/null
+++ b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-5.5.0-Python-2.7.5-zmq2.eb
@@ -0,0 +1,31 @@
+name = 'PyZMQ'
+version = '2.2.0.1'
+
+homepage = 'http://www.zeromq.org/bindings:python'
+description = """Python bindings for ZeroMQ"""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+source_urls = [PYPI_LOWER_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+python = 'Python'
+pythonversion = '2.7.5'
+pythonshortversion = ".".join(pythonversion.split(".")[0:2])
+zmqversion = '2.2.0'
+
+versionsuffix = '-%s-%s-%s' % (python, pythonversion, 'zmq%s' % zmqversion.split('.')[0])
+
+dependencies = [
+    (python, pythonversion),
+    ('ZeroMQ', zmqversion),
+]
+
+options = {'modulename': 'zmq'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%s/site-packages/zmq' % pythonshortversion],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-goalf-1.1.0-no-OFED-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.5.6-goalf-1.1.0-no-OFED-bare.eb
new file mode 100644
index 0000000000000000000000000000000000000000..279bdd8c9981a9dfb6c7c857c45bf7a2d8b55d8d
--- /dev/null
+++ b/easybuild/easyconfigs/p/Python/Python-2.5.6-goalf-1.1.0-no-OFED-bare.eb
@@ -0,0 +1,24 @@
+name = 'Python'
+version = '2.5.6'
+versionsuffix = '-bare'
+
+homepage = 'http://python.org/'
+description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively."
+
+toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
+sources = [SOURCE_TGZ]
+
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.7'),
+    ('libreadline', '6.2'),
+    ('ncurses', '5.9'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-gompi-1.4.12-no-OFED-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.5.6-gompi-1.4.12-no-OFED-bare.eb
index 8831f1a81b6a2be7f9b803200ca824ca9c6797f0..f9f346f7bcd4af874f261beb1f353732276f402f 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.5.6-gompi-1.4.12-no-OFED-bare.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.5.6-gompi-1.4.12-no-OFED-bare.eb
@@ -9,15 +9,16 @@ toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
-sources = ['%(name)s-%(version)s.tgz']
-
-patches = ['python_libffi_int128_icc.patch']
+sources = [SOURCE_TGZ]
 
 dependencies = [
     ('bzip2', '1.0.6'),
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-goolf-1.4.10-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.5.6-goolf-1.4.10-bare.eb
index f626304d8969a8ed6768dd96b4d2b0abfa0f53d6..66cb466a25c27f4ad4b7c3f840f8ca7abb501629 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.5.6-goolf-1.4.10-bare.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.5.6-goolf-1.4.10-bare.eb
@@ -9,15 +9,16 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
-sources = ['%(name)s-%(version)s.tgz']
-
-patches = ['python_libffi_int128_icc.patch']
+sources = [SOURCE_TGZ]
 
 dependencies = [
     ('bzip2', '1.0.6'),
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-4.0.6-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-4.0.6-bare.eb
new file mode 100644
index 0000000000000000000000000000000000000000..781b45ed3fb34373c13ab7dd6ceabaa40c6a9e02
--- /dev/null
+++ b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-4.0.6-bare.eb
@@ -0,0 +1,26 @@
+name = 'Python'
+version = '2.5.6'
+versionsuffix = '-bare'
+
+homepage = 'http://python.org/'
+description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively."
+
+toolchain = {'name': 'ictce', 'version': '4.0.6'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
+sources = [SOURCE_TGZ]
+
+patches = ['python_libffi_int128_icc.patch']
+
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.7'),
+    ('libreadline', '6.2'),
+    ('ncurses', '5.9'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-4.1.13-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-4.1.13-bare.eb
index 7cd7a6cc683d6f65e98654456ba52c11e8d75c80..c8bc196270c4edd976537d0ae34171c61750b279 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-4.1.13-bare.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-4.1.13-bare.eb
@@ -9,7 +9,7 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
 
 patches = ['python_libffi_int128_icc.patch']
 
@@ -18,6 +18,9 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.2.0-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.2.0-bare.eb
index 5defdd9ca745ba896ed7eb9cc378a308420629af..79512f826ca1b04dc1861178cc9a6f00a5493923 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.2.0-bare.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.2.0-bare.eb
@@ -9,15 +9,16 @@ toolchain = {'name': 'ictce', 'version': '5.2.0'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
-sources = ['%(name)s-%(version)s.tgz']
-
-patches = ['python_libffi_int128_icc.patch']
+sources = [SOURCE_TGZ]
 
 dependencies = [
     ('bzip2', '1.0.6'),
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.3.0-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.3.0-bare.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f949db90c2627ed510077239b9acae805f599534
--- /dev/null
+++ b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.3.0-bare.eb
@@ -0,0 +1,24 @@
+name = 'Python'
+version = '2.5.6'
+versionsuffix = '-bare'
+
+homepage = 'http://python.org/'
+description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively."
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
+sources = [SOURCE_TGZ]
+
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.7'),
+    ('libreadline', '6.2'),
+    ('ncurses', '5.9'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb
index 350cff539f96e12fdf6c77ed50730ccc061c679e..7a975980fe4f34dd60563254894015ee2aa72340 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb
@@ -11,7 +11,7 @@ numpyversion = '1.6.1'
 scipyversion = '0.10.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
 
 # python needs bzip2 to build the bz2 package
 dependencies = [
@@ -19,6 +19,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9-20130406'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 # order is important!
@@ -26,16 +27,24 @@ exts_list = [
     ('setuptools', '0.6c11', {
         'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'],
     }),
+    ('pip', '1.1', {
+        'source_urls': ['http://pypi.python.org/packages/source/p/pip/'],
+    }),
     ('nose', '1.1.2', {
         'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
     }),
     ('numpy', numpyversion, {
         'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
-        'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion],
+        'patches': [
+            'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion,
+        ],
     }),
     ('scipy', scipyversion, {
         'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
     }),
+    ('mpi4py', '1.3', {
+        'source_urls': ['https://mpi4py.googlecode.com/files/'],
+    }),
     ('paycheck', '1.0.2', {
         'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'],
     }),
@@ -48,6 +57,29 @@ exts_list = [
     ('Cython', '0.17.2', {
         'source_urls': ['http://www.cython.org/release/'],
     }),
+    ('dateutil', '2.1', {
+        'source_tmpl': 'python-%(name)s-%(version)s.tar.gz',
+        'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'],
+    }),
+    ('deap', '0.9.1', {
+        'source_urls': ['https://deap.googlecode.com/files/'],
+    }),
+    ('decorator', '3.4.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
+    }),
+    ('arff', '1.1', {
+        'source_tmpl': 'liac-%(name)s-%(version)s.zip',
+        'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'],
+    }),
+    ('pycrypto', '2.6.1', {
+        'modulename': 'Crypto',
+        'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'],
+    }),
+    ('paramiko', '1.12.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'],
+    }),
 ]
 
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb
index 78733636f297653dfd0e53e60e7f18964068d126..c0a121ef7142282c5af710af95a19eb45d065410 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb
@@ -11,7 +11,7 @@ numpyversion = '1.6.1'
 scipyversion = '0.10.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
 
 # python needs bzip2 to build the bz2 package
 dependencies = [
@@ -19,6 +19,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9-20130406'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 # order is important!
@@ -26,6 +27,9 @@ exts_list = [
     ('setuptools', '0.6c11', {
         'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'],
     }),
+    ('pip', '1.1', {
+        'source_urls': ['http://pypi.python.org/packages/source/p/pip/'],
+    }),
     ('nose', '1.1.2', {
         'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
     }),
@@ -36,6 +40,9 @@ exts_list = [
     ('scipy', scipyversion, {
         'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
     }),
+    ('mpi4py', '1.3', {
+        'source_urls': ['https://mpi4py.googlecode.com/files/'],
+    }),
     ('paycheck', '1.0.2', {
         'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'],
     }),
@@ -48,6 +55,29 @@ exts_list = [
     ('Cython', '0.17.2', {
         'source_urls': ['http://www.cython.org/release/'],
     }),
+    ('dateutil', '2.1', {
+        'source_tmpl': 'python-%(name)s-%(version)s.tar.gz',
+        'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'],
+    }),
+    ('deap', '0.9.1', {
+        'source_urls': ['https://deap.googlecode.com/files/'],
+    }),
+    ('decorator', '3.4.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
+    }),
+    ('arff', '1.1', {
+        'source_tmpl': 'liac-%(name)s-%(version)s.zip',
+        'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'],
+    }),
+    ('pycrypto', '2.6.1', {
+        'modulename': 'Crypto',
+        'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'],
+    }),
+    ('paramiko', '1.12.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'],
+    }),
 ]
 
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb
index 965f7680f9cae643a751e0ab9a37b03571ad566d..2e5b1c3cc2250da678074bdff00d2a988f849e9d 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb
@@ -11,7 +11,7 @@ numpyversion = '1.6.1'
 scipyversion = '0.10.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
 
 # python needs bzip2 to build the bz2 package
 dependencies = [
@@ -19,6 +19,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9-20130406'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 # order is important!
@@ -26,16 +27,24 @@ exts_list = [
     ('setuptools', '0.6c11', {
         'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'],
     }),
+    ('pip', '1.1', {
+        'source_urls': ['http://pypi.python.org/packages/source/p/pip/'],
+    }),
     ('nose', '1.1.2', {
         'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
     }),
     ('numpy', numpyversion, {
         'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
-        'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion],
+        'patches': [
+            'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion,
+        ],
     }),
     ('scipy', scipyversion, {
         'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
     }),
+    ('mpi4py', '1.3', {
+        'source_urls': ['https://mpi4py.googlecode.com/files/'],
+    }),
     ('paycheck', '1.0.2', {
         'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'],
     }),
@@ -43,11 +52,34 @@ exts_list = [
         'source_urls': ['http://argparse.googlecode.com/files/'],
     }),
     ('lockfile', '0.9.1', {
-        'source_urls': ['http://pylockfile.googlecode.com/files/'],
+        'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.17.2', {
         'source_urls': ['http://www.cython.org/release/'],
     }),
+    ('dateutil', '2.1', {
+        'source_tmpl': 'python-%(name)s-%(version)s.tar.gz',
+        'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'],
+    }),
+    ('deap', '0.9.1', {
+        'source_urls': ['https://deap.googlecode.com/files/'],
+    }),
+    ('decorator', '3.4.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
+    }),
+    ('arff', '1.1', {
+        'source_tmpl': 'liac-%(name)s-%(version)s.zip',
+        'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'],
+    }),
+    ('pycrypto', '2.6.1', {
+        'modulename': 'Crypto',
+        'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'],
+    }),
+    ('paramiko', '1.12.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'],
+    }),
 ]
 
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgoolf-1.1.7.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgoolf-1.1.7.eb
index d6df6cdaaa34755b42e2d86325663501040daf33..3cc5940708666c2ba9efb5f48b9341877224feda 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgoolf-1.1.7.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgoolf-1.1.7.eb
@@ -11,7 +11,7 @@ numpyversion = '1.6.1'
 scipyversion = '0.10.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
 
 # python needs bzip2 to build the bz2 package
 dependencies = [
@@ -19,6 +19,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9-20130406'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 # order is important!
@@ -26,6 +27,9 @@ exts_list = [
     ('setuptools', '0.6c11', {
         'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'],
     }),
+    ('pip', '1.1', {
+        'source_urls': ['http://pypi.python.org/packages/source/p/pip/'],
+    }),
     ('nose', '1.1.2', {
         'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
     }),
@@ -36,6 +40,9 @@ exts_list = [
     ('scipy', scipyversion, {
         'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
     }),
+    ('mpi4py', '1.3', {
+        'source_urls': ['https://mpi4py.googlecode.com/files/'],
+    }),
     ('paycheck', '1.0.2', {
         'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'],
     }),
@@ -48,6 +55,29 @@ exts_list = [
     ('Cython', '0.17.2', {
         'source_urls': ['http://www.cython.org/release/'],
     }),
+    ('dateutil', '2.1', {
+        'source_tmpl': 'python-%(name)s-%(version)s.tar.gz',
+        'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'],
+    }),
+    ('deap', '0.9.1', {
+        'source_urls': ['https://deap.googlecode.com/files/'],
+    }),
+    ('decorator', '3.4.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
+    }),
+    ('arff', '1.1', {
+        'source_tmpl': 'liac-%(name)s-%(version)s.zip',
+        'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'],
+    }),
+    ('pycrypto', '2.6.1', {
+        'modulename': 'Crypto',
+        'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'],
+    }),
+    ('paramiko', '1.12.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'],
+    }),
 ]
 
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb
index f097672302dba9ce717d388c8340f49dbd748112..f8a7666f7894cb16ac9e4152a7a3a4091c0b34d8 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb
@@ -11,7 +11,7 @@ numpyversion = '1.6.1'
 scipyversion = '0.10.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
 
 # python needs bzip2 to build the bz2 package
 dependencies = [
@@ -19,6 +19,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 # order is important!
@@ -26,16 +27,24 @@ exts_list = [
     ('setuptools', '0.6c11', {
         'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'],
     }),
+    ('pip', '1.1', {
+        'source_urls': ['http://pypi.python.org/packages/source/p/pip/'],
+    }),
     ('nose', '1.1.2', {
         'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
     }),
     ('numpy', numpyversion, {
         'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
-        'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion],
+        'patches': [
+            'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion,
+        ],
     }),
     ('scipy', scipyversion, {
         'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
     }),
+    ('mpi4py', '1.3', {
+        'source_urls': ['https://mpi4py.googlecode.com/files/'],
+    }),
     ('paycheck', '1.0.2', {
         'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'],
     }),
@@ -48,6 +57,29 @@ exts_list = [
     ('Cython', '0.17.2', {
         'source_urls': ['http://www.cython.org/release/'],
     }),
+    ('dateutil', '2.1', {
+        'source_tmpl': 'python-%(name)s-%(version)s.tar.gz',
+        'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'],
+    }),
+    ('deap', '0.9.1', {
+        'source_urls': ['https://deap.googlecode.com/files/'],
+    }),
+    ('decorator', '3.4.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
+    }),
+    ('arff', '1.1', {
+        'source_tmpl': 'liac-%(name)s-%(version)s.zip',
+        'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'],
+    }),
+    ('pycrypto', '2.6.1', {
+        'modulename': 'Crypto',
+        'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'],
+    }),
+    ('paramiko', '1.12.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'],
+    }),
 ]
 
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb
index d6387e790cf18b3b0e03d5d8c9b59deb01028607..262c91f0612550dc536db2ac4de4d1bd0f0dbb7d 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb
@@ -11,7 +11,7 @@ numpyversion = '1.6.1'
 scipyversion = '0.10.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
 
 # python needs bzip2 to build the bz2 package
 dependencies = [
@@ -19,6 +19,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9-20130406'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 # order is important!
@@ -26,16 +27,24 @@ exts_list = [
     ('setuptools', '0.6c11', {
         'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'],
     }),
+    ('pip', '1.1', {
+        'source_urls': ['http://pypi.python.org/packages/source/p/pip/'],
+    }),
     ('nose', '1.1.2', {
         'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
     }),
     ('numpy', numpyversion, {
         'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
-        'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion],
+        'patches': [
+            'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion,
+        ],
     }),
     ('scipy', scipyversion, {
         'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
     }),
+    ('mpi4py', '1.3', {
+        'source_urls': ['https://mpi4py.googlecode.com/files/'],
+    }),
     ('paycheck', '1.0.2', {
         'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'],
     }),
@@ -48,6 +57,29 @@ exts_list = [
     ('Cython', '0.17.2', {
         'source_urls': ['http://www.cython.org/release/'],
     }),
+    ('dateutil', '2.1', {
+        'source_tmpl': 'python-%(name)s-%(version)s.tar.gz',
+        'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'],
+    }),
+    ('deap', '0.9.1', {
+        'source_urls': ['https://deap.googlecode.com/files/'],
+    }),
+    ('decorator', '3.4.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
+    }),
+    ('arff', '1.1', {
+        'source_tmpl': 'liac-%(name)s-%(version)s.zip',
+        'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'],
+    }),
+    ('pycrypto', '2.6.1', {
+        'modulename': 'Crypto',
+        'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'],
+    }),
+    ('paramiko', '1.12.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'],
+    }),
 ]
 
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb
index 36c7fd70fed442f2a31e8e99fb7f520515ce51dd..c22d902c711604be4d7065d3014044162fbfb2fc 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb
@@ -11,7 +11,7 @@ numpyversion = '1.6.1'
 scipyversion = '0.10.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
 
 # python needs bzip2 to build the bz2 package
 dependencies = [
@@ -19,6 +19,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9-20130406'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 # order is important!
@@ -26,16 +27,24 @@ exts_list = [
     ('setuptools', '0.6c11', {
         'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'],
     }),
+    ('pip', '1.1', {
+        'source_urls': ['http://pypi.python.org/packages/source/p/pip/'],
+    }),
     ('nose', '1.1.2', {
         'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
     }),
     ('numpy', numpyversion, {
         'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
-        'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion],
+        'patches': [
+            'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion,
+        ],
     }),
     ('scipy', scipyversion, {
         'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
     }),
+    ('mpi4py', '1.3', {
+        'source_urls': ['https://mpi4py.googlecode.com/files/'],
+    }),
     ('paycheck', '1.0.2', {
         'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'],
     }),
@@ -48,6 +57,29 @@ exts_list = [
     ('Cython', '0.17.2', {
         'source_urls': ['http://www.cython.org/release/'],
     }),
+    ('dateutil', '2.1', {
+        'source_tmpl': 'python-%(name)s-%(version)s.tar.gz',
+        'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'],
+    }),
+    ('deap', '0.9.1', {
+        'source_urls': ['https://deap.googlecode.com/files/'],
+    }),
+    ('decorator', '3.4.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
+    }),
+    ('arff', '1.1', {
+        'source_tmpl': 'liac-%(name)s-%(version)s.zip',
+        'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'],
+    }),
+    ('pycrypto', '2.6.1', {
+        'modulename': 'Crypto',
+        'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'],
+    }),
+    ('paramiko', '1.12.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'],
+    }),
 ]
 
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb
index cb3e4c646f86f1cc337f55d1f912e4bd36d06c6b..4e3149189fe6419b31d23d284a5ac07aa53be141 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb
@@ -11,7 +11,7 @@ numpyversion = '1.6.1'
 scipyversion = '0.10.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
 
 # python needs bzip2 to build the bz2 package
 dependencies = [
@@ -19,6 +19,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 # order is important!
@@ -26,16 +27,24 @@ exts_list = [
     ('setuptools', '0.6c11', {
         'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'],
     }),
+    ('pip', '1.1', {
+        'source_urls': ['http://pypi.python.org/packages/source/p/pip/'],
+    }),
     ('nose', '1.1.2', {
         'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
     }),
     ('numpy', numpyversion, {
         'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
-        'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion],
+        'patches': [
+            'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion,
+        ],
     }),
     ('scipy', scipyversion, {
         'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
     }),
+    ('mpi4py', '1.3', {
+        'source_urls': ['https://mpi4py.googlecode.com/files/'],
+    }),
     ('paycheck', '1.0.2', {
         'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'],
     }),
@@ -48,6 +57,29 @@ exts_list = [
     ('Cython', '0.17.2', {
         'source_urls': ['http://www.cython.org/release/'],
     }),
+    ('dateutil', '2.1', {
+        'source_tmpl': 'python-%(name)s-%(version)s.tar.gz',
+        'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'],
+    }),
+    ('deap', '0.9.1', {
+        'source_urls': ['https://deap.googlecode.com/files/'],
+    }),
+    ('decorator', '3.4.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
+    }),
+    ('arff', '1.1', {
+        'source_tmpl': 'liac-%(name)s-%(version)s.zip',
+        'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'],
+    }),
+    ('pycrypto', '2.6.1', {
+        'modulename': 'Crypto',
+        'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'],
+    }),
+    ('paramiko', '1.12.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'],
+    }),
 ]
 
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb
index 2904d6f980711dd571f38bd0fd8b271dbb8813f8..0f28917f5c477df4dc5f64a791cf599377b8ce33 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb
@@ -11,7 +11,7 @@ numpyversion = '1.6.1'
 scipyversion = '0.10.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
 
 # python needs bzip2 to build the bz2 package
 dependencies = [
@@ -19,6 +19,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 # order is important!
@@ -26,16 +27,24 @@ exts_list = [
     ('setuptools', '0.6c11', {
         'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'],
     }),
+    ('pip', '1.1', {
+        'source_urls': ['http://pypi.python.org/packages/source/p/pip/'],
+    }),
     ('nose', '1.1.2', {
         'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
     }),
     ('numpy', numpyversion, {
         'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
-        'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion],
+        'patches': [
+            'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion,
+        ],
     }),
     ('scipy', scipyversion, {
         'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
     }),
+    ('mpi4py', '1.3', {
+        'source_urls': ['https://mpi4py.googlecode.com/files/'],
+    }),
     ('paycheck', '1.0.2', {
         'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'],
     }),
@@ -48,6 +57,29 @@ exts_list = [
     ('Cython', '0.17.2', {
         'source_urls': ['http://www.cython.org/release/'],
     }),
+    ('dateutil', '2.1', {
+        'source_tmpl': 'python-%(name)s-%(version)s.tar.gz',
+        'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'],
+    }),
+    ('deap', '0.9.1', {
+        'source_urls': ['https://deap.googlecode.com/files/'],
+    }),
+    ('decorator', '3.4.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
+    }),
+    ('arff', '1.1', {
+        'source_tmpl': 'liac-%(name)s-%(version)s.zip',
+        'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'],
+    }),
+    ('pycrypto', '2.6.1', {
+        'modulename': 'Crypto',
+        'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'],
+    }),
+    ('paramiko', '1.12.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'],
+    }),
 ]
 
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb
index 44396979b54ffe75d21ed5d5e9514c76cbfc63e3..11ffa16a419c4596ffa94a12c789b58956e1f0f3 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb
@@ -11,7 +11,7 @@ numpyversion = '1.6.1'
 scipyversion = '0.10.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
 
 patches = ['python_libffi_int128_icc.patch']
 
@@ -21,6 +21,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 # order is important!
@@ -28,6 +29,9 @@ exts_list = [
     ('setuptools', '0.6c11', {
         'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'],
     }),
+    ('pip', '1.1', {
+        'source_urls': ['http://pypi.python.org/packages/source/p/pip/'],
+    }),
     ('nose', '1.1.2', {
         'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
     }),
@@ -38,6 +42,9 @@ exts_list = [
     ('scipy', scipyversion, {
         'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
     }),
+    ('mpi4py', '1.3', {
+        'source_urls': ['https://mpi4py.googlecode.com/files/'],
+    }),
     ('paycheck', '1.0.2', {
         'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'],
     }),
@@ -50,6 +57,29 @@ exts_list = [
     ('Cython', '0.17.2', {
         'source_urls': ['http://www.cython.org/release/'],
     }),
+    ('dateutil', '2.1', {
+        'source_tmpl': 'python-%(name)s-%(version)s.tar.gz',
+        'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'],
+    }),
+    ('deap', '0.9.1', {
+        'source_urls': ['https://deap.googlecode.com/files/'],
+    }),
+    ('decorator', '3.4.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
+    }),
+    ('arff', '1.1', {
+        'source_tmpl': 'liac-%(name)s-%(version)s.zip',
+        'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'],
+    }),
+    ('pycrypto', '2.6.1', {
+        'modulename': 'Crypto',
+        'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'],
+    }),
+    ('paramiko', '1.12.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'],
+    }),
 ]
 
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.1.13.eb
index e69840bf6aaa17570efe190b9d7cd24dab1d14e8..97c9a23292c9c0a46528436b9e6a296cc7d9e1a8 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.1.13.eb
@@ -11,7 +11,7 @@ numpyversion = '1.6.1'
 scipyversion = '0.10.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
 
 patches = ['python_libffi_int128_icc.patch']
 
@@ -21,6 +21,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 # order is important!
@@ -28,6 +29,9 @@ exts_list = [
     ('setuptools', '0.6c11', {
         'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'],
     }),
+    ('pip', '1.1', {
+        'source_urls': ['http://pypi.python.org/packages/source/p/pip/'],
+    }),
     ('nose', '1.1.2', {
         'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
     }),
@@ -38,6 +42,9 @@ exts_list = [
     ('scipy', scipyversion, {
         'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
     }),
+    ('mpi4py', '1.3', {
+        'source_urls': ['https://mpi4py.googlecode.com/files/'],
+    }),
     ('paycheck', '1.0.2', {
         'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'],
     }),
@@ -50,6 +57,29 @@ exts_list = [
     ('Cython', '0.17.2', {
         'source_urls': ['http://www.cython.org/release/'],
     }),
+    ('dateutil', '2.1', {
+        'source_tmpl': 'python-%(name)s-%(version)s.tar.gz',
+        'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'],
+    }),
+    ('deap', '0.9.1', {
+        'source_urls': ['https://deap.googlecode.com/files/'],
+    }),
+    ('decorator', '3.4.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
+    }),
+    ('arff', '1.1', {
+        'source_tmpl': 'liac-%(name)s-%(version)s.zip',
+        'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'],
+    }),
+    ('pycrypto', '2.6.1', {
+        'modulename': 'Crypto',
+        'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'],
+    }),
+    ('paramiko', '1.12.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'],
+    }),
 ]
 
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb
index 0fcb35553c0cfa76a8b4147581b196c4359035c1..79e4bbcd675ef6d68b01513648a1e5b945ef7cd9 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb
@@ -11,9 +11,7 @@ numpyversion = '1.6.1'
 scipyversion = '0.10.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
-sources = ['%(name)s-%(version)s.tgz']
-
-patches = ['python_libffi_int128_icc.patch']
+sources = [SOURCE_TGZ]
 
 # python needs bzip2 to build the bz2 package
 dependencies = [
@@ -21,6 +19,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 # order is important!
@@ -28,6 +27,9 @@ exts_list = [
     ('setuptools', '0.6c11', {
         'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'],
     }),
+    ('pip', '1.1', {
+        'source_urls': ['http://pypi.python.org/packages/source/p/pip/'],
+    }),
     ('nose', '1.1.2', {
         'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
     }),
@@ -38,6 +40,9 @@ exts_list = [
     ('scipy', scipyversion, {
         'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
     }),
+    ('mpi4py', '1.3', {
+        'source_urls': ['https://mpi4py.googlecode.com/files/'],
+    }),
     ('paycheck', '1.0.2', {
         'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'],
     }),
@@ -50,6 +55,29 @@ exts_list = [
     ('Cython', '0.17.2', {
         'source_urls': ['http://www.cython.org/release/'],
     }),
+    ('dateutil', '2.1', {
+        'source_tmpl': 'python-%(name)s-%(version)s.tar.gz',
+        'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'],
+    }),
+    ('deap', '0.9.1', {
+        'source_urls': ['https://deap.googlecode.com/files/'],
+    }),
+    ('decorator', '3.4.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
+    }),
+    ('arff', '1.1', {
+        'source_tmpl': 'liac-%(name)s-%(version)s.zip',
+        'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'],
+    }),
+    ('pycrypto', '2.6.1', {
+        'modulename': 'Crypto',
+        'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'],
+    }),
+    ('paramiko', '1.12.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'],
+    }),
 ]
 
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb
index 0ef59f1a6c282381a4caf03bf038d6439f02a57a..1ccc5c12cad7fbada0cb3bb6c90584b265a3529b 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb
@@ -11,9 +11,7 @@ numpyversion = '1.6.1'
 scipyversion = '0.10.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
-sources = ['%(name)s-%(version)s.tgz']
-
-patches = ['python_libffi_int128_icc.patch']
+sources = [SOURCE_TGZ]
 
 # python needs bzip2 to build the bz2 package
 dependencies = [
@@ -21,6 +19,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 # order is important!
@@ -28,6 +27,9 @@ exts_list = [
     ('setuptools', '0.6c11', {
         'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'],
     }),
+    ('pip', '1.1', {
+        'source_urls': ['http://pypi.python.org/packages/source/p/pip/'],
+    }),
     ('nose', '1.1.2', {
         'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
     }),
@@ -38,6 +40,9 @@ exts_list = [
     ('scipy', scipyversion, {
         'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
     }),
+    ('mpi4py', '1.3', {
+        'source_urls': ['https://mpi4py.googlecode.com/files/'],
+    }),
     ('paycheck', '1.0.2', {
         'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'],
     }),
@@ -50,6 +55,29 @@ exts_list = [
     ('Cython', '0.17.2', {
         'source_urls': ['http://www.cython.org/release/'],
     }),
+    ('dateutil', '2.1', {
+        'source_tmpl': 'python-%(name)s-%(version)s.tar.gz',
+        'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'],
+    }),
+    ('deap', '0.9.1', {
+        'source_urls': ['https://deap.googlecode.com/files/'],
+    }),
+    ('decorator', '3.4.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
+    }),
+    ('arff', '1.1', {
+        'source_tmpl': 'liac-%(name)s-%(version)s.zip',
+        'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'],
+    }),
+    ('pycrypto', '2.6.1', {
+        'modulename': 'Crypto',
+        'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'],
+    }),
+    ('paramiko', '1.12.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'],
+    }),
 ]
 
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb
index 6d4756c14e4f79050eda5fefe93a7a7f9181f8d1..3a167c9f92008578c048c70fd8143f8c31f46489 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb
@@ -8,11 +8,10 @@ toolchain = {'name': 'iomkl', 'version': '4.6.13'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
 numpyversion = '1.6.1'
-scipyversion = '0.11.0'
-pytablesversion = '2.4.0'
+scipyversion = '0.10.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
 
 patches = ['python_libffi_int128_icc.patch']
 
@@ -22,6 +21,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 # order is important!
@@ -29,6 +29,9 @@ exts_list = [
     ('setuptools', '0.6c11', {
         'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'],
     }),
+    ('pip', '1.1', {
+        'source_urls': ['http://pypi.python.org/packages/source/p/pip/'],
+    }),
     ('nose', '1.1.2', {
         'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
     }),
@@ -39,6 +42,9 @@ exts_list = [
     ('scipy', scipyversion, {
         'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
     }),
+    ('mpi4py', '1.3', {
+        'source_urls': ['https://mpi4py.googlecode.com/files/'],
+    }),
     ('paycheck', '1.0.2', {
         'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'],
     }),
@@ -51,6 +57,29 @@ exts_list = [
     ('Cython', '0.17.2', {
         'source_urls': ['http://www.cython.org/release/'],
     }),
+    ('dateutil', '2.1', {
+        'source_tmpl': 'python-%(name)s-%(version)s.tar.gz',
+        'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'],
+    }),
+    ('deap', '0.9.1', {
+        'source_urls': ['https://deap.googlecode.com/files/'],
+    }),
+    ('decorator', '3.4.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
+    }),
+    ('arff', '1.1', {
+        'source_tmpl': 'liac-%(name)s-%(version)s.zip',
+        'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'],
+    }),
+    ('pycrypto', '2.6.1', {
+        'modulename': 'Crypto',
+        'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'],
+    }),
+    ('paramiko', '1.12.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'],
+    }),
 ]
 
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-iqacml-3.7.3.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-iqacml-3.7.3.eb
index 591a7c22f0f978736f86960cc37185d86c9e28da..1ad8450e3d74ac02a2abafb0115596c3a3ef11cb 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-iqacml-3.7.3.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-iqacml-3.7.3.eb
@@ -11,7 +11,7 @@ numpyversion = '1.6.1'
 scipyversion = '0.10.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
 
 patches = ['python_libffi_int128_icc.patch']
 
@@ -22,6 +22,7 @@ dependencies = [
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
     ('CBLAS', '20110120'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 # order is important!
@@ -29,6 +30,9 @@ exts_list = [
     ('setuptools', '0.6c11', {
         'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'],
     }),
+    ('pip', '1.1', {
+        'source_urls': ['http://pypi.python.org/packages/source/p/pip/'],
+    }),
     ('nose', '1.1.2', {
         'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
     }),
@@ -42,6 +46,9 @@ exts_list = [
     ('scipy', scipyversion, {
         'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
     }),
+    ('mpi4py', '1.3', {
+        'source_urls': ['https://mpi4py.googlecode.com/files/'],
+    }),
     ('paycheck', '1.0.2', {
         'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'],
     }),
@@ -54,6 +61,29 @@ exts_list = [
     ('Cython', '0.17.2', {
         'source_urls': ['http://www.cython.org/release/'],
     }),
+    ('dateutil', '2.1', {
+        'source_tmpl': 'python-%(name)s-%(version)s.tar.gz',
+        'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'],
+    }),
+    ('deap', '0.9.1', {
+        'source_urls': ['https://deap.googlecode.com/files/'],
+    }),
+    ('decorator', '3.4.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
+    }),
+    ('arff', '1.1', {
+        'source_tmpl': 'liac-%(name)s-%(version)s.zip',
+        'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'],
+    }),
+    ('pycrypto', '2.6.1', {
+        'modulename': 'Crypto',
+        'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'],
+    }),
+    ('paramiko', '1.12.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'],
+    }),
 ]
 
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb
index 61eaa9350c905d2979151a94e993c52bb6045525..df55e62340336d2e45887f4873743fd8aa9b408f 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb
@@ -11,9 +11,7 @@ numpyversion = '1.7.0'
 scipyversion = '0.12.0'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
-sources = ['%(name)s-%(version)s.tgz']
-
-patches = ['python-%(version)s_libffi_int128_icc.patch']
+sources = [SOURCE_TGZ]
 
 # python needs bzip2 to build the bz2 package
 dependencies = [
@@ -21,6 +19,7 @@ dependencies = [
     ('zlib', '1.2.8'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 # order is important!
@@ -28,15 +27,15 @@ exts_list = [
     ('setuptools', '0.6c11', {
         'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'],
     }),
-    ('nose', '1.3.0', {
+    ('pip', '1.1', {
+        'source_urls': ['http://pypi.python.org/packages/source/p/pip/'],
+    }),
+    ('nose', '1.1.2', {
         'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
     }),
     ('numpy', numpyversion, {
         'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
-        'patches': [
-            'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion,
-            'numpy-iqacml.patch',
-        ],
+        'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion],
     }),
     ('scipy', scipyversion, {
         'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
@@ -53,9 +52,32 @@ exts_list = [
     ('lockfile', '0.9.1', {
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
-    ('Cython', '0.19.1', {
+    ('Cython', '0.17.2', {
         'source_urls': ['http://www.cython.org/release/'],
     }),
+    ('dateutil', '2.1', {
+        'source_tmpl': 'python-%(name)s-%(version)s.tar.gz',
+        'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'],
+    }),
+    ('deap', '0.9.1', {
+        'source_urls': ['https://deap.googlecode.com/files/'],
+    }),
+    ('decorator', '3.4.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
+    }),
+    ('arff', '1.1', {
+        'source_tmpl': 'liac-%(name)s-%(version)s.zip',
+        'source_urls': ['https://pypi.python.org/packages/source/l/liac-arf/'],
+    }),
+    ('pycrypto', '2.6.1', {
+        'modulename': 'Crypto',
+        'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'],
+    }),
+    ('paramiko', '1.12.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'],
+    }),
 ]
 
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb
index 890f3ac899a786cff47451d42074677acae9cb45..968045a415e88eb204cab1efe27a036b88418d7a 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb
@@ -11,9 +11,7 @@ numpyversion = '1.7.0'
 scipyversion = '0.12.0'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
-sources = ['%(name)s-%(version)s.tgz']
-
-patches = ['python-%(version)s_libffi_int128_icc.patch']
+sources = [SOURCE_TGZ]
 
 # python needs bzip2 to build the bz2 package
 dependencies = [
@@ -21,6 +19,7 @@ dependencies = [
     ('zlib', '1.2.8'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 # order is important!
@@ -28,14 +27,16 @@ exts_list = [
     ('setuptools', '0.6c11', {
         'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'],
     }),
-    ('nose', '1.3.0', {
+    ('pip', '1.1', {
+        'source_urls': ['http://pypi.python.org/packages/source/p/pip/'],
+    }),
+    ('nose', '1.1.2', {
         'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
     }),
     ('numpy', numpyversion, {
         'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
         'patches': [
             'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion,
-            'numpy-iqacml.patch',
         ],
     }),
     ('scipy', scipyversion, {
@@ -53,9 +54,32 @@ exts_list = [
     ('lockfile', '0.9.1', {
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
-    ('Cython', '0.19.1', {
+    ('Cython', '0.17.2', {
         'source_urls': ['http://www.cython.org/release/'],
     }),
+    ('dateutil', '2.1', {
+        'source_tmpl': 'python-%(name)s-%(version)s.tar.gz',
+        'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'],
+    }),
+    ('deap', '0.9.1', {
+        'source_urls': ['https://deap.googlecode.com/files/'],
+    }),
+    ('decorator', '3.4.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
+    }),
+    ('arff', '1.1', {
+        'source_tmpl': 'liac-%(name)s-%(version)s.zip',
+        'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'],
+    }),
+    ('pycrypto', '2.6.1', {
+        'modulename': 'Crypto',
+        'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'],
+    }),
+    ('paramiko', '1.12.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'],
+    }),
 ]
 
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb
index ba61bc3e08033e5ff1306997ccf6d5c50954fba7..464a9c044128efe2eed3bda59336447f19d9fe41 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb
@@ -11,9 +11,10 @@ numpyversion = '1.7.0'
 scipyversion = '0.12.0'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
 
-patches = ['python-%(version)s_libffi_int128_icc.patch']
+# libffi build in python is still broken, see http://bugs.python.org/issue4130
+patches = ['python-2.7_libffi-include-xmmintrin.patch']
 
 # python needs bzip2 to build the bz2 package
 dependencies = [
@@ -21,6 +22,7 @@ dependencies = [
     ('zlib', '1.2.8'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 # order is important!
@@ -28,14 +30,16 @@ exts_list = [
     ('setuptools', '0.6c11', {
         'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'],
     }),
-    ('nose', '1.3.0', {
+    ('pip', '1.1', {
+        'source_urls': ['http://pypi.python.org/packages/source/p/pip/'],
+    }),
+    ('nose', '1.1.2', {
         'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
     }),
     ('numpy', numpyversion, {
         'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
         'patches': [
             'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion,
-            'numpy-iqacml.patch',
         ],
     }),
     ('scipy', scipyversion, {
@@ -53,9 +57,32 @@ exts_list = [
     ('lockfile', '0.9.1', {
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
-    ('Cython', '0.19.1', {
+    ('Cython', '0.17.2', {
         'source_urls': ['http://www.cython.org/release/'],
     }),
+    ('dateutil', '2.1', {
+        'source_tmpl': 'python-%(name)s-%(version)s.tar.gz',
+        'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'],
+    }),
+    ('deap', '0.9.1', {
+        'source_urls': ['https://deap.googlecode.com/files/'],
+    }),
+    ('decorator', '3.4.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
+    }),
+    ('arff', '1.1', {
+        'source_tmpl': 'liac-%(name)s-%(version)s.zip',
+        'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'],
+    }),
+    ('pycrypto', '2.6.1', {
+        'modulename': 'Crypto',
+        'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'],
+    }),
+    ('paramiko', '1.12.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'],
+    }),
 ]
 
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb
index 9cd24fe3aee8babf19279e5186a2530372252f10..54b6d1a65fa71991b6ae24bc590fc3cf5c72d7dd 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb
@@ -11,9 +11,10 @@ numpyversion = '1.7.0'
 scipyversion = '0.12.0'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
 
-patches = ['python-%(version)s_libffi_int128_icc.patch']
+# libffi build in python is still broken, see http://bugs.python.org/issue4130
+patches = ['python-2.7_libffi-include-xmmintrin.patch']
 
 # python needs bzip2 to build the bz2 package
 dependencies = [
@@ -21,6 +22,7 @@ dependencies = [
     ('zlib', '1.2.8'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 # order is important!
@@ -28,15 +30,15 @@ exts_list = [
     ('setuptools', '0.6c11', {
         'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'],
     }),
-    ('nose', '1.3.0', {
+    ('pip', '1.1', {
+        'source_urls': ['http://pypi.python.org/packages/source/p/pip/'],
+    }),
+    ('nose', '1.1.2', {
         'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
     }),
     ('numpy', numpyversion, {
         'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
-        'patches': [
-            'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion,
-            'numpy-iqacml.patch',
-        ],
+        'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion],
     }),
     ('scipy', scipyversion, {
         'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
@@ -53,9 +55,32 @@ exts_list = [
     ('lockfile', '0.9.1', {
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
-    ('Cython', '0.19.1', {
+    ('Cython', '0.17.2', {
         'source_urls': ['http://www.cython.org/release/'],
     }),
+    ('dateutil', '2.1', {
+        'source_tmpl': 'python-%(name)s-%(version)s.tar.gz',
+        'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'],
+    }),
+    ('deap', '0.9.1', {
+        'source_urls': ['https://deap.googlecode.com/files/'],
+    }),
+    ('decorator', '3.4.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
+    }),
+    ('arff', '1.1', {
+        'source_tmpl': 'liac-%(name)s-%(version)s.zip',
+        'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'],
+    }),
+    ('pycrypto', '2.6.1', {
+        'modulename': 'Crypto',
+        'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'],
+    }),
+    ('paramiko', '1.12.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'],
+    }),
 ]
 
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb
index 4896534784f8b276a0c95dea5986d2e4cef8ac82..d513f80632036144eefebc984d116a177a546726 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb
@@ -7,13 +7,14 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'ictce', 'version': '5.5.0'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numpyversion = '1.7.1'
+numpyversion = '1.7.0'
 scipyversion = '0.12.0'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
 
-patches = ['python-%(version)s_libffi_int128_icc.patch']
+# libffi build in python is still broken, see http://bugs.python.org/issue4130
+patches = ['python-2.7_libffi-include-xmmintrin.patch']
 
 # python needs bzip2 to build the bz2 package
 dependencies = [
@@ -21,6 +22,7 @@ dependencies = [
     ('zlib', '1.2.8'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 # order is important!
@@ -28,15 +30,15 @@ exts_list = [
     ('setuptools', '0.6c11', {
         'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'],
     }),
-    ('nose', '1.3.0', {
+    ('pip', '1.1', {
+        'source_urls': ['http://pypi.python.org/packages/source/p/pip/'],
+    }),
+    ('nose', '1.1.2', {
         'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
     }),
     ('numpy', numpyversion, {
         'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
-        'patches': [
-            'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion,
-            'numpy-iqacml.patch',
-        ],
+        'patches': ['numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion],
     }),
     ('scipy', scipyversion, {
         'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
@@ -53,9 +55,32 @@ exts_list = [
     ('lockfile', '0.9.1', {
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
-    ('Cython', '0.19.1', {
+    ('Cython', '0.17.2', {
         'source_urls': ['http://www.cython.org/release/'],
     }),
+    ('dateutil', '2.1', {
+        'source_tmpl': 'python-%(name)s-%(version)s.tar.gz',
+        'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'],
+    }),
+    ('deap', '0.9.1', {
+        'source_urls': ['https://deap.googlecode.com/files/'],
+    }),
+    ('decorator', '3.4.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
+    }),
+    ('arff', '1.1', {
+        'source_tmpl': 'liac-%(name)s-%(version)s.zip',
+        'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'],
+    }),
+    ('pycrypto', '2.6.1', {
+        'modulename': 'Crypto',
+        'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'],
+    }),
+    ('paramiko', '1.12.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'],
+    }),
 ]
 
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb
index fbb080007251d0ab42b41d97729b0832e42e64bb..4a7605ab2cbb41719964b60f0a3f3b6abb1adc5f 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb
@@ -11,9 +11,10 @@ numpyversion = '1.7.0'
 scipyversion = '0.12.0'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
 
-patches = ['python-%(version)s_libffi_int128_icc.patch']
+# libffi build in python is still broken, see http://bugs.python.org/issue4130
+patches = ['python-2.7_libffi-include-xmmintrin.patch']
 
 # python needs bzip2 to build the bz2 package
 dependencies = [
@@ -22,6 +23,7 @@ dependencies = [
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
     ('CBLAS', '20110120'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 # order is important!
@@ -29,7 +31,10 @@ exts_list = [
     ('setuptools', '0.6c11', {
         'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'],
     }),
-    ('nose', '1.3.0', {
+    ('pip', '1.1', {
+        'source_urls': ['http://pypi.python.org/packages/source/p/pip/'],
+    }),
+    ('nose', '1.1.2', {
         'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
     }),
     ('numpy', numpyversion, {
@@ -54,9 +59,32 @@ exts_list = [
     ('lockfile', '0.9.1', {
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
-    ('Cython', '0.19.1', {
+    ('Cython', '0.17.2', {
         'source_urls': ['http://www.cython.org/release/'],
     }),
+    ('dateutil', '2.1', {
+        'source_tmpl': 'python-%(name)s-%(version)s.tar.gz',
+        'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'],
+    }),
+    ('deap', '0.9.1', {
+        'source_urls': ['https://deap.googlecode.com/files/'],
+    }),
+    ('decorator', '3.4.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
+    }),
+    ('arff', '1.1', {
+        'source_tmpl': 'liac-%(name)s-%(version)s.zip',
+        'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'],
+    }),
+    ('pycrypto', '2.6.1', {
+        'modulename': 'Crypto',
+        'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'],
+    }),
+    ('paramiko', '1.12.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'],
+    }),
 ]
 
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..44158cd1590c581b8808489f5ff86a775a37c958
--- /dev/null
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb
@@ -0,0 +1,85 @@
+name = 'Python'
+version = '2.7.6'
+
+homepage = 'http://python.org/'
+description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively."
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+numpyversion = '1.8.0'
+scipyversion = '0.13.1'
+
+source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
+sources = [SOURCE_TGZ]
+
+# python needs bzip2 to build the bz2 package
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.7'),
+    ('libreadline', '6.2'),
+    ('ncurses', '5.9'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+]
+
+# order is important!
+exts_list = [
+    ('setuptools', '1.4.2', {
+        'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'],
+    }),
+    ('pip', '1.4.1', {
+        'source_urls': ['http://pypi.python.org/packages/source/p/pip/'],
+    }),
+    ('nose', '1.3.0', {
+        'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
+    }),
+    ('numpy', numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
+        'patches': [
+            'numpy-%s-mkl.patch' % numpyversion,
+        ],
+    }),
+    ('scipy', scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
+    }),
+    ('mpi4py', '1.3.1', {
+        'source_urls': ['https://mpi4py.googlecode.com/files/'],
+    }),
+    ('paycheck', '1.0.2', {
+        'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'],
+    }),
+    ('argparse', '1.2.1', {
+        'source_urls': ['http://argparse.googlecode.com/files/'],
+    }),
+    ('lockfile', '0.9.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
+    }),
+    ('Cython', '0.19.2', {
+        'source_urls': ['http://www.cython.org/release/'],
+    }),
+    ('dateutil', '2.2', {
+        'source_tmpl': 'python-%(name)s-%(version)s.tar.gz',
+        'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'],
+    }),
+    ('deap', '0.9.1', {
+        'source_urls': ['https://deap.googlecode.com/files/'],
+    }),
+    ('decorator', '3.4.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
+    }),
+    ('arff', '1.1', {
+        'source_tmpl': 'liac-%(name)s-%(version)s.zip',
+        'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'],
+    }),
+    ('pycrypto', '2.6.1', {
+        'modulename': 'Crypto',
+        'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'],
+    }),
+    ('paramiko', '1.12.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'],
+    }),
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6a17a47968420cbc18349375b2abee1df39e9130
--- /dev/null
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb
@@ -0,0 +1,88 @@
+name = 'Python'
+version = '2.7.6'
+
+homepage = 'http://python.org/'
+description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively."
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+numpyversion = '1.8.0'
+scipyversion = '0.13.1'
+
+source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
+sources = [SOURCE_TGZ]
+
+# libffi build in python is still broken, see http://bugs.python.org/issue4130
+patches = ['python-2.7_libffi-include-xmmintrin.patch']
+
+# python needs bzip2 to build the bz2 package
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.7'),
+    ('libreadline', '6.2'),
+    ('ncurses', '5.9'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+]
+
+# order is important!
+exts_list = [
+    ('setuptools', '1.4.2', {
+        'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'],
+    }),
+    ('pip', '1.4.1', {
+        'source_urls': ['http://pypi.python.org/packages/source/p/pip/'],
+    }),
+    ('nose', '1.3.0', {
+        'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
+    }),
+    ('numpy', numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
+        'patches': [
+            'numpy-%s-mkl.patch' % numpyversion,
+        ],
+    }),
+    ('scipy', scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
+    }),
+    ('mpi4py', '1.3.1', {
+        'source_urls': ['https://mpi4py.googlecode.com/files/'],
+    }),
+    ('paycheck', '1.0.2', {
+        'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'],
+    }),
+    ('argparse', '1.2.1', {
+        'source_urls': ['http://argparse.googlecode.com/files/'],
+    }),
+    ('lockfile', '0.9.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
+    }),
+    ('Cython', '0.19.2', {
+        'source_urls': ['http://www.cython.org/release/'],
+    }),
+    ('dateutil', '2.2', {
+        'source_tmpl': 'python-%(name)s-%(version)s.tar.gz',
+        'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'],
+    }),
+    ('deap', '0.9.1', {
+        'source_urls': ['https://deap.googlecode.com/files/'],
+    }),
+    ('decorator', '3.4.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
+    }),
+    ('arff', '1.1', {
+        'source_tmpl': 'liac-%(name)s-%(version)s.zip',
+        'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'],
+    }),
+    ('pycrypto', '2.6.1', {
+        'modulename': 'Crypto',
+        'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'],
+    }),
+    ('paramiko', '1.12.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'],
+    }),
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..af561484ae906744e682b6ee1322e1bcc2c224c9
--- /dev/null
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb
@@ -0,0 +1,88 @@
+name = 'Python'
+version = '2.7.6'
+
+homepage = 'http://python.org/'
+description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively."
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+numpyversion = '1.8.0'
+scipyversion = '0.13.1'
+
+source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
+sources = [SOURCE_TGZ]
+
+# libffi build in python is still broken, see http://bugs.python.org/issue4130
+patches = ['python-2.7_libffi-include-xmmintrin.patch']
+
+# python needs bzip2 to build the bz2 package
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.7'),
+    ('libreadline', '6.2'),
+    ('ncurses', '5.9'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+]
+
+# order is important!
+exts_list = [
+    ('setuptools', '1.4.2', {
+        'source_urls': ['http://pypi.python.org/packages/source/s/setuptools/'],
+    }),
+    ('pip', '1.4.1', {
+        'source_urls': ['http://pypi.python.org/packages/source/p/pip/'],
+    }),
+    ('nose', '1.3.0', {
+        'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
+    }),
+    ('numpy', numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
+        'patches': [
+            'numpy-%s-mkl.patch' % numpyversion,
+        ],
+    }),
+    ('scipy', scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
+    }),
+    ('mpi4py', '1.3.1', {
+        'source_urls': ['https://mpi4py.googlecode.com/files/'],
+    }),
+    ('paycheck', '1.0.2', {
+        'source_urls': ['http://pypi.python.org/packages/source/p/paycheck/'],
+    }),
+    ('argparse', '1.2.1', {
+        'source_urls': ['http://argparse.googlecode.com/files/'],
+    }),
+    ('lockfile', '0.9.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
+    }),
+    ('Cython', '0.19.2', {
+        'source_urls': ['http://www.cython.org/release/'],
+    }),
+    ('dateutil', '2.2', {
+        'source_tmpl': 'python-%(name)s-%(version)s.tar.gz',
+        'source_urls': ['http://pypi.python.org/packages/source/p/python-dateutil/'],
+    }),
+    ('deap', '0.9.1', {
+        'source_urls': ['https://deap.googlecode.com/files/'],
+    }),
+    ('decorator', '3.4.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
+    }),
+    ('arff', '1.1', {
+        'source_tmpl': 'liac-%(name)s-%(version)s.zip',
+        'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'],
+    }),
+    ('pycrypto', '2.6.1', {
+        'modulename': 'Crypto',
+        'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'],
+    }),
+    ('paramiko', '1.12.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'],
+    }),
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb
index 087bed47a18f4ce5d8cc6d7aa361e15db6f169bc..236304395eb98b8df84e5215a2d0dbffd6c673df 100644
--- a/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb
@@ -11,7 +11,7 @@ numpyversion = '1.6.1'
 scipyversion = '0.10.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
 
 # python needs bzip2 to build the bz2 package
 dependencies = [
@@ -19,6 +19,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 # order is important!
@@ -35,11 +36,34 @@ exts_list = [
     }),
     ('numpy', numpyversion, {
         'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
-        'patches': ['numpy-1.6.1_distutils_multiple-lib-dirs.patch'],
+        'patches': [
+            'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion,
+        ],
     }),
     ('scipy', scipyversion, {
         'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
     }),
+    ('mpi4py', '1.3', {
+        'source_urls': ['https://mpi4py.googlecode.com/files/'],
+    }),
+    ('argparse', '1.2.1', {
+        'source_urls': ['http://argparse.googlecode.com/files/'],
+    }),
+    ('Cython', '0.19.1', {
+        'source_urls': ['http://www.cython.org/release/'],
+    }),
+    ('deap', '0.9.1', {
+        'source_urls': ['https://deap.googlecode.com/files/'],
+    }),
+    ('decorator', '3.4.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
+    }),
+    ('pycrypto', '2.6.1', {
+        'modulename': 'Crypto',
+        'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'],
+    }),
 ]
 
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb
index f52c47b3045143c4a12c8e37727bdc54fe86568a..fbb78f9e843f4c1fea794768439dd083207b959c 100644
--- a/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb
@@ -11,7 +11,7 @@ numpyversion = '1.6.1'
 scipyversion = '0.10.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
 
 # python needs bzip2 to build the bz2 package
 dependencies = [
@@ -19,6 +19,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 # order is important!
@@ -35,11 +36,34 @@ exts_list = [
     }),
     ('numpy', numpyversion, {
         'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
-        'patches': ['numpy-1.6.1_distutils_multiple-lib-dirs.patch'],
+        'patches': [
+            'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion,
+        ],
     }),
     ('scipy', scipyversion, {
         'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
     }),
+    ('mpi4py', '1.3', {
+        'source_urls': ['https://mpi4py.googlecode.com/files/'],
+    }),
+    ('argparse', '1.2.1', {
+        'source_urls': ['http://argparse.googlecode.com/files/'],
+    }),
+    ('Cython', '0.19.1', {
+        'source_urls': ['http://www.cython.org/release/'],
+    }),
+    ('deap', '0.9.1', {
+        'source_urls': ['https://deap.googlecode.com/files/'],
+    }),
+    ('decorator', '3.4.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
+    }),
+    ('pycrypto', '2.6.1', {
+        'modulename': 'Crypto',
+        'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'],
+    }),
 ]
 
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb
index 938b80ce480bd2d4289ddefa296f317c6d657e6f..c6cedb61ef433077aac5ea122eaf1fb56f4ea8f1 100644
--- a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb
@@ -11,7 +11,9 @@ numpyversion = '1.6.1'
 scipyversion = '0.10.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
+
+patches = ['python_libffi_int128_icc.patch']
 
 # python needs bzip2 to build the bz2 package
 dependencies = [
@@ -19,6 +21,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 # order is important!
@@ -35,11 +38,34 @@ exts_list = [
     }),
     ('numpy', numpyversion, {
         'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
-        'patches': ['numpy-1.6.1_distutils_multiple-lib-dirs.patch'],
+        'patches': [
+            'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion,
+        ],
     }),
     ('scipy', scipyversion, {
         'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
     }),
+    ('mpi4py', '1.3', {
+        'source_urls': ['https://mpi4py.googlecode.com/files/'],
+    }),
+    ('argparse', '1.2.1', {
+        'source_urls': ['http://argparse.googlecode.com/files/'],
+    }),
+    ('Cython', '0.19.1', {
+        'source_urls': ['http://www.cython.org/release/'],
+    }),
+    ('deap', '0.9.1', {
+        'source_urls': ['https://deap.googlecode.com/files/'],
+    }),
+    ('decorator', '3.4.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
+    }),
+    ('pycrypto', '2.6.1', {
+        'modulename': 'Crypto',
+        'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'],
+    }),
 ]
 
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb
index 79711931880e690eec43f99a7f582aa70be1193c..38875e2a4f38bf62a311837b042a57f4d34b7a02 100644
--- a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb
@@ -4,7 +4,6 @@ version = '3.2.3'
 homepage = 'http://python.org/'
 description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively."
 
-
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
@@ -12,7 +11,7 @@ numpyversion = '1.6.1'
 scipyversion = '0.10.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
-sources = ['%(name)s-%(version)s.tgz']
+sources = [SOURCE_TGZ]
 
 # python needs bzip2 to build the bz2 package
 dependencies = [
@@ -20,6 +19,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 # order is important!
@@ -36,11 +36,34 @@ exts_list = [
     }),
     ('numpy', numpyversion, {
         'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
-        'patches': ['numpy-1.6.1_distutils_multiple-lib-dirs.patch'],
+        'patches': [
+            'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion,
+        ],
     }),
     ('scipy', scipyversion, {
         'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
     }),
+    ('mpi4py', '1.3', {
+        'source_urls': ['https://mpi4py.googlecode.com/files/'],
+    }),
+    ('argparse', '1.2.1', {
+        'source_urls': ['http://argparse.googlecode.com/files/'],
+    }),
+    ('Cython', '0.19.1', {
+        'source_urls': ['http://www.cython.org/release/'],
+    }),
+    ('deap', '0.9.1', {
+        'source_urls': ['https://deap.googlecode.com/files/'],
+    }),
+    ('decorator', '3.4.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
+    }),
+    ('pycrypto', '2.6.1', {
+        'modulename': 'Crypto',
+        'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'],
+    }),
 ]
 
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-3.3.2-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-3.3.2-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..73c3832a10263abab12a87b2cb598bac441cc489
--- /dev/null
+++ b/easybuild/easyconfigs/p/Python/Python-3.3.2-goolf-1.4.10.eb
@@ -0,0 +1,47 @@
+name = 'Python'
+version = '3.3.2'
+
+homepage = 'http://python.org/'
+description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively."
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+numpyversion = '1.7.1'
+scipyversion = '0.12.0'
+
+source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
+sources = [SOURCE_TGZ]
+
+# python needs bzip2 to build the bz2 package
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.8'),
+    ('libreadline', '6.2'),
+    ('ncurses', '5.9'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+]
+
+# order is important!
+exts_list = [
+    ('setuptools', '1.1.1', {
+        'source_urls': ['http://pypi.python.org/packages/source/s/setuptools'],
+    }),
+    ('pip', '1.4.1', {
+        'source_urls': ['http://pypi.python.org/packages/source/p/pip/'],
+    }),
+    ('nose', '1.3.0', {
+        'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
+    }),
+    ('numpy', numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
+        'patches': ['numpy-1.7.1_distutils_multiple-lib-dirs.patch'],
+    }),
+    ('scipy', scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
+    }),
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-4.1.13.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8cd8056d73a9290524fe52c82aac0be61f7306c0
--- /dev/null
+++ b/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-4.1.13.eb
@@ -0,0 +1,49 @@
+name = 'Python'
+version = '3.3.2'
+
+homepage = 'http://python.org/'
+description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively."
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+numpyversion = '1.7.1'
+scipyversion = '0.12.0'
+
+source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
+sources = [SOURCE_TGZ]
+
+patches = ['python-3.3_libffi-include-xmmintrin.patch']
+
+# python needs bzip2 to build the bz2 package
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.8'),
+    ('libreadline', '6.2'),
+    ('ncurses', '5.9'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+]
+
+# order is important!
+exts_list = [
+    ('setuptools', '1.1.1', {
+        'source_urls': ['http://pypi.python.org/packages/source/s/setuptools'],
+    }),
+    ('pip', '1.4.1', {
+        'source_urls': ['http://pypi.python.org/packages/source/p/pip/'],
+    }),
+    ('nose', '1.3.0', {
+        'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
+    }),
+    ('numpy', numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
+        'patches': ['numpy-1.7.1_distutils_multiple-lib-dirs.patch'],
+    }),
+    ('scipy', scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
+    }),
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..27461c4521d9b31df49b02b626e594f027a3a8c8
--- /dev/null
+++ b/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-5.3.0.eb
@@ -0,0 +1,49 @@
+name = 'Python'
+version = '3.3.2'
+
+homepage = 'http://python.org/'
+description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively."
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+numpyversion = '1.7.1'
+scipyversion = '0.12.0'
+
+source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
+sources = [SOURCE_TGZ]
+
+patches = ['python-3.3_libffi-include-xmmintrin.patch']
+
+# python needs bzip2 to build the bz2 package
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.8'),
+    ('libreadline', '6.2'),
+    ('ncurses', '5.9'),
+#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+]
+
+# order is important!
+exts_list = [
+    ('setuptools', '1.1.1', {
+        'source_urls': ['http://pypi.python.org/packages/source/s/setuptools'],
+    }),
+    ('pip', '1.4.1', {
+        'source_urls': ['http://pypi.python.org/packages/source/p/pip/'],
+    }),
+    ('nose', '1.3.0', {
+        'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
+    }),
+    ('numpy', numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
+        'patches': ['numpy-1.7.1_distutils_multiple-lib-dirs.patch'],
+    }),
+    ('scipy', scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
+    }),
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/numpy-1.8.0-mkl.patch b/easybuild/easyconfigs/p/Python/numpy-1.8.0-mkl.patch
new file mode 100644
index 0000000000000000000000000000000000000000..f2ffc7677b04a6cacd6c24f5ebb4934328d71e66
--- /dev/null
+++ b/easybuild/easyconfigs/p/Python/numpy-1.8.0-mkl.patch
@@ -0,0 +1,213 @@
+diff -ur numpy-1.8.0.orig/numpy/distutils/fcompiler/__init__.py numpy-1.8.0-2/numpy/distutils/fcompiler/__init__.py
+--- numpy-1.8.0.orig/numpy/distutils/fcompiler/__init__.py	2013-10-30 19:31:40.000000000 +0100
++++ numpy-1.8.0-2/numpy/distutils/fcompiler/__init__.py	2013-11-06 15:40:52.146711618 +0100
+@@ -628,7 +628,10 @@
+         return options
+ 
+     def library_option(self, lib):
+-        return "-l" + lib
++        if lib[0]=='-':
++            return lib
++        else:
++            return "-l" + lib
+     def library_dir_option(self, dir):
+         return "-L" + dir
+ 
+diff -ur numpy-1.8.0.orig/numpy/distutils/system_info.py numpy-1.8.0-2/numpy/distutils/system_info.py
+--- numpy-1.8.0.orig/numpy/distutils/system_info.py	2013-10-30 19:31:40.000000000 +0100
++++ numpy-1.8.0-2/numpy/distutils/system_info.py	2013-11-06 15:42:32.397199094 +0100
+@@ -600,7 +600,7 @@
+             if is_string(default):
+                 return [default]
+             return default
+-        return [b for b in [a.strip() for a in libs.split(',')] if b]
++        return [b for b in [a.strip().replace(':',',') for a in libs.split(',')] if b]
+ 
+     def get_libraries(self, key='libraries'):
+         return self.get_libs(key, '')
+@@ -642,6 +642,23 @@
+                      lib_dirs)
+         return info
+ 
++    def check_libs_all(self,lib_dir,libs,opt_libs =[]):
++        """If static or shared libraries are available then return
++        their info dictionary.
++
++        Checks for all libraries as shared libraries first, then
++        static (or vice versa if self.search_static_first is True).
++        """
++        exts = self.library_extensions()
++        info = None
++        for ext in exts:
++            info = self._check_libs_all(lib_dir,libs,opt_libs,[ext])
++            if info is not None:
++                break
++        if not info:
++            log.info('  libraries %s not found in %s', ','.join(libs), lib_dir)
++        return info
++
+     def check_libs2(self, lib_dirs, libs, opt_libs=[]):
+         """If static or shared libraries are available then return
+         their info dictionary.
+@@ -655,6 +672,18 @@
+                      lib_dirs)
+         return info
+ 
++    def check_libs2_all(self, lib_dirs, libs, opt_libs =[]):
++        """If static or shared libraries are available then return
++        their info dictionary.
++
++        Checks each library for shared or static.
++        """
++        exts = self.library_extensions()
++        info = self._check_libs_all(lib_dirs,libs,opt_libs,exts)
++        if not info:
++            log.info('  libraries %s not found in %s', ','.join(libs), os.pathsep.join(lib_dirs))
++        return info
++
+     def _lib_list(self, lib_dir, libs, exts):
+         assert is_string(lib_dir)
+         liblist = []
+@@ -665,6 +694,9 @@
+             lib_prefixes = ['lib']
+         # for each library name, see if we can find a file for it.
+         for l in libs:
++            if l[0]=='-':
++                liblist.append(l)
++                continue
+             for ext in exts:
+                 for prefix in lib_prefixes:
+                     p = self.combine_paths(lib_dir, prefix + l + ext)
+@@ -680,6 +712,19 @@
+                     break
+         return liblist
+ 
++    def _lib_list_all(self, lib_dirs, libs, exts):
++        assert (type(lib_dirs)==list)
++        if lib_dirs:
++           assert is_string(lib_dirs[0])
++        liblist=[]
++        for lib_dir in lib_dirs:
++           ls=self._lib_list(lib_dir,libs,exts)
++           for l in ls:
++               log.info("(_lib_list_all) Found %s in %s"%(l,lib_dir))
++               if l not in liblist:
++                   liblist.append(l)
++        return liblist
++
+     def _check_libs(self, lib_dirs, libs, opt_libs, exts):
+         """Find mandatory and optional libs in expected paths.
+ 
+@@ -721,6 +766,22 @@
+         else:
+             return None
+ 
++    def _check_libs_all(self, lib_dirs, libs, opt_libs, exts):
++        found_libs_unordered = self._lib_list_all(lib_dirs, libs, exts)
++        # ensure same order as in lib_dirs
++        found_libs = []
++        for lib_dir in libs:
++            if lib_dir in found_libs_unordered:
++                found_libs.append(lib_dir)
++        if len(found_libs) == len(libs):
++            info = {'libraries' : found_libs, 'library_dirs' : lib_dirs}
++            opt_found_libs = self._lib_list_all(lib_dirs, opt_libs, exts)
++            if len(opt_found_libs) == len(opt_libs):
++                info['libraries'].extend(opt_found_libs)
++            return info
++        else:
++            return
++
+     def combine_paths(self, *args):
+         """Return a list of existing paths composed by all combinations
+         of items from the arguments.
+@@ -956,9 +1017,11 @@
+         lib_dirs = self.get_lib_dirs()
+         incl_dirs = self.get_include_dirs()
+         mkl_libs = self.get_libs('mkl_libs', self._lib_mkl)
+-        info = self.check_libs2(lib_dirs, mkl_libs)
+-        if info is None:
++        mkl = None
++        mkl = self.check_libs2_all(lib_dirs,mkl_libs)
++        if mkl is None:
+             return
++        info = mkl
+         dict_append(info,
+                     define_macros=[('SCIPY_MKL_H', None)],
+                     include_dirs=incl_dirs)
+@@ -1020,16 +1083,13 @@
+         atlas = None
+         lapack = None
+         atlas_1 = None
+-        for d in lib_dirs:
+-            atlas = self.check_libs2(d, atlas_libs, [])
+-            lapack_atlas = self.check_libs2(d, ['lapack_atlas'], [])
+-            if atlas is not None:
+-                lib_dirs2 = [d] + self.combine_paths(d, ['atlas*', 'ATLAS*'])
+-                lapack = self.check_libs2(lib_dirs2, lapack_libs, [])
+-                if lapack is not None:
+-                    break
+-            if atlas:
+-                atlas_1 = atlas
++        atlas = self.check_libs2_all(lib_dirs, atlas_libs)
++        lapack_atlas = self.check_libs2_all(lib_dirs, ['lapack_atlas'])
++        if atlas is not None:
++            lib_dirs2 = lib_dirs + self.combine_paths(lib_dirs,['atlas*','ATLAS*'])
++            lapack = self.check_libs2_all(lib_dirs2, lapack_libs)
++        if atlas:
++            atlas_1 = atlas
+         log.info(self.__class__)
+         if atlas is None:
+             atlas = atlas_1
+@@ -1108,7 +1168,8 @@
+         info = {}
+         atlas_libs = self.get_libs('atlas_libs',
+                                    self._lib_names + self._lib_atlas)
+-        atlas = self.check_libs2(lib_dirs, atlas_libs, [])
++        atlas = None
++        atlas = self.check_libs2_all(lib_dirs, atlas_libs)
+         if atlas is None:
+             return
+         include_dirs = self.get_include_dirs()
+@@ -1156,8 +1217,10 @@
+         lib_dirs = self.get_lib_dirs()
+ 
+         lapack_libs = self.get_libs('lapack_libs', self._lib_names)
+-        info = self.check_libs(lib_dirs, lapack_libs, [])
+-        if info is None:
++        lapack = self.check_libs_all(lib_dirs, lapack_libs, [])
++        if lapack is not None:
++            info = lapack
++        else:
+             return
+         info['language'] = 'f77'
+         self.set_info(**info)
+@@ -1549,8 +1612,10 @@
+         lib_dirs = self.get_lib_dirs()
+ 
+         blas_libs = self.get_libs('blas_libs', self._lib_names)
+-        info = self.check_libs(lib_dirs, blas_libs, [])
+-        if info is None:
++        blas = self.check_libs_all(lib_dirs, blas_libs, [])
++        if blas is not None:
++            info = blas
++        else:
+             return
+         info['language'] = 'f77'  # XXX: is it generally true?
+         self.set_info(**info)
+diff -ur numpy-1.8.0.orig/numpy/distutils/unixccompiler.py numpy-1.8.0-2/numpy/distutils/unixccompiler.py
+--- numpy-1.8.0.orig/numpy/distutils/unixccompiler.py	2013-10-30 19:31:40.000000000 +0100
++++ numpy-1.8.0-2/numpy/distutils/unixccompiler.py	2013-11-06 15:38:08.942524314 +0100
+@@ -111,3 +111,12 @@
+ 
+ replace_method(UnixCCompiler, 'create_static_lib',
+                UnixCCompiler_create_static_lib)
++
++def UnixCCompiler_library_option(self, lib):
++    if lib[0]=='-':
++        return lib
++    else:
++        return "-l" + lib
++
++replace_method(UnixCCompiler, 'library_option',
++               UnixCCompiler_library_option)
diff --git a/easybuild/easyconfigs/p/Python/python-2.7_libffi-include-xmmintrin.patch b/easybuild/easyconfigs/p/Python/python-2.7_libffi-include-xmmintrin.patch
new file mode 100644
index 0000000000000000000000000000000000000000..6b03e80c469da6d563a0abebc72ad062657430bc
--- /dev/null
+++ b/easybuild/easyconfigs/p/Python/python-2.7_libffi-include-xmmintrin.patch
@@ -0,0 +1,11 @@
+diff -ru Modules/_ctypes/libffi/src/x86/ffi64.c libffi-3.0.13/src/x86/ffi64.c
+--- Modules.orig/_ctypes/libffi/src/x86/ffi64.c	2013-03-16 12:19:39.000000000 +0100
++++ Modules/_ctypes/libffi/src/x86/ffi64.c	2013-08-14 14:42:38.000000000 +0200
+@@ -39,6 +39,7 @@
+ #define MAX_SSE_REGS 8
+ 
+ #if defined(__INTEL_COMPILER)
++#include "xmmintrin.h"
+ #define UINT128 __m128
+ #else
+ #if defined(__SUNPRO_C)
diff --git a/easybuild/easyconfigs/p/Python/python-3.3_libffi-include-xmmintrin.patch b/easybuild/easyconfigs/p/Python/python-3.3_libffi-include-xmmintrin.patch
new file mode 100644
index 0000000000000000000000000000000000000000..79aaa325fc5f2ba449a5071e86483b06501b6214
--- /dev/null
+++ b/easybuild/easyconfigs/p/Python/python-3.3_libffi-include-xmmintrin.patch
@@ -0,0 +1,10 @@
+--- Python-3.3.2/Modules/_ctypes/libffi/src/x86/ffi64.c.orig	2014-02-15 13:40:51.000000000 +0100
++++ Python-3.3.2/Modules/_ctypes/libffi/src/x86/ffi64.c	2014-02-15 13:40:58.000000000 +0100
+@@ -39,6 +39,7 @@
+ #define MAX_SSE_REGS 8
+ 
+ #if defined(__INTEL_COMPILER)
++#include "xmmintrin.h"
+ #define UINT128 __m128
+ #else
+ #if defined(__SUNPRO_C)
diff --git a/easybuild/easyconfigs/p/packmol/packmol-13.234-ictce-4.1.13.eb b/easybuild/easyconfigs/p/packmol/packmol-13.234-ictce-4.1.13.eb
new file mode 100644
index 0000000000000000000000000000000000000000..839e36a38e236d6cef8790bce13b3d7c3e93675a
--- /dev/null
+++ b/easybuild/easyconfigs/p/packmol/packmol-13.234-ictce-4.1.13.eb
@@ -0,0 +1,23 @@
+easyblock = "MakeCp"
+
+name = 'packmol'
+version = '13.243'
+
+homepage = 'http://www.cmbi.ru.nl/molden/'
+description = "Packing Optimization for Molecular Dynamics Simulations"
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://packmol.googlecode.com/files']
+
+makeopts = 'FORTRAN="$F90"'
+
+files_to_copy = [(['packmol'],'bin'), 'COPYING', 'AUTHORS', 'LICENSE']
+
+sanity_check_paths={
+    'files': ['bin/packmol', 'COPYING', 'AUTHORS', 'LICENSE'],
+    'dirs': [],
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/p/pandas/pandas-0.11.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/p/pandas/pandas-0.11.0-goolf-1.4.10-Python-2.7.3.eb
index 4c33987f042326240016c97dd11d2053c61752c5..350eeb2738cd584055aef1e569146a057c7f0fb1 100644
--- a/easybuild/easyconfigs/p/pandas/pandas-0.11.0-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/p/pandas/pandas-0.11.0-goolf-1.4.10-Python-2.7.3.eb
@@ -9,7 +9,7 @@ and data analysis tools for the Python programming language."""
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-source_urls = ['http://pypi.python.org/packages/source/p/%(name)s/']
+source_urls = [PYPI_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 python = "Python"
diff --git a/easybuild/easyconfigs/p/pandas/pandas-0.11.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/p/pandas/pandas-0.11.0-ictce-4.1.13-Python-2.7.3.eb
index 1e3b66ee19dea9caf76137168ea8f98776eeeaa0..683efb783b0793dc130fb7ecd2d2edc73ec1cddf 100644
--- a/easybuild/easyconfigs/p/pandas/pandas-0.11.0-ictce-4.1.13-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/p/pandas/pandas-0.11.0-ictce-4.1.13-Python-2.7.3.eb
@@ -9,7 +9,7 @@ and data analysis tools for the Python programming language."""
 
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
-source_urls = ['http://pypi.python.org/packages/source/p/%(name)s/']
+source_urls = [PYPI_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 python = "Python"
diff --git a/easybuild/easyconfigs/p/pandas/pandas-0.11.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/p/pandas/pandas-0.11.0-ictce-5.3.0-Python-2.7.3.eb
index 37af8a2699d072c4e66dfdce234c0b0cab22ad37..9d8a5aeb674cc1cffd6002e4703eaffb1b06fdfa 100644
--- a/easybuild/easyconfigs/p/pandas/pandas-0.11.0-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/p/pandas/pandas-0.11.0-ictce-5.3.0-Python-2.7.3.eb
@@ -9,7 +9,7 @@ description = """pandas is an open source, BSD-licensed library providing high-p
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
-source_urls = ['http://pypi.python.org/packages/source/p/%(name)s/']
+source_urls = [PYPI_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 python = "Python"
diff --git a/easybuild/easyconfigs/p/pandas/pandas-0.12.0-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/p/pandas/pandas-0.12.0-ictce-5.5.0-Python-2.7.6.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b38ad74c90fbae0901313892c7a8c84ee64f2c46
--- /dev/null
+++ b/easybuild/easyconfigs/p/pandas/pandas-0.12.0-ictce-5.5.0-Python-2.7.6.eb
@@ -0,0 +1,31 @@
+easyblock = "PythonPackage"
+
+name = "pandas"
+version = "0.12.0"
+
+homepage = "http://pypi.python.org/pypi/pandas/"
+description = """pandas is an open source, BSD-licensed library providing high-performance, easy-to-use data structures
+ and data analysis tools for the Python programming language."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+python = "Python"
+pythonversion = "2.7.6"
+
+versionsuffix = "-%s-%s" % (python, pythonversion)
+
+dependencies = [(python, pythonversion)]
+
+py_short_ver = ".".join(pythonversion.split(".")[0:2])
+pylibdir = "lib/python%s/site-packages/%s" % (py_short_ver, name)
+
+sanity_check_paths = {
+    'files': [("%s-%%(version)s-py%s.egg" % (pylibdir, py_short_ver),
+               "%s-%%(version)s-py%s-linux-x86_64.egg" % (pylibdir, py_short_ver))],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/p/parallel/parallel-20130122-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/p/parallel/parallel-20130122-goalf-1.1.0-no-OFED.eb
index 26569c2f16731ca364d442ce6440045009b58632..d19fa1d165e11e3141f643406068ef32d42a1c67 100644
--- a/easybuild/easyconfigs/p/parallel/parallel-20130122-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/p/parallel/parallel-20130122-goalf-1.1.0-no-OFED.eb
@@ -17,7 +17,7 @@ homepage = 'http://savannah.gnu.org/projects/parallel/'
 description = """parallel: Build and execute shell commands in parallel"""
 
 sources = [SOURCE_TAR_BZ2]
-source_urls = ['http://ftp.gnu.org/gnu/parallel']
+source_urls = [GNU_SOURCE]
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
diff --git a/easybuild/easyconfigs/p/parallel/parallel-20130122-goolf-1.4.10.eb b/easybuild/easyconfigs/p/parallel/parallel-20130122-goolf-1.4.10.eb
index 85e087b41e6770ff80252c663e2ccd79e384e3ce..ec06e9c7ccc9dcba224a678174a81c16673aeb2b 100644
--- a/easybuild/easyconfigs/p/parallel/parallel-20130122-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/parallel/parallel-20130122-goolf-1.4.10.eb
@@ -17,7 +17,7 @@ homepage = 'http://savannah.gnu.org/projects/parallel/'
 description = """parallel: Build and execute shell commands in parallel"""
 
 sources = [SOURCE_TAR_BZ2]
-source_urls = ['http://ftp.gnu.org/gnu/parallel']
+source_urls = [GNU_SOURCE]
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
diff --git a/easybuild/easyconfigs/p/parallel/parallel-20130122-ictce-4.0.6.eb b/easybuild/easyconfigs/p/parallel/parallel-20130122-ictce-4.0.6.eb
index cf5a965b2d38bb37e9ca2f7544e0a6062b42690d..2a63fe61d3b38664efb9ad80295853ee2c99b011 100644
--- a/easybuild/easyconfigs/p/parallel/parallel-20130122-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/p/parallel/parallel-20130122-ictce-4.0.6.eb
@@ -17,7 +17,7 @@ homepage = 'http://savannah.gnu.org/projects/parallel/'
 description = """parallel: Build and execute shell commands in parallel"""
 
 sources = [SOURCE_TAR_BZ2]
-source_urls = ['http://ftp.gnu.org/gnu/parallel']
+source_urls = [GNU_SOURCE]
 
 toolchain = {'version': '4.0.6', 'name': 'ictce'}
 
diff --git a/easybuild/easyconfigs/p/parallel/parallel-20130122-ictce-5.3.0.eb b/easybuild/easyconfigs/p/parallel/parallel-20130122-ictce-5.3.0.eb
index 47bd8f12e9aad3e65eae1028ebc3d49024d0a539..8de6c2948530032a9f6377b9342fe175bf19da60 100644
--- a/easybuild/easyconfigs/p/parallel/parallel-20130122-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/p/parallel/parallel-20130122-ictce-5.3.0.eb
@@ -17,7 +17,7 @@ homepage = 'http://savannah.gnu.org/projects/parallel/'
 description = """parallel: Build and execute shell commands in parallel"""
 
 sources = [SOURCE_TAR_BZ2]
-source_urls = ['http://ftp.gnu.org/gnu/parallel']
+source_urls = [GNU_SOURCE]
 
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
diff --git a/easybuild/easyconfigs/p/patch/patch-2.7.1-goolf-1.4.10.eb b/easybuild/easyconfigs/p/patch/patch-2.7.1-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2bd4cf1e84d12f7a0f822a146e1fae154d5a1b19
--- /dev/null
+++ b/easybuild/easyconfigs/p/patch/patch-2.7.1-goolf-1.4.10.eb
@@ -0,0 +1,19 @@
+name = "patch"
+version = "2.7.1"
+
+homepage = 'http://www.gnu.org/software/coreutils/'
+description = """Patch takes a patch file containing a difference listing produced by the diff
+ program and applies those differences to one or more original files, producing patched versions."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+sanity_check_paths = {
+    'files': ["bin/patch"],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/patch/patch-2.7.1-ictce-5.3.0.eb b/easybuild/easyconfigs/p/patch/patch-2.7.1-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d40dfa96e15a9d1d3c330292d03645def6748663
--- /dev/null
+++ b/easybuild/easyconfigs/p/patch/patch-2.7.1-ictce-5.3.0.eb
@@ -0,0 +1,19 @@
+name = "patch"
+version = "2.7.1"
+
+homepage = 'http://www.gnu.org/software/coreutils/'
+description = """Patch takes a patch file containing a difference listing produced by the diff
+ program and applies those differences to one or more original files, producing patched versions."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+sanity_check_paths = {
+    'files': ["bin/patch"],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/phonopy/phonopy-1.6.4-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/p/phonopy/phonopy-1.6.4-ictce-5.3.0-Python-2.7.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c9d54a15dd18108e2af462283dc99c35f3b2391a
--- /dev/null
+++ b/easybuild/easyconfigs/p/phonopy/phonopy-1.6.4-ictce-5.3.0-Python-2.7.3.eb
@@ -0,0 +1,35 @@
+easyblock = "PythonPackage"
+
+name = 'phonopy'
+version = '1.6.4'
+
+homepage = 'http://phonopy.sourceforge.net/'
+description = """Phonopy is an open source package of phonon calculations based on the supercell approach."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+python = 'Python'
+pythonversion = '2.7.3'
+pythonshortversion = '.'.join(pythonversion.split('.')[:-1])
+
+versionsuffix = "-%s-%s" % (python, pythonversion)
+
+dependencies = [
+    (python, pythonversion),
+    ('matplotlib', '1.2.1', versionsuffix),
+    ('lxml', '3.1.2', versionsuffix),
+    ('PyYAML', '3.10', versionsuffix),
+]
+
+pylibdir = "lib/python%s/site-packages/%%(name)s" % pythonshortversion
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': [('%s-%%(version)s-py%s.egg' % (pylibdir, pythonshortversion), pylibdir)],
+}
+
+moduleclass = 'lib'
+
diff --git a/easybuild/easyconfigs/p/pixman/pixman-0.28.2-ictce-5.3.0.eb b/easybuild/easyconfigs/p/pixman/pixman-0.28.2-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f27088d0c87a793b99941dbf24eb089ea228877d
--- /dev/null
+++ b/easybuild/easyconfigs/p/pixman/pixman-0.28.2-ictce-5.3.0.eb
@@ -0,0 +1,18 @@
+name = "pixman"
+version = '0.28.2'
+
+homepage = 'http://www.pixman.org/'
+description = """Pixman is a low-level software library for pixel manipulation, providing features such as image
+compositing and trapezoid rasterization. Important users of pixman are the cairo graphics library and the X server."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = ['http://cairographics.org/releases/']
+sources = [SOURCE_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ['lib/libpixman-1.so'],
+    'dirs': []
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/p/printproto/printproto-1.0.5-ictce-5.3.0.eb b/easybuild/easyconfigs/p/printproto/printproto-1.0.5-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..bc10ad3e08e5352520300e911144c76d301bbd1b
--- /dev/null
+++ b/easybuild/easyconfigs/p/printproto/printproto-1.0.5-ictce-5.3.0.eb
@@ -0,0 +1,17 @@
+name = 'printproto'
+version = '1.0.5'
+
+homepage = 'http://xorg.freedesktop.org/'
+description = """X.org PrintProto protocol headers."""
+
+source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+sources = [SOURCELOWER_TAR_GZ]
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+sanity_check_paths = {
+    'files': ['include/X11/extensions/Print.h', 'include/X11/extensions/Printstr.h'],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/problog/problog-1.1-goolf-1.4.10.eb b/easybuild/easyconfigs/p/problog/problog-1.1-goolf-1.4.10.eb
index 98e5e870b99e542a20a978832163aa9096cb4556..7d7645d75c2c381af88a7ef1ee1ff61ea8449012 100644
--- a/easybuild/easyconfigs/p/problog/problog-1.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/problog/problog-1.1-goolf-1.4.10.eb
@@ -11,7 +11,7 @@ source_urls = [
     'http://www.cs.kuleuven.be/~theo/tools/',  # SimpleCUDD
 ]
 sources = [
-    '%(name)s-%(version)s.tgz',
+    SOURCE_TGZ,
     'SimpleCUDD.tar.gz',  # no version number?!
 ]
 
diff --git a/easybuild/easyconfigs/p/problog/problog-1.1-ictce-4.1.13.eb b/easybuild/easyconfigs/p/problog/problog-1.1-ictce-4.1.13.eb
index 3ad722d21e46111715c4575d0fd308a53f452652..ee27ea143c1b727325f12ca43af930081f082636 100644
--- a/easybuild/easyconfigs/p/problog/problog-1.1-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/p/problog/problog-1.1-ictce-4.1.13.eb
@@ -11,7 +11,7 @@ source_urls = [
     'http://www.cs.kuleuven.be/~theo/tools/',  # SimpleCUDD
 ]
 sources = [
-    '%(name)s-%(version)s.tgz',
+    SOURCE_TGZ,
     'SimpleCUDD.tar.gz',  # no version number?!
 ]
 
diff --git a/easybuild/easyconfigs/p/problog/problog-1.1-ictce-5.3.0.eb b/easybuild/easyconfigs/p/problog/problog-1.1-ictce-5.3.0.eb
index 9761353794c0df651b50c98c6fa1f9de5317a0af..bb29badc8bf5187cb451b45f7626c7bf3f03866a 100644
--- a/easybuild/easyconfigs/p/problog/problog-1.1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/p/problog/problog-1.1-ictce-5.3.0.eb
@@ -11,7 +11,7 @@ source_urls = [
     'http://www.cs.kuleuven.be/~theo/tools/',  # SimpleCUDD
 ]
 sources = [
-    '%(name)s-%(version)s.tgz',
+    SOURCE_TGZ,
     'SimpleCUDD.tar.gz',  # no version number?!
 ]
 
diff --git a/easybuild/easyconfigs/p/protobuf/protobuf-2.4.0a-goolf-1.4.10.eb b/easybuild/easyconfigs/p/protobuf/protobuf-2.4.0a-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7d1df26fcd5d8c6c77db182a11d5258f1ad85b72
--- /dev/null
+++ b/easybuild/easyconfigs/p/protobuf/protobuf-2.4.0a-goolf-1.4.10.eb
@@ -0,0 +1,17 @@
+name = 'protobuf'
+version = '2.4.0a'
+
+homepage = 'https://code.google.com/p/protobuf/'
+description = """Google Protocol Buffers"""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [GOOGLECODE_SOURCE]
+
+sanity_check_paths = {
+    'files': ['bin/protoc'],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/protobuf/protobuf-2.5.0-goolf-1.4.10.eb b/easybuild/easyconfigs/p/protobuf/protobuf-2.5.0-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f6ab1b5fd2fb34ee0b768fa37e06d21535ad1c70
--- /dev/null
+++ b/easybuild/easyconfigs/p/protobuf/protobuf-2.5.0-goolf-1.4.10.eb
@@ -0,0 +1,17 @@
+name = 'protobuf'
+version = '2.5.0'
+
+homepage = 'https://code.google.com/p/protobuf/'
+description = """Google Protocol Buffers"""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [GOOGLECODE_SOURCE]
+
+sanity_check_paths = {
+    'files': ['bin/protoc'],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/pyTables/pyTables-2.4.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/p/pyTables/pyTables-2.4.0-ictce-4.1.13-Python-2.7.3.eb
index 4dcd85eb02ca5ff027c3758dc6576371e467882c..c5aa1dcd66798f5be200ada97bde0201a21a01a6 100644
--- a/easybuild/easyconfigs/p/pyTables/pyTables-2.4.0-ictce-4.1.13-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/p/pyTables/pyTables-2.4.0-ictce-4.1.13-Python-2.7.3.eb
@@ -15,8 +15,8 @@ description = """PyTables is a package for managing hierarchical datasets and de
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 toolchainopts = {'usempi': True}
 
-source_urls = [('http://sourceforge.net/projects/pytables/files/pytables/%s' % version, 'download')]
-sources = ['tables-%s.tar.gz' % version]
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['tables-%(version)s.tar.gz']
 
 python = 'Python'
 pythonver = '2.7.3'
diff --git a/easybuild/easyconfigs/p/pyTables/pyTables-3.0.0-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/p/pyTables/pyTables-3.0.0-ictce-5.5.0-Python-2.7.6.eb
new file mode 100644
index 0000000000000000000000000000000000000000..929534794765b79fb7ade3f3fab468b6af23d5e6
--- /dev/null
+++ b/easybuild/easyconfigs/p/pyTables/pyTables-3.0.0-ictce-5.5.0-Python-2.7.6.eb
@@ -0,0 +1,40 @@
+easyblock = "PythonPackage"
+
+name = 'pyTables'
+version = '3.0.0'
+
+homepage = 'http://www.pytables.org/moin'
+description = """PyTables is a package for managing hierarchical datasets and designed to efficiently and easily cope
+ with extremely large amounts of data. PyTables is built on top of the HDF5 library, using the Python language and the
+ NumPy package. It features an object-oriented interface that, combined with C extensions for the performance-critical
+ parts of the code (generated using Cython), makes it a fast, yet extremely easy to use tool for interactively browse,
+ process and search very large amounts of data. One important feature of PyTables is that it optimizes memory and disk
+ resources so that data takes much less space (specially if on-flight compression is used) than other solutions such as
+ relational or object oriented databases."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'usempi': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['tables-%(version)s.tar.gz']
+
+python = 'Python'
+pythonver = '2.7.6'
+pythonshortver = '.'.join(pythonver.split('.')[0:2])
+versionsuffix = '-%s-%s' % (python, pythonver)
+
+dependencies = [
+    (python, pythonver),
+    ('numexpr', '2.2.2', versionsuffix),
+    ('HDF5', '1.8.12'),
+    ('Cython', '0.19.2', versionsuffix),
+]
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in ['pt2to3', 'ptdump', 'ptrepack']],
+    'dirs': ['lib/python%s/site-packages/tables' % pythonshortver],
+}
+
+options = {'modulename': 'tables'}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/p/pysqlite/pysqlite-2.6.3-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/p/pysqlite/pysqlite-2.6.3-goolf-1.4.10-Python-2.7.3.eb
index 92edc2ef94a14c369958e20f35d0dfb5208d67bb..cc1722a2053387d126c8c2e5eeae00015fcb048a 100644
--- a/easybuild/easyconfigs/p/pysqlite/pysqlite-2.6.3-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/p/pysqlite/pysqlite-2.6.3-goolf-1.4.10-Python-2.7.3.eb
@@ -9,7 +9,7 @@ description = """pysqlite is an interface to the SQLite 3.x embedded relational
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-source_urls = ['https://pypi.python.org/packages/source/p/pysqlite/']
+source_urls = [PYPI_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 python = 'Python'
diff --git a/easybuild/easyconfigs/p/pysqlite/pysqlite-2.6.3-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/p/pysqlite/pysqlite-2.6.3-ictce-5.3.0-Python-2.7.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0f28dccf307f84a5f8e15ad6a434811d27c23561
--- /dev/null
+++ b/easybuild/easyconfigs/p/pysqlite/pysqlite-2.6.3-ictce-5.3.0-Python-2.7.3.eb
@@ -0,0 +1,32 @@
+easyblock = "PythonPackage"
+
+name = 'pysqlite'
+version = '2.6.3'
+
+homepage = 'https://pypi.python.org/pypi/pysqlite'
+description = """pysqlite is an interface to the SQLite 3.x embedded relational database engine.
+ It is almost fully compliant with the Python database API version 2.0 also exposes the unique features of SQLite."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+python = 'Python'
+pyver = '2.7.3'
+pyshortver = '2.7'
+versionsuffix = '-%s-%s' % (python, pyver)
+
+dependencies = [
+    (python, pyver),
+    ('SQLite', '3.8.1'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%s/site-packages/%%(name)s%%(version_major)s' % pyshortver],
+}
+
+options = {'modulename': '%(name)s%(version_major)s'}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/p/python-dateutil/python-dateutil-2.1-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/p/python-dateutil/python-dateutil-2.1-goolf-1.4.10-Python-2.7.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b51abe00cdfd4feae2fd5385867d40f4a751ee12
--- /dev/null
+++ b/easybuild/easyconfigs/p/python-dateutil/python-dateutil-2.1-goolf-1.4.10-Python-2.7.3.eb
@@ -0,0 +1,31 @@
+easyblock = "PythonPackage"
+
+name = "python-dateutil"
+version = "2.1"
+
+homepage = "https://pypi.python.org/pypi/python-dateutil"
+description = """The dateutil module provides powerful extensions to the datetime module available in the Python standard library."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = [PYPI_LOWER_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+python = "Python"
+pythonversion = "2.7.3"
+
+versionsuffix = "-%s-%s" % (python, pythonversion)
+
+dependencies = [(python, pythonversion)]
+
+py_short_ver = ".".join(pythonversion.split(".")[0:2])
+pylibdir = "lib/python%s/site-packages/python_dateutil" % py_short_ver
+
+sanity_check_paths = {
+    'files': ["%s-%%(version)s-py%s.egg" % (pylibdir, py_short_ver)],
+    'dirs': []
+}
+
+options = {'modulename': 'dateutil'}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/p/python-dateutil/python-dateutil-2.1-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/p/python-dateutil/python-dateutil-2.1-ictce-4.1.13-Python-2.7.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..66b4d0b80c33ffd979620d92bfa46ba2c5ade36e
--- /dev/null
+++ b/easybuild/easyconfigs/p/python-dateutil/python-dateutil-2.1-ictce-4.1.13-Python-2.7.3.eb
@@ -0,0 +1,31 @@
+easyblock = "PythonPackage"
+
+name = "python-dateutil"
+version = "2.1"
+
+homepage = "https://pypi.python.org/pypi/python-dateutil"
+description = """The dateutil module provides powerful extensions to the datetime module available in the Python standard library."""
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+
+source_urls = [PYPI_LOWER_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+python = "Python"
+pythonversion = "2.7.3"
+
+versionsuffix = "-%s-%s" % (python, pythonversion)
+
+dependencies = [(python, pythonversion)]
+
+py_short_ver = ".".join(pythonversion.split(".")[0:2])
+pylibdir = "lib/python%s/site-packages/python_dateutil" % py_short_ver
+
+sanity_check_paths = {
+    'files': ["%s-%%(version)s-py%s.egg" % (pylibdir, py_short_ver)],
+    'dirs': []
+}
+
+options = {'modulename': 'dateutil'}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/p/python-meep/python-meep-1.4.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/p/python-meep/python-meep-1.4.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index 4a10173f4d7b46af1dd285834952279fb49c3ae7..2643e2c09c934b3913b5ff863bba2605323d471c 100644
--- a/easybuild/easyconfigs/p/python-meep/python-meep-1.4.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/p/python-meep/python-meep-1.4.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -8,7 +8,7 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True, 'usempi': True}
 
 source_urls = ["https://launchpad.net/python-meep/1.4/1.4/+download/"]
-sources = ['%s-%s.tar' % (name.lower(), version)]
+sources = [SOURCELOWER_TAR]
 
 patches = [
            'MPI_destructor_1.3.patch'
diff --git a/easybuild/easyconfigs/p/python-meep/python-meep-1.4.2-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/p/python-meep/python-meep-1.4.2-goolf-1.4.10-Python-2.7.3.eb
index e3438c674fc258494ff4a8797ff2762c08b57a6d..67aaeea480fcd9d91be129f3f7ba7486c3f3609a 100644
--- a/easybuild/easyconfigs/p/python-meep/python-meep-1.4.2-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/p/python-meep/python-meep-1.4.2-goolf-1.4.10-Python-2.7.3.eb
@@ -8,7 +8,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True, 'usempi': True}
 
 source_urls = ["https://launchpad.net/python-meep/1.4/1.4/+download/"]
-sources = ['%s-%s.tar' % (name.lower(), version)]
+sources = [SOURCELOWER_TAR]
 
 patches = [
            'MPI_destructor_1.3.patch'
diff --git a/easybuild/easyconfigs/p/python-meep/python-meep-1.4.2-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/p/python-meep/python-meep-1.4.2-ictce-4.0.6-Python-2.7.3.eb
index d4a1091638f9f4145a0669138f250a1bc042c6bf..dccd4207fd04e8b69dff1912ea3250ad384786ee 100644
--- a/easybuild/easyconfigs/p/python-meep/python-meep-1.4.2-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/p/python-meep/python-meep-1.4.2-ictce-4.0.6-Python-2.7.3.eb
@@ -8,7 +8,7 @@ toolchain = {'name': 'ictce', 'version': '4.0.6'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True, 'usempi': True}
 
 source_urls = ["https://launchpad.net/python-meep/1.4/1.4/+download/"]
-sources = ['%s-%s.tar' % (name.lower(), version)]
+sources = [SOURCELOWER_TAR]
 
 patches = [
            'MPI_destructor_1.3.patch'
diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goalf-1.1.0-no-OFED.eb
new file mode 100644
index 0000000000000000000000000000000000000000..feb10d4a75d6bb0dda9c1a6efdb1c0ca87c60835
--- /dev/null
+++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goalf-1.1.0-no-OFED.eb
@@ -0,0 +1,17 @@
+name = 'Qt'
+version = '4.8.4'
+
+homepage = 'http://qt-project.org/'
+description = "Qt is a comprehensive cross-platform C++ application framework."
+
+toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
+
+source_urls = [
+    'http://origin.releases.qt-project.org/qt4/source/',
+    'http://master.qt-project.org/archive/qt/%(version_major_minor)s/%(version)s/'
+]
+sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz']
+
+dependencies = [('GLib', '2.34.3')]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-gompi-1.4.12-no-OFED.eb
index 76d6056244cc6bc4b0d9b17d719eba941f3b0bf0..e8472dac116c8b9a467210f1980b37d0f16f03c5 100644
--- a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-gompi-1.4.12-no-OFED.eb
+++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-gompi-1.4.12-no-OFED.eb
@@ -6,7 +6,10 @@ description = "Qt is a comprehensive cross-platform C++ application framework."
 
 toolchain = {'name': 'gompi', 'version': '1.4.12-no-OFED'}
 
-source_urls = ['http://origin.releases.qt-project.org/qt4/source/']
+source_urls = [
+    'http://origin.releases.qt-project.org/qt4/source/',
+    'http://master.qt-project.org/archive/qt/%(version_major_minor)s/%(version)s/'
+]
 sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz']
 
 dependencies = [('GLib', '2.34.3')]
diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goolf-1.4.10.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goolf-1.4.10.eb
index 645d28151d672120bef27437833bc4f6a8c1e4d8..c489c5aa682dc189801d00ca78badd7605f47344 100644
--- a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goolf-1.4.10.eb
@@ -6,7 +6,10 @@ description = "Qt is a comprehensive cross-platform C++ application framework."
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-source_urls = ['http://origin.releases.qt-project.org/qt4/source/']
+source_urls = [
+    'http://origin.releases.qt-project.org/qt4/source/',
+    'http://master.qt-project.org/archive/qt/%(version_major_minor)s/%(version)s/'
+]
 sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz']
 
 dependencies = [('GLib', '2.34.3')]
diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.0.6.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.0.6.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4a7a10534b010eb44940b5c9b222ccc771571d71
--- /dev/null
+++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.0.6.eb
@@ -0,0 +1,21 @@
+name = 'Qt'
+version = '4.8.4'
+
+homepage = 'http://qt-project.org/'
+description = "Qt is a comprehensive cross-platform C++ application framework."
+
+toolchain = {'name': 'ictce', 'version': '4.0.6'}
+toolchainopts = {'lowopt': True}  # use -O1
+
+source_urls = [
+    'http://origin.releases.qt-project.org/qt4/source/',
+    'http://master.qt-project.org/archive/qt/%(version_major_minor)s/%(version)s/'
+]
+sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz']
+
+# enforce use of -O1, required because of compiler bug that triggers 'internal error: 0_381'
+patches = ['Qt-4.8.4_ictce-O1.patch']
+
+dependencies = [('GLib', '2.34.3')]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.1.13.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.1.13.eb
index 3f8dd7b9f5c028b057382a2d921cf2c4a297b3cf..a411477c0b4a84ffa9789a5b47ee2c5ea1822563 100644
--- a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.1.13.eb
@@ -6,7 +6,10 @@ description = "Qt is a comprehensive cross-platform C++ application framework."
 
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
-source_urls = ['http://origin.releases.qt-project.org/qt4/source/']
+source_urls = [
+    'http://origin.releases.qt-project.org/qt4/source/',
+    'http://master.qt-project.org/archive/qt/%(version_major_minor)s/%(version)s/'
+]
 sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz']
 
 dependencies = [('GLib', '2.34.3')]
diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-5.3.0.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3c0ae0a9af0e5c4e53a5345aa2721d80a94d6b7c
--- /dev/null
+++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-5.3.0.eb
@@ -0,0 +1,17 @@
+name = 'Qt'
+version = '4.8.4'
+
+homepage = 'http://qt-project.org/'
+description = "Qt is a comprehensive cross-platform C++ application framework."
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = [
+    'http://origin.releases.qt-project.org/qt4/source/',
+    'http://master.qt-project.org/archive/qt/%(version_major_minor)s/%(version)s/'
+]
+sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz']
+
+dependencies = [('GLib', '2.34.3')]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.4_ictce-O1.patch b/easybuild/easyconfigs/q/Qt/Qt-4.8.4_ictce-O1.patch
new file mode 100644
index 0000000000000000000000000000000000000000..26a7811ae9c22fa04507139621a64501eb06e241
--- /dev/null
+++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.4_ictce-O1.patch
@@ -0,0 +1,11 @@
+--- qt-everywhere-opensource-src-4.8.4/mkspecs/linux-icc/qmake.conf.orig	2013-12-23 14:54:00.272609496 +0100
++++ qt-everywhere-opensource-src-4.8.4/mkspecs/linux-icc/qmake.conf	2013-12-23 14:54:09.392773091 +0100
+@@ -25,7 +25,7 @@
+ QMAKE_CFLAGS_DEPS	= -M
+ QMAKE_CFLAGS_WARN_ON	= -w1 -Wcheck -wd654,1572,411,873,1125,2259
+ QMAKE_CFLAGS_WARN_OFF	= -w
+-QMAKE_CFLAGS_RELEASE	= -O2 -falign-functions=16 -ansi-alias -fstrict-aliasing
++QMAKE_CFLAGS_RELEASE	= -O1 -falign-functions=16 -ansi-alias -fstrict-aliasing
+ QMAKE_CFLAGS_DEBUG	= -O0 -g
+ QMAKE_CFLAGS_SHLIB	= -fPIC -fno-jump-tables
+ QMAKE_CFLAGS_STATIC_LIB	= $$QMAKE_CFLAGS_SHLIB
diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.5-gmpolf-1.4.8.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.5-gmpolf-1.4.8.eb
index faddb7d77e2c32c35f5ca443b934780f9338ace3..9e49fd8ca844e6b0c17b9eaac242a7f599f9ec21 100644
--- a/easybuild/easyconfigs/q/Qt/Qt-4.8.5-gmpolf-1.4.8.eb
+++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.5-gmpolf-1.4.8.eb
@@ -5,7 +5,10 @@ homepage = 'http://qt-project.org/'
 description = "Qt is a comprehensive cross-platform C++ application framework."
 toolchain = {'name': 'gmpolf', 'version': '1.4.8'} 
 
-source_urls = ['http://download.qt-project.org/official_releases/qt/4.8/4.8.5/']
+source_urls = [
+    'http://origin.releases.qt-project.org/qt4/source/',
+    'http://master.qt-project.org/archive/qt/%(version_major_minor)s/%(version)s/'
+]
 sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz']
 
 dependencies = [('GLib', '2.34.3')]
diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.5-ictce-4.1.13.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.5-ictce-4.1.13.eb
new file mode 100755
index 0000000000000000000000000000000000000000..312d6b1990967b49de842fb1ab05f316e7b8cd8f
--- /dev/null
+++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.5-ictce-4.1.13.eb
@@ -0,0 +1,19 @@
+name = 'Qt'
+version = '4.8.5'
+
+homepage = 'http://qt-project.org/'
+description = "Qt is a comprehensive cross-platform C++ application framework."
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+
+source_urls = [
+    'http://origin.releases.qt-project.org/qt4/source/',
+    'http://master.qt-project.org/archive/qt/%(version_major_minor)s/%(version)s/'
+]
+sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz']
+
+patches = ['Qt-4.8.5_ictce-qUnused.patch']
+
+dependencies = [('GLib', '2.34.3')]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.5_ictce-qUnused.patch b/easybuild/easyconfigs/q/Qt/Qt-4.8.5_ictce-qUnused.patch
new file mode 100644
index 0000000000000000000000000000000000000000..e881808fd22bb1066056764589ee4f43ac599042
--- /dev/null
+++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.5_ictce-qUnused.patch
@@ -0,0 +1,15 @@
+see https://qt.gitorious.net/qt/qtbase/commit/d3951a5b0f4fe9731d1512668b43f51bd98bd84e
+and http://lists.qt-project.org/pipermail/interest/2013-September/008591.html
+diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
+index 7d91fa3..cc0e6a1 100644
+--- a/src/corelib/global/qglobal.h
++++ b/src/corelib/global/qglobal.h
+@@ -820,7 +820,7 @@ Q_CORE_EXPORT bool qSharedBuild();
+    Avoid "unused parameter" warnings
+ */
+ 
+-#if defined(Q_CC_INTEL) && !defined(Q_OS_WIN) || defined(Q_CC_RVCT)
++#if defined(Q_CC_RVCT)
+ template <typename T>
+ inline void qUnused(T &x) { (void)x; }
+ #  define Q_UNUSED(x) qUnused(x);
diff --git a/easybuild/easyconfigs/q/QuadProg++/QuadProg++-1.2.1-goolf-1.4.10.eb b/easybuild/easyconfigs/q/QuadProg++/QuadProg++-1.2.1-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..dc4855b885d327b5542b3d752ff33f535721c010
--- /dev/null
+++ b/easybuild/easyconfigs/q/QuadProg++/QuadProg++-1.2.1-goolf-1.4.10.eb
@@ -0,0 +1,23 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+name = 'QuadProg++'
+version = '1.2.1'
+
+homepage = 'http://sourceforge.net/projects/quadprog/'
+description = """ A C++ library for Quadratic Programming which implements the 
+ Goldfarb-Idnani active-set dual method. At present it is limited to the solution 
+ of strictly convex quadratic programs. """
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+sources = ['%s-%s.tar.gz' % (name.lower().rstrip('++'), version)]
+source_urls = ['http://downloads.sourceforge.net/project/quadprog/']
+
+dependencies = [('Boost', '1.53.0')]
+
+configopts = ' --with-boost=$EBROOTBOOST'
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/q/QuadProg++/QuadProg++-1.2.1-ictce-6.2.5.eb b/easybuild/easyconfigs/q/QuadProg++/QuadProg++-1.2.1-ictce-6.2.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1349b54e0910f9e39e9a2bd7aa407d16a161aee3
--- /dev/null
+++ b/easybuild/easyconfigs/q/QuadProg++/QuadProg++-1.2.1-ictce-6.2.5.eb
@@ -0,0 +1,23 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+name = 'QuadProg++'
+version = '1.2.1'
+
+homepage = 'http://sourceforge.net/projects/quadprog/'
+description = """ A C++ library for Quadratic Programming which implements the 
+ Goldfarb-Idnani active-set dual method. At present it is limited to the solution 
+ of strictly convex quadratic programs. """
+
+toolchain = {'name': 'ictce', 'version': '6.2.5'}
+
+sources = ['%s-%s.tar.gz' % (name.lower().rstrip('++'), version)]
+source_urls = ['http://downloads.sourceforge.net/project/quadprog/']
+
+dependencies = [('Boost', '1.53.0')]
+
+configopts = ' --with-boost=$EBROOTBOOST'
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goalf-1.1.0-no-OFED-hybrid.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goalf-1.1.0-no-OFED-hybrid.eb
index afa5eaf4f0f147df01e138ee79a23c4afe0b837d..c7c70b133ce52fc4c75f3319b68c116987748a07 100644
--- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goalf-1.1.0-no-OFED-hybrid.eb
+++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goalf-1.1.0-no-OFED-hybrid.eb
@@ -9,28 +9,28 @@ description = """Quantum ESPRESSO  is an integrated suite of computer codes
   (both norm-conserving and ultrasoft)."""
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
-toolchainopts = {'usempi': True}
+toolchainopts = {'usempi': True, 'openmp': True}
 
 sources = [
-           'espresso-%s.tar.gz' % version,
-           'wannier90-1.2.tar.gz',
-           'want-2.3.0.tar.gz',
-           'yambo-3.2.1-r.448.tar.gz',
-          ]
+    'espresso-%(version)s.tar.gz',
+    'wannier90-1.2.tar.gz',
+    'want-2.3.0.tar.gz',
+    'yambo-3.2.1-r.448.tar.gz',
+]
 source_urls = [
-               'http://www.qe-forge.org/gf/download/frsrelease/64/96/',  # espresso-4.2.tar.gz
-               'http://www.qe-forge.org/gf/download/frsrelease/64/97/',  # wannier90-1.2.tar.gz
-               'http://files.qe-forge.org/index.php?file=',  # want-2.3.0.tar.gz
-               'http://www.qe-forge.org/gf/download/frsrelease/64/98/',  # yambo-3.2.1-r.448.tar.gz
-              ]
+    'http://www.qe-forge.org/gf/download/frsrelease/64/96/',  # espresso-4.2.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/64/97/',  # wannier90-1.2.tar.gz
+    'http://files.qe-forge.org/index.php?file=',  # want-2.3.0.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/64/98/',  # yambo-3.2.1-r.448.tar.gz
+]
 
 patches = [
-           'QuantumESPRESSO-4.2_fix-errors.patch', 
-           'QuantumESPRESSO-4.2_fix-makefile-for-plugins.patch',
-           'want-2.3.0_fix-memstat-issue.patch',
-           'yambo-3.2.1_fix-objects-files.patch',
-           'yambo_fix-configure-LDFLAGS.patch',
-          ]
+    'QuantumESPRESSO-%(version)s_fix-errors.patch',
+    'QuantumESPRESSO-%(version)s_fix-makefile-for-plugins.patch',
+    'want-2.3.0_fix-memstat-issue.patch',
+    'yambo-3.2.1_fix-objects-files.patch',
+    'yambo_fix-configure-LDFLAGS.patch',
+]
 
 makeopts = 'all gipaw vdw w90 want gww xspectra yambo'
 
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goalf-1.1.0-no-OFED.eb
index e5ec5f6d62d1e07f2487eda9848e3b4f3ed9dc43..632b84416c46ac8d2884835ccab12a494c3b32cc 100644
--- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goalf-1.1.0-no-OFED.eb
@@ -11,25 +11,25 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 toolchainopts = {'usempi': True}
 
 sources = [
-           'espresso-%s.tar.gz' % version,
-           'wannier90-1.2.tar.gz',
-           'want-2.3.0.tar.gz',
-           'yambo-3.2.1-r.448.tar.gz',
-          ]
+    'espresso-%(version)s.tar.gz',
+    'wannier90-1.2.tar.gz',
+    'want-2.3.0.tar.gz',
+    'yambo-3.2.1-r.448.tar.gz',
+]
 source_urls = [
-               'http://www.qe-forge.org/gf/download/frsrelease/64/96/',  # espresso-4.2.tar.gz
-               'http://www.qe-forge.org/gf/download/frsrelease/64/97/',  # wannier90-1.2.tar.gz
-               'http://files.qe-forge.org/index.php?file=',  # want-2.3.0.tar.gz
-               'http://www.qe-forge.org/gf/download/frsrelease/64/98/',  # yambo-3.2.1-r.448.tar.gz
-              ]
+    'http://www.qe-forge.org/gf/download/frsrelease/64/96/',  # espresso-4.2.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/64/97/',  # wannier90-1.2.tar.gz
+    'http://files.qe-forge.org/index.php?file=',  # want-2.3.0.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/64/98/',  # yambo-3.2.1-r.448.tar.gz
+]
 
 patches = [
-           'QuantumESPRESSO-4.2_fix-errors.patch',
-           'QuantumESPRESSO-4.2_fix-makefile-for-plugins.patch',
-           'want-2.3.0_fix-memstat-issue.patch',
-           'yambo-3.2.1_fix-objects-files.patch',
-           'yambo_fix-configure-LDFLAGS.patch',
-          ]
+    'QuantumESPRESSO-%(version)s_fix-errors.patch',
+    'QuantumESPRESSO-%(version)s_fix-makefile-for-plugins.patch',
+    'want-2.3.0_fix-memstat-issue.patch',
+    'yambo-3.2.1_fix-objects-files.patch',
+    'yambo_fix-configure-LDFLAGS.patch',
+]
 
 makeopts = 'all gipaw vdw w90 want gww xspectra yambo'
 
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goolf-1.4.10-hybrid.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goolf-1.4.10-hybrid.eb
index 4da00620d4957b874708cdf71114bced71c7bedf..106b9ec5dcf309150921cbb10daf7ec172adfcf7 100644
--- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goolf-1.4.10-hybrid.eb
+++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goolf-1.4.10-hybrid.eb
@@ -9,28 +9,28 @@ It is based on density-functional theory, plane waves, and pseudopotentials
 (both norm-conserving and ultrasoft)."""
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
-toolchainopts = {'usempi': True}
+toolchainopts = {'usempi': True, 'openmp': True}
 
 sources = [
-           'espresso-%s.tar.gz' % version,
-           'wannier90-1.2.tar.gz',
-           'want-2.3.0.tar.gz',
-           'yambo-3.2.1-r.448.tar.gz',
-          ]
+    'espresso-%(version)s.tar.gz',
+    'wannier90-1.2.tar.gz',
+    'want-2.3.0.tar.gz',
+    'yambo-3.2.1-r.448.tar.gz',
+]
 source_urls = [
-               'http://www.qe-forge.org/gf/download/frsrelease/64/96/',  # espresso-4.2.tar.gz
-               'http://www.qe-forge.org/gf/download/frsrelease/64/97/',  # wannier90-1.2.tar.gz
-               'http://files.qe-forge.org/index.php?file=',  # want-2.3.0.tar.gz
-               'http://www.qe-forge.org/gf/download/frsrelease/64/98/',  # yambo-3.2.1-r.448.tar.gz
-              ]
+    'http://www.qe-forge.org/gf/download/frsrelease/64/96/',  # espresso-4.2.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/64/97/',  # wannier90-1.2.tar.gz
+    'http://files.qe-forge.org/index.php?file=',  # want-2.3.0.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/64/98/',  # yambo-3.2.1-r.448.tar.gz
+]
 
 patches = [
-           'QuantumESPRESSO-4.2_fix-errors.patch', 
-           'QuantumESPRESSO-4.2_fix-makefile-for-plugins.patch',
-           'want-2.3.0_fix-memstat-issue.patch',
-           'yambo-3.2.1_fix-objects-files.patch',
-           'yambo_fix-configure-LDFLAGS.patch',
-          ]
+    'QuantumESPRESSO-%(version)s_fix-errors.patch',
+    'QuantumESPRESSO-%(version)s_fix-makefile-for-plugins.patch',
+    'want-2.3.0_fix-memstat-issue.patch',
+    'yambo-3.2.1_fix-objects-files.patch',
+    'yambo_fix-configure-LDFLAGS.patch',
+]
 
 makeopts = 'all gipaw vdw w90 want gww xspectra yambo'
 
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goolf-1.4.10.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goolf-1.4.10.eb
index 48256367ad67b55635bf26b9edc59d3b80faadb3..fd96509a3d9e32166b0533f0af06c68a22e838e3 100644
--- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goolf-1.4.10.eb
@@ -11,25 +11,25 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'usempi': True}
 
 sources = [
-           'espresso-%s.tar.gz' % version,
-           'wannier90-1.2.tar.gz',
-           'want-2.3.0.tar.gz',
-           'yambo-3.2.1-r.448.tar.gz',
-          ]
+    'espresso-%(version)s.tar.gz',
+    'wannier90-1.2.tar.gz',
+    'want-2.3.0.tar.gz',
+    'yambo-3.2.1-r.448.tar.gz',
+]
 source_urls = [
-               'http://www.qe-forge.org/gf/download/frsrelease/64/96/',  # espresso-4.2.tar.gz
-               'http://www.qe-forge.org/gf/download/frsrelease/64/97/',  # wannier90-1.2.tar.gz
-               'http://files.qe-forge.org/index.php?file=',  # want-2.3.0.tar.gz
-               'http://www.qe-forge.org/gf/download/frsrelease/64/98/',  # yambo-3.2.1-r.448.tar.gz
-              ]
+    'http://www.qe-forge.org/gf/download/frsrelease/64/96/',  # espresso-4.2.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/64/97/',  # wannier90-1.2.tar.gz
+    'http://files.qe-forge.org/index.php?file=',  # want-2.3.0.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/64/98/',  # yambo-3.2.1-r.448.tar.gz
+]
 
 patches = [
-           'QuantumESPRESSO-4.2_fix-errors.patch',
-           'QuantumESPRESSO-4.2_fix-makefile-for-plugins.patch',
-           'want-2.3.0_fix-memstat-issue.patch',
-           'yambo-3.2.1_fix-objects-files.patch',
-           'yambo_fix-configure-LDFLAGS.patch',
-          ]
+    'QuantumESPRESSO-%(version)s_fix-errors.patch',
+    'QuantumESPRESSO-%(version)s_fix-makefile-for-plugins.patch',
+    'want-2.3.0_fix-memstat-issue.patch',
+    'yambo-3.2.1_fix-objects-files.patch',
+    'yambo_fix-configure-LDFLAGS.patch',
+]
 
 makeopts = 'all gipaw vdw w90 want gww xspectra yambo'
 
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-4.0.6-hybrid.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-4.0.6-hybrid.eb
index d4e4a7714850cb319addbe8aadc54e684922eeb3..ff1ccd416c789efec39a1e705bf4f438ee38c793 100644
--- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-4.0.6-hybrid.eb
+++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-4.0.6-hybrid.eb
@@ -9,26 +9,26 @@ description = """Quantum ESPRESSO  is an integrated suite of computer codes
   (both norm-conserving and ultrasoft)."""
 
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
-toolchainopts = {'usempi': True}
+toolchainopts = {'usempi': True, 'openmp': True}
 
 sources = [
-           'espresso-%s.tar.gz' % version,
-           'wannier90-1.2.tar.gz',
-           'want-2.3.0.tar.gz',
-           'yambo-3.2.1-r.448.tar.gz',
-          ]
+    'espresso-%(version)s.tar.gz',
+    'wannier90-1.2.tar.gz',
+    'want-2.3.0.tar.gz',
+    'yambo-3.2.1-r.448.tar.gz',
+]
 source_urls = [
-               'http://www.qe-forge.org/gf/download/frsrelease/64/96/',  # espresso-4.2.tar.gz
-               'http://www.qe-forge.org/gf/download/frsrelease/64/97/',  # wannier90-1.2.tar.gz
-               'http://files.qe-forge.org/index.php?file=',  # want-2.3.0.tar.gz
-               'http://www.qe-forge.org/gf/download/frsrelease/64/98/',  # yambo-3.2.1-r.448.tar.gz
-              ]
+    'http://www.qe-forge.org/gf/download/frsrelease/64/96/',  # espresso-4.2.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/64/97/',  # wannier90-1.2.tar.gz
+    'http://files.qe-forge.org/index.php?file=',  # want-2.3.0.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/64/98/',  # yambo-3.2.1-r.448.tar.gz
+]
 
 patches = [
-           'QuantumESPRESSO-4.2_fix-makefile-for-plugins.patch',
-           'yambo-3.2.1_fix-objects-files.patch',
-           'yambo_fix-configure_ictce.patch',
-          ]
+    'QuantumESPRESSO-%(version)s_fix-makefile-for-plugins.patch',
+    'yambo-3.2.1_fix-objects-files.patch',
+    'yambo_fix-configure_ictce.patch',
+]
 
 makeopts = 'all gipaw vdw w90 want gww xspectra yambo'
 
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-4.0.6.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-4.0.6.eb
index b91d022bda0944c6aab51b089586cda670852d5f..d15d97009bd1dd5e2b5444ceea46998a422b1ade 100644
--- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-4.0.6.eb
@@ -11,23 +11,23 @@ toolchain = {'name': 'ictce', 'version': '4.0.6'}
 toolchainopts = {'usempi': True}
 
 sources = [
-           'espresso-%s.tar.gz' % version,
-           'wannier90-1.2.tar.gz',
-           'want-2.3.0.tar.gz',
-           'yambo-3.2.1-r.448.tar.gz',
-          ]
+    'espresso-%(version)s.tar.gz',
+    'wannier90-1.2.tar.gz',
+    'want-2.3.0.tar.gz',
+    'yambo-3.2.1-r.448.tar.gz',
+]
 source_urls = [
-               'http://www.qe-forge.org/gf/download/frsrelease/64/96/',  # espresso-4.2.tar.gz
-               'http://www.qe-forge.org/gf/download/frsrelease/64/97/',  # wannier90-1.2.tar.gz
-               'http://files.qe-forge.org/index.php?file=',  # want-2.3.0.tar.gz
-               'http://www.qe-forge.org/gf/download/frsrelease/64/98/',  # yambo-3.2.1-r.448.tar.gz
-              ]
+    'http://www.qe-forge.org/gf/download/frsrelease/64/96/',  # espresso-4.2.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/64/97/',  # wannier90-1.2.tar.gz
+    'http://files.qe-forge.org/index.php?file=',  # want-2.3.0.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/64/98/',  # yambo-3.2.1-r.448.tar.gz
+]
 
 patches = [
-           'QuantumESPRESSO-4.2_fix-makefile-for-plugins.patch',
-           'yambo-3.2.1_fix-objects-files.patch',
-           'yambo_fix-configure_ictce.patch',
-          ]
+    'QuantumESPRESSO-%(version)s_fix-makefile-for-plugins.patch',
+    'yambo-3.2.1_fix-objects-files.patch',
+    'yambo_fix-configure_ictce.patch',
+]
 
 makeopts = 'all gipaw vdw w90 want gww xspectra yambo'
 
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0-hybrid.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0-hybrid.eb
new file mode 100644
index 0000000000000000000000000000000000000000..cd5c79406188e8cde9bb9777ef8ed03749dc4c5e
--- /dev/null
+++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0-hybrid.eb
@@ -0,0 +1,41 @@
+name = 'QuantumESPRESSO'
+version = '4.2'
+versionsuffix = '-hybrid'
+
+homepage = 'http://www.pwscf.org/'
+description = """Quantum ESPRESSO  is an integrated suite of computer codes
+ for electronic-structure calculations and materials modeling at the nanoscale.
+ It is based on density-functional theory, plane waves, and pseudopotentials
+  (both norm-conserving and ultrasoft)."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'usempi': True, 'openmp': True}
+
+sources = [
+    'espresso-%(version)s.tar.gz',
+    'wannier90-1.2.tar.gz',
+    'want-2.3.0.tar.gz',
+    'yambo-3.2.1-r.448.tar.gz',
+]
+source_urls = [
+    'http://www.qe-forge.org/gf/download/frsrelease/64/96/',  # espresso-4.2.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/64/97/',  # wannier90-1.2.tar.gz
+    'http://files.qe-forge.org/index.php?file=',  # want-2.3.0.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/64/98/',  # yambo-3.2.1-r.448.tar.gz
+]
+
+patches = [
+    'QuantumESPRESSO-%(version)s_fix-makefile-for-plugins.patch',
+    'yambo-3.2.1_fix-objects-files.patch',
+    'yambo_fix-configure_ictce.patch',
+]
+
+makeopts = 'all gipaw vdw w90 want gww xspectra yambo'
+
+# parallel build tends to fail
+parallel = 1
+
+# hybrid build (enable OpenMP)
+hybrid = True
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4ec5d3ed70155d582434dba4052fbf720fe1f2a0
--- /dev/null
+++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0.eb
@@ -0,0 +1,37 @@
+name = 'QuantumESPRESSO'
+version = '4.2'
+
+homepage = 'http://www.pwscf.org/'
+description = """Quantum ESPRESSO  is an integrated suite of computer codes
+ for electronic-structure calculations and materials modeling at the nanoscale.
+ It is based on density-functional theory, plane waves, and pseudopotentials
+  (both norm-conserving and ultrasoft)."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'usempi': True}
+
+sources = [
+    'espresso-%(version)s.tar.gz',
+    'wannier90-1.2.tar.gz',
+    'want-2.3.0.tar.gz',
+    'yambo-3.2.1-r.448.tar.gz',
+          ]
+source_urls = [
+    'http://www.qe-forge.org/gf/download/frsrelease/64/96/',  # espresso-4.2.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/64/97/',  # wannier90-1.2.tar.gz
+    'http://files.qe-forge.org/index.php?file=',  # want-2.3.0.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/64/98/',  # yambo-3.2.1-r.448.tar.gz
+]
+
+patches = [
+    'QuantumESPRESSO-4.2_fix-makefile-for-plugins.patch',
+    'yambo-3.2.1_fix-objects-files.patch',
+    'yambo_fix-configure_ictce.patch',
+]
+
+makeopts = 'all gipaw vdw w90 want gww xspectra yambo'
+
+# parallel build tends to fail
+parallel = 1
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.5.0-hybrid.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.5.0-hybrid.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1dd41c052bd241eeb90869465d47553ff370a7b7
--- /dev/null
+++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.5.0-hybrid.eb
@@ -0,0 +1,41 @@
+name = 'QuantumESPRESSO'
+version = '4.2'
+versionsuffix = '-hybrid'
+
+homepage = 'http://www.pwscf.org/'
+description = """Quantum ESPRESSO  is an integrated suite of computer codes
+ for electronic-structure calculations and materials modeling at the nanoscale.
+ It is based on density-functional theory, plane waves, and pseudopotentials
+  (both norm-conserving and ultrasoft)."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'usempi': True, 'openmp': True}
+
+sources = [
+    'espresso-%(version)s.tar.gz',
+    'wannier90-1.2.tar.gz',
+    'want-2.3.0.tar.gz',
+    'yambo-3.2.1-r.448.tar.gz',
+]
+source_urls = [
+    'http://www.qe-forge.org/gf/download/frsrelease/64/96/',  # espresso-4.2.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/64/97/',  # wannier90-1.2.tar.gz
+    'http://files.qe-forge.org/index.php?file=',  # want-2.3.0.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/64/98/',  # yambo-3.2.1-r.448.tar.gz
+]
+
+patches = [
+    'QuantumESPRESSO-%(version)s_fix-makefile-for-plugins.patch',
+    'yambo-3.2.1_fix-objects-files.patch',
+    'yambo_fix-configure_ictce.patch',
+]
+
+makeopts = 'all gipaw vdw w90 want gww xspectra yambo'
+
+# parallel build tends to fail
+parallel = 1
+
+# hybrid build (enable OpenMP)
+hybrid = True
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.5.0.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8e4fd125939ed685ed32bb56010656a9d1298dd7
--- /dev/null
+++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.5.0.eb
@@ -0,0 +1,37 @@
+name = 'QuantumESPRESSO'
+version = '4.2'
+
+homepage = 'http://www.pwscf.org/'
+description = """Quantum ESPRESSO  is an integrated suite of computer codes
+ for electronic-structure calculations and materials modeling at the nanoscale.
+ It is based on density-functional theory, plane waves, and pseudopotentials
+  (both norm-conserving and ultrasoft)."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'usempi': True}
+
+sources = [
+    'espresso-%(version)s.tar.gz',
+    'wannier90-1.2.tar.gz',
+    'want-2.3.0.tar.gz',
+    'yambo-3.2.1-r.448.tar.gz',
+          ]
+source_urls = [
+    'http://www.qe-forge.org/gf/download/frsrelease/64/96/',  # espresso-4.2.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/64/97/',  # wannier90-1.2.tar.gz
+    'http://files.qe-forge.org/index.php?file=',  # want-2.3.0.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/64/98/',  # yambo-3.2.1-r.448.tar.gz
+]
+
+patches = [
+    'QuantumESPRESSO-4.2_fix-makefile-for-plugins.patch',
+    'yambo-3.2.1_fix-objects-files.patch',
+    'yambo_fix-configure_ictce.patch',
+]
+
+makeopts = 'all gipaw vdw w90 want gww xspectra yambo'
+
+# parallel build tends to fail
+parallel = 1
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goalf-1.1.0-no-OFED-hybrid.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goalf-1.1.0-no-OFED-hybrid.eb
index 2de08f4797301c11fece97da0e633b1e2a27e049..4d7911d2dfe513cc1fc816ec84f2dcf14ffc5771 100644
--- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goalf-1.1.0-no-OFED-hybrid.eb
+++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goalf-1.1.0-no-OFED-hybrid.eb
@@ -9,31 +9,31 @@ description = """Quantum ESPRESSO  is an integrated suite of computer codes
   (both norm-conserving and ultrasoft)."""
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
-toolchainopts = {'usempi': True}
+toolchainopts = {'usempi': True, 'openmp': True}
 
 # major part of this list was determined from espresso-5.0.2/install/plugins_list
 sources = [
-           'espresso-%s.tar.gz' % version,
-           'wannier90-1.2.tar.gz',
-           'atomic-5.0.2.tar.gz',
-           'neb-5.0.2.tar.gz',
-           'PHonon-5.0.2.tar.gz',
-           'plumed-1.3-qe.tar.gz',
-           'pwcond-5.0.2.tar.gz',
-           'tddfpt-5.0.2.tar.gz',
-           'want-2.4.0-base.tar.gz',
-           'yambo-3.2.5-rev.26.tar.gz',
-          ]
+    'espresso-%(version)s.tar.gz',
+    'wannier90-1.2.tar.gz',
+    'atomic-5.0.2.tar.gz',
+    'neb-5.0.2.tar.gz',
+    'PHonon-5.0.2.tar.gz',
+    'plumed-1.3-qe.tar.gz',
+    'pwcond-5.0.2.tar.gz',
+    'tddfpt-5.0.2.tar.gz',
+    'want-2.4.0-base.tar.gz',
+    'yambo-3.2.5-rev.26.tar.gz',
+]
 missing_sources = [
-                   'qe-gipaw-5.0.tar.gz',  # gipaw excluded, because v5.0 isn't stable (and no longer available)
-                   'sax-2.0.3.tar.gz',  # nowhere to be found
-                   'xspectra-5.0.2.tar.gz',  # nowhere to be found
-                  ]
+    'qe-gipaw-5.0.tar.gz',  # gipaw excluded, because v5.0 isn't stable
+    'sax-2.0.3.tar.gz',  # nowhere to be found
+    'xspectra-5.0.2.tar.gz',  # nowhere to be found
+]
 source_urls = [
-               'http://www.qe-forge.org/gf/download/frsrelease/116/403/',  # espresso-5.0.2.tar.gz
-               'http://www.qe-forge.org/gf/download/frsrelease/64/97/',  # wannier90-1.2.tar.gz
-               'http://files.qe-forge.org/index.php?file=',  # others
-              ]
+    'http://www.qe-forge.org/gf/download/frsrelease/116/403/',  # espresso-5.0.2.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/64/97/',  # wannier90-1.2.tar.gz
+    'http://files.qe-forge.org/index.php?file=',  # others
+]
 
 patches = ['yambo-3.2.5_fix-objects-files.patch']
 
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goalf-1.1.0-no-OFED.eb
index 47095699091da3a3b43a651bdca625da3096b280..b8ec946c6136288435508f34ce6444af7738b3d3 100644
--- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goalf-1.1.0-no-OFED.eb
@@ -12,27 +12,27 @@ toolchainopts = {'usempi': True}
 
 # major part of this list was determined from espresso-5.0.2/install/plugins_list
 sources = [
-           'espresso-%s.tar.gz' % version,
-           'wannier90-1.2.tar.gz',
-           'atomic-5.0.2.tar.gz',
-           'neb-5.0.2.tar.gz',
-           'PHonon-5.0.2.tar.gz',
-           'plumed-1.3-qe.tar.gz',
-           'pwcond-5.0.2.tar.gz',
-           'tddfpt-5.0.2.tar.gz',
-           'want-2.4.0-base.tar.gz',
-           'yambo-3.2.5-rev.26.tar.gz',
-          ]
+    'espresso-%(version)s.tar.gz',
+    'wannier90-1.2.tar.gz',
+    'atomic-5.0.2.tar.gz',
+    'neb-5.0.2.tar.gz',
+    'PHonon-5.0.2.tar.gz',
+    'plumed-1.3-qe.tar.gz',
+    'pwcond-5.0.2.tar.gz',
+    'tddfpt-5.0.2.tar.gz',
+    'want-2.4.0-base.tar.gz',
+    'yambo-3.2.5-rev.26.tar.gz',
+]
 missing_sources = [
-                   'qe-gipaw-5.0.tar.gz',  # gipaw excluded, because v5.0 isn't stable (and no longer available)
-                   'sax-2.0.3.tar.gz',  # nowhere to be found
-                   'xspectra-5.0.2.tar.gz',  # nowhere to be found
-                  ]
+    'qe-gipaw-5.0.tar.gz',  # gipaw excluded, because v5.0 isn't stable
+    'sax-2.0.3.tar.gz',  # nowhere to be found
+    'xspectra-5.0.2.tar.gz',  # nowhere to be found
+]
 source_urls = [
-               'http://www.qe-forge.org/gf/download/frsrelease/116/403/',  # espresso-5.0.2.tar.gz
-               'http://www.qe-forge.org/gf/download/frsrelease/64/97/',  # wannier90-1.2.tar.gz
-               'http://files.qe-forge.org/index.php?file=',  # others
-              ]
+    'http://www.qe-forge.org/gf/download/frsrelease/116/403/',  # espresso-5.0.2.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/64/97/',  # wannier90-1.2.tar.gz
+    'http://files.qe-forge.org/index.php?file=',  # others
+]
 
 patches = ['yambo-3.2.5_fix-objects-files.patch']
 
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goolf-1.4.10-hybrid.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goolf-1.4.10-hybrid.eb
index 6807d9cc10416c264ab7f082d799562925257aa4..df07d19513fd131128e50a4d2fc27cbac9d3909a 100644
--- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goolf-1.4.10-hybrid.eb
+++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goolf-1.4.10-hybrid.eb
@@ -9,31 +9,31 @@ It is based on density-functional theory, plane waves, and pseudopotentials
 (both norm-conserving and ultrasoft)."""
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
-toolchainopts = {'usempi': True}
+toolchainopts = {'usempi': True, 'openmp': True}
 
 # major part of this list was determined from espresso-5.0.2/install/plugins_list
 sources = [
-           'espresso-%s.tar.gz' % version,
-           'wannier90-1.2.tar.gz',
-           'atomic-5.0.2.tar.gz',
-           'neb-5.0.2.tar.gz',
-           'PHonon-5.0.2.tar.gz',
-           'plumed-1.3-qe.tar.gz',
-           'pwcond-5.0.2.tar.gz',
-           'tddfpt-5.0.2.tar.gz',
-           'want-2.4.0-base.tar.gz',
-           'yambo-3.2.5-rev.26.tar.gz',
-          ]
+    'espresso-%(version)s.tar.gz',
+    'wannier90-1.2.tar.gz',
+    'atomic-5.0.2.tar.gz',
+    'neb-5.0.2.tar.gz',
+    'PHonon-5.0.2.tar.gz',
+    'plumed-1.3-qe.tar.gz',
+    'pwcond-5.0.2.tar.gz',
+    'tddfpt-5.0.2.tar.gz',
+    'want-2.4.0-base.tar.gz',
+    'yambo-3.2.5-rev.26.tar.gz',
+]
 missing_sources = [
-                   'qe-gipaw-5.0.tar.gz',  # gipaw excluded, because v5.0 isn't stable (and no longer available)
-                   'sax-2.0.3.tar.gz',  # nowhere to be found
-                   'xspectra-5.0.2.tar.gz',  # nowhere to be found
-                  ]
+    'qe-gipaw-5.0.tar.gz',  # gipaw excluded, because v5.0 isn't stable
+    'sax-2.0.3.tar.gz',  # nowhere to be found
+    'xspectra-5.0.2.tar.gz',  # nowhere to be found
+]
 source_urls = [
-               'http://www.qe-forge.org/gf/download/frsrelease/116/403/',  # espresso-5.0.2.tar.gz
-               'http://www.qe-forge.org/gf/download/frsrelease/64/97/',  # wannier90-1.2.tar.gz
-               'http://files.qe-forge.org/index.php?file=',  # others
-              ]
+    'http://www.qe-forge.org/gf/download/frsrelease/116/403/',  # espresso-5.0.2.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/64/97/',  # wannier90-1.2.tar.gz
+    'http://files.qe-forge.org/index.php?file=',  # others
+]
 
 patches = ['yambo-3.2.5_fix-objects-files.patch']
 
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goolf-1.4.10.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goolf-1.4.10.eb
index 67dfd49bc10c2427daa585754d40cbd2a9cb62ec..a27849d9f9cc37e4d40166b1f50382e0e9c472a9 100644
--- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goolf-1.4.10.eb
@@ -12,27 +12,27 @@ toolchainopts = {'usempi': True}
 
 # major part of this list was determined from espresso-5.0.2/install/plugins_list
 sources = [
-           'espresso-%s.tar.gz' % version,
-           'wannier90-1.2.tar.gz',
-           'atomic-5.0.2.tar.gz',
-           'neb-5.0.2.tar.gz',
-           'PHonon-5.0.2.tar.gz',
-           'plumed-1.3-qe.tar.gz',
-           'pwcond-5.0.2.tar.gz',
-           'tddfpt-5.0.2.tar.gz',
-           'want-2.4.0-base.tar.gz',
-           'yambo-3.2.5-rev.26.tar.gz',
-          ]
+    'espresso-%(version)s.tar.gz',
+    'wannier90-1.2.tar.gz',
+    'atomic-5.0.2.tar.gz',
+    'neb-5.0.2.tar.gz',
+    'PHonon-5.0.2.tar.gz',
+    'plumed-1.3-qe.tar.gz',
+    'pwcond-5.0.2.tar.gz',
+    'tddfpt-5.0.2.tar.gz',
+    'want-2.4.0-base.tar.gz',
+    'yambo-3.2.5-rev.26.tar.gz',
+]
 missing_sources = [
-                   'qe-gipaw-5.0.tar.gz',  # gipaw excluded, because v5.0 isn't stable (and no longer available)
-                   'sax-2.0.3.tar.gz',  # nowhere to be found
-                   'xspectra-5.0.2.tar.gz',  # nowhere to be found
-                  ]
+    'qe-gipaw-5.0.tar.gz',  # gipaw excluded, because v5.0 isn't stable
+    'sax-2.0.3.tar.gz',  # nowhere to be found
+    'xspectra-5.0.2.tar.gz',  # nowhere to be found
+]
 source_urls = [
-               'http://www.qe-forge.org/gf/download/frsrelease/116/403/',  # espresso-5.0.2.tar.gz
-               'http://www.qe-forge.org/gf/download/frsrelease/64/97/',  # wannier90-1.2.tar.gz
-               'http://files.qe-forge.org/index.php?file=',  # others
-              ]
+    'http://www.qe-forge.org/gf/download/frsrelease/116/403/',  # espresso-5.0.2.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/64/97/',  # wannier90-1.2.tar.gz
+    'http://files.qe-forge.org/index.php?file=',  # others
+]
 
 patches = ['yambo-3.2.5_fix-objects-files.patch']
 
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-4.0.6-hybrid.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-4.0.6-hybrid.eb
index 47adff3a591d30463f02f4a25c20101e08922f8e..5376b7ca12551762c81c233c0b449db84a47d169 100644
--- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-4.0.6-hybrid.eb
+++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-4.0.6-hybrid.eb
@@ -9,36 +9,36 @@ description = """Quantum ESPRESSO  is an integrated suite of computer codes
   (both norm-conserving and ultrasoft)."""
 
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
-toolchainopts = {'usempi': True}
+toolchainopts = {'usempi': True, 'openmp': True}
 
 # major part of this list was determined from espresso-5.0.2/install/plugins_list
 sources = [
-           'espresso-%s.tar.gz' % version,
-           'wannier90-1.2.tar.gz',
-           'atomic-5.0.2.tar.gz',
-           'neb-5.0.2.tar.gz',
-           'PHonon-5.0.2.tar.gz',
-           'plumed-1.3-qe.tar.gz',
-           'pwcond-5.0.2.tar.gz',
-           'tddfpt-5.0.2.tar.gz',
-           'want-2.4.0-base.tar.gz',
-           'yambo-3.2.5-rev.26.tar.gz',
-          ]
+    'espresso-%(version)s.tar.gz',
+    'wannier90-1.2.tar.gz',
+    'atomic-5.0.2.tar.gz',
+    'neb-5.0.2.tar.gz',
+    'PHonon-5.0.2.tar.gz',
+    'plumed-1.3-qe.tar.gz',
+    'pwcond-5.0.2.tar.gz',
+    'tddfpt-5.0.2.tar.gz',
+    'want-2.4.0-base.tar.gz',
+    'yambo-3.2.5-rev.26.tar.gz',
+]
 missing_sources = [
-                   'qe-gipaw-5.0.tar.gz',  # gipaw excluded, because v5.0 isn't stable
-                   'sax-2.0.3.tar.gz',  # nowhere to be found
-                   'xspectra-5.0.2.tar.gz',  # nowhere to be found
-                  ]
+    'qe-gipaw-5.0.tar.gz',  # gipaw excluded, because v5.0 isn't stable
+    'sax-2.0.3.tar.gz',  # nowhere to be found
+    'xspectra-5.0.2.tar.gz',  # nowhere to be found
+]
 source_urls = [
-               'http://www.qe-forge.org/gf/download/frsrelease/116/403/',  # espresso-5.0.2.tar.gz
-               'http://www.qe-forge.org/gf/download/frsrelease/64/97/',  # wannier90-1.2.tar.gz
-               'http://files.qe-forge.org/index.php?file=',  # others
-              ]
+    'http://www.qe-forge.org/gf/download/frsrelease/116/403/',  # espresso-5.0.2.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/64/97/',  # wannier90-1.2.tar.gz
+    'http://files.qe-forge.org/index.php?file=',  # others
+]
 
 patches = [
-           'yambo-3.2.5_fix-objects-files.patch',
-           'QuantumESPRESSO-5.0.2_yambo-fftw.patch',
-          ]
+    'yambo-3.2.5_fix-objects-files.patch',
+    'QuantumESPRESSO-%(version)s_yambo-fftw.patch',
+]
 
 # parallel build tends to fail
 parallel = 1
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-4.0.6.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-4.0.6.eb
index f982d909d34f8916af19fe3e65aecd5ada2e1140..7e9edfdb1a4e3477ccae4d18023227f53d4e6ccb 100644
--- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-4.0.6.eb
@@ -12,32 +12,32 @@ toolchainopts = {'usempi': True}
 
 # major part of this list was determined from espresso-5.0.2/install/plugins_list
 sources = [
-           'espresso-%s.tar.gz' % version,
-           'wannier90-1.2.tar.gz',
-           'atomic-5.0.2.tar.gz',
-           'neb-5.0.2.tar.gz',
-           'PHonon-5.0.2.tar.gz',
-           'plumed-1.3-qe.tar.gz',
-           'pwcond-5.0.2.tar.gz',
-           'tddfpt-5.0.2.tar.gz',
-           'want-2.4.0-base.tar.gz',
-           'yambo-3.2.5-rev.26.tar.gz',
-          ]
+    'espresso-%(version)s.tar.gz',
+    'wannier90-1.2.tar.gz',
+    'atomic-5.0.2.tar.gz',
+    'neb-5.0.2.tar.gz',
+    'PHonon-5.0.2.tar.gz',
+    'plumed-1.3-qe.tar.gz',
+    'pwcond-5.0.2.tar.gz',
+    'tddfpt-5.0.2.tar.gz',
+    'want-2.4.0-base.tar.gz',
+    'yambo-3.2.5-rev.26.tar.gz',
+]
 missing_sources = [
-                   'qe-gipaw-5.0.tar.gz',  # gipaw excluded, because v5.0 isn't stable
-                   'sax-2.0.3.tar.gz',  # nowhere to be found
-                   'xspectra-5.0.2.tar.gz',  # nowhere to be found
-                  ]
+    'qe-gipaw-5.0.tar.gz',  # gipaw excluded, because v5.0 isn't stable
+    'sax-2.0.3.tar.gz',  # nowhere to be found
+    'xspectra-5.0.2.tar.gz',  # nowhere to be found
+]
 source_urls = [
-               'http://www.qe-forge.org/gf/download/frsrelease/116/403/',  # espresso-5.0.2.tar.gz
-               'http://www.qe-forge.org/gf/download/frsrelease/64/97/',  # wannier90-1.2.tar.gz
-               'http://files.qe-forge.org/index.php?file=',  # others
-              ]
+    'http://www.qe-forge.org/gf/download/frsrelease/116/403/',  # espresso-5.0.2.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/64/97/',  # wannier90-1.2.tar.gz
+    'http://files.qe-forge.org/index.php?file=',  # others
+]
 
 patches = [
-           'yambo-3.2.5_fix-objects-files.patch',
-           'QuantumESPRESSO-5.0.2_yambo-fftw.patch',
-          ]
+    'yambo-3.2.5_fix-objects-files.patch',
+    'QuantumESPRESSO-%(version)s_yambo-fftw.patch',
+]
 
 # gipaw excluded, because v5.0 isn't stable
 # xspectra v5.0.2 is nowhere to be found
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0-hybrid.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0-hybrid.eb
new file mode 100644
index 0000000000000000000000000000000000000000..63c5ce63fa09468b0a128e6f0fda21328376baa3
--- /dev/null
+++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0-hybrid.eb
@@ -0,0 +1,53 @@
+name = 'QuantumESPRESSO'
+version = '5.0.2'
+versionsuffix = '-hybrid'
+
+homepage = 'http://www.pwscf.org/'
+description = """Quantum ESPRESSO  is an integrated suite of computer codes
+ for electronic-structure calculations and materials modeling at the nanoscale.
+ It is based on density-functional theory, plane waves, and pseudopotentials
+  (both norm-conserving and ultrasoft)."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'usempi': True, 'openmp': True}
+
+# major part of this list was determined from espresso-5.0.2/install/plugins_list
+sources = [
+    'espresso-%(version)s.tar.gz',
+    'wannier90-1.2.tar.gz',
+    'atomic-5.0.2.tar.gz',
+    'neb-5.0.2.tar.gz',
+    'PHonon-5.0.2.tar.gz',
+    'plumed-1.3-qe.tar.gz',
+    'pwcond-5.0.2.tar.gz',
+    'tddfpt-5.0.2.tar.gz',
+    'want-2.4.0-base.tar.gz',
+    'yambo-3.2.5-rev.26.tar.gz',
+]
+missing_sources = [
+    'qe-gipaw-5.0.tar.gz',  # gipaw excluded, because v5.0 isn't stable
+    'sax-2.0.3.tar.gz',  # nowhere to be found
+    'xspectra-5.0.2.tar.gz',  # nowhere to be found
+]
+source_urls = [
+    'http://www.qe-forge.org/gf/download/frsrelease/116/403/',  # espresso-5.0.2.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/64/97/',  # wannier90-1.2.tar.gz
+    'http://files.qe-forge.org/index.php?file=',  # others
+]
+
+patches = [
+    'yambo-3.2.5_fix-objects-files.patch',
+    'QuantumESPRESSO-%(version)s_yambo-fftw.patch',
+]
+
+# parallel build tends to fail
+parallel = 1
+
+# gipaw excluded, because v5.0 isn't stable
+# xspectra v5.0.2 is nowhere to be found
+makeopts = 'all w90 want yambo plumed'
+
+# hybrid build (enable OpenMP)
+hybrid = True
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e41022393181f32a6af6db98920c59fc6263cf67
--- /dev/null
+++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.3.0.eb
@@ -0,0 +1,49 @@
+name = 'QuantumESPRESSO'
+version = '5.0.2'
+
+homepage = 'http://www.pwscf.org/'
+description = """Quantum ESPRESSO  is an integrated suite of computer codes
+ for electronic-structure calculations and materials modeling at the nanoscale.
+ It is based on density-functional theory, plane waves, and pseudopotentials
+  (both norm-conserving and ultrasoft)."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'usempi': True}
+
+# major part of this list was determined from espresso-5.0.2/install/plugins_list
+sources = [
+    'espresso-%(version)s.tar.gz',
+    'wannier90-1.2.tar.gz',
+    'atomic-5.0.2.tar.gz',
+    'neb-5.0.2.tar.gz',
+    'PHonon-5.0.2.tar.gz',
+    'plumed-1.3-qe.tar.gz',
+    'pwcond-5.0.2.tar.gz',
+    'tddfpt-5.0.2.tar.gz',
+    'want-2.4.0-base.tar.gz',
+    'yambo-3.2.5-rev.26.tar.gz',
+]
+missing_sources = [
+    'qe-gipaw-5.0.tar.gz',  # gipaw excluded, because v5.0 isn't stable
+    'sax-2.0.3.tar.gz',  # nowhere to be found
+    'xspectra-5.0.2.tar.gz',  # nowhere to be found
+]
+source_urls = [
+    'http://www.qe-forge.org/gf/download/frsrelease/116/403/',  # espresso-5.0.2.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/64/97/',  # wannier90-1.2.tar.gz
+    'http://files.qe-forge.org/index.php?file=',  # others
+]
+
+patches = [
+    'yambo-3.2.5_fix-objects-files.patch',
+    'QuantumESPRESSO-%(version)s_yambo-fftw.patch',
+]
+
+# gipaw excluded, because v5.0 isn't stable
+# xspectra v5.0.2 is nowhere to be found
+makeopts = 'all w90 want yambo plumed'
+
+# parallel build tends to fail
+parallel = 1
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.5.0-hybrid.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.5.0-hybrid.eb
new file mode 100644
index 0000000000000000000000000000000000000000..04ad81b30e568dbd7d020de167d06c4fabc01197
--- /dev/null
+++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.5.0-hybrid.eb
@@ -0,0 +1,53 @@
+name = 'QuantumESPRESSO'
+version = '5.0.2'
+versionsuffix = '-hybrid'
+
+homepage = 'http://www.pwscf.org/'
+description = """Quantum ESPRESSO  is an integrated suite of computer codes
+ for electronic-structure calculations and materials modeling at the nanoscale.
+ It is based on density-functional theory, plane waves, and pseudopotentials
+  (both norm-conserving and ultrasoft)."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'usempi': True, 'openmp': True}
+
+# major part of this list was determined from espresso-5.0.2/install/plugins_list
+sources = [
+    'espresso-%(version)s.tar.gz',
+    'wannier90-1.2.tar.gz',
+    'atomic-5.0.2.tar.gz',
+    'neb-5.0.2.tar.gz',
+    'PHonon-5.0.2.tar.gz',
+    'plumed-1.3-qe.tar.gz',
+    'pwcond-5.0.2.tar.gz',
+    'tddfpt-5.0.2.tar.gz',
+    'want-2.4.0-base.tar.gz',
+    'yambo-3.2.5-rev.26.tar.gz',
+]
+missing_sources = [
+    'qe-gipaw-5.0.tar.gz',  # gipaw excluded, because v5.0 isn't stable
+    'sax-2.0.3.tar.gz',  # nowhere to be found
+    'xspectra-5.0.2.tar.gz',  # nowhere to be found
+]
+source_urls = [
+    'http://www.qe-forge.org/gf/download/frsrelease/116/403/',  # espresso-5.0.2.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/64/97/',  # wannier90-1.2.tar.gz
+    'http://files.qe-forge.org/index.php?file=',  # others
+]
+
+patches = [
+    'yambo-3.2.5_fix-objects-files.patch',
+    'QuantumESPRESSO-%(version)s_yambo-fftw.patch',
+]
+
+# parallel build tends to fail
+parallel = 1
+
+# gipaw excluded, because v5.0 isn't stable
+# xspectra v5.0.2 is nowhere to be found
+makeopts = 'all w90 want yambo plumed'
+
+# hybrid build (enable OpenMP)
+hybrid = True
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.5.0.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..85601025bc99f844cbcfcf86384158d56b453595
--- /dev/null
+++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-5.5.0.eb
@@ -0,0 +1,49 @@
+name = 'QuantumESPRESSO'
+version = '5.0.2'
+
+homepage = 'http://www.pwscf.org/'
+description = """Quantum ESPRESSO  is an integrated suite of computer codes
+ for electronic-structure calculations and materials modeling at the nanoscale.
+ It is based on density-functional theory, plane waves, and pseudopotentials
+  (both norm-conserving and ultrasoft)."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'usempi': True}
+
+# major part of this list was determined from espresso-5.0.2/install/plugins_list
+sources = [
+    'espresso-%(version)s.tar.gz',
+    'wannier90-1.2.tar.gz',
+    'atomic-5.0.2.tar.gz',
+    'neb-5.0.2.tar.gz',
+    'PHonon-5.0.2.tar.gz',
+    'plumed-1.3-qe.tar.gz',
+    'pwcond-5.0.2.tar.gz',
+    'tddfpt-5.0.2.tar.gz',
+    'want-2.4.0-base.tar.gz',
+    'yambo-3.2.5-rev.26.tar.gz',
+]
+missing_sources = [
+    'qe-gipaw-5.0.tar.gz',  # gipaw excluded, because v5.0 isn't stable
+    'sax-2.0.3.tar.gz',  # nowhere to be found
+    'xspectra-5.0.2.tar.gz',  # nowhere to be found
+]
+source_urls = [
+    'http://www.qe-forge.org/gf/download/frsrelease/116/403/',  # espresso-5.0.2.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/64/97/',  # wannier90-1.2.tar.gz
+    'http://files.qe-forge.org/index.php?file=',  # others
+]
+
+patches = [
+    'yambo-3.2.5_fix-objects-files.patch',
+    'QuantumESPRESSO-%(version)s_yambo-fftw.patch',
+]
+
+# gipaw excluded, because v5.0 isn't stable
+# xspectra v5.0.2 is nowhere to be found
+makeopts = 'all w90 want yambo plumed'
+
+# parallel build tends to fail
+parallel = 1
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/r/R/R-2.15.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/r/R/R-2.15.2-goalf-1.1.0-no-OFED.eb
index a2e641a449c7febc7604c94e9ffb39163a3541f0..8468c6029d48b95356a6ec5b4b69077851ab3c3d 100644
--- a/easybuild/easyconfigs/r/R/R-2.15.2-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/r/R/R-2.15.2-goalf-1.1.0-no-OFED.eb
@@ -135,6 +135,8 @@ exts_list = [
     ('R.oo', '1.13.0', ext_options),
     ('R.matlab', '1.7.0', ext_options),
     ('Rniftilib', '0.0-32', ext_options),
+    ('gbm', '2.1', ext_options),
+
 ]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/r/R/R-2.15.2-goolf-1.4.10.eb b/easybuild/easyconfigs/r/R/R-2.15.2-goolf-1.4.10.eb
index cdf742e159032e3a716a16e9e949ac245c57671f..84d3f3e99e4cd3721ffb94da5b88340466aadc5a 100644
--- a/easybuild/easyconfigs/r/R/R-2.15.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/r/R/R-2.15.2-goolf-1.4.10.eb
@@ -135,6 +135,7 @@ exts_list = [
     ('R.oo', '1.13.0', ext_options),
     ('R.matlab', '1.7.0', ext_options),
     ('Rniftilib', '0.0-32', ext_options),
+    ('gbm', '2.1', ext_options),
 ]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/r/R/R-2.15.2-ictce-4.0.10.eb b/easybuild/easyconfigs/r/R/R-2.15.2-ictce-4.0.10.eb
index 71f7f4305058d551e0445d4f55484e46e6591dc0..70126d1ce646d1164f3a3db5dce15962cbda6fc4 100644
--- a/easybuild/easyconfigs/r/R/R-2.15.2-ictce-4.0.10.eb
+++ b/easybuild/easyconfigs/r/R/R-2.15.2-ictce-4.0.10.eb
@@ -135,6 +135,7 @@ exts_list = [
     ('R.oo', '1.13.0', ext_options),
     ('R.matlab', '1.7.0', ext_options),
     ('Rniftilib', '0.0-32', ext_options),
+    ('gbm', '2.1', ext_options),
 ]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/r/R/R-2.15.2-ictce-4.0.6.eb b/easybuild/easyconfigs/r/R/R-2.15.2-ictce-4.0.6.eb
index f9ee59bde03b28407f9e49a90f8bb69c78b474c1..3a90cc17ebd491fb937ada5615441ffba09e2fd8 100644
--- a/easybuild/easyconfigs/r/R/R-2.15.2-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/r/R/R-2.15.2-ictce-4.0.6.eb
@@ -135,6 +135,7 @@ exts_list = [
     ('R.oo', '1.13.0', ext_options),
     ('R.matlab', '1.7.0', ext_options),
     ('Rniftilib', '0.0-32', ext_options),
+    ('gbm', '2.1', ext_options),
 ]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/r/R/R-2.15.2-ictce-5.3.0.eb b/easybuild/easyconfigs/r/R/R-2.15.2-ictce-5.3.0.eb
index 6eb235ac8faafc4af53eb9f92f9305c30ff36324..201aa6b6366582083a0ac2abbad003ac17555e93 100644
--- a/easybuild/easyconfigs/r/R/R-2.15.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/r/R/R-2.15.2-ictce-5.3.0.eb
@@ -135,6 +135,7 @@ exts_list = [
     ('R.oo', '1.13.0', ext_options),
     ('R.matlab', '1.7.0', ext_options),
     ('Rniftilib', '0.0-32', ext_options),
+    ('gbm', '2.1', ext_options),
 ]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/r/R/R-2.15.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/r/R/R-2.15.3-goalf-1.1.0-no-OFED.eb
index 9ea41bf416d08e8beef3f2520895502d8fd121a9..65f22fa5a8ace751880dbc16022488cfe8afd763 100644
--- a/easybuild/easyconfigs/r/R/R-2.15.3-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/r/R/R-2.15.3-goalf-1.1.0-no-OFED.eb
@@ -140,6 +140,7 @@ exts_list = [
     ('ShortRead', '1.18.0', bioconductor_options),
     ('graph', '1.38.0', bioconductor_options),
     ('igraph0', '0.5.7', ext_options),
+    ('gbm', '2.1', ext_options),
 ]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/r/R/R-2.15.3-goolf-1.4.10.eb b/easybuild/easyconfigs/r/R/R-2.15.3-goolf-1.4.10.eb
index 9cf2522c37ddc54f708e44c1de0a330c1a28fe34..2672165c5022be2bbea20fbe410c8ebc1e3897a4 100644
--- a/easybuild/easyconfigs/r/R/R-2.15.3-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/r/R/R-2.15.3-goolf-1.4.10.eb
@@ -140,6 +140,7 @@ exts_list = [
     ('ShortRead', '1.18.0', bioconductor_options),
     ('graph', '1.38.0', bioconductor_options),
     ('igraph0', '0.5.7', ext_options),
+    ('gbm', '2.1', ext_options),
 ]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/r/R/R-2.15.3-ictce-4.1.13.eb b/easybuild/easyconfigs/r/R/R-2.15.3-ictce-4.1.13.eb
index 54e7b1e0bc2b4e1a8fe7a4ce96a7ae41d0e8af91..2f2b2a553e91701f77a98285b8b62f8adceccbe1 100644
--- a/easybuild/easyconfigs/r/R/R-2.15.3-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/r/R/R-2.15.3-ictce-4.1.13.eb
@@ -140,6 +140,7 @@ exts_list = [
     ('ShortRead', '1.18.0', bioconductor_options),
     ('graph', '1.38.0', bioconductor_options),
     ('igraph0', '0.5.7', ext_options),
+    ('gbm', '2.1', ext_options),
 ]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/r/R/R-2.15.3-ictce-5.3.0.eb b/easybuild/easyconfigs/r/R/R-2.15.3-ictce-5.3.0.eb
index 521894ec3c82b32f88af123d47a3658e7b94c0c0..2d510cfe36e70f1da082d2aa94f96b41608e54e5 100644
--- a/easybuild/easyconfigs/r/R/R-2.15.3-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/r/R/R-2.15.3-ictce-5.3.0.eb
@@ -140,6 +140,7 @@ exts_list = [
     ('ShortRead', '1.18.0', bioconductor_options),
     ('graph', '1.38.0', bioconductor_options),
     ('igraph0', '0.5.7', ext_options),
+    ('gbm', '2.1', ext_options),
 ]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/r/R/R-3.0.2-goolf-1.4.10.eb b/easybuild/easyconfigs/r/R/R-3.0.2-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8774fdea31f120a196354d82003503276cc165da
--- /dev/null
+++ b/easybuild/easyconfigs/r/R/R-3.0.2-goolf-1.4.10.eb
@@ -0,0 +1,158 @@
+name = 'R'
+version = '3.0.2'
+
+homepage = 'http://www.r-project.org/'
+description = """R is a free software environment for statistical computing and graphics."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+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=no --enable-R-shlib"
+# 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 = [
+    ('libreadline', '6.2'),
+    ('ncurses', '5.9'),
+    ('libpng', '1.6.6'),  # for plotting in R
+    ('Java', '1.7.0_21', '', True),  # Java bindings are built if Java is found, might as well provide it
+]
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in ['R', 'Rscript']] +
+             ['lib64/R/include/%s' % x for x in ['Rconfig.h', 'Rdefines.h', 'Rembedded.h',
+                                                 'R.h', 'Rinterface.h', 'Rinternals.h',
+                                                 'Rmath.h', 'Rversion.h', 'S.h']] +
+             ['lib64/R/modules/%s' % x for x in ['internet.so', 'lapack.so', 'vfonts.so']] +
+             ['lib64/R/lib/libR.so'],
+    'dirs': []
+}
+
+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.freestatistics.org/src/contrib',  # alternative for packages
+    ],
+    'source_tmpl': name_tmpl,
+}
+# Bioconductor packages have a different download url
+bioconductor_options = {
+    'source_urls': ['http://www.bioconductor.org/packages/2.13/bioc/src/contrib/'],
+    'source_tmpl': name_tmpl,
+}
+# !! order of packages is important !!
+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!
+    ('irace', '1.04', ext_options),
+    ('rJava', '0.9-4', ext_options),
+    ('lattice', '0.20-24', ext_options),
+    ('RColorBrewer', '1.0-5', ext_options),
+    ('latticeExtra', '0.6-26', ext_options),
+    ('Matrix', '1.1-0', ext_options),
+    ('png', '0.1-6', ext_options),
+    ('Rcpp', '0.10.6', ext_options),
+    ('quadprog', '1.5-5', ext_options),
+    ('BB', '2013.4-1', ext_options),
+    ('rlecuyer', '0.3-3', ext_options),
+    ('snow', '0.3-13', ext_options),
+    ('MASS', '7.3-29', ext_options),
+    ('class', '7.3-9', ext_options),
+    ('e1071', '1.6-1', ext_options),
+    ('nnet', '7.3-7', ext_options),
+    ('car', '2.0-19', ext_options),
+    ('colorspace', '1.2-4', ext_options),
+    ('robustbase', '0.9-10', ext_options),
+    ('sp', '1.0-14', ext_options),
+    ('vcd', '1.3-1', ext_options),
+    ('snowfall', '1.84-4', ext_options),
+    ('rpart', '4.1-3', ext_options),
+    ('mice', '2.18', ext_options),
+    ('nlme', '3.1-111', ext_options),
+    ('mgcv', '1.7-27', ext_options),
+    ('logistf', '1.21', ext_options),
+    ('akima', '0.5-11', ext_options),
+    ('bitops', '1.0-6', ext_options),
+    ('boot', '1.3-9', ext_options),
+    ('cluster', '1.14.4', ext_options),
+    ('coda', '0.16-1', ext_options),
+    ('codetools', '0.2-8', ext_options),
+    ('DBI', '0.2-7', ext_options),
+    ('foreign', '0.8-57', ext_options),
+    ('survival', '2.37-4', ext_options),
+    ('gam', '1.09', ext_options),
+    ('gamlss.data', '4.2-6', ext_options),
+    ('gamlss.dist', '4.2-0', ext_options),
+    ('hwriter', '1.3', ext_options),
+    ('KernSmooth', '2.23-10', ext_options),
+    ('zoo', '1.7-10', ext_options),
+    ('lmtest', '0.9-32', ext_options),
+    ('mnormt', '1.4-5', ext_options),
+    ('mvtnorm', '0.9-9996', ext_options),
+    ('numDeriv', '2012.9-1', ext_options),
+    ('pscl', '1.04.4', ext_options),
+    ('RSQLite', '0.11.4', ext_options),
+    ('sandwich', '2.3-0', ext_options),
+    ('sfsmisc', '1.0-24', ext_options),
+    ('spatial', '7.3-7', ext_options),
+    ('VGAM', '0.9-3', ext_options),
+    ('waveslim', '1.7.1', ext_options),
+    ('xtable', '1.7-1', ext_options),
+    ('profileModel', '0.5-9', ext_options),
+    ('brglm', '0.5-9', ext_options),
+    ('deSolve', '1.10-8', ext_options),
+    ('odesolve', '0.9-9', ext_options),
+    ('tseriesChaos', '0.1-13', ext_options),
+    ('tseries', '0.10-32', ext_options),
+    ('neuRosim', '0.2-10', ext_options),
+    ('fastICA', '1.2-0', ext_options),
+    ('R.methodsS3', '1.5.2', ext_options),
+    ('R.oo', '1.15.8', ext_options),
+    ('R.matlab', '2.0.5', ext_options),
+    ('Rniftilib', '0.0-32', ext_options),
+    ('BiocGenerics', '0.8.0', bioconductor_options),
+    ('Biobase', '2.22.0', bioconductor_options),
+    ('IRanges', '1.20.5', bioconductor_options),
+    ('AnnotationDbi', '1.24.0', bioconductor_options),
+    ('XVector', '0.2.0', bioconductor_options),
+    ('Biostrings', '2.30.0', bioconductor_options),
+    ('GenomicRanges', '1.14.3', bioconductor_options),
+    ('BSgenome', '1.30.0', bioconductor_options),
+    ('zlibbioc', '1.8.0', bioconductor_options),
+    ('Rsamtools', '1.14.1', bioconductor_options),
+    ('ShortRead', '1.20.0', bioconductor_options),
+    ('graph', '1.40.0', bioconductor_options),
+    ('igraph0', '0.5.7', ext_options),
+    ('gbm', '2.1', ext_options),
+    ('plyr', '1.8', ext_options),
+    ('dichromat', '2.0-0', ext_options),
+    ('Formula', '1.1-1', ext_options),
+    ('Hmisc', '3.13-0', ext_options),
+    ('stringr', '0.6.2', ext_options),
+    ('munsell', '0.4.2', ext_options),
+    ('labeling', '0.2', ext_options),
+    ('scales', '0.2.3', ext_options),
+    ('fastcluster', '1.1.11', ext_options),
+    ('reshape2', '1.2.2', ext_options),
+    ('digest', '0.6.3', ext_options),
+    ('gtable', '0.1.2', ext_options),
+    ('proto', '0.3-10', ext_options),
+    ('ggplot2', '0.9.3.1', ext_options),
+]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0.eb b/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0.eb
index 1f762f49eb0b438b0fcc3e5ff3c1d7b9502af10e..8d93a87fe57495b3dd41a7c367109378555795d6 100644
--- a/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0.eb
@@ -18,7 +18,7 @@ dependencies = [
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
     ('libpng', '1.6.6'),  # for plotting in R
-    ('Java', '1.7.0_21', '', True),  # Java bindings are built if Java is found, might as well provide it
+    ('Java', '1.7.0_15', '', True),  # Java bindings are built if Java is found, might as well provide it
 ]
 
 sanity_check_paths = {
@@ -138,6 +138,21 @@ exts_list = [
     ('ShortRead', '1.20.0', bioconductor_options),
     ('graph', '1.40.0', bioconductor_options),
     ('igraph0', '0.5.7', ext_options),
+    ('gbm', '2.1', ext_options),
+    ('plyr', '1.8', ext_options),
+    ('dichromat', '2.0-0', ext_options),
+    ('Formula', '1.1-1', ext_options),
+    ('Hmisc', '3.13-0', ext_options),
+    ('stringr', '0.6.2', ext_options),
+    ('munsell', '0.4.2', ext_options),
+    ('labeling', '0.2', ext_options),
+    ('scales', '0.2.3', ext_options),
+    ('fastcluster', '1.1.11', ext_options),
+    ('reshape2', '1.2.2', ext_options),
+    ('digest', '0.6.3', ext_options),
+    ('gtable', '0.1.2', ext_options),
+    ('proto', '0.3-10', ext_options),
+    ('ggplot2', '0.9.3.1', ext_options),
 ]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/r/RCS/RCS-5.7-goolf-1.4.10.eb b/easybuild/easyconfigs/r/RCS/RCS-5.7-goolf-1.4.10.eb
index eb4db79fe29574c3c171e0a17cd93f37a9b41dfd..107caabf86f3134e39059df56ac01fa88f5d8229 100644
--- a/easybuild/easyconfigs/r/RCS/RCS-5.7-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/r/RCS/RCS-5.7-goolf-1.4.10.eb
@@ -17,7 +17,7 @@ homepage = 'http://www.cs.purdue.edu/homes/trinkle/RCS/'
 description = "RCS: GNU Revision Control System - version control software"
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/rcs']
+source_urls = [GNU_SOURCE]
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
diff --git a/easybuild/easyconfigs/r/RCS/RCS-5.7-ictce-5.3.0.eb b/easybuild/easyconfigs/r/RCS/RCS-5.7-ictce-5.3.0.eb
index 779cdb65cdd5823bc6cc9ec3715e3bf11bebfb1d..d2cd389f5e8017f39d5365a59afcca7aaf5a561c 100644
--- a/easybuild/easyconfigs/r/RCS/RCS-5.7-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/r/RCS/RCS-5.7-ictce-5.3.0.eb
@@ -17,7 +17,7 @@ homepage = 'http://www.cs.purdue.edu/homes/trinkle/RCS/'
 description = "RCS: GNU Revision Control System - version control software"
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/rcs']
+source_urls = [GNU_SOURCE]
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
diff --git a/easybuild/easyconfigs/r/RSEQtools/RSEQtools-0.6-goolf-1.4.10.eb b/easybuild/easyconfigs/r/RSEQtools/RSEQtools-0.6-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d796288d70d1b4b1af69471f13a37d355e34420e
--- /dev/null
+++ b/easybuild/easyconfigs/r/RSEQtools/RSEQtools-0.6-goolf-1.4.10.eb
@@ -0,0 +1,59 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+easyblock='MakeCp'
+
+name = 'RSEQtools'
+version = '0.6'
+
+homepage = 'http://rseqtools.gersteinlab.org'
+description = """ A modular framework to analyze RNA-Seq data using compact 
+ and anonymized data summaries."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['http://archive.gersteinlab.org/proj/rnaseq/rseqtools/']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('BLAT', '3.5'),
+    ('GSL', '1.16'),
+]
+
+# this apps is tricky to compile so we will do everything in premakeopts
+#
+# firt define required environment variables
+premakeopts = 'export BIOINFOGSLDIR=$EBROOTGSL && export BIOINFOCONFDIR=conf && '
+# now move to "bios" folder and run "make && make prod". Then come back to root folder
+premakeopts += 'cd bios && make && make prod && cd - && '
+# now move to "mrf" folder, re-export the needed env var and run make
+premakeopts += 'cd mrf && export BIOINFOCONFDIR=../bios/conf/ && '
+ 
+parallel = 1
+
+# these are all the binaries compiled in "mrf" folder
+binary_files = ["psl2mrf", "bowtie2mrf", "singleExport2mrf", "mrfSubsetByTargetName",
+                "mrfQuantifier", "mrfAnnotationCoverage", "mrf2wig", "mrf2gff", "mrfSampler",
+                "mrf2bgr", "wigSegmenter", "mrfMappingBias", "mrfSelectRegion", "mrfSelectSpliced",
+                "mrfSelectAnnotated", "createSpliceJunctionLibrary", "gff2interval", "export2fastq",
+                "mergeTranscripts", "interval2gff", "interval2sequences", "bed2interval", 
+                "interval2bed", "mrf2sam", "sam2mrf", "mrfValidate", "bgrQuantifier", 
+                "bgrSegmenter", "mrfCountRegion"]
+
+files_to_copy = [
+    (['mrf/%s' % x for x in binary_files], "bin"),
+    "LICENSE", "README", "bios", "mrf", "test"
+]
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in binary_files],
+    'dirs': []
+}
+
+modextravars = {
+        'BIOINFOCONFDIR': '$root/bios/conf',
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/r/Ruby/Ruby-2.1.0-goolf-1.4.10.eb b/easybuild/easyconfigs/r/Ruby/Ruby-2.1.0-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..520edc5c97c293e7c1acc64f00c057b941f0a473
--- /dev/null
+++ b/easybuild/easyconfigs/r/Ruby/Ruby-2.1.0-goolf-1.4.10.eb
@@ -0,0 +1,31 @@
+#    With <3 for EasyBuild
+#    
+#    EasyConfig for Ruby 2.1:
+#    ----------------------------------------------------------------------------
+#    Copyright: 2014 - Gregor Mendel Institute of Molecular Plant Biology GmBH
+#    License: MIT
+#    Authors: Aaron <aaron.zauner@gmi.oeaw.ac.at> Zauner
+#    ----------------------------------------------------------------------------
+name = 'Ruby'
+version = '2.1.0'
+
+homepage = 'https://www.ruby-lang.org'
+description = """Ruby is a dynamic, open source programming language with 
+ a focus on simplicity and productivity. It has an elegant syntax that is 
+ natural to read and easy to write."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://cache.ruby-lang.org/pub/ruby/']
+
+sanity_check_paths = {
+    'files': ['bin/ruby', 'bin/rake', 'bin/gem', 'bin/testrb', 'bin/erb',
+              'bin/ri', 'bin/irb', 'bin/rdoc', 'lib/libruby.so.2.1.0',
+              'lib/libruby-static.a', 'lib/libruby.so'],
+    'dirs': ['lib/ruby/2.1.0', 'lib/ruby/gems', 'lib/pkgconfig', 'include/ruby-2.1.0']
+}
+
+configopts = "--disable-install-doc --enable-shared"
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/r/rSeq/rSeq-0.2.0-goolf-1.4.10.eb b/easybuild/easyconfigs/r/rSeq/rSeq-0.2.0-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..21ca0b75f99b034a99d6b185dcdbaa83f61e46bb
--- /dev/null
+++ b/easybuild/easyconfigs/r/rSeq/rSeq-0.2.0-goolf-1.4.10.eb
@@ -0,0 +1,31 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+easyblock='MakeCp'
+
+name = 'rSeq'
+version = '0.2.0'
+
+homepage = 'http://www-personal.umich.edu/~jianghui/rseq/'
+description = """ rSeq is a set of tools for RNA-Seq data analysis. It consists of programs 
+ that deal with many aspects of RNA-Seq data analysis, such as read quality assessment, 
+ reference sequence generation, sequence mapping, gene and isoform expressions (RPKMs) estimation, etc. 
+ There are also many other features that will be gradually added into rSeq in the future. """
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+sources = ['%(namelower)s-%(version)s-src.zip']
+source_urls = ['http://www-personal.umich.edu/~jianghui/rseq/download/']
+
+files_to_copy = [
+    (["rseq", "seqmap"], 'bin')
+]
+
+sanity_check_paths = {
+    'files': ["bin/rseq", "bin/seqmap"],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-0.1.19-goolf-1.4.10.eb b/easybuild/easyconfigs/s/SAMtools/SAMtools-0.1.19-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3f46ced5c1ea320a9fa4003c5b013daba866f804
--- /dev/null
+++ b/easybuild/easyconfigs/s/SAMtools/SAMtools-0.1.19-goolf-1.4.10.eb
@@ -0,0 +1,33 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine
+# Authors::   Cedric Laczny <cedric.laczny@uni.lu>, Fotis Georgatos <fotis.georgatos@uni.lu>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html
+##
+
+name = 'SAMtools'
+version = '0.1.19'
+
+homepage = 'http://samtools.sourceforge.net/'
+description = """SAM (Sequence Alignment/Map) format is a generic format
+for storing large nucleotide sequence alignments."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = [('http://sourceforge.net/projects/samtools/files/%(namelower)s/%(version)s', 'download')]
+
+patches = ['SAMtools-%(version)s_Makefile-ncurses.patch']
+
+dependencies = [
+    ('ncurses', '5.9'),
+    ('zlib', '1.2.7'),
+]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-0.1.19-ictce-5.5.0.eb b/easybuild/easyconfigs/s/SAMtools/SAMtools-0.1.19-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..dd1a4bc9ddeae52d77e24b2daff3a2d9405dcd33
--- /dev/null
+++ b/easybuild/easyconfigs/s/SAMtools/SAMtools-0.1.19-ictce-5.5.0.eb
@@ -0,0 +1,33 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine
+# Authors::   Cedric Laczny <cedric.laczny@uni.lu>, Fotis Georgatos <fotis.georgatos@uni.lu>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html
+##
+
+name = 'SAMtools'
+version = '0.1.19'
+
+homepage = 'http://samtools.sourceforge.net/'
+description = """SAM (Sequence Alignment/Map) format is a generic format
+for storing large nucleotide sequence alignments."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = [('http://sourceforge.net/projects/samtools/files/%(namelower)s/%(version)s', 'download')]
+
+patches = ['SAMtools-0.1.19_Makefile-ncurses.patch']
+
+dependencies = [
+    ('ncurses', '5.9'),
+    ('zlib', '1.2.7'),
+]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-0.1.19_Makefile-ncurses.patch b/easybuild/easyconfigs/s/SAMtools/SAMtools-0.1.19_Makefile-ncurses.patch
new file mode 100644
index 0000000000000000000000000000000000000000..c7506818207514743fe3ad0562a9c53972e16d2f
--- /dev/null
+++ b/easybuild/easyconfigs/s/SAMtools/SAMtools-0.1.19_Makefile-ncurses.patch
@@ -0,0 +1,81 @@
+--- samtools-0.1.19/Makefile.orig	2013-03-19 08:48:09.000000000 +0100
++++ samtools-0.1.19/Makefile	2013-12-05 11:39:20.167885410 +0100
+@@ -12,10 +12,10 @@
+ 			cut_target.o phase.o bam2depth.o padding.o bedcov.o bamshuf.o \
+ 			bam_tview_curses.o bam_tview_html.o
+ PROG=		samtools
+-INCLUDES=	-I.
++INCLUDES=	-I$(EBROOTNCURSES)/include -I$(EBROOTZLIB)/include -I.
+ SUBDIRS=	. bcftools misc
+-LIBPATH=
+-LIBCURSES=	-lcurses # -lXCurses
++LIBPATH= -L$(EBROOTZLIB)/lib 
++LIBCURSES=	-L$(EBROOTNCURSES)/lib -lcurses -L$(EBROOTZLIB)/lib -lz # -lXCurses
+ 
+ .SUFFIXES:.c .o
+ .PHONY: all lib
+@@ -47,10 +47,10 @@
+ 		$(CC) $(CFLAGS) -o $@ $(AOBJS) $(LDFLAGS) libbam.a -Lbcftools -lbcf $(LIBPATH) $(LIBCURSES) -lm -lz -lpthread
+ 
+ razip:razip.o razf.o $(KNETFILE_O)
+-		$(CC) $(CFLAGS) -o $@ $^ -lz
++		$(CC) $(CFLAGS) -o $@ $^ -L$(EBROOTZLIB)/lib -lz
+ 
+ bgzip:bgzip.o bgzf.o $(KNETFILE_O)
+-		$(CC) $(CFLAGS) -o $@ $^ -lz -lpthread
++		$(CC) $(CFLAGS) -o $@ $^ -L$(EBROOTZLIB)/lib -lz -lpthread
+ 
+ bgzf.o:bgzf.c bgzf.h
+ 		$(CC) -c $(CFLAGS) $(DFLAGS) -DBGZF_CACHE $(INCLUDES) bgzf.c -o $@
+@@ -81,10 +81,10 @@
+ 
+ 
+ libbam.1.dylib-local:$(LOBJS)
+-		libtool -dynamic $(LOBJS) -o libbam.1.dylib -lc -lz
++		libtool -dynamic $(LOBJS) -o libbam.1.dylib -lc -L$(EBROOTZLIB)/lib  -lz
+ 
+ libbam.so.1-local:$(LOBJS)
+-		$(CC) -shared -Wl,-soname,libbam.so -o libbam.so.1 $(LOBJS) -lc -lz
++		$(CC) -shared -Wl,-soname,libbam.so -o libbam.so.1 $(LOBJS) -lc -L$(EBROOTZLIB)/lib  -lz
+ 
+ dylib:
+ 		@$(MAKE) cleanlocal; \
+--- samtools-0.1.19/misc/Makefile.orig	2013-03-19 08:48:09.000000000 +0100
++++ samtools-0.1.19/misc/Makefile	2013-12-05 11:40:21.979700133 +0100
+@@ -28,19 +28,19 @@
+ lib:
+ 
+ bamcheck:bamcheck.o
+-		$(CC) $(CFLAGS) -o $@ bamcheck.o -L.. -lm -lbam -lpthread -lz
++		$(CC) $(CFLAGS) -o $@ bamcheck.o -L.. -lm -lbam -lpthread -L$(EBROOTZLIB)/lib -lz
+ 
+ bamcheck.o:bamcheck.c ../faidx.h ../khash.h ../sam.h ../razf.h
+ 		$(CC) $(CFLAGS) -c -I.. -o $@ bamcheck.c
+ 
+ ace2sam:ace2sam.o
+-		$(CC) $(CFLAGS) -o $@ ace2sam.o -lz
++		$(CC) $(CFLAGS) -o $@ ace2sam.o -L$(EBROOTZLIB)/lib -lz
+ 
+ wgsim:wgsim.o
+-		$(CC) $(CFLAGS) -o $@ wgsim.o -lm -lz
++		$(CC) $(CFLAGS) -o $@ wgsim.o -lm -L$(EBROOTZLIB)/lib -lz
+ 
+ md5fa:md5.o md5fa.o md5.h ../kseq.h
+-		$(CC) $(CFLAGS) -o $@ md5.o md5fa.o -lz
++		$(CC) $(CFLAGS) -o $@ md5.o md5fa.o -L$(EBROOTZLIB)/lib -lz
+ 
+ md5sum-lite:md5sum-lite.o
+ 		$(CC) $(CFLAGS) -o $@ md5sum-lite.o
+@@ -49,10 +49,10 @@
+ 		$(CC) -c $(CFLAGS) -DMD5SUM_MAIN -o $@ md5.c
+ 
+ maq2sam-short:maq2sam.c
+-		$(CC) $(CFLAGS) -o $@ maq2sam.c -lz
++		$(CC) $(CFLAGS) -o $@ maq2sam.c -L$(EBROOTZLIB)/lib  -lz
+ 
+ maq2sam-long:maq2sam.c
+-		$(CC) $(CFLAGS) -DMAQ_LONGREADS -o $@ maq2sam.c -lz
++		$(CC) $(CFLAGS) -DMAQ_LONGREADS -o $@ maq2sam.c -L$(EBROOTZLIB)/lib  -lz
+ 
+ md5fa.o:md5.h md5fa.c
+ 		$(CC) $(CFLAGS) -c -I.. -o $@ md5fa.c
diff --git a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index cbfc0fc2a71c44e53897a7ff00ac7cbe1405dbaf..a5239381240236db413de8c537a9551c349c8f88 100644
--- a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -14,23 +14,19 @@ sources = [SOURCELOWER_TAR_GZ]
 
 python = 'Python'
 pythonversion = '2.7.3'
-pythonshortversion = ".".join(pythonversion.split(".")[:-1])
+pyshortver = ".".join(pythonversion.split(".")[:-1])
 versionsuffix = '-%s-%s' % (python, pythonversion)
 zmqapi = 2
 
 dependencies = [
-                (python, pythonversion),  # python with builtin argparse
-                ('Greenlet', '0.4.0', versionsuffix),
-                ('PyZMQ', '2.2.0.1', '%s-zmq%s' % (versionsuffix, zmqapi)),
-               ]
+    (python, pythonversion),  # python with builtin argparse
+    ('Greenlet', '0.4.0', versionsuffix),
+    ('PyZMQ', '2.2.0.1', '%s-zmq%s' % (versionsuffix, zmqapi)),
+]
 
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': [('lib/python%(pyv)s/site-packages/'
-                                'scoop-%(version)s-py%(pyv)s.egg/scoop/') %
-                                {'pyv': pythonshortversion,
-                                 'version': version }
-                              ]
-                     }
+    'files': [],
+    'dirs': ['lib/python%(pyv)s/site-packages/scoop-%%(version)s-py%(pyv)s.egg/scoop/' % {'pyv': pyshortver}],
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-goolf-1.4.10-Python-2.7.3.eb
index 750cd29e0884eda5fd56b6436c3e7390f3844877..b60889a72b663eaab48d98616c51a346fe650e9d 100644
--- a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-goolf-1.4.10-Python-2.7.3.eb
@@ -5,7 +5,7 @@ version = '0.5.3'
 
 homepage = 'http://code.google.com/p/scoop/'
 description = """SCOOP (Scalable COncurrent Operations in Python) is a distributed task module
-allowing concurrent parallel programming on various environments, from heterogeneous grids to supercomputers."""
+ allowing concurrent parallel programming on various environments, from heterogeneous grids to supercomputers."""
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
@@ -14,23 +14,19 @@ sources = [SOURCELOWER_TAR_GZ]
 
 python = 'Python'
 pythonversion = '2.7.3'
-pythonshortversion = ".".join(pythonversion.split(".")[:-1])
+pyshortver = ".".join(pythonversion.split(".")[:-1])
 versionsuffix = '-%s-%s' % (python, pythonversion)
 zmqapi = 2
 
 dependencies = [
-                (python, pythonversion),  # python with builtin argparse
-                ('Greenlet', '0.4.0', versionsuffix),
-                ('PyZMQ', '2.2.0.1', '%s-zmq%s' % (versionsuffix, zmqapi)),
-               ]
+    (python, pythonversion),  # python with builtin argparse
+    ('Greenlet', '0.4.0', versionsuffix),
+    ('PyZMQ', '2.2.0.1', '%s-zmq%s' % (versionsuffix, zmqapi)),
+]
 
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': [('lib/python%(pyv)s/site-packages/'
-                                'scoop-%(version)s-py%(pyv)s.egg/scoop/') %
-                                {'pyv': pythonshortversion,
-                                 'version': version }
-                              ]
-                     }
+    'files': [],
+    'dirs': ['lib/python%(pyv)s/site-packages/scoop-%%(version)s-py%(pyv)s.egg/scoop/' % {'pyv': pyshortver}],
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-ictce-4.1.13-Python-2.7.3.eb
index 6359677a92efb063bce44aeed12136c5f53a8555..3f302d78e20b0e3192220c8a1984528752f1571e 100644
--- a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-ictce-4.1.13-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-ictce-4.1.13-Python-2.7.3.eb
@@ -14,23 +14,19 @@ sources = [SOURCELOWER_TAR_GZ]
 
 python = 'Python'
 pythonversion = '2.7.3'
-pythonshortversion = ".".join(pythonversion.split(".")[:-1])
+pyshortver = ".".join(pythonversion.split(".")[:-1])
 versionsuffix = '-%s-%s' % (python, pythonversion)
 zmqapi = 2
 
 dependencies = [
-                (python, pythonversion),  # python with builtin argparse
-                ('Greenlet', '0.4.0', versionsuffix),
-                ('PyZMQ', '2.2.0.1', '%s-zmq%s' % (versionsuffix, zmqapi)),
-               ]
+    (python, pythonversion),  # python with builtin argparse
+    ('Greenlet', '0.4.0', versionsuffix),
+    ('PyZMQ', '2.2.0.1', '%s-zmq%s' % (versionsuffix, zmqapi)),
+]
 
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': [('lib/python%(pyv)s/site-packages/'
-                                'scoop-%(version)s-py%(pyv)s.egg/scoop/') %
-                                {'pyv': pythonshortversion,
-                                 'version': version }
-                              ]
-                     }
+    'files': [],
+    'dirs': ['lib/python%(pyv)s/site-packages/scoop-%%(version)s-py%(pyv)s.egg/scoop/' % {'pyv': pyshortver}],
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-ictce-5.3.0-Python-2.7.3.eb
index 8a88b6106a5a5bca33640d5abe18fce0dac763a8..154be5b9d1a870a33e5c0bc94a08b1ef1896827c 100644
--- a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-ictce-5.3.0-Python-2.7.3.eb
@@ -7,7 +7,6 @@ homepage = 'http://code.google.com/p/scoop/'
 description = """SCOOP (Scalable COncurrent Operations in Python) is a distributed task module
  allowing concurrent parallel programming on various environments, from heterogeneous grids to supercomputers."""
 
-
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 source_urls = ["http://scoop.googlecode.com/files/"]
@@ -15,23 +14,19 @@ sources = [SOURCELOWER_TAR_GZ]
 
 python = 'Python'
 pythonversion = '2.7.3'
-pythonshortversion = ".".join(pythonversion.split(".")[:-1])
+pyshortver = ".".join(pythonversion.split(".")[:-1])
 versionsuffix = '-%s-%s' % (python, pythonversion)
 zmqapi = 2
 
 dependencies = [
-                (python, pythonversion),  # python with builtin argparse
-                ('Greenlet', '0.4.0', versionsuffix),
-                ('PyZMQ', '2.2.0.1', '%s-zmq%s' % (versionsuffix, zmqapi)),
-               ]
+    (python, pythonversion),  # python with builtin argparse
+    ('Greenlet', '0.4.0', versionsuffix),
+    ('PyZMQ', '2.2.0.1', '%s-zmq%s' % (versionsuffix, zmqapi)),
+]
 
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': [('lib/python%(pyv)s/site-packages/'
-                                'scoop-%(version)s-py%(pyv)s.egg/scoop/') %
-                                {'pyv': pythonshortversion,
-                                 'version': version }
-                              ]
-                     }
+    'files': [],
+    'dirs': ['lib/python%(pyv)s/site-packages/scoop-%%(version)s-py%(pyv)s.egg/scoop/' % {'pyv': pyshortver}],
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.5.eb b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0794de7781acb8e6bf8d1890b0706c3156c6b0f5
--- /dev/null
+++ b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.5.eb
@@ -0,0 +1,32 @@
+easyblock = "PythonPackage"
+
+name = 'SCOOP'
+version = '0.6.2'
+
+homepage = 'http://code.google.com/p/scoop/'
+description = """SCOOP (Scalable COncurrent Operations in Python) is a distributed task module
+ allowing concurrent parallel programming on various environments, from heterogeneous grids to supercomputers."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+source_urls = ["http://scoop.googlecode.com/files/"]
+sources = ["%(namelower)s-%(version)s.release.tar.gz"]
+
+python = 'Python'
+pythonversion = '2.7.5'
+pyshortver = ".".join(pythonversion.split(".")[:-1])
+versionsuffix = '-%s-%s' % (python, pythonversion)
+zmqapi = 2
+
+dependencies = [
+    (python, pythonversion),  # python with builtin argparse
+    ('Greenlet', '0.4.2', versionsuffix),
+    ('PyZMQ', '2.2.0.1', '%s-zmq%s' % (versionsuffix, zmqapi)),
+]
+
+sanity_check_paths = {
+    'dirs': [],
+    'files': ['lib/python%(pyv)s/site-packages/scoop-%%(version)s.release-py%(pyv)s.egg' % {'pyv': pyshortver}],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.6.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d684a52592a90cf7678e03148421055a53342961
--- /dev/null
+++ b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-ictce-5.5.0-Python-2.7.6.eb
@@ -0,0 +1,31 @@
+easyblock = "PythonPackage"
+
+name = 'SCOOP'
+version = '0.6.2'
+
+homepage = 'http://code.google.com/p/scoop/'
+description = """SCOOP (Scalable COncurrent Operations in Python) is a distributed task module
+ allowing concurrent parallel programming on various environments, from heterogeneous grids to supercomputers."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+source_urls = ["http://scoop.googlecode.com/files/"]
+sources = ['%s-%s.release.tar.gz' % (name.lower(), version)]
+
+python = 'Python'
+pythonversion = '2.7.6'
+pyshortver = ".".join(pythonversion.split(".")[:-1])
+versionsuffix = '-%s-%s' % (python, pythonversion)
+
+dependencies = [
+    (python, pythonversion),  # python with builtin argparse
+    ('Greenlet', '0.4.2', versionsuffix),
+    ('PyZMQ', '14.0.1', versionsuffix),
+]
+
+sanity_check_paths = {
+    'dirs': [],
+    'files': ['lib/python%(pyv)s/site-packages/scoop-%%(version)s.release-py%(pyv)s.egg' % {'pyv': pyshortver}],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.0_esmumps-ictce-5.3.0.eb b/easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.0_esmumps-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7bad11e6da2b983bc3e57b3e918e52c7e918c524
--- /dev/null
+++ b/easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.0_esmumps-ictce-5.3.0.eb
@@ -0,0 +1,14 @@
+name = 'SCOTCH'
+version = '6.0.0_esmumps'
+
+homepage = 'http://www.labri.fr/perso/pelegrin/scotch/'
+description = """Software package and libraries for sequential and parallel graph partitioning,
+static mapping, and sparse matrix block ordering, and sequential mesh and hypergraph partitioning."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'pic': True}
+
+source_urls = ['https://gforge.inria.fr/frs/download.php/31832/']
+sources = ['%(namelower)s_%(version)s.tar.gz']
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/s/SCons/SCons-2.3.0-ictce-5.3.0-Python-2.7.5.eb b/easybuild/easyconfigs/s/SCons/SCons-2.3.0-ictce-5.3.0-Python-2.7.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..35beebb612482bd82ea3a8f9425b1c05413f41e8
--- /dev/null
+++ b/easybuild/easyconfigs/s/SCons/SCons-2.3.0-ictce-5.3.0-Python-2.7.5.eb
@@ -0,0 +1,26 @@
+easyblock = 'PythonPackage'
+
+name = 'SCons'
+version = '2.3.0'
+
+homepage = 'http://www.scons.org/'
+description = "SCons is a software construction tool."
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
+
+python = 'Python'
+pyver = '2.7.5'
+versionsuffix = '-%s-%s' % (python, pyver)
+dependencies = [(python, pyver)]
+
+sanity_check_paths = {
+    'files': ['bin/scons', 'bin/scons-time', 'bin/sconsign'],
+    'dirs': ['lib/%(namelower)s-%(version)s/%(name)s'],
+}
+
+options = {'modulename': False}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/s/SOAPdenovo2/SOAPdenovo2-fix-unistd-includes.patch b/easybuild/easyconfigs/s/SOAPdenovo2/SOAPdenovo2-fix-unistd-includes.patch
new file mode 100644
index 0000000000000000000000000000000000000000..b5d76889db740c01129fee45e5e97f1e4748937e
--- /dev/null
+++ b/easybuild/easyconfigs/s/SOAPdenovo2/SOAPdenovo2-fix-unistd-includes.patch
@@ -0,0 +1,10 @@
+--- SOAPdenovo2-src-r240.orig/sparsePregraph/inc/stdinc.h	2013-07-09 05:46:52.000000000 +0200
++++ SOAPdenovo2-src-r240/sparsePregraph/inc/stdinc.h	2014-04-14 10:07:31.009191162 +0200
+@@ -32,6 +32,7 @@
+ #include <stddef.h>
+ #include <time.h>
+ #include <pthread.h>
++#include <unistd.h>
+ using namespace std;
+ 
+ 
diff --git a/easybuild/easyconfigs/s/SOAPdenovo2/SOAPdenovo2-r240-goolf-1.4.10.eb b/easybuild/easyconfigs/s/SOAPdenovo2/SOAPdenovo2-r240-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f630ed683958a4fdb25bf89653e8d86ed13cbe1c
--- /dev/null
+++ b/easybuild/easyconfigs/s/SOAPdenovo2/SOAPdenovo2-r240-goolf-1.4.10.eb
@@ -0,0 +1,38 @@
+#    With <3 for EasyBuild
+#    
+#    EasyConfig for SOAPdenovo2:
+#    ----------------------------------------------------------------------------
+#    Copyright: 2013 - Gregor Mendel Institute of Molecular Plant Biology GmBH
+#    License: MIT
+#    Authors: Petar <petar.forai@gmi.oeaw.ac.at> Forai
+#    ----------------------------------------------------------------------------
+
+easyblock = "MakeCp"
+
+name = 'SOAPdenovo2'
+version = 'r240'
+
+homepage = 'http://soap.genomics.org.cn/index.html'
+description = """SOAPdenovo is a novel short-read assembly method that can build a 
+ de novo draft assembly for human-sized genomes. The program is specially designed to 
+ assemble Illumina short reads. It creates new opportunities for building reference 
+ sequences and carrying out accurate analyses of unexplored genomes in a cost effective way. 
+ SOAPdenovo2 is the successor of SOAPdenovo.""" 
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['%(name)s-src-%(version)s.tgz']
+
+patches = ['SOAPdenovo2-fix-unistd-includes.patch']
+
+# parallel build is broken
+maxparallel = 1
+
+files_to_copy = [(['SOAPdenovo-127mer','SOAPdenovo-63mer'], 'bin')]
+
+sanity_check_paths = {
+    'files': ['bin/SOAPdenovo-63mer', 'bin/SOAPdenovo-127mer'],
+    'dirs': [],
+}
diff --git a/easybuild/easyconfigs/s/SOAPdenovo2/SOAPdenovo2-r240-ictce-5.3.0.eb b/easybuild/easyconfigs/s/SOAPdenovo2/SOAPdenovo2-r240-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..05c5b5cfbbd024c256b098929d9dbd155df5313c
--- /dev/null
+++ b/easybuild/easyconfigs/s/SOAPdenovo2/SOAPdenovo2-r240-ictce-5.3.0.eb
@@ -0,0 +1,38 @@
+#    With <3 for EasyBuild
+#    
+#    EasyConfig for SOAPdenovo2:
+#    ----------------------------------------------------------------------------
+#    Copyright: 2013 - Gregor Mendel Institute of Molecular Plant Biology GmBH
+#    License: MIT
+#    Authors: Petar <petar.forai@gmi.oeaw.ac.at> Forai
+#    ----------------------------------------------------------------------------
+
+easyblock = "MakeCp"
+
+name = 'SOAPdenovo2'
+version = 'r240'
+
+homepage = 'http://soap.genomics.org.cn/index.html'
+description = """SOAPdenovo is a novel short-read assembly method that can build a 
+ de novo draft assembly for human-sized genomes. The program is specially designed to 
+ assemble Illumina short reads. It creates new opportunities for building reference 
+ sequences and carrying out accurate analyses of unexplored genomes in a cost effective way. 
+ SOAPdenovo2 is the successor of SOAPdenovo.""" 
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['%(name)s-src-%(version)s.tgz']
+
+patches = ['SOAPdenovo2-fix-unistd-includes.patch']
+
+# parallel build is broken
+maxparallel = 1
+
+files_to_copy = [(['SOAPdenovo-127mer','SOAPdenovo-63mer'], 'bin')]
+
+sanity_check_paths = {
+    'files': ['bin/SOAPdenovo-63mer', 'bin/SOAPdenovo-127mer'],
+    'dirs': [],
+}
diff --git a/easybuild/easyconfigs/s/SOAPdenovo2/SOAPdenovo2-r240-ictce-5.5.0.eb b/easybuild/easyconfigs/s/SOAPdenovo2/SOAPdenovo2-r240-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..897f6582370b9ff862fc7fd9b8603176da8eb5b9
--- /dev/null
+++ b/easybuild/easyconfigs/s/SOAPdenovo2/SOAPdenovo2-r240-ictce-5.5.0.eb
@@ -0,0 +1,38 @@
+#    With <3 for EasyBuild
+#    
+#    EasyConfig for SOAPdenovo2:
+#    ----------------------------------------------------------------------------
+#    Copyright: 2013 - Gregor Mendel Institute of Molecular Plant Biology GmBH
+#    License: MIT
+#    Authors: Petar <petar.forai@gmi.oeaw.ac.at> Forai
+#    ----------------------------------------------------------------------------
+
+easyblock = "MakeCp"
+
+name = 'SOAPdenovo2'
+version = 'r240'
+
+homepage = 'http://soap.genomics.org.cn/index.html'
+description = """SOAPdenovo is a novel short-read assembly method that can build a 
+ de novo draft assembly for human-sized genomes. The program is specially designed to 
+ assemble Illumina short reads. It creates new opportunities for building reference 
+ sequences and carrying out accurate analyses of unexplored genomes in a cost effective way. 
+ SOAPdenovo2 is the successor of SOAPdenovo.""" 
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['%(name)s-src-%(version)s.tgz']
+
+patches = ['SOAPdenovo2-fix-unistd-includes.patch']
+
+# parallel build is broken
+maxparallel = 1
+
+files_to_copy = [(['SOAPdenovo-127mer','SOAPdenovo-63mer'], 'bin')]
+
+sanity_check_paths = {
+    'files': ['bin/SOAPdenovo-63mer', 'bin/SOAPdenovo-127mer'],
+    'dirs': [],
+}
diff --git a/easybuild/easyconfigs/s/SQLite/SQLite-3.8.1-ictce-5.3.0.eb b/easybuild/easyconfigs/s/SQLite/SQLite-3.8.1-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2d878020229a4f731af96dc48da74e3ce37086a5
--- /dev/null
+++ b/easybuild/easyconfigs/s/SQLite/SQLite-3.8.1-ictce-5.3.0.eb
@@ -0,0 +1,35 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine
+# Authors::   Fotis Georgatos <fotis.georgatos@uni.lu>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/
+##
+
+name = 'SQLite'
+version = '3.8.1'
+
+homepage = 'http://www.hwaci.com/sw/sqlite/'
+description = "SQLite: SQL Database Engine in a C Library"
+
+# eg. http://www.hwaci.com/sw/sqlite/2013/sqlite-autoconf-3080100.tar.gz
+source_urls = ['http://www.hwaci.com/sw/sqlite/2013']
+sources = ['sqlite-autoconf-%s0%s0%s00.tar.gz' % tuple(version.split('.'))]  # very weird way to calculate your filename
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+dependencies = [
+    ('libreadline', '6.2'),
+    ('Tcl', '8.6.1'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/sqlite3'],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/s/SRA-Tookit/SRA-Toolkit-2.3.5-centos_linux64.eb b/easybuild/easyconfigs/s/SRA-Tookit/SRA-Toolkit-2.3.5-centos_linux64.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fc325c12fd412351c3880a9ffbe661bd0f1ff047
--- /dev/null
+++ b/easybuild/easyconfigs/s/SRA-Tookit/SRA-Toolkit-2.3.5-centos_linux64.eb
@@ -0,0 +1,26 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+easyblock = 'Tarball'
+
+name = 'SRA-Toolkit'
+version = '2.3.5'
+versionsuffix = '-centos_linux64'
+
+homepage = 'http://trace.ncbi.nlm.nih.gov/Traces/sra/sra.cgi?view=std'
+description = """ The NCBI SRA Toolkit enables reading (dumping) of sequencing files
+ from the SRA database and writing (loading) files into the .sra format """
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+source_urls = ['http://ftp-trace.ncbi.nlm.nih.gov/sra/sdk/%(version)s/']
+sources = ['sratoolkit.%(version)s%(versionsuffix)s.tar.gz']
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ["sra-stat", "sra-sort", "srapath", "bam-load"]],
+    'dirs': ["example", "schema"],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SURF/SURF-1.0-ictce-5.3.0-LINUXAMD64.eb b/easybuild/easyconfigs/s/SURF/SURF-1.0-ictce-5.3.0-LINUXAMD64.eb
new file mode 100644
index 0000000000000000000000000000000000000000..711aeda3a7cbf8f0960e517ad41efa22741b1b4c
--- /dev/null
+++ b/easybuild/easyconfigs/s/SURF/SURF-1.0-ictce-5.3.0-LINUXAMD64.eb
@@ -0,0 +1,34 @@
+#
+# author: Dina Mahmoud Ibrahim ( Cairo University )
+#
+easyblock = 'MakeCp'
+
+name = 'SURF'
+version = '1.0'
+ARCH = 'LINUXAMD64'
+versionsuffix = '-%s' % ARCH
+
+homepage = 'http://www.ks.uiuc.edu/Research/vmd/vmd-1.7/ug/node65.html'
+description = "A molecular surface solver, which can be used as rendering method in VMD."
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = ['http://www.ks.uiuc.edu/Research/vmd/extsrcs']
+sources = [('%(namelower)s.tar.Z', 'tar -xzf %s')]
+
+builddependencies = [
+    ('makedepend', '1.0.4'),
+    ('ed', '1.9'),
+]
+
+premakeopts = 'make INCLUDE="-I. -I$EBROOTGCC/lib/gcc/x86_64-unknown-linux-gnu/$EBVERSIONGCC/include" depend && '
+makeopts = ' && mv surf surf_%s' % ARCH
+
+files_to_copy = [(['surf_%s' % ARCH], "bin")]
+
+sanity_check_paths = {
+    'files': ['bin/surf_%s' % ARCH],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3-ictce-5.3.0.eb b/easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..12bb8bfb6efca93fe33ad11b5a0e53aec4f4a9a6
--- /dev/null
+++ b/easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3-ictce-5.3.0.eb
@@ -0,0 +1,21 @@
+name = 'Sablotron'
+version = '1.0.3'
+
+homepage = 'http://sablotron.sourceforge.net/'
+description = """Sablotron XML processor"""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['Sablot-%(version)s.tar.gz']
+
+patches = ['%(name)s-%(version)s_recent-icpc.patch']
+
+dependencies = [('expat', '2.1.0')]
+
+sanity_check_paths = {
+    'files': ['bin/sabcmd', 'bin/sablot-config', 'include/sablot.h', 'lib/libsablot.a', 'lib/libsablot.so'],
+    'dirs': ['share/doc/html/sablot', 'man'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-1.8.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4-LAPACK-3.4.0-BLACS-1.1.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-1.8.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4-LAPACK-3.4.0-BLACS-1.1.eb
index 611b783f5dcf841509019e2d14aa8f504429c94e..210286f19db809377ab1291cf6c930e7d2ae266f 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-1.8.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4-LAPACK-3.4.0-BLACS-1.1.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-1.8.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4-LAPACK-3.4.0-BLACS-1.1.eb
@@ -8,7 +8,7 @@ description = """The ScaLAPACK (or Scalable LAPACK) library includes a subset of
 toolchain = {'name': 'gompi', 'version': '1.1.0-no-OFED'}
 toolchainopts = {'pic': True}
 
-sources = ['%s-%s.tgz' % (name.lower(), version)]
+sources = [SOURCELOWER_TGZ]
 source_urls = [homepage]
 
 blaslib = 'ATLAS'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-1.8.0-iiqmpi-3.3.0-ACML-5.3.0-ifort-64bit-BLACS-1.1.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-1.8.0-iiqmpi-3.3.0-ACML-5.3.0-ifort-64bit-BLACS-1.1.eb
index d71631e46bee88b2d969d9a0ded9ca2d431c08bd..adc08604576685e7874cfae6f1f9e530c2320d70 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-1.8.0-iiqmpi-3.3.0-ACML-5.3.0-ifort-64bit-BLACS-1.1.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-1.8.0-iiqmpi-3.3.0-ACML-5.3.0-ifort-64bit-BLACS-1.1.eb
@@ -9,7 +9,7 @@ toolchain = {'name': 'iiqmpi', 'version': '3.3.0'}
 toolchainopts = {'pic': True}
 
 source_urls = [homepage]
-sources = ['%(namelower)s-%(version)s.tgz']
+sources = [SOURCELOWER_TGZ]
 
 # BLAS and LAPACK
 acmln = 'ACML'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.1-gompi-1.1.0-no-OFED-ATLAS-3.8.4-LAPACK-3.4.0.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.1-gompi-1.1.0-no-OFED-ATLAS-3.8.4-LAPACK-3.4.0.eb
index 168e48a0dbac98b5ab6611ca7cd52b548a04fad2..269cb64669464104bdf417d6a7dd39aca3414117 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.1-gompi-1.1.0-no-OFED-ATLAS-3.8.4-LAPACK-3.4.0.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.1-gompi-1.1.0-no-OFED-ATLAS-3.8.4-LAPACK-3.4.0.eb
@@ -9,7 +9,7 @@ toolchain = {'name': 'gompi', 'version': '1.1.0-no-OFED'}
 toolchainopts = {'pic': True}
 
 source_urls = [homepage]
-sources = ['%(namelower)s-%(version)s.tgz']
+sources = [SOURCELOWER_TGZ]
 
 blaslib = 'ATLAS'
 blasver = '3.8.4'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmpich-1.1.6-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmpich-1.1.6-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
index b943203372420d5e2ca47ba2164051d8d2306f73..904f9125acf070f723adbbda9438a0a02f892279 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmpich-1.1.6-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmpich-1.1.6-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
@@ -9,7 +9,7 @@ toolchain = {'name': 'cgmpich', 'version': '1.1.6'}
 toolchainopts = {'pic': True}
 
 source_urls = [homepage]
-sources = ['%(namelower)s-%(version)s.tgz']
+sources = [SOURCELOWER_TGZ]
 
 blaslib = 'OpenBLAS'
 blasver = '0.2.6'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmvapich2-1.1.12rc1-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmvapich2-1.1.12rc1-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
index 5bea6d5a9bb505df593a4520bdaec1be5b089735..df6546768d28176aadb22c00cd5b7a4809171320 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmvapich2-1.1.12rc1-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmvapich2-1.1.12rc1-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
@@ -9,7 +9,7 @@ toolchain = {'name': 'cgmvapich2', 'version': '1.1.12rc1'}
 toolchainopts = {'pic': True}
 
 source_urls = [homepage]
-sources = ['%(namelower)s-%(version)s.tgz']
+sources = [SOURCELOWER_TGZ]
 
 blaslib = 'OpenBLAS'
 blasver = '0.2.6'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmvapich2-1.2.7-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmvapich2-1.2.7-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
index eee66ed24d0e31f3e99ee0b03ba4598727c32f89..799e3b5272818aab7c2221231127ac00eb64a48d 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmvapich2-1.2.7-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmvapich2-1.2.7-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
@@ -9,7 +9,7 @@ toolchain = {'name': 'cgmvapich2', 'version': '1.2.7'}
 toolchainopts = {'pic': True}
 
 source_urls = [homepage]
-sources = ['%(namelower)s-%(version)s.tgz']
+sources = [SOURCELOWER_TGZ]
 
 blaslib = 'OpenBLAS'
 blasver = '0.2.6'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgompi-1.1.7-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgompi-1.1.7-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
index cfe77a497facddddd33f770c8d33e37acd2673d3..d0e28920491631b6aab0336b3f0c1b63eacdb9c5 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgompi-1.1.7-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgompi-1.1.7-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
@@ -9,7 +9,7 @@ toolchain = {'name': 'cgompi', 'version': '1.1.7'}
 toolchainopts = {'pic': True}
 
 source_urls = [homepage]
-sources = ['%(namelower)s-%(version)s.tgz']
+sources = [SOURCELOWER_TGZ]
 
 blaslib = 'OpenBLAS'
 blasver = '0.2.6'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmpich2-1.4.8-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmpich2-1.4.8-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
index 5b744a280f47f69814abccda9f4a7e7348288742..967d7b0bdaa53eedc8a8c237153f4225c55b2864 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmpich2-1.4.8-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmpich2-1.4.8-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
@@ -9,7 +9,7 @@ toolchain = {'name': 'gmpich2', 'version': '1.4.8'}
 toolchainopts = {'pic': True}
 
 source_urls = [homepage]
-sources = ['%(namelower)s-%(version)s.tgz']
+sources = [SOURCELOWER_TGZ]
 
 blaslib = 'OpenBLAS'
 blasver = '0.2.6'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.12-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.12-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
index 5ff70cf998f52ff074c5b20aa769537daf1767ab..9f4ac4da774624a89460d74a48ce13e2e41d276c 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.12-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.12-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
@@ -9,7 +9,7 @@ toolchain = {'name': 'gmvapich2', 'version': '1.7.12'}
 toolchainopts = {'pic': True}
 
 source_urls = [homepage]
-sources = ['%(namelower)s-%(version)s.tgz']
+sources = [SOURCELOWER_TGZ]
 
 blaslib = 'OpenBLAS'
 blasver = '0.2.6'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.12rc1-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.12rc1-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
index 060eb83f03d83e2f1795acbb1de1423bc6c9893b..4e2c7a11615538272f092ec26aa44466a48b0634 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.12rc1-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.12rc1-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
@@ -9,7 +9,7 @@ toolchain = {'name': 'gmvapich2', 'version': '1.7.12rc1'}
 toolchainopts = {'pic': True}
 
 source_urls = [homepage]
-sources = ['%(namelower)s-%(version)s.tgz']
+sources = [SOURCELOWER_TGZ]
 
 blaslib = 'OpenBLAS'
 blasver = '0.2.6'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.9a2-ACML-5.2.0-gfortran-64bit.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.9a2-ACML-5.2.0-gfortran-64bit.eb
index f68c5fe5d412cce573439e006beb0e00de81ff0d..b8ff206dfbae2ce0c6a8680a1785dbf67761f143 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.9a2-ACML-5.2.0-gfortran-64bit.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.9a2-ACML-5.2.0-gfortran-64bit.eb
@@ -9,7 +9,7 @@ toolchain = {'name': 'gmvapich2', 'version': '1.7.9a2'}
 toolchainopts = {'pic': True}
 
 source_urls = [homepage]
-sources = ['%(namelower)s-%(version)s.tgz']
+sources = [SOURCELOWER_TGZ]
 
 blas_lapack_lib = 'ACML'
 blas_lapack_ver = '5.2.0'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.3.12-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.3.12-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
index ee98eec7c915f1c2ec0d5572e471c83bda9d4743..04f36f4b91043a273458db989e81da07eb55037c 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.3.12-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.3.12-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
@@ -9,7 +9,7 @@ toolchain = {'name': 'gompi', 'version': '1.3.12'}
 toolchainopts = {'pic': True}
 
 source_urls = [homepage]
-sources = ['%(namelower)s-%(version)s.tgz']
+sources = [SOURCELOWER_TGZ]
 
 blaslib = 'OpenBLAS'
 blasver = '0.2.6'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.4.10-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.4.10-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
index c1e8c6b2e6bd5956cf4157fd94004ab66c575e5c..8f7ad295d1679bb629c2c6814132c9e2ebd9056f 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.4.10-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.4.10-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
@@ -9,7 +9,7 @@ toolchain = {'name': 'gompi', 'version': '1.4.10'}
 toolchainopts = {'pic': True}
 
 source_urls = [homepage]
-sources = ['%(namelower)s-%(version)s.tgz']
+sources = [SOURCELOWER_TGZ]
 
 blaslib = 'OpenBLAS'
 blasver = '0.2.6'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.4.10-no-OFED-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.4.10-no-OFED-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5e0e14ba2c64e7905766ad2233ffcb166e204df3
--- /dev/null
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.4.10-no-OFED-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
@@ -0,0 +1,25 @@
+name = 'ScaLAPACK'
+version = '2.0.2'
+
+homepage = 'http://www.netlib.org/scalapack/'
+description = """The ScaLAPACK (or Scalable LAPACK) library includes a subset of LAPACK routines
+redesigned for distributed memory MIMD parallel computers."""
+
+toolchain = {'name': 'gompi', 'version': '1.4.10-no-OFED'}
+toolchainopts = {'pic': True}
+
+source_urls = [homepage]
+sources = ['%(namelower)s-%(version)s.tgz']
+
+blaslib = 'OpenBLAS'
+blasver = '0.2.6'
+blassuff = '-LAPACK-3.4.2'
+
+versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff)
+
+dependencies = [(blaslib, blasver, blassuff)]
+
+## parallel build tends to fail, so disabling it
+parallel = 1
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.12-ATLAS-3.10.1-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.12-ATLAS-3.10.1-LAPACK-3.4.2.eb
index 8027e588308d569f64727d011341df5597f08508..7e8bf14eee4c7025dbd1ad0fafa848d4ddcc4889 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.12-ATLAS-3.10.1-LAPACK-3.4.2.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.12-ATLAS-3.10.1-LAPACK-3.4.2.eb
@@ -9,7 +9,7 @@ toolchain = {'name': 'gompi', 'version': '1.5.12'}
 toolchainopts = {'pic': True}
 
 source_urls = [homepage]
-sources = ['%(namelower)s-%(version)s.tgz']
+sources = [SOURCELOWER_TGZ]
 
 blaslib = 'ATLAS'
 blasver = '3.10.1'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.12-no-OFED-ATLAS-3.10.1-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.12-no-OFED-ATLAS-3.10.1-LAPACK-3.4.2.eb
index 5fd2b5ab55bec42a103e9ff550d90d0dfde741dd..68e8936860fc692c3ac8a77a87557a7338380e46 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.12-no-OFED-ATLAS-3.10.1-LAPACK-3.4.2.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.12-no-OFED-ATLAS-3.10.1-LAPACK-3.4.2.eb
@@ -9,7 +9,7 @@ toolchain = {'name': 'gompi', 'version': '1.5.12-no-OFED'}
 toolchainopts = {'pic': True}
 
 source_urls = [homepage]
-sources = ['%(namelower)s-%(version)s.tgz']
+sources = [SOURCELOWER_TGZ]
 
 blaslib = 'ATLAS'
 blasver = '3.10.1'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.14-OpenBLAS-0.2.8-LAPACK-3.5.0.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.14-OpenBLAS-0.2.8-LAPACK-3.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2a0a7e12ce3769e1fd5da5567a2782fc070cce8e
--- /dev/null
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.14-OpenBLAS-0.2.8-LAPACK-3.5.0.eb
@@ -0,0 +1,25 @@
+name = 'ScaLAPACK'
+version = '2.0.2'
+
+homepage = 'http://www.netlib.org/scalapack/'
+description = """The ScaLAPACK (or Scalable LAPACK) library includes a subset of LAPACK routines
+ redesigned for distributed memory MIMD parallel computers."""
+
+toolchain = {'name': 'gompi', 'version': '1.5.14'}
+toolchainopts = {'pic': True}
+
+source_urls = [homepage]
+sources = [SOURCELOWER_TGZ]
+
+blaslib = 'OpenBLAS'
+blasver = '0.2.8'
+blassuff = '-LAPACK-3.5.0'
+
+versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff)
+
+dependencies = [(blaslib, blasver, blassuff)]
+
+## parallel build tends to fail, so disabling it
+parallel = 1
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.14-no-OFED-OpenBLAS-0.2.8-LAPACK-3.5.0.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.14-no-OFED-OpenBLAS-0.2.8-LAPACK-3.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b55976ccac840121dba0eb27ab881fd3d738a37d
--- /dev/null
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.14-no-OFED-OpenBLAS-0.2.8-LAPACK-3.5.0.eb
@@ -0,0 +1,25 @@
+name = 'ScaLAPACK'
+version = '2.0.2'
+
+homepage = 'http://www.netlib.org/scalapack/'
+description = """The ScaLAPACK (or Scalable LAPACK) library includes a subset of LAPACK routines
+ redesigned for distributed memory MIMD parallel computers."""
+
+toolchain = {'name': 'gompi', 'version': '1.5.14-no-OFED'}
+toolchainopts = {'pic': True}
+
+source_urls = [homepage]
+sources = [SOURCELOWER_TGZ]
+
+blaslib = 'OpenBLAS'
+blasver = '0.2.8'
+blassuff = '-LAPACK-3.5.0'
+
+versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff)
+
+dependencies = [(blaslib, blasver, blassuff)]
+
+## parallel build tends to fail, so disabling it
+parallel = 1
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb
index 5baf987e04df86783e476427f350c3a85b850576..b037ae507c78abd134539b40553afd2e5ff33e04 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb
@@ -9,7 +9,7 @@ toolchain = {'name': 'gompi', 'version': '1.6.10'}
 toolchainopts = {'pic': True}
 
 source_urls = [homepage]
-sources = ['%(namelower)s-%(version)s.tgz']
+sources = [SOURCELOWER_TGZ]
 
 blaslib = 'OpenBLAS'
 blasver = '0.2.8'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompic-2.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompic-2.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..77f58e7b27ba1805f0a058652d511b885fa5b2d7
--- /dev/null
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompic-2.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb
@@ -0,0 +1,25 @@
+name = 'ScaLAPACK'
+version = '2.0.2'
+
+homepage = 'http://www.netlib.org/scalapack/'
+description = """The ScaLAPACK (or Scalable LAPACK) library includes a subset of LAPACK routines
+ redesigned for distributed memory MIMD parallel computers."""
+
+toolchain = {'name': 'gompic', 'version': '2.6.10'}
+toolchainopts = {'pic': True}
+
+source_urls = [homepage]
+sources = ['%(namelower)s-%(version)s.tgz']
+
+blaslib = 'OpenBLAS'
+blasver = '0.2.8'
+blassuff = '-LAPACK-3.4.2'
+
+versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff)
+
+dependencies = [(blaslib, blasver, blassuff)]
+
+## parallel build tends to fail, so disabling it
+parallel = 1
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-iiqmpi-4.4.13-ACML-5.3.1-ifort-64bit.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-iiqmpi-4.4.13-ACML-5.3.1-ifort-64bit.eb
index 9f74510c4f50ec0a7c3305eca725c11d9e6cf64b..325514fe67e763bbdf4e62eae0a96f01cb9f54e0 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-iiqmpi-4.4.13-ACML-5.3.1-ifort-64bit.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-iiqmpi-4.4.13-ACML-5.3.1-ifort-64bit.eb
@@ -9,7 +9,7 @@ toolchain = {'name': 'iiqmpi', 'version': '4.4.13'}
 toolchainopts = {'pic': True}
 
 source_urls = [homepage]
-sources = ['%(namelower)s-%(version)s.tgz']
+sources = [SOURCELOWER_TGZ]
 
 blas_lapack_lib = 'ACML'
 blas_lapack_ver = '5.3.1'
diff --git a/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index 185f5d1c139b6e07ac0cf4f5eabb4dc8b5c72e1c..87deeb47fed2b3fe1bf3be70db4e0bc217315531 100644
--- a/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -9,7 +9,7 @@ description = """Shapely is a BSD-licensed Python package for manipulation and a
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
-source_urls = ['http://pypi.python.org/packages/source/S/Shapely/']
+source_urls = [PYPI_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 python = "Python"
diff --git a/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-goolf-1.4.10-Python-2.7.3.eb
index 11331141d5e19fc7ca0c7fbb1210eddbafc6f3c9..758a4009e5d02bbd4902447a9a92dc7c420e77ce 100644
--- a/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-goolf-1.4.10-Python-2.7.3.eb
@@ -9,7 +9,7 @@ It is based on the widely deployed GEOS (the engine of PostGIS) and JTS (from wh
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-source_urls = ['http://pypi.python.org/packages/source/S/Shapely/']
+source_urls = [PYPI_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 python = "Python"
diff --git a/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-ictce-4.0.6-Python-2.7.3.eb
index 2c659677e6431f54c64ea2e31e840fc4fb522eb0..b6ecffc690148d3e5e05c6e12f20f22ceaff04d0 100644
--- a/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-ictce-4.0.6-Python-2.7.3.eb
@@ -9,7 +9,7 @@ description = """Shapely is a BSD-licensed Python package for manipulation and a
 
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
-source_urls = ['http://pypi.python.org/packages/source/S/Shapely/']
+source_urls = [PYPI_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 python = "Python"
diff --git a/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-ictce-5.3.0-Python-2.7.3.eb
index 22947cbeb82d0aae270fdc24d90a1d9c4eddac56..8727c7a7cbf7d0a1e15448505bbf3c3bb9912abb 100644
--- a/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-ictce-5.3.0-Python-2.7.3.eb
@@ -7,10 +7,9 @@ homepage = 'http://toblerity.github.com/shapely/'
 description = """Shapely is a BSD-licensed Python package for manipulation and analysis of planar geometric objects.
  It is based on the widely deployed GEOS (the engine of PostGIS) and JTS (from which GEOS is ported) libraries."""
 
-
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
-source_urls = ['http://pypi.python.org/packages/source/S/Shapely/']
+source_urls = [PYPI_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 python = "Python"
diff --git a/easybuild/easyconfigs/s/Silo/Silo-4.9.1-ictce-5.3.0.eb b/easybuild/easyconfigs/s/Silo/Silo-4.9.1-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..672084b8d3519a37c957c1ab4c71755a7dec09e6
--- /dev/null
+++ b/easybuild/easyconfigs/s/Silo/Silo-4.9.1-ictce-5.3.0.eb
@@ -0,0 +1,20 @@
+name = 'Silo'
+version = '4.9.1'
+
+homepage = 'https://wci.llnl.gov/codes/silo/'
+description = """Silo is a library for reading and writing a wide variety of scientific data to binary, disk files"""  
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'opt': True, 'pic': True, 'usempi': True}
+
+sources = ['%(namelower)s-%(version)s.tar.gz']
+source_urls = ['https://wci.llnl.gov/codes/silo/silo-%(version)s']
+
+configopts = '--disable-silex'
+
+sanity_check_paths = {
+    'files': ['bin/browser', 'bin/silock', 'bin/silodiff', 'bin/silofile', 'lib/libsilo.a'],
+    'dirs': [],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index 00f276803661da0131242ff91c7a9b35cc802e38..b9a94e2e9e79af56c34ebfb76c3b0d7603f87000 100644
--- a/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -11,7 +11,7 @@ description = """Sphinx is a tool that makes it easy to create intelligent and b
 
 toolchain = {'name': "goalf", 'version': "1.1.0-no-OFED"}
 
-source_urls = ["http://pypi.python.org/packages/source/S/Sphinx/"]
+source_urls = [PYPI_SOURCE]
 sources = ["%s-%s.tar.gz" % (name.capitalize(), version)]
 
 python = "Python"
diff --git a/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-goolf-1.4.10-Python-2.7.3.eb
index ff5ff56c8530963d177e76b639f5d89886c120c5..61173fdddde70d4d350f991f4646a2ac2a4db38a 100644
--- a/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-goolf-1.4.10-Python-2.7.3.eb
@@ -11,7 +11,7 @@ special support for other languages as well."""
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-source_urls = ["http://pypi.python.org/packages/source/S/Sphinx/"]
+source_urls = [PYPI_SOURCE]
 sources = ["%s-%s.tar.gz" % (name.capitalize(), version)]
 
 python = "Python"
diff --git a/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-ictce-4.0.6-Python-2.7.3.eb
index 2cbcf34b38f52ce4a15e38281af05d008f4569ac..069dffe6d0cea4bc996efee769e56a6bf52f0afe 100644
--- a/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-ictce-4.0.6-Python-2.7.3.eb
@@ -11,7 +11,7 @@ description = """Sphinx is a tool that makes it easy to create intelligent and b
 
 toolchain = {'name': "ictce", 'version': "4.0.6"}
 
-source_urls = ["http://pypi.python.org/packages/source/S/Sphinx/"]
+source_urls = [PYPI_SOURCE]
 sources = ["%s-%s.tar.gz" % (name.capitalize(), version)]
 
 python = "Python"
diff --git a/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-ictce-5.3.0-Python-2.7.3.eb
index 29005c9cd915f2eef34ac6afcbc773cdfb6f286b..300df5535fc2dccccc367f8232d14c101a239319 100644
--- a/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-ictce-5.3.0-Python-2.7.3.eb
@@ -9,10 +9,9 @@ description = """Sphinx is a tool that makes it easy to create intelligent and b
  documentation of Python projects, but C/C++ is already supported as well, and it is planned to add 
  special support for other languages as well."""
 
-
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
-source_urls = ["http://pypi.python.org/packages/source/S/Sphinx/"]
+source_urls = [PYPI_SOURCE]
 sources = ["%s-%s.tar.gz" % (name.capitalize(), version)]
 
 python = "Python"
diff --git a/easybuild/easyconfigs/s/Stacks/Stacks-1.03-ictce-5.3.0.eb b/easybuild/easyconfigs/s/Stacks/Stacks-1.03-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..196d2c22e408ecd7e7fad563d8704d10792b0a7e
--- /dev/null
+++ b/easybuild/easyconfigs/s/Stacks/Stacks-1.03-ictce-5.3.0.eb
@@ -0,0 +1,29 @@
+name = 'Stacks'
+version = '1.03'
+
+homepage = 'http://creskolab.uoregon.edu/stacks/'
+description = """Stacks is a software pipeline for building loci from short-read sequences, such as those generated on
+ the Illumina platform. Stacks was developed to work with restriction enzyme-based data, such as RAD-seq, for the purpose
+ of building genetic maps and conducting population genomics and phylogeography.
+"""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = ['http://creskolab.uoregon.edu/stacks/source/']
+sources = [SOURCELOWER_TAR_GZ]
+
+runtest = "check"
+
+sanity_check_paths = {
+    'files': [
+        'bin/%s' % binfile for binfile in [
+            'clone_filter', 'denovo_map.pl', 'exec_velvet.pl', 'genotypes', 'index_radtags.pl', 'load_radtags.pl',
+            'populations', 'process_shortreads', 'ref_map.pl', 'sstacks', 'ustacks', 'cstacks', 'estacks',
+            'export_sql.pl', 'hstacks', 'kmer_filter', 'load_sequences.pl', 'process_radtags', 'pstacks',
+            'sort_read_pairs.pl', 'stacks_export_notify.pl',
+        ]
+    ],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/Stow/Stow-1.3.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/s/Stow/Stow-1.3.3-goalf-1.1.0-no-OFED.eb
index a4d66cc836a82686741eb49e087b7cec025ae1f4..b67b65616a89d1207ed63eaf683eaaaf3b7f9ce7 100644
--- a/easybuild/easyconfigs/s/Stow/Stow-1.3.3-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/s/Stow/Stow-1.3.3-goalf-1.1.0-no-OFED.eb
@@ -17,7 +17,7 @@ homepage = 'http://www.gnu.org/software/stow/stow.html'
 description = """Stow-1.3.3: Maps several separate packages into a tree without merging them"""
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/stow']
+source_urls = [GNU_SOURCE]
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
diff --git a/easybuild/easyconfigs/s/Stow/Stow-1.3.3-goolf-1.4.10.eb b/easybuild/easyconfigs/s/Stow/Stow-1.3.3-goolf-1.4.10.eb
index cc9ff2a1537a08d852488b6cfd7ffb27a01cab62..3e5a453e42dc21ebd1a5cd487636c355e2133129 100644
--- a/easybuild/easyconfigs/s/Stow/Stow-1.3.3-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/s/Stow/Stow-1.3.3-goolf-1.4.10.eb
@@ -17,7 +17,7 @@ homepage = 'http://www.gnu.org/software/stow/stow.html'
 description = """Stow-1.3.3: Maps several separate packages into a tree without merging them"""
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/stow']
+source_urls = [GNU_SOURCE]
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
diff --git a/easybuild/easyconfigs/s/Stow/Stow-1.3.3-ictce-4.0.6.eb b/easybuild/easyconfigs/s/Stow/Stow-1.3.3-ictce-4.0.6.eb
index b098bdf237ce5636dbfbb1d75831668df57868ce..911acb7f10a8e7bb18e4911f12d015605ca4cd49 100644
--- a/easybuild/easyconfigs/s/Stow/Stow-1.3.3-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/s/Stow/Stow-1.3.3-ictce-4.0.6.eb
@@ -17,7 +17,7 @@ homepage = 'http://www.gnu.org/software/stow/stow.html'
 description = """Stow-1.3.3: Maps several separate packages into a tree without merging them"""
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/stow']
+source_urls = [GNU_SOURCE]
 
 toolchain = {'version': '4.0.6', 'name': 'ictce'}
 
diff --git a/easybuild/easyconfigs/s/Stow/Stow-1.3.3-ictce-5.3.0.eb b/easybuild/easyconfigs/s/Stow/Stow-1.3.3-ictce-5.3.0.eb
index 28ac7d91ae48dce658b471745b8610e7f92975bb..1c4d3c3cc592e64636d3700c5dcfa4e9c06ede24 100644
--- a/easybuild/easyconfigs/s/Stow/Stow-1.3.3-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/s/Stow/Stow-1.3.3-ictce-5.3.0.eb
@@ -17,7 +17,7 @@ homepage = 'http://www.gnu.org/software/stow/stow.html'
 description = """Stow-1.3.3: Maps several separate packages into a tree without merging them"""
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://ftp.gnu.org/gnu/stow']
+source_urls = [GNU_SOURCE]
 
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
diff --git a/easybuild/easyconfigs/s/Stride/Stride-1.0-ictce-5.3.0.eb b/easybuild/easyconfigs/s/Stride/Stride-1.0-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..da61249bcff5dc1f16cb9156dc511092f8ccccb2
--- /dev/null
+++ b/easybuild/easyconfigs/s/Stride/Stride-1.0-ictce-5.3.0.eb
@@ -0,0 +1,24 @@
+#
+# author: Dina Mahmoud Ibrahim ( Cairo University )
+#
+easyblock = 'MakeCp'
+
+name = "Stride"
+version = "1.0"
+
+homepage = 'http://structure.usc.edu/stride/'
+description = "STRIDE is a program to recognize secondary structural elements in proteins from their atomic coordinates"
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = ['http://ftp.ebi.ac.uk/pub/software/unix/stride/src/']
+sources = ['%(namelower)s.tar.gz' ]
+
+files_to_copy = [(['stride'], "bin")]
+
+sanity_check_paths = {
+    'files': ['bin/stride'],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-3.7.1-goolf-1.4.10-ParMETIS-4.0.3.eb b/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-3.7.1-goolf-1.4.10-ParMETIS-4.0.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..62896760f1740196d83f9047f85299353c3bf24e
--- /dev/null
+++ b/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-3.7.1-goolf-1.4.10-ParMETIS-4.0.3.eb
@@ -0,0 +1,18 @@
+name = 'SuiteSparse'
+version = '3.7.1'
+
+homepage = 'http://www.cise.ufl.edu/research/sparse/SuiteSparse/'
+description = """SuiteSparse is a collection of libraries manipulate sparse matrices."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+toolchainopts = {'opt': True, 'unroll': True, 'pic': True, 'static': True}
+
+source_urls = ['http://www.cise.ufl.edu/research/sparse/SuiteSparse/']
+sources = [SOURCE_TAR_GZ]
+
+parmetis = 'ParMETIS'
+parmetis_ver = '4.0.3'
+versionsuffix = '-%s-%s' % (parmetis, parmetis_ver)
+dependencies = [(parmetis, parmetis_ver)]
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-3.7.1-ictce-5.5.0-ParMETIS-4.0.3.eb b/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-3.7.1-ictce-5.5.0-ParMETIS-4.0.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..02396e372811fe292078ca312dc073135afe7bde
--- /dev/null
+++ b/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-3.7.1-ictce-5.5.0-ParMETIS-4.0.3.eb
@@ -0,0 +1,18 @@
+name = 'SuiteSparse'
+version = '3.7.1'
+
+homepage = 'http://www.cise.ufl.edu/research/sparse/SuiteSparse/'
+description = """SuiteSparse is a collection of libraries manipulate sparse matrices."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'opt': True, 'unroll': True, 'pic': True, 'static': True}
+
+source_urls = ['http://www.cise.ufl.edu/research/sparse/SuiteSparse/']
+sources = [SOURCE_TAR_GZ]
+
+parmetis = 'ParMETIS'
+parmetis_ver = '4.0.3'
+versionsuffix = '-%s-%s' % (parmetis, parmetis_ver)
+dependencies = [(parmetis, parmetis_ver)]
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-4.2.1-goolf-1.4.10-ParMETIS-4.0.3.eb b/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-4.2.1-goolf-1.4.10-ParMETIS-4.0.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1193a31b099d924786c74c679f778b449d796f48
--- /dev/null
+++ b/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-4.2.1-goolf-1.4.10-ParMETIS-4.0.3.eb
@@ -0,0 +1,18 @@
+name = 'SuiteSparse'
+version = '4.2.1'
+
+homepage = 'http://www.cise.ufl.edu/research/sparse/SuiteSparse/'
+description = """SuiteSparse is a collection of libraries manipulate sparse matrices."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+toolchainopts = {'opt': True, 'unroll': True, 'pic': True, 'static': True}
+
+source_urls = ['http://www.cise.ufl.edu/research/sparse/SuiteSparse/']
+sources = [SOURCE_TAR_GZ]
+
+parmetis = 'ParMETIS'
+parmetis_ver = '4.0.3'
+versionsuffix = '-%s-%s' % (parmetis, parmetis_ver)
+dependencies = [(parmetis, parmetis_ver)]
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-4.2.1-ictce-5.5.0-ParMETIS-4.0.3.eb b/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-4.2.1-ictce-5.5.0-ParMETIS-4.0.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c537c65755a3d3c3e656a5a8c289ad9991c3310a
--- /dev/null
+++ b/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-4.2.1-ictce-5.5.0-ParMETIS-4.0.3.eb
@@ -0,0 +1,18 @@
+name = 'SuiteSparse'
+version = '4.2.1'
+
+homepage = 'http://www.cise.ufl.edu/research/sparse/SuiteSparse/'
+description = """SuiteSparse is a collection of libraries manipulate sparse matrices."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'opt': True, 'unroll': True, 'pic': True, 'static': True}
+
+source_urls = ['http://www.cise.ufl.edu/research/sparse/SuiteSparse/']
+sources = [SOURCE_TAR_GZ]
+
+parmetis = 'ParMETIS'
+parmetis_ver = '4.0.3'
+versionsuffix = '-%s-%s' % (parmetis, parmetis_ver)
+dependencies = [(parmetis, parmetis_ver)]
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-5.5.0.eb b/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d2fa1bb4aee4f5c91f9765edb272ac87075ca765
--- /dev/null
+++ b/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-5.5.0.eb
@@ -0,0 +1,21 @@
+name = 'Szip'
+version = '2.1'
+
+homepage = 'http://www.hdfgroup.org/doc_resource/SZIP/'
+description = "Szip compression software, providing lossless compression of scientific data"
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['http://www.hdfgroup.org/ftp/lib-external/szip/%(version)s/src']
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = "--with-pic"
+
+sanity_check_paths = {
+    'files': ["lib/libsz.a", "lib/libsz.so"] +
+             ["include/%s" % x for x in ["ricehdf.h", "szip_adpt.h", "szlib.h"]],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.13-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.13-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index 14d1f4a44584f3814ccedcd93b3e89579ec01ed1..96310147cf3f7cc403d0533305ec957cebba3f0a 100644
--- a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.13-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.13-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -11,7 +11,7 @@ description = """Scikit-learn integrates machine learning algorithms in the tigh
 
 toolchain = {'version': '1.1.0-no-OFED', 'name': 'goalf'}
 
-source_urls = ['https://pypi.python.org/packages/source/s/scikit-learn/']
+source_urls = [PYPI_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 python = "Python"
diff --git a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.13-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.13-ictce-4.1.13-Python-2.7.3.eb
index a4042b85f866c08d4111a47f8be9b047cd024411..568e256fdc759e20381e90035f5fe8f6b1178f4d 100644
--- a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.13-ictce-4.1.13-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.13-ictce-4.1.13-Python-2.7.3.eb
@@ -10,7 +10,7 @@ description = """Scikit-learn integrates machine learning algorithms in the tigh
 
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
-source_urls = ['https://pypi.python.org/packages/source/s/scikit-learn/']
+source_urls = [PYPI_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 python = "Python"
diff --git a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.13-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.13-ictce-5.3.0-Python-2.7.3.eb
index d7ea94f31637a8bdf0c31eacc11d5f5665eea015..e7e1f0c3228f6a9ea973535408d86adf29c83acd 100644
--- a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.13-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.13-ictce-5.3.0-Python-2.7.3.eb
@@ -10,7 +10,7 @@ description = """Scikit-learn integrates machine learning algorithms in the tigh
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
-source_urls = ['https://pypi.python.org/packages/source/s/scikit-learn/']
+source_urls = [PYPI_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 python = "Python"
diff --git a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-4.1.13-Python-2.7.3.eb
index 5e0d6b5e2f26ce3bd5e59ae2979f5f1f7f6c8f82..202d34e1119d40f331f29b207b005e6fd551de31 100644
--- a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-4.1.13-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-4.1.13-Python-2.7.3.eb
@@ -10,7 +10,8 @@ it provides versatile tools for data mining and analysis in any field of science
 It strives to be simple and efficient, accessible to everybody, and reusable in various contexts."""
 
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
-source_urls = ['https://pypi.python.org/packages/source/s/scikit-learn/']
+
+source_urls = [PYPI_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 python = "Python"
diff --git a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-5.3.0-Python-2.7.5.eb b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-5.3.0-Python-2.7.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..380fb7075a50401c7944cd605babc0ce1bf51564
--- /dev/null
+++ b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-5.3.0-Python-2.7.5.eb
@@ -0,0 +1,29 @@
+easyblock = "PythonPackage"
+
+name = "scikit-learn"
+version = "0.14"
+
+homepage = 'http://scikit-learn.org/stable/index.html'
+description = """Scikit-learn integrates machine learning algorithms in the tightly-knit scientific Python world,
+building upon numpy, scipy, and matplotlib. As a machine-learning module,
+it provides versatile tools for data mining and analysis in any field of science and engineering.
+It strives to be simple and efficient, accessible to everybody, and reusable in various contexts."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+python = "Python"
+pythonversion = '2.7.5'
+pythonshortversion = ".".join(pythonversion.split(".")[:-1])
+
+versionsuffix = "-%s-%s" % (python, pythonversion)
+dependencies = [
+    (python, pythonversion),
+    ('matplotlib', '1.3.0', versionsuffix),
+]
+
+options = {'modulename': "sklearn"}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-5.5.0-Python-2.7.6.eb
new file mode 100644
index 0000000000000000000000000000000000000000..22f760cf88210dd3eb079847ab2231961a58da5c
--- /dev/null
+++ b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-5.5.0-Python-2.7.6.eb
@@ -0,0 +1,29 @@
+easyblock = "PythonPackage"
+
+name = "scikit-learn"
+version = "0.14"
+
+homepage = 'http://scikit-learn.org/stable/index.html'
+description = """Scikit-learn integrates machine learning algorithms in the tightly-knit scientific Python world,
+building upon numpy, scipy, and matplotlib. As a machine-learning module,
+it provides versatile tools for data mining and analysis in any field of science and engineering.
+It strives to be simple and efficient, accessible to everybody, and reusable in various contexts."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+python = "Python"
+pythonversion = '2.7.6'
+pythonshortversion = ".".join(pythonversion.split(".")[:-1])
+
+versionsuffix = "-%s-%s" % (python, pythonversion)
+dependencies = [
+    (python, pythonversion),
+    ('matplotlib', '1.3.1', versionsuffix),
+]
+
+options = {'modulename': "sklearn"}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/s/scipy/scipy-0.11.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/s/scipy/scipy-0.11.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index f466b5ee8a598e86c72c5d2165bf51d62f3c24c5..12ff2e51889a6c8e1a8abee2de8cec966acaf65c 100644
--- a/easybuild/easyconfigs/s/scipy/scipy-0.11.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/scipy/scipy-0.11.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -9,11 +9,9 @@ description = """SciPy is a collection of mathematical algorithms and convenienc
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 toolchainopts = {'pic': True}
 
-source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%s' % version, 'download')]
+source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%(version)s', 'download')]
 sources = [SOURCE_TAR_GZ]
 
-dependencies = [
-                ('numpy', '1.6.2', versionsuffix),
-               ]
+dependencies = [('numpy', '1.6.2', versionsuffix)]
 
 moduleclass = 'math'
diff --git a/easybuild/easyconfigs/s/scipy/scipy-0.11.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/s/scipy/scipy-0.11.0-goolf-1.4.10-Python-2.7.3.eb
index 952fc435a522f1c0aafd8f1d81210df03318a57e..afedbc15378db6c8b92748859f13501d4480c3f4 100644
--- a/easybuild/easyconfigs/s/scipy/scipy-0.11.0-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/scipy/scipy-0.11.0-goolf-1.4.10-Python-2.7.3.eb
@@ -9,11 +9,9 @@ description = """SciPy is a collection of mathematical algorithms and convenienc
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'pic': True}
 
-source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%s' % version, 'download')]
+source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%(version)s', 'download')]
 sources = [SOURCE_TAR_GZ]
 
-dependencies = [
-                ('numpy', '1.6.2', versionsuffix),
-               ]
+dependencies = [('numpy', '1.6.2', versionsuffix)]
 
 moduleclass = 'math'
diff --git a/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-4.0.6-Python-2.7.3.eb
index 564b138ba67fd817e7d61370ce0d93121ad47758..93184d4eaf0bfb190e53e975ab7605443c189b9d 100644
--- a/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-4.0.6-Python-2.7.3.eb
@@ -9,11 +9,9 @@ description = """SciPy is a collection of mathematical algorithms and convenienc
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
 toolchainopts = {'pic': True}
 
-source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%s' % version, 'download')]
+source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%(version)s', 'download')]
 sources = [SOURCE_TAR_GZ]
 
-dependencies = [
-                ('numpy', '1.6.2', versionsuffix),
-               ]
+dependencies = [('numpy', '1.6.2', versionsuffix)]
 
 moduleclass = 'math'
diff --git a/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-4.1.13-Python-2.7.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f76c775805a7837068c65b4d08cc74b76bbc5305
--- /dev/null
+++ b/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-4.1.13-Python-2.7.3.eb
@@ -0,0 +1,17 @@
+name = 'scipy'
+version = '0.11.0'
+versionsuffix = '-Python-2.7.3'
+
+homepage = 'http://www.scipy.org'
+description = """SciPy is a collection of mathematical algorithms and convenience 
+ functions built on the Numpy extension for Python."""
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+toolchainopts = {'pic': True}
+
+source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%(version)s', 'download')]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('numpy', '1.6.2', versionsuffix)]
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-5.3.0-Python-2.7.3.eb
index 7875f2000057e8b38378d50bf93d2252d9a6db04..5c1e3242430c49b4088551bdbb8961134faf0090 100644
--- a/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-5.3.0-Python-2.7.3.eb
@@ -9,11 +9,9 @@ description = """SciPy is a collection of mathematical algorithms and convenienc
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 toolchainopts = {'pic': True}
 
-source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%s' % version, 'download')]
+source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%(version)s', 'download')]
 sources = [SOURCE_TAR_GZ]
 
-dependencies = [
-                ('numpy', '1.6.2', versionsuffix),
-               ]
+dependencies = [('numpy', '1.6.2', versionsuffix)]
 
 moduleclass = 'math'
diff --git a/easybuild/easyconfigs/s/scipy/scipy-0.12.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/s/scipy/scipy-0.12.0-goolf-1.4.10-Python-2.7.3.eb
index d0822a60e960997efd76810ae3c52cf774d6cc14..0451302efba448d58812b2b7ec2325a79c951a5c 100644
--- a/easybuild/easyconfigs/s/scipy/scipy-0.12.0-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/scipy/scipy-0.12.0-goolf-1.4.10-Python-2.7.3.eb
@@ -12,8 +12,6 @@ toolchainopts = {'pic': True}
 source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%(version)s', 'download')]
 sources = [SOURCE_TAR_GZ]
 
-dependencies = [
-    ('numpy', '1.6.2', versionsuffix),
-]
+dependencies = [('numpy', '1.6.2', versionsuffix)]
 
 moduleclass = 'math'
diff --git a/easybuild/easyconfigs/s/scipy/scipy-0.12.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/s/scipy/scipy-0.12.0-ictce-5.3.0-Python-2.7.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a44fd734135f8fad690e3de31d441b0e3ff4e9fe
--- /dev/null
+++ b/easybuild/easyconfigs/s/scipy/scipy-0.12.0-ictce-5.3.0-Python-2.7.3.eb
@@ -0,0 +1,19 @@
+name = 'scipy'
+version = '0.12.0'
+versionsuffix = '-Python-2.7.3'
+
+homepage = 'http://www.scipy.org'
+description = """SciPy is a collection of mathematical algorithms and convenience
+ functions built on the Numpy extension for Python."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'pic': True}
+
+source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%(version)s', 'download')]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('numpy', '1.6.2', versionsuffix),
+]
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/s/scipy/scipy-0.13.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/s/scipy/scipy-0.13.0-goolf-1.4.10-Python-2.7.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a1047f4733d32792d4a3a9c525a82be73b4e9f95
--- /dev/null
+++ b/easybuild/easyconfigs/s/scipy/scipy-0.13.0-goolf-1.4.10-Python-2.7.3.eb
@@ -0,0 +1,19 @@
+name = 'scipy'
+version = '0.13.0'
+versionsuffix = '-Python-2.7.3'
+
+homepage = 'http://www.scipy.org'
+description = """SciPy is a collection of mathematical algorithms and convenience
+ functions built on the Numpy extension for Python."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+toolchainopts = {'pic': True}
+
+source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%(version)s', 'download')]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('numpy', '1.7.1', versionsuffix),
+]
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/s/sed/sed-4.2.2-goolf-1.4.10.eb b/easybuild/easyconfigs/s/sed/sed-4.2.2-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..03dbd2a52cf2948ab10eccee212cbb7c611f2031
--- /dev/null
+++ b/easybuild/easyconfigs/s/sed/sed-4.2.2-goolf-1.4.10.eb
@@ -0,0 +1,17 @@
+name = 'sed'
+version = '4.2.2'
+
+homepage = 'http://www.gnu.org/software/sed/sed.html'
+description = "sed: GNU implementation of sed, the POSIX stream editor"
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCE_TAR_BZ2]
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+sanity_check_paths = {
+    'files': ["bin/sed"],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/s/sed/sed-4.2.2-ictce-5.3.0.eb b/easybuild/easyconfigs/s/sed/sed-4.2.2-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e36edb5e097d18a4f93d2edef651427259e8cccd
--- /dev/null
+++ b/easybuild/easyconfigs/s/sed/sed-4.2.2-ictce-5.3.0.eb
@@ -0,0 +1,17 @@
+name = 'sed'
+version = '4.2.2'
+
+homepage = 'http://www.gnu.org/software/sed/sed.html'
+description = "sed: GNU implementation of sed, the POSIX stream editor"
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCE_TAR_BZ2]
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+sanity_check_paths = {
+    'files': ["bin/sed"],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/s/segemehl/segemehl-0.1.7-goolf-1.4.10.eb b/easybuild/easyconfigs/s/segemehl/segemehl-0.1.7-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f5e2b9d7dd2acef1aa62d85fd27bd2fc1817db61
--- /dev/null
+++ b/easybuild/easyconfigs/s/segemehl/segemehl-0.1.7-goolf-1.4.10.eb
@@ -0,0 +1,32 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+easyblock = 'MakeCp'
+
+name = "segemehl"
+version = "0.1.7"
+
+homepage = 'http://www.bioinf.uni-leipzig.de/Software/segemehl/'
+description = """ segemehl is a software to map short sequencer reads to reference genomes. 
+ Unlike other methods, segemehl is able to detect not only mismatches but also insertions 
+ and deletions. Furthermore, segemehl is not limited to a specific read length and is able 
+ to mapprimer- or polyadenylation contaminated reads correctly. segemehl implements a matching 
+ strategy based on enhanced suffix arrays (ESA). Segemehl now supports the SAM format, reads 
+ gziped queries to save both disk and memory space and allows bisulfite sequencing mapping 
+ and split read mapping. """
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['http://www.bioinf.uni-leipzig.de/Software/segemehl/']
+sources = ['%s_%s.tar.gz' % (name, version.replace('.','_'))]
+
+files_to_copy = [(["haarz.x", "lack.x", "segemehl.x"], "bin")]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ["haarz.x", "lack.x" , "segemehl.x"]],
+    'dirs': []
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/setuptools/setuptools-1.4.2.eb b/easybuild/easyconfigs/s/setuptools/setuptools-1.4.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..87db02a9faa43ba673e00b5cf4175b13c6f89847
--- /dev/null
+++ b/easybuild/easyconfigs/s/setuptools/setuptools-1.4.2.eb
@@ -0,0 +1,19 @@
+easyblock = "VersionIndependentPythonPackage"
+
+name = "setuptools"
+version = "1.4.2"
+
+homepage = "http://pypi.python.org/pypi/setuptools/"
+description = """Download, build, install, upgrade, and uninstall Python packages -- easily!"""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+source_urls = ['http://pypi.python.org/packages/source/s/%(name)s/']
+sources = [SOURCE_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ["bin/easy_install"],
+    'dirs': ["lib/setuptools"],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/s/sickle/sickle-1.210-goolf-1.4.10.eb b/easybuild/easyconfigs/s/sickle/sickle-1.210-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a2500b9e047a4001fc7382f44908ef689f418edc
--- /dev/null
+++ b/easybuild/easyconfigs/s/sickle/sickle-1.210-goolf-1.4.10.eb
@@ -0,0 +1,30 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+easyblock = 'MakeCp'
+
+name = "sickle"
+# version checked running "sickle --version"
+version = "1.210"
+# git_commit_id bab15f7d14b06400be37d50df7c092b1ec6fe0c5
+versionsuffix = "-bab15f7"
+
+homepage = 'https://github.com/najoshi/sickle'
+description = """ Windowed Adaptive Trimming for fastq files using quality """
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+git_commit_id = versionsuffix[1:]
+sources = ['%s.tar.gz' % git_commit_id]
+source_urls = ['https://github.com/najoshi/sickle/archive/']
+
+files_to_copy = [(['sickle'], 'bin'), "README.md", "test"]
+
+sanity_check_paths = {
+    'files': ['bin/sickle'],
+    'dirs': []
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/slalib-c/slalib-c-0.0-goolf-1.4.10.eb b/easybuild/easyconfigs/s/slalib-c/slalib-c-0.0-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..433f61d41ecde621ebf9722d1b476fc83323a340
--- /dev/null
+++ b/easybuild/easyconfigs/s/slalib-c/slalib-c-0.0-goolf-1.4.10.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'slalib-c'
+version = '0.0'
+
+homepage = 'http://star-www.rl.ac.uk/star/docs/sun67.htx/sun67.html'
+description = "SLALIB is a library used by writers of positional-astronomy applications."
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+# only available for download per request, cfr. ftp://legacy.gsfc.nasa.gov/heasarc/software/slalib-info.html
+sources = [SOURCE_TAR_BZ2]
+
+skipsteps = ['configure', 'install']
+makeopts = 'INSTALL_DIR=%(installdir)s SLA_LIB_DIR=%(installdir)s/lib/ CCOMPC="$CC" CFLAGC="-c -pedantic $CFLAGS"'
+
+# make sure the gzip, gunzip and compress binaries are available after installation
+sanity_check_paths = {
+    'files': ["include/slalib.h", "include/slamac.h", "lib/libsla.a"],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/s/slalib-c/slalib-c-0.0-ictce-5.5.0.eb b/easybuild/easyconfigs/s/slalib-c/slalib-c-0.0-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8b598880386206ff25e6c890ec80ba2cc99065de
--- /dev/null
+++ b/easybuild/easyconfigs/s/slalib-c/slalib-c-0.0-ictce-5.5.0.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'slalib-c'
+version = '0.0'
+
+homepage = 'http://star-www.rl.ac.uk/star/docs/sun67.htx/sun67.html'
+description = "SLALIB is a library used by writers of positional-astronomy applications."
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+# only available for download per request, cfr. ftp://legacy.gsfc.nasa.gov/heasarc/software/slalib-info.html
+sources = [SOURCE_TAR_BZ2]
+
+skipsteps = ['configure', 'install']
+makeopts = 'INSTALL_DIR=%(installdir)s SLA_LIB_DIR=%(installdir)s/lib/ CCOMPC="$CC" CFLAGC="-c -pedantic $CFLAGS"'
+
+# make sure the gzip, gunzip and compress binaries are available after installation
+sanity_check_paths = {
+    'files': ["include/slalib.h", "include/slamac.h", "lib/libsla.a"],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/s/sympy/sympy-0.7.2-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/s/sympy/sympy-0.7.2-ictce-5.3.0-Python-2.7.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1328146b8ec77468fd02765f3a1c371540ea9768
--- /dev/null
+++ b/easybuild/easyconfigs/s/sympy/sympy-0.7.2-ictce-5.3.0-Python-2.7.3.eb
@@ -0,0 +1,32 @@
+easyblock = "PythonPackage"
+
+name = 'sympy'
+version = '0.7.2'
+
+homepage = 'http://sympy.org/'
+description = """SymPy is a Python library for symbolic mathematics. It aims to
+ become a full-featured computer algebra system (CAS) while keeping the code as
+ simple as possible in order to be comprehensible and easily extensible. SymPy
+ is written entirely in Python and does not require any external libraries."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = ['https://sympy.googlecode.com/files']
+sources = [SOURCE_TAR_GZ]
+
+python = "Python"
+pythonversion = '2.7.3'
+pythonshortversion = ".".join(pythonversion.split(".")[:-1])
+
+versionsuffix = "-%s-%s" % (python, pythonversion)
+
+dependencies = [(python, pythonversion)]
+
+runtest = 'python setup.py test'
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%s/site-packages/sympy' % pythonshortversion],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/t/TAMkin/TAMkin-1.0.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/t/TAMkin/TAMkin-1.0.0-ictce-4.1.13-Python-2.7.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..bdf51643a2e4f0c0458184cde28bf47655d0e9c9
--- /dev/null
+++ b/easybuild/easyconfigs/t/TAMkin/TAMkin-1.0.0-ictce-4.1.13-Python-2.7.3.eb
@@ -0,0 +1,37 @@
+easyblock = "PythonPackage"
+
+name = 'TAMkin'
+version = '1.0.0'
+
+homepage = 'http://molmod.github.io/tamkin/'
+description = """TAMkin is a post-processing toolkit for normal mode analysis,
+ thermochemistry and reaction kinetics. It uses a Hessian computation from a
+ standard computational chemistry program as its input."""
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+
+source_urls = ['https://github.com/molmod/tamkin/releases/download/v%(version)s']
+sources = [SOURCE_TAR_GZ]
+
+python = "Python"
+pythonversion = '2.7.3'
+pythonshortversion = ".".join(pythonversion.split(".")[:-1])
+
+versionsuffix = "-%s-%s" % (python, pythonversion)
+
+dependencies = [
+    (python, pythonversion),
+    ('matplotlib', '1.2.1', versionsuffix),
+    ('molmod', '1.0', versionsuffix),
+]
+
+# disable tests that require X11 by specifying "backend: agg" in matplotlibrc
+runtest = 'export MATPLOTLIBRC=$PWD; echo "backend: agg" > $MATPLOTLIBRC/matplotlibrc; '
+runtest += 'export OMP_NUM_THREADS=1; nosetests -v test'
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%s/site-packages/%%(namelower)s' % pythonshortversion],
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/t/TREE-PUZZLE/TREE-PUZZLE-5.2-goolf-1.4.10.eb b/easybuild/easyconfigs/t/TREE-PUZZLE/TREE-PUZZLE-5.2-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c0af373e762bb07ca1a08731a523c7cd277716ff
--- /dev/null
+++ b/easybuild/easyconfigs/t/TREE-PUZZLE/TREE-PUZZLE-5.2-goolf-1.4.10.eb
@@ -0,0 +1,29 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+name = 'TREE-PUZZLE'
+version = '5.2'
+
+homepage = 'http://www.tree-puzzle.de/'
+description = """ TREE-PUZZLE is a computer program to reconstruct 
+ phylogenetic trees from molecular sequence data by maximum likelihood. 
+ It implements a fast tree search algorithm, quartet puzzling, that allows
+ analysis of large data sets and automatically assigns estimations of 
+ support to each internal branch. """
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = [homepage]
+sources = [SOURCELOWER_TAR_GZ]
+
+# build with just 1 cpu to avoid errors
+parallel = 1
+
+sanity_check_paths = {
+    'files': ['bin/puzzle', 'bin/ppuzzle'],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/t/Tar/Tar-1.26-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/t/Tar/Tar-1.26-goalf-1.1.0-no-OFED.eb
index 36d6a8effc372e1e5529b0a5a0090d5d82084cdf..a50ed96b52b3406a4b9c12f7df65337fe0b1a60f 100644
--- a/easybuild/easyconfigs/t/Tar/Tar-1.26-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/t/Tar/Tar-1.26-goalf-1.1.0-no-OFED.eb
@@ -16,7 +16,7 @@ version = '1.26'
 homepage = 'http://www.gnu.org/software/tar/tar.html'
 description = "tar: The GNU tape archiver"
 
-source_urls = ['http://ftp.gnu.org/gnu/tar']
+source_urls = [GNU_SOURCE]
 sources = ['tar-%s.tar.bz2' % version]
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
diff --git a/easybuild/easyconfigs/t/Tar/Tar-1.26-goolf-1.4.10.eb b/easybuild/easyconfigs/t/Tar/Tar-1.26-goolf-1.4.10.eb
index 9714f94ef093ed5d6efe17ff2c2fa06982b7943c..72c6d238a9afce7d6b5978a391af8129ddd13d1e 100644
--- a/easybuild/easyconfigs/t/Tar/Tar-1.26-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/t/Tar/Tar-1.26-goolf-1.4.10.eb
@@ -16,7 +16,7 @@ version = '1.26'
 homepage = 'http://www.gnu.org/software/tar/tar.html'
 description = "tar: The GNU tape archiver"
 
-source_urls = ['http://ftp.gnu.org/gnu/tar']
+source_urls = [GNU_SOURCE]
 sources = ['tar-%s.tar.bz2' % version]
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
diff --git a/easybuild/easyconfigs/t/Tar/Tar-1.26-ictce-4.0.6.eb b/easybuild/easyconfigs/t/Tar/Tar-1.26-ictce-4.0.6.eb
index 5e707fde5268513615e2c7b0902da98b3304d334..dc4a806ac5caff22658c914d4a4042c8f2f9495d 100644
--- a/easybuild/easyconfigs/t/Tar/Tar-1.26-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/t/Tar/Tar-1.26-ictce-4.0.6.eb
@@ -16,7 +16,7 @@ version = '1.26'
 homepage = 'http://www.gnu.org/software/tar/tar.html'
 description = "tar: The GNU tape archiver"
 
-source_urls = ['http://ftp.gnu.org/gnu/tar']
+source_urls = [GNU_SOURCE]
 sources = ['tar-%s.tar.bz2' % version]
 
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
diff --git a/easybuild/easyconfigs/t/Tar/Tar-1.26-ictce-5.3.0.eb b/easybuild/easyconfigs/t/Tar/Tar-1.26-ictce-5.3.0.eb
index 0444d484d546b3b5db75ed015cf732bfb893d1b5..5b4cb4045a3d0ee2db3b4e8dfba9e30502856510 100644
--- a/easybuild/easyconfigs/t/Tar/Tar-1.26-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/t/Tar/Tar-1.26-ictce-5.3.0.eb
@@ -16,7 +16,7 @@ version = '1.26'
 homepage = 'http://www.gnu.org/software/tar/tar.html'
 description = "tar: The GNU tape archiver"
 
-source_urls = ['http://ftp.gnu.org/gnu/tar']
+source_urls = [GNU_SOURCE]
 sources = ['tar-%s.tar.bz2' % version]
 
 
diff --git a/easybuild/easyconfigs/t/Tcl/Tcl-8.5.15-ictce-5.3.0.eb b/easybuild/easyconfigs/t/Tcl/Tcl-8.5.15-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e52a011d4bc0b5e5916d07ccdc528e047d6dfd11
--- /dev/null
+++ b/easybuild/easyconfigs/t/Tcl/Tcl-8.5.15-ictce-5.3.0.eb
@@ -0,0 +1,19 @@
+name = 'Tcl'
+version = '8.5.15'
+
+homepage = 'http://www.tcl.tk/'
+description = """Tcl (Tool Command Language) is a very powerful but easy to learn dynamic programming language,
+suitable for a very wide range of uses, including web and desktop applications, networking, administration, testing and many more."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = ["http://prdownloads.sourceforge.net/tcl"]
+sources = ['%(namelower)s%(version)s-src.tar.gz']
+
+configopts = '--enable-threads EXTRA_INSTALL="install-private-headers"'
+
+runtest = 'test'
+
+start_dir = 'unix'
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/t/Tcl/Tcl-8.6.1-ictce-5.3.0.eb b/easybuild/easyconfigs/t/Tcl/Tcl-8.6.1-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fa866637b3836b131a71a4fb552fb2994e7f36b4
--- /dev/null
+++ b/easybuild/easyconfigs/t/Tcl/Tcl-8.6.1-ictce-5.3.0.eb
@@ -0,0 +1,19 @@
+name = 'Tcl'
+version = '8.6.1'
+
+homepage = 'http://www.tcl.tk/'
+description = """Tcl (Tool Command Language) is a very powerful but easy to learn dynamic programming language,
+suitable for a very wide range of uses, including web and desktop applications, networking, administration, testing and many more."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = ["http://prdownloads.sourceforge.net/tcl"]
+sources = ['%(namelower)s%(version)s-src.tar.gz']
+
+configopts = '--enable-threads EXTRA_INSTALL="install-private-headers"'
+
+runtest = 'test'
+
+start_dir = 'unix'
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/t/Tesla-Deployment-Kit/Tesla-Deployment-Kit-5.319.43.eb b/easybuild/easyconfigs/t/Tesla-Deployment-Kit/Tesla-Deployment-Kit-5.319.43.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0704526b696f7d814b54536e7d5cf08eb88040d0
--- /dev/null
+++ b/easybuild/easyconfigs/t/Tesla-Deployment-Kit/Tesla-Deployment-Kit-5.319.43.eb
@@ -0,0 +1,39 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine
+# Authors::   Fotis Georgatos <fotis.georgatos@uni.lu>
+# License::   MIT/GPL
+# $Id$
+##
+
+easyblock = "Tarball"
+
+name = "Tesla-Deployment-Kit"
+version = "5.319.43"
+
+homepage = 'https://developer.nvidia.com/tesla-deployment-kit'
+description = """The Tesla Deployment Kit is a set of tools provided primarily for the NVIDIA Tesla
+ range of GPUs. They aim to empower users to better manage their NVIDIA GPUs by providing a broad
+ range of functionalities. The kit contains:
+ * NVIDIA Management Library (NVML),
+ * Tesla Deployment Kit - Linux Edition (Aug 1st, 2013)"""
+
+toolchain = {'version': 'dummy', 'name': 'dummy'}
+
+sources = ['tdk_%(version)s.tar.gz']
+source_urls = ['http://developer.download.nvidia.com/compute/cuda/5_5/rel/nvml']
+
+sanity_check_paths = {
+    'files': ["nvidia-healthmon/nvidia-healthmon", "nvidia-healthmon/nvidia-healthmon_x86"],
+    'dirs': ["nvml/lib", "nvml/lib64"]
+}
+
+modextrapaths = {
+    'PATH': ['nvidia-healthmon'],
+    'CPATH': ['nvml/include'],
+    'MANPATH': ['nvml/doc/man'],
+    'LD_LIBRARY_PATH': ['nvml/lib', 'nvml/lib64'],
+}
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/t/Theano/Theano-0.5.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/t/Theano/Theano-0.5.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index 44f626558af9bbfdfe41c8bfff15a109900db5e7..ee6e84d4ce2896a47ca9826d9f0b40f7ec37e1b7 100644
--- a/easybuild/easyconfigs/t/Theano/Theano-0.5.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/t/Theano/Theano-0.5.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -9,7 +9,7 @@ description = """Theano is a Python library that allows you to define, optimize,
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
-source_urls = ['http://pypi.python.org/packages/source/T/%s' % name]
+source_urls = [PYPI_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 python = 'Python'
diff --git a/easybuild/easyconfigs/t/Theano/Theano-0.5.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/t/Theano/Theano-0.5.0-goolf-1.4.10-Python-2.7.3.eb
index 5f6561beb5b3f8bec9bebe98cf400b7147461a53..7a155fde426100cba257ab15aeb0aa15c561d274 100644
--- a/easybuild/easyconfigs/t/Theano/Theano-0.5.0-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/t/Theano/Theano-0.5.0-goolf-1.4.10-Python-2.7.3.eb
@@ -5,11 +5,11 @@ version = '0.5.0'
 
 homepage = 'http://deeplearning.net/software/theano'
 description = """Theano is a Python library that allows you to define, optimize, and evaluate mathematical expressions
-involving multi-dimensional arrays efficiently."""
+ involving multi-dimensional arrays efficiently."""
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-source_urls = ['http://pypi.python.org/packages/source/T/%s' % name]
+source_urls = [PYPI_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 python = 'Python'
diff --git a/easybuild/easyconfigs/t/Theano/Theano-0.5.0-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/t/Theano/Theano-0.5.0-ictce-4.0.6-Python-2.7.3.eb
index 8d8afe9d71d2d211e285c633bc9c263f8d12ba89..65e1061c007fd77f1653fc84c265c90465e799c7 100644
--- a/easybuild/easyconfigs/t/Theano/Theano-0.5.0-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/t/Theano/Theano-0.5.0-ictce-4.0.6-Python-2.7.3.eb
@@ -9,7 +9,7 @@ description = """Theano is a Python library that allows you to define, optimize,
 
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
-source_urls = ['http://pypi.python.org/packages/source/T/%s' % name]
+source_urls = [PYPI_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 python = 'Python'
diff --git a/easybuild/easyconfigs/t/Theano/Theano-0.5.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/t/Theano/Theano-0.5.0-ictce-5.3.0-Python-2.7.3.eb
index 4d3ea1e22e90159cd05e2896f5fdc39582fdb9f8..7c1726a3af1dab87ea1908d9734e698629a014d1 100644
--- a/easybuild/easyconfigs/t/Theano/Theano-0.5.0-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/t/Theano/Theano-0.5.0-ictce-5.3.0-Python-2.7.3.eb
@@ -7,10 +7,9 @@ homepage = 'http://deeplearning.net/software/theano'
 description = """Theano is a Python library that allows you to define, optimize, and evaluate mathematical expressions
  involving multi-dimensional arrays efficiently."""
 
-
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
-source_urls = ['http://pypi.python.org/packages/source/T/%s' % name]
+source_urls = [PYPI_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 python = 'Python'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/t/Tk/Tk-8.5.12-goalf-1.1.0-no-OFED.eb
index 812a6ecf52b3c12f7f817fe5fe5773ad325f8a0d..a8d8d4acdf86b9efd07c38f8bcb5f818d1a440c3 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.5.12-goalf-1.1.0-no-OFED.eb
@@ -8,7 +8,7 @@ description = """Tk is an open source, cross-platform widget toolchain that prov
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
 source_urls = ["http://prdownloads.sourceforge.net/tcl"]
-sources = ['%s%s-src.tar.gz' % (name.lower(), version)]
+sources = ['%(namelower)s%(version)s-src.tar.gz']
 
 dependencies = [('Tcl', version)]
 
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-goolf-1.4.10.eb b/easybuild/easyconfigs/t/Tk/Tk-8.5.12-goolf-1.4.10.eb
index 6c6af38ce35934239e541d03d40788fd20529b2c..b862540b18ba0ffa71bc6971a3430f16e77a9743 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.5.12-goolf-1.4.10.eb
@@ -8,7 +8,7 @@ a graphical user interface (GUI) in many different programming languages."""
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 source_urls = ["http://prdownloads.sourceforge.net/tcl"]
-sources = ['%s%s-src.tar.gz' % (name.lower(), version)]
+sources = ['%(namelower)s%(version)s-src.tar.gz']
 
 dependencies = [('Tcl', version)]
 
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-4.0.10.eb b/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-4.0.10.eb
index 9be243225cefec3adcb07278bebe68079125a7a9..ffd89a9367e56b32dccfc8d3fe1b34fdae7d4c0f 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-4.0.10.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-4.0.10.eb
@@ -8,7 +8,7 @@ description = """Tk is an open source, cross-platform widget toolchain that prov
 toolchain = {'name': 'ictce', 'version': '4.0.10'}
 
 source_urls = ["http://prdownloads.sourceforge.net/tcl"]
-sources = ['%s%s-src.tar.gz' % (name.lower(), version)]
+sources = ['%(namelower)s%(version)s-src.tar.gz']
 
 dependencies = [('Tcl', version)]
 
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-4.0.6.eb b/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-4.0.6.eb
index e153ed3819dbf25c0623b9f50ce26e9ba761f838..63e7f3be76eb71c2d586a281c0fea41662b6a7f0 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-4.0.6.eb
@@ -8,7 +8,7 @@ description = """Tk is an open source, cross-platform widget toolchain that prov
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
 source_urls = ["http://prdownloads.sourceforge.net/tcl"]
-sources = ['%s%s-src.tar.gz' % (name.lower(), version)]
+sources = ['%(namelower)s%(version)s-src.tar.gz']
 
 dependencies = [('Tcl', version)]
 
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-5.3.0.eb b/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-5.3.0.eb
index 92ba6db539f74806b0d9cb9c3562335eea4c3fb8..93b3e36dcc30878c02dab67cb9048f7876cbd260 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-5.3.0.eb
@@ -5,11 +5,10 @@ homepage = 'http://www.tcl.tk/'
 description = """Tk is an open source, cross-platform widget toolchain that provides a library of basic elements for building
  a graphical user interface (GUI) in many different programming languages."""
 
-
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 source_urls = ["http://prdownloads.sourceforge.net/tcl"]
-sources = ['%s%s-src.tar.gz' % (name.lower(), version)]
+sources = ['%(namelower)s%(version)s-src.tar.gz']
 
 dependencies = [('Tcl', version)]
 
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.5.15-ictce-5.3.0.eb b/easybuild/easyconfigs/t/Tk/Tk-8.5.15-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2c8c0ace461788fda11120150797caa96a4208f5
--- /dev/null
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.5.15-ictce-5.3.0.eb
@@ -0,0 +1,19 @@
+name = 'Tk'
+version = '8.5.15'
+
+homepage = 'http://www.tcl.tk/'
+description = """Tk is an open source, cross-platform widget toolchain that provides a library of basic elements for building
+ a graphical user interface (GUI) in many different programming languages."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = ["http://prdownloads.sourceforge.net/tcl"]
+sources = ['%(namelower)s%(version)s-src.tar.gz']
+
+dependencies = [('Tcl', version)]
+
+configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib CFLAGS="-I$EBROOTTCL/include"'
+
+start_dir = 'unix'
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/t/TopHat/TopHat-2.0.10-ictce-5.5.0.eb b/easybuild/easyconfigs/t/TopHat/TopHat-2.0.10-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fe60f11c962b415121c4509de42bb66ee818c1e8
--- /dev/null
+++ b/easybuild/easyconfigs/t/TopHat/TopHat-2.0.10-ictce-5.5.0.eb
@@ -0,0 +1,42 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine
+# Authors::   Cedric Laczny <cedric.laczny@uni.lu>, Fotis Georgatos <fotis.georgatos@uni.lu>, Jens Timmerman
+# License::   GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html
+##
+
+name = 'TopHat'
+version = '2.0.10'
+
+homepage = 'http://tophat.cbcb.umd.edu/'
+description = """TopHat is a fast splice junction mapper for RNA-Seq reads."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://tophat.cbcb.umd.edu/downloads/']
+
+patches = ['tophat_ictce.patch']
+
+dependencies = [
+    ('Boost', '1.55.0', '-Python-2.7.6'),
+    ('SAMtools', '0.1.19'),
+    ('zlib', '1.2.7'),
+]
+
+configopts = '--with-boost=$EBROOTBOOST --with-bam=$EBROOTSAMTOOLS'
+
+sanity_check_paths = {
+    'files': ['bin/tophat'],
+    'dirs': [],
+}
+
+parallel = 1  # not sure for a parallel build
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-ictce-4.1.13.eb b/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-ictce-4.1.13.eb
new file mode 100644
index 0000000000000000000000000000000000000000..de58c80ab679dfae65496ee90ceed987b2c81855
--- /dev/null
+++ b/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-ictce-4.1.13.eb
@@ -0,0 +1,41 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg, Ghent University
+# Authors::   Fotis Georgatos <fotis.georgatos@uni.lu>, Kenneth Hoste (Ghent University)
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-97.html
+##
+
+name = 'UDUNITS'
+version = '2.1.24'
+
+homepage = 'http://www.unidata.ucar.edu/software/udunits/'
+description = """UDUNITS supports conversion of unit specifications between formatted and binary forms,
+ arithmetic manipulation of units, and conversion of values between compatible scales of measurement."""
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+toolchainopts = {'opt': True, 'pic': True}
+
+# eg. ftp://ftp.unidata.ucar.edu/pub/udunits/udunits-2.1.24.tar.gz
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['ftp://ftp.unidata.ucar.edu/pub/udunits']
+
+sanity_check_paths = {
+    'files': [
+        'bin/udunits2',
+        'include/converter.h',
+        'include/udunits2.h',
+        'include/udunits.h',
+        'lib/libudunits2.a',
+        'lib/libudunits2.so',
+    ],
+    'dirs': ['share'],
+}
+
+parallel = 1
+
+moduleclass = 'phys'
diff --git a/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-goalf-1.1.0-no-OFED.eb
index d63c05d4aa40c5b72888685c22f503fd3a59bf61..282691e2117add78a4b06fab761806702fe5a21d 100644
--- a/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-goalf-1.1.0-no-OFED.eb
@@ -6,7 +6,7 @@ description = """Set of Linux utilities"""
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
-source_urls = ['%s/v%s'%(homepage,'.'.join(version.split('.')[0:2]) )]
+source_urls = ['%s/v%%(version_major_minor)s' % homepage]
 sources = [SOURCELOWER_TAR_GZ]
 
 # disable account related utilities (they need OS dependant pam-devel files)
@@ -20,8 +20,8 @@ configopts += "--with-systemdsystemunitdir='${prefix}/systemd' "
 dependencies = [('ncurses', '5.9')]
 
 sanity_check_paths = {
-                      'files': ['lib/lib%s.a' % x for x in ['blkid' , 'mount', 'uuid']],
-                      'dirs': ['include', 'bin', 'share', 'sbin']
-                      }
+    'files': ['lib/lib%s.a' % x for x in ['blkid' , 'mount', 'uuid']],
+    'dirs': ['include', 'bin', 'share', 'sbin'],
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-goolf-1.4.10.eb b/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-goolf-1.4.10.eb
index c6cf3bbdc6c043114e7fb7f992a86b61391e614e..2181cfe1ccbab17019af38988ab3e2a629f2d948 100644
--- a/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-goolf-1.4.10.eb
@@ -6,7 +6,7 @@ description = """Set of Linux utilities"""
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-source_urls = ['%s/v%s'%(homepage,'.'.join(version.split('.')[0:2]) )]
+source_urls = ['%s/v%%(version_major_minor)s' % homepage]
 sources = [SOURCELOWER_TAR_GZ]
 
 # disable account related utilities (they need OS dependant pam-devel files)
@@ -20,8 +20,8 @@ configopts += "--with-systemdsystemunitdir='${prefix}/systemd' "
 dependencies = [('ncurses', '5.9')]
 
 sanity_check_paths = {
-                      'files': ['lib/lib%s.a' % x for x in ['blkid' , 'mount', 'uuid']],
-                      'dirs': ['include', 'bin', 'share', 'sbin']
-                      }
+    'files': ['lib/lib%s.a' % x for x in ['blkid' , 'mount', 'uuid']],
+    'dirs': ['include', 'bin', 'share', 'sbin'],
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-4.1.13.eb b/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-4.1.13.eb
index 709d0a0204285ced6df2fcf0e24491f391953c52..5bcfe76a719a0b47fdab21c900af64c3a5b43eb4 100644
--- a/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-4.1.13.eb
@@ -6,7 +6,7 @@ description = """Set of Linux utilities"""
 
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
-source_urls = ['%s/v%s'%(homepage,'.'.join(version.split('.')[0:2]) )]
+source_urls = ['%s/v%%(version_major_minor)s' % homepage]
 sources = [SOURCELOWER_TAR_GZ]
 
 # disable account related utilities (they need OS dependant pam-devel files)
@@ -20,8 +20,8 @@ configopts += "--with-systemdsystemunitdir='${prefix}/systemd' "
 dependencies = [('ncurses', '5.9')]
 
 sanity_check_paths = {
-                      'files': ['lib/lib%s.a' % x for x in ['blkid' , 'mount', 'uuid']],
-                      'dirs': ['include', 'bin', 'share', 'sbin']
-                      }
+    'files': ['lib/lib%s.a' % x for x in ['blkid' , 'mount', 'uuid']],
+    'dirs': ['include', 'bin', 'share', 'sbin'],
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-5.3.0.eb b/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-5.3.0.eb
index 5efe20cea9cc255b1e904b802f4a080de7f81ad0..6fa9dfbdc6581c9faa840ed865f75114486f612b 100644
--- a/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-5.3.0.eb
@@ -4,10 +4,9 @@ version = '2.22.2'
 homepage = 'http://www.kernel.org/pub/linux/utils/util-linux'
 description = """Set of Linux utilities"""
 
-
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
-source_urls = ['%s/v%s'%(homepage,'.'.join(version.split('.')[0:2]) )]
+source_urls = ['%s/v%%(version_major_minor)s' % homepage]
 sources = [SOURCELOWER_TAR_GZ]
 
 # disable account related utilities (they need OS dependant pam-devel files)
@@ -21,8 +20,8 @@ configopts += "--with-systemdsystemunitdir='${prefix}/systemd' "
 dependencies = [('ncurses', '5.9')]
 
 sanity_check_paths = {
-                      'files': ['lib/lib%s.a' % x for x in ['blkid' , 'mount', 'uuid']],
-                      'dirs': ['include', 'bin', 'share', 'sbin']
-                      }
+    'files': ['lib/lib%s.a' % x for x in ['blkid' , 'mount', 'uuid']],
+    'dirs': ['include', 'bin', 'share', 'sbin'],
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-5.5.0.eb b/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4e19abd21c0b18a561c69a0ae382e3239089dafd
--- /dev/null
+++ b/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-5.5.0.eb
@@ -0,0 +1,27 @@
+name = 'util-linux'
+version = '2.22.2'
+
+homepage = 'http://www.kernel.org/pub/linux/utils/util-linux'
+description = """Set of Linux utilities"""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+source_urls = ['%s/v%%(version_major_minor)s' % homepage]
+sources = [SOURCELOWER_TAR_GZ]
+
+# disable account related utilities (they need OS dependant pam-devel files)
+# disable wall and friends (requires group changing permissions for install user)
+# install systemd service files in install dir
+configopts = '--disable-chfn-chsh --disable-login --disable-su '
+configopts += '--disable-wall --disable-use-tty-group '
+configopts += '--disable-makeinstall-chown --disable-makeinstall-setuid '
+configopts += "--with-systemdsystemunitdir='${prefix}/systemd' "
+
+dependencies = [('ncurses', '5.9')]
+
+sanity_check_paths = {
+    'files': ['lib/lib%s.a' % x for x in ['blkid' , 'mount', 'uuid']],
+    'dirs': ['include', 'bin', 'share', 'sbin'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/u/util-linux/util-linux-2.24-ictce-5.5.0.eb b/easybuild/easyconfigs/u/util-linux/util-linux-2.24-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..696815202f6692329880de9620a4454969460f14
--- /dev/null
+++ b/easybuild/easyconfigs/u/util-linux/util-linux-2.24-ictce-5.5.0.eb
@@ -0,0 +1,27 @@
+name = 'util-linux'
+version = '2.24'
+
+homepage = 'http://www.kernel.org/pub/linux/utils/util-linux'
+description = """Set of Linux utilities"""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+source_urls = ['%s/v%%(version_major_minor)s' % homepage]
+sources = [SOURCELOWER_TAR_GZ]
+
+# disable account related utilities (they need OS dependant pam-devel files)
+# disable wall and friends (requires group changing permissions for install user)
+# install systemd service files in install dir
+configopts = '--disable-chfn-chsh --disable-login --disable-su '
+configopts += '--disable-wall --disable-use-tty-group '
+configopts += '--disable-makeinstall-chown --disable-makeinstall-setuid '
+configopts += "--with-systemdsystemunitdir='${prefix}/systemd' "
+
+dependencies = [('ncurses', '5.9')]
+
+sanity_check_paths = {
+    'files': ['lib/lib%s.a' % x for x in ['blkid' , 'mount', 'uuid']],
+    'dirs': ['include', 'bin', 'share', 'sbin'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/u/util-linux/util-linux-2.24.1-ictce-5.5.0.eb b/easybuild/easyconfigs/u/util-linux/util-linux-2.24.1-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..77d061f0e012db1823699aef4003a7d7784b058a
--- /dev/null
+++ b/easybuild/easyconfigs/u/util-linux/util-linux-2.24.1-ictce-5.5.0.eb
@@ -0,0 +1,29 @@
+name = 'util-linux'
+version = '2.24.1'
+
+homepage = 'http://www.kernel.org/pub/linux/utils/util-linux'
+description = """Set of Linux utilities"""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+source_urls = ['%s/v%%(version_major_minor)s' % homepage]
+sources = [SOURCELOWER_TAR_GZ]
+
+# disable account related utilities (they need OS dependant pam-devel files)
+# disable wall and friends (requires group changing permissions for install user)
+# install systemd service files in install dir
+# install bash completion files in install dir
+configopts = '--disable-chfn-chsh --disable-login --disable-su '
+configopts += '--disable-wall --disable-use-tty-group '
+configopts += '--disable-makeinstall-chown --disable-makeinstall-setuid '
+configopts += "--with-systemdsystemunitdir='${prefix}/systemd' "
+configopts += "--with-bashcompletiondir='${prefix}/share/bash-completion/completions' "
+
+dependencies = [('ncurses', '5.9')]
+
+sanity_check_paths = {
+    'files': ['lib/lib%s.a' % x for x in ['blkid' , 'mount', 'uuid']],
+    'dirs': ['include', 'bin', 'share', 'sbin'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/v/VCFtools/VCFtools-0.1.11-goolf-1.4.10-Perl-5.16.3.eb b/easybuild/easyconfigs/v/VCFtools/VCFtools-0.1.11-goolf-1.4.10-Perl-5.16.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..47c30351f2414f238b5137dfebf90e6114b0fcbd
--- /dev/null
+++ b/easybuild/easyconfigs/v/VCFtools/VCFtools-0.1.11-goolf-1.4.10-Perl-5.16.3.eb
@@ -0,0 +1,39 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+name = 'VCFtools'
+version = '0.1.11'
+
+easyblock = 'MakeCp'
+
+homepage = "http://vcftools.sourceforge.net/"
+description = """The aim of VCFtools is to provide 
+ methods for working with VCF files: validating, 
+ merging, comparing and calculate some basic population
+ genetic statistics. """
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+toolchainopts = {'optarch': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['%(namelower)s_%(version)s.tar.gz']
+
+perl = 'Perl'
+perlver = '5.16.3'
+versionsuffix = '-%s-%s' % (perl, perlver)
+dependencies = [
+    (perl, perlver),
+]
+
+files_to_copy = ["bin", "lib"]
+
+modextrapaths = {'PERL5LIB': 'lib/perl5/site_perl'}
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in ['vcftools', 'vcf-sort', 'vcf-stats']],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/v/VCFtools/VCFtools-0.1.12-goolf-1.4.10-Perl-5.16.3.eb b/easybuild/easyconfigs/v/VCFtools/VCFtools-0.1.12-goolf-1.4.10-Perl-5.16.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..26093f8c38437f86d4f4069bc399e253d292d4b4
--- /dev/null
+++ b/easybuild/easyconfigs/v/VCFtools/VCFtools-0.1.12-goolf-1.4.10-Perl-5.16.3.eb
@@ -0,0 +1,39 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+easyblock = 'MakeCp'
+
+name = 'VCFtools'
+version = '0.1.12'
+
+homepage = "http://vcftools.sourceforge.net/"
+description = """The aim of VCFtools is to provide 
+ methods for working with VCF files: validating, 
+ merging, comparing and calculate some basic population
+ genetic statistics. """
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+toolchainopts = {'optarch': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['%(namelower)s_%(version)s.tar.gz']
+
+perl = 'Perl'
+perlver = '5.16.3'
+versionsuffix = '-%s-%s' % (perl, perlver)
+dependencies = [
+    (perl, perlver),
+]
+
+files_to_copy = ["bin", "lib", "examples", (["bin/man1"], 'man')]
+
+modextrapaths = {'PERL5LIB': 'lib/perl5/site_perl'}
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in ['vcftools', 'vcf-sort', 'vcf-stats']],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/v/Valgrind/Valgrind-3.9.0-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/v/Valgrind/Valgrind-3.9.0-goalf-1.5.12-no-OFED.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8f5bbc589708feab61be05108cb329470b213db1
--- /dev/null
+++ b/easybuild/easyconfigs/v/Valgrind/Valgrind-3.9.0-goalf-1.5.12-no-OFED.eb
@@ -0,0 +1,34 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 LCSB, Ghent University
+# Authors::   Fotis Georgatos <fotis.georgatos@uni.lu>, Ward Poelmans <wpoely86@gmail.com>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_07-02.html
+##
+
+name = 'Valgrind'
+version = '3.9.0'
+
+homepage = 'http://valgrind.org/downloads/'
+description = "Valgrind: Debugging and profiling tools"
+
+toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'}
+
+source_urls = ['http://valgrind.org/downloads/']
+sources = [SOURCELOWER_TAR_BZ2]
+
+binaries = [
+    'callgrind_annotate', 'callgrind_control', 'cg_annotate', 'cg_diff',
+    'cg_merge', 'ms_print', 'valgrind', 'valgrind-listener', 'vgdb'
+]
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in binaries],
+    'dirs': []
+}
+
+moduleclass = 'debugger'
diff --git a/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.1.6-ictce-5.5.0.eb b/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.1.6-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f0df3564677546414d0d3d3644f1b8d27af331c1
--- /dev/null
+++ b/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.1.6-ictce-5.5.0.eb
@@ -0,0 +1,45 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine
+# Authors::   Cedric Laczny <cedric.laczny@uni.lu>, Fotis Georgatos <fotis.georgatos@uni.lu>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html
+##
+
+name = 'ViennaRNA'
+version = '2.1.6'
+
+homepage = 'http://www.tbi.univie.ac.at/~ronny/RNA/vrna2.html'
+description = """The Vienna RNA Package consists of a C code library and several
+stand-alone programs for the prediction and comparison of RNA secondary structures."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0' }
+toolchainopts = {'optarch': True, 'pic': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://www.tbi.univie.ac.at/~ronny/RNA/packages/source']
+
+patches = ['ViennaRNA-2.1.6_ictce.patch']
+
+# Prevents the "make install" step from trying to copy to _global_ perl dir and thus make easybuild fail.
+configopts = '--without-perl'
+# Alternatively, you may want to use the following to copy the perl-module to a "local" directory
+# Code NOT yet tested, therefor left here for future recycling
+#preconfigopts = 'PERLPREFIX="/path/where/the/perl/module/shoud/go"'
+
+sanity_check_paths = {
+    'files': ['bin/RNA%s' % x for x in ['fold', 'eval', 'heat', 'pdist', 'distance',
+                                        'inverse', 'plot', 'subopt', 'Lfold', 'cofold',
+                                        'paln', 'duplex', 'alifold', 'plfold', 'up',
+                                        'aliduplex', 'Lalifold', '2Dfold', 'parconv',
+                                        'PKplex', 'plex', 'snoop', 'forester']] +
+             ['bin/Kinfold'],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
+
diff --git a/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.1.6_ictce.patch b/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.1.6_ictce.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ff068d76beff8d98f789cae33e7f953e7d6d6125
--- /dev/null
+++ b/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.1.6_ictce.patch
@@ -0,0 +1,26 @@
+--- ViennaRNA-2.1.6/Kinfold/cache.c.orig	2014-03-17 14:07:33.308562799 +0100
++++ ViennaRNA-2.1.6/Kinfold/cache.c	2014-03-17 14:07:48.808965449 +0100
+@@ -56,7 +56,6 @@
+                 61,59,53,47,43,41,37,31,29,23,17,13,11,7,3,1};
+ 
+ /* key must not be longer than 128 */
+-#pragma inline (cache_f)
+ unsigned cache_f(char *x) { 
+   register char *s;
+   register int i;
+@@ -80,6 +79,7 @@
+   int cacheval;
+   cache_entry *c;
+ 
++  #pragma inline (cache_f)
+   cacheval=cache_f(x);
+   if ((c=cachetab[cacheval]))
+     if (strcmp(c->structure,x)==0) return c;
+@@ -92,6 +92,7 @@
+   int cacheval;
+   cache_entry *c;
+   
++  #pragma inline (cache_f)
+   cacheval=cache_f(x->structure);
+   if ((c=cachetab[cacheval])) {
+     free(c->structure);
diff --git a/easybuild/easyconfigs/v/Vim/Vim-7.4-goolf-1.4.10.eb b/easybuild/easyconfigs/v/Vim/Vim-7.4-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6d3e505fffa44c2cac93f3538cca30bfa27c183d
--- /dev/null
+++ b/easybuild/easyconfigs/v/Vim/Vim-7.4-goolf-1.4.10.eb
@@ -0,0 +1,32 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+name = 'Vim'
+version = '7.4'
+
+homepage = 'http://www.vim.org'
+description = """ Vim is an advanced text editor that seeks to provide the power 
+ of the de-facto Unix editor 'Vi', with a more complete feature set. """
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['http://ftp.vim.org/pub/vim/unix/']
+sources = [SOURCELOWER_TAR_BZ2]
+
+# this dependencies are required for --enable-pythoninterp=yes and --enable-perlinterp=yes to work
+# check enabled features running "vim --version" after compilation
+dependencies = [
+    ('Python', '2.7.5'),
+    ('Perl', '5.16.3')
+    ]
+
+configopts = '--with-features=huge --enable-pythoninterp=yes --enable-perlinterp=yes'
+
+sanity_check_paths = {
+    'files': ['bin/vim','bin/vimdiff'],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/v/vsc-base/vsc-base-1.6.9.eb b/easybuild/easyconfigs/v/vsc-base/vsc-base-1.6.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..23ef4a12e7175259a5541d7d6928f4a64c1deb04
--- /dev/null
+++ b/easybuild/easyconfigs/v/vsc-base/vsc-base-1.6.9.eb
@@ -0,0 +1,17 @@
+easyblock = 'VSCPythonPackage'
+
+name = 'vsc-base'
+version = '1.6.9'
+
+homepage = 'http://hpcugent.github.com/vsc-mympirun/'
+description = """VSC-tools is a set of Python libraries and scripts that are commonly used within HPC-UGent."""
+
+# we build this to work with every python version
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://github.com/hpcugent/vsc-base/archive/']
+
+options = {'modulename': 'vsc.utils'}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/v/vsc-base/vsc-base-1.7.3.eb b/easybuild/easyconfigs/v/vsc-base/vsc-base-1.7.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a9424b799864fb1ab55d7ad05f88a9d4c447ce66
--- /dev/null
+++ b/easybuild/easyconfigs/v/vsc-base/vsc-base-1.7.3.eb
@@ -0,0 +1,17 @@
+easyblock = 'VSCPythonPackage'
+
+name = 'vsc-base'
+version = '1.7.3'
+
+homepage = 'http://hpcugent.github.com/vsc-mympirun/'
+description = """VSC-tools is a set of Python libraries and scripts that are commonly used within HPC-UGent."""
+
+# we build this to work with every python version
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://github.com/hpcugent/vsc-base/archive/']
+
+options = {'modulename': 'vsc.utils'}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/v/vsc-mympirun-scoop/vsc-mympirun-scoop-3.3.0-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/v/vsc-mympirun-scoop/vsc-mympirun-scoop-3.3.0-ictce-5.5.0-Python-2.7.6.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c1d224e11ee60c51c43bb0c164adb46314020e31
--- /dev/null
+++ b/easybuild/easyconfigs/v/vsc-mympirun-scoop/vsc-mympirun-scoop-3.3.0-ictce-5.5.0-Python-2.7.6.eb
@@ -0,0 +1,27 @@
+easyblock = 'VSCPythonPackage'
+
+name = 'vsc-mympirun-scoop'
+version = '3.3.0'
+
+homepage = 'http://hpcugent.github.com/vsc-mympirun/'
+description = """VSC-tools is a set of Python libraries and scripts that are commonly used within HPC-UGent."""
+
+# we build this to work with every python version
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://github.com/hpcugent/vsc-mympirun-scoop/archive/']
+
+python = 'Python'
+pyver = '2.7.6'
+versionsuffix = '-%s-%s' % (python, pyver)
+dependencies = [
+    ('vsc-processcontrol', '1.0', '', True),
+    ('vsc-mympirun', version, '', True),
+    (python, pyver),
+    ('SCOOP', '0.6.2', versionsuffix),
+]
+
+options = {'modulename': 'vsc.mympirun.scoop'}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb b/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..368c166390d1630230a75938c16c4e80105f5572
--- /dev/null
+++ b/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.2.1.eb
@@ -0,0 +1,22 @@
+easyblock = 'VersionIndependentPythonPackage'
+
+name = 'vsc-mympirun'
+version = '3.2.1'
+
+homepage = 'http://github.com/hpcugent/vsc-mympirun/'
+description = """VSC-tools is a set of Python libraries and scripts that are commonly used within HPC-UGent."""
+
+# we build this to work with every python version
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://github.com/hpcugent/vsc-mympirun/archive/']
+
+dependencies = [('vsc-base', '1.6.9')]
+
+# we ship something in bin/fake
+modextrapaths = {'PATH': 'bin/fake'}
+
+options = {'modulename': 'vsc.mympirun'}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.3.0.eb b/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5617b0766fed714d716146664d0c46a758f1236f
--- /dev/null
+++ b/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.3.0.eb
@@ -0,0 +1,25 @@
+easyblock = 'VSCPythonPackage'
+
+name = 'vsc-mympirun'
+version = '3.3.0'
+
+homepage = 'http://hpcugent.github.com/vsc-mympirun/'
+description = """VSC-tools is a set of Python libraries and scripts that are commonly used within HPC-UGent."""
+
+# we build this to work with every python version
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://github.com/hpcugent/vsc-mympirun/archive/']
+
+dependencies = [
+    ('vsc-base', '1.7.3'),
+    ('setuptools', '1.4.2'),
+]
+
+# we ship something in bin/fake
+modextrapaths = {'PATH': 'bin/fake'}
+
+options = {'modulename': 'vsc.mympirun'}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/v/vsc-processcontrol/vsc-processcontrol-1.0.eb b/easybuild/easyconfigs/v/vsc-processcontrol/vsc-processcontrol-1.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2b715acacf7c8c6f5dd8266eddbb2494baaf00bb
--- /dev/null
+++ b/easybuild/easyconfigs/v/vsc-processcontrol/vsc-processcontrol-1.0.eb
@@ -0,0 +1,20 @@
+easyblock = 'VSCPythonPackage'
+
+name = 'vsc-processcontrol'
+version = '1.0'
+
+homepage = 'http://hpcugent.github.com/vsc-processcontrol/'
+description = """vsc-processcontrol is a module to abstract process control like scheduler settings and affinity
+ from actual implementations like vsc.affinity and psutil."""
+
+# we build this to work with every python version
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://github.com/hpcugent/vsc-processcontrol/archive/']
+
+dependencies = [('vsc-base', '1.7.3')]
+
+options = {'modulename': 'sys; print sys.path; import vsc; print vsc.__path__; import vsc.processcontrol'}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.3.1-goalf-1.1.0-no-OFED-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.3.1-goalf-1.1.0-no-OFED-dmpar.eb
index 66840bc3fb79cadc22389b4aa41cc40425157e59..bf9ebc38cdc05ee261d317b3f12630ae83403afd 100644
--- a/easybuild/easyconfigs/w/WPS/WPS-3.3.1-goalf-1.1.0-no-OFED-dmpar.eb
+++ b/easybuild/easyconfigs/w/WPS/WPS-3.3.1-goalf-1.1.0-no-OFED-dmpar.eb
@@ -16,10 +16,10 @@ buildtype = "dmpar"
 versionsuffix = '-%s' % buildtype
 
 dependencies = [
-                ('WRF', version, versionsuffix),
-                ('netCDF', '4.1.3'),
-                ('libpng', '1.5.11'),
-                ('JasPer', '1.900.1')
-               ]
+    ('WRF', version, versionsuffix),
+    ('netCDF', '4.1.3'),
+    ('libpng', '1.5.11'),
+    ('JasPer', '1.900.1'),
+]
 
 moduleclass = 'geo'
diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.3.1-goolf-1.4.10-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.3.1-goolf-1.4.10-dmpar.eb
index d191598cb4d11bb0a4689bf2d42152e59fa6c157..cf9f032fe1af31038dcb1c3ffa6702fe1409d019 100644
--- a/easybuild/easyconfigs/w/WPS/WPS-3.3.1-goolf-1.4.10-dmpar.eb
+++ b/easybuild/easyconfigs/w/WPS/WPS-3.3.1-goolf-1.4.10-dmpar.eb
@@ -19,7 +19,7 @@ dependencies = [
     ('WRF', version, versionsuffix),
     ('netCDF', '4.1.3'),
     ('libpng', '1.5.11'),
-    ('JasPer', '1.900.1')
+    ('JasPer', '1.900.1'),
 ]
 
 moduleclass = 'geo'
diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.3.1-ictce-3.2.2.u3-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.3.1-ictce-3.2.2.u3-dmpar.eb
index 16a3c57158c7bc90762561d9e030de84d9326242..8431eafd57319c5e56fdf9db3bd22877efd02f8b 100644
--- a/easybuild/easyconfigs/w/WPS/WPS-3.3.1-ictce-3.2.2.u3-dmpar.eb
+++ b/easybuild/easyconfigs/w/WPS/WPS-3.3.1-ictce-3.2.2.u3-dmpar.eb
@@ -16,10 +16,10 @@ buildtype = "dmpar"
 versionsuffix = '-%s' % buildtype
 
 dependencies = [
-                ('WRF', version, versionsuffix),
-                ('netCDF', '4.1.3'),
-                ('libpng', '1.5.11'),
-                ('JasPer', '1.900.1')
-               ]
+    ('WRF', version, versionsuffix),
+    ('netCDF', '4.1.3'),
+    ('libpng', '1.5.11'),
+    ('JasPer', '1.900.1'),
+]
 
 moduleclass = 'geo'
diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.3.1-ictce-5.3.0-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.3.1-ictce-5.3.0-dmpar.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9a70c0a0befc3d3cc9a77a7245dfd887b1c569d6
--- /dev/null
+++ b/easybuild/easyconfigs/w/WPS/WPS-3.3.1-ictce-5.3.0-dmpar.eb
@@ -0,0 +1,25 @@
+name = 'WPS'
+version = '3.3.1'
+
+homepage = 'http://www.wrf-model.org'
+description = """WRF Preprocessing System (WPS) for WRF. The Weather Research and Forecasting (WRF) Model is 
+ a next-generation mesoscale numerical weather prediction system designed to serve both operational 
+ forecasting and atmospheric research needs."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'opt': True}
+
+sources = ['%(name)sV%(version)s.TAR.gz']
+source_urls = ['http://www.mmm.ucar.edu/wrf/src/']
+
+buildtype = "dmpar"
+versionsuffix = '-%s' % buildtype
+
+dependencies = [
+    ('WRF', version, versionsuffix),
+    ('netCDF', '4.1.3'),
+    ('libpng', '1.5.11'),
+    ('JasPer', '1.900.1'),
+]
+
+moduleclass = 'geo'
diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.4-goalf-1.1.0-no-OFED-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.4-goalf-1.1.0-no-OFED-dmpar.eb
index df3c22e073f561abf233173e5e013e537081f713..9e0cde67a1e267e66e143679fac634f3e7a5d88d 100644
--- a/easybuild/easyconfigs/w/WPS/WPS-3.4-goalf-1.1.0-no-OFED-dmpar.eb
+++ b/easybuild/easyconfigs/w/WPS/WPS-3.4-goalf-1.1.0-no-OFED-dmpar.eb
@@ -20,11 +20,11 @@ versionsuffix = '-%s' % buildtype
 netcdf_version = '4.2'
 
 dependencies = [
-                ('WRF', version, versionsuffix),
-                ('netCDF', netcdf_version),
-                ('netCDF-Fortran', netcdf_version),
-                ('libpng', '1.5.11'),
-                ('JasPer', '1.900.1')
-               ]
+    ('WRF', version, versionsuffix),
+    ('netCDF', netcdf_version),
+    ('netCDF-Fortran', netcdf_version),
+    ('libpng', '1.5.11'),
+    ('JasPer', '1.900.1'),
+]
 
 moduleclass = 'geo'
diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.4-ictce-3.2.2.u3-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.4-ictce-3.2.2.u3-dmpar.eb
index 0f57f30f8fe31429a6922fb1aed92322d9dec273..ceaf72669895e5b4a1e6cb8af78979cf9329fc69 100644
--- a/easybuild/easyconfigs/w/WPS/WPS-3.4-ictce-3.2.2.u3-dmpar.eb
+++ b/easybuild/easyconfigs/w/WPS/WPS-3.4-ictce-3.2.2.u3-dmpar.eb
@@ -20,11 +20,11 @@ versionsuffix = '-%s' % buildtype
 netcdf_version = '4.2'
 
 dependencies = [
-                ('WRF', version, versionsuffix),
-                ('netCDF', netcdf_version),
-                ('netCDF-Fortran', netcdf_version),
-                ('libpng', '1.5.11'),
-                ('JasPer', '1.900.1')
-               ]
+    ('WRF', version, versionsuffix),
+    ('netCDF', netcdf_version),
+    ('netCDF-Fortran', netcdf_version),
+    ('libpng', '1.5.11'),
+    ('JasPer', '1.900.1'),
+]
 
 moduleclass = 'geo'
diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.4-ictce-5.3.0-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.4-ictce-5.3.0-dmpar.eb
index d43822d6cd26b317d80af8ff309773a02ddb0a61..ef8b3b3cc61a829ad04799399745d233006eadb1 100644
--- a/easybuild/easyconfigs/w/WPS/WPS-3.4-ictce-5.3.0-dmpar.eb
+++ b/easybuild/easyconfigs/w/WPS/WPS-3.4-ictce-5.3.0-dmpar.eb
@@ -19,11 +19,11 @@ buildtype = "dmpar"
 versionsuffix = '-%s' % buildtype
 
 dependencies = [
-                ('WRF', version, versionsuffix),
-                ('netCDF', '4.2.1.1'),
-                ('netCDF-Fortran', '4.2'),
-                ('libpng', '1.5.11'),
-                ('JasPer', '1.900.1')
-               ]
+    ('WRF', version, versionsuffix),
+    ('netCDF', '4.2.1.1'),
+    ('netCDF-Fortran', '4.2'),
+    ('libpng', '1.5.11'),
+    ('JasPer', '1.900.1'),
+]
 
 moduleclass = 'geo'
diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.4.1-ictce-5.3.0-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.4.1-ictce-5.3.0-dmpar.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a520db34948788a4b976ad3decc5e814e05fbdcb
--- /dev/null
+++ b/easybuild/easyconfigs/w/WPS/WPS-3.4.1-ictce-5.3.0-dmpar.eb
@@ -0,0 +1,28 @@
+name = 'WPS'
+version = '3.4.1'
+
+homepage = 'http://www.wrf-model.org'
+description = """WRF Preprocessing System (WPS) for WRF. The Weather Research and Forecasting (WRF) Model is 
+ a next-generation mesoscale numerical weather prediction system designed to serve both operational 
+ forecasting and atmospheric research needs."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'opt': True}
+
+sources = ['%(name)sV%(version)s.TAR.gz']
+source_urls = ['http://www.mmm.ucar.edu/wrf/src/']
+
+patches = ['WPS_netCDF-Fortran_seperate_path.patch']
+
+buildtype = "dmpar"
+versionsuffix = '-%s' % buildtype
+
+dependencies = [
+    ('WRF', version, versionsuffix),
+    ('netCDF', '4.2.1.1'),
+    ('netCDF-Fortran', '4.2'),
+    ('libpng', '1.5.14'),
+    ('JasPer','1.900.1'),
+]
+
+moduleclass = 'geo'
diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.4.1-iqacml-3.7.3-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.4.1-iqacml-3.7.3-dmpar.eb
index a4441004d5bf243a2a1bde139ace5c981bccf15f..a11ffd3dd52d72cacdefbec6cb45f374823a8ebc 100644
--- a/easybuild/easyconfigs/w/WPS/WPS-3.4.1-iqacml-3.7.3-dmpar.eb
+++ b/easybuild/easyconfigs/w/WPS/WPS-3.4.1-iqacml-3.7.3-dmpar.eb
@@ -18,11 +18,11 @@ buildtype = "dmpar"
 versionsuffix = '-%s' % buildtype
 
 dependencies = [
-                ('WRF', version, versionsuffix),
-                ('netCDF', '4.2.1.1'),
-                ('netCDF-Fortran', '4.2'),
-                ('libpng', '1.5.14'),
-                ('JasPer','1.900.1')
-               ]
+    ('WRF', version, versionsuffix),
+    ('netCDF', '4.2.1.1'),
+    ('netCDF-Fortran', '4.2'),
+    ('libpng', '1.5.14'),
+    ('JasPer','1.900.1'),
+]
 
 moduleclass = 'geo'
diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.5-ictce-5.3.0-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.5-ictce-5.3.0-dmpar.eb
new file mode 100644
index 0000000000000000000000000000000000000000..daef6c10e62ef55ec88f9e8082ac208c79c5902b
--- /dev/null
+++ b/easybuild/easyconfigs/w/WPS/WPS-3.5-ictce-5.3.0-dmpar.eb
@@ -0,0 +1,29 @@
+name = 'WPS'
+version = '3.5'
+
+homepage = 'http://www.wrf-model.org'
+description = """WRF Preprocessing System (WPS) for WRF. The Weather Research and Forecasting (WRF) Model is 
+ a next-generation mesoscale numerical weather prediction system designed to serve both operational 
+ forecasting and atmospheric research needs."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'opt': True}
+
+sources = ['%(name)sV%(version)s.TAR.gz']
+source_urls = ['http://www.mmm.ucar.edu/wrf/src/']
+
+patches = ['WPS_netCDF-Fortran_seperate_path.patch']
+
+buildtype = "dmpar"
+versionsuffix = '-%s' % buildtype
+
+dependencies = [
+    ('WRF', version, versionsuffix),
+    ('netCDF', '4.2.1.1'),
+    ('netCDF-Fortran', '4.2'),
+    ('zlib', '1.2.7'),
+    ('libpng', '1.6.3'),
+    ('JasPer', '1.900.1'),
+]
+
+moduleclass = 'geo'
diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.5.1-ictce-4.1.13-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.5.1-ictce-4.1.13-dmpar.eb
index db34226522f4fa5c242ee7e0f7b7351df87d2c50..7981e0271c6fb67f9e067720dd3dc921499f8428 100644
--- a/easybuild/easyconfigs/w/WPS/WPS-3.5.1-ictce-4.1.13-dmpar.eb
+++ b/easybuild/easyconfigs/w/WPS/WPS-3.5.1-ictce-4.1.13-dmpar.eb
@@ -11,8 +11,10 @@ toolchainopts = {'opt': True}
 
 sources = ['%(name)sV%(version)s.TAR.gz']
 source_urls = ['http://www.mmm.ucar.edu/wrf/src/']
+# WPS v3.5.1 tarball was changed at some point, a previous version had checksum 0dd6b0b51321c836d3e60764f00ecb85
+checksums = ['ce0eb551d29e04f688e02d522d327c2c']
 
-patches = ['WPS_netCDF-Fortran_seperate_path.patch']
+patches = ['WPS-%(version)s_netCDF-Fortran_seperate_path.patch']
 
 buildtype = "dmpar"
 versionsuffix = '-%s' % buildtype
diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.5.1-ictce-5.3.0-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.5.1-ictce-5.3.0-dmpar.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f332d97a3edd7eb771c01ba24365250276fc82e5
--- /dev/null
+++ b/easybuild/easyconfigs/w/WPS/WPS-3.5.1-ictce-5.3.0-dmpar.eb
@@ -0,0 +1,31 @@
+name = 'WPS'
+version = '3.5.1'
+
+homepage = 'http://www.wrf-model.org'
+description = """WRF Preprocessing System (WPS) for WRF. The Weather Research and Forecasting (WRF) Model is 
+ a next-generation mesoscale numerical weather prediction system designed to serve both operational 
+ forecasting and atmospheric research needs."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'opt': True}
+
+sources = ['%(name)sV%(version)s.TAR.gz']
+source_urls = ['http://www.mmm.ucar.edu/wrf/src/']
+# WPS v3.5.1 tarball was changed at some point, a previous version had checksum 0dd6b0b51321c836d3e60764f00ecb85
+checksums = ['ce0eb551d29e04f688e02d522d327c2c']
+
+patches = ['WPS-%(version)s_netCDF-Fortran_seperate_path.patch']
+
+buildtype = "dmpar"
+versionsuffix = '-%s' % buildtype
+
+dependencies = [
+    ('WRF', version, versionsuffix),
+    ('netCDF', '4.2.1.1'),
+    ('netCDF-Fortran', '4.2'),
+    ('zlib', '1.2.7'),
+    ('libpng', '1.6.3'),
+    ('JasPer', '1.900.1'),
+]
+
+moduleclass = 'geo'
diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.5.1_netCDF-Fortran_seperate_path.patch b/easybuild/easyconfigs/w/WPS/WPS-3.5.1_netCDF-Fortran_seperate_path.patch
new file mode 100644
index 0000000000000000000000000000000000000000..a0a5dd6390283a1d4f932d233f4fde07351029ea
--- /dev/null
+++ b/easybuild/easyconfigs/w/WPS/WPS-3.5.1_netCDF-Fortran_seperate_path.patch
@@ -0,0 +1,71 @@
+diff -ru WPS.orig/arch/Config.pl WPS/arch/Config.pl
+--- WPS.orig/arch/Config.pl	2012-04-07 00:07:24.000000000 +0200
++++ WPS/arch/Config.pl	2012-06-19 15:33:40.998567539 +0200
+@@ -36,6 +36,7 @@
+     if(substr( $ARGV[0], 1, 8 ) eq "netcdff=")
+     {
+         $sw_netcdff_lib = substr( $ARGV[0], 9);
++        $sw_netcdff_lib =~ s/!/ /g ;
+     }
+     if(substr( $ARGV[0], 1, 6 ) eq "phdf5=")
+     {
+diff -ru WPS.orig/configure WPS/configure
+--- WPS.orig/configure	2012-04-07 00:07:19.000000000 +0200
++++ WPS/configure	2012-06-19 15:34:35.543132843 +0200
+@@ -119,9 +119,14 @@
+   echo "Will use NETCDF in dir: $NETCDF"
+   # for 3.6.2 and greater there might be a second library, libnetcdff.a .  Check for this and use
+   # if available
+-  NETCDFF=" "
+-  if [ -f "$NETCDF/lib/libnetcdff.a" ] ; then
+-    NETCDFF="-lnetcdff"
++  USENETCDFF=" "
++  # for netCDF 4.2 and greater, the Fortran library is a seperate install
++  if [ -z "$NETCDFF" ]
++  then
++    NETCDFF=$NETCDF
++  fi
++  if [ -f "$NETCDFF/lib/libnetcdff.a" ] ; then
++    USENETCDFF="-L$NETCDFF/lib!-lnetcdff"
+   fi
+ else
+   echo "Will configure for use without NetCDF"
+@@ -151,7 +156,7 @@
+ fi
+ 
+ # Found perl, so proceed with configuration
+-perl arch/Config.pl -perl=$PERL -netcdf=$NETCDF -netcdff=$NETCDFF -os=$os -mach=$mach 
++perl arch/Config.pl -perl=$PERL -netcdf=$NETCDF -netcdff=$USENETCDFF -os=$os -mach=$mach 
+ 
+ 
+ #Checking cross-compiling capability for some particular environment 
+@@ -319,9 +324,9 @@
+         end program
+ EOF
+     FFLAGS=`grep ^FFLAGS configure.wps | cut -d"=" -f2-`
+-    cp $NETCDF/include/netcdf.inc .
++    cp $NETCDFF/include/netcdf.inc .
+     FC=`grep ^SFC configure.wps | cut -d"=" -f2-`
+-    $FC ${FFLAGS} fort_netcdf.f -o fort_netcdf -L${NETCDF}/lib $NETCDFF -lnetcdf > /dev/null 2>&1 
++    $FC ${FFLAGS} fort_netcdf.f -o fort_netcdf -L${NETCDF}/lib -lnetcdf $USENETCDFF > /dev/null 2>&1 
+     if [ -f "fort_netcdf" ] ; then
+       fort_netcdf > /dev/null 2>&1
+       if [ $? = 0 ]; then
+Only in WPS: configure.wps
+diff -ru WPS.orig/util/src/Makefile WPS/util/src/Makefile
+--- WPS.orig/util/src/Makefile	2012-04-07 00:07:26.000000000 +0200
++++ WPS/util/src/Makefile	2012-06-19 15:36:39.849421166 +0200
+@@ -40,11 +40,11 @@
+ 		write_met_module.o misc_definitions_module.o met_data_module.o
+ 	$(SFC) $(LDFLAGS) -o $@ elev_angle.o cio.o module_debug.o gridinfo_module.o \
+ 		write_met_module.o misc_definitions_module.o met_data_module.o \
+-		-L$(NETCDF)/lib -I$(NETCDF)/include -lnetcdf
++		-L$(NETCDFF)/lib -I$(NETCDFF)/include -lnetcdff
+ 
+ elev_angle.o: elev_angle.F cio.o module_debug.o gridinfo_module.o \
+ 		write_met_module.o misc_definitions_module.o
+-	$(SFC) -c elev_angle.F -I$(NETCDF)/include
++	$(SFC) -c elev_angle.F -I$(NETCDFF)/include
+ 
+ calc_ecmwf_p.exe: calc_ecmwf_p.o cio.o module_debug.o module_stringutil.o gridinfo_module.o read_met_module.o \
+ 		write_met_module.o module_date_pack.o misc_definitions_module.o met_data_module.o constants_module.o
diff --git a/easybuild/easyconfigs/w/WPS/WPS_netCDF-Fortran_seperate_path.patch b/easybuild/easyconfigs/w/WPS/WPS_netCDF-Fortran_seperate_path.patch
index 7ffad44e63058a60758f3eed5e5c7fca60bf4a64..d37050c60e95031a94fe7b7bc06ca4a66b706308 100644
--- a/easybuild/easyconfigs/w/WPS/WPS_netCDF-Fortran_seperate_path.patch
+++ b/easybuild/easyconfigs/w/WPS/WPS_netCDF-Fortran_seperate_path.patch
@@ -1,3 +1,6 @@
+patch file for 'old' WPS v3.5.1 tarball (with MD5 checksum 0dd6b0b51321c836d3e60764f00ecb85)
+alternative patch available for last (?) version of v3.5.1 tarball (checksum ce0eb551d29e04f688e02d522d327c2c),
+see WPS-3.5.1_netCDF-Fortran_seperate_path.patch
 diff -ru WPS.orig/arch/Config.pl WPS/arch/Config.pl
 --- WPS.orig/arch/Config.pl	2012-04-07 00:07:24.000000000 +0200
 +++ WPS/arch/Config.pl	2012-06-19 15:33:40.998567539 +0200
diff --git a/easybuild/easyconfigs/w/WRF/WRF-3.4.1-ictce-5.3.0-dmpar.eb b/easybuild/easyconfigs/w/WRF/WRF-3.4.1-ictce-5.3.0-dmpar.eb
new file mode 100644
index 0000000000000000000000000000000000000000..227be5752c0e368c71b1e99894692569017cfc9f
--- /dev/null
+++ b/easybuild/easyconfigs/w/WRF/WRF-3.4.1-ictce-5.3.0-dmpar.eb
@@ -0,0 +1,37 @@
+name = 'WRF'
+version = '3.4.1'
+
+homepage = 'http://www.wrf-model.org'
+description = """The Weather Research and Forecasting (WRF) Model is a next-generation mesoscale
+ numerical weather prediction system designed to serve both operational forecasting and atmospheric
+ research needs."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'opt': False}  # don't use agressive optimization, stick to -O2
+
+sources = ['%(name)sV%(version)s.TAR.gz']
+source_urls = ['http://www.mmm.ucar.edu/wrf/src/']
+
+# csh is used by WRF install scripts
+builddependencies = [('tcsh', '6.18.01')]
+
+dependencies = [
+    ('JasPer', '1.900.1'),
+    ('netCDF', '4.2.1.1'),
+    ('netCDF-Fortran', '4.2'),
+]
+
+patches = [
+    'WRF_parallel_build_fix.patch',
+    'WRF-3.4.1_netCDF-Fortran_separate_path.patch',
+    'WRF_FC-output-spec_fix.patch',
+    'WRF_tests_limit-runtimes.patch',
+]
+
+# limit parallel build to 20
+maxparallel = 20
+
+buildtype = "dmpar"
+versionsuffix = '-%s' % buildtype
+
+moduleclass = 'geo'
diff --git a/easybuild/easyconfigs/w/WRF/WRF-3.5.1-ictce-5.3.0-dmpar.eb b/easybuild/easyconfigs/w/WRF/WRF-3.5.1-ictce-5.3.0-dmpar.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f02edb456770f58ec08518a25e760f9b77d79d40
--- /dev/null
+++ b/easybuild/easyconfigs/w/WRF/WRF-3.5.1-ictce-5.3.0-dmpar.eb
@@ -0,0 +1,36 @@
+name = 'WRF'
+version = '3.5.1'
+
+homepage = 'http://www.wrf-model.org'
+description = """The Weather Research and Forecasting (WRF) Model is a next-generation mesoscale
+ numerical weather prediction system designed to serve both operational forecasting and atmospheric
+ research needs."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'opt': False}  # don't use agressive optimization, stick to -O2
+
+sources = ['%(name)sV%(version)s.TAR.gz']
+source_urls = ['http://www.mmm.ucar.edu/wrf/src/']
+
+# csh is used by WRF install scripts
+builddependencies = [('tcsh', '6.18.01')]
+
+dependencies = [
+    ('JasPer', '1.900.1'),
+    ('netCDF', '4.2.1.1'),
+    ('netCDF-Fortran', '4.2'),
+]
+
+patches = [
+    'WRF_parallel_build_fix.patch',
+    'WRF-3.5_netCDF-Fortran_separate_path.patch',
+    'WRF_tests_limit-runtimes.patch',
+]
+
+# limit parallel build to 20
+maxparallel = 20
+
+buildtype = "dmpar"
+versionsuffix = '-%s' % buildtype
+
+moduleclass = 'geo'
diff --git a/easybuild/easyconfigs/w/wiki2beamer/wiki2beamer-0.9.5-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/w/wiki2beamer/wiki2beamer-0.9.5-ictce-5.3.0-Python-2.7.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3e35384c19108f53a641e5c894b71a25ee43f6a4
--- /dev/null
+++ b/easybuild/easyconfigs/w/wiki2beamer/wiki2beamer-0.9.5-ictce-5.3.0-Python-2.7.3.eb
@@ -0,0 +1,44 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine
+# Authors::   Cedric Laczny <cedric.laczny@uni.lu>, Fotis Georgatos <fotis.georgatos@uni.lu>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/index.html
+##
+
+easyblock = "PythonPackage"
+
+name = 'wiki2beamer'
+version = '0.9.5'
+
+homepage = 'http://wiki2beamer.sourceforge.net/'
+description = """wiki2beamer converts a simple wiki-like syntax to complex LaTeX beamer code.
+  It's written in python and should run on all *nix platforms. Afraid to loose some LaTeX powers?
+ Don't worry: you can always fall back to plain LaTeX as wiki2beamer is just a preprocessor."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+# eg. http://sourceforge.net/projects/wiki2beamer/files/wiki2beamer/wiki2beamer-0.9.5/wiki2beamer-0.9.5.zip/download
+sources = ['wiki2beamer-0.9.5.zip']
+source_urls = ['http://sourceforge.net/projects/wiki2beamer/files/wiki2beamer/wiki2beamer-0.9.5','download']
+
+python = 'Python'
+pyver = '2.7.3'
+versionsuffix = '-%s-%s' % (python, pyver)
+
+dependencies = [(python, pyver)]
+
+start_dir = 'code'
+
+options = {'modulename': False}
+
+sanity_check_paths = {
+                      'files': ["bin/wiki2beamer"],
+                      'dirs': ["."]
+                     }
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/x/XML/XML-3.95-0.1-goalf-1.1.0-no-OFED-R-2.15.2.eb b/easybuild/easyconfigs/x/XML/XML-3.95-0.1-goalf-1.1.0-no-OFED-R-2.15.2.eb
index 842e1cde9788b667e8c744d051e0b35e0c3ed3de..dfbf3d08493045c443964df81976de5e9633b9b7 100644
--- a/easybuild/easyconfigs/x/XML/XML-3.95-0.1-goalf-1.1.0-no-OFED-R-2.15.2.eb
+++ b/easybuild/easyconfigs/x/XML/XML-3.95-0.1-goalf-1.1.0-no-OFED-R-2.15.2.eb
@@ -3,7 +3,7 @@ version = '3.95-0.1'
 
 homepage = 'http://cran.r-project.org/web/packages/XML'
 description = """This package provides many approaches for both reading and creating XML (and HTML) documents
-  (including DTDs), both local and accessible via HTTP or FTP. It also offers access to an XPath "interpreter"."""
+  (including DTDs), both local and accessible via HTTP or FTP. It also offers access to an XPath 'interpreter'."""
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
diff --git a/easybuild/easyconfigs/x/XML/XML-3.95-0.1-goolf-1.4.10-R-2.15.2.eb b/easybuild/easyconfigs/x/XML/XML-3.95-0.1-goolf-1.4.10-R-2.15.2.eb
index dbd5ba5e89ed23495036ce42faa3681695008eab..366fa8a2aa6992e931d45e5889b0153bb7593fa2 100644
--- a/easybuild/easyconfigs/x/XML/XML-3.95-0.1-goolf-1.4.10-R-2.15.2.eb
+++ b/easybuild/easyconfigs/x/XML/XML-3.95-0.1-goolf-1.4.10-R-2.15.2.eb
@@ -3,7 +3,7 @@ version = '3.95-0.1'
 
 homepage = 'http://cran.r-project.org/web/packages/XML'
 description = """This package provides many approaches for both reading and creating XML (and HTML) documents
-(including DTDs), both local and accessible via HTTP or FTP. It also offers access to an XPath "interpreter"."""
+(including DTDs), both local and accessible via HTTP or FTP. It also offers access to an XPath 'interpreter'."""
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
diff --git a/easybuild/easyconfigs/x/XML/XML-3.95-0.1-ictce-4.0.6-R-2.15.2.eb b/easybuild/easyconfigs/x/XML/XML-3.95-0.1-ictce-4.0.6-R-2.15.2.eb
index 67a54f40cdc2305eee4b12ae66f58c6dd46fc8d8..695f7960bc5aca892b13fc48dec394b8334603c1 100644
--- a/easybuild/easyconfigs/x/XML/XML-3.95-0.1-ictce-4.0.6-R-2.15.2.eb
+++ b/easybuild/easyconfigs/x/XML/XML-3.95-0.1-ictce-4.0.6-R-2.15.2.eb
@@ -3,7 +3,7 @@ version = '3.95-0.1'
 
 homepage = 'http://cran.r-project.org/web/packages/XML'
 description = """This package provides many approaches for both reading and creating XML (and HTML) documents
-  (including DTDs), both local and accessible via HTTP or FTP. It also offers access to an XPath "interpreter"."""
+  (including DTDs), both local and accessible via HTTP or FTP. It also offers access to an XPath 'interpreter'."""
 
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
diff --git a/easybuild/easyconfigs/x/XML/XML-3.95-0.1-ictce-5.3.0-R-2.15.2.eb b/easybuild/easyconfigs/x/XML/XML-3.95-0.1-ictce-5.3.0-R-2.15.2.eb
index 16a2b8f8533edaf254caf70825ef19cc8c3625cc..e5358dc0d24825ff20cf44e5d8cfcfa3dc21f631 100644
--- a/easybuild/easyconfigs/x/XML/XML-3.95-0.1-ictce-5.3.0-R-2.15.2.eb
+++ b/easybuild/easyconfigs/x/XML/XML-3.95-0.1-ictce-5.3.0-R-2.15.2.eb
@@ -3,7 +3,7 @@ version = '3.95-0.1'
 
 homepage = 'http://cran.r-project.org/web/packages/XML'
 description = """This package provides many approaches for both reading and creating XML (and HTML) documents
-  (including DTDs), both local and accessible via HTTP or FTP. It also offers access to an XPath "interpreter"."""
+  (including DTDs), both local and accessible via HTTP or FTP. It also offers access to an XPath 'interpreter'."""
 
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
diff --git a/easybuild/easyconfigs/x/XZ/XZ-5.0.5-goolf-1.4.10.eb b/easybuild/easyconfigs/x/XZ/XZ-5.0.5-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2393846fce8bf33376b9efd377e0630b6000af90
--- /dev/null
+++ b/easybuild/easyconfigs/x/XZ/XZ-5.0.5-goolf-1.4.10.eb
@@ -0,0 +1,19 @@
+name = 'XZ'
+version = '5.0.5'
+
+homepage = 'http://tukaani.org/xz/'
+description = "xz: XZ utilities"
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['http://tukaani.org/xz/']
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+# configopts = ' --disable-assembler ' # may become useful in non-x86 archs
+
+sanity_check_paths = {
+    'files': ["bin/xz", "bin/lzmainfo"],
+    'dirs': []
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/x/XZ/XZ-5.0.5-ictce-5.3.0.eb b/easybuild/easyconfigs/x/XZ/XZ-5.0.5-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9c4849b2f4fe76da8e0e01c270a51af6ca94fb3b
--- /dev/null
+++ b/easybuild/easyconfigs/x/XZ/XZ-5.0.5-ictce-5.3.0.eb
@@ -0,0 +1,19 @@
+name = 'XZ'
+version = '5.0.5'
+
+homepage = 'http://tukaani.org/xz/'
+description = "xz: XZ utilities"
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['http://tukaani.org/xz/']
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+# configopts = ' --disable-assembler ' # may become useful in non-x86 archs
+
+sanity_check_paths = {
+    'files': ["bin/xz", "bin/lzmainfo"],
+    'dirs': []
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-ictce-5.3.0.eb b/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b3d975a74437f55653c9bce63e6654a3614bb68c
--- /dev/null
+++ b/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-ictce-5.3.0.eb
@@ -0,0 +1,17 @@
+name = 'xbitmaps'
+version = '1.1.1'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """provides bitmaps for x"""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://xorg.freedesktop.org/archive/individual/data/']
+
+sanity_check_paths = {
+    'files' : ['include/X11/bitmaps/gray'],
+    'dirs' : []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-ictce-5.3.0.eb b/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b6a0c1599352c8e28dc1de7dd643ca14c595ca89
--- /dev/null
+++ b/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-ictce-5.3.0.eb
@@ -0,0 +1,23 @@
+name = 'xextproto'
+version = '7.2.1'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """XExtProto protocol headers."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'optarch': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+
+sanity_check_paths = {
+    'files': ['include/X11/extensions/%s' % x for x in [
+            'agproto.h', 'cupproto.h', 'dbeproto.h', 'dpmsproto.h', 'EVIproto.h', 'geproto.h', 'lbxproto.h',
+            'mitmiscproto.h', 'multibufproto.h', 'securproto.h', 'shapeproto.h', 'shm.h', 'shmstr.h', 'syncproto.h',
+            'xtestconst.h', 'xtestext1proto.h'
+        ]
+    ],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xtrans/xtrans-1.2-goolf-1.4.10.eb b/easybuild/easyconfigs/x/xtrans/xtrans-1.2-goolf-1.4.10.eb
index 3772668400803e6e7fd18e7e0ded5eceb1105089..bfc50f46f5cca137c8c3c0c94655206c9e7c354b 100644
--- a/easybuild/easyconfigs/x/xtrans/xtrans-1.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/x/xtrans/xtrans-1.2-goolf-1.4.10.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 sanity_check_paths = {
     'files' : ['include/X11/Xtrans/%s' % x for x in [
diff --git a/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-4.1.13.eb b/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-4.1.13.eb
index 8b232a58889e10612802c4c293d10142c6da29e6..b8c63106bfe31c989b361d3a34d547f93aa4eed4 100644
--- a/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-4.1.13.eb
@@ -9,7 +9,7 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 sanity_check_paths = {
     'files' : ['include/X11/Xtrans/%s' % x for x in [
diff --git a/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-5.3.0.eb b/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e8f54023d97e17b6b9f8f54079c0d565d394d4c2
--- /dev/null
+++ b/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-5.3.0.eb
@@ -0,0 +1,24 @@
+name = 'xtrans'
+version = '1.2'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """xtrans includes a number of routines to make X implementations transport-independent;
+ at time of writing, it includes support for UNIX sockets, IPv4, IPv6, and DECnet.
+"""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+toolchainopts = {'optarch': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+sanity_check_paths = {
+    'files' : ['include/X11/Xtrans/%s' % x for x in [
+        'transport.c', 'Xtrans.c', 'Xtransdnet.c', 'Xtrans.h', 'Xtransint.h', 'Xtranslcl.c', 'Xtransos2.c',
+        'Xtranssock.c', 'Xtranstli.c', 'Xtransutil.c'
+        ]
+    ],
+    'dirs' : []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-ictce-5.3.0-Perl-5.16.3.eb b/easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-ictce-5.3.0-Perl-5.16.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..30d441b40aaa35fb8773339d8f0a4f09bd5612a7
--- /dev/null
+++ b/easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-ictce-5.3.0-Perl-5.16.3.eb
@@ -0,0 +1,35 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine
+# Authors::   Nils Christian <nils.christian@uni.lu>
+# License::   MIT/GPL
+# $Id$
+#
+##
+easyblock = 'PerlModule'
+
+name = 'YAML-Syck'
+version = '1.27'
+
+homepage = 'http://search.cpan.org/perldoc?YAML%3A%3ASyck'
+description = """Fast, lightweight YAML loader and dumper.
+ This module provides a Perl interface to the libsyck data serialization library."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = ['http://www.cpan.org/modules/by-module/YAML']
+sources = [SOURCE_TAR_GZ]
+
+perl = 'Perl'
+perlver = '5.16.3'
+perlverextra = ''
+versionsuffix = '-%s-%s%s' % (perl, perlver,perlverextra)
+
+dependencies = [
+    (perl, perlver, perlverextra),
+]
+
+options = {'modulename': 'YAML::Syck'}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/y/yaff/yaff-1.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/y/yaff/yaff-1.0-goolf-1.4.10-Python-2.7.3.eb
index 15ffe15aeecd20654188c021a4fd1b5e7322acda..18d77017867499b1b41b17f954126e7411084e02 100644
--- a/easybuild/easyconfigs/y/yaff/yaff-1.0-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/y/yaff/yaff-1.0-goolf-1.4.10-Python-2.7.3.eb
@@ -26,7 +26,8 @@ dependencies = [
 ]
 
 # disable tests that require X11 by specifying "backend: agg" in matplotlibrc
-runtest = 'export MATPLOTLIBRC=$PWD; echo "backend: agg" > $MATPLOTLIBRC/matplotlibrc; python setup.py build_ext -i; nosetests -v'
+runtest = 'export MATPLOTLIBRC=$PWD; echo "backend: agg" > $MATPLOTLIBRC/matplotlibrc; '
+runtest += 'python setup.py build_ext -i; nosetests -v'
 
 sanity_check_paths = {
     'files': [],
diff --git a/easybuild/easyconfigs/y/yaff/yaff-1.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/y/yaff/yaff-1.0-ictce-4.1.13-Python-2.7.3.eb
index a08ebd67d788c4d74b6a30779c6d91fe1deeb2af..cdf3df85def396554be9ce12e176ca3be7d84f4c 100644
--- a/easybuild/easyconfigs/y/yaff/yaff-1.0-ictce-4.1.13-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/y/yaff/yaff-1.0-ictce-4.1.13-Python-2.7.3.eb
@@ -26,7 +26,8 @@ dependencies = [
 ]
 
 # disable tests that require X11 by specifying "backend: agg" in matplotlibrc
-runtest = 'export MATPLOTLIBRC=$PWD; echo "backend: agg" > $MATPLOTLIBRC/matplotlibrc; python setup.py build_ext -i; nosetests -v'
+runtest = 'export MATPLOTLIBRC=$PWD; echo "backend: agg" > $MATPLOTLIBRC/matplotlibrc; '
+runtest += 'python setup.py build_ext -i; nosetests -v'
 
 sanity_check_paths = {
     'files': [],
diff --git a/easybuild/easyconfigs/y/yaff/yaff-1.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/y/yaff/yaff-1.0-ictce-5.3.0-Python-2.7.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ed6b897594876aa5f0fc3e445ab1e75430577a1e
--- /dev/null
+++ b/easybuild/easyconfigs/y/yaff/yaff-1.0-ictce-5.3.0-Python-2.7.3.eb
@@ -0,0 +1,37 @@
+easyblock = "PythonPackage"
+
+name = 'yaff'
+version = '1.0'
+
+homepage = 'http://molmod.github.io/yaff/'
+description = """Yaff stands for 'Yet another force field'. It is a pythonic force-field code."""
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+source_urls = ['http://users.ugent.be/~tovrstra/yaff']
+sources = [SOURCE_TAR_GZ]
+
+python = "Python"
+pythonversion = '2.7.3'
+pythonshortversion = ".".join(pythonversion.split(".")[:-1])
+
+versionsuffix = "-%s-%s" % (python, pythonversion)
+
+dependencies = [
+    (python, pythonversion),
+    ('h5py', '2.1.3', versionsuffix),
+    ('matplotlib', '1.2.1', versionsuffix),
+    ('Cython', '0.19.1', versionsuffix),
+    ('molmod', '1.0', versionsuffix),
+]
+
+# disable tests that require X11 by specifying "backend: agg" in matplotlibrc
+runtest = 'export MATPLOTLIBRC=$PWD; echo "backend: agg" > $MATPLOTLIBRC/matplotlibrc; '
+runtest += 'python setup.py build_ext -i; nosetests -v'
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%s/site-packages/%%(name)s' % pythonshortversion],
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-goalf-1.1.0-no-OFED.eb
index 9daba3c85e42e1f5aa7219b273ef023c32ac33d2..27a2cb351dcae37e7f08a2ad3cab86b5c215aa88 100644
--- a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-goalf-1.1.0-no-OFED.eb
@@ -20,13 +20,13 @@ configopts += 'OpenPGM_CFLAGS="-I$EBROOTOPENPGM/include/pgm-${EBVERSIONOPENPGM%.
 configopts += 'OpenPGM_LIBS="-L$EBROOTOPENPGM/lib -lpgm -lrt -lpthread -lm" '
 
 dependencies = [
-                ('OpenPGM', '5.2.122'),
-                ('util-linux', '2.22.2')
-               ]
+    ('OpenPGM', '5.2.122'),
+    ('util-linux', '2.22.2'),
+]
 
 sanity_check_paths = {
-                      'files': ['lib/libzmq.so', 'lib/libzmq.a'],
-                      'dirs': ['include', 'lib']
-                      }
+    'files': ['lib/libzmq.so', 'lib/libzmq.a'],
+    'dirs': ['include', 'lib'],
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-ictce-4.1.13.eb b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-ictce-4.1.13.eb
index a58d4fd0845acc9950770d3ab220abb2f00b9c92..a24777e7cdeda297d1823415d1bf61f92e9470ca 100644
--- a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-ictce-4.1.13.eb
@@ -20,13 +20,13 @@ configopts += 'OpenPGM_CFLAGS="-I$EBROOTOPENPGM/include/pgm-${EBVERSIONOPENPGM%.
 configopts += 'OpenPGM_LIBS="-L$EBROOTOPENPGM/lib -lpgm -lrt -lpthread -lm" '
 
 dependencies = [
-                ('OpenPGM', '5.2.122'),
-                ('util-linux', '2.22.2')
-               ]
+    ('OpenPGM', '5.2.122'),
+    ('util-linux', '2.22.2'),
+]
 
 sanity_check_paths = {
-                      'files': ['lib/libzmq.so', 'lib/libzmq.a'],
-                      'dirs': ['include', 'lib']
-                      }
+    'files': ['lib/libzmq.so', 'lib/libzmq.a'],
+    'dirs': ['include', 'lib'],
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-ictce-5.3.0.eb b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-ictce-5.3.0.eb
index cede9c77fd2b5f44261423409393f71959479b6c..c50ac8ac7d68eea7c2c118649bd176c8d89aee6a 100644
--- a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-ictce-5.3.0.eb
@@ -9,7 +9,6 @@ description = """ZeroMQ looks like an embeddable networking library but acts lik
  products. Its asynchronous I/O model gives you scalable multicore applications, built as asynchronous
  message-processing tasks. It has a score of language APIs and runs on most operating systems."""
 
-
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 source_urls = ['http://download.zeromq.org/']
@@ -21,13 +20,13 @@ configopts += 'OpenPGM_CFLAGS="-I$EBROOTOPENPGM/include/pgm-${EBVERSIONOPENPGM%.
 configopts += 'OpenPGM_LIBS="-L$EBROOTOPENPGM/lib -lpgm -lrt -lpthread -lm" '
 
 dependencies = [
-                ('OpenPGM', '5.2.122'),
-                ('util-linux', '2.22.2')
-               ]
+    ('OpenPGM', '5.2.122'),
+    ('util-linux', '2.22.2'),
+]
 
 sanity_check_paths = {
-                      'files': ['lib/libzmq.so', 'lib/libzmq.a'],
-                      'dirs': ['include', 'lib']
-                      }
+    'files': ['lib/libzmq.so', 'lib/libzmq.a'],
+    'dirs': ['include', 'lib'],
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-ictce-5.5.0.eb b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b356788e95411b0bad15d99cfa92480851e4daf8
--- /dev/null
+++ b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-ictce-5.5.0.eb
@@ -0,0 +1,32 @@
+name = 'ZeroMQ'
+version = '2.2.0'
+
+homepage = 'http://www.zeromq.org/'
+description = """ZeroMQ looks like an embeddable networking library but acts like a concurrency framework.
+ It gives you sockets that carry atomic messages across various transports like in-process,
+ inter-process, TCP, and multicast. You can connect sockets N-to-N with patterns like fanout,
+ pub-sub, task distribution, and request-reply. It's fast enough to be the fabric for clustered
+ products. Its asynchronous I/O model gives you scalable multicore applications, built as asynchronous
+ message-processing tasks. It has a score of language APIs and runs on most operating systems."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+source_urls = ['http://download.zeromq.org/']
+sources = [SOURCELOWER_TAR_GZ]
+
+# --with-pgm will use shipped OpenPGM (in foreign subdir)
+configopts = '--with-pic --with-system-pgm '
+configopts += 'OpenPGM_CFLAGS="-I$EBROOTOPENPGM/include/pgm-${EBVERSIONOPENPGM%.*}" '
+configopts += 'OpenPGM_LIBS="-L$EBROOTOPENPGM/lib -lpgm -lrt -lpthread -lm" '
+
+dependencies = [
+    ('OpenPGM', '5.2.122'),
+    ('util-linux', '2.22.2'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libzmq.so', 'lib/libzmq.a'],
+    'dirs': ['include', 'lib'],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-goalf-1.1.0-no-OFED.eb
index a774e6830099cc2ad9056b8f176e374d3309bbba..117938148caa7e71f8ad4703eacff2782d4bacea 100644
--- a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-goalf-1.1.0-no-OFED.eb
@@ -20,13 +20,13 @@ configopts += 'OpenPGM_CFLAGS="-I$EBROOTOPENPGM/include/pgm-${EBVERSIONOPENPGM%.
 configopts += 'OpenPGM_LIBS="-L$EBROOTOPENPGM/lib -lpgm -lrt -lpthread -lm" '
 
 dependencies = [
-                ('OpenPGM', '5.2.122'),
-                ('util-linux', '2.22.2')
-               ]
+    ('OpenPGM', '5.2.122'),
+    ('util-linux', '2.22.2'),
+]
 
 sanity_check_paths = {
-                      'files': ['lib/libzmq.so', 'lib/libzmq.a'],
-                      'dirs': ['include', 'lib']
-                      }
+    'files': ['lib/libzmq.so', 'lib/libzmq.a'],
+    'dirs': ['include', 'lib'],
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-ictce-4.1.13.eb b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-ictce-4.1.13.eb
index 5cace579947c30f8d2c86f72fad0ae7b9b8f1caa..7f28e21cd468d53230c4fc52d59b826b1e129f09 100644
--- a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-ictce-4.1.13.eb
@@ -14,21 +14,21 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'}
 source_urls = ['http://download.zeromq.org/']
 sources = [SOURCELOWER_TAR_GZ]
 
+patches = ['ZeroMQ-%(version)s_icc.patch']
+
 # --with-pgm will use shipped OpenPGM (in foreign subdir)
 configopts = '--with-pic --with-system-pgm '
 configopts += 'OpenPGM_CFLAGS="-I$EBROOTOPENPGM/include/pgm-${EBVERSIONOPENPGM%.*}" '
 configopts += 'OpenPGM_LIBS="-L$EBROOTOPENPGM/lib -lpgm -lrt -lpthread -lm" '
 
 dependencies = [
-                ('OpenPGM', '5.2.122'),
-                ('util-linux', '2.22.2')
-               ]
-
-patches = ['stream_engine_ictce_storage_class_first.patch']
+    ('OpenPGM', '5.2.122'),
+    ('util-linux', '2.22.2'),
+]
 
 sanity_check_paths = {
-                      'files': ['lib/libzmq.so', 'lib/libzmq.a'],
-                      'dirs': ['include', 'lib']
-                      }
+    'files': ['lib/libzmq.so', 'lib/libzmq.a'],
+    'dirs': ['include', 'lib'],
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-ictce-5.3.0.eb b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-ictce-5.3.0.eb
index e4cacef1c57a0e79b2a619ebf12369b4c0a3e135..4ab3604a005d371ef4f07e7d86977cbf90553595 100644
--- a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-ictce-5.3.0.eb
@@ -9,27 +9,26 @@ description = """ZeroMQ looks like an embeddable networking library but acts lik
  products. Its asynchronous I/O model gives you scalable multicore applications, built as asynchronous
  message-processing tasks. It has a score of language APIs and runs on most operating systems."""
 
-
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 source_urls = ['http://download.zeromq.org/']
 sources = [SOURCELOWER_TAR_GZ]
 
+patches = ['ZeroMQ-%(version)s_icc.patch']
+
 # --with-pgm will use shipped OpenPGM (in foreign subdir)
 configopts = '--with-pic --with-system-pgm '
 configopts += 'OpenPGM_CFLAGS="-I$EBROOTOPENPGM/include/pgm-${EBVERSIONOPENPGM%.*}" '
 configopts += 'OpenPGM_LIBS="-L$EBROOTOPENPGM/lib -lpgm -lrt -lpthread -lm" '
 
 dependencies = [
-                ('OpenPGM', '5.2.122'),
-                ('util-linux', '2.22.2')
-               ]
-
-patches = ['stream_engine_ictce_storage_class_first.patch']
+    ('OpenPGM', '5.2.122'),
+    ('util-linux', '2.22.2'),
+]
 
 sanity_check_paths = {
-                      'files': ['lib/libzmq.so', 'lib/libzmq.a'],
-                      'dirs': ['include', 'lib']
-                      }
+    'files': ['lib/libzmq.so', 'lib/libzmq.a'],
+    'dirs': ['include', 'lib'],
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2_icc.patch b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2_icc.patch
new file mode 100644
index 0000000000000000000000000000000000000000..eeb3dca31082a6fef52138670f101fad9e2598b5
--- /dev/null
+++ b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2_icc.patch
@@ -0,0 +1,12 @@
+diff -ru zeromq-3.2.2.orig/src/stream_engine.hpp zeromq-3.2.2/src/stream_engine.hpp
+--- zeromq-3.2.2.orig/src/stream_engine.hpp	2012-11-14 02:09:14.000000000 +0100
++++ zeromq-3.2.2/src/stream_engine.hpp	2014-02-15 13:57:14.074526627 +0100
+@@ -94,7 +94,7 @@
+ 
+         //  Size of the greeting message:
+         //  Preamble (10 bytes) + version (1 byte) + socket type (1 byte).
+-        const static size_t greeting_size = 12;
++        static const size_t greeting_size = 12;
+ 
+         //  True iff we are registered with an I/O poller.
+         bool io_enabled;
diff --git a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-4.0.3-ictce-5.5.0.eb b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-4.0.3-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8d73e9399ba044044f08e5cf2eb5d5b3d6bfe4d6
--- /dev/null
+++ b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-4.0.3-ictce-5.5.0.eb
@@ -0,0 +1,32 @@
+name = 'ZeroMQ'
+version = '4.0.3'
+
+homepage = 'http://www.zeromq.org/'
+description = """ZeroMQ looks like an embeddable networking library but acts like a concurrency framework.
+ It gives you sockets that carry atomic messages across various transports like in-process,
+ inter-process, TCP, and multicast. You can connect sockets N-to-N with patterns like fanout,
+ pub-sub, task distribution, and request-reply. It's fast enough to be the fabric for clustered
+ products. Its asynchronous I/O model gives you scalable multicore applications, built as asynchronous
+ message-processing tasks. It has a score of language APIs and runs on most operating systems."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+source_urls = ['http://download.zeromq.org/']
+sources = [SOURCELOWER_TAR_GZ]
+
+# --with-pgm will use shipped OpenPGM (in foreign subdir)
+configopts = '--with-pic --with-system-pgm '
+configopts += 'OpenPGM_CFLAGS="-I$EBROOTOPENPGM/include/pgm-${EBVERSIONOPENPGM%.*}" '
+configopts += 'OpenPGM_LIBS="-L$EBROOTOPENPGM/lib -lpgm -lrt -lpthread -lm" '
+
+dependencies = [
+    ('OpenPGM', '5.2.122'),
+    ('util-linux', '2.24'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libzmq.so', 'lib/libzmq.a'],
+    'dirs': ['include', 'lib'],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-goalf-1.5.12-no-OFED.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e008a0db4b6a304ae1eb8324b13871a4d0e38dd1
--- /dev/null
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-goalf-1.5.12-no-OFED.eb
@@ -0,0 +1,20 @@
+name = 'zlib'
+version = '1.2.7'
+
+homepage = 'http://www.zlib.net/'
+description = """zlib is designed to be a free, general-purpose, legally unencumbered -- that is, 
+ not covered by any patents -- lossless data-compression library for use on virtually any 
+ computer hardware and operating system."""
+
+toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%(version)s', 'download')]
+
+sanity_check_paths = {
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.so'],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-5.5.0.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fd81470bdd1cbc7905150001abe9d10d02fd4e09
--- /dev/null
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-5.5.0.eb
@@ -0,0 +1,20 @@
+name = 'zlib'
+version = '1.2.7'
+
+homepage = 'http://www.zlib.net/'
+description = """zlib is designed to be a free, general-purpose, legally unencumbered -- that is, 
+ not covered by any patents -- lossless data-compression library for use on virtually any 
+ computer hardware and operating system."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%(version)s', 'download')]
+
+sanity_check_paths = {
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.so'],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-ictce-6.2.5.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-ictce-6.2.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c01d1b4c1f06f51c91c005ad3dc8bc1cddb53587
--- /dev/null
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-ictce-6.2.5.eb
@@ -0,0 +1,22 @@
+name = 'zlib'
+version = '1.2.8'
+
+homepage = 'http://www.zlib.net/'
+description = """zlib is designed to be a free, general-purpose, legally unencumbered -- that is, 
+ not covered by any patents -- lossless data-compression library for use on virtually any 
+ computer hardware and operating system."""
+
+toolchain = {'name': 'ictce', 'version': '6.2.5'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%s' % version, 'download')]
+
+preconfigopts = 'LDSHARED="$CC -shared"'
+
+sanity_check_paths = {
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.so'],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/z/zsh/zsh-5.0.2-ictce-5.3.0.eb b/easybuild/easyconfigs/z/zsh/zsh-5.0.2-ictce-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..942cf2610b4a4ad7bc983b0bb8a6cb2e9a4d2f07
--- /dev/null
+++ b/easybuild/easyconfigs/z/zsh/zsh-5.0.2-ictce-5.3.0.eb
@@ -0,0 +1,16 @@
+name = 'zsh'
+version = '5.0.2'
+
+homepage = 'http://www.zsh.org/'
+description = "Zsh is a shell designed for interactive use, although it is also a powerful scripting language."
+
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
+
+# skip test that fails when zsh is built in non-terminal environment
+# see http://www.zsh.org/mla/users/2003/msg00852.html
+configopts = '--with-tcsetpgrp'
+
+moduleclass = 'tools'
diff --git a/setup.py b/setup.py
index 97ba63939b43eaf5fd2ad216c7433da8323d902d..8c07948b750bb97065dd3e93cdb518773ce48727 100644
--- a/setup.py
+++ b/setup.py
@@ -41,7 +41,7 @@ from distutils import log
 
 # note: release candidates should be versioned as a pre-release, e.g. "1.1rc1"
 # 1.1-rc1 would indicate a post-release, i.e., and update of 1.1, so beware!
-VERSION = "1.10.0.0dev"
+VERSION = "1.13.0.0dev"
 
 API_VERSION = VERSION.split('.')[0]
 EB_VERSION = '.'.join(VERSION.split('.')[0:2])
diff --git a/test/easyconfigs/easyconfigs.py b/test/easyconfigs/easyconfigs.py
index 3925e6ada398a78882ac9e24313c1a7bcbaa13a0..6490a96fde29ba2b8b9d1472470049a5ea360602 100644
--- a/test/easyconfigs/easyconfigs.py
+++ b/test/easyconfigs/easyconfigs.py
@@ -41,10 +41,10 @@ from unittest import TestCase, TestLoader, main
 
 import easybuild.main as main
 import easybuild.tools.options as eboptions
-from easybuild.framework.easyblock import EasyBlock, get_class
-from easybuild.framework.easyconfig.easyconfig import EasyConfig
-from easybuild.framework.easyconfig.tools import get_paths_for
-from easybuild.main import dep_graph, resolve_dependencies, process_easyconfig
+from easybuild.framework.easyblock import EasyBlock
+from easybuild.framework.easyconfig.easyconfig import EasyConfig, fetch_parameter_from_easyconfig_file
+from easybuild.framework.easyconfig.easyconfig import get_easyblock_class
+from easybuild.framework.easyconfig.tools import dep_graph, get_paths_for, process_easyconfig, resolve_dependencies
 from easybuild.tools import config
 from easybuild.tools.module_generator import det_full_module_name
 
@@ -60,14 +60,22 @@ class EasyConfigTest(TestCase):
     # initialize configuration (required for e.g. default modules_tool setting)
     eb_go = eboptions.parse_options()
     config.init(eb_go.options, eb_go.get_options_by_section('config'))
+    build_options = {
+        'check_osdeps': False,
+        'force': True,
+        'robot_path': get_paths_for("easyconfigs")[0],
+        'valid_module_classes': config.module_classes(),
+        'valid_stops': [x[0] for x in EasyBlock.get_steps()],
+    }
+    config.init_build_options(build_options=build_options)
+    config.set_tmpdir()
     del eb_go
         
     log = fancylogger.getLogger("EasyConfigTest", fname=False)
-    name_regex = re.compile("^name\s*=\s*['\"](.*)['\"]$", re.M)
-    easyblock_regex = re.compile(r"^\s*easyblock\s*=['\"](.*)['\"]$", re.M)
     # make sure a logger is present for main
     main._log = log
     ordered_specs = None
+    parsed_easyconfigs = []
 
     def process_all_easyconfigs(self):
         """Process all easyconfigs and resolve inter-easyconfig dependencies."""
@@ -75,12 +83,12 @@ class EasyConfigTest(TestCase):
         easyconfigs_path = get_paths_for("easyconfigs")[0]
         specs = glob.glob('%s/*/*/*.eb' % easyconfigs_path)
 
-        # parse all easyconfigs
-        easyconfigs = []
-        for spec in specs:
-            easyconfigs.extend(process_easyconfig(spec, validate=False))
+        # parse all easyconfigs if they haven't been already
+        if not self.parsed_easyconfigs:
+            for spec in specs:
+                self.parsed_easyconfigs.extend(process_easyconfig(spec))
 
-        self.ordered_specs = resolve_dependencies(easyconfigs, easyconfigs_path, force=True)
+        self.ordered_specs = resolve_dependencies(self.parsed_easyconfigs)
 
     def test_dep_graph(self):
         """Unit test that builds a full dependency graph."""
@@ -152,6 +160,22 @@ class EasyConfigTest(TestCase):
                         conflicts = True
         self.assertFalse(conflicts, "No conflicts detected")
 
+    def test_easyconfig_locations(self):
+        """Make sure all easyconfigs files are in the right location."""
+        easyconfig_dirs_regex = re.compile(r'/easybuild/easyconfigs/[a-z]/[^/]+$')
+        topdir = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
+        for (dirpath, _, filenames) in os.walk(topdir):
+            # ignore git/svn dirs
+            if '/.git/' in dirpath or '/.svn/' in dirpath:
+                continue
+            # check whether list of .eb files is non-empty
+            easyconfig_files = [fn for fn in filenames if fn.endswith('eb')]
+            if easyconfig_files:
+                # check whether path matches required pattern
+                if not easyconfig_dirs_regex.search(dirpath):
+                    # only exception: TEMPLATE.eb
+                    if not (dirpath.endswith('/easybuild/easyconfigs') and filenames == ['TEMPLATE.eb']):
+                        self.assertTrue(False, "List of easyconfig files in %s is empty: %s" % (dirpath, filenames))
 
 def template_easyconfig_test(self, spec):
     """Test whether all easyconfigs can be initialized."""
@@ -161,31 +185,23 @@ def template_easyconfig_test(self, spec):
     prev_single_tests_ok = single_tests_ok
     single_tests_ok = False
 
-    f = open(spec, 'r')
-    spectxt = f.read()
-    f.close()
-
-    # determine software name directly from easyconfig file
-    res = self.name_regex.search(spectxt)
-    if res:
-        name = res.group(1)
-    else:
-        self.assertTrue(False, "Obtained software name directly from easyconfig file")
-
     # parse easyconfig 
-    ec = EasyConfig(spec, validate=False)
+    ecs = process_easyconfig(spec)
+    if len(ecs) == 1:
+        ec = ecs[0]['ec']
+    else:
+        self.assertTrue(False, "easyconfig %s does not contain blocks, yields only one parsed easyconfig" % spec)
 
     # sanity check for software name
+    name = fetch_parameter_from_easyconfig_file(spec, 'name')
     self.assertTrue(ec['name'], name) 
 
     # try and fetch easyblock spec from easyconfig
-    easyblock = self.easyblock_regex.search(spectxt)
-    if easyblock:
-        easyblock = easyblock.group(1)
+    easyblock = fetch_parameter_from_easyconfig_file(spec, 'easyblock')
 
     # instantiate easyblock with easyconfig file
-    app_class = get_class(easyblock, name=name)
-    app = app_class(spec, validate_ec=False)
+    app_class = get_easyblock_class(easyblock, name=name)
+    app = app_class(ec)
 
     # more sanity checks
     self.assertTrue(name, app.name)
@@ -218,6 +234,9 @@ def template_easyconfig_test(self, spec):
     app.close_log()
     os.remove(app.logfile)
 
+    # cache the parsed easyconfig, to avoid that it is parsed again
+    self.parsed_easyconfigs.append(ecs[0])
+
     # test passed, so set back to True
     single_tests_ok = True and prev_single_tests_ok
 
diff --git a/test/easyconfigs/suite.py b/test/easyconfigs/suite.py
index 0c775762c4cdd1c723c0dd59032e59d5e0bf4c05..f936405be63ba8655e98707462070603601217ea 100644
--- a/test/easyconfigs/suite.py
+++ b/test/easyconfigs/suite.py
@@ -38,17 +38,14 @@ import tempfile
 import unittest
 from vsc import fancylogger
 
-import easybuild.tools.config as config
+import easybuild.tools.build_log  # initialize EasyBuild logging, so we disable it
 import test.easyconfigs.easyconfigs as e
 
-# initialize logger for all the unit tests
-fd, log_fn = tempfile.mkstemp(prefix='easybuild-easyconfigs-tests-', suffix='.log')
-os.close(fd)
-os.remove(log_fn)
-fancylogger.logToFile(log_fn)
-fancylogger.setLogLevelDebug()
+# disable all logging to significantly speed up tests
+fancylogger.disableDefaultHandlers()
+fancylogger.setLogLevelError()
 
-config.variables['tmp_logdir'] = tempfile.mkdtemp(prefix='easyconfigs_test_')
+os.environ['EASYBUILD_TMP_LOGDIR'] = tempfile.mkdtemp(prefix='easyconfigs_test_')
 
 # call suite() for each module and then run them all
 SUITE = unittest.TestSuite([x.suite() for x in [e]])
@@ -64,11 +61,8 @@ except ImportError, err:
     sys.stderr.write("WARNING: xmlrunner module not available, falling back to using unittest...\n\n")
     res = unittest.TextTestRunner().run(SUITE)
 
-fancylogger.logToFile(log_fn, enable=False)
-shutil.rmtree(config.variables['tmp_logdir'])
-
-for f in glob.glob('%s*' % log_fn):
-    os.remove(f)
+shutil.rmtree(os.environ['EASYBUILD_TMP_LOGDIR'])
+del os.environ['EASYBUILD_TMP_LOGDIR']
 
 if not res.wasSuccessful():
     sys.stderr.write("ERROR: Not all tests were successful.\n")