Merge pull request #3 from boegel/foss-2018b-utils

style fixes, add missing libgeotiff dep + switch to Python 3.6.6

easybuild/easyconfigs/g/GDAL/GDAL-2.2.3-foss-2018b-Python-3.7.0.eb → easybuild/easyconfigs/g/GDAL/GDAL-2.2.3-foss-2018b-Python-3.6.6.eb

@@ -18,26 +18,28 @@ sources = [SOURCELOWER_TAR_XZ]
 checksums = ['a328d63d476b3653f5a25b5f7971e87a15cdf8860ab0729d4b1157ba988b8d0b']
 
 dependencies = [
-    ('Python', '3.7.0'),
+    ('Python', '3.6.6'),
     ('netCDF', '4.6.1'),
-    ('expat', '2.2.5', '-GCCcore-7.3.0', True),
+    ('expat', '2.2.5'),
     ('GEOS', '3.6.2', '-Python-%(pyver)s'),
-    ('SQLite', '3.24.0'), # GCCcore
-    ('libxml2', '2.9.8'), # GCCcore
-    ('libpng', '1.6.34'), # GCCcore
-    ('libjpeg-turbo', '2.0.0', '-GCCcore-7.3.0', True),
+    ('SQLite', '3.24.0'),
+    ('libxml2', '2.9.8'),
+    ('libpng', '1.6.34'),
+    ('libjpeg-turbo', '2.0.0'),
     ('JasPer', '2.0.14'),
-    ('LibTIFF', '4.0.9', '-GCCcore-7.3.0', True),
+    ('LibTIFF', '4.0.9'),
     ('zlib', '1.2.11'),
-    ('cURL', '7.60.0', '-GCCcore-7.3.0', True),
+    ('cURL', '7.60.0'),
     ('PCRE', '8.41'),
     ('PROJ', '5.0.0'),
+    ('libgeotiff', '1.4.2'),
 ]
 
 configopts = '--with-expat=$EBROOTEXPAT --with-libz=$EBROOTLIBZ --with-hdf5=$EBROOTHDF5 --with-netcdf=$EBROOTNETCDF'
 configopts += ' --with-xml2=$EBROOTLIBXML2 --with-geos=$EBROOTGEOS/bin/geos-config --with-jpeg=$EBROOTLIBJPEGMINTURBO'
 configopts += ' --with-png=$EBROOTLIBPNG --with-sqlite3=$EBROOTSQLITE --with-jasper=$EBROOTJASPER'
 configopts += ' --with-libtiff=$EBROOTLIBTIFF --with-pcre=$EBROOTPCRE --with-python=$EBROOTPYTHON/bin/python'
+configopts += ' --with-libgeotiff=$EBROOTLIBGEOTIFF'
 
 modextrapaths = {'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages'}
 

easybuild/easyconfigs/g/GEOS/GEOS-3.6.2-foss-2018b-Python-3.7.0.eb → easybuild/easyconfigs/g/GEOS/GEOS-3.6.2-foss-2018b-Python-3.6.6.eb

@@ -17,7 +17,7 @@ checksums = [
     'ce320e5533e407807c0e0599b6cf06e207bc993204b27250bf7e1d0f24160029',  # GEOS-3.6.2_fix-Python3.patch
 ]
 
-dependencies = [('Python', '3.7.0')]
+dependencies = [('Python', '3.6.6')]
 
 builddependencies = [('SWIG', '3.0.12', versionsuffix)]
 

easybuild/easyconfigs/j/JasPer/JasPer-2.0.14-GCCcore-7.3.0.eb

@@ -28,7 +28,7 @@ separate_build_dir = True
 configopts = '-DJAS_ENABLE_DOC=OFF '
 
 sanity_check_paths = {
-    'files': ['bin/jasper', 'lib64/libjasper.%s' % SHLIB_EXT],
+    'files': ['bin/jasper', ('lib/libjasper.%s' % SHLIB_EXT, 'lib64/libjasper.%s' % SHLIB_EXT)],
     'dirs': ['include'],
 }
 

easybuild/easyconfigs/l/LibTIFF/LibTIFF-4.0.9-GCCcore-7.3.0.eb

@@ -26,6 +26,8 @@ source_urls = [
 sources = ['tiff-%(version)s.tar.gz']
 checksums = ['6e7bdeec2c310734e734d19aae3a71ebe37a4d842e0e23dbb1b8921c0026cfcd']
 
+builddependencies = [('binutils', '2.30')]
+
 configopts = " --enable-ld-version-script "
 
 sanity_check_paths = {

easybuild/easyconfigs/l/libgeotiff/libgeotiff-1.4.2-foss-2018b.eb

@@ -0,0 +1,33 @@
+easyblock = 'ConfigureMake'
+
+name = 'libgeotiff'
+version = '1.4.2'
+
+homepage = 'https://directory.fsf.org/wiki/Libgeotiff'
+description = "Library for reading and writing coordinate system information from/to GeoTIFF files"
+
+toolchain = {'name': 'foss', 'version': '2018b'}
+
+source_urls = [
+    'http://download.osgeo.org/geotiff/libgeotiff/',
+    'ftp://ftp.remotesensing.org/pub/libgeotiff/',
+]
+sources = ['%(name)s-%(version)s.tar.gz']
+checksums = ['ad87048adb91167b07f34974a8e53e4ec356494c29f1748de95252e8f81a5e6e']
+
+dependencies = [
+    ('zlib', '1.2.11'),
+    ('LibTIFF', '4.0.9'),
+    ('PROJ', '5.0.0'),
+    ('libjpeg-turbo', '2.0.0'),
+]
+
+configopts = ' --with-libtiff=$EBROOTLIBTIFF --with-proj=$EBROOTPROJ --with-zlib=$EBROOTZLIB'
+configopts += ' --with-jpeg=$EBROOTLIBJPEGMINTURBO'
+
+sanity_check_paths = {
+    'files': ['bin/listgeo', 'lib/libgeotiff.a', 'lib/libgeotiff.%s' % SHLIB_EXT],
+    'dirs': ['include', 'share'],
+}
+
+moduleclass = 'lib'

easybuild/easyconfigs/n/NLopt/NLopt-2.4.2-GCCcore-7.3.0.eb

@@ -20,6 +20,8 @@ source_urls = ['http://ab-initio.mit.edu/nlopt/']
 sources = [SOURCELOWER_TAR_GZ]
 checksums = ['8099633de9d71cbc06cd435da993eb424bbcdbded8f803cdaa9fb8c6e09c8e89']
 
+builddependencies = [('binutils', '2.30')]
+
 configopts = '--enable-shared --without-matlab --without-octave'
 
 sanity_check_paths = {

easybuild/easyconfigs/s/SWIG/SWIG-3.0.12-foss-2018b-Python-3.7.0.eb → easybuild/easyconfigs/s/SWIG/SWIG-3.0.12-foss-2018b-Python-3.6.6.eb

@@ -14,8 +14,8 @@ sources = [SOURCELOWER_TAR_GZ]
 checksums = ['7cf9f447ae7ed1c51722efc45e7f14418d15d7a1e143ac9f09a668999f4fc94d']
 
 dependencies = [
-    ('Python', '3.7.0'),
-    ('PCRE', '8.41', '-GCCcore-7.3.0', True),
+    ('Python', '3.6.6'),
+    ('PCRE', '8.41'),
 ]
 
 moduleclass = 'devel'