easybuilders · Micket · Aug 14, 2019 · Aug 9, 2019
diff --git a/easybuild/easyconfigs/g/GATE/GATE-8.0-intel-2017b-Python-2.7.14-Geant4-10.04.eb b/easybuild/easyconfigs/g/GATE/GATE-8.0-intel-2017b-Python-2.7.14-Geant4-10.04.eb
@@ -1,8 +1,7 @@
 name = 'GATE'
 version = '8.0'
-pyver = '2.7.14'
-geant4_ver = '10.04'
-versionsuffix = '-Python-%s-Geant4-%s' % (pyver, geant4_ver)
+local_geant4_ver = '10.04'
+versionsuffix = '-Python-2.7.14-Geant4-%s' % local_geant4_ver
 
 homepage = 'http://www.opengatecollaboration.org/'
 description = """GATE is an advanced opensource software developed by the international OpenGATE collaboration and
@@ -25,7 +24,7 @@ checksums = [
 
 builddependencies = [('CMake', '3.10.0')]
 dependencies = [
-    ('Geant4', geant4_ver),
+    ('Geant4', local_geant4_ver),
     ('CLHEP', '2.4.0.0'),
     ('ROOT', '6.10.08', '-Python-2.7.14'),
 ]

diff --git a/easybuild/easyconfigs/g/GATK/GATK-2.5-2-Java-1.7.0_10.eb b/easybuild/easyconfigs/g/GATK/GATK-2.5-2-Java-1.7.0_10.eb
@@ -14,6 +14,7 @@ easyblock = 'Tarball'
 
 name = 'GATK'
 version = '2.5-2'
+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 
@@ -27,10 +28,7 @@ toolchain = SYSTEM
 # download manually from http://www.broadinstitute.org/gatk/download
 sources = ['GenomeAnalysisTK-%(version)s.tar.bz2']
 
-java = 'Java'
-javaver = '1.7.0_10'
-versionsuffix = '-%s-%s' % (java, javaver)
-dependencies = [(java, javaver)]
+dependencies = [('Java', '1.7.0_10')]
 
 modloadmsg = "To execute GATK run: java -jar $EBROOTGATK/GenomeAnalysisTK.jar\n"
 

diff --git a/easybuild/easyconfigs/g/GATK/GATK-2.6-5-Java-1.7.0_10.eb b/easybuild/easyconfigs/g/GATK/GATK-2.6-5-Java-1.7.0_10.eb
@@ -14,6 +14,7 @@ easyblock = 'Tarball'
 
 name = 'GATK'
 version = '2.6-5'
+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 
@@ -27,10 +28,7 @@ toolchain = SYSTEM
 # download manually from http://www.broadinstitute.org/gatk/download
 sources = ['GenomeAnalysisTK-%(version)s.tar.bz2']
 
-java = 'Java'
-javaver = '1.7.0_10'
-versionsuffix = '-%s-%s' % (java, javaver)
-dependencies = [(java, javaver)]
+dependencies = [('Java', '1.7.0_10')]
 
 modloadmsg = "To execute GATK run: java -jar $EBROOTGATK/GenomeAnalysisTK.jar\n"
 

diff --git a/easybuild/easyconfigs/g/GATK/GATK-2.7-4-Java-1.7.0_10.eb b/easybuild/easyconfigs/g/GATK/GATK-2.7-4-Java-1.7.0_10.eb
@@ -14,6 +14,7 @@ easyblock = 'Tarball'
 
 name = 'GATK'
 version = '2.7-4'
+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 
@@ -27,10 +28,7 @@ toolchain = SYSTEM
 # download manually from http://www.broadinstitute.org/gatk/download
 sources = ['GenomeAnalysisTK-%(version)s.tar.bz2']
 
-java = 'Java'
-javaver = '1.7.0_10'
-versionsuffix = '-%s-%s' % (java, javaver)
-dependencies = [(java, javaver)]
+dependencies = [('Java', '1.7.0_10')]
 
 modloadmsg = "To execute GATK run: java -jar $EBROOTGATK/GenomeAnalysisTK.jar\n"
 

diff --git a/easybuild/easyconfigs/g/GATK/GATK-2.8-1-Java-1.7.0_10.eb b/easybuild/easyconfigs/g/GATK/GATK-2.8-1-Java-1.7.0_10.eb
@@ -14,6 +14,7 @@ easyblock = 'Tarball'
 
 name = 'GATK'
 version = '2.8-1'
+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 
@@ -27,10 +28,7 @@ toolchain = SYSTEM
 # download manually from http://www.broadinstitute.org/gatk/download
 sources = ['GenomeAnalysisTK-%(version)s.tar.bz2']
 
-java = 'Java'
-javaver = '1.7.0_10'
-versionsuffix = '-%s-%s' % (java, javaver)
-dependencies = [(java, javaver)]
+dependencies = [('Java', '1.7.0_10')]
 
 modloadmsg = "To execute GATK run: java -jar $EBROOTGATK/GenomeAnalysisTK.jar\n"
 

diff --git a/easybuild/easyconfigs/g/GATK/GATK-3.0-0-Java-1.7.0_10.eb b/easybuild/easyconfigs/g/GATK/GATK-3.0-0-Java-1.7.0_10.eb
@@ -14,6 +14,7 @@ easyblock = 'Tarball'
 
 name = 'GATK'
 version = '3.0-0'
+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 
@@ -27,10 +28,7 @@ toolchain = SYSTEM
 # download manually from http://www.broadinstitute.org/gatk/download
 sources = ['%s-%s.tar.bz2' % ("GenomeAnalysisTK", version)]
 
-java = 'Java'
-javaver = '1.7.0_10'
-versionsuffix = '-%s-%s' % (java, javaver)
-dependencies = [(java, javaver)]
+dependencies = [('Java', '1.7.0_10')]
 
 sanity_check_paths = {
     'files': ["GenomeAnalysisTK.jar"],

diff --git a/easybuild/easyconfigs/g/GATK/GATK-3.3-0-Java-1.7.0_21.eb b/easybuild/easyconfigs/g/GATK/GATK-3.3-0-Java-1.7.0_21.eb
@@ -15,6 +15,7 @@ easyblock = 'Tarball'
 
 name = 'GATK'
 version = '3.3-0'
+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 
@@ -28,10 +29,7 @@ toolchain = SYSTEM
 # download manually from http://www.broadinstitute.org/gatk/download
 sources = ['GenomeAnalysisTK-%(version)s.tar.bz2']
 
-java = 'Java'
-javaver = '1.7.0_21'
-versionsuffix = '-%s-%s' % (java, javaver)
-dependencies = [(java, javaver)]
+dependencies = [('Java', '1.7.0_21')]
 
 modloadmsg = "To execute GATK run: java -jar $EBROOTGATK/GenomeAnalysisTK.jar\n"
 

diff --git a/easybuild/easyconfigs/g/GATK/GATK-3.3-0-Java-1.7.0_80.eb b/easybuild/easyconfigs/g/GATK/GATK-3.3-0-Java-1.7.0_80.eb
@@ -15,6 +15,7 @@ easyblock = 'Tarball'
 
 name = 'GATK'
 version = '3.3-0'
+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 
@@ -28,10 +29,7 @@ toolchain = SYSTEM
 # download manually from http://www.broadinstitute.org/gatk/download
 sources = ['GenomeAnalysisTK-%(version)s.tar.bz2']
 
-java = 'Java'
-javaver = '1.7.0_80'
-versionsuffix = '-%s-%s' % (java, javaver)
-dependencies = [(java, javaver)]
+dependencies = [('Java', '1.7.0_80')]
 
 modloadmsg = "To execute GATK run: java -jar $EBROOTGATK/GenomeAnalysisTK.jar\n"
 

diff --git a/easybuild/easyconfigs/g/GATK/GATK-3.3-0-Java-1.8.0_66.eb b/easybuild/easyconfigs/g/GATK/GATK-3.3-0-Java-1.8.0_66.eb
@@ -15,6 +15,7 @@ easyblock = 'Tarball'
 
 name = 'GATK'
 version = '3.3-0'
+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 
@@ -28,10 +29,7 @@ toolchain = SYSTEM
 # download manually from http://www.broadinstitute.org/gatk/download
 sources = ['GenomeAnalysisTK-%(version)s.tar.bz2']
 
-java = 'Java'
-javaver = '1.8.0_66'
-versionsuffix = '-%s-%s' % (java, javaver)
-dependencies = [(java, javaver)]
+dependencies = [('Java', '1.8.0_66')]
 
 modloadmsg = "To execute GATK run: java -jar $EBROOTGATK/GenomeAnalysisTK.jar\n"
 

diff --git a/easybuild/easyconfigs/g/GATK/GATK-3.5-Java-1.8.0_66.eb b/easybuild/easyconfigs/g/GATK/GATK-3.5-Java-1.8.0_66.eb
@@ -15,6 +15,7 @@ easyblock = 'Tarball'
 
 name = 'GATK'
 version = '3.5'
+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 
@@ -28,10 +29,7 @@ toolchain = SYSTEM
 # download manually from http://www.broadinstitute.org/gatk/download
 sources = ['GenomeAnalysisTK-%(version)s.tar.bz2']
 
-java = 'Java'
-javaver = '1.8.0_66'
-versionsuffix = '-%s-%s' % (java, javaver)
-dependencies = [(java, javaver)]
+dependencies = [('Java', '1.8.0_66')]
 
 modloadmsg = "To execute GATK run: java -jar $EBROOTGATK/GenomeAnalysisTK.jar\n"
 

diff --git a/easybuild/easyconfigs/g/GC3Pie/GC3Pie-2.4.2.eb b/easybuild/easyconfigs/g/GC3Pie/GC3Pie-2.4.2.eb
@@ -92,14 +92,16 @@ exts_list = [
     }),
 ]
 
-pyver = '.'.join(SYS_PYTHON_VERSION.split('.')[:2])
+local_pyver = '.'.join(SYS_PYTHON_VERSION.split('.')[:2])
 
 # on RHEL-based systems, some extensions get installed to lib, some to lib64
-modextrapaths = {'PYTHONPATH': ['lib/python%s/site-packages' % pyver, 'lib64/python%s/site-packages' % pyver]}
+modextrapaths = {
+    'PYTHONPATH': ['lib/python%s/site-packages' % local_pyver, 'lib64/python%s/site-packages' % local_pyver],
+}
 
 sanity_check_paths = {
     'files': ['bin/gc3utils'],
-    'dirs': [('lib/python%s/site-packages' % pyver, 'lib64/python%s/site-packages' % pyver)],
+    'dirs': [('lib/python%s/site-packages' % local_pyver, 'lib64/python%s/site-packages' % local_pyver)],
 }
 
 sanity_check_commands = [('gc3utils', 'info --version')]

diff --git a/easybuild/easyconfigs/g/GC3Pie/GC3Pie-2.5.0.eb b/easybuild/easyconfigs/g/GC3Pie/GC3Pie-2.5.0.eb
@@ -150,14 +150,16 @@ exts_list = [
     }),
 ]
 
-pyver = '.'.join(SYS_PYTHON_VERSION.split('.')[:2])
+local_pyver = '.'.join(SYS_PYTHON_VERSION.split('.')[:2])
 
 # on RHEL-based systems, some extensions get installed to lib, some to lib64
-modextrapaths = {'PYTHONPATH': ['lib/python%s/site-packages' % pyver, 'lib64/python%s/site-packages' % pyver]}
+modextrapaths = {
+    'PYTHONPATH': ['lib/python%s/site-packages' % local_pyver, 'lib64/python%s/site-packages' % local_pyver],
+}
 
 sanity_check_paths = {
     'files': ['bin/gc3utils'],
-    'dirs': [('lib/python%s/site-packages' % pyver, 'lib64/python%s/site-packages' % pyver)],
+    'dirs': [('lib/python%s/site-packages' % local_pyver, 'lib64/python%s/site-packages' % local_pyver)],
 }
 
 sanity_check_commands = [('gc3utils', 'info --version')]

diff --git a/easybuild/easyconfigs/g/GDAL/GDAL-2.2.0-intel-2017a-Python-2.7.13-HDF5-1.8.18.eb b/easybuild/easyconfigs/g/GDAL/GDAL-2.2.0-intel-2017a-Python-2.7.13-HDF5-1.8.18.eb
@@ -2,8 +2,8 @@ easyblock = 'ConfigureMake'
 
 name = 'GDAL'
 version = '2.2.0'
-hdf5_ver = '1.8.18'
-versionsuffix = '-Python-%%(pyver)s-HDF5-%s' % hdf5_ver
+local_hdf5_ver = '1.8.18'
+versionsuffix = '-Python-%%(pyver)s-HDF5-%s' % local_hdf5_ver
 
 homepage = 'http://www.gdal.org/'
 description = """GDAL is a translator library for raster geospatial data formats that is released under an X/MIT style
@@ -24,7 +24,7 @@ checksums = [
 
 dependencies = [
     ('Python', '2.7.13'),
-    ('netCDF', '4.4.1.1', '-HDF5-%s' % hdf5_ver),
+    ('netCDF', '4.4.1.1', '-HDF5-%s' % local_hdf5_ver),
     ('expat', '2.2.0'),
     ('GEOS', '3.6.1', '-Python-%(pyver)s'),
     ('SQLite', '3.17.0'),

diff --git a/easybuild/easyconfigs/g/GDAL/GDAL-2.2.2-intel-2017b-Python-2.7.14-HDF5-1.8.19.eb b/easybuild/easyconfigs/g/GDAL/GDAL-2.2.2-intel-2017b-Python-2.7.14-HDF5-1.8.19.eb
@@ -2,8 +2,8 @@ easyblock = 'ConfigureMake'
 
 name = 'GDAL'
 version = '2.2.2'
-hdf5_ver = '1.8.19'
-versionsuffix = '-Python-%%(pyver)s-HDF5-%s' % hdf5_ver
+local_hdf5_ver = '1.8.19'
+versionsuffix = '-Python-%%(pyver)s-HDF5-%s' % local_hdf5_ver
 
 homepage = 'http://www.gdal.org/'
 description = """GDAL is a translator library for raster geospatial data formats that is released under an X/MIT style
@@ -24,7 +24,7 @@ checksums = [
 
 dependencies = [
     ('Python', '2.7.14'),
-    ('netCDF', '4.4.1.1', '-HDF5-%s' % hdf5_ver),
+    ('netCDF', '4.4.1.1', '-HDF5-%s' % local_hdf5_ver),
     ('expat', '2.2.4'),
     ('GEOS', '3.6.2', '-Python-%(pyver)s'),
     ('SQLite', '3.20.1'),

diff --git a/easybuild/easyconfigs/g/GIMIC/GIMIC-2018.04.20-intel-2018a-Python-2.7.14.eb b/easybuild/easyconfigs/g/GIMIC/GIMIC-2018.04.20-intel-2018a-Python-2.7.14.eb
@@ -3,7 +3,7 @@ easyblock = "CMakeMake"
 name = 'GIMIC'
 version = '2018.04.20'
 versionsuffix = '-Python-%(pyver)s'
-commit = 'fa939fe4553c77683044bc08890d9bcf1486aecc'
+local_commit = 'fa939fe4553c77683044bc08890d9bcf1486aecc'
 
 homepage = 'http://gimic.readthedocs.io'
 description = """The GIMIC program calculates magnetically induced currents in molecules.
@@ -14,7 +14,7 @@ Currently ACES2, Turbomole, G09, QChem, FERMION++, and LSDalton can produce thes
 toolchain = {'name': 'intel', 'version': '2018a'}
 
 source_urls = ['https://github.com/qmcurrents/gimic/archive']
-sources = ['%s.tar.gz' % commit]
+sources = ['%s.tar.gz' % local_commit]
 patches = ['%(name)s-%(version)s_git.patch']
 checksums = [
     # fa939fe4553c77683044bc08890d9bcf1486aecc.tar.gz
@@ -34,7 +34,7 @@ dependencies = [
 
 separate_build_dir = True
 
-configopts = '-DENABLE_OPENMP=ON -DENABLE_MKL_FLAG=ON -DGIT_REVISION=%s ' % commit
+configopts = '-DENABLE_OPENMP=ON -DENABLE_MKL_FLAG=ON -DGIT_REVISION=%s ' % local_commit
 configopts += '-DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" '
 configopts += '-DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" '
 configopts += '-DCMAKE_Fortran_FLAGS_RELEASE:STRING=" " '

diff --git a/easybuild/easyconfigs/g/GL2PS/GL2PS-1.3.9-foss-2016a-Mesa-11.2.1.eb b/easybuild/easyconfigs/g/GL2PS/GL2PS-1.3.9-foss-2016a-Mesa-11.2.1.eb
@@ -11,8 +11,8 @@ toolchain = {'name': 'foss', 'version': '2016a'}
 source_urls = ['http://geuz.org/gl2ps/src/']
 sources = [SOURCELOWER_TGZ]
 
-mesa_ver = '11.2.1'
-versionsuffix = '-Mesa-%s' % mesa_ver
+local_mesa_ver = '11.2.1'
+versionsuffix = '-Mesa-%s' % local_mesa_ver
 
 builddependencies = [
     ('CMake', '3.4.3'),
@@ -22,7 +22,7 @@ dependencies = [
     ('libX11', '1.6.3'),
     ('libXi', '1.7.6'),
     ('libXmu', '1.1.2'),
-    ('Mesa', mesa_ver),
+    ('Mesa', local_mesa_ver),
     ('libGLU', '9.0.0', versionsuffix),
     ('freeglut', '3.0.0', versionsuffix),
     ('libpng', '1.6.21'),

diff --git a/easybuild/easyconfigs/g/GL2PS/GL2PS-1.3.9-intel-2016a-Mesa-11.2.1.eb b/easybuild/easyconfigs/g/GL2PS/GL2PS-1.3.9-intel-2016a-Mesa-11.2.1.eb
@@ -11,8 +11,8 @@ toolchain = {'name': 'intel', 'version': '2016a'}
 source_urls = ['http://geuz.org/gl2ps/src/']
 sources = [SOURCELOWER_TGZ]
 
-mesa_ver = '11.2.1'
-versionsuffix = '-Mesa-%s' % mesa_ver
+local_mesa_ver = '11.2.1'
+versionsuffix = '-Mesa-%s' % local_mesa_ver
 
 builddependencies = [
     ('CMake', '3.4.3'),
@@ -22,7 +22,7 @@ dependencies = [
     ('libX11', '1.6.3'),
     ('libXi', '1.7.6'),
     ('libXmu', '1.1.2'),
-    ('Mesa', mesa_ver),
+    ('Mesa', local_mesa_ver),
     ('libGLU', '9.0.0', versionsuffix),
     ('freeglut', '3.0.0', versionsuffix),
     ('libpng', '1.6.21'),

diff --git a/easybuild/easyconfigs/g/GMT/GMT-4.5.17-foss-2018a.eb b/easybuild/easyconfigs/g/GMT/GMT-4.5.17-foss-2018a.eb
@@ -21,14 +21,14 @@ source_urls = [
     'ftp://ftp.soest.hawaii.edu/dcw',
     'ftp://ftp.soest.hawaii.edu/dcw/legacy',
 ]
-gshhg_ver = '2.3.7'
-dcw_ver = '1.1.3'
+local_gshhg_ver = '2.3.7'
+local_dcw_ver = '1.1.3'
 sources = [
     'gmt-%(version)s-src.tar.bz2',
     # coastlines, rivers, and political boundaries
-    'gshhg-gmt-%s.tar.gz' % gshhg_ver,
+    'gshhg-gmt-%s.tar.gz' % local_gshhg_ver,
     # country polygons
-    'dcw-gmt-%s.tar.gz' % dcw_ver,
+    'dcw-gmt-%s.tar.gz' % local_dcw_ver,
 ]
 checksums = [
     'd69c4e2075f16fb7c153ba77429a7b60e45c44583ebefd7aae63ae05439d1d41',  # gmt-4.5.17-src.tar.bz2
@@ -46,7 +46,7 @@ dependencies = [
     ('zlib', '1.2.11'),
 ]
 
-configopts = "--with-gshhg-dir=%%(builddir)s/gshhg-gmt-%s " % gshhg_ver
+configopts = "--with-gshhg-dir=%%(builddir)s/gshhg-gmt-%s " % local_gshhg_ver
 
 parallel = 1