From 00a795ed85bb3c9543ce590de033be7cca6df0c9 Mon Sep 17 00:00:00 2001
From: Ward Poelmans <wpoely86@gmail.com>
Date: Fri, 5 Feb 2016 13:35:51 +0100
Subject: [PATCH 1/9] Added PCMSolver

---
 ...PCMSolver-20160205-eigen-include-dir.patch | 14 ++++++
 ...lver-20160205-intel-2016a-Python-2.7.11.eb | 45 +++++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 easybuild/easyconfigs/p/PCMSolver/PCMSolver-20160205-eigen-include-dir.patch
 create mode 100644 easybuild/easyconfigs/p/PCMSolver/PCMSolver-20160205-intel-2016a-Python-2.7.11.eb

diff --git a/easybuild/easyconfigs/p/PCMSolver/PCMSolver-20160205-eigen-include-dir.patch b/easybuild/easyconfigs/p/PCMSolver/PCMSolver-20160205-eigen-include-dir.patch
new file mode 100644
index 000000000000..dcef0d8b3ad5
--- /dev/null
+++ b/easybuild/easyconfigs/p/PCMSolver/PCMSolver-20160205-eigen-include-dir.patch
@@ -0,0 +1,14 @@
+# it doesn't look in the correct directory to find Eigen
+diff --git a/cmake/custom/eigen.cmake b/cmake/custom/eigen.cmake
+index 8d2f26f..80815e0 100644
+--- a/cmake/custom/eigen.cmake
++++ b/cmake/custom/eigen.cmake
+@@ -11,7 +11,7 @@
+ #   define: '-DEIGEN3_ROOT="{0}"'.format(arguments['--eigen'])
+ 
+ if(EIGEN3_ROOT)
+-  set(EIGEN3_INCLUDE_DIR ${EIGEN3_ROOT}/include/eigen3)
++  set(EIGEN3_INCLUDE_DIR ${EIGEN3_ROOT}/include)
+   find_package(Eigen3 3.1.0)
+   message(STATUS "Eigen " ${EIGEN3_VERSION} " is located here: " ${EIGEN3_INCLUDE_DIR})
+   if(NOT EIGEN3_FOUND)
diff --git a/easybuild/easyconfigs/p/PCMSolver/PCMSolver-20160205-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/p/PCMSolver/PCMSolver-20160205-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 000000000000..0e7d1d14667f
--- /dev/null
+++ b/easybuild/easyconfigs/p/PCMSolver/PCMSolver-20160205-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,45 @@
+easyblock = 'CMakeMake'
+
+name = 'PCMSolver'
+version = '20160205'
+
+homepage = 'https://pcmsolver.readthedocs.org'
+description = """An API for the Polarizable Continuum Model."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'cstd': 'c99'}
+
+sources = ['1d53a584b9a70b.tar.gz']
+source_urls = ['https://github.com/PCMSolver/pcmsolver/archive/']
+
+patches = ['PCMSolver-%(version)s-eigen-include-dir.patch']
+
+python = 'Python'
+pyver = '2.7.11'
+versionsuffix = '-%s-%s' % (python, pyver)
+
+dependencies = [
+    (python, pyver),
+    ('zlib', '1.2.8'),
+    ('Boost', '1.59.0', versionsuffix),
+]
+
+builddependencies = [
+    ('CMake', '3.4.1'),
+    ('Eigen', '3.2.7'),
+]
+
+configopts = '-DCMAKE_BUILD_TYPE=Release -DEIGEN3_ROOT=$EBROOTEIGEN -DCMAKE_CXX_FLAGS="$LIBLAPACK_MT -DEIGEN_USE_MKL_ALL"'
+
+separate_build_dir = True
+
+runtest = 'test'
+
+postinstallcmds = ["chmod +x %(installdir)s/bin/pcmsolver.py"]
+
+sanity_check_paths = {
+    'files': ['bin/pcmsolver.py', 'lib/libpcm.a', 'lib/libpcm.%s' % SHLIB_EXT],
+    'dirs': ['include']
+}
+
+moduleclass = 'chem'

From 422db6b8ed6eae35818847193a64867837a810e5 Mon Sep 17 00:00:00 2001
From: Ward Poelmans <wpoely86@gmail.com>
Date: Fri, 5 Feb 2016 13:39:54 +0100
Subject: [PATCH 2/9] Added git version of PSI4

---
 .../PSI-4.0b6-20160201-fix-gitversion.patch   | 12 +++++
 ...6-20160201-intel-2016a-mt-Python-2.7.11.eb | 45 +++++++++++++++++++
 .../p/PSI/PSI-4.0b6-20160201-plugin-fix.patch | 14 ++++++
 3 files changed, 71 insertions(+)
 create mode 100644 easybuild/easyconfigs/p/PSI/PSI-4.0b6-20160201-fix-gitversion.patch
 create mode 100644 easybuild/easyconfigs/p/PSI/PSI-4.0b6-20160201-intel-2016a-mt-Python-2.7.11.eb
 create mode 100644 easybuild/easyconfigs/p/PSI/PSI-4.0b6-20160201-plugin-fix.patch

diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b6-20160201-fix-gitversion.patch b/easybuild/easyconfigs/p/PSI/PSI-4.0b6-20160201-fix-gitversion.patch
new file mode 100644
index 000000000000..93d3b7eab487
--- /dev/null
+++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b6-20160201-fix-gitversion.patch
@@ -0,0 +1,12 @@
+# As we have a git version without the git metadata, we tell it which commit we have used
+# by wpoely86@gmail.com
+diff -ur psi4public-e4070d0024742579a445e084da9dde078310094d.orig/src/bin/psi4/gitversion.py psi4public-e4070d0024742579a445e084da9dde078310094d/src/bin/psi4/gitversion.py
+--- psi4public-e4070d0024742579a445e084da9dde078310094d.orig/src/bin/psi4/gitversion.py	2016-02-01 22:43:36.000000000 +0100
++++ psi4public-e4070d0024742579a445e084da9dde078310094d/src/bin/psi4/gitversion.py	2016-02-04 11:41:37.287312135 +0100
+@@ -104,4 +104,5 @@
+     ghash = ''
+     mmp = ''
+ 
+-write_version(branch, mmp, ghash, status)
++#write_version(branch, mmp, ghash, status)
++write_version('master', None, 'e4070d002474257', '')
diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b6-20160201-intel-2016a-mt-Python-2.7.11.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b6-20160201-intel-2016a-mt-Python-2.7.11.eb
new file mode 100644
index 000000000000..d4fb4f7c9354
--- /dev/null
+++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b6-20160201-intel-2016a-mt-Python-2.7.11.eb
@@ -0,0 +1,45 @@
+name = 'PSI'
+version = '4.0b6-20160201'
+versionsuffix = '-mt'
+
+homepage = 'http://www.psicode.org/'
+description = """PSI4 is an open-source suite of ab initio quantum chemistry programs designed for
+ efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform
+ computations with more than 2500 basis functions running serially or in parallel."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'usempi': False}
+
+source_urls = ['https://github.com/psi4/psi4public/archive/']
+sources = ['e4070d0024742579.tar.gz']
+
+patches = [
+    'PSI-%(version)s-fix-gitversion.patch',
+    'PSI-%(version)s-plugin-fix.patch',
+]
+
+python = 'Python'
+pyver = '2.7.11'
+pysuff = '-%s-%s' % (python, pyver)
+versionsuffix += pysuff
+
+dependencies = [
+    (python, pyver),
+    ('Boost', '1.59.0', pysuff),
+    ('PCMSolver', '20160205', pysuff),
+    ('CheMPS2', '1.6'),
+]
+
+builddependencies = [
+    ('CMake', '3.4.1'),
+    ('Perl', '5.22.1', '-bare'),  # for the test suite
+]
+
+configopts = '-DENABLE_MPI=OFF -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'
+
+# Execute only the 'quick' tests and run 4 in parallel
+runtest = 'ARGS="-V -L quicktests -j 4" test'
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b6-20160201-plugin-fix.patch b/easybuild/easyconfigs/p/PSI/PSI-4.0b6-20160201-plugin-fix.patch
new file mode 100644
index 000000000000..1cd68c1a98f7
--- /dev/null
+++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b6-20160201-plugin-fix.patch
@@ -0,0 +1,14 @@
+# Let the plugin makefile system work with our install system: patch the
+# directory path to correspond with our install directory
+# 01/02/2016 - wpoely86@gmail.com
+diff -ur psi4public-e4070d0024742579a445e084da9dde078310094d.orig/CMakeLists.txt psi4public-e4070d0024742579a445e084da9dde078310094d/CMakeLists.txt
+--- psi4public-e4070d0024742579a445e084da9dde078310094d.orig/CMakeLists.txt	2016-02-01 22:43:36.000000000 +0100
++++ psi4public-e4070d0024742579a445e084da9dde078310094d/CMakeLists.txt	2016-02-05 12:40:20.375508374 +0100
+@@ -282,6 +282,7 @@
+ foreach(dir ${dirs})
+     set(PLUGIN_INCLUDE_DIRECTORIES "-I${dir} ${PLUGIN_INCLUDE_DIRECTORIES}")
+ endforeach()
++set(PLUGIN_INCLUDE_DIRECTORIES "-I$ENV{PSI_SRC_INSTALL_DIR}/include -I$ENV{PSI_SRC_INSTALL_DIR}/src/lib/ -I$ENV{PSI_OBJ_INSTALL_DIR}/include -I$ENV{PSI_OBJ_INSTALL_DIR}/src/lib/ ${PLUGIN_INCLUDE_DIRECTORIES}")
+ foreach(def ${defs})
+     set(PLUGIN_DEFINES "-D${def} ${PLUGIN_DEFINES}")
+ endforeach()

From 83cbdcc53f75dba692f751f327f1dc24ab20e7e1 Mon Sep 17 00:00:00 2001
From: Ward Poelmans <wpoely86@gmail.com>
Date: Fri, 5 Feb 2016 13:59:30 +0100
Subject: [PATCH 3/9] PCMSolver: patch is mainlined

---
 .../PCMSolver-20160205-eigen-include-dir.patch     | 14 --------------
 ...PCMSolver-20160205-intel-2016a-Python-2.7.11.eb |  4 +---
 2 files changed, 1 insertion(+), 17 deletions(-)
 delete mode 100644 easybuild/easyconfigs/p/PCMSolver/PCMSolver-20160205-eigen-include-dir.patch

diff --git a/easybuild/easyconfigs/p/PCMSolver/PCMSolver-20160205-eigen-include-dir.patch b/easybuild/easyconfigs/p/PCMSolver/PCMSolver-20160205-eigen-include-dir.patch
deleted file mode 100644
index dcef0d8b3ad5..000000000000
--- a/easybuild/easyconfigs/p/PCMSolver/PCMSolver-20160205-eigen-include-dir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# it doesn't look in the correct directory to find Eigen
-diff --git a/cmake/custom/eigen.cmake b/cmake/custom/eigen.cmake
-index 8d2f26f..80815e0 100644
---- a/cmake/custom/eigen.cmake
-+++ b/cmake/custom/eigen.cmake
-@@ -11,7 +11,7 @@
- #   define: '-DEIGEN3_ROOT="{0}"'.format(arguments['--eigen'])
- 
- if(EIGEN3_ROOT)
--  set(EIGEN3_INCLUDE_DIR ${EIGEN3_ROOT}/include/eigen3)
-+  set(EIGEN3_INCLUDE_DIR ${EIGEN3_ROOT}/include)
-   find_package(Eigen3 3.1.0)
-   message(STATUS "Eigen " ${EIGEN3_VERSION} " is located here: " ${EIGEN3_INCLUDE_DIR})
-   if(NOT EIGEN3_FOUND)
diff --git a/easybuild/easyconfigs/p/PCMSolver/PCMSolver-20160205-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/p/PCMSolver/PCMSolver-20160205-intel-2016a-Python-2.7.11.eb
index 0e7d1d14667f..a35d9ea83608 100644
--- a/easybuild/easyconfigs/p/PCMSolver/PCMSolver-20160205-intel-2016a-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/p/PCMSolver/PCMSolver-20160205-intel-2016a-Python-2.7.11.eb
@@ -9,11 +9,9 @@ description = """An API for the Polarizable Continuum Model."""
 toolchain = {'name': 'intel', 'version': '2016a'}
 toolchainopts = {'cstd': 'c99'}
 
-sources = ['1d53a584b9a70b.tar.gz']
+sources = ['2473699d6c5db36525160e.tar.gz']
 source_urls = ['https://github.com/PCMSolver/pcmsolver/archive/']
 
-patches = ['PCMSolver-%(version)s-eigen-include-dir.patch']
-
 python = 'Python'
 pyver = '2.7.11'
 versionsuffix = '-%s-%s' % (python, pyver)

From 71121908283c712dc7e386a0694ddfa67f70ed48 Mon Sep 17 00:00:00 2001
From: Ward Poelmans <wpoely86@gmail.com>
Date: Fri, 5 Feb 2016 14:00:10 +0100
Subject: [PATCH 4/9] Added Eigen 3.2.7 for intel/2016a

---
 .../easyconfigs/e/Eigen/Eigen-3.2.7-intel-2016a.eb | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 easybuild/easyconfigs/e/Eigen/Eigen-3.2.7-intel-2016a.eb

diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.2.7-intel-2016a.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.2.7-intel-2016a.eb
new file mode 100644
index 000000000000..5e2d4fc5a2ba
--- /dev/null
+++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.2.7-intel-2016a.eb
@@ -0,0 +1,14 @@
+name = 'Eigen'
+version = '3.2.7'
+
+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': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get']
+sources = ['%(version)s.tar.bz2']
+
+moduleclass = 'math'

From c16f4d894fb9b8e68f67a31d27bd4d93b6de4852 Mon Sep 17 00:00:00 2001
From: Ward Poelmans <wpoely86@gmail.com>
Date: Fri, 5 Feb 2016 14:00:32 +0100
Subject: [PATCH 5/9] Perl bare for intel/2016a

---
 .../p/Perl/Perl-5.22.1-intel-2016a-bare.eb      | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 easybuild/easyconfigs/p/Perl/Perl-5.22.1-intel-2016a-bare.eb

diff --git a/easybuild/easyconfigs/p/Perl/Perl-5.22.1-intel-2016a-bare.eb b/easybuild/easyconfigs/p/Perl/Perl-5.22.1-intel-2016a-bare.eb
new file mode 100644
index 000000000000..e7350c64a5f8
--- /dev/null
+++ b/easybuild/easyconfigs/p/Perl/Perl-5.22.1-intel-2016a-bare.eb
@@ -0,0 +1,17 @@
+name = 'Perl'
+version = '5.22.1'
+versionsuffix = '-bare'
+
+homepage = 'http://www.perl.org/'
+description = """Larry Wall's Practical Extraction and Report Language"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['http://www.cpan.org/src/5.0']
+sources = [SOURCELOWER_TAR_GZ]
+
+# bare, no extensions
+exts_list = []
+
+moduleclass = 'lang'

From d5a7ac81aaf53300de98be2bef29acd7099d8312 Mon Sep 17 00:00:00 2001
From: Ward Poelmans <wpoely86@gmail.com>
Date: Fri, 5 Feb 2016 14:00:52 +0100
Subject: [PATCH 6/9] Add CheMPS2

---
 .../c/CheMPS2/CheMPS2-1.6-intel-2016a.eb      | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 easybuild/easyconfigs/c/CheMPS2/CheMPS2-1.6-intel-2016a.eb

diff --git a/easybuild/easyconfigs/c/CheMPS2/CheMPS2-1.6-intel-2016a.eb b/easybuild/easyconfigs/c/CheMPS2/CheMPS2-1.6-intel-2016a.eb
new file mode 100644
index 000000000000..aab739ed1901
--- /dev/null
+++ b/easybuild/easyconfigs/c/CheMPS2/CheMPS2-1.6-intel-2016a.eb
@@ -0,0 +1,33 @@
+easyblock = 'CMakeMake'
+
+name = 'CheMPS2'
+version = '1.6'
+
+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': '2016a'}
+
+sources = ['v%(version)s.tar.gz']
+source_urls = ['https://github.com/SebWouters/CheMPS2/archive/']
+
+builddependencies = [('CMake', '3.4.1')]
+
+dependencies = [
+    ('GSL', '2.1'),
+    ('HDF5', '1.8.16')
+]
+
+buildopts = 'VERBOSE=1'
+
+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'

From a8923c12fb51d6397bb2cd2454981c122f736d39 Mon Sep 17 00:00:00 2001
From: Ward Poelmans <wpoely86@gmail.com>
Date: Fri, 5 Feb 2016 14:03:30 +0100
Subject: [PATCH 7/9] Added HDF5 for intel/2016a

---
 .../h/HDF5/HDF5-1.8.16-intel-2016a.eb         | 26 +++++++++++++++++++
 .../s/Szip/Szip-2.1-intel-2016a.eb            | 23 ++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 easybuild/easyconfigs/h/HDF5/HDF5-1.8.16-intel-2016a.eb
 create mode 100644 easybuild/easyconfigs/s/Szip/Szip-2.1-intel-2016a.eb

diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.16-intel-2016a.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.16-intel-2016a.eb
new file mode 100644
index 000000000000..dc65dce562ed
--- /dev/null
+++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.16-intel-2016a.eb
@@ -0,0 +1,26 @@
+name = 'HDF5'
+version = '1.8.16'
+
+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': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True, 'usempi': True}
+
+source_urls = ['http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version)s/src']
+sources = [SOURCELOWER_TAR_GZ]
+
+patches = [
+    'HDF5-1.8.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/s/Szip/Szip-2.1-intel-2016a.eb b/easybuild/easyconfigs/s/Szip/Szip-2.1-intel-2016a.eb
new file mode 100644
index 000000000000..67b0f103595f
--- /dev/null
+++ b/easybuild/easyconfigs/s/Szip/Szip-2.1-intel-2016a.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': 'intel', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['http://www.hdfgroup.org/ftp/lib-external/szip/%(version)s/src']
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = "--with-pic"
+
+sanity_check_paths = {
+    'files': ["lib/libsz.a", "lib/libsz.%s" % SHLIB_EXT] +
+             ["include/%s" % x for x in ["ricehdf.h", "szip_adpt.h", "szlib.h"]],
+    'dirs': [],
+}
+
+moduleclass = 'tools'

From 17526505f04477c6fc440195a74d6413ad5b6dfa Mon Sep 17 00:00:00 2001
From: Ward Poelmans <wpoely86@gmail.com>
Date: Fri, 5 Feb 2016 16:24:12 +0100
Subject: [PATCH 8/9] Fix remarks and add more tests

---
 .../PSI/PSI-4.0b6-20160201-intel-2016a-mt-Python-2.7.11.eb  | 6 ++++--
 .../easyconfigs/p/Perl/Perl-5.22.1-intel-2016a-bare.eb      | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b6-20160201-intel-2016a-mt-Python-2.7.11.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b6-20160201-intel-2016a-mt-Python-2.7.11.eb
index d4fb4f7c9354..a713c7f44f1a 100644
--- a/easybuild/easyconfigs/p/PSI/PSI-4.0b6-20160201-intel-2016a-mt-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b6-20160201-intel-2016a-mt-Python-2.7.11.eb
@@ -39,7 +39,9 @@ configopts = '-DENABLE_MPI=OFF -DENABLE_OMP=ON -DENABLE_UNIT_TESTS=ON -DENABLE_C
 configopts += ' -DENABLE_DUMMY_PLUGIN=ON -DCHEMPS2_ROOT=$EBROOTCHEMPS2'
 configopts += ' -DENABLE_PCMSOLVER=ON -DPCMSOLVER_ROOT=$EBROOTPCMSOLVER'
 
-# Execute only the 'quick' tests and run 4 in parallel
-runtest = 'ARGS="-V -L quicktests -j 4" test'
+# Execute 4 tests in parallel
+runtest = 'ARGS="-V -E \'opt10|pubchem1|pubchem2|pywrap-opt-sowreap|sapt4\' -j 4" test'
+
+
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/p/Perl/Perl-5.22.1-intel-2016a-bare.eb b/easybuild/easyconfigs/p/Perl/Perl-5.22.1-intel-2016a-bare.eb
index e7350c64a5f8..43999e6a1a96 100644
--- a/easybuild/easyconfigs/p/Perl/Perl-5.22.1-intel-2016a-bare.eb
+++ b/easybuild/easyconfigs/p/Perl/Perl-5.22.1-intel-2016a-bare.eb
@@ -8,7 +8,7 @@ description = """Larry Wall's Practical Extraction and Report Language"""
 toolchain = {'name': 'intel', 'version': '2016a'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-source_urls = ['http://www.cpan.org/src/5.0']
+source_urls = ['http://www.cpan.org/src/%(version_major)s']
 sources = [SOURCELOWER_TAR_GZ]
 
 # bare, no extensions

From a0d2192e5651b6dee4811d2491310548d32b6428 Mon Sep 17 00:00:00 2001
From: Ward Poelmans <wpoely86@gmail.com>
Date: Sat, 6 Feb 2016 16:01:22 +0100
Subject: [PATCH 9/9] Use newer version of CMake

---
 .../p/PCMSolver/PCMSolver-20160205-intel-2016a-Python-2.7.11.eb | 2 +-
 .../p/PSI/PSI-4.0b6-20160201-intel-2016a-mt-Python-2.7.11.eb    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/easybuild/easyconfigs/p/PCMSolver/PCMSolver-20160205-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/p/PCMSolver/PCMSolver-20160205-intel-2016a-Python-2.7.11.eb
index a35d9ea83608..861cd9d96357 100644
--- a/easybuild/easyconfigs/p/PCMSolver/PCMSolver-20160205-intel-2016a-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/p/PCMSolver/PCMSolver-20160205-intel-2016a-Python-2.7.11.eb
@@ -23,7 +23,7 @@ dependencies = [
 ]
 
 builddependencies = [
-    ('CMake', '3.4.1'),
+    ('CMake', '3.4.3'),
     ('Eigen', '3.2.7'),
 ]
 
diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b6-20160201-intel-2016a-mt-Python-2.7.11.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b6-20160201-intel-2016a-mt-Python-2.7.11.eb
index a713c7f44f1a..3f257ab0c149 100644
--- a/easybuild/easyconfigs/p/PSI/PSI-4.0b6-20160201-intel-2016a-mt-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b6-20160201-intel-2016a-mt-Python-2.7.11.eb
@@ -31,7 +31,7 @@ dependencies = [
 ]
 
 builddependencies = [
-    ('CMake', '3.4.1'),
+    ('CMake', '3.4.3'),
     ('Perl', '5.22.1', '-bare'),  # for the test suite
 ]