diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 8501454d3737f8f1bde8e94ceca8613b3bb379e2..c74d917ce1bf095031b7885979b18db4a1503f68 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -3,8 +3,60 @@ 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 6,548 easyconfig files, for 998 different software packages,
-37 different (compiler) toolchains, 12 software bundles and 1 meta-package.
+The latest version of easybuild-easyconfig provides 7,060 easyconfig files, for 1,085 different software packages,
+37 different (compiler) toolchains, 13 software bundles and 1 meta-package.
+
+v2.9.0 (September 23rd 2016)
+----------------------------
+
+feature release
+- added example easyconfig files for 88 new software packages:
+    ADMIXTURE (#3359), angsd (#3593), ASHS (#3429), AutoDock (#3465), AutoGrid (#3466), BayeScan (#2748, #3356),
+    BayPass (#3451), Bazel (#3379), Blender (#3553, #3558), bwakit (#3567), BXH_XCEDE_TOOLS (#3410), CastXML (#3403),
+    CHASE (#3304), configparser (#3368, #3424), configurable-http-proxy (#3380), cppcheck (#3508), CRPropa (#779),
+    DicomBrowser (#3432), DMTCP (#3422), entrypoints (#3368, #3424), f90cache (#3570), fastPHASE (#3343),
+    fastQValidator (#3192), FFindex (#1135), FragGeneScan (#1198), gdc-client (#3399), gflags (#3417), glog (#3417),
+    GRIT (#3561), H5hut (#3431), HAPGEN2 (#3344), HEALPix (#779), IMOD (#1187, #3347), IronPython (#607),
+    jhbuild (#3476), jupyterhub (#3380), Keras (#3581), khmer (#1158), LeadIT (#3345, #3599), LevelDB (#3417),
+    libbitmask (#3481), libcpuset (#3481), LMDB (#3417), log4cplus (#1136), MACH (#3346), Mako (#3460), Maq (#3428),
+    MetaGeneAnnotator (#3307), Metal (#3324), Mono (#607), MyMediaLite (#607), nco (#2575), nose-parameterized (#3579),
+    OpenEXR (#3553), OpenImageIO (#3553), path.py (#3368, #3424), PCRE2 (#3325), pftoolsV3 (#3317), PHASE (#3385),
+    PLAST (#3288), PLINKSEQ (#3402), POV-Ray (#3551), ProbABEL (#3108), prompt-toolkit (#3368, #3424),
+    protobuf-python (#3563), PSORTb (#3317), py (#3403, #3482), pygccxml (#3403, #3482), pyGIMLi (#3403, #3482),
+    pyplusplus (#3403, #3482), PyQt5 (#3533), Pyro4 (#3527), pytest (#3403, #3482), QCA (#3595), RDMC (#1137),
+    S.A.G.E. (#3427), SDL2 (#3551), SHORE (#3531), SimVascular (#3555), SortMeRNA (#3326), SUMACLUST (#3316),
+    SUMATRA (#3316), Text-CSV (#3323), Triangle (#3403), VEGAS (#3457), VirSorter (#3307), wcwidth (#3368, #3424),
+    X11 (#3340)
+- added new easyconfigs for existing toolchains:
+    - CrayGNU + CrayIntel 2016.06 (#3377)
+    - foss 2016.07 (#3517) + 2016.09 (#3523),
+    - iomkl 2016.07 (#3458)
+    - pomkl 2016.09 (#3516)
+- added additional easyconfigs for various supported software packages, including:
+    FFTW 3.3.5, GCC 4.9.4 + 6.2.0, GROMACS 5.1.4, IPython 5.1.0, LLVM 3.9.0, Mesa 12.0.1, OpenCV 3.1.0, OpenFOAM 4.0,
+    OpenMPI 2.0.1, ParaView 5.1.2, PGI 16.7, QuantumESPRESSO 5.4.0, Qt5 5.7.0, R-bundle-Bioconductor 3.3, VTK 7.0.0,
+    Yade 2016.06a
+- various enhancements, including:
+    - adjust PSI4 easyconfigs for updated easyblock (#3312)
+    - clean up libxml2 easyconfigs according to updated libxml2 easyblock (#3479, #3509)
+    - significantly speed up verifying of dumped easyconfig by resorting to 'shallow' parsing (#3520)
+    - include sanity checks for all MATIO config files (#3528)
+    - remove --with-tcl-config/--with-tk-config from R easyconfig, already done in R easyblock (#3580)
+- various bug fixes, including:
+    - disable testing in all ParaView 4.4.0 easyconfigs, required download is too much of a PITA (#3178)
+    - add SQLite as dep to GDAL 2.1.0 easyconfigs (#3342)
+    - add zlib/SQLite/LibTIFF as dep to R 3.3.1 easyconfigs (#3342)
+    - add bzip2 as a dependency of freetype (#3464)
+    - specify correct MPI target in FDS easyconfigs (#3488)
+    - add tcsh as OS dep in NAMD easyconfigs (#3491)
+    - statically link ncurses/libreadline in Lua easyconfig with 'dummy' toolchain (#3545)
+    - add M4 as dep for flex 2.6.x (#3542, #3550)
+    - add bzip2 and libxcb dependencies to FFmpeg 3.x easyconfigs (#3548)
+    - make sure & check that Graphviz does not install Tcl bindings in Tcl install prefix (#3556)
+    - add missing patches for extensions in Python 3.x easyconfigs (#3557)
+    - add missing XZ dependency to libxml2 2.9.4 easyconfigs, change gettext dep of XZ to build-only dep (#3568)
+    - enable running of tests for HPCG (#3578)
+    - fix buildopts in tabix easyconfigs (#3584)
 
 
 v2.8.2 (July 13th 2016)
diff --git a/easybuild/easyconfigs/0/3to2/3to2-1.1.1-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/0/3to2/3to2-1.1.1-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..264a6e4ac8233d37303084d292657fe6e6a11470
--- /dev/null
+++ b/easybuild/easyconfigs/0/3to2/3to2-1.1.1-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,25 @@
+easyblock = 'PythonPackage'
+
+name = '3to2'
+version = '1.1.1'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://pypi.python.org/pypi/3to2'
+description = """lib3to2 is a set of fixers that are intended to backport code written for Python version 3.x
+ into Python version 2.x."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_ZIP]
+
+dependencies = [('Python', '2.7.12')]
+
+options = {'modulename': 'lib3to2'}
+
+sanity_check_paths = {
+    'files': ['bin/3to2'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/a/ABySS/ABySS-1.3.4-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/a/ABySS/ABySS-1.3.4-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/a/ABySS/ABySS-1.3.4-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/a/ABySS/ABySS-1.3.4-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/a/ABySS/ABySS-1.3.4-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/a/ABySS/ABySS-1.3.4-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/a/ABySS/ABySS-1.3.4-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/a/ABySS/ABySS-1.3.4-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/a/ALADIN/ALADIN-36t1_op2bf1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/a/ALADIN/ALADIN-36t1_op2bf1-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/a/ALADIN/ALADIN-36t1_op2bf1-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/a/ALADIN/ALADIN-36t1_op2bf1-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/a/ALADIN/ALADIN-36t1_op2bf1-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/a/ALADIN/ALADIN-36t1_op2bf1-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/a/ALADIN/ALADIN-36t1_op2bf1-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/a/ALADIN/ALADIN-36t1_op2bf1-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/a/AMOS/AMOS-3.1.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/a/AMOS/AMOS-3.1.0-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/a/AMOS/AMOS-3.1.0-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/a/AMOS/AMOS-3.1.0-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/a/AMOS/AMOS-3.1.0-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/a/AMOS/AMOS-3.1.0-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/a/AMOS/AMOS-3.1.0-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/a/AMOS/AMOS-3.1.0-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/a/ARB/ARB-5.5-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/a/ARB/ARB-5.5-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/a/ASE/ASE-3.6.0.2515-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/a/ASE/ASE-3.6.0.2515-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/a/ASE/ASE-3.6.0.2515-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/a/ASE/ASE-3.6.0.2515-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/a/ASE/ASE-3.6.0.2515-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/a/ASE/ASE-3.6.0.2515-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/a/ASE/ASE-3.6.0.2515-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/a/ASE/ASE-3.6.0.2515-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/a/ATLAS/ATLAS-3.10.1-gompi-1.5.12-LAPACK-3.4.2.eb b/easybuild/easyconfigs/__archive__/a/ATLAS/ATLAS-3.10.1-gompi-1.5.12-LAPACK-3.4.2.eb
similarity index 100%
rename from easybuild/easyconfigs/a/ATLAS/ATLAS-3.10.1-gompi-1.5.12-LAPACK-3.4.2.eb
rename to easybuild/easyconfigs/__archive__/a/ATLAS/ATLAS-3.10.1-gompi-1.5.12-LAPACK-3.4.2.eb
diff --git a/easybuild/easyconfigs/a/ATLAS/ATLAS-3.10.1-gompi-1.5.12-no-OFED-LAPACK-3.4.2.eb b/easybuild/easyconfigs/__archive__/a/ATLAS/ATLAS-3.10.1-gompi-1.5.12-no-OFED-LAPACK-3.4.2.eb
similarity index 100%
rename from easybuild/easyconfigs/a/ATLAS/ATLAS-3.10.1-gompi-1.5.12-no-OFED-LAPACK-3.4.2.eb
rename to easybuild/easyconfigs/__archive__/a/ATLAS/ATLAS-3.10.1-gompi-1.5.12-no-OFED-LAPACK-3.4.2.eb
diff --git a/easybuild/easyconfigs/a/ATLAS/ATLAS-3.8.4-gompi-1.1.0-no-OFED-LAPACK-3.4.0.eb b/easybuild/easyconfigs/__archive__/a/ATLAS/ATLAS-3.8.4-gompi-1.1.0-no-OFED-LAPACK-3.4.0.eb
similarity index 100%
rename from easybuild/easyconfigs/a/ATLAS/ATLAS-3.8.4-gompi-1.1.0-no-OFED-LAPACK-3.4.0.eb
rename to easybuild/easyconfigs/__archive__/a/ATLAS/ATLAS-3.8.4-gompi-1.1.0-no-OFED-LAPACK-3.4.0.eb
diff --git a/easybuild/easyconfigs/a/ATLAS/ATLAS-3.8.4-gompi-1.1.0-no-OFED-with-shared-libs.eb b/easybuild/easyconfigs/__archive__/a/ATLAS/ATLAS-3.8.4-gompi-1.1.0-no-OFED-with-shared-libs.eb
similarity index 100%
rename from easybuild/easyconfigs/a/ATLAS/ATLAS-3.8.4-gompi-1.1.0-no-OFED-with-shared-libs.eb
rename to easybuild/easyconfigs/__archive__/a/ATLAS/ATLAS-3.8.4-gompi-1.1.0-no-OFED-with-shared-libs.eb
diff --git a/easybuild/easyconfigs/a/ATLAS/ATLAS-3.8.4-gompi-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/a/ATLAS/ATLAS-3.8.4-gompi-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/a/ATLAS/ATLAS-3.8.4-gompi-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/a/ATLAS/ATLAS-3.8.4-gompi-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/a/AnalyzeFMRI/AnalyzeFMRI-1.1-15-ictce-4.0.10-R-2.15.2.eb b/easybuild/easyconfigs/__archive__/a/AnalyzeFMRI/AnalyzeFMRI-1.1-15-ictce-4.0.10-R-2.15.2.eb
similarity index 100%
rename from easybuild/easyconfigs/a/AnalyzeFMRI/AnalyzeFMRI-1.1-15-ictce-4.0.10-R-2.15.2.eb
rename to easybuild/easyconfigs/__archive__/a/AnalyzeFMRI/AnalyzeFMRI-1.1-15-ictce-4.0.10-R-2.15.2.eb
diff --git a/easybuild/easyconfigs/a/Armadillo/Armadillo-2.4.4-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/a/Armadillo/Armadillo-2.4.4-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/a/Armadillo/Armadillo-2.4.4-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/a/Armadillo/Armadillo-2.4.4-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/a/Armadillo/Armadillo-2.4.4-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/a/Armadillo/Armadillo-2.4.4-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/a/Armadillo/Armadillo-2.4.4-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/a/Armadillo/Armadillo-2.4.4-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-gcccuda-2.6.10.eb b/easybuild/easyconfigs/__archive__/a/Autoconf/Autoconf-2.69-gcccuda-2.6.10.eb
similarity index 100%
rename from easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-gcccuda-2.6.10.eb
rename to easybuild/easyconfigs/__archive__/a/Autoconf/Autoconf-2.69-gcccuda-2.6.10.eb
diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/a/Autoconf/Autoconf-2.69-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/a/Autoconf/Autoconf-2.69-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/a/Autoconf/Autoconf-2.69-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/a/Autoconf/Autoconf-2.69-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/a/Autoconf/Autoconf-2.69-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/a/Automake/Automake-1.13.4-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/a/Automake/Automake-1.13.4-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/a/Automake/Automake-1.14-gcccuda-2.6.10.eb b/easybuild/easyconfigs/__archive__/a/Automake/Automake-1.14-gcccuda-2.6.10.eb
similarity index 100%
rename from easybuild/easyconfigs/a/Automake/Automake-1.14-gcccuda-2.6.10.eb
rename to easybuild/easyconfigs/__archive__/a/Automake/Automake-1.14-gcccuda-2.6.10.eb
diff --git a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/a/a2ps/a2ps-4.14-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/a/a2ps/a2ps-4.14-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/a/a2ps/a2ps-4.14-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/a/a2ps/a2ps-4.14-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/a/a2ps/a2ps-4.14-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/a/aria2/aria2-1.15.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/a/aria2/aria2-1.15.1-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/a/aria2/aria2-1.15.1-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/a/aria2/aria2-1.15.1-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/a/aria2/aria2-1.15.1-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/a/aria2/aria2-1.15.1-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/a/aria2/aria2-1.15.1-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/a/aria2/aria2-1.15.1-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/b/BEDTools/BEDTools-2.17.0-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/b/BEDTools/BEDTools-2.17.0-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/b/BEEF/BEEF-0.1.1-r16-iomkl-4.6.13.eb b/easybuild/easyconfigs/__archive__/b/BEEF/BEEF-0.1.1-r16-iomkl-4.6.13.eb
similarity index 100%
rename from easybuild/easyconfigs/b/BEEF/BEEF-0.1.1-r16-iomkl-4.6.13.eb
rename to easybuild/easyconfigs/__archive__/b/BEEF/BEEF-0.1.1-r16-iomkl-4.6.13.eb
diff --git a/easybuild/easyconfigs/b/BFAST/BFAST-0.7.0a-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/b/BFAST/BFAST-0.7.0a-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/b/BFAST/BFAST-0.7.0a-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/b/BFAST/BFAST-0.7.0a-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/b/BFAST/BFAST-0.7.0a-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/b/BFAST/BFAST-0.7.0a-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/b/BFAST/BFAST-0.7.0a-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/b/BFAST/BFAST-0.7.0a-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/b/BLACS/BLACS-1.1-gmpolf-1.4.8.eb b/easybuild/easyconfigs/__archive__/b/BLACS/BLACS-1.1-gmpolf-1.4.8.eb
similarity index 100%
rename from easybuild/easyconfigs/b/BLACS/BLACS-1.1-gmpolf-1.4.8.eb
rename to easybuild/easyconfigs/__archive__/b/BLACS/BLACS-1.1-gmpolf-1.4.8.eb
diff --git a/easybuild/easyconfigs/b/BLACS/BLACS-1.1-gmvapich2-1.6.7.eb b/easybuild/easyconfigs/__archive__/b/BLACS/BLACS-1.1-gmvapich2-1.6.7.eb
similarity index 100%
rename from easybuild/easyconfigs/b/BLACS/BLACS-1.1-gmvapich2-1.6.7.eb
rename to easybuild/easyconfigs/__archive__/b/BLACS/BLACS-1.1-gmvapich2-1.6.7.eb
diff --git a/easybuild/easyconfigs/b/BLACS/BLACS-1.1-gmvapich2-1.7.9a2.eb b/easybuild/easyconfigs/__archive__/b/BLACS/BLACS-1.1-gmvapich2-1.7.9a2.eb
similarity index 100%
rename from easybuild/easyconfigs/b/BLACS/BLACS-1.1-gmvapich2-1.7.9a2.eb
rename to easybuild/easyconfigs/__archive__/b/BLACS/BLACS-1.1-gmvapich2-1.7.9a2.eb
diff --git a/easybuild/easyconfigs/b/BLACS/BLACS-1.1-gompi-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/b/BLACS/BLACS-1.1-gompi-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/b/BLACS/BLACS-1.1-gompi-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/b/BLACS/BLACS-1.1-gompi-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/b/BLACS/BLACS-1.1-iiqmpi-3.3.0.eb b/easybuild/easyconfigs/__archive__/b/BLACS/BLACS-1.1-iiqmpi-3.3.0.eb
similarity index 100%
rename from easybuild/easyconfigs/b/BLACS/BLACS-1.1-iiqmpi-3.3.0.eb
rename to easybuild/easyconfigs/__archive__/b/BLACS/BLACS-1.1-iiqmpi-3.3.0.eb
diff --git a/easybuild/easyconfigs/b/BLAST+/BLAST+-2.2.27-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/b/BLAST+/BLAST+-2.2.27-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/b/BLAST+/BLAST+-2.2.27-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/b/BLAST+/BLAST+-2.2.27-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/b/BLAST+/BLAST+-2.2.27-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/b/BLAST+/BLAST+-2.2.27-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/b/BLAST+/BLAST+-2.2.27-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/b/BLAST+/BLAST+-2.2.27-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/b/BLAST+/BLAST+-2.2.28-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/b/BLAST+/BLAST+-2.2.28-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/b/BLAST+/BLAST+-2.2.28-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/b/BLAST+/BLAST+-2.2.28-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/b/BWA/BWA-0.6.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/b/BWA/BWA-0.6.2-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/b/BWA/BWA-0.6.2-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/b/BWA/BWA-0.6.2-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/b/BWA/BWA-0.6.2-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/b/BWA/BWA-0.6.2-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/b/BWA/BWA-0.6.2-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/b/BWA/BWA-0.6.2-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/b/BWA/BWA-0.7.4-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/b/BWA/BWA-0.7.4-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/b/BWA/BWA-0.7.4-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/b/BWA/BWA-0.7.4-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/b/BamTools/BamTools-2.2.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/b/BamTools/BamTools-2.2.3-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/b/BamTools/BamTools-2.2.3-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/b/BamTools/BamTools-2.2.3-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/b/Bash/Bash-4.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/b/Bash/Bash-4.2-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/b/Bash/Bash-4.2-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/b/Bash/Bash-4.2-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/b/BiSearch/BiSearch-20051222-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/b/BiSearch/BiSearch-20051222-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/b/BiSearch/BiSearch-20051222-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/b/BiSearch/BiSearch-20051222-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/b/BiSearch/BiSearch-20051222-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/b/BiSearch/BiSearch-20051222-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/b/BiSearch/BiSearch-20051222-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/b/BiSearch/BiSearch-20051222-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/b/BioPerl/BioPerl-1.6.1-ictce-4.1.13-Perl-5.16.3.eb b/easybuild/easyconfigs/__archive__/b/BioPerl/BioPerl-1.6.1-ictce-4.1.13-Perl-5.16.3.eb
similarity index 100%
rename from easybuild/easyconfigs/b/BioPerl/BioPerl-1.6.1-ictce-4.1.13-Perl-5.16.3.eb
rename to easybuild/easyconfigs/__archive__/b/BioPerl/BioPerl-1.6.1-ictce-4.1.13-Perl-5.16.3.eb
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.5-gmacml-1.7.0.eb b/easybuild/easyconfigs/__archive__/b/Bison/Bison-2.5-gmacml-1.7.0.eb
similarity index 100%
rename from easybuild/easyconfigs/b/Bison/Bison-2.5-gmacml-1.7.0.eb
rename to easybuild/easyconfigs/__archive__/b/Bison/Bison-2.5-gmacml-1.7.0.eb
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.5-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/b/Bison/Bison-2.5-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/b/Bison/Bison-2.5-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/b/Bison/Bison-2.5-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/b/Bison/Bison-2.5-ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/b/Bison/Bison-2.5-ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/b/Bison/Bison-2.5-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/b/Bison/Bison-2.5-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/b/Bison/Bison-2.5-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/b/Bison/Bison-2.5-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.5-iqacml-3.7.3.eb b/easybuild/easyconfigs/__archive__/b/Bison/Bison-2.5-iqacml-3.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/b/Bison/Bison-2.5-iqacml-3.7.3.eb
rename to easybuild/easyconfigs/__archive__/b/Bison/Bison-2.5-iqacml-3.7.3.eb
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.6.5-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/b/Bison/Bison-2.6.5-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/b/Bison/Bison-2.6.5-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/b/Bison/Bison-2.6.5-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7-ClangGCC-1.1.3.eb b/easybuild/easyconfigs/__archive__/b/Bison/Bison-2.7-ClangGCC-1.1.3.eb
similarity index 100%
rename from easybuild/easyconfigs/b/Bison/Bison-2.7-ClangGCC-1.1.3.eb
rename to easybuild/easyconfigs/__archive__/b/Bison/Bison-2.7-ClangGCC-1.1.3.eb
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7-ClangGCC-1.2.3.eb b/easybuild/easyconfigs/__archive__/b/Bison/Bison-2.7-ClangGCC-1.2.3.eb
similarity index 100%
rename from easybuild/easyconfigs/b/Bison/Bison-2.7-ClangGCC-1.2.3.eb
rename to easybuild/easyconfigs/__archive__/b/Bison/Bison-2.7-ClangGCC-1.2.3.eb
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7-iccifort-2011.13.367.eb b/easybuild/easyconfigs/__archive__/b/Bison/Bison-2.7-iccifort-2011.13.367.eb
similarity index 100%
rename from easybuild/easyconfigs/b/Bison/Bison-2.7-iccifort-2011.13.367.eb
rename to easybuild/easyconfigs/__archive__/b/Bison/Bison-2.7-iccifort-2011.13.367.eb
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/b/Bison/Bison-2.7-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/b/Bison/Bison-2.7-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7-iqacml-3.7.3.eb b/easybuild/easyconfigs/__archive__/b/Bison/Bison-2.7-iqacml-3.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/b/Bison/Bison-2.7-iqacml-3.7.3.eb
rename to easybuild/easyconfigs/__archive__/b/Bison/Bison-2.7-iqacml-3.7.3.eb
diff --git a/easybuild/easyconfigs/b/Bison/Bison-3.0.2-intel-para-2014.12.eb b/easybuild/easyconfigs/__archive__/b/Bison/Bison-3.0.2-intel-para-2014.12.eb
similarity index 100%
rename from easybuild/easyconfigs/b/Bison/Bison-3.0.2-intel-para-2014.12.eb
rename to easybuild/easyconfigs/__archive__/b/Bison/Bison-3.0.2-intel-para-2014.12.eb
diff --git a/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/b/Bonnie++/Bonnie++-1.03e-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/b/Bonnie++/Bonnie++-1.03e-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/b/Bonnie++/Bonnie++-1.03e-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/b/Bonnie++/Bonnie++-1.03e-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.49.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/b/Boost/Boost-1.49.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/b/Boost/Boost-1.49.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/b/Boost/Boost-1.49.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.49.0-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/b/Boost/Boost-1.49.0-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/b/Boost/Boost-1.49.0-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/b/Boost/Boost-1.49.0-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.51.0-gmpolf-1.4.8.eb b/easybuild/easyconfigs/__archive__/b/Boost/Boost-1.51.0-gmpolf-1.4.8.eb
similarity index 100%
rename from easybuild/easyconfigs/b/Boost/Boost-1.51.0-gmpolf-1.4.8.eb
rename to easybuild/easyconfigs/__archive__/b/Boost/Boost-1.51.0-gmpolf-1.4.8.eb
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.51.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/b/Boost/Boost-1.51.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/b/Boost/Boost-1.51.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/b/Boost/Boost-1.51.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.51.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/b/Boost/Boost-1.51.0-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/b/Boost/Boost-1.51.0-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/b/Boost/Boost-1.51.0-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.51.0-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/b/Boost/Boost-1.51.0-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/b/Boost/Boost-1.51.0-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/b/Boost/Boost-1.51.0-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.51.0-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/b/Boost/Boost-1.51.0-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/b/Boost/Boost-1.51.0-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/b/Boost/Boost-1.51.0-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.51.0-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/b/Boost/Boost-1.51.0-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/b/Boost/Boost-1.51.0-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/b/Boost/Boost-1.51.0-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.53.0-goalf-1.5.12-no-OFED-Python-2.7.5.eb b/easybuild/easyconfigs/__archive__/b/Boost/Boost-1.53.0-goalf-1.5.12-no-OFED-Python-2.7.5.eb
similarity index 100%
rename from easybuild/easyconfigs/b/Boost/Boost-1.53.0-goalf-1.5.12-no-OFED-Python-2.7.5.eb
rename to easybuild/easyconfigs/__archive__/b/Boost/Boost-1.53.0-goalf-1.5.12-no-OFED-Python-2.7.5.eb
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.53.0-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/b/Boost/Boost-1.53.0-gompi-1.4.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/b/Boost/Boost-1.53.0-gompi-1.4.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/b/Boost/Boost-1.53.0-gompi-1.4.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/b/Boost/Boost-1.53.0-ictce-4.1.13-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-4.1.13-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/b/Boost/Boost-1.53.0-ictce-4.1.13-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/b/Boost/Boost-1.53.0-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/b/Boost/Boost-1.53.0-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/b/Bowtie/Bowtie-1.0.0-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/b/Bowtie/Bowtie-1.0.0-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/b/Bowtie/Bowtie-1.0.0-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/b/Bowtie/Bowtie-1.0.0-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.0.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/b/Bowtie2/Bowtie2-2.0.2-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.0.2-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/b/Bowtie2/Bowtie2-2.0.2-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.0.2-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/b/Bowtie2/Bowtie2-2.0.2-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.0.2-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/b/Bowtie2/Bowtie2-2.0.2-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/b/bbFTP/bbFTP-3.2.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/b/bbFTP/bbFTP-3.2.0-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/b/bbFTP/bbFTP-3.2.0-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/b/bbFTP/bbFTP-3.2.0-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/b/bbftpPRO/bbftpPRO-9.3.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/b/bbftpPRO/bbftpPRO-9.3.1-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/b/bbftpPRO/bbftpPRO-9.3.1-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/b/bbftpPRO/bbftpPRO-9.3.1-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/b/beagle-lib/beagle-lib-20120124-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/b/beagle-lib/beagle-lib-20120124-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/b/beagle-lib/beagle-lib-20120124-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/b/beagle-lib/beagle-lib-20120124-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.22-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/b/binutils/binutils-2.22-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/b/binutils/binutils-2.22-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/b/binutils/binutils-2.22-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.22-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/b/binutils/binutils-2.22-gompi-1.4.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/b/binutils/binutils-2.22-gompi-1.4.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/b/binutils/binutils-2.22-gompi-1.4.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/b/byacc/byacc-20120526-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/b/byacc/byacc-20120526-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/b/byacc/byacc-20120526-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/b/byacc/byacc-20120526-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/b/byacc/byacc-20120526-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/b/byacc/byacc-20120526-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/b/byacc/byacc-20120526-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/b/byacc/byacc-20120526-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/__archive__/b/bzip2/bzip2-1.0.6-cgmpolf-1.1.6.eb
similarity index 100%
rename from easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-cgmpolf-1.1.6.eb
rename to easybuild/easyconfigs/__archive__/b/bzip2/bzip2-1.0.6-cgmpolf-1.1.6.eb
diff --git a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/__archive__/b/bzip2/bzip2-1.0.6-cgmvolf-1.1.12rc1.eb
similarity index 100%
rename from easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-cgmvolf-1.1.12rc1.eb
rename to easybuild/easyconfigs/__archive__/b/bzip2/bzip2-1.0.6-cgmvolf-1.1.12rc1.eb
diff --git a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-cgmvolf-1.2.7.eb b/easybuild/easyconfigs/__archive__/b/bzip2/bzip2-1.0.6-cgmvolf-1.2.7.eb
similarity index 100%
rename from easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-cgmvolf-1.2.7.eb
rename to easybuild/easyconfigs/__archive__/b/bzip2/bzip2-1.0.6-cgmvolf-1.2.7.eb
diff --git a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-cgoolf-1.1.7.eb b/easybuild/easyconfigs/__archive__/b/bzip2/bzip2-1.0.6-cgoolf-1.1.7.eb
similarity index 100%
rename from easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-cgoolf-1.1.7.eb
rename to easybuild/easyconfigs/__archive__/b/bzip2/bzip2-1.0.6-cgoolf-1.1.7.eb
diff --git a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-gmpolf-1.4.8.eb b/easybuild/easyconfigs/__archive__/b/bzip2/bzip2-1.0.6-gmpolf-1.4.8.eb
similarity index 100%
rename from easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-gmpolf-1.4.8.eb
rename to easybuild/easyconfigs/__archive__/b/bzip2/bzip2-1.0.6-gmpolf-1.4.8.eb
diff --git a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-gmvolf-1.7.12.eb b/easybuild/easyconfigs/__archive__/b/bzip2/bzip2-1.0.6-gmvolf-1.7.12.eb
similarity index 100%
rename from easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-gmvolf-1.7.12.eb
rename to easybuild/easyconfigs/__archive__/b/bzip2/bzip2-1.0.6-gmvolf-1.7.12.eb
diff --git a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/__archive__/b/bzip2/bzip2-1.0.6-gmvolf-1.7.12rc1.eb
similarity index 100%
rename from easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-gmvolf-1.7.12rc1.eb
rename to easybuild/easyconfigs/__archive__/b/bzip2/bzip2-1.0.6-gmvolf-1.7.12rc1.eb
diff --git a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/b/bzip2/bzip2-1.0.6-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/b/bzip2/bzip2-1.0.6-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/b/bzip2/bzip2-1.0.6-goalf-1.5.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-goalf-1.5.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/b/bzip2/bzip2-1.0.6-goalf-1.5.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/b/bzip2/bzip2-1.0.6-gompi-1.4.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-gompi-1.4.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/b/bzip2/bzip2-1.0.6-gompi-1.4.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/b/bzip2/bzip2-1.0.6-ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/b/bzip2/bzip2-1.0.6-ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/b/bzip2/bzip2-1.0.6-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/b/bzip2/bzip2-1.0.6-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/b/bzip2/bzip2-1.0.6-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/b/bzip2/bzip2-1.0.6-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-iomkl-4.6.13.eb b/easybuild/easyconfigs/__archive__/b/bzip2/bzip2-1.0.6-iomkl-4.6.13.eb
similarity index 100%
rename from easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-iomkl-4.6.13.eb
rename to easybuild/easyconfigs/__archive__/b/bzip2/bzip2-1.0.6-iomkl-4.6.13.eb
diff --git a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-iqacml-3.7.3.eb b/easybuild/easyconfigs/__archive__/b/bzip2/bzip2-1.0.6-iqacml-3.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-iqacml-3.7.3.eb
rename to easybuild/easyconfigs/__archive__/b/bzip2/bzip2-1.0.6-iqacml-3.7.3.eb
diff --git a/easybuild/easyconfigs/c/CBLAS/CBLAS-20110120-iqacml-3.7.3.eb b/easybuild/easyconfigs/__archive__/c/CBLAS/CBLAS-20110120-iqacml-3.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/c/CBLAS/CBLAS-20110120-iqacml-3.7.3.eb
rename to easybuild/easyconfigs/__archive__/c/CBLAS/CBLAS-20110120-iqacml-3.7.3.eb
diff --git a/easybuild/easyconfigs/c/CCfits/CCfits-2.4-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/c/CCfits/CCfits-2.4-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/c/CCfits/CCfits-2.4-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/c/CCfits/CCfits-2.4-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.34-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/c/CFITSIO/CFITSIO-3.34-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.34-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/c/CFITSIO/CFITSIO-3.34-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/c/CGAL/CGAL-4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/c/CGAL/CGAL-4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/c/CGAL/CGAL-4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.0-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/c/CGAL/CGAL-4.0-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/c/CGAL/CGAL-4.0-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/c/CGAL/CGAL-4.0-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/c/CHARMM/CHARMM-37b2-goalf-1.5.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/c/CHARMM/CHARMM-37b2-goalf-1.5.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/c/CHARMM/CHARMM-37b2-goalf-1.5.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/c/CLHEP/CLHEP-2.1.1.0-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/c/CLHEP/CLHEP-2.1.1.0-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/c/CLHEP/CLHEP-2.1.1.0-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.1.0-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/c/CLHEP/CLHEP-2.1.1.0-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.10.2-gmpolf-1.4.8.eb b/easybuild/easyconfigs/__archive__/c/CMake/CMake-2.8.10.2-gmpolf-1.4.8.eb
similarity index 100%
rename from easybuild/easyconfigs/c/CMake/CMake-2.8.10.2-gmpolf-1.4.8.eb
rename to easybuild/easyconfigs/__archive__/c/CMake/CMake-2.8.10.2-gmpolf-1.4.8.eb
diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.10.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/c/CMake/CMake-2.8.10.2-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/c/CMake/CMake-2.8.10.2-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/c/CMake/CMake-2.8.10.2-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.10.2-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/c/CMake/CMake-2.8.10.2-gompi-1.4.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/c/CMake/CMake-2.8.10.2-gompi-1.4.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/c/CMake/CMake-2.8.10.2-gompi-1.4.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.10.2-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/c/CMake/CMake-2.8.10.2-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/c/CMake/CMake-2.8.10.2-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/c/CMake/CMake-2.8.10.2-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.10.2-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/c/CMake/CMake-2.8.10.2-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/c/CMake/CMake-2.8.10.2-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/c/CMake/CMake-2.8.10.2-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.12-gmpolf-1.4.8.eb b/easybuild/easyconfigs/__archive__/c/CMake/CMake-2.8.12-gmpolf-1.4.8.eb
similarity index 100%
rename from easybuild/easyconfigs/c/CMake/CMake-2.8.12-gmpolf-1.4.8.eb
rename to easybuild/easyconfigs/__archive__/c/CMake/CMake-2.8.12-gmpolf-1.4.8.eb
diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.12-gmvolf-1.7.12.eb b/easybuild/easyconfigs/__archive__/c/CMake/CMake-2.8.12-gmvolf-1.7.12.eb
similarity index 100%
rename from easybuild/easyconfigs/c/CMake/CMake-2.8.12-gmvolf-1.7.12.eb
rename to easybuild/easyconfigs/__archive__/c/CMake/CMake-2.8.12-gmvolf-1.7.12.eb
diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.12-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/c/CMake/CMake-2.8.12-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/c/CMake/CMake-2.8.12-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/c/CMake/CMake-2.8.12-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.12-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/c/CMake/CMake-2.8.12-goalf-1.5.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/c/CMake/CMake-2.8.12-goalf-1.5.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/c/CMake/CMake-2.8.12-goalf-1.5.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.12-goolfc-2.6.10.eb b/easybuild/easyconfigs/__archive__/c/CMake/CMake-2.8.12-goolfc-2.6.10.eb
similarity index 100%
rename from easybuild/easyconfigs/c/CMake/CMake-2.8.12-goolfc-2.6.10.eb
rename to easybuild/easyconfigs/__archive__/c/CMake/CMake-2.8.12-goolfc-2.6.10.eb
diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.12-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/c/CMake/CMake-2.8.12-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/c/CMake/CMake-2.8.12-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/c/CMake/CMake-2.8.12-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.4-gmpolf-1.4.8.eb b/easybuild/easyconfigs/__archive__/c/CMake/CMake-2.8.4-gmpolf-1.4.8.eb
similarity index 100%
rename from easybuild/easyconfigs/c/CMake/CMake-2.8.4-gmpolf-1.4.8.eb
rename to easybuild/easyconfigs/__archive__/c/CMake/CMake-2.8.4-gmpolf-1.4.8.eb
diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.4-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/c/CMake/CMake-2.8.4-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/c/CMake/CMake-2.8.4-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/c/CMake/CMake-2.8.4-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.4-goolfc-1.3.12.eb b/easybuild/easyconfigs/__archive__/c/CMake/CMake-2.8.4-goolfc-1.3.12.eb
similarity index 100%
rename from easybuild/easyconfigs/c/CMake/CMake-2.8.4-goolfc-1.3.12.eb
rename to easybuild/easyconfigs/__archive__/c/CMake/CMake-2.8.4-goolfc-1.3.12.eb
diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.4-goolfc-2.6.10.eb b/easybuild/easyconfigs/__archive__/c/CMake/CMake-2.8.4-goolfc-2.6.10.eb
similarity index 100%
rename from easybuild/easyconfigs/c/CMake/CMake-2.8.4-goolfc-2.6.10.eb
rename to easybuild/easyconfigs/__archive__/c/CMake/CMake-2.8.4-goolfc-2.6.10.eb
diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.4-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/c/CMake/CMake-2.8.4-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/c/CMake/CMake-2.8.4-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/c/CMake/CMake-2.8.4-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.4-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/c/CMake/CMake-2.8.4-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/c/CMake/CMake-2.8.4-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/c/CMake/CMake-2.8.4-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-2.6.0-intel-para-2014.12.eb b/easybuild/easyconfigs/__archive__/c/CP2K/CP2K-2.6.0-intel-para-2014.12.eb
similarity index 100%
rename from easybuild/easyconfigs/c/CP2K/CP2K-2.6.0-intel-para-2014.12.eb
rename to easybuild/easyconfigs/__archive__/c/CP2K/CP2K-2.6.0-intel-para-2014.12.eb
diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-20111205-gmacml-1.7.0-libsmm.eb b/easybuild/easyconfigs/__archive__/c/CP2K/CP2K-20111205-gmacml-1.7.0-libsmm.eb
similarity index 100%
rename from easybuild/easyconfigs/c/CP2K/CP2K-20111205-gmacml-1.7.0-libsmm.eb
rename to easybuild/easyconfigs/__archive__/c/CP2K/CP2K-20111205-gmacml-1.7.0-libsmm.eb
diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-20111205-goalf-1.1.0-no-OFED-libsmm.eb b/easybuild/easyconfigs/__archive__/c/CP2K/CP2K-20111205-goalf-1.1.0-no-OFED-libsmm.eb
similarity index 100%
rename from easybuild/easyconfigs/c/CP2K/CP2K-20111205-goalf-1.1.0-no-OFED-libsmm.eb
rename to easybuild/easyconfigs/__archive__/c/CP2K/CP2K-20111205-goalf-1.1.0-no-OFED-libsmm.eb
diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-20111205-goalf-1.1.0-no-OFED-psmp.eb b/easybuild/easyconfigs/__archive__/c/CP2K/CP2K-20111205-goalf-1.1.0-no-OFED-psmp.eb
similarity index 100%
rename from easybuild/easyconfigs/c/CP2K/CP2K-20111205-goalf-1.1.0-no-OFED-psmp.eb
rename to easybuild/easyconfigs/__archive__/c/CP2K/CP2K-20111205-goalf-1.1.0-no-OFED-psmp.eb
diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-20111205-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/c/CP2K/CP2K-20111205-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/c/CP2K/CP2K-20111205-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/c/CP2K/CP2K-20111205-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-20111205-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/c/CP2K/CP2K-20111205-ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/c/CP2K/CP2K-20111205-ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/c/CP2K/CP2K-20111205-ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/c/CRF++/CRF++-0.57-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/c/CRF++/CRF++-0.57-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/c/CRF++/CRF++-0.57-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/c/CRF++/CRF++-0.57-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/c/CRF++/CRF++-0.57-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/c/CRF++/CRF++-0.57-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/c/CRF++/CRF++-0.57-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/c/CRF++/CRF++-0.57-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/c/CVXOPT/CVXOPT-1.1.5-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/c/CVXOPT/CVXOPT-1.1.5-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/c/CVXOPT/CVXOPT-1.1.5-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/c/CVXOPT/CVXOPT-1.1.5-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/c/CVXOPT/CVXOPT-1.1.5-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/c/CVXOPT/CVXOPT-1.1.5-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/c/CVXOPT/CVXOPT-1.1.5-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/c/CVXOPT/CVXOPT-1.1.5-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/c/Chapel/Chapel-1.6.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/c/Chapel/Chapel-1.6.0-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/c/Chapel/Chapel-1.6.0-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/c/Chapel/Chapel-1.6.0-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/c/ClangGCC/ClangGCC-1.1.3.eb b/easybuild/easyconfigs/__archive__/c/ClangGCC/ClangGCC-1.1.3.eb
similarity index 100%
rename from easybuild/easyconfigs/c/ClangGCC/ClangGCC-1.1.3.eb
rename to easybuild/easyconfigs/__archive__/c/ClangGCC/ClangGCC-1.1.3.eb
diff --git a/easybuild/easyconfigs/c/ClangGCC/ClangGCC-1.2.3.eb b/easybuild/easyconfigs/__archive__/c/ClangGCC/ClangGCC-1.2.3.eb
similarity index 100%
rename from easybuild/easyconfigs/c/ClangGCC/ClangGCC-1.2.3.eb
rename to easybuild/easyconfigs/__archive__/c/ClangGCC/ClangGCC-1.2.3.eb
diff --git a/easybuild/easyconfigs/c/ClangGCC/ClangGCC-1.3.0.eb b/easybuild/easyconfigs/__archive__/c/ClangGCC/ClangGCC-1.3.0.eb
similarity index 100%
rename from easybuild/easyconfigs/c/ClangGCC/ClangGCC-1.3.0.eb
rename to easybuild/easyconfigs/__archive__/c/ClangGCC/ClangGCC-1.3.0.eb
diff --git a/easybuild/easyconfigs/c/ClustalW2/ClustalW2-2.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/c/ClustalW2/ClustalW2-2.1-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/c/ClustalW2/ClustalW2-2.1-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/c/ClustalW2/ClustalW2-2.1-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/c/ClustalW2/ClustalW2-2.1-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/c/ClustalW2/ClustalW2-2.1-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/c/ClustalW2/ClustalW2-2.1-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/c/ClustalW2/ClustalW2-2.1-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/c/Corkscrew/Corkscrew-2.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/c/Corkscrew/Corkscrew-2.0-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/c/Corkscrew/Corkscrew-2.0-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/c/Corkscrew/Corkscrew-2.0-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/c/Corkscrew/Corkscrew-2.0-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/c/Corkscrew/Corkscrew-2.0-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/c/Corkscrew/Corkscrew-2.0-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/c/Corkscrew/Corkscrew-2.0-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/c/Cube/Cube-3.4.3-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/c/Cube/Cube-3.4.3-gompi-1.4.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/c/Cube/Cube-3.4.3-gompi-1.4.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/c/Cube/Cube-3.4.3-gompi-1.4.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/c/Cube/Cube-4.2-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/c/Cube/Cube-4.2-gompi-1.4.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/c/Cube/Cube-4.2-gompi-1.4.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/c/Cube/Cube-4.2-gompi-1.4.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/c/Cube/Cube-4.3-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/c/Cube/Cube-4.3-gompi-1.4.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/c/Cube/Cube-4.3-gompi-1.4.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/c/Cube/Cube-4.3-gompi-1.4.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.0.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/c/Cufflinks/Cufflinks-2.0.2-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.0.2-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/c/Cufflinks/Cufflinks-2.0.2-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.16-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/c/Cython/Cython-0.16-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/c/Cython/Cython-0.16-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/c/Cython/Cython-0.16-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/c/Cython/Cython-0.16-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/c/Cython/Cython-0.16-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/c/Cython/Cython-0.16-ictce-4.1.13-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/c/Cython/Cython-0.16-ictce-4.1.13-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/c/Cython/Cython-0.16-ictce-4.1.13-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/c/Cython/Cython-0.19.1-ictce-4.1.13-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/c/Cython/Cython-0.19.1-ictce-4.1.13-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/c/Cython/Cython-0.19.1-ictce-4.1.13-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.27.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/c/cURL/cURL-7.27.0-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/c/cURL/cURL-7.27.0-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/c/cURL/cURL-7.27.0-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.27.0-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/c/cURL/cURL-7.27.0-ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/c/cURL/cURL-7.27.0-ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/c/cURL/cURL-7.27.0-ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.27.0-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/c/cURL/cURL-7.27.0-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/c/cURL/cURL-7.27.0-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/c/cURL/cURL-7.27.0-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.28.1-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/c/cURL/cURL-7.28.1-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/c/cURL/cURL-7.28.1-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/c/cURL/cURL-7.28.1-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.28.1-iqacml-3.7.3.eb b/easybuild/easyconfigs/__archive__/c/cURL/cURL-7.28.1-iqacml-3.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/c/cURL/cURL-7.28.1-iqacml-3.7.3.eb
rename to easybuild/easyconfigs/__archive__/c/cURL/cURL-7.28.1-iqacml-3.7.3.eb
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.29.0-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/__archive__/c/cURL/cURL-7.29.0-cgmpolf-1.1.6.eb
similarity index 100%
rename from easybuild/easyconfigs/c/cURL/cURL-7.29.0-cgmpolf-1.1.6.eb
rename to easybuild/easyconfigs/__archive__/c/cURL/cURL-7.29.0-cgmpolf-1.1.6.eb
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.29.0-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/__archive__/c/cURL/cURL-7.29.0-cgmvolf-1.1.12rc1.eb
similarity index 100%
rename from easybuild/easyconfigs/c/cURL/cURL-7.29.0-cgmvolf-1.1.12rc1.eb
rename to easybuild/easyconfigs/__archive__/c/cURL/cURL-7.29.0-cgmvolf-1.1.12rc1.eb
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.29.0-cgmvolf-1.2.7.eb b/easybuild/easyconfigs/__archive__/c/cURL/cURL-7.29.0-cgmvolf-1.2.7.eb
similarity index 100%
rename from easybuild/easyconfigs/c/cURL/cURL-7.29.0-cgmvolf-1.2.7.eb
rename to easybuild/easyconfigs/__archive__/c/cURL/cURL-7.29.0-cgmvolf-1.2.7.eb
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.29.0-cgoolf-1.1.7.eb b/easybuild/easyconfigs/__archive__/c/cURL/cURL-7.29.0-cgoolf-1.1.7.eb
similarity index 100%
rename from easybuild/easyconfigs/c/cURL/cURL-7.29.0-cgoolf-1.1.7.eb
rename to easybuild/easyconfigs/__archive__/c/cURL/cURL-7.29.0-cgoolf-1.1.7.eb
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.29.0-gmvolf-1.7.12.eb b/easybuild/easyconfigs/__archive__/c/cURL/cURL-7.29.0-gmvolf-1.7.12.eb
similarity index 100%
rename from easybuild/easyconfigs/c/cURL/cURL-7.29.0-gmvolf-1.7.12.eb
rename to easybuild/easyconfigs/__archive__/c/cURL/cURL-7.29.0-gmvolf-1.7.12.eb
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.29.0-gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/__archive__/c/cURL/cURL-7.29.0-gmvolf-1.7.12rc1.eb
similarity index 100%
rename from easybuild/easyconfigs/c/cURL/cURL-7.29.0-gmvolf-1.7.12rc1.eb
rename to easybuild/easyconfigs/__archive__/c/cURL/cURL-7.29.0-gmvolf-1.7.12rc1.eb
diff --git a/easybuild/easyconfigs/c/cairo/cairo-1.12.14-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/c/cairo/cairo-1.12.14-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/c/cairo/cairo-1.12.14-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/c/cairo/cairo-1.12.14-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/c/cairo/cairo-1.12.14-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/c/cairo/cairo-1.12.14-ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/c/cairo/cairo-1.12.14-ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/c/cairo/cairo-1.12.14-ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/c/cairo/cairo-1.12.14-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/c/cairo/cairo-1.12.14-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/c/cairo/cairo-1.12.14-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/c/cairo/cairo-1.12.14-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/c/ccache/ccache-3.1.9-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/c/ccache/ccache-3.1.9-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/c/ccache/ccache-3.1.9-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/c/ccache/ccache-3.1.9-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/c/ccache/ccache-3.1.9-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/c/ccache/ccache-3.1.9-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/c/ccache/ccache-3.1.9-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/c/ccache/ccache-3.1.9-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/c/cflow/cflow-1.4-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/c/cflow/cflow-1.4-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/c/cflow/cflow-1.4-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/c/cflow/cflow-1.4-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/c/cflow/cflow-1.4-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/c/cflow/cflow-1.4-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/c/cflow/cflow-1.4-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/c/cflow/cflow-1.4-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/c/cgdb/cgdb-0.6.5-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/c/cgdb/cgdb-0.6.5-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/c/cgdb/cgdb-0.6.5-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/c/cgdb/cgdb-0.6.5-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/c/cgdb/cgdb-0.6.5-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/c/cgdb/cgdb-0.6.5-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/c/cgdb/cgdb-0.6.5-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/c/cgdb/cgdb-0.6.5-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/c/cgmpich/cgmpich-1.1.6.eb b/easybuild/easyconfigs/__archive__/c/cgmpich/cgmpich-1.1.6.eb
similarity index 100%
rename from easybuild/easyconfigs/c/cgmpich/cgmpich-1.1.6.eb
rename to easybuild/easyconfigs/__archive__/c/cgmpich/cgmpich-1.1.6.eb
diff --git a/easybuild/easyconfigs/c/cgmpolf/cgmpolf-1.1.6.eb b/easybuild/easyconfigs/__archive__/c/cgmpolf/cgmpolf-1.1.6.eb
similarity index 100%
rename from easybuild/easyconfigs/c/cgmpolf/cgmpolf-1.1.6.eb
rename to easybuild/easyconfigs/__archive__/c/cgmpolf/cgmpolf-1.1.6.eb
diff --git a/easybuild/easyconfigs/c/cgmvapich2/cgmvapich2-1.1.12rc1.eb b/easybuild/easyconfigs/__archive__/c/cgmvapich2/cgmvapich2-1.1.12rc1.eb
similarity index 100%
rename from easybuild/easyconfigs/c/cgmvapich2/cgmvapich2-1.1.12rc1.eb
rename to easybuild/easyconfigs/__archive__/c/cgmvapich2/cgmvapich2-1.1.12rc1.eb
diff --git a/easybuild/easyconfigs/c/cgmvapich2/cgmvapich2-1.2.7.eb b/easybuild/easyconfigs/__archive__/c/cgmvapich2/cgmvapich2-1.2.7.eb
similarity index 100%
rename from easybuild/easyconfigs/c/cgmvapich2/cgmvapich2-1.2.7.eb
rename to easybuild/easyconfigs/__archive__/c/cgmvapich2/cgmvapich2-1.2.7.eb
diff --git a/easybuild/easyconfigs/c/cgmvolf/cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/__archive__/c/cgmvolf/cgmvolf-1.1.12rc1.eb
similarity index 100%
rename from easybuild/easyconfigs/c/cgmvolf/cgmvolf-1.1.12rc1.eb
rename to easybuild/easyconfigs/__archive__/c/cgmvolf/cgmvolf-1.1.12rc1.eb
diff --git a/easybuild/easyconfigs/c/cgmvolf/cgmvolf-1.2.7.eb b/easybuild/easyconfigs/__archive__/c/cgmvolf/cgmvolf-1.2.7.eb
similarity index 100%
rename from easybuild/easyconfigs/c/cgmvolf/cgmvolf-1.2.7.eb
rename to easybuild/easyconfigs/__archive__/c/cgmvolf/cgmvolf-1.2.7.eb
diff --git a/easybuild/easyconfigs/c/cgompi/cgompi-1.1.7.eb b/easybuild/easyconfigs/__archive__/c/cgompi/cgompi-1.1.7.eb
similarity index 100%
rename from easybuild/easyconfigs/c/cgompi/cgompi-1.1.7.eb
rename to easybuild/easyconfigs/__archive__/c/cgompi/cgompi-1.1.7.eb
diff --git a/easybuild/easyconfigs/c/cgoolf/cgoolf-1.1.7.eb b/easybuild/easyconfigs/__archive__/c/cgoolf/cgoolf-1.1.7.eb
similarity index 100%
rename from easybuild/easyconfigs/c/cgoolf/cgoolf-1.1.7.eb
rename to easybuild/easyconfigs/__archive__/c/cgoolf/cgoolf-1.1.7.eb
diff --git a/easybuild/easyconfigs/d/DB/DB-4.7.25-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/d/DB/DB-4.7.25-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/d/DB/DB-4.7.25-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/d/DB/DB-4.7.25-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/d/DB/DB-5.3.28-gmpolf-1.4.8.eb b/easybuild/easyconfigs/__archive__/d/DB/DB-5.3.28-gmpolf-1.4.8.eb
similarity index 100%
rename from easybuild/easyconfigs/d/DB/DB-5.3.28-gmpolf-1.4.8.eb
rename to easybuild/easyconfigs/__archive__/d/DB/DB-5.3.28-gmpolf-1.4.8.eb
diff --git a/easybuild/easyconfigs/d/DB/DB-6.0.20-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/d/DB/DB-6.0.20-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/d/DB/DB-6.0.20-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/d/DB/DB-6.0.20-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/d/DL_POLY_Classic/DL_POLY_Classic-1.9-goalf-1.1.0-no-OFED-no-gui.eb b/easybuild/easyconfigs/__archive__/d/DL_POLY_Classic/DL_POLY_Classic-1.9-goalf-1.1.0-no-OFED-no-gui.eb
similarity index 100%
rename from easybuild/easyconfigs/d/DL_POLY_Classic/DL_POLY_Classic-1.9-goalf-1.1.0-no-OFED-no-gui.eb
rename to easybuild/easyconfigs/__archive__/d/DL_POLY_Classic/DL_POLY_Classic-1.9-goalf-1.1.0-no-OFED-no-gui.eb
diff --git a/easybuild/easyconfigs/d/DL_POLY_Classic/DL_POLY_Classic-1.9-ictce-4.1.13-no-gui.eb b/easybuild/easyconfigs/__archive__/d/DL_POLY_Classic/DL_POLY_Classic-1.9-ictce-4.1.13-no-gui.eb
similarity index 100%
rename from easybuild/easyconfigs/d/DL_POLY_Classic/DL_POLY_Classic-1.9-ictce-4.1.13-no-gui.eb
rename to easybuild/easyconfigs/__archive__/d/DL_POLY_Classic/DL_POLY_Classic-1.9-ictce-4.1.13-no-gui.eb
diff --git a/easybuild/easyconfigs/d/DOLFIN/DOLFIN-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/d/DOLFIN/DOLFIN-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/d/DOLFIN/DOLFIN-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/d/DOLFIN/DOLFIN-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/d/DOLFIN/DOLFIN-1.0.0-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/d/DOLFIN/DOLFIN-1.0.0-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/d/DOLFIN/DOLFIN-1.0.0-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/d/DOLFIN/DOLFIN-1.0.0-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/d/Docutils/Docutils-0.9.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/d/Docutils/Docutils-0.9.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/d/Docutils/Docutils-0.9.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/d/Docutils/Docutils-0.9.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/d/Docutils/Docutils-0.9.1-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/d/Docutils/Docutils-0.9.1-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/d/Docutils/Docutils-0.9.1-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/d/Docutils/Docutils-0.9.1-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/d/Doxygen/Doxygen-1.8.1.1-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/d/Doxygen/Doxygen-1.8.1.1-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/d/Doxygen/Doxygen-1.8.1.1-ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/d/Doxygen/Doxygen-1.8.1.1-ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/d/Doxygen/Doxygen-1.8.1.1-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/d/Doxygen/Doxygen-1.8.1.1-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/d/Doxygen/Doxygen-1.8.1.1-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/d/Doxygen/Doxygen-1.8.1.1-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.2-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/d/Doxygen/Doxygen-1.8.2-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.2-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/d/Doxygen/Doxygen-1.8.2-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/d/Doxygen/Doxygen-1.8.3.1-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/d/Doxygen/Doxygen-1.8.3.1-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-iqacml-3.7.3.eb b/easybuild/easyconfigs/__archive__/d/Doxygen/Doxygen-1.8.3.1-iqacml-3.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-iqacml-3.7.3.eb
rename to easybuild/easyconfigs/__archive__/d/Doxygen/Doxygen-1.8.3.1-iqacml-3.7.3.eb
diff --git a/easybuild/easyconfigs/e/ELinks/ELinks-0.12pre5-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/e/ELinks/ELinks-0.12pre5-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/e/ELinks/ELinks-0.12pre5-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/e/ELinks/ELinks-0.12pre5-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/e/ELinks/ELinks-0.12pre5-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/e/ELinks/ELinks-0.12pre5-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/e/ELinks/ELinks-0.12pre5-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/e/ELinks/ELinks-0.12pre5-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/e/EMBOSS/EMBOSS-6.5.7-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/e/EMBOSS/EMBOSS-6.5.7-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/e/EMBOSS/EMBOSS-6.5.7-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/e/EMBOSS/EMBOSS-6.5.7-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/e/ESMF/ESMF-5.3.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/e/ESMF/ESMF-5.3.0-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/e/ESMF/ESMF-5.3.0-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/e/ESMF/ESMF-5.3.0-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/e/ESMF/ESMF-5.3.0-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/e/ESMF/ESMF-5.3.0-ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/e/ESMF/ESMF-5.3.0-ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/e/ESMF/ESMF-5.3.0-ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/e/ESMF/ESMF-6.1.1-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/e/ESMF/ESMF-6.1.1-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/e/ESMF/ESMF-6.1.1-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/e/ESMF/ESMF-6.1.1-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/e/ESMF/ESMF-6.1.1-iqacml-3.7.3.eb b/easybuild/easyconfigs/__archive__/e/ESMF/ESMF-6.1.1-iqacml-3.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/e/ESMF/ESMF-6.1.1-iqacml-3.7.3.eb
rename to easybuild/easyconfigs/__archive__/e/ESMF/ESMF-6.1.1-iqacml-3.7.3.eb
diff --git a/easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-goalf-1.1.0-no-OFED-parallel.eb b/easybuild/easyconfigs/__archive__/e/ESPResSo/ESPResSo-3.1.1-goalf-1.1.0-no-OFED-parallel.eb
similarity index 100%
rename from easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-goalf-1.1.0-no-OFED-parallel.eb
rename to easybuild/easyconfigs/__archive__/e/ESPResSo/ESPResSo-3.1.1-goalf-1.1.0-no-OFED-parallel.eb
diff --git a/easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-goalf-1.1.0-no-OFED-serial.eb b/easybuild/easyconfigs/__archive__/e/ESPResSo/ESPResSo-3.1.1-goalf-1.1.0-no-OFED-serial.eb
similarity index 100%
rename from easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-goalf-1.1.0-no-OFED-serial.eb
rename to easybuild/easyconfigs/__archive__/e/ESPResSo/ESPResSo-3.1.1-goalf-1.1.0-no-OFED-serial.eb
diff --git a/easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-ictce-4.0.6-parallel.eb b/easybuild/easyconfigs/__archive__/e/ESPResSo/ESPResSo-3.1.1-ictce-4.0.6-parallel.eb
similarity index 100%
rename from easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-ictce-4.0.6-parallel.eb
rename to easybuild/easyconfigs/__archive__/e/ESPResSo/ESPResSo-3.1.1-ictce-4.0.6-parallel.eb
diff --git a/easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-ictce-4.0.6-serial.eb b/easybuild/easyconfigs/__archive__/e/ESPResSo/ESPResSo-3.1.1-ictce-4.0.6-serial.eb
similarity index 100%
rename from easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-ictce-4.0.6-serial.eb
rename to easybuild/easyconfigs/__archive__/e/ESPResSo/ESPResSo-3.1.1-ictce-4.0.6-serial.eb
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/e/Eigen/Eigen-3.1.1-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/e/Eigen/Eigen-3.1.1-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/e/Eigen/Eigen-3.1.1-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/e/Eigen/Eigen-3.1.1-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/e/Eigen/Eigen-3.1.4-goalf-1.5.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goalf-1.5.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/e/Eigen/Eigen-3.1.4-goalf-1.5.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/e/Eigen/Eigen-3.1.4-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/e/Eigen/Eigen-3.1.4-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/e/Extrae/Extrae-2.4.1-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/e/Extrae/Extrae-2.4.1-gompi-1.4.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/e/Extrae/Extrae-2.4.1-gompi-1.4.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/e/Extrae/Extrae-2.4.1-gompi-1.4.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/e/expat/expat-2.1.0-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/__archive__/e/expat/expat-2.1.0-cgmpolf-1.1.6.eb
similarity index 100%
rename from easybuild/easyconfigs/e/expat/expat-2.1.0-cgmpolf-1.1.6.eb
rename to easybuild/easyconfigs/__archive__/e/expat/expat-2.1.0-cgmpolf-1.1.6.eb
diff --git a/easybuild/easyconfigs/e/expat/expat-2.1.0-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/__archive__/e/expat/expat-2.1.0-cgmvolf-1.1.12rc1.eb
similarity index 100%
rename from easybuild/easyconfigs/e/expat/expat-2.1.0-cgmvolf-1.1.12rc1.eb
rename to easybuild/easyconfigs/__archive__/e/expat/expat-2.1.0-cgmvolf-1.1.12rc1.eb
diff --git a/easybuild/easyconfigs/e/expat/expat-2.1.0-cgmvolf-1.2.7.eb b/easybuild/easyconfigs/__archive__/e/expat/expat-2.1.0-cgmvolf-1.2.7.eb
similarity index 100%
rename from easybuild/easyconfigs/e/expat/expat-2.1.0-cgmvolf-1.2.7.eb
rename to easybuild/easyconfigs/__archive__/e/expat/expat-2.1.0-cgmvolf-1.2.7.eb
diff --git a/easybuild/easyconfigs/e/expat/expat-2.1.0-cgoolf-1.1.7.eb b/easybuild/easyconfigs/__archive__/e/expat/expat-2.1.0-cgoolf-1.1.7.eb
similarity index 100%
rename from easybuild/easyconfigs/e/expat/expat-2.1.0-cgoolf-1.1.7.eb
rename to easybuild/easyconfigs/__archive__/e/expat/expat-2.1.0-cgoolf-1.1.7.eb
diff --git a/easybuild/easyconfigs/e/expat/expat-2.1.0-gmvolf-1.7.12.eb b/easybuild/easyconfigs/__archive__/e/expat/expat-2.1.0-gmvolf-1.7.12.eb
similarity index 100%
rename from easybuild/easyconfigs/e/expat/expat-2.1.0-gmvolf-1.7.12.eb
rename to easybuild/easyconfigs/__archive__/e/expat/expat-2.1.0-gmvolf-1.7.12.eb
diff --git a/easybuild/easyconfigs/e/expat/expat-2.1.0-gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/__archive__/e/expat/expat-2.1.0-gmvolf-1.7.12rc1.eb
similarity index 100%
rename from easybuild/easyconfigs/e/expat/expat-2.1.0-gmvolf-1.7.12rc1.eb
rename to easybuild/easyconfigs/__archive__/e/expat/expat-2.1.0-gmvolf-1.7.12rc1.eb
diff --git a/easybuild/easyconfigs/e/expat/expat-2.1.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/e/expat/expat-2.1.0-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/e/expat/expat-2.1.0-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/e/expat/expat-2.1.0-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/e/expat/expat-2.1.0-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/e/expat/expat-2.1.0-ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/e/expat/expat-2.1.0-ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/e/expat/expat-2.1.0-ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/e/expat/expat-2.1.0-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/e/expat/expat-2.1.0-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/e/expat/expat-2.1.0-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/e/expat/expat-2.1.0-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/e/expat/expat-2.1.0-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/e/expat/expat-2.1.0-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/e/expat/expat-2.1.0-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/e/expat/expat-2.1.0-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/f/FFC/FFC-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/f/FFC/FFC-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/f/FFC/FFC-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/f/FFC/FFC-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/f/FFC/FFC-1.0.0-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/f/FFC/FFC-1.0.0-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/f/FFC/FFC-1.0.0-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/f/FFC/FFC-1.0.0-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-2.1.5-gompi-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/f/FFTW/FFTW-2.1.5-gompi-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/f/FFTW/FFTW-2.1.5-gompi-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/f/FFTW/FFTW-2.1.5-gompi-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.1-gompi-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.1-gompi-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/f/FFTW/FFTW-3.3.1-gompi-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.1-gompi-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.1-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.1-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/f/FFTW/FFTW-3.3.1-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.1-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.2-gmvapich2-1.7.9a2.eb b/easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.2-gmvapich2-1.7.9a2.eb
similarity index 100%
rename from easybuild/easyconfigs/f/FFTW/FFTW-3.3.2-gmvapich2-1.7.9a2.eb
rename to easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.2-gmvapich2-1.7.9a2.eb
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-cgmpich-1.1.6.eb b/easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.3-cgmpich-1.1.6.eb
similarity index 100%
rename from easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-cgmpich-1.1.6.eb
rename to easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.3-cgmpich-1.1.6.eb
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-cgmvapich2-1.1.12rc1.eb b/easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.3-cgmvapich2-1.1.12rc1.eb
similarity index 100%
rename from easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-cgmvapich2-1.1.12rc1.eb
rename to easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.3-cgmvapich2-1.1.12rc1.eb
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-cgmvapich2-1.2.7.eb b/easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.3-cgmvapich2-1.2.7.eb
similarity index 100%
rename from easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-cgmvapich2-1.2.7.eb
rename to easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.3-cgmvapich2-1.2.7.eb
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-cgompi-1.1.7.eb b/easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.3-cgompi-1.1.7.eb
similarity index 100%
rename from easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-cgompi-1.1.7.eb
rename to easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.3-cgompi-1.1.7.eb
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gmpich-1.4.8.eb b/easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.3-gmpich-1.4.8.eb
similarity index 100%
rename from easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gmpich-1.4.8.eb
rename to easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.3-gmpich-1.4.8.eb
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gmvapich2-1.7.12.eb b/easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.3-gmvapich2-1.7.12.eb
similarity index 100%
rename from easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gmvapich2-1.7.12.eb
rename to easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.3-gmvapich2-1.7.12.eb
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gmvapich2-1.7.12rc1.eb b/easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.3-gmvapich2-1.7.12rc1.eb
similarity index 100%
rename from easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gmvapich2-1.7.12rc1.eb
rename to easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.3-gmvapich2-1.7.12rc1.eb
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.3.12.eb b/easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.3-gompi-1.3.12.eb
similarity index 100%
rename from easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.3.12.eb
rename to easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.3-gompi-1.3.12.eb
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.4.10-no-OFED.eb b/easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.3-gompi-1.4.10-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.4.10-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.3-gompi-1.4.10-no-OFED.eb
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.5.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.3-gompi-1.5.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.5.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.3-gompi-1.5.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.5.12.eb b/easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.3-gompi-1.5.12.eb
similarity index 100%
rename from easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.5.12.eb
rename to easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.3-gompi-1.5.12.eb
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompic-2.6.10.eb b/easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.3-gompic-2.6.10.eb
similarity index 100%
rename from easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompic-2.6.10.eb
rename to easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.3-gompic-2.6.10.eb
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-ictce-4.1.13-single.eb b/easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.3-ictce-4.1.13-single.eb
similarity index 100%
rename from easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-ictce-4.1.13-single.eb
rename to easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.3-ictce-4.1.13-single.eb
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.3-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.3-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-iiqmpi-3.3.0.eb b/easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.3-iiqmpi-3.3.0.eb
similarity index 100%
rename from easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-iiqmpi-3.3.0.eb
rename to easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.3-iiqmpi-3.3.0.eb
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-iiqmpi-4.4.13.eb b/easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.3-iiqmpi-4.4.13.eb
similarity index 100%
rename from easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-iiqmpi-4.4.13.eb
rename to easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.3-iiqmpi-4.4.13.eb
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-iomkl-4.6.13-single.eb b/easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.3-iomkl-4.6.13-single.eb
similarity index 100%
rename from easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-iomkl-4.6.13-single.eb
rename to easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.3-iomkl-4.6.13-single.eb
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gmvapich2-1.7.12.eb b/easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.4-gmvapich2-1.7.12.eb
similarity index 100%
rename from easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gmvapich2-1.7.12.eb
rename to easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.4-gmvapich2-1.7.12.eb
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.5.14-no-OFED.eb b/easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.4-gompi-1.5.14-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.5.14-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.4-gompi-1.5.14-no-OFED.eb
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gpsmpi-2014.12.eb b/easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.4-gpsmpi-2014.12.eb
similarity index 100%
rename from easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gpsmpi-2014.12.eb
rename to easybuild/easyconfigs/__archive__/f/FFTW/FFTW-3.3.4-gpsmpi-2014.12.eb
diff --git a/easybuild/easyconfigs/f/FIAT/FIAT-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/f/FIAT/FIAT-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/f/FIAT/FIAT-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/f/FIAT/FIAT-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/f/FIAT/FIAT-1.0.0-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/f/FIAT/FIAT-1.0.0-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/f/FIAT/FIAT-1.0.0-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/f/FIAT/FIAT-1.0.0-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/f/FRC_align/FRC_align-20130521-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/f/FRC_align/FRC_align-20130521-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/f/FRC_align/FRC_align-20130521-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/f/FRC_align/FRC_align-20130521-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/f/FSL/FSL-4.1.9-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/f/FSL/FSL-4.1.9-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/f/FSL/FSL-4.1.9-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/f/FSL/FSL-4.1.9-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/f/FSL/FSL-4.1.9-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/f/FSL/FSL-4.1.9-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/f/FSL/FSL-4.1.9-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/f/FSL/FSL-4.1.9-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/f/FSL/FSL-5.0.4-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/f/FSL/FSL-5.0.4-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/f/FSL/FSL-5.0.4-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/f/FSL/FSL-5.0.4-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/f/Ferret/Ferret-6.72-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/f/Ferret/Ferret-6.72-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/f/Ferret/Ferret-6.72-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/f/Ferret/Ferret-6.72-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/f/fastahack/fastahack-20110215-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/f/fastahack/fastahack-20110215-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/f/fastahack/fastahack-20110215-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/f/fastahack/fastahack-20110215-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/f/fixesproto/fixesproto-5.0-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/f/fixesproto/fixesproto-5.0-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/f/flex/flex-2.5.35-gmacml-1.7.0.eb b/easybuild/easyconfigs/__archive__/f/flex/flex-2.5.35-gmacml-1.7.0.eb
similarity index 100%
rename from easybuild/easyconfigs/f/flex/flex-2.5.35-gmacml-1.7.0.eb
rename to easybuild/easyconfigs/__archive__/f/flex/flex-2.5.35-gmacml-1.7.0.eb
diff --git a/easybuild/easyconfigs/f/flex/flex-2.5.35-gmvapich2-1.6.7.eb b/easybuild/easyconfigs/__archive__/f/flex/flex-2.5.35-gmvapich2-1.6.7.eb
similarity index 100%
rename from easybuild/easyconfigs/f/flex/flex-2.5.35-gmvapich2-1.6.7.eb
rename to easybuild/easyconfigs/__archive__/f/flex/flex-2.5.35-gmvapich2-1.6.7.eb
diff --git a/easybuild/easyconfigs/f/flex/flex-2.5.35-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/f/flex/flex-2.5.35-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/f/flex/flex-2.5.35-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/f/flex/flex-2.5.35-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/f/flex/flex-2.5.35-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/f/flex/flex-2.5.35-ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/f/flex/flex-2.5.35-ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/f/flex/flex-2.5.35-ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/f/flex/flex-2.5.35-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/f/flex/flex-2.5.35-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/f/flex/flex-2.5.35-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/f/flex/flex-2.5.35-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/f/flex/flex-2.5.35-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/f/flex/flex-2.5.35-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/f/flex/flex-2.5.35-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/f/flex/flex-2.5.35-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/f/flex/flex-2.5.35-iqacml-3.7.3.eb b/easybuild/easyconfigs/__archive__/f/flex/flex-2.5.35-iqacml-3.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/f/flex/flex-2.5.35-iqacml-3.7.3.eb
rename to easybuild/easyconfigs/__archive__/f/flex/flex-2.5.35-iqacml-3.7.3.eb
diff --git a/easybuild/easyconfigs/f/flex/flex-2.5.37-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/f/flex/flex-2.5.37-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/f/flex/flex-2.5.37-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/f/flex/flex-2.5.37-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/f/flex/flex-2.5.37-iqacml-3.7.3.eb b/easybuild/easyconfigs/__archive__/f/flex/flex-2.5.37-iqacml-3.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/f/flex/flex-2.5.37-iqacml-3.7.3.eb
rename to easybuild/easyconfigs/__archive__/f/flex/flex-2.5.37-iqacml-3.7.3.eb
diff --git a/easybuild/easyconfigs/f/flex/flex-2.5.37-iqacml-4.4.13.eb b/easybuild/easyconfigs/__archive__/f/flex/flex-2.5.37-iqacml-4.4.13.eb
similarity index 100%
rename from easybuild/easyconfigs/f/flex/flex-2.5.37-iqacml-4.4.13.eb
rename to easybuild/easyconfigs/__archive__/f/flex/flex-2.5.37-iqacml-4.4.13.eb
diff --git a/easybuild/easyconfigs/f/flex/flex-2.5.39-intel-para-2014.12.eb b/easybuild/easyconfigs/__archive__/f/flex/flex-2.5.39-intel-para-2014.12.eb
similarity index 100%
rename from easybuild/easyconfigs/f/flex/flex-2.5.39-intel-para-2014.12.eb
rename to easybuild/easyconfigs/__archive__/f/flex/flex-2.5.39-intel-para-2014.12.eb
diff --git a/easybuild/easyconfigs/f/fmri/fmri-1.4-8-ictce-4.0.10-R-2.15.2.eb b/easybuild/easyconfigs/__archive__/f/fmri/fmri-1.4-8-ictce-4.0.10-R-2.15.2.eb
similarity index 100%
rename from easybuild/easyconfigs/f/fmri/fmri-1.4-8-ictce-4.0.10-R-2.15.2.eb
rename to easybuild/easyconfigs/__archive__/f/fmri/fmri-1.4-8-ictce-4.0.10-R-2.15.2.eb
diff --git a/easybuild/easyconfigs/f/fontconfig/fontconfig-2.10.91-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/f/fontconfig/fontconfig-2.10.91-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/f/fontconfig/fontconfig-2.10.91-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/f/fontconfig/fontconfig-2.10.91-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/f/fontconfig/fontconfig-2.10.91-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/f/fontconfig/fontconfig-2.10.91-ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/f/fontconfig/fontconfig-2.10.91-ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/f/fontconfig/fontconfig-2.10.91-ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/f/fontconfig/fontconfig-2.10.91-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/f/fontconfig/fontconfig-2.10.91-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/f/fontconfig/fontconfig-2.10.91-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/f/fontconfig/fontconfig-2.10.91-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/f/freeglut/freeglut-2.8.1-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/f/freeglut/freeglut-2.8.1-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.4.10-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/f/freetype/freetype-2.4.10-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/f/freetype/freetype-2.4.10-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/f/freetype/freetype-2.4.10-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.4.10-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/f/freetype/freetype-2.4.10-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/f/freetype/freetype-2.4.10-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/f/freetype/freetype-2.4.10-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.4.10-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/f/freetype/freetype-2.4.10-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/f/freetype/freetype-2.4.10-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/f/freetype/freetype-2.4.10-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.4.11-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/f/freetype/freetype-2.4.11-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/f/freetype/freetype-2.4.11-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/f/freetype/freetype-2.4.11-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.4.11-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/f/freetype/freetype-2.4.11-ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/f/freetype/freetype-2.4.11-ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/f/freetype/freetype-2.4.11-ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.4.11-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/f/freetype/freetype-2.4.11-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/f/freetype/freetype-2.4.11-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/f/freetype/freetype-2.4.11-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.4.11-iqacml-3.7.3.eb b/easybuild/easyconfigs/__archive__/f/freetype/freetype-2.4.11-iqacml-3.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/f/freetype/freetype-2.4.11-iqacml-3.7.3.eb
rename to easybuild/easyconfigs/__archive__/f/freetype/freetype-2.4.11-iqacml-3.7.3.eb
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/f/freetype/freetype-2.5.0.1-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/f/freetype/freetype-2.5.0.1-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/f/freetype/freetype-2.5.0.1-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/g/GAMESS-US/GAMESS-US-20130501-R1-goolf-1.5.14-no-OFED.eb b/easybuild/easyconfigs/__archive__/g/GAMESS-US/GAMESS-US-20130501-R1-goolf-1.5.14-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GAMESS-US/GAMESS-US-20130501-R1-goolf-1.5.14-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/g/GAMESS-US/GAMESS-US-20130501-R1-goolf-1.5.14-no-OFED.eb
diff --git a/easybuild/easyconfigs/g/GATE/GATE-6.1-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/g/GATE/GATE-6.1-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GATE/GATE-6.1-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/g/GATE/GATE-6.1-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/g/GATE/GATE-6.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/g/GATE/GATE-6.2-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GATE/GATE-6.2-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/g/GATE/GATE-6.2-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/g/GATE/GATE-6.2-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/g/GATE/GATE-6.2-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GATE/GATE-6.2-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/g/GATE/GATE-6.2-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/g/GDAL/GDAL-1.9.2-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/g/GDAL/GDAL-1.9.2-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-iqacml-3.7.3.eb b/easybuild/easyconfigs/__archive__/g/GDAL/GDAL-1.9.2-iqacml-3.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-iqacml-3.7.3.eb
rename to easybuild/easyconfigs/__archive__/g/GDAL/GDAL-1.9.2-iqacml-3.7.3.eb
diff --git a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/__archive__/g/GDB/GDB-7.5.1-cgmpolf-1.1.6.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgmpolf-1.1.6.eb
rename to easybuild/easyconfigs/__archive__/g/GDB/GDB-7.5.1-cgmpolf-1.1.6.eb
diff --git a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/__archive__/g/GDB/GDB-7.5.1-cgmvolf-1.1.12rc1.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgmvolf-1.1.12rc1.eb
rename to easybuild/easyconfigs/__archive__/g/GDB/GDB-7.5.1-cgmvolf-1.1.12rc1.eb
diff --git a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgmvolf-1.2.7.eb b/easybuild/easyconfigs/__archive__/g/GDB/GDB-7.5.1-cgmvolf-1.2.7.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgmvolf-1.2.7.eb
rename to easybuild/easyconfigs/__archive__/g/GDB/GDB-7.5.1-cgmvolf-1.2.7.eb
diff --git a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgoolf-1.1.7.eb b/easybuild/easyconfigs/__archive__/g/GDB/GDB-7.5.1-cgoolf-1.1.7.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GDB/GDB-7.5.1-cgoolf-1.1.7.eb
rename to easybuild/easyconfigs/__archive__/g/GDB/GDB-7.5.1-cgoolf-1.1.7.eb
diff --git a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-gmvolf-1.7.12.eb b/easybuild/easyconfigs/__archive__/g/GDB/GDB-7.5.1-gmvolf-1.7.12.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GDB/GDB-7.5.1-gmvolf-1.7.12.eb
rename to easybuild/easyconfigs/__archive__/g/GDB/GDB-7.5.1-gmvolf-1.7.12.eb
diff --git a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/__archive__/g/GDB/GDB-7.5.1-gmvolf-1.7.12rc1.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GDB/GDB-7.5.1-gmvolf-1.7.12rc1.eb
rename to easybuild/easyconfigs/__archive__/g/GDB/GDB-7.5.1-gmvolf-1.7.12rc1.eb
diff --git a/easybuild/easyconfigs/g/GDB/GDB-7.5.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/g/GDB/GDB-7.5.1-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GDB/GDB-7.5.1-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/g/GDB/GDB-7.5.1-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/g/GEOS/GEOS-3.3.5-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/g/GEOS/GEOS-3.3.5-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GEOS/GEOS-3.3.5-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/g/GEOS/GEOS-3.3.5-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/g/GEOS/GEOS-3.3.5-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/g/GEOS/GEOS-3.3.5-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GEOS/GEOS-3.3.5-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/g/GEOS/GEOS-3.3.5-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/g/GHC/GHC-7.4.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/g/GHC/GHC-7.4.2-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GHC/GHC-7.4.2-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/g/GHC/GHC-7.4.2-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/g/GHC/GHC-7.6.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/g/GHC/GHC-7.6.2-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GHC/GHC-7.6.2-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/g/GHC/GHC-7.6.2-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/g/GHC/GHC-7.8.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/g/GHC/GHC-7.8.3-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GHC/GHC-7.8.3-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/g/GHC/GHC-7.8.3-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/g/GLib/GLib-2.34.3-gmpolf-1.4.8.eb b/easybuild/easyconfigs/__archive__/g/GLib/GLib-2.34.3-gmpolf-1.4.8.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GLib/GLib-2.34.3-gmpolf-1.4.8.eb
rename to easybuild/easyconfigs/__archive__/g/GLib/GLib-2.34.3-gmpolf-1.4.8.eb
diff --git a/easybuild/easyconfigs/g/GLib/GLib-2.34.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/g/GLib/GLib-2.34.3-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GLib/GLib-2.34.3-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/g/GLib/GLib-2.34.3-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/g/GLib/GLib-2.34.3-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/g/GLib/GLib-2.34.3-gompi-1.4.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GLib/GLib-2.34.3-gompi-1.4.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/g/GLib/GLib-2.34.3-gompi-1.4.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/g/GLib/GLib-2.34.3-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/g/GLib/GLib-2.34.3-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GLib/GLib-2.34.3-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/g/GLib/GLib-2.34.3-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/g/GLib/GLib-2.34.3-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/g/GLib/GLib-2.34.3-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GLib/GLib-2.34.3-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/g/GLib/GLib-2.34.3-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/g/GMP/GMP-5.0.5-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/g/GMP/GMP-5.0.5-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GMP/GMP-5.0.5-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/g/GMP/GMP-5.0.5-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/g/GMP/GMP-5.0.5-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/g/GMP/GMP-5.0.5-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GMP/GMP-5.0.5-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/g/GMP/GMP-5.0.5-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/g/GPAW/GPAW-0.9.0.8965-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/g/GPAW/GPAW-0.9.0.8965-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GPAW/GPAW-0.9.0.8965-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/g/GPAW/GPAW-0.9.0.8965-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/g/GPAW/GPAW-0.9.0.8965-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/g/GPAW/GPAW-0.9.0.8965-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GPAW/GPAW-0.9.0.8965-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/g/GPAW/GPAW-0.9.0.8965-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-hybrid.eb b/easybuild/easyconfigs/__archive__/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-hybrid.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-hybrid.eb
rename to easybuild/easyconfigs/__archive__/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-hybrid.eb
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-mt.eb b/easybuild/easyconfigs/__archive__/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-mt.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-mt.eb
rename to easybuild/easyconfigs/__archive__/g/GROMACS/GROMACS-4.6.1-goolfc-1.3.12-mt.eb
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmpolf-1.4.8-hybrid.eb b/easybuild/easyconfigs/__archive__/g/GROMACS/GROMACS-4.6.5-gmpolf-1.4.8-hybrid.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmpolf-1.4.8-hybrid.eb
rename to easybuild/easyconfigs/__archive__/g/GROMACS/GROMACS-4.6.5-gmpolf-1.4.8-hybrid.eb
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmpolf-1.4.8-mt.eb b/easybuild/easyconfigs/__archive__/g/GROMACS/GROMACS-4.6.5-gmpolf-1.4.8-mt.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmpolf-1.4.8-mt.eb
rename to easybuild/easyconfigs/__archive__/g/GROMACS/GROMACS-4.6.5-gmpolf-1.4.8-mt.eb
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmvolf-1.7.12-hybrid.eb b/easybuild/easyconfigs/__archive__/g/GROMACS/GROMACS-4.6.5-gmvolf-1.7.12-hybrid.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmvolf-1.7.12-hybrid.eb
rename to easybuild/easyconfigs/__archive__/g/GROMACS/GROMACS-4.6.5-gmvolf-1.7.12-hybrid.eb
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmvolf-1.7.12-mt.eb b/easybuild/easyconfigs/__archive__/g/GROMACS/GROMACS-4.6.5-gmvolf-1.7.12-mt.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-gmvolf-1.7.12-mt.eb
rename to easybuild/easyconfigs/__archive__/g/GROMACS/GROMACS-4.6.5-gmvolf-1.7.12-mt.eb
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goalf-1.1.0-no-OFED-hybrid.eb b/easybuild/easyconfigs/__archive__/g/GROMACS/GROMACS-4.6.5-goalf-1.1.0-no-OFED-hybrid.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goalf-1.1.0-no-OFED-hybrid.eb
rename to easybuild/easyconfigs/__archive__/g/GROMACS/GROMACS-4.6.5-goalf-1.1.0-no-OFED-hybrid.eb
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goalf-1.1.0-no-OFED-mt.eb b/easybuild/easyconfigs/__archive__/g/GROMACS/GROMACS-4.6.5-goalf-1.1.0-no-OFED-mt.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goalf-1.1.0-no-OFED-mt.eb
rename to easybuild/easyconfigs/__archive__/g/GROMACS/GROMACS-4.6.5-goalf-1.1.0-no-OFED-mt.eb
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-hybrid.eb b/easybuild/easyconfigs/__archive__/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-hybrid.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-hybrid.eb
rename to easybuild/easyconfigs/__archive__/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-hybrid.eb
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-mt.eb b/easybuild/easyconfigs/__archive__/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-mt.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-mt.eb
rename to easybuild/easyconfigs/__archive__/g/GROMACS/GROMACS-4.6.5-goolfc-2.6.10-mt.eb
diff --git a/easybuild/easyconfigs/g/GSL/GSL-1.15-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/g/GSL/GSL-1.15-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GSL/GSL-1.15-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/g/GSL/GSL-1.15-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/g/GSL/GSL-1.15-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/g/GSL/GSL-1.15-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GSL/GSL-1.15-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/g/GSL/GSL-1.15-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/g/GSL/GSL-1.16-goolfc-1.3.12.eb b/easybuild/easyconfigs/__archive__/g/GSL/GSL-1.16-goolfc-1.3.12.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GSL/GSL-1.16-goolfc-1.3.12.eb
rename to easybuild/easyconfigs/__archive__/g/GSL/GSL-1.16-goolfc-1.3.12.eb
diff --git a/easybuild/easyconfigs/g/GSL/GSL-1.16-goolfc-2.6.10.eb b/easybuild/easyconfigs/__archive__/g/GSL/GSL-1.16-goolfc-2.6.10.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GSL/GSL-1.16-goolfc-2.6.10.eb
rename to easybuild/easyconfigs/__archive__/g/GSL/GSL-1.16-goolfc-2.6.10.eb
diff --git a/easybuild/easyconfigs/g/GTI/GTI-1.2.0-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/g/GTI/GTI-1.2.0-gompi-1.4.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GTI/GTI-1.2.0-gompi-1.4.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/g/GTI/GTI-1.2.0-gompi-1.4.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/g/Geant4/Geant4-9.4.p02-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/g/Geant4/Geant4-9.4.p02-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/g/Geant4/Geant4-9.4.p02-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/g/Geant4/Geant4-9.4.p02-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/g/Geant4/Geant4-9.5.p01-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/g/Geant4/Geant4-9.5.p01-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/g/Geant4/Geant4-9.5.p01-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/g/Geant4/Geant4-9.5.p01-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/g/Geant4/Geant4-9.5.p01-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/g/Geant4/Geant4-9.5.p01-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/g/Geant4/Geant4-9.5.p01-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/g/Geant4/Geant4-9.5.p01-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/g/Ghostscript/Ghostscript-9.10-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/g/Ghostscript/Ghostscript-9.10-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/g/Ghostscript/Ghostscript-9.10-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/g/Ghostscript/Ghostscript-9.10-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/g/GnuTLS/GnuTLS-3.1.8-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/g/GnuTLS/GnuTLS-3.1.8-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/g/GnuTLS/GnuTLS-3.1.8-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/g/GnuTLS/GnuTLS-3.1.8-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/g/Greenlet/Greenlet-0.4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/g/Greenlet/Greenlet-0.4.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/g/Greenlet/Greenlet-0.4.0-ictce-4.1.13-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.0-ictce-4.1.13-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/g/Greenlet/Greenlet-0.4.0-ictce-4.1.13-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/g/Guile/Guile-1.8.8-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/g/Guile/Guile-1.8.8-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/g/Guile/Guile-1.8.8-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/g/Guile/Guile-1.8.8-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/g/Guile/Guile-1.8.8-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/g/Guile/Guile-1.8.8-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/g/Guile/Guile-1.8.8-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/g/Guile/Guile-1.8.8-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/g/g2clib/g2clib-1.2.3-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/g/g2clib/g2clib-1.2.3-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/g/g2clib/g2clib-1.2.3-ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/g/g2clib/g2clib-1.2.3-ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/g/g2clib/g2clib-1.2.3-ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/g/g2clib/g2clib-1.4.0-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/g/g2clib/g2clib-1.4.0-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-iqacml-3.7.3.eb b/easybuild/easyconfigs/__archive__/g/g2clib/g2clib-1.4.0-iqacml-3.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/g/g2clib/g2clib-1.4.0-iqacml-3.7.3.eb
rename to easybuild/easyconfigs/__archive__/g/g2clib/g2clib-1.4.0-iqacml-3.7.3.eb
diff --git a/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/g/g2lib/g2lib-1.2.4-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/g/g2lib/g2lib-1.2.4-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/g/g2lib/g2lib-1.2.4-ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/g/g2lib/g2lib-1.2.4-ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/g/g2lib/g2lib-1.2.4-ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/g/g2lib/g2lib-1.4.0-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/g/g2lib/g2lib-1.4.0-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-iqacml-3.7.3.eb b/easybuild/easyconfigs/__archive__/g/g2lib/g2lib-1.4.0-iqacml-3.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/g/g2lib/g2lib-1.4.0-iqacml-3.7.3.eb
rename to easybuild/easyconfigs/__archive__/g/g2lib/g2lib-1.4.0-iqacml-3.7.3.eb
diff --git a/easybuild/easyconfigs/g/gcccuda/gcccuda-2.6.10.eb b/easybuild/easyconfigs/__archive__/g/gcccuda/gcccuda-2.6.10.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gcccuda/gcccuda-2.6.10.eb
rename to easybuild/easyconfigs/__archive__/g/gcccuda/gcccuda-2.6.10.eb
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/__archive__/g/gettext/gettext-0.18.2-cgmpolf-1.1.6.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmpolf-1.1.6.eb
rename to easybuild/easyconfigs/__archive__/g/gettext/gettext-0.18.2-cgmpolf-1.1.6.eb
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/__archive__/g/gettext/gettext-0.18.2-cgmvolf-1.1.12rc1.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmvolf-1.1.12rc1.eb
rename to easybuild/easyconfigs/__archive__/g/gettext/gettext-0.18.2-cgmvolf-1.1.12rc1.eb
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmvolf-1.2.7.eb b/easybuild/easyconfigs/__archive__/g/gettext/gettext-0.18.2-cgmvolf-1.2.7.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgmvolf-1.2.7.eb
rename to easybuild/easyconfigs/__archive__/g/gettext/gettext-0.18.2-cgmvolf-1.2.7.eb
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgoolf-1.1.7.eb b/easybuild/easyconfigs/__archive__/g/gettext/gettext-0.18.2-cgoolf-1.1.7.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gettext/gettext-0.18.2-cgoolf-1.1.7.eb
rename to easybuild/easyconfigs/__archive__/g/gettext/gettext-0.18.2-cgoolf-1.1.7.eb
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmpolf-1.4.8.eb b/easybuild/easyconfigs/__archive__/g/gettext/gettext-0.18.2-gmpolf-1.4.8.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmpolf-1.4.8.eb
rename to easybuild/easyconfigs/__archive__/g/gettext/gettext-0.18.2-gmpolf-1.4.8.eb
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmvolf-1.7.12.eb b/easybuild/easyconfigs/__archive__/g/gettext/gettext-0.18.2-gmvolf-1.7.12.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmvolf-1.7.12.eb
rename to easybuild/easyconfigs/__archive__/g/gettext/gettext-0.18.2-gmvolf-1.7.12.eb
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/__archive__/g/gettext/gettext-0.18.2-gmvolf-1.7.12rc1.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gettext/gettext-0.18.2-gmvolf-1.7.12rc1.eb
rename to easybuild/easyconfigs/__archive__/g/gettext/gettext-0.18.2-gmvolf-1.7.12rc1.eb
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/g/gettext/gettext-0.18.2-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gettext/gettext-0.18.2-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/g/gettext/gettext-0.18.2-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/g/gettext/gettext-0.18.2-gompi-1.4.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gettext/gettext-0.18.2-gompi-1.4.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/g/gettext/gettext-0.18.2-gompi-1.4.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/g/gettext/gettext-0.18.2-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/g/gettext/gettext-0.18.2-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/g/gettext/gettext-0.18.2-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/g/gettext/gettext-0.18.2-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/g/gimkl/gimkl-1.5.9.eb b/easybuild/easyconfigs/__archive__/g/gimkl/gimkl-1.5.9.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gimkl/gimkl-1.5.9.eb
rename to easybuild/easyconfigs/__archive__/g/gimkl/gimkl-1.5.9.eb
diff --git a/easybuild/easyconfigs/g/gimpi/gimpi-1.5.9.eb b/easybuild/easyconfigs/__archive__/g/gimpi/gimpi-1.5.9.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gimpi/gimpi-1.5.9.eb
rename to easybuild/easyconfigs/__archive__/g/gimpi/gimpi-1.5.9.eb
diff --git a/easybuild/easyconfigs/g/git/git-1.7.12-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/g/git/git-1.7.12-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/g/git/git-1.7.12-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/g/git/git-1.7.12-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/g/git/git-1.7.12-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/g/git/git-1.7.12-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/g/git/git-1.7.12-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/g/git/git-1.7.12-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/g/git/git-1.8.2-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/__archive__/g/git/git-1.8.2-cgmpolf-1.1.6.eb
similarity index 100%
rename from easybuild/easyconfigs/g/git/git-1.8.2-cgmpolf-1.1.6.eb
rename to easybuild/easyconfigs/__archive__/g/git/git-1.8.2-cgmpolf-1.1.6.eb
diff --git a/easybuild/easyconfigs/g/git/git-1.8.2-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/__archive__/g/git/git-1.8.2-cgmvolf-1.1.12rc1.eb
similarity index 100%
rename from easybuild/easyconfigs/g/git/git-1.8.2-cgmvolf-1.1.12rc1.eb
rename to easybuild/easyconfigs/__archive__/g/git/git-1.8.2-cgmvolf-1.1.12rc1.eb
diff --git a/easybuild/easyconfigs/g/git/git-1.8.2-cgmvolf-1.2.7.eb b/easybuild/easyconfigs/__archive__/g/git/git-1.8.2-cgmvolf-1.2.7.eb
similarity index 100%
rename from easybuild/easyconfigs/g/git/git-1.8.2-cgmvolf-1.2.7.eb
rename to easybuild/easyconfigs/__archive__/g/git/git-1.8.2-cgmvolf-1.2.7.eb
diff --git a/easybuild/easyconfigs/g/git/git-1.8.2-cgoolf-1.1.7.eb b/easybuild/easyconfigs/__archive__/g/git/git-1.8.2-cgoolf-1.1.7.eb
similarity index 100%
rename from easybuild/easyconfigs/g/git/git-1.8.2-cgoolf-1.1.7.eb
rename to easybuild/easyconfigs/__archive__/g/git/git-1.8.2-cgoolf-1.1.7.eb
diff --git a/easybuild/easyconfigs/g/git/git-1.8.2-gmvolf-1.7.12.eb b/easybuild/easyconfigs/__archive__/g/git/git-1.8.2-gmvolf-1.7.12.eb
similarity index 100%
rename from easybuild/easyconfigs/g/git/git-1.8.2-gmvolf-1.7.12.eb
rename to easybuild/easyconfigs/__archive__/g/git/git-1.8.2-gmvolf-1.7.12.eb
diff --git a/easybuild/easyconfigs/g/git/git-1.8.2-gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/__archive__/g/git/git-1.8.2-gmvolf-1.7.12rc1.eb
similarity index 100%
rename from easybuild/easyconfigs/g/git/git-1.8.2-gmvolf-1.7.12rc1.eb
rename to easybuild/easyconfigs/__archive__/g/git/git-1.8.2-gmvolf-1.7.12rc1.eb
diff --git a/easybuild/easyconfigs/g/glproto/glproto-1.4.16-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/g/glproto/glproto-1.4.16-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/g/glproto/glproto-1.4.16-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/g/glproto/glproto-1.4.16-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/g/glproto/glproto-1.4.16-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/g/glproto/glproto-1.4.16-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/g/glproto/glproto-1.4.16-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/g/glproto/glproto-1.4.16-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/g/glproto/glproto-1.4.16-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/g/glproto/glproto-1.4.16-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/g/glproto/glproto-1.4.16-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/g/glproto/glproto-1.4.16-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/g/gmacml/gmacml-1.7.0.eb b/easybuild/easyconfigs/__archive__/g/gmacml/gmacml-1.7.0.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gmacml/gmacml-1.7.0.eb
rename to easybuild/easyconfigs/__archive__/g/gmacml/gmacml-1.7.0.eb
diff --git a/easybuild/easyconfigs/g/gmpich/gmpich-1.4.8.eb b/easybuild/easyconfigs/__archive__/g/gmpich/gmpich-1.4.8.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gmpich/gmpich-1.4.8.eb
rename to easybuild/easyconfigs/__archive__/g/gmpich/gmpich-1.4.8.eb
diff --git a/easybuild/easyconfigs/g/gmpolf/gmpolf-1.4.8.eb b/easybuild/easyconfigs/__archive__/g/gmpolf/gmpolf-1.4.8.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gmpolf/gmpolf-1.4.8.eb
rename to easybuild/easyconfigs/__archive__/g/gmpolf/gmpolf-1.4.8.eb
diff --git a/easybuild/easyconfigs/g/gmvapich2/gmvapich2-1.1.0.eb b/easybuild/easyconfigs/__archive__/g/gmvapich2/gmvapich2-1.1.0.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gmvapich2/gmvapich2-1.1.0.eb
rename to easybuild/easyconfigs/__archive__/g/gmvapich2/gmvapich2-1.1.0.eb
diff --git a/easybuild/easyconfigs/g/gmvapich2/gmvapich2-1.6.7.eb b/easybuild/easyconfigs/__archive__/g/gmvapich2/gmvapich2-1.6.7.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gmvapich2/gmvapich2-1.6.7.eb
rename to easybuild/easyconfigs/__archive__/g/gmvapich2/gmvapich2-1.6.7.eb
diff --git a/easybuild/easyconfigs/g/gmvapich2/gmvapich2-1.7.12.eb b/easybuild/easyconfigs/__archive__/g/gmvapich2/gmvapich2-1.7.12.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gmvapich2/gmvapich2-1.7.12.eb
rename to easybuild/easyconfigs/__archive__/g/gmvapich2/gmvapich2-1.7.12.eb
diff --git a/easybuild/easyconfigs/g/gmvapich2/gmvapich2-1.7.12rc1.eb b/easybuild/easyconfigs/__archive__/g/gmvapich2/gmvapich2-1.7.12rc1.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gmvapich2/gmvapich2-1.7.12rc1.eb
rename to easybuild/easyconfigs/__archive__/g/gmvapich2/gmvapich2-1.7.12rc1.eb
diff --git a/easybuild/easyconfigs/g/gmvapich2/gmvapich2-1.7.9a2.eb b/easybuild/easyconfigs/__archive__/g/gmvapich2/gmvapich2-1.7.9a2.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gmvapich2/gmvapich2-1.7.9a2.eb
rename to easybuild/easyconfigs/__archive__/g/gmvapich2/gmvapich2-1.7.9a2.eb
diff --git a/easybuild/easyconfigs/g/gmvolf/gmvolf-1.7.12.eb b/easybuild/easyconfigs/__archive__/g/gmvolf/gmvolf-1.7.12.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gmvolf/gmvolf-1.7.12.eb
rename to easybuild/easyconfigs/__archive__/g/gmvolf/gmvolf-1.7.12.eb
diff --git a/easybuild/easyconfigs/g/gmvolf/gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/__archive__/g/gmvolf/gmvolf-1.7.12rc1.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gmvolf/gmvolf-1.7.12rc1.eb
rename to easybuild/easyconfigs/__archive__/g/gmvolf/gmvolf-1.7.12rc1.eb
diff --git a/easybuild/easyconfigs/g/gnuplot/gnuplot-4.6.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/g/gnuplot/gnuplot-4.6.0-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gnuplot/gnuplot-4.6.0-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/g/gnuplot/gnuplot-4.6.0-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/g/gnuplot/gnuplot-4.6.0-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/g/gnuplot/gnuplot-4.6.0-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gnuplot/gnuplot-4.6.0-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/g/gnuplot/gnuplot-4.6.0-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/g/goalf/goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/g/goalf/goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/g/goalf/goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/g/goalf/goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/g/goalf/goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/g/goalf/goalf-1.5.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/g/goalf/goalf-1.5.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/g/goalf/goalf-1.5.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/g/goalf/goalf-1.5.12.eb b/easybuild/easyconfigs/__archive__/g/goalf/goalf-1.5.12.eb
similarity index 100%
rename from easybuild/easyconfigs/g/goalf/goalf-1.5.12.eb
rename to easybuild/easyconfigs/__archive__/g/goalf/goalf-1.5.12.eb
diff --git a/easybuild/easyconfigs/g/gompi/gompi-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/g/gompi/gompi-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gompi/gompi-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/g/gompi/gompi-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/g/gompi/gompi-1.3.12.eb b/easybuild/easyconfigs/__archive__/g/gompi/gompi-1.3.12.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gompi/gompi-1.3.12.eb
rename to easybuild/easyconfigs/__archive__/g/gompi/gompi-1.3.12.eb
diff --git a/easybuild/easyconfigs/g/gompi/gompi-1.4.10-no-OFED.eb b/easybuild/easyconfigs/__archive__/g/gompi/gompi-1.4.10-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gompi/gompi-1.4.10-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/g/gompi/gompi-1.4.10-no-OFED.eb
diff --git a/easybuild/easyconfigs/g/gompi/gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/g/gompi/gompi-1.4.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gompi/gompi-1.4.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/g/gompi/gompi-1.4.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/g/gompi/gompi-1.5.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/g/gompi/gompi-1.5.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gompi/gompi-1.5.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/g/gompi/gompi-1.5.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/g/gompi/gompi-1.5.12.eb b/easybuild/easyconfigs/__archive__/g/gompi/gompi-1.5.12.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gompi/gompi-1.5.12.eb
rename to easybuild/easyconfigs/__archive__/g/gompi/gompi-1.5.12.eb
diff --git a/easybuild/easyconfigs/g/gompi/gompi-1.5.14-no-OFED.eb b/easybuild/easyconfigs/__archive__/g/gompi/gompi-1.5.14-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gompi/gompi-1.5.14-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/g/gompi/gompi-1.5.14-no-OFED.eb
diff --git a/easybuild/easyconfigs/g/gompic/gompic-2.6.10.eb b/easybuild/easyconfigs/__archive__/g/gompic/gompic-2.6.10.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gompic/gompic-2.6.10.eb
rename to easybuild/easyconfigs/__archive__/g/gompic/gompic-2.6.10.eb
diff --git a/easybuild/easyconfigs/g/goolf/goolf-1.4.10-no-OFED.eb b/easybuild/easyconfigs/__archive__/g/goolf/goolf-1.4.10-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/g/goolf/goolf-1.4.10-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/g/goolf/goolf-1.4.10-no-OFED.eb
diff --git a/easybuild/easyconfigs/g/goolf/goolf-1.5.14-no-OFED.eb b/easybuild/easyconfigs/__archive__/g/goolf/goolf-1.5.14-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/g/goolf/goolf-1.5.14-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/g/goolf/goolf-1.5.14-no-OFED.eb
diff --git a/easybuild/easyconfigs/g/goolfc/goolfc-1.3.12.eb b/easybuild/easyconfigs/__archive__/g/goolfc/goolfc-1.3.12.eb
similarity index 100%
rename from easybuild/easyconfigs/g/goolfc/goolfc-1.3.12.eb
rename to easybuild/easyconfigs/__archive__/g/goolfc/goolfc-1.3.12.eb
diff --git a/easybuild/easyconfigs/g/goolfc/goolfc-1.4.10.eb b/easybuild/easyconfigs/__archive__/g/goolfc/goolfc-1.4.10.eb
similarity index 100%
rename from easybuild/easyconfigs/g/goolfc/goolfc-1.4.10.eb
rename to easybuild/easyconfigs/__archive__/g/goolfc/goolfc-1.4.10.eb
diff --git a/easybuild/easyconfigs/g/goolfc/goolfc-2.6.10.eb b/easybuild/easyconfigs/__archive__/g/goolfc/goolfc-2.6.10.eb
similarity index 100%
rename from easybuild/easyconfigs/g/goolfc/goolfc-2.6.10.eb
rename to easybuild/easyconfigs/__archive__/g/goolfc/goolfc-2.6.10.eb
diff --git a/easybuild/easyconfigs/g/gperf/gperf-3.0.4-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/g/gperf/gperf-3.0.4-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gperf/gperf-3.0.4-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/g/gperf/gperf-3.0.4-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/g/gperf/gperf-3.0.4-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/g/gperf/gperf-3.0.4-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gperf/gperf-3.0.4-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/g/gperf/gperf-3.0.4-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/g/gpsmpi/gpsmpi-2014.12.eb b/easybuild/easyconfigs/__archive__/g/gpsmpi/gpsmpi-2014.12.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gpsmpi/gpsmpi-2014.12.eb
rename to easybuild/easyconfigs/__archive__/g/gpsmpi/gpsmpi-2014.12.eb
diff --git a/easybuild/easyconfigs/g/gpsolf/gpsolf-2014.12.eb b/easybuild/easyconfigs/__archive__/g/gpsolf/gpsolf-2014.12.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gpsolf/gpsolf-2014.12.eb
rename to easybuild/easyconfigs/__archive__/g/gpsolf/gpsolf-2014.12.eb
diff --git a/easybuild/easyconfigs/g/grib_api/grib_api-1.10.0-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/g/grib_api/grib_api-1.10.0-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/g/grib_api/grib_api-1.10.0-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/g/grib_api/grib_api-1.10.0-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/g/grib_api/grib_api-1.9.18-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/g/grib_api/grib_api-1.9.18-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/g/grib_api/grib_api-1.9.18-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/g/grib_api/grib_api-1.9.18-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/g/grib_api/grib_api-1.9.18-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/g/grib_api/grib_api-1.9.18-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/g/grib_api/grib_api-1.9.18-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/g/grib_api/grib_api-1.9.18-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.5-cgoolf-1.1.7.eb b/easybuild/easyconfigs/__archive__/g/gzip/gzip-1.5-cgoolf-1.1.7.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gzip/gzip-1.5-cgoolf-1.1.7.eb
rename to easybuild/easyconfigs/__archive__/g/gzip/gzip-1.5-cgoolf-1.1.7.eb
diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.5-gmpolf-1.4.8.eb b/easybuild/easyconfigs/__archive__/g/gzip/gzip-1.5-gmpolf-1.4.8.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gzip/gzip-1.5-gmpolf-1.4.8.eb
rename to easybuild/easyconfigs/__archive__/g/gzip/gzip-1.5-gmpolf-1.4.8.eb
diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.5-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/g/gzip/gzip-1.5-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gzip/gzip-1.5-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/g/gzip/gzip-1.5-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.5-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/g/gzip/gzip-1.5-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gzip/gzip-1.5-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/g/gzip/gzip-1.5-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.5-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/g/gzip/gzip-1.5-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gzip/gzip-1.5-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/g/gzip/gzip-1.5-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.4.10-no-OFED.eb b/easybuild/easyconfigs/__archive__/g/gzip/gzip-1.6-goolf-1.4.10-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.4.10-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/g/gzip/gzip-1.6-goolf-1.4.10-no-OFED.eb
diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.5.14-no-OFED.eb b/easybuild/easyconfigs/__archive__/g/gzip/gzip-1.6-goolf-1.5.14-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gzip/gzip-1.6-goolf-1.5.14-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/g/gzip/gzip-1.6-goolf-1.5.14-no-OFED.eb
diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.6-goolfc-1.4.10.eb b/easybuild/easyconfigs/__archive__/g/gzip/gzip-1.6-goolfc-1.4.10.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gzip/gzip-1.6-goolfc-1.4.10.eb
rename to easybuild/easyconfigs/__archive__/g/gzip/gzip-1.6-goolfc-1.4.10.eb
diff --git a/easybuild/easyconfigs/g/gzip/gzip-1.6-iomkl-6.6.2.eb b/easybuild/easyconfigs/__archive__/g/gzip/gzip-1.6-iomkl-6.6.2.eb
similarity index 100%
rename from easybuild/easyconfigs/g/gzip/gzip-1.6-iomkl-6.6.2.eb
rename to easybuild/easyconfigs/__archive__/g/gzip/gzip-1.6-iomkl-6.6.2.eb
diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/h/HDF/HDF-4.2.7-patch1-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/h/HDF/HDF-4.2.7-patch1-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/h/HDF/HDF-4.2.8-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HDF/HDF-4.2.8-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/h/HDF/HDF-4.2.8-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb b/easybuild/easyconfigs/__archive__/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb
rename to easybuild/easyconfigs/__archive__/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-4.1.13-gpfs-mt.eb b/easybuild/easyconfigs/__archive__/h/HDF5/HDF5-1.8.10-ictce-4.1.13-gpfs-mt.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-4.1.13-gpfs-mt.eb
rename to easybuild/easyconfigs/__archive__/h/HDF5/HDF5-1.8.10-ictce-4.1.13-gpfs-mt.eb
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-4.1.13-gpfs.eb b/easybuild/easyconfigs/__archive__/h/HDF5/HDF5-1.8.10-ictce-4.1.13-gpfs.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-4.1.13-gpfs.eb
rename to easybuild/easyconfigs/__archive__/h/HDF5/HDF5-1.8.10-ictce-4.1.13-gpfs.eb
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-4.1.13-no-mpi.eb b/easybuild/easyconfigs/__archive__/h/HDF5/HDF5-1.8.10-ictce-4.1.13-no-mpi.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-4.1.13-no-mpi.eb
rename to easybuild/easyconfigs/__archive__/h/HDF5/HDF5-1.8.10-ictce-4.1.13-no-mpi.eb
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/h/HDF5/HDF5-1.8.10-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/h/HDF5/HDF5-1.8.10-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-patch1-iqacml-3.7.3.eb b/easybuild/easyconfigs/__archive__/h/HDF5/HDF5-1.8.10-patch1-iqacml-3.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-patch1-iqacml-3.7.3.eb
rename to easybuild/easyconfigs/__archive__/h/HDF5/HDF5-1.8.10-patch1-iqacml-3.7.3.eb
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.12-ictce-4.1.13-zlib-1.2.7.eb b/easybuild/easyconfigs/__archive__/h/HDF5/HDF5-1.8.12-ictce-4.1.13-zlib-1.2.7.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HDF5/HDF5-1.8.12-ictce-4.1.13-zlib-1.2.7.eb
rename to easybuild/easyconfigs/__archive__/h/HDF5/HDF5-1.8.12-ictce-4.1.13-zlib-1.2.7.eb
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.7-gmpolf-1.4.8.eb b/easybuild/easyconfigs/__archive__/h/HDF5/HDF5-1.8.7-gmpolf-1.4.8.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HDF5/HDF5-1.8.7-gmpolf-1.4.8.eb
rename to easybuild/easyconfigs/__archive__/h/HDF5/HDF5-1.8.7-gmpolf-1.4.8.eb
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.7-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/h/HDF5/HDF5-1.8.7-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HDF5/HDF5-1.8.7-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/h/HDF5/HDF5-1.8.7-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.7-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/h/HDF5/HDF5-1.8.7-ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HDF5/HDF5-1.8.7-ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/h/HDF5/HDF5-1.8.7-ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.7-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/h/HDF5/HDF5-1.8.7-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HDF5/HDF5-1.8.7-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/h/HDF5/HDF5-1.8.7-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.9-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/h/HDF5/HDF5-1.8.9-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HDF5/HDF5-1.8.9-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/h/HDF5/HDF5-1.8.9-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.9-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/h/HDF5/HDF5-1.8.9-ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HDF5/HDF5-1.8.9-ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/h/HDF5/HDF5-1.8.9-ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.9-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/h/HDF5/HDF5-1.8.9-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HDF5/HDF5-1.8.9-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/h/HDF5/HDF5-1.8.9-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/h/HH-suite/HH-suite-2.0.16-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/h/HH-suite/HH-suite-2.0.16-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HH-suite/HH-suite-2.0.16-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/h/HH-suite/HH-suite-2.0.16-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/h/HMMER/HMMER-3.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/h/HMMER/HMMER-3.0-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HMMER/HMMER-3.0-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/h/HMMER/HMMER-3.0-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/h/HMMER/HMMER-3.0-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/h/HMMER/HMMER-3.0-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HMMER/HMMER-3.0-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/h/HMMER/HMMER-3.0-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/h/HPCBIOS_Math/HPCBIOS_Math-20130829-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/h/HPCBIOS_Math/HPCBIOS_Math-20130829-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HPCBIOS_Math/HPCBIOS_Math-20130829-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/h/HPCBIOS_Math/HPCBIOS_Math-20130829-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.0-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/__archive__/h/HPL/HPL-2.0-cgmpolf-1.1.6.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HPL/HPL-2.0-cgmpolf-1.1.6.eb
rename to easybuild/easyconfigs/__archive__/h/HPL/HPL-2.0-cgmpolf-1.1.6.eb
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.0-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/__archive__/h/HPL/HPL-2.0-cgmvolf-1.1.12rc1.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HPL/HPL-2.0-cgmvolf-1.1.12rc1.eb
rename to easybuild/easyconfigs/__archive__/h/HPL/HPL-2.0-cgmvolf-1.1.12rc1.eb
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.0-cgmvolf-1.2.7.eb b/easybuild/easyconfigs/__archive__/h/HPL/HPL-2.0-cgmvolf-1.2.7.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HPL/HPL-2.0-cgmvolf-1.2.7.eb
rename to easybuild/easyconfigs/__archive__/h/HPL/HPL-2.0-cgmvolf-1.2.7.eb
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.0-cgoolf-1.1.7.eb b/easybuild/easyconfigs/__archive__/h/HPL/HPL-2.0-cgoolf-1.1.7.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HPL/HPL-2.0-cgoolf-1.1.7.eb
rename to easybuild/easyconfigs/__archive__/h/HPL/HPL-2.0-cgoolf-1.1.7.eb
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/h/HPL/HPL-2.0-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HPL/HPL-2.0-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/h/HPL/HPL-2.0-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/h/HPL/HPL-2.0-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/h/HPL/HPL-2.0-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.0.5.eb b/easybuild/easyconfigs/__archive__/h/HPL/HPL-2.0-ictce-6.0.5.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HPL/HPL-2.0-ictce-6.0.5.eb
rename to easybuild/easyconfigs/__archive__/h/HPL/HPL-2.0-ictce-6.0.5.eb
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.0-iomkl-4.6.13.eb b/easybuild/easyconfigs/__archive__/h/HPL/HPL-2.0-iomkl-4.6.13.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HPL/HPL-2.0-iomkl-4.6.13.eb
rename to easybuild/easyconfigs/__archive__/h/HPL/HPL-2.0-iomkl-4.6.13.eb
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.1-gimkl-1.5.9.eb b/easybuild/easyconfigs/__archive__/h/HPL/HPL-2.1-gimkl-1.5.9.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HPL/HPL-2.1-gimkl-1.5.9.eb
rename to easybuild/easyconfigs/__archive__/h/HPL/HPL-2.1-gimkl-1.5.9.eb
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.1-gmpolf-1.4.8.eb b/easybuild/easyconfigs/__archive__/h/HPL/HPL-2.1-gmpolf-1.4.8.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HPL/HPL-2.1-gmpolf-1.4.8.eb
rename to easybuild/easyconfigs/__archive__/h/HPL/HPL-2.1-gmpolf-1.4.8.eb
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.1-goolfc-1.4.10.eb b/easybuild/easyconfigs/__archive__/h/HPL/HPL-2.1-goolfc-1.4.10.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HPL/HPL-2.1-goolfc-1.4.10.eb
rename to easybuild/easyconfigs/__archive__/h/HPL/HPL-2.1-goolfc-1.4.10.eb
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.1-goolfc-2.6.10.eb b/easybuild/easyconfigs/__archive__/h/HPL/HPL-2.1-goolfc-2.6.10.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HPL/HPL-2.1-goolfc-2.6.10.eb
rename to easybuild/easyconfigs/__archive__/h/HPL/HPL-2.1-goolfc-2.6.10.eb
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.1-gpsolf-2014.12.eb b/easybuild/easyconfigs/__archive__/h/HPL/HPL-2.1-gpsolf-2014.12.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HPL/HPL-2.1-gpsolf-2014.12.eb
rename to easybuild/easyconfigs/__archive__/h/HPL/HPL-2.1-gpsolf-2014.12.eb
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.1-ictce-6.3.5.eb b/easybuild/easyconfigs/__archive__/h/HPL/HPL-2.1-ictce-6.3.5.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HPL/HPL-2.1-ictce-6.3.5.eb
rename to easybuild/easyconfigs/__archive__/h/HPL/HPL-2.1-ictce-6.3.5.eb
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.1-intel-para-2014.12.eb b/easybuild/easyconfigs/__archive__/h/HPL/HPL-2.1-intel-para-2014.12.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HPL/HPL-2.1-intel-para-2014.12.eb
rename to easybuild/easyconfigs/__archive__/h/HPL/HPL-2.1-intel-para-2014.12.eb
diff --git a/easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-ictce-4.1.13-Python-2.7.6.eb b/easybuild/easyconfigs/__archive__/h/HTSeq/HTSeq-0.5.4p5-ictce-4.1.13-Python-2.7.6.eb
similarity index 100%
rename from easybuild/easyconfigs/h/HTSeq/HTSeq-0.5.4p5-ictce-4.1.13-Python-2.7.6.eb
rename to easybuild/easyconfigs/__archive__/h/HTSeq/HTSeq-0.5.4p5-ictce-4.1.13-Python-2.7.6.eb
diff --git a/easybuild/easyconfigs/h/Harminv/Harminv-1.3.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/h/Harminv/Harminv-1.3.1-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/h/Harminv/Harminv-1.3.1-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/h/Harminv/Harminv-1.3.1-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/h/Harminv/Harminv-1.3.1-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/h/Harminv/Harminv-1.3.1-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/h/Harminv/Harminv-1.3.1-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/h/Harminv/Harminv-1.3.1-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/h/Hypre/Hypre-2.8.0b-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/h/Hypre/Hypre-2.8.0b-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/h/Hypre/Hypre-2.8.0b-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/h/Hypre/Hypre-2.8.0b-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/h/Hypre/Hypre-2.8.0b-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/h/Hypre/Hypre-2.8.0b-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/h/Hypre/Hypre-2.8.0b-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/h/Hypre/Hypre-2.8.0b-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/h/h5py/h5py-2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/h/h5py/h5py-2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/h/h5py/h5py-2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/h/h5py/h5py-2.0.1-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/h/h5py/h5py-2.0.1-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/h/h5py/h5py-2.0.1-ictce-4.1.13-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/h/h5py/h5py-2.0.1-ictce-4.1.13-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/h/h5py/h5py-2.0.1-ictce-4.1.13-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/h/h5py/h5py-2.1.3-ictce-4.1.13-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/h/h5py/h5py-2.1.3-ictce-4.1.13-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/h/h5py/h5py-2.1.3-ictce-4.1.13-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.2.1-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/h/h5py/h5py-2.2.1-ictce-4.1.13-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/h/h5py/h5py-2.2.1-ictce-4.1.13-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/h/h5py/h5py-2.2.1-ictce-4.1.13-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/h/h5utils/h5utils-1.12.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/h/h5utils/h5utils-1.12.1-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/h/h5utils/h5utils-1.12.1-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/h/h5utils/h5utils-1.12.1-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/h/h5utils/h5utils-1.12.1-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/h/h5utils/h5utils-1.12.1-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/h/h5utils/h5utils-1.12.1-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/h/h5utils/h5utils-1.12.1-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/h/horton/horton-1.0.2-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/h/horton/horton-1.0.2-ictce-4.1.13-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/h/horton/horton-1.0.2-ictce-4.1.13-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/h/horton/horton-1.0.2-ictce-4.1.13-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/h/horton/horton-1.1.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/h/horton/horton-1.1.0-ictce-4.1.13-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/h/horton/horton-1.1.0-ictce-4.1.13-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/h/horton/horton-1.1.0-ictce-4.1.13-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/h/horton/horton-1.2.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/h/horton/horton-1.2.0-ictce-4.1.13-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/h/horton/horton-1.2.0-ictce-4.1.13-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/h/horton/horton-1.2.0-ictce-4.1.13-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/h/horton/horton-1.2.1-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/h/horton/horton-1.2.1-ictce-4.1.13-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/h/horton/horton-1.2.1-ictce-4.1.13-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/h/horton/horton-1.2.1-ictce-4.1.13-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.6-iccifort-2011.13.367.eb b/easybuild/easyconfigs/__archive__/h/hwloc/hwloc-1.6-iccifort-2011.13.367.eb
similarity index 100%
rename from easybuild/easyconfigs/h/hwloc/hwloc-1.6-iccifort-2011.13.367.eb
rename to easybuild/easyconfigs/__archive__/h/hwloc/hwloc-1.6-iccifort-2011.13.367.eb
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-ClangGCC-1.1.3.eb b/easybuild/easyconfigs/__archive__/h/hwloc/hwloc-1.6.2-ClangGCC-1.1.3.eb
similarity index 100%
rename from easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-ClangGCC-1.1.3.eb
rename to easybuild/easyconfigs/__archive__/h/hwloc/hwloc-1.6.2-ClangGCC-1.1.3.eb
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.8-gcccuda-2.6.10.eb b/easybuild/easyconfigs/__archive__/h/hwloc/hwloc-1.8-gcccuda-2.6.10.eb
similarity index 100%
rename from easybuild/easyconfigs/h/hwloc/hwloc-1.8-gcccuda-2.6.10.eb
rename to easybuild/easyconfigs/__archive__/h/hwloc/hwloc-1.8-gcccuda-2.6.10.eb
diff --git a/easybuild/easyconfigs/i/IMB/IMB-4.0.1-goolf-1.5.14-no-OFED.eb b/easybuild/easyconfigs/__archive__/i/IMB/IMB-4.0.1-goolf-1.5.14-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/i/IMB/IMB-4.0.1-goolf-1.5.14-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/i/IMB/IMB-4.0.1-goolf-1.5.14-no-OFED.eb
diff --git a/easybuild/easyconfigs/i/Infernal/Infernal-1.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/i/Infernal/Infernal-1.1-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/i/Infernal/Infernal-1.1-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/i/Infernal/Infernal-1.1-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/i/Infernal/Infernal-1.1-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/i/Infernal/Infernal-1.1-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/i/Infernal/Infernal-1.1-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/i/Infernal/Infernal-1.1-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/i/Infernal/Infernal-1.1rc1-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/i/Infernal/Infernal-1.1rc1-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/i/Infernal/Infernal-1.1rc1-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/i/Infernal/Infernal-1.1rc1-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/i/Instant/Instant-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/i/Instant/Instant-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/i/Instant/Instant-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/i/Instant/Instant-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/i/Instant/Instant-1.0.0-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/i/Instant/Instant-1.0.0-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/i/Instant/Instant-1.0.0-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/i/Instant/Instant-1.0.0-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/i/Iperf/Iperf-2.0.5-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/i/Iperf/Iperf-2.0.5-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/i/Iperf/Iperf-2.0.5-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/i/Iperf/Iperf-2.0.5-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/i/Iperf/Iperf-2.0.5-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/i/Iperf/Iperf-2.0.5-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/i/Iperf/Iperf-2.0.5-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/i/Iperf/Iperf-2.0.5-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/__archive__/i/IronPython/IronPython-2.7-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/i/IronPython/IronPython-2.7-ictce-4.1.13.eb
new file mode 100644
index 0000000000000000000000000000000000000000..147957947e3842bcd27cb64f58f60c036f3ac925
--- /dev/null
+++ b/easybuild/easyconfigs/__archive__/i/IronPython/IronPython-2.7-ictce-4.1.13.eb
@@ -0,0 +1,16 @@
+name = 'IronPython'
+version = '2.7'
+
+homepage = 'http://ironpython.net/'
+description = """IronPython is an open-source implementation of the Python programming language
+ which is tightly integrated with the .NET Framework. IronPython can use the .NET Framework and
+Python libraries, and other .NET languages can use Python code just as easily."""
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+
+source_urls = ['https://github.com/IronLanguages/main/archive/']
+sources = ['ipy-%(version)s.tar.gz']
+
+dependencies = [('Mono', '2.10.6')]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/i/iccifort/iccifort-11.1.073-32bit.eb b/easybuild/easyconfigs/__archive__/i/iccifort/iccifort-11.1.073-32bit.eb
similarity index 100%
rename from easybuild/easyconfigs/i/iccifort/iccifort-11.1.073-32bit.eb
rename to easybuild/easyconfigs/__archive__/i/iccifort/iccifort-11.1.073-32bit.eb
diff --git a/easybuild/easyconfigs/i/iccifort/iccifort-11.1.073.eb b/easybuild/easyconfigs/__archive__/i/iccifort/iccifort-11.1.073.eb
similarity index 100%
rename from easybuild/easyconfigs/i/iccifort/iccifort-11.1.073.eb
rename to easybuild/easyconfigs/__archive__/i/iccifort/iccifort-11.1.073.eb
diff --git a/easybuild/easyconfigs/i/iccifort/iccifort-2011.10.319.eb b/easybuild/easyconfigs/__archive__/i/iccifort/iccifort-2011.10.319.eb
similarity index 100%
rename from easybuild/easyconfigs/i/iccifort/iccifort-2011.10.319.eb
rename to easybuild/easyconfigs/__archive__/i/iccifort/iccifort-2011.10.319.eb
diff --git a/easybuild/easyconfigs/i/iccifort/iccifort-2011.13.367.eb b/easybuild/easyconfigs/__archive__/i/iccifort/iccifort-2011.13.367.eb
similarity index 100%
rename from easybuild/easyconfigs/i/iccifort/iccifort-2011.13.367.eb
rename to easybuild/easyconfigs/__archive__/i/iccifort/iccifort-2011.13.367.eb
diff --git a/easybuild/easyconfigs/i/iccifort/iccifort-2011.6.233.eb b/easybuild/easyconfigs/__archive__/i/iccifort/iccifort-2011.6.233.eb
similarity index 100%
rename from easybuild/easyconfigs/i/iccifort/iccifort-2011.6.233.eb
rename to easybuild/easyconfigs/__archive__/i/iccifort/iccifort-2011.6.233.eb
diff --git a/easybuild/easyconfigs/i/iccifort/iccifort-2013.1.117.eb b/easybuild/easyconfigs/__archive__/i/iccifort/iccifort-2013.1.117.eb
similarity index 100%
rename from easybuild/easyconfigs/i/iccifort/iccifort-2013.1.117.eb
rename to easybuild/easyconfigs/__archive__/i/iccifort/iccifort-2013.1.117.eb
diff --git a/easybuild/easyconfigs/i/iccifort/iccifort-2013_sp1.0.080.eb b/easybuild/easyconfigs/__archive__/i/iccifort/iccifort-2013_sp1.0.080.eb
similarity index 100%
rename from easybuild/easyconfigs/i/iccifort/iccifort-2013_sp1.0.080.eb
rename to easybuild/easyconfigs/__archive__/i/iccifort/iccifort-2013_sp1.0.080.eb
diff --git a/easybuild/easyconfigs/i/iccifort/iccifort-2013_sp1.3.174.eb b/easybuild/easyconfigs/__archive__/i/iccifort/iccifort-2013_sp1.3.174.eb
similarity index 100%
rename from easybuild/easyconfigs/i/iccifort/iccifort-2013_sp1.3.174.eb
rename to easybuild/easyconfigs/__archive__/i/iccifort/iccifort-2013_sp1.3.174.eb
diff --git a/easybuild/easyconfigs/i/ictce/ictce-3.2.2.u3-32bit.eb b/easybuild/easyconfigs/__archive__/i/ictce/ictce-3.2.2.u3-32bit.eb
similarity index 100%
rename from easybuild/easyconfigs/i/ictce/ictce-3.2.2.u3-32bit.eb
rename to easybuild/easyconfigs/__archive__/i/ictce/ictce-3.2.2.u3-32bit.eb
diff --git a/easybuild/easyconfigs/i/ictce/ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/i/ictce/ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/i/ictce/ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/i/ictce/ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/i/ictce/ictce-4.0.10.eb b/easybuild/easyconfigs/__archive__/i/ictce/ictce-4.0.10.eb
similarity index 100%
rename from easybuild/easyconfigs/i/ictce/ictce-4.0.10.eb
rename to easybuild/easyconfigs/__archive__/i/ictce/ictce-4.0.10.eb
diff --git a/easybuild/easyconfigs/i/ictce/ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/i/ictce/ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/i/ictce/ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/i/ictce/ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/i/ictce/ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/i/ictce/ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/i/ictce/ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/i/ictce/ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/i/ictce/ictce-5.1.1.eb b/easybuild/easyconfigs/__archive__/i/ictce/ictce-5.1.1.eb
similarity index 100%
rename from easybuild/easyconfigs/i/ictce/ictce-5.1.1.eb
rename to easybuild/easyconfigs/__archive__/i/ictce/ictce-5.1.1.eb
diff --git a/easybuild/easyconfigs/i/ictce/ictce-6.0.5.eb b/easybuild/easyconfigs/__archive__/i/ictce/ictce-6.0.5.eb
similarity index 100%
rename from easybuild/easyconfigs/i/ictce/ictce-6.0.5.eb
rename to easybuild/easyconfigs/__archive__/i/ictce/ictce-6.0.5.eb
diff --git a/easybuild/easyconfigs/i/ictce/ictce-6.3.5.eb b/easybuild/easyconfigs/__archive__/i/ictce/ictce-6.3.5.eb
similarity index 100%
rename from easybuild/easyconfigs/i/ictce/ictce-6.3.5.eb
rename to easybuild/easyconfigs/__archive__/i/ictce/ictce-6.3.5.eb
diff --git a/easybuild/easyconfigs/i/iimpi/iimpi-3.2.2.u3-32bit.eb b/easybuild/easyconfigs/__archive__/i/iimpi/iimpi-3.2.2.u3-32bit.eb
similarity index 100%
rename from easybuild/easyconfigs/i/iimpi/iimpi-3.2.2.u3-32bit.eb
rename to easybuild/easyconfigs/__archive__/i/iimpi/iimpi-3.2.2.u3-32bit.eb
diff --git a/easybuild/easyconfigs/i/iimpi/iimpi-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/i/iimpi/iimpi-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/i/iimpi/iimpi-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/i/iimpi/iimpi-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/i/iimpi/iimpi-4.0.10.eb b/easybuild/easyconfigs/__archive__/i/iimpi/iimpi-4.0.10.eb
similarity index 100%
rename from easybuild/easyconfigs/i/iimpi/iimpi-4.0.10.eb
rename to easybuild/easyconfigs/__archive__/i/iimpi/iimpi-4.0.10.eb
diff --git a/easybuild/easyconfigs/i/iimpi/iimpi-4.0.6.eb b/easybuild/easyconfigs/__archive__/i/iimpi/iimpi-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/i/iimpi/iimpi-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/i/iimpi/iimpi-4.0.6.eb
diff --git a/easybuild/easyconfigs/i/iimpi/iimpi-4.1.13.eb b/easybuild/easyconfigs/__archive__/i/iimpi/iimpi-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/i/iimpi/iimpi-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/i/iimpi/iimpi-4.1.13.eb
diff --git a/easybuild/easyconfigs/i/iimpi/iimpi-5.1.1.eb b/easybuild/easyconfigs/__archive__/i/iimpi/iimpi-5.1.1.eb
similarity index 100%
rename from easybuild/easyconfigs/i/iimpi/iimpi-5.1.1.eb
rename to easybuild/easyconfigs/__archive__/i/iimpi/iimpi-5.1.1.eb
diff --git a/easybuild/easyconfigs/i/iimpi/iimpi-6.0.5.eb b/easybuild/easyconfigs/__archive__/i/iimpi/iimpi-6.0.5.eb
similarity index 100%
rename from easybuild/easyconfigs/i/iimpi/iimpi-6.0.5.eb
rename to easybuild/easyconfigs/__archive__/i/iimpi/iimpi-6.0.5.eb
diff --git a/easybuild/easyconfigs/i/iimpi/iimpi-6.3.5.eb b/easybuild/easyconfigs/__archive__/i/iimpi/iimpi-6.3.5.eb
similarity index 100%
rename from easybuild/easyconfigs/i/iimpi/iimpi-6.3.5.eb
rename to easybuild/easyconfigs/__archive__/i/iimpi/iimpi-6.3.5.eb
diff --git a/easybuild/easyconfigs/i/iiqmpi/iiqmpi-3.3.0.eb b/easybuild/easyconfigs/__archive__/i/iiqmpi/iiqmpi-3.3.0.eb
similarity index 100%
rename from easybuild/easyconfigs/i/iiqmpi/iiqmpi-3.3.0.eb
rename to easybuild/easyconfigs/__archive__/i/iiqmpi/iiqmpi-3.3.0.eb
diff --git a/easybuild/easyconfigs/i/iiqmpi/iiqmpi-4.4.13.eb b/easybuild/easyconfigs/__archive__/i/iiqmpi/iiqmpi-4.4.13.eb
similarity index 100%
rename from easybuild/easyconfigs/i/iiqmpi/iiqmpi-4.4.13.eb
rename to easybuild/easyconfigs/__archive__/i/iiqmpi/iiqmpi-4.4.13.eb
diff --git a/easybuild/easyconfigs/i/imake/imake-1.0.5-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/i/imake/imake-1.0.5-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/i/imake/imake-1.0.5-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/i/imake/imake-1.0.5-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/i/imkl/imkl-10.2.6.038-iimpi-3.2.2.u3-32bit.eb b/easybuild/easyconfigs/__archive__/i/imkl/imkl-10.2.6.038-iimpi-3.2.2.u3-32bit.eb
similarity index 100%
rename from easybuild/easyconfigs/i/imkl/imkl-10.2.6.038-iimpi-3.2.2.u3-32bit.eb
rename to easybuild/easyconfigs/__archive__/i/imkl/imkl-10.2.6.038-iimpi-3.2.2.u3-32bit.eb
diff --git a/easybuild/easyconfigs/i/imkl/imkl-10.2.6.038-iimpi-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/i/imkl/imkl-10.2.6.038-iimpi-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/i/imkl/imkl-10.2.6.038-iimpi-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/i/imkl/imkl-10.2.6.038-iimpi-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/i/imkl/imkl-10.3.10.319-iimpi-4.0.10.eb b/easybuild/easyconfigs/__archive__/i/imkl/imkl-10.3.10.319-iimpi-4.0.10.eb
similarity index 100%
rename from easybuild/easyconfigs/i/imkl/imkl-10.3.10.319-iimpi-4.0.10.eb
rename to easybuild/easyconfigs/__archive__/i/imkl/imkl-10.3.10.319-iimpi-4.0.10.eb
diff --git a/easybuild/easyconfigs/i/imkl/imkl-10.3.12.361-iimpi-4.1.13.eb b/easybuild/easyconfigs/__archive__/i/imkl/imkl-10.3.12.361-iimpi-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/i/imkl/imkl-10.3.12.361-iimpi-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/i/imkl/imkl-10.3.12.361-iimpi-4.1.13.eb
diff --git a/easybuild/easyconfigs/i/imkl/imkl-10.3.12.361-iompi-4.6.13.eb b/easybuild/easyconfigs/__archive__/i/imkl/imkl-10.3.12.361-iompi-4.6.13.eb
similarity index 100%
rename from easybuild/easyconfigs/i/imkl/imkl-10.3.12.361-iompi-4.6.13.eb
rename to easybuild/easyconfigs/__archive__/i/imkl/imkl-10.3.12.361-iompi-4.6.13.eb
diff --git a/easybuild/easyconfigs/i/imkl/imkl-10.3.6.233-iimpi-4.0.6.eb b/easybuild/easyconfigs/__archive__/i/imkl/imkl-10.3.6.233-iimpi-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/i/imkl/imkl-10.3.6.233-iimpi-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/i/imkl/imkl-10.3.6.233-iimpi-4.0.6.eb
diff --git a/easybuild/easyconfigs/i/imkl/imkl-11.0.1.117-iimpi-5.1.1.eb b/easybuild/easyconfigs/__archive__/i/imkl/imkl-11.0.1.117-iimpi-5.1.1.eb
similarity index 100%
rename from easybuild/easyconfigs/i/imkl/imkl-11.0.1.117-iimpi-5.1.1.eb
rename to easybuild/easyconfigs/__archive__/i/imkl/imkl-11.0.1.117-iimpi-5.1.1.eb
diff --git a/easybuild/easyconfigs/i/imkl/imkl-11.1.0.080-iimpi-6.0.5.eb b/easybuild/easyconfigs/__archive__/i/imkl/imkl-11.1.0.080-iimpi-6.0.5.eb
similarity index 100%
rename from easybuild/easyconfigs/i/imkl/imkl-11.1.0.080-iimpi-6.0.5.eb
rename to easybuild/easyconfigs/__archive__/i/imkl/imkl-11.1.0.080-iimpi-6.0.5.eb
diff --git a/easybuild/easyconfigs/i/imkl/imkl-11.1.2.144-gimpi-1.5.9.eb b/easybuild/easyconfigs/__archive__/i/imkl/imkl-11.1.2.144-gimpi-1.5.9.eb
similarity index 100%
rename from easybuild/easyconfigs/i/imkl/imkl-11.1.2.144-gimpi-1.5.9.eb
rename to easybuild/easyconfigs/__archive__/i/imkl/imkl-11.1.2.144-gimpi-1.5.9.eb
diff --git a/easybuild/easyconfigs/i/imkl/imkl-11.1.2.144-iompi-6.6.2.eb b/easybuild/easyconfigs/__archive__/i/imkl/imkl-11.1.2.144-iompi-6.6.2.eb
similarity index 100%
rename from easybuild/easyconfigs/i/imkl/imkl-11.1.2.144-iompi-6.6.2.eb
rename to easybuild/easyconfigs/__archive__/i/imkl/imkl-11.1.2.144-iompi-6.6.2.eb
diff --git a/easybuild/easyconfigs/i/imkl/imkl-11.1.3.174-iimpi-6.3.5.eb b/easybuild/easyconfigs/__archive__/i/imkl/imkl-11.1.3.174-iimpi-6.3.5.eb
similarity index 100%
rename from easybuild/easyconfigs/i/imkl/imkl-11.1.3.174-iimpi-6.3.5.eb
rename to easybuild/easyconfigs/__archive__/i/imkl/imkl-11.1.3.174-iimpi-6.3.5.eb
diff --git a/easybuild/easyconfigs/i/imkl/imkl-11.1.4.211-iompi-6.6.4.eb b/easybuild/easyconfigs/__archive__/i/imkl/imkl-11.1.4.211-iompi-6.6.4.eb
similarity index 100%
rename from easybuild/easyconfigs/i/imkl/imkl-11.1.4.211-iompi-6.6.4.eb
rename to easybuild/easyconfigs/__archive__/i/imkl/imkl-11.1.4.211-iompi-6.6.4.eb
diff --git a/easybuild/easyconfigs/i/imkl/imkl-11.2.1.133-ipsmpi-2014.12.eb b/easybuild/easyconfigs/__archive__/i/imkl/imkl-11.2.1.133-ipsmpi-2014.12.eb
similarity index 100%
rename from easybuild/easyconfigs/i/imkl/imkl-11.2.1.133-ipsmpi-2014.12.eb
rename to easybuild/easyconfigs/__archive__/i/imkl/imkl-11.2.1.133-ipsmpi-2014.12.eb
diff --git a/easybuild/easyconfigs/i/impi/impi-4.0.0.028-iccifort-11.1.073-32bit.eb b/easybuild/easyconfigs/__archive__/i/impi/impi-4.0.0.028-iccifort-11.1.073-32bit.eb
similarity index 100%
rename from easybuild/easyconfigs/i/impi/impi-4.0.0.028-iccifort-11.1.073-32bit.eb
rename to easybuild/easyconfigs/__archive__/i/impi/impi-4.0.0.028-iccifort-11.1.073-32bit.eb
diff --git a/easybuild/easyconfigs/i/impi/impi-4.0.0.028-iccifort-11.1.073.eb b/easybuild/easyconfigs/__archive__/i/impi/impi-4.0.0.028-iccifort-11.1.073.eb
similarity index 100%
rename from easybuild/easyconfigs/i/impi/impi-4.0.0.028-iccifort-11.1.073.eb
rename to easybuild/easyconfigs/__archive__/i/impi/impi-4.0.0.028-iccifort-11.1.073.eb
diff --git a/easybuild/easyconfigs/i/impi/impi-4.0.2.003-iccifort-2011.10.319.eb b/easybuild/easyconfigs/__archive__/i/impi/impi-4.0.2.003-iccifort-2011.10.319.eb
similarity index 100%
rename from easybuild/easyconfigs/i/impi/impi-4.0.2.003-iccifort-2011.10.319.eb
rename to easybuild/easyconfigs/__archive__/i/impi/impi-4.0.2.003-iccifort-2011.10.319.eb
diff --git a/easybuild/easyconfigs/i/impi/impi-4.0.2.003-iccifort-2011.6.233.eb b/easybuild/easyconfigs/__archive__/i/impi/impi-4.0.2.003-iccifort-2011.6.233.eb
similarity index 100%
rename from easybuild/easyconfigs/i/impi/impi-4.0.2.003-iccifort-2011.6.233.eb
rename to easybuild/easyconfigs/__archive__/i/impi/impi-4.0.2.003-iccifort-2011.6.233.eb
diff --git a/easybuild/easyconfigs/i/impi/impi-4.1.0.027-iccifort-2011.13.367.eb b/easybuild/easyconfigs/__archive__/i/impi/impi-4.1.0.027-iccifort-2011.13.367.eb
similarity index 100%
rename from easybuild/easyconfigs/i/impi/impi-4.1.0.027-iccifort-2011.13.367.eb
rename to easybuild/easyconfigs/__archive__/i/impi/impi-4.1.0.027-iccifort-2011.13.367.eb
diff --git a/easybuild/easyconfigs/i/impi/impi-4.1.0.027-iccifort-2013.1.117.eb b/easybuild/easyconfigs/__archive__/i/impi/impi-4.1.0.027-iccifort-2013.1.117.eb
similarity index 100%
rename from easybuild/easyconfigs/i/impi/impi-4.1.0.027-iccifort-2013.1.117.eb
rename to easybuild/easyconfigs/__archive__/i/impi/impi-4.1.0.027-iccifort-2013.1.117.eb
diff --git a/easybuild/easyconfigs/i/impi/impi-4.1.1.036-iccifort-2013_sp1.0.080.eb b/easybuild/easyconfigs/__archive__/i/impi/impi-4.1.1.036-iccifort-2013_sp1.0.080.eb
similarity index 100%
rename from easybuild/easyconfigs/i/impi/impi-4.1.1.036-iccifort-2013_sp1.0.080.eb
rename to easybuild/easyconfigs/__archive__/i/impi/impi-4.1.1.036-iccifort-2013_sp1.0.080.eb
diff --git a/easybuild/easyconfigs/i/impi/impi-4.1.3.049-iccifort-2013_sp1.3.174.eb b/easybuild/easyconfigs/__archive__/i/impi/impi-4.1.3.049-iccifort-2013_sp1.3.174.eb
similarity index 100%
rename from easybuild/easyconfigs/i/impi/impi-4.1.3.049-iccifort-2013_sp1.3.174.eb
rename to easybuild/easyconfigs/__archive__/i/impi/impi-4.1.3.049-iccifort-2013_sp1.3.174.eb
diff --git a/easybuild/easyconfigs/i/inputproto/inputproto-2.3-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/i/inputproto/inputproto-2.3-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/i/inputproto/inputproto-2.3-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/i/inputproto/inputproto-2.3-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/i/intel-para/intel-para-2014.12.eb b/easybuild/easyconfigs/__archive__/i/intel-para/intel-para-2014.12.eb
similarity index 100%
rename from easybuild/easyconfigs/i/intel-para/intel-para-2014.12.eb
rename to easybuild/easyconfigs/__archive__/i/intel-para/intel-para-2014.12.eb
diff --git a/easybuild/easyconfigs/i/iomkl/iomkl-4.6.13.eb b/easybuild/easyconfigs/__archive__/i/iomkl/iomkl-4.6.13.eb
similarity index 100%
rename from easybuild/easyconfigs/i/iomkl/iomkl-4.6.13.eb
rename to easybuild/easyconfigs/__archive__/i/iomkl/iomkl-4.6.13.eb
diff --git a/easybuild/easyconfigs/i/iomkl/iomkl-6.6.2.eb b/easybuild/easyconfigs/__archive__/i/iomkl/iomkl-6.6.2.eb
similarity index 100%
rename from easybuild/easyconfigs/i/iomkl/iomkl-6.6.2.eb
rename to easybuild/easyconfigs/__archive__/i/iomkl/iomkl-6.6.2.eb
diff --git a/easybuild/easyconfigs/i/iompi/iompi-4.6.13.eb b/easybuild/easyconfigs/__archive__/i/iompi/iompi-4.6.13.eb
similarity index 100%
rename from easybuild/easyconfigs/i/iompi/iompi-4.6.13.eb
rename to easybuild/easyconfigs/__archive__/i/iompi/iompi-4.6.13.eb
diff --git a/easybuild/easyconfigs/i/iompi/iompi-6.6.2.eb b/easybuild/easyconfigs/__archive__/i/iompi/iompi-6.6.2.eb
similarity index 100%
rename from easybuild/easyconfigs/i/iompi/iompi-6.6.2.eb
rename to easybuild/easyconfigs/__archive__/i/iompi/iompi-6.6.2.eb
diff --git a/easybuild/easyconfigs/i/iompi/iompi-6.6.4-no-OFED.eb b/easybuild/easyconfigs/__archive__/i/iompi/iompi-6.6.4-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/i/iompi/iompi-6.6.4-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/i/iompi/iompi-6.6.4-no-OFED.eb
diff --git a/easybuild/easyconfigs/i/iompi/iompi-6.6.4.eb b/easybuild/easyconfigs/__archive__/i/iompi/iompi-6.6.4.eb
similarity index 100%
rename from easybuild/easyconfigs/i/iompi/iompi-6.6.4.eb
rename to easybuild/easyconfigs/__archive__/i/iompi/iompi-6.6.4.eb
diff --git a/easybuild/easyconfigs/i/ipsmpi/ipsmpi-2014.12.eb b/easybuild/easyconfigs/__archive__/i/ipsmpi/ipsmpi-2014.12.eb
similarity index 100%
rename from easybuild/easyconfigs/i/ipsmpi/ipsmpi-2014.12.eb
rename to easybuild/easyconfigs/__archive__/i/ipsmpi/ipsmpi-2014.12.eb
diff --git a/easybuild/easyconfigs/i/iqacml/iqacml-3.7.3.eb b/easybuild/easyconfigs/__archive__/i/iqacml/iqacml-3.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/i/iqacml/iqacml-3.7.3.eb
rename to easybuild/easyconfigs/__archive__/i/iqacml/iqacml-3.7.3.eb
diff --git a/easybuild/easyconfigs/i/iqacml/iqacml-4.4.13.eb b/easybuild/easyconfigs/__archive__/i/iqacml/iqacml-4.4.13.eb
similarity index 100%
rename from easybuild/easyconfigs/i/iqacml/iqacml-4.4.13.eb
rename to easybuild/easyconfigs/__archive__/i/iqacml/iqacml-4.4.13.eb
diff --git a/easybuild/easyconfigs/j/Jansson/Jansson-2.5-gcccuda-2.6.10.eb b/easybuild/easyconfigs/__archive__/j/Jansson/Jansson-2.5-gcccuda-2.6.10.eb
similarity index 100%
rename from easybuild/easyconfigs/j/Jansson/Jansson-2.5-gcccuda-2.6.10.eb
rename to easybuild/easyconfigs/__archive__/j/Jansson/Jansson-2.5-gcccuda-2.6.10.eb
diff --git a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/j/JasPer/JasPer-1.900.1-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/j/JasPer/JasPer-1.900.1-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/j/JasPer/JasPer-1.900.1-ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/j/JasPer/JasPer-1.900.1-ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/j/JasPer/JasPer-1.900.1-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/j/JasPer/JasPer-1.900.1-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-iqacml-3.7.3.eb b/easybuild/easyconfigs/__archive__/j/JasPer/JasPer-1.900.1-iqacml-3.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-iqacml-3.7.3.eb
rename to easybuild/easyconfigs/__archive__/j/JasPer/JasPer-1.900.1-iqacml-3.7.3.eb
diff --git a/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/j/Jinja2/Jinja2-2.6-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/j/Jinja2/Jinja2-2.6-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/j/Jinja2/Jinja2-2.6-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/j/Jinja2/Jinja2-2.6-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/k/kbproto/kbproto-1.0.6-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/k/kbproto/kbproto-1.0.6-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4-testing.eb b/easybuild/easyconfigs/__archive__/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4-testing.eb
similarity index 100%
rename from easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4-testing.eb
rename to easybuild/easyconfigs/__archive__/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4-testing.eb
diff --git a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4.eb b/easybuild/easyconfigs/__archive__/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4.eb
similarity index 100%
rename from easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4.eb
rename to easybuild/easyconfigs/__archive__/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4.eb
diff --git a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/LAPACK/LAPACK-3.4.0-gompi-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gmpich-1.4.8.eb b/easybuild/easyconfigs/__archive__/l/LAPACK/LAPACK-3.4.2-gmpich-1.4.8.eb
similarity index 100%
rename from easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gmpich-1.4.8.eb
rename to easybuild/easyconfigs/__archive__/l/LAPACK/LAPACK-3.4.2-gmpich-1.4.8.eb
diff --git a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.3.12.eb b/easybuild/easyconfigs/__archive__/l/LAPACK/LAPACK-3.4.2-gompi-1.3.12.eb
similarity index 100%
rename from easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.3.12.eb
rename to easybuild/easyconfigs/__archive__/l/LAPACK/LAPACK-3.4.2-gompi-1.3.12.eb
diff --git a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.5.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/LAPACK/LAPACK-3.4.2-gompi-1.5.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.5.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/LAPACK/LAPACK-3.4.2-gompi-1.5.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.5.12.eb b/easybuild/easyconfigs/__archive__/l/LAPACK/LAPACK-3.4.2-gompi-1.5.12.eb
similarity index 100%
rename from easybuild/easyconfigs/l/LAPACK/LAPACK-3.4.2-gompi-1.5.12.eb
rename to easybuild/easyconfigs/__archive__/l/LAPACK/LAPACK-3.4.2-gompi-1.5.12.eb
diff --git a/easybuild/easyconfigs/l/LIBSVM/LIBSVM-3.17-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/LIBSVM/LIBSVM-3.17-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/LIBSVM/LIBSVM-3.17-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/LIBSVM/LIBSVM-3.17-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/LWM2/LWM2-1.1-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/LWM2/LWM2-1.1-gompi-1.4.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/l/LWM2/LWM2-1.1-gompi-1.4.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/LWM2/LWM2-1.1-gompi-1.4.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/l/LZO/LZO-2.06-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/LZO/LZO-2.06-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/l/LZO/LZO-2.06-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/LZO/LZO-2.06-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/l/LZO/LZO-2.06-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/l/LZO/LZO-2.06-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/l/LZO/LZO-2.06-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/l/LZO/LZO-2.06-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/l/LZO/LZO-2.06-ictce-5.1.1.eb b/easybuild/easyconfigs/__archive__/l/LZO/LZO-2.06-ictce-5.1.1.eb
similarity index 100%
rename from easybuild/easyconfigs/l/LZO/LZO-2.06-ictce-5.1.1.eb
rename to easybuild/easyconfigs/__archive__/l/LZO/LZO-2.06-ictce-5.1.1.eb
diff --git a/easybuild/easyconfigs/l/LibTIFF/LibTIFF-4.0.3-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/LibTIFF/LibTIFF-4.0.3-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/LibTIFF/LibTIFF-4.0.3-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/LibTIFF/LibTIFF-4.0.3-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-gmacml-1.7.0.eb b/easybuild/easyconfigs/__archive__/l/Libint/Libint-1.1.4-gmacml-1.7.0.eb
similarity index 100%
rename from easybuild/easyconfigs/l/Libint/Libint-1.1.4-gmacml-1.7.0.eb
rename to easybuild/easyconfigs/__archive__/l/Libint/Libint-1.1.4-gmacml-1.7.0.eb
diff --git a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/Libint/Libint-1.1.4-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/l/Libint/Libint-1.1.4-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/Libint/Libint-1.1.4-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/l/Libint/Libint-1.1.4-ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/l/Libint/Libint-1.1.4-ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/Libint/Libint-1.1.4-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/Libint/Libint-1.1.4-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-intel-para-2014.12.eb b/easybuild/easyconfigs/__archive__/l/Libint/Libint-1.1.4-intel-para-2014.12.eb
similarity index 100%
rename from easybuild/easyconfigs/l/Libint/Libint-1.1.4-intel-para-2014.12.eb
rename to easybuild/easyconfigs/__archive__/l/Libint/Libint-1.1.4-intel-para-2014.12.eb
diff --git a/easybuild/easyconfigs/l/Libint/Libint-2.0.3-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/Libint/Libint-2.0.3-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/Libint/Libint-2.0.3-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/Libint/Libint-2.0.3-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/lftp/lftp-4.4.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/lftp/lftp-4.4.1-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/l/lftp/lftp-4.4.1-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/lftp/lftp-4.4.1-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/libICE/libICE-1.0.8-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/libICE/libICE-1.0.8-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/libSM/libSM-1.2.1-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/libSM/libSM-1.2.1-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/libX11/libX11-1.6.1-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/libX11/libX11-1.6.1-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/libXau/libXau-1.0.8-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libXau/libXau-1.0.8-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/libXau/libXau-1.0.8-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/libXaw/libXaw-1.0.12-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libXaw/libXaw-1.0.12-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/libXaw/libXaw-1.0.12-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/libXext/libXext-1.3.2-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/libXext/libXext-1.3.2-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/libXfixes/libXfixes-5.0.1-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/libXfixes/libXfixes-5.0.1-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/libXi/libXi-1.7.2-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/libXi/libXi-1.7.2-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/libXmu/libXmu-1.1.2-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/libXmu/libXmu-1.1.2-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/libXp/libXp-1.0.2-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/libXp/libXp-1.0.2-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/libXpm/libXpm-3.5.11-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/libXpm/libXpm-3.5.11-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/libXt/libXt-1.1.4-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/libXt/libXt-1.1.4-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/libXtst/libXtst-1.2.2-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/libXtst/libXtst-1.2.2-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libXtst/libXtst-1.2.2-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/libXtst/libXtst-1.2.2-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/libctl/libctl-3.2.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/libctl/libctl-3.2.1-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libctl/libctl-3.2.1-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/libctl/libctl-3.2.1-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/l/libctl/libctl-3.2.1-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/l/libctl/libctl-3.2.1-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libctl/libctl-3.2.1-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/l/libctl/libctl-3.2.1-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/libdrm/libdrm-2.4.27-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/libdrm/libdrm-2.4.27-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/l/libdrm/libdrm-2.4.27-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/l/libdrm/libdrm-2.4.27-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/libdrm/libdrm-2.4.27-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/libdrm/libdrm-2.4.27-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-gmpolf-1.4.8.eb b/easybuild/easyconfigs/__archive__/l/libffi/libffi-3.0.11-gmpolf-1.4.8.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libffi/libffi-3.0.11-gmpolf-1.4.8.eb
rename to easybuild/easyconfigs/__archive__/l/libffi/libffi-3.0.11-gmpolf-1.4.8.eb
diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/libffi/libffi-3.0.11-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libffi/libffi-3.0.11-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/libffi/libffi-3.0.11-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/l/libffi/libffi-3.0.11-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libffi/libffi-3.0.11-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/l/libffi/libffi-3.0.11-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.13-gmpolf-1.4.8.eb b/easybuild/easyconfigs/__archive__/l/libffi/libffi-3.0.13-gmpolf-1.4.8.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libffi/libffi-3.0.13-gmpolf-1.4.8.eb
rename to easybuild/easyconfigs/__archive__/l/libffi/libffi-3.0.13-gmpolf-1.4.8.eb
diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.13-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/libffi/libffi-3.0.13-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libffi/libffi-3.0.13-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/libffi/libffi-3.0.13-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.13-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/libffi/libffi-3.0.13-gompi-1.4.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libffi/libffi-3.0.13-gompi-1.4.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/libffi/libffi-3.0.13-gompi-1.4.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/l/libffi/libffi-3.0.13-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/l/libffi/libffi-3.0.13-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/libffi/libffi-3.0.13-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libffi/libffi-3.0.13-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/libffi/libffi-3.0.13-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/libgtextutils/libgtextutils-0.6.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/libgtextutils/libgtextutils-0.6.1-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libgtextutils/libgtextutils-0.6.1-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/libgtextutils/libgtextutils-0.6.1-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/l/libgtextutils/libgtextutils-0.6.1-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/l/libgtextutils/libgtextutils-0.6.1-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libgtextutils/libgtextutils-0.6.1-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/l/libgtextutils/libgtextutils-0.6.1-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/l/libharu/libharu-2.2.0-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/libharu/libharu-2.2.0-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libharu/libharu-2.2.0-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/libharu/libharu-2.2.0-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/libidn/libidn-1.27-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/libidn/libidn-1.27-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libidn/libidn-1.27-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/libidn/libidn-1.27-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.0-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/libjpeg-turbo/libjpeg-turbo-1.3.0-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.0-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/libjpeg-turbo/libjpeg-turbo-1.3.0-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.1-ictce-6.3.5.eb b/easybuild/easyconfigs/__archive__/l/libjpeg-turbo/libjpeg-turbo-1.3.1-ictce-6.3.5.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.1-ictce-6.3.5.eb
rename to easybuild/easyconfigs/__archive__/l/libjpeg-turbo/libjpeg-turbo-1.3.1-ictce-6.3.5.eb
diff --git a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/libmatheval/libmatheval-1.1.8-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/libmatheval/libmatheval-1.1.8-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/l/libmatheval/libmatheval-1.1.8-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.8-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/l/libmatheval/libmatheval-1.1.8-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/libpciaccess/libpciaccess-0.13.1-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/libpciaccess/libpciaccess-0.13.1-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/l/libpciaccess/libpciaccess-0.13.1-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/l/libpciaccess/libpciaccess-0.13.1-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/libpciaccess/libpciaccess-0.13.1-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/libpciaccess/libpciaccess-0.13.1-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.5.10-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/libpng/libpng-1.5.10-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libpng/libpng-1.5.10-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/libpng/libpng-1.5.10-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.5.10-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/l/libpng/libpng-1.5.10-ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libpng/libpng-1.5.10-ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/l/libpng/libpng-1.5.10-ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.5.10-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/l/libpng/libpng-1.5.10-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libpng/libpng-1.5.10-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/l/libpng/libpng-1.5.10-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.5.11-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/libpng/libpng-1.5.11-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libpng/libpng-1.5.11-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/libpng/libpng-1.5.11-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.5.11-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/l/libpng/libpng-1.5.11-ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libpng/libpng-1.5.11-ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/l/libpng/libpng-1.5.11-ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.5.11-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/l/libpng/libpng-1.5.11-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libpng/libpng-1.5.11-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/l/libpng/libpng-1.5.11-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.5.13-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/libpng/libpng-1.5.13-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libpng/libpng-1.5.13-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/libpng/libpng-1.5.13-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.5.13-ictce-4.0.10.eb b/easybuild/easyconfigs/__archive__/l/libpng/libpng-1.5.13-ictce-4.0.10.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libpng/libpng-1.5.13-ictce-4.0.10.eb
rename to easybuild/easyconfigs/__archive__/l/libpng/libpng-1.5.13-ictce-4.0.10.eb
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.5.13-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/l/libpng/libpng-1.5.13-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libpng/libpng-1.5.13-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/l/libpng/libpng-1.5.13-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.5.13-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/libpng/libpng-1.5.13-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libpng/libpng-1.5.13-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/libpng/libpng-1.5.13-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.5.14-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/libpng/libpng-1.5.14-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libpng/libpng-1.5.14-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/libpng/libpng-1.5.14-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.5.14-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/l/libpng/libpng-1.5.14-ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libpng/libpng-1.5.14-ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/l/libpng/libpng-1.5.14-ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.5.14-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/libpng/libpng-1.5.14-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libpng/libpng-1.5.14-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/libpng/libpng-1.5.14-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.5.14-iqacml-3.7.3.eb b/easybuild/easyconfigs/__archive__/l/libpng/libpng-1.5.14-iqacml-3.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libpng/libpng-1.5.14-iqacml-3.7.3.eb
rename to easybuild/easyconfigs/__archive__/l/libpng/libpng-1.5.14-iqacml-3.7.3.eb
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.6.12-ictce-6.3.5.eb b/easybuild/easyconfigs/__archive__/l/libpng/libpng-1.6.12-ictce-6.3.5.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libpng/libpng-1.6.12-ictce-6.3.5.eb
rename to easybuild/easyconfigs/__archive__/l/libpng/libpng-1.6.12-ictce-6.3.5.eb
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.6.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/libpng/libpng-1.6.2-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libpng/libpng-1.6.2-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/libpng/libpng-1.6.2-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.6.2-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/l/libpng/libpng-1.6.2-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libpng/libpng-1.6.2-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/l/libpng/libpng-1.6.2-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.6.2-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/libpng/libpng-1.6.2-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libpng/libpng-1.6.2-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/libpng/libpng-1.6.2-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.6.3-ictce-4.1.13-zlib-1.2.8.eb b/easybuild/easyconfigs/__archive__/l/libpng/libpng-1.6.3-ictce-4.1.13-zlib-1.2.8.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libpng/libpng-1.6.3-ictce-4.1.13-zlib-1.2.8.eb
rename to easybuild/easyconfigs/__archive__/l/libpng/libpng-1.6.3-ictce-4.1.13-zlib-1.2.8.eb
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.6.3-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/libpng/libpng-1.6.3-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libpng/libpng-1.6.3-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/libpng/libpng-1.6.3-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/libpng/libpng-1.6.6-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libpng/libpng-1.6.6-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/libpng/libpng-1.6.6-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/libpthread-stubs/libpthread-stubs-0.3-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/libpthread-stubs/libpthread-stubs-0.3-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/l/libpthread-stubs/libpthread-stubs-0.3-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/l/libpthread-stubs/libpthread-stubs-0.3-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/libpthread-stubs/libpthread-stubs-0.3-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/libpthread-stubs/libpthread-stubs-0.3-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/__archive__/l/libreadline/libreadline-6.2-cgmpolf-1.1.6.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmpolf-1.1.6.eb
rename to easybuild/easyconfigs/__archive__/l/libreadline/libreadline-6.2-cgmpolf-1.1.6.eb
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/__archive__/l/libreadline/libreadline-6.2-cgmvolf-1.1.12rc1.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.1.12rc1.eb
rename to easybuild/easyconfigs/__archive__/l/libreadline/libreadline-6.2-cgmvolf-1.1.12rc1.eb
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.2.7.eb b/easybuild/easyconfigs/__archive__/l/libreadline/libreadline-6.2-cgmvolf-1.2.7.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.2.7.eb
rename to easybuild/easyconfigs/__archive__/l/libreadline/libreadline-6.2-cgmvolf-1.2.7.eb
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgoolf-1.1.7.eb b/easybuild/easyconfigs/__archive__/l/libreadline/libreadline-6.2-cgoolf-1.1.7.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgoolf-1.1.7.eb
rename to easybuild/easyconfigs/__archive__/l/libreadline/libreadline-6.2-cgoolf-1.1.7.eb
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb b/easybuild/easyconfigs/__archive__/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb
rename to easybuild/easyconfigs/__archive__/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12.eb b/easybuild/easyconfigs/__archive__/l/libreadline/libreadline-6.2-gmvolf-1.7.12.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12.eb
rename to easybuild/easyconfigs/__archive__/l/libreadline/libreadline-6.2-gmvolf-1.7.12.eb
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/__archive__/l/libreadline/libreadline-6.2-gmvolf-1.7.12rc1.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12rc1.eb
rename to easybuild/easyconfigs/__archive__/l/libreadline/libreadline-6.2-gmvolf-1.7.12rc1.eb
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.10.eb b/easybuild/easyconfigs/__archive__/l/libreadline/libreadline-6.2-ictce-4.0.10.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.10.eb
rename to easybuild/easyconfigs/__archive__/l/libreadline/libreadline-6.2-ictce-4.0.10.eb
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/l/libreadline/libreadline-6.2-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/l/libreadline/libreadline-6.2-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/libreadline/libreadline-6.2-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/libreadline/libreadline-6.2-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iomkl-4.6.13.eb b/easybuild/easyconfigs/__archive__/l/libreadline/libreadline-6.2-iomkl-4.6.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libreadline/libreadline-6.2-iomkl-4.6.13.eb
rename to easybuild/easyconfigs/__archive__/l/libreadline/libreadline-6.2-iomkl-4.6.13.eb
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-3.7.3.eb b/easybuild/easyconfigs/__archive__/l/libreadline/libreadline-6.2-iqacml-3.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-3.7.3.eb
rename to easybuild/easyconfigs/__archive__/l/libreadline/libreadline-6.2-iqacml-3.7.3.eb
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-4.4.13.eb b/easybuild/easyconfigs/__archive__/l/libreadline/libreadline-6.2-iqacml-4.4.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-4.4.13.eb
rename to easybuild/easyconfigs/__archive__/l/libreadline/libreadline-6.2-iqacml-4.4.13.eb
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-ictce-6.3.5.eb b/easybuild/easyconfigs/__archive__/l/libreadline/libreadline-6.3-ictce-6.3.5.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libreadline/libreadline-6.3-ictce-6.3.5.eb
rename to easybuild/easyconfigs/__archive__/l/libreadline/libreadline-6.3-ictce-6.3.5.eb
diff --git a/easybuild/easyconfigs/l/libsmm/libsmm-20111205-gmacml-1.7.0.eb b/easybuild/easyconfigs/__archive__/l/libsmm/libsmm-20111205-gmacml-1.7.0.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libsmm/libsmm-20111205-gmacml-1.7.0.eb
rename to easybuild/easyconfigs/__archive__/l/libsmm/libsmm-20111205-gmacml-1.7.0.eb
diff --git a/easybuild/easyconfigs/l/libsmm/libsmm-20111205-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/libsmm/libsmm-20111205-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libsmm/libsmm-20111205-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/libsmm/libsmm-20111205-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/libtool/libtool-2.4.2-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libtool/libtool-2.4.2-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/libtool/libtool-2.4.2-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/l/libtool/libtool-2.4.2-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/l/libtool/libtool-2.4.2-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/libtool/libtool-2.4.2-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/libtool/libtool-2.4.2-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/libunistring/libunistring-0.9.3-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/libunistring/libunistring-0.9.3-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/l/libunistring/libunistring-0.9.3-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/l/libunistring/libunistring-0.9.3-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/l/libunwind/libunwind-1.1-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/libunwind/libunwind-1.1-gompi-1.4.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libunwind/libunwind-1.1-gompi-1.4.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/libunwind/libunwind-1.1-gompi-1.4.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/l/libxc/libxc-2.0.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/libxc/libxc-2.0.1-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libxc/libxc-2.0.1-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/libxc/libxc-2.0.1-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/l/libxc/libxc-2.0.1-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/libxc/libxc-2.0.1-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libxc/libxc-2.0.1-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/libxc/libxc-2.0.1-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/libxc/libxc-2.0.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/libxc/libxc-2.0.2-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libxc/libxc-2.0.2-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/libxc/libxc-2.0.2-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/l/libxc/libxc-2.0.2-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/libxc/libxc-2.0.2-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libxc/libxc-2.0.2-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/libxc/libxc-2.0.2-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/libxc/libxc-2.0.3-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/libxc/libxc-2.0.3-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libxc/libxc-2.0.3-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/libxc/libxc-2.0.3-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/libxc/libxc-2.2.1-intel-para-2014.12.eb b/easybuild/easyconfigs/__archive__/l/libxc/libxc-2.2.1-intel-para-2014.12.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libxc/libxc-2.2.1-intel-para-2014.12.eb
rename to easybuild/easyconfigs/__archive__/l/libxc/libxc-2.2.1-intel-para-2014.12.eb
diff --git a/easybuild/easyconfigs/l/libxcb/libxcb-1.8-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/l/libxcb/libxcb-1.8-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libxcb/libxcb-1.8-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/l/libxcb/libxcb-1.8-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/l/libxcb/libxcb-1.8-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/l/libxcb/libxcb-1.8-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libxcb/libxcb-1.8-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/l/libxcb/libxcb-1.8-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/l/libxcb/libxcb-1.8-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/l/libxcb/libxcb-1.8-ictce-4.1.13-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libxcb/libxcb-1.8-ictce-4.1.13-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/l/libxcb/libxcb-1.8-ictce-4.1.13-Python-2.7.3.eb
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/__archive__/l/libxml2/libxml2-2.8.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 54%
rename from easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.8.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index e98bac6018d8b2d18206da236d52f016c17c24fa..61ac8b0f98ec8d7dfff34222c0ec3cc9622150ed 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.8.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -1,5 +1,6 @@
 name = 'libxml2'
 version = '2.8.0'
+versionsuffix = '-Python-%(pyver)s'
 
 homepage = 'http://xmlsoft.org/'
 description = """Libxml2 is the XML C parser and toolchain developed for the Gnome project (but usable
@@ -14,20 +15,9 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB'
-
-pythonver = '2.7.3'
-pythonshortver = '.'.join(pythonver.split('.')[0:2])
-versionsuffix = '-%s-%s' % ('Python', pythonver)
-
 dependencies = [
     ('zlib', '1.2.7'),
-    ('Python', pythonver),
+    ('Python', '2.7.3'),
 ]
 
-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.8.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.8.0-goalf-1.1.0-no-OFED.eb
similarity index 60%
rename from easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.8.0-goalf-1.1.0-no-OFED.eb
index 4a4a4816ab2e8285a429accaf788d3b62c0090a9..b5be030eb8f85a648cb8982246c5bb2ea78c89af 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.8.0-goalf-1.1.0-no-OFED.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.8.0'
 
@@ -16,13 +14,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 dependencies = [('zlib', '1.2.7')]
 
-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.8.0-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.8.0-ictce-4.0.6-Python-2.7.3.eb
similarity index 53%
rename from easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.8.0-ictce-4.0.6-Python-2.7.3.eb
index b82e8e6c939dd27f6797f6fc9bc243ce463660db..541f5b23a744b4129da041ea4fc9f8b706631e04 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.8.0-ictce-4.0.6-Python-2.7.3.eb
@@ -1,5 +1,6 @@
 name = 'libxml2'
 version = '2.8.0'
+versionsuffix = '-Python-%(pyver)s'
 
 homepage = 'http://xmlsoft.org/'
 description = """Libxml2 is the XML C parser and toolchain developed for the Gnome project (but usable
@@ -14,20 +15,9 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB'
-
-pythonver = '2.7.3'
-pythonshortver = '.'.join(pythonver.split('.')[0:2])
-versionsuffix = '-%s-%s' % ('Python', pythonver)
-
 dependencies = [
     ('zlib', '1.2.7'),
-    ('Python', pythonver),
+    ('Python', '2.7.3'),
 ]
 
-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.8.0-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.8.0-ictce-4.0.6.eb
similarity index 60%
rename from easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.8.0-ictce-4.0.6.eb
index 91e1ffbc9cf78ac331e8e58b273a81ba7b6292a6..e30ea6f81026b2e59d02759db99415f8cb436d48 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.8.0-ictce-4.0.6.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.8.0'
 
@@ -16,13 +14,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 dependencies = [('zlib', '1.2.7')]
 
-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.8.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.8.0-ictce-4.1.13-Python-2.7.3.eb
similarity index 53%
rename from easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-4.1.13-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.8.0-ictce-4.1.13-Python-2.7.3.eb
index 31e824b5ea47acbaa1108c2d55569539d9a1a051..a089a50337ee911ab26e0ee38cfb544c9a22bd20 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-4.1.13-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.8.0-ictce-4.1.13-Python-2.7.3.eb
@@ -1,5 +1,6 @@
 name = 'libxml2'
 version = '2.8.0'
+versionsuffix = '-Python-%(pyver)s'
 
 homepage = 'http://xmlsoft.org/'
 description = """Libxml2 is the XML C parser and toolchain developed for the Gnome project (but usable
@@ -14,20 +15,9 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB'
-
-pythonver = '2.7.3'
-pythonshortver = '.'.join(pythonver.split('.')[0:2])
-versionsuffix = '-%s-%s' % ('Python', pythonver)
-
 dependencies = [
     ('zlib', '1.2.7'),
-    ('Python', pythonver),
+    ('Python', '2.7.3'),
 ]
 
-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.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.9.0-goalf-1.1.0-no-OFED.eb
similarity index 60%
rename from easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.9.0-goalf-1.1.0-no-OFED.eb
index 0567c075f0559a02c44f88d45f7cba387fc5f747..d27cd00a3d66f7377005907deaf21b4ea0eb72ea 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.9.0-goalf-1.1.0-no-OFED.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.0'
 
@@ -16,13 +14,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 dependencies = [('zlib', '1.2.7')]
 
-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.0-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.9.0-ictce-4.0.6.eb
similarity index 60%
rename from easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.9.0-ictce-4.0.6.eb
index 06cdc26c7679d6dfc012fc3f827214ac9702c50a..7012fe4e03955bfc329e71343462ac1f7aa0d96a 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.9.0-ictce-4.0.6.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.0'
 
@@ -16,13 +14,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 dependencies = [('zlib', '1.2.7')]
 
-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.0-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.9.0-ictce-4.1.13.eb
similarity index 60%
rename from easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.9.0-ictce-4.1.13.eb
index 3042a3cf37e83d5e1ec178f26e4a0c42bd539b99..c071752aa8d7a4ce88505a4d13bc55b9dfaf7c12 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.9.0-ictce-4.1.13.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.0'
 
@@ -16,13 +14,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 dependencies = [('zlib', '1.2.7')]
 
-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.1-gmpolf-1.4.8.eb b/easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.9.1-gmpolf-1.4.8.eb
similarity index 60%
rename from easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-gmpolf-1.4.8.eb
rename to easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.9.1-gmpolf-1.4.8.eb
index 33b6562e0fa336106df8fbd81e6b9f53227a9865..dacb6f49dad6dbb971002ebf54c2dd5bc180447c 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-gmpolf-1.4.8.eb
+++ b/easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.9.1-gmpolf-1.4.8.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.1'
 
@@ -16,13 +14,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 dependencies = [('zlib', '1.2.7')]
 
-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.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.9.1-goalf-1.1.0-no-OFED.eb
similarity index 60%
rename from easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.9.1-goalf-1.1.0-no-OFED.eb
index e44ddd0d64ca5a953af7c2db67ae22180df00cad..db9d8e9f002bd6684b47b6fcf7e13d01e157cb25 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.9.1-goalf-1.1.0-no-OFED.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.1'
 
@@ -16,13 +14,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 dependencies = [('zlib', '1.2.7')]
 
-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.1-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.9.1-goalf-1.5.12-no-OFED.eb
similarity index 60%
rename from easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goalf-1.5.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.9.1-goalf-1.5.12-no-OFED.eb
index 90b9bc8ea55a69d96978c8aeea8fe38b0163cec1..fe5357a0ea306e059f7a9b702ef0e61de0d2bab4 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goalf-1.5.12-no-OFED.eb
+++ b/easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.9.1-goalf-1.5.12-no-OFED.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.1'
 
@@ -16,13 +14,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 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.1-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.9.1-gompi-1.4.12-no-OFED.eb
similarity index 60%
rename from easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-gompi-1.4.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.9.1-gompi-1.4.12-no-OFED.eb
index 487bf333ac32b6b12eb55d846e3619b50562435b..3549a115036daf0051c74924a483e4959065fbc5 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-gompi-1.4.12-no-OFED.eb
+++ b/easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.9.1-gompi-1.4.12-no-OFED.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.1'
 
@@ -16,13 +14,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 dependencies = [('zlib', '1.2.7')]
 
-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.1-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.9.1-ictce-4.0.6.eb
similarity index 60%
rename from easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.9.1-ictce-4.0.6.eb
index 3e1cc777901a9cc7426ec2e6fb60fba31a39bff0..49bef39036d17e3ebf0b2ebc7d0ed23a6933d512 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.9.1-ictce-4.0.6.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.1'
 
@@ -16,13 +14,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 dependencies = [('zlib', '1.2.7')]
 
-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.1-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.9.1-ictce-4.1.13.eb
similarity index 60%
rename from easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.9.1-ictce-4.1.13.eb
index 5da629883240603b8ec01e430b14bc98e9c84afd..bbaaf19893231b652288e514831694b4294b7bba 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/__archive__/l/libxml2/libxml2-2.9.1-ictce-4.1.13.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.1'
 
@@ -16,13 +14,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 dependencies = [('zlib', '1.2.7')]
 
-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/libxslt/libxslt-1.1.28-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/libxslt/libxslt-1.1.28-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libxslt/libxslt-1.1.28-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/libxslt/libxslt-1.1.28-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/l/libxslt/libxslt-1.1.28-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/l/libxslt/libxslt-1.1.28-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libxslt/libxslt-1.1.28-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/l/libxslt/libxslt-1.1.28-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/l/libxslt/libxslt-1.1.28-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/libxslt/libxslt-1.1.28-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libxslt/libxslt-1.1.28-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/libxslt/libxslt-1.1.28-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/libyaml/libyaml-0.1.4-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/libyaml/libyaml-0.1.4-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/l/libyaml/libyaml-0.1.4-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/libyaml/libyaml-0.1.4-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/l/likwid/likwid-3.0.0-goalf-1.1.0-no-OFED-pinomp.eb b/easybuild/easyconfigs/__archive__/l/likwid/likwid-3.0.0-goalf-1.1.0-no-OFED-pinomp.eb
similarity index 100%
rename from easybuild/easyconfigs/l/likwid/likwid-3.0.0-goalf-1.1.0-no-OFED-pinomp.eb
rename to easybuild/easyconfigs/__archive__/l/likwid/likwid-3.0.0-goalf-1.1.0-no-OFED-pinomp.eb
diff --git a/easybuild/easyconfigs/l/likwid/likwid-3.0.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/l/likwid/likwid-3.0.0-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/l/likwid/likwid-3.0.0-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/l/likwid/likwid-3.0.0-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-4.1.13-pinomp.eb b/easybuild/easyconfigs/__archive__/l/likwid/likwid-3.0.0-ictce-4.1.13-pinomp.eb
similarity index 100%
rename from easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-4.1.13-pinomp.eb
rename to easybuild/easyconfigs/__archive__/l/likwid/likwid-3.0.0-ictce-4.1.13-pinomp.eb
diff --git a/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/likwid/likwid-3.0.0-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/likwid/likwid-3.0.0-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/likwid/likwid-4.0.1-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/likwid/likwid-4.0.1-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/likwid/likwid-4.0.1-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/likwid/likwid-4.0.1-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/l/lynx/lynx-2.8.7-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/l/lynx/lynx-2.8.7-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/l/lynx/lynx-2.8.7-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/l/lynx/lynx-2.8.7-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-ClangGCC-1.1.3.eb b/easybuild/easyconfigs/__archive__/m/M4/M4-1.4.16-ClangGCC-1.1.3.eb
similarity index 100%
rename from easybuild/easyconfigs/m/M4/M4-1.4.16-ClangGCC-1.1.3.eb
rename to easybuild/easyconfigs/__archive__/m/M4/M4-1.4.16-ClangGCC-1.1.3.eb
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-ClangGCC-1.2.3.eb b/easybuild/easyconfigs/__archive__/m/M4/M4-1.4.16-ClangGCC-1.2.3.eb
similarity index 100%
rename from easybuild/easyconfigs/m/M4/M4-1.4.16-ClangGCC-1.2.3.eb
rename to easybuild/easyconfigs/__archive__/m/M4/M4-1.4.16-ClangGCC-1.2.3.eb
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-gcccuda-2.6.10.eb b/easybuild/easyconfigs/__archive__/m/M4/M4-1.4.16-gcccuda-2.6.10.eb
similarity index 100%
rename from easybuild/easyconfigs/m/M4/M4-1.4.16-gcccuda-2.6.10.eb
rename to easybuild/easyconfigs/__archive__/m/M4/M4-1.4.16-gcccuda-2.6.10.eb
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-gmacml-1.7.0.eb b/easybuild/easyconfigs/__archive__/m/M4/M4-1.4.16-gmacml-1.7.0.eb
similarity index 100%
rename from easybuild/easyconfigs/m/M4/M4-1.4.16-gmacml-1.7.0.eb
rename to easybuild/easyconfigs/__archive__/m/M4/M4-1.4.16-gmacml-1.7.0.eb
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/m/M4/M4-1.4.16-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/m/M4/M4-1.4.16-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/m/M4/M4-1.4.16-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-iccifort-2011.13.367.eb b/easybuild/easyconfigs/__archive__/m/M4/M4-1.4.16-iccifort-2011.13.367.eb
similarity index 100%
rename from easybuild/easyconfigs/m/M4/M4-1.4.16-iccifort-2011.13.367.eb
rename to easybuild/easyconfigs/__archive__/m/M4/M4-1.4.16-iccifort-2011.13.367.eb
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/m/M4/M4-1.4.16-ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/m/M4/M4-1.4.16-ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/m/M4/M4-1.4.16-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/m/M4/M4-1.4.16-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/m/M4/M4-1.4.16-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/m/M4/M4-1.4.16-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/m/M4/M4-1.4.16-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-iqacml-3.7.3.eb b/easybuild/easyconfigs/__archive__/m/M4/M4-1.4.16-iqacml-3.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/m/M4/M4-1.4.16-iqacml-3.7.3.eb
rename to easybuild/easyconfigs/__archive__/m/M4/M4-1.4.16-iqacml-3.7.3.eb
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-para-2014.12.eb b/easybuild/easyconfigs/__archive__/m/M4/M4-1.4.17-intel-para-2014.12.eb
similarity index 83%
rename from easybuild/easyconfigs/m/M4/M4-1.4.17-intel-para-2014.12.eb
rename to easybuild/easyconfigs/__archive__/m/M4/M4-1.4.17-intel-para-2014.12.eb
index 104ad6a3bde2127f348767ec3b8b17b37dbb88fa..cda9d848b716bd766ef479b3582168ac7ceef36a 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-para-2014.12.eb
+++ b/easybuild/easyconfigs/__archive__/m/M4/M4-1.4.17-intel-para-2014.12.eb
@@ -13,6 +13,8 @@ toolchain = {'name': 'intel-para', 'version': '2014.12'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
 configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/m/MCL/MCL-12.135-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/m/MCL/MCL-12.135-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/m/MCL/MCL-12.135-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/m/MCL/MCL-12.135-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/m/MCL/MCL-12.135-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/m/MCL/MCL-12.135-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/m/MCL/MCL-12.135-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/m/MCL/MCL-12.135-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/m/MCL/MCL-12.135-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/m/MCL/MCL-12.135-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/m/MCL/MCL-12.135-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/m/MCL/MCL-12.135-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/m/MDP/MDP-3.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/m/MDP/MDP-3.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/m/MDP/MDP-3.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/m/MDP/MDP-3.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/m/MDP/MDP-3.3-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/m/MDP/MDP-3.3-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/m/MDP/MDP-3.3-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/m/MDP/MDP-3.3-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/m/MEME/MEME-4.8.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/m/MEME/MEME-4.8.0-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/m/MEME/MEME-4.8.0-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/m/MEME/MEME-4.8.0-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/m/MEME/MEME-4.8.0-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/m/MEME/MEME-4.8.0-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/m/MEME/MEME-4.8.0-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/m/MEME/MEME-4.8.0-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/m/METIS/METIS-4.0.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/m/METIS/METIS-4.0.1-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/m/METIS/METIS-4.0.1-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/m/METIS/METIS-4.0.1-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/m/METIS/METIS-4.0.1-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/m/METIS/METIS-4.0.1-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/m/METIS/METIS-4.0.1-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/m/METIS/METIS-4.0.1-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/m/METIS/METIS-4.0.3-gmpolf-1.4.8.eb b/easybuild/easyconfigs/__archive__/m/METIS/METIS-4.0.3-gmpolf-1.4.8.eb
similarity index 100%
rename from easybuild/easyconfigs/m/METIS/METIS-4.0.3-gmpolf-1.4.8.eb
rename to easybuild/easyconfigs/__archive__/m/METIS/METIS-4.0.3-gmpolf-1.4.8.eb
diff --git a/easybuild/easyconfigs/m/METIS/METIS-4.0.3-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/m/METIS/METIS-4.0.3-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/m/METIS/METIS-4.0.3-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/m/METIS/METIS-4.0.3-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/m/METIS/METIS-5.0.2-gmpolf-1.4.8.eb b/easybuild/easyconfigs/__archive__/m/METIS/METIS-5.0.2-gmpolf-1.4.8.eb
similarity index 100%
rename from easybuild/easyconfigs/m/METIS/METIS-5.0.2-gmpolf-1.4.8.eb
rename to easybuild/easyconfigs/__archive__/m/METIS/METIS-5.0.2-gmpolf-1.4.8.eb
diff --git a/easybuild/easyconfigs/m/METIS/METIS-5.0.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/m/METIS/METIS-5.0.2-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/m/METIS/METIS-5.0.2-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/m/METIS/METIS-5.0.2-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/m/METIS/METIS-5.0.2-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/m/METIS/METIS-5.0.2-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/m/METIS/METIS-5.0.2-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/m/METIS/METIS-5.0.2-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/m/METIS/METIS-5.0.2-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/m/METIS/METIS-5.0.2-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/m/METIS/METIS-5.0.2-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/m/METIS/METIS-5.0.2-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/m/METIS/METIS-5.1.0-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/m/METIS/METIS-5.1.0-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/m/METIS/METIS-5.1.0-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/m/METIS/METIS-5.1.0-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/m/MPFR/MPFR-3.1.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/m/MPFR/MPFR-3.1.0-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/m/MPFR/MPFR-3.1.0-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/m/MPFR/MPFR-3.1.0-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/m/MPFR/MPFR-3.1.0-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/m/MPFR/MPFR-3.1.0-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/m/MPFR/MPFR-3.1.0-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/m/MPFR/MPFR-3.1.0-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/m/MPICH/MPICH-3.0.3-ClangGCC-1.1.3.eb b/easybuild/easyconfigs/__archive__/m/MPICH/MPICH-3.0.3-ClangGCC-1.1.3.eb
similarity index 100%
rename from easybuild/easyconfigs/m/MPICH/MPICH-3.0.3-ClangGCC-1.1.3.eb
rename to easybuild/easyconfigs/__archive__/m/MPICH/MPICH-3.0.3-ClangGCC-1.1.3.eb
diff --git a/easybuild/easyconfigs/m/MUMPS/MUMPS-4.10.0-gmpolf-1.4.8-metis.eb b/easybuild/easyconfigs/__archive__/m/MUMPS/MUMPS-4.10.0-gmpolf-1.4.8-metis.eb
similarity index 100%
rename from easybuild/easyconfigs/m/MUMPS/MUMPS-4.10.0-gmpolf-1.4.8-metis.eb
rename to easybuild/easyconfigs/__archive__/m/MUMPS/MUMPS-4.10.0-gmpolf-1.4.8-metis.eb
diff --git a/easybuild/easyconfigs/m/MUMPS/MUMPS-4.10.0-ictce-4.1.13-metis.eb b/easybuild/easyconfigs/__archive__/m/MUMPS/MUMPS-4.10.0-ictce-4.1.13-metis.eb
similarity index 100%
rename from easybuild/easyconfigs/m/MUMPS/MUMPS-4.10.0-ictce-4.1.13-metis.eb
rename to easybuild/easyconfigs/__archive__/m/MUMPS/MUMPS-4.10.0-ictce-4.1.13-metis.eb
diff --git a/easybuild/easyconfigs/m/MUMPS/MUMPS-4.10.0-ictce-4.1.13-parmetis.eb b/easybuild/easyconfigs/__archive__/m/MUMPS/MUMPS-4.10.0-ictce-4.1.13-parmetis.eb
similarity index 100%
rename from easybuild/easyconfigs/m/MUMPS/MUMPS-4.10.0-ictce-4.1.13-parmetis.eb
rename to easybuild/easyconfigs/__archive__/m/MUMPS/MUMPS-4.10.0-ictce-4.1.13-parmetis.eb
diff --git a/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/m/MUMmer/MUMmer-3.23-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/m/MUMmer/MUMmer-3.23-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/m/MUMmer/MUMmer-3.23-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/m/MUMmer/MUMmer-3.23-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-4.1.13-Perl-5.16.3.eb b/easybuild/easyconfigs/__archive__/m/MUMmer/MUMmer-3.23-ictce-4.1.13-Perl-5.16.3.eb
similarity index 100%
rename from easybuild/easyconfigs/m/MUMmer/MUMmer-3.23-ictce-4.1.13-Perl-5.16.3.eb
rename to easybuild/easyconfigs/__archive__/m/MUMmer/MUMmer-3.23-ictce-4.1.13-Perl-5.16.3.eb
diff --git a/easybuild/easyconfigs/m/MUST/MUST-1.2.0-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/m/MUST/MUST-1.2.0-gompi-1.4.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/m/MUST/MUST-1.2.0-gompi-1.4.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/m/MUST/MUST-1.2.0-gompi-1.4.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-ClangGCC-1.1.3.eb b/easybuild/easyconfigs/__archive__/m/MVAPICH2/MVAPICH2-1.9-ClangGCC-1.1.3.eb
similarity index 100%
rename from easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-ClangGCC-1.1.3.eb
rename to easybuild/easyconfigs/__archive__/m/MVAPICH2/MVAPICH2-1.9-ClangGCC-1.1.3.eb
diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-ClangGCC-1.2.3.eb b/easybuild/easyconfigs/__archive__/m/MVAPICH2/MVAPICH2-1.9-ClangGCC-1.2.3.eb
similarity index 100%
rename from easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-ClangGCC-1.2.3.eb
rename to easybuild/easyconfigs/__archive__/m/MVAPICH2/MVAPICH2-1.9-ClangGCC-1.2.3.eb
diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-iccifort-2011.13.367.eb b/easybuild/easyconfigs/__archive__/m/MVAPICH2/MVAPICH2-1.9-iccifort-2011.13.367.eb
similarity index 100%
rename from easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-iccifort-2011.13.367.eb
rename to easybuild/easyconfigs/__archive__/m/MVAPICH2/MVAPICH2-1.9-iccifort-2011.13.367.eb
diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9rc1-ClangGCC-1.1.3.eb b/easybuild/easyconfigs/__archive__/m/MVAPICH2/MVAPICH2-1.9rc1-ClangGCC-1.1.3.eb
similarity index 100%
rename from easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9rc1-ClangGCC-1.1.3.eb
rename to easybuild/easyconfigs/__archive__/m/MVAPICH2/MVAPICH2-1.9rc1-ClangGCC-1.1.3.eb
diff --git a/easybuild/easyconfigs/m/MariaDB/MariaDB-5.5.29-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/m/MariaDB/MariaDB-5.5.29-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/m/MariaDB/MariaDB-5.5.29-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/m/MariaDB/MariaDB-5.5.29-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/m/Meep/Meep-1.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/m/Meep/Meep-1.2-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/m/Meep/Meep-1.2-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/m/Meep/Meep-1.2-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/m/Meep/Meep-1.2-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/m/Meep/Meep-1.2-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/m/Meep/Meep-1.2-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/m/Meep/Meep-1.2-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/m/Mercurial/Mercurial-2.3.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/m/Mercurial/Mercurial-2.3.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/m/Mercurial/Mercurial-2.3.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/m/Mercurial/Mercurial-2.3.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/m/Mercurial/Mercurial-2.3.2-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/m/Mercurial/Mercurial-2.3.2-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/m/Mercurial/Mercurial-2.3.2-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/m/Mercurial/Mercurial-2.3.2-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/m/Mercurial/Mercurial-2.5.2-cgmpolf-1.1.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/m/Mercurial/Mercurial-2.5.2-cgmpolf-1.1.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/m/Mercurial/Mercurial-2.5.2-cgmpolf-1.1.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/m/Mercurial/Mercurial-2.5.2-cgmpolf-1.1.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/m/Mercurial/Mercurial-2.5.2-cgmvolf-1.1.12rc1-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/m/Mercurial/Mercurial-2.5.2-cgmvolf-1.1.12rc1-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/m/Mercurial/Mercurial-2.5.2-cgmvolf-1.1.12rc1-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/m/Mercurial/Mercurial-2.5.2-cgmvolf-1.1.12rc1-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/m/Mercurial/Mercurial-2.5.2-cgmvolf-1.2.7-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/m/Mercurial/Mercurial-2.5.2-cgmvolf-1.2.7-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/m/Mercurial/Mercurial-2.5.2-cgmvolf-1.2.7-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/m/Mercurial/Mercurial-2.5.2-cgmvolf-1.2.7-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/m/Mercurial/Mercurial-2.5.2-cgoolf-1.1.7-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/m/Mercurial/Mercurial-2.5.2-cgoolf-1.1.7-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/m/Mercurial/Mercurial-2.5.2-cgoolf-1.1.7-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/m/Mercurial/Mercurial-2.5.2-cgoolf-1.1.7-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/m/Mercurial/Mercurial-2.5.2-gmvolf-1.7.12-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/m/Mercurial/Mercurial-2.5.2-gmvolf-1.7.12-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/m/Mercurial/Mercurial-2.5.2-gmvolf-1.7.12-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/m/Mercurial/Mercurial-2.5.2-gmvolf-1.7.12-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/m/Mercurial/Mercurial-2.5.2-gmvolf-1.7.12rc1-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/m/Mercurial/Mercurial-2.5.2-gmvolf-1.7.12rc1-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/m/Mercurial/Mercurial-2.5.2-gmvolf-1.7.12rc1-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/m/Mercurial/Mercurial-2.5.2-gmvolf-1.7.12rc1-Python-2.7.3.eb
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/__archive__/m/Mesa/Mesa-7.11.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/m/Mesa/Mesa-7.11.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/m/Mesa/Mesa-7.11.2-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/m/Mesa/Mesa-7.11.2-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/m/Mesa/Mesa-7.11.2-ictce-4.1.13-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-4.1.13-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/m/Mesa/Mesa-7.11.2-ictce-4.1.13-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/m/Mesquite/Mesquite-2.3.0-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/m/Mesquite/Mesquite-2.3.0-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/m/Mesquite/Mesquite-2.3.0-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/m/Mesquite/Mesquite-2.3.0-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/m/MetaVelvet/MetaVelvet-1.2.01-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/m/MetaVelvet/MetaVelvet-1.2.01-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/m/MetaVelvet/MetaVelvet-1.2.01-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/m/MetaVelvet/MetaVelvet-1.2.01-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/m/MetaVelvet/MetaVelvet-1.2.01-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/m/Molden/Molden-5.0-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/m/Molden/Molden-5.0-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/m/Molden/Molden-5.0-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/m/Molden/Molden-5.0-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/__archive__/m/Mono/Mono-2.10.6-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/m/Mono/Mono-2.10.6-ictce-4.1.13.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2971b15c539fff90c884dd0e901d7d48264cee69
--- /dev/null
+++ b/easybuild/easyconfigs/__archive__/m/Mono/Mono-2.10.6-ictce-4.1.13.eb
@@ -0,0 +1,28 @@
+name = 'Mono'
+version = '2.10.6'
+
+homepage = 'http://mono-framework.com' 
+description = """An open source, cross-platform, implementation of C# and the CLR that is
+ binary compatible with Microsoft.NET."""
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+
+# Mono required Mono to build, so there are a couple of options:
+# 1) provide Mono RPMs in sources, the Mono easyblock will use them to make a tmp Mono install
+# 2) assume a Mono version is available system-wide (assert using e.g. "osdependencies = ['mono-core']")
+# 3) specify an already available Mono module as build dep, e.g. "builddependencies = [('Mono', '2.10.6')]
+
+source_urls = ['http://download.mono-project.com/sources/mono/']
+sources = [
+    SOURCELOWER_TAR_BZ2,
+    # Mono requires Mono to build, so provide RPMs so Mono can be bootstrapped
+    'libgdiplus-2.4.2-2.el5.kb.x86_64.rpm',
+    'mono-core-2.4.2.3-2.el5.kb.x86_64.rpm',
+]
+
+builddependencies = [
+    ('Bison', '2.7'),
+    ('gettext', '0.18.2'),
+]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/m/Mothur/Mothur-1.30.2-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/m/Mothur/Mothur-1.30.2-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/m/Mothur/Mothur-1.30.2-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/m/Mothur/Mothur-1.30.2-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/m/MrBayes/MrBayes-3.1.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/m/MrBayes/MrBayes-3.1.2-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/m/MrBayes/MrBayes-3.1.2-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/m/MrBayes/MrBayes-3.1.2-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/m/MrBayes/MrBayes-3.1.2-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/m/MrBayes/MrBayes-3.1.2-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/m/MrBayes/MrBayes-3.1.2-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/m/MrBayes/MrBayes-3.1.2-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/m/MrBayes/MrBayes-3.2.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/m/MrBayes/MrBayes-3.2.0-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/m/MrBayes/MrBayes-3.2.0-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/m/MrBayes/MrBayes-3.2.0-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/m/MrBayes/MrBayes-3.2.0-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/m/MrBayes/MrBayes-3.2.0-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/m/MrBayes/MrBayes-3.2.0-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/m/MrBayes/MrBayes-3.2.0-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/__archive__/m/MyMediaLite/MyMediaLite-3.10-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/m/MyMediaLite/MyMediaLite-3.10-ictce-4.1.13.eb
new file mode 100644
index 0000000000000000000000000000000000000000..21917e5c286bf29d77a1e9f38eee5486581d0b1e
--- /dev/null
+++ b/easybuild/easyconfigs/__archive__/m/MyMediaLite/MyMediaLite-3.10-ictce-4.1.13.eb
@@ -0,0 +1,14 @@
+name = 'MyMediaLite'
+version = '3.10'
+
+homepage = 'http://www.ismll.uni-hildesheim.de/mymedialite/'
+description = """MyMediaLite is a lightweight, multi-purpose library of recommender system algorithms."""
+
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+
+source_urls = ['http://www.mymedialite.net/download/']
+sources = ['%(name)s-%(version)s.src.tar.gz']
+
+dependencies = [('Mono', '2.10.6')]
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/m/makedepend/makedepend-1.0.4-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/m/makedepend/makedepend-1.0.4-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/m/makedepend/makedepend-1.0.4-ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/m/makedepend/makedepend-1.0.4-ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/m/makedepend/makedepend-1.0.4-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/m/makedepend/makedepend-1.0.4-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/m/makedepend/makedepend-1.0.4-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/m/makedepend/makedepend-1.0.4-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-iqacml-3.7.3.eb b/easybuild/easyconfigs/__archive__/m/makedepend/makedepend-1.0.4-iqacml-3.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-iqacml-3.7.3.eb
rename to easybuild/easyconfigs/__archive__/m/makedepend/makedepend-1.0.4-iqacml-3.7.3.eb
diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.1.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/m/matplotlib/matplotlib-1.1.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/m/matplotlib/matplotlib-1.1.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/m/matplotlib/matplotlib-1.1.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.1.1-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/m/matplotlib/matplotlib-1.1.1-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/m/matplotlib/matplotlib-1.1.1-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/m/matplotlib/matplotlib-1.1.1-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.2.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/m/matplotlib/matplotlib-1.2.0-ictce-4.1.13-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/m/matplotlib/matplotlib-1.2.0-ictce-4.1.13-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/m/matplotlib/matplotlib-1.2.0-ictce-4.1.13-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.2.1-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/m/matplotlib/matplotlib-1.2.1-ictce-4.1.13-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/m/matplotlib/matplotlib-1.2.1-ictce-4.1.13-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/m/matplotlib/matplotlib-1.2.1-ictce-4.1.13-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.0-ictce-4.1.13-Python-2.7.5.eb b/easybuild/easyconfigs/__archive__/m/matplotlib/matplotlib-1.3.0-ictce-4.1.13-Python-2.7.5.eb
similarity index 100%
rename from easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.0-ictce-4.1.13-Python-2.7.5.eb
rename to easybuild/easyconfigs/__archive__/m/matplotlib/matplotlib-1.3.0-ictce-4.1.13-Python-2.7.5.eb
diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-4.1.13-Python-2.7.6.eb b/easybuild/easyconfigs/__archive__/m/matplotlib/matplotlib-1.3.1-ictce-4.1.13-Python-2.7.6.eb
similarity index 100%
rename from easybuild/easyconfigs/m/matplotlib/matplotlib-1.3.1-ictce-4.1.13-Python-2.7.6.eb
rename to easybuild/easyconfigs/__archive__/m/matplotlib/matplotlib-1.3.1-ictce-4.1.13-Python-2.7.6.eb
diff --git a/easybuild/easyconfigs/m/mc/mc-4.6.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/m/mc/mc-4.6.1-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/m/mc/mc-4.6.1-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/m/mc/mc-4.6.1-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/m/mc/mc-4.6.1-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/m/mc/mc-4.6.1-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/m/mc/mc-4.6.1-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/m/mc/mc-4.6.1-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/m/molmod/molmod-1.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/m/molmod/molmod-1.0-ictce-4.1.13-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/m/molmod/molmod-1.0-ictce-4.1.13-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/m/molmod/molmod-1.0-ictce-4.1.13-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/m/motif/motif-2.2.4-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/m/motif/motif-2.2.4-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/m/motif/motif-2.3.4-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/m/motif/motif-2.3.4-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/m/motif/motif-2.3.4-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/m/motif/motif-2.3.4-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/m/mpi4py/mpi4py-1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/m/mpi4py/mpi4py-1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/m/mpi4py/mpi4py-1.3-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/m/mpi4py/mpi4py-1.3-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/m/mpi4py/mpi4py-1.3-ictce-4.1.13-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.1.13-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/m/mpi4py/mpi4py-1.3-ictce-4.1.13-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/m/mpiBLAST/mpiBLAST-1.6.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/m/mpiBLAST/mpiBLAST-1.6.0-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/m/mpiBLAST/mpiBLAST-1.6.0-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/m/mpiBLAST/mpiBLAST-1.6.0-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/m/mpiBLAST/mpiBLAST-1.6.0-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/m/mpiBLAST/mpiBLAST-1.6.0-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/m/mpiBLAST/mpiBLAST-1.6.0-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/m/mpiBLAST/mpiBLAST-1.6.0-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/n/NAMD/NAMD-2.9-gmvapich2-1.7.12-ibverbs.eb b/easybuild/easyconfigs/__archive__/n/NAMD/NAMD-2.9-gmvapich2-1.7.12-ibverbs.eb
similarity index 76%
rename from easybuild/easyconfigs/n/NAMD/NAMD-2.9-gmvapich2-1.7.12-ibverbs.eb
rename to easybuild/easyconfigs/__archive__/n/NAMD/NAMD-2.9-gmvapich2-1.7.12-ibverbs.eb
index e2998dd325353f8675de7b7e3667edba33f95651..35ee2734405941aae8d1828f1d1b418d41cea730 100644
--- a/easybuild/easyconfigs/n/NAMD/NAMD-2.9-gmvapich2-1.7.12-ibverbs.eb
+++ b/easybuild/easyconfigs/__archive__/n/NAMD/NAMD-2.9-gmvapich2-1.7.12-ibverbs.eb
@@ -3,7 +3,8 @@ version = '2.9'
 versionsuffix = '-ibverbs'
 
 homepage = 'http://www.ks.uiuc.edu/Research/namd/'
-description = """NAMD is a parallel molecular dynamics code designed for high-performance simulation of large biomolecular systems."""
+description = """NAMD is a parallel molecular dynamics code designed for high-performance simulation of
+ large biomolecular systems."""
 
 toolchain = {'name': 'gmvapich2', 'version': '1.7.12'}
 toolchainopts = {'opt': True, 'pic': True}
@@ -15,6 +16,9 @@ dependencies = [
     ('FFTW', '3.3.4'),
 ]
 
+# /bin/csh is required by 'config' script
+osdependencies = ['tcsh']
+
 charm_arch = "net-linux-x86_64 ibverbs"
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/n/NAMD/NAMD-2.9-gmvolf-1.7.12-ibverbs.eb b/easybuild/easyconfigs/__archive__/n/NAMD/NAMD-2.9-gmvolf-1.7.12-ibverbs.eb
similarity index 74%
rename from easybuild/easyconfigs/n/NAMD/NAMD-2.9-gmvolf-1.7.12-ibverbs.eb
rename to easybuild/easyconfigs/__archive__/n/NAMD/NAMD-2.9-gmvolf-1.7.12-ibverbs.eb
index 9434c5a6023b01ecb826a89bd3f817391b67ba43..c1bef554889f38c8ab94dd51bfbf61a01ab5b05e 100644
--- a/easybuild/easyconfigs/n/NAMD/NAMD-2.9-gmvolf-1.7.12-ibverbs.eb
+++ b/easybuild/easyconfigs/__archive__/n/NAMD/NAMD-2.9-gmvolf-1.7.12-ibverbs.eb
@@ -3,7 +3,8 @@ version = '2.9'
 versionsuffix = '-ibverbs'
 
 homepage = 'http://www.ks.uiuc.edu/Research/namd/'
-description = """NAMD is a parallel molecular dynamics code designed for high-performance simulation of large biomolecular systems."""
+description = """NAMD is a parallel molecular dynamics code designed for high-performance simulation of
+ large biomolecular systems."""
 
 toolchain = {'name': 'gmvolf', 'version': '1.7.12'}
 toolchainopts = {'opt': True, 'pic': True}
@@ -14,6 +15,9 @@ dependencies = [
     ('Tcl', '8.5.12'),
 ]
 
+# /bin/csh is required by 'config' script
+osdependencies = ['tcsh']
+
 charm_arch = "net-linux-x86_64 ibverbs"
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/n/NASM/NASM-2.07-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/n/NASM/NASM-2.07-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/n/NASM/NASM-2.07-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/n/NASM/NASM-2.07-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/n/NASM/NASM-2.07-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/n/NASM/NASM-2.07-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/n/NASM/NASM-2.07-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/n/NASM/NASM-2.07-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/n/NASM/NASM-2.07-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/n/NASM/NASM-2.07-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/n/NASM/NASM-2.07-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/n/NASM/NASM-2.07-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/n/NASM/NASM-2.11.05-ictce-6.3.5.eb b/easybuild/easyconfigs/__archive__/n/NASM/NASM-2.11.05-ictce-6.3.5.eb
similarity index 100%
rename from easybuild/easyconfigs/n/NASM/NASM-2.11.05-ictce-6.3.5.eb
rename to easybuild/easyconfigs/__archive__/n/NASM/NASM-2.11.05-ictce-6.3.5.eb
diff --git a/easybuild/easyconfigs/n/NCBI-Toolkit/NCBI-Toolkit-9.0.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/n/NCBI-Toolkit/NCBI-Toolkit-9.0.0-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/n/NCBI-Toolkit/NCBI-Toolkit-9.0.0-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/n/NCBI-Toolkit/NCBI-Toolkit-9.0.0-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/n/NCBI-Toolkit/NCBI-Toolkit-9.0.0-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/n/NCBI-Toolkit/NCBI-Toolkit-9.0.0-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/n/NCBI-Toolkit/NCBI-Toolkit-9.0.0-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/n/NCBI-Toolkit/NCBI-Toolkit-9.0.0-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/n/NCL/NCL-6.0.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/n/NCL/NCL-6.0.0-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/n/NCL/NCL-6.0.0-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/n/NCL/NCL-6.0.0-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/n/NCL/NCL-6.0.0-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/n/NCL/NCL-6.0.0-ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/n/NCL/NCL-6.0.0-ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/n/NCL/NCL-6.0.0-ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/n/NCL/NCL-6.1.0-iqacml-3.7.3.eb b/easybuild/easyconfigs/__archive__/n/NCL/NCL-6.1.0-iqacml-3.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/n/NCL/NCL-6.1.0-iqacml-3.7.3.eb
rename to easybuild/easyconfigs/__archive__/n/NCL/NCL-6.1.0-iqacml-3.7.3.eb
diff --git a/easybuild/easyconfigs/n/NCL/NCL-6.1.2-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/n/NCL/NCL-6.1.2-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/n/NCL/NCL-6.1.2-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/n/NCL/NCL-6.1.2-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/n/NCL/NCL-6.1.2-iqacml-3.7.3.eb b/easybuild/easyconfigs/__archive__/n/NCL/NCL-6.1.2-iqacml-3.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/n/NCL/NCL-6.1.2-iqacml-3.7.3.eb
rename to easybuild/easyconfigs/__archive__/n/NCL/NCL-6.1.2-iqacml-3.7.3.eb
diff --git a/easybuild/easyconfigs/n/NEURON/NEURON-7.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/n/NEURON/NEURON-7.2-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/n/NEURON/NEURON-7.2-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/n/NEURON/NEURON-7.2-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/n/NEURON/NEURON-7.2-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/n/NEURON/NEURON-7.2-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/n/NEURON/NEURON-7.2-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/n/NEURON/NEURON-7.2-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/n/NWChem/NWChem-6.1.1-goalf-1.1.0-no-OFED-2012-06-27-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/n/NWChem/NWChem-6.1.1-goalf-1.1.0-no-OFED-2012-06-27-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/n/NWChem/NWChem-6.1.1-goalf-1.1.0-no-OFED-2012-06-27-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/n/NWChem/NWChem-6.1.1-goalf-1.1.0-no-OFED-2012-06-27-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/n/NWChem/NWChem-6.1.1-ictce-4.1.13-2012-06-27-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/n/NWChem/NWChem-6.1.1-ictce-4.1.13-2012-06-27-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/n/NWChem/NWChem-6.1.1-ictce-4.1.13-2012-06-27-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/n/NWChem/NWChem-6.1.1-ictce-4.1.13-2012-06-27-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/n/nano/nano-2.2.6-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/n/nano/nano-2.2.6-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/n/nano/nano-2.2.6-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/n/nano/nano-2.2.6-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/n/nano/nano-2.2.6-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/n/nano/nano-2.2.6-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/n/nano/nano-2.2.6-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/n/nano/nano-2.2.6-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-20130406-cgmpolf-1.1.6.eb
similarity index 100%
rename from easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgmpolf-1.1.6.eb
rename to easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-20130406-cgmpolf-1.1.6.eb
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-20130406-cgmvolf-1.1.12rc1.eb
similarity index 100%
rename from easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgmvolf-1.1.12rc1.eb
rename to easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-20130406-cgmvolf-1.1.12rc1.eb
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgmvolf-1.2.7.eb b/easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-20130406-cgmvolf-1.2.7.eb
similarity index 100%
rename from easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgmvolf-1.2.7.eb
rename to easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-20130406-cgmvolf-1.2.7.eb
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgoolf-1.1.7.eb b/easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-20130406-cgoolf-1.1.7.eb
similarity index 100%
rename from easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-cgoolf-1.1.7.eb
rename to easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-20130406-cgoolf-1.1.7.eb
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-gmvolf-1.7.12.eb b/easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-20130406-gmvolf-1.7.12.eb
similarity index 100%
rename from easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-gmvolf-1.7.12.eb
rename to easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-20130406-gmvolf-1.7.12.eb
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-20130406-gmvolf-1.7.12rc1.eb
similarity index 100%
rename from easybuild/easyconfigs/n/ncurses/ncurses-5.9-20130406-gmvolf-1.7.12rc1.eb
rename to easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-20130406-gmvolf-1.7.12rc1.eb
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-gmpolf-1.4.8.eb b/easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-gmpolf-1.4.8.eb
similarity index 100%
rename from easybuild/easyconfigs/n/ncurses/ncurses-5.9-gmpolf-1.4.8.eb
rename to easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-gmpolf-1.4.8.eb
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-gmvolf-1.7.12.eb b/easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-gmvolf-1.7.12.eb
similarity index 100%
rename from easybuild/easyconfigs/n/ncurses/ncurses-5.9-gmvolf-1.7.12.eb
rename to easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-gmvolf-1.7.12.eb
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-gmvolf-1.7.12rc1.eb
similarity index 100%
rename from easybuild/easyconfigs/n/ncurses/ncurses-5.9-gmvolf-1.7.12rc1.eb
rename to easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-gmvolf-1.7.12rc1.eb
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/n/ncurses/ncurses-5.9-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-goalf-1.5.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/n/ncurses/ncurses-5.9-goalf-1.5.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-goalf-1.5.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-gompi-1.4.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/n/ncurses/ncurses-5.9-gompi-1.4.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-gompi-1.4.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goolfc-1.3.12.eb b/easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-goolfc-1.3.12.eb
similarity index 100%
rename from easybuild/easyconfigs/n/ncurses/ncurses-5.9-goolfc-1.3.12.eb
rename to easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-goolfc-1.3.12.eb
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goolfc-2.6.10.eb b/easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-goolfc-2.6.10.eb
similarity index 100%
rename from easybuild/easyconfigs/n/ncurses/ncurses-5.9-goolfc-2.6.10.eb
rename to easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-goolfc-2.6.10.eb
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-4.0.10.eb b/easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-ictce-4.0.10.eb
similarity index 100%
rename from easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-4.0.10.eb
rename to easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-ictce-4.0.10.eb
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-6.3.5.eb b/easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-ictce-6.3.5.eb
similarity index 100%
rename from easybuild/easyconfigs/n/ncurses/ncurses-5.9-ictce-6.3.5.eb
rename to easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-ictce-6.3.5.eb
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-iomkl-4.6.13.eb b/easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-iomkl-4.6.13.eb
similarity index 100%
rename from easybuild/easyconfigs/n/ncurses/ncurses-5.9-iomkl-4.6.13.eb
rename to easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-iomkl-4.6.13.eb
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-iqacml-3.7.3.eb b/easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-iqacml-3.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/n/ncurses/ncurses-5.9-iqacml-3.7.3.eb
rename to easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-iqacml-3.7.3.eb
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-iqacml-4.4.13.eb b/easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-iqacml-4.4.13.eb
similarity index 100%
rename from easybuild/easyconfigs/n/ncurses/ncurses-5.9-iqacml-4.4.13.eb
rename to easybuild/easyconfigs/__archive__/n/ncurses/ncurses-5.9-iqacml-4.4.13.eb
diff --git a/easybuild/easyconfigs/n/ncview/ncview-2.1.2-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/n/ncview/ncview-2.1.2-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/n/ncview/ncview-2.1.2-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/n/ncview/ncview-2.1.2-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/n/netCDF-C++/netCDF-C++-4.2-ictce-4.1.13-mt.eb b/easybuild/easyconfigs/__archive__/n/netCDF-C++/netCDF-C++-4.2-ictce-4.1.13-mt.eb
similarity index 100%
rename from easybuild/easyconfigs/n/netCDF-C++/netCDF-C++-4.2-ictce-4.1.13-mt.eb
rename to easybuild/easyconfigs/__archive__/n/netCDF-C++/netCDF-C++-4.2-ictce-4.1.13-mt.eb
diff --git a/easybuild/easyconfigs/n/netCDF-C++/netCDF-C++-4.2-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/n/netCDF-C++/netCDF-C++-4.2-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/n/netCDF-C++/netCDF-C++-4.2-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/n/netCDF-C++/netCDF-C++-4.2-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/n/netCDF-C++/netCDF-C++-4.2-iqacml-3.7.3.eb b/easybuild/easyconfigs/__archive__/n/netCDF-C++/netCDF-C++-4.2-iqacml-3.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/n/netCDF-C++/netCDF-C++-4.2-iqacml-3.7.3.eb
rename to easybuild/easyconfigs/__archive__/n/netCDF-C++/netCDF-C++-4.2-iqacml-3.7.3.eb
diff --git a/easybuild/easyconfigs/n/netCDF-Fortran/netCDF-Fortran-4.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/n/netCDF-Fortran/netCDF-Fortran-4.2-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/n/netCDF-Fortran/netCDF-Fortran-4.2-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/n/netCDF-Fortran/netCDF-Fortran-4.2-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/n/netCDF-Fortran/netCDF-Fortran-4.2-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/n/netCDF-Fortran/netCDF-Fortran-4.2-ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/n/netCDF-Fortran/netCDF-Fortran-4.2-ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/n/netCDF-Fortran/netCDF-Fortran-4.2-ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/n/netCDF-Fortran/netCDF-Fortran-4.2-ictce-4.1.13-mt.eb b/easybuild/easyconfigs/__archive__/n/netCDF-Fortran/netCDF-Fortran-4.2-ictce-4.1.13-mt.eb
similarity index 100%
rename from easybuild/easyconfigs/n/netCDF-Fortran/netCDF-Fortran-4.2-ictce-4.1.13-mt.eb
rename to easybuild/easyconfigs/__archive__/n/netCDF-Fortran/netCDF-Fortran-4.2-ictce-4.1.13-mt.eb
diff --git a/easybuild/easyconfigs/n/netCDF-Fortran/netCDF-Fortran-4.2-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/n/netCDF-Fortran/netCDF-Fortran-4.2-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/n/netCDF-Fortran/netCDF-Fortran-4.2-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/n/netCDF-Fortran/netCDF-Fortran-4.2-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/n/netCDF-Fortran/netCDF-Fortran-4.2-iqacml-3.7.3.eb b/easybuild/easyconfigs/__archive__/n/netCDF-Fortran/netCDF-Fortran-4.2-iqacml-3.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/n/netCDF-Fortran/netCDF-Fortran-4.2-iqacml-3.7.3.eb
rename to easybuild/easyconfigs/__archive__/n/netCDF-Fortran/netCDF-Fortran-4.2-iqacml-3.7.3.eb
diff --git a/easybuild/easyconfigs/n/netCDF/netCDF-4.1.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/n/netCDF/netCDF-4.1.3-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/n/netCDF/netCDF-4.1.3-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/n/netCDF/netCDF-4.1.3-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/n/netCDF/netCDF-4.1.3-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/n/netCDF/netCDF-4.1.3-ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/n/netCDF/netCDF-4.1.3-ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/n/netCDF/netCDF-4.1.3-ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/n/netCDF/netCDF-4.1.3-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/n/netCDF/netCDF-4.1.3-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/n/netCDF/netCDF-4.1.3-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/n/netCDF/netCDF-4.1.3-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/n/netCDF/netCDF-4.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/n/netCDF/netCDF-4.2-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/n/netCDF/netCDF-4.2-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/n/netCDF/netCDF-4.2-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/n/netCDF/netCDF-4.2-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/n/netCDF/netCDF-4.2-ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/n/netCDF/netCDF-4.2-ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/n/netCDF/netCDF-4.2-ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-4.1.13-mt.eb b/easybuild/easyconfigs/__archive__/n/netCDF/netCDF-4.2.1.1-ictce-4.1.13-mt.eb
similarity index 100%
rename from easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-4.1.13-mt.eb
rename to easybuild/easyconfigs/__archive__/n/netCDF/netCDF-4.2.1.1-ictce-4.1.13-mt.eb
diff --git a/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/n/netCDF/netCDF-4.2.1.1-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/n/netCDF/netCDF-4.2.1.1-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-iqacml-3.7.3.eb b/easybuild/easyconfigs/__archive__/n/netCDF/netCDF-4.2.1.1-iqacml-3.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-iqacml-3.7.3.eb
rename to easybuild/easyconfigs/__archive__/n/netCDF/netCDF-4.2.1.1-iqacml-3.7.3.eb
diff --git a/easybuild/easyconfigs/n/netloc/netloc-0.5-gcccuda-2.6.10.eb b/easybuild/easyconfigs/__archive__/n/netloc/netloc-0.5-gcccuda-2.6.10.eb
similarity index 100%
rename from easybuild/easyconfigs/n/netloc/netloc-0.5-gcccuda-2.6.10.eb
rename to easybuild/easyconfigs/__archive__/n/netloc/netloc-0.5-gcccuda-2.6.10.eb
diff --git a/easybuild/easyconfigs/n/nettle/nettle-2.6-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/n/nettle/nettle-2.6-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/n/nettle/nettle-2.6-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/n/nettle/nettle-2.6-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/n/ns/ns-2.35-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/n/ns/ns-2.35-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/n/ns/ns-2.35-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/n/ns/ns-2.35-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/n/numactl/numactl-2.0.8-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/n/numactl/numactl-2.0.8-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/n/numactl/numactl-2.0.8-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/n/numactl/numactl-2.0.8-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/n/numactl/numactl-2.0.8-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/n/numactl/numactl-2.0.8-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/n/numactl/numactl-2.0.8-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/n/numactl/numactl-2.0.8-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/n/numexpr/numexpr-2.0.1-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/n/numexpr/numexpr-2.0.1-ictce-4.1.13-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/n/numexpr/numexpr-2.0.1-ictce-4.1.13-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/n/numexpr/numexpr-2.0.1-ictce-4.1.13-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.6.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/n/numpy/numpy-1.6.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/n/numpy/numpy-1.6.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/n/numpy/numpy-1.6.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/n/numpy/numpy-1.6.2-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/n/numpy/numpy-1.6.2-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/n/numpy/numpy-1.6.2-ictce-4.1.13-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-4.1.13-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/n/numpy/numpy-1.6.2-ictce-4.1.13-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.6.2-iqacml-3.7.3-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/n/numpy/numpy-1.6.2-iqacml-3.7.3-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/n/numpy/numpy-1.6.2-iqacml-3.7.3-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/n/numpy/numpy-1.6.2-iqacml-3.7.3-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.7.1-ictce-4.1.13-Python-2.7.5.eb b/easybuild/easyconfigs/__archive__/n/numpy/numpy-1.7.1-ictce-4.1.13-Python-2.7.5.eb
similarity index 100%
rename from easybuild/easyconfigs/n/numpy/numpy-1.7.1-ictce-4.1.13-Python-2.7.5.eb
rename to easybuild/easyconfigs/__archive__/n/numpy/numpy-1.7.1-ictce-4.1.13-Python-2.7.5.eb
diff --git a/easybuild/easyconfigs/o/OPARI2/OPARI2-1.0.7-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/o/OPARI2/OPARI2-1.0.7-gompi-1.4.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OPARI2/OPARI2-1.0.7-gompi-1.4.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/o/OPARI2/OPARI2-1.0.7-gompi-1.4.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/o/OPARI2/OPARI2-1.1.1-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/o/OPARI2/OPARI2-1.1.1-gompi-1.4.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OPARI2/OPARI2-1.1.1-gompi-1.4.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/o/OPARI2/OPARI2-1.1.1-gompi-1.4.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/o/OTF/OTF-1.12.4-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/o/OTF/OTF-1.12.4-gompi-1.4.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OTF/OTF-1.12.4-gompi-1.4.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/o/OTF/OTF-1.12.4-gompi-1.4.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/o/OTF2/OTF2-1.2.1-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/o/OTF2/OTF2-1.2.1-gompi-1.4.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OTF2/OTF2-1.2.1-gompi-1.4.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/o/OTF2/OTF2-1.2.1-gompi-1.4.12-no-OFED.eb
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/__archive__/o/Oger/Oger-1.1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/o/Oger/Oger-1.1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/o/Oger/Oger-1.1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/o/Oger/Oger-1.1.3-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/o/Oger/Oger-1.1.3-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/o/Oger/Oger-1.1.3-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/o/Oger/Oger-1.1.3-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgmpich-1.1.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/__archive__/o/OpenBLAS/OpenBLAS-0.2.6-cgmpich-1.1.6-LAPACK-3.4.2.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgmpich-1.1.6-LAPACK-3.4.2.eb
rename to easybuild/easyconfigs/__archive__/o/OpenBLAS/OpenBLAS-0.2.6-cgmpich-1.1.6-LAPACK-3.4.2.eb
diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgmvapich2-1.1.12rc1-LAPACK-3.4.2.eb b/easybuild/easyconfigs/__archive__/o/OpenBLAS/OpenBLAS-0.2.6-cgmvapich2-1.1.12rc1-LAPACK-3.4.2.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgmvapich2-1.1.12rc1-LAPACK-3.4.2.eb
rename to easybuild/easyconfigs/__archive__/o/OpenBLAS/OpenBLAS-0.2.6-cgmvapich2-1.1.12rc1-LAPACK-3.4.2.eb
diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgmvapich2-1.2.7-LAPACK-3.4.2.eb b/easybuild/easyconfigs/__archive__/o/OpenBLAS/OpenBLAS-0.2.6-cgmvapich2-1.2.7-LAPACK-3.4.2.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgmvapich2-1.2.7-LAPACK-3.4.2.eb
rename to easybuild/easyconfigs/__archive__/o/OpenBLAS/OpenBLAS-0.2.6-cgmvapich2-1.2.7-LAPACK-3.4.2.eb
diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgompi-1.1.7-LAPACK-3.4.2.eb b/easybuild/easyconfigs/__archive__/o/OpenBLAS/OpenBLAS-0.2.6-cgompi-1.1.7-LAPACK-3.4.2.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-cgompi-1.1.7-LAPACK-3.4.2.eb
rename to easybuild/easyconfigs/__archive__/o/OpenBLAS/OpenBLAS-0.2.6-cgompi-1.1.7-LAPACK-3.4.2.eb
diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gmpich-1.4.8-LAPACK-3.4.2.eb b/easybuild/easyconfigs/__archive__/o/OpenBLAS/OpenBLAS-0.2.6-gmpich-1.4.8-LAPACK-3.4.2.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gmpich-1.4.8-LAPACK-3.4.2.eb
rename to easybuild/easyconfigs/__archive__/o/OpenBLAS/OpenBLAS-0.2.6-gmpich-1.4.8-LAPACK-3.4.2.eb
diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gmvapich2-1.7.12-LAPACK-3.4.2.eb b/easybuild/easyconfigs/__archive__/o/OpenBLAS/OpenBLAS-0.2.6-gmvapich2-1.7.12-LAPACK-3.4.2.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gmvapich2-1.7.12-LAPACK-3.4.2.eb
rename to easybuild/easyconfigs/__archive__/o/OpenBLAS/OpenBLAS-0.2.6-gmvapich2-1.7.12-LAPACK-3.4.2.eb
diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gmvapich2-1.7.12rc1-LAPACK-3.4.2.eb b/easybuild/easyconfigs/__archive__/o/OpenBLAS/OpenBLAS-0.2.6-gmvapich2-1.7.12rc1-LAPACK-3.4.2.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gmvapich2-1.7.12rc1-LAPACK-3.4.2.eb
rename to easybuild/easyconfigs/__archive__/o/OpenBLAS/OpenBLAS-0.2.6-gmvapich2-1.7.12rc1-LAPACK-3.4.2.eb
diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gompi-1.3.12-LAPACK-3.4.2.eb b/easybuild/easyconfigs/__archive__/o/OpenBLAS/OpenBLAS-0.2.6-gompi-1.3.12-LAPACK-3.4.2.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gompi-1.3.12-LAPACK-3.4.2.eb
rename to easybuild/easyconfigs/__archive__/o/OpenBLAS/OpenBLAS-0.2.6-gompi-1.3.12-LAPACK-3.4.2.eb
diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gompi-1.4.10-no-OFED-LAPACK-3.4.2.eb b/easybuild/easyconfigs/__archive__/o/OpenBLAS/OpenBLAS-0.2.6-gompi-1.4.10-no-OFED-LAPACK-3.4.2.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.6-gompi-1.4.10-no-OFED-LAPACK-3.4.2.eb
rename to easybuild/easyconfigs/__archive__/o/OpenBLAS/OpenBLAS-0.2.6-gompi-1.4.10-no-OFED-LAPACK-3.4.2.eb
diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.5.14-no-OFED-LAPACK-3.5.0.eb b/easybuild/easyconfigs/__archive__/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.5.14-no-OFED-LAPACK-3.5.0.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.5.14-no-OFED-LAPACK-3.5.0.eb
rename to easybuild/easyconfigs/__archive__/o/OpenBLAS/OpenBLAS-0.2.8-gompi-1.5.14-no-OFED-LAPACK-3.5.0.eb
diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompic-2.6.10-LAPACK-3.4.2.eb b/easybuild/easyconfigs/__archive__/o/OpenBLAS/OpenBLAS-0.2.8-gompic-2.6.10-LAPACK-3.4.2.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.8-gompic-2.6.10-LAPACK-3.4.2.eb
rename to easybuild/easyconfigs/__archive__/o/OpenBLAS/OpenBLAS-0.2.8-gompic-2.6.10-LAPACK-3.4.2.eb
diff --git a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED-Python-2.7.5.eb b/easybuild/easyconfigs/__archive__/o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED-Python-2.7.5.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED-Python-2.7.5.eb
rename to easybuild/easyconfigs/__archive__/o/OpenBabel/OpenBabel-2.3.2-goalf-1.5.12-no-OFED-Python-2.7.5.eb
diff --git a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/o/OpenBabel/OpenBabel-2.3.2-ictce-4.1.13-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ictce-4.1.13-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/o/OpenBabel/OpenBabel-2.3.2-ictce-4.1.13-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/o/OpenFOAM-Extend/OpenFOAM-Extend-1.6-ictce-4.1.13-20130711.eb b/easybuild/easyconfigs/__archive__/o/OpenFOAM-Extend/OpenFOAM-Extend-1.6-ictce-4.1.13-20130711.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenFOAM-Extend/OpenFOAM-Extend-1.6-ictce-4.1.13-20130711.eb
rename to easybuild/easyconfigs/__archive__/o/OpenFOAM-Extend/OpenFOAM-Extend-1.6-ictce-4.1.13-20130711.eb
diff --git a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/o/OpenFOAM/OpenFOAM-2.1.1-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/o/OpenFOAM/OpenFOAM-2.1.1-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/o/OpenFOAM/OpenFOAM-2.1.1-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/o/OpenFOAM/OpenFOAM-2.1.1-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.2.0-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/o/OpenFOAM/OpenFOAM-2.2.0-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.2.0-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/o/OpenFOAM/OpenFOAM-2.2.0-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.2.0-iqacml-4.4.13.eb b/easybuild/easyconfigs/__archive__/o/OpenFOAM/OpenFOAM-2.2.0-iqacml-4.4.13.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.2.0-iqacml-4.4.13.eb
rename to easybuild/easyconfigs/__archive__/o/OpenFOAM/OpenFOAM-2.2.0-iqacml-4.4.13.eb
diff --git a/easybuild/easyconfigs/o/OpenIFS/OpenIFS-38r1v01-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/o/OpenIFS/OpenIFS-38r1v01-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenIFS/OpenIFS-38r1v01-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/o/OpenIFS/OpenIFS-38r1v01-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb b/easybuild/easyconfigs/__archive__/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb
rename to easybuild/easyconfigs/__archive__/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-ClangGCC-1.1.3.eb b/easybuild/easyconfigs/__archive__/o/OpenMPI/OpenMPI-1.6.4-ClangGCC-1.1.3.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-ClangGCC-1.1.3.eb
rename to easybuild/easyconfigs/__archive__/o/OpenMPI/OpenMPI-1.6.4-ClangGCC-1.1.3.eb
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb b/easybuild/easyconfigs/__archive__/o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb
rename to easybuild/easyconfigs/__archive__/o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb
diff --git a/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/o/OpenPGM/OpenPGM-5.2.122-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/o/OpenPGM/OpenPGM-5.2.122-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/o/OpenPGM/OpenPGM-5.2.122-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/o/OpenPGM/OpenPGM-5.2.122-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.0-gmpolf-1.4.8.eb b/easybuild/easyconfigs/__archive__/o/OpenSSL/OpenSSL-1.0.0-gmpolf-1.4.8.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.0-gmpolf-1.4.8.eb
rename to easybuild/easyconfigs/__archive__/o/OpenSSL/OpenSSL-1.0.0-gmpolf-1.4.8.eb
diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/o/OpenSSL/OpenSSL-1.0.0-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.0-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/o/OpenSSL/OpenSSL-1.0.0-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/__archive__/o/OpenSSL/OpenSSL-1.0.1f-cgmpolf-1.1.6.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-cgmpolf-1.1.6.eb
rename to easybuild/easyconfigs/__archive__/o/OpenSSL/OpenSSL-1.0.1f-cgmpolf-1.1.6.eb
diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/__archive__/o/OpenSSL/OpenSSL-1.0.1f-cgmvolf-1.1.12rc1.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-cgmvolf-1.1.12rc1.eb
rename to easybuild/easyconfigs/__archive__/o/OpenSSL/OpenSSL-1.0.1f-cgmvolf-1.1.12rc1.eb
diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-cgmvolf-1.2.7.eb b/easybuild/easyconfigs/__archive__/o/OpenSSL/OpenSSL-1.0.1f-cgmvolf-1.2.7.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-cgmvolf-1.2.7.eb
rename to easybuild/easyconfigs/__archive__/o/OpenSSL/OpenSSL-1.0.1f-cgmvolf-1.2.7.eb
diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-cgoolf-1.1.7.eb b/easybuild/easyconfigs/__archive__/o/OpenSSL/OpenSSL-1.0.1f-cgoolf-1.1.7.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-cgoolf-1.1.7.eb
rename to easybuild/easyconfigs/__archive__/o/OpenSSL/OpenSSL-1.0.1f-cgoolf-1.1.7.eb
diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-gmvolf-1.7.12.eb b/easybuild/easyconfigs/__archive__/o/OpenSSL/OpenSSL-1.0.1f-gmvolf-1.7.12.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-gmvolf-1.7.12.eb
rename to easybuild/easyconfigs/__archive__/o/OpenSSL/OpenSSL-1.0.1f-gmvolf-1.7.12.eb
diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/__archive__/o/OpenSSL/OpenSSL-1.0.1f-gmvolf-1.7.12rc1.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-gmvolf-1.7.12rc1.eb
rename to easybuild/easyconfigs/__archive__/o/OpenSSL/OpenSSL-1.0.1f-gmvolf-1.7.12rc1.eb
diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/o/OpenSSL/OpenSSL-1.0.1f-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/o/OpenSSL/OpenSSL-1.0.1f-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/o/OpenSSL/OpenSSL-1.0.1f-goalf-1.5.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-goalf-1.5.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/o/OpenSSL/OpenSSL-1.0.1f-goalf-1.5.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/o/OpenSSL/OpenSSL-1.0.1f-ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/o/OpenSSL/OpenSSL-1.0.1f-ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/o/OpenSSL/OpenSSL-1.0.1f-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/o/OpenSSL/OpenSSL-1.0.1f-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/o/OpenSSL/OpenSSL-1.0.1f-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/o/OpenSSL/OpenSSL-1.0.1f-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-iqacml-3.7.3.eb b/easybuild/easyconfigs/__archive__/o/OpenSSL/OpenSSL-1.0.1f-iqacml-3.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1f-iqacml-3.7.3.eb
rename to easybuild/easyconfigs/__archive__/o/OpenSSL/OpenSSL-1.0.1f-iqacml-3.7.3.eb
diff --git a/easybuild/easyconfigs/o/orthomcl/orthomcl-2.0.8-ictce-4.1.13-Perl-5.16.3.eb b/easybuild/easyconfigs/__archive__/o/orthomcl/orthomcl-2.0.8-ictce-4.1.13-Perl-5.16.3.eb
similarity index 100%
rename from easybuild/easyconfigs/o/orthomcl/orthomcl-2.0.8-ictce-4.1.13-Perl-5.16.3.eb
rename to easybuild/easyconfigs/__archive__/o/orthomcl/orthomcl-2.0.8-ictce-4.1.13-Perl-5.16.3.eb
diff --git a/easybuild/easyconfigs/o/otcl/otcl-1.14-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/o/otcl/otcl-1.14-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/o/otcl/otcl-1.14-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/o/otcl/otcl-1.14-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/p/PANDAseq/PANDAseq-2.5-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/p/PANDAseq/PANDAseq-2.5-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/p/PANDAseq/PANDAseq-2.5-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/p/PANDAseq/PANDAseq-2.5-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/p/PAPI/PAPI-5.0.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/p/PAPI/PAPI-5.0.1-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/p/PAPI/PAPI-5.0.1-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/p/PAPI/PAPI-5.0.1-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/p/PAPI/PAPI-5.0.1-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/p/PAPI/PAPI-5.0.1-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/p/PAPI/PAPI-5.0.1-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/p/PAPI/PAPI-5.0.1-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/p/PAPI/PAPI-5.2.0-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/p/PAPI/PAPI-5.2.0-gompi-1.4.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/p/PAPI/PAPI-5.2.0-gompi-1.4.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/p/PAPI/PAPI-5.2.0-gompi-1.4.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/p/PCRE/PCRE-8.12-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/p/PCRE/PCRE-8.12-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/p/PCRE/PCRE-8.12-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/p/PCRE/PCRE-8.12-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/p/PCRE/PCRE-8.12-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/p/PCRE/PCRE-8.12-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/p/PCRE/PCRE-8.12-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/p/PCRE/PCRE-8.12-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/p/PDT/PDT-3.19-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/p/PDT/PDT-3.19-gompi-1.4.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/p/PDT/PDT-3.19-gompi-1.4.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/p/PDT/PDT-3.19-gompi-1.4.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/p/PETSc/PETSc-3.3-p2-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/p/PETSc/PETSc-3.3-p2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/p/PETSc/PETSc-3.3-p2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/p/PETSc/PETSc-3.3-p2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/p/PETSc/PETSc-3.3-p2-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/p/PETSc/PETSc-3.3-p2-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/p/PETSc/PETSc-3.3-p2-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/p/PETSc/PETSc-3.3-p2-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/p/PLINK/PLINK-1.07-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/p/PLINK/PLINK-1.07-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/p/PLINK/PLINK-1.07-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/p/PLINK/PLINK-1.07-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/p/PP/PP-1.6.4-ictce-4.1.13-Python-2.7.5.eb b/easybuild/easyconfigs/__archive__/p/PP/PP-1.6.4-ictce-4.1.13-Python-2.7.5.eb
similarity index 100%
rename from easybuild/easyconfigs/p/PP/PP-1.6.4-ictce-4.1.13-Python-2.7.5.eb
rename to easybuild/easyconfigs/__archive__/p/PP/PP-1.6.4-ictce-4.1.13-Python-2.7.5.eb
diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13-mt.eb b/easybuild/easyconfigs/__archive__/p/PSI/PSI-4.0b4-ictce-4.1.13-mt.eb
similarity index 100%
rename from easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13-mt.eb
rename to easybuild/easyconfigs/__archive__/p/PSI/PSI-4.0b4-ictce-4.1.13-mt.eb
diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/p/PSI/PSI-4.0b4-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/p/PSI/PSI-4.0b4-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/p/PSI/PSI-4.0b4-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED-mt.eb b/easybuild/easyconfigs/__archive__/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED-mt.eb
similarity index 100%
rename from easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED-mt.eb
rename to easybuild/easyconfigs/__archive__/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED-mt.eb
diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/p/PSI/PSI-4.0b5-goalf-1.5.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.1.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/p/ParMETIS/ParMETIS-3.1.1-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.1.1-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/p/ParMETIS/ParMETIS-3.1.1-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.1.1-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/p/ParMETIS/ParMETIS-3.1.1-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.1.1-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/p/ParMETIS/ParMETIS-3.1.1-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.2.0-gmpolf-1.4.8.eb b/easybuild/easyconfigs/__archive__/p/ParMETIS/ParMETIS-3.2.0-gmpolf-1.4.8.eb
similarity index 100%
rename from easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.2.0-gmpolf-1.4.8.eb
rename to easybuild/easyconfigs/__archive__/p/ParMETIS/ParMETIS-3.2.0-gmpolf-1.4.8.eb
diff --git a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.2.0-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/p/ParMETIS/ParMETIS-3.2.0-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.2.0-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/p/ParMETIS/ParMETIS-3.2.0-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-gmpolf-1.4.8.eb b/easybuild/easyconfigs/__archive__/p/ParMETIS/ParMETIS-4.0.2-gmpolf-1.4.8.eb
similarity index 100%
rename from easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-gmpolf-1.4.8.eb
rename to easybuild/easyconfigs/__archive__/p/ParMETIS/ParMETIS-4.0.2-gmpolf-1.4.8.eb
diff --git a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/p/ParMETIS/ParMETIS-4.0.2-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/p/ParMETIS/ParMETIS-4.0.2-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/p/ParMETIS/ParMETIS-4.0.2-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/p/ParMETIS/ParMETIS-4.0.2-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/p/ParMGridGen/ParMGridGen-1.0-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/p/ParMGridGen/ParMGridGen-1.0-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/p/ParMGridGen/ParMGridGen-1.0-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/p/ParMGridGen/ParMGridGen-1.0-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/p/ParaView/ParaView-4.0.1-gmpolf-1.4.8.eb b/easybuild/easyconfigs/__archive__/p/ParaView/ParaView-4.0.1-gmpolf-1.4.8.eb
similarity index 100%
rename from easybuild/easyconfigs/p/ParaView/ParaView-4.0.1-gmpolf-1.4.8.eb
rename to easybuild/easyconfigs/__archive__/p/ParaView/ParaView-4.0.1-gmpolf-1.4.8.eb
diff --git a/easybuild/easyconfigs/p/ParaView/ParaView-4.1.0-gmpolf-1.4.8.eb b/easybuild/easyconfigs/__archive__/p/ParaView/ParaView-4.1.0-gmpolf-1.4.8.eb
similarity index 100%
rename from easybuild/easyconfigs/p/ParaView/ParaView-4.1.0-gmpolf-1.4.8.eb
rename to easybuild/easyconfigs/__archive__/p/ParaView/ParaView-4.1.0-gmpolf-1.4.8.eb
diff --git a/easybuild/easyconfigs/p/Pasha/Pasha-1.0.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/p/Pasha/Pasha-1.0.3-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/p/Pasha/Pasha-1.0.3-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/p/Pasha/Pasha-1.0.3-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/p/Pasha/Pasha-1.0.3-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/p/Pasha/Pasha-1.0.3-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/p/Pasha/Pasha-1.0.3-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/p/Pasha/Pasha-1.0.3-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/p/Pasha/Pasha-1.0.5-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/p/Pasha/Pasha-1.0.5-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/p/Pasha/Pasha-1.0.5-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/p/Pasha/Pasha-1.0.5-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/p/Perl/Perl-5.16.3-goalf-1.1.0-no-OFED-bare.eb b/easybuild/easyconfigs/__archive__/p/Perl/Perl-5.16.3-goalf-1.1.0-no-OFED-bare.eb
similarity index 100%
rename from easybuild/easyconfigs/p/Perl/Perl-5.16.3-goalf-1.1.0-no-OFED-bare.eb
rename to easybuild/easyconfigs/__archive__/p/Perl/Perl-5.16.3-goalf-1.1.0-no-OFED-bare.eb
diff --git a/easybuild/easyconfigs/p/Perl/Perl-5.16.3-ictce-4.1.13-bare.eb b/easybuild/easyconfigs/__archive__/p/Perl/Perl-5.16.3-ictce-4.1.13-bare.eb
similarity index 100%
rename from easybuild/easyconfigs/p/Perl/Perl-5.16.3-ictce-4.1.13-bare.eb
rename to easybuild/easyconfigs/__archive__/p/Perl/Perl-5.16.3-ictce-4.1.13-bare.eb
diff --git a/easybuild/easyconfigs/p/Perl/Perl-5.16.3-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/p/Perl/Perl-5.16.3-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/p/Perl/Perl-5.16.3-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/p/Perl/Perl-5.16.3-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/p/PnMPI/PnMPI-1.2.0-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/p/PnMPI/PnMPI-1.2.0-gompi-1.4.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/p/PnMPI/PnMPI-1.2.0-gompi-1.4.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/p/PnMPI/PnMPI-1.2.0-gompi-1.4.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/p/Primer3/Primer3-2.3.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/p/Primer3/Primer3-2.3.0-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/p/Primer3/Primer3-2.3.0-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/p/Primer3/Primer3-2.3.0-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/p/Primer3/Primer3-2.3.0-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/p/Primer3/Primer3-2.3.0-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/p/Primer3/Primer3-2.3.0-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/p/Primer3/Primer3-2.3.0-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3-zmq2.eb b/easybuild/easyconfigs/__archive__/p/PyZMQ/PyZMQ-2.2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3-zmq2.eb
similarity index 100%
rename from easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3-zmq2.eb
rename to easybuild/easyconfigs/__archive__/p/PyZMQ/PyZMQ-2.2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3-zmq2.eb
diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3-zmq3.eb b/easybuild/easyconfigs/__archive__/p/PyZMQ/PyZMQ-2.2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3-zmq3.eb
similarity index 100%
rename from easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3-zmq3.eb
rename to easybuild/easyconfigs/__archive__/p/PyZMQ/PyZMQ-2.2.0.1-goalf-1.1.0-no-OFED-Python-2.7.3-zmq3.eb
diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-4.1.13-Python-2.7.3-zmq2.eb b/easybuild/easyconfigs/__archive__/p/PyZMQ/PyZMQ-2.2.0.1-ictce-4.1.13-Python-2.7.3-zmq2.eb
similarity index 100%
rename from easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-4.1.13-Python-2.7.3-zmq2.eb
rename to easybuild/easyconfigs/__archive__/p/PyZMQ/PyZMQ-2.2.0.1-ictce-4.1.13-Python-2.7.3-zmq2.eb
diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-4.1.13-Python-2.7.3-zmq3.eb b/easybuild/easyconfigs/__archive__/p/PyZMQ/PyZMQ-2.2.0.1-ictce-4.1.13-Python-2.7.3-zmq3.eb
similarity index 100%
rename from easybuild/easyconfigs/p/PyZMQ/PyZMQ-2.2.0.1-ictce-4.1.13-Python-2.7.3-zmq3.eb
rename to easybuild/easyconfigs/__archive__/p/PyZMQ/PyZMQ-2.2.0.1-ictce-4.1.13-Python-2.7.3-zmq3.eb
diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-goalf-1.1.0-no-OFED-bare.eb b/easybuild/easyconfigs/__archive__/p/Python/Python-2.5.6-goalf-1.1.0-no-OFED-bare.eb
similarity index 100%
rename from easybuild/easyconfigs/p/Python/Python-2.5.6-goalf-1.1.0-no-OFED-bare.eb
rename to easybuild/easyconfigs/__archive__/p/Python/Python-2.5.6-goalf-1.1.0-no-OFED-bare.eb
diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-gompi-1.4.12-no-OFED-bare.eb b/easybuild/easyconfigs/__archive__/p/Python/Python-2.5.6-gompi-1.4.12-no-OFED-bare.eb
similarity index 100%
rename from easybuild/easyconfigs/p/Python/Python-2.5.6-gompi-1.4.12-no-OFED-bare.eb
rename to easybuild/easyconfigs/__archive__/p/Python/Python-2.5.6-gompi-1.4.12-no-OFED-bare.eb
diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-4.0.6-bare.eb b/easybuild/easyconfigs/__archive__/p/Python/Python-2.5.6-ictce-4.0.6-bare.eb
similarity index 100%
rename from easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-4.0.6-bare.eb
rename to easybuild/easyconfigs/__archive__/p/Python/Python-2.5.6-ictce-4.0.6-bare.eb
diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-4.1.13-bare.eb b/easybuild/easyconfigs/__archive__/p/Python/Python-2.5.6-ictce-4.1.13-bare.eb
similarity index 100%
rename from easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-4.1.13-bare.eb
rename to easybuild/easyconfigs/__archive__/p/Python/Python-2.5.6-ictce-4.1.13-bare.eb
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/__archive__/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb
similarity index 97%
rename from easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb
rename to easybuild/easyconfigs/__archive__/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb
index 458773a19ca69818f02788b8168b4ff2f5a57a47..1837c2a90e23ec6328d37cd45137e3fb97f2e81c 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb
+++ b/easybuild/easyconfigs/__archive__/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb
@@ -57,7 +57,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.17.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.1.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/__archive__/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb
similarity index 97%
rename from easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb
rename to easybuild/easyconfigs/__archive__/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb
index 8847eb716ad958585a1462cfcb3ec0db21ebebe6..9adcb16dd0fc05a77e923a342ed18bedfc3ff1ec 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb
+++ b/easybuild/easyconfigs/__archive__/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb
@@ -55,7 +55,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.17.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.1.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb b/easybuild/easyconfigs/__archive__/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb
similarity index 97%
rename from easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb
rename to easybuild/easyconfigs/__archive__/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb
index 8721ba5f0a86b47f2fdf5f236aff04191d94a232..9f64cf9e3237cd1869bfb785b23bded1921a50d9 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb
+++ b/easybuild/easyconfigs/__archive__/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb
@@ -57,7 +57,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.17.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.1.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgoolf-1.1.7.eb b/easybuild/easyconfigs/__archive__/p/Python/Python-2.7.3-cgoolf-1.1.7.eb
similarity index 97%
rename from easybuild/easyconfigs/p/Python/Python-2.7.3-cgoolf-1.1.7.eb
rename to easybuild/easyconfigs/__archive__/p/Python/Python-2.7.3-cgoolf-1.1.7.eb
index feaf2e76ec9ca818190b34aaecaaec25d2218eef..6c61e020b76192652e5907d7579e9a264eafce83 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgoolf-1.1.7.eb
+++ b/easybuild/easyconfigs/__archive__/p/Python/Python-2.7.3-cgoolf-1.1.7.eb
@@ -55,7 +55,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.17.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.1.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb b/easybuild/easyconfigs/__archive__/p/Python/Python-2.7.3-gmpolf-1.4.8.eb
similarity index 97%
rename from easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb
rename to easybuild/easyconfigs/__archive__/p/Python/Python-2.7.3-gmpolf-1.4.8.eb
index 6bbc4316af7a2b38bf3d93880231785261eeffac..f07bce51dbc748781170f077a5ef09adf7ed96b9 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb
+++ b/easybuild/easyconfigs/__archive__/p/Python/Python-2.7.3-gmpolf-1.4.8.eb
@@ -57,7 +57,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.17.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.1.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb b/easybuild/easyconfigs/__archive__/p/Python/Python-2.7.3-gmvolf-1.7.12.eb
similarity index 97%
rename from easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb
rename to easybuild/easyconfigs/__archive__/p/Python/Python-2.7.3-gmvolf-1.7.12.eb
index b6713093818a55f660b79e0b7873fd7df3022900..0b81650489c035518cbf5497e2f5fa209ac7cf0d 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb
+++ b/easybuild/easyconfigs/__archive__/p/Python/Python-2.7.3-gmvolf-1.7.12.eb
@@ -57,7 +57,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.17.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.1.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/__archive__/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb
similarity index 97%
rename from easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb
rename to easybuild/easyconfigs/__archive__/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb
index 383cedbc17d57cd3bcaa0b3a4cc203339e136edd..0bca041c4cdcb33531daf1e1befa009a7c24c688 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb
+++ b/easybuild/easyconfigs/__archive__/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb
@@ -57,7 +57,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.17.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.1.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb
similarity index 97%
rename from easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb
index ffaa43d1efacaaeae03cb1dedd1577162ee8e491..a72f677c7d601f885c894f1f604088dffada4bf0 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/__archive__/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb
@@ -57,7 +57,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.17.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.1.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/p/Python/Python-2.7.3-ictce-4.0.6.eb
similarity index 97%
rename from easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/p/Python/Python-2.7.3-ictce-4.0.6.eb
index 04f049367bdf4021f4ec2af45a36eff04b7ec65f..0b9eaa28a264b77f694cb4f6626c3f285526b754 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/__archive__/p/Python/Python-2.7.3-ictce-4.0.6.eb
@@ -57,7 +57,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.17.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.1.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/p/Python/Python-2.7.3-ictce-4.1.13.eb
similarity index 97%
rename from easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/p/Python/Python-2.7.3-ictce-4.1.13.eb
index f3c7ccd43d50161b87fd57ee4b714764222ddc6c..31b3323fc1338df35714284487f597d3701bd5b0 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/__archive__/p/Python/Python-2.7.3-ictce-4.1.13.eb
@@ -57,7 +57,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.17.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.1.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb b/easybuild/easyconfigs/__archive__/p/Python/Python-2.7.3-iomkl-4.6.13.eb
similarity index 97%
rename from easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb
rename to easybuild/easyconfigs/__archive__/p/Python/Python-2.7.3-iomkl-4.6.13.eb
index b36520e7e8afa0caf010275b25d8ff45e39b3f9c..367298ed3a8ae45572aea1cfcd8154768e766da3 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb
+++ b/easybuild/easyconfigs/__archive__/p/Python/Python-2.7.3-iomkl-4.6.13.eb
@@ -57,7 +57,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.17.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.1.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-iqacml-3.7.3.eb b/easybuild/easyconfigs/__archive__/p/Python/Python-2.7.3-iqacml-3.7.3.eb
similarity index 97%
rename from easybuild/easyconfigs/p/Python/Python-2.7.3-iqacml-3.7.3.eb
rename to easybuild/easyconfigs/__archive__/p/Python/Python-2.7.3-iqacml-3.7.3.eb
index 3806ea6dd78b1b3109b836f1bb8a9c3e28317f9a..32d54215536815ab148f0438c2dc77edaa8d613a 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-iqacml-3.7.3.eb
+++ b/easybuild/easyconfigs/__archive__/p/Python/Python-2.7.3-iqacml-3.7.3.eb
@@ -61,7 +61,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.17.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.1.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb
similarity index 97%
rename from easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb
index e8290ac41a316a88efeea8c17847b1901f087e3c..ad8c5d831799084ffbe388266c19c165979f3dd4 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb
+++ b/easybuild/easyconfigs/__archive__/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb
@@ -55,7 +55,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.17.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.1.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/p/Python/Python-2.7.5-ictce-4.1.13.eb
similarity index 97%
rename from easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/p/Python/Python-2.7.5-ictce-4.1.13.eb
index 45b1ca6a64852bde6f903be6922666582a7f6781..648ac1994a619e0f9b669ad1b52222402d438870 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/__archive__/p/Python/Python-2.7.5-ictce-4.1.13.eb
@@ -60,7 +60,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.17.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.1.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb b/easybuild/easyconfigs/__archive__/p/Python/Python-2.7.5-iqacml-3.7.3.eb
similarity index 97%
rename from easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb
rename to easybuild/easyconfigs/__archive__/p/Python/Python-2.7.5-iqacml-3.7.3.eb
index f5d6db6b40e4e6eb5965e35ca940e59d79e76e00..09835cdeb7bee91e99dc9c5a66810751d9bc7741 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb
+++ b/easybuild/easyconfigs/__archive__/p/Python/Python-2.7.5-iqacml-3.7.3.eb
@@ -62,7 +62,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.17.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.1.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/p/Python/Python-2.7.6-ictce-4.1.13.eb
similarity index 97%
rename from easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/p/Python/Python-2.7.6-ictce-4.1.13.eb
index 146417325f9f850b95a15e73de92e783b47a9cb3..d289934164516bc5b8b1af49806bd4cff549e2be 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/__archive__/p/Python/Python-2.7.6-ictce-4.1.13.eb
@@ -60,7 +60,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.19.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.4.1', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb
similarity index 96%
rename from easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb
index 9282981b3f706b4a8a9172b3f5568c45db80f26d..ae3c7ddc7a7ccc0d2f636873ff6b0ee8bfbf5d99 100644
--- a/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/__archive__/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb
@@ -49,7 +49,7 @@ exts_list = [
         'source_urls': ['http://bitbucket.org/mpi4py/mpi4py/downloads/'],
     }),
     ('Cython', '0.19.1', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('deap', '0.9.1', {
         'source_urls': ['https://pypi.python.org/packages/source/d/deap/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/p/Python/Python-3.2.3-ictce-4.0.6.eb
similarity index 96%
rename from easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/p/Python/Python-3.2.3-ictce-4.0.6.eb
index b110143efd89ed1e7c341ca56f0d529cf1647d6d..f10e1b0d7d98fd23dba9acd386f59ae5519b5617 100644
--- a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/__archive__/p/Python/Python-3.2.3-ictce-4.0.6.eb
@@ -51,7 +51,7 @@ exts_list = [
         'source_urls': ['http://bitbucket.org/mpi4py/mpi4py/downloads/'],
     }),
     ('Cython', '0.19.1', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('deap', '0.9.1', {
         'source_urls': ['https://pypi.python.org/packages/source/d/deap/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/p/Python/Python-3.3.2-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/p/Python/Python-3.3.2-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/p/packmol/packmol-13.243-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/p/packmol/packmol-13.243-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/p/packmol/packmol-13.243-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/p/packmol/packmol-13.243-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/p/pandas/pandas-0.11.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/p/pandas/pandas-0.11.0-ictce-4.1.13-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/p/pandas/pandas-0.11.0-ictce-4.1.13-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/p/pandas/pandas-0.11.0-ictce-4.1.13-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/p/parallel/parallel-20130122-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/p/parallel/parallel-20130122-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/p/parallel/parallel-20130122-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/p/parallel/parallel-20130122-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/p/parallel/parallel-20130122-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/p/parallel/parallel-20130122-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/p/parallel/parallel-20130122-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/p/parallel/parallel-20130122-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/p/paycheck/paycheck-1.0.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/p/paycheck/paycheck-1.0.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/p/paycheck/paycheck-1.0.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/p/paycheck/paycheck-1.0.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/p/paycheck/paycheck-1.0.2-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/p/paycheck/paycheck-1.0.2-ictce-4.1.13-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/p/paycheck/paycheck-1.0.2-ictce-4.1.13-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/p/paycheck/paycheck-1.0.2-ictce-4.1.13-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/p/paycheck/paycheck-1.0.2-iomkl-4.6.13-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/p/paycheck/paycheck-1.0.2-iomkl-4.6.13-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/p/paycheck/paycheck-1.0.2-iomkl-4.6.13-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/p/paycheck/paycheck-1.0.2-iomkl-4.6.13-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/p/petsc4py/petsc4py-3.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/p/petsc4py/petsc4py-3.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/p/petsc4py/petsc4py-3.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/p/petsc4py/petsc4py-3.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/p/petsc4py/petsc4py-3.3-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/p/petsc4py/petsc4py-3.3-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/p/petsc4py/petsc4py-3.3-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/p/petsc4py/petsc4py-3.3-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/p/pixman/pixman-0.28.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/p/pixman/pixman-0.28.2-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/p/pixman/pixman-0.28.2-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/p/pixman/pixman-0.28.2-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/p/pixman/pixman-0.28.2-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/p/pixman/pixman-0.28.2-ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/p/pixman/pixman-0.28.2-ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/p/pixman/pixman-0.28.2-ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/p/pixman/pixman-0.28.2-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/p/pixman/pixman-0.28.2-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/p/pixman/pixman-0.28.2-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/p/pixman/pixman-0.28.2-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/p/pkg-config/pkg-config-0.27.1-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/p/pkg-config/pkg-config-0.27.1-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/p/pkg-config/pkg-config-0.27.1-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/p/pkg-config/pkg-config-0.27.1-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/p/printproto/printproto-1.0.5-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/p/printproto/printproto-1.0.5-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/p/printproto/printproto-1.0.5-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/p/printproto/printproto-1.0.5-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/p/problog/problog-1.1-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/p/problog/problog-1.1-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/p/problog/problog-1.1-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/p/problog/problog-1.1-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/p/pyTables/pyTables-2.4.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/p/pyTables/pyTables-2.4.0-ictce-4.1.13-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/p/pyTables/pyTables-2.4.0-ictce-4.1.13-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/p/pyTables/pyTables-2.4.0-ictce-4.1.13-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/p/python-dateutil/python-dateutil-2.1-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/p/python-dateutil/python-dateutil-2.1-ictce-4.1.13-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/p/python-dateutil/python-dateutil-2.1-ictce-4.1.13-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/p/python-dateutil/python-dateutil-2.1-ictce-4.1.13-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/p/python-meep/python-meep-1.4.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/p/python-meep/python-meep-1.4.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/p/python-meep/python-meep-1.4.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/p/python-meep/python-meep-1.4.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/p/python-meep/python-meep-1.4.2-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/p/python-meep/python-meep-1.4.2-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/p/python-meep/python-meep-1.4.2-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/p/python-meep/python-meep-1.4.2-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/q/QLogicMPI/QLogicMPI-2.9-926.1005_rhel5_qlc.eb b/easybuild/easyconfigs/__archive__/q/QLogicMPI/QLogicMPI-2.9-926.1005_rhel5_qlc.eb
similarity index 100%
rename from easybuild/easyconfigs/q/QLogicMPI/QLogicMPI-2.9-926.1005_rhel5_qlc.eb
rename to easybuild/easyconfigs/__archive__/q/QLogicMPI/QLogicMPI-2.9-926.1005_rhel5_qlc.eb
diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/q/Qt/Qt-4.8.4-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/q/Qt/Qt-4.8.4-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/q/Qt/Qt-4.8.4-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/q/Qt/Qt-4.8.4-gompi-1.4.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/q/Qt/Qt-4.8.4-gompi-1.4.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/q/Qt/Qt-4.8.4-gompi-1.4.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/q/Qt/Qt-4.8.4-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/q/Qt/Qt-4.8.4-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/q/Qt/Qt-4.8.4-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/q/Qt/Qt-4.8.4-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/q/Qt/Qt-4.8.4-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.5-gmpolf-1.4.8.eb b/easybuild/easyconfigs/__archive__/q/Qt/Qt-4.8.5-gmpolf-1.4.8.eb
similarity index 100%
rename from easybuild/easyconfigs/q/Qt/Qt-4.8.5-gmpolf-1.4.8.eb
rename to easybuild/easyconfigs/__archive__/q/Qt/Qt-4.8.5-gmpolf-1.4.8.eb
diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.5-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/q/Qt/Qt-4.8.5-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/q/Qt/Qt-4.8.5-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/q/Qt/Qt-4.8.5-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goalf-1.1.0-no-OFED-hybrid.eb b/easybuild/easyconfigs/__archive__/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goalf-1.1.0-no-OFED-hybrid.eb
similarity index 100%
rename from easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goalf-1.1.0-no-OFED-hybrid.eb
rename to easybuild/easyconfigs/__archive__/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goalf-1.1.0-no-OFED-hybrid.eb
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/q/QuantumESPRESSO/QuantumESPRESSO-4.2-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-4.0.6-hybrid.eb b/easybuild/easyconfigs/__archive__/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-4.0.6-hybrid.eb
similarity index 100%
rename from easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-4.0.6-hybrid.eb
rename to easybuild/easyconfigs/__archive__/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-4.0.6-hybrid.eb
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goalf-1.1.0-no-OFED-hybrid.eb b/easybuild/easyconfigs/__archive__/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goalf-1.1.0-no-OFED-hybrid.eb
similarity index 100%
rename from easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goalf-1.1.0-no-OFED-hybrid.eb
rename to easybuild/easyconfigs/__archive__/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goalf-1.1.0-no-OFED-hybrid.eb
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-4.0.6-hybrid.eb b/easybuild/easyconfigs/__archive__/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-4.0.6-hybrid.eb
similarity index 100%
rename from easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-4.0.6-hybrid.eb
rename to easybuild/easyconfigs/__archive__/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-4.0.6-hybrid.eb
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/q/QuantumESPRESSO/QuantumESPRESSO-5.0.2-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/r/R/R-2.15.2-goalf-1.1.0-no-OFED-bare.eb b/easybuild/easyconfigs/__archive__/r/R/R-2.15.2-goalf-1.1.0-no-OFED-bare.eb
similarity index 100%
rename from easybuild/easyconfigs/r/R/R-2.15.2-goalf-1.1.0-no-OFED-bare.eb
rename to easybuild/easyconfigs/__archive__/r/R/R-2.15.2-goalf-1.1.0-no-OFED-bare.eb
diff --git a/easybuild/easyconfigs/r/R/R-2.15.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/r/R/R-2.15.2-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/r/R/R-2.15.2-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/r/R/R-2.15.2-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/r/R/R-2.15.2-ictce-4.0.10.eb b/easybuild/easyconfigs/__archive__/r/R/R-2.15.2-ictce-4.0.10.eb
similarity index 100%
rename from easybuild/easyconfigs/r/R/R-2.15.2-ictce-4.0.10.eb
rename to easybuild/easyconfigs/__archive__/r/R/R-2.15.2-ictce-4.0.10.eb
diff --git a/easybuild/easyconfigs/r/R/R-2.15.2-ictce-4.0.6-bare.eb b/easybuild/easyconfigs/__archive__/r/R/R-2.15.2-ictce-4.0.6-bare.eb
similarity index 100%
rename from easybuild/easyconfigs/r/R/R-2.15.2-ictce-4.0.6-bare.eb
rename to easybuild/easyconfigs/__archive__/r/R/R-2.15.2-ictce-4.0.6-bare.eb
diff --git a/easybuild/easyconfigs/r/R/R-2.15.2-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/r/R/R-2.15.2-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/r/R/R-2.15.2-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/r/R/R-2.15.2-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/r/R/R-2.15.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/r/R/R-2.15.3-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/r/R/R-2.15.3-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/r/R/R-2.15.3-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/r/R/R-2.15.3-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/r/R/R-2.15.3-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/r/R/R-2.15.3-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/r/R/R-2.15.3-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/r/R/R-3.0.1-goalf-1.1.0-no-OFED-bare.eb b/easybuild/easyconfigs/__archive__/r/R/R-3.0.1-goalf-1.1.0-no-OFED-bare.eb
similarity index 100%
rename from easybuild/easyconfigs/r/R/R-3.0.1-goalf-1.1.0-no-OFED-bare.eb
rename to easybuild/easyconfigs/__archive__/r/R/R-3.0.1-goalf-1.1.0-no-OFED-bare.eb
diff --git a/easybuild/easyconfigs/r/R/R-3.0.1-ictce-4.0.6-bare.eb b/easybuild/easyconfigs/__archive__/r/R/R-3.0.1-ictce-4.0.6-bare.eb
similarity index 100%
rename from easybuild/easyconfigs/r/R/R-3.0.1-ictce-4.0.6-bare.eb
rename to easybuild/easyconfigs/__archive__/r/R/R-3.0.1-ictce-4.0.6-bare.eb
diff --git a/easybuild/easyconfigs/r/R/R-3.0.1-ictce-4.1.13-bare.eb b/easybuild/easyconfigs/__archive__/r/R/R-3.0.1-ictce-4.1.13-bare.eb
similarity index 100%
rename from easybuild/easyconfigs/r/R/R-3.0.1-ictce-4.1.13-bare.eb
rename to easybuild/easyconfigs/__archive__/r/R/R-3.0.1-ictce-4.1.13-bare.eb
diff --git a/easybuild/easyconfigs/r/R/R-3.1.1-ictce-6.3.5-bare-mt.eb b/easybuild/easyconfigs/__archive__/r/R/R-3.1.1-ictce-6.3.5-bare-mt.eb
similarity index 100%
rename from easybuild/easyconfigs/r/R/R-3.1.1-ictce-6.3.5-bare-mt.eb
rename to easybuild/easyconfigs/__archive__/r/R/R-3.1.1-ictce-6.3.5-bare-mt.eb
diff --git a/easybuild/easyconfigs/r/R/R-3.1.1-ictce-6.3.5-default-mt.eb b/easybuild/easyconfigs/__archive__/r/R/R-3.1.1-ictce-6.3.5-default-mt.eb
similarity index 100%
rename from easybuild/easyconfigs/r/R/R-3.1.1-ictce-6.3.5-default-mt.eb
rename to easybuild/easyconfigs/__archive__/r/R/R-3.1.1-ictce-6.3.5-default-mt.eb
diff --git a/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-4.1.13-hybrid-sse3.eb b/easybuild/easyconfigs/__archive__/r/RAxML/RAxML-7.2.6-ictce-4.1.13-hybrid-sse3.eb
similarity index 100%
rename from easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-4.1.13-hybrid-sse3.eb
rename to easybuild/easyconfigs/__archive__/r/RAxML/RAxML-7.2.6-ictce-4.1.13-hybrid-sse3.eb
diff --git a/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-4.1.13-mpi-sse3.eb b/easybuild/easyconfigs/__archive__/r/RAxML/RAxML-7.2.6-ictce-4.1.13-mpi-sse3.eb
similarity index 100%
rename from easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-4.1.13-mpi-sse3.eb
rename to easybuild/easyconfigs/__archive__/r/RAxML/RAxML-7.2.6-ictce-4.1.13-mpi-sse3.eb
diff --git a/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-4.1.13-mt-sse3.eb b/easybuild/easyconfigs/__archive__/r/RAxML/RAxML-7.2.6-ictce-4.1.13-mt-sse3.eb
similarity index 100%
rename from easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-4.1.13-mt-sse3.eb
rename to easybuild/easyconfigs/__archive__/r/RAxML/RAxML-7.2.6-ictce-4.1.13-mt-sse3.eb
diff --git a/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-4.1.13-seq-sse3.eb b/easybuild/easyconfigs/__archive__/r/RAxML/RAxML-7.2.6-ictce-4.1.13-seq-sse3.eb
similarity index 100%
rename from easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-4.1.13-seq-sse3.eb
rename to easybuild/easyconfigs/__archive__/r/RAxML/RAxML-7.2.6-ictce-4.1.13-seq-sse3.eb
diff --git a/easybuild/easyconfigs/r/RNAz/RNAz-2.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/r/RNAz/RNAz-2.1-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/r/RNAz/RNAz-2.1-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/r/RNAz/RNAz-2.1-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/r/RNAz/RNAz-2.1-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/r/RNAz/RNAz-2.1-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/r/RNAz/RNAz-2.1-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/r/RNAz/RNAz-2.1-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.01-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/r/ROOT/ROOT-v5.34.01-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/r/ROOT/ROOT-v5.34.01-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/r/ROOT/ROOT-v5.34.01-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.01-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/r/ROOT/ROOT-v5.34.01-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/r/ROOT/ROOT-v5.34.01-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/r/ROOT/ROOT-v5.34.01-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/r/Rosetta/Rosetta-3.5-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/r/Rosetta/Rosetta-3.5-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/r/Rosetta/Rosetta-3.5-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/r/Rosetta/Rosetta-3.5-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-0.1.18-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/s/SAMtools/SAMtools-0.1.18-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/s/SAMtools/SAMtools-0.1.18-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/s/SAMtools/SAMtools-0.1.18-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-0.1.18-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/s/SAMtools/SAMtools-0.1.18-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/s/SAMtools/SAMtools-0.1.18-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/s/SAMtools/SAMtools-0.1.18-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/s/SCOOP/SCOOP-0.5.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/s/SCOOP/SCOOP-0.5.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/s/SCOOP/SCOOP-0.5.3-ictce-4.1.13-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/s/SCOOP/SCOOP-0.5.3-ictce-4.1.13-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/s/SCOOP/SCOOP-0.5.3-ictce-4.1.13-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/s/SCOTCH/SCOTCH-5.1.12b_esmumps-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/s/SCOTCH/SCOTCH-5.1.12b_esmumps-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/s/SCOTCH/SCOTCH-5.1.12b_esmumps-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/s/SCOTCH/SCOTCH-5.1.12b_esmumps-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/s/SCOTCH/SCOTCH-5.1.12b_esmumps-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/s/SCOTCH/SCOTCH-5.1.12b_esmumps-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/s/SCOTCH/SCOTCH-5.1.12b_esmumps-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/s/SCOTCH/SCOTCH-5.1.12b_esmumps-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/s/SCOTCH/SCOTCH-5.1.12b_esmumps-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/s/SCOTCH/SCOTCH-5.1.12b_esmumps-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/s/SCOTCH/SCOTCH-5.1.12b_esmumps-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/s/SCOTCH/SCOTCH-5.1.12b_esmumps-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.0_esmumps-gmpolf-1.4.8.eb b/easybuild/easyconfigs/__archive__/s/SCOTCH/SCOTCH-6.0.0_esmumps-gmpolf-1.4.8.eb
similarity index 100%
rename from easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.0_esmumps-gmpolf-1.4.8.eb
rename to easybuild/easyconfigs/__archive__/s/SCOTCH/SCOTCH-6.0.0_esmumps-gmpolf-1.4.8.eb
diff --git a/easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.0_esmumps-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/s/SCOTCH/SCOTCH-6.0.0_esmumps-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.0_esmumps-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/s/SCOTCH/SCOTCH-6.0.0_esmumps-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.0_esmumps-iqacml-4.4.13.eb b/easybuild/easyconfigs/__archive__/s/SCOTCH/SCOTCH-6.0.0_esmumps-iqacml-4.4.13.eb
similarity index 100%
rename from easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.0_esmumps-iqacml-4.4.13.eb
rename to easybuild/easyconfigs/__archive__/s/SCOTCH/SCOTCH-6.0.0_esmumps-iqacml-4.4.13.eb
diff --git a/easybuild/easyconfigs/s/SCons/SCons-2.3.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/s/SCons/SCons-2.3.0-ictce-4.1.13-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/s/SCons/SCons-2.3.0-ictce-4.1.13-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/s/SCons/SCons-2.3.0-ictce-4.1.13-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/s/SCons/SCons-2.3.0-ictce-4.1.13-Python-2.7.5.eb b/easybuild/easyconfigs/__archive__/s/SCons/SCons-2.3.0-ictce-4.1.13-Python-2.7.5.eb
similarity index 100%
rename from easybuild/easyconfigs/s/SCons/SCons-2.3.0-ictce-4.1.13-Python-2.7.5.eb
rename to easybuild/easyconfigs/__archive__/s/SCons/SCons-2.3.0-ictce-4.1.13-Python-2.7.5.eb
diff --git a/easybuild/easyconfigs/s/SHRiMP/SHRiMP-2.2.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/s/SHRiMP/SHRiMP-2.2.3-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/s/SHRiMP/SHRiMP-2.2.3-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/s/SHRiMP/SHRiMP-2.2.3-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/s/SHRiMP/SHRiMP-2.2.3-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/s/SHRiMP/SHRiMP-2.2.3-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/s/SHRiMP/SHRiMP-2.2.3-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/s/SHRiMP/SHRiMP-2.2.3-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/s/SLEPc/SLEPc-3.3-p1-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/s/SLEPc/SLEPc-3.3-p1-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/s/SLEPc/SLEPc-3.3-p1-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/s/SLEPc/SLEPc-3.3-p1-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/s/SLEPc/SLEPc-3.3-p1-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/s/SLEPc/SLEPc-3.3-p1-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/s/SLEPc/SLEPc-3.3-p1-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/s/SLEPc/SLEPc-3.3-p1-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/s/SOAPdenovo/SOAPdenovo-1.05-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/s/SOAPdenovo/SOAPdenovo-1.05-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/s/SOAPdenovo/SOAPdenovo-1.05-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/s/SOAPdenovo/SOAPdenovo-1.05-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/s/SOAPdenovo/SOAPdenovo-1.05-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/s/SOAPdenovo/SOAPdenovo-1.05-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/s/SOAPdenovo/SOAPdenovo-1.05-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/s/SOAPdenovo/SOAPdenovo-1.05-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/s/SWIG/SWIG-2.0.4-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/s/SWIG/SWIG-2.0.4-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/s/SWIG/SWIG-2.0.4-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/s/SWIG/SWIG-2.0.4-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/s/SWIG/SWIG-2.0.4-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/s/SWIG/SWIG-2.0.4-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/s/SWIG/SWIG-2.0.4-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/s/SWIG/SWIG-2.0.4-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/s/Sablotron/Sablotron-1.0.3-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/s/Sablotron/Sablotron-1.0.3-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/s/Sablotron/Sablotron-1.0.3-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-1.8.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4-LAPACK-3.4.0-BLACS-1.1.eb b/easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-1.8.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4-LAPACK-3.4.0-BLACS-1.1.eb
similarity index 100%
rename from easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-1.8.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4-LAPACK-3.4.0-BLACS-1.1.eb
rename to easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-1.8.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4-LAPACK-3.4.0-BLACS-1.1.eb
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-1.8.0-iiqmpi-3.3.0-ACML-5.3.0-ifort-64bit-BLACS-1.1.eb b/easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-1.8.0-iiqmpi-3.3.0-ACML-5.3.0-ifort-64bit-BLACS-1.1.eb
similarity index 100%
rename from easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-1.8.0-iiqmpi-3.3.0-ACML-5.3.0-ifort-64bit-BLACS-1.1.eb
rename to easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-1.8.0-iiqmpi-3.3.0-ACML-5.3.0-ifort-64bit-BLACS-1.1.eb
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.1-gompi-1.1.0-no-OFED-ATLAS-3.8.4-LAPACK-3.4.0.eb b/easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-2.0.1-gompi-1.1.0-no-OFED-ATLAS-3.8.4-LAPACK-3.4.0.eb
similarity index 100%
rename from easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.1-gompi-1.1.0-no-OFED-ATLAS-3.8.4-LAPACK-3.4.0.eb
rename to easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-2.0.1-gompi-1.1.0-no-OFED-ATLAS-3.8.4-LAPACK-3.4.0.eb
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmpich-1.1.6-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmpich-1.1.6-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
similarity index 100%
rename from easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmpich-1.1.6-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
rename to easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmpich-1.1.6-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmvapich2-1.1.12rc1-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmvapich2-1.1.12rc1-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
similarity index 100%
rename from easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmvapich2-1.1.12rc1-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
rename to easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmvapich2-1.1.12rc1-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmvapich2-1.2.7-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmvapich2-1.2.7-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
similarity index 100%
rename from easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmvapich2-1.2.7-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
rename to easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmvapich2-1.2.7-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgompi-1.1.7-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-2.0.2-cgompi-1.1.7-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
similarity index 100%
rename from easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgompi-1.1.7-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
rename to easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-2.0.2-cgompi-1.1.7-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmpich-1.4.8-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-2.0.2-gmpich-1.4.8-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
similarity index 100%
rename from easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmpich-1.4.8-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
rename to easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-2.0.2-gmpich-1.4.8-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.12-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.12-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
similarity index 100%
rename from easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.12-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
rename to easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.12-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.12rc1-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.12rc1-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
similarity index 100%
rename from easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.12rc1-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
rename to easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.12rc1-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.9a2-ACML-5.2.0-gfortran-64bit.eb b/easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.9a2-ACML-5.2.0-gfortran-64bit.eb
similarity index 100%
rename from easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.9a2-ACML-5.2.0-gfortran-64bit.eb
rename to easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.9a2-ACML-5.2.0-gfortran-64bit.eb
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.3.12-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.3.12-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
similarity index 100%
rename from easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.3.12-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
rename to easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.3.12-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.4.10-no-OFED-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.4.10-no-OFED-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
similarity index 100%
rename from easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.4.10-no-OFED-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
rename to easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.4.10-no-OFED-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.12-ATLAS-3.10.1-LAPACK-3.4.2.eb b/easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.12-ATLAS-3.10.1-LAPACK-3.4.2.eb
similarity index 100%
rename from easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.12-ATLAS-3.10.1-LAPACK-3.4.2.eb
rename to easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.12-ATLAS-3.10.1-LAPACK-3.4.2.eb
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.12-no-OFED-ATLAS-3.10.1-LAPACK-3.4.2.eb b/easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.12-no-OFED-ATLAS-3.10.1-LAPACK-3.4.2.eb
similarity index 100%
rename from easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.12-no-OFED-ATLAS-3.10.1-LAPACK-3.4.2.eb
rename to easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.12-no-OFED-ATLAS-3.10.1-LAPACK-3.4.2.eb
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.14-no-OFED-OpenBLAS-0.2.8-LAPACK-3.5.0.eb b/easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.14-no-OFED-OpenBLAS-0.2.8-LAPACK-3.5.0.eb
similarity index 100%
rename from easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.14-no-OFED-OpenBLAS-0.2.8-LAPACK-3.5.0.eb
rename to easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.14-no-OFED-OpenBLAS-0.2.8-LAPACK-3.5.0.eb
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompic-2.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb b/easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-2.0.2-gompic-2.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb
similarity index 100%
rename from easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompic-2.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb
rename to easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-2.0.2-gompic-2.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gpsmpi-2014.12-OpenBLAS-0.2.12-LAPACK-3.5.0.eb b/easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-2.0.2-gpsmpi-2014.12-OpenBLAS-0.2.12-LAPACK-3.5.0.eb
similarity index 100%
rename from easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gpsmpi-2014.12-OpenBLAS-0.2.12-LAPACK-3.5.0.eb
rename to easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-2.0.2-gpsmpi-2014.12-OpenBLAS-0.2.12-LAPACK-3.5.0.eb
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-iiqmpi-4.4.13-ACML-5.3.1-ifort-64bit.eb b/easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-2.0.2-iiqmpi-4.4.13-ACML-5.3.1-ifort-64bit.eb
similarity index 100%
rename from easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-iiqmpi-4.4.13-ACML-5.3.1-ifort-64bit.eb
rename to easybuild/easyconfigs/__archive__/s/ScaLAPACK/ScaLAPACK-2.0.2-iiqmpi-4.4.13-ACML-5.3.1-ifort-64bit.eb
diff --git a/easybuild/easyconfigs/s/Scalasca/Scalasca-1.4.3-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/s/Scalasca/Scalasca-1.4.3-gompi-1.4.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/s/Scalasca/Scalasca-1.4.3-gompi-1.4.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/s/Scalasca/Scalasca-1.4.3-gompi-1.4.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/s/Scalasca/Scalasca-2.0-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/s/Scalasca/Scalasca-2.0-gompi-1.4.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/s/Scalasca/Scalasca-2.0-gompi-1.4.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/s/Scalasca/Scalasca-2.0-gompi-1.4.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-gmpolf-1.4.8-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/s/ScientificPython/ScientificPython-2.8-gmpolf-1.4.8-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-gmpolf-1.4.8-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/s/ScientificPython/ScientificPython-2.8-gmpolf-1.4.8-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/s/ScientificPython/ScientificPython-2.8-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/s/ScientificPython/ScientificPython-2.8-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/s/ScientificPython/ScientificPython-2.8-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/s/ScientificPython/ScientificPython-2.8-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/s/Score-P/Score-P-1.2.1-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/s/Score-P/Score-P-1.2.1-gompi-1.4.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/s/Score-P/Score-P-1.2.1-gompi-1.4.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/s/Score-P/Score-P-1.2.1-gompi-1.4.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/s/Shapely/Shapely-1.2.15-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/s/Shapely/Shapely-1.2.15-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/s/Shapely/Shapely-1.2.15-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/s/Shapely/Shapely-1.2.15-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/s/Sphinx/Sphinx-1.1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/s/Sphinx/Sphinx-1.1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/s/Sphinx/Sphinx-1.1.3-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/s/Sphinx/Sphinx-1.1.3-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/s/Stacks/Stacks-1.03-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/s/Stacks/Stacks-1.03-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/s/Stacks/Stacks-1.03-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/s/Stacks/Stacks-1.03-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/s/Stow/Stow-1.3.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/s/Stow/Stow-1.3.3-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/s/Stow/Stow-1.3.3-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/s/Stow/Stow-1.3.3-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/s/Stow/Stow-1.3.3-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/s/Stow/Stow-1.3.3-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/s/Stow/Stow-1.3.3-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/s/Stow/Stow-1.3.3-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-3.7.0-gmpolf-1.4.8-withparmetis.eb b/easybuild/easyconfigs/__archive__/s/SuiteSparse/SuiteSparse-3.7.0-gmpolf-1.4.8-withparmetis.eb
similarity index 100%
rename from easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-3.7.0-gmpolf-1.4.8-withparmetis.eb
rename to easybuild/easyconfigs/__archive__/s/SuiteSparse/SuiteSparse-3.7.0-gmpolf-1.4.8-withparmetis.eb
diff --git a/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-3.7.0-goalf-1.1.0-no-OFED-withparmetis.eb b/easybuild/easyconfigs/__archive__/s/SuiteSparse/SuiteSparse-3.7.0-goalf-1.1.0-no-OFED-withparmetis.eb
similarity index 100%
rename from easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-3.7.0-goalf-1.1.0-no-OFED-withparmetis.eb
rename to easybuild/easyconfigs/__archive__/s/SuiteSparse/SuiteSparse-3.7.0-goalf-1.1.0-no-OFED-withparmetis.eb
diff --git a/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-3.7.0-ictce-4.0.6-withparmetis.eb b/easybuild/easyconfigs/__archive__/s/SuiteSparse/SuiteSparse-3.7.0-ictce-4.0.6-withparmetis.eb
similarity index 100%
rename from easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-3.7.0-ictce-4.0.6-withparmetis.eb
rename to easybuild/easyconfigs/__archive__/s/SuiteSparse/SuiteSparse-3.7.0-ictce-4.0.6-withparmetis.eb
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-gmpolf-1.4.8.eb b/easybuild/easyconfigs/__archive__/s/Szip/Szip-2.1-gmpolf-1.4.8.eb
similarity index 100%
rename from easybuild/easyconfigs/s/Szip/Szip-2.1-gmpolf-1.4.8.eb
rename to easybuild/easyconfigs/__archive__/s/Szip/Szip-2.1-gmpolf-1.4.8.eb
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/s/Szip/Szip-2.1-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/s/Szip/Szip-2.1-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/s/Szip/Szip-2.1-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/s/Szip/Szip-2.1-ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/s/Szip/Szip-2.1-ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/s/Szip/Szip-2.1-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/s/Szip/Szip-2.1-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/s/Szip/Szip-2.1-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/s/Szip/Szip-2.1-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/s/Szip/Szip-2.1-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-iqacml-3.7.3.eb b/easybuild/easyconfigs/__archive__/s/Szip/Szip-2.1-iqacml-3.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/s/Szip/Szip-2.1-iqacml-3.7.3.eb
rename to easybuild/easyconfigs/__archive__/s/Szip/Szip-2.1-iqacml-3.7.3.eb
diff --git a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.13-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/s/scikit-learn/scikit-learn-0.13-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.13-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/s/scikit-learn/scikit-learn-0.13-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.13-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/s/scikit-learn/scikit-learn-0.13-ictce-4.1.13-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.13-ictce-4.1.13-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/s/scikit-learn/scikit-learn-0.13-ictce-4.1.13-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-4.1.13-Python-2.7.5.eb b/easybuild/easyconfigs/__archive__/s/scikit-learn/scikit-learn-0.14-ictce-4.1.13-Python-2.7.5.eb
similarity index 100%
rename from easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.14-ictce-4.1.13-Python-2.7.5.eb
rename to easybuild/easyconfigs/__archive__/s/scikit-learn/scikit-learn-0.14-ictce-4.1.13-Python-2.7.5.eb
diff --git a/easybuild/easyconfigs/s/scipy/scipy-0.11.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/s/scipy/scipy-0.11.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/s/scipy/scipy-0.11.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/s/scipy/scipy-0.11.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/s/scipy/scipy-0.11.0-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/s/scipy/scipy-0.11.0-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/s/scipy/scipy-0.11.0-ictce-4.1.13-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/s/scipy/scipy-0.11.0-ictce-4.1.13-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/s/scipy/scipy-0.11.0-ictce-4.1.13-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/s/setuptools/setuptools-0.6c11-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/s/setuptools/setuptools-0.6c11-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/s/setuptools/setuptools-0.6c11-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/s/setuptools/setuptools-0.6c11-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/s/setuptools/setuptools-0.6c11-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/s/setuptools/setuptools-0.6c11-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/s/setuptools/setuptools-0.6c11-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/s/setuptools/setuptools-0.6c11-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/s/sparsehash/sparsehash-2.0.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/s/sparsehash/sparsehash-2.0.2-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/s/sparsehash/sparsehash-2.0.2-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/s/sparsehash/sparsehash-2.0.2-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/s/sparsehash/sparsehash-2.0.2-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/s/sparsehash/sparsehash-2.0.2-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/s/sparsehash/sparsehash-2.0.2-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/s/sparsehash/sparsehash-2.0.2-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/s/sympy/sympy-0.7.2-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/s/sympy/sympy-0.7.2-ictce-4.1.13-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/s/sympy/sympy-0.7.2-ictce-4.1.13-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/s/sympy/sympy-0.7.2-ictce-4.1.13-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/t/TAMkin/TAMkin-1.0.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/t/TAMkin/TAMkin-1.0.0-ictce-4.1.13-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/t/TAMkin/TAMkin-1.0.0-ictce-4.1.13-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/t/TAMkin/TAMkin-1.0.0-ictce-4.1.13-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/t/TAU/TAU-2.22.2-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/t/TAU/TAU-2.22.2-gompi-1.4.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/t/TAU/TAU-2.22.2-gompi-1.4.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/t/TAU/TAU-2.22.2-gompi-1.4.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/t/Tar/Tar-1.26-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/t/Tar/Tar-1.26-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/t/Tar/Tar-1.26-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/t/Tar/Tar-1.26-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/t/Tar/Tar-1.26-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/t/Tar/Tar-1.26-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/t/Tar/Tar-1.26-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/t/Tar/Tar-1.26-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/t/Tcl/Tcl-8.5.12-gmvapich2-1.7.12.eb b/easybuild/easyconfigs/__archive__/t/Tcl/Tcl-8.5.12-gmvapich2-1.7.12.eb
similarity index 100%
rename from easybuild/easyconfigs/t/Tcl/Tcl-8.5.12-gmvapich2-1.7.12.eb
rename to easybuild/easyconfigs/__archive__/t/Tcl/Tcl-8.5.12-gmvapich2-1.7.12.eb
diff --git a/easybuild/easyconfigs/t/Tcl/Tcl-8.5.12-gmvolf-1.7.12.eb b/easybuild/easyconfigs/__archive__/t/Tcl/Tcl-8.5.12-gmvolf-1.7.12.eb
similarity index 100%
rename from easybuild/easyconfigs/t/Tcl/Tcl-8.5.12-gmvolf-1.7.12.eb
rename to easybuild/easyconfigs/__archive__/t/Tcl/Tcl-8.5.12-gmvolf-1.7.12.eb
diff --git a/easybuild/easyconfigs/t/Tcl/Tcl-8.5.12-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/t/Tcl/Tcl-8.5.12-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/t/Tcl/Tcl-8.5.12-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/t/Tcl/Tcl-8.5.12-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/t/Tcl/Tcl-8.5.12-goolfc-1.3.12.eb b/easybuild/easyconfigs/__archive__/t/Tcl/Tcl-8.5.12-goolfc-1.3.12.eb
similarity index 100%
rename from easybuild/easyconfigs/t/Tcl/Tcl-8.5.12-goolfc-1.3.12.eb
rename to easybuild/easyconfigs/__archive__/t/Tcl/Tcl-8.5.12-goolfc-1.3.12.eb
diff --git a/easybuild/easyconfigs/t/Tcl/Tcl-8.5.12-ictce-4.0.10.eb b/easybuild/easyconfigs/__archive__/t/Tcl/Tcl-8.5.12-ictce-4.0.10.eb
similarity index 100%
rename from easybuild/easyconfigs/t/Tcl/Tcl-8.5.12-ictce-4.0.10.eb
rename to easybuild/easyconfigs/__archive__/t/Tcl/Tcl-8.5.12-ictce-4.0.10.eb
diff --git a/easybuild/easyconfigs/t/Tcl/Tcl-8.5.12-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/t/Tcl/Tcl-8.5.12-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/t/Tcl/Tcl-8.5.12-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/t/Tcl/Tcl-8.5.12-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/t/Theano/Theano-0.5.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/t/Theano/Theano-0.5.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/t/Theano/Theano-0.5.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/t/Theano/Theano-0.5.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/t/Theano/Theano-0.5.0-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/t/Theano/Theano-0.5.0-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/t/Theano/Theano-0.5.0-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/t/Theano/Theano-0.5.0-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/t/TiCCutils/TiCCutils-0.3-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.3-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/t/TiCCutils/TiCCutils-0.3-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.3-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/t/TiCCutils/TiCCutils-0.3-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.3-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/t/TiCCutils/TiCCutils-0.3-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/t/TiMBL/TiMBL-6.4.3-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.3-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/t/TiMBL/TiMBL-6.4.3-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.3-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/t/TiMBL/TiMBL-6.4.3-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.3-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/t/TiMBL/TiMBL-6.4.3-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/t/TinySVM/TinySVM-0.09-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/t/TinySVM/TinySVM-0.09-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/t/TinySVM/TinySVM-0.09-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/t/TinySVM/TinySVM-0.09-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/t/TinySVM/TinySVM-0.09-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/t/TinySVM/TinySVM-0.09-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/t/TinySVM/TinySVM-0.09-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/t/TinySVM/TinySVM-0.09-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/t/Tk/Tk-8.5.12-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/t/Tk/Tk-8.5.12-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/t/Tk/Tk-8.5.12-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-4.0.10.eb b/easybuild/easyconfigs/__archive__/t/Tk/Tk-8.5.12-ictce-4.0.10.eb
similarity index 100%
rename from easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-4.0.10.eb
rename to easybuild/easyconfigs/__archive__/t/Tk/Tk-8.5.12-ictce-4.0.10.eb
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/t/Tk/Tk-8.5.12-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/t/Tk/Tk-8.5.12-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/t/TopHat/TopHat-2.0.4-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/t/TopHat/TopHat-2.0.4-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/t/TopHat/TopHat-2.0.4-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/t/TopHat/TopHat-2.0.4-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/t/TopHat/TopHat-2.0.8-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/t/TopHat/TopHat-2.0.8-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/t/TopHat/TopHat-2.0.8-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/t/TopHat/TopHat-2.0.8-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/t/Tornado/Tornado-2012.09.06-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/t/Tornado/Tornado-2012.09.06-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/t/Tornado/Tornado-2012.09.06-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/t/Tornado/Tornado-2012.09.06-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/t/Trilinos/Trilinos-10.12.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/t/Trilinos/Trilinos-10.12.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/t/Trilinos/Trilinos-10.12.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/t/Trilinos/Trilinos-10.12.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/t/Trilinos/Trilinos-10.12.2-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/t/Trilinos/Trilinos-10.12.2-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/t/Trilinos/Trilinos-10.12.2-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/t/Trilinos/Trilinos-10.12.2-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/t/Trinity/Trinity-2012-10-05-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/t/Trinity/Trinity-2012-10-05-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/t/Trinity/Trinity-2012-10-05-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/t/Trinity/Trinity-2012-10-05-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/t/Trinity/Trinity-2012-10-05-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/t/Trinity/Trinity-2012-10-05-ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/t/Trinity/Trinity-2012-10-05-ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/t/Trinity/Trinity-2012-10-05-ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/t/Trinity/Trinity-2013-02-25-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/t/Trinity/Trinity-2013-02-25-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/t/Trinity/Trinity-2013-02-25-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/t/Trinity/Trinity-2013-02-25-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/t/Trinity/Trinity-2013-02-25-ictce-4.1.13-jellyfish-1.1.10.eb b/easybuild/easyconfigs/__archive__/t/Trinity/Trinity-2013-02-25-ictce-4.1.13-jellyfish-1.1.10.eb
similarity index 100%
rename from easybuild/easyconfigs/t/Trinity/Trinity-2013-02-25-ictce-4.1.13-jellyfish-1.1.10.eb
rename to easybuild/easyconfigs/__archive__/t/Trinity/Trinity-2013-02-25-ictce-4.1.13-jellyfish-1.1.10.eb
diff --git a/easybuild/easyconfigs/t/Trinity/Trinity-2013-02-25-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/t/Trinity/Trinity-2013-02-25-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/t/Trinity/Trinity-2013-02-25-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/t/Trinity/Trinity-2013-02-25-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/t/tclcl/tclcl-1.20-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/t/tclcl/tclcl-1.20-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/t/tclcl/tclcl-1.20-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/t/tclcl/tclcl-1.20-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/t/tcsh/tcsh-6.18.01-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/t/tcsh/tcsh-6.18.01-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/t/tcsh/tcsh-6.18.01-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/t/tcsh/tcsh-6.18.01-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/t/tcsh/tcsh-6.18.01-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/t/tcsh/tcsh-6.18.01-ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/t/tcsh/tcsh-6.18.01-ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/t/tcsh/tcsh-6.18.01-ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/t/tcsh/tcsh-6.18.01-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/t/tcsh/tcsh-6.18.01-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/t/tcsh/tcsh-6.18.01-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/t/tcsh/tcsh-6.18.01-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/t/tcsh/tcsh-6.18.01-iqacml-3.7.3.eb b/easybuild/easyconfigs/__archive__/t/tcsh/tcsh-6.18.01-iqacml-3.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/t/tcsh/tcsh-6.18.01-iqacml-3.7.3.eb
rename to easybuild/easyconfigs/__archive__/t/tcsh/tcsh-6.18.01-iqacml-3.7.3.eb
diff --git a/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/u/UDUNITS/UDUNITS-2.1.24-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/u/UDUNITS/UDUNITS-2.1.24-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/u/UDUNITS/UDUNITS-2.1.24-ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/u/UDUNITS/UDUNITS-2.1.24-ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/u/UDUNITS/UDUNITS-2.1.24-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/u/UDUNITS/UDUNITS-2.1.24-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/u/UDUNITS/UDUNITS-2.1.24-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/u/UDUNITS/UDUNITS-2.1.24-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-iqacml-3.7.3.eb b/easybuild/easyconfigs/__archive__/u/UDUNITS/UDUNITS-2.1.24-iqacml-3.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.1.24-iqacml-3.7.3.eb
rename to easybuild/easyconfigs/__archive__/u/UDUNITS/UDUNITS-2.1.24-iqacml-3.7.3.eb
diff --git a/easybuild/easyconfigs/u/UFC/UFC-2.0.5-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/u/UFC/UFC-2.0.5-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/u/UFC/UFC-2.0.5-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/u/UFC/UFC-2.0.5-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/u/UFC/UFC-2.0.5-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/u/UFC/UFC-2.0.5-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/u/UFC/UFC-2.0.5-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/u/UFC/UFC-2.0.5-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/u/UFL/UFL-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/u/UFL/UFL-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/u/UFL/UFL-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/u/UFL/UFL-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/u/UFL/UFL-1.0.0-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/u/UFL/UFL-1.0.0-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/u/UFL/UFL-1.0.0-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/u/UFL/UFL-1.0.0-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/u/util-linux/util-linux-2.22.2-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/u/util-linux/util-linux-2.22.2-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/u/util-linux/util-linux-2.22.2-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/u/util-linux/util-linux-2.22.2-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/v/VSC-tools/VSC-tools-0.1.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/v/VSC-tools/VSC-tools-0.1.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/v/VSC-tools/VSC-tools-0.1.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/v/VSC-tools/VSC-tools-0.1.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/v/VSC-tools/VSC-tools-0.1.2-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/v/VSC-tools/VSC-tools-0.1.2-ictce-4.1.13-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/v/VSC-tools/VSC-tools-0.1.2-ictce-4.1.13-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/v/VSC-tools/VSC-tools-0.1.2-ictce-4.1.13-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/v/VTK/VTK-5.10.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/v/VTK/VTK-5.10.1-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/v/VTK/VTK-5.10.1-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/v/VTK/VTK-5.10.1-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/v/VTK/VTK-5.10.1-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/v/VTK/VTK-5.10.1-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/v/VTK/VTK-5.10.1-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/v/VTK/VTK-5.10.1-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/v/VTK/VTK-6.0.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/v/VTK/VTK-6.0.0-ictce-4.1.13-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/v/VTK/VTK-6.0.0-ictce-4.1.13-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/v/VTK/VTK-6.0.0-ictce-4.1.13-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/v/Valgrind/Valgrind-3.8.1-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/__archive__/v/Valgrind/Valgrind-3.8.1-cgmpolf-1.1.6.eb
similarity index 100%
rename from easybuild/easyconfigs/v/Valgrind/Valgrind-3.8.1-cgmpolf-1.1.6.eb
rename to easybuild/easyconfigs/__archive__/v/Valgrind/Valgrind-3.8.1-cgmpolf-1.1.6.eb
diff --git a/easybuild/easyconfigs/v/Valgrind/Valgrind-3.8.1-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/__archive__/v/Valgrind/Valgrind-3.8.1-cgmvolf-1.1.12rc1.eb
similarity index 100%
rename from easybuild/easyconfigs/v/Valgrind/Valgrind-3.8.1-cgmvolf-1.1.12rc1.eb
rename to easybuild/easyconfigs/__archive__/v/Valgrind/Valgrind-3.8.1-cgmvolf-1.1.12rc1.eb
diff --git a/easybuild/easyconfigs/v/Valgrind/Valgrind-3.8.1-cgmvolf-1.2.7.eb b/easybuild/easyconfigs/__archive__/v/Valgrind/Valgrind-3.8.1-cgmvolf-1.2.7.eb
similarity index 100%
rename from easybuild/easyconfigs/v/Valgrind/Valgrind-3.8.1-cgmvolf-1.2.7.eb
rename to easybuild/easyconfigs/__archive__/v/Valgrind/Valgrind-3.8.1-cgmvolf-1.2.7.eb
diff --git a/easybuild/easyconfigs/v/Valgrind/Valgrind-3.8.1-cgoolf-1.1.7.eb b/easybuild/easyconfigs/__archive__/v/Valgrind/Valgrind-3.8.1-cgoolf-1.1.7.eb
similarity index 100%
rename from easybuild/easyconfigs/v/Valgrind/Valgrind-3.8.1-cgoolf-1.1.7.eb
rename to easybuild/easyconfigs/__archive__/v/Valgrind/Valgrind-3.8.1-cgoolf-1.1.7.eb
diff --git a/easybuild/easyconfigs/v/Valgrind/Valgrind-3.8.1-gmvolf-1.7.12.eb b/easybuild/easyconfigs/__archive__/v/Valgrind/Valgrind-3.8.1-gmvolf-1.7.12.eb
similarity index 100%
rename from easybuild/easyconfigs/v/Valgrind/Valgrind-3.8.1-gmvolf-1.7.12.eb
rename to easybuild/easyconfigs/__archive__/v/Valgrind/Valgrind-3.8.1-gmvolf-1.7.12.eb
diff --git a/easybuild/easyconfigs/v/Valgrind/Valgrind-3.8.1-gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/__archive__/v/Valgrind/Valgrind-3.8.1-gmvolf-1.7.12rc1.eb
similarity index 100%
rename from easybuild/easyconfigs/v/Valgrind/Valgrind-3.8.1-gmvolf-1.7.12rc1.eb
rename to easybuild/easyconfigs/__archive__/v/Valgrind/Valgrind-3.8.1-gmvolf-1.7.12rc1.eb
diff --git a/easybuild/easyconfigs/v/Valgrind/Valgrind-3.8.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/v/Valgrind/Valgrind-3.8.1-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/v/Valgrind/Valgrind-3.8.1-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/v/Valgrind/Valgrind-3.8.1-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/v/Valgrind/Valgrind-3.9.0-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/v/Valgrind/Valgrind-3.9.0-goalf-1.5.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/v/Valgrind/Valgrind-3.9.0-goalf-1.5.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/v/Valgrind/Valgrind-3.9.0-goalf-1.5.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/v/VampirTrace/VampirTrace-5.14.4-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/v/VampirTrace/VampirTrace-5.14.4-gompi-1.4.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/v/VampirTrace/VampirTrace-5.14.4-gompi-1.4.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/v/VampirTrace/VampirTrace-5.14.4-gompi-1.4.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/v/Velvet/Velvet-1.2.07-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/v/Velvet/Velvet-1.2.07-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/v/Velvet/Velvet-1.2.07-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/v/Velvet/Velvet-1.2.07-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/v/Velvet/Velvet-1.2.07-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/v/Velvet/Velvet-1.2.07-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/v/Velvet/Velvet-1.2.07-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/v/Velvet/Velvet-1.2.07-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.0.7-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/v/ViennaRNA/ViennaRNA-2.0.7-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.0.7-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/v/ViennaRNA/ViennaRNA-2.0.7-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.0.7-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/v/ViennaRNA/ViennaRNA-2.0.7-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.0.7-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/v/ViennaRNA/ViennaRNA-2.0.7-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/v/Viper/Viper-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/v/Viper/Viper-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/v/Viper/Viper-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/v/Viper/Viper-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/v/Viper/Viper-1.0.0-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/v/Viper/Viper-1.0.0-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/v/Viper/Viper-1.0.0-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/v/Viper/Viper-1.0.0-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/w/WIEN2k/WIEN2k-12.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/w/WIEN2k/WIEN2k-12.1-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/w/WIEN2k/WIEN2k-12.1-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/w/WIEN2k/WIEN2k-12.1-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/w/WIEN2k/WIEN2k-12.1-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/w/WIEN2k/WIEN2k-12.1-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/w/WIEN2k/WIEN2k-12.1-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/w/WIEN2k/WIEN2k-12.1-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.3.1-goalf-1.1.0-no-OFED-dmpar.eb b/easybuild/easyconfigs/__archive__/w/WPS/WPS-3.3.1-goalf-1.1.0-no-OFED-dmpar.eb
similarity index 100%
rename from easybuild/easyconfigs/w/WPS/WPS-3.3.1-goalf-1.1.0-no-OFED-dmpar.eb
rename to easybuild/easyconfigs/__archive__/w/WPS/WPS-3.3.1-goalf-1.1.0-no-OFED-dmpar.eb
diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.3.1-ictce-3.2.2.u3-dmpar.eb b/easybuild/easyconfigs/__archive__/w/WPS/WPS-3.3.1-ictce-3.2.2.u3-dmpar.eb
similarity index 100%
rename from easybuild/easyconfigs/w/WPS/WPS-3.3.1-ictce-3.2.2.u3-dmpar.eb
rename to easybuild/easyconfigs/__archive__/w/WPS/WPS-3.3.1-ictce-3.2.2.u3-dmpar.eb
diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.4-goalf-1.1.0-no-OFED-dmpar.eb b/easybuild/easyconfigs/__archive__/w/WPS/WPS-3.4-goalf-1.1.0-no-OFED-dmpar.eb
similarity index 100%
rename from easybuild/easyconfigs/w/WPS/WPS-3.4-goalf-1.1.0-no-OFED-dmpar.eb
rename to easybuild/easyconfigs/__archive__/w/WPS/WPS-3.4-goalf-1.1.0-no-OFED-dmpar.eb
diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.4-ictce-3.2.2.u3-dmpar.eb b/easybuild/easyconfigs/__archive__/w/WPS/WPS-3.4-ictce-3.2.2.u3-dmpar.eb
similarity index 100%
rename from easybuild/easyconfigs/w/WPS/WPS-3.4-ictce-3.2.2.u3-dmpar.eb
rename to easybuild/easyconfigs/__archive__/w/WPS/WPS-3.4-ictce-3.2.2.u3-dmpar.eb
diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.4.1-iqacml-3.7.3-dmpar.eb b/easybuild/easyconfigs/__archive__/w/WPS/WPS-3.4.1-iqacml-3.7.3-dmpar.eb
similarity index 100%
rename from easybuild/easyconfigs/w/WPS/WPS-3.4.1-iqacml-3.7.3-dmpar.eb
rename to easybuild/easyconfigs/__archive__/w/WPS/WPS-3.4.1-iqacml-3.7.3-dmpar.eb
diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.5-ictce-4.1.13-dmpar.eb b/easybuild/easyconfigs/__archive__/w/WPS/WPS-3.5-ictce-4.1.13-dmpar.eb
similarity index 100%
rename from easybuild/easyconfigs/w/WPS/WPS-3.5-ictce-4.1.13-dmpar.eb
rename to easybuild/easyconfigs/__archive__/w/WPS/WPS-3.5-ictce-4.1.13-dmpar.eb
diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.5.1-ictce-4.1.13-dmpar.eb b/easybuild/easyconfigs/__archive__/w/WPS/WPS-3.5.1-ictce-4.1.13-dmpar.eb
similarity index 100%
rename from easybuild/easyconfigs/w/WPS/WPS-3.5.1-ictce-4.1.13-dmpar.eb
rename to easybuild/easyconfigs/__archive__/w/WPS/WPS-3.5.1-ictce-4.1.13-dmpar.eb
diff --git a/easybuild/easyconfigs/w/WRF/WRF-3.3.1-goalf-1.1.0-no-OFED-dmpar.eb b/easybuild/easyconfigs/__archive__/w/WRF/WRF-3.3.1-goalf-1.1.0-no-OFED-dmpar.eb
similarity index 100%
rename from easybuild/easyconfigs/w/WRF/WRF-3.3.1-goalf-1.1.0-no-OFED-dmpar.eb
rename to easybuild/easyconfigs/__archive__/w/WRF/WRF-3.3.1-goalf-1.1.0-no-OFED-dmpar.eb
diff --git a/easybuild/easyconfigs/w/WRF/WRF-3.3.1-ictce-3.2.2.u3-dmpar.eb b/easybuild/easyconfigs/__archive__/w/WRF/WRF-3.3.1-ictce-3.2.2.u3-dmpar.eb
similarity index 100%
rename from easybuild/easyconfigs/w/WRF/WRF-3.3.1-ictce-3.2.2.u3-dmpar.eb
rename to easybuild/easyconfigs/__archive__/w/WRF/WRF-3.3.1-ictce-3.2.2.u3-dmpar.eb
diff --git a/easybuild/easyconfigs/w/WRF/WRF-3.4-goalf-1.1.0-no-OFED-dmpar.eb b/easybuild/easyconfigs/__archive__/w/WRF/WRF-3.4-goalf-1.1.0-no-OFED-dmpar.eb
similarity index 100%
rename from easybuild/easyconfigs/w/WRF/WRF-3.4-goalf-1.1.0-no-OFED-dmpar.eb
rename to easybuild/easyconfigs/__archive__/w/WRF/WRF-3.4-goalf-1.1.0-no-OFED-dmpar.eb
diff --git a/easybuild/easyconfigs/w/WRF/WRF-3.4-ictce-3.2.2.u3-dmpar.eb b/easybuild/easyconfigs/__archive__/w/WRF/WRF-3.4-ictce-3.2.2.u3-dmpar.eb
similarity index 100%
rename from easybuild/easyconfigs/w/WRF/WRF-3.4-ictce-3.2.2.u3-dmpar.eb
rename to easybuild/easyconfigs/__archive__/w/WRF/WRF-3.4-ictce-3.2.2.u3-dmpar.eb
diff --git a/easybuild/easyconfigs/w/WRF/WRF-3.4.1-iqacml-3.7.3-dmpar.eb b/easybuild/easyconfigs/__archive__/w/WRF/WRF-3.4.1-iqacml-3.7.3-dmpar.eb
similarity index 100%
rename from easybuild/easyconfigs/w/WRF/WRF-3.4.1-iqacml-3.7.3-dmpar.eb
rename to easybuild/easyconfigs/__archive__/w/WRF/WRF-3.4.1-iqacml-3.7.3-dmpar.eb
diff --git a/easybuild/easyconfigs/w/WRF/WRF-3.5-ictce-4.1.13-dmpar.eb b/easybuild/easyconfigs/__archive__/w/WRF/WRF-3.5-ictce-4.1.13-dmpar.eb
similarity index 100%
rename from easybuild/easyconfigs/w/WRF/WRF-3.5-ictce-4.1.13-dmpar.eb
rename to easybuild/easyconfigs/__archive__/w/WRF/WRF-3.5-ictce-4.1.13-dmpar.eb
diff --git a/easybuild/easyconfigs/w/WRF/WRF-3.5.1-ictce-4.1.13-dmpar.eb b/easybuild/easyconfigs/__archive__/w/WRF/WRF-3.5.1-ictce-4.1.13-dmpar.eb
similarity index 100%
rename from easybuild/easyconfigs/w/WRF/WRF-3.5.1-ictce-4.1.13-dmpar.eb
rename to easybuild/easyconfigs/__archive__/w/WRF/WRF-3.5.1-ictce-4.1.13-dmpar.eb
diff --git a/easybuild/easyconfigs/w/wiki2beamer/wiki2beamer-0.9.5-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/w/wiki2beamer/wiki2beamer-0.9.5-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/w/wiki2beamer/wiki2beamer-0.9.5-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/w/wiki2beamer/wiki2beamer-0.9.5-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/x/XCrySDen/XCrySDen-1.5.53-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/x/XCrySDen/XCrySDen-1.5.53-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/x/XCrySDen/XCrySDen-1.5.53-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/x/XCrySDen/XCrySDen-1.5.53-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/x/XCrySDen/XCrySDen-1.5.53-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/x/XCrySDen/XCrySDen-1.5.53-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/x/XCrySDen/XCrySDen-1.5.53-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/x/XCrySDen/XCrySDen-1.5.53-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/x/XML-LibXML/XML-LibXML-2.0018-ictce-4.1.13-Perl-5.16.3.eb b/easybuild/easyconfigs/__archive__/x/XML-LibXML/XML-LibXML-2.0018-ictce-4.1.13-Perl-5.16.3.eb
similarity index 100%
rename from easybuild/easyconfigs/x/XML-LibXML/XML-LibXML-2.0018-ictce-4.1.13-Perl-5.16.3.eb
rename to easybuild/easyconfigs/__archive__/x/XML-LibXML/XML-LibXML-2.0018-ictce-4.1.13-Perl-5.16.3.eb
diff --git a/easybuild/easyconfigs/x/XML-Simple/XML-Simple-2.20-ictce-4.1.13-Perl-5.16.3.eb b/easybuild/easyconfigs/__archive__/x/XML-Simple/XML-Simple-2.20-ictce-4.1.13-Perl-5.16.3.eb
similarity index 100%
rename from easybuild/easyconfigs/x/XML-Simple/XML-Simple-2.20-ictce-4.1.13-Perl-5.16.3.eb
rename to easybuild/easyconfigs/__archive__/x/XML-Simple/XML-Simple-2.20-ictce-4.1.13-Perl-5.16.3.eb
diff --git a/easybuild/easyconfigs/x/XML/XML-3.95-0.1-goalf-1.1.0-no-OFED-R-2.15.2.eb b/easybuild/easyconfigs/__archive__/x/XML/XML-3.95-0.1-goalf-1.1.0-no-OFED-R-2.15.2.eb
similarity index 100%
rename from easybuild/easyconfigs/x/XML/XML-3.95-0.1-goalf-1.1.0-no-OFED-R-2.15.2.eb
rename to easybuild/easyconfigs/__archive__/x/XML/XML-3.95-0.1-goalf-1.1.0-no-OFED-R-2.15.2.eb
diff --git a/easybuild/easyconfigs/x/XML/XML-3.95-0.1-ictce-4.0.6-R-2.15.2.eb b/easybuild/easyconfigs/__archive__/x/XML/XML-3.95-0.1-ictce-4.0.6-R-2.15.2.eb
similarity index 100%
rename from easybuild/easyconfigs/x/XML/XML-3.95-0.1-ictce-4.0.6-R-2.15.2.eb
rename to easybuild/easyconfigs/__archive__/x/XML/XML-3.95-0.1-ictce-4.0.6-R-2.15.2.eb
diff --git a/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/x/xbitmaps/xbitmaps-1.1.1-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/x/xbitmaps/xbitmaps-1.1.1-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/x/xcb-proto/xcb-proto-1.7-goalf-1.1.0-no-OFED-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-goalf-1.1.0-no-OFED-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/x/xcb-proto/xcb-proto-1.7-goalf-1.1.0-no-OFED-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/x/xcb-proto/xcb-proto-1.7-ictce-4.0.6-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-ictce-4.0.6-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/x/xcb-proto/xcb-proto-1.7-ictce-4.0.6-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/x/xcb-proto/xcb-proto-1.7-ictce-4.1.13-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-ictce-4.1.13-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/x/xcb-proto/xcb-proto-1.7-ictce-4.1.13-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/x/xextproto/xextproto-7.2.1-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/x/xextproto/xextproto-7.2.1-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.17-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/x/xorg-macros/xorg-macros-1.17-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.17-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/x/xorg-macros/xorg-macros-1.17-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.17-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/x/xorg-macros/xorg-macros-1.17-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.17-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/x/xorg-macros/xorg-macros-1.17-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.17-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/x/xorg-macros/xorg-macros-1.17-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.17-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/x/xorg-macros/xorg-macros-1.17-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/x/xproto/xproto-7.0.23-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/x/xproto/xproto-7.0.23-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/x/xproto/xproto-7.0.23-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/x/xproto/xproto-7.0.23-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/x/xproto/xproto-7.0.23-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/x/xproto/xproto-7.0.23-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/x/xproto/xproto-7.0.23-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/x/xtrans/xtrans-1.2-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/x/xtrans/xtrans-1.2-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-ictce-4.1.13-Perl-5.16.3.eb b/easybuild/easyconfigs/__archive__/y/YAML-Syck/YAML-Syck-1.27-ictce-4.1.13-Perl-5.16.3.eb
similarity index 72%
rename from easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-ictce-4.1.13-Perl-5.16.3.eb
rename to easybuild/easyconfigs/__archive__/y/YAML-Syck/YAML-Syck-1.27-ictce-4.1.13-Perl-5.16.3.eb
index 814139aaa0a11e22b1788e690bfef34bbb42d813..5efafeb0f0b7058b25a3a189e61f88fcd24a9bea 100644
--- a/easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-ictce-4.1.13-Perl-5.16.3.eb
+++ b/easybuild/easyconfigs/__archive__/y/YAML-Syck/YAML-Syck-1.27-ictce-4.1.13-Perl-5.16.3.eb
@@ -11,6 +11,7 @@ easyblock = 'PerlModule'
 
 name = 'YAML-Syck'
 version = '1.27'
+versionsuffix = '-Perl-%(perlver)s'
 
 homepage = 'http://search.cpan.org/perldoc?YAML%3A%3ASyck'
 description = """Fast, lightweight YAML loader and dumper.
@@ -21,21 +22,15 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'}
 source_urls = ['http://www.cpan.org/modules/by-module/YAML']
 sources = [SOURCE_TAR_GZ]
 
-perl = 'Perl'
-perlver = '5.16.3'
-perlverextra = ''
-versionsuffix = '-%s-%s%s' % (perl, perlver, perlverextra)
-
 dependencies = [
-    (perl, perlver, perlverextra),
+    ('Perl', '5.16.3'),
 ]
 
 options = {'modulename': 'YAML::Syck'}
 
-perlmajver = perlver.split('.')[0]
 sanity_check_paths = {
     'files': [],
-    'dirs': ['lib/perl%s/site_perl/%s/x86_64-linux-thread-multi/YAML' % (perlmajver, perlver)],
+    'dirs': ['lib/perl5/site_perl/%(perlver)s/x86_64-linux-thread-multi/YAML'],
 }
 
 moduleclass = 'data'
diff --git a/easybuild/easyconfigs/y/YamCha/YamCha-0.33-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/y/YamCha/YamCha-0.33-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/y/YamCha/YamCha-0.33-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/y/YamCha/YamCha-0.33-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/y/YamCha/YamCha-0.33-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/y/YamCha/YamCha-0.33-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/y/YamCha/YamCha-0.33-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/y/YamCha/YamCha-0.33-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/y/Yasm/Yasm-1.2.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/y/Yasm/Yasm-1.2.0-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/y/Yasm/Yasm-1.2.0-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/y/Yasm/Yasm-1.2.0-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/y/Yasm/Yasm-1.2.0-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/y/Yasm/Yasm-1.2.0-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/y/Yasm/Yasm-1.2.0-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/y/Yasm/Yasm-1.2.0-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/y/yaff/yaff-1.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/__archive__/y/yaff/yaff-1.0-ictce-4.1.13-Python-2.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/y/yaff/yaff-1.0-ictce-4.1.13-Python-2.7.3.eb
rename to easybuild/easyconfigs/__archive__/y/yaff/yaff-1.0-ictce-4.1.13-Python-2.7.3.eb
diff --git a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/z/ZeroMQ/ZeroMQ-2.2.0-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/z/ZeroMQ/ZeroMQ-2.2.0-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/z/ZeroMQ/ZeroMQ-2.2.0-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-2.2.0-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/z/ZeroMQ/ZeroMQ-2.2.0-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/z/ZeroMQ/ZeroMQ-3.2.2-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/z/ZeroMQ/ZeroMQ-3.2.2-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/z/ZeroMQ/ZeroMQ-3.2.2-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-3.2.2-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/z/ZeroMQ/ZeroMQ-3.2.2-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.5-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.5-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/z/zlib/zlib-1.2.5-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.5-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.5-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.5-ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/z/zlib/zlib-1.2.5-ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.5-ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.5-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.5-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/z/zlib/zlib-1.2.5-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.5-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.5-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.5-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/z/zlib/zlib-1.2.5-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.5-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.7-cgmpolf-1.1.6.eb
similarity index 100%
rename from easybuild/easyconfigs/z/zlib/zlib-1.2.7-cgmpolf-1.1.6.eb
rename to easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.7-cgmpolf-1.1.6.eb
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.7-cgmvolf-1.1.12rc1.eb
similarity index 100%
rename from easybuild/easyconfigs/z/zlib/zlib-1.2.7-cgmvolf-1.1.12rc1.eb
rename to easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.7-cgmvolf-1.1.12rc1.eb
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-cgmvolf-1.2.7.eb b/easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.7-cgmvolf-1.2.7.eb
similarity index 100%
rename from easybuild/easyconfigs/z/zlib/zlib-1.2.7-cgmvolf-1.2.7.eb
rename to easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.7-cgmvolf-1.2.7.eb
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-cgoolf-1.1.7.eb b/easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.7-cgoolf-1.1.7.eb
similarity index 100%
rename from easybuild/easyconfigs/z/zlib/zlib-1.2.7-cgoolf-1.1.7.eb
rename to easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.7-cgoolf-1.1.7.eb
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-gmpolf-1.4.8.eb b/easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.7-gmpolf-1.4.8.eb
similarity index 100%
rename from easybuild/easyconfigs/z/zlib/zlib-1.2.7-gmpolf-1.4.8.eb
rename to easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.7-gmpolf-1.4.8.eb
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-gmvapich2-1.7.12.eb b/easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.7-gmvapich2-1.7.12.eb
similarity index 100%
rename from easybuild/easyconfigs/z/zlib/zlib-1.2.7-gmvapich2-1.7.12.eb
rename to easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.7-gmvapich2-1.7.12.eb
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-gmvolf-1.7.12.eb b/easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.7-gmvolf-1.7.12.eb
similarity index 100%
rename from easybuild/easyconfigs/z/zlib/zlib-1.2.7-gmvolf-1.7.12.eb
rename to easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.7-gmvolf-1.7.12.eb
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.7-gmvolf-1.7.12rc1.eb
similarity index 100%
rename from easybuild/easyconfigs/z/zlib/zlib-1.2.7-gmvolf-1.7.12rc1.eb
rename to easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.7-gmvolf-1.7.12rc1.eb
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.7-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/z/zlib/zlib-1.2.7-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.7-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.7-goalf-1.5.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/z/zlib/zlib-1.2.7-goalf-1.5.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.7-goalf-1.5.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.7-gompi-1.4.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/z/zlib/zlib-1.2.7-gompi-1.4.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.7-gompi-1.4.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-goolfc-1.3.12.eb b/easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.7-goolfc-1.3.12.eb
similarity index 100%
rename from easybuild/easyconfigs/z/zlib/zlib-1.2.7-goolfc-1.3.12.eb
rename to easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.7-goolfc-1.3.12.eb
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.7-ictce-3.2.2.u3.eb
similarity index 100%
rename from easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-3.2.2.u3.eb
rename to easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.7-ictce-3.2.2.u3.eb
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-4.0.10.eb b/easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.7-ictce-4.0.10.eb
similarity index 100%
rename from easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-4.0.10.eb
rename to easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.7-ictce-4.0.10.eb
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.7-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.7-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.7-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/z/zlib/zlib-1.2.7-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.7-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-iomkl-4.6.13.eb b/easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.7-iomkl-4.6.13.eb
similarity index 100%
rename from easybuild/easyconfigs/z/zlib/zlib-1.2.7-iomkl-4.6.13.eb
rename to easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.7-iomkl-4.6.13.eb
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.7-iqacml-3.7.3.eb b/easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.7-iqacml-3.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/z/zlib/zlib-1.2.7-iqacml-3.7.3.eb
rename to easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.7-iqacml-3.7.3.eb
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.8-goalf-1.5.12-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/z/zlib/zlib-1.2.8-goalf-1.5.12-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.8-goalf-1.5.12-no-OFED.eb
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.8-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/z/zlib/zlib-1.2.8-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.8-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-ictce-6.3.5.eb b/easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.8-ictce-6.3.5.eb
similarity index 100%
rename from easybuild/easyconfigs/z/zlib/zlib-1.2.8-ictce-6.3.5.eb
rename to easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.8-ictce-6.3.5.eb
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-iqacml-3.7.3.eb b/easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.8-iqacml-3.7.3.eb
similarity index 100%
rename from easybuild/easyconfigs/z/zlib/zlib-1.2.8-iqacml-3.7.3.eb
rename to easybuild/easyconfigs/__archive__/z/zlib/zlib-1.2.8-iqacml-3.7.3.eb
diff --git a/easybuild/easyconfigs/z/zsh/zsh-5.0.2-ictce-4.1.13.eb b/easybuild/easyconfigs/__archive__/z/zsh/zsh-5.0.2-ictce-4.1.13.eb
similarity index 100%
rename from easybuild/easyconfigs/z/zsh/zsh-5.0.2-ictce-4.1.13.eb
rename to easybuild/easyconfigs/__archive__/z/zsh/zsh-5.0.2-ictce-4.1.13.eb
diff --git a/easybuild/easyconfigs/z/zsync/zsync-0.6.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/__archive__/z/zsync/zsync-0.6.2-goalf-1.1.0-no-OFED.eb
similarity index 100%
rename from easybuild/easyconfigs/z/zsync/zsync-0.6.2-goalf-1.1.0-no-OFED.eb
rename to easybuild/easyconfigs/__archive__/z/zsync/zsync-0.6.2-goalf-1.1.0-no-OFED.eb
diff --git a/easybuild/easyconfigs/z/zsync/zsync-0.6.2-ictce-4.0.6.eb b/easybuild/easyconfigs/__archive__/z/zsync/zsync-0.6.2-ictce-4.0.6.eb
similarity index 100%
rename from easybuild/easyconfigs/z/zsync/zsync-0.6.2-ictce-4.0.6.eb
rename to easybuild/easyconfigs/__archive__/z/zsync/zsync-0.6.2-ictce-4.0.6.eb
diff --git a/easybuild/easyconfigs/a/ABINIT/ABINIT-7.6.2-foss-2015a.eb b/easybuild/easyconfigs/a/ABINIT/ABINIT-7.6.2-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..bfa5f0befa0694ec82a86b15cc06a3bb88fd165b
--- /dev/null
+++ b/easybuild/easyconfigs/a/ABINIT/ABINIT-7.6.2-foss-2015a.eb
@@ -0,0 +1,36 @@
+easyblock = "ConfigureMake"
+
+name = 'ABINIT'
+version = '7.6.2'
+
+homepage = 'http://www.abinit.org/'
+description = """Abinit is a plane wave pseudopotential code for doing condensed phase electronic
+ structure calculations using DFT."""
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+
+source_urls = ['http://ftp.abinit.org/']
+sources = [SOURCELOWER_TAR_GZ]
+
+patches = [
+    'ABINIT-%(version)s_named-constant.patch',
+    'ABINIT-%(version)s_odamix.patch',
+]
+
+dependencies = [
+    ('netCDF', '4.3.2'),
+    ('netCDF-Fortran', '4.4.0'),
+]
+
+configopts = '--enable-mpi --with-mpi-prefix="$EBROOTOPENMPI" --enable-fallbacks '
+configopts += '--with-netcdf-incs="-I$EBROOTNETCDF/include -I$EBROOTNETCDFMINFORTRAN/include" '
+configopts += '--with-netcdf-libs="-L$EBROOTNETCDF/lib64 -lnetcdf -L$EBROOTNETCDFMINFORTRAN/lib -lnetcdff" '
+configopts += '--with-fft-libs="-L$EBROOTFFTW/lib -lfftw3 -lfftw3f" --with-fft-flavor=fftw3 '
+configopts += '--with-trio-flavor=netcdf+etsf_io --with-dft-flavor=libxc --enable-gw-dpc'
+
+sanity_check_paths = {
+    'files': ["bin/abinit"],
+    'dirs': [],
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/a/ABINIT/ABINIT-7.6.2_named-constant.patch b/easybuild/easyconfigs/a/ABINIT/ABINIT-7.6.2_named-constant.patch
new file mode 100644
index 0000000000000000000000000000000000000000..bb56a05a0a36ff63d5de64fe16f01a71b41bf03f
--- /dev/null
+++ b/easybuild/easyconfigs/a/ABINIT/ABINIT-7.6.2_named-constant.patch
@@ -0,0 +1,18 @@
+# This patch fixes a 'cannot assign to a named constant' error that occurs during the build.
+# Suggested fix from: https://lists.debian.org/debian-mentors/2014/08/msg00475.html
+--- src/62_ctqmc/defs.h.orig	2014-02-15 21:30:20.000000000 +0000
++++ src/62_ctqmc/defs.h	2016-08-22 13:05:09.473620286 +0100
+@@ -5,11 +5,11 @@
+ 
+ #define MALLOC(ARR,SIZE)     ABI_ALLOCATE(ARR,SIZE)
+ #define FREE(ARR)            ABI_DEALLOCATE(ARR) 
+-#define FREEIF(ARR)          IF(ALLOCATED(ARR)) THEN NEWLINE ABI_DEALLOCATE(ARR) NEWLINE END IF
++#define FREEIF(ARR)          IF(ALLOCATED(ARR)) ABI_DEALLOCATE(ARR)
+ 
+ #define DT_MALLOC(ARR,SIZE)  ABI_DATATYPE_ALLOCATE(ARR,SIZE)
+ #define DT_FREE(ARR)         ABI_DATATYPE_DEALLOCATE(ARR) 
+-#define DT_FREEIF(ARR)       IF(ALLOCATED(ARR)) THEN NEWLINE ABI_DATATYPE_DEALLOCATE(ARR) NEWLINE END IF
++#define DT_FREEIF(ARR)       IF(ALLOCATED(ARR)) ABI_DATATYPE_DEALLOCATE(ARR)
+ 
+ #define myWARNALL(msg)       MSG_WARNING(msg)
+ #define myWARN(msg)          call msg_hndl(msg,"WARNING","PERS")
diff --git a/easybuild/easyconfigs/a/ABINIT/ABINIT-7.6.2_odamix.patch b/easybuild/easyconfigs/a/ABINIT/ABINIT-7.6.2_odamix.patch
new file mode 100644
index 0000000000000000000000000000000000000000..2ea83d3829846a8e8eee520df802d29fac158c27
--- /dev/null
+++ b/easybuild/easyconfigs/a/ABINIT/ABINIT-7.6.2_odamix.patch
@@ -0,0 +1,12 @@
+# This fixes a build time error that is acknowledged here: http://forum.abinit.org/viewtopic.php?f=3&t=2656
+--- src/67_common/odamix.F90.orig	2016-08-22 13:27:30.289621140 +0100
++++ src/67_common/odamix.F90	2016-08-22 13:27:40.063570238 +0100
+@@ -544,7 +544,7 @@
+          do ispden=1,pawrhoij(iatom)%nspden
+            do irhoij=1,pawrhoij(iatom)%nrhoijsel
+              klmn=2*pawrhoij(iatom)%rhoijselect(irhoij)-1
+-             rhoijtmp(klmn-1:klmn+1,ispden)=pawrhoij(iatom)%rhoijp(jrhoij:jrhoij+1,ispden)
++             rhoijtmp(klmn:klmn+1,ispden)=pawrhoij(iatom)%rhoijp(jrhoij:jrhoij+1,ispden)
+              jrhoij=jrhoij+2
+            end do
+          end do
diff --git a/easybuild/easyconfigs/a/ART/ART-2016.06.05-intel-2016b.eb b/easybuild/easyconfigs/a/ART/ART-2016.06.05-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ac6f4932fffa87c627d1fc1c08fd830ae6413a0a
--- /dev/null
+++ b/easybuild/easyconfigs/a/ART/ART-2016.06.05-intel-2016b.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'ART'
+version = '2016.06.05'
+
+homepage = 'http://www.niehs.nih.gov/research/resources/software/biostatistics/art/'
+description = "ART is a set of simulation tools to generate synthetic next-generation sequencing reads"
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['http://www.niehs.nih.gov/research/resources/assets/docs/']
+sources = ['artsrcmountrainier%slinuxtgz.tgz' % ''.join(version.split('.'))]
+
+dependencies = [
+    ('GSL', '2.2.1'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/aln2bed.pl', 'bin/art_454', 'bin/art_illumina', 'bin/art_profiler_454',
+              'bin/art_profiler_illumina', 'bin/art_SOLiD', 'bin/combinedAvg.pl', 'bin/empDist.pl',
+              'bin/fastqReadAvg.pl', 'bin/map2bed.pl', 'bin/summation.pl'],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/a/ASHS/ASHS-rev103_20140612.eb b/easybuild/easyconfigs/a/ASHS/ASHS-rev103_20140612.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1e7fda13a16fd9fbb8e218c3ea48b5c3b2a98cc2
--- /dev/null
+++ b/easybuild/easyconfigs/a/ASHS/ASHS-rev103_20140612.eb
@@ -0,0 +1,29 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Ravi Tripathi
+# Email: ravi89@uab.edu
+
+easyblock = "Tarball"
+
+name = 'ASHS'
+version = 'rev103_20140612'
+
+homepage = 'https://sites.google.com/site/hipposubfields/home'
+description = """ Automatic Segmentation of Hippocampal Subfields (ASHS) """
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+#You need to create an account to download the source
+#from https://www.nitrc.org/frs/?group_id=370
+sources = ['ashs_Linux64_%(version)s.tgz']
+
+checksums= ["07fea2883b856af8797b200212b72e71"]
+
+modextravars = {'ASHS_ROOT': '%(installdir)s'}
+
+sanity_check_paths = {
+    'files': ["bin/ashs_main.sh", "bin/ashs_template_qsub.sh", "bin/ashs_train.sh", 
+             "bin/ashs_util_makepdf.sh"],
+    'dirs': ["ext"]
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/a/ATK/ATK-2.20.0-foss-2016a.eb b/easybuild/easyconfigs/a/ATK/ATK-2.20.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0f7c93a41dbad869c76d149870a8303758a704cf
--- /dev/null
+++ b/easybuild/easyconfigs/a/ATK/ATK-2.20.0-foss-2016a.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMake'
+
+name = 'ATK'
+version = '2.20.0'
+
+homepage = 'https://developer.gnome.org/ATK/stable/'
+description = """
+ ATK provides the set of accessibility interfaces that are implemented by other
+ toolkits and applications. Using the ATK interfaces, accessibility tools have
+ full access to view and control running applications.
+"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [FTPGNOME_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [
+    ('GLib', '2.48.0'),
+    ('GObject-Introspection', '1.48.0')
+]
+
+configopts = "--enable-introspection=yes"
+
+modextrapaths = {
+    'XDG_DATA_DIRS': 'share',
+}
+
+sanity_check_paths = {
+    'files': ['lib/libatk-1.0.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/a/ATK/ATK-2.22.0-intel-2016b.eb b/easybuild/easyconfigs/a/ATK/ATK-2.22.0-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9b536efda0fa66605eee66e43dfb21e9b1f38469
--- /dev/null
+++ b/easybuild/easyconfigs/a/ATK/ATK-2.22.0-intel-2016b.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMake'
+
+name = 'ATK'
+version = '2.22.0'
+
+homepage = 'https://developer.gnome.org/ATK/stable/'
+description = """
+ ATK provides the set of accessibility interfaces that are implemented by other
+ toolkits and applications. Using the ATK interfaces, accessibility tools have
+ full access to view and control running applications.
+"""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = [FTPGNOME_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [
+    ('GLib', '2.49.5'),
+    ('GObject-Introspection', '1.49.1')
+]
+
+configopts = "--enable-introspection=yes"
+
+modextrapaths = {
+    'XDG_DATA_DIRS': 'share',
+}
+
+sanity_check_paths = {
+    'files': ['lib/libatk-1.0.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/a/ATLAS/ATLAS-3.10.2-GCC-5.4.0-2.26-LAPACK-3.6.1.eb b/easybuild/easyconfigs/a/ATLAS/ATLAS-3.10.2-GCC-5.4.0-2.26-LAPACK-3.6.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5d4cb8e99dc36057680c4f952ce8cba85b84a59b
--- /dev/null
+++ b/easybuild/easyconfigs/a/ATLAS/ATLAS-3.10.2-GCC-5.4.0-2.26-LAPACK-3.6.1.eb
@@ -0,0 +1,36 @@
+name = 'ATLAS'
+version = '3.10.2'
+
+homepage = 'http://math-atlas.sourceforge.net'
+description = """ATLAS (Automatically Tuned Linear Algebra Software) is the application of
+ the AEOS (Automated Empirical Optimization of Software) paradigm, with the present emphasis 
+ on the Basic Linear Algebra Subprograms (BLAS), a widely used, performance-critical, linear 
+ algebra kernel library."""
+
+toolchain = {'name': 'GCC', 'version': '5.4.0-2.26'}
+toolchainopts = {'pic': True}
+
+lapackver = '3.6.1'
+versionsuffix = '-LAPACK-%s' % lapackver
+
+source_urls = [
+    ('http://sourceforge.net/projects/math-atlas/files/Stable/%(version)s', 'download'),
+    'http://www.netlib.org/lapack/',
+]
+sources = [
+    '%(namelower)s%(version)s.tar.bz2',
+    'lapack-%s.tgz' % lapackver,
+]
+
+# build full LAPACK library with supplied netlib LAPACK
+full_lapack = True
+
+# fix for http://math-atlas.sourceforge.net/errata.html#sharedProbe
+configopts = "-Ss f77lib '-L$(EBROOTGCC)/lib64 -lgfortran'"
+
+# ignore check done by ATLAS for CPU throttling;
+# you should set this to False (or remove it)
+# and disable CPU throttling (requires root privileges) if you can
+ignorethrottling = True
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/a/AutoDock/AutoDock-4.2.5.1-GCC-5.2.0.eb b/easybuild/easyconfigs/a/AutoDock/AutoDock-4.2.5.1-GCC-5.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..58598fa8b43a70459a7f6180375ff8e73cb37cf3
--- /dev/null
+++ b/easybuild/easyconfigs/a/AutoDock/AutoDock-4.2.5.1-GCC-5.2.0.eb
@@ -0,0 +1,24 @@
+# Currently there is not an EasyBlock to unify AutoDock and AutoGrid so this is a happy medium until then
+easyblock = 'ConfigureMake'
+
+name = 'AutoDock'
+version = '4.2.5.1'
+
+homepage = 'http://autodock.scripps.edu/'
+description = """AutoDock is a suite of automated docking tools. It is designed to 
+ predict how small molecules, such as substrates or drug candidates, bind to 
+ a receptor of known 3D structure."""
+
+toolchain = {'name': 'GCC', 'version': '5.2.0'}
+
+sources = ['%(namelower)ssuite-%(version)s-src.tar.gz']
+source_urls = ['http://autodock.scripps.edu/downloads/previous-releases/autodock-4-2-5/tars/dist4251/']
+
+start_dir = 'autodock'
+
+sanity_check_paths = {
+    'files': ["bin/autodock4"],
+    'dirs': []
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/a/AutoGrid/AutoGrid-4.2.5.1-GCC-5.2.0.eb b/easybuild/easyconfigs/a/AutoGrid/AutoGrid-4.2.5.1-GCC-5.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1cb41f8b792ef3f454ac176a79e2410cc86a78fc
--- /dev/null
+++ b/easybuild/easyconfigs/a/AutoGrid/AutoGrid-4.2.5.1-GCC-5.2.0.eb
@@ -0,0 +1,24 @@
+# Currently there is not an EasyBlock to unify AutoDock and AutoGrid so this is a happy medium until then
+easyblock = 'ConfigureMake'
+
+name = 'AutoGrid'
+version = '4.2.5.1'
+
+homepage = 'http://autodock.scripps.edu/'
+description = """AutoDock is a suite of automated docking tools. It is designed to 
+ predict how small molecules, such as substrates or drug candidates, bind to 
+ a receptor of known 3D structure."""
+
+toolchain = {'name': 'GCC', 'version': '5.2.0'}
+
+sources = ['autodocksuite-%(version)s-src.tar.gz']
+source_urls = ['http://autodock.scripps.edu/downloads/previous-releases/autodock-4-2-5/tars/dist4251/']
+
+start_dir = 'autogrid'
+
+sanity_check_paths = {
+    'files': ["bin/autogrid4"],
+    'dirs': []
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-5.4.0-2.26.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-5.4.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a3fab7ed38073daa3a67356347092512d9a6de60
--- /dev/null
+++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCC-5.4.0-2.26.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': '5.4.0-2.26'}
+
+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-GCCcore-4.9.3.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCCcore-4.9.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8b7fb4793d96caaf7a7046721a1b785123c234a7
--- /dev/null
+++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-GCCcore-4.9.3.eb
@@ -0,0 +1,32 @@
+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': 'GCCcore', 'version': '4.9.3'}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+builddependencies = [
+    ('binutils', '2.25')
+]
+
+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-2016.04.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-foss-2016.04.eb
new file mode 100644
index 0000000000000000000000000000000000000000..94bbfc01ec2e0abd18803ff63fe08a9a345e1d4f
--- /dev/null
+++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-foss-2016.04.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': '2016.04'}
+
+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.15-GCC-5.4.0-2.26.eb b/easybuild/easyconfigs/a/Automake/Automake-1.15-GCC-5.4.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e42ff285562e7c1784ff562473516c8f22c98a9f
--- /dev/null
+++ b/easybuild/easyconfigs/a/Automake/Automake-1.15-GCC-5.4.0-2.26.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': '5.4.0-2.26'}
+
+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-GCCcore-4.9.3.eb b/easybuild/easyconfigs/a/Automake/Automake-1.15-GCCcore-4.9.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5927ea856a1017088765c98659a0821800d75a1f
--- /dev/null
+++ b/easybuild/easyconfigs/a/Automake/Automake-1.15-GCCcore-4.9.3.eb
@@ -0,0 +1,34 @@
+##
+# 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': 'GCCcore', 'version': '4.9.3'}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+builddependencies = [('binutils', '2.25')]
+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-2016.04.eb b/easybuild/easyconfigs/a/Automake/Automake-1.15-foss-2016.04.eb
new file mode 100644
index 0000000000000000000000000000000000000000..40213b047b74a203dfbb4fa6e04d5b8bdd7ddda8
--- /dev/null
+++ b/easybuild/easyconfigs/a/Automake/Automake-1.15-foss-2016.04.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': '2016.04'}
+
+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-5.4.0-2.26.eb b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GCC-5.4.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1452a8b0add5fe55c46e756e5922ba722696f0c9
--- /dev/null
+++ b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GCC-5.4.0-2.26.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': '5.4.0-2.26'}
+
+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-GCCcore-4.9.3.eb b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GCCcore-4.9.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..14abf09d3b2d974f740bd7df3170c27c908b978a
--- /dev/null
+++ b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GCCcore-4.9.3.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': 'GCCcore', 'version': '4.9.3'}
+
+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-2016.04.eb b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-foss-2016.04.eb
new file mode 100644
index 0000000000000000000000000000000000000000..05ba2a5c7549c82fdb607570686015ac061b68b5
--- /dev/null
+++ b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-foss-2016.04.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': '2016.04'}
+
+dependencies = [
+    ('Autoconf', '2.69'),  # 20120424
+    ('Automake', '1.15'),  # 20150105
+    ('libtool', '2.4.6'),  # 20150215
+]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/a/angsd/angsd-0.910-foss-2016a.eb b/easybuild/easyconfigs/a/angsd/angsd-0.910-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c9d9db6e85f23d4f549a6c88f5345ccf584ee1b9
--- /dev/null
+++ b/easybuild/easyconfigs/a/angsd/angsd-0.910-foss-2016a.eb
@@ -0,0 +1,26 @@
+easyblock = 'MakeCp'
+
+name = 'angsd'
+version = '0.910'
+
+homepage = 'http://www.popgen.dk/angsd'
+description = """Program for analysing NGS data."""
+ 
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['https://github.com/ANGSD/angsd/archive/']
+sources = ['%(version)s.tar.gz']
+
+dependencies = [('HTSlib', '1.3.1')]
+
+files_to_copy = [
+    (['angsd'], 'bin'),
+    'doc',
+]
+
+sanity_check_paths = {
+    'files': ['bin/angsd'],
+    'dirs': ['doc'],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/a/argtable/argtable-2.13-foss-2016b.eb b/easybuild/easyconfigs/a/argtable/argtable-2.13-foss-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ec3422f1097e46cfb6167c5f2cdd4d5b7026007d
--- /dev/null
+++ b/easybuild/easyconfigs/a/argtable/argtable-2.13-foss-2016b.eb
@@ -0,0 +1,27 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+# Modified by: Adam Huffman
+# The Francis Crick Institute
+
+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': '2016b'}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['%s%s.tar.gz' % (name, version.replace('.', '-'))]
+
+sanity_check_paths = {
+    'files': ['lib/libargtable2.so', 'lib/libargtable2.la'],
+    'dirs': ['include', 'lib', 'share'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.4.0-intel-2016b.eb b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.4.0-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..feba2c7b4c9f46e0caccf00c10c43245955d6bfc
--- /dev/null
+++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.4.0-intel-2016b.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'arpack-ng'
+version = '3.4.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': '2016b'}
+toolchainopts = {'opt': True, 'pic': True, 'usempi': True}
+
+source_urls = ['https://github.com/opencollab/arpack-ng/archive/']
+sources = ['%(version)s.tar.gz']
+
+builddependencies = [('Autotools', '20150215')]
+
+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/a/awscli/awscli-1.11.1-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/a/awscli/awscli-1.11.1-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ce1d7a97a912706d3010bb946f390691714aa3df
--- /dev/null
+++ b/easybuild/easyconfigs/a/awscli/awscli-1.11.1-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,24 @@
+easyblock = 'PythonPackage'
+
+name = 'awscli'
+version = '1.11.1'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://pypi.python.org/pypi/awscli'
+description = 'Universal Command Line Environment for AWS'
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.12'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/aws'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.26.0-intel-2016b.eb b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.26.0-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3c9d695141470be3c80509db643dfd8470176778
--- /dev/null
+++ b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.26.0-intel-2016b.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.26.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': 'intel', 'version': '2016b'}
+
+# https://github.com/arq5x/bedtools2/releases/download/v2.26.0/bedtools-2.26.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/BLACS/BLACS-1.1-gmvapich2-2016a.eb b/easybuild/easyconfigs/b/BLACS/BLACS-1.1-gmvapich2-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..714b83985a39f8ce0e43bbdfa3c119ee5e1ed71b
--- /dev/null
+++ b/easybuild/easyconfigs/b/BLACS/BLACS-1.1-gmvapich2-2016a.eb
@@ -0,0 +1,24 @@
+name = 'BLACS'
+version = '1.1'
+
+homepage = 'http://www.netlib.org/blacs/'
+description = """The BLACS (Basic Linear Algebra Communication Subprograms) project is
+ an ongoing investigation whose purpose is to create a linear algebra oriented message passing interface
+ that may be implemented efficiently and uniformly across a large range of distributed memory platforms."""
+
+toolchain = {'name': 'gmvapich2', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+source_urls = [homepage]
+sources = [
+    'mpiblacs.tgz',
+    'mpiblacs-patch03.tgz',
+]
+checksums = [
+    '28ae5b91b3193402fe1ae8d06adcf500',
+    '48fdf5e4ef6cf53daec9eeef40498a8b',
+]
+
+patches = ['bmake.mpi.patch']
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/b/BLAST+/BLAST+-2.3.0-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/b/BLAST+/BLAST+-2.3.0-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c7b71288fa90b01fdffe5c8f57bb147cfdbd9dcd
--- /dev/null
+++ b/easybuild/easyconfigs/b/BLAST+/BLAST+-2.3.0-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,38 @@
+##
+# 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>, 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 = 'ConfigureMake'
+
+name = 'BLAST+'
+version = '2.3.0'
+versionsuffix = '-Python-2.7.11'
+
+homepage = 'http://blast.ncbi.nlm.nih.gov/'
+description = """Basic Local Alignment Search Tool, or BLAST, is an algorithm
+ for comparing primary biological sequence information, such as the amino-acid
+ sequences of different proteins or the nucleotides of DNA sequences."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = ['ncbi-blast-%(version)s+-src.tar.gz']
+source_urls = ['http://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/%(version)s/']
+
+dependencies = [('Boost', '1.58.0', versionsuffix)]
+
+configopts = '--with-boost=$EBROOTBOOST --with-64'
+
+sanity_check_paths = {
+    'files': ["bin/blastn", "bin/blastp", "bin/blastx"],
+    'dirs': []
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/BamTools/BamTools-2.4.0-foss-2016b.eb b/easybuild/easyconfigs/b/BamTools/BamTools-2.4.0-foss-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b1a2aa0cf6716a1ac261201c8f1ce087928acd37
--- /dev/null
+++ b/easybuild/easyconfigs/b/BamTools/BamTools-2.4.0-foss-2016b.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': '2016b'}
+
+sources = ['v%(version)s.tar.gz']
+source_urls = ['https://github.com/pezmaster31/bamtools/archive']
+
+builddependencies = [('CMake', '3.4.3')]
+
+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/BayPass/BayPass-2.1-foss-2015a.eb b/easybuild/easyconfigs/b/BayPass/BayPass-2.1-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..132df40d050f5826a957291adb2cfdd9fddd418c
--- /dev/null
+++ b/easybuild/easyconfigs/b/BayPass/BayPass-2.1-foss-2015a.eb
@@ -0,0 +1,29 @@
+easyblock = 'MakeCp'
+
+name = 'BayPass'
+version = '2.1'
+
+homepage = 'http://www1.montpellier.inra.fr/CBGP/software/baypass/'
+description = """The package BayPass is a population genomics software which is primarily
+ aimed at identifying genetic markers subjected to selection and/or associated to
+ population-specific covariates (e.g., environmental variables, quantitative or
+ categorical phenotypic characteristics)."""
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+toolchainopts = {'openmp': True}
+
+source_urls = ['http://www1.montpellier.inra.fr/CBGP/software/baypass/files/']
+sources = ['%(namelower)s_%(version)s.tar.gz']
+
+start_dir = 'sources'
+
+files_to_copy = [(['g_baypass'], 'bin'), (['BayPass_manual_2.1.pdf'], 'manual'), 'examples', 'utils']
+
+parallel = 1
+
+sanity_check_paths = {
+    'files': ['bin/g_baypass'],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/BayeScan/BayeScan-2.1-foss-2016a.eb b/easybuild/easyconfigs/b/BayeScan/BayeScan-2.1-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c4932d395387365c8aea6d9def5215cb012e01f5
--- /dev/null
+++ b/easybuild/easyconfigs/b/BayeScan/BayeScan-2.1-foss-2016a.eb
@@ -0,0 +1,39 @@
+# 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 = 'BayeScan'
+version = '2.1'
+
+homepage = 'http://cmpg.unibe.ch/software/BayeScan/'
+description = """BayeScan aims at identifying candidate loci under natural selection from genetic data, 
+ using differences in allele frequencies between populations."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'openmp': True}
+
+source_urls = ['http://cmpg.unibe.ch/software/BayeScan/files/']
+sources = ['%(name)s%(version)s.zip']
+
+prebuildopts = "sed -i.bk 's/g++/${CXX} ${CXXFLAGS}/g' Makefile && "
+
+start_dir = 'source'
+
+files_to_copy = [
+    (['source/bayescan_%(version)s'], 'bin'),
+    'BayeScan%(version)s_manual.pdf',
+    'input_examples',
+    'R functions'
+]
+
+parallel = 1
+                
+sanity_check_paths = {
+    'files': ['bin/bayescan_%(version)s'],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/Biopython/Biopython-1.68-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/b/Biopython/Biopython-1.68-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..953304846ea999c7fea3c7769546c37127498be3
--- /dev/null
+++ b/easybuild/easyconfigs/b/Biopython/Biopython-1.68-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,37 @@
+##
+# 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>, Thekla Loizou <t.loizou@cyi.ac.cy>, George Tsouloupas <g.tsouloupas@cyi.ac.cy>
+# License::   MIT/GPL
+#
+##
+easyblock = 'PythonPackage'
+
+name = 'Biopython'
+version = '1.68'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://www.biopython.org'
+description = """Biopython is a set of freely available tools for biological computation written
+in Python by an international team of developers. It is a distributed collaborative effort to
+develop Python libraries and applications which address the needs of current and future work in
+bioinformatics. """
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['http://biopython.org/DIST']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.12')
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/Bio', 'lib/python%(pyshortver)s/site-packages/BioSQL']
+}
+
+options = {'modulename': 'Bio'}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/Biopython/Biopython-1.68-intel-2016b-Python-3.5.2.eb b/easybuild/easyconfigs/b/Biopython/Biopython-1.68-intel-2016b-Python-3.5.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b22f51705c3c532edd50b5307bd25febb98e5ea7
--- /dev/null
+++ b/easybuild/easyconfigs/b/Biopython/Biopython-1.68-intel-2016b-Python-3.5.2.eb
@@ -0,0 +1,37 @@
+##
+# 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>, Thekla Loizou <t.loizou@cyi.ac.cy>, George Tsouloupas <g.tsouloupas@cyi.ac.cy>
+# License::   MIT/GPL
+#
+##
+easyblock = 'PythonPackage'
+
+name = 'Biopython'
+version = '1.68'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://www.biopython.org'
+description = """Biopython is a set of freely available tools for biological computation written
+in Python by an international team of developers. It is a distributed collaborative effort to
+develop Python libraries and applications which address the needs of current and future work in
+bioinformatics. """
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['http://biopython.org/DIST']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('Python', '3.5.2')
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/Bio', 'lib/python%(pyshortver)s/site-packages/BioSQL']
+}
+
+options = {'modulename': 'Bio'}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/Bison/Bison-3.0.1-ictce-5.5.0.eb b/easybuild/easyconfigs/b/Bison/Bison-3.0.1-ictce-5.5.0.eb
new file mode 100755
index 0000000000000000000000000000000000000000..152bd6207af9951c3bc05ab0754f0b73d9866cf0
--- /dev/null
+++ b/easybuild/easyconfigs/b/Bison/Bison-3.0.1-ictce-5.5.0.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'Bison'
+version = '3.0.1'
+
+homepage = 'http://www.gnu.org/software/bison'
+description = """Bison is a general-purpose parser generator that converts an annotated context-free grammar
+ into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser tables."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+builddependencies = [('M4', '1.4.17')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ["bison", "yacc"]] + ["lib/liby.a"],
+    'dirs': [],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/b/Bison/Bison-3.0.4-GCCcore-6.1.0.eb b/easybuild/easyconfigs/b/Bison/Bison-3.0.4-GCCcore-6.1.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..59b38bba21849b6651b93e9cce0006fabff68b71
--- /dev/null
+++ b/easybuild/easyconfigs/b/Bison/Bison-3.0.4-GCCcore-6.1.0.eb
@@ -0,0 +1,26 @@
+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': 'GCCcore', 'version': '6.1.0'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+builddependencies = [
+    ('M4', '1.4.17'),
+    # use same binutils version that was used when building GCCcore toolchain
+    ('binutils', '2.27', '', True),
+]
+
+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-GCCcore-6.2.0.eb b/easybuild/easyconfigs/b/Bison/Bison-3.0.4-GCCcore-6.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e30337e6bae7275448de7447d5e28edb49f8407d
--- /dev/null
+++ b/easybuild/easyconfigs/b/Bison/Bison-3.0.4-GCCcore-6.2.0.eb
@@ -0,0 +1,27 @@
+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': 'GCCcore', 'version': '6.2.0'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+builddependencies = [
+    ('M4', '1.4.17'),
+    # use same binutils version that was used when building GCCcore toolchain
+    ('binutils', '2.27', '', True),
+]
+
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ["bison", "yacc"]] + ["lib/liby.a"],
+    'dirs': [],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/b/Blender/Blender-2.77a-intel-2016b-Python-3.5.2.eb b/easybuild/easyconfigs/b/Blender/Blender-2.77a-intel-2016b-Python-3.5.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1ddf498f76a50c8d06bc03440c28867abbb6e700
--- /dev/null
+++ b/easybuild/easyconfigs/b/Blender/Blender-2.77a-intel-2016b-Python-3.5.2.eb
@@ -0,0 +1,53 @@
+easyblock = 'CMakeMake'
+
+name = 'Blender'
+version = '2.77a'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://www.blender.org/'
+description = """Blender is the free and open source 3D creation suite. It supports
+ the entirety of the 3D pipeline-modeling, rigging, animation, simulation, rendering,
+ compositing and motion tracking, even video editing and game creation."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://download.blender.org/source/']
+patches = ['Blender-%(version)s_fix-ARRAY_SIZE-icc.patch']
+
+# disable SSE detection to give EasyBuild full control over optimization compiler flags being used
+configopts = '-DWITH_CPU_SSE=OFF -DCMAKE_C_FLAGS_RELEASE="-DNDEBUG" -DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG" '
+
+# these are needed until extra dependencies are added for them to work
+configopts += '-DWITH_INSTALL_PORTABLE=OFF '
+configopts += '-DWITH_BUILDINFO=OFF '
+configopts += '-DWITH_GAMEENGINE=OFF '
+configopts += '-DWITH_SYSTEM_GLEW=OFF '
+
+# Python paths
+configopts += '-DPYTHON_VERSION=%(pyshortver)s -DPYTHON_LIBRARY=${EBROOTPYTHON}/lib/libpython%(pyshortver)sm.so '
+configopts += '-DPYTHON_INCLUDE_DIR=${EBROOTPYTHON}/include/python%(pyshortver)sm '
+configopts += '-DOPENEXR_INCLUDE_DIR=$EBROOTOPENEXR/include '
+
+dependencies = [
+    ('Python', '3.5.2'),
+    ('Boost', '1.61.0'),
+    ('libjpeg-turbo', '1.5.0'),
+    ('zlib', '1.2.8'),
+    ('X11', '20160819'),
+    ('Mesa', '12.0.2'),
+    ('OpenImageIO', '1.6.17'),  # required for cycles render engine
+]
+
+builddependencies = [('CMake', '3.6.1')]
+
+separate_build_dir = 'True'
+
+modextravars = {'GALLIUM_DRIVER': 'swr'}
+
+sanity_check_paths = {
+	'files': ['bin/blender'],
+	'dirs': []
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/b/Blender/Blender-2.77a_fix-ARRAY_SIZE-icc.patch b/easybuild/easyconfigs/b/Blender/Blender-2.77a_fix-ARRAY_SIZE-icc.patch
new file mode 100644
index 0000000000000000000000000000000000000000..2cc57b24de0ade8d76f1b8624fe1c9c4100d7a45
--- /dev/null
+++ b/easybuild/easyconfigs/b/Blender/Blender-2.77a_fix-ARRAY_SIZE-icc.patch
@@ -0,0 +1,13 @@
+use simple definition of ARRAY_SIZE macro when using Intel compilers
+author: Kenneth Hoste (HPC-UGent)
+--- blender-2.77a/source/blender/blenlib/BLI_utildefines.h.orig	2016-09-07 14:21:00.287130174 +0200
++++ blender-2.77a/source/blender/blenlib/BLI_utildefines.h	2016-09-07 14:21:08.087031653 +0200
+@@ -435,7 +435,7 @@
+ 	} (void)0
+ 
+ /* assuming a static array */
+-#if defined(__GNUC__) && !defined(__cplusplus) && !defined(__clang__)
++#if defined(__GNUC__) && !defined(__cplusplus) && !defined(__clang__) && !defined(__INTEL_COMPILER)
+ #  define ARRAY_SIZE(arr) \
+ 	((sizeof(struct {int isnt_array : ((const void *)&(arr) == &(arr)[0]);}) * 0) + \
+ 	 (sizeof(arr) / sizeof(*(arr))))
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.52.0-foss-2015a.eb b/easybuild/easyconfigs/b/Boost/Boost-1.52.0-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..68ec7366721cd71215bb058f57f5e8e542c2cc47
--- /dev/null
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.52.0-foss-2015a.eb
@@ -0,0 +1,23 @@
+name = 'Boost'
+version = '1.52.0'
+
+homepage = 'http://www.boost.org/'
+description = """Boost provides free peer-reviewed portable C++ source libraries."""
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+toolchainopts = {'pic': True, 'usempi': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['%%(namelower)s_%s.tar.gz' % '_'.join(version.split('.'))]
+
+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/Boost/Boost-1.61.0-foss-2016b.eb b/easybuild/easyconfigs/b/Boost/Boost-1.61.0-foss-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..876bfa42e6c1bd11ef7656a9540ddd363fa83212
--- /dev/null
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.61.0-foss-2016b.eb
@@ -0,0 +1,23 @@
+name = 'Boost'
+version = '1.61.0'
+
+homepage = 'http://www.boost.org/'
+description = """Boost provides free peer-reviewed portable C++ source libraries."""
+
+toolchain = {'name': 'foss', 'version': '2016b'}
+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/Boost/Boost-1.61.0-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/b/Boost/Boost-1.61.0-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..015aad27165b26a87deeffbb317a82fc49b8ee29
--- /dev/null
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.61.0-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,23 @@
+name = 'Boost'
+version = '1.61.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://www.boost.org/'
+description = """Boost provides free peer-reviewed portable C++ source libraries."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+toolchainopts = {'pic': True, 'usempi': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['%%(namelower)s_%s.tar.gz' % '_'.join(version.split('.'))]
+
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.8'),
+    ('Python', '2.7.12'),
+]
+
+# also build boost_mpi
+boost_mpi = True
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.61.0-intel-2016b.eb b/easybuild/easyconfigs/b/Boost/Boost-1.61.0-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..67f6199614993f617b8c8a36636507a06b2e09e1
--- /dev/null
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.61.0-intel-2016b.eb
@@ -0,0 +1,23 @@
+name = 'Boost'
+version = '1.61.0'
+
+homepage = 'http://www.boost.org/'
+description = """Boost provides free peer-reviewed portable C++ source libraries."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+toolchainopts = {'pic': True, 'usempi': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['%%(namelower)s_%s.tar.gz' % '_'.join(version.split('.'))]
+
+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/binutils/binutils-2.27-GCCcore-6.1.0.eb b/easybuild/easyconfigs/b/binutils/binutils-2.27-GCCcore-6.1.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..215aaf0cb28f0364da4319477845fbc91b712779
--- /dev/null
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.27-GCCcore-6.1.0.eb
@@ -0,0 +1,21 @@
+name = 'binutils'
+version = '2.27'
+
+homepage = 'http://directory.fsf.org/project/binutils/'
+description = "binutils: GNU binary utilities"
+
+toolchain = {'name': 'GCCcore', 'version': '6.1.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+builddependencies = [
+    ('flex', '2.6.0'),
+    ('Bison', '3.0.4'),
+    # zlib required, but being linked in statically, so not a runtime dep
+    ('zlib', '1.2.8'),
+    # use same binutils version that was used when building GCC toolchain, to 'bootstrap' this binutils
+    ('binutils', version, '', True)
+]
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.27-GCCcore-6.2.0.eb b/easybuild/easyconfigs/b/binutils/binutils-2.27-GCCcore-6.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..88e16771dff3753f0cfe8e94ae4b87e4fa98f200
--- /dev/null
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.27-GCCcore-6.2.0.eb
@@ -0,0 +1,21 @@
+name = 'binutils'
+version = '2.27'
+
+homepage = 'http://directory.fsf.org/project/binutils/'
+description = "binutils: GNU binary utilities"
+
+toolchain = {'name': 'GCCcore', 'version': '6.2.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+builddependencies = [
+    ('flex', '2.6.0'),
+    ('Bison', '3.0.4'),
+    # zlib required, but being linked in statically, so not a runtime dep
+    ('zlib', '1.2.8'),
+    # use same binutils version that was used when building GCC toolchain, to 'bootstrap' this binutils
+    ('binutils', version, '', True)
+]
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.27.eb b/easybuild/easyconfigs/b/binutils/binutils-2.27.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6011a780095ddc76213da5448e5d2bfd977105c1
--- /dev/null
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.27.eb
@@ -0,0 +1,19 @@
+name = 'binutils'
+version = '2.27'
+
+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.6.0'),
+    ('Bison', '3.0.4'),
+    # zlib required, but being linked in statically, so not a runtime dep
+    ('zlib', '1.2.8'),
+]
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/bwakit/bwakit-0.7.15_x64-linux.eb b/easybuild/easyconfigs/b/bwakit/bwakit-0.7.15_x64-linux.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5e016d4b0dc399d14b9995b043dae476c2b80e10
--- /dev/null
+++ b/easybuild/easyconfigs/b/bwakit/bwakit-0.7.15_x64-linux.eb
@@ -0,0 +1,31 @@
+# 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 = 'Tarball'
+
+name = 'bwakit'
+version = '0.7.15'
+versionsuffix = '_x64-linux'
+
+homepage = 'https://github.com/lh3/bwa/tree/master/bwakit'
+description = """Bwakit is a self-consistent installation-free package of scripts and precompiled binaries,
+providing an end-to-end solution to read mapping."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = ['https://sourceforge.net/projects/bio-bwa/files/bwakit/']
+sources = ['%(name)s-%(version)s%(versionsuffix)s.tar.bz2']
+
+sanity_check_paths = {
+    'files': ['bwa', 'samtools'],
+    'dirs': []
+}
+
+# add the installation dir to PATH
+modextrapaths = {
+	'PATH': "",
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/byacc/byacc-20160606-intel-2016b.eb b/easybuild/easyconfigs/b/byacc/byacc-20160606-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..981c94c528c1c490f3cb02b27c641bfe49ae624f
--- /dev/null
+++ b/easybuild/easyconfigs/b/byacc/byacc-20160606-intel-2016b.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'byacc'
+version = '20160606'
+
+homepage = 'http://invisible-island.net/byacc/byacc.html'
+description = """Berkeley Yacc (byacc) is generally conceded to be the best yacc variant available.
+ In contrast to bison, it is written to avoid dependencies upon a particular compiler."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+sources = [SOURCELOWER_TGZ]
+source_urls = ['ftp://invisible-island.net/byacc']
+
+checksums = ['d527c811b360f04a8c5f5a0a90625966']
+
+sanity_check_paths = {
+    'files': ["bin/yacc"],
+    'dirs': []
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-GCC-4.8.4.eb b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-GCC-4.8.4.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0a99a45a08583466923ad43b0a994ab877a3f824
--- /dev/null
+++ b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-GCC-4.8.4.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.8.4'}
+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-GCC-5.4.0-2.26.eb b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-GCC-5.4.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..42b488a1d63cb1af9284d9163004ce5e369bd7ba
--- /dev/null
+++ b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-GCC-5.4.0-2.26.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': '5.4.0-2.26'}
+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-GCCcore-4.9.3.eb b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-GCCcore-4.9.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3f3812483e0f9b4cf50ce888659fd8d111053cfa
--- /dev/null
+++ b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-GCCcore-4.9.3.eb
@@ -0,0 +1,19 @@
+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': 'GCCcore', 'version': '4.9.3'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://www.bzip.org/%(version)s']
+
+builddependencies = [
+    ('binutils', '2.25'),
+]
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-foss-2016.04.eb b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-foss-2016.04.eb
new file mode 100644
index 0000000000000000000000000000000000000000..deec24c55d0c2fe85648d2e06b774b4525ae90ac
--- /dev/null
+++ b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-foss-2016.04.eb
@@ -0,0 +1,16 @@
+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': '2016.04'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://www.bzip.org/%(version)s']
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/c/CBLAS/CBLAS-20110120-foss-2016b.eb b/easybuild/easyconfigs/c/CBLAS/CBLAS-20110120-foss-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..aadc3712b462532f376dc137904ed540f806d301
--- /dev/null
+++ b/easybuild/easyconfigs/c/CBLAS/CBLAS-20110120-foss-2016b.eb
@@ -0,0 +1,22 @@
+name = 'CBLAS'
+version = '20110120'
+
+homepage = 'http://www.netlib.org/blas/'
+description = "C interface to the BLAS"
+
+toolchain = {'name': 'foss', 'version': '2016b'}
+toolchainopts = {'pic': True}
+
+source_urls = ['http://www.netlib.org/blas/blast-forum/']
+sources = ['cblas.tgz']
+
+patches = ['CBLAS_shared-lib.patch']
+
+buildopts = 'all shared'
+
+# parallel build fails occasionally
+parallel = 1
+
+runtest = 'runtst'
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/c/CDO/CDO-1.7.1-foss-2015a.eb b/easybuild/easyconfigs/c/CDO/CDO-1.7.1-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0f0ccdc37335fef465ee10434f8a6a4b73e4fb51
--- /dev/null
+++ b/easybuild/easyconfigs/c/CDO/CDO-1.7.1-foss-2015a.eb
@@ -0,0 +1,28 @@
+easyblock = 'ConfigureMake'
+
+name = 'CDO'
+version = '1.7.1'
+
+homepage = 'https://code.zmaw.de/projects/cdo'
+description = """CDO is a collection of command line Operators to manipulate and analyse Climate and NWP model Data."""
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+toolchainopts = {'opt': True, 'pic': True, 'usempi': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['https://code.zmaw.de/attachments/download/12070/']
+
+dependencies = [
+    ('HDF5', '1.8.13'),
+    ('netCDF', '4.3.2'),
+    ('YAXT', '0.4.4'),
+]
+
+configopts = "--with-hdf5=$EBROOTHDF5 --with-netcdf=$EBROOTNETCDF"
+
+sanity_check_paths = {
+    'files': ["bin/cdo"],
+    'dirs': [],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.300-ictce-5.5.0.eb b/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.300-ictce-5.5.0.eb
new file mode 100755
index 0000000000000000000000000000000000000000..8c90ec640b0236d20dc1748b65d5070891dd4ed2
--- /dev/null
+++ b/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.300-ictce-5.5.0.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'CFITSIO'
+version = '3.300'
+
+homepage = 'http://heasarc.gsfc.nasa.gov/fitsio/'
+description = """CFITSIO is a library of C and Fortran subroutines for reading and writing data files in
+FITS (Flexible Image Transport System) data format."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'pic': True}
+
+srcversion = 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/CFITSIO/CFITSIO-3.350-ictce-5.5.0.eb b/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.350-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..177bb20dcc1286cb244bace7ba4155d63eefe745
--- /dev/null
+++ b/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.350-ictce-5.5.0.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'CFITSIO'
+version = '3.350'
+
+homepage = 'http://heasarc.gsfc.nasa.gov/fitsio/'
+description = """CFITSIO is a library of C and Fortran subroutines for reading and writing data files in
+FITS (Flexible Image Transport System) data format."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+srcversion = '%s' % 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.8.1-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.8.1-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3efaca57eb38ef9ca38118ac3b13686b7e14c400
--- /dev/null
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.8.1-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,36 @@
+name = 'CGAL'
+version = '4.8.1'
+versionsuffix = '-Python-%(pyver)s'
+
+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': '2016b'}
+toolchainopts = {'strict': True}
+
+source_urls = ['https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-%(version)s']
+sources = [SOURCE_TAR_XZ]
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('Python', '2.7.12'),
+    ('Boost', '1.61.0', versionsuffix),
+    ('MPFR', '3.1.4'),
+    ('GMP', '6.1.1'),
+    ('libGLU', '9.0.0'),
+    ('Qt5', '5.7.0'),
+]
+
+builddependencies = [
+    ('CMake', '3.6.1'),
+    ('Eigen', '3.2.9'),
+]
+
+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
+configopts += "-DWITH_ZLIB=ON -DWITH_MPFR=ON -DWITH_OpenGL=ON -DWITH_Eigen3=ON "
+configopts += "-DWITH_GMPXX=ON -DWITH_LAPACK=ON -DWITH_BLAS=ON "
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.8.1-intel-2016b.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.8.1-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..406b208a885a64eb4cf6c8adf3ab4054ce1af3c5
--- /dev/null
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.8.1-intel-2016b.eb
@@ -0,0 +1,34 @@
+name = 'CGAL'
+version = '4.8.1'
+
+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': '2016b'}
+toolchainopts = {'strict': True}
+
+source_urls = ['https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-%(version)s']
+sources = [SOURCE_TAR_XZ]
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('Boost', '1.61.0'),
+    ('MPFR', '3.1.4'),
+    ('GMP', '6.1.1'),
+    ('libGLU', '9.0.0'),
+    ('Qt5', '5.7.0'),
+]
+
+builddependencies = [
+    ('CMake', '3.6.1'),
+    ('Eigen', '3.2.9'),
+]
+
+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
+configopts += "-DWITH_ZLIB=ON -DWITH_MPFR=ON -DWITH_OpenGL=ON -DWITH_Eigen3=ON "
+configopts += "-DWITH_GMPXX=ON -DWITH_LAPACK=ON -DWITH_BLAS=ON "
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.3.1-ictce-5.5.0.eb b/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.3.1-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..380b94f6c7c236a984046b0053fec8a39724a641
--- /dev/null
+++ b/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.3.1-ictce-5.5.0.eb
@@ -0,0 +1,23 @@
+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': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TGZ]
+source_urls = ['http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/']
+
+builddependencies = [('CMake', '2.8.12')]
+
+separate_build_dir = True
+
+configopts = '-DCMAKE_BUILD_TYPE=Release'
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/c/CMake/CMake-3.4.3-foss-2016b.eb b/easybuild/easyconfigs/c/CMake/CMake-3.4.3-foss-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..cfb29da8c6bf080ad09d850d55b07d4ee2204841
--- /dev/null
+++ b/easybuild/easyconfigs/c/CMake/CMake-3.4.3-foss-2016b.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'CMake'
+version = '3.4.3'
+
+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': '2016b'}
+
+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.6.1-GCC-5.4.0-2.26.eb b/easybuild/easyconfigs/c/CMake/CMake-3.6.1-GCC-5.4.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..97b2282312fdb2dc386f319eb008d3f7ab5c60c3
--- /dev/null
+++ b/easybuild/easyconfigs/c/CMake/CMake-3.6.1-GCC-5.4.0-2.26.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'CMake'
+version = '3.6.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': 'GCC', 'version': '5.4.0-2.26'}
+
+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.1s'),
+]
+
+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.6.1-GCCcore-4.9.3.eb b/easybuild/easyconfigs/c/CMake/CMake-3.6.1-GCCcore-4.9.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d5ca429e05c505cb75fa5bd613bb898ff5121bce
--- /dev/null
+++ b/easybuild/easyconfigs/c/CMake/CMake-3.6.1-GCCcore-4.9.3.eb
@@ -0,0 +1,35 @@
+easyblock = 'ConfigureMake'
+
+name = 'CMake'
+version = '3.6.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]
+
+configopts = '-- -DCMAKE_USE_OPENSSL=1'
+
+builddependencies = [
+    ('binutils', '2.25'),
+]
+
+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.6.1-foss-2016b.eb b/easybuild/easyconfigs/c/CMake/CMake-3.6.1-foss-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c1386c78f896d8dc07fb578f87f9d3f0253b1a5e
--- /dev/null
+++ b/easybuild/easyconfigs/c/CMake/CMake-3.6.1-foss-2016b.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'CMake'
+version = '3.6.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': '2016b'}
+
+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.1s'),
+]
+
+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.6.1-intel-2016b.eb b/easybuild/easyconfigs/c/CMake/CMake-3.6.1-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..40d915d152ffed6606ba6cd6a87ebb9e652c2944
--- /dev/null
+++ b/easybuild/easyconfigs/c/CMake/CMake-3.6.1-intel-2016b.eb
@@ -0,0 +1,33 @@
+easyblock = 'ConfigureMake'
+
+name = 'CMake'
+version = '3.6.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': '2016b'}
+
+source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s']
+sources = [SOURCELOWER_TAR_GZ]
+
+patches = ['%(name)s-%(version)s-use-gnu11.patch']
+
+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.1s'),
+]
+
+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.6.1-use-gnu11.patch b/easybuild/easyconfigs/c/CMake/CMake-3.6.1-use-gnu11.patch
new file mode 100644
index 0000000000000000000000000000000000000000..361f38b0b3faa10732edf1ccc36e48c7ee5173b2
--- /dev/null
+++ b/easybuild/easyconfigs/c/CMake/CMake-3.6.1-use-gnu11.patch
@@ -0,0 +1,17 @@
+# Using -std=c11 lets the build fail with very weird errors (with icc). Switching to
+# gnu11 makes it pass.
+# Ward Poelmans <wpoely86@gmail.com>
+diff -ur cmake-3.6.1.orig/Modules/Compiler/Intel-C.cmake cmake-3.6.1/Modules/Compiler/Intel-C.cmake
+--- cmake-3.6.1.orig/Modules/Compiler/Intel-C.cmake	2016-07-22 15:50:22.000000000 +0200
++++ cmake-3.6.1/Modules/Compiler/Intel-C.cmake	2016-08-31 17:32:38.594401777 +0200
+@@ -15,8 +15,8 @@
+ endif()
+
+ if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 15.0.0)
+-  set(CMAKE_C11_STANDARD_COMPILE_OPTION "${_std}=c11")
+-  set(CMAKE_C11_EXTENSION_COMPILE_OPTION "${_std}=c11")
++  set(CMAKE_C11_STANDARD_COMPILE_OPTION "${_std}=gnu11")
++  set(CMAKE_C11_EXTENSION_COMPILE_OPTION "${_std}=gnu11")
+ endif()
+
+ if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.1)
diff --git a/easybuild/easyconfigs/c/CMake/CMake-3.6.2-foss-2016b.eb b/easybuild/easyconfigs/c/CMake/CMake-3.6.2-foss-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..adb0724437a111d40b93466730dc87eb11286f72
--- /dev/null
+++ b/easybuild/easyconfigs/c/CMake/CMake-3.6.2-foss-2016b.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'CMake'
+version = '3.6.2'
+
+homepage = 'http://www.cmake.org'
+description = """CMake, the cross-platform, open-source build system.
+ CMake is a family of tools designed to build, test and package software."""
+
+toolchain = {'name': 'foss', 'version': '2016b'}
+
+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.2j'),
+]
+
+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.6.2-intel-2016b.eb b/easybuild/easyconfigs/c/CMake/CMake-3.6.2-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b6e496837c29857c60970db220b2ab962dae18e0
--- /dev/null
+++ b/easybuild/easyconfigs/c/CMake/CMake-3.6.2-intel-2016b.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'CMake'
+version = '3.6.2'
+
+homepage = 'http://www.cmake.org'
+description = """CMake, the cross-platform, open-source build system.
+ CMake is a family of tools designed to build, test and package software."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+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.2j'),
+]
+
+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/CP2K/CP2K-3.0-intel-2016b-psmp.eb b/easybuild/easyconfigs/c/CP2K/CP2K-3.0-intel-2016b-psmp.eb
new file mode 100644
index 0000000000000000000000000000000000000000..70102c177eacc4d112a76f7c857b32c6cbaed858
--- /dev/null
+++ b/easybuild/easyconfigs/c/CP2K/CP2K-3.0-intel-2016b-psmp.eb
@@ -0,0 +1,45 @@
+name = 'CP2K'
+version = '3.0'
+versionsuffix = '-psmp'
+
+homepage = 'http://www.cp2k.org/'
+description = """CP2K is a freely available (GPL) program, written in Fortran 95, to perform atomistic and molecular
+ simulations of solid state, liquid, molecular and biological systems. It provides a general framework for different
+ methods such as e.g. density functional theory (DFT) using a mixed Gaussian and plane waves approach (GPW), and
+ classical pair and many-body potentials. """
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = [SOURCEFORGE_SOURCE]
+
+patches = [
+    'CP2K-2.6.0-ifort-compiler-bug-fix.patch',
+    'CP2K-2.4.0-fix_compile_date_lastsvn.patch',
+]
+
+dependencies = [
+    ('Libint', '1.1.6'),
+    ('libxc', '2.2.3'),
+    ('PLUMED', '2.2.3'),
+    ('libxsmm', '1.4.4'),
+]
+
+builddependencies = [
+    ('flex', '2.6.0'),
+    ('Bison', '3.0.4'),
+]
+
+# don't use parallel make, results in compilation failure
+# because Fortran module files aren't created before they are needed
+parallel = 1
+
+type = 'psmp'
+
+# regression test reports failures
+ignore_regtest_fails = True
+
+plumed = True
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-3.0-intel-2016b.eb b/easybuild/easyconfigs/c/CP2K/CP2K-3.0-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..edd1ebec094a6985529b7027d59a114055f88583
--- /dev/null
+++ b/easybuild/easyconfigs/c/CP2K/CP2K-3.0-intel-2016b.eb
@@ -0,0 +1,42 @@
+name = 'CP2K'
+version = '3.0'
+
+homepage = 'http://www.cp2k.org/'
+description = """CP2K is a freely available (GPL) program, written in Fortran 95, to perform atomistic and molecular
+ simulations of solid state, liquid, molecular and biological systems. It provides a general framework for different
+ methods such as e.g. density functional theory (DFT) using a mixed Gaussian and plane waves approach (GPW), and
+ classical pair and many-body potentials. """
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = [SOURCEFORGE_SOURCE]
+
+patches = [
+    'CP2K-2.6.0-ifort-compiler-bug-fix.patch',
+    'CP2K-2.4.0-fix_compile_date_lastsvn.patch',
+]
+
+dependencies = [
+    ('Libint', '1.1.6'),
+    ('libxc', '2.2.3'),
+    ('PLUMED', '2.2.3'),
+    ('libxsmm', '1.4.4'),
+]
+
+builddependencies = [
+    ('flex', '2.6.0'),
+    ('Bison', '3.0.4'),
+]
+
+# don't use parallel make, results in compilation failure
+# because Fortran module files aren't created before they are needed
+parallel = 1
+
+# regression test reports failures
+ignore_regtest_fails = True
+
+plumed = True
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/c/CRPropa/CRPropa-2.0.3-ictce-5.5.0.eb b/easybuild/easyconfigs/c/CRPropa/CRPropa-2.0.3-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7d9e83529184c681cc75561bef7591189cecde31
--- /dev/null
+++ b/easybuild/easyconfigs/c/CRPropa/CRPropa-2.0.3-ictce-5.5.0.eb
@@ -0,0 +1,39 @@
+easyblock = 'ConfigureMake'
+
+name = 'CRPropa'
+version = '2.0.3'
+
+homepage = 'https://crpropa.desy.de'
+description = """CRPropa is a publicly available code to study the propagation of ultra high energy nuclei up to iron
+ on their voyage through an extra galactic environment."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+source_urls = ['https://github.com/CRPropa/CRPropa2/archive/']
+sources = ['v%(version)s.tar.gz']
+
+patches = ['CRPropa-%(version)s_no-docs.patch']
+
+dependencies = [
+    ('CLHEP', '2.1.3.1'),
+    ('CFITSIO', '3.350'),
+    ('ROOT', 'v5.34.13'),
+    ('FFTW', '3.3.3'),
+]
+builddependencies = [('Doxygen', '1.8.5')]
+
+configopts = '--with-clhep-path=$EBROOTCLHEP/bin'
+configopts += '--with-cfitsio-include=$EBROOTCFITSIO/include --with-cfitsio-library=$EBROOTCFITSIO/lib '
+configopts += '--with-root=$EBROOTROOT/lib'
+
+# download and install the photo disintegration data package
+prebuildopts = './GetPDCrossSections.sh && '
+
+runtest = 'check'
+
+sanity_check_paths = {
+    'files': ["bin/CRPropa"],
+    'dirs': ["lib", "share"],
+}
+
+moduleclass = 'phys'
diff --git a/easybuild/easyconfigs/c/CRPropa/CRPropa-2.0.3_no-docs.patch b/easybuild/easyconfigs/c/CRPropa/CRPropa-2.0.3_no-docs.patch
new file mode 100644
index 0000000000000000000000000000000000000000..98c5588397252a252578618dc710865229da307a
--- /dev/null
+++ b/easybuild/easyconfigs/c/CRPropa/CRPropa-2.0.3_no-docs.patch
@@ -0,0 +1,13 @@
+skip building of docs
+author: Kenneth Hoste (HPC-UGent)
+--- Makefile.in.orig	2014-03-26 17:18:53.474997093 +0100
++++ Makefile.in	2014-03-26 17:19:18.844596386 +0100
+@@ -291,7 +291,7 @@
+ AM_CPPFLAGS = $(GNL_CPPFLAGS)
+ 
+ #SUBDIRS = External doc sophia dint src 
+-SUBDIRS = External sophia sibyll dint src  doc
++SUBDIRS = External sophia sibyll dint src # doc
+ EXTRA_DIST = sophia/src/sophia.h sibyll/sibyll.h src/Interactions/proton_f77 src/Interactions/proton_sophia dint/src/tables sysdep.h get_externals.sh GetPDCrossSections.sh HalfLifeTable doc/Doxyfile COPYRIGHT doc/UserGuide.tex doc/precision_traj.ps doc/PhotonDensityCollection2.eps doc/crpdetector.eps doc/AllIRBzEvolutionModelsCan.eps IRBzRedshiftEvol_Kneiske examples/GettingStarted Plot
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/easybuild/easyconfigs/c/CUDA/CUDA-8.0.44-GCC-5.4.0-2.26.eb b/easybuild/easyconfigs/c/CUDA/CUDA-8.0.44-GCC-5.4.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..414d7ab0924100562aa54f470e9b3a220fb03c7a
--- /dev/null
+++ b/easybuild/easyconfigs/c/CUDA/CUDA-8.0.44-GCC-5.4.0-2.26.eb
@@ -0,0 +1,19 @@
+name = 'CUDA'
+version = '8.0.44'
+
+homepage = 'https://developer.nvidia.com/cuda-toolkit'
+description = """CUDA (formerly Compute Unified Device Architecture) is a parallel
+ computing platform and programming model created by NVIDIA and implemented by the
+ graphics processing units (GPUs) that they produce. CUDA gives developers access
+ to the virtual instruction set and memory of the parallel computational elements in CUDA GPUs."""
+
+toolchain = {'name': 'GCC', 'version': '5.4.0-2.26'}
+
+source_urls = [
+    'http://developer.download.nvidia.com/compute/cuda/%(version_major_minor)s/Prod/local_installers/',
+    'https://developer.nvidia.com/compute/cuda/%(version_major_minor)s/prod/local_installers/'
+]
+
+sources = ['%(namelower)s_%(version)s_linux-run']
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/c/CVS/CVS-1.11.23-GCCcore-4.9.3.eb b/easybuild/easyconfigs/c/CVS/CVS-1.11.23-GCCcore-4.9.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e9bbed8bb408f80f991a353e8ed09453e22b2d0d
--- /dev/null
+++ b/easybuild/easyconfigs/c/CVS/CVS-1.11.23-GCCcore-4.9.3.eb
@@ -0,0 +1,30 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'CVS'
+version = '1.11.23'
+
+homepage = 'https://savannah.nongnu.org/projects/cvs'
+description = """CVS is a version control system, an important component of
+ Source Configuration Management (SCM)."""
+
+toolchain = {'name': 'GCCcore', 'version': '4.9.3'}
+
+source_urls = [' http://ftp.gnu.org/non-gnu/cvs/source/stable/%(version)s/']
+sources = [SOURCELOWER_TAR_BZ2]
+
+patches = ['CVS-1.11.23-zlib-1.patch', 'CVS-1.11.23-getline.patch']
+
+builddependencies = [('binutils', '2.25')]
+dependencies = [('zlib', '1.2.8')]
+
+sanity_check_paths = {
+    'files': ['bin/cvs', 'bin/cvsbug', 'bin/rcs2log'],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/c/Cantera/Cantera-2.2.1-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/c/Cantera/Cantera-2.2.1-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..df2115bf2e20534ea02b491090e5877b22060915
--- /dev/null
+++ b/easybuild/easyconfigs/c/Cantera/Cantera-2.2.1-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,41 @@
+easyblock = 'SCons'
+
+name = 'Cantera'
+version = '2.2.1'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://github.com/Cantera/cantera'
+description = """Chemical kinetics, thermodynamics, and transport tool suite"""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['https://github.com/Cantera/cantera/archive/']
+sources = ['v%(version)s.tar.gz']
+
+dependencies = [
+    ('Python', '2.7.12'),
+    ('Boost', '1.61.0', versionsuffix),
+    ('SUNDIALS', '2.6.2'),
+]
+builddependencies = [
+    ('SCons', '2.5.0', versionsuffix),
+    ('3to2', '1.1.1', versionsuffix),
+]
+
+common_opts = 'env_vars=all CC="$CC" CXX="$CXX" blas_lapack_libs=mkl_rt blas_lapack_dir=$BLAS_LAPACK_LIB_DIR'
+common_opts += ' sundials_include=$EBROOTSUNDIALS/include sundials_libdir=$EBROOTSUNDIALS/lib'
+buildopts = 'build ' + common_opts
+runtest = 'test ' + common_opts
+buildopts = 'install ' + common_opts
+prefix_arg = 'prefix='
+
+modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
+
+sanity_check_paths = {
+    'files': ['bin/mixmaster'],
+    'dirs': ['include/cantera', 'lib/pkgconfig', 'lib/python%(pyshortver)s/site-packages'],
+}
+
+sanity_check_commands = [('python', "-c 'import cantera'")]
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/c/CastXML/CastXML-20160617-foss-2016a.eb b/easybuild/easyconfigs/c/CastXML/CastXML-20160617-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..553587edc64960c94294604b15c4fcf79aa78b9a
--- /dev/null
+++ b/easybuild/easyconfigs/c/CastXML/CastXML-20160617-foss-2016a.eb
@@ -0,0 +1,32 @@
+easyblock = 'CMakeMake'
+
+name = 'CastXML'
+version = '20160617'
+commit_id = 'd5934bd'
+
+homepage = 'https://github.com/CastXML/CastXML'
+description = """CastXML is a C-family abstract syntax tree XML output tool."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['https://github.com/CastXML/CastXML/archive']
+sources = ['%s.tar.gz' % commit_id]
+
+builddependencies = [
+    ('CMake', '3.4.3'),
+]
+
+dependencies = [
+    ('Clang', '3.7.1'),
+    ('ncurses', '6.0'),
+    ('zlib', '1.2.8'),
+]
+
+separate_build_dir = True
+
+sanity_check_paths = {
+    'files': ["bin/castxml"],
+    'dirs': ["share/castxml"],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/c/CheMPS2/CheMPS2-1.8-intel-2016b.eb b/easybuild/easyconfigs/c/CheMPS2/CheMPS2-1.8-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f566c1ab13646dce3d167e758063c93a9815b966
--- /dev/null
+++ b/easybuild/easyconfigs/c/CheMPS2/CheMPS2-1.8-intel-2016b.eb
@@ -0,0 +1,30 @@
+easyblock = 'CMakeMake'
+
+name = 'CheMPS2'
+version = '1.8'
+
+homepage = 'https://github.com/SebWouters/CheMPS2'
+description = """CheMPS2 is a scientific library which contains a spin-adapted implementation of the
+density matrix renormalization group (DMRG) for ab initio quantum chemistry."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+sources = ['v%(version)s.tar.gz']
+source_urls = ['https://github.com/SebWouters/CheMPS2/archive/']
+
+builddependencies = [('CMake', '3.5.2')]
+
+dependencies = [
+    ('HDF5', '1.8.17')
+]
+
+runtest = 'test'
+
+separate_build_dir = True
+
+sanity_check_paths = {
+    'files': ['bin/chemps2', 'lib64/libchemps2.%s' % SHLIB_EXT, 'lib64/libchemps2.a'],
+    'dirs': ['include/chemps2']
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/c/Circos/Circos-0.69-2-ictce-5.5.0-Perl-5.18.2.eb b/easybuild/easyconfigs/c/Circos/Circos-0.69-2-ictce-5.5.0-Perl-5.18.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6c93e5f90f003a228b0cdfbc379f9bf172c66c6c
--- /dev/null
+++ b/easybuild/easyconfigs/c/Circos/Circos-0.69-2-ictce-5.5.0-Perl-5.18.2.eb
@@ -0,0 +1,33 @@
+easyblock = "Tarball"
+
+name = 'Circos'
+version = '0.69-2'
+
+homepage = 'http://www.circos.ca/'
+description = """Circos is a software package for visualizing data and information.
+ It visualizes data in a circular layout - this makes Circos ideal for exploring
+ relationships between objects or positions."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+source_urls = ['http://circos.ca/distribution/']
+sources = [SOURCELOWER_TGZ]
+
+perl = 'Perl'
+perlver = '5.18.2'
+versionsuffix = '-%s-%s' % (perl, perlver)
+dependencies = [
+    (perl, perlver),
+    ('GD', '2.52', versionsuffix),
+]
+
+sanity_check_paths = {
+    'files': ['bin/%(namelower)s'],
+    'dirs': ['lib/%(name)s'],
+}
+
+modextrapaths = {'PERL5LIB': 'lib'}
+
+sanity_check_commands = [('perl', '-e "use Circos"')]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/c/Clang/Clang-3.8.1-GCC-5.4.0-2.26.eb b/easybuild/easyconfigs/c/Clang/Clang-3.8.1-GCC-5.4.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3c6cb72c88a688d2ab94ee9989c9e2add70eeb57
--- /dev/null
+++ b/easybuild/easyconfigs/c/Clang/Clang-3.8.1-GCC-5.4.0-2.26.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.8.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': '5.4.0-2.26'}
+# 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",
+    "openmp-%(version)s.src.tar.xz",
+]
+
+dependencies = [
+    ('GMP', '6.1.1'),
+]
+
+builddependencies = [
+    ('CMake', '3.6.1'),
+    ('Python', '2.7.12', '-bare'),
+    ('libxml2', '2.9.4'),
+]
+
+assertions = True
+
+usepolly = True
+
+build_targets = ['X86']
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/c/Clustal-Omega/Clustal-Omega-1.2.0-foss-2016b.eb b/easybuild/easyconfigs/c/Clustal-Omega/Clustal-Omega-1.2.0-foss-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..06226cf0b0a0ffc84b6aa27a0b262f226b8a0a87
--- /dev/null
+++ b/easybuild/easyconfigs/c/Clustal-Omega/Clustal-Omega-1.2.0-foss-2016b.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
+# Modified by Adam Huffman
+# Francis Crick Institute
+
+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': '2016b'}
+
+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/CppUnit/CppUnit-1.12.1-foss-2016a.eb b/easybuild/easyconfigs/c/CppUnit/CppUnit-1.12.1-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f0709a3154d0b8541aa75babc8a00739bb0004c3
--- /dev/null
+++ b/easybuild/easyconfigs/c/CppUnit/CppUnit-1.12.1-foss-2016a.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': 'foss', 'version': '2016a'}
+
+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/Cube/Cube-4.2-goolf-1.5.14.eb b/easybuild/easyconfigs/c/Cube/Cube-4.2-goolf-1.5.14.eb
new file mode 100644
index 0000000000000000000000000000000000000000..94f4a3ca61d3d4f4d7f3e3885f4c23b2e37f91a4
--- /dev/null
+++ b/easybuild/easyconfigs/c/Cube/Cube-4.2-goolf-1.5.14.eb
@@ -0,0 +1,56 @@
+##
+# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2013-2015 Juelich Supercomputing Centre, Germany
+# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
+#             Markus Geimer <m.geimer@fz-juelich.de>
+# License::   3-clause BSD
+#
+# This work is based on experiences from the UNITE project
+# http://apps.fz-juelich.de/unite/
+##
+
+easyblock = 'EB_Score_minus_P'
+
+name = 'Cube'
+version = '4.2'
+
+homepage = 'http://www.scalasca.org/software/cube-4.x/download.html'
+description = """Cube, which is used as performance report explorer for Scalasca and
+ Score-P, is a generic tool for displaying a multi-dimensional performance space
+ consisting of the dimensions (i) performance metric, (ii) call path, and (iii) system
+ resource. Each dimension can be represented as a tree, where non-leaf nodes of the tree
+ can be collapsed or expanded to achieve the desired level of granularity."""
+
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://apps.fz-juelich.de/scalasca/releases/cube/%(version_major_minor)s/dist']
+
+# Backported fixes included in Cube 4.2.2 and up
+patches = [
+    'Cube-%(version)s_fix-Qt-version-check.patch',
+    'Cube-%(version)s_fix-with-qt-check.patch',
+]
+
+checksums = [
+    'aa1b1594bacddd3a1931f9a9dea23ce8',    # cube-4.2.tar.gz
+    'da69fe49d347dc7722c30bb785106d96',    # Cube-4.2_fix-Qt-version-check.patch
+    '5a746d4f6f4eb5eb8b464ca355b46891',    # Cube-4.2_fix-with-qt-check.patch
+]
+
+dependencies = [('Qt', '4.8.6')]
+
+# The Cube Java reader is currently only used by TAU, which ships it's own
+# copy as a jar file. If you really want to enable it, make sure to set
+# 'maxparallel=1', as automake's Java support has difficulties handling
+# parallel builds.
+configopts = '--without-java-reader'
+
+sanity_check_paths = {
+    'files': ['bin/cube', ('lib/libcube4.a', 'lib64/libcube4.a'),
+              ('lib/libcube4.%s' % SHLIB_EXT, 'lib64/libcube4.%s' % SHLIB_EXT)],
+    'dirs': ['include/cube', 'include/cubew'],
+}
+
+moduleclass = 'perf'
diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.24.1-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/c/Cython/Cython-0.24.1-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a2db0bddbe99132238a4d27f2a5214262a4b4899
--- /dev/null
+++ b/easybuild/easyconfigs/c/Cython/Cython-0.24.1-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,24 @@
+easyblock = 'PythonPackage'
+
+name = 'Cython'
+version = '0.24.1'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://pypi.python.org/pypi/Cython/'
+description = """The Cython language makes writing C extensions for the Python language as easy as Python itself.
+Cython is a source code translator based on the well-known Pyrex, but supports more cutting edge functionality and optimizations."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('Python', '2.7.11')]
+
+cythonlibdir = 'lib/python%(pyshortver)s/site-packages/Cython-%(version)s-py%(pyshortver)s-linux-x86_64.egg'
+sanity_check_paths = {
+    'files': ['bin/cygdb', 'bin/cython', '%s/%%(namelower)s.py' % cythonlibdir],
+    'dirs': [cythonlibdir + '/%(name)s']
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/c/cairo/cairo-1.14.6-foss-2016a-GLib-2.48.0.eb b/easybuild/easyconfigs/c/cairo/cairo-1.14.6-foss-2016a-GLib-2.48.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..92598548412db0b63dc7ad0646c9ba909214283e
--- /dev/null
+++ b/easybuild/easyconfigs/c/cairo/cairo-1.14.6-foss-2016a-GLib-2.48.0.eb
@@ -0,0 +1,53 @@
+easyblock = 'ConfigureMake'
+
+name = 'cairo'
+version = '1.14.6'
+glibver = '2.48.0'
+versionsuffix = '-GLib-%s' % glibver
+
+homepage = 'http://cairographics.org'
+description = """Cairo is a 2D graphics library with support for multiple output devices.
+ Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers,
+ PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://cairographics.org/releases/']
+sources = [SOURCE_TAR_XZ]
+
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.8'),
+    ('libpng', '1.6.21'),
+    ('freetype', '2.6.3'),
+    ('pixman', '0.34.0'),
+    ('fontconfig', '2.11.95'),
+    ('expat', '2.1.1'),
+    ('libX11', '1.6.3'),
+    ('libxcb', '1.11.1'),
+    ('libXrender', '0.9.9'),
+    ('libXext', '1.3.3'),
+    ('libXau', '1.0.8'),
+    ('libXdmcp', '1.1.2'),
+    ('GLib', glibver),
+]
+builddependencies = [
+    ('renderproto', '0.11'),
+    ('xproto', '7.0.28'),
+    ('xextproto', '7.3.0'),
+]
+
+# disable symbol lookup, which requires -lbfd, to avoid link issues with (non-PIC) libiberty.a provided by GCC
+configopts = "--enable-symbol-lookup=no --enable-gobject=yes --enable-svg=yes --enable-tee=yes "
+
+sanity_check_paths = {
+    'files': ['bin/cairo-trace', 'lib/cairo/libcairo-trace.so', 'lib/cairo/libcairo-trace.a',
+              'lib/libcairo.a', 'lib/libcairo-gobject.a', 'lib/libcairo-script-interpreter.a',
+              'lib/libcairo-gobject.so', 'lib/libcairo-script-interpreter.so', 'lib/libcairo.so'] +
+             ['include/cairo/cairo%s.h' % x for x in ['', '-deprecated', '-features', '-ft', '-gobject', '-pdf', '-ps',
+                                                      '-script', '-script-interpreter', '-svg', '-version', '-xcb',
+                                                      '-xlib', '-xlib-xrender']],
+    'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/c/cairo/cairo-1.14.6-intel-2016b.eb b/easybuild/easyconfigs/c/cairo/cairo-1.14.6-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..54967b2ef70805d4d9d341bf993395122c43711e
--- /dev/null
+++ b/easybuild/easyconfigs/c/cairo/cairo-1.14.6-intel-2016b.eb
@@ -0,0 +1,43 @@
+easyblock = 'ConfigureMake'
+
+name = 'cairo'
+version = '1.14.6'
+
+homepage = 'http://cairographics.org'
+description = """Cairo is a 2D graphics library with support for multiple output devices.
+ Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers,
+ PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB"""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['http://cairographics.org/releases/']
+sources = [SOURCE_TAR_XZ]
+
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.8'),
+    ('libpng', '1.6.24'),
+    ('freetype', '2.6.5'),
+    ('pixman', '0.34.0'),
+    ('expat', '2.2.0'),
+    ('GLib', '2.49.5'),
+    ('X11', '20160819'),
+]
+
+# disable symbol lookup, which requires -lbfd, to avoid link issues with (non-PIC) libiberty.a provided by GCC
+configopts = "--enable-symbol-lookup=no --enable-gobject=yes --enable-svg=yes --enable-tee=yes --enable-xlib-xcb "
+
+# workaround for "hidden symbol .* in .* is referenced by DSO" and "ld: final link failed: Bad value"
+buildopts = 'LD="$CC" LDFLAGS="$LDFLAGS -shared-intel"'
+
+sanity_check_paths = {
+    'files': ['bin/cairo-trace', 'lib/cairo/libcairo-trace.so', 'lib/cairo/libcairo-trace.a',
+              'lib/libcairo.a', 'lib/libcairo-gobject.a', 'lib/libcairo-script-interpreter.a',
+              'lib/libcairo-gobject.so', 'lib/libcairo-script-interpreter.so', 'lib/libcairo.so'] +
+             ['include/cairo/cairo%s.h' % x for x in ['', '-deprecated', '-features', '-ft', '-gobject', '-pdf', '-ps',
+                                                      '-script', '-script-interpreter', '-svg', '-version', '-xcb',
+                                                      '-xlib', '-xlib-xrender']],
+    'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/c/ccache/ccache-3.3.1.eb b/easybuild/easyconfigs/c/ccache/ccache-3.3.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..66a9fe225ab7cd620e3562b0a4e585681e64249c
--- /dev/null
+++ b/easybuild/easyconfigs/c/ccache/ccache-3.3.1.eb
@@ -0,0 +1,36 @@
+##
+# 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$
+##
+easyblock = 'ConfigureMake'
+
+name = 'ccache'
+version = '3.3.1'
+
+homepage = 'http://ccache.samba.org/'
+description = """ccache-3.1.9: Cache for C/C++ compilers"""
+
+toolchain = {'name': 'dummy', 'version': ''}
+toolchainopts = {'static': True}
+
+source_urls = ['https://github.com/ccache/ccache/archive/']
+sources = ['v%(version)s.tar.gz']
+
+builddependencies = [
+    ('Autotools', '20150215'),
+    ('zlib', '1.2.8'),
+]
+
+preconfigopts = "./autogen.sh && "
+buildopts = 'LDFLAGS="-static"'
+
+sanity_check_paths = {
+    'files': ['bin/ccache'],
+    'dirs': []
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/c/cppcheck/cppcheck-1.75-intel-2015b.eb b/easybuild/easyconfigs/c/cppcheck/cppcheck-1.75-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..70ed0f8ae7e86b7b65a1d736fb61ef0905d67da0
--- /dev/null
+++ b/easybuild/easyconfigs/c/cppcheck/cppcheck-1.75-intel-2015b.eb
@@ -0,0 +1,23 @@
+name = 'cppcheck'
+version = '1.75'
+
+homepage = 'http://cppcheck.sourceforge.net/'
+description = """Cppcheck is a static analysis tool for C/C++ code"""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'pic': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['%(name)s-%(version)s.tar.bz2']
+
+dependencies = [
+    ('Qt5', '5.5.1'),
+    ('PCRE', '8.37'),
+]
+
+have_rules = True
+build_gui = True
+
+buildopts = 'CXXFLAGS="$CXXFLAGS -std=c++11"'
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/c/cutadapt/cutadapt-1.9.1-foss-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.9.1-foss-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..63398f9cb069861aa85ee45a47c1a2c570026f23
--- /dev/null
+++ b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.9.1-foss-2016b-Python-2.7.12.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 (SIB)
+# Biozentrum - University of Basel
+# Modified by: Adam Huffman
+# The Francis Crick Institute
+
+easyblock = "PythonPackage"
+
+name = 'cutadapt'
+version = '1.9.1'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://opensource.scilifelab.se/projects/cutadapt/'
+description = """ Cutadapt finds and removes adapter sequences, primers, poly-A tails and
+ other types of unwanted sequence from your high-throughput sequencing reads. """
+
+toolchain = {'name': 'foss', 'version': '2016b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.12'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/cutadapt'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/cutadapt/'],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/d/DBD-mysql/DBD-mysql-4.033-intel-2016b-Perl-5.24.0.eb b/easybuild/easyconfigs/d/DBD-mysql/DBD-mysql-4.033-intel-2016b-Perl-5.24.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0a65c07d0ff3d66afb68c94c5c8f90fe9512b0a6
--- /dev/null
+++ b/easybuild/easyconfigs/d/DBD-mysql/DBD-mysql-4.033-intel-2016b-Perl-5.24.0.eb
@@ -0,0 +1,36 @@
+easyblock = 'PerlModule'
+
+name = 'DBD-mysql'
+version = '4.033'
+versionsuffix = '-Perl-%(perlver)s'
+
+homepage = 'http://search.cpan.org/~capttofu/DBD-mysql-%(version)s/'
+description = """Perl binding for MySQL"""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['http://cpan.metacpan.org/authors/id/C/CA/CAPTTOFU/']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Perl', '5.24.0'),
+    ('MariaDB', '10.1.17'),
+    ('zlib', '1.2.8'),
+    # 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.1q'),
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
+
+# force static linking of libmysqlclient to dance around problem with unresolved symbols
+configopts = '--libs="-L$EBROOTMARIADB/lib -Wl,-Bstatic -lmysqlclient -Wl,-Bdynamic -lpthread -lz -lrt -lssl -lcrypto"'
+
+options = {'modulename': 'DBD::mysql'}
+
+sanity_check_paths = {
+    'files': ['lib/perl5/site_perl/%(perlver)s/x86_64-linux-thread-multi/DBD/mysql.pm'],
+    'dirs': ['lib/perl5/site_perl/%(perlver)s/x86_64-linux-thread-multi/DBD/mysql'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/d/DBus/DBus-1.10.12-intel-2016b.eb b/easybuild/easyconfigs/d/DBus/DBus-1.10.12-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7071afdb2c399a237e3b67f396969e2547ad2fd5
--- /dev/null
+++ b/easybuild/easyconfigs/d/DBus/DBus-1.10.12-intel-2016b.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'DBus'
+version = '1.10.12'
+
+homepage = 'http://dbus.freedesktop.org/doc/dbus-glib'
+description = """D-Bus is a message bus system, a simple way for applications to talk
+ to one another.  In addition to interprocess communication, D-Bus helps
+ coordinate process lifecycle; it makes it simple and reliable to code
+ a "single instance" application or daemon, and to launch applications
+ and daemons on demand when their services are needed."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['http://dbus.freedesktop.org/releases/dbus']
+sources = [SOURCELOWER_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ['bin/dbus-%s' % x for x in ['cleanup-sockets', 'daemon', 'launch', 'monitor', 'run-session', 'send', 'uuidgen']] +
+             ['lib/libdbus-1.%s' % x for x in ['a', SHLIB_EXT]],
+    'dirs': ['include', 'share']
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/d/DBus/DBus-1.10.8-foss-2016a.eb b/easybuild/easyconfigs/d/DBus/DBus-1.10.8-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0940c66fb5b827ec733ab871720e5d2598efe97f
--- /dev/null
+++ b/easybuild/easyconfigs/d/DBus/DBus-1.10.8-foss-2016a.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'DBus'
+version = '1.10.8'
+
+homepage = 'http://dbus.freedesktop.org/doc/dbus-glib'
+description = """D-Bus is a message bus system, a simple way for applications to talk
+ to one another.  In addition to interprocess communication, D-Bus helps
+ coordinate process lifecycle; it makes it simple and reliable to code
+ a "single instance" application or daemon, and to launch applications
+ and daemons on demand when their services are needed."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://dbus.freedesktop.org/releases/dbus']
+sources = [SOURCELOWER_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ['bin/dbus-%s' % x for x in ['cleanup-sockets', 'daemon', 'launch', 'monitor', 'run-session', 'send', 'uuidgen']] +
+             ['lib/libdbus-1.%s' % x for x in ['a', SHLIB_EXT]],
+    'dirs': ['include', 'share']
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.5-ictce-5.5.0.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.5-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e87a654b014227c0b97575144e44c4ddce8ca031
--- /dev/null
+++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.5-ictce-5.5.0.eb
@@ -0,0 +1,18 @@
+name = 'Doxygen'
+version = '1.8.5'
+
+homepage = 'http://www.doxygen.org'
+description = """Doxygen is a documentation system for C++, C, Java, Objective-C, Python, 
+IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+sources = ['%(namelower)s-%(version)s.src.tar.gz']
+source_urls = ['http://ftp.stack.nl/pub/users/dimitri/']
+
+dependencies = [
+    ('flex', '2.5.37'),
+    ('Bison', '3.0.1'),
+]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/d/dadi/dadi-1.7.0-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/d/dadi/dadi-1.7.0-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..dcb0dd7c09baad0dfb4c2c2526e45bb38d171f32
--- /dev/null
+++ b/easybuild/easyconfigs/d/dadi/dadi-1.7.0-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,26 @@
+easyblock = 'PythonPackage'
+
+name = 'dadi'
+version = '1.7.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://bitbucket.org/gutenkunstlab/dadi'
+description = """∂a∂i implements methods for demographic history and selection inference from genetic data,
+ based on diffusion approximations to the allele frequency spectrum."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['https://bitbucket.org/gutenkunstlab/dadi/get/']
+sources = ['%(version)s.tar.gz']
+
+dependencies = [
+    ('Python', '2.7.12'),
+    ('matplotlib', '1.5.1', versionsuffix),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/d/dask/dask-0.11.0-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/d/dask/dask-0.11.0-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..27c5d182f4f47dfdbaa071604984566eac6cd2f0
--- /dev/null
+++ b/easybuild/easyconfigs/d/dask/dask-0.11.0-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,23 @@
+easyblock = 'PythonPackage'
+
+name = 'dask'
+version = '0.11.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://github.com/dask/dask/'
+description = """Dask provides multi-core execution on larger-than-memory datasets using blocked algorithms
+ and task scheduling."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('Python', '2.7.12')]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/d/dask/dask-0.11.0-intel-2016b-Python-3.5.2.eb b/easybuild/easyconfigs/d/dask/dask-0.11.0-intel-2016b-Python-3.5.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1b19e5cf3849107a2281b3cd74fda9d0a9658a61
--- /dev/null
+++ b/easybuild/easyconfigs/d/dask/dask-0.11.0-intel-2016b-Python-3.5.2.eb
@@ -0,0 +1,23 @@
+easyblock = 'PythonPackage'
+
+name = 'dask'
+version = '0.11.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://github.com/dask/dask/'
+description = """Dask provides multi-core execution on larger-than-memory datasets using blocked algorithms
+ and task scheduling."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('Python', '3.5.2')]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/d/dbus-glib/dbus-glib-0.106-foss-2016a.eb b/easybuild/easyconfigs/d/dbus-glib/dbus-glib-0.106-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3d05e04fc17aa8fa19504d5b2de0b4a77d6b5ccd
--- /dev/null
+++ b/easybuild/easyconfigs/d/dbus-glib/dbus-glib-0.106-foss-2016a.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'dbus-glib'
+version = '0.106'
+
+homepage = 'http://dbus.freedesktop.org/doc/dbus-glib'
+description = """D-Bus is a message bus system, a simple way for applications to talk to one another."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://dbus.freedesktop.org/releases/dbus-glib']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('GLib', '2.48.0'),
+    ('DBus', '1.10.8'),
+    ('expat', '2.1.1'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/dbus-binding-tool', 'lib/libdbus-glib-1.%s' % SHLIB_EXT, 'lib/libdbus-glib-1.a'],
+    'dirs': ['include', 'share']
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/d/dbus-glib/dbus-glib-0.108-intel-2016b.eb b/easybuild/easyconfigs/d/dbus-glib/dbus-glib-0.108-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..318a8a890a3ed9ad552a883b787e5674c5e6e423
--- /dev/null
+++ b/easybuild/easyconfigs/d/dbus-glib/dbus-glib-0.108-intel-2016b.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'dbus-glib'
+version = '0.108'
+
+homepage = 'http://dbus.freedesktop.org/doc/dbus-glib'
+description = """D-Bus is a message bus system, a simple way for applications to talk to one another."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['http://dbus.freedesktop.org/releases/dbus-glib']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('GLib', '2.49.5'),
+    ('DBus', '1.10.12'),
+    ('expat', '2.2.0'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/dbus-binding-tool', 'lib/libdbus-glib-1.%s' % SHLIB_EXT, 'lib/libdbus-glib-1.a'],
+    'dirs': ['include', 'share']
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/e/EIGENSOFT/EIGENSOFT-6.0.1-foss-2016a.eb b/easybuild/easyconfigs/e/EIGENSOFT/EIGENSOFT-6.0.1-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..653bc39a36da765a127f8b355f1ed1b137302d95
--- /dev/null
+++ b/easybuild/easyconfigs/e/EIGENSOFT/EIGENSOFT-6.0.1-foss-2016a.eb
@@ -0,0 +1,46 @@
+# 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 
+
+# Provided binaries required OpenBLAS and GSL libraries
+
+easyblock = 'MakeCp'
+
+name = 'EIGENSOFT'
+version = '6.0.1'
+
+homepage = 'http://www.hsph.harvard.edu/alkes-price/software/'
+description = """The EIGENSOFT package combines functionality from our population genetics methods (Patterson et al. 
+2006)  and our EIGENSTRAT stratification correction method (Price et al. 2006). The EIGENSTRAT method uses principal 
+components  analysis to explicitly model ancestry differences between cases and controls along continuous axes of 
+variation;  the resulting correction is specific to a candidate marker’s variation in frequency across ancestral 
+populations,  minimizing spurious associations while maximizing power to detect true associations. The EIGENSOFT 
+package has a built-in plotting script and supports multiple file formats and quantitative phenotypes."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [
+    'https://data.broadinstitute.org/alkesgroup/EIGENSOFT/',
+    'https://data.broadinstitute.org/alkesgroup/EIGENSOFT/OLD/'
+]
+sources = ['EIG%(version)s.tar.gz']
+
+dependencies = [
+	('GSL', '2.1'),
+]
+
+# -lm and -pthread are missing in the Makefile
+# also run "make install" after make to copy all binaries to the bin dir
+buildopts = 'LDLIBS="-lgsl $LIBBLAS -lrt -lm" LDFLAGS="$LDFLAGS -pthread" && make install'
+
+start_dir = 'src'
+
+files_to_copy = ['bin', 'CONVERTF', 'EIGENSTRAT', 'POPGEN', 'README']
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in ["baseprog", "convertf", "eigenstrat", "eigenstratQTL"]],
+    'dirs': []
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/e/EIGENSOFT/EIGENSOFT-6.1.1-foss-2016a.eb b/easybuild/easyconfigs/e/EIGENSOFT/EIGENSOFT-6.1.1-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..90343733e32df8004690e03412fe9e120e5b5702
--- /dev/null
+++ b/easybuild/easyconfigs/e/EIGENSOFT/EIGENSOFT-6.1.1-foss-2016a.eb
@@ -0,0 +1,46 @@
+# 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 
+
+# Provided binaries required OpenBLAS and GSL libraries
+
+easyblock = 'MakeCp'
+
+name = 'EIGENSOFT'
+version = '6.1.1'
+
+homepage = 'http://www.hsph.harvard.edu/alkes-price/software/'
+description = """The EIGENSOFT package combines functionality from our population genetics methods (Patterson et al. 
+2006)  and our EIGENSTRAT stratification correction method (Price et al. 2006). The EIGENSTRAT method uses principal 
+components  analysis to explicitly model ancestry differences between cases and controls along continuous axes of 
+variation;  the resulting correction is specific to a candidate marker’s variation in frequency across ancestral 
+populations,  minimizing spurious associations while maximizing power to detect true associations. The EIGENSOFT 
+package has a built-in plotting script and supports multiple file formats and quantitative phenotypes."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [
+    'https://data.broadinstitute.org/alkesgroup/EIGENSOFT/',
+    'https://data.broadinstitute.org/alkesgroup/EIGENSOFT/OLD/'
+]
+sources = ['EIG%(version)s.tar.gz']
+
+dependencies = [
+	('GSL', '2.1'),
+]
+
+# -lm and -pthread are missing in the Makefile
+# also run "make install" after make to copy all binaries to the bin dir
+buildopts = 'LDLIBS="-lgsl $LIBBLAS -lrt -lm" LDFLAGS="$LDFLAGS -pthread" && make install'
+
+start_dir = 'src'
+
+files_to_copy = ['bin', 'CONVERTF', 'EIGENSTRAT', 'POPGEN', 'README']
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in ["baseprog", "convertf", "eigenstrat", "eigenstratQTL"]],
+    'dirs': []
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-2.9.0.eb b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-2.9.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..09a04b73a8f427188cb2bc3f7e346eeb00d98ebf
--- /dev/null
+++ b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-2.9.0.eb
@@ -0,0 +1,38 @@
+easyblock = 'EB_EasyBuildMeta'
+
+name = 'EasyBuild'
+version = '2.9.0'
+
+homepage = 'http://hpcugent.github.com/easybuild/'
+description = """EasyBuild is a software build and installation framework
+ written in Python that allows you to install software in a structured,
+ repeatable and robust way."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+source_urls = [
+    # vsc-install
+    'https://pypi.python.org/packages/0e/83/4ed8215c5b27ba4ee4a6da3d43ce9579b67c5fe7a91f33f48991f878db13/',
+    # vsc-base
+    'https://pypi.python.org/packages/2b/fd/e16d723389f692b107b5e4e6243379d2b056e79a7ea3b5e4fdc2753d9541/',
+    # easybuild-framework
+    'https://pypi.python.org/packages/e9/c7/da05d522cfc8b932956e77bdbf5270a91443df1f91bc2004a08776bd55da/',
+    # easybuild-easyblocks
+    'https://pypi.python.org/packages/0f/c4/65f98c2dc041e8201a51d2be61ec407e421f02e4f43775c7cb85ed4b8bcd/',
+    # easybuild-easyconfigs
+    'https://pypi.python.org/packages/0a/5e/a0faffd999833c9f745b0f5592a8bce51556a4604d90daeda024244fa6fe/',
+]
+# order matters a lot, to avoid having dependencies auto-resolved (--no-deps easy_install option doesn't work?)
+sources = [
+    'vsc-install-0.10.15.tar.gz',
+    'vsc-base-2.5.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/Eigen/Eigen-3.2.9-intel-2016b.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.2.9-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..887c3a69f79050c4ff4df69f52c384ef5573d3f1
--- /dev/null
+++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.2.9-intel-2016b.eb
@@ -0,0 +1,13 @@
+name = 'Eigen'
+version = '3.2.9'
+
+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': 'intel', 'version': '2016b'}
+
+source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get']
+sources = ['%(version)s.tar.bz2']
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/e/Elk/Elk-4.0.15-intel-2016b.eb b/easybuild/easyconfigs/e/Elk/Elk-4.0.15-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e2db42a61e2e8902037c093c754679a3901bfb11
--- /dev/null
+++ b/easybuild/easyconfigs/e/Elk/Elk-4.0.15-intel-2016b.eb
@@ -0,0 +1,47 @@
+easyblock = 'MakeCp'
+
+name = 'Elk'
+version = '4.0.15'
+
+homepage = 'http://elk.sourceforge.net/'
+description = """An all-electron full-potential linearised augmented-plane wave (FP-LAPW) code with
+many advanced features. Written originally at Karl-Franzens-Universität Graz as a milestone of the
+EXCITING EU Research and Training Network, the code is designed to be as simple as possible so that
+new developments in the field of density functional theory (DFT) can be added quickly and reliably.
+"""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+toolchainopts = {'usempi': True}
+
+sources = [SOURCELOWER_TGZ]
+source_urls = [SOURCEFORGE_SOURCE]
+
+checksums = [
+    '760623faf5aab9b1f49488edbaae65fb',  # elk-4.0.15.tgz
+]
+
+dependencies = [
+    ('libxc', '2.2.3'),
+]
+
+
+# make.inc file is generated interactively by "setup" command, creating it here
+prebuildopts = 'echo "F90_OPTS = $FFLAGS" > make.inc && '
+prebuildopts += 'echo "F77_OPTS = $FFLAGS" >> make.inc && '
+prebuildopts += 'echo "LIB_LPK = $LIBLAPACK" >> make.inc && '
+prebuildopts += 'echo "LIB_libxc = $EBROOTLIBXC/lib/libxcf90.a $EBROOTLIBXC/lib/libxc.a" >> make.inc && '
+prebuildopts += 'echo "SRC_libxc = libxc_funcs.f90 libxc.f90 libxcifc.f90" >> make.inc && '
+prebuildopts += 'echo "SRC_FFT = zfftifc_fftw.f90" >> make.inc && '
+
+buildopts = 'all'
+
+parallel = 1
+
+files_to_copy = [(['src/elk', 'src/spacegroup/spacegroup', 'src/eos/eos'], 'bin')]
+
+sanity_check_paths = {
+    'files': ['bin/elk', 'bin/spacegroup', 'bin/eos'],
+    'dirs': []
+}
+
+moduleclass = 'phys'
diff --git a/easybuild/easyconfigs/e/ea-utils/ea-utils-27a4809-foss-2016a.eb b/easybuild/easyconfigs/e/ea-utils/ea-utils-27a4809-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7cf3821ef383af5885f474a2889e58a3b9f0cdbe
--- /dev/null
+++ b/easybuild/easyconfigs/e/ea-utils/ea-utils-27a4809-foss-2016a.eb
@@ -0,0 +1,48 @@
+easyblock = 'MakeCp'
+
+name = 'ea-utils'
+version = '27a4809'
+
+homepage = 'https://code.google.com/p/ea-utils/'
+description = """Command-line tools for processing biological sequencing data.
+Barcode demultiplexing, adapter trimming, etc.
+
+Primarily written to support an Illumina based pipeline - 
+but should work with any FASTQs."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['https://github.com/ExpressionAnalysis/%(name)s/tarball/master']
+sources = [SOURCE_TGZ]
+
+checksums = ['45eef4b040f83abe2c9f51d4a7d18271']
+
+start_dir = 'clipper'
+
+prebuildopts = "sed -i 's/$(CFLAGS)/$(CFLAGS) $(LDFLAGS) -I./' Makefile && PREFIX=%(installdir)s "
+buildopts = 'fastq-mcf fastq-multx fastq-join fastq-stats fastq-clipper sam-stats varcall'
+
+builddependencies = [
+    ('Perl', '5.22.1'),
+]
+
+dependencies = [
+    ('GSL', '2.1'),
+]
+
+files_to_copy = [([
+    'fastq-mcf', 'fastq-multx', 'fastq-join', 'fastq-stats', 'fastq-clipper', 
+    'sam-stats', 'varcall', 'randomFQ', 'alc', 'determine-phred'], 'bin'
+)]
+
+
+sanity_check_paths = {
+    'files': [
+        'bin/fastq-mcf', 'bin/fastq-multx', 'bin/fastq-join', 'bin/fastq-stats', 
+        'bin/fastq-clipper', 'bin/sam-stats', 'bin/varcall'
+    ],
+    'dirs': []
+}
+
+moduleclass = 'bio'
\ No newline at end of file
diff --git a/easybuild/easyconfigs/e/eudev/eudev-3.2-GCCcore-4.9.3.eb b/easybuild/easyconfigs/e/eudev/eudev-3.2-GCCcore-4.9.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..82f14302a61c9030cf283d617fc6246fa8a8c791
--- /dev/null
+++ b/easybuild/easyconfigs/e/eudev/eudev-3.2-GCCcore-4.9.3.eb
@@ -0,0 +1,33 @@
+easyblock = 'ConfigureMake'
+
+name = 'eudev'
+version = '3.2'
+
+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': 'GCCcore', 'version': '4.9.3'}
+
+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 = [
+    ('binutils', '2.25'),
+    ('gperf', '3.0.4'),
+]
+
+osdependencies = [('kernel-headers', 'linux-libc-dev')]
+
+configopts = '--disable-blkid --disable-selinux --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/e/expat/expat-2.2.0-GCCcore-4.9.3.eb b/easybuild/easyconfigs/e/expat/expat-2.2.0-GCCcore-4.9.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..cb60566c9f6779cc9823d6ce91ddaeb2e8af7b18
--- /dev/null
+++ b/easybuild/easyconfigs/e/expat/expat-2.2.0-GCCcore-4.9.3.eb
@@ -0,0 +1,20 @@
+easyblock = 'ConfigureMake'
+
+name = 'expat'
+version = '2.2.0'
+
+homepage = 'http://expat.sourceforge.net/'
+description = """Expat is an XML parser library written in C. It is a stream-oriented parser in which an application
+ registers handlers for things the parser might find in the XML document (like start tags)"""
+
+toolchain = {'name': 'GCCcore', 'version': '4.9.3'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = [SOURCEFORGE_SOURCE]
+
+builddependencies = [
+    ('binutils', '2.25'),
+]
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/f/FDS/FDS-6.3.0-intel-2015b.eb b/easybuild/easyconfigs/f/FDS/FDS-6.3.0-intel-2015b.eb
index 7278d23d80b703dd82a2dec30188728b4ed9bf53..f3aacd25ad010c1b3a1553d376a3fb8e02c09953 100644
--- a/easybuild/easyconfigs/f/FDS/FDS-6.3.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/f/FDS/FDS-6.3.0-intel-2015b.eb
@@ -23,7 +23,10 @@ start_dir = 'FDS_Compilation'
 skipsteps = ['configure', 'install']
 buildininstalldir = True
 
-prebuildopts = 'env FFLAGS="$FFLAGS -fpp"'
+target = 'mpi_intel_linux_64'
+buildopts = '%s FFLAGS="$FFLAGS -fpp" FCOMPL="$FC"' % target
+
+postinstallcmds = ["ln -s %%(installdir)s/FDS_Compilation/fds_%s %%(installdir)s/FDS_Compilation/fds" % target]
 
 modextrapaths = {'PATH': 'FDS_Compilation'}
 
@@ -31,4 +34,7 @@ sanity_check_paths = {
     'files': ['FDS_Compilation/fds'],
     'dirs': [],
 }
+
+sanity_check_commands = [("fds 2>&1 | grep 'MPI Enabled;'", '')]
+
 moduleclass = 'phys'
diff --git a/easybuild/easyconfigs/f/FDS/FDS-6.5.2-intel-2016b.eb b/easybuild/easyconfigs/f/FDS/FDS-6.5.2-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..477d5d84f28f6a947e5624d2aa89e75426214146
--- /dev/null
+++ b/easybuild/easyconfigs/f/FDS/FDS-6.5.2-intel-2016b.eb
@@ -0,0 +1,40 @@
+easyblock = 'ConfigureMake'
+
+name = 'FDS'
+version = '6.5.2'
+
+homepage = 'https://pages.nist.gov/fds-smv/'
+description = """Fire Dynamics Simulator (FDS) is a large-eddy simulation (LES) code for low-speed flows,
+ with an emphasis on smoke and heat transport from fires."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+toolchainopts = {'pic': True, 'usempi': True}
+
+source_urls = ['https://github.com/firemodels/fds/archive/']
+sources = ['Git-r21.tar.gz']
+
+patches = ['FDS-r18915_makefile.patch']
+
+unpack_options = '--strip-components=1'
+
+start_dir = 'FDS_Compilation'
+
+# just run make in the install dir
+skipsteps = ['configure', 'install']
+buildininstalldir = True
+
+target = 'mpi_intel_linux_64'
+buildopts = '%s FFLAGS="$FFLAGS -fpp" FCOMPL="$FC"' % target
+
+postinstallcmds = ["ln -s %%(installdir)s/FDS_Compilation/fds_%s %%(installdir)s/FDS_Compilation/fds" % target]
+
+modextrapaths = {'PATH': 'FDS_Compilation'}
+
+sanity_check_paths = {
+    'files': ['FDS_Compilation/fds'],
+    'dirs': [],
+}
+
+sanity_check_commands = [("fds 2>&1 | grep 'MPI Enabled;'", '')]
+
+moduleclass = 'phys'
diff --git a/easybuild/easyconfigs/f/FDS/FDS-r17534-intel-2015a.eb b/easybuild/easyconfigs/f/FDS/FDS-r17534-intel-2015a.eb
index 2779e0ddd8dcfc2b1f6f16dba1b0d6f8d6d306ca..6addd713dcaa31ff90454b8f7011c8fba23ef05a 100644
--- a/easybuild/easyconfigs/f/FDS/FDS-r17534-intel-2015a.eb
+++ b/easybuild/easyconfigs/f/FDS/FDS-r17534-intel-2015a.eb
@@ -23,6 +23,11 @@ parallel = 1
 skipsteps = ['configure', 'install']
 buildininstalldir = True
 
+target = 'mpi_intel_linux_64'
+buildopts = '%s FFLAGS="$FFLAGS -fpp" FCOMPL="$FC"' % target
+
+postinstallcmds = ["ln -s %%(installdir)s/FDS_Compilation/fds_%s %%(installdir)s/FDS_Compilation/fds" % target]
+
 modextrapaths = {'PATH': 'FDS_Compilation'}
 
 sanity_check_paths = {
@@ -30,4 +35,6 @@ sanity_check_paths = {
     'dirs': [],
 }
 
+sanity_check_commands = [("fds 2>&1 | grep 'MPI Enabled;'", '')]
+
 moduleclass = 'phys'
diff --git a/easybuild/easyconfigs/f/FDS/FDS-r18915-goolf-1.4.10.eb b/easybuild/easyconfigs/f/FDS/FDS-r18915-goolf-1.4.10.eb
index cefbd7a7f6cef12102aae7c3d5e263372764febc..aa1cadabd32a28a11fb238193cb7fd0aa6925460 100644
--- a/easybuild/easyconfigs/f/FDS/FDS-r18915-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/f/FDS/FDS-r18915-goolf-1.4.10.eb
@@ -17,6 +17,11 @@ patches = ['FDS-%(version)s_makefile.patch']
 skipsteps = ['configure', 'install']
 buildininstalldir = True
 
+target = 'mpi_gnu_linux'
+buildopts = '%s FFLAGS="$FFLAGS" FCOMPL="$FC"' % target
+
+postinstallcmds = ["ln -s %%(installdir)s/FDS_Source/fds_%s %%(installdir)s/FDS_Source/fds" % target]
+
 modextrapaths = {'PATH': 'FDS_Source'}
 
 sanity_check_paths = {
@@ -24,4 +29,6 @@ sanity_check_paths = {
     'dirs': [],
 }
 
+sanity_check_commands = [("fds 2>&1 | grep 'MPI Enabled;'", '')]
+
 moduleclass = 'phys'
diff --git a/easybuild/easyconfigs/f/FDS/FDS-r18915-ictce-5.5.0.eb b/easybuild/easyconfigs/f/FDS/FDS-r18915-ictce-5.5.0.eb
index bbf4065638c714cf5260fbb8ac836ed68ce1adde..25ed6f846acce8689155ab39aa326a2da1cc8eda 100644
--- a/easybuild/easyconfigs/f/FDS/FDS-r18915-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/f/FDS/FDS-r18915-ictce-5.5.0.eb
@@ -17,6 +17,11 @@ patches = ['FDS-%(version)s_makefile.patch']
 skipsteps = ['configure', 'install']
 buildininstalldir = True
 
+target = 'mpi_intel_linux_64'
+buildopts = '%s FFLAGS="$FFLAGS" FCOMPL="$FC"' % target
+
+postinstallcmds = ["ln -s %%(installdir)s/FDS_Source/fds_%s %%(installdir)s/FDS_Source/fds" % target]
+
 modextrapaths = {'PATH': 'FDS_Source'}
 
 sanity_check_paths = {
@@ -24,4 +29,6 @@ sanity_check_paths = {
     'dirs': [],
 }
 
+sanity_check_commands = [("fds 2>&1 | grep 'MPI Enabled;'", '')]
+
 moduleclass = 'phys'
diff --git a/easybuild/easyconfigs/f/FDS/FDS-r18915-intel-2015a.eb b/easybuild/easyconfigs/f/FDS/FDS-r18915-intel-2015a.eb
index e4ac832f81e11d32813be60afdf010fc329b8138..001132efa24d71094a0610ba012fade9ad16f0fc 100644
--- a/easybuild/easyconfigs/f/FDS/FDS-r18915-intel-2015a.eb
+++ b/easybuild/easyconfigs/f/FDS/FDS-r18915-intel-2015a.eb
@@ -17,6 +17,11 @@ patches = ['FDS-%(version)s_makefile.patch']
 skipsteps = ['configure', 'install']
 buildininstalldir = True
 
+target = 'mpi_intel_linux_64'
+buildopts = '%s FFLAGS="$FFLAGS" FCOMPL="$FC"' % target
+
+postinstallcmds = ["ln -s %%(installdir)s/FDS_Source/fds_%s %%(installdir)s/FDS_Source/fds" % target]
+
 modextrapaths = {'PATH': 'FDS_Source'}
 
 sanity_check_paths = {
@@ -24,4 +29,6 @@ sanity_check_paths = {
     'dirs': [],
 }
 
+sanity_check_commands = [("fds 2>&1 | grep 'MPI Enabled;'", '')]
+
 moduleclass = 'phys'
diff --git a/easybuild/easyconfigs/f/FDS/FDS-r22681-intel-2015a.eb b/easybuild/easyconfigs/f/FDS/FDS-r22681-intel-2015a.eb
index 75d4dcf42fd11d409e6ec785c94713ab826783e4..6f8589d3e9253ca75be573e9ae5e35feb47482d0 100644
--- a/easybuild/easyconfigs/f/FDS/FDS-r22681-intel-2015a.eb
+++ b/easybuild/easyconfigs/f/FDS/FDS-r22681-intel-2015a.eb
@@ -21,6 +21,11 @@ start_dir = 'FDS_Compilation'
 skipsteps = ['configure', 'install']
 buildininstalldir = True
 
+target = 'mpi_intel_linux_64'
+buildopts = '%s FFLAGS="$FFLAGS -fpp" FCOMPL="$FC"' % target
+
+postinstallcmds = ["ln -s %%(installdir)s/FDS_Compilation/fds_%s %%(installdir)s/FDS_Compilation/fds" % target]
+
 modextrapaths = {'PATH': 'FDS_Compilation'}
 
 sanity_check_paths = {
@@ -28,4 +33,6 @@ sanity_check_paths = {
     'dirs': [],
 }
 
+sanity_check_commands = [("fds 2>&1 | grep 'MPI Enabled;'", '')]
+
 moduleclass = 'phys'
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-2016.07.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-2016.07.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3fd16df92fc0b3f4729925930cd12755429582ad
--- /dev/null
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-2016.07.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': '2016.07'}
+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/FFTW/FFTW-3.3.5-gompi-2016.07.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.5-gompi-2016.07.eb
new file mode 100644
index 0000000000000000000000000000000000000000..854d665922a217eadea7bf2db6689ea8ea79cf8c
--- /dev/null
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.5-gompi-2016.07.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMake'
+
+name = 'FFTW'
+version = '3.3.5'
+
+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': '2016.07'}
+toolchainopts = {'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/FFTW/FFTW-3.3.5-gompi-2016.09.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.5-gompi-2016.09.eb
new file mode 100644
index 0000000000000000000000000000000000000000..95601b61f5bfb09763f66d769050eb2341f2fbcd
--- /dev/null
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.5-gompi-2016.09.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMake'
+
+name = 'FFTW'
+version = '3.3.5'
+
+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': '2016.09'}
+toolchainopts = {'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/FFTW/FFTW-3.3.5-gompi-2016b.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.5-gompi-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e222c97b5d0038b3fc69a5a4e0b300763864bb05
--- /dev/null
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.5-gompi-2016b.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMake'
+
+name = 'FFTW'
+version = '3.3.5'
+
+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': '2016b'}
+toolchainopts = {'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/FFTW/FFTW-3.3.5-gompic-2016.10.0.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.5-gompic-2016.10.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6df05f5634e3aebde042f8cab4d3625d106df872
--- /dev/null
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.5-gompic-2016.10.0.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMake'
+
+name = 'FFTW'
+version = '3.3.5'
+
+homepage = 'http://www.fftw.org'
+description = """FFTW is a C subroutine library for computing the discrete Fourier transform (DFT)
+ in one or more dimensions, of arbitrary input size, and of both real and complex data."""
+
+toolchain = {'name': 'gompic', 'version': '2016.10.0'}
+toolchainopts = {'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-avx --enable-mpi",
+    common_configopts + " --enable-long-double --enable-mpi",
+    common_configopts + " --enable-quad-precision",
+    common_configopts + " --enable-sse2 --enable-avx --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/FFTW/FFTW-3.3.5-intel-2016b.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.5-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6fcdd25eb53518ea226ff2cd9566a603bcb73901
--- /dev/null
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.5-intel-2016b.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMake'
+
+name = 'FFTW'
+version = '3.3.5'
+
+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': 'intel', 'version': '2016b'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [homepage]
+
+common_configopts = "--enable-threads --enable-openmp --with-pic"
+
+# no quad precision, requires GCC v4.6 or higher
+# see also http://www.fftw.org/doc/Extended-and-quadruple-precision-in-Fortran.html
+configopts = [
+    common_configopts + " --enable-single --enable-sse2 --enable-mpi",
+    common_configopts + " --enable-long-double --enable-mpi",
+    common_configopts + " --enable-sse2 --enable-mpi",  # default as last
+]
+
+sanity_check_paths = {
+    'files': ['bin/fftw%s' % x for x in ['-wisdom', '-wisdom-to-conf', 'f-wisdom', 'l-wisdom']] +
+             ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03',
+                                              '.h', 'l-mpi.f03', 'l.f03', 'q.f03']] +
+             ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']],
+    'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/f/FFindex/FFindex-0.9.9-goolf-1.4.10.eb b/easybuild/easyconfigs/f/FFindex/FFindex-0.9.9-goolf-1.4.10.eb
new file mode 100755
index 0000000000000000000000000000000000000000..e96e5e3b33d5f69270562508cd3145ce369d604a
--- /dev/null
+++ b/easybuild/easyconfigs/f/FFindex/FFindex-0.9.9-goolf-1.4.10.eb
@@ -0,0 +1,32 @@
+easyblock = 'ConfigureMake'
+
+name = 'FFindex'
+version = '0.9.9'
+
+homepage = 'http://www.splashground.de/~andy/programs/FFindex/'
+description = """simple index/database for huge amounts of small files"""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+toolchainopts = {'usempi': True}
+
+source_urls = ['http://www.splashground.de/~andy/programs/FFindex/']
+sources = [SOURCELOWER_TAR_GZ]
+
+skipsteps = ['configure']
+
+start_dir = 'src'
+
+buildopts = 'USEMPI=1'
+installopts = "USEMPI=1 INSTALL_DIR=%(installdir)s"
+
+runtest = 'test'
+
+parallel = 1
+
+sanity_check_paths = {
+    'files': ['bin/ffindex_%s' % x for x in ['apply', 'build', 'from_fasta', 'get', 'modify', 'unpack']] +
+             ['lib64/libffindex.a', 'lib64/libffindex.so'],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/f/FFmpeg/FFmpeg-0.10.16-intel-2016a.eb b/easybuild/easyconfigs/f/FFmpeg/FFmpeg-0.10.16-intel-2016a.eb
index 3e71d0c50e397537dd12a800a5347be195714c09..36e057b4695d683b66d84f4abfc779743ae6692a 100644
--- a/easybuild/easyconfigs/f/FFmpeg/FFmpeg-0.10.16-intel-2016a.eb
+++ b/easybuild/easyconfigs/f/FFmpeg/FFmpeg-0.10.16-intel-2016a.eb
@@ -16,7 +16,9 @@ source_urls = ['http://ffmpeg.org/releases/']
 dependencies = [
     ('NASM', '2.11.08'),
     ('zlib', '1.2.8'),
+    ('bzip2', '1.0.6'),
     ('x264', '20160114'),
+    ('libxcb', '1.11.1'),
 ]
 
 configopts = '--enable-pic --enable-shared --enable-gpl --enable-version3 --enable-nonfree --cc="$CC" --cxx="$CXX" '
@@ -25,7 +27,7 @@ configopts += '--enable-libx264'
 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',
-                                                'swresample', 'swscale', 'avutil'] for y in ['so', 'a']],
+                                                'swresample', 'swscale', 'avutil'] for y in [SHLIB_EXT, 'a']],
     'dirs': ['include']
 }
 
diff --git a/easybuild/easyconfigs/f/FFmpeg/FFmpeg-2.8.6-intel-2016a.eb b/easybuild/easyconfigs/f/FFmpeg/FFmpeg-2.8.6-intel-2016a.eb
index 40be8fe314c14e52eef4182c3fc91ac890a1a076..3349ed39612bc967a897291626338d0eb9469ced 100644
--- a/easybuild/easyconfigs/f/FFmpeg/FFmpeg-2.8.6-intel-2016a.eb
+++ b/easybuild/easyconfigs/f/FFmpeg/FFmpeg-2.8.6-intel-2016a.eb
@@ -14,7 +14,9 @@ source_urls = ['http://ffmpeg.org/releases/']
 dependencies = [
     ('NASM', '2.11.08'),
     ('zlib', '1.2.8'),
+    ('bzip2', '1.0.6'),
     ('x264', '20160114'),
+    ('libxcb', '1.11.1'),
 ]
 
 configopts = '--enable-pic --enable-shared --enable-gpl --enable-version3 --enable-nonfree --cc="$CC" --cxx="$CXX" '
@@ -23,7 +25,7 @@ configopts += '--enable-libx264'
 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',
-                                                'swresample', 'swscale', 'avutil'] for y in ['so', 'a']],
+                                                'swresample', 'swscale', 'avutil'] for y in [SHLIB_EXT, 'a']],
     'dirs': ['include']
 }
 
diff --git a/easybuild/easyconfigs/f/FFmpeg/FFmpeg-2.8.7-foss-2016a.eb b/easybuild/easyconfigs/f/FFmpeg/FFmpeg-2.8.7-foss-2016a.eb
index 0badebf4eb9eac06b609ce7704baaf1e3293e081..866438750623e5ac55bbc2b0555fb73a5af9db71 100644
--- a/easybuild/easyconfigs/f/FFmpeg/FFmpeg-2.8.7-foss-2016a.eb
+++ b/easybuild/easyconfigs/f/FFmpeg/FFmpeg-2.8.7-foss-2016a.eb
@@ -14,7 +14,9 @@ source_urls = ['http://ffmpeg.org/releases/']
 dependencies = [
     ('NASM', '2.12.01'),
     ('zlib', '1.2.8'),
+    ('bzip2', '1.0.6'),
     ('x264', '20160430'),
+    ('libxcb', '1.11.1'),
 ]
 
 configopts = '--enable-pic --enable-shared --enable-gpl --enable-version3 --enable-nonfree --cc="$CC" --cxx="$CXX" '
diff --git a/easybuild/easyconfigs/f/FFmpeg/FFmpeg-2.8.7-intel-2016a.eb b/easybuild/easyconfigs/f/FFmpeg/FFmpeg-2.8.7-intel-2016a.eb
index 05478ccadaa7fcaad792c1fee2c2dd065061c646..c6c61c7b359b42e2e9e89e06dab4f8d2a526af68 100644
--- a/easybuild/easyconfigs/f/FFmpeg/FFmpeg-2.8.7-intel-2016a.eb
+++ b/easybuild/easyconfigs/f/FFmpeg/FFmpeg-2.8.7-intel-2016a.eb
@@ -14,7 +14,9 @@ source_urls = ['http://ffmpeg.org/releases/']
 dependencies = [
     ('NASM', '2.12.01'),
     ('zlib', '1.2.8'),
+    ('bzip2', '1.0.6'),
     ('x264', '20160430'),
+    ('libxcb', '1.11.1'),
 ]
 
 configopts = '--enable-pic --enable-shared --enable-gpl --enable-version3 --enable-nonfree --cc="$CC" --cxx="$CXX" '
@@ -23,7 +25,7 @@ configopts += '--enable-libx264'
 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',
-                                                'swresample', 'swscale', 'avutil'] for y in ['so', 'a']],
+                                                'swresample', 'swscale', 'avutil'] for y in [SHLIB_EXT, 'a']],
     'dirs': ['include']
 }
 
diff --git a/easybuild/easyconfigs/f/FFmpeg/FFmpeg-3.0.2-foss-2016a.eb b/easybuild/easyconfigs/f/FFmpeg/FFmpeg-3.0.2-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4eee74c06297b3adca9dd787f0ce487d2d7a96b0
--- /dev/null
+++ b/easybuild/easyconfigs/f/FFmpeg/FFmpeg-3.0.2-foss-2016a.eb
@@ -0,0 +1,32 @@
+easyblock = 'ConfigureMake'
+
+name = 'FFmpeg'
+version = '3.0.2'
+
+homepage = 'https://www.ffmpeg.org/'
+description = """A complete, cross-platform solution to record, convert and stream audio and video."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['http://ffmpeg.org/releases/']
+
+dependencies = [
+    ('NASM', '2.12.01'),
+    ('zlib', '1.2.8'),
+    ('bzip2', '1.0.6'),
+    ('x264', '20160430'),
+    ('libxcb', '1.11.1'),
+]
+
+configopts = '--enable-pic --enable-shared --enable-gpl --enable-version3 --enable-nonfree --cc="$CC" --cxx="$CXX" '
+configopts += '--enable-libx264'
+
+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',
+                                                'swresample', 'swscale', 'avutil'] for y in [SHLIB_EXT, 'a']],
+    'dirs': ['include']
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/f/FFmpeg/FFmpeg-3.0.2-intel-2016a.eb b/easybuild/easyconfigs/f/FFmpeg/FFmpeg-3.0.2-intel-2016a.eb
index fb0c75a29bf506b5f2c2f3bc0c2fa9bead429a0a..fd22efefe030d73a18745f0dad526c98ec0ae245 100644
--- a/easybuild/easyconfigs/f/FFmpeg/FFmpeg-3.0.2-intel-2016a.eb
+++ b/easybuild/easyconfigs/f/FFmpeg/FFmpeg-3.0.2-intel-2016a.eb
@@ -14,7 +14,9 @@ source_urls = ['http://ffmpeg.org/releases/']
 dependencies = [
     ('NASM', '2.12.01'),
     ('zlib', '1.2.8'),
+    ('bzip2', '1.0.6'),
     ('x264', '20160430'),
+    ('libxcb', '1.11.1'),
 ]
 
 configopts = '--enable-pic --enable-shared --enable-gpl --enable-version3 --enable-nonfree --cc="$CC" --cxx="$CXX" '
@@ -23,7 +25,7 @@ configopts += '--enable-libx264'
 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',
-                                                'swresample', 'swscale', 'avutil'] for y in ['so', 'a']],
+                                                'swresample', 'swscale', 'avutil'] for y in [SHLIB_EXT, 'a']],
     'dirs': ['include']
 }
 
diff --git a/easybuild/easyconfigs/f/FFmpeg/FFmpeg-3.1.3-intel-2016b.eb b/easybuild/easyconfigs/f/FFmpeg/FFmpeg-3.1.3-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0744eae109c4a859e10e10a188cebb3f7c912b95
--- /dev/null
+++ b/easybuild/easyconfigs/f/FFmpeg/FFmpeg-3.1.3-intel-2016b.eb
@@ -0,0 +1,32 @@
+easyblock = 'ConfigureMake'
+
+name = 'FFmpeg'
+version = '3.1.3'
+
+homepage = 'https://www.ffmpeg.org/'
+description = """A complete, cross-platform solution to record, convert and stream audio and video."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['http://ffmpeg.org/releases/']
+
+dependencies = [
+    ('NASM', '2.12.02'),
+    ('zlib', '1.2.8'),
+    ('bzip2', '1.0.6'),
+    ('x264', '20160614'),
+    ('X11', '20160819'),
+]
+
+configopts = '--enable-pic --enable-shared --enable-gpl --enable-version3 --enable-nonfree --cc="$CC" --cxx="$CXX" '
+configopts += '--enable-libx264'
+
+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',
+                                                'swresample', 'swscale', 'avutil'] for y in [SHLIB_EXT, 'a']],
+    'dirs': ['include']
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/f/FGSL/FGSL-1.1.0-intel-2016b.eb b/easybuild/easyconfigs/f/FGSL/FGSL-1.1.0-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e06458da7eb737a6d96e4f4bc6b5de7fcdfa770e
--- /dev/null
+++ b/easybuild/easyconfigs/f/FGSL/FGSL-1.1.0-intel-2016b.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'FGSL'
+version = '1.1.0'
+
+homepage = 'https://www.lrz.de/services/software/mathematik/gsl/fortran/'
+description = """FGSL: A Fortran interface to the GNU Scientific Library"""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+sources = ['v%(version)s.tar.gz']
+source_urls = ['https://github.com/reinh-bader/fgsl/archive/']
+
+dependencies = [('GSL', '2.1')]
+
+builddependencies = [
+    ('Autotools', '20150215'),
+    ('pkg-config', '0.29.1'),
+]
+
+preconfigopts = 'autoreconf -fvi && '
+
+runtest = 'check'
+
+sanity_check_paths = {
+    'files': ['lib/libfgsl.%s' % SHLIB_EXT, 'lib/libfgsl.a'],
+    'dirs': ['include/fgsl', 'lib/pkgconfig']
+}
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/f/FLTK/FLTK-1.3.3-foss-2016a.eb b/easybuild/easyconfigs/f/FLTK/FLTK-1.3.3-foss-2016a.eb
index 0056b1139192bd5799d888a349a75faf2c3c2398..228b99e49ee8fd4060c9b3574122997ddbeae6c2 100644
--- a/easybuild/easyconfigs/f/FLTK/FLTK-1.3.3-foss-2016a.eb
+++ b/easybuild/easyconfigs/f/FLTK/FLTK-1.3.3-foss-2016a.eb
@@ -17,6 +17,8 @@ toolchainopts = {'optarch': True, 'pic': True}
 sources = ['%(namelower)s-%(version)s-source.tar.gz']
 source_urls = ['http://fltk.org/pub/%(namelower)s/%(version)s/']
 
+patches = ['%(name)s-%(version)s_undefined_reference.patch']
+
 configopts = '--enable-shared --enable-threads --enable-xft'
 
 dependencies = [
diff --git a/easybuild/easyconfigs/f/FLTK/FLTK-1.3.3-foss-2016b.eb b/easybuild/easyconfigs/f/FLTK/FLTK-1.3.3-foss-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4c82344219b57943b028a5c2334c4503dfe42bf9
--- /dev/null
+++ b/easybuild/easyconfigs/f/FLTK/FLTK-1.3.3-foss-2016b.eb
@@ -0,0 +1,38 @@
+#
+# author: Dina Mahmoud Ibrahim ( Cairo University )
+#
+easyblock = 'ConfigureMake'
+
+name = 'FLTK'
+version = '1.3.3'
+
+homepage = 'http://www.fltk.org'
+description = """FLTK is a cross-platform C++ GUI toolkit for UNIX/Linux (X11), Microsoft Windows,
+ and MacOS X. FLTK provides modern GUI functionality without the bloat and supports 3D graphics via OpenGL
+ and its built-in GLUT emulation."""
+
+toolchain = {'name': 'foss', 'version': '2016b'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+sources = ['%(namelower)s-%(version)s-source.tar.gz']
+source_urls = ['http://fltk.org/pub/%(namelower)s/%(version)s/']
+
+patches = ['%(name)s-%(version)s_undefined_reference.patch']
+
+configopts = '--enable-shared --enable-threads --enable-xft'
+
+dependencies = [
+    ('Mesa', '12.0.2'),
+    ('libGLU', '9.0.0'),
+    ('libpng', '1.6.24'),
+    ('libjpeg-turbo', '1.5.0'),
+    ('xprop', '1.2.2'),
+    ('zlib', '1.2.8'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/fltk-config', 'bin/fluid', 'lib/libfltk.a', 'lib/libfltk.%s' % SHLIB_EXT],
+    'dirs': ['lib'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/f/FLTK/FLTK-1.3.3-intel-2016a.eb b/easybuild/easyconfigs/f/FLTK/FLTK-1.3.3-intel-2016a.eb
index d88b64d96a2da3e6b80862b404dd8d9b8273843d..efbb3a22823b48408dc53f61d823ea441c66aa11 100644
--- a/easybuild/easyconfigs/f/FLTK/FLTK-1.3.3-intel-2016a.eb
+++ b/easybuild/easyconfigs/f/FLTK/FLTK-1.3.3-intel-2016a.eb
@@ -17,6 +17,8 @@ toolchainopts = {'optarch': True, 'pic': True}
 sources = ['%(namelower)s-%(version)s-source.tar.gz']
 source_urls = ['http://fltk.org/pub/%(namelower)s/%(version)s/']
 
+patches = ['%(name)s-%(version)s_undefined_reference.patch']
+
 configopts = '--enable-shared --enable-threads --enable-xft'
 
 dependencies = [
diff --git a/easybuild/easyconfigs/f/FLTK/FLTK-1.3.3-intel-2016b.eb b/easybuild/easyconfigs/f/FLTK/FLTK-1.3.3-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7a909b40155ead2bca8e804bf6fd35d269e76653
--- /dev/null
+++ b/easybuild/easyconfigs/f/FLTK/FLTK-1.3.3-intel-2016b.eb
@@ -0,0 +1,38 @@
+#
+# author: Dina Mahmoud Ibrahim ( Cairo University )
+#
+easyblock = 'ConfigureMake'
+
+name = 'FLTK'
+version = '1.3.3'
+
+homepage = 'http://www.fltk.org'
+description = """FLTK is a cross-platform C++ GUI toolkit for UNIX/Linux (X11), Microsoft Windows,
+ and MacOS X. FLTK provides modern GUI functionality without the bloat and supports 3D graphics via OpenGL
+ and its built-in GLUT emulation."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+sources = ['%(namelower)s-%(version)s-source.tar.gz']
+source_urls = ['http://fltk.org/pub/%(namelower)s/%(version)s/']
+
+patches = ['%(name)s-%(version)s_undefined_reference.patch']
+
+configopts = '--enable-shared --enable-threads --enable-xft'
+
+dependencies = [
+    ('Mesa', '12.0.2'),
+    ('libGLU', '9.0.0'),
+    ('libpng', '1.6.24'),
+    ('libjpeg-turbo', '1.5.0'),
+    ('xprop', '1.2.2'),
+    ('zlib', '1.2.8'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/fltk-config', 'bin/fluid', 'lib/libfltk.a', 'lib/libfltk.%s' % SHLIB_EXT],
+    'dirs': ['lib'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/f/FLTK/FLTK-1.3.3_undefined_reference.patch b/easybuild/easyconfigs/f/FLTK/FLTK-1.3.3_undefined_reference.patch
new file mode 100644
index 0000000000000000000000000000000000000000..5ddc1900edaf276acda446e3a5bc07e5c64a73b1
--- /dev/null
+++ b/easybuild/easyconfigs/f/FLTK/FLTK-1.3.3_undefined_reference.patch
@@ -0,0 +1,46 @@
+#see https://groups.google.com/forum/#!topic/fltkgeneral/GT6i2KGCb3A
+#and http://www.fltk.org/str.php?L3156
+# GNU Octave compains: 
+# error: octave-4.0.3/libinterp/dldfcn/PKG_ADD: octave-4.0.3/libinterp/dldfcn/__init_fltk__.oct: failed to load: FLTK/1.3.3-intel-2016b/lib/libfltk_gl.so.1.3: undefined symbol: _ZN18Fl_XFont_On_Demand5valueEv
+Index: src/fl_font.cxx
+===================================================================
+--- fltk-1.3.3/src/fl_font.cxx	(revision 10503)
++++ fltk-1.3.3/src/fl_font.cxx	(revision 10504)
+@@ -55,6 +55,12 @@
+ #  include "fl_font_x.cxx"
+ #endif // WIN32
+ 
++#if ! (defined(WIN32) || defined(__APPLE__))
++XFontStruct *fl_X_core_font()
++{
++  return fl_xfont.value();
++}
++#endif
+ 
+ double fl_width(const char* c) {
+   if (c) return fl_width(c, (int) strlen(c));
+Index: src/gl_draw.cxx
+===================================================================
+--- fltk-1.3.3/src/gl_draw.cxx	(revision 10503)
++++ fltk-1.3.3/src/gl_draw.cxx	(revision 10504)
+@@ -81,7 +81,7 @@
+  * then sorting through them at draw time (for normal X rendering) to find which one can
+  * render the current glyph... But for now, just use the first font in the list for GL...
+  */
+-    XFontStruct *font = fl_xfont;
++    XFontStruct *font = fl_X_core_font();
+     int base = font->min_char_or_byte2;
+     int count = font->max_char_or_byte2-base+1;
+     fl_fontsize->listbase = glGenLists(256);
+Index: FL/x.H
+===================================================================
+--- fltk-1.3.3/FL/x.H	(revision 10503)
++++ fltk-1.3.3/FL/x.H	(revision 10504)
+@@ -132,6 +132,7 @@
+   XFontStruct *ptr;
+ };
+ extern FL_EXPORT Fl_XFont_On_Demand fl_xfont;
++extern FL_EXPORT XFontStruct* fl_X_core_font();
+ 
+ // this object contains all X-specific stuff about a window:
+ // Warning: this object is highly subject to change!  
diff --git a/easybuild/easyconfigs/f/FLUENT/FLUENT-17.1.eb b/easybuild/easyconfigs/f/FLUENT/FLUENT-17.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c1ec088d35eb90f8cbc7d7876e93e40a1fee5970
--- /dev/null
+++ b/easybuild/easyconfigs/f/FLUENT/FLUENT-17.1.eb
@@ -0,0 +1,14 @@
+name = 'FLUENT'
+version = '17.1'
+
+homepage = 'http://www.ansys.com/Products/Simulation+Technology/Fluid+Dynamics/Fluid+Dynamics+Products/ANSYS+Fluent'
+description = """ANSYS FLUENT software contains the broad physical modeling capabilities needed
+to model flow, turbulence, heat transfer, and reactions for industrial applications ranging from
+air flow over an aircraft wing to combustion in a furnace, from bubble columns to oil platforms,
+from blood flow to semiconductor manufacturing, and from clean room design to wastewater treatment plants."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = ['FLUIDS_171_LINX64.tar']
+
+moduleclass = 'cae'
diff --git a/easybuild/easyconfigs/f/FragGeneScan/FragGeneScan-1.19-intel-2014b.eb b/easybuild/easyconfigs/f/FragGeneScan/FragGeneScan-1.19-intel-2014b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..807f2d8eb84958f3bf25c7db5240bceb5abf2855
--- /dev/null
+++ b/easybuild/easyconfigs/f/FragGeneScan/FragGeneScan-1.19-intel-2014b.eb
@@ -0,0 +1,25 @@
+easyblock = 'MakeCp'
+
+name = 'FragGeneScan'
+version = '1.19'
+
+homepage = 'http://omics.informatics.indiana.edu/FragGeneScan/'
+description = "FragGeneScan is an application for finding (fragmented) genes in short reads."
+
+toolchain = {'name': 'intel', 'version': '2014b'}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['%(name)s%(version)s.tar.gz']
+
+buildopts = 'CC="$CC" CFLAG="$CFLAGS" fgs && chmod -R go+rx *.py *.pl train example'
+
+files_to_copy = ['FragGeneScan', 'FGS_gff.py', 'post_process.pl', 'run_FragGeneScan.pl', 'example', 'train']
+
+modextrapaths = {'PATH': ['']}
+
+sanity_check_paths = {
+    'files': ['FGS_gff.py', 'FragGeneScan', 'post_process.pl', 'run_FragGeneScan.pl'],
+    'dirs': ['example', 'train'],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/f/f90cache/f90cache-0.96.eb b/easybuild/easyconfigs/f/f90cache/f90cache-0.96.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e0fc7d99c552bc3695911d0cb39fc8de764dd1b4
--- /dev/null
+++ b/easybuild/easyconfigs/f/f90cache/f90cache-0.96.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'f90cache'
+version = '0.96'
+
+homepage = 'http://people.irisa.fr/Edouard.Canot/f90cache/'
+description = """f90cache is a compiler cache. It acts as a caching pre-processor to Fortran compilers,
+ using the -E compiler switch and a hash to detect when a compilation can be satisfied from cache.
+ This often results in a great speedup in common compilations."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = ['http://people.irisa.fr/Edouard.Canot/f90cache/']
+sources = [SOURCE_TAR_BZ2]
+
+buildopts = "CFLAGS='-O2 -static'"
+
+sanity_check_paths = {
+    'files': ['bin/f90cache'],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/f/file/file-5.28-foss-2016b.eb b/easybuild/easyconfigs/f/file/file-5.28-foss-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..51d81cd7106301839a7ecc73d64716473049861c
--- /dev/null
+++ b/easybuild/easyconfigs/f/file/file-5.28-foss-2016b.eb
@@ -0,0 +1,25 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'file'
+version = '5.28'
+
+homepage = 'http://www.darwinsys.com/file/'
+description = """The file command is 'a file type guesser', that is, a command-line tool
+ that tells you in words what kind of data a file contains."""
+
+toolchain = {'name': 'foss', 'version': '2016b'}
+
+source_urls = ['ftp://ftp.astron.com/pub/file/']
+sources = [SOURCE_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ['bin/file', 'include/magic.h', 'lib/libmagic.%s' % SHLIB_EXT],
+    'dirs': ['share']
+}
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/f/flex/flex-2.6.0-GCC-4.9.2.eb b/easybuild/easyconfigs/f/flex/flex-2.6.0-GCC-4.9.2.eb
index 3626cfd2399a402a902c8c3729d6b01632c4b2e8..96c99f1d3c7e275c8ca6e3d05941f3a590aa142c 100644
--- a/easybuild/easyconfigs/f/flex/flex-2.6.0-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/f/flex/flex-2.6.0-GCC-4.9.2.eb
@@ -11,6 +11,11 @@ toolchainopts = {'pic': True}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
 
-dependencies = [('Bison', '3.0.4')]
+checksums = [
+    '5724bcffed4ebe39e9b55a9be80859ec',     # flex-2.6.0.tar.gz
+]
+
+dependencies = [('M4', '1.4.17')]
+builddependencies = [('Bison', '3.0.4')]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/f/flex/flex-2.6.0-GCCcore-4.9.3.eb b/easybuild/easyconfigs/f/flex/flex-2.6.0-GCCcore-4.9.3.eb
index 4015f4129186587d66c5fad9158d35c5a271c6c4..b7b82f91973a0c140afceec9c9952c581e024ecd 100644
--- a/easybuild/easyconfigs/f/flex/flex-2.6.0-GCCcore-4.9.3.eb
+++ b/easybuild/easyconfigs/f/flex/flex-2.6.0-GCCcore-4.9.3.eb
@@ -11,11 +11,15 @@ toolchainopts = {'pic': True}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
 
-dependencies = [('Bison', '3.0.4')]
+checksums = [
+    '5724bcffed4ebe39e9b55a9be80859ec',     # flex-2.6.0.tar.gz
+]
 
-# use same binutils version that was used when building GCC toolchain
-builddependencies = [('binutils', '2.25', '', True)]
-
-parallel = 1
+dependencies = [('M4', '1.4.17')]
+builddependencies = [
+    ('Bison', '3.0.4'),
+    # use same binutils version that was used when building GCC toolchain
+    ('binutils', '2.25', '', True),
+]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/f/flex/flex-2.6.0-GCCcore-4.9.4.eb b/easybuild/easyconfigs/f/flex/flex-2.6.0-GCCcore-4.9.4.eb
index 0b38c37169cf03232e7816dc82c569a1bb93c385..73279c6d88cda5d1c4c3718ac303fc9c8411b714 100644
--- a/easybuild/easyconfigs/f/flex/flex-2.6.0-GCCcore-4.9.4.eb
+++ b/easybuild/easyconfigs/f/flex/flex-2.6.0-GCCcore-4.9.4.eb
@@ -11,11 +11,15 @@ toolchainopts = {'pic': True}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
 
-dependencies = [('Bison', '3.0.4')]
+checksums = [
+    '5724bcffed4ebe39e9b55a9be80859ec',     # flex-2.6.0.tar.gz
+]
 
-# use same binutils version that was used when building GCC toolchain
-builddependencies = [('binutils', '2.25', '', True)]
-
-parallel = 1
+dependencies = [('M4', '1.4.17')]
+builddependencies = [
+    ('Bison', '3.0.4'),
+    # use same binutils version that was used when building GCC toolchain
+    ('binutils', '2.25', '', True),
+]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/f/flex/flex-2.6.0-GCCcore-5.3.0.eb b/easybuild/easyconfigs/f/flex/flex-2.6.0-GCCcore-5.3.0.eb
index e1a943777464a69db10ab7b224b2bd5116257f58..954dea0d03b4b48ff58a7d2669392156aef70eca 100644
--- a/easybuild/easyconfigs/f/flex/flex-2.6.0-GCCcore-5.3.0.eb
+++ b/easybuild/easyconfigs/f/flex/flex-2.6.0-GCCcore-5.3.0.eb
@@ -11,11 +11,15 @@ toolchainopts = {'pic': True}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
 
-dependencies = [('Bison', '3.0.4')]
+checksums = [
+    '5724bcffed4ebe39e9b55a9be80859ec',     # flex-2.6.0.tar.gz
+]
 
-# use same binutils version that was used when building GCC toolchain
-builddependencies = [('binutils', '2.26', '', True)]
-
-parallel = 1
+dependencies = [('M4', '1.4.17')]
+builddependencies = [
+    ('Bison', '3.0.4'),
+    # use same binutils version that was used when building GCC toolchain
+    ('binutils', '2.26', '', True),
+]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/f/flex/flex-2.6.0-GCCcore-5.4.0.eb b/easybuild/easyconfigs/f/flex/flex-2.6.0-GCCcore-5.4.0.eb
index 299747415ee51dbf81f0ed048d0d9bb390c5560f..ee9b4ed94d327a92a7790ff9c4a29749d6fd7022 100644
--- a/easybuild/easyconfigs/f/flex/flex-2.6.0-GCCcore-5.4.0.eb
+++ b/easybuild/easyconfigs/f/flex/flex-2.6.0-GCCcore-5.4.0.eb
@@ -11,11 +11,15 @@ toolchainopts = {'pic': True}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
 
-dependencies = [('Bison', '3.0.4')]
+checksums = [
+    '5724bcffed4ebe39e9b55a9be80859ec',     # flex-2.6.0.tar.gz
+]
 
-# use same binutils version that was used when building GCC toolchain
-builddependencies = [('binutils', '2.26', '', True)]
-
-parallel = 1
+dependencies = [('M4', '1.4.17')]
+builddependencies = [
+    ('Bison', '3.0.4'),
+    # use same binutils version that was used when building GCC toolchain
+    ('binutils', '2.26', '', True),
+]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/f/flex/flex-2.6.0-GCCcore-6.1.0.eb b/easybuild/easyconfigs/f/flex/flex-2.6.0-GCCcore-6.1.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..51d6c9f7b63df894c17190e0afbf070167bc9c5d
--- /dev/null
+++ b/easybuild/easyconfigs/f/flex/flex-2.6.0-GCCcore-6.1.0.eb
@@ -0,0 +1,25 @@
+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': 'GCCcore', 'version': '6.1.0'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
+
+checksums = [
+    '5724bcffed4ebe39e9b55a9be80859ec',     # flex-2.6.0.tar.gz
+]
+
+dependencies = [('M4', '1.4.17')]
+builddependencies = [
+    ('Bison', '3.0.4'),
+    # use same binutils version that was used when building GCC toolchain
+    ('binutils', '2.27', '', True),
+]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/f/flex/flex-2.6.0-GCCcore-6.2.0.eb b/easybuild/easyconfigs/f/flex/flex-2.6.0-GCCcore-6.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..43cfdfac42c2c9b7aba940b18f55419747ae4864
--- /dev/null
+++ b/easybuild/easyconfigs/f/flex/flex-2.6.0-GCCcore-6.2.0.eb
@@ -0,0 +1,25 @@
+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': 'GCCcore', 'version': '6.2.0'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
+
+checksums = [
+    '5724bcffed4ebe39e9b55a9be80859ec',     # flex-2.6.0.tar.gz
+]
+
+dependencies = [('M4', '1.4.17')]
+builddependencies = [
+    ('Bison', '3.0.4'),
+    # use same binutils version that was used when building GCC toolchain
+    ('binutils', '2.27', '', True),
+]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/f/flex/flex-2.6.0-foss-2015a.eb b/easybuild/easyconfigs/f/flex/flex-2.6.0-foss-2015a.eb
index bd783441d3334e3add6192d730197dc1c0c64441..5c0eb6b59ddcb6d4f19406d45e852777b7d32d39 100644
--- a/easybuild/easyconfigs/f/flex/flex-2.6.0-foss-2015a.eb
+++ b/easybuild/easyconfigs/f/flex/flex-2.6.0-foss-2015a.eb
@@ -11,6 +11,11 @@ toolchainopts = {'pic': True}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
 
-dependencies = [('Bison', '3.0.4')]
+checksums = [
+    '5724bcffed4ebe39e9b55a9be80859ec',     # flex-2.6.0.tar.gz
+]
+
+dependencies = [('M4', '1.4.17')]
+builddependencies = [('Bison', '3.0.4')]
 
 moduleclass = 'lang'
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
index 13ec4d5ea65f82f531926b869fa1ff7f4c8037ef..415a80ac0496acd51823bdf0de5db06fb496d6f1 100644
--- a/easybuild/easyconfigs/f/flex/flex-2.6.0-foss-2016a.eb
+++ b/easybuild/easyconfigs/f/flex/flex-2.6.0-foss-2016a.eb
@@ -11,6 +11,11 @@ toolchainopts = {'pic': True}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
 
-dependencies = [('Bison', '3.0.4')]
+checksums = [
+    '5724bcffed4ebe39e9b55a9be80859ec',     # flex-2.6.0.tar.gz
+]
+
+dependencies = [('M4', '1.4.17')]
+builddependencies = [('Bison', '3.0.4')]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/f/flex/flex-2.6.0-foss-2016b.eb b/easybuild/easyconfigs/f/flex/flex-2.6.0-foss-2016b.eb
index a59cd4005e342973711ed95e0ae00e6d478e8832..626ebe5d467e8970022cfc467f89bfb3440f634e 100644
--- a/easybuild/easyconfigs/f/flex/flex-2.6.0-foss-2016b.eb
+++ b/easybuild/easyconfigs/f/flex/flex-2.6.0-foss-2016b.eb
@@ -11,6 +11,11 @@ toolchainopts = {'pic': True}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
 
-dependencies = [('Bison', '3.0.4')]
+checksums = [
+    '5724bcffed4ebe39e9b55a9be80859ec',     # flex-2.6.0.tar.gz
+]
+
+dependencies = [('M4', '1.4.17')]
+builddependencies = [('Bison', '3.0.4')]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/f/flex/flex-2.6.0-gimkl-2.11.5.eb b/easybuild/easyconfigs/f/flex/flex-2.6.0-gimkl-2.11.5.eb
index c2677565b597dedb7ead661f16ed06c8aa7aafb0..3d60cee6749bd6adbef9a291eba0798322f86d0d 100644
--- a/easybuild/easyconfigs/f/flex/flex-2.6.0-gimkl-2.11.5.eb
+++ b/easybuild/easyconfigs/f/flex/flex-2.6.0-gimkl-2.11.5.eb
@@ -11,6 +11,11 @@ toolchainopts = {'pic': True}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
 
-dependencies = [('Bison', '3.0.4')]
+checksums = [
+    '5724bcffed4ebe39e9b55a9be80859ec',     # flex-2.6.0.tar.gz
+]
+
+dependencies = [('M4', '1.4.17')]
+builddependencies = [('Bison', '3.0.4')]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/f/flex/flex-2.6.0-intel-2015b.eb b/easybuild/easyconfigs/f/flex/flex-2.6.0-intel-2015b.eb
index c3e7a6b9650d13a062783d2844ab2e24b351b01d..098c6168e74256498c2ea16b002d3d5d6e358a71 100644
--- a/easybuild/easyconfigs/f/flex/flex-2.6.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/f/flex/flex-2.6.0-intel-2015b.eb
@@ -11,6 +11,11 @@ toolchainopts = {'pic': True}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
 
-dependencies = [('Bison', '3.0.4')]
+checksums = [
+    '5724bcffed4ebe39e9b55a9be80859ec',     # flex-2.6.0.tar.gz
+]
+
+dependencies = [('M4', '1.4.17')]
+builddependencies = [('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
index f451c3ed904166bda6cbe3f0133aa5173eae284c..da18a622381bff83d4b218c4fb1e30eb1571faa3 100644
--- a/easybuild/easyconfigs/f/flex/flex-2.6.0-intel-2016a.eb
+++ b/easybuild/easyconfigs/f/flex/flex-2.6.0-intel-2016a.eb
@@ -11,6 +11,11 @@ toolchainopts = {'pic': True}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
 
-dependencies = [('Bison', '3.0.4')]
+checksums = [
+    '5724bcffed4ebe39e9b55a9be80859ec',     # flex-2.6.0.tar.gz
+]
+
+dependencies = [('M4', '1.4.17')]
+builddependencies = [('Bison', '3.0.4')]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/f/flex/flex-2.6.0-intel-2016b.eb b/easybuild/easyconfigs/f/flex/flex-2.6.0-intel-2016b.eb
index 39937675eb0a18bba0cfed153d53591f17dd50b8..1dc06e55c18c1bac16123fb3ece39831dd5ea2c1 100644
--- a/easybuild/easyconfigs/f/flex/flex-2.6.0-intel-2016b.eb
+++ b/easybuild/easyconfigs/f/flex/flex-2.6.0-intel-2016b.eb
@@ -11,6 +11,11 @@ toolchainopts = {'pic': True}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
 
-dependencies = [('Bison', '3.0.4')]
+checksums = [
+    '5724bcffed4ebe39e9b55a9be80859ec',     # flex-2.6.0.tar.gz
+]
+
+dependencies = [('M4', '1.4.17')]
+builddependencies = [('Bison', '3.0.4')]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/f/flex/flex-2.6.0.eb b/easybuild/easyconfigs/f/flex/flex-2.6.0.eb
index e7580df4ae2d27389ac5ad52e49caf6295a1b414..853b81ad96d86c93d47dba29560b68a5731b9faa 100644
--- a/easybuild/easyconfigs/f/flex/flex-2.6.0.eb
+++ b/easybuild/easyconfigs/f/flex/flex-2.6.0.eb
@@ -11,6 +11,11 @@ toolchainopts = {'pic': True}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
 
-dependencies = [('Bison', '3.0.4')]
+checksums = [
+    '5724bcffed4ebe39e9b55a9be80859ec',     # flex-2.6.0.tar.gz
+]
+
+dependencies = [('M4', '1.4.17')]
+builddependencies = [('Bison', '3.0.4')]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/f/fontconfig/fontconfig-2.12.1-foss-2016b.eb b/easybuild/easyconfigs/f/fontconfig/fontconfig-2.12.1-foss-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..be4b4394550972b1e5cbdb9885079ffbdd68d56e
--- /dev/null
+++ b/easybuild/easyconfigs/f/fontconfig/fontconfig-2.12.1-foss-2016b.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'fontconfig'
+version = '2.12.1'
+
+homepage = 'http://www.freedesktop.org/software/fontconfig'
+description = """Fontconfig is a library designed to provide system-wide font configuration, customization and
+application access."""
+
+toolchain = {'name': 'foss', 'version': '2016b'}
+
+source_urls = ['http://www.freedesktop.org/software/fontconfig/release/']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('expat', '2.2.0'),
+    ('freetype', '2.6.5'),
+]
+
+configopts = '--disable-docs '
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/f/fontconfig/fontconfig-2.12.1-intel-2016b.eb b/easybuild/easyconfigs/f/fontconfig/fontconfig-2.12.1-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a2cd748981ec6c6592ecb8ba73536ed99301d0ac
--- /dev/null
+++ b/easybuild/easyconfigs/f/fontconfig/fontconfig-2.12.1-intel-2016b.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'fontconfig'
+version = '2.12.1'
+
+homepage = 'http://www.freedesktop.org/software/fontconfig'
+description = """Fontconfig is a library designed to provide system-wide font configuration, customization and
+application access."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['http://www.freedesktop.org/software/fontconfig/release/']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('expat', '2.2.0'),
+    ('freetype', '2.6.5'),
+]
+
+configopts = '--disable-docs '
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/f/foss/foss-2016.07.eb b/easybuild/easyconfigs/f/foss/foss-2016.07.eb
new file mode 100644
index 0000000000000000000000000000000000000000..052846a744362431d01f02132bbe39bad71b5161
--- /dev/null
+++ b/easybuild/easyconfigs/f/foss/foss-2016.07.eb
@@ -0,0 +1,37 @@
+easyblock = 'Toolchain'
+
+name = 'foss'
+version = '2016.07'
+
+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 = '6.1.0'
+binutilsver = '2.27'
+gccbinver = '%s-%s' % (gccver, binutilsver)
+
+blaslib = 'OpenBLAS'
+blasver = '0.2.18'
+blas = '%s-%s' % (blaslib, blasver)
+blassuff = '-LAPACK-3.6.1'
+
+# 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', gccbinver),
+    ('OpenMPI', '1.10.3', '', ('GCC', gccbinver)),
+    (blaslib, blasver, blassuff, comp_mpi_tc),
+    ('FFTW', '3.3.4', '', comp_mpi_tc),
+    ('ScaLAPACK', '2.0.2', '-%s%s' % (blas, blassuff), comp_mpi_tc)
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/f/foss/foss-2016.09.eb b/easybuild/easyconfigs/f/foss/foss-2016.09.eb
new file mode 100644
index 0000000000000000000000000000000000000000..89b1d4573215ac72719e86267198edf8f91170fb
--- /dev/null
+++ b/easybuild/easyconfigs/f/foss/foss-2016.09.eb
@@ -0,0 +1,35 @@
+easyblock = 'Toolchain'
+
+name = 'foss'
+version = '2016.09'
+
+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 = '6.2.0-2.27'
+
+blaslib = 'OpenBLAS'
+blasver = '0.2.19'
+blas = '%s-%s' % (blaslib, blasver)
+blassuff = '-LAPACK-3.6.1'
+
+# 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', '2.0.1', '', ('GCC', gccver)),
+    (blaslib, blasver, blassuff, comp_mpi_tc),
+    ('FFTW', '3.3.5', '', comp_mpi_tc),
+    ('ScaLAPACK', '2.0.2', '-%s%s' % (blas, blassuff), comp_mpi_tc)
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/f/freeglut/freeglut-3.0.0-intel-2016b.eb b/easybuild/easyconfigs/f/freeglut/freeglut-3.0.0-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ccad2796aa14d16e742fd06d511c3f702f62e7e5
--- /dev/null
+++ b/easybuild/easyconfigs/f/freeglut/freeglut-3.0.0-intel-2016b.eb
@@ -0,0 +1,34 @@
+easyblock = 'CMakeMake'
+
+name = 'freeglut'
+version = '3.0.0'
+
+homepage = 'http://freeglut.sourceforge.net/'
+description = "freeglut is a completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library."
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://prdownloads.sourceforge.net/%(name)s']
+
+builddependencies = [('CMake', '3.6.1')]
+
+dependencies = [
+    ('X11', '20160819'),
+    ('Mesa', '12.0.2'),
+]
+
+configopts = ' -DX11_X11_LIB="$EBROOTX11/lib/libX11.so" '
+configopts += ' -DX11_X11_INCLUDE_PATH="$EBROOTX11/include/X11" '
+configopts += ' -DX11_Xext_LIB="$EBROOTX11/lib/libXext.so" '
+configopts += ' -DX11_Xrandr_LIB="$EBROOTX11/lib/libXrandr.so" '
+configopts += ' -DX11_Xrandr_INCLUDE_PATH="$EBROOTX11/include/X11/extensions/" '
+configopts += ' -DX11_Xi_LIB="$EBROOTX11/lib/libXrandr.so" '
+configopts += ' -DX11_Xi_INCLUDE_PATH="$EBROOTX11/include/X11/extensions/" '
+
+sanity_check_paths = {
+    'files': [('lib/libglut.a', 'lib64/libglut.a'), ('lib/libglut.%s' % SHLIB_EXT, 'lib64/libglut.%s' % SHLIB_EXT)],
+    'dirs': ['include/GL'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.6.2-foss-2016a.eb b/easybuild/easyconfigs/f/freetype/freetype-2.6.2-foss-2016a.eb
index 3111a314be1d335be306892eb54230a67e4fb812..932824a17e8271f228be46c473c0fdc28d90538c 100644
--- a/easybuild/easyconfigs/f/freetype/freetype-2.6.2-foss-2016a.eb
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.6.2-foss-2016a.eb
@@ -11,10 +11,15 @@ toolchain = {'name': 'foss', 'version': '2016a'}
 source_urls = [GNU_SAVANNAH_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
-dependencies = [('libpng', '1.6.21')]
+dependencies = [
+    ('libpng', '1.6.21'),
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.8'),
+]
 
 sanity_check_paths = {
-    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT, '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
index ce2c31a36a9264bd5baca5decec58f728241497a..60b3db5452598527e1b53c024f1a279c28a0daa1 100644
--- a/easybuild/easyconfigs/f/freetype/freetype-2.6.2-intel-2016a.eb
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.6.2-intel-2016a.eb
@@ -11,7 +11,11 @@ toolchain = {'name': 'intel', 'version': '2016a'}
 source_urls = [GNU_SAVANNAH_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
-dependencies = [('libpng', '1.6.21')]
+dependencies = [
+    ('libpng', '1.6.21'),
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.8'),
+]
 
 sanity_check_paths = {
     'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT,
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.6.3-foss-2016a.eb b/easybuild/easyconfigs/f/freetype/freetype-2.6.3-foss-2016a.eb
index bc610c637e09e0c08336acbbe80fe5837022c229..d267c83653d1046fbd645c03dea04132187158c9 100644
--- a/easybuild/easyconfigs/f/freetype/freetype-2.6.3-foss-2016a.eb
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.6.3-foss-2016a.eb
@@ -11,7 +11,11 @@ toolchain = {'name': 'foss', 'version': '2016a'}
 source_urls = [GNU_SAVANNAH_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
-dependencies = [('libpng', '1.6.21')]
+dependencies = [
+    ('libpng', '1.6.21'),
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.8'),
+]
 
 sanity_check_paths = {
     'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT,
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.6.3-intel-2016a.eb b/easybuild/easyconfigs/f/freetype/freetype-2.6.3-intel-2016a.eb
index 6245460dc23afc9577f6deaf6f3f21d4296c981d..3d89e4bbb1d7e3dcfb354d5c80485da0b16f7682 100644
--- a/easybuild/easyconfigs/f/freetype/freetype-2.6.3-intel-2016a.eb
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.6.3-intel-2016a.eb
@@ -11,7 +11,11 @@ toolchain = {'name': 'intel', 'version': '2016a'}
 source_urls = [GNU_SAVANNAH_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
-dependencies = [('libpng', '1.6.21')]
+dependencies = [
+    ('libpng', '1.6.21'),
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.8'),
+]
 
 sanity_check_paths = {
     'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT,
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.6.5-GCCcore-4.9.3.eb b/easybuild/easyconfigs/f/freetype/freetype-2.6.5-GCCcore-4.9.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2c7c4b34eebe3d82ba4b6ac7160bd1d817f4dc1a
--- /dev/null
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.6.5-GCCcore-4.9.3.eb
@@ -0,0 +1,32 @@
+name = 'freetype'
+version = '2.6.5'
+
+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': 'GCCcore', 'version': '4.9.3'}
+
+source_urls = [GNU_SAVANNAH_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+builddependencies = [
+    ('binutils', '2.25'),
+]
+
+dependencies = [
+    ('libpng', '1.6.24'),
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.8'),
+]
+
+configopts = '--with-harfbuzz=no'
+
+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/f/freetype/freetype-2.6.5-foss-2016b.eb b/easybuild/easyconfigs/f/freetype/freetype-2.6.5-foss-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9156052c8f80538dcf9e207ebefbcb55813a513e
--- /dev/null
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.6.5-foss-2016b.eb
@@ -0,0 +1,26 @@
+name = 'freetype'
+version = '2.6.5'
+
+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': 'foss', 'version': '2016b'}
+
+source_urls = [GNU_SAVANNAH_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('libpng', '1.6.24'),
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.8'),
+]
+
+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/f/freetype/freetype-2.6.5-intel-2016b.eb b/easybuild/easyconfigs/f/freetype/freetype-2.6.5-intel-2016b.eb
index 63b620f14f2c8ac5132dac6fc4972246efdeb4f3..bf9e0cfc01c3ed31e70e7042a11033f8a36033e2 100644
--- a/easybuild/easyconfigs/f/freetype/freetype-2.6.5-intel-2016b.eb
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.6.5-intel-2016b.eb
@@ -11,7 +11,11 @@ toolchain = {'name': 'intel', 'version': '2016b'}
 source_urls = [GNU_SAVANNAH_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
-dependencies = [('libpng', '1.6.24')]
+dependencies = [
+    ('libpng', '1.6.24'),
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.8'),
+]
 
 sanity_check_paths = {
     'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT,
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.7-intel-2016b.eb b/easybuild/easyconfigs/f/freetype/freetype-2.7-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..52d8477931111ad36d7bd096d4f45f8b0e8ad9a6
--- /dev/null
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.7-intel-2016b.eb
@@ -0,0 +1,26 @@
+name = 'freetype'
+version = '2.7'
+
+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': '2016b'}
+
+source_urls = [GNU_SAVANNAH_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('libpng', '1.6.26'),
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.8'),
+]
+
+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/GATK/GATK-3.6-Java-1.8.0_92.eb b/easybuild/easyconfigs/g/GATK/GATK-3.6-Java-1.8.0_92.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3bbed9824ebf1b0498d618f5ff2d55d8ca2d9ef0
--- /dev/null
+++ b/easybuild/easyconfigs/g/GATK/GATK-3.6-Java-1.8.0_92.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
+# Modified by: Adam Huffman
+# The Francis Crick Institute
+##
+
+easyblock = 'Tarball'
+
+name = 'GATK'
+version = '3.6'
+versionsuffix = '-Java-%(javaver)s'
+
+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']
+
+dependencies = [('Java', '1.8.0_92')]
+
+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-6.1.0-2.27.eb b/easybuild/easyconfigs/g/GCC/GCC-6.1.0-2.27.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4faa0a48e88c2ccca189c320cebacabd6aab284f
--- /dev/null
+++ b/easybuild/easyconfigs/g/GCC/GCC-6.1.0-2.27.eb
@@ -0,0 +1,25 @@
+easyblock = 'Bundle'
+
+name = 'GCC'
+version = '6.1.0'
+
+binutilsver = '2.27'
+versionsuffix = '-%s' % binutilsver
+
+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': ''}
+
+dependencies = [
+    ('GCCcore', version),
+    # binutils built on top of GCCcore, which was built on top of (dummy-built) binutils
+    ('binutils', binutilsver, '', ('GCCcore', version)),
+]
+
+altroot = 'GCCcore'
+altversion = 'GCCcore'
+
+# this bundle serves as a compiler-only toolchain, so it should be marked as compiler (important for HMNS)
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/g/GCC/GCC-6.2.0-2.27.eb b/easybuild/easyconfigs/g/GCC/GCC-6.2.0-2.27.eb
new file mode 100644
index 0000000000000000000000000000000000000000..645cbb031445d38ae1c0dad8e981bc486490e1af
--- /dev/null
+++ b/easybuild/easyconfigs/g/GCC/GCC-6.2.0-2.27.eb
@@ -0,0 +1,25 @@
+easyblock = 'Bundle'
+
+name = 'GCC'
+version = '6.2.0'
+
+binutilsver = '2.27'
+versionsuffix = '-%s' % binutilsver
+
+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': ''}
+
+dependencies = [
+    ('GCCcore', version),
+    # binutils built on top of GCCcore, which was built on top of (dummy-built) binutils
+    ('binutils', binutilsver, '', ('GCCcore', version)),
+]
+
+altroot = 'GCCcore'
+altversion = 'GCCcore'
+
+# this bundle serves as a compiler-only toolchain, so it should be marked as compiler (important for HMNS)
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/g/GCCcore/GCCcore-6.1.0.eb b/easybuild/easyconfigs/g/GCCcore/GCCcore-6.1.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5b9af4041ac3bbef986c9c2b2b251b21e87e02f8
--- /dev/null
+++ b/easybuild/easyconfigs/g/GCCcore/GCCcore-6.1.0.eb
@@ -0,0 +1,57 @@
+easyblock = 'EB_GCC'
+
+name = 'GCCcore'
+version = '6.1.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.4'
+
+source_urls = [
+    '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
+    'http://ftpmirror.gnu.org/gcc/gcc-%(version)s',  # GCC auto-resolving HTTP mirror
+    'https://ftp.gnu.org/gnu/gcc/gcc-%(version)s/',  # Alternative GCC
+]
+
+sources = [
+    'gcc-%(version)s.tar.bz2',
+    'gmp-6.1.1.tar.bz2',
+    'mpfr-%s.tar.bz2' % mpfr_version,
+    'mpc-1.0.3.tar.gz',
+    'isl-0.16.1.tar.bz2',
+]
+
+builddependencies = [
+    ('M4', '1.4.17'),
+    ('binutils', '2.27'),
+]
+
+patches = [
+    ('mpfr-%s-allpatches-20160804.patch' % mpfr_version, '../mpfr-%s' % mpfr_version),
+    ('%s-%s_fix-find-isl.patch' % (name, version)),
+]
+
+checksums = [
+    '8fb6cb98b8459f5863328380fbf06bd1',     # gcc-6.1.0.tar.bz2
+    '4c175f86e11eb32d8bf9872ca3a8e11d',     # gmp-6.1.1.tar.bz2
+    'b8a2f6b0e68bef46e53da2ac439e1cf4',     # mpfr-3.1.4.tar.gz
+    'd6a1d5f8ddea3abd2cc3e98f58352d26',     # mpc-1.0.3.tar.gz
+    'ac1f25a0677912952718a51f5bc20f32',     # isl-0.16.1.tar.bz2
+]
+
+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/GCCcore/GCCcore-6.1.0_fix-find-isl.patch b/easybuild/easyconfigs/g/GCCcore/GCCcore-6.1.0_fix-find-isl.patch
new file mode 100644
index 0000000000000000000000000000000000000000..6334b6be3527921cba381caf0277f360482d93cf
--- /dev/null
+++ b/easybuild/easyconfigs/g/GCCcore/GCCcore-6.1.0_fix-find-isl.patch
@@ -0,0 +1,14 @@
+# Don't use libmpc and libmpfr to find libisl
+# by wpoely86@gmail.com
+diff -ur gcc-6.1.0.orig/configure gcc-6.1.0/configure
+--- gcc-6.1.0.orig/configure	2016-08-26 17:51:48.470524515 +0200
++++ gcc-6.1.0/configure	2016-03-17 23:54:19.000000000 +0100
+@@ -6018,7 +6018,7 @@
+     _isl_saved_LIBS=$LIBS
+
+     CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}"
+-    LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs} ${gmplibs}"
++    LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}"
+     LIBS="${_isl_saved_LIBS} -lisl -lgmp"
+
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isl 0.16, 0.15, or deprecated 0.14" >&5
diff --git a/easybuild/easyconfigs/g/GCCcore/GCCcore-6.2.0-fix-find-isl.patch b/easybuild/easyconfigs/g/GCCcore/GCCcore-6.2.0-fix-find-isl.patch
new file mode 100644
index 0000000000000000000000000000000000000000..6334b6be3527921cba381caf0277f360482d93cf
--- /dev/null
+++ b/easybuild/easyconfigs/g/GCCcore/GCCcore-6.2.0-fix-find-isl.patch
@@ -0,0 +1,14 @@
+# Don't use libmpc and libmpfr to find libisl
+# by wpoely86@gmail.com
+diff -ur gcc-6.1.0.orig/configure gcc-6.1.0/configure
+--- gcc-6.1.0.orig/configure	2016-08-26 17:51:48.470524515 +0200
++++ gcc-6.1.0/configure	2016-03-17 23:54:19.000000000 +0100
+@@ -6018,7 +6018,7 @@
+     _isl_saved_LIBS=$LIBS
+
+     CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}"
+-    LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs} ${gmplibs}"
++    LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}"
+     LIBS="${_isl_saved_LIBS} -lisl -lgmp"
+
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isl 0.16, 0.15, or deprecated 0.14" >&5
diff --git a/easybuild/easyconfigs/g/GCCcore/GCCcore-6.2.0.eb b/easybuild/easyconfigs/g/GCCcore/GCCcore-6.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a375f0e53968a7d7ffc6162983c4e0ec03a02e8d
--- /dev/null
+++ b/easybuild/easyconfigs/g/GCCcore/GCCcore-6.2.0.eb
@@ -0,0 +1,56 @@
+easyblock = 'EB_GCC'
+
+name = 'GCCcore'
+version = '6.2.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.4'
+
+source_urls = [
+    'http://ftpmirror.gnu.org/gcc/gcc-%(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 = [
+    'gcc-%(version)s.tar.bz2',
+    'gmp-6.1.1.tar.bz2',
+    'mpfr-%s.tar.bz2' % mpfr_version,
+    'mpc-1.0.3.tar.gz',
+    'isl-0.16.1.tar.bz2',
+]
+
+builddependencies = [
+    ('M4', '1.4.17'),
+    ('binutils', '2.27'),
+]
+
+patches = [
+    ('mpfr-%s-allpatches-20160804.patch' % mpfr_version, '../mpfr-%s' % mpfr_version),
+    '%(name)s-%(version)s-fix-find-isl.patch',
+]
+
+checksums = [
+    '9768625159663b300ae4de2f4745fcc4',     # gcc-6.2.0.tar.bz2
+    '4c175f86e11eb32d8bf9872ca3a8e11d',     # gmp-6.1.1.tar.bz2
+    'b8a2f6b0e68bef46e53da2ac439e1cf4',     # mpfr-3.1.4.tar.gz
+    'd6a1d5f8ddea3abd2cc3e98f58352d26',     # mpc-1.0.3.tar.gz
+    'ac1f25a0677912952718a51f5bc20f32',     # isl-0.16.1.tar.bz2
+]
+
+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/GCCcore/mpfr-3.1.4-allpatches-20160804.patch b/easybuild/easyconfigs/g/GCCcore/mpfr-3.1.4-allpatches-20160804.patch
new file mode 100644
index 0000000000000000000000000000000000000000..5823cecfe6cc3957094dd17f4a07f65391efac5c
--- /dev/null
+++ b/easybuild/easyconfigs/g/GCCcore/mpfr-3.1.4-allpatches-20160804.patch
@@ -0,0 +1,455 @@
+# All mpfr patches as of 2016-08-04
+# taken from their website: http://www.mpfr.org/mpfr-current/#download
+diff -Naurd mpfr-3.1.4-a/PATCHES mpfr-3.1.4-b/PATCHES
+--- mpfr-3.1.4-a/PATCHES	2016-04-13 21:22:23.720604013 +0000
++++ mpfr-3.1.4-b/PATCHES	2016-04-13 21:22:23.744603677 +0000
+@@ -0,0 +1 @@
++unix-check
+diff -Naurd mpfr-3.1.4-a/VERSION mpfr-3.1.4-b/VERSION
+--- mpfr-3.1.4-a/VERSION	2016-03-06 11:33:04.000000000 +0000
++++ mpfr-3.1.4-b/VERSION	2016-04-13 21:22:23.744603677 +0000
+@@ -1 +1 @@
+-3.1.4
++3.1.4-p1
+diff -Naurd mpfr-3.1.4-a/src/mpfr-impl.h mpfr-3.1.4-b/src/mpfr-impl.h
+--- mpfr-3.1.4-a/src/mpfr-impl.h	2016-03-06 11:33:04.000000000 +0000
++++ mpfr-3.1.4-b/src/mpfr-impl.h	2016-04-13 21:22:23.736603789 +0000
+@@ -252,19 +252,6 @@
+ # define MPFR_WIN_THREAD_SAFE_DLL 1
+ #endif
+
+-/* Detect some possible inconsistencies under Unix. */
+-#if defined(__unix__)
+-# if defined(_WIN32)
+-#  error "Both __unix__ and _WIN32 are defined"
+-# endif
+-# if __GMP_LIBGMP_DLL
+-#  error "__unix__ is defined and __GMP_LIBGMP_DLL is true"
+-# endif
+-# if defined(MPFR_WIN_THREAD_SAFE_DLL)
+-#  error "Both __unix__ and MPFR_WIN_THREAD_SAFE_DLL are defined"
+-# endif
+-#endif
+-
+ #if defined(__MPFR_WITHIN_MPFR) || !defined(MPFR_WIN_THREAD_SAFE_DLL)
+ extern MPFR_THREAD_ATTR unsigned int __gmpfr_flags;
+ extern MPFR_THREAD_ATTR mpfr_exp_t   __gmpfr_emin;
+diff -Naurd mpfr-3.1.4-a/src/mpfr.h mpfr-3.1.4-b/src/mpfr.h
+--- mpfr-3.1.4-a/src/mpfr.h	2016-03-06 11:33:04.000000000 +0000
++++ mpfr-3.1.4-b/src/mpfr.h	2016-04-13 21:22:23.744603677 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 4
+-#define MPFR_VERSION_STRING "3.1.4"
++#define MPFR_VERSION_STRING "3.1.4-p1"
+
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.4-a/src/version.c mpfr-3.1.4-b/src/version.c
+--- mpfr-3.1.4-a/src/version.c	2016-03-06 11:33:05.000000000 +0000
++++ mpfr-3.1.4-b/src/version.c	2016-04-13 21:22:23.744603677 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.4";
++  return "3.1.4-p1";
+ }
+diff -Naurd mpfr-3.1.4-a/PATCHES mpfr-3.1.4-b/PATCHES
+--- mpfr-3.1.4-a/PATCHES	2016-05-22 19:59:43.838399677 +0000
++++ mpfr-3.1.4-b/PATCHES	2016-05-22 19:59:43.866399168 +0000
+@@ -0,0 +1 @@
++add-sub-ui-flags
+diff -Naurd mpfr-3.1.4-a/VERSION mpfr-3.1.4-b/VERSION
+--- mpfr-3.1.4-a/VERSION	2016-04-13 21:22:23.744603677 +0000
++++ mpfr-3.1.4-b/VERSION	2016-05-22 19:59:43.866399168 +0000
+@@ -1 +1 @@
+-3.1.4-p1
++3.1.4-p2
+diff -Naurd mpfr-3.1.4-a/src/add_ui.c mpfr-3.1.4-b/src/add_ui.c
+--- mpfr-3.1.4-a/src/add_ui.c	2016-03-06 11:33:04.000000000 +0000
++++ mpfr-3.1.4-b/src/add_ui.c	2016-05-22 19:59:43.854399385 +0000
+@@ -49,6 +49,7 @@
+       MPFR_SAVE_EXPO_MARK (expo);
+       MPFR_SET_EXP (uu, GMP_NUMB_BITS - cnt);
+       inex = mpfr_add(y, x, uu, rnd_mode);
++      MPFR_SAVE_EXPO_UPDATE_FLAGS (expo, __gmpfr_flags);
+       MPFR_SAVE_EXPO_FREE (expo);
+       return mpfr_check_range(y, inex, rnd_mode);
+     }
+diff -Naurd mpfr-3.1.4-a/src/mpfr.h mpfr-3.1.4-b/src/mpfr.h
+--- mpfr-3.1.4-a/src/mpfr.h	2016-04-13 21:22:23.744603677 +0000
++++ mpfr-3.1.4-b/src/mpfr.h	2016-05-22 19:59:43.862399241 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 4
+-#define MPFR_VERSION_STRING "3.1.4-p1"
++#define MPFR_VERSION_STRING "3.1.4-p2"
+
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.4-a/src/sub_ui.c mpfr-3.1.4-b/src/sub_ui.c
+--- mpfr-3.1.4-a/src/sub_ui.c	2016-03-06 11:33:05.000000000 +0000
++++ mpfr-3.1.4-b/src/sub_ui.c	2016-05-22 19:59:43.854399385 +0000
+@@ -52,6 +52,7 @@
+       MPFR_SAVE_EXPO_MARK (expo);
+       MPFR_SET_EXP (uu, GMP_NUMB_BITS - cnt);
+       inex = mpfr_sub (y, x, uu, rnd_mode);
++      MPFR_SAVE_EXPO_UPDATE_FLAGS (expo, __gmpfr_flags);
+       MPFR_SAVE_EXPO_FREE (expo);
+       return mpfr_check_range (y, inex, rnd_mode);
+     }
+diff -Naurd mpfr-3.1.4-a/src/version.c mpfr-3.1.4-b/src/version.c
+--- mpfr-3.1.4-a/src/version.c	2016-04-13 21:22:23.744603677 +0000
++++ mpfr-3.1.4-b/src/version.c	2016-05-22 19:59:43.866399168 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.4-p1";
++  return "3.1.4-p2";
+ }
+diff -Naurd mpfr-3.1.4-a/tests/tadd_ui.c mpfr-3.1.4-b/tests/tadd_ui.c
+--- mpfr-3.1.4-a/tests/tadd_ui.c	2016-03-06 11:33:03.000000000 +0000
++++ mpfr-3.1.4-b/tests/tadd_ui.c	2016-05-22 19:59:43.854399385 +0000
+@@ -69,7 +69,9 @@
+
+   /* nan + 2394875 == nan */
+   mpfr_set_nan (x);
++  mpfr_clear_nanflag ();
+   mpfr_add_ui (y, x, 2394875L, MPFR_RNDN);
++  MPFR_ASSERTN (mpfr_nanflag_p ());
+   MPFR_ASSERTN (mpfr_nan_p (y));
+
+   /* +inf + 2394875 == +inf */
+diff -Naurd mpfr-3.1.4-a/tests/tsub_ui.c mpfr-3.1.4-b/tests/tsub_ui.c
+--- mpfr-3.1.4-a/tests/tsub_ui.c	2016-03-06 11:33:03.000000000 +0000
++++ mpfr-3.1.4-b/tests/tsub_ui.c	2016-05-22 19:59:43.854399385 +0000
+@@ -96,7 +96,9 @@
+
+   /* nan - 1 == nan */
+   mpfr_set_nan (x);
++  mpfr_clear_nanflag ();
+   mpfr_sub_ui (y, x, 1L, MPFR_RNDN);
++  MPFR_ASSERTN (mpfr_nanflag_p ());
+   MPFR_ASSERTN (mpfr_nan_p (y));
+
+   /* +inf - 1 == +inf */
+diff -Naurd mpfr-3.1.4-a/PATCHES mpfr-3.1.4-b/PATCHES
+--- mpfr-3.1.4-a/PATCHES	2016-06-01 13:00:30.748711490 +0000
++++ mpfr-3.1.4-b/PATCHES	2016-06-01 13:00:30.772711162 +0000
+@@ -0,0 +1 @@
++sub1-overflow
+diff -Naurd mpfr-3.1.4-a/VERSION mpfr-3.1.4-b/VERSION
+--- mpfr-3.1.4-a/VERSION	2016-05-22 19:59:43.866399168 +0000
++++ mpfr-3.1.4-b/VERSION	2016-06-01 13:00:30.772711162 +0000
+@@ -1 +1 @@
+-3.1.4-p2
++3.1.4-p3
+diff -Naurd mpfr-3.1.4-a/src/mpfr.h mpfr-3.1.4-b/src/mpfr.h
+--- mpfr-3.1.4-a/src/mpfr.h	2016-05-22 19:59:43.862399241 +0000
++++ mpfr-3.1.4-b/src/mpfr.h	2016-06-01 13:00:30.772711162 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 4
+-#define MPFR_VERSION_STRING "3.1.4-p2"
++#define MPFR_VERSION_STRING "3.1.4-p3"
+
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.4-a/src/sub1.c mpfr-3.1.4-b/src/sub1.c
+--- mpfr-3.1.4-a/src/sub1.c	2016-03-06 11:33:05.000000000 +0000
++++ mpfr-3.1.4-b/src/sub1.c	2016-06-01 13:00:30.760711326 +0000
+@@ -96,16 +96,15 @@
+       /* A = S*ABS(B) +/- ulp(a) */
+       MPFR_SET_EXP (a, MPFR_GET_EXP (b));
+       MPFR_RNDRAW_EVEN (inexact, a, MPFR_MANT (b), MPFR_PREC (b),
+-                        rnd_mode, MPFR_SIGN (a),
+-                        if (MPFR_UNLIKELY ( ++MPFR_EXP (a) > __gmpfr_emax))
+-                        inexact = mpfr_overflow (a, rnd_mode, MPFR_SIGN (a)));
+-      /* inexact = mpfr_set4 (a, b, rnd_mode, MPFR_SIGN (a));  */
++                        rnd_mode, MPFR_SIGN (a), ++ MPFR_EXP (a));
+       if (inexact == 0)
+         {
+           /* a = b (Exact)
+              But we know it isn't (Since we have to remove `c')
+              So if we round to Zero, we have to remove one ulp.
+              Otherwise the result is correctly rounded. */
++          /* An overflow is not possible. */
++          MPFR_ASSERTD (MPFR_EXP (a) <= __gmpfr_emax);
+           if (MPFR_IS_LIKE_RNDZ (rnd_mode, MPFR_IS_NEG (a)))
+             {
+               mpfr_nexttozero (a);
+@@ -136,9 +135,14 @@
+              i.e. inexact= MPFR_EVEN_INEX */
+           if (MPFR_UNLIKELY (inexact == MPFR_EVEN_INEX*MPFR_INT_SIGN (a)))
+             {
+-              mpfr_nexttozero (a);
++              if (MPFR_UNLIKELY (MPFR_EXP (a) > __gmpfr_emax))
++                mpfr_setmax (a, __gmpfr_emax);
++              else
++                mpfr_nexttozero (a);
+               inexact = -MPFR_INT_SIGN (a);
+             }
++          else if (MPFR_UNLIKELY (MPFR_EXP (a) > __gmpfr_emax))
++            inexact = mpfr_overflow (a, rnd_mode, MPFR_SIGN (a));
+           MPFR_RET (inexact);
+         }
+     }
+diff -Naurd mpfr-3.1.4-a/src/version.c mpfr-3.1.4-b/src/version.c
+--- mpfr-3.1.4-a/src/version.c	2016-05-22 19:59:43.866399168 +0000
++++ mpfr-3.1.4-b/src/version.c	2016-06-01 13:00:30.772711162 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.4-p2";
++  return "3.1.4-p3";
+ }
+diff -Naurd mpfr-3.1.4-a/tests/tsub.c mpfr-3.1.4-b/tests/tsub.c
+--- mpfr-3.1.4-a/tests/tsub.c	2016-03-06 11:33:03.000000000 +0000
++++ mpfr-3.1.4-b/tests/tsub.c	2016-06-01 13:00:30.760711326 +0000
+@@ -630,6 +630,135 @@
+     }
+ }
+
++static void
++check_max_almosteven (void)
++{
++  mpfr_exp_t old_emin, old_emax;
++  mpfr_exp_t emin[2] = { MPFR_EMIN_MIN, -1000 };
++  mpfr_exp_t emax[2] = { MPFR_EMAX_MAX, 1000 };
++  int i;
++
++  old_emin = mpfr_get_emin ();
++  old_emax = mpfr_get_emax ();
++
++  for (i = 0; i < 2; i++)
++    {
++      mpfr_t a1, a2, b, c;
++      mpfr_prec_t p;
++      int neg, j, rnd;
++
++      set_emin (emin[i]);
++      set_emax (emax[i]);
++
++      p = MPFR_PREC_MIN + randlimb () % 70;
++      mpfr_init2 (a1, p);
++      mpfr_init2 (a2, p);
++      mpfr_init2 (b, p+1);
++      mpfr_init2 (c, MPFR_PREC_MIN);
++
++      mpfr_setmax (b, 0);
++      mpfr_set_ui (c, 1, MPFR_RNDN);
++
++      for (neg = 0; neg < 2; neg++)
++        {
++          for (j = 1; j >= 0; j--)
++            {
++              mpfr_set_exp (b, __gmpfr_emax - j);
++              RND_LOOP (rnd)
++                {
++                  unsigned int flags1, flags2;
++                  int inex1, inex2;
++
++                  flags1 = MPFR_FLAGS_INEXACT;
++                  if (rnd == MPFR_RNDN || MPFR_IS_LIKE_RNDZ (rnd, neg))
++                    {
++                      inex1 = neg ? 1 : -1;
++                      mpfr_setmax (a1, __gmpfr_emax - j);
++                    }
++                  else
++                    {
++                      inex1 = neg ? -1 : 1;
++                      if (j == 0)
++                        {
++                          flags1 |= MPFR_FLAGS_OVERFLOW;
++                          mpfr_set_inf (a1, 1);
++                        }
++                      else
++                        {
++                          mpfr_setmin (a1, __gmpfr_emax);
++                        }
++                    }
++                  MPFR_SET_SIGN (a1, neg ? -1 : 1);
++
++                  mpfr_clear_flags ();
++                  inex2 = mpfr_sub (a2, b, c, (mpfr_rnd_t) rnd);
++                  flags2 = __gmpfr_flags;
++
++                  if (! (flags1 == flags2 && SAME_SIGN (inex1, inex2) &&
++                         mpfr_equal_p (a1, a2)))
++                    {
++                      printf ("Error 1 in check_max_almosteven for %s,"
++                              " i = %d, j = %d, neg = %d\n",
++                              mpfr_print_rnd_mode ((mpfr_rnd_t) rnd),
++                              i, j, neg);
++                      printf ("     b = ");
++                      mpfr_dump (b);
++                      printf ("Expected ");
++                      mpfr_dump (a1);
++                      printf ("  with inex = %d, flags =", inex1);
++                      flags_out (flags1);
++                      printf ("Got      ");
++                      mpfr_dump (a2);
++                      printf ("  with inex = %d, flags =", inex2);
++                      flags_out (flags2);
++                      exit (1);
++                    }
++
++                  if (i == 0)
++                    break;
++
++                  mpfr_clear_flags ();
++                  set_emin (MPFR_EMIN_MIN);
++                  set_emax (MPFR_EMAX_MAX);
++                  inex2 = mpfr_sub (a2, b, c, (mpfr_rnd_t) rnd);
++                  set_emin (emin[i]);
++                  set_emax (emax[i]);
++                  inex2 = mpfr_check_range (a2, inex2, (mpfr_rnd_t) rnd);
++                  flags2 = __gmpfr_flags;
++
++                  if (! (flags1 == flags2 && SAME_SIGN (inex1, inex2) &&
++                         mpfr_equal_p (a1, a2)))
++                    {
++                      printf ("Error 2 in check_max_almosteven for %s,"
++                              " i = %d, j = %d, neg = %d\n",
++                              mpfr_print_rnd_mode ((mpfr_rnd_t) rnd),
++                              i, j, neg);
++                      printf ("     b = ");
++                      mpfr_dump (b);
++                      printf ("Expected ");
++                      mpfr_dump (a1);
++                      printf ("  with inex = %d, flags =", inex1);
++                      flags_out (flags1);
++                      printf ("Got      ");
++                      mpfr_dump (a2);
++                      printf ("  with inex = %d, flags =", inex2);
++                      flags_out (flags2);
++                      exit (1);
++                    }
++                }
++            }  /* j */
++
++          mpfr_neg (b, b, MPFR_RNDN);
++          mpfr_neg (c, c, MPFR_RNDN);
++        }  /* neg */
++
++      mpfr_clears (a1, a2, b, c, (mpfr_ptr) 0);
++    }  /* i */
++
++  set_emin (old_emin);
++  set_emax (old_emax);
++}
++
+ #define TEST_FUNCTION test_sub
+ #define TWO_ARGS
+ #define RAND_FUNCTION(x) mpfr_random2(x, MPFR_LIMB_SIZE (x), randlimb () % 100, RANDS)
+@@ -647,6 +776,7 @@
+   check_rounding ();
+   check_diverse ();
+   check_inexact ();
++  check_max_almosteven ();
+   bug_ddefour ();
+   for (p=2; p<200; p++)
+     for (i=0; i<50; i++)
+diff -Naurd mpfr-3.1.4-a/PATCHES mpfr-3.1.4-b/PATCHES
+--- mpfr-3.1.4-a/PATCHES	2016-08-04 20:41:14.097592781 +0000
++++ mpfr-3.1.4-b/PATCHES	2016-08-04 20:41:14.121592350 +0000
+@@ -0,0 +1 @@
++c++11-compat
+diff -Naurd mpfr-3.1.4-a/VERSION mpfr-3.1.4-b/VERSION
+--- mpfr-3.1.4-a/VERSION	2016-06-01 13:00:30.772711162 +0000
++++ mpfr-3.1.4-b/VERSION	2016-08-04 20:41:14.121592350 +0000
+@@ -1 +1 @@
+-3.1.4-p3
++3.1.4-p4
+diff -Naurd mpfr-3.1.4-a/src/mpfr.h mpfr-3.1.4-b/src/mpfr.h
+--- mpfr-3.1.4-a/src/mpfr.h	2016-06-01 13:00:30.772711162 +0000
++++ mpfr-3.1.4-b/src/mpfr.h	2016-08-04 20:41:14.121592350 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 4
+-#define MPFR_VERSION_STRING "3.1.4-p3"
++#define MPFR_VERSION_STRING "3.1.4-p4"
+
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.4-a/src/version.c mpfr-3.1.4-b/src/version.c
+--- mpfr-3.1.4-a/src/version.c	2016-06-01 13:00:30.772711162 +0000
++++ mpfr-3.1.4-b/src/version.c	2016-08-04 20:41:14.121592350 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.4-p3";
++  return "3.1.4-p4";
+ }
+diff -Naurd mpfr-3.1.4-a/tests/tpow_z.c mpfr-3.1.4-b/tests/tpow_z.c
+--- mpfr-3.1.4-a/tests/tpow_z.c	2016-03-06 11:33:03.000000000 +0000
++++ mpfr-3.1.4-b/tests/tpow_z.c	2016-08-04 20:41:14.113592494 +0000
+@@ -26,7 +26,7 @@
+
+ #include "mpfr-test.h"
+
+-#define ERROR(str) do { printf("Error for "str"\n"); exit (1); } while (0)
++#define ERROR(str) do { printf ("Error for " str "\n"); exit (1); } while (0)
+
+ static void
+ check_special (void)
+diff -Naurd mpfr-3.1.4-a/tests/tset_si.c mpfr-3.1.4-b/tests/tset_si.c
+--- mpfr-3.1.4-a/tests/tset_si.c	2016-03-06 11:33:03.000000000 +0000
++++ mpfr-3.1.4-b/tests/tset_si.c	2016-08-04 20:41:14.113592494 +0000
+@@ -26,7 +26,7 @@
+
+ #include "mpfr-test.h"
+
+-#define ERROR(str) {printf("Error for "str"\n"); exit(1);}
++#define ERROR(str) do { printf ("Error for " str "\n"); exit (1); } while (0)
+
+ static void
+ test_2exp (void)
+diff -Naurd mpfr-3.1.4-a/tests/tset_sj.c mpfr-3.1.4-b/tests/tset_sj.c
+--- mpfr-3.1.4-a/tests/tset_sj.c	2016-03-06 11:33:03.000000000 +0000
++++ mpfr-3.1.4-b/tests/tset_sj.c	2016-08-04 20:41:14.113592494 +0000
+@@ -42,7 +42,7 @@
+
+ #else
+
+-#define ERROR(str) {printf("Error for "str"\n"); exit(1);}
++#define ERROR(str) do { printf ("Error for " str "\n"); exit (1); } while (0)
+
+ static int
+ inexact_sign (int x)
+diff -Naurd mpfr-3.1.4-a/tests/tsi_op.c mpfr-3.1.4-b/tests/tsi_op.c
+--- mpfr-3.1.4-a/tests/tsi_op.c	2016-03-06 11:33:03.000000000 +0000
++++ mpfr-3.1.4-b/tests/tsi_op.c	2016-08-04 20:41:14.113592494 +0000
+@@ -26,14 +26,16 @@
+
+ #include "mpfr-test.h"
+
+-#define ERROR1(s, i, z, exp) \
+-{\
+-  printf("Error for "s" and i=%d\n", i);\
+-  printf("Expected %s\n", exp);\
+-  printf("Got      "); mpfr_out_str (stdout, 16, 0, z, MPFR_RNDN);\
+-  putchar ('\n');\
+-  exit(1);\
+-}
++#define ERROR1(s,i,z,exp)                                               \
++  do                                                                    \
++    {                                                                   \
++      printf ("Error for " s " and i=%d\n", i);                         \
++      printf ("Expected %s\n", exp);                                    \
++      printf ("Got      "); mpfr_out_str (stdout, 16, 0, z, MPFR_RNDN); \
++      putchar ('\n');                                                   \
++      exit(1);                                                          \
++    }                                                                   \
++  while (0)
+
+ const struct {
+   const char * op1;
diff --git a/easybuild/easyconfigs/g/GConf/GConf-3.2.6-foss-2016a.eb b/easybuild/easyconfigs/g/GConf/GConf-3.2.6-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6b42d8e1b61951e910fa8de90602815402ce47d6
--- /dev/null
+++ b/easybuild/easyconfigs/g/GConf/GConf-3.2.6-foss-2016a.eb
@@ -0,0 +1,39 @@
+easyblock = 'ConfigureMake'
+
+name = 'GConf'
+version = '3.2.6'
+
+homepage = 'https://projects.gnome.org/gconf/'
+description = """GConf is a system for storing application preferences.
+ It is intended for user preferences; not configuration
+ of something like Apache, or arbitrary data storage."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://ftp.gnome.org/pub/GNOME/sources/GConf/%(version_major_minor)s/']
+sources = [SOURCE_TAR_XZ]
+
+dependencies = [
+    ('dbus-glib', '0.106'),
+    ('GLib', '2.48.0'),
+    ('GObject-Introspection', '1.48.0'),
+    ('libxml2', '2.9.3'),
+    ('GTK+', '2.24.30'),
+    ('intltool', '0.51.0', '-Perl-5.22.1'),
+]
+
+configopts = '--disable-orbit '
+
+sanity_check_paths = {
+    'files': ['bin/gconf%s' % x for x in['-merge-tree', 'tool-2']] +
+             ['bin/gsettings-%s-convert' % x for x in ['data', 'schema']] +
+             ['lib/libgconf-2.%s' % x for x in['a', 'so']],
+    'dirs': ['include', 'share']
+}
+
+modextrapaths = {
+    'GI_TYPELIB_PATH': 'share',
+    'XDG_DATA_DIRS': 'share',
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/g/GConf/GConf-3.2.6-intel-2016b.eb b/easybuild/easyconfigs/g/GConf/GConf-3.2.6-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a184de7e11e3abfe4f04de17b665ba49a762a573
--- /dev/null
+++ b/easybuild/easyconfigs/g/GConf/GConf-3.2.6-intel-2016b.eb
@@ -0,0 +1,39 @@
+easyblock = 'ConfigureMake'
+
+name = 'GConf'
+version = '3.2.6'
+
+homepage = 'https://projects.gnome.org/gconf/'
+description = """GConf is a system for storing application preferences.
+ It is intended for user preferences; not configuration
+ of something like Apache, or arbitrary data storage."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['http://ftp.gnome.org/pub/GNOME/sources/GConf/%(version_major_minor)s/']
+sources = [SOURCE_TAR_XZ]
+
+dependencies = [
+    ('dbus-glib', '0.108'),
+    ('GLib', '2.49.5'),
+    ('GObject-Introspection', '1.49.1'),
+    ('libxml2', '2.9.4'),
+    ('GTK+', '2.24.31'),
+    ('intltool', '0.51.0', '-Perl-5.24.0'),
+]
+
+configopts = '--disable-orbit '
+
+sanity_check_paths = {
+    'files': ['bin/gconf%s' % x for x in['-merge-tree', 'tool-2']] +
+             ['bin/gsettings-%s-convert' % x for x in ['data', 'schema']] +
+             ['lib/libgconf-2.%s' % x for x in['a', 'so']],
+    'dirs': ['include', 'share']
+}
+
+modextrapaths = {
+    'GI_TYPELIB_PATH': 'share',
+    'XDG_DATA_DIRS': 'share',
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/g/GDAL/GDAL-2.1.1-foss-2016a.eb b/easybuild/easyconfigs/g/GDAL/GDAL-2.1.1-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0ec6ce953ae72d20e8716c2f5ef3b5cbef5ee576
--- /dev/null
+++ b/easybuild/easyconfigs/g/GDAL/GDAL-2.1.1-foss-2016a.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'GDAL'
+version = '2.1.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': 'foss', 'version': '2016a'}
+toolchainopts = {'usempi': True}
+
+source_urls = ['http://download.osgeo.org/gdal/%(version)s/']
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [
+    ('netCDF', '4.4.0'),
+    ('expat', '2.1.1'),
+    ('libxml2', '2.9.3'),
+    ('zlib', '1.2.8'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libgdal.%s' % SHLIB_EXT, 'lib/libgdal.a'],
+    'dirs': ['bin', 'include']
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/g/GDB/GDB-7.11.1-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/g/GDB/GDB-7.11.1-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ad51f8adce6ed100c32b88850007cbece82b094f
--- /dev/null
+++ b/easybuild/easyconfigs/g/GDB/GDB-7.11.1-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,35 @@
+easyblock = 'ConfigureMake'
+
+name = 'GDB'
+version = '7.11.1'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://www.gnu.org/software/gdb/gdb.html'
+description = "The GNU Project Debugger"
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+sources = [SOURCELOWER_TAR_XZ]
+source_urls = [GNU_SOURCE]
+
+patches = ['GDB-7.9-missing-makeinfo.patch']
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('libreadline', '6.3'),
+    ('ncurses', '6.0'),
+    ('expat', '2.2.0'),
+    ('Python', '2.7.12'),
+]
+
+configopts = '--with-system-zlib --with-python=$EBROOTPYTHON/bin/python --with-expat=$EBROOTEXPAT '
+configopts += '--with-system-readline --enable-tui --enable-plugins'
+
+parallel = 1
+
+sanity_check_paths = {
+    'files': ['bin/gdb', 'bin/gdbserver'],
+    'dirs': [],
+}
+
+moduleclass = 'debugger'
diff --git a/easybuild/easyconfigs/g/GL2PS/GL2PS-1.3.9-intel-2016b.eb b/easybuild/easyconfigs/g/GL2PS/GL2PS-1.3.9-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1afefc8e7263edc409979defb441a63f7217199e
--- /dev/null
+++ b/easybuild/easyconfigs/g/GL2PS/GL2PS-1.3.9-intel-2016b.eb
@@ -0,0 +1,32 @@
+easyblock = 'CMakeMake'
+
+name = 'GL2PS'
+version = '1.3.9'
+
+homepage = 'http://www.geuz.org/gl2ps/'
+description = """GL2PS: an OpenGL to PostScript printing library"""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['http://geuz.org/gl2ps/src/']
+sources = [SOURCELOWER_TGZ]
+
+builddependencies = [
+    ('CMake', '3.6.1'),
+]
+
+dependencies = [
+    ('X11', '20160819'),
+    ('Mesa', '12.0.2'),
+    ('libGLU', '9.0.0'),
+    ('freeglut', '3.0.0'),
+    ('libpng', '1.6.24'),
+    ('zlib', '1.2.8'),
+]
+
+sanity_check_paths = {
+    'files': ['include/gl2ps.h', 'lib/libgl2ps.so'],
+    'dirs': []
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GLPK/GLPK-4.60-intel-2016b.eb b/easybuild/easyconfigs/g/GLPK/GLPK-4.60-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..66b0f5b8f26455ebcf27155b679333939bb7b2b7
--- /dev/null
+++ b/easybuild/easyconfigs/g/GLPK/GLPK-4.60-intel-2016b.eb
@@ -0,0 +1,28 @@
+easyblock = 'ConfigureMake'
+
+name = 'GLPK'
+version = '4.60'
+
+homepage = 'https://www.gnu.org/software/glpk/'
+description = """The GLPK (GNU Linear Programming Kit) package is intended for
+ solving large-scale linear programming (LP),
+ mixed integer programming (MIP), and other related problems.
+ It is a set of routines written in ANSI C 
+ and organized in the form of a callable library."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s/']
+
+dependencies = [('GMP', '6.1.1')]
+
+configopts = "--with-gmp"
+
+sanity_check_paths = {
+    'files': ['bin/glpsol', 'include/glpk.h'] +
+             ['lib/libglpk.%s' % x for x in [SHLIB_EXT, 'a']],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/g/GLib/GLib-2.49.5-intel-2016b.eb b/easybuild/easyconfigs/g/GLib/GLib-2.49.5-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..cabfe78d325876f0484af882c23960b55c41cdef
--- /dev/null
+++ b/easybuild/easyconfigs/g/GLib/GLib-2.49.5-intel-2016b.eb
@@ -0,0 +1,33 @@
+easyblock = 'ConfigureMake'
+
+name = 'GLib'
+version = '2.49.5'
+
+homepage = 'http://www.gtk.org/'
+description = """GLib is one of the base libraries of the GTK+ project"""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+toolchainopts = {'pic': True}
+
+source_urls = [FTPGNOME_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [
+    ('libffi', '3.2.1'),
+    ('gettext', '0.19.8'),
+    ('libxml2', '2.9.4'),
+    ('PCRE', '8.39'),
+]
+
+builddependencies = [('Python', '2.7.12')]
+
+configopts = "--disable-maintainer-mode --disable-silent-rules --disable-libelf --enable-static --enable-shared --disable-systemtap"
+
+postinstallcmds = ["sed -i -e 's|#!.*python|#!/usr/bin/env python|' %(installdir)s/bin/*"]
+
+sanity_check_paths = {
+    'files': ['lib/libglib-%(version_major)s.0.a', 'lib/libglib-%%(version_major)s.0.%s' % SHLIB_EXT],
+    'dirs': ['bin', 'include'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GMP/GMP-6.1.1-GCC-5.4.0-2.26.eb b/easybuild/easyconfigs/g/GMP/GMP-6.1.1-GCC-5.4.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e32606963803c7464924313578d22c0da36ae019
--- /dev/null
+++ b/easybuild/easyconfigs/g/GMP/GMP-6.1.1-GCC-5.4.0-2.26.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'GMP'
+version = '6.1.1'
+
+homepage = 'http://gmplib.org/'
+description = """GMP is a free library for arbitrary precision arithmetic,
+operating on signed integers, rational numbers, and floating point numbers. """
+
+toolchain = {'name': 'GCC', 'version': '5.4.0-2.26'}
+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.1-foss-2016.04.eb b/easybuild/easyconfigs/g/GMP/GMP-6.1.1-foss-2016.04.eb
new file mode 100644
index 0000000000000000000000000000000000000000..81653e7d61ed7d4f6e7a00ca79cb0cd51d6fe10a
--- /dev/null
+++ b/easybuild/easyconfigs/g/GMP/GMP-6.1.1-foss-2016.04.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'GMP'
+version = '6.1.1'
+
+homepage = 'http://gmplib.org/'
+description = """GMP is a free library for arbitrary precision arithmetic, 
+operating on signed integers, rational numbers, and floating point numbers. """
+
+toolchain = {'name': 'foss', 'version': '2016.04'}
+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/GObject-Introspection/GObject-Introspection-1.48.0-foss-2016a.eb b/easybuild/easyconfigs/g/GObject-Introspection/GObject-Introspection-1.48.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e8ddb76e89b7d35653bafb683713c3bb253736ef
--- /dev/null
+++ b/easybuild/easyconfigs/g/GObject-Introspection/GObject-Introspection-1.48.0-foss-2016a.eb
@@ -0,0 +1,48 @@
+easyblock = 'ConfigureMake'
+
+name = 'GObject-Introspection'
+version = '1.48.0'
+
+homepage = 'https://wiki.gnome.org/GObjectIntrospection/'
+description = """GObject introspection is a middleware layer between C libraries
+ (using GObject) and language bindings. The C library can be scanned at
+ compile time and generate a metadata file, in addition to the actual
+ native C library. Then at runtime, language bindings can read this
+ metadata and automatically provide bindings to call into the C library."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [FTPGNOME_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+glibver = '2.48.0'
+dependencies = [
+    ('Python', '2.7.11'),
+    ('GLib', glibver),
+    ('libffi', '3.2.1'),
+]
+
+builddependencies = [
+    ('Autotools', '20150215'),
+    ('flex', '2.6.0'),
+    ('Bison', '3.0.4'),
+    ('cairo', '1.14.6', '-GLib-%s' % glibver),
+]
+
+preconfigopts = "env GI_SCANNER_DISABLE_CACHE=true "
+
+# avoid using hard-coded path to 'python' in shebang of scripts
+buildopts = "PYTHON=python"
+
+modextrapaths = {
+    'GI_TYPELIB_PATH': 'share',
+    'XDG_DATA_DIRS': 'share',
+}
+
+sanity_check_paths = {
+    'files': ['bin/g-ir-%s' % x for x in ['annotation-tool', 'compiler', 'generate', 'scanner']] +
+             ['lib/libgirepository-1.0.%s' % x for x in ['so', 'a']],
+    'dirs': ['include', 'share']
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/g/GObject-Introspection/GObject-Introspection-1.49.1-intel-2016b.eb b/easybuild/easyconfigs/g/GObject-Introspection/GObject-Introspection-1.49.1-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..09a8cb39dc660d306b6d1080bb36d6dc112bc0f7
--- /dev/null
+++ b/easybuild/easyconfigs/g/GObject-Introspection/GObject-Introspection-1.49.1-intel-2016b.eb
@@ -0,0 +1,47 @@
+easyblock = 'ConfigureMake'
+
+name = 'GObject-Introspection'
+version = '1.49.1'
+
+homepage = 'https://wiki.gnome.org/GObjectIntrospection/'
+description = """GObject introspection is a middleware layer between C libraries
+ (using GObject) and language bindings. The C library can be scanned at
+ compile time and generate a metadata file, in addition to the actual
+ native C library. Then at runtime, language bindings can read this
+ metadata and automatically provide bindings to call into the C library."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = [FTPGNOME_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [
+    ('Python', '2.7.12'),
+    ('GLib', '2.49.5'),
+    ('libffi', '3.2.1'),
+]
+
+builddependencies = [
+    ('Autotools', '20150215'),
+    ('flex', '2.6.0'),
+    ('Bison', '3.0.4'),
+    ('cairo', '1.14.6'),
+]
+
+preconfigopts = "env GI_SCANNER_DISABLE_CACHE=true "
+
+# avoid using hard-coded path to 'python' in shebang of scripts
+buildopts = "PYTHON=python"
+
+modextrapaths = {
+    'GI_TYPELIB_PATH': 'share',
+    'XDG_DATA_DIRS': 'share',
+}
+
+sanity_check_paths = {
+    'files': ['bin/g-ir-%s' % x for x in ['annotation-tool', 'compiler', 'generate', 'scanner']] +
+             ['lib/libgirepository-1.0.%s' % x for x in ['so', 'a']],
+    'dirs': ['include', 'share']
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/g/GRIT/GRIT-2.0.5-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/g/GRIT/GRIT-2.0.5-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ec4f6977d05cef703c3fe392587827319b0e0487
--- /dev/null
+++ b/easybuild/easyconfigs/g/GRIT/GRIT-2.0.5-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,42 @@
+easyblock = 'Bundle'
+
+name = 'GRIT'
+version = '2.0.5'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://github.com/nboley/grit'
+description = """GRIT - A tool for the integrative analysis of RNA-seq type assays"""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+# this is a bundle of Python packages
+exts_defaultclass = 'PythonPackage'
+
+dependencies = [
+    ('Python', '2.7.12'),
+]
+
+exts_list = [
+    ('networkx', '1.11', {
+        'source_urls': ['https://pypi.python.org/packages/source/n/networkx'],
+    }),
+    ('pysam', '0.9.1.4', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pysam/'],
+    }),
+    (name, version, {
+        'source_urls': ['https://github.com/nboley/grit/archive/'],
+        'source_tmpl': '%(version)s.tar.gz',
+        'patches': ['GRIT-2.0.5_fix-typo.patch'],
+    }),
+]
+
+modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
+
+sanity_check_paths = {
+    'files': ['bin/run_grit'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+sanity_check_commands = [('run_grit', '--help')]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/GRIT/GRIT-2.0.5_fix-typo.patch b/easybuild/easyconfigs/g/GRIT/GRIT-2.0.5_fix-typo.patch
new file mode 100644
index 0000000000000000000000000000000000000000..cb33a36d9083d1bfbffbd369acb09c31c5492b60
--- /dev/null
+++ b/easybuild/easyconfigs/g/GRIT/GRIT-2.0.5_fix-typo.patch
@@ -0,0 +1,15 @@
+fix typo resulting in AttributeError, see also https://github.com/nboley/grit/pull/3
+author: Kenneth Hoste (HPC-UGent)
+diff --git a/grit/files/reads.py b/grit/files/reads.py
+index 6228a43..a9cc2db 100644
+--- a/grit/files/reads.py
++++ b/grit/files/reads.py
+@@ -957,7 +957,7 @@ class PolyAReads(Reads):
+         if reverse_read_strand in ('auto', None):
+             if ref_genes in([], None): 
+                 raise ValueError, "Determining reverse_read_strand requires reference genes"
+-            reverse_read_strand_params = Reads.determine_read_strand_param(
++            reverse_read_strand_params = determine_read_strand_params(
+                 self, ref_genes, pairs_are_opp_strand, 'tes_exon',
+                 300, 50 )
+             assert 'stranded' in reverse_read_strand_params
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-5.1.4-foss-2016b-hybrid.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-5.1.4-foss-2016b-hybrid.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2e153e4c273ff746aa4738f9f7fa4009838071f3
--- /dev/null
+++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-5.1.4-foss-2016b-hybrid.eb
@@ -0,0 +1,39 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University
+# Authors::   Wiktor Jurkowski <wiktor.jurkowski@uni.lu>, Fotis Georgatos <fotis.georgatos@uni.lu>, \
+#             George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Kenneth Hoste
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html
+#
+# Version 5.1.4
+# Author: Adam Huffman
+# The Francis Crick Institute
+##
+
+name = 'GROMACS'
+version = '5.1.4'
+versionsuffix = '-hybrid'
+
+homepage = 'http://www.gromacs.org'
+description = """GROMACS is a versatile package to perform molecular dynamics,
+ i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles."""
+
+toolchain = {'name': 'foss', 'version': '2016b'}
+toolchainopts = {'openmp': True, 'usempi': True}
+
+source_urls = ['ftp://ftp.gromacs.org/pub/gromacs/']
+sources = [SOURCELOWER_TAR_GZ]
+
+builddependencies = [
+    ('CMake', '3.5.2'),
+    ('libxml2', '2.9.4')
+]
+
+dependencies = [('Boost', '1.61.0')]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-5.1.4-foss-2016b-mt.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-5.1.4-foss-2016b-mt.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ab660ee95506e4e89bff259094dc42a37736ac03
--- /dev/null
+++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-5.1.4-foss-2016b-mt.eb
@@ -0,0 +1,39 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University
+# Authors::   Wiktor Jurkowski <wiktor.jurkowski@uni.lu>, Fotis Georgatos <fotis.georgatos@uni.lu>, \
+#             George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Kenneth Hoste
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html
+#
+# Version 5.1.4
+# Author: Adam Huffman
+# The Francis Crick Institute
+##
+
+name = 'GROMACS'
+version = '5.1.4'
+versionsuffix = '-mt'
+
+homepage = 'http://www.gromacs.org'
+description = """GROMACS is a versatile package to perform molecular dynamics,
+ i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles."""
+
+toolchain = {'name': 'foss', 'version': '2016b'}
+toolchainopts = {'openmp': True, 'usempi': False}
+
+source_urls = ['ftp://ftp.gromacs.org/pub/gromacs/']
+sources = [SOURCELOWER_TAR_GZ]
+
+builddependencies = [
+    ('CMake', '3.5.2'),
+    ('libxml2', '2.9.4')
+]
+
+dependencies = [('Boost', '1.61.0')]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/GSL/GSL-2.1-intel-2016b.eb b/easybuild/easyconfigs/g/GSL/GSL-2.1-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5018bf16a60f8a8c6436fbe89723847500cb1eee
--- /dev/null
+++ b/easybuild/easyconfigs/g/GSL/GSL-2.1-intel-2016b.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': '2016b'}
+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.2.1-intel-2016a.eb b/easybuild/easyconfigs/g/GSL/GSL-2.2.1-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6708b4036871a33a26c6b6c63d9c33f7de7dcff9
--- /dev/null
+++ b/easybuild/easyconfigs/g/GSL/GSL-2.2.1-intel-2016a.eb
@@ -0,0 +1,19 @@
+easyblock = 'ConfigureMake'
+
+name = 'GSL'
+version = '2.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 = {'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.2.1-intel-2016b.eb b/easybuild/easyconfigs/g/GSL/GSL-2.2.1-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6a638ab6e5bc76977baae3f61860d573f0ea853e
--- /dev/null
+++ b/easybuild/easyconfigs/g/GSL/GSL-2.2.1-intel-2016b.eb
@@ -0,0 +1,19 @@
+easyblock = 'ConfigureMake'
+
+name = 'GSL'
+version = '2.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': '2016b'}
+toolchainopts = {'unroll': True, 'pic': True}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = "--with-pic"
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/g/GST-plugins-base/GST-plugins-base-0.10.36-foss-2016a.eb b/easybuild/easyconfigs/g/GST-plugins-base/GST-plugins-base-0.10.36-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d0bab4473443397afbcaf5a28598814169b8f28b
--- /dev/null
+++ b/easybuild/easyconfigs/g/GST-plugins-base/GST-plugins-base-0.10.36-foss-2016a.eb
@@ -0,0 +1,35 @@
+easyblock = 'ConfigureMake'
+
+name = 'GST-plugins-base'
+version = '0.10.36'
+
+homepage = 'http://gstreamer.freedesktop.org/'
+description = """GStreamer is a library for constructing graphs of media-handling
+ components. The applications it supports range from simple
+ Ogg/Vorbis playback, audio/video streaming to complex audio
+ (mixing) and video (non-linear editing) processing."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://gstreamer.freedesktop.org/src/gst-plugins-base']
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [('GStreamer', '0.10.36')]
+
+# does not work with Bison 3.x
+builddependencies = [
+    ('Bison', '2.7', '', True),
+]
+
+sanity_check_paths = {
+    'files': ['bin/gst-%s-%%(version_major_minor)s' % x for x in ['discoverer', 'visualise']] +
+             ['lib/libgst%s-%%(version_major_minor)s.%s' % (x, SHLIB_EXT) for x in ['app', 'audio', 'video']],
+    'dirs': ['include', 'share']
+}
+
+modextrapaths = {
+    'GI_TYPELIB_PATH': 'share',
+    'XDG_DATA_DIRS': 'share',
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GST-plugins-base/GST-plugins-base-0.10.36-intel-2016b.eb b/easybuild/easyconfigs/g/GST-plugins-base/GST-plugins-base-0.10.36-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..743a59e91a75f2f3bab8542aa585f914ac2fd4de
--- /dev/null
+++ b/easybuild/easyconfigs/g/GST-plugins-base/GST-plugins-base-0.10.36-intel-2016b.eb
@@ -0,0 +1,35 @@
+easyblock = 'ConfigureMake'
+
+name = 'GST-plugins-base'
+version = '0.10.36'
+
+homepage = 'http://gstreamer.freedesktop.org/'
+description = """GStreamer is a library for constructing graphs of media-handling
+ components. The applications it supports range from simple
+ Ogg/Vorbis playback, audio/video streaming to complex audio
+ (mixing) and video (non-linear editing) processing."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['http://gstreamer.freedesktop.org/src/gst-plugins-base']
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [('GStreamer', '0.10.36')]
+
+# does not work with Bison 3.x
+builddependencies = [
+    ('Bison', '2.7', '', True),
+]
+
+sanity_check_paths = {
+    'files': ['bin/gst-%s-%%(version_major_minor)s' % x for x in ['discoverer', 'visualise']] +
+             ['lib/libgst%s-%%(version_major_minor)s.%s' % (x, SHLIB_EXT) for x in ['app', 'audio', 'video']],
+    'dirs': ['include', 'share']
+}
+
+modextrapaths = {
+    'GI_TYPELIB_PATH': 'share',
+    'XDG_DATA_DIRS': 'share',
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GST-plugins-base/GST-plugins-base-1.6.4-foss-2016a.eb b/easybuild/easyconfigs/g/GST-plugins-base/GST-plugins-base-1.6.4-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6d1390515a07aec8efaebd5658224d96f885b2cf
--- /dev/null
+++ b/easybuild/easyconfigs/g/GST-plugins-base/GST-plugins-base-1.6.4-foss-2016a.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMake'
+
+name = 'GST-plugins-base'
+version = '1.6.4'
+
+homepage = 'http://gstreamer.freedesktop.org/'
+description = """GStreamer is a library for constructing graphs of media-handling
+ components. The applications it supports range from simple
+ Ogg/Vorbis playback, audio/video streaming to complex audio
+ (mixing) and video (non-linear editing) processing."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://gstreamer.freedesktop.org/src/gst-plugins-base']
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [('GStreamer', '1.6.4')]
+
+builddependencies = [
+    ('Bison', '3.0.4', '', True),
+]
+
+sanity_check_paths = {
+    'files': ['bin/gst-%s-1.0' % x for x in ['discoverer', 'play']] +
+             ['lib/libgst%s-1.0.%s' % (x, SHLIB_EXT) for x in ['app', 'audio', 'video']],
+    'dirs': ['include', 'share']
+}
+
+modextrapaths = {
+    'GI_TYPELIB_PATH': 'share',
+    'XDG_DATA_DIRS': 'share',
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GST-plugins-base/GST-plugins-base-1.8.3-foss-2016a.eb b/easybuild/easyconfigs/g/GST-plugins-base/GST-plugins-base-1.8.3-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..248204c8cc0594b51c617a604da19ea6c545d7d2
--- /dev/null
+++ b/easybuild/easyconfigs/g/GST-plugins-base/GST-plugins-base-1.8.3-foss-2016a.eb
@@ -0,0 +1,39 @@
+easyblock = 'ConfigureMake'
+
+name = 'GST-plugins-base'
+version = '1.8.3'
+
+homepage = 'http://gstreamer.freedesktop.org/'
+description = """GStreamer is a library for constructing graphs of media-handling
+ components. The applications it supports range from simple
+ Ogg/Vorbis playback, audio/video streaming to complex audio
+ (mixing) and video (non-linear editing) processing."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://gstreamer.freedesktop.org/src/gst-plugins-base']
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [
+    ('GStreamer', '1.8.3'),
+    ('gettext', '0.19.7'),
+]
+
+builddependencies = [
+    ('Autotools', '20150215'),
+    ('pkg-config', '0.29.1'),
+    ('Bison', '3.0.4', '', True),
+]
+
+sanity_check_paths = {
+    'files': ['bin/gst-%s-1.0' % x for x in ['discoverer', 'play', 'device-monitor']] +
+             ['lib/libgst%s-1.0.%s' % (x, SHLIB_EXT) for x in ['app', 'audio', 'video']],
+    'dirs': ['include', 'share']
+}
+
+modextrapaths = {
+    'GI_TYPELIB_PATH': 'share',
+    'XDG_DATA_DIRS': 'share',
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GStreamer/GStreamer-0.10.36-foss-2016a.eb b/easybuild/easyconfigs/g/GStreamer/GStreamer-0.10.36-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3dddb7ed206ed02efd2b6dc7f01f99bcd27320f7
--- /dev/null
+++ b/easybuild/easyconfigs/g/GStreamer/GStreamer-0.10.36-foss-2016a.eb
@@ -0,0 +1,40 @@
+easyblock = 'ConfigureMake'
+
+name = 'GStreamer'
+version = '0.10.36'
+
+homepage = 'http://gstreamer.freedesktop.org/'
+description = """GStreamer is a library for constructing graphs of media-handling
+ components. The applications it supports range from simple
+ Ogg/Vorbis playback, audio/video streaming to complex audio
+ (mixing) and video (non-linear editing) processing."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://gstreamer.freedesktop.org/src/gstreamer']
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [
+    ('GLib', '2.48.0'),
+    ('GObject-Introspection', '1.48.0'),
+    ('zlib', '1.2.8'),
+]
+
+# does not work with Bison 3.x
+builddependencies = [
+    ('Bison', '2.7', '', True),
+]
+
+sanity_check_paths = {
+    'files': ['bin/gst-%s-%%(version_major_minor)s' % x for x in ['inspect', 'typefind', 'launch']] +
+             ['lib/libgst%s-%%(version_major_minor)s.%s' % (x, SHLIB_EXT) for x in ['reamer', 'base',
+                                                                                    'controller', 'check']],
+    'dirs': ['include', 'share', 'libexec'],
+}
+
+modextrapaths = {
+    'GI_TYPELIB_PATH': 'share',
+    'XDG_DATA_DIRS': 'share',
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GStreamer/GStreamer-0.10.36-intel-2016b.eb b/easybuild/easyconfigs/g/GStreamer/GStreamer-0.10.36-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a0214562e2fb427d1f49102f40d9baa59a0b0d93
--- /dev/null
+++ b/easybuild/easyconfigs/g/GStreamer/GStreamer-0.10.36-intel-2016b.eb
@@ -0,0 +1,40 @@
+easyblock = 'ConfigureMake'
+
+name = 'GStreamer'
+version = '0.10.36'
+
+homepage = 'http://gstreamer.freedesktop.org/'
+description = """GStreamer is a library for constructing graphs of media-handling
+ components. The applications it supports range from simple
+ Ogg/Vorbis playback, audio/video streaming to complex audio
+ (mixing) and video (non-linear editing) processing."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['http://gstreamer.freedesktop.org/src/gstreamer']
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [
+    ('GLib', '2.49.5'),
+    ('GObject-Introspection', '1.49.1'),
+    ('zlib', '1.2.8'),
+]
+
+# does not work with Bison 3.x
+builddependencies = [
+    ('Bison', '2.7', '', True),
+]
+
+sanity_check_paths = {
+    'files': ['bin/gst-%s-%%(version_major_minor)s' % x for x in ['inspect', 'typefind', 'launch']] +
+             ['lib/libgst%s-%%(version_major_minor)s.%s' % (x, SHLIB_EXT) for x in ['reamer', 'base',
+                                                                                    'controller', 'check']],
+    'dirs': ['include', 'share', 'libexec'],
+}
+
+modextrapaths = {
+    'GI_TYPELIB_PATH': 'share',
+    'XDG_DATA_DIRS': 'share',
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GStreamer/GStreamer-1.6.4-foss-2016a.eb b/easybuild/easyconfigs/g/GStreamer/GStreamer-1.6.4-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..05dfd4ddef23d01518146e3cd8b0b7622d7973d9
--- /dev/null
+++ b/easybuild/easyconfigs/g/GStreamer/GStreamer-1.6.4-foss-2016a.eb
@@ -0,0 +1,39 @@
+easyblock = 'ConfigureMake'
+
+name = 'GStreamer'
+version = '1.6.4'
+
+homepage = 'http://gstreamer.freedesktop.org/'
+description = """GStreamer is a library for constructing graphs of media-handling
+ components. The applications it supports range from simple
+ Ogg/Vorbis playback, audio/video streaming to complex audio
+ (mixing) and video (non-linear editing) processing."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://gstreamer.freedesktop.org/src/gstreamer']
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [
+    ('GLib', '2.48.0'),
+    ('GObject-Introspection', '1.48.0'),
+    ('zlib', '1.2.8'),
+]
+
+builddependencies = [
+    ('Bison', '3.0.4', '', True),
+]
+
+sanity_check_paths = {
+    'files': ['bin/gst-%s-1.0' % x for x in ['inspect', 'typefind', 'launch']] +
+             ['lib/libgst%s-1.0.%s' % (x, SHLIB_EXT) for x in ['reamer', 'base',
+              'controller', 'check']],
+    'dirs': ['include', 'share', 'libexec'],
+}
+
+modextrapaths = {
+    'GI_TYPELIB_PATH': 'share',
+    'XDG_DATA_DIRS': 'share',
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GStreamer/GStreamer-1.8.3-foss-2016a.eb b/easybuild/easyconfigs/g/GStreamer/GStreamer-1.8.3-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..191ac5221649a1be847135f102bee276c095ad96
--- /dev/null
+++ b/easybuild/easyconfigs/g/GStreamer/GStreamer-1.8.3-foss-2016a.eb
@@ -0,0 +1,37 @@
+easyblock = 'ConfigureMake'
+
+name = 'GStreamer'
+version = '1.8.3'
+
+homepage = 'http://gstreamer.freedesktop.org/'
+description = """GStreamer is a library for constructing graphs of media-handling
+ components. The applications it supports range from simple
+ Ogg/Vorbis playback, audio/video streaming to complex audio
+ (mixing) and video (non-linear editing) processing."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://gstreamer.freedesktop.org/src/gstreamer']
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [
+    ('GLib', '2.48.0'),
+    ('GObject-Introspection', '1.48.0'),
+    ('zlib', '1.2.8'),
+]
+
+builddependencies = [
+    ('Bison', '3.0.4'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['include', 'share', 'libexec'],
+}
+
+modextrapaths = {
+    'GI_TYPELIB_PATH': 'share',
+    'XDG_DATA_DIRS': 'share',
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GTI/GTI-1.2.0-goolf-1.5.14.eb b/easybuild/easyconfigs/g/GTI/GTI-1.2.0-goolf-1.5.14.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d2f8ea38ad71b473812f242533750c0df1ce58eb
--- /dev/null
+++ b/easybuild/easyconfigs/g/GTI/GTI-1.2.0-goolf-1.5.14.eb
@@ -0,0 +1,38 @@
+# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild
+# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany
+# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
+# License::   New BSD
+#
+# This work is based from experiences from the UNITE project
+# http://apps.fz-juelich.de/unite/
+##
+easyblock = 'CMakeMake'
+
+name = 'GTI'
+version = '1.2.0'
+
+homepage = 'http://www.tu-dresden.de/zih/must/'
+description = """A Generic Tools Infrastructure for Event-Based Tools in Parallel Systems."""
+
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
+toolchainopts = {'usempi': True}
+
+# http://tu-dresden.de/die_tu_dresden/zentrale_einrichtungen/zih/forschung/projekte/must/files/gti-release-1.2.0.tar.gz
+source_urls = ['http://tu-dresden.de/die_tu_dresden/zentrale_einrichtungen/zih/forschung/projekte/must/files/']
+sources = ['%(namelower)s-release-%(version)s.tar.gz']
+
+patches = ['GTI-%(version)s-missing-unistd.patch']
+
+dependencies = [('PnMPI', '1.2.0')]
+
+builddependencies = [('CMake', '3.0.2')]
+
+configopts = '-DCMAKE_BUILD_TYPE=Release -DPnMPI_INSTALL_PREFIX=${EBROOTPNMPI}'
+buildopts = 'CXXFLAGS="$CXXFLAGS -fpermissive"'
+
+sanity_check_paths = {
+    'files': ["bin/weaver", "include/I_Profiler.h"],
+    'dirs': [],
+}
+
+moduleclass = 'perf'
diff --git a/easybuild/easyconfigs/g/GTK+/GTK+-2.24.30-foss-2016a.eb b/easybuild/easyconfigs/g/GTK+/GTK+-2.24.30-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f8cd4f7bed72370ade3d0d83a7ba78d3bc8b51fd
--- /dev/null
+++ b/easybuild/easyconfigs/g/GTK+/GTK+-2.24.30-foss-2016a.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'GTK+'
+version = '2.24.30'
+
+homepage = 'https://developer.gnome.org/gtk+/stable/'
+description = """
+ The GTK+ 2 package contains libraries used for creating graphical user interfaces for applications.
+"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [FTPGNOME_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [
+    ('ATK', '2.20.0'),
+    ('Gdk-Pixbuf', '2.35.1'),
+    ('Pango', '1.40.1'),
+    ('GObject-Introspection', '1.48.0'),
+]
+
+configopts = "--disable-silent-rules --disable-glibtest --enable-introspection=yes --disable-visibility "
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GTK+/GTK+-2.24.31-intel-2016b.eb b/easybuild/easyconfigs/g/GTK+/GTK+-2.24.31-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..78f4ad00b7ac2afd97659e7d57ae944b75bbdbef
--- /dev/null
+++ b/easybuild/easyconfigs/g/GTK+/GTK+-2.24.31-intel-2016b.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'GTK+'
+version = '2.24.31'
+
+homepage = 'https://developer.gnome.org/gtk+/stable/'
+description = """
+ The GTK+ 2 package contains libraries used for creating graphical user interfaces for applications.
+"""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = [FTPGNOME_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [
+    ('ATK', '2.22.0'),
+    ('Gdk-Pixbuf', '2.36.0'),
+    ('Pango', '1.40.3'),
+    ('GObject-Introspection', '1.49.1'),
+]
+
+configopts = "--disable-silent-rules --disable-glibtest --enable-introspection=yes --disable-visibility "
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GTS/GTS-0.7.6-intel-2016b.eb b/easybuild/easyconfigs/g/GTS/GTS-0.7.6-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..53f710cecee47179cc8c87293f2e693286a9f3c3
--- /dev/null
+++ b/easybuild/easyconfigs/g/GTS/GTS-0.7.6-intel-2016b.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'GTS'
+version = '0.7.6'
+
+homepage = 'http://gts.sourceforge.net/'
+description = """GTS stands for the GNU Triangulated Surface Library.
+ It is an Open Source Free Software Library intended to provide a set of useful
+ functions to deal with 3D surfaces meshed with interconnected triangles."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('GLib', '2.49.5'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libgts.%s' % SHLIB_EXT, 'bin/gts2oogl', 'bin/gtscheck'],
+    'dirs': []
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.35.1-foss-2016a.eb b/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.35.1-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3f2a2533d67c49c8cc34f119dac2050b1ee0e5c1
--- /dev/null
+++ b/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.35.1-foss-2016a.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMake'
+
+name = 'Gdk-Pixbuf'
+version = '2.35.1'
+
+homepage = 'https://developer.gnome.org/gdk-pixbuf/stable/'
+description = """
+ The Gdk Pixbuf is a toolkit for image loading and pixel buffer manipulation.
+ It is used by GTK+ 2 and GTK+ 3 to load and manipulate images. In the past it
+ was distributed as part of GTK+ 2 but it was split off into a separate package
+ in preparation for the change to GTK+ 3.
+"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [FTPGNOME_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [
+    ('GLib', '2.48.0'),
+    ('libjpeg-turbo', '1.4.2', '-NASM-2.12.01'),
+    ('libpng', '1.6.21'),
+    ('LibTIFF', '4.0.6'),
+    ('GObject-Introspection', '1.48.0')
+]
+
+configopts = "--disable-maintainer-mode --enable-debug=no --enable-introspection=yes "
+configopts += "--disable-Bsymbolic --without-gdiplus --enable-shared --enable-static"
+
+modextrapaths = {
+    'XDG_DATA_DIRS': 'share',
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.36.0-intel-2016b.eb b/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.36.0-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4d84597d6248003715a7297a91e51eb831cea5b1
--- /dev/null
+++ b/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.36.0-intel-2016b.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMake'
+
+name = 'Gdk-Pixbuf'
+version = '2.36.0'
+
+homepage = 'https://developer.gnome.org/gdk-pixbuf/stable/'
+description = """
+ The Gdk Pixbuf is a toolkit for image loading and pixel buffer manipulation.
+ It is used by GTK+ 2 and GTK+ 3 to load and manipulate images. In the past it
+ was distributed as part of GTK+ 2 but it was split off into a separate package
+ in preparation for the change to GTK+ 3.
+"""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = [FTPGNOME_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [
+    ('GLib', '2.49.5'),
+    ('libjpeg-turbo', '1.5.0'),
+    ('libpng', '1.6.24'),
+    ('LibTIFF', '4.0.6'),
+    ('GObject-Introspection', '1.49.1')
+]
+
+configopts = "--disable-maintainer-mode --enable-debug=no --enable-introspection=yes "
+configopts += "--disable-Bsymbolic --without-gdiplus --enable-shared --enable-static"
+
+modextrapaths = {
+    'XDG_DATA_DIRS': 'share',
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/Ghostscript/Ghostscript-9.19-intel-2016b.eb b/easybuild/easyconfigs/g/Ghostscript/Ghostscript-9.19-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8612f2848b8bc1e62a5dc53b6ea654e2da393205
--- /dev/null
+++ b/easybuild/easyconfigs/g/Ghostscript/Ghostscript-9.19-intel-2016b.eb
@@ -0,0 +1,29 @@
+easyblock = 'ConfigureMake'
+
+name = 'Ghostscript'
+version = '9.19'
+
+homepage = 'http://ghostscript.com'
+description = """Ghostscript is a versatile processor for PostScript data with the ability to render PostScript to
+ different targets. It used to be part of the cups printing stack, but is no longer used for that."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+toolchainopts = {'pic': True}
+
+source_urls = ["https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs%(version_major)s%(version_minor)s/"]
+sources = ["ghostpdl-%(version)s.tar.bz2"]
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('libpng', '1.6.24'),
+    ('freetype', '2.6.5'),
+    ('libjpeg-turbo', '1.5.0'),
+    ('expat', '2.2.0'),
+    ('GLib', '2.49.5'),
+    ('cairo', '1.14.6'),
+    ('LibTIFF', '4.0.6'),
+]
+
+configopts = "--with-system-libtiff --enable-dynamic"
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/g/GraphicsMagick/GraphicsMagick-1.3.25-intel-2016b.eb b/easybuild/easyconfigs/g/GraphicsMagick/GraphicsMagick-1.3.25-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..20888d4d8732e09c3cee1987e8a7e3bb8d583fdb
--- /dev/null
+++ b/easybuild/easyconfigs/g/GraphicsMagick/GraphicsMagick-1.3.25-intel-2016b.eb
@@ -0,0 +1,39 @@
+easyblock = 'ConfigureMake'
+
+name = 'GraphicsMagick'
+version = '1.3.25'
+
+homepage = 'http://www.graphicsmagick.org/'
+description = """GraphicsMagick is the swiss army knife of image processing."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+toolchainopts = {'pic': True}
+
+source_urls = [
+    SOURCEFORGE_SOURCE,
+    'ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/%(version_major_minor)s/',
+]
+sources = [SOURCE_TAR_GZ]
+
+patches = ['%(name)s-%(version)s_intel.patch']
+
+builddependencies = [
+    ('libtool', '2.4.6'),
+]
+
+dependencies = [
+    ('X11', '20160819'),
+    ('bzip2', '1.0.6'),
+    ('freetype', '2.6.5'),
+    ('libpng', '1.6.24'),
+    ('libjpeg-turbo', '1.5.0'),
+    ('LibTIFF', '4.0.6'),
+    ('libxml2', '2.9.4'),
+    ('XZ', '5.2.2'),
+    ('zlib', '1.2.8'),
+    ('Ghostscript', '9.19'),
+]
+
+modextrapaths = {'CPATH': ['include/GraphicsMagick']}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GraphicsMagick/GraphicsMagick-1.3.25_intel.patch b/easybuild/easyconfigs/g/GraphicsMagick/GraphicsMagick-1.3.25_intel.patch
new file mode 100644
index 0000000000000000000000000000000000000000..1b8082e74b5f2fb80f90aed4db3bc95e0ed8df93
--- /dev/null
+++ b/easybuild/easyconfigs/g/GraphicsMagick/GraphicsMagick-1.3.25_intel.patch
@@ -0,0 +1,13 @@
+#Intel compiler does not understand __has_attribute(attribute
+# Oct 24th 2016 by B. Hajgato (Free University Brussels - VUB)
+--- GraphicsMagick-1.3.25/magick/common.h.orig	2016-09-05 21:20:24.000000000 +0200
++++ GraphicsMagick-1.3.25/magick/common.h	2016-10-24 15:03:21.858939448 +0200
+@@ -128,7 +128,7 @@
+ #    define MAGICK_ATTRIBUTE(x) /*nothing*/
+ #  else
+ #    define MAGICK_ATTRIBUTE(x) __attribute__(x)
+-#    if (defined(__clang__) || (defined(__GNUC__) && __GNUC__ >= 5))
++#    if (defined(__clang__) || ((defined(__GNUC__) && __GNUC__ >= 5) && !__INTEL_COMPILER))
+ #      define MAGICK_HAS_ATTRIBUTE(attribute) __has_attribute(attribute)
+ #    else
+ #      define MAGICK_HAS_ATTRIBUTE(attribute) (0)
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 aee7aa31e0d8e0d995475d8ef5b924ed7d4fe7e0..4634a7fb1a95a1f8a07e89db604c85fe00ef9d6a 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
@@ -46,6 +46,7 @@ patches = [
     'Graphviz-2.38.0_icc_sfio.patch',
 ]
 
+preconfigopts = "sed -i 's/install-data-hook$//g' tclpkg/Makefile.in && "
 configopts = '--enable-guile=no --enable-lua=no --enable-ocaml=no '
 configopts += '--enable-r=no --enable-ruby=no '
 
@@ -54,9 +55,14 @@ prebuildopts = 'qmake -o cmd/gvedit/qMakefile cmd/gvedit/gvedit.pro && '
 sanity_check_paths = {
     'files': ['bin/cluster', 'bin/dot', 'bin/gvmap',
               'lib/libcdt.%s' % SHLIB_EXT, 'lib/libgvc.%s' % SHLIB_EXT, 'lib/libxdot.%s' % SHLIB_EXT],
-    'dirs': ['include']
+    'dirs': ['include', 'lib/graphviz']
 }
 
+sanity_check_commands = [
+    ("test ! -d $EBROOTTCL/lib/*/graphviz", ''),
+    ("test ! -d $EBROOTTCL/lib64/*/graphviz", ''),
+]
+
 modextrapaths = {
     'PYTHONPATH': 'lib/graphviz/python',
     'CLASSPATH': 'lib/graphviz/java/org/graphviz',
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 231a5ddb6f76d9f2472c91c66f44d92e3f71e009..c9fd0d8f277a8411f055171586b80acdaa6af7dc 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
@@ -48,6 +48,7 @@ patches = [
     'Graphviz-2.38.0_icc_sfio.patch',
 ]
 
+preconfigopts = "sed -i 's/install-data-hook$//g' tclpkg/Makefile.in && "
 configopts = '--enable-guile=no --enable-lua=no --enable-ocaml=no '
 configopts += '--enable-r=no --enable-ruby=no '
 
@@ -56,9 +57,14 @@ prebuildopts = 'qmake -o cmd/gvedit/qMakefile cmd/gvedit/gvedit.pro && '
 sanity_check_paths = {
     'files': ['bin/cluster', 'bin/dot', 'bin/gvmap',
               'lib/libcdt.%s' % SHLIB_EXT, 'lib/libgvc.%s' % SHLIB_EXT, 'lib/libxdot.%s' % SHLIB_EXT],
-    'dirs': ['include']
+    'dirs': ['include', 'lib/graphviz']
 }
 
+sanity_check_commands = [
+    ("test ! -d $EBROOTTCL/lib/*/graphviz", ''),
+    ("test ! -d $EBROOTTCL/lib64/*/graphviz", ''),
+]
+
 modextrapaths = {
     'PYTHONPATH': 'lib/graphviz/python',
     'CLASSPATH': 'lib/graphviz/java/org/graphviz',
diff --git a/easybuild/easyconfigs/g/Guile/Guile-1.8.8-intel-2016b.eb b/easybuild/easyconfigs/g/Guile/Guile-1.8.8-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1be1335f08ba4f6c9d72d889df136f98d6420401
--- /dev/null
+++ b/easybuild/easyconfigs/g/Guile/Guile-1.8.8-intel-2016b.eb
@@ -0,0 +1,32 @@
+easyblock = 'ConfigureMake'
+
+name = 'Guile'
+version = '1.8.8'
+
+homepage = 'http://www.gnu.org/software/guile'
+description = """Guile is the GNU Ubiquitous Intelligent Language for Extensions,
+ the official extension language for the GNU operating system."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+dependencies = [
+    ('libtool', '2.4.6'),
+    ('GMP', '6.1.1'),
+    ('libunistring', '0.9.6'),
+    ('pkg-config', '0.29.1'),
+    ('libffi', '3.2.1'),
+    ('libreadline', '6.3'),
+]
+
+configopts = " --enable-error-on-warning=no"
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ["guile", 'guile-config', 'guile-snarf', 'guile-tools']] +
+             ["lib/libguile.a", "include/libguile.h"],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/g/gcccuda/gcccuda-2016.10.0.eb b/easybuild/easyconfigs/g/gcccuda/gcccuda-2016.10.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3d0ba0c9cfa612695fb8b9c123a9e93d613d8f2f
--- /dev/null
+++ b/easybuild/easyconfigs/g/gcccuda/gcccuda-2016.10.0.eb
@@ -0,0 +1,21 @@
+easyblock = "Toolchain"
+
+name = 'gcccuda'
+version = '2016.10.0'
+
+homepage = '(none)'
+description = """GNU Compiler Collection (GCC) based compiler toolchain, along with CUDA toolkit."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+comp_name = 'GCC'
+comp_ver = '5.4.0-2.26'
+comp = (comp_name, comp_ver)
+
+# compiler toolchain dependencies
+dependencies = [
+    comp,
+    ('CUDA', '8.0.44', '', comp),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/g/gdc-client/gdc-client-1.0.1-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/g/gdc-client/gdc-client-1.0.1-intel-2016b-Python-2.7.12.eb
index 12d6cdfceaea57fdd99a36ab5d4d26659cd6b934..8bbf7589b7cdedb3bc6bf68999e63485bac2e150 100644
--- a/easybuild/easyconfigs/g/gdc-client/gdc-client-1.0.1-intel-2016b-Python-2.7.12.eb
+++ b/easybuild/easyconfigs/g/gdc-client/gdc-client-1.0.1-intel-2016b-Python-2.7.12.eb
@@ -10,9 +10,6 @@ description = """The gdc-client provides several convenience functions over the
 
 toolchain = {'name': 'intel', 'version': '2016b'}
 
-source_urls = ['https://github.com/NCI-GDC/gdc-client/archive/']
-sources = ['v%(version)s.tar.gz']
-
 # this is a bundle of Python packages
 exts_defaultclass = 'PythonPackage'
 
diff --git a/easybuild/easyconfigs/g/gensim/gensim-0.13.2-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/g/gensim/gensim-0.13.2-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..991e6da6fa638df04d53a8dd92704859848cfbe1
--- /dev/null
+++ b/easybuild/easyconfigs/g/gensim/gensim-0.13.2-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,49 @@
+easyblock = 'Bundle'
+
+name = 'gensim'
+version = '0.13.2'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://pypi.python.org/pypi/gensim'
+description = """Gensim is a Python library for topic modelling, document indexing and similarity retrieval with
+ large corpora."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+# this is a bundle of Python packages
+exts_defaultclass = 'PythonPackage'
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('requests', '2.10.0', '-Python-%(pyver)s'),
+]
+
+exts_list = [
+    ('boto', '2.42.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/b/%(name)s'],
+        'source_tmpl': '%(name)s-%(version)s.tar.gz',
+    }),
+    ('bz2file', '0.98', {
+        'source_urls': ['https://pypi.python.org/packages/source/b/%(name)s'],
+        'source_tmpl': '%(name)s-%(version)s.tar.gz',
+    }),
+    ('smart_open', '1.3.4', {
+        'source_urls': ['https://pypi.python.org/packages/source/s/%(name)s'],
+        'source_tmpl': '%(name)s-%(version)s.tar.gz',
+    }),
+    (name, version, {
+        'source_urls': ['https://pypi.python.org/packages/source/g/%(name)s'],
+    }),
+]
+
+# 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': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
+
+moduleclass = 'lib'
\ No newline at end of file
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..68b4d25ce93c13c77ac16c7e2d6e7ec7fb960f81
--- /dev/null
+++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'gettext'
+version = '0.18.2'
+
+homepage = 'http://www.gnu.org/software/gettext/'
+description = """GNU `gettext' is an important step for the GNU Translation Project, as it is an asset on which we may
+build many other steps. This package offers to programmers, translators, and even users, a well integrated set of tools
+and documentation"""
+
+# This is a basic stripped down version of gettext without any
+# dependencies on other packages used as initial builddep for XZ
+# It is the first step in the cyclic dependency chain of
+# XZ -> libxml2 -> gettext -> XZ
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+configopts = '--without-emacs --with-included-libxml --without-xz --without-bzip2'
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.19.4.eb b/easybuild/easyconfigs/g/gettext/gettext-0.19.4.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ed81b95755a6bd661789a3d4b8c9c1677cf5cac1
--- /dev/null
+++ b/easybuild/easyconfigs/g/gettext/gettext-0.19.4.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'gettext'
+version = '0.19.4'
+
+homepage = 'http://www.gnu.org/software/gettext/'
+description = """GNU `gettext' is an important step for the GNU Translation Project, as it is an asset on which we may
+build many other steps. This package offers to programmers, translators, and even users, a well integrated set of tools
+and documentation"""
+
+# This is a basic stripped down version of gettext without any
+# dependencies on other packages used as initial builddep for XZ
+# It is the first step in the cyclic dependency chain of
+# XZ -> libxml2 -> gettext -> XZ
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+configopts = '--without-emacs --with-included-libxml --without-xz --without-bzip2'
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.19.6.eb b/easybuild/easyconfigs/g/gettext/gettext-0.19.6.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ce355420b29f29b3cfcfc413c7426256fcaea34d
--- /dev/null
+++ b/easybuild/easyconfigs/g/gettext/gettext-0.19.6.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'gettext'
+version = '0.19.6'
+
+homepage = 'http://www.gnu.org/software/gettext/'
+description = """GNU `gettext' is an important step for the GNU Translation Project, as it is an asset on which we may
+build many other steps. This package offers to programmers, translators, and even users, a well integrated set of tools
+and documentation"""
+
+# This is a basic stripped down version of gettext without any
+# dependencies on other packages used as initial builddep for XZ
+# It is the first step in the cyclic dependency chain of
+# XZ -> libxml2 -> gettext -> XZ
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+configopts = '--without-emacs --with-included-libxml --without-xz --without-bzip2'
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.19.7.eb b/easybuild/easyconfigs/g/gettext/gettext-0.19.7.eb
new file mode 100644
index 0000000000000000000000000000000000000000..578b07b38d3251d0eb20e2cfa52bd80ec2fe0a1f
--- /dev/null
+++ b/easybuild/easyconfigs/g/gettext/gettext-0.19.7.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'gettext'
+version = '0.19.7'
+
+homepage = 'http://www.gnu.org/software/gettext/'
+description = """GNU `gettext' is an important step for the GNU Translation Project, as it is an asset on which we may
+build many other steps. This package offers to programmers, translators, and even users, a well integrated set of tools
+and documentation"""
+
+# This is a basic stripped down version of gettext without any
+# dependencies on other packages used as initial builddep for XZ
+# It is the first step in the cyclic dependency chain of
+# XZ -> libxml2 -> gettext -> XZ
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+dependencies = [('ncurses', '6.0')]
+
+configopts = '--without-emacs --with-included-libxml --without-xz --without-bzip2'
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.19.8-GCCcore-4.9.3.eb b/easybuild/easyconfigs/g/gettext/gettext-0.19.8-GCCcore-4.9.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8e1b03ad2a1a31dd1f68eecf691a1562e36b520e
--- /dev/null
+++ b/easybuild/easyconfigs/g/gettext/gettext-0.19.8-GCCcore-4.9.3.eb
@@ -0,0 +1,27 @@
+easyblock = 'ConfigureMake'
+
+name = 'gettext'
+version = '0.19.8'
+
+homepage = 'http://www.gnu.org/software/gettext/'
+description = """GNU `gettext' is an important step for the GNU Translation Project, as it is an asset on which we may
+build many other steps. This package offers to programmers, translators, and even users, a well integrated set of tools
+and documentation"""
+
+toolchain = {'name': 'GCCcore', 'version': '4.9.3'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+builddependencies = [
+    ('binutils', '2.25'),
+]
+
+dependencies = [
+    ('libxml2', '2.9.4'),
+    ('ncurses', '6.0'),
+]
+
+configopts = '--without-emacs --with-libxml2-prefix=$EBROOTLIBXML2'
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.19.8-foss-2016.04.eb b/easybuild/easyconfigs/g/gettext/gettext-0.19.8-foss-2016.04.eb
new file mode 100644
index 0000000000000000000000000000000000000000..47b250264e4c3f0317e6231c0347043a8fac0904
--- /dev/null
+++ b/easybuild/easyconfigs/g/gettext/gettext-0.19.8-foss-2016.04.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'gettext'
+version = '0.19.8'
+
+homepage = 'http://www.gnu.org/software/gettext/'
+description = """GNU `gettext' is an important step for the GNU Translation Project, as it is an asset on which we may
+build many other steps. This package offers to programmers, translators, and even users, a well integrated set of tools
+and documentation"""
+
+toolchain = {'name': 'foss', 'version': '2016.04'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+dependencies = [
+    ('libxml2', '2.9.4'),
+    ('ncurses', '6.0'),
+]
+
+configopts = '--without-emacs --with-libxml2-prefix=$EBROOTLIBXML2'
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.19.8.eb b/easybuild/easyconfigs/g/gettext/gettext-0.19.8.eb
new file mode 100644
index 0000000000000000000000000000000000000000..45caa1fde85d1e18b31d28b2386916b21e0fb853
--- /dev/null
+++ b/easybuild/easyconfigs/g/gettext/gettext-0.19.8.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'gettext'
+version = '0.19.8'
+
+homepage = 'http://www.gnu.org/software/gettext/'
+description = """GNU `gettext' is an important step for the GNU Translation Project, as it is an asset on which we may
+build many other steps. This package offers to programmers, translators, and even users, a well integrated set of tools
+and documentation"""
+
+# This is a basic stripped down version of gettext without any
+# dependencies on other packages used as initial builddep for XZ
+# It is the first step in the cyclic dependency chain of
+# XZ -> libxml2 -> gettext -> XZ
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+dependencies = [('ncurses', '6.0')]
+
+configopts = '--without-emacs --with-included-libxml --without-xz --without-bzip2'
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/gnuplot/gnuplot-5.0.5-intel-2016b.eb b/easybuild/easyconfigs/g/gnuplot/gnuplot-5.0.5-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1181859b405511603a9318d59c967ef0f0ef2d6f
--- /dev/null
+++ b/easybuild/easyconfigs/g/gnuplot/gnuplot-5.0.5-intel-2016b.eb
@@ -0,0 +1,42 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine
+# Authors::   Fotis Georgatos <fotis.georgatos@uni.lu>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-97.html
+##
+easyblock = 'ConfigureMake'
+
+name = 'gnuplot'
+version = '5.0.5'
+
+homepage = 'http://gnuplot.sourceforge.net/'
+description = """Portable interactive, function plotting utility"""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [('http://sourceforge.net/projects/gnuplot/files', 'download')]
+
+dependencies = [
+    ('cairo', '1.14.6'),
+    ('libjpeg-turbo', '1.5.0'),
+    ('libpng', '1.6.24'),
+    ('libgd', '2.2.3'),
+    ('Pango', '1.40.3'),
+    ('libcerf', '1.5'),
+    ('Qt', '4.8.7'),
+]
+
+configopts = '--with-qt=qt4 '
+
+sanity_check_paths = {
+    'files': ['bin/gnuplot'],
+    'dirs': []
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/gompi/gompi-2016.07.eb b/easybuild/easyconfigs/g/gompi/gompi-2016.07.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5eca4152c8a45e53da71501d0f648b277ce85fdf
--- /dev/null
+++ b/easybuild/easyconfigs/g/gompi/gompi-2016.07.eb
@@ -0,0 +1,22 @@
+easyblock = "Toolchain"
+
+name = 'gompi'
+version = '2016.07'
+
+homepage = '(none)'
+description = """GNU Compiler Collection (GCC) based compiler toolchain,
+including OpenMPI for MPI support."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+gccver = '6.1.0'
+binutilsver = '2.27'
+gccbinver = '%s-%s' % (gccver, binutilsver)
+
+# compiler toolchain dependencies
+dependencies = [
+   ('GCC', gccbinver),  # includes both GCC and binutils
+   ('OpenMPI', '1.10.3', '', ('GCC', gccbinver)),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/g/gompi/gompi-2016.09.eb b/easybuild/easyconfigs/g/gompi/gompi-2016.09.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b4350de73ad72da9ac3456b0a0226cc696bca269
--- /dev/null
+++ b/easybuild/easyconfigs/g/gompi/gompi-2016.09.eb
@@ -0,0 +1,20 @@
+easyblock = "Toolchain" 
+
+name = 'gompi' 
+version = '2016.09' 
+ 
+homepage = '(none)' 
+description = """GNU Compiler Collection (GCC) based compiler toolchain, 
+including OpenMPI for MPI support.""" 
+ 
+toolchain = {'name': 'dummy', 'version': 'dummy'} 
+ 
+gccver = '6.2.0-2.27' 
+ 
+# compiler toolchain dependencies 
+dependencies = [ 
+   ('GCC', gccver),  # includes both GCC and binutils 
+   ('OpenMPI', '2.0.1', '', ('GCC', gccver)), 
+] 
+ 
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/g/gompic/gompic-2016.10.0.eb b/easybuild/easyconfigs/g/gompic/gompic-2016.10.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b0c994f8de23082f3dea59fdacc504914fdf9ffe
--- /dev/null
+++ b/easybuild/easyconfigs/g/gompic/gompic-2016.10.0.eb
@@ -0,0 +1,23 @@
+easyblock = "Toolchain"
+
+name = 'gompic'
+version = '2016.10.0'
+
+homepage = '(none)'
+description = """GNU Compiler Collection (GCC) based compiler toolchain along with CUDA toolkit,
+ including OpenMPI for MPI support with CUDA features enabled."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+comp_name = 'GCC'
+comp_ver = '5.4.0-2.26'
+comp = (comp_name, comp_ver)
+
+# compiler toolchain dependencies
+dependencies = [
+    comp,  # part of gcccuda
+    ('CUDA', '8.0.44', '', comp),  # part of gcccuda
+    ('OpenMPI', '2.0.1', '', ('gcccuda', version)),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/g/goolfc/goolfc-2016.10.0.eb b/easybuild/easyconfigs/g/goolfc/goolfc-2016.10.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6fd9d7c78beaf8cf8276f9766ace09ac449f969d
--- /dev/null
+++ b/easybuild/easyconfigs/g/goolfc/goolfc-2016.10.0.eb
@@ -0,0 +1,38 @@
+easyblock = "Toolchain"
+
+name = 'goolfc'
+version = '2016.10.0'
+
+homepage = '(none)'
+description = """GCC based compiler toolchain __with CUDA support__, and including
+ OpenMPI for MPI support, OpenBLAS (BLAS and LAPACK support), FFTW and ScaLAPACK."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+comp_name = 'GCC'
+comp_ver = '5.4.0-2.26'
+comp = (comp_name, comp_ver)
+
+# toolchain used to build goolfc dependencies
+comp_mpi_tc_name = 'gompic'
+comp_mpi_tc_ver = version
+comp_mpi_tc = (comp_mpi_tc_name, comp_mpi_tc_ver)
+
+blaslib = 'OpenBLAS'
+blasver = '0.2.19'
+blassuff = '-LAPACK-3.6.1'
+blas = '-%s-%s%s' % (blaslib, blasver, blassuff)
+
+# compiler toolchain dependencies
+# we need GCC and OpenMPI as explicit dependencies instead of gompi toolchain
+# because of toolchain preperation functions
+dependencies = [
+    comp,  # part of gompic
+    ('CUDA', '8.0.44', '', comp),  # part of gompic
+    ('OpenMPI', '2.0.1', '', ('gcccuda', version)),  # part of gompic
+    (blaslib, blasver, blassuff, comp_mpi_tc),
+    ('FFTW', '3.3.5', '', comp_mpi_tc),
+    ('ScaLAPACK', '2.0.2', blas, comp_mpi_tc),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/g/gperf/gperf-3.0.4-GCCcore-4.9.3.eb b/easybuild/easyconfigs/g/gperf/gperf-3.0.4-GCCcore-4.9.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b01284c10608f12903a188ce89ca29e873b0a83b
--- /dev/null
+++ b/easybuild/easyconfigs/g/gperf/gperf-3.0.4-GCCcore-4.9.3.eb
@@ -0,0 +1,26 @@
+easyblock = 'ConfigureMake'
+
+name = 'gperf'
+version = '3.0.4'
+
+homepage = 'http://www.gnu.org/software/gperf/'
+description = """GNU gperf is a perfect hash function generator. For a given list of strings, it produces a hash
+ function and hash table, in form of C or C++ code, for looking up a value depending on the input string. The hash
+ function is perfect, which means that the hash table has no collisions, and the hash table lookup needs a single
+ string comparison only."""
+
+toolchain = {'name': 'GCCcore', 'version': '4.9.3'}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+builddependencies = [
+    ('binutils', '2.25'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/gperf'],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/g/gperf/gperf-3.0.4-intel-2016b.eb b/easybuild/easyconfigs/g/gperf/gperf-3.0.4-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4ada07243f898b60493dadc6813792c086fa5eaf
--- /dev/null
+++ b/easybuild/easyconfigs/g/gperf/gperf-3.0.4-intel-2016b.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'gperf'
+version = '3.0.4'
+
+homepage = 'http://www.gnu.org/software/gperf/'
+description = """GNU gperf is a perfect hash function generator. For a given list of strings, it produces a hash
+ function and hash table, in form of C or C++ code, for looking up a value depending on the input string. The hash
+ function is perfect, which means that the hash table has no collisions, and the hash table lookup needs a single
+ string comparison only."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ['bin/gperf'],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/g/gperftools/gperftools-2.5-foss-2016a.eb b/easybuild/easyconfigs/g/gperftools/gperftools-2.5-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b4e90a24ee03913bcf9b1b36c9cd3d19b1518ed5
--- /dev/null
+++ b/easybuild/easyconfigs/g/gperftools/gperftools-2.5-foss-2016a.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = "gperftools"
+version = "2.5"
+
+homepage = 'http://github.com/gperftools/gperftools'
+description = """gperftools are for use by developers so that they can create more robust applications.
+ Especially of use to those developing multi-threaded applications in C++ with templates.
+ Includes TCMalloc, heap-checker, heap-profiler and cpu-profiler."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://github.com/gperftools/gperftools/releases/download/%(namelower)s-%(version)s']
+
+builddependencies = [('Autotools', '20150215')]
+dependencies = [('libunwind', '1.1')]
+
+sanity_check_paths = {
+    'files': ["bin/pprof"],
+    'dirs': []
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/g/gperftools/gperftools-2.5-intel-2016b.eb b/easybuild/easyconfigs/g/gperftools/gperftools-2.5-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fbae9a2a859bc3e37255d1c7abdc9168fcb176eb
--- /dev/null
+++ b/easybuild/easyconfigs/g/gperftools/gperftools-2.5-intel-2016b.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = "gperftools"
+version = "2.5"
+
+homepage = 'http://github.com/gperftools/gperftools'
+description = """gperftools are for use by developers so that they can create more robust applications.
+ Especially of use to those developing multi-threaded applications in C++ with templates.
+ Includes TCMalloc, heap-checker, heap-profiler and cpu-profiler."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://github.com/gperftools/gperftools/releases/download/%(namelower)s-%(version)s']
+
+dependencies = [('libunwind', '1.1')]
+
+configopts = '--enable-libunwind'
+
+sanity_check_paths = {
+    'files': ["bin/pprof"],
+    'dirs': []
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.16-gimkl-2.11.5-serial.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.16-gimkl-2.11.5-serial.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3f80a99e7110b9291a808ba648c1bfdd381b435a
--- /dev/null
+++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.16-gimkl-2.11.5-serial.eb
@@ -0,0 +1,22 @@
+name = 'HDF5'
+version = '1.8.16'
+versionsuffix = '-serial'
+
+homepage = 'http://www.hdfgroup.org/HDF5/'
+description = """HDF5 is a unique technology suite that makes possible the management of
+ extremely large and complex data collections."""
+
+toolchain = {'name': 'gimkl', 'version': '2.11.5'}
+toolchainopts = {'pic': True}
+
+source_urls = ['http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version)s/src']
+sources = [SOURCELOWER_TAR_GZ]
+
+patches = ['configure_libtool.patch']
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('Szip', '2.1'),
+]
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.17-intel-2016b-serial.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.17-intel-2016b-serial.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ded2abcfa1cc2230cd9d42bcc80bc29540835d76
--- /dev/null
+++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.17-intel-2016b-serial.eb
@@ -0,0 +1,27 @@
+name = 'HDF5'
+version = '1.8.17'
+versionsuffix = '-serial'
+
+homepage = 'http://www.hdfgroup.org/HDF5/'
+description = """HDF5 is a unique technology suite that makes possible the management of
+ extremely large and complex data collections."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+toolchainopts = {'pic': True, 'usempi': False}
+
+source_urls = ['http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version)s/src']
+sources = [SOURCELOWER_TAR_GZ]
+
+patches = [
+    'HDF5-1.8.15_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/HEALPix/HEALPix-2.20a-ictce-5.5.0.eb b/easybuild/easyconfigs/h/HEALPix/HEALPix-2.20a-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..597c5e6d4283e72892c6e2e1b02365726b390ff2
--- /dev/null
+++ b/easybuild/easyconfigs/h/HEALPix/HEALPix-2.20a-ictce-5.5.0.eb
@@ -0,0 +1,15 @@
+name = 'HEALPix'
+version = '2.20a'
+
+homepage = 'http://healpix.sourceforge.net/'
+description = """Hierarchical Equal Area isoLatitude Pixelation of a sphere."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'pic': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['Healpix_%(version)s_2011Feb09.tar.gz']
+
+dependencies = [('CFITSIO', '3.350')]
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/h/HISAT2/HISAT2-2.0.4-foss-2016b.eb b/easybuild/easyconfigs/h/HISAT2/HISAT2-2.0.4-foss-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..83a592d05a588218c56f54e2d151527b802378d5
--- /dev/null
+++ b/easybuild/easyconfigs/h/HISAT2/HISAT2-2.0.4-foss-2016b.eb
@@ -0,0 +1,33 @@
+easyblock = 'MakeCp'
+
+name = 'HISAT2'
+version = '2.0.4'
+
+homepage = 'https://ccb.jhu.edu/software/hisat2/index.shtml'
+description = """HISAT2 is a fast and sensitive alignment program for mapping next-generation sequencing reads
+ (both DNA and RNA) against the general human population (as well as against a single reference genome)."""
+
+toolchain = {'name': 'foss', 'version': '2016b'}
+
+sources = ['%(namelower)s-%(version)s-source.zip']
+source_urls = ['ftp://ftp.ccb.jhu.edu/pub/infphilo/%(namelower)s/downloads/']
+
+checksums = ['50119a693929e240b072d79e69dc211e']
+
+dependencies = [
+    ('NGS', '1.2.5'),
+    ('ncbi-vdb', '2.7.0'),
+]
+
+buildopts = "USE_SRA=1 NCBI_NGS_DIR=$EBROOTNGS NCBI_VDB_DIR=$EBROOTNCBIMINVDB"
+
+executables = ['hisat2', 'hisat2-align-l', 'hisat2-align-s', 'hisat2-build', 'hisat2-build-l', 'hisat2-build-s',
+               'hisat2-inspect', 'hisat2-inspect-s', 'hisat2-inspect-l']
+files_to_copy = [(executables, 'bin')]
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in executables],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/h/HPCG/HPCG-2.1-goolf-1.4.10.eb b/easybuild/easyconfigs/h/HPCG/HPCG-2.1-goolf-1.4.10.eb
index 06eaeceafd5d35c93701c11d4bc29b8a3146796b..cc1b32254880ae22e9fb3e31dd71051601de2e16 100644
--- a/easybuild/easyconfigs/h/HPCG/HPCG-2.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/h/HPCG/HPCG-2.1-goolf-1.4.10.eb
@@ -11,4 +11,6 @@ toolchainopts = {'usempi': True, 'openmp': True}
 source_urls = ['https://software.sandia.gov/hpcg/downloads/']
 sources = [SOURCELOWER_TAR_GZ]
 
+runtest = True
+
 moduleclass = 'math'
diff --git a/easybuild/easyconfigs/h/HPCG/HPCG-2.1-ictce-5.5.0.eb b/easybuild/easyconfigs/h/HPCG/HPCG-2.1-ictce-5.5.0.eb
index 1d3f7c2d895a29909697c522f95d327487892da7..550fcae2be78ce38ce3ba8b09fa431a45a57ab61 100644
--- a/easybuild/easyconfigs/h/HPCG/HPCG-2.1-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/h/HPCG/HPCG-2.1-ictce-5.5.0.eb
@@ -11,4 +11,6 @@ toolchainopts = {'usempi': True, 'openmp': True}
 source_urls = ['https://software.sandia.gov/hpcg/downloads/']
 sources = [SOURCELOWER_TAR_GZ]
 
+runtest = True
+
 moduleclass = 'math'
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.1-iomkl-2016.07.eb b/easybuild/easyconfigs/h/HPL/HPL-2.1-iomkl-2016.07.eb
new file mode 100644
index 0000000000000000000000000000000000000000..42249afb29b07367e46ba3664145aa64157146b4
--- /dev/null
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.1-iomkl-2016.07.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': 'iomkl', 'version': '2016.07'}
+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-pomkl-2016.09.eb b/easybuild/easyconfigs/h/HPL/HPL-2.1-pomkl-2016.09.eb
new file mode 100644
index 0000000000000000000000000000000000000000..112d6aa6345556e239cb730d1c4073806e3eaa9f
--- /dev/null
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.1-pomkl-2016.09.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': 'pomkl', 'version': '2016.09'}
+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.2-foss-2016.07.eb b/easybuild/easyconfigs/h/HPL/HPL-2.2-foss-2016.07.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c44018425b1dbf270179e425446855c4505a5065
--- /dev/null
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.2-foss-2016.07.eb
@@ -0,0 +1,18 @@
+name = 'HPL'
+version = '2.2'
+
+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': '2016.07'}
+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.2-foss-2016.09.eb b/easybuild/easyconfigs/h/HPL/HPL-2.2-foss-2016.09.eb
new file mode 100644
index 0000000000000000000000000000000000000000..be4db4593ebbf63dbc96873a396af3027feb9a97
--- /dev/null
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.2-foss-2016.09.eb
@@ -0,0 +1,18 @@
+name = 'HPL'
+version = '2.2'
+
+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': '2016.09'}
+toolchainopts = {'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.2-intel-2017.00.eb b/easybuild/easyconfigs/h/HPL/HPL-2.2-intel-2017.00.eb
new file mode 100644
index 0000000000000000000000000000000000000000..48447ddb2875e9466b5abb785b368f313cd8781b
--- /dev/null
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.2-intel-2017.00.eb
@@ -0,0 +1,18 @@
+name = 'HPL'
+version = '2.2'
+
+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': '2017.00'}
+toolchainopts = {'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.2-iomkl-2016.09-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/h/HPL/HPL-2.2-iomkl-2016.09-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..22cd32989a753684726798def06fc6c15b6b3f24
--- /dev/null
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.2-iomkl-2016.09-GCC-4.9.3-2.25.eb
@@ -0,0 +1,18 @@
+name = 'HPL'
+version = '2.2'
+
+homepage = 'http://www.netlib.org/benchmark/hpl/'
+description = """HPL is a software package that solves a (random) dense linear system in double precision (64 bits) arithmetic 
+ on distributed-memory computers. It can thus be regarded as a portable as well as freely available implementation of the 
+ High Performance Computing Linpack Benchmark."""
+
+toolchain = {'name': 'iomkl', 'version': '2016.09-GCC-4.9.3-2.25'}
+toolchainopts = {'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.2-pomkl-2016.09.eb b/easybuild/easyconfigs/h/HPL/HPL-2.2-pomkl-2016.09.eb
new file mode 100644
index 0000000000000000000000000000000000000000..005a57564c099d9d6127e09c08dd53386f3ab522
--- /dev/null
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.2-pomkl-2016.09.eb
@@ -0,0 +1,18 @@
+name = 'HPL'
+version = '2.2'
+
+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': 'pomkl', 'version': '2016.09'}
+toolchainopts = {'optarch': True, 'usempi': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.netlib.org/benchmark/%(namelower)s']
+
+# fix Make dependencies, so parallel build also works
+patches = ['HPL_parallel-make.patch']
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/h/HTSeq/HTSeq-0.6.1p1-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/h/HTSeq/HTSeq-0.6.1p1-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..12d319ea7b1d3562b30ccc55cfb2111ca3959d6f
--- /dev/null
+++ b/easybuild/easyconfigs/h/HTSeq/HTSeq-0.6.1p1-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,27 @@
+easyblock = 'PythonPackage'
+
+name = 'HTSeq'
+version = '0.6.1p1'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://www-huber.embl.de/users/anders/HTSeq/'
+description = """A framework to process and analyze data from high-throughput sequencing (HTS) assays"""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.12'),
+    ('matplotlib', '1.5.1', versionsuffix),
+]
+
+options = {'modulename': '%(name)s'}
+
+sanity_check_paths = {
+    'files': ['bin/htseq-count', 'bin/htseq-qa'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-1.2.7-foss-2016a.eb b/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-1.2.7-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1c081e2c8ed708fa18f5b135ab4d9fe38513a8eb
--- /dev/null
+++ b/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-1.2.7-foss-2016a.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMake'
+
+name = 'HarfBuzz'
+version = '1.2.7'
+
+homepage = 'http://www.freedesktop.org/wiki/Software/HarfBuzz'
+description = """HarfBuzz is an OpenType text shaping engine."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://www.freedesktop.org/software/harfbuzz/release/']
+sources = [SOURCELOWER_TAR_BZ2]
+
+glibver = '2.48.0'
+dependencies = [
+    ('GLib', glibver),
+    ('cairo', '1.14.6', '-GLib-%s' % glibver),
+    ('freetype', '2.6.3'),
+    ('GObject-Introspection', '1.48.0')
+]
+
+configopts = "--enable-introspection=yes --with-gobject=yes --enable-static --enable-shared --with-cairo "
+
+modextrapaths = {
+    'GI_TYPELIB_PATH': 'share',
+    'XDG_DATA_DIRS': 'share',
+}
+
+sanity_check_paths = {
+    'files': ['lib/libharfbuzz.%s' % SHLIB_EXT, 'bin/hb-view'],
+    'dirs': []
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-1.3.1-intel-2016b.eb b/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-1.3.1-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6a9022cf44825085bba6e6a38f5411c9b570cae7
--- /dev/null
+++ b/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-1.3.1-intel-2016b.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMake'
+
+name = 'HarfBuzz'
+version = '1.3.1'
+
+homepage = 'http://www.freedesktop.org/wiki/Software/HarfBuzz'
+description = """HarfBuzz is an OpenType text shaping engine."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['http://www.freedesktop.org/software/harfbuzz/release/']
+sources = [SOURCELOWER_TAR_BZ2]
+
+dependencies = [
+    ('GLib', '2.49.5'),
+    ('cairo', '1.14.6'),
+    ('freetype', '2.6.5'),
+]
+
+builddependencies = [('GObject-Introspection', '1.49.1')]
+
+configopts = "--enable-introspection=yes --with-gobject=yes --enable-static --enable-shared --with-cairo "
+
+modextrapaths = {
+    'GI_TYPELIB_PATH': 'share',
+    'XDG_DATA_DIRS': 'share',
+}
+
+sanity_check_paths = {
+    'files': ['lib/libharfbuzz.%s' % SHLIB_EXT, 'bin/hb-view'],
+    'dirs': []
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.6.0-intel-2016b-Python-2.7.12-HDF5-1.8.17.eb b/easybuild/easyconfigs/h/h5py/h5py-2.6.0-intel-2016b-Python-2.7.12-HDF5-1.8.17.eb
new file mode 100644
index 0000000000000000000000000000000000000000..027c8b1e437015a3fc704af0deb5854e2f2ec990
--- /dev/null
+++ b/easybuild/easyconfigs/h/h5py/h5py-2.6.0-intel-2016b-Python-2.7.12-HDF5-1.8.17.eb
@@ -0,0 +1,34 @@
+easyblock = "PythonPackage"
+
+name = 'h5py'
+version = '2.6.0'
+
+homepage = 'http://www.h5py.org/'
+description = """HDF5 for Python (h5py) is a general-purpose Python interface to the Hierarchical Data Format library,
+ version 5. HDF5 is a versatile, mature scientific software library designed for the fast, flexible storage of enormous
+ amounts of data."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+toolchainopts = {'usempi': True}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+hdf5ver = '1.8.17'
+versionsuffix = '-Python-%%(pyver)s-HDF5-%s' % hdf5ver
+
+# to really use mpi enabled hdf5 we now seem to need a configure step
+prebuildopts = ' python setup.py configure --mpi --hdf5=$EBROOTHDF5 && '
+
+dependencies = [
+    ('Python', '2.7.12'),
+    ('HDF5', hdf5ver),
+    ('pkgconfig', '1.1.0', '-Python-%(pyver)s'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.6.0-intel-2016b-Python-3.5.2-HDF5-1.8.17.eb b/easybuild/easyconfigs/h/h5py/h5py-2.6.0-intel-2016b-Python-3.5.2-HDF5-1.8.17.eb
new file mode 100644
index 0000000000000000000000000000000000000000..156acadec823ec9f2b8dc83a875ecf643fc7d953
--- /dev/null
+++ b/easybuild/easyconfigs/h/h5py/h5py-2.6.0-intel-2016b-Python-3.5.2-HDF5-1.8.17.eb
@@ -0,0 +1,34 @@
+easyblock = "PythonPackage"
+
+name = 'h5py'
+version = '2.6.0'
+
+homepage = 'http://www.h5py.org/'
+description = """HDF5 for Python (h5py) is a general-purpose Python interface to the Hierarchical Data Format library,
+ version 5. HDF5 is a versatile, mature scientific software library designed for the fast, flexible storage of enormous
+ amounts of data."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+toolchainopts = {'usempi': True}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+hdf5ver = '1.8.17'
+versionsuffix = '-Python-%%(pyver)s-HDF5-%s' % hdf5ver
+
+# to really use mpi enabled hdf5 we now seem to need a configure step
+prebuildopts = ' python setup.py configure --mpi --hdf5=$EBROOTHDF5 && '
+
+dependencies = [
+    ('Python', '3.5.2'),
+    ('HDF5', hdf5ver),
+    ('pkgconfig', '1.1.0', '-Python-%(pyver)s'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/h/hanythingondemand/hanythingondemand-3.1.4-cli.eb b/easybuild/easyconfigs/h/hanythingondemand/hanythingondemand-3.1.4-cli.eb
new file mode 100644
index 0000000000000000000000000000000000000000..275b2940c7532bcfce2f2ca03605138b03cd6e07
--- /dev/null
+++ b/easybuild/easyconfigs/h/hanythingondemand/hanythingondemand-3.1.4-cli.eb
@@ -0,0 +1,42 @@
+easyblock = 'PythonPackage'
+
+name = 'hanythingondemand'
+version = '3.1.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.5.1'),
+]
+
+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-2016b-Python-2.7.12',
+    #'HOD_CREATE_HOD_MODULE': 'hanythingondemand/%(version)s-intel-2016b-Python-2.7.12',
+    # 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.1.4-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/h/hanythingondemand/hanythingondemand-3.1.4-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f133f273c4776ca0274d63927f9db68dee6a7499
--- /dev/null
+++ b/easybuild/easyconfigs/h/hanythingondemand/hanythingondemand-3.1.4-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,30 @@
+easyblock = 'PythonPackage'
+
+name = 'hanythingondemand'
+version = '3.1.4'
+versionsuffix = '-Python-%(pyver)s'
+
+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': '2016b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+# a Python version with netaddr/netifaces/mpi4py + pbs_python and vsc-base/vsc-mympirun is required at runtime
+dependencies = [
+    ('Python', '2.7.12'),  # provides netaddr, netifaces, mpi4py
+    ('pbs_python', '4.6.0', versionsuffix),
+    ('vsc-mympirun', '3.4.3', versionsuffix),
+]
+
+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/hanythingondemand/hanythingondemand-3.2.0-cli.eb b/easybuild/easyconfigs/h/hanythingondemand/hanythingondemand-3.2.0-cli.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7e255dbc21069de0b625f82f16495165f31314e6
--- /dev/null
+++ b/easybuild/easyconfigs/h/hanythingondemand/hanythingondemand-3.2.0-cli.eb
@@ -0,0 +1,42 @@
+easyblock = 'PythonPackage'
+
+name = 'hanythingondemand'
+version = '3.2.0'
+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.5.1'),
+]
+
+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-2016b-Python-2.7.12',
+    #'HOD_CREATE_HOD_MODULE': 'hanythingondemand/%(version)s-intel-2016b-Python-2.7.12',
+    # 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.2.0-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/h/hanythingondemand/hanythingondemand-3.2.0-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ea99d52247b78ed9ead8f919a041e46d08e8fc97
--- /dev/null
+++ b/easybuild/easyconfigs/h/hanythingondemand/hanythingondemand-3.2.0-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,30 @@
+easyblock = 'PythonPackage'
+
+name = 'hanythingondemand'
+version = '3.2.0'
+versionsuffix = '-Python-%(pyver)s'
+
+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': '2016b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+# a Python version with netaddr/netifaces/mpi4py + pbs_python and vsc-base/vsc-mympirun is required at runtime
+dependencies = [
+    ('Python', '2.7.12'),  # provides netaddr, netifaces, mpi4py
+    ('pbs_python', '4.6.0', versionsuffix),
+    ('vsc-mympirun', '3.4.3', versionsuffix),
+]
+
+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/hwloc/hwloc-1.11.3-GCC-5.2.0.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.3-GCC-5.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ef0b1e1c2c957cd632fa8eea031435273fc089ba
--- /dev/null
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.3-GCC-5.2.0.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'hwloc'
+version = '1.11.3'
+
+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': '5.2.0'}
+
+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.3-GCC-6.1.0-2.27.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.3-GCC-6.1.0-2.27.eb
new file mode 100644
index 0000000000000000000000000000000000000000..659a1fdf2707136c18fe56ee61171ff2a815531e
--- /dev/null
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.3-GCC-6.1.0-2.27.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'hwloc'
+version = '1.11.3'
+
+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': '6.1.0-2.27'}
+
+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.3-iccifort-2016.3.210-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.3-iccifort-2016.3.210-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d786ed3e2f845934b0178d1b359c1d9d6cc261a6
--- /dev/null
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.3-iccifort-2016.3.210-GCC-4.9.3-2.25.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'hwloc'
+version = '1.11.3'
+
+homepage = 'http://www.open-mpi.org/projects/hwloc/'
+description = """The Portable Hardware Locality (hwloc) software package provides a portable abstraction
+  (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, including
+ NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. It also gathers various
+ system attributes such as cache and memory information as well as the locality of I/O devices such as
+ network interfaces, InfiniBand HCAs or GPUs. It primarily aims at helping applications with gathering
+ information about modern computing hardware so as to exploit it accordingly and efficiently."""
+
+toolchain = {'name': 'iccifort', 'version': '2016.3.210-GCC-4.9.3-2.25'}
+
+dependencies = [('numactl', '2.0.11')]
+
+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.11.3-iccifort-2016.3.210-GCC-5.4.0-2.26.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.3-iccifort-2016.3.210-GCC-5.4.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b656f492fea6a6c20aadca64a4e07040e396cf96
--- /dev/null
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.3-iccifort-2016.3.210-GCC-5.4.0-2.26.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'hwloc'
+version = '1.11.3'
+
+homepage = 'http://www.open-mpi.org/projects/hwloc/'
+description = """The Portable Hardware Locality (hwloc) software package provides a portable abstraction
+  (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, including
+ NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. It also gathers various
+ system attributes such as cache and memory information as well as the locality of I/O devices such as
+ network interfaces, InfiniBand HCAs or GPUs. It primarily aims at helping applications with gathering
+ information about modern computing hardware so as to exploit it accordingly and efficiently."""
+
+toolchain = {'name': 'iccifort', 'version': '2016.3.210-GCC-5.4.0-2.26'}
+
+dependencies = [('numactl', '2.0.11')]
+
+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.11.3-intel-2016b.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.3-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..651e1648ba805bb3601f6a3684c363d010b73037
--- /dev/null
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.3-intel-2016b.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'hwloc'
+version = '1.11.3'
+
+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': 'intel', 'version': '2016b'}
+
+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.4-GCC-6.2.0-2.27.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.4-GCC-6.2.0-2.27.eb
new file mode 100644
index 0000000000000000000000000000000000000000..35ced3699b49ed078f23acf88ef16609aca3680e
--- /dev/null
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.4-GCC-6.2.0-2.27.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake' 
+ 
+name = 'hwloc' 
+version = '1.11.4' 
+ 
+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': '6.2.0-2.27'} 
+ 
+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.4-PGI-16.7-GCC-5.4.0-2.26.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.4-PGI-16.7-GCC-5.4.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6138766fd96125e0883568b510d809df507f32ab
--- /dev/null
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.4-PGI-16.7-GCC-5.4.0-2.26.eb
@@ -0,0 +1,27 @@
+easyblock = 'ConfigureMake'
+
+name = 'hwloc'
+version = '1.11.4'
+
+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': 'PGI', 'version': '16.7-GCC-5.4.0-2.26'}
+
+source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
+sources = [SOURCE_TAR_GZ]
+
+checksums = ['b6f23eb59074fd09fdd84905d50b103d']
+
+dependencies = [
+    ('numactl', '2.0.11', '', ('GCCcore', '5.4.0')),
+]
+
+configopts = "--enable-libnuma=$EBROOTNUMACTL"
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.11.4-gcccuda-2016.10.0.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.4-gcccuda-2016.10.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..20cd96a78151871e989d862b78b01064dc076eec
--- /dev/null
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.4-gcccuda-2016.10.0.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake' 
+ 
+name = 'hwloc' 
+version = '1.11.4' 
+ 
+homepage = 'http://www.open-mpi.org/projects/hwloc/' 
+description = """The Portable Hardware Locality (hwloc) software package provides a portable abstraction 
+(across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, including 
+NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. It also gathers various 
+system attributes such as cache and memory information as well as the locality of I/O devices such as 
+network interfaces, InfiniBand HCAs or GPUs. It primarily aims at helping applications with gathering 
+information about modern computing hardware so as to exploit it accordingly and efficiently.""" 
+ 
+toolchain = {'name': 'gcccuda', 'version': '2016.10.0'} 
+ 
+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/i/IMB/IMB-4.1-foss-2016a.eb b/easybuild/easyconfigs/i/IMB/IMB-4.1-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..09fb675534c8273b75415b919951cb4fee09aa31
--- /dev/null
+++ b/easybuild/easyconfigs/i/IMB/IMB-4.1-foss-2016a.eb
@@ -0,0 +1,30 @@
+easyblock = 'MakeCp'
+
+name = 'IMB'
+version = '4.1'
+
+homepage = 'https://software.intel.com/en-us/articles/intel-mpi-benchmarks'
+description = """
+The Intel® MPI Benchmarks perform a set of MPI performance measurements for point-to-point 
+and global communication operations for a range of message sizes.
+"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = ['%(name)s_%(version)s.tgz']
+source_urls = ['https://software.intel.com/sites/default/files/managed/a3/b2/']
+
+start_dir = 'src'
+prebuildopts = 'export MPI_HOME=$EBROOTOPENMPI && '
+buildopts = "-f make_mpich MPI_HOME=$EBROOTOPENMPI"
+
+parallel = 1
+
+files_to_copy = [(['src/IMB-*'], 'bin'), (['doc/IMB_Users_Guide.pdf'], 'doc')]
+
+sanity_check_paths = {
+    'files': ['bin/%s' % binfile for binfile in ['IMB-RMA', 'IMB-EXT', 'IMB-NBC', 'IMB-MPI1']],
+    'dirs': ['bin','doc']
+}
+
+moduleclass = 'perf'
diff --git a/easybuild/easyconfigs/i/IMOD/IMOD-4.7.15_RHEL6-64_CUDA6.0.eb b/easybuild/easyconfigs/i/IMOD/IMOD-4.7.15_RHEL6-64_CUDA6.0.eb
index 505c2f3911bcd7130d07a2b05c7695f57dfc1b69..2cca42e4db17e4f3fc75752f4d22c32041e161ea 100644
--- a/easybuild/easyconfigs/i/IMOD/IMOD-4.7.15_RHEL6-64_CUDA6.0.eb
+++ b/easybuild/easyconfigs/i/IMOD/IMOD-4.7.15_RHEL6-64_CUDA6.0.eb
@@ -1,40 +1,29 @@
 # 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 = 'Binary'
+# authors:
+# * Pablo Escobar Lopez (sciCORE - University of Basel - SIB Swiss Institute of Bioinformatics)
+# * Benjamin Roberts (Landcare Research NZ Ltd)
 
 name = 'IMOD'
 version = '4.7.15'
 versionsuffix = '_RHEL6-64_CUDA6.0'
 
 homepage = 'http://bio3d.colorado.edu/imod/'
-description = """IMOD is a set of image processing, modeling and display programs 
- used for tomographic reconstruction and for 3D reconstruction of EM serial sections 
- and optical sections."""
+description = """IMOD is a set of image processing, modeling and display
+programs used for tomographic reconstruction and for 3D reconstruction of EM
+serial sections and optical sections. The package contains tools for assembling
+and aligning data within multiple types and sizes of image stacks, viewing 3-D
+data from any orientation, and modeling and display of the image files. IMOD
+was developed primarily by David Mastronarde, Rick Gaudette, Sue Held, Jim
+Kremer, Quanren Xiong, and John Heumann at the University of Colorado."""
 
 toolchain = {'name': 'dummy', 'version': ''}
 
 source_urls = ['http://bio3d.colorado.edu/imod/AMD64-RHEL5/']
 sources = ['%(namelower)s_%(version)s%(versionsuffix)s.csh']
 
-dependencies = [('Java', '1.7.0_80')]
-
-install_cmd = "csh %(namelower)s_%(version)s%(versionsuffix)s.csh -dir %(installdir)s -script %(installdir)s/ -yes"
-
-# the provied init script located in %(installdir)s also defines a bash/csh function named 'subm'.
-# It's not possible to define a function in the module file 
-modloadmsg = """Bash users run: 'source $EBROOTIMOD/IMOD-linux.sh'
-csh users run: 'source $EBROOTIMOD/IMOD-linux.csh'"""
-
-modextravars = {
-    'IMOD_JAVADIR': '\$EBROOTJAVA',
-}
-
-sanity_check_paths = {
-    'files': ['IMOD/bin/imod'],
-    'dirs': [],
-}
+dependencies = [
+    ('CUDA', '6.0.37'),
+    ('Java', '1.7.0_80'),
+]
 
-moduleclass = 'bio'
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.0.3-1-intel-2016b.eb b/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.0.3-1-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f3c4211e8402f81d9ec9f85e50cdb6e19b97cc76
--- /dev/null
+++ b/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.0.3-1-intel-2016b.eb
@@ -0,0 +1,41 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Ravi Tripathi
+# Email: ravi89@uab.edu
+
+easyblock = 'ConfigureMake'
+
+name = 'ImageMagick'
+version = '7.0.3-1'
+
+homepage = 'http://www.imagemagick.org/'
+description = """ImageMagick is a software suite to create, edit, compose, or convert bitmap images"""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+sources = [SOURCE_TAR_XZ]
+source_urls = ['http://www.imagemagick.org/download']
+
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('X11', '20160819'),
+    ('Ghostscript', '9.19'),
+    ('JasPer', '1.900.1'),
+    ('libjpeg-turbo', '1.5.0'),
+    ('LibTIFF', '4.0.6'),
+    ('LittleCMS', '2.8'),
+]
+
+builddependencies = [
+    ('pkg-config', '0.29.1'),
+]
+
+configopts = "--with-gslib --with-x"
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['bin', 'etc/%(name)s-%(version_major)s', 'include/%(name)s-%(version_major)s', 'lib', 'share'],
+}
+
+modextravars = {'MAGICK_HOME': '%(installdir)s'}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/i/IronPython/IronPython-2.7-intel-2016b.eb b/easybuild/easyconfigs/i/IronPython/IronPython-2.7-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b0645a78ef1d8b11587018e659d43fc8b250dcff
--- /dev/null
+++ b/easybuild/easyconfigs/i/IronPython/IronPython-2.7-intel-2016b.eb
@@ -0,0 +1,16 @@
+name = 'IronPython'
+version = '2.7'
+
+homepage = 'http://ironpython.net/'
+description = """IronPython is an open-source implementation of the Python programming language
+ which is tightly integrated with the .NET Framework. IronPython can use the .NET Framework and
+Python libraries, and other .NET languages can use Python code just as easily."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['https://github.com/IronLanguages/main/archive/']
+sources = ['ipy-%(version)s.tar.gz']
+
+dependencies = [('Mono', '2.10.6')]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/i/i-cisTarget/i-cisTarget-20160602-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/i/i-cisTarget/i-cisTarget-20160602-intel-2016a-Python-2.7.11.eb
index 5d57424030b47e665dedd5365de6e5f002aab098..efeb188af27eb851a0f7a33b1149ce3267a240f9 100644
--- a/easybuild/easyconfigs/i/i-cisTarget/i-cisTarget-20160602-intel-2016a-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/i/i-cisTarget/i-cisTarget-20160602-intel-2016a-Python-2.7.11.eb
@@ -41,7 +41,7 @@ dependencies = [
     ('matplotlib', '1.5.1', versionsuffix + '-freetype-2.6.3'),
     ('MySQL-python', '1.2.5', versionsuffix + '-MariaDB-10.1.14'),
     ('ImageMagick', '6.9.4-8'),
-    ('STAMP', '1.2'),
+    ('STAMP', '1.3'),
     ('Cluster-Buster', '20160106'),
     ('Kent_tools', '20130806', '-linux.x86_64', True),
 ]
diff --git a/easybuild/easyconfigs/i/icc/icc-2017.0.098-GCC-5.4.0-2.26.eb b/easybuild/easyconfigs/i/icc/icc-2017.0.098-GCC-5.4.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d1cc307109d8d9fe16605c02e80172767ae155e8
--- /dev/null
+++ b/easybuild/easyconfigs/i/icc/icc-2017.0.098-GCC-5.4.0-2.26.eb
@@ -0,0 +1,33 @@
+# This is an easyconfig file for EasyBuild, see http://hpcugent.github.io/easybuild
+
+name = 'icc'
+version = '2017.0.098'
+
+homepage = 'http://software.intel.com/en-us/intel-compilers/'
+description = "C and C++ compiler from Intel"
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = ['parallel_studio_xe_%(version_major)s_composer_edition_for_cpp.tgz']
+
+checksums = ['c8a2fdb1501fbc93bfaad93195677d86']
+
+gccver = '5.4.0'
+binutilsver = '2.26'
+versionsuffix = '-GCC-%s-%s' % (gccver, binutilsver)
+
+dependencies = [
+    ('GCCcore', gccver),
+    ('binutils', binutilsver, '', ('GCCcore', gccver)),
+]
+
+# list of regex for components to install
+# full list of components can be obtained from pset/mediaconfig.xml in unpacked sources
+# cfr. https://software.intel.com/en-us/articles/intel-composer-xe-2015-silent-installation-guide
+components = ['intel-comp', 'intel-ccomp', 'intel-icc', 'intel-openmp', 'intel-ipsc?_']
+
+dontcreateinstalldir = 'True'
+
+license_file = HOME + '/licenses/intel/license.lic'
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/i/iccifort/iccifort-2017.0.098-GCC-5.4.0-2.26.eb b/easybuild/easyconfigs/i/iccifort/iccifort-2017.0.098-GCC-5.4.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3ed3f947b9c1e37ef1ba5888c177bb2babe2fb96
--- /dev/null
+++ b/easybuild/easyconfigs/i/iccifort/iccifort-2017.0.098-GCC-5.4.0-2.26.eb
@@ -0,0 +1,18 @@
+# This is an easyconfig file for EasyBuild, see http://hpcugent.github.io/easybuild
+easyblock = "Toolchain"
+
+name = 'iccifort'
+version = '2017.0.098'
+versionsuffix = '-GCC-5.4.0-2.26'
+
+homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/'
+description = """Intel Cluster Toolkit Compiler Edition provides Intel C,C++ and fortran compilers, Intel MPI and Intel MKL"""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+dependencies = [
+    ('icc', version, versionsuffix),
+    ('ifort', version, versionsuffix),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/i/ifort/ifort-2017.0.098-GCC-5.4.0-2.26.eb b/easybuild/easyconfigs/i/ifort/ifort-2017.0.098-GCC-5.4.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9f30cbac75c8fc0b595ad6af76f0572596cb5d90
--- /dev/null
+++ b/easybuild/easyconfigs/i/ifort/ifort-2017.0.098-GCC-5.4.0-2.26.eb
@@ -0,0 +1,33 @@
+# This is an easyconfig file for EasyBuild, see http://hpcugent.github.io/easybuild
+
+name = 'ifort'
+version = '2017.0.098'
+
+homepage = 'http://software.intel.com/en-us/intel-compilers/'
+description = "C and C++ compiler from Intel"
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = ['parallel_studio_xe_%(version_major)s_composer_edition_for_fortran.tgz']
+
+checksums = ['8787795951fe10f90ce7dcdcec1b9341']
+
+gccver = '5.4.0'
+binutilsver = '2.26'
+versionsuffix = '-GCC-%s-%s' % (gccver, binutilsver)
+
+dependencies = [
+    ('GCCcore', gccver),
+    ('binutils', binutilsver, '', ('GCCcore', gccver)),
+]
+
+# list of regex for components to install
+# full list of components can be obtained from pset/mediaconfig.xml in unpacked sources
+# cfr. https://software.intel.com/en-us/articles/intel-composer-xe-2015-silent-installation-guide
+components = ['intel-comp', 'intel-fcomp', 'intel-ifort', 'intel-openmp', 'intel-ipsf?_']
+
+dontcreateinstalldir = 'True'
+
+license_file = HOME + '/licenses/intel/license.lic'
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/i/iimpi/iimpi-2017.00-GCC-5.4.0-2.26.eb b/easybuild/easyconfigs/i/iimpi/iimpi-2017.00-GCC-5.4.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1af95a3473e8e410a77be258fa04eef239dd3c89
--- /dev/null
+++ b/easybuild/easyconfigs/i/iimpi/iimpi-2017.00-GCC-5.4.0-2.26.eb
@@ -0,0 +1,20 @@
+# This is an easyconfig file for EasyBuild, see http://hpcugent.github.io/easybuild
+easyblock = "Toolchain"
+
+name = 'iimpi'
+version = '2017.00'
+versionsuffix = '-GCC-5.4.0-2.26'
+
+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 = '2017.0.098'
+dependencies = [
+    ('icc', compver, versionsuffix),
+    ('ifort', compver, versionsuffix),
+    ('impi', '2017.0.098', '', ('iccifort', '%s%s' % (compver, versionsuffix))),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/i/imkl/imkl-10.3.12.361-MVAPICH2-1.9.eb b/easybuild/easyconfigs/i/imkl/imkl-10.3.12.361-MVAPICH2-1.9.eb
deleted file mode 100644
index 4d5ef42fcf1ae19862198e6890807257f9e08ad7..0000000000000000000000000000000000000000
--- a/easybuild/easyconfigs/i/imkl/imkl-10.3.12.361-MVAPICH2-1.9.eb
+++ /dev/null
@@ -1,35 +0,0 @@
-name = 'imkl'
-version = '10.3.12.361'
-
-homepage = 'http://software.intel.com/en-us/intel-mkl/'
-description = """Intel Math Kernel Library is a library of highly optimized, extensively threaded math routines
-for science, engineering, and financial applications that require maximum performance. Core math functions include
-BLAS, LAPACK, ScaLAPACK, Sparse Solvers, Fast Fourier Transforms, Vector Math, and more."""
-
-toolchain = {'name': 'dummy', 'version': ''}
-
-sources = ['l_mkl_%(version)s.tgz']
-
-compver = '2011.13.367'
-comp = ('iccifort', compver)
-
-# deps for interface build
-mpi = 'MVAPICH2'
-mpiver = '1.9'
-versionsuffix = '-%s-%s' % (mpi, mpiver)
-
-dependencies = [
-    ('icc', compver),
-    ('ifort', compver),
-    (mpi, mpiver, '', comp),
-]
-
-dontcreateinstalldir = 'True'
-
-interfaces = True
-
-# license file
-import os
-license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
-
-moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/i/imkl/imkl-10.3.12.361-OpenMPI-1.6.3.eb b/easybuild/easyconfigs/i/imkl/imkl-10.3.12.361-OpenMPI-1.6.3.eb
deleted file mode 100644
index 2bd88ac625c46afa75b23783cd16177323c9645e..0000000000000000000000000000000000000000
--- a/easybuild/easyconfigs/i/imkl/imkl-10.3.12.361-OpenMPI-1.6.3.eb
+++ /dev/null
@@ -1,35 +0,0 @@
-name = 'imkl'
-version = '10.3.12.361'
-
-homepage = 'http://software.intel.com/en-us/intel-mkl/'
-description = """Intel Math Kernel Library is a library of highly optimized, extensively threaded math routines
-for science, engineering, and financial applications that require maximum performance. Core math functions include
-BLAS, LAPACK, ScaLAPACK, Sparse Solvers, Fast Fourier Transforms, Vector Math, and more."""
-
-toolchain = {'name': 'dummy', 'version': ''}
-
-sources = ['l_mkl_%(version)s.tgz']
-
-compver = '2011.13.367'
-comp = ('iccifort', compver)
-
-# deps for interface build
-mpi = 'OpenMPI'
-mpiver = '1.6.3'
-versionsuffix = '-%s-%s' % (mpi, mpiver)
-
-dependencies = [
-    ('icc', compver),
-    ('ifort', compver),
-    (mpi, mpiver, '', comp),
-]
-
-dontcreateinstalldir = 'True'
-
-interfaces = True
-
-# license file
-import os
-license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
-
-moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/i/imkl/imkl-11.3.3.210-iompi-2016.07.eb b/easybuild/easyconfigs/i/imkl/imkl-11.3.3.210-iompi-2016.07.eb
new file mode 100644
index 0000000000000000000000000000000000000000..425ca0043d7dc40220caa45310c79f3a1b4090c9
--- /dev/null
+++ b/easybuild/easyconfigs/i/imkl/imkl-11.3.3.210-iompi-2016.07.eb
@@ -0,0 +1,35 @@
+name = 'imkl'
+version = '11.3.3.210'
+
+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': 'iompi', 'version': '2016.07'}
+
+sources = ['l_mkl_%(version)s.tgz']
+checksums = ['f72546df27f5ebb0941b5d21fd804e34']
+
+dontcreateinstalldir = 'True'
+
+components = ['intel-mkl']
+
+interfaces = True
+
+license_file = HOME + '/licenses/intel/license.lic'
+
+postinstallcmds = [
+    # extract the examples
+    'tar xvzf %(installdir)s/mkl/examples/examples_cluster.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_core_c.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_core_f.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_f95.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_mic.tgz -C %(installdir)s/mkl/examples/'
+]
+
+modextravars = {
+    'MKL_EXAMPLES': '%(installdir)s/mkl/examples/',
+}
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/i/imkl/imkl-11.3.3.210-iompi-2016.09-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/i/imkl/imkl-11.3.3.210-iompi-2016.09-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..bbbfc083fb7ace6586906892fb3ec05aac751100
--- /dev/null
+++ b/easybuild/easyconfigs/i/imkl/imkl-11.3.3.210-iompi-2016.09-GCC-4.9.3-2.25.eb
@@ -0,0 +1,36 @@
+name = 'imkl'
+version = '11.3.3.210'
+
+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': 'iompi', 'version': '2016.09-GCC-4.9.3-2.25'}
+
+sources = ['l_mkl_%(version)s.tgz']
+checksums = ['f72546df27f5ebb0941b5d21fd804e34']
+
+dontcreateinstalldir = 'True'
+
+components = ['intel-mkl']
+
+interfaces = True
+
+license_file = HOME + '/licenses/intel/license.lic'
+
+postinstallcmds = [
+    # extract the examples
+    'tar xvzf %(installdir)s/mkl/examples/examples_cluster.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_core_c.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_core_f.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_f95.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_mic.tgz -C %(installdir)s/mkl/examples/'
+]
+
+modextravars = {
+    'MKL_EXAMPLES': '%(installdir)s/mkl/examples/',
+}
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/i/imkl/imkl-11.3.3.210-pompi-2016.09.eb b/easybuild/easyconfigs/i/imkl/imkl-11.3.3.210-pompi-2016.09.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ea94f4aa6a31332cbfb3b95257e90af0538394ee
--- /dev/null
+++ b/easybuild/easyconfigs/i/imkl/imkl-11.3.3.210-pompi-2016.09.eb
@@ -0,0 +1,38 @@
+# This is an easyconfig file for EasyBuild, see http://hpcugent.github.io/easybuild
+
+name = 'imkl'
+version = '11.3.3.210'
+
+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': 'pompi', 'version': '2016.09'}
+
+sources = ['l_mkl_%(version)s.tgz']
+checksums = ['f72546df27f5ebb0941b5d21fd804e34']
+
+dontcreateinstalldir = 'True'
+
+license_file = HOME + '/licenses/intel/license.lic'
+
+components = ['intel-mkl']
+
+interfaces = True
+
+postinstallcmds = [
+    # extract the examples
+    'tar xvzf %(installdir)s/mkl/examples/examples_cluster.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_core_c.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_core_f.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_f95.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_mic.tgz -C %(installdir)s/mkl/examples/'
+]
+
+modextravars = {
+    'MKL_EXAMPLES': '%(installdir)s/mkl/examples/',
+}
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/i/imkl/imkl-2017.0.098-iimpi-2017.00-GCC-5.4.0-2.26.eb b/easybuild/easyconfigs/i/imkl/imkl-2017.0.098-iimpi-2017.00-GCC-5.4.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..341dbab7ed44ce75dbc27cd404ced266444ce737
--- /dev/null
+++ b/easybuild/easyconfigs/i/imkl/imkl-2017.0.098-iimpi-2017.00-GCC-5.4.0-2.26.eb
@@ -0,0 +1,38 @@
+# This is an easyconfig file for EasyBuild, see http://hpcugent.github.io/easybuild
+
+name = 'imkl'
+version = '2017.0.098'
+
+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': '2017.00-GCC-5.4.0-2.26'}
+
+sources = ['l_mkl_%(version)s.tgz']
+checksums = ['3cdcb739ab5ab1e047eb130b9ffdd8d0']
+
+dontcreateinstalldir = 'True'
+
+license_file = HOME + '/licenses/intel/license.lic'
+
+interfaces = True
+
+postinstallcmds = [
+    # extract the examples
+    'tar xvzf %(installdir)s/mkl/examples/examples_cluster_c.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_cluster_f.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_core_c.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_core_f.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_f95.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_mic_f.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_mic_c.tgz -C %(installdir)s/mkl/examples/',
+]
+
+modextravars = {
+    'MKL_EXAMPLES': '%(installdir)s/mkl/examples/',
+}
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/i/impi/impi-2017.0.098-iccifort-2017.0.098-GCC-5.4.0-2.26.eb b/easybuild/easyconfigs/i/impi/impi-2017.0.098-iccifort-2017.0.098-GCC-5.4.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..867202a35792cdba6f8cdb01fc904197e4cf507d
--- /dev/null
+++ b/easybuild/easyconfigs/i/impi/impi-2017.0.098-iccifort-2017.0.098-GCC-5.4.0-2.26.eb
@@ -0,0 +1,35 @@
+# This is an easyconfig file for EasyBuild, see http://hpcugent.github.io/easybuild
+
+name = 'impi'
+version = '2017.0.098'
+
+homepage = 'http://software.intel.com/en-us/intel-mpi-library/'
+description = """The Intel(R) MPI Library for Linux* OS is a multi-fabric message
+ passing library based on ANL MPICH2 and OSU MVAPICH2. The Intel MPI Library for
+ Linux OS implements the Message Passing Interface, version 2 (MPI-2) specification."""
+
+toolchain = {'name': 'iccifort', 'version': '2017.0.098-GCC-5.4.0-2.26'}
+
+sources = ['l_mpi_%(version)s.tgz']
+
+checksums = ['fc123875773816b7084a91e419d54d20']
+
+dontcreateinstalldir = 'True'
+
+components = ['intel-mpi', 'intel-psxe', 'intel-imb']
+
+license_file = HOME + '/licenses/intel/license.lic'
+
+# set up all the mpi commands to default to intel compilers
+# set_mpi_wrappers_all = 'True'
+
+postinstallcmds = [
+    'ln -s %(installdir)s/lib64/libmpi.so  %(installdir)s/lib64/libmpich.so',
+    'ln -s %(installdir)s/lib64/libmpigc4.so  %(installdir)s/lib64/libmpichcxx.so',
+    'ln -s %(installdir)s/lib64/libmpigf.so %(installdir)s/lib64/libfmpich.so',
+    'ln -s %(installdir)s/lib64/libmpigf.so %(installdir)s/lib64/libmpichf90.so',
+    'ln -s %(installdir)s/lib64/libmpi.so %(installdir)s/lib64/libmpl.so',
+    'ln -s %(installdir)s/lib64/libmpi.so %(installdir)s/lib64/libopa.so'
+]
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/i/intel/intel-2017.00.eb b/easybuild/easyconfigs/i/intel/intel-2017.00.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ad8be63148a87d6eb827c77331cc04190cc877eb
--- /dev/null
+++ b/easybuild/easyconfigs/i/intel/intel-2017.00.eb
@@ -0,0 +1,24 @@
+easyblock = 'Toolchain'
+
+name = 'intel'
+version = '2017.00'
+
+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 = '2017.0.098'
+gccver = '5.4.0'
+binutilsver = '2.26'
+gccsuff = '-GCC-%s-%s' % (gccver, binutilsver)
+dependencies = [
+    ('GCCcore', gccver),
+    ('binutils', binutilsver, '-GCCcore-%s' % gccver),
+    ('icc', compver, gccsuff),
+    ('ifort', compver, gccsuff),
+    ('impi', '2017.0.098', '', ('iccifort', '%s%s' % (compver, gccsuff))),
+    ('imkl', '2017.0.098', '', ('iimpi', version + gccsuff)),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/i/intltool/intltool-0.51.0-GCCcore-4.9.3-Perl-5.24.0.eb b/easybuild/easyconfigs/i/intltool/intltool-0.51.0-GCCcore-4.9.3-Perl-5.24.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0acb163cda03df350f6cf8ddf755ede403528e2e
--- /dev/null
+++ b/easybuild/easyconfigs/i/intltool/intltool-0.51.0-GCCcore-4.9.3-Perl-5.24.0.eb
@@ -0,0 +1,29 @@
+easyblock = 'ConfigureMake'
+
+name = 'intltool'
+version = '0.51.0'
+versionsuffix = '-Perl-5.24.0'
+
+homepage = 'http://freedesktop.org/wiki/Software/intltool/'
+description = """intltool is a set of tools to centralize translation of
+ many different file formats using GNU gettext-compatible PO files."""
+
+toolchain = {'name': 'GCCcore', 'version': '4.9.3'}
+
+source_urls  = ['http://launchpad.net/intltool/trunk/%(version)s/+download/']
+sources = [SOURCE_TAR_GZ]
+
+builddependencies = [
+    ('binutils', '2.25'),
+]
+
+dependencies = [
+    ('XML-Parser', '2.44_01', versionsuffix),
+]
+
+sanity_check_paths = {
+    'files': ['bin/intltool%s' % x for x in ['-extract', '-merge', '-prepare', '-update', 'ize']],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/i/intltool/intltool-0.51.0-intel-2016b-Perl-5.24.0.eb b/easybuild/easyconfigs/i/intltool/intltool-0.51.0-intel-2016b-Perl-5.24.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c5a095b3f6afe8ef802835ee1c92a1bdf27796be
--- /dev/null
+++ b/easybuild/easyconfigs/i/intltool/intltool-0.51.0-intel-2016b-Perl-5.24.0.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'intltool'
+version = '0.51.0'
+versionsuffix = '-Perl-5.24.0'
+
+homepage = 'http://freedesktop.org/wiki/Software/intltool/'
+description = """intltool is a set of tools to centralize translation of
+ many different file formats using GNU gettext-compatible PO files."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['http://launchpad.net/intltool/trunk/%(version)s/+download/']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('XML-Parser', '2.44_01', versionsuffix),
+]
+
+sanity_check_paths = {
+    'files': ['bin/intltool%s' % x for x in ['-extract', '-merge', '-prepare', '-update', 'ize']],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/i/iomkl/iomkl-2016.07.eb b/easybuild/easyconfigs/i/iomkl/iomkl-2016.07.eb
new file mode 100644
index 0000000000000000000000000000000000000000..54ed73649a82ac957b0c23edce844f606f677b99
--- /dev/null
+++ b/easybuild/easyconfigs/i/iomkl/iomkl-2016.07.eb
@@ -0,0 +1,20 @@
+easyblock = "Toolchain"
+
+name = 'iomkl'
+version = '2016.07'
+
+homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/'
+description = """Intel Cluster Toolchain Compiler Edition provides Intel C/C++ and Fortran compilers, Intel MKL & OpenMPI."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+compver = '2016.3.210-GCC-5.4.0-2.26'
+
+dependencies = [
+    ('icc', compver),
+    ('ifort', compver),
+    ('OpenMPI', '1.10.3', '', ('iccifort', compver)),
+    ('imkl', '11.3.3.210', '', ('iompi', version)),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/i/iomkl/iomkl-2016.09-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/i/iomkl/iomkl-2016.09-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..cf9954cf88316acdf02c8c9abff7b7dce5e4958d
--- /dev/null
+++ b/easybuild/easyconfigs/i/iomkl/iomkl-2016.09-GCC-4.9.3-2.25.eb
@@ -0,0 +1,20 @@
+easyblock = "Toolchain"
+
+name = 'iomkl'
+version = '2016.09-GCC-4.9.3-2.25'
+
+homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/'
+description = """Intel Cluster Toolchain Compiler Edition provides Intel C/C++ and Fortran compilers, Intel MKL & OpenMPI."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+compver = '2016.3.210-GCC-4.9.3-2.25'
+
+dependencies = [
+    ('icc', compver),
+    ('ifort', compver),
+    ('OpenMPI', '1.10.4', '', ('iccifort', compver)),
+    ('imkl', '11.3.3.210', '', ('iompi', version)),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/i/iompi/iompi-2016.07.eb b/easybuild/easyconfigs/i/iompi/iompi-2016.07.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6cfe2ee8254f50fe5787da149c0d25ed6817e077
--- /dev/null
+++ b/easybuild/easyconfigs/i/iompi/iompi-2016.07.eb
@@ -0,0 +1,19 @@
+easyblock = "Toolchain"
+
+name = 'iompi'
+version = '2016.07'
+
+homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/'
+description = """Toolchain with Intel C, C++ and Fortran compilers, alongside OpenMPI."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+compver = '2016.3.210-GCC-5.4.0-2.26'
+
+dependencies = [
+    ('icc', compver),
+    ('ifort', compver),
+    ('OpenMPI', '1.10.3', '', ('iccifort', compver)),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/i/iompi/iompi-2016.09-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/i/iompi/iompi-2016.09-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3c9854b3e19ce4561dad5987d8fecc449e974c9b
--- /dev/null
+++ b/easybuild/easyconfigs/i/iompi/iompi-2016.09-GCC-4.9.3-2.25.eb
@@ -0,0 +1,20 @@
+easyblock = "Toolchain"
+
+name = 'iompi'
+version = '2016.09-GCC-4.9.3-2.25'
+
+homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/'
+description = """Toolchain with Intel C, C++ and Fortran compilers, alongside OpenMPI."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+compver = '2016.3.210-GCC-4.9.3-2.25'
+
+dependencies = [
+    ('OpenMPI', '1.10.4', '', ('iccifort', compver)),
+    ('icc', compver),
+    ('ifort', compver),
+]
+
+moduleclass = 'toolchain'
+
diff --git a/easybuild/easyconfigs/j/Java/Java-1.6.0_24.eb b/easybuild/easyconfigs/j/Java/Java-1.6.0_24.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ec1642238fe539e6888236328c7128215e7aa0b4
--- /dev/null
+++ b/easybuild/easyconfigs/j/Java/Java-1.6.0_24.eb
@@ -0,0 +1,15 @@
+name = 'Java'
+version = '1.6.0_24'
+
+homepage = 'http://java.com/'
+description = """Java Platform, Standard Edition (Java SE) lets you develop and deploy
+ Java applications on desktops and servers."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+# download the tar.gz directly from http://www.oracle.com/technetwork/java/javase/downloads/index.html
+(vp, vs) = version.split('_')
+altver = '%su%s' % (vp.split('.')[1], vs)
+sources = ['jdk-%s-linux-x64.bin' % altver]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/j/Java/Java-1.8.0_112.eb b/easybuild/easyconfigs/j/Java/Java-1.8.0_112.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6b87f36815bcb59f5285a0bd85a3eb37bde0401f
--- /dev/null
+++ b/easybuild/easyconfigs/j/Java/Java-1.8.0_112.eb
@@ -0,0 +1,15 @@
+name = 'Java'
+version = '1.8.0_112'
+
+homepage = 'http://java.com/'
+description = """Java Platform, Standard Edition (Java SE) lets you develop and deploy
+ Java applications on desktops and servers."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+# download the tar.gz directly from http://www.oracle.com/technetwork/java/javase/downloads/index.html
+(vp, vs) = version.split('_')
+altver = '%su%s' % (vp.split('.')[1], vs)
+sources = ['jdk-%s-linux-x64.tar.gz' % altver]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/j/jModelTest/jModelTest-2.1.10r20160303-Java-1.8.0_92.eb b/easybuild/easyconfigs/j/jModelTest/jModelTest-2.1.10r20160303-Java-1.8.0_92.eb
new file mode 100644
index 0000000000000000000000000000000000000000..00bc8cb97d9e349ff8551f3b206b12658f6e9ec4
--- /dev/null
+++ b/easybuild/easyconfigs/j/jModelTest/jModelTest-2.1.10r20160303-Java-1.8.0_92.eb
@@ -0,0 +1,36 @@
+# 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 = 'PackedBinary'
+
+name = 'jModelTest'
+version = '2.1.10r20160303'
+versionsuffix = '-Java-%(javaver)s'
+
+homepage = 'https://github.com/ddarriba/jmodeltest2'
+description="""jModelTest is a tool to carry out statistical selection of best-fit models of nucleotide substitution."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = ['https://github.com/ddarriba/jmodeltest2/archive/']
+sources = ['v%(version)s.tar.gz']
+
+builddependencies = [('ant', '1.9.7', versionsuffix)]
+
+dependencies = [
+    ('MPJ-Express', '0.44', versionsuffix, ('foss', '2016a')),
+    ('Java', '1.8.0_92'),
+]
+
+install_cmd = "cd jmodeltest2-%(version)s && ant -Ddist.dir=%(installdir)s jar"
+
+modloadmsg = """To execute jModelTest run: java -jar \\$EBROOTJMODELTEST/jModelTest.jar"""
+
+sanity_check_paths = {
+    'files': ['jModelTest.jar'], 
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/j/jemalloc/jemalloc-4.2.1-intel-2016b.eb b/easybuild/easyconfigs/j/jemalloc/jemalloc-4.2.1-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7ab95453f84c67f59745e50fabb07d306598c102
--- /dev/null
+++ b/easybuild/easyconfigs/j/jemalloc/jemalloc-4.2.1-intel-2016b.eb
@@ -0,0 +1,28 @@
+easyblock = 'ConfigureMake'
+
+name = 'jemalloc'
+version = '4.2.1'
+
+homepage = 'http://www.canonware.com/jemalloc'
+description = """jemalloc is a general purpose malloc(3) implementation that emphasizes fragmentation avoidance and
+ scalable concurrency support."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['https://github.com/jemalloc/jemalloc/archive']
+sources = ['%(version)s.tar.gz']
+
+builddependencies = [('Autotools', '20150215')]
+
+preconfigopts = "./autogen.sh && "
+prebuildopts = "make dist && "
+
+sanity_check_paths = {
+    'files': ['bin/jeprof', 'lib/libjemalloc.a', 'lib/libjemalloc_pic.a', 'lib/libjemalloc.%s' % SHLIB_EXT,
+              'include/jemalloc/jemalloc.h'],
+    'dirs': ['share'],
+}
+
+modextrapaths = {'LD_PRELOAD': ['lib/libjemalloc.%s' % SHLIB_EXT]}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/j/jhbuild/jhbuild-3.15.92-GCCcore-4.9.3.eb b/easybuild/easyconfigs/j/jhbuild/jhbuild-3.15.92-GCCcore-4.9.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b2f1cf65eb7bd22f80852cc42e83e0f97cbc94f6
--- /dev/null
+++ b/easybuild/easyconfigs/j/jhbuild/jhbuild-3.15.92-GCCcore-4.9.3.eb
@@ -0,0 +1,49 @@
+easyblock = 'ConfigureMake'
+
+name = 'jhbuild'
+version = '3.15.92'
+
+homepage = 'https://wiki.gnome.org/action/show/Projects/Jhbuild'
+description = """JHBuild allows you to automatically download and compile “modules” (i.e. source code packages). 
+Modules are listed in “module set” files, which also include dependency information so that JHBuild can discover 
+what modules need to be built and in what order."""
+
+toolchain = {'name': 'GCCcore', 'version': '4.9.3'}
+
+sources = ['%(version)s.tar.gz']
+source_urls = [('https://github.com/GNOME/jhbuild/archive/')]
+
+# jhbuild is python so it has a python dependency, but we want to give people freedom to use whatever python they
+# chose during a build process
+allow_system_deps = [('Python', SYS_PYTHON_VERSION)]
+
+builddependencies = [
+    ('binutils', '2.25'),
+]
+
+dependencies = [
+    ('Autotools', '20150215'),
+    ('pkg-config', '0.29.1'),
+    ('gettext', '0.19.8'),
+    ('flex', '2.6.0'),
+    ('Bison', '3.0.4'),
+    ('M4', '1.4.17'),
+    ('CVS', '1.11.23'),
+]
+
+# We use the simple install method as per:
+# https://developer.gnome.org/jhbuild/stable/getting-started.html.en
+# to avoid unnecessary dependencies. This requires us to build in the install dir so that all libs are found.
+buildininstalldir = True
+skipsteps = ['configure']
+prebuildopts = './autogen.sh --prefix=%(installdir)s &&' 
+
+# Make sure there are no "not found" in the sanitycheck output
+sanity_check_commands = [('! jhbuild', 'sanitycheck| grep not\ found')]
+
+sanity_check_paths = {
+    'files': ['bin/jhbuild'],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/k/Keras/Keras-1.0.8-intel-2016b-Python-3.5.2.eb b/easybuild/easyconfigs/k/Keras/Keras-1.0.8-intel-2016b-Python-3.5.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..418b1b87b0efcc1bb7fcb67c139b8759bf100001
--- /dev/null
+++ b/easybuild/easyconfigs/k/Keras/Keras-1.0.8-intel-2016b-Python-3.5.2.eb
@@ -0,0 +1,28 @@
+easyblock = "PythonPackage"
+
+name = 'Keras'
+version = '1.0.8'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://keras.io/'
+description = """Keras is a minimalist, highly modular neural networks library, written in Python and
+capable of running on top of either TensorFlow or Theano."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '3.5.2'),
+    ('Theano', '0.8.2', versionsuffix),
+    ('h5py', '2.6.0', '%(versionsuffix)s-HDF5-1.8.17'),
+    ('PyYAML', '3.12', versionsuffix),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/k/Keras/Keras-1.1.0-intel-2016b-Python-3.5.2.eb b/easybuild/easyconfigs/k/Keras/Keras-1.1.0-intel-2016b-Python-3.5.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..503271be943e0bf503f3eb768410b1e1d633c509
--- /dev/null
+++ b/easybuild/easyconfigs/k/Keras/Keras-1.1.0-intel-2016b-Python-3.5.2.eb
@@ -0,0 +1,28 @@
+easyblock = "PythonPackage"
+
+name = 'Keras'
+version = '1.1.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://keras.io/'
+description = """Keras is a minimalist, highly modular neural networks library, written in Python and
+capable of running on top of either TensorFlow or Theano."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '3.5.2'),
+    ('Theano', '0.8.2', versionsuffix),
+    ('h5py', '2.6.0', '%(versionsuffix)s-HDF5-1.8.17'),
+    ('PyYAML', '3.12', versionsuffix),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/k/kallisto/kallisto-0.43.0-intel-2016b.eb b/easybuild/easyconfigs/k/kallisto/kallisto-0.43.0-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..24e6fb2d59ae0bd49d42357d02ec405be1cce9b5
--- /dev/null
+++ b/easybuild/easyconfigs/k/kallisto/kallisto-0.43.0-intel-2016b.eb
@@ -0,0 +1,25 @@
+easyblock = 'CMakeMake'
+
+name = 'kallisto'
+version = '0.43.0'
+
+homepage = 'http://pachterlab.github.io/kallisto/'
+description = """kallisto is a program for quantifying abundances of transcripts from RNA-Seq data, or more generally
+ of target sequences using high-throughput sequencing reads."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['https://github.com/pachterlab/kallisto/archive/']
+sources = ['v%(version)s.tar.gz']
+
+builddependencies = [('CMake', '3.5.2')]
+dependencies = [('HDF5', '1.8.17')]
+
+separate_build_dir = True
+
+sanity_check_paths = {
+    'files': ['bin/kallisto'],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/l/LASTZ/LASTZ-1.02.00-goolf-1.7.20.eb b/easybuild/easyconfigs/l/LASTZ/LASTZ-1.02.00-goolf-1.7.20.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d7a88ce495d30a705dfbcc9e541915c8be8ce408
--- /dev/null
+++ b/easybuild/easyconfigs/l/LASTZ/LASTZ-1.02.00-goolf-1.7.20.eb
@@ -0,0 +1,46 @@
+# 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 = 'ConfigureMake'
+
+name = 'LASTZ'
+version = '1.02.00'
+
+homepage = 'http://www.bx.psu.edu/~rsharris/lastz/'
+
+description = """LASTZ is a program for aligning DNA sequences, a pairwise aligner. Originally designed to 
+ handle sequences the size of human chromosomes and from different species, it is also useful for sequences 
+ produced by NGS sequencing technologies such as Roche 454."""
+
+toolchain = {'name': 'goolf', 'version': '1.7.20'}
+
+source_urls = ['http://www.bx.psu.edu/miller_lab/dist/']
+sources = ['%(namelower)s-%(version)s.tar.gz']
+
+# the tarball includes some test data which is not copied when doing the "make install" step.
+# We use the buildininstalldir option to keep this test data in the %(installdir)s
+buildininstalldir = True
+
+parallel = 1
+
+unpack_options = '--strip-components=1'
+
+skipsteps = ['configure']
+
+# by default definedForAll variable in src/Makefile contains -Werror which works with gcc-4.4 
+# but crashes with newer gcc versions so we override definedForAll to remove the -Werror option
+buildopts = " definedForAll='-Wall -Wextra -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE'"
+
+# use the LASTZ_INSTALL variable to define the directory where to copy the binaries during "make install" step
+# Tarball includes an empty bin/ folder. In case the tarball doesn't include a bin/ folder you can do
+# preinstallopts = 'mkdir %(installdir)s/bin/ && '
+installopts = " LASTZ_INSTALL='%(installdir)s/bin'"
+
+sanity_check_paths = {
+    'files': ["bin/lastz", "bin/lastz_D"],
+    'dirs': []
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/l/LLVM/LLVM-3.8.1-GCCcore-4.9.3.eb b/easybuild/easyconfigs/l/LLVM/LLVM-3.8.1-GCCcore-4.9.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fe4a09d2cd410520940832a4879a22068ea22013
--- /dev/null
+++ b/easybuild/easyconfigs/l/LLVM/LLVM-3.8.1-GCCcore-4.9.3.eb
@@ -0,0 +1,42 @@
+easyblock = 'CMakeMake'
+
+name = 'LLVM'
+version = '3.8.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': 'GCCcore', 'version': '4.9.3'}
+
+source_urls = ["http://llvm.org/releases/%(version)s"]
+sources = ["llvm-%(version)s.src.tar.xz"]
+
+builddependencies = [
+    ('binutils', '2.25'),
+    ('CMake', '3.6.1'),
+    # We use the minimal Python in GCCcore
+    ('Python', '2.7.12', '-bare'),
+]
+
+dependencies = [
+    ('ncurses', '6.0'),
+]
+
+configopts = '-DBUILD_SHARED_LIBS=ON '
+# required to install extra tools in bin/
+configopts += "-DLLVM_INSTALL_UTILS=ON"
+
+separate_build_dir = True
+
+sanity_check_paths = {
+    'files': ['bin/llvm-ar', 'bin/FileCheck'],
+    'dirs': ['include/llvm', 'include/llvm-c'],
+}
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/l/LLVM/LLVM-3.8.1-foss-2016b.eb b/easybuild/easyconfigs/l/LLVM/LLVM-3.8.1-foss-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..959113598997d12dc9db166f08179dda1d747eba
--- /dev/null
+++ b/easybuild/easyconfigs/l/LLVM/LLVM-3.8.1-foss-2016b.eb
@@ -0,0 +1,42 @@
+easyblock = 'CMakeMake'
+
+name = 'LLVM'
+version = '3.8.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': 'foss', 'version': '2016b'}
+toolchainopts = {'cstd': 'gnu++11'}
+
+source_urls = ["http://llvm.org/releases/%(version)s"]
+sources = ["llvm-%(version)s.src.tar.xz"]
+
+builddependencies = [
+    ('CMake', '3.6.1'),
+    ('Python', '2.7.12'),
+]
+
+dependencies = [
+    ('ncurses', '6.0'),
+    ('zlib', '1.2.8'),
+]
+
+configopts = '-DBUILD_SHARED_LIBS=ON '
+# required to install extra tools in bin/
+configopts += "-DLLVM_INSTALL_UTILS=ON -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_ENABLE_ZLIB=ON"
+
+sanity_check_paths = {
+    'files': ['bin/llvm-ar', 'bin/FileCheck'],
+    'dirs': ['include/llvm', 'include/llvm-c'],
+}
+
+separate_build_dir = True
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/l/LLVM/LLVM-3.8.1-intel-2016b.eb b/easybuild/easyconfigs/l/LLVM/LLVM-3.8.1-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..243e52187d062fd16de946f82743168db236c9d7
--- /dev/null
+++ b/easybuild/easyconfigs/l/LLVM/LLVM-3.8.1-intel-2016b.eb
@@ -0,0 +1,42 @@
+easyblock = 'CMakeMake'
+
+name = 'LLVM'
+version = '3.8.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': '2016b'}
+toolchainopts = {'cstd': 'gnu++11'}
+
+source_urls = ["http://llvm.org/releases/%(version)s"]
+sources = ["llvm-%(version)s.src.tar.xz"]
+
+builddependencies = [
+    ('CMake', '3.5.2'),
+    ('Python', '2.7.12'),
+]
+
+dependencies = [
+    ('ncurses', '6.0'),
+    ('zlib', '1.2.8'),
+]
+
+configopts = '-DBUILD_SHARED_LIBS=ON -DCMAKE_EXE_LINKER_FLAGS="$LDFLAGS -shared-intel" '
+# required to install extra tools in bin/
+configopts += "-DLLVM_INSTALL_UTILS=ON -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_ENABLE_ZLIB=ON"
+
+sanity_check_paths = {
+    'files': ['bin/llvm-ar', 'bin/FileCheck'],
+    'dirs': ['include/llvm', 'include/llvm-c'],
+}
+
+separate_build_dir = True
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/l/LLVM/LLVM-3.9.0-foss-2016b.eb b/easybuild/easyconfigs/l/LLVM/LLVM-3.9.0-foss-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2a5106af44b13e3ccb0592a79744cc0130554ee6
--- /dev/null
+++ b/easybuild/easyconfigs/l/LLVM/LLVM-3.9.0-foss-2016b.eb
@@ -0,0 +1,43 @@
+easyblock = 'CMakeMake'
+
+name = 'LLVM'
+version = '3.9.0'
+
+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': 'foss', 'version': '2016b'}
+toolchainopts = {'cstd': 'gnu++11'}
+
+source_urls = ["http://llvm.org/releases/%(version)s"]
+sources = ["llvm-%(version)s.src.tar.xz"]
+
+builddependencies = [
+    ('CMake', '3.6.1'),
+    ('Python', '2.7.12'),
+]
+
+dependencies = [
+    ('ncurses', '6.0'),
+    ('zlib', '1.2.8'),
+]
+
+configopts = '-DBUILD_SHARED_LIBS=ON '
+# required to install extra tools in bin/
+configopts += '-DLLVM_INSTALL_UTILS=ON -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_ENABLE_ZLIB=ON '
+configopts += '-DCMAKE_BUILD_TYPE=Release '
+
+sanity_check_paths = {
+    'files': ['bin/llvm-ar', 'bin/FileCheck'],
+    'dirs': ['include/llvm', 'include/llvm-c'],
+}
+
+separate_build_dir = True
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/l/LLVM/LLVM-3.9.0-intel-2016b.eb b/easybuild/easyconfigs/l/LLVM/LLVM-3.9.0-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2bf426d402314b9f516138fab8fa46fe2ca7ef52
--- /dev/null
+++ b/easybuild/easyconfigs/l/LLVM/LLVM-3.9.0-intel-2016b.eb
@@ -0,0 +1,45 @@
+easyblock = 'CMakeMake'
+
+name = 'LLVM'
+version = '3.9.0'
+
+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': '2016b'}
+toolchainopts = {'cstd': 'gnu++11'}
+
+source_urls = ["http://llvm.org/releases/%(version)s"]
+sources = ["llvm-%(version)s.src.tar.xz"]
+
+patches = ['LLVM-3.9.0-intel-fix-loop.patch']
+
+builddependencies = [
+    ('CMake', '3.6.1'),
+    ('Python', '2.7.12'),
+]
+
+dependencies = [
+    ('ncurses', '6.0'),
+    ('zlib', '1.2.8'),
+]
+
+configopts = '-DBUILD_SHARED_LIBS=ON -DCMAKE_EXE_LINKER_FLAGS="$LDFLAGS -shared-intel" '
+# required to install extra tools in bin/
+configopts += '-DLLVM_INSTALL_UTILS=ON -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_ENABLE_ZLIB=ON '
+configopts += '-DCMAKE_BUILD_TYPE=Release '
+
+sanity_check_paths = {
+    'files': ['bin/llvm-ar', 'bin/FileCheck'],
+    'dirs': ['include/llvm', 'include/llvm-c'],
+}
+
+separate_build_dir = True
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/l/LLVM/LLVM-3.9.0-intel-fix-loop.patch b/easybuild/easyconfigs/l/LLVM/LLVM-3.9.0-intel-fix-loop.patch
new file mode 100644
index 0000000000000000000000000000000000000000..33e6578be43522e81d3c090af4cb8f72603db1f3
--- /dev/null
+++ b/easybuild/easyconfigs/l/LLVM/LLVM-3.9.0-intel-fix-loop.patch
@@ -0,0 +1,26 @@
+# Bug in intel compiler
+# Source: From https://sft.its.cern.ch/jira/browse/ROOT-8233
+diff -ur llvm-3.9.0rc3.src.orig/lib/Transforms/Utils/LoopUtils.cpp llvm-3.9.0rc3.src/lib/Transforms/Utils/LoopUtils.cpp
+--- llvm-3.9.0rc3.src.orig/lib/Transforms/Utils/LoopUtils.cpp	2016-06-11 23:48:25.000000000 +0200
++++ llvm-3.9.0rc3.src/lib/Transforms/Utils/LoopUtils.cpp	2016-09-01 11:40:34.394205219 +0200
+@@ -834,6 +834,11 @@
+   return UsedOutside;
+ }
+
++namespace llvm {
++  extern char &LoopSimplifyID;
++  extern char &LCSSAID;
++}
++
+ void llvm::getLoopAnalysisUsage(AnalysisUsage &AU) {
+   // By definition, all loop passes need the LoopInfo analysis and the
+   // Dominator tree it depends on. Because they all participate in the loop
+@@ -845,8 +850,6 @@
+
+   // We must also preserve LoopSimplify and LCSSA. We locally access their IDs
+   // here because users shouldn't directly get them from this header.
+-  extern char &LoopSimplifyID;
+-  extern char &LCSSAID;
+   AU.addRequiredID(LoopSimplifyID);
+   AU.addPreservedID(LoopSimplifyID);
+   AU.addRequiredID(LCSSAID);
diff --git a/easybuild/easyconfigs/l/LeadIT/LeadIT-2.1.9.eb b/easybuild/easyconfigs/l/LeadIT/LeadIT-2.1.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..128c5bbc07bbdc51f814b4bbeea20e5d339881b0
--- /dev/null
+++ b/easybuild/easyconfigs/l/LeadIT/LeadIT-2.1.9.eb
@@ -0,0 +1,27 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Ravi Tripathi
+# Email: ravi89@uab.edu
+
+easyblock = "Tarball"
+
+name = 'LeadIT'
+version = '2.1.9'
+
+homepage = 'http://www.biosolveit.de/LeadIT/index.html'
+description = """Visually Informed LeadOpt"""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+#You need to get the software manually from http://www.biosolveit.de/LeadIT/index.html
+sources = ['leadit-%(version)s-Linux-x64.tar.gz']
+
+checksums = ['363fa557861c4d109fd595ab895df3fd']
+
+modextrapaths = {'PATH': ''}
+
+sanity_check_paths = {
+    'files': ["leadit", "flexv", "hydescorer"],
+    'dirs': ["example", "doc"]
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/l/Libint/Libint-1.1.6-intel-2016b.eb b/easybuild/easyconfigs/l/Libint/Libint-1.1.6-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..accf89b9e8944ce9c93960b8f490434c441896db
--- /dev/null
+++ b/easybuild/easyconfigs/l/Libint/Libint-1.1.6-intel-2016b.eb
@@ -0,0 +1,27 @@
+name = 'Libint'
+version = '1.1.6'
+
+homepage = 'https://sourceforge.net/p/libint/'
+description = """Libint library is used to evaluate the traditional (electron repulsion) and certain novel two-body
+ matrix elements (integrals) over Cartesian Gaussian functions used in modern atomic and molecular theory."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+toolchainopts = {'pic': True}
+
+sources = ['release-%s.tar.gz' % '-'.join(version.split('.'))]
+source_urls = ['https://github.com/evaleev/libint/archive/']
+
+builddependencies = [('Autotools', '20150215')]
+
+preconfigopts = "aclocal -I lib/autoconf && libtoolize && autoconf && "
+
+configopts = "--enable-deriv --enable-r12"
+
+sanity_check_paths = {
+    'files': ['include/lib%(x)s/lib%(x)s.h' % {'x': x} for x in ['deriv', 'int', 'r12']] +
+             ['include/libint/hrr_header.h', 'include/libint/vrr_header.h'] +
+             ['lib/lib%s.%s' % (x,y) for x in ['deriv', 'int', 'r12'] for y in ['a', SHLIB_EXT]],
+    'dirs': [],
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/l/Libint/Libint-2.1.0-intel-2016b.eb b/easybuild/easyconfigs/l/Libint/Libint-2.1.0-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8282cb93ccd351b27d73c0799d7beae40ee1bd18
--- /dev/null
+++ b/easybuild/easyconfigs/l/Libint/Libint-2.1.0-intel-2016b.eb
@@ -0,0 +1,21 @@
+name = 'Libint'
+version = '2.1.0'
+
+homepage = 'https://github.com/evaleev/libint'
+description = """Libint library is used to evaluate the traditional (electron repulsion) and certain novel two-body
+ matrix elements (integrals) over Cartesian Gaussian functions used in modern atomic and molecular theory."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+toolchainopts = {'pic': True}
+
+sources = ['libint-%(version)s-stable.tgz']
+source_urls = ['https://github.com/evaleev/libint/releases/download/v%(version)s']
+
+builddependencies = [
+    ('GMP', '6.1.1'),
+    ('Boost', '1.61.0', '-Python-2.7.12'),
+    ('Eigen', '3.2.9'),
+    ('Python', '2.7.12'),
+]
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/l/LittleCMS/LittleCMS-2.8-intel-2016b.eb b/easybuild/easyconfigs/l/LittleCMS/LittleCMS-2.8-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..738095618f9ca021e29a25ebab1382e5d5e14330
--- /dev/null
+++ b/easybuild/easyconfigs/l/LittleCMS/LittleCMS-2.8-intel-2016b.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'LittleCMS'
+version = '2.8'
+
+homepage = 'http://www.littlecms.com/'
+description = """ Little CMS intends to be an OPEN SOURCE small-footprint color management engine,
+ with special focus on accuracy and performance. """
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['http://sourceforge.net/projects/lcms/files/lcms/%(version)s/']
+sources = ['lcms2-%(version)s.tar.gz']
+
+dependencies = [('libjpeg-turbo', '1.5.0')]
+
+sanity_check_paths = {
+    'files': ['bin/jpgicc', 'bin/linkicc', 'bin/psicc', 'bin/transicc', 'include/lcms2.h', 'include/lcms2_plugin.h',
+              'lib/liblcms2.a', 'lib/liblcms2.%s' % SHLIB_EXT, 'lib/pkgconfig/lcms2.pc'],
+    'dirs': ['share/man'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/Log-Log4perl/Log-Log4perl-1.47-foss-2016a.eb b/easybuild/easyconfigs/l/Log-Log4perl/Log-Log4perl-1.47-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..da1c7223b7d6db420d0752847841fbb13a410e57
--- /dev/null
+++ b/easybuild/easyconfigs/l/Log-Log4perl/Log-Log4perl-1.47-foss-2016a.eb
@@ -0,0 +1,23 @@
+easyblock = 'PerlModule'
+
+name = 'Log-Log4perl'
+version = '1.47'
+
+homepage = 'https://metacpan.org/pod/Log::Log4perl'
+description = """Log4perl"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+source_urls = ['https://cpan.metacpan.org/authors/id/M/MS/MSCHILLI/']
+sources = [SOURCE_TAR_GZ]
+
+perl = 'Perl'
+perlver = '5.22.1'
+perlversuffix = '-bare'
+
+dependencies = [
+    (perl, perlver, perlversuffix)
+]
+
+options = {'modulename': 'Log::Log4perl'}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/l/Loki/Loki-0.1.7-intel-2016b.eb b/easybuild/easyconfigs/l/Loki/Loki-0.1.7-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a25e47aac4fbfaae99f635c077a2c19fb096b4b4
--- /dev/null
+++ b/easybuild/easyconfigs/l/Loki/Loki-0.1.7-intel-2016b.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'Loki'
+version = '0.1.7'
+
+homepage = 'http://loki-lib.sourceforge.net/'
+description = """ Loki is a C++ library of designs, containing flexible implementations of common design patterns and 
+ idioms. """
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['https://sourceforge.net/projects/loki-lib/files/Loki/Loki %(version)s/']
+sources = [SOURCELOWER_TAR_GZ]
+
+skipsteps = ['configure']
+
+installopts = "prefix=%(installdir)s"
+
+sanity_check_paths={
+    'files': ['lib/libloki.a', 'lib/libloki.%s' % SHLIB_EXT, 'lib/libloki.%s.%%(version)s' % SHLIB_EXT],
+    'dirs': ['include/loki'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/Lua/Lua-5.1.4-8.eb b/easybuild/easyconfigs/l/Lua/Lua-5.1.4-8.eb
index b4e0ad7225ca00b35f7f007f787ae11aad3fc803..08d864aaf628672e6e666a6ae398fcc2944abb49 100644
--- a/easybuild/easyconfigs/l/Lua/Lua-5.1.4-8.eb
+++ b/easybuild/easyconfigs/l/Lua/Lua-5.1.4-8.eb
@@ -16,7 +16,13 @@ toolchain = {'name': 'dummy', 'version': ''}
 sources = ['lua-%s.tar.gz' % version.replace('-', '.')]
 source_urls = ['http://sourceforge.net/projects/lmod/files/']
 
-dependencies = [('ncurses', '6.0')]
+builddependencies = [
+    ('ncurses', '6.0'),
+    ('libreadline', '6.3')
+]
+
+# Use static linking for ncurses so it's not a runtime dep
+configopts = "--with-static=yes"
 
 sanity_check_paths = {
     'files': ["bin/lua"],
diff --git a/easybuild/easyconfigs/l/libGLU/libGLU-9.0.0-foss-2016b.eb b/easybuild/easyconfigs/l/libGLU/libGLU-9.0.0-foss-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..361489070d9e258967fff258f292c9700fd00dd4
--- /dev/null
+++ b/easybuild/easyconfigs/l/libGLU/libGLU-9.0.0-foss-2016b.eb
@@ -0,0 +1,24 @@
+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': 'foss', 'version': '2016b'}
+toolchainopts = {'pic': True}
+
+source_urls = ['ftp://ftp.freedesktop.org/pub/mesa/glu/']
+sources = ['glu-%(version)s.tar.bz2']
+
+dependencies = [
+    ('Mesa', '12.0.2'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libGLU.so.1'],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libGLU/libGLU-9.0.0-intel-2016b.eb b/easybuild/easyconfigs/l/libGLU/libGLU-9.0.0-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..51bb338e1e3a08c06dcd718f3673a7c69112ff33
--- /dev/null
+++ b/easybuild/easyconfigs/l/libGLU/libGLU-9.0.0-intel-2016b.eb
@@ -0,0 +1,24 @@
+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': '2016b'}
+toolchainopts = {'pic': True}
+
+source_urls = ['ftp://ftp.freedesktop.org/pub/mesa/glu/']
+sources = ['glu-%(version)s.tar.bz2']
+
+dependencies = [
+    ('Mesa', '12.0.2'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libGLU.so.1'],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libQGLViewer/libQGLViewer-2.6.3-intel-2016b.eb b/easybuild/easyconfigs/l/libQGLViewer/libQGLViewer-2.6.3-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4edf05a0d20b30b5b0092c2fe1e940675e25b63d
--- /dev/null
+++ b/easybuild/easyconfigs/l/libQGLViewer/libQGLViewer-2.6.3-intel-2016b.eb
@@ -0,0 +1,20 @@
+name = 'libQGLViewer'
+version = '2.6.3'
+
+homepage = 'http://libqglviewer.com/'
+description = "libQGLViewer is a C++ library based on Qt that eases the creation of OpenGL 3D viewers."
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['http://www.libqglviewer.com/src/']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('libGLU', '9.0.0'),
+]
+
+builddependencies = [('Qt', '4.8.7')]
+
+start_dir = '%(builddir)s/libQGLViewer-%(version)s/QGLViewer'
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libbitmask/libbitmask-2.0.eb b/easybuild/easyconfigs/l/libbitmask/libbitmask-2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5a0206f95032209215fec0ab760ccb524bb73c83
--- /dev/null
+++ b/easybuild/easyconfigs/l/libbitmask/libbitmask-2.0.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'libbitmask'
+version = '2.0'
+
+homepage = 'http://oss.sgi.com/projects/cpusets/'
+description = "libbitmask provides a convenient, powerful bitmask data type"
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = ['ftp://oss.sgi.com/projects/cpusets/download/']
+sources = [SOURCE_TAR_BZ2]
+
+builddependencies = [('Autotools', '20150215')]
+
+preconfigopts = "aclocal && libtoolize && autoconf && automake --add-missing && "
+
+sanity_check_paths = {
+    'files': ['include/bitmask.h', 'lib/libbitmask.a', 'lib/libbitmask.so'],
+    'dirs': ['share'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libcerf/libcerf-1.5-intel-2016b.eb b/easybuild/easyconfigs/l/libcerf/libcerf-1.5-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0cce9f8c9873b35f1d4af6a82e5e6a9341f9161c
--- /dev/null
+++ b/easybuild/easyconfigs/l/libcerf/libcerf-1.5-intel-2016b.eb
@@ -0,0 +1,28 @@
+easyblock = 'ConfigureMake'
+
+name = 'libcerf'
+version = '1.5'
+
+homepage = 'http://gnuplot.sourceforge.net/'
+description = """libcerf is a self-contained numeric library that provides an efficient and accurate
+ implementation of complex error functions, along with Dawson, Faddeeva, and Voigt functions."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+sources = [SOURCE_TGZ]
+source_urls = [
+    'http://apps.jcns.fz-juelich.de/src/libcerf/',
+    'http://apps.jcns.fz-juelich.de/src/libcerf/old',
+]
+
+builddependencies = [
+    ('Autotools', '20150215'),
+    ('libtool', '2.4.6'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libcerf.%s' % SHLIB_EXT],
+    'dirs': []
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/l/libcpuset/libcpuset-1.0.eb b/easybuild/easyconfigs/l/libcpuset/libcpuset-1.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..51fb71266e59fa4bfd6c55ac35600a4bcba31c34
--- /dev/null
+++ b/easybuild/easyconfigs/l/libcpuset/libcpuset-1.0.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'libcpuset'
+version = '1.0'
+
+homepage = 'http://oss.sgi.com/projects/cpusets/'
+description = "libcpuset provides full access to cpuset capabilities"
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = ['ftp://oss.sgi.com/projects/cpusets/download/']
+sources = [SOURCE_TAR_BZ2]
+
+builddependencies = [('Autotools', '20150215')]
+dependencies = [('libbitmask', '2.0')]
+
+preconfigopts = "mv configure.in configure.ac && aclocal && libtoolize && autoconf && automake --add-missing && "
+
+sanity_check_paths = {
+    'files': ['include/cpuset.h', 'lib/libcpuset.a', 'lib/libcpuset.so'],
+    'dirs': ['share'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.70-foss-2016b.eb b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.70-foss-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5d9e8ac938590bffa90d210a8b88e35cd512cd1b
--- /dev/null
+++ b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.70-foss-2016b.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'libdrm'
+version = '2.4.70'
+
+homepage = 'http://dri.freedesktop.org'
+description = """Direct Rendering Manager runtime library."""
+
+source_urls = ['http://dri.freedesktop.org/libdrm/']
+sources = [SOURCELOWER_TAR_GZ]
+
+toolchain = {'name': 'foss', 'version': '2016b'}
+
+dependencies = [
+    ('X11', '20160819'),
+]
+
+sanity_check_paths = {
+    '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'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.70-intel-2016b.eb b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.70-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9fb07a29545f25170359aec3e2d36abbfec691d0
--- /dev/null
+++ b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.70-intel-2016b.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'libdrm'
+version = '2.4.70'
+
+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': '2016b'}
+
+dependencies = [
+    ('X11', '20160819'),
+]
+
+sanity_check_paths = {
+    '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'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.2.1-GCC-5.4.0-2.26.eb b/easybuild/easyconfigs/l/libffi/libffi-3.2.1-GCC-5.4.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..54836f268142e76549cf500628d173edfe85589e
--- /dev/null
+++ b/easybuild/easyconfigs/l/libffi/libffi-3.2.1-GCC-5.4.0-2.26.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'libffi'
+version = '3.2.1'
+
+homepage = 'http://sourceware.org/libffi/'
+description = """The libffi library provides a portable, high level programming interface to various calling
+conventions. This allows a programmer to call any function specified by a call interface description at run-time."""
+
+toolchain = {'name': 'GCC', 'version': '5.4.0-2.26'}
+
+source_urls = [
+    'ftp://sourceware.org/pub/libffi/',
+    'http://www.mirrorservice.org/sites/sourceware.org/pub/libffi/',
+]
+sources = [SOURCELOWER_TAR_GZ]
+
+sanity_check_paths = {
+    'files': [('lib/libffi.%s' % SHLIB_EXT, 'lib64/libffi.%s' % SHLIB_EXT), ('lib/libffi.a', 'lib64/libffi.a')],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.2.1-foss-2016.04.eb b/easybuild/easyconfigs/l/libffi/libffi-3.2.1-foss-2016.04.eb
new file mode 100644
index 0000000000000000000000000000000000000000..37b990fbd320e13c4d37e02ef55f68c618eab588
--- /dev/null
+++ b/easybuild/easyconfigs/l/libffi/libffi-3.2.1-foss-2016.04.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'libffi'
+version = '3.2.1'
+
+homepage = 'http://sourceware.org/libffi/'
+description = """The libffi library provides a portable, high level programming interface to various calling
+conventions. This allows a programmer to call any function specified by a call interface description at run-time."""
+
+toolchain = {'name': 'foss', 'version': '2016.04'}
+
+source_urls = [
+    'ftp://sourceware.org/pub/libffi/',
+    'http://www.mirrorservice.org/sites/sourceware.org/pub/libffi/',
+]
+sources = [SOURCELOWER_TAR_GZ]
+
+sanity_check_paths = {
+    'files': [('lib/libffi.%s' % SHLIB_EXT, 'lib64/libffi.%s' % SHLIB_EXT), ('lib/libffi.a', 'lib64/libffi.a')],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libgd/libgd-2.2.3-intel-2016b.eb b/easybuild/easyconfigs/l/libgd/libgd-2.2.3-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3a99421ffa1f3b4c87ef6d7018bcee9abbed4418
--- /dev/null
+++ b/easybuild/easyconfigs/l/libgd/libgd-2.2.3-intel-2016b.eb
@@ -0,0 +1,26 @@
+easyblock = 'ConfigureMake'
+
+name = 'libgd'
+version = '2.2.3'
+
+homepage = 'http://libgd.bitbucket.org/'
+description = "GD is an open source code library for the dynamic creation of images by programmers."
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['https://github.com/libgd/libgd/releases/download/gd-%(version)s/']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('fontconfig', '2.12.1'),
+    ('libjpeg-turbo', '1.5.0'),
+    ('libpng', '1.6.24'),
+    ('zlib', '1.2.8'),
+]
+
+sanity_check_paths = {
+    'files': ["lib/libgd.a", "lib/libgd.%s" % SHLIB_EXT],
+    'dirs': ["bin", "include"],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libibmad/libibmad-1.3.12-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/l/libibmad/libibmad-1.3.12-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d619aa0f828733b0626c44ebe636cd1722452ba3
--- /dev/null
+++ b/easybuild/easyconfigs/l/libibmad/libibmad-1.3.12-GCC-4.9.3-2.25.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'libibmad'
+version = '1.3.12'
+
+homepage = 'http://www.openfabrics.org'
+description = """libibmad is a convenience library to encode, decode, and dump IB MAD packets. It
+ is implemented on top of and in conjunction with libibumad (the umad kernel
+ interface library.)"""
+
+toolchain = {'name': 'GCC', 'version': '4.9.3-2.25'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://www.openfabrics.org/downloads/management/']
+
+dependencies = [('libibumad', '1.3.10.2')]
+
+sanity_check_paths = {
+    'files': ['include/infiniband/mad.h', 'include/infiniband/mad_osd.h',
+              'lib/libibmad.a', 'lib/libibmad.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/l/libibumad/libibumad-1.3.10.2-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/l/libibumad/libibumad-1.3.10.2-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c2063cef0d60e2495ea213140131072c42624ff0
--- /dev/null
+++ b/easybuild/easyconfigs/l/libibumad/libibumad-1.3.10.2-GCC-4.9.3-2.25.eb
@@ -0,0 +1,19 @@
+easyblock = 'ConfigureMake'
+
+name = 'libibumad'
+version = '1.3.10.2'
+
+homepage = 'http://www.openfabrics.org'
+description = """libibumad is the umad kernel interface library."""
+
+toolchain = {'name': 'GCC', 'version': '4.9.3-2.25'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://www.openfabrics.org/downloads/management/']
+
+sanity_check_paths = {
+    'files': ['include/infiniband/umad.h', 'lib/libibumad.a', 'lib/libibumad.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.2-foss-2016a-NASM-2.12.01.eb b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.2-foss-2016a-NASM-2.12.01.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8728627d19aae25f2dc4f6934455f062ff538971
--- /dev/null
+++ b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.2-foss-2016a-NASM-2.12.01.eb
@@ -0,0 +1,33 @@
+easyblock = 'ConfigureMake'
+
+name = 'libjpeg-turbo'
+version = '1.4.2'
+
+homepage = 'http://sourceforge.net/projects/libjpeg-turbo/'
+description = """libjpeg-turbo is a fork of the original IJG libjpeg which uses SIMD to accelerate baseline JPEG
+compression and decompression. libjpeg is a library that implements JPEG image encoding, decoding and transcoding.
+"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+nasmver = '2.12.01'
+versionsuffix = '-NASM-%s' % nasmver
+
+dependencies = [
+    ('NASM', nasmver),
+]
+
+configopts = "--with-jpeg8"
+runtest = "test"
+
+sanity_check_paths = {
+    'files': ['bin/cjpeg', 'bin/djpeg', 'bin/jpegtran', 'bin/rdjpgcom', 'bin/tjbench', 'bin/wrjpgcom',
+              'lib/libjpeg.a', 'lib/libjpeg.%s' % SHLIB_EXT, 'lib/libturbojpeg.a', 'lib/libturbojpeg.%s' % SHLIB_EXT],
+    'dirs': ['include', 'share'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.5.1-intel-2016b.eb b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.5.1-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ecf772ccf16697ea7774b1b1d17ad8ed16ff38f5
--- /dev/null
+++ b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.5.1-intel-2016b.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'libjpeg-turbo'
+version = '1.5.1'
+
+homepage = 'http://sourceforge.net/projects/libjpeg-turbo/'
+description = """libjpeg-turbo is a fork of the original IJG libjpeg which uses SIMD to accelerate baseline JPEG
+compression and decompression. libjpeg is a library that implements JPEG image encoding, decoding and transcoding.
+"""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+toolchainopts = {'pic': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('NASM', '2.12.02'),
+]
+
+configopts = "--with-jpeg8"
+runtest = "test"
+
+sanity_check_paths = {
+    'files': ['bin/cjpeg', 'bin/djpeg', 'bin/jpegtran', 'bin/rdjpgcom', 'bin/tjbench', 'bin/wrjpgcom',
+              'lib/libjpeg.a', 'lib/libjpeg.%s' % SHLIB_EXT, 'lib/libturbojpeg.a', 'lib/libturbojpeg.%s' % SHLIB_EXT],
+    'dirs': ['include', 'share'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.11-intel-2016b.eb b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.11-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1e97665ea81cac89541c4f5daed0fe495d5052b4
--- /dev/null
+++ b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.11-intel-2016b.eb
@@ -0,0 +1,33 @@
+easyblock = 'ConfigureMake'
+
+name = 'libmatheval'
+version = '1.1.11'
+
+homepage = 'http://www.gnu.org/software/libmatheval/'
+description = """GNU libmatheval is a library (callable from C and Fortran) to parse
+ and evaluate symbolic expressions input as text."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+dependencies = [
+    ('flex', '2.6.0'),
+    ('Bison', '3.0.4'),
+    ('byacc', '20160606'),
+    ('Guile', '1.8.8'),
+]
+
+configopts = '--with-pic '
+
+# fix for guile-config being broken because shebang line contains full path to bin/guile
+configopts += 'GUILE_CONFIG="$EBROOTGUILE/bin/guile -e main -s $EBROOTGUILE/bin/guile-config"'
+
+sanity_check_paths = {
+    'files': ['lib/libmatheval.a', 'include/matheval.h'],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.6.24-GCCcore-4.9.3.eb b/easybuild/easyconfigs/l/libpng/libpng-1.6.24-GCCcore-4.9.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a2901e08909e0d2c01b2f2b4aa4b9efa99a3f1dd
--- /dev/null
+++ b/easybuild/easyconfigs/l/libpng/libpng-1.6.24-GCCcore-4.9.3.eb
@@ -0,0 +1,32 @@
+easyblock = 'ConfigureMake'
+
+name = 'libpng'
+version = '1.6.24'
+
+homepage = 'http://www.libpng.org/pub/png/libpng.html'
+description = "libpng is the official PNG reference library"
+
+toolchain = {'name': 'GCCcore', 'version': '4.9.3'}
+toolchainopts = {'pic': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+builddependencies = [
+    ('binutils', '2.25'),
+]
+
+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/libpng/libpng-1.6.24-foss-2016b.eb b/easybuild/easyconfigs/l/libpng/libpng-1.6.24-foss-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9f690e65b23ce08b7a4c589a3e99abae68c11dfb
--- /dev/null
+++ b/easybuild/easyconfigs/l/libpng/libpng-1.6.24-foss-2016b.eb
@@ -0,0 +1,26 @@
+easyblock = 'ConfigureMake'
+
+name = 'libpng'
+version = '1.6.24'
+
+homepage = 'http://www.libpng.org/pub/png/libpng.html'
+description = "libpng is the official PNG reference library"
+
+toolchain = {'name': 'foss', 'version': '2016b'}
+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/libpng/libpng-1.6.26-foss-2016b.eb b/easybuild/easyconfigs/l/libpng/libpng-1.6.26-foss-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..83dd651c2b45b5c125facd4bb48561e32ca8ba17
--- /dev/null
+++ b/easybuild/easyconfigs/l/libpng/libpng-1.6.26-foss-2016b.eb
@@ -0,0 +1,26 @@
+easyblock = 'ConfigureMake'
+
+name = 'libpng'
+version = '1.6.26'
+
+homepage = 'http://www.libpng.org/pub/png/libpng.html'
+description = "libpng is the official PNG reference library"
+
+toolchain = {'name': 'foss', 'version': '2016b'}
+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/libpng/libpng-1.6.26-intel-2016b.eb b/easybuild/easyconfigs/l/libpng/libpng-1.6.26-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ba71624bd16b8c3dcc02b0c2856bb6f353f1bac3
--- /dev/null
+++ b/easybuild/easyconfigs/l/libpng/libpng-1.6.26-intel-2016b.eb
@@ -0,0 +1,26 @@
+easyblock = 'ConfigureMake'
+
+name = 'libpng'
+version = '1.6.26'
+
+homepage = 'http://www.libpng.org/pub/png/libpng.html'
+description = "libpng is the official PNG reference library"
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+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/libreadline/libreadline-6.3-GCC-4.8.2.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GCC-4.8.2.eb
index 55d005e4b82e316d63398755953eb6f1d33547be..3d2321bd0603b3ed1715fa3f824cd4fce290eac1 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GCC-4.8.2.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GCC-4.8.2.eb
@@ -10,6 +10,7 @@ description = """The GNU Readline library provides a set of functions for use by
  to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands."""
 
 toolchain = {'name': 'GCC', 'version': '4.8.2'}
+toolchainopts = {'pic': True}
 
 sources = ['readline-%(version)s.tar.gz']
 source_urls = ['http://ftp.gnu.org/gnu/readline']
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GCC-4.8.4.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GCC-4.8.4.eb
new file mode 100644
index 0000000000000000000000000000000000000000..25cb143653dd8483a339cc9d7e75ecad27980eec
--- /dev/null
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GCC-4.8.4.eb
@@ -0,0 +1,32 @@
+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': 'GCC', 'version': '4.8.4'}
+toolchainopts = {'pic': True}
+
+sources = ['readline-%(version)s.tar.gz']
+source_urls = ['http://ftp.gnu.org/gnu/readline']
+
+patches = ['libreadline-%(version)s-bugfix.patch']
+
+dependencies = [('ncurses', '5.9')]
+
+# for the termcap symbols, use EB ncurses
+preconfigopts = "env 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-GCC-5.4.0-2.26.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GCC-5.4.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..645b3114fd3bcbea8a8c24663410b9da5b577b99
--- /dev/null
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GCC-5.4.0-2.26.eb
@@ -0,0 +1,32 @@
+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': 'GCC', 'version': '5.4.0-2.26'}
+toolchainopts = {'pic': True}
+
+sources = ['readline-%(version)s.tar.gz']
+source_urls = ['http://ftp.gnu.org/gnu/readline']
+
+patches = ['libreadline-%(version)s-bugfix.patch']
+
+dependencies = [('ncurses', '6.0')]
+
+# for the termcap symbols, use EB ncurses
+preconfigopts = "env 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-2016.04.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2016.04.eb
new file mode 100644
index 0000000000000000000000000000000000000000..14fbd4b55ee8f62ea7bd6af73167599c0c965599
--- /dev/null
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2016.04.eb
@@ -0,0 +1,32 @@
+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': '2016.04'}
+toolchainopts = {'pic': True}
+
+sources = ['readline-%(version)s.tar.gz']
+source_urls = ['http://ftp.gnu.org/gnu/readline']
+
+patches = ['libreadline-%(version)s-bugfix.patch']
+
+dependencies = [('ncurses', '6.0')]
+
+# for the termcap symbols, use EB ncurses
+preconfigopts = "env 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.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..36625b171750d5840cf2356e929f32d1dd03f72a
--- /dev/null
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3.eb
@@ -0,0 +1,32 @@
+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': 'dummy', 'version': ''}
+toolchainopts = {'pic': True}
+
+sources = ['readline-%(version)s.tar.gz']
+source_urls = ['http://ftp.gnu.org/gnu/readline']
+
+patches = ['libreadline-%(version)s-bugfix.patch']
+
+dependencies = [('ncurses', '6.0')]
+
+# for the termcap symbols, use EB ncurses
+preconfigopts = "env 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/libtool/libtool-2.4.6-GCC-5.4.0-2.26.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GCC-5.4.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ba5556d8b58c436d3c6963f04275aab0e2180431
--- /dev/null
+++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GCC-5.4.0-2.26.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': '5.4.0-2.26'}
+
+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-GCCcore-4.9.3.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GCCcore-4.9.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ae9366cdfd6f30e337176402093840ef7781c7b4
--- /dev/null
+++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GCCcore-4.9.3.eb
@@ -0,0 +1,23 @@
+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': 'GCCcore', 'version': '4.9.3'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+builddependencies = [
+    ('binutils', '2.25')
+]
+
+dependencies = [
+    ('M4', '1.4.17'),
+]
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.6-foss-2016.04.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.6-foss-2016.04.eb
new file mode 100644
index 0000000000000000000000000000000000000000..bc63db0c69cfa5eefd89f05d9d6bc87897149e57
--- /dev/null
+++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.6-foss-2016.04.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': '2016.04'}
+
+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.6-intel-2016b.eb b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.6-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a1958c52c67032d5e96425f06b3e1224daf2398b
--- /dev/null
+++ b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.6-intel-2016b.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'libunistring'
+version = '0.9.6'
+
+homepage = 'http://www.gnu.org/software/libunistring/'
+description = """This library provides functions for manipulating Unicode strings and for manipulating C strings
+ according to the Unicode standard."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+sources = [SOURCELOWER_TAR_XZ]
+source_urls = [GNU_SOURCE]
+
+parallel = 1
+
+sanity_check_paths = {
+    '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'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libunwind/libunwind-1.1-intel-2016b.eb b/easybuild/easyconfigs/l/libunwind/libunwind-1.1-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..aea3c64e514e8e1c8a0f6ea4a2e611552eca3b4c
--- /dev/null
+++ b/easybuild/easyconfigs/l/libunwind/libunwind-1.1-intel-2016b.eb
@@ -0,0 +1,33 @@
+easyblock = 'ConfigureMake'
+
+name = 'libunwind'
+version = '1.1'
+
+homepage = 'http://www.nongnu.org/libunwind/'
+description = """The primary goal of libunwind is to define a portable and efficient C programming interface
+ (API) to determine the call-chain of a program. The API additionally provides the means to manipulate the
+ preserved (callee-saved) state of each call-frame and to resume execution at any point in the call-chain
+ (non-local goto). The API supports both local (same-process) and remote (across-process) operation.
+ As such, the API is useful in a number of applications"""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [GNU_SAVANNAH_SOURCE]
+
+checksums = [
+    'fb4ea2f6fbbe45bf032cd36e586883ce',     # libunwind-1.1.tar.gz
+]
+
+dependencies = [
+    ('XZ', '5.2.2'),
+]
+
+preconfigopts = 'export LIBS="$LIBS -llzma" && '
+
+sanity_check_paths = {
+    'files': ["include/libunwind.h", "lib/libunwind.%s" % SHLIB_EXT],
+    'dirs': []
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libxc/libxc-2.2.3-intel-2016b.eb b/easybuild/easyconfigs/l/libxc/libxc-2.2.3-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a8378f30876e07fe358031c9e97886218e07434e
--- /dev/null
+++ b/easybuild/easyconfigs/l/libxc/libxc-2.2.3-intel-2016b.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'libxc'
+version = '2.2.3'
+
+homepage = 'http://www.tddft.org/programs/octopus/wiki/index.php/Libxc'
+description = """Libxc is a library of exchange-correlation functionals for density-functional theory.
+ The aim is to provide a portable, well tested and reliable set of exchange and correlation functionals."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://www.tddft.org/programs/octopus/down.php?file=libxc/']
+
+configopts = 'FC="$F77" FCFLAGS="$FFLAGS" --enable-shared --enable-fortran'
+
+# From the libxc mailing list
+# To summarize: expect less tests to fail in libxc 2.0.2, but don't expect
+# a fully working testsuite soon (unless someone wants to volunteer to do
+# it, of course  ) In the meantime, unless the majority of the tests
+# fail, your build should be fine.
+#runtest = 'check'
+
+sanity_check_paths = {
+    'files': ['lib/libxc%s.%s' % (x,y) for x in ['', 'f90'] for y in ['a', SHLIB_EXT]],
+    'dirs': ['include'],
+}
+
+parallel = 1
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/l/libxc/libxc-3.0.0-intel-2016b.eb b/easybuild/easyconfigs/l/libxc/libxc-3.0.0-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..951b7f060524ccb3711edb6bd9b6bf5ae92a9d79
--- /dev/null
+++ b/easybuild/easyconfigs/l/libxc/libxc-3.0.0-intel-2016b.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'libxc'
+version = '3.0.0'
+
+homepage = 'http://www.tddft.org/programs/octopus/wiki/index.php/Libxc'
+description = """Libxc is a library of exchange-correlation functionals for density-functional theory.
+ The aim is to provide a portable, well tested and reliable set of exchange and correlation functionals."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://www.tddft.org/programs/octopus/down.php?file=libxc/']
+
+configopts = 'FC="$F77" FCFLAGS="$FFLAGS" --enable-shared --enable-fortran'
+
+# From the libxc mailing list
+# To summarize: expect less tests to fail in libxc 2.0.2, but don't expect
+# a fully working testsuite soon (unless someone wants to volunteer to do
+# it, of course  ) In the meantime, unless the majority of the tests
+# fail, your build should be fine.
+#runtest = 'check'
+
+sanity_check_paths = {
+    'files': ['lib/libxc%s.%s' % (x,y) for x in ['', 'f90'] for y in ['a', SHLIB_EXT]],
+    'dirs': ['include'],
+}
+
+parallel = 1
+
+moduleclass = 'chem'
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 e1868be130ff398cabf41c2b25011dc0b7649851..b18cebf5edfe15fafef037c8c98a3bc8eb5feb71 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
@@ -1,5 +1,6 @@
 name = 'libxml2'
 version = '2.8.0'
+versionsuffix = '-Python-%(pyver)s'
 
 homepage = 'http://xmlsoft.org/'
 description = """Libxml2 is the XML C parser and toolchain developed for the Gnome project (but usable
@@ -13,20 +14,9 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB'
-
-pythonver = '2.7.3'
-pythonshortver = '.'.join(pythonver.split('.')[0:2])
-versionsuffix = '-%s-%s' % ('Python', pythonver)
-
 dependencies = [
     ('zlib', '1.2.7'),
-    ('Python', pythonver),
+    ('Python', '2.7.3'),
 ]
 
-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.8.0-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goolf-1.4.10.eb
index 00021cddc927def653589c79778a6281c6125a56..8dce8ccf026a985e59443dadc034a5467ad1f248 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
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.8.0'
 
@@ -15,13 +13,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 dependencies = [('zlib', '1.2.7')]
 
-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.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 5a92ef8bcb6c45abb4b30d473c350bbe58df8c0e..ecc03cc89879e7574a2d6dda45c7195f77c1bc8d 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
@@ -1,5 +1,6 @@
 name = 'libxml2'
 version = '2.8.0'
+versionsuffix = '-Python-%(pyver)s'
 
 homepage = 'http://xmlsoft.org/'
 description = """Libxml2 is the XML C parser and toolchain developed for the Gnome project (but usable
@@ -14,20 +15,9 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB'
-
-pythonver = '2.7.3'
-pythonshortver = '.'.join(pythonver.split('.')[0:2])
-versionsuffix = '-%s-%s' % ('Python', pythonver)
-
 dependencies = [
     ('zlib', '1.2.7'),
-    ('Python', pythonver),
+    ('Python', '2.7.3'),
 ]
 
-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.8.0-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-5.3.0.eb
index 98b15d6f97412023622f8b60ec1e4026c2e5f2bc..e6c885e909be27f3c699a6491ab49c6394202da5 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
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.8.0'
 
@@ -16,13 +14,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 dependencies = [('zlib', '1.2.7')]
 
-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.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 3f185c7e6d12585f91d9a7e745b987de5b7a23d9..b3162eb734e7b86a0bcef72a0f8138162a9a135e 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
@@ -1,5 +1,6 @@
 name = 'libxml2'
 version = '2.8.0'
+versionsuffix = '-Python-%(pyver)s'
 
 homepage = 'http://xmlsoft.org/'
 description = """Libxml2 is the XML C parser and toolchain developed for the Gnome project (but usable
@@ -14,20 +15,9 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB'
-
-pythonver = '2.7.3'
-pythonshortver = '.'.join(pythonver.split('.')[0:2])
-versionsuffix = '-%s-%s' % ('Python', pythonver)
-
 dependencies = [
     ('zlib', '1.2.8'),
-    ('Python', pythonver),
+    ('Python', '2.7.3'),
 ]
 
-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.0-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-goolf-1.4.10.eb
index ee43d716e22326706f520952b966791780ce6699..437c090f565f41f0227f03c999a96bb5a3e205c1 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
@@ -1,11 +1,10 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.0'
 
 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': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'pic': True}
 
@@ -15,13 +14,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 dependencies = [('zlib', '1.2.7')]
 
-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.0-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-ictce-5.3.0.eb
index f0aa6dee9cb24a65f7885798ea62e7ae936da42e..de12c4768fc8a485c3adb888d0d9d585753be7ec 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
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.0'
 
@@ -16,13 +14,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 dependencies = [('zlib', '1.2.7')]
 
-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.1-foss-2015b.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-foss-2015b.eb
index 03c075bd1ad120d75cf42b76c40171a8fbadd5f4..4a999c8acc9c85094e6d81c5942ca320e3c14178 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-foss-2015b.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-foss-2015b.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.1'
 
@@ -17,13 +15,5 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 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.1-goolf-1.4.10-Python-2.7.5.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goolf-1.4.10-Python-2.7.5.eb
index ae7f22f7a4879db23c81cc74d16da7ac406148c4..758bb9dd8441658b60b063f021d3953c2db438c6 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goolf-1.4.10-Python-2.7.5.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goolf-1.4.10-Python-2.7.5.eb
@@ -7,6 +7,7 @@ description = """Libxml2 is the XML C parser and toolchain developed for the Gno
  outside of the Gnome platform)."""
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
+toolchainopts = {'pic': True}
 
 source_urls = [
     'http://xmlsoft.org/sources/',
@@ -14,8 +15,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB'
-
 dependencies = [
     ('zlib', '1.2.8'),
     ('Python', '2.7.5'),
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 544880545882f3f6c20049a7865e12751323e67b..4e5a1b7c92866540212495f3f5cd8936d7ea6acf 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
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.1'
 
@@ -16,13 +14,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 dependencies = [('zlib', '1.2.7')]
 
-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.1-goolf-1.5.14.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goolf-1.5.14.eb
index b09000568f8db517f296a5991790e8657ed87348..ef65dcb9acc3a5ca1e9644f781f661a8951eb572 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
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.1'
 
@@ -16,13 +14,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 dependencies = [('zlib', '1.2.7')]
 
-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.1-ictce-5.2.0.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.2.0.eb
index aa7e4b1f778e00617c3d95c2057846db16512f20..c4fbddee119f9f128fb3c1cd80b1c6e75e59de9d 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
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.1'
 
@@ -16,13 +14,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 dependencies = [('zlib', '1.2.7')]
 
-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.1-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.3.0.eb
index e50f08d5e37560069cdf6158b737748924811bab..345f7339bbbd37920163a46d5a2b33fc49f26a00 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
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.1'
 
@@ -16,13 +14,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 dependencies = [('zlib', '1.2.7')]
 
-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.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 9d4e84392a22f9d5a177706e700433ffbc5069c9..0cdd2e03c2cbc0a3c1ac84b1fe01d32b77b11a34 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
@@ -1,5 +1,6 @@
 name = 'libxml2'
 version = '2.9.1'
+versionsuffix = '-Python-%(pyver)s'
 
 homepage = 'http://xmlsoft.org/'
 description = """Libxml2 is the XML C parser and toolchain developed for the Gnome project (but usable
@@ -14,20 +15,9 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB'
-
-pythonver = '2.7.6'
-pythonshortver = '.'.join(pythonver.split('.')[0:2])
-versionsuffix = '-%s-%s' % ('Python', pythonver)
-
 dependencies = [
     ('zlib', '1.2.7'),
-    ('Python', pythonver),
+    ('Python', '2.7.6'),
 ]
 
-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.1-ictce-5.5.0.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.5.0.eb
index 0cdacffa3af6fd2ec1e7825282e6488f47af531b..35cce5f83232858d2fec4bc624a7abdec05b235f 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
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.1'
 
@@ -16,13 +14,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 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.1-ictce-7.1.2.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-7.1.2.eb
index ca67a911c12c9b5c5244a06bb8a459740ceb6bcd..9322eb079f38c76ff91b1a02d82687be4c0d6bb8 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
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.1'
 
@@ -17,13 +15,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 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.1-intel-2014b.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-intel-2014b.eb
index c6335dd8b2f74a716215ae7f98f6becd3cae7cdb..7322bbf1cfcaec2585222fdce9fa19fb1ab5c328 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
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.1'
 
@@ -17,13 +15,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 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-GCC-4.8.3.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-GCC-4.8.3.eb
index 173e4c18707e8f04582d1c7d4b6b22d3fdfb4006..47732da727b21a4eeabf404bbfa1b02f1b651c0f 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-GCC-4.8.3.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-GCC-4.8.3.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.2'
 
@@ -9,6 +7,7 @@ toolchain developed for the Gnome project
  (but usable outside of the Gnome platform)."""
 
 toolchain = {'name': 'GCC', 'version': '4.8.3'}
+toolchainopts = {'pic': True}
 
 source_urls = [
     'http://xmlsoft.org/sources/',
@@ -16,13 +15,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 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-GCC-4.8.4.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-GCC-4.8.4.eb
new file mode 100644
index 0000000000000000000000000000000000000000..25e24ba97f44a5640db770f63302b6025539641c
--- /dev/null
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-GCC-4.8.4.eb
@@ -0,0 +1,20 @@
+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.8.4'}
+toolchainopts = {'pic': True}
+
+source_urls = [
+    'http://xmlsoft.org/sources/',
+    'http://xmlsoft.org/sources/old/'
+]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('zlib', '1.2.8')]
+
+moduleclass = 'lib'
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 841eddc11e74280cdfe8eeebfe8c230067635006..84f6203208c0d900800053d9e93973166fb2f02a 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
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.2'
 
@@ -17,13 +15,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 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-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-GCC-4.9.3-2.25.eb
index 8d892b499fd15242aee8ba21b4c92f8a434cf7df..80b60e88bec9a3c33027537187dccdf9d60772c2 100644
--- 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
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.2'
 
@@ -17,13 +15,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 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 3c33fb41dada3f6026c6e84977b08a46bda80cb2..8fb7cc97f084af04b80afd04124e6a63dc9c9467 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
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.2'
 
@@ -16,13 +14,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 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-foss-2015a.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-foss-2015a.eb
index ae39cc8c24a233b63d52b459e44d9d655fcce23c..0d7eb11ba26209348356964703c2f93eb2c0f612 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
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.2'
 
@@ -17,13 +15,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 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-foss-2015b.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-foss-2015b.eb
index ad02e51c2e0b8cc8fde45590554164500bb40d2c..933fed03d3849081a4eb88ffbf7e11db4e7ae826 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
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.2'
 
@@ -17,13 +15,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 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-goolf-1.5.14.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-goolf-1.5.14.eb
index f232e382c068930ef87c3117dfc1502063d04f79..935739296d91df4d6c8e30aa1c53936866a6e7e5 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
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.2'
 
@@ -17,13 +15,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 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-goolf-1.5.16.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-goolf-1.5.16.eb
index 54c5dad803dc36681877716fb5eed01f228cc478..22db63d4d819a1e1dbd653d6220b5b3bee595ea7 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-goolf-1.5.16.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-goolf-1.5.16.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.2'
 
@@ -17,13 +15,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 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-goolf-1.7.20.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-goolf-1.7.20.eb
index 22d8c149d6182236593bddd12650e24ac05c118c..42669ee57de4d05ba61fbbd7c5f20599ce5ef2a7 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
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.2'
 
@@ -17,13 +15,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 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-intel-2014.06.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2014.06.eb
index acdd85b6e6aace5c28f4aebde20699524ac346f3..947a255ee98d9c0bf53dcb38fa7afeecbc7a314b 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
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.2'
 
@@ -17,13 +15,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 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-intel-2014b.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2014b.eb
index 22aefe7d0cda545af8245c0aa775c2cfe7e636d8..d0e28b417879628ed190db3f6f2a1977e781c4cb 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
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.2'
 
@@ -17,13 +15,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 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-intel-2015a-Python-2.7.10.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2015a-Python-2.7.10.eb
index 37724f23f1b4a7ba85174a824f4ffa561c475639..b4846f1d26a11fdf51871f84e70f9eeb2ad07715 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2015a-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2015a-Python-2.7.10.eb
@@ -1,5 +1,6 @@
 name = 'libxml2'
 version = '2.9.2'
+versionsuffix = '-Python-%(pyver)s'
 
 homepage = 'http://xmlsoft.org/'
 description = """Libxml2 is the XML C parser and toolchain developed for the Gnome project (but usable
@@ -14,15 +15,9 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB'
-
-pythonver = '2.7.10'
-pythonshortver = '.'.join(pythonver.split('.')[0:2])
-versionsuffix = '-%s-%s' % ('Python', pythonver)
-
 dependencies = [
     ('zlib', '1.2.8'),
-    ('Python', pythonver),
+    ('Python', '2.7.10'),
 ]
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2015a-Python-2.7.9.eb
index 307b1793d4b0e1a6358aa8a2629b6df694701eee..af7eb40b20cf055c503e181c25e118e3487cf1ab 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2015a-Python-2.7.9.eb
@@ -1,5 +1,6 @@
 name = 'libxml2'
 version = '2.9.2'
+versionsuffix = '-Python-%(pyver)s'
 
 homepage = 'http://xmlsoft.org/'
 description = """Libxml2 is the XML C parser and toolchain developed for the Gnome project (but usable
@@ -14,15 +15,9 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB'
-
-pythonver = '2.7.9'
-pythonshortver = '.'.join(pythonver.split('.')[0:2])
-versionsuffix = '-%s-%s' % ('Python', pythonver)
-
 dependencies = [
     ('zlib', '1.2.8'),
-    ('Python', pythonver),
+    ('Python', '2.7.9'),
 ]
 
 moduleclass = 'lib'
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 1a4f4c99c405566e2a75e7207a9e9cae081db8f7..28e034ab2caf64623deb5d6df860dca27b562bb5 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
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.2'
 
@@ -17,13 +15,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 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-intel-2015b.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2015b.eb
index b95f92dfd972c2ab5f1dc8c34d76ca2032849a8a..a9be90146562af4f948d84eb5ad9001da5864495 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
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.2'
 
@@ -17,13 +15,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 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.3-CrayGNU-2016.03.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-CrayGNU-2016.03.eb
index e7c2739dac49f6bcb76fc9f5847ff50b0db780f8..135641e29dfac96075b40ceeccaf0b06a976766f 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-CrayGNU-2016.03.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-CrayGNU-2016.03.eb
@@ -1,6 +1,4 @@
 # contributed by Luca Marsella (CSCS)
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = "2.9.3"
 
@@ -18,13 +16,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 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.3-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-GCC-4.9.3-2.25.eb
index ba6d0a4c3f26989449ef72ed359a4fb73933c8a8..4447186030ad7baa52166e810271a66f8a1c5abe 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-GCC-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-GCC-4.9.3-2.25.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.3'
 
@@ -16,13 +14,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 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.3-foss-2015a-Python-2.7.11.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-foss-2015a-Python-2.7.11.eb
index 6cafc86e4f1dfbfc33ad5c06b6c66069a96293bc..38a9a0dfbcd8e59d5d4be4f1dffb4889be9de3b1 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-foss-2015a-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-foss-2015a-Python-2.7.11.eb
@@ -1,5 +1,6 @@
 name = 'libxml2'
 version = '2.9.3'
+versionsuffix = '-Python-%(pyver)s'
 
 homepage = 'http://xmlsoft.org/'
 description = """Libxml2 is the XML C parser and toolchain developed for the Gnome project (but usable
@@ -14,15 +15,9 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB'
-
-pythonver = '2.7.11'
-pythonshortver = '.'.join(pythonver.split('.')[:2])
-versionsuffix = '-%s-%s' % ('Python', pythonver)
-
 dependencies = [
     ('zlib', '1.2.8'),
-    ('Python', pythonver),
+    ('Python', '2.7.11'),
 ]
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-foss-2015a.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-foss-2015a.eb
index 59e0331739e491981981c5cba731ee5ee494be69..3f244ca27186be38a8c247a06f64f348d8f9b8c3 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-foss-2015a.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-foss-2015a.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.3'
 
@@ -16,8 +14,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 dependencies = [
     ('zlib', '1.2.8'),
 ]
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-foss-2016a-Python-2.7.11.eb
index 0df5cbd9574ae3f33a2dfe201fbf9d97571fbeb2..5c76876c0d7dc35140cded0f61d42a8f70730338 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-foss-2016a-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-foss-2016a-Python-2.7.11.eb
@@ -15,8 +15,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB'
-
 dependencies = [
     ('zlib', '1.2.8'),
     ('Python', '2.7.11'),
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-foss-2016a.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-foss-2016a.eb
index 9f21eb1b663320556b4e5a4ce63eb3cd42a74085..45737f40c5f3de6fa5cc69229b80c4a32e9f45ad 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-foss-2016a.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-foss-2016a.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.3'
 
@@ -17,13 +15,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 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.3-gimkl-2.11.5.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-gimkl-2.11.5.eb
index 1f39ac3f7d499c91a45b4cba2d5e7ed9b663af26..b5f12f37c260039129046dcf2e74cba810255c04 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-gimkl-2.11.5.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-gimkl-2.11.5.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.3'
 
@@ -17,13 +15,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 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.3-goolf-1.7.20.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-goolf-1.7.20.eb
index 66513c188bb1828608c819f54afe2890174c8cbb..116952d9c812f84337f07d876165a9fa20a1619a 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-goolf-1.7.20.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.3'
 
@@ -17,13 +15,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 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.3-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-intel-2015b-Python-2.7.10.eb
index 34777c9cc6854fe24010d28e50f4775ff509cd8b..f919243b0f910a3e6650c2aa96cc2c01fe1c06e5 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-intel-2015b-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-intel-2015b-Python-2.7.10.eb
@@ -1,5 +1,6 @@
 name = 'libxml2'
 version = '2.9.3'
+versionsuffix = '-Python-%(pyver)s'
 
 homepage = 'http://xmlsoft.org/'
 description = """Libxml2 is the XML C parser and toolchain developed for the Gnome project (but usable
@@ -14,15 +15,9 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB'
-
-pythonver = '2.7.10'
-pythonshortver = '.'.join(pythonver.split('.')[0:2])
-versionsuffix = '-%s-%s' % ('Python', pythonver)
-
 dependencies = [
     ('zlib', '1.2.8'),
-    ('Python', pythonver),
+    ('Python', '2.7.10'),
 ]
 
 moduleclass = 'lib'
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
index b28071061aede91e38954f4b53595cce896a95b2..95fbcbd2d44c99e91af66736044879a65d20c7a6 100644
--- 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
@@ -1,5 +1,6 @@
 name = 'libxml2'
 version = '2.9.3'
+versionsuffix = '-Python-%(pyver)s'
 
 homepage = 'http://xmlsoft.org/'
 description = """Libxml2 is the XML C parser and toolchain developed for the Gnome project (but usable
@@ -14,15 +15,9 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB'
-
-pythonver = '2.7.11'
-pythonshortver = '.'.join(pythonver.split('.')[:2])
-versionsuffix = '-%s-%s' % ('Python', pythonver)
-
 dependencies = [
     ('zlib', '1.2.8'),
-    ('Python', pythonver),
+    ('Python', '2.7.11'),
 ]
 
 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
index 41e2af0e98c1c7b46d1cfb791bef67d5eb1eacd6..b50b2e930b8987ff725ed42a0b8311f992c65b5b 100644
--- 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
@@ -1,5 +1,6 @@
 name = 'libxml2'
 version = '2.9.3'
+versionsuffix = '-Python-%(pyver)s'
 
 homepage = 'http://xmlsoft.org/'
 description = """Libxml2 is the XML C parser and toolchain developed for the Gnome project (but usable
@@ -14,15 +15,9 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB'
-
-pyver = '2.7.11'
-pyshortver = '.'.join(pyver.split('.')[:2])
-versionsuffix = '-Python-%s' % pyver
-
 dependencies = [
     ('zlib', '1.2.8'),
-    ('Python', pyver),
+    ('Python', '2.7.11'),
 ]
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-intel-2016a.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-intel-2016a.eb
index b762d969015cee07367d5f5be54962ad7912cfe8..483a54f92aae8eaf516059af2fa45bdb20d2c943 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-intel-2016a.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-intel-2016a.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.3'
 
@@ -17,13 +15,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
 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.4-GCC-5.4.0-2.26.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-GCC-5.4.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..798eea2998235307d5d00aea8af3c0fb879a244b
--- /dev/null
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-GCC-5.4.0-2.26.eb
@@ -0,0 +1,22 @@
+name = 'libxml2'
+version = '2.9.4'
+
+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': '5.4.0-2.26'}
+toolchainopts = {'pic': True}
+
+source_urls = [
+    'http://xmlsoft.org/sources/',
+    'http://xmlsoft.org/sources/old/'
+]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('XZ', '5.2.2'),
+]
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-GCCcore-4.9.3.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-GCCcore-4.9.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4873fafcda4f4fe7a885b55a2163ad7a73e521c1
--- /dev/null
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-GCCcore-4.9.3.eb
@@ -0,0 +1,27 @@
+name = 'libxml2'
+version = '2.9.4'
+
+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': 'GCCcore', 'version': '4.9.3'}
+toolchainopts = {'pic': True}
+
+source_urls = [
+    'http://xmlsoft.org/sources/',
+    'http://xmlsoft.org/sources/old/'
+]
+sources = [SOURCELOWER_TAR_GZ]
+
+builddependencies = [
+    ('binutils', '2.25'),
+]
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('XZ', '5.2.2'),
+]
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-foss-2016.04.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-foss-2016.04.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9268fd68be0c71eb527a9d7ed3c32a0301257608
--- /dev/null
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-foss-2016.04.eb
@@ -0,0 +1,23 @@
+name = 'libxml2'
+version = '2.9.4'
+
+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': 'foss', 'version': '2016.04'}
+toolchainopts = {'pic': True}
+
+source_urls = [
+    'http://xmlsoft.org/sources/',
+    'http://xmlsoft.org/sources/old/'
+]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('XZ', '5.2.2'),
+]
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-foss-2016a.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-foss-2016a.eb
index eb799f0921d05c29fa3ee53f8a9327ff15945f10..59cbe77a84c29e822094e4106f30403a5a38f533 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-foss-2016a.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-foss-2016a.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.4'
 
@@ -17,13 +15,9 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
-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'],
-}
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('XZ', '5.2.2'),
+]
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-foss-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-foss-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a047fc32c8cf8fb2f6569bebeb7c63762679dc9e
--- /dev/null
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-foss-2016b-Python-2.7.12.eb
@@ -0,0 +1,24 @@
+name = 'libxml2'
+version = '2.9.4'
+versionsuffix = '-Python-%(pyver)s'
+
+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': 'foss', 'version': '2016b'}
+toolchainopts = {'pic': True}
+
+source_urls = [
+    'http://xmlsoft.org/sources/',
+    'http://xmlsoft.org/sources/old/'
+]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('XZ', '5.2.2'),
+    ('Python', '2.7.12'),
+]
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-foss-2016b.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-foss-2016b.eb
index 38d9c7eb2e00c2f74081d99ad2a96d60d9df6f58..abee889e32e45347aeb79b9ea097e43f8db010fd 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-foss-2016b.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-foss-2016b.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.4'
 
@@ -17,13 +15,9 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
-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'],
-}
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('XZ', '5.2.2'),
+]
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5f9093db10dc5a24283163bb309d0f081f838604
--- /dev/null
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,24 @@
+name = 'libxml2'
+version = '2.9.4'
+versionsuffix = '-Python-%(pyver)s'
+
+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': '2016b'}
+toolchainopts = {'pic': True}
+
+source_urls = [
+    'http://xmlsoft.org/sources/',
+    'http://xmlsoft.org/sources/old/'
+]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('XZ', '5.2.2'),
+    ('Python', '2.7.12'),
+]
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-intel-2016b.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-intel-2016b.eb
index 9f8ee962cf599776d1cdb2019123c726509cb3b8..ab1c0ecd3e4e06b1de1d0d901c284ae53423efa1 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-intel-2016b.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-intel-2016b.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.4'
 
@@ -17,13 +15,9 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
-
-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'],
-}
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('XZ', '5.2.2'),
+]
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libxsmm/libxsmm-1.4.4-intel-2016b.eb b/easybuild/easyconfigs/l/libxsmm/libxsmm-1.4.4-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d0e021010344e7a80b6befb1a144f4dd87b258fa
--- /dev/null
+++ b/easybuild/easyconfigs/l/libxsmm/libxsmm-1.4.4-intel-2016b.eb
@@ -0,0 +1,26 @@
+easyblock = 'ConfigureMake'
+
+name = 'libxsmm'
+version = '1.4.4'
+
+homepage = 'https://github.com/hfp/libxsmm'
+description = """LIBXSMM is a library for small dense and small sparse matrix-matrix multiplications
+targeting Intel Architecture (x86)."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+sources = ['%(version)s.tar.gz']
+source_urls = ['https://github.com/hfp/libxsmm/archive/']
+
+# install both static and dynamic version
+installopts = ['PREFIX=%(installdir)s', 'PREFIX=%(installdir)s STATIC=0']
+
+skipsteps = ['configure']
+maxparallel = 1
+
+sanity_check_paths = {
+    'files': ['bin/libxsmm_gemm_generator', 'include/libxsmm.h', 'lib/libxsmm.a', 'lib/libxsmm.%s' % SHLIB_EXT],
+    'dirs': ['share']
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/l/log4cplus/log4cplus-1.0.4.3-ictce-5.5.0.eb b/easybuild/easyconfigs/l/log4cplus/log4cplus-1.0.4.3-ictce-5.5.0.eb
new file mode 100755
index 0000000000000000000000000000000000000000..af8ebb2524c8c5c363a1df7285b0d97283da57bd
--- /dev/null
+++ b/easybuild/easyconfigs/l/log4cplus/log4cplus-1.0.4.3-ictce-5.5.0.eb
@@ -0,0 +1,20 @@
+easyblock = 'ConfigureMake'
+
+name = 'log4cplus'
+version = '1.0.4.3'
+
+homepage = 'http://sourceforge.net/p/log4cplus'
+description = """log4cplus is a simple to use C++ logging API providing thread-safe, flexible, and arbitrarily
+granular control over log management and configuration. It is modelled after the Java log4j API."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ["lib/liblog4cplus.a", "lib/liblog4cplus.so"],
+    'dirs': ["include/log4cplus"],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/l/log4cplus/log4cplus-1.1.2-ictce-5.5.0.eb b/easybuild/easyconfigs/l/log4cplus/log4cplus-1.1.2-ictce-5.5.0.eb
new file mode 100755
index 0000000000000000000000000000000000000000..bdb9d13739691ae9b476a9632c3188e684bfc9ab
--- /dev/null
+++ b/easybuild/easyconfigs/l/log4cplus/log4cplus-1.1.2-ictce-5.5.0.eb
@@ -0,0 +1,20 @@
+easyblock = 'ConfigureMake'
+
+name = 'log4cplus'
+version = '1.1.2'
+
+homepage = 'http://sourceforge.net/p/log4cplus'
+description = """log4cplus is a simple to use C++ logging API providing thread-safe, flexible, and arbitrarily
+granular control over log management and configuration. It is modelled after the Java log4j API."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ["lib/liblog4cplus.a", "lib/liblog4cplus.so"],
+    'dirs': ["include/log4cplus"],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/l/lxml/lxml-3.6.4-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/l/lxml/lxml-3.6.4-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2329541fb323ef2ca6b4b3271e19a2091a81d380
--- /dev/null
+++ b/easybuild/easyconfigs/l/lxml/lxml-3.6.4-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,26 @@
+easyblock = 'PythonPackage'
+
+name = 'lxml'
+version = '3.6.4'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://lxml.de/'
+description = """The lxml XML toolkit is a Pythonic binding for the C libraries libxml2 and libxslt."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['http://lxml.de/files/']
+sources = [SOURCE_TGZ]
+
+dependencies = [
+    ('Python', '2.7.12'),
+    ('libxml2', '2.9.4'),
+    ('libxslt', '1.1.29'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-CrayGNU-2015.06.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-CrayGNU-2015.06.eb
index 8398e40d0665ca4cb92593c45b2d9755f0ab75a4..54365e5c1206734c1a95a0464750c447ee525c7f 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-CrayGNU-2015.06.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-CrayGNU-2015.06.eb
@@ -13,6 +13,8 @@ toolchain = {'name': 'CrayGNU', 'version': '2015.06'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
 configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-CrayGNU-2015.11.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-CrayGNU-2015.11.eb
index b84761b60206ddb7270a05110e8911573dff7510..41431f6ed6c5484a3c5bdee505d356dce83c7f57 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-CrayGNU-2015.11.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-CrayGNU-2015.11.eb
@@ -13,6 +13,8 @@ toolchain = {'name': 'CrayGNU', 'version': '2015.11'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
 configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
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
index b4bb4c955de91f15c5df15b89d700e7f478985b8..91d64e5bd3ca463f8b344a57f8c80f6eebe37200 100644
--- 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
@@ -13,6 +13,8 @@ toolchain = {'name': 'GCC', 'version': '4.7.2'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
 configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.8.2.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.8.2.eb
index 5df1dda5a3a107ec921112511cac14152963ffbc..cb0daa392fed324ffc6f1ae14f6baf34f4705b1b 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.8.2.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.8.2.eb
@@ -13,6 +13,8 @@ toolchain = {'name': 'GCC', 'version': '4.8.2'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
 configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.8.4.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.8.4.eb
index f406268a87d92714529bd138dc1bc61b06b4e56e..e59131c48fb164f143c5ad1fc8e82fdd9b62cc88 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.8.4.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.8.4.eb
@@ -13,6 +13,8 @@ toolchain = {'name': 'GCC', 'version': '4.8.4'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
 configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.2-binutils-2.25.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.2-binutils-2.25.eb
index 560606e07ad3dd4ea3ca3539d3d9ad54d2b81db4..c9b8ae162c44b08a1ac4929fea3e223101785aa4 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.2-binutils-2.25.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.2-binutils-2.25.eb
@@ -16,6 +16,8 @@ source_urls = [GNU_SOURCE]
 # use same binutils version that was used when building GCC toolchain
 builddependencies = [('binutils', '2.25', '', True)]
 
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
 configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.2.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.2.eb
index 00b1eb05a83cdc8d243782bd6c3d2a161cfce06a..d52dd469f6af1dba71334ed29fc57a750fe82e60 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.2.eb
@@ -13,6 +13,8 @@ toolchain = {'name': 'GCC', 'version': '4.9.2'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
 configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
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
index a939e01023030f76edf9fecb7f56645dec2f7402..5658dda837723f361f5fcdb38eb782bcaf1fdecf 100644
--- 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
@@ -13,6 +13,8 @@ toolchain = {'name': 'GCC', 'version': '4.9.3-2.25'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
 configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.3-binutils-2.25.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.3-binutils-2.25.eb
index 64c98aad337a5a17e87cac3f43c2d6d53179804d..006446b9f08e0bdb07bd4b5e70999a9c17ac94eb 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.3-binutils-2.25.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.3-binutils-2.25.eb
@@ -16,6 +16,8 @@ source_urls = [GNU_SOURCE]
 # use same binutils version that was used when building GCC toolchain
 builddependencies = [('binutils', '2.25', '', True)]
 
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
 configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.3.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.3.eb
index 745063ebad907909453d1dbb099e4b281055023e..e7a4d305fe1162d1b886824372d4ec88b8544f68 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.3.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.3.eb
@@ -13,6 +13,8 @@ toolchain = {'name': 'GCC', 'version': '4.9.3'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
 configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-5.1.0-binutils-2.25.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-5.1.0-binutils-2.25.eb
index a95ac9f601f6972c311353e9c0e715fd747174cb..6e2de92ed5905e500ecaf1fd8622971719e3f5cb 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-5.1.0-binutils-2.25.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-5.1.0-binutils-2.25.eb
@@ -16,6 +16,8 @@ source_urls = [GNU_SOURCE]
 # use same binutils version that was used when building GCC toolchain
 builddependencies = [('binutils', '2.25', '', True)]
 
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
 configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-5.4.0-2.26.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-5.4.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ab6365038384b116ad80f0d641dd1fda0c4ab45d
--- /dev/null
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-5.4.0-2.26.eb
@@ -0,0 +1,25 @@
+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': '5.4.0-2.26'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
+configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
+
+sanity_check_paths = {
+    'files': ["bin/m4"],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCCcore-4.9.2.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCCcore-4.9.2.eb
index 5551b81d856ade255716f92fadf4c88d12171249..4a7f47d9bcb40821121d9aa9cc78f32d3b32f4e9 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCCcore-4.9.2.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCCcore-4.9.2.eb
@@ -16,6 +16,8 @@ source_urls = [GNU_SOURCE]
 # use same binutils version that was used when building GCC toolchain
 builddependencies = [('binutils', '2.25', '', True)]
 
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
 configopts = "--enable-cxx CPPFLAGS='-fgnu89-inline'"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCCcore-4.9.3.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCCcore-4.9.3.eb
index 02f06d5cfecef51fae9e7c29c4c0af3ff45ad090..72fbf1541bfd0865ca471fbb3a5243c0e67b9880 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCCcore-4.9.3.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCCcore-4.9.3.eb
@@ -16,6 +16,8 @@ source_urls = [GNU_SOURCE]
 # use same binutils version that was used when building GCC toolchain
 builddependencies = [('binutils', '2.25', '', True)]
 
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
 configopts = "--enable-cxx CPPFLAGS='-fgnu89-inline'"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCCcore-4.9.4.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCCcore-4.9.4.eb
index fa161623a1fdccd55d977503dceedc9b3f898973..83effb6682bc6daab9c4a5d934fc9d58748617a2 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCCcore-4.9.4.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCCcore-4.9.4.eb
@@ -16,6 +16,8 @@ source_urls = [GNU_SOURCE]
 # use same binutils version that was used when building GCC toolchain
 builddependencies = [('binutils', '2.25', '', True)]
 
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
 configopts = "--enable-cxx CPPFLAGS='-fgnu89-inline'"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCCcore-5.3.0.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCCcore-5.3.0.eb
index 434b6f02ff3f4b9dad73a58e0c12d4f92a307b03..d508b59ac77db2845ffda78be95c36b0d4987aaa 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCCcore-5.3.0.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCCcore-5.3.0.eb
@@ -16,7 +16,9 @@ source_urls = [GNU_SOURCE]
 # use same binutils version that was used when building GCC toolchain
 builddependencies = [('binutils', '2.26', '', True)]
 
-configopts = "--enable-cxx"
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
+configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
     'files': ["bin/m4"],
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCCcore-5.4.0.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCCcore-5.4.0.eb
index 114b490972e5c12a1a94a3850b8c331c2a6236d8..702e8595184d52126dd9f26b583214f6a082cd6e 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCCcore-5.4.0.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCCcore-5.4.0.eb
@@ -16,7 +16,9 @@ source_urls = [GNU_SOURCE]
 # use same binutils version that was used when building GCC toolchain
 builddependencies = [('binutils', '2.26', '', True)]
 
-configopts = "--enable-cxx"
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
+configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
     'files': ["bin/m4"],
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCCcore-6.1.0.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCCcore-6.1.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..87ca206fb45ee4783f0df54e6767cd8e2a59c466
--- /dev/null
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCCcore-6.1.0.eb
@@ -0,0 +1,28 @@
+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': 'GCCcore', 'version': '6.1.0'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+# use same binutils version that was used when building GCCcore
+builddependencies = [('binutils', '2.27', '', True)]
+
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
+configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
+
+sanity_check_paths = {
+    'files': ["bin/m4"],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCCcore-6.2.0.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCCcore-6.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9a89ad1fbdf638acdb27a35a66649bcbde50dd13
--- /dev/null
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCCcore-6.2.0.eb
@@ -0,0 +1,28 @@
+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': 'GCCcore', 'version': '6.2.0'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+# use same binutils version that was used when building GCC toolchain
+builddependencies = [('binutils', '2.27', '', True)]
+
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
+configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
+
+sanity_check_paths = {
+    'files': ["bin/m4"],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GNU-4.9.2-2.25.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GNU-4.9.2-2.25.eb
index 134d181212255831296c9a1adb305b9e41f99628..9fd3840472384e917e5a856d3bcb14a2228af3f2 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-GNU-4.9.2-2.25.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GNU-4.9.2-2.25.eb
@@ -13,6 +13,8 @@ toolchain = {'name': 'GNU', 'version': '4.9.2-2.25'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
 configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GNU-4.9.3-2.25.eb
index 25f9aacaceb2cbc08c6c99d7f4f2fab8032a3278..222b4603e6d91f68ca6fe1816315cbfaf2d3fa73 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GNU-4.9.3-2.25.eb
@@ -13,6 +13,8 @@ toolchain = {'name': 'GNU', 'version': '4.9.3-2.25'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
 configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GNU-5.1.0-2.25.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GNU-5.1.0-2.25.eb
index 5ca90d16a7bee62a427909a9a79c3c4933481ce4..8d48b943902dd45395d8248a55fd1b0648d6124d 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-GNU-5.1.0-2.25.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GNU-5.1.0-2.25.eb
@@ -13,6 +13,8 @@ toolchain = {'name': 'GNU', 'version': '5.1.0-2.25'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
 configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2014b.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2014b.eb
index 4abe05a74fd0d16c61ffb7ba6dd6672c936745aa..4190871d6ee78291c358e267c371804cccaeded0 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2014b.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2014b.eb
@@ -13,6 +13,8 @@ toolchain = {'name': 'foss', 'version': '2014b'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
 configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2015a.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2015a.eb
index f58173164e6ea7ee31df0b14fd8d96326a31d73a..6b8e25d1d42559d7b505da0956fd7bd0cf2092e4 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2015a.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2015a.eb
@@ -13,6 +13,8 @@ toolchain = {'name': 'foss', 'version': '2015a'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
 configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2015b.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2015b.eb
index 6a7048dcf1a81e7ed9e3195bdc1bc4e74b11b506..414bbac849b88499423c5944b17aa363068d9fdb 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2015b.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2015b.eb
@@ -13,6 +13,8 @@ toolchain = {'name': 'foss', 'version': '2015b'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
 configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2016.04.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2016.04.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e93393c961bc77670f00ae7b3bd160ffdc1cba6b
--- /dev/null
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2016.04.eb
@@ -0,0 +1,25 @@
+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': '2016.04'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
+configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
+
+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
index ce563e7def08932c4809c482a06c4c3c99f3ddaa..32fe2f7b787c2f1e5256edbf79b01bf1f9490117 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2016a.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2016a.eb
@@ -13,6 +13,8 @@ toolchain = {'name': 'foss', 'version': '2016a'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
 configopts = "--enable-cxx CPPFLAGS='-fgnu89-inline'"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2016b.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2016b.eb
index e7ea6f7b851c730a3acb99612b5294fe4fb0f044..3d6737ba0844df35224d64b4791b3038305d375c 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2016b.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2016b.eb
@@ -13,6 +13,8 @@ toolchain = {'name': 'foss', 'version': '2016b'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
 configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-gimkl-2.11.5.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-gimkl-2.11.5.eb
index aa806c1087065210003cfcabf47d2bbb61b64de5..04ba474daf3d405ee78469377703cf87323f7f83 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-gimkl-2.11.5.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-gimkl-2.11.5.eb
@@ -13,6 +13,8 @@ toolchain = {'name': 'gimkl', 'version': '2.11.5'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
 configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-5.4.0.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-5.4.0.eb
index 304b160de546e23ba7198d1f926052cce3edb377..ca3c0c7b6c868e7f1e51413e8dd50e531f994e65 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-5.4.0.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-5.4.0.eb
@@ -13,6 +13,8 @@ toolchain = {'name': 'ictce', 'version': '5.4.0'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
 configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-5.5.0.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-5.5.0.eb
index 46c1b375cb08699f4194031bbfb38da5fa5cd760..e8ed91309a368f8bb795180ae758bbb8a41f90a8 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-5.5.0.eb
@@ -13,6 +13,8 @@ toolchain = {'name': 'ictce', 'version': '5.5.0'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
 configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-7.1.2.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-7.1.2.eb
index 0289e6c40e65fe26562286578cc747158621bf4c..a896f05992d9ffd1cf83b9424750bfc8fec0a514 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-7.1.2.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-7.1.2.eb
@@ -13,6 +13,8 @@ toolchain = {'name': 'ictce', 'version': '7.1.2'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
 configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2014b.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2014b.eb
index 857e1b9ffca6ede724bcf7a8a8948c18fcd55f9d..bd224278e8028e427833c158dd02ea97a777a24a 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2014b.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2014b.eb
@@ -13,6 +13,8 @@ toolchain = {'name': 'intel', 'version': '2014b'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
 configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2015a.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2015a.eb
index a805266216045a722e5ca7f7d064c3e65cc97863..942e49510c5e71e41f31807db5125456cc644d64 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2015a.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2015a.eb
@@ -13,6 +13,8 @@ toolchain = {'name': 'intel', 'version': '2015a'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
 configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2015b.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2015b.eb
index 6746b4b3a40b5725a49d1bb400af40a19392e934..dbdac66931a995d724bf928810361b7b9bdcc49b 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2015b.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2015b.eb
@@ -13,6 +13,8 @@ toolchain = {'name': 'intel', 'version': '2015b'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
 configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2016.02-GCC-4.9.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2016.02-GCC-4.9.eb
index 899804b18fe298245f2dca804f36be571f10c59b..683e8274c8ce7cfef125f22feed38dbcec3534cc 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2016.02-GCC-4.9.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2016.02-GCC-4.9.eb
@@ -13,6 +13,8 @@ toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
 configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
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
index 4472772492e50783de3c1929f5c2c6f003611f06..2b9dd5a6b802aaa1193273ccb36735ac4431362c 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2016a.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2016a.eb
@@ -13,6 +13,8 @@ toolchain = {'name': 'intel', 'version': '2016a'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
 configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2016b.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2016b.eb
index a7e7ddf81ea2627f54ee1256d0782307922645ca..d339ed79b83a37832f155aa63944b49b636e753e 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2016b.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2016b.eb
@@ -13,6 +13,8 @@ toolchain = {'name': 'intel', 'version': '2016b'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
 configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17.eb
index 2bc8d9c022922f54733c35a70f59eb90fd7c9537..159d8d0173e40d21c1db63119ba323d2da90113d 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17.eb
@@ -15,6 +15,8 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
+# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
+# see https://github.com/hpcugent/easybuild-easyconfigs/issues/529
 configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/m/MATIO/MATIO-1.5.2-goolf-1.4.10.eb b/easybuild/easyconfigs/m/MATIO/MATIO-1.5.2-goolf-1.4.10.eb
index 2f00cc2dbdd56cbaccf6ec72909079dfa281ac5a..013f802b61d35c06296af9ef9d9623eef1e24c9d 100644
--- a/easybuild/easyconfigs/m/MATIO/MATIO-1.5.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/m/MATIO/MATIO-1.5.2-goolf-1.4.10.eb
@@ -21,4 +21,9 @@ sources = [SOURCELOWER_ZIP]
 
 dependencies = [('zlib', '1.2.7')]
 
+sanity_check_paths = {
+    'files': ['include/matio.h', 'bin/matdump', 'lib/libmatio.a'],
+    'dirs': [],
+}
+
 moduleclass = 'lib'
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
index 9fb67afb2a35d4301ece629f143a18bb97308aee..05e18b2e8bdc729ddcadc862c4ee4d7b108b81cd 100644
--- a/easybuild/easyconfigs/m/MATIO/MATIO-1.5.2-intel-2015b.eb
+++ b/easybuild/easyconfigs/m/MATIO/MATIO-1.5.2-intel-2015b.eb
@@ -21,4 +21,9 @@ sources = [SOURCELOWER_ZIP]
 
 dependencies = [('zlib', '1.2.8')]
 
+sanity_check_paths = {
+    'files': ['include/matio.h', 'bin/matdump', 'lib/libmatio.a'],
+    'dirs': [],
+}
+
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/m/MATLAB/MATLAB-2016a.eb b/easybuild/easyconfigs/m/MATLAB/MATLAB-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e0113113d06007fb73f4fb596a38927cc8f1fc3b
--- /dev/null
+++ b/easybuild/easyconfigs/m/MATLAB/MATLAB-2016a.eb
@@ -0,0 +1,20 @@
+name = 'MATLAB'
+version = '2016a'
+
+homepage = 'http://www.mathworks.com/products/matlab'
+description = """MATLAB is a high-level language and interactive environment
+ that enables you to perform computationally intensive tasks faster than with
+ traditional programming languages such as C, C++, and Fortran."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('Java', '1.8.0_92')]
+
+import os
+license_server = os.getenv('EB_MATLAB_LICENSE_SERVER', 'license.example.com')
+license_server_port = os.getenv('EB_MATLAB_LICENSE_SERVER_PORT', '00000')
+key = os.getenv('EB_MATLAB_KEY', '00000-00000-00000-00000-00000-00000-00000-00000-00000-00000')
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/m/MCR/MCR-R2013a.eb b/easybuild/easyconfigs/m/MCR/MCR-R2013a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..caffaedaa3164f9c4e05705552abf415db0bfbfc
--- /dev/null
+++ b/easybuild/easyconfigs/m/MCR/MCR-R2013a.eb
@@ -0,0 +1,18 @@
+name = 'MCR'
+version = 'R2013a'
+
+homepage = 'http://www.mathworks.com/products/compiler/mcr/'
+description = """The MATLAB Runtime is a standalone set of shared libraries
+ that enables the execution of compiled MATLAB applications
+ or components on computers that do not have MATLAB installed."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = [
+    'http://www.mathworks.com/supportfiles/MCR_Runtime/%(version)s/',
+]
+sources = ['%(name)s_%(version)s_glnxa64_installer.zip']
+
+dependencies = [('Java', '1.8.0_31')]
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/m/MCR/MCR-R2016a.eb b/easybuild/easyconfigs/m/MCR/MCR-R2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7314d95a8c309a0cc696e65ce935f4d5e039e76e
--- /dev/null
+++ b/easybuild/easyconfigs/m/MCR/MCR-R2016a.eb
@@ -0,0 +1,18 @@
+name = 'MCR'
+version = 'R2016a'
+
+homepage = 'http://www.mathworks.com/products/compiler/mcr/'
+description = """The MATLAB Runtime is a standalone set of shared libraries
+ that enables the execution of compiled MATLAB applications
+ or components on computers that do not have MATLAB installed."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = [
+    'http://www.mathworks.com/supportfiles/downloads/%(version)s/deployment_files/%(version)s/installers/glnxa64/',
+]
+sources = ['%(name)s_%(version)s_glnxa64_installer.zip']
+
+dependencies = [('Java', '1.8.0_92')]
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/m/METIS/METIS-5.1.0-intel-2016b.eb b/easybuild/easyconfigs/m/METIS/METIS-5.1.0-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..65e2ae532f0b9701f88d2e8fb988538358af784b
--- /dev/null
+++ b/easybuild/easyconfigs/m/METIS/METIS-5.1.0-intel-2016b.eb
@@ -0,0 +1,25 @@
+name = 'METIS'
+version = '5.1.0'
+
+homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/metis/overview'
+description = """METIS is a set of serial programs for partitioning graphs, partitioning finite element meshes,
+and producing fill reducing orderings for sparse matrices. The algorithms implemented in METIS are based on the
+multilevel recursive-bisection, multilevel k-way, and multi-constraint partitioning schemes."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [
+    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis',
+    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/OLD',
+]
+
+# We use 32bit for indices and 64bit for content
+patches = ['METIS-5.1.0-use-doubles.patch']
+
+builddependencies = [('CMake', '3.6.1')]
+
+configopts = ['', 'shared=1']
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/m/METIS/METIS-5.1.0-use-doubles.patch b/easybuild/easyconfigs/m/METIS/METIS-5.1.0-use-doubles.patch
new file mode 100644
index 0000000000000000000000000000000000000000..f02824071ea66549311f728a7a6c641cd256f6af
--- /dev/null
+++ b/easybuild/easyconfigs/m/METIS/METIS-5.1.0-use-doubles.patch
@@ -0,0 +1,14 @@
+# Use double for floating point (64 bit) in METIS by default
+# OpenFOAM 4 uses doubles be default
+diff -ur metis-5.1.0.orig/include/metis.h metis-5.1.0/include/metis.h
+--- metis-5.1.0.orig/include/metis.h	2013-03-30 17:24:45.000000000 +0100
++++ metis-5.1.0/include/metis.h	2016-09-05 11:39:33.004384533 +0200
+@@ -40,7 +40,7 @@
+    32 : single precission floating point (float)
+    64 : double precission floating point (double)
+ --------------------------------------------------------------------------*/
+-#define REALTYPEWIDTH 32
++#define REALTYPEWIDTH 64
+
+
+
diff --git a/easybuild/easyconfigs/m/MIGRATE-N/MIGRATE-N-4.2.8-foss-2016a.eb b/easybuild/easyconfigs/m/MIGRATE-N/MIGRATE-N-4.2.8-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b6f05aeb5d714d8b9f28bd3bff2a2a08590704c8
--- /dev/null
+++ b/easybuild/easyconfigs/m/MIGRATE-N/MIGRATE-N-4.2.8-foss-2016a.eb
@@ -0,0 +1,42 @@
+easyblock = 'ConfigureMake'
+
+name = 'MIGRATE-N'
+version = '4.2.8'
+
+homepage = 'http://popgen.sc.fsu.edu/Migrate/Migrate-n.html'
+description = """
+Migrate estimates population parameters, effective population sizes
+and migration rates of n populations, using genetic data.  It 
+uses a coalescent theory approach taking into account history of 
+mutations and uncertainty of the genealogy. 
+"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = ['migrate-%(version)s.src.tar.gz']
+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/',
+    'http://popgen.sc.fsu.edu/newversions/',
+]
+
+patches = [
+    '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/%s' % x for x in ['migrate-n','migrate-n-mpi']],
+    'dirs': ['man'],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/m/MIGRATE-N/migrate-4.2.8_install.patch b/easybuild/easyconfigs/m/MIGRATE-N/migrate-4.2.8_install.patch
new file mode 100644
index 0000000000000000000000000000000000000000..97957ab44e0d8b4679fd3bbbbbef722071947ff5
--- /dev/null
+++ b/easybuild/easyconfigs/m/MIGRATE-N/migrate-4.2.8_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/MIRA/MIRA-4.0.2-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/m/MIRA/MIRA-4.0.2-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c98b95b63b9ec0dde123247e475e4b4cbd2f94a0
--- /dev/null
+++ b/easybuild/easyconfigs/m/MIRA/MIRA-4.0.2-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,36 @@
+easyblock = 'ConfigureMake'
+
+name = 'MIRA'
+version = '4.0.2'
+versionsuffix = '-Python-2.7.11'
+
+homepage = 'http://sourceforge.net/p/mira-assembler/wiki/Home/'
+description = """MIRA is a whole genome shotgun and EST sequence assembler for Sanger, 454, Solexa (Illumina),
+    IonTorrent data and PacBio (the later at the moment only CCS and error-corrected CLR reads)."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = ['%(namelower)s-%(version)s.tar.bz2']
+source_urls = [('http://sourceforge.net/projects/mira-assembler/files/MIRA/stable/', 'download')]
+
+# don't use PAX, it might break.
+tar_config_opts = True
+
+configopts = '--with-boost-libdir=$EBROOTBOOST/lib --with-expat=$EBROOTEXPAT'
+
+patches = ['MIRA-%(version)s-quirks.patch']
+
+builddependencies = [('flex', '2.5.39')]
+dependencies = [
+    ('Boost', '1.61.0', versionsuffix),
+    ('expat', '2.1.1'),
+    ('zlib', '1.2.8'),
+    ('gperftools', '2.5'),
+]
+
+sanity_check_paths = {
+    'files': ["bin/mira"],
+    'dirs': ["bin", "share"],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/m/MPFR/MPFR-3.1.4-intel-2016b.eb b/easybuild/easyconfigs/m/MPFR/MPFR-3.1.4-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1d9a8972b99841fe9b97a613de351926dc1c7651
--- /dev/null
+++ b/easybuild/easyconfigs/m/MPFR/MPFR-3.1.4-intel-2016b.eb
@@ -0,0 +1,26 @@
+easyblock = 'ConfigureMake'
+
+name = 'MPFR'
+version = '3.1.4'
+
+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': '2016b'}
+
+source_urls = ['http://www.mpfr.org/mpfr-%(version)s/']
+sources = [SOURCELOWER_TAR_BZ2]
+
+patches = ['MPFR_ictce_remove-deprecated-mp.patch']
+
+dependencies = [('GMP', '6.1.1')]
+
+runtest = 'check'
+
+sanity_check_paths = {
+    'files': ['lib/libmpfr.%s' % SHLIB_EXT, 'include/mpfr.h'],
+    'dirs': []
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/m/MPJ-Express/MPJ-Express-0.44-foss-2016a-Java-1.8.0_92.eb b/easybuild/easyconfigs/m/MPJ-Express/MPJ-Express-0.44-foss-2016a-Java-1.8.0_92.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0a8633bccd704c4f4f4d6ed79f77a10c4cf961d5
--- /dev/null
+++ b/easybuild/easyconfigs/m/MPJ-Express/MPJ-Express-0.44-foss-2016a-Java-1.8.0_92.eb
@@ -0,0 +1,45 @@
+# 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 = 'Tarball'
+
+name = 'MPJ-Express'
+version = '0.44'
+versionsuffix = '-Java-%(javaver)s'
+
+homepage = 'http://mpj-express.org/'
+description = """MPJ Express is an open source Java message passing library that allows application 
+ developers to write and execute parallel applications for multicore processors and compute clusters/clouds."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['https://sourceforge.net/projects/mpjexpress/files/releases/']
+sources = ['mpj-v%s.tar.gz' % (version.replace('.','_'))]
+
+builddependencies = [('CMake', '3.5.2')]
+
+dependencies = [
+    ('Java', '1.8.0_92', '', True),
+]
+
+# compile JNI wrapper library as described in docs
+# http://mpj-express.org/docs/readme/README
+postinstallcmds = ["mkdir %(installdir)s/src/mpjdev/natmpjdev/lib/build",
+		   "cd %(installdir)s/src/mpjdev/natmpjdev/lib/build && cmake .. && make && make install DESTDIR=%(installdir)s",]
+
+modextrapaths = {
+    'CLASSPATH': 'lib',
+}
+
+modextravars = {
+    'MPJ_HOME': '$root', # MPJ_HOME points to install directory
+}
+
+sanity_check_paths = {
+    'files': ['lib/libnativempjdev.so', 'bin/mpjrun.sh'],
+    'dirs': []
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/m/MUST/MUST-1.2.0-goolf-1.5.14.eb b/easybuild/easyconfigs/m/MUST/MUST-1.2.0-goolf-1.5.14.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a3e8ea9b643661e8ea77b79168307c69d944e1b8
--- /dev/null
+++ b/easybuild/easyconfigs/m/MUST/MUST-1.2.0-goolf-1.5.14.eb
@@ -0,0 +1,39 @@
+# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild
+# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany
+# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
+# License::   New BSD
+#
+# This work is based from experiences from the UNITE project
+# http://apps.fz-juelich.de/unite/
+##
+easyblock = 'CMakeMake'
+
+name = 'MUST'
+version = '1.2.0'
+
+homepage = 'http://www.tu-dresden.de/zih/must/'
+description = """MUST detects usage errors of the Message Passing Interface (MPI) and reports them
+ to the user. As MPI calls are complex and usage errors common, this functionality is extremely helpful
+ for application developers that want to develop correct MPI applications. This includes errors that
+ already manifest --segmentation faults or incorrect results -- as well as many errors that are not
+ visible to the application developer or do not manifest on a certain system or MPI implementation."""
+
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
+toolchainopts = {'usempi': True}
+
+# http://tu-dresden.de/die_tu_dresden/zentrale_einrichtungen/zih/forschung/projekte/must/files/must-release-1.2.0.tar.gz
+source_urls = ['http://tu-dresden.de/die_tu_dresden/zentrale_einrichtungen/zih/forschung/projekte/must/files/']
+sources = ['%(namelower)s-release-%(version)s.tar.gz']
+
+dependencies = [('GTI', '1.2.0')]
+
+builddependencies = [('CMake', '3.0.2')]
+
+configopts = ' -DCMAKE_BUILD_TYPE=Release -DGTI_INSTALL_PREFIX=${EBROOTGTI}'
+
+sanity_check_paths = {
+    'files': ['bin/mustrun', 'include/mustConfig.h'],
+    'dirs': [],
+}
+
+moduleclass = 'perf'
diff --git a/easybuild/easyconfigs/m/Mako/Mako-1.0.4-foss-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/m/Mako/Mako-1.0.4-foss-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..eaaa1eb1ea62c67a08fe3c8248e298848ffb2084
--- /dev/null
+++ b/easybuild/easyconfigs/m/Mako/Mako-1.0.4-foss-2016b-Python-2.7.12.eb
@@ -0,0 +1,22 @@
+easyblock = 'PythonPackage'
+
+name = 'Mako'
+version = '1.0.4'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://www.makotemplates.org'
+description = """A super-fast templating language that borrows the best ideas from the existing templating languages"""
+
+toolchain = {'name': 'foss', 'version': '2016b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('Python', '2.7.12')]
+
+sanity_check_paths = {
+    'files': ['bin/mako-render'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/%(name)s-%(version)s-py%(pyshortver)s.egg'],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/m/Mako/Mako-1.0.4-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/m/Mako/Mako-1.0.4-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4817748dbce4a0ad96e5f01aa87b9630764eb507
--- /dev/null
+++ b/easybuild/easyconfigs/m/Mako/Mako-1.0.4-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,22 @@
+easyblock = 'PythonPackage'
+
+name = 'Mako'
+version = '1.0.4'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://www.makotemplates.org'
+description = """A super-fast templating language that borrows the best ideas from the existing templating languages"""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('Python', '2.7.12')]
+
+sanity_check_paths = {
+    'files': ['bin/mako-render'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/%(name)s-%(version)s-py%(pyshortver)s.egg'],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/m/Maq/Maq-0.7.0.eb b/easybuild/easyconfigs/m/Maq/Maq-0.7.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b78da99d835e73dde489c08ffbf4aeefd4667406
--- /dev/null
+++ b/easybuild/easyconfigs/m/Maq/Maq-0.7.0.eb
@@ -0,0 +1,29 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Ravi Tripathi
+# Email: ravi89@uab.edu
+
+easyblock = "Tarball"
+
+name = 'Maq'
+version = '0.7.0'
+
+homepage = 'http://maq.sourceforge.net/maq-man.shtml'
+description = """ Maq is a software that builds mapping 
+assemblies from short reads generated by the 
+next-generation sequencing machines. """
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+source_urls = ['https://sourceforge.net/projects/maq/files/maq/%(version)s/']
+sources = ['maq-%(version)s_x86_64-linux.tar.bz2']
+
+checksums= ["65edff1529c84783d0a4b9208a91efa9"]
+
+modextrapaths = {'PATH': ''}
+
+sanity_check_paths = {
+    'files': ["asub", "maq", "maq.pdf", "maq.1", "solid2fastq.pl"],
+    'dirs': []
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/m/MariaDB/MariaDB-10.1.17-intel-2016b.eb b/easybuild/easyconfigs/m/MariaDB/MariaDB-10.1.17-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fe8145c64d07bd909cf4ffe168a9c909032f48ac
--- /dev/null
+++ b/easybuild/easyconfigs/m/MariaDB/MariaDB-10.1.17-intel-2016b.eb
@@ -0,0 +1,43 @@
+easyblock = 'CMakeMake'
+
+name = 'MariaDB'
+version = '10.1.17'
+
+homepage = 'https://mariadb.org/'
+description = """MariaDB An enhanced, drop-in replacement for MySQL."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['https://downloads.mariadb.org/f/mariadb-%(version)s/source']
+sources = [SOURCELOWER_TAR_GZ]
+
+patches = [
+    'MariaDB-10.1.13-remove-Werror.patch',
+    'MariaDB-10.1.13-link-rt-for-jemalloc.patch',
+]
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('ncurses', '6.0'),
+    ('jemalloc', '4.2.1'),
+    ('PCRE', '8.39'),
+    ('XZ', '5.2.2'),
+    ('Boost', '1.61.0', '-Python-2.7.12'),
+    ('libxml2', '2.9.4'),
+]
+
+builddependencies = [('CMake', '3.6.1')]
+
+separate_build_dir = True
+
+configopts = "-DWITH_PCRE=system -DWITH_JEMALLOC=yes -DWITH_ZLIB=system -DMYSQL_MAINTAINER_MODE=ON "
+configopts += "-DWITH_EMBEDDED_SERVER=ON "  # for libmysqld.so & co
+configopts += "-DWITHOUT_TOKUDB=ON "  # not supported with Intel compilers
+
+sanity_check_paths = {
+    'files': ['bin/mysql', 'bin/mysqld_safe', 'lib/libmysqlclient.%s' % SHLIB_EXT, 'lib/libmysqld.%s' % SHLIB_EXT,
+              'scripts/mysql_install_db'],
+    'dirs': ['include', 'share'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/m/Mathematica/Mathematica-11.0.1.eb b/easybuild/easyconfigs/m/Mathematica/Mathematica-11.0.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2afcde557085e0d9c14925c3f6cda7bb9399200c
--- /dev/null
+++ b/easybuild/easyconfigs/m/Mathematica/Mathematica-11.0.1.eb
@@ -0,0 +1,16 @@
+name = 'Mathematica'
+version = '11.0.1'
+
+homepage = 'http://www.wolfram.com/mathematica'
+description = """Mathematica is a computational software program used in many scientific, engineering, mathematical
+and computing fields."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = ['Mathematica_%(version)s_LINUX.sh']
+
+license_server = 'license.example.com'
+
+sanity_check_commands = [('mathematica', '--version')]
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-12.0.2-foss-2016b.eb b/easybuild/easyconfigs/m/Mesa/Mesa-12.0.2-foss-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8152b5bb382a5de704b62c2e15c600cecff34429
--- /dev/null
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-12.0.2-foss-2016b.eb
@@ -0,0 +1,59 @@
+# the purpose of the easyconfig is to build a Mesa for software rendering,
+# not hardware rendering. This means you want at least SSE4.2. We build:
+# - llvmpipe: the high-performance Gallium LLVM driver
+# - swr: Intel's OpenSWR
+# it will try to use the llvmpipe by default. It you want swr, do:
+# GALLIUM_DRIVER=swr
+
+easyblock = 'ConfigureMake'
+
+name = 'Mesa'
+version = '12.0.2'
+
+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': 'foss', 'version': '2016b'}
+# swr detects and builds parts specific for AVX and AVX2. If we use
+# -xHost, this always gets overwritten and will fail.
+toolchainopts = {'optarch': False}
+
+sources = [SOURCELOWER_TAR_XZ]
+source_urls = [
+    'https://mesa.freedesktop.org/archive/%(version)s',
+    'ftp://ftp.freedesktop.org/pub/mesa/%(version)s',
+    'ftp://ftp.freedesktop.org/pub/mesa/older-versions/%(version_major)s.x/%(version)s',
+]
+
+builddependencies = [
+    ('flex', '2.6.0'),
+    ('Bison', '3.0.4'),
+    ('Autotools', '20150215'),
+    ('pkg-config', '0.29.1'),
+    ('Mako', '1.0.4', '-Python-2.7.12'),
+    ('libxml2', '2.9.4', '-Python-2.7.12'),
+]
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('nettle', '3.2'),
+    ('libdrm', '2.4.70'),
+    ('LLVM', '3.8.1'),
+    ('X11', '20160819'),
+]
+
+# GLU is not part anymore of Mesa package!
+configopts = " --disable-osmesa --enable-gallium-osmesa --enable-gallium-llvm --enable-glx --disable-dri"
+configopts += " --disable-driglx-direct --with-gallium-drivers='swrast,swr' --disable-egl"
+configopts += " --with-osmesa-bits=32 --enable-texture-float --enable-llvm-shared-libs "
+
+sanity_check_paths = {
+    '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', 'include/GL/glxext.h',
+              'include/GL/glx_mangle.h', 'include/GLES/gl.h', 'include/GLES2/gl2.h', 'include/GLES3/gl3.h'],
+    'dirs': []
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-12.0.2-intel-2016b.eb b/easybuild/easyconfigs/m/Mesa/Mesa-12.0.2-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..90fd4b08106c27fa8e78f82acaf70efea622644f
--- /dev/null
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-12.0.2-intel-2016b.eb
@@ -0,0 +1,59 @@
+# the purpose of the easyconfig is to build a Mesa for software rendering,
+# not hardware rendering. This means you want at least SSE4.2. We build:
+# - llvmpipe: the high-performance Gallium LLVM driver
+# - swr: Intel's OpenSWR
+# it will try to use the llvmpipe by default. It you want swr, do:
+# GALLIUM_DRIVER=swr
+
+easyblock = 'ConfigureMake'
+
+name = 'Mesa'
+version = '12.0.2'
+
+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': '2016b'}
+# swr detects and builds parts specific for AVX and AVX2. If we use
+# -xHost, this always gets overwritten and will fail.
+toolchainopts = {'optarch': False}
+
+sources = [SOURCELOWER_TAR_XZ]
+source_urls = [
+    'https://mesa.freedesktop.org/archive/%(version)s',
+    'ftp://ftp.freedesktop.org/pub/mesa/%(version)s',
+    'ftp://ftp.freedesktop.org/pub/mesa/older-versions/%(version_major)s.x/%(version)s',
+]
+
+builddependencies = [
+    ('flex', '2.6.0'),
+    ('Bison', '3.0.4'),
+    ('Autotools', '20150215'),
+    ('pkg-config', '0.29.1'),
+    ('Mako', '1.0.4', '-Python-2.7.12'),
+    ('libxml2', '2.9.4', '-Python-2.7.12'),
+]
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('nettle', '3.2'),
+    ('libdrm', '2.4.70'),
+    ('LLVM', '3.8.1'),
+    ('X11', '20160819'),
+]
+
+# GLU is not part anymore of Mesa package!
+configopts = " --disable-osmesa --enable-gallium-osmesa --enable-gallium-llvm --enable-glx --disable-dri"
+configopts += " --disable-driglx-direct --with-gallium-drivers='swrast,swr' --disable-egl"
+configopts += " --with-osmesa-bits=32 --enable-texture-float --enable-llvm-shared-libs "
+
+sanity_check_paths = {
+    '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', 'include/GL/glxext.h',
+              'include/GL/glx_mangle.h', 'include/GLES/gl.h', 'include/GLES2/gl2.h', 'include/GLES3/gl3.h'],
+    'dirs': []
+}
+
+moduleclass = 'vis'
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 519d0887cc6bcde316957c81c2ad13afebd29555..de8bfef38e7145f0b8f39b6039a39377e8bcd7a7 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
@@ -11,7 +11,6 @@ toolchainopts = {'usempi': True}
 sources = ['%(namelower)s.%(version)s.tar.gz']
 
 # license file
-import os
-license_file = os.path.join(os.getenv('HOME'), 'licenses', name, 'license.lic')
+license_file = HOME + '/licenses/%(name)s/license.lic'
 
 moduleclass = 'chem'
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
index 25842fde1cbdab04660df875ce9b9ebaefc805d7..c80d4d1ee107df67c5dd30b1362f790aa0531355 100644
--- 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
@@ -15,7 +15,6 @@ 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')
+#license_file = HOME + '/licenses/%(name)s/license.lic'
 
 moduleclass = 'chem'
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
index 3d1681fc2e6200a3d33c6255254a2f99a1efb8f0..251958da52a5a8a82c26fc0480764e38117a9e01 100644
--- 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
@@ -15,7 +15,6 @@ 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')
+#license_file = HOME + '/licenses/%(name)s/license.lic'
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/m/Molpro/Molpro-mpp-2015.1.10.linux_x86_64_openmp.eb b/easybuild/easyconfigs/m/Molpro/Molpro-mpp-2015.1.10.linux_x86_64_openmp.eb
new file mode 100644
index 0000000000000000000000000000000000000000..22912ecf4ac22e7ef4cd50e038e766db8c832752
--- /dev/null
+++ b/easybuild/easyconfigs/m/Molpro/Molpro-mpp-2015.1.10.linux_x86_64_openmp.eb
@@ -0,0 +1,20 @@
+name = 'Molpro'
+versionprefix = 'mpp-'
+version = '2015.1.10'
+versionsuffix = '.linux_x86_64_openmp'
+
+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
+#license_file = HOME + '/licenses/%(name)s/license.lic'
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/m/Molpro/Molpro-mpp-2015.1.3.linux_x86_64_openmp.eb b/easybuild/easyconfigs/m/Molpro/Molpro-mpp-2015.1.3.linux_x86_64_openmp.eb
new file mode 100644
index 0000000000000000000000000000000000000000..47852f7b9afccf29b6606fd517d2c722c117b81f
--- /dev/null
+++ b/easybuild/easyconfigs/m/Molpro/Molpro-mpp-2015.1.3.linux_x86_64_openmp.eb
@@ -0,0 +1,20 @@
+name = 'Molpro'
+versionprefix = 'mpp-'
+version = '2015.1.3'
+versionsuffix = '.linux_x86_64_openmp'
+
+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
+#license_file = HOME + '/licenses/%(name)s/license.lic'
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/m/Mono/Mono-2.10.6-intel-2016b.eb b/easybuild/easyconfigs/m/Mono/Mono-2.10.6-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..365455df1b7dbd604bfab36be9df48af0c6a1562
--- /dev/null
+++ b/easybuild/easyconfigs/m/Mono/Mono-2.10.6-intel-2016b.eb
@@ -0,0 +1,28 @@
+name = 'Mono'
+version = '2.10.6'
+
+homepage = 'http://mono-framework.com' 
+description = """An open source, cross-platform, implementation of C# and the CLR that is
+ binary compatible with Microsoft.NET."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+# Mono required Mono to build, so there are a couple of options:
+# 1) provide Mono RPMs in sources, the Mono easyblock will use them to make a tmp Mono install
+# 2) assume a Mono version is available system-wide (assert using e.g. "osdependencies = ['mono-core']")
+# 3) specify an already available Mono module as build dep, e.g. "builddependencies = [('Mono', '2.10.6')]
+
+source_urls = ['http://download.mono-project.com/sources/mono/']
+sources = [
+    SOURCELOWER_TAR_BZ2,
+    # Mono requires Mono to build, so provide RPMs so Mono can be bootstrapped
+    'libgdiplus-2.4.2-2.el5.kb.x86_64.rpm',
+    'mono-core-2.4.2.3-2.el5.kb.x86_64.rpm',
+]
+
+builddependencies = [
+    ('Bison', '3.0.4'),
+    ('gettext', '0.19.8'),
+]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/m/MyMediaLite/MyMediaLite-3.10-intel-2016b.eb b/easybuild/easyconfigs/m/MyMediaLite/MyMediaLite-3.10-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..75f50aa79eda43a92fa582b639e35aa0d8a81f1f
--- /dev/null
+++ b/easybuild/easyconfigs/m/MyMediaLite/MyMediaLite-3.10-intel-2016b.eb
@@ -0,0 +1,14 @@
+name = 'MyMediaLite'
+version = '3.10'
+
+homepage = 'http://www.ismll.uni-hildesheim.de/mymedialite/'
+description = """MyMediaLite is a lightweight, multi-purpose library of recommender system algorithms."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['http://www.mymedialite.net/download/']
+sources = ['%(name)s-%(version)s.src.tar.gz']
+
+dependencies = [('Mono', '2.10.6')]
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1-intel-2016b-Python-2.7.12.eb
index 32e03140721de02233a5d8acfd238a039dec61a3..633cf0c29a062199cadbc7bd7dee64d1b8f45fb8 100644
--- a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1-intel-2016b-Python-2.7.12.eb
+++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1-intel-2016b-Python-2.7.12.eb
@@ -27,7 +27,7 @@ exts_list = [
         'source_tmpl': 'cycler-%(version)s.tar.gz',
     }),
     (name, version, {
-        'source_urls': [PYPI_SOURCE],
+        'source_urls': ['https://pypi.python.org/packages/source/m/matplotlib'],
         'patches': ['matplotlib-1.5.1_fix-Tcl-Tk-libdir.patch'],
     }),
 ]
diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1-intel-2016b-Python-3.5.2.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1-intel-2016b-Python-3.5.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fe6afff73144f3da1641e96fc665c3bf9e484a04
--- /dev/null
+++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1-intel-2016b-Python-3.5.2.eb
@@ -0,0 +1,45 @@
+easyblock = 'Bundle'
+
+name = 'matplotlib'
+version = '1.5.1'
+versionsuffix = '-Python-%(pyver)s'
+
+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': '2016b'}
+
+# this is a bundle of Python packages
+exts_defaultclass = 'PythonPackage'
+
+dependencies = [
+    ('Python', '3.5.2'),
+    ('freetype', '2.6.5'),
+    ('libpng', '1.6.24'),
+]
+
+exts_list = [
+    ('Cycler', '0.9.0', {
+        'modulename': 'cycler',
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cycler'],
+        'source_tmpl': 'cycler-%(version)s.tar.gz',
+    }),
+    (name, version, {
+        'source_urls': ['https://pypi.python.org/packages/source/m/matplotlib'],
+        'patches': ['matplotlib-1.5.1_fix-Tcl-Tk-libdir.patch'],
+    }),
+]
+
+# 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': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.2-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.2-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b85eaba8bb72e0cae3f2e94ada54fdec7a576345
--- /dev/null
+++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.2-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,44 @@
+easyblock = 'Bundle'
+
+name = 'matplotlib'
+version = '1.5.2'
+versionsuffix = '-Python-%(pyver)s'
+
+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': '2016b'}
+
+# this is a bundle of Python packages
+exts_defaultclass = 'PythonPackage'
+
+dependencies = [
+    ('Python', '2.7.12'),
+    ('freetype', '2.6.5'),
+    ('libpng', '1.6.24'),
+]
+
+exts_list = [
+    ('Cycler', '0.10.0', {
+        'modulename': 'cycler',
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cycler'],
+        'source_tmpl': 'cycler-%(version)s.tar.gz',
+    }),
+    (name, version, {
+        'source_urls': ['https://pypi.python.org/packages/source/m/matplotlib'],
+    }),
+]
+
+# 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': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.3-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.3-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2cd2414697a611bb846f179741519aa4955217b9
--- /dev/null
+++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.3-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,44 @@
+easyblock = 'Bundle'
+
+name = 'matplotlib'
+version = '1.5.3'
+versionsuffix = '-Python-%(pyver)s'
+
+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': '2016b'}
+
+# this is a bundle of Python packages
+exts_defaultclass = 'PythonPackage'
+
+dependencies = [
+    ('Python', '2.7.12'),
+    ('freetype', '2.7'),
+    ('libpng', '1.6.26'),
+]
+
+exts_list = [
+    ('Cycler', '0.10.0', {
+        'modulename': 'cycler',
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cycler'],
+        'source_tmpl': 'cycler-%(version)s.tar.gz',
+    }),
+    (name, version, {
+        'source_urls': ['https://pypi.python.org/packages/source/m/matplotlib'],
+    }),
+]
+
+# 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': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.3-intel-2016b-Python-3.5.2.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.3-intel-2016b-Python-3.5.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1db14993c4f59db29d1c3f43f1776484a6dd0d2f
--- /dev/null
+++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.3-intel-2016b-Python-3.5.2.eb
@@ -0,0 +1,44 @@
+easyblock = 'Bundle'
+
+name = 'matplotlib'
+version = '1.5.3'
+versionsuffix = '-Python-%(pyver)s'
+
+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': '2016b'}
+
+# this is a bundle of Python packages
+exts_defaultclass = 'PythonPackage'
+
+dependencies = [
+    ('Python', '3.5.2'),
+    ('freetype', '2.7'),
+    ('libpng', '1.6.26'),
+]
+
+exts_list = [
+    ('Cycler', '0.10.0', {
+        'modulename': 'cycler',
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cycler'],
+        'source_tmpl': 'cycler-%(version)s.tar.gz',
+    }),
+    (name, version, {
+        'source_urls': ['https://pypi.python.org/packages/source/m/matplotlib'],
+    }),
+]
+
+# 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': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/m/minieigen/minieigen-0.5.3-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/m/minieigen/minieigen-0.5.3-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ee0afa54ae67902c3a251384703e149bcc58e6dd
--- /dev/null
+++ b/easybuild/easyconfigs/m/minieigen/minieigen-0.5.3-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,26 @@
+easyblock = 'PythonPackage'
+
+name = 'minieigen'
+version = '0.5.3'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://launchpad.net/minieigen/'
+description = """A small wrapper for core parts of EIgen, c++ library for linear algebra."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [PYPI_SOURCE]
+
+dependencies = [
+    ('Boost', '1.61.0', versionsuffix),
+    ('Eigen', '3.2.9'),
+    ('Python', '2.7.12'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/python%%(pyshortver)s/site-packages/minieigen.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3.1-intel-2016b-Python-2.7.12-timed-pingpong.eb b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3.1-intel-2016b-Python-2.7.12-timed-pingpong.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e2e1da4cf2fed21ddae3580171add02847b0c4c7
--- /dev/null
+++ b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3.1-intel-2016b-Python-2.7.12-timed-pingpong.eb
@@ -0,0 +1,34 @@
+easyblock = 'PythonPackage'
+
+name = 'mpi4py'
+version = '1.3.1'
+label = 'timed-pingpong'
+versionsuffix = '-Python-%%(pyver)s-%s' % label
+
+homepage = 'https://bitbucket.org/mpi4py/mpi4py'
+description = """MPI for Python (mpi4py) provides bindings of the Message Passing Interface (MPI) standard for
+ the Python programming language, allowing any Python program to exploit multiple processors."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = [BITBUCKET_DOWNLOADS]
+sources = [SOURCE_TAR_GZ]
+
+patches = ['mpi4py-%%(version)s_%s.patch' % label]
+
+dependencies = [('Python', '2.7.12')]
+
+# force rebuilding everything, including patched files
+buildopts = '--force'
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/mpi4py'],
+}
+
+# check that timed pingpong routines that are added via the patch are available
+sanity_check_commands = [
+    ('python', '-c "from mpi4py.MPI import Comm; import sys; sys.exit((1, 0)[\'PingpongRS\' in dir(Comm)])"'),
+]
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-2.0.0-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/m/mpi4py/mpi4py-2.0.0-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..eade0fd4f9c129a5587fbbda53d42a3f4e4383de
--- /dev/null
+++ b/easybuild/easyconfigs/m/mpi4py/mpi4py-2.0.0-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,23 @@
+easyblock = 'PythonPackage'
+
+name = 'mpi4py'
+version = '2.0.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://bitbucket.org/mpi4py/mpi4py'
+description = """MPI for Python (mpi4py) provides bindings of the Message Passing Interface (MPI) standard for
+ the Python programming language, allowing any Python program to exploit multiple processors."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = [BITBUCKET_DOWNLOADS]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('Python', '2.7.12')]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/mpi4py'],
+}
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/m/mympingpong/mympingpong-0.7.1-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/m/mympingpong/mympingpong-0.7.1-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6be49aff6f1294e636355778a15a63eea61f3321
--- /dev/null
+++ b/easybuild/easyconfigs/m/mympingpong/mympingpong-0.7.1-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,34 @@
+easyblock = 'PythonPackage'
+
+name = 'mympingpong'
+version = '0.7.1'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://github.com/hpcugent/mympingpong'
+description = """A mpi4py based random pair pingpong network stress test."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+vsc_base_ver = '2.5.1'
+dependencies = [
+    ('Python', '2.7.12'),
+    ('vsc-base', vsc_base_ver, versionsuffix),
+    ('vsc-mympirun', '3.4.3', versionsuffix),
+    ('matplotlib', '1.5.1', versionsuffix),
+    ('h5py', '2.6.0', versionsuffix + '-HDF5-1.8.17'),
+    ('mpi4py', '1.3.1', versionsuffix + '-timed-pingpong'),
+    ('lxml', '3.6.4', versionsuffix),
+    ('hwloc', '1.11.3'),
+]
+
+options = {'modulename': 'vsc.mympingpong'}
+
+sanity_check_paths = {
+    'files': ['bin/mympingpong', 'bin/mympingponganalysis'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'perf'
diff --git a/easybuild/easyconfigs/m/mypy/mypy-0.4.5-intel-2016b.eb b/easybuild/easyconfigs/m/mypy/mypy-0.4.5-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7ebbaca141af8c82d6053364f7ff312bbc5b7093
--- /dev/null
+++ b/easybuild/easyconfigs/m/mypy/mypy-0.4.5-intel-2016b.eb
@@ -0,0 +1,37 @@
+easyblock = 'Bundle'
+
+name = 'mypy'
+version = '0.4.5'
+
+homepage = 'http://www.mypy-lang.org/'
+description = """Optional static typing for Python"""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+# this is a bundle of Python packages
+exts_defaultclass = 'PythonPackage'
+
+dependencies = [('Python', '3.5.2')]
+
+exts_list = [
+    ('typed-ast', '0.6.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/t/typed-ast'],
+        'modulename': 'typed_ast',
+    }),
+    (name, version, {
+        'source_urls': ['https://pypi.python.org/packages/source/m/mypy-lang'],
+        'source_tmpl': 'mypy-lang-%(version)s.tar.gz',
+    }),
+]
+
+# specify that Bundle easyblock should run a full sanity check, rather than just trying to load the module
+full_sanity_check = True
+
+modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
+
+sanity_check_paths = {
+    'files': ['bin/mypy'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/n/NAMD/NAMD-2.10b1-ictce-5.5.0-ibverbs.eb b/easybuild/easyconfigs/n/NAMD/NAMD-2.10b1-ictce-5.5.0-ibverbs.eb
index ca095349484e359d8f91076fdc8fb9a205ec0e31..007dda5df82e4924167da663bd29dafd0a93bdbd 100644
--- a/easybuild/easyconfigs/n/NAMD/NAMD-2.10b1-ictce-5.5.0-ibverbs.eb
+++ b/easybuild/easyconfigs/n/NAMD/NAMD-2.10b1-ictce-5.5.0-ibverbs.eb
@@ -3,7 +3,8 @@ version = '2.10b1'
 versionsuffix = '-ibverbs'
 
 homepage = 'http://www.ks.uiuc.edu/Research/namd/'
-description = """NAMD is a parallel molecular dynamics code designed for high-performance simulation of large biomolecular systems."""
+description = """NAMD is a parallel molecular dynamics code designed for high-performance simulation of
+ large biomolecular systems."""
 
 toolchain = {'name': 'ictce', 'version': '5.5.0'}
 toolchainopts = {'opt': True, 'pic': True}
@@ -15,6 +16,9 @@ dependencies = [
     ('FFTW', '3.3.4'),
 ]
 
+# /bin/csh is required by 'config' script
+osdependencies = ['tcsh']
+
 charm_arch = "net-linux-x86_64 ibverbs"
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/n/NAMD/NAMD-2.10b1-ictce-5.5.0-mpi.eb b/easybuild/easyconfigs/n/NAMD/NAMD-2.10b1-ictce-5.5.0-mpi.eb
index 8c61d5ae85813c9dc211e5978c225a3a41b6fcab..cb852fe76dd3677a02c18f0ad604ff0e2a0a0f53 100644
--- a/easybuild/easyconfigs/n/NAMD/NAMD-2.10b1-ictce-5.5.0-mpi.eb
+++ b/easybuild/easyconfigs/n/NAMD/NAMD-2.10b1-ictce-5.5.0-mpi.eb
@@ -3,7 +3,8 @@ version = '2.10b1'
 versionsuffix = '-mpi'
 
 homepage = 'http://www.ks.uiuc.edu/Research/namd/'
-description = """NAMD is a parallel molecular dynamics code designed for high-performance simulation of large biomolecular systems."""
+description = """NAMD is a parallel molecular dynamics code designed for high-performance simulation of
+ large biomolecular systems."""
 
 toolchain = {'name': 'ictce', 'version': '5.5.0'}
 toolchainopts = {'opt': True, 'pic': True, 'usempi': True}
@@ -15,6 +16,9 @@ dependencies = [
     ('FFTW', '3.3.4'),
 ]
 
+# /bin/csh is required by 'config' script
+osdependencies = ['tcsh']
+
 charm_arch = 'mpi-linux-x86_64'
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/n/NAMD/NAMD-2.9-goolf-1.4.10-ibverbs.eb b/easybuild/easyconfigs/n/NAMD/NAMD-2.9-goolf-1.4.10-ibverbs.eb
index 1bbb708c5e660a513c48098b2571fa9c3648a105..b2ccba3358c16c2eb440b6e115042e524df8d360 100644
--- a/easybuild/easyconfigs/n/NAMD/NAMD-2.9-goolf-1.4.10-ibverbs.eb
+++ b/easybuild/easyconfigs/n/NAMD/NAMD-2.9-goolf-1.4.10-ibverbs.eb
@@ -3,7 +3,8 @@ version = '2.9'
 versionsuffix = '-ibverbs'
 
 homepage = 'http://www.ks.uiuc.edu/Research/namd/'
-description = """NAMD is a parallel molecular dynamics code designed for high-performance simulation of large biomolecular systems."""
+description = """NAMD is a parallel molecular dynamics code designed for high-performance simulation of
+ large biomolecular systems."""
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'opt': True, 'pic': True}
@@ -14,6 +15,9 @@ dependencies = [
     ('Tcl', '8.5.12'),
 ]
 
+# /bin/csh is required by 'config' script
+osdependencies = ['tcsh']
+
 charm_arch = "net-linux-x86_64 ibverbs"
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/n/NAMD/NAMD-2.9-ictce-5.5.0-ibverbs.eb b/easybuild/easyconfigs/n/NAMD/NAMD-2.9-ictce-5.5.0-ibverbs.eb
index b18bbca8a4bc9d8e1d058f7724ee95b035e919cf..05806930d28439ca79b3fdb48aea8f23d456d36e 100644
--- a/easybuild/easyconfigs/n/NAMD/NAMD-2.9-ictce-5.5.0-ibverbs.eb
+++ b/easybuild/easyconfigs/n/NAMD/NAMD-2.9-ictce-5.5.0-ibverbs.eb
@@ -3,7 +3,8 @@ version = '2.9'
 versionsuffix = '-ibverbs'
 
 homepage = 'http://www.ks.uiuc.edu/Research/namd/'
-description = """NAMD is a parallel molecular dynamics code designed for high-performance simulation of large biomolecular systems."""
+description = """NAMD is a parallel molecular dynamics code designed for high-performance simulation of
+ large biomolecular systems."""
 
 toolchain = {'name': 'ictce', 'version': '5.5.0'}
 toolchainopts = {'opt': True, 'pic': True}
@@ -15,6 +16,9 @@ dependencies = [
     ('FFTW', '3.3.4'),
 ]
 
+# /bin/csh is required by 'config' script
+osdependencies = ['tcsh']
+
 charm_arch = "net-linux-x86_64 ibverbs"
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/n/NAMD/NAMD-2.9-ictce-5.5.0-mpi.eb b/easybuild/easyconfigs/n/NAMD/NAMD-2.9-ictce-5.5.0-mpi.eb
index 2fbdf0552929ef1cadedd580b8fa8d01398aef1e..427a25848b61ad2a43707b2203c934b1b3b41def 100644
--- a/easybuild/easyconfigs/n/NAMD/NAMD-2.9-ictce-5.5.0-mpi.eb
+++ b/easybuild/easyconfigs/n/NAMD/NAMD-2.9-ictce-5.5.0-mpi.eb
@@ -3,7 +3,8 @@ version = '2.9'
 versionsuffix = '-mpi'
 
 homepage = 'http://www.ks.uiuc.edu/Research/namd/'
-description = """NAMD is a parallel molecular dynamics code designed for high-performance simulation of large biomolecular systems."""
+description = """NAMD is a parallel molecular dynamics code designed for high-performance simulation of
+ large biomolecular systems."""
 
 toolchain = {'name': 'ictce', 'version': '5.5.0'}
 toolchainopts = {'opt': True, 'pic': True, 'usempi': True}
@@ -15,6 +16,9 @@ dependencies = [
     ('FFTW', '3.3.4'),
 ]
 
+# /bin/csh is required by 'config' script
+osdependencies = ['tcsh']
+
 charm_arch = 'mpi-linux-x86_64'
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/n/NGS/NGS-1.2.3-foss-2016b.eb b/easybuild/easyconfigs/n/NGS/NGS-1.2.3-foss-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5ebb8f01ff7a93dd7c3a33236849259172272a64
--- /dev/null
+++ b/easybuild/easyconfigs/n/NGS/NGS-1.2.3-foss-2016b.eb
@@ -0,0 +1,35 @@
+easyblock = 'ConfigureMake'
+
+name = 'NGS'
+version = '1.2.3'
+
+homepage = 'https://github.com/ncbi/ngs'
+description = """NGS is a new, domain-specific API for accessing reads, alignments and pileups produced from
+ Next Generation Sequencing."""
+
+toolchain = {'name': 'foss', 'version': '2016b'}
+
+source_urls = ['https://github.com/ncbi/ngs/archive/']
+sources = ['%(version)s.tar.gz']
+
+dependencies = [('Java', '1.8.0_92', '', True)]
+
+# override default of using $HOME/ncbi-outdir
+configopts = "--build-prefix=%(builddir)s/ncbi-outdir"
+
+buildopts = 'CC="$CC -c" CPP="$CXX" CP="$CXX -c" -C ngs-sdk && '
+buildopts += 'make CC="$CC -c" CPP="$CXX" CP="$CXX -c" -C ngs-java'
+
+installopts = "-C ngs-sdk && make install -C ngs-java"
+
+parallel = 1
+
+sanity_check_paths = {
+    'files': ['jar/ngs-java.jar', ('lib/libngs-sdk.%s' % SHLIB_EXT, 'lib64/libngs-sdk.%s' % SHLIB_EXT),
+              ('lib/libngs-adapt-c++.a', 'lib64/libngs-adapt-c++.a'), ('lib/libngs-c++.a', 'lib64/libngs-c++.a')],
+    'dirs': ['include/ngs', 'share'],
+}
+
+modextrapaths = {'CLASSPATH': 'jar/ngs-java.jar'}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/n/NGS/NGS-1.2.5-foss-2016b.eb b/easybuild/easyconfigs/n/NGS/NGS-1.2.5-foss-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8b032e04685d6d7fa4f9f651bf9b7e8d8b1c8f5c
--- /dev/null
+++ b/easybuild/easyconfigs/n/NGS/NGS-1.2.5-foss-2016b.eb
@@ -0,0 +1,35 @@
+easyblock = 'ConfigureMake'
+
+name = 'NGS'
+version = '1.2.5'
+
+homepage = 'https://github.com/ncbi/ngs'
+description = """NGS is a new, domain-specific API for accessing reads, alignments and pileups produced from
+ Next Generation Sequencing."""
+
+toolchain = {'name': 'foss', 'version': '2016b'}
+
+source_urls = ['https://github.com/ncbi/ngs/archive/']
+sources = ['%(version)s.tar.gz']
+
+dependencies = [('Java', '1.8.0_92', '', True)]
+
+# override default of using $HOME/ncbi-outdir
+configopts = "--build-prefix=%(builddir)s/ncbi-outdir"
+
+buildopts = 'CC="$CC -c" CPP="$CXX" CP="$CXX -c" -C ngs-sdk && '
+buildopts += 'make CC="$CC -c" CPP="$CXX" CP="$CXX -c" -C ngs-java'
+
+installopts = "-C ngs-sdk && make install -C ngs-java"
+
+parallel = 1
+
+sanity_check_paths = {
+    'files': ['jar/ngs-java.jar', ('lib/libngs-sdk.%s' % SHLIB_EXT, 'lib64/libngs-sdk.%s' % SHLIB_EXT),
+              ('lib/libngs-adapt-c++.a', 'lib64/libngs-adapt-c++.a'), ('lib/libngs-c++.a', 'lib64/libngs-c++.a')],
+    'dirs': ['include/ngs', 'share'],
+}
+
+modextrapaths = {'CLASSPATH': 'jar/ngs-java.jar'}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/n/ncbi-vdb/ncbi-vdb-2.5.8-1-foss-2016b.eb b/easybuild/easyconfigs/n/ncbi-vdb/ncbi-vdb-2.5.8-1-foss-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e0bd19a1216f1b8e75a8205c068f79f45f2e4280
--- /dev/null
+++ b/easybuild/easyconfigs/n/ncbi-vdb/ncbi-vdb-2.5.8-1-foss-2016b.eb
@@ -0,0 +1,38 @@
+easyblock = 'ConfigureMake'
+
+name = 'ncbi-vdb'
+version = '2.5.8-1'
+
+homepage = 'https://github.com/ncbi/ncbi-vdb'
+description = """The SRA Toolkit and SDK from NCBI is a collection of tools and libraries for
+ using data in the INSDC Sequence Read Archives."""
+
+toolchain = {'name': 'foss', 'version': '2016b'}
+
+source_urls = ['https://github.com/ncbi/ncbi-vdb/archive/']
+sources = ['%(version)s.tar.gz']
+
+dependencies = [
+    ('libxml2', '2.9.4'),
+    ('file', '5.28'),  # provides libmagic
+    ('HDF5', '1.8.17'),
+    ('NGS', '1.2.3'),
+]
+
+# override default of using $HOME/ncbi-outdir
+configopts = "--build-prefix=%(builddir)s/ncbi-outdir "
+
+configopts += "--with-ngs-sdk-prefix=$EBROOTNGS --with-ngs-java-prefix=$EBROOTNGS "
+configopts += "--with-hdf5-prefix=$EBROOTHDF5 --with-xml2-prefix=$EBROOTLIBXML2"
+
+parallel = 1
+
+sanity_check_paths = {
+    'files': ['include/ncbi-vdb/NGS.hpp', ('lib/libncbi-vdb.%s' % SHLIB_EXT, 'lib64/libncbi-vdb.%s' % SHLIB_EXT),
+              ('lib/libncbi-wvdb.%s' % SHLIB_EXT, 'lib64/libncbi-wvdb.%s' % SHLIB_EXT),
+              ('lib/libncbi-ngs-c++.a', 'lib64/libncbi-ngs-c++.a'), ('lib/libncbi-vdb.a', 'lib64/libncbi-vdb.a'),
+              ('lib/libncbi-wvdb.a', 'lib64/libncbi-wvdb.a')],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/n/ncbi-vdb/ncbi-vdb-2.7.0-foss-2016b.eb b/easybuild/easyconfigs/n/ncbi-vdb/ncbi-vdb-2.7.0-foss-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..077b870927f75f35b9a59a6e24c9ada988ff0f12
--- /dev/null
+++ b/easybuild/easyconfigs/n/ncbi-vdb/ncbi-vdb-2.7.0-foss-2016b.eb
@@ -0,0 +1,38 @@
+easyblock = 'ConfigureMake'
+
+name = 'ncbi-vdb'
+version = '2.7.0'
+
+homepage = 'https://github.com/ncbi/ncbi-vdb'
+description = """The SRA Toolkit and SDK from NCBI is a collection of tools and libraries for
+ using data in the INSDC Sequence Read Archives."""
+
+toolchain = {'name': 'foss', 'version': '2016b'}
+
+source_urls = ['https://github.com/ncbi/ncbi-vdb/archive/']
+sources = ['%(version)s.tar.gz']
+
+dependencies = [
+    ('libxml2', '2.9.4'),
+    ('file', '5.28'),  # provides libmagic
+    ('HDF5', '1.8.17'),
+    ('NGS', '1.2.5'),
+]
+
+# override default of using $HOME/ncbi-outdir
+configopts = "--build-prefix=%(builddir)s/ncbi-outdir "
+
+configopts += "--with-ngs-sdk-prefix=$EBROOTNGS --with-ngs-java-prefix=$EBROOTNGS "
+configopts += "--with-hdf5-prefix=$EBROOTHDF5 --with-xml2-prefix=$EBROOTLIBXML2"
+
+parallel = 1
+
+sanity_check_paths = {
+    'files': ['include/ncbi-vdb/NGS.hpp', ('lib/libncbi-vdb.%s' % SHLIB_EXT, 'lib64/libncbi-vdb.%s' % SHLIB_EXT),
+              ('lib/libncbi-wvdb.%s' % SHLIB_EXT, 'lib64/libncbi-wvdb.%s' % SHLIB_EXT),
+              ('lib/libncbi-ngs-c++.a', 'lib64/libncbi-ngs-c++.a'), ('lib/libncbi-vdb.a', 'lib64/libncbi-vdb.a'),
+              ('lib/libncbi-wvdb.a', 'lib64/libncbi-wvdb.a')],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/n/nco/nco-0.0.2-intel-2015a-Python-2.7.10.eb b/easybuild/easyconfigs/n/nco/nco-0.0.2-intel-2015a-Python-2.7.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a661d2786bdd76ea012fa9a46bde9dfb533c4c8c
--- /dev/null
+++ b/easybuild/easyconfigs/n/nco/nco-0.0.2-intel-2015a-Python-2.7.10.eb
@@ -0,0 +1,30 @@
+easyblock = 'PythonPackage'
+
+name = 'nco'
+version = '0.0.2'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://github.com/nco/pynco'
+description = """Python bindings for NCO"""
+
+toolchain = {'name': 'intel', 'version': '2015a'}
+toolchainopts = {'usempi': True}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.10'),
+    ('NCO', '4.5.1', versionsuffix),
+    ('numpy', '1.10.4', versionsuffix),
+    ('scipy', '0.16.1', versionsuffix),
+    ('netcdf4-python', '1.2.2', versionsuffix),
+
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-6.0-GCC-5.4.0-2.26.eb b/easybuild/easyconfigs/n/ncurses/ncurses-6.0-GCC-5.4.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a13213588d3cf9f0a0a1114489555f8d751453c4
--- /dev/null
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-6.0-GCC-5.4.0-2.26.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': 'GCC', 'version': '5.4.0-2.26'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+patches = ['ncurses-%(version)s_gcc-5.patch']
+
+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.eb b/easybuild/easyconfigs/n/ncurses/ncurses-6.0.eb
index 51d2a6f5390b67287c3aac50a949cfbfdfa62761..dcca941e16c534d94b33144d33dce9bbcbb04486 100644
--- a/easybuild/easyconfigs/n/ncurses/ncurses-6.0.eb
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-6.0.eb
@@ -16,12 +16,13 @@ sources = [SOURCE_TAR_GZ]
 
 configopts = [
     # default build
-    '--with-shared --enable-overwrite',
+    '--with-shared --enable-overwrite --with-termlib',
     # the UTF-8 enabled version (ncursesw)
-    '--with-shared --enable-overwrite --enable-ext-colors --enable-widec --includedir=%(installdir)s/include/ncursesw/'
+    '--with-shared --enable-overwrite --with-termlib ' +
+    '--enable-ext-colors --enable-widec --includedir=%(installdir)s/include/ncursesw/'
 ]
 
-libs = ["form", "menu", "ncurses", "panel"]
+libs = ["form", "menu", "ncurses", "panel", "tinfo"]
 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"]] +
diff --git a/easybuild/easyconfigs/n/ncview/ncview-2.1.7-intel-2016b.eb b/easybuild/easyconfigs/n/ncview/ncview-2.1.7-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..09cf15c6d34318e4bfd4b2b1f6d88c96feff863e
--- /dev/null
+++ b/easybuild/easyconfigs/n/ncview/ncview-2.1.7-intel-2016b.eb
@@ -0,0 +1,43 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2014 The Cyprus Institute
+# Authors:: Thekla Loizou <t.loizou@cyi.ac.cy>
+# License:: MIT/GPL
+#
+##
+easyblock = 'ConfigureMake'
+
+name = 'ncview'
+version = '2.1.7'
+
+homepage = 'http://meteora.ucsd.edu/~pierce/ncview_home_page.html'
+description = """Ncview is a visual browser for netCDF format files. 
+Typically you would use ncview to get a quick and easy, push-button 
+look at your netCDF files. You can view simple movies of the data, 
+view along various dimensions, take a look at the actual data values, 
+change color maps, invert the data, etc."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+toolchainopts = {'usempi': True, 'pic': True}
+
+source_urls = ['ftp://cirrus.ucsd.edu/pub/ncview/']
+sources = [SOURCE_TAR_GZ]
+
+# specified compiler is hard checked against (full path to) compiler used for netCDF...
+preconfigopts = "CC=$(which $CC) "
+configopts = "--with-udunits2_incdir=$EBROOTUDUNITS/include --with-udunits2_libdir=$EBROOTUDUNITS/lib "
+configopts += "--with-nc-config=$EBROOTNETCDF/bin/nc-config"
+
+dependencies = [
+    ('netCDF', '4.4.1'),
+    ('netCDF-Fortran', '4.4.4'),
+    ('UDUNITS', '2.2.20'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/ncview'],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/n/netcdf4-python/netcdf4-python-1.2.2-intel-2015a-Python-2.7.10.eb b/easybuild/easyconfigs/n/netcdf4-python/netcdf4-python-1.2.2-intel-2015a-Python-2.7.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1c992d8b514f633fab1a24221970060c6d47d0d8
--- /dev/null
+++ b/easybuild/easyconfigs/n/netcdf4-python/netcdf4-python-1.2.2-intel-2015a-Python-2.7.10.eb
@@ -0,0 +1,24 @@
+name = 'netcdf4-python'
+version = '1.2.2'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://unidata.github.io/netcdf4-python/'
+description = """Python/numpy interface to netCDF."""
+
+toolchain = {'name': 'intel', 'version': '2015a'}
+toolchainopts = {'usempi': True}
+
+source_urls = ['https://github.com/Unidata/netcdf4-python/archive/']
+sources = ['v%(version)srel.tar.gz']
+
+patches = ['netcdf4-python-1.1.8-avoid-diskless-test.patch']
+
+dependencies = [
+    ('Python', '2.7.10'),
+    ('numpy', '1.10.4', versionsuffix),
+    ('HDF5', '1.8.15'),
+    ('netCDF', '4.3.3.1'),
+    ('cURL', '7.43.0'),
+]
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/n/nettle/nettle-3.2-foss-2016b.eb b/easybuild/easyconfigs/n/nettle/nettle-3.2-foss-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d8b0e1009de7d82f3bb5753ead3da9279d97a158
--- /dev/null
+++ b/easybuild/easyconfigs/n/nettle/nettle-3.2-foss-2016b.eb
@@ -0,0 +1,28 @@
+easyblock = 'ConfigureMake'
+
+name = 'nettle'
+version = '3.2'
+
+homepage = 'http://www.lysator.liu.se/~nisse/nettle/'
+description = """Nettle is a cryptographic library that is designed to fit easily
+ in more or less any context: In crypto toolkits for object-oriented
+ languages (C++, Python, Pike, ...), in applications like LSH or GNUPG,
+ or even in kernel space."""
+
+toolchain = {'name': 'foss', 'version': '2016b'}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('GMP', '6.1.1'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in ['nettle-hash', 'nettle-lfib-stream', 'pkcs1-conv', 'sexp-conv']] +
+             ['lib64/libhogweed.a', 'lib64/libhogweed.%s' % SHLIB_EXT,
+              'lib64/libnettle.a', 'lib64/libnettle.%s' % SHLIB_EXT],
+    'dirs': ['include/nettle'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/n/nettle/nettle-3.2-intel-2016b.eb b/easybuild/easyconfigs/n/nettle/nettle-3.2-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..728d2523674a97e20a89edb120aaf765b5290546
--- /dev/null
+++ b/easybuild/easyconfigs/n/nettle/nettle-3.2-intel-2016b.eb
@@ -0,0 +1,28 @@
+easyblock = 'ConfigureMake'
+
+name = 'nettle'
+version = '3.2'
+
+homepage = 'http://www.lysator.liu.se/~nisse/nettle/'
+description = """Nettle is a cryptographic library that is designed to fit easily
+ in more or less any context: In crypto toolkits for object-oriented
+ languages (C++, Python, Pike, ...), in applications like LSH or GNUPG,
+ or even in kernel space."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('GMP', '6.1.1'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in ['nettle-hash', 'nettle-lfib-stream', 'pkcs1-conv', 'sexp-conv']] +
+             ['lib64/libhogweed.a', 'lib64/libhogweed.%s' % SHLIB_EXT,
+              'lib64/libnettle.a', 'lib64/libnettle.%s' % SHLIB_EXT],
+    'dirs': ['include/nettle'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/n/networkx/networkx-1.11-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/n/networkx/networkx-1.11-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8dde76eb25208e4ddf70044f8be0369432cd193a
--- /dev/null
+++ b/easybuild/easyconfigs/n/networkx/networkx-1.11-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,25 @@
+easyblock = 'PythonPackage'
+
+name = 'networkx'
+version = '1.11'
+versionsuffix = '-Python-%(pyver)s' 
+
+homepage = 'https://pypi.python.org/pypi/networkx'
+description = """NetworkX is a Python package for the creation, manipulation, and study of the structure, dynamics,
+ and functions of complex networks."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.11'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/n/networkx/networkx-1.11-foss-2016a-Python-3.5.1.eb b/easybuild/easyconfigs/n/networkx/networkx-1.11-foss-2016a-Python-3.5.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..488dd6f650b21339163af62a2077156c783b98b8
--- /dev/null
+++ b/easybuild/easyconfigs/n/networkx/networkx-1.11-foss-2016a-Python-3.5.1.eb
@@ -0,0 +1,25 @@
+easyblock = 'PythonPackage'
+
+name = 'networkx'
+version = '1.11'
+versionsuffix = '-Python-%(pyver)s' 
+
+homepage = 'https://pypi.python.org/pypi/networkx'
+description = """NetworkX is a Python package for the creation, manipulation, and study of the structure, dynamics,
+ and functions of complex networks."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '3.5.1'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/n/nose-parameterized/nose-parameterized-0.5.0-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/n/nose-parameterized/nose-parameterized-0.5.0-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ced9988f351e47b39ac55f02958aac17d3245e9f
--- /dev/null
+++ b/easybuild/easyconfigs/n/nose-parameterized/nose-parameterized-0.5.0-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,24 @@
+easyblock = "PythonPackage"
+
+name = 'nose-parameterized'
+version = '0.5.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'hmat://github.com/wolever/nose-parameterized'
+description = """Parameterized testing with any Python test framework."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('Python', '2.7.11')]
+
+options = {'modulename': 'nose_parameterized'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/n/nose-parameterized/nose-parameterized-0.5.0-foss-2016a-Python-3.5.1.eb b/easybuild/easyconfigs/n/nose-parameterized/nose-parameterized-0.5.0-foss-2016a-Python-3.5.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6c5140ef8ceefd40f3addca4905966f73ad112e2
--- /dev/null
+++ b/easybuild/easyconfigs/n/nose-parameterized/nose-parameterized-0.5.0-foss-2016a-Python-3.5.1.eb
@@ -0,0 +1,24 @@
+easyblock = "PythonPackage"
+
+name = 'nose-parameterized'
+version = '0.5.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'hmat://github.com/wolever/nose-parameterized'
+description = """Parameterized testing with any Python test framework."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('Python', '3.5.1')]
+
+options = {'modulename': 'nose_parameterized'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/n/nose-parameterized/nose-parameterized-0.5.0-intel-2016b-Python-3.5.2.eb b/easybuild/easyconfigs/n/nose-parameterized/nose-parameterized-0.5.0-intel-2016b-Python-3.5.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..971304f89cbb5206f4072534a9108961d21b164b
--- /dev/null
+++ b/easybuild/easyconfigs/n/nose-parameterized/nose-parameterized-0.5.0-intel-2016b-Python-3.5.2.eb
@@ -0,0 +1,24 @@
+easyblock = "PythonPackage"
+
+name = 'nose-parameterized'
+version = '0.5.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'hmat://github.com/wolever/nose-parameterized'
+description = """Parameterized testing with any Python test framework."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('Python', '3.5.2')]
+
+options = {'modulename': 'nose_parameterized'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/n/numactl/numactl-2.0.11-GCC-5.2.0.eb b/easybuild/easyconfigs/n/numactl/numactl-2.0.11-GCC-5.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2c6aa67bd45512331b0f066ca2334ca03656b577
--- /dev/null
+++ b/easybuild/easyconfigs/n/numactl/numactl-2.0.11-GCC-5.2.0.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': '5.2.0'}
+
+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-6.1.0-2.27.eb b/easybuild/easyconfigs/n/numactl/numactl-2.0.11-GCC-6.1.0-2.27.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b862023bd66c4b68fb14486d6d01850ae7c574f9
--- /dev/null
+++ b/easybuild/easyconfigs/n/numactl/numactl-2.0.11-GCC-6.1.0-2.27.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': '6.1.0-2.27'}
+
+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-6.2.0-2.27.eb b/easybuild/easyconfigs/n/numactl/numactl-2.0.11-GCC-6.2.0-2.27.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7d6ccf39997b1ba13d214fccdd4942677d5ea625
--- /dev/null
+++ b/easybuild/easyconfigs/n/numactl/numactl-2.0.11-GCC-6.2.0-2.27.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': '6.2.0-2.27'}
+
+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-GCCcore-5.4.0.eb b/easybuild/easyconfigs/n/numactl/numactl-2.0.11-GCCcore-5.4.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..61ae200dde801c185b5ebc98e6330ff674da11d8
--- /dev/null
+++ b/easybuild/easyconfigs/n/numactl/numactl-2.0.11-GCCcore-5.4.0.eb
@@ -0,0 +1,25 @@
+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': 'GCCcore', 'version': '5.4.0'}
+
+source_urls = ['ftp://oss.sgi.com/www/projects/libnuma/download/']
+sources = [SOURCE_TAR_GZ]
+
+checksums = ['d3bc88b7ddb9f06d60898f4816ae9127']
+
+builddependencies = [('binutils', '2.26')]
+
+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-gcccuda-2016.10.0.eb b/easybuild/easyconfigs/n/numactl/numactl-2.0.11-gcccuda-2016.10.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6ee99ec4e4a101a4dbf1530061fb8c86c3a01f27
--- /dev/null
+++ b/easybuild/easyconfigs/n/numactl/numactl-2.0.11-gcccuda-2016.10.0.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': 'gcccuda', 'version': '2016.10.0'}
+
+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-iccifort-2016.3.210-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/n/numactl/numactl-2.0.11-iccifort-2016.3.210-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..61b226e7c458a4903737a582e6dca5f45afdc2b6
--- /dev/null
+++ b/easybuild/easyconfigs/n/numactl/numactl-2.0.11-iccifort-2016.3.210-GCC-4.9.3-2.25.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'numactl'
+version = '2.0.11'
+
+checksums = ['d3bc88b7ddb9f06d60898f4816ae9127']
+
+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': 'iccifort', 'version': '2016.3.210-GCC-4.9.3-2.25'}
+
+source_urls = ['ftp://oss.sgi.com/www/projects/libnuma/download/']
+sources = [SOURCE_TAR_GZ]
+
+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-iccifort-2016.3.210-GCC-5.4.0-2.26.eb b/easybuild/easyconfigs/n/numactl/numactl-2.0.11-iccifort-2016.3.210-GCC-5.4.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fb308c3df39e7ebf859707329e00f2b1fb4be314
--- /dev/null
+++ b/easybuild/easyconfigs/n/numactl/numactl-2.0.11-iccifort-2016.3.210-GCC-5.4.0-2.26.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'numactl'
+version = '2.0.11'
+
+checksums = ['d3bc88b7ddb9f06d60898f4816ae9127']
+
+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': 'iccifort', 'version': '2016.3.210-GCC-5.4.0-2.26'}
+
+source_urls = ['ftp://oss.sgi.com/www/projects/libnuma/download/']
+sources = [SOURCE_TAR_GZ]
+
+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-intel-2016b.eb b/easybuild/easyconfigs/n/numactl/numactl-2.0.11-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0c6c854f4aab6f3fe28e910af53988e685746b01
--- /dev/null
+++ b/easybuild/easyconfigs/n/numactl/numactl-2.0.11-intel-2016b.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': 'intel', 'version': '2016b'}
+
+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/numpy/numpy-1.10.4-intel-2015a-Python-2.7.10.eb b/easybuild/easyconfigs/n/numpy/numpy-1.10.4-intel-2015a-Python-2.7.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d197dabcbd26defba3db2fa652c766e9884966b9
--- /dev/null
+++ b/easybuild/easyconfigs/n/numpy/numpy-1.10.4-intel-2015a-Python-2.7.10.eb
@@ -0,0 +1,26 @@
+name = 'numpy'
+version = '1.10.4'
+versionsuffix = '-Python-%(pyver)s'
+
+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': '2015a'}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+patches = [
+    'numpy-1.8.0-mkl.patch',
+    'numpy-%(version)s-sse42.patch',
+]
+
+dependencies = [
+    ('Python', '2.7.10'),
+]
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/o/OBITools/OBITools-1.2.9-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/o/OBITools/OBITools-1.2.9-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d30d6266abf160541580bec17d22186c5b551d58
--- /dev/null
+++ b/easybuild/easyconfigs/o/OBITools/OBITools-1.2.9-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,34 @@
+easyblock = "PythonPackage"
+
+name = 'OBITools'
+version = '1.2.9'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://www.grenoble.prabi.fr/trac/OBITools'
+description = """ The OBITools programs aims to help you to manipulate various data and sequence files in a convenient way using
+ the Unix command line interface. They follow the standard Unix interface for command line program, allowing to chain a set of
+ commands using the pipe mecanism. 
+"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('Cython', '0.24.1', versionsuffix),
+    ('wheel', '0.29.0', versionsuffix),
+    ('IPython', '5.0.0', versionsuffix),
+    ('Sphinx', '1.4.8', versionsuffix)
+]
+
+options = {'modulename': 'obitools'}
+
+sanity_check_paths = {
+    'files': ["bin/%s" % binfile for binfile in ['ali2consensus','ecotag','obiaddtaxids','obicount','obistat']],
+    'dirs': ['bin','lib/python%(pyshortver)s/site-packages/obitools'],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/o/OPARI2/OPARI2-1.1.1-goolf-1.5.14.eb b/easybuild/easyconfigs/o/OPARI2/OPARI2-1.1.1-goolf-1.5.14.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d50dab2154905f6f81841b49c2d3b4d66d918b3a
--- /dev/null
+++ b/easybuild/easyconfigs/o/OPARI2/OPARI2-1.1.1-goolf-1.5.14.eb
@@ -0,0 +1,31 @@
+# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild
+# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany
+# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
+# License::   New BSD
+#
+# This work is based from experiences from the UNITE project
+# http://apps.fz-juelich.de/unite/
+##
+easyblock = 'ConfigureMake'
+
+name = 'OPARI2'
+version = '1.1.1'
+
+homepage = 'http://www.score-p.org'
+description = """OPARI2, the successor of Forschungszentrum Juelich's OPARI,
+ is a source-to-source instrumentation tool for OpenMP and hybrid codes.
+ It surrounds OpenMP directives and runtime library calls with calls to
+ the POMP2 measurement interface."""
+
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
+
+# http://www.vi-hps.org/upload/packages/opari2/opari2-1.1.1.tar.gz
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.vi-hps.org/upload/packages/opari2/']
+
+sanity_check_paths = {
+    'files': ['bin/opari2', 'include/opari2/pomp2_lib.h'],
+    'dirs': [],
+}
+
+moduleclass = 'perf'
diff --git a/easybuild/easyconfigs/o/OSU-Micro-Benchmarks/OSU-Micro-Benchmarks-5.3.2-foss-2016a.eb b/easybuild/easyconfigs/o/OSU-Micro-Benchmarks/OSU-Micro-Benchmarks-5.3.2-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d25cf1b3ab773e9dbbb22a8c62759a0c7b28545c
--- /dev/null
+++ b/easybuild/easyconfigs/o/OSU-Micro-Benchmarks/OSU-Micro-Benchmarks-5.3.2-foss-2016a.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'OSU-Micro-Benchmarks'
+version = '5.3.2'
+
+homepage = 'http://mvapich.cse.ohio-state.edu/benchmarks/'
+description = """OSU Micro-Benchmarks"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich/']
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = 'CC="$MPICC" CXX="$MPICC"'
+
+benchmark_dirs = ['libexec/osu-micro-benchmarks/mpi/%s' % x for x in ['collective', 'one-sided', 'pt2pt']]
+modextrapaths = {'PATH': benchmark_dirs}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': benchmark_dirs,
+}
+
+moduleclass = 'perf'
diff --git a/easybuild/easyconfigs/o/OTF/OTF-1.12.4-goolf-1.5.14.eb b/easybuild/easyconfigs/o/OTF/OTF-1.12.4-goolf-1.5.14.eb
new file mode 100644
index 0000000000000000000000000000000000000000..831526692c13f152f7754aaa9db7ed3b3d65c984
--- /dev/null
+++ b/easybuild/easyconfigs/o/OTF/OTF-1.12.4-goolf-1.5.14.eb
@@ -0,0 +1,34 @@
+# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild
+# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany
+# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
+# License::   New BSD
+#
+# This work is based from experiences from the UNITE project
+# http://apps.fz-juelich.de/unite/
+##
+easyblock = 'ConfigureMake'
+
+name = 'OTF'
+version = '1.12.4'
+
+homepage = 'http://www.tu-dresden.de/zih/otf/'
+description = """The Open Trace Format is a highly scalable, memory efficient event
+ trace data format plus support library. It is the standard trace format
+ for Vampir, and is open for other tools. [NOW OBSOLETE: use OTF2]"""
+
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
+
+# http://wwwpub.zih.tu-dresden.de/%7Emlieber/dcount/dcount.php?package=otf&get=OTF-1.12.4salmon.tar.gz
+sources = ['%(name)s-%(version)ssalmon.tar.gz']
+source_urls = ['http://wwwpub.zih.tu-dresden.de/%7Emlieber/dcount/dcount.php?package=otf&get=']
+
+# name change in version 1.12.3: "open-trace-format" was "otf" in older versions
+# "open-trace-format" => "otf" for versions until 1.12.2
+sanity_check_paths = {
+    'files': ['bin/otfconfig', 'include/open-trace-format/otf.h',
+              # note by Bernd Mohr: on some systems libraries end up in lib/
+              ('lib64/libopen-trace-format.a', 'lib/libopen-trace-format.a')],
+    'dirs': [],
+}
+
+moduleclass = 'perf'
diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.18-gompi-2016.07-LAPACK-3.6.1.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.18-gompi-2016.07-LAPACK-3.6.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..75a0bc06f7430780fd79b92862658fd04d0e7f9f
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.18-gompi-2016.07-LAPACK-3.6.1.eb
@@ -0,0 +1,49 @@
+easyblock = 'ConfigureMake'
+
+name = 'OpenBLAS'
+version = '0.2.18'
+
+lapackver = '3.6.1'
+versionsuffix = '-LAPACK-%s' % lapackver
+
+homepage = 'http://xianyi.github.com/OpenBLAS/'
+description = """OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version."""
+
+toolchain = {'name': 'gompi', 'version': '2016.07'}
+
+lapack_src = 'lapack-%s.tgz' % lapackver
+large_src = 'large.tgz'
+timing_src = 'timing.tgz'
+sources = [
+    'v%(version)s.tar.gz',
+    lapack_src,
+    large_src,
+    timing_src,
+]
+source_urls = [
+    # order matters, trying to download the LAPACK tarball from GitHub causes trouble
+    "http://www.netlib.org/lapack/",
+    "http://www.netlib.org/lapack/timing/",
+    "https://github.com/xianyi/OpenBLAS/archive/",
+]
+
+patches = [
+    (lapack_src, '.'),  # copy LAPACK tarball to unpacked OpenBLAS dir
+    (large_src, '.'),
+    (timing_src, '.'),
+]
+
+skipsteps = ['configure']
+
+threading = 'USE_THREAD=1'
+buildopts = 'BINARY=64 ' + threading + ' CC="$CC" FC="$F77"'
+installopts = threading + " PREFIX=%(installdir)s"
+
+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/OpenBLAS/OpenBLAS-0.2.19-gompi-2016.09-LAPACK-3.6.1.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.19-gompi-2016.09-LAPACK-3.6.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..32b66ddad170a8aa84d2cbd0e17a9748caa9fd7d
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.19-gompi-2016.09-LAPACK-3.6.1.eb
@@ -0,0 +1,49 @@
+easyblock = 'ConfigureMake'
+
+name = 'OpenBLAS'
+version = '0.2.19'
+
+lapackver = '3.6.1'
+versionsuffix = '-LAPACK-%s' % lapackver
+
+homepage = 'http://xianyi.github.com/OpenBLAS/'
+description = """OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version."""
+
+toolchain = {'name': 'gompi', 'version': '2016.09'}
+
+lapack_src = 'lapack-%s.tgz' % lapackver
+large_src = 'large.tgz'
+timing_src = 'timing.tgz'
+sources = [
+    'v%(version)s.tar.gz',
+    lapack_src,
+    large_src,
+    timing_src,
+]
+source_urls = [
+    # order matters, trying to download the LAPACK tarball from GitHub causes trouble
+    "http://www.netlib.org/lapack/",
+    "http://www.netlib.org/lapack/timing/",
+    "https://github.com/xianyi/OpenBLAS/archive/",
+]
+
+patches = [
+    (lapack_src, '.'),  # copy LAPACK tarball to unpacked OpenBLAS dir
+    (large_src, '.'),
+    (timing_src, '.'),
+]
+
+skipsteps = ['configure']
+
+threading = 'USE_THREAD=1'
+buildopts = 'BINARY=64 ' + threading + ' CC="$CC" FC="$F77"'
+installopts = threading + " PREFIX=%(installdir)s"
+
+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/OpenBLAS/OpenBLAS-0.2.19-gompic-2016.10.0-LAPACK-3.6.1.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.19-gompic-2016.10.0-LAPACK-3.6.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..665e61e6ba4e60e06f0f16bb0268bf2b5ddb0db6
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.19-gompic-2016.10.0-LAPACK-3.6.1.eb
@@ -0,0 +1,49 @@
+easyblock = 'ConfigureMake'
+
+name = 'OpenBLAS'
+version = '0.2.19'
+
+lapackver = '3.6.1'
+versionsuffix = '-LAPACK-%s' % lapackver
+
+homepage = 'http://xianyi.github.com/OpenBLAS/'
+description = """OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version."""
+
+toolchain = {'name': 'gompic', 'version': '2016.10.0'}
+
+lapack_src = 'lapack-%s.tgz' % lapackver
+large_src = 'large.tgz'
+timing_src = 'timing.tgz'
+sources = [
+    'v%(version)s.tar.gz',
+    lapack_src,
+    large_src,
+    timing_src,
+]
+source_urls = [
+    # order matters, trying to download the LAPACK tarball from GitHub causes trouble
+    "http://www.netlib.org/lapack/",
+    "http://www.netlib.org/lapack/timing/",
+    "https://github.com/xianyi/OpenBLAS/archive/",
+]
+
+patches = [
+    (lapack_src, '.'),  # copy LAPACK tarball to unpacked OpenBLAS dir
+    (large_src, '.'),
+    (timing_src, '.'),
+]
+
+skipsteps = ['configure']
+
+threading = 'USE_THREAD=1'
+buildopts = 'BINARY=64 ' + threading + ' CC="$CC" FC="$F77"'
+installopts = threading + " PREFIX=%(installdir)s"
+
+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/OpenBabel/OpenBabel-2.3.2-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ce69b4afdeff8da5a994b00ebfce08a52a7975c2
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,36 @@
+name = 'OpenBabel'
+version = '2.3.2'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://openbabel.org'
+description = """Open Babel is a chemical toolbox designed to speak the many
+ languages of chemical data. It's an open, collaborative project allowing anyone
+ to search, convert, analyze, or store data from molecular modeling, chemistry,
+ solid-state materials, biochemistry, or related areas."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'strict': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+patches = [
+    'OpenBabel-%(version)s-fix-link-path-tests.patch',
+    'OpenBabel-%(version)s-ignore-failed-test.patch',
+    'OpenBabel-%(version)s-ignore-rotor-test.patch',
+]
+
+builddependencies = [
+    ('CMake', '3.5.2'),
+]
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('zlib', '1.2.8'),
+    ('libxml2', '2.9.3'),
+    ('Eigen', '3.2.8'),
+]
+
+runtest = 'test'
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ignore-rotor-test.patch b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ignore-rotor-test.patch
new file mode 100644
index 0000000000000000000000000000000000000000..8783154988b6bce48b17b5898cceaf49f696303b
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenBabel/OpenBabel-2.3.2-ignore-rotor-test.patch
@@ -0,0 +1,12 @@
+# The rotor tests fails, it is removed from the test set.
+# Author: Ruben van Dijk (University of Groningen)
+--- test/CMakeLists.txt.orig	2016-09-05 15:17:23.000000000 +0200
++++ test/CMakeLists.txt	2016-09-05 15:17:38.000000000 +0200
+@@ -18,7 +18,6 @@
+     implicitH
+     lssr
+     isomorphism
+-    rotor
+     shuffle
+     smiles
+     spectrophore
diff --git a/easybuild/easyconfigs/o/OpenCV/OpenCV-3.1.0-foss-2016a.eb b/easybuild/easyconfigs/o/OpenCV/OpenCV-3.1.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f835d278f9cff58e89abe02f361b7800e5ac1ccf
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenCV/OpenCV-3.1.0-foss-2016a.eb
@@ -0,0 +1,67 @@
+easyblock = 'CMakeMake'
+
+name = 'OpenCV'
+version = '3.1.0'
+
+homepage = 'http://opencv.org/'
+description = """OpenCV (Open Source Computer Vision Library) is an open source computer vision
+ and machine learning software library. OpenCV was built to provide
+ a common infrastructure for computer vision applications and to accelerate
+ the use of machine perception in the commercial products."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['https://github.com/Itseez/opencv/archive/']
+sources = ['%(version)s.zip']
+
+builddependencies = [
+    ('CMake', '3.5.2'),
+]
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('zlib', '1.2.8'),
+    ('FFmpeg', '3.0.2'),
+    ('libjpeg-turbo', '1.4.2', '-NASM-2.12.01'),
+    ('libpng', '1.6.21'),
+    ('LibTIFF', '4.0.6'),
+    ('JasPer', '1.900.1'),
+    ('Java', '1.8.0_92', '', True),
+    ('ant', '1.9.7', '-Java-%(javaver)s', True),
+    ('GLib', '2.48.0'),
+    ('GTK+', '2.24.30'),
+    ('GStreamer', '1.6.4'),
+    ('GST-plugins-base', '1.6.4'),
+]
+
+configopts = '-DCMAKE_BUILD_TYPE=RELEASE '
+configopts += '-DBUILD_PYTHON_SUPPORT=ON '
+configopts += '-DPYTHON_PACKAGES_PATH=%(installdir)s/lib/python%(pyshortver)s/site-packages '
+configopts += '-DBUILD_NEW_PYTHON_SUPPORT=ON '
+configopts += '-DZLIB_LIBRARY=$EBROOTZLIB/lib/libz.%s ' % SHLIB_EXT
+configopts += '-DZLIB_INCLUDE_DIR=$EBROOTZLIB/include '
+configopts += '-DTIFF_LIBRARY=$EBROOTLIBTIFF/lib/libtiff.%s ' % SHLIB_EXT
+configopts += '-DTIFF_INCLUDE_DIR=$EBROOTLIBTIFF/include '
+configopts += '-DPNG_LIBRARY=$EBROOTLIBPNG/lib/libpng.%s ' % SHLIB_EXT
+configopts += '-DPNG_INCLUDE_DIR=$EBROOTLIBPNG/include '
+configopts += '-DJPEG_LIBRARY=$EBROOTLIBJPEGMINTURBO/lib/libjpeg.%s ' % SHLIB_EXT
+configopts += '-DJPEG_INCLUDE_DIR=$EBROOTLIBJPEGMINTURBO/include '
+configopts += '-DJASPER_LIBRARY=$EBROOTJASPER/lib/libjasper.a '
+configopts += '-DJASPER_INCLUDE_DIR=$EBROOTJASPER/include '
+configopts += '-DWITH_IPP=ON '
+configopts += '-DENABLE_SSE=ON -DENABLE_SSE2=ON -DENABLE_SSE3=ON '
+configopts += '-DWITH_CUDA=OFF '
+
+sanity_check_paths = {
+    'files': ['lib/libopencv_core.%s' % SHLIB_EXT ] +
+             ['lib/python%%(pyshortver)s/site-packages/cv2.%s' % SHLIB_EXT ] +
+             ['bin/opencv_%s' % x for x in ['annotation', 'createsamples', 'traincascade']],
+    'dirs': ['include']
+}
+
+modextrapaths = {
+    'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages',
+    'CLASSPATH': 'share/OpenCV/java',
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/o/OpenEXR/OpenEXR-2.2.0-intel-2016b.eb b/easybuild/easyconfigs/o/OpenEXR/OpenEXR-2.2.0-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..479f9021cea48fd4b77f603ffbdf1568400402d9
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenEXR/OpenEXR-2.2.0-intel-2016b.eb
@@ -0,0 +1,32 @@
+easyblock = 'CMakeMake'
+
+name = 'OpenEXR'
+version = '2.2.0'
+
+homepage = 'http://www.openexr.com/'
+description = """OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic
+ for use in computer imaging applications"""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['https://github.com/openexr/openexr/archive/']
+sources = ['v%(version)s.tar.gz']
+
+builddependencies = [('CMake', '3.6.1')]
+
+env_vars = "CPATH=%(installdir)s/include/OpenEXR:$CPATH "
+env_vars += "LIBRARY_PATH=%(installdir)s/lib:$LIBRARY_PATH "
+env_vars += "LD_LIBRARY_PATH=%(installdir)s/lib:$LD_LIBRARY_PATH"
+preconfigopts = [
+    "cd IlmBase && ",
+    "cd OpenEXR && " + env_vars,
+]
+prebuildopts = preconfigopts[:]
+preinstallopts = preconfigopts[:]
+
+sanity_check_paths = {
+    'files': ['lib/libHalf.so'],
+    'dirs': ['bin', 'include/OpenEXR', 'share'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-4.0-cleanup.patch b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-4.0-cleanup.patch
new file mode 100644
index 0000000000000000000000000000000000000000..6ad12341f4642c621ad241466bab9dfb1f35eac0
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-4.0-cleanup.patch
@@ -0,0 +1,291 @@
+# This patch removes all need for the ThirdParty files of OpenFOAM:
+# we use EB dependencies for everything. It adjusts the paths, variables, etc
+# We also let the install dir, compiler, etc be set by EB.
+# Lastly, we also fix a small compile issue in 'ptscotchDecomp.C'
+# Ward Poelmans <wpoely86@gmail.com>
+diff -ur OpenFOAM-4.0.orig/applications/utilities/mesh/manipulation/setSet/Allwmake OpenFOAM-4.0/applications/utilities/mesh/manipulation/setSet/Allwmake
+--- OpenFOAM-4.0.orig/applications/utilities/mesh/manipulation/setSet/Allwmake	2016-06-24 23:33:52.000000000 +0200
++++ OpenFOAM-4.0/applications/utilities/mesh/manipulation/setSet/Allwmake	2016-09-02 15:44:36.305512075 +0200
+@@ -9,11 +9,11 @@
+ #
+ # use readline if available
+ #
+-if [ -f /usr/include/readline/readline.h ]
++if [ -f $EBROOTLIBREADLINE/include/readline/readline.h ]
+ then
+     echo "Found <readline/readline.h>  --  enabling readline support."
+     export COMP_FLAGS="-DHAS_READLINE"
+-    export LINK_FLAGS="-lreadline"
++    export LINK_FLAGS="-L$EBROOTLIBREADLINE/lib -lreadline -L$EBROOTNCURSES -lncurses"
+ fi
+
+ wmake
+diff -ur OpenFOAM-4.0.orig/applications/utilities/postProcessing/graphics/PVReaders/Allwmake OpenFOAM-4.0/applications/utilities/postProcessing/graphics/PVReaders/Allwmake
+--- OpenFOAM-4.0.orig/applications/utilities/postProcessing/graphics/PVReaders/Allwmake	2016-06-24 23:33:52.000000000 +0200
++++ OpenFOAM-4.0/applications/utilities/postProcessing/graphics/PVReaders/Allwmake	2016-09-02 15:44:36.305512075 +0200
+@@ -16,7 +16,7 @@
+         }
+
+         # ensure CMake gets the correct C++ compiler
+-        [ -n "$WM_CXX" ] && export CXX="$WM_CXX"
++#        [ -n "$WM_CXX" ] && export CXX="$WM_CXX"
+
+         wmake $targetType vtkPVReaders
+         PVblockMeshReader/Allwmake $*
+diff -ur OpenFOAM-4.0.orig/etc/bashrc OpenFOAM-4.0/etc/bashrc
+--- OpenFOAM-4.0.orig/etc/bashrc	2016-06-24 23:33:52.000000000 +0200
++++ OpenFOAM-4.0/etc/bashrc	2016-09-02 15:43:37.773220097 +0200
+@@ -42,9 +42,8 @@
+ #
+ # Please set to the appropriate path if the default is not correct.
+ #
+-[ $BASH_SOURCE ] && \
+-export FOAM_INST_DIR=${BASH_SOURCE%/*/*/*} || \
+-export FOAM_INST_DIR=$HOME/$WM_PROJECT
++# For Easybuild: set by the module
++#
+ # export FOAM_INST_DIR=~$WM_PROJECT
+ # export FOAM_INST_DIR=/opt/$WM_PROJECT
+ # export FOAM_INST_DIR=/usr/local/$WM_PROJECT
+diff -ur OpenFOAM-4.0.orig/etc/config.sh/CGAL OpenFOAM-4.0/etc/config.sh/CGAL
+--- OpenFOAM-4.0.orig/etc/config.sh/CGAL	2016-06-24 23:33:52.000000000 +0200
++++ OpenFOAM-4.0/etc/config.sh/CGAL	2016-09-02 15:43:37.773220097 +0200
+@@ -36,37 +36,7 @@
+ #
+ #------------------------------------------------------------------------------
+
+-boost_version=boost-system
+-cgal_version=cgal-system
+-#cgal_version=CGAL-4.8
+-
+-if [ -z "$SOURCE_CGAL_VERSIONS_ONLY" ]
+-then
+-
+-    common_path=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER
+-
+-    export BOOST_ARCH_PATH=$common_path/$boost_version
+-    export CGAL_ARCH_PATH=$common_path/$cgal_version
+-
+-    if [ "$FOAM_VERBOSE" -a "$PS1" ]
+-    then
+-        echo "Using CGAL and boost" 1>&2
+-        echo "    $cgal_version at $CGAL_ARCH_PATH" 1>&2
+-        echo "    $boost_version at $BOOST_ARCH_PATH" 1>&2
+-    fi
+-
+-    if [ -d "$CGAL_ARCH_PATH" -a "$cgal_version" != "cgal-system" ]
+-    then
+-        _foamAddLib $CGAL_ARCH_PATH/lib
+-    fi
+-
+-    if [ -d "$BOOST_ARCH_PATH" -a "$boost_version" != "boost-system" ]
+-    then
+-        _foamAddLib $BOOST_ARCH_PATH/lib
+-    fi
+-
+-    unset boost_version cgal_version common_path
+-
+-fi
++export CGAL_ARCH_PATH=$EBROOTCGAL
++export BOOST_ARCH_PATH=$EBROOTBOOST
+
+ #------------------------------------------------------------------------------
+diff -ur OpenFOAM-4.0.orig/etc/config.sh/gperftools OpenFOAM-4.0/etc/config.sh/gperftools
+--- OpenFOAM-4.0.orig/etc/config.sh/gperftools	2016-06-24 23:33:52.000000000 +0200
++++ OpenFOAM-4.0/etc/config.sh/gperftools	2016-09-02 15:43:37.773220097 +0200
+@@ -29,13 +29,7 @@
+ #
+ #------------------------------------------------------------------------------
+
+-version=svn
+-gperftools_install=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER
+-
+-GPERFTOOLS_VERSION=gperftools-$version
+-GPERFTOOLS_ARCH_PATH=$gperftools_install/$GPERFTOOLS_VERSION
+-
+-export PATH=$GPERFTOOLS_ARCH_PATH/bin:$PATH
+-export LD_LIBRARY_PATH=$GPERFTOOLS_ARCH_PATH/lib:$LD_LIBRARY_PATH
++GPERFTOOLS_VERSION=gperftools-$EBVERSIONGPERFTOOLS
++GPERFTOOLS_ARCH_PATH=$EBROOTGPERFTOOLS
+
+ #------------------------------------------------------------------------------
+diff -ur OpenFOAM-4.0.orig/etc/config.sh/metis OpenFOAM-4.0/etc/config.sh/metis
+--- OpenFOAM-4.0.orig/etc/config.sh/metis	2016-06-24 23:33:52.000000000 +0200
++++ OpenFOAM-4.0/etc/config.sh/metis	2016-09-02 15:43:37.773220097 +0200
+@@ -34,7 +34,7 @@
+ #
+ #------------------------------------------------------------------------------
+
+-export METIS_VERSION=metis-5.1.0
+-export METIS_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/$METIS_VERSION
++export METIS_VERSION=metis-$EBVERSIONMETIS
++export METIS_ARCH_PATH=$EBROOTMETIS
+
+ #------------------------------------------------------------------------------
+diff -ur OpenFOAM-4.0.orig/etc/config.sh/mpi OpenFOAM-4.0/etc/config.sh/mpi
+--- OpenFOAM-4.0.orig/etc/config.sh/mpi	2016-06-24 23:33:52.000000000 +0200
++++ OpenFOAM-4.0/etc/config.sh/mpi	2016-09-02 15:43:37.773220097 +0200
+@@ -243,6 +243,9 @@
+     _foamAddPath    $MPI_ARCH_PATH/bin64
+     _foamAddLib     $MPI_ARCH_PATH/lib64
+     ;;
++EASYBUILDMPI)
++    export FOAM_MPI=mpi
++    ;;
+ *)
+     export FOAM_MPI=dummy
+     ;;
+diff -ur OpenFOAM-4.0.orig/etc/config.sh/paraview OpenFOAM-4.0/etc/config.sh/paraview
+--- OpenFOAM-4.0.orig/etc/config.sh/paraview	2016-06-24 23:33:52.000000000 +0200
++++ OpenFOAM-4.0/etc/config.sh/paraview	2016-09-02 15:43:37.773220097 +0200
+@@ -41,21 +41,6 @@
+         ) \
+         && PATH="$cleaned"
+
+-# Determine the cmake to be used
+-unset CMAKE_HOME
+-for cmake in cmake-3.2.1 cmake-2.8.12.1 cmake-2.8.8 cmake-2.8.4 cmake-2.8.3 \
+-             cmake-2.8.1
+-do
+-    cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cmake
+-    if [ -r $cmake ]
+-    then
+-        export CMAKE_HOME=$cmake
+-        export CMAKE_ROOT=$cmake
+-        export PATH=$CMAKE_HOME/bin:$PATH
+-        break
+-    fi
+-done
+-
+
+ #- ParaView version, automatically determine major version
+ #export ParaView_VERSION=3.12.0
+@@ -64,7 +49,7 @@
+ #export ParaView_VERSION=4.3.1
+ #export ParaView_VERSION=4.4.0
+ #export ParaView_VERSION=5.0.0
+-export ParaView_VERSION=5.0.1
++export ParaView_VERSION=$EBVERSIONPARAVIEW
+ export ParaView_MAJOR=detect
+
+
+@@ -105,21 +90,15 @@
+ paraviewInstDir=$WM_THIRD_PARTY_DIR/ParaView-$ParaView_VERSION
+ paraviewArchName=ParaView-$ParaView_VERSION
+
+-export ParaView_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$paraviewArchName
++export ParaView_DIR=$EBROOTPARAVIEW
+
+ # Set paths if binaries or source are present
+ if [ -r $ParaView_DIR -o -r $paraviewInstDir ]
+ then
+     export ParaView_INCLUDE_DIR=$ParaView_DIR/include/paraview-$ParaView_MAJOR
+-    if [ ! -d $ParaView_INCLUDE_DIR -a -d $ParaView_DIR/include/paraview-3.0 ]
+-    then
+-        export ParaView_INCLUDE_DIR=$ParaView_DIR/include/paraview-3.0
+-    fi
+
+     ParaView_LIB_DIR=$ParaView_DIR/lib/paraview-$ParaView_MAJOR
+
+-    export PATH=$ParaView_DIR/bin:$PATH
+-    export LD_LIBRARY_PATH=$ParaView_LIB_DIR:$LD_LIBRARY_PATH
+     export PV_PLUGIN_PATH=$FOAM_LIBBIN/paraview-$ParaView_MAJOR
+
+     if [ "$FOAM_VERBOSE" -a "$PS1" ]
+@@ -131,17 +110,6 @@
+         echo "    PV_PLUGIN_PATH       : $PV_PLUGIN_PATH"
+     fi
+
+-    # Add in python libraries if required
+-    paraviewPython=$ParaView_DIR/Utilities/VTKPythonWrapping
+-    if [ -r $paraviewPython ]
+-    then
+-        if [ "$PYTHONPATH" ]
+-        then
+-            export PYTHONPATH=$PYTHONPATH:$paraviewPython:$ParaView_LIB_DIR
+-        else
+-            export PYTHONPATH=$paraviewPython:$ParaView_LIB_DIR
+-        fi
+-    fi
+ else
+     unset PV_PLUGIN_PATH
+ fi
+diff -ur OpenFOAM-4.0.orig/etc/config.sh/scotch OpenFOAM-4.0/etc/config.sh/scotch
+--- OpenFOAM-4.0.orig/etc/config.sh/scotch	2016-06-24 23:33:52.000000000 +0200
++++ OpenFOAM-4.0/etc/config.sh/scotch	2016-09-02 15:43:37.773220097 +0200
+@@ -37,7 +37,7 @@
+ #
+ #------------------------------------------------------------------------------
+
+-export SCOTCH_VERSION=scotch_6.0.3
+-export SCOTCH_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/$SCOTCH_VERSION
++export SCOTCH_VERSION=scotch_$EBVERSIONSCOTCH
++export SCOTCH_ARCH_PATH=$EBROOTSCOTCH
+
+ #------------------------------------------------------------------------------
+diff -ur OpenFOAM-4.0.orig/etc/config.sh/settings OpenFOAM-4.0/etc/config.sh/settings
+--- OpenFOAM-4.0.orig/etc/config.sh/settings	2016-06-24 23:33:52.000000000 +0200
++++ OpenFOAM-4.0/etc/config.sh/settings	2016-09-02 15:43:37.773220097 +0200
+@@ -56,11 +56,11 @@
+         64)
+             WM_ARCH=linux64
+             export WM_COMPILER_LIB_ARCH=64
+-            export WM_CC='gcc'
+-            export WM_CXX='g++'
+-            export WM_CFLAGS='-m64 -fPIC'
+-            export WM_CXXFLAGS='-m64 -fPIC -std=c++0x'
+-            export WM_LDFLAGS='-m64'
++            export WM_CC=$CC
++            export WM_CXX=$CXX
++            export WM_CFLAGS=$CFLAGS
++            export WM_CXXFLAGS=$CXXFLAGS
++            export WM_LDFLAGS=$LDFLAGS
+             ;;
+         *)
+             echo "Unknown WM_ARCH_OPTION '$WM_ARCH_OPTION', should be 32 or 64"\
+diff -ur OpenFOAM-4.0.orig/src/parallel/decompose/ptscotchDecomp/Make/options OpenFOAM-4.0/src/parallel/decompose/ptscotchDecomp/Make/options
+--- OpenFOAM-4.0.orig/src/parallel/decompose/ptscotchDecomp/Make/options	2016-06-24 23:33:52.000000000 +0200
++++ OpenFOAM-4.0/src/parallel/decompose/ptscotchDecomp/Make/options	2016-09-02 15:44:36.305512075 +0200
+@@ -3,10 +3,8 @@
+
+ EXE_INC = \
+     $(PFLAGS) $(PINC) \
+-    -I$(SCOTCH_ROOT)/include \
+     -I$(SCOTCH_ARCH_PATH)/include/$(FOAM_MPI) \
+-    -I/usr/include/scotch \
+     -I../decompositionMethods/lnInclude
+
+ LIB_LIBS = \
+-    -L$(SCOTCH_ROOT)/lib -L$(FOAM_EXT_LIBBIN)/$(FOAM_MPI) -lptscotch -lptscotcherrexit -lscotch ${LINK_FLAGS} -lrt
++    -L$(SCOTCH_ARCH_PATH)/lib -L$(FOAM_EXT_LIBBIN)/$(FOAM_MPI) -lptscotch -lptscotcherrexit -lscotch ${LINK_FLAGS} -lrt
+diff -ur OpenFOAM-4.0.orig/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C OpenFOAM-4.0/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C
+--- OpenFOAM-4.0.orig/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C	2016-06-24 23:33:52.000000000 +0200
++++ OpenFOAM-4.0/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C	2016-09-02 15:45:13.376950242 +0200
+@@ -30,10 +30,11 @@
+ #include "globalIndex.H"
+ #include "SubField.H"
+
++#include <mpi.h>
++
+ extern "C"
+ {
+     #include <stdio.h>
+-    #include <mpi.h>
+     #include "ptscotch.h"
+ }
+
+diff -ur OpenFOAM-4.0.orig/src/parallel/decompose/scotchDecomp/Make/options OpenFOAM-4.0/src/parallel/decompose/scotchDecomp/Make/options
+--- OpenFOAM-4.0.orig/src/parallel/decompose/scotchDecomp/Make/options	2016-06-24 23:33:52.000000000 +0200
++++ OpenFOAM-4.0/src/parallel/decompose/scotchDecomp/Make/options	2016-09-02 15:44:36.305512075 +0200
+@@ -7,10 +7,8 @@
+
+ EXE_INC = \
+     $(PFLAGS) $(PINC) \
+-    -I$(SCOTCH_ROOT)/include \
+     -I$(SCOTCH_ARCH_PATH)/include \
+-    -I/usr/include/scotch \
+     -I../decompositionMethods/lnInclude
+
+ LIB_LIBS = \
+-    -L$(SCOTCH_ROOT)/lib -L$(FOAM_EXT_LIBBIN) -lscotch -lscotcherrexit -lrt
++    -L$(SCOTCH_ARCH_PATH)/lib -L$(FOAM_EXT_LIBBIN) -lscotch -lscotcherrexit -lrt
diff --git a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-4.0-intel-2016b.eb b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-4.0-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..635072f873d12eb770a87c4a0079ec92b0839bc7
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-4.0-intel-2016b.eb
@@ -0,0 +1,36 @@
+name = 'OpenFOAM'
+version = '4.0'
+
+homepage = 'http://www.openfoam.com/'
+description = """OpenFOAM is a free, open source CFD software package.
+ OpenFOAM has an extensive range of features to solve anything from complex fluid flows
+ involving chemical reactions, turbulence and heat transfer,
+ to solid dynamics and electromagnetics."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+toolchainopts = {'cstd': 'c++11'}
+
+source_urls = ['https://github.com/OpenFOAM/OpenFOAM-%(version_major)s.x/archive']
+sources = ['version-%(version)s.tar.gz']
+
+checksums = ['294b520811aae87241f3a78423f05952']
+
+patches = ['OpenFOAM-%(version)s-cleanup.patch']
+
+dependencies = [
+    ('libreadline', '6.3'),
+    ('ncurses', '6.0'),
+    # OpenFOAM requires 64 bit METIS using 32 bit indexes (array indexes)
+    ('METIS', '5.1.0'),
+    ('SCOTCH', '6.0.4'),
+    ('CGAL', '4.8.1'),
+    ('ParaView', '5.1.2', '-mpi'),
+]
+
+builddependencies = [
+    ('Bison', '3.0.4'),
+    ('CMake', '3.6.1'),
+    ('flex', '2.6.0'),
+]
+
+moduleclass = 'cae'
diff --git a/easybuild/easyconfigs/o/OpenImageIO/OpenImageIO-1.6.17-intel-2016b.eb b/easybuild/easyconfigs/o/OpenImageIO/OpenImageIO-1.6.17-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7e6e2a6a220355428cbb3b9baa8ef669a5ad2138
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenImageIO/OpenImageIO-1.6.17-intel-2016b.eb
@@ -0,0 +1,32 @@
+easyblock = 'CMakeMake'
+
+name = 'OpenImageIO'
+version = '1.6.17'
+
+homepage = 'http://openimageio.org/'
+description = """OpenImageIO is a library for reading and writing images, and a bunch of related classes, utilities,
+ and applications."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['https://github.com/OpenImageIO/oiio/archive/']
+sources = ['Release-%(version)s.tar.gz']
+
+dependencies = [
+    ('Boost', '1.61.0'),
+    ('libjpeg-turbo', '1.5.0'),
+    ('LibTIFF', '4.0.6'),
+    ('OpenEXR', '2.2.0'),
+]
+builddependencies = [('CMake', '3.6.1')]
+
+separate_build_dir = True
+
+configopts = '-DSTOP_ON_WARNING=OFF'
+
+sanity_check_paths = {
+    'files': ['bin/oiiotool', 'lib/libOpenImageIO.so', 'lib/libOpenImageIO_Util.so'],
+    'dirs': ['include/OpenImageIO', 'share'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.10.2-GCC-6.1.0-2.27.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.10.2-GCC-6.1.0-2.27.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ac26d4212f687dcd9984ba00f094ec6ab2d35089
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.10.2-GCC-6.1.0-2.27.eb
@@ -0,0 +1,33 @@
+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': '6.1.0-2.27'}
+
+sources = [SOURCELOWER_TAR_GZ]
+
+source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads',]
+
+dependencies = [('hwloc', '1.11.3')]
+
+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.3-GCC-6.1.0-2.27.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.10.3-GCC-6.1.0-2.27.eb
new file mode 100644
index 0000000000000000000000000000000000000000..af22c5f5162eb54544e4b5716251d42f8dc95693
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.10.3-GCC-6.1.0-2.27.eb
@@ -0,0 +1,33 @@
+easyblock = 'ConfigureMake'
+
+name = 'OpenMPI'
+version = '1.10.3'
+
+homepage = 'http://www.open-mpi.org/'
+description = """The Open MPI Project is an open source MPI-2 implementation."""
+
+toolchain = {'name': 'GCC', 'version': '6.1.0-2.27'}
+
+sources = [SOURCELOWER_TAR_GZ]
+
+source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads',]
+
+dependencies = [('hwloc', '1.11.3')]
+
+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.3-iccifort-2016.3.210-GCC-5.4.0-2.26.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.10.3-iccifort-2016.3.210-GCC-5.4.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ed7694b56fd30e8ab92077451e47f3bee7607d4f
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.10.3-iccifort-2016.3.210-GCC-5.4.0-2.26.eb
@@ -0,0 +1,39 @@
+easyblock = 'ConfigureMake'
+
+name = 'OpenMPI'
+version = '1.10.3'
+
+homepage = 'http://www.open-mpi.org/'
+description = """The Open MPI Project is an open source MPI-2 implementation."""
+
+toolchain = {'name': 'iccifort', 'version': '2016.3.210-GCC-5.4.0-2.26'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
+
+
+configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --with-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
+
+dependencies = [('hwloc', '1.11.3')]
+
+# 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"],
+}
+
+sanity_check_commands = [
+    ('mpicc --version | grep icc', ''),
+    ('mpicxx --version | grep icpc', ''),
+    ('mpifort --version | grep ifort', ''),
+]
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.10.4-PGI-16.7-GCC-5.4.0-2.26.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.10.4-PGI-16.7-GCC-5.4.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fd6bb36c388a4243691b6754ce1cc9e76edf6050
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.10.4-PGI-16.7-GCC-5.4.0-2.26.eb
@@ -0,0 +1,41 @@
+easyblock = 'ConfigureMake'
+
+name = 'OpenMPI'
+version = '1.10.4'
+
+homepage = 'http://www.open-mpi.org/'
+description = """The Open MPI Project is an open source MPI-2 implementation."""
+
+toolchain = {'name': 'PGI', 'version': '16.7-GCC-5.4.0-2.26'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
+
+checksums = ['fb2fdb6a5b65c80d7dfa4bc9a0caf665']
+
+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
+configopts += '--with-cxxrtlib="-lgcc_s -lstdc++"' # for vt-mpi-unify
+
+dependencies = [('hwloc', '1.11.4')]
+
+# 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"],
+}
+
+sanity_check_commands = [
+    ('mpicc --version | grep pgcc', ''),
+    ('mpicxx --version | grep pgc++', ''),
+    ('mpifort --version | grep pgfortran', ''),
+]
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.10.4-iccifort-2016.3.210-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.10.4-iccifort-2016.3.210-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c16d7bf245b8a9c1c4e241cab52d2842a1fb89a3
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.10.4-iccifort-2016.3.210-GCC-4.9.3-2.25.eb
@@ -0,0 +1,39 @@
+easyblock = 'ConfigureMake'
+
+name = 'OpenMPI'
+version = '1.10.4'
+
+homepage = 'http://www.open-mpi.org/'
+description = """The Open MPI Project is an open source MPI-2 implementation."""
+
+toolchain = {'name': 'iccifort', 'version': '2016.3.210-GCC-4.9.3-2.25'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
+
+
+configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --with-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
+
+dependencies = [('hwloc', '1.11.3')]
+
+# 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"],
+}
+
+sanity_check_commands = [
+    ('mpicc --version | grep icc', ''),
+    ('mpicxx --version | grep icpc', ''),
+    ('mpifort --version | grep ifort', ''),
+]
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-2.0.0-GCC-5.2.0.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-2.0.0-GCC-5.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..23deffc8f49aedb19732a82aea0c0d51bdda155e
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-2.0.0-GCC-5.2.0.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMake'
+
+name = 'OpenMPI'
+version = '2.0.0'
+
+homepage = 'http://www.open-mpi.org/'
+description = """The Open MPI Project is an open source MPI-2 implementation."""
+
+toolchain = {'name': 'GCC', 'version': '5.2.0'}
+
+sources = [SOURCELOWER_TAR_GZ]
+
+source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads',]
+
+dependencies = [('hwloc', '1.11.3')]
+
+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'),]
+
+# VampirTrace is no longer used : https://www.open-mpi.org/community/lists/announce/2016/07/0085.php
+libs = ["mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte"]
+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"],
+}
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-2.0.1-GCC-6.2.0-2.27.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-2.0.1-GCC-6.2.0-2.27.eb
new file mode 100644
index 0000000000000000000000000000000000000000..aeb2a52e4c0da3c43e51233471f368bd31e00e08
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-2.0.1-GCC-6.2.0-2.27.eb
@@ -0,0 +1,33 @@
+easyblock = 'ConfigureMake'
+
+name = 'OpenMPI'
+version = '2.0.1'
+
+homepage = 'http://www.open-mpi.org/'
+description = """The Open MPI Project is an open source MPI-2 implementation."""
+
+toolchain = {'name': 'GCC', 'version': '6.2.0-2.27'}
+
+sources = [SOURCELOWER_TAR_GZ]
+
+source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads',]
+
+dependencies = [('hwloc', '1.11.4')]
+
+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_mpifh", "mpi", "ompitrace", "open-pal", "open-rte"]
+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': [],
+}
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-2.0.1-gcccuda-2016.10.0.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-2.0.1-gcccuda-2016.10.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c4792dca197ea1165bc9c5312a7b60aa00d0f3f9
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-2.0.1-gcccuda-2016.10.0.eb
@@ -0,0 +1,33 @@
+easyblock = 'ConfigureMake'
+
+name = 'OpenMPI'
+version = '2.0.1'
+
+homepage = 'http://www.open-mpi.org/'
+description = """The Open MPI Project is an open source MPI-2 implementation."""
+
+toolchain = {'name': 'gcccuda', 'version': '2016.10.0'}
+
+sources = [SOURCELOWER_TAR_GZ]
+
+source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads',]
+
+dependencies = [('hwloc', '1.11.4')]
+
+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 += '--with-cuda=$CUDA_HOME '             # CUDA-aware build; N.B. --disable-dlopen is incompatible
+
+# needed for --with-verbs
+osdependencies = [('libibverbs-dev', 'libibverbs-devel'),]
+
+libs = ["mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte"]
+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': [],
+}
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.2h-foss-2016.04.eb b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.2h-foss-2016.04.eb
new file mode 100644
index 0000000000000000000000000000000000000000..71a267bdcecee369316f2ef1499276881bfa1143
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.2h-foss-2016.04.eb
@@ -0,0 +1,19 @@
+name = 'OpenSSL'
+version = '1.0.2h'
+
+homepage = 'http://www.openssl.org/'
+description = """The OpenSSL Project is a collaborative effort to develop a robust, commercial-grade, full-featured,
+ and Open Source toolchain implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) 
+ protocols as well as a full-strength general purpose cryptography library. """
+
+toolchain = {'name': 'foss', 'version': '2016.04'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.openssl.org/source/']
+
+dependencies = [('zlib', '1.2.8')]
+
+runtest = 'test'
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/p/PCRE2/PCRE2-10.21-foss-2016a.eb b/easybuild/easyconfigs/p/PCRE2/PCRE2-10.21-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..03cdf3c1c3579232f1288d0911f495a7b3ee51e0
--- /dev/null
+++ b/easybuild/easyconfigs/p/PCRE2/PCRE2-10.21-foss-2016a.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'PCRE2'
+version = '10.21'
+
+homepage = 'http://www.pcre.org/'
+description = """
+ The PCRE library is a set of functions that implement regular expression pattern matching using the same syntax
+ and semantics as Perl 5.
+"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['http://download.sourceforge.net/pcre']
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = "--with-pic --disable-cpp --enable-jit"
+
+sanity_check_paths = {
+    'files': ["bin/pcre2-config", "bin/pcre2grep", "bin/pcre2test", "lib/libpcre2-8.a"],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
\ No newline at end of file
diff --git a/easybuild/easyconfigs/p/PDT/PDT-3.19-goolf-1.5.14.eb b/easybuild/easyconfigs/p/PDT/PDT-3.19-goolf-1.5.14.eb
new file mode 100644
index 0000000000000000000000000000000000000000..48f05702911454a17be17a6a5f67f79ca2445604
--- /dev/null
+++ b/easybuild/easyconfigs/p/PDT/PDT-3.19-goolf-1.5.14.eb
@@ -0,0 +1,32 @@
+##
+# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2013-2015 Juelich Supercomputing Centre, Germany
+# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
+#             Markus Geimer <m.geimer@fz-juelich.de>
+# License::   3-clause BSD
+#
+# This work is based on experiences from the UNITE project
+# http://apps.fz-juelich.de/unite/
+##
+
+name = 'PDT'
+version = '3.19'
+
+homepage = 'http://www.cs.uoregon.edu/research/pdt/'
+description = """Program Database Toolkit (PDT) is a framework for analyzing source
+ code written in several programming languages and for making rich program knowledge
+ accessible to developers of static and dynamic analysis tools. PDT implements a standard
+ program representation, the program database (PDB), that can be accessed in a uniform way
+ through a class library supporting common PDB operations."""
+
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
+
+sources = ['pdtoolkit-%(version)s.tar.gz']
+source_urls = ['http://tau.uoregon.edu/pdt_releases/']
+
+checksums = [
+    '5c5e1e6607086aa13bf4b1b9befc5864',     # pdtoolkit-3.19.tar.gz
+]
+
+moduleclass = 'perf'
diff --git a/easybuild/easyconfigs/p/PETSc/PETSc-3.7.3-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/p/PETSc/PETSc-3.7.3-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7988df358235da5762ba758a6bdbe619cd11ac28
--- /dev/null
+++ b/easybuild/easyconfigs/p/PETSc/PETSc-3.7.3-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,34 @@
+name = 'PETSc'
+version = '3.7.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': 'foss', 'version': '2016a'}
+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.61.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.5.3', '-%s-%s' % (parmetis, parmetis_ver)),
+    ('Hypre', '2.11.1'),
+]
+
+builddependencies = [('CMake', '3.5.2')]
+
+configopts = '--LIBS="$LIBS -lrt"'
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/p/PGDSpider/PGDSpider-2.1.0.3-Java-1.7.0_80.eb b/easybuild/easyconfigs/p/PGDSpider/PGDSpider-2.1.0.3-Java-1.7.0_80.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4071bc769afd3a3c1f5bd22b32a1a365602e3414
--- /dev/null
+++ b/easybuild/easyconfigs/p/PGDSpider/PGDSpider-2.1.0.3-Java-1.7.0_80.eb
@@ -0,0 +1,34 @@
+# 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='Tarball'
+
+name = "PGDSpider"
+version = "2.1.0.3"
+versionsuffix = "-Java-%(javaver)s"
+
+homepage = 'http://cmpg.unibe.ch/software/PGDSpider/'
+description = """An automated data conversion tool for connecting population genetics and genomics programs"""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = ['http://cmpg.unibe.ch/software/PGDSpider/']
+sources = ['%(name)s_%(version)s.zip']
+
+dependencies = [
+    ('Java', '1.7.0_80', '', True),
+]
+
+sanity_check_paths = {
+    'files': ['PGDSpider2-cli.jar', 'PGDSpider2.jar'],
+    'dirs': [],
+}
+
+modloadmsg = """
+To execute GUI run: java -Xmx1024m -Xms512m -jar \\$EBROOTPGDSPIDER/PGDSpider2.jar
+To execute CLI run: java -Xmx1024m -Xms512m -jar \\$EBROOTPGDSPIDER/PGDSpider2-cli.jar
+Adjust memory according to your requirements"""
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/p/PGI/PGI-16.7-GCC-5.4.0-2.26.eb b/easybuild/easyconfigs/p/PGI/PGI-16.7-GCC-5.4.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4517a84694d8b46bd325234c410b43ebc9922982
--- /dev/null
+++ b/easybuild/easyconfigs/p/PGI/PGI-16.7-GCC-5.4.0-2.26.eb
@@ -0,0 +1,25 @@
+name = 'PGI'
+version = '16.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']
+checksums = ['5594e5cab050bba07ed5f7741bc4c5e8']
+
+gccver = '5.4.0'
+binutilsver = '2.26'
+versionsuffix = '-GCC-%s-%s' % (gccver, binutilsver)
+
+dependencies = [
+    ('GCCcore', gccver),
+    ('binutils', binutilsver, '', ('GCCcore', gccver)),
+    ('numactl', '2.0.11', '', ('GCCcore', gccver)),
+]
+
+# license file
+license_file = HOME + '/licenses/pgi/license.dat'
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/p/PIL/PIL-1.1.7-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/p/PIL/PIL-1.1.7-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1e4d5e410367b1e6adab6215e386f92b2c9031e6
--- /dev/null
+++ b/easybuild/easyconfigs/p/PIL/PIL-1.1.7-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,32 @@
+easyblock = 'PythonPackage'
+
+name = 'PIL'
+version = '1.1.7'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://www.pythonware.com/products/pil'
+description = """The Python Imaging Library (PIL) adds image processing capabilities to your Python interpreter.
+ This library supports many file formats, and provides powerful image processing and graphics capabilities."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['http://effbot.org/downloads/']
+sources = ['Imaging-%(version)s.tar.gz']
+
+patches = ['PIL-%(version)s-find-deps.patch']
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('Python', '2.7.12'),
+    ('libjpeg-turbo', '1.5.0'),
+    ('freetype', '2.6.5'),
+]
+
+options = {'modulename': 'PIL'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['bin', 'lib/python%(pyshortver)s/site-packages/%(name)s'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/p/PLAST/PLAST-2.3.1-foss-2016a-Java-1.8.0_92.eb b/easybuild/easyconfigs/p/PLAST/PLAST-2.3.1-foss-2016a-Java-1.8.0_92.eb
new file mode 100644
index 0000000000000000000000000000000000000000..bb22d3db40840b53c75eb924b164fcc68691e9b6
--- /dev/null
+++ b/easybuild/easyconfigs/p/PLAST/PLAST-2.3.1-foss-2016a-Java-1.8.0_92.eb
@@ -0,0 +1,29 @@
+easyblock = 'CMakeMake'
+
+name = 'PLAST'
+version = '2.3.1'
+versionsuffix = '-Java-%(javaver)s'
+
+homepage = "http://www.irisa.fr/symbiose/projects/plast/" 
+description = """PLAST is a parallel alignment search tool for comparing large protein banks"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['https://github.com/PLAST-software/plast-library/releases/download/v%(version)s/']
+sources=['%(namelower)s_source_v%(version)s.tar.gz']
+
+builddependencies = [
+    ('CMake', '3.5.2'),
+    ('Perl', '5.22.1')
+]
+
+dependencies = [
+    ('Java', '1.8.0_92', '',  True),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['include', 'include/algo', 'include/alignment', 'include/misc'],
+}
+
+moduleclass = 'bio'
\ No newline at end of file
diff --git a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.2.3-intel-2016b.eb b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.2.3-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f53ad8b7b8e72602083a5570951fb14be34cee45
--- /dev/null
+++ b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.2.3-intel-2016b.eb
@@ -0,0 +1,42 @@
+# by Ward Poelmans <wpoely86@gmail.com>
+
+easyblock = 'ConfigureMake'
+
+name = 'PLUMED'
+version = '2.2.3'
+
+homepage = 'http://www.plumed-code.org'
+description = """PLUMED is an open source library for free energy calculations in molecular systems which
+ works together with some of the most popular molecular dynamics engines. Free energy calculations can be
+ performed as a function of many order parameters with a particular  focus on biological problems, using
+ state of the art methods such as metadynamics, umbrella sampling and Jarzynski-equation based steered MD.
+ The software, written in C++, can be easily interfaced with both fortran and C/C++ codes.
+"""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+toolchainopts = {'usempi': 'True'}
+
+source_urls = ['https://github.com/plumed/plumed2/archive/']
+sources = ['v%(version)s.tar.gz']
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('GSL', '2.1'),
+    ('libmatheval', '1.1.11'),
+]
+
+preconfigopts = 'env FC=$MPIF90 LIBS="$LIBLAPACK $LIBS" '
+configopts = ' --exec-prefix=%(installdir)s --enable-gsl'
+prebuildopts = 'source sourceme.sh && '
+
+sanity_check_paths = {
+    'files': ['bin/plumed', 'lib/libplumedKernel.%s' % SHLIB_EXT, 'lib/libplumed.%s' % SHLIB_EXT],
+    'dirs': ['lib/plumed']
+}
+
+modextrapaths = {
+    'PLUMED_KERNEL': 'lib/libplumedKernel.%s' % SHLIB_EXT,
+    'PLUMED_ROOT': 'lib/plumed',
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/p/PLplot/PLplot-5.11.1-intel-2016b-Java-1.7.0_80-Python-2.7.12.eb b/easybuild/easyconfigs/p/PLplot/PLplot-5.11.1-intel-2016b-Java-1.7.0_80-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fb25f08bf9e202d2434db9b1f910d3f79b1c90b3
--- /dev/null
+++ b/easybuild/easyconfigs/p/PLplot/PLplot-5.11.1-intel-2016b-Java-1.7.0_80-Python-2.7.12.eb
@@ -0,0 +1,47 @@
+easyblock = 'CMakeMake'
+
+name = 'PLplot'
+version = '5.11.1'
+versionsuffix = '-Java-%(javaver)s-Python-%(pyver)s'
+
+homepage = 'http://plplot.sourceforge.net'
+description = """PLplot is a cross-platform software package for creating scientific plots whose (UTF-8) plot symbols
+ and text are limited in practice only by what Unicode-aware system fonts are installed on a user's computer."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+toolchainopts = {'pic': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+builddependencies = [
+    ('CMake', '3.6.1'),
+    ('SWIG', '3.0.10', '-Python-%(pyver)s-PCRE-8.39'),
+    ('libtool', '2.4.6'),
+]
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('Java', '1.7.0_80', '', True),
+    ('Python', '2.7.12'),
+    ('Perl', '5.24.0'),
+    ('cairo', '1.14.6'),
+    ('expat', '2.2.0'),
+    ('GLib', '2.49.5'),
+    ('X11', '20160819'),
+    ('Pango', '1.40.3'),
+    ('pixman', '0.34.0'),
+    ('Tcl', '8.6.5'),
+    ('Tk', '8.6.5'),
+]
+
+separate_build_dir = True
+
+modextrapaths = {'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages'}
+
+sanity_check_paths = {
+    'files': ['lib/libplplot.so', 'lib/pkgconfig/plplot-f95.pc'],
+    'dirs': ['bin', 'include/plplot', 'lib/fortran/modules/plplot', 'lib/pkgconfig', 'share/man/man1'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/p/POV-Ray/POV-Ray-3.7.0.0-intel-2016b.eb b/easybuild/easyconfigs/p/POV-Ray/POV-Ray-3.7.0.0-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b01bff9fa68804c7ba08401c73ebec59b6077d43
--- /dev/null
+++ b/easybuild/easyconfigs/p/POV-Ray/POV-Ray-3.7.0.0-intel-2016b.eb
@@ -0,0 +1,56 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu, 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 = 'POV-Ray'
+version = '3.7.0.0'
+
+homepage = 'http://www.povray.org/'
+description = """The Persistence of Vision Raytracer, or POV-Ray, is a ray tracing program
+ which generates images from a text-based scene description, and is available for a variety
+ of computer platforms. POV-Ray is a high-quality, Free Software tool for creating stunning
+ three-dimensional graphics. The source code is available for those wanting to do their own ports."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+toolchainopts = {'pic': True}
+
+sources = ['v%(version)s.tar.gz']
+source_urls = ['https://github.com/POV-Ray/povray/archive/']
+patches = ['POV-Ray-%(version)s_fix-boost-linking.patch']
+
+dependencies = [
+    ('Boost', '1.61.0'),
+    ('zlib', '1.2.8'),
+    ('libpng', '1.6.24'),
+    ('libjpeg-turbo', '1.5.0'),
+    ('X11', '20160819'),
+    ('LibTIFF', '4.0.6'),
+    ('SDL2', '2.0.4'),
+]
+builddependencies = [('Autotools', '20150215')]
+
+preconfigopts = "cd unix && sed -i 's/^automake/automake --add-missing; automake/g' prebuild.sh && "
+preconfigopts += " ./prebuild.sh && cd .. && "
+configopts = "COMPILED_BY='EasyBuild' "
+configopts += "--with-boost=$EBROOTBOOST --with-zlib=$EBROOTZLIB --with-libpng=$EBROOTLIBPNG "
+configopts += "--with-libtiff=$EBROOTLIBTIFF --with-libjpeg=$EBROOTLIBJPEGMINTURBO --with-libsdl=$EBROOTSDL2 "
+# configopts += " --with-libmkl=DIR " ## upstream needs to fix this, still in BETA
+
+runtest = 'check'
+
+sanity_check_paths = {
+    'files': ['bin/povray'],
+    'dirs': ['etc/povray/%(version_major_minor)s', 'share']
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/p/POV-Ray/POV-Ray-3.7.0.0_fix-boost-linking.patch b/easybuild/easyconfigs/p/POV-Ray/POV-Ray-3.7.0.0_fix-boost-linking.patch
new file mode 100644
index 0000000000000000000000000000000000000000..aac9faf99046adffa7ff78c5403d585b53fc09a4
--- /dev/null
+++ b/easybuild/easyconfigs/p/POV-Ray/POV-Ray-3.7.0.0_fix-boost-linking.patch
@@ -0,0 +1,30 @@
+also include -lboost_system when linking with -lboost_thread
+cfr. https://build.opensuse.org/package/view_file/openSUSE:Leap:42.1:NonFree/povray/povray-3.6.9.7-boost-link.patch?expand=1
+--- povray-3.7.0.0/unix/config/ax_boost_thread.m4.orig	2013-11-06 21:28:15.000000000 +0100
++++ povray-3.7.0.0/unix/config/ax_boost_thread.m4	2016-09-07 18:26:36.447847499 +0200
+@@ -104,14 +104,14 @@
+                 for libextension in `ls $BOOSTLIBDIR/libboost_thread*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_thread.*\)\.so.*$;\1;'` `ls $BOOSTLIBDIR/libboost_thread*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_thread.*\)\.a*$;\1;'`; do
+                      ax_lib=${libextension}
+ 				    AC_CHECK_LIB($ax_lib, exit,
+-                                 [BOOST_THREAD_LIB="-l$ax_lib"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break],
++                                 [BOOST_THREAD_LIB="-l$ax_lib -lboost_system"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break],
+                                  [link_thread="no"])
+   				done
+                 if test "x$link_thread" != "xyes"; then
+                 for libextension in `ls $BOOSTLIBDIR/boost_thread*.dll* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_thread.*\)\.dll.*$;\1;'` `ls $BOOSTLIBDIR/boost_thread*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_thread.*\)\.a*$;\1;'` ; do
+                      ax_lib=${libextension}
+ 				    AC_CHECK_LIB($ax_lib, exit,
+-                                 [BOOST_THREAD_LIB="-l$ax_lib"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break],
++                                 [BOOST_THREAD_LIB="-l$ax_lib -lboost_system"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break],
+                                  [link_thread="no"])
+   				done
+                 fi
+@@ -119,7 +119,7 @@
+             else
+                for ax_lib in $ax_boost_user_thread_lib boost_thread-$ax_boost_user_thread_lib; do
+ 				      AC_CHECK_LIB($ax_lib, exit,
+-                                   [BOOST_THREAD_LIB="-l$ax_lib"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break],
++                                   [BOOST_THREAD_LIB="-l$ax_lib -lboost_system"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break],
+                                    [link_thread="no"])
+                   done
+ 
diff --git a/easybuild/easyconfigs/p/PSI4/PSI4-1.0-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/p/PSI4/PSI4-1.0-intel-2016a-Python-2.7.11.eb
index 9d52b0ef8862d6c0d902a9233ff2a19617ba84a3..ed0569f10136967d3595406717d9a1186a9b2438 100644
--- a/easybuild/easyconfigs/p/PSI4/PSI4-1.0-intel-2016a-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/p/PSI4/PSI4-1.0-intel-2016a-Python-2.7.11.eb
@@ -33,8 +33,6 @@ builddependencies = [
 ]
 
 configopts = '-DENABLE_MPI=ON -DENABLE_OMP=ON -DENABLE_UNIT_TESTS=ON -DENABLE_CHEMPS2=ON -DENABLE_PLUGINS=ON'
-configopts += ' -DENABLE_DUMMY_PLUGIN=ON -DCHEMPS2_ROOT=$EBROOTCHEMPS2'
-configopts += ' -DENABLE_PCMSOLVER=ON -DPCMSOLVER_ROOT=$EBROOTPCMSOLVER'
 
 # CMake will pick mpiexec by default and this fails with intel MPI
 #configopts += ' -DMPIEXEC=$EBROOTIMPI/bin64/mpirun'
diff --git a/easybuild/easyconfigs/p/PSI4/PSI4-1.0-intel-2016a-mt-Python-2.7.11.eb b/easybuild/easyconfigs/p/PSI4/PSI4-1.0-intel-2016a-mt-Python-2.7.11.eb
index 90a88521229e8e33edb85a1604f42913a83a0a05..1fcbf7998b7d8041ce3203c7d9ff413bc3f5f2c5 100644
--- a/easybuild/easyconfigs/p/PSI4/PSI4-1.0-intel-2016a-mt-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/p/PSI4/PSI4-1.0-intel-2016a-mt-Python-2.7.11.eb
@@ -34,8 +34,6 @@ builddependencies = [
 ]
 
 configopts = '-DENABLE_MPI=OFF -DENABLE_OMP=ON -DENABLE_UNIT_TESTS=ON -DENABLE_PLUGINS=ON -DENABLE_DUMMY_PLUGIN=ON'
-configopts += ' -DENABLE_CHEMPS2=ON -DCHEMPS2_ROOT=$EBROOTCHEMPS2'
-configopts += ' -DENABLE_PCMSOLVER=ON -DPCMSOLVER_ROOT=$EBROOTPCMSOLVER'
 
 # Execute 4 tests in parallel and disable the pubchem tests (they download things and don't work reliable)
 # Limit the number of concurrent tests to avoid failures
diff --git a/easybuild/easyconfigs/p/PSORTb/PSORTb-3.0.4-foss-2016a-Perl-5.22.1.eb b/easybuild/easyconfigs/p/PSORTb/PSORTb-3.0.4-foss-2016a-Perl-5.22.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..79449c632cffd80d62b4f232d4d822076a8a61bf
--- /dev/null
+++ b/easybuild/easyconfigs/p/PSORTb/PSORTb-3.0.4-foss-2016a-Perl-5.22.1.eb
@@ -0,0 +1,44 @@
+easyblock = 'PerlModule'
+
+name = 'PSORTb'
+version = '3.0.4'
+versionsuffix = '-Perl-%(perlver)s'
+
+homepage = 'http://psort.org/psortb/index.html'
+description = """PSORTb v3.0.4 is the most precise bacterial localization prediction tool available."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://www.psort.org/download/']
+sources = ['bio-tools-psort-all.%(version)s.tar.gz']
+
+patches = [
+    'PSORTb-%(version)s-libpsortb.patch',
+]
+
+dependencies = [
+    ('Perl', '5.22.1'),
+    ('libpsortb','1.0'),
+    ('BioPerl','1.6.924','-Perl-5.22.1'),
+    ('BLAST','2.2.26', '-Linux_x86_64', True),
+    ('pftoolsV3','20160324'),
+]
+
+options = {'modulename': 'Bio::Tools::PSort'}
+
+preconfigopts = "export PSORTROOT=%(installdir)s && "
+
+prebuildopts = 'sed -i "s/CC = cc/CC ?= gcc/" bio-tools-psort-modhmm/Makefile && '
+
+postinstallcmds = [
+   "cp -r psort/* %(installdir)s/.",
+]
+
+sanity_check_paths = {
+    'files': ['lib/perl5/site_perl/%(perlver)s/x86_64-linux-thread-multi/Algorithm/HMM.pm',
+              'lib/perl5/site_perl/%(perlver)s/x86_64-linux-thread-multi/Bio/Tools/PSort.pm'],
+    'dirs': ['lib/perl5/site_perl/%(perlver)s/x86_64-linux-thread-multi/Algorithm/HMM',
+             'lib/perl5/site_perl/%(perlver)s/x86_64-linux-thread-multi/Bio/Tools/PSort'],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/p/PSORTb/PSORTb-3.0.4-libpsortb.patch b/easybuild/easyconfigs/p/PSORTb/PSORTb-3.0.4-libpsortb.patch
new file mode 100644
index 0000000000000000000000000000000000000000..bbc5e91be1d4e684072f1f10cd34c543db0fb3c5
--- /dev/null
+++ b/easybuild/easyconfigs/p/PSORTb/PSORTb-3.0.4-libpsortb.patch
@@ -0,0 +1,130 @@
+Removed q and a and perl scripting environment set accordingly.
+Author: Fokke Dijkstra (University of Groningen)
+diff -ru bio-tools-psort-all/lib/Bio/Tools/PSort/Install.pm bio-tools-psort-all.new/lib/Bio/Tools/PSort/Install.pm
+--- bio-tools-psort-all/lib/Bio/Tools/PSort/Install.pm	2010-07-29 00:12:43.000000000 +0200
++++ bio-tools-psort-all.new/lib/Bio/Tools/PSort/Install.pm	2015-11-26 13:50:18.000000000 +0100
+@@ -77,7 +77,12 @@
+ 		}
+ 	    }
+ 	} else {
+-	    $input = ExtUtils::MakeMaker::prompt("\n$lib was not found in the dynamic linker path, is there somewhere else we should check? ", "/usr/local/lib$sixtyfour");
++            if (exists($ENV{EBROOTLIBPSORTB})) {
++               $input = "$ENV{EBROOTLIBPSORTB}/lib$sixtyfour";
++            } else {
++               $input = "/usr/local/lib$sixtyfour";
++            }
++	    $input = ExtUtils::MakeMaker::prompt("\n$lib was not found in the dynamic linker path, is there somewhere else we should check? ", $input);
+ 	    if($path = Bio::Tools::PSort::Install->findLib("-L$input -l$lib")) {
+ 		$passed = 1;
+ 		$libpath = $input;
+diff -ru bio-tools-psort-all/Makefile.PL bio-tools-psort-all.new/Makefile.PL
+--- bio-tools-psort-all/Makefile.PL	2010-07-28 23:40:19.000000000 +0200
++++ bio-tools-psort-all.new/Makefile.PL	2015-11-30 12:03:14.000000000 +0100
+@@ -97,7 +97,12 @@
+ }
+ 
+ sub get_psort_root {
+-    my $root = prompt("Where do you plan to install the psort configuration files?", '/usr/local/psortb');
++    if(exists($ENV{PSORTROOT})) {
++       $root = $ENV{PSORTROOT};
++    } else {
++       $root = '/usr/local/psortb';
++    }
++    my $root = prompt("Where do you plan to install the psort configuration files?", $root);
+     $PSORT_ROOT = $root;
+ }
+ 
+Only in bio-tools-psort-all: .Makefile.PL.swp
+diff -ru bio-tools-psort-all/psort/bin/check-sig bio-tools-psort-all.new/psort/bin/check-sig
+--- bio-tools-psort-all/psort/bin/check-sig	2003-07-25 18:48:03.000000000 +0200
++++ bio-tools-psort-all.new/psort/bin/check-sig	2015-11-26 13:51:19.000000000 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/perl
++#! /usr/bin/env perl
+ 
+ use Getopt::Long;
+ 
+diff -ru bio-tools-psort-all/psort/bin/psort bio-tools-psort-all.new/psort/bin/psort
+--- bio-tools-psort-all/psort/bin/psort	2010-05-26 23:51:55.000000000 +0200
++++ bio-tools-psort-all.new/psort/bin/psort	2015-11-26 13:50:58.000000000 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/perl
++#! /usr/bin/env perl
+ 
+ use Bio::Tools::PSort::Report::Formatter;
+ use Bio::Tools::PSort;
+diff -ru bio-tools-psort-all/psort/bin/psort.tmpt bio-tools-psort-all.new/psort/bin/psort.tmpt
+--- bio-tools-psort-all/psort/bin/psort.tmpt	2009-11-10 22:46:09.000000000 +0100
++++ bio-tools-psort-all.new/psort/bin/psort.tmpt	2015-11-26 13:51:01.000000000 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/perl
++#! /usr/bin/env perl
+ 
+ use Bio::Tools::PSort::Report::Formatter;
+ use Bio::Tools::PSort;
+diff -ru bio-tools-psort-all/psort/conf/analysis/signal/archaea/check-sig bio-tools-psort-all.new/psort/conf/analysis/signal/archaea/check-sig
+--- bio-tools-psort-all/psort/conf/analysis/signal/archaea/check-sig	2008-10-01 18:57:37.000000000 +0200
++++ bio-tools-psort-all.new/psort/conf/analysis/signal/archaea/check-sig	2015-11-26 13:52:00.000000000 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/perl
++#! /usr/bin/env perl
+ 
+ use Getopt::Long;
+ 
+diff -ru bio-tools-psort-all/psort/conf/analysis/signal/gramneg/check-sig bio-tools-psort-all.new/psort/conf/analysis/signal/gramneg/check-sig
+--- bio-tools-psort-all/psort/conf/analysis/signal/gramneg/check-sig	2004-02-25 08:50:44.000000000 +0100
++++ bio-tools-psort-all.new/psort/conf/analysis/signal/gramneg/check-sig	2015-11-26 13:52:02.000000000 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/perl
++#! /usr/bin/env perl
+ 
+ use Getopt::Long;
+ 
+diff -ru bio-tools-psort-all/psort/conf/analysis/signal/grampos/check-sig bio-tools-psort-all.new/psort/conf/analysis/signal/grampos/check-sig
+--- bio-tools-psort-all/psort/conf/analysis/signal/grampos/check-sig	2004-04-02 20:23:28.000000000 +0200
++++ bio-tools-psort-all.new/psort/conf/analysis/signal/grampos/check-sig	2015-11-26 13:52:05.000000000 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/perl
++#! /usr/bin/env perl
+ 
+ use Getopt::Long;
+ 
+diff -ru bio-tools-psort-all/psort/server/rpc/classify.xpl bio-tools-psort-all.new/psort/server/rpc/classify.xpl
+--- bio-tools-psort-all/psort/server/rpc/classify.xpl	2004-03-05 20:47:06.000000000 +0100
++++ bio-tools-psort-all.new/psort/server/rpc/classify.xpl	2015-11-26 13:52:20.000000000 +0100
+@@ -14,7 +14,7 @@
+ </help>
+ <code language="perl">
+ <![CDATA[
+-#!/usr/bin/perl
++#!/usr/bin/env perl
+ use Apache::Bio::Tools::PSort;
+ use Bio::Seq;
+ use Data::Dumper;
+diff -ru bio-tools-psort-all/psort/server/startup.pl bio-tools-psort-all.new/psort/server/startup.pl
+--- bio-tools-psort-all/psort/server/startup.pl	2006-08-16 23:41:43.000000000 +0200
++++ bio-tools-psort-all.new/psort/server/startup.pl	2015-11-26 13:51:29.000000000 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/perl
++#! /usr/bin/env perl
+ 
+ use Apache::Bio::Tools::PSort ();
+ use Apache::RPC::Server ();
+diff -ru bio-tools-psort-all/psort/server/www/results.pl bio-tools-psort-all.new/psort/server/www/results.pl
+--- bio-tools-psort-all/psort/server/www/results.pl	2005-03-01 21:38:17.000000000 +0100
++++ bio-tools-psort-all.new/psort/server/www/results.pl	2015-11-26 13:51:41.000000000 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/perl -w
++#! /usr/bin/env perl -w
+ 
+ use Bio::Tools::PSort::Report::Formatter;
+ use Bio::Tools::PSort::XMLRPC::Client;
+diff -ru bio-tools-psort-all/t/sclblast.pl bio-tools-psort-all.new/t/sclblast.pl
+--- bio-tools-psort-all/t/sclblast.pl	2008-10-01 18:57:37.000000000 +0200
++++ bio-tools-psort-all.new/t/sclblast.pl	2015-11-26 13:52:29.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/bin/env perl
+ 
+ use strict;
+ 
diff --git a/easybuild/easyconfigs/p/Pango/Pango-1.40.1-foss-2016a.eb b/easybuild/easyconfigs/p/Pango/Pango-1.40.1-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..70136d70c148a55548e711428c71154dbb478b23
--- /dev/null
+++ b/easybuild/easyconfigs/p/Pango/Pango-1.40.1-foss-2016a.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'Pango'
+version = '1.40.1'
+
+homepage = 'http://www.pango.org/'
+description = """Pango is a library for laying out and rendering of text, with an emphasis on internationalization.
+Pango can be used anywhere that text layout is needed, though most of the work on Pango so far has been done in the
+context of the GTK+ widget toolkit. Pango forms the core of text and font handling for GTK+-2.x."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [FTPGNOME_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+glibver = '2.48.0'
+dependencies = [
+    ('GLib', glibver),
+    ('cairo', '1.14.6', '-GLib-%s' % glibver),
+    ('HarfBuzz', '1.2.7'),
+    ('GObject-Introspection', '1.48.0'),
+    ('fontconfig', '2.11.95')
+]
+
+configopts = "--disable-silent-rules --enable-introspection=yes --enable-static --enable-shared "
+
+modextrapaths = {
+    'XDG_DATA_DIRS': 'share',
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/p/Pango/Pango-1.40.3-intel-2016b.eb b/easybuild/easyconfigs/p/Pango/Pango-1.40.3-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..16a242644026a3c4178633e77a7db3c49977f448
--- /dev/null
+++ b/easybuild/easyconfigs/p/Pango/Pango-1.40.3-intel-2016b.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'Pango'
+version = '1.40.3'
+
+homepage = 'http://www.pango.org/'
+description = """Pango is a library for laying out and rendering of text, with an emphasis on internationalization.
+Pango can be used anywhere that text layout is needed, though most of the work on Pango so far has been done in the
+context of the GTK+ widget toolkit. Pango forms the core of text and font handling for GTK+-2.x."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = [FTPGNOME_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [
+    ('X11', '20160819'),
+    ('GLib', '2.49.5'),
+    ('cairo', '1.14.6'),
+    ('HarfBuzz', '1.3.1'),
+]
+
+builddependencies = [('GObject-Introspection', '1.49.1')]
+
+configopts = "--disable-silent-rules --enable-introspection=yes --enable-static --enable-shared "
+
+modextrapaths = {
+    'XDG_DATA_DIRS': 'share',
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/p/ParaView/ParaView-4.4.0-foss-2016a.eb b/easybuild/easyconfigs/p/ParaView/ParaView-4.4.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ffa008562b522cd40f0957e517533ac22aee34ef
--- /dev/null
+++ b/easybuild/easyconfigs/p/ParaView/ParaView-4.4.0-foss-2016a.eb
@@ -0,0 +1,47 @@
+easyblock = 'CMakeMake'
+
+name = 'ParaView'
+version = '4.4.0'
+
+homepage = "http://www.paraview.org"
+description = "ParaView is a scientific parallel visualizer."
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'pic': True, 'usempi': False}
+
+download_suffix = 'download.php?submit=Download&version=v%(version_major_minor)s&type=source&os=all&downloadFile='
+source_urls = ['http://www.paraview.org/paraview-downloads/%s' % download_suffix]
+sources = ["ParaView-v%(version)s-source.tar.gz"]
+
+patches = ['%(name)s-%(version)s_missingheader.patch']
+
+dependencies = [
+    ('libGLU', '9.0.0', '-Mesa-11.2.1'),
+    ('libXt', '1.1.5'),
+    ('Qt', '4.8.7'),
+    ('libXext', '1.3.3'),
+    ('libX11', '1.6.3'),
+    ('zlib', '1.2.8'),
+    ('HDF5', '1.8.16', '-serial'),
+]
+
+builddependencies = [('CMake', '3.5.2')]
+
+separate_build_dir = True
+
+configopts = '-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON -DVTK_OPENGL_HAS_OSMESA=ON '
+configopts += '-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include -DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.so '
+configopts += '-DOSMESA_INCLUDE_DIR=$EBROOTMESA/include -DOSMESA_LIBRARY=$EBROOTMESA/lib/libOSMesa.so '
+configopts += '-DVTK_USE_SYSTEM_HDF5=ON '
+# Without internet connection turn off testing (uncomment the following line)
+configopts += '-DBUILD_TESTING=OFF '
+# Or consult https://gitlab.kitware.com/vtk/vtk/blob/master/Documentation/dev/git/data.md
+# and download ExternalData to $EASYBUILD_SOURCEPATH and adjust -DExternalData_OBJECT_STORES accordingly
+# Without internet connection, comment the following two lines (configopts and prebuildopts)
+configopts += '-DExternalData_OBJECT_STORES=%(builddir)s/ExternalData '
+# The ParaView server can be cranky, test downloads are quite often failing, especially in the case
+# of parallel downloads. Using ; insted of && gives a second chance to download the test files, if the
+# first serial attempt would fail.
+prebuildopts = 'make VTKData ;'
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/p/ParaView/ParaView-4.4.0-gimkl-2.11.5-mpi.eb b/easybuild/easyconfigs/p/ParaView/ParaView-4.4.0-gimkl-2.11.5-mpi.eb
index a0d908d3d55d69410f38d61d4aff340dd04b5786..881a107e714ed81c80fd5315ac80fd7178857abf 100644
--- a/easybuild/easyconfigs/p/ParaView/ParaView-4.4.0-gimkl-2.11.5-mpi.eb
+++ b/easybuild/easyconfigs/p/ParaView/ParaView-4.4.0-gimkl-2.11.5-mpi.eb
@@ -27,6 +27,7 @@ dependencies = [
     ('libXext', '1.3.3'),
     ('libX11', '1.6.3'),
     ('zlib', '1.2.8'),
+    ('HDF5', '1.8.16', '-serial'),
 ]
 
 builddependencies = [('CMake', '3.4.3')]
@@ -38,8 +39,9 @@ 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 '
 configopts += '-DOSMESA_INCLUDE_DIR=$EBROOTMESA/include -DOSMESA_LIBRARY=$EBROOTMESA/lib/libOSMesa.so '
+configopts += '-DVTK_USE_SYSTEM_HDF5=ON '
 # Without internet connection turn off testing (uncomment the following line)
-#configopts += '-DBUILD_TESTING=OFF '
+configopts += '-DBUILD_TESTING=OFF '
 # Or consult https://gitlab.kitware.com/vtk/vtk/blob/master/Documentation/dev/git/data.md
 # and download ExternalData to $EASYBUILD_SOURCEPATH and adjust -DExternalData_OBJECT_STORES accordingly
 # Without internet connection, comment the following two lines (configopts and prebuildopts)
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 2e7bc45270cfcd09fac2f78b3a774424376d2554..5d0a411cd910563f37a70fa62ad000484c3eb956 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
@@ -27,6 +27,7 @@ dependencies = [
     ('libXext', '1.3.3'),
     ('libX11', '1.6.3', pysuff),
     ('zlib', '1.2.8'),
+    ('HDF5', '1.8.16', '-serial'),
 ]
 
 builddependencies = [('CMake', '3.3.2')]
@@ -38,8 +39,9 @@ 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 '
 configopts += '-DOSMESA_INCLUDE_DIR=$EBROOTMESA/include -DOSMESA_LIBRARY=$EBROOTMESA/lib/libOSMesa.so '
+configopts += '-DVTK_USE_SYSTEM_HDF5=ON '
 # Without internet connection turn off testing (uncomment the following line)
-#configopts += '-DBUILD_TESTING=OFF '
+configopts += '-DBUILD_TESTING=OFF '
 # Or consult https://gitlab.kitware.com/vtk/vtk/blob/master/Documentation/dev/git/data.md
 # and download ExternalData to $EASYBUILD_SOURCEPATH and adjust -DExternalData_OBJECT_STORES accordingly
 # Without internet connection, comment the following two lines (configopts and prebuildopts)
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 0057213bea9baabbefe8efc4c88490e2718989d4..ae3e6cddc3370555ad57175122962bbe12ac3a0d 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
@@ -26,6 +26,7 @@ dependencies = [
     ('libXext', '1.3.3'),
     ('libX11', '1.6.3', pysuff),
     ('zlib', '1.2.8'),
+    ('HDF5', '1.8.16', '-serial'),
 ]
 
 builddependencies = [('CMake', '3.3.2')]
@@ -37,8 +38,9 @@ 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 '
 configopts += '-DOSMESA_INCLUDE_DIR=$EBROOTMESA/include -DOSMESA_LIBRARY=$EBROOTMESA/lib/libOSMesa.so '
+configopts += '-DVTK_USE_SYSTEM_HDF5=ON '
 # Without internet connection turn off testing (uncomment the following line)
-#configopts += '-DBUILD_TESTING=OFF '
+configopts += '-DBUILD_TESTING=OFF '
 # Or consult https://gitlab.kitware.com/vtk/vtk/blob/master/Documentation/dev/git/data.md
 # and download ExternalData to $EASYBUILD_SOURCEPATH and adjust -DExternalData_OBJECT_STORES accordingly
 # Without internet connection, comment the following two lines (configopts and prebuildopts)
diff --git a/easybuild/easyconfigs/p/ParaView/ParaView-4.4.0-intel-2016a.eb b/easybuild/easyconfigs/p/ParaView/ParaView-4.4.0-intel-2016a.eb
index 838808a7430e2ff01978cad94497c5f60727f166..0197db69778e703662d1d131a6108e0f6e6951b6 100644
--- a/easybuild/easyconfigs/p/ParaView/ParaView-4.4.0-intel-2016a.eb
+++ b/easybuild/easyconfigs/p/ParaView/ParaView-4.4.0-intel-2016a.eb
@@ -22,6 +22,7 @@ dependencies = [
     ('libXext', '1.3.3'),
     ('libX11', '1.6.3'),
     ('zlib', '1.2.8'),
+    ('HDF5', '1.8.16', '-serial'),
 ]
 
 builddependencies = [('CMake', '3.5.2')]
@@ -31,6 +32,7 @@ separate_build_dir = True
 configopts = '-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON -DVTK_OPENGL_HAS_OSMESA=ON '
 configopts += '-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include -DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.so '
 configopts += '-DOSMESA_INCLUDE_DIR=$EBROOTMESA/include -DOSMESA_LIBRARY=$EBROOTMESA/lib/libOSMesa.so '
+configopts += '-DVTK_USE_SYSTEM_HDF5=ON '
 # Without internet connection turn off testing (uncomment the following line)
 configopts += '-DBUILD_TESTING=OFF '
 # Or consult https://gitlab.kitware.com/vtk/vtk/blob/master/Documentation/dev/git/data.md
diff --git a/easybuild/easyconfigs/p/ParaView/ParaView-5.1.2-intel-2016b-mpi.eb b/easybuild/easyconfigs/p/ParaView/ParaView-5.1.2-intel-2016b-mpi.eb
new file mode 100644
index 0000000000000000000000000000000000000000..59f802689e29d0a2d004e5cd68c72fe4189d81cf
--- /dev/null
+++ b/easybuild/easyconfigs/p/ParaView/ParaView-5.1.2-intel-2016b-mpi.eb
@@ -0,0 +1,50 @@
+easyblock = 'CMakeMake'
+
+name = 'ParaView'
+version = '5.1.2'
+versionsuffix = '-mpi'
+
+homepage = "http://www.paraview.org"
+description = "ParaView is a scientific parallel visualizer."
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+toolchainopts = {'pic': True, 'usempi': True}
+
+download_suffix = 'download.php?submit=Download&version=v%(version_major_minor)s&type=source&os=all&downloadFile='
+source_urls = ['http://www.paraview.org/paraview-downloads/%s' % download_suffix]
+sources = ["ParaView-v%(version)s.tar.gz"]
+
+dependencies = [
+    ('X11', '20160819'),
+    ('Mesa', '12.0.2'),
+    ('libGLU', '9.0.0'),
+    ('Qt', '4.8.7'),
+    ('zlib', '1.2.8'),
+    ('HDF5', '1.8.17'),
+    ('Python', '2.7.12'),
+]
+
+builddependencies = [('CMake', '3.6.1')]
+
+separate_build_dir = True
+
+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.%s ' % SHLIB_EXT
+configopts += '-DOSMESA_INCLUDE_DIR=$EBROOTMESA/include -DOSMESA_LIBRARY=$EBROOTMESA/lib/libOSMesa.%s ' % SHLIB_EXT
+configopts += '-DOPENGL_glu_LIBRARY=$EBROOTLIBGLU/lib/libGLU.%s ' % SHLIB_EXT
+configopts += '-DVTK_USE_SYSTEM_HDF5=ON -DPARAVIEW_ENABLE_PYTHON=ON -DBUILD_SHARED_LIBS=ON '
+# if you want to build server only Paraview, uncomment the following line:
+# configopts += '-DVTK_USE_X=OFF '
+
+# Without internet connection turn off testing (uncomment the following line)
+configopts += '-DBUILD_TESTING=OFF '
+# Or consult https://gitlab.kitware.com/vtk/vtk/blob/master/Documentation/dev/git/data.md
+# and download ExternalData to $EASYBUILD_SOURCEPATH and adjust -DExternalData_OBJECT_STORES accordingly
+# Without internet connection, comment the following two lines (configopts and prebuildopts)
+configopts += '-DExternalData_OBJECT_STORES=%(builddir)s/ExternalData '
+# The ParaView server can be cranky, test downloads are quite often failing, especially in the case
+# of parallel downloads. Using ; insted of && gives a second chance to download the test files, if the
+# first serial attempt would fail.
+prebuildopts = 'make VTKData ;'
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/p/Perl/Perl-5.16.3-ictce-5.5.0.eb b/easybuild/easyconfigs/p/Perl/Perl-5.16.3-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6d7b68ab454852e10e38b28d91e778f390473b0e
--- /dev/null
+++ b/easybuild/easyconfigs/p/Perl/Perl-5.16.3-ictce-5.5.0.eb
@@ -0,0 +1,225 @@
+name = 'Perl'
+version = '5.16.3'
+
+homepage = 'http://www.perl.org/'
+description = """Larry Wall's Practical Extraction and Report Language"""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['http://www.cpan.org/src/5.0']
+sources = [SOURCELOWER_TAR_GZ]
+
+patches = ['exitcode_error.patch']
+
+runtest = 'test'
+
+exts_list = [
+    ('IO::String', '1.08', {
+        'source_tmpl': 'IO-String-1.08.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS/'],
+    }),
+    ('Data::Stag', '0.11', {
+        'source_tmpl': 'Data-Stag-0.11.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/C/CM/CMUNGALL/'],
+    }),
+    ('DB_File', '1.827', {
+        'source_urls': ['http://cpan.metacpan.org/authors/id/P/PM/PMQS/'],
+    }),
+    ('DBI', '1.625', {
+        'source_urls': ['http://cpan.metacpan.org/authors/id/T/TI/TIMB/'],
+    }),
+    ('Bio::Perl', '1.6.901', {
+        'source_tmpl': 'BioPerl-1.6.901.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/C/CJ/CJFIELDS/'],
+        'patches': ['BioPerl_disable-broken-test.patch'],
+    }),
+    ('Sub::Uplevel', '0.24', {
+        'source_tmpl': 'Sub-Uplevel-0.24.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/'],
+    }),
+    ('Tree::DAG_Node', '1.11', {
+        'source_tmpl': 'Tree-DAG_Node-1.11.tgz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RS/RSAVAGE/'],
+    }),
+    ('Try::Tiny', '0.12', {
+        'source_tmpl': 'Try-Tiny-0.12.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DO/DOY/'],
+    }),
+    ('Test::Fatal', '0.010', {
+        'source_tmpl': 'Test-Fatal-0.010.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RJ/RJBS/'],
+    }),
+    ('Test::Exception', '0.31', {
+        'source_tmpl': 'Test-Exception-0.31.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AD/ADIE/'],
+    }),
+    ('Test::Warn', '0.24', {
+        'source_tmpl': 'Test-Warn-0.24.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/C/CH/CHORNY/'],
+    }),
+    ('Test::Requires', '0.06', {
+        'source_tmpl': 'Test-Requires-0.06.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/T/TO/TOKUHIROM/'],
+    }),
+    ('Test::Tester', '0.108', {
+        'source_tmpl': 'Test-Tester-0.108.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/F/FD/FDALY/'],
+    }),
+    ('Params::Util', '1.07', {
+        'source_tmpl': 'Params-Util-1.07.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AD/ADAMK/'],
+    }),
+    ('Sub::Install', '0.926', {
+        'source_tmpl': 'Sub-Install-0.926.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RJ/RJBS/'],
+    }),
+    ('Data::OptList', '0.107', {
+        'source_tmpl': 'Data-OptList-0.107.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RJ/RJBS/'],
+    }),
+    ('Sub::Exporter', '0.985', {
+        'source_tmpl': 'Sub-Exporter-0.985.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RJ/RJBS/'],
+    }),
+    ('Test::Output', '1.01', {
+        'source_tmpl': 'Test-Output-1.01.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/B/BD/BDFOY/'],
+    }),
+    ('Module::Runtime', '0.013', {
+        'source_tmpl': 'Module-Runtime-0.013.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/Z/ZE/ZEFRAM/'],
+    }),
+    ('Module::Implementation', '0.06', {
+        'source_tmpl': 'Module-Implementation-0.06.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DR/DROLSKY/'],
+    }),
+    ('List::MoreUtils', '0.33', {
+        'source_tmpl': 'List-MoreUtils-0.33.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AD/ADAMK/'],
+    }),
+    ('Package::DeprecationManager', '0.13', {
+        'source_tmpl': 'Package-DeprecationManager-0.13.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DR/DROLSKY/'],
+    }),
+    ('Dist::CheckConflicts', '0.02', {
+        'source_tmpl': 'Dist-CheckConflicts-0.02.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DO/DOY/'],
+    }),
+    ('Package::Stash', '0.34', {
+        'source_tmpl': 'Package-Stash-0.34.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DO/DOY/'],
+    }),
+    ('Class::Load', '0.20', {
+        'source_tmpl': 'Class-Load-0.20.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DR/DROLSKY/'],
+    }),
+    ('MRO::Compat', '0.12', {
+        'source_tmpl': 'MRO-Compat-0.12.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/B/BO/BOBTFISH/'],
+    }),
+    ('Sub::Name', '0.05', {
+        'source_tmpl': 'Sub-Name-0.05.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/F/FL/FLORA/'],
+    }),
+    ('Eval::Closure', '0.08', {
+        'source_tmpl': 'Eval-Closure-0.08.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DO/DOY/'],
+    }),
+    ('Sub::Exporter::Progressive', '0.001010', {
+        'source_tmpl': 'Sub-Exporter-Progressive-0.001010.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/F/FR/FREW/'],
+    }),
+    ('Devel::GlobalDestruction', '0.11', {
+        'source_tmpl': 'Devel-GlobalDestruction-0.11.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/H/HA/HAARG/'],
+    }),
+    ('boolean', '0.30', {
+        'source_urls': ['http://cpan.metacpan.org/authors/id/I/IN/INGY/'],
+    }),
+    ('Tie::IxHash', '1.23', {
+        'source_tmpl': 'Tie-IxHash-1.23.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/C/CH/CHORNY/'],
+    }),
+    ('Moose', '2.0801', {
+        'source_urls': ['http://cpan.metacpan.org/authors/id/E/ET/ETHER/'],
+    }),
+    ('Params::Validate', '1.07', {
+        'source_tmpl': 'Params-Validate-1.07.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DR/DROLSKY/'],
+    }),
+    ('DateTime::Locale', '0.45', {
+        'source_tmpl': 'DateTime-Locale-0.45.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DR/DROLSKY/'],
+    }),
+    ('Class::Singleton', '1.4', {
+        'source_tmpl': 'Class-Singleton-1.4.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AB/ABW/'],
+    }),
+    ('DateTime::TimeZone', '1.58', {
+        'source_tmpl': 'DateTime-TimeZone-1.58.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DR/DROLSKY/'],
+    }),
+    ('DateTime', '1.01', {
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DR/DROLSKY/'],
+    }),
+    ('Data::Types', '0.09', {
+        'source_tmpl': 'Data-Types-0.09.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DW/DWHEELER/'],
+    }),
+    ('DateTime::Tiny', '1.04', {
+        'source_tmpl': 'DateTime-Tiny-1.04.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AD/ADAMK/'],
+    }),
+    ('File::Slurp', '9999.19', {
+        'source_tmpl': 'File-Slurp-9999.19.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/U/UR/URI/'],
+    }),
+    ('HTTP::Date', '6.02', {
+        'source_tmpl': 'HTTP-Date-6.02.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS/'],
+    }),
+    ('IO::HTML', '1.00', {
+        'source_tmpl': 'IO-HTML-1.00.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/C/CJ/CJM/'],
+    }),
+    ('LWP::MediaTypes', '6.02', {
+        'source_tmpl': 'LWP-MediaTypes-6.02.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS/'],
+    }),
+    ('URI', '1.60', {
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS/'],
+    }),
+    ('HTTP::Request', '6.06', {
+        'source_tmpl': 'HTTP-Message-6.06.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS/'],
+    }),
+    ('HTML::Tagset', '3.20', {
+        'source_tmpl': 'HTML-Tagset-3.20.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/P/PE/PETDANCE/'],
+    }),
+    ('HTML::Entities', '3.70', {
+        'source_tmpl': 'HTML-Parser-3.70.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS/'],
+    }),
+    ('AnyEvent', '7.04', {
+        'source_urls': ['http://cpan.metacpan.org/authors/id/M/ML/MLEHMANN/'],
+    }),
+    ('Mouse', '1.05', {
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GF/GFUJI/'],
+    }),
+    ('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::Base', '1.08', {
+        'source_tmpl': 'XML-SAX-Base-1.08.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GR/GRANTM/'],
+    }),
+    ('XML::SAX', '0.99', {
+        'source_tmpl': 'XML-SAX-0.99.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GR/GRANTM/'],
+    }),
+]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Perl/Perl-5.24.0-GCCcore-4.9.3.eb b/easybuild/easyconfigs/p/Perl/Perl-5.24.0-GCCcore-4.9.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..dc1a3cef69a3f9ded529556c250fcaa9c11478ce
--- /dev/null
+++ b/easybuild/easyconfigs/p/Perl/Perl-5.24.0-GCCcore-4.9.3.eb
@@ -0,0 +1,886 @@
+name = 'Perl'
+version = '5.24.0'
+
+homepage = 'http://www.perl.org/'
+description = """Larry Wall's Practical Extraction and Report Language"""
+
+toolchain = {'name': 'GCCcore', 'version': '4.9.3'}
+toolchainopts = {'pic': True}
+
+source_urls = ['http://www.cpan.org/src/%(version_major)s.0']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('binutils', '2.25')]
+
+exts_list = [
+    ('Config::General', '2.61', {
+        'source_tmpl': 'Config-General-2.61.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': ['https://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': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('Test::Harness', '3.36', {
+        'source_tmpl': 'Test-Harness-3.36.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': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('Module::Build::Tiny', '0.039', {
+        'source_tmpl': 'Module-Build-Tiny-0.039.tar.gz',
+        'source_urls': ['https://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': ['https://cpan.metacpan.org/authors/id/R/RC/RCLAMP'],
+    }),
+    ('Regexp::Common', '2016060801', {
+        'source_tmpl': 'Regexp-Common-2016060801.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/A/AB/ABIGAIL'],
+    }),
+    ('GO::Utils', '0.15', {
+        'source_tmpl': 'go-perl-0.15.tar.gz',
+        'source_urls': ['https://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.026', {
+        'source_tmpl': 'Test-Warnings-0.026.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('DateTime::Locale', '1.05', {
+        'source_tmpl': 'DateTime-Locale-1.05.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('DateTime::TimeZone', '2.00', {
+        'source_tmpl': 'DateTime-TimeZone-2.00.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': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('Module::Build', '0.4218', {
+        'source_tmpl': 'Module-Build-0.4218.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('Module::Runtime', '0.014', {
+        'source_tmpl': 'Module-Runtime-0.014.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/Z/ZE/ZEFRAM'],
+    }),
+    ('Try::Tiny', '0.24', {
+        'source_tmpl': 'Try-Tiny-0.24.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Params::Validate', '1.24', {
+        'source_tmpl': 'Params-Validate-1.24.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('List::MoreUtils', '0.416', {
+        'source_tmpl': 'List-MoreUtils-0.416.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': ['https://cpan.metacpan.org/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.34', {
+        'source_tmpl': 'DateTime-1.34.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'],
+    }),
+    ('Readonly', '2.05', {
+        'source_tmpl': 'Readonly-2.05.tar.gz',
+        'source_urls': ['https://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.29', {
+        'source_tmpl': 'Tree-DAG_Node-1.29.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': ['https://cpan.metacpan.org/authors/id/A/AB/ABW'],
+    }),
+    ('FreezeThaw', '0.5001', {
+        'source_tmpl': 'FreezeThaw-0.5001.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/I/IL/ILYAZ/modules'],
+    }),
+    ('DBI', '1.636', {
+        'source_tmpl': 'DBI-1.636.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TI/TIMB'],
+    }),
+    ('DBD::SQLite', '1.50', {
+        'source_tmpl': 'DBD-SQLite-1.50.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': ['https://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': ['https://cpan.metacpan.org/authors/id/J/JU/JUERD'],
+    }),
+    ('Shell', '0.73', {
+        'source_tmpl': 'Shell-0.73.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/F/FE/FERREIRA'],
+    }),
+    ('File::Spec', '3.62', {
+        'source_tmpl': 'PathTools-3.62.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('ExtUtils::MakeMaker', '7.18', {
+        'source_tmpl': 'ExtUtils-MakeMaker-7.18.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('Test::Simple', '1.302037', {
+        'source_tmpl': 'Test-Simple-1.302037.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': ['https://cpan.metacpan.org/authors/id/D/DA/DAVIDO'],
+    }),
+    ('IO::Stringy', '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': ['https://cpan.metacpan.org/authors/id/G/GR/GRANTM'],
+    }),
+    ('XML::NamespaceSupport', '1.11', {
+        'source_tmpl': 'XML-NamespaceSupport-1.11.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PE/PERIGRIN'],
+    }),
+    ('XML::SAX', '0.99', {
+        'source_tmpl': 'XML-SAX-0.99.tar.gz',
+        'source_urls': ['https://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.43', {
+        'source_tmpl': 'Test-Exception-0.43.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': ['https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF'],
+    }),
+    ('MIME::Types', '2.13', {
+        'source_tmpl': 'MIME-Types-2.13.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': ['https://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.72', {
+        'source_tmpl': 'HTML-Parser-3.72.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Date::Handler', '1.2', {
+        'source_tmpl': 'Date-Handler-1.2.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BB/BBEAUSEJ'],
+    }),
+    ('Params::Util', '1.07', {
+        'source_tmpl': 'Params-Util-1.07.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('IO::HTML', '1.001', {
+        'source_tmpl': 'IO-HTML-1.001.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/C/CJ/CJM'],
+    }),
+    ('Data::Grove', '0.08', {
+        'source_tmpl': 'libxml-perl-0.08.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/K/KM/KMACLEOD'],
+    }),
+    ('Class::ISA', '0.36', {
+        'source_tmpl': 'Class-ISA-0.36.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SM/SMUELLER'],
+    }),
+    ('URI', '1.71', {
+        'source_tmpl': 'URI-1.71.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': ['https://cpan.metacpan.org/authors/id/P/PE/PERRIN'],
+    }),
+    ('Tie::IxHash', '1.23', {
+        'source_tmpl': 'Tie-IxHash-1.23.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/C/CH/CHORNY'],
+    }),
+    ('GO', '0.04', {
+        'source_tmpl': 'go-db-perl-0.04.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SJ/SJCARBON'],
+    }),
+    ('Class::DBI::SQLite', '0.11', {
+        'source_tmpl': 'Class-DBI-SQLite-0.11.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MI/MIYAGAWA'],
+    }),
+    ('Pod::POM', '2.01', {
+        'source_tmpl': 'Pod-POM-2.01.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.44', {
+        'source_tmpl': 'Text-Diff-1.44.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': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('IO::Socket::SSL', '2.029', {
+        'source_tmpl': 'IO-Socket-SSL-2.029.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': ['https://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('Sub::Uplevel', '0.25', {
+        'source_tmpl': 'Sub-Uplevel-0.25.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN'],
+    }),
+    ('Meta::Builder', '0.003', {
+        'source_tmpl': 'Meta-Builder-0.003.tar.gz',
+        'source_urls': ['https://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'],
+    }),
+    ('Getopt::Long', '2.48', {
+        'source_tmpl': 'Getopt-Long-2.48.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': ['https://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.04', {
+        'source_tmpl': 'Test-Version-2.04.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', '1.120', {
+        'source_tmpl': 'Test-Deep-1.120.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': ['https://cpan.metacpan.org/authors/id/C/CH/CHORNY'],
+    }),
+    ('MRO::Compat', '0.12', {
+        'source_tmpl': 'MRO-Compat-0.12.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BO/BOBTFISH'],
+    }),
+    ('Moo', '2.002004', {
+        'source_tmpl': 'Moo-2.002004.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HA/HAARG'],
+    }),
+    ('Hash::Merge', '0.200', {
+        'source_tmpl': 'Hash-Merge-0.200.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RE/REHSACK'],
+    }),
+    ('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': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('File::Copy::Recursive', '0.38', {
+        'source_tmpl': 'File-Copy-Recursive-0.38.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DM/DMUEY'],
+    }),
+    ('Number::Compare', '0.03', {
+        'source_tmpl': 'Number-Compare-0.03.tar.gz',
+        'source_urls': ['https://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.09', {
+        'source_tmpl': 'HTML-Entities-Interpolate-1.09.tgz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RS/RSAVAGE'],
+    }),
+    ('Test::ClassAPI', '1.06', {
+        'source_tmpl': 'Test-ClassAPI-1.06.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('Test::Most', '0.34', {
+        'source_tmpl': 'Test-Most-0.34.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/O/OV/OVID'],
+    }),
+    ('Class::Accessor', '0.34', {
+        'source_tmpl': 'Class-Accessor-0.34.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/K/KA/KASEI'],
+    }),
+    ('Test::Differences', '0.64', {
+        'source_tmpl': 'Test-Differences-0.64.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DC/DCANTRELL'],
+    }),
+    ('HTTP::Tiny', '0.058', {
+        'source_tmpl': 'HTTP-Tiny-0.058.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN'],
+    }),
+    ('Package::DeprecationManager', '0.17', {
+        'source_tmpl': 'Package-DeprecationManager-0.17.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': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Date::Language', '2.30', {
+        'source_tmpl': 'TimeDate-2.30.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GB/GBARR'],
+    }),
+    ('version', '0.9917', {
+        'source_tmpl': 'version-0.9917.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'],
+    }),
+    ('XML::Bare', '0.53', {
+        'source_tmpl': 'XML-Bare-0.53.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/C/CO/CODECHILD'],
+    }),
+    ('Dist::CheckConflicts', '0.11', {
+        'source_tmpl': 'Dist-CheckConflicts-0.11.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DO/DOY'],
+    }),
+    ('Sub::Name', '0.15', {
+        'source_tmpl': 'Sub-Name-0.15.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Time::Piece', '1.31', {
+        'source_tmpl': 'Time-Piece-1.31.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ES/ESAYM'],
+    }),
+    ('Digest::HMAC', '1.03', {
+        'source_tmpl': 'Digest-HMAC-1.03.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('HTTP::Negotiate', '6.01', {
+        'source_tmpl': 'HTTP-Negotiate-6.01.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('MIME::Lite', '3.030', {
+        'source_tmpl': 'MIME-Lite-3.030.tar.gz',
+        'source_urls': ['https://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', '2011', {
+        'source_tmpl': 'Canary-Stability-2011.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/ML/MLEHMANN'],
+    }),
+    ('AnyEvent', '7.12', {
+        'source_tmpl': 'AnyEvent-7.12.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': ['https://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': ['https://cpan.metacpan.org/authors/id/D/DC/DCANTRELL'],
+    }),
+    ('HTML::Tagset', '3.20', {
+        'source_tmpl': 'HTML-Tagset-3.20.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PE/PETDANCE'],
+    }),
+    ('HTML::Tree', '5.03', {
+        'source_tmpl': 'HTML-Tree-5.03.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/C/CJ/CJM'],
+    }),
+    ('Devel::GlobalDestruction', '0.13', {
+        'source_tmpl': 'Devel-GlobalDestruction-0.13.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HA/HAARG'],
+    }),
+    ('WWW::RobotRules', '6.02', {
+        'source_tmpl': 'WWW-RobotRules-6.02.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Expect', '1.33', {
+        'source_tmpl': 'Expect-1.33.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/J/JA/JACOBY/'],
+    }),
+    ('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': ['https://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.0612', {
+        'source_tmpl': 'Statistics-Descriptive-3.0612.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.15', {
+        'source_tmpl': 'libwww-perl-6.15.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': ['https://cpan.metacpan.org/authors/id/K/KA/KASEI'],
+    }),
+    ('Package::Stash::XS', '0.28', {
+        'source_tmpl': 'Package-Stash-XS-0.28.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DO/DOY'],
+    }),
+    ('GD::Graph', '1.52', {
+        'source_tmpl': 'GDGraph-1.52.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': ['https://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': ['https://cpan.metacpan.org/authors/id/C/CM/CMUNGALL'],
+    }),
+    ('Test::NoWarnings', '1.04', {
+        'source_tmpl': 'Test-NoWarnings-1.04.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('Crypt::DES', '2.07', {
+        'source_tmpl': 'Crypt-DES-2.07.tar.gz',
+        'source_urls': ['https://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': ['https://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('Parse::RecDescent', '1.967013', {
+        'source_tmpl': 'Parse-RecDescent-1.967013.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/J/JT/JTBRAUN'],
+    }),
+    ('Carp', '1.38', {
+        'source_tmpl': 'Carp-1.38.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('XML::XPath', '1.37', {
+        'source_tmpl': 'XML-XPath-1.37.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MANWAR'],
+    }),
+    ('Capture::Tiny', '0.42', {
+        'source_tmpl': 'Capture-Tiny-0.42.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': ['https://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': ['https://cpan.metacpan.org/authors/id/A/AN/ANDYA'],
+    }),
+    ('Sub::Exporter::Progressive', '0.001011', {
+        'source_tmpl': 'Sub-Exporter-Progressive-0.001011.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/F/FR/FREW'],
+    }),
+    ('Data::Dumper::Concise', '2.022', {
+        'source_tmpl': 'Data-Dumper-Concise-2.022.tar.gz',
+        'source_urls': ['https://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': ['https://cpan.metacpan.org/authors/id/M/MP/MPIOTR'],
+    }),
+    ('Class::Data::Inheritable', '0.08', {
+        'source_tmpl': 'Class-Data-Inheritable-0.08.tar.gz',
+        'source_urls': ['https://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.000003', {
+        'source_tmpl': 'strictures-2.000003.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': ['https://cpan.metacpan.org/authors/id/C/CH/CHORNY'],
+    }),
+    ('File::Which', '1.21', {
+        'source_tmpl': 'File-Which-1.21.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': ['https://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.111', {
+        'source_tmpl': 'Mock-Quick-1.111.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': ['https://cpan.metacpan.org/authors/id/B/BD/BDFOY'],
+    }),
+    ('Class::DBI', '3.0.17', {
+        'source_tmpl': 'Class-DBI-v3.0.17.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TM/TMTM'],
+    }),
+    ('List::AllUtils', '0.11', {
+        'source_tmpl': 'List-AllUtils-0.11.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('UNIVERSAL::moniker', '0.08', {
+        'source_tmpl': 'UNIVERSAL-moniker-0.08.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/K/KA/KASEI'],
+    }),
+    ('Exception::Class', '1.40', {
+        'source_tmpl': 'Exception-Class-1.40.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': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Math::VecStat', '0.08', {
+        'source_tmpl': 'Math-VecStat-0.08.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/A/AS/ASPINELLI'],
+    }),
+    ('Pod::LaTeX', '0.61', {
+        'source_tmpl': 'Pod-LaTeX-0.61.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TJ/TJENNESS'],
+    }),
+    ('Eval::Closure', '0.14', {
+        'source_tmpl': 'Eval-Closure-0.14.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': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('XML::Simple', '2.22', {
+        'source_tmpl': 'XML-Simple-2.22.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GR/GRANTM'],
+    }),
+    ('Sub::Install', '0.928', {
+        'source_tmpl': 'Sub-Install-0.928.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('HTTP::Cookies', '6.01', {
+        'source_tmpl': 'HTTP-Cookies-6.01.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Pod::Plainer', '1.04', {
+        'source_tmpl': 'Pod-Plainer-1.04.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RM/RMBARKER'],
+    }),
+    ('Test::Exception::LessClever', '0.007', {
+        'source_tmpl': 'Test-Exception-LessClever-0.007.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('LWP::MediaTypes', '6.02', {
+        'source_tmpl': 'LWP-MediaTypes-6.02.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Scalar::Util', '1.45', {
+        'source_tmpl': 'Scalar-List-Utils-1.45.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': ['https://cpan.metacpan.org/authors/id/M/MI/MIYAGAWA'],
+    }),
+    ('Class::Trigger', '0.14', {
+        'source_tmpl': 'Class-Trigger-0.14.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MI/MIYAGAWA'],
+    }),
+    ('HTTP::Daemon', '6.01', {
+        'source_tmpl': 'HTTP-Daemon-6.01.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('File::HomeDir', '1.00', {
+        'source_tmpl': 'File-HomeDir-1.00.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('HTTP::Date', '6.02', {
+        'source_tmpl': 'HTTP-Date-6.02.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Authen::SASL', '2.16', {
+        'source_tmpl': 'Authen-SASL-2.16.tar.gz',
+        'source_urls': ['https://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': ['https://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.06', {
+        'source_tmpl': 'DateTime-Tiny-1.06.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN'],
+    }),
+    ('DBD::AnyData', '0.110', {
+        'source_tmpl': 'DBD-AnyData-0.110.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RE/REHSACK'],
+    }),
+    ('Text::Format', '0.59', {
+        'source_tmpl': 'Text-Format-0.59.tar.gz',
+        'source_urls': ['https://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.84', {
+        'source_tmpl': 'Log-Handler-0.84.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': ['https://cpan.metacpan.org/authors/id/T/TM/TMTM'],
+    }),
+    ('Devel::StackTrace', '2.01', {
+        'source_tmpl': 'Devel-StackTrace-2.01.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': ['https://cpan.metacpan.org/authors/id/S/SW/SWMCD'],
+    }),
+    ('Moose', '2.1804', {
+        'source_tmpl': 'Moose-2.1804.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': ['https://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': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('File::Find::Rule', '0.34', {
+        'source_tmpl': 'File-Find-Rule-0.34.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RC/RCLAMP'],
+    }),
+    ('SQL::Statement', '1.410', {
+        'source_tmpl': 'SQL-Statement-1.410.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': ['https://cpan.metacpan.org/authors/id/U/UR/URI'],
+    }),
+    ('Package::Stash', '0.37', {
+        'source_tmpl': 'Package-Stash-0.37.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DO/DOY'],
+    }),
+    ('Data::OptList', '0.110', {
+        'source_tmpl': 'Data-OptList-0.110.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('CPANPLUS', '0.9160', {
+        'source_tmpl': 'CPANPLUS-0.9160.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('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.05', {
+        'source_tmpl': 'Text-Soundex-3.05.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Lingua::EN::PluralToSingular', '0.18', {
+        'source_tmpl': 'Lingua-EN-PluralToSingular-0.18.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BK/BKB'],
+    }),
+    ('Want', '0.29', {
+        'source_tmpl': 'Want-0.29.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RO/ROBIN'],
+    }),
+    ('Cwd::Guard', '0.05', {
+        'source_tmpl': 'Cwd-Guard-0.05.tar.gz',
+        'source_urls': ['https://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.18', {
+        'source_tmpl': 'MailTools-2.18.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MARKOV'],
+    }),
+]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Pillow/Pillow-3.2.0-foss-2016a-Python-2.7.11-freetype-2.6.3.eb b/easybuild/easyconfigs/p/Pillow/Pillow-3.2.0-foss-2016a-Python-2.7.11-freetype-2.6.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..16cea8d33bff1c5a9fdadaab7d0087a532e2a26b
--- /dev/null
+++ b/easybuild/easyconfigs/p/Pillow/Pillow-3.2.0-foss-2016a-Python-2.7.11-freetype-2.6.3.eb
@@ -0,0 +1,30 @@
+easyblock = 'PythonPackage'
+
+name = 'Pillow'
+version = '3.2.0'
+versionsuffix = '-Python-%(pyver)s'
+
+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': '2016a'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+freetype_ver = '2.6.3'
+versionsuffix += '-freetype-%s' % freetype_ver
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('libjpeg-turbo', '1.4.2','-NASM-2.12.01'),
+    ('libpng', '1.6.21'),
+    ('zlib', '1.2.8'),
+    ('LibTIFF', '4.0.6'),
+    ('freetype', freetype_ver),
+]
+
+options = {'modulename': 'PIL'}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/p/Pillow/Pillow-3.4.2-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/p/Pillow/Pillow-3.4.2-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4667d2c7a639ec629da41ab9d2497a92a1bcd648
--- /dev/null
+++ b/easybuild/easyconfigs/p/Pillow/Pillow-3.4.2-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,27 @@
+easyblock = 'PythonPackage'
+
+name = 'Pillow'
+version = '3.4.2'
+versionsuffix = '-Python-%(pyver)s'
+
+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': '2016b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.12'),
+    ('libjpeg-turbo', '1.5.1'),
+    ('libpng', '1.6.26'),
+    ('zlib', '1.2.8'),
+    ('LibTIFF', '4.0.6'),
+    ('freetype', '2.7'),
+]
+
+options = {'modulename': 'PIL'}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/p/Pillow/Pillow-3.4.2-intel-2016b-Python-3.5.2.eb b/easybuild/easyconfigs/p/Pillow/Pillow-3.4.2-intel-2016b-Python-3.5.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a95d247bb56abfca54e08afd1bcf77e3112727fe
--- /dev/null
+++ b/easybuild/easyconfigs/p/Pillow/Pillow-3.4.2-intel-2016b-Python-3.5.2.eb
@@ -0,0 +1,27 @@
+easyblock = 'PythonPackage'
+
+name = 'Pillow'
+version = '3.4.2'
+versionsuffix = '-Python-%(pyver)s'
+
+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': '2016b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '3.5.2'),
+    ('libjpeg-turbo', '1.5.1'),
+    ('libpng', '1.6.26'),
+    ('zlib', '1.2.8'),
+    ('LibTIFF', '4.0.6'),
+    ('freetype', '2.7'),
+]
+
+options = {'modulename': 'PIL'}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/p/PnMPI/PnMPI-1.2.0-goolf-1.5.14.eb b/easybuild/easyconfigs/p/PnMPI/PnMPI-1.2.0-goolf-1.5.14.eb
new file mode 100644
index 0000000000000000000000000000000000000000..30ff748dc8c05e6ff5995466fd16db636884eb56
--- /dev/null
+++ b/easybuild/easyconfigs/p/PnMPI/PnMPI-1.2.0-goolf-1.5.14.eb
@@ -0,0 +1,35 @@
+# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild
+# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany
+# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
+# License::   New BSD
+#
+# This work is based from experiences from the UNITE project
+# http://apps.fz-juelich.de/unite/
+##
+easyblock = 'CMakeMake'
+
+name = 'PnMPI'
+version = '1.2.0'
+
+homepage = 'https://scalability.llnl.gov/pnmpi/'
+description = """MPI Tool Virtualization and Interoperability library."""
+
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
+toolchainopts = {'usempi': True}
+
+# http://tu-dresden.de/die_tu_dresden/zentrale_einrichtungen/zih/forschung/projekte/must/files/pnmpi-for-gti-1.2.0.tar.gz
+source_urls = ['http://tu-dresden.de/die_tu_dresden/zentrale_einrichtungen/zih/forschung/projekte/must/files/']
+sources = ['%(namelower)s-for-gti-%(version)s.tar.gz']
+
+builddependencies = [('CMake', '3.0.2')]
+
+configopts = ' -DCMAKE_BUILD_TYPE=Release -DBFD_FOUND=False -DPNMPI_HAVE_BFD=False'
+
+parallel = 1
+
+sanity_check_paths = {
+    'files': ["bin/pnmpi-patch", "include/pnmpi.h", "lib/libpnmpi.a"],
+    'dirs': [],
+}
+
+moduleclass = 'perf'
diff --git a/easybuild/easyconfigs/p/PostgreSQL/PostgreSQL-9.6.0-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/p/PostgreSQL/PostgreSQL-9.6.0-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a1b0d0ba132ea1bc0e9021233c255bcf924163a6
--- /dev/null
+++ b/easybuild/easyconfigs/p/PostgreSQL/PostgreSQL-9.6.0-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,44 @@
+easyblock = 'ConfigureMake'
+
+name = 'PostgreSQL'
+version = '9.6.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://www.mysql.com/'
+description = """PostgreSQL is a powerful, open source object-relational database system.
+ It is fully ACID compliant, has full support for foreign keys,
+ joins, views, triggers, and stored procedures (in multiple languages).
+ It includes most SQL:2008 data types, including INTEGER,
+ NUMERIC, BOOLEAN, CHAR, VARCHAR, DATE, INTERVAL, and TIMESTAMP.
+ It also supports storage of binary large objects, including pictures,
+ sounds, or video. It has native programming interfaces for C/C++, Java,
+ .Net, Perl, Python, Ruby, Tcl, ODBC, among others, and exceptional documentation."""
+
+source_urls = ['http://ftp.postgresql.org/pub/source/v%(version)s/']
+sources = [SOURCELOWER_TAR_GZ]
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
+dependencies = [
+    ('libreadline', '6.3'),
+    ('zlib', '1.2.8'),
+    ('Python', '2.7.12'),
+    #    ('OpenSSL', '1.0.1i'), # OS dependency should be preferred for security reasons
+]
+
+builddependencies = [
+    ('Bison', '3.0.4'),
+    ('flex', '2.6.0'),
+    ('Perl', '5.24.0'),
+]
+
+configopts = '--with-python --with-openssl'
+
+sanity_check_paths = {
+    'files': ['bin/psql', 'bin/pg_config', 'lib/libpq.a', 'lib/libpq.%s' % SHLIB_EXT],
+    'dirs': ['share/postgresql'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/p/PyGTS/PyGTS-0.3.1-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/p/PyGTS/PyGTS-0.3.1-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b961fbd0a432bb2a602a59e54bcb5dc2d4c81c0e
--- /dev/null
+++ b/easybuild/easyconfigs/p/PyGTS/PyGTS-0.3.1-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,30 @@
+easyblock = 'PythonPackage'
+
+name = 'PyGTS'
+version = '0.3.1'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://sourceforge.net/projects/pygts/'
+description = """ PyGTS is a python package used to construct, manipulate, 
+ and perform computations on triangulated surfaces. 
+ It is a hand-crafted and pythonic binding for the GNU Triangulated Surface (GTS) Library. """
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.12'),
+    ('GLib', '2.49.5'),
+    ('GTS' ,'0.7.6'),
+]
+
+options = {'modulename': 'gts'}
+
+sanity_check_paths = {
+    'files': ['lib/python%%(pyshortver)s/site-packages/gts/_gts.%s' % SHLIB_EXT],
+    'dirs':[],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/p/PyQt5/PyQt5-5.7-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/p/PyQt5/PyQt5-5.7-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5f366cc75cac90c041f739540d7823d194fe0c80
--- /dev/null
+++ b/easybuild/easyconfigs/p/PyQt5/PyQt5-5.7-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMakePythonPackage'
+
+name = 'PyQt5'
+version = '5.7'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://www.riverbankcomputing.co.uk/software/pyqt'
+description = """PyQt5 is a set of Python bindings for v5 of the Qt application framework from The Qt Company."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = ['%(name)s_gpl-%(version)s.tar.gz']
+source_urls = ['http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-%(version)s']
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('SIP', '4.18.1', versionsuffix),
+    ('Qt5', '5.7.0'),
+]
+
+configopts = "configure.py --confirm-license"
+configopts += " --destdir=%(installdir)s/lib/python%(pyshortver)s/site-packages "
+configopts += " --no-sip-files"
+
+options = {'modulename': '%(name)s'}
+
+modextrapaths = {'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/%(name)s'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/p/PyYAML/PyYAML-3.12-intel-2016b-Python-3.5.2.eb b/easybuild/easyconfigs/p/PyYAML/PyYAML-3.12-intel-2016b-Python-3.5.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..266c49b4251ba6c4a87959956b4637096f09c914
--- /dev/null
+++ b/easybuild/easyconfigs/p/PyYAML/PyYAML-3.12-intel-2016b-Python-3.5.2.eb
@@ -0,0 +1,27 @@
+easyblock = 'PythonPackage'
+
+name = 'PyYAML'
+version = '3.12'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = "https://pypi.python.org/pypi/PyYAML/"
+description = """PyYAML is a YAML parser and emitter for the Python programming language."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '3.5.2'),
+    ('libyaml', '0.1.6'),
+]
+
+options = {'modulename': 'yaml'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/p/Pygments/Pygments-2.1.3-foss-2016a-Python-3.5.1.eb b/easybuild/easyconfigs/p/Pygments/Pygments-2.1.3-foss-2016a-Python-3.5.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..85869f21eaaa3fbe57b298e3559e82d58cb66d20
--- /dev/null
+++ b/easybuild/easyconfigs/p/Pygments/Pygments-2.1.3-foss-2016a-Python-3.5.1.eb
@@ -0,0 +1,25 @@
+easyblock = 'PythonPackage'
+
+name = 'Pygments'
+version = '2.1.3'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://pygments.org/'
+description = """Generic syntax highlighter suitable for use in code hosting, forums, wikis or other applications
+ that need to prettify source code."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '3.5.1'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/pygmentize'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/%(name)s-%(version)s-py%(pyshortver)s.egg'],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/Pyro4/Pyro4-4.47-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/p/Pyro4/Pyro4-4.47-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0a1e3fec180dbc3354e023396037b9b73948b1b2
--- /dev/null
+++ b/easybuild/easyconfigs/p/Pyro4/Pyro4-4.47-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,27 @@
+easyblock = 'PythonPackage'
+
+name = 'Pyro4'
+version = '4.47'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://pypi.python.org/pypi/Pyro4'
+description = """Pyro means PYthon Remote Objects. It is a library that enables you to build applications in which
+ objects can talk to eachother over the network, with minimal programming effort."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+options = {'modulename': 'Pyro4'}
+
+dependencies = [
+    ('Python', '2.7.11'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/p/Pysam/Pysam-0.9.1.4-foss-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/p/Pysam/Pysam-0.9.1.4-foss-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9a77cac29a1f406af02f679735052fd7319bfde2
--- /dev/null
+++ b/easybuild/easyconfigs/p/Pysam/Pysam-0.9.1.4-foss-2016b-Python-2.7.12.eb
@@ -0,0 +1,53 @@
+# 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 
+# 0.9.1.4:
+# Modified by: Adam Huffman
+# The Francis Crick Institute
+
+easyblock = 'Bundle'
+
+name = 'Pysam'
+version = '0.9.1.4'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://github.com/pysam-developers/pysam'
+description = """Pysam is a python module for reading and manipulating Samfiles. 
+ It's a lightweight wrapper of the samtools C-API. Pysam also includes an interface for tabix."""
+
+toolchain = {'name': 'foss', 'version': '2016b'}
+
+parallel = 1
+
+dependencies = [
+    ('Python', '2.7.12'),
+    ('ncurses', '6.0'),
+    ('zlib', '1.2.8'),  
+    ('cURL', '7.49.1'),  
+]
+
+# this is a bundle of Python packages
+exts_defaultclass = 'PythonPackage'
+exts_filter = ("python -c 'import %(ext_name)s'", '')
+
+exts_list = [
+    ('Cython', '0.25.1', {
+	'source_urls': ['https://pypi.python.org/packages/source/c/cython/'],
+    }),
+    ('pysam', version, {
+	'source_tmpl': 'v%(version)s.tar.gz',
+        'source_urls': ['https://github.com/pysam-developers/pysam/archive/'],
+    }),
+]
+
+modextrapaths = {
+    'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/pysam-%(version)s-py%(pyshortver)s-linux-x86_64.egg'],
+}
+
+moduleclass = 'bio'
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
index c19c8970457265734e48c582d48254519bd9c0ab..fd80fddc40f51885bb2f75b08a277357e590e513 100644
--- 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
@@ -18,7 +18,7 @@ dependencies = [
     ('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'),
+    ('Tk', '8.6.4', '-no-X11'),  # this requires a full X11 stack
     #   ('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
 ]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.10-GNU-4.9.3-2.25-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.7.10-GNU-4.9.3-2.25-bare.eb
index 094f5e83b06bb0f33397874d5ed0a5ad815fc64d..6e9aa1f7c47660e47380b7076dd42ab4a25fdf0a 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.10-GNU-4.9.3-2.25-bare.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.10-GNU-4.9.3-2.25-bare.eb
@@ -18,7 +18,7 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '5.9'),
     ('SQLite', '3.8.10.2'),
-    ('Tk', '8.6.4', '-no-X11'),
+    ('Tk', '8.6.4', '-no-X11'),  # this requires a full X11 stack
     #   ('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
 ]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.10-foss-2015a.eb b/easybuild/easyconfigs/p/Python/Python-2.7.10-foss-2015a.eb
index 2110e24871ad60fa20c219404a6e3267868524df..f325e4238c084f9bbcb9daf528289518580225d8 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.10-foss-2015a.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.10-foss-2015a.eb
@@ -21,7 +21,7 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '5.9'),
     ('SQLite', '3.8.10.2'),
-    ('Tk', '8.6.4', '-no-X11'),
+    ('Tk', '8.6.4', '-no-X11'),  # this requires a full X11 stack
     ('GMP', '6.0.0a', '', ('GCC', '4.9.2')),  # required for pycrypto
     #   ('OpenSSL', '1.0.1m'),  # 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
@@ -67,7 +67,8 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.22', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
+        'source_tmpl': 'cython-%(version)s.tar.gz',
     }),
     ('six', '1.9.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.10-foss-2015b.eb b/easybuild/easyconfigs/p/Python/Python-2.7.10-foss-2015b.eb
index 76db705ebd43c5cb0af06dbf7336ff68a6cd2fad..1ba18083e712967aac8c27f4a69400d4d60b3289 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.10-foss-2015b.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.10-foss-2015b.eb
@@ -21,7 +21,7 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '5.9'),
     ('SQLite', '3.8.10.2'),
-    ('Tk', '8.6.4', '-no-X11'),
+    ('Tk', '8.6.4', '-no-X11'),  # this requires a full X11 stack
     ('GMP', '6.0.0a', '', ('GNU', '4.9.3-2.25')),  # required for pycrypto
     #   ('OpenSSL', '1.0.1m'),  # 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
@@ -67,7 +67,8 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.22', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
+        'source_tmpl': 'cython-%(version)s.tar.gz',
     }),
     ('six', '1.9.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.10-gimkl-2.11.5.eb b/easybuild/easyconfigs/p/Python/Python-2.7.10-gimkl-2.11.5.eb
index a5549be2988dac0021bea2cddf1a5771f2aaac77..e615c893547f7581d6d0ea217240b46b5298f574 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.10-gimkl-2.11.5.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.10-gimkl-2.11.5.eb
@@ -21,7 +21,7 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '5.9'),
     ('SQLite', '3.8.10.2'),
-    ('Tk', '8.6.4', '-no-X11'),
+    ('Tk', '8.6.4', '-no-X11'),  # this requires a full X11 stack
     #   ('OpenSSL', '1.0.1m'),  # 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
 ]
@@ -66,7 +66,8 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.22', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
+        'source_tmpl': 'cython-%(version)s.tar.gz',
     }),
     ('six', '1.9.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.10-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-2.7.10-goolf-1.4.10.eb
index 1156ffc2af46661292bc90d9725cd9ae06ccf773..7d445cd6ba97ba7c57b211b7ef67ea2b5e60912e 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.10-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.10-goolf-1.4.10.eb
@@ -21,7 +21,7 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '5.9'),
     ('SQLite', '3.8.10.2'),
-    ('Tk', '8.6.4', '-no-X11'),
+    ('Tk', '8.6.4', '-no-X11'),  # this requires a full X11 stack
     ('GMP', '6.0.0a', '', ('GCC', '4.7.2')),  # required for pycrypto
     #   ('OpenSSL', '1.0.1m'),  # 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
@@ -67,7 +67,8 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.22', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
+        'source_tmpl': 'cython-%(version)s.tar.gz',
     }),
     ('six', '1.9.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.10-goolf-1.7.20.eb b/easybuild/easyconfigs/p/Python/Python-2.7.10-goolf-1.7.20.eb
index 56b2274143f301040e8858e71cff60578c8af7b2..55f10df08f8cecd11049a2dd1f1ce546742abd20 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.10-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.10-goolf-1.7.20.eb
@@ -21,7 +21,7 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '5.9'),
     ('SQLite', '3.8.10.2'),
-    ('Tk', '8.6.4', '-no-X11'),
+    ('Tk', '8.6.4', '-no-X11'),  # this requires a full X11 stack
     ('GMP', '6.0.0a', '', ('GCC', '4.8.4')),  # required for pycrypto
     #   ('OpenSSL', '1.0.1m'),  # 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
@@ -67,7 +67,8 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.22', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
+        'source_tmpl': 'cython-%(version)s.tar.gz',
     }),
     ('six', '1.9.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.10-intel-2015a.eb b/easybuild/easyconfigs/p/Python/Python-2.7.10-intel-2015a.eb
index 2661d5c96a779fadeb6fd65af456eaf45aa0aac1..017e1ecaae37816c1851bad94eee84625e6283db 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.10-intel-2015a.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.10-intel-2015a.eb
@@ -21,7 +21,7 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '5.9'),
     ('SQLite', '3.8.10.2'),
-    ('Tk', '8.6.4', '-no-X11'),
+    ('Tk', '8.6.4', '-no-X11'),  # this requires a full X11 stack
     ('GMP', '6.0.0a', '', ('GCC', '4.9.2')),  # required for pycrypto
     #   ('OpenSSL', '1.0.1m'),  # 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
@@ -67,7 +67,8 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.22', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
+        'source_tmpl': 'cython-%(version)s.tar.gz',
     }),
     ('six', '1.9.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.10-intel-2015b.eb b/easybuild/easyconfigs/p/Python/Python-2.7.10-intel-2015b.eb
index 94c61afabcb5d86a3a178d1a125564ec96ec188f..276aa8a0f36f3b5512cd64fcca87869f10ab6291 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.10-intel-2015b.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.10-intel-2015b.eb
@@ -21,7 +21,7 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '5.9'),
     ('SQLite', '3.8.10.2'),
-    ('Tk', '8.6.4', '-no-X11'),
+    ('Tk', '8.6.4', '-no-X11'),  # this requires a full X11 stack
     #   ('OpenSSL', '1.0.1m'),  # 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
 ]
@@ -66,7 +66,8 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.22', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
+        'source_tmpl': 'cython-%(version)s.tar.gz',
     }),
     ('six', '1.9.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.11-CrayGNU-2015.11.eb b/easybuild/easyconfigs/p/Python/Python-2.7.11-CrayGNU-2015.11.eb
index 9a52c8f87de7c0c5ed82bfc3e31d566c36c92d13..d69b594b089801a7bd59378bb50da618d38a2fda 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.11-CrayGNU-2015.11.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.11-CrayGNU-2015.11.eb
@@ -26,7 +26,7 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '5.9'),
     ('SQLite', '3.9.2'),
-    ('Tk', '8.6.4', '-no-X11'), 
+    ('Tk', '8.6.4', '-no-X11'),  # this requires a full X11 stack 
     ('GMP', '6.1.0'),
 ]
 
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.11-CrayGNU-2016.03.eb b/easybuild/easyconfigs/p/Python/Python-2.7.11-CrayGNU-2016.03.eb
index 99f60636cbab3f4770cbb3276ed290c18fa5fbc5..ab13993dcf3d948857fd3edf0ea84defe533da8a 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.11-CrayGNU-2016.03.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.11-CrayGNU-2016.03.eb
@@ -26,7 +26,7 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '6.0'),
     ('SQLite', '3.9.2'),
-    ('Tk', '8.6.4', '-no-X11'), 
+    ('Tk', '8.6.4', '-no-X11'),  # this requires a full X11 stack 
     ('GMP', '6.1.0'),
 ]
 
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.11-GCC-4.9.3-2.25-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.7.11-GCC-4.9.3-2.25-bare.eb
index 895d73b12812161ba0da64981aaf3b314695d6f9..78953148b07d0b7ce8e840e283640a66e9de5f00 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.11-GCC-4.9.3-2.25-bare.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.11-GCC-4.9.3-2.25-bare.eb
@@ -19,7 +19,7 @@ dependencies = [
     ('libreadline', '6.3', '', ('GCCcore', '4.9.3')),
     ('ncurses', '6.0', '', ('GCCcore', '4.9.3')),
     ('SQLite', '3.9.2'),
-    ('Tk', '8.6.4', '-no-X11'),
+    ('Tk', '8.6.4', '-no-X11'),  # this requires a full X11 stack
     #   ('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
 ]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.11-foss-2015a.eb b/easybuild/easyconfigs/p/Python/Python-2.7.11-foss-2015a.eb
index c4aea6d0fc9fd67a01b58f823f8cab4e7a135481..c5fe86070e7d3f66c813b221f9a2f4ce09b133de 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.11-foss-2015a.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.11-foss-2015a.eb
@@ -21,7 +21,7 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '5.9'),
     ('SQLite', '3.10.0'),
-    ('Tk', '8.6.4', '-no-X11'),
+    ('Tk', '8.6.4', '-no-X11'),  # this requires a full X11 stack
     ('GMP', '6.1.0'),  # required for pycrypto
     #   ('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
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
index 3e1f1e63c683f6a13b9cb92f84a1e54f21e5a111..cd19e3b9026c69ba6f6a5e731913f47eb938b85e 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.11-foss-2016a.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.11-foss-2016a.eb
@@ -21,7 +21,7 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '6.0'),
     ('SQLite', '3.9.2'),
-    ('Tk', '8.6.4', '-no-X11'),
+    ('Tk', '8.6.4', '-no-X11'),  # this requires a full X11 stack
     ('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
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.11-gimkl-2.11.5.eb b/easybuild/easyconfigs/p/Python/Python-2.7.11-gimkl-2.11.5.eb
index 5bee9397c43c552432d27651f4438d58879e4ad1..917a362739fd79c5678fd76ce1d3fa0bdc8cce76 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.11-gimkl-2.11.5.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.11-gimkl-2.11.5.eb
@@ -21,7 +21,7 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '5.9'),
     ('SQLite', '3.9.2'),
-    ('Tk', '8.6.4', '-no-X11'),
+    ('Tk', '8.6.4', '-no-X11'),  # this requires a full X11 stack
     ('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
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.11-goolf-1.7.20.eb b/easybuild/easyconfigs/p/Python/Python-2.7.11-goolf-1.7.20.eb
index 98314b77b5a9cd8beda96745dc4397cf3d28c8c0..974e57d87ccf7d6bed4132d8b6676c90eb846b24 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.11-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.11-goolf-1.7.20.eb
@@ -21,8 +21,8 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '5.9'),
     ('SQLite', '3.9.2'),
-    #('Tk', '8.6.4', '-no-X11'),
-    ('Tk', '8.6.4'),
+    #('Tk', '8.6.4', '-no-X11'),  # this requires a full X11 stack
+    ('Tk', '8.6.4'),  # this requires a full X11 stack
     ('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
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 71a4890e4705fb727f25a97513e903ab16116101..fa2f05cdb99f521fc1e8fead8461872d3c14e45b 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
@@ -21,7 +21,7 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '5.9'),
     ('SQLite', '3.9.2'),
-    ('Tk', '8.6.4', '-no-X11'),
+    ('Tk', '8.6.4', '-no-X11'),  # this requires a full X11 stack
     ('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
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.11-intel-2016.02-GCC-4.9.eb b/easybuild/easyconfigs/p/Python/Python-2.7.11-intel-2016.02-GCC-4.9.eb
index bb7d002230ca8db62b3e890b4bf5888fabbde878..914f184b700fba5cf55706ed96bb8eaaf4f052d2 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.11-intel-2016.02-GCC-4.9.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.11-intel-2016.02-GCC-4.9.eb
@@ -21,7 +21,7 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '6.0'),
     ('SQLite', '3.9.2'),
-    ('Tk', '8.6.4', '-no-X11'),
+    ('Tk', '8.6.4', '-no-X11'),  # this requires a full X11 stack
     ('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
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
index 8ab42a8b9f0ba35dafb531679c1ca11fd8de7849..711240b058aa2e3cc29a758de72c54d476383e1a 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.11-intel-2016a.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.11-intel-2016a.eb
@@ -21,7 +21,7 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '6.0'),
     ('SQLite', '3.9.2'),
-    ('Tk', '8.6.4', '-no-X11'),
+    ('Tk', '8.6.4', '-no-X11'),  # this requires a full X11 stack
     ('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
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.12-GCC-5.4.0-2.26-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.7.12-GCC-5.4.0-2.26-bare.eb
new file mode 100644
index 0000000000000000000000000000000000000000..abfcbbf934634e4ace5d77d23dfee715d6e5bd50
--- /dev/null
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.12-GCC-5.4.0-2.26-bare.eb
@@ -0,0 +1,31 @@
+name = 'Python'
+version = '2.7.12'
+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': '5.4.0-2.26'}
+toolchainopts = {'pic': True}
+
+source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
+sources = [SOURCE_TGZ]
+
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.8'),
+    ('libreadline', '6.3'),
+    ('ncurses', '6.0'),
+    ('SQLite', '3.13.0'),
+    ('Tk', '8.6.5'),  # this requires a full X11 stack
+    ('GMP', '6.1.1'),
+    ('libffi', '3.2.1'),
+    # 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.2h'),
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.12-GCCcore-4.9.3-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.7.12-GCCcore-4.9.3-bare.eb
new file mode 100644
index 0000000000000000000000000000000000000000..62cd674cc5b11902dc649594835e9667c198ba26
--- /dev/null
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.12-GCCcore-4.9.3-bare.eb
@@ -0,0 +1,37 @@
+name = 'Python'
+version = '2.7.12'
+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': 'GCCcore', 'version': '4.9.3'}
+toolchainopts = {'pic': True}
+
+source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
+sources = [SOURCE_TGZ]
+
+builddependencies = [
+    ('binutils', '2.25'),
+]
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('bzip2', '1.0.6'),
+    ('libreadline', '6.3'),
+    ('ncurses', '6.0'),
+    ('SQLite', '3.14.1'),
+    #   ('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', 'libopenssl-devel')]
+
+# We hide this by default since users should not use it in production, high-performance Python should be delivered at
+# compiler level with a default extension set
+#hidden = True
+
+# bare installation: only known module deps for GCCcore tools included
+exts_list =[]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.12-foss-2016b.eb b/easybuild/easyconfigs/p/Python/Python-2.7.12-foss-2016b.eb
index 8bb576da7d5d1bbe9d9f6dbf33f13fa78fd6eda6..ba6ada1467237aadd0d98828506e50c9df09c353 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.12-foss-2016b.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.12-foss-2016b.eb
@@ -18,7 +18,7 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '6.0'),
     ('SQLite', '3.13.0'),
-    ('Tk', '8.6.5'),
+    ('Tk', '8.6.5'),  # this requires a full X11 stack
     ('GMP', '6.1.1'),
     ('libffi', '3.2.1'),
     # OS dependency should be preferred if the os version is more recent then this version,
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.12-intel-2016b.eb b/easybuild/easyconfigs/p/Python/Python-2.7.12-intel-2016b.eb
index e77dca81729da570931c589ec1ff4425ee8029c5..f39ab1c05674d776d582c462884cdb54b6e8a21c 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.12-intel-2016b.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.12-intel-2016b.eb
@@ -18,7 +18,7 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '6.0'),
     ('SQLite', '3.13.0'),
-    ('Tk', '8.6.5'),
+    ('Tk', '8.6.5'),  # this requires a full X11 stack
     ('GMP', '6.1.1'),
     ('libffi', '3.2.1'),
     # OS dependency should be preferred if the os version is more recent then this version,
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-foss-2015b.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-foss-2015b.eb
index 7bff359058f43cd65ee21d95630b9dfac5e985f9..c93dab2804d6cb744950e58678dedee6163e9b56 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-foss-2015b.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-foss-2015b.eb
@@ -57,7 +57,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.17.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.1.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb
index b20ffd67fb5a575df71ea292f4311d513348378b..53cdae92ab860f1520daa0dcf5adbc905e1de3d1 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb
@@ -57,7 +57,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.17.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.1.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.5.14.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.5.14.eb
index e087117a23517b8593e77efc650e6d5ab0885944..4cd83e24d0f4f969bca9df91ed373f3813d24834 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.5.14.eb
@@ -57,7 +57,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.17.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.1.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb
index 65a7050c90012aff70fd707e967d49c12fdf221f..2608210a179afdb4d3b1bef1a2d58ac585adfda2 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb
@@ -55,7 +55,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.17.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.1.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb
index caf683b0c800a39ac4c46a2ed461893496c59dfa..4ffdd56f7800b9dc5fe39837cf155cc71df044b6 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb
@@ -55,7 +55,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.17.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.1.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-intel-2015a.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-intel-2015a.eb
index a68ef18929ba692311f25818eb3b4ee67222dba0..35bbb975535d761680a4fbeb9aaa492d999190e1 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-intel-2015a.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-intel-2015a.eb
@@ -55,7 +55,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.17.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.1.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb
index 577653d1f500a18b89a14dd896c88ae5e42f1961..d2f51e3f225383ac22796fe0120c29b86eb84b48 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb
@@ -58,7 +58,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.17.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.1.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb
index 33dce6f6ca70c4d163a55494fbf6981104a7e7e4..c0ac0d38b167ed567979672a19c5672e53a35e19 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb
@@ -58,7 +58,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.17.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.1.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb
index 0a01b973a0d04f9d8e749f177468080d522ea9de..513384d5b56bc8f6840351d13429524f1ddfafb8 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb
@@ -58,7 +58,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.17.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.1.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb
index bccfcbf0c220159d4884b052b8db0902e5103c5c..95ff34f3f9c16d4f92b6b515b58e529aa605393c 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb
@@ -57,7 +57,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.19.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.4.1', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb
index a51d51c98601d8e4aa4dde8345eadbd9f37cc522..055543dc247f6c4468e7ca6846a42848857008e2 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb
@@ -60,7 +60,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.19.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.4.1', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.8-foss-2014b.eb b/easybuild/easyconfigs/p/Python/Python-2.7.8-foss-2014b.eb
index 16590efbbd1082d005bcc7366f17bb28f2fb5612..0409f54975348bd1829001623869731240213a96 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.8-foss-2014b.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.8-foss-2014b.eb
@@ -57,7 +57,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.20.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.7.3', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.8-goolf-1.5.14.eb b/easybuild/easyconfigs/p/Python/Python-2.7.8-goolf-1.5.14.eb
index c8491023d824a0fcc9f8df18b857d9996fc9d82a..2a90fee410794f5472b4c01a1c78db08ab1183f0 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.8-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.8-goolf-1.5.14.eb
@@ -66,7 +66,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.20.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('dateutil', '2.2', {
         'source_tmpl': 'python-%(name)s-%(version)s.tar.gz',
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.8-ictce-7.1.2.eb b/easybuild/easyconfigs/p/Python/Python-2.7.8-ictce-7.1.2.eb
index a7caba4faefa586132a5cf7a48abbfb0b1d111ea..d975d85c2d94c09a0ea9204032b84d4f49994824 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.8-ictce-7.1.2.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.8-ictce-7.1.2.eb
@@ -67,7 +67,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.20.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.7.3', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.8-intel-2014.06.eb b/easybuild/easyconfigs/p/Python/Python-2.7.8-intel-2014.06.eb
index dfe5979c7c5be91e27fee21819b96e4ba29932b4..dca27371ed7ee6aca17c27df12cd50399816331a 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.8-intel-2014.06.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.8-intel-2014.06.eb
@@ -64,7 +64,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.20.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.7.3', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.8-intel-2014b.eb b/easybuild/easyconfigs/p/Python/Python-2.7.8-intel-2014b.eb
index 54121e1a6fb6163021e9322e44f936839b68a2fa..a7d56bba1649ef4c244ff86e1dd958201539f86f 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.8-intel-2014b.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.8-intel-2014b.eb
@@ -64,7 +64,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.20.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.7.3', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.8-intel-2015a.eb b/easybuild/easyconfigs/p/Python/Python-2.7.8-intel-2015a.eb
index 012b08cef627b9559ee0ebc3552e7fc9b8ebc540..6b2fccea289c94605fb2568bf089930788156a6b 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.8-intel-2015a.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.8-intel-2015a.eb
@@ -61,7 +61,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.20.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.7.3', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.9-CrayGNU-2015.06.eb b/easybuild/easyconfigs/p/Python/Python-2.7.9-CrayGNU-2015.06.eb
index 21613bcfb7b1f115bba75831af9747b1f6e81e94..2c98486b9278bd013e550fc5097f3dbf4141222b 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.9-CrayGNU-2015.06.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.9-CrayGNU-2015.06.eb
@@ -64,7 +64,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.21.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.9.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.9-CrayGNU-2015.11.eb b/easybuild/easyconfigs/p/Python/Python-2.7.9-CrayGNU-2015.11.eb
index 995830889256293017fc2801333def200068bdfc..23449c08344b745ab07671f6003efe17ff6cbdca 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.9-CrayGNU-2015.11.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.9-CrayGNU-2015.11.eb
@@ -64,7 +64,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.21.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.9.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.9-GCC-4.8.4-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.7.9-GCC-4.8.4-bare.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c83dff187b29fb8cd1c5af5288e12872b6480914
--- /dev/null
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.9-GCC-4.8.4-bare.eb
@@ -0,0 +1,31 @@
+name = 'Python'
+version = '2.7.9'
+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.8.4'}
+toolchainopts = {'pic': 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'),
+    ('ncurses', '5.9'),
+    ('SQLite', '3.8.8.1'),
+    ('Tk', '8.6.3', '-no-X11'),  # this requires a full X11 stack
+    #('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.9-GCC-4.9.2-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.7.9-GCC-4.9.2-bare.eb
index 3b6c965221828caceed13fe34a8a081458be763a..a2e4addace20b764cda53531311ae544a52539bd 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.9-GCC-4.9.2-bare.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.9-GCC-4.9.2-bare.eb
@@ -18,7 +18,7 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '5.9'),
     ('SQLite', '3.8.8.1'),
-    ('Tk', '8.6.3', '-no-X11'),
+    ('Tk', '8.6.3', '-no-X11'),  # this requires a full X11 stack
     #   ('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
 ]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.9-foss-2015.05.eb b/easybuild/easyconfigs/p/Python/Python-2.7.9-foss-2015.05.eb
index 75386ccc4ae440fdd476204f4c3bac846ed86504..5ca1dda84ebf4921cc24b0bb1e3ecf64c7d3da76 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.9-foss-2015.05.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.9-foss-2015.05.eb
@@ -20,7 +20,7 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '5.9'),
     ('SQLite', '3.8.8.1'),
-    ('Tk', '8.6.3', '-no-X11'),
+    ('Tk', '8.6.3', '-no-X11'),  # this requires a full X11 stack
     #   ('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
 ]
@@ -64,7 +64,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.21.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.9.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.9-foss-2015a-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.7.9-foss-2015a-bare.eb
index a04b4992d3845721e9864bf8d50cb8c820db2ecb..e9063410dfeec2b3c5d8c206c2e47b6735d06fe9 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.9-foss-2015a-bare.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.9-foss-2015a-bare.eb
@@ -18,7 +18,7 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '5.9'),
     ('SQLite', '3.8.8.1'),
-    ('Tk', '8.6.3', '-no-X11'),
+    ('Tk', '8.6.3', '-no-X11'),  # this requires a full X11 stack
     #   ('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
 ]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.9-foss-2015a.eb b/easybuild/easyconfigs/p/Python/Python-2.7.9-foss-2015a.eb
index 4d8258d2814dbe834747b4bb981629fdccda846c..b636f6b2ef65feaf08d11a7020afa201bb16d9dc 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.9-foss-2015a.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.9-foss-2015a.eb
@@ -20,7 +20,7 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '5.9'),
     ('SQLite', '3.8.8.1'),
-    ('Tk', '8.6.3', '-no-X11'),
+    ('Tk', '8.6.3', '-no-X11'),  # this requires a full X11 stack
     #   ('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
 ]
@@ -64,7 +64,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.21.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.9.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.9-foss-2015b.eb b/easybuild/easyconfigs/p/Python/Python-2.7.9-foss-2015b.eb
index 81bfd4da015806761f8fba3af718cd1078262272..82282d02d9c59b7288f88b1ce95ff78f21429ccf 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.9-foss-2015b.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.9-foss-2015b.eb
@@ -20,7 +20,7 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '5.9'),
     ('SQLite', '3.8.8.1'),
-    ('Tk', '8.6.3', '-no-X11'),
+    ('Tk', '8.6.3', '-no-X11'),  # this requires a full X11 stack
 #   ('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
 ]
@@ -64,7 +64,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.21.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.9.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.9-gompi-1.5.16-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.7.9-gompi-1.5.16-bare.eb
index e8eb88c738b8515c0acdd92406529736f5761d62..c78274679f6a502ace6591f31b60967423a4895c 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.9-gompi-1.5.16-bare.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.9-gompi-1.5.16-bare.eb
@@ -17,7 +17,7 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '5.9'),
     ('SQLite', '3.8.8.1'),
-    ('Tk', '8.6.3', '-no-X11'),
+    ('Tk', '8.6.3', '-no-X11'),  # this requires a full X11 stack
     #   ('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
 ]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.9-goolf-1.5.14.eb b/easybuild/easyconfigs/p/Python/Python-2.7.9-goolf-1.5.14.eb
index 7739e8b255f28286877c996601b1401b193d72bf..987f0852f63aeadfb8be7fa65388f8638c396336 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.9-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.9-goolf-1.5.14.eb
@@ -20,7 +20,7 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '5.9'),
     ('SQLite', '3.8.8.1'),
-    ('Tk', '8.6.3', '-no-X11'),
+    ('Tk', '8.6.3', '-no-X11'),  # this requires a full X11 stack
     #   ('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
 ]
@@ -64,7 +64,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.21.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.9.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.9-goolf-1.5.16.eb b/easybuild/easyconfigs/p/Python/Python-2.7.9-goolf-1.5.16.eb
index 70860e49fae83bae772200301bb1c9ac2afe26f4..37abf12093b638069fb0196b2261d71c61207510 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.9-goolf-1.5.16.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.9-goolf-1.5.16.eb
@@ -20,7 +20,7 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '5.9'),
     ('SQLite', '3.8.8.1'),
-    ('Tk', '8.6.3', '-no-X11'),
+    ('Tk', '8.6.3', '-no-X11'),  # this requires a full X11 stack
 #    ('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
 ]
@@ -64,7 +64,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.21.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.9.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.9-goolf-1.7.20.eb b/easybuild/easyconfigs/p/Python/Python-2.7.9-goolf-1.7.20.eb
index 41e6d0cc85a0022e8ea63d0e19670a50af085be3..7bdd55756a3bea354c50eb16cead6dc8314a6128 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.9-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.9-goolf-1.7.20.eb
@@ -20,7 +20,7 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '5.9'),
     ('SQLite', '3.8.8.1'),
-    ('Tk', '8.6.3', '-no-X11'),
+    ('Tk', '8.6.3', '-no-X11'),  # this requires a full X11 stack
     #('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
 ]
@@ -64,7 +64,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.21.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.9.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.9-intel-2015a-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.7.9-intel-2015a-bare.eb
index f327891d4e89bb2eac7544a33b0072fb19e7b9ae..c672a429fd7839f1081602d1c9aa0105c75aefbd 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.9-intel-2015a-bare.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.9-intel-2015a-bare.eb
@@ -18,7 +18,7 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '5.9'),
     ('SQLite', '3.8.8.1'),
-    ('Tk', '8.6.3', '-no-X11'),
+    ('Tk', '8.6.3', '-no-X11'),  # this requires a full X11 stack
     #   ('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
 ]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.9-intel-2015a.eb b/easybuild/easyconfigs/p/Python/Python-2.7.9-intel-2015a.eb
index 188046b96972413bb51af944e7b138d6b414e563..24081c5cf8cd659ccc7f85ef90ab0dc64dc1c0e8 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.9-intel-2015a.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.9-intel-2015a.eb
@@ -20,7 +20,7 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '5.9'),
     ('SQLite', '3.8.8.1'),
-    ('Tk', '8.6.3', '-no-X11'),
+    ('Tk', '8.6.3', '-no-X11'),  # this requires a full X11 stack
     #   ('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
 ]
@@ -65,7 +65,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.21.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.9.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
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 98e26ec9ef9e2640d46dee45dde04b8860cec7a9..fc5033662d8a96ec9887f5b14c299ec6a7fbbad3 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
@@ -49,7 +49,7 @@ exts_list = [
         'source_urls': ['http://bitbucket.org/mpi4py/mpi4py/downloads/'],
     }),
     ('Cython', '0.19.1', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('deap', '0.9.1', {
         'source_urls': ['https://pypi.python.org/packages/source/d/deap/'],
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 4bc546cccb224feaeff993eaddb52f7136206643..1fe945390aa2e1dd00c7315e29103136c803670a 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
@@ -49,7 +49,7 @@ exts_list = [
         'source_urls': ['http://bitbucket.org/mpi4py/mpi4py/downloads/'],
     }),
     ('Cython', '0.19.1', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('deap', '0.9.1', {
         'source_urls': ['https://pypi.python.org/packages/source/d/deap/'],
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 66630e998024756b4c660470994c00aa39f69aa8..ba9c2f40b215f23b21e3e540c5788b9642ac80e3 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
@@ -66,7 +66,7 @@ exts_list = [
         'checksums': ['ce61468d4c1263e3005737bbed2641f0'],
     }),
     ('Cython', '0.20.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.7.3', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
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 d93f95e46a11c395573086dbc367b1b4ae459b4e..910cb21e5cf0a7003b352fee17cfbc94d01fa9c5 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
@@ -66,7 +66,7 @@ exts_list = [
         'checksums': ['ce61468d4c1263e3005737bbed2641f0'],
     }),
     ('Cython', '0.20.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.7.3', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
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 f8a3851092f9de828685b73cb6076653b39571ab..8f08cf73e46a4cf26573fed8045f552886a425ed 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
@@ -63,7 +63,8 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.22', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
+        'source_tmpl': 'cython-%(version)s.tar.gz',
     }),
     ('six', '1.9.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
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 6b562baa0c5a440a364a9665f8b470d3b6713b5a..825c8e6b10acc1a20d3bd1204053a834129f1d6e 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
@@ -20,7 +20,7 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '5.9'),
     ('SQLite', '3.9.2'),
-    ('Tk', '8.6.4', '-no-X11'),
+    ('Tk', '8.6.4', '-no-X11'),  # this requires a full X11 stack
     ('GMP', '6.1.0'),
     #   ('OpenSSL', '1.0.1p'),  # 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
@@ -66,7 +66,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.23.2', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.9.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-3.5.1-foss-2016a.eb b/easybuild/easyconfigs/p/Python/Python-3.5.1-foss-2016a.eb
index c11711336fab9a27acfda522da1aee2e14e1959b..129c326cbbd9b44389316069cf5ac5a2ad3940ad 100644
--- a/easybuild/easyconfigs/p/Python/Python-3.5.1-foss-2016a.eb
+++ b/easybuild/easyconfigs/p/Python/Python-3.5.1-foss-2016a.eb
@@ -20,7 +20,7 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '6.0'),
     ('SQLite', '3.9.2'),
-    ('Tk', '8.6.4', '-no-X11'),
+    ('Tk', '8.6.4', '-no-X11'),  # this requires a full X11 stack
     ('GMP', '6.1.0'),
     ('XZ', '5.2.2'),
 #   ('OpenSSL', '1.0.1q'),  # OS dependency should be preferred if the os version is more recent then this version, it's
@@ -66,7 +66,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.23.4', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.10.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-3.5.1-intel-2016a.eb b/easybuild/easyconfigs/p/Python/Python-3.5.1-intel-2016a.eb
index f0600eefc0fcfb7da096b2802d560121632bc252..395e40515b102c6def7ff6326907eafd508bc59d 100644
--- a/easybuild/easyconfigs/p/Python/Python-3.5.1-intel-2016a.eb
+++ b/easybuild/easyconfigs/p/Python/Python-3.5.1-intel-2016a.eb
@@ -20,7 +20,7 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '6.0'),
     ('SQLite', '3.9.2'),
-    ('Tk', '8.6.4', '-no-X11'),
+    ('Tk', '8.6.4', '-no-X11'),  # this requires a full X11 stack
     ('GMP', '6.1.0'),
     ('XZ', '5.2.2'),
 #   ('OpenSSL', '1.0.1q'),  # OS dependency should be preferred if the os version is more recent then this version, it's
@@ -70,7 +70,7 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
     }),
     ('Cython', '0.23.4', {
-        'source_urls': ['http://www.cython.org/release/'],
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cython/'],
     }),
     ('six', '1.10.0', {
         'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-3.5.2-foss-2016.04.eb b/easybuild/easyconfigs/p/Python/Python-3.5.2-foss-2016.04.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f49b2ff08519ec0a3549129deefd04a9d163b443
--- /dev/null
+++ b/easybuild/easyconfigs/p/Python/Python-3.5.2-foss-2016.04.eb
@@ -0,0 +1,123 @@
+name = 'Python'
+version = '3.5.2'
+
+homepage = 'http://python.org/'
+description = """Python is a programming language that lets you work more quickly
+ and integrate your systems more effectively."""
+
+toolchain = {'name': 'foss', 'version': '2016.04'}
+toolchainopts = {'pic': 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'),
+    ('ncurses', '6.0'),
+    ('SQLite', '3.13.0'),
+    ('Tk', '8.6.5'),  # this requires a full X11 stack
+    ('GMP', '6.1.1'),
+    ('XZ', '5.2.2'),
+    ('libffi', '3.2.1'),
+    # 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.2h'),
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
+
+# order is important!
+# package versions updated May 28th 2015
+exts_list = [
+    ('setuptools', '23.1.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/s/setuptools/'],
+    }),
+    ('pip', '8.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', '1.11.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/n/numpy'],
+        'patches': ['numpy-1.8.0-mkl.patch'],
+    }),
+    ('scipy', '0.17.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/s/scipy'],
+    }),
+    ('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/'],
+        'patches': [
+            'paycheck-1.0.2_setup-open-README-utf8.patch',
+        ],
+    }),
+    ('pbr', '1.10.0', {
+        '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.24', {
+        'source_urls': ['https://pypi.python.org/packages/source/c/cython/'],
+    }),
+    ('six', '1.10.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
+    }),
+    ('dateutil', '2.5.3', {
+        '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/'],
+        'patches': [
+            'deap-1.0.2_setup-open-README-utf8.patch',
+        ],
+    }),
+    ('decorator', '4.0.10', {
+        '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/'],
+    }),
+    ('cryptography', '1.4', {
+        'source_urls': ['https://pypi.python.org/packages/source/c/cryptography/'],
+    }),
+    ('paramiko', '2.0.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'],
+    }),
+    ('pyparsing', '2.1.5', {
+        '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'],
+    }),
+    ('pandas', '0.18.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pandas'],
+    }),
+    ('virtualenv', '15.0.2', {
+        'source_urls': ['https://pypi.python.org/packages/source/v/virtualenv'],
+    }),
+]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-3.5.2-foss-2016b.eb b/easybuild/easyconfigs/p/Python/Python-3.5.2-foss-2016b.eb
index a637288eb8fb5a0c82479c5108490743944921a0..f40c4aab551a331325e3f14f233d4673bd4a6ae4 100644
--- a/easybuild/easyconfigs/p/Python/Python-3.5.2-foss-2016b.eb
+++ b/easybuild/easyconfigs/p/Python/Python-3.5.2-foss-2016b.eb
@@ -18,7 +18,7 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '6.0'),
     ('SQLite', '3.13.0'),
-    ('Tk', '8.6.5'),
+    ('Tk', '8.6.5'),  # this requires a full X11 stack
     ('GMP', '6.1.1'),
     ('XZ', '5.2.2'),
     ('libffi', '3.2.1'),
@@ -56,6 +56,9 @@ exts_list = [
     }),
     ('paycheck', '1.0.2', {
         'source_urls': ['https://pypi.python.org/packages/source/p/paycheck/'],
+        'patches': [
+            'paycheck-1.0.2_setup-open-README-utf8.patch',
+        ],
     }),
     ('pbr', '1.10.0', {
         'source_urls': ['https://pypi.python.org/packages/source/p/pbr/'],
@@ -76,6 +79,9 @@ exts_list = [
     ('deap', '1.0.2', {
         'source_tmpl': '%(name)s-%(version)s.post2.tar.gz',
         'source_urls': ['https://pypi.python.org/packages/source/d/deap/'],
+        'patches': [
+            'deap-1.0.2_setup-open-README-utf8.patch',
+        ],
     }),
     ('decorator', '4.0.10', {
         'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
diff --git a/easybuild/easyconfigs/p/Python/Python-3.5.2-intel-2016b.eb b/easybuild/easyconfigs/p/Python/Python-3.5.2-intel-2016b.eb
index 46d7ae7573d22e6961a27876aa589bd689daddca..805061ab30b31af53ad2e6564cfa0550060d6e4f 100644
--- a/easybuild/easyconfigs/p/Python/Python-3.5.2-intel-2016b.eb
+++ b/easybuild/easyconfigs/p/Python/Python-3.5.2-intel-2016b.eb
@@ -18,7 +18,7 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '6.0'),
     ('SQLite', '3.13.0'),
-    ('Tk', '8.6.5'),
+    ('Tk', '8.6.5'),  # this requires a full X11 stack
     ('GMP', '6.1.1'),
     ('XZ', '5.2.2'),
     ('libffi', '3.2.1'),
@@ -56,6 +56,9 @@ exts_list = [
     }),
     ('paycheck', '1.0.2', {
         'source_urls': ['https://pypi.python.org/packages/source/p/paycheck/'],
+        'patches': [
+            'paycheck-1.0.2_setup-open-README-utf8.patch',
+        ],
     }),
     ('pbr', '1.10.0', {
         'source_urls': ['https://pypi.python.org/packages/source/p/pbr/'],
@@ -76,6 +79,9 @@ exts_list = [
     ('deap', '1.0.2', {
         'source_tmpl': '%(name)s-%(version)s.post2.tar.gz',
         'source_urls': ['https://pypi.python.org/packages/source/d/deap/'],
+        'patches': [
+            'deap-1.0.2_setup-open-README-utf8.patch',
+        ],
     }),
     ('decorator', '4.0.10', {
         'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
diff --git a/easybuild/easyconfigs/p/pandas/pandas-0.18.0-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/p/pandas/pandas-0.18.0-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9fd43e27cf1b1c064d6a1ea0b384e41f322409d6
--- /dev/null
+++ b/easybuild/easyconfigs/p/pandas/pandas-0.18.0-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,23 @@
+easyblock = 'PythonPackage'
+
+name = 'pandas'
+version = '0.18.0'
+versionsuffix = '-Python-%(pyver)s'
+
+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': 'foss', 'version': '2016a'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('Python', '2.7.11')]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/p/pandas/pandas-0.18.0-foss-2016a-Python-3.5.1.eb b/easybuild/easyconfigs/p/pandas/pandas-0.18.0-foss-2016a-Python-3.5.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a23b70abdac674c68b9c07ae743eac5f59e25876
--- /dev/null
+++ b/easybuild/easyconfigs/p/pandas/pandas-0.18.0-foss-2016a-Python-3.5.1.eb
@@ -0,0 +1,23 @@
+easyblock = 'PythonPackage'
+
+name = 'pandas'
+version = '0.18.0'
+versionsuffix = '-Python-%(pyver)s'
+
+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': 'foss', 'version': '2016a'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('Python', '3.5.1')]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/p/pandas/pandas-0.18.1-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/p/pandas/pandas-0.18.1-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..127a463ca2e7c8e1f17c9f5f97d360fb2d055596
--- /dev/null
+++ b/easybuild/easyconfigs/p/pandas/pandas-0.18.1-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,23 @@
+easyblock = 'PythonPackage'
+
+name = 'pandas'
+version = '0.18.1'
+versionsuffix = '-Python-%(pyver)s'
+
+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': '2016b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('Python', '2.7.12')]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/p/pandas/pandas-0.18.1-intel-2016b-Python-3.5.2.eb b/easybuild/easyconfigs/p/pandas/pandas-0.18.1-intel-2016b-Python-3.5.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..11324cd1bf1e5fcdeb47fe3dcfbf3f61b84bcbff
--- /dev/null
+++ b/easybuild/easyconfigs/p/pandas/pandas-0.18.1-intel-2016b-Python-3.5.2.eb
@@ -0,0 +1,23 @@
+easyblock = 'PythonPackage'
+
+name = 'pandas'
+version = '0.18.1'
+versionsuffix = '-Python-%(pyver)s'
+
+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': '2016b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('Python', '3.5.2')]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/p/pandas/pandas-0.19.0-foss-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/p/pandas/pandas-0.19.0-foss-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d10a536e673b74a9535fbc843d218550b106bb5c
--- /dev/null
+++ b/easybuild/easyconfigs/p/pandas/pandas-0.19.0-foss-2016b-Python-2.7.12.eb
@@ -0,0 +1,23 @@
+easyblock = 'PythonPackage'
+
+name = 'pandas'
+version = '0.19.0'
+versionsuffix = '-Python-%(pyver)s'
+
+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': 'foss', 'version': '2016b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('Python', '2.7.12')]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/p/pandas/pandas-0.19.0-foss-2016b-Python-3.5.2.eb b/easybuild/easyconfigs/p/pandas/pandas-0.19.0-foss-2016b-Python-3.5.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..66017ec4037993a827fccf7651103f13883c852a
--- /dev/null
+++ b/easybuild/easyconfigs/p/pandas/pandas-0.19.0-foss-2016b-Python-3.5.2.eb
@@ -0,0 +1,23 @@
+easyblock = 'PythonPackage'
+
+name = 'pandas'
+version = '0.19.0'
+versionsuffix = '-Python-%(pyver)s'
+
+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': 'foss', 'version': '2016b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('Python', '3.5.2')]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/p/pandas/pandas-0.19.0-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/p/pandas/pandas-0.19.0-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8829139b1b7111dfeac12dffc7a7771cf95be1c6
--- /dev/null
+++ b/easybuild/easyconfigs/p/pandas/pandas-0.19.0-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,23 @@
+easyblock = 'PythonPackage'
+
+name = 'pandas'
+version = '0.19.0'
+versionsuffix = '-Python-%(pyver)s'
+
+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': '2016b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('Python', '2.7.12')]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/p/pandas/pandas-0.19.0-intel-2016b-Python-3.5.2.eb b/easybuild/easyconfigs/p/pandas/pandas-0.19.0-intel-2016b-Python-3.5.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..823a55912c7d24fb730fb79fd80bc83781620c51
--- /dev/null
+++ b/easybuild/easyconfigs/p/pandas/pandas-0.19.0-intel-2016b-Python-3.5.2.eb
@@ -0,0 +1,23 @@
+easyblock = 'PythonPackage'
+
+name = 'pandas'
+version = '0.19.0'
+versionsuffix = '-Python-%(pyver)s'
+
+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': '2016b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('Python', '3.5.2')]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/p/pftoolsV3/pftoolsV3-20160324-foss-2016a.eb b/easybuild/easyconfigs/p/pftoolsV3/pftoolsV3-20160324-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8d5302dd6c83b5b456b349eac2d04efb40e1e2e2
--- /dev/null
+++ b/easybuild/easyconfigs/p/pftoolsV3/pftoolsV3-20160324-foss-2016a.eb
@@ -0,0 +1,22 @@
+easyblock='ConfigureMake'
+
+name = 'pftoolsV3'
+version = '20160324'
+
+homepage = 'http://web.expasy.org/pftools/'
+description = """The pftools package contains all the software necessary to build protein and DNA generalized profiles and use
+ them to scan and align sequences, and search databases.
+"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = ['%(name)s.tar.gz']
+source_urls = ['ftp://ftp.lausanne.isb-sib.ch/pub/software/unix/pftools/%(name)s/']
+checksums = ['ef1d3c7583d764cff06861fca75be455']
+
+sanity_check_paths = {
+    'files': ['bin/ptof', 'bin/htop', 'bin/6ft', 'bin/2ft', 'bin/pfdump', 'bin/pfscan', 'bin/pfsearch'],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/p/pixman/pixman-0.34.0-intel-2016b.eb b/easybuild/easyconfigs/p/pixman/pixman-0.34.0-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ae4b777250d2b4ec846f97ea6d0f5ab2dbbd8bbb
--- /dev/null
+++ b/easybuild/easyconfigs/p/pixman/pixman-0.34.0-intel-2016b.eb
@@ -0,0 +1,20 @@
+easyblock = 'ConfigureMake'
+
+name = "pixman"
+version = '0.34.0'
+
+homepage = 'http://www.pixman.org/'
+description = """Pixman is a low-level software library for pixel manipulation, providing features such as image
+compositing and trapezoid rasterization. Important users of pixman are the cairo graphics library and the X server."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['http://cairographics.org/releases/']
+sources = [SOURCE_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ['lib/libpixman-1.%s' % SHLIB_EXT],
+    'dirs': []
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/p/pkg-config/pkg-config-0.29.1-GCCcore-4.9.3.eb b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.29.1-GCCcore-4.9.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..08db3ee5e873339ed08b8df560035bf98bf4caf1
--- /dev/null
+++ b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.29.1-GCCcore-4.9.3.eb
@@ -0,0 +1,29 @@
+easyblock = 'ConfigureMake'
+
+name = 'pkg-config'
+version = '0.29.1'
+
+homepage = 'http://www.freedesktop.org/wiki/Software/pkg-config/'
+description = """pkg-config is a helper tool used when compiling applications and libraries. It helps you insert the
+ correct compiler options on the command line so an application can use
+  gcc -o test test.c `pkg-config --libs --cflags glib-2.0`
+ for instance, rather than hard-coding values on where to find glib (or other libraries)."""
+
+toolchain = {'name': 'GCCcore', 'version': '4.9.3'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://pkgconfig.freedesktop.org/releases/']
+
+builddependencies = [('binutils', '2.25')]
+
+# don't use PAX, it might break.
+tar_config_opts = True
+
+configopts = " --with-internal-glib"
+
+sanity_check_paths = {
+    'files': ['bin/pkg-config'],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/pkg-config/pkg-config-0.29.1-foss-2016b.eb b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.29.1-foss-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7e76d6460337d4492f7d841833270ab2688ab213
--- /dev/null
+++ b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.29.1-foss-2016b.eb
@@ -0,0 +1,27 @@
+easyblock = 'ConfigureMake'
+
+name = 'pkg-config'
+version = '0.29.1'
+
+homepage = 'http://www.freedesktop.org/wiki/Software/pkg-config/'
+description = """pkg-config is a helper tool used when compiling applications and libraries. It helps you insert the
+ correct compiler options on the command line so an application can use
+  gcc -o test test.c `pkg-config --libs --cflags glib-2.0`
+ for instance, rather than hard-coding values on where to find glib (or other libraries)."""
+
+toolchain = {'name': 'foss', 'version': '2016b'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://pkgconfig.freedesktop.org/releases/']
+
+# don't use PAX, it might break.
+tar_config_opts = True
+
+configopts = " --with-internal-glib"
+
+sanity_check_paths = {
+    'files': ['bin/pkg-config'],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/pkg-config/pkg-config-0.29.1-intel-2016b.eb b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.29.1-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..57705ced4aa62dd7abb01e869146e2b8cd63b268
--- /dev/null
+++ b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.29.1-intel-2016b.eb
@@ -0,0 +1,27 @@
+easyblock = 'ConfigureMake'
+
+name = 'pkg-config'
+version = '0.29.1'
+
+homepage = 'http://www.freedesktop.org/wiki/Software/pkg-config/'
+description = """pkg-config is a helper tool used when compiling applications and libraries. It helps you insert the
+ correct compiler options on the command line so an application can use
+  gcc -o test test.c `pkg-config --libs --cflags glib-2.0`
+ for instance, rather than hard-coding values on where to find glib (or other libraries)."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://pkgconfig.freedesktop.org/releases/']
+
+# don't use PAX, it might break.
+tar_config_opts = True
+
+configopts = " --with-internal-glib"
+
+sanity_check_paths = {
+    'files': ['bin/pkg-config'],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/pkgconfig/pkgconfig-1.1.0-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/p/pkgconfig/pkgconfig-1.1.0-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5be193eb6bdc9a43418dfb21cf8affecd10b3adf
--- /dev/null
+++ b/easybuild/easyconfigs/p/pkgconfig/pkgconfig-1.1.0-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,26 @@
+easyblock = 'PythonPackage'
+
+name = 'pkgconfig'
+version = '1.1.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://github.com/matze/pkgconfig'
+description = """pkgconfig is a Python module to interface with the pkg-config command line tool"""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+toolchainopts = {'usempi': True}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.12'),
+    ('pkg-config', '0.29.1'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/p/pkgconfig/pkgconfig-1.1.0-intel-2016b-Python-3.5.2.eb b/easybuild/easyconfigs/p/pkgconfig/pkgconfig-1.1.0-intel-2016b-Python-3.5.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2723e2f049a57e278b1cfcf6ca4d02081474a297
--- /dev/null
+++ b/easybuild/easyconfigs/p/pkgconfig/pkgconfig-1.1.0-intel-2016b-Python-3.5.2.eb
@@ -0,0 +1,26 @@
+easyblock = 'PythonPackage'
+
+name = 'pkgconfig'
+version = '1.1.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://github.com/matze/pkgconfig'
+description = """pkgconfig is a Python module to interface with the pkg-config command line tool"""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+toolchainopts = {'usempi': True}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '3.5.2'),
+    ('pkg-config', '0.29.1'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/p/pomkl/pomkl-2016.09.eb b/easybuild/easyconfigs/p/pomkl/pomkl-2016.09.eb
new file mode 100644
index 0000000000000000000000000000000000000000..74076e42f0edad261eac72a05846074f5bb8e9bc
--- /dev/null
+++ b/easybuild/easyconfigs/p/pomkl/pomkl-2016.09.eb
@@ -0,0 +1,20 @@
+easyblock = "Toolchain"
+
+name = 'pomkl'
+version = '2016.09'
+
+homepage = 'http://www.pgroup.com/index.htm'
+description = """Toolchain with PGI C, C++ and Fortran compilers, alongside Intel MKL & OpenMPI."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+compver = '16.7'
+gccsuff = '-GCC-5.4.0-2.26'
+
+dependencies = [
+    ('PGI', compver, gccsuff),
+    ('OpenMPI', '1.10.4', '', ('PGI', '%s%s' % (compver, gccsuff))),
+    ('imkl', '11.3.3.210', '', ('pompi', '%s' % (version))),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/p/pompi/pompi-2016.09.eb b/easybuild/easyconfigs/p/pompi/pompi-2016.09.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b83ba47007df4fd52384234739cc11340ab71ed2
--- /dev/null
+++ b/easybuild/easyconfigs/p/pompi/pompi-2016.09.eb
@@ -0,0 +1,19 @@
+easyblock = "Toolchain"
+
+name = 'pompi'
+version = '2016.09'
+pgisuffix = '-GCC-5.4.0-2.26'
+
+homepage = 'http://www.pgroup.com/index.htm'
+description = """Toolchain with PGI C, C++ and Fortran compilers, alongside OpenMPI."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+compver = '16.7'
+
+dependencies = [
+    ('PGI', compver, pgisuffix),
+    ('OpenMPI', '1.10.4', '', ('PGI', '%s%s' % (compver, pgisuffix))),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/p/protobuf-python/protobuf-python-3.0.2-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/p/protobuf-python/protobuf-python-3.0.2-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3deb45334a2f85f8443163e0b58018d33a49bbfb
--- /dev/null
+++ b/easybuild/easyconfigs/p/protobuf-python/protobuf-python-3.0.2-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,29 @@
+easyblock = 'PythonPackage'
+
+name = 'protobuf-python'
+version = '3.0.2'
+versionsuffix= '-Python-%(pyver)s'
+
+homepage = 'https://github.com/google/protobuf/'
+description = """Python Protocol Buffers runtime library."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['https://github.com/google/protobuf/archive/v%(version)s']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('protobuf', version)
+]
+
+start_dir = 'python'
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+options = {'modulename': 'google.protobuf' }
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/protobuf-python/protobuf-python-3.0.2-foss-2016a-Python-3.5.1.eb b/easybuild/easyconfigs/p/protobuf-python/protobuf-python-3.0.2-foss-2016a-Python-3.5.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..64b04ec53c33de2b066e44ce7ae2b22d0076a4d9
--- /dev/null
+++ b/easybuild/easyconfigs/p/protobuf-python/protobuf-python-3.0.2-foss-2016a-Python-3.5.1.eb
@@ -0,0 +1,29 @@
+easyblock = 'PythonPackage'
+
+name = 'protobuf-python'
+version = '3.0.2'
+versionsuffix= '-Python-%(pyver)s'
+
+homepage = 'https://github.com/google/protobuf/'
+description = """Python Protocol Buffers runtime library."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['https://github.com/google/protobuf/archive/v%(version)s']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '3.5.1'),
+    ('protobuf', version)
+]
+
+start_dir = 'python'
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+options = {'modulename': 'google.protobuf' }
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/protobuf/protobuf-3.0.2-foss-2016a.eb b/easybuild/easyconfigs/p/protobuf/protobuf-3.0.2-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..14ba425f1fd6f47f11fa6dc44dc3a4a3eb6675eb
--- /dev/null
+++ b/easybuild/easyconfigs/p/protobuf/protobuf-3.0.2-foss-2016a.eb
@@ -0,0 +1,21 @@
+easyblock = 'ConfigureMake'
+
+name = 'protobuf'
+version = '3.0.2'
+
+homepage = 'https://github.com/google/protobuf/'
+description = """Google Protocol Buffers"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['https://github.com/google/protobuf/archive/v%(version)s/']
+sources = [SOURCE_TAR_GZ]
+
+preconfigopts = "./autogen.sh &&"
+
+sanity_check_paths = {
+    'files': ['bin/protoc','lib/libprotobuf.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/py/py-1.4.31-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/p/py/py-1.4.31-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7bd9dcc8b81005297d76988a0aa6922bf9bccde8
--- /dev/null
+++ b/easybuild/easyconfigs/p/py/py-1.4.31-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,24 @@
+easyblock = "PythonPackage"
+
+name = 'py'
+version = '1.4.31'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = ' http://pylib.readthedocs.org/'
+description = """library with cross-python path, ini-parsing, io, code, log facilities"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.11'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/p/py/py-1.4.31-foss-2016a-Python-3.5.1.eb b/easybuild/easyconfigs/p/py/py-1.4.31-foss-2016a-Python-3.5.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..80574f225442b4fc3ce8fb88a083ee365497c997
--- /dev/null
+++ b/easybuild/easyconfigs/p/py/py-1.4.31-foss-2016a-Python-3.5.1.eb
@@ -0,0 +1,24 @@
+easyblock = "PythonPackage"
+
+name = 'py'
+version = '1.4.31'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = ' http://pylib.readthedocs.org/'
+description = """library with cross-python path, ini-parsing, io, code, log facilities"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('Python', '3.5.1'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/p/pyGIMLi/pyGIMLi-20160803-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/p/pyGIMLi/pyGIMLi-20160803-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..908370bc3a1e18f11f9cd6d9eac0f912d7762334
--- /dev/null
+++ b/easybuild/easyconfigs/p/pyGIMLi/pyGIMLi-20160803-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,68 @@
+easyblock = 'CMakeMake'
+
+name = 'pyGIMLi'
+version = '20160803'
+commit_id = 'a190c53'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://www.pygimli.org/'
+description = """pyGIMLi is an open-source multi-method library for solving inverse
+ and forward tasks related to geophysical problems. Written in C++ and Python,
+ it offers both efficiency and flexibility allowing you to quickly build
+ your own robust inversion applications for the geophysical problem at hand."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['https://github.com/gimli-org/gimli/archive/']
+sources = ['%s.tar.gz' % commit_id]
+
+patches = ['%(name)s-%(version)s_openblas.patch']
+
+#pyGIMLi is picky about the version of CastXML/pygccxml/pyplusplus
+#Check scripts/buildThirdParty.sh
+builddependencies = [
+    ('CMake', '3.4.3'),
+    ('CastXML', '20160617'),
+    ('pygccxml', '20160706', versionsuffix),
+    ('pyplusplus', '20160707', versionsuffix),
+]
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('matplotlib', '1.5.1', versionsuffix),
+    ('pytest', '3.0.1', versionsuffix),
+    ('Clang', '3.7.1'),
+    ('Boost', '1.60.0', versionsuffix),
+    ('zlib', '1.2.8'),
+    ('Triangle', '1.6'),
+    ('CppUnit', '1.12.1'),
+    ('SuiteSparse', '4.5.3', '-METIS-5.1.0'),
+]
+
+separate_build_dir = True
+
+configopts = '-DBOOST_ROOT=$EBROOTBOOST '
+configopts += '-DBLAS_LIBRARIES=$EBROOTOPENBLAS/lib/libopenblas.%s ' % SHLIB_EXT
+configopts += '-DLAPACK_LIBRARIES=$EBROOTOPENBLAS/lib/libopenblas.%s ' % SHLIB_EXT
+configopts += '-DCASTXML_EXECUTABLE=$EBROOTCASTXML/bin/castxml '
+configopts += '-DPYGCCXML_PATH=$EBROOTPYGCCXML/lib/python%(pyshortver)s/site-packages/ '
+configopts += '-DPYPLUSPLUS_PATH=$EBROOTPYPLUSPLUS/lib/python%(pyshortver)s/site-packages/ '
+
+buildopts = 'gimli pygimli apps'
+
+installopts = ' && mkdir -p %(installdir)s/lib/python%(pyshortver)s/site-packages '
+installopts += '&& cp -a ../gimli*/python/.  %(installdir)s/lib/python%(pyshortver)s/site-packages '
+installopts += '&& mkdir %(installdir)s/bin '
+installopts += '&& cp ../easybuild_obj/bin/*  %(installdir)s/bin'
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in ['bms2vtk', 'dc1dinv', 'dc1dsmooth', 'fdem1dinv', 'fdem1dsmooth',
+                                     'harmfit', 'invlinearmat', 'mrs1dblock', 'mrs1dsmooth',
+                                     'mt1dinv', 'mt1dsmooth', 'polyfit', 'ttinv', 'ttmod']]+
+             ['lib/libgimli.%s' % SHLIB_EXT, 'lib/python%(pyshortver)s/site-packages/pygimli.h'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/%(namelower)s'],
+}
+
+modextrapaths = {'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages'}
+
+moduleclass = 'geo'
diff --git a/easybuild/easyconfigs/p/pyGIMLi/pyGIMLi-20160803-foss-2016a-Python-3.5.1.eb b/easybuild/easyconfigs/p/pyGIMLi/pyGIMLi-20160803-foss-2016a-Python-3.5.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..bf649cda81c20497028cda994d98f1ee73e4efe5
--- /dev/null
+++ b/easybuild/easyconfigs/p/pyGIMLi/pyGIMLi-20160803-foss-2016a-Python-3.5.1.eb
@@ -0,0 +1,68 @@
+easyblock = 'CMakeMake'
+
+name = 'pyGIMLi'
+version = '20160803'
+commit_id = 'a190c53'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://www.pygimli.org/'
+description = """pyGIMLi is an open-source multi-method library for solving inverse
+ and forward tasks related to geophysical problems. Written in C++ and Python,
+ it offers both efficiency and flexibility allowing you to quickly build
+ your own robust inversion applications for the geophysical problem at hand."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['https://github.com/gimli-org/gimli/archive/']
+sources = ['%s.tar.gz' % commit_id]
+
+patches = ['%(name)s-%(version)s_openblas.patch']
+
+#pyGIMLi is picky about the version of CastXML/pygccxml/pyplusplus
+#Check scripts/buildThirdParty.sh
+builddependencies = [
+    ('CMake', '3.4.3'),
+    ('CastXML', '20160617'),
+    ('pygccxml', '20160706', versionsuffix),
+    ('pyplusplus', '20160707', versionsuffix),
+]
+
+dependencies = [
+    ('Python', '3.5.1'),
+    ('matplotlib', '1.5.1', versionsuffix),
+    ('pytest', '3.0.1', versionsuffix),
+    ('Clang', '3.7.1'),
+    ('Boost', '1.60.0', versionsuffix),
+    ('zlib', '1.2.8'),
+    ('Triangle', '1.6'),
+    ('CppUnit', '1.12.1'),
+    ('SuiteSparse', '4.5.3', '-METIS-5.1.0'),
+]
+
+separate_build_dir = True
+
+configopts = '-DBOOST_ROOT=$EBROOTBOOST '
+configopts += '-DBLAS_LIBRARIES=$EBROOTOPENBLAS/lib/libopenblas.%s ' % SHLIB_EXT
+configopts += '-DLAPACK_LIBRARIES=$EBROOTOPENBLAS/lib/libopenblas.%s ' % SHLIB_EXT
+configopts += '-DCASTXML_EXECUTABLE=$EBROOTCASTXML/bin/castxml '
+configopts += '-DPYGCCXML_PATH=$EBROOTPYGCCXML/lib/python%(pyshortver)s/site-packages/ '
+configopts += '-DPYPLUSPLUS_PATH=$EBROOTPYPLUSPLUS/lib/python%(pyshortver)s/site-packages/ '
+
+buildopts = 'gimli pygimli apps'
+
+installopts = ' && mkdir -p %(installdir)s/lib/python%(pyshortver)s/site-packages '
+installopts += '&& cp -a ../gimli*/python/.  %(installdir)s/lib/python%(pyshortver)s/site-packages '
+installopts += '&& mkdir %(installdir)s/bin '
+installopts += '&& cp ../easybuild_obj/bin/*  %(installdir)s/bin'
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in ['bms2vtk', 'dc1dinv', 'dc1dsmooth', 'fdem1dinv', 'fdem1dsmooth',
+                                     'harmfit', 'invlinearmat', 'mrs1dblock', 'mrs1dsmooth',
+                                     'mt1dinv', 'mt1dsmooth', 'polyfit', 'ttinv', 'ttmod']]+
+             ['lib/libgimli.%s' % SHLIB_EXT, 'lib/python%(pyshortver)s/site-packages/pygimli.h'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/%(namelower)s'],
+}
+
+modextrapaths = {'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages'}
+
+moduleclass = 'geo'
diff --git a/easybuild/easyconfigs/p/pyGIMLi/pyGIMLi-20160803_openblas.patch b/easybuild/easyconfigs/p/pyGIMLi/pyGIMLi-20160803_openblas.patch
new file mode 100644
index 0000000000000000000000000000000000000000..b8d7de57eff6a77684298ddaf933fb58d37fd015
--- /dev/null
+++ b/easybuild/easyconfigs/p/pyGIMLi/pyGIMLi-20160803_openblas.patch
@@ -0,0 +1,13 @@
+# OpenBLAS cblas.h is loacted at include/cblas.h and not include/openblas/cblas.h
+# Aug 04th 2016 by B. Hajgato (Free University Brussels - VUB)
+--- gimli/src/gimli.cpp.orig	2016-08-04 08:53:28.000000000 +0200
++++ gimli/src/gimli.cpp	2016-08-04 14:19:26.570541693 +0200
+@@ -28,7 +28,7 @@
+ #include <cstdlib>
+ 
+ #if OPENBLAS_FOUND && !CONDA_BUILD
+-    #include <openblas/cblas.h>
++    #include <cblas.h>
+ // #else
+ //     #include <cblas.h>
+ #endif
diff --git a/easybuild/easyconfigs/p/pygccxml/pygccxml-20160706-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/p/pygccxml/pygccxml-20160706-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9f63786f27c5a6ec0ee2dc1b85d50f02855cbb07
--- /dev/null
+++ b/easybuild/easyconfigs/p/pygccxml/pygccxml-20160706-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,32 @@
+easyblock = 'PythonPackage'
+
+name = 'pygccxml'
+version = '20160706'
+commit_id = '648e8da'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://pypi.python.org/pypi/pygccxml'
+description = """Python package for easy C++ declarations navigation."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['https://github.com/gccxml/pygccxml/archive/']
+sources = ['%s.tar.gz' % commit_id]
+
+builddependencies = [('pip', '8.1.2', versionsuffix)]
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('CastXML', '20160617'),
+]
+
+use_pip = True
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/%(name)s'],
+}
+
+options = {'modulename': '%(name)s'}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/p/pygccxml/pygccxml-20160706-foss-2016a-Python-3.5.1.eb b/easybuild/easyconfigs/p/pygccxml/pygccxml-20160706-foss-2016a-Python-3.5.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..be70419f92331a558a1e2bf2ff22d777d5f2b68a
--- /dev/null
+++ b/easybuild/easyconfigs/p/pygccxml/pygccxml-20160706-foss-2016a-Python-3.5.1.eb
@@ -0,0 +1,30 @@
+easyblock = 'PythonPackage'
+
+name = 'pygccxml'
+version = '20160706'
+commit_id = '648e8da'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://pypi.python.org/pypi/pygccxml'
+description = """Python package for easy C++ declarations navigation."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['https://github.com/gccxml/pygccxml/archive/']
+sources = ['%s.tar.gz' % commit_id]
+
+dependencies = [
+    ('Python', '3.5.1'),
+    ('CastXML', '20160617'),
+]
+
+use_pip = True
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/%(name)s'],
+}
+
+options = {'modulename': '%(name)s'}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/p/pymatgen/pymatgen-4.1.1-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/p/pymatgen/pymatgen-4.1.1-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6b8241e929e157bfd88ab3d3f946c6b0e43a7f93
--- /dev/null
+++ b/easybuild/easyconfigs/p/pymatgen/pymatgen-4.1.1-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,26 @@
+easyblock = "PythonPackage"
+
+name = 'pymatgen'
+version = '4.1.1'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://pypi.python.org/pypi/pymatgen'
+description = """Python Materials Genomics is a robust materials analysis code that defines core object
+ representations for structures and molecules with support for many electronic structure codes."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.12'),
+    ('spglib-python', '1.9.4.2', versionsuffix),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages']
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/p/pymatgen/pymatgen-4.3.2-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/p/pymatgen/pymatgen-4.3.2-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ff5f953560c7769c76eba605e3a24b6922a2ed74
--- /dev/null
+++ b/easybuild/easyconfigs/p/pymatgen/pymatgen-4.3.2-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,26 @@
+easyblock = 'PythonPackage'
+
+name = 'pymatgen'
+version = '4.3.2'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://pypi.python.org/pypi/pymatgen'
+description = """Python Materials Genomics is a robust materials analysis code that defines core object
+ representations for structures and molecules with support for many electronic structure codes."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.12'),
+    ('spglib-python', '1.9.5', versionsuffix),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages']
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/p/pyplusplus/pyplusplus-20160707-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/p/pyplusplus/pyplusplus-20160707-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..695617390c7ef20fd3803cdda85cf7fc1ec7e7b5
--- /dev/null
+++ b/easybuild/easyconfigs/p/pyplusplus/pyplusplus-20160707-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,35 @@
+easyblock = 'PythonPackage'
+
+name = 'pyplusplus'
+version = '20160707'
+commit_id = '2c6c05b7a7d2'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://bitbucket.org/ompl/pyplusplus'
+description = """Py++ is a code generator for Boost.Python that simplifies
+ writing Python bindings of a C/C++ library
+ The tool is implemented as a Python module which is controlled by a user script."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['https://bitbucket.org/ompl/pyplusplus/get/']
+sources = ['%s.zip' % commit_id]
+
+builddependencies = [('pip', '8.1.2', versionsuffix)]
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('pygccxml', '20160706', '-Python-%(pyver)s'),
+]
+
+use_pip = True
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/%(name)s'],
+}
+
+options = {'modulename': '%(name)s'}
+
+moduleclass = 'tools'
+
diff --git a/easybuild/easyconfigs/p/pyplusplus/pyplusplus-20160707-foss-2016a-Python-3.5.1.eb b/easybuild/easyconfigs/p/pyplusplus/pyplusplus-20160707-foss-2016a-Python-3.5.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..98760a6c19b4b09008b9954f63970153a95996c8
--- /dev/null
+++ b/easybuild/easyconfigs/p/pyplusplus/pyplusplus-20160707-foss-2016a-Python-3.5.1.eb
@@ -0,0 +1,33 @@
+easyblock = 'PythonPackage'
+
+name = 'pyplusplus'
+version = '20160707'
+commit_id = '2c6c05b7a7d2'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://bitbucket.org/ompl/pyplusplus'
+description = """Py++ is a code generator for Boost.Python that simplifies
+ writing Python bindings of a C/C++ library
+ The tool is implemented as a Python module which is controlled by a user script."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['https://bitbucket.org/ompl/pyplusplus/get/']
+sources = ['%s.zip' % commit_id]
+
+dependencies = [
+    ('Python', '3.5.1'),
+    ('pygccxml', '20160706', '-Python-%(pyver)s'),
+]
+
+use_pip = True
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/%(name)s'],
+}
+
+options = {'modulename': '%(name)s'}
+
+moduleclass = 'tools'
+
diff --git a/easybuild/easyconfigs/p/pytest/pytest-3.0.1-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/p/pytest/pytest-3.0.1-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a816b7e71ea3fb19d9755224d605adc32ef60941
--- /dev/null
+++ b/easybuild/easyconfigs/p/pytest/pytest-3.0.1-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,25 @@
+easyblock = "PythonPackage"
+
+name = 'pytest'
+version = '3.0.1'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://pytest.org'
+description = """pytest: simple powerful testing with Python"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('py', '1.4.31', versionsuffix),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/p/pytest/pytest-3.0.1-foss-2016a-Python-3.5.1.eb b/easybuild/easyconfigs/p/pytest/pytest-3.0.1-foss-2016a-Python-3.5.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..85ae51712a4a9e343a33c7e8bd90fdec519f9ad5
--- /dev/null
+++ b/easybuild/easyconfigs/p/pytest/pytest-3.0.1-foss-2016a-Python-3.5.1.eb
@@ -0,0 +1,25 @@
+easyblock = "PythonPackage"
+
+name = 'pytest'
+version = '3.0.1'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://pytest.org'
+description = """pytest: simple powerful testing with Python"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('Python', '3.5.1'),
+    ('py', '1.4.31', versionsuffix),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/q/QCA/QCA-2.1.0-foss-2016a.eb b/easybuild/easyconfigs/q/QCA/QCA-2.1.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6422b82abed50d558bb7ed8e8a996508a11ed199
--- /dev/null
+++ b/easybuild/easyconfigs/q/QCA/QCA-2.1.0-foss-2016a.eb
@@ -0,0 +1,29 @@
+easyblock = 'CMakeMake'
+name = 'QCA'
+version = '2.1.0'
+
+homepage = 'http://delta.affinix.com/qca/'
+description = """Taking a hint from the similarly-named Java Cryptography Architecture, 
+ QCA aims to provide a straightforward and cross-platform crypto API, using Qt datatypes 
+ and conventions. QCA separates the API from the implementation, using plugins known as 
+ Providers. The advantage of this model is to allow applications to avoid linking to or 
+ explicitly depending on any particular cryptographic library. This allows one to easily 
+ change or upgrade crypto implementations without even needing to recompile the 
+ application! QCA should work everywhere Qt does, including Windows/Unix/MacOSX."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://delta.affinix.com/download/qca/2.0/']
+sources = ['%(namelower)s-%(version)s.tar.gz']
+
+configopts = "-DQT4_BUILD=true"
+
+builddependencies = [
+    ('CMake', '3.5.2')
+]
+
+dependencies = [
+    ('Qt', '4.8.7')
+]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/q/Qhull/Qhull-2015.2-intel-2016b.eb b/easybuild/easyconfigs/q/Qhull/Qhull-2015.2-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e282e73b715b93b524bdfe75f05ea361b50eded4
--- /dev/null
+++ b/easybuild/easyconfigs/q/Qhull/Qhull-2015.2-intel-2016b.eb
@@ -0,0 +1,36 @@
+easyblock = 'CMakeMake'
+
+name = 'Qhull'
+version = '2015.2'
+
+homepage = 'http://www.qhull.org'
+description = """
+Qhull computes the convex hull, Delaunay triangulation, Voronoi diagram, halfspace intersection about a point,
+furthest-site Delaunay triangulation, and furthest-site Voronoi diagram. The source code runs in 2-d, 3-d, 4-d,
+and higher dimensions. Qhull implements the Quickhull algorithm for computing the convex hull.
+"""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+sources = ['%(namelower)s-%(version_major)s-src-7.%(version_minor)s.0.tgz']
+source_urls = ['http://www.qhull.org/download/']
+
+patches = [
+    'Qhull-%(version)s-intel-fix.patch',
+    'Qhull_pkgconfig.patch',
+]
+
+builddependencies = [('CMake', '3.6.2')]
+
+sanity_check_paths = {
+    'files': ['bin/qhull', 'lib/libqhull.%s' % SHLIB_EXT, 'lib/pkgconfig/qhull.pc'],
+    'dirs': [],
+}
+
+modextrapaths = {
+    'CPATH': ['qhull/include'],
+}
+
+parallel = 1
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.7-intel-2016b.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.7-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9a342ad59982a235fba7af0f12ecc7ed6291ed00
--- /dev/null
+++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.7-intel-2016b.eb
@@ -0,0 +1,28 @@
+name = 'Qt'
+version = '4.8.7'
+
+homepage = 'http://qt.io/'
+description = "Qt is a comprehensive cross-platform C++ application framework."
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+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']
+
+builddependencies = [
+    ('pkg-config', '0.29.1'),
+]
+
+dependencies = [
+    ('GLib', '2.49.5'),
+    ('libpng', '1.6.24'),
+    ('X11', '20160819'),
+    ('libGLU', '9.0.0'),
+]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/q/Qt5/Qt5-5.7.0-foss-2016a.eb b/easybuild/easyconfigs/q/Qt5/Qt5-5.7.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1ccc867425d0adf0186dbb51f651016dbf6a82f3
--- /dev/null
+++ b/easybuild/easyconfigs/q/Qt5/Qt5-5.7.0-foss-2016a.eb
@@ -0,0 +1,56 @@
+easyblock = 'EB_Qt'
+
+name = 'Qt5'
+version = '5.7.0'
+
+homepage = 'http://qt.io/'
+description = "Qt is a comprehensive cross-platform C++ application framework."
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+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']
+
+builddependencies = [
+    ('fixesproto', '5.0'),
+    ('glproto', '1.4.17'),
+    ('inputproto', '2.3.1'),
+    ('kbproto', '1.0.7'),
+    ('libpthread-stubs', '0.3'),
+    ('pkg-config', '0.29.1'),
+    ('xcb-proto', '1.11', '', True),
+    ('xextproto', '7.3.0'),
+    ('xorg-macros', '1.19.0'),
+    ('xproto', '7.0.28'),
+    ('xtrans', '1.3.5'),
+]
+
+dependencies = [
+    ('GLib', '2.48.0'),
+    ('libX11', '1.6.3'),
+    ('libXt', '1.1.5'),
+    ('libXi', '1.7.6'),
+    ('xcb-util', '0.4.0'),
+    ('xcb-util-image', '0.4.0'),
+    ('xcb-util-keysyms', '0.4.0'),
+    ('xcb-util-renderutil', '0.3.9'),
+    ('xcb-util-wm', '0.4.1'),
+    ('libxkbcommon', '0.6.1'),
+    ('libXrender', '0.9.9'),
+    ('fontconfig', '2.11.95'),
+    ('freetype', '2.6.3'),
+    ('libXfixes', '5.0.1'),
+    ('libXcursor', '1.1.14'),
+    ('libXinerama', '1.1.3'),
+    ('libXrandr', '1.5.0'),
+    ('libpng', '1.6.21'),
+    ('libGLU', '9.0.0', '-Mesa-11.2.1'),
+]
+
+# qtgamepad needs recent kernel/libevdev (fails on RHEL 6.x)
+configopts = '-skip qtgamepad'
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/q/Qt5/Qt5-5.7.0-intel-2016a.eb b/easybuild/easyconfigs/q/Qt5/Qt5-5.7.0-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a387649d5b91fea6359ece25f0f2e6bccb220305
--- /dev/null
+++ b/easybuild/easyconfigs/q/Qt5/Qt5-5.7.0-intel-2016a.eb
@@ -0,0 +1,56 @@
+easyblock = 'EB_Qt'
+
+name = 'Qt5'
+version = '5.7.0'
+
+homepage = 'http://qt.io/'
+description = "Qt is a comprehensive cross-platform C++ application framework."
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+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']
+
+builddependencies = [
+    ('fixesproto', '5.0'),
+    ('glproto', '1.4.17'),
+    ('inputproto', '2.3.1'),
+    ('kbproto', '1.0.7'),
+    ('libpthread-stubs', '0.3'),
+    ('pkg-config', '0.29.1'),
+    ('xcb-proto', '1.11', '', True),
+    ('xextproto', '7.3.0'),
+    ('xorg-macros', '1.19.0'),
+    ('xproto', '7.0.28'),
+    ('xtrans', '1.3.5'),
+]
+
+dependencies = [
+    ('GLib', '2.48.0'),
+    ('libX11', '1.6.3'),
+    ('libXt', '1.1.5'),
+    ('libXi', '1.7.6'),
+    ('xcb-util', '0.4.0'),
+    ('xcb-util-image', '0.4.0'),
+    ('xcb-util-keysyms', '0.4.0'),
+    ('xcb-util-renderutil', '0.3.9'),
+    ('xcb-util-wm', '0.4.1'),
+    ('libxkbcommon', '0.6.1'),
+    ('libXrender', '0.9.9'),
+    ('fontconfig', '2.11.95'),
+    ('freetype', '2.6.3'),
+    ('libXfixes', '5.0.1'),
+    ('libXcursor', '1.1.14'),
+    ('libXinerama', '1.1.3'),
+    ('libXrandr', '1.5.0'),
+    ('libpng', '1.6.21'),
+    ('libGLU', '9.0.0', '-Mesa-11.2.1'),
+]
+
+# qtgamepad needs recent kernel/libevdev (fails on RHEL 6.x)
+configopts = '-skip qtgamepad'
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/q/Qt5/Qt5-5.7.0-intel-2016b.eb b/easybuild/easyconfigs/q/Qt5/Qt5-5.7.0-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..589ca4e25a966d3c7afd8b9863f76100bee87d3d
--- /dev/null
+++ b/easybuild/easyconfigs/q/Qt5/Qt5-5.7.0-intel-2016b.eb
@@ -0,0 +1,33 @@
+easyblock = 'EB_Qt'
+
+name = 'Qt5'
+version = '5.7.0'
+
+homepage = 'http://qt.io/'
+description = "Qt is a comprehensive cross-platform C++ application framework."
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+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']
+
+patches = ['%(name)s-%(version)s-workaround-icpc-bug.patch']
+
+builddependencies = [
+    ('pkg-config', '0.29.1'),
+]
+
+# qtgamepad needs recent kernel/libevdev (fails on RHEL 6.x)
+configopts = '-skip qtgamepad'
+
+dependencies = [
+    ('GLib', '2.49.5'),
+    ('libpng', '1.6.24'),
+    ('X11', '20160819'),
+    ('libGLU', '9.0.0'),
+]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/q/Qt5/Qt5-5.7.0-workaround-icpc-bug.patch b/easybuild/easyconfigs/q/Qt5/Qt5-5.7.0-workaround-icpc-bug.patch
new file mode 100644
index 0000000000000000000000000000000000000000..fd58176f43c91bfad349d0f5425cc2afd7ef31dc
--- /dev/null
+++ b/easybuild/easyconfigs/q/Qt5/Qt5-5.7.0-workaround-icpc-bug.patch
@@ -0,0 +1,62 @@
+# This is an ugly workaround for a icpc bug: https://software.intel.com/en-us/comment/1882560
+# If the struct/class is local, icpc gives a faulty error. We move the class to be non-local.
+# Remove this patch as soon as icpc is fixed.
+# Ward Poelmans <wpoely86@gmail.com>
+diff -ur qt-everywhere-opensource-src-5.7.0.orig/qtdeclarative/src/quick/items/qquickitemanimation.cpp qt-everywhere-opensource-src-5.7.0/qtdeclarative/src/quick/items/qquickitemanimation.cpp
+--- qt-everywhere-opensource-src-5.7.0.orig/qtdeclarative/src/quick/items/qquickitemanimation.cpp	2016-06-11 14:05:08.000000000 +0200
++++ qt-everywhere-opensource-src-5.7.0/qtdeclarative/src/quick/items/qquickitemanimation.cpp	2016-08-29 12:42:35.880738297 +0200
+@@ -200,6 +200,27 @@
+     }
+ }
+
++struct QQuickParentAnimationData : public QAbstractAnimationAction
++{
++    QQuickParentAnimationData() : reverse(false) {}
++    ~QQuickParentAnimationData() { qDeleteAll(pc); }
++
++    QQuickStateActions actions;
++    //### reverse should probably apply on a per-action basis
++    bool reverse;
++    QList<QQuickParentChange *> pc;
++    void doAction() Q_DECL_OVERRIDE
++    {
++        for (int ii = 0; ii < actions.count(); ++ii) {
++            const QQuickStateAction &action = actions.at(ii);
++            if (reverse)
++                action.event->reverse();
++            else
++                action.event->execute();
++        }
++    }
++};
++
+ QAbstractAnimationJob* QQuickParentAnimation::transition(QQuickStateActions &actions,
+                         QQmlProperties &modified,
+                         TransitionDirection direction,
+@@ -207,26 +228,6 @@
+ {
+     Q_D(QQuickParentAnimation);
+
+-    struct QQuickParentAnimationData : public QAbstractAnimationAction
+-    {
+-        QQuickParentAnimationData() : reverse(false) {}
+-        ~QQuickParentAnimationData() { qDeleteAll(pc); }
+-
+-        QQuickStateActions actions;
+-        //### reverse should probably apply on a per-action basis
+-        bool reverse;
+-        QList<QQuickParentChange *> pc;
+-        void doAction() Q_DECL_OVERRIDE
+-        {
+-            for (int ii = 0; ii < actions.count(); ++ii) {
+-                const QQuickStateAction &action = actions.at(ii);
+-                if (reverse)
+-                    action.event->reverse();
+-                else
+-                    action.event->execute();
+-            }
+-        }
+-    };
+
+     QQuickParentAnimationData *data = new QQuickParentAnimationData;
+     QQuickParentAnimationData *viaData = new QQuickParentAnimationData;
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.1.2-ictce-7.3.5.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.1.2-ictce-7.3.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d453b22ecbafcdb07de1ac703a58b9e400d0a9ab
--- /dev/null
+++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.1.2-ictce-7.3.5.eb
@@ -0,0 +1,46 @@
+name = 'QuantumESPRESSO'
+version = '5.1.2'
+
+homepage = 'http://www.pwscf.org/'
+description = """Quantum ESPRESSO  is an integrated suite of computer codes
+for electronic-structure calculations and materials modeling at the nanoscale.
+It is based on density-functional theory, plane waves, and pseudopotentials
+(both norm-conserving and ultrasoft)."""
+
+toolchain = {'name': 'ictce', 'version': '7.3.5'}
+toolchainopts = {'usempi': True}
+
+sources = [
+    'espresso-%(version)s.tar.gz',
+    'atomic-%(version)s.tar.gz',
+    'neb-%(version)s.tar.gz',
+    'PHonon-%(version)s.tar.gz',
+    'pwcond-%(version)s.tar.gz',
+    'tddfpt-%(version)s.tar.gz',
+    'xspectra-%(version)s.tar.gz',
+    'GWW-%(version)s.tar.gz',
+]
+
+source_urls = [
+    'http://files.qe-forge.org/index.php?file=',  # all sources, except espresso*.tar.gz and GWW*.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/185/753/',  # espresso-5.1.2.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/185/754/',  # GWW-5.1.2.tar.gz
+]
+
+checksums = [
+    '55f766d1c41c8e7994b0d6717a55c3ea',  # espresso-5.1.2.tar.gz
+    '77ec8a5b2106abc080a55463d4fc964b',  # atomic-5.1.2.tar.gz
+    'b6123aa99f7db958dd635e9837abdf00',  # neb-5.1.2.tar.gz
+    '49c65d222449c5fcea539470e8001170',  # PHonon-5.1.2.tar.gz
+    '6a6c8f84d2a3e65d60cf4e5387383b9b',  # pwcond-5.1.2.tar.gz
+    '9790e7d55fc1f08c554a9d0212bc7f9e',  # tddfpt-5.1.2.tar.gz
+    'c27d6c9515c0ce29462a9b1e8203d118',  # xspectra-5.1.2.tar.gz
+    '681c7f83b4adefbf2da721c4b8210670',  # GWW-5.1.2.tar.gz
+]
+
+buildopts = 'all w90 want gipaw'
+
+# parallel build tends to fail
+parallel = 1
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.3.0-intel-2016.02-GCC-4.9.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.3.0-intel-2016.02-GCC-4.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7bd4242d316b2c9b07718ebadabc09e5825a5a7b
--- /dev/null
+++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.3.0-intel-2016.02-GCC-4.9.eb
@@ -0,0 +1,68 @@
+name = 'QuantumESPRESSO'
+version = '5.3.0'
+
+homepage = 'http://www.pwscf.org/'
+description = """Quantum ESPRESSO  is an integrated suite of computer codes
+ for electronic-structure calculations and materials modeling at the nanoscale.
+ It is based on density-functional theory, plane waves, and pseudopotentials
+  (both norm-conserving and ultrasoft)."""
+
+toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
+toolchainopts = {'usempi': True}
+
+# major part of this list was determined from espresso/install/plugins_list
+sources = [
+    'espresso-%(version)s.tar.gz',
+    'wannier90-1.2.tar.gz',
+    'atomic-%(version)s.tar.gz',
+    'neb-%(version)s.tar.gz',
+    'PHonon-%(version)s.tar.gz',
+    # must be downloaded manually from
+    # http://qe-forge.org/gf/project/q-e/scmsvn/?action=browse&path=%2F%2Acheckout%2A%2Ftags%2FQE-5.2.1%2Fespresso%2Farchive%2Fplumed-1.3-qe.tar.gz&revision=11758
+    # gets updated without changes to filename, cfr. http://qe-forge.org/pipermail/q-e-commits/2015-June/007359.html
+    # 'plumed-1.3-qe-r11758.tar.gz',
+    'pwcond-%(version)s.tar.gz',
+    'tddfpt-%(version)s.tar.gz',
+    'want-2.5.1-base.tar.gz',
+    'yambo-3.4.2.tgz',
+    'xspectra-%(version)s.tar.gz',
+]
+missing_sources = [
+    'sax-2.0.3.tar.gz',  # nowhere to be found
+]
+source_urls = [
+    'http://files.qe-forge.org/index.php?file=',  # all sources, except espresso*.tar.gz
+    'http://qe-forge.org/gf/download/frsrelease/204/912/',  # espresso-5.3.0.tar.gz
+    'http://qe-forge.org/gf/download/frsrelease/153/618/',  # want-2.5.1-base.tar.gz
+    'http://qe-forge.org/gf/download/frsrelease/208/932/',  # yambo-3.4.2.tgz
+]
+
+patches = [
+    'QuantumESPRESSO-%(version)s_yambo-fixes.patch',
+    'QuantumESPRESSO-%(version)s_fftxlib-fixes.patch',
+]
+
+# source checksums
+checksums = [
+    '6848fcfaeb118587d6be36bd10b7f2c3',  # espresso-5.3.0.tar.gz
+    'a1e9611b9a82941c23426028d112186e',  # wannier90-1.2.tar.gz
+    'e713f74b78a04600265e697ca346bea1',  # atomic-5.3.0.tar.gz
+    '91157da66570deb4e7a353a23621a39f',  # neb-5.3.0.tar.gz
+    '994c89e72b5500bceb44dada7134cc12',  # PHonon-5.3.0.tar.gz
+    # 'f094031c6d13a0e00022daf4d7c847c7',  # plumed-1.3-qe-r11758.tar.gz
+    '897753893dc46502de24b81929694ee1',  # pwcond-5.3.0.tar.gz
+    'ac9d86386f2b2d28a6b00c902668669b',  # tddfpt-5.3.0.tar.gz
+    'ac365daebbe380bf4019235eacf71079',  # want-2.5.1-base.tar.gz
+    'f0820a0f42dfc81ce3811af647bed777',  # yambo-3.4.2.tgz
+    'fc7d9d80e00185afcab44307d3b70a65',  # xspectra-5.3.0.tar.gz
+]
+
+# gipaw excluded due to: configure: error: Cannot compile against this version of Quantum-Espresso
+# add plumed and uncomment the lines in sources and checksums if the package is downloaded manually
+# 'all' not used here because upftools are missing from 5.3.0 package
+buildopts = 'pw ph pp pwcond neb cp ld1 tddfpt w90 want yambo xspectra'  # plumed
+
+# parallel build tends to fail
+parallel = 1
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.3.0_fftxlib-fixes.patch b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.3.0_fftxlib-fixes.patch
new file mode 100644
index 0000000000000000000000000000000000000000..c1fdcc987306e603dc9ef83df55baa390737a40c
--- /dev/null
+++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.3.0_fftxlib-fixes.patch
@@ -0,0 +1,24 @@
+* remove fftw_version, conflicts with the one in mkl's fftw
+* http://qe-forge.org/pipermail/q-e-developers/2016-January/001088.html
+author: Miguel Dias Costa (National University of Singapore)   
+--- espresso-5.3.0/FFTXlib/fftw.c.orig	2016-05-26 09:54:35.911733000 +0800
++++ espresso-5.3.0/FFTXlib/fftw.c	2016-05-26 09:59:43.900568303 +0800
+@@ -345,8 +345,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+-char *fftw_version = "FFTW V1.1 ($Id: fftw.c,v 1.3 2010-01-26 14:06:59 giannozz Exp $)";
+-
+ /*
+  * This function is called in other files, so we cannot declare
+  * it as static. 
+--- espresso-5.3.0/FFTXlib/fftw.h.orig	2016-05-26 09:54:40.566922000 +0800
++++ espresso-5.3.0/FFTXlib/fftw.h	2016-05-26 09:59:59.822132168 +0800
+@@ -133,7 +133,6 @@
+ 
+ extern generic_codelet fftw_twiddle_generic;
+ extern generic_codelet fftwi_twiddle_generic;
+-extern char *fftw_version;
+ 
+ /*****************************
+  *        Plans
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.3.0_yambo-fixes.patch b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.3.0_yambo-fixes.patch
new file mode 100644
index 0000000000000000000000000000000000000000..b4c96acc606145a173ea68f6eb898f4cefb356e6
--- /dev/null
+++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.3.0_yambo-fixes.patch
@@ -0,0 +1,71 @@
+* make sure -nofor_main is also used when $FC is defined as mpif90 for yambo
+* fix check in yambo configure script w.r.t. preprocessing Fortran code by ignoring harmless warning in stderr output
+* force ifort mangling in yambo's netcdf
+author: Kenneth Hoste (HPC-UGent), adapted to espresso-5.3.0 and yambo-3.4.2 by Miguel Dias Costa (National University of Singapore)
+--- espresso-5.3.0/yambo-3.4.2/configure.orig	2016-05-26 16:18:16.177156000 +0800
++++ espresso-5.3.0/yambo-3.4.2/configure	2016-05-26 16:20:31.929218336 +0800
+@@ -6238,7 +6238,7 @@
+       ;;
+     *g95*)
+       ;;
+-    *ifort*)
++    *ifort*|*mpif90*)
+       $FC -v >& ver_
+       VER_8=`grep 8. ver_   | wc -l`
+       VER_9=`grep 9. ver_   | wc -l`
+@@ -6321,7 +6321,7 @@
+     FCMFLAG=""
+     OMPFLAGS="-fopenmp"
+     ;;
+-  *ifort*)
++  *ifort*|*mpif90*)
+     CPU_FLAG=""
+     case "${FCVERSION}" in
+       *11* | *12* | *13* |*14* | *15* )
+@@ -6365,7 +6365,7 @@
+     UFFLAGS="-g -O0 -fno-second-underscore"
+     FCMFLAG=""
+     ;;
+-  *ifort*)
++  *ifort*|*mpif90*)
+     CPU_FLAG=""
+     case "${FCVERSION}" in
+       *1*)
+@@ -6413,7 +6413,7 @@
+     UFFLAGS="-g -O0 -w"
+     OMPFLAGS="-openmp"
+     ;;
+-  *ifort*)
++  *ifort*|*mpif90*)
+     CPU_FLAG=""
+     case "${FCVERSION}" in
+       *1*)
+@@ -6472,7 +6472,7 @@
+     UFFLAGS="-g -O0 -w -tpp2"
+     OMPFLAGS="-openmp"
+     ;;
+-  *ifort*)
++  *ifort*|*mpif90*)
+     CPU_FLAG=""
+     case "${FCVERSION}" in
+       *11* | *12* | *13* |*14* |*15* )
+@@ -7651,7 +7651,7 @@
+ 
+ if ! test -s conftest.er1 || test -n "`grep successful conftest.er1`"  ; then
+  eval $CPP $CPPFLAGS conftest.F > conftest.${F90SUFFIX}
+- eval $FC $FCFLAGS -c conftest.${F90SUFFIX} 2> conftest.er2 >&5
++ eval $FC $FCFLAGS -c conftest.${F90SUFFIX} | grep -v "ifort: command line remark" 2> conftest.er2 >&5
+  if test -s conftest.er2 ; then
+   if ! test -n "`grep successful conftest.er2`"  ; then
+    acx_F90_ok=no ;
+--- espresso-5.3.0/yambo-3.4.2/lib/netcdf/Makefile.loc.orig	2016-06-02 17:29:53.816844000 +0800
++++ espresso-5.3.0/yambo-3.4.2/lib/netcdf/Makefile.loc	2016-06-02 17:30:45.579476000 +0800
+@@ -40,7 +40,7 @@
+ 	      FC="$(f90)" \
+ 	      FCFLAGS="$(f77flags)" \
+ 	      FFLAGS="$(f77flags)" \
+-	      CPPFLAGS="$(netcdf_aux)" \
++	      CPPFLAGS="$(netcdf_aux) -DpgiFortran" \
+ 	      F90="$(f90)" \
+ 	      F77="$(f77)" \
+ 	      INSTALL_DIR="$(INSTALL_DIR)" ); \
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.4.0-foss-2016b-hybrid.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.4.0-foss-2016b-hybrid.eb
new file mode 100644
index 0000000000000000000000000000000000000000..57849d2efa21f0c22e9fd5acd09fa19afe1ea6f7
--- /dev/null
+++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.4.0-foss-2016b-hybrid.eb
@@ -0,0 +1,58 @@
+name = 'QuantumESPRESSO'
+version = '5.4.0'
+versionsuffix = '-hybrid'
+
+homepage = 'http://www.pwscf.org/'
+description = """Quantum ESPRESSO  is an integrated suite of computer codes
+ for electronic-structure calculations and materials modeling at the nanoscale.
+ It is based on density-functional theory, plane waves, and pseudopotentials
+  (both norm-conserving and ultrasoft)."""
+
+toolchain = {'name': 'foss', 'version': '2016b'}
+toolchainopts = {'usempi': True, 'openmp': True}
+
+#  this list was determined from QE 5.4.0 version release 
+sources = [
+    # Common source
+    'espresso-%(version)s.tar.gz',
+    'tddfpt-%(version)s.tar.gz',
+    # Other sources
+    'atomic-%(version)s.tar.gz',
+    'neb-%(version)s.tar.gz',
+    'PHonon-%(version)s.tar.gz',
+    'pwcond-%(version)s.tar.gz',
+    'xspectra-%(version)s.tar.gz' ,
+    'PWgui-%(version)s.tar.gz' ,
+    'EPW-%(version)s.tar.gz' ,
+    'test-suite-%(version)s.tar.gz' ,
+    'GWW-%(version)s.tar.gz' ,
+]
+source_urls = [
+    'http://files.qe-forge.org/index.php?file=',  # Almost all
+    'http://www.qe-forge.org/gf/download/frsrelease/211/968/', # espresso-5.4.0.tar.gz
+    # These will not be used because of the 404 signal not found from the previous link.
+    'http://www.qe-forge.org/gf/download/frsrelease/211/961/', # PWgui-5.4.0.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/211/956/', # tddfpt-5.4.0.tar.gz        
+    'http://www.qe-forge.org/gf/download/frsrelease/211/954/', # atomic-5.4.0.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/211/959/', # neb-5.4.0.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/211/962/', # PHonon-5.4.0.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/211/960/', # pwcond-5.4.0.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/211/958/', # xspectra-5.4.0.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/211/969/', # EPW-5.4.0.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/211/963/', # test-suite-5.4.0.tar.gz
+    'http://www.qe-forge.org/gf/download/frsrelease/211/957/', # GWW-5.4.0.tar.gz
+]
+
+# Hybrid option exists only for backward compatibility, use toolchain option openmp instead.
+hybrid = True
+# Patch file to avoid the CPP problem generated by different OSes
+patches = ['QuantumESPRESSO-5.4.0_fix-f90rule-gfortran.patch']               
+  
+# packages included in 5.4.0 version of QE. We met errors when try to include gipaw, yambo and someother packages.
+buildopts = 'all tddfpt neb xspectra ph '
+
+# parallel build tends to fail
+parallel = 1
+
+moduleclass = 'chem'
+
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.4.0-intel-2016.02-GCC-4.9.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.4.0-intel-2016.02-GCC-4.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8529a9282fa5056c314d81694e907c8364107841
--- /dev/null
+++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.4.0-intel-2016.02-GCC-4.9.eb
@@ -0,0 +1,66 @@
+name = 'QuantumESPRESSO'
+version = '5.4.0'
+
+homepage = 'http://www.pwscf.org/'
+description = """Quantum ESPRESSO  is an integrated suite of computer codes
+ for electronic-structure calculations and materials modeling at the nanoscale.
+ It is based on density-functional theory, plane waves, and pseudopotentials
+  (both norm-conserving and ultrasoft)."""
+
+toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
+toolchainopts = {'usempi': True}
+
+# major part of this list was determined from espresso/install/plugins_list
+sources = [
+    'espresso-%(version)s.tar.gz',
+    'wannier90-1.2.tar.gz',
+    'atomic-%(version)s.tar.gz',
+    'neb-%(version)s.tar.gz',
+    'PHonon-%(version)s.tar.gz',
+    # must be downloaded manually from
+    # http://qe-forge.org/gf/project/q-e/scmsvn/?action=browse&path=%2F%2Acheckout%2A%2Ftags%2FQE-5.2.1%2Fespresso%2Farchive%2Fplumed-1.3-qe.tar.gz&revision=11758
+    # gets updated without changes to filename, cfr. http://qe-forge.org/pipermail/q-e-commits/2015-June/007359.html
+    # 'plumed-1.3-qe-r11758.tar.gz',
+    'pwcond-%(version)s.tar.gz',
+    'tddfpt-%(version)s.tar.gz',
+    'want-2.5.1-base.tar.gz',
+    'yambo-3.4.2.tgz',
+    'xspectra-%(version)s.tar.gz',
+]
+missing_sources = [
+    'sax-2.0.3.tar.gz',  # nowhere to be found
+]
+source_urls = [
+    'http://files.qe-forge.org/index.php?file=',  # all sources, except espresso*.tar.gz
+    'http://qe-forge.org/gf/download/frsrelease/211/968/',  # espresso-5.4.0.tar.gz
+    'http://qe-forge.org/gf/download/frsrelease/153/618/',  # want-2.5.1-base.tar.gz
+    'http://qe-forge.org/gf/download/frsrelease/208/932/',  # yambo-3.4.2.tgz
+]
+
+patches = [
+    'QuantumESPRESSO-%(version)s_yambo-fixes.patch',
+]
+
+# source checksums
+checksums = [
+    '8bb78181b39bd084ae5cb7a512c1cfe7',  # espresso-5.4.0.tar.gz
+    'a1e9611b9a82941c23426028d112186e',  # wannier90-1.2.tar.gz
+    '24dc0d8bf5cf4eb4dc38e1c18a80b3ee',  # atomic-5.4.0.tar.gz
+    '254f929259fb06036b78c493cf18e5d6',  # neb-5.4.0.tar.gz
+    'f641fe9dcf0ec8f1e47d74e3c7c39705',  # PHonon-5.4.0.tar.gz
+    # 'f094031c6d13a0e00022daf4d7c847c7',  # plumed-1.3-qe-r11758.tar.gz
+    '31c1cd8cd76752833a9205d456093d0a',  # pwcond-5.4.0.tar.gz
+    '2101533a627644ef467b60d400977eab',  # tddfpt-5.4.0.tar.gz
+    'ac365daebbe380bf4019235eacf71079',  # want-2.5.1-base.tar.gz
+    'f0820a0f42dfc81ce3811af647bed777',  # yambo-3.4.2.tgz
+    '95080929c87389cd15cf765048cfc9d2',  # xspectra-5.4.0.tar.gz
+]
+
+# gipaw excluded due to: configure: error: Cannot compile against this version of Quantum-Espresso
+# add plumed and uncomment the lines in sources and checksums if the package is downloaded manually
+buildopts = 'all w90 want yambo xspectra'  # plumed
+
+# parallel build tends to fail
+parallel = 1
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.4.0_fix-f90rule-gfortran.patch b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.4.0_fix-f90rule-gfortran.patch
new file mode 100644
index 0000000000000000000000000000000000000000..85d62f606be0a23e55ae8a56b71f1463683c48a9
--- /dev/null
+++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.4.0_fix-f90rule-gfortran.patch
@@ -0,0 +1,12 @@
+diff -rupN espresso-5.4.0.orig/install/make.sys.in espresso-5.4.0/install/make.sys.in
+--- espresso-5.4.0.orig/install/make.sys.in	2016-04-24 23:19:25.000000000 +0200
++++ espresso-5.4.0/install/make.sys.in	2016-06-11 15:08:15.869499000 +0200
+@@ -13,7 +13,7 @@
+ # remember the tabulator in the first column !!!
+ 
+ .f90.o:
+-	@f90rule@
++	$(MPIF90) $(F90FLAGS) -c $<
+ 
+ # .f.o and .c.o: do not modify
+ 
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.4.0_yambo-fixes.patch b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.4.0_yambo-fixes.patch
new file mode 100644
index 0000000000000000000000000000000000000000..fd63a363335ced902eb5b3ab8a84f8427c675c28
--- /dev/null
+++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-5.4.0_yambo-fixes.patch
@@ -0,0 +1,71 @@
+* make sure -nofor_main is also used when $FC is defined as mpif90 for yambo
+* fix check in yambo configure script w.r.t. preprocessing Fortran code by ignoring harmless warning in stderr output
+* force ifort mangling in yambo's netcdf
+author: Kenneth Hoste (HPC-UGent), adapted to espresso-5.4.0 and yambo-3.4.2 by Miguel Dias Costa (National University of Singapore)
+--- espresso-5.4.0/yambo-3.4.2/configure.orig	2016-05-26 16:18:16.177156000 +0800
++++ espresso-5.4.0/yambo-3.4.2/configure	2016-05-26 16:20:31.929218336 +0800
+@@ -6238,7 +6238,7 @@
+       ;;
+     *g95*)
+       ;;
+-    *ifort*)
++    *ifort*|*mpif90*)
+       $FC -v >& ver_
+       VER_8=`grep 8. ver_   | wc -l`
+       VER_9=`grep 9. ver_   | wc -l`
+@@ -6321,7 +6321,7 @@
+     FCMFLAG=""
+     OMPFLAGS="-fopenmp"
+     ;;
+-  *ifort*)
++  *ifort*|*mpif90*)
+     CPU_FLAG=""
+     case "${FCVERSION}" in
+       *11* | *12* | *13* |*14* | *15* )
+@@ -6365,7 +6365,7 @@
+     UFFLAGS="-g -O0 -fno-second-underscore"
+     FCMFLAG=""
+     ;;
+-  *ifort*)
++  *ifort*|*mpif90*)
+     CPU_FLAG=""
+     case "${FCVERSION}" in
+       *1*)
+@@ -6413,7 +6413,7 @@
+     UFFLAGS="-g -O0 -w"
+     OMPFLAGS="-openmp"
+     ;;
+-  *ifort*)
++  *ifort*|*mpif90*)
+     CPU_FLAG=""
+     case "${FCVERSION}" in
+       *1*)
+@@ -6472,7 +6472,7 @@
+     UFFLAGS="-g -O0 -w -tpp2"
+     OMPFLAGS="-openmp"
+     ;;
+-  *ifort*)
++  *ifort*|*mpif90*)
+     CPU_FLAG=""
+     case "${FCVERSION}" in
+       *11* | *12* | *13* |*14* |*15* )
+@@ -7651,7 +7651,7 @@
+ 
+ if ! test -s conftest.er1 || test -n "`grep successful conftest.er1`"  ; then
+  eval $CPP $CPPFLAGS conftest.F > conftest.${F90SUFFIX}
+- eval $FC $FCFLAGS -c conftest.${F90SUFFIX} 2> conftest.er2 >&5
++ eval $FC $FCFLAGS -c conftest.${F90SUFFIX} | grep -v "ifort: command line remark" 2> conftest.er2 >&5
+  if test -s conftest.er2 ; then
+   if ! test -n "`grep successful conftest.er2`"  ; then
+    acx_F90_ok=no ;
+--- espresso-5.4.0/yambo-3.4.2/lib/netcdf/Makefile.loc.orig	2016-06-02 17:29:53.816844000 +0800
++++ espresso-5.4.0/yambo-3.4.2/lib/netcdf/Makefile.loc	2016-06-02 17:30:45.579476000 +0800
+@@ -40,7 +40,7 @@
+ 	      FC="$(f90)" \
+ 	      FCFLAGS="$(f77flags)" \
+ 	      FFLAGS="$(f77flags)" \
+-	      CPPFLAGS="$(netcdf_aux)" \
++	      CPPFLAGS="$(netcdf_aux) -DpgiFortran" \
+ 	      F90="$(f90)" \
+ 	      F77="$(f77)" \
+ 	      INSTALL_DIR="$(INSTALL_DIR)" ); \
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-6.0-intel-2016b.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-6.0-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..cd4f2fd67f9551719be835e71ed975fe69039c01
--- /dev/null
+++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-6.0-intel-2016b.eb
@@ -0,0 +1,55 @@
+name = 'QuantumESPRESSO'
+version = '6.0'
+
+homepage = 'http://www.pwscf.org/'
+description = """Quantum ESPRESSO  is an integrated suite of computer codes
+ for electronic-structure calculations and materials modeling at the nanoscale.
+ It is based on density-functional theory, plane waves, and pseudopotentials
+  (both norm-conserving and ultrasoft)."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+toolchainopts = {'usempi': True}
+
+# major part of this list was determined from espresso/install/plugins_list
+sources = [
+    'qe-%(version)s.tar.gz',
+    'wannier90-1.2.tar.gz',
+    'qe-gipaw-6.0.tar.gz',
+    # must be downloaded manually from
+    # http://qe-forge.org/gf/project/q-e/scmsvn/?action=browse&path=%2F%2Acheckout%2A%2Ftags%2FQE-5.2.1%2Fespresso%2Farchive%2Fplumed-1.3-qe.tar.gz&revision=11758
+    # gets updated without changes to filename, cfr. http://qe-forge.org/pipermail/q-e-commits/2015-June/007359.html
+    # 'plumed-1.3-qe-r11758.tar.gz',
+    'want-2.5.1-base.tar.gz',
+    'yambo-3.4.2.tgz',
+]
+missing_sources = [
+    'sax-2.0.3.tar.gz',  # nowhere to be found
+]
+source_urls = [
+    'http://files.qe-forge.org/index.php?file=',  # all sources, except espresso*.tar.gz
+    'http://qe-forge.org/gf/download/frsrelease/224/1044/',  # qe-6.0.tar.gz
+    'http://qe-forge.org/gf/download/frsrelease/153/618/',  # want-2.5.1-base.tar.gz
+    'http://qe-forge.org/gf/download/frsrelease/208/932/',  # yambo-3.4.2.tgz
+]
+
+patches = [
+    'QuantumESPRESSO-5.4.0_yambo-fixes.patch',
+]
+
+# source checksums
+checksums = [
+    'e42aeeffadf7951542d8561a6b4a3390',  # qe-6.0.tar.gz
+    'a1e9611b9a82941c23426028d112186e',  # wannier90-1.2.tar.gz
+    'b11a8b75109eb58fd97a1c6f7cf20e31',  # qe-gipaw-6.0.tar.gz
+    # 'f094031c6d13a0e00022daf4d7c847c7',  # plumed-1.3-qe-r11758.tar.gz
+    'ac365daebbe380bf4019235eacf71079',  # want-2.5.1-base.tar.gz
+    'f0820a0f42dfc81ce3811af647bed777',  # yambo-3.4.2.tgz
+]
+
+# add plumed and uncomment the lines in sources and checksums if the package is downloaded manually
+buildopts = 'all w90 gipaw want yambo xspectra'  # plumed
+
+# parallel build tends to fail
+parallel = 1
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/q/qrupdate/qrupdate-1.1.2-intel-2016b.eb b/easybuild/easyconfigs/q/qrupdate/qrupdate-1.1.2-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4c96735e498d1a0573a4aab2c0c4b76eed79150d
--- /dev/null
+++ b/easybuild/easyconfigs/q/qrupdate/qrupdate-1.1.2-intel-2016b.eb
@@ -0,0 +1,28 @@
+easyblock = 'MakeCp'
+
+name = 'qrupdate'
+version = '1.1.2'
+
+homepage = 'https://sourceforge.net/projects/qrupdate/'
+description = """qrupdate is a Fortran library for fast updates of QR and Cholesky decompositions."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [SOURCEFORGE_SOURCE]
+
+patches = ['%(name)s-%(version)s_makeconf.patch']
+
+buildopts = 'lib'
+
+files_to_copy = [(['libqrupdate.a'], 'lib')]
+
+sanity_check_paths = {
+    'files': ['lib/libqrupdate.a'],
+    'dirs': [],
+}
+
+parallel = 1
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/r/R-bundle-Bioconductor/R-bundle-Bioconductor-3.3-intel-2016b-R-3.3.1.eb b/easybuild/easyconfigs/r/R-bundle-Bioconductor/R-bundle-Bioconductor-3.3-intel-2016b-R-3.3.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c43e3ff869c6dc0bc148156b2d577546f7c28601
--- /dev/null
+++ b/easybuild/easyconfigs/r/R-bundle-Bioconductor/R-bundle-Bioconductor-3.3-intel-2016b-R-3.3.1.eb
@@ -0,0 +1,161 @@
+easyblock = 'Bundle'
+
+name = 'R-bundle-Bioconductor'
+version = '3.3'
+versionsuffix = '-R-%(rver)s'
+
+homepage = 'http://www.r-project.org/'
+description = """R is a free software environment for statistical computing and graphics."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+dependencies = [
+    ('R', '3.3.1'),
+    ('HDF5', '1.8.17'),  # for rhdf5
+]
+
+name_tmpl = '%(name)s_%(version)s.tar.gz'
+ext_options = {
+    'source_urls': [
+        'http://cran.r-project.org/src/contrib/Archive/%(name)s',  # package archive
+        'http://cran.r-project.org/src/contrib/',  # current version of packages
+        'http://cran.freestatistics.org/src/contrib',  # mirror alternative for current packages
+    ],
+    'source_tmpl': name_tmpl,
+}
+bioconductor_options = {
+    'source_urls': [
+        'http://bioconductor.org/packages/3.3/bioc/src/contrib/',
+        'http://bioconductor.org/packages/3.3/data/annotation/src/contrib/',
+        'http://bioconductor.org/packages/3.3/data/experiment/src/contrib/',
+    ],
+    'source_tmpl': name_tmpl,
+}
+
+exts_defaultclass = 'RPackage'
+exts_filter = ("R -q --no-save", "library(%(ext_name)s)")
+
+# CRAN packages on which these Bioconductor packages depend are available in R module on which this depends
+# !! order of packages is important !!
+exts_list = [
+    ('BiocGenerics', '0.18.0', bioconductor_options),
+    ('Biobase', '2.32.0', bioconductor_options),
+    ('S4Vectors', '0.10.3', bioconductor_options),
+    ('IRanges', '2.6.1', bioconductor_options),
+    ('GenomeInfoDb', '1.8.3', bioconductor_options),
+    ('AnnotationDbi', '1.34.4', bioconductor_options),
+    ('zlibbioc', '1.18.0', bioconductor_options),
+    ('XVector', '0.12.1', bioconductor_options),
+    ('Biostrings', '2.40.2', bioconductor_options),
+    ('GenomicRanges', '1.24.2', bioconductor_options),
+    ('BiocParallel', '1.6.6', bioconductor_options),
+    ('Rsamtools', '1.24.0', bioconductor_options),
+    ('lambda.r', '1.1.9', ext_options),
+    ('futile.options', '1.0.0', ext_options),
+    ('futile.logger', '1.4.3', ext_options),
+    ('SummarizedExperiment', '1.2.3', bioconductor_options),
+    ('GenomicAlignments', '1.8.4', bioconductor_options),
+    ('ShortRead', '1.30.0', bioconductor_options),
+    ('graph', '1.50.0', bioconductor_options),
+    ('affyio', '1.42.0', bioconductor_options),
+    ('BiocInstaller', '1.22.3', bioconductor_options),
+    ('preprocessCore', '1.34.0', bioconductor_options),
+    ('affy', '1.50.0', bioconductor_options),
+    ('GO.db', '3.3.0', bioconductor_options),
+    ('limma', '3.28.19', bioconductor_options),
+    ('RBGL', '1.48.1', bioconductor_options),
+    ('org.Hs.eg.db', '3.3.0', bioconductor_options),
+    ('AnnotationForge', '1.14.2', bioconductor_options),
+    ('KEGG.db', '3.2.3', bioconductor_options),
+    ('annaffy', '1.44.0', bioconductor_options),
+    ('gcrma', '2.44.0', bioconductor_options),
+    ('oligoClasses', '1.34.0', bioconductor_options),
+    ('edgeR', '3.14.0', bioconductor_options),
+    ('PFAM.db', '3.3.0', bioconductor_options),
+    ('perm', '1.0-0.0', ext_options),
+    ('baySeq', '2.6.0', bioconductor_options),
+    ('qvalue', '2.4.2', bioconductor_options),
+    ('impute', '1.46.0', bioconductor_options),
+    ('samr', '2.0', ext_options),
+    ('DEGseq', '1.26.0', bioconductor_options),
+    ('hgu133plus2.db', '3.2.3', bioconductor_options),
+    ('illuminaio', '0.14.0', bioconductor_options),
+    ('rtracklayer', '1.32.2', bioconductor_options),
+    ('biomaRt', '2.28.0', bioconductor_options),
+    ('GenomicFeatures', '1.24.5', bioconductor_options),
+    ('bumphunter', '1.12.0', bioconductor_options),
+    ('multtest', '2.28.0', bioconductor_options),
+    ('siggenes', '1.46.0', bioconductor_options),
+    ('DynDoc', '1.50.0', bioconductor_options),
+    ('genoset', '1.28.2', bioconductor_options),
+    ('NOISeq', '2.16.0', bioconductor_options),
+    ('Rgraphviz', '2.16.0', bioconductor_options),
+    ('RNASeqPower', '1.12.0', bioconductor_options),
+    ('annotate', '1.50.0', bioconductor_options),
+    ('GSEABase', '1.34.0', bioconductor_options),
+    ('genefilter', '1.54.2', bioconductor_options),
+    ('Category', '2.38.0', bioconductor_options),
+    ('GOstats', '2.38.1', bioconductor_options),
+    ('BSgenome', '1.40.1', bioconductor_options),
+    ('VariantAnnotation', '1.18.7', bioconductor_options),
+    ('interactiveDisplayBase', '1.10.3', bioconductor_options),
+    ('AnnotationHub', '2.4.2', bioconductor_options),
+    ('ensembldb', '1.4.7', bioconductor_options),
+    ('biovizBase', '1.20.0', bioconductor_options),
+    ('OrganismDbi', '1.14.1', bioconductor_options),
+    ('ggbio', '1.20.2', bioconductor_options),
+    ('geneplotter', '1.50.0', bioconductor_options),
+    ('DESeq2', '1.12.4', bioconductor_options),
+    ('ReportingTools', '2.12.2', bioconductor_options),
+    ('affycoretools', '1.44.3', bioconductor_options),
+    ('TxDb.Hsapiens.UCSC.hg19.knownGene', '3.2.2', bioconductor_options),
+    ('Homo.sapiens', '1.3.1', bioconductor_options),
+    ('BSgenome.Hsapiens.UCSC.hg19', '1.4.0', bioconductor_options),
+    ('AgiMicroRna', '2.22.0', bioconductor_options),
+    ('GenomeGraphs', '1.32.0', bioconductor_options),
+    ('geneLenDataBase', '1.8.0', bioconductor_options),
+    ('goseq', '1.24.0', bioconductor_options),
+    ('KEGGREST', '1.12.2', bioconductor_options),
+    ('KEGGgraph', '1.30.0', bioconductor_options),
+    ('KEGGprofile', '1.14.0', bioconductor_options),
+    ('GEOquery', '2.38.4', bioconductor_options),
+    ('mixOmics', '6.0.0', ext_options),
+    ('minfi', '1.18.6', bioconductor_options),
+    ('FDb.InfiniumMethylation.hg19', '2.2.0', bioconductor_options),
+    ('methylumi', '2.18.2', bioconductor_options),
+    ('lumi', '2.24.0', bioconductor_options),
+    ('widgetTools', '1.50.0', bioconductor_options),
+    ('tkWidgets', '1.50.0', bioconductor_options),
+    ('Mfuzz', '2.32.0', bioconductor_options),
+    ('maSigPro', '1.44.0', bioconductor_options),
+    ('SPIA', '2.24.0', bioconductor_options),
+    ('Gviz', '1.16.4', bioconductor_options),
+    ('cummeRbund', '2.14.0', bioconductor_options),
+    ('GenomicFiles', '1.8.0', bioconductor_options),
+    ('derfinderHelper', '1.6.3', bioconductor_options),
+    ('derfinder', '1.6.4', bioconductor_options),
+    ('polyester', '1.8.3', bioconductor_options),
+    ('Rsubread', '1.22.3', bioconductor_options),
+    ('pcaMethods', '1.64.0', bioconductor_options),
+    ('marray', '1.50.0', bioconductor_options),
+    ('CGHbase', '1.32.0', bioconductor_options),
+    ('sigaR', '1.15.0', bioconductor_options),
+    ('HCsnip', '1.12.0', bioconductor_options),
+    ('metagenomeSeq', '1.14.2', bioconductor_options),
+    ('gdsfmt', '1.8.3', bioconductor_options),
+    ('SNPRelate', '1.6.5', dict(bioconductor_options.items() + [('patches', ['SNPRelate-1.6.5_no-SSE-intr.patch'])])),
+    ('rhdf5', '2.16.0', bioconductor_options),
+    ('biomformat', '1.0.2', bioconductor_options),
+    ('phyloseq', '1.16.2', bioconductor_options),
+    ('ALDEx2', '1.4.0', bioconductor_options),
+    ('dada2', '1.0.3', bioconductor_options),
+]
+
+modextrapaths = {'R_LIBS': ''}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['AnnotationDbi', 'BiocInstaller', 'GenomicFeatures'],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/r/R-bundle-Bioconductor/SNPRelate-1.6.5_no-SSE-intr.patch b/easybuild/easyconfigs/r/R-bundle-Bioconductor/SNPRelate-1.6.5_no-SSE-intr.patch
new file mode 100644
index 0000000000000000000000000000000000000000..cb934b50ee0ec3051eff837f8e6ef6eff469b8e7
--- /dev/null
+++ b/easybuild/easyconfigs/r/R-bundle-Bioconductor/SNPRelate-1.6.5_no-SSE-intr.patch
@@ -0,0 +1,15 @@
+disable SSE intrinsics to avoid error when compiling with Intel C++ compiler:
+"error: expression must have integral or enum type"
+in genIBS.cpp and genKING.cpp due to use of complement (~) on values of type _m128i
+author: Kenneth Hoste; patch suggested by Xiuwen Zheng (SNPRelate maintainer)
+--- SNPRelate.orig/src/Makevars	2016-07-29 06:39:00.000000000 +0200
++++ SNPRelate/src/Makevars	2016-08-26 09:31:44.440787000 +0200
+@@ -3,7 +3,7 @@
+ ###                                                            ###
+ 
+ # additional preprocessor options
+-PKG_CPPFLAGS = -DUSING_R -I.
++PKG_CPPFLAGS = -DUSING_R -I. -DCOREARRAY_NO_SIMD
+ 
+ # to set flags for the linker
+ PKG_LIBS = $(FLIBS) $(BLAS_LIBS) $(LAPACK_LIBS) -lpthread
diff --git a/easybuild/easyconfigs/r/R/R-3.2.3-intel-2016a-libX11-1.6.3.eb b/easybuild/easyconfigs/r/R/R-3.2.3-intel-2016a-libX11-1.6.3.eb
index 5a44f1a48c8caa0b1f2312717e6870c18f6ae5af..1a886a00c96e84d063a6b2cbd8d934ee6c2540c4 100644
--- a/easybuild/easyconfigs/r/R/R-3.2.3-intel-2016a-libX11-1.6.3.eb
+++ b/easybuild/easyconfigs/r/R/R-3.2.3-intel-2016a-libX11-1.6.3.eb
@@ -15,8 +15,6 @@ source_urls = ['http://cran.us.r-project.org/src/base/R-%(version_major)s']
 
 preconfigopts = 'BLAS_LIBS="$LIBBLAS" LAPACK_LIBS="$LIBLAPACK"'
 configopts = "--with-lapack --with-blas --with-pic --enable-threads --with-x=yes --enable-R-shlib"
-#Actually use Tcl/Tk
-configopts += ' --with-tcl-config=$EBROOTTCL/lib/tclConfig.sh --with-tk-config=$EBROOTTK/lib/tkConfig.sh '
 # Enable graphics capabilities for plotting.
 configopts += " --with-cairo --with-libpng --with-jpeglib --with-libtiff"
 # some recommended packages may fail in a parallel build (e.g. Matrix), and we're installing them anyway below
diff --git a/easybuild/easyconfigs/r/RAxML/RAxML-8.2.9-foss-2016a-hybrid-avx2.eb b/easybuild/easyconfigs/r/RAxML/RAxML-8.2.9-foss-2016a-hybrid-avx2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..db82fd5e9ad2e6e614f2b1ad240bb4863290df12
--- /dev/null
+++ b/easybuild/easyconfigs/r/RAxML/RAxML-8.2.9-foss-2016a-hybrid-avx2.eb
@@ -0,0 +1,25 @@
+easyblock = 'MakeCp'
+
+name = 'RAxML'
+version = '8.2.9'
+versionsuffix = '-hybrid-avx2'
+
+homepage = 'https://github.com/stamatak/standard-RAxML'
+description = "RAxML search algorithm for maximum likelihood based inference of phylogenetic trees."
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'usempi': True}
+
+sources = ['v%(version)s.zip']
+source_urls = ['https://github.com/stamatak/standard-RAxML/archive/']
+
+buildopts = '-f Makefile.AVX2.HYBRID.gcc CC="$CC"'
+
+files_to_copy = [(["raxmlHPC-HYBRID-AVX2"], "bin"), "usefulScripts", "README", "manual"]
+
+sanity_check_paths = {
+    'files': ["bin/raxmlHPC-HYBRID-AVX2"],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/r/RDMC/RDMC-2.9.5-ictce-5.5.0.eb b/easybuild/easyconfigs/r/RDMC/RDMC-2.9.5-ictce-5.5.0.eb
new file mode 100755
index 0000000000000000000000000000000000000000..a768f518aca6f9b3cf209673f80748068d3319c8
--- /dev/null
+++ b/easybuild/easyconfigs/r/RDMC/RDMC-2.9.5-ictce-5.5.0.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'RDMC'
+version = '2.9.5'
+
+homepage = 'http://code.icecube.wisc.edu/'
+description = "The AMANDA-era RDMC physics library"
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+source_urls = ['http://code.icecube.wisc.edu/tools/distfiles/%(namelower)s/']
+sources = [SOURCELOWER_TAR_BZ2]
+
+builddependencies = [('texinfo', '5.2')]
+
+modextrapaths = {'LD_LIBRARY_PATH': 'lib/rdmc'}
+
+sanity_check_paths = {
+    'files': ["bin/cpfeil", "include/rdmc/rdmc.h", "include/rdmc/rdmc.inc",
+              "lib/rdmc/librdmc.a", "lib/rdmc/librdmc.so"],
+    'dirs': [],
+}
+
+moduleclass = 'phys'
diff --git a/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.13-ictce-5.5.0.eb b/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.13-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e025c77b0277d5835714260a9d4b8acfd594c77e
--- /dev/null
+++ b/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.13-ictce-5.5.0.eb
@@ -0,0 +1,39 @@
+name = 'ROOT'
+version = 'v5.34.13'
+
+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': 'ictce', 'version': '5.5.0'}
+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',
+]
+
+python = 'Python'
+pyver = '2.7.6'
+
+dependencies = [
+    ('GSL', '1.16'),
+    ('libxml2', '2.9.1', '-%s-%s' % (python, pyver)),
+    (python, pyver),
+]
+
+# architecture
+arch = 'linuxx8664icc'
+
+# disable features
+configopts = ' --disable-xft --disable-x11 --disable-xrootd --disable-mysql'
+# 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'
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/r/RSEM/RSEM-1.2.30-intel-2016b.eb b/easybuild/easyconfigs/r/RSEM/RSEM-1.2.30-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5420a22996be198b95a6a16494b0f93c3f8d0fea
--- /dev/null
+++ b/easybuild/easyconfigs/r/RSEM/RSEM-1.2.30-intel-2016b.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'RSEM'
+version = '1.2.30'
+
+homepage = 'http://deweylab.github.io/RSEM/'
+description = """RNA-Seq by Expectation-Maximization"""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['https://github.com/deweylab/RSEM/archive/']
+sources = ['v%(version)s.tar.gz']
+
+patches = ['RSEM-%(version)s_makefiles.patch']
+
+skipsteps = ['configure']
+installopts = "prefix=%(installdir)s"
+
+dependencies = [
+    ('ncurses', '6.0'),
+    ('zlib', '1.2.8'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/rsem-calculate-expression', 'bin/rsem-plot-model', 'bin/rsem-plot-transcript-wiggles', 'bin/rsem-bam2wig', 
+              'bin/rsem-generate-data-matrix', 'bin/rsem-run-em', 'bin/convert-sam-for-rsem'],
+    'dirs': ['bin/samtools-1.3'],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/r/Reads2snp/Reads2snp-2.0.eb b/easybuild/easyconfigs/r/Reads2snp/Reads2snp-2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..506890dce28fea86bceb7244e506c77f0584270b
--- /dev/null
+++ b/easybuild/easyconfigs/r/Reads2snp/Reads2snp-2.0.eb
@@ -0,0 +1,31 @@
+# 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 = 'Tarball'
+
+name = 'Reads2snp'
+version = '2.0'
+
+homepage = 'http://kimura.univ-montp2.fr/PopPhyl/index.php?section=tools'
+description = """reads2snp is a SNP and genotype caller: it predicts the genotype of distinct individuals 
+ at distinct positions of a set of sequences based on read mapping / read counts. Its typical input is a bam file. 
+ Its typical output is a vcf file. It is written in C++, based on the bio++ libraries, multi-threaded with openMP, 
+ available under Linux and MacOS"""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = ['http://kimura.univ-montp2.fr/PopPhyl/resources/tools/']
+sources = ['%(namelower)s_%(version)s.zip']
+
+sanity_check_paths = {
+    'files': ['reads2snp_%(version)s.64.bin'],
+    'dirs': [],
+}
+
+modextrapaths = {
+    'PATH': "", # add the installation dir to PATH
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/r/Ruby/Ruby-2.3.1-intel-2016b.eb b/easybuild/easyconfigs/r/Ruby/Ruby-2.3.1-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f97bed944ca236687dbcd46c7bc4592b2cdaf61d
--- /dev/null
+++ b/easybuild/easyconfigs/r/Ruby/Ruby-2.3.1-intel-2016b.eb
@@ -0,0 +1,63 @@
+#    With <3 for EasyBuild
+#
+#    EasyConfig for Ruby 2.1:
+#    ----------------------------------------------------------------------------
+#    Copyright: 2014 - Gregor Mendel Institute of Molecular Plant Biology GmBH
+#    License: MIT
+#    Authors: Aaron <aaron.zauner@gmi.oeaw.ac.at> Zauner
+#    ----------------------------------------------------------------------------
+
+name = 'Ruby'
+version = '2.3.1'
+
+homepage = 'https://www.ruby-lang.org'
+description = """Ruby is a dynamic, open source programming language with 
+ a focus on simplicity and productivity. It has an elegant syntax that is 
+ natural to read and easy to write."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://cache.ruby-lang.org/pub/ruby/']
+
+ext_options = {
+    'source_urls': ['http://rubygems.org/downloads/'],
+    'source_tmpl': '%(name)s-%(version)s.gem',
+}
+
+exts_list = [
+    ('ffi', '1.9.10', ext_options),
+    ('childprocess', '0.5.9', ext_options),
+    ('json', '1.8.3', ext_options),
+    ('cabin', '0.8.1', ext_options),
+    ('backports', '3.6.8', ext_options),
+    ('arr-pm', '0.0.10', ext_options),
+    ('clamp', '1.0.0', ext_options),
+    ('multipart-post', '2.0.0', ext_options),
+    ('faraday', '0.9.2', ext_options),
+    ('faraday_middleware', '0.10.0', ext_options),
+    ('highline', '1.7.8', ext_options),
+    ('net-http-pipeline', '1.0.1', ext_options),
+    ('net-http-persistent', '2.9.4', ext_options),
+    ('multi_json', '1.11.3', ext_options),
+    ('addressable', '2.4.0', ext_options),
+    ('gh', '0.14.0', ext_options),
+    ('launchy', '2.4.3', ext_options),
+    ('ethon', '0.8.1', ext_options),
+    ('typhoeus', '0.8.0', ext_options),
+    ('websocket', '1.2.3', ext_options),
+    ('pusher-client', '0.6.2', ext_options),
+    ('diff-lcs', '1.2.5', ext_options),
+    ('rspec-support', '3.4.1', ext_options),
+    ('rspec-mocks', '3.4.1', ext_options),
+    ('rspec-expectations', '3.4.0', ext_options),
+    ('rspec-core', '3.4.4', ext_options),
+    ('rspec', '3.4.0', ext_options),
+    ('rack', '1.6.4', ext_options),
+    ('rack-protection', '1.5.3', ext_options),
+    ('tilt', '2.0.2', ext_options),
+    ('sinatra', '1.4.7', ext_options),
+    ('rack-test', '0.6.3', ext_options),
+]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/r/Rust/Rust-1.12.0-foss-2016b.eb b/easybuild/easyconfigs/r/Rust/Rust-1.12.0-foss-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..de615e762046ffe34e4e7caaa5df4b9a0703f9a0
--- /dev/null
+++ b/easybuild/easyconfigs/r/Rust/Rust-1.12.0-foss-2016b.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'Rust'
+version = '1.12.0'
+
+homepage = 'https://www.rust-lang.org'
+description = """Rust is a systems programming language that runs blazingly fast, prevents segfaults,
+ and guarantees thread safety."""
+
+toolchain = {'name': 'foss', 'version': '2016b'}
+
+source_urls = ['https://static.rust-lang.org/dist/']
+sources = ['rustc-%(version)s-src.tar.gz']
+
+builddependencies = [('Python', '2.7.12'), ('CMake','3.6.2')]
+
+sanity_check_paths = {
+    'files': ['bin/rustc', 'bin/rustdoc'],
+    'dirs': ['share/doc', 'share/man', 'lib/rustlib'],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/r/requests/requests-2.10.0-foss-2016a-Python-3.5.1.eb b/easybuild/easyconfigs/r/requests/requests-2.10.0-foss-2016a-Python-3.5.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1435fab7e53a660665edf278a39301f94d2e1d5d
--- /dev/null
+++ b/easybuild/easyconfigs/r/requests/requests-2.10.0-foss-2016a-Python-3.5.1.eb
@@ -0,0 +1,24 @@
+easyblock = 'PythonPackage'
+
+name = 'requests'
+version = '2.10.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://pypi.python.org/pypi/requests/%(version)s'
+description = """Python http for humans"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [PYPI_LOWER_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('Python', '3.5.1'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/requests-%(version)s-py%(pyshortver)s.egg']
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/r/requests/requests-2.11.1-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/r/requests/requests-2.11.1-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..28824ad2fc145f27799888b2467814d8c31f3333
--- /dev/null
+++ b/easybuild/easyconfigs/r/requests/requests-2.11.1-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,24 @@
+easyblock = 'PythonPackage'
+
+name = 'requests'
+version = '2.11.1'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://pypi.python.org/pypi/requests/2.6.0'
+description = """Python http for humans"""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = [PYPI_LOWER_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.12'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/r/requests/requests-2.11.1-intel-2016b-Python-3.5.2.eb b/easybuild/easyconfigs/r/requests/requests-2.11.1-intel-2016b-Python-3.5.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..19001f1fa644e9882e9015740266e5131d9bfb85
--- /dev/null
+++ b/easybuild/easyconfigs/r/requests/requests-2.11.1-intel-2016b-Python-3.5.2.eb
@@ -0,0 +1,24 @@
+easyblock = 'PythonPackage'
+
+name = 'requests'
+version = '2.11.1'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://pypi.python.org/pypi/requests/2.6.0'
+description = """Python http for humans"""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = [PYPI_LOWER_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('Python', '3.5.2'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/s/S.A.G.E./S.A.G.E.-6.3.eb b/easybuild/easyconfigs/s/S.A.G.E./S.A.G.E.-6.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..28ef2c7ef618fabc019df802f07457730ee98cd9
--- /dev/null
+++ b/easybuild/easyconfigs/s/S.A.G.E./S.A.G.E.-6.3.eb
@@ -0,0 +1,25 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Ravi Tripathi
+# Email: ravi89@uab.edu
+
+easyblock = "Tarball"
+
+name = 'S.A.G.E.'
+version = '6.3'
+
+homepage = 'https://code.google.com/archive/p/opensage/'
+description = """ S.A.G.E. (Statistical Analysis for Genetic 
+Epidemiology) is free software package containing programs for 
+use in the genetic analysis of family, pedigree and individual data."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+source_urls = ['https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/opensage/']
+sources = ['%(name)sv%(version)s_Linux_x86_64.tar.gz']
+
+sanity_check_paths = {
+    'files': ["bin/freq", "bin/ageon", "bin/segreg"],
+    'dirs': ["data_files", "documentaion"]
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.3.1-intel-2016b.eb b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.3.1-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..068f81d41af5ae9c447fb52545faf43087db8178
--- /dev/null
+++ b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.3.1-intel-2016b.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$
+#
+# Modified by: Adam Huffman
+# The Francis Crick Institute
+##
+name = 'SAMtools'
+version = '1.3.1'
+
+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': 'intel', 'version': '2016b'}
+toolchainopts = {'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-%(version)s_Makefile.patch']
+
+dependencies = [
+    ('ncurses', '6.0'),
+    ('zlib', '1.2.8'),
+]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.4-intel-2016b.eb b/easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.4-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..20bc255b1a92698416894bcafc8849611455feb1
--- /dev/null
+++ b/easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.4-intel-2016b.eb
@@ -0,0 +1,14 @@
+name = 'SCOTCH'
+version = '6.0.4'
+
+homepage = 'http://gforge.inria.fr/projects/scotch/'
+description = """Software package and libraries for sequential and parallel graph partitioning,
+static mapping, and sparse matrix block ordering, and sequential mesh and hypergraph partitioning."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+toolchainopts = {'pic': True}
+
+source_urls = ['http://gforge.inria.fr/frs/download.php/file/34618/']
+sources = ['%(namelower)s_%(version)s.tar.gz']
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/s/SCons/SCons-2.5.0-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/s/SCons/SCons-2.5.0-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..87b42067554d7d732a2e0c38069c7771cff3d335
--- /dev/null
+++ b/easybuild/easyconfigs/s/SCons/SCons-2.5.0-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,24 @@
+easyblock = 'PythonPackage'
+
+name = 'SCons'
+version = '2.5.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://www.scons.org/'
+description = "SCons is a software construction tool."
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
+
+dependencies = [('Python', '2.7.12')]
+
+sanity_check_paths = {
+    'files': ['bin/scons', 'bin/scons-time', 'bin/sconsign'],
+    'dirs': ['lib/%(namelower)s-%(version)s/%(name)s'],
+}
+
+options = {'modulename': False}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/s/SDL2/SDL2-2.0.4-intel-2016b.eb b/easybuild/easyconfigs/s/SDL2/SDL2-2.0.4-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9d089f04eb6ce8fe5e556c92a0fe0929a3eeee15
--- /dev/null
+++ b/easybuild/easyconfigs/s/SDL2/SDL2-2.0.4-intel-2016b.eb
@@ -0,0 +1,35 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu, 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 = 'SDL2'
+version = '2.0.4'
+
+homepage = 'http://www.libsdl.org/'
+description = "SDL: Simple DirectMedia Layer, a cross-platform multimedia library"
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['http://www.libsdl.org/release/']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('X11', '20160819'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/sdl2-config', 'lib/libSDL2.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/s/SHORE/SHORE-0.9.3-foss-2016a.eb b/easybuild/easyconfigs/s/SHORE/SHORE-0.9.3-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..756efd9115ca042ae4c7f5d226444872eb54a26e
--- /dev/null
+++ b/easybuild/easyconfigs/s/SHORE/SHORE-0.9.3-foss-2016a.eb
@@ -0,0 +1,29 @@
+easyblock = 'ConfigureMake'
+
+name = 'SHORE'
+version = '0.9.3'
+
+homepage = "http://1001genomes.org/software/shore.html"
+description = """SHORE, for Short Read, is a mapping and analysis pipeline for short read data produced on the Illumina platform.
+"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['https://sourceforge.net/projects/shore/files/']
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = '--with-mpi'
+
+dependencies = [
+   ('XZ','5.2.2'),
+   ('zlib','1.2.8'),
+   ('GSL','1.16'), # GSL 2.1 does not work.
+   ('Boost', '1.61.0'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/shore', 'bin/shore-mpi', 'lib/libshore.a'],
+    'dirs': ['include', 'lib'],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SIP/SIP-4.18-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/s/SIP/SIP-4.18-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0ac8c1861dc319fa5edca39d8d3b4a8316e22ae2
--- /dev/null
+++ b/easybuild/easyconfigs/s/SIP/SIP-4.18-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,30 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Bart Verleye
+# Center for eResearch, Auckland
+easyblock = 'ConfigureMakePythonPackage'
+
+name = 'SIP'
+version = '4.18'
+versionsuffix = '-Python-%(pyver)s'
+
+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': 'foss', 'version': '2016a'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://sourceforge.net/projects/pyqt/files/sip/sip-%(version)s']
+
+dependencies = [('Python', '2.7.11')]
+
+configopts = "configure.py --bindir %(installdir)s/bin --incdir %(installdir)s/include "
+configopts += "--destdir %(installdir)s/lib/python%(pyshortver)s/site-packages"
+
+sanity_check_paths = {
+    'files': ['bin/sip', 'include/sip.h'] +
+             ['lib/python%%(pyshortver)s/site-packages/%s' % x
+              for x in ['sip.%s' % SHLIB_EXT, 'sipconfig.py', 'sipdistutils.py']],
+    'dirs': [],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/s/SIP/SIP-4.18.1-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/s/SIP/SIP-4.18.1-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..dbc48b8044d8de9956052828588f23750d75e32a
--- /dev/null
+++ b/easybuild/easyconfigs/s/SIP/SIP-4.18.1-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,30 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Bart Verleye
+# Center for eResearch, Auckland
+easyblock = 'ConfigureMakePythonPackage'
+
+name = 'SIP'
+version = '4.18.1'
+versionsuffix = '-Python-%(pyver)s'
+
+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': 'foss', 'version': '2016a'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://sourceforge.net/projects/pyqt/files/sip/sip-%(version)s']
+
+dependencies = [('Python', '2.7.11')]
+
+configopts = "configure.py --bindir %(installdir)s/bin --incdir %(installdir)s/include "
+configopts += "--destdir %(installdir)s/lib/python%(pyshortver)s/site-packages"
+
+sanity_check_paths = {
+    'files': ['bin/sip', 'include/sip.h'] +
+             ['lib/python%%(pyshortver)s/site-packages/%s' % x
+              for x in ['sip.%s' % SHLIB_EXT, 'sipconfig.py', 'sipdistutils.py']],
+    'dirs': [],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/s/SQLite/SQLite-3.13.0-GCC-5.4.0-2.26.eb b/easybuild/easyconfigs/s/SQLite/SQLite-3.13.0-GCC-5.4.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c8632b48d572c276b996aba0b56456a7b0c36ec9
--- /dev/null
+++ b/easybuild/easyconfigs/s/SQLite/SQLite-3.13.0-GCC-5.4.0-2.26.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.13.0'
+
+homepage = 'http://www.sqlite.org/'
+description = 'SQLite: SQL Database Engine in a C Library'
+
+toolchain = {'name': 'GCC', 'version': '5.4.0-2.26'}
+
+source_urls = ['http://www.sqlite.org/2016/']
+version_minor_etc = version.split('.')[1:]
+version_minor_etc += '0' * (3 - len(version_minor_etc))
+version_str = '%(version_major)s' + ''.join('%02d' % int(x) for x in version_minor_etc)
+sources = ['sqlite-autoconf-%s.tar.gz' % version_str]
+
+dependencies = [
+    ('libreadline', '6.3'),
+    ('Tcl', '8.6.5'),
+]
+
+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.13.0-foss-2016.04.eb b/easybuild/easyconfigs/s/SQLite/SQLite-3.13.0-foss-2016.04.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ee0989cdf47ed8c704440cd282ede5d793f06632
--- /dev/null
+++ b/easybuild/easyconfigs/s/SQLite/SQLite-3.13.0-foss-2016.04.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.13.0'
+
+homepage = 'http://www.sqlite.org/'
+description = 'SQLite: SQL Database Engine in a C Library'
+
+toolchain = {'name': 'foss', 'version': '2016.04'}
+
+source_urls = ['http://www.sqlite.org/2016/']
+version_minor_etc = version.split('.')[1:]
+version_minor_etc += '0' * (3 - len(version_minor_etc))
+version_str = '%(version_major)s' + ''.join('%02d' % int(x) for x in version_minor_etc)
+sources = ['sqlite-autoconf-%s.tar.gz' % version_str]
+
+dependencies = [
+    ('libreadline', '6.3'),
+    ('Tcl', '8.6.5'),
+]
+
+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.14.1-GCCcore-4.9.3.eb b/easybuild/easyconfigs/s/SQLite/SQLite-3.14.1-GCCcore-4.9.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d38cf611011d8eaaaed9f20aee025c8ad36f397e
--- /dev/null
+++ b/easybuild/easyconfigs/s/SQLite/SQLite-3.14.1-GCCcore-4.9.3.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::   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.14.1'
+
+homepage = 'http://www.sqlite.org/'
+description = 'SQLite: SQL Database Engine in a C Library'
+
+toolchain = {'name': 'GCCcore', 'version': '4.9.3'}
+
+# eg. http://www.sqlite.org/2014/sqlite-autoconf-3080600.tar.gz
+source_urls = ['http://www.sqlite.org/2016/']
+version_str = '%%(version_major)s%s00' % ''.join('%02d' % int(x) for x in version.split('.')[1:])
+sources = ['sqlite-autoconf-%s.tar.gz' % version_str]
+
+builddependencies = [
+    ('binutils', '2.25'),
+]
+
+dependencies = [
+    ('libreadline', '6.3'),
+    ('Tcl', '8.6.6'),
+]
+
+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.8.1-GCC-4.8.4.eb b/easybuild/easyconfigs/s/SQLite/SQLite-3.8.8.1-GCC-4.8.4.eb
new file mode 100644
index 0000000000000000000000000000000000000000..27cd84d7ec041f654f7d5fd0ed068d683fce9431
--- /dev/null
+++ b/easybuild/easyconfigs/s/SQLite/SQLite-3.8.8.1-GCC-4.8.4.eb
@@ -0,0 +1,38 @@
+##
+# 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.8.1'
+
+homepage = 'http://www.sqlite.org/'
+description = 'SQLite: SQL Database Engine in a C Library'
+
+toolchain = {'name': 'GCC', 'version': '4.8.4'}
+
+# 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'),
+    ('Tcl', '8.6.3'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/sqlite3'],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/s/STAMP/STAMP-1.2-intel-2016a.eb b/easybuild/easyconfigs/s/STAMP/STAMP-1.2-intel-2016a.eb
index 117f2476d8f9cbcf26f751e7a91a5a6b9ebef90b..f3009cafcc3dcecf3dd7c29b72f93d4f6b4fc386 100644
--- a/easybuild/easyconfigs/s/STAMP/STAMP-1.2-intel-2016a.eb
+++ b/easybuild/easyconfigs/s/STAMP/STAMP-1.2-intel-2016a.eb
@@ -3,19 +3,19 @@ easyblock = 'CmdCp'
 name = 'STAMP'
 version = '1.2'
 
-homepage = 'ihttp://www.benoslab.pitt.edu/stamp/ - https://github.com/aertslab/stamp'
+homepage = 'http://www.benoslab.pitt.edu/stamp/'
 description = """STAMP is a tool for characterizing similarities between transcription factor binding motifs"""
 
 toolchain = {'name': 'intel', 'version': '2016a'}
 
-source_urls = ['https://github.com/aertslab/stamp/archive/']
+source_urls = ['https://github.com/seqcode/stamp/archive/']
 sources = ['v%(version)s.tar.gz']
 
 dependencies = [('GSL', '2.1')]
 
 start_dir = 'src'
 
-cmds_map = [('.*', "$CXX $CXXFLAGS -o stamp *.cpp -lm -lgsl -lgslcblas")]
+cmds_map = [('.*', "$CXX $CXXFLAGS -o stamp *.cpp $LDFLAGS -lm -lgsl -lgslcblas")]
 
 files_to_copy = [(['stamp'], 'bin')]
 
diff --git a/easybuild/easyconfigs/s/STAMP/STAMP-1.3-intel-2016a.eb b/easybuild/easyconfigs/s/STAMP/STAMP-1.3-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4eb03dff0151993df6eef1c7149c03c7f61f97d9
--- /dev/null
+++ b/easybuild/easyconfigs/s/STAMP/STAMP-1.3-intel-2016a.eb
@@ -0,0 +1,27 @@
+easyblock = 'CmdCp'
+
+name = 'STAMP'
+version = '1.3'
+
+homepage = 'http://www.benoslab.pitt.edu/stamp/'
+description = """STAMP is a tool for characterizing similarities between transcription factor binding motifs"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['https://github.com/seqcode/stamp/archive/']
+sources = ['v%(version)s.tar.gz']
+
+dependencies = [('GSL', '2.2.1')]
+
+start_dir = 'src'
+
+cmds_map = [('.*', "$CXX $CXXFLAGS -o stamp *.cpp $LDFLAGS -lm -lgsl -lgslcblas")]
+
+files_to_copy = [(['stamp'], 'bin')]
+
+sanity_check_paths = {
+    'files': ['bin/stamp'],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/STAMP/STAMP-1.3-intel-2016b.eb b/easybuild/easyconfigs/s/STAMP/STAMP-1.3-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..51a70d8dc1935078c4a31bfa57aa3dfaa7e25291
--- /dev/null
+++ b/easybuild/easyconfigs/s/STAMP/STAMP-1.3-intel-2016b.eb
@@ -0,0 +1,27 @@
+easyblock = 'CmdCp'
+
+name = 'STAMP'
+version = '1.3'
+
+homepage = 'http://www.benoslab.pitt.edu/stamp/'
+description = """STAMP is a tool for characterizing similarities between transcription factor binding motifs"""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['https://github.com/seqcode/stamp/archive/']
+sources = ['v%(version)s.tar.gz']
+
+dependencies = [('GSL', '2.2.1')]
+
+start_dir = 'src'
+
+cmds_map = [('.*', "$CXX $CXXFLAGS -o stamp *.cpp $LDFLAGS -lm -lgsl -lgslcblas")]
+
+files_to_copy = [(['stamp'], 'bin')]
+
+sanity_check_paths = {
+    'files': ['bin/stamp'],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/STREAM/STREAM-5.10-intel-2015a.eb b/easybuild/easyconfigs/s/STREAM/STREAM-5.10-intel-2015a.eb
index 79841574824ac44256ab1cc50406beface9a6f6a..44cf8f84ff4a407078896fbbcee923a88ec5bc8f 100644
--- a/easybuild/easyconfigs/s/STREAM/STREAM-5.10-intel-2015a.eb
+++ b/easybuild/easyconfigs/s/STREAM/STREAM-5.10-intel-2015a.eb
@@ -22,13 +22,15 @@ cmds_str = "$CC $CFLAGS %(source)s -mcmodel=large -DSTREAM_ARRAY_SIZE=10000000 -
 cmds_str += "$CC $CFLAGS %(source)s -mcmodel=large -DSTREAM_ARRAY_SIZE=100000000 -DNTIMES=1000 -o stream_1Kx100M; "
 # 1 billion array elements (1000 runs): requires ~22.4 GiB of memory
 cmds_str += "$CC $CFLAGS %(source)s -mcmodel=large -DSTREAM_ARRAY_SIZE=1000000000 -DNTIMES=1000 -o stream_1Kx1B; "
+# 2.5 billion array elements (1000 runs): requires ~56 GiB of memory
+cmds_str += "$CC $CFLAGS %(source)s -mcmodel=large -DSTREAM_ARRAY_SIZE=2500000000 -DNTIMES=1000 -o stream_1Kx2.5B; "
 
 cmds_map = [('stream.c', cmds_str)]
 
-files_to_copy = [(['stream_1Kx10M', 'stream_1Kx100M', 'stream_1Kx1B'], 'bin')]
+files_to_copy = [(['stream_1Kx10M', 'stream_1Kx100M', 'stream_1Kx1B', 'stream_1Kx2.5B'], 'bin')]
 
 sanity_check_paths = {
-    'files': ['bin/stream_1Kx10M', 'bin/stream_1Kx100M', 'bin/stream_1Kx1B'],
+    'files': ['bin/stream_1Kx10M', 'bin/stream_1Kx100M', 'bin/stream_1Kx1B', 'bin/stream_1Kx2.5B'],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/s/STREAM/STREAM-5.10-intel-2016b.eb b/easybuild/easyconfigs/s/STREAM/STREAM-5.10-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..94341c99a0d9ce7fb9683c5895f858a9e77df41e
--- /dev/null
+++ b/easybuild/easyconfigs/s/STREAM/STREAM-5.10-intel-2016b.eb
@@ -0,0 +1,41 @@
+easyblock = 'CmdCp'
+
+name = 'STREAM'
+version = '5.10'
+
+homepage = 'http://www.cs.virginia.edu/stream/'
+description = """The STREAM benchmark is a simple synthetic benchmark program that measures sustainable
+ memory bandwidth (in MB/s) and the corresponding computation rate for simple vector kernels."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+toolchainopts = {'openmp': True}
+
+source_urls = ['http://www.cs.virginia.edu/stream/FTP/Code/']
+sources = ['%(namelower)s.c']
+checksums = ['dd2941e3a28ff90a79b571273c10aacf']
+
+skipsteps = ['source']
+
+# 10 million array elements (1000 runs): requires ~224MB of memory
+cmds_str = "$CC $CFLAGS %(source)s -mcmodel=large -DSTREAM_ARRAY_SIZE=10000000 -DNTIMES=1000 -o stream_1Kx10M; "
+# 100 million array elements (1000 runs): requires ~2.2GiB of memory
+cmds_str += "$CC $CFLAGS %(source)s -mcmodel=large -DSTREAM_ARRAY_SIZE=100000000 -DNTIMES=1000 -o stream_1Kx100M; "
+# 1 billion array elements (1000 runs): requires ~22.4 GiB of memory
+cmds_str += "$CC $CFLAGS %(source)s -mcmodel=large -DSTREAM_ARRAY_SIZE=1000000000 -DNTIMES=1000 -o stream_1Kx1B; "
+# 2.5 billion array elements (1000 runs): requires ~56 GiB of memory
+cmds_str += "$CC $CFLAGS %(source)s -mcmodel=large -DSTREAM_ARRAY_SIZE=2500000000 -DNTIMES=1000 -o stream_1Kx2.5B; "
+# 5 billion array elements (1000 runs): requires ~111 GiB of memory
+cmds_str += "$CC $CFLAGS %(source)s -mcmodel=large -DSTREAM_ARRAY_SIZE=5000000000 -DNTIMES=1000 -o stream_1Kx5B; "
+
+cmds_map = [('stream.c', cmds_str)]
+
+files_to_copy = [(['stream_1Kx10M', 'stream_1Kx100M', 'stream_1Kx1B', 'stream_1Kx2.5B', 'stream_1Kx5B'], 'bin')]
+
+sanity_check_paths = {
+    'files': ['bin/stream_1Kx10M', 'bin/stream_1Kx100M', 'bin/stream_1Kx1B', 'bin/stream_1Kx2.5B', 'bin/stream_1Kx5B'],
+    'dirs': [],
+}
+
+tests = ['%(installdir)s/bin/stream_1Kx10M']
+
+moduleclass = 'perf'
diff --git a/easybuild/easyconfigs/s/SUNDIALS/SUNDIALS-2.6.2-intel-2016b.eb b/easybuild/easyconfigs/s/SUNDIALS/SUNDIALS-2.6.2-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..db3419830f5ab9f2b4680be554026e3a51a07b68
--- /dev/null
+++ b/easybuild/easyconfigs/s/SUNDIALS/SUNDIALS-2.6.2-intel-2016b.eb
@@ -0,0 +1,29 @@
+easyblock = 'CMakeMake'
+
+name = 'SUNDIALS'
+version = '2.6.2'
+
+homepage = 'http://computation.llnl.gov/projects/sundials'
+description = "SUNDIALS: SUite of Nonlinear and DIfferential/ALgebraic Equation Solvers"
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+toolchainopts = {'openmp': True, 'usempi': True}
+
+source_urls = ['http://computation.llnl.gov/projects/sundials/download/']
+sources = [SOURCELOWER_TAR_GZ]
+
+builddependencies = [('CMake', '3.6.2')]
+
+separate_build_dir = True
+
+configopts = "-DMPI_ENABLE=ON -DOPENMP_ENABLE=ON -DLAPACK_ENABLE=ON"
+
+solvers = ['arkode', 'cvode', 'cvodes', 'ida', 'idas', 'kinsol']
+sanity_check_paths = {
+    'files': ['lib/libsundials_%s.a' % s for s in solvers + ['nvecopenmp', 'nvecparallel', 'nvecserial']] +
+             ['lib/libsundials_%s.%s' % (s, SHLIB_EXT) for s in solvers + ['nvecopenmp', 'nvecparallel', 'nvecserial']],
+    'dirs': ['examples/%s' % s for s in solvers] + ['include/%s' % s for s in solvers] +
+            ['examples/nvector', 'include/nvector', 'include/sundials'],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/s/SUNDIALS/SUNDIALS-2.7.0-intel-2016b.eb b/easybuild/easyconfigs/s/SUNDIALS/SUNDIALS-2.7.0-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..dc435288bd692c5b2db6b91320165710f772507b
--- /dev/null
+++ b/easybuild/easyconfigs/s/SUNDIALS/SUNDIALS-2.7.0-intel-2016b.eb
@@ -0,0 +1,29 @@
+easyblock = 'CMakeMake'
+
+name = 'SUNDIALS'
+version = '2.7.0'
+
+homepage = 'http://computation.llnl.gov/projects/sundials'
+description = "SUNDIALS: SUite of Nonlinear and DIfferential/ALgebraic Equation Solvers"
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+toolchainopts = {'openmp': True, 'usempi': True}
+
+source_urls = ['http://computation.llnl.gov/projects/sundials/download/']
+sources = [SOURCELOWER_TAR_GZ]
+
+builddependencies = [('CMake', '3.6.2')]
+
+separate_build_dir = True
+
+configopts = "-DMPI_ENABLE=ON -DOPENMP_ENABLE=ON -DLAPACK_ENABLE=ON"
+
+solvers = ['arkode', 'cvode', 'cvodes', 'ida', 'idas', 'kinsol']
+sanity_check_paths = {
+    'files': ['lib/libsundials_%s.a' % s for s in solvers + ['nvecopenmp', 'nvecparallel', 'nvecserial']] +
+             ['lib/libsundials_%s.%s' % (s, SHLIB_EXT) for s in solvers + ['nvecopenmp', 'nvecparallel', 'nvecserial']],
+    'dirs': ['examples/%s' % s for s in solvers] + ['include/%s' % s for s in solvers] +
+            ['examples/nvector', 'include/nvector', 'include/sundials'],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/s/SWIG/SWIG-3.0.10-intel-2016b-Python-2.7.12-PCRE-8.39.eb b/easybuild/easyconfigs/s/SWIG/SWIG-3.0.10-intel-2016b-Python-2.7.12-PCRE-8.39.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a1d01b931eaa4c86804cd6c242a4ba8a42d67814
--- /dev/null
+++ b/easybuild/easyconfigs/s/SWIG/SWIG-3.0.10-intel-2016b-Python-2.7.12-PCRE-8.39.eb
@@ -0,0 +1,20 @@
+name = 'SWIG'
+version = '3.0.10'
+versionsuffix = '-Python-%(pyver)s-PCRE-8.39'
+
+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': '2016b'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.12'),
+    ('PCRE', '8.39'),
+]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-2016.07-OpenBLAS-0.2.18-LAPACK-3.6.1.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-2016.07-OpenBLAS-0.2.18-LAPACK-3.6.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5345e933136727d79222013a00b8fd3df7ad431a
--- /dev/null
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-2016.07-OpenBLAS-0.2.18-LAPACK-3.6.1.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': '2016.07'}
+toolchainopts = {'pic': True}
+
+source_urls = [homepage]
+sources = [SOURCELOWER_TGZ]
+
+blaslib = 'OpenBLAS'
+blasver = '0.2.18'
+blassuff = '-LAPACK-3.6.1'
+
+versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff)
+
+dependencies = [(blaslib, blasver, blassuff)]
+
+# parallel build tends to fail, so disabling it
+parallel = 1
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-2016.09-OpenBLAS-0.2.19-LAPACK-3.6.1.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-2016.09-OpenBLAS-0.2.19-LAPACK-3.6.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8fcb8f66106bf4b89be675ad3f334aad7b9d071e
--- /dev/null
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-2016.09-OpenBLAS-0.2.19-LAPACK-3.6.1.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': '2016.09'}
+toolchainopts = {'pic': True}
+
+source_urls = [homepage]
+sources = [SOURCELOWER_TGZ]
+
+blaslib = 'OpenBLAS'
+blasver = '0.2.19'
+blassuff = '-LAPACK-3.6.1'
+
+versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff)
+
+dependencies = [(blaslib, blasver, blassuff)]
+
+# parallel build tends to fail, so disabling it
+parallel = 1
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompic-2016.10.0-OpenBLAS-0.2.19-LAPACK-3.6.1.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompic-2016.10.0-OpenBLAS-0.2.19-LAPACK-3.6.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..dabe226ac2364a17f8a23ffcc86a82be6fe4b3be
--- /dev/null
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompic-2016.10.0-OpenBLAS-0.2.19-LAPACK-3.6.1.eb
@@ -0,0 +1,25 @@
+name = 'ScaLAPACK'
+version = '2.0.2'
+
+homepage = 'http://www.netlib.org/scalapack/'
+description = """The ScaLAPACK (or Scalable LAPACK) library includes a subset of LAPACK routines
+ redesigned for distributed memory MIMD parallel computers."""
+
+toolchain = {'name': 'gompic', 'version': '2016.10.0'}
+toolchainopts = {'pic': True}
+
+source_urls = [homepage]
+sources = [SOURCELOWER_TGZ]
+
+blaslib = 'OpenBLAS'
+blasver = '0.2.19'
+blassuff = '-LAPACK-3.6.1'
+
+versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff)
+
+dependencies = [(blaslib, blasver, blassuff)]
+
+# parallel build tends to fail, so disabling it
+parallel = 1
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/Score-P/Score-P-1.2.1-goolf-1.5.14.eb b/easybuild/easyconfigs/s/Score-P/Score-P-1.2.1-goolf-1.5.14.eb
new file mode 100644
index 0000000000000000000000000000000000000000..df0333c95eb5cb399e5a0ca56b8df61e9e322fd1
--- /dev/null
+++ b/easybuild/easyconfigs/s/Score-P/Score-P-1.2.1-goolf-1.5.14.eb
@@ -0,0 +1,39 @@
+# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild
+# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany
+# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
+# License::   New BSD
+#
+# This work is based from experiences from the UNITE project
+# http://apps.fz-juelich.de/unite/
+##
+name = 'Score-P'
+version = '1.2.1'
+
+homepage = 'http://www.score-p.org'
+description = """The Score-P measurement infrastructure is a highly scalable and
+ easy-to-use tool suite for profiling, event tracing, and online analysis of HPC
+ applications."""
+
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
+toolchainopts = {'usempi': True}
+
+# http://www.vi-hps.org/upload/packages/scorep/scorep-1.2.1.tar.gz
+sources = ['scorep-%(version)s.tar.gz']
+source_urls = ['http://www.vi-hps.org/upload/packages/scorep/']
+
+# compiler toolchain depencies
+dependencies = [
+    ('Cube', '4.2'),
+    ('OPARI2', '1.1.1'),
+    ('OTF2', '1.2.1'),
+    ('PAPI', '5.2.0'),
+    ('PDT', '3.19'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/scorep', 'include/scorep/SCOREP_User.h',
+              ('lib64/libscorep_adapter_mpi_event.a', 'lib/libscorep_adapter_mpi_event.a')],
+    'dirs': [],
+}
+
+moduleclass = 'perf'
diff --git a/easybuild/easyconfigs/s/SelEstim/SelEstim-1.1.4-Linux-64bits.eb b/easybuild/easyconfigs/s/SelEstim/SelEstim-1.1.4-Linux-64bits.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7fd49e7b9f61b2a54b7e387737d697d441f94c9f
--- /dev/null
+++ b/easybuild/easyconfigs/s/SelEstim/SelEstim-1.1.4-Linux-64bits.eb
@@ -0,0 +1,35 @@
+# 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 = 'Tarball'
+
+name = 'SelEstim'
+version = '1.1.4'
+versionsuffix = '-Linux-64bits'
+
+homepage = 'http://www1.montpellier.inra.fr/CBGP/software/selestim/index.html'
+description = """SelEstim is aimed at distinguishing neutral from selected polymorphisms and estimate 
+ the intensity of selection at the latter. The SelEstim model accounts explicitly for positive selection, 
+ and it is assumed that all marker loci in the dataset are responding to selection, to some extent"""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = ['http://www1.montpellier.inra.fr/CBGP/software/selestim/files/']
+sources = ['%(name)s_%(version)s.zip']
+
+postinstallcmds = [
+	"rm -fr %(installdir)s/__MACOSX/ ",
+	"mv %(installdir)s/SelEstim_%(version)s/* %(installdir)s ",
+	"rm %(installdir)s/bin/SelEstim_1.1.4_OSX64bits ",
+	"rm %(installdir)s/bin/SelEstim_1.1.4_Linux32bits ",
+	"cd %(installdir)s/bin/ && ln -s SelEstim_%(version)s_Linux64bits SelEstim ",
+]
+
+sanity_check_paths = {
+    'files': ['bin/SelEstim_%(version)s_Linux64bits'],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SimVascular/SimVascular-2.16.0406-intel-2016b.eb b/easybuild/easyconfigs/s/SimVascular/SimVascular-2.16.0406-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6727139e3ee550bbeea6d96cc6efadad19ee9a31
--- /dev/null
+++ b/easybuild/easyconfigs/s/SimVascular/SimVascular-2.16.0406-intel-2016b.eb
@@ -0,0 +1,38 @@
+easyblock = 'Tarball'
+
+name = 'SimVascular'
+version = '2.16.0406'
+
+homepage = 'http://simvascular.github.io/'
+description = """SimVascular is an open source software suite for cardiovascular simulation, providing a complete
+ pipeline from medical image data to 3D model construction, meshing, and blood flow simulation."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+# download via https://simtk.org/project/xml/downloads.xml?group_id=188
+sources = ['SV-linux-x64-2016-04-06.tar.gz']
+
+dependencies = [
+    ('X11', '20160819'),
+    ('Tcl', '8.6.5'),
+    ('Tk', '8.6.5'),
+]
+
+unpack_options = '--strip-components=1'
+keepsymlinks = True
+
+# mimic what setup-symlinks.sh, but stick to dedicated install dir
+postinstallcmds = [
+    "mkdir %(installdir)s/bin",
+    "ln -s %(installdir)s/Bin/simvascular %(installdir)s/bin/simvascular",
+    "ln -s %(installdir)s/Bin/svpost %(installdir)s/bin/svpost",
+    "ln -s %(installdir)s/Bin/svpre %(installdir)s/bin/svpre",
+    "ln -s %(installdir)s/Bin/svsolver %(installdir)s/bin/svsolver",
+]
+
+sanity_check_paths = {
+    'files': ['bin/simvascular', 'bin/svpost', 'bin/svpre', 'bin/svsolver'],
+    'dirs': ['Bin'],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/Sphinx/Sphinx-1.4.8-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/s/Sphinx/Sphinx-1.4.8-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..249a32fcb839a9090b3a23c7bfa34ce6116eb6fb
--- /dev/null
+++ b/easybuild/easyconfigs/s/Sphinx/Sphinx-1.4.8-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,74 @@
+easyblock = 'Bundle'
+
+name = 'Sphinx'
+version = '1.4.8'
+versionsuffix = '-Python-%(pyver)s'
+
+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': 'foss', 'version': '2016a'}
+
+# this is a bundle of Python packages
+exts_defaultclass = 'PythonPackage'
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('Pygments', '2.1.3', '-Python-%(pyver)s'),
+    ('requests', '2.10.0', versionsuffix),
+]
+
+exts_list = [
+    ('imagesize', '0.7.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/i/imagesize/'],
+    }),
+    ('MarkupSafe', '0.23', {
+        'source_urls': ['https://pypi.io/packages/source/M/MarkupSafe/'],
+	'modulename': 'markupsafe',
+    }),
+    ('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/'],
+    }),
+    ('snowballstemmer', '1.2.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/s/snowballstemmer/'],
+    }),
+    ('Babel', '2.3.4', {
+        'source_urls': ['https://pypi.python.org/packages/source/B/Babel/'],
+    }),
+    ('alabaster', '0.7.8', {
+        'source_urls': ['https://pypi.python.org/packages/source/a/alabaster/'],
+    }),
+    (name, version, {
+        'source_urls': ['https://pypi.python.org/packages/source/S/Sphinx/'],
+        'patches': ['Sphinx-%s-pdflatex_failing_tests.patch' %version],
+    }),
+    # sphinx_rtd_theme depends on Sphinx, and should be there to make the tests work
+    ('sphinx_rtd_theme', '0.1.10a0', {
+        '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%(pyshortver)s/site-packages/:$PYTHONPATH make test",
+])]
+
+# 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%(pyshortver)s/site-packages'],
+}
+
+modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/s/Sphinx/Sphinx-1.4.8-foss-2016a-Python-3.5.1.eb b/easybuild/easyconfigs/s/Sphinx/Sphinx-1.4.8-foss-2016a-Python-3.5.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..90efc667c60d47c5693a020997438c95fda1fce5
--- /dev/null
+++ b/easybuild/easyconfigs/s/Sphinx/Sphinx-1.4.8-foss-2016a-Python-3.5.1.eb
@@ -0,0 +1,74 @@
+easyblock = 'Bundle'
+
+name = 'Sphinx'
+version = '1.4.8'
+versionsuffix = '-Python-%(pyver)s'
+
+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': 'foss', 'version': '2016a'}
+
+# this is a bundle of Python packages
+exts_defaultclass = 'PythonPackage'
+
+dependencies = [
+    ('Python', '3.5.1'),
+    ('Pygments', '2.1.3', '-Python-%(pyver)s'),
+    ('requests', '2.10.0', versionsuffix),
+]
+
+exts_list = [
+    ('imagesize', '0.7.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/i/imagesize/'],
+    }),
+    ('MarkupSafe', '0.23', {
+        'source_urls': ['https://pypi.io/packages/source/M/MarkupSafe/'],
+	'modulename': 'markupsafe',
+    }),
+    ('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/'],
+    }),
+    ('snowballstemmer', '1.2.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/s/snowballstemmer/'],
+    }),
+    ('Babel', '2.3.4', {
+        'source_urls': ['https://pypi.python.org/packages/source/B/Babel/'],
+    }),
+    ('alabaster', '0.7.8', {
+        'source_urls': ['https://pypi.python.org/packages/source/a/alabaster/'],
+    }),
+    (name, version, {
+        'source_urls': ['https://pypi.python.org/packages/source/S/Sphinx/'],
+        'patches': ['Sphinx-%s-pdflatex_failing_tests.patch' %version],
+    }),
+    # sphinx_rtd_theme depends on Sphinx, and should be there to make the tests work
+    ('sphinx_rtd_theme', '0.1.10a0', {
+        '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%(pyshortver)s/site-packages/:$PYTHONPATH make test",
+])]
+
+# 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%(pyshortver)s/site-packages'],
+}
+
+modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/s/Sphinx/Sphinx-1.4.8-pdflatex_failing_tests.patch b/easybuild/easyconfigs/s/Sphinx/Sphinx-1.4.8-pdflatex_failing_tests.patch
new file mode 100644
index 0000000000000000000000000000000000000000..44705787c3adfd7b54238a0754e917ac4ecfeba8
--- /dev/null
+++ b/easybuild/easyconfigs/s/Sphinx/Sphinx-1.4.8-pdflatex_failing_tests.patch
@@ -0,0 +1,20 @@
+pdflatex and latex tests fail on systems that have older versions installed
+Author: Ruben van Dijk (University of Groningen)
+--- Sphinx-1.4.8/Makefile	2016-10-05 11:05:34.000000000 +0200
++++ Sphinx-1.4.8/Makefile	2016-10-05 11:11:05.000000000 +0200
+@@ -67,8 +67,14 @@
+ reindent:
+ 	@$(PYTHON) utils/reindent.py -r -n .
+ 
++# Failing tests, py35 was already excluded.
++DONT_TEST  = -I py35 \
++                  -I latex \
++                  -I typing_test_data \
++                  -I ext_math 
++
+ test:
+-	@cd tests; $(PYTHON) run.py -I py35 -d -m '^[tT]est' $(TEST)
++	@cd tests; $(PYTHON) run.py $(DONT_TEST) -d #-m '^[tT]est' $(TEST) 
+ 
+ test-async:
+ 	@cd tests; $(PYTHON) run.py -d -m '^[tT]est' $(TEST)
diff --git a/easybuild/easyconfigs/s/Stacks/Stacks-1.42-foss-2016a.eb b/easybuild/easyconfigs/s/Stacks/Stacks-1.42-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6d5d6358c842bdfc156a56a5761834999be5bf02
--- /dev/null
+++ b/easybuild/easyconfigs/s/Stacks/Stacks-1.42-foss-2016a.eb
@@ -0,0 +1,35 @@
+easyblock = 'ConfigureMake'
+
+name = 'Stacks'
+version = '1.42'
+
+homepage = 'http://creskolab.uoregon.edu/stacks/'
+description = """Stacks is a software pipeline for building loci from short-read sequences, such as those generated on
+ the Illumina platform. Stacks was developed to work with restriction enzyme-based data, such as RAD-seq, for the purpose
+ of building genetic maps and conducting population genomics and phylogeography.
+"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://catchenlab.life.illinois.edu/stacks/source/']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('zlib', '1.2.8'), 
+    ('SAMtools', '1.3.1'), 
+    ('sparsehash', '2.0.2'),
+]
+
+sanity_check_paths = {
+    'files': [
+        'bin/%s' % binfile for binfile in [
+            'clone_filter', 'denovo_map.pl', 'exec_velvet.pl', 'genotypes', 'index_radtags.pl', 'load_radtags.pl',
+            'populations', 'process_shortreads', 'ref_map.pl', 'sstacks', 'ustacks', 'cstacks', 'estacks',
+            'export_sql.pl', 'hstacks', 'kmer_filter', 'load_sequences.pl', 'process_radtags', 'pstacks',
+            'sort_read_pairs.pl', 'stacks_export_notify.pl',
+        ]
+    ],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/StringTie/StringTie-1.3.0-intel-2016b.eb b/easybuild/easyconfigs/s/StringTie/StringTie-1.3.0-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..424d2b7aebc3f281cdd096d43352700945858870
--- /dev/null
+++ b/easybuild/easyconfigs/s/StringTie/StringTie-1.3.0-intel-2016b.eb
@@ -0,0 +1,26 @@
+# 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 = 'StringTie'
+version = '1.3.0'
+
+homepage = 'http://ccb.jhu.edu/software/stringtie/'
+description = """StringTie is a fast and highly efficient assembler of RNA-Seq alignments into potential transcripts."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['http://ccb.jhu.edu/software/stringtie/dl/']
+sources = [SOURCELOWER_TAR_GZ]
+
+files_to_copy = [(['stringtie'], 'bin'), 'README', 'LICENSE']
+                
+sanity_check_paths = {
+    'files': ['bin/stringtie'],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-4.5.3-foss-2016a-ParMETIS-4.0.3.eb b/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-4.5.3-foss-2016a-ParMETIS-4.0.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3b604c9d6d563f66ed11358e1bd9eb1e764d2bb5
--- /dev/null
+++ b/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-4.5.3-foss-2016a-ParMETIS-4.0.3.eb
@@ -0,0 +1,20 @@
+name = 'SuiteSparse'
+version = '4.5.3'
+
+homepage = 'http://faculty.cse.tamu.edu/davis/suitesparse.html'
+description = """SuiteSparse is a collection of libraries manipulate sparse matrices."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+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/SuiteSparse/SuiteSparse-4.5.3-intel-2016b-METIS-5.1.0.eb b/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-4.5.3-intel-2016b-METIS-5.1.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5235dd9545c45fde42a5e6abc637f9bebbe444cd
--- /dev/null
+++ b/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-4.5.3-intel-2016b-METIS-5.1.0.eb
@@ -0,0 +1,20 @@
+name = 'SuiteSparse'
+version = '4.5.3'
+
+homepage = 'http://faculty.cse.tamu.edu/davis/suitesparse.html'
+description = """SuiteSparse is a collection of libraries manipulate sparse matrices."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+toolchainopts = {'opt': True, 'unroll': True, 'pic': True}
+
+source_urls = ['http://faculty.cse.tamu.edu/davis/SuiteSparse/']
+sources = [SOURCE_TAR_GZ]
+
+metis = 'METIS'
+metis_ver = '5.1.0'
+versionsuffix = '-%s-%s' % (metis, metis_ver)
+dependencies = [(metis, metis_ver)]
+
+maxparallel = 1
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-gimkl-2.11.5.eb b/easybuild/easyconfigs/s/Szip/Szip-2.1-gimkl-2.11.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..bf50049e0fcbcc785822c6405df7d1e05c0f41cd
--- /dev/null
+++ b/easybuild/easyconfigs/s/Szip/Szip-2.1-gimkl-2.11.5.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'Szip'
+version = '2.1'
+
+homepage = 'http://www.hdfgroup.org/doc_resource/SZIP/'
+description = "Szip compression software, providing lossless compression of scientific data"
+
+toolchain = {'name': 'gimkl', 'version': '2.11.5'}
+toolchainopts = {'pic': True}
+
+source_urls = ['http://www.hdfgroup.org/ftp/lib-external/szip/%(version)s/src']
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = "--with-pic"
+
+sanity_check_paths = {
+    'files': ["lib/libsz.a", "lib/libsz.%s" % SHLIB_EXT] +
+             ["include/%s" % x for x in ["ricehdf.h", "szip_adpt.h", "szlib.h"]],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/s/scikit-image/scikit-image-0.12.3-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/s/scikit-image/scikit-image-0.12.3-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4f0de6e8da6dd329dfe04b5f8674fe79774bad4b
--- /dev/null
+++ b/easybuild/easyconfigs/s/scikit-image/scikit-image-0.12.3-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,35 @@
+easyblock = 'PythonPackage'
+
+name = 'scikit-image'
+version = '0.12.3'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://scikit-learn.org/stable/index.html'
+description = """Scikit-learn integrates machine learning algorithms in the tightly-knit scientific Python world,
+building upon numpy, scipy, and matplotlib. As a machine-learning module,
+it provides versatile tools for data mining and analysis in any field of science and engineering.
+It strives to be simple and efficient, accessible to everybody, and reusable in various contexts."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+freetype_ver = '2.6.3'
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('Qhull', '2015.2'),
+    ('matplotlib', '1.5.1', versionsuffix + '-freetype-%s' % freetype_ver),
+    ('networkx', '1.11', versionsuffix),
+    ('Pillow', '3.2.0', versionsuffix + '-freetype-%s' % freetype_ver),
+]
+
+options = {'modulename': 'skimage'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/s/scikit-image/scikit-image-0.12.3-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/s/scikit-image/scikit-image-0.12.3-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7741dcce3863e723a378d402fde40668b6f53865
--- /dev/null
+++ b/easybuild/easyconfigs/s/scikit-image/scikit-image-0.12.3-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,45 @@
+easyblock = 'Bundle'
+
+name = 'scikit-image'
+version = '0.12.3'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://scikit-learn.org/stable/index.html'
+description = """Scikit-learn integrates machine learning algorithms in the tightly-knit scientific Python world,
+building upon numpy, scipy, and matplotlib. As a machine-learning module,
+it provides versatile tools for data mining and analysis in any field of science and engineering.
+It strives to be simple and efficient, accessible to everybody, and reusable in various contexts."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+# this is a bundle of Python packages
+exts_defaultclass = 'PythonPackage'
+
+dependencies = [
+    ('Python', '2.7.12'),
+    ('Qhull', '2015.2'),
+    ('matplotlib', '1.5.3', versionsuffix),
+    ('Pillow', '3.4.2', versionsuffix),
+]
+
+exts_list = [
+    ('networkx', '1.11', {
+        'source_urls': ['https://pypi.python.org/packages/source/n/networkx'],
+    }),
+    (name, version, {
+        'source_urls': ['https://pypi.python.org/packages/source/s/scikit-image'],
+        'modulename': 'skimage',
+    }),
+]
+
+modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
+
+# 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': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/s/scikit-image/scikit-image-0.12.3-intel-2016b-Python-3.5.2.eb b/easybuild/easyconfigs/s/scikit-image/scikit-image-0.12.3-intel-2016b-Python-3.5.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f0eef4a235d1c1f7b836f365e693826e59789e9c
--- /dev/null
+++ b/easybuild/easyconfigs/s/scikit-image/scikit-image-0.12.3-intel-2016b-Python-3.5.2.eb
@@ -0,0 +1,45 @@
+easyblock = 'Bundle'
+
+name = 'scikit-image'
+version = '0.12.3'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://scikit-learn.org/stable/index.html'
+description = """Scikit-learn integrates machine learning algorithms in the tightly-knit scientific Python world,
+building upon numpy, scipy, and matplotlib. As a machine-learning module,
+it provides versatile tools for data mining and analysis in any field of science and engineering.
+It strives to be simple and efficient, accessible to everybody, and reusable in various contexts."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+# this is a bundle of Python packages
+exts_defaultclass = 'PythonPackage'
+
+dependencies = [
+    ('Python', '3.5.2'),
+    ('Qhull', '2015.2'),
+    ('matplotlib', '1.5.3', versionsuffix),
+    ('Pillow', '3.4.2', versionsuffix),
+]
+
+exts_list = [
+    ('networkx', '1.11', {
+        'source_urls': ['https://pypi.python.org/packages/source/n/networkx'],
+    }),
+    (name, version, {
+        'source_urls': ['https://pypi.python.org/packages/source/s/scikit-image'],
+        'modulename': 'skimage',
+    }),
+]
+
+modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
+
+# 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': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.17.1-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.17.1-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7a34f126ed0c616a70bccb2a4aec4032bb198fe1
--- /dev/null
+++ b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.17.1-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,30 @@
+easyblock = 'PythonPackage'
+
+name = 'scikit-learn'
+version = '0.17.1'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://scikit-learn.org/stable/index.html'
+description = """Scikit-learn integrates machine learning algorithms in the tightly-knit scientific Python world,
+building upon numpy, scipy, and matplotlib. As a machine-learning module,
+it provides versatile tools for data mining and analysis in any field of science and engineering.
+It strives to be simple and efficient, accessible to everybody, and reusable in various contexts."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('matplotlib', '1.5.1', versionsuffix),
+]
+
+options = {'modulename': 'sklearn'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/sklearn'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.17.1-foss-2016a-Python-3.5.1.eb b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.17.1-foss-2016a-Python-3.5.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9c2111d9465b0fe4686dea9d4016545c7b311fec
--- /dev/null
+++ b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.17.1-foss-2016a-Python-3.5.1.eb
@@ -0,0 +1,30 @@
+easyblock = 'PythonPackage'
+
+name = 'scikit-learn'
+version = '0.17.1'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://scikit-learn.org/stable/index.html'
+description = """Scikit-learn integrates machine learning algorithms in the tightly-knit scientific Python world,
+building upon numpy, scipy, and matplotlib. As a machine-learning module,
+it provides versatile tools for data mining and analysis in any field of science and engineering.
+It strives to be simple and efficient, accessible to everybody, and reusable in various contexts."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '3.5.1'),
+    ('matplotlib', '1.5.1', versionsuffix),
+]
+
+options = {'modulename': 'sklearn'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/sklearn'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.17.1-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.17.1-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..948220fce8bc69fb6971e22af82221b1a39a9f6b
--- /dev/null
+++ b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.17.1-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,30 @@
+easyblock = 'PythonPackage'
+
+name = 'scikit-learn'
+version = '0.17.1'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://scikit-learn.org/stable/index.html'
+description = """Scikit-learn integrates machine learning algorithms in the tightly-knit scientific Python world,
+building upon numpy, scipy, and matplotlib. As a machine-learning module,
+it provides versatile tools for data mining and analysis in any field of science and engineering.
+It strives to be simple and efficient, accessible to everybody, and reusable in various contexts."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.12'),
+    ('matplotlib', '1.5.1', versionsuffix),
+]
+
+options = {'modulename': 'sklearn'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/sklearn'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.18-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.18-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..cedad0e0ae1c6f481943a7f8e5a2e8b0efdce914
--- /dev/null
+++ b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.18-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,30 @@
+easyblock = 'PythonPackage'
+
+name = 'scikit-learn'
+version = '0.18'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://scikit-learn.org/stable/index.html'
+description = """Scikit-learn integrates machine learning algorithms in the tightly-knit scientific Python world,
+building upon numpy, scipy, and matplotlib. As a machine-learning module,
+it provides versatile tools for data mining and analysis in any field of science and engineering.
+It strives to be simple and efficient, accessible to everybody, and reusable in various contexts."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.12'),
+    ('matplotlib', '1.5.1', versionsuffix),
+]
+
+options = {'modulename': 'sklearn'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/sklearn'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.18-intel-2016b-Python-3.5.2.eb b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.18-intel-2016b-Python-3.5.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a4cbd2262285302172a6a8a3f6c3575652d2feef
--- /dev/null
+++ b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.18-intel-2016b-Python-3.5.2.eb
@@ -0,0 +1,30 @@
+easyblock = 'PythonPackage'
+
+name = 'scikit-learn'
+version = '0.18'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://scikit-learn.org/stable/index.html'
+description = """Scikit-learn integrates machine learning algorithms in the tightly-knit scientific Python world,
+building upon numpy, scipy, and matplotlib. As a machine-learning module,
+it provides versatile tools for data mining and analysis in any field of science and engineering.
+It strives to be simple and efficient, accessible to everybody, and reusable in various contexts."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '3.5.2'),
+    ('matplotlib', '1.5.1', versionsuffix),
+]
+
+options = {'modulename': 'sklearn'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/sklearn'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/s/scipy/scipy-0.16.1-intel-2015a-Python-2.7.10.eb b/easybuild/easyconfigs/s/scipy/scipy-0.16.1-intel-2015a-Python-2.7.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6126cbe4898b6d6a8f7df60bbc4242c1feab095b
--- /dev/null
+++ b/easybuild/easyconfigs/s/scipy/scipy-0.16.1-intel-2015a-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': '2015a'}
+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/spglib-python/spglib-python-1.9.4.2-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/s/spglib-python/spglib-python-1.9.4.2-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2cbf7eff9e3f01a516431bf758f95239f86fa3dd
--- /dev/null
+++ b/easybuild/easyconfigs/s/spglib-python/spglib-python-1.9.4.2-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,26 @@
+easyblock = "PythonPackage"
+
+name = 'spglib-python'
+version = '1.9.4.2'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://pypi.python.org/pypi/spglib'
+description = """Spglib for Python. Spglib is a library for finding and handling crystal symmetries written in C."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['https://pypi.python.org/packages/source/%(nameletter)s/spglib']
+sources = ['spglib-%(version)s.tar.gz']
+
+dependencies = [
+    ('Python', '2.7.12'),
+]
+
+options = {'modulename': 'spglib'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages']
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/s/spglib-python/spglib-python-1.9.5-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/s/spglib-python/spglib-python-1.9.5-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7dd378ce55e82006fdc9c010569dbdc7448e7f49
--- /dev/null
+++ b/easybuild/easyconfigs/s/spglib-python/spglib-python-1.9.5-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,26 @@
+easyblock = 'PythonPackage'
+
+name = 'spglib-python'
+version = '1.9.5'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://pypi.python.org/pypi/spglib'
+description = """Spglib for Python. Spglib is a library for finding and handling crystal symmetries written in C."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['https://pypi.python.org/packages/source/%(nameletter)s/spglib']
+sources = ['spglib-%(version)s.tar.gz']
+
+dependencies = [
+    ('Python', '2.7.12'),
+]
+
+options = {'modulename': 'spglib'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages']
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/t/TAU/TAU-2.22.2-goolf-1.5.14.eb b/easybuild/easyconfigs/t/TAU/TAU-2.22.2-goolf-1.5.14.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2f2888a832174aa297859e7d9d12b4723cdbf17d
--- /dev/null
+++ b/easybuild/easyconfigs/t/TAU/TAU-2.22.2-goolf-1.5.14.eb
@@ -0,0 +1,35 @@
+# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild
+# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany
+# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
+# License::   New BSD
+#
+# This work is based from experiences from the UNITE project
+# http://apps.fz-juelich.de/unite/
+##
+name = 'TAU'
+version = '2.22.2'
+
+homepage = 'http://tau.uoregon.edu'
+description = """The TAU Performance System is a portable profiling and tracing toolkit
+ for performance analysis of parallel programs written in Fortran, C, C++, Java, Python."""
+
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
+toolchainopts = {'usempi': True}
+
+source_urls = ['http://www.cs.uoregon.edu/research/paracomp/tau/tauprofile/dist/']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('OTF', '1.12.4'),
+    ('PAPI', '5.2.0'),
+    ('PDT', '3.19'),
+    ('Score-P', '1.2.1'),
+    # obsolete backends, use Score-P instead
+    #('Scalasca', '1.4.3'),
+    #('VampirTrace', '5.14.4'),
+]
+
+# scalasca and vampirtrace backends are deprecated
+extra_backends = ['scorep']
+
+moduleclass = 'perf'
diff --git a/easybuild/easyconfigs/t/Tcl/Tcl-8.6.3-GCC-4.8.4.eb b/easybuild/easyconfigs/t/Tcl/Tcl-8.6.3-GCC-4.8.4.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d3061eabd18c62e13b6237a97340f81831ab5f8a
--- /dev/null
+++ b/easybuild/easyconfigs/t/Tcl/Tcl-8.6.3-GCC-4.8.4.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'Tcl'
+version = '8.6.3'
+
+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.8.4'}
+
+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.5-GCC-5.4.0-2.26.eb b/easybuild/easyconfigs/t/Tcl/Tcl-8.6.5-GCC-5.4.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..cee27f6687d1da49504020a744ff09a4658712d8
--- /dev/null
+++ b/easybuild/easyconfigs/t/Tcl/Tcl-8.6.5-GCC-5.4.0-2.26.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'Tcl'
+version = '8.6.5'
+
+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': '5.4.0-2.26'}
+
+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.5-foss-2016.04.eb b/easybuild/easyconfigs/t/Tcl/Tcl-8.6.5-foss-2016.04.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c3516cdb4410d6322cbb4c61013c6db6197d0449
--- /dev/null
+++ b/easybuild/easyconfigs/t/Tcl/Tcl-8.6.5-foss-2016.04.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'Tcl'
+version = '8.6.5'
+
+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': '2016.04'}
+
+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.6-GCCcore-4.9.3.eb b/easybuild/easyconfigs/t/Tcl/Tcl-8.6.6-GCCcore-4.9.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..35b772ac6fe5ec4ae051d7e25104d7b502aa3f19
--- /dev/null
+++ b/easybuild/easyconfigs/t/Tcl/Tcl-8.6.6-GCCcore-4.9.3.eb
@@ -0,0 +1,29 @@
+easyblock = 'ConfigureMake'
+
+name = 'Tcl'
+version = '8.6.6'
+
+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': 'GCCcore', 'version': '4.9.3'}
+
+source_urls = ["http://prdownloads.sourceforge.net/tcl"]
+sources = ['%(namelower)s%(version)s-src.tar.gz']
+
+builddependencies = [
+    ('binutils', '2.25'),
+]
+
+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/Theano/Theano-0.8.2-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/t/Theano/Theano-0.8.2-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..84985c3bcb7126c067eb925e2a8c4c16b484984d
--- /dev/null
+++ b/easybuild/easyconfigs/t/Theano/Theano-0.8.2-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,28 @@
+easyblock = "PythonPackage"
+
+name = 'Theano'
+version = '0.8.2'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://deeplearning.net/software/theano'
+description = """Theano is a Python library that allows you to define, optimize,
+and evaluate mathematical expressions involving multi-dimensional arrays efficiently."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('Python', '2.7.11')]
+
+builddependencies = [('nose-parameterized', '0.5.0', versionsuffix)]
+
+# The tests take very long to finish (they are installed too)
+#runtest = 'nosetests theano'
+
+sanity_check_paths = {
+    'files': ['bin/theano-cache', 'bin/theano-nose', 'bin/theano-test'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'math'
\ No newline at end of file
diff --git a/easybuild/easyconfigs/t/Theano/Theano-0.8.2-foss-2016a-Python-3.5.1.eb b/easybuild/easyconfigs/t/Theano/Theano-0.8.2-foss-2016a-Python-3.5.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d7e9b83bcb9cbf429db94e448c27c4a792c997f4
--- /dev/null
+++ b/easybuild/easyconfigs/t/Theano/Theano-0.8.2-foss-2016a-Python-3.5.1.eb
@@ -0,0 +1,28 @@
+easyblock = "PythonPackage"
+
+name = 'Theano'
+version = '0.8.2'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://deeplearning.net/software/theano'
+description = """Theano is a Python library that allows you to define, optimize,
+and evaluate mathematical expressions involving multi-dimensional arrays efficiently."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('Python', '3.5.1')]
+
+builddependencies = [('nose-parameterized', '0.5.0', versionsuffix)]
+
+# The tests take very long to finish (they are installed too)
+#runtest = 'nosetests theano'
+
+sanity_check_paths = {
+    'files': ['bin/theano-cache', 'bin/theano-nose', 'bin/theano-test'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/t/Theano/Theano-0.8.2-intel-2016b-Python-3.5.2.eb b/easybuild/easyconfigs/t/Theano/Theano-0.8.2-intel-2016b-Python-3.5.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fdea58014edf8eae5f55812b0e4cdc646fc2f675
--- /dev/null
+++ b/easybuild/easyconfigs/t/Theano/Theano-0.8.2-intel-2016b-Python-3.5.2.eb
@@ -0,0 +1,28 @@
+easyblock = "PythonPackage"
+
+name = 'Theano'
+version = '0.8.2'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://deeplearning.net/software/theano'
+description = """Theano is a Python library that allows you to define, optimize,
+and evaluate mathematical expressions involving multi-dimensional arrays efficiently."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('Python', '3.5.2')]
+
+builddependencies = [('nose-parameterized', '0.5.0', versionsuffix)]
+
+# The tests take very long to finish (they are installed too)
+#runtest = 'nosetests theano'
+
+sanity_check_paths = {
+    'files': ['bin/theano-cache', 'bin/theano-nose', 'bin/theano-test'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.3-GCC-4.8.4-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-GCC-4.8.4-no-X11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e49d8019731bd8028e16866de4924d7757789384
--- /dev/null
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-GCC-4.8.4-no-X11.eb
@@ -0,0 +1,26 @@
+easyblock = 'ConfigureMake'
+
+name = 'Tk'
+version = '8.6.3'
+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.8.4'}
+
+source_urls = ["http://prdownloads.sourceforge.net/tcl"]
+sources = ['%(namelower)s%(version)s-src.tar.gz']
+
+dependencies = [
+    ('Tcl', version),
+    ('zlib', '1.2.8'),
+]
+
+# To be clear: this will still require X11 to be present (see issue #2261)
+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.3-GCC-4.9.2-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-GCC-4.9.2-no-X11.eb
index 878cfecf539d646a638f0b8f90d28410385cf192..df6346fdf8622c8e9503fe82059b23062d45cc8d 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.3-GCC-4.9.2-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-GCC-4.9.2-no-X11.eb
@@ -18,6 +18,7 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
+# To be clear: this will still require X11 to be present (see issue #2261)
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
 
 start_dir = 'unix'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.3-foss-2015.05-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-foss-2015.05-no-X11.eb
index ac0d5ff0bc58a0e2f7efdbe52cfabba110d843de..2394a098151702f035de2c4b3cef43d01965d149 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.3-foss-2015.05-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-foss-2015.05-no-X11.eb
@@ -18,6 +18,7 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
+# To be clear: this will still require X11 to be present (see issue #2261)
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
 
 start_dir = 'unix'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.3-foss-2015a-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-foss-2015a-no-X11.eb
index 0cf00324c8d649766fad5967e9794558f037a2d4..89e750afa3e21edababfa75c4bb9ac9e81539971 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.3-foss-2015a-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-foss-2015a-no-X11.eb
@@ -18,6 +18,7 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
+# To be clear: this will still require X11 to be present (see issue #2261)
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
 
 start_dir = 'unix'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.3-foss-2015b-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-foss-2015b-no-X11.eb
index aaa247a658e841075ccf657058923034df57ed0d..fd29c3376270cf467961a9cb3a50c29444bd9c06 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.3-foss-2015b-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-foss-2015b-no-X11.eb
@@ -18,6 +18,7 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
+# To be clear: this will still require X11 to be present (see issue #2261)
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
 
 start_dir = 'unix'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.3-gompi-1.5.16-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-gompi-1.5.16-no-X11.eb
index 0a860475e3a929120bf43a487276972f0ab382df..be1ac13f469b7c8ef5e74344a76c50fb192b5c84 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.3-gompi-1.5.16-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-gompi-1.5.16-no-X11.eb
@@ -18,6 +18,7 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
+# To be clear: this will still require X11 to be present (see issue #2261)
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
 
 start_dir = 'unix'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.3-goolf-1.5.14-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-goolf-1.5.14-no-X11.eb
index 890bfc8cfec32b0627a4d40f78c98c23034c6716..d5880a0b406cb57a1dcc82bfbc835080a5de45ce 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.3-goolf-1.5.14-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-goolf-1.5.14-no-X11.eb
@@ -18,6 +18,7 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
+# To be clear: this will still require X11 to be present (see issue #2261)
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
 
 start_dir = 'unix'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.3-goolf-1.5.16-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-goolf-1.5.16-no-X11.eb
index b383831c92fded663690e6735d912d4c17da5103..3fa9a767388661cceaf27a2b19c776333098b462 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.3-goolf-1.5.16-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-goolf-1.5.16-no-X11.eb
@@ -18,6 +18,7 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
+# To be clear: this will still require X11 to be present (see issue #2261)
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
 
 start_dir = 'unix'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.3-goolf-1.7.20-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-goolf-1.7.20-no-X11.eb
index 6550c8a4272aae568c43a719c928274e112fa044..dccd1a9e2f04d107c498399d646ef55f23264413 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.3-goolf-1.7.20-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-goolf-1.7.20-no-X11.eb
@@ -18,6 +18,7 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
+# To be clear: this will still require X11 to be present (see issue #2261)
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
 
 start_dir = 'unix'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.3-intel-2015a-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-intel-2015a-no-X11.eb
index 4762abfa095708143bfa749c830771ed12595793..68317abed0de62772800f589d8823d1e3b86853d 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.3-intel-2015a-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-intel-2015a-no-X11.eb
@@ -18,6 +18,7 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
+# To be clear: this will still require X11 to be present (see issue #2261)
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
 
 start_dir = 'unix'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-CrayGNU-2015.11-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-CrayGNU-2015.11-no-X11.eb
index 75434aa7b825fdf55e7795a1f557b98863603d48..02c810f4e3a3606b5b7ed58257e4cf71ad42c47f 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-CrayGNU-2015.11-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-CrayGNU-2015.11-no-X11.eb
@@ -19,6 +19,7 @@ dependencies = [
     ('Tcl', version),
 ]
 
+# To be clear: this will still require X11 to be present (see issue #2261)
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
 
 start_dir = 'unix'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-CrayGNU-2016.03-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-CrayGNU-2016.03-no-X11.eb
index ce3ef51b8f2ad54cce5b4f29dd29761bdd7a7587..f156bb1a1bfb7ed620ac2e3a11a6d239794add9d 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-CrayGNU-2016.03-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-CrayGNU-2016.03-no-X11.eb
@@ -19,6 +19,7 @@ dependencies = [
     ('Tcl', version),
 ]
 
+# To be clear: this will still require X11 to be present (see issue #2261)
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
 
 start_dir = 'unix'
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
index 684f3bddb6d76797e80e073834fabe10633b28f7..8a30be2061d2e140b4943693c2aee12ea8045365 100644
--- 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
@@ -20,6 +20,7 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
+# To be clear: this will still require X11 to be present (see issue #2261)
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
 
 start_dir = 'unix'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-GNU-4.9.3-2.25-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-GNU-4.9.3-2.25-no-X11.eb
index f077e32cc2b099813bcb2191c1e443ad992302c8..50d6e6345589496884fdd0a5a6d72e3816a94b60 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-GNU-4.9.3-2.25-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-GNU-4.9.3-2.25-no-X11.eb
@@ -20,6 +20,7 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
+# To be clear: this will still require X11 to be present (see issue #2261)
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x'
 
 start_dir = 'unix'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-foss-2015a-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-foss-2015a-no-X11.eb
index 9e3efc89f0dc13cb698825dab87212b0fededf94..2c44f99045c10c3a0cf8d54665c520c2cbc7f941 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-foss-2015a-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-foss-2015a-no-X11.eb
@@ -20,6 +20,7 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
+# To be clear: this will still require X11 to be present (see issue #2261)
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
 
 start_dir = 'unix'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-foss-2015b-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-foss-2015b-no-X11.eb
index 89ecb3248a7f4e9dce91b5bc0eec5c35e1a2c1f5..9f80c4ee639c1f17625fb5363a59da3442ec752c 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-foss-2015b-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-foss-2015b-no-X11.eb
@@ -20,6 +20,7 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
+# To be clear: this will still require X11 to be present (see issue #2261)
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
 
 start_dir = 'unix'
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
index 449ce63a291d4ec9eb0aac0d59a6661d24209b0f..57e512249bd8913a8904446510420987fccef12b 100644
--- 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
@@ -20,6 +20,7 @@ dependencies = [
     ('zlib', '1.2.8')
 ]
 
+# To be clear: this will still require X11 to be present (see issue #2261)
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
 
 start_dir = 'unix'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-gimkl-2.11.5-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-gimkl-2.11.5-no-X11.eb
index 5066a5847cdc83a938ae04c5379d39b8250933ca..be28b60358aa4d4e1f75e2fd5c63d4b61e3de8ce 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-gimkl-2.11.5-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-gimkl-2.11.5-no-X11.eb
@@ -20,6 +20,7 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
+# To be clear: this will still require X11 to be present (see issue #2261)
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
 
 start_dir = 'unix'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-goolf-1.4.10-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-goolf-1.4.10-no-X11.eb
index 9419fc66d665b810ae7d63238e24e46a8b55a2f8..a88315f8074faefe518850239b00ee95ad64e104 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-goolf-1.4.10-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-goolf-1.4.10-no-X11.eb
@@ -20,6 +20,7 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
+# To be clear: this will still require X11 to be present (see issue #2261)
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
 
 start_dir = 'unix'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-goolf-1.7.20-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-goolf-1.7.20-no-X11.eb
index 60f899a5847ab6810b112495340ca502882db963..26804627ae58cc057fe3ad07e48224f9c73f2637 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-goolf-1.7.20-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-goolf-1.7.20-no-X11.eb
@@ -20,6 +20,7 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
+# To be clear: this will still require X11 to be present (see issue #2261)
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
 
 start_dir = 'unix'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-ictce-7.3.5-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-ictce-7.3.5-no-X11.eb
index 53f70e54d2f08380c80b58970e26344af25494bd..3e9e1cab39dbb361e6bbaac8c283d367cb0f7baf 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-ictce-7.3.5-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-ictce-7.3.5-no-X11.eb
@@ -20,6 +20,7 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
+# To be clear: this will still require X11 to be present (see issue #2261)
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
 
 start_dir = 'unix'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2015a-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2015a-no-X11.eb
index 85504f868894a39e812f0577bb5c1392aad3fc40..ff4e4051ee19522145e222265b2ec32315f4dbca 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2015a-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2015a-no-X11.eb
@@ -20,6 +20,7 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
+# To be clear: this will still require X11 to be present (see issue #2261)
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
 
 start_dir = 'unix'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2015b-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2015b-no-X11.eb
index b7e6c77202038c6e9a8ee624284d0696e6f63d44..389d3ddf9828c1c61b2d5e0d615eec3c29ba811b 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2015b-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2015b-no-X11.eb
@@ -20,6 +20,7 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
+# To be clear: this will still require X11 to be present (see issue #2261)
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
 
 start_dir = 'unix'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2016.02-GCC-4.9-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2016.02-GCC-4.9-no-X11.eb
index ed76be27b657422d65a66165fe8979706a5fc259..873aa2d811e2437f6646a1670388bccee1c7b35a 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2016.02-GCC-4.9-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2016.02-GCC-4.9-no-X11.eb
@@ -19,6 +19,7 @@ dependencies = [
     ('Tcl', version),
 ]
 
+# To be clear: this will still require X11 to be present (see issue #2261)
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
 
 start_dir = 'unix'
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
index 9eede4921066c4045fe7939309e3bef44725eb76..3174f88f273bd3fdea80f8c8aca978720f18d1b9 100644
--- 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
@@ -20,6 +20,7 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
+# To be clear: this will still require X11 to be present (see issue #2261)
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
 
 start_dir = 'unix'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.5-GCC-5.4.0-2.26.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.5-GCC-5.4.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f2a063069a2d9beb04f9a028e04fe7684e4008c3
--- /dev/null
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.5-GCC-5.4.0-2.26.eb
@@ -0,0 +1,26 @@
+easyblock = 'ConfigureMake'
+
+name = 'Tk'
+version = '8.6.5'
+
+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': '5.4.0-2.26'}
+
+source_urls = ["http://prdownloads.sourceforge.net/tcl"]
+sources = ['%(namelower)s%(version)s-src.tar.gz']
+
+patches = ['Tk-8.6.4_different-prefix-with-tcl.patch']
+
+dependencies = [
+    ('Tcl', version),
+    ('zlib', '1.2.8'),
+]
+
+configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib CFLAGS="-I$EBROOTTCL/include"'
+
+start_dir = 'unix'
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.5-foss-2016.04.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.5-foss-2016.04.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5587e8e8dc2b6f3a9e831c8ede461977f23cd820
--- /dev/null
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.5-foss-2016.04.eb
@@ -0,0 +1,26 @@
+easyblock = 'ConfigureMake'
+
+name = 'Tk'
+version = '8.6.5'
+
+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': '2016.04'}
+
+source_urls = ["http://prdownloads.sourceforge.net/tcl"]
+sources = ['%(namelower)s%(version)s-src.tar.gz']
+
+patches = ['Tk-8.6.4_different-prefix-with-tcl.patch']
+
+dependencies = [
+    ('Tcl', version),
+    ('zlib', '1.2.8'),
+]
+
+configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib CFLAGS="-I$EBROOTTCL/include"'
+
+start_dir = 'unix'
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/t/Triangle/Triangle-1.6-foss-2016a.eb b/easybuild/easyconfigs/t/Triangle/Triangle-1.6-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c29bcc0a882cdb2eba99eb59d7dfd58b47bc95bc
--- /dev/null
+++ b/easybuild/easyconfigs/t/Triangle/Triangle-1.6-foss-2016a.eb
@@ -0,0 +1,34 @@
+easyblock = 'MakeCp'
+
+name = 'Triangle'
+version = '1.6'
+
+homepage = 'http://www.cs.cmu.edu/~quake/triangle.html'
+description = """Triangle generates exact Delaunay triangulations, constrained Delaunay triangulations,
+ conforming Delaunay triangulations, Voronoi diagrams, and high-quality triangular meshes.
+ The latter can be generated with no small or large angles,
+ and are thus suitable for finite element analysis."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+source_urls = ['http://www.netlib.org/voronoi/']
+sources = ['%(namelower)s.zip']
+checksums = [('md5', '10aff8d7950f5e0e2fb6dd2e340be2c9')]
+
+patches = ['%(name)s-%(version)s_makefile.patch']
+
+buildopts = 'triangle trilibrary'
+
+files_to_copy = [
+    (['triangle', 'tricall'], 'bin'),
+    (['triangle.h'], 'include'),
+    (['libtriangle.a'], 'lib'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/triangle', 'bin/tricall', 'include/triangle.h', 'lib/libtriangle.a'],
+    'dirs': []
+}
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/t/Triangle/Triangle-1.6_makefile.patch b/easybuild/easyconfigs/t/Triangle/Triangle-1.6_makefile.patch
new file mode 100644
index 0000000000000000000000000000000000000000..01806e267ea03e120a4fb0cca4a3880f324e9e13
--- /dev/null
+++ b/easybuild/easyconfigs/t/Triangle/Triangle-1.6_makefile.patch
@@ -0,0 +1,41 @@
+#Pick compiler and flags from environmental variables and make libtriangle.a from triangle.o
+# Aug 04th 2016 by B. Hajgato (Free Univeristy Brussels - VUB)
+--- makefile.orig	2005-07-28 02:22:01.000000000 +0200
++++ makefile	2016-08-04 14:29:37.360139408 +0200
+@@ -18,7 +18,7 @@
+ 
+ # CC should be set to the name of your favorite C compiler.
+ 
+-CC = cc
++CC ?= cc
+ 
+ # CSWITCHES is a list of all switches passed to the C compiler.  I strongly
+ #   recommend using the best level of optimization.  I also strongly
+@@ -73,7 +73,7 @@
+ #
+ #   CSWITCHES = -O -DNO_TIMER -DLINUX -I/usr/X11R6/include -L/usr/X11R6/lib
+ 
+-CSWITCHES = -O -DLINUX -I/usr/X11R6/include -L/usr/X11R6/lib
++CSWITCHES = $(CFLAGS) -DLINUX
+ 
+ # TRILIBDEFS is a list of definitions used to compile an object code version
+ #   of Triangle (triangle.o) to be called by another program.  The file
+@@ -96,7 +96,7 @@
+ 
+ all: $(BIN)triangle $(BIN)showme
+ 
+-trilibrary: $(BIN)triangle.o $(BIN)tricall
++trilibrary: $(BIN)libtriangle.a $(BIN)tricall
+ 
+ $(BIN)triangle: $(SRC)triangle.c
+ 	$(CC) $(CSWITCHES) -o $(BIN)triangle $(SRC)triangle.c -lm
+@@ -109,6 +109,9 @@
+ 	$(CC) $(CSWITCHES) $(TRILIBDEFS) -c -o $(BIN)triangle.o \
+ 		$(SRC)triangle.c
+ 
++$(BIN)libtriangle.a: $(SRC)triangle.o
++	$(AR) cqs $(BIN)libtriangle.a triangle.o
++    
+ $(BIN)showme: $(SRC)showme.c
+ 	$(CC) $(CSWITCHES) -o $(BIN)showme $(SRC)showme.c -lX11
+ 
diff --git a/easybuild/easyconfigs/t/Trinity/Trinity-2.2.0-foss-2016a.eb b/easybuild/easyconfigs/t/Trinity/Trinity-2.2.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..58018d93350fd5ff63bec5cba9c884c7d02fb328
--- /dev/null
+++ b/easybuild/easyconfigs/t/Trinity/Trinity-2.2.0-foss-2016a.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
+
+name = 'Trinity'
+version = '2.2.0'
+
+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': 'foss', 'version': '2016a'}
+
+source_urls = ['https://github.com/trinityrnaseq/trinityrnaseq/archive/']
+sources = ['v%(version)s.tar.gz']
+
+patches = [
+    'chrysalis_commandline_noconsts_2012-10-05.patch',
+    'Trinity-2.2.0_jellyfish-Makefile.patch',
+]
+
+builddependencies = [
+    ('Autotools', '20150215'),
+]
+
+dependencies = [
+    ('Java', '1.8.0_92', '', True),
+    ('ant', '1.9.7', '-Java-%(javaver)s', True),
+    ('Bowtie', '1.1.2'),
+    ('Bowtie2', '2.2.8'),
+    ('ncurses', '6.0',),
+    ('zlib', '1.2.8'),
+    ('Perl', '5.22.1'),
+]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/t/Trinity/Trinity-2.2.0_jellyfish-Makefile.patch b/easybuild/easyconfigs/t/Trinity/Trinity-2.2.0_jellyfish-Makefile.patch
new file mode 100644
index 0000000000000000000000000000000000000000..33fecc091177170c20bffec01e28b695b5e11f83
--- /dev/null
+++ b/easybuild/easyconfigs/t/Trinity/Trinity-2.2.0_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.2.0/trinity-plugins/Makefile.orig	2016-07-07 11:42:18.000000000 +0200
++++ trinityrnaseq-2.2.0/trinity-plugins/Makefile	2016-07-07 11:44:04.000000000 +0200
+@@ -2,6 +2,9 @@
+ JELLYFISH_CODE="jellyfish-2.1.4"
+ HTSLIB_CODE="htslib.github.Aug182015.tar.gz"
+ 
++CC?=gcc
++CXX?=g++
++
+ #######################
+ ### Required by Trinity
+ #######################
+@@ -26,12 +29,13 @@
+ 
+ samtools:
+ 	tar xvf samtools-0.1.19.tar.bz2
+-	cd samtools-0.1.19 && $(MAKE) ${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/tabix/tabix-0.2.6-foss-2016a.eb b/easybuild/easyconfigs/t/tabix/tabix-0.2.6-foss-2016a.eb
index cb200231af407837329f36c8f40d7cb47e0df0d8..30c58df38b902b14e598e61cfbe82269c3a354a5 100644
--- a/easybuild/easyconfigs/t/tabix/tabix-0.2.6-foss-2016a.eb
+++ b/easybuild/easyconfigs/t/tabix/tabix-0.2.6-foss-2016a.eb
@@ -13,7 +13,7 @@ sources = [SOURCE_TAR_BZ2]
 
 dependencies = [('zlib', '1.2.8')]
 
-buildopts = 'CFLAGS="-L$EBROOTZLIB/lib"'
+buildopts = 'CC="$CC" CFLAGS="$CFLAGS -L$EBROOTZLIB/lib"'
 
 files_to_copy = [
     (["tabix", "bgzip", "tabix.py"], "bin"),
@@ -29,4 +29,4 @@ sanity_check_paths = {
     'dirs': [""],
 }
 
-moduleclass = 'bio'
\ No newline at end of file
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/t/tabix/tabix-0.2.6-goolf-1.4.10.eb b/easybuild/easyconfigs/t/tabix/tabix-0.2.6-goolf-1.4.10.eb
index 4ab3c4b882088688322a148927a4bae7ce718c7b..e138adfe4c6b7496064bccfb7ca248be6d4c0366 100644
--- a/easybuild/easyconfigs/t/tabix/tabix-0.2.6-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/t/tabix/tabix-0.2.6-goolf-1.4.10.eb
@@ -19,7 +19,7 @@ sources = [SOURCE_TAR_BZ2]
 
 dependencies = [('zlib', '1.2.8')]
 
-buildopts = 'CFLAGS="-L$EBROOTZLIB/lib"'
+buildopts = 'CC="$CC" CFLAGS="$CFLAGS -L$EBROOTZLIB/lib"'
 
 files_to_copy = [
     (["tabix", "bgzip", "tabix.py"], "bin"),
diff --git a/easybuild/easyconfigs/t/tabix/tabix-0.2.6-intel-2014b.eb b/easybuild/easyconfigs/t/tabix/tabix-0.2.6-intel-2014b.eb
index 355e0eb0ad04f64903e2d076425ac06aa09873d3..af291cd25c46c9ada3c7e5365a6a760e46e7bb4b 100644
--- a/easybuild/easyconfigs/t/tabix/tabix-0.2.6-intel-2014b.eb
+++ b/easybuild/easyconfigs/t/tabix/tabix-0.2.6-intel-2014b.eb
@@ -19,7 +19,7 @@ sources = [SOURCE_TAR_BZ2]
 
 dependencies = [('zlib', '1.2.8')]
 
-buildopts = 'CFLAGS="-L$EBROOTZLIB/lib"'
+buildopts = 'CC="$CC" CFLAGS="$CFLAGS -L$EBROOTZLIB/lib"'
 
 files_to_copy = [
     (["tabix", "bgzip", "tabix.py"], "bin"),
diff --git a/easybuild/easyconfigs/t/tabix/tabix-0.2.6-intel-2016b.eb b/easybuild/easyconfigs/t/tabix/tabix-0.2.6-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ef8197538da889d177f6306c1e7f16992ea21b36
--- /dev/null
+++ b/easybuild/easyconfigs/t/tabix/tabix-0.2.6-intel-2016b.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
+# Author: Jens Timmerman, Ghent University
+
+easyblock = 'MakeCp'
+
+name = 'tabix'
+version = '0.2.6'
+
+homepage = 'http://samtools.sourceforge.net'
+description = """ Generic indexer for TAB-delimited genome position files """
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = [('http://sourceforge.net/projects/samtools/files/', 'download')]
+sources = [SOURCE_TAR_BZ2]
+
+dependencies = [('zlib', '1.2.8')]
+
+buildopts = 'CC="$CC" CFLAGS="$CFLAGS -L$EBROOTZLIB/lib"'
+
+files_to_copy = [
+    (["tabix", "bgzip", "tabix.py"], "bin"),
+    (["tabix.1"], "man/man1"),
+    "example.gtf.gz",
+    "example.gtf.gz.tbi",
+    "NEWS",
+    "ChangeLog"
+]
+
+sanity_check_paths = {
+    'files': ["bin/tabix", "bin/bgzip", "bin/tabix.py"],
+    'dirs': [""],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/t/texinfo/texinfo-5.2-ictce-5.5.0.eb b/easybuild/easyconfigs/t/texinfo/texinfo-5.2-ictce-5.5.0.eb
new file mode 100755
index 0000000000000000000000000000000000000000..0eff73d3ccb746a330deb7df1086f2ade67b4430
--- /dev/null
+++ b/easybuild/easyconfigs/t/texinfo/texinfo-5.2-ictce-5.5.0.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'texinfo'
+version = '5.2'
+
+homepage = 'https://www.gnu.org/software/texinfo/'
+description = """Texinfo is the official documentation format of the GNU project."""
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+osdependencies = ['texlive']
+
+preinstallopts = "make TEXMF=%(installdir)s/texmf install-tex && "
+
+# This will overwrite a users $TEXMFHOME so this module is best used as a build dependency
+modextravars = {'TEXMFHOME': '%(installdir)s/texmf'}
+modloadmsg = "\n\nWARNING: This texinfo module has (re)defined the value for the environment variable \\$TEXMFHOME.\n"
+modloadmsg += "If you use a custom texmf directory (such as ~/texmf) you should copy files found in the\n"
+modloadmsg += "new \\$TEXMFHOME to your custom directory and reset the value of \\$TEXMFHOME to point to that space:\n"
+modloadmsg += "\tcp -r $TEXMFHOME/* /path/to/your/texmf\n"
+modloadmsg += "\texport TEXMFHOME=/path/to/your/texmf\n\n"
+
+sanity_check_paths = {
+    'files': ['bin/info', 'bin/makeinfo', 'bin/pod2texi', 'bin/texi2pdf', 'texmf/tex/texinfo/texinfo.tex'],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.2.20-intel-2016b.eb b/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.2.20-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ae9bb8dae339bb4e1645b655c6788dd4d7f8a06a
--- /dev/null
+++ b/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.2.20-intel-2016b.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.20'
+
+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': '2016b'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['ftp://ftp.unidata.ucar.edu/pub/udunits']
+
+dependencies = [('expat', '2.2.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/v/VASP/VASP-5.4.1-intel-2016.02-GCC-4.9.eb b/easybuild/easyconfigs/v/VASP/VASP-5.4.1-intel-2016.02-GCC-4.9.eb
index 2a6923ac23c1a42426ae319856899c712eeb43c4..5cd635730b77cabde5904f022c980fb2bca1d5dd 100644
--- a/easybuild/easyconfigs/v/VASP/VASP-5.4.1-intel-2016.02-GCC-4.9.eb
+++ b/easybuild/easyconfigs/v/VASP/VASP-5.4.1-intel-2016.02-GCC-4.9.eb
@@ -12,17 +12,34 @@ toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
 toolchainopts = {'usempi': True}
 
 # Vasp is proprietary software, see http://www.vasp.at/index.php/faqs on how to get access to the code
-sources = [SOURCELOWER_TAR_GZ]
+sources = ['vasp.5.4.1.24Jun15.tar.gz']
+
+# uncommment after downloading patches from http://cms.mpi.univie.ac.at/wiki/index.php/Installing_VASP
+#patches = [
+#    'vasp.5.4.1.08072015.patch',
+#    'vasp.5.4.1.27082015.patch',
+#    'vasp.5.4.1.06112015.patch',
+#]
+
+checksums = [
+    '9a56174e272ac0c07645c42932848788',  # vasp.5.4.1.24Jun15.tar.gz
+    'ee242452bba6bb37459745f4617649d7',  # vasp.5.4.1.08072015.patch
+    'b137eb13804a60df382e77495dc738f9',  # vasp.5.4.1.27082015.patch
+    'd64b8f0ae861db7a76e6e9c9ffa188a1',  # vasp.5.4.1.06112015.patch
+]
 
 prebuildopts = 'cp arch/makefile.include.linux_intel ./makefile.include && '
 
 # path to libfftw3xf_intel.a is hardcoded in makefile.include
 prebuildopts += 'sed -i "s|\$(MKLROOT)/interfaces/fftw3xf|\$(FFTW_LIB_DIR)|" makefile.include && '
 
+# remove mkl flag to prevent mixing dynamic libs with the static libs in LIBBLACS/SCALAPACK
+prebuildopts += 'sed -i "s|-mkl||" makefile.include && '
+
 # VASP uses LIBS as a list of folders
 prebuildopts += 'unset LIBS && '
 
-buildopts = 'all BLACS="$LIBBLACS" '
+buildopts = 'all BLACS="$LIBBLACS" SCALAPACK="$LIBSCALAPACK"'
 
 parallel = 1
 
diff --git a/easybuild/easyconfigs/v/VCFtools/VCFtools-0.1.11-ictce-5.5.0-Perl-5.16.3.eb b/easybuild/easyconfigs/v/VCFtools/VCFtools-0.1.11-ictce-5.5.0-Perl-5.16.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1350a7b674dbb8883cbcfbf71b2067cf135e2888
--- /dev/null
+++ b/easybuild/easyconfigs/v/VCFtools/VCFtools-0.1.11-ictce-5.5.0-Perl-5.16.3.eb
@@ -0,0 +1,39 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+name = 'VCFtools'
+version = '0.1.11'
+
+easyblock = 'MakeCp'
+
+homepage = "http://vcftools.sourceforge.net/"
+description = """The aim of VCFtools is to provide 
+ methods for working with VCF files: validating, 
+ merging, comparing and calculate some basic population
+ genetic statistics. """
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+toolchainopts = {'optarch': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['%(namelower)s_%(version)s.tar.gz']
+
+perl = 'Perl'
+perlver = '5.16.3'
+versionsuffix = '-%s-%s' % (perl, perlver)
+dependencies = [
+    (perl, perlver),
+]
+
+files_to_copy = ["bin", "lib"]
+
+modextrapaths = {'PERL5LIB': 'lib/perl5/site_perl'}
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in ['vcftools', 'vcf-sort', 'vcf-stats']],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/v/VEGAS/VEGAS-0.8.27.eb b/easybuild/easyconfigs/v/VEGAS/VEGAS-0.8.27.eb
new file mode 100644
index 0000000000000000000000000000000000000000..83780a4e6cfb38ce1d566a13cf39f3edfa61f903
--- /dev/null
+++ b/easybuild/easyconfigs/v/VEGAS/VEGAS-0.8.27.eb
@@ -0,0 +1,29 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Ravi Tripathi
+# Email: ravi89@uab.edu
+
+easyblock = "Tarball"
+
+name = 'VEGAS'
+version = '0.8.27'
+
+homepage = 'http://gump.qimr.edu.au/VEGAS/'
+description = """ VEGAS (Versatile Gene-based Association Study) is 
+a free program for performing gene-based tests for association using 
+the results from genetic association studies """
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+source_urls = ['http://gump.qimr.edu.au/VEGAS/']
+sources = ['vegas-%(version)s-hapmapCEU.tar.gz']
+
+checksums= ["87ca985fec0c64820bfd202f15fb31de"]
+
+modextrapaths = {'PATH': ''}
+
+sanity_check_paths = {
+    'files': ["vegas", "glist-hg18", "VEGAS-readme.pdf"],
+    'dirs': ["hapmapCEU"]
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/v/VTK/VTK-6.3.0-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/v/VTK/VTK-6.3.0-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d63c30f413e02bc7aee49f60fc002f0416053ddd
--- /dev/null
+++ b/easybuild/easyconfigs/v/VTK/VTK-6.3.0-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,59 @@
+##
+# 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'
+versionsuffix = '-Python-%(pyver)s'
+
+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': '2016b'}
+
+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.6.1')]
+
+dependencies = [
+    ('Python', '2.7.12'),
+    ('libGLU', '9.0.0'),
+]
+
+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%%(pyshortver)s.%s " % SHLIB_EXT
+configopts += " -DPYTHON_INCLUDE_DIR=$EBROOTPYTHON/include/python%(pyshortver)s "
+preinstallopts = "mkdir -p %(installdir)s/lib/python%(pyshortver)s/site-packages/ && "
+preinstallopts += "export PYTHONPATH=%(installdir)s/lib/python%(pyshortver)s/site-packages:$PYTHONPATH && "
+
+modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
+
+sanity_check_paths = {
+    'files': ['bin/vtk%s-%%(version_major_minor)s' % x for x in ['EncodeString', 'HashSource',
+                                                                 'mkg3states', 'ParseOGLExt']],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/', 'include/vtk-%(version_major_minor)s'],
+}
+
+sanity_check_commands = [('python', "-c 'import %(namelower)s'")]
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/v/VTK/VTK-7.0.0-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/v/VTK/VTK-7.0.0-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ce85c69cbd2c83caca5a2cbc964ffd084547a65d
--- /dev/null
+++ b/easybuild/easyconfigs/v/VTK/VTK-7.0.0-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,58 @@
+##
+# 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 = '7.0.0'
+versionsuffix = '-Python-%(pyver)s'
+
+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': '2016b'}
+
+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.6.1')]
+
+dependencies = [
+    ('Python', '2.7.12'),
+    ('libGLU', '9.0.0'),
+]
+
+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%%(pyshortver)s.%s " % SHLIB_EXT
+configopts += " -DPYTHON_INCLUDE_DIR=$EBROOTPYTHON/include/python%(pyshortver)s "
+preinstallopts = "mkdir -p %(installdir)s/lib/python%(pyshortver)s/site-packages/ && "
+preinstallopts += "export PYTHONPATH=%(installdir)s/lib/python%(pyshortver)s/site-packages:$PYTHONPATH && "
+
+modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
+
+sanity_check_paths = {
+    'files': ['bin/vtk%s-%%(version_major_minor)s' % x for x in ['EncodeString', 'HashSource', 'mkg3states']],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/', 'include/vtk-%(version_major_minor)s'],
+}
+
+sanity_check_commands = [('python', "-c 'import %(namelower)s'")]
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/v/VTune/VTune-2017.eb b/easybuild/easyconfigs/v/VTune/VTune-2017.eb
new file mode 100644
index 0000000000000000000000000000000000000000..13d248cd6c44da89789aee3ea9c7f320896a94df
--- /dev/null
+++ b/easybuild/easyconfigs/v/VTune/VTune-2017.eb
@@ -0,0 +1,14 @@
+name = 'VTune'
+version = '2017'
+
+homepage = 'http://software.intel.com/en-us/intel-vtune-amplifier-xe'
+description = """Intel VTune Amplifier XE is the premier performance profiler for C, C++, C#, Fortran,
+ Assembly and Java."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = ['vtune_amplifier_xe_%(version)s.tar.gz']
+
+license_file = HOME + '/licenses/intel/license.lic'
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/v/VampirTrace/VampirTrace-5.14.4-goolf-1.5.14.eb b/easybuild/easyconfigs/v/VampirTrace/VampirTrace-5.14.4-goolf-1.5.14.eb
new file mode 100644
index 0000000000000000000000000000000000000000..722868d4b77ecc150db2b390a59d14a571a47ad6
--- /dev/null
+++ b/easybuild/easyconfigs/v/VampirTrace/VampirTrace-5.14.4-goolf-1.5.14.eb
@@ -0,0 +1,50 @@
+# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild
+# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany
+# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
+# License::   New BSD
+#
+# This work is based from experiences from the UNITE project
+# http://apps.fz-juelich.de/unite/
+##
+easyblock = 'ConfigureMake'
+
+name = 'VampirTrace'
+version = '5.14.4'
+
+homepage = 'http:/www.tu-dresden.de/zih/vampirtrace/'
+description = """VampirTrace is an open source library that allows detailed logging of program
+ execution for parallel applications using message passing (MPI) and threads (OpenMP), Pthreads)."""
+
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
+toolchainopts = {'usempi': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://wwwpub.zih.tu-dresden.de/%7Emlieber/dcount/dcount.php?package=vampirtrace&get=']
+
+dependencies = [
+    ('OTF', '1.12.4'),
+    ('PAPI', '5.2.0'),
+    ('PDT', '3.19'),
+]
+
+configopts  = 'MPIFC="$MPIF90"'
+
+# MPI suite should always be specified -- MUCH quicker and SAVER than autodetect
+# note: these options are toolchain specific!
+configopts += " --with-openmpi --enable-compinst=gnu"
+
+configopts += " --with-papi-dir=${EBROOTPAPI}"
+configopts += " --with-extern-otf-dir=${EBROOTOTF}"
+configopts += " --with-tau-instrumentor=${EBROOTPDT}/x86_64/bin/tau_instrumentor"
+configopts += " --with-pdt-cparse=${EBROOTPDT}/x86_64/bin/cparse"
+configopts += " --with-pdt-cxxparse=${EBROOTPDT}/x86_64/bin/cxxparse"
+configopts += " --with-pdt-fparse=${EBROOTPDT}/x86_64/bin/gfparse"
+# VamoirTrace does also support CUDA measurements - not yet tested
+# configopts += " --with-cuda-dir=${CUDADIR}"
+
+sanity_check_paths = {
+    'files': ['bin/vtcc', 'include/vampirtrace/vt_user.h', ('lib/libvt.a', 'lib64/libvt.a')],
+    'dirs': []
+}
+
+moduleclass = 'perf'
diff --git a/easybuild/easyconfigs/v/verifyBamID/verifyBamID-1.1.3-foss-2016a.eb b/easybuild/easyconfigs/v/verifyBamID/verifyBamID-1.1.3-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d08f6ddb122edca18046c54af57db35eceeb6291
--- /dev/null
+++ b/easybuild/easyconfigs/v/verifyBamID/verifyBamID-1.1.3-foss-2016a.eb
@@ -0,0 +1,30 @@
+easyblock = 'MakeCp'
+
+name = 'verifyBamID'
+version = '1.1.3'
+
+homepage = "http://csg.sph.umich.edu/kang/verifyBamID/index.html"
+description = """verifyBamID is a software that verifies whether the reads in particular file match previously known 
+ genotypes for an individual (or group of individuals), and checks whether the reads are contaminated as a mixture of 
+ two samples. verifyBamID can detect sample contamination and swaps when external genotypes are available. When 
+ external genotypes are not available, verifyBamID still robustly detects sample swaps.
+"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['https://github.com/statgen/%(name)s/releases/download/v%(version)s/']
+sources = ['%(name)sLibStatGen.%(version)s.tgz']
+
+checksums = ['9b3d4c73c8f72e6b8f1e014702bc5bec']
+
+buildopts = 'CXX="$CXX"'
+
+executables = ['%(name)s/bin/%(name)s']
+files_to_copy = [(executables, 'bin')]
+
+sanity_check_paths = {
+    'files': ['bin/%(name)s'],
+    'dirs': []
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/w/worker/worker-1.6.6-intel-2016b.eb b/easybuild/easyconfigs/w/worker/worker-1.6.6-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..dd9436b448a298b7f33329f2ddaff59f3351fe67
--- /dev/null
+++ b/easybuild/easyconfigs/w/worker/worker-1.6.6-intel-2016b.eb
@@ -0,0 +1,32 @@
+easyblock = 'ConfigureMake'
+
+name = 'worker'
+version = '1.6.6'
+
+homepage = 'https://github.com/gjbex/worker'
+description = """The Worker framework has been developed to help deal with parameter exploration experiments
+ that would otherwise result in many jobs, forcing the user resort to scripting to retain her sanity;
+ see also https://vscentrum.be/neutral/documentation/cluster-doc/running-jobs/worker-framework."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+toolchainopts = {'usempi': True}
+
+source_urls = ['https://github.com/gjbex/worker/archive/']
+sources = ['%(version)s.tar.gz']
+
+dependencies = [
+    ('Perl', '5.24.0')
+]
+
+# adjust worker configuration file
+# note: tweak this to your local setup
+postinstallcmds = [
+    'sed -i "s/ cores_per_node = .*/ cores_per_node = 16/g" %(installdir)s/conf/worker.conf',
+    'sed -i "s@ qsub = .*@ qsub = `which qsub`@g" %(installdir)s/conf/worker.conf',
+    'sed -i "s/ email = .*/ email = hpc-support@example.com/g" %(installdir)s/conf/worker.conf',
+    'sed -i "s/ unload_modules = .*/ unload_modules = intel/g" %(installdir)s/conf/worker.conf',
+    'sed -i "s@ mpi_module = .*@ mpi_module = intel/2016b@g" %(installdir)s/conf/worker.conf',
+    'sed -i "s@ module_path = .*@ module_path = %(installdir)s/../../../modules/all@g" %(installdir)s/conf/worker.conf',
+]
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/w/worker/worker-1.6.7-intel-2016b.eb b/easybuild/easyconfigs/w/worker/worker-1.6.7-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f9fffe780440e11fc320abf2830391b2e08c000d
--- /dev/null
+++ b/easybuild/easyconfigs/w/worker/worker-1.6.7-intel-2016b.eb
@@ -0,0 +1,65 @@
+easyblock = 'ConfigureMake'
+
+name = 'worker'
+version = '1.6.7'
+
+homepage = 'https://github.com/gjbex/worker'
+description = """The Worker framework has been developed to help deal with parameter exploration experiments
+ that would otherwise result in many jobs, forcing the user resort to scripting to retain her sanity;
+ see also https://vscentrum.be/neutral/documentation/cluster-doc/running-jobs/worker-framework."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = ['https://github.com/gjbex/worker/archive/']
+sources = ['%(version)s.tar.gz']
+
+tcname = 'intel'
+tcver = '2016b'
+builddependencies = [(tcname, tcver)]
+versionsuffix = '-%s-%s' % (tcname, tcver)
+
+exts_defaultclass = 'PerlModule'
+
+exts_list = [
+    ('Config::General', '2.61', {
+        'source_tmpl': 'Config-General-2.61.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TL/TLINDEN'],
+    }),
+    ('IO::Stringy', '2.111', {
+        'source_tmpl': 'IO-stringy-2.111.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DS/DSKOLL'],
+        }),
+    ('Text::CSV', '1.33', {
+        'source_tmpl': 'Text-CSV-1.33.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MAKAMAKA'],
+        }),
+    ('DBI', '1.636', {
+        'source_tmpl': 'DBI-1.636.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TI/TIMB'],
+        }),
+    ('DBD::SQLite', '1.50', {
+        'source_tmpl': 'DBD-SQLite-1.50.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/I/IS/ISHIGAKI'],
+        }),
+    ('Date::Language', '2.30', {
+        'source_tmpl': 'TimeDate-2.30.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GB/GBARR'],
+        }),
+]
+
+modextrapaths = {
+    'PERL5LIB': ['share/perl5', 'lib64/perl5'],
+}
+
+# adjust worker configuration file
+# note: tweak this to your local setup
+postinstallcmds = [
+    'sed -i "s/ cores_per_node = .*/ cores_per_node = 16/g" %(installdir)s/conf/worker.conf',
+    'sed -i "s@ qsub = .*@ qsub = `which qsub`@g" %(installdir)s/conf/worker.conf',
+    'sed -i "s/ email = .*/ email = hpc-support@example.com/g" %(installdir)s/conf/worker.conf',
+    'sed -i "s/ unload_modules = .*/ unload_modules = intel/g" %(installdir)s/conf/worker.conf',
+    'sed -i "s@ mpi_module = .*@ mpi_module = %s/%s@g" %%(installdir)s/conf/worker.conf' % (tcname, tcver),
+    'sed -i "s@ module_path = .*@ module_path = %(installdir)s/../../../modules/all@g" %(installdir)s/conf/worker.conf',
+]
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/w/wxPython/wxPython-3.0.2.0-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/w/wxPython/wxPython-3.0.2.0-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ddb87ab0aa6a7c393a5ae8cd415f97130ecf2ea6
--- /dev/null
+++ b/easybuild/easyconfigs/w/wxPython/wxPython-3.0.2.0-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,33 @@
+name = 'wxPython'
+version = '3.0.2.0'
+versionsuffix = "-Python-%(pyver)s" 
+
+homepage = 'http://www.wxpython.org'
+description = """wxPython is a GUI toolkit for the Python programming language.
+ It allows Python programmers to create programs with a robust,
+ highly functional graphical user interface, simply and easily.
+ It is implemented as a Python extension module (native code)
+ that wraps the popular wxWidgets cross platform GUI library,
+ which is written in C++."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['%(name)s-src-%(version)s.tar.bz2']
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('libpng', '1.6.21'),
+    ('zlib', '1.2.8'),
+    ('libjpeg-turbo', '1.4.2', '-NASM-2.12.01'),
+    ('LibTIFF', '4.0.6'),
+    ('expat', '2.1.1'),
+    ('GTK+', '2.24.30'),
+    ('GConf', '3.2.6'),
+    ('GST-plugins-base', '0.10.36'),
+    ('libGLU', '9.0.0', '-Mesa-11.2.1'),
+    ('libSM', '1.2.2'),
+    ('libXxf86vm', '1.1.4'),
+]
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/w/wxPython/wxPython-3.0.2.0-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/w/wxPython/wxPython-3.0.2.0-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..73dad53861834a289c25899929ade0889b9f75a4
--- /dev/null
+++ b/easybuild/easyconfigs/w/wxPython/wxPython-3.0.2.0-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,34 @@
+name = 'wxPython'
+version = '3.0.2.0'
+versionsuffix = "-Python-%(pyver)s" 
+
+homepage = 'http://www.wxpython.org'
+description = """wxPython is a GUI toolkit for the Python programming language.
+ It allows Python programmers to create programs with a robust,
+ highly functional graphical user interface, simply and easily.
+ It is implemented as a Python extension module (native code)
+ that wraps the popular wxWidgets cross platform GUI library,
+ which is written in C++."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['%(name)s-src-%(version)s.tar.bz2']
+
+patches = ['%(name)s_%(version)s_intel.patch']
+
+dependencies = [
+    ('Python', '2.7.12'),
+    ('libpng', '1.6.24'),
+    ('zlib', '1.2.8'),
+    ('libjpeg-turbo', '1.5.0'),
+    ('LibTIFF', '4.0.6'),
+    ('expat', '2.2.0'),
+    ('GTK+', '2.24.31'),
+    ('GConf', '3.2.6'),
+    ('GST-plugins-base', '0.10.36'),
+    ('Mesa', '12.0.2'),
+    ('libGLU', '9.0.0'),
+]
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/x/X11/X11-20160819-foss-2016b.eb b/easybuild/easyconfigs/x/X11/X11-20160819-foss-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c44e65c206b3e505bc4a5ff5630443c0a5d0c474
--- /dev/null
+++ b/easybuild/easyconfigs/x/X11/X11-20160819-foss-2016b.eb
@@ -0,0 +1,131 @@
+easyblock = 'Bundle'
+
+name = 'X11'
+version = '20160819'
+
+homepage = 'https://www.x.org'
+description = "The X Window System (X11) is a windowing system for bitmap displays"
+
+toolchain = {'name': 'foss', 'version': '2016b'}
+
+source_urls = [
+    XORG_LIB_SOURCE,
+    XORG_PROTO_SOURCE,
+    'http://xcb.freedesktop.org/dist/',
+    'http://xkbcommon.org/download/',
+    'http://cgit.freedesktop.org/xorg/util/macros/snapshot',
+]
+
+builddependencies = [
+    ('Autotools', '20150215'),
+    ('pkg-config', '0.29.1'),
+]
+dependencies = [
+    ('freetype', '2.6.5'),
+    ('fontconfig', '2.12.1'),
+    ('zlib', '1.2.8'),
+    ('bzip2', '1.0.6'),
+]
+
+default_easyblock = 'ConfigureMake'
+
+common_specs = {
+    'sources': [SOURCE_TAR_GZ],
+    'start_dir': '%(name)s-%(version)s',
+}
+components = [
+    ('xorg-macros', '1.19.0', {
+        'sources': ['util-macros-%(version)s.tar.gz'],
+        'start_dir': 'util-macros-%(version)s',
+    }),
+    ('libpthread-stubs', '0.3', common_specs),
+    ('bigreqsproto', '1.1.2', common_specs),
+    ('compositeproto', '0.4.2', common_specs),
+    ('damageproto', '1.2.1', common_specs),
+    ('dmxproto', '2.3.1', common_specs),
+    ('dri2proto', '2.8', common_specs),
+    ('dri3proto', '1.0', common_specs),
+    ('fixesproto', '5.0', common_specs),
+    ('fontsproto', '2.1.3', common_specs),
+    ('glproto', '1.4.17', common_specs),
+    ('inputproto', '2.3.1', common_specs),
+    ('kbproto', '1.0.7', common_specs),
+    ('presentproto', '1.0', common_specs),
+    ('randrproto', '1.5.0', common_specs),
+    ('recordproto', '1.14.2', common_specs),
+    ('renderproto', '0.11', common_specs),
+    ('resourceproto', '1.2.0', common_specs),
+    ('scrnsaverproto', '1.2.2', common_specs),
+    ('videoproto', '2.3.3', common_specs),
+    ('xcmiscproto', '1.2.2', common_specs),
+    ('xextproto', '7.3.0', common_specs),
+    ('xf86bigfontproto', '1.2.0', common_specs),
+    ('xf86dgaproto', '2.1', common_specs),
+    ('xf86driproto', '2.1.1', common_specs),
+    ('xf86vidmodeproto', '2.3.1', common_specs),
+    ('xineramaproto', '1.2.1', common_specs),
+    ('xproto', '7.0.28', common_specs),
+    ('libXau', '1.0.8', common_specs),
+    ('libXdmcp', '1.1.2', common_specs),
+    ('xcb-proto', '1.11', common_specs),
+    ('libxcb', '1.11.1', common_specs),
+    ('xtrans', '1.3.5', common_specs),
+    ('libxkbcommon', '0.6.1', {
+        'sources': ['libxkbcommon-%(version)s.tar.xz'],
+        'start_dir': 'libxkbcommon-%(version)s',
+    }),
+    ('libX11', '1.6.3', common_specs),
+    ('libXext', '1.3.3', common_specs),
+    ('libFS', '1.0.7', common_specs),
+    ('libICE', '1.0.9', common_specs),
+    ('libSM', '1.2.2', common_specs),
+    ('libXScrnSaver', '1.2.2', common_specs),
+    ('libXt', '1.1.5', common_specs),
+    ('libXmu', '1.1.2', common_specs),
+    ('libXpm', '3.5.11', common_specs),
+    ('libXaw', '1.0.13', common_specs),
+    ('libXfixes', '5.0.2', common_specs),
+    ('libXcomposite', '0.4.4', common_specs),
+    ('libXrender', '0.9.9', common_specs),
+    ('libXcursor', '1.1.14', common_specs),
+    ('libXdamage', '1.1.4', common_specs),
+    ('libfontenc', '1.1.3', common_specs),
+    ('libXfont', '1.5.1', common_specs),
+    ('libXft', '2.3.2', common_specs),
+    ('libXi', '1.7.6', common_specs),
+    ('libXinerama', '1.1.3', common_specs),
+    ('libXrandr', '1.5.0', common_specs),
+    ('libXres', '1.0.7', common_specs),
+    ('libXtst', '1.2.2', common_specs),
+    ('libXv', '1.0.10', common_specs),
+    ('libXvMC', '1.0.9', common_specs),
+    ('libXxf86dga', '1.1.4', common_specs),
+    ('libXxf86vm', '1.1.4', common_specs),
+    ('libdmx', '1.1.3', common_specs),
+    ('libpciaccess', '0.13.4', common_specs),
+    ('libxkbfile', '1.0.9', common_specs),
+    ('libxshmfence', '1.2', common_specs),
+    ('xcb-util', '0.4.0', common_specs),
+    ('xcb-util-image', '0.4.0', common_specs),
+    ('xcb-util-keysyms', '0.4.0', common_specs),
+    ('xcb-util-renderutil', '0.3.9', common_specs),
+    ('xcb-util-wm', '0.4.1', common_specs),
+    ('xcb-util-cursor', '0.1.3', common_specs),
+]
+
+# Python is required for xcb-proto
+allow_system_deps = [('Python', SYS_PYTHON_VERSION)]
+pyshortver = '.'.join(SYS_PYTHON_VERSION.split('.')[0:2])
+
+preconfigopts = "if [ ! -f configure ]; then ./autogen.sh; fi && "
+
+# specify that Bundle easyblock should run a full sanity check, rather than just trying to load the module
+full_sanity_check = True
+
+sanity_check_paths = {
+    'files': ['include/X11/Xlib.h', 'include/X11/Xutil.h'],
+    'dirs': ['include/GL', 'include/X11', 'include/X11/extensions', 'lib',
+             'lib/python%s/site-packages/xcbgen' % pyshortver, 'lib/pkgconfig', 'share/pkgconfig'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/x/X11/X11-20160819-intel-2016b.eb b/easybuild/easyconfigs/x/X11/X11-20160819-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..556bda9f6eb6ed8d8e21799201a95af3ac63ddd5
--- /dev/null
+++ b/easybuild/easyconfigs/x/X11/X11-20160819-intel-2016b.eb
@@ -0,0 +1,131 @@
+easyblock = 'Bundle'
+
+name = 'X11'
+version = '20160819'
+
+homepage = 'https://www.x.org'
+description = "The X Window System (X11) is a windowing system for bitmap displays"
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = [
+    XORG_LIB_SOURCE,
+    XORG_PROTO_SOURCE,
+    'http://xcb.freedesktop.org/dist/',
+    'http://xkbcommon.org/download/',
+    'http://cgit.freedesktop.org/xorg/util/macros/snapshot',
+]
+
+builddependencies = [
+    ('Autotools', '20150215'),
+    ('pkg-config', '0.29.1'),
+]
+dependencies = [
+    ('freetype', '2.6.5'),
+    ('fontconfig', '2.12.1'),
+    ('zlib', '1.2.8'),
+    ('bzip2', '1.0.6'),
+]
+
+default_easyblock = 'ConfigureMake'
+
+common_specs = {
+    'sources': [SOURCE_TAR_GZ],
+    'start_dir': '%(name)s-%(version)s',
+}
+components = [
+    ('xorg-macros', '1.19.0', {
+        'sources': ['util-macros-%(version)s.tar.gz'],
+        'start_dir': 'util-macros-%(version)s',
+    }),
+    ('libpthread-stubs', '0.3', common_specs),
+    ('bigreqsproto', '1.1.2', common_specs),
+    ('compositeproto', '0.4.2', common_specs),
+    ('damageproto', '1.2.1', common_specs),
+    ('dmxproto', '2.3.1', common_specs),
+    ('dri2proto', '2.8', common_specs),
+    ('dri3proto', '1.0', common_specs),
+    ('fixesproto', '5.0', common_specs),
+    ('fontsproto', '2.1.3', common_specs),
+    ('glproto', '1.4.17', common_specs),
+    ('inputproto', '2.3.1', common_specs),
+    ('kbproto', '1.0.7', common_specs),
+    ('presentproto', '1.0', common_specs),
+    ('randrproto', '1.5.0', common_specs),
+    ('recordproto', '1.14.2', common_specs),
+    ('renderproto', '0.11', common_specs),
+    ('resourceproto', '1.2.0', common_specs),
+    ('scrnsaverproto', '1.2.2', common_specs),
+    ('videoproto', '2.3.3', common_specs),
+    ('xcmiscproto', '1.2.2', common_specs),
+    ('xextproto', '7.3.0', common_specs),
+    ('xf86bigfontproto', '1.2.0', common_specs),
+    ('xf86dgaproto', '2.1', common_specs),
+    ('xf86driproto', '2.1.1', common_specs),
+    ('xf86vidmodeproto', '2.3.1', common_specs),
+    ('xineramaproto', '1.2.1', common_specs),
+    ('xproto', '7.0.28', common_specs),
+    ('libXau', '1.0.8', common_specs),
+    ('libXdmcp', '1.1.2', common_specs),
+    ('xcb-proto', '1.11', common_specs),
+    ('libxcb', '1.11.1', common_specs),
+    ('xtrans', '1.3.5', common_specs),
+    ('libxkbcommon', '0.6.1', {
+        'sources': ['libxkbcommon-%(version)s.tar.xz'],
+        'start_dir': 'libxkbcommon-%(version)s',
+    }),
+    ('libX11', '1.6.3', common_specs),
+    ('libXext', '1.3.3', common_specs),
+    ('libFS', '1.0.7', common_specs),
+    ('libICE', '1.0.9', common_specs),
+    ('libSM', '1.2.2', common_specs),
+    ('libXScrnSaver', '1.2.2', common_specs),
+    ('libXt', '1.1.5', common_specs),
+    ('libXmu', '1.1.2', common_specs),
+    ('libXpm', '3.5.11', common_specs),
+    ('libXaw', '1.0.13', common_specs),
+    ('libXfixes', '5.0.2', common_specs),
+    ('libXcomposite', '0.4.4', common_specs),
+    ('libXrender', '0.9.9', common_specs),
+    ('libXcursor', '1.1.14', common_specs),
+    ('libXdamage', '1.1.4', common_specs),
+    ('libfontenc', '1.1.3', common_specs),
+    ('libXfont', '1.5.1', common_specs),
+    ('libXft', '2.3.2', common_specs),
+    ('libXi', '1.7.6', common_specs),
+    ('libXinerama', '1.1.3', common_specs),
+    ('libXrandr', '1.5.0', common_specs),
+    ('libXres', '1.0.7', common_specs),
+    ('libXtst', '1.2.2', common_specs),
+    ('libXv', '1.0.10', common_specs),
+    ('libXvMC', '1.0.9', common_specs),
+    ('libXxf86dga', '1.1.4', common_specs),
+    ('libXxf86vm', '1.1.4', common_specs),
+    ('libdmx', '1.1.3', common_specs),
+    ('libpciaccess', '0.13.4', common_specs),
+    ('libxkbfile', '1.0.9', common_specs),
+    ('libxshmfence', '1.2', common_specs),
+    ('xcb-util', '0.4.0', common_specs),
+    ('xcb-util-image', '0.4.0', common_specs),
+    ('xcb-util-keysyms', '0.4.0', common_specs),
+    ('xcb-util-renderutil', '0.3.9', common_specs),
+    ('xcb-util-wm', '0.4.1', common_specs),
+    ('xcb-util-cursor', '0.1.3', common_specs),
+]
+
+# Python is required for xcb-proto
+allow_system_deps = [('Python', SYS_PYTHON_VERSION)]
+pyshortver = '.'.join(SYS_PYTHON_VERSION.split('.')[0:2])
+
+preconfigopts = "if [ ! -f configure ]; then ./autogen.sh; fi && "
+
+# specify that Bundle easyblock should run a full sanity check, rather than just trying to load the module
+full_sanity_check = True
+
+sanity_check_paths = {
+    'files': ['include/X11/Xlib.h', 'include/X11/Xutil.h'],
+    'dirs': ['include/GL', 'include/X11', 'include/X11/extensions', 'lib',
+             'lib/python%s/site-packages/xcbgen' % pyshortver, 'lib/pkgconfig', 'share/pkgconfig'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/x/XML-Parser/XML-Parser-2.44_01-GCCcore-4.9.3-Perl-5.24.0.eb b/easybuild/easyconfigs/x/XML-Parser/XML-Parser-2.44_01-GCCcore-4.9.3-Perl-5.24.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9234f034719e5ab49cced4e165263ffeaf4a041b
--- /dev/null
+++ b/easybuild/easyconfigs/x/XML-Parser/XML-Parser-2.44_01-GCCcore-4.9.3-Perl-5.24.0.eb
@@ -0,0 +1,31 @@
+easyblock = 'PerlModule'
+
+name = 'XML-Parser'
+version = '2.44_01'
+versionsuffix = '-Perl-%(perlver)s'
+
+homepage = 'http://search.cpan.org/~toddr/XML-Parser-2.41/'
+description = """This is a Perl extension interface to James Clark's XML parser, expat."""
+
+toolchain = {'name': 'GCCcore', 'version': '4.9.3'}
+
+source_urls = ['http://cpan.metacpan.org/authors/id/T/TO/TODDR/']
+sources = [SOURCE_TAR_GZ]
+
+builddependencies = [
+    ('binutils', '2.25')
+]
+
+dependencies = [
+    ('Perl', '5.24.0'),
+    ('expat', '2.2.0')
+]
+
+options = {'modulename': 'XML::Parser'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/perl5/site_perl/%(perlver)s/x86_64-linux-thread-multi/XML'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/x/XML-Parser/XML-Parser-2.44_01-intel-2016b-Perl-5.24.0.eb b/easybuild/easyconfigs/x/XML-Parser/XML-Parser-2.44_01-intel-2016b-Perl-5.24.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d7ce4573e1fcc8f6b2e432058a7c65afc5786236
--- /dev/null
+++ b/easybuild/easyconfigs/x/XML-Parser/XML-Parser-2.44_01-intel-2016b-Perl-5.24.0.eb
@@ -0,0 +1,27 @@
+easyblock = 'PerlModule'
+
+name = 'XML-Parser'
+version = '2.44_01'
+versionsuffix = '-Perl-%(perlver)s'
+
+homepage = 'http://search.cpan.org/~toddr/XML-Parser-2.41/'
+description = """This is a Perl extension interface to James Clark's XML parser, expat."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['http://cpan.metacpan.org/authors/id/T/TO/TODDR/']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Perl', '5.24.0'),
+    ('expat', '2.2.0')
+]
+
+options = {'modulename': 'XML::Parser'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/perl5/site_perl/%(perlver)s/x86_64-linux-thread-multi/XML'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/x/XZ/XZ-5.2.2-GCC-5.4.0-2.26.eb b/easybuild/easyconfigs/x/XZ/XZ-5.2.2-GCC-5.4.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9d2ac5e32d44e621e49d56164e86f9db15a1115a
--- /dev/null
+++ b/easybuild/easyconfigs/x/XZ/XZ-5.2.2-GCC-5.4.0-2.26.eb
@@ -0,0 +1,27 @@
+easyblock = 'ConfigureMake'
+
+name = 'XZ'
+version = '5.2.2'
+
+homepage = 'http://tukaani.org/xz/'
+description = "xz: XZ utilities"
+
+toolchain = {'name': 'GCC', 'version': '5.4.0-2.26'}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['http://tukaani.org/xz/']
+
+builddependencies = [
+    ('Autotools', '20150215'),
+    ('gettext', '0.19.8', '', True),
+]
+
+# may become useful in non-x86 archs
+#configopts = ' --disable-assembler '
+
+sanity_check_paths = {
+    'files': ["bin/xz", "bin/lzmainfo"],
+    'dirs': []
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/x/XZ/XZ-5.2.2-GCCcore-4.9.3.eb b/easybuild/easyconfigs/x/XZ/XZ-5.2.2-GCCcore-4.9.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..cafe4d07ac58e87a7980efcc43775a3d677e8d8a
--- /dev/null
+++ b/easybuild/easyconfigs/x/XZ/XZ-5.2.2-GCCcore-4.9.3.eb
@@ -0,0 +1,28 @@
+easyblock = 'ConfigureMake'
+
+name = 'XZ'
+version = '5.2.2'
+
+homepage = 'http://tukaani.org/xz/'
+description = "xz: XZ utilities"
+
+toolchain = {'name': 'GCCcore', 'version': '4.9.3'}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['http://tukaani.org/xz/']
+
+builddependencies = [
+    ('Autotools', '20150215'),
+    ('gettext', '0.19.8', '', True),
+    ('binutils', '2.25'),
+]
+
+# may become useful in non-x86 archs
+#configopts = ' --disable-assembler '
+
+sanity_check_paths = {
+    'files': ["bin/xz", "bin/lzmainfo"],
+    'dirs': []
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/x/XZ/XZ-5.2.2-foss-2015a.eb b/easybuild/easyconfigs/x/XZ/XZ-5.2.2-foss-2015a.eb
index 049e77b657e28521b59296523e4602205a7156a7..0245b4d8131971901d247b30a294dfc52595f32b 100644
--- a/easybuild/easyconfigs/x/XZ/XZ-5.2.2-foss-2015a.eb
+++ b/easybuild/easyconfigs/x/XZ/XZ-5.2.2-foss-2015a.eb
@@ -13,10 +13,7 @@ source_urls = ['http://tukaani.org/xz/']
 
 builddependencies = [
     ('Autotools', '20150215'),
-]
-
-dependencies = [
-    ('gettext', '0.19.4'),
+    ('gettext', '0.19.4', '', True),
 ]
 
 # may become useful in non-x86 archs
diff --git a/easybuild/easyconfigs/x/XZ/XZ-5.2.2-foss-2016.04.eb b/easybuild/easyconfigs/x/XZ/XZ-5.2.2-foss-2016.04.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6d7bd28197966b53510dd70ed5278e4043151838
--- /dev/null
+++ b/easybuild/easyconfigs/x/XZ/XZ-5.2.2-foss-2016.04.eb
@@ -0,0 +1,27 @@
+easyblock = 'ConfigureMake'
+
+name = 'XZ'
+version = '5.2.2'
+
+homepage = 'http://tukaani.org/xz/'
+description = "xz: XZ utilities"
+
+toolchain = {'name': 'foss', 'version': '2016.04'}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['http://tukaani.org/xz/']
+
+builddependencies = [
+    ('Autotools', '20150215'),
+    ('gettext', '0.19.8', '', True),
+]
+
+# may become useful in non-x86 archs
+#configopts = ' --disable-assembler '
+
+sanity_check_paths = {
+    'files': ["bin/xz", "bin/lzmainfo"],
+    'dirs': []
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/x/XZ/XZ-5.2.2-foss-2016a-gettext-0.19.7.eb b/easybuild/easyconfigs/x/XZ/XZ-5.2.2-foss-2016a-gettext-0.19.7.eb
index 17cd0492c014a002a57767793e2e9dc0b16731fe..b4a5a18d700cf2816048b4b848003be504777041 100644
--- a/easybuild/easyconfigs/x/XZ/XZ-5.2.2-foss-2016a-gettext-0.19.7.eb
+++ b/easybuild/easyconfigs/x/XZ/XZ-5.2.2-foss-2016a-gettext-0.19.7.eb
@@ -11,15 +11,12 @@ toolchain = {'name': 'foss', 'version': '2016a'}
 sources = [SOURCELOWER_TAR_BZ2]
 source_urls = ['http://tukaani.org/xz/']
 
-builddependencies = [
-    ('Autotools', '20150215'),
-]
-
 gettext_ver = '0.19.7'
 versionsuffix = '-gettext-%s' % gettext_ver
 
-dependencies = [
-    ('gettext', gettext_ver),
+builddependencies = [
+    ('Autotools', '20150215'),
+    ('gettext', gettext_ver, '', True),
 ]
 
 # may become useful in non-x86 archs
diff --git a/easybuild/easyconfigs/x/XZ/XZ-5.2.2-foss-2016a.eb b/easybuild/easyconfigs/x/XZ/XZ-5.2.2-foss-2016a.eb
index 2a89ca6af63efcce64d992e231e493b084028ad7..9cb0eb5b874361d77d36bcfe071b544ca267ce7f 100644
--- a/easybuild/easyconfigs/x/XZ/XZ-5.2.2-foss-2016a.eb
+++ b/easybuild/easyconfigs/x/XZ/XZ-5.2.2-foss-2016a.eb
@@ -13,10 +13,7 @@ source_urls = ['http://tukaani.org/xz/']
 
 builddependencies = [
     ('Autotools', '20150215'),
-]
-
-dependencies = [
-    ('gettext', '0.19.6'),
+    ('gettext', '0.19.6', '', True),
 ]
 
 # may become useful in non-x86 archs
diff --git a/easybuild/easyconfigs/x/XZ/XZ-5.2.2-foss-2016b.eb b/easybuild/easyconfigs/x/XZ/XZ-5.2.2-foss-2016b.eb
index cd789593239335725ce2511e551d50c004eec3fb..8bddb8fe4aa2ea97f74854fe9259dc4a350b842b 100644
--- a/easybuild/easyconfigs/x/XZ/XZ-5.2.2-foss-2016b.eb
+++ b/easybuild/easyconfigs/x/XZ/XZ-5.2.2-foss-2016b.eb
@@ -13,10 +13,7 @@ source_urls = ['http://tukaani.org/xz/']
 
 builddependencies = [
     ('Autotools', '20150215'),
-]
-
-dependencies = [
-    ('gettext', '0.19.8'),
+    ('gettext', '0.19.8', '', True),
 ]
 
 # may become useful in non-x86 archs
diff --git a/easybuild/easyconfigs/x/XZ/XZ-5.2.2-goolf-1.4.10.eb b/easybuild/easyconfigs/x/XZ/XZ-5.2.2-goolf-1.4.10.eb
index f9a06be7327fdd83b568218cf5f373b55f036b03..c463ba319e13c74c4efaf04d242c994c87ea0fab 100644
--- a/easybuild/easyconfigs/x/XZ/XZ-5.2.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/x/XZ/XZ-5.2.2-goolf-1.4.10.eb
@@ -13,10 +13,7 @@ source_urls = ['http://tukaani.org/xz/']
 
 builddependencies = [
     ('Autotools', '20150215', '', ('GCC', '4.7.2')),
-]
-
-dependencies = [
-    ('gettext', '0.18.2'),
+    ('gettext', '0.18.2', '', True),
 ]
 
 # may become useful in non-x86 archs
diff --git a/easybuild/easyconfigs/x/XZ/XZ-5.2.2-ictce-5.3.0.eb b/easybuild/easyconfigs/x/XZ/XZ-5.2.2-ictce-5.3.0.eb
index 96fe0ea8c8c03e8130eb5b4fcc2ae898df67f484..3e8e48f7606c1a4ab731c10dc9485a28bd7d1e8b 100644
--- a/easybuild/easyconfigs/x/XZ/XZ-5.2.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/x/XZ/XZ-5.2.2-ictce-5.3.0.eb
@@ -13,10 +13,7 @@ source_urls = ['http://tukaani.org/xz/']
 
 builddependencies = [
     ('Autotools', '20150215'),
-]
-
-dependencies = [
-    ('gettext', '0.18.2'),
+    ('gettext', '0.18.2', '', True),
 ]
 
 # may become useful in non-x86 archs
diff --git a/easybuild/easyconfigs/x/XZ/XZ-5.2.2-intel-2016a-gettext-0.19.7.eb b/easybuild/easyconfigs/x/XZ/XZ-5.2.2-intel-2016a-gettext-0.19.7.eb
index 7953b85916795e46aa34d2a65a277b4d394b939b..b10cbfb5b1504ad1f766a29bc3d599032f8d98cf 100644
--- a/easybuild/easyconfigs/x/XZ/XZ-5.2.2-intel-2016a-gettext-0.19.7.eb
+++ b/easybuild/easyconfigs/x/XZ/XZ-5.2.2-intel-2016a-gettext-0.19.7.eb
@@ -11,15 +11,12 @@ toolchain = {'name': 'intel', 'version': '2016a'}
 sources = [SOURCELOWER_TAR_BZ2]
 source_urls = ['http://tukaani.org/xz/']
 
-builddependencies = [
-    ('Autotools', '20150215'),
-]
-
 gettext_ver = '0.19.7'
 versionsuffix = '-gettext-%s' % gettext_ver
 
-dependencies = [
-    ('gettext', gettext_ver),
+builddependencies = [
+    ('Autotools', '20150215'),
+    ('gettext', gettext_ver, '', True),
 ]
 
 # may become useful in non-x86 archs
diff --git a/easybuild/easyconfigs/x/XZ/XZ-5.2.2-intel-2016a.eb b/easybuild/easyconfigs/x/XZ/XZ-5.2.2-intel-2016a.eb
index b717af018aaf06fa298f64daca32824917cf202c..e582d9cc6b8b36de8b63ae171fe513df8abdae3a 100644
--- a/easybuild/easyconfigs/x/XZ/XZ-5.2.2-intel-2016a.eb
+++ b/easybuild/easyconfigs/x/XZ/XZ-5.2.2-intel-2016a.eb
@@ -13,10 +13,7 @@ source_urls = ['http://tukaani.org/xz/']
 
 builddependencies = [
     ('Autotools', '20150215'),
-]
-
-dependencies = [
-    ('gettext', '0.19.6'),
+    ('gettext', '0.19.6', '', True),
 ]
 
 # may become useful in non-x86 archs
diff --git a/easybuild/easyconfigs/x/XZ/XZ-5.2.2-intel-2016b.eb b/easybuild/easyconfigs/x/XZ/XZ-5.2.2-intel-2016b.eb
index f05bff12d4debfc1b5b08501538c3555f8a78222..7d1af0e121bc515cd500a642e0926d8f963c08a1 100644
--- a/easybuild/easyconfigs/x/XZ/XZ-5.2.2-intel-2016b.eb
+++ b/easybuild/easyconfigs/x/XZ/XZ-5.2.2-intel-2016b.eb
@@ -13,10 +13,7 @@ source_urls = ['http://tukaani.org/xz/']
 
 builddependencies = [
     ('Autotools', '20150215'),
-]
-
-dependencies = [
-    ('gettext', '0.19.8'),
+    ('gettext', '0.19.8', '', True),
 ]
 
 # may become useful in non-x86 archs
diff --git a/easybuild/easyconfigs/x/x264/x264-20160614-intel-2016b.eb b/easybuild/easyconfigs/x/x264/x264-20160614-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d348640a5d2700c444694be71ca516dd0343b621
--- /dev/null
+++ b/easybuild/easyconfigs/x/x264/x264-20160614-intel-2016b.eb
@@ -0,0 +1,27 @@
+easyblock = 'ConfigureMake'
+
+name = 'x264'
+version = '20160614'
+
+homepage = 'http://www.videolan.org/developers/x264.html'
+description = """x264 is a free software library and application for encoding video streams into the H.264/MPEG-4
+ AVC compression format, and is released under the terms of the GNU GPL."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = [
+    'https://download.videolan.org/pub/videolan/x264/snapshots/',
+    'ftp://ftp.videolan.org/pub/videolan/x264/snapshots/',
+]
+sources = ['x264-snapshot-%(version)s-2245-stable.tar.bz2']
+
+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.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/x/xprop/xprop-1.2.2-foss-2016b.eb b/easybuild/easyconfigs/x/xprop/xprop-1.2.2-foss-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..abb82d5158e70dcfcccb4a0b3cc7c64d5a1b6967
--- /dev/null
+++ b/easybuild/easyconfigs/x/xprop/xprop-1.2.2-foss-2016b.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'xprop'
+version = '1.2.2'
+
+homepage = "http://www.x.org/wiki/"
+description = """The xprop utility is for displaying window and font properties in an X server.
+ One window or font is selected using the command line arguments or possibly
+ in the case of a window, by clicking on the desired window. A list of
+ properties is then given, possibly with formatting information."""
+
+toolchain = {'name': 'foss', 'version': '2016b'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://ftp.x.org/archive/individual/app/']
+
+builddependencies = [
+    ('pkg-config', '0.29.1'),
+]
+
+dependencies = [
+    ('X11', '20160819'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/xprop'],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/x/xprop/xprop-1.2.2-intel-2016b.eb b/easybuild/easyconfigs/x/xprop/xprop-1.2.2-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f011afc6c3c3bf289f13793b4c16cbce64bc8eab
--- /dev/null
+++ b/easybuild/easyconfigs/x/xprop/xprop-1.2.2-intel-2016b.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'xprop'
+version = '1.2.2'
+
+homepage = "http://www.x.org/wiki/"
+description = """The xprop utility is for displaying window and font properties in an X server.
+ One window or font is selected using the command line arguments or possibly
+ in the case of a window, by clicking on the desired window. A list of
+ properties is then given, possibly with formatting information."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://ftp.x.org/archive/individual/app/']
+
+builddependencies = [
+    ('pkg-config', '0.29.1'),
+]
+
+dependencies = [
+    ('X11', '20160819'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/xprop'],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-goolf-1.4.10-Perl-5.16.3.eb b/easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-goolf-1.4.10-Perl-5.16.3.eb
index 04fcdaad37b693c3506404ababea2fc09e0faaac..8cae54960cb52416522e68c105fbc1d514594fe8 100644
--- a/easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-goolf-1.4.10-Perl-5.16.3.eb
+++ b/easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-goolf-1.4.10-Perl-5.16.3.eb
@@ -11,6 +11,7 @@ easyblock = 'PerlModule'
 
 name = 'YAML-Syck'
 version = '1.27'
+versionsuffix = '-Perl-%(perlver)s'
 
 homepage = 'http://search.cpan.org/perldoc?YAML%3A%3ASyck'
 description = """Fast, lightweight YAML loader and dumper.
@@ -21,21 +22,15 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 source_urls = ['http://www.cpan.org/modules/by-module/YAML']
 sources = [SOURCE_TAR_GZ]
 
-perl = 'Perl'
-perlver = '5.16.3'
-perlverextra = ''
-versionsuffix = '-%s-%s%s' % (perl, perlver, perlverextra)
-
 dependencies = [
-    (perl, perlver, perlverextra),
+    ('Perl', '5.16.3'),
 ]
 
 options = {'modulename': 'YAML::Syck'}
 
-perlmajver = perlver.split('.')[0]
 sanity_check_paths = {
     'files': [],
-    'dirs': ['lib/perl%s/site_perl/%s/x86_64-linux-thread-multi/YAML' % (perlmajver, perlver)],
+    'dirs': ['lib/perl5/site_perl/%(perlver)s/x86_64-linux-thread-multi/YAML'],
 }
 
 moduleclass = 'data'
diff --git a/easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-ictce-5.3.0-Perl-5.16.3.eb b/easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-ictce-5.3.0-Perl-5.16.3.eb
index 4816f11ffde9ba24fff14f92533d7e3eed70c406..19442cc19e0b9528b10c19741b06037afb596f12 100644
--- a/easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-ictce-5.3.0-Perl-5.16.3.eb
+++ b/easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-ictce-5.3.0-Perl-5.16.3.eb
@@ -11,6 +11,7 @@ easyblock = 'PerlModule'
 
 name = 'YAML-Syck'
 version = '1.27'
+versionsuffix = '-Perl-%(perlver)s'
 
 homepage = 'http://search.cpan.org/perldoc?YAML%3A%3ASyck'
 description = """Fast, lightweight YAML loader and dumper.
@@ -21,21 +22,15 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'}
 source_urls = ['http://www.cpan.org/modules/by-module/YAML']
 sources = [SOURCE_TAR_GZ]
 
-perl = 'Perl'
-perlver = '5.16.3'
-perlverextra = ''
-versionsuffix = '-%s-%s%s' % (perl, perlver, perlverextra)
-
 dependencies = [
-    (perl, perlver, perlverextra),
+    ('Perl', '5.16.3'),
 ]
 
 options = {'modulename': 'YAML::Syck'}
 
-perlmajver = perlver.split('.')[0]
 sanity_check_paths = {
     'files': [],
-    'dirs': ['lib/perl%s/site_perl/%s/x86_64-linux-thread-multi/YAML' % (perlmajver, perlver)],
+    'dirs': ['lib/perl5/site_perl/%(perlver)s/x86_64-linux-thread-multi/YAML'],
 }
 
 moduleclass = 'data'
diff --git a/easybuild/easyconfigs/y/YAXT/YAXT-0.4.4-foss-2015a.eb b/easybuild/easyconfigs/y/YAXT/YAXT-0.4.4-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c754d53b2757d696340830bdc1a518a34cf36be3
--- /dev/null
+++ b/easybuild/easyconfigs/y/YAXT/YAXT-0.4.4-foss-2015a.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'YAXT'
+version = '0.4.4'
+
+homepage = 'https://www.dkrz.de/redmine/projects/yaxt'
+description = "Yet Another eXchange Tool"
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+toolchainopts = {'usempi': True}
+
+source_urls = ['https://www.dkrz.de/redmine/attachments/download/464/']
+sources = [SOURCELOWER_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ["include/yaxt.h", "include/yaxt.mod", "lib/libyaxt.a", "lib/libyaxt.%s" % SHLIB_EXT],
+    'dirs': ["include/xt"],
+}
+
+configopts = 'FC="$F90" FCFLAGS="$F90FLAGS -cpp"'
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/y/Yade/Yade-2016.06a-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/y/Yade/Yade-2016.06a-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c741427654e368addf892cfcdb31fae2bd2b0cf0
--- /dev/null
+++ b/easybuild/easyconfigs/y/Yade/Yade-2016.06a-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,62 @@
+easyblock = 'CMakeMake'
+
+name = 'Yade'
+version = '2016.06a'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://yade-dem.org/doc/'
+description = """ Yade is an extensible open-source framework for discrete numerical models, 
+ focused on Discrete Element Method. The computation parts are written in c++ using flexible object model, 
+ allowing independent implementation of new alogrithms and interfaces. 
+ Python is used for rapid and concise scene construction, simulation control, postprocessing and debugging. """
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = ['https://launchpad.net/yade/trunk/yade-1.00.0/+download/']
+sources = [SOURCELOWER_TAR_GZ]
+patches = ['Yade-%(version)s_include-signal.patch']
+
+dependencies = [
+    ('Boost', '1.61.0', versionsuffix),
+    ('CGAL', '4.8.1', versionsuffix),
+    ('GDB', '7.11.1', versionsuffix),
+    ('GL2PS', '1.3.9'),
+    ('GTS', '0.7.6'),
+    ('IPython', '5.1.0', versionsuffix),
+    ('libQGLViewer', '2.6.3'),
+    ('Loki', '0.1.7'),
+    ('matplotlib', '1.5.2', versionsuffix),
+    ('minieigen', '0.5.3', versionsuffix),
+    ('PyGTS', '0.3.1', versionsuffix),
+    ('Python', '2.7.12'),
+    ('Qt5', '5.7.0'),
+    ('SQLite', '3.13.0'),
+    ('VTK', '6.3.0', versionsuffix),
+    ('zlib', '1.2.8'),
+]
+
+builddependencies = [
+    ('CMake', '3.6.1'),
+    ('Eigen', '3.2.9'),
+]
+
+separate_build_dir = True
+
+configopts = '-DENABLE_GUI=OFF -DENABLE_LINSOLV=OFF -DENABLE_PFVFLOW=OFF '
+configopts += '-DCGAL_INCLUDE_DIR=$EBROOTCGAL/include '
+configopts += '-DGMP_INCLUDE_DIR=$EBROOTGMP/include -DGMP_LIBRARIES=$EBROOTGMP/lib -DGMPXX_LIBRARIES=$EBROOTGMP/lib '
+
+modextrapaths = {
+    'LD_LIBRARY_PATH': ['lib64/lib64/yade-%(version)s', 'lib/x86_64-linux-gnu/yade-%(version)s'],
+    'LIBRARY_PATH': ['lib64/lib64/yade-%(version)s', 'lib/x86_64-linux-gnu/yade-%(version)s'],
+    'PYTHONPATH': ['lib/x86_64-linux-gnu/yade-%(version)s/py', 'lib64/yade-%(version)s/py'],
+}
+
+sanity_check_paths = {
+    'files': ['bin/yade-%(version)s', 'bin/yade-%(version)s-batch',
+              ('lib/x86_64-linux-gnu/yade-%%(version)s/libyade.%s' % SHLIB_EXT,
+               'lib64/yade-%%(version)s/libyade.%s' %SHLIB_EXT)],
+    'dirs': [('lib/x86_64-linux-gnu/yade-%(version)s/py/yade', 'lib64/yade-%(version)s/py/yade')],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/y/Yade/Yade-2016.06a_include-signal.patch b/easybuild/easyconfigs/y/Yade/Yade-2016.06a_include-signal.patch
new file mode 100644
index 0000000000000000000000000000000000000000..28ff927ab481675a054d9f038bbe746d4ae0ef1f
--- /dev/null
+++ b/easybuild/easyconfigs/y/Yade/Yade-2016.06a_include-signal.patch
@@ -0,0 +1,10 @@
+--- trunk-2016.06a/py/wrapper/yadeWrapper.cpp.orig	2016-09-06 20:32:45.079249073 +0200
++++ trunk-2016.06a/py/wrapper/yadeWrapper.cpp	2016-09-06 20:32:59.049059903 +0200
+@@ -39,6 +39,7 @@
+ 
+ #include <core/Timing.hpp>
+ #include <lib/serialization/ObjectIO.hpp>
++#include <signal.h>
+ 
+ namespace py = boost::python;
+ 
diff --git a/easybuild/easyconfigs/y/Yambo/Yambo-4.0.2-rev.90-intel-2015b-QuantumESPRESSO-5.2.1.eb b/easybuild/easyconfigs/y/Yambo/Yambo-4.0.2-rev.90-intel-2015b-QuantumESPRESSO-5.2.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..300ae8a70c747d1ab57d899ac2a09dea08a52407
--- /dev/null
+++ b/easybuild/easyconfigs/y/Yambo/Yambo-4.0.2-rev.90-intel-2015b-QuantumESPRESSO-5.2.1.eb
@@ -0,0 +1,53 @@
+easyblock = 'MakeCp'
+
+name = 'Yambo'
+version = '4.0.2-rev.90'
+qe = 'QuantumESPRESSO'
+qever = '5.2.1'
+versionsuffix = '-%s-%s' % (qe, qever)
+
+homepage = 'http://www.yambo-code.org'
+description = """Yambo is a FORTRAN/C code for Many-Body calculations in solid state and molecular physics.
+ Yambo relies on the Kohn-Sham wavefunctions generated by two DFT public codes: abinit, and PWscf."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'usempi': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://qe-forge.org/gf/download/frsrelease/201/870/']
+checksums = ['03d5ffc655eb4c03db4e264606117c86']
+
+dependencies = [
+    ('netCDF-Fortran', '4.4.2'),
+    (qe, qever),
+]
+
+with_configure = 'True'
+
+configopts = 'CPPFLAGS="" FCFLAGS="-nofor_main" '
+configopts += '--with-blas-libs="$LIBBLAS" '
+configopts += '--with-lapack-libs="$LIBLAPACK" '
+configopts += '--with-fft-libs="$LIBFFT" '
+configopts += '--with-iotk-path="$EBROOTQUANTUMESPRESSO/espresso-%s/S3DE/iotk" ' % qever
+configopts += '--enable-netcdf-hdf5 '
+configopts += '--with-netcdf-includedir="$EBROOTNETCDFMINFORTRAN/include" '
+configopts += '--with-netcdf-libdir="$EBROOTNETCDFMINFORTRAN/lib" '
+
+buildopts = 'yambo interfaces ypp'
+
+parallel = 1
+
+files_to_copy = [(['bin/*'], 'bin')]
+
+sanity_check_paths = {
+    'files': ['bin/'+prog for prog in ['a2y', 'p2y', 'yambo', 'ypp' ]],
+    'dirs': []
+}
+
+# Yambo is installed with QuantumESPRESSO. I do not like if the same program (with different versions)
+# is twice in the PATH. Withouth removing the QuantumESPRESSO one, this version of Yambo would be used,
+# because it is earlier in the PATH
+modtclfooter = "remove-path	PATH	$::env(EBROOTQUANTUMESPRESSO)/espresso-%s/YAMBO/bin" % qever
+modluafooter = 'remove_path("PATH", os.getenv("EBROOTQUANTUMESPRESSO") .. "/espresso-%s/YAMBO/bin")' % qever 
+
+moduleclass = 'phys'
diff --git a/easybuild/easyconfigs/y/Yasm/Yasm-1.3.0-intel-2016b.eb b/easybuild/easyconfigs/y/Yasm/Yasm-1.3.0-intel-2016b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..bd4bc5d66f8301218b2425b424e00ec6ddbe4e6f
--- /dev/null
+++ b/easybuild/easyconfigs/y/Yasm/Yasm-1.3.0-intel-2016b.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::   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-90.html
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'Yasm'
+version = '1.3.0'
+
+homepage = 'http://www.tortall.net/projects/yasm/'
+description = """Yasm: Complete rewrite of the NASM assembler with BSD license"""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.tortall.net/projects/yasm/releases/']
+
+sanity_check_paths = {
+    'files': ['bin/yasm'],
+    'dirs': [],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-4.7.3.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-4.7.3.eb
index 1c29958289a7b9c07c17e230605aeec2acec2e60..1192872c10316dd3162a345a2deafeccbff72486 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-4.7.3.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-4.7.3.eb
@@ -9,6 +9,7 @@ not covered by any patents -- lossless data-compression library for use on virtu
 computer hardware and operating system."""
 
 toolchain = {'name': 'GCC', 'version': '4.7.3'}
+toolchainopts = {'pic': True}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%(version)s', 'download')]
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-4.8.4.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-4.8.4.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d7207b104ac81c47f841044ce1fe18aeb5883f7b
--- /dev/null
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-4.8.4.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.8.4'}
+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-5.4.0-2.26.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-5.4.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2155a965c083701439ac6d2fb545b0964408135a
--- /dev/null
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCC-5.4.0-2.26.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': '5.4.0-2.26'}
+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-GCCcore-6.1.0.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCCcore-6.1.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..47a40a40359f1496c3ff7f56ad0b42f38f431d46
--- /dev/null
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCCcore-6.1.0.eb
@@ -0,0 +1,25 @@
+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': 'GCCcore', 'version': '6.1.0'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%(version)s', 'download')]
+
+# use same binutils version that was used when building GCC toolchain
+builddependencies = [('binutils', '2.27', '', True)]
+
+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-GCCcore-6.2.0.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCCcore-6.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ecd6eff1be1c48d22b79ba4b5aa6a8c1fa8cddea
--- /dev/null
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCCcore-6.2.0.eb
@@ -0,0 +1,25 @@
+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': 'GCCcore', 'version': '6.2.0'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%(version)s', 'download')]
+
+# use same binutils version that was used when building GCC toolchain
+builddependencies = [('binutils', '2.27', '', True)]
+
+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-foss-2016.04.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-foss-2016.04.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a484ded00032b5acc48fe71d67dec73ce98e6f6f
--- /dev/null
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-foss-2016.04.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': '2016.04'}
+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.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8.eb
index 82a1155e2efd8f23e8967a8d05e2b73f27a7d868..ec9d1a0bdf681af40176ee0ea36106c33e0c6af2 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8.eb
@@ -9,6 +9,7 @@ description = """zlib is designed to be a free, general-purpose, legally unencum
  computer hardware and operating system."""
 
 toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchainopts = {'pic': True}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%(version)s', 'download')]
diff --git a/setup.py b/setup.py
index c52c2d05501f429d0fdbd539c21e16c349563652..f4cbb44d3b07b36748db8a21d1ad77084c835936 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.9.0.dev0'
+VERSION = '3.0.0.dev0'
 
 API_VERSION = VERSION.split('.')[0]
 EB_VERSION = '.'.join(VERSION.split('.')[0:2])
diff --git a/test/easyconfigs/easyconfigs.py b/test/easyconfigs/easyconfigs.py
index 13ea1263cd83ad9b50f5e61f9fef253c7af056ca..5901ae8d4cf48e302731cc340500e8254322fbcd 100644
--- a/test/easyconfigs/easyconfigs.py
+++ b/test/easyconfigs/easyconfigs.py
@@ -44,9 +44,10 @@ import easybuild.main as main
 import easybuild.tools.options as eboptions
 from easybuild.easyblocks.generic.configuremake import ConfigureMake
 from easybuild.framework.easyblock import EasyBlock
+from easybuild.framework.easyconfig.default import DEFAULT_CONFIG
 from easybuild.framework.easyconfig.easyconfig import EasyConfig
-from easybuild.framework.easyconfig.easyconfig import get_easyblock_class
-from easybuild.framework.easyconfig.parser import fetch_parameters_from_easyconfig
+from easybuild.framework.easyconfig.easyconfig import get_easyblock_class, letter_dir_for, resolve_template
+from easybuild.framework.easyconfig.parser import EasyConfigParser, fetch_parameters_from_easyconfig
 from easybuild.framework.easyconfig.tools import dep_graph, get_paths_for, process_easyconfig
 from easybuild.tools import config
 from easybuild.tools.config import build_option
@@ -168,11 +169,11 @@ class EasyConfigTest(TestCase):
 
     def test_easyconfig_locations(self):
         """Make sure all easyconfigs files are in the right location."""
-        easyconfig_dirs_regex = re.compile(r'/easybuild/easyconfigs/[a-z]/[^/]+$')
+        easyconfig_dirs_regex = re.compile(r'/easybuild/easyconfigs/[0a-z]/[^/]+$')
         topdir = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
         for (dirpath, _, filenames) in os.walk(topdir):
-            # ignore git/svn dirs
-            if '/.git/' in dirpath or '/.svn/' in dirpath:
+            # ignore git/svn dirs & archived easyconfigs
+            if '/.git/' in dirpath or '/.svn/' in dirpath or '__archive__' in dirpath:
                 continue
             # check whether list of .eb files is non-empty
             easyconfig_files = [fn for fn in filenames if fn.endswith('eb')]
@@ -210,7 +211,7 @@ def template_easyconfig_test(self, spec):
     name, easyblock = fetch_parameters_from_easyconfig(ec.rawtxt, ['name', 'easyblock'])
 
     # make sure easyconfig file is in expected location
-    expected_subdir = os.path.join('easybuild', 'easyconfigs', name.lower()[0], name)
+    expected_subdir = os.path.join('easybuild', 'easyconfigs', letter_dir_for(name), name)
     subdir = os.path.join(*spec.split(os.path.sep)[-5:-1])
     fail_msg = "Easyconfig file %s not in expected subdirectory %s" % (spec, expected_subdir)
     self.assertEqual(expected_subdir, subdir, fail_msg)
@@ -258,7 +259,8 @@ def template_easyconfig_test(self, spec):
                     self.assertTrue(os.path.isfile(ext_patch_full), msg)
 
     # check whether all extra_options defined for used easyblock are defined
-    for key in app.extra_options():
+    extra_opts = app.extra_options()
+    for key in extra_opts:
         self.assertTrue(key in app.cfg)
 
     app.close_log()
@@ -269,7 +271,7 @@ def template_easyconfig_test(self, spec):
     os.close(handle)
 
     ec.dump(test_ecfile)
-    dumped_ec = EasyConfig(test_ecfile)
+    dumped_ec = EasyConfigParser(test_ecfile).get_config_dict()
     os.remove(test_ecfile)
 
     # inject dummy values for templates that are only known at a later stage
@@ -278,10 +280,24 @@ def template_easyconfig_test(self, spec):
         'installdir': '/dummy/installdir',
     }
     ec.template_values.update(dummy_template_values)
-    dumped_ec.template_values.update(dummy_template_values)
 
-    for key in sorted(ec._config):
-        self.assertEqual(ec[key], dumped_ec[key])
+    ec_dict = ec.parser.get_config_dict()
+    keys = []
+    for key in ec_dict:
+        # skip parameters for which value is equal to default value
+        orig_val = ec_dict[key]
+        if key in DEFAULT_CONFIG and orig_val == DEFAULT_CONFIG[key][0]:
+            continue
+        if key in extra_opts and orig_val == extra_opts[key][0]:
+            continue
+        if key not in DEFAULT_CONFIG and key not in extra_opts:
+            continue
+
+        keys.append(key)
+        orig_val = resolve_template(ec_dict[key], ec.template_values)
+        dumped_val = resolve_template(dumped_ec[key], ec.template_values)
+
+        self.assertEqual(orig_val, dumped_val)
 
     # cache the parsed easyconfig, to avoid that it is parsed again
     self.parsed_easyconfigs.append(ecs[0])
@@ -289,6 +305,7 @@ def template_easyconfig_test(self, spec):
     # test passed, so set back to True
     single_tests_ok = True and prev_single_tests_ok
 
+
 def suite():
     """Return all easyblock initialisation tests."""
     # dynamically generate a separate test for each of the available easyconfigs
@@ -296,6 +313,11 @@ def suite():
     easyconfigs_path = get_paths_for('easyconfigs')[0]
     cnt = 0
     for (subpath, _, specs) in os.walk(easyconfigs_path, topdown=True):
+
+        # ignore archived easyconfigs
+        if '__archive__' in subpath:
+            continue
+
         for spec in specs:
             if spec.endswith('.eb') and spec != 'TEMPLATE.eb':
                 cnt += 1