diff --git a/Golden_Repo/a/Autoconf/Autoconf-2.71-GCCcore-11.2.0.eb b/Golden_Repo/a/Autoconf/Autoconf-2.71-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3af406badc21165f2db7a98c8b0a8391e19f7ffb
--- /dev/null
+++ b/Golden_Repo/a/Autoconf/Autoconf-2.71-GCCcore-11.2.0.eb
@@ -0,0 +1,41 @@
+easyblock = 'ConfigureMake'
+
+name = 'Autoconf'
+version = '2.71'
+
+homepage = 'https://www.gnu.org/software/autoconf/'
+
+description = """
+ Autoconf is an extensible package of M4 macros that produce shell scripts
+ to automatically configure software source code packages. These scripts can
+ adapt the packages to many kinds of UNIX-like systems without manual user
+ intervention. Autoconf creates a configuration script for a package from a
+ template file that lists the operating system features that the package can
+ use, in the form of M4 macro calls.
+"""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+checksums = ['431075ad0bf529ef13cb41e9042c542381103e80015686222b8a9d4abef42a1c']
+
+builddependencies = [
+    ('binutils', '2.37'),
+    # non-standard Perl modules are required,
+    # see https://github.com/easybuilders/easybuild-easyconfigs/issues/1822
+    ('Perl', '5.34.0'),
+]
+
+dependencies = [
+    ('M4', '1.4.19'),
+]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x
+              for x in ["autoconf", "autoheader", "autom4te", "autoreconf",
+                        "autoscan", "autoupdate", "ifnames"]],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/Golden_Repo/a/Autoconf/Autoconf-2.71.eb b/Golden_Repo/a/Autoconf/Autoconf-2.71.eb
index 03a87665219d9d6583c91d29002544f06b33140e..63a2fdb2e2b162b6973833933b5755edaa48302d 100644
--- a/Golden_Repo/a/Autoconf/Autoconf-2.71.eb
+++ b/Golden_Repo/a/Autoconf/Autoconf-2.71.eb
@@ -29,4 +29,6 @@ sanity_check_paths = {
     'dirs': [],
 }
 
+hidden = True
+
 moduleclass = 'devel'
diff --git a/Golden_Repo/a/Automake/Automake-1.16.4-GCCcore-11.2.0.eb b/Golden_Repo/a/Automake/Automake-1.16.4-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a47580d9afd63785d61c1db86b14c8bfcfb2d02d
--- /dev/null
+++ b/Golden_Repo/a/Automake/Automake-1.16.4-GCCcore-11.2.0.eb
@@ -0,0 +1,32 @@
+easyblock = 'ConfigureMake'
+
+name = 'Automake'
+version = '1.16.4'
+
+homepage = 'https://www.gnu.org/software/automake/automake.html'
+
+description = "Automake: GNU Standards-compliant Makefile generator"
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+checksums = ['8a0f0be7aaae2efa3a68482af28e5872d8830b9813a6a932a2571eac63ca1794']
+
+builddependencies = [
+    ('binutils', '2.37'),
+    # non-standard Perl modules are required,
+    # see https://github.com/easybuilders/easybuild-easyconfigs/issues/1822
+    ('Perl', '5.34.0'),
+]
+
+dependencies = [
+    ('Autoconf', '2.71'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/automake', 'bin/aclocal'],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/Golden_Repo/a/Automake/Automake-1.16.4.eb b/Golden_Repo/a/Automake/Automake-1.16.4.eb
index a0c7d57614b51f3579b97f94f5c3c817825cc4bf..a8720a3621aa9971f8c1319cf9811b702c7cf472 100644
--- a/Golden_Repo/a/Automake/Automake-1.16.4.eb
+++ b/Golden_Repo/a/Automake/Automake-1.16.4.eb
@@ -28,4 +28,6 @@ sanity_check_paths = {
     'dirs': []
 }
 
+hidden = True
+
 moduleclass = 'devel'
diff --git a/Golden_Repo/a/Autotools/Autotools-20210726-GCCcore-11.2.0.eb b/Golden_Repo/a/Autotools/Autotools-20210726-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..121721f98d84261520e8e4b59739ea45d0c42f02
--- /dev/null
+++ b/Golden_Repo/a/Autotools/Autotools-20210726-GCCcore-11.2.0.eb
@@ -0,0 +1,24 @@
+easyblock = 'Bundle'
+
+name = 'Autotools'
+version = '20210726'  # date of the most recent change
+
+homepage = 'https://autotools.io'
+
+description = """
+ This bundle collect the standard GNU build tools: Autoconf, Automake
+ and libtool
+"""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+dependencies = [
+    ('Autoconf', '2.71'),    # 20210128
+    ('Automake', '1.16.4'),  # 20210726
+    ('libtool', '2.4.6'),    # 20150215
+]
+
+# Pure bundle -- no need to specify 'binutils' used when building GCCcore
+# toolchain as build dependency
+
+moduleclass = 'devel'
diff --git a/Golden_Repo/a/Autotools/Autotools-20210726.eb b/Golden_Repo/a/Autotools/Autotools-20210726.eb
index cfac44ab64fe0dfeee7d59b9438f05fc94c79d90..97ce17df96e4671ae14b13ff15f2c262da8636d4 100644
--- a/Golden_Repo/a/Autotools/Autotools-20210726.eb
+++ b/Golden_Repo/a/Autotools/Autotools-20210726.eb
@@ -23,4 +23,6 @@ dependencies = [
 # Pure bundle -- no need to specify 'binutils' used when building GCCcore
 # toolchain as build dependency
 
+hidden = True
+
 moduleclass = 'devel'
diff --git a/Golden_Repo/c/cairo/cairo-1.16.0-GCCcore-11.2.0.eb b/Golden_Repo/c/cairo/cairo-1.16.0-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5dd9c60569e57edaca80205e0d802e2ea6564395
--- /dev/null
+++ b/Golden_Repo/c/cairo/cairo-1.16.0-GCCcore-11.2.0.eb
@@ -0,0 +1,46 @@
+easyblock = 'ConfigureMake'
+
+name = 'cairo'
+version = '1.16.0'
+
+homepage = 'https://cairographics.org'
+description = """Cairo is a 2D graphics library with support for multiple output devices.
+ Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers,
+ PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB"""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+source_urls = ['https://cairographics.org/releases/']
+sources = [SOURCE_TAR_XZ]
+checksums = ['5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331']
+
+builddependencies = [
+    ('binutils', '2.37'),
+    ('pkg-config', '0.29.2'),
+]
+dependencies = [
+    ('bzip2', '1.0.8'),
+    ('zlib', '1.2.11'),
+    ('libpng', '1.6.37'),
+    ('freetype', '2.11.0'),
+    ('pixman', '0.40.0'),
+    ('expat', '2.4.1'),
+    ('GLib', '2.69.1'),
+    ('X11', '20210802'),
+]
+
+# disable symbol lookup, which requires -lbfd, to avoid link issues with (non-PIC) libiberty.a provided by GCC
+configopts = "--enable-symbol-lookup=no --enable-gobject=yes --enable-svg=yes --enable-tee=yes --enable-xlib-xcb "
+
+sanity_check_paths = {
+    'files': ['bin/cairo-trace', 'lib/cairo/libcairo-trace.%s' % SHLIB_EXT, 'lib/cairo/libcairo-trace.a',
+              'lib/libcairo.a', 'lib/libcairo-gobject.a', 'lib/libcairo-script-interpreter.a',
+              'lib/libcairo.%s' % SHLIB_EXT, 'lib/libcairo-gobject.%s' % SHLIB_EXT,
+              'lib/libcairo-script-interpreter.%s' % SHLIB_EXT] +
+    ['include/cairo/cairo%s.h' % x for x in ['', '-deprecated', '-features', '-ft', '-gobject', '-pdf', '-ps',
+                                             '-script', '-script-interpreter', '-svg', '-version', '-xcb',
+                                             '-xlib', '-xlib-xrender']],
+    'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'vis'
diff --git a/Golden_Repo/d/DBus/DBus-1.13.18-GCCcore-11.2.0.eb b/Golden_Repo/d/DBus/DBus-1.13.18-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3591a25194ff80a22625e5f5efc265a1df5be311
--- /dev/null
+++ b/Golden_Repo/d/DBus/DBus-1.13.18-GCCcore-11.2.0.eb
@@ -0,0 +1,42 @@
+easyblock = 'ConfigureMake'
+
+name = 'DBus'
+version = '1.13.18'
+
+homepage = 'https://dbus.freedesktop.org/'
+
+description = """
+ D-Bus is a message bus system, a simple way for applications to talk
+ to one another.  In addition to interprocess communication, D-Bus helps
+ coordinate process lifecycle; it makes it simple and reliable to code
+ a "single instance" application or daemon, and to launch applications
+ and daemons on demand when their services are needed.
+"""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+toolchainopts = {'pic': True}
+
+source_urls = ['https://dbus.freedesktop.org/releases/dbus']
+sources = [SOURCELOWER_TAR_XZ]
+checksums = ['8078f5c25e34ab907ce06905d969dc8ef0ccbec367e1e1707c7ecf8460f4254e']
+
+builddependencies = [
+    ('binutils', '2.37'),
+    ('pkg-config', '0.29.2'),
+]
+
+dependencies = [
+    ('expat', '2.4.1'),
+]
+
+configopts = '--without-systemdsystemunitdir'
+
+sanity_check_paths = {
+    'files': ['bin/dbus-%s' % x for x in
+              ['cleanup-sockets', 'daemon', 'launch', 'monitor',
+               'run-session', 'send', 'uuidgen']] +
+             ['lib/libdbus-1.%s' % x for x in ['a', SHLIB_EXT]],
+    'dirs': ['include', 'share'],
+}
+
+moduleclass = 'devel'
diff --git a/Golden_Repo/d/Doxygen/Doxygen-1.9.1-GCCcore-11.2.0.eb b/Golden_Repo/d/Doxygen/Doxygen-1.9.1-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..394f61d368ac910be6520f6eccca629e9e0e7296
--- /dev/null
+++ b/Golden_Repo/d/Doxygen/Doxygen-1.9.1-GCCcore-11.2.0.eb
@@ -0,0 +1,28 @@
+name = 'Doxygen'
+version = '1.9.1'
+
+homepage = 'https://www.doxygen.org'
+description = """
+ Doxygen is a documentation system for C++, C, Java, Objective-C, Python,
+ IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some
+ extent D.
+"""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['%(namelower)s-%(version)s.src.tar.gz']
+checksums = ['67aeae1be4e1565519898f46f1f7092f1973cce8a767e93101ee0111717091d1']
+
+builddependencies = [
+    ('binutils', '2.37'),
+    ('Bison', '3.7.6'),
+    ('CMake', '3.21.1'),
+    ('flex', '2.6.4'),
+    ('pkg-config', '0.29.2'),
+]
+dependencies = [('libiconv', '1.16')]
+
+configopts = "-DICONV_DIR=$EBROOTLIBICONV -DICONV_IN_GLIBC=OFF"
+
+moduleclass = 'devel'
diff --git a/Golden_Repo/d/double-conversion/double-conversion-3.1.5-GCCcore-11.2.0.eb b/Golden_Repo/d/double-conversion/double-conversion-3.1.5-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6d456ab38f235b7c7a611c19205c986a5bc5ff72
--- /dev/null
+++ b/Golden_Repo/d/double-conversion/double-conversion-3.1.5-GCCcore-11.2.0.eb
@@ -0,0 +1,39 @@
+easyblock = 'CMakeMake'
+
+name = 'double-conversion'
+version = '3.1.5'
+
+homepage = 'https://github.com/google/double-conversion'
+description = "Efficient binary-decimal and decimal-binary conversion routines for IEEE doubles."
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+source_urls = ['https://github.com/google/%(name)s/archive']
+sources = ['v%(version)s.tar.gz']
+checksums = ['a63ecb93182134ba4293fd5f22d6e08ca417caafa244afaa751cbfddf6415b13']
+
+builddependencies = [
+    ('binutils', '2.37'),
+    ('CMake', '3.21.1'),
+]
+
+separate_build_dir = True
+
+build_type = 'Release'
+
+# Build static lib, static lib with -fPIC and shared lib
+configopts = [
+    '',
+    '-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_STATIC_LIBRARY_SUFFIX_CXX=_pic.a',
+    '-DBUILD_SHARED_LIBS=ON'
+]
+
+sanity_check_paths = {
+    'files': ['include/double-conversion/%s.h' % h for h in ['bignum', 'cached-powers', 'diy-fp', 'double-conversion',
+                                                             'fast-dtoa', 'fixed-dtoa', 'ieee', 'strtod', 'utils']] +
+    ['lib/libdouble-conversion.%s' % e for e in ['a', SHLIB_EXT]] +
+    ['lib/libdouble-conversion_pic.a'],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/Golden_Repo/e/Eigen/Eigen-3.3.9-GCCcore-11.2.0.eb b/Golden_Repo/e/Eigen/Eigen-3.3.9-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0b4155d94164dedc962defa61f15bf0d1ff47986
--- /dev/null
+++ b/Golden_Repo/e/Eigen/Eigen-3.3.9-GCCcore-11.2.0.eb
@@ -0,0 +1,21 @@
+name = 'Eigen'
+version = '3.3.9'
+
+homepage = 'https://eigen.tuxfamily.org'
+description = """Eigen is a C++ template library for linear algebra: matrices, vectors, numerical solvers,
+ and related algorithms."""
+
+# only includes header files, but requires CMake so using non-system toolchain
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+source_urls = ['https://gitlab.com/libeigen/eigen/-/archive/%(version)s']
+sources = [SOURCELOWER_TAR_BZ2]
+checksums = ['0fa5cafe78f66d2b501b43016858070d52ba47bd9b1016b0165a7b8e04675677']
+
+# using CMake built with GCCcore to avoid relying on the system compiler to build it
+builddependencies = [
+    ('binutils', '2.37'),  # to make CMake compiler health check pass on old systems
+    ('CMake', '3.21.1'),
+]
+
+moduleclass = 'math'
diff --git a/Golden_Repo/f/FriBidi/FriBidi-1.0.10-GCCcore-11.2.0.eb b/Golden_Repo/f/FriBidi/FriBidi-1.0.10-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..03871815312f302f8a24dd7c50206f8b5cfe4c87
--- /dev/null
+++ b/Golden_Repo/f/FriBidi/FriBidi-1.0.10-GCCcore-11.2.0.eb
@@ -0,0 +1,33 @@
+easyblock = 'ConfigureMake'
+
+name = 'FriBidi'
+version = '1.0.10'
+
+homepage = 'https://github.com/fribidi/fribidi'
+
+description = """
+ The Free Implementation of the Unicode Bidirectional Algorithm.
+"""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+source_urls = [
+    'https://github.com/%(namelower)s/%(namelower)s/releases/download/v%(version)s']
+sources = [SOURCELOWER_TAR_XZ]
+checksums = ['7f1c687c7831499bcacae5e8675945a39bacbad16ecaa945e9454a32df653c01']
+
+builddependencies = [
+    ('Autotools', '20210726'),
+    ('binutils', '2.37'),
+    ('pkg-config', '0.29.2'),
+]
+
+configopts = '--disable-docs'
+
+sanity_check_paths = {
+    'files': ['bin/%(namelower)s', 'include/%(namelower)s/%(namelower)s.h',
+              'lib/lib%%(namelower)s.%s' % SHLIB_EXT],
+    'dirs': []
+}
+
+moduleclass = 'lang'
diff --git a/Golden_Repo/g/GLPK/GLPK-5.0-GCCcore-11.2.0.eb b/Golden_Repo/g/GLPK/GLPK-5.0-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..13994a3781cd3d031ac28f09743ef63155c1de21
--- /dev/null
+++ b/Golden_Repo/g/GLPK/GLPK-5.0-GCCcore-11.2.0.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'GLPK'
+version = '5.0'
+
+homepage = 'https://www.gnu.org/software/glpk/'
+description = """The GLPK (GNU Linear Programming Kit) package is intended for
+ solving large-scale linear programming (LP),
+ mixed integer programming (MIP), and other related problems.
+ It is a set of routines written in ANSI C 
+ and organized in the form of a callable library."""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+checksums = ['4a1013eebb50f728fc601bdd833b0b2870333c3b3e5a816eeba921d95bec6f15']
+
+builddependencies = [('binutils', '2.37')]
+
+dependencies = [('GMP', '6.2.1')]
+
+configopts = "--with-gmp"
+
+sanity_check_paths = {
+    'files': ['bin/glpsol', 'include/glpk.h'] +
+             ['lib/libglpk.%s' % x for x in [SHLIB_EXT, 'a']],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/Golden_Repo/g/GLib/GLib-2.69.1-GCCcore-11.2.0.eb b/Golden_Repo/g/GLib/GLib-2.69.1-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c9f6dab66c42412bbd082e30a0894eb7ec1c6ebd
--- /dev/null
+++ b/Golden_Repo/g/GLib/GLib-2.69.1-GCCcore-11.2.0.eb
@@ -0,0 +1,52 @@
+easyblock = 'MesonNinja'
+
+name = 'GLib'
+version = '2.69.1'
+
+homepage = 'https://www.gtk.org/'
+description = """GLib is one of the base libraries of the GTK+ project"""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+toolchainopts = {'pic': True}
+
+source_urls = [FTPGNOME_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+checksums = ['f92f34057a091fc8638d91f10cece842cb8618e9a1090b0ddb19cc15a21bf39c']
+
+builddependencies = [
+    # Python is required for building against GLib, at least when
+    # gdbus-codegen or one of the other python scripts are used.
+    # Since Meson 0.50 and later are Python >=3.5 only we can't build
+    # Python specific versions of GLib that uses Python 2.x
+    # thus Python should not be a runtime dependency for GLib.
+    # Packages that use GLib should either have an explicit
+    # (build)dependency on Python or it will use the system version
+    # EasyBuild itself uses.
+    ('Python', '3.9.6'),
+    ('Meson', '0.58.2'),
+    ('Ninja', '1.10.2'),
+    ('binutils', '2.37'),
+    ('pkg-config', '0.29.2'),
+]
+
+dependencies = [
+    ('libffi', '3.4.2'),
+    ('gettext', '0.21'),
+    ('libxml2', '2.9.10'),
+    ('PCRE', '8.45'),
+    ('util-linux', '2.37'),
+]
+
+# avoid using hardcoded path to Python binary in build step
+preconfigopts = "export PYTHON=python && "
+
+configopts = "--buildtype=release --default-library=both "
+
+fix_python_shebang_for = ['bin/*']
+
+sanity_check_paths = {
+    'files': ['lib/libglib-%(version_major)s.0.a', 'lib/libglib-%%(version_major)s.0.%s' % SHLIB_EXT],
+    'dirs': ['bin', 'include'],
+}
+
+moduleclass = 'vis'
diff --git a/Golden_Repo/g/GMP/GMP-6.2.1-GCCcore-11.2.0.eb b/Golden_Repo/g/GMP/GMP-6.2.1-GCCcore-11.2.0.eb
index 0e90b111699ff6b592fbb971fb635cffe5264e30..53fcb03cdb1db060bbd020dc3c624a96998250f8 100644
--- a/Golden_Repo/g/GMP/GMP-6.2.1-GCCcore-11.2.0.eb
+++ b/Golden_Repo/g/GMP/GMP-6.2.1-GCCcore-11.2.0.eb
@@ -17,7 +17,7 @@ sources = [SOURCELOWER_TAR_BZ2]
 checksums = ['eae9326beb4158c386e39a356818031bd28f3124cf915f8c5b1dc4c7a36b4d7c']
 
 builddependencies = [
-    ('Autotools', '20210726', '', SYSTEM),
+    ('Autotools', '20210726'),
     ('binutils', '2.37'),
 ]
 
diff --git a/Golden_Repo/g/Ghostscript/Ghostscript-9.54.0-GCCcore-11.2.0.eb b/Golden_Repo/g/Ghostscript/Ghostscript-9.54.0-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..223ea4610f572fb084c7742c1c7db81e067de9d7
--- /dev/null
+++ b/Golden_Repo/g/Ghostscript/Ghostscript-9.54.0-GCCcore-11.2.0.eb
@@ -0,0 +1,59 @@
+easyblock = 'ConfigureMake'
+
+name = 'Ghostscript'
+version = '9.54.0'
+
+homepage = 'https://ghostscript.com'
+description = """Ghostscript is a versatile processor for PostScript data with the ability to render PostScript to
+ different targets. It used to be part of the cups printing stack, but is no longer used for that."""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+toolchainopts = {'pic': True}
+
+source_urls = [
+    'https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs%s/' % version.replace(
+        '.', ''),
+]
+sources = [SOURCELOWER_TAR_GZ]
+checksums = ['0646bb97f6f4d10a763f4919c54fa28b4fbdd3dff8e7de3410431c81762cade0']
+
+builddependencies = [
+    ('binutils', '2.37'),
+    ('pkg-config', '0.29.2'),
+]
+
+dependencies = [
+    ('zlib', '1.2.11'),
+    ('libpng', '1.6.37'),
+    ('freetype', '2.11.0'),
+    ('libjpeg-turbo', '2.0.6'),
+    ('expat', '2.4.1'),
+    ('GLib', '2.69.1'),
+    ('cairo', '1.16.0'),
+    ('LibTIFF', '4.3.0'),
+]
+
+# Do not use local copies of zlib, jpeg, freetype, and png
+preconfigopts = "mv zlib zlib.no && mv jpeg jpeg.no && mv freetype freetype.no && mv libpng libpng.no && "
+preconfigopts += 'export LIBS="$LIBS -L$EBROOTZLIB/lib -lz" && '
+
+configopts = "--with-system-libtiff --enable-dynamic"
+
+# Avoid race condition in build if too much parallelism is used
+maxparallel = 4
+
+postinstallcmds = [
+    # build and install shared libs
+    "make so && make soinstall",
+    # install header files
+    "mkdir -p %(installdir)s/include/ghostscript",
+    "install -v -m644 base/*.h %(installdir)s/include/ghostscript",
+    "install -v -m644 psi/*.h %(installdir)s/include/ghostscript",
+]
+
+sanity_check_paths = {
+    'files': ['bin/gs', 'lib/libgs.%s' % SHLIB_EXT],
+    'dirs': ['lib/ghostscript', 'include/ghostscript', 'share/man'],
+}
+
+moduleclass = 'tools'
diff --git a/Golden_Repo/g/giflib/giflib-5.2.1-GCCcore-11.2.0.eb b/Golden_Repo/g/giflib/giflib-5.2.1-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..340aaeaf3129322fdea20e4a4c2a8c51c17a4b9d
--- /dev/null
+++ b/Golden_Repo/g/giflib/giflib-5.2.1-GCCcore-11.2.0.eb
@@ -0,0 +1,28 @@
+easyblock = 'ConfigureMake'
+
+name = 'giflib'
+version = '5.2.1'
+
+homepage = 'http://giflib.sourceforge.net/'
+description = """giflib is a library for reading and writing gif images.
+It is API and ABI compatible with libungif which was in wide use while
+the LZW compression algorithm was patented."""
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCE_TAR_GZ]
+checksums = ['31da5562f44c5f15d63340a09a4fd62b48c45620cd302f77a6d9acf0077879bd']
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+builddependencies = [('binutils', '2.37')]
+
+skipsteps = ['configure']
+
+installopts = 'PREFIX=%(installdir)s'
+
+sanity_check_paths = {
+    'files': ['bin/giftool'],
+    'dirs': []
+}
+
+moduleclass = 'lib'
diff --git a/Golden_Repo/g/gzip/gzip-1.10-GCCcore-11.2.0.eb b/Golden_Repo/g/gzip/gzip-1.10-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..633d7f7791b71d71a89be3ca12fa6e7352eb8a31
--- /dev/null
+++ b/Golden_Repo/g/gzip/gzip-1.10-GCCcore-11.2.0.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'gzip'
+version = '1.10'
+
+homepage = 'https://www.gnu.org/software/gzip/'
+description = "gzip (GNU zip) is a popular data compression program as a replacement for compress"
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCE_TAR_GZ]
+checksums = ['c91f74430bf7bc20402e1f657d0b252cb80aa66ba333a25704512af346633c68']
+
+builddependencies = [('binutils', '2.37')]
+
+sanity_check_paths = {
+    'files': ["bin/gunzip", "bin/gzip", "bin/uncompress"],
+    'dirs': [],
+}
+
+sanity_check_commands = [True, ('gzip', '--version')]
+
+moduleclass = 'tools'
diff --git a/Golden_Repo/l/LAME/LAME-3.100-GCCcore-11.2.0.eb b/Golden_Repo/l/LAME/LAME-3.100-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..402c7be409c67ff900d9d326da2247eca24c8dfb
--- /dev/null
+++ b/Golden_Repo/l/LAME/LAME-3.100-GCCcore-11.2.0.eb
@@ -0,0 +1,38 @@
+easyblock = 'ConfigureMake'
+
+name = 'LAME'
+version = '3.100'
+
+homepage = 'http://lame.sourceforge.net/'
+description = """LAME is a high quality MPEG Audio Layer III (MP3) encoder licensed under the LGPL."""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+source_urls = [
+    'https://sourceforge.net/projects/lame/files/lame/%(version_major_minor)s/']
+sources = [SOURCELOWER_TAR_GZ]
+patches = ['LAME-3.99.5_check-tgetent.patch']
+checksums = [
+    'ddfe36cab873794038ae2c1210557ad34857a4b6bdc515785d1da9e175b1da1e',  # lame-3.100.tar.gz
+    # LAME-3.99.5_check-tgetent.patch
+    '8bfb6a73f2db1511baf90fbd7174f11043ec4b592a4917edc30ccfb53bf37256',
+]
+
+builddependencies = [
+    ('binutils', '2.37'),
+    ('Autotools', '20210726'),
+]
+
+dependencies = [('ncurses', '6.2')]
+
+preconfigopts = "autoconf && "
+
+# configure is broken: add workaround to find libncurses...
+configure_cmd_prefix = "FRONTEND_LDADD='-L${EBROOTNCURSES}/lib' "
+
+sanity_check_paths = {
+    'files': ['bin/lame', 'include/lame/lame.h', 'lib/libmp3lame.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'data'
diff --git a/Golden_Repo/l/LMDB/LMDB-0.9.29-GCCcore-11.2.0.eb b/Golden_Repo/l/LMDB/LMDB-0.9.29-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8ed7a0228ea1cad0f671d46c5ff318c8a727d9a6
--- /dev/null
+++ b/Golden_Repo/l/LMDB/LMDB-0.9.29-GCCcore-11.2.0.eb
@@ -0,0 +1,34 @@
+easyblock = 'MakeCp'
+
+name = 'LMDB'
+version = '0.9.29'
+
+homepage = 'https://symas.com/lmdb'
+description = """LMDB is a fast, memory-efficient database. With memory-mapped files, it has the read performance
+ of a pure in-memory database while retaining the persistence of standard disk-based databases."""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+source_urls = ['https://github.com/LMDB/lmdb/archive/']
+sources = ['%(name)s_%(version)s.tar.gz']
+checksums = ['22054926b426c66d8f2bc22071365df6e35f3aacf19ad943bc6167d4cae3bebb']
+
+builddependencies = [('binutils', '2.37')]
+
+buildopts = 'CC="$CC" OPT="$CFLAGS"'
+
+runtest = 'test'
+
+files_to_copy = [
+    (['lmdb.h', 'midl.h'], 'include'),
+    (['mdb_copy', 'mdb_dump', 'mdb_load', 'mdb_stat'], 'bin'),
+    (['liblmdb.a', 'liblmdb.%s' % SHLIB_EXT], 'lib'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/mdb_copy', 'bin/mdb_dump', 'bin/mdb_load', 'bin/mdb_stat', 'include/lmdb.h',
+              'include/midl.h', 'lib/liblmdb.a', 'lib/liblmdb.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/Golden_Repo/l/LibTIFF/LibTIFF-4.3.0-GCCcore-11.2.0.eb b/Golden_Repo/l/LibTIFF/LibTIFF-4.3.0-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d6c6f6e6216fccaba53663fa5141cc648ceb4111
--- /dev/null
+++ b/Golden_Repo/l/LibTIFF/LibTIFF-4.3.0-GCCcore-11.2.0.eb
@@ -0,0 +1,32 @@
+easyblock = 'ConfigureMake'
+
+name = 'LibTIFF'
+version = '4.3.0'
+
+homepage = 'https://libtiff.maptools.org/'
+description = "tiff: Library and tools for reading and writing TIFF data files"
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+toolchainopts = {'pic': True}
+
+source_urls = [
+    'https://download.osgeo.org/libtiff/',
+]
+sources = ['tiff-%(version)s.tar.gz']
+checksums = ['0e46e5acb087ce7d1ac53cf4f56a09b221537fc86dfc5daaad1c2e89e1b37ac8']
+
+builddependencies = [('binutils', '2.37')]
+
+dependencies = [
+    ('zlib', '1.2.11'),
+    ('libjpeg-turbo', '2.0.6')
+]
+
+configopts = " --enable-ld-version-script "
+
+sanity_check_paths = {
+    'files': ['bin/tiffinfo'],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/Golden_Repo/l/libiconv/libiconv-1.16-GCCcore-11.2.0.eb b/Golden_Repo/l/libiconv/libiconv-1.16-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c306c634ed692a044a4bbb1244bf4dcba3ff59f8
--- /dev/null
+++ b/Golden_Repo/l/libiconv/libiconv-1.16-GCCcore-11.2.0.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'libiconv'
+version = '1.16'
+
+homepage = 'https://www.gnu.org/software/libiconv'
+description = "Libiconv converts from one character encoding to another through Unicode conversion"
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCE_TAR_GZ]
+checksums = ['e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04']
+
+builddependencies = [('binutils', '2.37')]
+
+sanity_check_paths = {
+    'files': ['bin/iconv', 'include/iconv.h', 'include/libcharset.h', 'include/localcharset.h',
+              'lib/libcharset.a', 'lib/libcharset.%s' % SHLIB_EXT, 'lib/libiconv.%s' % SHLIB_EXT],
+    'dirs': ['share'],
+}
+
+moduleclass = 'lib'
diff --git a/Golden_Repo/l/libpciaccess/libpciaccess-0.16-GCCcore-11.2.0.eb b/Golden_Repo/l/libpciaccess/libpciaccess-0.16-GCCcore-11.2.0.eb
index 1bc4c4a5a344f37a869006a3b79c53b3322bb71f..56d0c9048de71cfc517ccf83bf70a6a2499825bf 100644
--- a/Golden_Repo/l/libpciaccess/libpciaccess-0.16-GCCcore-11.2.0.eb
+++ b/Golden_Repo/l/libpciaccess/libpciaccess-0.16-GCCcore-11.2.0.eb
@@ -14,7 +14,7 @@ checksums = ['84413553994aef0070cf420050aa5c0a51b1956b404920e21b81e96db6a61a27']
 
 builddependencies = [
     ('binutils', '2.37'),
-    ('Autotools', '20210726', '', SYSTEM),
+    ('Autotools', '20210726'),
     ('xorg-macros', '1.19.3'),
 ]
 
diff --git a/Golden_Repo/l/libsodium/libsodium-1.0.18-GCCcore-11.2.0.eb b/Golden_Repo/l/libsodium/libsodium-1.0.18-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7b5cad31e15fa1ed68a1dc91d28252424e9dbed8
--- /dev/null
+++ b/Golden_Repo/l/libsodium/libsodium-1.0.18-GCCcore-11.2.0.eb
@@ -0,0 +1,33 @@
+easyblock = 'ConfigureMake'
+
+name = 'libsodium'
+version = '1.0.18'
+
+homepage = 'https://doc.libsodium.org/'
+
+description = """
+ Sodium is a modern, easy-to-use software library for encryption, decryption,
+ signatures, password hashing and more.
+"""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+toolchainopts = {'pic': True}
+
+source_urls = [
+    'https://download.libsodium.org/libsodium/releases/',
+    'https://download.libsodium.org/libsodium/releases/old/',
+    'https://download.libsodium.org/libsodium/releases/old/unsupported/',
+]
+sources = [SOURCE_TAR_GZ]
+checksums = ['6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1']
+
+builddependencies = [
+    ('binutils', '2.37'),
+]
+
+sanity_check_paths = {
+    'files': ['include/sodium.h', 'lib/libsodium.so', 'lib/libsodium.a'],
+    'dirs': ['include/sodium', 'lib/pkgconfig'],
+}
+
+moduleclass = 'lib'
diff --git a/Golden_Repo/l/libunwind/libunwind-1.5.0-GCCcore-11.2.0.eb b/Golden_Repo/l/libunwind/libunwind-1.5.0-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d7312b13e9bccabdb6f06ae24fc1b6ab0518048a
--- /dev/null
+++ b/Golden_Repo/l/libunwind/libunwind-1.5.0-GCCcore-11.2.0.eb
@@ -0,0 +1,38 @@
+easyblock = 'ConfigureMake'
+
+name = 'libunwind'
+version = '1.5.0'
+
+homepage = 'https://www.nongnu.org/libunwind/'
+description = """The primary goal of libunwind is to define a portable and efficient C programming interface
+ (API) to determine the call-chain of a program. The API additionally provides the means to manipulate the
+ preserved (callee-saved) state of each call-frame and to resume execution at any point in the call-chain
+ (non-local goto). The API supports both local (same-process) and remote (across-process) operation.
+ As such, the API is useful in a number of applications"""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+source_urls = [GNU_SAVANNAH_SOURCE]
+sources = [SOURCE_TAR_GZ]
+patches = ['libunwind-1.3.1_fix_ppc64_fpreg_t.patch']
+checksums = [
+    # libunwind-1.5.0.tar.gz
+    '90337653d92d4a13de590781371c604f9031cdb50520366aa1e3a91e1efb1017',
+    # libunwind-1.3.1_fix_ppc64_fpreg_t.patch
+    '61a507eec7ece286b06be698c742f0016d8c605eaeedf34f451cf1d0e510ec86',
+]
+
+builddependencies = [('binutils', '2.37')]
+
+dependencies = [
+    ('XZ', '5.2.5'),
+]
+
+preconfigopts = 'export LIBS="$LIBS -llzma" && export CFLAGS="$CFLAGS -fuse-ld=bfd -fno-common" && '
+
+sanity_check_paths = {
+    'files': ['include/libunwind.h', 'lib/libunwind.%s' % SHLIB_EXT],
+    'dirs': []
+}
+
+moduleclass = 'lib'
diff --git a/Golden_Repo/l/libwebp/libwebp-1.2.0-GCCcore-11.2.0.eb b/Golden_Repo/l/libwebp/libwebp-1.2.0-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0a239677f99621ccf34489eded4e3476c0e3826f
--- /dev/null
+++ b/Golden_Repo/l/libwebp/libwebp-1.2.0-GCCcore-11.2.0.eb
@@ -0,0 +1,38 @@
+easyblock = 'ConfigureMake'
+
+name = 'libwebp'
+version = '1.2.0'
+
+homepage = 'https://developers.google.com/speed/webp/'
+description = """WebP is a modern image format that provides superior
+lossless and lossy compression for images on the web. Using WebP,
+webmasters and web developers can create smaller, richer images that
+make the web faster."""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+source_urls = [
+    'https://storage.googleapis.com/downloads.webmproject.org/releases/webp']
+sources = [SOURCELOWER_TAR_GZ]
+checksums = ['2fc8bbde9f97f2ab403c0224fb9ca62b2e6852cbc519e91ceaa7c153ffd88a0c']
+
+builddependencies = [('binutils', '2.37')]
+
+dependencies = [
+    ('libjpeg-turbo', '2.0.6'),
+    ('libpng', '1.6.37'),
+    ('LibTIFF', '4.3.0'),
+    ('giflib', '5.2.1'),
+]
+
+configopts = "--enable-libwebpmux"
+
+sanity_check_paths = {
+    'files': ['include/webp/%s' % f for f in ['decode.h', 'demux.h', 'encode.h', 'mux.h', 'mux_types.h', 'types.h']] +
+             ['lib/lib%s.a' % l for l in ['webp', 'webpdemux', 'webpmux']] +
+             ['lib/lib%s.%s' % (l, SHLIB_EXT)
+              for l in ['webp', 'webpdemux', 'webpmux']],
+    'dirs': ['lib/']
+}
+
+moduleclass = 'lib'
diff --git a/Golden_Repo/l/lz4/lz4-1.9.3-GCCcore-11.2.0.eb b/Golden_Repo/l/lz4/lz4-1.9.3-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..09b7377077bb3449fc93eb707d0a7326b0b13817
--- /dev/null
+++ b/Golden_Repo/l/lz4/lz4-1.9.3-GCCcore-11.2.0.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'lz4'
+version = '1.9.3'
+
+homepage = 'https://lz4.github.io/lz4/'
+description = """LZ4 is lossless compression algorithm, providing compression speed at 400 MB/s per core. 
+ It features an extremely fast decoder, with speed in multiple GB/s per core."""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+github_account = '%(name)s'
+source_urls = [GITHUB_SOURCE]
+sources = ['v%(version)s.tar.gz']
+checksums = ['030644df4611007ff7dc962d981f390361e6c97a34e5cbc393ddfbe019ffe2c1']
+
+builddependencies = [('binutils', '2.37')]
+
+skipsteps = ['configure']
+
+installopts = "PREFIX=%(installdir)s"
+
+runtest = 'check'
+
+sanity_check_paths = {
+    'files': ["bin/lz4", "lib/liblz4.%s" % SHLIB_EXT, "include/lz4.h"],
+    'dirs': ["lib/pkgconfig"]
+}
+
+moduleclass = 'lib'
diff --git a/Golden_Repo/m/MPFR/MPFR-4.1.0-GCCcore-11.2.0.eb b/Golden_Repo/m/MPFR/MPFR-4.1.0-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..cf964266691b3f9ed349a2a06715179da94480fe
--- /dev/null
+++ b/Golden_Repo/m/MPFR/MPFR-4.1.0-GCCcore-11.2.0.eb
@@ -0,0 +1,39 @@
+easyblock = 'ConfigureMake'
+
+name = 'MPFR'
+version = '4.1.0'
+
+homepage = 'https://www.mpfr.org'
+
+description = """
+ The MPFR library is a C library for multiple-precision floating-point
+ computations with correct rounding.
+"""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+source_urls = ['https://www.mpfr.org/mpfr-%(version)s/']
+sources = [SOURCELOWER_TAR_BZ2]
+checksums = ['feced2d430dd5a97805fa289fed3fc8ff2b094c02d05287fd6133e7f1f0ec926']
+
+builddependencies = [
+    ('binutils', '2.37'),
+]
+
+dependencies = [
+    ('GMP', '6.2.1'),
+]
+
+runtest = 'check'
+
+# copy libmpfr.so* to <installdir>/lib to make sure that it  is picked up by tests
+# when EasyBuild is configured with --rpath, and clean up afterwards (let 'make install' do its job)
+pretestopts = "mkdir -p %%(installdir)s/lib && cp -a src/.libs/libmpfr.%s* %%(installdir)s/lib && " % SHLIB_EXT
+testopts = " && rm -r %(installdir)s/lib"
+
+sanity_check_paths = {
+    'files': ['lib/libmpfr.%s' % SHLIB_EXT, 'include/mpfr.h'],
+    'dirs': [],
+}
+
+moduleclass = 'math'
diff --git a/Golden_Repo/n/NLopt/NLopt-2.7.0-GCCcore-11.2.0.eb b/Golden_Repo/n/NLopt/NLopt-2.7.0-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5d5877cfd0ee5927011303002fe95863025eafe3
--- /dev/null
+++ b/Golden_Repo/n/NLopt/NLopt-2.7.0-GCCcore-11.2.0.eb
@@ -0,0 +1,33 @@
+easyblock = 'CMakeMake'
+
+name = 'NLopt'
+version = '2.7.0'
+
+homepage = 'http://ab-initio.mit.edu/wiki/index.php/NLopt'
+description = """ NLopt is a free/open-source library for nonlinear optimization,
+ providing a common interface for a number of different free optimization routines
+ available online as well as original implementations of various other algorithms. """
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+toolchainopts = {'pic': True}
+
+source_urls = ['https://github.com/stevengj/nlopt/archive']
+sources = ['v%(version)s.tar.gz']
+checksums = ['b881cc2a5face5139f1c5a30caf26b7d3cb43d69d5e423c9d78392f99844499f']
+
+builddependencies = [
+    ('CMake', '3.21.1'),
+    ('binutils', '2.37'),
+]
+
+configopts = [
+    '-DBUILD_SHARED_LIBS=ON',
+    '-DBUILD_SHARED_LIBS=OFF'
+]
+
+sanity_check_paths = {
+    'files': ['lib/libnlopt.a', 'lib/libnlopt.%s' % SHLIB_EXT, 'include/nlopt.h'],
+    'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'numlib'
diff --git a/Golden_Repo/n/NSPR/NSPR-4.32-GCCcore-11.2.0.eb b/Golden_Repo/n/NSPR/NSPR-4.32-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d97f4b7a45bb7373441308dc8b2850b4959a8112
--- /dev/null
+++ b/Golden_Repo/n/NSPR/NSPR-4.32-GCCcore-11.2.0.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'NSPR'
+version = '4.32'
+
+homepage = 'https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR'
+description = """Netscape Portable Runtime (NSPR) provides a platform-neutral API for system level
+ and libc-like functions."""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+source_urls = ['https://ftp.mozilla.org/pub/nspr/releases/v%(version)s/src/']
+sources = [SOURCELOWER_TAR_GZ]
+checksums = ['bb6bf4f534b9559cf123dcdc6f9cd8167de950314a90a88b2a329c16836e7f6c']
+
+builddependencies = [('binutils', '2.37')]
+
+configopts = "--disable-debug --enable-optimize --enable-64bit"
+
+sanity_check_paths = {
+    'files': ['bin/nspr-config', 'lib/libnspr%(version_major)s.a', 'lib/libnspr%%(version_major)s.%s' % SHLIB_EXT,
+              'lib/libplc%(version_major)s.a', 'lib/libplc%%(version_major)s.%s' % SHLIB_EXT,
+              'lib/libplds%(version_major)s.a', 'lib/libplds%%(version_major)s.%s' % SHLIB_EXT,
+              'lib/pkgconfig/nspr.pc'],
+    'dirs': ['include/nspr'],
+}
+
+sanity_check_commands = ["nspr-config --version"]
+
+moduleclass = 'lib'
diff --git a/Golden_Repo/n/NSS/NSS-3.39_pkgconfig.patch b/Golden_Repo/n/NSS/NSS-3.39_pkgconfig.patch
new file mode 100644
index 0000000000000000000000000000000000000000..827396691769d412b10f2518321ed8b9627f0c41
--- /dev/null
+++ b/Golden_Repo/n/NSS/NSS-3.39_pkgconfig.patch
@@ -0,0 +1,221 @@
+based on https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/nss/files/nss-3.12.4-gentoo-fixups-1.diff
+
+updated/fixed for NSS 3.39 by Kenneth Hoste (HPC-UGent)
+
+diff -urN nss/manifest.mn nss-3.12.4/mozilla/security/nss/manifest.mn
+--- nss/manifest.mn	2008-04-04 15:36:59.000000000 -0500
++++ nss/manifest.mn	2009-09-14 21:45:45.703656167 -0500
+
+ RELEASE = nss
+
+-DIRS = coreconf lib cmd cpputil gtests
++DIRS = coreconf lib cmd cpputil gtests config
+diff -urN nss/config/Makefile nss-3.12.4/mozilla/security/nss/config/Makefile
+--- nss/config/Makefile	1969-12-31 18:00:00.000000000 -0600
++++ nss/config/Makefile	2009-09-14 21:45:45.619639265 -0500
+@@ -0,0 +1,40 @@
++CORE_DEPTH = ..
++DEPTH      = ../..
++
++include $(CORE_DEPTH)/coreconf/config.mk
++
++NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
++NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
++NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
++PREFIX = /usr
++
++all: export libs
++
++export:
++	# Create the nss.pc file
++	mkdir -p $(DIST)/lib/pkgconfig
++	sed -e "s,@prefix@,$(PREFIX)," \
++	    -e "s,@exec_prefix@,\$${prefix}/bin," \
++	    -e "s,@libdir@,\$${prefix}/lib," \
++	    -e "s,@includedir@,\$${prefix}/include/nss," \
++	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
++	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
++	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
++	    nss.pc.in > nss.pc
++	chmod 0644 nss.pc
++	ln -sf ../../../../nss/config/nss.pc $(DIST)/lib/pkgconfig
++
++	# Create the nss-config script
++	mkdir -p $(DIST)/bin
++	sed -e "s,@prefix@,$(PREFIX)," \
++	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
++	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
++	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
++	    nss-config.in > nss-config
++	chmod 0755 nss-config
++	ln -sf ../../../nss/config/nss-config $(DIST)/bin
++
++libs:
++
++dummy: all export libs
++
+diff -urN nss/config/nss-config.in nss-3.12.4/mozilla/security/nss/config/nss-config.in
+--- nss/config/nss-config.in	1969-12-31 18:00:00.000000000 -0600
++++ nss/config/nss-config.in	2009-09-14 21:47:45.190638078 -0500
+@@ -0,0 +1,145 @@
++#!/bin/sh
++
++prefix=@prefix@
++
++major_version=@NSS_MAJOR_VERSION@
++minor_version=@NSS_MINOR_VERSION@
++patch_version=@NSS_PATCH_VERSION@
++
++usage()
++{
++	cat <<EOF
++Usage: nss-config [OPTIONS] [LIBRARIES]
++Options:
++	[--prefix[=DIR]]
++	[--exec-prefix[=DIR]]
++	[--includedir[=DIR]]
++	[--libdir[=DIR]]
++	[--version]
++	[--libs]
++	[--cflags]
++Dynamic Libraries:
++	nss
++	ssl
++	smime
++	nssutil
++EOF
++	exit $1
++}
++
++if test $# -eq 0; then
++	usage 1 1>&2
++fi
++
++lib_ssl=yes
++lib_smime=yes
++lib_nss=yes
++lib_nssutil=yes
++
++while test $# -gt 0; do
++  case "$1" in
++  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
++  *) optarg= ;;
++  esac
++
++  case $1 in
++    --prefix=*)
++      prefix=$optarg
++      ;;
++    --prefix)
++      echo_prefix=yes
++      ;;
++    --exec-prefix=*)
++      exec_prefix=$optarg
++      ;;
++    --exec-prefix)
++      echo_exec_prefix=yes
++      ;;
++    --includedir=*)
++      includedir=$optarg
++      ;;
++    --includedir)
++      echo_includedir=yes
++      ;;
++    --libdir=*)
++      libdir=$optarg
++      ;;
++    --libdir)
++      echo_libdir=yes
++      ;;
++    --version)
++      echo ${major_version}.${minor_version}.${patch_version}
++      ;;
++    --cflags)
++      echo_cflags=yes
++      ;;
++    --libs)
++      echo_libs=yes
++      ;;
++    ssl)
++      lib_ssl=yes
++      ;;
++    smime)
++      lib_smime=yes
++      ;;
++    nss)
++      lib_nss=yes
++      ;;
++    nssutil)                                                      
++      lib_nssutil=yes                                             
++      ;;
++    *)
++      usage 1 1>&2
++      ;;
++  esac
++  shift
++done
++
++# Set variables that may be dependent upon other variables
++if test -z "$exec_prefix"; then
++    exec_prefix=`pkg-config --variable=exec_prefix nss`
++fi
++if test -z "$includedir"; then
++    includedir=`pkg-config --variable=includedir nss`
++fi
++if test -z "$libdir"; then
++    libdir=`pkg-config --variable=libdir nss`
++fi
++
++if test "$echo_prefix" = "yes"; then
++    echo $prefix
++fi
++
++if test "$echo_exec_prefix" = "yes"; then
++    echo $exec_prefix
++fi
++
++if test "$echo_includedir" = "yes"; then
++    echo $includedir
++fi
++
++if test "$echo_libdir" = "yes"; then
++    echo $libdir
++fi
++
++if test "$echo_cflags" = "yes"; then
++    echo -I$includedir
++fi
++
++if test "$echo_libs" = "yes"; then
++      libdirs="-Wl,-R$libdir -L$libdir"
++      if test -n "$lib_ssl"; then
++	libdirs="$libdirs -lssl${major_version}"
++      fi
++      if test -n "$lib_smime"; then
++	libdirs="$libdirs -lsmime${major_version}"
++      fi
++      if test -n "$lib_nss"; then
++	libdirs="$libdirs -lnss${major_version}"
++      fi
++      if test -n "$lib_nssutil"; then
++       libdirs="$libdirs -lnssutil${major_version}"
++      fi
++      echo $libdirs
++fi      
++
+diff -urN nss/config/nss.pc.in nss-3.12.4/mozilla/security/nss/config/nss.pc.in
+--- nss/config/nss.pc.in	1969-12-31 18:00:00.000000000 -0600
++++ nss/config/nss.pc.in	2009-09-14 21:45:45.653637310 -0500
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: NSS
++Description: Network Security Services
++Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
++Requires: nspr >= 4.8
++Libs: -L${libdir} -lssl3 -lsmime3 -lnssutil3 -lnss3 -Wl,-R${libdir}
++Cflags: -I${includedir}
++
diff --git a/Golden_Repo/n/NSS/NSS-3.51_fix_kremlin_ppc64le.patch b/Golden_Repo/n/NSS/NSS-3.51_fix_kremlin_ppc64le.patch
new file mode 100644
index 0000000000000000000000000000000000000000..56e2edda9b18ec6b8bebb684adac00c2a831fb04
--- /dev/null
+++ b/Golden_Repo/n/NSS/NSS-3.51_fix_kremlin_ppc64le.patch
@@ -0,0 +1,28 @@
+Patch based on https://github.com/FStarLang/kremlin/pull/167
+Prepared for EasyBuild by Simon Branford of the BEAR Software team at the University of Birmingham
+diff -aur nss-3.51.orig/nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h nss-3.51/nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h
+--- nss-3.51.orig/nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h	2020-03-23 20:23:06.943356000 +0000
++++ nss-3.51/nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h	2020-03-23 20:24:27.270377000 +0000
+@@ -56,7 +56,8 @@
+ #include <emmintrin.h>
+ typedef __m128i FStar_UInt128_uint128;
+ #elif !defined(KRML_VERIFIED_UINT128) && !defined(_MSC_VER) && \
+-    (defined(__x86_64__) || defined(__x86_64) || defined(__aarch64__))
++    (defined(__x86_64__) || defined(__x86_64) || defined(__aarch64__) || \
++    (defined(__powerpc64__) && defined(__LITTLE_ENDIAN__)))
+ typedef unsigned __int128 FStar_UInt128_uint128;
+ #else
+ typedef struct FStar_UInt128_uint128_s {
+diff -aur nss-3.51.orig/nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h nss-3.51/nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h
+--- nss-3.51.orig/nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h	2020-03-23 20:23:06.947505000 +0000
++++ nss-3.51/nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h	2020-03-23 20:25:20.007003000 +0000
+@@ -25,7 +25,8 @@
+ #include "LowStar_Endianness.h"
+ 
+ #if !defined(KRML_VERIFIED_UINT128) && !defined(_MSC_VER) && \
+-    (defined(__x86_64__) || defined(__x86_64) || defined(__aarch64__))
++    (defined(__x86_64__) || defined(__x86_64) || defined(__aarch64__) || \
++    (defined(__powerpc64__) && defined(__LITTLE_ENDIAN__)))
+ 
+ /* GCC + using native unsigned __int128 support */
+ 
diff --git a/Golden_Repo/n/NSS/NSS-3.69-GCCcore-11.2.0.eb b/Golden_Repo/n/NSS/NSS-3.69-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..98ec48b8fd6edbe03f331b43ea8ce06819f2c409
--- /dev/null
+++ b/Golden_Repo/n/NSS/NSS-3.69-GCCcore-11.2.0.eb
@@ -0,0 +1,55 @@
+easyblock = 'MakeCp'
+
+name = 'NSS'
+version = '3.69'
+
+homepage = 'https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS'
+description = """Network Security Services (NSS) is a set of libraries designed to support cross-platform development
+ of security-enabled client and server applications."""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+source_urls = [
+    'https://ftp.mozilla.org/pub/security/nss/releases/NSS_%(version_major)s_%(version_minor)s_RTM/src/']
+sources = [SOURCELOWER_TAR_GZ]
+patches = [
+    'NSS-3.39_pkgconfig.patch',
+    'NSS-3.55_fix-ftbfs-glibc-invalid-oob-error.patch',
+]
+checksums = [
+    'c880205a365e0dd488ff29fdea82716ff9fcde9da6f3b703d636f8fc08008799',  # nss-3.69.tar.gz
+    # NSS-3.39_pkgconfig.patch
+    '5c4b55842e5afd1e8e67b90635f6474510b89242963c4ac2622d3e3da9062774',
+    # NSS-3.55_fix-ftbfs-glibc-invalid-oob-error.patch
+    '15768297c5dd6918132af281531afcfe3e358f45a00bc2655d20a6cbe4310a9b',
+]
+
+builddependencies = [('binutils', '2.37')]
+
+dependencies = [
+    ('NSPR', '4.32'),
+    ('zlib', '1.2.11'),
+]
+
+# building in parallel fails
+parallel = 1
+
+# fix for not being able to find header files
+buildopts = 'BUILD_OPT=1 USE_64=1 CPATH="$EBROOTNSPR/include/nspr:$CPATH" '
+# fix c standard causing missing functions
+buildopts += 'OS_REL_CFLAGS="-D_XOPEN_SOURCE " && '
+# also install pkgconfig file (see patch)
+buildopts += "cd config && make PREFIX=%(installdir)s BUILD_OPT=1 USE_64=1 && cd -"
+# optional testsuite (takes a long time)
+# buildopts += " && cd %(builddir)s/%(namelower)s-%(version)s/%(namelower)s/tests && BUILD_OPT=1 USE_64=1 ./all.sh "
+
+files_to_copy = ['../dist/Linux*.OBJ/*', (['../dist/public/*'], 'include')]
+
+sanity_check_paths = {
+    'files': ['lib/libnss.a'],
+    'dirs': ['bin', 'include/dbm', 'include/nss'],
+}
+
+modextrapaths = {'CPATH': 'include/nss'}
+
+moduleclass = 'lib'
diff --git a/Golden_Repo/n/nettle/nettle-3.7.3-GCCcore-11.2.0.eb b/Golden_Repo/n/nettle/nettle-3.7.3-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a39edd034d5e5c520b99d8e5a3af11e4f74baf23
--- /dev/null
+++ b/Golden_Repo/n/nettle/nettle-3.7.3-GCCcore-11.2.0.eb
@@ -0,0 +1,39 @@
+easyblock = 'ConfigureMake'
+
+name = 'nettle'
+version = '3.7.3'
+
+homepage = 'https://www.lysator.liu.se/~nisse/nettle/'
+description = """Nettle is a cryptographic library that is designed to fit easily
+ in more or less any context: In crypto toolkits for object-oriented
+ languages (C++, Python, Pike, ...), in applications like LSH or GNUPG,
+ or even in kernel space."""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCE_TAR_GZ]
+checksums = ['661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0']
+
+builddependencies = [
+    ('binutils', '2.37'),
+    ('Autotools', '20210726'),
+]
+
+dependencies = [
+    ('GMP', '6.2.1'),
+]
+
+# openssl is just used for the nettle-openssl example and requires openssl 1.1
+configopts = '--disable-openssl '
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in ['nettle-hash', 'nettle-lfib-stream', 'pkcs1-conv', 'sexp-conv']] +
+             [('lib/libhogweed.a', 'lib64/libhogweed.a'),
+              ('lib/libhogweed.%s' % SHLIB_EXT, 'lib64/libhogweed.%s' % SHLIB_EXT),
+              ('lib/libnettle.a', 'lib64/libnettle.a'),
+              ('lib/libnettle.%s' % SHLIB_EXT, 'lib64/libnettle.%s' % SHLIB_EXT)],
+    'dirs': ['include/nettle'],
+}
+
+moduleclass = 'lib'
diff --git a/Golden_Repo/o/OpenEXR/OpenEXR-3.1.1-GCCcore-11.2.0.eb b/Golden_Repo/o/OpenEXR/OpenEXR-3.1.1-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6e9e8261d5221cf1f691c0e2c250a4599a627ac2
--- /dev/null
+++ b/Golden_Repo/o/OpenEXR/OpenEXR-3.1.1-GCCcore-11.2.0.eb
@@ -0,0 +1,31 @@
+easyblock = 'CMakeMake'
+
+name = 'OpenEXR'
+version = '3.1.1'
+
+homepage = 'https://www.openexr.com/'
+description = """OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic
+ for use in computer imaging applications"""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+source_urls = ['https://github.com/openexr/openexr/archive/']
+sources = ['v%(version)s.tar.gz']
+checksums = ['045254e201c0f87d1d1a4b2b5815c4ae54845af2e6ec0ab88e979b5fdb30a86e']
+
+builddependencies = [
+    ('binutils', '2.37'),
+    ('CMake', '3.21.1'),
+]
+
+configopts = '-DOPENEXR_BUILD_PYTHON_LIBS=OFF'
+
+sanity_check_paths = {
+    'files': ['lib/lib%s.%s' % (x, SHLIB_EXT) for x in
+              ['Iex', 'IlmThread', 'Imath', 'OpenEXR', 'OpenEXRUtil']] +
+             ['bin/exr%s' % x for x in
+              ['envmap', 'header', 'makepreview', 'maketiled', 'multipart', 'multiview', 'stdattr']],
+    'dirs': ['include/OpenEXR', 'share'],
+}
+
+moduleclass = 'vis'
diff --git a/Golden_Repo/o/OpenJPEG/OpenJPEG-2.4.0-GCCcore-11.2.0.eb b/Golden_Repo/o/OpenJPEG/OpenJPEG-2.4.0-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ad834747cdd4a7d125b732e979308f35404ded53
--- /dev/null
+++ b/Golden_Repo/o/OpenJPEG/OpenJPEG-2.4.0-GCCcore-11.2.0.eb
@@ -0,0 +1,43 @@
+easyblock = 'CMakeMake'
+
+name = 'OpenJPEG'
+version = '2.4.0'
+
+homepage = 'https://www.openjpeg.org/'
+description = """OpenJPEG is an open-source JPEG 2000 codec written in
+ C language. It has been developed in order to promote the use of JPEG 2000,
+ a still-image compression standard from the Joint Photographic Experts Group
+ (JPEG). Since may 2015, it is officially recognized by ISO/IEC and ITU-T as
+ a JPEG 2000 Reference Software."""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+toolchainopts = {'pic': True}
+
+source_urls = ['https://github.com/uclouvain/openjpeg/archive']
+sources = ['v%(version)s.tar.gz']
+checksums = ['8702ba68b442657f11aaeb2b338443ca8d5fb95b0d845757968a7be31ef7f16d']
+
+separate_build_dir = True
+
+builddependencies = [
+    ('binutils', '2.37'),
+    ('CMake', '3.21.1')
+]
+
+# for running the binary of openjpeg like opj_compress you need the libraries like zlib etc.
+dependencies = [
+    ('zlib', '1.2.11'),
+    ('libpng', '1.6.37'),
+    ('LibTIFF', '4.3.0')
+]
+
+sanity_check_paths = {
+    'files': ['bin/opj_compress',
+              'bin/opj_decompress',
+              'bin/opj_dump',
+              'include/openjpeg-%(version_major)s.%(version_minor)s/openjpeg.h',
+              'lib/libopenjp2.%s' % SHLIB_EXT],
+    'dirs': ['bin', 'include', 'lib'],
+}
+
+moduleclass = 'lib'
diff --git a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb b/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb
index db2f8c5b5b8e120707f201cce05cb0a11497da5c..cf5bd68fa1b49d386f0d76f2c7eb9e783f63a403 100644
--- a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb
+++ b/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb
@@ -24,7 +24,7 @@ osdependencies = [
 ]
 
 builddependencies = [
-    ('Autotools', '20210726', '', SYSTEM),
+    ('Autotools', '20210726'),
     ('pkg-config', '0.29.2'),
 ]
 
diff --git a/Golden_Repo/o/OpenPGM/OpenPGM-5.2.122-GCCcore-11.2.0.eb b/Golden_Repo/o/OpenPGM/OpenPGM-5.2.122-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9f0c766e8bce065451ba5f26b91b9b49e3e4fcd3
--- /dev/null
+++ b/Golden_Repo/o/OpenPGM/OpenPGM-5.2.122-GCCcore-11.2.0.eb
@@ -0,0 +1,49 @@
+easyblock = 'ConfigureMake'
+
+name = 'OpenPGM'
+version = '5.2.122'
+
+homepage = 'https://code.google.com/p/openpgm/'
+
+description = """
+ OpenPGM is an open source implementation of the Pragmatic General Multicast
+ (PGM) specification in RFC 3208 available at www.ietf.org. PGM is a reliable
+ and scalable multicast protocol that enables receivers to detect loss, request
+ retransmission of lost data, or notify an application of unrecoverable loss.
+ PGM is a receiver-reliable protocol, which means the receiver is responsible
+ for ensuring all data is received, absolving the sender of reception
+ responsibility.
+"""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+toolchainopts = {'pic': True}
+
+source_urls = [
+    'https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/openpgm/']
+sources = ['libpgm-%(version)s.tar.gz']
+patches = [
+    'OpenPGM-5.2.122-pkgconfig_includes.patch',
+    'OpenPGM-5.2.122-python3-compliant.patch'
+]
+checksums = [
+    # libpgm-5.2.122.tar.gz
+    '6b895f550b95284dcde7189b01e04a9a1c1f94579af31b1eebd32c2207a1ba2c',
+    # OpenPGM-5.2.122-pkgconfig_includes.patch
+    '4a9fc7fbb6e73e325639a895cd19c1ac6918b575f715c057caa01f826de40114',
+    # OpenPGM-5.2.122-python3-compliant.patch
+    'a3bf6b4127473d287d72767b0335b8705940e56ffbccc8d4d3bdbf23a2fc8618',
+]
+
+builddependencies = [
+    ('binutils', '2.37'),
+    ('Python', '3.9.6'),
+]
+
+start_dir = 'pgm'
+
+sanity_check_paths = {
+    'files': ['lib/libpgm.%s' % SHLIB_EXT, 'lib/libpgm.a'],
+    'dirs': ['include'],
+}
+
+moduleclass = 'system'
diff --git a/Golden_Repo/p/PCRE/PCRE-8.45-GCCcore-11.2.0.eb b/Golden_Repo/p/PCRE/PCRE-8.45-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b20423ccc52128bce3b8ca98200795693507742b
--- /dev/null
+++ b/Golden_Repo/p/PCRE/PCRE-8.45-GCCcore-11.2.0.eb
@@ -0,0 +1,45 @@
+easyblock = 'ConfigureMake'
+
+name = 'PCRE'
+version = '8.45'
+
+homepage = 'https://www.pcre.org/'
+
+description = """
+ The PCRE library is a set of functions that implement regular expression
+ pattern matching using the same syntax and semantics as Perl 5.
+"""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+toolchainopts = {'pic': True}
+
+source_urls = [
+    SOURCEFORGE_SOURCE,
+    'https://ftp.pcre.org/pub/pcre/',
+]
+sources = [SOURCELOWER_TAR_GZ]
+checksums = ['4e6ce03e0336e8b4a3d6c2b70b1c5e18590a5673a98186da90d4f33c23defc09']
+
+builddependencies = [
+    ('binutils', '2.37'),
+]
+
+dependencies = [
+    ('bzip2', '1.0.8'),
+    ('zlib', '1.2.11'),
+]
+
+configopts = """\
+    --enable-utf\
+    --enable-unicode-properties\
+    --enable-pcre16\
+    --enable-pcre32\
+"""
+
+sanity_check_paths = {
+    'files': ['bin/pcre-config', 'include/pcre.h',
+              'share/man/man3/pcre.3', 'lib/libpcre32.%s' % SHLIB_EXT],
+    'dirs': ['lib/pkgconfig', 'share/doc/pcre/html', 'share/man/man1'],
+}
+
+moduleclass = 'devel'
diff --git a/Golden_Repo/p/PCRE2/PCRE2-10.37-GCCcore-11.2.0.eb b/Golden_Repo/p/PCRE2/PCRE2-10.37-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..257c390e0b9de2d6821803f5e3162fd2931eccb7
--- /dev/null
+++ b/Golden_Repo/p/PCRE2/PCRE2-10.37-GCCcore-11.2.0.eb
@@ -0,0 +1,28 @@
+easyblock = 'ConfigureMake'
+
+name = 'PCRE2'
+version = '10.37'
+
+homepage = 'https://www.pcre.org/'
+description = """
+ The PCRE library is a set of functions that implement regular expression pattern matching using the same syntax
+ and semantics as Perl 5.
+"""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+toolchainopts = {'pic': True}
+
+source_urls = ['https://download.sourceforge.net/pcre']
+sources = [SOURCELOWER_TAR_GZ]
+checksums = ['04e214c0c40a97b8a5c2b4ae88a3aa8a93e6f2e45c6b3534ddac351f26548577']
+
+builddependencies = [('binutils', '2.37')]
+
+configopts = "--enable-shared --enable-jit --enable-pcre2-16 --enable-unicode"
+
+sanity_check_paths = {
+    'files': ["bin/pcre2-config", "bin/pcre2grep", "bin/pcre2test", "lib/libpcre2-8.a", "lib/libpcre2-16.a"],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/Golden_Repo/p/pixman/pixman-0.40.0-GCCcore-11.2.0.eb b/Golden_Repo/p/pixman/pixman-0.40.0-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..913df957af377184c14ee7db9a42ac49083ec8b7
--- /dev/null
+++ b/Golden_Repo/p/pixman/pixman-0.40.0-GCCcore-11.2.0.eb
@@ -0,0 +1,29 @@
+easyblock = 'ConfigureMake'
+
+name = 'pixman'
+version = '0.40.0'
+
+homepage = 'http://www.pixman.org/'
+description = """
+ Pixman is a low-level software library for pixel manipulation, providing
+ features such as image compositing and trapezoid rasterization. Important
+ users of pixman are the cairo graphics library and the X server.
+"""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+source_urls = ['https://cairographics.org/releases/']
+sources = [SOURCE_TAR_GZ]
+checksums = ['6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc']
+
+builddependencies = [
+    ('binutils', '2.37'),
+]
+
+
+sanity_check_paths = {
+    'files': ['lib/libpixman-1.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/Golden_Repo/q/Qhull/Qhull-2020.2-GCCcore-11.2.0.eb b/Golden_Repo/q/Qhull/Qhull-2020.2-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..14e2a0d4bec84ed0ad7cae5090b55c7c35330861
--- /dev/null
+++ b/Golden_Repo/q/Qhull/Qhull-2020.2-GCCcore-11.2.0.eb
@@ -0,0 +1,40 @@
+easyblock = 'CMakeMake'
+
+name = 'Qhull'
+version = '2020.2'
+
+homepage = 'http://www.qhull.org'
+
+description = """
+ Qhull computes the convex hull, Delaunay triangulation, Voronoi diagram,
+ halfspace intersection about a point, furthest-site Delaunay triangulation,
+ and furthest-site Voronoi diagram. The source code runs in 2-d, 3-d, 4-d, and
+ higher dimensions. Qhull implements the Quickhull algorithm for computing the
+ convex hull.
+"""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+toolchainopts = {'pic': True}
+
+source_urls = ['http://www.qhull.org/download/']
+sources = ['%(namelower)s-%(version_major)s-src-8.0.2.tgz']
+checksums = ['b5c2d7eb833278881b952c8a52d20179eab87766b00b865000469a45c1838b7e']
+
+builddependencies = [
+    ('binutils', '2.37'),
+    ('CMake', '3.21.1'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/qhull', 'lib/libqhull_r.%s' % SHLIB_EXT,
+              'lib/pkgconfig/qhull_r.pc'],
+    'dirs': [],
+}
+
+modextrapaths = {
+    'CPATH': ['qhull/include'],
+}
+
+parallel = 1
+
+moduleclass = 'math'
diff --git a/Golden_Repo/r/re2c/re2c-2.2-GCCcore-11.2.0.eb b/Golden_Repo/r/re2c/re2c-2.2-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7d742df5cdbc9c3ba99a650fa7eb04dacb4391b4
--- /dev/null
+++ b/Golden_Repo/r/re2c/re2c-2.2-GCCcore-11.2.0.eb
@@ -0,0 +1,28 @@
+easyblock = 'ConfigureMake'
+
+name = 're2c'
+version = '2.2'
+
+homepage = 'https://re2c.org/'
+description = """re2c is a free and open-source lexer generator for C and C++. Its main goal is generating
+fast lexers: at least as fast as their reasonably optimized hand-coded counterparts. Instead of using
+traditional table-driven approach, re2c encodes the generated finite state automata directly in the form
+of conditional jumps and comparisons."""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+source_urls = [
+    'https://github.com/skvadrik/re2c/releases/download/%(version)s']
+sources = ['%(name)s-%(version)s.tar.xz']
+checksums = ['0fc45e4130a8a555d68e230d1795de0216dfe99096b61b28e67c86dfd7d86bda']
+
+builddependencies = [('binutils', '2.37')]
+
+sanity_check_paths = {
+    'files': ['bin/re2c'],
+    'dirs': [],
+}
+
+sanity_check_commands = ["re2c --help"]
+
+moduleclass = 'tools'
diff --git a/Golden_Repo/s/Szip/Szip-2.1.1-GCCcore-11.2.0.eb b/Golden_Repo/s/Szip/Szip-2.1.1-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..50df4ee90b98fedf202b753089310c89f08364db
--- /dev/null
+++ b/Golden_Repo/s/Szip/Szip-2.1.1-GCCcore-11.2.0.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'Szip'
+version = '2.1.1'
+
+homepage = 'https://www.hdfgroup.org/doc_resource/SZIP/'
+
+description = """
+ Szip compression software, providing lossless compression of scientific data
+"""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+toolchainopts = {'pic': True}
+
+source_urls = [
+    'https://www.hdfgroup.org/ftp/lib-external/szip/%(version)s/src']
+sources = [SOURCELOWER_TAR_GZ]
+checksums = ['21ee958b4f2d4be2c9cabfa5e1a94877043609ce86fde5f286f105f7ff84d412']
+
+builddependencies = [
+    ('binutils', '2.37'),
+]
+
+sanity_check_paths = {
+    'files': ["lib/libsz.a", "lib/libsz.%s" % SHLIB_EXT] +
+             ["include/%s" % x for x in ["ricehdf.h", "szip_adpt.h", "szlib.h"]],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/Golden_Repo/s/snappy/snappy-1.1.9-GCCcore-11.2.0.eb b/Golden_Repo/s/snappy/snappy-1.1.9-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..365086c0f2f9fe11131273b388af58ce9a908b1d
--- /dev/null
+++ b/Golden_Repo/s/snappy/snappy-1.1.9-GCCcore-11.2.0.eb
@@ -0,0 +1,36 @@
+easyblock = 'CMakeMake'
+
+name = 'snappy'
+version = '1.1.9'
+
+homepage = 'https://github.com/google/snappy'
+description = """Snappy is a compression/decompression library. It does not aim
+for maximum compression, or compatibility with any other compression library;
+instead, it aims for very high speeds and reasonable compression."""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+source_urls = ['https://github.com/google/snappy/archive/']
+sources = ['%(version)s.tar.gz']
+patches = ['%(name)s-%(version)s_inline-functions.patch']
+checksums = [
+    '75c1fbb3d618dd3a0483bff0e26d0a92b495bbe5059c8b4f1c962b478b6e06e7',  # 1.1.9.tar.gz
+    # snappy-1.1.9_inline-functions.patch
+    'ad79190b274df5ddabf14eddd2bb0d9a091ee7d44e4afde89febf9a8f783fdce',
+]
+
+builddependencies = [
+    ('binutils', '2.37'),
+    ('CMake', '3.21.1'),
+]
+
+# Disable building tests and benchmarks - we're not using them and they require googletest and benchmark source code
+_configopts = '-DSNAPPY_BUILD_TESTS=OFF -DSNAPPY_BUILD_BENCHMARKS=OFF'
+configopts = ['%s' % _configopts, '-DBUILD_SHARED_LIBS=ON %s' % _configopts]
+
+sanity_check_paths = {
+    'files': ['lib64/libsnappy.a', 'lib64/libsnappy.%s' % SHLIB_EXT, 'include/snappy.h'],
+    'dirs': []
+}
+
+moduleclass = 'lib'
diff --git a/Golden_Repo/u/UDUNITS/UDUNITS-2.2.28-GCCcore-11.2.0.eb b/Golden_Repo/u/UDUNITS/UDUNITS-2.2.28-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..67c01b52a1d48cfe2b00f73d2a66c721289be1f8
--- /dev/null
+++ b/Golden_Repo/u/UDUNITS/UDUNITS-2.2.28-GCCcore-11.2.0.eb
@@ -0,0 +1,44 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/easybuilders/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg, Ghent University
+# Authors::   Fotis Georgatos <fotis@cern.ch>, Kenneth Hoste (Ghent University)
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-97.html
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'UDUNITS'
+version = '2.2.28'
+
+homepage = 'https://www.unidata.ucar.edu/software/udunits/'
+description = """UDUNITS supports conversion of unit specifications between formatted and binary forms,
+ arithmetic manipulation of units, and conversion of values between compatible scales of measurement."""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+toolchainopts = {'pic': True}
+
+source_urls = [
+    'https://artifacts.unidata.ucar.edu/repository/downloads-udunits/',
+    'https://sources.easybuild.io/u/UDUNITS/',
+]
+sources = [SOURCELOWER_TAR_GZ]
+checksums = ['590baec83161a3fd62c00efa66f6113cec8a7c461e3f61a5182167e0cc5d579e']
+
+builddependencies = [('binutils', '2.37')]
+
+dependencies = [('expat', '2.4.1')]
+
+sanity_check_paths = {
+    'files': ['bin/udunits2', 'include/converter.h', 'include/udunits2.h', 'include/udunits.h',
+              'lib/libudunits2.a', 'lib/libudunits2.%s' % SHLIB_EXT],
+    'dirs': ['share'],
+}
+
+parallel = 1
+
+moduleclass = 'phys'
diff --git a/Golden_Repo/x/X11/X11-20210802-GCCcore-11.2.0.eb b/Golden_Repo/x/X11/X11-20210802-GCCcore-11.2.0.eb
index b6e1cd8ef634c3c965f2ef8898c784491a472bb3..607744625b2eb1be373c6e266e1fa13acd58cd20 100644
--- a/Golden_Repo/x/X11/X11-20210802-GCCcore-11.2.0.eb
+++ b/Golden_Repo/x/X11/X11-20210802-GCCcore-11.2.0.eb
@@ -21,7 +21,7 @@ source_urls = [
 
 builddependencies = [
     ('binutils', '2.37'),
-    ('Autotools', '20210726', '', SYSTEM),
+    ('Autotools', '20210726'),
     ('Bison', '3.7.6'),
     ('gettext', '0.21'),
     ('pkg-config', '0.29.2'),
diff --git a/Golden_Repo/x/xorg-macros/xorg-macros-1.19.3-GCCcore-11.2.0.eb b/Golden_Repo/x/xorg-macros/xorg-macros-1.19.3-GCCcore-11.2.0.eb
index bce3cc7a221e95f10a0bba7ae188e6ed9ca2999f..5b6753c1efff0f09cdc2752b5ad1e216c6062bef 100644
--- a/Golden_Repo/x/xorg-macros/xorg-macros-1.19.3-GCCcore-11.2.0.eb
+++ b/Golden_Repo/x/xorg-macros/xorg-macros-1.19.3-GCCcore-11.2.0.eb
@@ -18,7 +18,7 @@ checksums = ['8205d210a580da0938f5ce4392a96b60cf1d9a5f792eaa1474fa4c1977aef4d0']
 
 builddependencies = [
     ('binutils', '2.37'),
-    ('Autotools', '20210726', '', SYSTEM),
+    ('Autotools', '20210726'),
 ]
 
 preconfigopts = './autogen.sh && '
diff --git a/Golden_Repo/y/Yasm/Yasm-1.3.0-GCCcore-11.2.0.eb b/Golden_Repo/y/Yasm/Yasm-1.3.0-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..93a7e18fb8d097497ea8d3e6afda5abc387a6d7e
--- /dev/null
+++ b/Golden_Repo/y/Yasm/Yasm-1.3.0-GCCcore-11.2.0.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'Yasm'
+version = '1.3.0'
+
+homepage = 'https://www.tortall.net/projects/yasm/'
+
+description = """Yasm: Complete rewrite of the NASM assembler with BSD license"""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+source_urls = ['https://github.com/yasm/yasm/releases/download/v%(version)s/']
+sources = [SOURCELOWER_TAR_GZ]
+checksums = ['3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f']
+
+builddependencies = [('binutils', '2.37')]
+
+sanity_check_paths = {
+    'files': ['bin/yasm'],
+    'dirs': [],
+}
+
+moduleclass = 'lang'
diff --git a/Golden_Repo/z/Z3/Z3-4.8.12-GCCcore-11.2.0.eb b/Golden_Repo/z/Z3/Z3-4.8.12-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e5532af3956fa0c5500e946de00d28ca196f9709
--- /dev/null
+++ b/Golden_Repo/z/Z3/Z3-4.8.12-GCCcore-11.2.0.eb
@@ -0,0 +1,33 @@
+easyblock = 'CMakeMake'
+
+name = 'Z3'
+version = '4.8.12'
+
+homepage = 'https://github.com/Z3Prover/z3'
+description = """
+ Z3 is a theorem prover from Microsoft Research.
+"""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+source_urls = ['https://github.com/Z3Prover/z3/archive/']
+sources = [SOURCELOWER_TAR_GZ]
+checksums = ['e3aaefde68b839299cbc988178529535e66048398f7d083b40c69fe0da55f8b7']
+
+builddependencies = [
+    ('CMake', '3.21.1'),
+    ('binutils', '2.37'),
+]
+
+dependencies = [
+    ('GMP', '6.2.1'),
+]
+
+configopts = '-DZ3_USE_LIB_GMP=ON -DZ3_LINK_TIME_OPTIMIZATION=ON '
+
+sanity_check_paths = {
+    'files': ['bin/z3', 'include/z3_api.h', 'lib/libz3.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/Golden_Repo/z/ZeroMQ/ZeroMQ-4.3.4-GCCcore-11.2.0.eb b/Golden_Repo/z/ZeroMQ/ZeroMQ-4.3.4-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..52b65812368344788385dec1d899f6955a89c3de
--- /dev/null
+++ b/Golden_Repo/z/ZeroMQ/ZeroMQ-4.3.4-GCCcore-11.2.0.eb
@@ -0,0 +1,41 @@
+easyblock = 'ConfigureMake'
+
+name = 'ZeroMQ'
+version = '4.3.4'
+
+homepage = 'https://www.zeromq.org/'
+description = """ZeroMQ looks like an embeddable networking library but acts like a concurrency framework.
+ It gives you sockets that carry atomic messages across various transports like in-process,
+ inter-process, TCP, and multicast. You can connect sockets N-to-N with patterns like fanout,
+ pub-sub, task distribution, and request-reply. It's fast enough to be the fabric for clustered
+ products. Its asynchronous I/O model gives you scalable multicore applications, built as asynchronous
+ message-processing tasks. It has a score of language APIs and runs on most operating systems."""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+source_urls = [
+    'https://github.com/zeromq/libzmq/releases/download/v%(version)s/']
+sources = [SOURCELOWER_TAR_GZ]
+checksums = ['c593001a89f5a85dd2ddf564805deb860e02471171b3f204944857336295c3e5']
+
+builddependencies = [
+    ('binutils', '2.37'),
+    ('pkg-config', '0.29.2'),
+]
+
+dependencies = [
+    ('OpenPGM', '5.2.122'),
+    ('libsodium', '1.0.18'),
+    ('util-linux', '2.37'),
+]
+
+# Compialtion warnings in GCC 11, cf. https://github.com/zeromq/libzmq/issues/4178
+# Needto disable warnings as errors.
+configopts = '--with-pic --with-pgm --with-libsodium --disable-Werror'
+
+sanity_check_paths = {
+    'files': ['lib/libzmq.%s' % SHLIB_EXT, 'lib/libzmq.a'],
+    'dirs': ['include', 'lib'],
+}
+
+moduleclass = 'devel'
diff --git a/Golden_Repo/z/Zip/Zip-3.0-GCCcore-11.2.0.eb b/Golden_Repo/z/Zip/Zip-3.0-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f376553d7a09f78154a3433b01158154542cdead
--- /dev/null
+++ b/Golden_Repo/z/Zip/Zip-3.0-GCCcore-11.2.0.eb
@@ -0,0 +1,40 @@
+easyblock = 'ConfigureMake'
+
+name = 'Zip'
+version = '3.0'
+
+homepage = 'http://www.info-zip.org/Zip.html'
+description = """Zip is a compression and file packaging/archive utility.
+Although highly compatible both with PKWARE's PKZIP and PKUNZIP
+utilities for MS-DOS and with Info-ZIP's own UnZip, our primary objectives
+have been portability and other-than-MSDOS functionality"""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+source_urls = ['https://download.sourceforge.net/infozip']
+sources = ['%(namelower)s%(version_major)s%(version_minor)s.tar.gz']
+checksums = ['f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369']
+
+builddependencies = [
+    ('binutils', '2.37'),
+]
+dependencies = [
+    ('bzip2', '1.0.8'),
+]
+
+skipsteps = ['configure']
+
+buildopts = '-f unix/Makefile CC="$CC" IZ_OUR_BZIP2_DIR=$EBROOTBZIP2 '
+buildopts += 'CFLAGS="$CFLAGS -I. -DUNIX -DBZIP2_SUPPORT -DUNICODE_SUPPORT -DLARGE_FILE_SUPPORT" '
+buildopts += 'generic_gcc'
+
+installopts = '-f unix/Makefile prefix=%(installdir)s '
+
+sanity_check_paths = {
+    'files': ['bin/zip', 'bin/zipcloak', 'bin/zipnote', 'bin/zipsplit'],
+    'dirs': ['man/man1']
+}
+
+sanity_check_commands = ["zip --version"]
+
+moduleclass = 'tools'
diff --git a/Golden_Repo/z/zstd/zstd-1.5.0-GCCcore-11.2.0.eb b/Golden_Repo/z/zstd/zstd-1.5.0-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..39a21b894e7ea6ef6f1126e13feb8a39c91dc3f9
--- /dev/null
+++ b/Golden_Repo/z/zstd/zstd-1.5.0-GCCcore-11.2.0.eb
@@ -0,0 +1,41 @@
+easyblock = 'ConfigureMake'
+
+name = 'zstd'
+version = '1.5.0'
+
+homepage = 'https://facebook.github.io/zstd'
+description = """Zstandard is a real-time compression algorithm, providing high compression ratios. 
+ It offers a very wide range of compression/speed trade-off, while being backed by a very fast decoder.
+ It also offers a special mode for small data, called dictionary compression, and can create dictionaries
+ from any sample set."""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+github_account = 'facebook'
+source_urls = [GITHUB_SOURCE]
+sources = ['v%(version)s.tar.gz']
+checksums = ['0d9ade222c64e912d6957b11c923e214e2e010a18f39bec102f572e693ba2867']
+
+builddependencies = [
+    ('binutils', '2.37'),
+]
+
+dependencies = [
+    ('zlib', '1.2.11'),
+    ('gzip', '1.10'),
+    ('XZ', '5.2.5'),
+    ('lz4', '1.9.3'),
+]
+
+skipsteps = ['configure']
+
+runtest = 'check'
+
+installopts = "PREFIX=%(installdir)s"
+
+sanity_check_paths = {
+    'files': ["bin/zstd", "lib/libzstd.%s" % SHLIB_EXT, "include/zstd.h"],
+    'dirs': ["lib/pkgconfig"]
+}
+
+moduleclass = 'lib'
diff --git a/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb b/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb
index 9e5be07c78f333aecc138878f6c976bd2b8ff01b..43848326d0cb64c3152985b947167d9c3b964974 100644
--- a/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb
+++ b/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb
@@ -24,7 +24,7 @@ osdependencies = [
 ]
 
 builddependencies = [
-    ('Autotools', '20210726', '', SYSTEM),
+    ('Autotools', '20210726'),
     ('pkg-config', '0.29.2'),
 ]
 
diff --git a/Overlays/jurecadc_overlay/b/BullMPI/BullMPI-4.1.0-GCC-11.2.0.eb b/Overlays/jurecadc_overlay/b/BullMPI/BullMPI-4.1.0-GCC-11.2.0.eb
index dd8f3d40d61766f59ef5f8a0da5425cc16b64f8b..f3059aaff422f0dbcca38d9f784e3f50d78c8f2d 100644
--- a/Overlays/jurecadc_overlay/b/BullMPI/BullMPI-4.1.0-GCC-11.2.0.eb
+++ b/Overlays/jurecadc_overlay/b/BullMPI/BullMPI-4.1.0-GCC-11.2.0.eb
@@ -20,7 +20,7 @@ osdependencies = [
 ]
 
 builddependencies = [
-    ('Autotools', '20210726', '', SYSTEM),
+    ('Autotools', '20210726'),
     ('pkg-config', '0.29.2'),
 ]