From 7e1e949bbe49f97757e7cb657d14445263f26985 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Krup=C4=8D=C3=ADk?= <lukas.krupcik@vsb.cz>
Date: Mon, 24 Aug 2020 08:48:54 +0200
Subject: [PATCH] 	new file:  
 c/CGAL/CGAL-4.14.3-intel-2020a-Python-3.8.2.eb 	modified:  
 o/OpenFOAM/OpenFOAM-v2006-intel-2020a.eb 	deleted:   
 i/iimpi/iimpi-2020a.eb.old 	deleted:    i/intel/intel-2020a.eb.old

---
 .../CGAL-4.14.3-intel-2020a-Python-3.8.2.eb   | 40 +++++++++++++++++++
 i/iimpi/iimpi-2020a.eb.old                    | 19 ---------
 i/intel/intel-2020a.eb.old                    | 25 ------------
 o/OpenFOAM/OpenFOAM-v2006-intel-2020a.eb      |  2 +-
 4 files changed, 41 insertions(+), 45 deletions(-)
 create mode 100644 c/CGAL/CGAL-4.14.3-intel-2020a-Python-3.8.2.eb
 delete mode 100644 i/iimpi/iimpi-2020a.eb.old
 delete mode 100644 i/intel/intel-2020a.eb.old

diff --git a/c/CGAL/CGAL-4.14.3-intel-2020a-Python-3.8.2.eb b/c/CGAL/CGAL-4.14.3-intel-2020a-Python-3.8.2.eb
new file mode 100644
index 00000000..8acc64f4
--- /dev/null
+++ b/c/CGAL/CGAL-4.14.3-intel-2020a-Python-3.8.2.eb
@@ -0,0 +1,40 @@
+# JH 2020
+
+name = 'CGAL'
+version = '4.14.3'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://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': '2020a'}
+toolchainopts = {'strict': True}
+
+source_urls = ['https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-%(version)s']
+sources = [SOURCE_TAR_XZ]
+checksums = ['5bafe7abe8435beca17a1082062d363368ec1e3f0d6581bb0da8b010fb389fe4']
+
+builddependencies = [
+    ('CMake', '3.16.4'),
+    ('Eigen', '3.3.7'),
+]
+
+dependencies = [
+    ('zlib', '1.2.11'),
+    ('Python', '3.8.2'),
+    ('Boost', '1.72.0'),
+    ('MPFR', '4.0.2'),
+    ('GMP', '6.2.0'),
+    ('Mesa', '20.0.2'),
+    ('libGLU', '9.0.1'),
+    ('Qt5', '5.14.1'),
+]
+
+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/i/iimpi/iimpi-2020a.eb.old b/i/iimpi/iimpi-2020a.eb.old
deleted file mode 100644
index 1b70f432..00000000
--- a/i/iimpi/iimpi-2020a.eb.old
+++ /dev/null
@@ -1,19 +0,0 @@
-# IT4Innovations 2019
-
-easyblock = "Toolchain"
-
-name = 'iimpi'
-version = '2020a'
-
-homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-local_compiler/'
-description = """Intel C/C++ and Fortran compilers, alongside Intel MPI."""
-
-toolchain = SYSTEM
-
-local_compver = '2020.0.166'
-dependencies = [
-    ('iccifort', local_compver),
-    ('impi', '2019.6.166', '', ('iccifort', local_compver)),
-]
-
-moduleclass = 'toolchain'
diff --git a/i/intel/intel-2020a.eb.old b/i/intel/intel-2020a.eb.old
deleted file mode 100644
index 4937cd72..00000000
--- a/i/intel/intel-2020a.eb.old
+++ /dev/null
@@ -1,25 +0,0 @@
-# IT4Innovations 2020
-
-easyblock = 'Toolchain'
-
-name = 'intel'
-version = '2020a'
-
-homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-local_compiler/'
-description = "Compiler toolchain including Intel compilers, Intel MPI and Intel Math Kernel Library (MKL)."
-
-toolchain = SYSTEM
-
-local_compver = '2020.0.166'
-local_gccver = '8.3.0'
-local_binutilsver = '2.32'
-local_gccsuff = '-GCC-%s-%s' % (local_gccver, local_binutilsver)
-dependencies = [
-    ('GCCcore', local_gccver),
-    ('binutils', local_binutilsver, '-GCCcore-%s' % local_gccver),
-    ('iccifort', local_compver), 
-    ('impi', '2019.6.166', '', ('iccifort', local_compver)),
-    ('imkl', local_compver, '', ('iimpi', version)),
-]
-
-moduleclass = 'toolchain'
diff --git a/o/OpenFOAM/OpenFOAM-v2006-intel-2020a.eb b/o/OpenFOAM/OpenFOAM-v2006-intel-2020a.eb
index 94b93713..7bb89586 100644
--- a/o/OpenFOAM/OpenFOAM-v2006-intel-2020a.eb
+++ b/o/OpenFOAM/OpenFOAM-v2006-intel-2020a.eb
@@ -25,7 +25,7 @@ checksums = [
 
 dependencies = [
     ('libreadline', '8.0'),
-    ('ncurses', '6.1'),
+    ('ncurses', '6.2'),
     # OpenFOAM requires 64 bit METIS using 32 bit indexes (array indexes)
     ('METIS', '5.1.0'),
     ('SCOTCH', '6.0.9'),