diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index ad3268bea11de41744213d65a5c566bbda787473..a3e8287af779d16f6c0066e1899df60f66e863d6 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -3,9 +3,35 @@ For more detailed information, please see the git log.
 
 These release notes can also be consulted at http://easybuild.readthedocs.org/en/latest/Release_notes.html.
 
-The latest version of easybuild-easyconfig provides 4,819 easyconfig files, for 778 different software packages,
+The latest version of easybuild-easyconfig provides 5,093 easyconfig files, for 799 different software packages,
 34 different (compiler) toolchains, 12 software bundles and 1 meta-package.
 
+v2.6.0 (January 26th 2016)
+--------------------------
+
+feature + bugfix release
+- add easyconfigs for foss/2016a and intel/2016 common toolchains (#2310, #2311, #2339, #2363)
+    incl. easyconfigs for Boost, CMake, Python, Perl using these toolchains
+- added example easyconfig files for 21 new software packages:
+    BLASR (#922), BioKanga (#2247), BoltzTraP (#2365), basemap (#2221), CppUnit (#2271), EggLib (#2335),
+    FLASH (#2281), GLM (#2288), hub (#2249), MACS2 (#1983), MotEvo (#843), numba (#2243), PGI (#1833, #2367),
+    PLY (#2305), PaStiX (#2319, #2326), patchelf (#2327), pip (#2284), RSEM (#2316), RcppArmadillo (#2289),
+    SCDE (#2289), slepc4py (#2318)
+- added additional easyconfigs for various supported software packages: version updates, different toolchains, ...
+    including BamTools 2.4.0, Boost 1.60.0, Clang 3.7.1, DOLFIN/FFC/FIAT/Instant/UFL 1.6.0, GATE 7.0, GCC 5.3.0,
+              LLVM 3.7.1, pandas 0.17.1, PETSc 3.6.3, SAMtools 1.3, scipy 0.16.1, SLEPc 3.6.2, Trilinos 12.4.2,
+              Trinity 2.1.1, VTK 6.3.0
+- various other enhancements, including:
+    - added new Cray* toolchain versions with pinned dependency versions (#2222)
+    - don't hardcode .so, use SHLIB_EXT constant instead (#2245)
+    - add custom sanity check in GEOS easyconfigs (#2285)
+- various bug fixes, including:
+    - add Autotools (M4) as a build dependency in GMP v6.x easyconfigs (#2096)
+    - remove argparse from list of extensions in Python 3.2+ easyconfigs, since it became part of stdlib (#2323)
+- various style fixes, including:
+    - get rid of tabs (#2302)
+    - remove trailing whitespace (#2341)
+
 v2.5.0 (December 17th 2015)
 ---------------------------
 
diff --git a/easybuild/easyconfigs/a/ABINIT/ABINIT-7.0.3-x86_64_linux_gnu4.5.eb b/easybuild/easyconfigs/a/ABINIT/ABINIT-7.0.3-x86_64_linux_gnu4.5.eb
index a0768a4fb37e85ed907357b329230206ddb8a61c..a8e8be161119722960333773432e22ccf8e81c21 100644
--- a/easybuild/easyconfigs/a/ABINIT/ABINIT-7.0.3-x86_64_linux_gnu4.5.eb
+++ b/easybuild/easyconfigs/a/ABINIT/ABINIT-7.0.3-x86_64_linux_gnu4.5.eb
@@ -27,7 +27,7 @@ sources = [('abinit-%s_%s.bz2' % (version, versionsuffix[1:]), 'tar xfj %s')]
 source_urls = ['http://ftp.abinit.org/']
 
 sanity_check_paths = {
-                      'files': ["bin/abinit"], 
+                      'files': ["bin/abinit"],
                       'dirs': []
                      }
 
diff --git a/easybuild/easyconfigs/a/ABINIT/ABINIT-7.0.5-x86_64_linux_gnu4.5.eb b/easybuild/easyconfigs/a/ABINIT/ABINIT-7.0.5-x86_64_linux_gnu4.5.eb
index 0e53b02003a1589f80ab84a87635921ee0685125..083d321a07d3795a9e963796cc41345d00bef2be 100644
--- a/easybuild/easyconfigs/a/ABINIT/ABINIT-7.0.5-x86_64_linux_gnu4.5.eb
+++ b/easybuild/easyconfigs/a/ABINIT/ABINIT-7.0.5-x86_64_linux_gnu4.5.eb
@@ -29,7 +29,7 @@ sources = [('abinit-%s_%s.bz2' % (version, versionsuffix[1:]), 'tar xfj %s')]
 source_urls = ['http://ftp.abinit.org/']
 
 sanity_check_paths = {
-                      'files': ["bin/abinit"], 
+                      'files': ["bin/abinit"],
                       'dirs': []
                      }
 
diff --git a/easybuild/easyconfigs/a/ABINIT/ABINIT-7.2.1-x86_64_linux_gnu4.5.eb b/easybuild/easyconfigs/a/ABINIT/ABINIT-7.2.1-x86_64_linux_gnu4.5.eb
index 7722a1277b76511a26327a423b05c75d046f23ae..5ccd2f15a76982121dde82b050ab35506f84a9ef 100644
--- a/easybuild/easyconfigs/a/ABINIT/ABINIT-7.2.1-x86_64_linux_gnu4.5.eb
+++ b/easybuild/easyconfigs/a/ABINIT/ABINIT-7.2.1-x86_64_linux_gnu4.5.eb
@@ -30,7 +30,7 @@ sources = [('abinit-%s_%s.bz2' % (version, versionsuffix[1:]), 'tar xfj %s')]
 source_urls = ['http://ftp.abinit.org/']
 
 sanity_check_paths = {
-                      'files': ["bin/abinit"], 
+                      'files': ["bin/abinit"],
                       'dirs': []
                      }
 
diff --git a/easybuild/easyconfigs/a/ABINIT/ABINIT-7.4.3-goolf-1.4.10-ETSF_IO-1.0.4.eb b/easybuild/easyconfigs/a/ABINIT/ABINIT-7.4.3-goolf-1.4.10-ETSF_IO-1.0.4.eb
index 4d319523acef9584081e14f56c2b426f7d692824..f598583eb777fa56b745387e13c0a5ffe36b3310 100644
--- a/easybuild/easyconfigs/a/ABINIT/ABINIT-7.4.3-goolf-1.4.10-ETSF_IO-1.0.4.eb
+++ b/easybuild/easyconfigs/a/ABINIT/ABINIT-7.4.3-goolf-1.4.10-ETSF_IO-1.0.4.eb
@@ -33,7 +33,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ["bin/abinit"], 
+    'files': ["bin/abinit"],
     'dirs': []
 }
 
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
index cdc9d8c7ad2f1801911e5020728fa0a98fba9080..93b76ef8beaa1b479c12592a4e15f2cab0d38089 100644
--- 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
@@ -26,11 +26,11 @@ toolchainopts = {'usempi': True}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://www.bcgsc.ca/downloads/abyss/']
 
-dependencies = [ 
+dependencies = [
     ('sparsehash', '2.0.2'),
     ('Boost', '1.49.0', versionsuffix),
 ]
- 
+
 sanity_check_paths = {
     'files': ["bin/ABYSS", "bin/ABYSS-P"],
     'dirs': []
diff --git a/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-ictce-5.4.0.eb b/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-ictce-5.4.0.eb
index b32cf6ce866655f800a12a2ba3b2d6bb3105eca9..f40658d1411cc84a89ec70d5e6e1a2e5295fb854 100644
--- a/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-ictce-5.4.0.eb
+++ b/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-ictce-5.4.0.eb
@@ -13,7 +13,7 @@ sources = [SOURCELOWER_TAR_GZ]
 
 patches = ['ANTLR-%(version)s_cpp-headers.patch']
 
-dependencies = [('Java', '1.7.0_60', '', True)] 
+dependencies = [('Java', '1.7.0_60', '', True)]
 
 configopts = "--disable-examples --disable-csharp"
 
diff --git a/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-intel-2014b.eb b/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-intel-2014b.eb
index 5cf3b03e646eb9b7cac45584217aef4f95b6069f..8ba4070760d593212c4f824aa41f678cf25e3d23 100644
--- a/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-intel-2014b.eb
+++ b/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-intel-2014b.eb
@@ -13,7 +13,7 @@ sources = [SOURCELOWER_TAR_GZ]
 
 patches = ['ANTLR-%(version)s_cpp-headers.patch']
 
-dependencies = [('Java', '1.7.0_60', '', True)] 
+dependencies = [('Java', '1.7.0_60', '', True)]
 
 configopts = "--disable-examples --disable-csharp"
 
diff --git a/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-intel-2015a-Python-2.7.10.eb b/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-intel-2015a-Python-2.7.10.eb
index 66d819dd00f81d6712315738d7ba6313d9cec0cb..31ae0ccb1524f8c6afe90fef162af687c90becc1 100644
--- a/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-intel-2015a-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-intel-2015a-Python-2.7.10.eb
@@ -10,7 +10,7 @@ description = """ANTLR, ANother Tool for Language Recognition, (formerly PCCTS)
  Java, C#, C++, or Python actions."""
 
 toolchain = {'name': 'intel', 'version': '2015a'}
-  
+
 source_urls = ['http://www.antlr2.org/download/']
 sources = [SOURCELOWER_TAR_GZ]
 
diff --git a/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-intel-2015b-Python-2.7.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..00631356607a325a632d88851a0e4c4d6374df86
--- /dev/null
+++ b/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-intel-2015b-Python-2.7.10.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMake'
+
+name = 'ANTLR'
+version = "2.7.7"
+
+homepage = 'http://www.antlr2.org/'
+description = """ANTLR, ANother Tool for Language Recognition, (formerly PCCTS)
+ is a language tool that provides a framework for constructing recognizers,
+ compilers, and translators from grammatical descriptions containing
+ Java, C#, C++, or Python actions."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = ['http://www.antlr2.org/download/']
+sources = [SOURCELOWER_TAR_GZ]
+
+patches = ['%(name)s-%(version)s_includes.patch']
+
+pythonversion = '2.7.10'
+versionsuffix = "-Python-%s" % pythonversion
+
+dependencies = [
+    ('Java', '1.8.0_66', '', True),
+    ('Python', pythonversion),
+]
+
+configopts = '--disable-examples --disable-csharp '
+
+sanity_check_paths = {
+    'files': ['bin/antlr', 'bin/antlr-config'],
+    'dirs': ['include'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/a/APR-util/APR-util-1.5.4-foss-2015a.eb b/easybuild/easyconfigs/a/APR-util/APR-util-1.5.4-foss-2015a.eb
index 7eb29d95957b950559ef701e4b6e5000c0d67056..299a987b846fa0a4d950d2b11bfce84fca830b82 100644
--- a/easybuild/easyconfigs/a/APR-util/APR-util-1.5.4-foss-2015a.eb
+++ b/easybuild/easyconfigs/a/APR-util/APR-util-1.5.4-foss-2015a.eb
@@ -20,7 +20,7 @@ dependencies = [
 configopts = "--with-apr=$EBROOTAPR/bin/apr-1-config --with-sqlite3=$EBROOTSQLITE --with-expat=$EBROOTEXPAT "
 
 sanity_check_paths = {
-    'files': ["bin/apu-1-config", "lib/libaprutil-1.so", "lib/libaprutil-1.a"],
+    'files': ["bin/apu-1-config", "lib/libaprutil-1.%s" % SHLIB_EXT, "lib/libaprutil-1.a"],
     'dirs': ["include/apr-1"],
 }
 
diff --git a/easybuild/easyconfigs/a/APR/APR-1.5.2-foss-2015a.eb b/easybuild/easyconfigs/a/APR/APR-1.5.2-foss-2015a.eb
index fdaff97c8e7debb3d5dc2488afb870c47278c761..50c9f6172193c2ac5984c66cc137f7ec28e1c61e 100644
--- a/easybuild/easyconfigs/a/APR/APR-1.5.2-foss-2015a.eb
+++ b/easybuild/easyconfigs/a/APR/APR-1.5.2-foss-2015a.eb
@@ -12,7 +12,7 @@ source_urls = ['http://archive.apache.org/dist/apr/']
 sources = [SOURCELOWER_TAR_GZ]
 
 sanity_check_paths = {
-    'files': ["bin/apr-1-config", "lib/libapr-1.so", "lib/libapr-1.a"],
+    'files': ["bin/apr-1-config", "lib/libapr-1.%s" % SHLIB_EXT, "lib/libapr-1.a"],
     'dirs': ["include/apr-1"],
 }
 
diff --git a/easybuild/easyconfigs/a/ATK/ATK-2.16.0-intel-2015a.eb b/easybuild/easyconfigs/a/ATK/ATK-2.16.0-intel-2015a.eb
index 6fc5e6597fb373e6ff6709fd24632c9e4f3c9df3..af67d8fed170df7af1eacfbbc6f914006149d042 100644
--- a/easybuild/easyconfigs/a/ATK/ATK-2.16.0-intel-2015a.eb
+++ b/easybuild/easyconfigs/a/ATK/ATK-2.16.0-intel-2015a.eb
@@ -20,7 +20,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/libatk-1.0.so'],
+    'files': ['lib/libatk-1.0.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/a/ATK/ATK-2.16.0-intel-2015b.eb b/easybuild/easyconfigs/a/ATK/ATK-2.16.0-intel-2015b.eb
index 24bac3017fd5675cf0ee831d3cbf8ed1a6c7e31a..bddf11ebe82a690ab71c29dba493541271e55386 100644
--- a/easybuild/easyconfigs/a/ATK/ATK-2.16.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/a/ATK/ATK-2.16.0-intel-2015b.eb
@@ -20,7 +20,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/libatk-1.0.so'],
+    'files': ['lib/libatk-1.0.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/a/Armadillo/Armadillo-6.400.3-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/a/Armadillo/Armadillo-6.400.3-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..093ebf2f4e95dbd20bcca4ad8528f835a1ee1f41
--- /dev/null
+++ b/easybuild/easyconfigs/a/Armadillo/Armadillo-6.400.3-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,22 @@
+name = 'Armadillo'
+version = '6.400.3'
+versionsuffix = '-Python-2.7.11'
+
+homepage = 'http://arma.sourceforge.net/'
+description = """Armadillo is an open-source C++ linear algebra library (matrix maths) aiming towards
+ a good balance between speed and ease of use. Integer, floating point and complex numbers are supported,
+ as well as a subset of trigonometric and statistics functions."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://sourceforge.net/projects/arma/files']
+
+dependencies = [
+    ('Boost', '1.59.0', versionsuffix),
+    ('arpack-ng', '3.3.0'),
+]
+
+builddependencies = [('CMake', '3.4.1')]
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/a/Atkmm/Atkmm-2.22.7-intel-2015a.eb b/easybuild/easyconfigs/a/Atkmm/Atkmm-2.22.7-intel-2015a.eb
index 946d69a7a2ec1056e5d382343fae2eff17bd3b87..a5593a4c547dcbe9b82f902c2e1409e01cac4861 100644
--- a/easybuild/easyconfigs/a/Atkmm/Atkmm-2.22.7-intel-2015a.eb
+++ b/easybuild/easyconfigs/a/Atkmm/Atkmm-2.22.7-intel-2015a.eb
@@ -19,7 +19,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/libatkmm-1.6.so'],
+    'files': ['lib/libatkmm-1.6.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/a/Atkmm/Atkmm-2.22.7-intel-2015b.eb b/easybuild/easyconfigs/a/Atkmm/Atkmm-2.22.7-intel-2015b.eb
index 05a73c47576fc5e1bb7eb5acd5167edb23553ece..58785a851547cab01a0a48f724a79280452e045d 100644
--- a/easybuild/easyconfigs/a/Atkmm/Atkmm-2.22.7-intel-2015b.eb
+++ b/easybuild/easyconfigs/a/Atkmm/Atkmm-2.22.7-intel-2015b.eb
@@ -19,7 +19,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/libatkmm-1.6.so'],
+    'files': ['lib/libatkmm-1.6.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1ea18e5a7c500e13b662b0c608053cc18946146c
--- /dev/null
+++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-4.9.3-2.25.eb
@@ -0,0 +1,26 @@
+easyblock = 'ConfigureMake'
+
+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': 'GCC', 'version': '4.9.3-2.25'}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('M4', '1.4.17')]
+
+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-foss-2015a.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1001ba837c6c8f4eee75612c7f0dcc6f4fc071af
--- /dev/null
+++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-foss-2015a.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+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': 'foss', 'version': '2015a'}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('M4', '1.4.17')]
+
+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-foss-2016a.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..34de43acd4bdfa4789d735885d21c55cac860454
--- /dev/null
+++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-foss-2016a.eb
@@ -0,0 +1,26 @@
+easyblock = 'ConfigureMake'
+
+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': 'foss', 'version': '2016a'}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('M4', '1.4.17')]
+
+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-intel-2015b.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..801b643ac0ccf5d1e05778dc902b362796726c93
--- /dev/null
+++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-intel-2015b.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+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': 'intel', 'version': '2015b'}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('M4', '1.4.17')]
+
+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-intel-2016a.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9014da6c867c1bb91fcf288c5913cd8bf6eaac1f
--- /dev/null
+++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-intel-2016a.eb
@@ -0,0 +1,26 @@
+easyblock = 'ConfigureMake'
+
+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': 'intel', 'version': '2016a'}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('M4', '1.4.17')]
+
+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.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69.eb
new file mode 100644
index 0000000000000000000000000000000000000000..88f6a855ea18821c39da3dc7dde73065f78dc839
--- /dev/null
+++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69.eb
@@ -0,0 +1,26 @@
+easyblock = 'ConfigureMake'
+
+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': 'dummy', 'version': ''}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('M4', '1.4.17')]
+
+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-ictce-5.5.0.eb b/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-5.5.0.eb
index 675782f77b21c6fae5da97e80186cc8825ef725b..5661ddb517be5d5b03b4d3038e05d4868f914da1 100644
--- 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
@@ -16,7 +16,7 @@ description = "Automake: GNU Standards-compliant Makefile generator"
 
 source_urls = [GNU_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
-toolchain = {'name': 'ictce', 'version': '5.5.0'} 
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
 
 dependencies = [('Autoconf', '2.69')]
 
diff --git a/easybuild/easyconfigs/a/Automake/Automake-1.15-GCC-4.7.2.eb b/easybuild/easyconfigs/a/Automake/Automake-1.15-GCC-4.7.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..05705b029ec11a8040f5ca1f298513e0067e3019
--- /dev/null
+++ b/easybuild/easyconfigs/a/Automake/Automake-1.15-GCC-4.7.2.eb
@@ -0,0 +1,33 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Fotis Georgatos <fotis@cern.ch>
+# 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/
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'Automake'
+version = "1.15"
+
+homepage = 'http://www.gnu.org/software/automake/automake.html'
+description = "Automake: GNU Standards-compliant Makefile generator"
+
+toolchain = {'name': 'GCC', 'version': '4.7.2'}
+
+source_urls = [GNU_SOURCE]
+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.15-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/a/Automake/Automake-1.15-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a37c1d9e3b640f6bc43201517dfa0c06319276c8
--- /dev/null
+++ b/easybuild/easyconfigs/a/Automake/Automake-1.15-GCC-4.9.3-2.25.eb
@@ -0,0 +1,33 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Fotis Georgatos <fotis@cern.ch>
+# 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/
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'Automake'
+version = "1.15"
+
+homepage = 'http://www.gnu.org/software/automake/automake.html'
+description = "Automake: GNU Standards-compliant Makefile generator"
+
+toolchain = {'name': 'GCC', 'version': '4.9.3-2.25'}
+
+source_urls = [GNU_SOURCE]
+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.15-foss-2015a.eb b/easybuild/easyconfigs/a/Automake/Automake-1.15-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7303c3d70e6fa0bbe9a953838f85fe693be895d5
--- /dev/null
+++ b/easybuild/easyconfigs/a/Automake/Automake-1.15-foss-2015a.eb
@@ -0,0 +1,33 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Fotis Georgatos <fotis@cern.ch>
+# 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/
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'Automake'
+version = "1.15"
+
+homepage = 'http://www.gnu.org/software/automake/automake.html'
+description = "Automake: GNU Standards-compliant Makefile generator"
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+
+source_urls = [GNU_SOURCE]
+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.15-foss-2016a.eb b/easybuild/easyconfigs/a/Automake/Automake-1.15-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f73c4759eebf5ce980f4fcb6582337f65b9031e6
--- /dev/null
+++ b/easybuild/easyconfigs/a/Automake/Automake-1.15-foss-2016a.eb
@@ -0,0 +1,33 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Fotis Georgatos <fotis@cern.ch>
+# 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/
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'Automake'
+version = "1.15"
+
+homepage = 'http://www.gnu.org/software/automake/automake.html'
+description = "Automake: GNU Standards-compliant Makefile generator"
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [GNU_SOURCE]
+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.15-intel-2015b.eb b/easybuild/easyconfigs/a/Automake/Automake-1.15-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8a059d28e6555eee00804ba73ab50eacb1d482e1
--- /dev/null
+++ b/easybuild/easyconfigs/a/Automake/Automake-1.15-intel-2015b.eb
@@ -0,0 +1,33 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Fotis Georgatos <fotis@cern.ch>
+# 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/
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'Automake'
+version = "1.15"
+
+homepage = 'http://www.gnu.org/software/automake/automake.html'
+description = "Automake: GNU Standards-compliant Makefile generator"
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = [GNU_SOURCE]
+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.15-intel-2016a.eb b/easybuild/easyconfigs/a/Automake/Automake-1.15-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..06fbc9d74bd3c351d8e09f1b2af9f2cf0ac4709d
--- /dev/null
+++ b/easybuild/easyconfigs/a/Automake/Automake-1.15-intel-2016a.eb
@@ -0,0 +1,33 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Fotis Georgatos <fotis@cern.ch>
+# 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/
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'Automake'
+version = "1.15"
+
+homepage = 'http://www.gnu.org/software/automake/automake.html'
+description = "Automake: GNU Standards-compliant Makefile generator"
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [GNU_SOURCE]
+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.15.eb b/easybuild/easyconfigs/a/Automake/Automake-1.15.eb
new file mode 100644
index 0000000000000000000000000000000000000000..155ccd39aafb47386284df525a0c3ff13ce63b8c
--- /dev/null
+++ b/easybuild/easyconfigs/a/Automake/Automake-1.15.eb
@@ -0,0 +1,33 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Fotis Georgatos <fotis@cern.ch>
+# 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/
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'Automake'
+version = "1.15"
+
+homepage = 'http://www.gnu.org/software/automake/automake.html'
+description = "Automake: GNU Standards-compliant Makefile generator"
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = [GNU_SOURCE]
+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/Autotools/Autotools-20150215-GCC-4.7.2.eb b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GCC-4.7.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7f04debe9c1bca7fd694fc4dd21fcff6442e594e
--- /dev/null
+++ b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GCC-4.7.2.eb
@@ -0,0 +1,17 @@
+easyblock = 'Bundle'
+
+name = 'Autotools'
+version = '20150215'  # date of the most recent change
+
+homepage = 'http://autotools.io'
+description = """This bundle collect the standard GNU build tools: Autoconf, Automake and libtool"""
+
+toolchain = {'name': 'GCC', 'version': '4.7.2'}
+
+dependencies = [
+    ('Autoconf', '2.69'), # 20120424
+    ('Automake', '1.15'), # 20150105
+    ('libtool', '2.4.6'), # 20150215
+]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GCC-4.8.4.eb b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GCC-4.8.4.eb
new file mode 100644
index 0000000000000000000000000000000000000000..357867c5863a8f599d9048d72961a41219516726
--- /dev/null
+++ b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GCC-4.8.4.eb
@@ -0,0 +1,17 @@
+easyblock = 'Bundle'
+
+name = 'Autotools'
+version = '20150215'  # date of the most recent change
+
+homepage = 'http://autotools.io'
+description = """This bundle collect the standard GNU build tools: Autoconf, Automake and libtool"""
+
+toolchain = {'name': 'GCC', 'version': '4.8.4'}
+
+dependencies = [
+    ('Autoconf', '2.69'), # 20120424
+    ('Automake', '1.15'), # 20150105
+    ('libtool', '2.4.6'), # 20150215
+]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8870d76965ff3e2306bddda455af1149d63edf7e
--- /dev/null
+++ b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GCC-4.9.3-2.25.eb
@@ -0,0 +1,17 @@
+easyblock = 'Bundle'
+
+name = 'Autotools'
+version = '20150215'  # date of the most recent change
+
+homepage = 'http://autotools.io'
+description = """This bundle collect the standard GNU build tools: Autoconf, Automake and libtool"""
+
+toolchain = {'name': 'GCC', 'version': '4.9.3-2.25'}
+
+dependencies = [
+    ('Autoconf', '2.69'), # 20120424
+    ('Automake', '1.15'), # 20150105
+    ('libtool', '2.4.6'), # 20150215
+]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/a/Autotools/Autotools-20150215-foss-2015a.eb b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6a68f164a9c7c37e268a44939064a23ab94b9aa0
--- /dev/null
+++ b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-foss-2015a.eb
@@ -0,0 +1,17 @@
+easyblock = 'Bundle'
+
+name = 'Autotools'
+version = '20150215'  # date of the most recent change
+
+homepage = 'http://autotools.io'
+description = """This bundle collect the standard GNU build tools: Autoconf, Automake and libtool"""
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+
+dependencies = [
+    ('Autoconf', '2.69'), # 20120424
+    ('Automake', '1.15'), # 20150105
+    ('libtool', '2.4.6'), # 20150215
+]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/a/Autotools/Autotools-20150215-foss-2016a.eb b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a07bbf4e2558bcc3087b1294d8faad8400e6dec5
--- /dev/null
+++ b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-foss-2016a.eb
@@ -0,0 +1,17 @@
+easyblock = 'Bundle'
+
+name = 'Autotools'
+version = '20150215'  # date of the most recent change
+
+homepage = 'http://autotools.io'
+description = """This bundle collect the standard GNU build tools: Autoconf, Automake and libtool"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+dependencies = [
+    ('Autoconf', '2.69'), # 20120424
+    ('Automake', '1.15'), # 20150105
+    ('libtool', '2.4.6'), # 20150215
+]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/a/Autotools/Autotools-20150215-intel-2015b.eb b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7677218c9440c6f82c9df3ad0b8b9cef944f4fe8
--- /dev/null
+++ b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-intel-2015b.eb
@@ -0,0 +1,17 @@
+easyblock = 'Bundle'
+
+name = 'Autotools'
+version = '20150215'  # date of the most recent change
+
+homepage = 'http://autotools.io'
+description = """This bundle collect the standard GNU build tools: Autoconf, Automake and libtool"""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+dependencies = [
+    ('Autoconf', '2.69'), # 20120424
+    ('Automake', '1.15'), # 20150105
+    ('libtool', '2.4.6'), # 20150215
+]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/a/Autotools/Autotools-20150215-intel-2016a.eb b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0810dfe53647e2d4ea84587539bb9a9b9269364a
--- /dev/null
+++ b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-intel-2016a.eb
@@ -0,0 +1,17 @@
+easyblock = 'Bundle'
+
+name = 'Autotools'
+version = '20150215'  # date of the most recent change
+
+homepage = 'http://autotools.io'
+description = """This bundle collect the standard GNU build tools: Autoconf, Automake and libtool"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+dependencies = [
+    ('Autoconf', '2.69'), # 20120424
+    ('Automake', '1.15'), # 20150105
+    ('libtool', '2.4.6'), # 20150215
+]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/a/Autotools/Autotools-20150215.eb b/easybuild/easyconfigs/a/Autotools/Autotools-20150215.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6763feae560cec3eeae7298b6c97b4df92e34f1e
--- /dev/null
+++ b/easybuild/easyconfigs/a/Autotools/Autotools-20150215.eb
@@ -0,0 +1,17 @@
+easyblock = 'Bundle'
+
+name = 'Autotools'
+version = '20150215'  # date of the most recent change
+
+homepage = 'http://autotools.io'
+description = """This bundle collect the standard GNU build tools: Autoconf, Automake and libtool"""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+dependencies = [
+    ('Autoconf', '2.69'), # 20120424
+    ('Automake', '1.15'), # 20150105
+    ('libtool', '2.4.6'), # 20150215
+]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/a/ant/ant-1.9.6-Java-1.8.0_66.eb b/easybuild/easyconfigs/a/ant/ant-1.9.6-Java-1.8.0_66.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b048fcd09766b3fd62f1405afc3618e15e3a6eb1
--- /dev/null
+++ b/easybuild/easyconfigs/a/ant/ant-1.9.6-Java-1.8.0_66.eb
@@ -0,0 +1,26 @@
+name = 'ant'
+version = '1.9.6'
+
+homepage = 'http://ant.apache.org/'
+description = """Apache Ant is a Java library and command-line tool whose mission is to drive processes described in build files
+ as targets and extension points dependent upon each other. The main known usage of Ant is the build of Java applications."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = ['apache-%(name)s-%(version)s-src.tar.gz']
+source_urls = ['http://archive.apache.org/dist/%(name)s/source/']
+
+java = 'Java'
+javaver = '1.8.0_66'
+versionsuffix = '-%s-%s' % (java, javaver)
+
+dependencies = [(java, javaver)]
+
+builddependencies = [('JUnit', '4.12', versionsuffix)]
+
+sanity_check_paths = {
+    'files': ['bin/ant', 'lib/ant.jar', 'lib/ant.jar'],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/a/argtable/argtable-2.13-foss-2015b.eb b/easybuild/easyconfigs/a/argtable/argtable-2.13-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..251023a5bd2d1cc01a1399f9c75028685109107f
--- /dev/null
+++ b/easybuild/easyconfigs/a/argtable/argtable-2.13-foss-2015b.eb
@@ -0,0 +1,25 @@
+# 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 = 'ConfigureMake'
+
+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': 'foss', 'version': '2015b'}
+
+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/argtable/argtable-2.13-goolf-1.4.10.eb b/easybuild/easyconfigs/a/argtable/argtable-2.13-goolf-1.4.10.eb
index 00d3a24d263b369ee2501a39281e1c674684391b..d2502b1343169c9db267c20fd492048a698f3fee 100644
--- 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
@@ -18,7 +18,7 @@ source_urls = [SOURCEFORGE_SOURCE]
 sources = ['%s%s.tar.gz' % (name, version.replace('.','-'))]
 
 sanity_check_paths = {
-    'files': ['lib/libargtable2.so', 'lib/libargtable2.la'],
+    'files': ['lib/libargtable2.%s' % SHLIB_EXT, 'lib/libargtable2.la'],
     'dirs': ['include', 'lib', 'share'],
 }
 
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
index 69351c2f0fbf24a77971bea12a95ea098025ff87..38638c65fbf0f9a711c4c2b3d74e072d5c5b03ab 100644
--- 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
@@ -22,7 +22,7 @@ patches = [
 configopts = '--with-pic --with-blas="$LIBBLAS_MT" --with-lapack="$LIBLAPACK_MT"'
 
 sanity_check_paths = {
-    'files': ["lib/libarpack.a", "lib/libarpack.so"],
+    'files': ["lib/libarpack.a", "lib/libarpack.%s" % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.3.0.eb b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.3.0.eb
index 9491e3183b3ae434dc040c4e0c0361ee88384024..e567606aa794550bbccde08549e14c3cd0bb6930 100644
--- a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.3.0.eb
@@ -22,7 +22,7 @@ patches = [
 configopts = '--enable-mpi --with-pic --with-blas="$LIBBLAS" --with-lapack="$LIBLAPACK"'
 
 sanity_check_paths = {
-    'files': ["lib/libarpack.a", "lib/libarpack.so", "lib/libparpack.a", "lib/libparpack.so"],
+    'files': ["lib/libarpack.a", "lib/libarpack.%s" % SHLIB_EXT, "lib/libparpack.a", "lib/libparpack.%s" % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0-mt.eb b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0-mt.eb
index e222e2fd03b6ec2e4f7edb8e334cf814967f3f83..837fa583de8227269041736e851dabc8dca952a8 100644
--- a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0-mt.eb
+++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0-mt.eb
@@ -22,7 +22,7 @@ patches = [
 configopts = '--with-pic --with-blas="$LIBBLAS_MT" --with-lapack="$LIBLAPACK_MT"'
 
 sanity_check_paths = {
-    'files': ["lib/libarpack.a", "lib/libarpack.so"],
+    'files': ["lib/libarpack.a", "lib/libarpack.%s" % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0.eb b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0.eb
index feee7f7ba71fb0b23b1da98dd12a8cebad54300a..15e7a3b7340f8e24a785922f841b0b747b75e797 100644
--- a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.3-ictce-5.5.0.eb
@@ -22,7 +22,7 @@ patches = [
 configopts = '--enable-mpi --with-pic --with-blas="$LIBBLAS" --with-lapack="$LIBLAPACK"'
 
 sanity_check_paths = {
-    'files': ["lib/libarpack.a", "lib/libarpack.so", "lib/libparpack.a", "lib/libparpack.so"],
+    'files': ["lib/libarpack.a", "lib/libarpack.%s" % SHLIB_EXT, "lib/libparpack.a", "lib/libparpack.%s" % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.5-ictce-7.1.2-mt.eb b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.5-ictce-7.1.2-mt.eb
index 812915265ce18cf8220e9aa55800e9cbc684d6a5..6388557ca2e36779a47b074157e8af97eb23f664 100644
--- a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.5-ictce-7.1.2-mt.eb
+++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.5-ictce-7.1.2-mt.eb
@@ -16,7 +16,7 @@ sources = ['%(name)s_%(version)s.tar.gz']
 configopts = '--with-pic --with-blas="$LIBBLAS_MT" --with-lapack="$LIBLAPACK_MT"'
 
 sanity_check_paths = {
-    'files': ["lib/libarpack.a", "lib/libarpack.so"],
+    'files': ["lib/libarpack.a", "lib/libarpack.%s" % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.5-ictce-7.1.2.eb b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.5-ictce-7.1.2.eb
index 879d20e6567e049919d6ddd4c1efa9b1fa27d3c4..15bec194bef84d4784df2567b0df9191892d0834 100644
--- a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.5-ictce-7.1.2.eb
+++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.1.5-ictce-7.1.2.eb
@@ -15,7 +15,7 @@ sources = ['%(name)s_%(version)s.tar.gz']
 configopts = '--with-pic --with-blas="$LIBBLAS_MT" --with-lapack="$LIBLAPACK_MT"'
 
 sanity_check_paths = {
-    'files': ["lib/libarpack.a", "lib/libarpack.so"],
+    'files': ["lib/libarpack.a", "lib/libarpack.%s" % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.2.0-intel-2015a-mt.eb b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.2.0-intel-2015a-mt.eb
index 5f89014f6e2369cb90ac61ca5f21021edb7c2969..0a13946d1b0b2a12371edb99ddf677d6346bb10e 100644
--- a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.2.0-intel-2015a-mt.eb
+++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.2.0-intel-2015a-mt.eb
@@ -16,7 +16,7 @@ sources = ['%(version)s.tar.gz']
 configopts = '--with-pic --with-blas="$LIBBLAS_MT" --with-lapack="$LIBLAPACK_MT"'
 
 sanity_check_paths = {
-    'files': ["lib/libarpack.a", "lib/libarpack.so"],
+    'files': ["lib/libarpack.a", "lib/libarpack.%s" % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.2.0-intel-2015a.eb b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.2.0-intel-2015a.eb
index 9f6edb0eef22f69723385ae9bedb027ae1c8be83..a37e2d0ee2597c6873efd9ed915cc87384869d8e 100644
--- a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.2.0-intel-2015a.eb
+++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.2.0-intel-2015a.eb
@@ -15,7 +15,7 @@ sources = ['%(version)s.tar.gz']
 configopts = '--with-pic --with-blas="$LIBBLAS" --with-lapack="$LIBLAPACK"'
 
 sanity_check_paths = {
-    'files': ["lib/libarpack.a", "lib/libarpack.so"],
+    'files': ["lib/libarpack.a", "lib/libarpack.%s" % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.3.0-intel-2015b.eb b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.3.0-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e5eaecb750d92d0993c3d223eeab55bd5ce594a0
--- /dev/null
+++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.3.0-intel-2015b.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'arpack-ng'
+version = '3.3.0'
+
+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': 'intel', 'version': '2015b'}
+toolchainopts = {'opt': True, 'pic': True, 'usempi': True}
+
+source_urls = ['https://github.com/opencollab/arpack-ng/archive/']
+sources = ['%(version)s.tar.gz']
+
+builddependencies = [('Autotools', '20150215', '', ('GNU', '4.9.3-2.25'))]
+
+preconfigopts = "sh bootstrap && "
+configopts = '--with-pic --with-blas="$LIBBLAS" --with-lapack="$LIBLAPACK"'
+
+sanity_check_paths = {
+    'files': ["lib/libarpack.a", "lib/libarpack.so"],
+    'dirs': []
+}
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/b/BCFtools/BCFtools-1.2-foss-2015a.eb b/easybuild/easyconfigs/b/BCFtools/BCFtools-1.2-foss-2015a.eb
index 7aa9dcdd5bb9ef427aa35ef7ef9b3ca737190bdb..1e64be716a5971ad42365867025bb6968c03a66c 100644
--- a/easybuild/easyconfigs/b/BCFtools/BCFtools-1.2-foss-2015a.eb
+++ b/easybuild/easyconfigs/b/BCFtools/BCFtools-1.2-foss-2015a.eb
@@ -20,7 +20,7 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
-parallel = 1 
+parallel = 1
 
 skipsteps = ['configure']
 
diff --git a/easybuild/easyconfigs/b/BCFtools/BCFtools-1.2-intel-2015a.eb b/easybuild/easyconfigs/b/BCFtools/BCFtools-1.2-intel-2015a.eb
index c997c54557f881c6dbbeb50775b98826f656f5cc..2143e1fd78e17f4e04c52ebd3aa5ce51e1dc9abc 100644
--- a/easybuild/easyconfigs/b/BCFtools/BCFtools-1.2-intel-2015a.eb
+++ b/easybuild/easyconfigs/b/BCFtools/BCFtools-1.2-intel-2015a.eb
@@ -20,7 +20,7 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
-parallel = 1 
+parallel = 1
 
 skipsteps = ['configure']
 
diff --git a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.25.0-foss-2015a.eb b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.25.0-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0b9e9a4fe53c280b633d294106ac668ff1b4d70a
--- /dev/null
+++ b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.25.0-foss-2015a.eb
@@ -0,0 +1,33 @@
+# Author: Maxime Schmitt, University of Luxembourg
+# Author: Adam Huffman, The Francis Crick Institute 
+#
+# Based on the work of: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics (SIB)
+# Biozentrum - University of Basel
+
+easyblock = 'MakeCp'
+
+name = 'BEDTools'
+version = '2.25.0'
+
+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': 'foss', 'version': '2015a'}
+
+# https://github.com/arq5x/bedtools2/releases/download/v2.25.0/bedtools-2.25.0.tar.gz
+source_urls = ['https://github.com/arq5x/bedtools2/releases/download/v%(version)s/']
+sources = ['bedtools-%(version)s.tar.gz']
+
+buildopts = 'CXX="$CXX"'
+
+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/BLASR/BLASR-2.1-goolf-1.4.10.eb b/easybuild/easyconfigs/b/BLASR/BLASR-2.1-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7b47764f4758e9a58c3799462d24c2eb6e6f480b
--- /dev/null
+++ b/easybuild/easyconfigs/b/BLASR/BLASR-2.1-goolf-1.4.10.eb
@@ -0,0 +1,37 @@
+# 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 = 'ConfigureMake'
+
+name = 'BLASR'
+version = '2.1'
+
+homepage = 'https://github.com/PacificBiosciences/blasr'
+description = """ BLASR (Basic Local Alignment with Successive Refinement) rapidly maps 
+ reads to genomes by finding the highest scoring local alignment or set of local alignments 
+ between the read and the genome. Optimized for PacBio's extraordinarily long reads and 
+ taking advantage of rich quality values, BLASR maps reads rapidly with high accuracy. """
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['https://github.com/PacificBiosciences/blasr/archive/']
+sources = ['smrtanalysis-%(version)s.tar.gz']
+
+dependencies = [('HDF5', '1.8.11')]
+
+skipsteps = ['configure']
+
+# the STATIC= option is a workaround. Check details here:
+# https://github.com/PacificBiosciences/blasr/issues/4#issuecomment-44142749
+buildopts = ' STATIC= '
+
+installopts = ' INSTALL_BIN_DIR=%(installdir)s/bin'
+
+sanity_check_paths = {
+    'files': ["bin/blasr"],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/BSMAP/BSMAP-2.74-goolf-1.4.10.eb b/easybuild/easyconfigs/b/BSMAP/BSMAP-2.74-goolf-1.4.10.eb
index 1318374418384cf7a77e6cb10572e1311f0264e2..d31fc0a136ae9c6e041c39b76beaad97047cc9f2 100644
--- a/easybuild/easyconfigs/b/BSMAP/BSMAP-2.74-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/BSMAP/BSMAP-2.74-goolf-1.4.10.eb
@@ -1,4 +1,4 @@
-easyblock = 'ConfigureMake' 
+easyblock = 'ConfigureMake'
 
 name = 'BSMAP'
 version = '2.74'
@@ -13,7 +13,7 @@ sources = [SOURCELOWER_TGZ]
 
 skipsteps = ['configure']
 
-installopts = "DESTDIR=%(installdir)s" 
+installopts = "DESTDIR=%(installdir)s"
 
 patches = [
      'BSMAP-2.74_makefile-modif.patch',
diff --git a/easybuild/easyconfigs/b/BamTools/BamTools-2.4.0-foss-2015b.eb b/easybuild/easyconfigs/b/BamTools/BamTools-2.4.0-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c4a843674ba89042d1157afff8b9102aeb1685b0
--- /dev/null
+++ b/easybuild/easyconfigs/b/BamTools/BamTools-2.4.0-foss-2015b.eb
@@ -0,0 +1,31 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 The Cyprus Institute
+# Authors::   Andreas Panteli <a.panteli@cyi.ac.cy>, George Tsouloupas <g.tsouloupas@cyi.ac.cy>
+# License::   MIT/GPL
+#
+##
+
+name = 'BamTools'
+version = '2.4.0'
+
+homepage = 'https://github.com/pezmaster31/bamtools'
+description = """BamTools provides both a programmer's API and an end-user's toolkit for handling BAM files."""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+
+sources = ['v%(version)s.tar.gz']
+source_urls = ['https://github.com/pezmaster31/bamtools/archive']
+
+builddependencies = [('CMake', '3.4.1')]
+
+files_to_copy = ["bin", "lib", "include", "docs", "LICENSE", "README"]
+
+sanity_check_paths =  {
+    'files': ["bin/bamtools", "include/shared/bamtools_global.h", "lib/libbamtools.a",
+              "lib/libbamtools.so", "lib/libbamtools-utils.a", "lib/libjsoncpp.a"],
+    'dirs': ["include/api", "docs"]
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/BioKanga/BioKanga-3.4.5-foss-2015b.eb b/easybuild/easyconfigs/b/BioKanga/BioKanga-3.4.5-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..accaece1d7a6d07d995f9ac6be60c99ad8a9ddf5
--- /dev/null
+++ b/easybuild/easyconfigs/b/BioKanga/BioKanga-3.4.5-foss-2015b.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'BioKanga'
+version = '3.4.5'
+
+homepage = 'http://sourceforge.net/projects/biokanga'
+description = """BioKanga is an integrated toolkit of high performance bioinformatics
+  subprocesses targeting the challenges of next generation sequencing analytics.
+  Kanga is an acronym standing for 'K-mer Adaptive Next Generation Aligner'."""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+
+source_urls = ['http://sourceforge.net/projects/biokanga/files/']
+sources = ['buildbiokanga_%s.zip' % version.replace('.', '_')]
+
+dependencies = [('GSL', '2.1')]
+
+preconfigopts = "chmod +x configure && "
+
+sanity_check_paths = {
+    'files': ["bin/biokanga"],
+    'dirs': []
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/Biopython/Biopython-1.61-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/b/Biopython/Biopython-1.61-goolf-1.4.10-Python-2.7.3.eb
index d287d5529257274eaa616b6e1b6714aa1921afa1..baf247c07d375d56d0644d0a4d24b28fae42ba8b 100644
--- a/easybuild/easyconfigs/b/Biopython/Biopython-1.61-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/b/Biopython/Biopython-1.61-goolf-1.4.10-Python-2.7.3.eb
@@ -35,7 +35,7 @@ dependencies = [
 
 sanity_check_paths = {
     'files': [],
-    'dirs': ['lib/python%s/site-packages/Bio' % pyshortver, 
+    'dirs': ['lib/python%s/site-packages/Bio' % pyshortver,
         'lib/python%s/site-packages/biopython-%s-py%s.egg-info' % (pyshortver, version,\
             pyshortver),
         'lib/python%s/site-packages/BioSQL' % pyshortver]
diff --git a/easybuild/easyconfigs/b/Biopython/Biopython-1.61-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/b/Biopython/Biopython-1.61-ictce-5.3.0-Python-2.7.3.eb
index eca39ee0dfb3c8bf87dbfefd86ab4c6412df8e82..96eae4f6355fd4035d91d0b741a609d301962072 100644
--- a/easybuild/easyconfigs/b/Biopython/Biopython-1.61-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/b/Biopython/Biopython-1.61-ictce-5.3.0-Python-2.7.3.eb
@@ -35,7 +35,7 @@ dependencies = [
 
 sanity_check_paths = {
     'files': [],
-    'dirs': ['lib/python%s/site-packages/Bio' % pyshortver, 
+    'dirs': ['lib/python%s/site-packages/Bio' % pyshortver,
         'lib/python%s/site-packages/biopython-%s-py%s.egg-info' % (pyshortver, version,\
             pyshortver),
         'lib/python%s/site-packages/BioSQL' % pyshortver]
diff --git a/easybuild/easyconfigs/b/Bismark/Bismark-0.10.1-goolf-1.4.10.eb b/easybuild/easyconfigs/b/Bismark/Bismark-0.10.1-goolf-1.4.10.eb
index 337980614fbfd664844ef62098e2f683b84c0ed5..07dcfa192ddee66faf061bc591471c9cb6bfb899 100644
--- a/easybuild/easyconfigs/b/Bismark/Bismark-0.10.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/Bismark/Bismark-0.10.1-goolf-1.4.10.eb
@@ -23,9 +23,9 @@ sources = ['%s_v%s.tar.gz' % (name.lower(), version) ]
 dependencies = [('Bowtie2', '2.0.2')]
 
 sanity_check_paths = {
-     'files': ["bismark", "bismark2bedGraph", "bismark2report", "bismark_genome_preparation", 
+     'files': ["bismark", "bismark2bedGraph", "bismark2report", "bismark_genome_preparation",
                "bismark_methylation_extractor", "coverage2cytosine", "deduplicate_bismark"],
      'dirs': [],
-} 
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7-goolf-1.5.14.eb b/easybuild/easyconfigs/b/Bison/Bison-2.7-goolf-1.5.14.eb
index de2474fb3b4a1849be5c0c5017821d285b3eb1b4..4c523b02e611305fc07d8361641917779fa80f5b 100644
--- a/easybuild/easyconfigs/b/Bison/Bison-2.7-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/b/Bison/Bison-2.7-goolf-1.5.14.eb
@@ -7,7 +7,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': 'goolf', 'version': '1.5.14'} 
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
diff --git a/easybuild/easyconfigs/b/Bison/Bison-3.0.4-foss-2016a.eb b/easybuild/easyconfigs/b/Bison/Bison-3.0.4-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e479dbbdd8b50896d909e206d903739f849492f9
--- /dev/null
+++ b/easybuild/easyconfigs/b/Bison/Bison-3.0.4-foss-2016a.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'Bison'
+version = '3.0.4'
+
+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': 'foss', 'version': '2016a'}
+
+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-3.0.4-intel-2016a.eb b/easybuild/easyconfigs/b/Bison/Bison-3.0.4-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..df48dd47dd88b236915c4abd96d7e4d2e3d5c710
--- /dev/null
+++ b/easybuild/easyconfigs/b/Bison/Bison-3.0.4-intel-2016a.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'Bison'
+version = '3.0.4'
+
+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': 'intel', 'version': '2016a'}
+
+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/BitSeq/BitSeq-0.7.0-goolf-1.4.10.eb b/easybuild/easyconfigs/b/BitSeq/BitSeq-0.7.0-goolf-1.4.10.eb
index 82b02fc155de3aa2c5595e7d2e8547a9df397f84..28b4adc0bdb10d22b8b4c891a85a847747ec955a 100644
--- 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
@@ -24,7 +24,7 @@ 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", 
+        "getPPLR", "getVariance", "getWithinGeneExpression", "parseAlignment",
         "transposeLargeFile", "getCounts.py", "extractTranscriptInfo.py"]
 
 # this is the real EasyBuild line to copy all the executables to "bin"
diff --git a/easybuild/easyconfigs/b/BoltzTraP/BoltzTraP-1.2.5-intel-2016a.eb b/easybuild/easyconfigs/b/BoltzTraP/BoltzTraP-1.2.5-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..db484f3beb1e82ed979e2b51e6f8a1e32be5ed59
--- /dev/null
+++ b/easybuild/easyconfigs/b/BoltzTraP/BoltzTraP-1.2.5-intel-2016a.eb
@@ -0,0 +1,29 @@
+easyblock = 'MakeCp'
+
+name = 'BoltzTraP'
+version = '1.2.5'
+
+homepage = 'http://www.icams.de/content/departments/cmat/boltztrap/'
+description = """Boltzmann Transport Properties (BoltzTraP) is a program for calculating the semi-classic transport
+ coefficients."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+# download from http://www.icams.de/content/uploads/boltztrap/BoltzTraP.tar.bz2, and rename to include version
+sources = [SOURCE_TAR_BZ2]
+checksums = ['6623d4393bce2e178b073f75f283eee6']
+
+skipsteps = ['configure']
+
+start_dir = 'src'
+parallel = 1
+buildopts = 'FC="${FC}" FOPT="$FFLAGS" LIBS="$LIBLAPACK"'
+
+files_to_copy = [(['BoltzTraP'], 'bin')]
+
+sanity_check_paths = {
+    'files': ['bin/BoltzTraP'],
+    'dirs': [],
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.55.0-foss-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/b/Boost/Boost-1.55.0-foss-2015a-Python-2.7.9.eb
index 88a81a73e9b2486a7faef4d0ec8caad67229c1f4..54a936cee57732bd2998e878f6b0b6d108cb5db8 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.55.0-foss-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.55.0-foss-2015a-Python-2.7.9.eb
@@ -4,7 +4,7 @@ version = '1.55.0'
 homepage = 'http://www.boost.org/'
 description = """Boost provides free peer-reviewed portable C++ source libraries."""
 
-toolchain = {'name': 'foss', 'version': '2015a'} 
+toolchain = {'name': 'foss', 'version': '2015a'}
 toolchainopts = {'pic': True, 'usempi': True}
 
 source_urls = [SOURCEFORGE_SOURCE]
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.55.0-intel-2015a-Python-2.7.8.eb b/easybuild/easyconfigs/b/Boost/Boost-1.55.0-intel-2015a-Python-2.7.8.eb
index 39ae5a52a46c19071732360ee60d5f4224d005d5..4646d38d2166bd0d9ea87af762f34098dc868085 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.55.0-intel-2015a-Python-2.7.8.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.55.0-intel-2015a-Python-2.7.8.eb
@@ -4,7 +4,7 @@ version = '1.55.0'
 homepage = 'http://www.boost.org/'
 description = """Boost provides free peer-reviewed portable C++ source libraries."""
 
-toolchain = {'name': 'intel', 'version': '2015a'} 
+toolchain = {'name': 'intel', 'version': '2015a'}
 toolchainopts = {'pic': True, 'usempi': True}
 
 source_urls = [SOURCEFORGE_SOURCE]
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.57.0-foss-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/b/Boost/Boost-1.57.0-foss-2015a-Python-2.7.9.eb
index 1c2ebd212d9ee7e9aef71812fb790e967ba36cec..944128c6d51f8c80ed5ce6f63447bfd6afe94fb2 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.57.0-foss-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.57.0-foss-2015a-Python-2.7.9.eb
@@ -4,7 +4,7 @@ version = '1.57.0'
 homepage = 'http://www.boost.org/'
 description = """Boost provides free peer-reviewed portable C++ source libraries."""
 
-toolchain = {'name': 'foss', 'version': '2015a'} 
+toolchain = {'name': 'foss', 'version': '2015a'}
 toolchainopts = {'pic': True, 'usempi': True}
 
 source_urls = [SOURCEFORGE_SOURCE]
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.57.0-foss-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/b/Boost/Boost-1.57.0-foss-2015b-Python-2.7.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f89cb288d3edecdd7ec575b5c1c7d285cb3830fe
--- /dev/null
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.57.0-foss-2015b-Python-2.7.10.eb
@@ -0,0 +1,25 @@
+name = 'Boost'
+version = '1.57.0'
+
+homepage = 'http://www.boost.org/'
+description = """Boost provides free peer-reviewed portable C++ source libraries."""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+toolchainopts = {'pic': True, 'usempi': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['%%(namelower)s_%s.tar.gz' % '_'.join(version.split('.'))]
+
+pythonversion = '2.7.10'
+versionsuffix = '-Python-%s' % pythonversion
+
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.8'),
+    ('Python', pythonversion),
+]
+
+# also build boost_mpi
+boost_mpi = True
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.57.0-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/b/Boost/Boost-1.57.0-intel-2015a-Python-2.7.9.eb
index 84fbb7d38c94a5542d42e0f557cfd91df8452865..cf98c58fdf7cb4e5e68c8ecc5a062bd420423b23 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.57.0-intel-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.57.0-intel-2015a-Python-2.7.9.eb
@@ -4,7 +4,7 @@ version = '1.57.0'
 homepage = 'http://www.boost.org/'
 description = """Boost provides free peer-reviewed portable C++ source libraries."""
 
-toolchain = {'name': 'intel', 'version': '2015a'} 
+toolchain = {'name': 'intel', 'version': '2015a'}
 toolchainopts = {'pic': True, 'usempi': True}
 
 source_urls = [SOURCEFORGE_SOURCE]
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.58.0-foss-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/b/Boost/Boost-1.58.0-foss-2015a-Python-2.7.9.eb
index bbef8b760b3ac8240f9078c2e2961fca0159d225..02c7922f8dd548e45c09c5d0df552f94134152de 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.58.0-foss-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.58.0-foss-2015a-Python-2.7.9.eb
@@ -4,7 +4,7 @@ version = '1.58.0'
 homepage = 'http://www.boost.org/'
 description = """Boost provides free peer-reviewed portable C++ source libraries."""
 
-toolchain = {'name': 'foss', 'version': '2015a'} 
+toolchain = {'name': 'foss', 'version': '2015a'}
 toolchainopts = {'pic': True, 'usempi': True}
 
 source_urls = [SOURCEFORGE_SOURCE]
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.58.0-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/b/Boost/Boost-1.58.0-intel-2015a-Python-2.7.9.eb
index a209577bba563ea28b75df363e7dac921d12fe0d..9d905a95e3c1ef71a086fe14d4be2a2e1cbfc0e7 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.58.0-intel-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.58.0-intel-2015a-Python-2.7.9.eb
@@ -4,7 +4,7 @@ version = '1.58.0'
 homepage = 'http://www.boost.org/'
 description = """Boost provides free peer-reviewed portable C++ source libraries."""
 
-toolchain = {'name': 'intel', 'version': '2015a'} 
+toolchain = {'name': 'intel', 'version': '2015a'}
 toolchainopts = {'pic': True, 'usempi': True}
 
 source_urls = [SOURCEFORGE_SOURCE]
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.59.0-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/b/Boost/Boost-1.59.0-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5a890ee8ea508e935ba36a744a1bf35481c7870f
--- /dev/null
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.59.0-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,25 @@
+name = 'Boost'
+version = '1.59.0'
+
+homepage = 'http://www.boost.org/'
+description = """Boost provides free peer-reviewed portable C++ source libraries."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'pic': True, 'usempi': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['%%(namelower)s_%s.tar.gz' % '_'.join(version.split('.'))]
+
+pythonversion = '2.7.11'
+versionsuffix = '-Python-%s' % pythonversion
+
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.8'),
+    ('Python', pythonversion),
+]
+
+# also build boost_mpi
+boost_mpi = True
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.59.0-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/b/Boost/Boost-1.59.0-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..57d1d20c886efce723840c595913e9f4fa4d889a
--- /dev/null
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.59.0-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,25 @@
+name = 'Boost'
+version = '1.59.0'
+
+homepage = 'http://www.boost.org/'
+description = """Boost provides free peer-reviewed portable C++ source libraries."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'pic': True, 'usempi': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['%%(namelower)s_%s.tar.gz' % '_'.join(version.split('.'))]
+
+pythonversion = '2.7.11'
+versionsuffix = '-Python-%s' % pythonversion
+
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.8'),
+    ('Python', pythonversion),
+]
+
+# also build boost_mpi
+boost_mpi = True
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.59.0-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/b/Boost/Boost-1.59.0-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..df6d6d14c61619e1b5f8a23e6635e1f78101f189
--- /dev/null
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.59.0-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,25 @@
+name = 'Boost'
+version = '1.59.0'
+
+homepage = 'http://www.boost.org/'
+description = """Boost provides free peer-reviewed portable C++ source libraries."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'pic': True, 'usempi': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['%%(namelower)s_%s.tar.gz' % '_'.join(version.split('.'))]
+
+pythonversion = '2.7.11'
+versionsuffix = '-Python-%s' % pythonversion
+
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.8'),
+    ('Python', pythonversion),
+]
+
+# also build boost_mpi
+boost_mpi = True
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.60.0-foss-2015b.eb b/easybuild/easyconfigs/b/Boost/Boost-1.60.0-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6319781076f5254aea6c6dd4989cc4b1b1469d39
--- /dev/null
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.60.0-foss-2015b.eb
@@ -0,0 +1,23 @@
+name = 'Boost'
+version = '1.60.0'
+
+homepage = 'http://www.boost.org/'
+description = """Boost provides free peer-reviewed portable C++ source libraries."""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+toolchainopts = {'pic': True, 'usempi': True}
+
+sources = ['%%(namelower)s_%s.tar.gz' % '_'.join(version.split('.'))]
+source_urls = [SOURCEFORGE_SOURCE]
+
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.8'),
+]
+
+configopts = '--without-libraries=python'
+
+# also build boost_mpi
+boost_mpi = True
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Bowtie/Bowtie-1.1.2-foss-2015b.eb b/easybuild/easyconfigs/b/Bowtie/Bowtie-1.1.2-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..74828669ae4cdc7dccb54fdf3c7d4d5ef9c2a9c8
--- /dev/null
+++ b/easybuild/easyconfigs/b/Bowtie/Bowtie-1.1.2-foss-2015b.eb
@@ -0,0 +1,18 @@
+#Modified from existing version by:
+#Robert Schmidt <rjeschmi@gmail.com>
+#Ottawa Hospital Research Institute - Bioinformatics Team
+name = 'Bowtie'
+version = '1.1.2'
+
+homepage = 'http://bowtie-bio.sourceforge.net/index.shtml'
+description = """Bowtie is an ultrafast, memory-efficient short read aligner.
+It aligns short DNA sequences (reads) to the human genome.
+"""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+toolchainopts = {'pic': True}
+
+sources = ['%(namelower)s-%(version)s-src.zip']
+source_urls = ['http://download.sourceforge.net/bowtie-bio/']
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/Bowtie/Bowtie-1.1.2-intel-2015b.eb b/easybuild/easyconfigs/b/Bowtie/Bowtie-1.1.2-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..63be2bee21c94f8ead66096b5b4b2765fc91d523
--- /dev/null
+++ b/easybuild/easyconfigs/b/Bowtie/Bowtie-1.1.2-intel-2015b.eb
@@ -0,0 +1,21 @@
+#Modified from existing version by:
+#Robert Schmidt <rjeschmi@gmail.com>
+#Ottawa Hospital Research Institute - Bioinformatics Team
+name = 'Bowtie'
+version = '1.1.2'
+
+homepage = 'http://bowtie-bio.sourceforge.net/index.shtml'
+description = """Bowtie is an ultrafast, memory-efficient short read aligner.
+It aligns short DNA sequences (reads) to the human genome.
+"""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+sources = ['%(namelower)s-%(version)s-src.zip']
+source_urls = ['http://download.sourceforge.net/bowtie-bio/']
+
+patches = ['int64typedef.patch']
+
+moduleclass = 'bio'
+
diff --git a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.6-foss-2015b.eb b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.6-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9b9219de67df50b72cb816860f5955cb8b4ede4e
--- /dev/null
+++ b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.6-foss-2015b.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
+# Modified by: Robert Schmidt <rjeschmi@gmail.com>
+# Ottawa Hospital Research Institute - Bioinformatics Team
+
+easyblock = 'MakeCp'
+
+name = 'Bowtie2'
+version = '2.2.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': 'foss', 'version': '2015b'}
+
+sources = ['%(namelower)s-%(version)s-source.zip']
+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/basemap/basemap-1.0.7-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/b/basemap/basemap-1.0.7-intel-2015b-Python-2.7.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9b8b2b064c69859b9fa5761e29fbb7ef444194d2
--- /dev/null
+++ b/easybuild/easyconfigs/b/basemap/basemap-1.0.7-intel-2015b-Python-2.7.10.eb
@@ -0,0 +1,36 @@
+easyblock = 'PythonPackage'
+
+name = 'basemap'
+version = '1.0.7'
+
+homepage = 'http://matplotlib.org/basemap/'
+description = """The matplotlib basemap toolkit is a library for plotting 2D data on maps in Python"""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://downloads.sourceforge.net/project/matplotlib/matplotlib-toolkits/basemap-%(version)s']
+
+prebuildopts = 'GEOS_DIR=$EBROOTGEOS'
+preinstallopts = prebuildopts
+
+python = 'Python'
+pythonver = '2.7.10'
+pythonshortver = '.'.join(pythonver.split('.')[0:2])
+versionsuffix = '-Python-%s' % pythonver
+
+dependencies = [
+    ('Python', pythonver),
+    ('matplotlib', '1.5.0', versionsuffix),
+    ('GEOS', '3.5.0', versionsuffix),
+    ('PIL', '1.1.7', versionsuffix),
+]
+
+sanity_check_paths = {
+    'files':  ['lib/python%s/site-packages/_geoslib.%s' % (pythonshortver, SHLIB_EXT)],
+    'dirs':  ['lib/python%s/site-packages/mpl_toolkits/basemap' % pythonshortver]
+}
+
+options = {'modulename': 'mpl_toolkits.basemap'}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/b/bbftpPRO/bbftpPRO-9.3.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/b/bbftpPRO/bbftpPRO-9.3.1-goalf-1.1.0-no-OFED.eb
index 7f34d18683617837c091b6d408b5281834af734d..ead21fe6c829ba2ee658ba9ce9b7b05f5096ddc5 100644
--- a/easybuild/easyconfigs/b/bbftpPRO/bbftpPRO-9.3.1-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/b/bbftpPRO/bbftpPRO-9.3.1-goalf-1.1.0-no-OFED.eb
@@ -24,7 +24,7 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 sources = [SOURCE_TAR_BZ2]
 source_urls = ['http://bbftppro.myftp.org/']
 
-unpack_options = '--strip-components=1' # we need to dive one level deep inside the tarball 
+unpack_options = '--strip-components=1' # we need to dive one level deep inside the tarball
 
 start_dir = 'bbftpc'
 
diff --git a/easybuild/easyconfigs/b/bbftpPRO/bbftpPRO-9.3.1-goolf-1.4.10.eb b/easybuild/easyconfigs/b/bbftpPRO/bbftpPRO-9.3.1-goolf-1.4.10.eb
index 8017f38954ab778889f1c51e5c63a25378024af0..944cb25b8bd84727a98122f274893e0345dac5cc 100644
--- a/easybuild/easyconfigs/b/bbftpPRO/bbftpPRO-9.3.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/bbftpPRO/bbftpPRO-9.3.1-goolf-1.4.10.eb
@@ -24,7 +24,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 sources = [SOURCE_TAR_BZ2]
 source_urls = ['http://bbftppro.myftp.org/']
 
-unpack_options = '--strip-components=1' # we need to dive one level deep inside the tarball 
+unpack_options = '--strip-components=1' # we need to dive one level deep inside the tarball
 
 start_dir = 'bbftpc'
 
diff --git a/easybuild/easyconfigs/b/bbftpPRO/bbftpPRO-9.3.1-ictce-5.3.0.eb b/easybuild/easyconfigs/b/bbftpPRO/bbftpPRO-9.3.1-ictce-5.3.0.eb
index cf3d332d4be4367799827e87cd4fc5b552c203dc..8cff88ba262c030c07a9ce88173590f02b1643bf 100644
--- a/easybuild/easyconfigs/b/bbftpPRO/bbftpPRO-9.3.1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/b/bbftpPRO/bbftpPRO-9.3.1-ictce-5.3.0.eb
@@ -24,7 +24,7 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'}
 sources = [SOURCE_TAR_BZ2]
 source_urls = ['http://bbftppro.myftp.org/']
 
-unpack_options = '--strip-components=1' # we need to dive one level deep inside the tarball 
+unpack_options = '--strip-components=1' # we need to dive one level deep inside the tarball
 
 start_dir = 'bbftpc'
 
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 09be4e251381a1486680b49c6af7103786803631..89688dc6f162fb51c9d97b4b65879850816f5517 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
@@ -30,7 +30,7 @@ configopts = '--with-sysroot=/'
 binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'nm',
            'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip' ]
 sanity_check_paths = {
-    'files': ['bin/%s' % x for x in binlist] + ['lib/libbfd.a', 'lib/libopcodes.a', 'lib64/libiberty.a'] + 
+    'files': ['bin/%s' % x for x in binlist] + ['lib/libbfd.a', 'lib/libopcodes.a', 'lib64/libiberty.a'] +
              ['include/%s' % x for x in ['ansidecl.h', 'bfd.h', 'bfdlink.h', 'dis-asm.h', 'symcat.h']],
     'dirs': [],
 }
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 037eea64d670577145cd3de25899bcc26f5d0e82..fc3ab9230d42fa6c50ea123286c427849ef9df70 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
@@ -30,7 +30,7 @@ configopts = '--with-sysroot=/'
 binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'nm',
            'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip' ]
 sanity_check_paths = {
-    'files': ['bin/%s' % x for x in binlist] + ['lib/libbfd.a', 'lib/libopcodes.a', 'lib64/libiberty.a'] + 
+    'files': ['bin/%s' % x for x in binlist] + ['lib/libbfd.a', 'lib/libopcodes.a', 'lib64/libiberty.a'] +
              ['include/%s' % x for x in ['ansidecl.h', 'bfd.h', 'bfdlink.h', 'dis-asm.h', 'symcat.h']],
     'dirs': [],
 }
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 6eefeecf7f105efe2cf079ce217cbdcca6cd9866..10612dc9735f4d71eda671b018ae93a7c1235582 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
@@ -29,7 +29,7 @@ configopts = '--with-sysroot=/'
 binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'nm',
            'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip' ]
 sanity_check_paths = {
-    'files': ['bin/%s' % x for x in binlist] + ['lib/libbfd.a', 'lib/libopcodes.a', 'lib64/libiberty.a'] + 
+    'files': ['bin/%s' % x for x in binlist] + ['lib/libbfd.a', 'lib/libopcodes.a', 'lib64/libiberty.a'] +
              ['include/%s' % x for x in ['ansidecl.h', 'bfd.h', 'bfdlink.h', 'dis-asm.h', 'symcat.h']],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.5.14.eb b/easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.5.14.eb
index 1922cb5d1278e46e29a3390b39777eff79f9b58f..f0f82557eb08c19273790361bdc14d0f7d04dfb4 100644
--- a/easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.5.14.eb
@@ -27,7 +27,7 @@ source_urls = [GNU_SOURCE]
 binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'nm',
            'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip' ]
 sanity_check_paths = {
-    'files': ['bin/%s' % x for x in binlist] + ['lib/libbfd.a', 'lib/libopcodes.a', 'lib64/libiberty.a'] + 
+    'files': ['bin/%s' % x for x in binlist] + ['lib/libbfd.a', 'lib/libopcodes.a', 'lib64/libiberty.a'] +
              ['include/%s' % x for x in ['ansidecl.h', 'bfd.h', 'bfdlink.h', 'dis-asm.h', 'symcat.h']],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.25.1.eb b/easybuild/easyconfigs/b/binutils/binutils-2.25.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6e4fce3123e5d5efff2806542abb7f09fad1c6cf
--- /dev/null
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.25.1.eb
@@ -0,0 +1,39 @@
+easyblock = 'ConfigureMake'
+
+name = 'binutils'
+version = '2.25.1'
+
+homepage = 'http://directory.fsf.org/project/binutils/'
+description = "binutils: GNU binary utilities"
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+builddependencies = [
+    ('flex', '2.5.39'),
+    ('Bison', '3.0.4'),
+    # zlib required, but being linked instatically, so not a runtime dep
+    ('zlib', '1.2.8'),
+]
+
+# statically link with zlib, to avoid runtime dependency on zlib
+# further, add the system library path in the rpath: this should 'harden' the
+# resulting binutils to bootstrap GCC (no trouble when other libstdc++ is build etc)
+preconfigopts = 'LIBS="$EBROOTZLIB/lib/libz.a -Wl,-rpath=/lib64 -Wl,-rpath=/usr/lib64 -Wl,-rpath=/lib -Wl,-rpath=/usr/lib"'
+prebuildopts = preconfigopts
+
+# make sure that system libraries are also considered by ld and ld.gold is also built
+# --enable-plugins should be used whenever --enable-gold is used, see http://llvm.org/docs/GoldPlugin.html
+configopts = '--with-sysroot=/ --enable-gold --enable-ld=default --enable-plugins'
+
+binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'ld.gold', 'nm',
+           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip' ]
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in binlist] + ['lib/libbfd.a', 'lib/libopcodes.a'] +
+             ['include/%s' % x for x in ['ansidecl.h', 'bfd.h', 'bfdlink.h', 'dis-asm.h', 'symcat.h']],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b21a0542ef20509266aa01f923395cdfe15546d0
--- /dev/null
+++ b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-GCC-4.9.3-2.25.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': 'GCC', 'version': '4.9.3-2.25'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://www.bzip.org/%(version)s']
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-foss-2016a.eb b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4620787ebb9a4a6ab25fb838190cac7a6c8d6e74
--- /dev/null
+++ b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-foss-2016a.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': 'foss', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://www.bzip.org/%(version)s']
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-intel-2016a.eb b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c663462b9f2fbe994ab19ac919d8e338ddae223e
--- /dev/null
+++ b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-intel-2016a.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': 'intel', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://www.bzip.org/%(version)s']
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.1-foss-2015b-2012-08-27.eb b/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.1-foss-2015b-2012-08-27.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d4682f582da01771ed802577e5270de2419d52f9
--- /dev/null
+++ b/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.1-foss-2015b-2012-08-27.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 = "CD-HIT"
+version = "4.6.1"
+versionsuffix = "-2012-08-27"
+
+homepage = 'http://weizhong-lab.ucsd.edu/cd-hit/'
+description = """ CD-HIT is a very widely used program for clustering and 
+ comparing protein or nucleotide sequences."""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+toolchainopts = {'openmp': True}
+
+source_urls = ['https://github.com/weizhongli/cdhit/releases/download/V%(version)s/']
+sources = ['%(namelower)s-v%(version)s%(versionsuffix)s.tgz']
+
+# make sure compilation flags are passed down (e.g. to enable OpenMP)
+buildopts = ' CC="$CXX" CCFLAGS="$CPPFLAGS $CXXFLAGS"'
+
+# put here the list of generated executables when compiling
+list_of_executables = ["cd-hit", "cd-hit-est", "cd-hit-2d", "cd-hit-est-2d", "cd-hit-div", "cd-hit-454"]
+
+# this is the real EasyBuild line to copy all the executables and perl scripts to "bin"
+files_to_copy = [(list_of_executables, "bin"), (["*.pl"], 'bin'), "README", "doc", "license.txt" ]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in list_of_executables],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.4-GNU-4.9.3-2.25-2015-0603.eb b/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.4-GNU-4.9.3-2.25-2015-0603.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b3d2485ff06869c70502ac4a1a4208cc4477fb5f
--- /dev/null
+++ b/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.4-GNU-4.9.3-2.25-2015-0603.eb
@@ -0,0 +1,45 @@
+# 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 = "CD-HIT"
+version = "4.6.4"
+versionsuffix = "-2015-0603"
+
+homepage = 'http://weizhongli-lab.org/cd-hit/'
+
+description = """ CD-HIT is a very widely used program for clustering and 
+ comparing protein or nucleotide sequences."""
+
+toolchain = {'name': 'GNU', 'version': '4.9.3-2.25'}
+toolchainopts = {'openmp': True}
+
+source_urls = ['https://github.com/weizhongli/cdhit/releases/download/V%(version)s/']
+sources = ['%(namelower)s-v%(version)s%(versionsuffix)s.tar.gz']
+
+# make sure compilation flags are passed down (e.g. to enable OpenMP)
+buildopts = ' CC="$CXX" CCFLAGS="$CPPFLAGS $CXXFLAGS"'
+
+# put here the list of generated executables when compiling
+list_of_executables = ["cd-hit", "cd-hit-est", "cd-hit-2d", "cd-hit-est-2d", "cd-hit-div", "cd-hit-454"]
+
+# this is the real EasyBuild line to copy all the executables and perl scripts to "bin"
+files_to_copy = [
+    (list_of_executables, "bin"),
+    (["*.pl"], 'bin'),
+    (["psi-cd-hit/*.pl"], 'bin'),
+    "README",
+    "doc",
+    "license.txt",
+    "psi-cd-hit/README.psi-cd-hit",
+ ]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in list_of_executables],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.4-foss-2015b-2015-0603.eb b/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.4-foss-2015b-2015-0603.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e2e712b7d506ef79e665debea9abc8ea6deb139e
--- /dev/null
+++ b/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.4-foss-2015b-2015-0603.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 = "CD-HIT"
+version = "4.6.4"
+versionsuffix = "-2015-0603"
+
+homepage = 'http://weizhong-lab.ucsd.edu/cd-hit/'
+description = """ CD-HIT is a very widely used program for clustering and 
+ comparing protein or nucleotide sequences."""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+toolchainopts = {'openmp': True}
+
+source_urls = ['https://github.com/weizhongli/cdhit/releases/download/V%(version)s/']
+sources = ['%(namelower)s-v%(version)s%(versionsuffix)s.tar.gz']
+
+# make sure compilation flags are passed down (e.g. to enable OpenMP)
+buildopts = ' CC="$CXX" CCFLAGS="$CPPFLAGS $CXXFLAGS"'
+
+# put here the list of generated executables when compiling
+list_of_executables = ["cd-hit", "cd-hit-est", "cd-hit-2d", "cd-hit-est-2d", "cd-hit-div", "cd-hit-454"]
+
+# this is the real EasyBuild line to copy all the executables and perl scripts to "bin"
+files_to_copy = [(list_of_executables, "bin"), (["*.pl"], 'bin'), "README", "doc", "license.txt" ]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in list_of_executables],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.37-intel-2015a.eb b/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.37-intel-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..08e0bf1795b3ead089f732d0ea3223d2c6e7dbfc
--- /dev/null
+++ b/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.37-intel-2015a.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'CFITSIO'
+version = '3.37'
+
+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': 'intel', 'version': '2015a'}
+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.7-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.7-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4cab94fb9f5a5c9489212a98ac5e8ea39da054ba
--- /dev/null
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.7-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,36 @@
+name = 'CGAL'
+version = '4.7'
+
+homepage = 'http://www.cgal.org/'
+description = """The goal of the CGAL Open Source Project is to provide easy access to efficient 
+ and reliable geometric algorithms in the form of a C++ library."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'strict': True}
+
+# note: source URL needs to be updated for a new version (checksums too)!
+source_urls = ['https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-%(version)s']
+sources = [SOURCE_TAR_XZ]
+checksums = ['623d91fb2ab0a35049dc6098a0f235cc']
+
+pythonversion = '2.7.11'
+versionsuffix = "-Python-%s" % pythonversion
+
+mesaver = '11.0.8'
+dependencies = [
+    ('Boost', '1.59.0', versionsuffix),
+    ('MPFR', '3.1.3', '-GMP-6.1.0'),
+    ('Qt5', '5.5.1', '-Mesa-%s' % mesaver),
+    ('Mesa', '11.0.8', versionsuffix),
+    ('libGLU', '9.0.0', '-Mesa-%s' % mesaver),
+]
+
+configopts = "-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include\;$EBROOTLIBGLU/include "
+configopts += "-DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.%s " % SHLIB_EXT
+configopts += "-DOPENGL_glu_LIBRARY=$EBROOTLIBGLU/lib/libGLU.%s " % SHLIB_EXT
+
+builddependencies = [
+    ('CMake', '3.4.1'),
+]
+
+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
index 928c867d0ae75a3db31d679bc8e05b8608982b0c..01ff6a23298f0bc092165a2915861f797b5b9a67 100644
--- 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
@@ -18,9 +18,9 @@ patches = [
 ]
 
 # FFTW will automatically be used because of the toolchain
-build_options = "FULL COLFFT PIPF"
+build_options = "FULL COLFFT PIPF +DOMDEC -CMPI"
 
-# Chose from: huge, xxlarge, xlarge, large, medium (the default), small, xsmall, reduce
+# Choose 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
index 3485ce9ee917e80b35e1aaeb333e745c03044f6f..18d4e7d4ab6eb6c4d1b51b492d36551826ac7d6f 100644
--- 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
@@ -22,7 +22,7 @@ patches = [
 # 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
+# Choose 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
index 81f90923f074c6c2f744f04fe0dc746ab9b9542e..d7cd0f51f6f4d170457a50e775a0f3460c712f3a 100644
--- a/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-ictce-5.5.0.eb
@@ -19,9 +19,9 @@ patches = [
 ]
 
 # MKL activated automatically when the ictce toolchain is used
-build_options = "FULL COLFFT PIPF"
+build_options = "FULL COLFFT PIPF +DOMDEC -CMPI"
 
-# Chose from: huge, xxlarge, xlarge, large, medium (the default), small, xsmall, reduce
+# Choose 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-intel-2015a.eb b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-intel-2015a.eb
index 155eb5a8aee415696369bf728fba55305175dfd7..894f7b229756207b309950d60bd7cb582f7fc006 100644
--- a/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-intel-2015a.eb
+++ b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-intel-2015a.eb
@@ -16,13 +16,13 @@ patches = [
     "qmmm-pme-%(version)s.patch",
     "use-xhost-%(version)s.patch",
     "main-case-fix-%(version)s.patch",
-    'CHARMM-37b2_fix-qgas-double-declared.patch',
+    'CHARMM-%(version)s_fix-qgas-double-declared.patch',
 ]
 
-# MKL activated automatically when the ictce toolchain is used
-build_options = "FULL COLFFT PIPF"
+# MKL activated automatically when the intel toolchain is used
+build_options = "FULL COLFFT PIPF +DOMDEC -CMPI"
 
-# Chose from: huge, xxlarge, xlarge, large, medium (the default), small, xsmall, reduce
+# Choose 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-intel-2015b.eb b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-intel-2015b.eb
index 417f7a87856a0351912c83ceb53806f1a5fc0a43..de51fe23be51742cdcb2e83749b24dae07078aed 100644
--- a/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-intel-2015b.eb
+++ b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-intel-2015b.eb
@@ -16,13 +16,13 @@ patches = [
     "qmmm-pme-%(version)s.patch",
     "use-xhost-%(version)s.patch",
     "main-case-fix-%(version)s.patch",
-    'CHARMM-37b2_fix-qgas-double-declared.patch',
+    'CHARMM-%(version)s_fix-qgas-double-declared.patch',
 ]
 
-# MKL activated automatically when the ictce toolchain is used
-build_options = "FULL COLFFT PIPF"
+# MKL activated automatically when the intel toolchain is used
+build_options = "FULL COLFFT PIPF +DOMDEC -CMPI"
 
-# Chose from: huge, xxlarge, xlarge, large, medium (the default), small, xsmall, reduce
+# Choose 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-intel-2016a.eb b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..100fe610032535f698bfb4e1c1ffea3962e11d74
--- /dev/null
+++ b/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-intel-2016a.eb
@@ -0,0 +1,28 @@
+# 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': 'intel', 'version': '2016a'}
+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",
+    'CHARMM-%(version)s_fix-qgas-double-declared.patch',
+]
+
+# MKL activated automatically when the intel toolchain is used
+build_options = "FULL COLFFT PIPF +DOMDEC -CMPI"
+
+# Choose from: huge, xxlarge, xlarge, large, medium (the default), small, xsmall, reduce
+system_size = "medium"
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.3.1-intel-2015a.eb b/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.3.1-intel-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0e9493dbb4176541ba3eb88086e6720f3f81e296
--- /dev/null
+++ b/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.3.1-intel-2015a.eb
@@ -0,0 +1,24 @@
+easyblock = 'CMakeMake'
+
+name = 'CLHEP'
+version = '2.1.3.1'
+
+homepage = 'http://proj-clhep.web.cern.ch/proj-clhep/'
+description = """The CLHEP project is intended to be a set of HEP-specific foundation and
+ utility classes such as random generators, physics vectors, geometry and linear algebra.
+ CLHEP is structured in a set of packages independent of any external package."""
+
+
+toolchain = {'name': 'intel', 'version': '2015a'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TGZ]
+source_urls = ['http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/']
+
+builddependencies = [('CMake', '3.1.3')]
+
+separate_build_dir = True
+
+configopts = '-DCMAKE_BUILD_TYPE=Release'
+
+moduleclass = 'numlib'
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
index 3ca4fbb07d4799db93849f3752ef63c2d444aad1..fbd1e0f85d8b8f54020e71169da7cb01bb47f8eb 100644
--- 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
@@ -20,7 +20,7 @@ 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'],
+    'files': ['bin/cloog', 'lib/libcloog-isl.%s' % SHLIB_EXT, 'lib/libisl.%s' % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.12-ictce-7.1.2.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-ictce-7.1.2.eb
index 48bd837709078f6375b40a3cd2f320004cdf9e68..97f1c8805395161c027c97d9a1bbc1c54138e552 100644
--- a/easybuild/easyconfigs/c/CMake/CMake-2.8.12-ictce-7.1.2.eb
+++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-ictce-7.1.2.eb
@@ -7,7 +7,7 @@ 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': '7.1.2'} 
+toolchain = {'name': 'ictce', 'version': '7.1.2'}
 
 source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s']
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.12-intel-2014b.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-intel-2014b.eb
index 7749fdcd0283adfb9fb301425f96d6148b14ec9c..93127430ded9ba65bfb1c1e248242037ff83c8d7 100644
--- a/easybuild/easyconfigs/c/CMake/CMake-2.8.12-intel-2014b.eb
+++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-intel-2014b.eb
@@ -7,7 +7,7 @@ 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': 'intel', 'version': '2014b'} 
+toolchain = {'name': 'intel', 'version': '2014b'}
 
 source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s']
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/c/CMake/CMake-3.4.1-GCCcore-4.9.3.eb b/easybuild/easyconfigs/c/CMake/CMake-3.4.1-GCCcore-4.9.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1a599467bd455977ac991cd3adcb113dd1b5ac49
--- /dev/null
+++ b/easybuild/easyconfigs/c/CMake/CMake-3.4.1-GCCcore-4.9.3.eb
@@ -0,0 +1,33 @@
+easyblock = 'ConfigureMake'
+
+name = 'CMake'
+version = '3.4.1'
+
+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': 'GCCcore', 'version': '4.9.3'}
+
+source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s']
+sources = [SOURCELOWER_TAR_GZ]
+
+builddependencies = [('binutils', '2.25')]
+
+configopts = '-- -DCMAKE_USE_OPENSSL=1'
+
+dependencies = [
+    ('ncurses', '6.0'),
+    # OS dependency should be preferred if the os version is more recent then this version,
+    # it's nice to have an up to date openssl for security reasons
+    #('OpenSSL', '1.0.1p'),
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/c/CMake/CMake-3.4.1-foss-2015b.eb b/easybuild/easyconfigs/c/CMake/CMake-3.4.1-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5702e9976db58d9e561616805e5a771274befcc4
--- /dev/null
+++ b/easybuild/easyconfigs/c/CMake/CMake-3.4.1-foss-2015b.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'CMake'
+version = '3.4.1'
+
+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': 'foss', 'version': '2015b'}
+
+source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s']
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = '-- -DCMAKE_USE_OPENSSL=1'
+
+dependencies = [
+    ('ncurses', '5.9'),
+    # OS dependency should be preferred if the os version is more recent then this version,
+    # it's nice to have an up to date openssl for security reasons
+    #('OpenSSL', '1.0.1p'),
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/c/CMake/CMake-3.4.1-foss-2016a.eb b/easybuild/easyconfigs/c/CMake/CMake-3.4.1-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..87dc8ebec4ef0dca2936c93194536d60b38f6340
--- /dev/null
+++ b/easybuild/easyconfigs/c/CMake/CMake-3.4.1-foss-2016a.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'CMake'
+version = '3.4.1'
+
+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': 'foss', 'version': '2016a'}
+
+source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s']
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = '-- -DCMAKE_USE_OPENSSL=1'
+
+dependencies = [
+    ('ncurses', '6.0'),
+    # OS dependency should be preferred if the os version is more recent then this version,
+    # it's nice to have an up to date openssl for security reasons
+    #('OpenSSL', '1.0.1p'),
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/c/CMake/CMake-3.4.1-intel-2016a.eb b/easybuild/easyconfigs/c/CMake/CMake-3.4.1-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..db841bbaef4d9b13ca4b89f411d499d3f268c879
--- /dev/null
+++ b/easybuild/easyconfigs/c/CMake/CMake-3.4.1-intel-2016a.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'CMake'
+version = '3.4.1'
+
+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': 'intel', 'version': '2016a'}
+
+source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s']
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = '-- -DCMAKE_USE_OPENSSL=1'
+
+dependencies = [
+    ('ncurses', '6.0'),
+    # OS dependency should be preferred if the os version is more recent then this version,
+    # it's nice to have an up to date openssl for security reasons
+    #('OpenSSL', '1.0.1p'),
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/c/CONTRAfold/CONTRAfold-2.02-goolf-1.4.10.eb b/easybuild/easyconfigs/c/CONTRAfold/CONTRAfold-2.02-goolf-1.4.10.eb
index f772aaa29cdaed52dd453f8867154cee139cd1ad..34d8a45119aab110365d6e7ef761c6d3c48d0321 100644
--- a/easybuild/easyconfigs/c/CONTRAfold/CONTRAfold-2.02-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/c/CONTRAfold/CONTRAfold-2.02-goolf-1.4.10.eb
@@ -20,8 +20,8 @@ patches = ['contrafold-gcc47.patch']
 
 start_dir = 'src'
 
-files_to_copy = [(['score_prediction', 'contrafold', 'score_directory.pl',\
-	 	   'roc_area.pl', 'MakeDefaults.pl'], 'bin'), '../doc']
+binaries = ['score_prediction', 'contrafold', 'score_directory.pl', 'roc_area.pl', 'MakeDefaults.pl']
+files_to_copy = [(binaries, 'bin'), '../doc']
 
 sanity_check_paths = {
     'files': ['bin/score_prediction', 'bin/contrafold'],
diff --git a/easybuild/easyconfigs/c/CPLEX/CPLEX-12.4.eb b/easybuild/easyconfigs/c/CPLEX/CPLEX-12.4.eb
index 2536b8c9d5e31f2a5b226ec082e22f0f1371bee7..128e2f2ae34f544365601ec40ef6e97e895981f4 100644
--- a/easybuild/easyconfigs/c/CPLEX/CPLEX-12.4.eb
+++ b/easybuild/easyconfigs/c/CPLEX/CPLEX-12.4.eb
@@ -1,13 +1,17 @@
 name = 'CPLEX'
 version = '12.4'
 
-homepage = 'http://www-01.ibm.com/software/integration/optimization/cplex-optimizer/'
+homepage = 'http://www-01.ibm.com/software/commerce/optimization/cplex-optimizer/'
 description = """IBM ILOG CPLEX Optimizer's mathematical programming technology enables
  analytical decision support for improving efficiency,
  reducing costs, and increasing profitability."""
 
 toolchain = {'name': 'dummy', 'version': 'dummy'}
 
+# the Academic Initiative version (as used in this file) can be downloaded as described on
+# https://www.ibm.com/developerworks/community/blogs/jfp/entry/cplex_studio_in_ibm_academic_initiative?lang=en
+# a restricted "Community edition" version can be found on
+# https://www-01.ibm.com/software/websphere/products/optimization/cplex-studio-community-edition/
 sources = ['cplex_studio%s.linux-x86-64.bin' % ''.join(version.split('.'))]
 
 moduleclass = 'math'
diff --git a/easybuild/easyconfigs/c/CPLEX/CPLEX-12.6.3-foss-2015b.eb b/easybuild/easyconfigs/c/CPLEX/CPLEX-12.6.3-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8327d3734bd397579899b300906e19b4ae446578
--- /dev/null
+++ b/easybuild/easyconfigs/c/CPLEX/CPLEX-12.6.3-foss-2015b.eb
@@ -0,0 +1,21 @@
+name = 'CPLEX'
+version = '12.6.3'
+
+homepage = 'http://www-01.ibm.com/software/commerce/optimization/cplex-optimizer/'
+description = """IBM ILOG CPLEX Optimizer's mathematical programming technology enables
+ analytical decision support for improving efficiency,
+ reducing costs, and increasing profitability."""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+
+# the Academic Initiative version (as used in this file) can be downloaded as described on 
+# https://www.ibm.com/developerworks/community/blogs/jfp/entry/cplex_studio_in_ibm_academic_initiative?lang=en
+# a restricted "Community edition" version can be found on
+# https://www-01.ibm.com/software/websphere/products/optimization/cplex-studio-community-edition/
+sources = ['cplex_studio%s.linux-x86-64.bin' % ''.join(version.split('.'))]
+
+dependencies = [
+    ('Java', '1.8.0_66', '', True),
+]
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/c/ChIP-Seq/ChIP-Seq-1.5-1-goolf-1.4.10.eb b/easybuild/easyconfigs/c/ChIP-Seq/ChIP-Seq-1.5-1-goolf-1.4.10.eb
index 89d4bf646096eb7e40ac4628060c7f2f10b15e16..50c119c61c8d901e9ed3771b0b8c159c3ff3f545 100644
--- a/easybuild/easyconfigs/c/ChIP-Seq/ChIP-Seq-1.5-1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/c/ChIP-Seq/ChIP-Seq-1.5-1-goolf-1.4.10.eb
@@ -31,13 +31,13 @@ installopts += 'cp -a tools/ %(installdir)s && '
 installopts += 'cp -a README doc/ %(installdir)s'
 
 sanity_check_paths = {
-    'files': ["bin/%s" % x for x in ["chipcenter", "chipcor", "chipextract", "chippart", "chippeak", 
+    'files': ["bin/%s" % x for x in ["chipcenter", "chipcor", "chipextract", "chippart", "chippeak",
                                     "chipscore", "compactsga", "counts_filter", "countsga", "featreplace"]],
     'dirs': []
 }
 
 # add tools dir to PATH
-modextrapaths = { 
+modextrapaths = {
         'PATH': "tools",
 }
 
diff --git a/easybuild/easyconfigs/c/ChIP-Seq/ChIP-Seq-1.5-1-goolf-1.7.20.eb b/easybuild/easyconfigs/c/ChIP-Seq/ChIP-Seq-1.5-1-goolf-1.7.20.eb
index d273ae8dd8589b6bf298524b06601eb7c85d33c2..a72566ad44776388e5974851be6f8ed04960f764 100644
--- a/easybuild/easyconfigs/c/ChIP-Seq/ChIP-Seq-1.5-1-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/c/ChIP-Seq/ChIP-Seq-1.5-1-goolf-1.7.20.eb
@@ -31,13 +31,13 @@ installopts += 'cp -a tools/ %(installdir)s && '
 installopts += 'cp -a README doc/ %(installdir)s'
 
 sanity_check_paths = {
-    'files': ["bin/%s" % x for x in ["chipcenter", "chipcor", "chipextract", "chippart", "chippeak", 
+    'files': ["bin/%s" % x for x in ["chipcenter", "chipcor", "chipextract", "chippart", "chippeak",
                                     "chipscore", "compactsga", "counts_filter", "countsga", "featreplace"]],
     'dirs': []
 }
 
 # add tools dir to PATH
-modextrapaths = { 
+modextrapaths = {
         'PATH': "tools",
 }
 
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 36fb2222445f06ebe32b2d5803379e128a8f5f97..05ffad5f40050721abb9ab13ce5b834869f37acd 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
@@ -34,7 +34,7 @@ patches = ['Clang-3.2-failing-tests-due-to-gcc-installation-prefix.patch']
 builddependencies = [('CMake', '2.8.4')]
 
 sanity_check_paths = {
-    'files': ['bin/clang', 'bin/clang++', 'lib/libclang.so', 'lib/clang/3.2/include/stddef.h'],
+    'files': ['bin/clang', 'bin/clang++', 'lib/libclang.%s' % SHLIB_EXT, 'lib/clang/3.2/include/stddef.h'],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/c/Clang/Clang-3.6.0-GCC-4.9.2.eb b/easybuild/easyconfigs/c/Clang/Clang-3.6.0-GCC-4.9.2.eb
index 40f0a86d6f88f57be99c3c2828537ba9a17af9c6..9d5881c5250a6cf474e9d06fc8a84adf17e36483 100644
--- a/easybuild/easyconfigs/c/Clang/Clang-3.6.0-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/c/Clang/Clang-3.6.0-GCC-4.9.2.eb
@@ -32,7 +32,7 @@ sources = [
 dependencies = [
     ('GMP', '6.0.0a'),
     ('ISL', '0.14'),
-] 
+]
 
 builddependencies = [
     ('CMake', '3.1.3'),
diff --git a/easybuild/easyconfigs/c/Clang/Clang-3.6.1-GCC-4.9.2.eb b/easybuild/easyconfigs/c/Clang/Clang-3.6.1-GCC-4.9.2.eb
index 966759d71cd17ea26dc4cf0cbe3336c20850e610..bb31f282f683df73565a76cf2571cf135fbcbf05 100644
--- a/easybuild/easyconfigs/c/Clang/Clang-3.6.1-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/c/Clang/Clang-3.6.1-GCC-4.9.2.eb
@@ -32,7 +32,7 @@ sources = [
 dependencies = [
     ('GMP', '6.0.0a'),
     ('ISL', '0.14'),
-] 
+]
 
 builddependencies = [
     ('CMake', '3.2.1'),
diff --git a/easybuild/easyconfigs/c/Clang/Clang-3.7.0-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/c/Clang/Clang-3.7.0-GNU-4.9.3-2.25.eb
index 94e343f08b410161bfe14f997105b486c32c22f1..a76712524b49bcd774a310ab13baf91ea92b1b9d 100644
--- a/easybuild/easyconfigs/c/Clang/Clang-3.7.0-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/c/Clang/Clang-3.7.0-GNU-4.9.3-2.25.eb
@@ -32,7 +32,7 @@ sources = [
 dependencies = [
     ('GMP', '6.0.0a'),
     ('ISL', '0.15'),
-] 
+]
 
 builddependencies = [
     ('CMake', '3.3.2'),
diff --git a/easybuild/easyconfigs/c/Clang/Clang-3.7.1-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/c/Clang/Clang-3.7.1-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ee437ef2f241e6a2657428b6386a029e70682ebc
--- /dev/null
+++ b/easybuild/easyconfigs/c/Clang/Clang-3.7.1-GCC-4.9.3-2.25.eb
@@ -0,0 +1,49 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2013-2015 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.7.1"
+
+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.9.3-2.25'}
+# 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.xz",
+    "cfe-%(version)s.src.tar.xz",
+    "compiler-rt-%(version)s.src.tar.xz",
+    "polly-%(version)s.src.tar.xz",
+]
+
+dependencies = [
+    ('GMP', '6.1.0'),
+    ('ISL', '0.15'),
+]
+
+builddependencies = [
+    ('CMake', '3.4.1', '', ('GCCcore', '4.9.3')),
+    ('Python', '2.7.10', '-bare'),
+    ('libxml2', '2.9.2'),
+]
+
+assertions = True
+
+usepolly = True
+
+build_targets = ['X86']
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/c/Clustal-Omega/Clustal-Omega-1.2.0-foss-2015b.eb b/easybuild/easyconfigs/c/Clustal-Omega/Clustal-Omega-1.2.0-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2ddcf2b93a966536e58d0f3b66580713a020d497
--- /dev/null
+++ b/easybuild/easyconfigs/c/Clustal-Omega/Clustal-Omega-1.2.0-foss-2015b.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
+
+easyblock = 'ConfigureMake'
+
+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': 'foss', 'version': '2015b'}
+
+source_urls = [homepage]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('argtable', '2.13')]
+
+sanity_check_paths = {
+    'files': ['bin/clustalo'],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/c/ClustalW2/ClustalW2-2.1-foss-2015b.eb b/easybuild/easyconfigs/c/ClustalW2/ClustalW2-2.1-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2c61c0adb7d81a9fce6ab562c6cda4ce996f6d3a
--- /dev/null
+++ b/easybuild/easyconfigs/c/ClustalW2/ClustalW2-2.1-foss-2015b.eb
@@ -0,0 +1,32 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Cedric Laczny <cedric.laczny@uni.lu>, Fotis Georgatos <fotis@cern.ch>
+# 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 = 'ConfigureMake'
+
+name = 'ClustalW2'
+version = '2.1'
+
+homepage = 'http://www.ebi.ac.uk/Tools/msa/clustalw2/'
+description = """ClustalW2 is a general purpose multiple sequence alignment program for DNA or proteins."""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['http://www.clustal.org/download/%(version)s']
+sources = ['clustalw-%(version)s.tar.gz']
+
+sanity_check_paths = {
+    'files': ['bin/clustalw2'],
+    'dirs': []
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/c/CppUnit/CppUnit-1.12.1-intel-2015b.eb b/easybuild/easyconfigs/c/CppUnit/CppUnit-1.12.1-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1039b8eda37a1874b2b261de00bd66a23b734ea2
--- /dev/null
+++ b/easybuild/easyconfigs/c/CppUnit/CppUnit-1.12.1-intel-2015b.eb
@@ -0,0 +1,19 @@
+easyblock = 'ConfigureMake'
+
+name = 'CppUnit'
+version = '1.12.1'
+
+homepage = 'http://sourceforge.net/projects/cppunit/'
+description = """CppUnit is the C++ port of the famous JUnit framework for unit testing."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ['lib/libcppunit.a', 'lib/libcppunit.%s' % SHLIB_EXT, 'lib/pkgconfig/cppunit.pc'],
+    'dirs': ['bin', 'include/cppunit', 'share'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/c/CrayCCE/CrayCCE-2015.06-XC.eb b/easybuild/easyconfigs/c/CrayCCE/CrayCCE-2015.06-XC.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c35ce0b32e7db94f7797e97a6930a2a30c2843a3
--- /dev/null
+++ b/easybuild/easyconfigs/c/CrayCCE/CrayCCE-2015.06-XC.eb
@@ -0,0 +1,20 @@
+easyblock = 'CrayToolchain'
+
+name = 'CrayCCE'
+version = '2015.06-XC'
+
+homepage = 'http://docs.cray.com/books/S-9407-1511'
+description = """Toolchain using Cray compiler wrapper, using PrgEnv-gnu module (PE release: November 2015).\n"""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+dependencies = [
+    ('PrgEnv-cray/5.2.40', EXTERNAL_MODULE),
+    ('cce/8.3.12', EXTERNAL_MODULE),
+    ('craype/2.4.0', EXTERNAL_MODULE),
+    ('cray-libsci/13.0.4', EXTERNAL_MODULE),
+    ('cray-mpich/7.2.2', EXTERNAL_MODULE),
+    ('fftw/3.3.4.3', EXTERNAL_MODULE),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/c/CrayCCE/CrayCCE-2015.11-XC.eb b/easybuild/easyconfigs/c/CrayCCE/CrayCCE-2015.11-XC.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3433ca305dc4fe414a742f9938ecdb1da312e3e2
--- /dev/null
+++ b/easybuild/easyconfigs/c/CrayCCE/CrayCCE-2015.11-XC.eb
@@ -0,0 +1,20 @@
+easyblock = 'CrayToolchain'
+
+name = 'CrayCCE'
+version = '2015.11-XC'
+
+homepage = 'http://docs.cray.com/books/S-9407-1511'
+description = """Toolchain using Cray compiler wrapper, using PrgEnv-gnu module (PE release: November 2015).\n"""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+dependencies = [
+    ('PrgEnv-cray/5.2.82', EXTERNAL_MODULE),
+    ('cce/8.4.1', EXTERNAL_MODULE),
+    ('craype/2.4.2', EXTERNAL_MODULE),
+    ('cray-libsci/13.2.0', EXTERNAL_MODULE),
+    ('cray-mpich/7.2.6', EXTERNAL_MODULE),
+    ('fftw/3.3.4.5', EXTERNAL_MODULE),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/c/CrayGNU/CrayGNU-2015.06-XC.eb b/easybuild/easyconfigs/c/CrayGNU/CrayGNU-2015.06-XC.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f804d0e859858f83e0ec0b7883a58372b2547aa4
--- /dev/null
+++ b/easybuild/easyconfigs/c/CrayGNU/CrayGNU-2015.06-XC.eb
@@ -0,0 +1,20 @@
+easyblock = 'CrayToolchain'
+
+name = 'CrayGNU'
+version = '2015.06-XC'
+
+homepage = 'http://docs.cray.com/books/S-9407-1506'
+description = """Toolchain using Cray compiler wrapper, using PrgEnv-gnu module (PE release: June 2015).\n"""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+dependencies = [
+    ('PrgEnv-gnu/5.2.40', EXTERNAL_MODULE),
+    ('gcc/4.8.2', EXTERNAL_MODULE),
+    ('craype/2.4.0', EXTERNAL_MODULE),
+    ('cray-libsci/13.0.4', EXTERNAL_MODULE),
+    ('cray-mpich/7.2.2', EXTERNAL_MODULE),
+    ('fftw/3.3.4.3', EXTERNAL_MODULE),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/c/CrayGNU/CrayGNU-2015.11-XC.eb b/easybuild/easyconfigs/c/CrayGNU/CrayGNU-2015.11-XC.eb
new file mode 100644
index 0000000000000000000000000000000000000000..15eb5087e5368cf581aec2eb790a4eb27309c7b2
--- /dev/null
+++ b/easybuild/easyconfigs/c/CrayGNU/CrayGNU-2015.11-XC.eb
@@ -0,0 +1,20 @@
+easyblock = 'CrayToolchain'
+
+name = 'CrayGNU'
+version = '2015.11-XC'
+
+homepage = 'http://docs.cray.com/books/S-9407-1511'
+description = """Toolchain using Cray compiler wrapper, using PrgEnv-gnu module (PE release: November 2015).\n"""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+dependencies = [
+    ('PrgEnv-gnu/5.2.82', EXTERNAL_MODULE),
+    ('gcc/4.9.3', EXTERNAL_MODULE),
+    ('craype/2.4.2', EXTERNAL_MODULE),
+    ('cray-libsci/13.2.0', EXTERNAL_MODULE),
+    ('cray-mpich/7.2.6', EXTERNAL_MODULE),
+    ('fftw/3.3.4.5', EXTERNAL_MODULE),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/c/CrayIntel/CrayIntel-2015.06-XC.eb b/easybuild/easyconfigs/c/CrayIntel/CrayIntel-2015.06-XC.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5ee5f118a34c1fdc94400693e7963b34f4dfe09e
--- /dev/null
+++ b/easybuild/easyconfigs/c/CrayIntel/CrayIntel-2015.06-XC.eb
@@ -0,0 +1,20 @@
+easyblock = 'CrayToolchain'
+
+name = 'CrayIntel'
+version = '2015.06-XC'
+
+homepage = 'http://docs.cray.com/books/S-9407-1511'
+description = """Toolchain using Cray compiler wrapper, using PrgEnv-gnu module (PE release: November 2015).\n"""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+dependencies = [
+    ('PrgEnv-intel/5.2.82', EXTERNAL_MODULE),
+    ('intel/15.0.1.133', EXTERNAL_MODULE),
+    ('craype/2.4.0', EXTERNAL_MODULE),
+    ('cray-libsci/13.0.4', EXTERNAL_MODULE),
+    ('cray-mpich/7.2.2', EXTERNAL_MODULE),
+    ('fftw/3.3.4.3', EXTERNAL_MODULE),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/c/CrayIntel/CrayIntel-2015.11-XC.eb b/easybuild/easyconfigs/c/CrayIntel/CrayIntel-2015.11-XC.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7846b2d7c54b12f64109a7284c5d9f6b8e67eb68
--- /dev/null
+++ b/easybuild/easyconfigs/c/CrayIntel/CrayIntel-2015.11-XC.eb
@@ -0,0 +1,20 @@
+easyblock = 'CrayToolchain'
+
+name = 'CrayIntel'
+version = '2015.11-XC'
+
+homepage = 'http://docs.cray.com/books/S-9407-1511'
+description = """Toolchain using Cray compiler wrapper, using PrgEnv-gnu module (PE release: November 2015).\n"""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+dependencies = [
+    ('PrgEnv-intel/5.2.82', EXTERNAL_MODULE),
+    ('intel/15.0.1.133', EXTERNAL_MODULE),
+    ('craype/2.4.2', EXTERNAL_MODULE),
+    ('cray-libsci/13.2.0', EXTERNAL_MODULE),
+    ('cray-mpich/7.2.6', EXTERNAL_MODULE),
+    ('fftw/3.3.4.5', EXTERNAL_MODULE),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/c/Cube/Cube-4.2-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/c/Cube/Cube-4.2-gompi-1.4.12-no-OFED.eb
index 7159c84d00340784eaee2a3197754cf914269110..5cb3746c74c2691ad084117be085bee3f3ecc1fd 100644
--- a/easybuild/easyconfigs/c/Cube/Cube-4.2-gompi-1.4.12-no-OFED.eb
+++ b/easybuild/easyconfigs/c/Cube/Cube-4.2-gompi-1.4.12-no-OFED.eb
@@ -48,7 +48,7 @@ dependencies = [('Qt', '4.8.4')]
 configopts = "--without-java-reader"
 
 sanity_check_paths = {
-    'files': ["bin/cube", ("lib/libcube4.a", "lib64/libcube4.a"), ("lib/libcube4.so", "lib64/libcube4.so")],
+    'files': ["bin/cube", ("lib/libcube4.a", "lib64/libcube4.a"), ("lib/libcube4.%s" % SHLIB_EXT, "lib64/libcube4.%s" % SHLIB_EXT)],
     'dirs': ["include/cube", "include/cubew"],
 }
 
diff --git a/easybuild/easyconfigs/c/Cube/Cube-4.2.3-goolf-1.5.14.eb b/easybuild/easyconfigs/c/Cube/Cube-4.2.3-goolf-1.5.14.eb
index 7bda257ed231f7102fd0103e87be93c729b84284..67d71a581b0d00695c98e5d3d6db911245c05b4b 100644
--- a/easybuild/easyconfigs/c/Cube/Cube-4.2.3-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/c/Cube/Cube-4.2.3-goolf-1.5.14.eb
@@ -34,7 +34,7 @@ dependencies = [('Qt', '4.8.4')]
 configopts = "--without-java-reader"
 
 sanity_check_paths = {
-    'files': ["bin/cube", ("lib/libcube4.a", "lib64/libcube4.a"), ("lib/libcube4.so", "lib64/libcube4.so")],
+    'files': ["bin/cube", ("lib/libcube4.a", "lib64/libcube4.a"), ("lib/libcube4.%s" % SHLIB_EXT, "lib64/libcube4.%s" % SHLIB_EXT)],
     'dirs': ["include/cube", "include/cubew"],
 }
 
diff --git a/easybuild/easyconfigs/c/Cube/Cube-4.3-foss-2015a.eb b/easybuild/easyconfigs/c/Cube/Cube-4.3-foss-2015a.eb
index 01eebc5f7e4e2b066bf6550339be1282e465b6a3..fb1b773cd43fcb5db7b3d5de88095f62a2d13ec5 100644
--- a/easybuild/easyconfigs/c/Cube/Cube-4.3-foss-2015a.eb
+++ b/easybuild/easyconfigs/c/Cube/Cube-4.3-foss-2015a.eb
@@ -40,7 +40,7 @@ dependencies = [('Qt', '4.8.6')]
 configopts = "--without-java-reader"
 
 sanity_check_paths = {
-    'files': ["bin/cube", ("lib/libcube4.a", "lib64/libcube4.a"), ("lib/libcube4.so", "lib64/libcube4.so")],
+    'files': ["bin/cube", ("lib/libcube4.a", "lib64/libcube4.a"), ("lib/libcube4.%s" % SHLIB_EXT, "lib64/libcube4.%s" % SHLIB_EXT)],
     'dirs': ["include/cube", "include/cubew"],
 }
 
diff --git a/easybuild/easyconfigs/c/Cube/Cube-4.3-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/c/Cube/Cube-4.3-gompi-1.4.12-no-OFED.eb
index 560d4ea5c5f8d46862c8791dac23921bc8db5a36..27232c720ca1451114a449ce6043e22099e8c966 100644
--- a/easybuild/easyconfigs/c/Cube/Cube-4.3-gompi-1.4.12-no-OFED.eb
+++ b/easybuild/easyconfigs/c/Cube/Cube-4.3-gompi-1.4.12-no-OFED.eb
@@ -40,7 +40,7 @@ dependencies = [('Qt', '4.8.4')]
 configopts = "--without-java-reader"
 
 sanity_check_paths = {
-    'files': ["bin/cube", ("lib/libcube4.a", "lib64/libcube4.a"), ("lib/libcube4.so", "lib64/libcube4.so")],
+    'files': ["bin/cube", ("lib/libcube4.a", "lib64/libcube4.a"), ("lib/libcube4.%s" % SHLIB_EXT, "lib64/libcube4.%s" % SHLIB_EXT)],
     'dirs': ["include/cube", "include/cubew"],
 }
 
diff --git a/easybuild/easyconfigs/c/Cube/Cube-4.3.2-foss-2015a.eb b/easybuild/easyconfigs/c/Cube/Cube-4.3.2-foss-2015a.eb
index b12da485bc27115bfdf88a5ff755a1ec5abae1e0..c04c268ec15470fcc519f1e76a2986ee6286e88b 100644
--- a/easybuild/easyconfigs/c/Cube/Cube-4.3.2-foss-2015a.eb
+++ b/easybuild/easyconfigs/c/Cube/Cube-4.3.2-foss-2015a.eb
@@ -34,7 +34,7 @@ checksums = [
 dependencies = [('Qt', '4.8.6')]
 
 sanity_check_paths = {
-    'files': ["bin/cube", ("lib/libcube4.a", "lib64/libcube4.a"), ("lib/libcube4.so", "lib64/libcube4.so")],
+    'files': ["bin/cube", ("lib/libcube4.a", "lib64/libcube4.a"), ("lib/libcube4.%s" % SHLIB_EXT, "lib64/libcube4.%s" % SHLIB_EXT)],
     'dirs': ["include/cube", "include/cubew"],
 }
 
diff --git a/easybuild/easyconfigs/c/Cufflinks/Cufflinks-1.3.0-goolf-1.4.10.eb b/easybuild/easyconfigs/c/Cufflinks/Cufflinks-1.3.0-goolf-1.4.10.eb
index 95405d7ce3a3d4b8d19b2ba14805dba3fbecbab0..501824903b421ad611701a06a6531280b6c7dfe4 100644
--- a/easybuild/easyconfigs/c/Cufflinks/Cufflinks-1.3.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/c/Cufflinks/Cufflinks-1.3.0-goolf-1.4.10.eb
@@ -11,7 +11,7 @@
 ##
 
 name = 'Cufflinks'
-version = "1.3.0" 
+version = "1.3.0"
 
 homepage = 'http://cole-trapnell-lab.github.io/cufflinks/'
 description = """Transcript assembly, differential expression, and differential regulation for RNA-Seq"""
@@ -30,7 +30,7 @@ dependencies = [
 ]
 
 patches = [
-    'Cufflinks_GCC-4.7.patch', 
+    'Cufflinks_GCC-4.7.patch',
     'cufflinks-1.x-ldflags.patch'
 ]
 
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.27.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/c/cURL/cURL-7.27.0-goalf-1.1.0-no-OFED.eb
index d19a93b8f72527079cc26dad8b5d6d014fdb8f88..ac4a33148af36b98f1a27fa8c7316c6c5264fbc4 100644
--- a/easybuild/easyconfigs/c/cURL/cURL-7.27.0-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.27.0-goalf-1.1.0-no-OFED.eb
@@ -21,7 +21,7 @@ dependencies = [('OpenSSL', '1.0.1f')]
 configopts = "--with-ssl=$EBROOTOPENSSL"
 
 sanity_check_paths = {
-    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.27.0-goolf-1.4.10.eb b/easybuild/easyconfigs/c/cURL/cURL-7.27.0-goolf-1.4.10.eb
index 308d2908fddce51e6f02483ca4e95d4ffcc0d027..c54c318c31dc79ae47b4ddf0bafa6d8039419a47 100644
--- a/easybuild/easyconfigs/c/cURL/cURL-7.27.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.27.0-goolf-1.4.10.eb
@@ -21,7 +21,7 @@ dependencies = [('OpenSSL', '1.0.1f')]
 configopts = "--with-ssl=$EBROOTOPENSSL"
 
 sanity_check_paths = {
-    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.27.0-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/c/cURL/cURL-7.27.0-ictce-3.2.2.u3.eb
index 08677ae0d02b6c473bd06315a5b4ce028f5810cd..ac0452b2e2e50ecc9962903570bee550b02bd9f4 100644
--- a/easybuild/easyconfigs/c/cURL/cURL-7.27.0-ictce-3.2.2.u3.eb
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.27.0-ictce-3.2.2.u3.eb
@@ -21,7 +21,7 @@ dependencies = [('OpenSSL', '1.0.1f')]
 configopts = "--with-ssl=$EBROOTOPENSSL"
 
 sanity_check_paths = {
-    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
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
index 22ed00385f32287c7eab50b12fd3639154d6ea5b..ae3721cd9eef93517c8a7db0aa6e0068fddbfa48 100644
--- 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
@@ -21,7 +21,7 @@ dependencies = [('OpenSSL', '1.0.1f')]
 configopts = "--with-ssl=$EBROOTOPENSSL"
 
 sanity_check_paths = {
-    'files': ["bin/curl", "lib/libcurl.a", "lib/libcurl.so"],
+    'files': ["bin/curl", "lib/libcurl.a", "lib/libcurl.%s" % SHLIB_EXT],
     'dirs': ["lib/pkgconfig"],
 }
 
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.27.0-ictce-5.3.0.eb b/easybuild/easyconfigs/c/cURL/cURL-7.27.0-ictce-5.3.0.eb
index f0fe3d92ae56861ddc3758693c80ea8642dcff84..c76a4c33d25845657cd00216f3d84779adbd21ab 100644
--- a/easybuild/easyconfigs/c/cURL/cURL-7.27.0-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.27.0-ictce-5.3.0.eb
@@ -21,7 +21,7 @@ dependencies = [('OpenSSL', '1.0.1f')]
 configopts = "--with-ssl=$EBROOTOPENSSL"
 
 sanity_check_paths = {
-    'files': ["bin/curl", "lib/libcurl.a", "lib/libcurl.so"],
+    'files': ["bin/curl", "lib/libcurl.a", "lib/libcurl.%s" % SHLIB_EXT],
     'dirs': ["lib/pkgconfig"],
 }
 
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
index aa170c9bf2fc00f22477a2602141fea0f956ed77..b12d1f0079eafe5ea7296393de579c1785a377fa 100644
--- 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
@@ -21,7 +21,7 @@ dependencies = [('OpenSSL', '1.0.1f')]
 configopts = "--with-ssl=$EBROOTOPENSSL"
 
 sanity_check_paths = {
-    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
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
index 2cbb5547123128d12b5b4b4b9c0fa8948ce89ef8..74e6839e575b6e87ed2310650fdf38a1808a661e 100644
--- 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
@@ -21,7 +21,7 @@ dependencies = [('OpenSSL', '1.0.1f')]
 configopts = "--with-ssl=$EBROOTOPENSSL"
 
 sanity_check_paths = {
-    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.28.1-iqacml-3.7.3.eb b/easybuild/easyconfigs/c/cURL/cURL-7.28.1-iqacml-3.7.3.eb
index 549dfa692ae5583b8d81f8415cdde8ba76d6b577..09cdce4817dbb7c90d47610d879c5a34fdfc157c 100644
--- a/easybuild/easyconfigs/c/cURL/cURL-7.28.1-iqacml-3.7.3.eb
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.28.1-iqacml-3.7.3.eb
@@ -21,7 +21,7 @@ dependencies = [('OpenSSL', '1.0.1f')]
 configopts = "--with-ssl=$EBROOTOPENSSL"
 
 sanity_check_paths = {
-    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.29.0-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/c/cURL/cURL-7.29.0-cgmpolf-1.1.6.eb
index 4d7a07a71f59e9e4fae7075af2178c435d98d424..771aeabd5efa5ff833b5d45599aa8056be9b19c9 100644
--- a/easybuild/easyconfigs/c/cURL/cURL-7.29.0-cgmpolf-1.1.6.eb
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.29.0-cgmpolf-1.1.6.eb
@@ -21,7 +21,7 @@ dependencies = [('OpenSSL', '1.0.1f')]
 configopts = "--with-ssl=$EBROOTOPENSSL"
 
 sanity_check_paths = {
-    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.29.0-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/c/cURL/cURL-7.29.0-cgmvolf-1.1.12rc1.eb
index d9c35ea662745f61f492b0a289a5d183e3b66f3b..698e03bfee80c2566ba3d7846f2475150fffdedb 100644
--- a/easybuild/easyconfigs/c/cURL/cURL-7.29.0-cgmvolf-1.1.12rc1.eb
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.29.0-cgmvolf-1.1.12rc1.eb
@@ -21,7 +21,7 @@ dependencies = [('OpenSSL', '1.0.1f')]
 configopts = "--with-ssl=$EBROOTOPENSSL"
 
 sanity_check_paths = {
-    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.29.0-cgmvolf-1.2.7.eb b/easybuild/easyconfigs/c/cURL/cURL-7.29.0-cgmvolf-1.2.7.eb
index b5148412f3b53d3106326911de7ee78ea6641f44..0abe7ca465e4cefe8c0996d947632ea927286a6c 100644
--- a/easybuild/easyconfigs/c/cURL/cURL-7.29.0-cgmvolf-1.2.7.eb
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.29.0-cgmvolf-1.2.7.eb
@@ -21,7 +21,7 @@ dependencies = [('OpenSSL', '1.0.1f')]
 configopts = "--with-ssl=$EBROOTOPENSSL"
 
 sanity_check_paths = {
-    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.29.0-cgoolf-1.1.7.eb b/easybuild/easyconfigs/c/cURL/cURL-7.29.0-cgoolf-1.1.7.eb
index 5062e4abe854fceb42a816b210c2f320a58e3970..79f8d750265867c3154ae612c2577c0c1e9fe0cd 100644
--- a/easybuild/easyconfigs/c/cURL/cURL-7.29.0-cgoolf-1.1.7.eb
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.29.0-cgoolf-1.1.7.eb
@@ -21,7 +21,7 @@ dependencies = [('OpenSSL', '1.0.1f')]
 configopts = "--with-ssl=$EBROOTOPENSSL"
 
 sanity_check_paths = {
-    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.29.0-gmvolf-1.7.12.eb b/easybuild/easyconfigs/c/cURL/cURL-7.29.0-gmvolf-1.7.12.eb
index 63311d78498ca78f8ae28784bb01748434052b60..8462cbf28ed7dce6951f4052ab6c650d3bb9d294 100644
--- a/easybuild/easyconfigs/c/cURL/cURL-7.29.0-gmvolf-1.7.12.eb
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.29.0-gmvolf-1.7.12.eb
@@ -21,7 +21,7 @@ dependencies = [('OpenSSL', '1.0.1f')]
 configopts = "--with-ssl=$EBROOTOPENSSL"
 
 sanity_check_paths = {
-    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.29.0-gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/c/cURL/cURL-7.29.0-gmvolf-1.7.12rc1.eb
index 070c2757094ad12232722484e841971a4b104fda..223f2b4428a099232bcf2e112a8c5e2dde90f861 100644
--- a/easybuild/easyconfigs/c/cURL/cURL-7.29.0-gmvolf-1.7.12rc1.eb
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.29.0-gmvolf-1.7.12rc1.eb
@@ -21,7 +21,7 @@ dependencies = [('OpenSSL', '1.0.1f')]
 configopts = "--with-ssl=$EBROOTOPENSSL"
 
 sanity_check_paths = {
-    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.29.0-goolf-1.4.10.eb b/easybuild/easyconfigs/c/cURL/cURL-7.29.0-goolf-1.4.10.eb
index cb387db31b0a6c3285c234e3d82c1361c5044685..307fbc0b46a1eda60f9b3ba61f93523a01162451 100644
--- a/easybuild/easyconfigs/c/cURL/cURL-7.29.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.29.0-goolf-1.4.10.eb
@@ -21,7 +21,7 @@ dependencies = [('OpenSSL', '1.0.1f')]
 configopts = "--with-ssl=$EBROOTOPENSSL"
 
 sanity_check_paths = {
-    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.33.0-GCC-4.8.2.eb b/easybuild/easyconfigs/c/cURL/cURL-7.33.0-GCC-4.8.2.eb
index 698a9cde210943ba9646fcb335f7d5d8b84e6220..3a95cb2ff70834a0adddf606da7d8ad3eefb7b94 100644
--- a/easybuild/easyconfigs/c/cURL/cURL-7.33.0-GCC-4.8.2.eb
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.33.0-GCC-4.8.2.eb
@@ -21,7 +21,7 @@ dependencies = [('OpenSSL', '1.0.1f')]
 configopts = "--with-ssl=$EBROOTOPENSSL"
 
 sanity_check_paths = {
-    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
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
index ce886810a7e9fbd091cefc46d564fdeb164716b7..237b0c17fd5261c97c580e3e1ddb22500d0dda4e 100644
--- 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
@@ -21,7 +21,7 @@ dependencies = [('OpenSSL', '1.0.1f')]
 configopts = "--with-ssl=$EBROOTOPENSSL"
 
 sanity_check_paths = {
-    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.34.0-GCC-4.8.2.eb b/easybuild/easyconfigs/c/cURL/cURL-7.34.0-GCC-4.8.2.eb
index 34d5cc05141dbb046d666d269b76e5621138b1d1..9835e5582ae1419cc9688040c941cc674124e057 100644
--- a/easybuild/easyconfigs/c/cURL/cURL-7.34.0-GCC-4.8.2.eb
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.34.0-GCC-4.8.2.eb
@@ -21,7 +21,7 @@ dependencies = [('OpenSSL', '1.0.1f')]
 configopts = "--with-ssl=$EBROOTOPENSSL"
 
 sanity_check_paths = {
-    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.34.0-ictce-5.4.0.eb b/easybuild/easyconfigs/c/cURL/cURL-7.34.0-ictce-5.4.0.eb
index 5de32247736386b521bd7c396f1fb2dcbf0461de..b4f8554c2a976bca29c0a097bded50a8caf5b840 100644
--- a/easybuild/easyconfigs/c/cURL/cURL-7.34.0-ictce-5.4.0.eb
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.34.0-ictce-5.4.0.eb
@@ -21,7 +21,7 @@ dependencies = [('OpenSSL', '1.0.1f')]
 configopts = "--with-ssl=$EBROOTOPENSSL"
 
 sanity_check_paths = {
-    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
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
index c2ed6dbc333839dc41a497caeee6f446a6d76a95..5e5a9834c565449563d4124c5a75d37e86ab93ae 100644
--- 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
@@ -21,7 +21,7 @@ dependencies = [('OpenSSL', '1.0.1f')]
 configopts = "--with-ssl=$EBROOTOPENSSL"
 
 sanity_check_paths = {
-    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.37.1-foss-2014b.eb b/easybuild/easyconfigs/c/cURL/cURL-7.37.1-foss-2014b.eb
index 00fec4f4d114791d69d862e922f383318da66298..980fd8a13c40c8e7bdf8667b2947071d1ffcaf2c 100644
--- a/easybuild/easyconfigs/c/cURL/cURL-7.37.1-foss-2014b.eb
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.37.1-foss-2014b.eb
@@ -20,7 +20,7 @@ source_urls = ['http://curl.haxx.se/download/']
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
 
 sanity_check_paths = {
-    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.37.1-foss-2015a.eb b/easybuild/easyconfigs/c/cURL/cURL-7.37.1-foss-2015a.eb
index 0ba45ba9e526d5225207c829ef7370ea107cc2fe..fcbb0636e8c1ede344ef23413f38278c399d8d2a 100644
--- a/easybuild/easyconfigs/c/cURL/cURL-7.37.1-foss-2015a.eb
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.37.1-foss-2015a.eb
@@ -20,7 +20,7 @@ source_urls = ['http://curl.haxx.se/download/']
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
 
 sanity_check_paths = {
-    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.37.1-intel-2014b.eb b/easybuild/easyconfigs/c/cURL/cURL-7.37.1-intel-2014b.eb
index 90466f7075df483df658fa90d88b9e1d34914b63..dfe1f4cd864c23ee10e0a8d3506fa97afa390ce3 100644
--- a/easybuild/easyconfigs/c/cURL/cURL-7.37.1-intel-2014b.eb
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.37.1-intel-2014b.eb
@@ -20,7 +20,7 @@ source_urls = ['http://curl.haxx.se/download/']
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
 
 sanity_check_paths = {
-    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.37.1-intel-2015a.eb b/easybuild/easyconfigs/c/cURL/cURL-7.37.1-intel-2015a.eb
index 82fe8da72af928a5ea2e7574b4e24a24ce9ee49e..5e1e3ebad8b461ba1b9507a3a1deabe5d0e882d3 100644
--- a/easybuild/easyconfigs/c/cURL/cURL-7.37.1-intel-2015a.eb
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.37.1-intel-2015a.eb
@@ -20,7 +20,7 @@ source_urls = ['http://curl.haxx.se/download/']
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
 
 sanity_check_paths = {
-    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.40.0-GCC-4.9.2.eb b/easybuild/easyconfigs/c/cURL/cURL-7.40.0-GCC-4.9.2.eb
index c62cc4830742b987d0ff57af5dd2b9f3f0f6a002..ecb2365eff6faa778b4ad5174403d8b37e386d51 100644
--- a/easybuild/easyconfigs/c/cURL/cURL-7.40.0-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.40.0-GCC-4.9.2.eb
@@ -23,7 +23,7 @@ osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
 # configopts = "--with-ssl=$EBROOTOPENSSL"
 
 sanity_check_paths = {
-    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.40.0-foss-2015a.eb b/easybuild/easyconfigs/c/cURL/cURL-7.40.0-foss-2015a.eb
index f28780066aad21fca969d09fe9e94a0f631b10f0..56b0b57ed69fcb1716287f30d5ffffd2162b6500 100644
--- a/easybuild/easyconfigs/c/cURL/cURL-7.40.0-foss-2015a.eb
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.40.0-foss-2015a.eb
@@ -19,7 +19,7 @@ source_urls = ['http://curl.haxx.se/download/']
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
 
 sanity_check_paths = {
-    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.40.0-intel-2015a.eb b/easybuild/easyconfigs/c/cURL/cURL-7.40.0-intel-2015a.eb
index c9c8c7db481c4902ec5145fceae3635830c250b5..456fa99decd742c6507135d922079e40a8dc5e97 100644
--- a/easybuild/easyconfigs/c/cURL/cURL-7.40.0-intel-2015a.eb
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.40.0-intel-2015a.eb
@@ -23,7 +23,7 @@ osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
 # configopts = "--with-ssl=$EBROOTOPENSSL"
 
 sanity_check_paths = {
-    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.41.0-intel-2015a.eb b/easybuild/easyconfigs/c/cURL/cURL-7.41.0-intel-2015a.eb
index 4e2d371a7115bb7b09002e94202bb5e4b25b5d83..6b26369841e2b739f8e0c68fad80b9f4d1f7be03 100644
--- a/easybuild/easyconfigs/c/cURL/cURL-7.41.0-intel-2015a.eb
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.41.0-intel-2015a.eb
@@ -22,7 +22,7 @@ osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
 # configopts = "--with-ssl=$EBROOTOPENSSL"
 
 sanity_check_paths = {
-    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.43.0-foss-2015b.eb b/easybuild/easyconfigs/c/cURL/cURL-7.43.0-foss-2015b.eb
index 00dbb79c54a156842fd56050e9f241b6149484ca..8268a960ae5c5fb103092f0e85b2c1e547d4ac11 100644
--- a/easybuild/easyconfigs/c/cURL/cURL-7.43.0-foss-2015b.eb
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.43.0-foss-2015b.eb
@@ -24,7 +24,7 @@ osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
 modextravars = {'CURL_INCLUDES': '%(installdir)s/include'}
 
 sanity_check_paths = {
-    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.43.0-goolf-1.7.20.eb b/easybuild/easyconfigs/c/cURL/cURL-7.43.0-goolf-1.7.20.eb
index f234e4353beecca8317a4b449ac9acf73058faa0..4d9fde4e6a17f274c599c895e208c89e25bab3dd 100644
--- a/easybuild/easyconfigs/c/cURL/cURL-7.43.0-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.43.0-goolf-1.7.20.eb
@@ -24,7 +24,7 @@ osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
 modextravars = {'CURL_INCLUDES': '%(installdir)s/include'}
 
 sanity_check_paths = {
-    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.43.0-intel-2015a.eb b/easybuild/easyconfigs/c/cURL/cURL-7.43.0-intel-2015a.eb
index 2dbc140a53cfcaf4bd3a95d2086a8db91ac8c739..e923765cebfe43d8d6ad75ea611ca85a772e6508 100644
--- a/easybuild/easyconfigs/c/cURL/cURL-7.43.0-intel-2015a.eb
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.43.0-intel-2015a.eb
@@ -24,7 +24,7 @@ osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
 modextravars = {'CURL_INCLUDES': '%(installdir)s/include'}
 
 sanity_check_paths = {
-    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.43.0-intel-2015b.eb b/easybuild/easyconfigs/c/cURL/cURL-7.43.0-intel-2015b.eb
index 853014d95e13db0bbb18c3aa49ef28d86eae9bf4..8f64671269f40f75b9b4b6601502fb4c3c4cb954 100644
--- a/easybuild/easyconfigs/c/cURL/cURL-7.43.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.43.0-intel-2015b.eb
@@ -24,7 +24,7 @@ osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
 modextravars = {'CURL_INCLUDES': '%(installdir)s/include'}
 
 sanity_check_paths = {
-    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.44.0-foss-2015a.eb b/easybuild/easyconfigs/c/cURL/cURL-7.44.0-foss-2015a.eb
index 19e23c5058fef104d68809ba6b6bd80c6a7086ee..494501aa00819a05a4bef2fe6a92bb0a1f5ed2a9 100644
--- a/easybuild/easyconfigs/c/cURL/cURL-7.44.0-foss-2015a.eb
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.44.0-foss-2015a.eb
@@ -24,7 +24,7 @@ osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
 modextravars = {'CURL_INCLUDES': '%(installdir)s/include'}
 
 sanity_check_paths = {
-    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.44.0-goolf-1.7.20.eb b/easybuild/easyconfigs/c/cURL/cURL-7.44.0-goolf-1.7.20.eb
index 22021b62b570cbc306a2197f8fb73ee55c1806ff..ea4746a629df138dd5482c9a027f46d6a2bee875 100644
--- a/easybuild/easyconfigs/c/cURL/cURL-7.44.0-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.44.0-goolf-1.7.20.eb
@@ -24,7 +24,7 @@ osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
 modextravars = {'CURL_INCLUDES': '%(installdir)s/include'}
 
 sanity_check_paths = {
-    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.44.0-intel-2015a.eb b/easybuild/easyconfigs/c/cURL/cURL-7.44.0-intel-2015a.eb
index 4957904abe55186754cbeea4423fe5d53ece532b..07fc16413e70c855180130fef7f9a53aef8ff313 100644
--- a/easybuild/easyconfigs/c/cURL/cURL-7.44.0-intel-2015a.eb
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.44.0-intel-2015a.eb
@@ -24,7 +24,7 @@ osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
 modextravars = {'CURL_INCLUDES': '%(installdir)s/include'}
 
 sanity_check_paths = {
-    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.45.0-intel-2015b.eb b/easybuild/easyconfigs/c/cURL/cURL-7.45.0-intel-2015b.eb
index cac9b22fc9dec8f3d933d3919a1765ec39f7c4dd..e8f4cf17fa59cf960e1f44616937cbb19fb3704e 100644
--- a/easybuild/easyconfigs/c/cURL/cURL-7.45.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.45.0-intel-2015b.eb
@@ -24,7 +24,7 @@ osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
 modextravars = {'CURL_INCLUDES': '%(installdir)s/include'}
 
 sanity_check_paths = {
-    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/c/cairomm/cairomm-1.10.0-intel-2015a.eb b/easybuild/easyconfigs/c/cairomm/cairomm-1.10.0-intel-2015a.eb
index 5aa8ded5d683cedf7e9f7f35b12bc63892986735..c3d9dd1f282707f849f8cca3d3f34cc84d308576 100644
--- a/easybuild/easyconfigs/c/cairomm/cairomm-1.10.0-intel-2015a.eb
+++ b/easybuild/easyconfigs/c/cairomm/cairomm-1.10.0-intel-2015a.eb
@@ -19,7 +19,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/libcairomm-1.0.so'],
+    'files': ['lib/libcairomm-1.0.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/c/cairomm/cairomm-1.10.0-intel-2015b.eb b/easybuild/easyconfigs/c/cairomm/cairomm-1.10.0-intel-2015b.eb
index 371e1b55e1a9f5c5ffbf5171056c40d2f96b1cdb..8cd26b8a00bf2146394c75fec2815572060a67fa 100644
--- a/easybuild/easyconfigs/c/cairomm/cairomm-1.10.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/c/cairomm/cairomm-1.10.0-intel-2015b.eb
@@ -19,7 +19,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/libcairomm-1.0.so'],
+    'files': ['lib/libcairomm-1.0.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
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
index c519419dcf757ca545b6dd0b18501bb05308a8a0..59cb6d8b45ea6960dc91f3805fcedfb944c30ec1 100644
--- 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
@@ -31,7 +31,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['bin/cutadapt','lib/python2.7/site-packages/cutadapt/calign.so',],
+    'files': ['bin/cutadapt','lib/python2.7/site-packages/cutadapt/calign.%s' % SHLIB_EXT,],
     'dirs': [],
 }
 
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
index f278de669b75bbe123facd55546fdb7364b900c1..f90288e47d5a3aad10ef4b9ea93ba09f06cc4951 100644
--- 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
@@ -31,7 +31,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['bin/cutadapt','lib/python2.7/site-packages/cutadapt/calign.so',],
+    'files': ['bin/cutadapt','lib/python2.7/site-packages/cutadapt/calign.%s' % SHLIB_EXT,],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/d/DB/DB-4.7.25-goolf-1.4.10.eb b/easybuild/easyconfigs/d/DB/DB-4.7.25-goolf-1.4.10.eb
index f5b3296ba09dddbb5854d868bf698cd78c95d7ab..2da345f144297325eee56b56fd9e17c5e0931eb2 100644
--- a/easybuild/easyconfigs/d/DB/DB-4.7.25-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/d/DB/DB-4.7.25-goolf-1.4.10.eb
@@ -11,7 +11,7 @@ source_urls = ['http://download.oracle.com/berkeley-db']
 sources = [SOURCELOWER_TAR_GZ]
 
 sanity_check_paths = {
-    'files': ["include/db.h", "include/db_cxx.h", "lib/libdb.a", "lib/libdb.so"],
+    'files': ["include/db.h", "include/db_cxx.h", "lib/libdb.a", "lib/libdb.%s" % SHLIB_EXT],
     'dirs': ["bin"],
 }
 
diff --git a/easybuild/easyconfigs/d/DB/DB-4.7.25-ictce-4.1.13.eb b/easybuild/easyconfigs/d/DB/DB-4.7.25-ictce-4.1.13.eb
index 2a459174775f1b4e448f4eac3adf50a55d5aa207..c5051b60fe939ecc20e67c043da1002eea72ce6e 100644
--- a/easybuild/easyconfigs/d/DB/DB-4.7.25-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/d/DB/DB-4.7.25-ictce-4.1.13.eb
@@ -11,7 +11,7 @@ source_urls = ['http://download.oracle.com/berkeley-db']
 sources = [SOURCELOWER_TAR_GZ]
 
 sanity_check_paths = {
-    'files': ["include/db.h", "include/db_cxx.h", "lib/libdb.a", "lib/libdb.so"],
+    'files': ["include/db.h", "include/db_cxx.h", "lib/libdb.a", "lib/libdb.%s" % SHLIB_EXT],
     'dirs': ["bin"],
 }
 
diff --git a/easybuild/easyconfigs/d/DOLFIN/DOLFIN-1.6.0-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/d/DOLFIN/DOLFIN-1.6.0-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f6b89c67c7a85b7e7b5c68afba27699f3b3a481d
--- /dev/null
+++ b/easybuild/easyconfigs/d/DOLFIN/DOLFIN-1.6.0-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,67 @@
+name = 'DOLFIN'
+version = '1.6.0'
+
+homepage = 'https://bitbucket.org/fenics-project/dolfin'
+description = """DOLFIN is the C++/Python interface of FEniCS, providing a consistent PSE
+  (Problem Solving Environment) for ordinary and partial differential equations."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'usempi': True, 'pic': True, 'packed-linker-options': True}
+
+majver = version.split('.')
+if majver[0] == '0':
+    majver = majver[0]
+else:
+    majver = '.'.join(majver[0:2])
+
+source_urls = ['https://bitbucket.org/fenics-project/dolfin/downloads/']
+sources = [SOURCELOWER_TAR_GZ]
+
+patches = [
+    'DOLFIN-%(version)s_petsc-slepc-libs.patch',
+    'DOLFIN-%(version)s_fix-SuiteSparse-4.3.patch',
+]
+
+pyver = '2.7.11'
+versionsuffix = '-Python-%s' % pyver
+
+builddependencies = [
+    ('CMake', '3.4.1'),
+    ('SWIG', '3.0.8', versionsuffix),
+    ('patchelf', '0.8', '', ('GNU', '4.9.3-2.25')),
+]
+dependencies = [
+    ('Python', pyver),
+    ('Boost', '1.59.0', versionsuffix),
+    ('FFC', version, versionsuffix),
+    ('FIAT', version, versionsuffix),
+    ('Instant', version, versionsuffix),
+    ('UFL', version, versionsuffix),
+    ('SCOTCH', '6.0.4'),
+    ('SuiteSparse', '4.4.6', '-ParMETIS-4.0.3'),
+    ('CGAL', '4.7', versionsuffix),
+    ('PETSc', '3.6.3', versionsuffix),
+    ('SLEPc', '3.6.2', versionsuffix),
+    ('MTL4', '4.0.9555', '', True),
+    ('HDF5', '1.8.15-patch1'),
+    ('Trilinos', '12.4.2', versionsuffix),
+    ('Sphinx', '1.3.3', versionsuffix),
+    ('zlib', '1.2.8'),
+    ('libxml2', '2.9.3', versionsuffix),
+    ('Eigen', '3.2.7'),
+    ('PLY', '3.8', versionsuffix),
+    ('VTK', '6.3.0', versionsuffix),
+    ('petsc4py', '3.6.0', versionsuffix),
+    ('slepc4py', '3.6.0', versionsuffix),
+    ('PaStiX', '5.2.2.22'),
+    ('CppUnit', '1.12.1'),
+    ('Qt', '4.8.7', versionsuffix),
+]
+
+# supply path to libsuitesparseconfig.a for CHOLMOD/UMFPACK, see also patch file
+configopts = "-DSUITESPARSECONFIG_DIR=$EBROOTSUITESPARSE/SuiteSparse_config "
+
+# demos run as tests fail with 'bad X server connection', skipping for now
+runtest = False
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/d/DOLFIN/DOLFIN-1.6.0_fix-SuiteSparse-4.3.patch b/easybuild/easyconfigs/d/DOLFIN/DOLFIN-1.6.0_fix-SuiteSparse-4.3.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ab6e94c810988fbd01c477a7d0611a4943493813
--- /dev/null
+++ b/easybuild/easyconfigs/d/DOLFIN/DOLFIN-1.6.0_fix-SuiteSparse-4.3.patch
@@ -0,0 +1,26 @@
+make CMake script for CHOLMOD and UMFPACK consider SUITESPARSECONFIG_DIR when looking for libsuitesparseconfig.a
+required because of changes made in SuiteSparse 4.3.0
+cfr. https://github.com/FEniCS/dolfin/issues/2
+author: Kenneth Hoste (HPC-UGent)
+--- dolfin-1.6.0/cmake/modules/FindUMFPACK.cmake.orig	2016-01-12 14:49:31.660886973 +0100
++++ dolfin-1.6.0/cmake/modules/FindUMFPACK.cmake	2016-01-12 15:20:07.597039273 +0100
+@@ -36,7 +36,7 @@
+ 
+ # Check for SUITESPARSECONFIG library
+ find_library(SUITESPARSECONFIG_LIBRARY suitesparseconfig
+-  HINTS ${UMFPACK_DIR}/lib $ENV{UMFPACK_DIR}/lib $ENV{PETSC_DIR}/lib
++  HINTS ${SUITESPARSECONFIG_DIR} ${UMFPACK_DIR}/lib $ENV{UMFPACK_DIR}/lib $ENV{PETSC_DIR}/lib
+   DOC "The SUITESPARSE library")
+ mark_as_advanced(SUITESPARSECONFIG_LIBRARY)
+ 
+--- dolfin-1.6.0/cmake/modules/FindCHOLMOD.cmake.orig	2015-07-28 17:05:55.000000000 +0200
++++ dolfin-1.6.0/cmake/modules/FindCHOLMOD.cmake	2016-01-12 15:19:12.765414768 +0100
+@@ -84,7 +84,7 @@
+ 
+ # Check for SUITESPARSECONFIG library
+ find_library(SUITESPARSECONFIG_LIBRARY suitesparseconfig
+-  HINTS ${CHOLMOD_DIR}/lib ${CCOLAMD_DIR}/lib $ENV{CHOLMOD_DIR}/lib
++  HINTS ${SUITESPARSECONFIG_DIR} ${CHOLMOD_DIR}/lib ${CCOLAMD_DIR}/lib $ENV{CHOLMOD_DIR}/lib
+   $ENV{CCOLAMD_DIR}/lib $ENV{PETSC_DIR}/lib
+   DOC "The SUITESPARSECONFIG library")
+ 
diff --git a/easybuild/easyconfigs/d/DOLFIN/DOLFIN-1.6.0_petsc-slepc-libs.patch b/easybuild/easyconfigs/d/DOLFIN/DOLFIN-1.6.0_petsc-slepc-libs.patch
new file mode 100644
index 0000000000000000000000000000000000000000..579635c05c27b2418286b2c1897a100e3bc5fdfb
--- /dev/null
+++ b/easybuild/easyconfigs/d/DOLFIN/DOLFIN-1.6.0_petsc-slepc-libs.patch
@@ -0,0 +1,18 @@
+fix to use external PETSc
+author: Kenneth Hoste (HPC-UGent)
+diff -ru cmake/modules/FindPETSc.cmake cmake/modules/FindPETSc.cmake
+--- cmake/modules/FindPETSc.cmake	2011-12-07 22:21:22.000000000 +0100
++++ cmake/modules/FindPETSc.cmake	2012-08-10 13:02:21.032955197 +0200
+@@ -114,9 +114,10 @@
+   petsc_get_variable(PETSC_INCLUDE PETSC_INCLUDE)          # 3.1
+   petsc_get_variable(PETSC_CC_INCLUDES PETSC_CC_INCLUDES)  # dev
+   set(PETSC_INCLUDE ${PETSC_INCLUDE} ${PETSC_CC_INCLUDES})
+-  petsc_get_variable(PETSC_LIB_BASIC PETSC_LIB_BASIC)
++  petsc_get_variable(PETSC_WITH_EXTERNAL_LIB PETSC_WITH_EXTERNAL_LIB)
+   petsc_get_variable(PETSC_LIB_DIR PETSC_LIB_DIR)
+-  set(PETSC_LIB "-L${PETSC_LIB_DIR} ${PETSC_LIB_BASIC}")
++  set(PETSC_LIB "-L${PETSC_LIB_DIR} ${PETSC_WITH_EXTERNAL_LIB}")
++  message(STATUS "PETSC_LIB ${PETSC_LIB}")
+ 
+   # Remove temporary Makefile
+   file(REMOVE ${petsc_config_makefile})
diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-goolf-1.5.14.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-goolf-1.5.14.eb
index 14b0fa758317b025eb7e901f723f309c783d7c27..2e87b89a364851b99d2cf08c6b07f869e8962e62 100644
--- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-goolf-1.5.14.eb
@@ -5,7 +5,7 @@ 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': 'goolf', 'version': '1.5.14'} 
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
 
 sources = ['%(namelower)s-%(version)s.src.tar.gz']
 source_urls = ['http://ftp.stack.nl/pub/users/dimitri/']
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
index 6294e116566fcea740cd84d4e6216c283620b368..89cd537fc7b264a12fc90732f4f375eb70ed066e 100644
--- 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
@@ -15,7 +15,7 @@ version = '2013.11'
 homepage = 'http://elpa.rzg.mpg.de'
 description = """Eigenvalue SoLvers for Petaflop-Applications ."""
 
-toolchain = {'name': 'ictce', 'version': '5.3.0'} 
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
 toolchainopts = {'optarch': True, 'usempi': True}
 
 # download at http://elpa.rzg.mpg.de/elpa-tar-archive
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
index c080908b4295b548ed7a1f54a5726881d50b6f6f..bbbc8c56b4e9bfe4f9149b3d0cbd77ac21735920 100644
--- 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
@@ -15,7 +15,7 @@ version = '2013.11'
 homepage = 'http://elpa.rzg.mpg.de'
 description = """Eigenvalue SoLvers for Petaflop-Applications ."""
 
-toolchain = {'name': 'ictce', 'version': '5.5.0'} 
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
 toolchainopts = {'optarch': True, 'usempi': True}
 
 # download at http://elpa.rzg.mpg.de/elpa-tar-archive
diff --git a/easybuild/easyconfigs/e/ELPH/ELPH-1.0.1-goolf-1.4.10.eb b/easybuild/easyconfigs/e/ELPH/ELPH-1.0.1-goolf-1.4.10.eb
index 85c2d23a0ee5236ded07489481064b30cdb10064..5403f1fde92af6ddf0b74aeb7e526781d2fc3142 100644
--- a/easybuild/easyconfigs/e/ELPH/ELPH-1.0.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/e/ELPH/ELPH-1.0.1-goolf-1.4.10.eb
@@ -26,7 +26,7 @@ buildopts = ' CC="$CC"'
 
 parallel = 1
 
-files_to_copy = [ (["elph"], "bin"), "COPYRIGHT", "LICENSE", "Readme.ELPH", "VERSION" ] 
+files_to_copy = [ (["elph"], "bin"), "COPYRIGHT", "LICENSE", "Readme.ELPH", "VERSION" ]
 
 sanity_check_paths = {
     'files': ["bin/elph"],
diff --git a/easybuild/easyconfigs/e/ELPH/ELPH-1.0.1-ictce-6.2.5.eb b/easybuild/easyconfigs/e/ELPH/ELPH-1.0.1-ictce-6.2.5.eb
index a6057c15fd1cf2c97d68c5020ba9f49fe4a30c4e..8986e9720049c69dfe4e19f7db73e1c79ca920e3 100644
--- a/easybuild/easyconfigs/e/ELPH/ELPH-1.0.1-ictce-6.2.5.eb
+++ b/easybuild/easyconfigs/e/ELPH/ELPH-1.0.1-ictce-6.2.5.eb
@@ -26,7 +26,7 @@ buildopts = ' CC="$CC"'
 
 parallel = 1
 
-files_to_copy = [ (["elph"], "bin"), "COPYRIGHT", "LICENSE", "Readme.ELPH", "VERSION" ] 
+files_to_copy = [ (["elph"], "bin"), "COPYRIGHT", "LICENSE", "Readme.ELPH", "VERSION" ]
 
 sanity_check_paths = {
     'files': ["bin/elph"],
diff --git a/easybuild/easyconfigs/e/EMBOSS/EMBOSS-6.5.7-goolf-1.4.10.eb b/easybuild/easyconfigs/e/EMBOSS/EMBOSS-6.5.7-goolf-1.4.10.eb
index ae4e3793e60083908662d9c236f6dfafb1f22946..c8367acc3482a00203326be2bb66eb59851f8639 100644
--- a/easybuild/easyconfigs/e/EMBOSS/EMBOSS-6.5.7-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/e/EMBOSS/EMBOSS-6.5.7-goolf-1.4.10.eb
@@ -31,7 +31,7 @@ configopts = " --with-hpdf=$EBROOTLIBHARU "
 parallel = 1
 
 sanity_check_paths = {
-    'files': ['bin/%s' % x for x in ['seqret', 'aligncopy', 'profit', 'prophet']] + 
+    'files': ['bin/%s' % x for x in ['seqret', 'aligncopy', 'profit', 'prophet']] +
              ['lib/lib%s.a' % x for x in ['acd', 'ajax', 'ajaxdb', 'ajaxg', 'eexpat', 'ensembl',
                                           'epcre', 'eplplot', 'ezlib', 'nucleus']] +
              ['share/EMBOSS/jemboss/lib/jemboss.jar'],
diff --git a/easybuild/easyconfigs/e/EMBOSS/EMBOSS-6.5.7-ictce-4.1.13.eb b/easybuild/easyconfigs/e/EMBOSS/EMBOSS-6.5.7-ictce-4.1.13.eb
index f3660e8c90267e5ea244f121627fd1633af0879c..7100e7cae910f7abc94993d361d9cd40d7a2a44d 100644
--- a/easybuild/easyconfigs/e/EMBOSS/EMBOSS-6.5.7-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/e/EMBOSS/EMBOSS-6.5.7-ictce-4.1.13.eb
@@ -31,7 +31,7 @@ configopts = " --with-hpdf=$EBROOTLIBHARU "
 parallel = 1
 
 sanity_check_paths = {
-    'files': ['bin/%s' % x for x in ['seqret', 'aligncopy', 'profit', 'prophet']] + 
+    'files': ['bin/%s' % x for x in ['seqret', 'aligncopy', 'profit', 'prophet']] +
              ['lib/lib%s.a' % x for x in ['acd', 'ajax', 'ajaxdb', 'ajaxg', 'eexpat', 'ensembl',
                                           'epcre', 'eplplot', 'ezlib', 'nucleus']] +
              ['share/EMBOSS/jemboss/lib/jemboss.jar'],
diff --git a/easybuild/easyconfigs/e/EMBOSS/EMBOSS-6.5.7-ictce-5.3.0.eb b/easybuild/easyconfigs/e/EMBOSS/EMBOSS-6.5.7-ictce-5.3.0.eb
index f34568c03769ed40cd3fab7b0d7f00492b06ba91..88380bcbaba3a92fc7b063101eed3f0c92230040 100644
--- a/easybuild/easyconfigs/e/EMBOSS/EMBOSS-6.5.7-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/e/EMBOSS/EMBOSS-6.5.7-ictce-5.3.0.eb
@@ -31,7 +31,7 @@ configopts = " --with-hpdf=$EBROOTLIBHARU "
 parallel = 1
 
 sanity_check_paths = {
-    'files': ['bin/%s' % x for x in ['seqret', 'aligncopy', 'profit', 'prophet']] + 
+    'files': ['bin/%s' % x for x in ['seqret', 'aligncopy', 'profit', 'prophet']] +
              ['lib/lib%s.a' % x for x in ['acd', 'ajax', 'ajaxdb', 'ajaxg', 'eexpat', 'ensembl',
                                           'epcre', 'eplplot', 'ezlib', 'nucleus']] +
              ['share/EMBOSS/jemboss/lib/jemboss.jar'],
diff --git a/easybuild/easyconfigs/e/ETSF_IO/ETSF_IO-1.0.4-goolf-1.4.10.eb b/easybuild/easyconfigs/e/ETSF_IO/ETSF_IO-1.0.4-goolf-1.4.10.eb
index f270612d5f3fb42b24c61890c2353e5d5d0ea9f4..9ec46d296fbb4621a01f19cc7ea82f6afebfceb0 100644
--- a/easybuild/easyconfigs/e/ETSF_IO/ETSF_IO-1.0.4-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/e/ETSF_IO/ETSF_IO-1.0.4-goolf-1.4.10.eb
@@ -27,7 +27,7 @@ configopts += " --with-netcdf-incs='-I$EBROOTNETCDF/include'"
 dependencies = [ ('netCDF', '4.1.3') ]
 
 sanity_check_paths = {
-    'files': ["bin/etsf_io"], 
+    'files': ["bin/etsf_io"],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-2.5.0.eb b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-2.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..37d212b3344d2cd6952f3c0e3051c2a8b7da5756
--- /dev/null
+++ b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-2.5.0.eb
@@ -0,0 +1,31 @@
+easyblock = 'EB_EasyBuildMeta'
+
+name = 'EasyBuild'
+version = '2.5.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 = [
+    'https://pypi.python.org/packages/source/v/vsc-base/',
+    'https://pypi.python.org/packages/source/e/easybuild-framework/',
+    'https://pypi.python.org/packages/source/e/easybuild-easyblocks/',
+    'https://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 = [
+    'vsc-base-2.2.4.tar.gz',
+    'easybuild-framework-%(version)s.tar.gz',
+    'easybuild-easyblocks-%(version)s.tar.gz',
+    'easybuild-easyconfigs-%(version)s.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/EggLib/EggLib-2.1.10-intel-2016a.eb b/easybuild/easyconfigs/e/EggLib/EggLib-2.1.10-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d32e7db6161a0cd36c5380589519f07016722df1
--- /dev/null
+++ b/easybuild/easyconfigs/e/EggLib/EggLib-2.1.10-intel-2016a.eb
@@ -0,0 +1,20 @@
+name = 'EggLib'
+version = '2.1.10'
+
+homepage = 'http://egglib.sourceforge.net/'
+description = """EggLib is a C++/Python library and program package for evolutionary genetics and genomics."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [
+    '%(namelower)s-cpp-%(version)s.tar.gz',
+    '%(namelower)s-py-%(version)s.tar.gz',
+]
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('GSL', '2.1'),
+]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-2.0.17-goolf-1.4.10.eb b/easybuild/easyconfigs/e/Eigen/Eigen-2.0.17-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a9cf3457671e383e781c4df906461f81cd4135fc
--- /dev/null
+++ b/easybuild/easyconfigs/e/Eigen/Eigen-2.0.17-goolf-1.4.10.eb
@@ -0,0 +1,14 @@
+name = 'Eigen'
+version = '2.0.17'
+
+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 = 'numlib'
diff --git a/easybuild/easyconfigs/e/Emacs/Emacs-24.3-GCC-4.8.3-bare.eb b/easybuild/easyconfigs/e/Emacs/Emacs-24.3-GCC-4.8.3-bare.eb
index 68f945c239d3605a84ecfe6c273e6b0a6e0f29c7..8e47359be16c01f74373272ae50c5b11764e6837 100644
--- a/easybuild/easyconfigs/e/Emacs/Emacs-24.3-GCC-4.8.3-bare.eb
+++ b/easybuild/easyconfigs/e/Emacs/Emacs-24.3-GCC-4.8.3-bare.eb
@@ -10,7 +10,7 @@ description = """GNU Emacs is an extensible, customizable text editor—and more
  with extensions to support text editing."""
 
 toolchain = {'name': 'GCC', 'version': '4.8.3'}
-toolchainopts = {} 
+toolchainopts = {}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
diff --git a/easybuild/easyconfigs/e/Emacs/Emacs-24.3-GCC-4.8.3.eb b/easybuild/easyconfigs/e/Emacs/Emacs-24.3-GCC-4.8.3.eb
index cb835bb8cddcb990337f5cc6817993c45f4ca103..485bc706648e8f6055b6c3b6d53b7253a3912564 100644
--- a/easybuild/easyconfigs/e/Emacs/Emacs-24.3-GCC-4.8.3.eb
+++ b/easybuild/easyconfigs/e/Emacs/Emacs-24.3-GCC-4.8.3.eb
@@ -9,7 +9,7 @@ description = """GNU Emacs is an extensible, customizable text editor—and more
  with extensions to support text editing."""
 
 toolchain = {'name': 'GCC', 'version': '4.8.3'}
-toolchainopts = {} 
+toolchainopts = {}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
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
index 4e009be5c9a156fe8a181b700d988dc5d7cf9a88..570e7eb37f89ab40e4f515d259453b4151a2c4ce 100644
--- 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
@@ -16,7 +16,7 @@ configopts = '--without-javac '
 
 sanity_check_paths = {
     'files': ['bin/erl'],
-    'dirs': ['lib/erlang/bin', 'lib/erlang/lib'], 
+    'dirs': ['lib/erlang/bin', 'lib/erlang/lib'],
 }
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/e/eudev/eudev-3.1.5-intel-2015b.eb b/easybuild/easyconfigs/e/eudev/eudev-3.1.5-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..cd53df32962ffa73721e24a65049689f79cc846f
--- /dev/null
+++ b/easybuild/easyconfigs/e/eudev/eudev-3.1.5-intel-2015b.eb
@@ -0,0 +1,33 @@
+easyblock = 'ConfigureMake'
+
+name = 'eudev'
+version = '3.1.5'
+
+homepage = 'https://wiki.gentoo.org/wiki/Project:Eudev'
+description = """eudev is a fork of systemd-udev with the goal of obtaining
+ better compatibility with existing software such as
+ OpenRC and Upstart, older kernels, various toolchains
+ and anything else required by users and various distributions."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'cstd': 'c99'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://dev.gentoo.org/~blueness/%(name)s/']
+patches = ['%(name)s-3.1.2_pre-2.6.34_kernel.patch']
+
+builddependencies = [
+    ('gperf', '3.0.4'),
+]
+
+osdependencies = [('kernel-headers', 'linux-libc-dev')]
+
+configopts = '--disable-blkid --disable-selinux --disable-gudev --disable-manpages '
+runtest = 'check'
+
+sanity_check_paths = {
+    'files' : ['bin/udevadm', 'include/libudev.h', 'include/udev.h', 'lib/libudev.so.1'],
+    'dirs' : [],
+}
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-goalf-1.1.0-no-OFED.eb
index ce824a5e5672c3ea52bc3bc3246159ab0b2adec7..2fa88fc7e066998447bfd5dd5af960ad97edab06 100644
--- a/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-goalf-1.1.0-no-OFED.eb
@@ -33,7 +33,7 @@ sanity_check_paths = {
                                                              'artifacts_filter', 'reverse_complement',
                                                              'collapser', 'uncollapser', 'renamer',
                                                              'barcode_splitter.pl', 'nucleotide_distribution_graph.sh',
-                                                             'nucleotide_distribution_line_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',
diff --git a/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-goolf-1.4.10.eb b/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-goolf-1.4.10.eb
index d68850c2976f781e78d0d3792f8f1ce696bca366..b2711aa2a6d88db7f7d421e2a830a2e1179ddd82 100644
--- a/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-goolf-1.4.10.eb
@@ -33,7 +33,7 @@ sanity_check_paths = {
                                                              'artifacts_filter', 'reverse_complement',
                                                              'collapser', 'uncollapser', 'renamer',
                                                              'barcode_splitter.pl', 'nucleotide_distribution_graph.sh',
-                                                             'nucleotide_distribution_line_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',
diff --git a/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-ictce-4.0.6.eb b/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-ictce-4.0.6.eb
index c0fdac7c353b30530be2b3b72871964c96c7e302..aaddc8190a9752078e8379e6426f3f55a1f91060 100644
--- a/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-ictce-4.0.6.eb
@@ -35,7 +35,7 @@ sanity_check_paths = {
                                                              'artifacts_filter', 'reverse_complement',
                                                              'collapser', 'uncollapser', 'renamer',
                                                              'barcode_splitter.pl', 'nucleotide_distribution_graph.sh',
-                                                             'nucleotide_distribution_line_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',
diff --git a/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-ictce-5.3.0.eb b/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-ictce-5.3.0.eb
index f7fa06667c04b2374bd73050f6df140db4c51873..02992118cc80bb9a19cf529429c82ae9167ffe60 100644
--- a/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-ictce-5.3.0.eb
@@ -36,7 +36,7 @@ sanity_check_paths = {
                                                              'artifacts_filter', 'reverse_complement',
                                                              'collapser', 'uncollapser', 'renamer',
                                                              'barcode_splitter.pl', 'nucleotide_distribution_graph.sh',
-                                                             'nucleotide_distribution_line_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',
diff --git a/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.14-foss-2015b.eb b/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.14-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..46d174be2ccec1243f31090d4e6306aed14989ba
--- /dev/null
+++ b/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.14-foss-2015b.eb
@@ -0,0 +1,44 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Cedric Laczny <cedric.laczny@uni.lu>, Fotis Georgatos <fotis@cern.ch>
+# 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 = 'ConfigureMake'
+
+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': 'foss', 'version': '2015b'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['https://github.com/agordon/fastx_toolkit/releases/download/%(version)s']
+sources = ['fastx_toolkit-%(version)s.tar.bz2']
+
+builddependencies = [('libgtextutils', '0.7')];
+
+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/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
index 96c112929039c24581b53fe6668fdcb843b9b354..16426d67887be135e52da9d3a1c35d072c95ee6a 100644
--- 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
@@ -29,15 +29,15 @@ sources = ['%s-%%(version)s.tar.bz2' % altname]
 dependencies = [('libgtextutils', '0.6.1')];
 
 sanity_check_paths = {
-    'files': 
-        ['bin/fastx_%s' % x for x in 
+    '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 
+            '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', 
+        ['bin/fastq_%s' % x for x in
+            ['quality_boxplot_graph.sh', 'quality_converter', 'to_fasta', 'quality_filter',
             'quality_trimmer', 'masker']],
     'dirs': ['.']
     }
diff --git a/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.14-intel-2015a.eb b/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.14-intel-2015a.eb
index 13d9d1cb72c6032c4494d7b048c85486eb2bd9a8..18c56837a0965f0a540bf828d4c08deccb38a58e 100644
--- a/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.14-intel-2015a.eb
+++ b/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.14-intel-2015a.eb
@@ -29,15 +29,15 @@ sources = ['%s-%%(version)s.tar.bz2' % altname]
 dependencies = [('libgtextutils', '0.6.1')];
 
 sanity_check_paths = {
-    'files': 
-        ['bin/fastx_%s' % x for x in 
+    '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 
+            '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', 
+        ['bin/fastq_%s' % x for x in
+            ['quality_boxplot_graph.sh', 'quality_converter', 'to_fasta', 'quality_filter',
             'quality_trimmer', 'masker']],
     'dirs': ['.']
     }
diff --git a/easybuild/easyconfigs/f/FFC/FFC-1.6.0-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/f/FFC/FFC-1.6.0-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8e3e690feb1adec16e6ab3f043610d3229d01198
--- /dev/null
+++ b/easybuild/easyconfigs/f/FFC/FFC-1.6.0-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,34 @@
+easyblock = "PythonPackage"
+
+name = 'FFC'
+version = '1.6.0'
+
+homepage = 'https://bitbucket.org/fenics-project/ffc'
+description = """FEniCS Form Compiler (FFC) works as a compiler for multilinear forms by generating
+ code (C++) for the evaluation of a multilinear form given in mathematical notation."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = ['https://bitbucket.org/fenics-project/ffc/downloads/']
+sources = [SOURCELOWER_TAR_GZ]
+
+pyver = '2.7.11'
+versionsuffix = '-Python-%s' % pyver
+
+builddependencies = [
+    ('SWIG', '3.0.8', versionsuffix),
+]
+dependencies = [
+    ('Python', pyver),
+    ('UFL', version, versionsuffix),
+    ('FIAT', version, versionsuffix),
+    ('Instant', version, versionsuffix),
+]
+
+pyshortver = '.'.join(pyver.split('.')[:2])
+sanity_check_paths = {
+    'files': ['bin/ffc'],
+    'dirs': ['lib/python%s/site-packages' % pyshortver]
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-2016a.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ea1354d72d75cb79a468c33dc38a086af99f988e
--- /dev/null
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-2016a.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMake'
+
+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': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [homepage]
+
+common_configopts = "--enable-threads --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%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']] +
+             ['lib/libfftw3q.a', 'lib/libfftw3q_omp.a'],
+    'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/f/FIAT/FIAT-1.5.0-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/f/FIAT/FIAT-1.5.0-intel-2015a-Python-2.7.9.eb
index 03fe5cf7a1bc322769d8ae010431f0b14cf242b0..2e95a09438e24139cabeb8caeb5ecd93228e6df9 100644
--- a/easybuild/easyconfigs/f/FIAT/FIAT-1.5.0-intel-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/f/FIAT/FIAT-1.5.0-intel-2015a-Python-2.7.9.eb
@@ -3,7 +3,7 @@ easyblock = 'PythonPackage'
 name = 'FIAT'
 version = '1.5.0'
 
-homepage = 'ttps://bitbucket.org/fenics-project/fiat'
+homepage = 'https://bitbucket.org/fenics-project/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."""
diff --git a/easybuild/easyconfigs/f/FIAT/FIAT-1.6.0-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/f/FIAT/FIAT-1.6.0-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..47959ae1d492aff319ca5df7ae3fd5752b5fb388
--- /dev/null
+++ b/easybuild/easyconfigs/f/FIAT/FIAT-1.6.0-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,32 @@
+easyblock = 'PythonPackage'
+
+name = 'FIAT'
+version = '1.6.0'
+
+homepage = 'https://bitbucket.org/fenics-project/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': 'intel', 'version': '2015b'}
+
+source_urls = ['https://bitbucket.org/fenics-project/fiat/downloads']
+sources = [SOURCELOWER_TAR_GZ]
+
+pyver = '2.7.11'
+versionsuffix = '-Python-%s' % pyver
+
+dependencies = [
+    ('Python', pyver),
+    ('sympy', '0.7.6.1', versionsuffix),
+]
+
+options = {'modulename': name}
+
+pyshortver = '.'.join(pyver.split('.')[:2])
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%s/site-packages' % pyshortver],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/f/FLASH/FLASH-1.2.11-foss-2015b.eb b/easybuild/easyconfigs/f/FLASH/FLASH-1.2.11-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8df3311e827b7d0e5e73971d0d5846a46275c15d
--- /dev/null
+++ b/easybuild/easyconfigs/f/FLASH/FLASH-1.2.11-foss-2015b.eb
@@ -0,0 +1,25 @@
+easyblock = 'MakeCp'
+
+name = 'FLASH'
+version = '1.2.11'
+
+homepage = 'https://ccb.jhu.edu/software/FLASH/'
+description = """FLASH (Fast Length Adjustment of SHort reads) is a very fast and accurate software
+  tool to merge paired-end reads from next-generation sequencing experiments. FLASH is designed to
+  merge pairs of reads when the original DNA fragments are shorter than twice the length of reads.
+  The resulting longer reads can significantly improve genome assemblies. They can also improve
+  transcriptome assembly when FLASH is used to merge RNA-seq data."""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+
+source_urls = ['http://download.sourceforge.net/%(namelower)spage']
+sources = [SOURCE_TAR_GZ]
+
+files_to_copy = [(['flash'], 'bin')]
+
+sanity_check_paths = {
+    'files': ['bin/flash'],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/f/fastqz/fastqz-1.5-GCC-4.8.2.eb b/easybuild/easyconfigs/f/fastqz/fastqz-1.5-GCC-4.8.2.eb
index 902b240c0498d9a384a1f761f30e94e85f6be9c1..4af4d1b872d6b68da6b11da276477c68e551f254 100644
--- a/easybuild/easyconfigs/f/fastqz/fastqz-1.5-GCC-4.8.2.eb
+++ b/easybuild/easyconfigs/f/fastqz/fastqz-1.5-GCC-4.8.2.eb
@@ -37,7 +37,7 @@ cmds_map = [
 files_to_copy = [(['fastqz', 'fapack'], 'bin')]
 
 sanity_check_paths = {
-    'files': ["bin/fastqz", "bin/fapack"], 
+    'files': ["bin/fastqz", "bin/fapack"],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/f/ffmpeg/ffmpeg-2.4-intel-2014.06.eb b/easybuild/easyconfigs/f/ffmpeg/ffmpeg-2.4-intel-2014.06.eb
index 36569d20af714fca2d0ff0500931e39465ec8b4a..4abf658ad6540653f653205149455b0c4f108c35 100644
--- a/easybuild/easyconfigs/f/ffmpeg/ffmpeg-2.4-intel-2014.06.eb
+++ b/easybuild/easyconfigs/f/ffmpeg/ffmpeg-2.4-intel-2014.06.eb
@@ -20,7 +20,7 @@ dependencies = [
 
 sanity_check_paths = {
     'files': ['bin/ff%s' % x for x in ['mpeg', 'probe', 'server'] ] +
-             ['lib/lib%s.%s' % (x, y) for x in ['avdevice', 'avfilter', 'avformat', 'avcodec', 'postproc', 
+             ['lib/lib%s.%s' % (x, y) for x in ['avdevice', 'avfilter', 'avformat', 'avcodec', 'postproc',
                                                 'swresample', 'swscale', 'avutil'] for y in ['so', 'a']],
     'dirs': ['include']
 }
diff --git a/easybuild/easyconfigs/f/ffmpeg/ffmpeg-2.4-intel-2014b.eb b/easybuild/easyconfigs/f/ffmpeg/ffmpeg-2.4-intel-2014b.eb
index a9bbbfc3c130aaa2f1edec4c1476b3a1c79a7c9f..4461759fe7e4189bb9d6acb12ac1fa3b73c83fd6 100644
--- a/easybuild/easyconfigs/f/ffmpeg/ffmpeg-2.4-intel-2014b.eb
+++ b/easybuild/easyconfigs/f/ffmpeg/ffmpeg-2.4-intel-2014b.eb
@@ -20,7 +20,7 @@ dependencies = [
 
 sanity_check_paths = {
     'files': ['bin/ff%s' % x for x in ['mpeg', 'probe', 'server'] ] +
-             ['lib/lib%s.%s' % (x, y) for x in ['avdevice', 'avfilter', 'avformat', 'avcodec', 'postproc', 
+             ['lib/lib%s.%s' % (x, y) for x in ['avdevice', 'avfilter', 'avformat', 'avcodec', 'postproc',
                                                 'swresample', 'swscale', 'avutil'] for y in ['so', 'a']],
     'dirs': ['include']
 }
diff --git a/easybuild/easyconfigs/f/flex/flex-2.5.37-goolf-1.5.14.eb b/easybuild/easyconfigs/f/flex/flex-2.5.37-goolf-1.5.14.eb
index 3f5206f66ceb7f98101f7829015b32fa3141a733..852837bf5be97bf2a9d8bf4bbd2721bf2f29cb27 100644
--- a/easybuild/easyconfigs/f/flex/flex-2.5.37-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/f/flex/flex-2.5.37-goolf-1.5.14.eb
@@ -5,7 +5,7 @@ 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': 'goolf', 'version': '1.5.14'} 
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
 toolchainopts = {'pic': True}
 
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/f/flex/flex-2.5.39-foss-2016a.eb b/easybuild/easyconfigs/f/flex/flex-2.5.39-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..352bff833483b41833a9c2adf3263328bfcc34d2
--- /dev/null
+++ b/easybuild/easyconfigs/f/flex/flex-2.5.39-foss-2016a.eb
@@ -0,0 +1,14 @@
+name = 'flex'
+version = '2.5.39'
+
+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': 'foss', 'version': '2016a'}
+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.39-intel-2016a.eb b/easybuild/easyconfigs/f/flex/flex-2.5.39-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..419266740d48f770220ab36af19b4eea900c0fea
--- /dev/null
+++ b/easybuild/easyconfigs/f/flex/flex-2.5.39-intel-2016a.eb
@@ -0,0 +1,14 @@
+name = 'flex'
+version = '2.5.39'
+
+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': 'intel', 'version': '2016a'}
+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.39-intel-para-2014.12.eb b/easybuild/easyconfigs/f/flex/flex-2.5.39-intel-para-2014.12.eb
index 469e32f3d7341e7622a534695852f35e40cbca63..7cd93ab5fc2de6cab6ecf702a34f32caa7962840 100644
--- a/easybuild/easyconfigs/f/flex/flex-2.5.39-intel-para-2014.12.eb
+++ b/easybuild/easyconfigs/f/flex/flex-2.5.39-intel-para-2014.12.eb
@@ -5,7 +5,7 @@ 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': 'intel-para', 'version': '2014.12'} 
+toolchain = {'name': 'intel-para', 'version': '2014.12'}
 toolchainopts = {'pic': True}
 
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/f/flex/flex-2.6.0-foss-2016a.eb b/easybuild/easyconfigs/f/flex/flex-2.6.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..13ec4d5ea65f82f531926b869fa1ff7f4c8037ef
--- /dev/null
+++ b/easybuild/easyconfigs/f/flex/flex-2.6.0-foss-2016a.eb
@@ -0,0 +1,16 @@
+name = 'flex'
+version = '2.6.0'
+
+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': 'foss', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
+
+dependencies = [('Bison', '3.0.4')]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/f/flex/flex-2.6.0-intel-2016a.eb b/easybuild/easyconfigs/f/flex/flex-2.6.0-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f451c3ed904166bda6cbe3f0133aa5173eae284c
--- /dev/null
+++ b/easybuild/easyconfigs/f/flex/flex-2.6.0-intel-2016a.eb
@@ -0,0 +1,16 @@
+name = 'flex'
+version = '2.6.0'
+
+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': 'intel', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
+
+dependencies = [('Bison', '3.0.4')]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/f/foss/foss-2014b.eb b/easybuild/easyconfigs/f/foss/foss-2014b.eb
index 5ff6c5693e15c34ab4df7050215d1736a2c4b025..538536a6960c08a58f756b214563ba6c20156db0 100644
--- a/easybuild/easyconfigs/f/foss/foss-2014b.eb
+++ b/easybuild/easyconfigs/f/foss/foss-2014b.eb
@@ -28,7 +28,7 @@ comp_mpi_tc = (comp_mpi_tc_name, comp_mpi_tc_ver)
 # because of toolchain preperation functions
 dependencies = [
     ('GCC', '4.8.3'),
-    ('OpenMPI', '1.8.1', '', comp),  
+    ('OpenMPI', '1.8.1', '', comp),
     (blaslib, blasver, blassuff, comp),
     ('FFTW', '3.3.4', '', comp_mpi_tc),
     ('ScaLAPACK', '2.0.2', '-%s%s' % (blas, blassuff), comp_mpi_tc),
diff --git a/easybuild/easyconfigs/f/foss/foss-2016a.eb b/easybuild/easyconfigs/f/foss/foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d0ff96c9d1bc4e2faac638d4ffe341b4cb771b87
--- /dev/null
+++ b/easybuild/easyconfigs/f/foss/foss-2016a.eb
@@ -0,0 +1,35 @@
+easyblock = 'Toolchain'
+
+name = 'foss'
+version = '2016a'
+
+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'}
+
+gccver = '4.9.3-2.25'
+
+blaslib = 'OpenBLAS'
+blasver = '0.2.15'
+blas = '%s-%s' % (blaslib, blasver)
+blassuff = '-LAPACK-3.6.0'
+
+# toolchain used to build foss dependencies
+comp_mpi_tc_name = 'gompi'
+comp_mpi_tc = (comp_mpi_tc_name, version)
+
+# compiler toolchain depencies
+# we need GCC and OpenMPI as explicit dependencies instead of gompi toolchain
+# because of toolchain preperation functions
+# For binutils, stick to http://wiki.osdev.org/Cross-Compiler_Successful_Builds
+dependencies = [
+    ('GCC', gccver),
+    ('OpenMPI', '1.10.2', '', ('GCC', gccver)),
+    (blaslib, blasver, blassuff, ('GCC', gccver)),
+    ('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/f/fqzcomp/fqzcomp-4.6-GCC-4.8.2.eb b/easybuild/easyconfigs/f/fqzcomp/fqzcomp-4.6-GCC-4.8.2.eb
index 0f7a6c3ea5b97878bd3cf555af52f525fabd32d5..c4cf3f3ff7cfe9313c30f3c3289cf7c42473d926 100644
--- a/easybuild/easyconfigs/f/fqzcomp/fqzcomp-4.6-GCC-4.8.2.eb
+++ b/easybuild/easyconfigs/f/fqzcomp/fqzcomp-4.6-GCC-4.8.2.eb
@@ -24,7 +24,7 @@ source_urls = [SOURCEFORGE_SOURCE]
 files_to_copy = [(['fqz_comp'], 'bin')]
 
 sanity_check_paths = {
-    'files': ["bin/fqz_comp"], 
+    'files': ["bin/fqz_comp"],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-goolf-1.4.10.eb b/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-goolf-1.4.10.eb
index d7a5bba2c4e0eca57695a978cd0415ab5f8c600d..c1785a1f92eece51dd7f0405d7950f0510bc401b 100644
--- a/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-goolf-1.4.10.eb
@@ -14,7 +14,7 @@ source_urls = ['http://prdownloads.sourceforge.net/%(name)s']
 dependencies = [('libXi', '1.7.2')]
 
 sanity_check_paths = {
-    'files': ['lib/libglut.a', 'lib/libglut.so'],
+    'files': ['lib/libglut.a', 'lib/libglut.%s' % SHLIB_EXT],
     'dirs': ['include/GL'],
 }
 
diff --git a/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-ictce-4.1.13.eb b/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-ictce-4.1.13.eb
index 7f4b598d23f85ba56d91f92d896ee629f825c0e3..56db81441a0773cd5a7c71032dc6203f103fa3af 100644
--- a/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-ictce-4.1.13.eb
@@ -14,7 +14,7 @@ source_urls = ['http://prdownloads.sourceforge.net/%(name)s']
 dependencies = [('libXi', '1.7.2')]
 
 sanity_check_paths = {
-    'files': ['lib/libglut.a', 'lib/libglut.so'],
+    'files': ['lib/libglut.a', 'lib/libglut.%s' % SHLIB_EXT],
     'dirs': ['include/GL'],
 }
 
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
index 0519e56f117879db92d4ee8cb1f95db65941249f..bed452773a5a7aad17f5bed7a4b3e395e5ba0025 100644
--- 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
@@ -14,7 +14,7 @@ source_urls = ['http://prdownloads.sourceforge.net/%(name)s']
 dependencies = [('libXi', '1.7.2')]
 
 sanity_check_paths = {
-    'files': ['lib/libglut.a', 'lib/libglut.so'],
+    'files': ['lib/libglut.a', 'lib/libglut.%s' % SHLIB_EXT],
     'dirs': ['include/GL'],
 }
 
diff --git a/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-intel-2015a.eb b/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-intel-2015a.eb
index f501cd2fef4b62782e6d82fa759b0d94b58a8a34..6625f21f90e92f4465e29fc9ac76de195d695119 100644
--- a/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-intel-2015a.eb
+++ b/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-intel-2015a.eb
@@ -14,7 +14,7 @@ source_urls = ['http://prdownloads.sourceforge.net/%(name)s']
 dependencies = [('libXi', '1.7.4')]
 
 sanity_check_paths = {
-    'files': ['lib/libglut.a', 'lib/libglut.so'],
+    'files': ['lib/libglut.a', 'lib/libglut.%s' % SHLIB_EXT],
     'dirs': ['include/GL'],
 }
 
diff --git a/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-intel-2015b.eb b/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-intel-2015b.eb
index c494fa68a7a6bf1365e7dc1c950fc6e00456a784..1b9b08eda7618dc436970f5dcc8250a31fa3fd29 100644
--- a/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-intel-2015b.eb
+++ b/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-intel-2015b.eb
@@ -14,7 +14,7 @@ source_urls = ['http://prdownloads.sourceforge.net/%(name)s']
 dependencies = [('libXi', '1.7.4')]
 
 sanity_check_paths = {
-    'files': ['lib/libglut.a', 'lib/libglut.so'],
+    'files': ['lib/libglut.a', 'lib/libglut.%s' % SHLIB_EXT],
     'dirs': ['include/GL'],
 }
 
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 0933ebbe50bd2a910f29e1c8e8198face5ee00bd..cfe2971df55d1a69d4a018b392f96444b4471e70 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
@@ -12,7 +12,7 @@ source_urls = [GNU_SAVANNAH_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 sanity_check_paths = {
-    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'],
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT, 'lib/pkgconfig/freetype2.pc'],
     'dirs': ['include/freetype2'],
 }
 
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 13f7275f3ee6b2f0245e79fdecc8cfa4a30bc5a0..09e345ac68770efaa66f893035e10a05e4e56aa3 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
@@ -13,7 +13,7 @@ source_urls = [GNU_SAVANNAH_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 sanity_check_paths = {
-    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'],
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT, 'lib/pkgconfig/freetype2.pc'],
     'dirs': ['include/freetype2'],
 }
 
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 d8180f31a0372b76beb84bfb8ae66352b4529c4b..14dc056b132226056ed023b4ef91668af6868885 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
@@ -12,7 +12,7 @@ source_urls = [GNU_SAVANNAH_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 sanity_check_paths = {
-    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'],
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT, 'lib/pkgconfig/freetype2.pc'],
     'dirs': ['include/freetype2'],
 }
 
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 6cd7f858d2a1f8208595575f1fd493ea888e79cc..5a77c82a2712c90985f4cd2216c1cc68df8bfed7 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
@@ -12,7 +12,7 @@ source_urls = [GNU_SAVANNAH_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 sanity_check_paths = {
-    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'],
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT, 'lib/pkgconfig/freetype2.pc'],
     'dirs': ['include/freetype2'],
 }
 
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 115ca243f34aba97e7e2496a9aa35c1191a81536..f0c8e977f83efa56602b057a2636335648a5e0be 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
@@ -12,7 +12,7 @@ source_urls = [GNU_SAVANNAH_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 sanity_check_paths = {
-    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'],
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT, 'lib/pkgconfig/freetype2.pc'],
     'dirs': ['include/freetype2'],
 }
 
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 00039d8f1d4a323fa7a6cb57043936a1d9191e2a..bb44b1c6a9185f3b781002a0df612e002c8cd5c6 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
@@ -13,7 +13,7 @@ source_urls = [GNU_SAVANNAH_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 sanity_check_paths = {
-    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'],
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT, 'lib/pkgconfig/freetype2.pc'],
     'dirs': ['include/freetype2'],
 }
 
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 1df33cbab7fbd1fb3af133ff16333353deda150d..dafae024b098291bd3af68c3471f0d086f6209d5 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
@@ -13,7 +13,7 @@ source_urls = [GNU_SAVANNAH_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 sanity_check_paths = {
-    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'],
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT, 'lib/pkgconfig/freetype2.pc'],
     'dirs': ['include/freetype2'],
 }
 
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 b99078235aeacaaec15b9bf64427d8298dfe2ff5..ba8671fabfda616c2aa239e6a0a0f053494d72e4 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
@@ -12,7 +12,7 @@ source_urls = [GNU_SAVANNAH_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 sanity_check_paths = {
-    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'],
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT, 'lib/pkgconfig/freetype2.pc'],
     'dirs': ['include/freetype2'],
 }
 
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 6187e6b9ba6cee1cf82bb23d2df5f578045d6277..dfc1ea425fa8712eeb6a174cebaeaf8547711edb 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
@@ -12,7 +12,7 @@ source_urls = [GNU_SAVANNAH_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 sanity_check_paths = {
-    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'],
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT, 'lib/pkgconfig/freetype2.pc'],
     'dirs': ['include/freetype2'],
 }
 
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
index 6c789c8bd3ac1111ce999148265cfe0f8b531f5b..93ed64ef3127e33bdd4d9c1e12ac9317bad17687 100644
--- 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
@@ -12,7 +12,7 @@ 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'],
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT, 'lib/pkgconfig/freetype2.pc'],
     'dirs': ['include/freetype2'],
 }
 
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 b585104cabec1c559e800f0bf96d9edc6162cf17..36f7fddf9858b81c29e342ae1d3b0c772232a4fb 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
@@ -12,7 +12,7 @@ source_urls = [GNU_SAVANNAH_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 sanity_check_paths = {
-    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'],
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT, 'lib/pkgconfig/freetype2.pc'],
     'dirs': ['include/freetype2'],
 }
 
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
index c8025842ef6b8a988c8e9185ee236e83503c86e9..c7a87aa9acca1a738f4e83cdee765f918cd54da6 100644
--- 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
@@ -14,7 +14,7 @@ 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'],
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT, 'lib/pkgconfig/freetype2.pc'],
     'dirs': ['include/freetype2'],
 }
 
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
index de48d98038e81c797a4682b781b1b8650390ed3b..47b3494ce434bfc781b5f6d560f62ad2030a069f 100644
--- 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
@@ -14,7 +14,7 @@ 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'],
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT, 'lib/pkgconfig/freetype2.pc'],
     'dirs': ['include/freetype2'],
 }
 
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
index d509fdfff7e14e12f310288ca786fa3fcdb0c3bd..5fa7fbc89e960634020edf4e5379515f36058943 100644
--- 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
@@ -14,7 +14,7 @@ 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'],
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT, 'lib/pkgconfig/freetype2.pc'],
     'dirs': ['include/freetype2'],
 }
 
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 e9d9036e940a074ddc9e4cf38d4e6716c74bcc27..6af71f85bae7577ee876385d1bd82622007fb16e 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
@@ -14,7 +14,7 @@ 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'],
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT, 'lib/pkgconfig/freetype2.pc'],
     'dirs': ['include/freetype2'],
 }
 
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
index 578bf6e2b3a52273b060f4821f6edf2e67c53ccc..7424371c2999170871b01eaf1de2db21b2df6ff3 100644
--- 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
@@ -14,7 +14,7 @@ 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'],
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT, 'lib/pkgconfig/freetype2.pc'],
     'dirs': ['include/freetype2'],
 }
 
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.5.3-foss-2014b.eb b/easybuild/easyconfigs/f/freetype/freetype-2.5.3-foss-2014b.eb
index c6397df9cf9e60b9dda5f9524da1f08be7b00a0e..1840f18b99cfba51be6ffc57b88d16b47def8fe6 100644
--- a/easybuild/easyconfigs/f/freetype/freetype-2.5.3-foss-2014b.eb
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.5.3-foss-2014b.eb
@@ -14,7 +14,7 @@ sources = [SOURCE_TAR_GZ]
 dependencies = [('libpng', '1.6.12')]
 
 sanity_check_paths = {
-    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'],
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT, 'lib/pkgconfig/freetype2.pc'],
     'dirs': ['include/freetype2'],
 }
 
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.5.3-goolf-1.7.20.eb b/easybuild/easyconfigs/f/freetype/freetype-2.5.3-goolf-1.7.20.eb
index c5fb92d43c4f151bdbf760adc52541f881e8a87a..cf4ca6186c312c0147657da9b3685f817da2ba08 100644
--- a/easybuild/easyconfigs/f/freetype/freetype-2.5.3-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.5.3-goolf-1.7.20.eb
@@ -14,7 +14,7 @@ sources = [SOURCE_TAR_GZ]
 dependencies = [('libpng', '1.6.12')]
 
 sanity_check_paths = {
-    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'],
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT, 'lib/pkgconfig/freetype2.pc'],
     'dirs': ['include/freetype2'],
 }
 
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.5.3-intel-2014b.eb b/easybuild/easyconfigs/f/freetype/freetype-2.5.3-intel-2014b.eb
index c0d1a23ea9cf481b6bda79480d1b8a55439e90f9..68312d108df26ef060a24d28e4ff22e4e4cbbf1a 100644
--- a/easybuild/easyconfigs/f/freetype/freetype-2.5.3-intel-2014b.eb
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.5.3-intel-2014b.eb
@@ -14,7 +14,7 @@ sources = [SOURCE_TAR_GZ]
 dependencies = [('libpng', '1.6.12')]
 
 sanity_check_paths = {
-    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'],
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT, 'lib/pkgconfig/freetype2.pc'],
     'dirs': ['include/freetype2'],
 }
 
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.5.5-foss-2015a.eb b/easybuild/easyconfigs/f/freetype/freetype-2.5.5-foss-2015a.eb
index a62c8bab170d8f94db13161c7738b7794358d8f3..e9f0fd7c959882fdd0ff168845aece4264346cfc 100644
--- a/easybuild/easyconfigs/f/freetype/freetype-2.5.5-foss-2015a.eb
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.5.5-foss-2015a.eb
@@ -14,7 +14,7 @@ sources = [SOURCE_TAR_GZ]
 dependencies = [('libpng', '1.6.16')]
 
 sanity_check_paths = {
-    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'],
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT, 'lib/pkgconfig/freetype2.pc'],
     'dirs': ['include/freetype2'],
 }
 
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.5.5-intel-2015a.eb b/easybuild/easyconfigs/f/freetype/freetype-2.5.5-intel-2015a.eb
index 3f93bd607044f78ff89698115b0df86effe25b6f..5eb7f91b58423594ee233daee2957a7a58c53b88 100644
--- a/easybuild/easyconfigs/f/freetype/freetype-2.5.5-intel-2015a.eb
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.5.5-intel-2015a.eb
@@ -14,7 +14,7 @@ sources = [SOURCE_TAR_GZ]
 dependencies = [('libpng', '1.6.16')]
 
 sanity_check_paths = {
-    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'],
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT, 'lib/pkgconfig/freetype2.pc'],
     'dirs': ['include/freetype2'],
 }
 
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.5.5-intel-2015b.eb b/easybuild/easyconfigs/f/freetype/freetype-2.5.5-intel-2015b.eb
index baf0037fb6bd05c168d9b9fd174eda5df34882e4..ca24a618dc1be131169a1fcb474295c67fab6894 100644
--- a/easybuild/easyconfigs/f/freetype/freetype-2.5.5-intel-2015b.eb
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.5.5-intel-2015b.eb
@@ -14,7 +14,7 @@ sources = [SOURCE_TAR_GZ]
 dependencies = [('libpng', '1.6.16')]
 
 sanity_check_paths = {
-    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'],
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT, 'lib/pkgconfig/freetype2.pc'],
     'dirs': ['include/freetype2'],
 }
 
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.6-foss-2015a.eb b/easybuild/easyconfigs/f/freetype/freetype-2.6-foss-2015a.eb
index 3678616622f855c37aeabec97a8ae35f4c8ce5fe..89788124588b4233d1d2bcd61db8bf26eee5d509 100644
--- a/easybuild/easyconfigs/f/freetype/freetype-2.6-foss-2015a.eb
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.6-foss-2015a.eb
@@ -14,7 +14,7 @@ sources = [SOURCE_TAR_GZ]
 dependencies = [('libpng', '1.6.17')]
 
 sanity_check_paths = {
-    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'],
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT, 'lib/pkgconfig/freetype2.pc'],
     'dirs': ['include/freetype2'],
 }
 
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.6-goolf-1.7.20.eb b/easybuild/easyconfigs/f/freetype/freetype-2.6-goolf-1.7.20.eb
index 484ef7705acac9012be473c86b0798b3c5a9105d..af7228f4f5421469eadbf09220ad01825005b70b 100644
--- a/easybuild/easyconfigs/f/freetype/freetype-2.6-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.6-goolf-1.7.20.eb
@@ -14,7 +14,7 @@ sources = [SOURCE_TAR_GZ]
 dependencies = [('libpng', '1.6.17')]
 
 sanity_check_paths = {
-    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'],
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT, 'lib/pkgconfig/freetype2.pc'],
     'dirs': ['include/freetype2'],
 }
 
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.6-intel-2015a.eb b/easybuild/easyconfigs/f/freetype/freetype-2.6-intel-2015a.eb
index 6a1b7e739c956a04be39b4b3c1439138e742eece..316e040e0881748cf5afce930605f538c23bbc08 100644
--- a/easybuild/easyconfigs/f/freetype/freetype-2.6-intel-2015a.eb
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.6-intel-2015a.eb
@@ -14,7 +14,7 @@ sources = [SOURCE_TAR_GZ]
 dependencies = [('libpng', '1.6.17')]
 
 sanity_check_paths = {
-    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'],
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT, 'lib/pkgconfig/freetype2.pc'],
     'dirs': ['include/freetype2'],
 }
 
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.6.1-intel-2015b-libpng-1.6.19.eb b/easybuild/easyconfigs/f/freetype/freetype-2.6.1-intel-2015b-libpng-1.6.19.eb
index ae1e8f4cb7bbfd7fea3db99c7113ac1dc7b6f55a..32b12425a852e0283b685a27c6cd1ca39a7d1771 100644
--- a/easybuild/easyconfigs/f/freetype/freetype-2.6.1-intel-2015b-libpng-1.6.19.eb
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.6.1-intel-2015b-libpng-1.6.19.eb
@@ -16,7 +16,7 @@ versionsuffix = '-libpng-%s' % libpngver
 dependencies = [('libpng', libpngver)]
 
 sanity_check_paths = {
-    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'],
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT, 'lib/pkgconfig/freetype2.pc'],
     'dirs': ['include/freetype2'],
 }
 
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.6.1-intel-2015b.eb b/easybuild/easyconfigs/f/freetype/freetype-2.6.1-intel-2015b.eb
index 0138ab3d151339bc622387832802feae8a8812ca..0913227caf19a6b5c571a4e5710312d98f6299af 100644
--- a/easybuild/easyconfigs/f/freetype/freetype-2.6.1-intel-2015b.eb
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.6.1-intel-2015b.eb
@@ -14,7 +14,7 @@ sources = [SOURCE_TAR_GZ]
 dependencies = [('libpng', '1.6.18')]
 
 sanity_check_paths = {
-    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'],
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT, 'lib/pkgconfig/freetype2.pc'],
     'dirs': ['include/freetype2'],
 }
 
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.6.2-intel-2016a.eb b/easybuild/easyconfigs/f/freetype/freetype-2.6.2-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ce2c31a36a9264bd5baca5decec58f728241497a
--- /dev/null
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.6.2-intel-2016a.eb
@@ -0,0 +1,22 @@
+name = 'freetype'
+version = '2.6.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': 'intel', 'version': '2016a'}
+
+source_urls = [GNU_SAVANNAH_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('libpng', '1.6.21')]
+
+sanity_check_paths = {
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT,
+              'lib/pkgconfig/freetype2.pc'],
+    'dirs': ['include/freetype2'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GATE/GATE-7.0-intel-2015a.eb b/easybuild/easyconfigs/g/GATE/GATE-7.0-intel-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..55757f7ccc5a64c6f5f4ce611ac0a6f5dbc430d9
--- /dev/null
+++ b/easybuild/easyconfigs/g/GATE/GATE-7.0-intel-2015a.eb
@@ -0,0 +1,29 @@
+name = 'GATE'
+version = '7.0'
+
+homepage = 'http://www.opengatecollaboration.org/'
+description = """GATE is an advanced opensource software developed by the international OpenGATE collaboration and
+ dedicated to the numerical simulations in medical imaging. It currently supports simulations of Emission Tomography
+  (Positron Emission Tomography - PET and Single Photon Emission Computed Tomography - SPECT), and Computed Tomography"""
+
+toolchain = {'name': 'intel', 'version': '2015a'}
+
+sources = [('%(namelower)s_v%(version)s.tar_.gz' , "tar xfvz %s")]
+source_urls = ['http://www.opengatecollaboration.org/sites/opengatecollaboration.org/files/']
+
+patches = [
+    'GATE-%(version)s_Makefile-prefix.patch',
+    'GATE-%(version)s_unistdh.patch',
+]
+
+builddependencies = [
+    ('CMake', '3.1.3'),
+]
+
+dependencies = [
+    ('Geant4', '9.6.p04'),
+    ('CLHEP', '2.1.3.1'),
+    ('ROOT', 'v5.34.26'),
+]
+
+moduleclass = 'cae'
diff --git a/easybuild/easyconfigs/g/GATE/GATE-7.0_Makefile-prefix.patch b/easybuild/easyconfigs/g/GATE/GATE-7.0_Makefile-prefix.patch
new file mode 100644
index 0000000000000000000000000000000000000000..eb39ff836c7044cbb8790a714fa6fe5466805802
--- /dev/null
+++ b/easybuild/easyconfigs/g/GATE/GATE-7.0_Makefile-prefix.patch
@@ -0,0 +1,46 @@
+--- gate_v7.0/cluster_tools/filemerger/Makefile.orig	2014-05-12 11:18:16.000000000 +0200
++++ gate_v7.0/cluster_tools/filemerger/Makefile	2015-03-04 10:54:55.461301152 +0100
+@@ -16,6 +16,8 @@
+ INCLUDE := -I./include `geant4-config --cflags` `root-config --cflags`
+ LDFLAGS := `geant4-config --libs` `root-config --glibs`
+ 
++PREFIX := /usr/local
++
+ TARGET := gjm
+ 
+ .PHONY: all clean directories cleanall install uninstall
+@@ -49,8 +51,9 @@
+ 
+ install:
+ 	@echo Installing ...
+-	@$(CP) $(TARGET) /usr/local/bin
++	mkdir -p $(PREFIX)/bin
++	@$(CP) $(TARGET) $(PREFIX)/bin
+ 
+ uninstall:
+ 	@echo Uninstalling...
+-	@$(RM) /usr/local/bin/$(TARGET)
++	@$(RM) $(PREFIX)/bin/$(TARGET)
+--- gate_v7.0/cluster_tools/jobsplitter/Makefile.orig	2014-05-12 11:18:16.000000000 +0200
++++ gate_v7.0/cluster_tools/jobsplitter/Makefile	2015-03-04 10:54:55.461301152 +0100
+@@ -16,6 +16,8 @@
+ INCLUDE := -I./include `geant4-config --cflags`
+ LDFLAGS := `geant4-config --libs`
+ 
++PREFIX := /usr/local
++
+ TARGET := gjs
+ 
+ .PHONY: all clean directories cleanall install uninstall
+@@ -57,8 +59,9 @@
+ 
+ install:
+ 	@echo Installing ...
+-	@$(CP) $(TARGET) /usr/local/bin
++	mkdir -p $(PREFIX)/bin
++	@$(CP) $(TARGET) $(PREFIX)/bin
+ 
+ uninstall:
+ 	@echo Uninstalling...
+-	@$(RM) /usr/local/bin/$(TARGET)
++	@$(RM) $(PREFIX)/bin/$(TARGET)
diff --git a/easybuild/easyconfigs/g/GATE/GATE-7.0_unistdh.patch b/easybuild/easyconfigs/g/GATE/GATE-7.0_unistdh.patch
new file mode 100644
index 0000000000000000000000000000000000000000..13ce5cc6e63d4645254e04f8ddfd9b89950817c2
--- /dev/null
+++ b/easybuild/easyconfigs/g/GATE/GATE-7.0_unistdh.patch
@@ -0,0 +1,10 @@
+--- gate_v7.0/cluster_tools/jobsplitter/include/GateMacfileParser.hh.org	2014-05-12 11:18:16.000000000 +0200
++++ gate_v7.0/cluster_tools/jobsplitter/include/GateMacfileParser.hh	2015-03-04 10:32:24.416298472 +0100
+@@ -19,6 +19,7 @@
+ #include <sstream> 
+ #include <fstream> 
+ #include <math.h>
++#include <unistd.h>
+ 
+ using namespace std;
+ 
diff --git a/easybuild/easyconfigs/g/GATK/GATK-3.3-0-Java-1.8.0_66.eb b/easybuild/easyconfigs/g/GATK/GATK-3.3-0-Java-1.8.0_66.eb
new file mode 100644
index 0000000000000000000000000000000000000000..00459becfc657117baa26a7f178e3ddfe96997c0
--- /dev/null
+++ b/easybuild/easyconfigs/g/GATK/GATK-3.3-0-Java-1.8.0_66.eb
@@ -0,0 +1,42 @@
+##
+# 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 = '3.3-0'
+
+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.8.0_66'
+versionsuffix = '-%s-%s' % (java, javaver)
+dependencies = [(java, javaver)]
+
+modloadmsg = """To execute GATK run: java -jar \\$EBROOTGATK/GenomeAnalysisTK.jar"""
+
+sanity_check_paths = {
+    'files': ["GenomeAnalysisTK.jar"],
+    'dirs': ["resources"],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/GATK/GATK-3.5-Java-1.8.0_66.eb b/easybuild/easyconfigs/g/GATK/GATK-3.5-Java-1.8.0_66.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2dc9a277e24b16f51714356772dc9dc1cd01abf1
--- /dev/null
+++ b/easybuild/easyconfigs/g/GATK/GATK-3.5-Java-1.8.0_66.eb
@@ -0,0 +1,42 @@
+##
+# 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 = '3.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.8.0_66'
+versionsuffix = '-%s-%s' % (java, javaver)
+dependencies = [(java, javaver)]
+
+modloadmsg = """To execute GATK run: java -jar \\$EBROOTGATK/GenomeAnalysisTK.jar"""
+
+sanity_check_paths = {
+    'files': ["GenomeAnalysisTK.jar"],
+    'dirs': ["resources"],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/GCC/GCC-5.3.0.eb b/easybuild/easyconfigs/g/GCC/GCC-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..83ebb4cb78dc3d2bf23d1c15f2127d44fed2de6e
--- /dev/null
+++ b/easybuild/easyconfigs/g/GCC/GCC-5.3.0.eb
@@ -0,0 +1,49 @@
+name = 'GCC'
+version = '5.3.0'
+
+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': ''}
+
+mpfr_version = '3.1.3'
+
+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
+    'ftp://gcc.gnu.org/pub/gcc/infrastructure/',  # GCC dependencies
+    'http://gcc.cybermirror.org/infrastructure/',  # HTTP mirror for GCC dependencies
+]
+
+sources = [
+    SOURCELOWER_TAR_BZ2,
+    'gmp-6.1.0.tar.bz2',
+    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpc-1.0.3.tar.gz',
+    'isl-0.15.tar.bz2',
+]
+
+patches = [('mpfr-%s-allpatches-20151029.patch' % mpfr_version, '../mpfr-%s' % mpfr_version)]
+
+builddependencies = [('M4', '1.4.17')]
+
+checksums = [
+    'c9616fd448f980259c31de613e575719',     # gcc-5.3.0.tar.bz2
+    '86ee6e54ebfc4a90b643a65e402c4048',     # gmp-6.1.0.tar.bz2
+    '7b650781f0a7c4a62e9bc8bdaaa0018b',     # mpfr-3.1.3.tar.gz
+    'd6a1d5f8ddea3abd2cc3e98f58352d26',     # mpc-1.0.3.tar.gz
+    '8428efbbc6f6e2810ce5c1ba73ecf98c',     # isl-0.15.tar.bz2
+    '6476b450c3db177b2250f3549362380e',     # mpfr-3.1.3-allpatches-20151029.patch
+]
+
+languages = ['c', 'c++', 'fortran']
+
+withisl = 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/mpfr-3.1.3-allpatches-20151029.patch b/easybuild/easyconfigs/g/GCC/mpfr-3.1.3-allpatches-20151029.patch
new file mode 100644
index 0000000000000000000000000000000000000000..891831f521e3fc32e59adb76f4dfe42083df1538
--- /dev/null
+++ b/easybuild/easyconfigs/g/GCC/mpfr-3.1.3-allpatches-20151029.patch
@@ -0,0 +1,1830 @@
+diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
+--- mpfr-3.1.3-a/PATCHES	2015-07-02 10:49:23.950112879 +0000
++++ mpfr-3.1.3-b/PATCHES	2015-07-02 10:49:24.042113845 +0000
+@@ -0,0 +1 @@
++lngamma-and-doc
+diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
+--- mpfr-3.1.3-a/VERSION	2015-06-19 19:55:09.000000000 +0000
++++ mpfr-3.1.3-b/VERSION	2015-07-02 10:49:24.042113845 +0000
+@@ -1 +1 @@
+-3.1.3
++3.1.3-p1
+diff -Naurd mpfr-3.1.3-a/doc/mpfr.texi mpfr-3.1.3-b/doc/mpfr.texi
+--- mpfr-3.1.3-a/doc/mpfr.texi	2015-06-19 19:55:11.000000000 +0000
++++ mpfr-3.1.3-b/doc/mpfr.texi	2015-07-02 10:49:24.018113593 +0000
+@@ -810,13 +810,17 @@
+ When the input point is in the closure of the domain of the mathematical
+ function and an input argument is +0 (resp.@: @minus{}0), one considers
+ the limit when the corresponding argument approaches 0 from above
+-(resp.@: below). If the limit is not defined (e.g., @code{mpfr_log} on
+-@minus{}0), the behavior is specified in the description of the MPFR function.
++(resp.@: below), if possible. If the limit is not defined (e.g.,
++@code{mpfr_sqrt} and @code{mpfr_log} on @minus{}0), the behavior is
++specified in the description of the MPFR function, but must be consistent
++with the rule from the above paragraph (e.g., @code{mpfr_log} on @pom{}0
++gives @minus{}Inf).
+ 
+ When the result is equal to 0, its sign is determined by considering the
+ limit as if the input point were not in the domain: If one approaches 0
+ from above (resp.@: below), the result is +0 (resp.@: @minus{}0);
+-for example, @code{mpfr_sin} on +0 gives +0.
++for example, @code{mpfr_sin} on @minus{}0 gives @minus{}0 and
++@code{mpfr_acos} on 1 gives +0 (in all rounding modes).
+ In the other cases, the sign is specified in the description of the MPFR
+ function; for example @code{mpfr_max} on @minus{}0 and +0 gives +0.
+ 
+@@ -832,8 +836,8 @@
+ @c that advantages in practice), like for any bug fix.
+ Example: @code{mpfr_hypot} on (NaN,0) gives NaN, but @code{mpfr_hypot}
+ on (NaN,+Inf) gives +Inf (as specified in @ref{Special Functions}),
+-since for any finite input @var{x}, @code{mpfr_hypot} on (@var{x},+Inf)
+-gives +Inf.
++since for any finite or infinite input @var{x}, @code{mpfr_hypot} on
++(@var{x},+Inf) gives +Inf.
+ 
+ @node Exceptions, Memory Handling, Floating-Point Values on Special Numbers, MPFR Basics
+ @comment  node-name,  next,  previous,  up
+@@ -1581,7 +1585,8 @@
+ @deftypefunx int mpfr_add_z (mpfr_t @var{rop}, mpfr_t @var{op1}, mpz_t @var{op2}, mpfr_rnd_t @var{rnd})
+ @deftypefunx int mpfr_add_q (mpfr_t @var{rop}, mpfr_t @var{op1}, mpq_t @var{op2}, mpfr_rnd_t @var{rnd})
+ Set @var{rop} to @math{@var{op1} + @var{op2}} rounded in the direction
+-@var{rnd}. For types having no signed zero, it is considered unsigned
++@var{rnd}.  The IEEE-754 rules are used, in particular for signed zeros.
++But for types having no signed zeros, 0 is considered unsigned
+ (i.e., (+0) + 0 = (+0) and (@minus{}0) + 0 = (@minus{}0)).
+ The @code{mpfr_add_d} function assumes that the radix of the @code{double} type
+ is a power of 2, with a precision at most that declared by the C implementation
+@@ -1599,7 +1604,8 @@
+ @deftypefunx int mpfr_sub_z (mpfr_t @var{rop}, mpfr_t @var{op1}, mpz_t @var{op2}, mpfr_rnd_t @var{rnd})
+ @deftypefunx int mpfr_sub_q (mpfr_t @var{rop}, mpfr_t @var{op1}, mpq_t @var{op2}, mpfr_rnd_t @var{rnd})
+ Set @var{rop} to @math{@var{op1} - @var{op2}} rounded in the direction
+-@var{rnd}. For types having no signed zero, it is considered unsigned
++@var{rnd}.  The IEEE-754 rules are used, in particular for signed zeros.
++But for types having no signed zeros, 0 is considered unsigned
+ (i.e., (+0) @minus{} 0 = (+0), (@minus{}0) @minus{} 0 = (@minus{}0),
+ 0 @minus{} (+0) = (@minus{}0) and 0 @minus{} (@minus{}0) = (+0)).
+ The same restrictions than for @code{mpfr_add_d} apply to @code{mpfr_d_sub}
+@@ -1615,7 +1621,7 @@
+ Set @var{rop} to @math{@var{op1} @GMPtimes{} @var{op2}} rounded in the
+ direction @var{rnd}.
+ When a result is zero, its sign is the product of the signs of the operands
+-(for types having no signed zero, it is considered positive).
++(for types having no signed zeros, 0 is considered positive).
+ The same restrictions than for @code{mpfr_add_d} apply to @code{mpfr_mul_d}.
+ @end deftypefun
+ 
+@@ -1635,7 +1641,7 @@
+ @deftypefunx int mpfr_div_q (mpfr_t @var{rop}, mpfr_t @var{op1}, mpq_t @var{op2}, mpfr_rnd_t @var{rnd})
+ Set @var{rop} to @math{@var{op1}/@var{op2}} rounded in the direction @var{rnd}.
+ When a result is zero, its sign is the product of the signs of the operands
+-(for types having no signed zero, it is considered positive).
++(for types having no signed zeros, 0 is considered positive).
+ The same restrictions than for @code{mpfr_add_d} apply to @code{mpfr_d_div}
+ and @code{mpfr_div_d}.
+ @end deftypefun
+@@ -1643,15 +1649,18 @@
+ @deftypefun int mpfr_sqrt (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd})
+ @deftypefunx int mpfr_sqrt_ui (mpfr_t @var{rop}, unsigned long int @var{op}, mpfr_rnd_t @var{rnd})
+ Set @var{rop} to @m{\sqrt{@var{op}}, the square root of @var{op}}
+-rounded in the direction @var{rnd} (set @var{rop} to @minus{}0 if @var{op} is
+-@minus{}0, to be consistent with the IEEE 754 standard).
++rounded in the direction @var{rnd}.  Set @var{rop} to @minus{}0 if
++@var{op} is @minus{}0, to be consistent with the IEEE 754 standard.
+ Set @var{rop} to NaN if @var{op} is negative.
+ @end deftypefun
+ 
+ @deftypefun int mpfr_rec_sqrt (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd})
+ Set @var{rop} to @m{1/\sqrt{@var{op}}, the reciprocal square root of @var{op}}
+-rounded in the direction @var{rnd}. Set @var{rop} to +Inf if @var{op} is
+-@pom{}0, +0 if @var{op} is +Inf, and NaN if @var{op} is negative.
++rounded in the direction @var{rnd}.  Set @var{rop} to +Inf if @var{op} is
++@pom{}0, +0 if @var{op} is +Inf, and NaN if @var{op} is negative.  Warning!
++Therefore the result on @minus{}0 is different from the one of the rSqrt
++function recommended by the IEEE 754-2008 standard (Section 9.2.1), which
++is @minus{}Inf instead of +Inf.
+ @end deftypefun
+ 
+ @deftypefun int mpfr_cbrt (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd})
+@@ -1832,7 +1841,9 @@
+ @m{\log_2 @var{op}, log2(@var{op})} or
+ @m{\log_{10} @var{op}, log10(@var{op})}, respectively,
+ rounded in the direction @var{rnd}.
+-Set @var{rop} to @minus{}Inf if @var{op} is @minus{}0
++Set @var{rop} to +0 if @var{op} is 1 (in all rounding modes),
++for consistency with the ISO C99 and IEEE 754-2008 standards.
++Set @var{rop} to @minus{}Inf if @var{op} is @pom{}0
+ (i.e., the sign of the zero has no influence on the result).
+ @end deftypefun
+ 
+@@ -2003,8 +2014,11 @@
+ @deftypefun int mpfr_lngamma (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd})
+ Set @var{rop} to the value of the logarithm of the Gamma function on @var{op},
+ rounded in the direction @var{rnd}.
+-When @math{@minus{}2@var{k}@minus{}1 @le{} @var{op} @le{} @minus{}2@var{k}},
+-@var{k} being a non-negative integer, @var{rop} is set to NaN.
++When @var{op} is 1 or 2, set @var{rop} to +0 (in all rounding modes).
++When @var{op} is an infinity or a nonpositive integer, set @var{rop} to +Inf,
++following the general rules on special values.
++When @math{@minus{}2@var{k}@minus{}1 < @var{op} < @minus{}2@var{k}},
++@var{k} being a nonnegative integer, set @var{rop} to NaN@.
+ See also @code{mpfr_lgamma}.
+ @end deftypefun
+ 
+@@ -2012,10 +2026,11 @@
+ Set @var{rop} to the value of the logarithm of the absolute value of the
+ Gamma function on @var{op}, rounded in the direction @var{rnd}. The sign
+ (1 or @minus{}1) of Gamma(@var{op}) is returned in the object pointed to
+-by @var{signp}. When @var{op} is an infinity or a non-positive integer, set
+-@var{rop} to +Inf. When @var{op} is NaN, @minus{}Inf or a negative integer,
+-*@var{signp} is undefined, and when @var{op} is @pom{}0, *@var{signp} is
+-the sign of the zero.
++by @var{signp}.
++When @var{op} is 1 or 2, set @var{rop} to +0 (in all rounding modes).
++When @var{op} is an infinity or a nonpositive integer, set @var{rop} to +Inf.
++When @var{op} is NaN, @minus{}Inf or a negative integer, *@var{signp} is
++undefined, and when @var{op} is @pom{}0, *@var{signp} is the sign of the zero.
+ @end deftypefun
+ 
+ @deftypefun int mpfr_digamma (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd})
+@@ -2064,7 +2079,10 @@
+ @deftypefunx int mpfr_fms (mpfr_t @var{rop}, mpfr_t @var{op1}, mpfr_t @var{op2}, mpfr_t @var{op3}, mpfr_rnd_t @var{rnd})
+ Set @var{rop} to @math{(@var{op1} @GMPtimes{} @var{op2}) + @var{op3}}
+ (resp.@: @math{(@var{op1} @GMPtimes{} @var{op2}) - @var{op3}})
+-rounded in the direction @var{rnd}.
++rounded in the direction @var{rnd}.  Concerning special values (signed zeros,
++infinities, NaN), these functions behave like a multiplication followed by a
++separate addition or subtraction.  That is, the fused operation matters only
++for rounding.
+ @end deftypefun
+ 
+ @deftypefun int mpfr_agm (mpfr_t @var{rop}, mpfr_t @var{op1}, mpfr_t @var{op2}, mpfr_rnd_t @var{rnd})
+@@ -2089,8 +2107,8 @@
+ i.e., $\sqrt{x^2+y^2}$,
+ @end tex
+ rounded in the direction @var{rnd}.
+-Special values are handled as described in Section F.9.4.3 of
+-the ISO C99 and IEEE 754-2008 standards:
++Special values are handled as described in the ISO C99 (Section F.9.4.3)
++and IEEE 754-2008 (Section 9.2.1) standards:
+ If @var{x} or @var{y} is an infinity, then +Inf is returned in @var{rop},
+ even if the other number is NaN.
+ @end deftypefun
+diff -Naurd mpfr-3.1.3-a/doc/mpfr.info mpfr-3.1.3-b/doc/mpfr.info
+--- mpfr-3.1.3-a/doc/mpfr.info	2015-06-19 19:55:53.000000000 +0000
++++ mpfr-3.1.3-b/doc/mpfr.info	2015-07-02 10:49:38.718267817 +0000
+@@ -1,4 +1,4 @@
+-This is mpfr.info, produced by makeinfo version 5.2 from mpfr.texi.
++This is mpfr.info, produced by makeinfo version 6.0 from mpfr.texi.
+ 
+ This manual documents how to install and use the Multiple Precision
+ Floating-Point Reliable Library, version 3.1.3.
+@@ -55,7 +55,7 @@
+ MPFR Copying Conditions
+ ***********************
+ 
+-The GNU MPFR library (or MPFR for short) is "free"; this means that
++The GNU MPFR library (or MPFR for short) is “free”; this means that
+ everyone is free to use it and free to redistribute it on a free basis.
+ The library is not in the public domain; it is copyrighted and there are
+ restrictions on its distribution, but these restrictions are designed to
+@@ -418,7 +418,7 @@
+ 4.2 Nomenclature and Types
+ ==========================
+ 
+-A "floating-point number", or "float" for short, is an arbitrary
++A “floating-point number”, or “float” for short, is an arbitrary
+ precision significand (also called mantissa) with a limited precision
+ exponent.  The C data type for such objects is ‘mpfr_t’ (internally
+ defined as a one-element array of a structure, and ‘mpfr_ptr’ is the C
+@@ -432,7 +432,7 @@
+ to the other functions supported by MPFR. Unless documented otherwise,
+ the sign bit of a NaN is unspecified.
+ 
+-The "precision" is the number of bits used to represent the significand
++The “precision” is the number of bits used to represent the significand
+ of a floating-point number; the corresponding C data type is
+ ‘mpfr_prec_t’.  The precision can be any integer between ‘MPFR_PREC_MIN’
+ and ‘MPFR_PREC_MAX’.  In the current implementation, ‘MPFR_PREC_MIN’ is
+@@ -446,7 +446,7 @@
+ may abort, crash or have undefined behavior (depending on your C
+ implementation).
+ 
+-The "rounding mode" specifies the way to round the result of a
++The “rounding mode” specifies the way to round the result of a
+ floating-point operation, in case the exact result can not be
+ represented exactly in the destination significand; the corresponding C
+ data type is ‘mpfr_rnd_t’.
+@@ -499,14 +499,14 @@
+ representable numbers, it is rounded to the one with the least
+ significant bit set to zero.  For example, the number 2.5, which is
+ represented by (10.1) in binary, is rounded to (10.0)=2 with a precision
+-of two bits, and not to (11.0)=3.  This rule avoids the "drift"
++of two bits, and not to (11.0)=3.  This rule avoids the “drift”
+ phenomenon mentioned by Knuth in volume 2 of The Art of Computer
+ Programming (Section 4.2.2).
+ 
+    Most MPFR functions take as first argument the destination variable,
+ as second and following arguments the input variables, as last argument
+ a rounding mode, and have a return value of type ‘int’, called the
+-"ternary value".  The value stored in the destination variable is
++“ternary value”.  The value stored in the destination variable is
+ correctly rounded, i.e., MPFR behaves as if it computed the result with
+ an infinite precision, then rounded it to the precision of this
+ variable.  The input variables are regarded as exact (in particular,
+@@ -572,15 +572,18 @@
+    When the input point is in the closure of the domain of the
+ mathematical function and an input argument is +0 (resp. −0), one
+ considers the limit when the corresponding argument approaches 0 from
+-above (resp. below).  If the limit is not defined (e.g., ‘mpfr_log’ on
+-−0), the behavior is specified in the description of the MPFR function.
++above (resp. below), if possible.  If the limit is not defined (e.g.,
++‘mpfr_sqrt’ and ‘mpfr_log’ on −0), the behavior is specified in the
++description of the MPFR function, but must be consistent with the rule
++from the above paragraph (e.g., ‘mpfr_log’ on ±0 gives −Inf).
+ 
+    When the result is equal to 0, its sign is determined by considering
+ the limit as if the input point were not in the domain: If one
+ approaches 0 from above (resp. below), the result is +0 (resp. −0); for
+-example, ‘mpfr_sin’ on +0 gives +0.  In the other cases, the sign is
+-specified in the description of the MPFR function; for example
+-‘mpfr_max’ on −0 and +0 gives +0.
++example, ‘mpfr_sin’ on −0 gives −0 and ‘mpfr_acos’ on 1 gives +0 (in all
++rounding modes).  In the other cases, the sign is specified in the
++description of the MPFR function; for example ‘mpfr_max’ on −0 and +0
++gives +0.
+ 
+    When the input point is not in the closure of the domain of the
+ function, the result is NaN. Example: ‘mpfr_sqrt’ on −17 gives NaN.
+@@ -590,8 +593,8 @@
+ numbers; such a case is always explicitly specified in *note MPFR
+ Interface::.  Example: ‘mpfr_hypot’ on (NaN,0) gives NaN, but
+ ‘mpfr_hypot’ on (NaN,+Inf) gives +Inf (as specified in *note Special
+-Functions::), since for any finite input X, ‘mpfr_hypot’ on (X,+Inf)
+-gives +Inf.
++Functions::), since for any finite or infinite input X, ‘mpfr_hypot’ on
++(X,+Inf) gives +Inf.
+ 
+ 
+ File: mpfr.info,  Node: Exceptions,  Next: Memory Handling,  Prev: Floating-Point Values on Special Numbers,  Up: MPFR Basics
+@@ -1253,8 +1256,9 @@
+           mpfr_rnd_t RND)
+  -- Function: int mpfr_add_q (mpfr_t ROP, mpfr_t OP1, mpq_t OP2,
+           mpfr_rnd_t RND)
+-     Set ROP to OP1 + OP2 rounded in the direction RND.  For types
+-     having no signed zero, it is considered unsigned (i.e., (+0) + 0 =
++     Set ROP to OP1 + OP2 rounded in the direction RND.  The IEEE-754
++     rules are used, in particular for signed zeros.  But for types
++     having no signed zeros, 0 is considered unsigned (i.e., (+0) + 0 =
+      (+0) and (−0) + 0 = (−0)).  The ‘mpfr_add_d’ function assumes that
+      the radix of the ‘double’ type is a power of 2, with a precision at
+      most that declared by the C implementation (macro
+@@ -1280,8 +1284,9 @@
+           mpfr_rnd_t RND)
+  -- Function: int mpfr_sub_q (mpfr_t ROP, mpfr_t OP1, mpq_t OP2,
+           mpfr_rnd_t RND)
+-     Set ROP to OP1 - OP2 rounded in the direction RND.  For types
+-     having no signed zero, it is considered unsigned (i.e., (+0) − 0 =
++     Set ROP to OP1 - OP2 rounded in the direction RND.  The IEEE-754
++     rules are used, in particular for signed zeros.  But for types
++     having no signed zeros, 0 is considered unsigned (i.e., (+0) − 0 =
+      (+0), (−0) − 0 = (−0), 0 − (+0) = (−0) and 0 − (−0) = (+0)).  The
+      same restrictions than for ‘mpfr_add_d’ apply to ‘mpfr_d_sub’ and
+      ‘mpfr_sub_d’.
+@@ -1300,7 +1305,7 @@
+           mpfr_rnd_t RND)
+      Set ROP to OP1 times OP2 rounded in the direction RND.  When a
+      result is zero, its sign is the product of the signs of the
+-     operands (for types having no signed zero, it is considered
++     operands (for types having no signed zeros, 0 is considered
+      positive).  The same restrictions than for ‘mpfr_add_d’ apply to
+      ‘mpfr_mul_d’.
+ 
+@@ -1327,21 +1332,24 @@
+           mpfr_rnd_t RND)
+      Set ROP to OP1/OP2 rounded in the direction RND.  When a result is
+      zero, its sign is the product of the signs of the operands (for
+-     types having no signed zero, it is considered positive).  The same
++     types having no signed zeros, 0 is considered positive).  The same
+      restrictions than for ‘mpfr_add_d’ apply to ‘mpfr_d_div’ and
+      ‘mpfr_div_d’.
+ 
+  -- Function: int mpfr_sqrt (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+  -- Function: int mpfr_sqrt_ui (mpfr_t ROP, unsigned long int OP,
+           mpfr_rnd_t RND)
+-     Set ROP to the square root of OP rounded in the direction RND (set
+-     ROP to −0 if OP is −0, to be consistent with the IEEE 754
+-     standard).  Set ROP to NaN if OP is negative.
++     Set ROP to the square root of OP rounded in the direction RND.  Set
++     ROP to −0 if OP is −0, to be consistent with the IEEE 754 standard.
++     Set ROP to NaN if OP is negative.
+ 
+  -- Function: int mpfr_rec_sqrt (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+      Set ROP to the reciprocal square root of OP rounded in the
+      direction RND.  Set ROP to +Inf if OP is ±0, +0 if OP is +Inf, and
+-     NaN if OP is negative.
++     NaN if OP is negative.  Warning!  Therefore the result on −0 is
++     different from the one of the rSqrt function recommended by the
++     IEEE 754-2008 standard (Section 9.2.1), which is −Inf instead of
++     +Inf.
+ 
+  -- Function: int mpfr_cbrt (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+  -- Function: int mpfr_root (mpfr_t ROP, mpfr_t OP, unsigned long int K,
+@@ -1515,8 +1523,10 @@
+  -- Function: int mpfr_log2 (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+  -- Function: int mpfr_log10 (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+      Set ROP to the natural logarithm of OP, log2(OP) or log10(OP),
+-     respectively, rounded in the direction RND.  Set ROP to −Inf if OP
+-     is −0 (i.e., the sign of the zero has no influence on the result).
++     respectively, rounded in the direction RND.  Set ROP to +0 if OP is
++     1 (in all rounding modes), for consistency with the ISO C99 and
++     IEEE 754-2008 standards.  Set ROP to −Inf if OP is ±0 (i.e., the
++     sign of the zero has no influence on the result).
+ 
+  -- Function: int mpfr_exp (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+  -- Function: int mpfr_exp2 (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+@@ -1649,17 +1659,21 @@
+ 
+  -- Function: int mpfr_lngamma (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+      Set ROP to the value of the logarithm of the Gamma function on OP,
+-     rounded in the direction RND.  When −2K−1 <= OP <= −2K, K being a
+-     non-negative integer, ROP is set to NaN. See also ‘mpfr_lgamma’.
++     rounded in the direction RND.  When OP is 1 or 2, set ROP to +0 (in
++     all rounding modes).  When OP is an infinity or a nonpositive
++     integer, set ROP to +Inf, following the general rules on special
++     values.  When −2K−1 < OP < −2K, K being a nonnegative integer, set
++     ROP to NaN.  See also ‘mpfr_lgamma’.
+ 
+  -- Function: int mpfr_lgamma (mpfr_t ROP, int *SIGNP, mpfr_t OP,
+           mpfr_rnd_t RND)
+      Set ROP to the value of the logarithm of the absolute value of the
+      Gamma function on OP, rounded in the direction RND.  The sign (1 or
+      −1) of Gamma(OP) is returned in the object pointed to by SIGNP.
+-     When OP is an infinity or a non-positive integer, set ROP to +Inf.
+-     When OP is NaN, −Inf or a negative integer, *SIGNP is undefined,
+-     and when OP is ±0, *SIGNP is the sign of the zero.
++     When OP is 1 or 2, set ROP to +0 (in all rounding modes).  When OP
++     is an infinity or a nonpositive integer, set ROP to +Inf.  When OP
++     is NaN, −Inf or a negative integer, *SIGNP is undefined, and when
++     OP is ±0, *SIGNP is the sign of the zero.
+ 
+  -- Function: int mpfr_digamma (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+      Set ROP to the value of the Digamma (sometimes also called Psi)
+@@ -1703,7 +1717,10 @@
+  -- Function: int mpfr_fms (mpfr_t ROP, mpfr_t OP1, mpfr_t OP2, mpfr_t
+           OP3, mpfr_rnd_t RND)
+      Set ROP to (OP1 times OP2) + OP3 (resp. (OP1 times OP2) - OP3)
+-     rounded in the direction RND.
++     rounded in the direction RND.  Concerning special values (signed
++     zeros, infinities, NaN), these functions behave like a
++     multiplication followed by a separate addition or subtraction.
++     That is, the fused operation matters only for rounding.
+ 
+  -- Function: int mpfr_agm (mpfr_t ROP, mpfr_t OP1, mpfr_t OP2,
+           mpfr_rnd_t RND)
+@@ -1717,9 +1734,10 @@
+           RND)
+      Set ROP to the Euclidean norm of X and Y, i.e., the square root of
+      the sum of the squares of X and Y, rounded in the direction RND.
+-     Special values are handled as described in Section F.9.4.3 of the
+-     ISO C99 and IEEE 754-2008 standards: If X or Y is an infinity, then
+-     +Inf is returned in ROP, even if the other number is NaN.
++     Special values are handled as described in the ISO C99 (Section
++     F.9.4.3) and IEEE 754-2008 (Section 9.2.1) standards: If X or Y is
++     an infinity, then +Inf is returned in ROP, even if the other number
++     is NaN.
+ 
+  -- Function: int mpfr_ai (mpfr_t ROP, mpfr_t X, mpfr_rnd_t RND)
+      Set ROP to the value of the Airy function Ai on X, rounded in the
+@@ -2670,7 +2688,7 @@
+ 5.16 Internals
+ ==============
+ 
+-A "limb" means the part of a multi-precision number that fits in a
++A “limb” means the part of a multi-precision number that fits in a
+ single word.  Usually a limb contains 32 or 64 bits.  The C data type
+ for a limb is ‘mp_limb_t’.
+ 
+@@ -3140,7 +3158,7 @@
+   0. PREAMBLE
+ 
+      The purpose of this License is to make a manual, textbook, or other
+-     functional and useful document "free" in the sense of freedom: to
++     functional and useful document “free” in the sense of freedom: to
+      assure everyone the effective freedom to copy and redistribute it,
+      with or without modifying it, either commercially or
+      noncommercially.  Secondarily, this License preserves for the
+@@ -3655,9 +3673,9 @@
+ * Menu:
+ 
+ * mpfr_abs:                              Basic Arithmetic Functions.
+-                                                              (line 160)
+-* mpfr_acos:                             Special Functions.   (line  51)
+-* mpfr_acosh:                            Special Functions.   (line 115)
++                                                              (line 165)
++* mpfr_acos:                             Special Functions.   (line  53)
++* mpfr_acosh:                            Special Functions.   (line 117)
+ * mpfr_add:                              Basic Arithmetic Functions.
+                                                               (line   6)
+ * mpfr_add_d:                            Basic Arithmetic Functions.
+@@ -3670,15 +3688,15 @@
+                                                               (line   8)
+ * mpfr_add_z:                            Basic Arithmetic Functions.
+                                                               (line  14)
+-* mpfr_agm:                              Special Functions.   (line 210)
+-* mpfr_ai:                               Special Functions.   (line 226)
+-* mpfr_asin:                             Special Functions.   (line  52)
+-* mpfr_asinh:                            Special Functions.   (line 116)
++* mpfr_agm:                              Special Functions.   (line 219)
++* mpfr_ai:                               Special Functions.   (line 236)
++* mpfr_asin:                             Special Functions.   (line  54)
++* mpfr_asinh:                            Special Functions.   (line 118)
+ * mpfr_asprintf:                         Formatted Output Functions.
+                                                               (line 193)
+-* mpfr_atan:                             Special Functions.   (line  53)
+-* mpfr_atan2:                            Special Functions.   (line  63)
+-* mpfr_atanh:                            Special Functions.   (line 117)
++* mpfr_atan:                             Special Functions.   (line  55)
++* mpfr_atan2:                            Special Functions.   (line  65)
++* mpfr_atanh:                            Special Functions.   (line 119)
+ * mpfr_buildopt_decimal_p:               Miscellaneous Functions.
+                                                               (line 162)
+ * mpfr_buildopt_gmpinternals_p:          Miscellaneous Functions.
+@@ -3690,7 +3708,7 @@
+ * mpfr_can_round:                        Rounding Related Functions.
+                                                               (line  39)
+ * mpfr_cbrt:                             Basic Arithmetic Functions.
+-                                                              (line 108)
++                                                              (line 113)
+ * mpfr_ceil:                             Integer Related Functions.
+                                                               (line   7)
+ * mpfr_check_range:                      Exception Related Functions.
+@@ -3735,18 +3753,18 @@
+                                                               (line  27)
+ * mpfr_cmp_z:                            Comparison Functions.
+                                                               (line  11)
+-* mpfr_const_catalan:                    Special Functions.   (line 237)
+-* mpfr_const_euler:                      Special Functions.   (line 236)
+-* mpfr_const_log2:                       Special Functions.   (line 234)
+-* mpfr_const_pi:                         Special Functions.   (line 235)
++* mpfr_const_catalan:                    Special Functions.   (line 247)
++* mpfr_const_euler:                      Special Functions.   (line 246)
++* mpfr_const_log2:                       Special Functions.   (line 244)
++* mpfr_const_pi:                         Special Functions.   (line 245)
+ * mpfr_copysign:                         Miscellaneous Functions.
+                                                               (line 109)
+-* mpfr_cos:                              Special Functions.   (line  29)
+-* mpfr_cosh:                             Special Functions.   (line  95)
+-* mpfr_cot:                              Special Functions.   (line  47)
+-* mpfr_coth:                             Special Functions.   (line 111)
+-* mpfr_csc:                              Special Functions.   (line  46)
+-* mpfr_csch:                             Special Functions.   (line 110)
++* mpfr_cos:                              Special Functions.   (line  31)
++* mpfr_cosh:                             Special Functions.   (line  97)
++* mpfr_cot:                              Special Functions.   (line  49)
++* mpfr_coth:                             Special Functions.   (line 113)
++* mpfr_csc:                              Special Functions.   (line  48)
++* mpfr_csch:                             Special Functions.   (line 112)
+ * mpfr_custom_get_exp:                   Custom Interface.    (line  75)
+ * mpfr_custom_get_kind:                  Custom Interface.    (line  65)
+ * mpfr_custom_get_significand:           Custom Interface.    (line  70)
+@@ -3756,47 +3774,47 @@
+ * mpfr_custom_move:                      Custom Interface.    (line  82)
+ * MPFR_DECL_INIT:                        Initialization Functions.
+                                                               (line  74)
+-* mpfr_digamma:                          Special Functions.   (line 166)
++* mpfr_digamma:                          Special Functions.   (line 172)
+ * mpfr_dim:                              Basic Arithmetic Functions.
+-                                                              (line 166)
++                                                              (line 171)
+ * mpfr_div:                              Basic Arithmetic Functions.
+-                                                              (line  72)
++                                                              (line  74)
+ * mpfr_divby0_p:                         Exception Related Functions.
+                                                               (line 134)
+ * mpfr_div_2exp:                         Compatibility with MPF.
+                                                               (line  49)
+ * mpfr_div_2si:                          Basic Arithmetic Functions.
+-                                                              (line 181)
++                                                              (line 186)
+ * mpfr_div_2ui:                          Basic Arithmetic Functions.
+-                                                              (line 179)
++                                                              (line 184)
+ * mpfr_div_d:                            Basic Arithmetic Functions.
+-                                                              (line  84)
++                                                              (line  86)
+ * mpfr_div_q:                            Basic Arithmetic Functions.
+-                                                              (line  88)
++                                                              (line  90)
+ * mpfr_div_si:                           Basic Arithmetic Functions.
+-                                                              (line  80)
++                                                              (line  82)
+ * mpfr_div_ui:                           Basic Arithmetic Functions.
+-                                                              (line  76)
++                                                              (line  78)
+ * mpfr_div_z:                            Basic Arithmetic Functions.
+-                                                              (line  86)
++                                                              (line  88)
+ * mpfr_d_div:                            Basic Arithmetic Functions.
+-                                                              (line  82)
++                                                              (line  84)
+ * mpfr_d_sub:                            Basic Arithmetic Functions.
+-                                                              (line  35)
+-* mpfr_eint:                             Special Functions.   (line 133)
++                                                              (line  36)
++* mpfr_eint:                             Special Functions.   (line 135)
+ * mpfr_eq:                               Compatibility with MPF.
+                                                               (line  28)
+ * mpfr_equal_p:                          Comparison Functions.
+                                                               (line  59)
+ * mpfr_erangeflag_p:                     Exception Related Functions.
+                                                               (line 137)
+-* mpfr_erf:                              Special Functions.   (line 177)
+-* mpfr_erfc:                             Special Functions.   (line 178)
+-* mpfr_exp:                              Special Functions.   (line  23)
+-* mpfr_exp10:                            Special Functions.   (line  25)
+-* mpfr_exp2:                             Special Functions.   (line  24)
+-* mpfr_expm1:                            Special Functions.   (line 129)
+-* mpfr_fac_ui:                           Special Functions.   (line 121)
++* mpfr_erf:                              Special Functions.   (line 183)
++* mpfr_erfc:                             Special Functions.   (line 184)
++* mpfr_exp:                              Special Functions.   (line  25)
++* mpfr_exp10:                            Special Functions.   (line  27)
++* mpfr_exp2:                             Special Functions.   (line  26)
++* mpfr_expm1:                            Special Functions.   (line 131)
++* mpfr_fac_ui:                           Special Functions.   (line 123)
+ * mpfr_fits_intmax_p:                    Conversion Functions.
+                                                               (line 150)
+ * mpfr_fits_sint_p:                      Conversion Functions.
+@@ -3815,20 +3833,20 @@
+                                                               (line 147)
+ * mpfr_floor:                            Integer Related Functions.
+                                                               (line   8)
+-* mpfr_fma:                              Special Functions.   (line 203)
++* mpfr_fma:                              Special Functions.   (line 209)
+ * mpfr_fmod:                             Integer Related Functions.
+                                                               (line  92)
+-* mpfr_fms:                              Special Functions.   (line 205)
++* mpfr_fms:                              Special Functions.   (line 211)
+ * mpfr_fprintf:                          Formatted Output Functions.
+                                                               (line 157)
+ * mpfr_frac:                             Integer Related Functions.
+                                                               (line  76)
+-* mpfr_free_cache:                       Special Functions.   (line 244)
++* mpfr_free_cache:                       Special Functions.   (line 254)
+ * mpfr_free_str:                         Conversion Functions.
+                                                               (line 137)
+ * mpfr_frexp:                            Conversion Functions.
+                                                               (line  45)
+-* mpfr_gamma:                            Special Functions.   (line 148)
++* mpfr_gamma:                            Special Functions.   (line 150)
+ * mpfr_get_d:                            Conversion Functions.
+                                                               (line   7)
+ * mpfr_get_decimal64:                    Conversion Functions.
+@@ -3887,7 +3905,7 @@
+                                                               (line  56)
+ * mpfr_greater_p:                        Comparison Functions.
+                                                               (line  55)
+-* mpfr_hypot:                            Special Functions.   (line 218)
++* mpfr_hypot:                            Special Functions.   (line 227)
+ * mpfr_inexflag_p:                       Exception Related Functions.
+                                                               (line 136)
+ * mpfr_inf_p:                            Comparison Functions.
+@@ -3922,21 +3940,21 @@
+                                                               (line  31)
+ * mpfr_integer_p:                        Integer Related Functions.
+                                                               (line 119)
+-* mpfr_j0:                               Special Functions.   (line 182)
+-* mpfr_j1:                               Special Functions.   (line 183)
+-* mpfr_jn:                               Special Functions.   (line 184)
++* mpfr_j0:                               Special Functions.   (line 188)
++* mpfr_j1:                               Special Functions.   (line 189)
++* mpfr_jn:                               Special Functions.   (line 190)
+ * mpfr_lessequal_p:                      Comparison Functions.
+                                                               (line  58)
+ * mpfr_lessgreater_p:                    Comparison Functions.
+                                                               (line  64)
+ * mpfr_less_p:                           Comparison Functions.
+                                                               (line  57)
+-* mpfr_lgamma:                           Special Functions.   (line 157)
+-* mpfr_li2:                              Special Functions.   (line 143)
+-* mpfr_lngamma:                          Special Functions.   (line 152)
++* mpfr_lgamma:                           Special Functions.   (line 162)
++* mpfr_li2:                              Special Functions.   (line 145)
++* mpfr_lngamma:                          Special Functions.   (line 154)
+ * mpfr_log:                              Special Functions.   (line  16)
+ * mpfr_log10:                            Special Functions.   (line  18)
+-* mpfr_log1p:                            Special Functions.   (line 125)
++* mpfr_log1p:                            Special Functions.   (line 127)
+ * mpfr_log2:                             Special Functions.   (line  17)
+ * mpfr_max:                              Miscellaneous Functions.
+                                                               (line  22)
+@@ -3947,29 +3965,29 @@
+ * mpfr_modf:                             Integer Related Functions.
+                                                               (line  82)
+ * mpfr_mul:                              Basic Arithmetic Functions.
+-                                                              (line  51)
++                                                              (line  53)
+ * mpfr_mul_2exp:                         Compatibility with MPF.
+                                                               (line  47)
+ * mpfr_mul_2si:                          Basic Arithmetic Functions.
+-                                                              (line 174)
++                                                              (line 179)
+ * mpfr_mul_2ui:                          Basic Arithmetic Functions.
+-                                                              (line 172)
++                                                              (line 177)
+ * mpfr_mul_d:                            Basic Arithmetic Functions.
+-                                                              (line  57)
++                                                              (line  59)
+ * mpfr_mul_q:                            Basic Arithmetic Functions.
+-                                                              (line  61)
++                                                              (line  63)
+ * mpfr_mul_si:                           Basic Arithmetic Functions.
+-                                                              (line  55)
++                                                              (line  57)
+ * mpfr_mul_ui:                           Basic Arithmetic Functions.
+-                                                              (line  53)
++                                                              (line  55)
+ * mpfr_mul_z:                            Basic Arithmetic Functions.
+-                                                              (line  59)
++                                                              (line  61)
+ * mpfr_nanflag_p:                        Exception Related Functions.
+                                                               (line 135)
+ * mpfr_nan_p:                            Comparison Functions.
+                                                               (line  39)
+ * mpfr_neg:                              Basic Arithmetic Functions.
+-                                                              (line 159)
++                                                              (line 164)
+ * mpfr_nextabove:                        Miscellaneous Functions.
+                                                               (line  15)
+ * mpfr_nextbelow:                        Miscellaneous Functions.
+@@ -3983,13 +4001,13 @@
+ * mpfr_overflow_p:                       Exception Related Functions.
+                                                               (line 133)
+ * mpfr_pow:                              Basic Arithmetic Functions.
+-                                                              (line 116)
++                                                              (line 121)
+ * mpfr_pow_si:                           Basic Arithmetic Functions.
+-                                                              (line 120)
++                                                              (line 125)
+ * mpfr_pow_ui:                           Basic Arithmetic Functions.
+-                                                              (line 118)
++                                                              (line 123)
+ * mpfr_pow_z:                            Basic Arithmetic Functions.
+-                                                              (line 122)
++                                                              (line 127)
+ * mpfr_prec_round:                       Rounding Related Functions.
+                                                               (line  13)
+ * ‘mpfr_prec_t’:                         Nomenclature and Types.
+@@ -3999,7 +4017,7 @@
+ * mpfr_print_rnd_mode:                   Rounding Related Functions.
+                                                               (line  71)
+ * mpfr_rec_sqrt:                         Basic Arithmetic Functions.
+-                                                              (line 103)
++                                                              (line 105)
+ * mpfr_regular_p:                        Comparison Functions.
+                                                               (line  43)
+ * mpfr_reldiff:                          Compatibility with MPF.
+@@ -4021,11 +4039,11 @@
+ * ‘mpfr_rnd_t’:                          Nomenclature and Types.
+                                                               (line  34)
+ * mpfr_root:                             Basic Arithmetic Functions.
+-                                                              (line 109)
++                                                              (line 114)
+ * mpfr_round:                            Integer Related Functions.
+                                                               (line   9)
+-* mpfr_sec:                              Special Functions.   (line  45)
+-* mpfr_sech:                             Special Functions.   (line 109)
++* mpfr_sec:                              Special Functions.   (line  47)
++* mpfr_sech:                             Special Functions.   (line 111)
+ * mpfr_set:                              Assignment Functions.
+                                                               (line   9)
+ * mpfr_setsign:                          Miscellaneous Functions.
+@@ -4100,57 +4118,57 @@
+                                                               (line  49)
+ * mpfr_signbit:                          Miscellaneous Functions.
+                                                               (line  99)
+-* mpfr_sin:                              Special Functions.   (line  30)
+-* mpfr_sinh:                             Special Functions.   (line  96)
+-* mpfr_sinh_cosh:                        Special Functions.   (line 101)
+-* mpfr_sin_cos:                          Special Functions.   (line  35)
++* mpfr_sin:                              Special Functions.   (line  32)
++* mpfr_sinh:                             Special Functions.   (line  98)
++* mpfr_sinh_cosh:                        Special Functions.   (line 103)
++* mpfr_sin_cos:                          Special Functions.   (line  37)
+ * mpfr_si_div:                           Basic Arithmetic Functions.
+-                                                              (line  78)
++                                                              (line  80)
+ * mpfr_si_sub:                           Basic Arithmetic Functions.
+-                                                              (line  31)
++                                                              (line  32)
+ * mpfr_snprintf:                         Formatted Output Functions.
+                                                               (line 180)
+ * mpfr_sprintf:                          Formatted Output Functions.
+                                                               (line 170)
+ * mpfr_sqr:                              Basic Arithmetic Functions.
+-                                                              (line  69)
++                                                              (line  71)
+ * mpfr_sqrt:                             Basic Arithmetic Functions.
+-                                                              (line  96)
++                                                              (line  98)
+ * mpfr_sqrt_ui:                          Basic Arithmetic Functions.
+-                                                              (line  97)
++                                                              (line  99)
+ * mpfr_strtofr:                          Assignment Functions.
+                                                               (line  80)
+ * mpfr_sub:                              Basic Arithmetic Functions.
+-                                                              (line  25)
++                                                              (line  26)
+ * mpfr_subnormalize:                     Exception Related Functions.
+                                                               (line  60)
+ * mpfr_sub_d:                            Basic Arithmetic Functions.
+-                                                              (line  37)
++                                                              (line  38)
+ * mpfr_sub_q:                            Basic Arithmetic Functions.
+-                                                              (line  43)
++                                                              (line  44)
+ * mpfr_sub_si:                           Basic Arithmetic Functions.
+-                                                              (line  33)
++                                                              (line  34)
+ * mpfr_sub_ui:                           Basic Arithmetic Functions.
+-                                                              (line  29)
++                                                              (line  30)
+ * mpfr_sub_z:                            Basic Arithmetic Functions.
+-                                                              (line  41)
+-* mpfr_sum:                              Special Functions.   (line 252)
++                                                              (line  42)
++* mpfr_sum:                              Special Functions.   (line 262)
+ * mpfr_swap:                             Assignment Functions.
+                                                               (line 150)
+ * ‘mpfr_t’:                              Nomenclature and Types.
+                                                               (line   6)
+-* mpfr_tan:                              Special Functions.   (line  31)
+-* mpfr_tanh:                             Special Functions.   (line  97)
++* mpfr_tan:                              Special Functions.   (line  33)
++* mpfr_tanh:                             Special Functions.   (line  99)
+ * mpfr_trunc:                            Integer Related Functions.
+                                                               (line  10)
+ * mpfr_ui_div:                           Basic Arithmetic Functions.
+-                                                              (line  74)
++                                                              (line  76)
+ * mpfr_ui_pow:                           Basic Arithmetic Functions.
+-                                                              (line 126)
++                                                              (line 131)
+ * mpfr_ui_pow_ui:                        Basic Arithmetic Functions.
+-                                                              (line 124)
++                                                              (line 129)
+ * mpfr_ui_sub:                           Basic Arithmetic Functions.
+-                                                              (line  27)
++                                                              (line  28)
+ * mpfr_underflow_p:                      Exception Related Functions.
+                                                               (line 132)
+ * mpfr_unordered_p:                      Comparison Functions.
+@@ -4181,61 +4199,61 @@
+                                                               (line 182)
+ * mpfr_vsprintf:                         Formatted Output Functions.
+                                                               (line 171)
+-* mpfr_y0:                               Special Functions.   (line 193)
+-* mpfr_y1:                               Special Functions.   (line 194)
+-* mpfr_yn:                               Special Functions.   (line 195)
++* mpfr_y0:                               Special Functions.   (line 199)
++* mpfr_y1:                               Special Functions.   (line 200)
++* mpfr_yn:                               Special Functions.   (line 201)
+ * mpfr_zero_p:                           Comparison Functions.
+                                                               (line  42)
+-* mpfr_zeta:                             Special Functions.   (line 171)
+-* mpfr_zeta_ui:                          Special Functions.   (line 172)
++* mpfr_zeta:                             Special Functions.   (line 177)
++* mpfr_zeta_ui:                          Special Functions.   (line 178)
+ * mpfr_z_sub:                            Basic Arithmetic Functions.
+-                                                              (line  39)
++                                                              (line  40)
+ 
+ 
+ 
+ Tag Table:
+ Node: Top775
+ Node: Copying2007
+-Node: Introduction to MPFR3766
+-Node: Installing MPFR5880
+-Node: Reporting Bugs11323
+-Node: MPFR Basics13353
+-Node: Headers and Libraries13669
+-Node: Nomenclature and Types16828
+-Node: MPFR Variable Conventions18874
+-Node: Rounding Modes20418
+-Ref: ternary value21544
+-Node: Floating-Point Values on Special Numbers23526
+-Node: Exceptions26572
+-Node: Memory Handling29749
+-Node: MPFR Interface30894
+-Node: Initialization Functions33008
+-Node: Assignment Functions40318
+-Node: Combined Initialization and Assignment Functions49673
+-Node: Conversion Functions50974
+-Node: Basic Arithmetic Functions60035
+-Node: Comparison Functions69200
+-Node: Special Functions72687
+-Node: Input and Output Functions86672
+-Node: Formatted Output Functions88644
+-Node: Integer Related Functions98431
+-Node: Rounding Related Functions105051
+-Node: Miscellaneous Functions108888
+-Node: Exception Related Functions117568
+-Node: Compatibility with MPF124386
+-Node: Custom Interface127127
+-Node: Internals131526
+-Node: API Compatibility133066
+-Node: Type and Macro Changes134995
+-Node: Added Functions137844
+-Node: Changed Functions141132
+-Node: Removed Functions145545
+-Node: Other Changes145973
+-Node: Contributors147576
+-Node: References150219
+-Node: GNU Free Documentation License151973
+-Node: Concept Index174562
+-Node: Function and Type Index180659
++Node: Introduction to MPFR3770
++Node: Installing MPFR5884
++Node: Reporting Bugs11327
++Node: MPFR Basics13357
++Node: Headers and Libraries13673
++Node: Nomenclature and Types16832
++Node: MPFR Variable Conventions18894
++Node: Rounding Modes20438
++Ref: ternary value21568
++Node: Floating-Point Values on Special Numbers23554
++Node: Exceptions26813
++Node: Memory Handling29990
++Node: MPFR Interface31135
++Node: Initialization Functions33249
++Node: Assignment Functions40559
++Node: Combined Initialization and Assignment Functions49914
++Node: Conversion Functions51215
++Node: Basic Arithmetic Functions60276
++Node: Comparison Functions69777
++Node: Special Functions73264
++Node: Input and Output Functions87862
++Node: Formatted Output Functions89834
++Node: Integer Related Functions99621
++Node: Rounding Related Functions106241
++Node: Miscellaneous Functions110078
++Node: Exception Related Functions118758
++Node: Compatibility with MPF125576
++Node: Custom Interface128317
++Node: Internals132716
++Node: API Compatibility134260
++Node: Type and Macro Changes136189
++Node: Added Functions139038
++Node: Changed Functions142326
++Node: Removed Functions146739
++Node: Other Changes147167
++Node: Contributors148770
++Node: References151413
++Node: GNU Free Documentation License153167
++Node: Concept Index175760
++Node: Function and Type Index181857
+ 
+ End Tag Table
+ 
+diff -Naurd mpfr-3.1.3-a/src/lngamma.c mpfr-3.1.3-b/src/lngamma.c
+--- mpfr-3.1.3-a/src/lngamma.c	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/src/lngamma.c	2015-07-02 10:49:24.018113593 +0000
+@@ -603,16 +603,17 @@
+       mpfr_get_prec (y), mpfr_log_prec, y, inex));
+ 
+   /* special cases */
+-  if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (x)))
++  if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (x) ||
++                     (MPFR_IS_NEG (x) && mpfr_integer_p (x))))
+     {
+-      if (MPFR_IS_NAN (x) || MPFR_IS_NEG (x))
++      if (MPFR_IS_NAN (x))
+         {
+           MPFR_SET_NAN (y);
+           MPFR_RET_NAN;
+         }
+-      else /* lngamma(+Inf) = lngamma(+0) = +Inf */
++      else /* lngamma(+/-Inf) = lngamma(nonpositive integer) = +Inf */
+         {
+-          if (MPFR_IS_ZERO (x))
++          if (!MPFR_IS_INF (x))
+             mpfr_set_divby0 ();
+           MPFR_SET_INF (y);
+           MPFR_SET_POS (y);
+@@ -620,8 +621,8 @@
+         }
+     }
+ 
+-  /* if x < 0 and -2k-1 <= x <= -2k, then lngamma(x) = NaN */
+-  if (MPFR_IS_NEG (x) && (unit_bit (x) == 0 || mpfr_integer_p (x)))
++  /* if -2k-1 < x < -2k <= 0, then lngamma(x) = NaN */
++  if (MPFR_IS_NEG (x) && unit_bit (x) == 0)
+     {
+       MPFR_SET_NAN (y);
+       MPFR_RET_NAN;
+diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
+--- mpfr-3.1.3-a/src/mpfr.h	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/src/mpfr.h	2015-07-02 10:49:24.038113803 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 3
+-#define MPFR_VERSION_STRING "3.1.3"
++#define MPFR_VERSION_STRING "3.1.3-p1"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
+--- mpfr-3.1.3-a/src/version.c	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/src/version.c	2015-07-02 10:49:24.042113845 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.3";
++  return "3.1.3-p1";
+ }
+diff -Naurd mpfr-3.1.3-a/tests/tlngamma.c mpfr-3.1.3-b/tests/tlngamma.c
+--- mpfr-3.1.3-a/tests/tlngamma.c	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/tests/tlngamma.c	2015-07-02 10:49:24.018113593 +0000
+@@ -33,7 +33,7 @@
+ special (void)
+ {
+   mpfr_t x, y;
+-  int inex;
++  int i, inex;
+ 
+   mpfr_init (x);
+   mpfr_init (y);
+@@ -46,25 +46,29 @@
+       exit (1);
+     }
+ 
+-  mpfr_set_inf (x, -1);
++  mpfr_set_inf (x, 1);
++  mpfr_clear_flags ();
+   mpfr_lngamma (y, x, MPFR_RNDN);
+-  if (!mpfr_nan_p (y))
++  if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 || __gmpfr_flags != 0)
+     {
+-      printf ("Error for lngamma(-Inf)\n");
++      printf ("Error for lngamma(+Inf)\n");
+       exit (1);
+     }
+ 
+-  mpfr_set_inf (x, 1);
++  mpfr_set_inf (x, -1);
++  mpfr_clear_flags ();
+   mpfr_lngamma (y, x, MPFR_RNDN);
+-  if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0)
++  if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 || __gmpfr_flags != 0)
+     {
+-      printf ("Error for lngamma(+Inf)\n");
++      printf ("Error for lngamma(-Inf)\n");
+       exit (1);
+     }
+ 
+   mpfr_set_ui (x, 0, MPFR_RNDN);
++  mpfr_clear_flags ();
+   mpfr_lngamma (y, x, MPFR_RNDN);
+-  if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0)
++  if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 ||
++      __gmpfr_flags != MPFR_FLAGS_DIVBY0)
+     {
+       printf ("Error for lngamma(+0)\n");
+       exit (1);
+@@ -72,32 +76,58 @@
+ 
+   mpfr_set_ui (x, 0, MPFR_RNDN);
+   mpfr_neg (x, x, MPFR_RNDN);
++  mpfr_clear_flags ();
+   mpfr_lngamma (y, x, MPFR_RNDN);
+-  if (!mpfr_nan_p (y))
++  if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 ||
++      __gmpfr_flags != MPFR_FLAGS_DIVBY0)
+     {
+       printf ("Error for lngamma(-0)\n");
+       exit (1);
+     }
+ 
+   mpfr_set_ui (x, 1, MPFR_RNDN);
++  mpfr_clear_flags ();
+   mpfr_lngamma (y, x, MPFR_RNDN);
+-  if (MPFR_IS_NAN (y) || mpfr_cmp_ui (y, 0) || MPFR_IS_NEG (y))
++  if (mpfr_cmp_ui0 (y, 0) || MPFR_IS_NEG (y))
+     {
+       printf ("Error for lngamma(1)\n");
+       exit (1);
+     }
+ 
+-  mpfr_set_si (x, -1, MPFR_RNDN);
+-  mpfr_lngamma (y, x, MPFR_RNDN);
+-  if (!mpfr_nan_p (y))
++  for (i = 1; i <= 5; i++)
+     {
+-      printf ("Error for lngamma(-1)\n");
+-      exit (1);
++      int c;
++
++      mpfr_set_si (x, -i, MPFR_RNDN);
++      mpfr_clear_flags ();
++      mpfr_lngamma (y, x, MPFR_RNDN);
++      if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 ||
++          __gmpfr_flags != MPFR_FLAGS_DIVBY0)
++        {
++          printf ("Error for lngamma(-%d)\n", i);
++          exit (1);
++        }
++      if (i & 1)
++        {
++          mpfr_nextabove (x);
++          c = '+';
++        }
++      else
++        {
++          mpfr_nextbelow (x);
++          c = '-';
++        }
++      mpfr_lngamma (y, x, MPFR_RNDN);
++      if (!mpfr_nan_p (y))
++        {
++          printf ("Error for lngamma(-%d%cepsilon)\n", i, c);
++          exit (1);
++        }
+     }
+ 
+   mpfr_set_ui (x, 2, MPFR_RNDN);
+   mpfr_lngamma (y, x, MPFR_RNDN);
+-  if (MPFR_IS_NAN (y) || mpfr_cmp_ui (y, 0) || MPFR_IS_NEG (y))
++  if (mpfr_cmp_ui0 (y, 0) || MPFR_IS_NEG (y))
+     {
+       printf ("Error for lngamma(2)\n");
+       exit (1);
+@@ -127,7 +157,7 @@
+   mpfr_set_str (x, CHECK_X2, 10, MPFR_RNDN);
+   mpfr_lngamma (y, x, MPFR_RNDN);
+   mpfr_set_str (x, CHECK_Y2, 10, MPFR_RNDN);
+-  if (MPFR_IS_NAN (y) || mpfr_cmp (y, x))
++  if (mpfr_cmp0 (y, x))
+     {
+       printf ("mpfr_lngamma("CHECK_X2") is wrong:\n"
+               "expected ");
+@@ -143,7 +173,7 @@
+   mpfr_lngamma (y, x, MPFR_RNDU);
+   mpfr_set_prec (x, 175);
+   mpfr_set_str_binary (x, "0.1010001100011101101011001101110010100001000001000001110011000001101100001111001001000101011011100100010101011110100111110101010100010011010010000101010111001100011000101111E7");
+-  if (MPFR_IS_NAN (y) || mpfr_cmp (x, y))
++  if (mpfr_cmp0 (x, y))
+     {
+       printf ("Error in mpfr_lngamma (1)\n");
+       exit (1);
+@@ -155,7 +185,7 @@
+   mpfr_lngamma (x, y, MPFR_RNDZ);
+   mpfr_set_prec (y, 21);
+   mpfr_set_str_binary (y, "0.111000101000001100101E9");
+-  if (MPFR_IS_NAN (x) || mpfr_cmp (x, y))
++  if (mpfr_cmp0 (x, y))
+     {
+       printf ("Error in mpfr_lngamma (120)\n");
+       printf ("Expected "); mpfr_print_binary (y); puts ("");
+@@ -169,7 +199,7 @@
+   inex = mpfr_lngamma (y, x, MPFR_RNDN);
+   mpfr_set_prec (x, 206);
+   mpfr_set_str_binary (x, "0.10000111011000000011100010101001100110001110000111100011000100100110110010001011011110101001111011110110000001010100111011010000000011100110110101100111000111010011110010000100010111101010001101000110101001E13");
+-  if (MPFR_IS_NAN (y) || mpfr_cmp (x, y))
++  if (mpfr_cmp0 (x, y))
+     {
+       printf ("Error in mpfr_lngamma (768)\n");
+       exit (1);
+@@ -185,7 +215,7 @@
+   mpfr_set_str_binary (x, "0.1100E-66");
+   mpfr_lngamma (y, x, MPFR_RNDN);
+   mpfr_set_str_binary (x, "0.1100E6");
+-  if (MPFR_IS_NAN (y) || mpfr_cmp (x, y))
++  if (mpfr_cmp0 (x, y))
+     {
+       printf ("Error for lngamma(0.1100E-66)\n");
+       exit (1);
+@@ -199,7 +229,7 @@
+   mpfr_lngamma (y, x, MPFR_RNDN);
+   mpfr_set_prec (x, 32);
+   mpfr_set_str_binary (x, "-0.10001000111011111011000010100010E207");
+-  if (MPFR_IS_NAN (y) || mpfr_cmp (x, y))
++  if (mpfr_cmp0 (x, y))
+     {
+       printf ("Error for lngamma(-2^199+0.5)\n");
+       printf ("Got        ");
+diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
+--- mpfr-3.1.3-a/PATCHES	2015-07-02 10:50:08.046573308 +0000
++++ mpfr-3.1.3-b/PATCHES	2015-07-02 10:50:08.126574142 +0000
+@@ -0,0 +1 @@
++muldiv-2exp-overflow
+diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
+--- mpfr-3.1.3-a/VERSION	2015-07-02 10:49:24.042113845 +0000
++++ mpfr-3.1.3-b/VERSION	2015-07-02 10:50:08.126574142 +0000
+@@ -1 +1 @@
+-3.1.3-p1
++3.1.3-p2
+diff -Naurd mpfr-3.1.3-a/src/div_2si.c mpfr-3.1.3-b/src/div_2si.c
+--- mpfr-3.1.3-a/src/div_2si.c	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/src/div_2si.c	2015-07-02 10:50:08.106573933 +0000
+@@ -49,7 +49,7 @@
+             rnd_mode = MPFR_RNDZ;
+           return mpfr_underflow (y, rnd_mode, MPFR_SIGN(y));
+         }
+-      else if (MPFR_UNLIKELY(n < 0 && (__gmpfr_emax < MPFR_EMIN_MIN - n ||
++      else if (MPFR_UNLIKELY(n <= 0 && (__gmpfr_emax < MPFR_EMIN_MIN - n ||
+                                        exp > __gmpfr_emax + n)) )
+         return mpfr_overflow (y, rnd_mode, MPFR_SIGN(y));
+ 
+diff -Naurd mpfr-3.1.3-a/src/div_2ui.c mpfr-3.1.3-b/src/div_2ui.c
+--- mpfr-3.1.3-a/src/div_2ui.c	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/src/div_2ui.c	2015-07-02 10:50:08.106573933 +0000
+@@ -32,7 +32,7 @@
+      rnd_mode),
+     ("y[%Pu]=%.*Rg inexact=%d", mpfr_get_prec(y), mpfr_log_prec, y, inexact));
+ 
+-  if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (x)))
++  if (MPFR_UNLIKELY (n == 0 || MPFR_IS_SINGULAR (x)))
+     return mpfr_set (y, x, rnd_mode);
+   else
+     {
+diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
+--- mpfr-3.1.3-a/src/mpfr.h	2015-07-02 10:49:24.038113803 +0000
++++ mpfr-3.1.3-b/src/mpfr.h	2015-07-02 10:50:08.126574142 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 3
+-#define MPFR_VERSION_STRING "3.1.3-p1"
++#define MPFR_VERSION_STRING "3.1.3-p2"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.3-a/src/mul_2si.c mpfr-3.1.3-b/src/mul_2si.c
+--- mpfr-3.1.3-a/src/mul_2si.c	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/src/mul_2si.c	2015-07-02 10:50:08.106573933 +0000
+@@ -39,7 +39,7 @@
+     {
+       mpfr_exp_t exp = MPFR_GET_EXP (x);
+       MPFR_SETRAW (inexact, y, x, exp, rnd_mode);
+-      if (MPFR_UNLIKELY( n > 0 && (__gmpfr_emax < MPFR_EMIN_MIN + n ||
++      if (MPFR_UNLIKELY(n >= 0 && (__gmpfr_emax < MPFR_EMIN_MIN + n ||
+                                    exp > __gmpfr_emax - n)))
+         return mpfr_overflow (y, rnd_mode, MPFR_SIGN(y));
+       else if (MPFR_UNLIKELY(n < 0 && (__gmpfr_emin > MPFR_EMAX_MAX + n ||
+diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
+--- mpfr-3.1.3-a/src/version.c	2015-07-02 10:49:24.042113845 +0000
++++ mpfr-3.1.3-b/src/version.c	2015-07-02 10:50:08.126574142 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.3-p1";
++  return "3.1.3-p2";
+ }
+diff -Naurd mpfr-3.1.3-a/tests/tmul_2exp.c mpfr-3.1.3-b/tests/tmul_2exp.c
+--- mpfr-3.1.3-a/tests/tmul_2exp.c	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/tests/tmul_2exp.c	2015-07-02 10:50:08.106573933 +0000
+@@ -242,6 +242,76 @@
+   large (MPFR_EMAX_MAX);
+ }
+ 
++/* Cases where the function overflows on n = 0 when rounding is like
++   away from zero. */
++static void
++overflow0 (mpfr_exp_t emax)
++{
++  mpfr_exp_t old_emax;
++  mpfr_t x, y1, y2;
++  int neg, r, op;
++  static char *sop[4] = { "mul_2ui", "mul_2si", "div_2ui", "div_2si" };
++
++  old_emax = mpfr_get_emax ();
++  set_emax (emax);
++
++  mpfr_init2 (x, 8);
++  mpfr_inits2 (6, y1, y2, (mpfr_ptr) 0);
++
++  mpfr_set_inf (x, 1);
++  mpfr_nextbelow (x);
++
++  for (neg = 0; neg <= 1; neg++)
++    {
++      RND_LOOP (r)
++        {
++          int inex1, inex2;
++          unsigned int flags1, flags2;
++
++          /* Even if there isn't an overflow (rounding ~ toward zero),
++             the result is the same as the one of an overflow. */
++          inex1 = mpfr_overflow (y1, (mpfr_rnd_t) r, neg ? -1 : 1);
++          flags1 = MPFR_FLAGS_INEXACT;
++          if (mpfr_inf_p (y1))
++            flags1 |= MPFR_FLAGS_OVERFLOW;
++          for (op = 0; op < 4; op++)
++            {
++              mpfr_clear_flags ();
++              inex2 =
++                op == 0 ? mpfr_mul_2ui (y2, x, 0, (mpfr_rnd_t) r) :
++                op == 1 ? mpfr_mul_2si (y2, x, 0, (mpfr_rnd_t) r) :
++                op == 2 ? mpfr_div_2ui (y2, x, 0, (mpfr_rnd_t) r) :
++                op == 3 ? mpfr_div_2si (y2, x, 0, (mpfr_rnd_t) r) :
++                (MPFR_ASSERTN (0), 0);
++              flags2 = __gmpfr_flags;
++              if (!(mpfr_equal_p (y1, y2) &&
++                    SAME_SIGN (inex1, inex2) &&
++                    flags1 == flags2))
++                {
++                  printf ("Error in overflow0 for %s, mpfr_%s, emax = %"
++                          MPFR_EXP_FSPEC "d,\nx = ",
++                          mpfr_print_rnd_mode ((mpfr_rnd_t) r), sop[op],
++                          (mpfr_eexp_t) emax);
++                  mpfr_dump (x);
++                  printf ("Expected ");
++                  mpfr_dump (y1);
++                  printf ("  with inex = %d, flags =", inex1);
++                  flags_out (flags1);
++                  printf ("Got      ");
++                  mpfr_dump (y2);
++                  printf ("  with inex = %d, flags =", inex2);
++                  flags_out (flags2);
++                  exit (1);
++                }
++            }
++        }
++      mpfr_neg (x, x, MPFR_RNDN);
++    }
++
++  mpfr_clears (x, y1, y2, (mpfr_ptr) 0);
++  set_emax (old_emax);
++}
++
+ int
+ main (int argc, char *argv[])
+ {
+@@ -334,6 +404,11 @@
+   underflow0 ();
+   large0 ();
+ 
++  if (mpfr_get_emax () != MPFR_EMAX_MAX)
++    overflow0 (mpfr_get_emax ());
++  overflow0 (MPFR_EMAX_MAX);
++  overflow0 (-1);
++
+   tests_end_mpfr ();
+   return 0;
+ }
+diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
+--- mpfr-3.1.3-a/PATCHES	2015-07-17 08:54:48.592799981 +0000
++++ mpfr-3.1.3-b/PATCHES	2015-07-17 08:54:48.616811495 +0000
+@@ -0,0 +1 @@
++muldiv-2exp-underflow
+diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
+--- mpfr-3.1.3-a/VERSION	2015-07-02 10:50:08.126574142 +0000
++++ mpfr-3.1.3-b/VERSION	2015-07-17 08:54:48.616811495 +0000
+@@ -1 +1 @@
+-3.1.3-p2
++3.1.3-p3
+diff -Naurd mpfr-3.1.3-a/src/div_2si.c mpfr-3.1.3-b/src/div_2si.c
+--- mpfr-3.1.3-a/src/div_2si.c	2015-07-02 10:50:08.106573933 +0000
++++ mpfr-3.1.3-b/src/div_2si.c	2015-07-17 08:54:48.608807656 +0000
+@@ -45,7 +45,8 @@
+           if (rnd_mode == MPFR_RNDN &&
+               (__gmpfr_emin > MPFR_EMAX_MAX - (n - 1) ||
+                exp < __gmpfr_emin + (n - 1) ||
+-               (inexact >= 0 && mpfr_powerof2_raw (y))))
++               ((MPFR_IS_NEG (y) ? inexact <= 0 : inexact >= 0) &&
++                mpfr_powerof2_raw (y))))
+             rnd_mode = MPFR_RNDZ;
+           return mpfr_underflow (y, rnd_mode, MPFR_SIGN(y));
+         }
+diff -Naurd mpfr-3.1.3-a/src/div_2ui.c mpfr-3.1.3-b/src/div_2ui.c
+--- mpfr-3.1.3-a/src/div_2ui.c	2015-07-02 10:50:08.106573933 +0000
++++ mpfr-3.1.3-b/src/div_2ui.c	2015-07-17 08:54:48.608807656 +0000
+@@ -44,7 +44,9 @@
+       if (MPFR_UNLIKELY (n >= diffexp))  /* exp - n <= emin - 1 */
+         {
+           if (rnd_mode == MPFR_RNDN &&
+-              (n > diffexp || (inexact >= 0 && mpfr_powerof2_raw (y))))
++              (n > diffexp ||
++               ((MPFR_IS_NEG (y) ? inexact <= 0 : inexact >= 0) &&
++                mpfr_powerof2_raw (y))))
+             rnd_mode = MPFR_RNDZ;
+           return mpfr_underflow (y, rnd_mode, MPFR_SIGN (y));
+         }
+diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
+--- mpfr-3.1.3-a/src/mpfr.h	2015-07-02 10:50:08.126574142 +0000
++++ mpfr-3.1.3-b/src/mpfr.h	2015-07-17 08:54:48.616811495 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 3
+-#define MPFR_VERSION_STRING "3.1.3-p2"
++#define MPFR_VERSION_STRING "3.1.3-p3"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.3-a/src/mul_2si.c mpfr-3.1.3-b/src/mul_2si.c
+--- mpfr-3.1.3-a/src/mul_2si.c	2015-07-02 10:50:08.106573933 +0000
++++ mpfr-3.1.3-b/src/mul_2si.c	2015-07-17 08:54:48.608807656 +0000
+@@ -48,7 +48,8 @@
+           if (rnd_mode == MPFR_RNDN &&
+               (__gmpfr_emin > MPFR_EMAX_MAX + (n + 1) ||
+                exp < __gmpfr_emin - (n + 1) ||
+-               (inexact >= 0 && mpfr_powerof2_raw (y))))
++               ((MPFR_IS_NEG (y) ? inexact <= 0 : inexact >= 0) &&
++                mpfr_powerof2_raw (y))))
+             rnd_mode = MPFR_RNDZ;
+           return mpfr_underflow (y, rnd_mode, MPFR_SIGN(y));
+         }
+diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
+--- mpfr-3.1.3-a/src/version.c	2015-07-02 10:50:08.126574142 +0000
++++ mpfr-3.1.3-b/src/version.c	2015-07-17 08:54:48.616811495 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.3-p2";
++  return "3.1.3-p3";
+ }
+diff -Naurd mpfr-3.1.3-a/tests/tmul_2exp.c mpfr-3.1.3-b/tests/tmul_2exp.c
+--- mpfr-3.1.3-a/tests/tmul_2exp.c	2015-07-02 10:50:08.106573933 +0000
++++ mpfr-3.1.3-b/tests/tmul_2exp.c	2015-07-17 08:54:48.608807656 +0000
+@@ -50,77 +50,82 @@
+ {
+   mpfr_t x, y, z1, z2;
+   mpfr_exp_t emin;
+-  int i, k;
++  int i, k, s;
+   int prec;
+   int rnd;
+   int div;
+   int inex1, inex2;
+   unsigned int flags1, flags2;
+ 
+-  /* Test mul_2si(x, e - k), div_2si(x, k - e) and div_2ui(x, k - e)
+-   * with emin = e, x = 1 + i/16, i in { -1, 0, 1 }, and k = 1 to 4,
+-   * by comparing the result with the one of a simple division.
++  /* Test mul_2si(x, e - k), div_2si(x, k - e) and div_2ui(x, k - e) with
++   * emin = e, x = s * (1 + i/16), i in { -1, 0, 1 }, s in { -1, 1 }, and
++   * k = 1 to 4, by comparing the result with the one of a simple division.
+    */
+   emin = mpfr_get_emin ();
+   set_emin (e);
+   mpfr_inits2 (8, x, y, (mpfr_ptr) 0);
+   for (i = 15; i <= 17; i++)
+-    {
+-      inex1 = mpfr_set_ui_2exp (x, i, -4, MPFR_RNDN);
+-      MPFR_ASSERTN (inex1 == 0);
+-      for (prec = 6; prec >= 3; prec -= 3)
+-        {
+-          mpfr_inits2 (prec, z1, z2, (mpfr_ptr) 0);
+-          RND_LOOP (rnd)
+-            for (k = 1; k <= 4; k++)
+-              {
+-                /* The following one is assumed to be correct. */
+-                inex1 = mpfr_mul_2si (y, x, e, MPFR_RNDN);
+-                MPFR_ASSERTN (inex1 == 0);
+-                inex1 = mpfr_set_ui (z1, 1 << k, MPFR_RNDN);
+-                MPFR_ASSERTN (inex1 == 0);
+-                mpfr_clear_flags ();
+-                /* Do not use mpfr_div_ui to avoid the optimization
+-                   by mpfr_div_2si. */
+-                inex1 = mpfr_div (z1, y, z1, (mpfr_rnd_t) rnd);
+-                flags1 = __gmpfr_flags;
+-
+-              for (div = 0; div <= 2; div++)
++    for (s = 1; s >= -1; s -= 2)
++      {
++        inex1 = mpfr_set_si_2exp (x, s * i, -4, MPFR_RNDN);
++        MPFR_ASSERTN (inex1 == 0);
++        for (prec = 6; prec >= 3; prec -= 3)
++          {
++            mpfr_inits2 (prec, z1, z2, (mpfr_ptr) 0);
++            RND_LOOP (rnd)
++              for (k = 1; k <= 4; k++)
+                 {
++                  /* The following one is assumed to be correct. */
++                  inex1 = mpfr_mul_2si (y, x, e, MPFR_RNDN);
++                  MPFR_ASSERTN (inex1 == 0);
++                  inex1 = mpfr_set_ui (z1, 1 << k, MPFR_RNDN);
++                  MPFR_ASSERTN (inex1 == 0);
+                   mpfr_clear_flags ();
+-                  inex2 = div == 0 ?
+-                    mpfr_mul_2si (z2, x, e - k, (mpfr_rnd_t) rnd) : div == 1 ?
+-                    mpfr_div_2si (z2, x, k - e, (mpfr_rnd_t) rnd) :
+-                    mpfr_div_2ui (z2, x, k - e, (mpfr_rnd_t) rnd);
+-                  flags2 = __gmpfr_flags;
+-                  if (flags1 == flags2 && SAME_SIGN (inex1, inex2) &&
+-                      mpfr_equal_p (z1, z2))
+-                    continue;
+-                  printf ("Error in underflow(");
+-                  if (e == MPFR_EMIN_MIN)
+-                    printf ("MPFR_EMIN_MIN");
+-                  else if (e == emin)
+-                    printf ("default emin");
+-                  else if (e >= LONG_MIN)
+-                    printf ("%ld", (long) e);
+-                  else
+-                    printf ("<LONG_MIN");
+-                  printf (") with mpfr_%s,\nx = %d/16, prec = %d, k = %d, "
+-                          "%s\n", div == 0 ? "mul_2si" : div == 1 ?
+-                          "div_2si" : "div_2ui", i, prec, k,
+-                          mpfr_print_rnd_mode ((mpfr_rnd_t) rnd));
+-                  printf ("Expected ");
+-                  mpfr_out_str (stdout, 16, 0, z1, MPFR_RNDN);
+-                  printf (", inex = %d, flags = %u\n", SIGN (inex1), flags1);
+-                  printf ("Got      ");
+-                  mpfr_out_str (stdout, 16, 0, z2, MPFR_RNDN);
+-                  printf (", inex = %d, flags = %u\n", SIGN (inex2), flags2);
+-                  exit (1);
+-                }  /* div */
+-              }  /* k */
+-          mpfr_clears (z1, z2, (mpfr_ptr) 0);
+-        }  /* prec */
+-    }  /* i */
++                  /* Do not use mpfr_div_ui to avoid the optimization
++                     by mpfr_div_2si. */
++                  inex1 = mpfr_div (z1, y, z1, (mpfr_rnd_t) rnd);
++                  flags1 = __gmpfr_flags;
++
++                  for (div = 0; div <= 2; div++)
++                    {
++                      mpfr_clear_flags ();
++                      inex2 =
++                        div == 0 ?
++                        mpfr_mul_2si (z2, x, e - k, (mpfr_rnd_t) rnd) :
++                        div == 1 ?
++                        mpfr_div_2si (z2, x, k - e, (mpfr_rnd_t) rnd) :
++                        mpfr_div_2ui (z2, x, k - e, (mpfr_rnd_t) rnd);
++                      flags2 = __gmpfr_flags;
++                      if (flags1 == flags2 && SAME_SIGN (inex1, inex2) &&
++                          mpfr_equal_p (z1, z2))
++                        continue;
++                      printf ("Error in underflow(");
++                      if (e == MPFR_EMIN_MIN)
++                        printf ("MPFR_EMIN_MIN");
++                      else if (e == emin)
++                        printf ("default emin");
++                      else if (e >= LONG_MIN)
++                        printf ("%ld", (long) e);
++                      else
++                        printf ("<LONG_MIN");
++                      printf (") with mpfr_%s,\nx = %d/16, prec = %d, k = %d,"
++                              " %s\n", div == 0 ? "mul_2si" : div == 1 ?
++                              "div_2si" : "div_2ui", s * i, prec, k,
++                              mpfr_print_rnd_mode ((mpfr_rnd_t) rnd));
++                      printf ("Expected ");
++                      mpfr_out_str (stdout, 16, 0, z1, MPFR_RNDN);
++                      printf (", inex = %d, flags = %u\n",
++                              SIGN (inex1), flags1);
++                      printf ("Got      ");
++                      mpfr_out_str (stdout, 16, 0, z2, MPFR_RNDN);
++                      printf (", inex = %d, flags = %u\n",
++                              SIGN (inex2), flags2);
++                      exit (1);
++                    }  /* div */
++                }  /* k */
++            mpfr_clears (z1, z2, (mpfr_ptr) 0);
++          }  /* prec */
++      }  /* i */
+   mpfr_clears (x, y, (mpfr_ptr) 0);
+   set_emin (emin);
+ }
+diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
+--- mpfr-3.1.3-a/PATCHES	2015-07-17 08:58:21.094987384 +0000
++++ mpfr-3.1.3-b/PATCHES	2015-07-17 08:58:21.118986898 +0000
+@@ -0,0 +1 @@
++frexp
+diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
+--- mpfr-3.1.3-a/VERSION	2015-07-17 08:54:48.616811495 +0000
++++ mpfr-3.1.3-b/VERSION	2015-07-17 08:58:21.118986898 +0000
+@@ -1 +1 @@
+-3.1.3-p3
++3.1.3-p4
+diff -Naurd mpfr-3.1.3-a/src/frexp.c mpfr-3.1.3-b/src/frexp.c
+--- mpfr-3.1.3-a/src/frexp.c	2015-06-19 19:55:09.000000000 +0000
++++ mpfr-3.1.3-b/src/frexp.c	2015-07-17 08:58:21.106987142 +0000
+@@ -26,6 +26,13 @@
+ mpfr_frexp (mpfr_exp_t *exp, mpfr_ptr y, mpfr_srcptr x, mpfr_rnd_t rnd)
+ {
+   int inex;
++  unsigned int saved_flags = __gmpfr_flags;
++  MPFR_BLOCK_DECL (flags);
++
++  MPFR_LOG_FUNC
++    (("x[%Pu]=%.*Rg rnd=%d", mpfr_get_prec (x), mpfr_log_prec, x, rnd),
++     ("y[%Pu]=%.*Rg exp=%" MPFR_EXP_FSPEC "d inex=%d", mpfr_get_prec (y),
++      mpfr_log_prec, y, (mpfr_eexp_t) *exp, inex));
+ 
+   if (MPFR_UNLIKELY(MPFR_IS_SINGULAR(x)))
+     {
+@@ -49,8 +56,32 @@
+         }
+     }
+ 
+-  inex = mpfr_set (y, x, rnd);
++  MPFR_BLOCK (flags, inex = mpfr_set (y, x, rnd));
++  __gmpfr_flags = saved_flags;
++
++  /* Possible overflow due to the rounding, no possible underflow. */
++
++  if (MPFR_UNLIKELY (MPFR_OVERFLOW (flags)))
++    {
++      int inex2;
++
++      /* An overflow here means that the exponent of y would be larger than
++         the one of x, thus x would be rounded to the next power of 2, and
++         the returned y should be 1/2 in absolute value, rounded (i.e. with
++         possible underflow or overflow). This also implies that x and y are
++         different objects, so that the exponent of x has not been lost. */
++      MPFR_LOG_MSG (("Internal overflow\n", 0));
++      MPFR_ASSERTD (x != y);
++      *exp = MPFR_GET_EXP (x) + 1;
++      inex2 = mpfr_set_si_2exp (y, MPFR_INT_SIGN (x), -1, rnd);
++      MPFR_LOG_MSG (("inex=%d inex2=%d\n", inex, inex2));
++      if (inex2 != 0)
++        inex = inex2;
++      MPFR_RET (inex);
++    }
++
+   *exp = MPFR_GET_EXP (y);
+-  MPFR_SET_EXP (y, 0);
++  /* Do not use MPFR_SET_EXP because the range has not been checked yet. */
++  MPFR_EXP (y) = 0;
+   return mpfr_check_range (y, inex, rnd);
+ }
+diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
+--- mpfr-3.1.3-a/src/mpfr.h	2015-07-17 08:54:48.616811495 +0000
++++ mpfr-3.1.3-b/src/mpfr.h	2015-07-17 08:58:21.114986979 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 3
+-#define MPFR_VERSION_STRING "3.1.3-p3"
++#define MPFR_VERSION_STRING "3.1.3-p4"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
+--- mpfr-3.1.3-a/src/version.c	2015-07-17 08:54:48.616811495 +0000
++++ mpfr-3.1.3-b/src/version.c	2015-07-17 08:58:21.118986898 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.3-p3";
++  return "3.1.3-p4";
+ }
+diff -Naurd mpfr-3.1.3-a/tests/tfrexp.c mpfr-3.1.3-b/tests/tfrexp.c
+--- mpfr-3.1.3-a/tests/tfrexp.c	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/tests/tfrexp.c	2015-07-17 08:58:21.106987142 +0000
+@@ -129,12 +129,115 @@
+   mpfr_clear (x);
+ }
+ 
++static void check1 (void)
++{
++  mpfr_exp_t emin, emax, e;
++  mpfr_t x, y1, y2;
++  int r, neg, red;
++
++  emin = mpfr_get_emin ();
++  emax = mpfr_get_emax ();
++  set_emin (MPFR_EMIN_MIN);
++  set_emax (MPFR_EMAX_MAX);
++
++  mpfr_init2 (x, 7);
++  mpfr_inits2 (4, y1, y2, (mpfr_ptr) 0);
++
++  mpfr_set_ui_2exp (x, 1, -2, MPFR_RNDN);
++  while (mpfr_regular_p (x))
++    {
++      /* Test the exponents up to 3 and with the maximum exponent
++         (to check potential intermediate overflow). */
++      if (MPFR_GET_EXP (x) == 4)
++        mpfr_set_exp (x, MPFR_EMAX_MAX);
++      e = MPFR_GET_EXP (x);
++      for (neg = 0; neg < 2; neg++)
++        {
++          RND_LOOP (r)
++            {
++              int inex1, inex2;
++              mpfr_exp_t e1, e2;
++              unsigned int flags1, flags2;
++
++              for (red = 0; red < 2; red++)
++                {
++                  if (red)
++                    {
++                      /* e1: exponent of the rounded value of x. */
++                      MPFR_ASSERTN (e1 == e || e1 == e + 1);
++                      set_emin (e);
++                      set_emax (e);
++                      mpfr_clear_flags ();
++                      inex1 = e1 < 0 ?
++                        mpfr_mul_2ui (y1, x, -e1, (mpfr_rnd_t) r) :
++                        mpfr_div_2ui (y1, x, e1, (mpfr_rnd_t) r);
++                      flags1 = __gmpfr_flags;
++                    }
++                  else
++                    {
++                      inex1 = mpfr_set (y1, x, (mpfr_rnd_t) r);
++                      e1 = MPFR_IS_INF (y1) ? e + 1 : MPFR_GET_EXP (y1);
++                      flags1 = inex1 != 0 ? MPFR_FLAGS_INEXACT : 0;
++                    }
++                  mpfr_clear_flags ();
++                  inex2 = mpfr_frexp (&e2, y2, x, (mpfr_rnd_t) r);
++                  flags2 = __gmpfr_flags;
++                  set_emin (MPFR_EMIN_MIN);
++                  set_emax (MPFR_EMAX_MAX);
++                  if ((!red || e == 0) &&
++                      (! mpfr_regular_p (y2) || MPFR_GET_EXP (y2) != 0))
++                    {
++                      printf ("Error in check1 for %s, red = %d, x = ",
++                              mpfr_print_rnd_mode ((mpfr_rnd_t) r), red);
++                      mpfr_dump (x);
++                      printf ("Expected 1/2 <= |y| < 1, got y = ");
++                      mpfr_dump (y2);
++                      exit (1);
++                    }
++                  if (!red)
++                    {
++                      if (e2 > 0)
++                        mpfr_mul_2ui (y2, y2, e2, MPFR_RNDN);
++                      else if (e2 < 0)
++                        mpfr_div_2ui (y2, y2, -e2, MPFR_RNDN);
++                    }
++                  if (! (SAME_SIGN (inex1, inex2) &&
++                         mpfr_equal_p (y1, y2) &&
++                         flags1 == flags2))
++                    {
++                      printf ("Error in check1 for %s, red = %d, x = ",
++                              mpfr_print_rnd_mode ((mpfr_rnd_t) r), red);
++                      mpfr_dump (x);
++                      printf ("Expected y1 = ");
++                      mpfr_dump (y1);
++                      printf ("Got      y2 = ");
++                      mpfr_dump (y2);
++                      printf ("Expected inex ~= %d, got %d\n", inex1, inex2);
++                      printf ("Expected flags:");
++                      flags_out (flags1);
++                      printf ("Got flags:     ");
++                      flags_out (flags2);
++                      exit (1);
++                    }
++                }
++            }
++          mpfr_neg (x, x, MPFR_RNDN);
++        }
++      mpfr_nextabove (x);
++    }
++
++  mpfr_clears (x, y1, y2, (mpfr_ptr) 0);
++  set_emin (emin);
++  set_emax (emax);
++}
++
+ int
+ main (int argc, char *argv[])
+ {
+   tests_start_mpfr ();
+ 
+   check_special ();
++  check1 ();
+ 
+   tests_end_mpfr ();
+   return 0;
+diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
+--- mpfr-3.1.3-a/PATCHES	2015-10-29 13:47:46.735901185 +0000
++++ mpfr-3.1.3-b/PATCHES	2015-10-29 13:47:46.763900609 +0000
+@@ -0,0 +1 @@
++divhigh-basecase
+diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
+--- mpfr-3.1.3-a/VERSION	2015-07-17 08:58:21.118986898 +0000
++++ mpfr-3.1.3-b/VERSION	2015-10-29 13:47:46.763900609 +0000
+@@ -1 +1 @@
+-3.1.3-p4
++3.1.3-p5
+diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
+--- mpfr-3.1.3-a/src/mpfr.h	2015-07-17 08:58:21.114986979 +0000
++++ mpfr-3.1.3-b/src/mpfr.h	2015-10-29 13:47:46.759900692 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 3
+-#define MPFR_VERSION_STRING "3.1.3-p4"
++#define MPFR_VERSION_STRING "3.1.3-p5"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.3-a/src/mulders.c mpfr-3.1.3-b/src/mulders.c
+--- mpfr-3.1.3-a/src/mulders.c	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/src/mulders.c	2015-10-29 13:47:46.751900855 +0000
+@@ -236,9 +236,10 @@
+          that in addition to the limb np[n-1] to reduce, we have at least 2
+          extra limbs, thus accessing np[n-3] is valid. */
+ 
+-      /* warning: we can have np[n-1]=d1 and np[n-2]=d0, but since {np,n} < D,
+-         the largest possible partial quotient is B-1 */
+-      if (MPFR_UNLIKELY(np[n - 1] == d1 && np[n - 2] == d0))
++      /* Warning: we can have np[n-1]>d1 or (np[n-1]=d1 and np[n-2]>=d0) here,
++         since we truncate the divisor at each step, but since {np,n} < D
++         originally, the largest possible partial quotient is B-1. */
++      if (MPFR_UNLIKELY(np[n-1] > d1 || (np[n-1] == d1 && np[n-2] >= d0)))
+         q2 = ~ (mp_limb_t) 0;
+       else
+         udiv_qr_3by2 (q2, q1, q0, np[n - 1], np[n - 2], np[n - 3],
+diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
+--- mpfr-3.1.3-a/src/version.c	2015-07-17 08:58:21.118986898 +0000
++++ mpfr-3.1.3-b/src/version.c	2015-10-29 13:47:46.763900609 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.3-p4";
++  return "3.1.3-p5";
+ }
+diff -Naurd mpfr-3.1.3-a/tests/tdiv.c mpfr-3.1.3-b/tests/tdiv.c
+--- mpfr-3.1.3-a/tests/tdiv.c	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/tests/tdiv.c	2015-10-29 13:47:46.751900855 +0000
+@@ -1099,6 +1099,69 @@
+   mpfr_set_emax (old_emax);
+ }
+ 
++/* Bug in mpfr_divhigh_n_basecase when all limbs of q (except the most
++   significant one) are B-1 where B=2^GMP_NUMB_BITS. Since we truncate
++   the divisor at each step, it might happen at some point that
++   (np[n-1],np[n-2]) > (d1,d0), and not only the equality.
++   Reported by Ricky Farr
++   <https://sympa.inria.fr/sympa/arc/mpfr/2015-10/msg00023.html>
++   To get a failure, a MPFR_DIVHIGH_TAB entry below the MPFR_DIV_THRESHOLD
++   limit must have a value 0. With most mparam.h files, this cannot occur. */
++static void
++test_20151023 (void)
++{
++  mpfr_prec_t p;
++  mpfr_t n, d, q, q0;
++  int inex, i;
++
++  for (p = GMP_NUMB_BITS; p <= 2000; p++)
++    {
++      mpfr_init2 (n, 2*p);
++      mpfr_init2 (d, p);
++      mpfr_init2 (q, p);
++      mpfr_init2 (q0, GMP_NUMB_BITS);
++
++      /* generate a random divisor of p bits */
++      mpfr_urandomb (d, RANDS);
++      /* generate a random quotient of GMP_NUMB_BITS bits */
++      mpfr_urandomb (q0, RANDS);
++      /* zero-pad the quotient to p bits */
++      inex = mpfr_prec_round (q0, p, MPFR_RNDN);
++      MPFR_ASSERTN(inex == 0);
++
++      for (i = 0; i < 3; i++)
++        {
++          /* i=0: try with the original quotient xxx000...000
++             i=1: try with the original quotient minus one ulp
++             i=2: try with the original quotient plus one ulp */
++          if (i == 1)
++            mpfr_nextbelow (q0);
++          else if (i == 2)
++            {
++              mpfr_nextabove (q0);
++              mpfr_nextabove (q0);
++            }
++
++          inex = mpfr_mul (n, d, q0, MPFR_RNDN);
++          MPFR_ASSERTN(inex == 0);
++          mpfr_nextabove (n);
++          mpfr_div (q, n, d, MPFR_RNDN);
++          MPFR_ASSERTN(mpfr_cmp (q, q0) == 0);
++
++          inex = mpfr_mul (n, d, q0, MPFR_RNDN);
++          MPFR_ASSERTN(inex == 0);
++          mpfr_nextbelow (n);
++          mpfr_div (q, n, d, MPFR_RNDN);
++          MPFR_ASSERTN(mpfr_cmp (q, q0) == 0);
++        }
++
++      mpfr_clear (n);
++      mpfr_clear (d);
++      mpfr_clear (q);
++      mpfr_clear (q0);
++    }
++}
++
+ #define TEST_FUNCTION test_div
+ #define TWO_ARGS
+ #define RAND_FUNCTION(x) mpfr_random2(x, MPFR_LIMB_SIZE (x), randlimb () % 100, RANDS)
+@@ -1219,6 +1282,7 @@
+   consistency ();
+   test_20070603 ();
+   test_20070628 ();
++  test_20151023 ();
+   test_generic (2, 800, 50);
+   test_extreme ();
+ 
diff --git a/easybuild/easyconfigs/g/GDAL/GDAL-1.10.1-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/g/GDAL/GDAL-1.10.1-intel-2015b-Python-2.7.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a54077b4b39a11cea44e24aa2bf910d4a405d1ec
--- /dev/null
+++ b/easybuild/easyconfigs/g/GDAL/GDAL-1.10.1-intel-2015b-Python-2.7.10.eb
@@ -0,0 +1,54 @@
+easyblock = 'ConfigureMake'
+
+name = 'GDAL'
+version = '1.10.1'
+
+homepage = 'http://www.gdal.org/'
+description = """GDAL is a translator library for raster geospatial data formats that is released under an X/MIT style
+ Open Source license by the Open Source Geospatial Foundation. As a library, it presents a single abstract data model
+ to the calling application for all supported formats. It also comes with a variety of useful commandline utilities for
+ data translation and processing."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = ['http://download.osgeo.org/gdal/%(version)s/']
+sources = [SOURCELOWER_TAR_XZ]
+
+patches = ['GDAL-%(version)s-python.patch']
+
+pyver = '2.7.10'
+pyshortver = '.'.join(pyver.split('.')[0:2])
+versionsuffix = '-%s-%s' % ('Python', pyver)
+
+dependencies = [
+    ('Python', pyver),
+    ('netCDF', '4.3.2'),
+    ('expat', '2.1.0'),
+    ('GEOS', '3.5.0', versionsuffix),
+    ('SQLite', '3.8.10.2'),
+    ('libxml2', '2.9.3', versionsuffix),
+    ('libpng', '1.6.18'),
+    ('libjpeg-turbo', '1.4.2'),
+    ('JasPer', '1.900.1'),
+    ('LibTIFF', '4.0.3'),
+    ('zlib', '1.2.8'),
+    ('cURL', '7.43.0'),
+    ('PCRE', '8.37'),
+]
+
+configopts = '--with-expat=$EBROOTEXPAT --with-libz=$EBROOTLIBZ --with-hdf5=$EBROOTHDF5 --with-netcdf=$EBROOTNETCDF'
+configopts += ' --with-xml2=$EBROOTLIBXML2 --with-geos=$EBROOTGEOS/bin/geos-config --with-jpeg=$EBROOTLIBJPEGTURBO'
+configopts += ' --with-png=$EBROOTLIBPNG --with-sqlite3=$EBROOTSQLITE --with-jasper=$EBROOTJASPER'
+configopts += ' --with-libtiff=$EBROOTLIBTIFF --with-pcre=$EBROOTPCRE --with-python=$EBROOTPYTHON/bin/python'
+# there is a bug in the build system causing the build with libtool to fail for the moment 
+# (static library is also missing because of this)
+configopts += ' --without-libtool'
+
+modextrapaths = {'PYTHONPATH': 'lib/python%s/site-packages' % pyshortver}
+
+sanity_check_paths = {
+    'files': ['lib/libgdal.%s' % SHLIB_EXT],
+    'dirs': ['bin', 'include']
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/g/GDAL/GDAL-1.10.1-python.patch b/easybuild/easyconfigs/g/GDAL/GDAL-1.10.1-python.patch
new file mode 100644
index 0000000000000000000000000000000000000000..12ad48ccf8ea18f21bfece2375350fa7cec40c13
--- /dev/null
+++ b/easybuild/easyconfigs/g/GDAL/GDAL-1.10.1-python.patch
@@ -0,0 +1,21 @@
+# Fix installing python bindings
+# By Ward Poelmans <ward.poelmans@ugent.be>
+diff -ur gdal-1.10.1.orig/swig/python/GNUmakefile gdal-1.10.1/swig/python/GNUmakefile
+--- gdal-1.10.1.orig/swig/python/GNUmakefile	2013-08-26 22:01:11.000000000 +0200
++++ gdal-1.10.1/swig/python/GNUmakefile	2016-01-07 17:58:10.743255676 +0100
+@@ -66,13 +66,8 @@
+ 	$(PYTHON) setup.py bdist_egg 
+ 	
+ install:
+-
+-ifeq ($(PY_HAVE_SETUPTOOLS),1)
+-	$(PYTHON) setup.py install 
+-else
+-	$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
+-endif
+-
++	mkdir -p $(DESTDIR)$(prefix)/lib/python2.7/site-packages
++	PYTHONPATH=$(DESTDIR)$(prefix)/lib/python2.7/site-packages:$(PYTHONPATH) $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
+ 	for f in $(SCRIPTS) ; do $(INSTALL) ./scripts/$$f $(DESTDIR)$(INST_BIN) ; done
+ 
+ docs:
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
index 884cb408425bf49fe5c7c8d440d62f6c0c8470d7..fa9ab627f319a82a84567d9a2d7959cbc498ff1a 100644
--- 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
@@ -17,7 +17,7 @@ sources = [SOURCELOWER_TAR_GZ]
 dependencies = [('zlib', '1.2.7')]
 
 sanity_check_paths = {
-    'files': ['lib/libgdal.so', 'lib/libgdal.a'],
+    'files': ['lib/libgdal.%s' % SHLIB_EXT, 'lib/libgdal.a'],
     'dirs': ['bin', 'include']
 }
 
diff --git a/easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-goolf-1.5.16.eb b/easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-goolf-1.5.16.eb
index 14deb76474f7f4e209b96a6d497fcc77ce38bd62..9be42926e7dc1842014d228a49179cc155526c20 100644
--- a/easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-goolf-1.5.16.eb
+++ b/easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-goolf-1.5.16.eb
@@ -17,7 +17,7 @@ sources = [SOURCELOWER_TAR_GZ]
 dependencies = [('zlib', '1.2.8')]
 
 sanity_check_paths = {
-    'files': ['lib/libgdal.so', 'lib/libgdal.a'],
+    'files': ['lib/libgdal.%s' % SHLIB_EXT, 'lib/libgdal.a'],
     'dirs': ['bin', 'include']
 }
 
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
index 9a0c3842fb8e3f8ef551049c9a646162a117c72a..94cef6458ddc9d3ceeaa8176be553df9c0efe092 100644
--- 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
@@ -17,7 +17,7 @@ sources = [SOURCELOWER_TAR_GZ]
 dependencies = [('zlib', '1.2.7')]
 
 sanity_check_paths = {
-    'files': ['lib/libgdal.so', 'lib/libgdal.a'],
+    'files': ['lib/libgdal.%s' % SHLIB_EXT, 'lib/libgdal.a'],
     'dirs': ['bin', 'include']
 }
 
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
index eb57686131989ab9d73621a9eae8ee2383c568bb..024ded503c23ec894777a014614e5de817c5c915 100644
--- 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
@@ -17,7 +17,7 @@ sources = [SOURCELOWER_TAR_GZ]
 dependencies = [('zlib', '1.2.7')]
 
 sanity_check_paths = {
-    'files': ['lib/libgdal.so', 'lib/libgdal.a'],
+    'files': ['lib/libgdal.%s' % SHLIB_EXT, 'lib/libgdal.a'],
     'dirs': ['bin', 'include']
 }
 
diff --git a/easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-iqacml-3.7.3.eb b/easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-iqacml-3.7.3.eb
index b400835265a463b58ba54ad949ebbfe69f022ca7..83b2c99400a82c8c92840dfff39efcd1a51a65ad 100644
--- a/easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-iqacml-3.7.3.eb
+++ b/easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-iqacml-3.7.3.eb
@@ -17,7 +17,7 @@ sources = [SOURCELOWER_TAR_GZ]
 dependencies = [('zlib', '1.2.7')]
 
 sanity_check_paths = {
-    'files': ['lib/libgdal.so', 'lib/libgdal.a'],
+    'files': ['lib/libgdal.%s' % SHLIB_EXT, 'lib/libgdal.a'],
     'dirs': ['bin', 'include']
 }
 
diff --git a/easybuild/easyconfigs/g/GDAL/GDAL-2.0.0-intel-2015a.eb b/easybuild/easyconfigs/g/GDAL/GDAL-2.0.0-intel-2015a.eb
index 2d5340eabaedeaf53f325b16a380f994d3602f8d..dbff74b11052503b3126500f96decf78fd010076 100644
--- a/easybuild/easyconfigs/g/GDAL/GDAL-2.0.0-intel-2015a.eb
+++ b/easybuild/easyconfigs/g/GDAL/GDAL-2.0.0-intel-2015a.eb
@@ -22,7 +22,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/libgdal.so', 'lib/libgdal.a'],
+    'files': ['lib/libgdal.%s' % SHLIB_EXT, 'lib/libgdal.a'],
     'dirs': ['bin', 'include']
 }
 
diff --git a/easybuild/easyconfigs/g/GEMSTAT/GEMSTAT-1.0-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GEMSTAT/GEMSTAT-1.0-goolf-1.4.10.eb
index c3c35140d3581af65608af7a257085e67fe3e73d..71eda7f1813fbc887abbff743b60b17eeb207b69 100644
--- a/easybuild/easyconfigs/g/GEMSTAT/GEMSTAT-1.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/g/GEMSTAT/GEMSTAT-1.0-goolf-1.4.10.eb
@@ -30,7 +30,7 @@ buildopts = ' GSL_DIR=$EBROOTGSL'
 
 files_to_copy = [
     (["seq2expr"], 'bin'),
-    "README.txt", "data"    
+    "README.txt", "data"
 ]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/g/GEOS/GEOS-3.3.5-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/GEOS/GEOS-3.3.5-goalf-1.1.0-no-OFED.eb
index ab3440a25ce5c9fc7337215b10ac65c93724bfda..03606c24ee97e2195748a41c035f4483b99831f9 100644
--- a/easybuild/easyconfigs/g/GEOS/GEOS-3.3.5-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/g/GEOS/GEOS-3.3.5-goalf-1.1.0-no-OFED.eb
@@ -6,9 +6,14 @@ version = '3.3.5'
 homepage = 'http://trac.osgeo.org/geos'
 description = """GEOS (Geometry Engine - Open Source) is a C++ port of the  Java Topology Suite (JTS)"""
 
-source_urls = [ 'http://download.osgeo.org/geos/' ]
+source_urls = ['http://download.osgeo.org/geos/']
 sources = [SOURCELOWER_TAR_BZ2]
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
+sanity_check_paths = {
+    'files': ['bin/geos-config', 'lib/libgeos.so', 'lib/libgeos.a', 'include/geos.h'],
+    'dirs': []
+}
+
 moduleclass = 'math'
diff --git a/easybuild/easyconfigs/g/GEOS/GEOS-3.3.5-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GEOS/GEOS-3.3.5-goolf-1.4.10.eb
index 28fdadb86f21637bbbe376228ca4f8a70e2b5d0a..dc750d2020372da9bd539ceeebe4de6e5ac552f8 100644
--- a/easybuild/easyconfigs/g/GEOS/GEOS-3.3.5-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/g/GEOS/GEOS-3.3.5-goolf-1.4.10.eb
@@ -6,8 +6,14 @@ version = '3.3.5'
 homepage = 'http://trac.osgeo.org/geos'
 description = """GEOS (Geometry Engine - Open Source) is a C++ port of the  Java Topology Suite (JTS)"""
 
-source_urls = [ 'http://download.osgeo.org/geos/' ]
-sources = [SOURCELOWER_TAR_BZ2]
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
+source_urls = ['http://download.osgeo.org/geos/']
+sources = [SOURCELOWER_TAR_BZ2]
+
+sanity_check_paths = {
+    'files': ['bin/geos-config', 'lib/libgeos.so', 'lib/libgeos.a', 'include/geos.h'],
+    'dirs': []
+}
+
 moduleclass = 'math'
diff --git a/easybuild/easyconfigs/g/GEOS/GEOS-3.3.5-ictce-4.0.6.eb b/easybuild/easyconfigs/g/GEOS/GEOS-3.3.5-ictce-4.0.6.eb
index 0b85c86242d1769fca509d44146abdb85d23485e..0a0116a3b7f272bf47042da685ccff4dce332248 100644
--- a/easybuild/easyconfigs/g/GEOS/GEOS-3.3.5-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/g/GEOS/GEOS-3.3.5-ictce-4.0.6.eb
@@ -6,9 +6,14 @@ version = '3.3.5'
 homepage = 'http://trac.osgeo.org/geos'
 description = """GEOS (Geometry Engine - Open Source) is a C++ port of the  Java Topology Suite (JTS)"""
 
-source_urls = [ 'http://download.osgeo.org/geos/' ]
+toolchain = {'name': 'ictce', 'version': '4.0.6'}
+
+source_urls = ['http://download.osgeo.org/geos/']
 sources = [SOURCELOWER_TAR_BZ2]
 
-toolchain = {'name': 'ictce', 'version': '4.0.6'}
+sanity_check_paths = {
+    'files': ['bin/geos-config', 'lib/libgeos.so', 'lib/libgeos.a', 'include/geos.h'],
+    'dirs': []
+}
 
 moduleclass = 'math'
diff --git a/easybuild/easyconfigs/g/GEOS/GEOS-3.3.5-ictce-5.3.0.eb b/easybuild/easyconfigs/g/GEOS/GEOS-3.3.5-ictce-5.3.0.eb
index 27b9e83b617856549292b1b8581e5f4adbf09d52..7d45ab8ba7223dfc7589e364bae1f0c2a78cd7bf 100644
--- a/easybuild/easyconfigs/g/GEOS/GEOS-3.3.5-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/g/GEOS/GEOS-3.3.5-ictce-5.3.0.eb
@@ -6,10 +6,14 @@ version = '3.3.5'
 homepage = 'http://trac.osgeo.org/geos'
 description = """GEOS (Geometry Engine - Open Source) is a C++ port of the  Java Topology Suite (JTS)"""
 
-source_urls = [ 'http://download.osgeo.org/geos/' ]
-sources = [SOURCELOWER_TAR_BZ2]
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
+source_urls = ['http://download.osgeo.org/geos/']
+sources = [SOURCELOWER_TAR_BZ2]
 
-toolchain = {'name': 'ictce', 'version': '5.3.0'}
+sanity_check_paths = {
+    'files': ['bin/geos-config', 'lib/libgeos.so', 'lib/libgeos.a', 'include/geos.h'],
+    'dirs': []
+}
 
 moduleclass = 'math'
diff --git a/easybuild/easyconfigs/g/GEOS/GEOS-3.5.0-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/g/GEOS/GEOS-3.5.0-intel-2015b-Python-2.7.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..35073f5ad2c8303f9e5772f7c642bf4e3437eba5
--- /dev/null
+++ b/easybuild/easyconfigs/g/GEOS/GEOS-3.5.0-intel-2015b-Python-2.7.10.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'GEOS'
+version = '3.5.0'
+
+homepage = 'http://trac.osgeo.org/geos'
+description = """GEOS (Geometry Engine - Open Source) is a C++ port of the  Java Topology Suite (JTS)"""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = ['http://download.osgeo.org/geos/']
+sources = [SOURCELOWER_TAR_BZ2]
+
+pyver = '2.7.10'
+pyshortver = '.'.join(pyver.split('.')[0:2])
+versionsuffix = '-Python-%s' % pyver
+
+dependencies = [('Python', pyver)]
+
+builddependencies = [('SWIG', '3.0.7', versionsuffix)]
+
+configopts = '--enable-python'
+
+modextrapaths = {'PYTHONPATH': 'lib/python%s/site-packages' % pyshortver}
+
+sanity_check_paths = {
+    'files': ['bin/geos-config', 'lib/libgeos.%s' % SHLIB_EXT, 'lib/libgeos.a', 'include/geos.h'],
+    'dirs': ['lib/python%s/site-packages/geos' % pyshortver]
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/g/GLM/GLM-0.9.7.2-intel-2015b.eb b/easybuild/easyconfigs/g/GLM/GLM-0.9.7.2-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1d08ddaee6cbc00ab60d9396a005b5e7c103ed17
--- /dev/null
+++ b/easybuild/easyconfigs/g/GLM/GLM-0.9.7.2-intel-2015b.eb
@@ -0,0 +1,22 @@
+easyblock = 'CMakeMake'
+
+name = 'GLM'
+version = '0.9.7.2'
+
+homepage = 'https://github.com/g-truc/glm'
+description = """OpenGL Mathematics (GLM) is a header only C++ mathematics library for graphics software based on
+ the OpenGL Shading Language (GLSL) specifications."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = ['https://github.com/g-truc/glm/archive/']
+sources = ['%(version)s.tar.gz']
+
+builddependencies = [('CMake', '3.4.1')]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['include/glm/'],
+}
+
+moduleclass = 'lib'
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 afaaab1f33d255c4452951bd7a44ef7179ddc31d..42150fd75f0dbfedcd690e71a2d897fdb2aa331d 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 @@ written in ANSI C and organized in the form of a callable library."""
 
 toolchain = {'name': 'ictce', 'version': '5.2.0'}
 toolchainopts = {'opt': True, 'optarch': True, 'pic': True}
- 
+
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
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
index 4716a30ce5587a8a8cac05b8d8644e72519bfcb1..c0b7a972313254d66bd85670cf82be743f8ef994 100644
--- 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
@@ -10,7 +10,7 @@ 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']
 
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
index 9aae296531466e7d3d137618534241d1dbdd11e0..4525095b9713d7977c1de7b43048305b85c3e7da 100644
--- 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
@@ -9,7 +9,7 @@ programming (LP), mixed integer programming (MIP), and other related problems. I
 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']
 
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
index b55056667c6ae4bd4d5933ee55f8606b4126cacb..aabef669ba99bc23084ad1d9cde7223e5c8fb4e3 100644
--- 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
@@ -10,7 +10,7 @@ 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']
 
diff --git a/easybuild/easyconfigs/g/GLibmm/GLibmm-2.41.2-intel-2015a.eb b/easybuild/easyconfigs/g/GLibmm/GLibmm-2.41.2-intel-2015a.eb
index 64f2f5e526f1d6b96f01b69ba58e6ba82068fda4..e53ca6dc7d891705a07642ba248c1e3b991b7141 100644
--- a/easybuild/easyconfigs/g/GLibmm/GLibmm-2.41.2-intel-2015a.eb
+++ b/easybuild/easyconfigs/g/GLibmm/GLibmm-2.41.2-intel-2015a.eb
@@ -18,7 +18,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-	'files': ['lib/libglibmm-2.4.so'],
-        'dirs': [],
+    'files': ['lib/libglibmm-2.4.%s' % SHLIB_EXT],
+    'dirs': [],
 }
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GLibmm/GLibmm-2.41.2-intel-2015b.eb b/easybuild/easyconfigs/g/GLibmm/GLibmm-2.41.2-intel-2015b.eb
index 25c577786dfaa134a7ba8759553ad414e4313368..0ce479aba52d37953c18a5687a03392e1078fba7 100644
--- a/easybuild/easyconfigs/g/GLibmm/GLibmm-2.41.2-intel-2015b.eb
+++ b/easybuild/easyconfigs/g/GLibmm/GLibmm-2.41.2-intel-2015b.eb
@@ -18,7 +18,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-	'files': ['lib/libglibmm-2.4.so'],
-        'dirs': [],
+    'files': ['lib/libglibmm-2.4.%s' % SHLIB_EXT],
+    'dirs': [],
 }
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GMAP-GSNAP/GMAP-GSNAP-2014-01-21-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GMAP-GSNAP/GMAP-GSNAP-2014-01-21-goolf-1.4.10.eb
index 3ce82b5b2d73e74bcb56b64a8d7c82ee97c01cf8..5fbe4acc9a092714ef3853f276b5670b3f05ad5e 100644
--- a/easybuild/easyconfigs/g/GMAP-GSNAP/GMAP-GSNAP-2014-01-21-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/g/GMAP-GSNAP/GMAP-GSNAP-2014-01-21-goolf-1.4.10.eb
@@ -3,7 +3,7 @@
 # Swiss Institute of Bioinformatics
 # Biozentrum - University of Basel
 
-easyblock = 'ConfigureMake' 
+easyblock = 'ConfigureMake'
 
 name = 'GMAP-GSNAP'
 version = '2014-01-21'
diff --git a/easybuild/easyconfigs/g/GMAP-GSNAP/GMAP-GSNAP-2014-06-10-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GMAP-GSNAP/GMAP-GSNAP-2014-06-10-goolf-1.4.10.eb
index 746e7c4f5339888f5130e7cbddf9115aa615b3c1..d83527abe3bcb4a000b1a5d3be3a062363b83eaa 100644
--- a/easybuild/easyconfigs/g/GMAP-GSNAP/GMAP-GSNAP-2014-06-10-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/g/GMAP-GSNAP/GMAP-GSNAP-2014-06-10-goolf-1.4.10.eb
@@ -3,7 +3,7 @@
 # Swiss Institute of Bioinformatics
 # Biozentrum - University of Basel
 
-easyblock = 'ConfigureMake' 
+easyblock = 'ConfigureMake'
 
 name = 'GMAP-GSNAP'
 version = "2014-06-10"
diff --git a/easybuild/easyconfigs/g/GMP/GMP-6.0.0-GCC-4.9.2.eb b/easybuild/easyconfigs/g/GMP/GMP-6.0.0-GCC-4.9.2.eb
index df7b8848c54759d2f84ee93450f9b1ed83b073ef..ebcf35412899168ccdfb8bd31902f3146eab9155 100644
--- a/easybuild/easyconfigs/g/GMP/GMP-6.0.0-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/g/GMP/GMP-6.0.0-GCC-4.9.2.eb
@@ -12,13 +12,17 @@ toolchain = {'name': 'GCC', 'version': '4.9.2'}
 sources = ["%(namelower)s-%(version)s.tar.bz2"]
 source_urls = [GNU_SOURCE]
 
+builddependencies = [
+    ('Autotools', '20150215'),
+]
+
 # enable C++ interface
 configopts = '--enable-cxx'
 
 runtest = 'check'
 
 sanity_check_paths = {
-    'files': ['lib/libgmp.so', 'include/gmp.h'],
+    'files': ['lib/libgmp.%s' % SHLIB_EXT, 'include/gmp.h'],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/g/GMP/GMP-6.0.0a-GCC-4.7.2.eb b/easybuild/easyconfigs/g/GMP/GMP-6.0.0a-GCC-4.7.2.eb
index fde2319360acbc8cb3e0b47db2c6b18858ce1cca..f6165358fa14040548f3ceff2586102e76e747aa 100644
--- a/easybuild/easyconfigs/g/GMP/GMP-6.0.0a-GCC-4.7.2.eb
+++ b/easybuild/easyconfigs/g/GMP/GMP-6.0.0a-GCC-4.7.2.eb
@@ -12,13 +12,17 @@ toolchain = {'name': 'GCC', 'version': '4.7.2'}
 sources = ["%(namelower)s-%(version)s.tar.bz2"]
 source_urls = [GNU_SOURCE]
 
+builddependencies = [
+    ('Autotools', '20150215'),
+]
+
 # enable C++ interface
 configopts = '--enable-cxx'
 
 runtest = 'check'
 
 sanity_check_paths = {
-    'files': ['lib/libgmp.so', 'include/gmp.h'],
+    'files': ['lib/libgmp.%s' % SHLIB_EXT, 'include/gmp.h'],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/g/GMP/GMP-6.0.0a-GCC-4.8.4.eb b/easybuild/easyconfigs/g/GMP/GMP-6.0.0a-GCC-4.8.4.eb
index 86bd52156f44a483f2db27807efc868f0c26cac9..0ea694664ddb077cfa32a7da7fbeea0ac2c59a74 100644
--- a/easybuild/easyconfigs/g/GMP/GMP-6.0.0a-GCC-4.8.4.eb
+++ b/easybuild/easyconfigs/g/GMP/GMP-6.0.0a-GCC-4.8.4.eb
@@ -12,13 +12,17 @@ toolchain = {'name': 'GCC', 'version': '4.8.4'}
 sources = ["%(namelower)s-%(version)s.tar.bz2"]
 source_urls = [GNU_SOURCE]
 
+builddependencies = [
+    ('Autotools', '20150215'),
+]
+
 # enable C++ interface
 configopts = '--enable-cxx'
 
 runtest = 'check'
 
 sanity_check_paths = {
-    'files': ['lib/libgmp.so', 'include/gmp.h'],
+    'files': ['lib/libgmp.%s' % SHLIB_EXT, 'include/gmp.h'],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/g/GMP/GMP-6.0.0a-GCC-4.9.2.eb b/easybuild/easyconfigs/g/GMP/GMP-6.0.0a-GCC-4.9.2.eb
index a9855e2029c8283bf69deaf48eb65661e7483035..d4d4addc7ca6d06201a2b915f9375959cbe3cf34 100644
--- a/easybuild/easyconfigs/g/GMP/GMP-6.0.0a-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/g/GMP/GMP-6.0.0a-GCC-4.9.2.eb
@@ -12,13 +12,17 @@ toolchain = {'name': 'GCC', 'version': '4.9.2'}
 sources = ["%(namelower)s-%(version)s.tar.bz2"]
 source_urls = [GNU_SOURCE]
 
+builddependencies = [
+    ('Autotools', '20150215'),
+]
+
 # enable C++ interface
 configopts = '--enable-cxx'
 
 runtest = 'check'
 
 sanity_check_paths = {
-    'files': ['lib/libgmp.so', 'include/gmp.h'],
+    'files': ['lib/libgmp.%s' % SHLIB_EXT, 'include/gmp.h'],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/g/GMP/GMP-6.0.0a-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/g/GMP/GMP-6.0.0a-GNU-4.9.3-2.25.eb
index 692f1fd8423e7fce9476386330bfb812114abb68..3328cb48836065fa1ff322366184557b1161449c 100644
--- a/easybuild/easyconfigs/g/GMP/GMP-6.0.0a-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/g/GMP/GMP-6.0.0a-GNU-4.9.3-2.25.eb
@@ -12,13 +12,17 @@ toolchain = {'name': 'GNU', 'version': '4.9.3-2.25'}
 sources = ["%(namelower)s-%(version)s.tar.bz2"]
 source_urls = [GNU_SOURCE]
 
+builddependencies = [
+    ('Autotools', '20150215'),
+]
+
 # enable C++ interface
 configopts = '--enable-cxx'
 
 runtest = 'check'
 
 sanity_check_paths = {
-    'files': ['lib/libgmp.so', 'include/gmp.h'],
+    'files': ['lib/libgmp.%s' % SHLIB_EXT, 'include/gmp.h'],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/g/GMP/GMP-6.0.0a-foss-2015a.eb b/easybuild/easyconfigs/g/GMP/GMP-6.0.0a-foss-2015a.eb
index 2b5b650040ceb85228fbea32feda6e1f636d0ace..70ef38387dbb8b041f68fed0bca219e46de45f17 100644
--- a/easybuild/easyconfigs/g/GMP/GMP-6.0.0a-foss-2015a.eb
+++ b/easybuild/easyconfigs/g/GMP/GMP-6.0.0a-foss-2015a.eb
@@ -12,6 +12,10 @@ toolchain = {'name': 'foss', 'version': '2015a'}
 sources = [SOURCELOWER_TAR_BZ2]
 source_urls = ['http://ftp.gnu.org/gnu/gmp']
 
+builddependencies = [
+    ('Autotools', '20150215'),
+]
+
 # enable C++ interface
 configopts = '--enable-cxx'
 
diff --git a/easybuild/easyconfigs/g/GMP/GMP-6.0.0a-intel-2015b.eb b/easybuild/easyconfigs/g/GMP/GMP-6.0.0a-intel-2015b.eb
index 9195f21b779954d2597e3ff9d732ee6e48cb201d..1497e837466d004103e1341474a2d184c4f773e7 100644
--- a/easybuild/easyconfigs/g/GMP/GMP-6.0.0a-intel-2015b.eb
+++ b/easybuild/easyconfigs/g/GMP/GMP-6.0.0a-intel-2015b.eb
@@ -13,6 +13,10 @@ toolchainopts = {'pic': True, 'precise': True}
 sources = [SOURCELOWER_TAR_BZ2]
 source_urls = [GNU_SOURCE]
 
+builddependencies = [
+    ('Autotools', '20150215'),
+]
+
 # enable C++ interface
 configopts = '--enable-cxx'
 
diff --git a/easybuild/easyconfigs/g/GMP/GMP-6.1.0-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/g/GMP/GMP-6.1.0-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3a35abe64e279b8016564fdc2975f9eef373833d
--- /dev/null
+++ b/easybuild/easyconfigs/g/GMP/GMP-6.1.0-GCC-4.9.3-2.25.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'GMP'
+version = '6.1.0'
+
+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.9.3-2.25'}
+toolchainopts = {'pic': True, 'precise': True}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['http://ftp.gnu.org/gnu/gmp']
+
+builddependencies = [
+    ('Autotools', '20150215'),
+]
+
+# enable C++ interface
+configopts = '--enable-cxx'
+
+runtest = 'check'
+
+sanity_check_paths = {
+    'files': ['lib/libgmp.%s' % SHLIB_EXT, 'include/gmp.h'],
+    'dirs': [],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/g/GMP/GMP-6.1.0-foss-2016a.eb b/easybuild/easyconfigs/g/GMP/GMP-6.1.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5a43c93bf337b9bfea24c2eaee61d077b07f7407
--- /dev/null
+++ b/easybuild/easyconfigs/g/GMP/GMP-6.1.0-foss-2016a.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'GMP'
+version = '6.1.0'
+
+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': 'foss', 'version': '2016a'}
+toolchainopts = {'pic': True, 'precise': True}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['http://ftp.gnu.org/gnu/gmp']
+
+builddependencies = [
+    ('Autotools', '20150215'),
+]
+
+# enable C++ interface
+configopts = '--enable-cxx'
+
+runtest = 'check'
+
+sanity_check_paths = {
+    'files': ['lib/libgmp.%s' % SHLIB_EXT, 'include/gmp.h'],
+    'dirs': [],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/g/GMP/GMP-6.1.0-intel-2015b.eb b/easybuild/easyconfigs/g/GMP/GMP-6.1.0-intel-2015b.eb
index 04e471f0d69e5271943caf040952df3e347aec19..531c5382b9357f6104413150d35a6a0ee2d418e7 100644
--- a/easybuild/easyconfigs/g/GMP/GMP-6.1.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/g/GMP/GMP-6.1.0-intel-2015b.eb
@@ -13,6 +13,10 @@ toolchainopts = {'pic': True, 'precise': True}
 sources = [SOURCELOWER_TAR_BZ2]
 source_urls = ['http://ftp.gnu.org/gnu/gmp']
 
+builddependencies = [
+    ('Autotools', '20150215'),
+]
+
 # enable C++ interface
 configopts = '--enable-cxx'
 
diff --git a/easybuild/easyconfigs/g/GMP/GMP-6.1.0-intel-2016a.eb b/easybuild/easyconfigs/g/GMP/GMP-6.1.0-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c0c58b69fb51050995d6d66f564ba580673ea0c7
--- /dev/null
+++ b/easybuild/easyconfigs/g/GMP/GMP-6.1.0-intel-2016a.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'GMP'
+version = '6.1.0'
+
+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': 'intel', 'version': '2016a'}
+toolchainopts = {'pic': True, 'precise': True}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['http://ftp.gnu.org/gnu/gmp']
+
+builddependencies = [
+    ('Autotools', '20150215'),
+]
+
+# enable C++ interface
+configopts = '--enable-cxx'
+
+runtest = 'check'
+
+sanity_check_paths = {
+    'files': ['lib/libgmp.%s' % SHLIB_EXT, 'include/gmp.h'],
+    'dirs': [],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/g/GSL/GSL-2.1-foss-2015b.eb b/easybuild/easyconfigs/g/GSL/GSL-2.1-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..812faf4e0f961d12935b387256830af9b24f28af
--- /dev/null
+++ b/easybuild/easyconfigs/g/GSL/GSL-2.1-foss-2015b.eb
@@ -0,0 +1,18 @@
+easyblock = 'ConfigureMake'
+
+name = 'GSL'
+version = "2.1"
+
+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 = {'version': '2015b', 'name': 'foss'}
+toolchainopts = {'opt': True, 'optarch': True, 'unroll': True, 'pic': True}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = "--with-pic"
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/g/GSL/GSL-2.1-intel-2016a.eb b/easybuild/easyconfigs/g/GSL/GSL-2.1-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..418483081374507a1cf8132a955b69e1eaa8ce1a
--- /dev/null
+++ b/easybuild/easyconfigs/g/GSL/GSL-2.1-intel-2016a.eb
@@ -0,0 +1,19 @@
+easyblock = 'ConfigureMake'
+
+name = 'GSL'
+version = '2.1'
+
+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': 'intel', 'version': '2016a'}
+toolchainopts = {'opt': True, 'optarch': True, 'unroll': True, 'pic': True}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = "--with-pic"
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/g/GTS/GTS-0.7.6-intel-2014b.eb b/easybuild/easyconfigs/g/GTS/GTS-0.7.6-intel-2014b.eb
index b673ea80e1810e3aec5ba5901f961dc5edfe5afe..20a9adba503eb4c45b290af32a7f460836b40385 100644
--- a/easybuild/easyconfigs/g/GTS/GTS-0.7.6-intel-2014b.eb
+++ b/easybuild/easyconfigs/g/GTS/GTS-0.7.6-intel-2014b.eb
@@ -18,7 +18,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/libgts.so', 'bin/gts2oogl', 'bin/gtscheck'],
+    'files': ['lib/libgts.%s' % SHLIB_EXT, 'bin/gts2oogl', 'bin/gtscheck'],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/g/GTS/GTS-0.7.6-intel-2015a-GLib-2.44.1.eb b/easybuild/easyconfigs/g/GTS/GTS-0.7.6-intel-2015a-GLib-2.44.1.eb
index 959c6d7b2b0fb2f636d5b2d9bb8e232962424da7..540cb5407196a61b5b7715bfbeaf9ae4399258d7 100644
--- a/easybuild/easyconfigs/g/GTS/GTS-0.7.6-intel-2015a-GLib-2.44.1.eb
+++ b/easybuild/easyconfigs/g/GTS/GTS-0.7.6-intel-2015a-GLib-2.44.1.eb
@@ -22,7 +22,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/libgts.so', 'bin/gts2oogl', 'bin/gtscheck'],
+    'files': ['lib/libgts.%s' % SHLIB_EXT, 'bin/gts2oogl', 'bin/gtscheck'],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/g/Geant4/Geant4-9.6.p04-intel-2015a.eb b/easybuild/easyconfigs/g/Geant4/Geant4-9.6.p04-intel-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..791ce6652ffc04ceeb117eaf9f5490ae2597bf9a
--- /dev/null
+++ b/easybuild/easyconfigs/g/Geant4/Geant4-9.6.p04-intel-2015a.eb
@@ -0,0 +1,24 @@
+name = 'Geant4'
+version = '9.6.p04'
+
+homepage = 'http://geant4.cern.ch/'
+description = """Geant4 is a toolkit for the simulation of the passage of particles through matter.
+ Its areas of application include high energy, nuclear and accelerator physics, 
+ as well as studies in medical and space science."""
+
+toolchain = {'name': 'intel', 'version': '2015a'}
+
+source_urls = ['http://geant4.cern.ch/support/source']
+sources = ['%(namelower)s.%(version)s.tar.gz']
+
+dependencies = [
+    ('expat', '2.1.0'),
+    ('CLHEP', '2.1.3.1'),
+]
+
+builddependencies = [('CMake', '3.1.3')]
+
+configopts = "-DEXPAT_LIBRARY=$EBROOTEXPAT/lib/libexpat.so -DEXPAT_INCLUDE_DIR=$EBROOTEXPAT/include"
+configopts += "-DGEANT4_INSTALL_DATA=OFF"
+
+moduleclass = 'phys'
diff --git a/easybuild/easyconfigs/g/GeoIP-C/GeoIP-C-1.6.7-intel-2015a.eb b/easybuild/easyconfigs/g/GeoIP-C/GeoIP-C-1.6.7-intel-2015a.eb
index 9dfefbcbfd90e8ecf035ca9b838a31377a50a7d5..1bee539962390b313af5ab13c5f788caa688dbf6 100644
--- a/easybuild/easyconfigs/g/GeoIP-C/GeoIP-C-1.6.7-intel-2015a.eb
+++ b/easybuild/easyconfigs/g/GeoIP-C/GeoIP-C-1.6.7-intel-2015a.eb
@@ -13,7 +13,7 @@ sources = ['GeoIP-%(version)s.tar.gz']
 
 sanity_check_paths = {
     'files': ['bin/geoiplookup', 'bin/geoiplookup6', 'include/GeoIPCity.h', 'include/GeoIP.h',
-              'lib/libGeoIP.a', 'lib/libGeoIP.so', 'lib/pkgconfig/geoip.pc'],
+              'lib/libGeoIP.a', 'lib/libGeoIP.%s' % SHLIB_EXT, 'lib/pkgconfig/geoip.pc'],
     'dirs': ['share/man'],
 }
 
diff --git a/easybuild/easyconfigs/g/GeoIP-C/GeoIP-C-1.6.7-intel-2015b.eb b/easybuild/easyconfigs/g/GeoIP-C/GeoIP-C-1.6.7-intel-2015b.eb
index 1ea1832677b25ef7689ba5b5b80e530b3936e748..052d35f001f76fb36b0402628789ca0dac5e0551 100644
--- a/easybuild/easyconfigs/g/GeoIP-C/GeoIP-C-1.6.7-intel-2015b.eb
+++ b/easybuild/easyconfigs/g/GeoIP-C/GeoIP-C-1.6.7-intel-2015b.eb
@@ -13,7 +13,7 @@ sources = ['GeoIP-%(version)s.tar.gz']
 
 sanity_check_paths = {
     'files': ['bin/geoiplookup', 'bin/geoiplookup6', 'include/GeoIPCity.h', 'include/GeoIP.h',
-              'lib/libGeoIP.a', 'lib/libGeoIP.so', 'lib/pkgconfig/geoip.pc'],
+              'lib/libGeoIP.a', 'lib/libGeoIP.%s' % SHLIB_EXT, 'lib/pkgconfig/geoip.pc'],
     'dirs': ['share/man'],
 }
 
diff --git a/easybuild/easyconfigs/g/Ghostscript/Ghostscript-9.14-intel-2014b.eb b/easybuild/easyconfigs/g/Ghostscript/Ghostscript-9.14-intel-2014b.eb
index 9439f32c2bee41cae604ebd89d424a87ec9b8f96..97a129a9e5a916b3842f3c9026c22a6228c29d2d 100644
--- a/easybuild/easyconfigs/g/Ghostscript/Ghostscript-9.14-intel-2014b.eb
+++ b/easybuild/easyconfigs/g/Ghostscript/Ghostscript-9.14-intel-2014b.eb
@@ -37,7 +37,7 @@ buildopts = [' ', 'so']
 installopts = [' ', 'soinstall']
 
 sanity_check_paths = {
-    'files': ['bin/gs', 'bin/ps2pdf', 'lib/libgs.so'],
+    'files': ['bin/gs', 'bin/ps2pdf', 'lib/libgs.%s' % SHLIB_EXT],
     'dirs': ['include']
 }
 
diff --git a/easybuild/easyconfigs/g/Ghostscript/Ghostscript-9.16-goolf-1.7.20.eb b/easybuild/easyconfigs/g/Ghostscript/Ghostscript-9.16-goolf-1.7.20.eb
index 41de713278c1e3b91f359ce115801eb709adf51b..4e828aad873bfcebdb73eca5e146e2cf372fc006 100644
--- a/easybuild/easyconfigs/g/Ghostscript/Ghostscript-9.16-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/g/Ghostscript/Ghostscript-9.16-goolf-1.7.20.eb
@@ -17,7 +17,7 @@ checksums = ['829319325bbdb83f5c81379a8f86f38f']
 
 dependencies = [
     ('zlib', '1.2.8'),
-    ('libpng', '1.6.17'),  
+    ('libpng', '1.6.17'),
     ('freetype', '2.6'),
     ('fontconfig', '2.11.94'),
     ('GLib', '2.44.1'),
diff --git a/easybuild/easyconfigs/g/Graphviz/Graphviz-2.38.0-intel-2014b.eb b/easybuild/easyconfigs/g/Graphviz/Graphviz-2.38.0-intel-2014b.eb
index c23e8f17a12714c5893ad321729d20b2f5e9cc2e..fdd14fa479330e33ec628603f5e6a8207e246b0f 100644
--- a/easybuild/easyconfigs/g/Graphviz/Graphviz-2.38.0-intel-2014b.eb
+++ b/easybuild/easyconfigs/g/Graphviz/Graphviz-2.38.0-intel-2014b.eb
@@ -53,7 +53,7 @@ prebuildopts = 'qmake -o cmd/gvedit/qMakefile cmd/gvedit/gvedit.pro && '
 
 sanity_check_paths = {
     'files': ['bin/cluster', 'bin/dot', 'bin/gvmap',
-              'lib/libcdt.so', 'lib/libgvc.so', 'lib/libxdot.so'],
+              'lib/libcdt.%s' % SHLIB_EXT, 'lib/libgvc.%s' % SHLIB_EXT, 'lib/libxdot.%s' % SHLIB_EXT],
     'dirs': ['include']
 }
 
diff --git a/easybuild/easyconfigs/g/Graphviz/Graphviz-2.38.0-intel-2015a-Python-2.7.10.eb b/easybuild/easyconfigs/g/Graphviz/Graphviz-2.38.0-intel-2015a-Python-2.7.10.eb
index c5e6a0512b1c00cafee989adddf11438caecbbd4..f2c3631ad016a68ff7fd34848fa4f09d2e5b3661 100644
--- a/easybuild/easyconfigs/g/Graphviz/Graphviz-2.38.0-intel-2015a-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/g/Graphviz/Graphviz-2.38.0-intel-2015a-Python-2.7.10.eb
@@ -55,7 +55,7 @@ prebuildopts = 'qmake -o cmd/gvedit/qMakefile cmd/gvedit/gvedit.pro && '
 
 sanity_check_paths = {
     'files': ['bin/cluster', 'bin/dot', 'bin/gvmap',
-              'lib/libcdt.so', 'lib/libgvc.so', 'lib/libxdot.so'],
+              'lib/libcdt.%s' % SHLIB_EXT, 'lib/libgvc.%s' % SHLIB_EXT, 'lib/libxdot.%s' % SHLIB_EXT],
     'dirs': ['include']
 }
 
diff --git a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.2-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.2-intel-2015b-Python-2.7.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9cbb38d0514baf9a6cbac19983d4223536ed3603
--- /dev/null
+++ b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.2-intel-2015b-Python-2.7.10.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': 'intel', 'version': '2015b'}
+
+source_urls = [PYPI_LOWER_SOURCE]
+sources = [SOURCELOWER_ZIP]
+
+patches = ['Greenlet-%(version)s_icc_no_amd64_predefined_in_prepocessor.patch']
+
+pyver = '2.7.10'
+versionsuffix = "-Python-%s" % pyver
+
+dependencies = [('Python', pyver)]
+
+pyshortver = '.'.join(pyver.split('.')[:2])
+sanity_check_paths = {
+    'files': ['include/python%s/greenlet/greenlet.h' % pyshortver,
+              'lib/python%s/site-packages/greenlet.%s' % (pyshortver, SHLIB_EXT)],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/g/Gtkmm/Gtkmm-2.24.4-intel-2015a.eb b/easybuild/easyconfigs/g/Gtkmm/Gtkmm-2.24.4-intel-2015a.eb
index 8e1cb764c0a1ba19d3813fbe54457af48da7a4fb..f946da12a260d8d2f29d1c253a413e434b340bdc 100644
--- a/easybuild/easyconfigs/g/Gtkmm/Gtkmm-2.24.4-intel-2015a.eb
+++ b/easybuild/easyconfigs/g/Gtkmm/Gtkmm-2.24.4-intel-2015a.eb
@@ -20,7 +20,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/libgtkmm-2.4.so.1'], 
+    'files': ['lib/libgtkmm-2.4.so.1'],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/g/Gtkmm/Gtkmm-2.24.4-intel-2015b.eb b/easybuild/easyconfigs/g/Gtkmm/Gtkmm-2.24.4-intel-2015b.eb
index f4d4f0209a8693f533cd5f477a6387d1379c1e05..60c1e59723ffabf7a8dce421c4f55496811112ee 100644
--- a/easybuild/easyconfigs/g/Gtkmm/Gtkmm-2.24.4-intel-2015b.eb
+++ b/easybuild/easyconfigs/g/Gtkmm/Gtkmm-2.24.4-intel-2015b.eb
@@ -20,7 +20,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/libgtkmm-2.4.so.1'], 
+    'files': ['lib/libgtkmm-2.4.so.1'],
     'dirs': [],
 }
 
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 ea88dd569c366f085c21442e15688cd8d793b545..cff1cf8e33694ec01a1c22ca4ec51e86837559aa 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
@@ -8,7 +8,7 @@ description = """GNU `gettext' is an important step for the GNU Translation Proj
 build many other steps. This package offers to programmers, translators, and even users, a well integrated set of tools
 and documentation"""
 
-toolchain = {'name': 'ictce', 'version': '4.1.13'} 
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
 sources = [SOURCE_TAR_GZ]
 source_urls = [GNU_SOURCE]
diff --git a/easybuild/easyconfigs/g/gmvolf/gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/g/gmvolf/gmvolf-1.7.12rc1.eb
index c3fb773c88fcdcc25f006797727a37d6cb67bbf6..50901901bf3400bd6a93818b15c39ce45e1c3f18 100644
--- a/easybuild/easyconfigs/g/gmvolf/gmvolf-1.7.12rc1.eb
+++ b/easybuild/easyconfigs/g/gmvolf/gmvolf-1.7.12rc1.eb
@@ -32,6 +32,6 @@ dependencies = [
     (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/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 8746928b55d8d5042f89d418ecbb872851e40541..9315e9e792cf09033563a2dbdc0889079e9aaeb9 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
@@ -21,7 +21,7 @@ configopts = "--with-guile-site-dir=$EBROOTGUILE"
 
 sanity_check_paths = {
                       'files': ['bin/%s' % x for x in ['certtool', 'danetool', 'gnutls-cli', 'gnutls-cli-debug',
-                                                       'gnutls-serv', 'ocsptool', 'psktool', 'srptool']] + 
+                                                       'gnutls-serv', 'ocsptool', 'psktool', 'srptool']] +
                                ['lib/libgnutls%s' % x for x in ['.a', 'xx.a', '-xssl.a', '-openssl.a']],
                       'dirs': ['include/gnutls'],
                      }
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 110dff5cb7eee39836546f287536d2277073ef51..0fc5d46401d3723509a29a1d16fde9f7643094b2 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
@@ -20,7 +20,7 @@ configopts = "--with-guile-site-dir=$EBROOTGUILE"
 
 sanity_check_paths = {
                       'files': ['bin/%s' % x for x in ['certtool', 'danetool', 'gnutls-cli', 'gnutls-cli-debug',
-                                                       'gnutls-serv', 'ocsptool', 'psktool', 'srptool']] + 
+                                                       'gnutls-serv', 'ocsptool', 'psktool', 'srptool']] +
                                ['lib/libgnutls%s' % x for x in ['.a', 'xx.a', '-xssl.a', '-openssl.a']],
                       'dirs': ['include/gnutls'],
                      }
diff --git a/easybuild/easyconfigs/g/gnutls/gnutls-3.4.7-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/g/gnutls/gnutls-3.4.7-GNU-4.9.3-2.25.eb
index c59e536de396ee2fbdbb7e3d999c4891ad40e4c3..d883037773378e2bb3bb4587b6e5cebf29b0cf34 100644
--- a/easybuild/easyconfigs/g/gnutls/gnutls-3.4.7-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/g/gnutls/gnutls-3.4.7-GNU-4.9.3-2.25.eb
@@ -31,8 +31,8 @@ configopts = "--with-guile-site-dir=$EBROOTGUILE --enable-openssl-compatibility
 
 sanity_check_paths = {
     'files': ['bin/%s' % x for x in ['certtool', 'crywrap', 'gnutls-cli', 'gnutls-cli-debug',
-                                     'gnutls-serv', 'ocsptool', 'psktool', 'srptool']] + 
-             ['lib/libgnutls%s' % x for x in ['.so', 'xx.so', '-openssl.so']] +
+                                     'gnutls-serv', 'ocsptool', 'psktool', 'srptool']] +
+             ['lib/libgnutls%s' % x for x in ['.%s' % SHLIB_EXT, 'xx.%s' % SHLIB_EXT, '-openssl.%s' % SHLIB_EXT]] +
              ['lib/guile/%s/guile-gnutls-v-2.so' % guileshortver],
     'dirs': ['include/gnutls'],
 }
diff --git a/easybuild/easyconfigs/g/gompi/gompi-2016a.eb b/easybuild/easyconfigs/g/gompi/gompi-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..793e78b5ef19fe5acf73f30e6d2ebc0232d72ef5
--- /dev/null
+++ b/easybuild/easyconfigs/g/gompi/gompi-2016a.eb
@@ -0,0 +1,20 @@
+easyblock = "Toolchain"
+
+name = 'gompi'
+version = '2016a'
+
+homepage = '(none)'
+description = """GNU Compiler Collection (GCC) based compiler toolchain,
+ including OpenMPI for MPI support."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+gccver = '4.9.3-2.25'
+
+# compiler toolchain dependencies
+dependencies = [
+    ('GCC', gccver),  # includes both GCC 4.9.3 and binutils 2.25
+    ('OpenMPI', '1.10.2', '', ('GCC', gccver)),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/g/gtkglext/gtkglext-1.2.0-intel-2015b.eb b/easybuild/easyconfigs/g/gtkglext/gtkglext-1.2.0-intel-2015b.eb
index 4169a1657f2162b770e66e9ed8da1b9d67dff452..24f8fc107092b2fcbc31634a986ccbaaa0a7320b 100644
--- a/easybuild/easyconfigs/g/gtkglext/gtkglext-1.2.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/g/gtkglext/gtkglext-1.2.0-intel-2015b.eb
@@ -21,8 +21,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/gtkglext-1.0/include/gdkglext-config.h', 'lib/libgdkglext-x11-1.0.a', 'lib/libgdkglext-x11-1.0.so',
-              'lib/libgtkglext-x11-1.0.a', 'lib/libgtkglext-x11-1.0.so'],
+    'files': ['lib/gtkglext-1.0/include/gdkglext-config.h', 'lib/libgdkglext-x11-1.0.a', 'lib/libgdkglext-x11-1.0.%s' % SHLIB_EXT,
+              'lib/libgtkglext-x11-1.0.a', 'lib/libgtkglext-x11-1.0.%s' % SHLIB_EXT],
     'dirs': ['include/gtkglext-1.0/gdk', 'include/gtkglext-1.0/gtk', 'lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.6-intel-2015b.eb b/easybuild/easyconfigs/g/gzip/gzip-1.6-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c1b78eb897bc365f1a4e0e62a9210da4403e5c48
--- /dev/null
+++ b/easybuild/easyconfigs/g/gzip/gzip-1.6-intel-2015b.eb
@@ -0,0 +1,21 @@
+easyblock = 'ConfigureMake'
+
+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': 'intel', 'version': '2015b'}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ["bin/gunzip", "bin/gzip", "bin/uncompress"],
+    'dirs': [],
+}
+
+sanity_check_commands = [True, ('gzip', '--version')]
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/h/HBase/HBase-1.0.2.eb b/easybuild/easyconfigs/h/HBase/HBase-1.0.2.eb
index aeb9e7c8b09993a26717028cbcf8c09e9382df56..ab9d5fd44fb20ffb2896ba03057ef693d7164e56 100644
--- a/easybuild/easyconfigs/h/HBase/HBase-1.0.2.eb
+++ b/easybuild/easyconfigs/h/HBase/HBase-1.0.2.eb
@@ -15,10 +15,10 @@ dependencies = [('Java', '1.7.0_80')]
 
 parallel = 1
 
-sanity_check_paths = {  
-    'files': ["bin/hbase"],  
-    'dirs': ["conf", "docs", "hbase-webapps", "lib"]  
-}  
+sanity_check_paths = {
+    'files': ["bin/hbase"],
+    'dirs': ["conf", "docs", "hbase-webapps", "lib"]
+}
 
 modextravars = {'HBASE_HOME': '%(installdir)s'}
 
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-patch1-goolf-1.5.14.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-patch1-goolf-1.5.14.eb
index 89abbbefcff3d66c333485ee0bb2d3c134e149dd..c83b2a6347231dfa072ed05d7290c9c4dd52fc31 100644
--- a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-patch1-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-patch1-goolf-1.5.14.eb
@@ -5,7 +5,7 @@ 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.5.14'} 
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
 toolchainopts = {'optarch': True, 'usempi': True, 'pic': True}
 
 source_urls = ['http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version)s/src']
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.13-intel-2015b.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.13-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a74b48d6644fc17dada2c5f58818b19be5aab86c
--- /dev/null
+++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.13-intel-2015b.eb
@@ -0,0 +1,26 @@
+name = 'HDF5'
+version = '1.8.13'
+
+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': 'intel', 'version': '2015b'}
+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-%(version)s_configure_intel.patch',
+    'configure_libtool.patch',
+]
+
+buildopts = 'CXXFLAGS="$CXXFLAGS -DMPICH_IGNORE_CXX_SEEK"'
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('Szip', '2.1'),
+]
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayCCE-2015.06-XC.eb b/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayCCE-2015.06-XC.eb
new file mode 100644
index 0000000000000000000000000000000000000000..845802b50453459a0037378e23af09ca6ad9405d
--- /dev/null
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayCCE-2015.06-XC.eb
@@ -0,0 +1,22 @@
+name = 'HPL'
+version = '2.1'
+
+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': 'CrayCCE', 'version': '2015.06-XC'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.netlib.org/benchmark/%(namelower)s']
+
+patches = [
+    # fix Make dependencies, so parallel build also works
+    'HPL_parallel-make.patch',
+    'HPL-2.1_LINKER-ld.patch',
+]
+
+parallel = 1
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayCCE-2015.11-XC.eb b/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayCCE-2015.11-XC.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f4a0256f792ccb59850cab642b040dcce744c346
--- /dev/null
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayCCE-2015.11-XC.eb
@@ -0,0 +1,22 @@
+name = 'HPL'
+version = '2.1'
+
+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': 'CrayCCE', 'version': '2015.11-XC'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.netlib.org/benchmark/%(namelower)s']
+
+patches = [
+    # fix Make dependencies, so parallel build also works
+    'HPL_parallel-make.patch',
+    'HPL-2.1_LINKER-ld.patch',
+]
+
+parallel = 1
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayGNU-2015.06-XC.eb b/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayGNU-2015.06-XC.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fe0de8812c09e89270bcd9e93f493d9b8d9857a9
--- /dev/null
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayGNU-2015.06-XC.eb
@@ -0,0 +1,18 @@
+name = 'HPL'
+version = '2.1'
+
+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': 'CrayGNU', 'version': '2015.06-XC'}
+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.1-CrayGNU-2015.11-XC.eb b/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayGNU-2015.11-XC.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ecd5998b8d6a52014e0fb7fed6fd9d0e03cae82d
--- /dev/null
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayGNU-2015.11-XC.eb
@@ -0,0 +1,18 @@
+name = 'HPL'
+version = '2.1'
+
+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': 'CrayGNU', 'version': '2015.11-XC'}
+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.1-CrayIntel-2015.06-XC.eb b/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayIntel-2015.06-XC.eb
new file mode 100644
index 0000000000000000000000000000000000000000..32e943a8d6e9be4c4dad2d6db3c6c23d6857d5ef
--- /dev/null
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayIntel-2015.06-XC.eb
@@ -0,0 +1,18 @@
+name = 'HPL'
+version = '2.1'
+
+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': 'CrayIntel', 'version': '2015.06-XC'}
+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.1-CrayIntel-2015.11-XC.eb b/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayIntel-2015.11-XC.eb
new file mode 100644
index 0000000000000000000000000000000000000000..370ce49b4cf7cb051b02d4f1763140117941e9ce
--- /dev/null
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayIntel-2015.11-XC.eb
@@ -0,0 +1,18 @@
+name = 'HPL'
+version = '2.1'
+
+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': 'CrayIntel', 'version': '2015.11-XC'}
+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.1-foss-2016a.eb b/easybuild/easyconfigs/h/HPL/HPL-2.1-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e43e4270ddec3ee1d1dbd17f9618c578aef2610d
--- /dev/null
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.1-foss-2016a.eb
@@ -0,0 +1,18 @@
+name = 'HPL'
+version = '2.1'
+
+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': 'foss', 'version': '2016a'}
+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.1-gpsolf-2014.12.eb b/easybuild/easyconfigs/h/HPL/HPL-2.1-gpsolf-2014.12.eb
index 26abf7963c7d3f98b8443b31af1afec3949e1ba6..8b166299eb8f86be5b04bef894b5c60bc1b557a1 100644
--- a/easybuild/easyconfigs/h/HPL/HPL-2.1-gpsolf-2014.12.eb
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.1-gpsolf-2014.12.eb
@@ -5,7 +5,7 @@ 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': 'gpsolf', 'version': '2014.12'} 
+toolchain = {'name': 'gpsolf', 'version': '2014.12'}
 toolchainopts = {'optarch': True, 'usempi': True}
 
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.1-intel-2016a.eb b/easybuild/easyconfigs/h/HPL/HPL-2.1-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a3af786ca9b1ffb63b6a7bafdf7fa91941026405
--- /dev/null
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.1-intel-2016a.eb
@@ -0,0 +1,18 @@
+name = 'HPL'
+version = '2.1'
+
+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': 'intel', 'version': '2016a'}
+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.1-intel-para-2014.12.eb b/easybuild/easyconfigs/h/HPL/HPL-2.1-intel-para-2014.12.eb
index b56af425fea1870530acec7386bba8aa81403fef..0ad29d6c94f28bb4ea10c0ff8dd21226a7770a96 100644
--- a/easybuild/easyconfigs/h/HPL/HPL-2.1-intel-para-2014.12.eb
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.1-intel-para-2014.12.eb
@@ -5,7 +5,7 @@ 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': 'intel-para', 'version': '2014.12'} 
+toolchain = {'name': 'intel-para', 'version': '2014.12'}
 toolchainopts = {'optarch': True, 'usempi': True}
 
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/h/HTSlib/HTSlib-1.1-goolf-1.4.10.eb b/easybuild/easyconfigs/h/HTSlib/HTSlib-1.1-goolf-1.4.10.eb
index 93dfcd4cac2fa659f57632f554352a104177403f..d99049bc6c6b2d0c0ff6f3798968d1918a9c7405 100644
--- a/easybuild/easyconfigs/h/HTSlib/HTSlib-1.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/h/HTSlib/HTSlib-1.1-goolf-1.4.10.eb
@@ -3,7 +3,7 @@
 # Swiss Institute of Bioinformatics
 # Biozentrum - University of Basel
 
-easyblock = 'ConfigureMake' 
+easyblock = 'ConfigureMake'
 
 name = 'HTSlib'
 version = '1.1'
@@ -26,7 +26,7 @@ skipsteps = ['configure']
 installopts = ' prefix=%(installdir)s'
 
 sanity_check_paths = {
-    'files': ["bin/bgzip", "bin/tabix", "lib/libhts.so"],
+    'files': ["bin/bgzip", "bin/tabix", "lib/libhts.%s" % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/h/HTSlib/HTSlib-1.2.1-foss-2015a.eb b/easybuild/easyconfigs/h/HTSlib/HTSlib-1.2.1-foss-2015a.eb
index 000a05482bd524282521b799d49dfaf53379b100..b9abe470f01314d4d14ed54ada177e3931e97f7f 100644
--- a/easybuild/easyconfigs/h/HTSlib/HTSlib-1.2.1-foss-2015a.eb
+++ b/easybuild/easyconfigs/h/HTSlib/HTSlib-1.2.1-foss-2015a.eb
@@ -20,7 +20,7 @@ sources = [SOURCELOWER_TAR_BZ2]
 dependencies = [('zlib', '1.2.8')]
 
 sanity_check_paths = {
-    'files': ["bin/bgzip", "bin/tabix", "lib/libhts.so"],
+    'files': ["bin/bgzip", "bin/tabix", "lib/libhts.%s" % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/h/HTSlib/HTSlib-1.2.1-goolf-1.7.20.eb b/easybuild/easyconfigs/h/HTSlib/HTSlib-1.2.1-goolf-1.7.20.eb
index b266c4f0a2a0aca044bbe73e30dd31515a9f5632..742be3ddc090196a80f5e4a034465aeba6999456 100644
--- a/easybuild/easyconfigs/h/HTSlib/HTSlib-1.2.1-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/h/HTSlib/HTSlib-1.2.1-goolf-1.7.20.eb
@@ -22,7 +22,7 @@ sources = [SOURCELOWER_TAR_BZ2]
 dependencies = [('zlib', '1.2.8')]
 
 sanity_check_paths = {
-    'files': ["bin/bgzip", "bin/tabix", "lib/libhts.so"],
+    'files': ["bin/bgzip", "bin/tabix", "lib/libhts.%s" % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/h/HTSlib/HTSlib-1.2.1-intel-2015a.eb b/easybuild/easyconfigs/h/HTSlib/HTSlib-1.2.1-intel-2015a.eb
index 3963d9e53913585e17e33c234062242636de3a2d..a5f315ea84f911674974c9461b006892f5cddf0f 100644
--- a/easybuild/easyconfigs/h/HTSlib/HTSlib-1.2.1-intel-2015a.eb
+++ b/easybuild/easyconfigs/h/HTSlib/HTSlib-1.2.1-intel-2015a.eb
@@ -20,7 +20,7 @@ sources = [SOURCELOWER_TAR_BZ2]
 dependencies = [('zlib', '1.2.8')]
 
 sanity_check_paths = {
-    'files': ["bin/bgzip", "bin/tabix", "lib/libhts.so"],
+    'files': ["bin/bgzip", "bin/tabix", "lib/libhts.%s" % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/h/HTSlib/HTSlib-1.2.1-intel-2015b.eb b/easybuild/easyconfigs/h/HTSlib/HTSlib-1.2.1-intel-2015b.eb
index 465b0a7d53d7e7213cff80e758080e7de1f6444f..ced9e05617be9c6f7e523b05b5262209e64dab5b 100644
--- a/easybuild/easyconfigs/h/HTSlib/HTSlib-1.2.1-intel-2015b.eb
+++ b/easybuild/easyconfigs/h/HTSlib/HTSlib-1.2.1-intel-2015b.eb
@@ -20,7 +20,7 @@ sources = [SOURCELOWER_TAR_BZ2]
 dependencies = [('zlib', '1.2.8')]
 
 sanity_check_paths = {
-    'files': ["bin/bgzip", "bin/tabix", "lib/libhts.so"],
+    'files': ["bin/bgzip", "bin/tabix", "lib/libhts.%s" % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-0.9.35-intel-2014b.eb b/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-0.9.35-intel-2014b.eb
index ba609bc0fdba65c496d6deae0d5e944f6c127c16..da1d4ca30fcd770baba3dce82244284f0a31d3de 100644
--- a/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-0.9.35-intel-2014b.eb
+++ b/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-0.9.35-intel-2014b.eb
@@ -21,7 +21,7 @@ patches = ['HarfBuzz-%(version)s_config.patch']
 configopts = '--with-gobject --enable-introspection=yes '
 
 sanity_check_paths = {
-    'files': ['lib/libharfbuzz.so', 'bin/hb-view'],
+    'files': ['lib/libharfbuzz.%s' % SHLIB_EXT, 'bin/hb-view'],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-0.9.41-intel-2015a.eb b/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-0.9.41-intel-2015a.eb
index 30ed702ef86d44117360b5f12f6125071e4e9670..aa9159ceb503e8b5d94cd83cc2692882ffcc73a8 100644
--- a/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-0.9.41-intel-2015a.eb
+++ b/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-0.9.41-intel-2015a.eb
@@ -18,9 +18,9 @@ dependencies = [
     ('GLib', '2.41.2'),
 ]
 
-sanity_check_paths = {                                                                                                   
-    'files': ["lib/libharfbuzz.so"],                                                                                             
-    'dirs': [""],                                                                                          
+sanity_check_paths = {
+    'files': ['lib/libharfbuzz.%s' % SHLIB_EXT],
+    'dirs': [],
 }
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-0.9.41-intel-2015b.eb b/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-0.9.41-intel-2015b.eb
index f814340bb54dd6d9d0952d9ef4584b27ab6a2cb0..82ca87f89c920965b7d45c1051ea404001d3a7e4 100644
--- a/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-0.9.41-intel-2015b.eb
+++ b/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-0.9.41-intel-2015b.eb
@@ -18,9 +18,9 @@ dependencies = [
     ('GLib', '2.41.2'),
 ]
 
-sanity_check_paths = {                                                                                                   
-    'files': ["lib/libharfbuzz.so"],                                                                                             
-    'dirs': [""],                                                                                          
+sanity_check_paths = {
+    'files': ['lib/libharfbuzz.%s' % SHLIB_EXT],
+    'dirs': [],
 }
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-1.0.1-intel-2015a.eb b/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-1.0.1-intel-2015a.eb
index d96b54ef9349e23496e8739ddc6cad9ac3def7d0..816c289c555ce0e6c16c43220b2d7829942a6a49 100644
--- a/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-1.0.1-intel-2015a.eb
+++ b/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-1.0.1-intel-2015a.eb
@@ -19,7 +19,7 @@ dependencies = [
 configopts = '--with-gobject --enable-introspection=yes '
 
 sanity_check_paths = {
-    'files': ['lib/libharfbuzz.so', 'bin/hb-view'],
+    'files': ['lib/libharfbuzz.%s' % SHLIB_EXT, 'bin/hb-view'],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-1.1.0-intel-2015b.eb b/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-1.1.0-intel-2015b.eb
index 9ed292cff80f05415286b9e8dd8547b7aedaf9a3..15e2c94d10340a73462f7d621a9774315d01eae1 100644
--- a/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-1.1.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-1.1.0-intel-2015b.eb
@@ -19,7 +19,7 @@ dependencies = [
 configopts = '--with-gobject --enable-introspection=yes '
 
 sanity_check_paths = {
-    'files': ['lib/libharfbuzz.so', 'bin/hb-view'],
+    'files': ['lib/libharfbuzz.%s' % SHLIB_EXT, 'bin/hb-view'],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/h/Hoard/Hoard-3.10-intel-2015a.eb b/easybuild/easyconfigs/h/Hoard/Hoard-3.10-intel-2015a.eb
index 229cf3a9baaee4c576b999160dd62d1b392f49bd..80e0503ba7c1e8356b383b5cfb5341acada999e6 100644
--- a/easybuild/easyconfigs/h/Hoard/Hoard-3.10-intel-2015a.eb
+++ b/easybuild/easyconfigs/h/Hoard/Hoard-3.10-intel-2015a.eb
@@ -17,13 +17,13 @@ start_dir = 'src'
 
 buildopts = 'linux-gcc-x86-64'
 
-files_to_copy = [(['libhoard.so'], 'lib')]
+files_to_copy = [(['libhoard.%s' % SHLIB_EXT], 'lib')]
 
 sanity_check_paths = {
-    'files': ['lib/libhoard.so'],
+    'files': ['lib/libhoard.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
-modextrapaths = {'LD_PRELOAD': ['lib/libhoard.so']}
+modextrapaths = {'LD_PRELOAD': ['lib/libhoard.%s' % SHLIB_EXT]}
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/h/hanythingondemand/hanythingondemand-3.0.4-cli.eb b/easybuild/easyconfigs/h/hanythingondemand/hanythingondemand-3.0.4-cli.eb
new file mode 100644
index 0000000000000000000000000000000000000000..754319d620b8688bcbe1fd8e7b4068a73624ecff
--- /dev/null
+++ b/easybuild/easyconfigs/h/hanythingondemand/hanythingondemand-3.0.4-cli.eb
@@ -0,0 +1,42 @@
+easyblock = 'PythonPackage'
+
+name = 'hanythingondemand'
+version = '3.0.4'
+versionsuffix = '-cli'
+
+homepage = 'https://github.com/hpcugent/hanythingondemand'
+description = """HanythingOnDemand (HOD) is a system for provisioning virtual Hadoop clusters over a large physical cluster.
+It uses the Torque resource manager to do node allocation."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+# minimal version for interactive use: just uses system Python (netaddr/netifaces/mpi4py not required)
+dependencies = [
+    ('pbs_python', '4.6.0'),
+    ('vsc-base', '2.4.2'),
+]
+
+use_easy_install = True
+zipped_egg = True
+
+# use 'hod' rather than 'hanythingondemand' in module name
+modaltsoftname = 'hod'
+
+options = {'modulename': 'hod'}
+
+modextravars = {
+    # site-specific settings, hence commented out
+    # specify HOD module to use in jobs (*full* HOD installation, not a minimal one)
+    #'HOD_BATCH_HOD_MODULE': 'hanythingondemand/%(version)s-intel-2015b-Python-2.7.10',
+    #'HOD_CREATE_HOD_MODULE': 'hanythingondemand/%(version)s-intel-2015b-Python-2.7.10',
+    # specify location on shared 'scratch' filesystem for HOD working directories
+    #'HOD_BATCH_WORKDIR': '\$VSC_SCRATCH/hod',
+    #'HOD_CREATE_WORKDIR': '\$VSC_SCRATCH/hod',
+}
+
+sanity_check_commands = [('hod', '--help'), ('hod', 'dists')]
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/h/hanythingondemand/hanythingondemand-3.0.4-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/h/hanythingondemand/hanythingondemand-3.0.4-intel-2015b-Python-2.7.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a9eb0b66e93d0e6fde9b46a5f5799c37c2124dd3
--- /dev/null
+++ b/easybuild/easyconfigs/h/hanythingondemand/hanythingondemand-3.0.4-intel-2015b-Python-2.7.10.eb
@@ -0,0 +1,35 @@
+easyblock = 'PythonPackage'
+
+name = 'hanythingondemand'
+version = '3.0.4'
+
+homepage = 'https://github.com/hpcugent/hanythingondemand'
+description = """HanythingOnDemand (HOD) is a system for provisioning virtual Hadoop clusters over a large physical cluster.
+It uses the Torque resource manager to do node allocation."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+python = 'Python'
+pythonver = '2.7.10'
+pythonshortver = '.'.join(pythonver.split('.')[:2])
+versionsuffix = '-%s-%s' % (python, pythonver)
+
+# a Python version with netaddr/netifaces/mpi4py + pbs_python and vsc-base/vsc-mympirun is required at runtime
+dependencies = [
+    (python, pythonver),  # provides netaddr, netifaces, mpi4py
+    ('pbs_python', '4.6.0', versionsuffix),
+    ('vsc-mympirun', '3.4.2', versionsuffix + '-vsc-base-2.4.2'),
+    ('setuptools', '1.4.2', '', True),
+]
+
+use_easy_install = True
+zipped_egg = True
+
+options = {'modulename': 'hod'}
+
+sanity_check_commands = [('hod', '--help'), ('hod', 'dists')]
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/h/hisat/hisat-0.1.5-beta-goolf-1.7.20.eb b/easybuild/easyconfigs/h/hisat/hisat-0.1.5-beta-goolf-1.7.20.eb
index bd8c70bf67223e9464b03585ce21bfc46b274acd..bece15fbe37e5fae55bd11916c37fc4dd17900b0 100644
--- a/easybuild/easyconfigs/h/hisat/hisat-0.1.5-beta-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/h/hisat/hisat-0.1.5-beta-goolf-1.7.20.eb
@@ -19,7 +19,7 @@ source_urls = ['http://ccb.jhu.edu/software/hisat/downloads/']
 
 checksums = ['9524a0170d85c5b560b51e0087f4cf46']
 
-executables = [name, 'hisat-build', 'hisat-inspect', 'hisat-build-s', 'hisat-inspect-s', 'hisat-align-s', 
+executables = [name, 'hisat-build', 'hisat-inspect', 'hisat-build-s', 'hisat-inspect-s', 'hisat-align-s',
                'hisat-build-l', 'hisat-inspect-l', 'hisat-align-l']
 files_to_copy = [(executables, 'bin')]
 
diff --git a/easybuild/easyconfigs/h/hub/hub-2.2.2-linux-amd64.eb b/easybuild/easyconfigs/h/hub/hub-2.2.2-linux-amd64.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b96b5278710421da4042862bedae243e2248eef6
--- /dev/null
+++ b/easybuild/easyconfigs/h/hub/hub-2.2.2-linux-amd64.eb
@@ -0,0 +1,22 @@
+easyblock = 'PackedBinary'
+
+name = 'hub'
+version = '2.2.2'
+versionsuffix = '-linux-amd64'
+
+homepage = 'https://hub.github.com/'
+description = """hub is a command-line wrapper for git that makes you better at GitHub."""
+
+source_urls = ['https://github.com/github/hub/releases/download/v%(version)s/']
+sources = ['%(namelower)s%(versionsuffix)s-%(version)s.tgz']
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+postinstallcmds = ['chmod -x %(installdir)s/install']
+
+sanity_check_paths = {
+    'files': ['bin/hub'],
+    'dirs': []
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.10.0-GCC-4.9.2.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.10.0-GCC-4.9.2.eb
index f86d5d11abd0a82d2b52d52b4dc0f689ca1240cb..24816732939841a25717f291461d908009b267ac 100644
--- a/easybuild/easyconfigs/h/hwloc/hwloc-1.10.0-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.10.0-GCC-4.9.2.eb
@@ -16,7 +16,7 @@ toolchain = {'name': 'GCC', 'version': '4.9.2'}
 dependencies = [('numactl', '2.0.10')]
 
 configopts = "--enable-libnuma=$EBROOTNUMACTL"
-  
+
 source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
 sources = [SOURCE_TAR_GZ]
 
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.10.1-GCC-4.8.4.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.10.1-GCC-4.8.4.eb
index 6adedf3a5dd1de5e83439e455ff3ce5499a0dd71..ec2211254799f3c3ff9697e1afa4b19c4b49be7f 100644
--- a/easybuild/easyconfigs/h/hwloc/hwloc-1.10.1-GCC-4.8.4.eb
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.10.1-GCC-4.8.4.eb
@@ -19,5 +19,5 @@ sources = [SOURCE_TAR_GZ]
 dependencies = [('numactl', '2.0.10')]
 
 configopts = "--enable-libnuma=$EBROOTNUMACTL"
-  
+
 moduleclass = 'system'
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.10.1-GNU-4.9.2-2.25.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.10.1-GNU-4.9.2-2.25.eb
index 33b2aeafd6639d9f349403cd6d394393a9c0af3c..afa499ff97a0b05160efb746cd9ab31687e508cc 100644
--- a/easybuild/easyconfigs/h/hwloc/hwloc-1.10.1-GNU-4.9.2-2.25.eb
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.10.1-GNU-4.9.2-2.25.eb
@@ -16,7 +16,7 @@ toolchain = {'name': 'GNU', 'version': '4.9.2-2.25'}
 dependencies = [('numactl', '2.0.10')]
 
 configopts = "--enable-libnuma=$EBROOTNUMACTL"
-  
+
 source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
 sources = [SOURCE_TAR_GZ]
 
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.11.0-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.0-GNU-4.9.3-2.25.eb
index 086602c3aaf50781106cfef41fc7f86d4fbcfcea..5b67b5f49085a0f77cfbc12d44152c1806d61ff4 100644
--- a/easybuild/easyconfigs/h/hwloc/hwloc-1.11.0-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.0-GNU-4.9.3-2.25.eb
@@ -16,7 +16,7 @@ toolchain = {'name': 'GNU', 'version': '4.9.3-2.25'}
 dependencies = [('numactl', '2.0.10')]
 
 configopts = "--enable-libnuma=$EBROOTNUMACTL"
-  
+
 source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
 sources = [SOURCE_TAR_GZ]
 
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.11.1-iccifort-2015.3.187-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.1-iccifort-2015.3.187-GNU-4.9.3-2.25.eb
index e2d5ab4c7f9859b2bdc839e5156479b9e157c53b..50bcad92f396814072303d122c19f40ac85fc7c6 100644
--- a/easybuild/easyconfigs/h/hwloc/hwloc-1.11.1-iccifort-2015.3.187-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.1-iccifort-2015.3.187-GNU-4.9.3-2.25.eb
@@ -16,7 +16,7 @@ toolchain = {'name': 'iccifort', 'version': '2015.3.187-GNU-4.9.3-2.25'}
 dependencies = [('numactl', '2.0.10')]
 
 configopts = "--enable-libnuma=$EBROOTNUMACTL"
-  
+
 source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
 sources = [SOURCE_TAR_GZ]
 
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.11.2-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.2-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..dd384c19f8882c8b8ab8b2369a62e43a3744abb4
--- /dev/null
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.2-GCC-4.9.3-2.25.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'hwloc'
+version = '1.11.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': 'GCC', 'version': '4.9.3-2.25'}
+  
+source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('numactl', '2.0.11')]
+
+configopts = "--enable-libnuma=$EBROOTNUMACTL"
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.11.2-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.2-GNU-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..41a09546a092fc36e6e1e097cba4708962f552b9
--- /dev/null
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.2-GNU-4.9.3-2.25.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'hwloc'
+version = '1.11.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': 'GNU', 'version': '4.9.3-2.25'}
+
+dependencies = [('numactl', '2.0.10')]
+
+configopts = "--enable-libnuma=$EBROOTNUMACTL"
+
+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-ClangGCC-1.1.3.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-ClangGCC-1.1.3.eb
index 21df4831304fd179be5b7874aa2a1f83f618f92b..3e12868a7814648a03355bd311f3501b6b114f38 100644
--- a/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-ClangGCC-1.1.3.eb
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-ClangGCC-1.1.3.eb
@@ -12,7 +12,7 @@ description = """The Portable Hardware Locality (hwloc) software package provide
  information about modern computing hardware so as to exploit it accordingly and efficiently."""
 
 toolchain = {'name': 'ClangGCC', 'version': '1.1.3'}
-  
+
 source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
 sources = [SOURCE_TAR_GZ]
 
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-GCC-4.6.4.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-GCC-4.6.4.eb
index 3c07bbe6148ecc49ba35e2788c09e9ed7d10dc31..ca74b09ce12d502346c92e5368f401074a62fa12 100644
--- a/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-GCC-4.6.4.eb
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-GCC-4.6.4.eb
@@ -12,7 +12,7 @@ description = """The Portable Hardware Locality (hwloc) software package provide
  information about modern computing hardware so as to exploit it accordingly and efficiently."""
 
 toolchain = {'name': 'GCC', 'version': '4.6.4'}
-  
+
 source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
 sources = [SOURCE_TAR_GZ]
 
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-GCC-4.7.2.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-GCC-4.7.2.eb
index 19d34c3d1a3869cf8c17db553dc21e4a7c8bc9a4..58f69d8db5b1ae2e4341379d468a4b91c68dcb1c 100644
--- a/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-GCC-4.7.2.eb
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-GCC-4.7.2.eb
@@ -12,7 +12,7 @@ description = """The Portable Hardware Locality (hwloc) software package provide
  information about modern computing hardware so as to exploit it accordingly and efficiently."""
 
 toolchain = {'name': 'GCC', 'version': '4.7.2'}
-  
+
 source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
 sources = [SOURCE_TAR_GZ]
 
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
index 35e5b4d3bc88cdbafb5d6223c9b63344d7240446..4a1f0300da7427caf218ed1a3c49fe8edb138f53 100644
--- 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
@@ -12,7 +12,7 @@ description = """The Portable Hardware Locality (hwloc) software package provide
  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]
 
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.7.2-GCC-4.8.2.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.7.2-GCC-4.8.2.eb
index ade75969bd51fa1e6a6039caf37957578f519de3..13051e6d8152e4a0c9d7cf63a9124dcef4273940 100644
--- a/easybuild/easyconfigs/h/hwloc/hwloc-1.7.2-GCC-4.8.2.eb
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.7.2-GCC-4.8.2.eb
@@ -12,7 +12,7 @@ description = """The Portable Hardware Locality (hwloc) software package provide
  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]
 
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
index bbe1c894d7b4aa84facd9222337e531ebc597639..459fa88c69ebf6df9e527e59eeb48426b93023b2 100644
--- 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
@@ -12,7 +12,7 @@ description = """The Portable Hardware Locality (hwloc) software package provide
  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]
 
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
index b8de1f4777b877e6637eac355f27c7f73a51ef6f..b61501e14182cb4fde080f4fcc582559deff11f2 100644
--- 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
@@ -12,7 +12,7 @@ description = """The Portable Hardware Locality (hwloc) software package provide
  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]
 
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
index cb11169e9229014039a5b17c66639748b09857b6..ea7fbe41ddd44b144df98802edc9d7412fc20aad 100644
--- 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
@@ -12,7 +12,7 @@ description = """The Portable Hardware Locality (hwloc) software package provide
  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]
 
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.8.1-GCC-4.8.3.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.8.1-GCC-4.8.3.eb
index dd1343eaa7596f44e5cf116b3a560cd150b61b9f..82f551b2472717ba7ffe776a20974c3991f5b598 100644
--- a/easybuild/easyconfigs/h/hwloc/hwloc-1.8.1-GCC-4.8.3.eb
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.8.1-GCC-4.8.3.eb
@@ -12,7 +12,7 @@ description = """The Portable Hardware Locality (hwloc) software package provide
  information about modern computing hardware so as to exploit it accordingly and efficiently."""
 
 toolchain = {'name': 'GCC', 'version': '4.8.3'}
-  
+
 source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
 sources = [SOURCE_TAR_GZ]
 
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.9-GCC-4.8.3.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.9-GCC-4.8.3.eb
index c21425bb3c717135c77ff674e13477b6df7c821e..5353d4e58c45e74817f63e5a488a3e1496908f3e 100644
--- a/easybuild/easyconfigs/h/hwloc/hwloc-1.9-GCC-4.8.3.eb
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.9-GCC-4.8.3.eb
@@ -16,7 +16,7 @@ toolchain = {'name': 'GCC', 'version': '4.8.3'}
 dependencies = [('numactl', '2.0.9')]
 
 configopts = "--enable-libnuma=$EBROOTNUMACTL"
-  
+
 source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
 sources = [SOURCE_TAR_GZ]
 
diff --git a/easybuild/easyconfigs/i/IDBA-UD/IDBA-UD-1.1.1-goolf-1.4.10.eb b/easybuild/easyconfigs/i/IDBA-UD/IDBA-UD-1.1.1-goolf-1.4.10.eb
index 0ee4a4f74034fad3f36869481aeeec6c9b721695..776e9a78462c7021f6184ef769ac43e900904c50 100644
--- a/easybuild/easyconfigs/i/IDBA-UD/IDBA-UD-1.1.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/i/IDBA-UD/IDBA-UD-1.1.1-goolf-1.4.10.eb
@@ -8,7 +8,7 @@
 easyblock = 'MakeCp'
 
 name = 'IDBA-UD'
-version = '1.1.1' 
+version = '1.1.1'
 
 homepage = 'http://i.cs.hku.hk/~alse/hkubrg/projects/idba_ud/'
 description = """ IDBA-UD is a iterative De Bruijn Graph De Novo Assembler for Short Reads 
@@ -31,7 +31,7 @@ prebuildopts = './configure && '
 buildopts = ' && rm -fr bin/*.o && rm -fr bin/Makefile*'
 
 files_to_copy = ["bin", "script", "README", "ChangeLog", "NEWS"]
-        
+
 sanity_check_paths = {
     'files': ["bin/%s" % x for x in ["idba", "idba_hybrid", "idba_tran",
                                     "idba_ud", "parallel_blat", "idba_tran_test"]],
diff --git a/easybuild/easyconfigs/i/IMPUTE2/IMPUTE2-2.3.2_x86_64_dynamic.eb b/easybuild/easyconfigs/i/IMPUTE2/IMPUTE2-2.3.2_x86_64_dynamic.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4a7086b810d79990f1551423c09324397d3983a6
--- /dev/null
+++ b/easybuild/easyconfigs/i/IMPUTE2/IMPUTE2-2.3.2_x86_64_dynamic.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 = "Tarball"
+
+name = 'IMPUTE2'
+version = '2.3.2'
+versionsuffix = '_x86_64_dynamic'
+
+homepage = 'http://mathgen.stats.ox.ac.uk/impute/impute_v2.html'
+description = """  IMPUTE version 2 (also known as IMPUTE2) is a genotype imputation 
+ and haplotype phasing program based on ideas from Howie et al. 2009 """
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+source_urls = ['https://mathgen.stats.ox.ac.uk/impute/']
+sources = ['%s_v%%(version)s%%(versionsuffix)s.tgz' % name.lower()[:-1]]
+
+sanity_check_paths = {
+    'files': ["impute2"],
+    'dirs': ["Example"]
+}
+
+# add the top dir to PATH
+modextrapaths = {
+    'PATH': ''
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/i/IMPUTE2/IMPUTE2-2.3.2_x86_64_static.eb b/easybuild/easyconfigs/i/IMPUTE2/IMPUTE2-2.3.2_x86_64_static.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2f68d383ff68d065fbad7b90c9dd4e4e41dab133
--- /dev/null
+++ b/easybuild/easyconfigs/i/IMPUTE2/IMPUTE2-2.3.2_x86_64_static.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 = "Tarball"
+
+name = 'IMPUTE2'
+version = '2.3.2'
+versionsuffix = '_x86_64_static'
+
+homepage = 'http://mathgen.stats.ox.ac.uk/impute/impute_v2.html'
+description = """  IMPUTE version 2 (also known as IMPUTE2) is a genotype imputation 
+ and haplotype phasing program based on ideas from Howie et al. 2009 """
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+source_urls = ['https://mathgen.stats.ox.ac.uk/impute/']
+sources = ['%s_v%%(version)s%%(versionsuffix)s.tgz' % name.lower()[:-1]]
+
+sanity_check_paths = {
+    'files': ["impute2"],
+    'dirs': ["Example"]
+}
+
+# add the top dir to PATH
+modextrapaths = {
+    'PATH': ''
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/i/IOR/IOR-2.10.3-goolf-1.4.10-mpiio.eb b/easybuild/easyconfigs/i/IOR/IOR-2.10.3-goolf-1.4.10-mpiio.eb
index 2aebd3c1b6e14103d7d31c650df4c1d3274e13a8..2f880e46891f84baad303a5866ba983a28805941 100644
--- a/easybuild/easyconfigs/i/IOR/IOR-2.10.3-goolf-1.4.10-mpiio.eb
+++ b/easybuild/easyconfigs/i/IOR/IOR-2.10.3-goolf-1.4.10-mpiio.eb
@@ -25,7 +25,7 @@ sources = [SOURCE_TGZ]
 # gmake all        -- IOR with POSIX, MPIIO, HDF5, and NCMPI interfaces
 buildopts = ' mpiio'
 
-files_to_copy = [(['src/C/IOR'], 'bin'), 
+files_to_copy = [(['src/C/IOR'], 'bin'),
                 "README", "RELEASE_LOG", "UNDOCUMENTED_OPTIONS", "USER_GUIDE", "scripts", "testing"]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/i/IOR/IOR-2.10.3-intel-2014b-mpiio.eb b/easybuild/easyconfigs/i/IOR/IOR-2.10.3-intel-2014b-mpiio.eb
index 50f1a0bd7d86b32ff54d47b359de794b1b9235d6..ac67b88a09292e8d3b9b37cb175f22727986bad4 100644
--- a/easybuild/easyconfigs/i/IOR/IOR-2.10.3-intel-2014b-mpiio.eb
+++ b/easybuild/easyconfigs/i/IOR/IOR-2.10.3-intel-2014b-mpiio.eb
@@ -25,7 +25,7 @@ sources = [SOURCE_TGZ]
 # gmake all        -- IOR with POSIX, MPIIO, HDF5, and NCMPI interfaces
 buildopts = ' mpiio'
 
-files_to_copy = [(['src/C/IOR'], 'bin'), 
+files_to_copy = [(['src/C/IOR'], 'bin'),
                 "README", "RELEASE_LOG", "UNDOCUMENTED_OPTIONS", "USER_GUIDE", "scripts", "testing"]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/i/IPython/IPython-3.2.3-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/i/IPython/IPython-3.2.3-intel-2015b-Python-2.7.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fd3e839da8d3eb686b8b3de324ca76daf1b04802
--- /dev/null
+++ b/easybuild/easyconfigs/i/IPython/IPython-3.2.3-intel-2015b-Python-2.7.10.eb
@@ -0,0 +1,90 @@
+easyblock = 'Bundle'
+
+name = 'IPython'
+version = '3.2.3'
+
+homepage = 'http://ipython.org/index.html'
+description = """IPython provides a rich architecture for interactive computing with:
+ Powerful interactive shells (terminal and Qt-based).
+ A browser-based notebook with support for code, text, mathematical expressions, inline plots and other rich media.
+ Support for interactive data visualization and use of GUI toolkits.
+ Flexible, embeddable interpreters to load into your own projects.
+ Easy to use, high performance tools for parallel computing."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+python = 'Python'
+pyver = '2.7.10'
+pyshortver = '.'.join(pyver.split('.')[:2])
+versionsuffix = '-%s-%s' % (python, pyver)
+
+dependencies = [
+    (python, pyver),
+    ('PyZMQ', '15.1.0', '%s-zmq4' % versionsuffix),
+]
+
+# this is a bundle of Python packages
+exts_defaultclass = 'PythonPackage'
+exts_filter = ("python -c 'import %(ext_name)s'", '')
+
+exts_list = [
+    ('pysqlite', '2.8.1', {
+        'modulename': 'pysqlite2',
+        'source_urls': ['https://pypi.python.org/packages/source/p/pysqlite/'],
+    }),
+    ('requests', '2.9.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/r/requests/'],
+    }),
+    ('Pygments', '2.0.2', {
+        'source_urls': ['https://pypi.python.org/packages/source/P/Pygments/'],
+    }),
+    ('singledispatch', '3.4.0.3', {
+        'source_urls': ['https://pypi.python.org/packages/source/s/singledispatch/'],
+    }),
+    ('backports.ssl_match_hostname', '3.5.0.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/b/backports.ssl_match_hostname/'],
+    }),
+    ('certifi', '2015.11.20.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/c/certifi/'],
+    }),
+    ('backports_abc', '0.4', {
+        'source_urls': ['https://pypi.python.org/packages/source/b/backports_abc/'],
+    }),
+    ('tornado', '4.3', {
+        'source_urls': ['https://pypi.python.org/packages/source/t/tornado/'],
+    }),
+    ('Jinja2', '2.8', {
+        'source_urls': ['https://pypi.python.org/packages/source/J/Jinja2/'],
+    }),
+    ('jsonschema', '2.5.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/j/jsonschema/'],
+    }),
+    ('mistune', '0.7.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/m/mistune/'],
+    }),
+    ('ptyprocess', '0.5', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/ptyprocess/'],
+    }),
+    ('terminado', '0.6', {
+        'source_urls': ['https://pypi.python.org/packages/source/t/terminado/'],
+    }),
+    ('ipython', version, {
+        'source_urls': ['https://pypi.python.org/packages/source/i/ipython/'],
+        'modulename': 'IPython',
+    }),
+]
+
+modextrapaths = {'PYTHONPATH': ['lib/python%s/site-packages' % pyshortver]}
+
+sanity_check_paths = {
+    'files': ['bin/ipython'],
+    'dirs': ['lib/python%s/site-packages/IPython' % pyshortver],
+}
+
+sanity_check_commands = [
+    ('ipython -h', ''),
+    ('ipython notebook --help', ''),
+    ('iptest', ''),
+]
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/i/ISL/ISL-0.14-GCC-4.9.2.eb b/easybuild/easyconfigs/i/ISL/ISL-0.14-GCC-4.9.2.eb
index f6423e5d6eb43d9926048ed3846f1c38e871353e..a303238f9baa35fbc99998108c12930223c78d20 100644
--- a/easybuild/easyconfigs/i/ISL/ISL-0.14-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/i/ISL/ISL-0.14-GCC-4.9.2.eb
@@ -14,7 +14,7 @@ sources = [SOURCELOWER_TAR_BZ2]
 dependencies = [('GMP', '6.0.0a')]
 
 sanity_check_paths = {
-    'files': ['lib/libisl.so', 'lib/libisl.a'],
+    'files': ['lib/libisl.%s' % SHLIB_EXT, 'lib/libisl.a'],
     'dirs': ['include/isl']
 }
 
diff --git a/easybuild/easyconfigs/i/ISL/ISL-0.15-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/i/ISL/ISL-0.15-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e711a7699f943604f90fb879c2b6bee8ce487fb6
--- /dev/null
+++ b/easybuild/easyconfigs/i/ISL/ISL-0.15-GCC-4.9.3-2.25.eb
@@ -0,0 +1,21 @@
+easyblock = 'ConfigureMake'
+
+name = 'ISL'
+version = '0.15'
+
+homepage = 'http://isl.gforge.inria.fr/'
+description = """isl is a library for manipulating sets and relations of integer points bounded by linear constraints."""
+
+toolchain = {'name': 'GCC', 'version': '4.9.3-2.25'}
+
+source_urls = ['http://isl.gforge.inria.fr/']
+sources = [SOURCELOWER_TAR_BZ2]
+
+dependencies = [('GMP', '6.1.0')]
+
+sanity_check_paths = {
+    'files': ['lib/libisl.%s' % SHLIB_EXT, 'lib/libisl.a'],
+    'dirs': ['include/isl']
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/i/ISL/ISL-0.15-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/i/ISL/ISL-0.15-GNU-4.9.3-2.25.eb
index d4fff8d35c421405a762cf15c30cdfaace024811..5ae9fcabbc1acb996a8a8a62bfbe85039c8e214a 100644
--- a/easybuild/easyconfigs/i/ISL/ISL-0.15-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/i/ISL/ISL-0.15-GNU-4.9.3-2.25.eb
@@ -14,7 +14,7 @@ sources = [SOURCELOWER_TAR_BZ2]
 dependencies = [('GMP', '6.0.0a')]
 
 sanity_check_paths = {
-    'files': ['lib/libisl.so', 'lib/libisl.a'],
+    'files': ['lib/libisl.%s' % SHLIB_EXT, 'lib/libisl.a'],
     'dirs': ['include/isl']
 }
 
diff --git a/easybuild/easyconfigs/i/Instant/Instant-1.6.0-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/i/Instant/Instant-1.6.0-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..84082aadb44eb9d5e7b54734e43f2a84a9daa9ef
--- /dev/null
+++ b/easybuild/easyconfigs/i/Instant/Instant-1.6.0-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,36 @@
+easyblock = 'PythonPackage'
+
+name = 'Instant'
+version = '1.6.0'
+
+homepage = 'https://bitbucket.org/fenics-project/instant'
+description = """Instant is a Python module that allows for instant inlining of C and C++ code in Python.
+ It is a small Python module built on top of SWIG and Distutils."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = ['https://bitbucket.org/fenics-project/instant/downloads/']
+sources = [SOURCELOWER_TAR_GZ]
+
+pyver = '2.7.11'
+versionsuffix = '-Python-%s' % pyver
+
+dependencies = [
+    ('Python', pyver),
+    ('SWIG', '3.0.8', versionsuffix),
+    ('CMake', '3.4.1'),  # runtime dep!
+]
+
+# compiler-related variables *must* be set, since Instant does runtime compilation and remembers $CFLAGS/$CXXFLAGS
+modextravars = {
+    'CC': 'icc',
+    'CXX': 'icpc',
+}
+
+pyshortver = '.'.join(pyver.split('.')[:2])
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['bin', 'lib/python%s/site-packages' % pyshortver]
+}
+
+moduleclass = 'devel'
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
index 7dc3787320bc598d08a264e33b4b08762faf3e69..5f710302572515b9ff700697fed00fb8a2abd76e 100644
--- 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
@@ -20,7 +20,7 @@ sources = [
 ]
 source_urls = ['http://www.cs.ucr.edu/~jianxing']
 
-dependencies = [ 
+dependencies = [
     ('QuadProg++', '1.2.1'),
     ('GLPK', '4.53'),
     ('GSL', '1.16')
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
index 436dd9a680a2451f2d7f6ce26212a76346e6fe97..10342bedf08e9c840b57a8350355ce41e929627e 100644
--- 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
@@ -20,7 +20,7 @@ sources = [
 ]
 source_urls = ['http://www.cs.ucr.edu/~jianxing']
 
-dependencies = [ 
+dependencies = [
     ('QuadProg++', '1.2.1'),
     ('GLPK', '4.53'),
     ('GSL', '1.16')
diff --git a/easybuild/easyconfigs/i/ictce/ictce-4.0.6.eb b/easybuild/easyconfigs/i/ictce/ictce-4.0.6.eb
index 72df26b46c7617793222c179184769ae1946eaaa..77fb61dc74e09ef57ba0fc218f3e1238e68913bc 100644
--- a/easybuild/easyconfigs/i/ictce/ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/i/ictce/ictce-4.0.6.eb
@@ -9,7 +9,7 @@ description = """Intel Cluster Toolkit Compiler Edition provides Intel C/C++ and
 toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 compver = '2011.6.233'
-dependencies = [ 
+dependencies = [
     ('icc', compver),
     ('ifort', compver),
     ('impi', '4.0.2.003', '', ('iccifort', compver)),
diff --git a/easybuild/easyconfigs/i/iimpi/iimpi-4.0.6.eb b/easybuild/easyconfigs/i/iimpi/iimpi-4.0.6.eb
index ffa9bd38436d4745dbdef967a3befcb5553a62f0..51b3aa5c0ff843a35c7b386faab80f6f07797828 100644
--- a/easybuild/easyconfigs/i/iimpi/iimpi-4.0.6.eb
+++ b/easybuild/easyconfigs/i/iimpi/iimpi-4.0.6.eb
@@ -9,7 +9,7 @@ description = """Intel C/C++ and Fortran compilers, alongside Intel MPI."""
 toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 compver = '2011.6.233'
-dependencies = [ 
+dependencies = [
     ('icc', compver),
     ('ifort', compver),
     ('impi', '4.0.2.003', '', ('iccifort', compver)),
diff --git a/easybuild/easyconfigs/i/iimpi/iimpi-8.1.5-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/i/iimpi/iimpi-8.1.5-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..43b5e47c98624b655a14eb5d4ecee475b1c60e71
--- /dev/null
+++ b/easybuild/easyconfigs/i/iimpi/iimpi-8.1.5-GCC-4.9.3-2.25.eb
@@ -0,0 +1,19 @@
+easyblock = "Toolchain"
+
+name = 'iimpi'
+version = '8.1.5'
+versionsuffix = '-GCC-4.9.3-2.25'
+
+homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/'
+description = """Intel C/C++ and Fortran compilers, alongside Intel MPI."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+compver = '2016.1.150'
+dependencies = [
+    ('icc', compver, versionsuffix),
+    ('ifort', compver, versionsuffix),
+    ('impi', '5.1.2.150', '', ('iccifort', '%s%s' % (compver, versionsuffix))),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/i/imkl/imkl-11.2.1.133-ipsmpi-2014.12.eb b/easybuild/easyconfigs/i/imkl/imkl-11.2.1.133-ipsmpi-2014.12.eb
index a44565b87fc364da49b420300f5d42f4b198186b..58af7333725d64dd785894bbdb90c93f5ec86b0f 100644
--- a/easybuild/easyconfigs/i/imkl/imkl-11.2.1.133-ipsmpi-2014.12.eb
+++ b/easybuild/easyconfigs/i/imkl/imkl-11.2.1.133-ipsmpi-2014.12.eb
@@ -1,12 +1,12 @@
 name = 'imkl'
-version = "11.2.1.133" 
+version = "11.2.1.133"
 
 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': 'ipsmpi', 'version': '2014.12'} 
+toolchain = {'name': 'ipsmpi', 'version': '2014.12'}
 
 sources = ['l_mkl_%(version)s.tgz']
 
diff --git a/easybuild/easyconfigs/i/imkl/imkl-11.3.1.150-iimpi-8.1.5-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/i/imkl/imkl-11.3.1.150-iimpi-8.1.5-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..de96c38b1596997999c83be982936497ffc4abcf
--- /dev/null
+++ b/easybuild/easyconfigs/i/imkl/imkl-11.3.1.150-iimpi-8.1.5-GCC-4.9.3-2.25.eb
@@ -0,0 +1,22 @@
+name = 'imkl'
+version = '11.3.1.150'
+
+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': 'iimpi', 'version': '8.1.5-GCC-4.9.3-2.25'}
+
+sources = ['l_mkl_%(version)s.tgz']
+
+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-5.1.2.150-iccifort-2016.1.150-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/i/impi/impi-5.1.2.150-iccifort-2016.1.150-GCC-4.9.3-2.25.eb
index 73e4fbb0275023c75eae0ccb11ea76399fc033f8..da4a9937801dbeff8aa6dfdaa45c8dae4c7a19da 100644
--- a/easybuild/easyconfigs/i/impi/impi-5.1.2.150-iccifort-2016.1.150-GCC-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/i/impi/impi-5.1.2.150-iccifort-2016.1.150-GCC-4.9.3-2.25.eb
@@ -19,6 +19,9 @@ dontcreateinstalldir = 'True'
 import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
 
+# set up all the mpi commands to default to intel compilers
+# set_mpi_wrappers_all = 'True'
+
 moduleclass = 'mpi'
 
 postinstallcmds = [
diff --git a/easybuild/easyconfigs/i/intel/intel-2016a.eb b/easybuild/easyconfigs/i/intel/intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c858c20f5337f66f7869cbd5b86943700d454df2
--- /dev/null
+++ b/easybuild/easyconfigs/i/intel/intel-2016a.eb
@@ -0,0 +1,21 @@
+easyblock = 'Toolchain'
+
+name = 'intel'
+version = '2016a'
+
+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'}
+
+compver = '2016.1.150'
+gccsuff = '-GCC-4.9.3-2.25'
+
+dependencies = [
+    ('icc', compver, gccsuff),
+    ('ifort', compver, gccsuff),
+    ('impi', '5.1.2.150', '', ('iccifort', '%s%s' % (compver, gccsuff))),
+    ('imkl', '11.3.1.150', '', ('iimpi', '8.1.5%s' % gccsuff)),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/i/ispc/ispc-1.6.0.eb b/easybuild/easyconfigs/i/ispc/ispc-1.6.0.eb
index 5f9a44b8c20215b44e09a24f5c7d5313391da265..0e49c82636cdaebede9fc57366267411ffc97116 100644
--- a/easybuild/easyconfigs/i/ispc/ispc-1.6.0.eb
+++ b/easybuild/easyconfigs/i/ispc/ispc-1.6.0.eb
@@ -17,7 +17,7 @@ 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"], 
+    'files': ["ispc"],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/j/JAGS/JAGS-3.4.0-goolf-1.4.10.eb b/easybuild/easyconfigs/j/JAGS/JAGS-3.4.0-goolf-1.4.10.eb
index f0fdf4369d997e32351d4995530249abc529fdd0..c85a8270b1f7f711be6c2a390e744b8bd1454ef3 100644
--- a/easybuild/easyconfigs/j/JAGS/JAGS-3.4.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/j/JAGS/JAGS-3.4.0-goolf-1.4.10.eb
@@ -20,7 +20,7 @@ sources = [SOURCE_TAR_GZ]
 configopts = ' --with-blas="-lopenblas" --with-lapack="-llapack" '
 
 sanity_check_paths = {
-    'files': ["bin/jags", "libexec/jags-terminal", "lib/libjags.so"],
+    'files': ["bin/jags", "libexec/jags-terminal", "lib/libjags.%s" % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/j/JAGS/JAGS-3.4.0-ictce-6.2.5.eb b/easybuild/easyconfigs/j/JAGS/JAGS-3.4.0-ictce-6.2.5.eb
index 9b984fa0fd1b1a1dcc2cf5e717aa663035ea8379..4b9b0d8456a3109dac09dc0749673d4b6d3301b6 100644
--- a/easybuild/easyconfigs/j/JAGS/JAGS-3.4.0-ictce-6.2.5.eb
+++ b/easybuild/easyconfigs/j/JAGS/JAGS-3.4.0-ictce-6.2.5.eb
@@ -20,7 +20,7 @@ sources = [SOURCE_TAR_GZ]
 configopts = ' --with-blas="-lmkl" --with-lapack="-lmkl" '
 
 sanity_check_paths = {
-    'files': ["bin/jags", "libexec/jags-terminal", "lib/libjags.so"],
+    'files': ["bin/jags", "libexec/jags-terminal", "lib/libjags.%s" % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/j/JAGS/JAGS-3.4.0-intel-2014b.eb b/easybuild/easyconfigs/j/JAGS/JAGS-3.4.0-intel-2014b.eb
index a19a5f06c5a0269ab40104e8fcaa55dfbc94662a..e57e27043b8f52e539d36f3a0bf8ef0052411f84 100644
--- a/easybuild/easyconfigs/j/JAGS/JAGS-3.4.0-intel-2014b.eb
+++ b/easybuild/easyconfigs/j/JAGS/JAGS-3.4.0-intel-2014b.eb
@@ -20,7 +20,7 @@ sources = [SOURCE_TAR_GZ]
 configopts = ' --with-blas="-lmkl" --with-lapack="-lmkl" '
 
 sanity_check_paths = {
-    'files': ["bin/jags", "libexec/jags-terminal", "lib/libjags.so"],
+    'files': ["bin/jags", "libexec/jags-terminal", "lib/libjags.%s" % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/j/JUnit/JUnit-4.12-Java-1.8.0_66.eb b/easybuild/easyconfigs/j/JUnit/JUnit-4.12-Java-1.8.0_66.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5ad39de4e08ad0bedad45beee7507fe9af698ccf
--- /dev/null
+++ b/easybuild/easyconfigs/j/JUnit/JUnit-4.12-Java-1.8.0_66.eb
@@ -0,0 +1,25 @@
+easyblock = 'JAR'
+
+name = 'JUnit'
+version = '4.12'
+
+homepage = 'http://sourceforge.net/projects/junit'
+description = """A programmer-oriented testing framework for Java."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = ['%(namelower)s-%(version)s.jar']
+source_urls = ['http://search.maven.org/remotecontent?filepath=junit/junit/%(version)s/']
+
+java = 'Java'
+javaver = '1.8.0_66'
+versionsuffix = '-%s-%s' % (java, javaver)
+
+dependencies = [(java, javaver)]
+
+sanity_check_paths = {
+    'files': sources,
+    'dirs': [],
+}
+
+moduleclass = 'devel'
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
index d889b3d0b2cfe510b836ecf74b145984749e0bad..949fa049839f1fa4544ce14085451293ae86c09e 100644
--- 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
@@ -13,7 +13,7 @@ description = """Jansson is a C library for encoding, decoding and manipulating
  * 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']
diff --git a/easybuild/easyconfigs/j/Jansson/Jansson-2.6-GCC-4.8.3.eb b/easybuild/easyconfigs/j/Jansson/Jansson-2.6-GCC-4.8.3.eb
index 0803b327c8a29a3e70bd02f80eab3d6037a97aa0..6da2045abd99ed7c0c227886d2f9c0e8222de5fa 100644
--- a/easybuild/easyconfigs/j/Jansson/Jansson-2.6-GCC-4.8.3.eb
+++ b/easybuild/easyconfigs/j/Jansson/Jansson-2.6-GCC-4.8.3.eb
@@ -13,7 +13,7 @@ description = """Jansson is a C library for encoding, decoding and manipulating
  * Extensive test suite"""
 
 toolchain = {'name': 'GCC', 'version': '4.8.3'}
-  
+
 # fi. https://github.com/akheron/jansson/archive/2.5.zip
 source_urls = ['https://github.com/akheron/jansson/archive/']
 sources = ['%(version)s.tar.gz']
diff --git a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-goolf-1.5.14.eb b/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-goolf-1.5.14.eb
index e398d414f130934f827046cc1f3801dc86df059e..8d3aa6f5feb82fd109aac7d0a0bc8ab035ac82d6 100644
--- a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-goolf-1.5.14.eb
@@ -6,7 +6,7 @@ version = '1.900.1'
 homepage = 'http://www.ece.uvic.ca/~frodo/jasper/'
 description = "gzip (GNU zip) is a popular data compression program as a replacement for compress"
 
-toolchain = {'name': 'goolf', 'version': '1.5.14'} 
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
 toolchainopts = {'pic': True}
 
 sources = [SOURCELOWER_ZIP]
diff --git a/easybuild/easyconfigs/j/Jellyfish/Jellyfish-2.2.4-foss-2015b.eb b/easybuild/easyconfigs/j/Jellyfish/Jellyfish-2.2.4-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ff49f091da98425a8b32389beb028f8a42dacf73
--- /dev/null
+++ b/easybuild/easyconfigs/j/Jellyfish/Jellyfish-2.2.4-foss-2015b.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 = 'ConfigureMake'
+
+name = 'Jellyfish'
+version = '2.2.4'
+
+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': 'foss', 'version': '2015b'}
+
+source_urls = ['https://github.com/gmarcais/Jellyfish/releases/download/v%(version)s']
+sources = [SOURCELOWER_TAR_GZ]
+
+parallel = 1
+
+# The tests for the Bloom filter are statistical tests and can randomly fail, they actually don't make a lot of sense
+runtest = "check GTEST_FILTER=-'*Bloom*'"
+
+postinstallcmds = ["cp config.h %(installdir)s/include/%(namelower)s-%(version)s/%(namelower)s/"]
+
+sanity_check_paths = {
+    'files': ['bin/jellyfish'],
+    'dirs': []
+}
+
+modextrapaths = {'CPATH': 'include/%(namelower)s-%(version)s'}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/j/jemalloc/jemalloc-3.6.0-foss-2015a.eb b/easybuild/easyconfigs/j/jemalloc/jemalloc-3.6.0-foss-2015a.eb
index b9fa5705295ca629a151410b07ea096ff684d318..9511dfc3743ad074124f0c056afd30689a40ec01 100644
--- a/easybuild/easyconfigs/j/jemalloc/jemalloc-3.6.0-foss-2015a.eb
+++ b/easybuild/easyconfigs/j/jemalloc/jemalloc-3.6.0-foss-2015a.eb
@@ -13,7 +13,7 @@ source_urls = ['http://www.canonware.com/download/jemalloc/']
 sources = [SOURCE_TAR_BZ2]
 
 sanity_check_paths = {
-    'files': ['bin/pprof', 'lib/libjemalloc.a', 'lib/libjemalloc_pic.a', 'lib/libjemalloc.so',
+    'files': ['bin/pprof', 'lib/libjemalloc.a', 'lib/libjemalloc_pic.a', 'lib/libjemalloc.%s' % SHLIB_EXT,
               'lib/libjemalloc.so.1', 'include/jemalloc/jemalloc.h'],
     'dirs': ['share'],
 }
diff --git a/easybuild/easyconfigs/j/jemalloc/jemalloc-3.6.0-intel-2015a.eb b/easybuild/easyconfigs/j/jemalloc/jemalloc-3.6.0-intel-2015a.eb
index f80ef5fcba3caea9613b4208213b6b216028e36f..f5af407ce7abe53e4a450e9eb72ea8a375fec62b 100644
--- a/easybuild/easyconfigs/j/jemalloc/jemalloc-3.6.0-intel-2015a.eb
+++ b/easybuild/easyconfigs/j/jemalloc/jemalloc-3.6.0-intel-2015a.eb
@@ -13,7 +13,7 @@ source_urls = ['http://www.canonware.com/download/jemalloc/']
 sources = [SOURCE_TAR_BZ2]
 
 sanity_check_paths = {
-    'files': ['bin/pprof', 'lib/libjemalloc.a', 'lib/libjemalloc_pic.a', 'lib/libjemalloc.so',
+    'files': ['bin/pprof', 'lib/libjemalloc.a', 'lib/libjemalloc_pic.a', 'lib/libjemalloc.%s' % SHLIB_EXT,
               'lib/libjemalloc.so.1', 'include/jemalloc/jemalloc.h'],
     'dirs': ['share'],
 }
diff --git a/easybuild/easyconfigs/k/Kerberos_V5/Kerberos_V5-1.12.2-intel-2014b.eb b/easybuild/easyconfigs/k/Kerberos_V5/Kerberos_V5-1.12.2-intel-2014b.eb
index 9315d81b5a2e47d426503496ddc88cafd7d49900..d8151b8cd781b7eacf980a512b96de239ab42b12 100644
--- a/easybuild/easyconfigs/k/Kerberos_V5/Kerberos_V5-1.12.2-intel-2014b.eb
+++ b/easybuild/easyconfigs/k/Kerberos_V5/Kerberos_V5-1.12.2-intel-2014b.eb
@@ -24,8 +24,8 @@ preconfigopts = "tar xvf krb5-%(version)s.tar.gz && " + prebuildopts
 sanity_check_paths = {
     'files': ['bin/krb5-config', 'bin/gss-client', 'bin/kadmin',
               'sbin/kdb5_util', 'sbin/gss-server', 'sbin/kadmind',
-              'lib/libkrb5.so', 'lib/libgssapi_krb5.so', 'lib/libkadm5clnt.so',
-              'lib/libkadm5srv.so', 'lib/libkdb5.so', 'lib/libk5crypto.so',
+              'lib/libkrb5.%s' % SHLIB_EXT, 'lib/libgssapi_krb5.%s' % SHLIB_EXT, 'lib/libkadm5clnt.%s' % SHLIB_EXT,
+              'lib/libkadm5srv.%s' % SHLIB_EXT, 'lib/libkdb5.%s' % SHLIB_EXT, 'lib/libk5crypto.%s' % SHLIB_EXT,
              ],
     'dirs': ['lib/krb5']
 }
diff --git a/easybuild/easyconfigs/l/LLVM/LLVM-3.6.2-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/l/LLVM/LLVM-3.6.2-intel-2015a-Python-2.7.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..dcb8e49ef1969ec0972bf3f651ffaab42278332f
--- /dev/null
+++ b/easybuild/easyconfigs/l/LLVM/LLVM-3.6.2-intel-2015a-Python-2.7.9.eb
@@ -0,0 +1,38 @@
+easyblock = 'CMakeMake'
+
+name = 'LLVM'
+version = '3.6.2'
+python = 'Python'
+pyver = '2.7.9'
+versionsuffix = '-%s-%s' % (python, pyver)
+
+homepage = "http://llvm.org/"
+description = """The LLVM Core libraries provide a modern source- and target-independent
+ optimizer, along with code generation support for many popular CPUs
+ (as well as some less common ones!) These libraries are built around a well
+ specified code representation known as the LLVM intermediate representation
+ ("LLVM IR"). The LLVM Core libraries are well documented, and it is
+ particularly easy to invent your own language (or port an existing compiler)
+ to use LLVM as an optimizer and code generator."""
+
+toolchain = {'name': 'intel', 'version': '2015a'}
+toolchainopts = {'cstd': 'gnu++11'}
+
+source_urls = ["http://llvm.org/releases/%(version)s"]
+sources = ["llvm-%(version)s.src.tar.xz"]
+
+builddependencies = [
+    ('CMake', '3.2.3'),
+    (python, pyver),
+]
+
+configopts = '-DBUILD_SHARED_LIBS=ON '
+
+sanity_check_paths = {
+    'files' : ['bin/llvm-ar'],
+    'dirs' : ['include/llvm', 'include/llvm-c'],
+}
+
+separate_build_dir = True
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/l/LLVM/LLVM-3.6.2-intel-2015b.eb b/easybuild/easyconfigs/l/LLVM/LLVM-3.6.2-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ae23f4c83c569087505aa45c2f502dbb273ab3e3
--- /dev/null
+++ b/easybuild/easyconfigs/l/LLVM/LLVM-3.6.2-intel-2015b.eb
@@ -0,0 +1,35 @@
+easyblock = 'CMakeMake'
+
+name = 'LLVM'
+version = '3.6.2'
+
+homepage = "http://llvm.org/"
+description = """The LLVM Core libraries provide a modern source- and target-independent
+ optimizer, along with code generation support for many popular CPUs
+ (as well as some less common ones!) These libraries are built around a well
+ specified code representation known as the LLVM intermediate representation
+ ("LLVM IR"). The LLVM Core libraries are well documented, and it is
+ particularly easy to invent your own language (or port an existing compiler)
+ to use LLVM as an optimizer and code generator."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'cstd': 'gnu++11'}
+
+source_urls = ["http://llvm.org/releases/%(version)s"]
+sources = ["llvm-%(version)s.src.tar.xz"]
+
+builddependencies = [
+    ('CMake', '3.2.3'),
+    ('Python', '2.7.11'),
+]
+
+configopts = '-DBUILD_SHARED_LIBS=ON '
+
+sanity_check_paths = {
+    'files' : ['bin/llvm-ar'],
+    'dirs' : ['include/llvm', 'include/llvm-c'],
+}
+
+separate_build_dir = True
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/l/LLVM/LLVM-3.7.1-intel-2015b.eb b/easybuild/easyconfigs/l/LLVM/LLVM-3.7.1-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e0f3bf3a62cd4a951990eaa2d0f71cdcf984c7d1
--- /dev/null
+++ b/easybuild/easyconfigs/l/LLVM/LLVM-3.7.1-intel-2015b.eb
@@ -0,0 +1,35 @@
+easyblock = 'CMakeMake'
+
+name = 'LLVM'
+version = '3.7.1'
+
+homepage = "http://llvm.org/"
+description = """The LLVM Core libraries provide a modern source- and target-independent
+ optimizer, along with code generation support for many popular CPUs
+ (as well as some less common ones!) These libraries are built around a well
+ specified code representation known as the LLVM intermediate representation
+ ("LLVM IR"). The LLVM Core libraries are well documented, and it is
+ particularly easy to invent your own language (or port an existing compiler)
+ to use LLVM as an optimizer and code generator."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'cstd': 'gnu++11'}
+
+source_urls = ["http://llvm.org/releases/%(version)s"]
+sources = ["llvm-%(version)s.src.tar.xz"]
+
+builddependencies = [
+    ('CMake', '3.4.1'),
+    ('Python', '2.7.11'),
+]
+
+configopts = '-DBUILD_SHARED_LIBS=ON -DCMAKE_EXE_LINKER_FLAGS="$LDFLAGS -shared-intel" '
+
+sanity_check_paths = {
+    'files' : ['bin/llvm-ar'],
+    'dirs' : ['include/llvm', 'include/llvm-c'],
+}
+
+separate_build_dir = True
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/l/LibUUID/LibUUID-1.0.3-intel-2015a.eb b/easybuild/easyconfigs/l/LibUUID/LibUUID-1.0.3-intel-2015a.eb
index e1a2ccf7bb7ade1ef02142b41632711a197a08f4..579d4bd9955cbfcea8e9469a51c5f5b3f6f4c2f6 100644
--- a/easybuild/easyconfigs/l/LibUUID/LibUUID-1.0.3-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/LibUUID/LibUUID-1.0.3-intel-2015a.eb
@@ -12,7 +12,7 @@ source_urls  = [SOURCEFORGE_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 sanity_check_paths = {
-    'files' : ['include/uuid/uuid.h', 'lib/libuuid.a','lib/libuuid.so'],
+    'files' : ['include/uuid/uuid.h', 'lib/libuuid.a','lib/libuuid.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/l/LibUUID/LibUUID-1.0.3-intel-2015b.eb b/easybuild/easyconfigs/l/LibUUID/LibUUID-1.0.3-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..052b80a1b3eaab21a237851c35906c2f95893963
--- /dev/null
+++ b/easybuild/easyconfigs/l/LibUUID/LibUUID-1.0.3-intel-2015b.eb
@@ -0,0 +1,19 @@
+easyblock = 'ConfigureMake'
+
+name = 'LibUUID'
+version = '1.0.3'
+
+homepage = 'http://sourceforge.net/projects/libuuid/'
+description = """Portable uuid C library"""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls  = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+sanity_check_paths = {
+    'files' : ['include/uuid/uuid.h', 'lib/libuuid.a','lib/libuuid.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libGLU/libGLU-9.0.0-intel-2015b-Mesa-11.0.8.eb b/easybuild/easyconfigs/l/libGLU/libGLU-9.0.0-intel-2015b-Mesa-11.0.8.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2d27e3100e5c130325fcfc005bb5ecd72c719a69
--- /dev/null
+++ b/easybuild/easyconfigs/l/libGLU/libGLU-9.0.0-intel-2015b-Mesa-11.0.8.eb
@@ -0,0 +1,27 @@
+easyblock = 'ConfigureMake'
+
+name = 'libGLU'
+version = '9.0.0'
+
+homepage = 'ftp://ftp.freedesktop.org/pub/mesa/glu/'
+description = """The OpenGL Utility Library (GLU) is a computer graphics library for OpenGL. """
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'pic': True}
+
+source_urls = ['ftp://ftp.freedesktop.org/pub/mesa/glu/']
+sources = ['glu-%(version)s.tar.bz2']
+
+mesaver = '11.0.8'
+versionsuffix = '-Mesa-%s' % mesaver
+
+dependencies = [
+    ('Mesa', mesaver, '-Python-2.7.11'),
+]
+
+sanity_check_paths = {
+    'files' : ['lib/libGLU.so.1'],
+    'dirs' : [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libICE/libICE-1.0.8-intel-2014b.eb b/easybuild/easyconfigs/l/libICE/libICE-1.0.8-intel-2014b.eb
index d296c6ae8cb5f908c920013f904fba246d58eac8..3280a4d8e4a2e337ee06f9c008cbd0c2ad66ce76 100644
--- a/easybuild/easyconfigs/l/libICE/libICE-1.0.8-intel-2014b.eb
+++ b/easybuild/easyconfigs/l/libICE/libICE-1.0.8-intel-2014b.eb
@@ -6,7 +6,7 @@ version = '1.0.8'
 homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
 description = """X Inter-Client Exchange library for freedesktop.org"""
 
-toolchain = {'name': 'intel', 'version': '2014b'} 
+toolchain = {'name': 'intel', 'version': '2014b'}
 
 sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
diff --git a/easybuild/easyconfigs/l/libICE/libICE-1.0.9-intel-2015a.eb b/easybuild/easyconfigs/l/libICE/libICE-1.0.9-intel-2015a.eb
index 57f6a9f4e3f631531f27facbf86040b16e92fdf6..c7f664c8c8ffd128e0c3438565970387e52714f8 100644
--- a/easybuild/easyconfigs/l/libICE/libICE-1.0.9-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libICE/libICE-1.0.9-intel-2015a.eb
@@ -6,7 +6,7 @@ version = '1.0.9'
 homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
 description = """X Inter-Client Exchange library for freedesktop.org"""
 
-toolchain = {'name': 'intel', 'version': '2015a'} 
+toolchain = {'name': 'intel', 'version': '2015a'}
 
 sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
diff --git a/easybuild/easyconfigs/l/libICE/libICE-1.0.9-intel-2015b.eb b/easybuild/easyconfigs/l/libICE/libICE-1.0.9-intel-2015b.eb
index 061d77840dd2f63c5f0db8a2bd02120e1f051a1b..87ccf251e183296c2c00f43ea63902b9c6c5c2d8 100644
--- a/easybuild/easyconfigs/l/libICE/libICE-1.0.9-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libICE/libICE-1.0.9-intel-2015b.eb
@@ -6,7 +6,7 @@ version = '1.0.9'
 homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
 description = """X Inter-Client Exchange library for freedesktop.org"""
 
-toolchain = {'name': 'intel', 'version': '2015b'} 
+toolchain = {'name': 'intel', 'version': '2015b'}
 
 sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.2-intel-2014b-Python-2.7.8.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.2-intel-2014b-Python-2.7.8.eb
index 491d7b754b38a597c70a5246bd00bdae495e294b..6dc47a39efcba5f2164e20308025769c5d667fa8 100644
--- a/easybuild/easyconfigs/l/libX11/libX11-1.6.2-intel-2014b-Python-2.7.8.eb
+++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.2-intel-2014b-Python-2.7.8.eb
@@ -7,7 +7,7 @@ versionsuffix = '-Python-2.7.8'
 homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
 description = """X11 client-side library"""
 
-toolchain = {'name': 'intel', 'version': '2014b'} 
+toolchain = {'name': 'intel', 'version': '2014b'}
 
 sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.2-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.2-intel-2015a-Python-2.7.9.eb
index 3f72262d57dd754c01e3452d7251b5d8e03f9f20..ee582416a0923c4255dcddd6698d86e9990ae213 100644
--- a/easybuild/easyconfigs/l/libX11/libX11-1.6.2-intel-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.2-intel-2015a-Python-2.7.9.eb
@@ -7,7 +7,7 @@ versionsuffix = '-Python-2.7.9'
 homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
 description = """X11 client-side library"""
 
-toolchain = {'name': 'intel', 'version': '2015a'} 
+toolchain = {'name': 'intel', 'version': '2015a'}
 
 sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2015a-Python-2.7.10.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2015a-Python-2.7.10.eb
index 9c513d4634cfe420d8a127ad8c7c8408ed7539c3..a4a74373002a527d1689b22633a360ecbe4bbfb2 100644
--- a/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2015a-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2015a-Python-2.7.10.eb
@@ -7,7 +7,7 @@ versionsuffix = '-Python-2.7.10'
 homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
 description = """X11 client-side library"""
 
-toolchain = {'name': 'intel', 'version': '2015a'} 
+toolchain = {'name': 'intel', 'version': '2015a'}
 
 sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2015a-Python-2.7.9.eb
index aec9e4570d870e8e3ab88d3e0dba95965e9e163f..fa0d2300e626c886d1f2f4d3741c8ab19d635c1a 100644
--- a/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2015a-Python-2.7.9.eb
@@ -7,7 +7,7 @@ versionsuffix = '-Python-2.7.9'
 homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
 description = """X11 client-side library"""
 
-toolchain = {'name': 'intel', 'version': '2015a'} 
+toolchain = {'name': 'intel', 'version': '2015a'}
 
 sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2015b-Python-2.7.10.eb
index 81992bc475333e49f16d338459c7febc26447dd4..90a1e61002a4da340131a706295f84e5a3fdadb1 100644
--- a/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2015b-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2015b-Python-2.7.10.eb
@@ -7,7 +7,7 @@ versionsuffix = '-Python-2.7.10'
 homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
 description = """X11 client-side library"""
 
-toolchain = {'name': 'intel', 'version': '2015b'} 
+toolchain = {'name': 'intel', 'version': '2015b'}
 
 sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ce11a9ade319ba602a18c19900f3aa9e537b99a8
--- /dev/null
+++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,37 @@
+easyblock = 'ConfigureMake'
+
+name = 'libX11'
+version = '1.6.3'
+versionsuffix = '-Python-2.7.11'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """X11 client-side library"""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+builddependencies = [
+    ('xextproto', '7.3.0'),
+    ('xcb-proto', '1.11', versionsuffix),
+    ('inputproto', '2.3.1'),
+    ('xproto', '7.0.28'),
+    ('kbproto', '1.0.7'),
+]
+
+dependencies = [
+    ('libxcb', '1.11.1', versionsuffix),
+    ('xtrans', '1.3.5'),
+]
+
+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/libXScrnSaver/libXScrnSaver-1.2.2-intel-2015a.eb b/easybuild/easyconfigs/l/libXScrnSaver/libXScrnSaver-1.2.2-intel-2015a.eb
index 0889930509402b0b32bc7a0bd8de6ba4c9cfdf34..964480ee2ec681b2d65f4f8ee779f4d122b0ce8a 100644
--- a/easybuild/easyconfigs/l/libXScrnSaver/libXScrnSaver-1.2.2-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libXScrnSaver/libXScrnSaver-1.2.2-intel-2015a.eb
@@ -17,7 +17,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/libXss.a', 'lib/libXss.so', 'include/X11/extensions/scrnsaver.h'],
+    'files': ['lib/libXss.a', 'lib/libXss.%s' % SHLIB_EXT, 'include/X11/extensions/scrnsaver.h'],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-foss-2014b.eb b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-foss-2014b.eb
index 26a7c1bcad481d2485123a5899dcd0d51f3e7b9d..fb7fa9047cf36e5232246a3da1c05d929cc74c8d 100644
--- a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-foss-2014b.eb
+++ b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-foss-2014b.eb
@@ -18,7 +18,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/%s' % x for x in ['libXau.a', 'libXau.so']],
+    'files': ['lib/%s' % x for x in ['libXau.a', 'libXau.%s' % SHLIB_EXT]],
     'dirs': [],
 }
 
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 1cbc16e8bbedd82a071f983c86248a78211de0c0..bb9632f8a7c2ccc9b689f4c587b85cf8da194d5c 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
@@ -14,7 +14,7 @@ sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
 
 sanity_check_paths = {
-    'files': ['lib/%s' % x for x in ['libXau.a', 'libXau.so']],
+    'files': ['lib/%s' % x for x in ['libXau.a', 'libXau.%s' % SHLIB_EXT]],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-goolf-1.5.14.eb b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-goolf-1.5.14.eb
index 2de39a52c7c7f3d73462ee78fea927a353c89b5d..658d67c16559e3842217cf0e2d05dd7c79da800b 100644
--- a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-goolf-1.5.14.eb
@@ -18,7 +18,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/%s' % x for x in ['libXau.a', 'libXau.so']],
+    'files': ['lib/%s' % x for x in ['libXau.a', 'libXau.%s' % SHLIB_EXT]],
     'dirs': [],
 }
 
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 aa72c34e220a493a372528b2a97cce0dae9e5d55..20b6db8b12bcc0ae468c264ba1a2de3c352d8e8a 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
@@ -14,7 +14,7 @@ sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
 
 sanity_check_paths = {
-    'files': ['lib/%s' % x for x in ['libXau.a', 'libXau.so']],
+    'files': ['lib/%s' % x for x in ['libXau.a', 'libXau.%s' % SHLIB_EXT]],
     'dirs': [],
 }
 
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
index 61b3a03f5e6b606424c10ae74efff628d4d3b791..7fec589824bd0fa0a8fc54fa32276b39d3e17367 100644
--- 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
@@ -14,7 +14,7 @@ sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
 
 sanity_check_paths = {
-    'files': ['lib/%s' % x for x in ['libXau.a', 'libXau.so']],
+    'files': ['lib/%s' % x for x in ['libXau.a', 'libXau.%s' % SHLIB_EXT]],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-intel-2014b.eb b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-intel-2014b.eb
index de6588743754866b920e33e1520fd285f1f1c950..4d40c3b428b420bb0c4fba04d467e2818d72dbea 100644
--- a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-intel-2014b.eb
+++ b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-intel-2014b.eb
@@ -18,7 +18,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/%s' % x for x in ['libXau.a', 'libXau.so']],
+    'files': ['lib/%s' % x for x in ['libXau.a', 'libXau.%s' % SHLIB_EXT]],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-intel-2015a.eb b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-intel-2015a.eb
index 03dfe7dd925c47d3bbaab09dd10c32f39415128a..724c9202494d555235eaf6be144b010f049ddb49 100644
--- a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-intel-2015a.eb
@@ -18,7 +18,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/%s' % x for x in ['libXau.a', 'libXau.so']],
+    'files': ['lib/%s' % x for x in ['libXau.a', 'libXau.%s' % SHLIB_EXT]],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-intel-2015b.eb b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-intel-2015b.eb
index fae47f9348b7d0db24d1e41a9a334f3e0d3f5797..9cfc777f9e4417b7f799f1675fabf8397bff4896 100644
--- a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-intel-2015b.eb
@@ -18,7 +18,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/%s' % x for x in ['libXau.a', 'libXau.so']],
+    'files': ['lib/%s' % x for x in ['libXau.a', 'libXau.%s' % SHLIB_EXT]],
     'dirs': [],
 }
 
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 0afe4224f62594cfdec81c2dd8a005c8f3ae3e92..f340efd9304f50795692e5d943feadcd922bfa0e 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
@@ -17,7 +17,7 @@ dependencies = [
     ('libXpm', '3.5.11'),
 ]
 sanity_check_paths = {
-    'files': ['lib/%s' % x for x in ['libXaw6.a', 'libXaw7.a', 'libXaw.so']],
+    'files': ['lib/%s' % x for x in ['libXaw6.a', 'libXaw7.a', 'libXaw.%s' % SHLIB_EXT]],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-goolf-1.5.14.eb b/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-goolf-1.5.14.eb
index 9a8e4a899f936bc8ea9998bda0c6e45ce99c683d..cd2a86aaa78816ad5befaecb161c0c8a081a289b 100644
--- a/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-goolf-1.5.14.eb
@@ -17,7 +17,7 @@ dependencies = [
     ('libXpm', '3.5.11'),
 ]
 sanity_check_paths = {
-    'files': ['lib/%s' % x for x in ['libXaw6.a', 'libXaw7.a', 'libXaw.so']],
+    'files': ['lib/%s' % x for x in ['libXaw6.a', 'libXaw7.a', 'libXaw.%s' % SHLIB_EXT]],
     'dirs': [],
 }
 
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 dbbc5cbafd704f941994bfbf3a00ff29f464ea0d..392e94c34121abb380fac24c8624717a5e4188ab 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
@@ -17,7 +17,7 @@ dependencies = [
     ('libXpm', '3.5.11'),
 ]
 sanity_check_paths = {
-    'files': ['lib/%s' % x for x in ['libXaw6.a', 'libXaw7.a', 'libXaw.so']],
+    'files': ['lib/%s' % x for x in ['libXaw6.a', 'libXaw7.a', 'libXaw.%s' % SHLIB_EXT]],
     'dirs': [],
 }
 
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
index ab991baeb12777a32be65fbf0ae6e07fa4fa6a24..df9ea11747f57ad93d5231153e1fc3d70a7f9e1c 100644
--- 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
@@ -17,7 +17,7 @@ dependencies = [
     ('libXpm', '3.5.11'),
 ]
 sanity_check_paths = {
-    'files': ['lib/%s' % x for x in ['libXaw6.a', 'libXaw7.a', 'libXaw.so']],
+    'files': ['lib/%s' % x for x in ['libXaw6.a', 'libXaw7.a', 'libXaw.%s' % SHLIB_EXT]],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/l/libXcursor/libXcursor-1.1.14-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/l/libXcursor/libXcursor-1.1.14-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0eefe006cb7966070c31a2748bd2813846b268a6
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXcursor/libXcursor-1.1.14-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'libXcursor'
+version = '1.1.14'
+versionsuffix = '-Python-2.7.11'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """X Cursor management library"""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+builddependencies = [
+    ('fixesproto', '5.0'),
+]
+
+dependencies = [
+    ('libX11', '1.6.3', versionsuffix),
+    ('libXfixes', '5.0.1'),
+    ('libXrender', '0.9.9', versionsuffix),
+]
+
+sanity_check_paths = {
+    'files': ['include/X11/Xcursor/Xcursor.h', 'lib/libXcursor.so', 'lib/libXcursor.a'],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXcursor/libXcursor-1.1.14-intel-2015b.eb b/easybuild/easyconfigs/l/libXcursor/libXcursor-1.1.14-intel-2015b.eb
index b03a386fb2bb2240bfbbcb59c3b553fab95e5cd2..4da67074115b28cf8c8de5957f128a98939575c8 100644
--- a/easybuild/easyconfigs/l/libXcursor/libXcursor-1.1.14-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libXcursor/libXcursor-1.1.14-intel-2015b.eb
@@ -22,7 +22,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['include/X11/Xcursor/Xcursor.h', 'lib/libXcursor.so', 'lib/libXcursor.a'],
+    'files': ['include/X11/Xcursor/Xcursor.h', 'lib/libXcursor.%s' % SHLIB_EXT, 'lib/libXcursor.a'],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/l/libXdamage/libXdamage-1.1.4-intel-2015a-Python-2.7.10.eb b/easybuild/easyconfigs/l/libXdamage/libXdamage-1.1.4-intel-2015a-Python-2.7.10.eb
index 0cb53836e382ccebf106804266a25f116b16dd6e..74d7162e6f9800d734a77d246a72090599c94b38 100644
--- a/easybuild/easyconfigs/l/libXdamage/libXdamage-1.1.4-intel-2015a-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/l/libXdamage/libXdamage-1.1.4-intel-2015a-Python-2.7.10.eb
@@ -19,7 +19,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['include/X11/extensions/Xdamage.h', 'lib/libXdamage.so', 'lib/libXdamage.a'],
+    'files': ['include/X11/extensions/Xdamage.h', 'lib/libXdamage.%s' % SHLIB_EXT, 'lib/libXdamage.a'],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/l/libXdamage/libXdamage-1.1.4-intel-2015a.eb b/easybuild/easyconfigs/l/libXdamage/libXdamage-1.1.4-intel-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..afb05aa782d999e92299ebde8e5ac513457a86e2
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXdamage/libXdamage-1.1.4-intel-2015a.eb
@@ -0,0 +1,26 @@
+easyblock = 'ConfigureMake'
+
+name = 'libXdamage'
+version = '1.1.4'
+pyver = '-Python-2.7.9'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """X Damage extension library"""
+
+toolchain = {'name': 'intel', 'version': '2015a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+dependencies = [
+    ('libX11', '1.6.3', pyver),
+    ('libxcb', '1.11', pyver),
+    ('libXau', '1.0.8'),
+]
+
+sanity_check_paths = {
+    'files': ['include/X11/extensions/Xdamage.h', 'lib/libXdamage.so', 'lib/libXdamage.a'],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXdamage/libXdamage-1.1.4-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/l/libXdamage/libXdamage-1.1.4-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8cb91c68012a7ee3adc9f8a0fe1247ad945fc3b0
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXdamage/libXdamage-1.1.4-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,26 @@
+easyblock = 'ConfigureMake'
+
+name = 'libXdamage'
+version = '1.1.4'
+versionsuffix = '-Python-2.7.11'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """X Damage extension library"""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+dependencies = [
+    ('libX11', '1.6.3', versionsuffix),
+    ('libxcb', '1.11.1', versionsuffix),
+    ('libXau', '1.0.8'),
+]
+
+sanity_check_paths = {
+    'files': ['include/X11/extensions/Xdamage.h', 'lib/libXdamage.so', 'lib/libXdamage.a'],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXdamage/libXdamage-1.1.4-intel-2015b.eb b/easybuild/easyconfigs/l/libXdamage/libXdamage-1.1.4-intel-2015b.eb
index b2eabd0f14c09e664e42ede65169653d2fc432ea..1ede837784e448a3b39a70bcee3fef0bd0a5de7a 100644
--- a/easybuild/easyconfigs/l/libXdamage/libXdamage-1.1.4-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libXdamage/libXdamage-1.1.4-intel-2015b.eb
@@ -18,7 +18,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['include/X11/extensions/Xdamage.h', 'lib/libXdamage.so', 'lib/libXdamage.a'],
+    'files': ['include/X11/extensions/Xdamage.h', 'lib/libXdamage.%s' % SHLIB_EXT, 'lib/libXdamage.a'],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d0916f41c9abce830141aafaf2cf970ad39df9ae
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,35 @@
+easyblock = 'ConfigureMake'
+
+name = 'libXext'
+version = '1.3.3'
+versionsuffix = '-Python-2.7.11'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """Common X Extensions library"""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'optarch': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+
+builddependencies = [
+    ('xproto', '7.0.28'),
+    ('xextproto', '7.3.0'),
+]
+
+dependencies = [
+    ('libX11', '1.6.3', versionsuffix),
+    ('libXdmcp', '1.1.2'),
+]
+
+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 4f783695b31421045c09129c577d854c84b2ba1d..501a07d2d9d9671f8d32c28cae8bc580bbdf057f 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
@@ -17,7 +17,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/extensions/Xfixes.h', 'lib/libXfixes.a', 'lib/libXfixes.so'],
+    'files' : ['include/X11/extensions/Xfixes.h', 'lib/libXfixes.a', 'lib/libXfixes.%s' % SHLIB_EXT],
     'dirs' : [],
 }
 
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 9fb8e9f3f9d9ad498ae9e3a8a34fde57efa8f4dd..b97a4a27936bfeead8ec9962bace704c8f3c8538 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
@@ -17,7 +17,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/extensions/Xfixes.h', 'lib/libXfixes.a', 'lib/libXfixes.so'],
+    'files' : ['include/X11/extensions/Xfixes.h', 'lib/libXfixes.a', 'lib/libXfixes.%s' % SHLIB_EXT],
     'dirs' : [],
 }
 
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
index adfb7e8af0c3b165a4b22c95561ae0da05446f10..a90ec28a7d027cfdee85b904ecdaf581b660c497 100644
--- 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
@@ -17,7 +17,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/extensions/Xfixes.h', 'lib/libXfixes.a', 'lib/libXfixes.so'],
+    'files' : ['include/X11/extensions/Xfixes.h', 'lib/libXfixes.a', 'lib/libXfixes.%s' % SHLIB_EXT],
     'dirs' : [],
 }
 
diff --git a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-intel-2015a.eb b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-intel-2015a.eb
index 3129ec62b114c097d13f74a946cd86458666f6f6..51127a819452e3f8cca89e9f837ebd92e942f5bb 100644
--- a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-intel-2015a.eb
@@ -17,7 +17,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/extensions/Xfixes.h', 'lib/libXfixes.a', 'lib/libXfixes.so'],
+    'files' : ['include/X11/extensions/Xfixes.h', 'lib/libXfixes.a', 'lib/libXfixes.%s' % SHLIB_EXT],
     'dirs' : [],
 }
 
diff --git a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-intel-2015b.eb b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-intel-2015b.eb
index 6a78af91162f19957d54ed8ee563a8d087490ec5..84e087e7bc4f52f0269f85ac0e59b85b6eb4f9c6 100644
--- a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-intel-2015b.eb
@@ -17,7 +17,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/extensions/Xfixes.h', 'lib/libXfixes.a', 'lib/libXfixes.so'],
+    'files' : ['include/X11/extensions/Xfixes.h', 'lib/libXfixes.a', 'lib/libXfixes.%s' % SHLIB_EXT],
     'dirs' : [],
 }
 
diff --git a/easybuild/easyconfigs/l/libXfont/libXfont-1.5.1-intel-2015a-Python-2.7.10.eb b/easybuild/easyconfigs/l/libXfont/libXfont-1.5.1-intel-2015a-Python-2.7.10.eb
index c14d0fe75e7fcc8fcae9ff657274648ee461d4ef..e90ae888d780c7b2bddac25f65eaea11fd7403c9 100644
--- a/easybuild/easyconfigs/l/libXfont/libXfont-1.5.1-intel-2015a-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/l/libXfont/libXfont-1.5.1-intel-2015a-Python-2.7.10.eb
@@ -23,7 +23,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/libXfont.so', 'lib/libXfont.a'],
+    'files': ['lib/libXfont.%s' % SHLIB_EXT, 'lib/libXfont.a'],
     'dirs': ['include/X11/fonts'],
 }
 
diff --git a/easybuild/easyconfigs/l/libXfont/libXfont-1.5.1-intel-2015a.eb b/easybuild/easyconfigs/l/libXfont/libXfont-1.5.1-intel-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..662f56c3c5d9f91745dc68703e53ca260a77ba55
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXfont/libXfont-1.5.1-intel-2015a.eb
@@ -0,0 +1,29 @@
+easyblock = 'ConfigureMake'
+
+name = 'libXfont'
+version = '1.5.1'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """X font libary"""
+
+toolchain = {'name': 'intel', 'version': '2015a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+builddependencies = [
+    ('fontsproto', '2.1.3'),
+    ('xproto', '7.0.27'),
+    ('xtrans', '1.3.5'),
+    ('libfontenc', '1.1.3'),
+]
+dependencies = [
+    ('libX11', '1.6.3', '-Python-2.7.9'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libXfont.so', 'lib/libXfont.a'],
+    'dirs': ['include/X11/fonts'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXfont/libXfont-1.5.1-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/l/libXfont/libXfont-1.5.1-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..41f49602df8c56b27f62289ef624c005e2de412e
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXfont/libXfont-1.5.1-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,32 @@
+easyblock = 'ConfigureMake'
+
+name = 'libXfont'
+version = '1.5.1'
+versionsuffix = '-Python-2.7.11'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """X font libary"""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+builddependencies = [
+    ('fontsproto', '2.1.3'),
+    ('xproto', '7.0.28'),
+    ('xtrans', '1.3.5'),
+    ('xorg-macros', '1.19.0'),
+    ('libfontenc', '1.1.3'),
+]
+dependencies = [
+    ('libX11', '1.6.3', versionsuffix),
+    ('freetype', '2.6.1'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libXfont.so', 'lib/libXfont.a'],
+    'dirs': ['include/X11/fonts'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXfont/libXfont-1.5.1-intel-2015b.eb b/easybuild/easyconfigs/l/libXfont/libXfont-1.5.1-intel-2015b.eb
index 8d3a7d49e988b4d9b8f2816c961a383ed918db44..964bfb9cde466954dbab50e6032ce2ffdfdc867a 100644
--- a/easybuild/easyconfigs/l/libXfont/libXfont-1.5.1-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libXfont/libXfont-1.5.1-intel-2015b.eb
@@ -24,7 +24,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/libXfont.so', 'lib/libXfont.a'],
+    'files': ['lib/libXfont.%s' % SHLIB_EXT, 'lib/libXfont.a'],
     'dirs': ['include/X11/fonts'],
 }
 
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 989ca225d4c2ed489c806054ca10671e093aff32..5f423967c0c59cbb3c9f43ef9b0264ac12e33d12 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
@@ -20,7 +20,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/extensions/XInput.h', 'include/X11/extensions/XInput2.h', 'lib/libXi.so', 'lib/libXi.a'],
+    'files' : ['include/X11/extensions/XInput.h', 'include/X11/extensions/XInput2.h', 'lib/libXi.%s' % SHLIB_EXT, 'lib/libXi.a'],
     'dirs' : [],
 }
 
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 f1233c793cc0480af2b8237ae9cb48504a8a304e..4b0cae6a95ff3cd23482c189b3cbd8923003066a 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
@@ -20,7 +20,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/extensions/XInput.h', 'include/X11/extensions/XInput2.h', 'lib/libXi.so', 'lib/libXi.a'],
+    'files' : ['include/X11/extensions/XInput.h', 'include/X11/extensions/XInput2.h', 'lib/libXi.%s' % SHLIB_EXT, 'lib/libXi.a'],
     'dirs' : [],
 }
 
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
index 1fc075646238f712f34a5568569f4ba375cc0920..ebca121b1074507794aa490d7a761bbb490f7892 100644
--- 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
@@ -20,7 +20,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/extensions/XInput.h', 'include/X11/extensions/XInput2.h', 'lib/libXi.so', 'lib/libXi.a'],
+    'files' : ['include/X11/extensions/XInput.h', 'include/X11/extensions/XInput2.h', 'lib/libXi.%s' % SHLIB_EXT, 'lib/libXi.a'],
     'dirs' : [],
 }
 
diff --git a/easybuild/easyconfigs/l/libXi/libXi-1.7.4-intel-2015a.eb b/easybuild/easyconfigs/l/libXi/libXi-1.7.4-intel-2015a.eb
index 20988d4e6e69b2efc0e0d25e070b2e45710d4e18..0ed8458cff33bf823e61596be81bf56293196550 100644
--- a/easybuild/easyconfigs/l/libXi/libXi-1.7.4-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libXi/libXi-1.7.4-intel-2015a.eb
@@ -19,7 +19,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/extensions/XInput.h', 'include/X11/extensions/XInput2.h', 'lib/libXi.so', 'lib/libXi.a'],
+    'files' : ['include/X11/extensions/XInput.h', 'include/X11/extensions/XInput2.h', 'lib/libXi.%s' % SHLIB_EXT, 'lib/libXi.a'],
     'dirs' : [],
 }
 
diff --git a/easybuild/easyconfigs/l/libXi/libXi-1.7.4-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/l/libXi/libXi-1.7.4-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1eaec43d4ee7d6df3a8dc66accd451a2d62d4582
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXi/libXi-1.7.4-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,27 @@
+easyblock = 'ConfigureMake'
+name = 'libXi'
+version = '1.7.4'
+versionsuffix = '-Python-2.7.11'
+
+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': 'intel', 'version': '2015b'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+dependencies = [
+    ('xproto', '7.0.28'),
+    ('xextproto', '7.3.0'),
+    ('libXext', '1.3.3', versionsuffix),
+    ('inputproto', '2.3.1'),
+    ('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/libXi/libXi-1.7.4-intel-2015b.eb b/easybuild/easyconfigs/l/libXi/libXi-1.7.4-intel-2015b.eb
index 05e88b068fd44d6cb7ef6bb7aa7a943275208897..418bfdfe23480c01e3b87afebddfb5850a7d3945 100644
--- a/easybuild/easyconfigs/l/libXi/libXi-1.7.4-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libXi/libXi-1.7.4-intel-2015b.eb
@@ -19,7 +19,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/extensions/XInput.h', 'include/X11/extensions/XInput2.h', 'lib/libXi.so', 'lib/libXi.a'],
+    'files' : ['include/X11/extensions/XInput.h', 'include/X11/extensions/XInput2.h', 'lib/libXi.%s' % SHLIB_EXT, 'lib/libXi.a'],
     'dirs' : [],
 }
 
diff --git a/easybuild/easyconfigs/l/libXinerama/libXinerama-1.1.3-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/l/libXinerama/libXinerama-1.1.3-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..df35769e55a9298850ff448764d56636f6e1c9e6
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXinerama/libXinerama-1.1.3-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,32 @@
+easyblock = 'ConfigureMake'
+
+name = 'libXinerama'
+version = '1.1.3'
+versionsuffix = '-Python-2.7.11'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """Xinerama multiple monitor library"""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+builddependencies = [
+    ('kbproto', '1.0.7'),
+    ('xineramaproto', '1.2.1'),
+    ('xextproto', '7.3.0'),
+]
+
+dependencies = [
+    ('xproto','7.0.28'),
+    ('libX11', '1.6.3', versionsuffix),
+    ('libXext', '1.3.3', versionsuffix),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libXinerama.a'],
+    '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 b54fb5d0e063b595394dd995a00d860170dad62b..7e4d47cef9d15e95bee80c4ca7251d88c4da5481 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
@@ -23,7 +23,7 @@ dependencies = [
      ('libXau', '1.0.8'),
 ]
 sanity_check_paths = {
-    'files': ['lib/%s' % x for x in ['libXp.a', 'libXp.so']],
+    'files': ['lib/%s' % x for x in ['libXp.a', 'libXp.%s' % SHLIB_EXT]],
     'dirs': []
 }
 
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 aafb0c89662f0a37c287e48344b45086d39c722d..f3cb59abe1121ea71afbcb4db04da692690b6076 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
@@ -23,7 +23,7 @@ dependencies = [
      ('libXau', '1.0.8'),
 ]
 sanity_check_paths = {
-    'files': ['lib/%s' % x for x in ['libXp.a', 'libXp.so']],
+    'files': ['lib/%s' % x for x in ['libXp.a', 'libXp.%s' % SHLIB_EXT]],
     'dirs': [],
 }
 
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
index 2adf08884bc5110891b78a3345bc6214709959ef..5a95f178eedfa080f9449bc2cf3a3fb3310f8743 100644
--- 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
@@ -23,7 +23,7 @@ dependencies = [
      ('libXau', '1.0.8'),
 ]
 sanity_check_paths = {
-    'files': ['lib/%s' % x for x in ['libXp.a', 'libXp.so']],
+    'files': ['lib/%s' % x for x in ['libXp.a', 'libXp.%s' % SHLIB_EXT]],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/l/libXp/libXp-1.0.3-goolf-1.5.14.eb b/easybuild/easyconfigs/l/libXp/libXp-1.0.3-goolf-1.5.14.eb
index 9da42c6bbb4edeec019ea6fa348ccddbf22db1c8..04dbfd170124d6befbddff4858675ad38e2bd66e 100644
--- a/easybuild/easyconfigs/l/libXp/libXp-1.0.3-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/l/libXp/libXp-1.0.3-goolf-1.5.14.eb
@@ -23,7 +23,7 @@ dependencies = [
      ('libXau', '1.0.8'),
 ]
 sanity_check_paths = {
-    'files': ['lib/%s' % x for x in ['libXp.a', 'libXp.so']],
+    'files': ['lib/%s' % x for x in ['libXp.a', 'libXp.%s' % SHLIB_EXT]],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/l/libXp/libXp-1.0.3-intel-2015a.eb b/easybuild/easyconfigs/l/libXp/libXp-1.0.3-intel-2015a.eb
index fe0d5183a55f006871b9afcf11bb52f8653c2aab..c09d0e3c06fe967b1c9194c23ab3ccf428b110d0 100644
--- a/easybuild/easyconfigs/l/libXp/libXp-1.0.3-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libXp/libXp-1.0.3-intel-2015a.eb
@@ -24,7 +24,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/%s' % x for x in ['libXp.a', 'libXp.so']],
+    'files': ['lib/%s' % x for x in ['libXp.a', 'libXp.%s' % SHLIB_EXT]],
     'dirs': [],
 }
 
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 0840f6e06d458849b62d2c4d777bea8da9fea9b0..1e6eb0a853c1c4aa999642e4b2c5d3bb96d4bbe5 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
@@ -15,7 +15,7 @@ source_urls = [XORG_LIB_SOURCE]
 builddependencies = [('gettext', '0.18.2')]
 
 sanity_check_paths = {
-    'files': ['lib/%s' % x for x in ['libXpm.a', 'libXpm.so']],
+    'files': ['lib/%s' % x for x in ['libXpm.a', 'libXpm.%s' % SHLIB_EXT]],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-goolf-1.5.14.eb b/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-goolf-1.5.14.eb
index 885a79da5324f5d56807636593d9e73107601d8e..8c000c36ade218c74609897862896cb7f0e2dbab 100644
--- a/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-goolf-1.5.14.eb
@@ -15,7 +15,7 @@ source_urls = [XORG_LIB_SOURCE]
 builddependencies = [('gettext', '0.18.2')]
 
 sanity_check_paths = {
-    'files': ['lib/%s' % x for x in ['libXpm.a', 'libXpm.so']],
+    'files': ['lib/%s' % x for x in ['libXpm.a', 'libXpm.%s' % SHLIB_EXT]],
     'dirs': [],
 }
 
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 076cc39edb1d049bd20c31c3005f9bd56e695186..0d4cd1cee7eb5f91e963d093053578189a80e90a 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
@@ -15,7 +15,7 @@ source_urls = [XORG_LIB_SOURCE]
 builddependencies = [('gettext', '0.18.2')]
 
 sanity_check_paths = {
-    'files': ['lib/%s' % x for x in ['libXpm.a', 'libXpm.so']],
+    'files': ['lib/%s' % x for x in ['libXpm.a', 'libXpm.%s' % SHLIB_EXT]],
     'dirs': [],
 }
 
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
index 5bb46ff15c9319db7f7ce76f6241df41b30b2080..306a9bf1d29b4b417d8d7bd995e2a1aad37e81ce 100644
--- 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
@@ -15,7 +15,7 @@ source_urls = [XORG_LIB_SOURCE]
 builddependencies = [('gettext', '0.18.2')]
 
 sanity_check_paths = {
-    'files': ['lib/%s' % x for x in ['libXpm.a', 'libXpm.so']],
+    'files': ['lib/%s' % x for x in ['libXpm.a', 'libXpm.%s' % SHLIB_EXT]],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-intel-2015a.eb b/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-intel-2015a.eb
index 69fda1c84a0f87d164d49cfc10c227069788092e..b38602a722f9dda0cd31a0d39453afcd015f7006 100644
--- a/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-intel-2015a.eb
@@ -15,7 +15,7 @@ source_urls = [XORG_LIB_SOURCE]
 builddependencies = [('gettext', '0.19.4', '', ('GCC', '4.9.2'))]
 
 sanity_check_paths = {
-    'files': ['lib/%s' % x for x in ['libXpm.a', 'libXpm.so']],
+    'files': ['lib/%s' % x for x in ['libXpm.a', 'libXpm.%s' % SHLIB_EXT]],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/l/libXrandr/libXrandr-1.5.0-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/l/libXrandr/libXrandr-1.5.0-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6b526bdf5290088842e50c6f51a08cfffc08ffb3
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXrandr/libXrandr-1.5.0-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,32 @@
+easyblock = 'ConfigureMake'
+
+name = 'libXrandr'
+version = '1.5.0'
+versionsuffix = '-Python-2.7.11'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """X Resize, Rotate and Reflection extension library"""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+builddependencies = [
+    ('randrproto', '1.5.0'),
+    ('renderproto', '0.11'),
+    ('xextproto', '7.3.0'),
+]
+
+dependencies = [
+    ('libX11', '1.6.3', versionsuffix),
+    ('libXext', '1.3.3', versionsuffix),
+    ('libXrender', '0.9.9', versionsuffix),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libXrandr.so', 'lib/libXrandr.a'],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXrandr/libXrandr-1.5.0-intel-2015b.eb b/easybuild/easyconfigs/l/libXrandr/libXrandr-1.5.0-intel-2015b.eb
index 400d476d8db91e046557033a0da8edbf445f3de1..e95be8e09d0617c51ae3ab2580fad2b7f5c18837 100644
--- a/easybuild/easyconfigs/l/libXrandr/libXrandr-1.5.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libXrandr/libXrandr-1.5.0-intel-2015b.eb
@@ -24,7 +24,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/libXrandr.so', 'lib/libXrandr.a'],
+    'files': ['lib/libXrandr.%s' % SHLIB_EXT, 'lib/libXrandr.a'],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/l/libXrender/libXrender-0.9.9-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/l/libXrender/libXrender-0.9.9-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5d4c3536fb9117c6dcf5fb32b21fa5c8004a6888
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXrender/libXrender-0.9.9-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,29 @@
+easyblock = 'ConfigureMake'
+
+name = 'libXrender'
+version = '0.9.9'
+versionsuffix = '-Python-2.7.11'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """X11 client-side library"""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+builddependencies = [
+    ('kbproto', '1.0.7'),
+    ('renderproto', '0.11'),
+]
+
+dependencies = [
+    ('libX11', '1.6.3', versionsuffix),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libXrender.a'],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXt/libXt-1.1.5-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/l/libXt/libXt-1.1.5-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a4877fe346a6d75dca83e82ab4a7d58491f0dd10
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXt/libXt-1.1.5-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,40 @@
+easyblock = 'ConfigureMake'
+
+name = 'libXt'
+version = '1.1.5'
+versionsuffix = '-Python-2.7.11'
+
+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': 'intel', 'version': '2015b'}
+toolchainopts = {'optarch': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+dependencies = [
+    ('libSM', '1.2.2'),
+    ('libICE', '1.0.9'),
+    ('libX11', '1.6.3', versionsuffix),
+]
+
+builddependencies = [
+    ('xproto', '7.0.28'),
+    ('kbproto', '1.0.7'),
+]
+
+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/libXtst/libXtst-1.2.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXtst/libXtst-1.2.2-goolf-1.4.10.eb
index 21b73fce1cec78b60ffc6c9705a72a21b4993740..e9f3a54d522929fbe72995b3b23cccc23e9f583a 100644
--- a/easybuild/easyconfigs/l/libXtst/libXtst-1.2.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libXtst/libXtst-1.2.2-goolf-1.4.10.eb
@@ -13,7 +13,7 @@ sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
 
 sanity_check_paths = {
-    'files': ['lib/%s' % x for x in ['libXtst.a', 'libXtst.so']],
+    'files': ['lib/%s' % x for x in ['libXtst.a', 'libXtst.%s' % SHLIB_EXT]],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/l/libXtst/libXtst-1.2.2-goolf-1.5.14.eb b/easybuild/easyconfigs/l/libXtst/libXtst-1.2.2-goolf-1.5.14.eb
index 9bf21bea7e284aa7d45598abcab2e7ee216d361b..4d722525170fbf86230df7d70197655ea7b3e93b 100644
--- a/easybuild/easyconfigs/l/libXtst/libXtst-1.2.2-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/l/libXtst/libXtst-1.2.2-goolf-1.5.14.eb
@@ -13,7 +13,7 @@ sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
 
 sanity_check_paths = {
-    'files': ['lib/%s' % x for x in ['libXtst.a', 'libXtst.so']],
+    'files': ['lib/%s' % x for x in ['libXtst.a', 'libXtst.%s' % SHLIB_EXT]],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/l/libXtst/libXtst-1.2.2-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXtst/libXtst-1.2.2-ictce-4.1.13.eb
index 9713052fb643ae878ea284f0fbf247f2a87cc16c..207ab0872f7e51cd970f07d2d2aaa737c4f3d7b7 100644
--- a/easybuild/easyconfigs/l/libXtst/libXtst-1.2.2-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libXtst/libXtst-1.2.2-ictce-4.1.13.eb
@@ -13,7 +13,7 @@ sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
 
 sanity_check_paths = {
-    'files': ['lib/%s' % x for x in ['libXtst.a', 'libXtst.so']],
+    'files': ['lib/%s' % x for x in ['libXtst.a', 'libXtst.%s' % SHLIB_EXT]],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/l/libXtst/libXtst-1.2.2-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libXtst/libXtst-1.2.2-ictce-5.3.0.eb
index 86028b462b8b70635e7fa815e990ae20cc496d3b..fa74f41bf7646909e62b7e6bc98238bb09413517 100644
--- a/easybuild/easyconfigs/l/libXtst/libXtst-1.2.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libXtst/libXtst-1.2.2-ictce-5.3.0.eb
@@ -13,7 +13,7 @@ sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
 
 sanity_check_paths = {
-    'files': ['lib/%s' % x for x in ['libXtst.a', 'libXtst.so']],
+    'files': ['lib/%s' % x for x in ['libXtst.a', 'libXtst.%s' % SHLIB_EXT]],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/l/libXtst/libXtst-1.2.2-intel-2015a.eb b/easybuild/easyconfigs/l/libXtst/libXtst-1.2.2-intel-2015a.eb
index 9bd6332adcfa0b0397fc133ff11da036606b6621..0f5a6e9ec2763f593631027ec1198310b61d08a6 100644
--- a/easybuild/easyconfigs/l/libXtst/libXtst-1.2.2-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libXtst/libXtst-1.2.2-intel-2015a.eb
@@ -13,7 +13,7 @@ sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
 
 sanity_check_paths = {
-    'files': ['lib/%s' % x for x in ['libXtst.a', 'libXtst.so']],
+    'files': ['lib/%s' % x for x in ['libXtst.a', 'libXtst.%s' % SHLIB_EXT]],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/l/libcircle/libcircle-0.2.0-rc.1-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libcircle/libcircle-0.2.0-rc.1-goolf-1.4.10.eb
index 0a754ead09b0687ddc568833da828715cf5d9f75..5c7402fd86c437d3977c6faa5085af07100c6c6e 100644
--- a/easybuild/easyconfigs/l/libcircle/libcircle-0.2.0-rc.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libcircle/libcircle-0.2.0-rc.1-goolf-1.4.10.eb
@@ -23,7 +23,7 @@ sources = ['%(version)s.tar.gz']
 source_urls = ['https://github.com/hpc/libcircle/archive/']
 
 sanity_check_paths = {
-    'files': ['include/libcircle.h', 'lib/libcircle.a', 'lib/libcircle.so'],
+    'files': ['include/libcircle.h', 'lib/libcircle.a', 'lib/libcircle.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/l/libcircle/libcircle-0.2.0-rc.1-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libcircle/libcircle-0.2.0-rc.1-ictce-5.3.0.eb
index b03276694bb0ac6fa0dbd651d87c88804a40e0cc..0021c76f06df9219970e58ee246cb2132b7c6143 100644
--- a/easybuild/easyconfigs/l/libcircle/libcircle-0.2.0-rc.1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libcircle/libcircle-0.2.0-rc.1-ictce-5.3.0.eb
@@ -23,7 +23,7 @@ sources = ['%(version)s.tar.gz']
 source_urls = ['https://github.com/hpc/libcircle/archive/']
 
 sanity_check_paths = {
-    'files': ['include/libcircle.h', 'lib/libcircle.a', 'lib/libcircle.so'],
+    'files': ['include/libcircle.h', 'lib/libcircle.a', 'lib/libcircle.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/l/libdap/libdap-3.14.0-intel-2015a-Python-2.7.10.eb b/easybuild/easyconfigs/l/libdap/libdap-3.14.0-intel-2015a-Python-2.7.10.eb
index 6b99d4fd62ae5601a9e2b7424022ce35893e232d..63172f59f4dd403a47f737d34d293cc21fa1cdee 100644
--- a/easybuild/easyconfigs/l/libdap/libdap-3.14.0-intel-2015a-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/l/libdap/libdap-3.14.0-intel-2015a-Python-2.7.10.eb
@@ -2,7 +2,7 @@ easyblock = 'ConfigureMake'
 
 name = 'libdap'
 version = '3.14.0'
-versionsuffix = "-Python-2.7.10" 
+versionsuffix = "-Python-2.7.10"
 
 homepage = 'http://opendap.org/download/libdap'
 description = """A C++ SDK which contains an implementation of DAP 2.0
@@ -28,7 +28,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['bin/getdap', 'bin/getdap4', 'bin/dap-config', 'lib/libdap.a', 'lib/libdap.so'],
+    'files' : ['bin/getdap', 'bin/getdap4', 'bin/dap-config', 'lib/libdap.a', 'lib/libdap.%s' % SHLIB_EXT],
     'dirs': ['include'],
 }
 
diff --git a/easybuild/easyconfigs/l/libdap/libdap-3.14.0-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/l/libdap/libdap-3.14.0-intel-2015b-Python-2.7.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f70b2b33c48480b5f21ba38dede621582cb722d3
--- /dev/null
+++ b/easybuild/easyconfigs/l/libdap/libdap-3.14.0-intel-2015b-Python-2.7.10.eb
@@ -0,0 +1,35 @@
+easyblock = 'ConfigureMake'
+
+name = 'libdap'
+version = '3.14.0'
+versionsuffix = "-Python-2.7.10"
+
+homepage = 'http://opendap.org/download/libdap'
+description = """A C++ SDK which contains an implementation of DAP 2.0
+ and the development versions of DAP3, up to 3.4.
+ This includes both Client- and Server-side support classes."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls  = ['http://www.opendap.org/pub/source/']
+sources = [SOURCE_TAR_GZ]
+
+patches = ['%(name)s-%(version)s_flex.patch']
+
+builddependencies = [
+    ('Bison', '3.0.4'),
+    ('flex', '2.5.39'),
+]
+
+dependencies = [
+    ('cURL', '7.43.0'),
+    ('libxml2', '2.9.3', versionsuffix),
+    ('LibUUID', '1.0.3'),
+]
+
+sanity_check_paths = {
+    'files' : ['bin/getdap', 'bin/getdap4', 'bin/dap-config', 'lib/libdap.a', 'lib/libdap.%s' % SHLIB_EXT],
+    'dirs': ['include'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-goalf-1.1.0-no-OFED.eb
index 92ffc337ddd59b79bfe0667b79d77a7aa1551748..dbc45bd35cc2d9284e565bec97cc52337d293eb6 100644
--- a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-goalf-1.1.0-no-OFED.eb
@@ -17,8 +17,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.so',
-               'lib/libdrm_radeon.so', 'lib/libdrm.so', 'lib/libkms.so'],
+    'files' : ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.%s' % SHLIB_EXT,
+               'lib/libdrm_radeon.%s' % SHLIB_EXT, 'lib/libdrm.%s' % SHLIB_EXT, 'lib/libkms.%s' % SHLIB_EXT],
     'dirs': ['include/libdrm', 'include/libkms', 'lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-goolf-1.4.10.eb
index b1d2fbfdf4022b01eef815daaa39b934300b2896..69b418577f7163144b4e04f55a54e12761f95cf7 100644
--- a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-goolf-1.4.10.eb
@@ -17,8 +17,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.so',
-               'lib/libdrm_radeon.so', 'lib/libdrm.so', 'lib/libkms.so'],
+    'files' : ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.%s' % SHLIB_EXT,
+               'lib/libdrm_radeon.%s' % SHLIB_EXT, 'lib/libdrm.%s' % SHLIB_EXT, 'lib/libkms.%s' % SHLIB_EXT],
     'dirs': ['include/libdrm', 'include/libkms', 'lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-ictce-4.0.6.eb
index c3030842e986744a09fdbfe8795ee9bfcc3dedc4..390148b6934c53ea80d5d8315e71d64222a65ca1 100644
--- a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-ictce-4.0.6.eb
@@ -17,8 +17,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.so',
-               'lib/libdrm_radeon.so', 'lib/libdrm.so', 'lib/libkms.so'],
+    'files' : ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.%s' % SHLIB_EXT,
+               'lib/libdrm_radeon.%s' % SHLIB_EXT, 'lib/libdrm.%s' % SHLIB_EXT, 'lib/libkms.%s' % SHLIB_EXT],
     'dirs': ['include/libdrm', 'include/libkms', 'lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-ictce-4.1.13.eb
index 153b29cec154354e3bdc86f0afee51fe0a0db864..0b86566ae8a6d3c942854eabef7c5f1522cf5314 100644
--- a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-ictce-4.1.13.eb
@@ -17,8 +17,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.so',
-               'lib/libdrm_radeon.so', 'lib/libdrm.so', 'lib/libkms.so'],
+    'files' : ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.%s' % SHLIB_EXT,
+               'lib/libdrm_radeon.%s' % SHLIB_EXT, 'lib/libdrm.%s' % SHLIB_EXT, 'lib/libkms.%s' % SHLIB_EXT],
     'dirs': ['include/libdrm', 'include/libkms', 'lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-ictce-5.3.0.eb
index c5883cb6dbd425f4eebbbaca2fca21d40a29b304..96c26fee1ce6012df59bf8fae15378c4460d91f1 100644
--- a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-ictce-5.3.0.eb
@@ -17,8 +17,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.so',
-               'lib/libdrm_radeon.so', 'lib/libdrm.so', 'lib/libkms.so'],
+    'files' : ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.%s' % SHLIB_EXT,
+               'lib/libdrm_radeon.%s' % SHLIB_EXT, 'lib/libdrm.%s' % SHLIB_EXT, 'lib/libkms.%s' % SHLIB_EXT],
     'dirs': ['include/libdrm', 'include/libkms', 'lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-ictce-5.5.0.eb b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-ictce-5.5.0.eb
index d46e9edefed2775fd9b3cc54a18a7de2fff32b24..aaa4f551989d4bf0c5c18525d23eeb61dc135873 100644
--- a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-ictce-5.5.0.eb
@@ -17,8 +17,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.so',
-               'lib/libdrm_radeon.so', 'lib/libdrm.so', 'lib/libkms.so'],
+    'files' : ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.%s' % SHLIB_EXT,
+               'lib/libdrm_radeon.%s' % SHLIB_EXT, 'lib/libdrm.%s' % SHLIB_EXT, 'lib/libkms.%s' % SHLIB_EXT],
     'dirs': ['include/libdrm', 'include/libkms', 'lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.59-intel-2015a.eb b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.59-intel-2015a.eb
index 3b516fcaacf3904c52e285f395cc002771916ecf..bf98667278ba7d0d3514b656a001512e99540f38 100644
--- a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.59-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.59-intel-2015a.eb
@@ -17,8 +17,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.so',
-               'lib/libdrm_radeon.so', 'lib/libdrm.so', 'lib/libkms.so'],
+    'files' : ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.%s' % SHLIB_EXT,
+               'lib/libdrm_radeon.%s' % SHLIB_EXT, 'lib/libdrm.%s' % SHLIB_EXT, 'lib/libkms.%s' % SHLIB_EXT],
     'dirs': ['include/libdrm', 'include/libkms', 'lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.64-intel-2015b.eb b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.64-intel-2015b.eb
index 957d926dae82d928953f8d4b578464dc2aa8ca24..40c401fcce832dc9a69baf983889bb18ab3f689a 100644
--- a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.64-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.64-intel-2015b.eb
@@ -17,8 +17,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.so',
-               'lib/libdrm_radeon.so', 'lib/libdrm.so', 'lib/libkms.so'],
+    'files' : ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.%s' % SHLIB_EXT,
+               'lib/libdrm_radeon.%s' % SHLIB_EXT, 'lib/libdrm.%s' % SHLIB_EXT, 'lib/libkms.%s' % SHLIB_EXT],
     'dirs': ['include/libdrm', 'include/libkms', 'lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.66-intel-2015b.eb b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.66-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8d5e86157a1688a3590ced4b9497ea43f793cb24
--- /dev/null
+++ b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.66-intel-2015b.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'libdrm'
+version = '2.4.66'
+
+homepage = 'http://dri.freedesktop.org'
+description = """Direct Rendering Manager runtime library."""
+
+source_urls  = ['http://dri.freedesktop.org/libdrm/']
+sources = [SOURCELOWER_TAR_GZ]
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+dependencies = [
+    ('libpthread-stubs', '0.3'),
+    ('libpciaccess', '0.13.4'),
+]
+
+sanity_check_paths = {
+    'files' : ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.so',
+               'lib/libdrm_radeon.so', 'lib/libdrm.so', 'lib/libkms.so'],
+    'dirs': ['include/libdrm', 'include/libkms', 'lib/pkgconfig'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libdwarf/libdwarf-20140805-GCC-4.9.2.eb b/easybuild/easyconfigs/l/libdwarf/libdwarf-20140805-GCC-4.9.2.eb
index c4e1b21a2a84822782defa64c40b0aabb6678868..cc9e86a7d03a48197779f067635ad063ca4d8da0 100644
--- a/easybuild/easyconfigs/l/libdwarf/libdwarf-20140805-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/l/libdwarf/libdwarf-20140805-GCC-4.9.2.eb
@@ -23,7 +23,7 @@ prebuildopts = ' LD_LIBRARY_PATH="../libdwarf:$LD_LIBRARY_PATH" '
 
 files_to_copy = [
     (["dwarfdump2/dwarfdump"], "bin"),
-    (["libdwarf/libdwarf.a", "libdwarf/libdwarf.so"], "lib"),
+    (["libdwarf/libdwarf.a", "libdwarf/libdwarf.%s" % SHLIB_EXT], "lib"),
     (["libdwarf/libdwarf.h", "libdwarf/dwarf.h"], "include"),
 ]
 
diff --git a/easybuild/easyconfigs/l/libedit/libedit-20150325-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/l/libedit/libedit-20150325-GNU-4.9.3-2.25.eb
index fe54474a05f46484d6a53eb80628a3c46bc00c4c..20fc94afcc87965b02435ca352c2cc6a46ac70b4 100644
--- a/easybuild/easyconfigs/l/libedit/libedit-20150325-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/l/libedit/libedit-20150325-GNU-4.9.3-2.25.eb
@@ -17,7 +17,7 @@ source_urls = ['http://thrysoee.dk/editline/']
 dependencies = [('ncurses', '5.9')]
 
 sanity_check_paths = {
-    'files': ['include/editline/readline.h', 'lib/libedit.so', 'lib/libedit.a'],
+    'files': ['include/editline/readline.h', 'lib/libedit.%s' % SHLIB_EXT, 'lib/libedit.a'],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/l/libelf/libelf-0.8.13-GCC-4.9.2.eb b/easybuild/easyconfigs/l/libelf/libelf-0.8.13-GCC-4.9.2.eb
index f0033e4acfb0604108c2f2ce7f77130e60a3af1e..9babe1877c9ef230910b0577610b4573492a5ad7 100644
--- a/easybuild/easyconfigs/l/libelf/libelf-0.8.13-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/l/libelf/libelf-0.8.13-GCC-4.9.2.eb
@@ -12,7 +12,7 @@ sources = [SOURCE_TAR_GZ]
 source_urls = ['http://www.mr511.de/software/']
 
 sanity_check_paths = {
-    'files': ['lib/libelf.a', 'lib/libelf.so', 'lib/libelf.so.0', 'include/libelf.h'],
+    'files': ['lib/libelf.a', 'lib/libelf.%s' % SHLIB_EXT, 'lib/libelf.so.0', 'include/libelf.h'],
     'dirs': ['lib/pkgconfig']
 }
 
diff --git a/easybuild/easyconfigs/l/libfontenc/libfontenc-1.1.3-intel-2015a.eb b/easybuild/easyconfigs/l/libfontenc/libfontenc-1.1.3-intel-2015a.eb
index b6a5cba0dbc9b17505219d9bd09369ecf2e9297b..f206e4360114c9610a1c8aaec316d32c6a31493d 100644
--- a/easybuild/easyconfigs/l/libfontenc/libfontenc-1.1.3-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libfontenc/libfontenc-1.1.3-intel-2015a.eb
@@ -16,7 +16,7 @@ builddependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['include/X11/fonts/fontenc.h', 'lib/libfontenc.so', 'lib/libfontenc.a'],
+    'files': ['include/X11/fonts/fontenc.h', 'lib/libfontenc.%s' % SHLIB_EXT, 'lib/libfontenc.a'],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/l/libfontenc/libfontenc-1.1.3-intel-2015b.eb b/easybuild/easyconfigs/l/libfontenc/libfontenc-1.1.3-intel-2015b.eb
index 1804b5383febb3104d35ef196e12de4de59a69cf..c5a467f31b6cb87ac264708f29bd8d25c0792fe0 100644
--- a/easybuild/easyconfigs/l/libfontenc/libfontenc-1.1.3-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libfontenc/libfontenc-1.1.3-intel-2015b.eb
@@ -16,7 +16,7 @@ builddependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['include/X11/fonts/fontenc.h', 'lib/libfontenc.so', 'lib/libfontenc.a'],
+    'files': ['include/X11/fonts/fontenc.h', 'lib/libfontenc.%s' % SHLIB_EXT, 'lib/libfontenc.a'],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/l/libgd/libgd-2.1.0-ictce-5.5.0.eb b/easybuild/easyconfigs/l/libgd/libgd-2.1.0-ictce-5.5.0.eb
index 610b070a4fc1d50a4c55067f2259a0c9f5963b4c..5b28873de211d1835aed8ce6e3ff0815603094f5 100644
--- a/easybuild/easyconfigs/l/libgd/libgd-2.1.0-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/l/libgd/libgd-2.1.0-ictce-5.5.0.eb
@@ -19,7 +19,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ["lib/libgd.a", "lib/libgd.so"],
+    'files': ["lib/libgd.a", "lib/libgd.%s" % SHLIB_EXT],
     'dirs': ["bin", "include"],
 }
 
diff --git a/easybuild/easyconfigs/l/libgd/libgd-2.1.1-intel-2015b.eb b/easybuild/easyconfigs/l/libgd/libgd-2.1.1-intel-2015b.eb
index 27e5a0a02e061f4ede1ed3f4a17108684bf70437..3714305afd9fcc3d49c28a76c279e814ade6d5e1 100644
--- a/easybuild/easyconfigs/l/libgd/libgd-2.1.1-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libgd/libgd-2.1.1-intel-2015b.eb
@@ -20,7 +20,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ["lib/libgd.a", "lib/libgd.so"],
+    'files': ["lib/libgd.a", "lib/libgd.%s" % SHLIB_EXT],
     'dirs': ["bin", "include"],
 }
 
diff --git a/easybuild/easyconfigs/l/libgtextutils/libgtextutils-0.6.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libgtextutils/libgtextutils-0.6.1-goalf-1.1.0-no-OFED.eb
index b7b2e2fbc538bae7c735decb7a5a0385368a8298..6aabc3ac11770d3a0ca4607479324fbe929f6e66 100644
--- a/easybuild/easyconfigs/l/libgtextutils/libgtextutils-0.6.1-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/l/libgtextutils/libgtextutils-0.6.1-goalf-1.1.0-no-OFED.eb
@@ -25,8 +25,8 @@ sources = [SOURCE_TAR_BZ2]
 source_urls = ['http://hannonlab.cshl.edu/fastx_toolkit']
 
 sanity_check_paths = {
-                      'files': ['lib/libgtextutils.so', 'lib/libgtextutils.a'],
-                      'dirs': ['lib/pkgconfig']
-                     }
+    'files': ['lib/libgtextutils.%s' % SHLIB_EXT, 'lib/libgtextutils.a'],
+    'dirs': ['lib/pkgconfig']
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/l/libgtextutils/libgtextutils-0.6.1-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libgtextutils/libgtextutils-0.6.1-goolf-1.4.10.eb
index 4dccc15fd5e321fc5341752be38750e168dc050f..2f55afa678e0406fc14c3f4398bd411be544820d 100644
--- a/easybuild/easyconfigs/l/libgtextutils/libgtextutils-0.6.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libgtextutils/libgtextutils-0.6.1-goolf-1.4.10.eb
@@ -24,8 +24,8 @@ sources = [SOURCE_TAR_BZ2]
 source_urls = ['http://hannonlab.cshl.edu/fastx_toolkit']
 
 sanity_check_paths = {
-                      'files': ['lib/libgtextutils.so', 'lib/libgtextutils.a'],
-                      'dirs': ['lib/pkgconfig']
-                     }
+    'files': ['lib/libgtextutils.%s' % SHLIB_EXT, 'lib/libgtextutils.a'],
+    'dirs': ['lib/pkgconfig']
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/l/libgtextutils/libgtextutils-0.6.1-goolf-1.7.20.eb b/easybuild/easyconfigs/l/libgtextutils/libgtextutils-0.6.1-goolf-1.7.20.eb
index b5f853d5af4fcb0651cb8fceb9c37f813438c254..1b5c00b84c6b29173fac7a4ad0a2180323eeabd9 100644
--- a/easybuild/easyconfigs/l/libgtextutils/libgtextutils-0.6.1-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/l/libgtextutils/libgtextutils-0.6.1-goolf-1.7.20.eb
@@ -25,7 +25,7 @@ sources = [SOURCE_TAR_BZ2]
 source_urls = ['http://hannonlab.cshl.edu/fastx_toolkit']
 
 sanity_check_paths = {
-    'files': ['lib/libgtextutils.so', 'lib/libgtextutils.a'],
+    'files': ['lib/libgtextutils.%s' % SHLIB_EXT, 'lib/libgtextutils.a'],
     'dirs': ['lib/pkgconfig']
 }
 
diff --git a/easybuild/easyconfigs/l/libgtextutils/libgtextutils-0.6.1-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libgtextutils/libgtextutils-0.6.1-ictce-4.0.6.eb
index 0ac17949f1e06e594c65a1f7696d9ac5396a0214..ded865424087c822cb3419ebee3dd85fea33535f 100644
--- a/easybuild/easyconfigs/l/libgtextutils/libgtextutils-0.6.1-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/l/libgtextutils/libgtextutils-0.6.1-ictce-4.0.6.eb
@@ -25,8 +25,8 @@ sources = [SOURCE_TAR_BZ2]
 source_urls = ['http://hannonlab.cshl.edu/fastx_toolkit']
 
 sanity_check_paths = {
-                      'files': ['lib/libgtextutils.so', 'lib/libgtextutils.a'],
-                      'dirs': ['lib/pkgconfig']
-                     }
+    'files': ['lib/libgtextutils.%s' % SHLIB_EXT, 'lib/libgtextutils.a'],
+    'dirs': ['lib/pkgconfig']
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/l/libgtextutils/libgtextutils-0.6.1-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libgtextutils/libgtextutils-0.6.1-ictce-5.3.0.eb
index dc2903782e64c4fbf85fa66c16e6477575e858a3..7ff4a544d309a49e7440b3a1631d0dd78f6a2139 100644
--- a/easybuild/easyconfigs/l/libgtextutils/libgtextutils-0.6.1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libgtextutils/libgtextutils-0.6.1-ictce-5.3.0.eb
@@ -26,8 +26,8 @@ sources = [SOURCE_TAR_BZ2]
 source_urls = ['http://hannonlab.cshl.edu/fastx_toolkit']
 
 sanity_check_paths = {
-                      'files': ['lib/libgtextutils.so', 'lib/libgtextutils.a'],
-                      'dirs': ['lib/pkgconfig']
-                     }
+    'files': ['lib/libgtextutils.%s' % SHLIB_EXT, 'lib/libgtextutils.a'],
+    'dirs': ['lib/pkgconfig']
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/l/libgtextutils/libgtextutils-0.6.1-intel-2015a.eb b/easybuild/easyconfigs/l/libgtextutils/libgtextutils-0.6.1-intel-2015a.eb
index 16d490f92bf2bccaa322f74f12cf17471598c078..a911adbdf645ddb7e3fcbd05f9c5040fb1e5c2be 100644
--- a/easybuild/easyconfigs/l/libgtextutils/libgtextutils-0.6.1-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libgtextutils/libgtextutils-0.6.1-intel-2015a.eb
@@ -25,7 +25,7 @@ sources = [SOURCE_TAR_BZ2]
 source_urls = ['http://hannonlab.cshl.edu/fastx_toolkit']
 
 sanity_check_paths = {
-    'files': ['lib/libgtextutils.so', 'lib/libgtextutils.a'],
+    'files': ['lib/libgtextutils.%s' % SHLIB_EXT, 'lib/libgtextutils.a'],
     'dirs': ['lib/pkgconfig']
 }
 
diff --git a/easybuild/easyconfigs/l/libgtextutils/libgtextutils-0.7-foss-2015b.eb b/easybuild/easyconfigs/l/libgtextutils/libgtextutils-0.7-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..733d12d5e4b8358f6d61d678f3796b761baaac3e
--- /dev/null
+++ b/easybuild/easyconfigs/l/libgtextutils/libgtextutils-0.7-foss-2015b.eb
@@ -0,0 +1,32 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Cedric Laczny <cedric.laczny@uni.lu>, Fotis Georgatos <fotis@cern.ch>
+# 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 = 'ConfigureMake'
+
+name = 'libgtextutils'
+version = '0.7'
+
+homepage = 'http://hannonlab.cshl.edu/fastx_toolkit/'
+description = """ligtextutils is a dependency of fastx-toolkit and is provided via the same upstream"""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['https://github.com/agordon/libgtextutils/releases/download/%(version)s']
+sources = [SOURCE_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ['lib/libgtextutils.so', 'lib/libgtextutils.a'],
+    'dirs': ['lib/pkgconfig']
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libidn/libidn-1.32-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/l/libidn/libidn-1.32-GNU-4.9.3-2.25.eb
index f2f84be803f02327f3abf280b988da35fac3cdb6..7f81586dbbe14b113bd699ba71553c83e196f442 100644
--- a/easybuild/easyconfigs/l/libidn/libidn-1.32-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/l/libidn/libidn-1.32-GNU-4.9.3-2.25.eb
@@ -13,7 +13,7 @@ source_urls = [GNU_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 sanity_check_paths = {
-    'files': ['bin/idn', 'lib/libidn.so'],
+    'files': ['bin/idn', 'lib/libidn.%s' % SHLIB_EXT],
     'dirs': ['include'],
 }
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.3-intel-2015a.eb b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.3-intel-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e28f16cff6c3aedfb3731be4ae131774dafbe438
--- /dev/null
+++ b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.3-intel-2015a.eb
@@ -0,0 +1,26 @@
+easyblock = 'ConfigureMake'
+
+name = 'libpciaccess'
+version = '0.13.3'
+
+homepage = 'http://cgit.freedesktop.org/xorg/lib/libpciaccess/'
+description = """Generic PCI access library."""
+
+source_urls = ['http://cgit.freedesktop.org/xorg/lib/libpciaccess/snapshot']
+sources = [SOURCE_TAR_GZ]
+
+toolchain = {'name': 'intel', 'version': '2015a'}
+
+builddependencies = [
+    ('Autoconf', '2.69'),
+    ('xorg-macros', '1.19.0'),
+]
+
+preconfigopts = "ACLOCAL='aclocal -I $EBROOTXORGMINMACROS/share/aclocal' ./autogen.sh && "
+
+sanity_check_paths = {
+    'files': ['include/pciaccess.h', 'lib/libpciaccess.a'],
+    'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.5.13-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libpng/libpng-1.5.13-goalf-1.1.0-no-OFED.eb
index d8f3d31c2c98819cc680df7103c198d23e1f4171..9f8c965936b25419967bec34e05b8d9191683ee3 100644
--- a/easybuild/easyconfigs/l/libpng/libpng-1.5.13-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/l/libpng/libpng-1.5.13-goalf-1.1.0-no-OFED.eb
@@ -17,9 +17,9 @@ 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']
-                     }
+    'files': ['bin/libpng-config', 'lib/libpng.a', 'lib/libpng.%s' % SHLIB_EXT,
+              'lib/pkgconfig/libpng.pc'],
+    'dirs': ['include']
+}
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.5.13-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libpng/libpng-1.5.13-goolf-1.4.10.eb
index 848af67ab2b8d9dcaa9a3a54d6683d268fda0a00..026279ea98cb4f2ef2244f5a4b9961c6b6b18002 100644
--- a/easybuild/easyconfigs/l/libpng/libpng-1.5.13-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libpng/libpng-1.5.13-goolf-1.4.10.eb
@@ -16,9 +16,9 @@ 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']
-                     }
+    'files': ['bin/libpng-config', 'lib/libpng.a', 'lib/libpng.%s' % SHLIB_EXT,
+              'lib/pkgconfig/libpng.pc'],
+    'dirs': ['include']
+}
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.5.13-ictce-4.0.10.eb b/easybuild/easyconfigs/l/libpng/libpng-1.5.13-ictce-4.0.10.eb
index 79eddf253709fb24b4f79e6222f1c066c2aa5442..3869d59df91ef2c0d2b3f370e780cd75a3e4d22f 100644
--- a/easybuild/easyconfigs/l/libpng/libpng-1.5.13-ictce-4.0.10.eb
+++ b/easybuild/easyconfigs/l/libpng/libpng-1.5.13-ictce-4.0.10.eb
@@ -17,9 +17,9 @@ 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']
-                     }
+    'files': ['bin/libpng-config', 'lib/libpng.a', 'lib/libpng.%s' % SHLIB_EXT,
+              'lib/pkgconfig/libpng.pc'],
+    'dirs': ['include']
+}
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.5.13-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libpng/libpng-1.5.13-ictce-4.0.6.eb
index fbcb722f706725d4250b72cf5134ecf45d816544..4375a4e72529a2c07a9133b4db3c05e6cac02842 100644
--- a/easybuild/easyconfigs/l/libpng/libpng-1.5.13-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/l/libpng/libpng-1.5.13-ictce-4.0.6.eb
@@ -17,9 +17,9 @@ 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']
-                     }
+    'files': ['bin/libpng-config', 'lib/libpng.a', 'lib/libpng.%s' % SHLIB_EXT,
+              'lib/pkgconfig/libpng.pc'],
+    'dirs': ['include']
+}
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.5.13-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libpng/libpng-1.5.13-ictce-4.1.13.eb
index cf81907b250b69ddb944532abdaaa5d5bb6b7b0c..0d7b0e835c18832a842cf50ca77d9060538d6095 100644
--- a/easybuild/easyconfigs/l/libpng/libpng-1.5.13-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libpng/libpng-1.5.13-ictce-4.1.13.eb
@@ -17,9 +17,9 @@ 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']
-                     }
+    'files': ['bin/libpng-config', 'lib/libpng.a', 'lib/libpng.%s' % SHLIB_EXT,
+              'lib/pkgconfig/libpng.pc'],
+    'dirs': ['include']
+}
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.5.13-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libpng/libpng-1.5.13-ictce-5.3.0.eb
index 615cbae8c64f36fd231d60b7e2390d2b8a3c3004..b67cbf0ac01d47ebc079225a09bd5e00c3d18a0e 100644
--- a/easybuild/easyconfigs/l/libpng/libpng-1.5.13-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libpng/libpng-1.5.13-ictce-5.3.0.eb
@@ -17,9 +17,9 @@ 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']
-                     }
+    'files': ['bin/libpng-config', 'lib/libpng.a', 'lib/libpng.%s' % SHLIB_EXT,
+              'lib/pkgconfig/libpng.pc'],
+    'dirs': ['include']
+}
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.5.14-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libpng/libpng-1.5.14-goalf-1.1.0-no-OFED.eb
index 3b118ba80640b1fb53f3dec25aed3df4b429a66b..75db89f06cf8f0baa6788d7770f73c269917d960 100644
--- a/easybuild/easyconfigs/l/libpng/libpng-1.5.14-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/l/libpng/libpng-1.5.14-goalf-1.1.0-no-OFED.eb
@@ -17,7 +17,7 @@ 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'],
+    'files': ['bin/libpng-config', 'lib/libpng.a', 'lib/libpng.%s' % SHLIB_EXT, 'lib/pkgconfig/libpng.pc'],
     'dirs': ['include'],
 }
 
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.5.14-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libpng/libpng-1.5.14-goolf-1.4.10.eb
index 9e16b44ccb5594b11d9e0dd6410b1461e3f233e6..9c74dd0a4a5dfeed63dbc88271bd14f1c34da613 100644
--- a/easybuild/easyconfigs/l/libpng/libpng-1.5.14-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libpng/libpng-1.5.14-goolf-1.4.10.eb
@@ -17,7 +17,7 @@ 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'],
+    'files': ['bin/libpng-config', 'lib/libpng.a', 'lib/libpng.%s' % SHLIB_EXT, 'lib/pkgconfig/libpng.pc'],
     'dirs': ['include'],
 }
 
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.5.14-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/l/libpng/libpng-1.5.14-ictce-3.2.2.u3.eb
index c67d2249d57513b5c5c1540e2d951a6b73847619..0e161c68b9639a28b3df2f1443732b99af948bd7 100644
--- a/easybuild/easyconfigs/l/libpng/libpng-1.5.14-ictce-3.2.2.u3.eb
+++ b/easybuild/easyconfigs/l/libpng/libpng-1.5.14-ictce-3.2.2.u3.eb
@@ -17,7 +17,7 @@ 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'],
+    'files': ['bin/libpng-config', 'lib/libpng.a', 'lib/libpng.%s' % SHLIB_EXT, 'lib/pkgconfig/libpng.pc'],
     'dirs': ['include'],
 }
 
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.5.14-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libpng/libpng-1.5.14-ictce-4.1.13.eb
index dfc6f1d8048cf2347d5388364647c496ed60c2c6..3e3a08adaacbcb381d6520374566e43f8053132d 100644
--- a/easybuild/easyconfigs/l/libpng/libpng-1.5.14-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libpng/libpng-1.5.14-ictce-4.1.13.eb
@@ -17,7 +17,7 @@ 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'],
+    'files': ['bin/libpng-config', 'lib/libpng.a', 'lib/libpng.%s' % SHLIB_EXT, 'lib/pkgconfig/libpng.pc'],
     'dirs': ['include'],
 }
 
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
index 93ce285e5484d89ca93d10073b112f83c3bfc9e2..6aeef2a9a29abc41b1c83711bd97eb957bbd5d94 100644
--- 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
@@ -17,7 +17,7 @@ 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'],
+    'files': ['bin/libpng-config', 'lib/libpng.a', 'lib/libpng.%s' % SHLIB_EXT, 'lib/pkgconfig/libpng.pc'],
     'dirs': ['include'],
 }
 
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.5.14-iqacml-3.7.3.eb b/easybuild/easyconfigs/l/libpng/libpng-1.5.14-iqacml-3.7.3.eb
index a7a887af098e64dd4c44c3fc3f37d8646b3ca6a2..83d95fbd12cd19a36daa2c8141a6e095459c2b72 100644
--- a/easybuild/easyconfigs/l/libpng/libpng-1.5.14-iqacml-3.7.3.eb
+++ b/easybuild/easyconfigs/l/libpng/libpng-1.5.14-iqacml-3.7.3.eb
@@ -17,7 +17,7 @@ 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'],
+    'files': ['bin/libpng-config', 'lib/libpng.a', 'lib/libpng.%s' % SHLIB_EXT, 'lib/pkgconfig/libpng.pc'],
     'dirs': ['include'],
 }
 
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.6.21-intel-2016a.eb b/easybuild/easyconfigs/l/libpng/libpng-1.6.21-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7ea89634eb146ce48a48a7ffc1cdacd97e85d282
--- /dev/null
+++ b/easybuild/easyconfigs/l/libpng/libpng-1.6.21-intel-2016a.eb
@@ -0,0 +1,26 @@
+easyblock = 'ConfigureMake'
+
+name = 'libpng'
+version = '1.6.21'
+
+homepage = 'http://www.libpng.org/pub/png/libpng.html'
+description = "libpng is the official PNG reference library"
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('zlib', '1.2.8')]
+
+configopts = "--with-pic"
+
+majminver = ''.join(version.split('.')[:2])
+sanity_check_paths = {
+    'files': ['include/pngconf.h', 'include/png.h', 'include/pnglibconf.h', 'lib/libpng.a',
+              'lib/libpng.%s' % SHLIB_EXT, 'lib/libpng%s.a' % majminver, 'lib/libpng%s.%s' %(majminver, SHLIB_EXT)],
+    'dirs': ['bin', 'include/libpng%s' % majminver, 'share/man'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-goalf-1.1.0-no-OFED.eb
index f829f915ab6597136901000c734dc83d981a6a43..9739f76ef1f2a4ab0b1711e06dbf3da52d820198 100644
--- a/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-goalf-1.1.0-no-OFED.eb
@@ -14,7 +14,7 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
 sanity_check_paths = {
                       'files' : ['lib/pkgconfig/pthread-stubs.pc'],
-                      'dirs': [] 
+                      'dirs': []
                      }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-goolf-1.4.10.eb
index 1b25208919d5b1d5a6427f76cd979908683ad8e6..1a74d61a74a330bb66e29e6483b2d43664bb3d78 100644
--- a/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-goolf-1.4.10.eb
@@ -13,7 +13,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sanity_check_paths = {
                       'files' : ['lib/pkgconfig/pthread-stubs.pc'],
-                      'dirs': [] 
+                      'dirs': []
                      }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-ictce-4.0.6.eb
index 9f980a8c825637ab625cecdac48d3ae7fee1c24e..f71c39521be9e1639fac2a5fe441b494ad5f9130 100644
--- a/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-ictce-4.0.6.eb
@@ -14,7 +14,7 @@ toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
 sanity_check_paths = {
                       'files' : ['lib/pkgconfig/pthread-stubs.pc'],
-                      'dirs': [] 
+                      'dirs': []
                      }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-ictce-5.3.0.eb
index 1c780648c6cb3a3d8ed1ef54650a2b11fb87fa5a..8789568941c8f1517a72dab0b0d6da78360cad23 100644
--- a/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-ictce-5.3.0.eb
@@ -15,7 +15,7 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 sanity_check_paths = {
                       'files' : ['lib/pkgconfig/pthread-stubs.pc'],
-                      'dirs': [] 
+                      'dirs': []
                      }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GCCcore-4.9.3.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GCCcore-4.9.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3c101707a6e69abe030dc75727769ea039a52c6b
--- /dev/null
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GCCcore-4.9.3.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'libreadline'
+version = '6.3'
+
+homepage = 'http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html'
+description = """The GNU Readline library provides a set of functions for use by applications that
+ allow users to edit command lines as they are typed in. Both Emacs and vi editing modes are available.
+ The Readline library includes additional functions to maintain a list of previously-entered command lines,
+ to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands."""
+
+toolchain = {'name': 'GCCcore', 'version': '4.9.3'}
+toolchainopts = {'pic': True}
+
+sources = ['readline-%(version)s.tar.gz']
+source_urls = ['http://ftp.gnu.org/gnu/readline']
+
+builddependencies = [('binutils', '2.25')]
+dependencies = [('ncurses', '6.0')]
+
+# for the termcap symbols, use EB ncurses
+preconfigopts = "LDFLAGS='-lncurses'"
+
+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': [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2016a.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4d15c99139f4eb76a0b9de8678b640960f4bd348
--- /dev/null
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2016a.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'libreadline'
+version = '6.3'
+
+homepage = 'http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html'
+description = """The GNU Readline library provides a set of functions for use by applications that
+ allow users to edit command lines as they are typed in. Both Emacs and vi editing modes are available.
+ The Readline library includes additional functions to maintain a list of previously-entered command lines,
+ to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+sources = ['readline-%(version)s.tar.gz']
+source_urls = ['http://ftp.gnu.org/gnu/readline']
+
+dependencies = [('ncurses', '6.0')]
+
+# for the termcap symbols, use EB ncurses
+preconfigopts = "LDFLAGS='-lncurses'"
+
+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' : [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2016a.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..555538dfd5adf8ea7aff09f545cd7afa3754043e
--- /dev/null
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2016a.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'libreadline'
+version = '6.3'
+
+homepage = 'http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html'
+description = """The GNU Readline library provides a set of functions for use by applications that
+ allow users to edit command lines as they are typed in. Both Emacs and vi editing modes are available.
+ The Readline library includes additional functions to maintain a list of previously-entered command lines,
+ to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+sources = ['readline-%(version)s.tar.gz']
+source_urls = ['http://ftp.gnu.org/gnu/readline']
+
+dependencies = [('ncurses', '6.0')]
+
+# for the termcap symbols, use EB ncurses
+preconfigopts = "LDFLAGS='-lncurses'"
+
+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' : [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libsigc++/libsigc++-2.4.1-intel-2015a.eb b/easybuild/easyconfigs/l/libsigc++/libsigc++-2.4.1-intel-2015a.eb
index f4b4e3a392d224afe9554a8242b924484fe297ce..e04102662d77df9ec738c821fffa5cb536be3fc8 100644
--- a/easybuild/easyconfigs/l/libsigc++/libsigc++-2.4.1-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libsigc++/libsigc++-2.4.1-intel-2015a.eb
@@ -13,8 +13,8 @@ source_urls = ['http://ftp.gnome.org/pub/gnome/sources/%(name)s/%(version_major_
 sources = ['%(namelower)s-%(version)s.tar.xz']
 
 sanity_check_paths = {
-	'files': ['lib/libsigc-2.0.so'],
-        'dirs': [],
+    'files': ['lib/libsigc-2.0.%s' % SHLIB_EXT],
+    'dirs': [],
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/l/libsigc++/libsigc++-2.4.1-intel-2015b.eb b/easybuild/easyconfigs/l/libsigc++/libsigc++-2.4.1-intel-2015b.eb
index 5511462c101c04cb4060bcbd4604261885282002..0a9130740bc419ebb3de9f6902977a67c2c677f5 100644
--- a/easybuild/easyconfigs/l/libsigc++/libsigc++-2.4.1-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libsigc++/libsigc++-2.4.1-intel-2015b.eb
@@ -13,7 +13,7 @@ source_urls = ['http://ftp.gnome.org/pub/gnome/sources/%(name)s/%(version_major_
 sources = ['%(namelower)s-%(version)s.tar.xz']
 
 sanity_check_paths = {
-	'files': ['lib/libsigc-2.0.so'],
+    'files': ['lib/libsigc-2.0.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/l/libsodium/libsodium-1.0.3-intel-2015a.eb b/easybuild/easyconfigs/l/libsodium/libsodium-1.0.3-intel-2015a.eb
index 761355fc9f515a8aabebf8582db27bb77d24f5a1..7c1505061ba59e50f8594777d3f8eb116a90b715 100644
--- a/easybuild/easyconfigs/l/libsodium/libsodium-1.0.3-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libsodium/libsodium-1.0.3-intel-2015a.eb
@@ -13,7 +13,7 @@ source_urls = ['https://download.libsodium.org/libsodium/releases/']
 sources = [SOURCE_TAR_GZ]
 
 sanity_check_paths = {
-    'files': ['include/sodium.h', 'lib/libsodium.so', 'lib/libsodium.a'],
+    'files': ['include/sodium.h', 'lib/libsodium.%s' % SHLIB_EXT, 'lib/libsodium.a'],
     'dirs': ['include/sodium', 'lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/l/libsodium/libsodium-1.0.6-intel-2015b.eb b/easybuild/easyconfigs/l/libsodium/libsodium-1.0.6-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..67aa99e29a41c2512f1792a193ef84b4f21c7399
--- /dev/null
+++ b/easybuild/easyconfigs/l/libsodium/libsodium-1.0.6-intel-2015b.eb
@@ -0,0 +1,20 @@
+easyblock = 'ConfigureMake'
+
+name = 'libsodium'
+version = '1.0.6'
+
+homepage = 'http://doc.libsodium.org/'
+description = """Sodium is a modern, easy-to-use software library for encryption, decryption, signatures,
+ password hashing and more."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = ['https://download.libsodium.org/libsodium/releases/']
+sources = [SOURCE_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ['include/sodium.h', 'lib/libsodium.so', 'lib/libsodium.a'],
+    'dirs': ['include/sodium', 'lib/pkgconfig'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.2-GCC-4.9.2.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.2-GCC-4.9.2.eb
index fdeaf140c10ba4cd30da4cce5f01094e9477178c..a0d2e1edbd2f555fd2f1db59593de5620e12c409 100644
--- a/easybuild/easyconfigs/l/libtool/libtool-2.4.2-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.2-GCC-4.9.2.eb
@@ -7,7 +7,7 @@ homepage = 'http://www.gnu.org/software/libtool'
 description = """GNU libtool is a generic library support script. Libtool hides the complexity of using shared libraries
  behind a consistent, portable interface."""
 
-toolchain = {'name': 'GCC', 'version': '4.9.2'} 
+toolchain = {'name': 'GCC', 'version': '4.9.2'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.5-GCC-4.9.2.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.5-GCC-4.9.2.eb
index a0c6a258a8085acd0019ae315d17dde3d1611a56..51c79ac40abd2506909c7db616abae7c2c094d1b 100644
--- a/easybuild/easyconfigs/l/libtool/libtool-2.4.5-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.5-GCC-4.9.2.eb
@@ -7,7 +7,7 @@ homepage = 'http://www.gnu.org/software/libtool'
 description = """GNU libtool is a generic library support script. Libtool hides the complexity of using shared libraries
  behind a consistent, portable interface."""
 
-toolchain = {'name': 'GCC', 'version': '4.9.2'} 
+toolchain = {'name': 'GCC', 'version': '4.9.2'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.5-intel-2015a.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.5-intel-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..dd9022e00e809937946f7665c83329ee95573c10
--- /dev/null
+++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.5-intel-2015a.eb
@@ -0,0 +1,17 @@
+easyblock = 'ConfigureMake'
+
+name = 'libtool'
+version = '2.4.5'
+
+homepage = 'http://www.gnu.org/software/libtool'
+description = """GNU libtool is a generic library support script. Libtool hides the complexity of using shared libraries
+ behind a consistent, portable interface."""
+
+toolchain = {'name': 'intel', 'version': '2015a'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+dependencies = [('M4', '1.4.17')]
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GCC-4.7.2.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GCC-4.7.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..81c5e4cf653a881aef879641aa947f33721d288d
--- /dev/null
+++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GCC-4.7.2.eb
@@ -0,0 +1,17 @@
+easyblock = 'ConfigureMake'
+
+name = 'libtool'
+version = '2.4.6'
+
+homepage = 'http://www.gnu.org/software/libtool'
+description = """GNU libtool is a generic library support script. Libtool hides the complexity of using shared libraries
+ behind a consistent, portable interface."""
+
+toolchain = {'name': 'GCC', 'version': '4.7.2'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+dependencies = [('M4', '1.4.16')]
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GCC-4.8.4.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GCC-4.8.4.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e93fcc4049b2bfebc254c1e29457c40d010d4d16
--- /dev/null
+++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GCC-4.8.4.eb
@@ -0,0 +1,17 @@
+easyblock = 'ConfigureMake'
+
+name = 'libtool'
+version = '2.4.6'
+
+homepage = 'http://www.gnu.org/software/libtool'
+description = """GNU libtool is a generic library support script. Libtool hides the complexity of using shared libraries
+ behind a consistent, portable interface."""
+
+toolchain = {'name': 'GCC', 'version': '4.8.4'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+dependencies = [('M4', '1.4.17')]
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d4e8dd2add9349a11977ffdcd5195d9894b1c5d7
--- /dev/null
+++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GCC-4.9.3-2.25.eb
@@ -0,0 +1,17 @@
+easyblock = 'ConfigureMake'
+
+name = 'libtool'
+version = '2.4.6'
+
+homepage = 'http://www.gnu.org/software/libtool'
+description = """GNU libtool is a generic library support script. Libtool hides the complexity of using shared libraries
+ behind a consistent, portable interface."""
+
+toolchain = {'name': 'GCC', 'version': '4.9.3-2.25'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+dependencies = [('M4', '1.4.17')]
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GNU-4.9.2-2.25.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GNU-4.9.2-2.25.eb
index f29d89e1c6f27074975fbcf3d6237f7ba5adeab4..6daa86f14ecdc648f966099325e719b2833b80b6 100644
--- a/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GNU-4.9.2-2.25.eb
+++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GNU-4.9.2-2.25.eb
@@ -7,7 +7,7 @@ homepage = 'http://www.gnu.org/software/libtool'
 description = """GNU libtool is a generic library support script. Libtool hides the complexity of using shared libraries
  behind a consistent, portable interface."""
 
-toolchain = {'name': 'GNU', 'version': '4.9.2-2.25'} 
+toolchain = {'name': 'GNU', 'version': '4.9.2-2.25'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GNU-4.9.3-2.25.eb
index 99efd1e796649386114cc5847624d00d32ca5cb7..714310160567468310e77cc7d0e897df21673f51 100644
--- a/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GNU-4.9.3-2.25.eb
@@ -7,7 +7,7 @@ homepage = 'http://www.gnu.org/software/libtool'
 description = """GNU libtool is a generic library support script. Libtool hides the complexity of using shared libraries
  behind a consistent, portable interface."""
 
-toolchain = {'name': 'GNU', 'version': '4.9.3-2.25'} 
+toolchain = {'name': 'GNU', 'version': '4.9.3-2.25'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GNU-5.1.0-2.25.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GNU-5.1.0-2.25.eb
index 33c6f3867ed98f6470bff34307768d7b5e142edf..290aa77f300336ecb32a66c6bcaba32a84a9d883 100644
--- a/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GNU-5.1.0-2.25.eb
+++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GNU-5.1.0-2.25.eb
@@ -7,7 +7,7 @@ homepage = 'http://www.gnu.org/software/libtool'
 description = """GNU libtool is a generic library support script. Libtool hides the complexity of using shared libraries
  behind a consistent, portable interface."""
 
-toolchain = {'name': 'GNU', 'version': '5.1.0-2.25'} 
+toolchain = {'name': 'GNU', 'version': '5.1.0-2.25'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.6-foss-2015a.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.6-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d420dbd013213537a4479097c0e37ed756b556cc
--- /dev/null
+++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.6-foss-2015a.eb
@@ -0,0 +1,17 @@
+easyblock = 'ConfigureMake'
+
+name = 'libtool'
+version = '2.4.6'
+
+homepage = 'http://www.gnu.org/software/libtool'
+description = """GNU libtool is a generic library support script. Libtool hides the complexity of using shared libraries
+ behind a consistent, portable interface."""
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+dependencies = [('M4', '1.4.17')]
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.6-foss-2016a.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.6-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d14a6fa24feb54cd4deaf85c34ad3240698ebc83
--- /dev/null
+++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.6-foss-2016a.eb
@@ -0,0 +1,17 @@
+easyblock = 'ConfigureMake'
+
+name = 'libtool'
+version = '2.4.6'
+
+homepage = 'http://www.gnu.org/software/libtool'
+description = """GNU libtool is a generic library support script. Libtool hides the complexity of using shared libraries
+ behind a consistent, portable interface."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+dependencies = [('M4', '1.4.17')]
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.6-intel-2015b.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.6-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f1364b279c59171ea9ffff0d1f0af0279bec94e6
--- /dev/null
+++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.6-intel-2015b.eb
@@ -0,0 +1,17 @@
+easyblock = 'ConfigureMake'
+
+name = 'libtool'
+version = '2.4.6'
+
+homepage = 'http://www.gnu.org/software/libtool'
+description = """GNU libtool is a generic library support script. Libtool hides the complexity of using shared libraries
+ behind a consistent, portable interface."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+dependencies = [('M4', '1.4.17')]
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.6-intel-2016a.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.6-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f2ac301f5612bed35ba3a4a21c3ae8b5e5645c9d
--- /dev/null
+++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.6-intel-2016a.eb
@@ -0,0 +1,17 @@
+easyblock = 'ConfigureMake'
+
+name = 'libtool'
+version = '2.4.6'
+
+homepage = 'http://www.gnu.org/software/libtool'
+description = """GNU libtool is a generic library support script. Libtool hides the complexity of using shared libraries
+ behind a consistent, portable interface."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+dependencies = [('M4', '1.4.17')]
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.6.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.6.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3533b0aa04e32f52329597d92f786486d9b08e28
--- /dev/null
+++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.6.eb
@@ -0,0 +1,17 @@
+easyblock = 'ConfigureMake'
+
+name = 'libtool'
+version = '2.4.6'
+
+homepage = 'http://www.gnu.org/software/libtool'
+description = """GNU libtool is a generic library support script. Libtool hides the complexity of using shared libraries
+ behind a consistent, portable interface."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+dependencies = [('M4', '1.4.17')]
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-GNU-4.9.3-2.25.eb
index 4655c23d9d7f4c5088d8d31aab0b735070917bd1..9c592ae30c09316c09c24d7a9f1bbd490cb43a12 100644
--- a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-GNU-4.9.3-2.25.eb
@@ -15,7 +15,7 @@ source_urls = [GNU_SOURCE]
 parallel = 1
 
 sanity_check_paths = {
-    'files' : ['lib/libunistring.a', 'lib/libunistring.so'] +
+    'files' : ['lib/libunistring.a', 'lib/libunistring.%s' % SHLIB_EXT] +
               ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm',
                                                'stdio', 'str', 'types', 'wbrk', 'width']],
     'dirs' : ['include/unistring'],
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 19cf71b9a1bc1bf08127dd31caf72fb85fa27777..533de6991222572f2f67b742fd7ab5688b15c939 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
@@ -15,7 +15,7 @@ source_urls = [GNU_SOURCE]
 parallel = 1
 
 sanity_check_paths = {
-    'files' : ['lib/libunistring.a', 'lib/libunistring.so'] +
+    'files' : ['lib/libunistring.a', 'lib/libunistring.%s' % SHLIB_EXT] +
               ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm',
                                                'stdio', 'str', 'types', 'wbrk', 'width']],
     'dirs' : ['include/unistring'],
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 3370c05aa0bd38dfa218db8cee55ac087faaa155..31485301e10ce118d6570207d570c66e160cebe3 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
@@ -14,7 +14,7 @@ source_urls = [GNU_SOURCE]
 parallel = 1
 
 sanity_check_paths = {
-    'files' : ['lib/libunistring.a', 'lib/libunistring.so'] +
+    'files' : ['lib/libunistring.a', 'lib/libunistring.%s' % SHLIB_EXT] +
               ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm',
                                                'stdio', 'str', 'types', 'wbrk', 'width']],
     'dirs' : ['include/unistring'],
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 745c60d166a3a7cc2bb065b8e8ead08d18a296b3..18d1b4326678c555089d871ad4c4df4981637fb6 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
@@ -17,7 +17,7 @@ patches = ['libunistring_icc_builtin_nan-inf.patch']
 parallel = 1
 
 sanity_check_paths = {
-    'files' : ['lib/libunistring.a', 'lib/libunistring.so'] +
+    'files' : ['lib/libunistring.a', 'lib/libunistring.%s' % SHLIB_EXT] +
               ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm',
                                                'stdio', 'str', 'types', 'wbrk', 'width']],
     'dirs' : ['include/unistring'],
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 453aa477598449377400cce807e67d09605fe484..a07834afed603991052d1cdd8cf3bba76ed97bd3 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
@@ -17,7 +17,7 @@ patches = ['libunistring_icc_builtin_nan-inf.patch']
 parallel = 1
 
 sanity_check_paths = {
-    'files' : ['lib/libunistring.a', 'lib/libunistring.so'] +
+    'files' : ['lib/libunistring.a', 'lib/libunistring.%s' % SHLIB_EXT] +
               ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm',
                                                'stdio', 'str', 'types', 'wbrk', 'width']],
     'dirs' : ['include/unistring'],
diff --git a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-intel-2015a.eb b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-intel-2015a.eb
index 1f2a2690da535fa0bb059d1019dac58cefc2991c..088b49a64a83bc53c182428cae7d739d262e9a83 100644
--- a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-intel-2015a.eb
@@ -17,7 +17,7 @@ patches = ['libunistring_icc_builtin_nan-inf.patch']
 parallel = 1
 
 sanity_check_paths = {
-    'files' : ['lib/libunistring.a', 'lib/libunistring.so'] +
+    'files' : ['lib/libunistring.a', 'lib/libunistring.%s' % SHLIB_EXT] +
               ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm',
                                                'stdio', 'str', 'types', 'wbrk', 'width']],
     'dirs' : ['include/unistring'],
diff --git a/easybuild/easyconfigs/l/libxc/libxc-2.0.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libxc/libxc-2.0.1-goalf-1.1.0-no-OFED.eb
index 6d8ba273cc85cf316db5f1961ac898fa8f4de066..64c0ffe76da87a89ff928ab05375035b7b9bc30e 100644
--- a/easybuild/easyconfigs/l/libxc/libxc-2.0.1-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/l/libxc/libxc-2.0.1-goalf-1.1.0-no-OFED.eb
@@ -25,7 +25,7 @@ configopts = 'FC="$F77" FCFLAGS="$FFLAGS" --enable-shared'
 patches = ['libxc-%(version)s-fix-initialization.patch']
 
 sanity_check_paths = {
-    'files': ['lib/libxc.a', 'lib/libxc.so'],
+    'files': ['lib/libxc.a', 'lib/libxc.%s' % SHLIB_EXT],
     'dirs': ['include'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxc/libxc-2.0.1-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libxc/libxc-2.0.1-goolf-1.4.10.eb
index 527700c8cfec3dace2efcfceb3769ced4ab940f4..f0bcc7d4a6d7bbb82af2152f340e27e1b7df81a9 100644
--- a/easybuild/easyconfigs/l/libxc/libxc-2.0.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libxc/libxc-2.0.1-goolf-1.4.10.eb
@@ -25,7 +25,7 @@ configopts = 'FC="$F77" FCFLAGS="$FFLAGS" --enable-shared'
 patches = ['libxc-%(version)s-fix-initialization.patch']
 
 sanity_check_paths = {
-    'files': ['lib/libxc.a', 'lib/libxc.so'],
+    'files': ['lib/libxc.a', 'lib/libxc.%s' % SHLIB_EXT],
     'dirs': ['include'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxc/libxc-2.0.1-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libxc/libxc-2.0.1-ictce-4.1.13.eb
index 75f790529979383a3972715663bb746174725265..add9d8667df2d9d9fec10f3a2dcdad7a60ee6bd6 100644
--- a/easybuild/easyconfigs/l/libxc/libxc-2.0.1-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libxc/libxc-2.0.1-ictce-4.1.13.eb
@@ -25,7 +25,7 @@ configopts = 'FC="$F77" FCFLAGS="$FFLAGS" --enable-shared'
 patches = ['libxc-%(version)s-fix-initialization.patch']
 
 sanity_check_paths = {
-    'files': ['lib/libxc.a', 'lib/libxc.so'],
+    'files': ['lib/libxc.a', 'lib/libxc.%s' % SHLIB_EXT],
     'dirs': ['include'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxc/libxc-2.0.1-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libxc/libxc-2.0.1-ictce-5.3.0.eb
index 16b3b342945be71d910b26625af28022e5cc725b..f7564e13c2676fa45f5b62a03f5d607f53c979bb 100644
--- a/easybuild/easyconfigs/l/libxc/libxc-2.0.1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libxc/libxc-2.0.1-ictce-5.3.0.eb
@@ -25,7 +25,7 @@ configopts = 'FC="$F77" FCFLAGS="$FFLAGS" --enable-shared'
 patches = ['libxc-%(version)s-fix-initialization.patch']
 
 sanity_check_paths = {
-    'files': ['lib/libxc.a', 'lib/libxc.so'],
+    'files': ['lib/libxc.a', 'lib/libxc.%s' % SHLIB_EXT],
     'dirs': ['include'],
 }
 
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
index 67b912636d604431949a6930df2bf68308cefb5c..02c561f8498eb1efbb5af5df19f86e1b9efef817 100644
--- 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
@@ -23,7 +23,7 @@ configopts = 'FC="$F77" FCFLAGS="$FFLAGS" FCCPP="$F77 -E" --enable-shared'
 #runtest = 'check'
 
 sanity_check_paths = {
-    'files': ['lib/libxc.a', 'lib/libxc.so'],
+    'files': ['lib/libxc.a', 'lib/libxc.%s' % SHLIB_EXT],
     'dirs': ['include'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxc/libxc-2.0.1-intel-2014b.eb b/easybuild/easyconfigs/l/libxc/libxc-2.0.1-intel-2014b.eb
index d8bcb279887b19734bb7ed44c76b9651c29cd273..8276d5a07e336ce48c6f5d25267a921f68590f05 100644
--- a/easybuild/easyconfigs/l/libxc/libxc-2.0.1-intel-2014b.eb
+++ b/easybuild/easyconfigs/l/libxc/libxc-2.0.1-intel-2014b.eb
@@ -23,7 +23,7 @@ configopts = 'FC="$F77" FCFLAGS="$FFLAGS" FCCPP="$F77 -E" --enable-shared'
 #runtest = 'check'
 
 sanity_check_paths = {
-    'files': ['lib/libxc.a', 'lib/libxc.so'],
+    'files': ['lib/libxc.a', 'lib/libxc.%s' % SHLIB_EXT],
     'dirs': ['include'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxc/libxc-2.0.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libxc/libxc-2.0.2-goalf-1.1.0-no-OFED.eb
index cb5559a2e4934e19db1df7f86815522432276532..af430902a8004f77dd72f16228f3b855b182637d 100644
--- a/easybuild/easyconfigs/l/libxc/libxc-2.0.2-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/l/libxc/libxc-2.0.2-goalf-1.1.0-no-OFED.eb
@@ -23,7 +23,7 @@ configopts = 'FC="$F77" FCFLAGS="$FFLAGS" FCCPP="/lib/cpp -ansi" --enable-shared
 #runtest = 'check'
 
 sanity_check_paths = {
-    'files': ['lib/libxc.a', 'lib/libxc.so'],
+    'files': ['lib/libxc.a', 'lib/libxc.%s' % SHLIB_EXT],
     'dirs': ['include'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxc/libxc-2.0.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libxc/libxc-2.0.2-goolf-1.4.10.eb
index 33d403016122fda035151da5d0ed7b674bcd2a0f..0bf711caf0e7a9f6e2038fa8e5e6c7b3a54a71e4 100644
--- a/easybuild/easyconfigs/l/libxc/libxc-2.0.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libxc/libxc-2.0.2-goolf-1.4.10.eb
@@ -23,7 +23,7 @@ configopts = 'FC="$F77" FCFLAGS="$FFLAGS" FCCPP="/lib/cpp -ansi" --enable-shared
 #runtest = 'check'
 
 sanity_check_paths = {
-    'files': ['lib/libxc.a', 'lib/libxc.so'],
+    'files': ['lib/libxc.a', 'lib/libxc.%s' % SHLIB_EXT],
     'dirs': ['include'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxc/libxc-2.0.2-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libxc/libxc-2.0.2-ictce-4.1.13.eb
index 58b1cd150354b5bac212c27d4b1713daf4aa5a7c..5b57d2fd2430fee72e604efe5993e955cee3ff31 100644
--- a/easybuild/easyconfigs/l/libxc/libxc-2.0.2-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libxc/libxc-2.0.2-ictce-4.1.13.eb
@@ -23,7 +23,7 @@ configopts = 'FC="$F77" FCFLAGS="$FFLAGS" --enable-shared'
 #runtest = 'check'
 
 sanity_check_paths = {
-    'files': ['lib/libxc.a', 'lib/libxc.so'],
+    'files': ['lib/libxc.a', 'lib/libxc.%s' % SHLIB_EXT],
     'dirs': ['include'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxc/libxc-2.0.2-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libxc/libxc-2.0.2-ictce-5.3.0.eb
index b055ba4333e08b8bed4eced8aa793eeb50e47c61..f008d8268a33f100b0b5237fdf818f8fd00a4a3a 100644
--- a/easybuild/easyconfigs/l/libxc/libxc-2.0.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libxc/libxc-2.0.2-ictce-5.3.0.eb
@@ -23,7 +23,7 @@ configopts = 'FC="$F77" FCFLAGS="$FFLAGS" --enable-shared  --enable-fortran'
 #runtest = 'check'
 
 sanity_check_paths = {
-    'files': ['lib/libxc.a', 'lib/libxc.so'],
+    'files': ['lib/libxc.a', 'lib/libxc.%s' % SHLIB_EXT],
     'dirs': ['include'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxc/libxc-2.0.3-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libxc/libxc-2.0.3-goolf-1.4.10.eb
index 119c74e739c6c636f3c068149ed8b297bb8f50ec..c631b87e66aa68755afaed3cb36cfd0eeb8d8978 100644
--- a/easybuild/easyconfigs/l/libxc/libxc-2.0.3-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libxc/libxc-2.0.3-goolf-1.4.10.eb
@@ -23,7 +23,7 @@ configopts = 'FC="$F77" FCFLAGS="$FFLAGS" FCCPP="/lib/cpp -ansi" --enable-shared
 #runtest = 'check'
 
 sanity_check_paths = {
-    'files': ['lib/libxc.a', 'lib/libxc.so'],
+    'files': ['lib/libxc.a', 'lib/libxc.%s' % SHLIB_EXT],
     'dirs': ['include'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxc/libxc-2.0.3-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libxc/libxc-2.0.3-ictce-4.1.13.eb
index 64b37d779cb76456927e384a41b24b866d72a651..04a43645113c9579a998d7bb001d1683fe1f9cc4 100644
--- a/easybuild/easyconfigs/l/libxc/libxc-2.0.3-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libxc/libxc-2.0.3-ictce-4.1.13.eb
@@ -23,7 +23,7 @@ configopts = 'FC="$F77" FCFLAGS="$FFLAGS" --enable-shared'
 #runtest = 'check'
 
 sanity_check_paths = {
-    'files': ['lib/libxc.a', 'lib/libxc.so'],
+    'files': ['lib/libxc.a', 'lib/libxc.%s' % SHLIB_EXT],
     'dirs': ['include'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxc/libxc-2.2.0-intel-2014b.eb b/easybuild/easyconfigs/l/libxc/libxc-2.2.0-intel-2014b.eb
index d3bacbccff572ccdf82b82a1622523f6445a5a47..3bee3b3d9c155e4a66d230644eae39462c14e7bc 100644
--- a/easybuild/easyconfigs/l/libxc/libxc-2.2.0-intel-2014b.eb
+++ b/easybuild/easyconfigs/l/libxc/libxc-2.2.0-intel-2014b.eb
@@ -23,7 +23,7 @@ configopts = 'FC="$F77" FCFLAGS="$FFLAGS" --enable-shared'
 #runtest = 'check'
 
 sanity_check_paths = {
-    'files': ['lib/libxc.a', 'lib/libxc.so'],
+    'files': ['lib/libxc.a', 'lib/libxc.%s' % SHLIB_EXT],
     'dirs': ['include'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxc/libxc-2.2.1-intel-2015a.eb b/easybuild/easyconfigs/l/libxc/libxc-2.2.1-intel-2015a.eb
index 9ed080064b7e680cc4d999ddd8f87f14ea328766..13f7f941b6fa261a0cece0a4a40cf8c8b2596562 100644
--- a/easybuild/easyconfigs/l/libxc/libxc-2.2.1-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libxc/libxc-2.2.1-intel-2015a.eb
@@ -23,7 +23,7 @@ configopts = 'FC="$F77" FCFLAGS="$FFLAGS" --enable-shared'
 #runtest = 'check'
 
 sanity_check_paths = {
-    'files': ['lib/libxc.a', 'lib/libxc.so'],
+    'files': ['lib/libxc.a', 'lib/libxc.%s' % SHLIB_EXT],
     'dirs': ['include'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxc/libxc-2.2.1-intel-para-2014.12.eb b/easybuild/easyconfigs/l/libxc/libxc-2.2.1-intel-para-2014.12.eb
index 8ba57e35c50ec5aeeccba9ebdfe3ec339f00ed9e..29ec0af29b724d256704a85f350ced50c205ecce 100644
--- a/easybuild/easyconfigs/l/libxc/libxc-2.2.1-intel-para-2014.12.eb
+++ b/easybuild/easyconfigs/l/libxc/libxc-2.2.1-intel-para-2014.12.eb
@@ -23,7 +23,7 @@ configopts = 'FC="$F77" FCFLAGS="$FFLAGS" --enable-shared --enable-fortran'
 #runtest = 'check'
 
 sanity_check_paths = {
-    'files': ['lib/libxc.a', 'lib/libxc.so', 'lib/libxcf90.a', 'lib/libxcf90.so'],
+    'files': ['lib/libxc.a', 'lib/libxc.%s' % SHLIB_EXT, 'lib/libxcf90.a', 'lib/libxcf90.%s' % SHLIB_EXT],
     'dirs': ['include'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxc/libxc-2.2.2-foss-2015b.eb b/easybuild/easyconfigs/l/libxc/libxc-2.2.2-foss-2015b.eb
index 355b1a14f908d1f52d0918d42c362de9a87c731b..b029d7950cf262fbb5e236df5401c2f70accc737 100644
--- a/easybuild/easyconfigs/l/libxc/libxc-2.2.2-foss-2015b.eb
+++ b/easybuild/easyconfigs/l/libxc/libxc-2.2.2-foss-2015b.eb
@@ -23,7 +23,7 @@ configopts = 'FC="$F77" FCFLAGS="$FFLAGS" --enable-shared'
 #runtest = 'check'
 
 sanity_check_paths = {
-    'files': ['lib/libxc.a', 'lib/libxc.so'],
+    'files': ['lib/libxc.a', 'lib/libxc.%s' % SHLIB_EXT],
     'dirs': ['include'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxc/libxc-2.2.2-intel-2015a.eb b/easybuild/easyconfigs/l/libxc/libxc-2.2.2-intel-2015a.eb
index 25c12f798e5de9a8b1f4c2961dabb2520d5d2d31..7590c8664b53f7a73aa9b9a100db3725781a4b88 100644
--- a/easybuild/easyconfigs/l/libxc/libxc-2.2.2-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libxc/libxc-2.2.2-intel-2015a.eb
@@ -23,7 +23,7 @@ configopts = 'FC="$F77" FCFLAGS="$FFLAGS" --enable-shared'
 #runtest = 'check'
 
 sanity_check_paths = {
-    'files': ['lib/libxc.a', 'lib/libxc.so'],
+    'files': ['lib/libxc.a', 'lib/libxc.%s' % SHLIB_EXT],
     'dirs': ['include'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxc/libxc-2.2.2-intel-2015b.eb b/easybuild/easyconfigs/l/libxc/libxc-2.2.2-intel-2015b.eb
index b07c35e53185c016113075b962ee4a172ee2bde5..96aab1d17858a1c410627bb2d3749ceb7e9dbb8f 100644
--- a/easybuild/easyconfigs/l/libxc/libxc-2.2.2-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libxc/libxc-2.2.2-intel-2015b.eb
@@ -23,7 +23,7 @@ configopts = 'FC="$F77" FCFLAGS="$FFLAGS" --enable-shared'
 #runtest = 'check'
 
 sanity_check_paths = {
-    'files': ['lib/libxc.a', 'lib/libxc.so'],
+    'files': ['lib/libxc.a', 'lib/libxc.%s' % SHLIB_EXT],
     'dirs': ['include'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxcb/libxcb-1.10-intel-2014b-Python-2.7.8.eb b/easybuild/easyconfigs/l/libxcb/libxcb-1.10-intel-2014b-Python-2.7.8.eb
index 1ae3d3fbc40c7c0d3f627467989c0e9ededafabb..930f6a164fdc51f0a6444e48c0dd8a7bcf57fb04 100644
--- a/easybuild/easyconfigs/l/libxcb/libxcb-1.10-intel-2014b-Python-2.7.8.eb
+++ b/easybuild/easyconfigs/l/libxcb/libxcb-1.10-intel-2014b-Python-2.7.8.eb
@@ -7,7 +7,7 @@ homepage = 'http://xcb.freedesktop.org/'
 description = """The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint,
 latency hiding, direct access to the protocol, improved threading support, and extensibility."""
 
-toolchain = {'name': 'intel', 'version': '2014b'} 
+toolchain = {'name': 'intel', 'version': '2014b'}
 
 source_urls  = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/l/libxcb/libxcb-1.11-intel-2015a-Python-2.7.10.eb b/easybuild/easyconfigs/l/libxcb/libxcb-1.11-intel-2015a-Python-2.7.10.eb
index c1b10ef129b17a1ca369339b4f7cb365ef5a4ba0..09a13b616da5170643ccf545cf753bfd34e4cbf1 100644
--- a/easybuild/easyconfigs/l/libxcb/libxcb-1.11-intel-2015a-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/l/libxcb/libxcb-1.11-intel-2015a-Python-2.7.10.eb
@@ -7,7 +7,7 @@ homepage = 'http://xcb.freedesktop.org/'
 description = """The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint,
 latency hiding, direct access to the protocol, improved threading support, and extensibility."""
 
-toolchain = {'name': 'intel', 'version': '2015a'} 
+toolchain = {'name': 'intel', 'version': '2015a'}
 
 source_urls  = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/l/libxcb/libxcb-1.11-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/l/libxcb/libxcb-1.11-intel-2015a-Python-2.7.9.eb
index 7d200384127ab316952fcf7ef8ba0db83a63c343..68acb79d5bf1c14aa703728a0b7c1493ad3145b4 100644
--- a/easybuild/easyconfigs/l/libxcb/libxcb-1.11-intel-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/l/libxcb/libxcb-1.11-intel-2015a-Python-2.7.9.eb
@@ -7,7 +7,7 @@ homepage = 'http://xcb.freedesktop.org/'
 description = """The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint,
 latency hiding, direct access to the protocol, improved threading support, and extensibility."""
 
-toolchain = {'name': 'intel', 'version': '2015a'} 
+toolchain = {'name': 'intel', 'version': '2015a'}
 
 source_urls  = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/l/libxcb/libxcb-1.11.1-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/l/libxcb/libxcb-1.11.1-intel-2015b-Python-2.7.10.eb
index d5d178d52d49dfd54ada3e7a9f17286e46c81242..482b2014e9da106776c2d9de55f88fb403b737b1 100644
--- a/easybuild/easyconfigs/l/libxcb/libxcb-1.11.1-intel-2015b-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/l/libxcb/libxcb-1.11.1-intel-2015b-Python-2.7.10.eb
@@ -7,7 +7,7 @@ homepage = 'http://xcb.freedesktop.org/'
 description = """The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint,
 latency hiding, direct access to the protocol, improved threading support, and extensibility."""
 
-toolchain = {'name': 'intel', 'version': '2015b'} 
+toolchain = {'name': 'intel', 'version': '2015b'}
 
 source_urls  = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/l/libxcb/libxcb-1.11.1-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/l/libxcb/libxcb-1.11.1-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c9239b151b55e210d05aff682176d6cef4cc90aa
--- /dev/null
+++ b/easybuild/easyconfigs/l/libxcb/libxcb-1.11.1-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMake'
+
+name = 'libxcb'
+version = '1.11.1'
+
+homepage = 'http://xcb.freedesktop.org/'
+description = """The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint,
+latency hiding, direct access to the protocol, improved threading support, and extensibility."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls  = ['http://xcb.freedesktop.org/dist/']
+sources = [SOURCELOWER_TAR_GZ]
+
+python = 'Python'
+pyver = '2.7.11'
+versionsuffix = '-%s-%s' % (python, pyver)
+
+dependencies = [
+    (python, pyver),
+    ('xcb-proto', '1.11', versionsuffix),
+    ('libXau', '1.0.8'),
+    ('libpthread-stubs', '0.3'),
+]
+
+sanity_check_paths = {
+    'files' : ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx",
+                                              "-randr", "-record", "-render", "-res", "-screensaver",
+                                              "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes",
+                                              "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]],
+    'dirs': ['include/xcb', 'lib/pkgconfig'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libxkbcommon/libxkbcommon-0.5.0-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/l/libxkbcommon/libxkbcommon-0.5.0-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5308b095b34ae1c5f917c4f6eed61f8809fb22ad
--- /dev/null
+++ b/easybuild/easyconfigs/l/libxkbcommon/libxkbcommon-0.5.0-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,33 @@
+easyblock = 'ConfigureMake'
+
+name = 'libxkbcommon'
+version = '0.5.0'
+versionsuffix = '-Python-2.7.11'
+
+homepage = 'http://xkbcommon.org/'
+description = """xkbcommon is a library to handle keyboard descriptions,
+ including loading them from disk, parsing them and handling their state.
+ It's mainly meant for client toolkits, window systems,
+ and other system applications."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls  = ['http://xkbcommon.org/download/']
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [
+    ('libxcb', '1.11.1', versionsuffix),
+    ('XKeyboardConfig', '2.16', versionsuffix),
+]
+
+builddependencies = [
+    ('flex', '2.5.39'),
+    ('Bison', '3.0.4'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libxkbcommon%s.so' % x for x in ['', '-x11']],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index 22eb3e4fce6e0812ff6758559ec0c62fb7f7161e..5fdaa5d70ccb0afd6be90eb29879d161be4a0909 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -26,7 +26,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goalf-1.1.0-no-OFED.eb
index 7557598cd64d9613aad91a05f3e48ab9362c474b..952422def75ac3c365019293701b322261570414 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goalf-1.1.0-no-OFED.eb
@@ -21,7 +21,7 @@ configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
 dependencies = [('zlib', '1.2.7')]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goolf-1.4.10-Python-2.7.3.eb
index 60c64c147dcde840645808f5a4bab5a90e895337..4a1316692f7a0eef74b4c8a15a1158679a31b62e 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goolf-1.4.10-Python-2.7.3.eb
@@ -25,7 +25,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goolf-1.4.10.eb
index 53eca5aa25a0d500aa46bc8d938e4eae1f912a91..f2fa0134cb22a0bd5b3d773d6591c647d5b90ae7 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goolf-1.4.10.eb
@@ -20,7 +20,7 @@ configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
 dependencies = [('zlib', '1.2.7')]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-4.0.6-Python-2.7.3.eb
index 3e93f2c23c41f4c3e905945608cf06bb517cdd57..33784ddde95c35192aa681170b6ca6c1606b7368 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-4.0.6-Python-2.7.3.eb
@@ -26,7 +26,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-4.0.6.eb
index 36c184b95a294c22da7af4f0c60ce46c7e11ade9..3117fe0a651669733dc46050324a8651939ae917 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-4.0.6.eb
@@ -21,7 +21,7 @@ configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
 dependencies = [('zlib', '1.2.7')]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-4.1.13-Python-2.7.3.eb
index 5c84637a7e6a7b228fb1699ee76c90d5a2189eff..cc27d1b86cc43eb6b057fe0d6ab24e319dae39a0 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-4.1.13-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-4.1.13-Python-2.7.3.eb
@@ -26,7 +26,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-5.3.0-Python-2.7.3.eb
index 47ab2a1eaf30dd30964e015ddb10b2ea26fba74a..61308782eab7c3427905204f4a037876877d997b 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-5.3.0-Python-2.7.3.eb
@@ -26,7 +26,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-5.3.0.eb
index 0297dc62f16c0ccd9c36fac6e1c780f88227ffb1..fd2903059061bae94f2c54a257b375e840474d07 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-5.3.0.eb
@@ -21,7 +21,7 @@ configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
 dependencies = [('zlib', '1.2.7')]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-intel-2015a-Python-2.7.3.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-intel-2015a-Python-2.7.3.eb
index b747d1108f7d76dfb72c59840a63611941fbdef6..81d93bf45c69c9ee593472861f54996f73973656 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-intel-2015a-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-intel-2015a-Python-2.7.3.eb
@@ -26,7 +26,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-goalf-1.1.0-no-OFED.eb
index 461d52a9c8e2bacdd93b664eddd517f93e811fe5..8a4a61220f80dd7fcce440b463c4870620a4103c 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-goalf-1.1.0-no-OFED.eb
@@ -21,7 +21,7 @@ configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
 dependencies = [('zlib', '1.2.7')]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-goolf-1.4.10.eb
index 9780466535460c5720cb016319abc989dad304af..0aa0c139866e39b97c5030727c4b009313ec9873 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-goolf-1.4.10.eb
@@ -20,7 +20,7 @@ configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
 dependencies = [('zlib', '1.2.7')]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-ictce-4.0.6.eb
index f10ab602a59aef8feed069751ca5be3364e77548..b1af1bc74e30c625ea5e3a3ec1bbbca45bec51cf 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-ictce-4.0.6.eb
@@ -21,7 +21,7 @@ configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
 dependencies = [('zlib', '1.2.7')]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-ictce-4.1.13.eb
index 5d91dfdb96ccb962a58b42d5c22d1ae068f04512..1364db9fd87fc0b7382617aa588d540df1e7d01c 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-ictce-4.1.13.eb
@@ -21,7 +21,7 @@ configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
 dependencies = [('zlib', '1.2.7')]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-ictce-5.3.0.eb
index e91eeeeabc9b78aff7a0b393a085ea1af7a91dd2..c35a6e9fc3272268839f18a0e6991a1a0f29f36b 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-ictce-5.3.0.eb
@@ -21,7 +21,7 @@ configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
 dependencies = [('zlib', '1.2.7')]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-gmpolf-1.4.8.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-gmpolf-1.4.8.eb
index f98f4a1b675989bebc5ccb067a9f521b2c8faea7..60a6e144044ed474faa82795e186ba4b5edbda91 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-gmpolf-1.4.8.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-gmpolf-1.4.8.eb
@@ -21,7 +21,7 @@ configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
 dependencies = [('zlib', '1.2.7')]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goalf-1.1.0-no-OFED.eb
index 728af8a94693e5f43c52fed7d0718b8ebed7597e..b388d01bd846e65564e58c9c815576af026e60d0 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goalf-1.1.0-no-OFED.eb
@@ -21,7 +21,7 @@ configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
 dependencies = [('zlib', '1.2.7')]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goalf-1.5.12-no-OFED.eb
index ddfc201d2da00595c64b401afea6adf0a2c7acd2..f80ae7c225f3a87df048c4590d17d72b9ebb6a29 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goalf-1.5.12-no-OFED.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goalf-1.5.12-no-OFED.eb
@@ -21,7 +21,7 @@ configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
 dependencies = [('zlib', '1.2.8')]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-gompi-1.4.12-no-OFED.eb
index 04f39a5a5e2afe2c82664100754626c7d2f21f4f..6bb7068cf9e7f3ef61960fbc1297f713d0abef9a 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-gompi-1.4.12-no-OFED.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-gompi-1.4.12-no-OFED.eb
@@ -21,7 +21,7 @@ configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
 dependencies = [('zlib', '1.2.7')]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goolf-1.4.10.eb
index 85c8e40fd53130964b09bd1952f3619a86f2a9e4..2382dbbd475d2db986e2990bdb30032e051e3643 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goolf-1.4.10.eb
@@ -21,7 +21,7 @@ configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
 dependencies = [('zlib', '1.2.7')]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goolf-1.5.14.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goolf-1.5.14.eb
index dc6262f297f24a8310ff036f4f88ca3ef2eab526..72ae920157941d0818ea4be1ef4b7866d4f075e4 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goolf-1.5.14.eb
@@ -21,7 +21,7 @@ configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
 dependencies = [('zlib', '1.2.7')]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-4.0.6.eb
index 63cf588844b53a52703445f235635f5512955f19..8a603988658ff3241a2cd067ad2cd5ce91d61167 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-4.0.6.eb
@@ -21,7 +21,7 @@ configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
 dependencies = [('zlib', '1.2.7')]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-4.1.13.eb
index 5849c68e0ba5f8f15f5e8386014de4ce131ba6b8..a2720d5e9b7bfe8beb4a04ef129e8af3bf1a3b41 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-4.1.13.eb
@@ -21,7 +21,7 @@ configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
 dependencies = [('zlib', '1.2.7')]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.2.0.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.2.0.eb
index 00ef91bfbe0bd50a4e193754a90f44b6c833fbe3..1c1b880f5686863e1610f80479c2a2cdfae9e948 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.2.0.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.2.0.eb
@@ -21,7 +21,7 @@ configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
 dependencies = [('zlib', '1.2.7')]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.3.0.eb
index 6454b3c5bcd485aaf2da86d0e79d04e06a571b2c..90f80b28047800acdb28ee0cec52a99e9cebf14b 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.3.0.eb
@@ -21,7 +21,7 @@ configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
 dependencies = [('zlib', '1.2.7')]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.5.0-Python-2.7.6.eb
index 8b4ebb1f971939825aca07609205eeff84036118..449f38ddfbcdf43c2ae0713cf82168ef5ae6a6fe 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.5.0-Python-2.7.6.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.5.0-Python-2.7.6.eb
@@ -26,7 +26,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.5.0.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.5.0.eb
index 32892101ebaac548d2e3de5529f506708e00a150..118fae1f4c2930f495cc4056eae79c5acc214dc6 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.5.0.eb
@@ -21,7 +21,7 @@ configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
 dependencies = [('zlib', '1.2.8')]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-7.1.2.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-7.1.2.eb
index 4ca7d2ddd74a9b760744b9b090da6af80f95ba95..615b01f264f3cef0016fd75acba3f9e2235fa886 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-7.1.2.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-7.1.2.eb
@@ -22,7 +22,7 @@ configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
 dependencies = [('zlib', '1.2.8')]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-intel-2014b.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-intel-2014b.eb
index 0fdd037332ea1c5035cdbc942c6bfee3f8d8a1ee..222bbd19cd6006d57271236510e7bc0dc721b0de 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-intel-2014b.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-intel-2014b.eb
@@ -22,7 +22,7 @@ configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
 dependencies = [('zlib', '1.2.8')]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-GCC-4.9.2.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-GCC-4.9.2.eb
index 4f3853dc8b4fc821dd7656c8025c6847e5816fc4..7575c86f51806e80ddc1536622cf70ef694444e2 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-GCC-4.9.2.eb
@@ -22,7 +22,7 @@ configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
 dependencies = [('zlib', '1.2.8')]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..01f5647249055580799bda80af81e276a56573ef
--- /dev/null
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-GCC-4.9.3-2.25.eb
@@ -0,0 +1,29 @@
+easyblock = 'ConfigureMake'
+
+name = 'libxml2'
+version = '2.9.2'
+
+homepage = 'http://xmlsoft.org/'
+description = """Libxml2 is the XML C parser and 
+toolchain developed for the Gnome project
+ (but usable outside of the Gnome platform)."""
+
+toolchain = {'name': 'GCC', 'version': '4.9.3-2.25'}
+toolchainopts = {'pic': True}
+
+source_urls = [
+    'http://xmlsoft.org/sources/',
+    'http://xmlsoft.org/sources/old/'
+]
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
+
+dependencies = [('zlib', '1.2.8')]
+
+sanity_check_paths = {
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
+    'dirs': ['bin', 'include/libxml2/libxml'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-GNU-4.9.3-2.25.eb
index aa7e3a45276411fd154df845dcb4f998252079e8..9bdf731db36d54f1f5803b0472c3205c8e7a9ac7 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-GNU-4.9.3-2.25.eb
@@ -21,7 +21,7 @@ configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
 dependencies = [('zlib', '1.2.8')]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-foss-2015a.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-foss-2015a.eb
index 60f233de3e2288bb1bcc8f82b6f7959142fdf05a..541ab91f1b7a522a2b8fc841a78c234382cc062d 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-foss-2015a.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-foss-2015a.eb
@@ -22,7 +22,7 @@ configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
 dependencies = [('zlib', '1.2.8')]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-foss-2015b.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-foss-2015b.eb
index 4af0891c8abb0e79ef12e21bb654a7c4a529cfb8..8fd891d71abdff98a9b5f335eca7bfef058afafc 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-foss-2015b.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-foss-2015b.eb
@@ -22,7 +22,7 @@ configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
 dependencies = [('zlib', '1.2.8')]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-goolf-1.5.14.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-goolf-1.5.14.eb
index f85a2b61718f864d4770d3e097dc5988c7093c88..9d5d34d98e8576a2d905a0c31b030f1eb053e275 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-goolf-1.5.14.eb
@@ -22,7 +22,7 @@ configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
 dependencies = [('zlib', '1.2.8')]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-goolf-1.7.20.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-goolf-1.7.20.eb
index 8b3729f893206d3afe1fbdb461d78ff0bcb67dbf..aa5618634da7d3f2c05dda7a953333a5a4099a43 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-goolf-1.7.20.eb
@@ -22,7 +22,7 @@ configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
 dependencies = [('zlib', '1.2.8')]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2014.06.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2014.06.eb
index 22b90777374860b36500eff766c4220b3fa3de1a..fe435074c91c4e4161d75d552795ae479c07d643 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2014.06.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2014.06.eb
@@ -22,7 +22,7 @@ configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
 dependencies = [('zlib', '1.2.8')]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2014b.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2014b.eb
index 22727637dc909b79e688b6b2178b09df5edbf3a5..7f753229e09f89aaa82f596532f320a38be2e5b9 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2014b.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2014b.eb
@@ -22,7 +22,7 @@ configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
 dependencies = [('zlib', '1.2.8')]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2015a.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2015a.eb
index c052dd338dba35e323aa2cfa315090435e1bbe9f..f49980dfe330a68a7b820c043f44d7174fec7d41 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2015a.eb
@@ -22,7 +22,7 @@ configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
 dependencies = [('zlib', '1.2.8')]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2015b.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2015b.eb
index 6b29a23daad4f87a9a3d758e565ec78dd6825e8d..b18959ba9738d8cb6563d003936450b8c1a98cb5 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2015b.eb
@@ -22,7 +22,7 @@ configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
 dependencies = [('zlib', '1.2.8')]
 
 sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.so', 'lib64/libxml2.so')],
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
     'dirs': ['bin', 'include/libxml2/libxml'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..61e0b9ca786c6b92e407007d77c36152edcee441
--- /dev/null
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,28 @@
+name = 'libxml2'
+version = '2.9.3'
+
+homepage = 'http://xmlsoft.org/'
+description = """Libxml2 is the XML C parser and toolchain developed for the Gnome project (but usable
+ outside of the Gnome platform)."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'pic': True}
+
+source_urls = [
+    'http://xmlsoft.org/sources/',
+    'http://xmlsoft.org/sources/old/'
+]
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = 'CC="$CC" CXX="$CXX" --with-pic'
+
+pythonver = '2.7.11'
+pythonshortver = '.'.join(pythonver.split('.')[:2])
+versionsuffix = '-%s-%s' % ('Python', pythonver)
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('Python', pythonver),
+]
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..41e4fc099efca78d87e9853e2fd3f191a333df17
--- /dev/null
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,28 @@
+name = 'libxml2'
+version = '2.9.3'
+
+homepage = 'http://xmlsoft.org/'
+description = """Libxml2 is the XML C parser and toolchain developed for the Gnome project (but usable
+ outside of the Gnome platform)."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+source_urls = [
+    'http://xmlsoft.org/sources/',
+    'http://xmlsoft.org/sources/old/'
+]
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = 'CC="$CC" CXX="$CXX" --with-pic'
+
+pyver = '2.7.11'
+pyshortver = '.'.join(pyver.split('.')[:2])
+versionsuffix = '-Python-%s' % pyver
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('Python', pyver),
+]
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libxslt/libxslt-1.1.28-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/l/libxslt/libxslt-1.1.28-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c1402800ba28697342285447090883678bbdf5eb
--- /dev/null
+++ b/easybuild/easyconfigs/l/libxslt/libxslt-1.1.28-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'libxslt'
+version = '1.1.28'
+versionsuffix = '-Python-2.7.11'
+
+homepage = 'http://xmlsoft.org/'
+description = """Libxslt is the XSLT C library developed for the GNOME project
+ (but usable outside of the Gnome platform)."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [
+    'http://xmlsoft.org/sources/',
+    'http://xmlsoft.org/sources/old/'
+]
+
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('libxml2', '2.9.3', versionsuffix),
+]
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libyaml/libyaml-0.1.4-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libyaml/libyaml-0.1.4-goalf-1.1.0-no-OFED.eb
index c595540a201c7e6ffc34a8452fc5b6f799295fd6..3a532844038a11bfe30420664d603ea2b78ff34d 100644
--- a/easybuild/easyconfigs/l/libyaml/libyaml-0.1.4-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/l/libyaml/libyaml-0.1.4-goalf-1.1.0-no-OFED.eb
@@ -21,8 +21,8 @@ sources = ['yaml-%(version)s.tar.gz']
 source_urls = ['http://pyyaml.org/download/libyaml/']
 
 sanity_check_paths = {
-                      'files': ["include/yaml.h", "lib/libyaml.a", "lib/libyaml.so"],
-                      'dirs': ["lib/pkgconfig"]
-                     }
+    'files': ["include/yaml.h", "lib/libyaml.a", "lib/libyaml.%s" % SHLIB_EXT],
+    'dirs': ["lib/pkgconfig"]
+}
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libyaml/libyaml-0.1.4-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libyaml/libyaml-0.1.4-goolf-1.4.10.eb
index 0e518d9646e1b4d3b58de74515442f0221acb27e..1383948289860f990c8d718b919a456046811f70 100644
--- a/easybuild/easyconfigs/l/libyaml/libyaml-0.1.4-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libyaml/libyaml-0.1.4-goolf-1.4.10.eb
@@ -20,8 +20,8 @@ sources = ['yaml-%(version)s.tar.gz']
 source_urls = ['http://pyyaml.org/download/libyaml/']
 
 sanity_check_paths = {
-                      'files': ["include/yaml.h", "lib/libyaml.a", "lib/libyaml.so"],
-                      'dirs': ["lib/pkgconfig"]
-                     }
+    'files': ["include/yaml.h", "lib/libyaml.a", "lib/libyaml.%s" % SHLIB_EXT],
+    'dirs': ["lib/pkgconfig"]
+}
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libyaml/libyaml-0.1.4-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libyaml/libyaml-0.1.4-ictce-5.3.0.eb
index 750f58b2de85e102894d0e0c15555faa753d3783..ff0da7e03391fd45232dab02b009f3f4d9084022 100644
--- a/easybuild/easyconfigs/l/libyaml/libyaml-0.1.4-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libyaml/libyaml-0.1.4-ictce-5.3.0.eb
@@ -21,7 +21,7 @@ sources = ['yaml-%(version)s.tar.gz']
 source_urls = ['http://pyyaml.org/download/libyaml/']
 
 sanity_check_paths = {
-    'files': ["include/yaml.h", "lib/libyaml.a", "lib/libyaml.so"],
+    'files': ["include/yaml.h", "lib/libyaml.a", "lib/libyaml.%s" % SHLIB_EXT],
     'dirs': ["lib/pkgconfig"]
 }
 
diff --git a/easybuild/easyconfigs/l/libyaml/libyaml-0.1.6-intel-2015a.eb b/easybuild/easyconfigs/l/libyaml/libyaml-0.1.6-intel-2015a.eb
index 7b42e2d0837cd106981a9343e87aa2e9cbb42c1b..2a9749a5815e3e371fccc9dfe90454cd19df439d 100644
--- a/easybuild/easyconfigs/l/libyaml/libyaml-0.1.6-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libyaml/libyaml-0.1.6-intel-2015a.eb
@@ -21,7 +21,7 @@ sources = ['yaml-%(version)s.tar.gz']
 source_urls = ['http://pyyaml.org/download/libyaml/']
 
 sanity_check_paths = {
-    'files': ["include/yaml.h", "lib/libyaml.a", "lib/libyaml.so"],
+    'files': ["include/yaml.h", "lib/libyaml.a", "lib/libyaml.%s" % SHLIB_EXT],
     'dirs': ["lib/pkgconfig"]
 }
 
diff --git a/easybuild/easyconfigs/l/libyaml/libyaml-0.1.6-intel-2015b.eb b/easybuild/easyconfigs/l/libyaml/libyaml-0.1.6-intel-2015b.eb
index 581b8cb56bb2a8eed622664de0d48af2cc4d4cab..cf285fb5ecb2cd32323366a8c9fc0148f0399b26 100644
--- a/easybuild/easyconfigs/l/libyaml/libyaml-0.1.6-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libyaml/libyaml-0.1.6-intel-2015b.eb
@@ -21,7 +21,7 @@ sources = ['yaml-%(version)s.tar.gz']
 source_urls = ['http://pyyaml.org/download/libyaml/']
 
 sanity_check_paths = {
-    'files': ["include/yaml.h", "lib/libyaml.a", "lib/libyaml.so"],
+    'files': ["include/yaml.h", "lib/libyaml.a", "lib/libyaml.%s" % SHLIB_EXT],
     'dirs': ["lib/pkgconfig"]
 }
 
diff --git a/easybuild/easyconfigs/l/libyaml/libyaml-0.1.6-intel-2016a.eb b/easybuild/easyconfigs/l/libyaml/libyaml-0.1.6-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c715793903da7dea239ad4d648a07f8184e2351b
--- /dev/null
+++ b/easybuild/easyconfigs/l/libyaml/libyaml-0.1.6-intel-2016a.eb
@@ -0,0 +1,28 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Nils Christian <nils.christian@uni.lu>
+# License::   MIT/GPL
+# $Id$
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'libyaml'
+version = '0.1.6'
+
+homepage = 'http://pyyaml.org/wiki/LibYAML'
+description = """LibYAML is a YAML 1.1 parser and emitter written in C."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+sources = ['yaml-%(version)s.tar.gz']
+source_urls = ['http://pyyaml.org/download/libyaml/']
+
+sanity_check_paths = {
+    'files': ["include/yaml.h", "lib/libyaml.a", "lib/libyaml.%s" % SHLIB_EXT],
+    'dirs': ["lib/pkgconfig"]
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/likwid/likwid-3.0.0-goalf-1.1.0-no-OFED-pinomp.eb b/easybuild/easyconfigs/l/likwid/likwid-3.0.0-goalf-1.1.0-no-OFED-pinomp.eb
index c2776bf36f2339c842bdc23a38a7b9128358b4df..e17929c01baa3e90805134686e69dd1bedc5aaad 100644
--- a/easybuild/easyconfigs/l/likwid/likwid-3.0.0-goalf-1.1.0-no-OFED-pinomp.eb
+++ b/easybuild/easyconfigs/l/likwid/likwid-3.0.0-goalf-1.1.0-no-OFED-pinomp.eb
@@ -22,7 +22,7 @@ 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"],
+              "lib/liblikwidpin.%s" % SHLIB_EXT , "lib/liblikwid.a"],
     'dirs': ["man/man1"]
 }
 
diff --git a/easybuild/easyconfigs/l/likwid/likwid-3.0.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/likwid/likwid-3.0.0-goalf-1.1.0-no-OFED.eb
index 124ce106488aa2c5c1f02a90f60ad50b42d397a5..9d0cf1054d24421b39ec74a1176cb5d28646ec4a 100644
--- a/easybuild/easyconfigs/l/likwid/likwid-3.0.0-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/l/likwid/likwid-3.0.0-goalf-1.1.0-no-OFED.eb
@@ -19,7 +19,7 @@ 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"],
+              "lib/liblikwidpin.%s" % SHLIB_EXT, "lib/liblikwid.a"],
     'dirs': ["man/man1"]
 }
 
diff --git a/easybuild/easyconfigs/l/likwid/likwid-3.0.0-goolf-1.4.10-pinomp.eb b/easybuild/easyconfigs/l/likwid/likwid-3.0.0-goolf-1.4.10-pinomp.eb
index 98e3f2bc6930b1f173dd5d5b21eb9e02932ab353..3855b155c5c34735be4a1ef7f3e8fb99e27c85cf 100644
--- a/easybuild/easyconfigs/l/likwid/likwid-3.0.0-goolf-1.4.10-pinomp.eb
+++ b/easybuild/easyconfigs/l/likwid/likwid-3.0.0-goolf-1.4.10-pinomp.eb
@@ -22,7 +22,7 @@ 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"],
+              "lib/liblikwidpin.%s" % SHLIB_EXT , "lib/liblikwid.a"],
     'dirs': ["man/man1"]
 }
 
diff --git a/easybuild/easyconfigs/l/likwid/likwid-3.0.0-goolf-1.4.10.eb b/easybuild/easyconfigs/l/likwid/likwid-3.0.0-goolf-1.4.10.eb
index 7008e1d1c4944465f3a9822be0a476dc3ca5ebfa..8d8e1a8a561fb8a11c0b870cc228ed3476ce751c 100644
--- a/easybuild/easyconfigs/l/likwid/likwid-3.0.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/likwid/likwid-3.0.0-goolf-1.4.10.eb
@@ -19,7 +19,7 @@ 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"],
+              "lib/liblikwidpin.%s" % SHLIB_EXT, "lib/liblikwid.a"],
     'dirs': ["man/man1"]
 }
 
diff --git a/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-4.1.13-pinomp.eb b/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-4.1.13-pinomp.eb
index a7934235d050296e991e73d486b8b0c9b3646da6..2933d462674a127dd5f93587a6b3a83099e4c3f2 100644
--- a/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-4.1.13-pinomp.eb
+++ b/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-4.1.13-pinomp.eb
@@ -22,7 +22,7 @@ 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"],
+              "lib/liblikwidpin.%s" % SHLIB_EXT, "lib/liblikwid.a"],
     'dirs': ["man/man1"]
 }
 
diff --git a/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-4.1.13.eb b/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-4.1.13.eb
index 0202739bca00601192ccd4d72f9d59cce372c9e5..39f9e9f76b67403293362ea4b1453b9e827411e9 100644
--- a/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-4.1.13.eb
@@ -19,7 +19,7 @@ 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"],
+              "lib/liblikwidpin.%s" % SHLIB_EXT, "lib/liblikwid.a"],
     'dirs': ["man/man1"]
 }
 
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
index 0bcdcea56d7348ab46007dbc1b72f6f3fe15ae2a..07a812856a3780205944cc85ba2187a38d5d62f6 100644
--- 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
@@ -22,7 +22,7 @@ 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"],
+              "lib/liblikwidpin.%s" % SHLIB_EXT, "lib/liblikwid.a"],
     'dirs': ["man/man1"]
 }
 
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
index 357fb0550dfd53cc57c3b5b95dbbe987e5ad934b..5202c650457ab798e1cdb43f7acaf01b0a84532b 100644
--- 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
@@ -19,7 +19,7 @@ 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"],
+              "lib/liblikwidpin.%s" % SHLIB_EXT, "lib/liblikwid.a"],
     'dirs': ["man/man1"]
 }
 
diff --git a/easybuild/easyconfigs/l/likwid/likwid-3.1.3-intel-2015a.eb b/easybuild/easyconfigs/l/likwid/likwid-3.1.3-intel-2015a.eb
index 63f25c7e42f359ae9175d48b07483e71e2899c81..8e33280ec2042745e69253d14027a1d92edd371b 100644
--- a/easybuild/easyconfigs/l/likwid/likwid-3.1.3-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/likwid/likwid-3.1.3-intel-2015a.eb
@@ -19,7 +19,7 @@ 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"],
+              "lib/liblikwidpin.%s" % SHLIB_EXT, "lib/liblikwid.a"],
     'dirs': ["man/man1"]
 }
 
diff --git a/easybuild/easyconfigs/l/likwid/likwid-4.0.1-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/l/likwid/likwid-4.0.1-GNU-4.9.3-2.25.eb
index 5b4c4dc112400f3491ef072d288206856ab8d1f0..2a2856e4d30ffa868208242ba991aaa1130200f9 100644
--- a/easybuild/easyconfigs/l/likwid/likwid-4.0.1-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/l/likwid/likwid-4.0.1-GNU-4.9.3-2.25.eb
@@ -22,7 +22,7 @@ installopts = 'PREFIX=%(installdir)s'
 sanity_check_paths = {
     'files': ["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.so"],
+              "lib/liblikwidpin.%s" % SHLIB_EXT, "lib/liblikwid.%s" % SHLIB_EXT],
     'dirs': ["man/man1"]
 }
 
diff --git a/easybuild/easyconfigs/l/likwid/likwid-4.0.1-ictce-4.1.13.eb b/easybuild/easyconfigs/l/likwid/likwid-4.0.1-ictce-4.1.13.eb
index dee1d84dba8ce6efa38fe2390ea2ee8f068acc0c..513b07277d1e71274463f90d4c0c17fda83fba7b 100644
--- a/easybuild/easyconfigs/l/likwid/likwid-4.0.1-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/likwid/likwid-4.0.1-ictce-4.1.13.eb
@@ -22,7 +22,7 @@ installopts = 'PREFIX=%(installdir)s'
 sanity_check_paths = {
     'files': ["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.so"],
+              "lib/liblikwidpin.%s" % SHLIB_EXT, "lib/liblikwid.%s" % SHLIB_EXT],
     'dirs': ["man/man1"]
 }
 
diff --git a/easybuild/easyconfigs/l/lxml/lxml-3.5.0-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/l/lxml/lxml-3.5.0-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e06da544f241e9066196fe02c32cc1ee5f5881e4
--- /dev/null
+++ b/easybuild/easyconfigs/l/lxml/lxml-3.5.0-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,30 @@
+easyblock = 'PythonPackage'
+
+name = 'lxml'
+version = '3.5.0'
+
+homepage = 'http://lxml.de/'
+description = """The lxml XML toolkit is a Pythonic binding for the C libraries libxml2 and libxslt."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://lxml.de/files/']
+sources = [SOURCE_TGZ]
+
+pyver = '2.7.11'
+pyshortver = '.'.join(pyver.split('.')[:2])
+
+versionsuffix = '-Python-%s' % pyver
+
+dependencies = [
+    ('Python', pyver),
+    ('libxml2', '2.9.3', versionsuffix),
+    ('libxslt', '1.1.28', versionsuffix),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%s/site-packages' % pyshortver],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-goolf-1.5.14.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-goolf-1.5.14.eb
index b2b44741465cd4bc3595fb272c77d10b713f9145..0cb44a3cfb211d42229b5e1287b9afb64ba89cac 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.16-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-goolf-1.5.14.eb
@@ -10,7 +10,7 @@ It is mostly SVR4 compatible although it has some extensions
 GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc.
 """
 
-toolchain = {'name': 'goolf', 'version': '1.5.14'} 
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.7.2.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.7.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b62284872a3046da08afe97e8232ba453bc4cbc0
--- /dev/null
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.7.2.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+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': 'GCC', 'version': '4.7.2'}
+
+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/M4/M4-1.4.17-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0fa72c61c98b4f6fb3b8fed618866eeed23b0c70
--- /dev/null
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.3-2.25.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+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': 'GCC', 'version': '4.9.3-2.25'}
+
+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/M4/M4-1.4.17-foss-2016a.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0d030e3264daafe90d23c28443ae3d9bf0ec2a2b
--- /dev/null
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2016a.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+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': 'foss', 'version': '2016a'}
+
+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/M4/M4-1.4.17-intel-2016a.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..519be6b6b35287fd2d2c870271b33bcaa569412e
--- /dev/null
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2016a.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+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': 'intel', 'version': '2016a'}
+
+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/MACS2/MACS2-2.1.0.20150731-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/m/MACS2/MACS2-2.1.0.20150731-goolf-1.4.10-Python-2.7.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5ab68f33556eb16e1193902e969cb3fb02dc11ea
--- /dev/null
+++ b/easybuild/easyconfigs/m/MACS2/MACS2-2.1.0.20150731-goolf-1.4.10-Python-2.7.3.eb
@@ -0,0 +1,47 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright (c) 2015 Virginia Bioinformatics Institute at Virginia Tech
+# Authors::   Dominik L. Borkowski <dominik.borkowski@gmail.com>
+# License::   MIT/GPL
+# $Id$
+#
+##
+
+easyblock = 'PythonPackage'
+
+name = 'MACS2'
+version = '2.1.0.20150731'
+
+homepage = 'https://github.com/taoliu/MACS/'
+description = "Model Based Analysis for ChIP-Seq data"
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+python = 'Python'
+pyver = '2.7.3'
+pyshortver = '.'.join(pyver.split('.')[0:2])
+pylibdir = 'lib/python%s/site-packages' % pyshortver
+versionsuffix = "-%s-%s" % (python, pyver)
+
+dependencies = [
+    (python, pyver),
+    ('numpy', '1.7.1', versionsuffix),
+]
+
+options = {'modulename': name }
+
+# specify that this asyblock should run a full sanity check, rather than just trying to load the module
+full_sanity_check = True
+
+sanity_check_paths = {
+    'files': ['bin/macs2', '%s/%s-%s-py%s-linux-x86_64.egg' % (pylibdir, name, version, pyshortver)],
+    'dirs': [],
+}
+
+sanity_check_commands = [('%(namelower)s --version')]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/m/MATIO/MATIO-1.5.2-intel-2015b.eb b/easybuild/easyconfigs/m/MATIO/MATIO-1.5.2-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9fb67afb2a35d4301ece629f143a18bb97308aee
--- /dev/null
+++ b/easybuild/easyconfigs/m/MATIO/MATIO-1.5.2-intel-2015b.eb
@@ -0,0 +1,24 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2014-2015 The Cyprus Institute
+# Authors:: Thekla Loizou <t.loizou@cyi.ac.cy>
+# License:: MIT/GPL
+#
+##
+easyblock = 'ConfigureMake'
+
+name = 'MATIO'
+version = '1.5.2'
+
+homepage = 'http://sourceforge.net/projects/matio/'
+description = """matio is an C library for reading and writing Matlab MAT files."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_ZIP]
+
+dependencies = [('zlib', '1.2.8')]
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/m/MIGRATE-N/MIGRATE-N-4.2.2a-intel-2015b.eb b/easybuild/easyconfigs/m/MIGRATE-N/MIGRATE-N-4.2.2a-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ee0f39c51aab93208b6aa8efca7a1cccf58f616f
--- /dev/null
+++ b/easybuild/easyconfigs/m/MIGRATE-N/MIGRATE-N-4.2.2a-intel-2015b.eb
@@ -0,0 +1,39 @@
+easyblock = "ConfigureMake"
+
+name = "MIGRATE-N"
+version = "4.2.2a"
+
+homepage = 'http://popgen.sc.fsu.edu/Migrate/Migrate-n.html'
+description = """Migrate estimates effective population sizes and past migration rates
+ between n population assuming a migration matrix model
+ with asymmetric migration tates and different subpopulation sizes."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = [
+    'http://popgen.sc.fsu.edu/currentversions/',
+    'http://popgen.sc.fsu.edu/oldversions/%(version_major)s.x/%(version_major_minor)s',
+    'http://popgen.sc.fsu.edu/oldversions/',
+]
+sources = ['migrate-%(version)s.src.tar.gz']
+
+patches = [
+    'migrate-%(version)s_icc.patch',
+    'migrate-%(version)s_install.patch',
+]
+
+dependencies = [
+    ('zlib', '1.2.8'),
+]
+
+configopts = '--enable-A4 "CC=$CC" STDCPLUS=-lstdc++ '
+prebuildopts = 'make mpis && make clean && '
+
+start_dir = 'src'
+
+sanity_check_paths = {
+    'files': ['bin/migrate-n', 'bin/migrate-n-mpi'],
+    'dirs': []
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/m/MIGRATE-N/migrate-4.2.2a_icc.patch b/easybuild/easyconfigs/m/MIGRATE-N/migrate-4.2.2a_icc.patch
new file mode 100644
index 0000000000000000000000000000000000000000..20da05a0e459797254800e2220dae66e436654b1
--- /dev/null
+++ b/easybuild/easyconfigs/m/MIGRATE-N/migrate-4.2.2a_icc.patch
@@ -0,0 +1,13 @@
+#icc does not find -lpthread, if -fast defined
+#B. Hajgato January 18th, 2016
+--- src/configure.orig	2014-12-28 03:46:09.000000000 +0100
++++ src/configure	2016-01-18 15:02:00.147089834 +0100
+@@ -3332,7 +3332,7 @@
+      	     pgcc) CFLAGS="-B -fast ";
+ 	     	  SYSTEM="gcc";;
+ #            icc)  CFLAGS=" -O3 -tpp7 -xKW -pad -ip ";
+-             icc)  CFLAGS+=" -fast ";
++             icc)  CFLAGS+="";
+ 	     	  SYSTEM="icc";;
+              cc)   case "$host_vendor" in
+                    ibm) CFLAGS="-O3 -Dinline='/*inline*/' -q cpluscmt -DIBM";
diff --git a/easybuild/easyconfigs/m/MIGRATE-N/migrate-4.2.2a_install.patch b/easybuild/easyconfigs/m/MIGRATE-N/migrate-4.2.2a_install.patch
new file mode 100644
index 0000000000000000000000000000000000000000..97957ab44e0d8b4679fd3bbbbbef722071947ff5
--- /dev/null
+++ b/easybuild/easyconfigs/m/MIGRATE-N/migrate-4.2.2a_install.patch
@@ -0,0 +1,13 @@
+#Create parent directories during install
+#B. Hajgato January 18th, 2016
+--- src/configure.orig	2014-12-28 03:46:09.000000000 +0100
++++ src/configure	2016-01-18 14:57:26.331047715 +0100
+@@ -3411,7 +3411,7 @@
+ 	      test -s conftest.dir/conftest.one &&
+ 	      test -s conftest.dir/conftest.two
+ 	    then
+-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
++	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c -D"
+ 	      break 3
+ 	    fi
+ 	  fi
diff --git a/easybuild/easyconfigs/m/MPC/MPC-1.0.2-foss-2015a.eb b/easybuild/easyconfigs/m/MPC/MPC-1.0.2-foss-2015a.eb
index d5449c24a44d8951e22dbf6840ec3f18e43de7c8..b3adacecd6dde36107d5ba0bece527d01bc7500d 100644
--- a/easybuild/easyconfigs/m/MPC/MPC-1.0.2-foss-2015a.eb
+++ b/easybuild/easyconfigs/m/MPC/MPC-1.0.2-foss-2015a.eb
@@ -25,7 +25,7 @@ dependencies = [
 runtest = 'check'
 
 sanity_check_paths = {
-    'files': ['lib/libmpc.so', 'include/mpc.h'],
+    'files': ['lib/libmpc.%s' % SHLIB_EXT, 'include/mpc.h'],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/m/MPC/MPC-1.0.2-intel-2015a.eb b/easybuild/easyconfigs/m/MPC/MPC-1.0.2-intel-2015a.eb
index 2efb366e000846d650b0639d4800be3354f82048..6763501bb444ca0ca2ebca3d88b66f55c2822290 100644
--- a/easybuild/easyconfigs/m/MPC/MPC-1.0.2-intel-2015a.eb
+++ b/easybuild/easyconfigs/m/MPC/MPC-1.0.2-intel-2015a.eb
@@ -23,7 +23,7 @@ dependencies = [('GMP', '5.1.3'),
 runtest = 'check'
 
 sanity_check_paths = {
-    'files': ['lib/libmpc.so', 'include/mpc.h'],
+    'files': ['lib/libmpc.%s' % SHLIB_EXT, 'include/mpc.h'],
     'dirs': []
                      }
 
diff --git a/easybuild/easyconfigs/m/MPFR/MPFR-3.1.3-intel-2015b-GMP-6.1.0.eb b/easybuild/easyconfigs/m/MPFR/MPFR-3.1.3-intel-2015b-GMP-6.1.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..dc0a419868e5d0cd95185fbe7583b6fd3d11260e
--- /dev/null
+++ b/easybuild/easyconfigs/m/MPFR/MPFR-3.1.3-intel-2015b-GMP-6.1.0.eb
@@ -0,0 +1,29 @@
+easyblock = 'ConfigureMake'
+
+name = 'MPFR'
+version = '3.1.3'
+
+homepage = 'http://www.mpfr.org'
+description = """The MPFR library is a C library for multiple-precision 
+ floating-point computations with correct rounding."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = ['http://www.mpfr.org/mpfr-%(version)s/']
+sources = [SOURCELOWER_TAR_BZ2]
+
+patches = ['MPFR_ictce_remove-deprecated-mp.patch']
+
+gmpver = '6.1.0'
+versionsuffix = '-GMP-%s' % gmpver
+
+dependencies = [('GMP', gmpver)]
+
+runtest = 'check'
+
+sanity_check_paths = {
+    'files': ['lib/libmpfr.%s' % SHLIB_EXT, 'include/mpfr.h'],
+    'dirs': []
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/m/MPICH/MPICH-3.0.4-GCC-4.8.1.eb b/easybuild/easyconfigs/m/MPICH/MPICH-3.0.4-GCC-4.8.1.eb
index ffd62dfbf726924b004b15263d2d0e75b3ab74cf..f81230a16b43a7d071a58fac0cb37ae55a563fdb 100644
--- a/easybuild/easyconfigs/m/MPICH/MPICH-3.0.4-GCC-4.8.1.eb
+++ b/easybuild/easyconfigs/m/MPICH/MPICH-3.0.4-GCC-4.8.1.eb
@@ -20,9 +20,9 @@ configopts = '--enable-shared'
 
 sanity_check_paths = {
     'files': ['bin/mpicc', 'bin/mpicxx', 'bin/mpic++', 'bin/mpif77', 'bin/mpif90', 'bin/mpiexec', 'bin/mpirun',
-              'include/mpi.h', 'include/mpi.mod', 'include/mpif.h', 'lib/libfmpich.a', 'lib/libfmpich.so',
-              'lib/libmpich.a', 'lib/libmpich.so', 'lib/libmpichcxx.a', 'lib/libmpichcxx.so', 'lib/libmpichf90.a',
-              'lib/libmpichf90.so'],
+              'include/mpi.h', 'include/mpi.mod', 'include/mpif.h', 'lib/libfmpich.a', 'lib/libfmpich.%s' % SHLIB_EXT,
+              'lib/libmpich.a', 'lib/libmpich.%s' % SHLIB_EXT, 'lib/libmpichcxx.a', 'lib/libmpichcxx.%s' % SHLIB_EXT, 'lib/libmpichf90.a',
+              'lib/libmpichf90.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/m/MTL4/MTL4-4.0.9555.eb b/easybuild/easyconfigs/m/MTL4/MTL4-4.0.9555.eb
new file mode 100644
index 0000000000000000000000000000000000000000..980fa06b14f2bcabb8b9f5048ceb9a22b95152ab
--- /dev/null
+++ b/easybuild/easyconfigs/m/MTL4/MTL4-4.0.9555.eb
@@ -0,0 +1,15 @@
+name = 'MTL4'
+version = '4.0.9555'
+
+homepage = "http://www.simunova.com/mtl4"
+description = """The Matrix Template Library 4 incorporates the most modern programming techniques
+ to provide an easy and intuitive interface to users while enabling optimal performance. The natural
+ mathematical notation in MTL4 empowers all engineers and scientists to implement their algorithms and
+ models in minimal time. All technical aspects are encapsulated in the library."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+source_urls = ['http://www.simunova.com/downloads/mtl4']
+sources = ['MTL-all-%(version)s-Linux.tar.gz']
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/m/MariaDB/MariaDB-10.0.21-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/m/MariaDB/MariaDB-10.0.21-GNU-4.9.3-2.25.eb
index c56c34addfc7ef62f532258a699ae28a0d99b8fd..6e95bf258aaabe1c1b2bb12e2075569321a3023c 100644
--- a/easybuild/easyconfigs/m/MariaDB/MariaDB-10.0.21-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/m/MariaDB/MariaDB-10.0.21-GNU-4.9.3-2.25.eb
@@ -31,7 +31,7 @@ configopts = "-DCURSES_LIBRARY=$EBROOTNCURSES/lib/libncurses.so -DCURSES_INCLUDE
 configopts += " -DCMAKE_SHARED_LINKER_FLAGS='-fuse-ld=bfd' "
 
 sanity_check_paths = {
-    'files': ['bin/mysql', 'bin/mysqld_safe', 'lib/libmysqlclient.so', 'scripts/mysql_install_db'],
+    'files': ['bin/mysql', 'bin/mysqld_safe', 'lib/libmysqlclient.%s' % SHLIB_EXT, 'scripts/mysql_install_db'],
     'dirs': ['include', 'share'],
 }
 
diff --git a/easybuild/easyconfigs/m/MariaDB/MariaDB-5.5.29-ictce-4.1.13.eb b/easybuild/easyconfigs/m/MariaDB/MariaDB-5.5.29-ictce-4.1.13.eb
index 63213cd9a5df2cb3a129482a60bb7525e6e40188..ec2fa1dac83150eace066a55bc144124e4903d47 100644
--- a/easybuild/easyconfigs/m/MariaDB/MariaDB-5.5.29-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/m/MariaDB/MariaDB-5.5.29-ictce-4.1.13.eb
@@ -24,7 +24,7 @@ configopts = "-DCURSES_LIBRARY=$EBROOTNCURSES/lib/libncurses.so -DCURSES_INCLUDE
 buildopts = "VERBOSE=1"
 
 sanity_check_paths = {
-    'files': ['bin/mysql', 'bin/mysqld_safe', 'lib/libmysqlclient.so', 'scripts/mysql_install_db'],
+    'files': ['bin/mysql', 'bin/mysqld_safe', 'lib/libmysqlclient.%s' % SHLIB_EXT, 'scripts/mysql_install_db'],
     'dirs': ['include', 'share'],
 }
 
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-10.4.5-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/m/Mesa/Mesa-10.4.5-intel-2015a-Python-2.7.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9fed17ec40c48af1441505a28055c04c3c528d27
--- /dev/null
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-10.4.5-intel-2015a-Python-2.7.9.eb
@@ -0,0 +1,75 @@
+easyblock = 'ConfigureMake'
+
+name = 'Mesa'
+version = '10.4.5'
+
+homepage = 'http://www.mesa3d.org/'
+description = """Mesa is an open-source implementation of the OpenGL specification -
+ a system for rendering interactive 3D graphics."""
+
+toolchain = {'name': 'intel', 'version': '2015a'}
+toolchainopts = {'optarch': True}
+
+sources = ['%(name)sLib-%(version)s.tar.gz']
+source_urls = [
+    'ftp://ftp.freedesktop.org/pub/mesa/%(version)s',
+    'ftp://ftp.freedesktop.org/pub/mesa/older-versions/%(version_major)s.x/%(version)s',
+]
+
+patches = ['Mesa-%(version)s_sse4_1.patch']
+
+pythonver = '2.7.9'
+pythonshortver = '.'.join(pythonver.split('.')[0:2])
+versionsuffix = '-%s-%s' % ('Python', pythonver)
+
+builddependencies = [
+    ('flex', '2.5.39'),
+    ('Bison', '3.0.2'),
+    ('Automake', '1.15'),
+    ('makedepend', '1.0.5'),
+    ('kbproto', '1.0.6'),
+    ('xextproto', '7.3.0'),
+    ('xproto', '7.0.27'),
+    ('libtool', '2.4.5'),
+    ('pkg-config', '0.28'),
+    ('glproto', '1.4.17'),
+    ('M4', '1.4.17')
+]
+
+dependencies = [
+    ('Python', pythonver),
+    ('libxml2', '2.9.2', versionsuffix),
+    ('libdrm', '2.4.59'),
+    ('libX11', '1.6.3', versionsuffix),
+    ('libXext', '1.3.3'),
+    ('libXfixes', '5.0.1'),
+    ('libXdamage', '1.1.4'),
+    ('libXfont', '1.5.1'),
+    ('LLVM', '3.6.2', versionsuffix),
+    ('eudev', '3.0'),
+]
+
+#Use the os provided libudev or the EB provided eudev
+#osdependencies = ['libudev']
+
+# GLU is not part anymore of Mesa package!
+configopts = " --disable-osmesa --disable-gallium-llvm --enable-glx --disable-dri --enable-xlib-glx"
+configopts += " --disable-driglx-direct --with-gallium-drivers='' --disable-egl"""
+
+# package-config files for os dependencies are in an os specific place
+#preconfigopts = ' PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/share/pkgconfig" '
+
+prebuildopts = 'CPATH="$EBROOTLIBDRM/include/libdrm" '
+
+sanity_check_paths = {
+    'files': ['lib/libGL.%s' % SHLIB_EXT, 'include/GL/glext.h', 'include/GL/gl_mangle.h',
+              'include/GL/glx.h', 'include/GL/osmesa.h',
+              'include/GL/wglext.h', 'include/GL/gl.h',
+              'include/GL/glxext.h', 'include/GL/glx_mangle.h',
+              'include/GL/wmesa.h'],
+    'dirs': []
+}
+
+maxparallel = 1
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-10.4.5_sse4_1.patch b/easybuild/easyconfigs/m/Mesa/Mesa-10.4.5_sse4_1.patch
new file mode 100644
index 0000000000000000000000000000000000000000..11d5aee63052b932b8f90d3565751d3f5c60b110
--- /dev/null
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-10.4.5_sse4_1.patch
@@ -0,0 +1,20 @@
+#AMD Barcelona SSE4.1 capability wrongly determined.
+#http://patchwork.freedesktop.org/patch/36869/
+# B. Hajgato March 4th 2015
+--- a/src/mesa/vbo/vbo_exec_array.c
++++ b/src/mesa/vbo/vbo_exec_array.c
+@@ -121,12 +121,14 @@  vbo_get_minmax_index(struct gl_context *ctx,
+          }
+       }
+       else {
++#ifdef __SSE4_1__
+ #if defined(USE_SSE41)
+          if (cpu_has_sse4_1) {
+             _mesa_uint_array_min_max(ui_indices, &min_ui, &max_ui, count);
+          }
+          else
+ #endif
++#endif
+             for (i = 0; i < count; i++) {
+                if (ui_indices[i] > max_ui) max_ui = ui_indices[i];
+                if (ui_indices[i] < min_ui) min_ui = ui_indices[i];
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-10.5.5-intel-2015a-Python-2.7.10.eb b/easybuild/easyconfigs/m/Mesa/Mesa-10.5.5-intel-2015a-Python-2.7.10.eb
index 9f2977a63e37ca2723f34e76c3a86bc17cc7c6ac..ddd54508d05829363d88720a4b7ede83202c0c5b 100644
--- a/easybuild/easyconfigs/m/Mesa/Mesa-10.5.5-intel-2015a-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-10.5.5-intel-2015a-Python-2.7.10.eb
@@ -60,7 +60,7 @@ preconfigopts = ' libtoolize &&  '
 prebuildopts = 'CPATH="$EBROOTLIBDRM/include/libdrm" '
 
 sanity_check_paths = {
-    'files': ['lib/libGL.so', 'lib/libOSMesa.so',
+    'files': ['lib/libGL.%s' % SHLIB_EXT, 'lib/libOSMesa.%s' % SHLIB_EXT,
               'include/GL/glext.h', 'include/GL/gl_mangle.h',
               'include/GL/glx.h', 'include/GL/osmesa.h',
               'include/GL/wglext.h', 'include/GL/gl.h',
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-11.0.2-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/m/Mesa/Mesa-11.0.2-intel-2015b-Python-2.7.10.eb
index aedf550c92b093cf20573031802527a329aa9706..3e51cbc3cf3299cccff9186e28d98a60e711240e 100644
--- a/easybuild/easyconfigs/m/Mesa/Mesa-11.0.2-intel-2015b-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-11.0.2-intel-2015b-Python-2.7.10.eb
@@ -59,8 +59,8 @@ preconfigopts = ' libtoolize &&  '
 prebuildopts = 'CPATH="$EBROOTLIBDRM/include/libdrm" '
 
 sanity_check_paths = {
-    'files': ['lib/libGL.so', 'lib/libOSMesa.so',
-              'lib/libGLESv1_CM.so', 'lib/libGLESv2.so',
+    'files': ['lib/libGL.%s' % SHLIB_EXT, 'lib/libOSMesa.%s' % SHLIB_EXT,
+              'lib/libGLESv1_CM.%s' % SHLIB_EXT, 'lib/libGLESv2.%s' % SHLIB_EXT,
               'include/GL/glext.h', 'include/GL/gl_mangle.h',
               'include/GL/glx.h', 'include/GL/osmesa.h',
               'include/GL/wglext.h', 'include/GL/gl.h',
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-11.0.8-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/m/Mesa/Mesa-11.0.8-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5bc1c00683acd05f0b7fd65669636c08600512c6
--- /dev/null
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-11.0.8-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,75 @@
+easyblock = 'ConfigureMake'
+
+name = 'Mesa'
+version = '11.0.8'
+
+homepage = 'http://www.mesa3d.org/'
+description = """Mesa is an open-source implementation of the OpenGL specification -
+ a system for rendering interactive 3D graphics."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'optarch': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+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.11'
+pythonshortver = '.'.join(pythonver.split('.')[0:2])
+versionsuffix = '-%s-%s' % ('Python', pythonver)
+
+builddependencies = [
+    ('flex', '2.5.39'),
+    ('Bison', '3.0.4'),
+    ('Autotools', '20150215', '', ('GNU', '4.9.3-2.25')),
+    ('pkg-config', '0.29'),
+    ('glproto', '1.4.17'),
+    ('kbproto', '1.0.7'),
+    ('xextproto', '7.3.0'),
+    ('xproto', '7.0.28'),
+    ('makedepend', '1.0.5'),
+]
+
+dependencies = [
+    ('Python', pythonver),
+    ('libxml2', '2.9.3', versionsuffix),
+    ('libdrm', '2.4.66'),
+    ('libX11', '1.6.3', versionsuffix),
+    ('libXext', '1.3.3', versionsuffix),
+    ('libXfixes', '5.0.1'),
+    ('libXdamage', '1.1.4', versionsuffix),
+    ('libXfont', '1.5.1', versionsuffix),
+    ('LLVM', '3.7.1'),
+    ('eudev', '3.1.5'),
+]
+
+#Use the os provided libudev or the EB provided eudev
+#osdependencies = ['libudev']
+
+# GLU is not part anymore of Mesa package!
+configopts = " --disable-osmesa --enable-gallium-osmesa --enable-gallium-llvm --enable-glx --disable-dri --enable-xlib-glx"
+configopts += " --disable-driglx-direct --with-gallium-drivers='swrast' --disable-egl --with-osmesa-bits=32 --enable-texture-float "
+
+# package-config files for os dependencies are in an os specific place
+#preconfigopts = 'libtoolize && PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/share/pkgconfig" '
+preconfigopts = ' libtoolize &&  '
+
+prebuildopts = 'CPATH="$EBROOTLIBDRM/include/libdrm" '
+
+sanity_check_paths = {
+    'files': ['lib/libGL.so', 'lib/libOSMesa.so',
+              'lib/libGLESv1_CM.so', 'lib/libGLESv2.so',
+              'include/GL/glext.h', 'include/GL/gl_mangle.h',
+              'include/GL/glx.h', 'include/GL/osmesa.h',
+              'include/GL/wglext.h', 'include/GL/gl.h',
+              'include/GL/glxext.h', 'include/GL/glx_mangle.h',
+              'include/GLES/gl.h', 'include/GLES2/gl2.h',
+              'include/GLES3/gl3.h'],
+    'dirs': []
+}
+
+maxparallel = 1
+
+moduleclass = 'vis'
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 11985c41cfaf29544eed364418c0d9fe1590e1ce..071c95fba21833ccaa0110341b6e78ed753d4260 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
@@ -33,8 +33,8 @@ dependencies = [
 osdependencies = [
             'libX11-devel',  # Xlibs.h
             'xorg-x11-proto-devel',  # X.h, glproto, xproto
-            'libXdamage-devel', 
-            'libXext-devel', 
+            'libXdamage-devel',
+            'libXext-devel',
             'libXfixes-devel',
         ]
 
@@ -46,8 +46,8 @@ preconfigopts = ' PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/s
 
 prebuildopts = 'CPATH="$EBROOTLIBDRM/include/libdrm" '
 
-sanity_check_paths = { 
-    'files': ['lib/libGL.so', 'lib/libGLU.so', 'include/GL/glext.h', 'include/GL/gl_mangle.h',
+sanity_check_paths = {
+    'files': ['lib/libGL.%s' % SHLIB_EXT, 'lib/libGLU.%s' % SHLIB_EXT, 'include/GL/glext.h', 'include/GL/gl_mangle.h',
               'include/GL/glu_mangle.h', 'include/GL/glx.h', 'include/GL/osmesa.h', 'include/GL/wglext.h',
               'include/GL/gl.h', 'include/GL/glu.h', 'include/GL/glxext.h', 'include/GL/glx_mangle.h',
               'include/GL/vms_x_fix.h', 'include/GL/wmesa.h'],
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 0efe09a06f4260b85ce18d2bfa1943700fc3b012..3fa0d3f751f1389f5244bc6c8a34f43a0d175d36 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
@@ -32,8 +32,8 @@ dependencies = [
 osdependencies = [
             'libX11-devel',  # Xlibs.h
             'xorg-x11-proto-devel',  # X.h, glproto, xproto
-            'libXdamage-devel', 
-            'libXext-devel', 
+            'libXdamage-devel',
+            'libXext-devel',
             'libXfixes-devel',
         ]
 
@@ -45,8 +45,8 @@ preconfigopts = ' PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/s
 
 prebuildopts = 'CPATH="$EBROOTLIBDRM/include/libdrm" '
 
-sanity_check_paths = { 
-    'files': ['lib/libGL.so', 'lib/libGLU.so', 'include/GL/glext.h', 'include/GL/gl_mangle.h',
+sanity_check_paths = {
+    'files': ['lib/libGL.%s' % SHLIB_EXT, 'lib/libGLU.%s' % SHLIB_EXT, 'include/GL/glext.h', 'include/GL/gl_mangle.h',
               'include/GL/glu_mangle.h', 'include/GL/glx.h', 'include/GL/osmesa.h', 'include/GL/wglext.h',
               'include/GL/gl.h', 'include/GL/glu.h', 'include/GL/glxext.h', 'include/GL/glx_mangle.h',
               'include/GL/vms_x_fix.h', 'include/GL/wmesa.h'],
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 7c14a3454506c7db7c8a5696d1c938e22b641eb5..864dc0bea3033a68446471667d3c1819b2a4c74f 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
@@ -33,8 +33,8 @@ dependencies = [
 osdependencies = [
             'libX11-devel',  # Xlibs.h
             'xorg-x11-proto-devel',  # X.h, glproto, xproto
-            'libXdamage-devel', 
-            'libXext-devel', 
+            'libXdamage-devel',
+            'libXext-devel',
             'libXfixes-devel',
         ]
 
@@ -46,8 +46,8 @@ preconfigopts = ' PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/s
 
 prebuildopts = 'CPATH="$EBROOTLIBDRM/include/libdrm" '
 
-sanity_check_paths = { 
-    'files': ['lib/libGL.so', 'lib/libGLU.so', 'include/GL/glext.h', 'include/GL/gl_mangle.h',
+sanity_check_paths = {
+    'files': ['lib/libGL.%s' % SHLIB_EXT, 'lib/libGLU.%s' % SHLIB_EXT, 'include/GL/glext.h', 'include/GL/gl_mangle.h',
               'include/GL/glu_mangle.h', 'include/GL/glx.h', 'include/GL/osmesa.h', 'include/GL/wglext.h',
               'include/GL/gl.h', 'include/GL/glu.h', 'include/GL/glxext.h', 'include/GL/glx_mangle.h',
               'include/GL/vms_x_fix.h', 'include/GL/wmesa.h'],
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-4.1.13-Python-2.7.3.eb
index 4f8581ed6aba38000872feb72845a40814548049..4ae1b349117163e193e71f0a65830cee7cb5829d 100644
--- a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-4.1.13-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-4.1.13-Python-2.7.3.eb
@@ -33,8 +33,8 @@ dependencies = [
 osdependencies = [
     'libX11-devel',  # Xlibs.h
     'xorg-x11-proto-devel',  # X.h, glproto, xproto
-    'libXdamage-devel', 
-    'libXext-devel', 
+    'libXdamage-devel',
+    'libXext-devel',
     'libXfixes-devel',
 ]
 
@@ -46,8 +46,8 @@ preconfigopts = ' PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/s
 
 prebuildopts = 'CPATH="$EBROOTLIBDRM/include/libdrm" '
 
-sanity_check_paths = { 
-    'files': ['lib/libGL.so', 'lib/libGLU.so', 'include/GL/glext.h', 'include/GL/gl_mangle.h',
+sanity_check_paths = {
+    'files': ['lib/libGL.%s' % SHLIB_EXT, 'lib/libGLU.%s' % SHLIB_EXT, 'include/GL/glext.h', 'include/GL/gl_mangle.h',
               'include/GL/glu_mangle.h', 'include/GL/glx.h', 'include/GL/osmesa.h', 'include/GL/wglext.h',
               'include/GL/gl.h', 'include/GL/glu.h', 'include/GL/glxext.h', 'include/GL/glx_mangle.h',
               'include/GL/vms_x_fix.h', 'include/GL/wmesa.h'],
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 fc5542e2ee708e03b793fa7e2262e6bbad09591d..8f7b8fd9e1830bc0368eddbe80bc24b0d21283a0 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
@@ -34,8 +34,8 @@ dependencies = [
 osdependencies = [
             'libX11-devel',  # Xlibs.h
             'xorg-x11-proto-devel',  # X.h, glproto, xproto
-            'libXdamage-devel', 
-            'libXext-devel', 
+            'libXdamage-devel',
+            'libXext-devel',
             'libXfixes-devel',
         ]
 
@@ -47,8 +47,8 @@ preconfigopts = ' PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/s
 
 prebuildopts = 'CPATH="$EBROOTLIBDRM/include/libdrm" '
 
-sanity_check_paths = { 
-    'files': ['lib/libGL.so', 'lib/libGLU.so', 'include/GL/glext.h', 'include/GL/gl_mangle.h',
+sanity_check_paths = {
+    'files': ['lib/libGL.%s' % SHLIB_EXT, 'lib/libGLU.%s' % SHLIB_EXT, 'include/GL/glext.h', 'include/GL/gl_mangle.h',
               'include/GL/glu_mangle.h', 'include/GL/glx.h', 'include/GL/osmesa.h', 'include/GL/wglext.h',
               'include/GL/gl.h', 'include/GL/glu.h', 'include/GL/glxext.h', 'include/GL/glx_mangle.h',
               'include/GL/vms_x_fix.h', 'include/GL/wmesa.h'],
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-5.5.0-Python-2.7.6.eb
index 3534cda3ad65c631c4f02782d87f97749fd500f6..9c7388d8246c45918ac2586d5b032bc8f0748761 100644
--- a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-5.5.0-Python-2.7.6.eb
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-5.5.0-Python-2.7.6.eb
@@ -48,7 +48,7 @@ preconfigopts = ' PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/s
 prebuildopts = 'CPATH="$EBROOTLIBDRM/include/libdrm" '
 
 sanity_check_paths = {
-    'files': ['lib/libGL.so', 'lib/libGLU.so', 'include/GL/glext.h', 'include/GL/gl_mangle.h',
+    'files': ['lib/libGL.%s' % SHLIB_EXT, 'lib/libGLU.%s' % SHLIB_EXT, 'include/GL/glext.h', 'include/GL/gl_mangle.h',
               'include/GL/glu_mangle.h', 'include/GL/glx.h', 'include/GL/osmesa.h',
               'include/GL/wglext.h', 'include/GL/gl.h', 'include/GL/glu.h',
               'include/GL/glxext.h', 'include/GL/glx_mangle.h', 'include/GL/vms_x_fix.h',
diff --git a/easybuild/easyconfigs/m/MethPipe/MethPipe-3.0.1-goolf-1.4.10.eb b/easybuild/easyconfigs/m/MethPipe/MethPipe-3.0.1-goolf-1.4.10.eb
index 852c1e30669303caac780f1e4734b9e7c027d706..5ee01321f8a8084a5ddbc0b59bd3388331737ecc 100644
--- a/easybuild/easyconfigs/m/MethPipe/MethPipe-3.0.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/m/MethPipe/MethPipe-3.0.1-goolf-1.4.10.eb
@@ -32,8 +32,8 @@ files_to_copy = ["bin", "docs"]
 
 sanity_check_paths = {
     'files': ["bin/%s" % x for x in ["allelicmeth", "amrfinder", "amrtester", "bsrate", "dmr",
-                                     "duplicate-remover", "hmr", "hmr_plant", "lc_approx","levels", 
-                                     "merge-bsrate", "merge-methcounts", "methcounts","methdiff", 
+                                     "duplicate-remover", "hmr", "hmr_plant", "lc_approx","levels",
+                                     "merge-bsrate", "merge-methcounts", "methcounts","methdiff",
                                      "methstates", "pmd", "rmapbs", "rmapbs-pe", "roimethstat", "to-mr"]],
     'dirs': ['docs'],
 }
diff --git a/easybuild/easyconfigs/m/MethPipe/MethPipe-3.0.1-intel-2014b.eb b/easybuild/easyconfigs/m/MethPipe/MethPipe-3.0.1-intel-2014b.eb
index 2c109b355724aba5d1974479ac18cb08ff24c15f..546db6338aa1f5535328d68f1957b1b8e2267e5c 100644
--- a/easybuild/easyconfigs/m/MethPipe/MethPipe-3.0.1-intel-2014b.eb
+++ b/easybuild/easyconfigs/m/MethPipe/MethPipe-3.0.1-intel-2014b.eb
@@ -32,8 +32,8 @@ files_to_copy = ["bin", "docs"]
 
 sanity_check_paths = {
     'files': ["bin/%s" % x for x in ["allelicmeth", "amrfinder", "amrtester", "bsrate", "dmr",
-                                     "duplicate-remover", "hmr", "hmr_plant", "lc_approx","levels", 
-                                     "merge-bsrate", "merge-methcounts", "methcounts","methdiff", 
+                                     "duplicate-remover", "hmr", "hmr_plant", "lc_approx","levels",
+                                     "merge-bsrate", "merge-methcounts", "methcounts","methdiff",
                                      "methstates", "pmd", "rmapbs", "rmapbs-pe", "roimethstat", "to-mr"]],
     'dirs': ['docs'],
 }
diff --git a/easybuild/easyconfigs/m/Molpro/Molpro-2012.1.27-intel-2015a.eb b/easybuild/easyconfigs/m/Molpro/Molpro-2012.1.27-intel-2015a.eb
index bfa90c0102678c6848c8e75e748d21d5471dd1b9..519d0887cc6bcde316957c81c2ad13afebd29555 100644
--- a/easybuild/easyconfigs/m/Molpro/Molpro-2012.1.27-intel-2015a.eb
+++ b/easybuild/easyconfigs/m/Molpro/Molpro-2012.1.27-intel-2015a.eb
@@ -1,7 +1,7 @@
 name = 'Molpro'
 version = '2012.1.27'
 
-homepage = 'https://molpro.net'
+homepage = 'https://www.molpro.net'
 description = """Molpro is a complete system of ab initio programs for molecular electronic structure calculations."""
 
 toolchain = {'name': 'intel', 'version': '2015a'}
diff --git a/easybuild/easyconfigs/m/Molpro/Molpro-mpp-2010.1.23.Linux_x86_64.eb b/easybuild/easyconfigs/m/Molpro/Molpro-mpp-2010.1.23.Linux_x86_64.eb
new file mode 100644
index 0000000000000000000000000000000000000000..25842fde1cbdab04660df875ce9b9ebaefc805d7
--- /dev/null
+++ b/easybuild/easyconfigs/m/Molpro/Molpro-mpp-2010.1.23.Linux_x86_64.eb
@@ -0,0 +1,21 @@
+name = 'Molpro'
+versionprefix = 'mpp-'
+version = '2010.1.23'
+versionsuffix = '.Linux_x86_64'
+
+homepage = 'https://www.molpro.net'
+description = """Molpro is a complete system of ab initio programs for molecular electronic structure calculations."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+# no source URL available, requires registration to download
+sources = ['%(namelower)s-%(versionprefix)s%(version)s%(versionsuffix)s.sh']
+patches = ['%(name)s-%(versionprefix)s%(version)s%(versionsuffix)s.patch']
+precompiled_binaries = True
+
+# license file - uncomment if a licence file is supplied by your site and
+# is valid for all users - the value of license_file may have to be changed
+#import os
+#license_file = os.path.join(os.getenv('HOME'), 'licenses', name, 'license.lic')
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/m/Molpro/Molpro-mpp-2010.1.23.Linux_x86_64.patch b/easybuild/easyconfigs/m/Molpro/Molpro-mpp-2010.1.23.Linux_x86_64.patch
new file mode 100644
index 0000000000000000000000000000000000000000..05094b69467c67a6926cdd5dac0893cb61a7e975
--- /dev/null
+++ b/easybuild/easyconfigs/m/Molpro/Molpro-mpp-2010.1.23.Linux_x86_64.patch
@@ -0,0 +1,18 @@
+be verbose about not having a license token available
+author: Benjamin Roberts (NeSI)
+--- molpro-mpp-2010.1.23.Linux_x86_64.sh	2015-09-02 12:57:08.239724674 +1200
++++ molpro-mpp-2010.1.23.Linux_x86_64.sh	2015-09-02 13:01:18.998587159 +1200
+@@ -156,7 +156,12 @@
+  eval ${download} "https://www.molpro.net/licensee/token" 1>/dev/null 2>&1 || rm -f ${INSTLIB}/.token
+ fi
+ 
+-if [ -f ${INSTLIB}/.token ] ; then
++if [ ! -f ${INSTLIB}/.token ] ; then
++ echo ""
++ echo "Licence token could not be installed successfully."
++ echo "A licence token must be provided whenever running Molpro."
++ exit 0
++else
+  chmod 0644 ${INSTLIB}/.token
+  echo
+  echo Token sucessfully downloaded and installed
diff --git a/easybuild/easyconfigs/m/Molpro/Molpro-mpp-2015.1.0.linux_x86_64_intel.eb b/easybuild/easyconfigs/m/Molpro/Molpro-mpp-2015.1.0.linux_x86_64_intel.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3d1681fc2e6200a3d33c6255254a2f99a1efb8f0
--- /dev/null
+++ b/easybuild/easyconfigs/m/Molpro/Molpro-mpp-2015.1.0.linux_x86_64_intel.eb
@@ -0,0 +1,21 @@
+name = 'Molpro'
+versionprefix = 'mpp-'
+version = '2015.1.0'
+versionsuffix = '.linux_x86_64_intel'
+
+homepage = 'https://www.molpro.net'
+description = """Molpro is a complete system of ab initio programs for molecular electronic structure calculations."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+# no source URL available, requires registration to download
+sources = ['%(namelower)s-%(versionprefix)s%(version)s%(versionsuffix)s.sh']
+
+precompiled_binaries = True
+
+# license file - uncomment if a licence file is supplied by your site and
+# is valid for all users - the value of license_file may have to be changed
+#import os
+#license_file = os.path.join(os.getenv('HOME'), 'licenses', name, 'license.lic')
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/m/MotEvo/MotEvo-1.02-goolf-1.4.10.eb b/easybuild/easyconfigs/m/MotEvo/MotEvo-1.02-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ce172894c99a789873ef5887f952da323e644334
--- /dev/null
+++ b/easybuild/easyconfigs/m/MotEvo/MotEvo-1.02-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 = 'MotEvo'
+version = '1.02'
+
+homepage = 'http://swissregulon.unibas.ch/fcgi/sr/software'
+description = """ MotEvo: a integrated suite of Bayesian probabilistic methods for 
+ the prediction of TFBSs and inference of regulatory motifs from multiple alignments 
+ of phylogenetically related DNA sequences """
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['http://www.swissregulon.unibas.ch/software/motevo/']
+sources = ['%(namelower)s_v%(version)s.tar.gz']
+
+start_dir = "source"
+
+parallel = 1
+
+files_to_copy = ["../*"] 
+
+sanity_check_paths = {
+    'files': ["bin/motevo", "bin/runUFE"],
+    'dirs': ["weight_matrices", "trees", "weight_matrices"],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/m/Mothur/Mothur-1.36.1-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/m/Mothur/Mothur-1.36.1-intel-2015b-Python-2.7.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d04ad20cc6d9da1aee719b997b9368c5ced988bc
--- /dev/null
+++ b/easybuild/easyconfigs/m/Mothur/Mothur-1.36.1-intel-2015b-Python-2.7.10.eb
@@ -0,0 +1,29 @@
+name = 'Mothur'
+version = '1.36.1'
+python = 'Python'
+pyver = '2.7.10'
+versionsuffix = '-%s-%s' % (python, pyver)
+
+homepage = 'http://www.mothur.org/'
+description = """Mothur is a single piece of open-source, expandable software
+ to fill the bioinformatics needs of the microbial ecology community."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'usempi': True}
+
+source_urls = ['https://github.com/mothur/mothur/archive/']
+sources = ['v%(version)s.tar.gz']
+
+patches = ['%(name)s-%(version)s_makefile-hardcoding.patch']
+
+dependencies = [
+    (python, pyver),
+    ('Boost', '1.59.0', versionsuffix),
+    ('libreadline', '6.3'),
+    ('ncurses', '5.9'),
+    ('bzip2', '1.0.6'),
+    ('gzip', '1.6'),
+    ('zlib', '1.2.8'),
+]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/m/Mothur/Mothur-1.36.1_makefile-hardcoding.patch b/easybuild/easyconfigs/m/Mothur/Mothur-1.36.1_makefile-hardcoding.patch
new file mode 100644
index 0000000000000000000000000000000000000000..83e04782d640c7e5d24f17e1d8561bbc462acda6
--- /dev/null
+++ b/easybuild/easyconfigs/m/Mothur/Mothur-1.36.1_makefile-hardcoding.patch
@@ -0,0 +1,68 @@
+--- makefile.org	2015-07-27 16:18:26.000000000 +0200
++++ makefile	2016-01-18 13:37:34.624809549 +0100
+@@ -18,12 +18,12 @@
+ VERSION = "\"1.36.1\""
+ 
+ # Optimize to level 3:
+-CXXFLAGS += -O3
++#CXXFLAGS += -O3
+ 
+ 
+ ifeq  ($(strip $(64BIT_VERSION)),yes)
+     #if you are a mac user use the following line
+-    TARGET_ARCH += -arch x86_64
++    #TARGET_ARCH += -arch x86_64
+ 
+     #if you using cygwin to build Windows the following line
+     #CXX = x86_64-w64-mingw32-g++
+@@ -58,20 +58,20 @@
+ 
+ 
+ ifeq  ($(strip $(USEMPI)),yes)
+-    CXX = mpic++
++    CXX = $(MPICXX)
+     CXXFLAGS += -DUSE_MPI
+ endif
+ 
+ #The boost libraries allow you to read gz files.
+ ifeq  ($(strip $(USEBOOST)),yes)
+-    BOOST_INCLUDE_DIR="/usr/local/include"
+-    BOOST_LIBRARY_DIR="/usr/local/lib"
++    BOOST_INCLUDE_DIR=$(EBROOTBOOST)/include
++    BOOST_LIBRARY_DIR=$(EBROOTBOOST)/lib
+ 
+     CXXFLAGS += -DUSE_BOOST
+ 
+     LIBS += \
+     ${BOOST_LIBRARY_DIR}/libboost_iostreams.a \
+-    ${BOOST_LIBRARY_DIR}/zlib.a
++    ${EBROOTZLIB}/lib/libz.a
+ 
+     #if linux or windows then ${BOOST_LIBRARY_DIR}/libz.a
+ endif
+--- source/uchime_src/mk.orig	2015-07-27 16:18:26.000000000 +0200
++++ source/uchime_src/mk	2016-01-18 14:07:56.834224506 +0100
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/bash -v
+ CPPNames='addtargets2 alignchime alignchimel alnparams alpha alpha2 fractid getparents globalalign2 make3way mx myutils path searchchime seqdb setnucmx sfasta tracebackbit uchime_main usort viterbifast writechhit'
+ ObjNames='addtargets2.o alignchime.o alignchimel.o alnparams.o alpha.o alpha2.o fractid.o getparents.o globalalign2.o make3way.o mx.o myutils.o path.o searchchime.o seqdb.o setnucmx.o sfasta.o tracebackbit.o uchime_main.o usort.o viterbifast.o writechhit.o'
+ 
+@@ -7,7 +7,7 @@
+ for CPPName in $CPPNames
+ do
+   echo $CPPName >> /dev/tty
+-  g++ $ENV_GCC_OPTS -c -O3 -msse2 -mfpmath=sse -D_FILE_OFFSET_BITS=64 -DNDEBUG=1 -DUCHIMES=1 $CPPName.cpp -o $CPPName.o  >> mk.stdout 2>> tmp.stderr
++  $CXX $ENV_GCC_OPTS -c $CXXFLAGS -D_FILE_OFFSET_BITS=64 -DNDEBUG=1 -DUCHIMES=1 $CPPName.cpp -o $CPPName.o  >> mk.stdout 2>> tmp.stderr
+ 	cat tmp.stderr
+ 	cat tmp.stderr >> mk.stderr
+ 	rm -f tmp.stderr
+@@ -17,7 +17,7 @@
+ if [ `uname -s` == Linux ] ; then
+     LINK_OPTS=-static
+ fi
+-g++ $LINK_OPTS $ENV_LINK_OPTS -g -o uchime $ObjNames >> mk.stdout 2>> tmp.stderr
++$CXX $CXXFLAGS $ENV_LINK_OPTS -o uchime $ObjNames >> mk.stdout 2>> tmp.stderr
+ cat tmp.stderr
+ cat tmp.stderr >> mk.stderr
+ rm -f tmp.stderr
diff --git a/easybuild/easyconfigs/m/MultiNest/MultiNest-3.10-intel-2015b.eb b/easybuild/easyconfigs/m/MultiNest/MultiNest-3.10-intel-2015b.eb
index fc01056a67ea8d53a9be47d4765a68956f33b228..1640a345124dbac11b93bd4a5b352a490644e17f 100644
--- a/easybuild/easyconfigs/m/MultiNest/MultiNest-3.10-intel-2015b.eb
+++ b/easybuild/easyconfigs/m/MultiNest/MultiNest-3.10-intel-2015b.eb
@@ -18,7 +18,7 @@ builddependencies = [('CMake', '3.4.0')]
 sanity_check_paths = {
     'files': ['bin/%s' % x for x in ['ackley', 'eggboxC', 'eggboxC++', 'gaussian', 'gauss_shell', 'himmelblau',
                                      'obj_detect', 'rosenbrock']] +
-             ['lib/lib%s' % x for x in ['multinest.a', 'multinest_mpi.a', 'multinest_mpi.so', 'multinest.so']] +
+             ['lib/lib%s' % x for x in ['multinest.a', 'multinest_mpi.a', 'multinest_mpi.%s' % SHLIB_EXT, 'multinest.%s' % SHLIB_EXT]] +
              ['include/multinest.h'],
     'dirs': ['modules'],
 }
diff --git a/easybuild/easyconfigs/m/make/make-4.1-GCC-4.9.2.eb b/easybuild/easyconfigs/m/make/make-4.1-GCC-4.9.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..bff321b4b29d6cdc8897f6eec09d733c38c6281c
--- /dev/null
+++ b/easybuild/easyconfigs/m/make/make-4.1-GCC-4.9.2.eb
@@ -0,0 +1,30 @@
+##
+# This file is an EasyBuild recipy as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Fotis Georgatos <fotis@cern.ch>
+# 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/
+##
+easyblock = 'ConfigureMake'
+
+name = 'make'
+version = '4.1'
+
+homepage = 'http://www.gnu.org/software/make/make.html'
+description = "GNU version of make utility"
+
+toolchain = {'name': 'GCC', 'version': '4.9.2'}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCE_TAR_BZ2]
+
+sanity_check_paths = {
+    'files': ['bin/make'],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-goalf-1.1.0-no-OFED.eb
index 10d8f0fdb3e78fb7c10d908182beaa6ec444ea30..529c59d6aba10d54c2991f9f5528f173fd165401 100644
--- a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-goalf-1.1.0-no-OFED.eb
@@ -12,7 +12,7 @@ toolchainopts = {'optarch': True}
 sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/releases/individual/util']
 
-sanity_check_paths = { 
+sanity_check_paths = {
     'files': ['bin/makedepend'],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-goolf-1.4.10.eb b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-goolf-1.4.10.eb
index ff1abe689361c85bb092676c405858a18d97d57a..df5d7baa125c52d859ae11538a6ae946bd200b37 100644
--- a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-goolf-1.4.10.eb
@@ -11,7 +11,7 @@ toolchainopts = {'optarch': True}
 sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/releases/individual/util']
 
-sanity_check_paths = { 
+sanity_check_paths = {
     'files': ['bin/makedepend'],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-3.2.2.u3.eb
index 790eefcde4e2ee9a68c3062d8a78c35813d1e879..3d0c89f8f228c1c056d837e03d0d34fe6c3b293c 100644
--- a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-3.2.2.u3.eb
+++ b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-3.2.2.u3.eb
@@ -14,7 +14,7 @@ source_urls = ['http://xorg.freedesktop.org/releases/individual/util']
 
 patches = ['makedepend_icc-sigaction.patch']
 
-sanity_check_paths = { 
+sanity_check_paths = {
     'files': ['bin/makedepend'],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-4.0.6.eb b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-4.0.6.eb
index 94b2544e16ba273e54977ade6328541ffd6dde51..fa3bc9877b6a9c36389cf63955af2bd82753c89c 100644
--- a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-4.0.6.eb
@@ -12,7 +12,7 @@ toolchainopts = {'optarch': True}
 sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/releases/individual/util']
 
-sanity_check_paths = { 
+sanity_check_paths = {
     'files': ['bin/makedepend'],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-4.1.13.eb b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-4.1.13.eb
index c0f71c373d449bf4b96bb9e56b3f9a7e16785bcd..3f3fa2cba5d9065c78548167f85db67d2e486934 100644
--- a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-4.1.13.eb
@@ -12,7 +12,7 @@ toolchainopts = {'optarch': True}
 sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/releases/individual/util']
 
-sanity_check_paths = { 
+sanity_check_paths = {
     'files': ['bin/makedepend'],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-5.3.0.eb b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-5.3.0.eb
index 39683b811c08f77b73d659e82050830131403f15..653ce13c66c3c2003357bbcf76640681f9030d69 100644
--- a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-5.3.0.eb
@@ -13,7 +13,7 @@ toolchainopts = {'optarch': True}
 sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/releases/individual/util']
 
-sanity_check_paths = { 
+sanity_check_paths = {
     'files': ['bin/makedepend'],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-iqacml-3.7.3.eb b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-iqacml-3.7.3.eb
index 34e982133e2bf19e8379fcf7d7dfcdf579d60c8e..a42c1e4ac5e81cf3e4f35264555e3fa0c9ac6cf5 100644
--- a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-iqacml-3.7.3.eb
+++ b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-iqacml-3.7.3.eb
@@ -14,7 +14,7 @@ source_urls = ['http://xorg.freedesktop.org/releases/individual/util']
 
 patches = ['makedepend_icc-sigaction.patch']
 
-sanity_check_paths = { 
+sanity_check_paths = {
     'files': ['bin/makedepend'],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..192e60d3a1522ed45d0e030997eb9ea3cde58b2d
--- /dev/null
+++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,32 @@
+easyblock = 'PythonPackage'
+
+name = 'matplotlib'
+version = '1.5.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': 'intel', 'version': '2016a'}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+pyver = '2.7.11'
+pyshortver = '.'.join(pyver.split('.')[:2])
+
+versionsuffix = '-Python-%s' % pyver
+
+dependencies = [
+    ('Python', pyver),
+    ('freetype', '2.6.2'),
+    ('libpng', '1.6.21'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%s/site-packages' % pyshortver],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/m/mdtest/mdtest-1.7.1-goolf-1.4.10.eb b/easybuild/easyconfigs/m/mdtest/mdtest-1.7.1-goolf-1.4.10.eb
index 6c2df30046b9baffb45d453fde3aecf1ef8d9ae3..f389f068078ce10e2120e00505787582a0a331c2 100644
--- a/easybuild/easyconfigs/m/mdtest/mdtest-1.7.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/m/mdtest/mdtest-1.7.1-goolf-1.4.10.eb
@@ -25,8 +25,8 @@ parallel = 1
 buildopts = ' CC="$CC"'
 
 files_to_copy = [
-        (['mdtest'], 'bin'), 
-        "README", 
+        (['mdtest'], 'bin'),
+        "README",
         "COPYRIGHT",
 ]
 
diff --git a/easybuild/easyconfigs/m/mdtest/mdtest-1.7.1-ictce-6.2.5.eb b/easybuild/easyconfigs/m/mdtest/mdtest-1.7.1-ictce-6.2.5.eb
index d5a5cb84d436991d52b80dd432426a30db5e1113..9444c160fdaf0605aa94ebce2300c055f506607e 100644
--- a/easybuild/easyconfigs/m/mdtest/mdtest-1.7.1-ictce-6.2.5.eb
+++ b/easybuild/easyconfigs/m/mdtest/mdtest-1.7.1-ictce-6.2.5.eb
@@ -25,8 +25,8 @@ parallel = 1
 buildopts = ' CC="$CC"'
 
 files_to_copy = [
-        (['mdtest'], 'bin'), 
-        "README", 
+        (['mdtest'], 'bin'),
+        "README",
         "COPYRIGHT",
 ]
 
diff --git a/easybuild/easyconfigs/m/mdtest/mdtest-1.9.3-goolf-1.4.10.eb b/easybuild/easyconfigs/m/mdtest/mdtest-1.9.3-goolf-1.4.10.eb
index aaa351515085644ec98850874bf2693eff974854..a7dcc82e6246c99b71df04399062292e10967cd7 100644
--- a/easybuild/easyconfigs/m/mdtest/mdtest-1.9.3-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/m/mdtest/mdtest-1.9.3-goolf-1.4.10.eb
@@ -25,9 +25,9 @@ parallel = 1
 buildopts = ' CC="$CC"'
 
 files_to_copy = [
-        (['mdtest'], 'bin'), 
-        (['mdtest.1'], 'man/man1'), 
-        "README", 
+        (['mdtest'], 'bin'),
+        (['mdtest.1'], 'man/man1'),
+        "README",
         "RELEASE_LOG",
         "scripts"
 ]
diff --git a/easybuild/easyconfigs/m/mdtest/mdtest-1.9.3-ictce-6.2.5.eb b/easybuild/easyconfigs/m/mdtest/mdtest-1.9.3-ictce-6.2.5.eb
index 28fb4bd0ad69071be90cb209ca4daebe2d2360a7..2085a445de5b832dce805e4b91292aeb36de2fa1 100644
--- a/easybuild/easyconfigs/m/mdtest/mdtest-1.9.3-ictce-6.2.5.eb
+++ b/easybuild/easyconfigs/m/mdtest/mdtest-1.9.3-ictce-6.2.5.eb
@@ -25,9 +25,9 @@ parallel = 1
 buildopts = ' CC="$CC"'
 
 files_to_copy = [
-        (['mdtest'], 'bin'), 
-        (['mdtest.1'], 'man/man1'), 
-        "README", 
+        (['mdtest'], 'bin'),
+        (['mdtest.1'], 'man/man1'),
+        "README",
         "RELEASE_LOG",
         "scripts"
 ]
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
index 98f6b375dfec77f5e8f773681483a034c6e86d98..de5230e1fac51acfacbc625d8ee814e64c46fff4 100644
--- 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
@@ -14,7 +14,7 @@ source_urls = [
     GOOGLECODE_SOURCE,
 ]
 sources = [SOURCE_TAR_GZ]
-                                      
+
 python = 'Python'
 pyver = '2.7.3'
 versionsuffix = '-%s-%s' % (python, pyver)
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 58e1efec953d6fd93286aa4b10b8a37d7ecd387d..c04cd339fdfce0b24ab24598f654c7eeedb661fb 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
@@ -14,7 +14,7 @@ source_urls = [
     GOOGLECODE_SOURCE,
 ]
 sources = [SOURCE_TAR_GZ]
-                                      
+
 python = 'Python'
 pyver = '2.7.3'
 versionsuffix = '-%s-%s' % (python, pyver)
diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goolf-1.4.10-Python-3.2.3.eb b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goolf-1.4.10-Python-3.2.3.eb
index 8d1017dab1d5529822d9b1a8e68480c9d24dc6b3..bc0d20fdcba25ccdaeb0ba5af7355f4efe7e374d 100644
--- a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goolf-1.4.10-Python-3.2.3.eb
+++ b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goolf-1.4.10-Python-3.2.3.eb
@@ -15,7 +15,7 @@ source_urls = [
     GOOGLECODE_SOURCE,
 ]
 sources = [SOURCE_TAR_GZ]
-                                      
+
 python = 'Python'
 pyver = '3.2.3'
 versionsuffix = '-%s-%s' % (python, pyver)
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 fff549de1f9e5125088caae9bd42a07e5552d25d..ad06de5d4f6dffeb4d8887fe81d6e3729e9c9705 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
@@ -14,7 +14,7 @@ source_urls = [
     GOOGLECODE_SOURCE,
 ]
 sources = [SOURCE_TAR_GZ]
-                                      
+
 python = 'Python'
 pyver = '2.7.3'
 versionsuffix = '-%s-%s' % (python, pyver)
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 9fe2a5f319af2b39d5a680874013722ab102c943..c69d7c6073ca42d1e1fc14fa5f20d9b5734b0138 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
@@ -14,7 +14,7 @@ source_urls = [
     GOOGLECODE_SOURCE,
 ]
 sources = [SOURCE_TAR_GZ]
-                                      
+
 python = 'Python'
 pyver = '2.7.3'
 versionsuffix = '-%s-%s' % (python, pyver)
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 eaf599c8ab0e5c4731710f43b7e0e35ef4456665..94b5a9f2f87793e9b9653cb8d2986f7fcaf0c666 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
@@ -14,7 +14,7 @@ source_urls = [
     GOOGLECODE_SOURCE,
 ]
 sources = [SOURCE_TAR_GZ]
-                                      
+
 python = 'Python'
 pyver = '2.7.3'
 versionsuffix = '-%s-%s' % (python, pyver)
diff --git a/easybuild/easyconfigs/n/NCO/NCO-4.4.4-intel-2014b.eb b/easybuild/easyconfigs/n/NCO/NCO-4.4.4-intel-2014b.eb
index 434cce1376537213ffbbb9f26142a26595eb6743..91425320d28ea09035d5a758f31fc94a298c7d83 100644
--- a/easybuild/easyconfigs/n/NCO/NCO-4.4.4-intel-2014b.eb
+++ b/easybuild/easyconfigs/n/NCO/NCO-4.4.4-intel-2014b.eb
@@ -22,7 +22,7 @@ dependencies = [
 sanity_check_paths = {
     'files': ['bin/nc%s' % x for x in ['ap2', 'atted', 'bo', 'diff', 'ea', 'ecat', 'es', 'flint',
                                        'ks', 'pdq', 'ra', 'rcat', 'rename']] +
-             ['lib/libnco.a', 'lib/libnco.so', 'lib/libnco_c++.a', 'lib/libnco_c++.so'],
+             ['lib/libnco.a', 'lib/libnco.%s' % SHLIB_EXT, 'lib/libnco_c++.a', 'lib/libnco_c++.%s' % SHLIB_EXT],
     'dirs': ['include'],
 }
 
diff --git a/easybuild/easyconfigs/n/NCO/NCO-4.4.7-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/n/NCO/NCO-4.4.7-intel-2015b-Python-2.7.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b849d1d7ccc654a39a36963043d88a04914cc41a
--- /dev/null
+++ b/easybuild/easyconfigs/n/NCO/NCO-4.4.7-intel-2015b-Python-2.7.10.eb
@@ -0,0 +1,45 @@
+easyblock = 'ConfigureMake'
+
+name = 'NCO'
+version = "4.4.7"
+versionsuffix = "-Python-2.7.10"
+
+homepage = 'http://nco.sourceforge.net/'
+description = """The NCO toolkit manipulates and analyzes data stored in netCDF-accessible
+ formats, including DAP, HDF4, and HDF5. It exploits the geophysical
+ expressivity of many CF (Climate & Forecast) metadata conventions,
+ the flexible description of physical dimensions translated by UDUnits,
+ the network transparency of OPeNDAP, the storage features
+ (e.g., compression, chunking, groups) of HDF (the Hierarchical Data Format),
+ and many powerful mathematical and statistical
+ algorithms of GSL (the GNU Scientific Library)."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'cstd': 'c99'}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+builddependencies = [
+    ('Bison', '3.0.4'),
+    ('flex', '2.5.39'),
+]
+
+dependencies = [
+    ('ANTLR', '2.7.7', versionsuffix),
+    ('libdap', '3.14.0', versionsuffix),
+    ('GSL', '1.16'),
+    ('UDUNITS', '2.2.19'),
+    ('netCDF', '4.3.2'),
+    ('netcdf4-python', '1.1.8', versionsuffix),
+    ('scipy', '0.16.1', versionsuffix),
+]
+
+sanity_check_paths = {
+    'files': ['bin/nc%s' % x for x in ('ap', 'ap2', 'atted', 'bo', 'diff', 'ea', 'ecat', 'es',
+                                       'flint', 'ks', 'pdq', 'ra', 'rcat', 'rename', 'wa')] +
+             ['lib/libnco.a', 'lib/libnco.%s' % SHLIB_EXT, 'lib/libnco_c++.a', 'lib/libnco_c++.%s' % SHLIB_EXT],
+    'dirs': ['include'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/n/NCO/NCO-4.5.1-intel-2015a-Python-2.7.10.eb b/easybuild/easyconfigs/n/NCO/NCO-4.5.1-intel-2015a-Python-2.7.10.eb
index 3612474f0c5c07d5e2dab701e421a916f14edc75..a6ab3c607d69b18398743a9750d877b215eeddf8 100644
--- a/easybuild/easyconfigs/n/NCO/NCO-4.5.1-intel-2015a-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/n/NCO/NCO-4.5.1-intel-2015a-Python-2.7.10.eb
@@ -16,7 +16,7 @@ description = """The NCO toolkit manipulates and analyzes data stored in netCDF-
 
 toolchain = {'name': 'intel', 'version': '2015a'}
 toolchainopts = {'cstd': 'c99'}
-  
+
 source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
diff --git a/easybuild/easyconfigs/n/NFFT/NFFT-3.3.0-CrayGNU-5.2.40.eb b/easybuild/easyconfigs/n/NFFT/NFFT-3.3.0-CrayGNU-5.2.40.eb
index dca0868591c7aa4baa077e3c315ac42bbdccc353..292a68dda4ed263d37f837a4cd83a00c36e25ad4 100644
--- a/easybuild/easyconfigs/n/NFFT/NFFT-3.3.0-CrayGNU-5.2.40.eb
+++ b/easybuild/easyconfigs/n/NFFT/NFFT-3.3.0-CrayGNU-5.2.40.eb
@@ -15,7 +15,7 @@ source_urls = ['https://www-user.tu-chemnitz.de/~potts/nfft/download/']
 sources = [SOURCELOWER_TAR_GZ]
 
 sanity_check_paths = {
-    'files': ['include/nfft3.h', 'include/nfft3mp.h', 'lib/libnfft3.a', 'lib/libnfft3.so'],
+    'files': ['include/nfft3.h', 'include/nfft3mp.h', 'lib/libnfft3.a', 'lib/libnfft3.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/n/NFFT/NFFT-3.3.0-foss-2015a.eb b/easybuild/easyconfigs/n/NFFT/NFFT-3.3.0-foss-2015a.eb
index 263c3c6dac7d48ea5b196aced4a54d1cf082ca1c..80c497f2b9aa58b8a20a5811ab9bb0430f739d2b 100644
--- a/easybuild/easyconfigs/n/NFFT/NFFT-3.3.0-foss-2015a.eb
+++ b/easybuild/easyconfigs/n/NFFT/NFFT-3.3.0-foss-2015a.eb
@@ -16,7 +16,7 @@ sources = [SOURCELOWER_TAR_GZ]
 dependencies = [('FFTW', '3.3.4', '', ('gompi', '2015a'))]
 
 sanity_check_paths = {
-    'files': ['include/nfft3.h', 'include/nfft3mp.h', 'lib/libnfft3.a', 'lib/libnfft3.so'],
+    'files': ['include/nfft3.h', 'include/nfft3mp.h', 'lib/libnfft3.a', 'lib/libnfft3.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/n/NFFT/NFFT-3.3.0-intel-2015a.eb b/easybuild/easyconfigs/n/NFFT/NFFT-3.3.0-intel-2015a.eb
index 0e939b4038921b7dd6cf0b7b16e44776fe6fe957..d9068963edf3cf08ae1104b12abc416211ec2ec9 100644
--- a/easybuild/easyconfigs/n/NFFT/NFFT-3.3.0-intel-2015a.eb
+++ b/easybuild/easyconfigs/n/NFFT/NFFT-3.3.0-intel-2015a.eb
@@ -16,7 +16,7 @@ sources = [SOURCELOWER_TAR_GZ]
 dependencies = [('FFTW', '3.3.4')]
 
 sanity_check_paths = {
-    'files': ['include/nfft3.h', 'include/nfft3mp.h', 'lib/libnfft3.a', 'lib/libnfft3.so'],
+    'files': ['include/nfft3.h', 'include/nfft3mp.h', 'lib/libnfft3.a', 'lib/libnfft3.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-6.0-GCCcore-4.9.3.eb b/easybuild/easyconfigs/n/ncurses/ncurses-6.0-GCCcore-4.9.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..eab9da36db7595cf134d65292f3571c48391de32
--- /dev/null
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-6.0-GCCcore-4.9.3.eb
@@ -0,0 +1,36 @@
+easyblock = 'ConfigureMake'
+
+name = 'ncurses'
+version = '6.0'
+
+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': 'GCCcore', 'version': '4.9.3'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+builddependencies = [('binutils', '2.25')]
+
+configopts = [
+    # default build
+    '--with-shared --enable-overwrite',
+    # the UTF-8 enabled version (ncursesw)
+    '--with-shared --enable-overwrite --enable-ext-colors --enable-widec --includedir=%(installdir)s/include/ncursesw/'
+]
+
+libs = ["form", "menu", "ncurses", "panel"]
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in ["captoinfo", "clear", "infocmp", "infotocap", "ncurses%(version_major)s-config",
+                                     "reset", "tabs", "tic", "toe", "tput", "tset"]] +
+             ['lib/lib%s%s.a' % (x, y) for x in libs for y in ['', '_g', 'w', 'w_g']] +
+             ['lib/lib%s%s.%s' % (x, y, SHLIB_EXT) for x in libs for y in ['', 'w']] +
+             ['lib/libncurses++%s.a' % x for x in ['', 'w']],
+    'dirs': ['include', 'include/ncursesw'],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-6.0-foss-2016a.eb b/easybuild/easyconfigs/n/ncurses/ncurses-6.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6029357e961c47bb3ba2f920abb5b420f48aadce
--- /dev/null
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-6.0-foss-2016a.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMake'
+
+name = 'ncurses'
+version = '6.0'
+
+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': 'foss', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+configopts = [
+    # default build
+    '--with-shared --enable-overwrite',
+    # the UTF-8 enabled version (ncursesw)
+    '--with-shared --enable-overwrite --enable-ext-colors --enable-widec --includedir=%(installdir)s/include/ncursesw/'
+]
+
+libs = ["form", "menu", "ncurses", "panel"]
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in ["captoinfo", "clear", "infocmp", "infotocap", "ncurses%(version_major)s-config",
+                                     "reset", "tabs", "tic", "toe", "tput", "tset"]] +
+             ['lib/lib%s%s.a' % (x, y) for x in libs for y in ['', '_g', 'w', 'w_g']] +
+             ['lib/lib%s%s.so' % (x, y) for x in libs for y in ['', 'w']] +
+             ['lib/libncurses++%s.a' % x for x in ['', 'w']],
+    'dirs': ['include', 'include/ncursesw'],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-6.0-intel-2016a.eb b/easybuild/easyconfigs/n/ncurses/ncurses-6.0-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..852b0df6bb6aaa5f84a7f1b4bb27c82b0acf0641
--- /dev/null
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-6.0-intel-2016a.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMake'
+
+name = 'ncurses'
+version = '6.0'
+
+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': 'intel', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+configopts = [
+    # default build
+    '--with-shared --enable-overwrite',
+    # the UTF-8 enabled version (ncursesw)
+    '--with-shared --enable-overwrite --enable-ext-colors --enable-widec --includedir=%(installdir)s/include/ncursesw/'
+]
+
+libs = ["form", "menu", "ncurses", "panel"]
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in ["captoinfo", "clear", "infocmp", "infotocap", "ncurses%(version_major)s-config",
+                                     "reset", "tabs", "tic", "toe", "tput", "tset"]] +
+             ['lib/lib%s%s.a' % (x, y) for x in libs for y in ['', '_g', 'w', 'w_g']] +
+             ['lib/lib%s%s.so' % (x, y) for x in libs for y in ['', 'w']] +
+             ['lib/libncurses++%s.a' % x for x in ['', 'w']],
+    'dirs': ['include', 'include/ncursesw'],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/n/netCDF-C++/netCDF-C++-4.2-goolf-1.4.10.eb b/easybuild/easyconfigs/n/netCDF-C++/netCDF-C++-4.2-goolf-1.4.10.eb
index e0cfb1558e3ee268b3cfee1869c975f91e0305d3..86801a2825fcc6c329e0a097ba62ab862b14ce45 100644
--- a/easybuild/easyconfigs/n/netCDF-C++/netCDF-C++-4.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/n/netCDF-C++/netCDF-C++-4.2-goolf-1.4.10.eb
@@ -20,7 +20,7 @@ source_urls = [
 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'],
+    'files': ['include/ncvalues.h', 'include/netcdfcpp.h', 'include/netcdf.hh', 'lib/libnetcdf_c++.a', 'lib/libnetcdf_c++.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
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
index d47cb17c759e7cd7920c9d7158c04cfd5198a69e..62be978e1001c2af1e65eff855e2928f8bbdd70c 100644
--- 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
@@ -24,7 +24,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['include/ncvalues.h', 'include/netcdfcpp.h', 'include/netcdf.hh', 'lib/libnetcdf_c++.a', 'lib/libnetcdf_c++.so'],
+    'files': ['include/ncvalues.h', 'include/netcdfcpp.h', 'include/netcdf.hh', 'lib/libnetcdf_c++.a', 'lib/libnetcdf_c++.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
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
index 400224b911f0f03f51b8476caa8b5c378e77d8e6..31394ae5b8b918c8ba38ce0cbbab32d7685f136d 100644
--- 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
@@ -20,7 +20,7 @@ source_urls = [
 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'],
+    'files': ['include/ncvalues.h', 'include/netcdfcpp.h', 'include/netcdf.hh', 'lib/libnetcdf_c++.a', 'lib/libnetcdf_c++.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/n/netCDF-C++/netCDF-C++-4.2-ictce-5.3.0.eb b/easybuild/easyconfigs/n/netCDF-C++/netCDF-C++-4.2-ictce-5.3.0.eb
index 16ea5317c44ad2e4ce3acbefe0d99483abd17034..c93f617359c6237991ce7bc32512f80963a18df0 100644
--- a/easybuild/easyconfigs/n/netCDF-C++/netCDF-C++-4.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/n/netCDF-C++/netCDF-C++-4.2-ictce-5.3.0.eb
@@ -20,7 +20,7 @@ source_urls = [
 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'],
+    'files': ['include/ncvalues.h', 'include/netcdfcpp.h', 'include/netcdf.hh', 'lib/libnetcdf_c++.a', 'lib/libnetcdf_c++.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/n/netCDF-C++/netCDF-C++-4.2-iqacml-3.7.3.eb b/easybuild/easyconfigs/n/netCDF-C++/netCDF-C++-4.2-iqacml-3.7.3.eb
index d8cdaf41c40323ce847ca3ddbe5c1bc41c70c602..62b26c83b5a6c6a28d308d48fef1164d3cef0c94 100644
--- a/easybuild/easyconfigs/n/netCDF-C++/netCDF-C++-4.2-iqacml-3.7.3.eb
+++ b/easybuild/easyconfigs/n/netCDF-C++/netCDF-C++-4.2-iqacml-3.7.3.eb
@@ -20,7 +20,7 @@ source_urls = [
 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'],
+    'files': ['include/ncvalues.h', 'include/netcdfcpp.h', 'include/netcdf.hh', 'lib/libnetcdf_c++.a', 'lib/libnetcdf_c++.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/n/netCDF-C++4/netCDF-C++4-4.2.1-foss-2014b.eb b/easybuild/easyconfigs/n/netCDF-C++4/netCDF-C++4-4.2.1-foss-2014b.eb
index 5fcb22ae6f56dabbb79b5bb89da19e82cea41bdf..9511397c7578b49cd80e0eea13985ea5deba222c 100644
--- a/easybuild/easyconfigs/n/netCDF-C++4/netCDF-C++4-4.2.1-foss-2014b.eb
+++ b/easybuild/easyconfigs/n/netCDF-C++4/netCDF-C++4-4.2.1-foss-2014b.eb
@@ -17,7 +17,7 @@ source_urls = ['https://github.com/Unidata/netcdf-cxx4/archive/']
 dependencies = [('netCDF', '4.3.2')]
 
 sanity_check_paths = {
-    'files': ['include/netcdf', 'lib/libnetcdf_c++4.a', 'lib/libnetcdf_c++4.so'],
+    'files': ['include/netcdf', 'lib/libnetcdf_c++4.a', 'lib/libnetcdf_c++4.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/n/netCDF-C++4/netCDF-C++4-4.2.1-intel-2014b.eb b/easybuild/easyconfigs/n/netCDF-C++4/netCDF-C++4-4.2.1-intel-2014b.eb
index c46c081007c38b471edb2ac05ecbbd93362e9427..04008305da3afe89d5f14d8ecf49af1a7e691ce5 100644
--- a/easybuild/easyconfigs/n/netCDF-C++4/netCDF-C++4-4.2.1-intel-2014b.eb
+++ b/easybuild/easyconfigs/n/netCDF-C++4/netCDF-C++4-4.2.1-intel-2014b.eb
@@ -17,7 +17,7 @@ source_urls = ['https://github.com/Unidata/netcdf-cxx4/archive/']
 dependencies = [('netCDF', '4.3.2')]
 
 sanity_check_paths = {
-    'files': ['include/netcdf', 'lib/libnetcdf_c++4.a', 'lib/libnetcdf_c++4.so'],
+    'files': ['include/netcdf', 'lib/libnetcdf_c++4.a', 'lib/libnetcdf_c++4.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/n/netCDF-Fortran/netCDF-Fortran-4.2-goolf-1.5.14.eb b/easybuild/easyconfigs/n/netCDF-Fortran/netCDF-Fortran-4.2-goolf-1.5.14.eb
index bd158f66c56af7e8f4cd8334a66a873497547b5b..3d072019b1e83cfd2314f53944d4bbe6e105915d 100644
--- a/easybuild/easyconfigs/n/netCDF-Fortran/netCDF-Fortran-4.2-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/n/netCDF-Fortran/netCDF-Fortran-4.2-goolf-1.5.14.eb
@@ -6,7 +6,7 @@ description = """NetCDF (network Common Data Form) is a set of software librarie
 and machine-independent data formats that support the creation, access, and sharing of array-oriented 
 scientific data."""
 
-toolchain = {'name': 'goolf', 'version': '1.5.14'} 
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
 toolchainopts = {'pic': True}
 
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-goolf-1.5.14.eb b/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-goolf-1.5.14.eb
index 452797370468a8d706be4e1a1e7b04df67788b83..113ec9d3b844ce34176b183b2e7f5d584d587a66 100644
--- a/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-goolf-1.5.14.eb
@@ -6,7 +6,7 @@ description = """NetCDF (network Common Data Form) is a set of software librarie
  and machine-independent data formats that support the creation, access, and sharing of array-oriented 
  scientific data."""
 
-toolchain = {'name': 'goolf', 'version': '1.5.14'} 
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
 toolchainopts = {'pic': True}
 
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/n/netCDF/netCDF-4.3.2-intel-2015b.eb b/easybuild/easyconfigs/n/netCDF/netCDF-4.3.2-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..52365b33f33f80050b4cca69eb83e0417b5a2ce6
--- /dev/null
+++ b/easybuild/easyconfigs/n/netCDF/netCDF-4.3.2-intel-2015b.eb
@@ -0,0 +1,34 @@
+name = 'netCDF'
+version = '4.3.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': 'intel', 'version': '2015b'}
+toolchainopts = {'pic': True, 'usempi': True}
+
+sources = ['v%(version)s.tar.gz']
+source_urls = ['https://github.com/Unidata/netcdf-c/archive']
+
+patches = [
+    'netCDF-4.3.2-with-HDF-1.8.13.patch',
+    'netCDF-4.3.2-parallel-HDF.patch',
+]
+
+dependencies = [('HDF5', '1.8.13')]
+
+builddependencies = [
+    ('CMake', '3.4.1'),
+    ('Doxygen', '1.8.10'),
+    ('cURL', '7.43.0'),
+]
+
+# make sure both static and shared libs are built
+configopts = [
+    "-DCURL_LIBRARY=$EBROOTCURL/lib/libcurl.%s -DCURL_INCLUDE_DIR=$EBROOTCURL/include -DBUILD_SHARED_LIBS=ON" % SHLIB_EXT,
+    "-DCURL_LIBRARY=$EBROOTCURL/lib/libcurl.%s -DCURL_INCLUDE_DIR=$EBROOTCURL/include -DBUILD_SHARED_LIBS=OFF" % SHLIB_EXT,
+]
+
+moduleclass = 'data'
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
index 4705fe247a6ca5c8d452990dff8f22b23b29f162..b7da81870b563a1da79533113e45105fac8b7ef6 100644
--- 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
@@ -1,7 +1,7 @@
 name = 'netcdf4-python'
 version = '1.0.7'
 
-homepage = 'https://code.google.com/p/netcdf4-python/'
+homepage = 'https://unidata.github.io/netcdf4-python/'
 description = """Python/numpy interface to netCDF."""
 
 toolchain = {'name': 'ictce', 'version': '5.5.0'}
diff --git a/easybuild/easyconfigs/n/netcdf4-python/netcdf4-python-1.1.8-avoid-diskless-test.patch b/easybuild/easyconfigs/n/netcdf4-python/netcdf4-python-1.1.8-avoid-diskless-test.patch
new file mode 100644
index 0000000000000000000000000000000000000000..d146f649548b0815386b6003647eb6cf37cee583
--- /dev/null
+++ b/easybuild/easyconfigs/n/netcdf4-python/netcdf4-python-1.1.8-avoid-diskless-test.patch
@@ -0,0 +1,14 @@
+# this test seems to always fall. The diskless thing is not really diskless it seems
+# By Ward Poelmans <ward.poelmans@ugent.be>
+diff -ur netcdf4-python-1.1.8rel/test/tst_diskless.py netcdf4-python-1.1.8rel.new/test/tst_diskless.py
+--- netcdf4-python-1.1.8rel/test/tst_diskless.py	2015-05-13 16:27:00.000000000 +0200
++++ netcdf4-python-1.1.8rel.new/test/tst_diskless.py	2016-01-07 14:16:21.851971913 +0100
+@@ -65,7 +65,7 @@
+         assert_array_almost_equal(foo[:], ranarr)
+         assert_array_almost_equal(bar[:], ranarr2)
+         # file does not actually exist on disk
+-        assert(os.path.isfile(self.file)==False)
++#        assert(os.path.isfile(self.file)==False)
+         # open persisted file.
+         # first, check that file does actually exist on disk
+         assert(os.path.isfile(self.file2)==True)
diff --git a/easybuild/easyconfigs/n/netcdf4-python/netcdf4-python-1.1.8-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/n/netcdf4-python/netcdf4-python-1.1.8-intel-2015b-Python-2.7.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8bd2e5f95c2eff3edf4e70fad6006d14564fb301
--- /dev/null
+++ b/easybuild/easyconfigs/n/netcdf4-python/netcdf4-python-1.1.8-intel-2015b-Python-2.7.10.eb
@@ -0,0 +1,28 @@
+name = 'netcdf4-python'
+version = '1.1.8'
+
+homepage = 'https://unidata.github.io/netcdf4-python/'
+description = """Python/numpy interface to netCDF."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'usempi': True}
+
+source_urls = ['https://github.com/Unidata/netcdf4-python/archive/']
+sources = ['v%(version)srel.tar.gz']
+
+patches = ['netcdf4-python-%(version)s-avoid-diskless-test.patch']
+
+python = 'Python'
+pythonver = '2.7.10'
+pythonshortver = '.'.join(pythonver.split('.')[0:2])
+versionsuffix = '-%s-%s' % (python, pythonver)
+
+dependencies = [
+    (python, pythonver),
+    ('numpy', '1.10.4', versionsuffix),
+    ('HDF5', '1.8.13'),
+    ('netCDF', '4.3.2'),
+    ('cURL', '7.43.0'),
+]
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/n/netloc/netloc-0.5-GCC-4.8.3.eb b/easybuild/easyconfigs/n/netloc/netloc-0.5-GCC-4.8.3.eb
index 025be1d81d77ad937026294b7c49cbca007406f3..26ee8e7734ce8740d0171aa0c9ead68dc5d4eb03 100644
--- a/easybuild/easyconfigs/n/netloc/netloc-0.5-GCC-4.8.3.eb
+++ b/easybuild/easyconfigs/n/netloc/netloc-0.5-GCC-4.8.3.eb
@@ -10,7 +10,7 @@ description = """The Portable Network Locality (netloc) software package provide
  It is provided as a companion to the Portable Hardware Locality (hwloc) package."""
 
 toolchain = {'name': 'GCC', 'version': '4.8.3'}
-  
+
 source_urls = [homepage + '/v%(version_major_minor)s/downloads']
 sources = [SOURCE_TAR_GZ]
 
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
index 6b5126f478bfa0dc7ce0abcba806d44830551626..71e8c66169021bf057046f5b1f8408c9ea1fd9a6 100644
--- 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
@@ -10,7 +10,7 @@ description = """The Portable Network Locality (netloc) software package provide
  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'),
diff --git a/easybuild/easyconfigs/n/nettle/nettle-2.6-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/n/nettle/nettle-2.6-goalf-1.1.0-no-OFED.eb
index 03cdd193de835b7aa2d23f32ed2cafaa5b62b402..7b56d0898ac316debb5061307ac533db37c331ac 100644
--- a/easybuild/easyconfigs/n/nettle/nettle-2.6-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/n/nettle/nettle-2.6-goalf-1.1.0-no-OFED.eb
@@ -15,7 +15,7 @@ dependencies = [('GMP', '5.0.5')]
 
 sanity_check_paths = {
     'files': ['bin/%s' % x for x in ['nettle-hash', 'nettle-lfib-stream', 'pkcs1-conv', 'sexp-conv']] +
-             ['lib64/libhogweed.a', 'lib64/libhogweed.so', 'lib64/libnettle.a', 'lib64/libnettle.so'],
+             ['lib64/libhogweed.a', 'lib64/libhogweed.%s' % SHLIB_EXT, 'lib64/libnettle.a', 'lib64/libnettle.%s' % SHLIB_EXT],
     'dirs': ['include/nettle'],
 }
 
diff --git a/easybuild/easyconfigs/n/nettle/nettle-2.6-goolf-1.4.10.eb b/easybuild/easyconfigs/n/nettle/nettle-2.6-goolf-1.4.10.eb
index fbf0448f8d2f4adf00ebde3a5597b91e40b9caa5..d09168b7c84da1b8800084df6b5f722549ffb5a4 100644
--- a/easybuild/easyconfigs/n/nettle/nettle-2.6-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/n/nettle/nettle-2.6-goolf-1.4.10.eb
@@ -15,7 +15,7 @@ dependencies = [('GMP', '5.0.5')]
 
 sanity_check_paths = {
     'files': ['bin/%s' % x for x in ['nettle-hash', 'nettle-lfib-stream', 'pkcs1-conv', 'sexp-conv']] +
-             ['lib64/libhogweed.a', 'lib64/libhogweed.so', 'lib64/libnettle.a', 'lib64/libnettle.so'],
+             ['lib64/libhogweed.a', 'lib64/libhogweed.%s' % SHLIB_EXT, 'lib64/libnettle.a', 'lib64/libnettle.%s' % SHLIB_EXT],
     'dirs': ['include/nettle'],
 }
 
diff --git a/easybuild/easyconfigs/n/nettle/nettle-3.1.1-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/n/nettle/nettle-3.1.1-GNU-4.9.3-2.25.eb
index bf1ecbbd35c70087b71747ca205f89437e9ce68c..d17a6ef2c2d40573471342ffbf050a8b78a7fc3a 100644
--- a/easybuild/easyconfigs/n/nettle/nettle-3.1.1-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/n/nettle/nettle-3.1.1-GNU-4.9.3-2.25.eb
@@ -20,7 +20,7 @@ dependencies = [
 
 sanity_check_paths = {
     'files': ['bin/%s' % x for x in ['nettle-hash', 'nettle-lfib-stream', 'pkcs1-conv', 'sexp-conv']] +
-             ['lib64/libhogweed.a', 'lib64/libhogweed.so', 'lib64/libnettle.a', 'lib64/libnettle.so'],
+             ['lib64/libhogweed.a', 'lib64/libhogweed.%s' % SHLIB_EXT, 'lib64/libnettle.a', 'lib64/libnettle.%s' % SHLIB_EXT],
     'dirs': ['include/nettle'],
 }
 
diff --git a/easybuild/easyconfigs/n/numactl/numactl-2.0.10-GCC-4.8.4.eb b/easybuild/easyconfigs/n/numactl/numactl-2.0.10-GCC-4.8.4.eb
index e56d4ba751895b72c1ab0999c9eb2451444e25f3..dcc13adeafcb250ce66b80338b6aa182299c4b95 100644
--- a/easybuild/easyconfigs/n/numactl/numactl-2.0.10-GCC-4.8.4.eb
+++ b/easybuild/easyconfigs/n/numactl/numactl-2.0.10-GCC-4.8.4.eb
@@ -23,7 +23,7 @@ builddependencies = [
 preconfigopts = './autogen.sh && '
 
 sanity_check_paths = {
-    'files': ['bin/numactl', 'bin/numastat', 'lib/libnuma.so', 'lib/libnuma.a'],
+    'files': ['bin/numactl', 'bin/numastat', 'lib/libnuma.%s' % SHLIB_EXT, 'lib/libnuma.a'],
     'dirs': ['share/man', 'include']
 }
 
diff --git a/easybuild/easyconfigs/n/numactl/numactl-2.0.10-GCC-4.9.2.eb b/easybuild/easyconfigs/n/numactl/numactl-2.0.10-GCC-4.9.2.eb
index 8629235333c962563b80da159ccb711567b69433..31b7335ae5f797e8dd63d1738cd9cfa54e2ba523 100644
--- a/easybuild/easyconfigs/n/numactl/numactl-2.0.10-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/n/numactl/numactl-2.0.10-GCC-4.9.2.eb
@@ -24,7 +24,7 @@ preconfigopts = './autogen.sh && '
 
 
 sanity_check_paths = {
-    'files': ['bin/numactl', 'bin/numastat', 'lib/libnuma.so', 'lib/libnuma.a'],
+    'files': ['bin/numactl', 'bin/numastat', 'lib/libnuma.%s' % SHLIB_EXT, 'lib/libnuma.a'],
     'dirs': ['share/man', 'include']
 }
 
diff --git a/easybuild/easyconfigs/n/numactl/numactl-2.0.10-GNU-4.9.2-2.25.eb b/easybuild/easyconfigs/n/numactl/numactl-2.0.10-GNU-4.9.2-2.25.eb
index 52f1df7369287e84717e58036bef9ddf34b18445..727e24951e24167c73a0faccc5d1dd9c6d0b3c4f 100644
--- a/easybuild/easyconfigs/n/numactl/numactl-2.0.10-GNU-4.9.2-2.25.eb
+++ b/easybuild/easyconfigs/n/numactl/numactl-2.0.10-GNU-4.9.2-2.25.eb
@@ -20,7 +20,7 @@ builddependencies = [('Autotools', '20150215')]
 preconfigopts = './autogen.sh && '
 
 sanity_check_paths = {
-    'files': ['bin/numactl', 'bin/numastat', 'lib/libnuma.so', 'lib/libnuma.a'],
+    'files': ['bin/numactl', 'bin/numastat', 'lib/libnuma.%s' % SHLIB_EXT, 'lib/libnuma.a'],
     'dirs': ['share/man', 'include']
 }
 
diff --git a/easybuild/easyconfigs/n/numactl/numactl-2.0.10-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/n/numactl/numactl-2.0.10-GNU-4.9.3-2.25.eb
index 04cd4b9e23de46364477bf7ad7d5f7a358db7bc2..eb1b29e032c638d1b7b5d39899573a0c6db55ba5 100644
--- a/easybuild/easyconfigs/n/numactl/numactl-2.0.10-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/n/numactl/numactl-2.0.10-GNU-4.9.3-2.25.eb
@@ -20,7 +20,7 @@ builddependencies = [('Autotools', '20150215')]
 preconfigopts = './autogen.sh && '
 
 sanity_check_paths = {
-    'files': ['bin/numactl', 'bin/numastat', 'lib/libnuma.so', 'lib/libnuma.a'],
+    'files': ['bin/numactl', 'bin/numastat', 'lib/libnuma.%s' % SHLIB_EXT, 'lib/libnuma.a'],
     'dirs': ['share/man', 'include']
 }
 
diff --git a/easybuild/easyconfigs/n/numactl/numactl-2.0.10-iccifort-2015.3.187-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/n/numactl/numactl-2.0.10-iccifort-2015.3.187-GNU-4.9.3-2.25.eb
index 1651c58510a221152b9407d3697cb609fac621a2..1d4c3067fd6bd1bdb5d2ec403ca9a19da3b947b0 100644
--- a/easybuild/easyconfigs/n/numactl/numactl-2.0.10-iccifort-2015.3.187-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/n/numactl/numactl-2.0.10-iccifort-2015.3.187-GNU-4.9.3-2.25.eb
@@ -20,7 +20,7 @@ builddependencies = [('Autotools', '20150215', '', ('GNU', '4.9.3-2.25'))]
 preconfigopts = './autogen.sh && '
 
 sanity_check_paths = {
-    'files': ['bin/numactl', 'bin/numastat', 'lib/libnuma.so', 'lib/libnuma.a'],
+    'files': ['bin/numactl', 'bin/numastat', 'lib/libnuma.%s' % SHLIB_EXT, 'lib/libnuma.a'],
     'dirs': ['share/man', 'include']
 }
 
diff --git a/easybuild/easyconfigs/n/numactl/numactl-2.0.11-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/n/numactl/numactl-2.0.11-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..cee677dd4c082f90405fbb77bc310e0f27e40945
--- /dev/null
+++ b/easybuild/easyconfigs/n/numactl/numactl-2.0.11-GCC-4.9.3-2.25.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'numactl'
+version = '2.0.11'
+
+homepage = 'http://oss.sgi.com/projects/libnuma/'
+description = """The numactl program allows you to run your application program on specific cpu's and memory nodes.
+ It does this by supplying a NUMA memory policy to the operating system before running your program.
+ The libnuma library provides convenient ways for you to add NUMA memory policies into your own program."""
+
+toolchain = {'name': 'GCC', 'version': '4.9.3-2.25'}
+
+source_urls = ['ftp://oss.sgi.com/www/projects/libnuma/download/']
+sources = [SOURCE_TAR_GZ]
+
+checksums = ['d3bc88b7ddb9f06d60898f4816ae9127']
+
+sanity_check_paths = {
+    'files': ['bin/numactl', 'bin/numastat', 'lib/libnuma.%s' % SHLIB_EXT, 'lib/libnuma.a'],
+    'dirs': ['share/man', 'include']
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/n/numactl/numactl-2.0.11-GCC-4.9.3.eb b/easybuild/easyconfigs/n/numactl/numactl-2.0.11-GCC-4.9.3.eb
index 65478cc919d5ca6d615a15a10057959456d04e97..a7dc26e7feee963adbcf838bbf97343af122d0cc 100644
--- a/easybuild/easyconfigs/n/numactl/numactl-2.0.11-GCC-4.9.3.eb
+++ b/easybuild/easyconfigs/n/numactl/numactl-2.0.11-GCC-4.9.3.eb
@@ -16,7 +16,7 @@ source_urls = ['ftp://oss.sgi.com/www/projects/libnuma/download/']
 sources = [SOURCE_TAR_GZ]
 
 sanity_check_paths = {
-    'files': ['bin/numactl', 'bin/numastat', 'lib/libnuma.so', 'lib/libnuma.a'],
+    'files': ['bin/numactl', 'bin/numastat', 'lib/libnuma.%s' % SHLIB_EXT, 'lib/libnuma.a'],
     'dirs': ['share/man', 'include']
 }
 
diff --git a/easybuild/easyconfigs/n/numactl/numactl-2.0.8-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/n/numactl/numactl-2.0.8-goalf-1.1.0-no-OFED.eb
index dbb1640bc1e95a52038124672a109739d4a32524..64784ac871ac80f0b335496db87df36f358ff77d 100644
--- a/easybuild/easyconfigs/n/numactl/numactl-2.0.8-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/n/numactl/numactl-2.0.8-goalf-1.1.0-no-OFED.eb
@@ -17,9 +17,8 @@ skipsteps = ['configure']
 installopts = "PREFIX=%(installdir)s libdir='${prefix}/lib'"
 
 sanity_check_paths = {
-                      'files': ['bin/numactl', 'bin/numastat',
-                                'lib/libnuma.so', 'lib/libnuma.a'],
-                      'dirs': ['share/man', 'include']
-                     }
+    'files': ['bin/numactl', 'bin/numastat', 'lib/libnuma.%s' % SHLIB_EXT, 'lib/libnuma.a'],
+    'dirs': ['share/man', 'include']
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/n/numactl/numactl-2.0.8-goolf-1.4.10.eb b/easybuild/easyconfigs/n/numactl/numactl-2.0.8-goolf-1.4.10.eb
index 9dab9a78e3353b9fdbca857a24a161a3395783b5..fdf229d038b461a1da14debe87036624ef5d5056 100644
--- a/easybuild/easyconfigs/n/numactl/numactl-2.0.8-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/n/numactl/numactl-2.0.8-goolf-1.4.10.eb
@@ -17,9 +17,8 @@ skipsteps = ['configure']
 installopts = "PREFIX=%(installdir)s libdir='${prefix}/lib'"
 
 sanity_check_paths = {
-                      'files': ['bin/numactl', 'bin/numastat',
-                                'lib/libnuma.so', 'lib/libnuma.a'],
-                      'dirs': ['share/man', 'include']
-                     }
+    'files': ['bin/numactl', 'bin/numastat', 'lib/libnuma.%s' % SHLIB_EXT, 'lib/libnuma.a'],
+    'dirs': ['share/man', 'include']
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/n/numactl/numactl-2.0.8-ictce-4.1.13.eb b/easybuild/easyconfigs/n/numactl/numactl-2.0.8-ictce-4.1.13.eb
index 38e2472e6b600d62380ba8c3816aabdb3bc66034..cc76df6c60003bbefc8968685cd4c4702f28d6ad 100644
--- a/easybuild/easyconfigs/n/numactl/numactl-2.0.8-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/n/numactl/numactl-2.0.8-ictce-4.1.13.eb
@@ -17,10 +17,8 @@ skipsteps = ['configure']
 installopts = "PREFIX=%(installdir)s libdir='${prefix}/lib'"
 
 sanity_check_paths = {
-                      'files': ['bin/numactl', 'bin/numastat',
-                                'lib/libnuma.so', 'lib/libnuma.a'],
-                      'dirs': ['share/man', 'include']
-                     }
+    'files': ['bin/numactl', 'bin/numastat', 'lib/libnuma.%s' % SHLIB_EXT, 'lib/libnuma.a'],
+    'dirs': ['share/man', 'include']
+}
 
 moduleclass = 'tools'
-
diff --git a/easybuild/easyconfigs/n/numactl/numactl-2.0.8-ictce-5.3.0.eb b/easybuild/easyconfigs/n/numactl/numactl-2.0.8-ictce-5.3.0.eb
index 8d379ac5acdacf1449e5b3b2214f267156d3c39d..53c7670b082fd657da22c87e9ed0f0d2b4a80a7f 100644
--- a/easybuild/easyconfigs/n/numactl/numactl-2.0.8-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/n/numactl/numactl-2.0.8-ictce-5.3.0.eb
@@ -18,10 +18,8 @@ skipsteps = ['configure']
 installopts = "PREFIX=%(installdir)s libdir='${prefix}/lib'"
 
 sanity_check_paths = {
-                      'files': ['bin/numactl', 'bin/numastat',
-                                'lib/libnuma.so', 'lib/libnuma.a'],
-                      'dirs': ['share/man', 'include']
-                     }
+    'files': ['bin/numactl', 'bin/numastat', 'lib/libnuma.%s' % SHLIB_EXT, 'lib/libnuma.a'],
+    'dirs': ['share/man', 'include']
+}
 
 moduleclass = 'tools'
-
diff --git a/easybuild/easyconfigs/n/numactl/numactl-2.0.9-GCC-4.8.3.eb b/easybuild/easyconfigs/n/numactl/numactl-2.0.9-GCC-4.8.3.eb
index 4b76914247c8bd7d2748395d023de8cd86d05965..d58d803fc7bc0616a276b40e64fb9adf9c223c69 100644
--- a/easybuild/easyconfigs/n/numactl/numactl-2.0.9-GCC-4.8.3.eb
+++ b/easybuild/easyconfigs/n/numactl/numactl-2.0.9-GCC-4.8.3.eb
@@ -17,7 +17,7 @@ skipsteps = ['configure']
 installopts = "PREFIX=%(installdir)s libdir='${prefix}/lib'"
 
 sanity_check_paths = {
-    'files': ['bin/numactl', 'bin/numastat', 'lib/libnuma.so', 'lib/libnuma.a'],
+    'files': ['bin/numactl', 'bin/numastat', 'lib/libnuma.%s' % SHLIB_EXT, 'lib/libnuma.a'],
     'dirs': ['share/man', 'include']
 }
 
diff --git a/easybuild/easyconfigs/n/numba/llvmlite-0.8.0_no-static-libstc++.patch b/easybuild/easyconfigs/n/numba/llvmlite-0.8.0_no-static-libstc++.patch
new file mode 100644
index 0000000000000000000000000000000000000000..c257a9a2fa08e2fb0f2daf0c5f334876bb7e40e8
--- /dev/null
+++ b/easybuild/easyconfigs/n/numba/llvmlite-0.8.0_no-static-libstc++.patch
@@ -0,0 +1,17 @@
+don't use -static-libstdc++, causing problems like "glibc detected *** python: free(): invalid pointer"
+cfr. https://github.com/numba/llvmlite/issues/93
+author: Kenneth Hoste (HPC-UGent)
+diff -ru llvmlite-0.8.0.orig/ffi/Makefile.linux llvmlite-0.8.0/ffi/Makefile.linux
+--- llvmlite-0.8.0.orig/ffi/Makefile.linux	2015-10-23 17:19:27.000000000 +0200
++++ llvmlite-0.8.0/ffi/Makefile.linux	2016-01-08 15:55:27.138306000 +0100
+@@ -14,9 +14,7 @@
+ all: $(OUTPUT)
+ 
+ $(OUTPUT): $(SRC)
+-	# static-libstdc++ avoids runtime dependencies on a
+-	# particular libstdc++ version.
+-	$(CXX) -static-libstdc++ -shared $(CXXFLAGS) $(SRC) -o $(OUTPUT) $(LDFLAGS) $(LIBS)
++	$(CXX) -shared $(CXXFLAGS) $(SRC) -o $(OUTPUT) $(LDFLAGS) $(LIBS)
+ 
+ 
+ clean:
diff --git a/easybuild/easyconfigs/n/numba/numba-0.22.1-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/n/numba/numba-0.22.1-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..adad31edb77f8af8bbc656295e9f60233ebe3a7d
--- /dev/null
+++ b/easybuild/easyconfigs/n/numba/numba-0.22.1-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,44 @@
+easyblock = 'Bundle'
+
+name = 'numba'
+version = '0.22.1'
+
+homepage = 'http://numba.pydata.org/'
+description = """Numba is an Open Source NumPy-aware optimizing compiler for Python sponsored by Continuum Analytics,
+ Inc. It uses the remarkable LLVM compiler infrastructure to compile Python syntax to machine code."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+# this is a bundle of Python packages
+exts_defaultclass = 'PythonPackage'
+exts_filter = ('python -c "import %(ext_name)s"', '')
+
+pyver = '2.7.11'
+versionsuffix=  '-Python-%s' % pyver
+dependencies = [
+    ('Python', pyver),
+    ('LLVM', '3.6.2'),
+]
+
+exts_list = [
+    ('llvmlite', '0.8.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/l/llvmlite/'],
+        'patches': ['llvmlite-0.8.0_no-static-libstc++.patch'],
+    }),
+    (name, version, {
+        'source_urls': ['https://pypi.python.org/packages/source/n/numba/'],
+    }),
+]
+
+# specify that Bundle easyblock should run a full sanity check, rather than just trying to load the module
+full_sanity_check = True
+
+pyshortver = '.'.join(pyver.split('.')[:2])
+sanity_check_paths = {
+    'files': ['bin/numba', 'bin/pycc'],
+    'dirs': ['lib/python%s/site-packages' % pyshortver],
+}
+
+modextrapaths = {'PYTHONPATH': ['lib/python%s/site-packages' % pyshortver]}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/n/numexpr/numexpr-2.4.6-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/n/numexpr/numexpr-2.4.6-intel-2015b-Python-2.7.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a1e1df7d77f9a9ad2e225db2b41280dd22182ad7
--- /dev/null
+++ b/easybuild/easyconfigs/n/numexpr/numexpr-2.4.6-intel-2015b-Python-2.7.10.eb
@@ -0,0 +1,33 @@
+easyblock = "PythonPackage"
+
+name = 'numexpr'
+version = '2.4.6'
+
+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': 'intel', 'version': '2015b'}
+toolchainopts = {'usempi': True}
+
+source_urls = ['https://github.com/pydata/numexpr/archive/']
+sources = ['v%(version)s.tar.gz']
+
+python = 'Python'
+pythonver = '2.7.10'
+pythonshortver = '.'.join(pythonver.split('.')[0:2])
+versionsuffix = '-%s-%s' % (python, pythonver)
+
+dependencies = [
+    (python, pythonver),
+    ('numpy', '1.10.4', versionsuffix),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%s/site-packages' % pythonshortver],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.10.4-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/n/numpy/numpy-1.10.4-intel-2015b-Python-2.7.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..db4b5f54bff4b93f2d54361b1a1360f2566fc122
--- /dev/null
+++ b/easybuild/easyconfigs/n/numpy/numpy-1.10.4-intel-2015b-Python-2.7.10.eb
@@ -0,0 +1,26 @@
+name = 'numpy'
+version = '1.10.4'
+
+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': 'intel', 'version': '2015b'}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+patches = ['numpy-1.8.0-mkl.patch']
+
+python = 'Python'
+pyver = '2.7.10'
+versionsuffix = '-%s-%s' % (python, pyver)
+
+dependencies = [
+    (python, pyver),
+]
+
+moduleclass = 'math'
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 32146789ef56c7259b982ca6df06b2c32ab2a6d2..cd51989f63b36dee3f41bb2b2a54cb734a6f87d5 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
@@ -12,7 +12,7 @@ toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
 source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCE_TAR_GZ]
-                                      
+
 patches = ['numpy-1.6.2_distutils_multiple-lib-dirs.patch']
 
 python = 'Python'
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
index 6f22931653ff77f7463ceefd8918fbaeefc653aa..0c0f8292031fbd09d08223f6f69d0fac6286214c 100644
--- 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
@@ -12,7 +12,7 @@ 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'
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 0ea594ac42a3d9419b0a7fab6ff381fde910779c..72587faf5d80aca3b8f7fa2e7790f9cfef5123a0 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
@@ -12,7 +12,7 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCE_TAR_GZ]
-                                      
+
 patches = ['numpy-1.6.2_distutils_multiple-lib-dirs.patch']
 
 python = 'Python'
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
index 722f3cab2c520d2b05087573d89f97ced0df6d6a..9211de2ef5e8b32ab0ecf494dc261a3bad3f9158 100644
--- 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
@@ -14,7 +14,7 @@ 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)
diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.8.2-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/n/numpy/numpy-1.8.2-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2530e184df088c5bab0d9f9a2cb1821968c5a3f1
--- /dev/null
+++ b/easybuild/easyconfigs/n/numpy/numpy-1.8.2-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,26 @@
+name = 'numpy'
+version = '1.8.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': 'intel', 'version': '2015b'}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+patches = ['numpy-1.8.1-mkl.patch']
+
+python = 'Python'
+pyver = '2.7.11'
+versionsuffix = '-%s-%s' % (python, pyver)
+
+dependencies = [
+    (python, pyver),
+]
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/o/Oger/Oger-1.1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/o/Oger/Oger-1.1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index 2e5794c12dcca51af0fc204e4fa9fef11247d258..15b1424e0dd07df8c121c0f5fa44c55d6b6c9869 100644
--- a/easybuild/easyconfigs/o/Oger/Oger-1.1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/o/Oger/Oger-1.1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -28,9 +28,9 @@ options = {'modulename': name}
 
 sanity_check_paths = {
                         'files': ['lib/python2.7/site-packages/Oger/__init__.py'],
-                        'dirs': ['lib/python%s/site-packages/Oger/%s' % (pythonshortversion, dir) for dir in 
+                        'dirs': ['lib/python%s/site-packages/Oger/%s' % (pythonshortversion, dir) for dir in
                                     [
-                                        'datasets', 'evaluation', 'examples', 'gradient', 
+                                        'datasets', 'evaluation', 'examples', 'gradient',
                                         'nodes', 'parallel', 'tests', 'utils',
                                     ]
                             ]
diff --git a/easybuild/easyconfigs/o/Oger/Oger-1.1.3-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/o/Oger/Oger-1.1.3-goolf-1.4.10-Python-2.7.3.eb
index ca77bdf1b16a6e5879d5a9205661141fd0e2a299..95e21e11e76440df7b9109467ad0e299d67e65b2 100644
--- a/easybuild/easyconfigs/o/Oger/Oger-1.1.3-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/o/Oger/Oger-1.1.3-goolf-1.4.10-Python-2.7.3.eb
@@ -29,9 +29,9 @@ options = {'modulename': name}
 
 sanity_check_paths = {
                         'files': ['lib/python2.7/site-packages/Oger/__init__.py'],
-                        'dirs': ['lib/python%s/site-packages/Oger/%s' % (pythonshortversion, dir) for dir in 
+                        'dirs': ['lib/python%s/site-packages/Oger/%s' % (pythonshortversion, dir) for dir in
                                     [
-                                        'datasets', 'evaluation', 'examples', 'gradient', 
+                                        'datasets', 'evaluation', 'examples', 'gradient',
                                         'nodes', 'parallel', 'tests', 'utils',
                                     ]
                             ]
diff --git a/easybuild/easyconfigs/o/Oger/Oger-1.1.3-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/o/Oger/Oger-1.1.3-ictce-4.0.6-Python-2.7.3.eb
index 96fa8be93687b3b171117cf86e21e730c93cc562..e5cd3a5503985c67176807d5e764c2bc73bf887e 100644
--- a/easybuild/easyconfigs/o/Oger/Oger-1.1.3-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/o/Oger/Oger-1.1.3-ictce-4.0.6-Python-2.7.3.eb
@@ -28,7 +28,7 @@ options = {'modulename': name}
 
 sanity_check_paths = {
                       'files': ['lib/python2.7/site-packages/Oger/__init__.py'],
-                      'dirs': ['lib/python%s/site-packages/Oger/%s' % (pythonshortversion, dir) for dir in 
+                      'dirs': ['lib/python%s/site-packages/Oger/%s' % (pythonshortversion, dir) for dir in
                                 ['datasets', 'evaluation', 'examples', 'gradient', 'nodes', 'parallel', 'tests', 'utils']
                               ]
                      }
diff --git a/easybuild/easyconfigs/o/Oger/Oger-1.1.3-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/o/Oger/Oger-1.1.3-ictce-5.3.0-Python-2.7.3.eb
index 3a51160584040a28e0fca1a69e9722b2ddb733d0..a04089fb7dad4669d129c18ba0efb2b33f672cbe 100644
--- a/easybuild/easyconfigs/o/Oger/Oger-1.1.3-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/o/Oger/Oger-1.1.3-ictce-5.3.0-Python-2.7.3.eb
@@ -29,7 +29,7 @@ options = {'modulename': name}
 
 sanity_check_paths = {
                       'files': ['lib/python2.7/site-packages/Oger/__init__.py'],
-                      'dirs': ['lib/python%s/site-packages/Oger/%s' % (pythonshortversion, dir) for dir in 
+                      'dirs': ['lib/python%s/site-packages/Oger/%s' % (pythonshortversion, dir) for dir in
                                 ['datasets', 'evaluation', 'examples', 'gradient', 'nodes', 'parallel', 'tests', 'utils']
                               ]
                      }
diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.15-GCC-4.9.3-2.25-LAPACK-3.6.0.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.15-GCC-4.9.3-2.25-LAPACK-3.6.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..32dd146e23ce19679a6291af717916733094b43f
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.15-GCC-4.9.3-2.25-LAPACK-3.6.0.eb
@@ -0,0 +1,51 @@
+easyblock = 'ConfigureMake'
+
+name = 'OpenBLAS'
+version = '0.2.15'
+
+lapackver = '3.6.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': 'GCC', 'version': '4.9.3-2.25'}
+
+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']
+
+buildopts = 'BINARY=64 USE_THREAD=1 CC="$CC" FC="$F77" NO_AFFINITY=1'
+installopts = "USE_THREAD=1 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' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/o/OpenCV/OpenCV-2.4.9-intel-2014.06.eb b/easybuild/easyconfigs/o/OpenCV/OpenCV-2.4.9-intel-2014.06.eb
index 9bed0737f0cf6488b462f7443cc39df1038378dd..cda5e655b4d5d8586ebb56405ed05d2fc5ff2bc3 100644
--- a/easybuild/easyconfigs/o/OpenCV/OpenCV-2.4.9-intel-2014.06.eb
+++ b/easybuild/easyconfigs/o/OpenCV/OpenCV-2.4.9-intel-2014.06.eb
@@ -63,7 +63,7 @@ configopts += '-DENABLE_SSE=ON -DENABLE_SSE2=ON -DENABLE_SSE3=ON '
 configopts += '-DWITH_CUDA=OFF '
 
 sanity_check_paths = {
-    'files': ['lib/libopencv_core.so'] +
+    'files': ['lib/libopencv_core.%s' % SHLIB_EXT] +
              [ 'bin/opencv_%s' % x for x in ['haartraining', 'createsamples', 'performance', 'traincascade'] ],
     'dirs': ['include']
 }
diff --git a/easybuild/easyconfigs/o/OpenCV/OpenCV-2.4.9-intel-2014b.eb b/easybuild/easyconfigs/o/OpenCV/OpenCV-2.4.9-intel-2014b.eb
index 3da865854a0f1ac72aee32436be2a577a96b570b..2db6adbc7404daf43f3193a9a2f6beee25afb3d0 100644
--- a/easybuild/easyconfigs/o/OpenCV/OpenCV-2.4.9-intel-2014b.eb
+++ b/easybuild/easyconfigs/o/OpenCV/OpenCV-2.4.9-intel-2014b.eb
@@ -63,7 +63,7 @@ configopts += '-DENABLE_SSE=ON -DENABLE_SSE2=ON -DENABLE_SSE3=ON '
 configopts += '-DWITH_CUDA=OFF '
 
 sanity_check_paths = {
-    'files': ['lib/libopencv_core.so'] +
+    'files': ['lib/libopencv_core.%s' % SHLIB_EXT] +
              [ 'bin/opencv_%s' % x for x in ['haartraining', 'createsamples', 'performance', 'traincascade'] ],
     'dirs': ['include']
 }
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.10.1-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.10.1-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c91ebdd2216e1bf5237bca369b0676951b25491e
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.10.1-GCC-4.9.3-2.25.eb
@@ -0,0 +1,32 @@
+easyblock = 'ConfigureMake'
+
+name = 'OpenMPI'
+version = '1.10.1'
+
+homepage = 'http://www.open-mpi.org/'
+description = """The Open MPI Project is an open source MPI-2 implementation."""
+
+toolchain = {'name': 'GCC', 'version': '4.9.3-2.25'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
+
+dependencies = [('hwloc', '1.11.2')]
+
+configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --with-verbs '
+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
+
+# needed for --with-verbs
+osdependencies = [('libibverbs-dev', 'libibverbs-devel')]
+
+libs = ["mpi_cxx", "mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"]
+sanity_check_paths = {
+    'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] +
+             ["lib/lib%s.%s" % (libfile, SHLIB_EXT) for libfile in libs] +
+             ["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/OpenMPI/OpenMPI-1.10.2-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.10.2-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6afba2f2929dc490f7e934bf6cac1210f8fa89a4
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.10.2-GCC-4.9.3-2.25.eb
@@ -0,0 +1,32 @@
+easyblock = 'ConfigureMake'
+
+name = 'OpenMPI'
+version = '1.10.2'
+
+homepage = 'http://www.open-mpi.org/'
+description = """The Open MPI Project is an open source MPI-2 implementation."""
+
+toolchain = {'name': 'GCC', 'version': '4.9.3-2.25'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
+
+dependencies = [('hwloc', '1.11.2')]
+
+configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --with-verbs '
+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
+
+# needed for --with-verbs
+osdependencies = [('libibverbs-dev', 'libibverbs-devel')]
+
+libs = ["mpi_cxx", "mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"]
+sanity_check_paths = {
+    'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] +
+             ["lib/lib%s.%s" % (libfile, SHLIB_EXT) for libfile in libs] +
+             ["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/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
index 8b588833b0c12bbf66e7797020c3a94ca1a0e326..4310e30ba0325ab150ddebc678bc72a7bf3ff682 100644
--- 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
@@ -14,7 +14,7 @@ source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/d
 
 dependencies = [('hwloc', '1.6.2')]
 
-configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --without-openib ' 
+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
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 ccbc9394ec9eed2af9e1eccbe052d90063a61f14..b1763322934c1f48c2488707290dc4e09bc32de0 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
@@ -12,7 +12,7 @@ toolchain = {'name': 'GCC', 'version': '4.7.3'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
 
-patches = [ 
+patches = [
       'OpenMPI-1.6.5-vt_cupti_events.patch',
 ]
 
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 ce23f55355012b7649e9e014603456c3b077bab5..da09b2dec4cd73cd870aa1bf8c39778e59474345 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
@@ -12,7 +12,7 @@ toolchain = {'name': 'GCC', 'version': '4.8.1'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
 
-patches = [ 
+patches = [
       'OpenMPI-1.6.5-vt_cupti_events.patch',
 ]
 
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 c6b40582c811ab933be965e5e3d4a70972a3c210..192e2876579a4bdd2afef0a2deb6e88649857551 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
@@ -11,7 +11,7 @@ toolchain = {'name': 'GCC', 'version': '4.8.1'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
 
-patches = [ 
+patches = [
       'OpenMPI-1.6.5-vt_cupti_events.patch',
 ]
 
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
index 2afbc4733e247f52c6237f6660133c85b8f746f6..6714cfb974eff9395031a7d736fe3f95bb28fb0b 100644
--- 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
@@ -12,7 +12,7 @@ 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 = [ 
+patches = [
       'OpenMPI-1.6.5-vt_cupti_events.patch',
 ]
 
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
index 8af372736a44fabbbb08930300abd29c4e875038..dcc884ec5473fda9e3ba293a5ecd92c15d264d3b 100644
--- 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
@@ -11,7 +11,7 @@ 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 = [ 
+patches = [
       'OpenMPI-1.6.5-vt_cupti_events.patch',
 ]
 
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.3.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.3.eb
index 2ae7377c3711c9dc395ade0bda8a717d614b459a..ef8df74e3029a7c45ec30ac05ee932922abafecf 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.3.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.3.eb
@@ -11,7 +11,7 @@ toolchain = {'name': 'GCC', 'version': '4.8.3'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
 
-patches = [ 
+patches = [
       'OpenMPI-1.6.5-vt_cupti_events.patch',
 ]
 
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
index 10774dff41ae6028fb5708e770c44b6a5efdb2b3..0d0d8c22439cabfb6ddd9ef49219af0cae6e17db 100644
--- 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
@@ -11,7 +11,7 @@ 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']
 
-patches = [ 
+patches = [
     'OpenMPI-%(version)s_common-cuda-lib.patch',
     'OpenMPI-%(version)s-vt_cupti_events.patch',
 ]
diff --git a/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-foss-2015a.eb b/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-foss-2015a.eb
index 6dae1dce8531dbe3c06c2fbc0797ec320d00c25e..34c308ea5d735fe2189865b2b34ea6f5fd43ee3b 100644
--- a/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-foss-2015a.eb
+++ b/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-foss-2015a.eb
@@ -20,7 +20,7 @@ configopts = '--with-pic'
 start_dir = 'pgm'
 
 sanity_check_paths = {
-    'files': ['lib/libpgm.so', 'lib/libpgm.a'],
+    'files': ['lib/libpgm.%s' % SHLIB_EXT, 'lib/libpgm.a'],
     'dirs': ['include'],
 }
 
diff --git a/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-goalf-1.1.0-no-OFED.eb
index 07cb82d75cc5bbc0dab4ab21870117fd53a6bd8c..5a5ff8f5b9eb59822dea3ec1e51abbc4f0bfa0be 100644
--- a/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-goalf-1.1.0-no-OFED.eb
@@ -20,8 +20,8 @@ configopts = '--with-pic'
 start_dir = 'pgm'
 
 sanity_check_paths = {
-                      'files': ['lib/libpgm.so', 'lib/libpgm.a'],
-                      'dirs': ['include']
-                      }
+    'files': ['lib/libpgm.%s' % SHLIB_EXT, 'lib/libpgm.a'],
+    'dirs': ['include']
+}
 
 moduleclass = 'system'
diff --git a/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-goolf-1.4.10.eb b/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-goolf-1.4.10.eb
index 46f7b823540842a229344df529ed52f9bd9a04e0..da4b481d25e32d00cbf146c52295aa5d70a3f1c0 100644
--- a/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-goolf-1.4.10.eb
@@ -20,8 +20,8 @@ configopts = '--with-pic'
 start_dir = 'pgm'
 
 sanity_check_paths = {
-                      'files': ['lib/libpgm.so', 'lib/libpgm.a'],
-                      'dirs': ['include']
-                      }
+    'files': ['lib/libpgm.%s' % SHLIB_EXT, 'lib/libpgm.a'],
+    'dirs': ['include']
+}
 
 moduleclass = 'system'
diff --git a/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-ictce-4.1.13.eb b/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-ictce-4.1.13.eb
index 6ae37f3575be15cd22880fb5debc7524b9a797ab..0fee5daa4373e23b0bb04ab6deeec99c059dca74 100644
--- a/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-ictce-4.1.13.eb
@@ -20,8 +20,8 @@ configopts = '--with-pic'
 start_dir = 'pgm'
 
 sanity_check_paths = {
-                      'files': ['lib/libpgm.so', 'lib/libpgm.a'],
-                      'dirs': ['include']
-                      }
+    'files': ['lib/libpgm.%s' % SHLIB_EXT, 'lib/libpgm.a'],
+    'dirs': ['include']
+}
 
 moduleclass = 'system'
diff --git a/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-ictce-5.3.0.eb b/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-ictce-5.3.0.eb
index a26c28e0af5280e27a8610de3a8c420e0085eebf..8aaab1f337b9a781a368d61da25af2594dbb3e75 100644
--- a/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-ictce-5.3.0.eb
@@ -21,8 +21,8 @@ configopts = '--with-pic'
 start_dir = 'pgm'
 
 sanity_check_paths = {
-                      'files': ['lib/libpgm.so', 'lib/libpgm.a'],
-                      'dirs': ['include']
-                      }
+    'files': ['lib/libpgm.%s' % SHLIB_EXT, 'lib/libpgm.a'],
+    'dirs': ['include']
+}
 
 moduleclass = 'system'
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
index 324c3ec862b28615e208813165f5f7832f1283a8..e0719d72e6c3b534a04075363a09879c69ace82b 100644
--- 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
@@ -20,7 +20,7 @@ configopts = '--with-pic'
 start_dir = 'pgm'
 
 sanity_check_paths = {
-    'files': ['lib/libpgm.so', 'lib/libpgm.a'],
+    'files': ['lib/libpgm.%s' % SHLIB_EXT, 'lib/libpgm.a'],
     'dirs': ['include'],
 }
 
diff --git a/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-intel-2015a.eb b/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-intel-2015a.eb
index bb2adb94d7c0a397596e7d15a76752dd5c118861..690b4d99ca2bee029a64d78938be52a5302df775 100644
--- a/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-intel-2015a.eb
+++ b/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-intel-2015a.eb
@@ -20,7 +20,7 @@ configopts = '--with-pic'
 start_dir = 'pgm'
 
 sanity_check_paths = {
-    'files': ['lib/libpgm.so', 'lib/libpgm.a'],
+    'files': ['lib/libpgm.%s' % SHLIB_EXT, 'lib/libpgm.a'],
     'dirs': ['include'],
 }
 
diff --git a/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-intel-2015b.eb b/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..26e1420fdaffd92f0979b43a83d48f3696cb5264
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-intel-2015b.eb
@@ -0,0 +1,28 @@
+easyblock = 'ConfigureMake'
+
+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': 'intel', 'version': '2015b'}
+toolchainopts = {'pic': True}
+
+source_urls = [GOOGLECODE_SOURCE]
+sources = ['libpgm-%(version)s.tar.gz']
+
+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/o2scl/o2scl-0.913-goolf-1.4.10.eb b/easybuild/easyconfigs/o/o2scl/o2scl-0.913-goolf-1.4.10.eb
index 539e278a55796051e06244ac07502a6fe117b527..665ae52c04d529e79b628283fed4fc30ce53d3a8 100644
--- 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
@@ -20,7 +20,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
-dependencies = [ 
+dependencies = [
     ('Eigen', '3.1.4'),
     ('libreadline', '6.2'),
     ('HDF5', '1.8.11'),
diff --git a/easybuild/easyconfigs/o/orthomcl/orthomcl-2.0.8-goolf-1.4.10-Perl-5.16.3.eb b/easybuild/easyconfigs/o/orthomcl/orthomcl-2.0.8-goolf-1.4.10-Perl-5.16.3.eb
index 54437d6a78ae44e6c13a74e88bdccf90008e220b..2cbfe2886febcbbb0f562b81f248b74f4c868cbb 100644
--- a/easybuild/easyconfigs/o/orthomcl/orthomcl-2.0.8-goolf-1.4.10-Perl-5.16.3.eb
+++ b/easybuild/easyconfigs/o/orthomcl/orthomcl-2.0.8-goolf-1.4.10-Perl-5.16.3.eb
@@ -27,7 +27,7 @@ sanity_check_paths = {
                                                  'ExtractProteinIdsFromGroupsFile', 'ExtractProteinPairsFromGroupsFile',
                                                  'FilterFasta', 'InstallSchema', 'LoadBlast', 'MclToGroups', 'Pairs',
                                                  'ReduceFasta', 'ReduceGroups', 'RemoveIdenticalGroups', 'Singletons',
-                                                 'SortGroupMembersByScore', 'SortGroupsFile']], 
+                                                 'SortGroupMembersByScore', 'SortGroupsFile']],
     'dirs': ['lib/perl/OrthoMCLEngine'],
 }
 
diff --git a/easybuild/easyconfigs/o/orthomcl/orthomcl-2.0.8-ictce-4.1.13-Perl-5.16.3.eb b/easybuild/easyconfigs/o/orthomcl/orthomcl-2.0.8-ictce-4.1.13-Perl-5.16.3.eb
index 0bcdb50b2fcb758271df587866d161d04db8db6c..b5689400cf4567463c5bcc99010dda8e231d5f85 100644
--- a/easybuild/easyconfigs/o/orthomcl/orthomcl-2.0.8-ictce-4.1.13-Perl-5.16.3.eb
+++ b/easybuild/easyconfigs/o/orthomcl/orthomcl-2.0.8-ictce-4.1.13-Perl-5.16.3.eb
@@ -27,7 +27,7 @@ sanity_check_paths = {
                                                  'ExtractProteinIdsFromGroupsFile', 'ExtractProteinPairsFromGroupsFile',
                                                  'FilterFasta', 'InstallSchema', 'LoadBlast', 'MclToGroups', 'Pairs',
                                                  'ReduceFasta', 'ReduceGroups', 'RemoveIdenticalGroups', 'Singletons',
-                                                 'SortGroupMembersByScore', 'SortGroupsFile']], 
+                                                 'SortGroupMembersByScore', 'SortGroupsFile']],
     'dirs': ['lib/perl/OrthoMCLEngine'],
 }
 
diff --git a/easybuild/easyconfigs/o/orthomcl/orthomcl-2.0.8-ictce-5.3.0-Perl-5.16.3.eb b/easybuild/easyconfigs/o/orthomcl/orthomcl-2.0.8-ictce-5.3.0-Perl-5.16.3.eb
index 4cb9385e591baa1714e04ded2b2036ea177d5545..2fe03116064d8558042da83bea1660ee848cf32e 100644
--- a/easybuild/easyconfigs/o/orthomcl/orthomcl-2.0.8-ictce-5.3.0-Perl-5.16.3.eb
+++ b/easybuild/easyconfigs/o/orthomcl/orthomcl-2.0.8-ictce-5.3.0-Perl-5.16.3.eb
@@ -27,7 +27,7 @@ sanity_check_paths = {
                                                  'ExtractProteinIdsFromGroupsFile', 'ExtractProteinPairsFromGroupsFile',
                                                  'FilterFasta', 'InstallSchema', 'LoadBlast', 'MclToGroups', 'Pairs',
                                                  'ReduceFasta', 'ReduceGroups', 'RemoveIdenticalGroups', 'Singletons',
-                                                 'SortGroupMembersByScore', 'SortGroupsFile']], 
+                                                 'SortGroupMembersByScore', 'SortGroupsFile']],
     'dirs': ['lib/perl/OrthoMCLEngine'],
 }
 
diff --git a/easybuild/easyconfigs/o/otcl/otcl-1.14-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/o/otcl/otcl-1.14-goalf-1.1.0-no-OFED.eb
index 1d362a73aed15a463d9bf402da6020b7c43cb33f..8a1c43632470edb7d75a8307f1724966a7ae2fc2 100644
--- a/easybuild/easyconfigs/o/otcl/otcl-1.14-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/o/otcl/otcl-1.14-goalf-1.1.0-no-OFED.eb
@@ -27,7 +27,7 @@ configopts += "--with-tk-ver=$EBVERSIONTK"
 parallel = 1
 
 sanity_check_paths = {
-    'files': ['bin/otclsh', 'include/otcl.h', 'lib/libotcl.a', 'lib/libotcl.so'],
+    'files': ['bin/otclsh', 'include/otcl.h', 'lib/libotcl.a', 'lib/libotcl.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/o/otcl/otcl-1.14-goolf-1.4.10.eb b/easybuild/easyconfigs/o/otcl/otcl-1.14-goolf-1.4.10.eb
index 0a50c8abb900ab8217b65b783aa90a2096638960..49c68abea9d54b9da1710d607f0dacafda879552 100644
--- a/easybuild/easyconfigs/o/otcl/otcl-1.14-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/o/otcl/otcl-1.14-goolf-1.4.10.eb
@@ -27,7 +27,7 @@ configopts += "--with-tk-ver=$EBVERSIONTK"
 parallel = 1
 
 sanity_check_paths = {
-    'files': ['bin/otclsh', 'include/otcl.h', 'lib/libotcl.a', 'lib/libotcl.so'],
+    'files': ['bin/otclsh', 'include/otcl.h', 'lib/libotcl.a', 'lib/libotcl.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/o/otcl/otcl-1.14-ictce-5.3.0.eb b/easybuild/easyconfigs/o/otcl/otcl-1.14-ictce-5.3.0.eb
index 597dc68acfb27bcf97892d8a8969333a8a619ba9..f53d6887c371e99022a717848ef6974feda08c7c 100644
--- a/easybuild/easyconfigs/o/otcl/otcl-1.14-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/o/otcl/otcl-1.14-ictce-5.3.0.eb
@@ -27,7 +27,7 @@ configopts += "--with-tk-ver=$EBVERSIONTK"
 parallel = 1
 
 sanity_check_paths = {
-    'files': ['bin/otclsh', 'include/otcl.h', 'lib/libotcl.a', 'lib/libotcl.so'],
+    'files': ['bin/otclsh', 'include/otcl.h', 'lib/libotcl.a', 'lib/libotcl.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/p/PANDAseq/PANDAseq-2.5-goolf-1.4.10.eb b/easybuild/easyconfigs/p/PANDAseq/PANDAseq-2.5-goolf-1.4.10.eb
index fdec406ad1f510de4c6d9b2380fe0d59674aae85..86983e66d24f54203817656e1e4a215b068d69b5 100644
--- a/easybuild/easyconfigs/p/PANDAseq/PANDAseq-2.5-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/PANDAseq/PANDAseq-2.5-goolf-1.4.10.eb
@@ -23,7 +23,7 @@ preconfigopts = "./autogen.sh &&"
 
 sanity_check_paths = {
     'files': ['bin/pandaseq', 'bin/pandaseq-checkid', 'bin/pandaseq-hang', 'bin/pandaxs',
-              'lib/libpandaseq.so', 'lib/libpandaseq.a', 'lib/pkgconfig/pandaseq-%(version_major)s.pc'],
+              'lib/libpandaseq.%s' % SHLIB_EXT, 'lib/libpandaseq.a', 'lib/pkgconfig/pandaseq-%(version_major)s.pc'],
     'dirs': ['include/pandaseq-%(version_major)s'],
 }
 
diff --git a/easybuild/easyconfigs/p/PANDAseq/PANDAseq-2.5-ictce-4.1.13.eb b/easybuild/easyconfigs/p/PANDAseq/PANDAseq-2.5-ictce-4.1.13.eb
index c0eaa92772a19de460601ff96603ec8c3c6f84e3..3691e4a15a4b7ca8dd68aa235509e2d1f9c7e0fb 100644
--- a/easybuild/easyconfigs/p/PANDAseq/PANDAseq-2.5-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/p/PANDAseq/PANDAseq-2.5-ictce-4.1.13.eb
@@ -23,7 +23,7 @@ preconfigopts = "./autogen.sh &&"
 
 sanity_check_paths = {
     'files': ['bin/pandaseq', 'bin/pandaseq-checkid', 'bin/pandaseq-hang', 'bin/pandaxs',
-              'lib/libpandaseq.so', 'lib/libpandaseq.a', 'lib/pkgconfig/pandaseq-%(version_major)s.pc'],
+              'lib/libpandaseq.%s' % SHLIB_EXT, 'lib/libpandaseq.a', 'lib/pkgconfig/pandaseq-%(version_major)s.pc'],
     'dirs': ['include/pandaseq-%(version_major)s'],
 }
 
diff --git a/easybuild/easyconfigs/p/PBZIP2/PBZIP2-1.1.8-goolf-1.4.10.eb b/easybuild/easyconfigs/p/PBZIP2/PBZIP2-1.1.8-goolf-1.4.10.eb
index e0822f5ef30310772f7eebef96341330bffb9f96..e1ffffe6152d84a7b9754868291d9abb0cdd2e5f 100644
--- a/easybuild/easyconfigs/p/PBZIP2/PBZIP2-1.1.8-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/PBZIP2/PBZIP2-1.1.8-goolf-1.4.10.eb
@@ -6,7 +6,7 @@
 easyblock = 'MakeCp'
 
 name = 'PBZIP2'
-version = '1.1.8' 
+version = '1.1.8'
 
 homepage = 'http://compression.ca/pbzip2/'
 description = """ PBZIP2 is a parallel implementation of the bzip2 block-sorting file 
@@ -24,7 +24,7 @@ buildopts = " CC=$CXX"
 parallel = 1
 
 files_to_copy = [(["pbzip2"], "bin"), (["pbzip2.1"], "man/man1"), "README", "ChangeLog"]
-        
+
 sanity_check_paths = {
     'files': ["bin/pbzip2"],
     'dirs': [],
diff --git a/easybuild/easyconfigs/p/PBZIP2/PBZIP2-1.1.8-ictce-6.2.5.eb b/easybuild/easyconfigs/p/PBZIP2/PBZIP2-1.1.8-ictce-6.2.5.eb
index a1befffbe40b73e286c1feec3f07abf8c3a6c965..795cc4f409ca348c9fe0770d32b069c62f4c7e6b 100644
--- a/easybuild/easyconfigs/p/PBZIP2/PBZIP2-1.1.8-ictce-6.2.5.eb
+++ b/easybuild/easyconfigs/p/PBZIP2/PBZIP2-1.1.8-ictce-6.2.5.eb
@@ -6,7 +6,7 @@
 easyblock = 'MakeCp'
 
 name = 'PBZIP2'
-version = '1.1.8' 
+version = '1.1.8'
 
 homepage = 'http://compression.ca/pbzip2/'
 description = """ PBZIP2 is a parallel implementation of the bzip2 block-sorting file 
@@ -14,7 +14,7 @@ description = """ PBZIP2 is a parallel implementation of the bzip2 block-sorting
  of this version is fully compatible with bzip2 v1.0.2 or newer (ie: anything compressed 
  with pbzip2 can be decompressed with bzip2)."""
 
-toolchain = {'name': 'ictce', 'version': '6.2.5'} 
+toolchain = {'name': 'ictce', 'version': '6.2.5'}
 
 source_urls = ['http://compression.ca/pbzip2/']
 sources = [SOURCELOWER_TAR_GZ]
@@ -24,7 +24,7 @@ buildopts = " CC=$CXX"
 parallel = 1
 
 files_to_copy = [(["pbzip2"], "bin"), (["pbzip2.1"], "man/man1"), "README", "ChangeLog"]
-        
+
 sanity_check_paths = {
     'files': ["bin/pbzip2"],
     'dirs': [],
diff --git a/easybuild/easyconfigs/p/PCC/PCC-20131024.eb b/easybuild/easyconfigs/p/PCC/PCC-20131024.eb
index be6e59a2e93efa193ad350e651f28dd23eb2e467..c40392b7711f295f9ad46e89c728c0a8e2a580e3 100644
--- a/easybuild/easyconfigs/p/PCC/PCC-20131024.eb
+++ b/easybuild/easyconfigs/p/PCC/PCC-20131024.eb
@@ -28,7 +28,7 @@ builddependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ["bin/pcc"], 
+    'files': ["bin/pcc"],
     'dirs': ["lib"]
 }
 
diff --git a/easybuild/easyconfigs/p/PETSc/PETSc-3.5.1-intel-2014b-Python-2.7.8.eb b/easybuild/easyconfigs/p/PETSc/PETSc-3.5.1-intel-2014b-Python-2.7.8.eb
index 4cff265549c1762145116e523f795cff5e87feef..72b0ef23a93edafacd6a838a1060721b70d327b8 100644
--- a/easybuild/easyconfigs/p/PETSc/PETSc-3.5.1-intel-2014b-Python-2.7.8.eb
+++ b/easybuild/easyconfigs/p/PETSc/PETSc-3.5.1-intel-2014b-Python-2.7.8.eb
@@ -15,7 +15,7 @@ sources = [SOURCELOWER_TAR_GZ]
 patches = [
     'PETSc_ranlib-fix.patch',
     'PETSc-%(version)s-zlibfix.patch',
-] 
+]
 
 parmetis = 'ParMETIS'
 parmetis_ver = '4.0.3'
diff --git a/easybuild/easyconfigs/p/PETSc/PETSc-3.6.3-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/p/PETSc/PETSc-3.6.3-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8bab727ff29245a7858e50fdf93a001a203e3830
--- /dev/null
+++ b/easybuild/easyconfigs/p/PETSc/PETSc-3.6.3-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,32 @@
+name = 'PETSc'
+version = '3.6.3'
+versionsuffix = '-Python-2.7.11'
+
+homepage = 'http://www.mcs.anl.gov/petsc'
+description = """PETSc, pronounced PET-see (the S is silent), is a suite of data structures and routines for the
+ scalable (parallel) solution of scientific applications modeled by partial differential equations."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'usempi': True, 'pic': True}
+
+source_urls = ['http://ftp.mcs.anl.gov/pub/petsc/release-snapshots']
+sources = [SOURCELOWER_TAR_GZ]
+
+patches = ['PETSc_ranlib-fix.patch']
+
+parmetis = 'ParMETIS'
+parmetis_ver = '4.0.3'
+dependencies = [
+    ('Boost', '1.59.0', versionsuffix),
+    ('ScientificPython', '2.9.4', versionsuffix),
+    ('FIAT', '1.6.0', versionsuffix),
+    ('METIS', '5.1.0'),
+    (parmetis, parmetis_ver),
+    ('SCOTCH', '6.0.4'),
+    ('SuiteSparse', '4.4.6', '-%s-%s' % (parmetis, parmetis_ver)),
+    ('Hypre', '2.10.1'),
+]
+
+builddependencies = [('CMake', '3.4.1')]
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/p/PGI/PGI-15.10-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/p/PGI/PGI-15.10-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e722b3a3d51413d4100937ed01047487eb0a3322
--- /dev/null
+++ b/easybuild/easyconfigs/p/PGI/PGI-15.10-GCC-4.9.3-2.25.eb
@@ -0,0 +1,25 @@
+name = 'PGI'
+version = '15.10'
+
+homepage = 'http://www.pgroup.com/'
+description = "C, C++ and Fortran compilers from The Portland Group - PGI"
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = ['pgilinux-20%(version_major)s-%(version_major)s%(version_minor)s-x86_64.tar.gz']
+checksums = ['cae307f7ad467a1811a5d5da758048ab']
+
+gccver = '4.9.3'
+binutilsver = '2.25'
+versionsuffix = '-GCC-%s-%s' % (gccver, binutilsver)
+
+dependencies = [
+    ('GCCcore', gccver),
+    ('binutils', binutilsver, '', ('GCCcore', gccver)),
+]
+
+# license file
+import os
+license_file = os.path.join(os.getenv('HOME'), "licenses", "pgi", "license.dat")
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/p/PGI/PGI-15.7-GNU-4.9.2-2.25.eb b/easybuild/easyconfigs/p/PGI/PGI-15.7-GNU-4.9.2-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d3260f31f88f55488164307720bd1b96e40bcda5
--- /dev/null
+++ b/easybuild/easyconfigs/p/PGI/PGI-15.7-GNU-4.9.2-2.25.eb
@@ -0,0 +1,21 @@
+name = 'PGI'
+version = '15.7'
+
+homepage = 'http://www.pgroup.com/'
+description = "C, C++ and Fortran compilers from The Portland Group - PGI"
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = ['pgilinux-20%(version_major)s-%(version_major)s%(version_minor)s-x86_64.tar.gz']
+
+gnu = 'GNU'
+gnuver = '4.9.2-2.25'
+versionsuffix = '-%s-%s' % (gnu, gnuver)
+
+dependencies = [(gnu, gnuver)]
+
+# license file
+import os
+license_file = os.path.join(os.getenv('HOME'), "licenses", "pgi", "license.dat")
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/p/PGI/PGI-15.7-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/p/PGI/PGI-15.7-GNU-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6589eba972142296011c7f1c7061dfab74410f1a
--- /dev/null
+++ b/easybuild/easyconfigs/p/PGI/PGI-15.7-GNU-4.9.3-2.25.eb
@@ -0,0 +1,21 @@
+name = 'PGI'
+version = '15.7'
+
+homepage = 'http://www.pgroup.com/'
+description = "C, C++ and Fortran compilers from The Portland Group - PGI"
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = ['pgilinux-20%(version_major)s-%(version_major)s%(version_minor)s-x86_64.tar.gz']
+
+gnu = 'GNU'
+gnuver = '4.9.3-2.25'
+versionsuffix = '-%s-%s' % (gnu, gnuver)
+
+dependencies = [(gnu, gnuver)]
+
+# license file
+import os
+license_file = os.path.join(os.getenv('HOME'), "licenses", "pgi", "license.dat")
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/p/PIL/PIL-1.1.7-find-deps.patch b/easybuild/easyconfigs/p/PIL/PIL-1.1.7-find-deps.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ac98c7fa89fa5d5b535322ecf408c856b40fcd8a
--- /dev/null
+++ b/easybuild/easyconfigs/p/PIL/PIL-1.1.7-find-deps.patch
@@ -0,0 +1,31 @@
+# let PIL finds the EB deps
+# By Ward Poelmans <ward.poelmans@ugent.be>
+diff -ur Imaging-1.1.7.orig/setup.py Imaging-1.1.7/setup.py
+--- Imaging-1.1.7.orig/setup.py	2009-11-15 17:06:10.000000000 +0100
++++ Imaging-1.1.7/setup.py	2016-01-07 12:29:07.708559953 +0100
+@@ -14,6 +14,8 @@
+     pass
+ 
+ def libinclude(root):
++    if not root:
++        return None
+     # map root to (root/lib, root/include)
+     return os.path.join(root, "lib"), os.path.join(root, "include")
+ 
+@@ -33,11 +35,11 @@
+ #
+ # TIFF_ROOT = libinclude("/opt/tiff")
+ 
+-TCL_ROOT = None
+-JPEG_ROOT = None
+-ZLIB_ROOT = None
+-TIFF_ROOT = None
+-FREETYPE_ROOT = None
++TCL_ROOT = libinclude(os.getenv("EBROOTTCL"))
++JPEG_ROOT = libinclude(os.getenv("EBROOTLIBJPEGMINTURBO"))
++ZLIB_ROOT = libinclude(os.getenv("EBROOTZLIB"))
++TIFF_ROOT = libinclude(os.getenv("EBROOTLIBTIFF"))
++FREETYPE_ROOT = libinclude(os.getenv("EBROOTFREETYPE"))
+ LCMS_ROOT = None
+ 
+ # FIXME: add mechanism to explicitly *disable* the use of a library
diff --git a/easybuild/easyconfigs/p/PIL/PIL-1.1.7-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/p/PIL/PIL-1.1.7-intel-2015b-Python-2.7.10.eb
index fbe47598f679c36c8a837978c29fe19165b2e14a..087b2efa58a86f07f14c0fbfda1ddd8c1340591b 100644
--- a/easybuild/easyconfigs/p/PIL/PIL-1.1.7-intel-2015b-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/p/PIL/PIL-1.1.7-intel-2015b-Python-2.7.10.eb
@@ -12,9 +12,17 @@ toolchain = {'name': 'intel', 'version': '2015b'}
 source_urls = ['http://effbot.org/downloads/']
 sources = ['Imaging-%(version)s.tar.gz']
 
+patches = ['PIL-%(version)s-find-deps.patch']
+
 pyver = '2.7.10'
 versionsuffix = '-Python-%s' % pyver
-dependencies = [('Python', pyver)]
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('Python', pyver),
+    ('libjpeg-turbo', '1.4.2'),
+    # currently not used because of dependency hell
+    # ('freetype', '2.6.1'),
+]
 
 options = {'modulename': 'PIL'}
 
diff --git a/easybuild/easyconfigs/p/PLINK/PLINK-1.07-x86_64.eb b/easybuild/easyconfigs/p/PLINK/PLINK-1.07-x86_64.eb
index 50bb76fbb335ca5b24752327a4eac513666913cc..7f7c8b29a2133f6367d22e7fe0d05220d301e291 100644
--- a/easybuild/easyconfigs/p/PLINK/PLINK-1.07-x86_64.eb
+++ b/easybuild/easyconfigs/p/PLINK/PLINK-1.07-x86_64.eb
@@ -14,7 +14,7 @@ source_urls = ['http://pngu.mgh.harvard.edu/~purcell/plink/dist/']
 checksums = ['fd0bafeda42151b20534e4f97b0d97df']
 
 files_to_copy = [
-    'plink', 
+    'plink',
     'gPLINK.jar',
     'test.map',
     'test.ped',
diff --git a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.0.4-ictce-7.1.2.eb b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.0.4-ictce-7.1.2.eb
index e6ac2070ea914340d95b3e4dda1cdaee8fd6d4ba..e4e68f12e8db0aca7bf3f0506c1c417c82c9d724 100644
--- a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.0.4-ictce-7.1.2.eb
+++ b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.0.4-ictce-7.1.2.eb
@@ -26,10 +26,10 @@ prebuildopts = " ./configure.sh linux.icc && source sourceme.sh && "
 preinstallopts = " export PLUMED_PREFIX=%(installdir)s && "
 
 sanity_check_paths = {
-    'files': ['bin/plumed', 'lib/libplumedKernel.so', 'lib/libplumed.so'],
+    'files': ['bin/plumed', 'lib/libplumedKernel.%s' % SHLIB_EXT, 'lib/libplumed.%s' % SHLIB_EXT],
     'dirs': ['lib/plumed']
 }
 
-modextrapaths = {'PLUMED_KERNEL': 'lib/libplumedKernel.so'}
+modextrapaths = {'PLUMED_KERNEL': 'lib/libplumedKernel.%s' % SHLIB_EXT}
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.1.3-intel-2015a.eb b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.1.3-intel-2015a.eb
index 89a5511e514fa9695c53d198d3fa8f9aeeddc37d..d87b961730ae9acf36822487fee3e486f9a5dc81 100644
--- a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.1.3-intel-2015a.eb
+++ b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.1.3-intel-2015a.eb
@@ -27,10 +27,10 @@ prebuildopts = " ./configure.sh linux.mpi.icc && source sourceme.sh && "
 preinstallopts = " export PLUMED_PREFIX=%(installdir)s && "
 
 sanity_check_paths = {
-    'files': ['bin/plumed', 'lib/libplumedKernel.so', 'lib/libplumed.so'],
+    'files': ['bin/plumed', 'lib/libplumedKernel.%s' % SHLIB_EXT, 'lib/libplumed.%s' % SHLIB_EXT],
     'dirs': ['lib/plumed']
 }
 
-modextrapaths = {'PLUMED_KERNEL': 'lib/libplumedKernel.so'}
+modextrapaths = {'PLUMED_KERNEL': 'lib/libplumedKernel.%s' % SHLIB_EXT}
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/p/PLY/PLY-3.8-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/p/PLY/PLY-3.8-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a7d3815c2c2a1949cc4584dcdf2004fa762f8780
--- /dev/null
+++ b/easybuild/easyconfigs/p/PLY/PLY-3.8-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,26 @@
+easyblock = 'PythonPackage'
+
+name = 'PLY'
+version = '3.8'
+
+homepage = "http://www.dabeaz.com/ply/"
+description = """PLY is yet another implementation of lex and yacc for Python."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = [PYPI_LOWER_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+pyver = '2.7.11'
+
+versionsuffix = "-Python-%s" % pyver
+
+dependencies = [('Python', pyver)]
+
+py_short_ver = '.'.join(pyver.split('.')[:2])
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%s/site-packages' % py_short_ver],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/p/PROJ/PROJ-4.8.0-goolf-1.4.10.eb b/easybuild/easyconfigs/p/PROJ/PROJ-4.8.0-goolf-1.4.10.eb
index 2060e3874c7fc694274a63e808fd851725b2d1ec..34a1760e0e9adf7dc21d8d159b4cf3aadc4de2d7 100644
--- a/easybuild/easyconfigs/p/PROJ/PROJ-4.8.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/PROJ/PROJ-4.8.0-goolf-1.4.10.eb
@@ -22,7 +22,7 @@ source_urls = ['http://download.osgeo.org/proj/']
 sources = [SOURCELOWER_TAR_GZ]
 
 sanity_check_paths = {
-    'files': ['bin/cs2cs', 'bin/geod', 'bin/invgeod', 'bin/invproj', 
+    'files': ['bin/cs2cs', 'bin/geod', 'bin/invgeod', 'bin/invproj',
               'bin/nad2bin', 'bin/proj'],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/p/PROJ/PROJ-4.8.0-ictce-5.3.0.eb b/easybuild/easyconfigs/p/PROJ/PROJ-4.8.0-ictce-5.3.0.eb
index 427477bf963cc96c4830a83e4901011d9532ffc3..1a6432b2aa66837a3f2a8025047a3beff7ef7c64 100644
--- a/easybuild/easyconfigs/p/PROJ/PROJ-4.8.0-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/p/PROJ/PROJ-4.8.0-ictce-5.3.0.eb
@@ -22,7 +22,7 @@ source_urls = ['http://download.osgeo.org/proj/']
 sources = [SOURCELOWER_TAR_GZ]
 
 sanity_check_paths = {
-    'files': ['bin/cs2cs', 'bin/geod', 'bin/invgeod', 'bin/invproj', 
+    'files': ['bin/cs2cs', 'bin/geod', 'bin/invgeod', 'bin/invproj',
               'bin/nad2bin', 'bin/proj'],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/p/PaStiX/PaStiX-5.2.2.22-intel-2015b.eb b/easybuild/easyconfigs/p/PaStiX/PaStiX-5.2.2.22-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..34d2da9e2f58d0ac27693129eec44da7255479bf
--- /dev/null
+++ b/easybuild/easyconfigs/p/PaStiX/PaStiX-5.2.2.22-intel-2015b.eb
@@ -0,0 +1,42 @@
+easyblock = 'ConfigureMake'
+
+name = 'PaStiX'
+version = '5.2.2.22'
+
+homepage = 'http://pastix.gforge.inria.fr/'
+description = """PaStiX (Parallel Sparse matriX package) is a scientific library that provides a high performance
+ parallel solver for very large sparse linear systems based on direct methods."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'pic': True}
+
+source_urls = ['https://gforge.inria.fr/frs/download.php/file/35070/']
+sources = ['%(namelower)s_%(version)s.tar.bz2']
+checksums = ['85127ecdfaeed39e850c996b78573d94']
+
+dependencies = [
+    ('hwloc', '1.11.2', '', ('GNU', '4.9.3-2.25')),
+    ('SCOTCH', '6.0.4'),
+]
+
+skipsteps = ['configure']
+
+start_dir = 'src'
+
+prebuildopts = "cp -a config/LINUX-INTEL.in config.in && "
+buildopts = 'BLASLIB="-L$BLAS_LIB_DIR $LIBBLAS" HWLOC_HOME=$EBROOTHWLOC SCOTCH_HOME=$EBROOTSCOTCH '
+# take control over compiler flags
+buildopts += 'CCFOPT="$CFLAGS" '
+# fix value for $MPCXXPROG, default uses 'mpic++' which is incorrect
+buildopts += 'MPCXXPROG="$MPICXX -cxx=$CXX -Wall" '
+
+runtest = "examples && ./example/bin/simple -lap 100"
+
+installopts = "PREFIX=%(installdir)s"
+
+sanity_check_paths = {
+    'files': ['bin/pastix-conf', 'lib/libmatrix_driver.a', 'lib/libpastix.a', 'lib/libpastix_murge.a'],
+    'dirs': ['include'],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/p/Pango/Pango-1.36.7-intel-2014b.eb b/easybuild/easyconfigs/p/Pango/Pango-1.36.7-intel-2014b.eb
index 76a476c789260cf72da2998aaf9840fde183c9b7..cf37090dbc1acc81507ce169fea9df6fb1c800cb 100644
--- a/easybuild/easyconfigs/p/Pango/Pango-1.36.7-intel-2014b.eb
+++ b/easybuild/easyconfigs/p/Pango/Pango-1.36.7-intel-2014b.eb
@@ -30,8 +30,8 @@ builddependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['bin/pango-view', 'lib/libpango-1.0.so', 'lib/libpangocairo-1.0.so',
-              'lib/libpangoft2-1.0.so', 'lib/libpangoxft-1.0.so'],
+    'files': ['bin/pango-view', 'lib/libpango-1.0.%s' % SHLIB_EXT, 'lib/libpangocairo-1.0.%s' % SHLIB_EXT,
+              'lib/libpangoft2-1.0.%s' % SHLIB_EXT, 'lib/libpangoxft-1.0.%s' % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/p/Pango/Pango-1.37.2-intel-2015a.eb b/easybuild/easyconfigs/p/Pango/Pango-1.37.2-intel-2015a.eb
index d1b5731cfff4e57495660a5f0342056359f00f8e..6e8887ec4ef882e114b0a2ed45efd5a622d75687 100644
--- a/easybuild/easyconfigs/p/Pango/Pango-1.37.2-intel-2015a.eb
+++ b/easybuild/easyconfigs/p/Pango/Pango-1.37.2-intel-2015a.eb
@@ -30,8 +30,8 @@ builddependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['bin/pango-view', 'lib/libpango-1.0.so', 'lib/libpangocairo-1.0.so',
-              'lib/libpangoft2-1.0.so', 'lib/libpangoxft-1.0.so'],
+    'files': ['bin/pango-view', 'lib/libpango-1.0.%s' % SHLIB_EXT, 'lib/libpangocairo-1.0.%s' % SHLIB_EXT,
+              'lib/libpangoft2-1.0.%s' % SHLIB_EXT, 'lib/libpangoxft-1.0.%s' % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/p/Pango/Pango-1.38.1-intel-2015b.eb b/easybuild/easyconfigs/p/Pango/Pango-1.38.1-intel-2015b.eb
index 85f56a97012d994d3137401bc3fbd4ca656e252c..bcb85326ff36e21af1110680f4c7fa234df02604 100644
--- a/easybuild/easyconfigs/p/Pango/Pango-1.38.1-intel-2015b.eb
+++ b/easybuild/easyconfigs/p/Pango/Pango-1.38.1-intel-2015b.eb
@@ -30,8 +30,8 @@ builddependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['bin/pango-view', 'lib/libpango-1.0.so', 'lib/libpangocairo-1.0.so',
-              'lib/libpangoft2-1.0.so', 'lib/libpangoxft-1.0.so'],
+    'files': ['bin/pango-view', 'lib/libpango-1.0.%s' % SHLIB_EXT, 'lib/libpangocairo-1.0.%s' % SHLIB_EXT,
+              'lib/libpangoft2-1.0.%s' % SHLIB_EXT, 'lib/libpangoxft-1.0.%s' % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/p/Pangomm/Pangomm-2.36.0-intel-2015a.eb b/easybuild/easyconfigs/p/Pangomm/Pangomm-2.36.0-intel-2015a.eb
index 044fc1c671029a286e109155c513ae22d59f7496..d0dd1f99071aa8bc416f17e83100cf2e04cab078 100644
--- a/easybuild/easyconfigs/p/Pangomm/Pangomm-2.36.0-intel-2015a.eb
+++ b/easybuild/easyconfigs/p/Pangomm/Pangomm-2.36.0-intel-2015a.eb
@@ -19,8 +19,8 @@ dependencies = [
 
 
 sanity_check_paths = {
-    'files': ['lib/libpangomm-1.4.so'],
+    'files': ['lib/libpangomm-1.4.%s' % SHLIB_EXT],
     'dirs': [],
-} 
+}
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/p/Pangomm/Pangomm-2.36.0-intel-2015b.eb b/easybuild/easyconfigs/p/Pangomm/Pangomm-2.36.0-intel-2015b.eb
index 09010410c9bb93e566e459eb7b583d56c3a9c52a..71f5cdfd45fbc7d783c93ccf384cdb89889c36fd 100644
--- a/easybuild/easyconfigs/p/Pangomm/Pangomm-2.36.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/p/Pangomm/Pangomm-2.36.0-intel-2015b.eb
@@ -19,8 +19,8 @@ dependencies = [
 
 
 sanity_check_paths = {
-    'files': ['lib/libpangomm-1.4.so'],
+    'files': ['lib/libpangomm-1.4.%s' % SHLIB_EXT],
     'dirs': [],
-} 
+}
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/p/ParaView/ParaView-4.3.1-intel-2015a-Python-2.7.10-mpi.eb b/easybuild/easyconfigs/p/ParaView/ParaView-4.3.1-intel-2015a-Python-2.7.10-mpi.eb
index 003394e4e200f90176bdbd8f28962b3939727d40..96e7b3b1b8eddc11975e05083e51c85df1a2650c 100644
--- a/easybuild/easyconfigs/p/ParaView/ParaView-4.3.1-intel-2015a-Python-2.7.10-mpi.eb
+++ b/easybuild/easyconfigs/p/ParaView/ParaView-4.3.1-intel-2015a-Python-2.7.10-mpi.eb
@@ -33,7 +33,7 @@ builddependencies = [('CMake', '3.2.2')]
 
 separate_build_dir = True
 
-maxparallel = 4 
+maxparallel = 4
 
 configopts = '-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON -DVTK_OPENGL_HAS_OSMESA=ON -DPARAVIEW_USE_MPI=ON '
 configopts += '-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include -DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.so '
diff --git a/easybuild/easyconfigs/p/ParaView/ParaView-4.3.1-intel-2015a-Python-2.7.10.eb b/easybuild/easyconfigs/p/ParaView/ParaView-4.3.1-intel-2015a-Python-2.7.10.eb
index db9915173850632740fa8b1100eb08a0e45f08db..a80a2bae4848ec6ee62894ab91bbd5eaf81c7568 100644
--- a/easybuild/easyconfigs/p/ParaView/ParaView-4.3.1-intel-2015a-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/p/ParaView/ParaView-4.3.1-intel-2015a-Python-2.7.10.eb
@@ -32,7 +32,7 @@ builddependencies = [('CMake', '3.2.2')]
 
 separate_build_dir = True
 
-maxparallel = 4 
+maxparallel = 4
 
 configopts = '-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON -DVTK_OPENGL_HAS_OSMESA=ON '
 configopts += '-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include -DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.so '
diff --git a/easybuild/easyconfigs/p/ParaView/ParaView-4.4.0-intel-2015b-mpi.eb b/easybuild/easyconfigs/p/ParaView/ParaView-4.4.0-intel-2015b-mpi.eb
index fb6b899d907d188c0c3f7b07caf9fd18fcfa4dec..9449cd74f2b5be68b56650c4ce978583d2e70ebd 100644
--- a/easybuild/easyconfigs/p/ParaView/ParaView-4.4.0-intel-2015b-mpi.eb
+++ b/easybuild/easyconfigs/p/ParaView/ParaView-4.4.0-intel-2015b-mpi.eb
@@ -33,7 +33,7 @@ builddependencies = [('CMake', '3.3.2')]
 
 separate_build_dir = True
 
-maxparallel = 4 
+maxparallel = 4
 
 configopts = '-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON -DVTK_OPENGL_HAS_OSMESA=ON -DPARAVIEW_USE_MPI=ON '
 configopts += '-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include -DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.so '
diff --git a/easybuild/easyconfigs/p/ParaView/ParaView-4.4.0-intel-2015b.eb b/easybuild/easyconfigs/p/ParaView/ParaView-4.4.0-intel-2015b.eb
index 00106458b88b4bab758c9fa082669ad89aa10d50..cb5acbbae9f92808269a8c9723225604d15e5a96 100644
--- a/easybuild/easyconfigs/p/ParaView/ParaView-4.4.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/p/ParaView/ParaView-4.4.0-intel-2015b.eb
@@ -32,7 +32,7 @@ builddependencies = [('CMake', '3.3.2')]
 
 separate_build_dir = True
 
-maxparallel = 4 
+maxparallel = 4
 
 configopts = '-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON -DVTK_OPENGL_HAS_OSMESA=ON '
 configopts += '-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include -DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.so '
diff --git a/easybuild/easyconfigs/p/Perl/Perl-5.20.3-foss-2016a.eb b/easybuild/easyconfigs/p/Perl/Perl-5.20.3-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0dbde8ec2c3048d365ce701964968dc0a14f2263
--- /dev/null
+++ b/easybuild/easyconfigs/p/Perl/Perl-5.20.3-foss-2016a.eb
@@ -0,0 +1,909 @@
+name = 'Perl'
+version = '5.20.3'
+
+homepage = 'http://www.perl.org/'
+description = """Larry Wall's Practical Extraction and Report Language"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['http://www.cpan.org/src/5.0']
+sources = [SOURCELOWER_TAR_GZ]
+
+exts_list = [
+    ('Config::General', '2.58', {
+        'source_tmpl': 'Config-General-2.58.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TL/TLINDEN'],
+    }),
+    ('File::Listing', '6.04', {
+        'source_tmpl': 'File-Listing-6.04.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('ExtUtils::InstallPaths', '0.011', {
+        'source_tmpl': 'ExtUtils-InstallPaths-0.011.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('ExtUtils::Helpers', '0.022', {
+        'source_tmpl': 'ExtUtils-Helpers-0.022.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('TAP::Harness::Env', '3.35', {
+        'source_tmpl': 'Test-Harness-3.35.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('ExtUtils::Config', '0.008', {
+        'source_tmpl': 'ExtUtils-Config-0.008.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('Module::Build::Tiny', '0.039', {
+        'source_tmpl': 'Module-Build-Tiny-0.039.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('aliased', '0.34', {
+        'source_tmpl': 'aliased-0.34.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Text::Glob', '0.09', {
+        'source_tmpl': 'Text-Glob-0.09.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RC/RCLAMP'],
+    }),
+    ('Regexp::Common', '2013031301', {
+        'source_tmpl': 'Regexp-Common-2013031301.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AB/ABIGAIL'],
+    }),
+    ('GO::Utils', '0.15', {
+        'source_tmpl': 'go-perl-0.15.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/C/CM/CMUNGALL'],
+    }),
+    ('Module::Pluggable', '5.2', {
+        'source_tmpl': 'Module-Pluggable-5.2.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SI/SIMONW'],
+    }),
+    ('Test::Fatal', '0.014', {
+        'source_tmpl': 'Test-Fatal-0.014.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Test::Warnings', '0.021', {
+        'source_tmpl': 'Test-Warnings-0.021.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('DateTime::Locale', '0.46', {
+        'source_tmpl': 'DateTime-Locale-0.46.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('DateTime::TimeZone', '1.93', {
+        'source_tmpl': 'DateTime-TimeZone-1.93.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('Test::Requires', '0.10', {
+        'source_tmpl': 'Test-Requires-0.10.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TO/TOKUHIROM'],
+    }),
+    ('Module::Implementation', '0.09', {
+        'source_tmpl': 'Module-Implementation-0.09.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('Module::Runtime', '0.014', {
+        'source_tmpl': 'Module-Runtime-0.014.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/Z/ZE/ZEFRAM'],
+    }),
+    ('Try::Tiny', '0.22', {
+        'source_tmpl': 'Try-Tiny-0.22.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DO/DOY'],
+    }),
+    ('Params::Validate', '1.21', {
+        'source_tmpl': 'Params-Validate-1.21.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('List::MoreUtils', '0.413', {
+        'source_tmpl': 'List-MoreUtils-0.413.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RE/REHSACK'],
+    }),
+    ('Exporter::Tiny', '0.042', {
+        'source_tmpl': 'Exporter-Tiny-0.042.tar.gz',
+        'source_urls': ['http://search.cpan.org/CPAN/authors/id/T/TO/TOBYINK'],
+    }),
+    ('Class::Singleton', '1.5', {
+        'source_tmpl': 'Class-Singleton-1.5.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SH/SHAY'],
+    }),
+    ('DateTime', '1.20', {
+        'source_tmpl': 'DateTime-1.20.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('File::Find::Rule::Perl', '1.15', {
+        'source_tmpl': 'File-Find-Rule-Perl-1.15.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Module::Build', '0.4214', {
+        'source_tmpl': 'Module-Build-0.4214.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('Readonly', '2.00', {
+        'source_tmpl': 'Readonly-2.00.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/S/SA/SANKO'],
+    }),
+    ('Git', '0.41', {
+        'source_tmpl': 'Git-0.41.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MS/MSOUTH'],
+    }),
+    ('Tree::DAG_Node', '1.27', {
+        'source_tmpl': 'Tree-DAG_Node-1.27.tgz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RS/RSAVAGE'],
+    }),
+    ('Template', '2.26', {
+        'source_tmpl': 'Template-Toolkit-2.26.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AB/ABW'],
+    }),
+    ('FreezeThaw', '0.5001', {
+        'source_tmpl': 'FreezeThaw-0.5001.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/I/IL/ILYAZ/modules'],
+    }),
+    ('DBI', '1.634', {
+        'source_tmpl': 'DBI-1.634.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TI/TIMB'],
+    }),
+    ('DBD::SQLite', '1.48', {
+        'source_tmpl': 'DBD-SQLite-1.48.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/I/IS/ISHIGAKI'],
+    }),
+    ('Math::Bezier', '0.01', {
+        'source_tmpl': 'Math-Bezier-0.01.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AB/ABW'],
+    }),
+    ('Archive::Extract', '0.76', {
+        'source_tmpl': 'Archive-Extract-0.76.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('DBIx::Simple', '1.35', {
+        'source_tmpl': 'DBIx-Simple-1.35.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/J/JU/JUERD'],
+    }),
+    ('Shell', '0.72', {
+        'source_tmpl': 'Shell-0.72.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/F/FE/FERREIRA'],
+    }),
+    ('File::Spec', '3.47', {
+        'source_tmpl': 'PathTools-3.47.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/S/SM/SMUELLER'],
+    }),
+    ('ExtUtils::MakeMaker', '7.10', {
+        'source_tmpl': 'ExtUtils-MakeMaker-7.10.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('Test::Simple', '1.001014', {
+        'source_tmpl': 'Test-Simple-1.001014.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('Set::Scalar', '1.29', {
+        'source_tmpl': 'Set-Scalar-1.29.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DA/DAVIDO'],
+    }),
+    ('IO::WrapTie', '2.111', {
+        'source_tmpl': 'IO-stringy-2.111.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DS/DSKOLL'],
+    }),
+    ('Encode::Locale', '1.05', {
+        'source_tmpl': 'Encode-Locale-1.05.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('XML::SAX::Base', '1.08', {
+        'source_tmpl': 'XML-SAX-Base-1.08.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GR/GRANTM'],
+    }),
+    ('XML::NamespaceSupport', '1.11', {
+        'source_tmpl': 'XML-NamespaceSupport-1.11.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/P/PE/PERIGRIN'],
+    }),
+    ('XML::SAX', '0.99', {
+        'source_tmpl': 'XML-SAX-0.99.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GR/GRANTM'],
+    }),
+    ('Test::LeakTrace', '0.15', {
+        'source_tmpl': 'Test-LeakTrace-0.15.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GF/GFUJI'],
+    }),
+    ('Test::Exception', '0.40', {
+        'source_tmpl': 'Test-Exception-0.40.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('Text::Table', '1.130', {
+        'source_tmpl': 'Text-Table-1.130.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/S/SH/SHLOMIF'],
+    }),
+    ('MIME::Types', '2.11', {
+        'source_tmpl': 'MIME-Types-2.11.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MARKOV'],
+    }),
+    ('Module::Build::XSUtil', '0.16', {
+        'source_tmpl': 'Module-Build-XSUtil-0.16.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HI/HIDEAKIO'],
+    }),
+    ('Tie::Function', '0.02', {
+        'source_tmpl': 'Tie-Function-0.02.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DA/DAVIDNICO/handy_tied_functions'],
+    }),
+    ('Template::Plugin::Number::Format', '1.06', {
+        'source_tmpl': 'Template-Plugin-Number-Format-1.06.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DARREN'],
+    }),
+    ('HTML::Parser', '3.71', {
+        'source_tmpl': 'HTML-Parser-3.71.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Date::Handler', '1.2', {
+        'source_tmpl': 'Date-Handler-1.2.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/B/BB/BBEAUSEJ'],
+    }),
+    ('Params::Util', '1.07', {
+        'source_tmpl': 'Params-Util-1.07.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('IO::HTML', '1.001', {
+        'source_tmpl': 'IO-HTML-1.001.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/C/CJ/CJM'],
+    }),
+    ('Data::Grove', '0.08', {
+        'source_tmpl': 'libxml-perl-0.08.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/K/KM/KMACLEOD'],
+    }),
+    ('Class::ISA', '0.36', {
+        'source_tmpl': 'Class-ISA-0.36.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/S/SM/SMUELLER'],
+    }),
+    ('URI', '1.69', {
+        'source_tmpl': 'URI-1.69.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Ima::DBI', '0.35', {
+        'source_tmpl': 'Ima-DBI-0.35.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/P/PE/PERRIN'],
+    }),
+    ('Tie::IxHash', '1.23', {
+        'source_tmpl': 'Tie-IxHash-1.23.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/C/CH/CHORNY'],
+    }),
+    ('GO', '0.04', {
+        'source_tmpl': 'go-db-perl-0.04.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/S/SJ/SJCARBON'],
+    }),
+    ('Class::DBI::SQLite', '0.11', {
+        'source_tmpl': 'Class-DBI-SQLite-0.11.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/M/MI/MIYAGAWA'],
+    }),
+    ('Pod::POM', '2.00', {
+        'source_tmpl': 'Pod-POM-2.00.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/N/NE/NEILB'],
+    }),
+    ('Math::Round', '0.07', {
+        'source_tmpl': 'Math-Round-0.07.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GR/GROMMEL'],
+    }),
+    ('Text::Diff', '1.43', {
+        'source_tmpl': 'Text-Diff-1.43.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/N/NE/NEILB'],
+    }),
+    ('Log::Message::Simple', '0.10', {
+        'source_tmpl': 'Log-Message-Simple-0.10.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('IO::Socket::SSL', '2.020', {
+        'source_tmpl': 'IO-Socket-SSL-2.020.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SU/SULLR'],
+    }),
+    ('Fennec::Lite', '0.004', {
+        'source_tmpl': 'Fennec-Lite-0.004.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('Sub::Uplevel', '0.25', {
+        'source_tmpl': 'Sub-Uplevel-0.25.tar.gz',
+        'source_urls': ['http://search.cpan.org/CPAN/authors/id/D/DA/DAGOLDEN/'],
+    }),
+    ('Meta::Builder', '0.003', {
+        'source_tmpl': 'Meta-Builder-0.003.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('Exporter::Declare', '0.114', {
+        'source_tmpl': 'Exporter-Declare-0.114.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('IO::Stringy', '2.111', {
+        'source_tmpl': 'IO-stringy-2.111.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DS/DSKOLL'],
+    }),
+    ('Getopt::Long', '2.47', {
+        'source_tmpl': 'Getopt-Long-2.47.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/J/JV/JV'],
+    }),
+    ('Log::Message', '0.08', {
+        'source_tmpl': 'Log-Message-0.08.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('Mouse', 'v2.4.5', {
+        'source_tmpl': 'Mouse-v2.4.5.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SY/SYOHEX'],
+    }),
+    ('Test::Version', '2.03', {
+        'source_tmpl': 'Test-Version-2.03.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PL/PLICEASE'],
+    }),
+    ('DBIx::Admin::TableInfo', '3.01', {
+        'source_tmpl': 'DBIx-Admin-TableInfo-3.01.tgz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RS/RSAVAGE'],
+    }),
+    ('Net::HTTP', '6.09', {
+        'source_tmpl': 'Net-HTTP-6.09.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Test::Deep', '0.117', {
+        'source_tmpl': 'Test-Deep-0.117.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Test::Warn', '0.30', {
+        'source_tmpl': 'Test-Warn-0.30.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/C/CH/CHORNY'],
+    }),
+    ('MRO::Compat', '0.12', {
+        'source_tmpl': 'MRO-Compat-0.12.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/B/BO/BOBTFISH'],
+    }),
+    ('Moo', '2.000002', {
+        'source_tmpl': 'Moo-2.000002.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HA/HAARG'],
+    }),
+    ('Hash::Merge', '0.200', {
+        'source_urls': ['http://search.cpan.org/CPAN/authors/id/R/RE/REHSACK/'],
+        'source_tmpl': 'Hash-Merge-0.200.tar.gz',
+    }),
+    ('SQL::Abstract', '1.81', {
+        'source_tmpl': 'SQL-Abstract-1.81.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RI/RIBASUSHI'],
+    }),
+    ('HTML::Form', '6.03', {
+        'source_tmpl': 'HTML-Form-6.03.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('File::Copy::Recursive', '0.38', {
+        'source_tmpl': 'File-Copy-Recursive-0.38.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DM/DMUEY'],
+    }),
+    ('Number::Compare', '0.03', {
+        'source_tmpl': 'Number-Compare-0.03.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RC/RCLAMP'],
+    }),
+    ('IPC::Run', '0.94', {
+        'source_tmpl': 'IPC-Run-0.94.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TO/TODDR'],
+    }),
+    ('HTML::Entities::Interpolate', '1.05', {
+        'source_tmpl': 'HTML-Entities-Interpolate-1.05.tgz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RS/RSAVAGE'],
+    }),
+    ('Test::ClassAPI', '1.06', {
+        'source_tmpl': 'Test-ClassAPI-1.06.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('Test::Most', '0.34', {
+        'source_tmpl': 'Test-Most-0.34.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/O/OV/OVID'],
+    }),
+    ('Class::Accessor', '0.34', {
+        'source_tmpl': 'Class-Accessor-0.34.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/K/KA/KASEI'],
+    }),
+    ('Test::Differences', '0.63', {
+        'source_tmpl': 'Test-Differences-0.63.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DC/DCANTRELL'],
+    }),
+    ('HTTP::Tiny', '0.056', {
+        'source_tmpl': 'HTTP-Tiny-0.056.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN'],
+    }),
+    ('Package::DeprecationManager', '0.14', {
+        'source_tmpl': 'Package-DeprecationManager-0.14.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('Digest::SHA1', '2.13', {
+        'source_tmpl': 'Digest-SHA1-2.13.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Date::Language', '2.30', {
+        'source_tmpl': 'TimeDate-2.30.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GB/GBARR'],
+    }),
+    ('version', '0.9912', {
+        'source_tmpl': 'version-0.9912.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/J/JP/JPEACOCK'],
+    }),
+    ('Sub::Uplevel', '0.25', {
+        'source_tmpl': 'Sub-Uplevel-0.25.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN'],
+    }),
+    # fails: uses 'gcc'
+    #('XML::Bare', '0.53', {
+    #    'source_tmpl': 'XML-Bare-0.53.tar.gz',
+    #    'source_urls': ['http://cpan.metacpan.org/authors/id/C/CO/CODECHILD'],
+    #}),
+    ('Dist::CheckConflicts', '0.11', {
+        'source_tmpl': 'Dist-CheckConflicts-0.11.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DO/DOY'],
+    }),
+    ('Sub::Name', '0.14', {
+        'source_tmpl': 'Sub-Name-0.14.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Time::Piece', '1.30', {
+        'source_tmpl': 'Time-Piece-1.30.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Digest::HMAC', '1.03', {
+        'source_tmpl': 'Digest-HMAC-1.03.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('HTTP::Negotiate', '6.01', {
+        'source_tmpl': 'HTTP-Negotiate-6.01.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('MIME::Lite', '3.030', {
+        'source_tmpl': 'MIME-Lite-3.030.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Crypt::Rijndael', '1.13', {
+        'source_tmpl': 'Crypt-Rijndael-1.13.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('B::Lint', '1.20', {
+        'source_tmpl': 'B-Lint-1.20.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Canary::Stability', '2006', {
+        'source_tmpl': 'Canary-Stability-2006.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/ML/MLEHMANN'],
+    }),
+    ('AnyEvent', '7.11', {
+        'source_tmpl': 'AnyEvent-7.11.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/ML/MLEHMANN'],
+    }),
+    ('Object::Accessor', '0.48', {
+        'source_tmpl': 'Object-Accessor-0.48.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('Data::UUID', '1.221', {
+        'source_tmpl': 'Data-UUID-1.221.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Test::Pod', '1.51', {
+        'source_tmpl': 'Test-Pod-1.51.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('AppConfig', '1.71', {
+        'source_tmpl': 'AppConfig-1.71.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/N/NE/NEILB'],
+    }),
+    ('Net::SMTP::SSL', '1.03', {
+        'source_tmpl': 'Net-SMTP-SSL-1.03.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('XML::Tiny', '2.06', {
+        'source_tmpl': 'XML-Tiny-2.06.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DC/DCANTRELL'],
+    }),
+    ('HTML::Tagset', '3.20', {
+        'source_tmpl': 'HTML-Tagset-3.20.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/P/PE/PETDANCE'],
+    }),
+    ('HTML::Tree', '5.03', {
+        'source_tmpl': 'HTML-Tree-5.03.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/C/CJ/CJM'],
+    }),
+    ('Devel::GlobalDestruction', '0.13', {
+        'source_tmpl': 'Devel-GlobalDestruction-0.13.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/H/HA/HAARG'],
+    }),
+    ('WWW::RobotRules', '6.02', {
+        'source_tmpl': 'WWW-RobotRules-6.02.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Expect', '1.32', {
+        'source_tmpl': 'Expect-1.32.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SZ/SZABGAB'],
+    }),
+    ('Term::UI', '0.46', {
+        'source_tmpl': 'Term-UI-0.46.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('Net::SNMP', 'v6.0.1', {
+        'source_tmpl': 'Net-SNMP-v6.0.1.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DT/DTOWN'],
+    }),
+    ('XML::SAX::Writer', '0.56', {
+        'source_tmpl': 'XML-SAX-Writer-0.56.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PE/PERIGRIN'],
+    }),
+    ('Statistics::Descriptive', '3.0609', {
+        'source_tmpl': 'Statistics-Descriptive-3.0609.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF'],
+    }),
+    ('Class::Load', '0.23', {
+        'source_tmpl': 'Class-Load-0.23.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('LWP::Simple', '6.13', {
+        'source_tmpl': 'libwww-perl-6.13.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Time::Piece::MySQL', '0.06', {
+        'source_tmpl': 'Time-Piece-MySQL-0.06.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/K/KA/KASEI'],
+    }),
+    ('Package::Stash::XS', '0.28', {
+        'source_tmpl': 'Package-Stash-XS-0.28.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DO/DOY'],
+    }),
+    ('GD::Graph', '1.49', {
+        'source_tmpl': 'GDGraph-1.49.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RU/RUZ'],
+    }),
+    ('Set::Array', '0.30', {
+        'source_tmpl': 'Set-Array-0.30.tgz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RS/RSAVAGE'],
+    }),
+    ('boolean', '0.45', {
+        'source_tmpl': 'boolean-0.45.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/I/IN/INGY'],
+    }),
+    ('Number::Format', '1.75', {
+        'source_tmpl': 'Number-Format-1.75.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/W/WR/WRW'],
+    }),
+    ('Data::Stag', '0.14', {
+        'source_tmpl': 'Data-Stag-0.14.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/C/CM/CMUNGALL'],
+    }),
+    ('Test::Tester', '1.001014', {
+        'source_tmpl': 'Test-Simple-1.001014.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('Test::NoWarnings', '1.04', {
+        'source_tmpl': 'Test-NoWarnings-1.04.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('Crypt::DES', '2.07', {
+        'source_tmpl': 'Crypt-DES-2.07.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DP/DPARIS'],
+    }),
+    ('Exporter', '5.72', {
+        'source_tmpl': 'Exporter-5.72.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TO/TODDR'],
+    }),
+    ('Class::Inspector', '1.28', {
+        'source_tmpl': 'Class-Inspector-1.28.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('Parse::RecDescent', '1.967012', {
+        'source_tmpl': 'Parse-RecDescent-1.967012.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/J/JT/JTBRAUN'],
+    }),
+    ('Carp', '1.36', {
+        'source_tmpl': 'Carp-1.36.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('XML::XPath', '1.13', {
+        'source_tmpl': 'XML-XPath-1.13.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/M/MS/MSERGEANT'],
+    }),
+    ('Capture::Tiny', '0.30', {
+        'source_tmpl': 'Capture-Tiny-0.30.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN'],
+    }),
+    ('JSON', '2.90', {
+        'source_tmpl': 'JSON-2.90.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MAKAMAKA'],
+    }),
+    ('Sub::Exporter', '0.987', {
+        'source_tmpl': 'Sub-Exporter-0.987.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Class::Load::XS', '0.09', {
+        'source_tmpl': 'Class-Load-XS-0.09.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Set::IntSpan::Fast', '1.15', {
+        'source_tmpl': 'Set-IntSpan-Fast-1.15.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AN/ANDYA'],
+    }),
+    ('Sub::Exporter::Progressive', '0.001011', {
+        'source_tmpl': 'Sub-Exporter-Progressive-0.001011.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/F/FR/FREW'],
+    }),
+    ('LWP', '6.13', {
+        'source_tmpl': 'libwww-perl-6.13.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Data::Dumper::Concise', '2.022', {
+        'source_tmpl': 'Data-Dumper-Concise-2.022.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/F/FR/FREW'],
+    }),
+    ('File::Slurp::Tiny', '0.004', {
+        'source_tmpl': 'File-Slurp-Tiny-0.004.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('Algorithm::Diff', '1.1903', {
+        'source_tmpl': 'Algorithm-Diff-1.1903.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TY/TYEMQ'],
+    }),
+    ('AnyData', '0.12', {
+        'source_tmpl': 'AnyData-0.12.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RE/REHSACK'],
+    }),
+    ('Text::Iconv', '1.7', {
+        'source_tmpl': 'Text-Iconv-1.7.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/M/MP/MPIOTR'],
+    }),
+    ('Class::Data::Inheritable', '0.08', {
+        'source_tmpl': 'Class-Data-Inheritable-0.08.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/T/TM/TMTM'],
+    }),
+    ('Text::Balanced', '2.03', {
+        'source_tmpl': 'Text-Balanced-2.03.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SH/SHAY'],
+    }),
+    ('strictures', '2.000001', {
+        'source_tmpl': 'strictures-2.000001.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HA/HAARG'],
+    }),
+    ('Switch', '2.17', {
+        'source_tmpl': 'Switch-2.17.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/C/CH/CHORNY'],
+    }),
+    ('File::Which', '1.19', {
+        'source_tmpl': 'File-Which-1.19.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PL/PLICEASE'],
+    }),
+    ('Email::Date::Format', '1.005', {
+        'source_tmpl': 'Email-Date-Format-1.005.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Error', '0.17024', {
+        'source_tmpl': 'Error-0.17024.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF'],
+    }),
+    ('Mock::Quick', '1.110', {
+        'source_tmpl': 'Mock-Quick-1.110.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('Text::CSV', '1.33', {
+        'source_tmpl': 'Text-CSV-1.33.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MAKAMAKA'],
+    }),
+    ('Test::Output', '1.03', {
+        'source_tmpl': 'Test-Output-1.03.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/B/BD/BDFOY'],
+    }),
+    ('Class::DBI', 'v3.0.17', {
+        'source_tmpl': 'Class-DBI-v3.0.17.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/T/TM/TMTM'],
+    }),
+    ('List::AllUtils', '0.09', {
+        'source_tmpl': 'List-AllUtils-0.09.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('UNIVERSAL::moniker', '0.08', {
+        'source_tmpl': 'UNIVERSAL-moniker-0.08.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/K/KA/KASEI'],
+    }),
+    ('Exception::Class', '1.39', {
+        'source_tmpl': 'Exception-Class-1.39.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('File::CheckTree', '4.42', {
+        'source_tmpl': 'File-CheckTree-4.42.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Math::VecStat', '0.08', {
+        'source_tmpl': 'Math-VecStat-0.08.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AS/ASPINELLI'],
+    }),
+    ('Pod::LaTeX', '0.61', {
+        'source_tmpl': 'Pod-LaTeX-0.61.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/T/TJ/TJENNESS'],
+    }),
+    ('Eval::Closure', '0.13', {
+        'source_tmpl': 'Eval-Closure-0.13.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DO/DOY'],
+    }),
+    ('HTTP::Request', '6.11', {
+        'source_tmpl': 'HTTP-Message-6.11.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('XML::Twig', '3.49', {
+        'source_tmpl': 'XML-Twig-3.49.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MI/MIROD'],
+    }),
+    ('IO::String', '1.08', {
+        'source_tmpl': 'IO-String-1.08.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('XML::Simple', '2.20', {
+        'source_tmpl': 'XML-Simple-2.20.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GR/GRANTM'],
+    }),
+    ('Sub::Install', '0.928', {
+        'source_tmpl': 'Sub-Install-0.928.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('HTTP::Cookies', '6.01', {
+        'source_tmpl': 'HTTP-Cookies-6.01.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Pod::Plainer', '1.04', {
+        'source_tmpl': 'Pod-Plainer-1.04.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RM/RMBARKER'],
+    }),
+    ('Test::Exception::LessClever', '0.006', {
+        'source_tmpl': 'Test-Exception-LessClever-0.006.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('LWP::MediaTypes', '6.02', {
+        'source_tmpl': 'LWP-MediaTypes-6.02.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Scalar::Util', '1.42', {
+        'source_tmpl': 'Scalar-List-Utils-1.42.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PE/PEVANS'],
+    }),
+    ('Data::Section::Simple', '0.07', {
+        'source_tmpl': 'Data-Section-Simple-0.07.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/M/MI/MIYAGAWA'],
+    }),
+    ('IO::Scalar', '2.111', {
+        'source_tmpl': 'IO-stringy-2.111.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DS/DSKOLL'],
+    }),
+    ('Class::Trigger', '0.14', {
+        'source_tmpl': 'Class-Trigger-0.14.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/M/MI/MIYAGAWA'],
+    }),
+    ('HTTP::Daemon', '6.01', {
+        'source_tmpl': 'HTTP-Daemon-6.01.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('File::HomeDir', '1.00', {
+        'source_tmpl': 'File-HomeDir-1.00.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('HTTP::Date', '6.02', {
+        'source_tmpl': 'HTTP-Date-6.02.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Authen::SASL', '2.16', {
+        'source_tmpl': 'Authen-SASL-2.16.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GB/GBARR'],
+    }),
+    ('Clone', '0.38', {
+        'source_tmpl': 'Clone-0.38.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GARU'],
+    }),
+    ('Data::Types', '0.09', {
+        'source_tmpl': 'Data-Types-0.09.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DW/DWHEELER'],
+    }),
+    ('Import::Into', '1.002005', {
+        'source_tmpl': 'Import-Into-1.002005.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HA/HAARG'],
+    }),
+    ('DateTime::Tiny', '1.04', {
+        'source_tmpl': 'DateTime-Tiny-1.04.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('DBD::AnyData', '0.110', {
+        'source_tmpl': 'DBD-AnyData-0.110.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RE/REHSACK'],
+    }),
+    ('Text::Format', '0.59', {
+        'source_tmpl': 'Text-Format-0.59.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/S/SH/SHLOMIF'],
+    }),
+    ('Devel::CheckCompiler', '0.06', {
+        'source_tmpl': 'Devel-CheckCompiler-0.06.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SY/SYOHEX'],
+    }),
+    ('Log::Handler', '0.87', {
+        'source_tmpl': 'Log-Handler-0.87.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BL/BLOONIX'],
+    }),
+    ('DBIx::ContextualFetch', '1.03', {
+        'source_tmpl': 'DBIx-ContextualFetch-1.03.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/T/TM/TMTM'],
+    }),
+    ('HTML::Entities', '3.71', {
+        'source_tmpl': 'HTML-Parser-3.71.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Devel::StackTrace', '2.00', {
+        'source_tmpl': 'Devel-StackTrace-2.00.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('Term::ReadKey', '2.33', {
+        'source_tmpl': 'TermReadKey-2.33.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/J/JS/JSTOWE'],
+    }),
+    ('Set::IntSpan', '1.19', {
+        'source_tmpl': 'Set-IntSpan-1.19.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/S/SW/SWMCD'],
+    }),
+    ('Moose', '2.1603', {
+        'source_tmpl': 'Moose-2.1603.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Algorithm::Dependency', '1.110', {
+        'source_tmpl': 'Algorithm-Dependency-1.110.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('Font::TTF', '1.05', {
+        'source_tmpl': 'Font-TTF-1.05.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MH/MHOSKEN'],
+    }),
+    ('IPC::Run3', '0.048', {
+        'source_tmpl': 'IPC-Run3-0.048.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('File::Find::Rule', '0.33', {
+        'source_tmpl': 'File-Find-Rule-0.33.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RC/RCLAMP'],
+    }),
+    ('SQL::Statement', '1.407', {
+        'source_tmpl': 'SQL-Statement-1.407.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RE/REHSACK'],
+    }),
+    ('File::Slurp', '9999.19', {
+        'source_tmpl': 'File-Slurp-9999.19.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/U/UR/URI'],
+    }),
+    ('Package::Stash', '0.37', {
+        'source_tmpl': 'Package-Stash-0.37.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DO/DOY'],
+    }),
+    ('Data::OptList', '0.109', {
+        'source_tmpl': 'Data-OptList-0.109.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('CPANPLUS', '0.9154', {
+        'source_tmpl': 'CPANPLUS-0.9154.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('Test::Harness', '3.35', {
+        'source_tmpl': 'Test-Harness-3.35.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('IO::Tty', '1.12', {
+        'source_tmpl': 'IO-Tty-1.12.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TO/TODDR'],
+    }),
+    ('Text::Soundex', '3.04', {
+        'source_tmpl': 'Text-Soundex-3.04.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Lingua::EN::PluralToSingular', '0.14', {
+        'source_tmpl': 'Lingua-EN-PluralToSingular-0.14.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/B/BK/BKB'],
+    }),
+    ('Want', '0.26', {
+        'source_tmpl': 'Want-0.26.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RO/ROBIN'],
+    }),
+    ('Cwd::Guard', '0.04', {
+        'source_tmpl': 'Cwd-Guard-0.04.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/K/KA/KAZEBURO'],
+    }),
+    ('Bundle::BioPerl', '2.1.9', {
+        'source_tmpl': 'Bundle-BioPerl-2.1.9.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/C/CJ/CJFIELDS'],
+    }),
+    ('Mail::Util', '2.14', {
+        'source_tmpl': 'MailTools-2.14.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MARKOV'],
+    }),
+]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Perl/Perl-5.20.3-intel-2016a.eb b/easybuild/easyconfigs/p/Perl/Perl-5.20.3-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..146a854c211301bfbde72ae0de055029b46c5379
--- /dev/null
+++ b/easybuild/easyconfigs/p/Perl/Perl-5.20.3-intel-2016a.eb
@@ -0,0 +1,909 @@
+name = 'Perl'
+version = '5.20.3'
+
+homepage = 'http://www.perl.org/'
+description = """Larry Wall's Practical Extraction and Report Language"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['http://www.cpan.org/src/5.0']
+sources = [SOURCELOWER_TAR_GZ]
+
+exts_list = [
+    ('Config::General', '2.58', {
+        'source_tmpl': 'Config-General-2.58.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TL/TLINDEN'],
+    }),
+    ('File::Listing', '6.04', {
+        'source_tmpl': 'File-Listing-6.04.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('ExtUtils::InstallPaths', '0.011', {
+        'source_tmpl': 'ExtUtils-InstallPaths-0.011.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('ExtUtils::Helpers', '0.022', {
+        'source_tmpl': 'ExtUtils-Helpers-0.022.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('TAP::Harness::Env', '3.35', {
+        'source_tmpl': 'Test-Harness-3.35.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('ExtUtils::Config', '0.008', {
+        'source_tmpl': 'ExtUtils-Config-0.008.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('Module::Build::Tiny', '0.039', {
+        'source_tmpl': 'Module-Build-Tiny-0.039.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('aliased', '0.34', {
+        'source_tmpl': 'aliased-0.34.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Text::Glob', '0.09', {
+        'source_tmpl': 'Text-Glob-0.09.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RC/RCLAMP'],
+    }),
+    ('Regexp::Common', '2013031301', {
+        'source_tmpl': 'Regexp-Common-2013031301.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AB/ABIGAIL'],
+    }),
+    ('GO::Utils', '0.15', {
+        'source_tmpl': 'go-perl-0.15.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/C/CM/CMUNGALL'],
+    }),
+    ('Module::Pluggable', '5.2', {
+        'source_tmpl': 'Module-Pluggable-5.2.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SI/SIMONW'],
+    }),
+    ('Test::Fatal', '0.014', {
+        'source_tmpl': 'Test-Fatal-0.014.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Test::Warnings', '0.021', {
+        'source_tmpl': 'Test-Warnings-0.021.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('DateTime::Locale', '0.46', {
+        'source_tmpl': 'DateTime-Locale-0.46.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('DateTime::TimeZone', '1.93', {
+        'source_tmpl': 'DateTime-TimeZone-1.93.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('Test::Requires', '0.10', {
+        'source_tmpl': 'Test-Requires-0.10.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TO/TOKUHIROM'],
+    }),
+    ('Module::Implementation', '0.09', {
+        'source_tmpl': 'Module-Implementation-0.09.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('Module::Runtime', '0.014', {
+        'source_tmpl': 'Module-Runtime-0.014.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/Z/ZE/ZEFRAM'],
+    }),
+    ('Try::Tiny', '0.22', {
+        'source_tmpl': 'Try-Tiny-0.22.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DO/DOY'],
+    }),
+    ('Params::Validate', '1.21', {
+        'source_tmpl': 'Params-Validate-1.21.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('List::MoreUtils', '0.413', {
+        'source_tmpl': 'List-MoreUtils-0.413.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RE/REHSACK'],
+    }),
+    ('Exporter::Tiny', '0.042', {
+        'source_tmpl': 'Exporter-Tiny-0.042.tar.gz',
+        'source_urls': ['http://search.cpan.org/CPAN/authors/id/T/TO/TOBYINK'],
+    }),
+    ('Class::Singleton', '1.5', {
+        'source_tmpl': 'Class-Singleton-1.5.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SH/SHAY'],
+    }),
+    ('DateTime', '1.20', {
+        'source_tmpl': 'DateTime-1.20.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('File::Find::Rule::Perl', '1.15', {
+        'source_tmpl': 'File-Find-Rule-Perl-1.15.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Module::Build', '0.4214', {
+        'source_tmpl': 'Module-Build-0.4214.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('Readonly', '2.00', {
+        'source_tmpl': 'Readonly-2.00.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/S/SA/SANKO'],
+    }),
+    ('Git', '0.41', {
+        'source_tmpl': 'Git-0.41.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MS/MSOUTH'],
+    }),
+    ('Tree::DAG_Node', '1.27', {
+        'source_tmpl': 'Tree-DAG_Node-1.27.tgz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RS/RSAVAGE'],
+    }),
+    ('Template', '2.26', {
+        'source_tmpl': 'Template-Toolkit-2.26.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AB/ABW'],
+    }),
+    ('FreezeThaw', '0.5001', {
+        'source_tmpl': 'FreezeThaw-0.5001.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/I/IL/ILYAZ/modules'],
+    }),
+    ('DBI', '1.634', {
+        'source_tmpl': 'DBI-1.634.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TI/TIMB'],
+    }),
+    ('DBD::SQLite', '1.48', {
+        'source_tmpl': 'DBD-SQLite-1.48.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/I/IS/ISHIGAKI'],
+    }),
+    ('Math::Bezier', '0.01', {
+        'source_tmpl': 'Math-Bezier-0.01.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AB/ABW'],
+    }),
+    ('Archive::Extract', '0.76', {
+        'source_tmpl': 'Archive-Extract-0.76.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('DBIx::Simple', '1.35', {
+        'source_tmpl': 'DBIx-Simple-1.35.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/J/JU/JUERD'],
+    }),
+    ('Shell', '0.72', {
+        'source_tmpl': 'Shell-0.72.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/F/FE/FERREIRA'],
+    }),
+    ('File::Spec', '3.47', {
+        'source_tmpl': 'PathTools-3.47.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/S/SM/SMUELLER'],
+    }),
+    ('ExtUtils::MakeMaker', '7.10', {
+        'source_tmpl': 'ExtUtils-MakeMaker-7.10.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('Test::Simple', '1.001014', {
+        'source_tmpl': 'Test-Simple-1.001014.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('Set::Scalar', '1.29', {
+        'source_tmpl': 'Set-Scalar-1.29.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DA/DAVIDO'],
+    }),
+    ('IO::WrapTie', '2.111', {
+        'source_tmpl': 'IO-stringy-2.111.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DS/DSKOLL'],
+    }),
+    ('Encode::Locale', '1.05', {
+        'source_tmpl': 'Encode-Locale-1.05.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('XML::SAX::Base', '1.08', {
+        'source_tmpl': 'XML-SAX-Base-1.08.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GR/GRANTM'],
+    }),
+    ('XML::NamespaceSupport', '1.11', {
+        'source_tmpl': 'XML-NamespaceSupport-1.11.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/P/PE/PERIGRIN'],
+    }),
+    ('XML::SAX', '0.99', {
+        'source_tmpl': 'XML-SAX-0.99.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GR/GRANTM'],
+    }),
+    ('Test::LeakTrace', '0.15', {
+        'source_tmpl': 'Test-LeakTrace-0.15.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GF/GFUJI'],
+    }),
+    ('Test::Exception', '0.40', {
+        'source_tmpl': 'Test-Exception-0.40.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('Text::Table', '1.130', {
+        'source_tmpl': 'Text-Table-1.130.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/S/SH/SHLOMIF'],
+    }),
+    ('MIME::Types', '2.11', {
+        'source_tmpl': 'MIME-Types-2.11.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MARKOV'],
+    }),
+    ('Module::Build::XSUtil', '0.16', {
+        'source_tmpl': 'Module-Build-XSUtil-0.16.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HI/HIDEAKIO'],
+    }),
+    ('Tie::Function', '0.02', {
+        'source_tmpl': 'Tie-Function-0.02.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DA/DAVIDNICO/handy_tied_functions'],
+    }),
+    ('Template::Plugin::Number::Format', '1.06', {
+        'source_tmpl': 'Template-Plugin-Number-Format-1.06.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DARREN'],
+    }),
+    ('HTML::Parser', '3.71', {
+        'source_tmpl': 'HTML-Parser-3.71.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Date::Handler', '1.2', {
+        'source_tmpl': 'Date-Handler-1.2.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/B/BB/BBEAUSEJ'],
+    }),
+    ('Params::Util', '1.07', {
+        'source_tmpl': 'Params-Util-1.07.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('IO::HTML', '1.001', {
+        'source_tmpl': 'IO-HTML-1.001.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/C/CJ/CJM'],
+    }),
+    ('Data::Grove', '0.08', {
+        'source_tmpl': 'libxml-perl-0.08.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/K/KM/KMACLEOD'],
+    }),
+    ('Class::ISA', '0.36', {
+        'source_tmpl': 'Class-ISA-0.36.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/S/SM/SMUELLER'],
+    }),
+    ('URI', '1.69', {
+        'source_tmpl': 'URI-1.69.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Ima::DBI', '0.35', {
+        'source_tmpl': 'Ima-DBI-0.35.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/P/PE/PERRIN'],
+    }),
+    ('Tie::IxHash', '1.23', {
+        'source_tmpl': 'Tie-IxHash-1.23.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/C/CH/CHORNY'],
+    }),
+    ('GO', '0.04', {
+        'source_tmpl': 'go-db-perl-0.04.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/S/SJ/SJCARBON'],
+    }),
+    ('Class::DBI::SQLite', '0.11', {
+        'source_tmpl': 'Class-DBI-SQLite-0.11.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/M/MI/MIYAGAWA'],
+    }),
+    ('Pod::POM', '2.00', {
+        'source_tmpl': 'Pod-POM-2.00.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/N/NE/NEILB'],
+    }),
+    ('Math::Round', '0.07', {
+        'source_tmpl': 'Math-Round-0.07.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GR/GROMMEL'],
+    }),
+    ('Text::Diff', '1.43', {
+        'source_tmpl': 'Text-Diff-1.43.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/N/NE/NEILB'],
+    }),
+    ('Log::Message::Simple', '0.10', {
+        'source_tmpl': 'Log-Message-Simple-0.10.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('IO::Socket::SSL', '2.020', {
+        'source_tmpl': 'IO-Socket-SSL-2.020.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SU/SULLR'],
+    }),
+    ('Fennec::Lite', '0.004', {
+        'source_tmpl': 'Fennec-Lite-0.004.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('Sub::Uplevel', '0.25', {
+        'source_tmpl': 'Sub-Uplevel-0.25.tar.gz',
+        'source_urls': ['http://search.cpan.org/CPAN/authors/id/D/DA/DAGOLDEN/'],
+    }),
+    ('Meta::Builder', '0.003', {
+        'source_tmpl': 'Meta-Builder-0.003.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('Exporter::Declare', '0.114', {
+        'source_tmpl': 'Exporter-Declare-0.114.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('IO::Stringy', '2.111', {
+        'source_tmpl': 'IO-stringy-2.111.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DS/DSKOLL'],
+    }),
+    ('Getopt::Long', '2.47', {
+        'source_tmpl': 'Getopt-Long-2.47.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/J/JV/JV'],
+    }),
+    ('Log::Message', '0.08', {
+        'source_tmpl': 'Log-Message-0.08.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('Mouse', 'v2.4.5', {
+        'source_tmpl': 'Mouse-v2.4.5.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SY/SYOHEX'],
+    }),
+    ('Test::Version', '2.03', {
+        'source_tmpl': 'Test-Version-2.03.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PL/PLICEASE'],
+    }),
+    ('DBIx::Admin::TableInfo', '3.01', {
+        'source_tmpl': 'DBIx-Admin-TableInfo-3.01.tgz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RS/RSAVAGE'],
+    }),
+    ('Net::HTTP', '6.09', {
+        'source_tmpl': 'Net-HTTP-6.09.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Test::Deep', '0.117', {
+        'source_tmpl': 'Test-Deep-0.117.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Test::Warn', '0.30', {
+        'source_tmpl': 'Test-Warn-0.30.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/C/CH/CHORNY'],
+    }),
+    ('MRO::Compat', '0.12', {
+        'source_tmpl': 'MRO-Compat-0.12.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/B/BO/BOBTFISH'],
+    }),
+    ('Moo', '2.000002', {
+        'source_tmpl': 'Moo-2.000002.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HA/HAARG'],
+    }),
+    ('Hash::Merge', '0.200', {
+        'source_urls': ['http://search.cpan.org/CPAN/authors/id/R/RE/REHSACK/'],
+        'source_tmpl': 'Hash-Merge-0.200.tar.gz',
+    }),
+    ('SQL::Abstract', '1.81', {
+        'source_tmpl': 'SQL-Abstract-1.81.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RI/RIBASUSHI'],
+    }),
+    ('HTML::Form', '6.03', {
+        'source_tmpl': 'HTML-Form-6.03.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('File::Copy::Recursive', '0.38', {
+        'source_tmpl': 'File-Copy-Recursive-0.38.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DM/DMUEY'],
+    }),
+    ('Number::Compare', '0.03', {
+        'source_tmpl': 'Number-Compare-0.03.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RC/RCLAMP'],
+    }),
+    ('IPC::Run', '0.94', {
+        'source_tmpl': 'IPC-Run-0.94.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TO/TODDR'],
+    }),
+    ('HTML::Entities::Interpolate', '1.05', {
+        'source_tmpl': 'HTML-Entities-Interpolate-1.05.tgz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RS/RSAVAGE'],
+    }),
+    ('Test::ClassAPI', '1.06', {
+        'source_tmpl': 'Test-ClassAPI-1.06.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('Test::Most', '0.34', {
+        'source_tmpl': 'Test-Most-0.34.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/O/OV/OVID'],
+    }),
+    ('Class::Accessor', '0.34', {
+        'source_tmpl': 'Class-Accessor-0.34.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/K/KA/KASEI'],
+    }),
+    ('Test::Differences', '0.63', {
+        'source_tmpl': 'Test-Differences-0.63.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DC/DCANTRELL'],
+    }),
+    ('HTTP::Tiny', '0.056', {
+        'source_tmpl': 'HTTP-Tiny-0.056.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN'],
+    }),
+    ('Package::DeprecationManager', '0.14', {
+        'source_tmpl': 'Package-DeprecationManager-0.14.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('Digest::SHA1', '2.13', {
+        'source_tmpl': 'Digest-SHA1-2.13.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Date::Language', '2.30', {
+        'source_tmpl': 'TimeDate-2.30.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GB/GBARR'],
+    }),
+    ('version', '0.9912', {
+        'source_tmpl': 'version-0.9912.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/J/JP/JPEACOCK'],
+    }),
+    ('Sub::Uplevel', '0.25', {
+        'source_tmpl': 'Sub-Uplevel-0.25.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN'],
+    }),
+    # fails: uses 'gcc'
+    #('XML::Bare', '0.53', {
+    #    'source_tmpl': 'XML-Bare-0.53.tar.gz',
+    #    'source_urls': ['http://cpan.metacpan.org/authors/id/C/CO/CODECHILD'],
+    #}),
+    ('Dist::CheckConflicts', '0.11', {
+        'source_tmpl': 'Dist-CheckConflicts-0.11.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DO/DOY'],
+    }),
+    ('Sub::Name', '0.14', {
+        'source_tmpl': 'Sub-Name-0.14.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Time::Piece', '1.30', {
+        'source_tmpl': 'Time-Piece-1.30.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Digest::HMAC', '1.03', {
+        'source_tmpl': 'Digest-HMAC-1.03.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('HTTP::Negotiate', '6.01', {
+        'source_tmpl': 'HTTP-Negotiate-6.01.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('MIME::Lite', '3.030', {
+        'source_tmpl': 'MIME-Lite-3.030.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Crypt::Rijndael', '1.13', {
+        'source_tmpl': 'Crypt-Rijndael-1.13.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('B::Lint', '1.20', {
+        'source_tmpl': 'B-Lint-1.20.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Canary::Stability', '2006', {
+        'source_tmpl': 'Canary-Stability-2006.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/ML/MLEHMANN'],
+    }),
+    ('AnyEvent', '7.11', {
+        'source_tmpl': 'AnyEvent-7.11.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/ML/MLEHMANN'],
+    }),
+    ('Object::Accessor', '0.48', {
+        'source_tmpl': 'Object-Accessor-0.48.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('Data::UUID', '1.221', {
+        'source_tmpl': 'Data-UUID-1.221.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Test::Pod', '1.51', {
+        'source_tmpl': 'Test-Pod-1.51.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('AppConfig', '1.71', {
+        'source_tmpl': 'AppConfig-1.71.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/N/NE/NEILB'],
+    }),
+    ('Net::SMTP::SSL', '1.03', {
+        'source_tmpl': 'Net-SMTP-SSL-1.03.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('XML::Tiny', '2.06', {
+        'source_tmpl': 'XML-Tiny-2.06.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DC/DCANTRELL'],
+    }),
+    ('HTML::Tagset', '3.20', {
+        'source_tmpl': 'HTML-Tagset-3.20.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/P/PE/PETDANCE'],
+    }),
+    ('HTML::Tree', '5.03', {
+        'source_tmpl': 'HTML-Tree-5.03.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/C/CJ/CJM'],
+    }),
+    ('Devel::GlobalDestruction', '0.13', {
+        'source_tmpl': 'Devel-GlobalDestruction-0.13.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/H/HA/HAARG'],
+    }),
+    ('WWW::RobotRules', '6.02', {
+        'source_tmpl': 'WWW-RobotRules-6.02.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Expect', '1.32', {
+        'source_tmpl': 'Expect-1.32.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SZ/SZABGAB'],
+    }),
+    ('Term::UI', '0.46', {
+        'source_tmpl': 'Term-UI-0.46.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('Net::SNMP', 'v6.0.1', {
+        'source_tmpl': 'Net-SNMP-v6.0.1.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DT/DTOWN'],
+    }),
+    ('XML::SAX::Writer', '0.56', {
+        'source_tmpl': 'XML-SAX-Writer-0.56.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PE/PERIGRIN'],
+    }),
+    ('Statistics::Descriptive', '3.0609', {
+        'source_tmpl': 'Statistics-Descriptive-3.0609.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF'],
+    }),
+    ('Class::Load', '0.23', {
+        'source_tmpl': 'Class-Load-0.23.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('LWP::Simple', '6.13', {
+        'source_tmpl': 'libwww-perl-6.13.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Time::Piece::MySQL', '0.06', {
+        'source_tmpl': 'Time-Piece-MySQL-0.06.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/K/KA/KASEI'],
+    }),
+    ('Package::Stash::XS', '0.28', {
+        'source_tmpl': 'Package-Stash-XS-0.28.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DO/DOY'],
+    }),
+    ('GD::Graph', '1.49', {
+        'source_tmpl': 'GDGraph-1.49.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RU/RUZ'],
+    }),
+    ('Set::Array', '0.30', {
+        'source_tmpl': 'Set-Array-0.30.tgz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RS/RSAVAGE'],
+    }),
+    ('boolean', '0.45', {
+        'source_tmpl': 'boolean-0.45.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/I/IN/INGY'],
+    }),
+    ('Number::Format', '1.75', {
+        'source_tmpl': 'Number-Format-1.75.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/W/WR/WRW'],
+    }),
+    ('Data::Stag', '0.14', {
+        'source_tmpl': 'Data-Stag-0.14.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/C/CM/CMUNGALL'],
+    }),
+    ('Test::Tester', '1.001014', {
+        'source_tmpl': 'Test-Simple-1.001014.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('Test::NoWarnings', '1.04', {
+        'source_tmpl': 'Test-NoWarnings-1.04.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('Crypt::DES', '2.07', {
+        'source_tmpl': 'Crypt-DES-2.07.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DP/DPARIS'],
+    }),
+    ('Exporter', '5.72', {
+        'source_tmpl': 'Exporter-5.72.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TO/TODDR'],
+    }),
+    ('Class::Inspector', '1.28', {
+        'source_tmpl': 'Class-Inspector-1.28.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('Parse::RecDescent', '1.967012', {
+        'source_tmpl': 'Parse-RecDescent-1.967012.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/J/JT/JTBRAUN'],
+    }),
+    ('Carp', '1.36', {
+        'source_tmpl': 'Carp-1.36.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('XML::XPath', '1.13', {
+        'source_tmpl': 'XML-XPath-1.13.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/M/MS/MSERGEANT'],
+    }),
+    ('Capture::Tiny', '0.30', {
+        'source_tmpl': 'Capture-Tiny-0.30.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN'],
+    }),
+    ('JSON', '2.90', {
+        'source_tmpl': 'JSON-2.90.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MAKAMAKA'],
+    }),
+    ('Sub::Exporter', '0.987', {
+        'source_tmpl': 'Sub-Exporter-0.987.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Class::Load::XS', '0.09', {
+        'source_tmpl': 'Class-Load-XS-0.09.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Set::IntSpan::Fast', '1.15', {
+        'source_tmpl': 'Set-IntSpan-Fast-1.15.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AN/ANDYA'],
+    }),
+    ('Sub::Exporter::Progressive', '0.001011', {
+        'source_tmpl': 'Sub-Exporter-Progressive-0.001011.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/F/FR/FREW'],
+    }),
+    ('LWP', '6.13', {
+        'source_tmpl': 'libwww-perl-6.13.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Data::Dumper::Concise', '2.022', {
+        'source_tmpl': 'Data-Dumper-Concise-2.022.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/F/FR/FREW'],
+    }),
+    ('File::Slurp::Tiny', '0.004', {
+        'source_tmpl': 'File-Slurp-Tiny-0.004.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('Algorithm::Diff', '1.1903', {
+        'source_tmpl': 'Algorithm-Diff-1.1903.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TY/TYEMQ'],
+    }),
+    ('AnyData', '0.12', {
+        'source_tmpl': 'AnyData-0.12.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RE/REHSACK'],
+    }),
+    ('Text::Iconv', '1.7', {
+        'source_tmpl': 'Text-Iconv-1.7.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/M/MP/MPIOTR'],
+    }),
+    ('Class::Data::Inheritable', '0.08', {
+        'source_tmpl': 'Class-Data-Inheritable-0.08.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/T/TM/TMTM'],
+    }),
+    ('Text::Balanced', '2.03', {
+        'source_tmpl': 'Text-Balanced-2.03.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SH/SHAY'],
+    }),
+    ('strictures', '2.000001', {
+        'source_tmpl': 'strictures-2.000001.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HA/HAARG'],
+    }),
+    ('Switch', '2.17', {
+        'source_tmpl': 'Switch-2.17.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/C/CH/CHORNY'],
+    }),
+    ('File::Which', '1.19', {
+        'source_tmpl': 'File-Which-1.19.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PL/PLICEASE'],
+    }),
+    ('Email::Date::Format', '1.005', {
+        'source_tmpl': 'Email-Date-Format-1.005.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Error', '0.17024', {
+        'source_tmpl': 'Error-0.17024.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF'],
+    }),
+    ('Mock::Quick', '1.110', {
+        'source_tmpl': 'Mock-Quick-1.110.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('Text::CSV', '1.33', {
+        'source_tmpl': 'Text-CSV-1.33.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MAKAMAKA'],
+    }),
+    ('Test::Output', '1.03', {
+        'source_tmpl': 'Test-Output-1.03.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/B/BD/BDFOY'],
+    }),
+    ('Class::DBI', 'v3.0.17', {
+        'source_tmpl': 'Class-DBI-v3.0.17.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/T/TM/TMTM'],
+    }),
+    ('List::AllUtils', '0.09', {
+        'source_tmpl': 'List-AllUtils-0.09.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('UNIVERSAL::moniker', '0.08', {
+        'source_tmpl': 'UNIVERSAL-moniker-0.08.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/K/KA/KASEI'],
+    }),
+    ('Exception::Class', '1.39', {
+        'source_tmpl': 'Exception-Class-1.39.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('File::CheckTree', '4.42', {
+        'source_tmpl': 'File-CheckTree-4.42.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Math::VecStat', '0.08', {
+        'source_tmpl': 'Math-VecStat-0.08.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AS/ASPINELLI'],
+    }),
+    ('Pod::LaTeX', '0.61', {
+        'source_tmpl': 'Pod-LaTeX-0.61.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/T/TJ/TJENNESS'],
+    }),
+    ('Eval::Closure', '0.13', {
+        'source_tmpl': 'Eval-Closure-0.13.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DO/DOY'],
+    }),
+    ('HTTP::Request', '6.11', {
+        'source_tmpl': 'HTTP-Message-6.11.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('XML::Twig', '3.49', {
+        'source_tmpl': 'XML-Twig-3.49.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MI/MIROD'],
+    }),
+    ('IO::String', '1.08', {
+        'source_tmpl': 'IO-String-1.08.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('XML::Simple', '2.20', {
+        'source_tmpl': 'XML-Simple-2.20.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GR/GRANTM'],
+    }),
+    ('Sub::Install', '0.928', {
+        'source_tmpl': 'Sub-Install-0.928.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('HTTP::Cookies', '6.01', {
+        'source_tmpl': 'HTTP-Cookies-6.01.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Pod::Plainer', '1.04', {
+        'source_tmpl': 'Pod-Plainer-1.04.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RM/RMBARKER'],
+    }),
+    ('Test::Exception::LessClever', '0.006', {
+        'source_tmpl': 'Test-Exception-LessClever-0.006.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('LWP::MediaTypes', '6.02', {
+        'source_tmpl': 'LWP-MediaTypes-6.02.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Scalar::Util', '1.42', {
+        'source_tmpl': 'Scalar-List-Utils-1.42.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PE/PEVANS'],
+    }),
+    ('Data::Section::Simple', '0.07', {
+        'source_tmpl': 'Data-Section-Simple-0.07.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/M/MI/MIYAGAWA'],
+    }),
+    ('IO::Scalar', '2.111', {
+        'source_tmpl': 'IO-stringy-2.111.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DS/DSKOLL'],
+    }),
+    ('Class::Trigger', '0.14', {
+        'source_tmpl': 'Class-Trigger-0.14.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/M/MI/MIYAGAWA'],
+    }),
+    ('HTTP::Daemon', '6.01', {
+        'source_tmpl': 'HTTP-Daemon-6.01.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('File::HomeDir', '1.00', {
+        'source_tmpl': 'File-HomeDir-1.00.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('HTTP::Date', '6.02', {
+        'source_tmpl': 'HTTP-Date-6.02.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Authen::SASL', '2.16', {
+        'source_tmpl': 'Authen-SASL-2.16.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GB/GBARR'],
+    }),
+    ('Clone', '0.38', {
+        'source_tmpl': 'Clone-0.38.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GARU'],
+    }),
+    ('Data::Types', '0.09', {
+        'source_tmpl': 'Data-Types-0.09.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DW/DWHEELER'],
+    }),
+    ('Import::Into', '1.002005', {
+        'source_tmpl': 'Import-Into-1.002005.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HA/HAARG'],
+    }),
+    ('DateTime::Tiny', '1.04', {
+        'source_tmpl': 'DateTime-Tiny-1.04.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('DBD::AnyData', '0.110', {
+        'source_tmpl': 'DBD-AnyData-0.110.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RE/REHSACK'],
+    }),
+    ('Text::Format', '0.59', {
+        'source_tmpl': 'Text-Format-0.59.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/S/SH/SHLOMIF'],
+    }),
+    ('Devel::CheckCompiler', '0.06', {
+        'source_tmpl': 'Devel-CheckCompiler-0.06.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SY/SYOHEX'],
+    }),
+    ('Log::Handler', '0.87', {
+        'source_tmpl': 'Log-Handler-0.87.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BL/BLOONIX'],
+    }),
+    ('DBIx::ContextualFetch', '1.03', {
+        'source_tmpl': 'DBIx-ContextualFetch-1.03.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/T/TM/TMTM'],
+    }),
+    ('HTML::Entities', '3.71', {
+        'source_tmpl': 'HTML-Parser-3.71.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Devel::StackTrace', '2.00', {
+        'source_tmpl': 'Devel-StackTrace-2.00.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('Term::ReadKey', '2.33', {
+        'source_tmpl': 'TermReadKey-2.33.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/J/JS/JSTOWE'],
+    }),
+    ('Set::IntSpan', '1.19', {
+        'source_tmpl': 'Set-IntSpan-1.19.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/S/SW/SWMCD'],
+    }),
+    ('Moose', '2.1603', {
+        'source_tmpl': 'Moose-2.1603.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Algorithm::Dependency', '1.110', {
+        'source_tmpl': 'Algorithm-Dependency-1.110.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('Font::TTF', '1.05', {
+        'source_tmpl': 'Font-TTF-1.05.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MH/MHOSKEN'],
+    }),
+    ('IPC::Run3', '0.048', {
+        'source_tmpl': 'IPC-Run3-0.048.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('File::Find::Rule', '0.33', {
+        'source_tmpl': 'File-Find-Rule-0.33.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RC/RCLAMP'],
+    }),
+    ('SQL::Statement', '1.407', {
+        'source_tmpl': 'SQL-Statement-1.407.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RE/REHSACK'],
+    }),
+    ('File::Slurp', '9999.19', {
+        'source_tmpl': 'File-Slurp-9999.19.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/U/UR/URI'],
+    }),
+    ('Package::Stash', '0.37', {
+        'source_tmpl': 'Package-Stash-0.37.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DO/DOY'],
+    }),
+    ('Data::OptList', '0.109', {
+        'source_tmpl': 'Data-OptList-0.109.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('CPANPLUS', '0.9154', {
+        'source_tmpl': 'CPANPLUS-0.9154.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('Test::Harness', '3.35', {
+        'source_tmpl': 'Test-Harness-3.35.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('IO::Tty', '1.12', {
+        'source_tmpl': 'IO-Tty-1.12.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TO/TODDR'],
+    }),
+    ('Text::Soundex', '3.04', {
+        'source_tmpl': 'Text-Soundex-3.04.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Lingua::EN::PluralToSingular', '0.14', {
+        'source_tmpl': 'Lingua-EN-PluralToSingular-0.14.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/B/BK/BKB'],
+    }),
+    ('Want', '0.26', {
+        'source_tmpl': 'Want-0.26.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RO/ROBIN'],
+    }),
+    ('Cwd::Guard', '0.04', {
+        'source_tmpl': 'Cwd-Guard-0.04.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/K/KA/KAZEBURO'],
+    }),
+    ('Bundle::BioPerl', '2.1.9', {
+        'source_tmpl': 'Bundle-BioPerl-2.1.9.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/C/CJ/CJFIELDS'],
+    }),
+    ('Mail::Util', '2.14', {
+        'source_tmpl': 'MailTools-2.14.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MARKOV'],
+    }),
+]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Pillow/Pillow-2.8.1-foss-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/p/Pillow/Pillow-2.8.1-foss-2015a-Python-2.7.9.eb
index 524dd9ba3d66e30769478b0dd7d5c993f7e2cab5..aededa4507ca45390fe757dd635ade13e436a898 100644
--- a/easybuild/easyconfigs/p/Pillow/Pillow-2.8.1-foss-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/p/Pillow/Pillow-2.8.1-foss-2015a-Python-2.7.9.eb
@@ -7,7 +7,7 @@ homepage = 'http://pillow.readthedocs.org/'
 description = """Pillow is the 'friendly PIL fork' by Alex Clark and Contributors.
  PIL is the Python Imaging Library by Fredrik Lundh and Contributors."""
 
-toolchain = {'name': 'foss', 'version': '2015a'} 
+toolchain = {'name': 'foss', 'version': '2015a'}
 
 source_urls = [PYPI_SOURCE]
 sources = [SOURCE_TAR_GZ]
diff --git a/easybuild/easyconfigs/p/Pillow/Pillow-2.8.1-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/p/Pillow/Pillow-2.8.1-intel-2015a-Python-2.7.9.eb
index 04c7f0efa3cf824724db3ccf6669ee49e194a57c..07b42e823bee4b44aa941fe9b959c98ffebf6a8f 100644
--- a/easybuild/easyconfigs/p/Pillow/Pillow-2.8.1-intel-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/p/Pillow/Pillow-2.8.1-intel-2015a-Python-2.7.9.eb
@@ -7,7 +7,7 @@ homepage = 'http://pillow.readthedocs.org/'
 description = """Pillow is the 'friendly PIL fork' by Alex Clark and Contributors.
  PIL is the Python Imaging Library by Fredrik Lundh and Contributors."""
 
-toolchain = {'name': 'intel', 'version': '2015a'} 
+toolchain = {'name': 'intel', 'version': '2015a'}
 
 source_urls = [PYPI_SOURCE]
 sources = [SOURCE_TAR_GZ]
diff --git a/easybuild/easyconfigs/p/Pindel/Pindel-0.2.5a7-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Pindel/Pindel-0.2.5a7-goolf-1.4.10.eb
index 65d0c45c59d1130cd39a00d9e14b219d489fe854..864b80e95ce978be20bfe79b08fd5f4979153b1e 100644
--- a/easybuild/easyconfigs/p/Pindel/Pindel-0.2.5a7-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/Pindel/Pindel-0.2.5a7-goolf-1.4.10.eb
@@ -28,14 +28,14 @@ dependencies = [
 ]
 
 cmds_map = [('.*', "CPATH=$EBROOTSAMTOOLS/include/bam:$CPATH ./INSTALL $EBROOTSAMTOOLS")]
- 
+
 files_to_copy = [
     (['pindel', 'sam2pindel', 'pindel2vcf', 'bam2pindel.pl', 'Adaptor.pm'], 'bin'),
-     "demo", 
-     "gmt", 
-     "gmt-web", 
-     "test", 
-     "README.md", 
+     "demo",
+     "gmt",
+     "gmt-web",
+     "test",
+     "README.md",
      "RELEASE"
 ]
 
diff --git a/easybuild/easyconfigs/p/PyYAML/PyYAML-3.11-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/p/PyYAML/PyYAML-3.11-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b47675367824657c2fa40fe838c5382874bc0993
--- /dev/null
+++ b/easybuild/easyconfigs/p/PyYAML/PyYAML-3.11-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,31 @@
+easyblock = 'PythonPackage'
+
+name = 'PyYAML'
+version = '3.11'
+
+homepage = "https://pypi.python.org/pypi/PyYAML/"
+description = """PyYAML is a YAML parser and emitter for the Python programming language."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+pyver = '2.7.11'
+pyshortver = '.'.join(pyver.split('.')[:2])
+
+versionsuffix = '-Python-%s' % pyver
+
+dependencies = [
+    ('Python', pyver),
+    ('libyaml', '0.1.6'),
+]
+
+options = {'modulename': 'yaml'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%s/site-packages/yaml' % pyshortver],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-15.1.0-intel-2015b-Python-2.7.10-zmq4.eb b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-15.1.0-intel-2015b-Python-2.7.10-zmq4.eb
new file mode 100644
index 0000000000000000000000000000000000000000..34ae1ffa29c56b7e9beab024ec22ba9db161c6b3
--- /dev/null
+++ b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-15.1.0-intel-2015b-Python-2.7.10-zmq4.eb
@@ -0,0 +1,33 @@
+easyblock = 'PythonPackage'
+
+name = 'PyZMQ'
+version = '15.1.0'
+
+homepage = 'http://www.zeromq.org/bindings:python'
+description = """Python bindings for ZeroMQ"""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = [PYPI_LOWER_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+python = 'Python'
+pythonversion = '2.7.10'
+pyshortver = '.'.join(pythonversion.split('.')[:2])
+zmqversion = '4.1.4'
+
+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' % pyshortver],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.10-GCC-4.9.3-2.25-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.7.10-GCC-4.9.3-2.25-bare.eb
new file mode 100644
index 0000000000000000000000000000000000000000..40981226c2b71549d82971518de294c5b59cb0d1
--- /dev/null
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.10-GCC-4.9.3-2.25-bare.eb
@@ -0,0 +1,31 @@
+name = 'Python'
+version = '2.7.10'
+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': 'GCC', 'version': '4.9.3-2.25'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+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.3', '', ('GCCcore', '4.9.3')),
+    ('ncurses', '6.0', '', ('GCCcore', '4.9.3')),
+    ('SQLite', '3.8.10.2'),
+    ('Tk', '8.6.4', '-no-X11'),
+#   ('OpenSSL', '1.0.1k'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+#   nice to have an up to date openssl for security reasons
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
+# bare installation: no extensions included
+exts_list = []
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.11-foss-2016a.eb b/easybuild/easyconfigs/p/Python/Python-2.7.11-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4bce06c8fe162ba58bf829e93d037373da229393
--- /dev/null
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.11-foss-2016a.eb
@@ -0,0 +1,129 @@
+name = 'Python'
+version = '2.7.11'
+
+homepage = 'http://python.org/'
+description = """Python is a programming language that lets you work more quickly and integrate your systems
+ more effectively."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+numpyversion = '1.10.1'
+scipyversion = '0.16.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.8'),
+    ('libreadline', '6.3'),
+    ('ncurses', '6.0'),
+    ('SQLite', '3.9.2'),
+    ('Tk', '8.6.4', '-no-X11'),
+    ('GMP', '6.1.0'),
+#   ('OpenSSL', '1.0.1q'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+#   nice to have an up to date openssl for security reasons
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
+
+# order is important!
+# package versions updated May 28th 2015
+exts_list = [
+    ('setuptools', '18.7.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/s/setuptools/'],
+    }),
+    ('pip', '7.1.2', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pip/'],
+    }),
+    ('nose', '1.3.7', {
+        'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
+    }),
+    ('numpy', numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
+        'patches': [
+            'numpy-1.8.0-mkl.patch', # % numpyversion,
+        ],
+    }),
+    ('scipy', scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
+    }),
+    ('blist', '1.3.6', {
+        'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],
+    }),
+    ('mpi4py', '1.3.1', {
+        'source_urls': ['http://bitbucket.org/mpi4py/mpi4py/downloads/'],
+    }),
+    ('paycheck', '1.0.2', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paycheck/'],
+    }),
+    ('argparse', '1.4.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/a/argparse/'],
+    }),
+    ('pbr', '1.8.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pbr/'],
+    }),
+    ('lockfile', '0.12.2', {
+        'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
+    }),
+    ('Cython', '0.23.4', {
+        'source_urls': ['http://www.cython.org/release/'],
+    }),
+    ('six', '1.10.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
+    }),
+    ('dateutil', '2.4.2', {
+        'source_tmpl': 'python-%(name)s-%(version)s.tar.gz',
+        'source_urls': ['https://pypi.python.org/packages/source/p/python-dateutil/'],
+    }),
+    ('deap', '1.0.2', {
+        'source_tmpl': '%(name)s-%(version)s.post2.tar.gz',
+        'source_urls': ['https://pypi.python.org/packages/source/d/deap/'],
+    }),
+    ('decorator', '4.0.4', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
+    }),
+    ('arff', '2.1.0', {
+        '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/'],
+    }),
+    ('ecdsa', '0.13', {
+        'source_urls': ['https://pypi.python.org/packages/source/e/ecdsa/'],
+    }),
+    ('paramiko', '1.16.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'],
+    }),
+    ('pyparsing', '2.0.6', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pyparsing/'],
+    }),
+    ('netifaces', '0.10.4', {
+        'source_urls': ['https://pypi.python.org/packages/source/n/netifaces'],
+    }),
+    ('netaddr', '0.7.18', {
+        'source_urls': ['https://pypi.python.org/packages/source/n/netaddr'],
+    }),
+    ('funcsigs', '0.4', {
+        'source_urls': ['https://pypi.python.org/packages/source/f/funcsigs'],
+    }),
+    ('mock', '1.3.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/m/mock'],
+    }),
+    ('pytz', '2015.7', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pytz'],
+    }),
+    ('pandas', '0.17.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pandas'],
+    }),
+    ('enum34', '1.1.2', {
+        'modulename': 'enum',
+        'source_urls': ['https://pypi.python.org/packages/source/e/enum34'],
+    }),
+]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.11-intel-2015b.eb b/easybuild/easyconfigs/p/Python/Python-2.7.11-intel-2015b.eb
index ac89976c5e20a3772221ddd74a841456b753f80a..c697adc7c774765c3d911bb047416b0c503a4995 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.11-intel-2015b.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.11-intel-2015b.eb
@@ -120,6 +120,10 @@ exts_list = [
     ('pandas', '0.17.1', {
         'source_urls': ['https://pypi.python.org/packages/source/p/pandas'],
     }),
+    ('enum34', '1.1.2', {
+        'modulename': 'enum',
+        'source_urls': ['https://pypi.python.org/packages/source/e/enum34'],
+    }),
 ]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.11-intel-2016a.eb b/easybuild/easyconfigs/p/Python/Python-2.7.11-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b615ded539138b93417c939d1b4fd0a1ee78cd0f
--- /dev/null
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.11-intel-2016a.eb
@@ -0,0 +1,129 @@
+name = 'Python'
+version = '2.7.11'
+
+homepage = 'http://python.org/'
+description = """Python is a programming language that lets you work more quickly and integrate your systems
+ more effectively."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+numpyversion = '1.10.1'
+scipyversion = '0.16.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.8'),
+    ('libreadline', '6.3'),
+    ('ncurses', '6.0'),
+    ('SQLite', '3.9.2'),
+    ('Tk', '8.6.4', '-no-X11'),
+    ('GMP', '6.1.0'),
+#   ('OpenSSL', '1.0.1q'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+#   nice to have an up to date openssl for security reasons
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
+
+# order is important!
+# package versions updated May 28th 2015
+exts_list = [
+    ('setuptools', '18.7.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/s/setuptools/'],
+    }),
+    ('pip', '7.1.2', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pip/'],
+    }),
+    ('nose', '1.3.7', {
+        'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
+    }),
+    ('numpy', numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
+        'patches': [
+            'numpy-1.8.0-mkl.patch', # % numpyversion,
+        ],
+    }),
+    ('scipy', scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
+    }),
+    ('blist', '1.3.6', {
+        'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],
+    }),
+    ('mpi4py', '1.3.1', {
+        'source_urls': ['http://bitbucket.org/mpi4py/mpi4py/downloads/'],
+    }),
+    ('paycheck', '1.0.2', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paycheck/'],
+    }),
+    ('argparse', '1.4.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/a/argparse/'],
+    }),
+    ('pbr', '1.8.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pbr/'],
+    }),
+    ('lockfile', '0.12.2', {
+        'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
+    }),
+    ('Cython', '0.23.4', {
+        'source_urls': ['http://www.cython.org/release/'],
+    }),
+    ('six', '1.10.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
+    }),
+    ('dateutil', '2.4.2', {
+        'source_tmpl': 'python-%(name)s-%(version)s.tar.gz',
+        'source_urls': ['https://pypi.python.org/packages/source/p/python-dateutil/'],
+    }),
+    ('deap', '1.0.2', {
+        'source_tmpl': '%(name)s-%(version)s.post2.tar.gz',
+        'source_urls': ['https://pypi.python.org/packages/source/d/deap/'],
+    }),
+    ('decorator', '4.0.4', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
+    }),
+    ('arff', '2.1.0', {
+        '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/'],
+    }),
+    ('ecdsa', '0.13', {
+        'source_urls': ['https://pypi.python.org/packages/source/e/ecdsa/'],
+    }),
+    ('paramiko', '1.16.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'],
+    }),
+    ('pyparsing', '2.0.6', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pyparsing/'],
+    }),
+    ('netifaces', '0.10.4', {
+        'source_urls': ['https://pypi.python.org/packages/source/n/netifaces'],
+    }),
+    ('netaddr', '0.7.18', {
+        'source_urls': ['https://pypi.python.org/packages/source/n/netaddr'],
+    }),
+    ('funcsigs', '0.4', {
+        'source_urls': ['https://pypi.python.org/packages/source/f/funcsigs'],
+    }),
+    ('mock', '1.3.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/m/mock'],
+    }),
+    ('pytz', '2015.7', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pytz'],
+    }),
+    ('pandas', '0.17.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pandas'],
+    }),
+    ('enum34', '1.1.2', {
+        'modulename': 'enum',
+        'source_urls': ['https://pypi.python.org/packages/source/e/enum34'],
+    }),
+]
+
+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 ddf1d2d85390d0b5008ba7ad9c9c0430af53978d..151d6f90e79532b4162e75eb439c427e47d6baba 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
@@ -48,9 +48,6 @@ exts_list = [
     ('mpi4py', '1.3', {
         'source_urls': ['http://bitbucket.org/mpi4py/mpi4py/downloads/'],
     }),
-    ('argparse', '1.2.1', {
-        'source_urls': ['https://pypi.python.org/packages/source/a/argparse/'],
-    }),
     ('Cython', '0.19.1', {
         'source_urls': ['http://www.cython.org/release/'],
     }),
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 86066e4a5eb3c5b8aee0fd1ac75d70b0338099d7..c2247793ab8bc254295ee81766ac85a415f80de0 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
@@ -48,9 +48,6 @@ exts_list = [
     ('mpi4py', '1.3', {
         'source_urls': ['http://bitbucket.org/mpi4py/mpi4py/downloads/'],
     }),
-    ('argparse', '1.2.1', {
-        'source_urls': ['https://pypi.python.org/packages/source/a/argparse/'],
-    }),
     ('Cython', '0.19.1', {
         'source_urls': ['http://www.cython.org/release/'],
     }),
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 b01168b83e9499e9210ad557aaaf0aa49d6bbc61..77a4ae2161af48e9fb0110de9e668031f9eda6b8 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
@@ -50,9 +50,6 @@ exts_list = [
     ('mpi4py', '1.3', {
         'source_urls': ['http://bitbucket.org/mpi4py/mpi4py/downloads/'],
     }),
-    ('argparse', '1.2.1', {
-        'source_urls': ['https://pypi.python.org/packages/source/a/argparse/'],
-    }),
     ('Cython', '0.19.1', {
         'source_urls': ['http://www.cython.org/release/'],
     }),
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 de9617eacf2ef57da0be8ee59774497069f65761..24ea958ab00cbced932585b2f7b437914fc75c11 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
@@ -48,9 +48,6 @@ exts_list = [
     ('mpi4py', '1.3', {
         'source_urls': ['http://bitbucket.org/mpi4py/mpi4py/downloads/'],
     }),
-    ('argparse', '1.2.1', {
-        'source_urls': ['https://pypi.python.org/packages/source/a/argparse/'],
-    }),
     ('Cython', '0.19.1', {
         'source_urls': ['http://www.cython.org/release/'],
     }),
diff --git a/easybuild/easyconfigs/p/Python/Python-3.4.1-intel-2014b.eb b/easybuild/easyconfigs/p/Python/Python-3.4.1-intel-2014b.eb
index b7690d84fc789d268975ed57c180e3a805a710ff..f553cd209e2b62865e95a0314c078b1c4c40d5f1 100644
--- a/easybuild/easyconfigs/p/Python/Python-3.4.1-intel-2014b.eb
+++ b/easybuild/easyconfigs/p/Python/Python-3.4.1-intel-2014b.eb
@@ -60,9 +60,6 @@ exts_list = [
             'paycheck-1.0.2_setup-open-README-utf8.patch',
         ],
     }),
-    ('argparse', '1.2.1', {
-        'source_urls': ['https://pypi.python.org/packages/source/a/argparse/'],
-    }),
     ('lockfile', '0.9.1', {
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
         # tarball has changed upstream, so make sure we get the right version by verifying the checksum
diff --git a/easybuild/easyconfigs/p/Python/Python-3.4.1-intel-2015a.eb b/easybuild/easyconfigs/p/Python/Python-3.4.1-intel-2015a.eb
index 91935078a9cf5e99aa877a2ed58a34f89ad551bc..cdfe46f05e2b46625fa754821c996b64ce64de3c 100644
--- a/easybuild/easyconfigs/p/Python/Python-3.4.1-intel-2015a.eb
+++ b/easybuild/easyconfigs/p/Python/Python-3.4.1-intel-2015a.eb
@@ -60,9 +60,6 @@ exts_list = [
             'paycheck-1.0.2_setup-open-README-utf8.patch',
         ],
     }),
-    ('argparse', '1.2.1', {
-        'source_urls': ['https://pypi.python.org/packages/source/a/argparse/'],
-    }),
     ('lockfile', '0.9.1', {
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
         # tarball has changed upstream, so make sure we get the right version by verifying the checksum
diff --git a/easybuild/easyconfigs/p/Python/Python-3.4.3-intel-2015a.eb b/easybuild/easyconfigs/p/Python/Python-3.4.3-intel-2015a.eb
index 5741325e74448e20da59427ab0e27a4f42546422..dd4b3e999bba669bbfcd22fe1a3204f90702ef21 100644
--- a/easybuild/easyconfigs/p/Python/Python-3.4.3-intel-2015a.eb
+++ b/easybuild/easyconfigs/p/Python/Python-3.4.3-intel-2015a.eb
@@ -58,9 +58,6 @@ exts_list = [
             'paycheck-1.0.2_setup-open-README-utf8.patch',
         ],
     }),
-    ('argparse', '1.3.0', {
-        'source_urls': ['https://pypi.python.org/packages/source/a/argparse/'],
-    }),
     ('pbr', '0.11.0', {
         'source_urls': ['https://pypi.python.org/packages/source/p/pbr/'],
     }),
diff --git a/easybuild/easyconfigs/p/Python/Python-3.5.0-intel-2015b.eb b/easybuild/easyconfigs/p/Python/Python-3.5.0-intel-2015b.eb
index 088e6f96d905601e35a3180543576d882f623a6a..f6409a5d49a3618137c2e1a48aee18b33902967d 100644
--- a/easybuild/easyconfigs/p/Python/Python-3.5.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/p/Python/Python-3.5.0-intel-2015b.eb
@@ -58,9 +58,6 @@ exts_list = [
             'paycheck-1.0.2_setup-open-README-utf8.patch',
         ],
     }),
-    ('argparse', '1.4.0', {
-        'source_urls': ['https://pypi.python.org/packages/source/a/argparse/'],
-    }),
     ('pbr', '1.8.0', {
         'source_urls': ['https://pypi.python.org/packages/source/p/pbr/'],
     }),
diff --git a/easybuild/easyconfigs/p/p7zip/p7zip-9.38.1-GCC-4.9.2.eb b/easybuild/easyconfigs/p/p7zip/p7zip-9.38.1-GCC-4.9.2.eb
index aba7c4da3fd5d4576f6cd34984aca5762eb1db6f..f20b769e50803af7990dab548e7f9805815c1cec 100644
--- a/easybuild/easyconfigs/p/p7zip/p7zip-9.38.1-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/p/p7zip/p7zip-9.38.1-GCC-4.9.2.eb
@@ -17,7 +17,7 @@ buildopts = 'all3 CC="$CC" CXX="$CXX" OPTFLAGS="$CFLAGS"'
 
 files_to_copy = [
     (['bin/7za', 'bin/7zr', 'bin/7zCon.sfx'], 'bin'),  # stand-alone binaries
-    (['bin/7z', 'bin/7z.so', 'bin/Codecs'], 'libexec'),  # 7z requires 7z.so plugin in same directory
+    (['bin/7z', 'bin/7z.%s' % SHLIB_EXT, 'bin/Codecs'], 'libexec'),  # 7z requires 7z.so plugin in same directory
 ]
 
 # put script in place for 7z, since it *must* be called full path, to ensure that 7z.so is found in the same directory
@@ -28,7 +28,7 @@ postinstallcmds = [
 ]
 
 sanity_check_paths = {
-    'files': ['bin/7z', 'bin/7za', 'bin/7zCon.sfx', 'bin/7zr', 'libexec/7z', 'libexec/7z.so'],
+    'files': ['bin/7z', 'bin/7za', 'bin/7zCon.sfx', 'bin/7zr', 'libexec/7z', 'libexec/7z.%s' % SHLIB_EXT],
     'dirs': ['libexec/Codecs'],
 }
 
diff --git a/easybuild/easyconfigs/p/p7zip/p7zip-9.38.1.eb b/easybuild/easyconfigs/p/p7zip/p7zip-9.38.1.eb
index b709c55a99bb41e02f085b0e8642ececce9bccf0..082cc254b85e6ddd8f712cbc975bee33d7523c06 100644
--- a/easybuild/easyconfigs/p/p7zip/p7zip-9.38.1.eb
+++ b/easybuild/easyconfigs/p/p7zip/p7zip-9.38.1.eb
@@ -17,7 +17,7 @@ buildopts = 'all3'
 
 files_to_copy = [
     (['bin/7za', 'bin/7zr', 'bin/7zCon.sfx'], 'bin'),  # stand-alone binaries
-    (['bin/7z', 'bin/7z.so', 'bin/Codecs'], 'libexec'),  # 7z requires 7z.so plugin in same directory
+    (['bin/7z', 'bin/7z.%s' % SHLIB_EXT, 'bin/Codecs'], 'libexec'),  # 7z requires 7z.so plugin in same directory
 ]
 
 # put script in place for 7z, since it *must* be called full path, to ensure that 7z.so is found in the same directory
@@ -28,7 +28,7 @@ postinstallcmds = [
 ]
 
 sanity_check_paths = {
-    'files': ['bin/7z', 'bin/7za', 'bin/7zCon.sfx', 'bin/7zr', 'libexec/7z', 'libexec/7z.so'],
+    'files': ['bin/7z', 'bin/7za', 'bin/7zCon.sfx', 'bin/7zr', 'libexec/7z', 'libexec/7z.%s' % SHLIB_EXT],
     'dirs': ['libexec/Codecs'],
 }
 
diff --git a/easybuild/easyconfigs/p/pBWA/pBWA-0.5.9_1.21009-goolf-1.4.10.eb b/easybuild/easyconfigs/p/pBWA/pBWA-0.5.9_1.21009-goolf-1.4.10.eb
index fa5b729bcb665c94125a32b00bba0743f166fa49..8678c701924df5aab730783955d159ac1e2ffbec 100644
--- a/easybuild/easyconfigs/p/pBWA/pBWA-0.5.9_1.21009-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/pBWA/pBWA-0.5.9_1.21009-goolf-1.4.10.eb
@@ -28,6 +28,6 @@ files_to_copy = [(['pBWA','qualfa2fq.pl','solid2fastq.pl' ], 'bin')]
 sanity_check_paths = {
     'files': ['bin/pBWA','bin/qualfa2fq.pl','bin/solid2fastq.pl'],
     'dirs': ['.'],
-} 
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/p/pandas/pandas-0.17.1-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/p/pandas/pandas-0.17.1-intel-2015b-Python-2.7.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..35f47526a2e594b2c54b2ddd728f561d31b46eb0
--- /dev/null
+++ b/easybuild/easyconfigs/p/pandas/pandas-0.17.1-intel-2015b-Python-2.7.10.eb
@@ -0,0 +1,28 @@
+easyblock = 'PythonPackage'
+
+name = 'pandas'
+version = '0.17.1'
+
+homepage = "https://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': 'intel', 'version': '2015b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+python = 'Python'
+pyver = '2.7.10'
+
+versionsuffix = "-%s-%s" % (python, pyver)
+
+dependencies = [(python, pyver)]
+
+py_short_ver = '.'.join(pyver.split('.')[:2])
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%s/site-packages' % py_short_ver],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/p/pangox-compat/pangox-compat-0.0.2-intel-2015b-Pango-1.37.1.eb b/easybuild/easyconfigs/p/pangox-compat/pangox-compat-0.0.2-intel-2015b-Pango-1.37.1.eb
index e488d95cd880ea6151b25bd89a6be3a54f391f10..f2a20187d474614badd91376e4edda67427aa499 100644
--- a/easybuild/easyconfigs/p/pangox-compat/pangox-compat-0.0.2-intel-2015b-Pango-1.37.1.eb
+++ b/easybuild/easyconfigs/p/pangox-compat/pangox-compat-0.0.2-intel-2015b-Pango-1.37.1.eb
@@ -16,7 +16,7 @@ versionsuffix = '-Pango-%s' % pangover
 dependencies = [('Pango', pangover)]
 
 sanity_check_paths = {
-    'files': ['lib/libpangox-1.0.a', 'lib/libpangox-1.0.so', 'lib/pkgconfig/pangox.pc',
+    'files': ['lib/libpangox-1.0.a', 'lib/libpangox-1.0.%s' % SHLIB_EXT, 'lib/pkgconfig/pangox.pc',
               'include/pango-1.0/pango/pangox.h'],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/p/parallel/parallel-20151222-foss-2015b.eb b/easybuild/easyconfigs/p/parallel/parallel-20151222-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..693b7da49a0bd0542d6bb88e0578d175ffdfacc6
--- /dev/null
+++ b/easybuild/easyconfigs/p/parallel/parallel-20151222-foss-2015b.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'parallel'
+version = '20151222'
+
+homepage = 'http://savannah.gnu.org/projects/parallel/'
+description = """parallel: Build and execute shell commands in parallel"""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = [GNU_SOURCE]
+
+dependencies = [
+    ('Perl', '5.22.0', '-bare'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/parallel'],
+    'dirs': []
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/p/patchelf/patchelf-0.8-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/p/patchelf/patchelf-0.8-GNU-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e63fac1d5dccef5303766053041de8c9301c4a35
--- /dev/null
+++ b/easybuild/easyconfigs/p/patchelf/patchelf-0.8-GNU-4.9.3-2.25.eb
@@ -0,0 +1,21 @@
+easyblock = 'ConfigureMake'
+
+name = 'patchelf'
+version = '0.8'
+
+homepage = 'http://nixos.org/patchelf.html'
+description = """PatchELF is a small utility to modify the dynamic linker and RPATH of ELF executables."""
+
+toolchain = {'name': 'GNU', 'version': '4.9.3-2.25'}
+
+source_urls = ['https://github.com/NixOS/patchelf/archive/']
+sources = ['%(version)s.tar.gz']
+
+preconfigopts = "sh bootstrap.sh && "
+
+sanity_check_paths = {
+    'files': ['bin/patchelf'],
+    'dirs': ['share'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/p/petsc4py/petsc4py-3.6.0-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/p/petsc4py/petsc4py-3.6.0-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..25e343af47f91a3786c21bd8574451ee4fead571
--- /dev/null
+++ b/easybuild/easyconfigs/p/petsc4py/petsc4py-3.6.0-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,28 @@
+easyblock = 'PythonPackage'
+
+name = 'petsc4py'
+version = '3.6.0'
+
+homepage = 'https://bitbucket.org/petsc/petsc4py'
+description = "petsc4py are Python bindings for PETSc, the Portable, Extensible Toolchain for Scientific Computation."
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+pyver = '2.7.11'
+versionsuffix = '-Python-%s' % pyver
+
+dependencies = [
+    ('Python', pyver),
+    ('PETSc', '3.6.3', versionsuffix)
+]
+
+pyshortver = '.'.join(pyver.split('.')[:2])
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%s/site-packages' % pyshortver],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/p/phonopy/phonopy-1.10.1-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/p/phonopy/phonopy-1.10.1-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8ce0f20b144ad825e8e3f15d3f0845737cb761ac
--- /dev/null
+++ b/easybuild/easyconfigs/p/phonopy/phonopy-1.10.1-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,32 @@
+easyblock = 'PythonPackage'
+
+name = 'phonopy'
+version = '1.10.1'
+
+homepage = 'http://atztogo.github.io/phonopy/'
+description = """Phonopy is an open source package of phonon calculations based on the supercell approach."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+pyver = '2.7.11'
+pyshortver = '.'.join(pyver.split('.')[:2])
+
+versionsuffix = '-Python-%s' % pyver
+
+dependencies = [
+    ('Python', pyver),
+    ('matplotlib', '1.5.1', versionsuffix),
+    ('lxml', '3.5.0', versionsuffix),
+    ('PyYAML', '3.11', versionsuffix),
+]
+
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%s/site-packages/%%(name)s' % pyshortver],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/p/pigz/pigz-2.3.1-goolf-1.4.10.eb b/easybuild/easyconfigs/p/pigz/pigz-2.3.1-goolf-1.4.10.eb
index 2c50b49d2278e90481f06d3407bf075e038dea60..292fb226d32d2adcf50372464bf0a88e70c5928e 100644
--- a/easybuild/easyconfigs/p/pigz/pigz-2.3.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/pigz/pigz-2.3.1-goolf-1.4.10.eb
@@ -6,7 +6,7 @@
 easyblock = 'MakeCp'
 
 name = 'pigz'
-version = '2.3.1' 
+version = '2.3.1'
 
 homepage = 'http://zlib.net/pigz/'
 description = """ pigz, which stands for parallel implementation of gzip, is a fully 
@@ -27,7 +27,7 @@ buildopts = ' CC=$CC'
 parallel = 1
 
 files_to_copy = [(["pigz", "unpigz"], "bin")]
-        
+
 sanity_check_paths = {
     'files': ["bin/pigz", "bin/unpigz"],
     'dirs': [""],
diff --git a/easybuild/easyconfigs/p/pigz/pigz-2.3.1-ictce-6.2.5.eb b/easybuild/easyconfigs/p/pigz/pigz-2.3.1-ictce-6.2.5.eb
index ec92fe5f04e1108ff8e83c97860a501cd3234d96..770c70dd5f7fca5b595374c442ef1c2a42b2472c 100644
--- a/easybuild/easyconfigs/p/pigz/pigz-2.3.1-ictce-6.2.5.eb
+++ b/easybuild/easyconfigs/p/pigz/pigz-2.3.1-ictce-6.2.5.eb
@@ -6,7 +6,7 @@
 easyblock = 'MakeCp'
 
 name = 'pigz'
-version = '2.3.1' 
+version = '2.3.1'
 
 homepage = 'http://zlib.net/pigz/'
 description = """ pigz, which stands for parallel implementation of gzip, is a fully 
@@ -27,7 +27,7 @@ buildopts = ' CC=$CC'
 parallel = 1
 
 files_to_copy = [(["pigz", "unpigz"], "bin")]
-        
+
 sanity_check_paths = {
     'files': ["bin/pigz", "bin/unpigz"],
     'dirs': [""],
diff --git a/easybuild/easyconfigs/p/pigz/pigz-2.3.3-foss-2015b.eb b/easybuild/easyconfigs/p/pigz/pigz-2.3.3-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e95cb85cb9fc0be28fbae6ad68496752d5a96775
--- /dev/null
+++ b/easybuild/easyconfigs/p/pigz/pigz-2.3.3-foss-2015b.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 = 'pigz'
+version = '2.3.3'
+
+homepage = 'http://zlib.net/pigz/'
+description = """ pigz, which stands for parallel implementation of gzip, is a fully 
+ functional replacement for gzip that exploits multiple processors and multiple cores 
+ to the hilt when compressing data. pigz was written by Mark Adler, and uses the zlib 
+ and pthread libraries. """
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+
+source_urls = ['http://zlib.net/pigz/']
+sources = [SOURCE_TAR_GZ]
+
+# Patch Makefile so zlib provided by EasyBuild is picked up
+patches = ['pigz-2.3.3_Makefile.patch']
+
+# README recommends zlib 1.2.6 or higher
+dependencies = [('zlib', '1.2.8')]
+
+buildopts = ' CC=$CC'
+
+parallel = 1
+
+files_to_copy = [(["pigz", "unpigz"], "bin")]
+
+sanity_check_paths = {
+    'files': ["bin/pigz", "bin/unpigz"],
+    'dirs': [""],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/p/pigz/pigz-2.3.3_Makefile.patch b/easybuild/easyconfigs/p/pigz/pigz-2.3.3_Makefile.patch
new file mode 100644
index 0000000000000000000000000000000000000000..cef334ae06b50d99b88246a51c1ee0ad246f82a0
--- /dev/null
+++ b/easybuild/easyconfigs/p/pigz/pigz-2.3.3_Makefile.patch
@@ -0,0 +1,16 @@
+--- Makefile.orig	2016-01-11 13:27:20.537470900 +1030
++++ Makefile	2016-01-11 13:27:35.557588464 +1030
+@@ -1,11 +1,10 @@
+-CC=cc
+-CFLAGS=-O3 -Wall -Wextra
++ZLIB=-L$(EBROOTZLIB)/lib
+ LDFLAGS=-lz
+ ZOPFLI=zopfli/src/zopfli/
+ # use gcc and gmake on Solaris
+ 
+ pigz: pigz.o yarn.o try.o ${ZOPFLI}deflate.o ${ZOPFLI}blocksplitter.o ${ZOPFLI}tree.o ${ZOPFLI}lz77.o ${ZOPFLI}cache.o ${ZOPFLI}hash.o ${ZOPFLI}util.o ${ZOPFLI}squeeze.o ${ZOPFLI}katajainen.o
+-	$(CC) $(LDFLAGS) -o pigz $^ -lpthread -lm
++	$(CC) $(ZLIB) -o pigz $^ -lpthread -lm $(LDFLAGS)
+ 	ln -f pigz unpigz
+ 
+ pigz.o: pigz.c yarn.h try.h ${ZOPFLI}deflate.h ${ZOPFLI}util.h
diff --git a/easybuild/easyconfigs/p/pip/pip-7.1.2-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/p/pip/pip-7.1.2-intel-2015b-Python-2.7.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3b1ec70aab6bc119172a6563ba80837fdfeac1cf
--- /dev/null
+++ b/easybuild/easyconfigs/p/pip/pip-7.1.2-intel-2015b-Python-2.7.10.eb
@@ -0,0 +1,22 @@
+easyblock = 'PythonPackage'
+
+name = 'pip'
+version = '7.1.2'
+
+homepage = 'https://pip.pypa.io'
+description = """The PyPA recommended tool for installing Python packages."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+python = 'Python'
+pyver = '2.7.10'
+versionsuffix = '-%s-%s' % (python, pyver)
+
+dependencies = [
+    (python, pyver),
+]
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/p/pixman/pixman-0.28.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/p/pixman/pixman-0.28.2-goalf-1.1.0-no-OFED.eb
index 50258b4bd0f6462016c614f299a8765435aa6a3f..9cffd5d148d0fa645950e742a94dc579d2e20048 100644
--- a/easybuild/easyconfigs/p/pixman/pixman-0.28.2-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/p/pixman/pixman-0.28.2-goalf-1.1.0-no-OFED.eb
@@ -13,7 +13,7 @@ source_urls = ['http://cairographics.org/releases/']
 sources = [SOURCE_TAR_GZ]
 
 sanity_check_paths = {
-    'files': ['lib/libpixman-1.so'],
+    'files': ['lib/libpixman-1.%s' % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/p/pixman/pixman-0.28.2-goolf-1.4.10.eb b/easybuild/easyconfigs/p/pixman/pixman-0.28.2-goolf-1.4.10.eb
index 541743ef66f6ba1440fb6be735c9d4d3be9d42ab..62bdd5d5547b832f5b449ab4666fb1e166a826a7 100644
--- a/easybuild/easyconfigs/p/pixman/pixman-0.28.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/pixman/pixman-0.28.2-goolf-1.4.10.eb
@@ -13,7 +13,7 @@ source_urls = ['http://cairographics.org/releases/']
 sources = [SOURCE_TAR_GZ]
 
 sanity_check_paths = {
-    'files': ['lib/libpixman-1.so'],
+    'files': ['lib/libpixman-1.%s' % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/p/pixman/pixman-0.28.2-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/p/pixman/pixman-0.28.2-ictce-3.2.2.u3.eb
index 7971e5ec6d0a43bde1bd082b3d041483476d80fa..61be50bbbfcbe1c8add771574f74c1d021e02e03 100644
--- a/easybuild/easyconfigs/p/pixman/pixman-0.28.2-ictce-3.2.2.u3.eb
+++ b/easybuild/easyconfigs/p/pixman/pixman-0.28.2-ictce-3.2.2.u3.eb
@@ -13,7 +13,7 @@ source_urls = ['http://cairographics.org/releases/']
 sources = [SOURCE_TAR_GZ]
 
 sanity_check_paths = {
-    'files': ['lib/libpixman-1.so'],
+    'files': ['lib/libpixman-1.%s' % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/p/pixman/pixman-0.28.2-ictce-4.1.13.eb b/easybuild/easyconfigs/p/pixman/pixman-0.28.2-ictce-4.1.13.eb
index 003ed58349a2e7332b10692699fcf23bc1c099bc..9d840139aa70175ee3f230c236b4b6b151d2e2f6 100644
--- a/easybuild/easyconfigs/p/pixman/pixman-0.28.2-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/p/pixman/pixman-0.28.2-ictce-4.1.13.eb
@@ -13,7 +13,7 @@ source_urls = ['http://cairographics.org/releases/']
 sources = [SOURCE_TAR_GZ]
 
 sanity_check_paths = {
-    'files': ['lib/libpixman-1.so'],
+    'files': ['lib/libpixman-1.%s' % SHLIB_EXT],
     'dirs': []
 }
 
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
index 730661425c90dcfffe256e68b5325b271f1bc751..95b98067f098566353ae36e49dd191adfba91cdc 100644
--- 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
@@ -13,7 +13,7 @@ source_urls = ['http://cairographics.org/releases/']
 sources = [SOURCE_TAR_GZ]
 
 sanity_check_paths = {
-    'files': ['lib/libpixman-1.so'],
+    'files': ['lib/libpixman-1.%s' % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/p/pixman/pixman-0.32.6-goolf-1.7.20.eb b/easybuild/easyconfigs/p/pixman/pixman-0.32.6-goolf-1.7.20.eb
index 9a915bad5f07f1c75fafd779994dd2c1d9efaacf..b69347b571e5ac62cd5da690a9f6f1639b4e915d 100644
--- a/easybuild/easyconfigs/p/pixman/pixman-0.32.6-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/p/pixman/pixman-0.32.6-goolf-1.7.20.eb
@@ -13,7 +13,7 @@ source_urls = ['http://cairographics.org/releases/']
 sources = [SOURCE_TAR_GZ]
 
 sanity_check_paths = {
-    'files': ['lib/libpixman-1.so'],
+    'files': ['lib/libpixman-1.%s' % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/p/pixman/pixman-0.32.6-intel-2014b.eb b/easybuild/easyconfigs/p/pixman/pixman-0.32.6-intel-2014b.eb
index dc69def433077dc18ebc01fd42c99274809c6ea2..9d1bad81517876d4d82a4463add5178a47fed4ee 100644
--- a/easybuild/easyconfigs/p/pixman/pixman-0.32.6-intel-2014b.eb
+++ b/easybuild/easyconfigs/p/pixman/pixman-0.32.6-intel-2014b.eb
@@ -13,7 +13,7 @@ source_urls = ['http://cairographics.org/releases/']
 sources = [SOURCE_TAR_GZ]
 
 sanity_check_paths = {
-    'files': ['lib/libpixman-1.so'],
+    'files': ['lib/libpixman-1.%s' % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/p/pixman/pixman-0.32.6-intel-2015a.eb b/easybuild/easyconfigs/p/pixman/pixman-0.32.6-intel-2015a.eb
index 480001289ad988385e94f2c6319de9908c524083..7c7c7a06baa73e5af281413a4252f84ee484b6c6 100644
--- a/easybuild/easyconfigs/p/pixman/pixman-0.32.6-intel-2015a.eb
+++ b/easybuild/easyconfigs/p/pixman/pixman-0.32.6-intel-2015a.eb
@@ -13,7 +13,7 @@ source_urls = ['http://cairographics.org/releases/']
 sources = [SOURCE_TAR_GZ]
 
 sanity_check_paths = {
-    'files': ['lib/libpixman-1.so'],
+    'files': ['lib/libpixman-1.%s' % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/p/pixman/pixman-0.32.8-intel-2015b.eb b/easybuild/easyconfigs/p/pixman/pixman-0.32.8-intel-2015b.eb
index f938cf12081b8e5c43deca5336439b49fc3afcdd..d916e6e26365f8703fd328144189a8b844f14458 100644
--- a/easybuild/easyconfigs/p/pixman/pixman-0.32.8-intel-2015b.eb
+++ b/easybuild/easyconfigs/p/pixman/pixman-0.32.8-intel-2015b.eb
@@ -13,7 +13,7 @@ source_urls = ['http://cairographics.org/releases/']
 sources = [SOURCE_TAR_GZ]
 
 sanity_check_paths = {
-    'files': ['lib/libpixman-1.so'],
+    'files': ['lib/libpixman-1.%s' % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-goalf-1.1.0-no-OFED.eb
index b0953355e6e417452b0b31e2306ede09c127cf8f..ec3f8c364ac37c37755090ec53c7e937ead0e92d 100644
--- a/easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-goalf-1.1.0-no-OFED.eb
@@ -17,8 +17,8 @@ source_urls = ['http://pkgconfig.freedesktop.org/releases/']
 configopts = " --with-internal-glib"
 
 sanity_check_paths = {
-                      'files': ['bin/pkg-config'],
-                      'dirs': []
-                     }
+    'files': ['bin/pkg-config'],
+    'dirs': []
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-goolf-1.4.10.eb b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-goolf-1.4.10.eb
index d6281260973a92cce10e18268a05c1c8dbf4c433..0b6b8bc92789a6c447bdc5a5a87b75bf6c0c4b5c 100644
--- a/easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-goolf-1.4.10.eb
@@ -17,8 +17,8 @@ source_urls = ['http://pkgconfig.freedesktop.org/releases/']
 configopts = " --with-internal-glib"
 
 sanity_check_paths = {
-                      'files': ['bin/pkg-config'],
-                      'dirs': []
-                     }
+    'files': ['bin/pkg-config'],
+    'dirs': []
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-ictce-4.0.6.eb b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-ictce-4.0.6.eb
index 2d7168b4db723d3a912fc30f5681381fc1c05004..ca1b0b102a47143e5cc3cca693051a7e24dfa45f 100644
--- a/easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-ictce-4.0.6.eb
@@ -17,8 +17,8 @@ source_urls = ['http://pkgconfig.freedesktop.org/releases/']
 configopts = " --with-internal-glib"
 
 sanity_check_paths = {
-                      'files': ['bin/pkg-config'],
-                      'dirs': []
-                     }
+    'files': ['bin/pkg-config'],
+    'dirs': []
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-ictce-5.3.0.eb b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-ictce-5.3.0.eb
index d9c51d2da3b241677f63ef94e845ac05eb0bde6f..206bdee24407f8e0c7b95be60f7f184b690e78cb 100644
--- a/easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-ictce-5.3.0.eb
@@ -18,8 +18,8 @@ source_urls = ['http://pkgconfig.freedesktop.org/releases/']
 configopts = " --with-internal-glib"
 
 sanity_check_paths = {
-                      'files': ['bin/pkg-config'],
-                      'dirs': []
-                     }
+    'files': ['bin/pkg-config'],
+    'dirs': []
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-ictce-5.5.0.eb b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-ictce-5.5.0.eb
index 927b413c4e73765ba50895e422d563c7858b16ae..fee25e4441373b4bd33a2cbc1da44a0976f4b45e 100644
--- a/easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-ictce-5.5.0.eb
@@ -20,8 +20,8 @@ source_urls = ['http://pkgconfig.freedesktop.org/releases/']
 configopts = " --with-internal-glib"
 
 sanity_check_paths = {
-                      'files': ['bin/pkg-config'],
-                      'dirs': []
-                     }
+    'files': ['bin/pkg-config'],
+    'dirs': []
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/pkg-config/pkg-config-0.28-GCC-4.8.2.eb b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.28-GCC-4.8.2.eb
index fa19c90773732451f403b9469d11336b9702d46c..b4996e7af35594a442f250ed7216ad9956a97e00 100644
--- a/easybuild/easyconfigs/p/pkg-config/pkg-config-0.28-GCC-4.8.2.eb
+++ b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.28-GCC-4.8.2.eb
@@ -20,8 +20,8 @@ source_urls = ['http://pkgconfig.freedesktop.org/releases/']
 configopts = " --with-internal-glib"
 
 sanity_check_paths = {
-                      'files': ['bin/pkg-config'],
-                      'dirs': []
-                     }
+    'files': ['bin/pkg-config'],
+    'dirs': []
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/pkg-config/pkg-config-0.28-ictce-5.5.0.eb b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.28-ictce-5.5.0.eb
index 309549fb3b4e0ff1e37a958b674aabd932d48aef..7c85168da3f6be663efeaad3e125e139b0af5f44 100644
--- a/easybuild/easyconfigs/p/pkg-config/pkg-config-0.28-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.28-ictce-5.5.0.eb
@@ -20,8 +20,8 @@ source_urls = ['http://pkgconfig.freedesktop.org/releases/']
 configopts = " --with-internal-glib"
 
 sanity_check_paths = {
-                      'files': ['bin/pkg-config'],
-                      'dirs': []
-                     }
+    'files': ['bin/pkg-config'],
+    'dirs': []
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/popt/popt-1.14-GCC-4.8.2.eb b/easybuild/easyconfigs/p/popt/popt-1.14-GCC-4.8.2.eb
index 0b1a4ed316b77439698d51fe51d735e503293ca8..46a0db16f709ad7c5545ba36e5e0410ac452b53f 100644
--- a/easybuild/easyconfigs/p/popt/popt-1.14-GCC-4.8.2.eb
+++ b/easybuild/easyconfigs/p/popt/popt-1.14-GCC-4.8.2.eb
@@ -14,7 +14,7 @@ sources = [SOURCE_TAR_GZ]
 sanity_check_paths = {
     'files': ['include/popt.h',
              ('lib/libpopt.a',  'lib64/libpopt.a'),
-             ('lib/libpopt.so', 'lib64/libpopt.so')],
+             ('lib/libpopt.%s' % SHLIB_EXT, 'lib64/libpopt.%s' % SHLIB_EXT)],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/p/popt/popt-1.14-iccifort-2015.1.133.eb b/easybuild/easyconfigs/p/popt/popt-1.14-iccifort-2015.1.133.eb
index 5a0c5612917e4a6f9a699defe6e09868741cf4fe..24a941cf28cf4e61439ca6a6e96a85f846ba7669 100644
--- a/easybuild/easyconfigs/p/popt/popt-1.14-iccifort-2015.1.133.eb
+++ b/easybuild/easyconfigs/p/popt/popt-1.14-iccifort-2015.1.133.eb
@@ -5,7 +5,7 @@ version = '1.14'
 
 homepage = "http://freecode.com/projects/popt"
 description = """Popt is a C library for parsing command line parameters."""
-toolchain = {'name': 'iccifort', 'version': '2015.1.133'} 
+toolchain = {'name': 'iccifort', 'version': '2015.1.133'}
 
 
 source_urls = ['http://rpm5.org/files/popt/']
@@ -14,7 +14,7 @@ sources = [SOURCE_TAR_GZ]
 sanity_check_paths = {
     'files': ['include/popt.h',
              ('lib/libpopt.a',  'lib64/libpopt.a'),
-             ('lib/libpopt.so', 'lib64/libpopt.so')],
+             ('lib/libpopt.%s' % SHLIB_EXT, 'lib64/libpopt.%s' % SHLIB_EXT)],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/p/popt/popt-1.16-GCC-4.9.2.eb b/easybuild/easyconfigs/p/popt/popt-1.16-GCC-4.9.2.eb
index a64a52cc7ff76355ec8b74e2786b41454e6254d7..07519cbd9a9c93889a94493de007b5fe1e3bd95c 100644
--- a/easybuild/easyconfigs/p/popt/popt-1.16-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/p/popt/popt-1.16-GCC-4.9.2.eb
@@ -1,7 +1,7 @@
 easyblock = 'ConfigureMake'
 
 name = 'popt'
-version = "1.16" 
+version = "1.16"
 
 homepage = "http://freecode.com/projects/popt"
 description = """Popt is a C library for parsing command line parameters."""
@@ -16,7 +16,7 @@ toolchainopts = {'optarch': False}
 sanity_check_paths = {
     'files': ['include/popt.h',
              ('lib/libpopt.a',  'lib64/libpopt.a'),
-             ('lib/libpopt.so', 'lib64/libpopt.so')],
+             ('lib/libpopt.%s' % SHLIB_EXT, 'lib64/libpopt.%s' % SHLIB_EXT)],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/p/pscom/pscom-5.0.43-GCC-4.8.2.eb b/easybuild/easyconfigs/p/pscom/pscom-5.0.43-GCC-4.8.2.eb
index 1c59dd3dd2dcfa4da0c4aba1a6e203e1e9351ce7..65a73afe7df4b82ac028ab13111d788786832470 100644
--- a/easybuild/easyconfigs/p/pscom/pscom-5.0.43-GCC-4.8.2.eb
+++ b/easybuild/easyconfigs/p/pscom/pscom-5.0.43-GCC-4.8.2.eb
@@ -15,7 +15,7 @@ sources = ['%(version)s-1.zip']
 dependencies = [('popt', '1.14')]
 
 sanity_check_paths = {
-    'files': ['include/pscom.h', ('lib/libpscom.so', 'lib64/libpscom.so')],
+    'files': ['include/pscom.h', ('lib/libpscom.%s' % SHLIB_EXT, 'lib64/libpscom.%s' % SHLIB_EXT)],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/p/pscom/pscom-5.0.44-1-GCC-4.9.2.eb b/easybuild/easyconfigs/p/pscom/pscom-5.0.44-1-GCC-4.9.2.eb
index dfe678ff567869e10d0180b48dd7579c1c18e92f..605259b37f3e57acc9f76de99eab9453aa89d348 100644
--- a/easybuild/easyconfigs/p/pscom/pscom-5.0.44-1-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/p/pscom/pscom-5.0.44-1-GCC-4.9.2.eb
@@ -13,7 +13,7 @@ dependencies = [('popt', '1.16')]
 
 
 sanity_check_paths = {
-      'files': ['include/pscom.h', ('lib/libpscom.so', 'lib64/libpscom.so')],
+      'files': ['include/pscom.h', ('lib/libpscom.%s' % SHLIB_EXT, 'lib64/libpscom.%s' % SHLIB_EXT)],
       'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/p/pscom/pscom-5.0.44-1-iccifort-2015.1.133.eb b/easybuild/easyconfigs/p/pscom/pscom-5.0.44-1-iccifort-2015.1.133.eb
index 3e93e9239a3d70f4b376792b8d92cd980d1811b7..3b463debfce745c731f036ae4755152a8dc21fb0 100644
--- a/easybuild/easyconfigs/p/pscom/pscom-5.0.44-1-iccifort-2015.1.133.eb
+++ b/easybuild/easyconfigs/p/pscom/pscom-5.0.44-1-iccifort-2015.1.133.eb
@@ -4,7 +4,7 @@ name = 'pscom'
 version = '5.0.44-1'
 homepage = 'http://www.par-tec.com'
 description = """ParaStation is a robust and efficient cluster middleware, consisting of a high-performance communication layer (MPI) and a sophisticated management layer."""
-toolchain = {'name': 'iccifort', 'version': '2015.1.133'} 
+toolchain = {'name': 'iccifort', 'version': '2015.1.133'}
 
 
 source_urls = ['https://github.com/ParaStation/%(name)s/archive/']
@@ -13,7 +13,7 @@ sources = ['%(version)s.zip']
 dependencies = [('popt', '1.14')]
 
 sanity_check_paths = {
-      'files': ['include/pscom.h', ('lib/libpscom.so', 'lib64/libpscom.so')],
+      'files': ['include/pscom.h', ('lib/libpscom.%s' % SHLIB_EXT, 'lib64/libpscom.%s' % SHLIB_EXT)],
       'dirs': [],
 }
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/p/psmpi/psmpi-5.1.0-1-GCC-4.9.2.eb b/easybuild/easyconfigs/p/psmpi/psmpi-5.1.0-1-GCC-4.9.2.eb
index c310b1fc807c1ce68f8252a762add35bb5684329..d99677edc9af1fc1cc95f156b31ec5e9d31b8329 100644
--- a/easybuild/easyconfigs/p/psmpi/psmpi-5.1.0-1-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/p/psmpi/psmpi-5.1.0-1-GCC-4.9.2.eb
@@ -8,10 +8,14 @@ description = """ParaStation MPI as part of the ParaStationV5 cluster suite prov
 
 toolchain = {'name': 'GCC', 'version': '4.9.2'}
 
-sources = ['%(version)s.tar.gz',
-	'openpa-1.0.4.tar.gz']
-source_urls = ['https://github.com/ParaStation/psmpi2/archive/'
-	    ,'https://trac.mpich.org/projects/openpa/raw-attachment/wiki/Downloads/']
+sources = [
+    '%(version)s.tar.gz',
+    'openpa-1.0.4.tar.gz',
+]
+source_urls = [
+    'https://github.com/ParaStation/psmpi2/archive/',
+    'https://trac.mpich.org/projects/openpa/raw-attachment/wiki/Downloads/',
+]
 
 # MPICH configure wants F90/F90FLAGS to be renamed to FC/FCFLAGS.
 preconfigopts = 'export FC="$F90"; export FCFLAGS="$F90FLAGS"; unset F90; unset F90FLAGS; '
@@ -25,17 +29,17 @@ dependencies = [('pscom' , '5.0.44-1')]
 
 
 sanity_check_paths = {
-	'files': ['bin/mpicc', 'bin/mpicxx', 'bin/mpic++', 'bin/mpif77', 'bin/mpif90',
-	'include/mpi.h', 'include/mpi.mod', 'include/mpif.h',
-	('lib/libfmpich.a', 'lib64/libfmpich.a'),
-	('lib/libfmpich.so', 'lib64/libfmpich.so'),
-	('lib/libmpich.a', 'lib64/libmpich.a'),
-	('lib/libmpich.so', 'lib64/libmpich.so'),
-	('lib/libmpichcxx.a', 'lib64/libmpichcxx.a'),
-	('lib/libmpichcxx.so', 'lib64/libmpichcxx.so'),
-	('lib/libmpichf90.a', 'lib64/libmpichf90.a'),
-	('lib/libmpichf90.so', 'lib64/libmpichf90.so')],
-	'dirs': [],
+    'files': ['bin/mpicc', 'bin/mpicxx', 'bin/mpic++', 'bin/mpif77', 'bin/mpif90',
+              'include/mpi.h', 'include/mpi.mod', 'include/mpif.h',
+              ('lib/libfmpich.a', 'lib64/libfmpich.a'),
+              ('lib/libfmpich.%s' % SHLIB_EXT, 'lib64/libfmpich.%s' % SHLIB_EXT),
+              ('lib/libmpich.a', 'lib64/libmpich.a'),
+              ('lib/libmpich.%s' % SHLIB_EXT, 'lib64/libmpich.%s' % SHLIB_EXT),
+              ('lib/libmpichcxx.a', 'lib64/libmpichcxx.a'),
+              ('lib/libmpichcxx.%s' % SHLIB_EXT, 'lib64/libmpichcxx.%s' % SHLIB_EXT),
+              ('lib/libmpichf90.a', 'lib64/libmpichf90.a'),
+              ('lib/libmpichf90.%s' % SHLIB_EXT, 'lib64/libmpichf90.%s' % SHLIB_EXT)],
+    'dirs': [],
 }
 
 
diff --git a/easybuild/easyconfigs/p/psmpi/psmpi-5.1.0-1-iccifort-2015.1.133.eb b/easybuild/easyconfigs/p/psmpi/psmpi-5.1.0-1-iccifort-2015.1.133.eb
index 2989b452c198dec2813d48ce1063c317144e8296..fc50026e3c62ea98defd58d990aee339c42076dd 100644
--- a/easybuild/easyconfigs/p/psmpi/psmpi-5.1.0-1-iccifort-2015.1.133.eb
+++ b/easybuild/easyconfigs/p/psmpi/psmpi-5.1.0-1-iccifort-2015.1.133.eb
@@ -8,10 +8,14 @@ description = """ParaStation MPI as part of the ParaStationV5 cluster suite prov
 
 toolchain = {'name': 'iccifort', 'version': '2015.1.133'}
 
-sources = ['%(version)s.tar.gz',
-	'openpa-1.0.4.tar.gz']
-source_urls = ['https://github.com/ParaStation/psmpi2/archive/'
-	    ,'https://trac.mpich.org/projects/openpa/attachment/wiki/Downloads']
+sources = [
+    '%(version)s.tar.gz',
+    'openpa-1.0.4.tar.gz',
+]
+source_urls = [
+    'https://github.com/ParaStation/psmpi2/archive/',
+    'https://trac.mpich.org/projects/openpa/attachment/wiki/Downloads',
+]
 
 # MPICH configure wants F90/F90FLAGS to be renamed to FC/FCFLAGS.
 preconfigopts = 'export FC="$F90"; export FCFLAGS="$F90FLAGS"; unset F90; unset F90FLAGS; '
@@ -23,17 +27,17 @@ dependencies = [('pscom' , '5.0.44-1')]
 
 
 sanity_check_paths = {
-	'files': ['bin/mpicc', 'bin/mpicxx', 'bin/mpic++', 'bin/mpif77', 'bin/mpif90',
-	'include/mpi.h', 'include/mpi.mod', 'include/mpif.h',
-	('lib/libfmpich.a', 'lib64/libfmpich.a'),
-	('lib/libfmpich.so', 'lib64/libfmpich.so'),
-	('lib/libmpich.a', 'lib64/libmpich.a'),
-	('lib/libmpich.so', 'lib64/libmpich.so'),
-	('lib/libmpichcxx.a', 'lib64/libmpichcxx.a'),
-	('lib/libmpichcxx.so', 'lib64/libmpichcxx.so'),
-	('lib/libmpichf90.a', 'lib64/libmpichf90.a'),
-	('lib/libmpichf90.so', 'lib64/libmpichf90.so')],
-	'dirs': [],
+    'files': ['bin/mpicc', 'bin/mpicxx', 'bin/mpic++', 'bin/mpif77', 'bin/mpif90',
+              'include/mpi.h', 'include/mpi.mod', 'include/mpif.h',
+              ('lib/libfmpich.a', 'lib64/libfmpich.a'),
+              ('lib/libfmpich.%s' % SHLIB_EXT, 'lib64/libfmpich.%s' % SHLIB_EXT),
+              ('lib/libmpich.a', 'lib64/libmpich.a'),
+              ('lib/libmpich.%s' % SHLIB_EXT, 'lib64/libmpich.%s' % SHLIB_EXT),
+              ('lib/libmpichcxx.a', 'lib64/libmpichcxx.a'),
+              ('lib/libmpichcxx.%s' % SHLIB_EXT, 'lib64/libmpichcxx.%s' % SHLIB_EXT),
+              ('lib/libmpichf90.a', 'lib64/libmpichf90.a'),
+              ('lib/libmpichf90.%s' % SHLIB_EXT, 'lib64/libmpichf90.%s' % SHLIB_EXT)],
+    'dirs': [],
 }
 
 moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/p/psmpi2/psmpi2-5.0.29-GCC-4.8.2-mt.eb b/easybuild/easyconfigs/p/psmpi2/psmpi2-5.0.29-GCC-4.8.2-mt.eb
index 86c6b1c0045cb906be044849c2d1df9940f1fa49..d7fb1e75ef2509316ff78e6ef426798f413264c5 100644
--- a/easybuild/easyconfigs/p/psmpi2/psmpi2-5.0.29-GCC-4.8.2-mt.eb
+++ b/easybuild/easyconfigs/p/psmpi2/psmpi2-5.0.29-GCC-4.8.2-mt.eb
@@ -33,16 +33,16 @@ prebuildopts = "echo '%(version)s-1' > VERSION && "
 preinstallopts = prebuildopts
 
 sanity_check_paths = {
-    'files': ['bin/mpicc', 'bin/mpicxx', 'bin/mpic++', 'bin/mpif77', 'bin/mpif90', 
-              'include/mpi.h', 'include/mpi.mod', 'include/mpif.h', 
+    'files': ['bin/mpicc', 'bin/mpicxx', 'bin/mpic++', 'bin/mpif77', 'bin/mpif90',
+              'include/mpi.h', 'include/mpi.mod', 'include/mpif.h',
               ('lib/libfmpich.a',    'lib64/libfmpich.a'),
-              ('lib/libfmpich.so',   'lib64/libfmpich.so'),
+              ('lib/libfmpich.%s' % SHLIB_EXT,   'lib64/libfmpich.%s' % SHLIB_EXT),
               ('lib/libmpich.a',     'lib64/libmpich.a'),
-              ('lib/libmpich.so',    'lib64/libmpich.so'),
+              ('lib/libmpich.%s' % SHLIB_EXT,    'lib64/libmpich.%s' % SHLIB_EXT),
               ('lib/libmpichcxx.a',  'lib64/libmpichcxx.a'),
-              ('lib/libmpichcxx.so', 'lib64/libmpichcxx.so'),
+              ('lib/libmpichcxx.%s' % SHLIB_EXT, 'lib64/libmpichcxx.%s' % SHLIB_EXT),
               ('lib/libmpichf90.a',  'lib64/libmpichf90.a'),
-              ('lib/libmpichf90.so', 'lib64/libmpichf90.so')],
+              ('lib/libmpichf90.%s' % SHLIB_EXT, 'lib64/libmpichf90.%s' % SHLIB_EXT)],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/p/psmpi2/psmpi2-5.0.29-GCC-4.8.2.eb b/easybuild/easyconfigs/p/psmpi2/psmpi2-5.0.29-GCC-4.8.2.eb
index a095dc02b4ed17685ef776a07dd1be60ab969e6d..9c3dd66c7737eff336303c41ada3255e237aefc8 100644
--- a/easybuild/easyconfigs/p/psmpi2/psmpi2-5.0.29-GCC-4.8.2.eb
+++ b/easybuild/easyconfigs/p/psmpi2/psmpi2-5.0.29-GCC-4.8.2.eb
@@ -32,16 +32,16 @@ prebuildopts = "echo '%(version)s-1' > VERSION && "
 preinstallopts = prebuildopts
 
 sanity_check_paths = {
-    'files': ['bin/mpicc', 'bin/mpicxx', 'bin/mpic++', 'bin/mpif77', 'bin/mpif90', 
-              'include/mpi.h', 'include/mpi.mod', 'include/mpif.h', 
+    'files': ['bin/mpicc', 'bin/mpicxx', 'bin/mpic++', 'bin/mpif77', 'bin/mpif90',
+              'include/mpi.h', 'include/mpi.mod', 'include/mpif.h',
               ('lib/libfmpich.a',    'lib64/libfmpich.a'),
-              ('lib/libfmpich.so',   'lib64/libfmpich.so'),
+              ('lib/libfmpich.%s' % SHLIB_EXT,   'lib64/libfmpich.%s' % SHLIB_EXT),
               ('lib/libmpich.a',     'lib64/libmpich.a'),
-              ('lib/libmpich.so',    'lib64/libmpich.so'),
+              ('lib/libmpich.%s' % SHLIB_EXT,    'lib64/libmpich.%s' % SHLIB_EXT),
               ('lib/libmpichcxx.a',  'lib64/libmpichcxx.a'),
-              ('lib/libmpichcxx.so', 'lib64/libmpichcxx.so'),
+              ('lib/libmpichcxx.%s' % SHLIB_EXT, 'lib64/libmpichcxx.%s' % SHLIB_EXT),
               ('lib/libmpichf90.a',  'lib64/libmpichf90.a'),
-              ('lib/libmpichf90.so', 'lib64/libmpichf90.so')],
+              ('lib/libmpichf90.%s' % SHLIB_EXT, 'lib64/libmpichf90.%s' % SHLIB_EXT)],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/p/pyTables/pyTables-3.2.2-fix-libs.patch b/easybuild/easyconfigs/p/pyTables/pyTables-3.2.2-fix-libs.patch
new file mode 100644
index 0000000000000000000000000000000000000000..08b67b94daa6077d03a438f9e1bf1141ba2721ac
--- /dev/null
+++ b/easybuild/easyconfigs/p/pyTables/pyTables-3.2.2-fix-libs.patch
@@ -0,0 +1,17 @@
+# pyTables expects that LIBS is a list of library names and will add
+# a -l by itself.
+# ward.poelmans@ugent.be
+diff -ur PyTables-v.3.2.2/setup.py PyTables-v.3.2.2.new/setup.py
+--- PyTables-v.3.2.2/setup.py   2015-09-22 05:54:51.000000000 +0200
++++ PyTables-v.3.2.2.new/setup.py       2016-01-11 15:38:07.512454000 +0100
+@@ -433,6 +433,10 @@
+ # is not a good idea.
+ CFLAGS = os.environ.get('CFLAGS', '').split()
+ LIBS = os.environ.get('LIBS', '').split()
++for idx, lib in enumerate(LIBS):
++    if lib.startswith("-l"):
++        LIBS[idx] = lib.replace("-l", "")
++
+ # We start using pkg-config since some distributions are putting HDF5
+ # (and possibly other libraries) in exotic locations.  See issue #442.
+ if distutils.spawn.find_executable(PKG_CONFIG):
diff --git a/easybuild/easyconfigs/p/pyTables/pyTables-3.2.2-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/p/pyTables/pyTables-3.2.2-intel-2015b-Python-2.7.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c7500dde1e317bc1a9fe958c1b870f7fbb7f5ccd
--- /dev/null
+++ b/easybuild/easyconfigs/p/pyTables/pyTables-3.2.2-intel-2015b-Python-2.7.10.eb
@@ -0,0 +1,42 @@
+easyblock = "PythonPackage"
+
+name = 'pyTables'
+version = '3.2.2'
+
+homepage = 'http://www.pytables.org'
+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': 'intel', 'version': '2015b'}
+toolchainopts = {'usempi': True}
+
+source_urls = ['https://github.com/PyTables/PyTables/archive/']
+sources = ['v.%(version)s.tar.gz']
+
+patches = ['pyTables-%(version)s-fix-libs.patch']
+
+python = 'Python'
+pythonver = '2.7.10'
+pythonshortver = '.'.join(pythonver.split('.')[0:2])
+versionsuffix = '-%s-%s' % (python, pythonver)
+
+dependencies = [
+    (python, pythonver),
+    ('numpy', '1.10.4', versionsuffix),
+    ('numexpr', '2.4.6', versionsuffix),
+    ('HDF5', '1.8.13'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in ['pt2to3', 'ptdump', 'ptrepack']],
+    'dirs': ['lib/python%s/site-packages' % pythonshortver],
+}
+
+options = {'modulename': 'tables'}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/p/pycosat/pycosat-0.6.1-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/p/pycosat/pycosat-0.6.1-intel-2015b-Python-2.7.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..cea252567b519f62ecc304bbcb174c378599f761
--- /dev/null
+++ b/easybuild/easyconfigs/p/pycosat/pycosat-0.6.1-intel-2015b-Python-2.7.10.eb
@@ -0,0 +1,29 @@
+easyblock = 'PythonPackage'
+
+name = 'pycosat'
+version = '0.6.1'
+
+homepage = 'https://pypi.python.org/pypi/pycosat'
+description = """pycosat provides efficient Python bindings to picosat on the C level, i.e. when importing pycosat,
+ the picosat solver becomes part of the Python process itself."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+python = 'Python'
+pyver = '2.7.10'
+versionsuffix = '-%s-%s' % (python, pyver)
+
+dependencies = [
+    (python, pyver),
+]
+
+pyshortver = '.'.join(pyver.split('.')[:2])
+sanity_check_paths = {
+    'files': ['lib/python%s/site-packages/pycosat.so' % pyshortver],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/q/Qhull/Qhull-2012.1-ictce-7.1.2.eb b/easybuild/easyconfigs/q/Qhull/Qhull-2012.1-ictce-7.1.2.eb
index 625317ad022b5ae257eea45986813818f1ee4ba7..5c40951ce1f4577e7d338982dc9451ca63ba9f0a 100644
--- a/easybuild/easyconfigs/q/Qhull/Qhull-2012.1-ictce-7.1.2.eb
+++ b/easybuild/easyconfigs/q/Qhull/Qhull-2012.1-ictce-7.1.2.eb
@@ -23,7 +23,7 @@ patches = [
 builddependencies = [('CMake', '2.8.12')]
 
 sanity_check_paths = {
-    'files': ['bin/qhull', 'lib/libqhull.so', 'lib/pkgconfig/qhull.pc'],
+    'files': ['bin/qhull', 'lib/libqhull.%s' % SHLIB_EXT, 'lib/pkgconfig/qhull.pc'],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/q/Qhull/Qhull-2012.1-intel-2014b.eb b/easybuild/easyconfigs/q/Qhull/Qhull-2012.1-intel-2014b.eb
index 617a67c44d822dcbaf051b343a83b26b5c14e888..a562fe39d80732810c74d125bb3ce62724c0e385 100644
--- a/easybuild/easyconfigs/q/Qhull/Qhull-2012.1-intel-2014b.eb
+++ b/easybuild/easyconfigs/q/Qhull/Qhull-2012.1-intel-2014b.eb
@@ -23,7 +23,7 @@ patches = [
 builddependencies = [('CMake', '2.8.12')]
 
 sanity_check_paths = {
-    'files': ['bin/qhull', 'lib/libqhull.so', 'lib/pkgconfig/qhull.pc'],
+    'files': ['bin/qhull', 'lib/libqhull.%s' % SHLIB_EXT, 'lib/pkgconfig/qhull.pc'],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/q/Qhull/Qhull-2012.1-intel-2015a.eb b/easybuild/easyconfigs/q/Qhull/Qhull-2012.1-intel-2015a.eb
index 1488f628fe22f7f0fcab3b1a6e1607a6eaa497a2..78effcbf0be5eac13eb155ccce08f8ee39e480f3 100644
--- a/easybuild/easyconfigs/q/Qhull/Qhull-2012.1-intel-2015a.eb
+++ b/easybuild/easyconfigs/q/Qhull/Qhull-2012.1-intel-2015a.eb
@@ -23,7 +23,7 @@ patches = [
 builddependencies = [('CMake', '3.2.1', '', ('GCC', '4.9.2'))]
 
 sanity_check_paths = {
-    'files': ['bin/qhull', 'lib/libqhull.so', 'lib/pkgconfig/qhull.pc'],
+    'files': ['bin/qhull', 'lib/libqhull.%s' % SHLIB_EXT, 'lib/pkgconfig/qhull.pc'],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/q/Qhull/Qhull-2012.1-intel-2015b.eb b/easybuild/easyconfigs/q/Qhull/Qhull-2012.1-intel-2015b.eb
index 8544695ac424bffdea87d314db759609d270c708..d232942c8a3d4ddc1a70ccca3c8e68eed4724720 100644
--- a/easybuild/easyconfigs/q/Qhull/Qhull-2012.1-intel-2015b.eb
+++ b/easybuild/easyconfigs/q/Qhull/Qhull-2012.1-intel-2015b.eb
@@ -23,7 +23,7 @@ patches = [
 builddependencies = [('CMake', '3.2.1', '', ('GNU', '4.9.3-2.25'))]
 
 sanity_check_paths = {
-    'files': ['bin/qhull', 'lib/libqhull.so', 'lib/pkgconfig/qhull.pc'],
+    'files': ['bin/qhull', 'lib/libqhull.%s' % SHLIB_EXT, 'lib/pkgconfig/qhull.pc'],
     'dirs': [],
 }
 
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 6abe0d811d8c00c835f93de23f247811415d9769..5406e997c6187a026e46f24878fbdb5d9767df68 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
@@ -4,7 +4,7 @@ version = '4.8.5'
 homepage = 'http://qt.io/'
 description = "Qt is a comprehensive cross-platform C++ application framework."
 
-toolchain = {'name': 'gmpolf', 'version': '1.4.8'} 
+toolchain = {'name': 'gmpolf', 'version': '1.4.8'}
 
 source_urls = [
     'http://download.qt.io/official_releases/qt/%(version_major_minor)s/%(version)s/',
@@ -17,7 +17,7 @@ dependencies = [('GLib', '2.34.3')]
 configopts="-confirm-license -opensource -silent"
 
 sanity_check_paths = {
-    'files': ['lib/libQtCore.so'],
-	 'dirs': [],
+    'files': ['lib/libQtCore.%s' % SHLIB_EXT],
+    'dirs': [],
 }
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.5-goolf-1.5.14.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.5-goolf-1.5.14.eb
index 7bcfcdfee8aa4c73f770b512c2d457e0df2a0369..c5c6c8344b447215cee434043b5cba839e44bb2c 100644
--- a/easybuild/easyconfigs/q/Qt/Qt-4.8.5-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.5-goolf-1.5.14.eb
@@ -4,7 +4,7 @@ version = '4.8.5'
 homepage = 'http://qt.io/'
 description = "Qt is a comprehensive cross-platform C++ application framework."
 
-toolchain = {'name': 'goolf', 'version': '1.5.14'} 
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
 
 source_urls = [
     'http://download.qt.io/official_releases/qt/%(version_major_minor)s/%(version)s/',
@@ -17,7 +17,7 @@ dependencies = [('GLib', '2.34.3')]
 configopts="-confirm-license -opensource -silent"
 
 sanity_check_paths = {
-    'files': ['lib/libQtCore.so'],
-	 'dirs': [],
+    'files': ['lib/libQtCore.%s' % SHLIB_EXT],
+    'dirs': [],
 }
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.7-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.7-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9f56d8e9fbf5ac7e29a754f288ada979ec2511af
--- /dev/null
+++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.7-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,25 @@
+name = 'Qt'
+version = '4.8.7'
+versionsuffix = '-Python-2.7.11'
+
+homepage = 'http://qt.io/'
+description = "Qt is a comprehensive cross-platform C++ application framework."
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = [
+    'http://download.qt.io/official_releases/qt/%(version_major_minor)s/%(version)s/',
+    'http://download.qt.io/archive/qt/%(version_major_minor)s/%(version)s/'
+]
+sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz']
+
+patches = ['Qt-%(version)s_phonon-export.patch']
+
+dependencies = [
+    ('GLib', '2.46.0'),
+    ('libX11', '1.6.3', versionsuffix),
+    ('libXt', '1.1.5', versionsuffix),
+    ('libXrender', '0.9.9', versionsuffix),
+]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/q/Qt5/Qt5-5.5.1-intel-2015b-Mesa-11.0.8.eb b/easybuild/easyconfigs/q/Qt5/Qt5-5.5.1-intel-2015b-Mesa-11.0.8.eb
new file mode 100644
index 0000000000000000000000000000000000000000..037b082375beb88b555303f644ce0b2addc1fbd7
--- /dev/null
+++ b/easybuild/easyconfigs/q/Qt5/Qt5-5.5.1-intel-2015b-Mesa-11.0.8.eb
@@ -0,0 +1,43 @@
+easyblock = 'EB_Qt'
+
+name = 'Qt5'
+version = '5.5.1'
+mesaver = '11.0.8'
+versionsuffix = '-Mesa-%s' % mesaver
+
+homepage = 'http://qt.io/'
+description = "Qt is a comprehensive cross-platform C++ application framework."
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = [
+    'http://download.qt.io/official_releases/qt/%(version_major_minor)s/%(version)s/single/',
+    'http://download.qt.io/archive/qt/%(version_major_minor)s/%(version)s/single/'
+]
+sources = ['qt-everywhere-opensource-src-%(version)s.tar.xz']
+
+pysuff = '-Python-2.7.11'
+dependencies = [
+    ('GLib', '2.46.0'),
+    ('libX11', '1.6.3', pysuff),
+    ('libXt', '1.1.5', pysuff),
+    ('libXi', '1.7.4', pysuff),
+    ('xcb-util', '0.4.0', pysuff),
+    ('xcb-util-image', '0.4.0', pysuff),
+    ('xcb-util-keysyms', '0.4.0', pysuff),
+    ('xcb-util-renderutil', '0.3.9', pysuff),
+    ('xcb-util-wm', '0.4.1', pysuff),
+    ('libxkbcommon', '0.5.0', pysuff),
+    ('libXrender', '0.9.9', pysuff),
+    ('fontconfig', '2.11.94'),
+    ('freetype', '2.6.1'),
+    ('libXfixes', '5.0.1'),
+    ('libXcursor', '1.1.14', pysuff),
+    ('libXinerama', '1.1.3', pysuff),
+    ('libXrandr', '1.5.0', pysuff),
+    ('libpng', '1.6.18'),
+    ('Mesa', mesaver, pysuff),
+    ('libGLU', '9.0.0', versionsuffix),
+]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/q/Quip/Quip-1.1.8-GCC-4.8.2.eb b/easybuild/easyconfigs/q/Quip/Quip-1.1.8-GCC-4.8.2.eb
index 1cda3a4011f1d514226ab94990142f4236b9f2ca..e4973548b5d8599d18f6c4bb2e41e7bd60df6181 100644
--- a/easybuild/easyconfigs/q/Quip/Quip-1.1.8-GCC-4.8.2.eb
+++ b/easybuild/easyconfigs/q/Quip/Quip-1.1.8-GCC-4.8.2.eb
@@ -23,7 +23,7 @@ sources = [SOURCELOWER_TAR_GZ]
 source_urls = [homepage]
 
 sanity_check_paths = {
-    'files': ["bin/quip"], 
+    'files': ["bin/quip"],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/q/qtop/qtop-53-1.eb b/easybuild/easyconfigs/q/qtop/qtop-53-1.eb
index c04c0cb73de4a38c2afa8d7df385ff60e5fc9316..1e12105e71b928a341e95219c0fa1cea4f9cc966 100644
--- a/easybuild/easyconfigs/q/qtop/qtop-53-1.eb
+++ b/easybuild/easyconfigs/q/qtop/qtop-53-1.eb
@@ -27,7 +27,7 @@ sources = [SOURCE_TAR_GZ]
 source_urls = [homepage]
 
 sanity_check_paths = {
-    'files': ["qtop"], 
+    'files': ["qtop"],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/r/R-bundle-Bioconductor/R-bundle-Bioconductor-3.1-intel-2015b-R-3.2.1.eb b/easybuild/easyconfigs/r/R-bundle-Bioconductor/R-bundle-Bioconductor-3.1-intel-2015b-R-3.2.1.eb
index 3bf5e2abf4ca7feed7309dc32619918ed060f26f..1a0beb9ba94164d5f5c6ec39bfa65679891c6f23 100644
--- a/easybuild/easyconfigs/r/R-bundle-Bioconductor/R-bundle-Bioconductor-3.1-intel-2015b-R-3.2.1.eb
+++ b/easybuild/easyconfigs/r/R-bundle-Bioconductor/R-bundle-Bioconductor-3.1-intel-2015b-R-3.2.1.eb
@@ -133,6 +133,7 @@ exts_list = [
     ('derfinder', '1.2.1', bioconductor_options),
     ('polyester', '1.4.0', bioconductor_options),
     ('Rsubread', '1.18.0', bioconductor_options),
+    ('pcaMethods', '1.58.0', bioconductor_options),
 ]
 
 modextrapaths = {'R_LIBS': ''}
diff --git a/easybuild/easyconfigs/r/R/R-2.15.2-goalf-1.1.0-no-OFED-bare.eb b/easybuild/easyconfigs/r/R/R-2.15.2-goalf-1.1.0-no-OFED-bare.eb
index d74aef52559ce1e1732c9ab32851444684b7bf1d..da982e4bc509f9fcd7fc119253d38380eff387f4 100644
--- a/easybuild/easyconfigs/r/R/R-2.15.2-goalf-1.1.0-no-OFED-bare.eb
+++ b/easybuild/easyconfigs/r/R/R-2.15.2-goalf-1.1.0-no-OFED-bare.eb
@@ -29,8 +29,8 @@ sanity_check_paths = {
              ['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'],
+             ['lib64/R/modules/%s' % x for x in ['internet.%s' % SHLIB_EXT, 'lapack.%s' % SHLIB_EXT, 'vfonts.%s' % SHLIB_EXT]] +
+             ['lib64/R/lib/libR.%s' % SHLIB_EXT],
     'dirs': []
 }
 
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 d91d0ca1fd74fcc71ba25fec3c243c3ee402447e..576d1be2d27d1e7e2de52dc6a8bf5f69d6ff50d0 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
@@ -26,8 +26,8 @@ sanity_check_paths = {
              ['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'],
+             ['lib64/R/modules/%s' % x for x in ['internet.%s' % SHLIB_EXT, 'lapack.%s' % SHLIB_EXT, 'vfonts.%s' % SHLIB_EXT]] +
+             ['lib64/R/lib/libR.%s' % SHLIB_EXT],
     'dirs': []
 }
 
@@ -42,8 +42,9 @@ ext_options = {
 # Bioconductor packages have a different download url
 bioconductor_options = {
     'source_urls': [
-    	'http://www.bioconductor.org/packages/release/bioc/src/contrib/',
-    	'http://www.bioconductor.org/packages/2.11/bioc/src/contrib/'],
+        'http://www.bioconductor.org/packages/release/bioc/src/contrib/',
+        'http://www.bioconductor.org/packages/2.11/bioc/src/contrib/',
+    ],
     'source_tmpl': name_tmpl,
 }
 # !! order of packages is important !!
diff --git a/easybuild/easyconfigs/r/R/R-2.15.2-goolf-1.4.10-bare.eb b/easybuild/easyconfigs/r/R/R-2.15.2-goolf-1.4.10-bare.eb
index 5a34325876a85479e5564a49e4b7b09f4a1c3fba..b12bc8e75dd03e5b2cd43aa85e88893d53fdcca7 100644
--- a/easybuild/easyconfigs/r/R/R-2.15.2-goolf-1.4.10-bare.eb
+++ b/easybuild/easyconfigs/r/R/R-2.15.2-goolf-1.4.10-bare.eb
@@ -29,8 +29,8 @@ sanity_check_paths = {
              ['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'],
+             ['lib64/R/modules/%s' % x for x in ['internet.%s' % SHLIB_EXT, 'lapack.%s' % SHLIB_EXT, 'vfonts.%s' % SHLIB_EXT]] +
+             ['lib64/R/lib/libR.%s' % SHLIB_EXT],
     'dirs': []
 }
 
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 517c6d157a2c637e40a2e872c3e60536a210b76f..561a883aa500b17e9c741000178385520addb4f7 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
@@ -26,8 +26,8 @@ sanity_check_paths = {
              ['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'],
+             ['lib64/R/modules/%s' % x for x in ['internet.%s' % SHLIB_EXT, 'lapack.%s' % SHLIB_EXT, 'vfonts.%s' % SHLIB_EXT]] +
+             ['lib64/R/lib/libR.%s' % SHLIB_EXT],
     'dirs': []
 }
 
@@ -42,8 +42,9 @@ ext_options = {
 # Bioconductor packages have a different download url
 bioconductor_options = {
     'source_urls': [
-    	'http://www.bioconductor.org/packages/release/bioc/src/contrib/',
-    	'http://www.bioconductor.org/packages/2.11/bioc/src/contrib/'],
+        'http://www.bioconductor.org/packages/release/bioc/src/contrib/',
+        'http://www.bioconductor.org/packages/2.11/bioc/src/contrib/',
+    ],
     'source_tmpl': name_tmpl,
 }
 # !! order of packages is important !!
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 b2152142eb75d140691522fdb1639a06430174cd..661662e5e271a11d9de74e74dbe824839c3781e3 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
@@ -26,8 +26,8 @@ sanity_check_paths = {
              ['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'],
+             ['lib64/R/modules/%s' % x for x in ['internet.%s' % SHLIB_EXT, 'lapack.%s' % SHLIB_EXT, 'vfonts.%s' % SHLIB_EXT]] +
+             ['lib64/R/lib/libR.%s' % SHLIB_EXT],
     'dirs': []
 }
 
@@ -42,8 +42,9 @@ ext_options = {
 # Bioconductor packages have a different download url
 bioconductor_options = {
     'source_urls': [
-    	'http://www.bioconductor.org/packages/release/bioc/src/contrib/',
-    	'http://www.bioconductor.org/packages/2.11/bioc/src/contrib/'],
+        'http://www.bioconductor.org/packages/release/bioc/src/contrib/',
+        'http://www.bioconductor.org/packages/2.11/bioc/src/contrib/',
+    ],
     'source_tmpl': name_tmpl,
 }
 # !! order of packages is important !!
diff --git a/easybuild/easyconfigs/r/R/R-2.15.2-ictce-4.0.6-bare.eb b/easybuild/easyconfigs/r/R/R-2.15.2-ictce-4.0.6-bare.eb
index a61cbb96b53260b943ab8484b92418daf9981cdd..e63fd886baf3d92dc0804ed5001658850c7b7375 100644
--- a/easybuild/easyconfigs/r/R/R-2.15.2-ictce-4.0.6-bare.eb
+++ b/easybuild/easyconfigs/r/R/R-2.15.2-ictce-4.0.6-bare.eb
@@ -29,8 +29,8 @@ sanity_check_paths = {
              ['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'],
+             ['lib64/R/modules/%s' % x for x in ['internet.%s' % SHLIB_EXT, 'lapack.%s' % SHLIB_EXT, 'vfonts.%s' % SHLIB_EXT]] +
+             ['lib64/R/lib/libR.%s' % SHLIB_EXT],
     'dirs': []
 }
 
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 9414cfc682214bbba0707101af740483bbf9df0f..11da9a675a31cd129acd6a0e5bee3015ea3ee224 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
@@ -26,8 +26,8 @@ sanity_check_paths = {
              ['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'],
+             ['lib64/R/modules/%s' % x for x in ['internet.%s' % SHLIB_EXT, 'lapack.%s' % SHLIB_EXT, 'vfonts.%s' % SHLIB_EXT]] +
+             ['lib64/R/lib/libR.%s' % SHLIB_EXT],
     'dirs': []
 }
 
@@ -42,8 +42,9 @@ ext_options = {
 # Bioconductor packages have a different download url
 bioconductor_options = {
     'source_urls': [
-    	'http://www.bioconductor.org/packages/release/bioc/src/contrib/',
-    	'http://www.bioconductor.org/packages/2.11/bioc/src/contrib/'],
+        'http://www.bioconductor.org/packages/release/bioc/src/contrib/',
+        'http://www.bioconductor.org/packages/2.11/bioc/src/contrib/',
+    ],
     'source_tmpl': name_tmpl,
 }
 # !! order of packages is important !!
diff --git a/easybuild/easyconfigs/r/R/R-2.15.2-ictce-5.3.0-bare.eb b/easybuild/easyconfigs/r/R/R-2.15.2-ictce-5.3.0-bare.eb
index c109319f0f1961449f9e024b079c337a67c4114b..d58882331fbc921f830f0c3d73f012b8b1d5e7ee 100644
--- a/easybuild/easyconfigs/r/R/R-2.15.2-ictce-5.3.0-bare.eb
+++ b/easybuild/easyconfigs/r/R/R-2.15.2-ictce-5.3.0-bare.eb
@@ -29,8 +29,8 @@ sanity_check_paths = {
              ['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'],
+             ['lib64/R/modules/%s' % x for x in ['internet.%s' % SHLIB_EXT, 'lapack.%s' % SHLIB_EXT, 'vfonts.%s' % SHLIB_EXT]] +
+             ['lib64/R/lib/libR.%s' % SHLIB_EXT],
     'dirs': []
 }
 
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 4b3f70cab0d2d0b03ec611e5c23b346674bed388..8ba729ce15a2d0ba5e6c857b2a853b28432aa252 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
@@ -26,8 +26,8 @@ sanity_check_paths = {
              ['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'],
+             ['lib64/R/modules/%s' % x for x in ['internet.%s' % SHLIB_EXT, 'lapack.%s' % SHLIB_EXT, 'vfonts.%s' % SHLIB_EXT]] +
+             ['lib64/R/lib/libR.%s' % SHLIB_EXT],
     'dirs': []
 }
 
@@ -42,8 +42,9 @@ ext_options = {
 # Bioconductor packages have a different download url
 bioconductor_options = {
     'source_urls': [
-    	'http://www.bioconductor.org/packages/release/bioc/src/contrib/',
-    	'http://www.bioconductor.org/packages/2.11/bioc/src/contrib/'],
+        'http://www.bioconductor.org/packages/release/bioc/src/contrib/',
+        'http://www.bioconductor.org/packages/2.11/bioc/src/contrib/',
+    ],
     'source_tmpl': name_tmpl,
 }
 # !! order of packages is important !!
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 4434fbdf2a657a68b6b66962ad07ed079d3b5024..dacee352a9e0c3236581f20994d59927720dc466 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
@@ -26,8 +26,8 @@ sanity_check_paths = {
              ['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'],
+             ['lib64/R/modules/%s' % x for x in ['internet.%s' % SHLIB_EXT, 'lapack.%s' % SHLIB_EXT, 'vfonts.%s' % SHLIB_EXT]] +
+             ['lib64/R/lib/libR.%s' % SHLIB_EXT],
     'dirs': []
 }
 
@@ -42,8 +42,9 @@ ext_options = {
 # Bioconductor packages have a different download url
 bioconductor_options = {
     'source_urls': [
-    	'http://www.bioconductor.org/packages/release/bioc/src/contrib/',
-    	'http://www.bioconductor.org/packages/2.12/bioc/src/contrib/'],
+        'http://www.bioconductor.org/packages/release/bioc/src/contrib/',
+        'http://www.bioconductor.org/packages/2.12/bioc/src/contrib/',
+    ],
     'source_tmpl': name_tmpl,
 }
 # !! order of packages is important !!
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 174451bf4401e1e3127f1302e5c91da09aa6e283..e96756b81d78bcea0319b335b3cc7f7803bd5a24 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
@@ -26,8 +26,8 @@ sanity_check_paths = {
              ['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'],
+             ['lib64/R/modules/%s' % x for x in ['internet.%s' % SHLIB_EXT, 'lapack.%s' % SHLIB_EXT, 'vfonts.%s' % SHLIB_EXT]] +
+             ['lib64/R/lib/libR.%s' % SHLIB_EXT],
     'dirs': []
 }
 
@@ -42,8 +42,9 @@ ext_options = {
 # Bioconductor packages have a different download url
 bioconductor_options = {
     'source_urls': [
-    	'http://www.bioconductor.org/packages/release/bioc/src/contrib/',
-    	'http://www.bioconductor.org/packages/2.12/bioc/src/contrib/'],
+        'http://www.bioconductor.org/packages/release/bioc/src/contrib/',
+        'http://www.bioconductor.org/packages/2.12/bioc/src/contrib/',
+    ],
     'source_tmpl': name_tmpl,
 }
 # !! order of packages is important !!
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 cc29570d01a9016120d92e83e38fb77fc0fb36f2..a4ff1fa8818315d1f18d83bb9868b17187926649 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
@@ -26,8 +26,8 @@ sanity_check_paths = {
              ['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'],
+             ['lib64/R/modules/%s' % x for x in ['internet.%s' % SHLIB_EXT, 'lapack.%s' % SHLIB_EXT, 'vfonts.%s' % SHLIB_EXT]] +
+             ['lib64/R/lib/libR.%s' % SHLIB_EXT],
     'dirs': []
 }
 
@@ -42,8 +42,9 @@ ext_options = {
 # Bioconductor packages have a different download url
 bioconductor_options = {
     'source_urls': [
-    	'http://www.bioconductor.org/packages/release/bioc/src/contrib/',
-    	'http://www.bioconductor.org/packages/2.12/bioc/src/contrib/'],
+        'http://www.bioconductor.org/packages/release/bioc/src/contrib/',
+        'http://www.bioconductor.org/packages/2.12/bioc/src/contrib/',
+    ],
     'source_tmpl': name_tmpl,
 }
 # !! order of packages is important !!
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 4b201ba94793d80b7e983ea2c5f46def100dfe38..86f63c2452bc02bbdeb63d281cd155027f33ad3b 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
@@ -26,8 +26,8 @@ sanity_check_paths = {
              ['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'],
+             ['lib64/R/modules/%s' % x for x in ['internet.%s' % SHLIB_EXT, 'lapack.%s' % SHLIB_EXT, 'vfonts.%s' % SHLIB_EXT]] +
+             ['lib64/R/lib/libR.%s' % SHLIB_EXT],
     'dirs': []
 }
 
@@ -42,8 +42,9 @@ ext_options = {
 # Bioconductor packages have a different download url
 bioconductor_options = {
     'source_urls': [
-    	'http://www.bioconductor.org/packages/release/bioc/src/contrib/',
-    	'http://www.bioconductor.org/packages/2.12/bioc/src/contrib/'],
+        'http://www.bioconductor.org/packages/release/bioc/src/contrib/',
+        'http://www.bioconductor.org/packages/2.12/bioc/src/contrib/',
+    ],
     'source_tmpl': name_tmpl,
 }
 # !! order of packages is important !!
diff --git a/easybuild/easyconfigs/r/R/R-3.0.1-goalf-1.1.0-no-OFED-bare.eb b/easybuild/easyconfigs/r/R/R-3.0.1-goalf-1.1.0-no-OFED-bare.eb
index 767049a9d853db63970e382d28445b5f3b883e08..ec86d62dfdfc9574fd469873777285fa0182db3e 100644
--- a/easybuild/easyconfigs/r/R/R-3.0.1-goalf-1.1.0-no-OFED-bare.eb
+++ b/easybuild/easyconfigs/r/R/R-3.0.1-goalf-1.1.0-no-OFED-bare.eb
@@ -29,8 +29,8 @@ sanity_check_paths = {
              ['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'],
+             ['lib64/R/modules/%s' % x for x in ['internet.%s' % SHLIB_EXT, 'lapack.%s' % SHLIB_EXT, 'vfonts.%s' % SHLIB_EXT]] +
+             ['lib64/R/lib/libR.%s' % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/r/R/R-3.0.1-goolf-1.4.10-bare.eb b/easybuild/easyconfigs/r/R/R-3.0.1-goolf-1.4.10-bare.eb
index 074bfe4e4d7403336997bc64badee040e2059ac2..a7f037b0a775d438d8489f10445ae9f8ede50e79 100644
--- a/easybuild/easyconfigs/r/R/R-3.0.1-goolf-1.4.10-bare.eb
+++ b/easybuild/easyconfigs/r/R/R-3.0.1-goolf-1.4.10-bare.eb
@@ -29,8 +29,8 @@ sanity_check_paths = {
              ['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'],
+             ['lib64/R/modules/%s' % x for x in ['internet.%s' % SHLIB_EXT, 'lapack.%s' % SHLIB_EXT, 'vfonts.%s' % SHLIB_EXT]] +
+             ['lib64/R/lib/libR.%s' % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/r/R/R-3.0.1-ictce-4.0.6-bare.eb b/easybuild/easyconfigs/r/R/R-3.0.1-ictce-4.0.6-bare.eb
index 0f91a27e14fbfbfb41431d3863c099794a6f45c3..c26cbbf2684d3a661f94ffa27791422e0172aed1 100644
--- a/easybuild/easyconfigs/r/R/R-3.0.1-ictce-4.0.6-bare.eb
+++ b/easybuild/easyconfigs/r/R/R-3.0.1-ictce-4.0.6-bare.eb
@@ -29,8 +29,8 @@ sanity_check_paths = {
              ['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'],
+             ['lib64/R/modules/%s' % x for x in ['internet.%s' % SHLIB_EXT, 'lapack.%s' % SHLIB_EXT, 'vfonts.%s' % SHLIB_EXT]] +
+             ['lib64/R/lib/libR.%s' % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/r/R/R-3.0.1-ictce-4.1.13-bare.eb b/easybuild/easyconfigs/r/R/R-3.0.1-ictce-4.1.13-bare.eb
index 22abee62210cadc66406d32d1c93ac5f4cd9932f..c7f78728ac958b0f94234bb8617f677d40755643 100644
--- a/easybuild/easyconfigs/r/R/R-3.0.1-ictce-4.1.13-bare.eb
+++ b/easybuild/easyconfigs/r/R/R-3.0.1-ictce-4.1.13-bare.eb
@@ -29,8 +29,8 @@ sanity_check_paths = {
              ['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'],
+             ['lib64/R/modules/%s' % x for x in ['internet.%s' % SHLIB_EXT, 'lapack.%s' % SHLIB_EXT, 'vfonts.%s' % SHLIB_EXT]] +
+             ['lib64/R/lib/libR.%s' % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/r/R/R-3.0.1-ictce-5.3.0-bare.eb b/easybuild/easyconfigs/r/R/R-3.0.1-ictce-5.3.0-bare.eb
index b1ad98874fa349430e12f94086b2a702532dc4e6..c79a8bd4e82de14e33e02d94dc88c757851d3734 100644
--- a/easybuild/easyconfigs/r/R/R-3.0.1-ictce-5.3.0-bare.eb
+++ b/easybuild/easyconfigs/r/R/R-3.0.1-ictce-5.3.0-bare.eb
@@ -29,8 +29,8 @@ sanity_check_paths = {
              ['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'],
+             ['lib64/R/modules/%s' % x for x in ['internet.%s' % SHLIB_EXT, 'lapack.%s' % SHLIB_EXT, 'vfonts.%s' % SHLIB_EXT]] +
+             ['lib64/R/lib/libR.%s' % SHLIB_EXT],
     'dirs': []
 }
 
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
index 5280f5e5c7c20071d99185a090142dbb754d15b0..3c069b9b81e3361e63488de2b7a655a12364b9d9 100644
--- 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
@@ -26,8 +26,8 @@ sanity_check_paths = {
              ['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'],
+             ['lib64/R/modules/%s' % x for x in ['internet.%s' % SHLIB_EXT, 'lapack.%s' % SHLIB_EXT, 'vfonts.%s' % SHLIB_EXT]] +
+             ['lib64/R/lib/libR.%s' % SHLIB_EXT],
     'dirs': []
 }
 
@@ -42,8 +42,9 @@ ext_options = {
 # Bioconductor packages have a different download url
 bioconductor_options = {
     'source_urls': [
-    	'http://www.bioconductor.org/packages/release/bioc/src/contrib/',
-    	'http://www.bioconductor.org/packages/2.13/bioc/src/contrib/'],
+        'http://www.bioconductor.org/packages/release/bioc/src/contrib/',
+        'http://www.bioconductor.org/packages/2.13/bioc/src/contrib/',
+    ],
     'source_tmpl': name_tmpl,
 }
 
diff --git a/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0-bare.eb b/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0-bare.eb
index 0729ff492ebda5b407ea1280948f7d35f16ae464..8d427ebb5dd175b6f4c1ade3ea644da7577763c4 100644
--- a/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0-bare.eb
+++ b/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.3.0-bare.eb
@@ -28,8 +28,8 @@ sanity_check_paths = {
              ['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'],
+             ['lib64/R/modules/%s' % x for x in ['internet.%s' % SHLIB_EXT, 'lapack.%s' % SHLIB_EXT, 'vfonts.%s' % SHLIB_EXT]] +
+             ['lib64/R/lib/libR.%s' % SHLIB_EXT],
     'dirs': []
 }
 
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 8fababc35894f07a670966ee06bee0af35d74d1a..b2aa05899780218aae3e7150d360895c065804dd 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
@@ -26,8 +26,8 @@ sanity_check_paths = {
              ['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'],
+             ['lib64/R/modules/%s' % x for x in ['internet.%s' % SHLIB_EXT, 'lapack.%s' % SHLIB_EXT, 'vfonts.%s' % SHLIB_EXT]] +
+             ['lib64/R/lib/libR.%s' % SHLIB_EXT],
     'dirs': []
 }
 
@@ -42,8 +42,9 @@ ext_options = {
 # Bioconductor packages have a different download url
 bioconductor_options = {
     'source_urls': [
-    	'http://www.bioconductor.org/packages/release/bioc/src/contrib/',
-    	'http://www.bioconductor.org/packages/2.13/bioc/src/contrib/'],
+        'http://www.bioconductor.org/packages/release/bioc/src/contrib/',
+        'http://www.bioconductor.org/packages/2.13/bioc/src/contrib/',
+    ],
     'source_tmpl': name_tmpl,
 }
 
diff --git a/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.5.0.eb b/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.5.0.eb
index 549134c6cc0531791eabfa4078c1a54a69a26bc3..ee87a80c866706bc2fb264641fac3fd34040ec64 100644
--- a/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/r/R/R-3.0.2-ictce-5.5.0.eb
@@ -26,8 +26,8 @@ sanity_check_paths = {
              ['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'],
+             ['lib64/R/modules/%s' % x for x in ['internet.%s' % SHLIB_EXT, 'lapack.%s' % SHLIB_EXT, 'vfonts.%s' % SHLIB_EXT]] +
+             ['lib64/R/lib/libR.%s' % SHLIB_EXT],
     'dirs': []
 }
 
@@ -42,8 +42,9 @@ ext_options = {
 # Bioconductor packages have a different download url
 bioconductor_options = {
     'source_urls': [
-    	'http://www.bioconductor.org/packages/release/bioc/src/contrib/',
-    	'http://www.bioconductor.org/packages/2.13/bioc/src/contrib/'],
+        'http://www.bioconductor.org/packages/release/bioc/src/contrib/',
+        'http://www.bioconductor.org/packages/2.13/bioc/src/contrib/',
+    ],
     'source_tmpl': name_tmpl,
 }
 
diff --git a/easybuild/easyconfigs/r/R/R-3.1.0-ictce-5.5.0.eb b/easybuild/easyconfigs/r/R/R-3.1.0-ictce-5.5.0.eb
index e7c9c708cc66cb7322acc0a8e520e58144ceff2d..516a650ab376d4fca134ff3161145268634e75e3 100644
--- a/easybuild/easyconfigs/r/R/R-3.1.0-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/r/R/R-3.1.0-ictce-5.5.0.eb
@@ -32,8 +32,9 @@ ext_options = {
 # Bioconductor packages have a different download url
 bioconductor_options = {
     'source_urls': [
-    	'http://www.bioconductor.org/packages/release/bioc/src/contrib/',
-    	'http://www.bioconductor.org/packages/2.14/bioc/src/contrib/'],
+        'http://www.bioconductor.org/packages/release/bioc/src/contrib/',
+        'http://www.bioconductor.org/packages/2.14/bioc/src/contrib/',
+    ],
     'source_tmpl': name_tmpl,
 }
 # !! order of packages is important !!
diff --git a/easybuild/easyconfigs/r/R/R-3.1.1-ictce-6.2.5-bare-mt.eb b/easybuild/easyconfigs/r/R/R-3.1.1-ictce-6.2.5-bare-mt.eb
index 10cfd0f2dca745fe023fa2e721c54fef05938f43..31222cc1f7cb04d4daef9b7728fb4704f7c20c0f 100644
--- a/easybuild/easyconfigs/r/R/R-3.1.1-ictce-6.2.5-bare-mt.eb
+++ b/easybuild/easyconfigs/r/R/R-3.1.1-ictce-6.2.5-bare-mt.eb
@@ -31,8 +31,8 @@ sanity_check_paths = {
              ['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'],
+             ['lib64/R/modules/%s' % x for x in ['internet.%s' % SHLIB_EXT, 'lapack.%s' % SHLIB_EXT, 'vfonts.%s' % SHLIB_EXT]] +
+             ['lib64/R/lib/libR.%s' % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/r/R/R-3.1.1-ictce-6.2.5-default-mt.eb b/easybuild/easyconfigs/r/R/R-3.1.1-ictce-6.2.5-default-mt.eb
index 84b9a7bb033b553948e0716b3f4f4aba7ef06679..866b40ba8180c1e122242c636fa082869de58253 100644
--- a/easybuild/easyconfigs/r/R/R-3.1.1-ictce-6.2.5-default-mt.eb
+++ b/easybuild/easyconfigs/r/R/R-3.1.1-ictce-6.2.5-default-mt.eb
@@ -28,8 +28,8 @@ sanity_check_paths = {
              ['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'],
+             ['lib64/R/modules/%s' % x for x in ['internet.%s' % SHLIB_EXT, 'lapack.%s' % SHLIB_EXT, 'vfonts.%s' % SHLIB_EXT]] +
+             ['lib64/R/lib/libR.%s' % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/r/R/R-3.1.1-ictce-6.3.5-bare-mt.eb b/easybuild/easyconfigs/r/R/R-3.1.1-ictce-6.3.5-bare-mt.eb
index 810f195e932c88de6e6cb2517c61f0b515da67e7..1856c092a2890d1c3a7e12dd872a77dec852a383 100644
--- a/easybuild/easyconfigs/r/R/R-3.1.1-ictce-6.3.5-bare-mt.eb
+++ b/easybuild/easyconfigs/r/R/R-3.1.1-ictce-6.3.5-bare-mt.eb
@@ -31,8 +31,8 @@ sanity_check_paths = {
              ['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'],
+             ['lib64/R/modules/%s' % x for x in ['internet.%s' % SHLIB_EXT, 'lapack.%s' % SHLIB_EXT, 'vfonts.%s' % SHLIB_EXT]] +
+             ['lib64/R/lib/libR.%s' % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/r/R/R-3.1.1-ictce-6.3.5-default-mt.eb b/easybuild/easyconfigs/r/R/R-3.1.1-ictce-6.3.5-default-mt.eb
index 63bf09eeb5a6362ec51566a586b2259e45d9de3f..7fed5ef14fba86e82899b45b53e3971fc23b632d 100644
--- a/easybuild/easyconfigs/r/R/R-3.1.1-ictce-6.3.5-default-mt.eb
+++ b/easybuild/easyconfigs/r/R/R-3.1.1-ictce-6.3.5-default-mt.eb
@@ -28,8 +28,8 @@ sanity_check_paths = {
              ['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'],
+             ['lib64/R/modules/%s' % x for x in ['internet.%s' % SHLIB_EXT, 'lapack.%s' % SHLIB_EXT, 'vfonts.%s' % SHLIB_EXT]] +
+             ['lib64/R/lib/libR.%s' % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/r/R/R-3.1.1-intel-2014b.eb b/easybuild/easyconfigs/r/R/R-3.1.1-intel-2014b.eb
index 91ba061891d1a3ded8ff797335d435c0d2545196..a6b3f19e09bca80c0d2bdc0467be4b8be486dd1d 100644
--- a/easybuild/easyconfigs/r/R/R-3.1.1-intel-2014b.eb
+++ b/easybuild/easyconfigs/r/R/R-3.1.1-intel-2014b.eb
@@ -33,8 +33,9 @@ ext_options = {
 # Bioconductor packages have a different download url
 bioconductor_options = {
     'source_urls': [
-    	'http://www.bioconductor.org/packages/release/bioc/src/contrib/',
-    	'http://www.bioconductor.org/packages/2.14/bioc/src/contrib/'],
+        'http://www.bioconductor.org/packages/release/bioc/src/contrib/',
+        'http://www.bioconductor.org/packages/2.14/bioc/src/contrib/',
+    ],
     'source_tmpl': name_tmpl,
 }
 # !! order of packages is important !!
diff --git a/easybuild/easyconfigs/r/R/R-3.2.1-intel-2015b.eb b/easybuild/easyconfigs/r/R/R-3.2.1-intel-2015b.eb
index 77fae48b0b4e5e183eb011f18253161d95d32ca6..73337ba42844fbad9f956eebe8a90bfaf20056d0 100644
--- a/easybuild/easyconfigs/r/R/R-3.2.1-intel-2015b.eb
+++ b/easybuild/easyconfigs/r/R/R-3.2.1-intel-2015b.eb
@@ -381,6 +381,20 @@ exts_list = [
     ('EasyABC', '1.5', ext_options),
     ('shape', '1.4.2', ext_options),
     ('tidyr', '0.3.1', ext_options),
+    ('whisker', '0.3-2', ext_options),
+    ('rstudioapi', '0.4.0', ext_options),
+    ('roxygen2', '5.0.1', ext_options),
+    ('git2r', '0.13.1', ext_options),
+    ('xml2', '0.1.2', ext_options),
+    ('rversions', '1.0.2', ext_options),
+    ('devtools', '1.9.1', ext_options),
+    ('Rook', '1.1-1', ext_options),
+    ('rjson', '0.2.15', ext_options),
+    ('Cairo', '1.5-9', ext_options),
+    ('RMTstat', '0.3', ext_options),
+    ('Lmoments', '1.1-6', ext_options),
+    ('distillery', '1.0-2', ext_options),
+    ('extRemes', '2.0-7', ext_options),
 ]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.26-intel-2015a.eb b/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.26-intel-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4f0b4fda48da4b8fcf859cdf836237c41d6f456c
--- /dev/null
+++ b/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.26-intel-2015a.eb
@@ -0,0 +1,57 @@
+name = 'ROOT'
+version = 'v5.34.26'
+
+homepage = 'http://root.cern.ch/drupal/'
+description = """The ROOT system provides a set of OO frameworks with all the functionality
+    needed to handle and analyze large amounts of data in a very efficient way."""
+
+toolchain = {'name': 'intel', 'version': '2015a'}
+toolchainopts = {'pic': True}
+
+sources = ['%(namelower)s_%(version)s.source.tar.gz']
+source_urls = ['ftp://root.cern.ch/root/']
+patches = [
+    'configure_FftwFromMkl_28.patch',
+    'ROOT-v5_recent-ifort.patch',
+    'ROOT-v5.34.26_libX.patch',
+]
+
+python = 'Python'
+pyver = '2.7.9'
+
+dependencies = [
+    ('GSL', '1.16'),
+    ('Mesa', '10.4.5', '-%s-%s' % (python, pyver)),
+    ('libxml2', '2.9.2', '-%s-%s' % (python, pyver)),
+    ('PCRE', '8.36'),
+    ('CFITSIO', '3.37'),
+    ('freetype', '2.5.5'),
+    (python, pyver),
+    ('zlib', '1.2.8'),
+    ('libXft', '2.3.2', '-libX11-1.6.3'),
+    ('libXpm', '3.5.11'),
+    ('libXext', '1.3.3'),
+]
+
+# use external ZLIB
+preconfigopts = 'ZLIB=$EBROOTZLIB '
+
+# architecture
+arch = 'linuxx8664icc'
+
+# disable features
+configopts = ' --disable-xrootd --disable-mysql --disable-krb5 --disable-odbc '
+configopts += ' --disable-oracle --disable-pgsql --disable-qt --disable-sqlite'
+# enable features
+configopts += ' --enable-unuran --enable-table --enable-explicitlink --enable-minuit2 --enable-roofit'
+configopts += ' --with-gsl-incdir=$EBROOTGSL/include/gsl --with-gsl-libdir=$EBROOTGSL/lib'
+configopts += ' --with-fftw3-incdir=$MKLROOT/mkl/include/fftw --with-fftw3-libdir=$MKLROOT/mkl/lib/intel64'
+configopts += ' --with-xml-incdir=$EBROOTLIBXML2/include/libxml2/libxml --with-xml-libdir=$EBROOTLIBXML2/lib'
+configopts += ' --with-python-libdir=$EBROOTPYTHON/lib'
+configopts += ' --with-cfitsio-incdir=$EBROOTCFITSIO/include --with-cfitsio-libdir=$EBROOTCFITSIO/lib'
+configopts += ' --with-opengl-incdir=$EBROOTMESA/include --with-opengl-libdir=$EBROOTMESA/lib'
+configopts += ' --with-x11-libdir=$EBROOTLIBX11/lib --with-xext-libdir=$EBROOTLIBXEXT/lib'
+configopts += ' --with-xft-libdir=$EBROOTLIBXFT/lib'
+configopts += ' --with-xpm-incdir=$EBROOTLIBXPM/include --with-xpm-libdir=$EBROOTLIBXPM/lib'
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.26_libX.patch b/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.26_libX.patch
new file mode 100644
index 0000000000000000000000000000000000000000..bea67c521da7b84f52c11885353623eddb6dc9a9
--- /dev/null
+++ b/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.26_libX.patch
@@ -0,0 +1,28 @@
+#Find custom located LIBX11, LIBXFT, and LIBXEXT includes
+#December 08, 2015 by B. Hajgato (Vrije Universiteit Brussel)
+--- configure.orig	2015-12-08 11:43:15.397124435 +0100
++++ configure	2015-12-08 11:47:42.530999154 +0100
+@@ -2681,6 +2681,7 @@
+ 
+     check_header "X11/Xlib.h" "" \
+         ${finkdir:+$finkdir/include} \
++        $EBROOTLIBX11/include \
+         /usr/include /usr/X11R6/include /usr/include/X11 /usr/openwin/include \
+         /usr/local/include /usr/local/include/X11 /usr/local/X11R6/include \
+         /usr/X11/include /usr/include/X11R5
+@@ -2707,6 +2708,7 @@
+ 
+     check_header "X11/Xft/Xft.h" "" \
+         ${finkdir:+$finkdir/include} \
++        $xftlibdir/../include \
+         /usr/include /usr/X11R6/include /usr/include/X11 /usr/openwin/include \
+         /usr/local/include /usr/local/include/X11 /usr/local/X11R6/include \
+         /usr/X11/include /usr/include/X11R5
+@@ -2720,6 +2722,7 @@
+     if test ! "x$arch" = "xaix5" ; then
+         check_header "X11/extensions/shape.h" "" \
+             ${finkdir:+$finkdir/include} \
++            $xextlibdir/../include \
+             /usr/include /usr/X11R6/include /usr/include/X11 \
+             /usr/openwin/include /usr/local/include /usr/local/include/X11 \
+             /usr/local/X11R6/include /usr/X11/include /usr/include/X11R5
diff --git a/easybuild/easyconfigs/r/RSEM/RSEM-1.2.26-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/r/RSEM/RSEM-1.2.26-GNU-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..07868df9c117a861739c8ceb42df3cc877880363
--- /dev/null
+++ b/easybuild/easyconfigs/r/RSEM/RSEM-1.2.26-GNU-4.9.3-2.25.eb
@@ -0,0 +1,58 @@
+easyblock = 'MakeCp'
+
+name = 'RSEM'
+version = '1.2.26'
+
+homepage = 'http://deweylab.github.io/RSEM/'
+description = """RNA-Seq by Expectation-Maximization)"""
+
+toolchain = {'name': 'GNU', 'version': '4.9.3-2.25'}
+
+source_urls = ['https://github.com/deweylab/RSEM/archive/']
+sources = ['v%(version)s.tar.gz']
+
+patches = ['RSEM-%(version)s_eb_provided_zlib.patch']
+
+dependencies = [
+    ('ncurses', '5.9'),
+    ('zlib', '1.2.8'),
+]
+
+list_of_executables = [
+    "rsem_perl_utils.pm",
+    "rsem-bam2readdepth",
+    "rsem-bam2wig",
+    "rsem-build-read-index",
+    "rsem-calculate-credibility-intervals",
+    "rsem-calculate-expression",
+    "rsem-control-fdr",
+    "rsem-extract-reference-transcripts",
+    "rsem-generate-data-matrix",
+    "rsem-generate-ngvector",
+    "rsem-gen-transcript-plots",
+    "rsem-get-unique",
+    "rsem-gff3-to-gtf",
+    "rsem-parse-alignments",
+    "rsem-plot-model",
+    "rsem-plot-transcript-wiggles",
+    "rsem-prepare-reference",
+    "rsem-preref",
+    "rsem-refseq-extract-primary-assembly",
+    "rsem-run-ebseq",
+    "rsem-run-em",
+    "rsem-run-gibbs",
+    "rsem-sam-validator",
+    "rsem-scan-for-paired-end-reads",
+    "rsem-simulate-reads",
+    "rsem-synthesis-reference-transcripts",
+    "rsem-tbam2gbam",
+]
+
+files_to_copy = [(list_of_executables, "bin"), "WHAT_IS_NEW"]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in list_of_executables],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/r/RSEM/RSEM-1.2.26-intel-2015b.eb b/easybuild/easyconfigs/r/RSEM/RSEM-1.2.26-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c63ccbd6bf6332abc0eb47a38f8db4a8daac5164
--- /dev/null
+++ b/easybuild/easyconfigs/r/RSEM/RSEM-1.2.26-intel-2015b.eb
@@ -0,0 +1,58 @@
+easyblock = 'MakeCp'
+
+name = 'RSEM'
+version = '1.2.26'
+
+homepage = 'http://deweylab.github.io/RSEM/'
+description = """RNA-Seq by Expectation-Maximization)"""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = ['https://github.com/deweylab/RSEM/archive/']
+sources = ['v%(version)s.tar.gz']
+
+patches = ['RSEM-%(version)s_eb_provided_zlib.patch']
+
+dependencies = [
+    ('ncurses', '5.9'),
+    ('zlib', '1.2.8'),
+]
+
+list_of_executables = [
+    "rsem_perl_utils.pm",
+    "rsem-bam2readdepth",
+    "rsem-bam2wig",
+    "rsem-build-read-index",
+    "rsem-calculate-credibility-intervals",
+    "rsem-calculate-expression",
+    "rsem-control-fdr",
+    "rsem-extract-reference-transcripts",
+    "rsem-generate-data-matrix",
+    "rsem-generate-ngvector",
+    "rsem-gen-transcript-plots",
+    "rsem-get-unique",
+    "rsem-gff3-to-gtf",
+    "rsem-parse-alignments",
+    "rsem-plot-model",
+    "rsem-plot-transcript-wiggles",
+    "rsem-prepare-reference",
+    "rsem-preref",
+    "rsem-refseq-extract-primary-assembly",
+    "rsem-run-ebseq",
+    "rsem-run-em",
+    "rsem-run-gibbs",
+    "rsem-sam-validator",
+    "rsem-scan-for-paired-end-reads",
+    "rsem-simulate-reads",
+    "rsem-synthesis-reference-transcripts",
+    "rsem-tbam2gbam",
+]
+
+files_to_copy = [(list_of_executables, "bin"), "WHAT_IS_NEW"]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in list_of_executables],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/r/RSEM/RSEM-1.2.26_eb_provided_zlib.patch b/easybuild/easyconfigs/r/RSEM/RSEM-1.2.26_eb_provided_zlib.patch
new file mode 100644
index 0000000000000000000000000000000000000000..c1f315d2d7a97b628b6d94c7656057c50f65a2c1
--- /dev/null
+++ b/easybuild/easyconfigs/r/RSEM/RSEM-1.2.26_eb_provided_zlib.patch
@@ -0,0 +1,162 @@
+#Use EB provided libz and use EB provided CXX and CXXFLAGS
+# January 11, 2016 by B. Hajgato (Vrije Ubiversiteit Brussel)
+--- Makefile.orig	2016-01-08 02:23:01.000000000 +0100
++++ Makefile	2016-01-18 12:02:56.406105229 +0100
+@@ -1,6 +1,6 @@
+-CC = g++
+-CFLAGS = -Wall -c -I.
+-COFLAGS = -Wall -O3 -ffast-math -c -I.
++#CC = g++
++#CFLAGS = -Wall -c -I.
++COFLAGS =  ${CXXFLAGS} -Wall -c -I.
+ PROGRAMS = rsem-extract-reference-transcripts rsem-synthesis-reference-transcripts rsem-preref rsem-parse-alignments rsem-build-read-index rsem-run-em rsem-tbam2gbam rsem-run-gibbs rsem-calculate-credibility-intervals rsem-simulate-reads rsem-bam2wig rsem-get-unique rsem-bam2readdepth rsem-sam-validator rsem-scan-for-paired-end-reads
+ 
+ .PHONY : all ebseq clean
+@@ -8,6 +8,8 @@
+ all : $(PROGRAMS)
+ 
+ sam/libbam.a :
++	sed -e 's/ -lz/ -L\$$\{EBROOTZLIB\}\/lib -lz/' -i sam/Makefile
++	sed -e 's/ -lz/ -L\$$\{EBROOTZLIB\}\/lib -lz/' -i sam/bcftools/Makefile
+ 	cd sam ; ${MAKE} all
+ 
+ Transcript.h : utils.h
+@@ -15,10 +17,10 @@
+ Transcripts.h : utils.h my_assert.h Transcript.h
+ 
+ rsem-extract-reference-transcripts : utils.h my_assert.h GTFItem.h Transcript.h Transcripts.h extractRef.cpp
+-	$(CC) -Wall -O3 extractRef.cpp -o rsem-extract-reference-transcripts
++	$(CXX) -Wall ${CXXFLAGS} extractRef.cpp -o rsem-extract-reference-transcripts
+ 
+ rsem-synthesis-reference-transcripts : utils.h my_assert.h Transcript.h Transcripts.h synthesisRef.cpp
+-	$(CC) -Wall -O3 synthesisRef.cpp -o rsem-synthesis-reference-transcripts
++	$(CXX) -Wall ${CXXFLAGS} synthesisRef.cpp -o rsem-synthesis-reference-transcripts
+ 
+ BowtieRefSeqPolicy.h : RefSeqPolicy.h
+ 
+@@ -28,10 +30,10 @@
+ 
+ 
+ rsem-preref : preRef.o
+-	$(CC) preRef.o -o rsem-preref
++	$(CXX) preRef.o -o rsem-preref
+ 
+ preRef.o : utils.h RefSeq.h Refs.h PolyARules.h RefSeqPolicy.h AlignerRefSeqPolicy.h preRef.cpp
+-	$(CC) $(COFLAGS) preRef.cpp
++	$(CXX) $(COFLAGS) preRef.cpp
+ 
+ 
+ SingleRead.h : Read.h
+@@ -52,14 +54,14 @@
+ 
+ 
+ rsem-parse-alignments : parseIt.o sam/libbam.a
+-	$(CC) -o rsem-parse-alignments parseIt.o sam/libbam.a -lz -lpthread 
++	$(CXX) -o rsem-parse-alignments parseIt.o sam/libbam.a -L${EBROOTZLIB}/lib -lz -lpthread 
+ 
+ parseIt.o : utils.h GroupInfo.h Read.h SingleRead.h SingleReadQ.h PairedEndRead.h PairedEndReadQ.h SingleHit.h PairedEndHit.h HitContainer.h SamParser.h Transcripts.h sam/sam.h sam/bam.h parseIt.cpp
+-	$(CC) -Wall -O2 -c -I. parseIt.cpp
++	$(CXX) $(COFLAGS) parseIt.cpp
+ 
+ 
+ rsem-build-read-index : utils.h buildReadIndex.cpp
+-	$(CC) -O3 buildReadIndex.cpp -o rsem-build-read-index
++	$(CXX) ${CXXFLAGS} buildReadIndex.cpp -o rsem-build-read-index
+ 
+ 
+ simul.h : boost/random.hpp
+@@ -87,57 +89,57 @@
+ WriteResults.h : utils.h my_assert.h GroupInfo.h Transcript.h Transcripts.h RefSeq.h Refs.h Model.h SingleModel.h SingleQModel.h PairedEndModel.h PairedEndQModel.h
+ 
+ rsem-run-em : EM.o sam/libbam.a
+-	$(CC) -o rsem-run-em EM.o sam/libbam.a -lz -lpthread
++	$(CXX) -o rsem-run-em EM.o sam/libbam.a -L${EBROOTZLIB}/lib -lz -lpthread
+ 
+ EM.o : utils.h my_assert.h Read.h SingleRead.h SingleReadQ.h PairedEndRead.h PairedEndReadQ.h SingleHit.h PairedEndHit.h Model.h SingleModel.h SingleQModel.h PairedEndModel.h PairedEndQModel.h Refs.h GroupInfo.h HitContainer.h ReadIndex.h ReadReader.h Orientation.h LenDist.h RSPD.h QualDist.h QProfile.h NoiseQProfile.h ModelParams.h RefSeq.h RefSeqPolicy.h PolyARules.h Profile.h NoiseProfile.h Transcript.h Transcripts.h HitWrapper.h BamWriter.h sam/bam.h sam/sam.h simul.h sam_rsem_aux.h sampling.h boost/random.hpp WriteResults.h EM.cpp
+-	$(CC) $(COFLAGS) EM.cpp
++	$(CXX) $(COFLAGS) EM.cpp
+ 
+ bc_aux.h : sam/bam.h
+ 
+ BamConverter.h : utils.h my_assert.h sam/sam.h sam/bam.h sam_rsem_aux.h sam_rsem_cvt.h bc_aux.h Transcript.h Transcripts.h
+ 
+ rsem-tbam2gbam : utils.h Transcripts.h Transcript.h bc_aux.h BamConverter.h sam/sam.h sam/bam.h sam/libbam.a sam_rsem_aux.h sam_rsem_cvt.h tbam2gbam.cpp sam/libbam.a
+-	$(CC) -O3 -Wall tbam2gbam.cpp sam/libbam.a -lz -lpthread -o $@
++	$(CXX) ${CXXFLAGS} -Wall tbam2gbam.cpp sam/libbam.a -L${EBROOTZLIB}/lib -lz -lpthread -o $@
+ 
+ rsem-bam2wig : utils.h my_assert.h wiggle.h wiggle.o sam/libbam.a bam2wig.cpp
+-	$(CC) -O3 -Wall bam2wig.cpp wiggle.o sam/libbam.a -lz -lpthread -o $@
++	$(CXX) ${CXXFLAGS} -Wall bam2wig.cpp wiggle.o sam/libbam.a -L${EBROOTZLIB}/lib -lz -lpthread -o $@
+ 
+ rsem-bam2readdepth : utils.h my_assert.h wiggle.h wiggle.o sam/libbam.a bam2readdepth.cpp
+-	$(CC) -O3 -Wall bam2readdepth.cpp wiggle.o sam/libbam.a -lz -lpthread -o $@
++	$(CXX) ${CXXFLAGS} -Wall bam2readdepth.cpp wiggle.o sam/libbam.a -L${EBROOTZLIB}/lib -lz -lpthread -o $@
+ 
+ wiggle.o: sam/bam.h sam/sam.h wiggle.cpp wiggle.h
+-	$(CC) $(COFLAGS) wiggle.cpp
++	$(CXX) $(COFLAGS) wiggle.cpp
+ 
+ rsem-simulate-reads : simulation.o
+-	$(CC) -o rsem-simulate-reads simulation.o
++	$(CXX) -o rsem-simulate-reads simulation.o
+ 
+ simulation.o : utils.h Read.h SingleRead.h SingleReadQ.h PairedEndRead.h PairedEndReadQ.h Model.h SingleModel.h SingleQModel.h PairedEndModel.h PairedEndQModel.h Refs.h RefSeq.h GroupInfo.h Transcript.h Transcripts.h Orientation.h LenDist.h RSPD.h QualDist.h QProfile.h NoiseQProfile.h Profile.h NoiseProfile.h simul.h boost/random.hpp WriteResults.h simulation.cpp
+-	$(CC) $(COFLAGS) simulation.cpp
++	$(CXX) $(COFLAGS) simulation.cpp
+ 
+ rsem-run-gibbs : Gibbs.o
+-	$(CC) -o rsem-run-gibbs Gibbs.o -lpthread
++	$(CXX) -o rsem-run-gibbs Gibbs.o -lpthread
+ 
+ #some header files are omitted
+ Gibbs.o : utils.h my_assert.h boost/random.hpp sampling.h Model.h SingleModel.h SingleQModel.h PairedEndModel.h PairedEndQModel.h RefSeq.h RefSeqPolicy.h PolyARules.h Refs.h GroupInfo.h WriteResults.h Gibbs.cpp 
+-	$(CC) $(COFLAGS) Gibbs.cpp
++	$(CXX) $(COFLAGS) Gibbs.cpp
+ 
+ Buffer.h : my_assert.h
+ 
+ rsem-calculate-credibility-intervals : calcCI.o
+-	$(CC) -o rsem-calculate-credibility-intervals calcCI.o -lpthread
++	$(CXX) -o rsem-calculate-credibility-intervals calcCI.o -lpthread
+ 
+ #some header files are omitted
+ calcCI.o : utils.h my_assert.h boost/random.hpp sampling.h Model.h SingleModel.h SingleQModel.h PairedEndModel.h PairedEndQModel.h RefSeq.h RefSeqPolicy.h PolyARules.h Refs.h GroupInfo.h WriteResults.h Buffer.h calcCI.cpp
+-	$(CC) $(COFLAGS) calcCI.cpp
++	$(CXX) $(COFLAGS) calcCI.cpp
+ 
+ rsem-get-unique : sam/bam.h sam/sam.h getUnique.cpp sam/libbam.a
+-	$(CC) -O3 -Wall getUnique.cpp sam/libbam.a -lz -lpthread -o $@
++	$(CXX) ${CXXFLAGS} -Wall getUnique.cpp sam/libbam.a -L${EBROOTZLIB}/lib -lz -lpthread -o $@
+ 
+ rsem-sam-validator : sam/bam.h sam/sam.h my_assert.h samValidator.cpp sam/libbam.a
+-	$(CC) -O3 -Wall samValidator.cpp sam/libbam.a -lz -lpthread -o $@
++	$(CXX) ${CXXFLAGS} -Wall samValidator.cpp sam/libbam.a -L${EBROOTZLIB}/lib -lz -lpthread -o $@
+ 
+ rsem-scan-for-paired-end-reads : sam/bam.h sam/sam.h my_assert.h scanForPairedEndReads.cpp sam/libbam.a
+-	$(CC) -O3 -Wall scanForPairedEndReads.cpp sam/libbam.a -lz -lpthread -o $@
++	$(CXX) ${CXXFLAGS} -Wall scanForPairedEndReads.cpp sam/libbam.a -L${EBROOTZLIB}/lib -lz -lpthread -o $@
+ 
+ ebseq :
+ 	cd EBSeq ; ${MAKE} all
+--- sam/Makefile.orig	2016-01-08 02:23:01.000000000 +0100
++++ sam/Makefile	2016-01-18 12:08:43.769066188 +0100
+@@ -1,7 +1,7 @@
+-CC=			gcc
++#CC=			gcc
+ CFLAGS_EXTRA=
+ #CFLAGS_EXTRA= -L/usr/include/ncurses
+-CFLAGS=		-g -Wall -O2 $(CFLAGS_EXTRA)
++#CFLAGS=		-g -Wall -O2 $(CFLAGS_EXTRA)
+ #LDFLAGS=		-Wl,-rpath,\$$ORIGIN/../lib
+ DFLAGS_EXTRA=
+ #DFLAGS_EXTRA= -Dexpl=exp -Dlogl=log
+--- sam/bcftools/Makefile.orig	2016-01-08 02:23:01.000000000 +0100
++++ sam/bcftools/Makefile	2016-01-18 12:09:10.076063429 +0100
+@@ -1,5 +1,5 @@
+-CC=			gcc
+-CFLAGS=		-g -Wall -O2 #-m64 #-arch ppc
++#CC=			gcc
++#CFLAGS=		-g -Wall -O2 #-m64 #-arch ppc
+ DFLAGS=		-D_FILE_OFFSET_BITS=64 -D_USE_KNETFILE
+ LOBJS=		bcf.o vcf.o bcfutils.o prob1.o em.o kfunc.o kmin.o index.o fet.o mut.o bcf2qcall.o
+ OMISC=		..
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
index 418cc4118e796b57dd7cc5000bbb036aee8a3506..d832fcca9366fa93f06bd29f4f976a6ce7805871 100644
--- 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
@@ -30,7 +30,7 @@ prebuildopts = 'export BIOINFOGSLDIR=$EBROOTGSL && export BIOINFOCONFDIR=conf &&
 prebuildopts += 'cd bios && make && make prod && cd - && '
 # now move to "mrf" folder, re-export the needed env var and run make
 prebuildopts += 'cd mrf && export BIOINFOCONFDIR=../bios/conf/ && '
- 
+
 parallel = 1
 
 # these are all the binaries compiled in "mrf" folder
@@ -38,8 +38,8 @@ binary_files = ["psl2mrf", "bowtie2mrf", "singleExport2mrf", "mrfSubsetByTargetN
                 "mrfQuantifier", "mrfAnnotationCoverage", "mrf2wig", "mrf2gff", "mrfSampler",
                 "mrf2bgr", "wigSegmenter", "mrfMappingBias", "mrfSelectRegion", "mrfSelectSpliced",
                 "mrfSelectAnnotated", "createSpliceJunctionLibrary", "gff2interval", "export2fastq",
-                "mergeTranscripts", "interval2gff", "interval2sequences", "bed2interval", 
-                "interval2bed", "mrf2sam", "sam2mrf", "mrfValidate", "bgrQuantifier", 
+                "mergeTranscripts", "interval2gff", "interval2sequences", "bed2interval",
+                "interval2bed", "mrf2sam", "sam2mrf", "mrfValidate", "bgrQuantifier",
                 "bgrSegmenter", "mrfCountRegion"]
 
 files_to_copy = [
diff --git a/easybuild/easyconfigs/r/RcppArmadillo/RcppArmadillo-0.6.400.2.2-intel-2015b-R-3.2.1.eb b/easybuild/easyconfigs/r/RcppArmadillo/RcppArmadillo-0.6.400.2.2-intel-2015b-R-3.2.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..112c89bc799634704176ad613b74d8315cb6ad41
--- /dev/null
+++ b/easybuild/easyconfigs/r/RcppArmadillo/RcppArmadillo-0.6.400.2.2-intel-2015b-R-3.2.1.eb
@@ -0,0 +1,31 @@
+easyblock = 'RPackage'
+
+name = 'RcppArmadillo'
+version = '0.6.400.2.2'
+
+homepage = 'http://cran.r-project.org/web/packages/%(name)s'
+description = """'Armadillo' is a templated C++ linear algebra library that aims towards a good balance
+ between speed and ease of use"""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = [
+    'http://cran.r-project.org/src/contrib/',
+    'http://cran.r-project.org/src/contrib/Archive/$(name)s/',
+]
+sources = ['%(name)s_%(version)s.tar.gz']
+
+r = 'R'
+rver = '3.2.1'
+versionsuffix = '-%s-%s' % (r, rver)
+
+dependencies = [
+    (r, rver),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['RcppArmadillo'],
+}
+
+moduleclass = 'vis'
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
index d0fd6f17e3c0915097b22ac963599d144f1c54cf..97d67dd516fbb28c8d7d876920d9bccaf8076523 100644
--- 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
@@ -24,7 +24,7 @@ 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'],
+              'lib/libruby-static.a', 'lib/libruby.%s' % SHLIB_EXT],
     'dirs': ['lib/ruby/2.1.0', 'lib/ruby/gems', 'lib/pkgconfig', 'include/ruby-2.1.0']
 }
 
diff --git a/easybuild/easyconfigs/r/Ruby/Ruby-2.1.5-intel-2014b.eb b/easybuild/easyconfigs/r/Ruby/Ruby-2.1.5-intel-2014b.eb
index 32eca44aae4e0274e70b313c4042b78fae9e8a33..7acca63ee05dc9fa6910ac3793fd3d3100ebcc41 100644
--- a/easybuild/easyconfigs/r/Ruby/Ruby-2.1.5-intel-2014b.eb
+++ b/easybuild/easyconfigs/r/Ruby/Ruby-2.1.5-intel-2014b.eb
@@ -24,7 +24,7 @@ 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'],
+              'lib/libruby-static.a', 'lib/libruby.%s' % SHLIB_EXT],
     'dirs': ['lib/ruby/2.1.0', 'lib/ruby/gems', 'lib/pkgconfig', 'include/ruby-2.1.0']
 }
 
diff --git a/easybuild/easyconfigs/r/rCUDA/rCUDA-4.0.1_linux_64_Ubuntu10.04.eb b/easybuild/easyconfigs/r/rCUDA/rCUDA-4.0.1_linux_64_Ubuntu10.04.eb
index f306dfebf154139473e1c2876410b5c6470d5065..764e0a56544a32f545de656718e3f9c1f8246dd5 100644
--- a/easybuild/easyconfigs/r/rCUDA/rCUDA-4.0.1_linux_64_Ubuntu10.04.eb
+++ b/easybuild/easyconfigs/r/rCUDA/rCUDA-4.0.1_linux_64_Ubuntu10.04.eb
@@ -25,8 +25,8 @@ toolchain = {'version': 'dummy', 'name': 'dummy'}
 sources = ['rCUDA_%(version)s%(versionsuffix)s.tar.gz']
 
 sanity_check_paths = {
-    'files': ["framework/common/rCUDAcommIB.so", "framework/common/rCUDAcommTCP.so",
-              "framework/rCUDAl/libcudart.so", "util/rCUDA_util.h"],
+    'files': ["framework/common/rCUDAcommIB.%s" % SHLIB_EXT, "framework/common/rCUDAcommTCP.%s" % SHLIB_EXT,
+              "framework/rCUDAl/libcudart.%s" % SHLIB_EXT, "util/rCUDA_util.h"],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/r/rCUDA/rCUDA-5.0_linux_64_scientificLinux6.eb b/easybuild/easyconfigs/r/rCUDA/rCUDA-5.0_linux_64_scientificLinux6.eb
index 5169448939a74a30ce0d7edba841e7a3a773b97e..67667d2f43bcc42bb5b7511d4a971fc3b8905e1f 100644
--- a/easybuild/easyconfigs/r/rCUDA/rCUDA-5.0_linux_64_scientificLinux6.eb
+++ b/easybuild/easyconfigs/r/rCUDA/rCUDA-5.0_linux_64_scientificLinux6.eb
@@ -24,8 +24,8 @@ toolchain = {'version': 'dummy', 'name': 'dummy'}
 sources = ['rCUDA_%(version)s%(versionsuffix)s.tar.gz']
 
 sanity_check_paths = {
-    'files': ["framework/common/rCUDAcommIB.so", "framework/common/rCUDAcommTCP.so",
-              "framework/rCUDAl/libcudart.so", "framework/rCUDAd/getGPUNo"],
+    'files': ["framework/common/rCUDAcommIB.%s" % SHLIB_EXT, "framework/common/rCUDAcommTCP.%s" % SHLIB_EXT,
+              "framework/rCUDAl/libcudart.%s" % SHLIB_EXT, "framework/rCUDAd/getGPUNo"],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/r/rpy2/rpy2-2.4.3-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/r/rpy2/rpy2-2.4.3-goolf-1.4.10-Python-2.7.3.eb
index 463de39baadc9e3a3b3320449d899e95d8732faa..7c80c0fb249c594e767de88246cac44779ddf302 100644
--- a/easybuild/easyconfigs/r/rpy2/rpy2-2.4.3-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/r/rpy2/rpy2-2.4.3-goolf-1.4.10-Python-2.7.3.eb
@@ -12,7 +12,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 source_urls = ['https://pypi.python.org/packages/source/r/%(name)s']
 sources = [SOURCE_TAR_GZ]
-                                      
+
 python = 'Python'
 pyver = '2.7.3'
 pyshortver = '.'.join(pyver.split('.')[:2])
diff --git a/easybuild/easyconfigs/r/rpy2/rpy2-2.4.3-goolf-1.4.10-Python-3.2.3.eb b/easybuild/easyconfigs/r/rpy2/rpy2-2.4.3-goolf-1.4.10-Python-3.2.3.eb
index 5287791d7cab1724223d2e7175245647c4bb5b53..2ad8592b89d2329b0de12bcaffb45ba6ca508fb6 100644
--- a/easybuild/easyconfigs/r/rpy2/rpy2-2.4.3-goolf-1.4.10-Python-3.2.3.eb
+++ b/easybuild/easyconfigs/r/rpy2/rpy2-2.4.3-goolf-1.4.10-Python-3.2.3.eb
@@ -12,7 +12,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 source_urls = ['https://pypi.python.org/packages/source/r/%(name)s']
 sources = [SOURCE_TAR_GZ]
-                                      
+
 python = 'Python'
 pyver = '3.2.3'
 pyshortver = '.'.join(pyver.split('.')[:2])
diff --git a/easybuild/easyconfigs/s/S-Lang/S-Lang-2.3.0-GCC-4.9.2.eb b/easybuild/easyconfigs/s/S-Lang/S-Lang-2.3.0-GCC-4.9.2.eb
index d5d02f5692e0d610be266a43d00cf2940b5af635..ec3e8a22d530f33f91e242fcf1ecd7a1021519b4 100644
--- a/easybuild/easyconfigs/s/S-Lang/S-Lang-2.3.0-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/s/S-Lang/S-Lang-2.3.0-GCC-4.9.2.eb
@@ -15,7 +15,7 @@ sources = ['slang-%(version)s.tar.gz']
 source_urls = ['http://www.jedsoft.org/releases/slang/']
 
 sanity_check_paths = {
-    'files': ['include/slang.h', 'bin/slsh', 'lib/libslang.so'],
+    'files': ['include/slang.h', 'bin/slsh', 'lib/libslang.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.1-foss-2014b.eb b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.1-foss-2014b.eb
index a7bfe7aa5180bdbe2c3d38820135c028a99ecc6e..37118ac1e183b33c640fcc6b1be9add4cb8b32b5 100644
--- a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.1-foss-2014b.eb
+++ b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.1-foss-2014b.eb
@@ -28,6 +28,6 @@ dependencies = [
     ('zlib', '1.2.7'),
 ]
 
-parallel = 1 
+parallel = 1
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.1-goolf-1.4.10.eb b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.1-goolf-1.4.10.eb
index 48efe7e0a744ef5152580ddc8ea865e8793fe98c..ffeec869d84fc1e180f1e5fda0614df6be32c359 100644
--- a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.1-goolf-1.4.10.eb
@@ -30,6 +30,6 @@ dependencies = [
     ('zlib', '1.2.7'),
 ]
 
-parallel = 1 
+parallel = 1
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.1-intel-2014b.eb b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.1-intel-2014b.eb
index 9993040cdb01438adf3b44db6339cba883e4c31f..f6766acbd26aac25f5c3b84c9726230c6851ba52 100644
--- a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.1-intel-2014b.eb
+++ b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.1-intel-2014b.eb
@@ -30,6 +30,6 @@ dependencies = [
     ('zlib', '1.2.7'),
 ]
 
-parallel = 1 
+parallel = 1
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.1-intel-2015a.eb b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.1-intel-2015a.eb
index 91e58c27f084775489ef7213be45f4e4df14f20a..805874583a9b3a81d667859ea92480f6d94c5e2e 100644
--- a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.1-intel-2015a.eb
+++ b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.1-intel-2015a.eb
@@ -30,6 +30,6 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
-parallel = 1 
+parallel = 1
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-foss-2015a-HTSlib-1.2.1.eb b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-foss-2015a-HTSlib-1.2.1.eb
index c7743a27f3fdafbebe67abfde4f1f8bfe4e15f3f..3835083700e6a61402f7f002d7477c15b2305ada 100644
--- a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-foss-2015a-HTSlib-1.2.1.eb
+++ b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-foss-2015a-HTSlib-1.2.1.eb
@@ -33,6 +33,6 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
-parallel = 1 
+parallel = 1
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-foss-2015a.eb b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-foss-2015a.eb
index 227c52d47d092c405f6a9edfba4e8db34ad34e76..be9360b7e58260f70071ebc91dce097c3a1a5d0f 100644
--- a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-foss-2015a.eb
+++ b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-foss-2015a.eb
@@ -28,6 +28,6 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
-parallel = 1 
+parallel = 1
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-foss-2015b.eb b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..598ba6e51e620a64765c5152f8895f4b84789e15
--- /dev/null
+++ b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-foss-2015b.eb
@@ -0,0 +1,33 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Robert Schmidt <roschmidt@ohri.ca>, Cedric Laczny <cedric.laczny@uni.lu>, Fotis Georgatos <fotis@cern.ch>
+# License::   MIT/GPL
+# $Id$
+#
+##
+
+name = 'SAMtools'
+version = '1.2'
+
+homepage = 'http://www.htslib.org/'
+description = """SAM Tools provide various utilities for manipulating alignments in the SAM format, 
+ including sorting, merging, indexing and generating alignments in a per-position format."""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['https://github.com/samtools/%(namelower)s/releases/download/%(version)s']
+
+patches = ['SAMtools-1.1_Makefile.patch']
+
+dependencies = [
+    ('ncurses', '5.9'),
+    ('zlib', '1.2.8'),
+]
+
+parallel = 1
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-goolf-1.4.10.eb b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-goolf-1.4.10.eb
index 15cb82566ef6959e7e84f8c884349f59a5f7b64c..97a147d8ecfe0b29fc5b1dd0ffbb9314ec13f560 100644
--- a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-goolf-1.4.10.eb
@@ -28,6 +28,6 @@ dependencies = [
     ('zlib', '1.2.7'),
 ]
 
-parallel = 1 
+parallel = 1
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-goolf-1.7.20.eb b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-goolf-1.7.20.eb
index 695f8c6b45dd56a582adb2f1b0dfbbaee8e29bf9..e3ff7301d8bf43ab5f1a5dc47b841caf6381d52a 100644
--- a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-goolf-1.7.20.eb
@@ -28,6 +28,6 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
-parallel = 1 
+parallel = 1
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-intel-2015a-HTSlib-1.2.1.eb b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-intel-2015a-HTSlib-1.2.1.eb
index ccd0092201647c9ce353a1aa5cd40ba127ed1a16..289687681922c87ccefe6248634cd0b485007881 100644
--- a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-intel-2015a-HTSlib-1.2.1.eb
+++ b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-intel-2015a-HTSlib-1.2.1.eb
@@ -33,6 +33,6 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
-parallel = 1 
+parallel = 1
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.3-foss-2015b.eb b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.3-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4ff251eb7303ffd4196818b02532a2dcdc83f843
--- /dev/null
+++ b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.3-foss-2015b.eb
@@ -0,0 +1,31 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Robert Schmidt <roschmidt@ohri.ca>, Cedric Laczny <cedric.laczny@uni.lu>, Fotis Georgatos <fotis@cern.ch>
+# License::   MIT/GPL
+# $Id$
+#
+##
+name = 'SAMtools'
+version = '1.3'
+
+homepage = 'http://www.htslib.org/'
+description = """SAM Tools provide various utilities for manipulating alignments in the SAM format, 
+ including sorting, merging, indexing and generating alignments in a per-position format."""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['https://github.com/samtools/%(namelower)s/releases/download/%(version)s']
+sources = [SOURCELOWER_TAR_BZ2]
+
+# Patch Makefile to link against zlib provided by EB
+patches = ['SAMtools-1.3_Makefile.patch']
+
+dependencies = [
+    ('ncurses', '5.9'),
+    ('zlib', '1.2.8'),
+]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.3_Makefile.patch b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.3_Makefile.patch
new file mode 100644
index 0000000000000000000000000000000000000000..9b97a35bd66cdf073e58695188468b332d59c161
--- /dev/null
+++ b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.3_Makefile.patch
@@ -0,0 +1,18 @@
+--- Makefile.orig	2016-01-11 15:26:44.436740394 +1030
++++ Makefile	2016-01-11 15:25:55.588263958 +1030
+@@ -83,13 +83,13 @@
+ # TODO Use configure or htslib.pc to add -rdynamic/-ldl conditionally
+ ALL_CPPFLAGS = $(DFLAGS) -I. $(HTSLIB_CPPFLAGS) $(CPPFLAGS)
+ ALL_LDFLAGS  = -rdynamic $(HTSLIB_LDFLAGS) $(LDFLAGS)
+-ALL_LIBS     = -lz -ldl $(LIBS)
++ALL_LIBS     = -L$(EBROOTZLIB)/lib -lz -ldl $(LIBS)
+ 
+ # Usually config.mk and config.h are generated by running configure
+ # or config.status, but if those aren't used create defaults here.
+ 
+ config.mk:
+-	@sed -e '/^prefix/,/^LIBS/d;s/@Hsource@//;s/@Hinstall@/#/;s#@HTSDIR@#htslib-1.3#g;s/@HTSLIB_CPPFLAGS@/-I$$(HTSDIR)/g;s/@CURSES_LIB@/-lcurses/g' config.mk.in > $@
++	@sed -e '/^prefix/,/^LIBS/d;s/@Hsource@//;s/@Hinstall@/#/;s#@HTSDIR@#htslib-1.3#g;s/@HTSLIB_CPPFLAGS@/-I$$(HTSDIR)/g;s/@CURSES_LIB@/-L$$(EBROOTNCURSES)\/lib -lcurses/g' config.mk.in > $@
+ 
+ config.h:
+ 	echo '/* Basic config.h generated by Makefile */' > $@
diff --git a/easybuild/easyconfigs/s/SCALCE/SCALCE-2.7-GCC-4.8.2.eb b/easybuild/easyconfigs/s/SCALCE/SCALCE-2.7-GCC-4.8.2.eb
index f442020c76eb4e88fd0ab75f8e512439db8a9a25..d732b448eb4c483f267e48bbb72369db9030efad 100644
--- a/easybuild/easyconfigs/s/SCALCE/SCALCE-2.7-GCC-4.8.2.eb
+++ b/easybuild/easyconfigs/s/SCALCE/SCALCE-2.7-GCC-4.8.2.eb
@@ -30,7 +30,7 @@ buildopts = '-C zlib-1.2.8 && make all'
 files_to_copy = [(['scalce'], 'bin')]
 
 sanity_check_paths = {
-    'files': ["bin/scalce"], 
+    'files': ["bin/scalce"],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/s/SCDE/SCDE-20151209-intel-2015b-R-3.2.1.eb b/easybuild/easyconfigs/s/SCDE/SCDE-20151209-intel-2015b-R-3.2.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6451471e7438205ac8069f350211698a452a67ff
--- /dev/null
+++ b/easybuild/easyconfigs/s/SCDE/SCDE-20151209-intel-2015b-R-3.2.1.eb
@@ -0,0 +1,29 @@
+easyblock = 'RPackage'
+
+name = 'SCDE'
+version = '20151209'
+
+homepage = 'http://pklab.med.harvard.edu/scde'
+description = """R package for analyzing single-cell RNA-seq data"""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = ['https://github.com/hms-dbmi/scde/archive/']
+sources = ['db56b09.tar.gz']
+
+rver = '3.2.1'
+versionsuffix = '-R-%s' % rver
+
+dependencies = [
+    ('R', rver),
+    ('R-bundle-Bioconductor', '3.1', versionsuffix),
+    # newer version of RcppArmadillo required than the one included in R module
+    ('RcppArmadillo', '0.6.400.2.2', versionsuffix),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['%(namelower)s'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-intel-2015b-Python-2.7.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..057612c575f8114fe9181e791b812bbcff57086b
--- /dev/null
+++ b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.6.2-intel-2015b-Python-2.7.10.eb
@@ -0,0 +1,30 @@
+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': 'intel', 'version': '2015b'}
+
+source_urls = ["http://scoop.googlecode.com/files/"]
+sources = ['%(namelower)s-%(version)s.release.tar.gz']
+
+pyver = '2.7.10'
+pyshortver = '.'.join(pyver.split('.')[:2])
+versionsuffix = '-Python-%s' % pyver
+
+dependencies = [
+    ('Python', pyver),  # python with builtin argparse
+    ('Greenlet', '0.4.2', versionsuffix),
+    ('PyZMQ', '15.1.0', versionsuffix + '-zmq4'),
+]
+
+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.4-intel-2015b-64bitint.eb b/easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.4-intel-2015b-64bitint.eb
index edac27cad0652311b79f5e52193e7c3d7d230b24..ba1a0a43d1dd50f8beca796eae3859f0ac13f27a 100644
--- a/easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.4-intel-2015b-64bitint.eb
+++ b/easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.4-intel-2015b-64bitint.eb
@@ -1,6 +1,6 @@
 name = 'SCOTCH'
 version = '6.0.4'
-versionsuffix = '-64bitint' 
+versionsuffix = '-64bitint'
 
 homepage = 'http://gforge.inria.fr/projects/scotch/'
 description = """Software package and libraries for sequential and parallel graph partitioning,
diff --git a/easybuild/easyconfigs/s/SDCC/SDCC-3.3.0.eb b/easybuild/easyconfigs/s/SDCC/SDCC-3.3.0.eb
index b97860755cfac80a288c20b387702ccef0f079ca..a74b423aa792495aa92e13fd860422090872cfed 100644
--- a/easybuild/easyconfigs/s/SDCC/SDCC-3.3.0.eb
+++ b/easybuild/easyconfigs/s/SDCC/SDCC-3.3.0.eb
@@ -35,7 +35,7 @@ builddependencies = [
 configopts = "--disable-pic14-port --disable-pic16-port"
 
 sanity_check_paths = {
-    'files': ["bin/sdcc"], 
+    'files': ["bin/sdcc"],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/s/SIP/SIP-4.16.4-goolf-1.5.14-Python-2.7.9.eb b/easybuild/easyconfigs/s/SIP/SIP-4.16.4-goolf-1.5.14-Python-2.7.9.eb
index 2c2c1d2e6afa0cd35c5820862b885bb61d3278ab..aaac9462ce8b4c52dcf1dea3a9699165053aeb62 100644
--- a/easybuild/easyconfigs/s/SIP/SIP-4.16.4-goolf-1.5.14-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/s/SIP/SIP-4.16.4-goolf-1.5.14-Python-2.7.9.eb
@@ -9,7 +9,7 @@ version = '4.16.4'
 homepage = 'http://www.riverbankcomputing.com/software/sip/'
 description = """SIP is a tool that makes it very easy to create Python bindings for C and C++ libraries."""
 
-toolchain = {'name': 'goolf', 'version': '1.5.14'} 
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://sourceforge.net/projects/pyqt/files/sip/sip-%(version)s']
@@ -26,7 +26,7 @@ configopts += "--destdir %%(installdir)s/lib/python%s/site-packages" % pyshortve
 
 sanity_check_paths = {
     'files': ['bin/sip', 'include/sip.h'] +
-             ['lib/python%s/site-packages/%s' % (pyshortver, x) for x in ['sip.so', 'sipconfig.py', 'sipdistutils.py']],
+             ['lib/python%s/site-packages/%s' % (pyshortver, x) for x in ['sip.%s' % SHLIB_EXT, 'sipconfig.py', 'sipdistutils.py']],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/s/SIP/SIP-4.16.4-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/s/SIP/SIP-4.16.4-intel-2015a-Python-2.7.9.eb
index db47a517caf321cc1739273ad1f3e8b39ee9221e..f0dcc913e9fb3e115beaad19ae6791aa87a04e98 100644
--- a/easybuild/easyconfigs/s/SIP/SIP-4.16.4-intel-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/s/SIP/SIP-4.16.4-intel-2015a-Python-2.7.9.eb
@@ -9,7 +9,7 @@ version = '4.16.4'
 homepage = 'http://www.riverbankcomputing.com/software/sip/'
 description = """SIP is a tool that makes it very easy to create Python bindings for C and C++ libraries."""
 
-toolchain = {'name': 'intel', 'version': '2015a'} 
+toolchain = {'name': 'intel', 'version': '2015a'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://sourceforge.net/projects/pyqt/files/sip/sip-%(version)s']
@@ -26,7 +26,7 @@ configopts += "--destdir %%(installdir)s/lib/python%s/site-packages" % pyshortve
 
 sanity_check_paths = {
     'files': ['bin/sip', 'include/sip.h'] +
-             ['lib/python%s/site-packages/%s' % (pyshortver, x) for x in ['sip.so', 'sipconfig.py', 'sipdistutils.py']],
+             ['lib/python%s/site-packages/%s' % (pyshortver, x) for x in ['sip.%s' % SHLIB_EXT, 'sipconfig.py', 'sipdistutils.py']],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/s/SIP/SIP-4.16.8-foss-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/s/SIP/SIP-4.16.8-foss-2015a-Python-2.7.9.eb
index c03c93c847b615b55e879e7fbe3fdf9400bd04ff..af473b7d9f72de62dbbe3323de344f21e039429e 100644
--- a/easybuild/easyconfigs/s/SIP/SIP-4.16.8-foss-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/s/SIP/SIP-4.16.8-foss-2015a-Python-2.7.9.eb
@@ -26,7 +26,7 @@ configopts += "--destdir %%(installdir)s/lib/python%s/site-packages" % pyshortve
 
 sanity_check_paths = {
     'files': ['bin/sip', 'include/sip.h'] +
-             ['lib/python%s/site-packages/%s' % (pyshortver, x) for x in ['sip.so', 'sipconfig.py', 'sipdistutils.py']],
+             ['lib/python%s/site-packages/%s' % (pyshortver, x) for x in ['sip.%s' % SHLIB_EXT, 'sipconfig.py', 'sipdistutils.py']],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/s/SIP/SIP-4.16.8-intel-2014b-Python-2.7.8.eb b/easybuild/easyconfigs/s/SIP/SIP-4.16.8-intel-2014b-Python-2.7.8.eb
index d266d5f8e0f8b5e3736e7ff661248f8b731c9c3b..2fb045fa8473050462adc32184c0498b4fbd1d3a 100644
--- a/easybuild/easyconfigs/s/SIP/SIP-4.16.8-intel-2014b-Python-2.7.8.eb
+++ b/easybuild/easyconfigs/s/SIP/SIP-4.16.8-intel-2014b-Python-2.7.8.eb
@@ -26,7 +26,7 @@ configopts += "--destdir %%(installdir)s/lib/python%s/site-packages" % pyshortve
 
 sanity_check_paths = {
     'files': ['bin/sip', 'include/sip.h'] +
-             ['lib/python%s/site-packages/%s' % (pyshortver, x) for x in ['sip.so', 'sipconfig.py', 'sipdistutils.py']],
+             ['lib/python%s/site-packages/%s' % (pyshortver, x) for x in ['sip.%s' % SHLIB_EXT, 'sipconfig.py', 'sipdistutils.py']],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/s/SIP/SIP-4.16.8-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/s/SIP/SIP-4.16.8-intel-2015a-Python-2.7.9.eb
index 4fb9048408c8829413b88e106df5276d6d4ee4d0..457e09c556d3839bf09c0704374fed1f0d53bd4a 100644
--- a/easybuild/easyconfigs/s/SIP/SIP-4.16.8-intel-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/s/SIP/SIP-4.16.8-intel-2015a-Python-2.7.9.eb
@@ -26,7 +26,7 @@ configopts += "--destdir %%(installdir)s/lib/python%s/site-packages" % pyshortve
 
 sanity_check_paths = {
     'files': ['bin/sip', 'include/sip.h'] +
-             ['lib/python%s/site-packages/%s' % (pyshortver, x) for x in ['sip.so', 'sipconfig.py', 'sipdistutils.py']],
+             ['lib/python%s/site-packages/%s' % (pyshortver, x) for x in ['sip.%s' % SHLIB_EXT, 'sipconfig.py', 'sipdistutils.py']],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/s/SLEPc/SLEPc-3.6.2-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/s/SLEPc/SLEPc-3.6.2-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..775feb38377e8472ef188e57d8368aa5a883357b
--- /dev/null
+++ b/easybuild/easyconfigs/s/SLEPc/SLEPc-3.6.2-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,21 @@
+name = 'SLEPc'
+version = '3.6.2'
+versionsuffix = '-Python-2.7.11'
+
+homepage = 'http://www.grycap.upv.es/slepc/'
+description = """SLEPc (Scalable Library for Eigenvalue Problem Computations) is a software library for the solution of
+ large scale sparse eigenvalue problems on parallel computers. It is an extension of PETSc and can be used for either
+ standard or generalized eigenproblems, with real or complex arithmetic. It can also be used for computing a partial
+ SVD of a large, sparse, rectangular matrix, and to solve quadratic eigenvalue problems."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'usempi': True}
+
+source_urls = ['http://www.grycap.upv.es/slepc/download/download.php?filename=']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('PETSc', '3.6.3', versionsuffix)]
+
+petsc_arch = 'installed-arch-linux2-c-opt'
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/SOAPdenovo2/SOAPdenovo2-r240-intel-2015b.eb b/easybuild/easyconfigs/s/SOAPdenovo2/SOAPdenovo2-r240-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0df8fa5210e1c17dd11c0c3afb759abe6b4290d0
--- /dev/null
+++ b/easybuild/easyconfigs/s/SOAPdenovo2/SOAPdenovo2-r240-intel-2015b.eb
@@ -0,0 +1,40 @@
+#    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': 'intel', 'version': '2015b'}
+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': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SQLite/SQLite-3.8.10.2-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/s/SQLite/SQLite-3.8.10.2-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..62c6f7b8b27a83e63fc4c73b558fc63b36c5de9b
--- /dev/null
+++ b/easybuild/easyconfigs/s/SQLite/SQLite-3.8.10.2-GCC-4.9.3-2.25.eb
@@ -0,0 +1,40 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Fotis Georgatos <fotis@cern.ch>
+# 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/
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'SQLite'
+version = '3.8.10.2'
+
+homepage = 'http://www.sqlite.org/'
+description = 'SQLite: SQL Database Engine in a C Library'
+
+toolchain = {'name': 'GCC', 'version': '4.9.3-2.25'}
+
+# eg. http://www.sqlite.org/2014/sqlite-autoconf-3080600.tar.gz
+source_urls = ['http://www.sqlite.org/2015/']
+version_str = '%(version_major)s' + ''.join('%02d' % int(x) for x in version.split('.')[1:])
+sources = ['sqlite-autoconf-%s.tar.gz' % version_str]
+
+dependencies = [
+    ('libreadline', '6.3', '', ('GCCcore', '4.9.3')),
+    ('Tcl', '8.6.4'),
+]
+
+parallel = 1
+
+sanity_check_paths = {
+    'files': ['bin/sqlite3', 'include/sqlite3ext.h', 'include/sqlite3.h', 'lib/libsqlite3.a', 'lib/libsqlite3.%s' % SHLIB_EXT],
+    'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/s/SQLite/SQLite-3.8.10.2-foss-2015a.eb b/easybuild/easyconfigs/s/SQLite/SQLite-3.8.10.2-foss-2015a.eb
index fbe46bacc9c1bd8179973683d6bd7b48e215c4a8..06b2583e36b4f279c498c9564c935d861d7b5af7 100644
--- a/easybuild/easyconfigs/s/SQLite/SQLite-3.8.10.2-foss-2015a.eb
+++ b/easybuild/easyconfigs/s/SQLite/SQLite-3.8.10.2-foss-2015a.eb
@@ -33,7 +33,7 @@ dependencies = [
 parallel = 1
 
 sanity_check_paths = {
-    'files': ['bin/sqlite3', 'include/sqlite3ext.h', 'include/sqlite3.h', 'lib/libsqlite3.a', 'lib/libsqlite3.so'],
+    'files': ['bin/sqlite3', 'include/sqlite3ext.h', 'include/sqlite3.h', 'lib/libsqlite3.a', 'lib/libsqlite3.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/s/SQLite/SQLite-3.8.10.2-foss-2015b.eb b/easybuild/easyconfigs/s/SQLite/SQLite-3.8.10.2-foss-2015b.eb
index f71908ec0b0b8f3a6185a4d4b332cdf2ee7b0241..5708afcd84c1c9eda0c27516d457c83ef1e45939 100644
--- a/easybuild/easyconfigs/s/SQLite/SQLite-3.8.10.2-foss-2015b.eb
+++ b/easybuild/easyconfigs/s/SQLite/SQLite-3.8.10.2-foss-2015b.eb
@@ -33,7 +33,7 @@ dependencies = [
 parallel = 1
 
 sanity_check_paths = {
-    'files': ['bin/sqlite3', 'include/sqlite3ext.h', 'include/sqlite3.h', 'lib/libsqlite3.a', 'lib/libsqlite3.so'],
+    'files': ['bin/sqlite3', 'include/sqlite3ext.h', 'include/sqlite3.h', 'lib/libsqlite3.a', 'lib/libsqlite3.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/s/SQLite/SQLite-3.8.10.2-gimkl-2.11.5.eb b/easybuild/easyconfigs/s/SQLite/SQLite-3.8.10.2-gimkl-2.11.5.eb
index dae12b573444fc48e60b472480b619604cb5d887..11fc55a1b6d510f66f78708c9c73e8850fad82c8 100644
--- a/easybuild/easyconfigs/s/SQLite/SQLite-3.8.10.2-gimkl-2.11.5.eb
+++ b/easybuild/easyconfigs/s/SQLite/SQLite-3.8.10.2-gimkl-2.11.5.eb
@@ -33,7 +33,7 @@ dependencies = [
 parallel = 1
 
 sanity_check_paths = {
-    'files': ['bin/sqlite3', 'include/sqlite3ext.h', 'include/sqlite3.h', 'lib/libsqlite3.a', 'lib/libsqlite3.so'],
+    'files': ['bin/sqlite3', 'include/sqlite3ext.h', 'include/sqlite3.h', 'lib/libsqlite3.a', 'lib/libsqlite3.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/s/SQLite/SQLite-3.8.10.2-goolf-1.4.10.eb b/easybuild/easyconfigs/s/SQLite/SQLite-3.8.10.2-goolf-1.4.10.eb
index 068704800490922c7b972112529c5358c9e4a43c..6a41f5863cdd704e90ae0196cf0c304428dfd172 100644
--- a/easybuild/easyconfigs/s/SQLite/SQLite-3.8.10.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/s/SQLite/SQLite-3.8.10.2-goolf-1.4.10.eb
@@ -33,7 +33,7 @@ dependencies = [
 parallel = 1
 
 sanity_check_paths = {
-    'files': ['bin/sqlite3', 'include/sqlite3ext.h', 'include/sqlite3.h', 'lib/libsqlite3.a', 'lib/libsqlite3.so'],
+    'files': ['bin/sqlite3', 'include/sqlite3ext.h', 'include/sqlite3.h', 'lib/libsqlite3.a', 'lib/libsqlite3.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/s/SQLite/SQLite-3.8.10.2-goolf-1.7.20.eb b/easybuild/easyconfigs/s/SQLite/SQLite-3.8.10.2-goolf-1.7.20.eb
index 3ad3a9145ad9ac47ec57addf0d9ce18a086021a5..e06537d494213332b5c58d0eb050d09e907573e3 100644
--- a/easybuild/easyconfigs/s/SQLite/SQLite-3.8.10.2-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/s/SQLite/SQLite-3.8.10.2-goolf-1.7.20.eb
@@ -33,7 +33,7 @@ dependencies = [
 parallel = 1
 
 sanity_check_paths = {
-    'files': ['bin/sqlite3', 'include/sqlite3ext.h', 'include/sqlite3.h', 'lib/libsqlite3.a', 'lib/libsqlite3.so'],
+    'files': ['bin/sqlite3', 'include/sqlite3ext.h', 'include/sqlite3.h', 'lib/libsqlite3.a', 'lib/libsqlite3.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/s/SQLite/SQLite-3.8.10.2-intel-2015a.eb b/easybuild/easyconfigs/s/SQLite/SQLite-3.8.10.2-intel-2015a.eb
index 03c9b50fbabb2dd183ad3118fd064f74afdd885f..17d369e53012d76db9298c6702f9b97044c1bfc1 100644
--- a/easybuild/easyconfigs/s/SQLite/SQLite-3.8.10.2-intel-2015a.eb
+++ b/easybuild/easyconfigs/s/SQLite/SQLite-3.8.10.2-intel-2015a.eb
@@ -33,7 +33,7 @@ dependencies = [
 parallel = 1
 
 sanity_check_paths = {
-    'files': ['bin/sqlite3', 'include/sqlite3ext.h', 'include/sqlite3.h', 'lib/libsqlite3.a', 'lib/libsqlite3.so'],
+    'files': ['bin/sqlite3', 'include/sqlite3ext.h', 'include/sqlite3.h', 'lib/libsqlite3.a', 'lib/libsqlite3.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/s/SQLite/SQLite-3.8.10.2-intel-2015b.eb b/easybuild/easyconfigs/s/SQLite/SQLite-3.8.10.2-intel-2015b.eb
index 2008f892f3bb68d29bcc0c52c7b8decd90fe4381..26439e2d65f89ff9cec5933ec668459b32f1d701 100644
--- a/easybuild/easyconfigs/s/SQLite/SQLite-3.8.10.2-intel-2015b.eb
+++ b/easybuild/easyconfigs/s/SQLite/SQLite-3.8.10.2-intel-2015b.eb
@@ -33,7 +33,7 @@ dependencies = [
 parallel = 1
 
 sanity_check_paths = {
-    'files': ['bin/sqlite3', 'include/sqlite3ext.h', 'include/sqlite3.h', 'lib/libsqlite3.a', 'lib/libsqlite3.so'],
+    'files': ['bin/sqlite3', 'include/sqlite3ext.h', 'include/sqlite3.h', 'lib/libsqlite3.a', 'lib/libsqlite3.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/s/SQLite/SQLite-3.9.2-foss-2016a.eb b/easybuild/easyconfigs/s/SQLite/SQLite-3.9.2-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..47bee4f6240889b5a75b45f31a7488fb08df1232
--- /dev/null
+++ b/easybuild/easyconfigs/s/SQLite/SQLite-3.9.2-foss-2016a.eb
@@ -0,0 +1,40 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Fotis Georgatos <fotis@cern.ch>
+# 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/
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'SQLite'
+version = '3.9.2'
+
+homepage = 'http://www.sqlite.org/'
+description = 'SQLite: SQL Database Engine in a C Library'
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+# eg. http://www.sqlite.org/2014/sqlite-autoconf-3080600.tar.gz
+source_urls = ['http://www.sqlite.org/2015/']
+version_str = '%%(version_major)s%s00' % ''.join('%02d' % int(x) for x in version.split('.')[1:])
+sources = ['sqlite-autoconf-%s.tar.gz' % version_str]
+
+dependencies = [
+    ('libreadline', '6.3'),
+    ('Tcl', '8.6.4'),
+]
+
+parallel = 1
+
+sanity_check_paths = {
+    'files': ['bin/sqlite3', 'include/sqlite3ext.h', 'include/sqlite3.h', 'lib/libsqlite3.a', 'lib/libsqlite3.%s' % SHLIB_EXT],
+    'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/s/SQLite/SQLite-3.9.2-intel-2015b.eb b/easybuild/easyconfigs/s/SQLite/SQLite-3.9.2-intel-2015b.eb
index 625f8fa8a1f7fd56ae03b38601e080749a67c1c2..79c1231084cf1cbade52b54a95b74f2b7e5d060e 100644
--- a/easybuild/easyconfigs/s/SQLite/SQLite-3.9.2-intel-2015b.eb
+++ b/easybuild/easyconfigs/s/SQLite/SQLite-3.9.2-intel-2015b.eb
@@ -33,7 +33,7 @@ dependencies = [
 parallel = 1
 
 sanity_check_paths = {
-    'files': ['bin/sqlite3', 'include/sqlite3ext.h', 'include/sqlite3.h', 'lib/libsqlite3.a', 'lib/libsqlite3.so'],
+    'files': ['bin/sqlite3', 'include/sqlite3ext.h', 'include/sqlite3.h', 'lib/libsqlite3.a', 'lib/libsqlite3.%s' % SHLIB_EXT],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/s/SQLite/SQLite-3.9.2-intel-2016a.eb b/easybuild/easyconfigs/s/SQLite/SQLite-3.9.2-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a35ea6d2811fc95f83728004d08f164fc58865d5
--- /dev/null
+++ b/easybuild/easyconfigs/s/SQLite/SQLite-3.9.2-intel-2016a.eb
@@ -0,0 +1,40 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Fotis Georgatos <fotis@cern.ch>
+# 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/
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'SQLite'
+version = '3.9.2'
+
+homepage = 'http://www.sqlite.org/'
+description = 'SQLite: SQL Database Engine in a C Library'
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+# eg. http://www.sqlite.org/2014/sqlite-autoconf-3080600.tar.gz
+source_urls = ['http://www.sqlite.org/2015/']
+version_str = '%%(version_major)s%s00' % ''.join('%02d' % int(x) for x in version.split('.')[1:])
+sources = ['sqlite-autoconf-%s.tar.gz' % version_str]
+
+dependencies = [
+    ('libreadline', '6.3'),
+    ('Tcl', '8.6.4'),
+]
+
+parallel = 1
+
+sanity_check_paths = {
+    'files': ['bin/sqlite3', 'include/sqlite3ext.h', 'include/sqlite3.h', 'lib/libsqlite3.a', 'lib/libsqlite3.%s' % SHLIB_EXT],
+    'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/s/SSAHA2/SSAHA2-2.5.5-i686.eb b/easybuild/easyconfigs/s/SSAHA2/SSAHA2-2.5.5-i686.eb
index c965b7304ffcfbffbe6901bf7a68cc9efd3e9298..0e8750aa56a92bca49be6c674c2413e423a96a74 100644
--- a/easybuild/easyconfigs/s/SSAHA2/SSAHA2-2.5.5-i686.eb
+++ b/easybuild/easyconfigs/s/SSAHA2/SSAHA2-2.5.5-i686.eb
@@ -28,7 +28,7 @@ sanity_check_paths = {
 }
 
 # add the installation dir to PATH
-modextrapaths = { 
+modextrapaths = {
     'PATH': "",
 }
 
diff --git a/easybuild/easyconfigs/s/SSAHA2/SSAHA2-2.5.5-x86_64.eb b/easybuild/easyconfigs/s/SSAHA2/SSAHA2-2.5.5-x86_64.eb
index bb97c237d90c7d939e161fb9b7d896dc1bd1b90d..ea1f495c8a6b9f24ec2dcaf74d60f7ef3fb3c9f0 100644
--- a/easybuild/easyconfigs/s/SSAHA2/SSAHA2-2.5.5-x86_64.eb
+++ b/easybuild/easyconfigs/s/SSAHA2/SSAHA2-2.5.5-x86_64.eb
@@ -28,7 +28,7 @@ sanity_check_paths = {
 }
 
 # add the installation dir to PATH
-modextrapaths = { 
+modextrapaths = {
     'PATH': "",
 }
 
diff --git a/easybuild/easyconfigs/s/STAR/STAR-2.3.0e-goolf-1.4.10.eb b/easybuild/easyconfigs/s/STAR/STAR-2.3.0e-goolf-1.4.10.eb
index c428723fec1ce476f55b4e38b9936cec7f7566cc..c819f307db7716444808d574a550bc59d707377a 100644
--- a/easybuild/easyconfigs/s/STAR/STAR-2.3.0e-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/s/STAR/STAR-2.3.0e-goolf-1.4.10.eb
@@ -6,7 +6,7 @@
 easyblock = 'MakeCp'
 
 name = 'STAR'
-version = '2.3.0e' 
+version = '2.3.0e'
 
 homepage = 'https://code.google.com/p/rna-star/'
 description = """ STAR aligns RNA-seq reads to a reference genome using 
@@ -25,7 +25,7 @@ prebuildopts = 'rm STAR && '
 parallel = 1
 
 files_to_copy = [(["STAR"], "bin"), "README.txt"]
-        
+
 sanity_check_paths = {
     'files': ["bin/STAR"],
     'dirs': [],
diff --git a/easybuild/easyconfigs/s/STAR/STAR-2.5.0a-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/s/STAR/STAR-2.5.0a-GNU-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2a0e1ca5db44719858b5ea2f8df34f31dfd7da5b
--- /dev/null
+++ b/easybuild/easyconfigs/s/STAR/STAR-2.5.0a-GNU-4.9.3-2.25.eb
@@ -0,0 +1,32 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# sciCORE - University of Basel
+# SIB Swiss Institute of Bioinformatics
+
+easyblock = 'MakeCp'
+
+name = 'STAR'
+version = '2.5.0a'
+
+homepage = 'https://code.google.com/p/rna-star/'
+description = """ STAR aligns RNA-seq reads to a reference genome using 
+ uncompressed suffix arrays. """
+
+toolchain = {'name': 'GNU', 'version': '4.9.3-2.25'}
+
+source_urls = ['https://github.com/alexdobin/STAR/archive/']
+sources = ['%(name)s_%(version)s.tar.gz']
+
+# a binary is provided with the source files. We delete it
+prebuildopts = 'rm -fr bin/ && '
+
+parallel = 1
+
+files_to_copy = [(["source/STAR"], "bin"), "CHANGES.md", "doc", "extras", "LICENSE", "README.md", "RELEASEnotes.md"]
+
+sanity_check_paths = {
+    'files': ["bin/STAR"],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/STAR/STAR-2.5.0a-goolf-1.4.10.eb b/easybuild/easyconfigs/s/STAR/STAR-2.5.0a-goolf-1.4.10.eb
index 6a4e930918f99d68f0107d4aa8c21c87eeb4b3b5..ab46efb39c664961e1db9d749f3d076834ed1b6a 100644
--- a/easybuild/easyconfigs/s/STAR/STAR-2.5.0a-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/s/STAR/STAR-2.5.0a-goolf-1.4.10.eb
@@ -6,7 +6,7 @@
 easyblock = 'MakeCp'
 
 name = 'STAR'
-version = '2.5.0a' 
+version = '2.5.0a'
 
 homepage = 'https://code.google.com/p/rna-star/'
 description = """ STAR aligns RNA-seq reads to a reference genome using 
@@ -23,7 +23,7 @@ prebuildopts = 'rm -fr bin/ && '
 parallel = 1
 
 files_to_copy = [(["source/STAR"], "bin"), "CHANGES.md", "doc", "extras", "LICENSE", "README.md", "RELEASEnotes.md"]
-        
+
 sanity_check_paths = {
     'files': ["bin/STAR"],
     'dirs': [],
diff --git a/easybuild/easyconfigs/s/SWIG/SWIG-3.0.8-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/s/SWIG/SWIG-3.0.8-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0b3c5f42cf9e30391728151dd958bbcdc97f520e
--- /dev/null
+++ b/easybuild/easyconfigs/s/SWIG/SWIG-3.0.8-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,23 @@
+name = 'SWIG'
+version = '3.0.8'
+
+homepage = 'http://www.swig.org/'
+description = """SWIG is a software development tool that connects programs written in C and C++ with
+ a variety of high-level programming languages."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+python = 'Python'
+pythonversion = '2.7.11'
+versionsuffix = '-%s-%s' % (python, pythonversion)
+
+dependencies = [
+    (python, pythonversion),
+    ('PCRE', '8.37'),
+]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3-goolf-1.4.10.eb b/easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3-goolf-1.4.10.eb
index 55cd2babc089c069e03fc4f96deb375f872657b0..fb000c408e02a88af429476049a4bdca97c796b4 100644
--- a/easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3-goolf-1.4.10.eb
@@ -14,7 +14,7 @@ sources = ['Sablot-%(version)s.tar.gz']
 dependencies = [('expat', '2.1.0')]
 
 sanity_check_paths = {
-    'files': ['bin/sabcmd', 'bin/sablot-config', 'include/sablot.h', 'lib/libsablot.a', 'lib/libsablot.so'],
+    'files': ['bin/sabcmd', 'bin/sablot-config', 'include/sablot.h', 'lib/libsablot.a', 'lib/libsablot.%s' % SHLIB_EXT],
     'dirs': ['share/doc/html/sablot', 'man'],
 }
 
diff --git a/easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3-ictce-4.1.13.eb b/easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3-ictce-4.1.13.eb
index db41cb46c7d16b4364771b72acaf210ab5cc81f1..c8667ed41e9b78c7ef7c29dcdbfc76f3df5c0bd6 100644
--- a/easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3-ictce-4.1.13.eb
@@ -16,7 +16,7 @@ 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'],
+    'files': ['bin/sabcmd', 'bin/sablot-config', 'include/sablot.h', 'lib/libsablot.a', 'lib/libsablot.%s' % SHLIB_EXT],
     'dirs': ['share/doc/html/sablot', 'man'],
 }
 
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
index 3b78da50c78dbf76d5f51269b422a17ab61073a1..7516655a5bd324df6ce511ab09534620f0b42623 100644
--- 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
@@ -16,7 +16,7 @@ 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'],
+    'files': ['bin/sabcmd', 'bin/sablot-config', 'include/sablot.h', 'lib/libsablot.a', 'lib/libsablot.%s' % SHLIB_EXT],
     'dirs': ['share/doc/html/sablot', 'man'],
 }
 
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-2016a-OpenBLAS-0.2.15-LAPACK-3.6.0.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-2016a-OpenBLAS-0.2.15-LAPACK-3.6.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1326db5fe2ebbbc3616ffbcf9d601b98c1111963
--- /dev/null
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-2016a-OpenBLAS-0.2.15-LAPACK-3.6.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': '2016a'}
+toolchainopts = {'pic': True}
+
+source_urls = [homepage]
+sources = [SOURCELOWER_TGZ]
+
+blaslib = 'OpenBLAS'
+blasver = '0.2.15'
+blassuff = '-LAPACK-3.6.0'
+
+versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff)
+
+dependencies = [(blaslib, blasver, blassuff, ('GCC', '4.9.3-2.25'))]
+
+## parallel build tends to fail, so disabling it
+parallel = 1
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.9.4-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.9.4-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..47671f1164cf4fd0e29bc09208daaddca11b5766
--- /dev/null
+++ b/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.9.4-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,35 @@
+easyblock = 'PythonPackage'
+
+name = 'ScientificPython'
+version = '2.9.4'
+
+homepage = 'https://sourcesup.cru.fr/projects/scientific-py/'
+description = """ScientificPython is a collection of Python modules for scientific computing.
+ It contains support for geometry, mathematical functions, statistics, physical units, IO, visualization,
+ and parallelization."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = ['https://sourcesup.renater.fr/frs/download.php/4570']
+sources = [SOURCE_TAR_GZ]
+
+pyver = '2.7.11'
+pyshortver = '.'.join(pyver.split('.')[:2])
+
+versionsuffix = '-Python-%s' % pyver
+
+dependencies = [
+    ('Python', pyver),
+    # older version of numpy than the one included in Python module required
+    # cfr. https://bitbucket.org/khinsen/scientificpython/issue/13/numpy-19-has-dropped-support-for
+    ('numpy', '1.8.2', versionsuffix),
+]
+
+options = {'modulename': 'Scientific'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%s/site-packages/Scientific' % pyshortver],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/s/Serf/Serf-1.3.8-foss-2015a.eb b/easybuild/easyconfigs/s/Serf/Serf-1.3.8-foss-2015a.eb
index febe7d2fb6a453a218f5acec10a906e702034006..0676f0176618165b22cfce60ac9b080b7a49f058 100644
--- a/easybuild/easyconfigs/s/Serf/Serf-1.3.8-foss-2015a.eb
+++ b/easybuild/easyconfigs/s/Serf/Serf-1.3.8-foss-2015a.eb
@@ -30,7 +30,7 @@ osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
 buildopts = "APR=$EBROOTAPR/bin/apr-1-config APU=$EBROOTAPRMINUTIL/bin/apu-1-config"
 
 sanity_check_paths = {
-    'files': ['include/serf-1/serf.h'] + 
+    'files': ['include/serf-1/serf.h'] +
              ['lib/libserf-1.%s' % x for x in ['a', 'so']],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/s/Spark/Spark-1.6.0.eb b/easybuild/easyconfigs/s/Spark/Spark-1.6.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..276eb5f0cf8f4777bc6fdde336a8d191d98160d0
--- /dev/null
+++ b/easybuild/easyconfigs/s/Spark/Spark-1.6.0.eb
@@ -0,0 +1,27 @@
+easyblock = 'Tarball'
+
+name = 'Spark'
+version = '1.6.0'
+
+homepage = 'http://spark.apache.org'
+description = """Spark is Hadoop MapReduce done in memory"""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = ['%(namelower)s-%(version)s-bin-hadoop2.6.tgz']
+source_urls = [
+    'http://apache.belnet.be/%(namelower)s/%(namelower)s-%(version)s/',
+    'http://www.eu.apache.org/dist/%(namelower)s/%(namelower)s-%(version)s/',
+    'http://www.us.apache.org/dist/%(namelower)s/%(namelower)s-%(version)s/',
+]
+
+dependencies = [('Java', '1.7.0_80')]
+
+sanity_check_paths = {
+    'files': ['bin/spark-shell'],
+    'dirs': ['lib', 'python']
+}
+
+modextrapaths = {'PYTHONPATH': 'python'}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/s/Sphinx/Sphinx-1.3.3-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/s/Sphinx/Sphinx-1.3.3-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3813e03737da16b580757c521935f2a0be5dfcbf
--- /dev/null
+++ b/easybuild/easyconfigs/s/Sphinx/Sphinx-1.3.3-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,71 @@
+easyblock = 'Bundle'
+
+name = 'Sphinx'
+version = '1.3.3'
+
+homepage = 'http://sphinx.pocoo.org/'
+description = """Sphinx is a tool that makes it easy to create intelligent and beautiful documentation.
+ It was originally created for the new Python documentation, and it has excellent facilities for the 
+ 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': 'intel', 'version': '2015b'}
+
+# this is a bundle of Python packages
+exts_defaultclass = 'PythonPackage'
+exts_filter = ('python -c "import %(ext_name)s"', '')
+
+pyver = '2.7.11'
+pyshortver = '.'.join(pyver.split('.')[0:2])
+versionsuffix = '-Python-%s' % pyver
+
+dependencies = [
+    ('Python', pyver),
+]
+
+exts_list = [
+    ('Docutils', '0.12', {
+        'source_tmpl': 'docutils-%(version)s.tar.gz',
+        'source_urls': [('http://sourceforge.net/projects/docutils/files/docutils/%(version)s/', 'download')],
+    }),
+    ('Jinja2', '2.8', {
+        'source_urls': ['https://pypi.python.org/packages/source/J/Jinja2/'],
+    }),
+    ('Pygments', '2.0.2', {
+        'source_urls': ['https://pypi.python.org/packages/source/P/Pygments'],
+    }),
+    ('snowballstemmer', '1.2.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/s/snowballstemmer/'],
+    }),
+    ('Babel', '2.2.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/B/Babel/'],
+    }),
+    ('alabaster', '0.7.7', {
+        'source_urls': ['https://pypi.python.org/packages/source/a/alabaster/'],
+    }),
+    (name, version, {
+        'source_urls': ['https://pypi.python.org/packages/source/S/Sphinx/'],
+    }),
+    # sphinx_rtd_theme depends on Sphinx, and should be there to make the tests work
+    ('sphinx_rtd_theme', '0.1.9', {
+        'source_urls': ['https://pypi.python.org/packages/source/s/sphinx_rtd_theme/'],
+    }),
+]
+
+# Sphinx unit tests *after* installing extensions
+postinstallcmds = [' && '.join([
+    "cd %(builddir)s/%(name)s/%(name)s-%(version)s/",
+    "PYTHONPATH=%%(installdir)s/lib/python%s/site-packages/:$PYTHONPATH make test" % pyshortver,
+])]
+
+# specify that Bundle easyblock should run a full sanity check, rather than just trying to load the module
+full_sanity_check = True
+
+sanity_check_paths = {
+    'files': ['bin/sphinx-%s' % x for x in ['apidoc', 'autogen', 'build', 'quickstart']],
+    'dirs': ['lib/python%s/site-packages' % pyshortver],
+}
+
+modextrapaths = {'PYTHONPATH': ['lib/python%s/site-packages' % pyshortver]}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/s/Stampy/Stampy-1.0.28-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/s/Stampy/Stampy-1.0.28-intel-2015b-Python-2.7.10.eb
index 54957600564781c6524af507a2ce0d66bada000b..04304ec6c24c29b04092b33c7cab98c6092337df 100644
--- a/easybuild/easyconfigs/s/Stampy/Stampy-1.0.28-intel-2015b-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/s/Stampy/Stampy-1.0.28-intel-2015b-Python-2.7.10.eb
@@ -22,10 +22,10 @@ dependencies = [
     ('Python', pyver),
 ]
 
-files_to_copy = ['ext', 'maptools.so', 'plugins', 'README.txt', 'Stampy', 'stampy.py']
+files_to_copy = ['ext', 'maptools.%s' % SHLIB_EXT, 'plugins', 'README.txt', 'Stampy', 'stampy.py']
 
 sanity_check_paths = {
-    'files': ['maptools.so', 'stampy.py'],
+    'files': ['maptools.%s' % SHLIB_EXT, 'stampy.py'],
     'dirs': ['ext', 'plugins', 'Stampy'],
 }
 
diff --git a/easybuild/easyconfigs/s/Subversion/Subversion-1.8.14-foss-2015a.eb b/easybuild/easyconfigs/s/Subversion/Subversion-1.8.14-foss-2015a.eb
index 9bae8b637e1c02963100cc848cd72284fe371ae6..be6f1332e2d701f6a307a316f2fcf43badc45774 100644
--- a/easybuild/easyconfigs/s/Subversion/Subversion-1.8.14-foss-2015a.eb
+++ b/easybuild/easyconfigs/s/Subversion/Subversion-1.8.14-foss-2015a.eb
@@ -31,4 +31,4 @@ sanity_check_paths = {
     'dirs': [],
 }
 
-moduleclass = 'tools' 
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-4.4.5-intel-2015b-METIS-5.1.0.eb b/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-4.4.5-intel-2015b-METIS-5.1.0.eb
index 49a8ba6feadf6665a65891a1181b59da6f162296..36dee081edeeb252a1824b5613b3e5da1eafb5cf 100644
--- a/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-4.4.5-intel-2015b-METIS-5.1.0.eb
+++ b/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-4.4.5-intel-2015b-METIS-5.1.0.eb
@@ -11,7 +11,7 @@ source_urls = ['http://faculty.cse.tamu.edu/davis/SuiteSparse/']
 sources = [SOURCE_TAR_GZ]
 
 patches = [
-    'SuiteSparse-%(version)s_AMD_GNUMakefile.patch', 
+    'SuiteSparse-%(version)s_AMD_GNUMakefile.patch',
     'SuiteSparse-%(version)s_UMFPACK_GNUMakefile.patch',
 ]
 
diff --git a/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-4.4.6-intel-2015b-ParMETIS-4.0.3.eb b/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-4.4.6-intel-2015b-ParMETIS-4.0.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f139f365f0d7df49d8fe2053c2d0ddf6115e1c7a
--- /dev/null
+++ b/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-4.4.6-intel-2015b-ParMETIS-4.0.3.eb
@@ -0,0 +1,20 @@
+name = 'SuiteSparse'
+version = '4.4.6'
+
+homepage = 'http://www.cise.ufl.edu/research/sparse/SuiteSparse/'
+description = """SuiteSparse is a collection of libraries manipulate sparse matrices."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'opt': True, 'unroll': True, 'pic': True}
+
+source_urls = ['http://faculty.cse.tamu.edu/davis/SuiteSparse/']
+sources = [SOURCE_TAR_GZ]
+
+parmetis = 'ParMETIS'
+parmetis_ver = '4.0.3'
+versionsuffix = '-%s-%s' % (parmetis, parmetis_ver)
+dependencies = [(parmetis, parmetis_ver)]
+
+maxparallel = 1
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-CrayGNU-5.1.29.eb b/easybuild/easyconfigs/s/Szip/Szip-2.1-CrayGNU-5.1.29.eb
index dfcda740abf749e3526172aa9d71843c075f6bfb..04ccb9df33f9344330b6ee3261c6300a427da1c2 100644
--- a/easybuild/easyconfigs/s/Szip/Szip-2.1-CrayGNU-5.1.29.eb
+++ b/easybuild/easyconfigs/s/Szip/Szip-2.1-CrayGNU-5.1.29.eb
@@ -15,7 +15,7 @@ sources = [SOURCELOWER_TAR_GZ]
 configopts = "--with-pic"
 
 sanity_check_paths = {
-    'files': ["lib/libsz.a", "lib/libsz.so"] +
+    'files': ["lib/libsz.a", "lib/libsz.%s" % SHLIB_EXT] +
              ["include/%s" % x for x in ["ricehdf.h", "szip_adpt.h", "szlib.h"]],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-CrayGNU-5.2.25.eb b/easybuild/easyconfigs/s/Szip/Szip-2.1-CrayGNU-5.2.25.eb
index 0772f31b941fc2ede2b6aa53ad18ff9219221e4e..ce6dcbcc3dfae25a0f23d799b8089a20f2765a18 100644
--- a/easybuild/easyconfigs/s/Szip/Szip-2.1-CrayGNU-5.2.25.eb
+++ b/easybuild/easyconfigs/s/Szip/Szip-2.1-CrayGNU-5.2.25.eb
@@ -15,7 +15,7 @@ sources = [SOURCELOWER_TAR_GZ]
 configopts = "--with-pic"
 
 sanity_check_paths = {
-    'files': ["lib/libsz.a", "lib/libsz.so"] +
+    'files': ["lib/libsz.a", "lib/libsz.%s" % SHLIB_EXT] +
              ["include/%s" % x for x in ["ricehdf.h", "szip_adpt.h", "szlib.h"]],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-CrayGNU-5.2.40.eb b/easybuild/easyconfigs/s/Szip/Szip-2.1-CrayGNU-5.2.40.eb
index d98933db4b77e10a3b372b457b2863986e4fb218..821b800cb60f12e7df29d65c38ee2dc24e64dcf9 100644
--- a/easybuild/easyconfigs/s/Szip/Szip-2.1-CrayGNU-5.2.40.eb
+++ b/easybuild/easyconfigs/s/Szip/Szip-2.1-CrayGNU-5.2.40.eb
@@ -15,7 +15,7 @@ sources = [SOURCELOWER_TAR_GZ]
 configopts = "--with-pic"
 
 sanity_check_paths = {
-    'files': ["lib/libsz.a", "lib/libsz.so"] +
+    'files': ["lib/libsz.a", "lib/libsz.%s" % SHLIB_EXT] +
              ["include/%s" % x for x in ["ricehdf.h", "szip_adpt.h", "szlib.h"]],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-GCC-4.8.1.eb b/easybuild/easyconfigs/s/Szip/Szip-2.1-GCC-4.8.1.eb
index e5111378c88c913c66f2a5535f1d69dc0299f2b2..4356912900b65786361884ed4fae8d4a002b5936 100644
--- a/easybuild/easyconfigs/s/Szip/Szip-2.1-GCC-4.8.1.eb
+++ b/easybuild/easyconfigs/s/Szip/Szip-2.1-GCC-4.8.1.eb
@@ -15,7 +15,7 @@ sources = [SOURCELOWER_TAR_GZ]
 configopts = "--with-pic"
 
 sanity_check_paths = {
-    'files': ["lib/libsz.a", "lib/libsz.so"] +
+    'files': ["lib/libsz.a", "lib/libsz.%s" % SHLIB_EXT] +
              ["include/%s" % x for x in ["ricehdf.h", "szip_adpt.h", "szlib.h"]],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-foss-2014b.eb b/easybuild/easyconfigs/s/Szip/Szip-2.1-foss-2014b.eb
index 9d1f75c5eb86da7db35e3da92c6efccddcfa985a..d4cbdb38bb41de45c7d7f3f47c856b36b100b29c 100644
--- a/easybuild/easyconfigs/s/Szip/Szip-2.1-foss-2014b.eb
+++ b/easybuild/easyconfigs/s/Szip/Szip-2.1-foss-2014b.eb
@@ -15,7 +15,7 @@ sources = [SOURCELOWER_TAR_GZ]
 configopts = "--with-pic"
 
 sanity_check_paths = {
-    'files': ["lib/libsz.a", "lib/libsz.so"] +
+    'files': ["lib/libsz.a", "lib/libsz.%s" % SHLIB_EXT] +
              ["include/%s" % x for x in ["ricehdf.h", "szip_adpt.h", "szlib.h"]],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-foss-2015a.eb b/easybuild/easyconfigs/s/Szip/Szip-2.1-foss-2015a.eb
index 5647497c3f48baf5f9cc97c555f8e3ba5a45a6bd..8ee9a367a651bc69659a202966a5da1b9ff65bf8 100644
--- a/easybuild/easyconfigs/s/Szip/Szip-2.1-foss-2015a.eb
+++ b/easybuild/easyconfigs/s/Szip/Szip-2.1-foss-2015a.eb
@@ -15,7 +15,7 @@ sources = [SOURCELOWER_TAR_GZ]
 configopts = "--with-pic"
 
 sanity_check_paths = {
-    'files': ["lib/libsz.a", "lib/libsz.so"] +
+    'files': ["lib/libsz.a", "lib/libsz.%s" % SHLIB_EXT] +
              ["include/%s" % x for x in ["ricehdf.h", "szip_adpt.h", "szlib.h"]],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-gmpolf-1.4.8.eb b/easybuild/easyconfigs/s/Szip/Szip-2.1-gmpolf-1.4.8.eb
index b6931f92b4b776a556e39e6675f6481fcd067b9a..d8346a8fe3d3fee20388046d440e588673076342 100644
--- a/easybuild/easyconfigs/s/Szip/Szip-2.1-gmpolf-1.4.8.eb
+++ b/easybuild/easyconfigs/s/Szip/Szip-2.1-gmpolf-1.4.8.eb
@@ -15,7 +15,7 @@ sources = [SOURCELOWER_TAR_GZ]
 configopts = "--with-pic"
 
 sanity_check_paths = {
-    'files': ["lib/libsz.a", "lib/libsz.so"] +
+    'files': ["lib/libsz.a", "lib/libsz.%s" % SHLIB_EXT] +
              ["include/%s" % x for x in ["ricehdf.h", "szip_adpt.h", "szlib.h"]],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/s/Szip/Szip-2.1-goalf-1.1.0-no-OFED.eb
index 428ca53264fa8960e3514a6517c2d4d3eb41993c..c930788a686acc6cfc75c59214158e81e9dd9b42 100644
--- a/easybuild/easyconfigs/s/Szip/Szip-2.1-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/s/Szip/Szip-2.1-goalf-1.1.0-no-OFED.eb
@@ -15,7 +15,7 @@ sources = [SOURCELOWER_TAR_GZ]
 configopts = "--with-pic"
 
 sanity_check_paths = {
-    'files': ["lib/libsz.a", "lib/libsz.so"] +
+    'files': ["lib/libsz.a", "lib/libsz.%s" % SHLIB_EXT] +
              ["include/%s" % x for x in ["ricehdf.h", "szip_adpt.h", "szlib.h"]],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-goolf-1.4.10.eb b/easybuild/easyconfigs/s/Szip/Szip-2.1-goolf-1.4.10.eb
index e66bad6682d5a81eebe3d2e107c62cefc7a02622..fa8030d775f837abafddff4295ee08709da70f3d 100644
--- a/easybuild/easyconfigs/s/Szip/Szip-2.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/s/Szip/Szip-2.1-goolf-1.4.10.eb
@@ -15,7 +15,7 @@ sources = [SOURCELOWER_TAR_GZ]
 configopts = "--with-pic"
 
 sanity_check_paths = {
-    'files': ["lib/libsz.a", "lib/libsz.so"] +
+    'files': ["lib/libsz.a", "lib/libsz.%s" % SHLIB_EXT] +
              ["include/%s" % x for x in ["ricehdf.h", "szip_adpt.h", "szlib.h"]],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-goolf-1.5.14.eb b/easybuild/easyconfigs/s/Szip/Szip-2.1-goolf-1.5.14.eb
index a04f95998388f1630d9fe77142e169964d0606e4..af861220378e273814042988489f4c9946105526 100644
--- a/easybuild/easyconfigs/s/Szip/Szip-2.1-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/s/Szip/Szip-2.1-goolf-1.5.14.eb
@@ -6,7 +6,7 @@ version = '2.1'
 homepage = 'http://www.hdfgroup.org/doc_resource/SZIP/'
 description = "Szip compression software, providing lossless compression of scientific data"
 
-toolchain = {'name': 'goolf', 'version': '1.5.14'} 
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
 toolchainopts = {'optarch': True, 'pic': True}
 
 source_urls = ['http://www.hdfgroup.org/ftp/lib-external/szip/%(version)s/src']
@@ -15,7 +15,7 @@ sources = [SOURCELOWER_TAR_GZ]
 configopts = "--with-pic"
 
 sanity_check_paths = {
-    'files': ["lib/libsz.a", "lib/libsz.so"] +
+    'files': ["lib/libsz.a", "lib/libsz.%s" % SHLIB_EXT] +
              ["include/%s" % x for x in ["ricehdf.h", "szip_adpt.h", "szlib.h"]],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-3.2.2.u3.eb
index f3ea085a384e956110c0a47c12b3962bc8d5b0ba..c3644809e1104ea29cd536f5571763c859a740f5 100644
--- a/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-3.2.2.u3.eb
+++ b/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-3.2.2.u3.eb
@@ -15,7 +15,7 @@ sources = [SOURCELOWER_TAR_GZ]
 configopts = "--with-pic"
 
 sanity_check_paths = {
-    'files': ["lib/libsz.a", "lib/libsz.so"] +
+    'files': ["lib/libsz.a", "lib/libsz.%s" % SHLIB_EXT] +
              ["include/%s" % x for x in ["ricehdf.h", "szip_adpt.h", "szlib.h"]],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-4.0.6.eb b/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-4.0.6.eb
index 3b871003de503a517b89de388d2ea6d47c43a30c..f5069f13af4b48ad50ae5ddbcf98de5558b7be09 100644
--- a/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-4.0.6.eb
@@ -15,7 +15,7 @@ sources = [SOURCELOWER_TAR_GZ]
 configopts = "--with-pic"
 
 sanity_check_paths = {
-    'files': ["lib/libsz.a", "lib/libsz.so"] +
+    'files': ["lib/libsz.a", "lib/libsz.%s" % SHLIB_EXT] +
              ["include/%s" % x for x in ["ricehdf.h", "szip_adpt.h", "szlib.h"]],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-4.1.13.eb b/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-4.1.13.eb
index 508e0b416f5adf083c3fd185c0075fa1b214e47b..0f73cd22ed1cea9ee7b06f3369115920b045a7ca 100644
--- a/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-4.1.13.eb
@@ -15,7 +15,7 @@ sources = [SOURCELOWER_TAR_GZ]
 configopts = "--with-pic"
 
 sanity_check_paths = {
-    'files': ["lib/libsz.a", "lib/libsz.so"] +
+    'files': ["lib/libsz.a", "lib/libsz.%s" % SHLIB_EXT] +
              ["include/%s" % x for x in ["ricehdf.h", "szip_adpt.h", "szlib.h"]],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-5.2.0.eb b/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-5.2.0.eb
index add5a1ec83791c5f6b2f37eb5d36782e50f174bd..57102b24eb418e3af8485dd9061dc2af4ee11f79 100644
--- a/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-5.2.0.eb
+++ b/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-5.2.0.eb
@@ -15,7 +15,7 @@ sources = [SOURCELOWER_TAR_GZ]
 configopts = "--with-pic"
 
 sanity_check_paths = {
-    'files': ["lib/libsz.a", "lib/libsz.so"] +
+    'files': ["lib/libsz.a", "lib/libsz.%s" % SHLIB_EXT] +
              ["include/%s" % x for x in ["ricehdf.h", "szip_adpt.h", "szlib.h"]],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-5.3.0.eb b/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-5.3.0.eb
index b4b3cf902353ecde7a3506362a8cbc321f3f9c48..9fb50c3aaa48363b9d95f11f231618d6a8303d69 100644
--- a/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-5.3.0.eb
@@ -15,7 +15,7 @@ sources = [SOURCELOWER_TAR_GZ]
 configopts = "--with-pic"
 
 sanity_check_paths = {
-    'files': ["lib/libsz.a", "lib/libsz.so"] +
+    'files': ["lib/libsz.a", "lib/libsz.%s" % SHLIB_EXT] +
              ["include/%s" % x for x in ["ricehdf.h", "szip_adpt.h", "szlib.h"]],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-5.4.0.eb b/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-5.4.0.eb
index 43e89506aa9109ba49c579d236b3c1d76791cf46..6e85cddcb43ab3110b207a4bda341625e6ae39cf 100644
--- a/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-5.4.0.eb
+++ b/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-5.4.0.eb
@@ -15,7 +15,7 @@ sources = [SOURCELOWER_TAR_GZ]
 configopts = "--with-pic"
 
 sanity_check_paths = {
-    'files': ["lib/libsz.a", "lib/libsz.so"] +
+    'files': ["lib/libsz.a", "lib/libsz.%s" % SHLIB_EXT] +
              ["include/%s" % x for x in ["ricehdf.h", "szip_adpt.h", "szlib.h"]],
     'dirs': [],
 }
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
index c69f9f0890413376d6d456418cd0ce2814cb0c6c..874483a81c8806c4582de69473df1d627b29eb03 100644
--- 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
@@ -15,7 +15,7 @@ sources = [SOURCELOWER_TAR_GZ]
 configopts = "--with-pic"
 
 sanity_check_paths = {
-    'files': ["lib/libsz.a", "lib/libsz.so"] +
+    'files': ["lib/libsz.a", "lib/libsz.%s" % SHLIB_EXT] +
              ["include/%s" % x for x in ["ricehdf.h", "szip_adpt.h", "szlib.h"]],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-6.1.5.eb b/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-6.1.5.eb
index d90d48702e0469fa4f0aa9cf1081706f00641106..dd9bbe69e877a71b8f14b11c0b47a622fcb6a634 100644
--- a/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-6.1.5.eb
+++ b/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-6.1.5.eb
@@ -15,7 +15,7 @@ sources = [SOURCELOWER_TAR_GZ]
 configopts = "--with-pic"
 
 sanity_check_paths = {
-    'files': ["lib/libsz.a", "lib/libsz.so"] +
+    'files': ["lib/libsz.a", "lib/libsz.%s" % SHLIB_EXT] +
              ["include/%s" % x for x in ["ricehdf.h", "szip_adpt.h", "szlib.h"]],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-7.1.2.eb b/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-7.1.2.eb
index 169a754e3c3057b0467e1017eadf91c2a71b378d..7ab0bfa52d901b90546c625332b2f4cbd2f251eb 100644
--- a/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-7.1.2.eb
+++ b/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-7.1.2.eb
@@ -15,7 +15,7 @@ sources = [SOURCELOWER_TAR_GZ]
 configopts = "--with-pic"
 
 sanity_check_paths = {
-    'files': ["lib/libsz.a", "lib/libsz.so"] +
+    'files': ["lib/libsz.a", "lib/libsz.%s" % SHLIB_EXT] +
              ["include/%s" % x for x in ["ricehdf.h", "szip_adpt.h", "szlib.h"]],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-intel-2014b.eb b/easybuild/easyconfigs/s/Szip/Szip-2.1-intel-2014b.eb
index 5d4845b9932520ecc83d15b627fc4265b6839878..f873b710360dda1026f546c040835ec0cbf6e181 100644
--- a/easybuild/easyconfigs/s/Szip/Szip-2.1-intel-2014b.eb
+++ b/easybuild/easyconfigs/s/Szip/Szip-2.1-intel-2014b.eb
@@ -15,7 +15,7 @@ sources = [SOURCELOWER_TAR_GZ]
 configopts = "--with-pic"
 
 sanity_check_paths = {
-    'files': ["lib/libsz.a", "lib/libsz.so"] +
+    'files': ["lib/libsz.a", "lib/libsz.%s" % SHLIB_EXT] +
              ["include/%s" % x for x in ["ricehdf.h", "szip_adpt.h", "szlib.h"]],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-intel-2015a.eb b/easybuild/easyconfigs/s/Szip/Szip-2.1-intel-2015a.eb
index 989df56176db956aa83104193a7e05b6280a07db..0c94946cf2c5e58513dcf2f3e279ee2a341bf92d 100644
--- a/easybuild/easyconfigs/s/Szip/Szip-2.1-intel-2015a.eb
+++ b/easybuild/easyconfigs/s/Szip/Szip-2.1-intel-2015a.eb
@@ -15,7 +15,7 @@ sources = [SOURCELOWER_TAR_GZ]
 configopts = "--with-pic"
 
 sanity_check_paths = {
-    'files': ["lib/libsz.a", "lib/libsz.so"] +
+    'files': ["lib/libsz.a", "lib/libsz.%s" % SHLIB_EXT] +
              ["include/%s" % x for x in ["ricehdf.h", "szip_adpt.h", "szlib.h"]],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-intel-2015b.eb b/easybuild/easyconfigs/s/Szip/Szip-2.1-intel-2015b.eb
index 8b003830371e42ab776dc412b4b91ab8f987414d..fdf466086698383784f7dee3734d999f55c39eea 100644
--- a/easybuild/easyconfigs/s/Szip/Szip-2.1-intel-2015b.eb
+++ b/easybuild/easyconfigs/s/Szip/Szip-2.1-intel-2015b.eb
@@ -15,7 +15,7 @@ sources = [SOURCELOWER_TAR_GZ]
 configopts = "--with-pic"
 
 sanity_check_paths = {
-    'files': ["lib/libsz.a", "lib/libsz.so"] +
+    'files': ["lib/libsz.a", "lib/libsz.%s" % SHLIB_EXT] +
              ["include/%s" % x for x in ["ricehdf.h", "szip_adpt.h", "szlib.h"]],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-iqacml-3.7.3.eb b/easybuild/easyconfigs/s/Szip/Szip-2.1-iqacml-3.7.3.eb
index 4e7d1f550f63573adbae6b4b78acf0a9ad9893fd..5077e60bd160bd14f89d778c70b4a0a854409917 100644
--- a/easybuild/easyconfigs/s/Szip/Szip-2.1-iqacml-3.7.3.eb
+++ b/easybuild/easyconfigs/s/Szip/Szip-2.1-iqacml-3.7.3.eb
@@ -15,7 +15,7 @@ sources = [SOURCELOWER_TAR_GZ]
 configopts = "--with-pic"
 
 sanity_check_paths = {
-    'files': ["lib/libsz.a", "lib/libsz.so"] +
+    'files': ["lib/libsz.a", "lib/libsz.%s" % SHLIB_EXT] +
              ["include/%s" % x for x in ["ricehdf.h", "szip_adpt.h", "szlib.h"]],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/s/scikit-umfpack/scikit-umfpack-0.2.1-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/s/scikit-umfpack/scikit-umfpack-0.2.1-intel-2015b-Python-2.7.10.eb
index c30e04d554fc35204f998ead73ef3342bbc93146..f47e1ccb983d0cc65120e39132c6410bf349698c 100644
--- a/easybuild/easyconfigs/s/scikit-umfpack/scikit-umfpack-0.2.1-intel-2015b-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/s/scikit-umfpack/scikit-umfpack-0.2.1-intel-2015b-Python-2.7.10.eb
@@ -23,7 +23,7 @@ dependencies = [
 
 builddependencies = [
     ('SWIG', '3.0.7', versionsuffix),
-] 
+]
 
 options = {'modulename': 'scikits'}
 
diff --git a/easybuild/easyconfigs/s/scipy/scipy-0.16.1-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/s/scipy/scipy-0.16.1-intel-2015b-Python-2.7.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..bf26ec46a2125a64fc4e81086e8dd2fdf6e6610e
--- /dev/null
+++ b/easybuild/easyconfigs/s/scipy/scipy-0.16.1-intel-2015b-Python-2.7.10.eb
@@ -0,0 +1,19 @@
+name = 'scipy'
+version = '0.16.1'
+versionsuffix = '-Python-2.7.10'
+
+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': 'intel', 'version': '2015b'}
+toolchainopts = {'pic': True}
+
+source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%(version)s', 'download')]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('numpy', '1.10.4', versionsuffix),
+]
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/s/slepc4py/slepc4py-3.6.0-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/s/slepc4py/slepc4py-3.6.0-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9759c25617341d0e455b50d5bd21b28289002b3e
--- /dev/null
+++ b/easybuild/easyconfigs/s/slepc4py/slepc4py-3.6.0-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,29 @@
+easyblock = 'PythonPackage'
+
+name = 'slepc4py'
+version = '3.6.0'
+
+homepage = 'https://bitbucket.org/slepc/slepc4py'
+description = "Python bindings for SLEPc, the Scalable Library for Eigenvalue Problem Computations."
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+pyver = '2.7.11'
+versionsuffix = '-Python-%s' % pyver
+
+dependencies = [
+    ('Python', pyver),
+    ('SLEPc', '3.6.2', versionsuffix),
+    ('petsc4py', '3.6.0', versionsuffix),
+]
+
+pyshortver = '.'.join(pyver.split('.')[:2])
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%s/site-packages' % pyshortver],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/s/snappy/snappy-1.1.2-GCC-4.9.2.eb b/easybuild/easyconfigs/s/snappy/snappy-1.1.2-GCC-4.9.2.eb
index 551924427db6983d92bab23312dfba6e75b0a384..c94ded9731dd664808f7cf5edd8ea839731db2e4 100644
--- a/easybuild/easyconfigs/s/snappy/snappy-1.1.2-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/s/snappy/snappy-1.1.2-GCC-4.9.2.eb
@@ -21,7 +21,7 @@ sources = ['%s.tar.gz' % commit]
 preconfigopts = "./autogen.sh && "
 
 sanity_check_paths = {
-    'files': ['lib/libsnappy.so'],
+    'files': ['lib/libsnappy.%s' % SHLIB_EXT],
     'dirs': ['include', 'share']
 }
 
diff --git a/easybuild/easyconfigs/s/snappy/snappy-1.1.3-GCC-4.9.3.eb b/easybuild/easyconfigs/s/snappy/snappy-1.1.3-GCC-4.9.3.eb
index 1043087833fca0e54aba1eb3a677560c0d4a926a..901b001dcd699a549b2720b4596634aedecbe22e 100644
--- a/easybuild/easyconfigs/s/snappy/snappy-1.1.3-GCC-4.9.3.eb
+++ b/easybuild/easyconfigs/s/snappy/snappy-1.1.3-GCC-4.9.3.eb
@@ -21,7 +21,7 @@ sources = ['%s.tar.gz' % commit]
 preconfigopts = "./autogen.sh && "
 
 sanity_check_paths = {
-    'files': ['lib/libsnappy.so'],
+    'files': ['lib/libsnappy.%s' % SHLIB_EXT],
     'dirs': ['include', 'share']
 }
 
diff --git a/easybuild/easyconfigs/s/spglib/spglib-1.7.3-CrayGNU-5.2.40.eb b/easybuild/easyconfigs/s/spglib/spglib-1.7.3-CrayGNU-5.2.40.eb
index 2e71f2ce6be53d7dec7f0e8613cd700076c66cb9..f3db34a07abffb8d978078e3307b82d7b59671c1 100644
--- a/easybuild/easyconfigs/s/spglib/spglib-1.7.3-CrayGNU-5.2.40.eb
+++ b/easybuild/easyconfigs/s/spglib/spglib-1.7.3-CrayGNU-5.2.40.eb
@@ -7,7 +7,7 @@ homepage = 'http://spglib.sourceforge.net/'
 description = """Spglib is a C library for finding and handling crystal symmetries."""
 
 toolchain = {'name': 'CrayGNU', 'version': '5.2.40'}
-toolchainopts = {'dynamic': True, } 
+toolchainopts = {'dynamic': True, }
 
 source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCE_TAR_GZ]
@@ -15,7 +15,7 @@ sources = [SOURCE_TAR_GZ]
 start_dir = '%(name)s-%(version)s'
 
 sanity_check_paths = {
-    'files': ['lib/libsymspg.a', 'lib/libsymspg.so'],
+    'files': ['lib/libsymspg.a', 'lib/libsymspg.%s' % SHLIB_EXT],
     'dirs': ['include/spglib'],
 }
 
diff --git a/easybuild/easyconfigs/s/spglib/spglib-1.7.3-intel-2015a.eb b/easybuild/easyconfigs/s/spglib/spglib-1.7.3-intel-2015a.eb
index f6b34ab67040f9b8b01e2071dd256ddba174c843..073df44cdb3e6193252b58452d92ff3a5da0996a 100644
--- a/easybuild/easyconfigs/s/spglib/spglib-1.7.3-intel-2015a.eb
+++ b/easybuild/easyconfigs/s/spglib/spglib-1.7.3-intel-2015a.eb
@@ -14,7 +14,7 @@ sources = [SOURCE_TAR_GZ]
 start_dir = '%(name)s-%(version)s'
 
 sanity_check_paths = {
-    'files': ['lib/libsymspg.a', 'lib/libsymspg.so'],
+    'files': ['lib/libsymspg.a', 'lib/libsymspg.%s' % SHLIB_EXT],
     'dirs': ['include/spglib'],
 }
 
diff --git a/easybuild/easyconfigs/s/spglib/spglib-1.7.4-intel-2015b.eb b/easybuild/easyconfigs/s/spglib/spglib-1.7.4-intel-2015b.eb
index 9ecdb68f03ff7d032576844b132b1e0e56480a86..d2670d88eb5039358c5b290ffd9592a8c20318f8 100644
--- a/easybuild/easyconfigs/s/spglib/spglib-1.7.4-intel-2015b.eb
+++ b/easybuild/easyconfigs/s/spglib/spglib-1.7.4-intel-2015b.eb
@@ -12,7 +12,7 @@ source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 sanity_check_paths = {
-    'files': ['lib/libsymspg.a', 'lib/libsymspg.so'],
+    'files': ['lib/libsymspg.a', 'lib/libsymspg.%s' % SHLIB_EXT],
     'dirs': ['include/spglib'],
 }
 
diff --git a/easybuild/easyconfigs/s/sympy/sympy-0.7.6.1-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/s/sympy/sympy-0.7.6.1-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d4d078aa23b21bce943e1479d89b85a4adb1145a
--- /dev/null
+++ b/easybuild/easyconfigs/s/sympy/sympy-0.7.6.1-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,34 @@
+easyblock = 'PythonPackage'
+
+name = 'sympy'
+version = '0.7.6.1'
+
+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': 'intel', 'version': '2015b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+patches = ['sympy-0.7.6_fix-numpy-include.patch']
+
+python = 'Python'
+pyver = '2.7.11'
+pyshortver = '.'.join(pyver.split('.')[:-1])
+
+versionsuffix = "-%s-%s" % (python, pyver)
+
+dependencies = [(python, pyver)]
+
+runtest = 'python setup.py test'
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%s/site-packages/sympy' % pyshortver],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/t/TCC/TCC-0.9.26.eb b/easybuild/easyconfigs/t/TCC/TCC-0.9.26.eb
index e7a38fab7904dcf624ea28b93dd3e2b9b0947fd2..9fc79c204d56d5dc29706383f1ae82c53d1eeb16 100644
--- a/easybuild/easyconfigs/t/TCC/TCC-0.9.26.eb
+++ b/easybuild/easyconfigs/t/TCC/TCC-0.9.26.eb
@@ -27,7 +27,7 @@ sources = [SOURCELOWER_TAR_BZ2]
 source_urls = ['http://download.savannah.nongnu.org/releases/tinycc/']
 
 sanity_check_paths = {
-    'files': ["bin/tcc"], 
+    'files': ["bin/tcc"],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/t/Tcl/Tcl-8.6.4-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/t/Tcl/Tcl-8.6.4-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e7800ee7009ceb2171117823bcb56487751b030c
--- /dev/null
+++ b/easybuild/easyconfigs/t/Tcl/Tcl-8.6.4-GCC-4.9.3-2.25.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'Tcl'
+version = '8.6.4'
+
+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': 'GCC', 'version': '4.9.3-2.25'}
+
+source_urls = ["http://prdownloads.sourceforge.net/tcl"]
+sources = ['%(namelower)s%(version)s-src.tar.gz']
+
+dependencies = [
+    ('zlib', '1.2.8'),
+]
+
+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.4-foss-2016a.eb b/easybuild/easyconfigs/t/Tcl/Tcl-8.6.4-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3884765bf6d968110796c595db9c1ad5248da8f5
--- /dev/null
+++ b/easybuild/easyconfigs/t/Tcl/Tcl-8.6.4-foss-2016a.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'Tcl'
+version = '8.6.4'
+
+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': 'foss', 'version': '2016a'}
+
+source_urls = ["http://prdownloads.sourceforge.net/tcl"]
+sources = ['%(namelower)s%(version)s-src.tar.gz']
+
+dependencies = [
+    ('zlib', '1.2.8'),
+]
+
+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.4-intel-2016a.eb b/easybuild/easyconfigs/t/Tcl/Tcl-8.6.4-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..20cd9eb96c2310f2e3f22495f770121a1d5580a0
--- /dev/null
+++ b/easybuild/easyconfigs/t/Tcl/Tcl-8.6.4-intel-2016a.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'Tcl'
+version = '8.6.4'
+
+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': 'intel', 'version': '2016a'}
+
+source_urls = ["http://prdownloads.sourceforge.net/tcl"]
+sources = ['%(namelower)s%(version)s-src.tar.gz']
+
+dependencies = [
+    ('zlib', '1.2.8'),
+]
+
+configopts = '--enable-threads EXTRA_INSTALL="install-private-headers"'
+
+runtest = 'test'
+
+start_dir = 'unix'
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.3-goalf-1.1.0-no-OFED.eb
index 859871997e9690ffa56927dad8f5f5d47c798b97..f64c40563e10e7f305d135f4713a2eec78bc68ff 100644
--- a/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.3-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.3-goalf-1.1.0-no-OFED.eb
@@ -17,7 +17,7 @@ source_urls = [homepage]
 configopts = '--with-pic'
 
 sanity_check_paths = {
-    'files': ['lib/libticcutils.so', 'lib/libticcutils.a'],
+    'files': ['lib/libticcutils.%s' % SHLIB_EXT, 'lib/libticcutils.a'],
     'dirs': ['include/ticcutils'],
 }
 
diff --git a/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.3-goolf-1.4.10.eb b/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.3-goolf-1.4.10.eb
index d14a03ca50f051558b49413988f0dc98ef7d7680..445f99bec6bd2959226564df532a5d79f4a14cb4 100644
--- a/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.3-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.3-goolf-1.4.10.eb
@@ -17,7 +17,7 @@ source_urls = [homepage]
 configopts = '--with-pic'
 
 sanity_check_paths = {
-    'files': ['lib/libticcutils.so', 'lib/libticcutils.a'],
+    'files': ['lib/libticcutils.%s' % SHLIB_EXT, 'lib/libticcutils.a'],
     'dirs': ['include/ticcutils'],
 }
 
diff --git a/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.3-ictce-4.1.13.eb b/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.3-ictce-4.1.13.eb
index 181443391bbcc8247d32e25ff35733de2ed49abc..70bc5a288d51f040fedba337e3791a4d8f2e03cc 100644
--- a/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.3-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.3-ictce-4.1.13.eb
@@ -17,7 +17,7 @@ source_urls = [homepage]
 configopts = '--with-pic'
 
 sanity_check_paths = {
-    'files': ['lib/libticcutils.so', 'lib/libticcutils.a'],
+    'files': ['lib/libticcutils.%s' % SHLIB_EXT, 'lib/libticcutils.a'],
     'dirs': ['include/ticcutils'],
 }
 
diff --git a/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.3-ictce-5.3.0.eb b/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.3-ictce-5.3.0.eb
index a1560bc07f3c62adf7d1c95d96fd8ae91ae3bac6..a5a1f3ba0c0c5e4ae30b50692836b32bf39916da 100644
--- a/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.3-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.3-ictce-5.3.0.eb
@@ -17,7 +17,7 @@ source_urls = [homepage]
 configopts = '--with-pic'
 
 sanity_check_paths = {
-    'files': ['lib/libticcutils.so', 'lib/libticcutils.a'],
+    'files': ['lib/libticcutils.%s' % SHLIB_EXT, 'lib/libticcutils.a'],
     'dirs': ['include/ticcutils'],
 }
 
diff --git a/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.7-intel-2015b.eb b/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.7-intel-2015b.eb
index 80f98c98df5773ef990497986871b64cb220c1f8..d62879bb69f5bc8cd35ca90278a27ce09b12a9a8 100644
--- a/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.7-intel-2015b.eb
+++ b/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.7-intel-2015b.eb
@@ -17,7 +17,7 @@ source_urls = [homepage]
 configopts = '--with-pic'
 
 sanity_check_paths = {
-    'files': ['lib/libticcutils.so', 'lib/libticcutils.a'],
+    'files': ['lib/libticcutils.%s' % SHLIB_EXT, 'lib/libticcutils.a'],
     'dirs': ['include/ticcutils'],
 }
 
diff --git a/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.3-goalf-1.1.0-no-OFED.eb
index d4ed9ad26c5957697e5dc280da0e012ce3672ee9..efab9018605526646029710903117f3da778cf68 100644
--- a/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.3-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.3-goalf-1.1.0-no-OFED.eb
@@ -25,7 +25,7 @@ dependencies = [
 configopts = '--with-ticcutils=$EBROOTTICCUTILS'
 
 sanity_check_paths = {
-    'files': ['bin/timbl', 'lib/libtimbl.so', 'lib/libtimbl.a'],
+    'files': ['bin/timbl', 'lib/libtimbl.%s' % SHLIB_EXT, 'lib/libtimbl.a'],
     'dirs': ['include/timbl']
 }
 
diff --git a/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.3-goolf-1.4.10.eb b/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.3-goolf-1.4.10.eb
index bfc1a1974a798a1b4dbc9c9c35088c5e32e228ea..9db7b9cd717a1933cc58c1e80b2fd1ec556c4a39 100644
--- a/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.3-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.3-goolf-1.4.10.eb
@@ -25,7 +25,7 @@ dependencies = [
 configopts = '--with-ticcutils=$EBROOTTICCUTILS'
 
 sanity_check_paths = {
-    'files': ['bin/timbl', 'lib/libtimbl.so', 'lib/libtimbl.a'],
+    'files': ['bin/timbl', 'lib/libtimbl.%s' % SHLIB_EXT, 'lib/libtimbl.a'],
     'dirs': ['include/timbl']
 }
 
diff --git a/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.3-ictce-4.1.13.eb b/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.3-ictce-4.1.13.eb
index 2dc98b30661eb34001624da313c3f0bcfd225d8d..ef78059fdfe292112ce74848b0da8e723b0d0f7c 100644
--- a/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.3-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.3-ictce-4.1.13.eb
@@ -25,7 +25,7 @@ dependencies = [
 configopts = '--with-ticcutils=$EBROOTTICCUTILS'
 
 sanity_check_paths = {
-    'files': ['bin/timbl', 'lib/libtimbl.so', 'lib/libtimbl.a'],
+    'files': ['bin/timbl', 'lib/libtimbl.%s' % SHLIB_EXT, 'lib/libtimbl.a'],
     'dirs': ['include/timbl']
 }
 
diff --git a/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.3-ictce-5.3.0.eb b/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.3-ictce-5.3.0.eb
index 51cd57a6f7aaec2f24839ab5d013ea537d03bdde..72a8eb72c874b574643bb6d5f1d983da614552c2 100644
--- a/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.3-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.3-ictce-5.3.0.eb
@@ -25,7 +25,7 @@ dependencies = [
 configopts = '--with-ticcutils=$EBROOTTICCUTILS'
 
 sanity_check_paths = {
-    'files': ['bin/timbl', 'lib/libtimbl.so', 'lib/libtimbl.a'],
+    'files': ['bin/timbl', 'lib/libtimbl.%s' % SHLIB_EXT, 'lib/libtimbl.a'],
     'dirs': ['include/timbl']
 }
 
diff --git a/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.6-intel-2015b.eb b/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.6-intel-2015b.eb
index 01bbfe82013bb99b398a985458a0bb243991e714..9f427601238c8ba243acd2ebafeecfd3b8188bbe 100644
--- a/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.6-intel-2015b.eb
+++ b/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.6-intel-2015b.eb
@@ -25,7 +25,7 @@ dependencies = [
 configopts = '--with-ticcutils=$EBROOTTICCUTILS'
 
 sanity_check_paths = {
-    'files': ['bin/timbl', 'lib/libtimbl.so', 'lib/libtimbl.a'],
+    'files': ['bin/timbl', 'lib/libtimbl.%s' % SHLIB_EXT, 'lib/libtimbl.a'],
     'dirs': ['include/timbl']
 }
 
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-GCC-4.9.3-2.25-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-GCC-4.9.3-2.25-no-X11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a8245c85800e9d02b4fb9c4b4d30b030d906a942
--- /dev/null
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-GCC-4.9.3-2.25-no-X11.eb
@@ -0,0 +1,26 @@
+easyblock = 'ConfigureMake'
+
+name = 'Tk'
+version = '8.6.4'
+versionsuffix = '-no-X11'
+
+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': 'GCC', 'version': '4.9.3-2.25'}
+
+source_urls = ["http://prdownloads.sourceforge.net/tcl"]
+sources = ['%(namelower)s%(version)s-src.tar.gz']
+
+patches = ['Tk-%(version)s_different-prefix-with-tcl.patch']
+
+dependencies = [
+    ('Tcl', version),
+]
+
+configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
+
+start_dir = 'unix'
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-foss-2016a-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-foss-2016a-no-X11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6f98f7076c68817fedaf272059c5e078c00f4b99
--- /dev/null
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-foss-2016a-no-X11.eb
@@ -0,0 +1,26 @@
+easyblock = 'ConfigureMake'
+
+name = 'Tk'
+version = '8.6.4'
+versionsuffix = '-no-X11'
+
+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': 'foss', 'version': '2016a'}
+
+source_urls = ["http://prdownloads.sourceforge.net/tcl"]
+sources = ['%(namelower)s%(version)s-src.tar.gz']
+
+patches = ['Tk-%(version)s_different-prefix-with-tcl.patch']
+
+dependencies = [
+    ('Tcl', version),
+]
+
+configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
+
+start_dir = 'unix'
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2016a-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2016a-no-X11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9f46cbbff73ab04a958cea81030729c38f5b8be1
--- /dev/null
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2016a-no-X11.eb
@@ -0,0 +1,26 @@
+easyblock = 'ConfigureMake'
+
+name = 'Tk'
+version = '8.6.4'
+versionsuffix = '-no-X11'
+
+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': 'intel', 'version': '2016a'}
+
+source_urls = ["http://prdownloads.sourceforge.net/tcl"]
+sources = ['%(namelower)s%(version)s-src.tar.gz']
+
+patches = ['Tk-%(version)s_different-prefix-with-tcl.patch']
+
+dependencies = [
+    ('Tcl', version),
+]
+
+configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
+
+start_dir = 'unix'
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/t/Trilinos/Trilinos-10.12.2-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/t/Trilinos/Trilinos-10.12.2-ictce-4.0.6-Python-2.7.3.eb
index cc0fc985e002a319f7a952d795963e0c7c1920dd..fea45f6e5c39d91f959e79af23dc52a595c301f7 100644
--- a/easybuild/easyconfigs/t/Trilinos/Trilinos-10.12.2-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/t/Trilinos/Trilinos-10.12.2-ictce-4.0.6-Python-2.7.3.eb
@@ -29,5 +29,5 @@ builddependencies = [('CMake', '2.8.4')]
 # Kokkos build is broken with ictce/4.0.6
 # yields internal error: 0_1670 for packages/kokkos/LinAlg/Kokkos_DefaultArithmetic.hpp (line 827)
 skip_exts = ["Kokkos", "Tpetra"]
- 
+
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/t/Trilinos/Trilinos-10.12.2-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/t/Trilinos/Trilinos-10.12.2-ictce-5.3.0-Python-2.7.3.eb
index a7d22afde05ecff870f2bbf08391234f69def5df..84613e0ab25b7f46dd68ab95e74a877e20109799 100644
--- a/easybuild/easyconfigs/t/Trilinos/Trilinos-10.12.2-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/t/Trilinos/Trilinos-10.12.2-ictce-5.3.0-Python-2.7.3.eb
@@ -30,5 +30,5 @@ builddependencies = [('CMake', '2.8.4')]
 # Kokkos build is broken with ictce/4.0.6
 # yields internal error: 0_1670 for packages/kokkos/LinAlg/Kokkos_DefaultArithmetic.hpp (line 827)
 skip_exts = ["Kokkos", "Tpetra"]
- 
+
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/t/Trilinos/Trilinos-12.4.2-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/t/Trilinos/Trilinos-12.4.2-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..57bd77ec8b5c5f57ddd5096bf00451e300a4e1eb
--- /dev/null
+++ b/easybuild/easyconfigs/t/Trilinos/Trilinos-12.4.2-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,37 @@
+name = 'Trilinos'
+version = '12.4.2'
+versionsuffix = '-Python-2.7.11'
+
+homepage = 'http://trilinos.sandia.gov/'
+description = """The Trilinos Project is an effort to develop algorithms and enabling technologies
+ within an object-oriented software framework for the solution of large-scale, complex multi-physics
+ engineering and scientific problems. A unique design feature of Trilinos is its focus on packages."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'usempi': True, 'pic': True, 'strict': True}
+
+source_urls = ['http://trilinos.csbsju.edu/download/files/']
+sources = ['%(namelower)s-%(version)s-Source.tar.gz']
+
+patches = ['fix-parmetis.patch']
+
+dependencies = [
+    ('Boost', '1.59.0', versionsuffix),
+    ('SCOTCH', '6.0.4'),
+    ('SuiteSparse', '4.4.6', '-ParMETIS-4.0.3'),
+    ('ParMETIS', '4.0.3'),
+    ('netCDF', '4.3.3.1'),
+    ('MATIO', '1.5.2'),
+    ('GLM', '0.9.7.2'),
+]
+
+builddependencies = [('CMake', '3.4.1')]
+
+# STK Classic is deprecated/broken, STKDoc_tests needs to be disabled too because of it
+# see https://trilinos.org/oldsite/release_notes-11.10.html and https://github.com/trilinos/Trilinos/issues/19
+skip_exts = ['STKClassic', 'STKDoc_tests']
+
+# too parallel is too slow, and may cause build/tests to fail
+maxparallel = 10
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/t/Trinity/Trinity-2.1.1-intel-2015b.eb b/easybuild/easyconfigs/t/Trinity/Trinity-2.1.1-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5f116c4b08e19272176c1f95631dabc8bfeb8f56
--- /dev/null
+++ b/easybuild/easyconfigs/t/Trinity/Trinity-2.1.1-intel-2015b.eb
@@ -0,0 +1,37 @@
+name = 'Trinity'
+version = '2.1.1'
+
+homepage = 'http://trinityrnaseq.github.io'
+description = """Trinity represents a novel method for the efficient and robust de novo reconstruction
+ of transcriptomes from RNA-Seq data. Trinity combines three independent software modules: Inchworm,
+ Chrysalis, and Butterfly, applied sequentially to process large volumes of RNA-Seq reads."""
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'optarch': True}
+
+source_urls = ['https://github.com/trinityrnaseq/trinityrnaseq/archive/']
+
+java = 'Java'
+javaver = '1.8.0_66'
+
+sources = ['v%(version)s.tar.gz']
+
+patches = [
+    'chrysalis_commandline_noconsts_2012-10-05.patch',
+    'Trinity-%(version)s_jellyfish-Makefile.patch',
+]
+
+builddependencies = [
+    ('Autotools', '20150215', '', ('GNU', '4.9.3-2.25')),
+]
+
+dependencies = [
+    (java, javaver, '', True),
+    ('ant', '1.9.6', '-%s-%s' % (java, javaver), True),
+    ('Bowtie', '1.1.2'),
+    ('Bowtie2', '2.2.6'),
+    ('ncurses', '5.9',),
+    ('zlib', '1.2.8'),
+    ('Perl', '5.20.3'),
+]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/t/Trinity/Trinity-2.1.1_jellyfish-Makefile.patch b/easybuild/easyconfigs/t/Trinity/Trinity-2.1.1_jellyfish-Makefile.patch
new file mode 100644
index 0000000000000000000000000000000000000000..175210f9efb94d5021a474bd11a2ab1bb13ea5b5
--- /dev/null
+++ b/easybuild/easyconfigs/t/Trinity/Trinity-2.1.1_jellyfish-Makefile.patch
@@ -0,0 +1,30 @@
+use EasyBuild-provided zlib, don't hardcode gcc/g++ for jellyfish plugin
+authors: B. Hajgato (Vrije Universiteit Brussel), Kenneth Hoste (HPC-UGent)
+--- trinityrnaseq-2.1.1/trinity-plugins/Makefile.orig	2015-10-15 14:07:11.000000000 +0200
++++ trinityrnaseq-2.1.1/trinity-plugins/Makefile	2016-01-12 13:42:35.197202000 +0100
+@@ -2,6 +2,9 @@
+ JELLYFISH_CODE="jellyfish-2.1.4"
+ HTSLIB_CODE="htslib.github.Aug182015.tar.gz"
+ 
++CC?=gcc
++CXX?=g++
++
+ #######################
+ ### Required by Trinity
+ #######################
+@@ -18,12 +21,13 @@
+ 
+ samtools:
+ 	tar xvf samtools-0.1.19.tar.bz2
+-	cd samtools-0.1.19 && $(MAKE) LIBPATH=-ltinfo
++	sed -e 's/ -lz/ -L\$$\{EBROOTZLIB\}\/lib -lz/' -i samtools-0.1.19/misc/Makefile
++	cd samtools-0.1.19 && $(MAKE) LIBPATH=-L${EBROOTZLIB}/lib 
+ 	mv samtools-0.1.19/samtools ./BIN/.
+ 
+ jellyfish:
+ 	tar -zxvf ${JELLYFISH_CODE}.tar.gz && ln -sf ${JELLYFISH_CODE} tmp.jellyfish
+-	cd ./tmp.jellyfish/ && ./configure CC=gcc CXX=g++ --enable-static --disable-shared --prefix=`pwd` && $(MAKE) LDFLAGS="-lpthread -all-static" AM_CPPFLAGS="-Wall -Wnon-virtual-dtor -I"`pwd`"/include"
++	cd ./tmp.jellyfish/ && ./configure CC=$(CC) CXX=$(CXX) --enable-static --disable-shared --prefix=`pwd` && $(MAKE) LDFLAGS="-lpthread -all-static" AM_CPPFLAGS="-Wall -Wnon-virtual-dtor -I"`pwd`"/include"
+ 	mv tmp.jellyfish jellyfish
+ 
+ htslib_target:
diff --git a/easybuild/easyconfigs/t/tcsh/tcsh-6.18.01-goolf-1.5.14.eb b/easybuild/easyconfigs/t/tcsh/tcsh-6.18.01-goolf-1.5.14.eb
index 2e710f4a1d969e76e45bef13b0f8d873bc793d76..5e7647f183055292f97422042fdc4a16a11f1662 100644
--- a/easybuild/easyconfigs/t/tcsh/tcsh-6.18.01-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/t/tcsh/tcsh-6.18.01-goolf-1.5.14.eb
@@ -21,7 +21,7 @@ description = """Tcsh is an enhanced, but completely compatible version of the B
   processor. It includes a command-line editor, programmable word completion, spelling correction, a history 
   mechanism, job control and a C-like syntax."""
 
-toolchain = {'name': 'goolf', 'version': '1.5.14'} 
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [
diff --git a/easybuild/easyconfigs/t/tmux/tmux-1.9a-GCC-4.9.2.eb b/easybuild/easyconfigs/t/tmux/tmux-1.9a-GCC-4.9.2.eb
index cd1b05dd17ce9eb83283b5aafd9e9d337012f324..b34529fe922c37209f866e1007779dd376c0d659 100644
--- a/easybuild/easyconfigs/t/tmux/tmux-1.9a-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/t/tmux/tmux-1.9a-GCC-4.9.2.eb
@@ -19,7 +19,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['bin/tmux'], 
+    'files': ['bin/tmux'],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-goalf-1.1.0-no-OFED.eb
index 50fbec0e1c0343bf5c18546e675d4d62e77af209..a52aa694fc5d3a94b21c5de21669e9c3b9e44deb 100644
--- a/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-goalf-1.1.0-no-OFED.eb
@@ -33,7 +33,7 @@ sanity_check_paths = {
         'include/udunits2.h',
         'include/udunits.h',
         'lib/libudunits2.a',
-        'lib/libudunits2.so',
+        'lib/libudunits2.%s' % SHLIB_EXT,
     ],
     'dirs': ['share'],
 }
diff --git a/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-goolf-1.4.10.eb b/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-goolf-1.4.10.eb
index 46c29b08f1d18941351ab2f1233ca3b07c7108ea..72d80a88dd707be0846c79bda426158c3666e9bf 100644
--- a/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-goolf-1.4.10.eb
@@ -33,7 +33,7 @@ sanity_check_paths = {
         'include/udunits2.h',
         'include/udunits.h',
         'lib/libudunits2.a',
-        'lib/libudunits2.so',
+        'lib/libudunits2.%s' % SHLIB_EXT,
     ],
     'dirs': ['share'],
 }
diff --git a/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-ictce-3.2.2.u3.eb
index d95d2e2e5ff1bb928df13f5bf3d288668efa9682..b9d1c0a57407f0f92ab422ebbe4873e570e09e26 100644
--- a/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-ictce-3.2.2.u3.eb
+++ b/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-ictce-3.2.2.u3.eb
@@ -33,7 +33,7 @@ sanity_check_paths = {
         'include/udunits2.h',
         'include/udunits.h',
         'lib/libudunits2.a',
-        'lib/libudunits2.so',
+        'lib/libudunits2.%s' % SHLIB_EXT,
     ],
     'dirs': ['share'],
 }
diff --git a/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-ictce-4.0.6.eb b/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-ictce-4.0.6.eb
index 0b5eedcf683ea17643682f2c5e3d6d17ffe542c1..7a9b90a956361de34076f73ba3e6682799024a42 100644
--- a/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-ictce-4.0.6.eb
@@ -33,7 +33,7 @@ sanity_check_paths = {
         'include/udunits2.h',
         'include/udunits.h',
         'lib/libudunits2.a',
-        'lib/libudunits2.so',
+        'lib/libudunits2.%s' % SHLIB_EXT,
     ],
     'dirs': ['share'],
 }
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
index b3e41567be85e516e15e08e9d3b114f9c2b856cb..f166af224856a7a0fc7d74d96cd95cc7dd7ff09f 100644
--- 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
@@ -33,7 +33,7 @@ sanity_check_paths = {
         'include/udunits2.h',
         'include/udunits.h',
         'lib/libudunits2.a',
-        'lib/libudunits2.so',
+        'lib/libudunits2.%s' % SHLIB_EXT,
     ],
     'dirs': ['share'],
 }
diff --git a/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-ictce-5.2.0.eb b/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-ictce-5.2.0.eb
index ac829b62ae7e0c8a2f9704ef646a1ecb4e2f4572..6769cda969032d32dfa09e419869846195d5a050 100644
--- a/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-ictce-5.2.0.eb
+++ b/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-ictce-5.2.0.eb
@@ -33,7 +33,7 @@ sanity_check_paths = {
         'include/udunits2.h',
         'include/udunits.h',
         'lib/libudunits2.a',
-        'lib/libudunits2.so',
+        'lib/libudunits2.%s' % SHLIB_EXT,
     ],
     'dirs': ['share'],
 }
diff --git a/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-ictce-5.3.0.eb b/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-ictce-5.3.0.eb
index b0e1ae05f8417a54a83879a3b463e4cb8366ece6..13138db3b02a41b1abe082fa408b980361e3fa65 100644
--- a/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-ictce-5.3.0.eb
@@ -33,7 +33,7 @@ sanity_check_paths = {
         'include/udunits2.h',
         'include/udunits.h',
         'lib/libudunits2.a',
-        'lib/libudunits2.so',
+        'lib/libudunits2.%s' % SHLIB_EXT,
     ],
     'dirs': ['share'],
 }
diff --git a/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-ictce-5.4.0.eb b/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-ictce-5.4.0.eb
index e3a2a31a1906e323dbe172c6ce5c285246425995..39dc1241a0bc16e2ae8c6ef9c5e78c254a1d040d 100644
--- a/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-ictce-5.4.0.eb
+++ b/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-ictce-5.4.0.eb
@@ -34,7 +34,7 @@ sanity_check_paths = {
         'include/udunits2.h',
         'include/udunits.h',
         'lib/libudunits2.a',
-        'lib/libudunits2.so',
+        'lib/libudunits2.%s' % SHLIB_EXT,
     ],
     'dirs': ['share'],
 }
diff --git a/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-intel-2014b.eb b/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-intel-2014b.eb
index e9bf8e9075f196b4dea7024270eb604fdd3fd7bd..e773e384b2192dc1f1cb9637630a24b85e9ac034 100644
--- a/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-intel-2014b.eb
+++ b/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-intel-2014b.eb
@@ -32,7 +32,7 @@ sanity_check_paths = {
         'include/udunits2.h',
         'include/udunits.h',
         'lib/libudunits2.a',
-        'lib/libudunits2.so',
+        'lib/libudunits2.%s' % SHLIB_EXT,
     ],
     'dirs': ['share'],
 }
diff --git a/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-iqacml-3.7.3.eb b/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-iqacml-3.7.3.eb
index bfcc6592efaa60c36ae7eb850ae1439e64d61ba2..193e10df496f413f72ab55aae80f4a629554b09e 100644
--- a/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-iqacml-3.7.3.eb
+++ b/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-iqacml-3.7.3.eb
@@ -33,7 +33,7 @@ sanity_check_paths = {
         'include/udunits2.h',
         'include/udunits.h',
         'lib/libudunits2.a',
-        'lib/libudunits2.so',
+        'lib/libudunits2.%s' % SHLIB_EXT,
     ],
     'dirs': ['share'],
 }
diff --git a/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.2.19-intel-2015a.eb b/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.2.19-intel-2015a.eb
index 54303b9dd93f9c781a905bb1394a9a5bde081bde..964a50f27f8e5527bd2f10768014d2771cdcda43 100644
--- a/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.2.19-intel-2015a.eb
+++ b/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.2.19-intel-2015a.eb
@@ -28,8 +28,8 @@ source_urls = ['ftp://ftp.unidata.ucar.edu/pub/udunits']
 dependencies = [('expat', '2.1.0')]
 
 sanity_check_paths = {
-    'files': ['bin/udunits2', 'include/converter.h', 'include/udunits2.h', 'include/udunits.h', 
-              'lib/libudunits2.a', 'lib/libudunits2.so', ],
+    'files': ['bin/udunits2', 'include/converter.h', 'include/udunits2.h', 'include/udunits.h',
+              'lib/libudunits2.a', 'lib/libudunits2.%s' % SHLIB_EXT],
     'dirs': ['share'],
 }
 
diff --git a/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.2.19-intel-2015b.eb b/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.2.19-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..efdb4ae86f533759428bfd8dcc3a0d046bd46af7
--- /dev/null
+++ b/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.2.19-intel-2015b.eb
@@ -0,0 +1,38 @@
+##
+# 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@cern.ch>, 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
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'UDUNITS'
+version = '2.2.19'
+
+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': 'intel', 'version': '2015b'}
+toolchainopts = {'opt': True, 'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['ftp://ftp.unidata.ucar.edu/pub/udunits']
+
+dependencies = [('expat', '2.1.0')]
+
+sanity_check_paths = {
+    'files': ['bin/udunits2', 'include/converter.h', 'include/udunits2.h', 'include/udunits.h',
+              'lib/libudunits2.a', 'lib/libudunits2.%s' % SHLIB_EXT],
+    'dirs': ['share'],
+}
+
+parallel = 1
+
+moduleclass = 'phys'
diff --git a/easybuild/easyconfigs/u/UFL/UFL-1.6.0-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/u/UFL/UFL-1.6.0-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..36a4f726d65dd8b55f2d992ca8f5b52132b2e405
--- /dev/null
+++ b/easybuild/easyconfigs/u/UFL/UFL-1.6.0-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,29 @@
+easyblock = 'PythonPackage'
+
+name = 'UFL'
+version = '1.6.0'
+
+homepage = 'https://launchpad.net/ufl'
+description = """The Unified Form Language (UFL) is a domain specific language 
+ for declaration of finite element discretizations of variational forms. 
+ More precisely, it defines a flexible interface for choosing finite element 
+ spaces and defining expressions for weak forms in a notation close to 
+ mathematical notation."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = ['https://bitbucket.org/fenics-project/ufl/downloads/']
+sources = [SOURCELOWER_TAR_GZ]
+
+pyver = '2.7.11'
+versionsuffix = '-Python-%s' % pyver
+
+dependencies = [('Python', pyver)]
+
+pyshortver = '.'.join(pyver.split('.')[:2])
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in ['form2ufl', 'ufl2py', 'ufl-analyse', 'ufl-convert', 'ufl-version']],
+    'dirs': ['lib/python%s/site-packages/ufl' % pyshortver]
+}
+
+moduleclass = 'cae'
diff --git a/easybuild/easyconfigs/u/util-linux/util-linux-2.27.1-intel-2015b.eb b/easybuild/easyconfigs/u/util-linux/util-linux-2.27.1-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..43293be3b6fa22a46f502b39a31be8e22811a1c0
--- /dev/null
+++ b/easybuild/easyconfigs/u/util-linux/util-linux-2.27.1-intel-2015b.eb
@@ -0,0 +1,33 @@
+easyblock = 'ConfigureMake'
+
+name = 'util-linux'
+version = '2.27.1'
+
+homepage = 'http://www.kernel.org/pub/linux/utils/util-linux'
+description = """Set of Linux utilities"""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+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' "
+# disable building Python bindings (since we don't include Python as a dep)
+configopts += "--without-python "
+
+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/VTK/VTK-6.3.0-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/v/VTK/VTK-6.3.0-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4be27d99f6731ac6cfd6f258996f9b8847876739
--- /dev/null
+++ b/easybuild/easyconfigs/v/VTK/VTK-6.3.0-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,64 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Fotis Georgatos <fotis@cern.ch>
+# 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
+##
+
+easyblock = 'CMakeMake'
+
+name = 'VTK'
+version = '6.3.0'
+
+homepage = 'http://www.vtk.org'
+description = """The Visualization Toolkit (VTK) is an open-source, freely available software system for
+ 3D computer graphics, image processing and visualization. VTK consists of a C++ class library and several
+ interpreted interface layers including Tcl/Tk, Java, and Python. VTK supports a wide variety of visualization
+ algorithms including: scalar, vector, tensor, texture, and volumetric methods; and advanced modeling techniques
+ such as: implicit modeling, polygon reduction, mesh smoothing, cutting, contouring, and Delaunay triangulation."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = ['http://www.vtk.org/files/release/%(version_major_minor)s']
+sources = [
+    SOURCE_TAR_GZ,
+    '%(name)sData-%(version)s.tar.gz',
+]
+
+builddependencies = [('CMake', '3.4.1')]
+
+pyver = '2.7.11'
+pyshortver = '.'.join(pyver.split('.')[:2])
+versionsuffix = '-Python-%s' % pyver
+
+mesaver = '11.0.8'
+dependencies = [
+    ('Python', pyver),
+    ('Mesa', mesaver, versionsuffix),
+    ('libGLU', '9.0.0', '-Mesa-%s' % mesaver),
+]
+
+configopts = "-DOPENGL_glu_LIBRARY=$EBROOTLIBGLU/lib/libGLU.%s " % SHLIB_EXT
+configopts += "-DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.%s " % SHLIB_EXT
+configopts += "-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include -DVTK_WRAP_PYTHON=ON "
+configopts += "-DPYTHON_LIBRARY=$EBROOTPYTHON/lib/libpython%s.%s " % (pyshortver, SHLIB_EXT)
+configopts += " -DPYTHON_INCLUDE_DIR=$EBROOTPYTHON/include/python%s " % pyshortver
+preinstallopts = "mkdir -p %(installdir)s/lib/python2.7/site-packages/ && "
+preinstallopts += "export PYTHONPATH=%%(installdir)s/lib/python%s/site-packages:$PYTHONPATH && " % pyshortver
+
+modextrapaths = {'PYTHONPATH': ['lib/python%s/site-packages' % pyshortver]}
+
+sanity_check_paths = {
+    'files': ['bin/vtk%s-%%(version_major_minor)s' % x for x in ['EncodeString', 'HashSource',
+                                                                 'mkg3states', 'ParseOGLExt']],
+    'dirs': ['lib/python%s/site-packages/' % pyshortver, 'include/vtk-%(version_major_minor)s'],
+}
+
+sanity_check_commands = [('python', "-c 'import %(namelower)s'")]
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/v/VampirServer/VampirServer-8.4.1-gompi-2015a.eb b/easybuild/easyconfigs/v/VampirServer/VampirServer-8.4.1-gompi-2015a.eb
index 5b068e3cf704aa9f792ebf374f73eb95d57caa6c..09d9d1ef44a84180fff7473e5f1c72e2f74f4d90 100644
--- a/easybuild/easyconfigs/v/VampirServer/VampirServer-8.4.1-gompi-2015a.eb
+++ b/easybuild/easyconfigs/v/VampirServer/VampirServer-8.4.1-gompi-2015a.eb
@@ -37,7 +37,7 @@ license_file = '/example/licenses/path/vampir.license'
 install_cmd = "./" + sources[0] + " --silent --instdir=%(installdir)s && %(installdir)s/bin/vampirserver config --silent"
 
 sanity_check_paths = {
-    'files': ["bin/vampirserver", "doc/vampirserver-manual.pdf", "lib/vampirserver-driver.so"],
+    'files': ["bin/vampirserver", "doc/vampirserver-manual.pdf", "lib/vampirserver-driver.%s" % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/v/Velvet/Velvet-1.2.10-intel-2015b-mt-kmer_100.eb b/easybuild/easyconfigs/v/Velvet/Velvet-1.2.10-intel-2015b-mt-kmer_100.eb
new file mode 100644
index 0000000000000000000000000000000000000000..70b05647b0dfd601fc21a77d66a4b016bddbead7
--- /dev/null
+++ b/easybuild/easyconfigs/v/Velvet/Velvet-1.2.10-intel-2015b-mt-kmer_100.eb
@@ -0,0 +1,29 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA, 2012-2013 The Cyprus Institute
+# Authors::   Cedric Laczny <cedric.laczny@uni.lu>, Fotis Georgatos <fotis@cern.ch>,
+#             Thekla Loizou <t.loizou@cyi.ac.cy>, Andreas Panteli <a.panteli@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_2012-94.html
+##
+
+name = 'Velvet'
+version = '1.2.10'
+versionsuffix = '-mt-kmer_100'
+
+homepage = 'http://www.ebi.ac.uk/~zerbino/velvet/'
+description = """Sequence assembler for very short reads"""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'optarch': True, 'pic': True, 'openmp': True}
+
+sources = ['%(namelower)s_%(version)s.tgz']
+source_urls = ['http://www.ebi.ac.uk/~zerbino/%(namelower)s']
+
+buildopts = "OPENMP=1 MAXKMERLENGTH=%s" % versionsuffix.split('_')[1]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/v/Velvet/Velvet-1.2.10-intel-2015b-mt-kmer_31.eb b/easybuild/easyconfigs/v/Velvet/Velvet-1.2.10-intel-2015b-mt-kmer_31.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fff6a988abda5ba439621c5d1302f104f628d30b
--- /dev/null
+++ b/easybuild/easyconfigs/v/Velvet/Velvet-1.2.10-intel-2015b-mt-kmer_31.eb
@@ -0,0 +1,30 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA, 2012-2013 The Cyprus Institute
+# Authors::   Cedric Laczny <cedric.laczny@uni.lu>, Fotis Georgatos <fotis@cern.ch>,
+#             Thekla Loizou <t.loizou@cyi.ac.cy>, Andreas Panteli <a.panteli@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_2012-94.html
+##
+
+name = 'Velvet'
+version = '1.2.10'
+versionsuffix = '-mt-kmer_31'
+
+homepage = 'http://www.ebi.ac.uk/~zerbino/velvet/'
+description = """Sequence assembler for very short reads"""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'optarch': True, 'pic': True, 'openmp': True}
+
+sources = ['%(namelower)s_%(version)s.tgz']
+source_urls = ['http://www.ebi.ac.uk/~zerbino/%(namelower)s']
+
+# by default MAXKMERLENGTH=31 but defined here to keep all the easyconfigs homogeneous
+buildopts = "OPENMP=1 MAXKMERLENGTH=%s" % versionsuffix.split('_')[1]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/v/vsc-mympirun-scoop/vsc-mympirun-scoop-3.3.0-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/v/vsc-mympirun-scoop/vsc-mympirun-scoop-3.3.0-intel-2015b-Python-2.7.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1bbd44502a05ff68bd072e890594d0df89ae5b0a
--- /dev/null
+++ b/easybuild/easyconfigs/v/vsc-mympirun-scoop/vsc-mympirun-scoop-3.3.0-intel-2015b-Python-2.7.10.eb
@@ -0,0 +1,32 @@
+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': 'intel', 'version': '2015b'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://github.com/hpcugent/vsc-mympirun-scoop/archive/']
+
+python = 'Python'
+pyver = '2.7.10'
+versionsuffix = '-%s-%s' % (python, pyver)
+dependencies = [
+    ('vsc-processcontrol', '1.0', '-vsc-base-2.1.2', True),
+    ('vsc-mympirun', '3.4.2', '', True),
+    (python, pyver),
+    ('SCOOP', '0.6.2', versionsuffix),
+]
+
+options = {'modulename': 'vsc.mympirun.scoop'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/vsc/mympirun/scoop'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/v/vsc-processcontrol/vsc-processcontrol-1.0-vsc-base-2.1.2.eb b/easybuild/easyconfigs/v/vsc-processcontrol/vsc-processcontrol-1.0-vsc-base-2.1.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..761d760aa280c3ab1ce711e8813d41965931942e
--- /dev/null
+++ b/easybuild/easyconfigs/v/vsc-processcontrol/vsc-processcontrol-1.0-vsc-base-2.1.2.eb
@@ -0,0 +1,27 @@
+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/']
+
+vsc_base_ver = '2.1.2'
+versionsuffix = '-vsc-base-%s' % vsc_base_ver
+dependencies = [('vsc-base', vsc_base_ver)]
+
+options = {'modulename': 'sys; print sys.path; import vsc; print vsc.__path__; import vsc.processcontrol'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/vsc/processcontrol'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/w/WRF/WRF-3.5.1-goolf-1.5.14-dmpar.eb b/easybuild/easyconfigs/w/WRF/WRF-3.5.1-goolf-1.5.14-dmpar.eb
index aca6ed1e40ae9d55bcaa36cee80ce354ea1871e8..8654cbea4e4e55d658c4189b8b5bc2275006d951 100644
--- a/easybuild/easyconfigs/w/WRF/WRF-3.5.1-goolf-1.5.14-dmpar.eb
+++ b/easybuild/easyconfigs/w/WRF/WRF-3.5.1-goolf-1.5.14-dmpar.eb
@@ -6,7 +6,7 @@ description = """The Weather Research and Forecasting (WRF) Model is a next-gene
  numerical weather prediction system designed to serve both operational forecasting and atmospheric
  research needs."""
 
-toolchain = {'name': 'goolf', 'version': '1.5.14'} 
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
 toolchainopts = {'opt': False}  # don't use agressive optimization, stick to -O2
 
 sources = ['%(name)sV%(version)s.TAR.gz']
diff --git a/easybuild/easyconfigs/x/XKeyboardConfig/XKeyboardConfig-2.16-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/x/XKeyboardConfig/XKeyboardConfig-2.16-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6a5ccd4d2e3b7fa3737bc84dccb413c7c12a2884
--- /dev/null
+++ b/easybuild/easyconfigs/x/XKeyboardConfig/XKeyboardConfig-2.16-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,37 @@
+easyblock = 'ConfigureMake'
+
+name = 'XKeyboardConfig'
+version = '2.16'
+versionsuffix = '-Python-2.7.11'
+
+homepage = 'http://www.freedesktop.org/wiki/Software/XKeyboardConfig/'
+description = """The non-arch keyboard configuration database for X Window.
+ The goal is to provide the consistent, well-structured,
+ frequently released open source of X keyboard configuration data
+ for X Window System implementations (free, open source and commercial).
+ The project is targeted to XKB-based systems."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls  = ['http://ftp.x.org/pub/individual/data/xkeyboard-config/']
+sources = ['xkeyboard-config-%(version)s.tar.bz2']
+
+builddependencies = [
+    ('libxslt', '1.1.28'),
+    ('gettext', '0.19.6'),
+    ('intltool', '0.51.0'),
+]
+
+dependencies = [
+    ('libX11', '1.6.3', '-Python-2.7.11'),
+]
+
+#see http://www.linuxfromscratch.org/blfs/view/svn/x/xkeyboard-config.html
+configopts = '--with-xkb-rules-symlink=xorg '
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['share/X11/xkb']
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/Xmipp/Xmipp-3.1-goolf-1.4.10-with-incl-deps.eb b/easybuild/easyconfigs/x/Xmipp/Xmipp-3.1-goolf-1.4.10-with-incl-deps.eb
index c1f4fa485c8a52d3abe146c463fab96e0ccb498b..d9881b2ef718a5421ee1061303bfb7e37c76d838 100644
--- a/easybuild/easyconfigs/x/Xmipp/Xmipp-3.1-goolf-1.4.10-with-incl-deps.eb
+++ b/easybuild/easyconfigs/x/Xmipp/Xmipp-3.1-goolf-1.4.10-with-incl-deps.eb
@@ -7,10 +7,10 @@ description = "Xmipp is a suite of image processing programs, primarily aimed at
  
 source_urls = ['http://xmipp.cnb.csic.es/Downloads/']
 sources = ['Xmipp-%(version)s-src.tar.gz']
- 
+
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 # note: all other dependencies are taken care of by Xmipp itself
 dependencies = [('Java', '1.7.0_80', '', True)]
- 
+
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/x/x264/x264-20150930-intel-2015b.eb b/easybuild/easyconfigs/x/x264/x264-20150930-intel-2015b.eb
index 962e01b94a5024aafc86bdc425e7c3340783337b..9483eafcda3d6e8217f5f858ac5b042b2f4ddc0f 100644
--- a/easybuild/easyconfigs/x/x264/x264-20150930-intel-2015b.eb
+++ b/easybuild/easyconfigs/x/x264/x264-20150930-intel-2015b.eb
@@ -17,7 +17,7 @@ dependencies = [('Yasm', '1.3.0')]
 configopts = "  --enable-shared --enable-static "
 
 sanity_check_paths = {
-    'files': ['bin/x264', 'include/x264_config.h', 'include/x264.h', 'lib/libx264.a', 'lib/libx264.so'],
+    'files': ['bin/x264', 'include/x264_config.h', 'include/x264.h', 'lib/libx264.a', 'lib/libx264.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..750bbbc4cd302d1a241855f2f29253fce684c4ab
--- /dev/null
+++ b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,27 @@
+easyblock = 'ConfigureMake'
+
+name = 'xcb-proto'
+version = '1.11'
+
+homepage = 'http://xcb.freedesktop.org/'
+description = """The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint,
+latency hiding, direct access to the protocol, improved threading support, and extensibility."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls  = ['http://xcb.freedesktop.org/dist/']
+sources = [SOURCELOWER_TAR_GZ]
+
+python = 'Python'
+pyver = '2.7.11'
+versionsuffix = '-%s-%s' % (python, pyver)
+dependencies = [(python, pyver)]
+
+pyshortver = '.'.join(pyver.split('.')[0:2])
+
+sanity_check_paths = {
+    'files': ['lib/pkgconfig/xcb-proto.pc'],
+    'dirs': ['lib/python%s/site-packages/xcbgen' % pyshortver]
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xcb-util-image/xcb-util-image-0.4.0-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/x/xcb-util-image/xcb-util-image-0.4.0-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..360cb404a5e088b83c24bbbd77bb770e47f0b82e
--- /dev/null
+++ b/easybuild/easyconfigs/x/xcb-util-image/xcb-util-image-0.4.0-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'xcb-util-image'
+version = '0.4.0'
+versionsuffix = '-Python-2.7.11'
+
+homepage = 'http://xcb.freedesktop.org/'
+description = """The xcb-util-image package provides additional extensions to the XCB library."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls  = ['http://xcb.freedesktop.org/dist/']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('xcb-util', '0.4.0', versionsuffix),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libxcb-image.%s' % SHLIB_EXT],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xcb-util-image/xcb-util-image-0.4.0-intel-2015b.eb b/easybuild/easyconfigs/x/xcb-util-image/xcb-util-image-0.4.0-intel-2015b.eb
index 5cf0e37d19e4b3e0ef740ffafc3e51afe7fbafdf..4f85a1627f8a24bcc92aef25237337e6d2f6133d 100644
--- a/easybuild/easyconfigs/x/xcb-util-image/xcb-util-image-0.4.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/x/xcb-util-image/xcb-util-image-0.4.0-intel-2015b.eb
@@ -16,7 +16,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/libxcb-image.so'],
+    'files': ['lib/libxcb-image.%s' % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/x/xcb-util-keysyms/xcb-util-keysyms-0.4.0-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/x/xcb-util-keysyms/xcb-util-keysyms-0.4.0-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2fb24a70136c5b5a754abcb1eab36fb1f5cc67bb
--- /dev/null
+++ b/easybuild/easyconfigs/x/xcb-util-keysyms/xcb-util-keysyms-0.4.0-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'xcb-util-keysyms'
+version = '0.4.0'
+versionsuffix = '-Python-2.7.11'
+
+homepage = 'http://xcb.freedesktop.org/'
+description = """The xcb-util-keysyms package contains a library for
+ handling standard X key constants and conversion to/from keycodes."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls  = ['http://xcb.freedesktop.org/dist/']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('libxcb', '1.11.1', versionsuffix),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libxcb-keysyms.so'],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xcb-util-keysyms/xcb-util-keysyms-0.4.0-intel-2015b.eb b/easybuild/easyconfigs/x/xcb-util-keysyms/xcb-util-keysyms-0.4.0-intel-2015b.eb
index 845c0b3ba8adf822a3feb87be09ea24cd47ad122..4854d896a133df753e9f476760d306b38becebdc 100644
--- a/easybuild/easyconfigs/x/xcb-util-keysyms/xcb-util-keysyms-0.4.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/x/xcb-util-keysyms/xcb-util-keysyms-0.4.0-intel-2015b.eb
@@ -17,7 +17,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/libxcb-keysyms.so'],
+    'files': ['lib/libxcb-keysyms.%s' % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/x/xcb-util-renderutil/xcb-util-renderutil-0.3.9-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/x/xcb-util-renderutil/xcb-util-renderutil-0.3.9-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5ab8e229a6b75d3d277a914747e72eeb4d224683
--- /dev/null
+++ b/easybuild/easyconfigs/x/xcb-util-renderutil/xcb-util-renderutil-0.3.9-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'xcb-util-renderutil'
+version = '0.3.9'
+versionsuffix = '-Python-2.7.11'
+
+homepage = 'http://xcb.freedesktop.org/'
+description = """The xcb-util-renderutil package provides additional extensions to the XCB library."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls  = ['http://xcb.freedesktop.org/dist/']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('libxcb', '1.11.1', versionsuffix),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libxcb-render-util.so'],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xcb-util-renderutil/xcb-util-renderutil-0.3.9-intel-2015b.eb b/easybuild/easyconfigs/x/xcb-util-renderutil/xcb-util-renderutil-0.3.9-intel-2015b.eb
index 55946bc4e1347cd0406538ed8b134463e4844e1d..bf0147fea6275fe12ed3753342d5fb0ef6175b14 100644
--- a/easybuild/easyconfigs/x/xcb-util-renderutil/xcb-util-renderutil-0.3.9-intel-2015b.eb
+++ b/easybuild/easyconfigs/x/xcb-util-renderutil/xcb-util-renderutil-0.3.9-intel-2015b.eb
@@ -16,7 +16,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/libxcb-render-util.so'],
+    'files': ['lib/libxcb-render-util.%s' % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/x/xcb-util-wm/xcb-util-wm-0.4.1-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/x/xcb-util-wm/xcb-util-wm-0.4.1-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a3589e6112e4865bf6dd06a58a01afaf7ac7b2f9
--- /dev/null
+++ b/easybuild/easyconfigs/x/xcb-util-wm/xcb-util-wm-0.4.1-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'xcb-util-wm'
+version = '0.4.1'
+versionsuffix = '-Python-2.7.11'
+
+homepage = 'http://xcb.freedesktop.org/'
+description = """The xcb-util-wm package contains libraries which provide client and window-manager helpers for EWMH and ICCCM."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls  = ['http://xcb.freedesktop.org/dist/']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('libxcb', '1.11.1', versionsuffix),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libxcb-%s.so' % x for x in ['ewmh', 'icccm']],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xcb-util/xcb-util-0.4.0-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/x/xcb-util/xcb-util-0.4.0-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a89385186985aa17f9dcc8c1d690378ebb515fab
--- /dev/null
+++ b/easybuild/easyconfigs/x/xcb-util/xcb-util-0.4.0-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'xcb-util'
+version = '0.4.0'
+versionsuffix = '-Python-2.7.11'
+
+homepage = 'http://xcb.freedesktop.org/'
+description = """The xcb-util package provides additional extensions to the XCB library,
+ many that were previously found in Xlib, but are not part of core X protocol"""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls  = ['http://xcb.freedesktop.org/dist/']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('libxcb', '1.11.1', versionsuffix),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libxcb-util.so'],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xcb-util/xcb-util-0.4.0-intel-2015b.eb b/easybuild/easyconfigs/x/xcb-util/xcb-util-0.4.0-intel-2015b.eb
index cc6561672e82a79e369932152f3c6c53da1a8a8a..8fd3b74ca5e2768b40e720195682558f49010223 100644
--- a/easybuild/easyconfigs/x/xcb-util/xcb-util-0.4.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/x/xcb-util/xcb-util-0.4.0-intel-2015b.eb
@@ -17,7 +17,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/libxcb-util.so'],
+    'files': ['lib/libxcb-util.%s' % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2014b.eb b/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2014b.eb
index 4ef466e9c69527e75c7429e420c2fbd7b5355eb4..d03ad18e50eb66f71f62563b7d5563721e0daf2a 100644
--- a/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2014b.eb
+++ b/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2014b.eb
@@ -6,7 +6,7 @@ version = '7.3.0'
 homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
 description = """XExtProto protocol headers."""
 
-toolchain = {'name': 'intel', 'version': '2014b'} 
+toolchain = {'name': 'intel', 'version': '2014b'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
diff --git a/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2015a.eb b/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2015a.eb
index ee0ab26f86b30eb293f0052f21fe22542efcf0e2..01075a73cf5416b5084188dcdb594114ab5e03a7 100644
--- a/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2015a.eb
+++ b/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2015a.eb
@@ -6,7 +6,7 @@ version = '7.3.0'
 homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
 description = """XExtProto protocol headers."""
 
-toolchain = {'name': 'intel', 'version': '2015a'} 
+toolchain = {'name': 'intel', 'version': '2015a'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
diff --git a/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2015b.eb b/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2015b.eb
index 5e95a7e8bdddac1f321cedff66cd4f0d77654d75..983804175f7a09766f89e4ab43793a66562d0601 100644
--- a/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2015b.eb
@@ -6,7 +6,7 @@ version = '7.3.0'
 homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
 description = """XExtProto protocol headers."""
 
-toolchain = {'name': 'intel', 'version': '2015b'} 
+toolchain = {'name': 'intel', 'version': '2015b'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
diff --git a/easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.19.0-intel-2015a.eb b/easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.19.0-intel-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8f8f5df7e5c8080f0141dab96aa3543890782dda
--- /dev/null
+++ b/easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.19.0-intel-2015a.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'xorg-macros'
+version = '1.19.0'
+
+homepage = 'http://cgit.freedesktop.org/xorg/util/macros'
+description = """X.org macros utilities."""
+toolchain = {'name': 'intel', 'version': '2015a'}
+
+source_urls = ['http://cgit.freedesktop.org/xorg/util/macros/snapshot']  # no slash ('/') at the end!
+sources = ['util-macros-%(version)s.tar.bz2']
+
+dependencies = [('Autoconf', '2.69')]
+
+preconfigopts = './autogen.sh && '
+
+sanity_check_paths = {
+    'files': ['share/pkgconfig/xorg-macros.pc'],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goalf-1.1.0-no-OFED.eb
index bb6336c3400b219b59f2bd589a1d0d4f9f1ef854..51a00b2812bdf359ede4018bc3c684f269c86543 100644
--- a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goalf-1.1.0-no-OFED.eb
@@ -14,7 +14,7 @@ source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
                       'files' : ['include/X11/%s' % x for x in ['ap_keysym.h', 'HPkeysym.h', 'keysym.h', 'Xalloca.h',
-                                 'Xatom.h', 'XF86keysym.h', 'Xfuncs.h', 'Xmd.h', 'Xos.h', 'Xpoll.h', 'Xprotostr.h', 
+                                 'Xatom.h', 'XF86keysym.h', 'Xfuncs.h', 'Xmd.h', 'Xos.h', 'Xpoll.h', 'Xprotostr.h',
                                  'Xw32defs.h', 'Xwindows.h', 'DECkeysym.h', 'keysymdef.h', 'Sunkeysym.h', 'Xarch.h',
                                  'Xdefs.h', 'Xfuncproto.h', 'X.h', 'Xosdefs.h', 'Xos_r.h', 'Xproto.h', 'Xthreads.h',
                                  'XWDFile.h', 'Xwinsock.h']],
diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goolf-1.4.10.eb b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goolf-1.4.10.eb
index 6e21bf0fdc2db8f4b6adf8e7bcee21fb6d9c9c61..d17e8eb76f790c9474377a1449aa0d8a388ece45 100644
--- a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goolf-1.4.10.eb
@@ -14,7 +14,7 @@ source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
     'files' : ['include/X11/%s' % x for x in ['ap_keysym.h', 'HPkeysym.h', 'keysym.h', 'Xalloca.h',
-               'Xatom.h', 'XF86keysym.h', 'Xfuncs.h', 'Xmd.h', 'Xos.h', 'Xpoll.h', 'Xprotostr.h', 
+               'Xatom.h', 'XF86keysym.h', 'Xfuncs.h', 'Xmd.h', 'Xos.h', 'Xpoll.h', 'Xprotostr.h',
                'Xw32defs.h', 'Xwindows.h', 'DECkeysym.h', 'keysymdef.h', 'Sunkeysym.h', 'Xarch.h',
                'Xdefs.h', 'Xfuncproto.h', 'X.h', 'Xosdefs.h', 'Xos_r.h', 'Xproto.h', 'Xthreads.h',
                'XWDFile.h', 'Xwinsock.h']],
diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goolf-1.5.14.eb b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goolf-1.5.14.eb
index 2837728722a326d727b98adf60577c1bc36cd0db..f34a19a93272638d1f5efec62d64a2dd85d2542b 100644
--- a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goolf-1.5.14.eb
@@ -14,7 +14,7 @@ source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
     'files' : ['include/X11/%s' % x for x in ['ap_keysym.h', 'HPkeysym.h', 'keysym.h', 'Xalloca.h',
-               'Xatom.h', 'XF86keysym.h', 'Xfuncs.h', 'Xmd.h', 'Xos.h', 'Xpoll.h', 'Xprotostr.h', 
+               'Xatom.h', 'XF86keysym.h', 'Xfuncs.h', 'Xmd.h', 'Xos.h', 'Xpoll.h', 'Xprotostr.h',
                'Xw32defs.h', 'Xwindows.h', 'DECkeysym.h', 'keysymdef.h', 'Sunkeysym.h', 'Xarch.h',
                'Xdefs.h', 'Xfuncproto.h', 'X.h', 'Xosdefs.h', 'Xos_r.h', 'Xproto.h', 'Xthreads.h',
                'XWDFile.h', 'Xwinsock.h']],
diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-4.0.6.eb b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-4.0.6.eb
index d005dadc8e4d5e9364e1ee63cf0883d2c846bd4d..fd2b06fd61646a21abd1866aa1b28fb28014f5b2 100644
--- a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-4.0.6.eb
@@ -14,7 +14,7 @@ source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
                       'files' : ['include/X11/%s' % x for x in ['ap_keysym.h', 'HPkeysym.h', 'keysym.h', 'Xalloca.h',
-                                 'Xatom.h', 'XF86keysym.h', 'Xfuncs.h', 'Xmd.h', 'Xos.h', 'Xpoll.h', 'Xprotostr.h', 
+                                 'Xatom.h', 'XF86keysym.h', 'Xfuncs.h', 'Xmd.h', 'Xos.h', 'Xpoll.h', 'Xprotostr.h',
                                  'Xw32defs.h', 'Xwindows.h', 'DECkeysym.h', 'keysymdef.h', 'Sunkeysym.h', 'Xarch.h',
                                  'Xdefs.h', 'Xfuncproto.h', 'X.h', 'Xosdefs.h', 'Xos_r.h', 'Xproto.h', 'Xthreads.h',
                                  'XWDFile.h', 'Xwinsock.h']],
diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-5.3.0.eb b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-5.3.0.eb
index 096a07bd53fb6588b1929ccd1224438590ae9af6..dad31a77b4f847bc3915147bf71407366e36b084 100644
--- a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-5.3.0.eb
@@ -15,7 +15,7 @@ source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
                       'files' : ['include/X11/%s' % x for x in ['ap_keysym.h', 'HPkeysym.h', 'keysym.h', 'Xalloca.h',
-                                 'Xatom.h', 'XF86keysym.h', 'Xfuncs.h', 'Xmd.h', 'Xos.h', 'Xpoll.h', 'Xprotostr.h', 
+                                 'Xatom.h', 'XF86keysym.h', 'Xfuncs.h', 'Xmd.h', 'Xos.h', 'Xpoll.h', 'Xprotostr.h',
                                  'Xw32defs.h', 'Xwindows.h', 'DECkeysym.h', 'keysymdef.h', 'Sunkeysym.h', 'Xarch.h',
                                  'Xdefs.h', 'Xfuncproto.h', 'X.h', 'Xosdefs.h', 'Xos_r.h', 'Xproto.h', 'Xthreads.h',
                                  'XWDFile.h', 'Xwinsock.h']],
diff --git a/easybuild/easyconfigs/y/YAXT/YAXT-0.2.1-ictce-5.5.0.eb b/easybuild/easyconfigs/y/YAXT/YAXT-0.2.1-ictce-5.5.0.eb
index 21337d5364564f4b21bd10721d7aea3033ff9ef3..580265ba7e5439a42de0e40ec57fe607b6451fd9 100644
--- a/easybuild/easyconfigs/y/YAXT/YAXT-0.2.1-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/y/YAXT/YAXT-0.2.1-ictce-5.5.0.eb
@@ -13,7 +13,7 @@ source_urls = ['https://www.dkrz.de/redmine/attachments/download/436/']
 sources = [SOURCELOWER_TAR_GZ]
 
 sanity_check_paths = {
-    'files': ["include/yaxt.h", "include/yaxt.mod", "lib/libyaxt.a", "lib/libyaxt.so"],
+    'files': ["include/yaxt.h", "include/yaxt.mod", "lib/libyaxt.a", "lib/libyaxt.%s" % SHLIB_EXT],
     'dirs': ["include/xt"],
 }
 
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 2f4d2827cfbe139b3d19ab3415825de6c79e9697..e6b15eb6108645accf35dea0a6df2107fdc858c5 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
@@ -27,7 +27,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/libzmq.so', 'lib/libzmq.a'],
+    'files': ['lib/libzmq.%s' % SHLIB_EXT, 'lib/libzmq.a'],
     'dirs': ['include', 'lib'],
 }
 
diff --git a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-goolf-1.4.10.eb b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-goolf-1.4.10.eb
index 747cf1ffc258e1b955c6b20b0578ee4608367516..b73b89d70f69e29dbe5cbb6457e0c7cc440a900d 100644
--- a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-goolf-1.4.10.eb
@@ -27,7 +27,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/libzmq.so', 'lib/libzmq.a'],
+    'files': ['lib/libzmq.%s' % SHLIB_EXT, 'lib/libzmq.a'],
     'dirs': ['include', 'lib']
 }
 
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 4dbaf2c3bd1f6382bdaa40fcdc0e9ac44ca0ee45..b83d808908d2c3b91f95a879ec86e95f57cf0281 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
@@ -27,7 +27,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/libzmq.so', 'lib/libzmq.a'],
+    'files': ['lib/libzmq.%s' % SHLIB_EXT, 'lib/libzmq.a'],
     'dirs': ['include', 'lib'],
 }
 
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 2ada7561b2aa358e3ba6f307aa8b34721ace5af6..40d87c85a13ccf8729801f6019c273304fcabd3c 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
@@ -27,7 +27,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/libzmq.so', 'lib/libzmq.a'],
+    'files': ['lib/libzmq.%s' % SHLIB_EXT, 'lib/libzmq.a'],
     'dirs': ['include', 'lib'],
 }
 
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
index 629f7f4392882f0169ff68e58c5e0d96d9582855..c3ed6bc8cded57f72795fd1a4abbbe4e9ad1a874 100644
--- 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
@@ -27,7 +27,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/libzmq.so', 'lib/libzmq.a'],
+    'files': ['lib/libzmq.%s' % SHLIB_EXT, 'lib/libzmq.a'],
     'dirs': ['include', 'lib'],
 }
 
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 d1040c0b9b45dac314546601fb9161e239f59206..1252449cdc568af98bf6fc1a46f9989653a1b63b 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
@@ -27,7 +27,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/libzmq.so', 'lib/libzmq.a'],
+    'files': ['lib/libzmq.%s' % SHLIB_EXT, 'lib/libzmq.a'],
     'dirs': ['include', 'lib'],
 }
 
diff --git a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-goolf-1.4.10.eb b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-goolf-1.4.10.eb
index e0a45d3a3a20018552c08135848cb06da525456a..95a131cfe830232c215af89e24f60cd9f9b6a61d 100644
--- a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-goolf-1.4.10.eb
@@ -27,7 +27,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/libzmq.so', 'lib/libzmq.a'],
+    'files': ['lib/libzmq.%s' % SHLIB_EXT, 'lib/libzmq.a'],
     'dirs': ['include', 'lib']
 }
 
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 6ea68c4e6d1b0676d83406250a2d816c8d5c06b6..e10a755a01bfa84265bb47286457f0fd9253fd0b 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
@@ -29,7 +29,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/libzmq.so', 'lib/libzmq.a'],
+    'files': ['lib/libzmq.%s' % SHLIB_EXT, 'lib/libzmq.a'],
     'dirs': ['include', 'lib'],
 }
 
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 e61f976c13ef951dcf2a7612f9c3c144ac8248ac..527739faf9c27b1cc052ac1bf9113516be5863bc 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
@@ -29,7 +29,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/libzmq.so', 'lib/libzmq.a'],
+    'files': ['lib/libzmq.%s' % SHLIB_EXT, 'lib/libzmq.a'],
     'dirs': ['include', 'lib'],
 }
 
diff --git a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.5-foss-2015a.eb b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.5-foss-2015a.eb
index 537ac748fee1b628be5ac893fc9ffb85a660ad10..1f514501d975543cedf1ba1a283e92be5dce7af9 100644
--- a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.5-foss-2015a.eb
+++ b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.5-foss-2015a.eb
@@ -27,7 +27,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/libzmq.so', 'lib/libzmq.a'],
+    'files': ['lib/libzmq.%s' % SHLIB_EXT, 'lib/libzmq.a'],
     'dirs': ['include', 'lib'],
 }
 
diff --git a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.5-intel-2015a.eb b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.5-intel-2015a.eb
index 19243eab21929639d393a570ffb061db30487553..b225911a4b767b096e6a5774efd444a2a39569d0 100644
--- a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.5-intel-2015a.eb
+++ b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.5-intel-2015a.eb
@@ -29,7 +29,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/libzmq.so', 'lib/libzmq.a'],
+    'files': ['lib/libzmq.%s' % SHLIB_EXT, 'lib/libzmq.a'],
     'dirs': ['include', 'lib'],
 }
 
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
index 24e4243b5aeb325796f1db53a387546f19e07143..7785988c2b9c9a8ec47be545379df697290080a5 100644
--- 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
@@ -27,7 +27,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/libzmq.so', 'lib/libzmq.a'],
+    'files': ['lib/libzmq.%s' % SHLIB_EXT, 'lib/libzmq.a'],
     'dirs': ['include', 'lib'],
 }
 
diff --git a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-4.1.3-intel-2015a.eb b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-4.1.3-intel-2015a.eb
index e23ec179be069f5fa56dbd8e1f3c1965cafc12ef..bc5c878ab6dbbe7484074ca71362209f8e67377a 100644
--- a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-4.1.3-intel-2015a.eb
+++ b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-4.1.3-intel-2015a.eb
@@ -28,7 +28,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/libzmq.so', 'lib/libzmq.a'],
+    'files': ['lib/libzmq.%s' % SHLIB_EXT, 'lib/libzmq.a'],
     'dirs': ['include', 'lib'],
 }
 
diff --git a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-4.1.4-intel-2015b.eb b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-4.1.4-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0261518b887bb8c28f1bbfdba350ac606f403679
--- /dev/null
+++ b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-4.1.4-intel-2015b.eb
@@ -0,0 +1,35 @@
+easyblock = 'ConfigureMake'
+
+name = 'ZeroMQ'
+version = '4.1.4'
+
+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': 'intel', 'version': '2015b'}
+
+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.27.1'),
+    ('libsodium', '1.0.6'),
+]
+
+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.5-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.5-goalf-1.1.0-no-OFED.eb
index 9722f5606c7b1d8a7fc84e1a27a0e27ebde71e9c..37f161d0c04f49ad5e006b4e78edb6b1bb45d84c 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.5-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.5-goalf-1.1.0-no-OFED.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.5-goolf-1.4.10.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.5-goolf-1.4.10.eb
index 9aed2a693231c0fbfe3f7b16bf3e9d5e103623c5..daba234ecf69097ceb284cb243b4fe1e0b77a296 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.5-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.5-goolf-1.4.10.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.5-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.5-ictce-3.2.2.u3.eb
index d01a7f9d722bfa01ac5754793cac6701c2724d61..b40c73ee4b884add8fa7fc2d23b216a425003ea2 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.5-ictce-3.2.2.u3.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.5-ictce-3.2.2.u3.eb
@@ -17,7 +17,7 @@ source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%(version)s',
 patches = ['zlib-%(version)s-detected-icc.patch']
 
 sanity_check_paths = {
-    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.so'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.5-ictce-4.0.6.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.5-ictce-4.0.6.eb
index 69d5b76957a7e291990747534f257d73fa72b419..7cbc32bfe9d79d43ebbfcd50bb7221f40894d0bd 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.5-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.5-ictce-4.0.6.eb
@@ -17,7 +17,7 @@ source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%(version)s',
 patches = ['zlib-%(version)s-detected-icc.patch']
 
 sanity_check_paths = {
-    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.so'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.5-ictce-4.1.13.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.5-ictce-4.1.13.eb
index 47b80f9b8b1682046d06e589df9ca598fa57dec3..902026b61d30ed1926ca8644fcf701ae7b5aae62 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.5-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.5-ictce-4.1.13.eb
@@ -17,7 +17,7 @@ source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%(version)s',
 patches = ['zlib-%(version)s-detected-icc.patch']
 
 sanity_check_paths = {
-    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.so'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.5-ictce-5.3.0.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.5-ictce-5.3.0.eb
index a0237792fee3de493f01f605939e8c13294dc4c4..822d286719f1f3644a4d9564ee384fb3b7c352c3 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.5-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.5-ictce-5.3.0.eb
@@ -17,7 +17,7 @@ source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%(version)s',
 patches = ['zlib-%(version)s-detected-icc.patch']
 
 sanity_check_paths = {
-    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.so'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.5-ictce-5.5.0.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.5-ictce-5.5.0.eb
index 32533e0df9490a4f993f38e1901a8af250b7c2bd..1d129e59cb680b9ac37bf5ec099c479e9615a2e3 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.5-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.5-ictce-5.5.0.eb
@@ -17,7 +17,7 @@ source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%(version)s',
 patches = ['zlib-%(version)s-detected-icc.patch']
 
 sanity_check_paths = {
-    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.so'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-cgmpolf-1.1.6.eb
index 8ff26148228f15084e19e4bd084596f7f0c9882d..de4650180a41a801375440df521ae6822c714c36 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-cgmpolf-1.1.6.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-cgmpolf-1.1.6.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-cgmvolf-1.1.12rc1.eb
index 226a64f7a2826bd8c9adf3cd373e89d042839f1e..fe4296cb856f3a549abcd0c2b66113d31c189396 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-cgmvolf-1.1.12rc1.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-cgmvolf-1.1.12rc1.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-cgmvolf-1.2.7.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-cgmvolf-1.2.7.eb
index 48fed3624ccf0a9f28a71f13beae0235b3254ca6..9d2adb08155d5ef329907bedb29da0d961a35674 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-cgmvolf-1.2.7.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-cgmvolf-1.2.7.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-cgoolf-1.1.7.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-cgoolf-1.1.7.eb
index 1a47989ab0cbe72a31625e00b6741e4dea0a656a..c29279005d1cdc5d029dcd636138011738f5d745 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-cgoolf-1.1.7.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-cgoolf-1.1.7.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-foss-2014b.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-foss-2014b.eb
index 9909f13d52261e731505ac292140d030cecf48d8..2cd7bfea2b90e14db1b5c27d2196a92e7b109404 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-foss-2014b.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-foss-2014b.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-gmvapich2-1.7.12.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-gmvapich2-1.7.12.eb
index bf8527b9384e80e2fb2895041ddb7e1b1be462af..c2c22020a2fa3313590e1e4d512f04c6d839f78b 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-gmvapich2-1.7.12.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-gmvapich2-1.7.12.eb
@@ -15,7 +15,7 @@ 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"],
+    'files': ["include/zconf.h", "include/zlib.h", "lib/libz.a", "lib/libz.%s" % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-gmvolf-1.7.12.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-gmvolf-1.7.12.eb
index 524811dfd5da35df93b446206aae4d1bee63ac22..0b958206e7aef98bd3bb14163e0227f1ec22e895 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-gmvolf-1.7.12.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-gmvolf-1.7.12.eb
@@ -15,7 +15,7 @@ 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"],
+    'files': ["include/zconf.h", "include/zlib.h", "lib/libz.a", "lib/libz.%s" % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-gmvolf-1.7.12rc1.eb
index 93ea64e321f4f327c030f6462236e8aafcb57d31..92dd07257ea883752da96cf492c8b7acecdc1bb4 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-gmvolf-1.7.12rc1.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-gmvolf-1.7.12rc1.eb
@@ -15,7 +15,7 @@ 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"],
+    'files': ["include/zconf.h", "include/zlib.h", "lib/libz.a", "lib/libz.%s" % SHLIB_EXT],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-goalf-1.1.0-no-OFED.eb
index 2349edc7b62aade492557bc97a49930d8a98082d..fb65776a3a08b8f76e4d22e5961a00796c1d506d 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-goalf-1.1.0-no-OFED.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
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
index 11979135cdf9d4a67430c680ca4ef2787254f29b..7f6715e88a3cba493a0cc821396f63295810c544 100644
--- 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
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-3.2.2.u3.eb
index b0a946a39d64b9e15f68d085dee9973a95b87d1b..e32a3e79c43e8ae98ec50059a3f1e7ee3dabddd3 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-3.2.2.u3.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-3.2.2.u3.eb
@@ -17,7 +17,7 @@ source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%(version)s',
 patches = ['zlib-%(version)s-detected-icc.patch']
 
 sanity_check_paths = {
-    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.so'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-4.0.10.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-4.0.10.eb
index c028b117215e1953d68dc6e92cd6be06fa781678..db3a0dfff8f61e3f2f858988691fc97fcb89ab56 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-4.0.10.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-4.0.10.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-4.0.6.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-4.0.6.eb
index 9728ddb7b21079f345024d4862c7ccfcaeb3a9d7..b9505d072cf65872ee05a6368357e63fbd3251be 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-4.0.6.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-4.1.13.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-4.1.13.eb
index f713fd7cf7121c3887f0c9d7784fce937c2471c9..8b2f4375e42128673d7aa19f62731ee3151330aa 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-4.1.13.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-5.2.0.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-5.2.0.eb
index 1afe111ef5d4cf70894bdff96a360a993d2c0845..7fb621ba0df510fc25cd2d9bf8260f2d42f05553 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-5.2.0.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-5.2.0.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-5.3.0.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-5.3.0.eb
index 115527d009f9bb7e91eafddf0b5473fe86ea89a1..90333383fbbadf89442490bf25cf17f18aa41fa0 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-5.3.0.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-5.4.0.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-5.4.0.eb
index b5a38518237b8a096ef0c48281cda74b922b1987..ab73afa7b9c8c5713e20f032ddfacbdfeef12a91 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-5.4.0.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-5.4.0.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
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
index 07c5786ac6a7fcbd9c66a37935ca10b0dfb97027..260dbe8959d1f3c47c075525db9d56f0e56e67a0 100644
--- 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
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-6.1.5.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-6.1.5.eb
index 62b9777b1c06b1fbded08b09b802f5041d09927e..208dc7a9fd447e37ae8e6baca89d142bb8cae985 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-6.1.5.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-6.1.5.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-intel-2015a.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-intel-2015a.eb
index d4d69bb5d671645a08c607034a63e94d0def7f18..ebb898495951a4c31597049b9ca3e29c34a7ad32 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-intel-2015a.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-intel-2015a.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-iomkl-4.6.13.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-iomkl-4.6.13.eb
index 70d765ec1256d368086d347733babe553d82e6bc..c7709c49619ed210497cbd70afc41c5cb17c5c0b 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-iomkl-4.6.13.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-iomkl-4.6.13.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-iqacml-3.7.3.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-iqacml-3.7.3.eb
index 34070b60f491ae504b148f3d0a1120fb5616938c..9bdeabddeca5b67e68baa18d71b18b30ea9bc9b7 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-iqacml-3.7.3.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.7-iqacml-3.7.3.eb
@@ -17,7 +17,7 @@ source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%(version)s',
 patches = ['zlib-%(version)s-detected-icc.patch']
 
 sanity_check_paths = {
-    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.so'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-CrayGNU-5.1.29.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-CrayGNU-5.1.29.eb
index f6714bc2c14f4a912545c40bdd9d01a116640c8c..e23fdc62cba725270bd7e10c55f1daef8ddde835 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-CrayGNU-5.1.29.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-CrayGNU-5.1.29.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-CrayGNU-5.2.25.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-CrayGNU-5.2.25.eb
index 17db62ce981b6853924d35a91df9acb6b937870d..196dc1e3be416521fa0e0f0aeeb07ae9dd164b7b 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-CrayGNU-5.2.25.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-CrayGNU-5.2.25.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-CrayGNU-5.2.40.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-CrayGNU-5.2.40.eb
index 736d7b43ce9634350228d1ea50eab4fa7c6ed67e..942056eae5de36d426bf7b105473ba2aa5be0a55 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-CrayGNU-5.2.40.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-CrayGNU-5.2.40.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-4.9.2-binutils-2.25.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-4.9.2-binutils-2.25.eb
index 2f2a76d597aec547ba00a50b5f5b97d9e94b4fc4..6aa4e52aa9e45469ac92bce8a3ab42b1b840d133 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-4.9.2-binutils-2.25.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-4.9.2-binutils-2.25.eb
@@ -18,7 +18,7 @@ source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%(version)s',
 builddependencies = [('binutils', '2.25', '', True)]
 
 sanity_check_paths = {
-    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.so'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-4.9.2.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-4.9.2.eb
index 6d7d97956e84ba880639c172817415d04e86e492..9010ac84fcd90ecf8487a5cf8142c9bf7a602c6c 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-4.9.2.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ed40a656ffd5f78cbfaae2e1472ed0e854e5f661
--- /dev/null
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-4.9.3-2.25.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+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': 'GCC', 'version': '4.9.3-2.25'}
+toolchainopts = {'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.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-4.9.3-binutils-2.25.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-4.9.3-binutils-2.25.eb
index 4e570a5bd454e24d780f3954379135c4cae825ba..9ab612053c2c06423ee719f6d14013a087cca6f5 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-4.9.3-binutils-2.25.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-4.9.3-binutils-2.25.eb
@@ -18,7 +18,7 @@ source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%(version)s',
 builddependencies = [('binutils', '2.25', '', True)]
 
 sanity_check_paths = {
-    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.so'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-4.9.3.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-4.9.3.eb
index 9473da0a68d0e1a675ac14135d1d306dbb64cc82..f19cf0b1f2e0da584b3a02594610a3f8bca84d86 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-4.9.3.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-4.9.3.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-5.1.0-binutils-2.25.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-5.1.0-binutils-2.25.eb
index e551df98f0c6eb0f1a871804095b5b667e3f52ab..3475aad2a70954de80c92a353b67aa5efe40955d 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-5.1.0-binutils-2.25.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-5.1.0-binutils-2.25.eb
@@ -18,7 +18,7 @@ source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%(version)s',
 builddependencies = [('binutils', '2.25', '', True)]
 
 sanity_check_paths = {
-    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.so'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCCcore-4.9.3.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCCcore-4.9.3.eb
index 48e9e054620e478bae30ab3f056a633eb637268d..1353624765dbaa410ea76afe149c404dc3e94a63 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCCcore-4.9.3.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCCcore-4.9.3.eb
@@ -18,7 +18,7 @@ source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%(version)s',
 builddependencies = [('binutils', '2.25', '', True)]
 
 sanity_check_paths = {
-    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.so'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GNU-4.9.3-2.25.eb
index dd3f32139a458df31de518c8d360438a14b51737..cb71ffc347c8711a8f75529c74f26a32a32e35a8 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GNU-4.9.3-2.25.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-foss-2014b.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-foss-2014b.eb
index a9a1a7a751d10661d5d1fa9c669695535f0f8afd..cfcb2bbea8f6605ef0c782108ab7c692f32b6d68 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-foss-2014b.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-foss-2014b.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-foss-2015.05.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-foss-2015.05.eb
index 33f49407b27900b1d56bc1fea2a9e1ccf2950d9d..d7d7de4e67d3dda191c69c27955088714ccd9f66 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-foss-2015.05.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-foss-2015.05.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-foss-2015a.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-foss-2015a.eb
index 564e7c630a5ab7a3c849406ea8dfbcffa29b82d7..db7aae0d304e3638c7c034bd9ff71d290899396d 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-foss-2015a.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-foss-2015a.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-foss-2015b.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-foss-2015b.eb
index 7b3f5726f1ab937dc146420cf951d33a02654af4..7816ad0e723b8ffdc813cbe3c559c69e4494cbb1 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-foss-2015b.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-foss-2015b.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-foss-2016a.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8e13f1aa09f4c5459191f4bb3ff859ef31f829ce
--- /dev/null
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-foss-2016a.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+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': 'foss', 'version': '2016a'}
+toolchainopts = {'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.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-gimkl-2.11.5.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-gimkl-2.11.5.eb
index 587247480f428e1399cef831ffe43aec9093bf62..5d61da12e59b593e55aae23513c9bfec9189e71c 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-gimkl-2.11.5.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-gimkl-2.11.5.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-goalf-1.5.12-no-OFED.eb
index 6842a4905a708854fbd1bcbb6536dd169343d5df..84377844a5393f1416c6fde26062dc1de582ce47 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-goalf-1.5.12-no-OFED.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-goalf-1.5.12-no-OFED.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-gompi-1.5.16.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-gompi-1.5.16.eb
index 695c4e9adbb27d0e96391122c3206cf319887a1f..193fdea71fddcf06b88bf268e9048b1454fc56b7 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-gompi-1.5.16.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-gompi-1.5.16.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-goolf-1.4.10.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-goolf-1.4.10.eb
index ef7ff90823dbae2808d22b9f34b886a0c35af56a..e939da6164e7b2f95b7bf065dd61f8311156f288 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-goolf-1.4.10.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-goolf-1.5.14.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-goolf-1.5.14.eb
index 04ad52753bcaac3d86e013feb87397fe92510c34..e6c8fcbaf522bb3bd084f1f3e8bb9a68a88aa7c6 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-goolf-1.5.14.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-goolf-1.5.16.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-goolf-1.5.16.eb
index 2f5f986ee278908a43df72cb4a58c14bde163d09..fa938352c895c0d9669e942a33ef64f5e3d1b233 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-goolf-1.5.16.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-goolf-1.5.16.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-goolf-1.7.20.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-goolf-1.7.20.eb
index f1b7c406e89242313da17fd5ebc43177bb36f7d3..5f8aec5188957b9bb360f3547deeac3cb09f12e1 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-goolf-1.7.20.eb
@@ -15,7 +15,7 @@ source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%(version)s',
 sources = [SOURCELOWER_TAR_GZ]
 
 sanity_check_paths = {
-    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.so'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-ictce-4.1.13.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-ictce-4.1.13.eb
index 19090e972d5576df82c2a2fc74b4b5d83e05805f..12a56a28d09b2dcca9d7b23e2cdbb06a5447daf2 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-ictce-4.1.13.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-ictce-5.3.0.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-ictce-5.3.0.eb
index 6079bed795ed96f2a77eaa210b9b59888e9a58d7..e7a70ba0d0593051f0891325689b540766a1b62e 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-ictce-5.3.0.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-ictce-5.4.0.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-ictce-5.4.0.eb
index 676cd36a50ad788dcea662b55ee8f655bd63fc97..15b66c7537251cbbd27e352a5a27e5ff6ce03978 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-ictce-5.4.0.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-ictce-5.4.0.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-ictce-5.5.0.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-ictce-5.5.0.eb
index 7e2745fe837d8a9809070441b6821af80a1bb1ec..fe67071a0f85be8afd687bbca4e4dedc5ef6bf64 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-ictce-5.5.0.eb
@@ -15,7 +15,7 @@ sources = [SOURCELOWER_TAR_GZ]
 source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%s' % version, 'download')]
 
 sanity_check_paths = {
-    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.so'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
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
index 6159219e439dd8d07be62daf007fc7b050f0071d..f0a6894a1594b2f147222d6de3b7615b0e48bbce 100644
--- 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
@@ -15,7 +15,7 @@ sources = [SOURCELOWER_TAR_GZ]
 source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%s' % version, 'download')]
 
 sanity_check_paths = {
-    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.so'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-ictce-6.3.5.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-ictce-6.3.5.eb
index 2a01e395d92aca91052209163ead0e460a77e6c1..9996730fc60bcd7499bfcc56024312962e5896f7 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-ictce-6.3.5.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-ictce-6.3.5.eb
@@ -18,7 +18,7 @@ source_urls = [
 ]
 
 sanity_check_paths = {
-    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.so'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-ictce-7.1.2.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-ictce-7.1.2.eb
index 9847388bbe3f8370ecb4364164bc67655b1f2b70..d1ec42ed0ef4b44de8fe78b1be93bb8f74f4f416 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-ictce-7.1.2.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-ictce-7.1.2.eb
@@ -15,7 +15,7 @@ sources = [SOURCELOWER_TAR_GZ]
 source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%s' % version, 'download')]
 
 sanity_check_paths = {
-    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.so'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-ictce-7.3.5.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-ictce-7.3.5.eb
index 598e2f0a701d24be498ce8d74938e3addb40efe7..c37c55c1d2f2e2243321c67dd7bcca316222f660 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-ictce-7.3.5.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-ictce-7.3.5.eb
@@ -15,7 +15,7 @@ sources = [SOURCELOWER_TAR_GZ]
 source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%s' % version, 'download')]
 
 sanity_check_paths = {
-    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.so'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-intel-2014.06.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-intel-2014.06.eb
index 8222dedfd6ee8d5e4813f4561b1c477844b1e60f..603aa1686ed43087844ea1edeffe907a6c9c19f8 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-intel-2014.06.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-intel-2014.06.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-intel-2014b.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-intel-2014b.eb
index ea8ec92737edc442421d201a276260bd067603a2..855a831081b8d757b822dcb45c6031df952b473a 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-intel-2014b.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-intel-2014b.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-intel-2015a.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-intel-2015a.eb
index 08196c546846d8b15e143dac1d2db88124b98bb6..ac61371779598ef6ab9563bb1fefc63d2c5acea6 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-intel-2015a.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-intel-2015a.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-intel-2015b.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-intel-2015b.eb
index 3f7d7ddee0bcc513c16cc14c41a19ce4b3ab1d9b..4b58f77dff869fb5c3061d3fce1e3898da67ab95 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-intel-2015b.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-intel-2015b.eb
@@ -15,7 +15,7 @@ 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'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-intel-2016a.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e9099d2071061c820cff142811e6da975979a48a
--- /dev/null
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-intel-2016a.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+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': 'intel', 'version': '2016a'}
+toolchainopts = {'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.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-iqacml-3.7.3.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-iqacml-3.7.3.eb
index 2e832099e810bc71908f93f70c9365dbbb46cebd..2cc314be64bdcb9d41b1c8408620104064836319 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-iqacml-3.7.3.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-iqacml-3.7.3.eb
@@ -17,7 +17,7 @@ source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%(version)s',
 patches = ['zlib-1.2.7-detected-icc.patch']
 
 sanity_check_paths = {
-    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.so'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8.eb
index 606b98c86a4808bba071f428469065b20a4b26b8..82a1155e2efd8f23e8967a8d05e2b73f27a7d868 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8.eb
@@ -18,7 +18,7 @@ source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%(version)s',
 buildopts = 'CFLAGS="-O2 -fPIC"'
 
 sanity_check_paths = {
-    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.so'],
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..700c19b72cbc7dfcffbc177b124db83c6312f0d3
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,2 @@
+[easy_install]
+
diff --git a/setup.py b/setup.py
index 611161c4794d62d1c51dce213436d129be3e3d98..caeb9346b1f21d87b3e81339f6800dc9f2a2ae17 100644
--- a/setup.py
+++ b/setup.py
@@ -47,7 +47,7 @@ from distutils import log
 # recent setuptools versions will *TRANSFORM* something like 'X.Y.Zdev' into 'X.Y.Z.dev0', with a warning like
 #   UserWarning: Normalizing '2.4.0dev' to '2.4.0.dev0'
 # This causes problems further up the dependency chain...
-VERSION = '2.5.0'
+VERSION = '2.6.0'
 
 API_VERSION = VERSION.split('.')[0]
 EB_VERSION = '.'.join(VERSION.split('.')[0:2])