diff --git a/Golden_Repo/m/MUMPS/MUMPS-5.3.4-gpsmkl-2020.eb b/Golden_Repo/m/MUMPS/MUMPS-5.3.4-gpsmkl-2020.eb
index 5e94590dd08c6bf4dfcb0b72c6f3a563428c469a..bfd8d4528098aa1691b22872dd04f658284e2e69 100644
--- a/Golden_Repo/m/MUMPS/MUMPS-5.3.4-gpsmkl-2020.eb
+++ b/Golden_Repo/m/MUMPS/MUMPS-5.3.4-gpsmkl-2020.eb
@@ -25,11 +25,10 @@ source_urls = ['http://mumps.enseeiht.fr/']
 sources = ['%(name)s_%(version)s.tar.gz']
 
 patches = [
-    'MUMPS-5.1.2_examples_mkl.patch',
-    'MUMPS-5.2.1_shared-pord.patch',    # builds the shared libs of PORD
+    'MUMPS-%(version)s_examples_mkl.patch',
+    'MUMPS-%(version)s_shared-pord.patch',    # builds the shared libs of PORD
 ]
 
-
 dependencies = [
     ('SCOTCH', '6.1.0'),
     ('ParMETIS', '4.0.3'),
@@ -37,6 +36,8 @@ dependencies = [
 
 buildopts = 'all'
 
+parallel = 1
+
 modextravars = {
     'MUMPS_ROOT': '%(installdir)s',
     'MUMPSROOT': '%(installdir)s',
@@ -44,15 +45,16 @@ modextravars = {
     'MUMPS_LIB': '%(installdir)s/lib'
 }
 
-parallel = 1
-
 postinstallcmds = [
     "cp -r %(builddir)s/MUMPS_%(version)s/examples %(installdir)s/examples",
     "rm %(installdir)s/examples/*.o",
-    "mv %(installdir)s/examples/Makefile_built_gpsmkl %(installdir)s/examples/Makefile",
-    "rm %(installdir)s/examples/Makefile_built_gpsmkl.orig",
+    "mv %(installdir)s/examples/Makefile_installed_gnu %(installdir)s/examples/Makefile",
+    "rm %(installdir)s/examples/Makefile_installed*.orig",
+    "rm %(installdir)s/examples/Makefile_installed",
     "rm %(installdir)s/examples/?simpletest",
+    "rm %(installdir)s/examples/?simpletest_save_restore",
     "rm %(installdir)s/examples/c_example",
+    "rm %(installdir)s/examples/c_example_save_restore",
     "chmod 644 %(installdir)s/examples/*",
 ]
 
diff --git a/Golden_Repo/m/MUMPS/MUMPS-5.3.4-intel-2020.eb b/Golden_Repo/m/MUMPS/MUMPS-5.3.4-intel-2020.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fee34f72eecfe01596eb3672a6a29afaea7de7d0
--- /dev/null
+++ b/Golden_Repo/m/MUMPS/MUMPS-5.3.4-intel-2020.eb
@@ -0,0 +1,61 @@
+name = 'MUMPS'
+version = '5.3.4'
+
+homepage = 'http://graal.ens-lyon.fr/MUMPS/'
+description = """MUMPS, A parallel sparse direct solver has been installed as module in $EBROOTMUMPS
+It contains all precisions and can use SCOTCH as well as ParMETIS.
+"""
+
+usage = """There ara four MUMPS libraries for the four different precisions:
+
+libsmumps.a for single precision real
+libdmumps.a for double precision real
+libcmumps.a for single precision complex
+libzmumps.a for double precision complex.
+"""
+
+examples = """Examples can be found in $EBROOTMUMPS/examples."""
+
+site_contacts = 'I. Gutheil (i.gutheil@fz-juelich.de)'
+
+toolchain = {'name': 'intel', 'version': '2020'}
+toolchainopts = {'pic': True, 'usempi': True, 'openmp': True}
+
+source_urls = ['http://mumps.enseeiht.fr/']
+sources = ['%(name)s_%(version)s.tar.gz']
+
+patches = [
+    'MUMPS-%(version)s_examples_mkl.patch',
+    'MUMPS-%(version)s_shared-pord.patch',    # builds the shared libs of PORD
+]
+
+dependencies = [
+    ('SCOTCH', '6.1.0'),
+    ('ParMETIS', '4.0.3'),
+]
+
+buildopts = 'all'
+
+parallel = 1
+
+modextravars = {
+    'MUMPS_ROOT': '%(installdir)s',
+    'MUMPSROOT': '%(installdir)s',
+    'MUMPS_INCLUDE': '%(installdir)s/include',
+    'MUMPS_LIB': '%(installdir)s/lib'
+}
+
+postinstallcmds = [
+    "cp -r %(builddir)s/MUMPS_%(version)s/examples %(installdir)s/examples",
+    "rm %(installdir)s/examples/*.o",
+    "mv %(installdir)s/examples/Makefile_installed %(installdir)s/examples/Makefile",
+    "rm %(installdir)s/examples/Makefile_installed*.orig",
+    "rm %(installdir)s/examples/Makefile_installed_gnu",
+    "rm %(installdir)s/examples/?simpletest",
+    "rm %(installdir)s/examples/?simpletest_save_restore",
+    "rm %(installdir)s/examples/c_example",
+    "rm %(installdir)s/examples/c_example_save_restore",
+    "chmod 644 %(installdir)s/examples/*",
+]
+
+moduleclass = 'math'
diff --git a/Golden_Repo/m/MUMPS/MUMPS-5.3.4-intel-para-2020.eb b/Golden_Repo/m/MUMPS/MUMPS-5.3.4-intel-para-2020.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c77aef1b81697db4f32b64f6691e89a8e1c4f0ee
--- /dev/null
+++ b/Golden_Repo/m/MUMPS/MUMPS-5.3.4-intel-para-2020.eb
@@ -0,0 +1,61 @@
+name = 'MUMPS'
+version = '5.3.4'
+
+homepage = 'http://graal.ens-lyon.fr/MUMPS/'
+description = """MUMPS, A parallel sparse direct solver has been installed as module in $EBROOTMUMPS
+It contains all precisions and can use SCOTCH as well as ParMETIS.
+"""
+
+usage = """There ara four MUMPS libraries for the four different precisions:
+
+libsmumps.a for single precision real
+libdmumps.a for double precision real
+libcmumps.a for single precision complex
+libzmumps.a for double precision complex.
+"""
+
+examples = """Examples can be found in $EBROOTMUMPS/examples."""
+
+site_contacts = 'I. Gutheil (i.gutheil@fz-juelich.de)'
+
+toolchain = {'name': 'intel-para', 'version': '2020'}
+toolchainopts = {'pic': True, 'usempi': True, 'openmp': True}
+
+source_urls = ['http://mumps.enseeiht.fr/']
+sources = ['%(name)s_%(version)s.tar.gz']
+
+patches = [
+    'MUMPS-%(version)s_examples_mkl.patch',
+    'MUMPS-%(version)s_shared-pord.patch',    # builds the shared libs of PORD
+]
+
+dependencies = [
+    ('SCOTCH', '6.1.0'),
+    ('ParMETIS', '4.0.3'),
+]
+
+buildopts = 'all'
+
+parallel = 1
+
+modextravars = {
+    'MUMPS_ROOT': '%(installdir)s',
+    'MUMPSROOT': '%(installdir)s',
+    'MUMPS_INCLUDE': '%(installdir)s/include',
+    'MUMPS_LIB': '%(installdir)s/lib'
+}
+
+postinstallcmds = [
+    "cp -r %(builddir)s/MUMPS_%(version)s/examples %(installdir)s/examples",
+    "rm %(installdir)s/examples/*.o",
+    "mv %(installdir)s/examples/Makefile_installed %(installdir)s/examples/Makefile",
+    "rm %(installdir)s/examples/Makefile_installed*.orig",
+    "rm %(installdir)s/examples/Makefile_installed_gnu",
+    "rm %(installdir)s/examples/?simpletest",
+    "rm %(installdir)s/examples/?simpletest_save_restore",
+    "rm %(installdir)s/examples/c_example",
+    "rm %(installdir)s/examples/c_example_save_restore",
+    "chmod 644 %(installdir)s/examples/*",
+]
+
+moduleclass = 'math'
diff --git a/Golden_Repo/m/MUMPS/MUMPS-5.3.4_examples_mkl.patch b/Golden_Repo/m/MUMPS/MUMPS-5.3.4_examples_mkl.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ad19bf66bbdf1bf658a64fd4954dae63b8789bd5
--- /dev/null
+++ b/Golden_Repo/m/MUMPS/MUMPS-5.3.4_examples_mkl.patch
@@ -0,0 +1,252 @@
+--- MUMPS_5.3.4/VERSION	2020-09-28 09:16:41.000000000 +0200
++++ MUMPS_5.3.4_ok/VERSION	2020-10-20 10:26:15.553979000 +0200
+@@ -1,2 +1,3 @@
+ MUMPS 5.3.4
+ Mon Sep 28 07:16:41 UTC 2020
++
+--- MUMPS_5.3.4/examples/Makefile_installed	1970-01-01 01:00:00.000000000 +0100
++++ MUMPS_5.3.4_ok/examples/Makefile_installed	2020-10-20 14:54:57.933120000 +0200
+@@ -0,0 +1,120 @@
++#
++#  This file is part of MUMPS 5.3.4, released
++#  on Mon Sep 28 07:16:41 UTC 2020
++#
++CC = mpicc
++FC = mpif77
++FL = mpif77
++
++LIBBLAS = -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lpthread
++SCALAP=-lmkl_scalapack_lp64 -lmkl_blacs_intelmpi_lp64
++LIBPAR = $(SCALAP) $(LIBBLAS)
++
++#Preprocessor defs for calling Fortran from C (-DAdd_ or -DAdd__ or -DUPPER)
++CDEFS   = -DAdd_
++
++#Begin Optimized options
++OPTF    = -O -nofor_main -qopenmp -Dintel_ -DALLOW_NON_INIT
++OPTL    = -O -nofor_main -qopenmp
++OPTC    = -O -qopenmp
++#End Optimized options
++
++
++default: d
++
++.PHONY: default all s d c z multi clean
++.SECONDEXPANSION:
++
++all:	c z s d multi
++
++c:	csimpletest csimpletest_save_restore
++z:	zsimpletest zsimpletest_save_restore
++s:	ssimpletest ssimpletest_save_restore
++d:	dsimpletest dsimpletest_save_restore c_example_save_restore c_example
++multi:	multiple_arithmetics_example
++
++
++SCOTCHDIR=$(EBROOTSCOTCH)
++LMETISDIR=$(EBROOTPARMETIS)
++LMETIS=-L$(EBROOTPARMETIS)/lib -lparmetis -lmetis
++LSCOTCH=-L$(EBROOTSCOTCH)/lib -lptesmumps -lptscotch -lptscotcherr -lesmumps -lscotch -lscotcherr
++LPORD=-L$(MUMPS_LIB) -lpord
++
++LIBMUMPS_COMMON = -L$(MUMPS_LIB)/ -lmumps_common
++
++LORDERINGS=$(LMETIS) $(LPORD) $(LSCOTCH)
++
++LIBSMUMPS = -L$(MUMPS_LIB) -lsmumps $(LIBMUMPS_COMMON)
++
++ssimpletest:   $$@.o
++	$(FL) -o $@ $(OPTL) ssimpletest.o  $(LIBSMUMPS) $(LORDERINGS) $(LIBPAR)
++
++
++LIBDMUMPS = -L$(MUMPS_LIB) -ldmumps $(LIBMUMPS_COMMON)
++
++dsimpletest:  $$@.o 
++	$(FL) -o $@ $(OPTL) dsimpletest.o  $(LIBDMUMPS) $(LORDERINGS) $(LIBPAR)
++
++
++LIBCMUMPS = -L$(MUMPS_LIB) -lcmumps$(PLAT)$(LIBEXT) $(LIBMUMPS_COMMON)
++
++csimpletest:  $$@.o
++	$(FL) -o $@ $(OPTL) csimpletest.o  $(LIBCMUMPS) $(LORDERINGS) $(LIBPAR)
++
++
++LIBZMUMPS = -L$(MUMPS_LIB) -lzmumps$(PLAT)$(LIBEXT) $(LIBMUMPS_COMMON)
++
++zsimpletest:  $$@.o
++	$(FL) -o $@ $(OPTL) zsimpletest.o  $(LIBZMUMPS) $(LORDERINGS) $(LIBPAR)
++
++c_example:    $$@.o
++	$(FL) -o $@ $(OPTL) $@.o $(LIBDMUMPS) $(LORDERINGS) $(LIBPAR)
++
++
++multiple_arithmetics_example:	 $$@.o
++	$(FL) -o $@ $(OPTL) $@.o $(LIBSMUMPS) $(LIBDMUMPS) $(LIBCMUMPS) $(LIBZMUMPS) $(LORDERINGS) $(LIBPAR)
++
++ssimpletest_save_restore:    $$@.o
++	$(FL) -o $@ $(OPTL) ssimpletest_save_restore.o  $(LIBSMUMPS) $(LORDERINGS) $(LIBPAR)
++
++dsimpletest_save_restore:   $$@.o 
++	$(FL) -o $@ $(OPTL) dsimpletest_save_restore.o  $(LIBDMUMPS) $(LORDERINGS) $(LIBPAR)
++
++csimpletest_save_restore:   $$@.o
++	$(FL) -o $@ $(OPTL) csimpletest_save_restore.o  $(LIBCMUMPS) $(LORDERINGS) $(LIBPAR)
++
++zsimpletest_save_restore:   $$@.o
++	$(FL) -o $@ $(OPTL) zsimpletest_save_restore.o  $(LIBZMUMPS) $(LORDERINGS) $(LIBPAR)
++
++c_example_save_restore:	 $$@.o
++	$(FL) -o $@ $(OPTL) $@.o $(LIBDMUMPS) $(LORDERINGS) $(LIBPAR)
++
++.SUFFIXES: .c .F .o
++.F.o:
++	$(FC) $(OPTF) -I. -I$(MUMPS_INCLUDE) -c $*.F
++.c.o:
++	$(CC) $(OPTC) $(CDEFS) -I. -I$(MUMPS_INCLUDE) -c $*.c
++
++
++$(MUMPS_LIB)/libsmumps$(PLAT)$(LIBEXT):
++	@echo 'Error: you should build the library' $@ 'first'
++	exit 1
++
++$(MUMPS_LIB)/libdmumps$(PLAT)$(LIBEXT):
++	@echo 'Error: you should build the library' $@ 'first'
++	exit 1
++
++$(MUMPS_LIB)/libcmumps$(PLAT)$(LIBEXT):
++	@echo 'Error: you should build the library' $@ 'first'
++	exit 1
++
++$(MUMPS_LIB)/libzmumps$(PLAT)$(LIBEXT):
++	@echo 'Error: you should build the library' $@ 'first'
++	exit 1
++
++$(LIBMUMPS_COMMON):
++	@echo 'Error: you should build the library' $@ 'first'
++	exit 1
++
++clean:
++	$(RM) *.o [sdcz]simpletest c_example multiple_arithmetics_example ssimpletest_save_restore dsimpletest_save_restore csimpletest_save_restore zsimpletest_save_restore c_example_save_restore
+--- MUMPS_5.3.4/examples/Makefile_installed_gnu	1970-01-01 01:00:00.000000000 +0100
++++ MUMPS_5.3.4_ok/examples/Makefile_installed_gnu	2020-10-20 14:55:13.846779000 +0200
+@@ -0,0 +1,120 @@
++#
++#  This file is part of MUMPS 5.3.4, released
++#  on Mon Sep 28 07:16:41 UTC 2020
++#
++CC = mpicc
++FC = mpif77
++FL = mpif77
++
++LIBBLAS = -lmkl_gf_lp64 -lmkl_gnu_thread -lmkl_core -lgomp -lpthread -lm -ldl
++SCALAP=-lmkl_scalapack_lp64 -lmkl_blacs_intelmpi_lp64
++LIBPAR = $(SCALAP) $(LIBBLAS)
++
++#Preprocessor defs for calling Fortran from C (-DAdd_ or -DAdd__ or -DUPPER)
++CDEFS   = -DAdd_
++
++#Begin Optimized options
++OPTF    = -O -nofor_main -qopenmp -Dintel_ -DALLOW_NON_INIT
++OPTL    = -O -nofor_main -qopenmp
++OPTC    = -O -qopenmp
++#End Optimized options
++
++
++default: d
++
++.PHONY: default all s d c z multi clean
++.SECONDEXPANSION:
++
++all:	c z s d multi
++
++c:	csimpletest csimpletest_save_restore
++z:	zsimpletest zsimpletest_save_restore
++s:	ssimpletest ssimpletest_save_restore
++d:	dsimpletest dsimpletest_save_restore c_example_save_restore c_example
++multi:	multiple_arithmetics_example
++
++
++SCOTCHDIR=$(EBROOTSCOTCH)
++LMETISDIR=$(EBROOTPARMETIS)
++LMETIS=-L$(EBROOTPARMETIS)/lib -lparmetis -lmetis
++LSCOTCH=-L$(EBROOTSCOTCH)/lib -lptesmumps -lptscotch -lptscotcherr -lesmumps -lscotch -lscotcherr
++LPORD=-L$(MUMPS_LIB) -lpord
++
++LIBMUMPS_COMMON = -L$(MUMPS_LIB)/ -lmumps_common
++
++LORDERINGS=$(LMETIS) $(LPORD) $(LSCOTCH)
++
++LIBSMUMPS = -L$(MUMPS_LIB) -lsmumps $(LIBMUMPS_COMMON)
++
++ssimpletest:   $$@.o
++	$(FL) -o $@ $(OPTL) ssimpletest.o  $(LIBSMUMPS) $(LORDERINGS) $(LIBPAR)
++
++
++LIBDMUMPS = -L$(MUMPS_LIB) -ldmumps $(LIBMUMPS_COMMON)
++
++dsimpletest:  $$@.o 
++	$(FL) -o $@ $(OPTL) dsimpletest.o  $(LIBDMUMPS) $(LORDERINGS) $(LIBPAR)
++
++
++LIBCMUMPS = -L$(MUMPS_LIB) -lcmumps$(PLAT)$(LIBEXT) $(LIBMUMPS_COMMON)
++
++csimpletest:  $$@.o
++	$(FL) -o $@ $(OPTL) csimpletest.o  $(LIBCMUMPS) $(LORDERINGS) $(LIBPAR)
++
++
++LIBZMUMPS = -L$(MUMPS_LIB) -lzmumps$(PLAT)$(LIBEXT) $(LIBMUMPS_COMMON)
++
++zsimpletest:  $$@.o
++	$(FL) -o $@ $(OPTL) zsimpletest.o  $(LIBZMUMPS) $(LORDERINGS) $(LIBPAR)
++
++c_example:    $$@.o
++	$(FL) -o $@ $(OPTL) $@.o $(LIBDMUMPS) $(LORDERINGS) $(LIBPAR)
++
++
++multiple_arithmetics_example:	 $$@.o
++	$(FL) -o $@ $(OPTL) $@.o $(LIBSMUMPS) $(LIBDMUMPS) $(LIBCMUMPS) $(LIBZMUMPS) $(LORDERINGS) $(LIBPAR)
++
++ssimpletest_save_restore:    $$@.o
++	$(FL) -o $@ $(OPTL) ssimpletest_save_restore.o  $(LIBSMUMPS) $(LORDERINGS) $(LIBPAR)
++
++dsimpletest_save_restore:   $$@.o 
++	$(FL) -o $@ $(OPTL) dsimpletest_save_restore.o  $(LIBDMUMPS) $(LORDERINGS) $(LIBPAR)
++
++csimpletest_save_restore:   $$@.o
++	$(FL) -o $@ $(OPTL) csimpletest_save_restore.o  $(LIBCMUMPS) $(LORDERINGS) $(LIBPAR)
++
++zsimpletest_save_restore:   $$@.o
++	$(FL) -o $@ $(OPTL) zsimpletest_save_restore.o  $(LIBZMUMPS) $(LORDERINGS) $(LIBPAR)
++
++c_example_save_restore:	 $$@.o
++	$(FL) -o $@ $(OPTL) $@.o $(LIBDMUMPS) $(LORDERINGS) $(LIBPAR)
++
++.SUFFIXES: .c .F .o
++.F.o:
++	$(FC) $(OPTF) -I. -I$(MUMPS_INCLUDE) -c $*.F
++.c.o:
++	$(CC) $(OPTC) $(CDEFS) -I. -I$(MUMPS_INCLUDE) -c $*.c
++
++
++$(MUMPS_LIB)/libsmumps$(PLAT)$(LIBEXT):
++	@echo 'Error: you should build the library' $@ 'first'
++	exit 1
++
++$(MUMPS_LIB)/libdmumps$(PLAT)$(LIBEXT):
++	@echo 'Error: you should build the library' $@ 'first'
++	exit 1
++
++$(MUMPS_LIB)/libcmumps$(PLAT)$(LIBEXT):
++	@echo 'Error: you should build the library' $@ 'first'
++	exit 1
++
++$(MUMPS_LIB)/libzmumps$(PLAT)$(LIBEXT):
++	@echo 'Error: you should build the library' $@ 'first'
++	exit 1
++
++$(LIBMUMPS_COMMON):
++	@echo 'Error: you should build the library' $@ 'first'
++	exit 1
++
++clean:
++	$(RM) *.o [sdcz]simpletest c_example multiple_arithmetics_example ssimpletest_save_restore dsimpletest_save_restore csimpletest_save_restore zsimpletest_save_restore c_example_save_restore
diff --git a/Golden_Repo/m/MUMPS/MUMPS-5.3.4_shared-pord.patch b/Golden_Repo/m/MUMPS/MUMPS-5.3.4_shared-pord.patch
new file mode 100644
index 0000000000000000000000000000000000000000..10edc5b7eb89aeb64f824c3add960bf8f7ceaecb
--- /dev/null
+++ b/Golden_Repo/m/MUMPS/MUMPS-5.3.4_shared-pord.patch
@@ -0,0 +1,80 @@
+source: https://src.fedoraproject.org/rpms/MUMPS/blob/master/f/MUMPS-shared-pord.patch
+author: Antonio Trande (sagitter@fedoraproject.org)
+Create static and shared versions of the PORD library.
+
+Index: mumps/PORD/lib/Makefile
+===================================================================
+--- mumps.orig/PORD/lib/Makefile
++++ mumps/PORD/lib/Makefile
+@@ -9,7 +9,7 @@
+ 
+ INCLUDES = -I../include
+ 
+-COPTIONS = $(INCLUDES) $(CFLAGS) $(OPTFLAGS)
++COPTIONS = $(INCLUDES) $(CFLAGS) $(OPTFLAGS) -fPIC
+ 
+ OBJS = graph.o gbipart.o gbisect.o ddcreate.o ddbisect.o nestdiss.o \
+        multisector.o gelim.o bucket.o tree.o \
+@@ -24,12 +24,16 @@
+ .c.o:
+ 	$(CC) $(COPTIONS) -c $*.c $(OUTC)$*.o
+ 
+-libpord$(LIBEXT):$(OBJS)
+-	$(AR)$@ $(OBJS)
++libpord$(PLAT).a:$(OBJS)
++	$(AR) $@ $(OBJS)
+ 	$(RANLIB) $@
+ 
++libpord$(PLAT).so: $(OBJS)
++	$(CC) -shared $(OBJS) -Wl,-soname,libpord$(PLAT)-$(SONAME_VERSION).so -o libpord$(PLAT)-$(SONAME_VERSION).so $(OPTL) -Wl,-z,defs
++	ln -fs libpord$(PLAT)-$(SONAME_VERSION).so $@
++
+ clean:
+ 	rm -f *.o
+ 
+ realclean:
+-	rm -f *.o libpord.a
++	rm -f *.o libpord*.a *.so
+Index: mumps/Makefile
+===================================================================
+--- mumps.orig/Makefile
++++ mumps/Makefile
+@@ -54,7 +54,7 @@
+ multi_example:	s d c z
+ 	(cd examples ; $(MAKE) multi)
+ 
+-requiredobj: Makefile.inc $(LIBSEQNEEDED) $(libdir)/libpord$(PLAT)$(LIBEXT)
++requiredobj: Makefile.inc $(LIBSEQNEEDED) $(libdir)/libpord$(PLAT).a $(libdir)/libpord$(PLAT).so
+ 
+ # dummy MPI library (sequential version)
+ 
+@@ -62,19 +62,26 @@
+ 	(cd libseq; $(MAKE))
+ 
+ # Build the libpord.a library and copy it into $(topdir)/lib
+-$(libdir)/libpord$(PLAT)$(LIBEXT):
++$(libdir)/libpord$(PLAT).a:
+ 	if [ "$(LPORDDIR)" != "" ] ; then \
+ 	  cd $(LPORDDIR); \
+ 	  $(MAKE) CC="$(CC)" CFLAGS="$(OPTC)" AR="$(AR)" RANLIB="$(RANLIB)" OUTC="$(OUTC)" LIBEXT=$(LIBEXT); \
+ 	fi;
+ 	if [ "$(LPORDDIR)" != "" ] ; then \
+-	  cp $(LPORDDIR)/libpord$(LIBEXT) $@; \
++	  cp $(LPORDDIR)/libpord$(PLAT).a $@; \
+ 	fi;
+ 
++$(libdir)/libpord$(PLAT).so:
++	if [ "$(LPORDDIR)" != "" ] ; then \
++	cd $(LPORDDIR); make CC="$(CC)" CFLAGS="$(OPTC)" AR="$(AR)" ARFUNCT= RANLIB="$(RANLIB)" libpord$(PLAT).so; fi;
++	if [ "$(LPORDDIR)" != "" ] ; then \
++	cp -a $(LPORDDIR)/libpord*.so lib/; fi;
++
++
+ clean:
+ 	(cd src; $(MAKE) clean)
+ 	(cd examples; $(MAKE) clean)
+-	(cd $(libdir); $(RM) *$(PLAT)$(LIBEXT))
++	(cd $(libdir); $(RM) *$(PLAT).a *$(PLAT).so)
+ 	(cd libseq; $(MAKE) clean)
+ 	if [ "$(LPORDDIR)" != "" ] ; then \
+ 	  cd $(LPORDDIR); $(MAKE) realclean; \
diff --git a/Golden_Repo/p/PETSc/PETSc-3.14-gpsmkl-2020.eb b/Golden_Repo/p/PETSc/PETSc-3.14-gpsmkl-2020.eb
new file mode 100644
index 0000000000000000000000000000000000000000..907c2b9a49a7cca8960b7224c92bb450b930f1b1
--- /dev/null
+++ b/Golden_Repo/p/PETSc/PETSc-3.14-gpsmkl-2020.eb
@@ -0,0 +1,56 @@
+name = "PETSc"
+version = "3.14"
+
+homepage = 'http://www.mcs.anl.gov/petsc'
+description = """PETSc, pronounced PET-see (the S is silent), is a suite
+of data structures and routines for the scalable (parallel) solution
+of scientific applications modeled by partial differential equations.
+
+This version is configured with several downloads of other libraries,
+with --with-large-file-io and no debugging. It is a C and Fortran
+version with default 4-Byte integer values.
+
+For more information see $PETSC_DIR/$PETSC_ARCH/lib/petsc/conf/configure.log.
+"""
+
+site_contacts = 'I. Gutheil (i.gutheil@fz-juelich.de)'
+
+toolchain = {'name': 'gpsmkl', 'version': '2020'}
+
+toolchainopts = {'usempi': True}
+
+source_urls = ['http://ftp.mcs.anl.gov/pub/petsc/release-snapshots']
+sources = ['petsc-lite-%s.tar.gz' % version]
+
+builddependencies = [
+    ('CMake', '3.18.0')
+]
+
+download_deps = [
+    'triangle',
+]
+
+download_deps_static = [
+    'hypre',
+    'metis',
+    'parmetis',
+    'spooles',
+    'superlu',
+    'superlu_dist',
+    'mumps',
+    'spai',
+    'chaco',
+    'sundials',
+    'parms',
+    'hdf5',
+]
+
+configopts = '--with-large-file-io --with-cxx-dialect=C++11 --with-pic=0 -fPIC'
+
+postinstallcmds = [
+    'cp %(builddir)s/petsc-%(version)s.0/src/mat/impls/aij/mpi/mpiaij.h %(installdir)s/include/petsc/private/',
+    'cp %(builddir)s/petsc-%(version)s.0/src/mat/impls/aij/seq/aij.h %(installdir)s/include/petsc/private/',
+    'cp %(builddir)s/petsc-%(version)s.0/src/mat/impls/dense/seq/dense.h %(installdir)s/include/petsc/private/'
+]
+
+moduleclass = 'numlib'
diff --git a/Golden_Repo/p/PETSc/PETSc-3.14-intel-2020.eb b/Golden_Repo/p/PETSc/PETSc-3.14-intel-2020.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0084920dbfb6ba5074efcf6be183bf8876ca1360
--- /dev/null
+++ b/Golden_Repo/p/PETSc/PETSc-3.14-intel-2020.eb
@@ -0,0 +1,56 @@
+name = "PETSc"
+version = "3.14"
+
+homepage = 'http://www.mcs.anl.gov/petsc'
+description = """PETSc, pronounced PET-see (the S is silent), is a suite
+of data structures and routines for the scalable (parallel) solution
+of scientific applications modeled by partial differential equations.
+
+This version is configured with several downloads of other libraries,
+with --with-large-file-io and no debugging. It is a C and Fortran
+version with default 4-Byte integer values.
+
+For more information see $PETSC_DIR/$PETSC_ARCH/lib/petsc/conf/configure.log.
+"""
+
+site_contacts = 'I. Gutheil (i.gutheil@fz-juelich.de)'
+
+toolchain = {'name': 'intel', 'version': '2020'}
+
+toolchainopts = {'usempi': True}
+
+source_urls = ['http://ftp.mcs.anl.gov/pub/petsc/release-snapshots']
+sources = ['petsc-lite-%s.tar.gz' % version]
+
+builddependencies = [
+    ('CMake', '3.18.0')
+]
+
+download_deps = [
+    'triangle',
+]
+
+download_deps_static = [
+    'hypre',
+    'metis',
+    'parmetis',
+    'spooles',
+    'superlu',
+    'superlu_dist',
+    'mumps',
+    'spai',
+    'chaco',
+    'sundials',
+    'parms',
+    'hdf5',
+]
+
+configopts = '--with-large-file-io --with-cxx-dialect=C++11 --with-pic=0 -fPIC'
+
+postinstallcmds = [
+    'cp %(builddir)s/petsc-%(version)s.0/src/mat/impls/aij/mpi/mpiaij.h %(installdir)s/include/petsc/private/',
+    'cp %(builddir)s/petsc-%(version)s.0/src/mat/impls/aij/seq/aij.h %(installdir)s/include/petsc/private/',
+    'cp %(builddir)s/petsc-%(version)s.0/src/mat/impls/dense/seq/dense.h %(installdir)s/include/petsc/private/'
+]
+
+moduleclass = 'numlib'