modified: archive/l/LLVM/LLVM-3.7.1-foss-2015g.eb

modified:   b/BerkeleyUPC/BerkeleyUPC-2.16.2-gompi-2015b.eb
	modified:   c/CLooG/CLooG-0.18.1-GCC-4.8.2.eb
	modified:   c/Clang/Clang-3.7.0-GNU-5.1.0-2.25.eb
	modified:   c/Clang/Clang-3.8.1-GCC-6.3.0-2.27.eb
	modified:   c/Clang/Clang-5.0.0-GCC-6.3.0-2.27.eb
	modified:   c/Clang/Clang-7.0.1-gompi-2019.02.eb
	modified:   c/Clang/Clang-7.0.1.eb
	modified:   g/GCC/GCC-4.4.7-system.eb
	modified:   g/GCC/GCC-4.7.0.eb
	modified:   g/GCC/GCC-4.8.1-CLooG.eb
	modified:   g/GCC/GCC-4.8.1.eb
	modified:   g/GCC/GCC-4.8.2-CLooG-multilib.eb
	modified:   g/GCC/GCC-4.8.2-CLooG.eb
	modified:   g/GCC/GCC-4.8.2-multilib.eb
	modified:   g/GCC/GCC-4.8.2.eb
	modified:   g/GCC/GCC-4.8.3-CLooG-multilib.eb
	modified:   g/GCC/GCC-4.8.3.eb
	modified:   g/GCC/GCC-4.8.4-CLooG-multilib.eb
	modified:   g/GCC/GCC-4.8.4-CLooG.eb
	modified:   g/GCC/GCC-4.8.4.eb
	modified:   g/GCC/GCC-4.8.5.eb
	modified:   g/GCC/GCC-4.9.0-CLooG-multilib.eb
	modified:   g/GCC/GCC-4.9.0-CLooG.eb
	modified:   g/GCC/GCC-4.9.0.eb
	modified:   g/GCC/GCC-4.9.1-CLooG-multilib.eb
	modified:   g/GCC/GCC-4.9.1-CLooG.eb
	modified:   g/GCC/GCC-4.9.1.eb
	modified:   g/GCC/GCC-4.9.2-CLooG-multilib.eb
	modified:   g/GCC/GCC-4.9.2-CLooG.eb
	modified:   g/GCC/GCC-4.9.2-binutils-2.25.eb
	modified:   g/GCC/GCC-4.9.2.eb
	modified:   g/GCC/GCC-4.9.3-binutils-2.25.eb
	modified:   g/GCC/GCC-4.9.3-experimental.eb
	modified:   g/GCC/GCC-4.9.3-tf.eb
	modified:   g/GCC/GCC-4.9.3.eb
	modified:   g/GCC/GCC-5.1.0-binutils-2.25.eb
	modified:   g/GCC/GCC-5.1.0.eb
	modified:   g/GCC/GCC-5.2.0.eb
	modified:   g/GCC/GCC-5.3.0-2.25.eb
	modified:   g/GCC/GCC-5.3.0-binutils-2.25.eb
	modified:   g/GCC/GCC-5.3.0.eb
	modified:   g/GCC/GCC-5.3.1-snapshot-20160419-2.25.eb
	modified:   g/GCC/GCC-7.3.0-2.30.eb
	modified:   g/GCC/GCC-8.1.0-2.30.eb
	modified:   g/GCC/GCC-8.3.0-2.32.eb
	modified:   g/GCC/GCC-9.2.0-2.32.eb
	modified:   g/GCCcore/GCCcore-4.9.2.eb
	modified:   g/GCCcore/GCCcore-4.9.3.eb
	modified:   g/GCCcore/GCCcore-5.3.0.eb
	modified:   g/GCCcore/GCCcore-5.3.1-snapshot-20160419.eb
	modified:   g/GCCcore/GCCcore-5.4.0.eb
	modified:   g/GCCcore/GCCcore-6.1.0.eb
	modified:   g/GCCcore/GCCcore-6.2.0.eb
	modified:   g/GCCcore/GCCcore-6.3.0.eb
	modified:   g/GCCcore/GCCcore-6.4.0.eb
	modified:   g/GCCcore/GCCcore-7.1.0.eb
	modified:   g/GCCcore/GCCcore-8.1.0.eb
	modified:   g/GCCcore/GCCcore-8.2.0.eb
	modified:   g/GCCcore/GCCcore-8.3.0.eb
	modified:   g/GCCcore/GCCcore-9.2.0.eb
	modified:   g/Go/Go-1.11.1.eb
	modified:   g/Go/Go-1.12.7.eb
	modified:   g/Go/Go-1.13.1.eb
	modified:   i/icc/icc-2017.1.132-GCC-6.3.0-2.27.eb
	modified:   i/icc/icc-2017.2.174-GCC-6.3.0-2.27.eb
	modified:   i/icc/icc-2017.4.196-GCC-6.3.0-2.27.eb
	modified:   i/icc/icc-2017.5.239-GCC-6.3.0-2.27.eb
	modified:   i/icc/icc-2017.7.259-GCC-6.3.0-2.27.eb
	modified:   i/icc/icc-2018.1.163-GCC-6.3.0-2.27.eb
	modified:   i/icc/icc-2018.3.222-GCC-6.3.0-2.27.eb
	modified:   i/icc/icc-2018.3.222-GCC-8.1.0-2.30.eb
	modified:   i/icc/icc-2018.5.274-GCC-6.3.0-2.27.eb
	modified:   i/icc/icc-2019.2.187-GCC-6.3.0-2.27.eb
	modified:   i/icc/icc-2019.4.227-GCC-6.3.0-2.27.eb
	modified:   i/icc/icc-2019.4.227-GCC-8.3.0-2.32.eb
	modified:   i/icc/icc-2019.4.227-GCC-9.1.0-2.32.eb
	modified:   i/ifort/ifort-2017.1.132-GCC-6.3.0-2.27.eb
	modified:   i/ifort/ifort-2017.4.196-GCC-6.4.0-2.28.eb
	modified:   i/ifort/ifort-2017.5.239-GCC-6.3.0-2.27.eb
	modified:   i/ifort/ifort-2017.7.259-GCC-6.3.0-2.27.eb
	modified:   i/ifort/ifort-2018.1.163-GCC-6.3.0-2.27.eb
	modified:   i/ifort/ifort-2018.3.222-GCC-6.3.0-2.27.eb
	modified:   i/ifort/ifort-2018.3.222-GCC-8.1.0-2.30.eb
	modified:   i/ifort/ifort-2018.5.274-GCC-6.3.0-2.27.eb
	modified:   i/ifort/ifort-2019.2.187-GCC-6.3.0-2.27.eb
	modified:   i/ifort/ifort-2019.4.227-GCC-6.3.0-2.27.eb
	modified:   i/ifort/ifort-2019.4.227-GCC-8.3.0-2.32.eb
	modified:   i/ifort/ifort-2019.4.227-GCC-9.1.0-2.32.eb
	modified:   i/ispc/ispc-1.9.1.eb
	modified:   l/LLVM/LLVM-3.8.1-intel-2017a.eb
	modified:   l/LLVM/LLVM-3.9.0-intel-2017.00.eb
	modified:   l/LLVM/LLVM-4.0.0-GCC-6.3.0-2.27.eb
	modified:   l/LLVM/LLVM-5.0.0-GCC-6.3.0-2.27.eb
	modified:   l/LLVM/LLVM-6.0.0-Py-2.7.eb
	modified:   l/LLVM/LLVM-6.0.1-GCC-6.3.0-2.27.eb
	modified:   l/LLVM/LLVM-6.0.1.eb
	modified:   l/LLVM/LLVM-7.0.0-intel-2017c.eb
	modified:   l/LLVM/LLVM-7.0.0.eb
	modified:   o/OpenCoarrays/OpenCoarrays-1.4.0.eb
	modified:   o/OpenCoarrays/OpenCoarrays-1.8.10-GCC-6.3.0-2.27.eb
	modified:   p/PCC/PCC-20131024.eb
	modified:   p/PGI/PGI-15.10-GCC-4.9.3-2.25.eb
	modified:   p/PGI/PGI-15.7-GNU-4.9.2-2.25.eb
	modified:   p/PGI/PGI-15.7-GNU-4.9.3-2.25.eb
	modified:   p/PGI/PGI-16.10-GNU-4.9.3-2.25.eb
	modified:   p/PGI/PGI-17.3-GCC-6.3.0-2.28.eb
	modified:   p/PGI/PGI-17.9-GCC-6.3.0-2.28.eb
	modified:   p/PGI/PGI-18.5-GCC-6.3.0-2.27.eb
	modified:   p/PGI/PGI-19.1-GCC-6.3.0-2.27.eb
	modified:   p/PGI/PGI-19.4-GCC-8.2.0-2.31.1.eb
	modified:   p/PGI/PGI-19.7-GCC-8.2.0-2.31.1-CUDA.eb
	modified:   p/PGI/PGI-19.7-GCC-8.2.0-2.31.1.eb
	modified:   p/PGI/PGI-19.7-GCC-8.3.0-2.32-CUDA-10.1.243.eb
	modified:   p/PGI/PGI-19.7-GCC-8.3.0-2.32.eb

archive/l/LLVM/LLVM-3.7.1-foss-2015g.eb

@@ -32,4 +32,4 @@ sanity_check_paths = {
 
 separate_build_dir = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

b/BerkeleyUPC/BerkeleyUPC-2.16.2-gompi-2015b.eb

@@ -39,4 +39,4 @@ sanity_check_paths = {
 
 parallel = 1
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

c/CLooG/CLooG-0.18.1-GCC-4.8.2.eb

@@ -28,4 +28,4 @@ sanity_check_paths = {
         SHLIB_EXT],
     'dirs': []}
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

c/Clang/Clang-3.7.0-GNU-5.1.0-2.25.eb

@@ -39,4 +39,4 @@ usepolly = True
 
 build_targets = ['X86']
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

c/Clang/Clang-3.8.1-GCC-6.3.0-2.27.eb

@@ -46,4 +46,4 @@ usepolly = True
 
 build_targets = ['X86']
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

c/Clang/Clang-5.0.0-GCC-6.3.0-2.27.eb

@@ -42,4 +42,4 @@ usepolly = True
 
 build_targets = ['X86']
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

c/Clang/Clang-7.0.1-gompi-2019.02.eb

@@ -36,4 +36,4 @@ assertions = True
 usepolly = True
 skip_all_tests = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

c/Clang/Clang-7.0.1.eb

@@ -36,4 +36,4 @@ assertions = True
 usepolly = True
 skip_all_tests = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCC/GCC-4.4.7-system.eb

@@ -27,4 +27,4 @@ sanity_check_paths = {
     'dirs': ['/usr/share/doc/gcc-4.4.7']
 }
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCC/GCC-4.7.0.eb

@@ -37,4 +37,4 @@ languages = ['c', 'c++', 'fortran']
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCC/GCC-4.8.1-CLooG.eb

@@ -46,4 +46,4 @@ clooguseisl = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCC/GCC-4.8.1.eb

@@ -34,4 +34,4 @@ languages = ['c', 'c++', 'fortran']
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCC/GCC-4.8.2-CLooG-multilib.eb

@@ -48,4 +48,4 @@ multilib = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCC/GCC-4.8.2-CLooG.eb

@@ -46,4 +46,4 @@ clooguseisl = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCC/GCC-4.8.2-multilib.eb

@@ -37,4 +37,4 @@ multilib = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCC/GCC-4.8.2.eb

@@ -34,4 +34,4 @@ languages = ['c', 'c++', 'fortran']
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCC/GCC-4.8.3-CLooG-multilib.eb

@@ -48,4 +48,4 @@ multilib = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCC/GCC-4.8.3.eb

@@ -34,7 +34,7 @@ languages = ['c', 'c++', 'fortran']
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
 
 opt = True
 

g/GCC/GCC-4.8.4-CLooG-multilib.eb

@@ -48,4 +48,4 @@ multilib = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCC/GCC-4.8.4-CLooG.eb

@@ -46,4 +46,4 @@ clooguseisl = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCC/GCC-4.8.4.eb

@@ -34,4 +34,4 @@ languages = ['c', 'c++', 'fortran']
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCC/GCC-4.8.5.eb

@@ -34,4 +34,4 @@ languages = ['c', 'c++', 'fortran']
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCC/GCC-4.9.0-CLooG-multilib.eb

@@ -8,7 +8,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.2'
+local_mpfr_version = '3.1.2'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -23,7 +23,7 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.2.tar.gz',
     'cloog-0.18.1.tar.gz',
     'isl-0.12.2.tar.bz2',
@@ -31,9 +31,9 @@ sources = [
 
 patches = [
     ('mpfr-%s-allpatches-20140630.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 checksums = [
     '9709b49ae0e904cbb0a6a1b62853b556',     # gcc-4.9.0.tar.bz2
@@ -57,4 +57,4 @@ multilib = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCC/GCC-4.9.0-CLooG.eb

@@ -8,7 +8,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.2'
+local_mpfr_version = '3.1.2'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -23,7 +23,7 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.2.tar.gz',
     'cloog-0.18.1.tar.gz',
     'isl-0.12.2.tar.bz2',
@@ -31,9 +31,9 @@ sources = [
 
 patches = [
     ('mpfr-%s-allpatches-20140630.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 checksums = [
     '9709b49ae0e904cbb0a6a1b62853b556',     # gcc-4.9.0.tar.bz2
@@ -55,4 +55,4 @@ clooguseisl = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCC/GCC-4.9.0.eb

@@ -7,7 +7,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.2'
+local_mpfr_version = '3.1.2'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -19,15 +19,15 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.2.tar.gz',
 ]
 
 patches = [
     ('mpfr-%s-allpatches-20140630.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 checksums = [
     '9709b49ae0e904cbb0a6a1b62853b556',     # gcc-4.9.0.tar.bz2
@@ -43,4 +43,4 @@ languages = ['c', 'c++', 'fortran']
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCC/GCC-4.9.1-CLooG-multilib.eb

@@ -8,7 +8,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.2'
+local_mpfr_version = '3.1.2'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -23,7 +23,7 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.2.tar.gz',
     'cloog-0.18.1.tar.gz',
     'isl-0.12.2.tar.bz2',
@@ -31,9 +31,9 @@ sources = [
 
 patches = [
     ('mpfr-%s-allpatches-20140630.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 checksums = [
     'fddf71348546af523353bd43d34919c1',     # gcc-4.9.1.tar.gz
@@ -57,4 +57,4 @@ multilib = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCC/GCC-4.9.1-CLooG.eb

@@ -8,7 +8,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.2'
+local_mpfr_version = '3.1.2'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -23,7 +23,7 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.2.tar.gz',
     'cloog-0.18.1.tar.gz',
     'isl-0.12.2.tar.bz2',
@@ -31,9 +31,9 @@ sources = [
 
 patches = [
     ('mpfr-%s-allpatches-20140630.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 checksums = [
     'fddf71348546af523353bd43d34919c1',     # gcc-4.9.1.tar.gz
@@ -55,4 +55,4 @@ clooguseisl = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCC/GCC-4.9.1.eb

@@ -7,7 +7,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.2'
+local_mpfr_version = '3.1.2'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -19,15 +19,15 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.2.tar.gz',
 ]
 
 patches = [
     ('mpfr-%s-allpatches-20140630.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 checksums = [
     'fddf71348546af523353bd43d34919c1',     # gcc-4.9.1.tar.gz
@@ -43,4 +43,4 @@ languages = ['c', 'c++', 'fortran']
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCC/GCC-4.9.2-CLooG-multilib.eb

@@ -8,7 +8,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.2'
+local_mpfr_version = '3.1.2'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -23,7 +23,7 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.2.tar.gz',
     'cloog-0.18.1.tar.gz',
     'isl-0.12.2.tar.bz2',
@@ -31,9 +31,9 @@ sources = [
 
 patches = [
     ('mpfr-%s-allpatches-20140630.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 checksums = [
     '4df8ee253b7f3863ad0b86359cd39c43',     # gcc-4.9.2.tar.bz2
@@ -57,4 +57,4 @@ multilib = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCC/GCC-4.9.2-CLooG.eb

@@ -8,7 +8,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.2'
+local_mpfr_version = '3.1.2'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -23,7 +23,7 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.2.tar.gz',
     'cloog-0.18.1.tar.gz',
     'isl-0.12.2.tar.bz2',
@@ -31,9 +31,9 @@ sources = [
 
 patches = [
     ('mpfr-%s-allpatches-20140630.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 checksums = [
     '4df8ee253b7f3863ad0b86359cd39c43',     # gcc-4.9.2.tar.bz2
@@ -55,4 +55,4 @@ clooguseisl = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCC/GCC-4.9.2-binutils-2.25.eb

@@ -10,7 +10,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.2'
+local_mpfr_version = '3.1.2'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -22,7 +22,7 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.2.tar.gz',
 ]
 
@@ -30,9 +30,9 @@ builddependencies = [('binutils', local_local_binutilsver)]
 
 patches = [
     ('mpfr-%s-allpatches-20140630.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 checksums = [
     '4df8ee253b7f3863ad0b86359cd39c43',     # gcc-4.9.2.tar.bz2
@@ -48,4 +48,4 @@ languages = ['c', 'c++', 'fortran']
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCC/GCC-4.9.2.eb

@@ -7,7 +7,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.2'
+local_mpfr_version = '3.1.2'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -19,15 +19,15 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.2.tar.gz',
 ]
 
 patches = [
     ('mpfr-%s-allpatches-20140630.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 checksums = [
     '4df8ee253b7f3863ad0b86359cd39c43',     # gcc-4.9.2.tar.bz2
@@ -43,4 +43,4 @@ languages = ['c', 'c++', 'fortran']
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCC/GCC-4.9.3-binutils-2.25.eb

@@ -10,7 +10,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.2'
+local_mpfr_version = '3.1.2'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -22,7 +22,7 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.2.tar.gz',
 ]
 
@@ -30,9 +30,9 @@ builddependencies = [('binutils', local_local_binutilsver)]
 
 patches = [
     ('mpfr-%s-allpatches-20141204.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 checksums = [
     '6f831b4d251872736e8e9cc09746f327',     # gcc-4.9.3.tar.bz2
@@ -60,4 +60,4 @@ modextravars = {
     'DEBUGFLAGS': '-O0 -g'
 }
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCC/GCC-4.9.3-experimental.eb

@@ -8,7 +8,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.2'
+local_mpfr_version = '3.1.2'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -20,15 +20,15 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.2.tar.gz',
 ]
 
 patches = [
     ('mpfr-%s-allpatches-20141204.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 checksums = [
     '6f831b4d251872736e8e9cc09746f327',     # gcc-4.9.3.tar.bz2
@@ -48,4 +48,4 @@ languages = ['c', 'c++', 'fortran']
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCC/GCC-4.9.3-tf.eb

@@ -8,7 +8,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.2'
+local_mpfr_version = '3.1.2'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -20,15 +20,15 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.2.tar.gz',
 ]
 
 patches = [
     ('mpfr-%s-allpatches-20141204.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 checksums = [
     '6f831b4d251872736e8e9cc09746f327',     # gcc-4.9.3.tar.bz2
@@ -48,4 +48,4 @@ languages = ['c', 'c++', 'fortran']
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCC/GCC-4.9.3.eb

@@ -7,7 +7,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.2'
+local_mpfr_version = '3.1.2'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -19,15 +19,15 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.2.tar.gz',
 ]
 
 patches = [
     ('mpfr-%s-allpatches-20141204.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 checksums = [
     '6f831b4d251872736e8e9cc09746f327',     # gcc-4.9.3.tar.bz2
@@ -43,4 +43,4 @@ languages = ['c', 'c++', 'fortran']
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCC/GCC-5.1.0-binutils-2.25.eb

@@ -10,7 +10,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.2'
+local_mpfr_version = '3.1.2'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -25,7 +25,7 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.3.tar.gz',
     'isl-0.14.tar.bz2',
 ]
@@ -37,9 +37,9 @@ builddependencies = [
 
 patches = [
     ('mpfr-%s-allpatches-20141204.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 checksums = [
     'd5525b1127d07d215960e6051c5da35e',     # gcc-5.1.0.tar.bz2
@@ -58,7 +58,7 @@ withisl = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
 
 # Salomon specific optimalization
 modextravars = {

g/GCC/GCC-5.1.0.eb

@@ -7,7 +7,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.2'
+local_mpfr_version = '3.1.2'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -22,16 +22,16 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.3.tar.gz',
     'isl-0.14.tar.bz2',
 ]
 
 patches = [
     ('mpfr-%s-allpatches-20141204.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 builddependencies = [('M4', '1.4.17')]
 
@@ -52,7 +52,7 @@ withisl = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
 
 # Salomon specific optimalization
 modextravars = {

g/GCC/GCC-5.2.0.eb

@@ -7,7 +7,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.3'
+local_mpfr_version = '3.1.3'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -22,16 +22,16 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.3.tar.gz',
     'isl-0.14.tar.bz2',
 ]
 
 patches = [
     ('mpfr-%s-allpatches-20150717.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 builddependencies = [('M4', '1.4.17')]
 
@@ -52,4 +52,4 @@ withisl = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCC/GCC-5.3.0-2.25.eb

@@ -24,4 +24,4 @@ altversion = 'GCCcore'
 
 # this bundle serves as a local_compiler-only toolchain, so it should be marked
 # as local_compiler (important for HMNS)
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCC/GCC-5.3.0-binutils-2.25.eb

@@ -10,7 +10,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.3'
+local_mpfr_version = '3.1.3'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -25,16 +25,16 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.1.0.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.3.tar.gz',
     'isl-0.15.tar.bz2',
 ]
 
 patches = [
     ('mpfr-%s-allpatches-20151029.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 builddependencies = [
     ('M4', '1.4.17'),
@@ -58,7 +58,7 @@ withisl = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
 
 # IT4I specific optimalization
 modextravars = {

g/GCC/GCC-5.3.0.eb

@@ -7,7 +7,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.3'
+local_mpfr_version = '3.1.3'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -22,16 +22,16 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.1.0.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.3.tar.gz',
     'isl-0.15.tar.bz2',
 ]
 
 patches = [
     ('mpfr-%s-allpatches-20151029.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 builddependencies = [('M4', '1.4.17')]
 
@@ -52,4 +52,4 @@ withisl = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCC/GCC-5.3.1-snapshot-20160419-2.25.eb

@@ -24,4 +24,4 @@ altversion = 'GCCcore'
 
 # this bundle serves as a local_compiler-only toolchain, so it should be marked
 # as local_compiler (important for HMNS)
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCC/GCC-7.3.0-2.30.eb

@@ -22,4 +22,4 @@ altroot = 'GCCcore'
 altversion = 'GCCcore'
 
 # this bundle serves as a local_compiler-only toolchain, so it should be marked as local_compiler (important for HMNS)
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCC/GCC-8.1.0-2.30.eb

@@ -22,4 +22,4 @@ dependencies = [
 altroot = 'GCCcore'
 altversion = 'GCCcore'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCC/GCC-8.3.0-2.32.eb

@@ -24,4 +24,4 @@ altroot = 'GCCcore'
 altversion = 'GCCcore'
 
 # this bundle serves as a local_compiler-only toolchain, so it should be marked as local_compiler (important for HMNS)
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCC/GCC-9.2.0-2.32.eb

@@ -24,4 +24,4 @@ altroot = 'GCCcore'
 altversion = 'GCCcore'
 
 # this bundle serves as a local_compiler-only toolchain, so it should be marked as local_compiler (important for HMNS)
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCCcore/GCCcore-4.9.2.eb

@@ -9,7 +9,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.2'
+local_mpfr_version = '3.1.2'
 gcc_name = 'GCC'
 
 source_urls = [
@@ -21,7 +21,7 @@ source_urls = [
 sources = [
     '%s-%s.tar.bz2' % (gcc_name.lower(), version),
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.2.tar.gz',
 ]
 
@@ -32,9 +32,9 @@ builddependencies = [
 
 patches = [
     ('mpfr-%s-allpatches-20141204.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 checksums = [
     '4df8ee253b7f3863ad0b86359cd39c43',     # gcc-4.9.2.tar.bz2
@@ -50,4 +50,4 @@ languages = ['c', 'c++', 'fortran']
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCCcore/GCCcore-4.9.3.eb

@@ -11,7 +11,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.2'
+local_mpfr_version = '3.1.2'
 
 source_urls = [
     'http://ftpmirror.gnu.org/gcc/gcc-%s' % version,  # GCC auto-resolving HTTP mirror
@@ -23,7 +23,7 @@ source_urls = [
 sources = [
     'gcc-%(version)s.tar.bz2',
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.2.tar.gz',
 ]
 
@@ -34,9 +34,9 @@ builddependencies = [
 
 patches = [
     ('mpfr-%s-allpatches-20141204.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 checksums = [
     '6f831b4d251872736e8e9cc09746f327',     # gcc-4.9.3.tar.bz2
@@ -52,7 +52,7 @@ languages = ['c', 'c++', 'fortran']
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
 
 # Salomon specific optimalization
 modextravars = {

g/GCCcore/GCCcore-5.3.0.eb

@@ -9,7 +9,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.3'
+local_mpfr_version = '3.1.3'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -24,16 +24,16 @@ source_urls = [
 sources = [
     'gcc-%(version)s.tar.bz2',
     'gmp-6.1.0.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.3.tar.gz',
     'isl-0.15.tar.bz2',
 ]
 
 patches = [
     ('mpfr-%s-allpatches-20151029.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 builddependencies = [
     ('binutils', '2.26'),
@@ -57,7 +57,7 @@ withisl = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
 
 # Salomon specific optimalization
 modextravars = {

g/GCCcore/GCCcore-5.3.1-snapshot-20160419.eb

@@ -11,7 +11,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.3'
+local_mpfr_version = '3.1.3'
 gcc_name = 'GCC'
 
 source_urls = [
@@ -24,7 +24,7 @@ source_urls = [
 sources = [
     'gcc-5-%s.tar.bz2' % snapshot,
     'gmp-6.1.0.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.3.tar.gz',
     'isl-0.15.tar.bz2',
 ]
@@ -33,9 +33,9 @@ builddependencies = [('binutils', '2.25')]
 
 patches = [
     ('mpfr-%s-allpatches-20151029.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 checksums = [
     'bf701ac49b63272cf77ba0f272214a38',     # gcc-5-20160419.tar.bz2
@@ -54,7 +54,7 @@ withisl = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
 
 # Salomon specific optimalization
 modextravars = {

g/GCCcore/GCCcore-5.4.0.eb

@@ -9,7 +9,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.4'
+local_mpfr_version = '3.1.4'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -25,16 +25,16 @@ source_urls = [
 sources = [
     'gcc-%(version)s.tar.bz2',
     'gmp-6.1.0.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.3.tar.gz',
     'isl-0.15.tar.bz2',
 ]
 
 patches = [
     ('mpfr-%s-allpatches-20160601.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 builddependencies = [
     ('binutils', '2.26'),
@@ -58,4 +58,4 @@ withisl = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCCcore/GCCcore-6.1.0.eb

@@ -9,7 +9,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.4'
+local_mpfr_version = '3.1.4'
 
 source_urls = [
     'http://ftpmirror.gnu.org/gmp',  # idem for GMP
@@ -26,7 +26,7 @@ source_urls = [
 sources = [
     'gcc-%(version)s.tar.bz2',
     'gmp-6.1.1.tar.bz2',
-    'mpfr-%s.tar.bz2' % mpfr_version,
+    'mpfr-%s.tar.bz2' % local_mpfr_version,
     'mpc-1.0.3.tar.gz',
     'isl-0.16.1.tar.bz2',
 ]
@@ -38,8 +38,8 @@ builddependencies = [
 
 patches = [
     ('mpfr-%s-allpatches-20160804.patch' %
-     mpfr_version, '../mpfr-%s' %
-     mpfr_version), ('%s-%s_fix-find-isl.patch' %
+     local_mpfr_version, '../mpfr-%s' %
+     local_mpfr_version), ('%s-%s_fix-find-isl.patch' %
                      (name, version)), ]
 
 checksums = [
@@ -54,4 +54,4 @@ languages = ['c', 'c++', 'fortran']
 
 withisl = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCCcore/GCCcore-6.2.0.eb

@@ -9,7 +9,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.4'
+local_mpfr_version = '3.1.4'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -25,7 +25,7 @@ source_urls = [
 sources = [
     'gcc-%(version)s.tar.bz2',
     'gmp-6.1.1.tar.bz2',
-    'mpfr-%s.tar.bz2' % mpfr_version,
+    'mpfr-%s.tar.bz2' % local_mpfr_version,
     'mpc-1.0.3.tar.gz',
     'isl-0.16.1.tar.bz2',
 ]
@@ -37,9 +37,9 @@ builddependencies = [
 
 patches = [
     ('mpfr-%s-allpatches-20160804.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version),
+     local_mpfr_version),
     '%(name)s-%(version)s-fix-find-isl.patch',
 ]
 
@@ -55,7 +55,7 @@ languages = ['c', 'c++', 'fortran']
 
 withisl = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
 
 # Salomon specific optimalization
 modextravars = {

g/GCCcore/GCCcore-6.3.0.eb

@@ -9,7 +9,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.5'
+local_mpfr_version = '3.1.5'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -30,7 +30,7 @@ source_urls = [
 sources = [
     'gcc-%(version)s.tar.bz2',
     'gmp-6.1.1.tar.bz2',
-    'mpfr-%s.tar.bz2' % mpfr_version,
+    'mpfr-%s.tar.bz2' % local_mpfr_version,
     'mpc-1.0.3.tar.gz',
     'isl-0.16.1.tar.bz2',
 ]
@@ -42,9 +42,9 @@ builddependencies = [
 
 patches = [
     ('mpfr-%s-allpatches-20161215.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version),
+     local_mpfr_version),
     'GCCcore-6.2.0-fix-find-isl.patch',
 ]
 
@@ -71,4 +71,4 @@ modextravars = {
 
 withisl = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCCcore/GCCcore-6.4.0.eb

@@ -13,7 +13,7 @@ description = """
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.5'
+local_mpfr_version = '3.1.5'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -29,7 +29,7 @@ source_urls = [
 sources = [
     'gcc-%(version)s.tar.gz',
     'gmp-6.1.2.tar.bz2',
-    'mpfr-%s.tar.bz2' % mpfr_version,
+    'mpfr-%s.tar.bz2' % local_mpfr_version,
     'mpc-1.0.3.tar.gz',
     'isl-0.16.1.tar.bz2',
 ]
@@ -41,9 +41,9 @@ builddependencies = [
 
 patches = [
     ('mpfr-%s-allpatches-20170606.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version),
+     local_mpfr_version),
     'GCCcore-6.2.0-fix-find-isl.patch',
 ]
 
@@ -74,4 +74,4 @@ modextravars = {
     'DEBUGFLAGS': '-O0 -g'
 }
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCCcore/GCCcore-7.1.0.eb

@@ -9,7 +9,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.5'
+local_mpfr_version = '3.1.5'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -25,7 +25,7 @@ source_urls = [
 sources = [
     'gcc-%(version)s.tar.bz2',
     'gmp-6.1.2.tar.bz2',
-    'mpfr-%s.tar.bz2' % mpfr_version,
+    'mpfr-%s.tar.bz2' % local_mpfr_version,
     'mpc-1.0.3.tar.gz',
     'isl-0.16.1.tar.bz2',
 ]
@@ -37,9 +37,9 @@ builddependencies = [
 
 patches = [
     ('mpfr-%s-allpatches-20161219.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version),
+     local_mpfr_version),
     'GCCcore-6.2.0-fix-find-isl.patch',
 ]
 
@@ -66,4 +66,4 @@ modextravars = {
     'DEBUGFLAGS': '-O0 -g'
 }
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCCcore/GCCcore-8.1.0.eb

@@ -11,7 +11,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '4.0.1'
+local_mpfr_version = '4.0.1'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -26,7 +26,7 @@ source_urls = [
 sources = [
     'gcc-%(version)s.tar.gz',
     'gmp-6.1.2.tar.bz2',
-    'mpfr-%s.tar.bz2' % mpfr_version,
+    'mpfr-%s.tar.bz2' % local_mpfr_version,
     'mpc-1.1.0.tar.gz',
     'isl-0.19.tar.bz2',
 ]
@@ -52,4 +52,4 @@ languages = ['c', 'c++', 'fortran']
 
 withisl = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCCcore/GCCcore-8.2.0.eb

@@ -9,7 +9,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '4.0.1'
+local_mpfr_version = '4.0.1'
 
 source_urls = [
     'http://ftpmirror.gnu.org/gnu/gcc/gcc-%(version)s',  # GCC auto-resolving HTTP mirror
@@ -24,7 +24,7 @@ source_urls = [
 sources = [
     'gcc-%(version)s.tar.gz',
     'gmp-6.1.2.tar.bz2',
-    'mpfr-%s.tar.bz2' % mpfr_version,
+    'mpfr-%s.tar.bz2' % local_mpfr_version,
     'mpc-1.1.0.tar.gz',
     'isl-0.20.tar.bz2',
 ]
@@ -51,4 +51,4 @@ languages = ['c', 'c++', 'fortran']
 
 withisl = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCCcore/GCCcore-8.3.0.eb

@@ -46,4 +46,4 @@ languages = ['c', 'c++', 'fortran']
 
 withisl = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/GCCcore/GCCcore-9.2.0.eb

@@ -11,7 +11,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-local_mpfr_version = '4.0.2'
+local_local_mpfr_version = '4.0.2'
 
 source_urls = [
     'https://ftpmirror.gnu.org/gnu/gcc/gcc-%(version)s',  # GCC auto-resolving HTTP mirror
@@ -25,7 +25,7 @@ source_urls = [
 sources = [
     'gcc-%(version)s.tar.gz',
     'gmp-6.1.2.tar.bz2',
-    'mpfr-%s.tar.bz2' % local_mpfr_version,
+    'mpfr-%s.tar.bz2' % local_local_mpfr_version,
     'mpc-1.1.0.tar.gz',
     'isl-0.21.tar.bz2',
 ]
@@ -48,4 +48,4 @@ languages = ['c', 'c++', 'fortran']
 
 withisl = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/Go/Go-1.11.1.eb

@@ -23,4 +23,4 @@ sanity_check_paths = {
 
 modextravars = {'GOROOT': '%(installdir)s'}
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/Go/Go-1.12.7.eb

@@ -23,4 +23,4 @@ sanity_check_paths = {
 
 modextravars = {'GOROOT': '%(installdir)s'}
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

g/Go/Go-1.13.1.eb

@@ -23,4 +23,4 @@ sanity_check_paths = {
 
 modextravars = {'GOROOT': '%(installdir)s'}
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

i/icc/icc-2017.1.132-GCC-6.3.0-2.27.eb

@@ -39,4 +39,4 @@ dontcreateinstalldir = 'True'
 
 license_file = '/apps/licenses/intel/license.lic'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

i/icc/icc-2017.2.174-GCC-6.3.0-2.27.eb

@@ -39,4 +39,4 @@ dontcreateinstalldir = 'True'
 
 license_file = '/apps/licenses/intel/license.lic'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

i/icc/icc-2017.4.196-GCC-6.3.0-2.27.eb

@@ -37,4 +37,4 @@ dontcreateinstalldir = 'True'
 
 license_file = '/apps/licenses/intel/license.lic'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

i/icc/icc-2017.5.239-GCC-6.3.0-2.27.eb

@@ -37,4 +37,4 @@ dontcreateinstalldir = 'True'
 
 license_file = '/apps/licenses/intel/license.lic'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

i/icc/icc-2017.7.259-GCC-6.3.0-2.27.eb

@@ -39,4 +39,4 @@ dontcreateinstalldir = 'True'
 
 license_file = '/apps/licenses/intel/license.lic'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

i/icc/icc-2018.1.163-GCC-6.3.0-2.27.eb

@@ -38,4 +38,4 @@ dontcreateinstalldir = 'True'
 
 license_file = '/apps/licenses/intel/license.lic'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

i/icc/icc-2018.3.222-GCC-6.3.0-2.27.eb

@@ -36,4 +36,4 @@ dontcreateinstalldir = 'True'
 
 license_file = '/apps/licenses/intel/license.lic'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

i/icc/icc-2018.3.222-GCC-8.1.0-2.30.eb

@@ -36,4 +36,4 @@ dontcreateinstalldir = 'True'
 
 license_file = '/apps/licenses/intel/license.lic'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

i/icc/icc-2018.5.274-GCC-6.3.0-2.27.eb

@@ -36,4 +36,4 @@ dontcreateinstalldir = 'True'
 
 license_file = '/apps/licenses/intel/license.lic'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

i/icc/icc-2019.2.187-GCC-6.3.0-2.27.eb

@@ -38,4 +38,4 @@ modextravars = {
 
 modluafooter = 'add_property("state","experimental")'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

i/icc/icc-2019.4.227-GCC-6.3.0-2.27.eb

@@ -38,4 +38,4 @@ modextravars = {
 
 modluafooter = 'add_property("state","experimental")'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

i/icc/icc-2019.4.227-GCC-8.3.0-2.32.eb

@@ -38,4 +38,4 @@ modextravars = {
 
 modluafooter = 'add_property("state","experimental")'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

i/icc/icc-2019.4.227-GCC-9.1.0-2.32.eb

@@ -38,4 +38,4 @@ modextravars = {
 
 modluafooter = 'add_property("state","experimental")'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

i/ifort/ifort-2017.1.132-GCC-6.3.0-2.27.eb

@@ -42,4 +42,4 @@ dontcreateinstalldir = 'True'
 
 license_file = '/apps/licenses/intel/license.lic'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

i/ifort/ifort-2017.4.196-GCC-6.4.0-2.28.eb

@@ -39,4 +39,4 @@ dontcreateinstalldir = 'True'
 
 license_file = '/apps/licenses/intel/license.lic'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

i/ifort/ifort-2017.5.239-GCC-6.3.0-2.27.eb

@@ -39,4 +39,4 @@ dontcreateinstalldir = 'True'
 
 license_file = '/apps/licenses/intel/license.lic'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

i/ifort/ifort-2017.7.259-GCC-6.3.0-2.27.eb

@@ -41,4 +41,4 @@ dontcreateinstalldir = 'True'
 
 license_file = '/apps/licenses/intel/license.lic'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

i/ifort/ifort-2018.1.163-GCC-6.3.0-2.27.eb

@@ -43,4 +43,4 @@ dontcreateinstalldir = 'True'
 
 license_file = '/apps/licenses/intel/license.lic'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

i/ifort/ifort-2018.3.222-GCC-6.3.0-2.27.eb

@@ -37,4 +37,4 @@ dontcreateinstalldir = 'True'
 
 license_file = '/apps/licenses/intel/license.lic'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

i/ifort/ifort-2018.3.222-GCC-8.1.0-2.30.eb

@@ -37,4 +37,4 @@ dontcreateinstalldir = 'True'
 
 license_file = '/apps/licenses/intel/license.lic'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

i/ifort/ifort-2018.5.274-GCC-6.3.0-2.27.eb

@@ -35,4 +35,4 @@ dontcreateinstalldir = 'True'
 
 license_file = '/apps/licenses/intel/license.lic'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

i/ifort/ifort-2019.2.187-GCC-6.3.0-2.27.eb

@@ -40,4 +40,4 @@ modextravars = {
 
 modluafooter = 'add_property("state","experimental")'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

i/ifort/ifort-2019.4.227-GCC-6.3.0-2.27.eb

@@ -40,4 +40,4 @@ modextravars = {
 
 modluafooter = 'add_property("state","experimental")'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

i/ifort/ifort-2019.4.227-GCC-8.3.0-2.32.eb

@@ -40,4 +40,4 @@ modextravars = {
 
 modluafooter = 'add_property("state","experimental")'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

i/ifort/ifort-2019.4.227-GCC-9.1.0-2.32.eb

@@ -40,4 +40,4 @@ modextravars = {
 
 modluafooter = 'add_property("state","experimental")'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

i/ispc/ispc-1.9.1.eb

@@ -24,4 +24,4 @@ sanity_check_paths = {
 
 modextrapaths = {'PATH': ''}
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

l/LLVM/LLVM-3.8.1-intel-2017a.eb

@@ -39,4 +39,4 @@ sanity_check_paths = {
 
 separate_build_dir = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

l/LLVM/LLVM-3.9.0-intel-2017.00.eb

@@ -39,4 +39,4 @@ sanity_check_paths = {
 
 separate_build_dir = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

l/LLVM/LLVM-4.0.0-GCC-6.3.0-2.27.eb

@@ -37,4 +37,4 @@ sanity_check_paths = {
 
 separate_build_dir = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

l/LLVM/LLVM-5.0.0-GCC-6.3.0-2.27.eb

@@ -37,4 +37,4 @@ sanity_check_paths = {
 
 separate_build_dir = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

l/LLVM/LLVM-6.0.0-Py-2.7.eb

@@ -36,4 +36,4 @@ sanity_check_paths = {
 
 separate_build_dir = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

l/LLVM/LLVM-6.0.1-GCC-6.3.0-2.27.eb

@@ -39,4 +39,4 @@ sanity_check_paths = {
 
 separate_build_dir = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

l/LLVM/LLVM-6.0.1.eb

@@ -42,4 +42,4 @@ sanity_check_paths = {
 
 separate_build_dir = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

l/LLVM/LLVM-7.0.0-intel-2017c.eb

@@ -42,4 +42,4 @@ sanity_check_paths = {
 
 separate_build_dir = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

l/LLVM/LLVM-7.0.0.eb

@@ -42,4 +42,4 @@ sanity_check_paths = {
 
 separate_build_dir = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'

o/OpenCoarrays/OpenCoarrays-1.4.0.eb

@@ -25,4 +25,4 @@ sanity_check_paths = {
     'dirs': ['bin', 'lib'],
 }
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'