Git intel toolchain alignment + Fix netCDF-Fortran conflict

intel-2018/ESMF-7.0.1-intel-2018.eb

@@ -1,5 +1,6 @@
 name = 'ESMF'
 version = '7.0.1'
+versionsuffix = '-netCDF-4.4.1.1'
 
 homepage = 'http://sourceforge.net/projects/esmf'
 description = """The Earth System Modeling Framework (ESMF) is software for building and coupling weather,
@@ -18,7 +19,7 @@ patches = [
 
 dependencies = [
     ('netCDF', '4.4.1.1'),
-    ('netCDF-Fortran', '4.4.4'),
+    ('netCDF-Fortran', '4.4.4', versionsuffix),
     ('netCDF-C++4', '4.3.0'),
 ]
 

intel-2018/NCL-6.4.0-intel-2018.eb

@@ -1,5 +1,6 @@
 name = 'NCL'
 version = '6.4.0'
+versionsuffix = '-netCDF-4.4.1.1'
 
 homepage = 'http://www.ncl.ucar.edu'
 description = """NCL is an interpreted language designed specifically for scientific data analysis and 
@@ -21,7 +22,7 @@ dependencies = [
     ('HDF', '4.2.12'),
     ('HDF5', '1.8.18'),
     ('netCDF', '4.4.1.1'),
-    ('netCDF-Fortran', '4.4.4'),
+    ('netCDF-Fortran', '4.4.4', versionsuffix),
     ('Szip', '2.1'),
     ('freetype', '2.8'),
     ('zlib', '1.2.11'),

intel-2018/gettext-0.19.8.1-intel-2018.eb

@@ -0,0 +1,29 @@
+easyblock = 'ConfigureMake'
+
+name = 'gettext'
+version = '0.19.8.1'
+
+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': 'intel', 'version': '2018'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+dependencies = [
+    ('libxml2', '2.9.4'),
+    ('ncurses', '6.0'),
+]
+
+configopts = '--without-emacs --with-libxml2-prefix=$EBROOTLIBXML2'
+
+sanity_check_paths = {
+    'files': ['bin/gettext', 'lib/libasprintf.a', 'lib/libasprintf.%s' % SHLIB_EXT,
+              'lib/libgettextpo.a', 'lib/libgettextpo.%s' % SHLIB_EXT],
+    'dirs': ['include'],
+}
+
+moduleclass = 'tools'

intel-2018/git-2.13.1-intel-2018.eb

@@ -17,9 +17,8 @@ builddependencies = [
     ('Autoconf', '2.69'),
 ]
 
-
 dependencies = [
-    ('cURL', '7.55.1'),
+    ('cURL', '7.58.0'),
     ('expat', '2.2.4'),
     ('gettext', '0.19.8.1'),
     ('Perl', '5.24.0'),

intel-2018/netCDF-Fortran-4.4.4-intel-2018-netCDF-4.4.1.1.eb

@@ -0,0 +1,18 @@
+name = 'netCDF-Fortran'
+version = '4.4.4'
+versionsuffix = '-netCDF-4.4.1.1'
+
+homepage = 'http://www.unidata.ucar.edu/software/netcdf/'
+description = """NetCDF (network Common Data Form) is a set of software libraries 
+ and machine-independent data formats that support the creation, access, and sharing of array-oriented 
+ scientific data."""
+
+toolchain = {'name': 'intel', 'version': '2018'}
+toolchainopts = {'pic': True}
+
+source_urls = ['https://github.com/Unidata/netcdf-fortran/archive/']
+sources = ['v%(version)s.tar.gz']
+
+dependencies = [('netCDF', '4.4.1.1')]
+
+moduleclass = 'data'