From f344da91db3a61bf1e3eb19c8228e069d02cf83d Mon Sep 17 00:00:00 2001
From: Sebastian Achilles <s.achilles@fz-juelich.de>
Date: Fri, 9 Sep 2022 17:19:40 +0200
Subject: [PATCH] Initial commit 2023

---
 Custom_EasyBlocks/cuda.py                     |   334 -
 Custom_EasyBlocks/numexpr.py                  |   133 -
 .../a/ABINIT/ABINIT-9.6.2-gpsmkl-2021b.eb     |    75 -
 .../a/ABINIT/ABINIT-9.6.2-intel-para-2021b.eb |    72 -
 Golden_Repo/a/ACTC/ACTC-1.1-GCCcore-11.2.0.eb |    35 -
 .../a/ADIOS2/ADIOS2-2.7.1-gpsmkl-2021b.eb     |   169 -
 .../a/ADIOS2/ADIOS2-2.7.1-intel-para-2021b.eb |   169 -
 Golden_Repo/a/ADIOS2/include4gcc11.patch      |    22 -
 Golden_Repo/a/AMBER/AMBER-20-gpsmkl-2021b.eb  |    98 -
 Golden_Repo/a/AMBER/fix_nmrat_error.patch     |    12 -
 .../AMD-uProf-3.4.502-GCCcore-11.2.0.eb       |    51 -
 .../AMD-uProf-3.5.671-GCCcore-11.2.0.eb       |    53 -
 .../a/ANTLR/ANTLR-2.7.7-GCCcore-11.2.0.eb     |    41 -
 .../a/AOCC/AOCC-3.1.0-GCCcore-11.2.0.eb       |    24 -
 .../a/AOCC/AOCC-3.2.0-GCCcore-11.2.0.eb       |    24 -
 .../APR-util/APR-util-1.6.1-GCCcore-11.2.0.eb |    32 -
 Golden_Repo/a/APR/APR-1.7.0-GCCcore-11.2.0.eb |    22 -
 Golden_Repo/a/ARMForge/ARMForge-21.1.2.eb     |    43 -
 ...-3.8.0-gcccoremkl-11.2.0-2021.4.0-nompi.eb |    43 -
 .../ARPACK-NG/ARPACK-NG-3.8.0-gomkl-2021b.eb  |    55 -
 .../ARPACK-NG/ARPACK-NG-3.8.0-gpsmkl-2021b.eb |    55 -
 ...ACK-NG-3.8.0-install-arpack-examples.patch |   538 -
 ...3.8.0-install-arpack-examples_gpsmkl.patch |   538 -
 .../ARPACK-NG/ARPACK-NG-3.8.0-intel-2021b.eb  |    54 -
 .../ARPACK-NG-3.8.0-intel-para-2021b.eb       |    54 -
 .../ARPACK-NG/ARPACK-NG-3.8.0-iomkl-2021b.eb  |    54 -
 ...3.22.0-gcccoremkl-11.2.0-2021.4.0-nompi.eb |    46 -
 Golden_Repo/a/ASE/ASE-3.22.0-gpsmkl-2021b.eb  |    45 -
 .../AT-SPI2-ATK-2.38.0-GCCcore-11.2.0.eb      |    43 -
 .../AT-SPI2-core-2.40.3-GCCcore-11.2.0.eb     |    44 -
 .../a/ATK/ATK-2.36.0-GCCcore-11.2.0.eb        |    42 -
 Golden_Repo/a/Advisor/Advisor-2021.4.0.eb     |    27 -
 .../Apptainer-Tools-2022-GCCcore-11.2.0.eb    |    50 -
 .../a/AtomPAW/AtomPAW-4.1.1.0-gpsmkl-2021b.eb |    39 -
 .../Autoconf/Autoconf-2.69-GCCcore-11.2.0.eb  |    41 -
 .../Autoconf/Autoconf-2.71-GCCcore-11.2.0.eb  |    41 -
 Golden_Repo/a/Autoconf/Autoconf-2.71.eb       |    34 -
 .../Automake-1.16.4-GCCcore-11.2.0.eb         |    32 -
 Golden_Repo/a/Automake/Automake-1.16.4.eb     |    33 -
 .../Autotools-20210726-GCCcore-11.2.0.eb      |    24 -
 Golden_Repo/a/Autotools/Autotools-20210726.eb |    28 -
 Golden_Repo/a/ant/ant-1.10.12-Java-15.eb      |    27 -
 .../archspec/archspec-0.1.3-GCCcore-11.2.0.eb |    34 -
 Golden_Repo/a/archspec/archspec_click_8.patch |   131 -
 .../b/BLIS/BLIS-0.8.1-GCCcore-11.2.0.eb       |    41 -
 ...ix_dgemm-fpe-signalling-on-broadwell.patch |  2219 ---
 .../b/Bazel/Bazel-3.4.1-fix-grpc-protoc.patch |    27 -
 .../Bazel/Bazel-3.7.1_fix-protobuf-env.patch  |    20 -
 .../b/Bazel/Bazel-3.7.2-GCCcore-11.2.0.eb     |    45 -
 Golden_Repo/b/Bazel/gcc11-2-bazel-3.7.2.patch |    10 -
 Golden_Repo/b/Bazel/gcc11-bazel-3.7.2.patch   |    10 -
 Golden_Repo/b/Bazel/java15.patch              |    29 -
 ...opython-1.79-gcccoremkl-11.2.0-2021.4.0.eb |    42 -
 .../b/Bison/Bison-3.7.6-GCCcore-11.2.0.eb     |    30 -
 Golden_Repo/b/Bison/Bison-3.7.6.eb            |    31 -
 .../Blender-3.1.2-GCCcore-11.2.0-binary.eb    |    41 -
 .../b/Blosc/Blosc-1.21.1-GCCcore-11.2.0.eb    |    28 -
 .../Boost.Python-1.78.0-GCCcore-11.2.0.eb     |    26 -
 .../b/Boost/Boost-1.78.0-GCCcore-11.2.0.eb    |    32 -
 .../b/Brotli/Brotli-1.0.9-GCCcore-11.2.0.eb   |    37 -
 .../binutils/binutils-2.37-GCCcore-11.2.0.eb  |    33 -
 Golden_Repo/b/binutils/binutils-2.37.eb       |    28 -
 .../bokeh-2.4.1-gcccoremkl-11.2.0-2021.4.0.eb |    40 -
 .../b/byacc/byacc-20210808-GCCcore-11.2.0.eb  |    22 -
 .../b/bzip2/bzip2-1.0.8-GCCcore-11.2.0.eb     |    28 -
 .../b/bzip2/bzip2-1.0.8-pkgconfig.patch       |    33 -
 Golden_Repo/c/CDO/CDO-2.0.2-gompi-2021b.eb    |    36 -
 Golden_Repo/c/CDO/CDO-2.0.2-gpsmpi-2021b.eb   |    36 -
 Golden_Repo/c/CDO/CDO-2.0.2-iimpi-2021b.eb    |    36 -
 Golden_Repo/c/CDO/CDO-2.0.2-iompi-2021b.eb    |    36 -
 Golden_Repo/c/CDO/CDO-2.0.2-ipsmpi-2021b.eb   |    36 -
 Golden_Repo/c/CDO/CDO-2.0.2-npsmpic-2021b.eb  |    37 -
 Golden_Repo/c/CDO/CDO-2.0.2-nvompic-2021b.eb  |    37 -
 .../c/CFITSIO/CFITSIO-4.0.0-GCCcore-11.2.0.eb |    44 -
 .../CFITSIO-4.0.0_install_test_data.patch     |    13 -
 Golden_Repo/c/CGAL/CGAL-5.2-GCCcore-11.2.0.eb |    41 -
 Golden_Repo/c/CGNS/CGNS-4.2.0-gpsmpi-2021b.eb |    34 -
 .../c/CMake/CMake-3.21.1-GCCcore-11.2.0.eb    |    30 -
 Golden_Repo/c/CMake/CMake-3.21.1.eb           |    28 -
 .../c/CMake/CMake-3.23.1-GCCcore-11.2.0.eb    |    30 -
 .../c/CP2K/CP2K-8.2.0-intel-para-2021b.eb     |    94 -
 Golden_Repo/c/CP2K/CP2K-8.2.0-iomkl-2021b.eb  |    94 -
 .../c/CP2K/CP2K-9.1.0-intel-para-2021b.eb     |    95 -
 Golden_Repo/c/CP2K/CP2K-9.1.0-iomkl-2021b.eb  |    95 -
 Golden_Repo/c/CPMD/CPMD-4.3-intel-2021b.eb    |    69 -
 .../c/CPMD/CPMD-4.3-intel-para-2021bhybrid.eb |    71 -
 Golden_Repo/c/CPMD/cpmd-v4.3-config.patch     |    40 -
 Golden_Repo/c/CUDA/CUDA-11.5.eb               |    48 -
 .../c/CVS/CVS-1.11.23-GCCcore-11.2.0.eb       |    45 -
 .../c/CVXOPT/CVXOPT-1.2.1-fix-setup-py.patch  |   128 -
 .../c/CVXOPT/CVXOPT-1.2.7-gpsmkl-2021b.eb     |    43 -
 .../Cartopy/Cartopy-0.20.0-GCCcore-11.2.0.eb  |    50 -
 .../Cirq-0.13.1-gcccoremkl-11.2.0-2021.4.0.eb |   109 -
 .../Cirq-0.14.1-gcccoremkl-11.2.0-2021.4.0.eb |   109 -
 .../c/Clang/Clang-13.0.1-GCCcore-11.2.0.eb    |   112 -
 .../c/Cling/Cling-0.9-GCCcore-11.2.0.eb       |    76 -
 Golden_Repo/c/Cling/patchgcc11fix.patch       |    15 -
 .../Code_Saturne-7.0.2-gpsmkl-2021b.eb        |    55 -
 .../Colmap-3.7-gcccoremkl-11.2.0-2021.4.0.eb  |    48 -
 .../Coreutils/Coreutils-9.0-GCCcore-11.2.0.eb |    28 -
 .../c/CubeGUI/CubeGUI-4.6-GCCcore-11.2.0.eb   |    62 -
 .../c/CubeGUI/CubeGUI-4.7-GCCcore-11.2.0.eb   |    62 -
 .../c/CubeLib/CubeLib-4.6-GCCcore-11.2.0.eb   |    58 -
 .../c/CubeLib/CubeLib-4.7-GCCcore-11.2.0.eb   |    58 -
 .../c/CubeLib/CubeLib-4.7.1-GCCcore-11.2.0.eb |    58 -
 .../CubeWriter-4.6-GCCcore-11.2.0.eb          |    57 -
 .../CubeWriter-4.7-GCCcore-11.2.0.eb          |    57 -
 .../CubeWriter-4.7.1-GCCcore-11.2.0.eb        |    57 -
 .../c/cURL/cURL-7.78.0-GCCcore-11.2.0.eb      |    43 -
 .../c/cairo/cairo-1.16.0-GCCcore-11.2.0.eb    |    47 -
 Golden_Repo/c/ccache/ccache-4.3.eb            |    42 -
 ...solver-2.0.0-gcccoremkl-11.2.0-2021.4.0.eb |    38 -
 .../c/cppcheck/cppcheck-2.6-GCCcore-11.2.0.eb |    29 -
 .../c/cppy/cppy-1.1.0-GCCcore-11.2.0.eb       |    29 -
 .../c/cuDNN/cuDNN-8.3.1.22-CUDA-11.5.eb       |    36 -
 .../cuTENSOR-1.4.0.6-GCCcore-11.2.0.eb        |    41 -
 Golden_Repo/d/DB/DB-18.1.40-GCCcore-11.2.0.eb |    33 -
 .../d/DBus/DBus-1.13.18-GCCcore-11.2.0.eb     |    42 -
 .../DWave-4.2.0-gcccoremkl-11.2.0-2021.4.0.eb |   161 -
 .../dwave_networkx_fix_decorator-5.0.9.patch  |    11 -
 .../d/Doxygen/Doxygen-1.9.1-GCCcore-11.2.0.eb |    28 -
 .../darshan-runtime-3.3.1-gompi-2021b.eb      |    63 -
 .../darshan-runtime-3.3.1-gpsmpi-2021b.eb     |    63 -
 .../darshan-runtime-3.3.1-iimpi-2021b.eb      |    63 -
 .../darshan-runtime-3.3.1-ipsmpi-2021b.eb     |    63 -
 .../darshan-runtime-3.3.1-npsmpic-2021b.eb    |    63 -
 .../darshan-runtime-3.3.1-nvompic-2021b.eb    |    63 -
 .../darshan-runtime-3.4.0-gompi-2021b.eb      |    63 -
 .../darshan-runtime-3.4.0-gpsmpi-2021b.eb     |    63 -
 .../darshan-runtime-3.4.0-npsmpic-2021b.eb    |    63 -
 .../darshan-runtime-3.4.0-nvompic-2021b.eb    |    63 -
 .../darshan-util-3.3.1-gompi-2021b.eb         |    74 -
 .../darshan-util-3.3.1-gpsmpi-2021b.eb        |    74 -
 .../darshan-util-3.3.1-iimpi-2021b.eb         |    74 -
 .../darshan-util-3.3.1-ipsmpi-2021b.eb        |    74 -
 .../darshan-util-3.3.1-npsmpic-2021b.eb       |    74 -
 .../darshan-util-3.3.1-nvompic-2021b.eb       |    74 -
 .../darshan-util-3.4.0-gompi-2021b.eb         |    74 -
 .../darshan-util-3.4.0-gpsmpi-2021b.eb        |    74 -
 .../darshan-util-3.4.0-npsmpic-2021b.eb       |    74 -
 .../darshan-util-3.4.0-nvompic-2021b.eb       |    74 -
 ...ask-2021.9.1-gcccoremkl-11.2.0-2021.4.0.eb |    72 -
 ...buted-2.30.1-gcccoremkl-11.2.0-2021.4.0.eb |    43 -
 .../double-conversion-3.1.6-GCCcore-11.2.0.eb |    40 -
 .../e/ELPA/ELPA-2021.11.001-gomkl-2021b.eb    |   107 -
 .../e/ELPA/ELPA-2021.11.001-gpsmkl-2021b.eb   |   105 -
 .../e/ELPA/ELPA-2021.11.001-intel-2021b.eb    |   104 -
 .../ELPA/ELPA-2021.11.001-intel-para-2021b.eb |   104 -
 .../e/ELPA/ELPA-2021.11.001-iomkl-2021b.eb    |   105 -
 ...-2021.11.001_fix_hardcoded_perl_path.patch |    40 -
 ...ELPA-2021.11.001_install-libelpatest.patch | 12790 ----------------
 Golden_Repo/e/ESMF/ESMF-8.2.0-gpsmkl-2021b.eb |    44 -
 Golden_Repo/e/ESMF/psmpi_lmpifort.patch       |    10 -
 .../e/Eigen/Eigen-3.3.9-GCCcore-11.2.0.eb     |    21 -
 .../e/Emacs/Emacs-27.1-GCCcore-11.2.0.eb      |    40 -
 .../e/Embree/Embree-3.13.2-GCC-11.2.0.eb      |    59 -
 .../e/Exiv2/Exiv2-0.27.5-GCCcore-11.2.0.eb    |    34 -
 .../e/Extrae/Extrae-3.8.3-gompi-2021b.eb      |    55 -
 .../e/Extrae/Extrae-3.8.3-gpsmpi-2021b.eb     |    55 -
 .../e/Extrae/Extrae-3.8.3-iompi-2021b.eb      |    55 -
 .../e/Extrae/Extrae-3.8.3-ipsmpi-2021b.eb     |    55 -
 .../ecCodes-2.22.1-GCCcore-11.2.0-nompi.eb    |    48 -
 .../e/ecCodes/ecCodes-2.22.1-gompi-2021b.eb   |    44 -
 .../e/ecCodes/ecCodes-2.22.1-gpsmpi-2021b.eb  |    44 -
 .../e/ecCodes/ecCodes-2.22.1-iimpi-2021b.eb   |    44 -
 .../e/ecCodes/ecCodes-2.22.1-iompi-2021b.eb   |    44 -
 .../e/ecCodes/ecCodes-2.22.1-ipsmpi-2021b.eb  |    44 -
 .../e/ecCodes/ecCodes-2.22.1-npsmpic-2021b.eb |    44 -
 .../e/ecCodes/ecCodes-2.22.1-nvompic-2021b.eb |    44 -
 .../elfutils/elfutils-0.185-GCCcore-11.2.0.eb |    41 -
 .../e/eudev/eudev-3.2.9-GCCcore-11.2.0.eb     |    44 -
 Golden_Repo/e/eudev/eudev-3.2.9_python3.patch |     9 -
 .../e/expat/expat-2.4.1-GCCcore-11.2.0.eb     |    36 -
 .../expecttest-0.1.3-GCCcore-11.2.0.eb        |    25 -
 .../FFTW/FFTW-3.3.10-GCCcore-11.2.0-nompi.eb  |    37 -
 Golden_Repo/f/FFTW/FFTW-3.3.10-gompi-2021b.eb |    25 -
 .../f/FFTW/FFTW-3.3.10-gpsmpi-2021b.eb        |    25 -
 Golden_Repo/f/FFTW/FFTW-3.3.10-iimpi-2021b.eb |    34 -
 Golden_Repo/f/FFTW/FFTW-3.3.10-iompi-2021b.eb |    34 -
 .../f/FFTW/FFTW-3.3.10-ipsmpi-2021b.eb        |    34 -
 .../f/FFTW/FFTW-3.3.10-npsmpic-2021b.eb       |    34 -
 .../f/FFTW/FFTW-3.3.10-nvompic-2021b.eb       |    34 -
 .../f/FFmpeg/FFmpeg-4.4.1-GCCcore-11.2.0.eb   |    70 -
 Golden_Repo/f/FLINT/FLINT-2.7.1-GCC-11.2.0.eb |    36 -
 .../f/FLTK/FLTK-1.3.7-GCCcore-11.2.0.eb       |    45 -
 .../f/Fiona/Fiona-1.8.20-GCCcore-11.2.0.eb    |    47 -
 .../f/Flask/Flask-2.0.2-GCCcore-11.2.0.eb     |    40 -
 .../FreeImage-3.18.0-GCCcore-11.2.0.eb        |    40 -
 .../FreeImage-3.18.0-fix-makefile.patch       |    54 -
 .../FreeSurfer-7.1.1-GCCcore-11.2.0.eb        |    38 -
 .../f/FreeSurfer/freesurfer711-tcsh.patch     |  2070 ---
 Golden_Repo/f/FreeSurfer/license_text.txt     |     5 -
 .../FriBidi/FriBidi-1.0.10-GCCcore-11.2.0.eb  |    33 -
 .../flatbuffers-python-2.0-GCCcore-11.2.0.eb  |    28 -
 .../flatbuffers-2.0.0-GCCcore-11.2.0.eb       |    33 -
 .../f/flex/flex-2.6.4-GCCcore-11.2.0.eb       |    37 -
 Golden_Repo/f/flex/flex-2.6.4.eb              |    28 -
 Golden_Repo/f/fmt/fmt-8.1.1-GCCcore-11.2.0.eb |    30 -
 .../fontconfig-2.13.94-GCCcore-11.2.0.eb      |    40 -
 .../freeglut/freeglut-3.2.1-GCCcore-11.2.0.eb |    39 -
 .../f/freeglut/freeglut-3.2.1_fixgcc10.patch  |    46 -
 .../freetype-2.11.0-GCCcore-11.2.0.eb         |    43 -
 Golden_Repo/g/GCC/GCC-11.2.0.eb               |    26 -
 Golden_Repo/g/GCCcore/GCCcore-11.2.0.eb       |    74 -
 .../GCCcore/GCCcore-6.2.0-fix-find-isl.patch  |    14 -
 .../g/GCCcore/GCCcore-9.3.0_gmp-c99.patch     |    67 -
 .../g/GDAL/GDAL-3.3.2-GCCcore-11.2.0.eb       |    66 -
 Golden_Repo/g/GDB/GDB-11.1-GCCcore-11.2.0.eb  |    44 -
 .../g/GEOS/GEOS-3.9.1-GCCcore-11.2.0.eb       |    22 -
 .../g/GL2PS/GL2PS-1.4.2-GCCcore-11.2.0.eb     |    33 -
 .../g/GLM/GLM-0.9.9.8-GCCcore-11.2.0.eb       |    34 -
 Golden_Repo/g/GLPK/GLPK-5.0-GCCcore-11.2.0.eb |    31 -
 .../g/GLib/GLib-2.69.1-GCCcore-11.2.0.eb      |    52 -
 Golden_Repo/g/GMP/GMP-6.2.1-GCCcore-11.2.0.eb |    40 -
 ...ect-Introspection-1.68.0-GCCcore-11.2.0.eb |    51 -
 .../g/GPAW-setups/GPAW-setups-0.9.9672.eb     |    23 -
 .../g/GPAW/GPAW-21.6.0-gpsmkl-2021b.eb        |    47 -
 .../GPicView/GPicView-0.2.5-GCCcore-11.2.0.eb |    36 -
 .../GROMACS-2021.4-gpsmkl-2021b-plumed.eb     |    77 -
 .../g/GROMACS/GROMACS-2021.4-gpsmkl-2021b.eb  |    69 -
 .../GROMACS-2021_add-missing-sync.patch       |    39 -
 Golden_Repo/g/GSL/GSL-2.7-GCC-11.2.0.eb       |    25 -
 Golden_Repo/g/GSL/GSL-2.7-GCCcore-11.2.0.eb   |    27 -
 .../GStreamer-1.18.6-GCCcore-11.2.0.eb        |    74 -
 .../g/GTK+/GTK+-3.24.23-GCCcore-11.2.0.eb     |    94 -
 ...-theme-3.34.3_disable-svg-conversion.patch |    16 -
 Golden_Repo/g/GTS/GTS-0.7.6-GCCcore-11.2.0.eb |    32 -
 .../Gdk-Pixbuf-2.42.6-GCCcore-11.2.0.eb       |    43 -
 .../Ghostscript-9.54.0-GCCcore-11.2.0.eb      |    59 -
 Golden_Repo/g/Go/Go-1.17.3.eb                 |    30 -
 .../g/Grace/Grace-5.1.25-GCCcore-11.2.0.eb    |    36 -
 .../GraphicsMagick-1.3.36-GCCcore-11.2.0.eb   |    53 -
 .../Graphviz-2.49.3-GCCcore-11.2.0.eb         |    91 -
 .../GtkSourceView-4.4.0-GCCcore-11.2.0.eb     |    43 -
 .../g/g2clib/g2clib-1.6.3-GCCcore-11.2.0.eb   |    24 -
 Golden_Repo/g/g2lib/fix_makefile.patch        |    11 -
 Golden_Repo/g/g2lib/g2lib-3.1.0-kind.patch    |    41 -
 .../g/g2lib/g2lib-3.1.0_makefile.patch        |    21 -
 .../g/g2lib/g2lib-3.2.0-GCCcore-11.2.0.eb     |    33 -
 .../g/g2lib/g2lib-3.2.0_makefile.patch        |    40 -
 Golden_Repo/g/gc/gc-8.2.0-GCCcore-11.2.0.eb   |    44 -
 .../gcccoremkl/gcccoremkl-11.2.0-2021.4.0.eb  |    26 -
 .../g/gettext/gettext-0.21-GCCcore-11.2.0.eb  |    34 -
 Golden_Repo/g/gettext/gettext-0.21.eb         |    40 -
 .../g/gflags/gflags-2.2.2-GCCcore-11.2.0.eb   |    35 -
 .../g/giflib/giflib-5.2.1-GCCcore-11.2.0.eb   |    28 -
 Golden_Repo/g/git-lfs/git-lfs-2.11.0.eb       |    29 -
 .../g/git/git-2.33.1-GCCcore-11.2.0-nodocs.eb |    47 -
 .../g/glog/glog-0.5.0-GCCcore-11.2.0.eb       |    33 -
 ...mpy2-2.1.0b5-gcccoremkl-11.2.0-2021.4.0.eb |    25 -
 .../g/gnuplot/gnuplot-5.4.2-GCCcore-11.2.0.eb |    51 -
 Golden_Repo/g/gomkl/gomkl-2021b.eb            |    27 -
 Golden_Repo/g/gompi/gompi-2021b.eb            |    28 -
 .../g/gperf/gperf-3.1-GCCcore-11.2.0.eb       |    30 -
 Golden_Repo/g/gpsmkl/gpsmkl-2021b.eb          |    24 -
 Golden_Repo/g/gpsmpi/gpsmpi-2021b.eb          |    19 -
 .../g/groff/groff-1.22.4-GCCcore-11.2.0.eb    |    29 -
 ...s-desktop-schemas-3.34.0-GCCcore-11.2.0.eb |    38 -
 .../g/guile/guile-2.0.14-GCCcore-11.2.0.eb    |    41 -
 .../g/guile/guile-3.0.7-GCCcore-11.2.0.eb     |    43 -
 .../g/gzip/gzip-1.10-GCCcore-11.2.0.eb        |    24 -
 .../h/HDF/HDF-4.2.15-GCCcore-11.2.0.eb        |    65 -
 .../HDF5/HDF5-1.12.1-GCCcore-11.2.0-serial.eb |    31 -
 Golden_Repo/h/HDF5/HDF5-1.12.1-gompi-2021b.eb |    21 -
 .../h/HDF5/HDF5-1.12.1-gpsmpi-2021b.eb        |    21 -
 Golden_Repo/h/HDF5/HDF5-1.12.1-iimpi-2021b.eb |    21 -
 Golden_Repo/h/HDF5/HDF5-1.12.1-iompi-2021b.eb |    21 -
 .../h/HDF5/HDF5-1.12.1-ipsmpi-2021b.eb        |    21 -
 .../h/HDF5/HDF5-1.12.1-npsmpic-2021b.eb       |    21 -
 .../h/HDF5/HDF5-1.12.1-nvompic-2021b.eb       |    21 -
 .../h/HDFView/HDFView-3.1.3-GCCcore-11.2.0.eb |    31 -
 .../h/HTSlib/HTSlib-1.14-GCCcore-11.2.0.eb    |    41 -
 .../HarfBuzz/HarfBuzz-2.8.2-GCCcore-11.2.0.eb |    45 -
 .../h/Harminv/Harminv-1.4.1-intel-2021b.eb    |    22 -
 .../Harminv/Harminv-1.4.1-intel-para-2021b.eb |    22 -
 .../h/Harminv/Harminv-1.4.1-iomkl-2021b.eb    |    22 -
 .../h/Horovod/Horovod-0.24.3-gomkl-2021b.eb   |   102 -
 .../h/Horovod/Horovod-0.25.0-gomkl-2021b.eb   |   101 -
 .../Hypre-2.23.0-gomkl-2021b-mixedint.eb      |    58 -
 .../h/Hypre/Hypre-2.23.0-gomkl-2021b.eb       |    56 -
 .../Hypre-2.23.0-gpsmkl-2021b-mixedint.eb     |    57 -
 .../h/Hypre/Hypre-2.23.0-gpsmkl-2021b.eb      |    54 -
 .../Hypre-2.23.0-intel-2021b-mixedint.eb      |    56 -
 .../h/Hypre/Hypre-2.23.0-intel-2021b.eb       |    54 -
 .../Hypre-2.23.0-intel-para-2021b-mixedint.eb |    56 -
 .../h/Hypre/Hypre-2.23.0-intel-para-2021b.eb  |    54 -
 .../Hypre-2.23.0-iomkl-2021b-mixedint.eb      |    56 -
 .../h/Hypre/Hypre-2.23.0-iomkl-2021b.eb       |    54 -
 .../h/Hypre/hypre-2.23.0_examples_mkl.patch   |   536 -
 .../h5py/h5py-3.5.0-GCCcore-11.2.0-serial.eb  |    38 -
 Golden_Repo/h/h5py/h5py-3.5.0-gompi-2021b.eb  |    36 -
 Golden_Repo/h/h5py/h5py-3.5.0-gpsmpi-2021b.eb |    36 -
 Golden_Repo/h/h5py/h5py-3.5.0-iimpi-2021b.eb  |    36 -
 Golden_Repo/h/h5py/h5py-3.5.0-iompi-2021b.eb  |    36 -
 Golden_Repo/h/h5py/h5py-3.5.0-ipsmpi-2021b.eb |    36 -
 .../h/h5py/h5py-3.5.0-npsmpic-2021b.eb        |    37 -
 .../h/h5py/h5py-3.5.0-nvompic-2021b.eb        |    37 -
 .../help2man-1.48.3-GCCcore-11.2.0.eb         |    27 -
 .../h/hwloc/hwloc-2.5.0-GCCcore-11.2.0.eb     |    52 -
 .../hypothesis-6.14.6-GCCcore-11.2.0.eb       |    24 -
 Golden_Repo/i/ICU/ICU-70.1-GCCcore-11.2.0.eb  |    27 -
 ...-1.3-gcccoremkl-11.2.0-2021.4.0-R-4.1.2.eb |    66 -
 Golden_Repo/i/ISL/ISL-0.24-GCCcore-11.2.0.eb  |    23 -
 .../i/ITK/ITK-5.2.1-GCCcore-11.2.0-nompi.eb   |   176 -
 Golden_Repo/i/ITK/ITK-5.2.1-gompi-2021b.eb    |   175 -
 Golden_Repo/i/ITK/ITK-5.2.1-gpsmpi-2021b.eb   |   177 -
 .../i/ITSTool/ITSTool-2.0.7-GCCcore-11.2.0.eb |    28 -
 .../ImageMagick-7.1.0-13-GCCcore-11.2.0.eb    |    44 -
 Golden_Repo/i/Inspector/Inspector-2022.0.0.eb |    24 -
 Golden_Repo/i/iimpi/iimpi-2021b.eb            |    18 -
 .../i/imkl/imkl-2021.4.0-gompi-2021b.eb       |    39 -
 .../i/imkl/imkl-2021.4.0-gpsmpi-2021b.eb      |    39 -
 .../i/imkl/imkl-2021.4.0-iimpi-2021b.eb       |    39 -
 .../i/imkl/imkl-2021.4.0-iompi-2021b.eb       |    39 -
 .../i/imkl/imkl-2021.4.0-ipsmpi-2021b.eb      |    39 -
 Golden_Repo/i/imkl/imkl-2021.4.0.eb           |    45 -
 .../i/impi-settings/impi-settings-2021-UCX.eb |    25 -
 .../impi-settings/impi-settings-2021-plain.eb |    24 -
 .../impi-2021.4.0-intel-compilers-2021.4.0.eb |    17 -
 .../intel-compilers-2021.4.0.eb               |    33 -
 Golden_Repo/i/intel-para/intel-para-2021b.eb  |    27 -
 Golden_Repo/i/intel/intel-2021b.eb            |    21 -
 .../intltool-0.51.0-GCCcore-11.2.0.eb         |    37 -
 .../intltool-0.51.0_fix-Perl-compat.patch     |    45 -
 Golden_Repo/i/iomkl/iomkl-2021b.eb            |    23 -
 Golden_Repo/i/iompi/iompi-2021b.eb            |    18 -
 Golden_Repo/i/ipp/ipp-2021.5.1.eb             |    22 -
 Golden_Repo/i/ipsmpi/ipsmpi-2021b.eb          |    18 -
 Golden_Repo/i/ispc/ispc-1.16.1.eb             |    26 -
 Golden_Repo/i/itac/itac-2021.5.0.eb           |    18 -
 Golden_Repo/j/JUBE/JUBE-2.4.2.eb              |    31 -
 Golden_Repo/j/JUBE/JUBE-2.4.3.eb              |    31 -
 Golden_Repo/j/JUBE/JUBE-2.5.0.eb              |    31 -
 Golden_Repo/j/JUBE/JUBE-2.5.1.eb              |    31 -
 .../j/JasPer/JasPer-2.0.33-GCCcore-11.2.0.eb  |    42 -
 Golden_Repo/j/Java/Java-15.0.1.eb             |    15 -
 Golden_Repo/j/Java/Java-15.eb                 |    14 -
 .../j/JsonCpp/JsonCpp-1.9.4-GCCcore-11.2.0.eb |    40 -
 .../Julia-1.7.1-gcccoremkl-11.2.0-2021.4.0.eb |   216 -
 .../j/Julia/Julia-1.7.1-gomkl-2021b.eb        |   230 -
 Golden_Repo/j/Jupyter/401html.patch           |   135 -
 ...ter-2022.3.3-gcccoremkl-11.2.0-2021.4.0.eb |  1293 --
 ...ter-2022.3.4-gcccoremkl-11.2.0-2021.4.0.eb |  1359 --
 ...istributed-2022.8.1_unpin-tornado6.2.patch |    13 -
 Golden_Repo/j/Jupyter/flake8_mccabe07.patch   |    12 -
 .../jupyter-resource-usage_fixpsutil.patch    |    17 -
 ...pyter-server-proxy_pr337_unixsockets.patch |   175 -
 .../jupyter-server-proxy_timeout.patch        |    24 -
 .../j/Jupyter/jupyter-server_i11934.patch     |    12 -
 ..._contrib_nbextensions-template_paths.patch |   121 -
 .../jupyter_latex_envs-template_paths.patch   |    48 -
 .../jupyterhub-1.1.0_logoutcookie-2.0.patch   |   123 -
 .../Jupyter/jupyterlab-gitlab-2.0.0_jsc.patch |    23 -
 .../j/Jupyter/jupyterlab-gitlab-widget3.patch |    39 -
 .../jupyterlab-s3-browser_pr86_s3v2.patch     |   133 -
 .../Jupyter/jupyterlab_github-2.0.0_jsc.patch |    13 -
 .../j/Jupyter/jupyterlab_i7081_retry503.patch |   232 -
 .../j/Jupyter/jupyterlmod-packagejson.patch   |    17 -
 .../j/Jupyter/jupyterlmod-urlfile.patch       |    37 -
 .../Jupyter/jupyterserverproxy-urlfile.patch  |    82 -
 .../Jupyter/jupyterserverproxy-urlfile3.patch |    82 -
 Golden_Repo/j/Jupyter/nbdev_noqtconsole.patch |    12 -
 .../j/Jupyter/notebook-6.0.3_jsc.patch        |   143 -
 .../j/Jupyter/notebook-6.4.11_jsc.patch       |   141 -
 Golden_Repo/j/Jupyter/tornado-timeouts.patch  |    14 -
 Golden_Repo/j/Jupyter/update_favorites_json   |   157 -
 ...ion-2022.3.3-gcccoremkl-11.2.0-2021.4.0.eb |    34 -
 ...ion-2022.3.4-gcccoremkl-11.2.0-2021.4.0.eb |    34 -
 ...1.0-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb |   182 -
 ...7.0-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb |   179 -
 ...6.0-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb |    55 -
 ...7.0-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb |    55 -
 ...5.0-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb |    52 -
 ...7.2-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb |    96 -
 ...7.2-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb |    96 -
 ...0.9-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb |    95 -
 ...0.9-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb |    95 -
 ...2.1-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb |    64 -
 ...2.1-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb |    64 -
 ...7.1-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb |   129 -
 ...7.1-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb |   129 -
 ...4.0-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb |   141 -
 ...4.0-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb |   141 -
 ...1.1-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb |   163 -
 ...1.1-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb |   163 -
 .../logo-128x128.png.base64                   |   164 -
 .../logo-32x32.png.base64                     |    24 -
 .../logo-64x64.png.base64                     |    63 -
 ...3.0-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb |   141 -
 .../logo-128x128.png.base64                   |   217 -
 .../logo-32x32.png.base64                     |    35 -
 .../logo-64x64.png.base64                     |    87 -
 ...1.0-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb |   131 -
 ...1.0-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb |   131 -
 .../logo-128x128.png.base64                   |   229 -
 .../logo-32x32.png.base64                     |    30 -
 .../logo-64x64.png.base64                     |    79 -
 ...1.2-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb |   112 -
 ...1.2-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb |   112 -
 ...0.1-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb |    59 -
 ...0.1-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb |    59 -
 ...3.2-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb |    83 -
 ...3.4-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb |    79 -
 .../jupyter_xprahtml5_fixfont.patch           |    11 -
 .../jupyter_xprahtml5_proxy-launch_xpra.patch |    27 -
 ....7.0_cuda-noncanonical-include-paths.patch |    20 -
 ...2.19_fix-update-of-cache-access-time.patch |    18 -
 ....9-gcccoremkl-11.2.0-2021.4.0-CUDA-11.5.eb |   118 -
 ...ib-0.1.70_add-bazel-args-to-shutdown.patch |    18 -
 .../j/jax/jaxlib_local-tensorflow-repo.sed    |    12 -
 .../jemalloc/jemalloc-5.2.1-GCCcore-11.2.0.eb |    37 -
 .../jsc-xdg-menu-2022.5-GCCcore-11.2.0.eb     |    40 -
 .../k/kim-api/kim-api-2.2.1-GCCcore-11.2.0.eb |    47 -
 .../l/LAME/LAME-3.100-GCCcore-11.2.0.eb       |    38 -
 .../l/LAMMPS/LAMMPS-7Jan2022-gpsmkl-2021b.eb  |   166 -
 .../l/LCov/LCov-1.15-GCCcore-11.2.0.eb        |    29 -
 .../l/LLVM/LLVM-13.0.0-GCCcore-11.2.0.eb      |    41 -
 .../l/LMDB/LMDB-0.9.29-GCCcore-11.2.0.eb      |    34 -
 .../l/LibTIFF/LibTIFF-4.3.0-GCCcore-11.2.0.eb |    32 -
 ...a.6-intel-compilers-2021.4.0_cp2k_lmax5.eb |    56 -
 .../LittleCMS-2.12-GCCcore-11.2.0.eb          |    30 -
 ...2-OpenResty-2.1-20220411-GCCcore-11.2.0.eb |    38 -
 .../libGDSII/libGDSII-0.21-GCCcore-11.2.0.eb  |    26 -
 .../l/libaec/libaec-1.0.6-GCCcore-11.2.0.eb   |    28 -
 .../l/libaio/libaio-0.3.112-GCCcore-11.2.0.eb |    32 -
 .../libarchive-3.5.1-GCCcore-11.2.0.eb        |    33 -
 .../l/libcerf/libcerf-1.17-GCCcore-11.2.0.eb  |    33 -
 ...ibcint-4.4.0-gcccoremkl-11.2.0-2021.4.0.eb |    40 -
 .../libcint-4.4.0_remove_pyscftest.patch      |    18 -
 .../libcroco-0.6.13-GCCcore-11.2.0.eb         |    34 -
 .../l/libctl/libctl-4.5.1-GCC-11.2.0.eb       |    21 -
 .../libctl-4.5.1-intel-compilers-2021.4.0.eb  |    25 -
 .../l/libdap/libdap-3.20.8-GCCcore-11.2.0.eb  |    34 -
 .../l/libdrm/libdrm-2.4.107-GCCcore-11.2.0.eb |    32 -
 .../l/libdrm/libdrm-2.4.108-GCCcore-11.2.0.eb |    34 -
 .../libdwarf-20210528-GCCcore-11.2.0.eb       |    34 -
 .../l/libelf/libelf-0.8.13-GCCcore-11.2.0.eb  |    34 -
 .../libepoxy/libepoxy-1.5.9-GCCcore-11.2.0.eb |    37 -
 .../libevent-2.1.12-GCCcore-11.2.0.eb         |    40 -
 .../l/libffi/libffi-3.4.2-GCCcore-11.2.0.eb   |    30 -
 .../l/libgd/libgd-2.3.1-GCCcore-11.2.0.eb     |    35 -
 .../libgeotiff-1.7.0-GCCcore-11.2.0.eb        |    41 -
 .../l/libgit2/libgit2-1.1.1-GCCcore-11.2.0.eb |    34 -
 .../libglvnd/libglvnd-1.3.3-GCCcore-11.2.0.eb |    35 -
 .../libiconv/libiconv-1.16-GCCcore-11.2.0.eb  |    23 -
 .../libjpeg-turbo-2.1.1-GCCcore-11.2.0.eb     |    42 -
 Golden_Repo/l/libmatheval/003-guile2.0.patch  |   403 -
 .../libmatheval-1.1.11-GCCcore-11.2.0.eb      |    48 -
 ...libmatheval-1.1.11_fix-matheval-test.patch |    32 -
 .../libmpack-lua-1.0.9-GCCcore-11.2.0.eb      |    58 -
 .../libpciaccess-0.16-GCCcore-11.2.0.eb       |    26 -
 .../l/libpng/libpng-1.6.37-GCCcore-11.2.0.eb  |    30 -
 .../libreadline-8.1-GCCcore-11.2.0.eb         |    43 -
 ...ibrosa-0.9.2-gcccoremkl-11.2.0-2021.4.0.eb |    41 -
 .../librsvg/librsvg-2.51.2-GCCcore-11.2.0.eb  |    45 -
 .../libsndfile-1.0.31-GCCcore-11.2.0.eb       |    29 -
 .../libsodium-1.0.18-GCCcore-11.2.0.eb        |    33 -
 .../libspatialindex-1.9.3-GCCcore-11.2.0.eb   |    26 -
 .../l/libspng/libspng-0.7.1-GCCcore-11.2.0.eb |    43 -
 .../libtermkey-0.22-GCCcore-11.2.0.eb         |    36 -
 .../libtirpc/libtirpc-1.3.2-GCCcore-11.2.0.eb |    28 -
 .../l/libtool/libtool-2.4.6-GCCcore-11.2.0.eb |    34 -
 Golden_Repo/l/libtool/libtool-2.4.6.eb        |    27 -
 .../libunistring-0.9.10-GCCcore-11.2.0.eb     |    31 -
 .../libunwind-1.5.0-GCCcore-11.2.0.eb         |    38 -
 .../l/libuv/libuv-1.44.2-GCCcore-11.2.0.eb    |    33 -
 .../l/libvdwxc/libvdwxc-0.4.0-gpsmpi-2021b.eb |    33 -
 .../libvips/libvips-8.13.1-GCCcore-11.2.0.eb  |    40 -
 .../l/libvpx/libvpx-1.11.0-GCCcore-11.2.0.eb  |    35 -
 .../libvterm/libvterm-0.1.3-GCCcore-11.2.0.eb |    35 -
 .../l/libwebp/libwebp-1.2.0-GCCcore-11.2.0.eb |    38 -
 Golden_Repo/l/libxc/libxc-5.1.7-GCC-11.2.0.eb |    47 -
 .../libxc-5.1.7-intel-compilers-2021.4.0.eb   |    47 -
 ...xml2-2.9.10-parenthesize-type-checks.patch |    92 -
 .../libxml2-python-2.9.10-GCCcore-11.2.0.eb   |    54 -
 .../libxml2/libxml2-2.9.10-GCCcore-11.2.0.eb  |    30 -
 .../libxslt/libxslt-1.1.34-GCCcore-11.2.0.eb  |    31 -
 .../l/libxsmm/libxsmm-1.16.3-GCC-11.2.0.eb    |    34 -
 ...libxsmm-1.16.3-intel-compilers-2021.4.0.eb |    33 -
 .../l/libyaml/libyaml-0.2.5-GCCcore-11.2.0.eb |    23 -
 .../libyuv/libyuv-20210428-GCCcore-11.2.0.eb  |    60 -
 .../l/likwid/likwid-5.2.1-GCCcore-11.2.0.eb   |    50 -
 .../l/lpeg/lpeg-1.0.2-GCCcore-11.2.0.eb       |    57 -
 Golden_Repo/l/luv/compat-5.3.c                |   948 --
 Golden_Repo/l/luv/compat-5.3.h                |   424 -
 .../l/luv/luv-1.44.2-0-GCCcore-11.2.0.eb      |    59 -
 .../l/lxml/lxml-4.6.3-GCCcore-11.2.0.eb       |    26 -
 Golden_Repo/l/lz4/lz4-1.9.3-GCCcore-11.2.0.eb |    30 -
 Golden_Repo/m/M4/M4-1.4.19-GCCcore-11.2.0.eb  |    31 -
 Golden_Repo/m/M4/M4-1.4.19.eb                 |    33 -
 .../m/MATLAB/MATLAB-2022a-GCCcore-11.2.0.eb   |    60 -
 Golden_Repo/m/MATLAB/README.txt               |    13 -
 Golden_Repo/m/MCR/MCR-R2021b.2.eb             |    21 -
 Golden_Repo/m/MCR/MCR-R2022a.eb               |    20 -
 ...alysis-2.0.0-gcccoremkl-11.2.0-2021.4.0.eb |    46 -
 Golden_Repo/m/MED/MED-4.1.0-gpsmpi-2021b.eb   |    44 -
 .../m/MED/med-4.1.0_hdf5_H5Oget_info.patch    |    96 -
 Golden_Repo/m/MED/med-4.1.0_hdf5_v11201.patch |   126 -
 .../METIS-5.1.0-GCC-11.2.0-RTW64-IDX32.eb     |    32 -
 Golden_Repo/m/METIS/METIS-5.1.0-GCC-11.2.0.eb |    26 -
 .../METIS/METIS-5.1.0-GCCcore-11.2.0-IDX64.eb |    34 -
 Golden_Repo/m/METIS/METIS-5.1.0-IDX64.patch   |    11 -
 .../METIS-5.1.0-intel-compilers-2021.4.0.eb   |    26 -
 .../m/METIS/METIS-5.1.0-use-doubles.patch     |    11 -
 Golden_Repo/m/MPB/MPB-1.11.1-ipsmpi-2021b.eb  |    51 -
 Golden_Repo/m/MPC/MPC-1.2.1-GCCcore-11.2.0.eb |    35 -
 .../m/MPFR/MPFR-4.1.0-GCCcore-11.2.0.eb       |    39 -
 .../m/MUMPS/MUMPS-5.4.1-gomkl-2021b.eb        |    68 -
 .../m/MUMPS/MUMPS-5.4.1-gpsmkl-2021b.eb       |    68 -
 .../m/MUMPS/MUMPS-5.4.1_examples_mkl.patch    |   270 -
 .../m/MUMPS/MUMPS-5.4.1_shared-mumps.patch    |    59 -
 .../m/MUMPS/MUMPS-5.4.1_shared-pord.patch     |    46 -
 Golden_Repo/m/MUST/MUST-1.7.2-gompi-2021b.eb  |    53 -
 Golden_Repo/m/MUST/MUST-1.7.2-gpsmpi-2021b.eb |    53 -
 Golden_Repo/m/MUST/MUST-1.7.2-iimpi-2021b.eb  |    53 -
 Golden_Repo/m/MUST/MUST-1.7.2-iompi-2021b.eb  |    53 -
 Golden_Repo/m/MUST/MUST-1.7.2-ipsmpi-2021b.eb |    53 -
 Golden_Repo/m/MUST/wrap-config.cmake.in.patch |    90 -
 .../m/Mako/Mako-1.1.4-GCCcore-11.2.0.eb       |    29 -
 .../m/Meep/Meep-1.24.0-intel-para-2021b.eb    |    59 -
 ...rcurial-5.8-GCCcore-11.2.0-Python-3.9.6.eb |    31 -
 .../m/Meson/Meson-0.58.2-GCCcore-11.2.0.eb    |    34 -
 .../m/MethPipe/MethPipe-5.0.0-gpsmkl-2021b.eb |    45 -
 ....1-gcccoremkl-11.2.0-2021.4.0-CUDA-11.5.eb |    41 -
 .../m/magma/magma-2.6.1_allow-all-sms.patch   |   230 -
 .../m/makeinfo/makeinfo-6.8-GCCcore-11.2.0.eb |    25 -
 ...lotlib-3.4.3-gcccoremkl-11.2.0-2021.4.0.eb |    64 -
 .../memkind/memkind-1.12.0-GCCcore-11.2.0.eb  |    31 -
 .../m/motif/motif-2.3.8-GCCcore-11.2.0.eb     |    42 -
 .../m/mpi4py/mpi4py-3.1.3-gompi-2021b.eb      |    24 -
 .../m/mpi4py/mpi4py-3.1.3-gpsmpi-2021b.eb     |    25 -
 .../m/mpi4py/mpi4py-3.1.3-iimpi-2021b.eb      |    25 -
 .../m/mpi4py/mpi4py-3.1.3-iompi-2021b.eb      |    25 -
 .../m/mpi4py/mpi4py-3.1.3-ipsmpi-2021b.eb     |    25 -
 .../m/mpi4py/mpi4py-3.1.3-npsmpic-2021b.eb    |    26 -
 .../m/mpi4py/mpi4py-3.1.3-nvompic-2021b.eb    |    26 -
 Golden_Repo/m/mpiP/mpiP-3.5-gpsmpi-2021b.eb   |    44 -
 .../msgpack-c-4.0.0-GCCcore-11.2.0.eb         |    35 -
 .../muparserx-4.0.8-GCCcore-11.2.0.eb         |    27 -
 Golden_Repo/n/NAMD/NAMD-2.14-gompi-2021b.eb   |    45 -
 Golden_Repo/n/NAMD/NAMD-2.14-gpsmpi-2021b.eb  |    45 -
 Golden_Repo/n/NAMD/NAMD-2.14-iimpi-2021b.eb   |    45 -
 Golden_Repo/n/NAMD/NAMD-2.14-iompi-2021b.eb   |    45 -
 Golden_Repo/n/NAMD/NAMD-2.14-ipsmpi-2021b.eb  |    45 -
 .../n/NAMD/namd-2.14-fix-gnu-casting.patch    |    11 -
 .../n/NASM/NASM-2.15.05-GCCcore-11.2.0.eb     |    25 -
 .../NCCL-2.11.4-GCCcore-11.2.0-CUDA-11.5.eb   |    23 -
 .../NCCL-2.12.7-1-GCCcore-11.2.0-CUDA-11.5.eb |    30 -
 .../NCCL-2.14.3-1-GCCcore-11.2.0-CUDA-11.5.eb |    30 -
 Golden_Repo/n/NCO/NCO-5.0.3-gompi-2021b.eb    |    43 -
 Golden_Repo/n/NCO/NCO-5.0.3-gpsmpi-2021b.eb   |    43 -
 Golden_Repo/n/NCO/NCO-5.0.3-iimpi-2021b.eb    |    43 -
 Golden_Repo/n/NCO/NCO-5.0.3-iompi-2021b.eb    |    43 -
 Golden_Repo/n/NCO/NCO-5.0.3-ipsmpi-2021b.eb   |    43 -
 Golden_Repo/n/NCO/NCO-5.0.3-npsmpic-2021b.eb  |    43 -
 Golden_Repo/n/NCO/NCO-5.0.3-nvompic-2021b.eb  |    43 -
 .../n/NLopt/NLopt-2.7.0-GCCcore-11.2.0.eb     |    33 -
 .../n/NSPR/NSPR-4.32-GCCcore-11.2.0.eb        |    30 -
 Golden_Repo/n/NSS/NSS-3.39_pkgconfig.patch    |   221 -
 .../n/NSS/NSS-3.51_fix_kremlin_ppc64le.patch  |    28 -
 Golden_Repo/n/NSS/NSS-3.73-GCCcore-11.2.0.eb  |    55 -
 Golden_Repo/n/NVHPC/NVHPC-21.11.eb            |    70 -
 Golden_Repo/n/NVHPC/NVHPC-22.1.eb             |    72 -
 Golden_Repo/n/NVHPC/NVHPC-22.3.eb             |    73 -
 Golden_Repo/n/NVHPC/NVHPC-22.7.eb             |    73 -
 .../n/NVSHMEM/NVSHMEM-2.4.1-gompi-2021b.eb    |    65 -
 .../n/NVSHMEM/NVSHMEM-2.4.1-gpsmpi-2021b.eb   |    65 -
 .../n/NVSHMEM/NVSHMEM-2.5.0-gpsmpi-2021b.eb   |    65 -
 .../n/NWChem/NWChem-7.0.2-intel-2021b.eb      |    49 -
 .../n/NWChem/NWChem-7.0.2-intel-para-2021b.eb |    49 -
 Golden_Repo/n/NWChem/NWChem_fix-date.patch    |    11 -
 .../n/NeoVim/NeoVim-0.7.2-GCCcore-11.2.0.eb   |    74 -
 .../Ninja-Python-1.10.2-GCCcore-11.2.0.eb     |    38 -
 .../n/Ninja/Ninja-1.10.2-GCCcore-11.2.0.eb    |    31 -
 .../Nsight-Compute-2022.1.0-GCCcore-11.2.0.eb |    47 -
 .../Nsight-Compute-2022.1.1-GCCcore-11.2.0.eb |    47 -
 .../Nsight-Compute-2022.2.0-GCCcore-11.2.0.eb |    47 -
 .../Nsight-Systems-2021.5.1-GCCcore-11.2.0.eb |    44 -
 .../Nsight-Systems-2022.1.1-GCCcore-11.2.0.eb |    44 -
 .../Nsight-Systems-2022.2.1-GCCcore-11.2.0.eb |    44 -
 Golden_Repo/n/nano/nano-5.9-GCCcore-11.2.0.eb |    25 -
 .../n/ncurses/ncurses-6.2-GCCcore-11.2.0.eb   |    49 -
 Golden_Repo/n/ncurses/ncurses-6.2.eb          |    48 -
 .../n/ncview/ncview-2.1.8-GCCcore-11.2.0.eb   |    40 -
 ...netCDF-C++4-4.3.1-GCCcore-11.2.0-serial.eb |    28 -
 .../netCDF-C++4-4.3.1-gompi-2021b.eb          |    26 -
 .../netCDF-C++4-4.3.1-gpsmpi-2021b.eb         |    26 -
 .../netCDF-C++4-4.3.1-iimpi-2021b.eb          |    26 -
 .../netCDF-C++4-4.3.1-iompi-2021b.eb          |    26 -
 .../netCDF-C++4-4.3.1-ipsmpi-2021b.eb         |    26 -
 .../netCDF-C++4-4.3.1-npsmpic-2021b.eb        |    26 -
 .../netCDF-C++4-4.3.1-nvompic-2021b.eb        |    26 -
 ...CDF-Fortran-4.5.3-GCCcore-11.2.0-serial.eb |    28 -
 .../netCDF-Fortran-4.5.3-gompi-2021b.eb       |    26 -
 .../netCDF-Fortran-4.5.3-gpsmpi-2021b.eb      |    26 -
 .../netCDF-Fortran-4.5.3-iimpi-2021b.eb       |    26 -
 .../netCDF-Fortran-4.5.3-iompi-2021b.eb       |    26 -
 .../netCDF-Fortran-4.5.3-ipsmpi-2021b.eb      |    26 -
 .../netCDF-Fortran-4.5.3-npsmpic-2021b.eb     |    26 -
 .../netCDF-Fortran-4.5.3-nvompic-2021b.eb     |    26 -
 .../netCDF-4.8.1-GCCcore-11.2.0-serial.eb     |    40 -
 .../n/netCDF/netCDF-4.8.1-gompi-2021b.eb      |    40 -
 .../n/netCDF/netCDF-4.8.1-gpsmpi-2021b.eb     |    40 -
 .../n/netCDF/netCDF-4.8.1-iimpi-2021b.eb      |    40 -
 .../n/netCDF/netCDF-4.8.1-iompi-2021b.eb      |    40 -
 .../n/netCDF/netCDF-4.8.1-ipsmpi-2021b.eb     |    40 -
 .../n/netCDF/netCDF-4.8.1-npsmpic-2021b.eb    |    40 -
 .../n/netCDF/netCDF-4.8.1-nvompic-2021b.eb    |    40 -
 ...df4-python-1.1.8-avoid-diskless-test.patch |    14 -
 ...cdf4-python-1.5.7-GCCcore-11.2.0-serial.eb |    57 -
 .../netcdf4-python-1.5.7-gompi-2021b.eb       |    56 -
 .../netcdf4-python-1.5.7-gpsmpi-2021b.eb      |    56 -
 .../netcdf4-python-1.5.7-iimpi-2021b.eb       |    56 -
 .../netcdf4-python-1.5.7-iompi-2021b.eb       |    56 -
 .../netcdf4-python-1.5.7-ipsmpi-2021b.eb      |    56 -
 .../netcdf4-python-1.5.7-npsmpic-2021b.eb     |    57 -
 .../netcdf4-python-1.5.7-nvompic-2021b.eb     |    57 -
 .../n/nettle/nettle-3.7.3-GCCcore-11.2.0.eb   |    39 -
 ...tworkx-2.6.3-gcccoremkl-11.2.0-2021.4.0.eb |    24 -
 .../nlohmann-json-3.10.4-GCCcore-11.2.0.eb    |    26 -
 .../n/nodejs/nodejs-16.13.0-GCCcore-11.2.0.eb |    44 -
 Golden_Repo/n/npsmpic/npsmpic-2021b.eb        |    19 -
 .../n/nsync/nsync-1.24.0-GCCcore-11.2.0.eb    |    26 -
 Golden_Repo/n/numactl/numactl-2.0.14.eb       |    36 -
 .../n/numba/llvmlite-0.38.0-llvm13.patch      |    92 -
 ...numba-0.55.1-gcccoremkl-11.2.0-2021.4.0.eb |    75 -
 .../nvidia-Video_Codec_SDK-11.1.5.eb          |    47 -
 .../n/nvidia-driver/nvidia-driver-default.eb  |    23 -
 Golden_Repo/n/nvompic/nvompic-2021b.eb        |    19 -
 .../o/OPARI2/OPARI2-2.0.6-GCCcore-11.2.0.eb   |    44 -
 .../o/OSPRay/OSPRay-2.8.0-gpsmpi-2021b.eb     |    63 -
 Golden_Repo/o/OTF2/OTF2-2.3-GCCcore-11.2.0.eb |    49 -
 Golden_Repo/o/OTF2/OTF2-3.0-GCCcore-11.2.0.eb |    49 -
 ...-6.4.0-gcccoremkl-11.2.0-2021.4.0-nompi.eb |    86 -
 ...OpenCV-4.5.4-gcccoremkl-11.2.0-2021.4.0.eb |    77 -
 ....5.5-gcccoremkl-11.2.0-2021.4.0-contrib.eb |   139 -
 .../o/OpenEXR/OpenEXR-3.1.1-GCCcore-11.2.0.eb |    31 -
 .../OpenFOAM/OpenFOAM-v1906-wmake-ompi.patch  |    29 -
 .../o/OpenFOAM/OpenFOAM-v2012-cleanup.patch   |   150 -
 .../o/OpenFOAM/OpenFOAM-v2112-gpsmpi-2021b.eb |    41 -
 .../o/OpenGL/OpenGL-2021b-GCCcore-11.2.0.eb   |   235 -
 Golden_Repo/o/OpenGL/ofnone-fix.patch         |    92 -
 Golden_Repo/o/OpenGL/swrllvm-fix.patch        |   262 -
 ...enoise-1.4.2-gcccoremkl-11.2.0-2021.4.0.eb |    39 -
 .../OpenJPEG/OpenJPEG-2.4.0-GCCcore-11.2.0.eb |    43 -
 .../OpenMPI-settings-4.1-plain.eb             |    42 -
 .../o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb     |    61 -
 .../OpenMPI-4.1.1-intel-compilers-2021.4.0.eb |    61 -
 .../o/OpenMPI/OpenMPI-4.1.2-GCC-11.2.0.eb     |    61 -
 .../o/OpenMPI/OpenMPI-4.1.2-NVHPC-22.1.eb     |    61 -
 .../OpenMPI-4.1.2-intel-compilers-2021.4.0.eb |    61 -
 .../OpenPGM/OpenPGM-5.2.122-GCCcore-11.2.0.eb |    49 -
 Golden_Repo/o/OpenSSL/OpenSSL-1.1.eb          |    39 -
 .../OpenSlide-3.4.1-GCCcore-11.2.0.eb         |    45 -
 .../OpenStackClient-5.8.0-GCCcore-11.2.0.eb   |   133 -
 Golden_Repo/o/OptiX/OptiX-6.5.0.eb            |    31 -
 Golden_Repo/o/OptiX/OptiX-7.4.0.eb            |    31 -
 .../openslide-python-1.2.0-GCCcore-11.2.0.eb  |    29 -
 .../o/openvkl/openvkl-1.1.0-GCC-11.2.0.eb     |    43 -
 .../p/PAPI/PAPI-6.0.0.1-GCCcore-11.2.0.eb     |    49 -
 .../p/PCRE/PCRE-8.45-GCCcore-11.2.0.eb        |    45 -
 .../p/PCRE2/PCRE2-10.37-GCCcore-11.2.0.eb     |    28 -
 .../p/PDT/PDT-3.25.1-GCCcore-11.2.0.eb        |    40 -
 .../p/PETSc/PETSc-3.16.3-gomkl-2021b.eb       |    56 -
 .../p/PETSc/PETSc-3.16.3-gpsmkl-2021b.eb      |    56 -
 ...etsc4py-3.16.3-gomkl-2021b-Python-3.9.6.eb |    29 -
 ...tsc4py-3.16.3-gspmkl-2021b-Python-3.9.6.eb |    29 -
 .../p/PLUMED/PLUMED-2.7.2-gpsmkl-2021b.eb     |    43 -
 .../p/PLUMED/PLUMED-2.7.2-intel-para-2021b.eb |    43 -
 .../p/PLUMED/PLUMED-2.7.2-iomkl-2021b.eb      |    43 -
 .../POV-Ray-3.7.0.10-GCCcore-11.2.0.eb        |    64 -
 .../POV-Ray-3.7.0.7_dont-touch-home.patch     |    25 -
 .../p/PROJ/PROJ-8.1.0-GCCcore-11.2.0.eb       |    41 -
 Golden_Repo/p/Pandoc/Pandoc-2.16.1.eb         |    22 -
 .../p/Pango/Pango-1.48.8-GCCcore-11.2.0.eb    |    43 -
 Golden_Repo/p/Panoply/Panoply-4.12.13.eb      |    32 -
 .../ParMETIS-4.0.3-gompi-2021b-double.eb      |    40 -
 .../p/ParMETIS/ParMETIS-4.0.3-gompi-2021b.eb  |    36 -
 .../ParMETIS-4.0.3-gpsmpi-2021b-double.eb     |    40 -
 .../p/ParMETIS/ParMETIS-4.0.3-gpsmpi-2021b.eb |    36 -
 .../ParMETIS-4.0.3-iimpi-2021b-double.eb      |    40 -
 .../p/ParMETIS/ParMETIS-4.0.3-iimpi-2021b.eb  |    36 -
 .../ParMETIS-4.0.3-iompi-2021b-double.eb      |    40 -
 .../p/ParMETIS/ParMETIS-4.0.3-iompi-2021b.eb  |    36 -
 .../ParMETIS-4.0.3-ipsmpi-2021b-double.eb     |    40 -
 .../p/ParMETIS/ParMETIS-4.0.3-ipsmpi-2021b.eb |    36 -
 .../p/ParMETIS/parmetis-4.0.3-double.patch    |    11 -
 .../parmetis_computevertexseparator.patch     |   186 -
 .../ParaView-5.10.0-gpsmkl-2021b-EGL.eb       |   317 -
 .../ParaView/ParaView-5.10.0-gpsmkl-2021b.eb  |   315 -
 .../ParaView-5.10.1-gpsmkl-2021b-EGL.eb       |   316 -
 .../ParaView/ParaView-5.10.1-gpsmkl-2021b.eb  |   314 -
 .../ParaViewData-5.10.0-GCCcore-11.2.0.eb     |    28 -
 ...lugin-Nek5000-20221505-gpsmkl-2021b-EGL.eb |    34 -
 ...iewPlugin-Nek5000-20221505-gpsmkl-2021b.eb |    33 -
 .../p/Perl/Perl-5.34.0-GCCcore-11.2.0.eb      |  1825 ---
 .../Pillow-SIMD-8.3.1-GCCcore-11.2.0.eb       |    39 -
 .../Pillow-SIMD-9.0.1-GCCcore-11.2.0.eb       |    39 -
 .../p/PnetCDF/PnetCDF-1.12.2-gompi-2021b.eb   |    35 -
 .../p/PnetCDF/PnetCDF-1.12.2-gpsmpi-2021b.eb  |    35 -
 .../p/PnetCDF/PnetCDF-1.12.2-iimpi-2021b.eb   |    35 -
 .../p/PnetCDF/PnetCDF-1.12.2-iompi-2021b.eb   |    35 -
 .../p/PnetCDF/PnetCDF-1.12.2-ipsmpi-2021b.eb  |    35 -
 .../p/PnetCDF/PnetCDF-1.12.2-npsmpic-2021b.eb |    36 -
 .../p/PnetCDF/PnetCDF-1.12.2-nvompic-2021b.eb |    36 -
 .../PostgreSQL-13.4-GCCcore-11.2.0.eb         |    42 -
 .../p/PyCUDA/PyCUDA-2021.1-GCCcore-11.2.0.eb  |    39 -
 .../PyCairo/PyCairo-1.20.1-GCCcore-11.2.0.eb  |    45 -
 Golden_Repo/p/PyFerret/Faddpath               |    11 -
 .../p/PyFerret/PyFerret-7.6.5-gpsmkl-2021b.eb |    99 -
 .../configure_pyferret-7.6.3_stage2021.patch  |   438 -
 Golden_Repo/p/PyFerret/pyferret               |     6 -
 .../PyGObject-3.42.0-GCCcore-11.2.0.eb        |    47 -
 ...CL-2021.2.13-gcccoremkl-11.2.0-2021.4.0.eb |    39 -
 .../p/PyQt5/PyQt5-5.15.4-GCCcore-11.2.0.eb    |   104 -
 ...PyQuil-3.0.1-gcccoremkl-11.2.0-2021.4.0.eb |   134 -
 Golden_Repo/p/PySCF/PySCF-2.0.1-GCC-11.2.0.eb |    46 -
 ...metric-2.0.4-gcccoremkl-11.2.0-2021.4.0.eb |   124 -
 ...0_fix-test-dataloader-fixed-affinity.patch |    40 -
 .../PyTorch-1.10.0_skip_cmake_rpath.patch     |   195 -
 ...11-gcccoremkl-11.2.0-2021.4.0-CUDA-11.5.eb |   201 -
 .../PyTorch-1.11.0_fix_sharded_imports.patch  |    44 -
 ...Torch-1.11.0_fix_skip_jit_cuda_fuser.patch |   428 -
 ...h-1.11.0_hostname_endpoints_mismatch.patch |   256 -
 ....0_increase-distributed-test-timeout.patch |    17 -
 ...1.11.0_increase_test_tolerances_TF32.patch |   143 -
 ...yTorch-1.11.0_skip_failing_ops_tests.patch |    26 -
 ...yTorch-1.7.0_avoid-nan-in-test-torch.patch |    18 -
 .../PyTorch-1.7.0_disable-dev-shm-test.patch  |    21 -
 ...Torch-1.8.1_dont-use-gpu-ccc-in-test.patch |    22 -
 ...ld-size-for-zero-redundancy-opt-test.patch |    20 -
 .../p/PyYAML/PyYAML-5.4.1-GCCcore-11.2.0.eb   |    27 -
 ...gcccoremkl-11.2.0-2021.4.0-Python-3.9.6.eb |   113 -
 .../Python-2.7.18-GCCcore-11.2.0-bare.eb      |    34 -
 .../Python-3.9.6-GCCcore-11.2.0-bare.eb       |    36 -
 .../p/Python/Python-3.9.6-GCCcore-11.2.0.eb   |   734 -
 .../p/p7zip/p7zip-17.04-GCCcore-11.2.0.eb     |    47 -
 .../parallel-20210722-GCCcore-11.2.0.eb       |    26 -
 .../patchelf/patchelf-0.13-GCCcore-11.2.0.eb  |    27 -
 .../p/pixman/pixman-0.40.0-GCCcore-11.2.0.eb  |    30 -
 .../pkg-config-0.29.2-GCCcore-11.2.0.eb       |    37 -
 Golden_Repo/p/pkg-config/pkg-config-0.29.2.eb |    35 -
 .../pkgconfig-1.5.5-GCCcore-11.2.0-python.eb  |    28 -
 .../p/pocl/include_cl_header_1_8.patch        |    10 -
 Golden_Repo/p/pocl/pocl-1.8-GCCcore-11.2.0.eb |    47 -
 Golden_Repo/p/popt/popt-1.18.eb               |    20 -
 .../pretty-yaml-20.4.0-GCCcore-11.2.0.eb      |    31 -
 .../protobuf-python-3.17.3-GCCcore-11.2.0.eb  |    36 -
 .../protobuf-3.17.3-GCCcore-11.2.0.eb         |    31 -
 Golden_Repo/p/pscom/pscom-5.4-default.eb      |    50 -
 .../psmpi-settings/psmpi-settings-5.5-CUDA.eb |    41 -
 .../psmpi-settings/psmpi-settings-5.5-UCX.eb  |    23 -
 .../psmpi-settings-5.5-plain.eb               |    21 -
 .../p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb       |    54 -
 .../p/psmpi/psmpi-5.5.0-1-NVHPC-22.1-mt.eb    |    55 -
 .../p/psmpi/psmpi-5.5.0-1-NVHPC-22.1.eb       |    54 -
 ...mpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb |    55 -
 .../psmpi-5.5.0-1-intel-compilers-2021.4.0.eb |    54 -
 Golden_Repo/p/psmpi/psmpi-5.5.0-1_ime.patch   |   220 -
 Golden_Repo/p/psmpi/psmpi_shebang.patch       |    36 -
 .../pybind11/pybind11-2.7.1-GCCcore-11.2.0.eb |    23 -
 .../p/pyproj/pyproj-3.3.0-GCCcore-11.2.0.eb   |    37 -
 .../pytest-xdist-2.5.0-GCCcore-11.2.0.eb      |    62 -
 .../p/pyvips/pyvips-2.2.1-GCCcore-11.2.0.eb   |    31 -
 .../q/Qhull/Qhull-2020.2-GCCcore-11.2.0.eb    |    40 -
 .../Qiskit-juqcs-0.5.0-gpsmkl-2021b.eb        |    39 -
 .../q/Qiskit/Qiskit-0.36.2-gpsmkl-2021b.eb    |   191 -
 Golden_Repo/q/Qt5/Qt5-5.13.1_fix-avx2.patch   |    14 -
 .../q/Qt5/Qt5-5.13.1_fix-qmake-libdir.patch   |    44 -
 .../Qt5-5.14.2_fix-std-runtime_error.patch    |    12 -
 .../q/Qt5/Qt5-5.15.2-GCCcore-11.2.0.eb        |    83 -
 Golden_Repo/q/Qt5/Qt5-5.15.2_fix-gcc11.patch  |   139 -
 .../qcint-5.0.0-gcccoremkl-11.2.0-2021.4.0.eb |    31 -
 .../qrupdate/qrupdate-1.1.2-GCCcore-11.2.0.eb |    35 -
 .../q/qrupdate/qrupdate-1.1.2_makeconf.patch  |    18 -
 .../r/R/R-4.1.2-gcccoremkl-11.2.0-2021.4.0.eb |  3198 ----
 .../r/RDFlib/RDFlib-6.0.2-GCCcore-11.2.0.eb   |    26 -
 .../r/RELION/RELION-3.1.3-gpsmpi-2021b.eb     |    48 -
 .../r/ROOT/ROOT-6.26.04-gpsmpi-2021b.eb       |    57 -
 .../r/Ruby/Ruby-3.0.1-GCCcore-11.2.0.eb       |   202 -
 .../r/Rust/Rust-1.54.0-GCCcore-11.2.0.eb      |    48 -
 Golden_Repo/r/re2c/re2c-2.2-GCCcore-11.2.0.eb |    28 -
 .../r/rencode/rencode-1.0.5-GCCcore-11.2.0.eb |    42 -
 .../r/rkcommon/rkcommon-1.8.0-GCC-11.2.0.eb   |    37 -
 Golden_Repo/r/rpmrebuild/rpmrebuild-2.16.eb   |    33 -
 .../s/SCOTCH/SCOTCH-6.1.2-gompi-2021b.eb      |    32 -
 .../s/SCOTCH/SCOTCH-6.1.2-gpsmpi-2021b.eb     |    31 -
 .../s/SCOTCH/SCOTCH-6.1.2-iimpi-2021b.eb      |    28 -
 .../s/SCOTCH/SCOTCH-6.1.2-iompi-2021b.eb      |    28 -
 .../s/SCOTCH/SCOTCH-6.1.2-ipsmpi-2021b.eb     |    31 -
 .../s/SCons/SCons-4.2.0-GCCcore-11.2.0.eb     |    33 -
 .../SDL2-2.0.18-gcccoremkl-11.2.0-2021.4.0.eb |    41 -
 .../s/SIONfwd/SIONfwd-1.0.1-gompi-2021b.eb    |    22 -
 .../s/SIONfwd/SIONfwd-1.0.1-gpsmpi-2021b.eb   |    22 -
 .../s/SIONfwd/SIONfwd-1.0.1-iimpi-2021b.eb    |    22 -
 .../s/SIONfwd/SIONfwd-1.0.1-iompi-2021b.eb    |    22 -
 .../s/SIONfwd/SIONfwd-1.0.1-ipsmpi-2021b.eb   |    22 -
 .../s/SIONfwd/SIONfwd-1.0.1-npsmpic-2021b.eb  |    22 -
 .../s/SIONfwd/SIONfwd-1.0.1-nvompic-2021b.eb  |    22 -
 .../SIONlib-1.7.7-GCCcore-11.2.0-tools.eb     |    36 -
 .../s/SIONlib/SIONlib-1.7.7-gompi-2021b.eb    |    37 -
 .../s/SIONlib/SIONlib-1.7.7-gpsmpi-2021b.eb   |    41 -
 .../s/SIONlib/SIONlib-1.7.7-iimpi-2021b.eb    |    37 -
 .../s/SIONlib/SIONlib-1.7.7-iompi-2021b.eb    |    37 -
 .../s/SIONlib/SIONlib-1.7.7-ipsmpi-2021b.eb   |    41 -
 .../s/SIONlib/SIONlib-1.7.7-npsmpic-2021b.eb  |    41 -
 .../s/SIONlib/SIONlib-1.7.7-nvompic-2021b.eb  |    37 -
 Golden_Repo/s/SIONlib/sionlib_psmpi.patch     |    19 -
 .../s/SLEPc/SLEPc-3.16.1-gomkl-2021b.eb       |    30 -
 .../s/SLEPc/SLEPc-3.16.1-gpsmkl-2021b.eb      |    30 -
 .../s/SOCI/SOCI-4.0.2-GCCcore-11.2.0.eb       |    53 -
 .../s/SQLite/SQLite-3.36-GCCcore-11.2.0.eb    |    40 -
 .../s/SUNDIALS/SUNDIALS-6.1.0-gomkl-2021b.eb  |    71 -
 .../s/SUNDIALS/SUNDIALS-6.1.0-gpsmkl-2021b.eb |    70 -
 .../s/SUNDIALS/SUNDIALS-6.1.0-intel-2021b.eb  |    70 -
 .../SUNDIALS-6.1.0-intel-para-2021b.eb        |    70 -
 .../s/SUNDIALS/SUNDIALS-6.1.0-iomkl-2021b.eb  |    70 -
 .../s/SWIG/SWIG-4.0.2-GCCcore-11.2.0.eb       |    24 -
 Golden_Repo/s/SZ/SZ-2.1.12-GCCcore-11.2.0.eb  |    43 -
 .../s/ScaFaCoS/ScaFaCoS-1.0.1-gpsmpi-2021b.eb |    44 -
 .../s/Scalasca/Scalasca-2.6-gompi-2021b.eb    |    64 -
 .../s/Scalasca/Scalasca-2.6-gpsmpi-2021b.eb   |    64 -
 .../s/Scalasca/Scalasca-2.6-iimpi-2021b.eb    |    64 -
 .../s/Scalasca/Scalasca-2.6-iompi-2021b.eb    |    64 -
 .../s/Scalasca/Scalasca-2.6-ipsmpi-2021b.eb   |    64 -
 .../s/Scalasca/Scalasca-2.6-npsmpic-2021b.eb  |    64 -
 .../s/Scalasca/Scalasca-2.6-nvompic-2021b.eb  |    64 -
 ...-Stack-2021b-gcccoremkl-11.2.0-2021.4.0.eb |    21 -
 ...ndle-2021.10-gcccoremkl-11.2.0-2021.4.0.eb |    85 -
 .../s/Score-P/Score-P-7.1-gompi-2021b.eb      |    65 -
 .../s/Score-P/Score-P-7.1-gpsmpi-2021b.eb     |    65 -
 .../s/Score-P/Score-P-7.1-iimpi-2021b.eb      |    65 -
 .../s/Score-P/Score-P-7.1-iompi-2021b.eb      |    65 -
 .../s/Score-P/Score-P-7.1-ipsmpi-2021b.eb     |    65 -
 .../s/Score-P/Score-P-7.1-npsmpic-2021b.eb    |    65 -
 .../s/Score-P/Score-P-7.1-nvompic-2021b.eb    |    65 -
 ...aborn-0.11.2-gcccoremkl-11.2.0-2021.4.0.eb |    24 -
 .../s/Serf/Serf-1.3.9-GCCcore-11.2.0.eb       |    40 -
 .../s/Shapely/Shapely-1.8.0-GCCcore-11.2.0.eb |    25 -
 .../s/Siesta/Siesta-4.1.5-intel-2021b.eb      |    27 -
 .../s/Siesta/Siesta-4.1.5-intel-para-2021b.eb |    27 -
 Golden_Repo/s/Silo/Silo-4.11-gpsmpi-2021b.eb  |    36 -
 Golden_Repo/s/Silo/Silo-4.11-ipsmpi-2021b.eb  |    36 -
 Golden_Repo/s/Silo/silo-4.11-fix-hdf5.patch   |    58 -
 .../Singularity-Tools-2022-GCCcore-11.2.0.eb  |    20 -
 .../s/SoX/SoX-14.4.2-GCCcore-11.2.0.eb        |    27 -
 .../Subversion-1.14.1-GCCcore-11.2.0.eb       |    51 -
 ...5.10.1-gcccoremkl-11.2.0-2021.4.0-nompi.eb |    30 -
 .../SuiteSparse-5.10.1-gomkl-2021b.eb         |    28 -
 .../SuiteSparse-5.10.1-gpsmkl-2021b.eb        |    28 -
 .../SuiteSparse-5.10.1-intel-2021.eb          |    28 -
 .../SuiteSparse-5.10.1-intel-para-2021.eb     |    28 -
 .../SuiteSparse-5.10.1-iomkl-2021.eb          |    28 -
 .../s/SuperLU/SuperLU-5.3.0-gpsmkl-2021b.eb   |    27 -
 .../SuperLU/SuperLU-5.3.0-intel-para-2021b.eb |    27 -
 .../SymEngine-python-0.9.2-GCC-11.2.0.eb      |    30 -
 .../s/SymEngine/SymEngine-0.9.0-GCC-11.2.0.eb |    39 -
 .../s/Szip/Szip-2.1.1-GCCcore-11.2.0.eb       |    30 -
 ...-allel-1.3.3-gcccoremkl-11.2.0-2021.4.0.eb |    36 -
 ...it-bio-0.5.6-gcccoremkl-11.2.0-2021.4.0.eb |    43 -
 .../scikit-build-0.11.1-GCCcore-11.2.0.eb     |    33 -
 ...-image-0.18.1_fix-README-cache-perms.patch |    35 -
 ...image-0.18.3-gcccoremkl-11.2.0-2021.4.0.eb |    50 -
 ...-learn-1.0.1-gcccoremkl-11.2.0-2021.4.0.eb |    28 -
 ...timize-0.9.0-gcccoremkl-11.2.0-2021.4.0.eb |    29 -
 ...uplift-0.4.0-gcccoremkl-11.2.0-2021.4.0.eb |    36 -
 .../s/shpc/shpc-0.1.12-GCCcore-11.2.0.eb      |    70 -
 .../s/snappy/snappy-1.1.9-GCCcore-11.2.0.eb   |    36 -
 .../s/spdlog/spdlog-1.9.2-GCCcore-11.2.0.eb   |    25 -
 ...ython-1.16.1-gcccoremkl-11.2.0-2021.4.0.eb |    27 -
 Golden_Repo/s/sprng/sprng-1-examples.patch    |   498 -
 Golden_Repo/s/sprng/sprng-1-gompi-2021b.eb    |   104 -
 Golden_Repo/s/sprng/sprng-1-gpsmpi-2021b.eb   |   104 -
 Golden_Repo/s/sprng/sprng-1-iimpi-2021b.eb    |   104 -
 Golden_Repo/s/sprng/sprng-1-iompi-2021b.eb    |   104 -
 Golden_Repo/s/sprng/sprng-1-ipsmpi-2021b.eb   |   104 -
 Golden_Repo/s/sprng/sprng-1.patch             |   111 -
 .../s/sprng/sprng-5-10062021-examples.patch   |   533 -
 .../s/sprng/sprng-5-gompi-2021b-10062021.eb   |    72 -
 .../s/sprng/sprng-5-gpsmpi-2021b-10062021.eb  |    72 -
 .../s/sprng/sprng-5-iimpi-2021b-10062021.eb   |    72 -
 .../s/sprng/sprng-5-iompi-2021b-10062021.eb   |    72 -
 .../s/sprng/sprng-5-ipsmpi-2021b-10062021.eb  |    72 -
 .../s/strace/strace-5.14-GCCcore-11.2.0.eb    |    28 -
 .../sympy-1.8-gcccoremkl-11.2.0-2021.4.0.eb   |    35 -
 .../t/Tcl/Tcl-8.6.11-GCCcore-11.2.0.eb        |    42 -
 .../TensorFlow-2.1.0_fix-cuda-build.patch     |    47 -
 .../TensorFlow/TensorFlow-2.4.0_add-ldl.patch |    19 -
 .../TensorFlow-2.4.0_dont-use-var-lock.patch  |    37 -
 ...ow-2.5.0-fix-alias-violation-in-absl.patch |    26 -
 ...0_add-support-for-large-core-systems.patch |    32 -
 ...Flow-2.5.0_disable-avx512-extensions.patch |    19 -
 ...Flow-2.5.0_fix-arm-vector-intrinsics.patch |    37 -
 ...nsorFlow-2.5.0_fix-crash-on-shutdown.patch |    20 -
 ...w-2.5.0_fix_numpy_1.20_compatibility.patch |    55 -
 ...low-2.5.0_fix_protobuf_error_message.patch |    30 -
 ...low-2.5.0_remove-duplicate-gpu-tests.patch |    45 -
 ....0-gcccoremkl-11.2.0-2021.4.0-CUDA-11.5.eb |   264 -
 ...nsorFlow-2.6.0_add-default-shell-env.patch |    98 -
 ...ow-2.6.0_downgrade-required-versions.patch |    36 -
 .../h5py-2.10.0_avoid-mpi-init.patch          |    85 -
 .../TensorFlow/scipy-1.4.1-fix-pthread.patch  |    39 -
 .../TensorFlow/tensorboard-2.6.0-jupyter.fix  |    93 -
 Golden_Repo/t/Tk/Tk-8.6.11-GCCcore-11.2.0.eb  |    41 -
 .../Tk-8.6.4_different-prefix-with-tcl.patch  |    27 -
 .../t/Tkinter/Tkinter-3.9.6-GCCcore-11.2.0.eb |    25 -
 .../TotalView-2021.4.10-GCCcore-11.2.0.eb     |    66 -
 .../TotalView-2022.1.11-GCCcore-11.2.0.eb     |    64 -
 .../t/tbb/tbb-2020.3-GCCcore-11.2.0.eb        |    19 -
 .../t/tbb/tbb-2021.4.0-GCCcore-11.2.0.eb      |    26 -
 .../t/tcsh/tcsh-6.22.04-GCCcore-11.2.0.eb     |    43 -
 .../t/texinfo/texinfo-6.8-GCCcore-11.2.0.eb   |    41 -
 .../texlive-20200406-GCCcore-11.2.0.eb        |    66 -
 Golden_Repo/t/tmux/tmux-3.2-GCCcore-11.2.0.eb |    32 -
 .../t/torchaudio/standard-libs-deps.patch     |    11 -
 ...chaudio-0.11-gcccoremkl-11.2.0-2021.4.0.eb |    48 -
 ....0-gcccoremkl-11.2.0-2021.4.0-CUDA-11.5.eb |    23 -
 .../t/tqdm/tqdm-4.62.3-GCCcore-11.2.0.eb      |    23 -
 .../tree-sitter-0.20.6-GCCcore-11.2.0.eb      |    39 -
 ...imesh-3.9.36-gcccoremkl-11.2.0-2021.4.0.eb |    33 -
 ...ping-extensions-3.10.0.0-GCCcore-11.2.0.eb |    22 -
 .../u/UCX-settings/UCX-settings-DC-CUDA.eb    |    27 -
 Golden_Repo/u/UCX-settings/UCX-settings-DC.eb |    27 -
 .../u/UCX-settings/UCX-settings-RC-CUDA.eb    |    27 -
 Golden_Repo/u/UCX-settings/UCX-settings-RC.eb |    27 -
 .../u/UCX-settings/UCX-settings-UD-CUDA.eb    |    27 -
 Golden_Repo/u/UCX-settings/UCX-settings-UD.eb |    27 -
 .../u/UCX-settings/UCX-settings-plain.eb      |    17 -
 Golden_Repo/u/UCX/UCX-1.11.2.eb               |    78 -
 Golden_Repo/u/UCX/UCX-1.12.1.eb               |    76 -
 Golden_Repo/u/UCX/UCX-default.eb              |    77 -
 .../UDUNITS/UDUNITS-2.2.28-GCCcore-11.2.0.eb  |    44 -
 .../u/UnZip/UnZip-6.0-GCCcore-11.2.0.eb       |    52 -
 ...security-and-other-fixes-from-Ubuntu.patch |  1188 --
 Golden_Repo/u/uftp/uftp-1.4.3.eb              |    34 -
 .../uglifyjs-3.14.3-GCCcore-11.2.0.eb         |    30 -
 .../unibilium-2.1.1-GCCcore-11.2.0.eb         |    36 -
 .../utf8proc/utf8proc-2.6.1-GCCcore-11.2.0.eb |    30 -
 .../util-linux-2.37-GCCcore-11.2.0.eb         |    41 -
 Golden_Repo/v/VMD/VMD-1.9.3_plugins.patch     |    29 -
 .../VMD/VMD-1.9.3_stride_MAX_AT_IN_RES.patch  |    15 -
 .../v/VMD/VMD-1.9.3_stride_Makefile.patch     |    37 -
 .../v/VMD/VMD-1.9.3_surf_Makefile.patch       |   112 -
 .../v/VMD/VMD-1.9.3_surf_bad_printfs.patch    |    74 -
 ...VMD-1.9.4a51-gcccoremkl-11.2.0-2021.4.0.eb |    73 -
 .../v/VMD/VMD-1.9.4a51_configure.patch        |   177 -
 .../v/VMD/VMD-1.9.4a51_extra_colors.patch     |    46 -
 .../v/VTK/VTK-9.1.0-GCCcore-11.2.0-nompi.eb   |   187 -
 Golden_Repo/v/VTK/VTK-9.1.0-gpsmpi-2022.eb    |   188 -
 Golden_Repo/v/VTK/vtk-version.egg-info        |     5 -
 .../v/VTKData/VTKData-9.1.0-GCCcore-11.2.0.eb |    30 -
 Golden_Repo/v/VTune/VTune-2021.9.0.eb         |    25 -
 .../v/Valgrind/Valgrind-3.18.1-gompi-2021b.eb |    31 -
 .../Valgrind/Valgrind-3.18.1-gpsmpi-2021b.eb  |    31 -
 .../v/Valgrind/Valgrind-3.18.1-iimpi-2021b.eb |    32 -
 .../v/Valgrind/Valgrind-3.18.1-iompi-2021b.eb |    32 -
 .../Valgrind/Valgrind-3.18.1-ipsmpi-2021b.eb  |    32 -
 Golden_Repo/v/Vampir/Vampir-10.0.0.eb         |    45 -
 Golden_Repo/v/Vampir/Vampir-9.11.3.eb         |    44 -
 .../VampirServer-10.0.0-gpsmpi-2021b.eb       |    64 -
 .../VampirServer-9.11.3-gpsmpi-2021b.eb       |    64 -
 .../VirtualGL-2.6.5-GCCcore-11.2.0.eb         |    50 -
 .../VirtualGL/VirtualGL-3.0-GCCcore-11.2.0.eb |    50 -
 .../VirtualGL/virtualgl_cmake_lib_path.patch  |    13 -
 .../v/Voro++/Voro++-0.4.6-GCCcore-11.2.0.eb   |    41 -
 .../w/Wannier90/Wannier90-1.2-gomkl-2021b.eb  |    39 -
 .../w/Wannier90/Wannier90-1.2-gpsmkl-2021b.eb |    39 -
 .../w/Wannier90/Wannier90-1.2-intel-2021b.eb  |    39 -
 .../Wannier90-1.2-intel-para-2021b.eb         |    39 -
 .../w/Wannier90/Wannier90-1.2-iomkl-2021b.eb  |    39 -
 .../Wannier90/Wannier90-3.1.0-gomkl-2021b.eb  |    39 -
 .../Wannier90/Wannier90-3.1.0-gpsmkl-2021b.eb |    39 -
 .../Wannier90/Wannier90-3.1.0-intel-2021b.eb  |    36 -
 .../Wannier90-3.1.0-intel-para-2021b.eb       |    36 -
 .../Wannier90/Wannier90-3.1.0-iomkl-2021b.eb  |    36 -
 .../Wannier90_1x_ignore_makesys.patch         |    13 -
 .../Wannier90_3x_ignore_makeinc.patch         |    32 -
 .../x/X11/X11-20210802-GCCcore-11.2.0.eb      |   221 -
 .../x/XCFun/XCFun-2.1.1-GCCcore-11.2.0.eb     |    30 -
 ...GBoost-1.5.1-gcccoremkl-11.2.0-2021.4.0.eb |    34 -
 Golden_Repo/x/XServer/0002-Constant-DPI.patch |    96 -
 .../x/XServer/0003-fix-pointer-limits.patch   |    39 -
 ...ort-for-30-bit-depth-in-dummy-driver.patch |    41 -
 .../XServer/XServer-1.20.13-GCCcore-11.2.0.eb |   274 -
 Golden_Repo/x/XServer/xterm-cursesloc.patch   |    12 -
 Golden_Repo/x/XServer/xvfb-run                |   194 -
 Golden_Repo/x/XZ/XZ-5.2.5-GCCcore-11.2.0.eb   |    38 -
 .../x/x264/x264-20210613-GCCcore-11.2.0.eb    |    37 -
 Golden_Repo/x/x265/x265-3.4-GCCcore-11.2.0.eb |    40 -
 ...array-0.20.1-gcccoremkl-11.2.0-2021.4.0.eb |    25 -
 .../xorg-macros-1.19.3-GCCcore-11.2.0.eb      |    31 -
 .../xpra-4.0.4-use_Xorg_on_PATH_first.patch   |    28 -
 .../x/xpra/xpra-4.3.3-GCCcore-11.2.0.eb       |   162 -
 .../x/xpra/xpra-4.3.4-GCCcore-11.2.0.eb       |   162 -
 .../xpra/xpra-iconsearch-XDG_DATA_DIRS.patch  |    23 -
 .../x/xpra/xprahtml-4.5.2-encryptionfix.patch |    13 -
 .../x/xprop/xprop-1.2.5-GCCcore-11.2.0.eb     |    32 -
 .../y/YACS/YACS-0.1.8-GCCcore-11.2.0.eb       |    31 -
 Golden_Repo/y/YAXT/YAXT-0.9.1-gompi-2021b.eb  |    34 -
 Golden_Repo/y/YAXT/YAXT-0.9.1-gpsmpi-2021b.eb |    34 -
 Golden_Repo/y/YAXT/YAXT-0.9.1-iimpi-2021b.eb  |    34 -
 Golden_Repo/y/YAXT/YAXT-0.9.1-iompi-2021b.eb  |    34 -
 Golden_Repo/y/YAXT/YAXT-0.9.1-ipsmpi-2021b.eb |    34 -
 .../y/YAXT/YAXT-0.9.1-npsmpic-2021b.eb        |    34 -
 .../y/YAXT/YAXT-0.9.1-nvompic-2021b.eb        |    34 -
 .../y/Yasm/Yasm-1.3.0-GCCcore-11.2.0.eb       |    23 -
 .../y/yarn/yarn-1.22.17-GCCcore-11.2.0.eb     |    35 -
 .../yuicompressor-2.4.8-GCCcore-11.2.0.eb     |    34 -
 Golden_Repo/z/Z3/Z3-4.8.12-GCCcore-11.2.0.eb  |    33 -
 .../z/ZeroMQ/ZeroMQ-4.3.4-GCCcore-11.2.0.eb   |    41 -
 Golden_Repo/z/Zip/Zip-3.0-GCCcore-11.2.0.eb   |    40 -
 .../zarr-2.10.1-gcccoremkl-11.2.0-2021.4.0.eb |    41 -
 Golden_Repo/z/zfp/zfp-0.5.5-GCCcore-11.2.0.eb |    59 -
 .../z/zlib/zlib-1.2.11-GCCcore-11.2.0.eb      |    29 -
 Golden_Repo/z/zlib/zlib-1.2.11.eb             |    31 -
 Golden_Repo/z/zsh/zsh-5.8-GCCcore-11.2.0.eb   |    31 -
 .../z/zstd/zstd-1.5.0-GCCcore-11.2.0.eb       |    41 -
 .../o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb     |    62 -
 .../OpenMPI-4.1.1-intel-compilers-2021.4.0.eb |    62 -
 .../o/OpenMPI/OpenMPI-4.1.2-GCC-11.2.0.eb     |    62 -
 .../o/OpenMPI/OpenMPI-4.1.2-NVHPC-22.1.eb     |    62 -
 .../OpenMPI-4.1.2-intel-compilers-2021.4.0.eb |    62 -
 .../p/PAPI/PAPI-6.0.0.1-GCCcore-11.2.0.eb     |    50 -
 .../p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb       |    56 -
 .../p/psmpi/psmpi-5.5.0-1-NVHPC-22.1-mt.eb    |    57 -
 .../p/psmpi/psmpi-5.5.0-1-NVHPC-22.1.eb       |    56 -
 ...mpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb |    57 -
 .../psmpi-5.5.0-1-intel-compilers-2021.4.0.eb |    56 -
 .../n/nvidia-driver/nvidia-driver-default.eb  |    23 -
 .../o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb     |    62 -
 .../OpenMPI-4.1.1-intel-compilers-2021.4.0.eb |    62 -
 .../o/OpenMPI/OpenMPI-4.1.2-GCC-11.2.0.eb     |    62 -
 .../o/OpenMPI/OpenMPI-4.1.2-NVHPC-22.1.eb     |    62 -
 .../OpenMPI-4.1.2-intel-compilers-2021.4.0.eb |    62 -
 .../p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb       |    56 -
 .../p/psmpi/psmpi-5.5.0-1-NVHPC-22.1-mt.eb    |    57 -
 .../p/psmpi/psmpi-5.5.0-1-NVHPC-22.1.eb       |    56 -
 ...mpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb |    57 -
 .../psmpi-5.5.0-1-intel-compilers-2021.4.0.eb |    56 -
 .../h/hwloc/hwloc-2.5.0-GCCcore-11.2.0.eb     |    53 -
 .../o/OpenMPI/OpenMPI-4.1.2-GCC-11.2.0.eb     |    61 -
 .../o/OpenMPI/OpenMPI-4.1.2-NVHPC-22.1.eb     |    61 -
 .../b/BLIS/BLIS-0.8.1-GCCcore-11.2.0.eb       |    41 -
 ...ix_dgemm-fpe-signalling-on-broadwell.patch |  2219 ---
 .../b/BLIS/BLIS-3.1-GCCcore-11.2.0-amd.eb     |    45 -
 .../b/Blaze/Blaze-3.8.1-gomkl-2021b.eb        |    39 -
 .../babeltrace-1.5.8-GCCcore-11.2.0.eb        |    52 -
 .../CppHeaderParser-2.7.4-GCCcore-11.2.0.eb   |    33 -
 .../gfxreconstruct-1.3.213-GCCcore-11.2.0.eb  |    53 -
 .../glslang/glslang-1.3.213-GCCcore-11.2.0.eb |    41 -
 .../h/hwloc/hwloc-2.5.0-GCCcore-11.2.0.eb     |    52 -
 .../l/LAPACK/LAPACK-3.10.1-GCC-11.2.0.eb      |    16 -
 .../l/LLVM/LLVM-14.0.3-GCCcore-11.2.0.eb      |    44 -
 .../l/libdrm/libdrm-2.4.107-GCCcore-11.2.0.eb |    32 -
 .../l/libdrm/libdrm-2.4.108-GCCcore-11.2.0.eb |    34 -
 .../l/libdrm/libdrm-2.4.110-GCCcore-11.2.0.eb |    34 -
 .../msgpack-cpp-4.1.1-GCCcore-11.2.0.eb       |    44 -
 ...penCL-Headers-2022.05.18-GCCcore-11.2.0.eb |    31 -
 ...CL-ICD-Loader-2022.05.18-GCCcore-11.2.0.eb |    37 -
 .../o/OpenGL/OpenGL-2021b-GCCcore-11.2.0.eb   |   210 -
 .../o/OpenMPI/OpenMPI-4.1.2-GCC-11.2.0.eb     |    62 -
 .../r/ROCm/MIOpen-disable-pch-until-5.3.patch |    13 -
 .../r/ROCm/ROCm-5.1.3-GCCcore-11.2.0.eb       |  1070 --
 .../r/ROCm/ROCm-5.2.0-GCCcore-11.2.0.eb       |  1098 --
 .../aomp-5.2.0-extras-version-string.patch    |    12 -
 .../r/ROCm/aomp-5.2.0-openmp-rocm_dir.patch   |    24 -
 .../aomp-extras-5.2.0-rocm-dir-llvm.patch     |    13 -
 .../aomp-extras-compiler-in-rocm-dir.patch    |    22 -
 .../r/ROCm/aomp-flang-alarm-signature.patch   |    12 -
 ...ng-decouple-out-dir-and-rocm-install.patch |    57 -
 .../r/ROCm/aomp-flang-libomp-path.patch       |    11 -
 .../r/ROCm/aomp-gcc8-only-for-cuda.patch      |    42 -
 .../r/ROCm/aomp-openmp-buildpath.patch        |    23 -
 .../r/ROCm/aomp-openmp-llvm.patch             |    23 -
 .../hipBLAS-5.2.0-rocblas-include-fix.patch   |    13 -
 .../r/ROCm/hipamd-5.1.3-git-hash.patch        |    13 -
 .../llvm-project-hostrpc-fprintf-decl.patch   |    18 -
 .../llvm-project-mlir-fix-rpath-flags.patch   |    14 -
 ...-rpath-do-it-via-commandline-instead.patch |    16 -
 .../miopen-5.2.0-rocblas-include-fix.patch    |    26 -
 ...N-5.2.0-fix-complex-device-operators.patch |   113 -
 ...rocALUTION-5.2.0-rocblas-include-fix.patch |    65 -
 .../r/ROCm/rocALUTION-complex.patch           |    82 -
 ...cBLAS-5.2.0-find-python-if-undefined.patch |    16 -
 ...s-5.2.0-internal-rocblas-include-fix.patch |    13 -
 .../roctracer-hsa_ostream_ops-include.patch   |    13 -
 .../roctracer-preprocess-no-linemarkers.patch |    21 -
 ...obin-hood-hashing-3.11.5-GCCcore-11.2.0.eb |    32 -
 .../SPIRV-Cross-1.3.213-GCCcore-11.2.0.eb     |    36 -
 .../SPIRV-Headers-1.3.213-GCCcore-11.2.0.eb   |    32 -
 .../SPIRV-Reflect-1.3.213-GCCcore-11.2.0.eb   |    49 -
 .../SPIRV-Tools-2022.2-GCCcore-11.2.0.eb      |    51 -
 .../source-highlight-3.1.9-GCCcore-11.2.0.eb  |    38 -
 .../source-highlight-gcc11.patch              |    34 -
 .../u/UCX-settings/UCX-settings-RC-ROCm.eb    |    27 -
 .../jureca_mi200_overlay/u/UCX/UCX-1.11.2.eb  |    79 -
 .../jureca_mi200_overlay/u/UCX/UCX-1.12.0.eb  |    77 -
 .../jureca_mi200_overlay/u/UCX/UCX-1.12.1.eb  |    77 -
 .../u/UCX/UCX-1.13.0-5879c44.eb               |    92 -
 .../jureca_mi200_overlay/u/UCX/UCX-1.13.0.eb  |    77 -
 .../jureca_mi200_overlay/u/UCX/UCX-default.eb |    79 -
 .../Vulkan-Headers-1.3.213-GCCcore-11.2.0.eb  |    30 -
 .../Vulkan-Loader-1.3.213-GCCcore-11.2.0.eb   |    37 -
 .../Vulkan-Tools-1.3.213-GCCcore-11.2.0.eb    |    38 -
 ...ValidationLayers-1.3.213-GCCcore-11.2.0.eb |    45 -
 .../jurecabooster_overlay/g/GCC/GCC-11.2.0.eb |    25 -
 .../g/GCCcore/GCCcore-11.2.0.eb               |    73 -
 .../Hypre-2.23.0-gpsmkl-2021b-mixedint.eb     |    55 -
 .../h/Hypre/Hypre-2.23.0-gpsmkl-2021b.eb      |    53 -
 .../Hypre-2.23.0-intel-2021b-mixedint.eb      |    52 -
 .../h/Hypre/Hypre-2.23.0-intel-2021b.eb       |    50 -
 .../Hypre-2.23.0-intel-para-2021b-mixedint.eb |    52 -
 .../h/Hypre/Hypre-2.23.0-intel-para-2021b.eb  |    50 -
 .../Hypre-2.23.0-iomkl-2021b-mixedint.eb      |    52 -
 .../h/Hypre/Hypre-2.23.0-iomkl-2021b.eb       |    50 -
 .../h/Hypre/hypre-2.23.0_examples_mkl.patch   |   535 -
 .../h/hwloc/hwloc-2.5.0-GCCcore-11.2.0.eb     |    51 -
 .../impi-2021.4.0-intel-compilers-2021.4.0.eb |    15 -
 .../p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb       |    56 -
 ...mpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb |    57 -
 .../psmpi-5.5.0-1-intel-compilers-2021.4.0.eb |    56 -
 .../s/Scalasca/Scalasca-2.6-gpsmpi-2021b.eb   |    56 -
 .../s/Scalasca/Scalasca-2.6-iimpi-2021b.eb    |    56 -
 .../s/Scalasca/Scalasca-2.6-ipsmpi-2021b.eb   |    56 -
 .../s/Score-P/Score-P-7.1-gpsmpi-2021b.eb     |    66 -
 .../s/Score-P/Score-P-7.1-iimpi-2021b.eb      |    66 -
 .../s/Score-P/Score-P-7.1-ipsmpi-2021b.eb     |    66 -
 .../b/BLIS/BLIS-3.1-GCCcore-11.2.0-amd.eb     |    45 -
 .../BullMPI-settings-4.1-plain.eb             |    42 -
 .../b/BullMPI/BullMPI-4.1.0-GCC-11.2.0.eb     |    72 -
 .../l/LWP-MPI/LWP-MPI-1.7.0-gompi-2021b.eb    |    51 -
 .../l/LWP-MPI/LWP-MPI-1.7.0-iimpi-2021b.eb    |    51 -
 .../l/LWP-settings/LWP-settings-LWP-omp.eb    |    23 -
 .../LWP-settings/LWP-settings-LWP-procstat.eb |    16 -
 .../LWP-settings/LWP-settings-LWP-sysinfo.eb  |    16 -
 .../l/LWP-settings/LWP-settings-LWP-vmstat.eb |    16 -
 Overlays/jurecadc_overlay/l/LWP/LWP-1.1.3.eb  |    67 -
 .../p/pscom/pscom-5.4-default.eb              |    50 -
 .../b/BLIS/BLIS-3.1-GCCcore-11.2.0-amd.eb     |    45 -
 .../x/XZ/XZ-5.2.5-GCCcore-11.2.0.eb           |    41 -
 .../r/R/R-4.1.2-gcccoremkl-11.2.0-2021.4.0.eb |  3198 ----
 1141 files changed, 97339 deletions(-)
 delete mode 100644 Custom_EasyBlocks/cuda.py
 delete mode 100644 Custom_EasyBlocks/numexpr.py
 delete mode 100644 Golden_Repo/a/ABINIT/ABINIT-9.6.2-gpsmkl-2021b.eb
 delete mode 100644 Golden_Repo/a/ABINIT/ABINIT-9.6.2-intel-para-2021b.eb
 delete mode 100644 Golden_Repo/a/ACTC/ACTC-1.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/a/ADIOS2/ADIOS2-2.7.1-gpsmkl-2021b.eb
 delete mode 100644 Golden_Repo/a/ADIOS2/ADIOS2-2.7.1-intel-para-2021b.eb
 delete mode 100644 Golden_Repo/a/ADIOS2/include4gcc11.patch
 delete mode 100644 Golden_Repo/a/AMBER/AMBER-20-gpsmkl-2021b.eb
 delete mode 100644 Golden_Repo/a/AMBER/fix_nmrat_error.patch
 delete mode 100644 Golden_Repo/a/AMD-uProf/AMD-uProf-3.4.502-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/a/AMD-uProf/AMD-uProf-3.5.671-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/a/ANTLR/ANTLR-2.7.7-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/a/AOCC/AOCC-3.1.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/a/AOCC/AOCC-3.2.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/a/APR-util/APR-util-1.6.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/a/APR/APR-1.7.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/a/ARMForge/ARMForge-21.1.2.eb
 delete mode 100644 Golden_Repo/a/ARPACK-NG/ARPACK-NG-3.8.0-gcccoremkl-11.2.0-2021.4.0-nompi.eb
 delete mode 100644 Golden_Repo/a/ARPACK-NG/ARPACK-NG-3.8.0-gomkl-2021b.eb
 delete mode 100644 Golden_Repo/a/ARPACK-NG/ARPACK-NG-3.8.0-gpsmkl-2021b.eb
 delete mode 100644 Golden_Repo/a/ARPACK-NG/ARPACK-NG-3.8.0-install-arpack-examples.patch
 delete mode 100644 Golden_Repo/a/ARPACK-NG/ARPACK-NG-3.8.0-install-arpack-examples_gpsmkl.patch
 delete mode 100644 Golden_Repo/a/ARPACK-NG/ARPACK-NG-3.8.0-intel-2021b.eb
 delete mode 100644 Golden_Repo/a/ARPACK-NG/ARPACK-NG-3.8.0-intel-para-2021b.eb
 delete mode 100644 Golden_Repo/a/ARPACK-NG/ARPACK-NG-3.8.0-iomkl-2021b.eb
 delete mode 100644 Golden_Repo/a/ASE/ASE-3.22.0-gcccoremkl-11.2.0-2021.4.0-nompi.eb
 delete mode 100644 Golden_Repo/a/ASE/ASE-3.22.0-gpsmkl-2021b.eb
 delete mode 100644 Golden_Repo/a/AT-SPI2-ATK/AT-SPI2-ATK-2.38.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/a/AT-SPI2-core/AT-SPI2-core-2.40.3-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/a/ATK/ATK-2.36.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/a/Advisor/Advisor-2021.4.0.eb
 delete mode 100644 Golden_Repo/a/Apptainer-Tools/Apptainer-Tools-2022-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/a/AtomPAW/AtomPAW-4.1.1.0-gpsmkl-2021b.eb
 delete mode 100644 Golden_Repo/a/Autoconf/Autoconf-2.69-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/a/Autoconf/Autoconf-2.71-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/a/Autoconf/Autoconf-2.71.eb
 delete mode 100644 Golden_Repo/a/Automake/Automake-1.16.4-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/a/Automake/Automake-1.16.4.eb
 delete mode 100644 Golden_Repo/a/Autotools/Autotools-20210726-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/a/Autotools/Autotools-20210726.eb
 delete mode 100644 Golden_Repo/a/ant/ant-1.10.12-Java-15.eb
 delete mode 100644 Golden_Repo/a/archspec/archspec-0.1.3-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/a/archspec/archspec_click_8.patch
 delete mode 100644 Golden_Repo/b/BLIS/BLIS-0.8.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/b/BLIS/BLIS-0.8.1_fix_dgemm-fpe-signalling-on-broadwell.patch
 delete mode 100644 Golden_Repo/b/Bazel/Bazel-3.4.1-fix-grpc-protoc.patch
 delete mode 100644 Golden_Repo/b/Bazel/Bazel-3.7.1_fix-protobuf-env.patch
 delete mode 100644 Golden_Repo/b/Bazel/Bazel-3.7.2-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/b/Bazel/gcc11-2-bazel-3.7.2.patch
 delete mode 100644 Golden_Repo/b/Bazel/gcc11-bazel-3.7.2.patch
 delete mode 100644 Golden_Repo/b/Bazel/java15.patch
 delete mode 100644 Golden_Repo/b/Biopython/Biopython-1.79-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/b/Bison/Bison-3.7.6-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/b/Bison/Bison-3.7.6.eb
 delete mode 100644 Golden_Repo/b/Blender/Blender-3.1.2-GCCcore-11.2.0-binary.eb
 delete mode 100644 Golden_Repo/b/Blosc/Blosc-1.21.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/b/Boost.Python/Boost.Python-1.78.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/b/Boost/Boost-1.78.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/b/Brotli/Brotli-1.0.9-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/b/binutils/binutils-2.37-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/b/binutils/binutils-2.37.eb
 delete mode 100644 Golden_Repo/b/bokeh/bokeh-2.4.1-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/b/byacc/byacc-20210808-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/b/bzip2/bzip2-1.0.8-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/b/bzip2/bzip2-1.0.8-pkgconfig.patch
 delete mode 100644 Golden_Repo/c/CDO/CDO-2.0.2-gompi-2021b.eb
 delete mode 100644 Golden_Repo/c/CDO/CDO-2.0.2-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/c/CDO/CDO-2.0.2-iimpi-2021b.eb
 delete mode 100644 Golden_Repo/c/CDO/CDO-2.0.2-iompi-2021b.eb
 delete mode 100644 Golden_Repo/c/CDO/CDO-2.0.2-ipsmpi-2021b.eb
 delete mode 100644 Golden_Repo/c/CDO/CDO-2.0.2-npsmpic-2021b.eb
 delete mode 100644 Golden_Repo/c/CDO/CDO-2.0.2-nvompic-2021b.eb
 delete mode 100644 Golden_Repo/c/CFITSIO/CFITSIO-4.0.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/c/CFITSIO/CFITSIO-4.0.0_install_test_data.patch
 delete mode 100644 Golden_Repo/c/CGAL/CGAL-5.2-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/c/CGNS/CGNS-4.2.0-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/c/CMake/CMake-3.21.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/c/CMake/CMake-3.21.1.eb
 delete mode 100644 Golden_Repo/c/CMake/CMake-3.23.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/c/CP2K/CP2K-8.2.0-intel-para-2021b.eb
 delete mode 100644 Golden_Repo/c/CP2K/CP2K-8.2.0-iomkl-2021b.eb
 delete mode 100644 Golden_Repo/c/CP2K/CP2K-9.1.0-intel-para-2021b.eb
 delete mode 100644 Golden_Repo/c/CP2K/CP2K-9.1.0-iomkl-2021b.eb
 delete mode 100644 Golden_Repo/c/CPMD/CPMD-4.3-intel-2021b.eb
 delete mode 100644 Golden_Repo/c/CPMD/CPMD-4.3-intel-para-2021bhybrid.eb
 delete mode 100644 Golden_Repo/c/CPMD/cpmd-v4.3-config.patch
 delete mode 100644 Golden_Repo/c/CUDA/CUDA-11.5.eb
 delete mode 100644 Golden_Repo/c/CVS/CVS-1.11.23-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/c/CVXOPT/CVXOPT-1.2.1-fix-setup-py.patch
 delete mode 100644 Golden_Repo/c/CVXOPT/CVXOPT-1.2.7-gpsmkl-2021b.eb
 delete mode 100644 Golden_Repo/c/Cartopy/Cartopy-0.20.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/c/Cirq/Cirq-0.13.1-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/c/Cirq/Cirq-0.14.1-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/c/Clang/Clang-13.0.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/c/Cling/Cling-0.9-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/c/Cling/patchgcc11fix.patch
 delete mode 100644 Golden_Repo/c/Code_Saturne/Code_Saturne-7.0.2-gpsmkl-2021b.eb
 delete mode 100644 Golden_Repo/c/Colmap/Colmap-3.7-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/c/Coreutils/Coreutils-9.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/c/CubeGUI/CubeGUI-4.6-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/c/CubeGUI/CubeGUI-4.7-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/c/CubeLib/CubeLib-4.6-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/c/CubeLib/CubeLib-4.7-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/c/CubeLib/CubeLib-4.7.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/c/CubeWriter/CubeWriter-4.6-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/c/CubeWriter/CubeWriter-4.7-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/c/CubeWriter/CubeWriter-4.7.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/c/cURL/cURL-7.78.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/c/cairo/cairo-1.16.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/c/ccache/ccache-4.3.eb
 delete mode 100644 Golden_Repo/c/ceres-solver/ceres-solver-2.0.0-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/c/cppcheck/cppcheck-2.6-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/c/cppy/cppy-1.1.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/c/cuDNN/cuDNN-8.3.1.22-CUDA-11.5.eb
 delete mode 100644 Golden_Repo/c/cuTENSOR/cuTENSOR-1.4.0.6-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/d/DB/DB-18.1.40-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/d/DBus/DBus-1.13.18-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/d/DWave/DWave-4.2.0-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/d/DWave/dwave_networkx_fix_decorator-5.0.9.patch
 delete mode 100644 Golden_Repo/d/Doxygen/Doxygen-1.9.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/d/darshan-runtime/darshan-runtime-3.3.1-gompi-2021b.eb
 delete mode 100644 Golden_Repo/d/darshan-runtime/darshan-runtime-3.3.1-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/d/darshan-runtime/darshan-runtime-3.3.1-iimpi-2021b.eb
 delete mode 100644 Golden_Repo/d/darshan-runtime/darshan-runtime-3.3.1-ipsmpi-2021b.eb
 delete mode 100644 Golden_Repo/d/darshan-runtime/darshan-runtime-3.3.1-npsmpic-2021b.eb
 delete mode 100644 Golden_Repo/d/darshan-runtime/darshan-runtime-3.3.1-nvompic-2021b.eb
 delete mode 100644 Golden_Repo/d/darshan-runtime/darshan-runtime-3.4.0-gompi-2021b.eb
 delete mode 100644 Golden_Repo/d/darshan-runtime/darshan-runtime-3.4.0-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/d/darshan-runtime/darshan-runtime-3.4.0-npsmpic-2021b.eb
 delete mode 100644 Golden_Repo/d/darshan-runtime/darshan-runtime-3.4.0-nvompic-2021b.eb
 delete mode 100644 Golden_Repo/d/darshan-util/darshan-util-3.3.1-gompi-2021b.eb
 delete mode 100644 Golden_Repo/d/darshan-util/darshan-util-3.3.1-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/d/darshan-util/darshan-util-3.3.1-iimpi-2021b.eb
 delete mode 100644 Golden_Repo/d/darshan-util/darshan-util-3.3.1-ipsmpi-2021b.eb
 delete mode 100644 Golden_Repo/d/darshan-util/darshan-util-3.3.1-npsmpic-2021b.eb
 delete mode 100644 Golden_Repo/d/darshan-util/darshan-util-3.3.1-nvompic-2021b.eb
 delete mode 100644 Golden_Repo/d/darshan-util/darshan-util-3.4.0-gompi-2021b.eb
 delete mode 100644 Golden_Repo/d/darshan-util/darshan-util-3.4.0-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/d/darshan-util/darshan-util-3.4.0-npsmpic-2021b.eb
 delete mode 100644 Golden_Repo/d/darshan-util/darshan-util-3.4.0-nvompic-2021b.eb
 delete mode 100644 Golden_Repo/d/dask/dask-2021.9.1-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/d/distributed/distributed-2.30.1-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/d/double-conversion/double-conversion-3.1.6-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/e/ELPA/ELPA-2021.11.001-gomkl-2021b.eb
 delete mode 100644 Golden_Repo/e/ELPA/ELPA-2021.11.001-gpsmkl-2021b.eb
 delete mode 100644 Golden_Repo/e/ELPA/ELPA-2021.11.001-intel-2021b.eb
 delete mode 100644 Golden_Repo/e/ELPA/ELPA-2021.11.001-intel-para-2021b.eb
 delete mode 100644 Golden_Repo/e/ELPA/ELPA-2021.11.001-iomkl-2021b.eb
 delete mode 100644 Golden_Repo/e/ELPA/ELPA-2021.11.001_fix_hardcoded_perl_path.patch
 delete mode 100644 Golden_Repo/e/ELPA/ELPA-2021.11.001_install-libelpatest.patch
 delete mode 100644 Golden_Repo/e/ESMF/ESMF-8.2.0-gpsmkl-2021b.eb
 delete mode 100644 Golden_Repo/e/ESMF/psmpi_lmpifort.patch
 delete mode 100644 Golden_Repo/e/Eigen/Eigen-3.3.9-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/e/Emacs/Emacs-27.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/e/Embree/Embree-3.13.2-GCC-11.2.0.eb
 delete mode 100644 Golden_Repo/e/Exiv2/Exiv2-0.27.5-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/e/Extrae/Extrae-3.8.3-gompi-2021b.eb
 delete mode 100644 Golden_Repo/e/Extrae/Extrae-3.8.3-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/e/Extrae/Extrae-3.8.3-iompi-2021b.eb
 delete mode 100644 Golden_Repo/e/Extrae/Extrae-3.8.3-ipsmpi-2021b.eb
 delete mode 100644 Golden_Repo/e/ecCodes/ecCodes-2.22.1-GCCcore-11.2.0-nompi.eb
 delete mode 100644 Golden_Repo/e/ecCodes/ecCodes-2.22.1-gompi-2021b.eb
 delete mode 100644 Golden_Repo/e/ecCodes/ecCodes-2.22.1-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/e/ecCodes/ecCodes-2.22.1-iimpi-2021b.eb
 delete mode 100644 Golden_Repo/e/ecCodes/ecCodes-2.22.1-iompi-2021b.eb
 delete mode 100644 Golden_Repo/e/ecCodes/ecCodes-2.22.1-ipsmpi-2021b.eb
 delete mode 100644 Golden_Repo/e/ecCodes/ecCodes-2.22.1-npsmpic-2021b.eb
 delete mode 100644 Golden_Repo/e/ecCodes/ecCodes-2.22.1-nvompic-2021b.eb
 delete mode 100644 Golden_Repo/e/elfutils/elfutils-0.185-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/e/eudev/eudev-3.2.9-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/e/eudev/eudev-3.2.9_python3.patch
 delete mode 100644 Golden_Repo/e/expat/expat-2.4.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/e/expecttest/expecttest-0.1.3-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/f/FFTW/FFTW-3.3.10-GCCcore-11.2.0-nompi.eb
 delete mode 100644 Golden_Repo/f/FFTW/FFTW-3.3.10-gompi-2021b.eb
 delete mode 100644 Golden_Repo/f/FFTW/FFTW-3.3.10-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/f/FFTW/FFTW-3.3.10-iimpi-2021b.eb
 delete mode 100644 Golden_Repo/f/FFTW/FFTW-3.3.10-iompi-2021b.eb
 delete mode 100644 Golden_Repo/f/FFTW/FFTW-3.3.10-ipsmpi-2021b.eb
 delete mode 100644 Golden_Repo/f/FFTW/FFTW-3.3.10-npsmpic-2021b.eb
 delete mode 100644 Golden_Repo/f/FFTW/FFTW-3.3.10-nvompic-2021b.eb
 delete mode 100644 Golden_Repo/f/FFmpeg/FFmpeg-4.4.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/f/FLINT/FLINT-2.7.1-GCC-11.2.0.eb
 delete mode 100644 Golden_Repo/f/FLTK/FLTK-1.3.7-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/f/Fiona/Fiona-1.8.20-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/f/Flask/Flask-2.0.2-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/f/FreeImage/FreeImage-3.18.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/f/FreeImage/FreeImage-3.18.0-fix-makefile.patch
 delete mode 100644 Golden_Repo/f/FreeSurfer/FreeSurfer-7.1.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/f/FreeSurfer/freesurfer711-tcsh.patch
 delete mode 100644 Golden_Repo/f/FreeSurfer/license_text.txt
 delete mode 100644 Golden_Repo/f/FriBidi/FriBidi-1.0.10-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/f/flatbuffers-python/flatbuffers-python-2.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/f/flatbuffers/flatbuffers-2.0.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/f/flex/flex-2.6.4-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/f/flex/flex-2.6.4.eb
 delete mode 100644 Golden_Repo/f/fmt/fmt-8.1.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/f/fontconfig/fontconfig-2.13.94-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/f/freeglut/freeglut-3.2.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/f/freeglut/freeglut-3.2.1_fixgcc10.patch
 delete mode 100644 Golden_Repo/f/freetype/freetype-2.11.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/g/GCC/GCC-11.2.0.eb
 delete mode 100644 Golden_Repo/g/GCCcore/GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/g/GCCcore/GCCcore-6.2.0-fix-find-isl.patch
 delete mode 100644 Golden_Repo/g/GCCcore/GCCcore-9.3.0_gmp-c99.patch
 delete mode 100644 Golden_Repo/g/GDAL/GDAL-3.3.2-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/g/GDB/GDB-11.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/g/GEOS/GEOS-3.9.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/g/GL2PS/GL2PS-1.4.2-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/g/GLM/GLM-0.9.9.8-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/g/GLPK/GLPK-5.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/g/GLib/GLib-2.69.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/g/GMP/GMP-6.2.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/g/GObject-Introspection/GObject-Introspection-1.68.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/g/GPAW-setups/GPAW-setups-0.9.9672.eb
 delete mode 100644 Golden_Repo/g/GPAW/GPAW-21.6.0-gpsmkl-2021b.eb
 delete mode 100644 Golden_Repo/g/GPicView/GPicView-0.2.5-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/g/GROMACS/GROMACS-2021.4-gpsmkl-2021b-plumed.eb
 delete mode 100644 Golden_Repo/g/GROMACS/GROMACS-2021.4-gpsmkl-2021b.eb
 delete mode 100644 Golden_Repo/g/GROMACS/GROMACS-2021_add-missing-sync.patch
 delete mode 100644 Golden_Repo/g/GSL/GSL-2.7-GCC-11.2.0.eb
 delete mode 100644 Golden_Repo/g/GSL/GSL-2.7-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/g/GStreamer/GStreamer-1.18.6-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/g/GTK+/GTK+-3.24.23-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/g/GTK+/adwaita-icon-theme-3.34.3_disable-svg-conversion.patch
 delete mode 100644 Golden_Repo/g/GTS/GTS-0.7.6-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.6-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/g/Ghostscript/Ghostscript-9.54.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/g/Go/Go-1.17.3.eb
 delete mode 100644 Golden_Repo/g/Grace/Grace-5.1.25-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/g/GraphicsMagick/GraphicsMagick-1.3.36-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/g/Graphviz/Graphviz-2.49.3-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/g/GtkSourceView/GtkSourceView-4.4.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/g/g2clib/g2clib-1.6.3-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/g/g2lib/fix_makefile.patch
 delete mode 100644 Golden_Repo/g/g2lib/g2lib-3.1.0-kind.patch
 delete mode 100644 Golden_Repo/g/g2lib/g2lib-3.1.0_makefile.patch
 delete mode 100644 Golden_Repo/g/g2lib/g2lib-3.2.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/g/g2lib/g2lib-3.2.0_makefile.patch
 delete mode 100644 Golden_Repo/g/gc/gc-8.2.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/g/gcccoremkl/gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/g/gettext/gettext-0.21-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/g/gettext/gettext-0.21.eb
 delete mode 100644 Golden_Repo/g/gflags/gflags-2.2.2-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/g/giflib/giflib-5.2.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/g/git-lfs/git-lfs-2.11.0.eb
 delete mode 100644 Golden_Repo/g/git/git-2.33.1-GCCcore-11.2.0-nodocs.eb
 delete mode 100644 Golden_Repo/g/glog/glog-0.5.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/g/gmpy2/gmpy2-2.1.0b5-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/g/gnuplot/gnuplot-5.4.2-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/g/gomkl/gomkl-2021b.eb
 delete mode 100644 Golden_Repo/g/gompi/gompi-2021b.eb
 delete mode 100644 Golden_Repo/g/gperf/gperf-3.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/g/gpsmkl/gpsmkl-2021b.eb
 delete mode 100644 Golden_Repo/g/gpsmpi/gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/g/groff/groff-1.22.4-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/g/gsettings-desktop-schemas/gsettings-desktop-schemas-3.34.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/g/guile/guile-2.0.14-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/g/guile/guile-3.0.7-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/g/gzip/gzip-1.10-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/h/HDF/HDF-4.2.15-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/h/HDF5/HDF5-1.12.1-GCCcore-11.2.0-serial.eb
 delete mode 100644 Golden_Repo/h/HDF5/HDF5-1.12.1-gompi-2021b.eb
 delete mode 100644 Golden_Repo/h/HDF5/HDF5-1.12.1-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/h/HDF5/HDF5-1.12.1-iimpi-2021b.eb
 delete mode 100644 Golden_Repo/h/HDF5/HDF5-1.12.1-iompi-2021b.eb
 delete mode 100644 Golden_Repo/h/HDF5/HDF5-1.12.1-ipsmpi-2021b.eb
 delete mode 100644 Golden_Repo/h/HDF5/HDF5-1.12.1-npsmpic-2021b.eb
 delete mode 100644 Golden_Repo/h/HDF5/HDF5-1.12.1-nvompic-2021b.eb
 delete mode 100644 Golden_Repo/h/HDFView/HDFView-3.1.3-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/h/HTSlib/HTSlib-1.14-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/h/HarfBuzz/HarfBuzz-2.8.2-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/h/Harminv/Harminv-1.4.1-intel-2021b.eb
 delete mode 100644 Golden_Repo/h/Harminv/Harminv-1.4.1-intel-para-2021b.eb
 delete mode 100644 Golden_Repo/h/Harminv/Harminv-1.4.1-iomkl-2021b.eb
 delete mode 100644 Golden_Repo/h/Horovod/Horovod-0.24.3-gomkl-2021b.eb
 delete mode 100644 Golden_Repo/h/Horovod/Horovod-0.25.0-gomkl-2021b.eb
 delete mode 100644 Golden_Repo/h/Hypre/Hypre-2.23.0-gomkl-2021b-mixedint.eb
 delete mode 100644 Golden_Repo/h/Hypre/Hypre-2.23.0-gomkl-2021b.eb
 delete mode 100644 Golden_Repo/h/Hypre/Hypre-2.23.0-gpsmkl-2021b-mixedint.eb
 delete mode 100644 Golden_Repo/h/Hypre/Hypre-2.23.0-gpsmkl-2021b.eb
 delete mode 100644 Golden_Repo/h/Hypre/Hypre-2.23.0-intel-2021b-mixedint.eb
 delete mode 100644 Golden_Repo/h/Hypre/Hypre-2.23.0-intel-2021b.eb
 delete mode 100644 Golden_Repo/h/Hypre/Hypre-2.23.0-intel-para-2021b-mixedint.eb
 delete mode 100644 Golden_Repo/h/Hypre/Hypre-2.23.0-intel-para-2021b.eb
 delete mode 100644 Golden_Repo/h/Hypre/Hypre-2.23.0-iomkl-2021b-mixedint.eb
 delete mode 100644 Golden_Repo/h/Hypre/Hypre-2.23.0-iomkl-2021b.eb
 delete mode 100644 Golden_Repo/h/Hypre/hypre-2.23.0_examples_mkl.patch
 delete mode 100644 Golden_Repo/h/h5py/h5py-3.5.0-GCCcore-11.2.0-serial.eb
 delete mode 100644 Golden_Repo/h/h5py/h5py-3.5.0-gompi-2021b.eb
 delete mode 100644 Golden_Repo/h/h5py/h5py-3.5.0-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/h/h5py/h5py-3.5.0-iimpi-2021b.eb
 delete mode 100644 Golden_Repo/h/h5py/h5py-3.5.0-iompi-2021b.eb
 delete mode 100644 Golden_Repo/h/h5py/h5py-3.5.0-ipsmpi-2021b.eb
 delete mode 100644 Golden_Repo/h/h5py/h5py-3.5.0-npsmpic-2021b.eb
 delete mode 100644 Golden_Repo/h/h5py/h5py-3.5.0-nvompic-2021b.eb
 delete mode 100644 Golden_Repo/h/help2man/help2man-1.48.3-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/h/hwloc/hwloc-2.5.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/h/hypothesis/hypothesis-6.14.6-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/i/ICU/ICU-70.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/i/IRkernel/IRkernel-1.3-gcccoremkl-11.2.0-2021.4.0-R-4.1.2.eb
 delete mode 100644 Golden_Repo/i/ISL/ISL-0.24-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/i/ITK/ITK-5.2.1-GCCcore-11.2.0-nompi.eb
 delete mode 100644 Golden_Repo/i/ITK/ITK-5.2.1-gompi-2021b.eb
 delete mode 100644 Golden_Repo/i/ITK/ITK-5.2.1-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/i/ITSTool/ITSTool-2.0.7-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/i/ImageMagick/ImageMagick-7.1.0-13-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/i/Inspector/Inspector-2022.0.0.eb
 delete mode 100644 Golden_Repo/i/iimpi/iimpi-2021b.eb
 delete mode 100644 Golden_Repo/i/imkl/imkl-2021.4.0-gompi-2021b.eb
 delete mode 100644 Golden_Repo/i/imkl/imkl-2021.4.0-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/i/imkl/imkl-2021.4.0-iimpi-2021b.eb
 delete mode 100644 Golden_Repo/i/imkl/imkl-2021.4.0-iompi-2021b.eb
 delete mode 100644 Golden_Repo/i/imkl/imkl-2021.4.0-ipsmpi-2021b.eb
 delete mode 100644 Golden_Repo/i/imkl/imkl-2021.4.0.eb
 delete mode 100644 Golden_Repo/i/impi-settings/impi-settings-2021-UCX.eb
 delete mode 100644 Golden_Repo/i/impi-settings/impi-settings-2021-plain.eb
 delete mode 100644 Golden_Repo/i/impi/impi-2021.4.0-intel-compilers-2021.4.0.eb
 delete mode 100644 Golden_Repo/i/intel-compilers/intel-compilers-2021.4.0.eb
 delete mode 100644 Golden_Repo/i/intel-para/intel-para-2021b.eb
 delete mode 100644 Golden_Repo/i/intel/intel-2021b.eb
 delete mode 100644 Golden_Repo/i/intltool/intltool-0.51.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/i/intltool/intltool-0.51.0_fix-Perl-compat.patch
 delete mode 100644 Golden_Repo/i/iomkl/iomkl-2021b.eb
 delete mode 100644 Golden_Repo/i/iompi/iompi-2021b.eb
 delete mode 100644 Golden_Repo/i/ipp/ipp-2021.5.1.eb
 delete mode 100644 Golden_Repo/i/ipsmpi/ipsmpi-2021b.eb
 delete mode 100644 Golden_Repo/i/ispc/ispc-1.16.1.eb
 delete mode 100644 Golden_Repo/i/itac/itac-2021.5.0.eb
 delete mode 100644 Golden_Repo/j/JUBE/JUBE-2.4.2.eb
 delete mode 100644 Golden_Repo/j/JUBE/JUBE-2.4.3.eb
 delete mode 100644 Golden_Repo/j/JUBE/JUBE-2.5.0.eb
 delete mode 100644 Golden_Repo/j/JUBE/JUBE-2.5.1.eb
 delete mode 100644 Golden_Repo/j/JasPer/JasPer-2.0.33-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/j/Java/Java-15.0.1.eb
 delete mode 100644 Golden_Repo/j/Java/Java-15.eb
 delete mode 100644 Golden_Repo/j/JsonCpp/JsonCpp-1.9.4-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/j/Julia/Julia-1.7.1-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/j/Julia/Julia-1.7.1-gomkl-2021b.eb
 delete mode 100644 Golden_Repo/j/Jupyter/401html.patch
 delete mode 100644 Golden_Repo/j/Jupyter/Jupyter-2022.3.3-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/j/Jupyter/Jupyter-2022.3.4-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/j/Jupyter/distributed-2022.8.1_unpin-tornado6.2.patch
 delete mode 100644 Golden_Repo/j/Jupyter/flake8_mccabe07.patch
 delete mode 100644 Golden_Repo/j/Jupyter/jupyter-resource-usage_fixpsutil.patch
 delete mode 100644 Golden_Repo/j/Jupyter/jupyter-server-proxy_pr337_unixsockets.patch
 delete mode 100644 Golden_Repo/j/Jupyter/jupyter-server-proxy_timeout.patch
 delete mode 100644 Golden_Repo/j/Jupyter/jupyter-server_i11934.patch
 delete mode 100644 Golden_Repo/j/Jupyter/jupyter_contrib_nbextensions-template_paths.patch
 delete mode 100644 Golden_Repo/j/Jupyter/jupyter_latex_envs-template_paths.patch
 delete mode 100644 Golden_Repo/j/Jupyter/jupyterhub-1.1.0_logoutcookie-2.0.patch
 delete mode 100644 Golden_Repo/j/Jupyter/jupyterlab-gitlab-2.0.0_jsc.patch
 delete mode 100644 Golden_Repo/j/Jupyter/jupyterlab-gitlab-widget3.patch
 delete mode 100644 Golden_Repo/j/Jupyter/jupyterlab-s3-browser_pr86_s3v2.patch
 delete mode 100644 Golden_Repo/j/Jupyter/jupyterlab_github-2.0.0_jsc.patch
 delete mode 100644 Golden_Repo/j/Jupyter/jupyterlab_i7081_retry503.patch
 delete mode 100644 Golden_Repo/j/Jupyter/jupyterlmod-packagejson.patch
 delete mode 100644 Golden_Repo/j/Jupyter/jupyterlmod-urlfile.patch
 delete mode 100644 Golden_Repo/j/Jupyter/jupyterserverproxy-urlfile.patch
 delete mode 100644 Golden_Repo/j/Jupyter/jupyterserverproxy-urlfile3.patch
 delete mode 100644 Golden_Repo/j/Jupyter/nbdev_noqtconsole.patch
 delete mode 100644 Golden_Repo/j/Jupyter/notebook-6.0.3_jsc.patch
 delete mode 100644 Golden_Repo/j/Jupyter/notebook-6.4.11_jsc.patch
 delete mode 100644 Golden_Repo/j/Jupyter/tornado-timeouts.patch
 delete mode 100755 Golden_Repo/j/Jupyter/update_favorites_json
 delete mode 100644 Golden_Repo/j/JupyterCollection/JupyterCollection-2022.3.3-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/j/JupyterCollection/JupyterCollection-2022.3.4-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/j/JupyterExtension-elyra/JupyterExtension-elyra-3.11.0-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
 delete mode 100644 Golden_Repo/j/JupyterExtension-elyra/JupyterExtension-elyra-3.7.0-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb
 delete mode 100644 Golden_Repo/j/JupyterExtension-nvdashboard/JupyterExtension-nvdashboard-0.6.0-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb
 delete mode 100644 Golden_Repo/j/JupyterExtension-nvdashboard/JupyterExtension-nvdashboard-0.7.0-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
 delete mode 100644 Golden_Repo/j/JupyterHub/JupyterHub-1.5.0-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
 delete mode 100644 Golden_Repo/j/JupyterKernel-Bash/JupyterKernel-Bash-0.7.2-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb
 delete mode 100644 Golden_Repo/j/JupyterKernel-Bash/JupyterKernel-Bash-0.7.2-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
 delete mode 100644 Golden_Repo/j/JupyterKernel-Cling/JupyterKernel-Cling-0.9-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb
 delete mode 100644 Golden_Repo/j/JupyterKernel-Cling/JupyterKernel-Cling-0.9-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
 delete mode 100644 Golden_Repo/j/JupyterKernel-JavaScript/JupyterKernel-JavaScript-5.2.1-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb
 delete mode 100644 Golden_Repo/j/JupyterKernel-JavaScript/JupyterKernel-JavaScript-5.2.1-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
 delete mode 100644 Golden_Repo/j/JupyterKernel-Julia/JupyterKernel-Julia-1.7.1-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb
 delete mode 100644 Golden_Repo/j/JupyterKernel-Julia/JupyterKernel-Julia-1.7.1-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
 delete mode 100644 Golden_Repo/j/JupyterKernel-Octave/JupyterKernel-Octave-6.4.0-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb
 delete mode 100644 Golden_Repo/j/JupyterKernel-Octave/JupyterKernel-Octave-6.4.0-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
 delete mode 100644 Golden_Repo/j/JupyterKernel-PyDeepLearning/JupyterKernel-PyDeepLearning-1.1-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb
 delete mode 100644 Golden_Repo/j/JupyterKernel-PyDeepLearning/JupyterKernel-PyDeepLearning-1.1-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
 delete mode 100644 Golden_Repo/j/JupyterKernel-PyDeepLearning/logo-128x128.png.base64
 delete mode 100644 Golden_Repo/j/JupyterKernel-PyDeepLearning/logo-32x32.png.base64
 delete mode 100644 Golden_Repo/j/JupyterKernel-PyDeepLearning/logo-64x64.png.base64
 delete mode 100644 Golden_Repo/j/JupyterKernel-PyQuantum/JupyterKernel-PyQuantum-3.0-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
 delete mode 100644 Golden_Repo/j/JupyterKernel-PyQuantum/logo-128x128.png.base64
 delete mode 100644 Golden_Repo/j/JupyterKernel-PyQuantum/logo-32x32.png.base64
 delete mode 100644 Golden_Repo/j/JupyterKernel-PyQuantum/logo-64x64.png.base64
 delete mode 100644 Golden_Repo/j/JupyterKernel-PyVisualization/JupyterKernel-PyVisualization-1.0-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb
 delete mode 100644 Golden_Repo/j/JupyterKernel-PyVisualization/JupyterKernel-PyVisualization-1.0-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
 delete mode 100644 Golden_Repo/j/JupyterKernel-PyVisualization/logo-128x128.png.base64
 delete mode 100644 Golden_Repo/j/JupyterKernel-PyVisualization/logo-32x32.png.base64
 delete mode 100644 Golden_Repo/j/JupyterKernel-PyVisualization/logo-64x64.png.base64
 delete mode 100644 Golden_Repo/j/JupyterKernel-R/JupyterKernel-R-4.1.2-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb
 delete mode 100644 Golden_Repo/j/JupyterKernel-R/JupyterKernel-R-4.1.2-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
 delete mode 100644 Golden_Repo/j/JupyterKernel-Ruby/JupyterKernel-Ruby-3.0.1-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb
 delete mode 100644 Golden_Repo/j/JupyterKernel-Ruby/JupyterKernel-Ruby-3.0.1-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
 delete mode 100644 Golden_Repo/j/JupyterProxy-XpraHTML5/JupyterProxy-XpraHTML5-0.3.2-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb
 delete mode 100644 Golden_Repo/j/JupyterProxy-XpraHTML5/JupyterProxy-XpraHTML5-0.3.4-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
 delete mode 100644 Golden_Repo/j/JupyterProxy-XpraHTML5/jupyter_xprahtml5_fixfont.patch
 delete mode 100644 Golden_Repo/j/JupyterProxy-XpraHTML5/jupyter_xprahtml5_proxy-launch_xpra.patch
 delete mode 100644 Golden_Repo/j/jax/TensorFlow-2.7.0_cuda-noncanonical-include-paths.patch
 delete mode 100644 Golden_Repo/j/jax/jax-0.2.19_fix-update-of-cache-access-time.patch
 delete mode 100644 Golden_Repo/j/jax/jax-0.3.9-gcccoremkl-11.2.0-2021.4.0-CUDA-11.5.eb
 delete mode 100644 Golden_Repo/j/jax/jaxlib-0.1.70_add-bazel-args-to-shutdown.patch
 delete mode 100644 Golden_Repo/j/jax/jaxlib_local-tensorflow-repo.sed
 delete mode 100644 Golden_Repo/j/jemalloc/jemalloc-5.2.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/j/jsc-xdg-menu/jsc-xdg-menu-2022.5-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/k/kim-api/kim-api-2.2.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/LAME/LAME-3.100-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/LAMMPS/LAMMPS-7Jan2022-gpsmkl-2021b.eb
 delete mode 100644 Golden_Repo/l/LCov/LCov-1.15-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/LLVM/LLVM-13.0.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/LMDB/LMDB-0.9.29-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/LibTIFF/LibTIFF-4.3.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/Libint/Libint-2.7.0-beta.6-intel-compilers-2021.4.0_cp2k_lmax5.eb
 delete mode 100644 Golden_Repo/l/LittleCMS/LittleCMS-2.12-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/LuaJIT2-OpenResty/LuaJIT2-OpenResty-2.1-20220411-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libGDSII/libGDSII-0.21-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libaec/libaec-1.0.6-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libaio/libaio-0.3.112-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libarchive/libarchive-3.5.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libcerf/libcerf-1.17-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libcint/libcint-4.4.0-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/l/libcint/libcint-4.4.0_remove_pyscftest.patch
 delete mode 100644 Golden_Repo/l/libcroco/libcroco-0.6.13-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libctl/libctl-4.5.1-GCC-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libctl/libctl-4.5.1-intel-compilers-2021.4.0.eb
 delete mode 100644 Golden_Repo/l/libdap/libdap-3.20.8-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libdrm/libdrm-2.4.107-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libdrm/libdrm-2.4.108-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libdwarf/libdwarf-20210528-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libelf/libelf-0.8.13-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libepoxy/libepoxy-1.5.9-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libevent/libevent-2.1.12-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libffi/libffi-3.4.2-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libgd/libgd-2.3.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libgeotiff/libgeotiff-1.7.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libgit2/libgit2-1.1.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libglvnd/libglvnd-1.3.3-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libiconv/libiconv-1.16-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libjpeg-turbo/libjpeg-turbo-2.1.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libmatheval/003-guile2.0.patch
 delete mode 100644 Golden_Repo/l/libmatheval/libmatheval-1.1.11-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libmatheval/libmatheval-1.1.11_fix-matheval-test.patch
 delete mode 100644 Golden_Repo/l/libmpack-lua/libmpack-lua-1.0.9-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libpciaccess/libpciaccess-0.16-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libpng/libpng-1.6.37-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libreadline/libreadline-8.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/librosa/librosa-0.9.2-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/l/librsvg/librsvg-2.51.2-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libsndfile/libsndfile-1.0.31-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libsodium/libsodium-1.0.18-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libspatialindex/libspatialindex-1.9.3-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libspng/libspng-0.7.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libtermkey/libtermkey-0.22-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libtirpc/libtirpc-1.3.2-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libtool/libtool-2.4.6-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libtool/libtool-2.4.6.eb
 delete mode 100644 Golden_Repo/l/libunistring/libunistring-0.9.10-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libunwind/libunwind-1.5.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libuv/libuv-1.44.2-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libvdwxc/libvdwxc-0.4.0-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/l/libvips/libvips-8.13.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libvpx/libvpx-1.11.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libvterm/libvterm-0.1.3-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libwebp/libwebp-1.2.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libxc/libxc-5.1.7-GCC-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libxc/libxc-5.1.7-intel-compilers-2021.4.0.eb
 delete mode 100644 Golden_Repo/l/libxml2-python/libxml2-2.9.10-parenthesize-type-checks.patch
 delete mode 100644 Golden_Repo/l/libxml2-python/libxml2-python-2.9.10-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libxml2/libxml2-2.9.10-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libxslt/libxslt-1.1.34-GCCcore-11.2.0.eb
 delete mode 100755 Golden_Repo/l/libxsmm/libxsmm-1.16.3-GCC-11.2.0.eb
 delete mode 100755 Golden_Repo/l/libxsmm/libxsmm-1.16.3-intel-compilers-2021.4.0.eb
 delete mode 100644 Golden_Repo/l/libyaml/libyaml-0.2.5-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/libyuv/libyuv-20210428-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/likwid/likwid-5.2.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/lpeg/lpeg-1.0.2-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/luv/compat-5.3.c
 delete mode 100644 Golden_Repo/l/luv/compat-5.3.h
 delete mode 100644 Golden_Repo/l/luv/luv-1.44.2-0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/lxml/lxml-4.6.3-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/l/lz4/lz4-1.9.3-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/m/M4/M4-1.4.19-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/m/M4/M4-1.4.19.eb
 delete mode 100644 Golden_Repo/m/MATLAB/MATLAB-2022a-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/m/MATLAB/README.txt
 delete mode 100644 Golden_Repo/m/MCR/MCR-R2021b.2.eb
 delete mode 100644 Golden_Repo/m/MCR/MCR-R2022a.eb
 delete mode 100644 Golden_Repo/m/MDAnalysis/MDAnalysis-2.0.0-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/m/MED/MED-4.1.0-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/m/MED/med-4.1.0_hdf5_H5Oget_info.patch
 delete mode 100644 Golden_Repo/m/MED/med-4.1.0_hdf5_v11201.patch
 delete mode 100644 Golden_Repo/m/METIS/METIS-5.1.0-GCC-11.2.0-RTW64-IDX32.eb
 delete mode 100644 Golden_Repo/m/METIS/METIS-5.1.0-GCC-11.2.0.eb
 delete mode 100644 Golden_Repo/m/METIS/METIS-5.1.0-GCCcore-11.2.0-IDX64.eb
 delete mode 100644 Golden_Repo/m/METIS/METIS-5.1.0-IDX64.patch
 delete mode 100644 Golden_Repo/m/METIS/METIS-5.1.0-intel-compilers-2021.4.0.eb
 delete mode 100644 Golden_Repo/m/METIS/METIS-5.1.0-use-doubles.patch
 delete mode 100644 Golden_Repo/m/MPB/MPB-1.11.1-ipsmpi-2021b.eb
 delete mode 100644 Golden_Repo/m/MPC/MPC-1.2.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/m/MPFR/MPFR-4.1.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/m/MUMPS/MUMPS-5.4.1-gomkl-2021b.eb
 delete mode 100644 Golden_Repo/m/MUMPS/MUMPS-5.4.1-gpsmkl-2021b.eb
 delete mode 100644 Golden_Repo/m/MUMPS/MUMPS-5.4.1_examples_mkl.patch
 delete mode 100644 Golden_Repo/m/MUMPS/MUMPS-5.4.1_shared-mumps.patch
 delete mode 100644 Golden_Repo/m/MUMPS/MUMPS-5.4.1_shared-pord.patch
 delete mode 100644 Golden_Repo/m/MUST/MUST-1.7.2-gompi-2021b.eb
 delete mode 100644 Golden_Repo/m/MUST/MUST-1.7.2-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/m/MUST/MUST-1.7.2-iimpi-2021b.eb
 delete mode 100644 Golden_Repo/m/MUST/MUST-1.7.2-iompi-2021b.eb
 delete mode 100644 Golden_Repo/m/MUST/MUST-1.7.2-ipsmpi-2021b.eb
 delete mode 100644 Golden_Repo/m/MUST/wrap-config.cmake.in.patch
 delete mode 100644 Golden_Repo/m/Mako/Mako-1.1.4-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/m/Meep/Meep-1.24.0-intel-para-2021b.eb
 delete mode 100644 Golden_Repo/m/Mercurial/Mercurial-5.8-GCCcore-11.2.0-Python-3.9.6.eb
 delete mode 100644 Golden_Repo/m/Meson/Meson-0.58.2-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/m/MethPipe/MethPipe-5.0.0-gpsmkl-2021b.eb
 delete mode 100644 Golden_Repo/m/magma/magma-2.6.1-gcccoremkl-11.2.0-2021.4.0-CUDA-11.5.eb
 delete mode 100644 Golden_Repo/m/magma/magma-2.6.1_allow-all-sms.patch
 delete mode 100644 Golden_Repo/m/makeinfo/makeinfo-6.8-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/m/matplotlib/matplotlib-3.4.3-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/m/memkind/memkind-1.12.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/m/motif/motif-2.3.8-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/m/mpi4py/mpi4py-3.1.3-gompi-2021b.eb
 delete mode 100644 Golden_Repo/m/mpi4py/mpi4py-3.1.3-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/m/mpi4py/mpi4py-3.1.3-iimpi-2021b.eb
 delete mode 100644 Golden_Repo/m/mpi4py/mpi4py-3.1.3-iompi-2021b.eb
 delete mode 100644 Golden_Repo/m/mpi4py/mpi4py-3.1.3-ipsmpi-2021b.eb
 delete mode 100644 Golden_Repo/m/mpi4py/mpi4py-3.1.3-npsmpic-2021b.eb
 delete mode 100644 Golden_Repo/m/mpi4py/mpi4py-3.1.3-nvompic-2021b.eb
 delete mode 100644 Golden_Repo/m/mpiP/mpiP-3.5-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/m/msgpack-c/msgpack-c-4.0.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/m/muparserx/muparserx-4.0.8-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/n/NAMD/NAMD-2.14-gompi-2021b.eb
 delete mode 100644 Golden_Repo/n/NAMD/NAMD-2.14-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/n/NAMD/NAMD-2.14-iimpi-2021b.eb
 delete mode 100644 Golden_Repo/n/NAMD/NAMD-2.14-iompi-2021b.eb
 delete mode 100644 Golden_Repo/n/NAMD/NAMD-2.14-ipsmpi-2021b.eb
 delete mode 100644 Golden_Repo/n/NAMD/namd-2.14-fix-gnu-casting.patch
 delete mode 100644 Golden_Repo/n/NASM/NASM-2.15.05-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/n/NCCL/NCCL-2.11.4-GCCcore-11.2.0-CUDA-11.5.eb
 delete mode 100644 Golden_Repo/n/NCCL/NCCL-2.12.7-1-GCCcore-11.2.0-CUDA-11.5.eb
 delete mode 100644 Golden_Repo/n/NCCL/NCCL-2.14.3-1-GCCcore-11.2.0-CUDA-11.5.eb
 delete mode 100644 Golden_Repo/n/NCO/NCO-5.0.3-gompi-2021b.eb
 delete mode 100644 Golden_Repo/n/NCO/NCO-5.0.3-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/n/NCO/NCO-5.0.3-iimpi-2021b.eb
 delete mode 100644 Golden_Repo/n/NCO/NCO-5.0.3-iompi-2021b.eb
 delete mode 100644 Golden_Repo/n/NCO/NCO-5.0.3-ipsmpi-2021b.eb
 delete mode 100644 Golden_Repo/n/NCO/NCO-5.0.3-npsmpic-2021b.eb
 delete mode 100644 Golden_Repo/n/NCO/NCO-5.0.3-nvompic-2021b.eb
 delete mode 100644 Golden_Repo/n/NLopt/NLopt-2.7.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/n/NSPR/NSPR-4.32-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/n/NSS/NSS-3.39_pkgconfig.patch
 delete mode 100644 Golden_Repo/n/NSS/NSS-3.51_fix_kremlin_ppc64le.patch
 delete mode 100644 Golden_Repo/n/NSS/NSS-3.73-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/n/NVHPC/NVHPC-21.11.eb
 delete mode 100644 Golden_Repo/n/NVHPC/NVHPC-22.1.eb
 delete mode 100644 Golden_Repo/n/NVHPC/NVHPC-22.3.eb
 delete mode 100644 Golden_Repo/n/NVHPC/NVHPC-22.7.eb
 delete mode 100644 Golden_Repo/n/NVSHMEM/NVSHMEM-2.4.1-gompi-2021b.eb
 delete mode 100644 Golden_Repo/n/NVSHMEM/NVSHMEM-2.4.1-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/n/NVSHMEM/NVSHMEM-2.5.0-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/n/NWChem/NWChem-7.0.2-intel-2021b.eb
 delete mode 100644 Golden_Repo/n/NWChem/NWChem-7.0.2-intel-para-2021b.eb
 delete mode 100644 Golden_Repo/n/NWChem/NWChem_fix-date.patch
 delete mode 100644 Golden_Repo/n/NeoVim/NeoVim-0.7.2-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/n/Ninja-Python/Ninja-Python-1.10.2-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/n/Ninja/Ninja-1.10.2-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/n/Nsight-Compute/Nsight-Compute-2022.1.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/n/Nsight-Compute/Nsight-Compute-2022.1.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/n/Nsight-Compute/Nsight-Compute-2022.2.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/n/Nsight-Systems/Nsight-Systems-2021.5.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/n/Nsight-Systems/Nsight-Systems-2022.1.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/n/Nsight-Systems/Nsight-Systems-2022.2.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/n/nano/nano-5.9-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/n/ncurses/ncurses-6.2-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/n/ncurses/ncurses-6.2.eb
 delete mode 100644 Golden_Repo/n/ncview/ncview-2.1.8-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/n/netCDF-C++4/netCDF-C++4-4.3.1-GCCcore-11.2.0-serial.eb
 delete mode 100644 Golden_Repo/n/netCDF-C++4/netCDF-C++4-4.3.1-gompi-2021b.eb
 delete mode 100644 Golden_Repo/n/netCDF-C++4/netCDF-C++4-4.3.1-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/n/netCDF-C++4/netCDF-C++4-4.3.1-iimpi-2021b.eb
 delete mode 100644 Golden_Repo/n/netCDF-C++4/netCDF-C++4-4.3.1-iompi-2021b.eb
 delete mode 100644 Golden_Repo/n/netCDF-C++4/netCDF-C++4-4.3.1-ipsmpi-2021b.eb
 delete mode 100644 Golden_Repo/n/netCDF-C++4/netCDF-C++4-4.3.1-npsmpic-2021b.eb
 delete mode 100644 Golden_Repo/n/netCDF-C++4/netCDF-C++4-4.3.1-nvompic-2021b.eb
 delete mode 100644 Golden_Repo/n/netCDF-Fortran/netCDF-Fortran-4.5.3-GCCcore-11.2.0-serial.eb
 delete mode 100644 Golden_Repo/n/netCDF-Fortran/netCDF-Fortran-4.5.3-gompi-2021b.eb
 delete mode 100644 Golden_Repo/n/netCDF-Fortran/netCDF-Fortran-4.5.3-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/n/netCDF-Fortran/netCDF-Fortran-4.5.3-iimpi-2021b.eb
 delete mode 100644 Golden_Repo/n/netCDF-Fortran/netCDF-Fortran-4.5.3-iompi-2021b.eb
 delete mode 100644 Golden_Repo/n/netCDF-Fortran/netCDF-Fortran-4.5.3-ipsmpi-2021b.eb
 delete mode 100644 Golden_Repo/n/netCDF-Fortran/netCDF-Fortran-4.5.3-npsmpic-2021b.eb
 delete mode 100644 Golden_Repo/n/netCDF-Fortran/netCDF-Fortran-4.5.3-nvompic-2021b.eb
 delete mode 100644 Golden_Repo/n/netCDF/netCDF-4.8.1-GCCcore-11.2.0-serial.eb
 delete mode 100644 Golden_Repo/n/netCDF/netCDF-4.8.1-gompi-2021b.eb
 delete mode 100644 Golden_Repo/n/netCDF/netCDF-4.8.1-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/n/netCDF/netCDF-4.8.1-iimpi-2021b.eb
 delete mode 100644 Golden_Repo/n/netCDF/netCDF-4.8.1-iompi-2021b.eb
 delete mode 100644 Golden_Repo/n/netCDF/netCDF-4.8.1-ipsmpi-2021b.eb
 delete mode 100644 Golden_Repo/n/netCDF/netCDF-4.8.1-npsmpic-2021b.eb
 delete mode 100644 Golden_Repo/n/netCDF/netCDF-4.8.1-nvompic-2021b.eb
 delete mode 100644 Golden_Repo/n/netcdf4-python/netcdf4-python-1.1.8-avoid-diskless-test.patch
 delete mode 100644 Golden_Repo/n/netcdf4-python/netcdf4-python-1.5.7-GCCcore-11.2.0-serial.eb
 delete mode 100644 Golden_Repo/n/netcdf4-python/netcdf4-python-1.5.7-gompi-2021b.eb
 delete mode 100644 Golden_Repo/n/netcdf4-python/netcdf4-python-1.5.7-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/n/netcdf4-python/netcdf4-python-1.5.7-iimpi-2021b.eb
 delete mode 100644 Golden_Repo/n/netcdf4-python/netcdf4-python-1.5.7-iompi-2021b.eb
 delete mode 100644 Golden_Repo/n/netcdf4-python/netcdf4-python-1.5.7-ipsmpi-2021b.eb
 delete mode 100644 Golden_Repo/n/netcdf4-python/netcdf4-python-1.5.7-npsmpic-2021b.eb
 delete mode 100644 Golden_Repo/n/netcdf4-python/netcdf4-python-1.5.7-nvompic-2021b.eb
 delete mode 100644 Golden_Repo/n/nettle/nettle-3.7.3-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/n/networkx/networkx-2.6.3-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/n/nlohmann-json/nlohmann-json-3.10.4-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/n/nodejs/nodejs-16.13.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/n/npsmpic/npsmpic-2021b.eb
 delete mode 100644 Golden_Repo/n/nsync/nsync-1.24.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/n/numactl/numactl-2.0.14.eb
 delete mode 100644 Golden_Repo/n/numba/llvmlite-0.38.0-llvm13.patch
 delete mode 100644 Golden_Repo/n/numba/numba-0.55.1-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/n/nvidia-Video_Codec_SDK/nvidia-Video_Codec_SDK-11.1.5.eb
 delete mode 100644 Golden_Repo/n/nvidia-driver/nvidia-driver-default.eb
 delete mode 100644 Golden_Repo/n/nvompic/nvompic-2021b.eb
 delete mode 100644 Golden_Repo/o/OPARI2/OPARI2-2.0.6-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/o/OSPRay/OSPRay-2.8.0-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/o/OTF2/OTF2-2.3-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/o/OTF2/OTF2-3.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/o/Octave/Octave-6.4.0-gcccoremkl-11.2.0-2021.4.0-nompi.eb
 delete mode 100644 Golden_Repo/o/OpenCV/OpenCV-4.5.4-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/o/OpenCV/OpenCV-4.5.5-gcccoremkl-11.2.0-2021.4.0-contrib.eb
 delete mode 100644 Golden_Repo/o/OpenEXR/OpenEXR-3.1.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/o/OpenFOAM/OpenFOAM-v1906-wmake-ompi.patch
 delete mode 100644 Golden_Repo/o/OpenFOAM/OpenFOAM-v2012-cleanup.patch
 delete mode 100644 Golden_Repo/o/OpenFOAM/OpenFOAM-v2112-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/o/OpenGL/OpenGL-2021b-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/o/OpenGL/ofnone-fix.patch
 delete mode 100644 Golden_Repo/o/OpenGL/swrllvm-fix.patch
 delete mode 100644 Golden_Repo/o/OpenImageDenoise/OpenImageDenoise-1.4.2-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/o/OpenJPEG/OpenJPEG-2.4.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/o/OpenMPI-settings/OpenMPI-settings-4.1-plain.eb
 delete mode 100644 Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb
 delete mode 100644 Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-intel-compilers-2021.4.0.eb
 delete mode 100644 Golden_Repo/o/OpenMPI/OpenMPI-4.1.2-GCC-11.2.0.eb
 delete mode 100644 Golden_Repo/o/OpenMPI/OpenMPI-4.1.2-NVHPC-22.1.eb
 delete mode 100644 Golden_Repo/o/OpenMPI/OpenMPI-4.1.2-intel-compilers-2021.4.0.eb
 delete mode 100644 Golden_Repo/o/OpenPGM/OpenPGM-5.2.122-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/o/OpenSSL/OpenSSL-1.1.eb
 delete mode 100644 Golden_Repo/o/OpenSlide/OpenSlide-3.4.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/o/OpenStackClient/OpenStackClient-5.8.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/o/OptiX/OptiX-6.5.0.eb
 delete mode 100644 Golden_Repo/o/OptiX/OptiX-7.4.0.eb
 delete mode 100644 Golden_Repo/o/openslide-python/openslide-python-1.2.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/o/openvkl/openvkl-1.1.0-GCC-11.2.0.eb
 delete mode 100644 Golden_Repo/p/PAPI/PAPI-6.0.0.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/p/PCRE/PCRE-8.45-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/p/PCRE2/PCRE2-10.37-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/p/PDT/PDT-3.25.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/p/PETSc/PETSc-3.16.3-gomkl-2021b.eb
 delete mode 100644 Golden_Repo/p/PETSc/PETSc-3.16.3-gpsmkl-2021b.eb
 delete mode 100644 Golden_Repo/p/PETSc/petsc4py-3.16.3-gomkl-2021b-Python-3.9.6.eb
 delete mode 100644 Golden_Repo/p/PETSc/petsc4py-3.16.3-gspmkl-2021b-Python-3.9.6.eb
 delete mode 100644 Golden_Repo/p/PLUMED/PLUMED-2.7.2-gpsmkl-2021b.eb
 delete mode 100644 Golden_Repo/p/PLUMED/PLUMED-2.7.2-intel-para-2021b.eb
 delete mode 100644 Golden_Repo/p/PLUMED/PLUMED-2.7.2-iomkl-2021b.eb
 delete mode 100644 Golden_Repo/p/POV-Ray/POV-Ray-3.7.0.10-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/p/POV-Ray/POV-Ray-3.7.0.7_dont-touch-home.patch
 delete mode 100644 Golden_Repo/p/PROJ/PROJ-8.1.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/p/Pandoc/Pandoc-2.16.1.eb
 delete mode 100644 Golden_Repo/p/Pango/Pango-1.48.8-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/p/Panoply/Panoply-4.12.13.eb
 delete mode 100644 Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-gompi-2021b-double.eb
 delete mode 100644 Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-gompi-2021b.eb
 delete mode 100644 Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-gpsmpi-2021b-double.eb
 delete mode 100644 Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-iimpi-2021b-double.eb
 delete mode 100644 Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-iimpi-2021b.eb
 delete mode 100644 Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-iompi-2021b-double.eb
 delete mode 100644 Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-iompi-2021b.eb
 delete mode 100644 Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-ipsmpi-2021b-double.eb
 delete mode 100644 Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-ipsmpi-2021b.eb
 delete mode 100644 Golden_Repo/p/ParMETIS/parmetis-4.0.3-double.patch
 delete mode 100644 Golden_Repo/p/ParMETIS/parmetis_computevertexseparator.patch
 delete mode 100644 Golden_Repo/p/ParaView/ParaView-5.10.0-gpsmkl-2021b-EGL.eb
 delete mode 100644 Golden_Repo/p/ParaView/ParaView-5.10.0-gpsmkl-2021b.eb
 delete mode 100644 Golden_Repo/p/ParaView/ParaView-5.10.1-gpsmkl-2021b-EGL.eb
 delete mode 100644 Golden_Repo/p/ParaView/ParaView-5.10.1-gpsmkl-2021b.eb
 delete mode 100644 Golden_Repo/p/ParaViewData/ParaViewData-5.10.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/p/ParaViewPlugin-Nek5000/ParaViewPlugin-Nek5000-20221505-gpsmkl-2021b-EGL.eb
 delete mode 100644 Golden_Repo/p/ParaViewPlugin-Nek5000/ParaViewPlugin-Nek5000-20221505-gpsmkl-2021b.eb
 delete mode 100644 Golden_Repo/p/Perl/Perl-5.34.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/p/Pillow-SIMD/Pillow-SIMD-8.3.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/p/Pillow-SIMD/Pillow-SIMD-9.0.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/p/PnetCDF/PnetCDF-1.12.2-gompi-2021b.eb
 delete mode 100644 Golden_Repo/p/PnetCDF/PnetCDF-1.12.2-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/p/PnetCDF/PnetCDF-1.12.2-iimpi-2021b.eb
 delete mode 100644 Golden_Repo/p/PnetCDF/PnetCDF-1.12.2-iompi-2021b.eb
 delete mode 100644 Golden_Repo/p/PnetCDF/PnetCDF-1.12.2-ipsmpi-2021b.eb
 delete mode 100644 Golden_Repo/p/PnetCDF/PnetCDF-1.12.2-npsmpic-2021b.eb
 delete mode 100644 Golden_Repo/p/PnetCDF/PnetCDF-1.12.2-nvompic-2021b.eb
 delete mode 100644 Golden_Repo/p/PostgreSQL/PostgreSQL-13.4-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/p/PyCUDA/PyCUDA-2021.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/p/PyCairo/PyCairo-1.20.1-GCCcore-11.2.0.eb
 delete mode 100755 Golden_Repo/p/PyFerret/Faddpath
 delete mode 100644 Golden_Repo/p/PyFerret/PyFerret-7.6.5-gpsmkl-2021b.eb
 delete mode 100644 Golden_Repo/p/PyFerret/configure_pyferret-7.6.3_stage2021.patch
 delete mode 100755 Golden_Repo/p/PyFerret/pyferret
 delete mode 100644 Golden_Repo/p/PyGObject/PyGObject-3.42.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/p/PyOpenCL/PyOpenCL-2021.2.13-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/p/PyQt5/PyQt5-5.15.4-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/p/PyQuil/PyQuil-3.0.1-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/p/PySCF/PySCF-2.0.1-GCC-11.2.0.eb
 delete mode 100644 Golden_Repo/p/PyTorch-Geometric/PyTorch-Geometric-2.0.4-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/p/PyTorch/PyTorch-1.10.0_fix-test-dataloader-fixed-affinity.patch
 delete mode 100644 Golden_Repo/p/PyTorch/PyTorch-1.10.0_skip_cmake_rpath.patch
 delete mode 100644 Golden_Repo/p/PyTorch/PyTorch-1.11-gcccoremkl-11.2.0-2021.4.0-CUDA-11.5.eb
 delete mode 100644 Golden_Repo/p/PyTorch/PyTorch-1.11.0_fix_sharded_imports.patch
 delete mode 100644 Golden_Repo/p/PyTorch/PyTorch-1.11.0_fix_skip_jit_cuda_fuser.patch
 delete mode 100644 Golden_Repo/p/PyTorch/PyTorch-1.11.0_hostname_endpoints_mismatch.patch
 delete mode 100644 Golden_Repo/p/PyTorch/PyTorch-1.11.0_increase-distributed-test-timeout.patch
 delete mode 100644 Golden_Repo/p/PyTorch/PyTorch-1.11.0_increase_test_tolerances_TF32.patch
 delete mode 100644 Golden_Repo/p/PyTorch/PyTorch-1.11.0_skip_failing_ops_tests.patch
 delete mode 100644 Golden_Repo/p/PyTorch/PyTorch-1.7.0_avoid-nan-in-test-torch.patch
 delete mode 100644 Golden_Repo/p/PyTorch/PyTorch-1.7.0_disable-dev-shm-test.patch
 delete mode 100644 Golden_Repo/p/PyTorch/PyTorch-1.8.1_dont-use-gpu-ccc-in-test.patch
 delete mode 100644 Golden_Repo/p/PyTorch/PyTorch-1.9.0_limit-world-size-for-zero-redundancy-opt-test.patch
 delete mode 100644 Golden_Repo/p/PyYAML/PyYAML-5.4.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/p/Python-Neuroimaging/Python-Neuroimaging-2022-gcccoremkl-11.2.0-2021.4.0-Python-3.9.6.eb
 delete mode 100644 Golden_Repo/p/Python/Python-2.7.18-GCCcore-11.2.0-bare.eb
 delete mode 100644 Golden_Repo/p/Python/Python-3.9.6-GCCcore-11.2.0-bare.eb
 delete mode 100644 Golden_Repo/p/Python/Python-3.9.6-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/p/p7zip/p7zip-17.04-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/p/parallel/parallel-20210722-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/p/patchelf/patchelf-0.13-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/p/pixman/pixman-0.40.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/p/pkg-config/pkg-config-0.29.2-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/p/pkg-config/pkg-config-0.29.2.eb
 delete mode 100644 Golden_Repo/p/pkgconfig/pkgconfig-1.5.5-GCCcore-11.2.0-python.eb
 delete mode 100644 Golden_Repo/p/pocl/include_cl_header_1_8.patch
 delete mode 100644 Golden_Repo/p/pocl/pocl-1.8-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/p/popt/popt-1.18.eb
 delete mode 100644 Golden_Repo/p/pretty-yaml/pretty-yaml-20.4.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/p/protobuf-python/protobuf-python-3.17.3-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/p/protobuf/protobuf-3.17.3-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/p/pscom/pscom-5.4-default.eb
 delete mode 100644 Golden_Repo/p/psmpi-settings/psmpi-settings-5.5-CUDA.eb
 delete mode 100644 Golden_Repo/p/psmpi-settings/psmpi-settings-5.5-UCX.eb
 delete mode 100644 Golden_Repo/p/psmpi-settings/psmpi-settings-5.5-plain.eb
 delete mode 100644 Golden_Repo/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
 delete mode 100644 Golden_Repo/p/psmpi/psmpi-5.5.0-1-NVHPC-22.1-mt.eb
 delete mode 100644 Golden_Repo/p/psmpi/psmpi-5.5.0-1-NVHPC-22.1.eb
 delete mode 100644 Golden_Repo/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
 delete mode 100644 Golden_Repo/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
 delete mode 100644 Golden_Repo/p/psmpi/psmpi-5.5.0-1_ime.patch
 delete mode 100644 Golden_Repo/p/psmpi/psmpi_shebang.patch
 delete mode 100644 Golden_Repo/p/pybind11/pybind11-2.7.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/p/pyproj/pyproj-3.3.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/p/pytest-xdist/pytest-xdist-2.5.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/p/pyvips/pyvips-2.2.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/q/Qhull/Qhull-2020.2-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/q/Qiskit-juqcs/Qiskit-juqcs-0.5.0-gpsmkl-2021b.eb
 delete mode 100644 Golden_Repo/q/Qiskit/Qiskit-0.36.2-gpsmkl-2021b.eb
 delete mode 100644 Golden_Repo/q/Qt5/Qt5-5.13.1_fix-avx2.patch
 delete mode 100644 Golden_Repo/q/Qt5/Qt5-5.13.1_fix-qmake-libdir.patch
 delete mode 100644 Golden_Repo/q/Qt5/Qt5-5.14.2_fix-std-runtime_error.patch
 delete mode 100644 Golden_Repo/q/Qt5/Qt5-5.15.2-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/q/Qt5/Qt5-5.15.2_fix-gcc11.patch
 delete mode 100644 Golden_Repo/q/qcint/qcint-5.0.0-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/q/qrupdate/qrupdate-1.1.2-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/q/qrupdate/qrupdate-1.1.2_makeconf.patch
 delete mode 100644 Golden_Repo/r/R/R-4.1.2-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/r/RDFlib/RDFlib-6.0.2-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/r/RELION/RELION-3.1.3-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/r/ROOT/ROOT-6.26.04-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/r/Ruby/Ruby-3.0.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/r/Rust/Rust-1.54.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/r/re2c/re2c-2.2-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/r/rencode/rencode-1.0.5-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/r/rkcommon/rkcommon-1.8.0-GCC-11.2.0.eb
 delete mode 100644 Golden_Repo/r/rpmrebuild/rpmrebuild-2.16.eb
 delete mode 100644 Golden_Repo/s/SCOTCH/SCOTCH-6.1.2-gompi-2021b.eb
 delete mode 100644 Golden_Repo/s/SCOTCH/SCOTCH-6.1.2-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/s/SCOTCH/SCOTCH-6.1.2-iimpi-2021b.eb
 delete mode 100644 Golden_Repo/s/SCOTCH/SCOTCH-6.1.2-iompi-2021b.eb
 delete mode 100644 Golden_Repo/s/SCOTCH/SCOTCH-6.1.2-ipsmpi-2021b.eb
 delete mode 100644 Golden_Repo/s/SCons/SCons-4.2.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/s/SDL2/SDL2-2.0.18-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-gompi-2021b.eb
 delete mode 100644 Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-iimpi-2021b.eb
 delete mode 100644 Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-iompi-2021b.eb
 delete mode 100644 Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-ipsmpi-2021b.eb
 delete mode 100644 Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-npsmpic-2021b.eb
 delete mode 100644 Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-nvompic-2021b.eb
 delete mode 100644 Golden_Repo/s/SIONlib/SIONlib-1.7.7-GCCcore-11.2.0-tools.eb
 delete mode 100644 Golden_Repo/s/SIONlib/SIONlib-1.7.7-gompi-2021b.eb
 delete mode 100644 Golden_Repo/s/SIONlib/SIONlib-1.7.7-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/s/SIONlib/SIONlib-1.7.7-iimpi-2021b.eb
 delete mode 100644 Golden_Repo/s/SIONlib/SIONlib-1.7.7-iompi-2021b.eb
 delete mode 100644 Golden_Repo/s/SIONlib/SIONlib-1.7.7-ipsmpi-2021b.eb
 delete mode 100644 Golden_Repo/s/SIONlib/SIONlib-1.7.7-npsmpic-2021b.eb
 delete mode 100644 Golden_Repo/s/SIONlib/SIONlib-1.7.7-nvompic-2021b.eb
 delete mode 100644 Golden_Repo/s/SIONlib/sionlib_psmpi.patch
 delete mode 100644 Golden_Repo/s/SLEPc/SLEPc-3.16.1-gomkl-2021b.eb
 delete mode 100644 Golden_Repo/s/SLEPc/SLEPc-3.16.1-gpsmkl-2021b.eb
 delete mode 100644 Golden_Repo/s/SOCI/SOCI-4.0.2-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/s/SQLite/SQLite-3.36-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/s/SUNDIALS/SUNDIALS-6.1.0-gomkl-2021b.eb
 delete mode 100644 Golden_Repo/s/SUNDIALS/SUNDIALS-6.1.0-gpsmkl-2021b.eb
 delete mode 100644 Golden_Repo/s/SUNDIALS/SUNDIALS-6.1.0-intel-2021b.eb
 delete mode 100644 Golden_Repo/s/SUNDIALS/SUNDIALS-6.1.0-intel-para-2021b.eb
 delete mode 100644 Golden_Repo/s/SUNDIALS/SUNDIALS-6.1.0-iomkl-2021b.eb
 delete mode 100644 Golden_Repo/s/SWIG/SWIG-4.0.2-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/s/SZ/SZ-2.1.12-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/s/ScaFaCoS/ScaFaCoS-1.0.1-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/s/Scalasca/Scalasca-2.6-gompi-2021b.eb
 delete mode 100644 Golden_Repo/s/Scalasca/Scalasca-2.6-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/s/Scalasca/Scalasca-2.6-iimpi-2021b.eb
 delete mode 100644 Golden_Repo/s/Scalasca/Scalasca-2.6-iompi-2021b.eb
 delete mode 100644 Golden_Repo/s/Scalasca/Scalasca-2.6-ipsmpi-2021b.eb
 delete mode 100644 Golden_Repo/s/Scalasca/Scalasca-2.6-npsmpic-2021b.eb
 delete mode 100644 Golden_Repo/s/Scalasca/Scalasca-2.6-nvompic-2021b.eb
 delete mode 100644 Golden_Repo/s/SciPy-Stack/SciPy-Stack-2021b-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/s/SciPy-bundle/SciPy-bundle-2021.10-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/s/Score-P/Score-P-7.1-gompi-2021b.eb
 delete mode 100644 Golden_Repo/s/Score-P/Score-P-7.1-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/s/Score-P/Score-P-7.1-iimpi-2021b.eb
 delete mode 100644 Golden_Repo/s/Score-P/Score-P-7.1-iompi-2021b.eb
 delete mode 100644 Golden_Repo/s/Score-P/Score-P-7.1-ipsmpi-2021b.eb
 delete mode 100644 Golden_Repo/s/Score-P/Score-P-7.1-npsmpic-2021b.eb
 delete mode 100644 Golden_Repo/s/Score-P/Score-P-7.1-nvompic-2021b.eb
 delete mode 100644 Golden_Repo/s/Seaborn/Seaborn-0.11.2-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/s/Serf/Serf-1.3.9-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/s/Shapely/Shapely-1.8.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/s/Siesta/Siesta-4.1.5-intel-2021b.eb
 delete mode 100644 Golden_Repo/s/Siesta/Siesta-4.1.5-intel-para-2021b.eb
 delete mode 100644 Golden_Repo/s/Silo/Silo-4.11-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/s/Silo/Silo-4.11-ipsmpi-2021b.eb
 delete mode 100644 Golden_Repo/s/Silo/silo-4.11-fix-hdf5.patch
 delete mode 100644 Golden_Repo/s/Singularity-Tools/Singularity-Tools-2022-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/s/SoX/SoX-14.4.2-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/s/Subversion/Subversion-1.14.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/s/SuiteSparse/SuiteSparse-5.10.1-gcccoremkl-11.2.0-2021.4.0-nompi.eb
 delete mode 100644 Golden_Repo/s/SuiteSparse/SuiteSparse-5.10.1-gomkl-2021b.eb
 delete mode 100644 Golden_Repo/s/SuiteSparse/SuiteSparse-5.10.1-gpsmkl-2021b.eb
 delete mode 100644 Golden_Repo/s/SuiteSparse/SuiteSparse-5.10.1-intel-2021.eb
 delete mode 100644 Golden_Repo/s/SuiteSparse/SuiteSparse-5.10.1-intel-para-2021.eb
 delete mode 100644 Golden_Repo/s/SuiteSparse/SuiteSparse-5.10.1-iomkl-2021.eb
 delete mode 100644 Golden_Repo/s/SuperLU/SuperLU-5.3.0-gpsmkl-2021b.eb
 delete mode 100644 Golden_Repo/s/SuperLU/SuperLU-5.3.0-intel-para-2021b.eb
 delete mode 100644 Golden_Repo/s/SymEngine-python/SymEngine-python-0.9.2-GCC-11.2.0.eb
 delete mode 100644 Golden_Repo/s/SymEngine/SymEngine-0.9.0-GCC-11.2.0.eb
 delete mode 100644 Golden_Repo/s/Szip/Szip-2.1.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/s/scikit-allel/scikit-allel-1.3.3-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/s/scikit-bio/scikit-bio-0.5.6-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100755 Golden_Repo/s/scikit-build/scikit-build-0.11.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/s/scikit-image/scikit-image-0.18.1_fix-README-cache-perms.patch
 delete mode 100644 Golden_Repo/s/scikit-image/scikit-image-0.18.3-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/s/scikit-learn/scikit-learn-1.0.1-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/s/scikit-optimize/scikit-optimize-0.9.0-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/s/scikit-uplift/scikit-uplift-0.4.0-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/s/shpc/shpc-0.1.12-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/s/snappy/snappy-1.1.9-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/s/spdlog/spdlog-1.9.2-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/s/spglib-python/spglib-python-1.16.1-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/s/sprng/sprng-1-examples.patch
 delete mode 100644 Golden_Repo/s/sprng/sprng-1-gompi-2021b.eb
 delete mode 100644 Golden_Repo/s/sprng/sprng-1-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/s/sprng/sprng-1-iimpi-2021b.eb
 delete mode 100644 Golden_Repo/s/sprng/sprng-1-iompi-2021b.eb
 delete mode 100644 Golden_Repo/s/sprng/sprng-1-ipsmpi-2021b.eb
 delete mode 100644 Golden_Repo/s/sprng/sprng-1.patch
 delete mode 100644 Golden_Repo/s/sprng/sprng-5-10062021-examples.patch
 delete mode 100644 Golden_Repo/s/sprng/sprng-5-gompi-2021b-10062021.eb
 delete mode 100644 Golden_Repo/s/sprng/sprng-5-gpsmpi-2021b-10062021.eb
 delete mode 100644 Golden_Repo/s/sprng/sprng-5-iimpi-2021b-10062021.eb
 delete mode 100644 Golden_Repo/s/sprng/sprng-5-iompi-2021b-10062021.eb
 delete mode 100644 Golden_Repo/s/sprng/sprng-5-ipsmpi-2021b-10062021.eb
 delete mode 100644 Golden_Repo/s/strace/strace-5.14-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/s/sympy/sympy-1.8-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/t/Tcl/Tcl-8.6.11-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/t/TensorFlow/TensorFlow-2.1.0_fix-cuda-build.patch
 delete mode 100644 Golden_Repo/t/TensorFlow/TensorFlow-2.4.0_add-ldl.patch
 delete mode 100644 Golden_Repo/t/TensorFlow/TensorFlow-2.4.0_dont-use-var-lock.patch
 delete mode 100644 Golden_Repo/t/TensorFlow/TensorFlow-2.5.0-fix-alias-violation-in-absl.patch
 delete mode 100644 Golden_Repo/t/TensorFlow/TensorFlow-2.5.0_add-support-for-large-core-systems.patch
 delete mode 100644 Golden_Repo/t/TensorFlow/TensorFlow-2.5.0_disable-avx512-extensions.patch
 delete mode 100644 Golden_Repo/t/TensorFlow/TensorFlow-2.5.0_fix-arm-vector-intrinsics.patch
 delete mode 100644 Golden_Repo/t/TensorFlow/TensorFlow-2.5.0_fix-crash-on-shutdown.patch
 delete mode 100644 Golden_Repo/t/TensorFlow/TensorFlow-2.5.0_fix_numpy_1.20_compatibility.patch
 delete mode 100644 Golden_Repo/t/TensorFlow/TensorFlow-2.5.0_fix_protobuf_error_message.patch
 delete mode 100644 Golden_Repo/t/TensorFlow/TensorFlow-2.5.0_remove-duplicate-gpu-tests.patch
 delete mode 100644 Golden_Repo/t/TensorFlow/TensorFlow-2.6.0-gcccoremkl-11.2.0-2021.4.0-CUDA-11.5.eb
 delete mode 100644 Golden_Repo/t/TensorFlow/TensorFlow-2.6.0_add-default-shell-env.patch
 delete mode 100644 Golden_Repo/t/TensorFlow/TensorFlow-2.6.0_downgrade-required-versions.patch
 delete mode 100644 Golden_Repo/t/TensorFlow/h5py-2.10.0_avoid-mpi-init.patch
 delete mode 100644 Golden_Repo/t/TensorFlow/scipy-1.4.1-fix-pthread.patch
 delete mode 100644 Golden_Repo/t/TensorFlow/tensorboard-2.6.0-jupyter.fix
 delete mode 100644 Golden_Repo/t/Tk/Tk-8.6.11-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/t/Tk/Tk-8.6.4_different-prefix-with-tcl.patch
 delete mode 100644 Golden_Repo/t/Tkinter/Tkinter-3.9.6-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/t/TotalView/TotalView-2021.4.10-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/t/TotalView/TotalView-2022.1.11-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/t/tbb/tbb-2020.3-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/t/tbb/tbb-2021.4.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/t/tcsh/tcsh-6.22.04-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/t/texinfo/texinfo-6.8-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/t/texlive/texlive-20200406-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/t/tmux/tmux-3.2-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/t/torchaudio/standard-libs-deps.patch
 delete mode 100644 Golden_Repo/t/torchaudio/torchaudio-0.11-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/t/torchvision/torchvision-0.12.0-gcccoremkl-11.2.0-2021.4.0-CUDA-11.5.eb
 delete mode 100644 Golden_Repo/t/tqdm/tqdm-4.62.3-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/t/tree-sitter/tree-sitter-0.20.6-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/t/trimesh/trimesh-3.9.36-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/t/typing-extensions/typing-extensions-3.10.0.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/u/UCX-settings/UCX-settings-DC-CUDA.eb
 delete mode 100644 Golden_Repo/u/UCX-settings/UCX-settings-DC.eb
 delete mode 100644 Golden_Repo/u/UCX-settings/UCX-settings-RC-CUDA.eb
 delete mode 100644 Golden_Repo/u/UCX-settings/UCX-settings-RC.eb
 delete mode 100644 Golden_Repo/u/UCX-settings/UCX-settings-UD-CUDA.eb
 delete mode 100644 Golden_Repo/u/UCX-settings/UCX-settings-UD.eb
 delete mode 100644 Golden_Repo/u/UCX-settings/UCX-settings-plain.eb
 delete mode 100644 Golden_Repo/u/UCX/UCX-1.11.2.eb
 delete mode 100644 Golden_Repo/u/UCX/UCX-1.12.1.eb
 delete mode 100644 Golden_Repo/u/UCX/UCX-default.eb
 delete mode 100644 Golden_Repo/u/UDUNITS/UDUNITS-2.2.28-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/u/UnZip/UnZip-6.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/u/UnZip/UnZip-6.0_various-security-and-other-fixes-from-Ubuntu.patch
 delete mode 100644 Golden_Repo/u/uftp/uftp-1.4.3.eb
 delete mode 100644 Golden_Repo/u/uglifyjs/uglifyjs-3.14.3-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/u/unibilium/unibilium-2.1.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/u/utf8proc/utf8proc-2.6.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/u/util-linux/util-linux-2.37-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/v/VMD/VMD-1.9.3_plugins.patch
 delete mode 100644 Golden_Repo/v/VMD/VMD-1.9.3_stride_MAX_AT_IN_RES.patch
 delete mode 100644 Golden_Repo/v/VMD/VMD-1.9.3_stride_Makefile.patch
 delete mode 100644 Golden_Repo/v/VMD/VMD-1.9.3_surf_Makefile.patch
 delete mode 100644 Golden_Repo/v/VMD/VMD-1.9.3_surf_bad_printfs.patch
 delete mode 100644 Golden_Repo/v/VMD/VMD-1.9.4a51-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/v/VMD/VMD-1.9.4a51_configure.patch
 delete mode 100644 Golden_Repo/v/VMD/VMD-1.9.4a51_extra_colors.patch
 delete mode 100644 Golden_Repo/v/VTK/VTK-9.1.0-GCCcore-11.2.0-nompi.eb
 delete mode 100644 Golden_Repo/v/VTK/VTK-9.1.0-gpsmpi-2022.eb
 delete mode 100644 Golden_Repo/v/VTK/vtk-version.egg-info
 delete mode 100644 Golden_Repo/v/VTKData/VTKData-9.1.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/v/VTune/VTune-2021.9.0.eb
 delete mode 100644 Golden_Repo/v/Valgrind/Valgrind-3.18.1-gompi-2021b.eb
 delete mode 100644 Golden_Repo/v/Valgrind/Valgrind-3.18.1-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/v/Valgrind/Valgrind-3.18.1-iimpi-2021b.eb
 delete mode 100644 Golden_Repo/v/Valgrind/Valgrind-3.18.1-iompi-2021b.eb
 delete mode 100644 Golden_Repo/v/Valgrind/Valgrind-3.18.1-ipsmpi-2021b.eb
 delete mode 100644 Golden_Repo/v/Vampir/Vampir-10.0.0.eb
 delete mode 100644 Golden_Repo/v/Vampir/Vampir-9.11.3.eb
 delete mode 100644 Golden_Repo/v/VampirServer/VampirServer-10.0.0-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/v/VampirServer/VampirServer-9.11.3-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/v/VirtualGL/VirtualGL-2.6.5-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/v/VirtualGL/VirtualGL-3.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/v/VirtualGL/virtualgl_cmake_lib_path.patch
 delete mode 100644 Golden_Repo/v/Voro++/Voro++-0.4.6-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/w/Wannier90/Wannier90-1.2-gomkl-2021b.eb
 delete mode 100644 Golden_Repo/w/Wannier90/Wannier90-1.2-gpsmkl-2021b.eb
 delete mode 100644 Golden_Repo/w/Wannier90/Wannier90-1.2-intel-2021b.eb
 delete mode 100644 Golden_Repo/w/Wannier90/Wannier90-1.2-intel-para-2021b.eb
 delete mode 100644 Golden_Repo/w/Wannier90/Wannier90-1.2-iomkl-2021b.eb
 delete mode 100644 Golden_Repo/w/Wannier90/Wannier90-3.1.0-gomkl-2021b.eb
 delete mode 100644 Golden_Repo/w/Wannier90/Wannier90-3.1.0-gpsmkl-2021b.eb
 delete mode 100644 Golden_Repo/w/Wannier90/Wannier90-3.1.0-intel-2021b.eb
 delete mode 100644 Golden_Repo/w/Wannier90/Wannier90-3.1.0-intel-para-2021b.eb
 delete mode 100644 Golden_Repo/w/Wannier90/Wannier90-3.1.0-iomkl-2021b.eb
 delete mode 100644 Golden_Repo/w/Wannier90/Wannier90_1x_ignore_makesys.patch
 delete mode 100644 Golden_Repo/w/Wannier90/Wannier90_3x_ignore_makeinc.patch
 delete mode 100644 Golden_Repo/x/X11/X11-20210802-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/x/XCFun/XCFun-2.1.1-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/x/XGBoost/XGBoost-1.5.1-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/x/XServer/0002-Constant-DPI.patch
 delete mode 100644 Golden_Repo/x/XServer/0003-fix-pointer-limits.patch
 delete mode 100644 Golden_Repo/x/XServer/0005-support-for-30-bit-depth-in-dummy-driver.patch
 delete mode 100644 Golden_Repo/x/XServer/XServer-1.20.13-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/x/XServer/xterm-cursesloc.patch
 delete mode 100644 Golden_Repo/x/XServer/xvfb-run
 delete mode 100644 Golden_Repo/x/XZ/XZ-5.2.5-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/x/x264/x264-20210613-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/x/x265/x265-3.4-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/x/xarray/xarray-0.20.1-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/x/xorg-macros/xorg-macros-1.19.3-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/x/xpra/xpra-4.0.4-use_Xorg_on_PATH_first.patch
 delete mode 100644 Golden_Repo/x/xpra/xpra-4.3.3-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/x/xpra/xpra-4.3.4-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/x/xpra/xpra-iconsearch-XDG_DATA_DIRS.patch
 delete mode 100644 Golden_Repo/x/xpra/xprahtml-4.5.2-encryptionfix.patch
 delete mode 100644 Golden_Repo/x/xprop/xprop-1.2.5-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/y/YACS/YACS-0.1.8-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/y/YAXT/YAXT-0.9.1-gompi-2021b.eb
 delete mode 100644 Golden_Repo/y/YAXT/YAXT-0.9.1-gpsmpi-2021b.eb
 delete mode 100644 Golden_Repo/y/YAXT/YAXT-0.9.1-iimpi-2021b.eb
 delete mode 100644 Golden_Repo/y/YAXT/YAXT-0.9.1-iompi-2021b.eb
 delete mode 100644 Golden_Repo/y/YAXT/YAXT-0.9.1-ipsmpi-2021b.eb
 delete mode 100644 Golden_Repo/y/YAXT/YAXT-0.9.1-npsmpic-2021b.eb
 delete mode 100644 Golden_Repo/y/YAXT/YAXT-0.9.1-nvompic-2021b.eb
 delete mode 100644 Golden_Repo/y/Yasm/Yasm-1.3.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/y/yarn/yarn-1.22.17-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/y/yuicompressor/yuicompressor-2.4.8-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/z/Z3/Z3-4.8.12-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/z/ZeroMQ/ZeroMQ-4.3.4-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/z/Zip/Zip-3.0-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/z/zarr/zarr-2.10.1-gcccoremkl-11.2.0-2021.4.0.eb
 delete mode 100644 Golden_Repo/z/zfp/zfp-0.5.5-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/z/zlib/zlib-1.2.11-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/z/zlib/zlib-1.2.11.eb
 delete mode 100644 Golden_Repo/z/zsh/zsh-5.8-GCCcore-11.2.0.eb
 delete mode 100644 Golden_Repo/z/zstd/zstd-1.5.0-GCCcore-11.2.0.eb
 delete mode 100644 Overlays/deep_overlay/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb
 delete mode 100644 Overlays/deep_overlay/o/OpenMPI/OpenMPI-4.1.1-intel-compilers-2021.4.0.eb
 delete mode 100644 Overlays/deep_overlay/o/OpenMPI/OpenMPI-4.1.2-GCC-11.2.0.eb
 delete mode 100644 Overlays/deep_overlay/o/OpenMPI/OpenMPI-4.1.2-NVHPC-22.1.eb
 delete mode 100644 Overlays/deep_overlay/o/OpenMPI/OpenMPI-4.1.2-intel-compilers-2021.4.0.eb
 delete mode 100644 Overlays/deep_overlay/p/PAPI/PAPI-6.0.0.1-GCCcore-11.2.0.eb
 delete mode 100644 Overlays/deep_overlay/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
 delete mode 100644 Overlays/deep_overlay/p/psmpi/psmpi-5.5.0-1-NVHPC-22.1-mt.eb
 delete mode 100644 Overlays/deep_overlay/p/psmpi/psmpi-5.5.0-1-NVHPC-22.1.eb
 delete mode 100644 Overlays/deep_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
 delete mode 100644 Overlays/deep_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
 delete mode 100644 Overlays/hdfml_overlay/n/nvidia-driver/nvidia-driver-default.eb
 delete mode 100644 Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb
 delete mode 100644 Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.1-intel-compilers-2021.4.0.eb
 delete mode 100644 Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.2-GCC-11.2.0.eb
 delete mode 100644 Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.2-NVHPC-22.1.eb
 delete mode 100644 Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.2-intel-compilers-2021.4.0.eb
 delete mode 100644 Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
 delete mode 100644 Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-NVHPC-22.1-mt.eb
 delete mode 100644 Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-NVHPC-22.1.eb
 delete mode 100644 Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
 delete mode 100644 Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
 delete mode 100644 Overlays/jureca_arm_overlay/h/hwloc/hwloc-2.5.0-GCCcore-11.2.0.eb
 delete mode 100644 Overlays/jureca_arm_overlay/o/OpenMPI/OpenMPI-4.1.2-GCC-11.2.0.eb
 delete mode 100644 Overlays/jureca_arm_overlay/o/OpenMPI/OpenMPI-4.1.2-NVHPC-22.1.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/b/BLIS/BLIS-0.8.1-GCCcore-11.2.0.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/b/BLIS/BLIS-0.8.1_fix_dgemm-fpe-signalling-on-broadwell.patch
 delete mode 100644 Overlays/jureca_mi200_overlay/b/BLIS/BLIS-3.1-GCCcore-11.2.0-amd.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/b/Blaze/Blaze-3.8.1-gomkl-2021b.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/b/babeltrace/babeltrace-1.5.8-GCCcore-11.2.0.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/c/CppHeaderParser/CppHeaderParser-2.7.4-GCCcore-11.2.0.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/g/gfxreconstruct/gfxreconstruct-1.3.213-GCCcore-11.2.0.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/g/glslang/glslang-1.3.213-GCCcore-11.2.0.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/h/hwloc/hwloc-2.5.0-GCCcore-11.2.0.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/l/LAPACK/LAPACK-3.10.1-GCC-11.2.0.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/l/LLVM/LLVM-14.0.3-GCCcore-11.2.0.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/l/libdrm/libdrm-2.4.107-GCCcore-11.2.0.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/l/libdrm/libdrm-2.4.108-GCCcore-11.2.0.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/l/libdrm/libdrm-2.4.110-GCCcore-11.2.0.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/m/msgpack-cpp/msgpack-cpp-4.1.1-GCCcore-11.2.0.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/o/OpenCL-Headers/OpenCL-Headers-2022.05.18-GCCcore-11.2.0.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/o/OpenCL-ICD-Loader/OpenCL-ICD-Loader-2022.05.18-GCCcore-11.2.0.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/o/OpenGL/OpenGL-2021b-GCCcore-11.2.0.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/o/OpenMPI/OpenMPI-4.1.2-GCC-11.2.0.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/r/ROCm/MIOpen-disable-pch-until-5.3.patch
 delete mode 100644 Overlays/jureca_mi200_overlay/r/ROCm/ROCm-5.1.3-GCCcore-11.2.0.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/r/ROCm/ROCm-5.2.0-GCCcore-11.2.0.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/r/ROCm/aomp-5.2.0-extras-version-string.patch
 delete mode 100644 Overlays/jureca_mi200_overlay/r/ROCm/aomp-5.2.0-openmp-rocm_dir.patch
 delete mode 100644 Overlays/jureca_mi200_overlay/r/ROCm/aomp-extras-5.2.0-rocm-dir-llvm.patch
 delete mode 100644 Overlays/jureca_mi200_overlay/r/ROCm/aomp-extras-compiler-in-rocm-dir.patch
 delete mode 100644 Overlays/jureca_mi200_overlay/r/ROCm/aomp-flang-alarm-signature.patch
 delete mode 100644 Overlays/jureca_mi200_overlay/r/ROCm/aomp-flang-decouple-out-dir-and-rocm-install.patch
 delete mode 100644 Overlays/jureca_mi200_overlay/r/ROCm/aomp-flang-libomp-path.patch
 delete mode 100644 Overlays/jureca_mi200_overlay/r/ROCm/aomp-gcc8-only-for-cuda.patch
 delete mode 100644 Overlays/jureca_mi200_overlay/r/ROCm/aomp-openmp-buildpath.patch
 delete mode 100644 Overlays/jureca_mi200_overlay/r/ROCm/aomp-openmp-llvm.patch
 delete mode 100644 Overlays/jureca_mi200_overlay/r/ROCm/hipBLAS-5.2.0-rocblas-include-fix.patch
 delete mode 100644 Overlays/jureca_mi200_overlay/r/ROCm/hipamd-5.1.3-git-hash.patch
 delete mode 100644 Overlays/jureca_mi200_overlay/r/ROCm/llvm-project-hostrpc-fprintf-decl.patch
 delete mode 100644 Overlays/jureca_mi200_overlay/r/ROCm/llvm-project-mlir-fix-rpath-flags.patch
 delete mode 100644 Overlays/jureca_mi200_overlay/r/ROCm/llvm-project-mlir-no-append-rpath-do-it-via-commandline-instead.patch
 delete mode 100644 Overlays/jureca_mi200_overlay/r/ROCm/miopen-5.2.0-rocblas-include-fix.patch
 delete mode 100644 Overlays/jureca_mi200_overlay/r/ROCm/rocALUTION-5.2.0-fix-complex-device-operators.patch
 delete mode 100644 Overlays/jureca_mi200_overlay/r/ROCm/rocALUTION-5.2.0-rocblas-include-fix.patch
 delete mode 100644 Overlays/jureca_mi200_overlay/r/ROCm/rocALUTION-complex.patch
 delete mode 100644 Overlays/jureca_mi200_overlay/r/ROCm/rocBLAS-5.2.0-find-python-if-undefined.patch
 delete mode 100644 Overlays/jureca_mi200_overlay/r/ROCm/rocblas-5.2.0-internal-rocblas-include-fix.patch
 delete mode 100644 Overlays/jureca_mi200_overlay/r/ROCm/roctracer-hsa_ostream_ops-include.patch
 delete mode 100644 Overlays/jureca_mi200_overlay/r/ROCm/roctracer-preprocess-no-linemarkers.patch
 delete mode 100644 Overlays/jureca_mi200_overlay/r/robin-hood-hashing/robin-hood-hashing-3.11.5-GCCcore-11.2.0.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/s/SPIRV-Cross/SPIRV-Cross-1.3.213-GCCcore-11.2.0.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/s/SPIRV-Headers/SPIRV-Headers-1.3.213-GCCcore-11.2.0.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/s/SPIRV-Reflect/SPIRV-Reflect-1.3.213-GCCcore-11.2.0.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/s/SPIRV-Tools/SPIRV-Tools-2022.2-GCCcore-11.2.0.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/s/source-highlight/source-highlight-3.1.9-GCCcore-11.2.0.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/s/source-highlight/source-highlight-gcc11.patch
 delete mode 100644 Overlays/jureca_mi200_overlay/u/UCX-settings/UCX-settings-RC-ROCm.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/u/UCX/UCX-1.11.2.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/u/UCX/UCX-1.12.0.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/u/UCX/UCX-1.12.1.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/u/UCX/UCX-1.13.0-5879c44.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/u/UCX/UCX-1.13.0.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/u/UCX/UCX-default.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/v/Vulkan-Headers/Vulkan-Headers-1.3.213-GCCcore-11.2.0.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/v/Vulkan-Loader/Vulkan-Loader-1.3.213-GCCcore-11.2.0.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/v/Vulkan-Tools/Vulkan-Tools-1.3.213-GCCcore-11.2.0.eb
 delete mode 100644 Overlays/jureca_mi200_overlay/v/Vulkan-ValidationLayers/Vulkan-ValidationLayers-1.3.213-GCCcore-11.2.0.eb
 delete mode 100644 Overlays/jurecabooster_overlay/g/GCC/GCC-11.2.0.eb
 delete mode 100644 Overlays/jurecabooster_overlay/g/GCCcore/GCCcore-11.2.0.eb
 delete mode 100644 Overlays/jurecabooster_overlay/h/Hypre/Hypre-2.23.0-gpsmkl-2021b-mixedint.eb
 delete mode 100644 Overlays/jurecabooster_overlay/h/Hypre/Hypre-2.23.0-gpsmkl-2021b.eb
 delete mode 100644 Overlays/jurecabooster_overlay/h/Hypre/Hypre-2.23.0-intel-2021b-mixedint.eb
 delete mode 100644 Overlays/jurecabooster_overlay/h/Hypre/Hypre-2.23.0-intel-2021b.eb
 delete mode 100644 Overlays/jurecabooster_overlay/h/Hypre/Hypre-2.23.0-intel-para-2021b-mixedint.eb
 delete mode 100644 Overlays/jurecabooster_overlay/h/Hypre/Hypre-2.23.0-intel-para-2021b.eb
 delete mode 100644 Overlays/jurecabooster_overlay/h/Hypre/Hypre-2.23.0-iomkl-2021b-mixedint.eb
 delete mode 100644 Overlays/jurecabooster_overlay/h/Hypre/Hypre-2.23.0-iomkl-2021b.eb
 delete mode 100644 Overlays/jurecabooster_overlay/h/Hypre/hypre-2.23.0_examples_mkl.patch
 delete mode 100644 Overlays/jurecabooster_overlay/h/hwloc/hwloc-2.5.0-GCCcore-11.2.0.eb
 delete mode 100644 Overlays/jurecabooster_overlay/i/impi/impi-2021.4.0-intel-compilers-2021.4.0.eb
 delete mode 100644 Overlays/jurecabooster_overlay/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
 delete mode 100644 Overlays/jurecabooster_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
 delete mode 100644 Overlays/jurecabooster_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
 delete mode 100644 Overlays/jurecabooster_overlay/s/Scalasca/Scalasca-2.6-gpsmpi-2021b.eb
 delete mode 100644 Overlays/jurecabooster_overlay/s/Scalasca/Scalasca-2.6-iimpi-2021b.eb
 delete mode 100644 Overlays/jurecabooster_overlay/s/Scalasca/Scalasca-2.6-ipsmpi-2021b.eb
 delete mode 100644 Overlays/jurecabooster_overlay/s/Score-P/Score-P-7.1-gpsmpi-2021b.eb
 delete mode 100644 Overlays/jurecabooster_overlay/s/Score-P/Score-P-7.1-iimpi-2021b.eb
 delete mode 100644 Overlays/jurecabooster_overlay/s/Score-P/Score-P-7.1-ipsmpi-2021b.eb
 delete mode 100644 Overlays/jurecadc_overlay/b/BLIS/BLIS-3.1-GCCcore-11.2.0-amd.eb
 delete mode 100644 Overlays/jurecadc_overlay/b/BullMPI-settings/BullMPI-settings-4.1-plain.eb
 delete mode 100644 Overlays/jurecadc_overlay/b/BullMPI/BullMPI-4.1.0-GCC-11.2.0.eb
 delete mode 100644 Overlays/jurecadc_overlay/l/LWP-MPI/LWP-MPI-1.7.0-gompi-2021b.eb
 delete mode 100644 Overlays/jurecadc_overlay/l/LWP-MPI/LWP-MPI-1.7.0-iimpi-2021b.eb
 delete mode 100644 Overlays/jurecadc_overlay/l/LWP-settings/LWP-settings-LWP-omp.eb
 delete mode 100644 Overlays/jurecadc_overlay/l/LWP-settings/LWP-settings-LWP-procstat.eb
 delete mode 100644 Overlays/jurecadc_overlay/l/LWP-settings/LWP-settings-LWP-sysinfo.eb
 delete mode 100644 Overlays/jurecadc_overlay/l/LWP-settings/LWP-settings-LWP-vmstat.eb
 delete mode 100644 Overlays/jurecadc_overlay/l/LWP/LWP-1.1.3.eb
 delete mode 100644 Overlays/jurecadc_overlay/p/pscom/pscom-5.4-default.eb
 delete mode 100644 Overlays/jusuf_overlay/b/BLIS/BLIS-3.1-GCCcore-11.2.0-amd.eb
 delete mode 100644 Overlays/jusuf_overlay/x/XZ/XZ-5.2.5-GCCcore-11.2.0.eb
 delete mode 100644 Overlays/juwels_overlay/r/R/R-4.1.2-gcccoremkl-11.2.0-2021.4.0.eb

diff --git a/Custom_EasyBlocks/cuda.py b/Custom_EasyBlocks/cuda.py
deleted file mode 100644
index 13a0ade87..000000000
--- a/Custom_EasyBlocks/cuda.py
+++ /dev/null
@@ -1,334 +0,0 @@
-##
-# Copyright 2012-2021 Ghent University
-#
-# This file is part of EasyBuild,
-# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
-# with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
-# Flemish Research Foundation (FWO) (http://www.fwo.be/en)
-# and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
-#
-# https://github.com/easybuilders/easybuild
-#
-# EasyBuild is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation v2.
-#
-# EasyBuild is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with EasyBuild.  If not, see <http://www.gnu.org/licenses/>.
-##
-"""
-EasyBuild support for CUDA, implemented as an easyblock
-
-Ref: https://speakerdeck.com/ajdecon/introduction-to-the-cuda-toolkit-for-building-applications
-
-@author: George Tsouloupas (Cyprus Institute)
-@author: Fotis Georgatos (Uni.lu)
-@author: Kenneth Hoste (Ghent University)
-@author: Damian Alvarez (Forschungszentrum Juelich)
-@author: Ward Poelmans (Free University of Brussels)
-@author: Robert Mijakovic (LuxProvide S.A.)
-"""
-import os
-import re
-import stat
-
-from distutils.version import LooseVersion
-
-from easybuild.easyblocks.generic.binary import Binary
-from easybuild.framework.easyconfig import CUSTOM
-from easybuild.tools.build_log import EasyBuildError
-from easybuild.tools.config import IGNORE
-from easybuild.tools.filetools import adjust_permissions, change_dir, copy_dir, expand_glob_paths
-from easybuild.tools.filetools import patch_perl_script_autoflush, remove_file, symlink, which, write_file
-from easybuild.tools.run import run_cmd, run_cmd_qa
-from easybuild.tools.systemtools import AARCH64, POWER, X86_64, get_cpu_architecture, get_shared_lib_ext
-import easybuild.tools.environment as env
-
-# Wrapper script definition
-WRAPPER_TEMPLATE = """#!/bin/sh
-echo "$@" | grep -e '-ccbin' -e '--compiler-bindir' > /dev/null
-if [ $? -eq 0 ];
-then
-        echo "ERROR: do not set -ccbin or --compiler-bindir when using the `basename $0` wrapper"
-else
-        nvcc -ccbin=%s "$@"
-        exit $?
-fi """
-
-
-class EB_CUDA(Binary):
-    """
-    Support for installing CUDA.
-    """
-
-    @staticmethod
-    def extra_options():
-        """Create a set of wrappers based on a list determined by the easyconfig file"""
-        extra_vars = {
-            'host_compilers': [None, "Host compilers for which a wrapper will be generated", CUSTOM]
-        }
-        return Binary.extra_options(extra_vars)
-
-    def __init__(self, *args, **kwargs):
-        """ Init the cuda easyblock adding a new cudaarch template var """
-        myarch = get_cpu_architecture()
-        if myarch == AARCH64:
-            cudaarch = '_sbsa'
-        elif myarch == POWER:
-            cudaarch = '_ppc64le'
-        elif myarch == X86_64:
-            cudaarch = ''
-        else:
-            raise EasyBuildError("Architecture %s is not supported for CUDA on EasyBuild", myarch)
-
-        super(EB_CUDA, self).__init__(*args, **kwargs)
-
-        self.cfg.template_values['cudaarch'] = cudaarch
-        self.cfg.generate_template_values()
-
-    def extract_step(self):
-        """Extract installer to have more control, e.g. options, patching Perl scripts, etc."""
-        execpath = self.src[0]['path']
-        run_cmd("/bin/sh " + execpath + " --noexec --nox11 --target " + self.builddir)
-        self.src[0]['finalpath'] = self.builddir
-
-    def install_step(self):
-        """Install CUDA using Perl install script."""
-
-        # define how to run the installer
-        # script has /usr/bin/perl hardcoded, but we want to have control over which perl is being used
-        if LooseVersion(self.version) <= LooseVersion("5"):
-            install_interpreter = "perl"
-            install_script = "install-linux.pl"
-            self.cfg.update('installopts', '--prefix=%s' % self.installdir)
-        elif LooseVersion(self.version) > LooseVersion("5") and LooseVersion(self.version) < LooseVersion("10.1"):
-            install_interpreter = "perl"
-            install_script = "cuda-installer.pl"
-            # note: samples are installed by default
-            self.cfg.update('installopts', "-verbose -silent -toolkitpath=%s -toolkit" % self.installdir)
-        else:
-            install_interpreter = ""
-            install_script = "./cuda-installer"
-            # samples are installed in two places with identical copies:
-            # self.installdir/samples and $HOME/NVIDIA_CUDA-11.2_Samples
-            # changing the second location (the one under $HOME) to a scratch location using
-            # --samples --samplespath=self.builddir
-            # avoids the duplicate and pollution of the home directory of the installer.
-            self.cfg.update('installopts',
-                            "--silent --samples --samplespath=%s --toolkit --toolkitpath=%s --defaultroot=%s" % (
-                                self.builddir, self.installdir, self.installdir))
-            # When eb is called via sudo -u someuser -i eb ..., the installer may try to chown samples to the
-            # original user using the SUDO_USER environment variable, which fails
-            if "SUDO_USER" in os.environ:
-                self.log.info("SUDO_USER was defined as '%s', need to unset it to avoid problems..." %
-                              os.environ["SUDO_USER"])
-                del os.environ["SUDO_USER"]
-
-        if LooseVersion("10.0") < LooseVersion(self.version) < LooseVersion("10.2") and get_cpu_architecture() == POWER:
-            # Workaround for
-            # https://devtalk.nvidia.com/default/topic/1063995/cuda-setup-and-installation/cuda-10-1-243-10-1-update-2-ppc64le-run-file-installation-issue/
-            install_script = " && ".join([
-                "mkdir -p %(installdir)s/targets/ppc64le-linux/include",
-                "([ -e %(installdir)s/include ] || ln -s targets/ppc64le-linux/include %(installdir)s/include)",
-                "cp -r %(builddir)s/builds/cublas/src %(installdir)s/.",
-                install_script
-            ]) % {
-                'installdir': self.installdir,
-                'builddir': self.builddir
-            }
-
-        # Use C locale to avoid localized questions and crash on CUDA 10.1
-        self.cfg.update('preinstallopts', "export LANG=C && ")
-
-        cmd = "%(preinstallopts)s %(interpreter)s %(script)s %(installopts)s" % {
-            'preinstallopts': self.cfg['preinstallopts'],
-            'interpreter': install_interpreter,
-            'script': install_script,
-            'installopts': self.cfg['installopts']
-        }
-
-        # prepare for running install script autonomously
-        qanda = {}
-        stdqa = {
-            # this question is only asked if CUDA tools are already available system-wide
-            r"Would you like to remove all CUDA files under .*? (yes/no/abort): ": "no",
-        }
-        noqanda = [
-            r"^Configuring",
-            r"Installation Complete",
-            r"Verifying archive integrity.*",
-            r"^Uncompressing NVIDIA CUDA",
-            r".* -> .*",
-        ]
-
-        # patch install script to handle Q&A autonomously
-        if install_interpreter == "perl":
-            patch_perl_script_autoflush(os.path.join(self.builddir, install_script))
-            p5lib = os.getenv('PERL5LIB', '')
-            if p5lib == '':
-                p5lib = self.builddir
-            else:
-                p5lib = os.pathsep.join([self.builddir, p5lib])
-            env.setvar('PERL5LIB', p5lib)
-
-        # make sure $DISPLAY is not defined, which may lead to (weird) problems
-        # this is workaround for not being able to specify --nox11 to the Perl install scripts
-        if 'DISPLAY' in os.environ:
-            os.environ.pop('DISPLAY')
-
-        # cuda-installer creates /tmp/cuda-installer.log (ignoring TMPDIR)
-        # Try to remove it before running the installer.
-        # This will fail with a usable error if it can't be removed
-        # instead of segfaulting in the cuda-installer.
-        remove_file('/tmp/cuda-installer.log')
-
-        # overriding maxhits default value to 1000 (seconds to wait for nothing to change in the output
-        # without seeing a known question)
-        run_cmd_qa(cmd, qanda, std_qa=stdqa, no_qa=noqanda, log_all=True, simple=True, maxhits=1000)
-
-        # Remove the cuda-installer log file
-        remove_file('/tmp/cuda-installer.log')
-
-        # check if there are patches to apply
-        if len(self.src) > 1:
-            for patch in self.src[1:]:
-                self.log.debug("Running patch %s", patch['name'])
-                run_cmd("/bin/sh " + patch['path'] + " --accept-eula --silent --installdir=" + self.installdir)
-
-    def post_install_step(self):
-        """
-        Create wrappers for the specified host compilers, generate the appropriate stub symlinks and create version
-        independent pkgconfig files
-        """
-        def create_wrapper(wrapper_name, wrapper_comp):
-            """Create for a particular compiler, with a particular name"""
-            wrapper_f = os.path.join(self.installdir, 'bin', wrapper_name)
-            write_file(wrapper_f, WRAPPER_TEMPLATE % wrapper_comp)
-            perms = stat.S_IXUSR | stat.S_IRUSR | stat.S_IXGRP | stat.S_IRGRP | stat.S_IXOTH | stat.S_IROTH
-            adjust_permissions(wrapper_f, perms)
-
-        # Prepare wrappers to handle a default host compiler other than g++
-        for comp in (self.cfg['host_compilers'] or []):
-            create_wrapper('nvcc_%s' % comp, comp)
-
-        ldconfig = which('ldconfig', log_ok=False, on_error=IGNORE)
-        sbin_dirs = ['/sbin', '/usr/sbin']
-        if not ldconfig:
-            # ldconfig is usually in /sbin or /usr/sbin
-            for cand_path in sbin_dirs:
-                if os.path.exists(os.path.join(cand_path, 'ldconfig')):
-                    ldconfig = os.path.join(cand_path, 'ldconfig')
-                    break
-
-        # fail if we couldn't find ldconfig, because it's really needed
-        if ldconfig:
-            self.log.info("ldconfig found at %s", ldconfig)
-        else:
-            path = os.environ.get('PATH', '')
-            raise EasyBuildError("Unable to find 'ldconfig' in $PATH (%s), nor in any of %s", path, sbin_dirs)
-
-        stubs_dir = os.path.join(self.installdir, 'lib64', 'stubs')
-        # Run ldconfig to create missing symlinks in the stubs directory (libcuda.so.1, etc)
-        cmd = ' '.join([ldconfig, '-N', stubs_dir])
-        run_cmd(cmd)
-
-        # GCC searches paths in LIBRARY_PATH and the system paths suffixed with ../lib64 or ../lib first
-        # This means stubs/../lib64 is searched before the system /lib64 folder containing a potentially older libcuda.
-        # See e.g. https://github.com/easybuilders/easybuild-easyconfigs/issues/12348
-        # Workaround: Create a copy that matches this pattern
-        new_stubs_dir = os.path.join(self.installdir, 'stubs')
-        copy_dir(stubs_dir, os.path.join(new_stubs_dir, 'lib64'))
-        # Also create the lib dir as a symlink
-        symlink('lib64', os.path.join(new_stubs_dir, 'lib'), use_abspath_source=False)
-
-        # Packages like xpra look for version independent pc files.
-        # See e.g. https://github.com/Xpra-org/xpra/blob/master/setup.py#L206
-        # Distros provide these files, so let's do it here too
-        pkgconfig_dir = os.path.join(self.installdir, 'pkgconfig')
-        pc_files = expand_glob_paths([os.path.join(pkgconfig_dir, '*.pc')])
-        change_dir(pkgconfig_dir)
-        for f in pc_files:
-            f = os.path.basename(f)
-            l = re.sub('-[0-9]*.?[0-9]*(.[0-9]*)?.pc', '.pc', f)
-            symlink(f, l, use_abspath_source=False)
-
-        super(EB_CUDA, self).post_install_step()
-
-    def sanity_check_step(self):
-        """Custom sanity check for CUDA."""
-
-        shlib_ext = get_shared_lib_ext()
-
-        chk_libdir = ["lib64", "lib"]
-        culibs = ["cublas", "cudart", "cufft", "curand", "cusparse"]
-        custom_paths = {
-            'files': [os.path.join("bin", x) for x in ["fatbinary", "nvcc", "nvlink", "ptxas"]] +
-            [os.path.join("%s", "lib%s.%s") % (x, y, shlib_ext) for x in chk_libdir for y in culibs],
-            'dirs': ["include"],
-        }
-
-        if LooseVersion(self.version) > LooseVersion('5'):
-            custom_paths['files'].append(os.path.join('samples', 'Makefile'))
-        if LooseVersion(self.version) < LooseVersion('7'):
-            custom_paths['files'].append(os.path.join('open64', 'bin', 'nvopencc'))
-        if LooseVersion(self.version) >= LooseVersion('7'):
-            custom_paths['files'].append(os.path.join("extras", "CUPTI", "lib64", "libcupti.%s") % shlib_ext)
-            custom_paths['dirs'].append(os.path.join("extras", "CUPTI", "include"))
-
-        # Just a subset of files are checked, since the whole list is likely to change, and irrelevant in most cases
-        # anyway
-        pc_files = ['cublas.pc', 'cudart.pc', 'cuda.pc', 'nvidia-ml.pc', 'nvjpeg.pc']
-        custom_paths['files'] = custom_paths['files'] + [os.path.join('pkgconfig', x) for x in pc_files]
-
-        super(EB_CUDA, self).sanity_check_step(custom_paths=custom_paths)
-
-    def make_module_extra(self):
-        """Set the install directory as CUDA_HOME, CUDA_ROOT, CUDA_PATH."""
-
-        # avoid adding of installation directory to $PATH (cfr. Binary easyblock) since that may cause trouble,
-        # for example when there's a clash between command name and a subdirectory in the installation directory
-        # (like compute-sanitizer)
-        self.cfg['prepend_to_path'] = False
-
-        txt = super(EB_CUDA, self).make_module_extra()
-        txt += self.module_generator.set_environment('CUDA_HOME', self.installdir)
-        txt += self.module_generator.set_environment('CUDA_ROOT', self.installdir)
-        txt += self.module_generator.set_environment('CUDA_PATH', self.installdir)
-        self.log.debug("make_module_extra added this: %s", txt)
-        return txt
-
-    def make_module_req_guess(self):
-        """Specify CUDA custom values for PATH etc."""
-
-        guesses = super(EB_CUDA, self).make_module_req_guess()
-
-        # The dirs should be in the order ['open64/bin', 'bin']
-        bin_path = []
-        if LooseVersion(self.version) < LooseVersion('7'):
-            bin_path.append(os.path.join('open64', 'bin'))
-        bin_path.append('bin')
-
-        lib_path = ['lib64']
-        inc_path = ['include']
-        if LooseVersion(self.version) >= LooseVersion('7'):
-            lib_path.append(os.path.join('extras', 'CUPTI', 'lib64'))
-            inc_path.append(os.path.join('extras', 'CUPTI', 'include'))
-            bin_path.append(os.path.join('nvvm', 'bin'))
-            lib_path.append(os.path.join('nvvm', 'lib64'))
-            inc_path.append(os.path.join('nvvm', 'include'))
-
-        guesses.update({
-            'PATH': bin_path,
-            'LD_LIBRARY_PATH': lib_path,
-            'LIBRARY_PATH': ['lib64', os.path.join('stubs', 'lib64')],
-            'CPATH': inc_path,
-            'PKG_CONFIG_PATH': ['pkgconfig'],
-        })
-
-        return guesses
diff --git a/Custom_EasyBlocks/numexpr.py b/Custom_EasyBlocks/numexpr.py
deleted file mode 100644
index ad7e67063..000000000
--- a/Custom_EasyBlocks/numexpr.py
+++ /dev/null
@@ -1,133 +0,0 @@
-##
-# Copyright 2019-2022 Ghent University
-#
-# This file is part of EasyBuild,
-# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
-# with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
-# Flemish Research Foundation (FWO) (http://www.fwo.be/en)
-# and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
-#
-# https://github.com/easybuilders/easybuild
-#
-# EasyBuild is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation v2.
-#
-# EasyBuild is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with EasyBuild.  If not, see <http://www.gnu.org/licenses/>.
-##
-"""
-EasyBuild support for building and installing numexpr, implemented as an easyblock
-"""
-import os
-from distutils.version import LooseVersion
-
-import easybuild.tools.toolchain as toolchain
-from easybuild.easyblocks.generic.pythonpackage import PythonPackage
-from easybuild.tools.filetools import write_file
-from easybuild.tools.modules import get_software_root, get_software_version
-from easybuild.tools.systemtools import get_cpu_features
-
-
-class EB_numexpr(PythonPackage):
-    """Support for building/installing numexpr."""
-
-    @staticmethod
-    def extra_options():
-        """Override some custom easyconfig parameters specifically for numexpr."""
-        extra_vars = PythonPackage.extra_options()
-
-        extra_vars['download_dep_fail'][0] = True
-        extra_vars['use_pip'][0] = True
-
-        return extra_vars
-
-    def __init__(self, *args, **kwargs):
-        """Initialisation of custom class variables for numexpr."""
-        super(EB_numexpr, self).__init__(*args, **kwargs)
-
-        self.imkl_root = None
-
-    def configure_step(self):
-        """Custom configuration procedure for numexpr."""
-        super(EB_numexpr, self).configure_step()
-
-        self.imkl_root = get_software_root('imkl')
-
-        # if Intel MKL is available, set up site.cfg such that the right VML library is used;
-        # this makes a *big* difference in terms of performance;
-        # see also https://github.com/pydata/numexpr/blob/master/site.cfg.example
-        if self.imkl_root:
-
-            # figure out which VML library to link to
-            cpu_features = get_cpu_features()
-            if 'avx512f' in cpu_features:
-                mkl_vml_lib = 'mkl_vml_avx512'
-            elif 'avx2' in cpu_features:
-                mkl_vml_lib = 'mkl_vml_avx2'
-            elif 'avx' in cpu_features:
-                mkl_vml_lib = 'mkl_vml_avx'
-            else:
-                # use default kernels as fallback for non-AVX systems
-                mkl_vml_lib = 'mkl_vml_def'
-
-            if self.toolchain.comp_family() == toolchain.INTELCOMP:
-                mkl_threading_libs = ['mkl_intel_thread', 'iomp5']
-            elif self.toolchain.comp_family() == toolchain.GCC:
-                mkl_threading_libs = ['mkl_gnu_thread', 'gomp']
-            else:
-                mkl_threading_libs = []
-
-            mkl_ver = get_software_version('imkl')
-
-            if LooseVersion(mkl_ver) >= LooseVersion('2021'):
-                mkl_lib_dirs = [
-                    os.path.join(self.imkl_root, 'mkl',
-                                 'latest', 'lib', 'intel64'),
-                ]
-                mkl_include_dirs = os.path.join(
-                    self.imkl_root, 'mkl', 'latest', 'include')
-                mkl_libs = ['mkl_intel_lp64', 'mkl_core',
-                            mkl_vml_lib] + mkl_threading_libs
-            else:
-                mkl_lib_dirs = [
-                    os.path.join(self.imkl_root, 'mkl', 'lib', 'intel64'),
-                    os.path.join(self.imkl_root, 'lib', 'intel64'),
-                ]
-                mkl_include_dirs = os.path.join(
-                    self.imkl_root, 'mkl', 'include')
-                mkl_libs = ['mkl_intel_lp64', 'mkl_core',
-                            'mkl_def', mkl_vml_lib] + mkl_threading_libs
-
-            site_cfg_lines = [
-                "[mkl]",
-                "include_dirs = %s" % mkl_include_dirs,
-                "library_dirs = %s" % os.pathsep.join(
-                    mkl_lib_dirs + self.toolchain.get_variable('LDFLAGS', typ=list)),
-            ]
-
-            if LooseVersion(self.version) >= LooseVersion("2.8.0"):
-                site_cfg_lines.append("libraries = %s" %
-                                      os.pathsep.join(mkl_libs))
-            else:
-                site_cfg_lines.append("mkl_libs = %s" % ', '.join(mkl_libs))
-
-            write_file('site.cfg', '\n'.join(site_cfg_lines))
-
-    def sanity_check_step(self):
-        """Custom sanity check for numexpr."""
-
-        custom_commands = []
-
-        # if Intel MKL is available, make sure VML is used
-        if self.imkl_root:
-            custom_commands.append(
-                "python -c 'import numexpr; assert(numexpr.use_vml)'")
-
-        return super(EB_numexpr, self).sanity_check_step(custom_commands=custom_commands)
diff --git a/Golden_Repo/a/ABINIT/ABINIT-9.6.2-gpsmkl-2021b.eb b/Golden_Repo/a/ABINIT/ABINIT-9.6.2-gpsmkl-2021b.eb
deleted file mode 100644
index 75a5342c2..000000000
--- a/Golden_Repo/a/ABINIT/ABINIT-9.6.2-gpsmkl-2021b.eb
+++ /dev/null
@@ -1,75 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'ABINIT'
-version = '9.6.2'
-
-homepage = 'https://www.abinit.org/'
-description = """
-ABINIT is a package whose main program allows one to find the total energy, charge density and electronic structure of
-systems made of electrons and nuclei (molecules and periodic solids) within Density Functional Theory (DFT), using
-pseudopotentials and a planewave or wavelet basis.
-"""
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-toolchainopts = {'usempi': True, 'openmp': True, 'pic': True}
-
-source_urls = ['https://www.abinit.org/sites/default/files/packages/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['b018c2ff24338a5952c5550a7e09d4c7793b62402c7aa4e09273e9a666e674fb']
-
-builddependencies = [
-    ('Python', '3.9.6'),
-]
-dependencies = [
-    ('libxc', '5.1.7'),
-    ('netCDF', '4.8.1'),
-    ('netCDF-Fortran', '4.5.3'),
-    ('HDF5', '1.12.1'),
-    ('Wannier90', '3.1.0'),
-]
-
-# Needed due to changes in GCC10.
-preconfigopts = 'export  FCFLAGS="-fallow-argument-mismatch -ffree-line-length-none $FCFLAGS" && '
-preconfigopts += 'export FFLAGS="-fallow-argument-mismatch -ffree-line-length-none $FFLAGS" && '
-
-# Ensure MPI
-configopts = '--with-mpi="yes" '
-
-# Enable OpenMP
-configopts += '--enable-openmp="yes" '
-
-# BLAS/Lapack from MKL
-configopts += '--with-linalg-flavor=mkl '
-
-# FFTW from MKL
-configopts += '--with-fft-flavor=dfti '
-
-# libxc support
-configopts += '--with-libxc=${EBROOTLIBXC} '
-
-# hdf5/netcdf4 support
-configopts += '--with-netcdf="${EBROOTNETCDF}" '
-configopts += '--with-netcdf-fortran="${EBROOTNETCDFMINFORTRAN}" '
-configopts += '--with-hdf5="${EBROOTHDF5}" '
-
-# Wannier90
-configopts += '--with-wannier90="${EBROOTWANNIER90}" '
-preconfigopts += 'export WANNIER90_LIBS="-L$EBROOTWANNIER90/lib -lwannier" && '
-
-# Enable double precision for GW calculations
-configopts += '--enable-gw-dpc '
-
-# Enable OpenMP
-configopts += '--enable-openmp '
-
-# 'make check' is just executing some basic unit tests.
-# Also running 'make tests_v1' to have some basic validation
-# runtest = "check && make test_v1"
-runtest = "check"
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in ['abinit', 'aim', 'cut3d', 'conducti', 'mrgddb', 'mrgscr', 'optic']],
-    'dirs': ['lib/pkgconfig'],
-}
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/a/ABINIT/ABINIT-9.6.2-intel-para-2021b.eb b/Golden_Repo/a/ABINIT/ABINIT-9.6.2-intel-para-2021b.eb
deleted file mode 100644
index 83c44ba91..000000000
--- a/Golden_Repo/a/ABINIT/ABINIT-9.6.2-intel-para-2021b.eb
+++ /dev/null
@@ -1,72 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'ABINIT'
-version = '9.6.2'
-
-homepage = 'https://www.abinit.org/'
-description = """
-ABINIT is a package whose main program allows one to find the total energy, charge density and electronic structure of
-systems made of electrons and nuclei (molecules and periodic solids) within Density Functional Theory (DFT), using
-pseudopotentials and a planewave or wavelet basis.
-"""
-
-toolchain = {'name': 'intel-para', 'version': '2021b'}
-toolchainopts = {'usempi': True, 'openmp': True, 'pic': True}
-
-source_urls = ['https://www.abinit.org/sites/default/files/packages/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['b018c2ff24338a5952c5550a7e09d4c7793b62402c7aa4e09273e9a666e674fb']
-
-builddependencies = [
-    ('Python', '3.9.6'),
-]
-dependencies = [
-    ('libxc', '5.1.7'),
-    ('netCDF', '4.8.1'),
-    ('netCDF-Fortran', '4.5.3'),
-    ('HDF5', '1.12.1'),
-    ('Wannier90', '3.1.0'),
-]
-
-# Ensure MPI with intel wrappers.
-configopts = '--with-mpi="yes" '
-# configopts += ' FC="mpiifort" CC="mpiicc" CXX="mpiicpc" '
-
-# Enable OpenMP
-configopts += '--enable-openmp="yes" '
-
-# BLAS/Lapack from MKL
-configopts += '--with-linalg-flavor=mkl '
-
-# FFTW from MKL
-configopts += '--with-fft-flavor=dfti '
-
-# libxc support
-configopts += '--with-libxc=${EBROOTLIBXC} '
-
-# hdf5/netcdf4 support
-configopts += '--with-netcdf="${EBROOTNETCDF}" '
-configopts += '--with-netcdf-fortran="${EBROOTNETCDFMINFORTRAN}" '
-configopts += '--with-hdf5="${EBROOTHDF5}" '
-
-# Wannier90
-configopts += '--with-wannier90="${EBROOTWANNIER90}" '
-preconfigopts = 'export WANNIER90_LIBS="-L$EBROOTWANNIER90/lib -lwannier" && '
-
-# Enable double precision for GW calculations
-configopts += '--enable-gw-dpc '
-
-# Enable OpenMP
-configopts += '--enable-openmp '
-
-# 'make check' is just executing some basic unit tests.
-# Also running 'make tests_v1' to have some basic validation
-# runtest = "check && make test_v1"
-runtest = "check"
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in ['abinit', 'aim', 'cut3d', 'conducti', 'mrgddb', 'mrgscr', 'optic']],
-    'dirs': ['lib/pkgconfig'],
-}
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/a/ACTC/ACTC-1.1-GCCcore-11.2.0.eb b/Golden_Repo/a/ACTC/ACTC-1.1-GCCcore-11.2.0.eb
deleted file mode 100644
index 0ed99bce3..000000000
--- a/Golden_Repo/a/ACTC/ACTC-1.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,35 +0,0 @@
-easyblock = 'MakeCp'
-
-name = 'ACTC'
-version = '1.1'
-
-homepage = 'https://sourceforge.net/projects/actc'
-description = "ACTC converts independent triangles into triangle strips or fans."
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [SOURCEFORGE_SOURCE]
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['3a1303291629b9de6008c3c9d7b020a4b854802408fb3f8222ec492808c8b44d']
-
-builddependencies = [('binutils', '2.37')]
-
-buildopts = 'CC="$CC" CFLAGS="$CFLAGS"'
-
-files_to_copy = [
-    (['tcsample', 'tctest', 'tctest2'], 'bin'),
-    (['tc.h'], 'include/ac'),
-    (['libactc.a'], 'lib'),
-    'COPYRIGHT', 'manual.html', 'prims.gif', 'README',
-]
-
-sanity_check_paths = {
-    'files': ['bin/tctest', 'bin/tctest2', 'bin/tcsample', 'include/ac/tc.h', 'lib/libactc.a',
-              'COPYRIGHT', 'manual.html', 'prims.gif', 'README'],
-    'dirs': [],
-}
-
-modextrapaths = {'CPATH': 'include/ac'}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/a/ADIOS2/ADIOS2-2.7.1-gpsmkl-2021b.eb b/Golden_Repo/a/ADIOS2/ADIOS2-2.7.1-gpsmkl-2021b.eb
deleted file mode 100644
index 8a9b394df..000000000
--- a/Golden_Repo/a/ADIOS2/ADIOS2-2.7.1-gpsmkl-2021b.eb
+++ /dev/null
@@ -1,169 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'ADIOS2'
-version = '2.7.1'
-
-homepage = 'https://www.olcf.ornl.gov/center-projects/adios/'
-description = """The Adaptable IO System (ADIOS) provides a simple,
-flexible way for scientists to describe the data in their code that may
-need to be written, read, or processed outside of the running
-simulation."""
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': False}
-
-github_account = 'ornladios'
-source_urls = [GITHUB_SOURCE]
-sources = ['v%(version)s.tar.gz']
-patches = ['include4gcc11.patch']
-checksums = [
-    'c8e237fd51f49d8a62a0660db12b72ea5067512aa7970f3fcf80b70e3f87ca3e',
-    'ea10445fc942796568c6196a4bed7d506e8a6bf381b2a01c9bdaae38f1601ea2',
-]
-
-builddependencies = [
-    ('CMake', '3.21.1'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-Stack', '2021b', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('zlib', '1.2.11'),
-    ('bzip2', '1.0.8'),
-    ('Szip', '2.1.1'),
-    ('SZ', '2.1.12'),
-    ('zfp', '0.5.5'),
-    ('Blosc', '1.21.1'),
-    ('HDF5', '1.12.1'),
-    ('mpi4py', '3.1.3'),
-    ('libpng', '1.6.37'),
-    ('ZeroMQ', '4.3.4'),
-    ('nlohmann-json', '3.10.4'),
-    ('pybind11', '2.7.1'),
-]
-
-separate_build_dir = True
-
-configopts = "-DCMAKE_VERBOSE_MAKEFILE=ON "
-
-configopts += "-DADIOS2_USE_Fortran=ON "
-configopts += "-DADIOS2_USE_MPI=ON "
-
-# Examples/Testing
-configopts += "-DADIOS2_BUILD_EXAMPLES=OFF "
-configopts += "-DADIOS2_BUILD_EXAMPLES_EXPERIMENTAL=OFF "
-configopts += "-DADIOS2_BUILD_TESTING=OFF "
-
-# Compression
-configopts += "-DADIOS2_USE_BZip2=ON "
-configopts += "-DBZIP2_DIR=${EBROOTBZIP2} "
-
-configopts += "-DADIOS2_USE_PNG=ON "
-configopts += "-DPNG_DIR=${EBROOTLIBPNG} "
-
-configopts += "-DADIOS2_USE_SZ=ON "
-configopts += "-DSZ_DIR=${EBROOTSZ} "
-
-configopts += "-DADIOS2_USE_ZFP=ON "
-configopts += "-DZFP_DIR=${EBROOTZFP} "
-
-configopts += "-DADIOS2_USE_Blosc=ON "
-configopts += "-DBLOSC_DIR=${EBROOTBLOSC} "
-
-configopts += "-DZLIB_DIR=${EBROOTZLIB} "
-configopts += "-DADIOS2_USE_MGARD=OFF "
-
-# HDF5
-configopts += "-DADIOS2_USE_HDF5=ON "
-configopts += "-DHDF5_DIR=${EBROOTHDF5} "
-
-# ZeroMQ
-configopts += "-DADIOS2_USE_ZeroMQ=ON "
-configopts += "-DZeroMQ_DIR=${EBROOTZEROMQ} "
-
-# Python
-configopts += "-DADIOS2_USE_Python=ON "
-configopts += "-DPython_DIR=${EBROOTPYTHON} "
-
-# System Virtual Shared Memory
-configopts += "-DADIOS2_USE_SysVShMem=ON "
-
-# Strong Staging Coupler
-# https://adios2.readthedocs.io/en/latest/engines/engines.html#ssc-strong-staging-coupler
-configopts += "-DADIOS2_USE_SSC=ON "
-
-# Sustainable Staging Transport
-# https://adios2.readthedocs.io/en/latest/engines/engines.html#sst-sustainable-staging-transport
-configopts += "-DADIOS2_USE_SST=ON "
-# Can optionally use LibFabric for RDMA transport: if -DLIBFABRIC_ROOT=<path> is set.
-
-# DataMan
-# https://adios2.readthedocs.io/en/latest/engines/engines.html#dataman-for-wide-area-network-data-staging
-configopts += "-DADIOS2_USE_DataMan=ON "
-
-# DataSpaces (mind. version 1.8)
-configopts += "-DADIOS2_USE_DataSpaces=OFF "
-
-# external libs
-configopts += "-DADIOS2_USE_EXTERNAL_PYBIND11=ON "
-configopts += "-Dpybind11_DIR=${EBROOTPYBIND11} "
-configopts += "-DADIOS2_USE_EXTERNAL_NLOHMANN_JSON=ON "
-configopts += "-Dnlohmann_json_DIR=${EBROOTNLOHMANNMINJSON} "
-
-# more options
-configopts += "-DADIOS2_USE_IME=OFF "
-configopts += "-DADIOS2_USE_Profiling=OFF "
-configopts += "-DADIOS2_USE_Table=OFF "
-# configopts += "-DADIOS2_USE_Endian_Reverse=ON "
-
-runtest = False
-
-# create pkgconfig files
-postinstallcmds = [
-    'mkdir %(installdir)s/lib/pkgconfig',
-    """echo -e "Name: adios2
-Description: ADIOS2 I/O library
-Version: %(version)s
-Requires: bzip2, zfp, sz, libpng, blosc
-Libs: $(%(installdir)s/bin/adios2-config --c-libs)
-Cflags: $(%(installdir)s/bin/adios2-config --c-flags)" > %(installdir)s/lib/pkgconfig/adios2.pc""",
-    """echo -e "Name: adios2_cxx
-Description: ADIOS2 I/O library (C++)
-Version: %(version)s
-Libs: $(%(installdir)s/bin/adios2-config --cxx-libs)
-Cflags: $(%(installdir)s/bin/adios2-config --cxx-flags)" > %(installdir)s/lib/pkgconfig/adios2_cxx.pc""",
-    """echo -e "Name: adios2_f
-Description: ADIOS2 I/O library (Fortran)
-Version: %(version)s
-Libs: $(%(installdir)s/bin/adios2-config --fortran-libs)
-Cflags: $(%(installdir)s/bin/adios2-config --fortran-flags)" > %(installdir)s/lib/pkgconfig/adios2_f.pc""",
-]
-
-sanity_check_paths = {
-    'files': ['bin/adios2-config', 'bin/bpls', 'bin/bp4dbg'],
-    'files': ['include/adios2.h', 'include/adios2_c.h', 'include/adios2/fortran/adios2.mod'],
-    'files': [
-        'lib64/libadios2_core.so', 'lib64/libadios2_core_mpi.so', 'lib64/cmake/adios2/adios2-config.cmake',
-        'lib64/libadios2_c.so', 'lib64/libadios2_c_mpi.so', 'lib64/libadios2_cxx11.so',
-        'lib64/libadios2_cxx11_mpi.so', 'lib64/libadios2_fortran.so', 'lib64/libadios2_fortran_mpi.so'
-    ],
-    'dirs': ['lib/python%(pyshortver)s/site-packages']
-}
-
-sanity_check_paths = {
-    'files': ['bin/adios2-config', 'bin/bpls'],
-    'dirs': ['include/adios2', 'lib/python%(pyshortver)s'],
-}
-
-modextrapaths = {
-    'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages',
-}
-
-modextravars = {
-    'ADIOS2_PKGCONFIG_LIBS': 'adios2',
-    'ADIOS2_CXX_PKGCONFIG_LIBS': 'adios2_cxx',
-    'ADIOS2_FORTRAN_PKGCONFIG_LIBS': 'adios2_f',
-}
-
-moduleclass = 'data'
diff --git a/Golden_Repo/a/ADIOS2/ADIOS2-2.7.1-intel-para-2021b.eb b/Golden_Repo/a/ADIOS2/ADIOS2-2.7.1-intel-para-2021b.eb
deleted file mode 100644
index ff47b40c7..000000000
--- a/Golden_Repo/a/ADIOS2/ADIOS2-2.7.1-intel-para-2021b.eb
+++ /dev/null
@@ -1,169 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'ADIOS2'
-version = '2.7.1'
-
-homepage = 'https://www.olcf.ornl.gov/center-projects/adios/'
-description = """The Adaptable IO System (ADIOS) provides a simple,
-flexible way for scientists to describe the data in their code that may
-need to be written, read, or processed outside of the running
-simulation."""
-
-toolchain = {'name': 'intel-para', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': False}
-
-github_account = 'ornladios'
-source_urls = [GITHUB_SOURCE]
-sources = ['v%(version)s.tar.gz']
-patches = ['include4gcc11.patch']
-checksums = [
-    'c8e237fd51f49d8a62a0660db12b72ea5067512aa7970f3fcf80b70e3f87ca3e',
-    'ea10445fc942796568c6196a4bed7d506e8a6bf381b2a01c9bdaae38f1601ea2',
-]
-
-builddependencies = [
-    ('CMake', '3.21.1'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-Stack', '2021b', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('zlib', '1.2.11'),
-    ('bzip2', '1.0.8'),
-    ('Szip', '2.1.1'),
-    ('SZ', '2.1.12'),
-    ('zfp', '0.5.5'),
-    ('Blosc', '1.21.1'),
-    ('HDF5', '1.12.1'),
-    ('mpi4py', '3.1.3'),
-    ('libpng', '1.6.37'),
-    ('ZeroMQ', '4.3.4'),
-    ('nlohmann-json', '3.10.4'),
-    ('pybind11', '2.7.1'),
-]
-
-separate_build_dir = True
-
-configopts = "-DCMAKE_VERBOSE_MAKEFILE=ON "
-
-configopts += "-DADIOS2_USE_Fortran=ON "
-configopts += "-DADIOS2_USE_MPI=ON "
-
-# Examples/Testing
-configopts += "-DADIOS2_BUILD_EXAMPLES=OFF "
-configopts += "-DADIOS2_BUILD_EXAMPLES_EXPERIMENTAL=OFF "
-configopts += "-DADIOS2_BUILD_TESTING=OFF "
-
-# Compression
-configopts += "-DADIOS2_USE_BZip2=ON "
-configopts += "-DBZIP2_DIR=${EBROOTBZIP2} "
-
-configopts += "-DADIOS2_USE_PNG=ON "
-configopts += "-DPNG_DIR=${EBROOTLIBPNG} "
-
-configopts += "-DADIOS2_USE_SZ=ON "
-configopts += "-DSZ_DIR=${EBROOTSZ} "
-
-configopts += "-DADIOS2_USE_ZFP=ON "
-configopts += "-DZFP_DIR=${EBROOTZFP} "
-
-configopts += "-DADIOS2_USE_Blosc=ON "
-configopts += "-DBLOSC_DIR=${EBROOTBLOSC} "
-
-configopts += "-DZLIB_DIR=${EBROOTZLIB} "
-configopts += "-DADIOS2_USE_MGARD=OFF "
-
-# HDF5
-configopts += "-DADIOS2_USE_HDF5=ON "
-configopts += "-DHDF5_DIR=${EBROOTHDF5} "
-
-# ZeroMQ
-configopts += "-DADIOS2_USE_ZeroMQ=ON "
-configopts += "-DZeroMQ_DIR=${EBROOTZEROMQ} "
-
-# Python
-configopts += "-DADIOS2_USE_Python=ON "
-configopts += "-DPython_DIR=${EBROOTPYTHON} "
-
-# System Virtual Shared Memory
-configopts += "-DADIOS2_USE_SysVShMem=ON "
-
-# Strong Staging Coupler
-# https://adios2.readthedocs.io/en/latest/engines/engines.html#ssc-strong-staging-coupler
-configopts += "-DADIOS2_USE_SSC=ON "
-
-# Sustainable Staging Transport
-# https://adios2.readthedocs.io/en/latest/engines/engines.html#sst-sustainable-staging-transport
-configopts += "-DADIOS2_USE_SST=ON "
-# Can optionally use LibFabric for RDMA transport: if -DLIBFABRIC_ROOT=<path> is set.
-
-# DataMan
-# https://adios2.readthedocs.io/en/latest/engines/engines.html#dataman-for-wide-area-network-data-staging
-configopts += "-DADIOS2_USE_DataMan=ON "
-
-# DataSpaces (mind. version 1.8)
-configopts += "-DADIOS2_USE_DataSpaces=OFF "
-
-# external libs
-configopts += "-DADIOS2_USE_EXTERNAL_PYBIND11=ON "
-configopts += "-Dpybind11_DIR=${EBROOTPYBIND11} "
-configopts += "-DADIOS2_USE_EXTERNAL_NLOHMANN_JSON=ON "
-configopts += "-Dnlohmann_json_DIR=${EBROOTNLOHMANNMINJSON} "
-
-# more options
-configopts += "-DADIOS2_USE_IME=OFF "
-configopts += "-DADIOS2_USE_Profiling=OFF "
-configopts += "-DADIOS2_USE_Table=OFF "
-# configopts += "-DADIOS2_USE_Endian_Reverse=ON "
-
-runtest = False
-
-# create pkgconfig files
-postinstallcmds = [
-    'mkdir %(installdir)s/lib/pkgconfig',
-    """echo -e "Name: adios2
-Description: ADIOS2 I/O library
-Version: %(version)s
-Requires: bzip2, zfp, sz, libpng, blosc
-Libs: $(%(installdir)s/bin/adios2-config --c-libs)
-Cflags: $(%(installdir)s/bin/adios2-config --c-flags)" > %(installdir)s/lib/pkgconfig/adios2.pc""",
-    """echo -e "Name: adios2_cxx
-Description: ADIOS2 I/O library (C++)
-Version: %(version)s
-Libs: $(%(installdir)s/bin/adios2-config --cxx-libs)
-Cflags: $(%(installdir)s/bin/adios2-config --cxx-flags)" > %(installdir)s/lib/pkgconfig/adios2_cxx.pc""",
-    """echo -e "Name: adios2_f
-Description: ADIOS2 I/O library (Fortran)
-Version: %(version)s
-Libs: $(%(installdir)s/bin/adios2-config --fortran-libs)
-Cflags: $(%(installdir)s/bin/adios2-config --fortran-flags)" > %(installdir)s/lib/pkgconfig/adios2_f.pc""",
-]
-
-sanity_check_paths = {
-    'files': ['bin/adios2-config', 'bin/bpls', 'bin/bp4dbg'],
-    'files': ['include/adios2.h', 'include/adios2_c.h', 'include/adios2/fortran/adios2.mod'],
-    'files': [
-        'lib64/libadios2_core.so', 'lib64/libadios2_core_mpi.so', 'lib64/cmake/adios2/adios2-config.cmake',
-        'lib64/libadios2_c.so', 'lib64/libadios2_c_mpi.so', 'lib64/libadios2_cxx11.so',
-        'lib64/libadios2_cxx11_mpi.so', 'lib64/libadios2_fortran.so', 'lib64/libadios2_fortran_mpi.so'
-    ],
-    'dirs': ['lib/python%(pyshortver)s/site-packages']
-}
-
-sanity_check_paths = {
-    'files': ['bin/adios2-config', 'bin/bpls'],
-    'dirs': ['include/adios2', 'lib/python%(pyshortver)s'],
-}
-
-modextrapaths = {
-    'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages',
-}
-
-modextravars = {
-    'ADIOS2_PKGCONFIG_LIBS': 'adios2',
-    'ADIOS2_CXX_PKGCONFIG_LIBS': 'adios2_cxx',
-    'ADIOS2_FORTRAN_PKGCONFIG_LIBS': 'adios2_f',
-}
-
-moduleclass = 'data'
diff --git a/Golden_Repo/a/ADIOS2/include4gcc11.patch b/Golden_Repo/a/ADIOS2/include4gcc11.patch
deleted file mode 100644
index e0714c2d8..000000000
--- a/Golden_Repo/a/ADIOS2/include4gcc11.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 8d04bda12988ac4190780e1d75bedaf3e510d32c Mon Sep 17 00:00:00 2001
-From: Erik Schnetter <schnetter@gmail.com>
-Date: Thu, 20 May 2021 08:55:59 -0400
-Subject: [PATCH] Add missing #include <memory>
-
-Closes https://github.com/ornladios/ADIOS2/issues/2709
----
- source/adios2/toolkit/zmq/zmqpubsub/ZmqPubSub.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/source/adios2/toolkit/zmq/zmqpubsub/ZmqPubSub.h b/source/adios2/toolkit/zmq/zmqpubsub/ZmqPubSub.h
-index 3648ded1d..a0c381a05 100644
---- a/source/adios2/toolkit/zmq/zmqpubsub/ZmqPubSub.h
-+++ b/source/adios2/toolkit/zmq/zmqpubsub/ZmqPubSub.h
-@@ -11,6 +11,7 @@
- #ifndef ADIOS2_TOOLKIT_ZMQ_ZMQPUBSUB_H_
- #define ADIOS2_TOOLKIT_ZMQ_ZMQPUBSUB_H_
- 
-+#include <memory>
- #include <mutex>
- #include <queue>
- #include <thread>
diff --git a/Golden_Repo/a/AMBER/AMBER-20-gpsmkl-2021b.eb b/Golden_Repo/a/AMBER/AMBER-20-gpsmkl-2021b.eb
deleted file mode 100644
index 5b6c0231b..000000000
--- a/Golden_Repo/a/AMBER/AMBER-20-gpsmkl-2021b.eb
+++ /dev/null
@@ -1,98 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'AMBER'
-version = '20'
-versionsuffix = '-AmberTools-21'
-
-homepage = 'http://ambermd.org'
-description = """
-AMBER: 'Assisted Model Building with Energy Refinement' is a set of molecular
-mechanics force fields and a package of molecular simulation programs.
-
-Citation:
-D.A. Case, K. Belfon, I.Y. Ben-Shalom, S.R. Brozell, D.S. Cerutti,
-T.E. Cheatham, III, V.W.D. Cruzeiro, T.A. Darden, R.E. Duke, G. Giambasu,
-M.K. Gilson, H. Gohlke, A.W. Goetz, R. Harris, S. Izadi, S.A. Izmailov,
-K. Kasavajhala, A. Kovalenko, R. Krasny, T. Kurtzman, T.S. Lee, S. LeGrand,
-P. Li, C. Lin, J. Liu, T. Luchko, R. Luo, V. Man, K.M. Merz, Y. Miao,
-O. Mikhailovskii, G. Monard, H. Nguyen, A. Onufriev, F.Pan, S. Pantano,
-R. Qi, D.R. Roe, A. Roitberg, C. Sagui, S. Schott-Verdugo, J. Shen,
-C. Simmerling, N.R.Skrynnikov, J. Smith, J. Swails, R.C. Walker, J. Wang,
-L. Wilson, R.M. Wolf, X. Wu, Y. Xiong, Y. Xue, D.M. York
-and P.A. Kollman (2020),
-AMBER 2020, University of California, San Francisco.
-"""
-
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-]
-dependencies = [
-    ('FFTW', '3.3.10'),
-    ('Python', '3.9.6'),
-    ('SciPy-Stack', '2021b', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('Boost', '1.78.0'),
-    ('flex', '2.6.4'),
-    ('NCCL', '2.11.4', '-CUDA-11.5'),
-]
-
-sources = [
-    'AmberTools21.tar.bz2',
-    'Amber20.tar.bz2',
-]
-patches = [
-    'fix_nmrat_error.patch',
-]
-checksums = [
-    'f55fa930598d5a8e9749e8a22d1f25cab7fcf911d98570e35365dd7f262aaafd',
-    'a4c53639441c8cc85adee397933d07856cc4a723c82c6bea585cd76c197ead75',
-    'af92af090fc4df06b504bd9aabc88f3c63b006aa15b70ee118a789ce19f60b98',
-]
-
-separate_build_dir = True
-local_build_mpi_parts = "TRUE"
-local_build_cuda_parts = "TRUE"
-local_build_cuda_nccl = "TRUE"
-
-preconfigopts = "CC=gcc && CXX=g++ && COMPILER=GNU "
-preconfigopts += " && cd %(builddir)s/amber20_src && "
-preconfigopts += " ./update_amber --update && cd ../easybuild_obj && "
-
-configopts = "-DCOMPILER=GNU -DCHECK_UPDATES=OFF -DAPPLY_UPDATES=OFF -DBUILD_GUI=FALSE "
-configopts += " -DINSTALL_TESTS=TRUE  -DMPI=%s " % local_build_mpi_parts
-configopts += " -DDOWNLOAD_MINICONDA=FALSE -DTRUST_SYSTEM_LIBS=TRUE "
-configopts += " -DCUDA=%s " % local_build_cuda_parts
-configopts += " -DNCCL=%s " % local_build_cuda_nccl
-buildopts = 'NVCC_GENCODE="-gencode=arch=compute_70,code=sm_70 \
-                           -gencode=arch=compute_75,code=sm_75 \
-                           -gencode=arch=compute_80,code=sm_80"'
-
-modextravars = {
-    'AMBERHOME': '%(installdir)s/',
-}
-modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
-
-modluafooter = '''
-add_property("arch","gpu")
-'''
-
-group = "amber"
-
-modloadmsg = '''
-
-Info: (1) Check the loaded modules to see if loading the AMBER module
-succeeded. If it did, ignore the rest of this message. (2) If AMBER
-didn't load, one possible reason is that "amber" is not currently
-your primary group. You can temporarily change your primary group by
-typing "newgrp amber". (3) If that didn't work, you are probably
-not a member of the group "amber", you have to first add yourself
-to that group. Visit "https://judoor.fz-juelich.de/", follow the
-link "Request access to restricted software", enable "amber" for
-your account, wait 15-20 minutes and then try "newgrp amber" again.
-
-'''
-
-moduleclass = 'bio'
diff --git a/Golden_Repo/a/AMBER/fix_nmrat_error.patch b/Golden_Repo/a/AMBER/fix_nmrat_error.patch
deleted file mode 100644
index 76804f018..000000000
--- a/Golden_Repo/a/AMBER/fix_nmrat_error.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN amber20_src/src/pmemd/src/cuda/gpu.cpp amber20_src1/src/pmemd/src/cuda/gpu.cpp
---- amber20_src/src/pmemd/src/cuda/gpu.cpp	2022-02-28 12:02:56.035534480 +0100
-+++ amber20_src1/src/pmemd/src/cuda/gpu.cpp	2022-02-28 12:26:15.265104588 +0100
-@@ -2849,7 +2849,7 @@
-     }
-     // torsions, resttype = 3
-     else if (resttype[i] == 3) {
--      if (nmrat[i][0] >= 0 && nmrat[i][1] >= 0 && nmrat[i][2] >= 0 && nmrat[3] >= 0) {
-+      if (nmrat[i][0] >= 0 && nmrat[i][1] >= 0 && nmrat[i][2] >= 0 && nmrat[i][3] >= 0) {
-         torsions++;
-       }
-       else {
diff --git a/Golden_Repo/a/AMD-uProf/AMD-uProf-3.4.502-GCCcore-11.2.0.eb b/Golden_Repo/a/AMD-uProf/AMD-uProf-3.4.502-GCCcore-11.2.0.eb
deleted file mode 100644
index ca81e393f..000000000
--- a/Golden_Repo/a/AMD-uProf/AMD-uProf-3.4.502-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,51 +0,0 @@
-##
-# Author:    Robert Mijakovic <robert.mijakovic@lxp.lu>
-#            Ilya Zhukov <i.zhukov@fz-juelich.de>
-##
-easyblock = 'Binary'
-
-name = 'AMD-uProf'
-version = '3.4.502'
-
-homepage = 'https://developer.amd.com/amd-uprof/'
-
-description = """AMD uProf is a performance analysis tool for applications running on Windows, Linux & FreeBSD
- operating systems. It allows developers to better understand the runtime performance of their application and
- to identify ways to improve its performance."""
-
-usage = """
-Provide '--disable-perfparanoid' option to your sbatch command to enable collection of required perf events.
-
-Typical workflow consists of three phases:
-
-1. Collect phase - run the application program and collect the profile data, e.g.
-   $ srun <srun_options> AMDuProfCLI collect <additional_collect_options> <program> [<args>]
-
-2. Translate phase - process the profile data to aggregate, correlate, and organize into database
-   $ AMDuProfCLI report -i <report_directory>
-
-3. Analyze phase - view and analyze the performance data to identify the bottlenecks
-   $ AMDuProf <report_directory>
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://developer.amd.com/wordpress/media/files/']
-sources = ['AMDuProf_Linux_x64_%(version)s.tar.bz2']
-checksums = ['891463c0e4f20e1c67a145441e983c863156a52716234cd8d5a96a8d09635ba7']
-
-extract_sources = True
-
-sanity_check_paths = {
-    'files': ['include/AMDTPowerProfileApi.h', 'lib/x64/libAMDProfileController.a',
-              'bin/libAMDThreadProfileAPI.%s' % SHLIB_EXT, 'bin/AMDuProf'],
-    'dirs': ['Examples']
-}
-
-sanity_check_commands = ['AMDuProfCLI info --system']
-
-modextrapaths = {
-    'LD_LIBRARY_PATH': 'bin'
-}
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/a/AMD-uProf/AMD-uProf-3.5.671-GCCcore-11.2.0.eb b/Golden_Repo/a/AMD-uProf/AMD-uProf-3.5.671-GCCcore-11.2.0.eb
deleted file mode 100644
index c0874c40b..000000000
--- a/Golden_Repo/a/AMD-uProf/AMD-uProf-3.5.671-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,53 +0,0 @@
-##
-# Author:    Robert Mijakovic <robert.mijakovic@lxp.lu>
-#            Ilya Zhukov <i.zhukov@fz-juelich.de>
-##
-easyblock = 'Binary'
-
-name = 'AMD-uProf'
-version = '3.5.671'
-
-homepage = 'https://developer.amd.com/amd-uprof/'
-
-description = """AMD uProf is a performance analysis tool for applications running on Windows, Linux & FreeBSD
- operating systems. It allows developers to better understand the runtime performance of their application and
- to identify ways to improve its performance."""
-
-usage = """
-Provide "--disable-perfparanoid" option to your sbatch command to enable collection of required perf events.
-
-Typical workflow consists of three phases:
-Provide "--disable-perfparanoid" option to your sbatch command to enable to collect all required perf events.
-
-1. Collect phase - run the application program and collect the profile data, e.g.
-   $ srun <srun_options> AMDuProfCLI collect <additional_collect_options> <program> [<args>]
-
-2. Translate phase - process the profile data to aggregate, correlate, and organize into database
-   $ AMDuProfCLI report -i <report_directory>
-
-3. Analyze phase - view and analyze the performance data to identify the bottlenecks
-   $ AMDuProf <report_directory>
-
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://developer.amd.com/wordpress/media/files/']
-sources = ['AMDuProf_Linux_x64_%(version)s.tar.bz2']
-checksums = ['a73066305228658a14af5ecd6cf45a1aa47ae94f7e9d14db31f43013d3ef1a43']
-
-extract_sources = True
-
-sanity_check_paths = {
-    'files': ['include/AMDTPowerProfileApi.h', 'lib/x64/libAMDProfileController.a',
-              'bin/libAMDThreadProfileAPI.%s' % SHLIB_EXT, 'bin/AMDuProf'],
-    'dirs': ['Examples']
-}
-
-sanity_check_commands = ['AMDuProfCLI info --system']
-
-modextrapaths = {
-    'LD_LIBRARY_PATH': 'bin'
-}
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/a/ANTLR/ANTLR-2.7.7-GCCcore-11.2.0.eb b/Golden_Repo/a/ANTLR/ANTLR-2.7.7-GCCcore-11.2.0.eb
deleted file mode 100644
index 9557ec96a..000000000
--- a/Golden_Repo/a/ANTLR/ANTLR-2.7.7-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,41 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'ANTLR'
-version = "2.7.7"
-
-homepage = 'http://www.antlr2.org/'
-description = """ANTLR, ANother Tool for Language Recognition, (formerly PCCTS)
- is a language tool that provides a framework for constructing recognizers,
- compilers, and translators from grammatical descriptions containing
- Java, C#, C++, or Python actions.
-"""
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['http://www.antlr2.org/download/']
-sources = [SOURCELOWER_TAR_GZ]
-patches = ['%(name)s-%(version)s_includes.patch']
-checksums = [
-    '853aeb021aef7586bda29e74a6b03006bcb565a755c86b66032d8ec31b67dbb9',  # antlr-2.7.7.tar.gz
-    # ANTLR-2.7.7_includes.patch
-    'd167d3248a03301bc93efcb37d5df959aae6794968e42231af0b0dd26d6a2e66',
-]
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('Java', '15', '', SYSTEM),
-    ('Python', '3.9.6'),
-]
-
-configopts = '--disable-examples --disable-csharp '
-
-sanity_check_paths = {
-    'files': ['bin/antlr', 'bin/antlr-config'],
-    'dirs': ['include'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/a/AOCC/AOCC-3.1.0-GCCcore-11.2.0.eb b/Golden_Repo/a/AOCC/AOCC-3.1.0-GCCcore-11.2.0.eb
deleted file mode 100644
index 506f4cdc2..000000000
--- a/Golden_Repo/a/AOCC/AOCC-3.1.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,24 +0,0 @@
-name = 'AOCC'
-version = '3.1.0'
-
-homepage = 'https://developer.amd.com/amd-aocc/'
-description = "AMD Optimized C/C++ & Fortran compilers (AOCC) based on LLVM 12.0"
-
-# Clang also depends on libstdc++ during runtime, but this dependency is
-# already specified as the toolchain.
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['http://developer.amd.com/wordpress/media/files/']
-sources = ['aocc-compiler-%(version)s.tar']
-checksums = ['1948104a430506fe5e445c0c796d6956109e7cc9fc0a1e32c9f1285cfd566d0c']
-
-clangversion = '12.0.0'
-
-dependencies = [
-    ('binutils', '2.37'),
-    ('ncurses', '6.2'),
-    ('zlib', '1.2.11'),
-    ('libxml2', '2.9.10'),
-]
-
-moduleclass = 'compiler'
diff --git a/Golden_Repo/a/AOCC/AOCC-3.2.0-GCCcore-11.2.0.eb b/Golden_Repo/a/AOCC/AOCC-3.2.0-GCCcore-11.2.0.eb
deleted file mode 100644
index de77f0ac9..000000000
--- a/Golden_Repo/a/AOCC/AOCC-3.2.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,24 +0,0 @@
-name = 'AOCC'
-version = '3.2.0'
-
-homepage = 'https://developer.amd.com/amd-aocc/'
-description = "AMD Optimized C/C++ & Fortran compilers (AOCC) based on LLVM 13.0"
-
-# Clang also depends on libstdc++ during runtime, but this dependency is
-# already specified as the toolchain.
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['http://developer.amd.com/wordpress/media/files/']
-sources = ['aocc-compiler-%(version)s.tar']
-checksums = ['8493525b3df77f48ee16f3395a68ad4c42e18233a44b4d9282b25dbb95b113ec']
-
-clangversion = '13.0.0'
-
-dependencies = [
-    ('binutils', '2.37'),
-    ('ncurses', '6.2'),
-    ('zlib', '1.2.11'),
-    ('libxml2', '2.9.10'),
-]
-
-moduleclass = 'compiler'
diff --git a/Golden_Repo/a/APR-util/APR-util-1.6.1-GCCcore-11.2.0.eb b/Golden_Repo/a/APR-util/APR-util-1.6.1-GCCcore-11.2.0.eb
deleted file mode 100644
index c55d9126f..000000000
--- a/Golden_Repo/a/APR-util/APR-util-1.6.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,32 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'APR-util'
-version = '1.6.1'
-
-homepage = 'https://apr.apache.org/'
-description = "Apache Portable Runtime (APR) util libraries."
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://archive.apache.org/dist/apr/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['b65e40713da57d004123b6319828be7f1273fbc6490e145874ee1177e112c459']
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [
-    ('APR', '1.7.0'),
-    ('SQLite', '3.36'),
-    ('expat', '2.4.1'),
-]
-
-configopts = "--with-apr=$EBROOTAPR/bin/apr-1-config --with-sqlite3=$EBROOTSQLITE --with-expat=$EBROOTEXPAT "
-
-sanity_check_paths = {
-    'files': ["bin/apu-1-config", "lib/libaprutil-1.%s" % SHLIB_EXT, "lib/libaprutil-1.a"],
-    'dirs': ["include/apr-1"],
-}
-
-parallel = 1
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/a/APR/APR-1.7.0-GCCcore-11.2.0.eb b/Golden_Repo/a/APR/APR-1.7.0-GCCcore-11.2.0.eb
deleted file mode 100644
index f8b0ca58f..000000000
--- a/Golden_Repo/a/APR/APR-1.7.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,22 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'APR'
-version = '1.7.0'
-
-homepage = 'https://apr.apache.org/'
-description = "Apache Portable Runtime (APR) libraries."
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://archive.apache.org/dist/apr/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['48e9dbf45ae3fdc7b491259ffb6ccf7d63049ffacbc1c0977cced095e4c2d5a2']
-
-builddependencies = [('binutils', '2.37')]
-
-sanity_check_paths = {
-    'files': ["bin/apr-1-config", "lib/libapr-1.%s" % SHLIB_EXT, "lib/libapr-1.a"],
-    'dirs': ["include/apr-1"],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/a/ARMForge/ARMForge-21.1.2.eb b/Golden_Repo/a/ARMForge/ARMForge-21.1.2.eb
deleted file mode 100644
index 77fe60a4c..000000000
--- a/Golden_Repo/a/ARMForge/ARMForge-21.1.2.eb
+++ /dev/null
@@ -1,43 +0,0 @@
-# For using $SYSTEMNAME to determine license path. The local prefix is to appease the checker
-import os as local_os
-
-easyblock = 'EB_Allinea'
-
-name = 'ARMForge'
-version = '21.1.2'
-
-homepage = 'https://developer.arm.com/tools-and-software/server-and-hpc/debug-and-profile/arm-forge'
-description = """
-Arm Forge is the leading server and HPC development tool suite in research, industry, and academia for C, C++, Fortran,
-and Python high performance code on Linux.  
-
-Arm Forge includes Arm DDT, the best debugger for time-saving high performance application debugging, Arm MAP, the
-trusted performance profiler for invaluable optimization advice, and Arm Performance Reports to help you analyze your
-HPC application runs.
-"""
-
-usage = """For more information, type "ddt -h", "map -h" or "perf-report -h"
-
-For the ARMForge User Guide, please see: "$EBROOTARMFORGE/doc/userguide.pdf"
-"""
-
-toolchain = SYSTEM
-
-sources = ['arm-forge-%(version)s-linux-x86_64.tar']
-source_urls = ['https://content.allinea.com/downloads/']
-checksums = ['ebc99fa3461d2cd968e4d304c11b70cc8d9c5a2acd68681cec2067c128255cd5']
-
-start_dir = '%(builddir)s/arm-forge-%(version)s-linux-x86_64/'
-install_cmd = "./textinstall.sh --accept-licence %(installdir)s"
-local_licdir = '/p/software/%s/licenses/armforge' % local_os.environ['SYSTEMNAME']
-license_file = [
-    '%s/LicenseForge.lic' % local_licdir,
-    '%s/LicensePR.lic' % local_licdir
-]
-
-sanity_check_paths = {
-    'files': ['bin/ddt', 'bin/perf-report'],
-    'dirs': [],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/a/ARPACK-NG/ARPACK-NG-3.8.0-gcccoremkl-11.2.0-2021.4.0-nompi.eb b/Golden_Repo/a/ARPACK-NG/ARPACK-NG-3.8.0-gcccoremkl-11.2.0-2021.4.0-nompi.eb
deleted file mode 100644
index eda1f0540..000000000
--- a/Golden_Repo/a/ARPACK-NG/ARPACK-NG-3.8.0-gcccoremkl-11.2.0-2021.4.0-nompi.eb
+++ /dev/null
@@ -1,43 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'ARPACK-NG'
-version = '3.8.0'
-versionsuffix = '-nompi'
-
-homepage = 'http://forge.scilab.org/index.php/p/arpack-ng/'
-description = """ARPACK-NG is a collection of Fortran77 subroutines designed to solve large scale eigenvalue problems.
-
-libarpack.a has been installed in $EBROOTARPACKMINNG.
-
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'opt': True, 'optarch': True, 'pic': True}
-
-source_urls = ['https://github.com/opencollab/arpack-ng/archive/']
-sources = ["%(version)s.tar.gz"]
-checksums = ['ada5aeb3878874383307239c9235b716a8a170c6d096a6625bfd529844df003d']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2')
-]
-
-# We hide it since this should be used just for Jupyter and the MPI version should be preferred for normal cases
-hidden = True
-
-preconfigopts = 'sh bootstrap &&'
-configopts = '--with-pic --with-blas="$LIBBLAS" --with-lapack="$LIBLAPACK"'
-
-sanity_check_paths = {
-    'files': ["lib/libarpack.%s" % SHLIB_EXT, ],
-    'dirs': []
-}
-
-modextravars = {
-    'ARPACK_ROOT': '%(installdir)s',
-    'ARPACK_LIB': '%(installdir)s/lib',
-}
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/a/ARPACK-NG/ARPACK-NG-3.8.0-gomkl-2021b.eb b/Golden_Repo/a/ARPACK-NG/ARPACK-NG-3.8.0-gomkl-2021b.eb
deleted file mode 100644
index 88f6c1c07..000000000
--- a/Golden_Repo/a/ARPACK-NG/ARPACK-NG-3.8.0-gomkl-2021b.eb
+++ /dev/null
@@ -1,55 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'ARPACK-NG'
-version = '3.8.0'
-
-homepage = 'http://forge.scilab.org/index.php/p/arpack-ng/'
-description = """ARPACK-NG is a collection of Fortran77 subroutines designed to solve large scale eigenvalue problems.
-
-libarpack.a and libparpack.a have been installed in $EBROOTARPACKMINNG.
-
-In addition the variables ARPACK_ROOT, ARPACK_LIB, PARPACK_ROOT, and PARPACK_LIB are set.
-"""
-
-examples = 'Examples can be found in $ARPACK_ROOT/EXAMPLES'
-
-toolchain = {'name': 'gomkl', 'version': '2021b'}
-toolchainopts = {'opt': True, 'optarch': True, 'pic': True, 'usempi': True}
-
-source_urls = ['https://github.com/opencollab/arpack-ng/releases/tag/']
-sources = ["%(version)s.tar.gz"]
-patches = [
-    'ARPACK-NG-%(version)s-install-arpack-examples_gpsmkl.patch'
-]
-checksums = [
-    'ada5aeb3878874383307239c9235b716a8a170c6d096a6625bfd529844df003d',  # 3.8.0.tar.gz
-    # ARPACK-NG-3.8.0-install-arpack-examples_gpsmkl.patch
-    'edf121fcaf5f2bf17c8395d5c4aae35d106eb3746b29561927f53ed6d3769707',
-]
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2')
-]
-
-preconfigopts = 'sh bootstrap &&'
-configopts = '--enable-mpi --with-pic --enable-static --with-blas="$LIBBLAS" --with-lapack="$LIBLAPACK"'
-
-postinstallcmds = [
-    "cp -r EXAMPLES %(installdir)s/EXAMPLES",
-    "cp -r PARPACK/EXAMPLES/MPI %(installdir)s/EXAMPLES/PARPACK",
-]
-
-sanity_check_paths = {
-    'files': ["lib/libarpack.a", "lib/libarpack.%s" % SHLIB_EXT, "lib/libparpack.a", "lib/libparpack.%s" % SHLIB_EXT],
-    'dirs': []
-}
-
-modextravars = {
-    'ARPACK_ROOT': '%(installdir)s',
-    'PARPACK_ROOT': '%(installdir)s',
-    'ARPACK_LIB': '%(installdir)s/lib',
-    'PARPACK_LIB': '%(installdir)s/lib'
-}
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/a/ARPACK-NG/ARPACK-NG-3.8.0-gpsmkl-2021b.eb b/Golden_Repo/a/ARPACK-NG/ARPACK-NG-3.8.0-gpsmkl-2021b.eb
deleted file mode 100644
index 6589113c0..000000000
--- a/Golden_Repo/a/ARPACK-NG/ARPACK-NG-3.8.0-gpsmkl-2021b.eb
+++ /dev/null
@@ -1,55 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'ARPACK-NG'
-version = '3.8.0'
-
-homepage = 'http://forge.scilab.org/index.php/p/arpack-ng/'
-description = """ARPACK-NG is a collection of Fortran77 subroutines designed to solve large scale eigenvalue problems.
-
-libarpack.a and libparpack.a have been installed in $EBROOTARPACKMINNG.
-
-In addition the variables ARPACK_ROOT, ARPACK_LIB, PARPACK_ROOT, and PARPACK_LIB are set.
-"""
-
-examples = 'Examples can be found in $ARPACK_ROOT/EXAMPLES'
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-toolchainopts = {'opt': True, 'optarch': True, 'pic': True, 'usempi': True}
-
-source_urls = ['https://github.com/opencollab/arpack-ng/archive/']
-sources = ["%(version)s.tar.gz"]
-patches = [
-    'ARPACK-NG-%(version)s-install-arpack-examples_gpsmkl.patch'
-]
-checksums = [
-    'ada5aeb3878874383307239c9235b716a8a170c6d096a6625bfd529844df003d',  # 3.8.0.tar.gz
-    # ARPACK-NG-3.8.0-install-arpack-examples_gpsmkl.patch
-    'edf121fcaf5f2bf17c8395d5c4aae35d106eb3746b29561927f53ed6d3769707',
-]
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2')
-]
-
-preconfigopts = 'sh bootstrap &&'
-configopts = '--enable-mpi --with-pic --enable-static --with-blas="$LIBBLAS" --with-lapack="$LIBLAPACK"'
-
-postinstallcmds = [
-    "cp -r EXAMPLES %(installdir)s/EXAMPLES",
-    "cp -r PARPACK/EXAMPLES/MPI %(installdir)s/EXAMPLES/PARPACK",
-]
-
-sanity_check_paths = {
-    'files': ["lib/libarpack.a", "lib/libarpack.%s" % SHLIB_EXT, "lib/libparpack.a", "lib/libparpack.%s" % SHLIB_EXT],
-    'dirs': []
-}
-
-modextravars = {
-    'ARPACK_ROOT': '%(installdir)s',
-    'PARPACK_ROOT': '%(installdir)s',
-    'ARPACK_LIB': '%(installdir)s/lib',
-    'PARPACK_LIB': '%(installdir)s/lib'
-}
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/a/ARPACK-NG/ARPACK-NG-3.8.0-install-arpack-examples.patch b/Golden_Repo/a/ARPACK-NG/ARPACK-NG-3.8.0-install-arpack-examples.patch
deleted file mode 100644
index 8ec3b0762..000000000
--- a/Golden_Repo/a/ARPACK-NG/ARPACK-NG-3.8.0-install-arpack-examples.patch
+++ /dev/null
@@ -1,538 +0,0 @@
---- arpack-ng-3.8.0/PARPACK_CHANGES	2021-06-30 09:57:39.220219000 +0200
-+++ arpack-ng-3.8.0-ok/PARPACK_CHANGES	2021-06-30 10:25:30.148960874 +0200
-@@ -334,4 +334,6 @@
- 36. 09/18/2016 p*apps.f and p*aitr.f contain condition to fetch machine epsilon.
-     When different p*aupd call use communicator with different number of CPU these
-     conditions cause deadlock. Variables inside conditions are moved to global
--    to be reset each first iteration
-\ No newline at end of file
-+    to be reset each first iteration
-+
-+
---- arpack-ng-3.8.0/EXAMPLES/BAND/Makefile_band_intel	1970-01-01 01:00:00.000000000 +0100
-+++ arpack-ng-3.8.0-ok/EXAMPLES/BAND/Makefile_band_intel	2021-06-30 10:36:04.492823000 +0200
-@@ -0,0 +1,159 @@
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+#
-+CC = mpicc
-+CFLAGS = -g -O2
-+CPP = mpicc -E
-+CPPFLAGS = 
-+
-+F77 = mpif77
-+FFLAGS = -g -O2
-+F77LD = $(F77)
-+FGREP = /bin/grep -F
-+
-+LAPACK_LIBS = -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -liomp5 -lpthread
-+
-+ARPACKLIB = -L$(ARPACK_LIB) -larpack
-+
-+cnbdr1_OBJECTS = cnbdr1.o cnband.o
-+cnbdr2_OBJECTS = cnbdr2.o cnband.o
-+cnbdr3_OBJECTS = cnbdr3.o cnband.o
-+cnbdr4_OBJECTS = cnbdr4.o cnband.o
-+dnbdr1_OBJECTS = dnbdr1.o dnband.o
-+dnbdr2_OBJECTS = dnbdr2.o dnband.o
-+dnbdr3_OBJECTS = dnbdr3.o dnband.o
-+dnbdr4_OBJECTS = dnbdr4.o dnband.o
-+dnbdr5_OBJECTS = dnbdr5.o dnband.o
-+dnbdr6_OBJECTS = dnbdr6.o dnband.o
-+dsbdr1_OBJECTS = dsbdr1.o dsband.o
-+dsbdr2_OBJECTS = dsbdr2.o dsband.o
-+dsbdr3_OBJECTS = dsbdr3.o dsband.o
-+dsbdr4_OBJECTS = dsbdr4.o dsband.o
-+dsbdr5_OBJECTS = dsbdr5.o dsband.o
-+dsbdr6_OBJECTS = dsbdr6.o dsband.o
-+snbdr1_OBJECTS = snbdr1.o snband.o
-+snbdr2_OBJECTS = snbdr2.o snband.o
-+snbdr3_OBJECTS = snbdr3.o snband.o
-+snbdr4_OBJECTS = snbdr4.o snband.o
-+snbdr5_OBJECTS = snbdr5.o snband.o
-+snbdr6_OBJECTS = snbdr6.o snband.o
-+ssbdr1_OBJECTS = ssbdr1.o ssband.o
-+ssbdr2_OBJECTS = ssbdr2.o ssband.o
-+ssbdr3_OBJECTS = ssbdr3.o ssband.o
-+ssbdr4_OBJECTS = ssbdr4.o ssband.o
-+ssbdr5_OBJECTS = ssbdr5.o ssband.o
-+ssbdr6_OBJECTS = ssbdr6.o ssband.o
-+znbdr1_OBJECTS = znbdr1.o znband.o
-+znbdr2_OBJECTS = znbdr2.o znband.o
-+znbdr3_OBJECTS = znbdr3.o znband.o
-+znbdr4_OBJECTS = znbdr4.o znband.o
-+
-+all : cnbdr1 cnbdr2 cnbdr3 cnbdr4 \
-+	dnbdr1 dnbdr2 dnbdr3 dnbdr4 dnbdr5 dnbdr6 \
-+	dsbdr1 dsbdr2 dsbdr3 dsbdr4 dsbdr5 dsbdr6 \
-+	snbdr1 snbdr2 snbdr3 snbdr4 snbdr5 snbdr6 \
-+	ssbdr1 ssbdr2 ssbdr3 ssbdr4 ssbdr5 ssbdr6 \
-+	znbdr1 znbdr2 znbdr3 znbdr4
-+
-+.SUFFIXES: .f .o 
-+.f.o:
-+	$(F77) -c -o $@ $<
-+
-+cnbdr1 : $(cnbdr1_OBJECTS)
-+	$(F77LD) -o $@ $(cnbdr1_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+cnbdr2 : $(cnbdr2_OBJECTS)
-+	$(F77LD) -o $@ $(cnbdr2_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+cnbdr3 : $(cnbdr3_OBJECTS)
-+	$(F77LD) -o $@ $(cnbdr3_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+cnbdr4 : $(cnbdr4_OBJECTS)
-+	$(F77LD) -o $@ $(cnbdr4_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dnbdr1 : $(dnbdr1_OBJECTS)
-+	$(F77LD) -o $@ $(dnbdr1_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dnbdr2 : $(dnbdr2_OBJECTS)
-+	$(F77LD) -o $@ $(dnbdr2_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dnbdr3 : $(dnbdr3_OBJECTS)
-+	$(F77LD) -o $@ $(dnbdr3_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dnbdr4 : $(dnbdr4_OBJECTS)
-+	$(F77LD) -o $@ $(dnbdr4_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dnbdr5 : $(dnbdr5_OBJECTS)
-+	$(F77LD) -o $@ $(dnbdr5_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dnbdr6 : $(dnbdr6_OBJECTS)
-+	$(F77LD) -o $@ $(dnbdr6_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dsbdr1 : $(dsbdr1_OBJECTS)
-+	$(F77LD) -o $@ $(dsbdr1_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dsbdr2 : $(dsbdr2_OBJECTS)
-+	$(F77LD) -o $@ $(dsbdr2_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dsbdr3 : $(dsbdr3_OBJECTS)
-+	$(F77LD) -o $@ $(dsbdr3_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dsbdr4 : $(dsbdr4_OBJECTS)
-+	$(F77LD) -o $@ $(dsbdr4_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dsbdr5 : $(dsbdr5_OBJECTS)
-+	$(F77LD) -o $@ $(dsbdr5_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dsbdr6 : $(dsbdr6_OBJECTS)
-+	$(F77LD) -o $@ $(dsbdr6_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+snbdr1 : $(snbdr1_OBJECTS)
-+	$(F77LD) -o $@ $(snbdr1_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+snbdr2 : $(snbdr2_OBJECTS)
-+	$(F77LD) -o $@ $(snbdr2_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+snbdr3 : $(snbdr3_OBJECTS)
-+	$(F77LD) -o $@ $(snbdr3_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+snbdr4 : $(snbdr4_OBJECTS)
-+	$(F77LD) -o $@ $(snbdr4_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+snbdr5 : $(snbdr5_OBJECTS)
-+	$(F77LD) -o $@ $(snbdr5_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+snbdr6 : $(snbdr6_OBJECTS)
-+	$(F77LD) -o $@ $(snbdr6_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+ssbdr1 : $(ssbdr1_OBJECTS)
-+	$(F77LD) -o $@ $(ssbdr1_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+ssbdr2 : $(ssbdr2_OBJECTS)
-+	$(F77LD) -o $@ $(ssbdr2_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+ssbdr3 : $(ssbdr3_OBJECTS)
-+	$(F77LD) -o $@ $(ssbdr3_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+ssbdr4 : $(ssbdr4_OBJECTS)
-+	$(F77LD) -o $@ $(ssbdr4_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+ssbdr5 : $(ssbdr5_OBJECTS)
-+	$(F77LD) -o $@ $(ssbdr5_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+ssbdr6 : $(ssbdr6_OBJECTS)
-+	$(F77LD) -o $@ $(ssbdr6_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+znbdr1 : $(znbdr1_OBJECTS)
-+	$(F77LD) -o $@ $(znbdr1_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+znbdr2 : $(znbdr2_OBJECTS)
-+	$(F77LD) -o $@ $(znbdr2_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+znbdr3 : $(znbdr3_OBJECTS)
-+	$(F77LD) -o $@ $(znbdr3_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+znbdr4 : $(znbdr4_OBJECTS)
-+	$(F77LD) -o $@ $(znbdr4_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+
---- arpack-ng-3.8.0/EXAMPLES/COMPLEX/Makefile_complex_intel	1970-01-01 01:00:00.000000000 +0100
-+++ arpack-ng-3.8.0-ok/EXAMPLES/COMPLEX/Makefile_complex_intel	2021-06-30 10:36:04.496200000 +0200
-@@ -0,0 +1,59 @@
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+#
-+CC = mpicc
-+CFLAGS = -g -O2
-+CPP = mpicc -E
-+CPPFLAGS = 
-+
-+F77 = mpif77
-+FFLAGS = -g -O2
-+F77LD = $(F77)
-+FGREP = /bin/grep -F
-+
-+LAPACK_LIBS = -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -liomp5 -lpthread
-+
-+ARPACKLIB = -L$(ARPACK_LIB) -larpack
-+
-+cndrv1_OBJECTS = cndrv1.o
-+cndrv2_OBJECTS = cndrv2.o
-+cndrv3_OBJECTS = cndrv3.o
-+cndrv4_OBJECTS = cndrv4.o
-+zndrv1_OBJECTS = zndrv1.o
-+zndrv2_OBJECTS = zndrv2.o
-+zndrv3_OBJECTS = zndrv3.o
-+zndrv4_OBJECTS = zndrv4.o
-+
-+all : cndrv1 cndrv2 cndrv3 cndrv4 \
-+	zndrv1 zndrv2 zndrv3 zndrv4
-+
-+.SUFFIXES: .f .o 
-+.f.o:
-+	$(F77) -c -o $@ $<
-+
-+cndrv1 : $(cndrv1_OBJECTS)
-+	$(F77LD) -o $@ $(cndrv1_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+cndrv2 : $(cndrv2_OBJECTS)
-+	$(F77LD) -o $@ $(cndrv2_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+cndrv3 : $(cndrv3_OBJECTS)
-+	$(F77LD) -o $@ $(cndrv3_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+cndrv4 : $(cndrv4_OBJECTS)
-+	$(F77LD) -o $@ $(cndrv4_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+zndrv1 : $(zndrv1_OBJECTS)
-+	$(F77LD) -o $@ $(zndrv1_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+zndrv2 : $(zndrv2_OBJECTS)
-+	$(F77LD) -o $@ $(zndrv2_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+zndrv3 : $(zndrv3_OBJECTS)
-+	$(F77LD) -o $@ $(zndrv3_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+zndrv4 : $(zndrv4_OBJECTS)
-+	$(F77LD) -o $@ $(zndrv4_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+
---- arpack-ng-3.8.0/EXAMPLES/NONSYM/Makefile_nonsym_intel	1970-01-01 01:00:00.000000000 +0100
-+++ arpack-ng-3.8.0-ok/EXAMPLES/NONSYM/Makefile_nonsym_intel	2021-06-30 10:36:04.539153000 +0200
-@@ -0,0 +1,75 @@
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+#
-+CC = mpicc
-+CFLAGS = -g -O2
-+CPP = mpicc -E
-+CPPFLAGS = 
-+
-+F77 = mpif77
-+FFLAGS = -g -O2
-+F77LD = $(F77)
-+FGREP = /bin/grep -F
-+
-+LAPACK_LIBS = -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -liomp5 -lpthread
-+
-+ARPACKLIB = -L$(ARPACK_LIB) -larpack
-+
-+dndrv1_OBJECTS = dndrv1.o
-+dndrv2_OBJECTS = dndrv2.o
-+dndrv3_OBJECTS = dndrv3.o
-+dndrv4_OBJECTS = dndrv4.o
-+dndrv5_OBJECTS = dndrv5.o
-+dndrv6_OBJECTS = dndrv6.o
-+sndrv1_OBJECTS = sndrv1.o
-+sndrv2_OBJECTS = sndrv2.o
-+sndrv3_OBJECTS = sndrv3.o
-+sndrv4_OBJECTS = sndrv4.o
-+sndrv5_OBJECTS = sndrv5.o
-+sndrv6_OBJECTS = sndrv6.o
-+
-+all : dndrv1 dndrv2 dndrv3 dndrv4 dndrv5 dndrv6 \
-+	sndrv1 sndrv2 sndrv3 sndrv4 sndrv5 sndrv6
-+
-+.SUFFIXES: .f .o 
-+.f.o:
-+	$(F77) -c -o $@ $<
-+
-+dndrv1 : $(dndrv1_OBJECTS)
-+	$(F77LD) -o $@ $(dndrv1_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dndrv2 : $(dndrv2_OBJECTS)
-+	$(F77LD) -o $@ $(dndrv2_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dndrv3 : $(dndrv3_OBJECTS)
-+	$(F77LD) -o $@ $(dndrv3_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dndrv4 : $(dndrv4_OBJECTS)
-+	$(F77LD) -o $@ $(dndrv4_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dndrv5 : $(dndrv5_OBJECTS)
-+	$(F77LD) -o $@ $(dndrv5_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dndrv6 : $(dndrv6_OBJECTS)
-+	$(F77LD) -o $@ $(dndrv6_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+sndrv1 : $(sndrv1_OBJECTS)
-+	$(F77LD) -o $@ $(sndrv1_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+sndrv2 : $(sndrv2_OBJECTS)
-+	$(F77LD) -o $@ $(sndrv2_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+sndrv3 : $(sndrv3_OBJECTS)
-+	$(F77LD) -o $@ $(sndrv3_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+sndrv4 : $(sndrv4_OBJECTS)
-+	$(F77LD) -o $@ $(sndrv4_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+sndrv5 : $(sndrv5_OBJECTS)
-+	$(F77LD) -o $@ $(sndrv5_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+sndrv6 : $(sndrv6_OBJECTS)
-+	$(F77LD) -o $@ $(sndrv6_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+
---- arpack-ng-3.8.0/PARPACK/EXAMPLES/MPI/Makefile_parpack_intel	1970-01-01 01:00:00.000000000 +0100
-+++ arpack-ng-3.8.0-ok/PARPACK/EXAMPLES/MPI/Makefile_parpack_intel	2021-06-30 10:37:57.095101000 +0200
-@@ -0,0 +1,51 @@
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+#
-+CC = mpicc
-+CFLAGS = -g -O2
-+CPP = mpicc -E
-+CPPFLAGS = 
-+
-+F77 = mpif77
-+FFLAGS = -g -O2
-+F77LD = $(F77)
-+FGREP = /bin/grep -F
-+
-+LAPACK_LIBS = -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -liomp5 -lpthread
-+
-+PARPACKLIB = -L$(ARPACK_LIB) -lparpack -larpack
-+
-+pcndrv1_OBJECTS = pcndrv1.o
-+pdndrv1_OBJECTS = pdndrv1.o
-+pdndrv3_OBJECTS = pdndrv3.o
-+psndrv1_OBJECTS = psndrv1.o
-+psndrv3_OBJECTS = psndrv3.o
-+pzndrv1_OBJECTS = pzndrv1.o
-+
-+all : pcndrv1 pdndrv1 pdndrv3 \
-+	psndrv1 psndrv3 pzndrv1
-+
-+.SUFFIXES: .f .o 
-+.f.o:
-+	$(F77) -c -o $@ $<
-+
-+pcndrv1 : $(pcndrv1_OBJECTS)
-+	$(F77LD) -o $@ $(pcndrv1_OBJECTS) $(PARPACKLIB) $(LAPACK_LIBS)
-+
-+pdndrv1 : $(pdndrv1_OBJECTS)
-+	$(F77LD) -o $@ $(pdndrv1_OBJECTS) $(PARPACKLIB) $(LAPACK_LIBS)
-+
-+pdndrv3 : $(pdndrv3_OBJECTS)
-+	$(F77LD) -o $@ $(pdndrv3_OBJECTS) $(PARPACKLIB) $(LAPACK_LIBS)
-+
-+psndrv1 : $(psndrv1_OBJECTS)
-+	$(F77LD) -o $@ $(psndrv1_OBJECTS) $(PARPACKLIB) $(LAPACK_LIBS)
-+
-+psndrv3 : $(psndrv3_OBJECTS)
-+	$(F77LD) -o $@ $(psndrv3_OBJECTS) $(PARPACKLIB) $(LAPACK_LIBS)
-+
-+pzndrv1 : $(pzndrv1_OBJECTS)
-+	$(F77LD) -o $@ $(pzndrv1_OBJECTS) $(PARPACKLIB) $(LAPACK_LIBS)
-+
-+
---- arpack-ng-3.8.0/EXAMPLES/SIMPLE/Makefile_simple_intel	1970-01-01 01:00:00.000000000 +0100
-+++ arpack-ng-3.8.0-ok/EXAMPLES/SIMPLE/Makefile_simple_intel	2021-06-30 10:36:04.541931000 +0200
-@@ -0,0 +1,51 @@
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+#
-+CC = mpicc
-+CFLAGS = -g -O2
-+CPP = mpicc -E
-+CPPFLAGS = 
-+
-+F77 = mpif77
-+FFLAGS = -g -O2
-+F77LD = $(F77)
-+FGREP = /bin/grep -F
-+
-+LAPACK_LIBS = -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -liomp5 -lpthread
-+
-+ARPACKLIB = -L$(ARPACK_LIB) -larpack
-+
-+cnsimp_OBJECTS = cnsimp.o
-+dnsimp_OBJECTS = dnsimp.o
-+dssimp_OBJECTS = dssimp.o
-+snsimp_OBJECTS = snsimp.o
-+sssimp_OBJECTS = sssimp.o
-+znsimp_OBJECTS = znsimp.o
-+
-+all : cnsimp dnsimp dssimp \
-+	snsimp sssimp znsimp 
-+
-+.SUFFIXES: .f .o 
-+.f.o:
-+	$(F77) -c -o $@ $<
-+
-+cnsimp : $(cnsimp_OBJECTS)
-+	$(F77LD) -o $@ $(cnsimp_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dnsimp : $(dnsimp_OBJECTS)
-+	$(F77LD) -o $@ $(dnsimp_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dssimp : $(dssimp_OBJECTS)
-+	$(F77LD) -o $@ $(dssimp_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+snsimp : $(snsimp_OBJECTS)
-+	$(F77LD) -o $@ $(snsimp_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+sssimp : $(sssimp_OBJECTS)
-+	$(F77LD) -o $@ $(sssimp_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+znsimp : $(znsimp_OBJECTS)
-+	$(F77LD) -o $@ $(znsimp_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+
---- arpack-ng-3.8.0/EXAMPLES/SVD/Makefile_svd_intel	1970-01-01 01:00:00.000000000 +0100
-+++ arpack-ng-3.8.0-ok/EXAMPLES/SVD/Makefile_svd_intel	2021-06-30 10:36:04.546102000 +0200
-@@ -0,0 +1,36 @@
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+#
-+CC = mpicc
-+CFLAGS = -g -O2
-+CPP = mpicc -E
-+CPPFLAGS = 
-+
-+F77 = mpif77
-+FFLAGS = -g -O2
-+F77LD = $(F77)
-+FGREP = /bin/grep -F
-+
-+LAPACK_LIBS = -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -liomp5 -lpthread
-+
-+ARPACKLIB = -L$(ARPACK_LIB) -larpack
-+
-+dsvd_OBJECTS = dsvd.o
-+ssvd_OBJECTS = ssvd.o
-+
-+all : dsvd \
-+	ssvd 
-+
-+.SUFFIXES: .f .o 
-+.f.o:
-+	$(F77) -c -o $@ $<
-+
-+
-+dsvd : $(dsvd_OBJECTS)
-+	$(F77LD) -o $@ $(dsvd_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+ssvd : $(ssvd_OBJECTS)
-+	$(F77LD) -o $@ $(ssvd_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+
---- arpack-ng-3.8.0/EXAMPLES/SYM/Makefile_sym_intel	1970-01-01 01:00:00.000000000 +0100
-+++ arpack-ng-3.8.0-ok/EXAMPLES/SYM/Makefile_sym_intel	2021-06-30 10:36:04.549670000 +0200
-@@ -0,0 +1,75 @@
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+#
-+CC = mpicc
-+CFLAGS = -g -O2
-+CPP = mpicc -E
-+CPPFLAGS = 
-+
-+F77 = mpif77
-+FFLAGS = -g -O2
-+F77LD = $(F77)
-+FGREP = /bin/grep -F
-+
-+LAPACK_LIBS = -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -liomp5 -lpthread
-+
-+ARPACKLIB = -L$(ARPACK_LIB) -larpack
-+
-+dsdrv1_OBJECTS = dsdrv1.o
-+dsdrv2_OBJECTS = dsdrv2.o
-+dsdrv3_OBJECTS = dsdrv3.o
-+dsdrv4_OBJECTS = dsdrv4.o
-+dsdrv5_OBJECTS = dsdrv5.o
-+dsdrv6_OBJECTS = dsdrv6.o
-+ssdrv1_OBJECTS = ssdrv1.o
-+ssdrv2_OBJECTS = ssdrv2.o
-+ssdrv3_OBJECTS = ssdrv3.o
-+ssdrv4_OBJECTS = ssdrv4.o
-+ssdrv5_OBJECTS = ssdrv5.o
-+ssdrv6_OBJECTS = ssdrv6.o
-+
-+all : dsdrv1 dsdrv2 dsdrv3 dsdrv4 dsdrv5 dsdrv6 \
-+	ssdrv1 ssdrv2 ssdrv3 ssdrv4 ssdrv5 ssdrv6
-+
-+.SUFFIXES: .f .o 
-+.f.o:
-+	$(F77) -c -o $@ $<
-+
-+dsdrv1 : $(dsdrv1_OBJECTS)
-+	$(F77LD) -o $@ $(dsdrv1_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dsdrv2 : $(dsdrv2_OBJECTS)
-+	$(F77LD) -o $@ $(dsdrv2_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dsdrv3 : $(dsdrv3_OBJECTS)
-+	$(F77LD) -o $@ $(dsdrv3_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dsdrv4 : $(dsdrv4_OBJECTS)
-+	$(F77LD) -o $@ $(dsdrv4_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dsdrv5 : $(dsdrv5_OBJECTS)
-+	$(F77LD) -o $@ $(dsdrv5_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dsdrv6 : $(dsdrv6_OBJECTS)
-+	$(F77LD) -o $@ $(dsdrv6_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+ssdrv1 : $(ssdrv1_OBJECTS)
-+	$(F77LD) -o $@ $(ssdrv1_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+ssdrv2 : $(ssdrv2_OBJECTS)
-+	$(F77LD) -o $@ $(ssdrv2_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+ssdrv3 : $(ssdrv3_OBJECTS)
-+	$(F77LD) -o $@ $(ssdrv3_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+ssdrv4 : $(ssdrv4_OBJECTS)
-+	$(F77LD) -o $@ $(ssdrv4_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+ssdrv5 : $(ssdrv5_OBJECTS)
-+	$(F77LD) -o $@ $(ssdrv5_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+ssdrv6 : $(ssdrv6_OBJECTS)
-+	$(F77LD) -o $@ $(ssdrv6_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+
diff --git a/Golden_Repo/a/ARPACK-NG/ARPACK-NG-3.8.0-install-arpack-examples_gpsmkl.patch b/Golden_Repo/a/ARPACK-NG/ARPACK-NG-3.8.0-install-arpack-examples_gpsmkl.patch
deleted file mode 100644
index cb08b9ea9..000000000
--- a/Golden_Repo/a/ARPACK-NG/ARPACK-NG-3.8.0-install-arpack-examples_gpsmkl.patch
+++ /dev/null
@@ -1,538 +0,0 @@
---- arpack-ng-3.8.0/PARPACK_CHANGES	2021-06-30 09:57:39.220219000 +0200
-+++ arpack-ng-3.8.0-ok/PARPACK_CHANGES	2021-06-30 10:25:30.148960874 +0200
-@@ -334,4 +334,6 @@
- 36. 09/18/2016 p*apps.f and p*aitr.f contain condition to fetch machine epsilon.
-     When different p*aupd call use communicator with different number of CPU these
-     conditions cause deadlock. Variables inside conditions are moved to global
--    to be reset each first iteration
-\ No newline at end of file
-+    to be reset each first iteration
-+
-+
---- arpack-ng-3.8.0/EXAMPLES/BAND/Makefile_band	1970-01-01 01:00:00.000000000 +0100
-+++ arpack-ng-3.8.0-ok/EXAMPLES/BAND/Makefile_band	2021-06-30 10:36:04.461587000 +0200
-@@ -0,0 +1,159 @@
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+#
-+CC = mpicc
-+CFLAGS = -g -O2
-+CPP = mpicc -E
-+CPPFLAGS = 
-+
-+F77 = mpif77
-+FFLAGS = -g -O2
-+F77LD = $(F77)
-+FGREP = /bin/grep -F
-+
-+LAPACK_LIBS = -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lgomp -lpthread
-+
-+ARPACKLIB = -L$(ARPACK_LIB) -larpack
-+
-+cnbdr1_OBJECTS = cnbdr1.o cnband.o
-+cnbdr2_OBJECTS = cnbdr2.o cnband.o
-+cnbdr3_OBJECTS = cnbdr3.o cnband.o
-+cnbdr4_OBJECTS = cnbdr4.o cnband.o
-+dnbdr1_OBJECTS = dnbdr1.o dnband.o
-+dnbdr2_OBJECTS = dnbdr2.o dnband.o
-+dnbdr3_OBJECTS = dnbdr3.o dnband.o
-+dnbdr4_OBJECTS = dnbdr4.o dnband.o
-+dnbdr5_OBJECTS = dnbdr5.o dnband.o
-+dnbdr6_OBJECTS = dnbdr6.o dnband.o
-+dsbdr1_OBJECTS = dsbdr1.o dsband.o
-+dsbdr2_OBJECTS = dsbdr2.o dsband.o
-+dsbdr3_OBJECTS = dsbdr3.o dsband.o
-+dsbdr4_OBJECTS = dsbdr4.o dsband.o
-+dsbdr5_OBJECTS = dsbdr5.o dsband.o
-+dsbdr6_OBJECTS = dsbdr6.o dsband.o
-+snbdr1_OBJECTS = snbdr1.o snband.o
-+snbdr2_OBJECTS = snbdr2.o snband.o
-+snbdr3_OBJECTS = snbdr3.o snband.o
-+snbdr4_OBJECTS = snbdr4.o snband.o
-+snbdr5_OBJECTS = snbdr5.o snband.o
-+snbdr6_OBJECTS = snbdr6.o snband.o
-+ssbdr1_OBJECTS = ssbdr1.o ssband.o
-+ssbdr2_OBJECTS = ssbdr2.o ssband.o
-+ssbdr3_OBJECTS = ssbdr3.o ssband.o
-+ssbdr4_OBJECTS = ssbdr4.o ssband.o
-+ssbdr5_OBJECTS = ssbdr5.o ssband.o
-+ssbdr6_OBJECTS = ssbdr6.o ssband.o
-+znbdr1_OBJECTS = znbdr1.o znband.o
-+znbdr2_OBJECTS = znbdr2.o znband.o
-+znbdr3_OBJECTS = znbdr3.o znband.o
-+znbdr4_OBJECTS = znbdr4.o znband.o
-+
-+all : cnbdr1 cnbdr2 cnbdr3 cnbdr4 \
-+	dnbdr1 dnbdr2 dnbdr3 dnbdr4 dnbdr5 dnbdr6 \
-+	dsbdr1 dsbdr2 dsbdr3 dsbdr4 dsbdr5 dsbdr6 \
-+	snbdr1 snbdr2 snbdr3 snbdr4 snbdr5 snbdr6 \
-+	ssbdr1 ssbdr2 ssbdr3 ssbdr4 ssbdr5 ssbdr6 \
-+	znbdr1 znbdr2 znbdr3 znbdr4
-+
-+.SUFFIXES: .f .o 
-+.f.o:
-+	$(F77) -c -o $@ $<
-+
-+cnbdr1 : $(cnbdr1_OBJECTS)
-+	$(F77LD) -o $@ $(cnbdr1_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+cnbdr2 : $(cnbdr2_OBJECTS)
-+	$(F77LD) -o $@ $(cnbdr2_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+cnbdr3 : $(cnbdr3_OBJECTS)
-+	$(F77LD) -o $@ $(cnbdr3_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+cnbdr4 : $(cnbdr4_OBJECTS)
-+	$(F77LD) -o $@ $(cnbdr4_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dnbdr1 : $(dnbdr1_OBJECTS)
-+	$(F77LD) -o $@ $(dnbdr1_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dnbdr2 : $(dnbdr2_OBJECTS)
-+	$(F77LD) -o $@ $(dnbdr2_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dnbdr3 : $(dnbdr3_OBJECTS)
-+	$(F77LD) -o $@ $(dnbdr3_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dnbdr4 : $(dnbdr4_OBJECTS)
-+	$(F77LD) -o $@ $(dnbdr4_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dnbdr5 : $(dnbdr5_OBJECTS)
-+	$(F77LD) -o $@ $(dnbdr5_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dnbdr6 : $(dnbdr6_OBJECTS)
-+	$(F77LD) -o $@ $(dnbdr6_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dsbdr1 : $(dsbdr1_OBJECTS)
-+	$(F77LD) -o $@ $(dsbdr1_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dsbdr2 : $(dsbdr2_OBJECTS)
-+	$(F77LD) -o $@ $(dsbdr2_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dsbdr3 : $(dsbdr3_OBJECTS)
-+	$(F77LD) -o $@ $(dsbdr3_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dsbdr4 : $(dsbdr4_OBJECTS)
-+	$(F77LD) -o $@ $(dsbdr4_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dsbdr5 : $(dsbdr5_OBJECTS)
-+	$(F77LD) -o $@ $(dsbdr5_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dsbdr6 : $(dsbdr6_OBJECTS)
-+	$(F77LD) -o $@ $(dsbdr6_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+snbdr1 : $(snbdr1_OBJECTS)
-+	$(F77LD) -o $@ $(snbdr1_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+snbdr2 : $(snbdr2_OBJECTS)
-+	$(F77LD) -o $@ $(snbdr2_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+snbdr3 : $(snbdr3_OBJECTS)
-+	$(F77LD) -o $@ $(snbdr3_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+snbdr4 : $(snbdr4_OBJECTS)
-+	$(F77LD) -o $@ $(snbdr4_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+snbdr5 : $(snbdr5_OBJECTS)
-+	$(F77LD) -o $@ $(snbdr5_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+snbdr6 : $(snbdr6_OBJECTS)
-+	$(F77LD) -o $@ $(snbdr6_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+ssbdr1 : $(ssbdr1_OBJECTS)
-+	$(F77LD) -o $@ $(ssbdr1_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+ssbdr2 : $(ssbdr2_OBJECTS)
-+	$(F77LD) -o $@ $(ssbdr2_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+ssbdr3 : $(ssbdr3_OBJECTS)
-+	$(F77LD) -o $@ $(ssbdr3_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+ssbdr4 : $(ssbdr4_OBJECTS)
-+	$(F77LD) -o $@ $(ssbdr4_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+ssbdr5 : $(ssbdr5_OBJECTS)
-+	$(F77LD) -o $@ $(ssbdr5_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+ssbdr6 : $(ssbdr6_OBJECTS)
-+	$(F77LD) -o $@ $(ssbdr6_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+znbdr1 : $(znbdr1_OBJECTS)
-+	$(F77LD) -o $@ $(znbdr1_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+znbdr2 : $(znbdr2_OBJECTS)
-+	$(F77LD) -o $@ $(znbdr2_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+znbdr3 : $(znbdr3_OBJECTS)
-+	$(F77LD) -o $@ $(znbdr3_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+znbdr4 : $(znbdr4_OBJECTS)
-+	$(F77LD) -o $@ $(znbdr4_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+
---- arpack-ng-3.8.0/EXAMPLES/COMPLEX/Makefile_complex	1970-01-01 01:00:00.000000000 +0100
-+++ arpack-ng-3.8.0-ok/EXAMPLES/COMPLEX/Makefile_complex	2021-06-30 10:36:04.494505000 +0200
-@@ -0,0 +1,59 @@
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+#
-+CC = mpicc
-+CFLAGS = -g -O2
-+CPP = mpicc -E
-+CPPFLAGS = 
-+
-+F77 = mpif77
-+FFLAGS = -g -O2
-+F77LD = $(F77)
-+FGREP = /bin/grep -F
-+
-+LAPACK_LIBS = -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lgomp -lpthread
-+
-+ARPACKLIB = -L$(ARPACK_LIB) -larpack
-+
-+cndrv1_OBJECTS = cndrv1.o
-+cndrv2_OBJECTS = cndrv2.o
-+cndrv3_OBJECTS = cndrv3.o
-+cndrv4_OBJECTS = cndrv4.o
-+zndrv1_OBJECTS = zndrv1.o
-+zndrv2_OBJECTS = zndrv2.o
-+zndrv3_OBJECTS = zndrv3.o
-+zndrv4_OBJECTS = zndrv4.o
-+
-+all : cndrv1 cndrv2 cndrv3 cndrv4 \
-+	zndrv1 zndrv2 zndrv3 zndrv4
-+
-+.SUFFIXES: .f .o 
-+.f.o:
-+	$(F77) -c -o $@ $<
-+
-+cndrv1 : $(cndrv1_OBJECTS)
-+	$(F77LD) -o $@ $(cndrv1_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+cndrv2 : $(cndrv2_OBJECTS)
-+	$(F77LD) -o $@ $(cndrv2_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+cndrv3 : $(cndrv3_OBJECTS)
-+	$(F77LD) -o $@ $(cndrv3_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+cndrv4 : $(cndrv4_OBJECTS)
-+	$(F77LD) -o $@ $(cndrv4_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+zndrv1 : $(zndrv1_OBJECTS)
-+	$(F77LD) -o $@ $(zndrv1_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+zndrv2 : $(zndrv2_OBJECTS)
-+	$(F77LD) -o $@ $(zndrv2_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+zndrv3 : $(zndrv3_OBJECTS)
-+	$(F77LD) -o $@ $(zndrv3_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+zndrv4 : $(zndrv4_OBJECTS)
-+	$(F77LD) -o $@ $(zndrv4_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+
---- arpack-ng-3.8.0/EXAMPLES/NONSYM/Makefile_nonsym	1970-01-01 01:00:00.000000000 +0100
-+++ arpack-ng-3.8.0-ok/EXAMPLES/NONSYM/Makefile_nonsym	2021-06-30 10:36:04.498741000 +0200
-@@ -0,0 +1,75 @@
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+#
-+CC = mpicc
-+CFLAGS = -g -O2
-+CPP = mpicc -E
-+CPPFLAGS = 
-+
-+F77 = mpif77
-+FFLAGS = -g -O2
-+F77LD = $(F77)
-+FGREP = /bin/grep -F
-+
-+LAPACK_LIBS = -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lgomp -lpthread
-+
-+ARPACKLIB = -L$(ARPACK_LIB) -larpack
-+
-+dndrv1_OBJECTS = dndrv1.o
-+dndrv2_OBJECTS = dndrv2.o
-+dndrv3_OBJECTS = dndrv3.o
-+dndrv4_OBJECTS = dndrv4.o
-+dndrv5_OBJECTS = dndrv5.o
-+dndrv6_OBJECTS = dndrv6.o
-+sndrv1_OBJECTS = sndrv1.o
-+sndrv2_OBJECTS = sndrv2.o
-+sndrv3_OBJECTS = sndrv3.o
-+sndrv4_OBJECTS = sndrv4.o
-+sndrv5_OBJECTS = sndrv5.o
-+sndrv6_OBJECTS = sndrv6.o
-+
-+all : dndrv1 dndrv2 dndrv3 dndrv4 dndrv5 dndrv6 \
-+	sndrv1 sndrv2 sndrv3 sndrv4 sndrv5 sndrv6
-+
-+.SUFFIXES: .f .o 
-+.f.o:
-+	$(F77) -c -o $@ $<
-+
-+dndrv1 : $(dndrv1_OBJECTS)
-+	$(F77LD) -o $@ $(dndrv1_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dndrv2 : $(dndrv2_OBJECTS)
-+	$(F77LD) -o $@ $(dndrv2_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dndrv3 : $(dndrv3_OBJECTS)
-+	$(F77LD) -o $@ $(dndrv3_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dndrv4 : $(dndrv4_OBJECTS)
-+	$(F77LD) -o $@ $(dndrv4_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dndrv5 : $(dndrv5_OBJECTS)
-+	$(F77LD) -o $@ $(dndrv5_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dndrv6 : $(dndrv6_OBJECTS)
-+	$(F77LD) -o $@ $(dndrv6_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+sndrv1 : $(sndrv1_OBJECTS)
-+	$(F77LD) -o $@ $(sndrv1_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+sndrv2 : $(sndrv2_OBJECTS)
-+	$(F77LD) -o $@ $(sndrv2_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+sndrv3 : $(sndrv3_OBJECTS)
-+	$(F77LD) -o $@ $(sndrv3_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+sndrv4 : $(sndrv4_OBJECTS)
-+	$(F77LD) -o $@ $(sndrv4_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+sndrv5 : $(sndrv5_OBJECTS)
-+	$(F77LD) -o $@ $(sndrv5_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+sndrv6 : $(sndrv6_OBJECTS)
-+	$(F77LD) -o $@ $(sndrv6_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+
---- arpack-ng-3.8.0/PARPACK/EXAMPLES/MPI/Makefile_parpack	1970-01-01 01:00:00.000000000 +0100
-+++ arpack-ng-3.8.0-ok/PARPACK/EXAMPLES/MPI/Makefile_parpack	2021-06-30 10:37:57.093198000 +0200
-@@ -0,0 +1,51 @@
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+#
-+CC = mpicc
-+CFLAGS = -g -O2
-+CPP = mpicc -E
-+CPPFLAGS = 
-+
-+F77 = mpif77
-+FFLAGS = -g -O2
-+F77LD = $(F77)
-+FGREP = /bin/grep -F
-+
-+LAPACK_LIBS = -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lgomp -lpthread
-+
-+PARPACKLIB = -L$(ARPACK_LIB) -lparpack -larpack
-+
-+pcndrv1_OBJECTS = pcndrv1.o
-+pdndrv1_OBJECTS = pdndrv1.o
-+pdndrv3_OBJECTS = pdndrv3.o
-+psndrv1_OBJECTS = psndrv1.o
-+psndrv3_OBJECTS = psndrv3.o
-+pzndrv1_OBJECTS = pzndrv1.o
-+
-+all : pcndrv1 pdndrv1 pdndrv3 \
-+	psndrv1 psndrv3 pzndrv1
-+
-+.SUFFIXES: .f .o 
-+.f.o:
-+	$(F77) -c -o $@ $<
-+
-+pcndrv1 : $(pcndrv1_OBJECTS)
-+	$(F77LD) -o $@ $(pcndrv1_OBJECTS) $(PARPACKLIB) $(LAPACK_LIBS)
-+
-+pdndrv1 : $(pdndrv1_OBJECTS)
-+	$(F77LD) -o $@ $(pdndrv1_OBJECTS) $(PARPACKLIB) $(LAPACK_LIBS)
-+
-+pdndrv3 : $(pdndrv3_OBJECTS)
-+	$(F77LD) -o $@ $(pdndrv3_OBJECTS) $(PARPACKLIB) $(LAPACK_LIBS)
-+
-+psndrv1 : $(psndrv1_OBJECTS)
-+	$(F77LD) -o $@ $(psndrv1_OBJECTS) $(PARPACKLIB) $(LAPACK_LIBS)
-+
-+psndrv3 : $(psndrv3_OBJECTS)
-+	$(F77LD) -o $@ $(psndrv3_OBJECTS) $(PARPACKLIB) $(LAPACK_LIBS)
-+
-+pzndrv1 : $(pzndrv1_OBJECTS)
-+	$(F77LD) -o $@ $(pzndrv1_OBJECTS) $(PARPACKLIB) $(LAPACK_LIBS)
-+
-+
---- arpack-ng-3.8.0/EXAMPLES/SIMPLE/Makefile_simple	1970-01-01 01:00:00.000000000 +0100
-+++ arpack-ng-3.8.0-ok/EXAMPLES/SIMPLE/Makefile_simple	2021-06-30 10:36:04.541054000 +0200
-@@ -0,0 +1,51 @@
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+#
-+CC = mpicc
-+CFLAGS = -g -O2
-+CPP = mpicc -E
-+CPPFLAGS = 
-+
-+F77 = mpif77
-+FFLAGS = -g -O2
-+F77LD = $(F77)
-+FGREP = /bin/grep -F
-+
-+LAPACK_LIBS = -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lgomp -lpthread
-+
-+ARPACKLIB = -L$(ARPACK_LIB) -larpack
-+
-+cnsimp_OBJECTS = cnsimp.o
-+dnsimp_OBJECTS = dnsimp.o
-+dssimp_OBJECTS = dssimp.o
-+snsimp_OBJECTS = snsimp.o
-+sssimp_OBJECTS = sssimp.o
-+znsimp_OBJECTS = znsimp.o
-+
-+all : cnsimp dnsimp dssimp \
-+	snsimp sssimp znsimp 
-+
-+.SUFFIXES: .f .o 
-+.f.o:
-+	$(F77) -c -o $@ $<
-+
-+cnsimp : $(cnsimp_OBJECTS)
-+	$(F77LD) -o $@ $(cnsimp_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dnsimp : $(dnsimp_OBJECTS)
-+	$(F77LD) -o $@ $(dnsimp_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dssimp : $(dssimp_OBJECTS)
-+	$(F77LD) -o $@ $(dssimp_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+snsimp : $(snsimp_OBJECTS)
-+	$(F77LD) -o $@ $(snsimp_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+sssimp : $(sssimp_OBJECTS)
-+	$(F77LD) -o $@ $(sssimp_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+znsimp : $(znsimp_OBJECTS)
-+	$(F77LD) -o $@ $(znsimp_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+
---- arpack-ng-3.8.0/EXAMPLES/SVD/Makefile_svd	1970-01-01 01:00:00.000000000 +0100
-+++ arpack-ng-3.8.0-ok/EXAMPLES/SVD/Makefile_svd	2021-06-30 10:36:04.545031000 +0200
-@@ -0,0 +1,36 @@
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+#
-+CC = mpicc
-+CFLAGS = -g -O2
-+CPP = mpicc -E
-+CPPFLAGS = 
-+
-+F77 = mpif77
-+FFLAGS = -g -O2
-+F77LD = $(F77)
-+FGREP = /bin/grep -F
-+
-+LAPACK_LIBS = -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lgomp -lpthread
-+
-+ARPACKLIB = -L$(ARPACK_LIB) -larpack
-+
-+dsvd_OBJECTS = dsvd.o
-+ssvd_OBJECTS = ssvd.o
-+
-+all : dsvd \
-+	ssvd 
-+
-+.SUFFIXES: .f .o 
-+.f.o:
-+	$(F77) -c -o $@ $<
-+
-+
-+dsvd : $(dsvd_OBJECTS)
-+	$(F77LD) -o $@ $(dsvd_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+ssvd : $(ssvd_OBJECTS)
-+	$(F77LD) -o $@ $(ssvd_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+
---- arpack-ng-3.8.0/EXAMPLES/SYM/Makefile_sym	1970-01-01 01:00:00.000000000 +0100
-+++ arpack-ng-3.8.0-ok/EXAMPLES/SYM/Makefile_sym	2021-06-30 10:36:04.548174000 +0200
-@@ -0,0 +1,75 @@
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+#
-+CC = mpicc
-+CFLAGS = -g -O2
-+CPP = mpicc -E
-+CPPFLAGS = 
-+
-+F77 = mpif77
-+FFLAGS = -g -O2
-+F77LD = $(F77)
-+FGREP = /bin/grep -F
-+
-+LAPACK_LIBS = -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lgomp -lpthread
-+
-+ARPACKLIB = -L$(ARPACK_LIB) -larpack
-+
-+dsdrv1_OBJECTS = dsdrv1.o
-+dsdrv2_OBJECTS = dsdrv2.o
-+dsdrv3_OBJECTS = dsdrv3.o
-+dsdrv4_OBJECTS = dsdrv4.o
-+dsdrv5_OBJECTS = dsdrv5.o
-+dsdrv6_OBJECTS = dsdrv6.o
-+ssdrv1_OBJECTS = ssdrv1.o
-+ssdrv2_OBJECTS = ssdrv2.o
-+ssdrv3_OBJECTS = ssdrv3.o
-+ssdrv4_OBJECTS = ssdrv4.o
-+ssdrv5_OBJECTS = ssdrv5.o
-+ssdrv6_OBJECTS = ssdrv6.o
-+
-+all : dsdrv1 dsdrv2 dsdrv3 dsdrv4 dsdrv5 dsdrv6 \
-+	ssdrv1 ssdrv2 ssdrv3 ssdrv4 ssdrv5 ssdrv6
-+
-+.SUFFIXES: .f .o 
-+.f.o:
-+	$(F77) -c -o $@ $<
-+
-+dsdrv1 : $(dsdrv1_OBJECTS)
-+	$(F77LD) -o $@ $(dsdrv1_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dsdrv2 : $(dsdrv2_OBJECTS)
-+	$(F77LD) -o $@ $(dsdrv2_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dsdrv3 : $(dsdrv3_OBJECTS)
-+	$(F77LD) -o $@ $(dsdrv3_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dsdrv4 : $(dsdrv4_OBJECTS)
-+	$(F77LD) -o $@ $(dsdrv4_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dsdrv5 : $(dsdrv5_OBJECTS)
-+	$(F77LD) -o $@ $(dsdrv5_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+dsdrv6 : $(dsdrv6_OBJECTS)
-+	$(F77LD) -o $@ $(dsdrv6_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+ssdrv1 : $(ssdrv1_OBJECTS)
-+	$(F77LD) -o $@ $(ssdrv1_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+ssdrv2 : $(ssdrv2_OBJECTS)
-+	$(F77LD) -o $@ $(ssdrv2_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+ssdrv3 : $(ssdrv3_OBJECTS)
-+	$(F77LD) -o $@ $(ssdrv3_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+ssdrv4 : $(ssdrv4_OBJECTS)
-+	$(F77LD) -o $@ $(ssdrv4_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+ssdrv5 : $(ssdrv5_OBJECTS)
-+	$(F77LD) -o $@ $(ssdrv5_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+ssdrv6 : $(ssdrv6_OBJECTS)
-+	$(F77LD) -o $@ $(ssdrv6_OBJECTS) $(ARPACKLIB) $(LAPACK_LIBS)
-+
-+
diff --git a/Golden_Repo/a/ARPACK-NG/ARPACK-NG-3.8.0-intel-2021b.eb b/Golden_Repo/a/ARPACK-NG/ARPACK-NG-3.8.0-intel-2021b.eb
deleted file mode 100644
index 4a594c9c6..000000000
--- a/Golden_Repo/a/ARPACK-NG/ARPACK-NG-3.8.0-intel-2021b.eb
+++ /dev/null
@@ -1,54 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'ARPACK-NG'
-version = '3.8.0'
-
-homepage = 'http://forge.scilab.org/index.php/p/arpack-ng/'
-description = """ARPACK-NG is a collection of Fortran77 subroutines designed to solve large scale eigenvalue problems.
-
-libarpack.a and libparpack.a have been installed in $EBROOTARPACKMINNG.
-
-In addition the variables ARPACK_ROOT, ARPACK_LIB, PARPACK_ROOT, and PARPACK_LIB are set.
-"""
-
-examples = 'Examples can be found in $ARPACK_ROOT/EXAMPLES'
-
-toolchain = {'name': 'intel', 'version': '2021b'}
-toolchainopts = {'opt': True, 'optarch': True, 'pic': True, 'usempi': True}
-
-source_urls = ['https://github.com/opencollab/arpack-ng/archive/']
-sources = ["%(version)s.tar.gz"]
-patches = [
-    'ARPACK-NG-%(version)s-install-arpack-examples.patch'
-]
-checksums = [
-    'ada5aeb3878874383307239c9235b716a8a170c6d096a6625bfd529844df003d',  # 3.8.0.tar.gz
-    'bd5a1d29d8ca0ac8ab87e2f78d06d4fd13ee8ae22ad9b12d36512f20eeb86f62',  # ARPACK-NG-3.8.0-install-arpack-examples.patch
-]
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2')
-]
-
-preconfigopts = 'sh bootstrap &&'
-configopts = '--enable-mpi --with-pic --enable-static --with-blas="$LIBBLAS" --with-lapack="$LIBLAPACK"'
-
-postinstallcmds = [
-    "cp -r EXAMPLES %(installdir)s/EXAMPLES",
-    "cp -r PARPACK/EXAMPLES/MPI %(installdir)s/EXAMPLES/PARPACK",
-]
-
-sanity_check_paths = {
-    'files': ["lib/libarpack.a", "lib/libarpack.%s" % SHLIB_EXT, "lib/libparpack.a", "lib/libparpack.%s" % SHLIB_EXT],
-    'dirs': []
-}
-
-modextravars = {
-    'ARPACK_ROOT': '%(installdir)s',
-    'PARPACK_ROOT': '%(installdir)s',
-    'ARPACK_LIB': '%(installdir)s/lib',
-    'PARPACK_LIB': '%(installdir)s/lib'
-}
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/a/ARPACK-NG/ARPACK-NG-3.8.0-intel-para-2021b.eb b/Golden_Repo/a/ARPACK-NG/ARPACK-NG-3.8.0-intel-para-2021b.eb
deleted file mode 100644
index 817feb5e8..000000000
--- a/Golden_Repo/a/ARPACK-NG/ARPACK-NG-3.8.0-intel-para-2021b.eb
+++ /dev/null
@@ -1,54 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'ARPACK-NG'
-version = '3.8.0'
-
-homepage = 'http://forge.scilab.org/index.php/p/arpack-ng/'
-description = """ARPACK-NG is a collection of Fortran77 subroutines designed to solve large scale eigenvalue problems.
-
-libarpack.a and libparpack.a have been installed in $EBROOTARPACKMINNG.
-
-In addition the variables ARPACK_ROOT, ARPACK_LIB, PARPACK_ROOT, and PARPACK_LIB are set.
-"""
-
-examples = 'Examples can be found in $ARPACK_ROOT/EXAMPLES'
-
-toolchain = {'name': 'intel-para', 'version': '2021b'}
-toolchainopts = {'opt': True, 'optarch': True, 'pic': True, 'usempi': True}
-
-source_urls = ['https://github.com/opencollab/arpack-ng/archive/']
-sources = ["%(version)s.tar.gz"]
-patches = [
-    'ARPACK-NG-%(version)s-install-arpack-examples.patch'
-]
-checksums = [
-    'ada5aeb3878874383307239c9235b716a8a170c6d096a6625bfd529844df003d',  # 3.8.0.tar.gz
-    'bd5a1d29d8ca0ac8ab87e2f78d06d4fd13ee8ae22ad9b12d36512f20eeb86f62',  # ARPACK-NG-3.8.0-install-arpack-examples.patch
-]
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2')
-]
-
-preconfigopts = 'sh bootstrap &&'
-configopts = '--enable-mpi --with-pic --enable-static --with-blas="$LIBBLAS" --with-lapack="$LIBLAPACK"'
-
-postinstallcmds = [
-    "cp -r EXAMPLES %(installdir)s/EXAMPLES",
-    "cp -r PARPACK/EXAMPLES/MPI %(installdir)s/EXAMPLES/PARPACK",
-]
-
-sanity_check_paths = {
-    'files': ["lib/libarpack.a", "lib/libarpack.%s" % SHLIB_EXT, "lib/libparpack.a", "lib/libparpack.%s" % SHLIB_EXT],
-    'dirs': []
-}
-
-modextravars = {
-    'ARPACK_ROOT': '%(installdir)s',
-    'PARPACK_ROOT': '%(installdir)s',
-    'ARPACK_LIB': '%(installdir)s/lib',
-    'PARPACK_LIB': '%(installdir)s/lib'
-}
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/a/ARPACK-NG/ARPACK-NG-3.8.0-iomkl-2021b.eb b/Golden_Repo/a/ARPACK-NG/ARPACK-NG-3.8.0-iomkl-2021b.eb
deleted file mode 100644
index 810d8b354..000000000
--- a/Golden_Repo/a/ARPACK-NG/ARPACK-NG-3.8.0-iomkl-2021b.eb
+++ /dev/null
@@ -1,54 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'ARPACK-NG'
-version = '3.8.0'
-
-homepage = 'http://forge.scilab.org/index.php/p/arpack-ng/'
-description = """ARPACK-NG is a collection of Fortran77 subroutines designed to solve large scale eigenvalue problems.
-
-libarpack.a and libparpack.a have been installed in $EBROOTARPACKMINNG.
-
-In addition the variables ARPACK_ROOT, ARPACK_LIB, PARPACK_ROOT, and PARPACK_LIB are set.
-"""
-
-examples = 'Examples can be found in $ARPACK_ROOT/EXAMPLES'
-
-toolchain = {'name': 'iomkl', 'version': '2021b'}
-toolchainopts = {'opt': True, 'optarch': True, 'pic': True, 'usempi': True}
-
-source_urls = ['https://github.com/opencollab/arpack-ng/archive/']
-sources = ["%(version)s.tar.gz"]
-patches = [
-    'ARPACK-NG-%(version)s-install-arpack-examples.patch'
-]
-checksums = [
-    'ada5aeb3878874383307239c9235b716a8a170c6d096a6625bfd529844df003d',  # 3.8.0.tar.gz
-    'bd5a1d29d8ca0ac8ab87e2f78d06d4fd13ee8ae22ad9b12d36512f20eeb86f62',  # ARPACK-NG-3.8.0-install-arpack-examples.patch
-]
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2')
-]
-
-preconfigopts = 'sh bootstrap &&'
-configopts = '--enable-mpi --with-pic --enable-static --with-blas="$LIBBLAS" --with-lapack="$LIBLAPACK"'
-
-postinstallcmds = [
-    "cp -r EXAMPLES %(installdir)s/EXAMPLES",
-    "cp -r PARPACK/EXAMPLES/MPI %(installdir)s/EXAMPLES/PARPACK",
-]
-
-sanity_check_paths = {
-    'files': ["lib/libarpack.a", "lib/libarpack.%s" % SHLIB_EXT, "lib/libparpack.a", "lib/libparpack.%s" % SHLIB_EXT],
-    'dirs': []
-}
-
-modextravars = {
-    'ARPACK_ROOT': '%(installdir)s',
-    'PARPACK_ROOT': '%(installdir)s',
-    'ARPACK_LIB': '%(installdir)s/lib',
-    'PARPACK_LIB': '%(installdir)s/lib'
-}
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/a/ASE/ASE-3.22.0-gcccoremkl-11.2.0-2021.4.0-nompi.eb b/Golden_Repo/a/ASE/ASE-3.22.0-gcccoremkl-11.2.0-2021.4.0-nompi.eb
deleted file mode 100644
index 9626968ee..000000000
--- a/Golden_Repo/a/ASE/ASE-3.22.0-gcccoremkl-11.2.0-2021.4.0-nompi.eb
+++ /dev/null
@@ -1,46 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'ASE'
-version = '3.22.0'
-versionsuffix = '-nompi'
-
-homepage = 'https://wiki.fysik.dtu.dk/ase/'
-description = """ASE is a python package providing an open source Atomic Simulation Environment in the Python scripting
-language."""
-
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10'),
-    ('Flask', '2.0.2'),
-    ('matplotlib', '3.4.3'),
-    ('Tkinter', '%(pyver)s'),     # Needed by GUI of ASE
-    ('spglib-python', '1.16.1'),  # optional
-]
-
-use_pip = True
-sanity_pip_check = True
-
-exts_list = [
-    ('pytest-mock', '3.6.1', {
-        'checksums': ['40217a058c52a63f1042f0784f62009e976ba824c418cced42e88d5f40ab0e62'],
-    }),
-    ('ase', version, {
-        'checksums': ['e60259c7b50867b1cb817caf938fcc1ed383702413df6d2e1afe7ea07f65acee'],
-    }),
-    ('ase-ext', '20.9.0', {
-        'checksums': ['a348b0e42cf9fdd11f04b3df002b0bf150002c8df2698ff08d3c8fc7a1223aed'],
-    }),
-]
-
-sanity_check_paths = {
-    'files': ['bin/ase'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-# make sure Tkinter is available, otherwise 'ase gui' will not work
-sanity_check_commands = ["python -c 'import tkinter' "]
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/a/ASE/ASE-3.22.0-gpsmkl-2021b.eb b/Golden_Repo/a/ASE/ASE-3.22.0-gpsmkl-2021b.eb
deleted file mode 100644
index 01d9df482..000000000
--- a/Golden_Repo/a/ASE/ASE-3.22.0-gpsmkl-2021b.eb
+++ /dev/null
@@ -1,45 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'ASE'
-version = '3.22.0'
-
-homepage = 'https://wiki.fysik.dtu.dk/ase/'
-description = """ASE is a python package providing an open source Atomic Simulation Environment in the Python scripting
-language."""
-
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('Flask', '2.0.2'),
-    ('matplotlib', '3.4.3', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('Tkinter', '%(pyver)s'),     # Needed by GUI of ASE
-    ('spglib-python', '1.16.1', '', ('gcccoremkl', '11.2.0-2021.4.0')),  # optional
-]
-
-use_pip = True
-sanity_pip_check = True
-
-exts_list = [
-    ('pytest-mock', '3.6.1', {
-        'checksums': ['40217a058c52a63f1042f0784f62009e976ba824c418cced42e88d5f40ab0e62'],
-    }),
-    ('ase', version, {
-        'checksums': ['e60259c7b50867b1cb817caf938fcc1ed383702413df6d2e1afe7ea07f65acee'],
-    }),
-    ('ase-ext', '20.9.0', {
-        'checksums': ['a348b0e42cf9fdd11f04b3df002b0bf150002c8df2698ff08d3c8fc7a1223aed'],
-    }),
-]
-
-sanity_check_paths = {
-    'files': ['bin/ase'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-# make sure Tkinter is available, otherwise 'ase gui' will not work
-sanity_check_commands = ["python -c 'import tkinter' "]
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/a/AT-SPI2-ATK/AT-SPI2-ATK-2.38.0-GCCcore-11.2.0.eb b/Golden_Repo/a/AT-SPI2-ATK/AT-SPI2-ATK-2.38.0-GCCcore-11.2.0.eb
deleted file mode 100644
index 43ad778f1..000000000
--- a/Golden_Repo/a/AT-SPI2-ATK/AT-SPI2-ATK-2.38.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,43 +0,0 @@
-easyblock = 'MesonNinja'
-
-name = 'AT-SPI2-ATK'
-version = '2.38.0'
-
-homepage = 'https://developer.gnome.org/ATK/stable/'
-description = """
- ATK provides the set of accessibility interfaces that are implemented by other
- toolkits and applications. Using the ATK interfaces, accessibility tools have
- full access to view and control running applications.
-"""
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [FTPGNOME_SOURCE]
-sources = [SOURCELOWER_TAR_XZ]
-checksums = ['cfa008a5af822b36ae6287f18182c40c91dd699c55faa38605881ed175ca464f']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('GObject-Introspection', '1.68.0'),
-    ('Meson', '0.58.2'),
-    ('Ninja', '1.10.2'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('DBus', '1.13.18'),
-    ('ATK', '2.36.0'),
-    ('AT-SPI2-core', '2.40.3')
-]
-
-modextrapaths = {
-    'XDG_DATA_DIRS': 'share',
-}
-
-sanity_check_paths = {
-    'files': ['lib/libatk-bridge-2.0.%s' % SHLIB_EXT],
-    'dirs': [],
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/a/AT-SPI2-core/AT-SPI2-core-2.40.3-GCCcore-11.2.0.eb b/Golden_Repo/a/AT-SPI2-core/AT-SPI2-core-2.40.3-GCCcore-11.2.0.eb
deleted file mode 100644
index 416e5f6bb..000000000
--- a/Golden_Repo/a/AT-SPI2-core/AT-SPI2-core-2.40.3-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,44 +0,0 @@
-easyblock = 'MesonNinja'
-
-name = 'AT-SPI2-core'
-version = '2.40.3'
-
-homepage = 'https://developer.gnome.org/ATK/stable/'
-description = """
- ATK provides the set of accessibility interfaces that are implemented by other
- toolkits and applications. Using the ATK interfaces, accessibility tools have
- full access to view and control running applications.
-"""
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [FTPGNOME_SOURCE]
-sources = [SOURCELOWER_TAR_XZ]
-checksums = ['e49837c2ad30d71e1f29ca8e0968a54b95030272f7ff40b89b48968653f37a5c']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('GObject-Introspection', '1.68.0'),
-    ('Meson', '0.58.2'),
-    ('Ninja', '1.10.2'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('DBus', '1.13.18'),
-    ('intltool', '0.51.0'),
-    ('X11', '20210802'),
-]
-
-modextrapaths = {
-    'GI_TYPELIB_PATH': 'lib64/girepository-1.0',
-    'XDG_DATA_DIRS': 'share',
-}
-
-sanity_check_paths = {
-    'files': ['lib64/libatspi.%s' % SHLIB_EXT],
-    'dirs': [],
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/a/ATK/ATK-2.36.0-GCCcore-11.2.0.eb b/Golden_Repo/a/ATK/ATK-2.36.0-GCCcore-11.2.0.eb
deleted file mode 100644
index c776e9a64..000000000
--- a/Golden_Repo/a/ATK/ATK-2.36.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,42 +0,0 @@
-easyblock = 'MesonNinja'
-
-name = 'ATK'
-version = '2.36.0'
-
-homepage = 'https://developer.gnome.org/ATK/stable/'
-description = """
- ATK provides the set of accessibility interfaces that are implemented by other
- toolkits and applications. Using the ATK interfaces, accessibility tools have
- full access to view and control running applications.
-"""
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [FTPGNOME_SOURCE]
-sources = [SOURCELOWER_TAR_XZ]
-checksums = ['fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('GObject-Introspection', '1.68.0'),
-    ('Meson', '0.58.2'),
-    ('pkg-config', '0.29.2'),
-    ('Ninja', '1.10.2')
-]
-
-dependencies = [
-    ('GLib', '2.69.1'),
-]
-
-modextrapaths = {
-    'GI_TYPELIB_PATH': 'lib64/girepository-1.0',
-    'XDG_DATA_DIRS': 'share',
-}
-
-sanity_check_paths = {
-    'files': ['lib64/libatk-1.0.%s' % SHLIB_EXT],
-    'dirs': [],
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/a/Advisor/Advisor-2021.4.0.eb b/Golden_Repo/a/Advisor/Advisor-2021.4.0.eb
deleted file mode 100644
index 4495f9488..000000000
--- a/Golden_Repo/a/Advisor/Advisor-2021.4.0.eb
+++ /dev/null
@@ -1,27 +0,0 @@
-name = 'Advisor'
-version = '2021.4.0'
-
-homepage = 'https://software.intel.com/intel-advisor-xe'
-description = """Vectorization Optimization and Thread Prototyping
- - Vectorize & thread code or performance “dies”
- - Easy workflow + data + tips = faster code faster
- - Prioritize, Prototype & Predict performance gain
- """
-
-toolchain = SYSTEM
-
-source_urls = [
-    'https://registrationcenter-download.intel.com/akdlm/irc_nas/18220/']
-sources = ['l_oneapi_advisor_p_%(version)s.389_offline.sh']
-checksums = ['dd948f7312629d9975e12a57664f736b8e011de948771b4c05ad444438532be8']
-
-dontcreateinstalldir = True
-
-sanity_check_paths = {
-    'files': ['%(namelower)s/%(version)s/bin64/advisor'],
-    'dirs': ['%(namelower)s/%(version)s/bin64',
-             '%(namelower)s/%(version)s/lib64',
-             '%(namelower)s/%(version)s/include/intel64']
-}
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/a/Apptainer-Tools/Apptainer-Tools-2022-GCCcore-11.2.0.eb b/Golden_Repo/a/Apptainer-Tools/Apptainer-Tools-2022-GCCcore-11.2.0.eb
deleted file mode 100644
index 2c69770fa..000000000
--- a/Golden_Repo/a/Apptainer-Tools/Apptainer-Tools-2022-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,50 +0,0 @@
-easyblock = 'PythonBundle'
-name = 'Apptainer-Tools'
-version = '2022'
-
-homepage = 'https://gitlab.version.fz-juelich.de/hps-public/container-build-system-cli'
-description = """Apptainer-Tools contain a bunch of tools for Apptainer,
- e.g. the JSC Build System CLI or singularity-compose.
-"""
-
-site_contacts = 'Ruben Simons <r.simons@fz-juelich.de>'
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('pretty-yaml', '20.4.0')
-]
-
-use_pip = True
-
-exts_list = [
-    ('semver', '2.13.0', {
-        'source_urls': ['https://pypi.python.org/packages/source/p/semver'],
-        'checksums': ['fa0fe2722ee1c3f57eac478820c3a5ae2f624af8264cbdf9000c980ff7f75e3f'],
-    }),
-    ('spython', '0.1.17', {
-        'source_urls': ['https://pypi.python.org/packages/source/p/spython'],
-        'checksums': ['00991fa848c6787ffbb7dfa6efc67cc80cb5214b5faf7124515c92f4bb02de3e'],
-    }),
-    ('singularity-compose', '0.1.14', {
-        'modulename': 'scompose',
-        'source_urls': ['https://pypi.python.org/packages/source/p/singularity-compose'],
-        'checksums': ['00351fcf6b566afab77c1340be714c28383461d3af2a5586e1f0fb89b00e39a0'],
-    }),
-    ('tabulate', '0.8.9', {
-        'source_urls': ['https://pypi.python.org/packages/source/p/tabulate'],
-        'checksums': ['eb1d13f25760052e8931f2ef80aaf6045a6cceb47514db8beab24cded16f13a7'],
-    }),
-    ('sib', '0.1.1', {
-        'modulename': 'singularitydb_client',
-        'sources': ['container-build-system-cli-v%(version)s.tar.gz'],
-        'checksums': ['ac008ec07b886470e916a590b965624d89e8206b491aaef697b8a425f3718dd6'],
-    }),
-]
-
-sanity_pip_check = True
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/a/AtomPAW/AtomPAW-4.1.1.0-gpsmkl-2021b.eb b/Golden_Repo/a/AtomPAW/AtomPAW-4.1.1.0-gpsmkl-2021b.eb
deleted file mode 100644
index 26044499f..000000000
--- a/Golden_Repo/a/AtomPAW/AtomPAW-4.1.1.0-gpsmkl-2021b.eb
+++ /dev/null
@@ -1,39 +0,0 @@
-##
-# This version of AtomPAW is lastest version to be used with ABINIT 8.10.x
-##
-
-easyblock = 'ConfigureMake'
-
-name = 'AtomPAW'
-version = '4.1.1.0'
-
-homepage = 'http://users.wfu.edu/natalie/papers/pwpaw/man.html'
-description = """
-AtomPAW is a Projector-Augmented Wave Dataset Generator that
-can be used both as a standalone program and a library.
-"""
-
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-
-source_urls = ['http://users.wfu.edu/natalie/papers/pwpaw/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['b1ee2b53720066655d98523ef337e54850cb1e68b3a2da04ff5a1576d3893891']
-
-dependencies = [
-    ('libxc', '5.1.7'),
-]
-
-configopts = '--enable-libxc'
-configopts += ' --with-libxc-incs="-I$EBROOTLIBXC/include"'
-configopts += ' --with-libxc-libs="-L$EBROOTLIBXC/lib -lxc"'
-
-configopts += ' --with-linalg-libs="-L$EBROOTIMKL/lib/intel64 -Wl,--start-group'
-configopts += '  -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -Wl,--end-group -lpthread -lm -ldl" '
-
-sanity_check_paths = {
-    'files': ['bin/atompaw', 'bin/graphatom'],
-    'dirs': ['bin'],
-}
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/a/Autoconf/Autoconf-2.69-GCCcore-11.2.0.eb b/Golden_Repo/a/Autoconf/Autoconf-2.69-GCCcore-11.2.0.eb
deleted file mode 100644
index fc039083f..000000000
--- a/Golden_Repo/a/Autoconf/Autoconf-2.69-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,41 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'Autoconf'
-version = '2.69'
-
-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 = ['954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969']
-
-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-GCCcore-11.2.0.eb b/Golden_Repo/a/Autoconf/Autoconf-2.71-GCCcore-11.2.0.eb
deleted file mode 100644
index 3af406bad..000000000
--- a/Golden_Repo/a/Autoconf/Autoconf-2.71-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,41 +0,0 @@
-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
deleted file mode 100644
index 63a2fdb2e..000000000
--- a/Golden_Repo/a/Autoconf/Autoconf-2.71.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-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.
-"""
-
-site_contacts = 'sc@fz-juelich.de'
-
-toolchain = SYSTEM
-
-source_urls = [GNU_SOURCE]
-sources = [SOURCELOWER_TAR_XZ]
-checksums = ['f14c83cfebcc9427f2c3cea7258bd90df972d92eb26752da4ddad81c87a0faa4']
-
-dependencies = [
-    ('M4', '1.4.19'),
-]
-
-sanity_check_paths = {
-    'files': ["bin/%s" % x for x in ["autoconf", "autoheader", "autom4te", "autoreconf", "autoscan",
-                                     "autoupdate", "ifnames"]],
-    '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
deleted file mode 100644
index a47580d9a..000000000
--- a/Golden_Repo/a/Automake/Automake-1.16.4-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,32 +0,0 @@
-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
deleted file mode 100644
index a8720a362..000000000
--- a/Golden_Repo/a/Automake/Automake-1.16.4.eb
+++ /dev/null
@@ -1,33 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'Automake'
-version = '1.16.4'
-
-homepage = 'https://www.gnu.org/software/automake/automake.html'
-
-description = "Automake: GNU Standards-compliant Makefile generator"
-
-site_contacts = 'sc@fz-juelich.de'
-
-toolchain = SYSTEM
-
-source_urls = [GNU_SOURCE]
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['8a0f0be7aaae2efa3a68482af28e5872d8830b9813a6a932a2571eac63ca1794']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('Autoconf', '2.71'),
-]
-
-sanity_check_paths = {
-    'files': ['bin/automake', 'bin/aclocal'],
-    '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
deleted file mode 100644
index 121721f98..000000000
--- a/Golden_Repo/a/Autotools/Autotools-20210726-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index 97ce17df9..000000000
--- a/Golden_Repo/a/Autotools/Autotools-20210726.eb
+++ /dev/null
@@ -1,28 +0,0 @@
-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
-"""
-
-site_contacts = 'sc@fz-juelich.de'
-
-toolchain = SYSTEM
-
-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
-
-hidden = True
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/a/ant/ant-1.10.12-Java-15.eb b/Golden_Repo/a/ant/ant-1.10.12-Java-15.eb
deleted file mode 100644
index 7314007bd..000000000
--- a/Golden_Repo/a/ant/ant-1.10.12-Java-15.eb
+++ /dev/null
@@ -1,27 +0,0 @@
-easyblock = 'PackedBinary'
-
-name = 'ant'
-version = '1.10.12'
-versionsuffix = '-Java-%(javaver)s'
-
-homepage = 'https://ant.apache.org/'
-description = """Apache Ant is a Java library and command-line tool whose mission is to drive processes described in
- build files as targets and extension points dependent upon each other. The main known usage of Ant is the build of
- Java applications."""
-
-toolchain = SYSTEM
-
-source_urls = ['https://archive.apache.org/dist/ant/binaries/']
-sources = ['apache-%(name)s-%(version)s-bin.tar.gz']
-checksums = ['4b3b557279bae4fb80210a5679180fdae3498b44cfd13368e3386e2a21dd853b']
-
-dependencies = [('Java', '15')]
-
-sanity_check_paths = {
-    'files': ['bin/ant', 'lib/ant.jar'],
-    'dirs': [],
-}
-
-modextravars = {'ANT_HOME': '%(installdir)s'}
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/a/archspec/archspec-0.1.3-GCCcore-11.2.0.eb b/Golden_Repo/a/archspec/archspec-0.1.3-GCCcore-11.2.0.eb
deleted file mode 100644
index 11258dda7..000000000
--- a/Golden_Repo/a/archspec/archspec-0.1.3-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'archspec'
-version = '0.1.3'
-
-homepage = 'https://github.com/archspec/archspec'
-description = "A library for detecting, labeling, and reasoning about microarchitectures"
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [PYPI_SOURCE]
-sources = [SOURCE_TAR_GZ]
-# See https://github.com/archspec/archspec/pull/69
-patches = ['archspec_click_8.patch']
-checksums = [
-    'a1aa7abde4d4ce38d115dfd572584906fa8e192e3272b8897e7b4fa1213ec27c',  # archspec-0.1.3.tar.gz
-    'd9fbdc599bb58b0121ec5e19e81e82238fc78da35e4f207b4f15186657896c59',  # archspec_click_8.patch
-]
-
-builddependencies = [('binutils', '2.37')]
-dependencies = [('Python', '3.9.6')]
-
-download_dep_fail = True
-use_pip = True
-sanity_pip_check = True
-
-sanity_check_paths = {
-    'files': [],
-    'dirs': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-sanity_check_commands = ["python -c 'from %(name)s.cpu import host; print(host())'"]
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/a/archspec/archspec_click_8.patch b/Golden_Repo/a/archspec/archspec_click_8.patch
deleted file mode 100644
index 54a880637..000000000
--- a/Golden_Repo/a/archspec/archspec_click_8.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-diff -ruN archspec-0.1.3.orig/archspec/cpu/detect.py archspec-0.1.3/archspec/cpu/detect.py
---- archspec-0.1.3.orig/archspec/cpu/detect.py	2021-10-22 13:57:34.215254800 +0200
-+++ archspec-0.1.3/archspec/cpu/detect.py	2022-01-24 17:49:18.591176274 +0100
-@@ -61,7 +61,7 @@
-     ``/proc/cpuinfo``
-     """
-     info = {}
--    with open("/proc/cpuinfo") as file:
-+    with open("/proc/cpuinfo") as file:  # pylint: disable=unspecified-encoding
-         for line in file:
-             key, separator, value = line.partition(":")
- 
-@@ -80,7 +80,9 @@
- 
- 
- def _check_output(args, env):
--    output = subprocess.Popen(args, stdout=subprocess.PIPE, env=env).communicate()[0]
-+    output = subprocess.Popen(  # pylint: disable=consider-using-with
-+        args, stdout=subprocess.PIPE, env=env
-+    ).communicate()[0]
-     return six.text_type(output.decode("utf-8"))
- 
- 
-@@ -288,7 +290,7 @@
-     arch_root = TARGETS[basename]
-     return (
-         (target == arch_root or arch_root in target.ancestors)
--        and (target.vendor == vendor or target.vendor == "generic")
-+        and target.vendor in (vendor, "generic")
-         and target.features.issubset(features)
-     )
- 
-@@ -303,7 +305,7 @@
-     arch_root = TARGETS[basename]
-     return (
-         (target == arch_root or arch_root in target.ancestors)
--        and (target.vendor == vendor or target.vendor == "generic")
-+        and target.vendor in (vendor, "generic")
-         and target.features.issubset(features)
-     )
- 
-diff -ruN archspec-0.1.3.orig/archspec/cpu/schema.py archspec-0.1.3/archspec/cpu/schema.py
---- archspec-0.1.3.orig/archspec/cpu/schema.py	2021-09-03 17:23:36.193003000 +0200
-+++ archspec-0.1.3/archspec/cpu/schema.py	2022-01-24 17:49:18.594040000 +0100
-@@ -11,7 +11,7 @@
- try:
-     from collections.abc import MutableMapping  # novm
- except ImportError:
--    from collections import MutableMapping
-+    from collections import MutableMapping  # pylint: disable=deprecated-class
- 
- 
- class LazyDictionary(MutableMapping):
-@@ -56,7 +56,7 @@
- 
-     def _factory():
-         filename = os.path.join(json_dir, json_file)
--        with open(filename, "r") as file:
-+        with open(filename, "r") as file:  # pylint: disable=unspecified-encoding
-             return json.load(file)
- 
-     return _factory
-diff -ruN archspec-0.1.3.orig/pyproject.toml archspec-0.1.3/pyproject.toml
---- archspec-0.1.3.orig/pyproject.toml	2021-10-22 13:57:34.215254800 +0200
-+++ archspec-0.1.3/pyproject.toml	2022-01-24 17:49:18.594944000 +0100
-@@ -25,46 +25,51 @@
- ]
- 
- [tool.poetry.dependencies]
--python = ">=2.7 !=3.4.* !=3.3.* !=3.2.* !=3.1.* !=3.0.* <4"
-+python = "==2.7 || ^3.5"
- six = "^1.13.0"
--click = ">=7.1.2,<8.0"
-+click = [
-+  {version = "^8", python = '^3.6'},
-+  {version = "^7", python = '==3.5'},
-+  {version = "^7", python = '==2.7'}
-+]
- 
- [tool.poetry.dev-dependencies]
- pytest = [
--  {version = ">=5.3.2", python = '^3.5'},
--  {version = ">=3.5.2", python = '^2.7'}
-+  {version = "^6", python = '^3.6'},
-+  {version = "~5", python = '==3.5'},
-+  {version = "~3", python = '==2.7'}
- ]
- more_itertools = [
--  {version = ">=5.0.0", python = '^2.7'}
-+  {version = "~5", python = '==2.7'}
- ]
- scandir = [
--  {version = ">=1.10.0", python = '^2.7'}
-+  {version = "~1", python = '==2.7'}
- ]
- pytest-cov = "^2.8.1"
- coverage = "^5.3"
- pylint = [
--  {version = "^2.4.4", python = "^3.5"}
-+  {version = "^2", python = "^3.6"}
- ]
- flake8 = [
--  {version = "^3.7.9", python = "^3.5"}
-+  {version = "^4", python = "^3.6"}
- ]
- black = [
--  {version = ">19.10b0", python = "^3.6"}
-+  {version = "==21.12b0", python = "^3.8"}
- ]
- sphinx = [
--  {version = "^2.3.1", python = "^3.5"}
-+  {version = "^4", python = "^3.6"}
- ]
- sphinx_rtd_theme = [
--  {version = "^0.4.3", python = "^3.5"}
-+  {version = "^1", python = "^3.6"}
- ]
- jsonschema = "^3.2.0"
- pyrsistent = [
--  {version="<0.17.0", python="^2.7"}
-+  {version="~0.16", python="==2.7"}
- ]
- 
- [tool.poetry.scripts]
- archspec = 'archspec.cli:main'
- 
- [build-system]
--requires = ["poetry>=0.12"]
--build-backend = "poetry.masonry.api"
-+requires = ["poetry>=1.0.0"]
-+build-backend = "poetry.core.masonry.api"
diff --git a/Golden_Repo/b/BLIS/BLIS-0.8.1-GCCcore-11.2.0.eb b/Golden_Repo/b/BLIS/BLIS-0.8.1-GCCcore-11.2.0.eb
deleted file mode 100644
index 96688e4b6..000000000
--- a/Golden_Repo/b/BLIS/BLIS-0.8.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,41 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'BLIS'
-version = '0.8.1'
-
-homepage = 'https://github.com/flame/blis/'
-description = """BLIS is a portable software framework for instantiating high-performance
-BLAS-like dense linear algebra libraries."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://github.com/flame/blis/archive/']
-sources = ['%(version)s.tar.gz']
-patches = [
-    '%(name)s-%(version)s_fix_dgemm-fpe-signalling-on-broadwell.patch',
-]
-checksums = [
-    '729694128719801e82fae7b5f2489ab73e4a467f46271beff09588c9265a697b',  # 0.8.1.tar.gz
-    # BLIS-0.8.1_fix_dgemm-fpe-signalling-on-broadwell.patch
-    '345fa39933e9d1442d2eb1e4ed9129df3fe4aefecf4d104e5d4f25b3bca24d0d',
-]
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Python', '3.9.6'),
-    ('Perl', '5.34.0'),
-]
-
-configopts = '--enable-cblas --enable-threading=openmp --enable-shared CC="$CC" auto'
-
-runtest = 'check'
-
-sanity_check_paths = {
-    'files': ['include/blis/cblas.h', 'include/blis/blis.h',
-              'lib/libblis.a', 'lib/libblis.%s' % SHLIB_EXT],
-    'dirs': [],
-}
-
-modextrapaths = {'CPATH': 'include/blis'}
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/b/BLIS/BLIS-0.8.1_fix_dgemm-fpe-signalling-on-broadwell.patch b/Golden_Repo/b/BLIS/BLIS-0.8.1_fix_dgemm-fpe-signalling-on-broadwell.patch
deleted file mode 100644
index ad6dee6c3..000000000
--- a/Golden_Repo/b/BLIS/BLIS-0.8.1_fix_dgemm-fpe-signalling-on-broadwell.patch
+++ /dev/null
@@ -1,2219 +0,0 @@
-Taken from https://github.com/flame/blis/pull/544
-Fixes a problem with DGEMM causing FPR signalling on Broadwell
-See https://github.com/flame/blis/issues/486
-
-Åke Sandgren, 20210916
-
-commit 5191c43faccf45975f577c60b9089abee25722c9
-Author: Devin Matthews <damatthews@smu.edu>
-Date:   Thu Sep 16 10:16:17 2021 -0500
-
-    Fix more copy-paste errors in the haswell gemmsup code.
-    
-    Fixes #486.
-
-diff --git a/kernels/haswell/3/sup/d6x8/bli_gemmsup_rd_haswell_asm_dMx4.c b/kernels/haswell/3/sup/d6x8/bli_gemmsup_rd_haswell_asm_dMx4.c
-index 4c6094b1..21dd3b89 100644
---- a/kernels/haswell/3/sup/d6x8/bli_gemmsup_rd_haswell_asm_dMx4.c
-+++ b/kernels/haswell/3/sup/d6x8/bli_gemmsup_rd_haswell_asm_dMx4.c
-@@ -101,7 +101,7 @@ void bli_dgemmsup_rd_haswell_asm_6x4
- 	begin_asm()
- 
- 	//vzeroall()                         // zero all xmm/ymm registers.
--	
-+
- 	mov(var(a), r14)                   // load address of a.
- 	mov(var(rs_a), r8)                 // load rs_a
- 	//mov(var(cs_a), r9)                 // load cs_a
-@@ -119,7 +119,7 @@ void bli_dgemmsup_rd_haswell_asm_6x4
- 
- 	lea(mem(r11, r11, 2), r13)         // r13 = 3*cs_b
- 	lea(mem(r8,  r8,  2), r10)         // r10 = 3*rs_a
--	
-+
- 
- 	mov(var(c), r12)                   // load address of c
- 	mov(var(rs_c), rdi)                // load rs_c
-@@ -172,19 +172,19 @@ void bli_dgemmsup_rd_haswell_asm_6x4
- 	prefetch(0, mem(rcx, rdi, 2, 3*8)) // prefetch c + 2*rs_c
- #endif
- 	lea(mem(r8,  r8,  4), rbp)         // rbp = 5*rs_a
--	
- 
--	
--	
-+
-+
-+
- 	mov(var(k_iter16), rsi)            // i = k_iter16;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DCONSIDKITER4)                 // if i == 0, jump to code that
- 	                                   // contains the k_iter4 loop.
--	
--	
-+
-+
- 	label(.DLOOPKITER16)               // MAIN LOOP
--	
--	
-+
-+
- 	// ---------------------------------- iteration 0
- 
- #if 0
-@@ -219,7 +219,7 @@ void bli_dgemmsup_rd_haswell_asm_6x4
- 	vfmadd231pd(ymm1, ymm3, ymm14)
- 	vfmadd231pd(ymm2, ymm3, ymm15)
- 
--	
-+
- 	// ---------------------------------- iteration 1
- 
- 	vmovupd(mem(rax       ), ymm0)
-@@ -250,7 +250,7 @@ void bli_dgemmsup_rd_haswell_asm_6x4
- 
- 
- 	// ---------------------------------- iteration 2
--	
-+
- #if 0
- 	prefetch(0, mem(rax, r10, 1, 0*8)) // prefetch rax + 3*cs_a
- 	prefetch(0, mem(rax, r8,  4, 0*8)) // prefetch rax + 4*cs_a
-@@ -312,27 +312,27 @@ void bli_dgemmsup_rd_haswell_asm_6x4
- 	vfmadd231pd(ymm1, ymm3, ymm14)
- 	vfmadd231pd(ymm2, ymm3, ymm15)
- 
--	
-+
- 
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKITER16)                 // iterate again if i != 0.
--	
--	
--	
--	
--	
--	
-+
-+
-+
-+
-+
-+
- 	label(.DCONSIDKITER4)
--	
-+
- 	mov(var(k_iter4), rsi)             // i = k_iter4;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DCONSIDKLEFT1)                 // if i == 0, jump to code that
- 	                                   // considers k_left1 loop.
- 	                                   // else, we prepare to enter k_iter4 loop.
--	
--	
-+
-+
- 	label(.DLOOPKITER4)                // EDGE LOOP (ymm)
--	
-+
- #if 0
- 	prefetch(0, mem(rax, r10, 1, 0*8)) // prefetch rax + 3*cs_a
- 	prefetch(0, mem(rax, r8,  4, 0*8)) // prefetch rax + 4*cs_a
-@@ -343,7 +343,7 @@ void bli_dgemmsup_rd_haswell_asm_6x4
- 	vmovupd(mem(rax, r8, 1), ymm1)
- 	vmovupd(mem(rax, r8, 2), ymm2)
- 	add(imm(4*8), rax)                 // a += 4*cs_b = 4*8;
--	
-+
- 	vmovupd(mem(rbx        ), ymm3)
- 	vfmadd231pd(ymm0, ymm3, ymm4)
- 	vfmadd231pd(ymm1, ymm3, ymm5)
-@@ -365,21 +365,21 @@ void bli_dgemmsup_rd_haswell_asm_6x4
- 	vfmadd231pd(ymm1, ymm3, ymm14)
- 	vfmadd231pd(ymm2, ymm3, ymm15)
- 
--	
-+
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKITER4)                  // iterate again if i != 0.
--	
--	
--	
-+
-+
-+
- 
- 	label(.DCONSIDKLEFT1)
--	
-+
- 	mov(var(k_left1), rsi)             // i = k_left1;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DPOSTACCUM)                    // if i == 0, we're done; jump to end.
- 	                                   // else, we prepare to enter k_left1 loop.
--	
--	
-+
-+
- 
- 
- 	label(.DLOOPKLEFT1)                // EDGE LOOP (scalar)
-@@ -387,12 +387,12 @@ void bli_dgemmsup_rd_haswell_asm_6x4
- 	                                   // using the xmm registers would zero out the
- 	                                   // high bits of the destination registers,
- 	                                   // which would destory intermediate results.
--	
-+
- 	vmovsd(mem(rax       ), xmm0)
- 	vmovsd(mem(rax, r8, 1), xmm1)
- 	vmovsd(mem(rax, r8, 2), xmm2)
- 	add(imm(1*8), rax)                 // a += 1*cs_a = 1*8;
--	
-+
- 	vmovsd(mem(rbx        ), xmm3)
- 	vfmadd231pd(ymm0, ymm3, ymm4)
- 	vfmadd231pd(ymm1, ymm3, ymm5)
-@@ -414,12 +414,12 @@ void bli_dgemmsup_rd_haswell_asm_6x4
- 	vfmadd231pd(ymm1, ymm3, ymm14)
- 	vfmadd231pd(ymm2, ymm3, ymm15)
- 
--	
-+
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKLEFT1)                  // iterate again if i != 0.
--	
--	
--	
-+
-+
-+
- 
- 
- 
-@@ -427,11 +427,11 @@ void bli_dgemmsup_rd_haswell_asm_6x4
- 	label(.DPOSTACCUM)
- 
- 
--	
--	                                   // ymm4  ymm7  ymm10 ymm13  
-+
-+	                                   // ymm4  ymm7  ymm10 ymm13
- 	                                   // ymm5  ymm8  ymm11 ymm14
- 	                                   // ymm6  ymm9  ymm12 ymm15
--	
-+
- 	vhaddpd( ymm7, ymm4, ymm0 )
- 	vextractf128(imm(1), ymm0, xmm1 )
- 	vaddpd( xmm0, xmm1, xmm0 )
-@@ -469,7 +469,7 @@ void bli_dgemmsup_rd_haswell_asm_6x4
- 	                                   // xmm6[0:3] = sum(ymm6) sum(ymm9) sum(ymm12) sum(ymm15)
- 
- 
--	
-+
- 	//mov(var(rs_c), rdi)                // load rs_c
- 	//lea(mem(, rdi, 8), rdi)            // rs_c *= sizeof(double)
- 
-@@ -477,73 +477,73 @@ void bli_dgemmsup_rd_haswell_asm_6x4
- 	mov(var(beta), rbx)                // load address of beta
- 	vbroadcastsd(mem(rax), ymm0)       // load alpha and duplicate
- 	vbroadcastsd(mem(rbx), ymm3)       // load beta and duplicate
--	
-+
- 	vmulpd(ymm0, ymm4, ymm4)           // scale by alpha
- 	vmulpd(ymm0, ymm5, ymm5)
- 	vmulpd(ymm0, ymm6, ymm6)
--	
--	
--	
--	
--	
--	
-+
-+
-+
-+
-+
-+
- 	//mov(var(cs_c), rsi)                // load cs_c
- 	//lea(mem(, rsi, 8), rsi)            // rsi = cs_c * sizeof(double)
--	
--	
--	
-+
-+
-+
- 	                                   // now avoid loading C if beta == 0
--	
-+
- 	vxorpd(ymm0, ymm0, ymm0)           // set ymm0 to zero.
- 	vucomisd(xmm0, xmm3)               // set ZF if beta == 0.
- 	je(.DBETAZERO)                     // if ZF = 1, jump to beta == 0 case
--	
- 
--	
-+
-+
- 	label(.DROWSTORED)
--	
--	
-+
-+
- 	vfmadd231pd(mem(rcx), ymm3, ymm4)
- 	vmovupd(ymm4, mem(rcx))
- 	add(rdi, rcx)
--	
-+
- 	vfmadd231pd(mem(rcx), ymm3, ymm5)
- 	vmovupd(ymm5, mem(rcx))
- 	add(rdi, rcx)
--	
-+
- 	vfmadd231pd(mem(rcx), ymm3, ymm6)
- 	vmovupd(ymm6, mem(rcx))
- 	//add(rdi, rcx)
--	
--	
--	
-+
-+
-+
- 	jmp(.DDONE)                        // jump to end.
--	
--	
--	
--	
-+
-+
-+
-+
- 	label(.DBETAZERO)
--	
- 
--	
-+
-+
- 	label(.DROWSTORBZ)
--	
--	
-+
-+
- 	vmovupd(ymm4, mem(rcx))
- 	add(rdi, rcx)
--	
-+
- 	vmovupd(ymm5, mem(rcx))
- 	add(rdi, rcx)
--	
-+
- 	vmovupd(ymm6, mem(rcx))
- 	//add(rdi, rcx)
--	
--	
--	
--	
-+
-+
-+
-+
- 	label(.DDONE)
--	
--	
-+
-+
- 
- 
- 	lea(mem(r12, rdi, 2), r12)         //
-@@ -560,7 +560,7 @@ void bli_dgemmsup_rd_haswell_asm_6x4
- 
- 	label(.DRETURN)
- 
--	
-+
- 
-     end_asm(
- 	: // output operands (none)
-@@ -629,7 +629,7 @@ void bli_dgemmsup_rd_haswell_asm_2x4
- 	// -------------------------------------------------------------------------
- 
- 	begin_asm()
--	
-+
- 	//vzeroall()                         // zero all xmm/ymm registers.
- 
- 	mov(var(a), rax)                   // load address of a.
-@@ -649,7 +649,7 @@ void bli_dgemmsup_rd_haswell_asm_2x4
- 
- 	lea(mem(r11, r11, 2), r13)         // r13 = 3*cs_b
- 	//lea(mem(r8,  r8,  2), r10)         // r10 = 3*rs_a
--	
-+
- 
- 	mov(var(c), rcx)                   // load address of c
- 	mov(var(rs_c), rdi)                // load rs_c
-@@ -682,7 +682,7 @@ void bli_dgemmsup_rd_haswell_asm_2x4
- 	//lea(mem(r14), rax)                 // rax = a;
- 	//lea(mem(rdx), rbx)                 // rbx = b;
- 
--	
-+
- #if 1
- 	//mov(var(rs_c), rdi)                // load rs_c
- 	//lea(mem(, rdi, 8), rdi)            // rs_c *= sizeof(double)
-@@ -690,18 +690,18 @@ void bli_dgemmsup_rd_haswell_asm_2x4
- 	prefetch(0, mem(rcx, rdi, 1, 3*8)) // prefetch c + 1*rs_c
- #endif
- 
--	
--	
--	
-+
-+
-+
- 	mov(var(k_iter16), rsi)            // i = k_iter16;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DCONSIDKITER4)                 // if i == 0, jump to code that
- 	                                   // contains the k_iter4 loop.
--	
--	
-+
-+
- 	label(.DLOOPKITER16)               // MAIN LOOP
--	
--	
-+
-+
- 	// ---------------------------------- iteration 0
- 
- #if 0
-@@ -730,7 +730,7 @@ void bli_dgemmsup_rd_haswell_asm_2x4
- 	vfmadd231pd(ymm0, ymm3, ymm13)
- 	vfmadd231pd(ymm1, ymm3, ymm14)
- 
--	
-+
- 	// ---------------------------------- iteration 1
- 
- 	vmovupd(mem(rax       ), ymm0)
-@@ -756,7 +756,7 @@ void bli_dgemmsup_rd_haswell_asm_2x4
- 
- 
- 	// ---------------------------------- iteration 2
--	
-+
- #if 0
- 	prefetch(0, mem(rax, r10, 1, 0*8)) // prefetch rax + 3*cs_a
- 	prefetch(0, mem(rax, r8,  4, 0*8)) // prefetch rax + 4*cs_a
-@@ -807,27 +807,27 @@ void bli_dgemmsup_rd_haswell_asm_2x4
- 	vfmadd231pd(ymm0, ymm3, ymm13)
- 	vfmadd231pd(ymm1, ymm3, ymm14)
- 
--	
-+
- 
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKITER16)                 // iterate again if i != 0.
--	
--	
--	
--	
--	
--	
-+
-+
-+
-+
-+
-+
- 	label(.DCONSIDKITER4)
--	
-+
- 	mov(var(k_iter4), rsi)             // i = k_iter4;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DCONSIDKLEFT1)                 // if i == 0, jump to code that
- 	                                   // considers k_left1 loop.
- 	                                   // else, we prepare to enter k_iter4 loop.
--	
--	
-+
-+
- 	label(.DLOOPKITER4)                // EDGE LOOP (ymm)
--	
-+
- #if 0
- 	prefetch(0, mem(rax, r10, 1, 0*8)) // prefetch rax + 3*cs_a
- 	prefetch(0, mem(rax, r8,  4, 0*8)) // prefetch rax + 4*cs_a
-@@ -836,7 +836,7 @@ void bli_dgemmsup_rd_haswell_asm_2x4
- 	vmovupd(mem(rax       ), ymm0)
- 	vmovupd(mem(rax, r8, 1), ymm1)
- 	add(imm(4*8), rax)                 // a += 4*cs_b = 4*8;
--	
-+
- 	vmovupd(mem(rbx        ), ymm3)
- 	vfmadd231pd(ymm0, ymm3, ymm4)
- 	vfmadd231pd(ymm1, ymm3, ymm5)
-@@ -854,21 +854,21 @@ void bli_dgemmsup_rd_haswell_asm_2x4
- 	vfmadd231pd(ymm0, ymm3, ymm13)
- 	vfmadd231pd(ymm1, ymm3, ymm14)
- 
--	
-+
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKITER4)                  // iterate again if i != 0.
--	
--	
--	
-+
-+
-+
- 
- 	label(.DCONSIDKLEFT1)
--	
-+
- 	mov(var(k_left1), rsi)             // i = k_left1;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DPOSTACCUM)                    // if i == 0, we're done; jump to end.
- 	                                   // else, we prepare to enter k_left1 loop.
--	
--	
-+
-+
- 
- 
- 	label(.DLOOPKLEFT1)                // EDGE LOOP (scalar)
-@@ -876,11 +876,11 @@ void bli_dgemmsup_rd_haswell_asm_2x4
- 	                                   // using the xmm registers would zero out the
- 	                                   // high bits of the destination registers,
- 	                                   // which would destory intermediate results.
--	
-+
- 	vmovsd(mem(rax       ), xmm0)
- 	vmovsd(mem(rax, r8, 1), xmm1)
- 	add(imm(1*8), rax)                 // a += 1*cs_a = 1*8;
--	
-+
- 	vmovsd(mem(rbx        ), xmm3)
- 	vfmadd231pd(ymm0, ymm3, ymm4)
- 	vfmadd231pd(ymm1, ymm3, ymm5)
-@@ -898,12 +898,12 @@ void bli_dgemmsup_rd_haswell_asm_2x4
- 	vfmadd231pd(ymm0, ymm3, ymm13)
- 	vfmadd231pd(ymm1, ymm3, ymm14)
- 
--	
-+
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKLEFT1)                  // iterate again if i != 0.
--	
--	
--	
-+
-+
-+
- 
- 
- 
-@@ -911,10 +911,10 @@ void bli_dgemmsup_rd_haswell_asm_2x4
- 	label(.DPOSTACCUM)
- 
- 
--	
--	                                   // ymm4  ymm7  ymm10 ymm13  
-+
-+	                                   // ymm4  ymm7  ymm10 ymm13
- 	                                   // ymm5  ymm8  ymm11 ymm14
--	
-+
- 	vhaddpd( ymm7, ymm4, ymm0 )
- 	vextractf128(imm(1), ymm0, xmm1 )
- 	vaddpd( xmm0, xmm1, xmm0 )
-@@ -943,75 +943,75 @@ void bli_dgemmsup_rd_haswell_asm_2x4
- 
- 	//mov(var(rs_c), rdi)                // load rs_c
-     //lea(mem(, rdi, 4), rdi)            // rs_c *= sizeof(float)
--	
-+
- 	mov(var(alpha), rax)               // load address of alpha
- 	mov(var(beta), rbx)                // load address of beta
- 	vbroadcastsd(mem(rax), ymm0)       // load alpha and duplicate
- 	vbroadcastsd(mem(rbx), ymm3)       // load beta and duplicate
--	
-+
- 	vmulpd(ymm0, ymm4, ymm4)           // scale by alpha
- 	vmulpd(ymm0, ymm5, ymm5)
--	
--	
--	
--	
--	
--	
-+
-+
-+
-+
-+
-+
- 	//mov(var(cs_c), rsi)                // load cs_c
- 	//lea(mem(, rsi, 8), rsi)            // rsi = cs_c * sizeof(double)
--	
--	
--	
-+
-+
-+
- 	                                   // now avoid loading C if beta == 0
--	
-+
- 	vxorpd(ymm0, ymm0, ymm0)           // set ymm0 to zero.
- 	vucomisd(xmm0, xmm3)               // set ZF if beta == 0.
- 	je(.DBETAZERO)                     // if ZF = 1, jump to beta == 0 case
--	
- 
--	
-+
-+
- 	label(.DROWSTORED)
--	
--	
-+
-+
- 	vfmadd231pd(mem(rcx), ymm3, ymm4)
- 	vmovupd(ymm4, mem(rcx))
- 	add(rdi, rcx)
--	
-+
- 	vfmadd231pd(mem(rcx), ymm3, ymm5)
- 	vmovupd(ymm5, mem(rcx))
- 	//add(rdi, rcx)
--	
--	
--	
-+
-+
-+
- 	jmp(.DDONE)                        // jump to end.
--	
--	
--	
--	
-+
-+
-+
-+
- 	label(.DBETAZERO)
--	
- 
--	
-+
-+
- 	label(.DROWSTORBZ)
--	
--	
-+
-+
- 	vmovupd(ymm4, mem(rcx))
- 	add(rdi, rcx)
--	
-+
- 	vmovupd(ymm5, mem(rcx))
- 	//add(rdi, rcx)
--	
--	
--	
--	
-+
-+
-+
-+
- 	label(.DDONE)
- 
- 
- 
- 
- 	label(.DRETURN)
--	
--	
-+
-+
- 
-     end_asm(
- 	: // output operands (none)
-@@ -1079,7 +1079,7 @@ void bli_dgemmsup_rd_haswell_asm_1x4
- 	// -------------------------------------------------------------------------
- 
- 	begin_asm()
--	
-+
- 	//vzeroall()                         // zero all xmm/ymm registers.
- 
- 	mov(var(a), rax)                   // load address of a.
-@@ -1099,7 +1099,7 @@ void bli_dgemmsup_rd_haswell_asm_1x4
- 
- 	lea(mem(r11, r11, 2), r13)         // r13 = 3*cs_b
- 	//lea(mem(r8,  r8,  2), r10)         // r10 = 3*rs_a
--	
-+
- 
- 	mov(var(c), rcx)                   // load address of c
- 	mov(var(rs_c), rdi)                // load rs_c
-@@ -1128,26 +1128,26 @@ void bli_dgemmsup_rd_haswell_asm_1x4
- 	//lea(mem(r14), rax)                 // rax = a;
- 	//lea(mem(rdx), rbx)                 // rbx = b;
- 
--	
-+
- #if 1
- 	//mov(var(rs_c), rdi)                // load rs_c
- 	//lea(mem(, rdi, 8), rdi)            // rs_c *= sizeof(double)
- 	prefetch(0, mem(rcx,         3*8)) // prefetch c + 0*rs_c
--	prefetch(0, mem(rcx, rdi, 1, 3*8)) // prefetch c + 1*rs_c
-+	//prefetch(0, mem(rcx, rdi, 1, 3*8)) // prefetch c + 1*rs_c
- #endif
- 
--	
--	
--	
-+
-+
-+
- 	mov(var(k_iter16), rsi)            // i = k_iter16;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DCONSIDKITER4)                 // if i == 0, jump to code that
- 	                                   // contains the k_iter4 loop.
--	
--	
-+
-+
- 	label(.DLOOPKITER16)               // MAIN LOOP
--	
--	
-+
-+
- 	// ---------------------------------- iteration 0
- 
- #if 0
-@@ -1170,7 +1170,7 @@ void bli_dgemmsup_rd_haswell_asm_1x4
- 	add(imm(4*8), rbx)                 // b += 4*rs_b = 4*8;
- 	vfmadd231pd(ymm0, ymm3, ymm13)
- 
--	
-+
- 	// ---------------------------------- iteration 1
- 
- 	vmovupd(mem(rax       ), ymm0)
-@@ -1191,7 +1191,7 @@ void bli_dgemmsup_rd_haswell_asm_1x4
- 
- 
- 	// ---------------------------------- iteration 2
--	
-+
- #if 0
- 	prefetch(0, mem(rax, r10, 1, 0*8)) // prefetch rax + 3*cs_a
- #endif
-@@ -1231,27 +1231,27 @@ void bli_dgemmsup_rd_haswell_asm_1x4
- 	add(imm(4*8), rbx)                 // b += 4*rs_b = 4*8;
- 	vfmadd231pd(ymm0, ymm3, ymm13)
- 
--	
-+
- 
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKITER16)                 // iterate again if i != 0.
--	
--	
--	
--	
--	
--	
-+
-+
-+
-+
-+
-+
- 	label(.DCONSIDKITER4)
--	
-+
- 	mov(var(k_iter4), rsi)             // i = k_iter4;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DCONSIDKLEFT1)                 // if i == 0, jump to code that
- 	                                   // considers k_left1 loop.
- 	                                   // else, we prepare to enter k_iter4 loop.
--	
--	
-+
-+
- 	label(.DLOOPKITER4)                // EDGE LOOP (ymm)
--	
-+
- #if 0
- 	prefetch(0, mem(rax, r10, 1, 0*8)) // prefetch rax + 3*cs_a
- 	prefetch(0, mem(rax, r8,  4, 0*8)) // prefetch rax + 4*cs_a
-@@ -1259,7 +1259,7 @@ void bli_dgemmsup_rd_haswell_asm_1x4
- 
- 	vmovupd(mem(rax       ), ymm0)
- 	add(imm(4*8), rax)                 // a += 4*cs_b = 4*8;
--	
-+
- 	vmovupd(mem(rbx        ), ymm3)
- 	vfmadd231pd(ymm0, ymm3, ymm4)
- 
-@@ -1273,21 +1273,21 @@ void bli_dgemmsup_rd_haswell_asm_1x4
- 	add(imm(4*8), rbx)                 // b += 4*rs_b = 4*8;
- 	vfmadd231pd(ymm0, ymm3, ymm13)
- 
--	
-+
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKITER4)                  // iterate again if i != 0.
--	
--	
--	
-+
-+
-+
- 
- 	label(.DCONSIDKLEFT1)
--	
-+
- 	mov(var(k_left1), rsi)             // i = k_left1;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DPOSTACCUM)                    // if i == 0, we're done; jump to end.
- 	                                   // else, we prepare to enter k_left1 loop.
--	
--	
-+
-+
- 
- 
- 	label(.DLOOPKLEFT1)                // EDGE LOOP (scalar)
-@@ -1295,10 +1295,10 @@ void bli_dgemmsup_rd_haswell_asm_1x4
- 	                                   // using the xmm registers would zero out the
- 	                                   // high bits of the destination registers,
- 	                                   // which would destory intermediate results.
--	
-+
- 	vmovsd(mem(rax       ), xmm0)
- 	add(imm(1*8), rax)                 // a += 1*cs_a = 1*8;
--	
-+
- 	vmovsd(mem(rbx        ), xmm3)
- 	vfmadd231pd(ymm0, ymm3, ymm4)
- 
-@@ -1312,12 +1312,12 @@ void bli_dgemmsup_rd_haswell_asm_1x4
- 	add(imm(1*8), rbx)                 // b += 1*rs_b = 1*8;
- 	vfmadd231pd(ymm0, ymm3, ymm13)
- 
--	
-+
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKLEFT1)                  // iterate again if i != 0.
--	
--	
--	
-+
-+
-+
- 
- 
- 
-@@ -1325,9 +1325,9 @@ void bli_dgemmsup_rd_haswell_asm_1x4
- 	label(.DPOSTACCUM)
- 
- 
--	
--	                                   // ymm4  ymm7  ymm10 ymm13  
--	
-+
-+	                                   // ymm4  ymm7  ymm10 ymm13
-+
- 	vhaddpd( ymm7, ymm4, ymm0 )
- 	vextractf128(imm(1), ymm0, xmm1 )
- 	vaddpd( xmm0, xmm1, xmm0 )
-@@ -1339,15 +1339,15 @@ void bli_dgemmsup_rd_haswell_asm_1x4
- 	vperm2f128(imm(0x20), ymm2, ymm0, ymm4 )
- 
- 
--	vhaddpd( ymm8, ymm5, ymm0 )
--	vextractf128(imm(1), ymm0, xmm1 )
--	vaddpd( xmm0, xmm1, xmm0 )
-+	//vhaddpd( ymm8, ymm5, ymm0 )
-+	//vextractf128(imm(1), ymm0, xmm1 )
-+	//vaddpd( xmm0, xmm1, xmm0 )
- 
--	vhaddpd( ymm14, ymm11, ymm2 )
--	vextractf128(imm(1), ymm2, xmm1 )
--	vaddpd( xmm2, xmm1, xmm2 )
-+	//vhaddpd( ymm14, ymm11, ymm2 )
-+	//vextractf128(imm(1), ymm2, xmm1 )
-+	//vaddpd( xmm2, xmm1, xmm2 )
- 
--	vperm2f128(imm(0x20), ymm2, ymm0, ymm5 )
-+	//vperm2f128(imm(0x20), ymm2, ymm0, ymm5 )
- 
- 	                                   // xmm4[0:3] = sum(ymm4) sum(ymm7) sum(ymm10) sum(ymm13)
- 
-@@ -1355,67 +1355,67 @@ void bli_dgemmsup_rd_haswell_asm_1x4
- 
- 	//mov(var(rs_c), rdi)                // load rs_c
-     //lea(mem(, rdi, 4), rdi)            // rs_c *= sizeof(float)
--	
-+
- 	mov(var(alpha), rax)               // load address of alpha
- 	mov(var(beta), rbx)                // load address of beta
- 	vbroadcastsd(mem(rax), ymm0)       // load alpha and duplicate
- 	vbroadcastsd(mem(rbx), ymm3)       // load beta and duplicate
--	
-+
- 	vmulpd(ymm0, ymm4, ymm4)           // scale by alpha
--	
--	
--	
--	
--	
--	
-+
-+
-+
-+
-+
-+
- 	//mov(var(cs_c), rsi)                // load cs_c
- 	//lea(mem(, rsi, 8), rsi)            // rsi = cs_c * sizeof(double)
--	
--	
--	
-+
-+
-+
- 	                                   // now avoid loading C if beta == 0
--	
-+
- 	vxorpd(ymm0, ymm0, ymm0)           // set ymm0 to zero.
- 	vucomisd(xmm0, xmm3)               // set ZF if beta == 0.
- 	je(.DBETAZERO)                     // if ZF = 1, jump to beta == 0 case
--	
- 
--	
-+
-+
- 	label(.DROWSTORED)
--	
--	
-+
-+
- 	vfmadd231pd(mem(rcx), ymm3, ymm4)
- 	vmovupd(ymm4, mem(rcx))
- 	//add(rdi, rcx)
--	
--	
--	
-+
-+
-+
- 	jmp(.DDONE)                        // jump to end.
--	
--	
--	
--	
-+
-+
-+
-+
- 	label(.DBETAZERO)
--	
- 
--	
-+
-+
- 	label(.DROWSTORBZ)
--	
--	
-+
-+
- 	vmovupd(ymm4, mem(rcx))
- 	//add(rdi, rcx)
--	
--	
--	
--	
-+
-+
-+
-+
- 	label(.DDONE)
- 
- 
- 
- 
- 	label(.DRETURN)
--	
--	
-+
-+
- 
-     end_asm(
- 	: // output operands (none)
-commit e3dc1954ffb5eee2a8b41fce85ba589f75770eea
-Author: Devin Matthews <damatthews@smu.edu>
-Date:   Thu Sep 16 10:59:37 2021 -0500
-
-    Fix problem where uninitialized registers are included in vhaddpd in the Mx1 gemmsup kernels for haswell.
-    
-    The fix is to use the same (valid) source register twice in the horizontal addition.
-
-diff --git a/kernels/haswell/3/sup/d6x8/bli_gemmsup_rd_haswell_asm_dMx1.c b/kernels/haswell/3/sup/d6x8/bli_gemmsup_rd_haswell_asm_dMx1.c
-index 6e3c1a0e..457ef9f2 100644
---- a/kernels/haswell/3/sup/d6x8/bli_gemmsup_rd_haswell_asm_dMx1.c
-+++ b/kernels/haswell/3/sup/d6x8/bli_gemmsup_rd_haswell_asm_dMx1.c
-@@ -99,9 +99,9 @@ void bli_dgemmsup_rd_haswell_asm_6x1
- 	// -------------------------------------------------------------------------
- 
- 	begin_asm()
--	
-+
- 	//vzeroall()                         // zero all xmm/ymm registers.
--	
-+
- 	mov(var(a), rax)                   // load address of a.
- 	mov(var(rs_a), r8)                 // load rs_a
- 	//mov(var(cs_a), r9)                 // load cs_a
-@@ -119,7 +119,7 @@ void bli_dgemmsup_rd_haswell_asm_6x1
- 
- 	//lea(mem(r11, r11, 2), r13)         // r13 = 3*cs_b
- 	//lea(mem(r8,  r8,  2), r10)         // r10 = 3*rs_a
--	
-+
- 
- 	mov(var(c), rcx)                   // load address of c
- 	mov(var(rs_c), rdi)                // load rs_c
-@@ -163,19 +163,19 @@ void bli_dgemmsup_rd_haswell_asm_6x1
- 	prefetch(0, mem(r10, rdi, 1, 1*8)) // prefetch c + 4*rs_c
- 	prefetch(0, mem(r10, rdi, 2, 1*8)) // prefetch c + 5*rs_c
- #endif
--	
- 
--	
--	
-+
-+
-+
- 	mov(var(k_iter16), rsi)            // i = k_iter16;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DCONSIDKITER4)                 // if i == 0, jump to code that
- 	                                   // contains the k_iter4 loop.
--	
--	
-+
-+
- 	label(.DLOOPKITER16)               // MAIN LOOP
--	
--	
-+
-+
- 	// ---------------------------------- iteration 0
- 
- #if 0
-@@ -206,7 +206,7 @@ void bli_dgemmsup_rd_haswell_asm_6x1
- 	add(imm(4*8), rax)                 // a += 4*cs_a = 4*8;
- 	vfmadd231pd(ymm0, ymm3, ymm14)
- 
--	
-+
- 	// ---------------------------------- iteration 1
- 
- 	vmovupd(mem(rbx        ), ymm0)
-@@ -233,7 +233,7 @@ void bli_dgemmsup_rd_haswell_asm_6x1
- 
- 
- 	// ---------------------------------- iteration 2
--	
-+
- #if 0
- 	prefetch(0, mem(rax, r10, 1, 0*8)) // prefetch rax + 3*cs_a
- 	prefetch(0, mem(rax, r8,  4, 0*8)) // prefetch rax + 4*cs_a
-@@ -287,27 +287,27 @@ void bli_dgemmsup_rd_haswell_asm_6x1
- 	add(imm(4*8), rax)                 // a += 4*cs_a = 4*8;
- 	vfmadd231pd(ymm0, ymm3, ymm14)
- 
--	
-+
- 
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKITER16)                 // iterate again if i != 0.
--	
--	
--	
--	
--	
--	
-+
-+
-+
-+
-+
-+
- 	label(.DCONSIDKITER4)
--	
-+
- 	mov(var(k_iter4), rsi)             // i = k_iter4;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DCONSIDKLEFT1)                 // if i == 0, jump to code that
- 	                                   // considers k_left1 loop.
- 	                                   // else, we prepare to enter k_iter4 loop.
--	
--	
-+
-+
- 	label(.DLOOPKITER4)                // EDGE LOOP (ymm)
--	
-+
- #if 0
- 	prefetch(0, mem(rax, r10, 1, 0*8)) // prefetch rax + 3*cs_a
- 	prefetch(0, mem(rax, r8,  4, 0*8)) // prefetch rax + 4*cs_a
-@@ -336,21 +336,21 @@ void bli_dgemmsup_rd_haswell_asm_6x1
- 	add(imm(4*8), rax)                 // a += 4*cs_a = 4*8;
- 	vfmadd231pd(ymm0, ymm3, ymm14)
- 
--	
-+
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKITER4)                  // iterate again if i != 0.
--	
--	
--	
-+
-+
-+
- 
- 	label(.DCONSIDKLEFT1)
--	
-+
- 	mov(var(k_left1), rsi)             // i = k_left1;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DPOSTACCUM)                    // if i == 0, we're done; jump to end.
- 	                                   // else, we prepare to enter k_left1 loop.
--	
--	
-+
-+
- 
- 
- 	label(.DLOOPKLEFT1)                // EDGE LOOP (scalar)
-@@ -358,7 +358,7 @@ void bli_dgemmsup_rd_haswell_asm_6x1
- 	                                   // using the xmm registers would zero out the
- 	                                   // high bits of the destination registers,
- 	                                   // which would destory intermediate results.
--	
-+
- 	vmovsd(mem(rbx        ), xmm0)
- 	add(imm(1*8), rbx)                 // b += 1*rs_b = 1*8;
- 
-@@ -381,12 +381,12 @@ void bli_dgemmsup_rd_haswell_asm_6x1
- 	add(imm(1*8), rax)                 // a += 1*cs_a = 1*8;
- 	vfmadd231pd(ymm0, ymm3, ymm14)
- 
--	
-+
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKLEFT1)                  // iterate again if i != 0.
--	
--	
--	
-+
-+
-+
- 
- 
- 
-@@ -399,28 +399,28 @@ void bli_dgemmsup_rd_haswell_asm_6x1
- 	                                   // ymm10
- 	                                   // ymm12
- 	                                   // ymm14
--	
--	vhaddpd( ymm5, ymm4, ymm0 )
-+
-+	vhaddpd( ymm4, ymm4, ymm0 )
- 	vextractf128(imm(1), ymm0, xmm1 )
- 	vaddpd( xmm0, xmm1, xmm4 )
- 
--	vhaddpd( ymm7, ymm6, ymm0 )
-+	vhaddpd( ymm6, ymm6, ymm0 )
- 	vextractf128(imm(1), ymm0, xmm1 )
- 	vaddpd( xmm0, xmm1, xmm6 )
- 
--	vhaddpd( ymm9, ymm8, ymm0 )
-+	vhaddpd( ymm8, ymm8, ymm0 )
- 	vextractf128(imm(1), ymm0, xmm1 )
- 	vaddpd( xmm0, xmm1, xmm8 )
- 
--	vhaddpd( ymm11, ymm10, ymm0 )
-+	vhaddpd( ymm10, ymm10, ymm0 )
- 	vextractf128(imm(1), ymm0, xmm1 )
- 	vaddpd( xmm0, xmm1, xmm10 )
- 
--	vhaddpd( ymm13, ymm12, ymm0 )
-+	vhaddpd( ymm12, ymm12, ymm0 )
- 	vextractf128(imm(1), ymm0, xmm1 )
- 	vaddpd( xmm0, xmm1, xmm12 )
- 
--	vhaddpd( ymm15, ymm14, ymm0 )
-+	vhaddpd( ymm14, ymm14, ymm0 )
- 	vextractf128(imm(1), ymm0, xmm1 )
- 	vaddpd( xmm0, xmm1, xmm14 )
- 
-@@ -435,114 +435,114 @@ void bli_dgemmsup_rd_haswell_asm_6x1
- 
- 	//mov(var(rs_c), rdi)                // load rs_c
- 	//lea(mem(, rdi, 4), rdi)            // rs_c *= sizeof(double)
--	
-+
- 	mov(var(alpha), rax)               // load address of alpha
- 	mov(var(beta), rbx)                // load address of beta
- 	vbroadcastsd(mem(rax), ymm0)       // load alpha and duplicate
- 	vbroadcastsd(mem(rbx), ymm3)       // load beta and duplicate
--	
-+
- 	vmulpd(xmm0, xmm4,  xmm4)          // scale by alpha
- 	vmulpd(xmm0, xmm6,  xmm6)
- 	vmulpd(xmm0, xmm8,  xmm8)
- 	vmulpd(xmm0, xmm10, xmm10)
- 	vmulpd(xmm0, xmm12, xmm12)
- 	vmulpd(xmm0, xmm14, xmm14)
--	
--	
--	
--	
--	
--	
-+
-+
-+
-+
-+
-+
- 	//mov(var(cs_c), rsi)                // load cs_c
- 	//lea(mem(, rsi, 8), rsi)            // rsi = cs_c * sizeof(double)
--	
--	
--	
-+
-+
-+
- 	                                   // now avoid loading C if beta == 0
--	
-+
- 	vxorpd(ymm0, ymm0, ymm0)           // set ymm0 to zero.
- 	vucomisd(xmm0, xmm3)               // set ZF if beta == 0.
- 	je(.DBETAZERO)                     // if ZF = 1, jump to beta == 0 case
--	
- 
--	
-+
-+
- 	label(.DROWSTORED)
--	
- 
--	vmovsd(mem(rcx), xmm0)	
-+
-+	vmovsd(mem(rcx), xmm0)
- 	vfmadd231pd(xmm0, xmm3, xmm4)
- 	vmovsd(xmm4, mem(rcx))
- 	add(rdi, rcx)
--	
--	vmovsd(mem(rcx), xmm0)	
-+
-+	vmovsd(mem(rcx), xmm0)
- 	vfmadd231pd(xmm0, xmm3, xmm6)
- 	vmovsd(xmm6, mem(rcx))
- 	add(rdi, rcx)
--	
--	vmovsd(mem(rcx), xmm0)	
-+
-+	vmovsd(mem(rcx), xmm0)
- 	vfmadd231pd(xmm0, xmm3, xmm8)
- 	vmovsd(xmm8, mem(rcx))
- 	add(rdi, rcx)
--	
--	vmovsd(mem(rcx), xmm0)	
-+
-+	vmovsd(mem(rcx), xmm0)
- 	vfmadd231pd(xmm0, xmm3, xmm10)
- 	vmovsd(xmm10, mem(rcx))
- 	add(rdi, rcx)
--	
--	vmovsd(mem(rcx), xmm0)	
-+
-+	vmovsd(mem(rcx), xmm0)
- 	vfmadd231pd(xmm0, xmm3, xmm12)
- 	vmovsd(xmm12, mem(rcx))
- 	add(rdi, rcx)
--	
--	vmovsd(mem(rcx), xmm0)	
-+
-+	vmovsd(mem(rcx), xmm0)
- 	vfmadd231pd(xmm0, xmm3, xmm14)
- 	vmovsd(xmm14, mem(rcx))
- 	//add(rdi, rcx)
--	
--	
--	
-+
-+
-+
- 	jmp(.DDONE)                        // jump to end.
--	
--	
--	
--	
-+
-+
-+
-+
- 	label(.DBETAZERO)
--	
- 
--	
-+
-+
- 	label(.DROWSTORBZ)
--	
--	
-+
-+
- 	vmovsd(xmm4, mem(rcx))
- 	add(rdi, rcx)
--	
-+
- 	vmovsd(xmm6, mem(rcx))
- 	add(rdi, rcx)
--	
-+
- 	vmovsd(xmm8, mem(rcx))
- 	add(rdi, rcx)
--	
-+
- 	vmovsd(xmm10, mem(rcx))
- 	add(rdi, rcx)
--	
-+
- 	vmovsd(xmm12, mem(rcx))
- 	add(rdi, rcx)
--	
-+
- 	vmovsd(xmm14, mem(rcx))
- 	//add(rdi, rcx)
--	
- 
--	
--	
--	
-+
-+
-+
-+
- 	label(.DDONE)
--	
-+
- 
- 
- 
- 	label(.DRETURN)
- 
--	
-+
- 
-     end_asm(
- 	: // output operands (none)
-@@ -613,9 +613,9 @@ void bli_dgemmsup_rd_haswell_asm_3x1
- 	// -------------------------------------------------------------------------
- 
- 	begin_asm()
--	
-+
- 	//vzeroall()                         // zero all xmm/ymm registers.
--	
-+
- 	mov(var(a), rax)                   // load address of a.
- 	mov(var(rs_a), r8)                 // load rs_a
- 	//mov(var(cs_a), r9)                 // load cs_a
-@@ -633,7 +633,7 @@ void bli_dgemmsup_rd_haswell_asm_3x1
- 
- 	//lea(mem(r11, r11, 2), r13)         // r13 = 3*cs_b
- 	//lea(mem(r8,  r8,  2), r10)         // r10 = 3*rs_a
--	
-+
- 
- 	mov(var(c), rcx)                   // load address of c
- 	mov(var(rs_c), rdi)                // load rs_c
-@@ -671,19 +671,19 @@ void bli_dgemmsup_rd_haswell_asm_3x1
- 	prefetch(0, mem(rcx, rdi, 1, 1*8)) // prefetch c + 1*rs_c
- 	prefetch(0, mem(rcx, rdi, 2, 1*8)) // prefetch c + 2*rs_c
- #endif
--	
- 
--	
--	
-+
-+
-+
- 	mov(var(k_iter16), rsi)            // i = k_iter16;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DCONSIDKITER4)                 // if i == 0, jump to code that
- 	                                   // contains the k_iter4 loop.
--	
--	
-+
-+
- 	label(.DLOOPKITER16)               // MAIN LOOP
--	
--	
-+
-+
- 	// ---------------------------------- iteration 0
- 
- #if 0
-@@ -705,7 +705,7 @@ void bli_dgemmsup_rd_haswell_asm_3x1
- 	add(imm(4*8), rax)                 // a += 4*cs_a = 4*8;
- 	vfmadd231pd(ymm0, ymm3, ymm8)
- 
--	
-+
- 	// ---------------------------------- iteration 1
- 
- 	vmovupd(mem(rbx        ), ymm0)
-@@ -723,7 +723,7 @@ void bli_dgemmsup_rd_haswell_asm_3x1
- 
- 
- 	// ---------------------------------- iteration 2
--	
-+
- #if 0
- 	prefetch(0, mem(rax, r10, 1, 0*8)) // prefetch rax + 3*cs_a
- 	prefetch(0, mem(rax, r8,  4, 0*8)) // prefetch rax + 4*cs_a
-@@ -759,27 +759,27 @@ void bli_dgemmsup_rd_haswell_asm_3x1
- 	add(imm(4*8), rax)                 // a += 4*cs_a = 4*8;
- 	vfmadd231pd(ymm0, ymm3, ymm8)
- 
--	
-+
- 
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKITER16)                 // iterate again if i != 0.
--	
--	
--	
--	
--	
--	
-+
-+
-+
-+
-+
-+
- 	label(.DCONSIDKITER4)
--	
-+
- 	mov(var(k_iter4), rsi)             // i = k_iter4;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DCONSIDKLEFT1)                 // if i == 0, jump to code that
- 	                                   // considers k_left1 loop.
- 	                                   // else, we prepare to enter k_iter4 loop.
--	
--	
-+
-+
- 	label(.DLOOPKITER4)                // EDGE LOOP (ymm)
--	
-+
- #if 0
- 	prefetch(0, mem(rax, r10, 1, 0*8)) // prefetch rax + 3*cs_a
- 	prefetch(0, mem(rax, r8,  4, 0*8)) // prefetch rax + 4*cs_a
-@@ -799,21 +799,21 @@ void bli_dgemmsup_rd_haswell_asm_3x1
- 	add(imm(4*8), rax)                 // a += 4*cs_a = 4*8;
- 	vfmadd231pd(ymm0, ymm3, ymm8)
- 
--	
-+
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKITER4)                  // iterate again if i != 0.
--	
--	
--	
-+
-+
-+
- 
- 	label(.DCONSIDKLEFT1)
--	
-+
- 	mov(var(k_left1), rsi)             // i = k_left1;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DPOSTACCUM)                    // if i == 0, we're done; jump to end.
- 	                                   // else, we prepare to enter k_left1 loop.
--	
--	
-+
-+
- 
- 
- 	label(.DLOOPKLEFT1)                // EDGE LOOP (scalar)
-@@ -821,7 +821,7 @@ void bli_dgemmsup_rd_haswell_asm_3x1
- 	                                   // using the xmm registers would zero out the
- 	                                   // high bits of the destination registers,
- 	                                   // which would destory intermediate results.
--	
-+
- 	vmovsd(mem(rbx        ), xmm0)
- 	add(imm(1*8), rbx)                 // b += 1*rs_b = 1*8;
- 
-@@ -835,12 +835,12 @@ void bli_dgemmsup_rd_haswell_asm_3x1
- 	add(imm(1*8), rax)                 // a += 1*cs_a = 1*8;
- 	vfmadd231pd(ymm0, ymm3, ymm8)
- 
--	
-+
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKLEFT1)                  // iterate again if i != 0.
--	
--	
--	
-+
-+
-+
- 
- 
- 
-@@ -850,16 +850,16 @@ void bli_dgemmsup_rd_haswell_asm_3x1
- 	                                   // ymm4
- 	                                   // ymm6
- 	                                   // ymm8
--	
--	vhaddpd( ymm5, ymm4, ymm0 )
-+
-+	vhaddpd( ymm4, ymm4, ymm0 )
- 	vextractf128(imm(1), ymm0, xmm1 )
- 	vaddpd( xmm0, xmm1, xmm4 )
- 
--	vhaddpd( ymm7, ymm6, ymm0 )
-+	vhaddpd( ymm6, ymm6, ymm0 )
- 	vextractf128(imm(1), ymm0, xmm1 )
- 	vaddpd( xmm0, xmm1, xmm6 )
- 
--	vhaddpd( ymm9, ymm8, ymm0 )
-+	vhaddpd( ymm8, ymm8, ymm0 )
- 	vextractf128(imm(1), ymm0, xmm1 )
- 	vaddpd( xmm0, xmm1, xmm8 )
- 
-@@ -871,87 +871,87 @@ void bli_dgemmsup_rd_haswell_asm_3x1
- 
- 	//mov(var(rs_c), rdi)                // load rs_c
- 	//lea(mem(, rdi, 4), rdi)            // rs_c *= sizeof(double)
--	
-+
- 	mov(var(alpha), rax)               // load address of alpha
- 	mov(var(beta), rbx)                // load address of beta
- 	vbroadcastsd(mem(rax), ymm0)       // load alpha and duplicate
- 	vbroadcastsd(mem(rbx), ymm3)       // load beta and duplicate
--	
-+
- 	vmulpd(xmm0, xmm4,  xmm4)          // scale by alpha
- 	vmulpd(xmm0, xmm6,  xmm6)
- 	vmulpd(xmm0, xmm8,  xmm8)
--	
--	
--	
--	
--	
--	
-+
-+
-+
-+
-+
-+
- 	//mov(var(cs_c), rsi)                // load cs_c
- 	//lea(mem(, rsi, 8), rsi)            // rsi = cs_c * sizeof(double)
--	
--	
--	
-+
-+
-+
- 	                                   // now avoid loading C if beta == 0
--	
-+
- 	vxorpd(ymm0, ymm0, ymm0)           // set ymm0 to zero.
- 	vucomisd(xmm0, xmm3)               // set ZF if beta == 0.
- 	je(.DBETAZERO)                     // if ZF = 1, jump to beta == 0 case
--	
- 
--	
-+
-+
- 	label(.DROWSTORED)
--	
- 
--	vmovsd(mem(rcx), xmm0)	
-+
-+	vmovsd(mem(rcx), xmm0)
- 	vfmadd231pd(xmm0, xmm3, xmm4)
- 	vmovsd(xmm4, mem(rcx))
- 	add(rdi, rcx)
--	
--	vmovsd(mem(rcx), xmm0)	
-+
-+	vmovsd(mem(rcx), xmm0)
- 	vfmadd231pd(xmm0, xmm3, xmm6)
- 	vmovsd(xmm6, mem(rcx))
- 	add(rdi, rcx)
--	
--	vmovsd(mem(rcx), xmm0)	
-+
-+	vmovsd(mem(rcx), xmm0)
- 	vfmadd231pd(xmm0, xmm3, xmm8)
- 	vmovsd(xmm8, mem(rcx))
- 	//add(rdi, rcx)
--	
--	
--	
-+
-+
-+
- 	jmp(.DDONE)                        // jump to end.
--	
--	
--	
--	
-+
-+
-+
-+
- 	label(.DBETAZERO)
--	
- 
--	
-+
-+
- 	label(.DROWSTORBZ)
--	
--	
-+
-+
- 	vmovsd(xmm4, mem(rcx))
- 	add(rdi, rcx)
--	
-+
- 	vmovsd(xmm6, mem(rcx))
- 	add(rdi, rcx)
--	
-+
- 	vmovsd(xmm8, mem(rcx))
- 	//add(rdi, rcx)
--	
- 
--	
--	
--	
-+
-+
-+
-+
- 	label(.DDONE)
--	
-+
- 
- 
- 
- 	label(.DRETURN)
- 
--	
-+
- 
-     end_asm(
- 	: // output operands (none)
-@@ -1022,9 +1022,9 @@ void bli_dgemmsup_rd_haswell_asm_2x1
- 	// -------------------------------------------------------------------------
- 
- 	begin_asm()
--	
-+
- 	//vzeroall()                         // zero all xmm/ymm registers.
--	
-+
- 	mov(var(a), rax)                   // load address of a.
- 	mov(var(rs_a), r8)                 // load rs_a
- 	//mov(var(cs_a), r9)                 // load cs_a
-@@ -1042,7 +1042,7 @@ void bli_dgemmsup_rd_haswell_asm_2x1
- 
- 	//lea(mem(r11, r11, 2), r13)         // r13 = 3*cs_b
- 	//lea(mem(r8,  r8,  2), r10)         // r10 = 3*rs_a
--	
-+
- 
- 	mov(var(c), rcx)                   // load address of c
- 	mov(var(rs_c), rdi)                // load rs_c
-@@ -1078,19 +1078,19 @@ void bli_dgemmsup_rd_haswell_asm_2x1
- 	prefetch(0, mem(rcx,         1*8)) // prefetch c + 0*rs_c
- 	prefetch(0, mem(rcx, rdi, 1, 1*8)) // prefetch c + 1*rs_c
- #endif
--	
- 
--	
--	
-+
-+
-+
- 	mov(var(k_iter16), rsi)            // i = k_iter16;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DCONSIDKITER4)                 // if i == 0, jump to code that
- 	                                   // contains the k_iter4 loop.
--	
--	
-+
-+
- 	label(.DLOOPKITER16)               // MAIN LOOP
--	
--	
-+
-+
- 	// ---------------------------------- iteration 0
- 
- #if 0
-@@ -1109,7 +1109,7 @@ void bli_dgemmsup_rd_haswell_asm_2x1
- 	add(imm(4*8), rax)                 // a += 4*cs_a = 4*8;
- 	vfmadd231pd(ymm0, ymm3, ymm6)
- 
--	
-+
- 	// ---------------------------------- iteration 1
- 
- 	vmovupd(mem(rbx        ), ymm0)
-@@ -1124,7 +1124,7 @@ void bli_dgemmsup_rd_haswell_asm_2x1
- 
- 
- 	// ---------------------------------- iteration 2
--	
-+
- #if 0
- 	prefetch(0, mem(rax, r10, 1, 0*8)) // prefetch rax + 3*cs_a
- 	prefetch(0, mem(rax, r8,  4, 0*8)) // prefetch rax + 4*cs_a
-@@ -1154,27 +1154,27 @@ void bli_dgemmsup_rd_haswell_asm_2x1
- 	add(imm(4*8), rax)                 // a += 4*cs_a = 4*8;
- 	vfmadd231pd(ymm0, ymm3, ymm6)
- 
--	
-+
- 
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKITER16)                 // iterate again if i != 0.
--	
--	
--	
--	
--	
--	
-+
-+
-+
-+
-+
-+
- 	label(.DCONSIDKITER4)
--	
-+
- 	mov(var(k_iter4), rsi)             // i = k_iter4;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DCONSIDKLEFT1)                 // if i == 0, jump to code that
- 	                                   // considers k_left1 loop.
- 	                                   // else, we prepare to enter k_iter4 loop.
--	
--	
-+
-+
- 	label(.DLOOPKITER4)                // EDGE LOOP (ymm)
--	
-+
- #if 0
- 	prefetch(0, mem(rax, r10, 1, 0*8)) // prefetch rax + 3*cs_a
- 	prefetch(0, mem(rax, r8,  4, 0*8)) // prefetch rax + 4*cs_a
-@@ -1191,21 +1191,21 @@ void bli_dgemmsup_rd_haswell_asm_2x1
- 	add(imm(4*8), rax)                 // a += 4*cs_a = 4*8;
- 	vfmadd231pd(ymm0, ymm3, ymm6)
- 
--	
-+
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKITER4)                  // iterate again if i != 0.
--	
--	
--	
-+
-+
-+
- 
- 	label(.DCONSIDKLEFT1)
--	
-+
- 	mov(var(k_left1), rsi)             // i = k_left1;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DPOSTACCUM)                    // if i == 0, we're done; jump to end.
- 	                                   // else, we prepare to enter k_left1 loop.
--	
--	
-+
-+
- 
- 
- 	label(.DLOOPKLEFT1)                // EDGE LOOP (scalar)
-@@ -1213,7 +1213,7 @@ void bli_dgemmsup_rd_haswell_asm_2x1
- 	                                   // using the xmm registers would zero out the
- 	                                   // high bits of the destination registers,
- 	                                   // which would destory intermediate results.
--	
-+
- 	vmovsd(mem(rbx        ), xmm0)
- 	add(imm(1*8), rbx)                 // b += 1*rs_b = 1*8;
- 
-@@ -1224,12 +1224,12 @@ void bli_dgemmsup_rd_haswell_asm_2x1
- 	add(imm(1*8), rax)                 // a += 1*cs_a = 1*8;
- 	vfmadd231pd(ymm0, ymm3, ymm6)
- 
--	
-+
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKLEFT1)                  // iterate again if i != 0.
--	
--	
--	
-+
-+
-+
- 
- 
- 
-@@ -1238,12 +1238,12 @@ void bli_dgemmsup_rd_haswell_asm_2x1
- 
- 	                                   // ymm4
- 	                                   // ymm6
--	
--	vhaddpd( ymm5, ymm4, ymm0 )
-+
-+	vhaddpd( ymm4, ymm4, ymm0 )
- 	vextractf128(imm(1), ymm0, xmm1 )
- 	vaddpd( xmm0, xmm1, xmm4 )
- 
--	vhaddpd( ymm7, ymm6, ymm0 )
-+	vhaddpd( ymm6, ymm6, ymm0 )
- 	vextractf128(imm(1), ymm0, xmm1 )
- 	vaddpd( xmm0, xmm1, xmm6 )
- 
-@@ -1254,78 +1254,78 @@ void bli_dgemmsup_rd_haswell_asm_2x1
- 
- 	//mov(var(rs_c), rdi)                // load rs_c
- 	//lea(mem(, rdi, 4), rdi)            // rs_c *= sizeof(double)
--	
-+
- 	mov(var(alpha), rax)               // load address of alpha
- 	mov(var(beta), rbx)                // load address of beta
- 	vbroadcastsd(mem(rax), ymm0)       // load alpha and duplicate
- 	vbroadcastsd(mem(rbx), ymm3)       // load beta and duplicate
--	
-+
- 	vmulpd(xmm0, xmm4,  xmm4)          // scale by alpha
- 	vmulpd(xmm0, xmm6,  xmm6)
--	
--	
--	
--	
--	
--	
-+
-+
-+
-+
-+
-+
- 	//mov(var(cs_c), rsi)                // load cs_c
- 	//lea(mem(, rsi, 8), rsi)            // rsi = cs_c * sizeof(double)
--	
--	
--	
-+
-+
-+
- 	                                   // now avoid loading C if beta == 0
--	
-+
- 	vxorpd(ymm0, ymm0, ymm0)           // set ymm0 to zero.
- 	vucomisd(xmm0, xmm3)               // set ZF if beta == 0.
- 	je(.DBETAZERO)                     // if ZF = 1, jump to beta == 0 case
--	
- 
--	
-+
-+
- 	label(.DROWSTORED)
--	
- 
--	vmovsd(mem(rcx), xmm0)	
-+
-+	vmovsd(mem(rcx), xmm0)
- 	vfmadd231pd(xmm0, xmm3, xmm4)
- 	vmovsd(xmm4, mem(rcx))
- 	add(rdi, rcx)
--	
--	vmovsd(mem(rcx), xmm0)	
-+
-+	vmovsd(mem(rcx), xmm0)
- 	vfmadd231pd(xmm0, xmm3, xmm6)
- 	vmovsd(xmm6, mem(rcx))
- 	//add(rdi, rcx)
--	
--	
--	
-+
-+
-+
- 	jmp(.DDONE)                        // jump to end.
--	
--	
--	
--	
-+
-+
-+
-+
- 	label(.DBETAZERO)
--	
- 
--	
-+
-+
- 	label(.DROWSTORBZ)
--	
--	
-+
-+
- 	vmovsd(xmm4, mem(rcx))
- 	add(rdi, rcx)
--	
-+
- 	vmovsd(xmm6, mem(rcx))
- 	//add(rdi, rcx)
--	
- 
--	
--	
--	
-+
-+
-+
-+
- 	label(.DDONE)
--	
-+
- 
- 
- 
- 	label(.DRETURN)
- 
--	
-+
- 
-     end_asm(
- 	: // output operands (none)
-@@ -1396,9 +1396,9 @@ void bli_dgemmsup_rd_haswell_asm_1x1
- 	// -------------------------------------------------------------------------
- 
- 	begin_asm()
--	
-+
- 	//vzeroall()                         // zero all xmm/ymm registers.
--	
-+
- 	mov(var(a), rax)                   // load address of a.
- 	mov(var(rs_a), r8)                 // load rs_a
- 	//mov(var(cs_a), r9)                 // load cs_a
-@@ -1416,7 +1416,7 @@ void bli_dgemmsup_rd_haswell_asm_1x1
- 
- 	//lea(mem(r11, r11, 2), r13)         // r13 = 3*cs_b
- 	//lea(mem(r8,  r8,  2), r10)         // r10 = 3*rs_a
--	
-+
- 
- 	mov(var(c), rcx)                   // load address of c
- 	mov(var(rs_c), rdi)                // load rs_c
-@@ -1450,19 +1450,19 @@ void bli_dgemmsup_rd_haswell_asm_1x1
- 	//lea(mem(r10, rdi, 1), r10)         // rdx = c + 3*rs_c;
- 	prefetch(0, mem(rcx,         1*8)) // prefetch c + 0*rs_c
- #endif
--	
- 
--	
--	
-+
-+
-+
- 	mov(var(k_iter16), rsi)            // i = k_iter16;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DCONSIDKITER4)                 // if i == 0, jump to code that
- 	                                   // contains the k_iter4 loop.
--	
--	
-+
-+
- 	label(.DLOOPKITER16)               // MAIN LOOP
--	
--	
-+
-+
- 	// ---------------------------------- iteration 0
- 
- #if 0
-@@ -1478,7 +1478,7 @@ void bli_dgemmsup_rd_haswell_asm_1x1
- 	add(imm(4*8), rax)                 // a += 4*cs_a = 4*8;
- 	vfmadd231pd(ymm0, ymm3, ymm4)
- 
--	
-+
- 	// ---------------------------------- iteration 1
- 
- 	vmovupd(mem(rbx        ), ymm0)
-@@ -1490,7 +1490,7 @@ void bli_dgemmsup_rd_haswell_asm_1x1
- 
- 
- 	// ---------------------------------- iteration 2
--	
-+
- #if 0
- 	prefetch(0, mem(rax, r10, 1, 0*8)) // prefetch rax + 3*cs_a
- 	prefetch(0, mem(rax, r8,  4, 0*8)) // prefetch rax + 4*cs_a
-@@ -1514,27 +1514,27 @@ void bli_dgemmsup_rd_haswell_asm_1x1
- 	add(imm(4*8), rax)                 // a += 4*cs_a = 4*8;
- 	vfmadd231pd(ymm0, ymm3, ymm4)
- 
--	
-+
- 
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKITER16)                 // iterate again if i != 0.
--	
--	
--	
--	
--	
--	
-+
-+
-+
-+
-+
-+
- 	label(.DCONSIDKITER4)
--	
-+
- 	mov(var(k_iter4), rsi)             // i = k_iter4;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DCONSIDKLEFT1)                 // if i == 0, jump to code that
- 	                                   // considers k_left1 loop.
- 	                                   // else, we prepare to enter k_iter4 loop.
--	
--	
-+
-+
- 	label(.DLOOPKITER4)                // EDGE LOOP (ymm)
--	
-+
- #if 0
- 	prefetch(0, mem(rax, r10, 1, 0*8)) // prefetch rax + 3*cs_a
- 	prefetch(0, mem(rax, r8,  4, 0*8)) // prefetch rax + 4*cs_a
-@@ -1548,21 +1548,21 @@ void bli_dgemmsup_rd_haswell_asm_1x1
- 	add(imm(4*8), rax)                 // a += 4*cs_a = 4*8;
- 	vfmadd231pd(ymm0, ymm3, ymm4)
- 
--	
-+
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKITER4)                  // iterate again if i != 0.
--	
--	
--	
-+
-+
-+
- 
- 	label(.DCONSIDKLEFT1)
--	
-+
- 	mov(var(k_left1), rsi)             // i = k_left1;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DPOSTACCUM)                    // if i == 0, we're done; jump to end.
- 	                                   // else, we prepare to enter k_left1 loop.
--	
--	
-+
-+
- 
- 
- 	label(.DLOOPKLEFT1)                // EDGE LOOP (scalar)
-@@ -1570,7 +1570,7 @@ void bli_dgemmsup_rd_haswell_asm_1x1
- 	                                   // using the xmm registers would zero out the
- 	                                   // high bits of the destination registers,
- 	                                   // which would destory intermediate results.
--	
-+
- 	vmovsd(mem(rbx        ), xmm0)
- 	add(imm(1*8), rbx)                 // b += 1*rs_b = 1*8;
- 
-@@ -1578,12 +1578,12 @@ void bli_dgemmsup_rd_haswell_asm_1x1
- 	add(imm(1*8), rax)                 // a += 1*cs_a = 1*8;
- 	vfmadd231pd(ymm0, ymm3, ymm4)
- 
--	
-+
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKLEFT1)                  // iterate again if i != 0.
--	
--	
--	
-+
-+
-+
- 
- 
- 
-@@ -1591,8 +1591,8 @@ void bli_dgemmsup_rd_haswell_asm_1x1
- 	label(.DPOSTACCUM)
- 
- 	                                   // ymm4
--	
--	vhaddpd( ymm5, ymm4, ymm0 )
-+
-+	vhaddpd( ymm4, ymm4, ymm0 )
- 	vextractf128(imm(1), ymm0, xmm1 )
- 	vaddpd( xmm0, xmm1, xmm4 )
- 
-@@ -1602,69 +1602,69 @@ void bli_dgemmsup_rd_haswell_asm_1x1
- 
- 	//mov(var(rs_c), rdi)                // load rs_c
- 	//lea(mem(, rdi, 4), rdi)            // rs_c *= sizeof(double)
--	
-+
- 	mov(var(alpha), rax)               // load address of alpha
- 	mov(var(beta), rbx)                // load address of beta
- 	vbroadcastsd(mem(rax), ymm0)       // load alpha and duplicate
- 	vbroadcastsd(mem(rbx), ymm3)       // load beta and duplicate
--	
-+
- 	vmulpd(xmm0, xmm4,  xmm4)          // scale by alpha
--	
--	
--	
--	
--	
--	
-+
-+
-+
-+
-+
-+
- 	//mov(var(cs_c), rsi)                // load cs_c
- 	//lea(mem(, rsi, 8), rsi)            // rsi = cs_c * sizeof(double)
--	
--	
--	
-+
-+
-+
- 	                                   // now avoid loading C if beta == 0
--	
-+
- 	vxorpd(ymm0, ymm0, ymm0)           // set ymm0 to zero.
- 	vucomisd(xmm0, xmm3)               // set ZF if beta == 0.
- 	je(.DBETAZERO)                     // if ZF = 1, jump to beta == 0 case
--	
- 
--	
-+
-+
- 	label(.DROWSTORED)
--	
- 
--	vmovsd(mem(rcx), xmm0)	
-+
-+	vmovsd(mem(rcx), xmm0)
- 	vfmadd231pd(xmm0, xmm3, xmm4)
- 	vmovsd(xmm4, mem(rcx))
- 	//add(rdi, rcx)
--	
--	
--	
-+
-+
-+
- 	jmp(.DDONE)                        // jump to end.
--	
--	
--	
--	
-+
-+
-+
-+
- 	label(.DBETAZERO)
--	
- 
--	
-+
-+
- 	label(.DROWSTORBZ)
--	
--	
-+
-+
- 	vmovsd(xmm4, mem(rcx))
- 	//add(rdi, rcx)
--	
- 
--	
--	
--	
-+
-+
-+
-+
- 	label(.DDONE)
--	
-+
- 
- 
- 
- 	label(.DRETURN)
- 
--	
-+
- 
-     end_asm(
- 	: // output operands (none)
-diff --git a/kernels/haswell/3/sup/d6x8/bli_gemmsup_rd_haswell_asm_dMx4.c b/kernels/haswell/3/sup/d6x8/bli_gemmsup_rd_haswell_asm_dMx4.c
-index 21dd3b89..516bfced 100644
---- a/kernels/haswell/3/sup/d6x8/bli_gemmsup_rd_haswell_asm_dMx4.c
-+++ b/kernels/haswell/3/sup/d6x8/bli_gemmsup_rd_haswell_asm_dMx4.c
-@@ -1338,17 +1338,6 @@ void bli_dgemmsup_rd_haswell_asm_1x4
- 
- 	vperm2f128(imm(0x20), ymm2, ymm0, ymm4 )
- 
--
--	//vhaddpd( ymm8, ymm5, ymm0 )
--	//vextractf128(imm(1), ymm0, xmm1 )
--	//vaddpd( xmm0, xmm1, xmm0 )
--
--	//vhaddpd( ymm14, ymm11, ymm2 )
--	//vextractf128(imm(1), ymm2, xmm1 )
--	//vaddpd( xmm2, xmm1, xmm2 )
--
--	//vperm2f128(imm(0x20), ymm2, ymm0, ymm5 )
--
- 	                                   // xmm4[0:3] = sum(ymm4) sum(ymm7) sum(ymm10) sum(ymm13)
- 
- 
diff --git a/Golden_Repo/b/Bazel/Bazel-3.4.1-fix-grpc-protoc.patch b/Golden_Repo/b/Bazel/Bazel-3.4.1-fix-grpc-protoc.patch
deleted file mode 100644
index ecc4021a0..000000000
--- a/Golden_Repo/b/Bazel/Bazel-3.4.1-fix-grpc-protoc.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From cd3c41eb5a29ca475b7bafc42aa71e94363d46df Mon Sep 17 00:00:00 2001
-From: Alexander Grund <alexander.grund@tu-dresden.de>
-Date: Tue, 28 Jul 2020 19:51:13 +0200
-Subject: [PATCH] Fix environment for protobuf compilation in grpc
-
-Add use_default_shell_env = True to protoc invocation for grpc to mirror
-what the protobuf cc_proto_library & co are doing
-Fixes a failure in invocing protoc when it is build in a non-default
-environment (e.g. with a custom LD_LIBRARY_PATH)
-
-Fixes #11852, fixes #11855
----
- third_party/grpc/bazel/generate_cc.bzl | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/third_party/grpc/bazel/generate_cc.bzl b/third_party/grpc/bazel/generate_cc.bzl
-index 38a5b460f90..d5a4e27bc88 100644
---- a/third_party/grpc/bazel/generate_cc.bzl
-+++ b/third_party/grpc/bazel/generate_cc.bzl
-@@ -123,6 +123,7 @@ def generate_cc_impl(ctx):
-         outputs = out_files,
-         executable = ctx.executable.protoc,
-         arguments = arguments,
-+        use_default_shell_env = True,
-     )
- 
-     return struct(files = depset(out_files))
diff --git a/Golden_Repo/b/Bazel/Bazel-3.7.1_fix-protobuf-env.patch b/Golden_Repo/b/Bazel/Bazel-3.7.1_fix-protobuf-env.patch
deleted file mode 100644
index 0e110a672..000000000
--- a/Golden_Repo/b/Bazel/Bazel-3.7.1_fix-protobuf-env.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/third_party/protobuf/3.13.0.patch b/third_party/protobuf/3.13.0.patch
-index bde8684b82..3336ef4024 100644
---- a/third_party/protobuf/3.13.0.patch
-+++ b/third_party/protobuf/3.13.0.patch
-@@ -38,3 +38,15 @@ index cfdb28e2e..3705fdbe3 100644
- +        "@io_bazel//third_party:gson",
-      ],
-  )
-+diff --git a/protobuf.bzl b/protobuf.bzl
-+index 050eafc54..12d3edb94 100644
-+--- a/protobuf.bzl
-++++ b/protobuf.bzl
-+@@ -352,6 +352,7 @@ def _internal_gen_well_known_protos_java_impl(ctx):
-+         inputs = descriptors,
-+         outputs = [srcjar],
-+         arguments = [args],
-++        use_default_shell_env = True,
-+     )
-+ 
-+     return [
diff --git a/Golden_Repo/b/Bazel/Bazel-3.7.2-GCCcore-11.2.0.eb b/Golden_Repo/b/Bazel/Bazel-3.7.2-GCCcore-11.2.0.eb
deleted file mode 100644
index e774f38e3..000000000
--- a/Golden_Repo/b/Bazel/Bazel-3.7.2-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,45 +0,0 @@
-name = 'Bazel'
-version = '3.7.2'
-
-homepage = 'https://bazel.io/'
-description = """Bazel is a build tool that builds code quickly and reliably.
-It is used to build the majority of Google's software."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [
-    'https://github.com/bazelbuild/%(namelower)s/releases/download/%(version)s']
-sources = ['%(namelower)s-%(version)s-dist.zip']
-patches = [
-    '%(name)s-3.4.1-fix-grpc-protoc.patch',
-    'java15.patch',
-    '%(name)s-3.7.1_fix-protobuf-env.patch',
-    'gcc11-bazel-3.7.2.patch',
-    'gcc11-2-bazel-3.7.2.patch',
-
-]
-checksums = [
-    # bazel-3.7.2-dist.zip
-    'de255bb42163a915312df9f4b86e5b874b46d9e8d4b72604b5123c3a845ed9b1',
-    # Bazel-3.4.1-fix-grpc-protoc.patch
-    'f87ad8ad6922fd9c974381ea22b7b0e6502ccad5e532145f179b80d5599e24ac',
-    '28f394f561824abf562556877483bc443dfd3ee0c7cba48a56e22670258669e7',  # java15.patch
-    # Bazel-3.7.1_fix-protobuf-env.patch
-    '8706ecc99b658e0a96c38dc2c23e44da35059b85f308602aac76a6d6680376e7',
-    # gcc11-bazel-3.7.2.patch
-    '32dc4abdc45bfcf70e9d93a66150b89646c801f8704930f0b713038366e40d40',
-    # gcc11-2-bazel-3.7.2.patch
-    '3160caff050330e33df1f7afb649e8303bf4af969ef7722639bd0f3c3ae036b4',
-]
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Python', '3.9.6'),
-    ('Zip', '3.0'),
-]
-
-prebuildopts = "export BAZEL_LINKOPTS=-static-libstdc++:-static-libgcc BAZEL_LINKLIBS=-l%:libstdc++.a:-lm && "
-configopts = "--host_jvm_args=--illegal-access=permit"
-dependencies = [('Java', '15', '', True)]
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/b/Bazel/gcc11-2-bazel-3.7.2.patch b/Golden_Repo/b/Bazel/gcc11-2-bazel-3.7.2.patch
deleted file mode 100644
index c7ceaa843..000000000
--- a/Golden_Repo/b/Bazel/gcc11-2-bazel-3.7.2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/third_party/ijar/mapped_file.h.orig	2021-11-05 15:56:24.654184777 +0100
-+++ src/third_party/ijar/mapped_file.h	2021-11-05 15:56:33.879015290 +0100
-@@ -16,6 +16,7 @@
- #define INCLUDED_THIRD_PARTY_IJAR_MAPPED_FILE_H
- 
- #include "third_party/ijar/common.h"
-+#include <limits>
- 
- namespace devtools_ijar {
- 
diff --git a/Golden_Repo/b/Bazel/gcc11-bazel-3.7.2.patch b/Golden_Repo/b/Bazel/gcc11-bazel-3.7.2.patch
deleted file mode 100644
index b46eda738..000000000
--- a/Golden_Repo/b/Bazel/gcc11-bazel-3.7.2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/third_party/ijar/zlib_client.h.orig	2021-11-05 15:39:58.061336981 +0100
-+++ src/third_party/ijar/zlib_client.h	2021-11-05 15:40:22.650877105 +0100
-@@ -16,6 +16,7 @@
- #define THIRD_PARTY_IJAR_ZLIB_CLIENT_H_
- 
- #include <limits.h>
-+#include <limits>
- 
- #include "third_party/ijar/common.h"
- 
diff --git a/Golden_Repo/b/Bazel/java15.patch b/Golden_Repo/b/Bazel/java15.patch
deleted file mode 100644
index 6fc6a9563..000000000
--- a/Golden_Repo/b/Bazel/java15.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0216ee54417fa1f2fef14f6eb14cbc1e8f595821 Mon Sep 17 00:00:00 2001
-From: philwo <philwo@google.com>
-Date: Mon, 8 Feb 2021 10:45:50 -0800
-Subject: [PATCH] Fix Bazel #10214: JDK 13 introduced a source compatibility
- issue.
-
-Quote from the Java release notes:
-
-The addition of newFileSystem(Path, Map<String, ?>) creates a source (but not binary) compatibility issue for code that has been using the existing 2-arg newFileSystem(Path, ClassLoader) and specifying the class loader as null. [...] To avoid the ambiguous reference, this code needs to be modified to cast the second parameter to java.lang.ClassLoader.
-
-RELNOTES:
-PiperOrigin-RevId: 356301318
----
- .../com/google/devtools/build/buildjar/VanillaJavaBuilder.java  | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/VanillaJavaBuilder.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/VanillaJavaBuilder.java
-index 327017362626..5edf9ba0cf23 100644
---- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/VanillaJavaBuilder.java
-+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/VanillaJavaBuilder.java
-@@ -77,7 +77,7 @@
-   private FileSystem getJarFileSystem(Path sourceJar) throws IOException {
-     FileSystem fs = filesystems.get(sourceJar);
-     if (fs == null) {
--      filesystems.put(sourceJar, fs = FileSystems.newFileSystem(sourceJar, null));
-+      filesystems.put(sourceJar, fs = FileSystems.newFileSystem(sourceJar, (ClassLoader) null));
-     }
-     return fs;
-   }
\ No newline at end of file
diff --git a/Golden_Repo/b/Biopython/Biopython-1.79-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/b/Biopython/Biopython-1.79-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index c42b6f2eb..000000000
--- a/Golden_Repo/b/Biopython/Biopython-1.79-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,42 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'Biopython'
-version = '1.79'
-
-homepage = 'https://www.biopython.org'
-description = """Biopython is a set of freely available tools for biological
- computation written in Python by an international team of developers. It is
- a distributed collaborative effort to develop Python libraries and
- applications which address the needs of current and future work in
- bioinformatics. """
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-source_urls = ['https://biopython.org/DIST']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['edb07eac99d3b8abd7ba56ff4bedec9263f76dfc3c3f450e7d2e2bcdecf8559b']
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10'),
-]
-
-download_dep_fail = True
-use_pip = True
-sanity_pip_check = True
-
-# Run only tests that don't require internet connection
-runtest = 'python setup.py test --offline'
-
-sanity_check_paths = {
-    'files': [],
-    'dirs': ['lib/python%(pyshortver)s/site-packages/Bio',
-             'lib/python%(pyshortver)s/site-packages/BioSQL']
-}
-
-# extra check to ensure numpy dependency is available
-sanity_check_commands = ["python -c 'import Bio.MarkovModel'"]
-
-options = {'modulename': 'Bio'}
-
-moduleclass = 'bio'
diff --git a/Golden_Repo/b/Bison/Bison-3.7.6-GCCcore-11.2.0.eb b/Golden_Repo/b/Bison/Bison-3.7.6-GCCcore-11.2.0.eb
deleted file mode 100644
index 8bb811de9..000000000
--- a/Golden_Repo/b/Bison/Bison-3.7.6-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,30 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'Bison'
-version = '3.7.6'
-
-homepage = 'https://www.gnu.org/software/bison'
-description = """Bison is a general-purpose parser generator that converts an annotated context-free grammar
- into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser tables."""
-
-site_contacts = 'sc@fz-juelich.de'
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [GNU_SOURCE]
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['69dc0bb46ea8fc307d4ca1e0b61c8c355eb207d0b0c69f4f8462328e74d7b9ea']
-
-builddependencies = [
-    ('M4', '1.4.19'),
-    # use same binutils version that was used when building GCCcore toolchain
-    ('binutils', '2.37', '', SYSTEM),
-]
-
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in ['bison', 'yacc']] + [('lib/liby.a', 'lib64/liby.a')],
-    'dirs': [],
-}
-
-moduleclass = 'lang'
diff --git a/Golden_Repo/b/Bison/Bison-3.7.6.eb b/Golden_Repo/b/Bison/Bison-3.7.6.eb
deleted file mode 100644
index 2f810b741..000000000
--- a/Golden_Repo/b/Bison/Bison-3.7.6.eb
+++ /dev/null
@@ -1,31 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'Bison'
-version = '3.7.6'
-
-homepage = 'https://www.gnu.org/software/bison'
-
-description = """
- Bison is a general-purpose parser generator that converts an annotated
- context-free grammar into a deterministic LR or generalized LR (GLR) parser
- employing LALR(1) parser tables.
-"""
-
-site_contacts = 'sc@fz-juelich.de'
-
-toolchain = SYSTEM
-
-source_urls = [GNU_SOURCE]
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['69dc0bb46ea8fc307d4ca1e0b61c8c355eb207d0b0c69f4f8462328e74d7b9ea']
-
-builddependencies = [
-    ('M4', '1.4.19'),
-]
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in ['bison', 'yacc']] + [('lib/liby.a', 'lib64/liby.a')],
-    'dirs': [],
-}
-
-moduleclass = 'lang'
diff --git a/Golden_Repo/b/Blender/Blender-3.1.2-GCCcore-11.2.0-binary.eb b/Golden_Repo/b/Blender/Blender-3.1.2-GCCcore-11.2.0-binary.eb
deleted file mode 100644
index ac14b5b1e..000000000
--- a/Golden_Repo/b/Blender/Blender-3.1.2-GCCcore-11.2.0-binary.eb
+++ /dev/null
@@ -1,41 +0,0 @@
-easyblock = 'PackedBinary'
-
-name = 'Blender'
-version = '3.1.2'
-versionsuffix = '-binary'
-
-homepage = 'https://www.blender.org'
-description = """
-Blender is the free and open source 3D creation suite. It supports the entirety of the 3D pipeline,
-modeling, rigging, animation, simulation, rendering, compositing and motion tracking, even video 
-editing and game creation.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['http://ftp.nluug.nl/pub/graphics/%(namelower)s/release/%(name)s%(version_major_minor)s/']
-sources = ['%(namelower)s-%(version)s-linux-x64.tar.xz']
-checksums = ['c1d345b25c6f83708b2681d354d70a3e6023c04bb73cc7943366c0c19e542958']
-
-dependencies = [
-    ('X11', '20210802'),
-    ('OpenGL', '2021b'),
-    ('CUDA', '11.5', '', SYSTEM),
-]
-
-postinstallcmds = [
-    # remove Blenders OpenGL libs
-    'rm %(installdir)s/lib/libgl*',
-    'rm %(installdir)s/lib/libGL*',
-]
-
-sanity_check_paths = {
-    'files': ['%(namelower)s'],
-    'dirs': ['%(version_major_minor)s'],
-}
-
-modaliases = {
-    'blender': 'blender -- --cycles-device CUDA',
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/b/Blosc/Blosc-1.21.1-GCCcore-11.2.0.eb b/Golden_Repo/b/Blosc/Blosc-1.21.1-GCCcore-11.2.0.eb
deleted file mode 100644
index 35ae6fea8..000000000
--- a/Golden_Repo/b/Blosc/Blosc-1.21.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,28 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'Blosc'
-version = '1.21.1'
-
-homepage = 'https://www.blosc.org/'
-
-description = "Blosc, an extremely fast, multi-threaded, meta-compressor library"
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True, 'cstd': 'c++11'}
-
-source_urls = ['https://github.com/Blosc/c-blosc/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['f387149eab24efa01c308e4cba0f59f64ccae57292ec9c794002232f7903b55b']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1'),
-]
-
-sanity_check_paths = {
-    'files': ['include/blosc-export.h', 'include/blosc.h', 'lib/libblosc.a',
-              'lib/libblosc.%s' % SHLIB_EXT],
-    'dirs': [],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/b/Boost.Python/Boost.Python-1.78.0-GCCcore-11.2.0.eb b/Golden_Repo/b/Boost.Python/Boost.Python-1.78.0-GCCcore-11.2.0.eb
deleted file mode 100644
index 7fbdcf3d5..000000000
--- a/Golden_Repo/b/Boost.Python/Boost.Python-1.78.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,26 +0,0 @@
-easyblock = 'EB_Boost'
-
-name = 'Boost.Python'
-version = '1.78.0'
-
-homepage = 'https://boostorg.github.io/python'
-description = """Boost.Python is a C++ library which enables seamless interoperability between C++
- and the Python programming language."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [
-    'https://boostorg.jfrog.io/artifactory/main/release/%(version)s/source/']
-sources = ['boost_%s.tar.gz' % '_'.join(version.split('.'))]
-checksums = ['94ced8b72956591c4775ae2207a9763d3600b30d9d7446562c552f0a14a63be7']
-
-dependencies = [
-    ('binutils', '2.37'),
-    ('Boost',  version),
-    ('Python', '3.9.6'),
-]
-
-only_python_bindings = True
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/b/Boost/Boost-1.78.0-GCCcore-11.2.0.eb b/Golden_Repo/b/Boost/Boost-1.78.0-GCCcore-11.2.0.eb
deleted file mode 100644
index e86551460..000000000
--- a/Golden_Repo/b/Boost/Boost-1.78.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,32 +0,0 @@
-##
-# Authors::   Denis Kristak <thenis@inuits.eu>
-##
-name = 'Boost'
-version = '1.78.0'
-
-homepage = 'https://www.boost.org/'
-description = """Boost provides free peer-reviewed portable C++ source libraries."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [
-    'https://boostorg.jfrog.io/artifactory/main/release/%(version)s/source/']
-sources = ['%%(namelower)s_%s.tar.gz' % '_'.join(version.split('.'))]
-checksums = ['94ced8b72956591c4775ae2207a9763d3600b30d9d7446562c552f0a14a63be7']
-
-dependencies = [
-    ('binutils', '2.37'),
-    ('bzip2', '1.0.8'),
-    ('zlib', '1.2.11'),
-    ('XZ', '5.2.5'),
-    ('ICU', '70.1'),
-]
-
-configopts = '--without-libraries=python,mpi'
-
-# disable MPI, build Boost libraries with tagged layout
-boost_mpi = False
-tagged_layout = True
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/b/Brotli/Brotli-1.0.9-GCCcore-11.2.0.eb b/Golden_Repo/b/Brotli/Brotli-1.0.9-GCCcore-11.2.0.eb
deleted file mode 100644
index 61e58f174..000000000
--- a/Golden_Repo/b/Brotli/Brotli-1.0.9-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,37 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'Brotli'
-version = '1.0.9'
-
-homepage = 'https://github.com/google/brotli'
-description = """Brotli is a generic-purpose lossless compression algorithm that compresses data using a combination
- of a modern variant of the LZ77 algorithm, Huffman coding and 2nd order context modeling, with a compression ratio
- comparable to the best currently available general-purpose compression methods. It is similar in speed with deflate
- but offers more dense compression.
-The specification of the Brotli Compressed Data Format is defined in RFC 7932."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://github.com/google/brotli/archive']
-sources = ['v%(version)s.tar.gz']
-patches = ['Brotli-%(version)s_pc_link_flags.patch']
-checksums = [
-    'f9e8d81d0405ba66d181529af42a3354f838c939095ff99930da6aa9cdf6fe46',  # v1.0.9.tar.gz
-    # Brotli-1.0.9_pc_link_flags.patch
-    '1a8498fe5179fa530d5e6da57632a7ca8ee98b462953b9995e3400cdac4c3d7e',
-]
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1'),
-]
-
-sanity_check_paths = {
-    'files': ['bin/brotli', 'lib/libbrotlidec.%s' % SHLIB_EXT, 'lib/libbrotlienc.%s' % SHLIB_EXT,
-              'lib/libbrotlidec-static.a', 'lib/libbrotlienc-static.a'],
-    'dirs': [],
-}
-
-sanity_check_commands = ["brotli --help"]
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/b/binutils/binutils-2.37-GCCcore-11.2.0.eb b/Golden_Repo/b/binutils/binutils-2.37-GCCcore-11.2.0.eb
deleted file mode 100644
index 6743c603e..000000000
--- a/Golden_Repo/b/binutils/binutils-2.37-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,33 +0,0 @@
-name = 'binutils'
-version = '2.37'
-
-homepage = 'https://directory.fsf.org/project/binutils/'
-description = "binutils: GNU binary utilities"
-
-site_contacts = 'sc@fz-juelich.de'
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [GNU_SOURCE]
-sources = [SOURCE_TAR_GZ]
-checksums = ['c44968b97cd86499efbc4b4ab7d98471f673e5414c554ef54afa930062dbbfcb']
-
-builddependencies = [
-    ('flex', '2.6.4'),
-    ('Bison', '3.7.6'),
-    # use same binutils version that was used when building GCC toolchain, to 'bootstrap' this binutils
-    ('binutils', version, '', SYSTEM)
-]
-
-dependencies = [
-    # zlib is a runtime dep to avoid that it gets embedded in libbfd.so,
-    # see https://github.com/easybuilders/easybuild-easyblocks/issues/1350
-    ('zlib', '1.2.11'),
-]
-
-# avoid build failure when makeinfo command is not available
-# see https://sourceware.org/bugzilla/show_bug.cgi?id=15345
-buildopts = 'MAKEINFO=true'
-installopts = buildopts
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/b/binutils/binutils-2.37.eb b/Golden_Repo/b/binutils/binutils-2.37.eb
deleted file mode 100644
index 2267cd7ed..000000000
--- a/Golden_Repo/b/binutils/binutils-2.37.eb
+++ /dev/null
@@ -1,28 +0,0 @@
-name = 'binutils'
-version = '2.37'
-
-homepage = 'https://directory.fsf.org/project/binutils/'
-
-description = "binutils: GNU binary utilities"
-
-site_contacts = 'sc@fz-juelich.de'
-
-toolchain = SYSTEM
-
-source_urls = [GNU_SOURCE]
-sources = [SOURCE_TAR_GZ]
-checksums = ['c44968b97cd86499efbc4b4ab7d98471f673e5414c554ef54afa930062dbbfcb']
-
-builddependencies = [
-    ('flex', '2.6.4'),
-    ('Bison', '3.7.6'),
-    # zlib required, but being linked in statically, so not a runtime dep
-    ('zlib', '1.2.11'),
-]
-
-# avoid build failure when makeinfo command is not available
-# see https://sourceware.org/bugzilla/show_bug.cgi?id=15345
-buildopts = 'MAKEINFO=true'
-installopts = buildopts
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/b/bokeh/bokeh-2.4.1-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/b/bokeh/bokeh-2.4.1-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index 7564c979a..000000000
--- a/Golden_Repo/b/bokeh/bokeh-2.4.1-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,40 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'bokeh'
-version = '2.4.1'
-
-homepage = 'https://github.com/bokeh/bokeh'
-description = "Statistical and novel interactive HTML plots for Python"
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('PyYAML', '5.4.1'),
-    ('Pillow-SIMD', '9.0.1'),
-    ('SciPy-bundle', '2021.10'),
-    ('typing-extensions', '3.10.0.0'),
-]
-
-use_pip = True
-
-exts_list = [
-    ('tornado', '6.1', {
-        'checksums': ['33c6e81d7bd55b468d2e793517c909b139960b6c790a60b7991b9b6b76fb9791'],
-    }),
-    (name, version, {
-        'checksums': ['d0410717d743a0ac251e62480e2ea860a7341bdcd1dbe01499a904f233c90512'],
-    }),
-]
-
-sanity_check_paths = {
-    'files': ['bin/bokeh'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-sanity_check_commands = ["bokeh --help"]
-
-sanity_pip_check = True
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/b/byacc/byacc-20210808-GCCcore-11.2.0.eb b/Golden_Repo/b/byacc/byacc-20210808-GCCcore-11.2.0.eb
deleted file mode 100644
index 2591dbc86..000000000
--- a/Golden_Repo/b/byacc/byacc-20210808-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,22 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'byacc'
-version = '20210808'
-
-homepage = 'http://invisible-island.net/byacc/byacc.html'
-description = """Berkeley Yacc (byacc) is generally conceded to be the best yacc variant available.
- In contrast to bison, it is written to avoid dependencies upon a particular compiler.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['ftp://ftp.invisible-island.net/byacc']
-sources = [SOURCELOWER_TGZ]
-checksums = ['f158529be9d0594263c7f11a87616a49ea23e55ac63691252a2304fbbc7d3a83']
-
-builddependencies = [('binutils', '2.37')]
-
-sanity_check_paths = {
-    'files': ["bin/yacc"],
-    'dirs': []
-}
diff --git a/Golden_Repo/b/bzip2/bzip2-1.0.8-GCCcore-11.2.0.eb b/Golden_Repo/b/bzip2/bzip2-1.0.8-GCCcore-11.2.0.eb
deleted file mode 100644
index 4081bc41c..000000000
--- a/Golden_Repo/b/bzip2/bzip2-1.0.8-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,28 +0,0 @@
-name = 'bzip2'
-version = '1.0.8'
-
-homepage = 'https://sourceware.org/bzip2/'
-description = """bzip2 is a freely available, patent free, high-quality data
-compressor. It typically compresses files to within 10% to 15% of the best
-available techniques (the PPM family of statistical compressors), whilst being
-around twice as fast at compression and six times faster at decompression.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://sourceware.org/pub/%(name)s/']
-sources = [SOURCE_TAR_GZ]
-patches = ['bzip2-%(version)s-pkgconfig.patch']
-checksums = [
-    'ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269',  # bzip2-1.0.8.tar.gz
-    # bzip2-1.0.8-pkgconfig.patch
-    '9299e8ee4d014ea973777b6ea90661fe329dfa991f822add4c763ea9ddb9aab1',
-]
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/b/bzip2/bzip2-1.0.8-pkgconfig.patch b/Golden_Repo/b/bzip2/bzip2-1.0.8-pkgconfig.patch
deleted file mode 100644
index ab8d70415..000000000
--- a/Golden_Repo/b/bzip2/bzip2-1.0.8-pkgconfig.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-#- Adds a pkgconfig/bzip2.pc file 
-#
-# author: Jiri Furst <jiri.furst@gmail.com>
-# inspired by OpenSUSE patch by Stanislav Brabec <sbrabec@suse.cz>, see
-# http://ftp.suse.com/pub/people/sbrabec/bzip2/
-diff -Nau bzip2-1.0.8.orig/bzip2.pc.in bzip2-1.0.6/bzip2.pc.in
---- bzip2-1.0.8.orig/bzip2.pc.in	1970-01-01 01:00:00.000000000 +0100
-+++ bzip2-1.0.8/bzip2.pc.in	2019-05-01 11:47:29.795517973 +0200
-@@ -0,0 +1,11 @@
-+exec_prefix=${prefix}
-+bindir=${exec_prefix}/bin
-+libdir=${exec_prefix}/lib
-+includedir=${prefix}/include
-+
-+Name: bzip2
-+Description: Lossless, block-sorting data compression
-+Version: 1.0.8
-+Libs: -L${libdir} -lbz2
-+Cflags: -I${includedir}
-+
-diff -Nau bzip2-1.0.8.orig/Makefile bzip2-1.0.6/Makefile
---- bzip2-1.0.8.orig/Makefile	2019-05-01 11:28:04.788206974 +0200
-+++ bzip2-1.0.8/Makefile	2019-05-01 11:46:20.911324226 +0200
-@@ -107,6 +107,9 @@
- 	echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1
- 	echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1
- 	echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1
-+	if ( test ! -d $(PREFIX)/lib/pkgconfig ) ; then mkdir -p $(PREFIX)/lib/pkgconfig ; fi
-+	echo "prefix=$(PREFIX)" > $(PREFIX)/lib/pkgconfig/bzip2.pc
-+	cat bzip2.pc.in >> $(PREFIX)/lib/pkgconfig/bzip2.pc
- 
- clean: 
- 	rm -f *.o libbz2.a bzip2 bzip2recover \
diff --git a/Golden_Repo/c/CDO/CDO-2.0.2-gompi-2021b.eb b/Golden_Repo/c/CDO/CDO-2.0.2-gompi-2021b.eb
deleted file mode 100644
index 17067bd41..000000000
--- a/Golden_Repo/c/CDO/CDO-2.0.2-gompi-2021b.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'CDO'
-version = '2.0.2'
-
-homepage = 'https://code.zmaw.de/projects/cdo'
-description = """CDO is a collection of command line Operators to manipulate and analyse Climate and NWP model Data."""
-
-toolchain = {'name': 'gompi', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': True}
-
-source_urls = ['https://code.mpimet.mpg.de/attachments/download/26654/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['34dfdd0d4126cfd35fc69e37e60901c8622d13ec5b3fa5f0fe6a1cc866cc5a70']
-
-dependencies = [
-    ('HDF5', '1.12.1'),
-    ('netCDF', '4.8.1'),
-    ('YAXT', '0.9.1'),
-    ('ecCodes', '2.22.1'),
-    ('FFTW', '3.3.10'),
-    ('PROJ', '8.1.0'),
-]
-
-configopts = "--with-hdf5=$EBROOTHDF5 --with-netcdf=$EBROOTNETCDF --with-eccodes=$EBROOTECCODES --with-szlib=yes "
-configopts += " --with-proj=$EBROOTPROJ --with-fftw3 --with-fftw3=$EBROOTFFTW"
-
-# fix for linking issues with HDF5 libraries for libcdi, should link with both -lnetcdf and -lhdf5_hl -lhdf5
-prebuildopts = "find libcdi -name Makefile | xargs sed -i 's/-lnetcdf -lnetcdf/-lnetcdf -lhdf5_hl -lhdf5/g' && "
-
-sanity_check_paths = {
-    'files': ['bin/cdo'],
-    'dirs': [],
-}
-
-moduleclass = 'data'
diff --git a/Golden_Repo/c/CDO/CDO-2.0.2-gpsmpi-2021b.eb b/Golden_Repo/c/CDO/CDO-2.0.2-gpsmpi-2021b.eb
deleted file mode 100644
index fd6690e1d..000000000
--- a/Golden_Repo/c/CDO/CDO-2.0.2-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'CDO'
-version = '2.0.2'
-
-homepage = 'https://code.zmaw.de/projects/cdo'
-description = """CDO is a collection of command line Operators to manipulate and analyse Climate and NWP model Data."""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': True}
-
-source_urls = ['https://code.mpimet.mpg.de/attachments/download/26654/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['34dfdd0d4126cfd35fc69e37e60901c8622d13ec5b3fa5f0fe6a1cc866cc5a70']
-
-dependencies = [
-    ('HDF5', '1.12.1'),
-    ('netCDF', '4.8.1'),
-    ('YAXT', '0.9.1'),
-    ('ecCodes', '2.22.1'),
-    ('FFTW', '3.3.10'),
-    ('PROJ', '8.1.0'),
-]
-
-configopts = "--with-hdf5=$EBROOTHDF5 --with-netcdf=$EBROOTNETCDF --with-eccodes=$EBROOTECCODES --with-szlib=yes "
-configopts += " --with-proj=$EBROOTPROJ --with-fftw3 --with-fftw3=$EBROOTFFTW"
-
-# fix for linking issues with HDF5 libraries for libcdi, should link with both -lnetcdf and -lhdf5_hl -lhdf5
-prebuildopts = "find libcdi -name Makefile | xargs sed -i 's/-lnetcdf -lnetcdf/-lnetcdf -lhdf5_hl -lhdf5/g' && "
-
-sanity_check_paths = {
-    'files': ['bin/cdo'],
-    'dirs': [],
-}
-
-moduleclass = 'data'
diff --git a/Golden_Repo/c/CDO/CDO-2.0.2-iimpi-2021b.eb b/Golden_Repo/c/CDO/CDO-2.0.2-iimpi-2021b.eb
deleted file mode 100644
index e67744e43..000000000
--- a/Golden_Repo/c/CDO/CDO-2.0.2-iimpi-2021b.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'CDO'
-version = '2.0.2'
-
-homepage = 'https://code.zmaw.de/projects/cdo'
-description = """CDO is a collection of command line Operators to manipulate and analyse Climate and NWP model Data."""
-
-toolchain = {'name': 'iimpi', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': True}
-
-source_urls = ['https://code.mpimet.mpg.de/attachments/download/26654/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['34dfdd0d4126cfd35fc69e37e60901c8622d13ec5b3fa5f0fe6a1cc866cc5a70']
-
-dependencies = [
-    ('HDF5', '1.12.1'),
-    ('netCDF', '4.8.1'),
-    ('YAXT', '0.9.1'),
-    ('ecCodes', '2.22.1'),
-    ('FFTW', '3.3.10'),
-    ('PROJ', '8.1.0'),
-]
-
-configopts = "--with-hdf5=$EBROOTHDF5 --with-netcdf=$EBROOTNETCDF --with-eccodes=$EBROOTECCODES --with-szlib=yes "
-configopts += " --with-proj=$EBROOTPROJ --with-fftw3 --with-fftw3=$EBROOTFFTW"
-
-# fix for linking issues with HDF5 libraries for libcdi, should link with both -lnetcdf and -lhdf5_hl -lhdf5
-prebuildopts = "find libcdi -name Makefile | xargs sed -i 's/-lnetcdf -lnetcdf/-lnetcdf -lhdf5_hl -lhdf5/g' && "
-
-sanity_check_paths = {
-    'files': ['bin/cdo'],
-    'dirs': [],
-}
-
-moduleclass = 'data'
diff --git a/Golden_Repo/c/CDO/CDO-2.0.2-iompi-2021b.eb b/Golden_Repo/c/CDO/CDO-2.0.2-iompi-2021b.eb
deleted file mode 100644
index dae493d06..000000000
--- a/Golden_Repo/c/CDO/CDO-2.0.2-iompi-2021b.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'CDO'
-version = '2.0.2'
-
-homepage = 'https://code.zmaw.de/projects/cdo'
-description = """CDO is a collection of command line Operators to manipulate and analyse Climate and NWP model Data."""
-
-toolchain = {'name': 'iompi', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': True}
-
-source_urls = ['https://code.mpimet.mpg.de/attachments/download/26654/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['34dfdd0d4126cfd35fc69e37e60901c8622d13ec5b3fa5f0fe6a1cc866cc5a70']
-
-dependencies = [
-    ('HDF5', '1.12.1'),
-    ('netCDF', '4.8.1'),
-    ('YAXT', '0.9.1'),
-    ('ecCodes', '2.22.1'),
-    ('FFTW', '3.3.10'),
-    ('PROJ', '8.1.0'),
-]
-
-configopts = "--with-hdf5=$EBROOTHDF5 --with-netcdf=$EBROOTNETCDF --with-eccodes=$EBROOTECCODES --with-szlib=yes "
-configopts += " --with-proj=$EBROOTPROJ --with-fftw3 --with-fftw3=$EBROOTFFTW"
-
-# fix for linking issues with HDF5 libraries for libcdi, should link with both -lnetcdf and -lhdf5_hl -lhdf5
-prebuildopts = "find libcdi -name Makefile | xargs sed -i 's/-lnetcdf -lnetcdf/-lnetcdf -lhdf5_hl -lhdf5/g' && "
-
-sanity_check_paths = {
-    'files': ['bin/cdo'],
-    'dirs': [],
-}
-
-moduleclass = 'data'
diff --git a/Golden_Repo/c/CDO/CDO-2.0.2-ipsmpi-2021b.eb b/Golden_Repo/c/CDO/CDO-2.0.2-ipsmpi-2021b.eb
deleted file mode 100644
index feeec64e3..000000000
--- a/Golden_Repo/c/CDO/CDO-2.0.2-ipsmpi-2021b.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'CDO'
-version = '2.0.2'
-
-homepage = 'https://code.zmaw.de/projects/cdo'
-description = """CDO is a collection of command line Operators to manipulate and analyse Climate and NWP model Data."""
-
-toolchain = {'name': 'ipsmpi', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': True}
-
-source_urls = ['https://code.mpimet.mpg.de/attachments/download/26654/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['34dfdd0d4126cfd35fc69e37e60901c8622d13ec5b3fa5f0fe6a1cc866cc5a70']
-
-dependencies = [
-    ('HDF5', '1.12.1'),
-    ('netCDF', '4.8.1'),
-    ('YAXT', '0.9.1'),
-    ('ecCodes', '2.22.1'),
-    ('FFTW', '3.3.10'),
-    ('PROJ', '8.1.0'),
-]
-
-configopts = "--with-hdf5=$EBROOTHDF5 --with-netcdf=$EBROOTNETCDF --with-eccodes=$EBROOTECCODES --with-szlib=yes "
-configopts += " --with-proj=$EBROOTPROJ --with-fftw3 --with-fftw3=$EBROOTFFTW"
-
-# fix for linking issues with HDF5 libraries for libcdi, should link with both -lnetcdf and -lhdf5_hl -lhdf5
-prebuildopts = "find libcdi -name Makefile | xargs sed -i 's/-lnetcdf -lnetcdf/-lnetcdf -lhdf5_hl -lhdf5/g' && "
-
-sanity_check_paths = {
-    'files': ['bin/cdo'],
-    'dirs': [],
-}
-
-moduleclass = 'data'
diff --git a/Golden_Repo/c/CDO/CDO-2.0.2-npsmpic-2021b.eb b/Golden_Repo/c/CDO/CDO-2.0.2-npsmpic-2021b.eb
deleted file mode 100644
index a40229485..000000000
--- a/Golden_Repo/c/CDO/CDO-2.0.2-npsmpic-2021b.eb
+++ /dev/null
@@ -1,37 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'CDO'
-version = '2.0.2'
-
-homepage = 'https://code.zmaw.de/projects/cdo'
-description = """CDO is a collection of command line Operators to manipulate and analyse Climate and NWP model Data."""
-
-toolchain = {'name': 'npsmpic', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': True}
-
-source_urls = ['https://code.mpimet.mpg.de/attachments/download/26654/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['34dfdd0d4126cfd35fc69e37e60901c8622d13ec5b3fa5f0fe6a1cc866cc5a70']
-
-dependencies = [
-    ('HDF5', '1.12.1'),
-    ('netCDF', '4.8.1'),
-    ('YAXT', '0.9.1'),
-    ('ecCodes', '2.22.1'),
-    ('FFTW', '3.3.10'),
-    ('PROJ', '8.1.0'),
-]
-
-preconfigopts = 'LDFLAGS="-pgf90libs $LDFLAGS"'  # fix to build NCL using NVHPC
-configopts = "-with-hdf5=$EBROOTHDF5 --with-netcdf=$EBROOTNETCDF --with-eccodes=$EBROOTECCODES --with-szlib=yes "
-configopts += " --with-proj=$EBROOTPROJ --with-fftw3 --with-fftw3=$EBROOTFFTW"
-
-# fix for linking issues with HDF5 libraries for libcdi, should link with both -lnetcdf and -lhdf5_hl -lhdf5
-prebuildopts = "find libcdi -name Makefile | xargs sed -i 's/-lnetcdf -lnetcdf/-lnetcdf -lhdf5_hl -lhdf5/g' && "
-
-sanity_check_paths = {
-    'files': ['bin/cdo'],
-    'dirs': [],
-}
-
-moduleclass = 'data'
diff --git a/Golden_Repo/c/CDO/CDO-2.0.2-nvompic-2021b.eb b/Golden_Repo/c/CDO/CDO-2.0.2-nvompic-2021b.eb
deleted file mode 100644
index 75ed0f506..000000000
--- a/Golden_Repo/c/CDO/CDO-2.0.2-nvompic-2021b.eb
+++ /dev/null
@@ -1,37 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'CDO'
-version = '2.0.2'
-
-homepage = 'https://code.zmaw.de/projects/cdo'
-description = """CDO is a collection of command line Operators to manipulate and analyse Climate and NWP model Data."""
-
-toolchain = {'name': 'nvompic', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': True}
-
-source_urls = ['https://code.mpimet.mpg.de/attachments/download/26654/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['34dfdd0d4126cfd35fc69e37e60901c8622d13ec5b3fa5f0fe6a1cc866cc5a70']
-
-dependencies = [
-    ('HDF5', '1.12.1'),
-    ('netCDF', '4.8.1'),
-    ('YAXT', '0.9.1'),
-    ('ecCodes', '2.22.1'),
-    ('FFTW', '3.3.10'),
-    ('PROJ', '8.1.0'),
-]
-
-preconfigopts = 'LDFLAGS="-pgf90libs $LDFLAGS"'  # fix to build NCL using NVHPC
-configopts = "-with-hdf5=$EBROOTHDF5 --with-netcdf=$EBROOTNETCDF --with-eccodes=$EBROOTECCODES --with-szlib=yes "
-configopts += " --with-proj=$EBROOTPROJ --with-fftw3 --with-fftw3=$EBROOTFFTW"
-
-# fix for linking issues with HDF5 libraries for libcdi, should link with both -lnetcdf and -lhdf5_hl -lhdf5
-prebuildopts = "find libcdi -name Makefile | xargs sed -i 's/-lnetcdf -lnetcdf/-lnetcdf -lhdf5_hl -lhdf5/g' && "
-
-sanity_check_paths = {
-    'files': ['bin/cdo'],
-    'dirs': [],
-}
-
-moduleclass = 'data'
diff --git a/Golden_Repo/c/CFITSIO/CFITSIO-4.0.0-GCCcore-11.2.0.eb b/Golden_Repo/c/CFITSIO/CFITSIO-4.0.0-GCCcore-11.2.0.eb
deleted file mode 100644
index 50ed4b6df..000000000
--- a/Golden_Repo/c/CFITSIO/CFITSIO-4.0.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,44 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'CFITSIO'
-version = '4.0.0'
-
-homepage = 'http://heasarc.gsfc.nasa.gov/fitsio/'
-description = """CFITSIO is a library of C and Fortran subroutines for reading and writing data files in
-FITS (Flexible Image Transport System) data format.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/']
-sources = ['%%(namelower)s-%s.tar.gz' % version]
-patches = ['CFITSIO-4.0.0_install_test_data.patch']
-checksums = [
-    # cfitsio-4.0.0.tar.gz
-    'b2a8efba0b9f86d3e1bd619f662a476ec18112b4f27cc441cc680a4e3777425e',
-    # CFITSIO-4.0.0_install_test_data.patch
-    '75559db8b0648bc90ea9bb81a74acfd89913236ee0a2daf533477cddd37ea8a6',
-]
-
-dependencies = [('cURL', '7.78.0')]
-
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-# make would create just static libcfitsio.a.
-# Let's create dynamic lib and testprog too.
-buildopts = '&& make shared && make testprog'
-
-sanity_check_paths = {
-    'files': ['lib/libcfitsio.a', 'lib/libcfitsio.%s' % SHLIB_EXT],
-    'dirs': ['include'],
-}
-
-sanity_check_commands = [
-    ('cd %(installdir)s/share && testprog'),
-]
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/c/CFITSIO/CFITSIO-4.0.0_install_test_data.patch b/Golden_Repo/c/CFITSIO/CFITSIO-4.0.0_install_test_data.patch
deleted file mode 100644
index 7437760d4..000000000
--- a/Golden_Repo/c/CFITSIO/CFITSIO-4.0.0_install_test_data.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.in.orig	2021-11-05 17:08:01.927879000 +0100
-+++ Makefile.in	2021-11-05 17:08:42.545401000 +0100
-@@ -31,8 +31,9 @@
- CFITSIO_BIN	= ${DESTDIR}@bindir@
- CFITSIO_LIB	= ${DESTDIR}@libdir@
- CFITSIO_INCLUDE	= ${DESTDIR}@includedir@
--INSTALL_DIRS	= ${DESTDIR}@INSTALL_ROOT@ ${CFITSIO_INCLUDE} ${CFITSIO_LIB} ${CFITSIO_LIB}/pkgconfig
-+CFITSIO_DATADIR = ${DESTDIR}@datadir@
- 
-+INSTALL_DIRS	= ${DESTDIR}@INSTALL_ROOT@ ${CFITSIO_INCLUDE} ${CFITSIO_LIB} ${CFITSIO_LIB}/pkgconfig ${CFITSIO_DATADIR}
- 
- SHELL =		/bin/sh
- ARCHIVE =	@ARCHIVE@
diff --git a/Golden_Repo/c/CGAL/CGAL-5.2-GCCcore-11.2.0.eb b/Golden_Repo/c/CGAL/CGAL-5.2-GCCcore-11.2.0.eb
deleted file mode 100644
index ceec52409..000000000
--- a/Golden_Repo/c/CGAL/CGAL-5.2-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,41 +0,0 @@
-name = 'CGAL'
-version = '5.2'
-
-homepage = 'http://www.cgal.org/'
-description = """The goal of the CGAL Open Source Project is to provide easy access to efficient 
- and reliable geometric algorithms in the form of a C++ library.
- """
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'strict': True}
-
-source_urls = [
-    'https://github.com/%(name)s/%(namelower)s/releases/download/v%(version)s/']
-sources = [SOURCE_TAR_XZ]
-checksums = ['744c86edb6e020ab0238f95ffeb9cf8363d98cde17ebb897d3ea93dac4145923']
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-    ('Eigen', '3.3.9'),
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('Python', '3.9.6'),
-    ('Boost.Python', '1.78.0'),
-    ('MPFR', '4.1.0'),
-    ('GMP', '6.2.1'),
-    ('OpenGL', '2021b'),
-    ('Qt5', '5.15.2'),
-]
-
-configopts = "-DCGAL_HEADER_ONLY=OFF -DCMAKE_BUILD_TYPE=Release "
-configopts += "-DOPENGL_INCLUDE_DIR=$EBROOTOPENGL/include\; "
-configopts += "-DOPENGL_gl_LIBRARY=$EBROOTOPENGL/lib/libGL.%s " % SHLIB_EXT
-configopts += "-DOPENGL_glu_LIBRARY=$EBROOTOPENGL/lib/libGLU.%s " % SHLIB_EXT
-configopts += "-DWITH_ZLIB=ON -DWITH_MPFR=ON -DWITH_OpenGL=ON -DWITH_Eigen3=ON "
-configopts += "-DWITH_GMPXX=ON "
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/c/CGNS/CGNS-4.2.0-gpsmpi-2021b.eb b/Golden_Repo/c/CGNS/CGNS-4.2.0-gpsmpi-2021b.eb
deleted file mode 100644
index 9aa510720..000000000
--- a/Golden_Repo/c/CGNS/CGNS-4.2.0-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-# easyconfig file for CGNS library
-easyblock = 'CMakeMake'
-
-name = 'CGNS'
-version = '4.2.0'
-
-homepage = 'https://cgns.github.io/'
-description = """The CGNS system is designed to facilitate the exchange
-of data between sites and applications, and to help stabilize the archiving
-of aerodynamic data."""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-toolchainopts = {'optarch': True, 'pic': True, 'usempi': True}
-
-source_urls = ['https://github.com/CGNS/CGNS/archive/refs/tags/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['090ec6cb0916d90c16790183fc7c2bd2bd7e9a5e3764b36c8196ba37bf1dc817']
-
-dependencies = [
-    ('HDF5', '1.12.1'),
-]
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-]
-
-sanity_check_paths = {
-    'files': ["bin/%s" % x for x in ["cgnscheck", "cgnscompress",
-              "cgnsconvert", "cgnsdiff", "cgnslist", "cgnsnames",
-                                                     "cgnsupdate"]],
-    'dirs': [],
-}
-
-moduleclass = 'cae'
diff --git a/Golden_Repo/c/CMake/CMake-3.21.1-GCCcore-11.2.0.eb b/Golden_Repo/c/CMake/CMake-3.21.1-GCCcore-11.2.0.eb
deleted file mode 100644
index c8ec80e74..000000000
--- a/Golden_Repo/c/CMake/CMake-3.21.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,30 +0,0 @@
-name = 'CMake'
-version = '3.21.1'
-
-homepage = 'https://www.cmake.org'
-
-description = """
-CMake, the cross-platform, open-source build system.  CMake is a family of
-tools designed to build, test and package software.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://www.cmake.org/files/v%(version_major_minor)s']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('ncurses', '6.2'),
-    ('zlib', '1.2.11'),
-    ('bzip2', '1.0.8'),
-    ('cURL', '7.78.0'),
-    ('libarchive', '3.5.1'),
-    ('OpenSSL', '1.1', '', True),
-]
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/c/CMake/CMake-3.21.1.eb b/Golden_Repo/c/CMake/CMake-3.21.1.eb
deleted file mode 100644
index 7a6c44f98..000000000
--- a/Golden_Repo/c/CMake/CMake-3.21.1.eb
+++ /dev/null
@@ -1,28 +0,0 @@
-name = 'CMake'
-version = '3.21.1'
-
-homepage = 'https://www.cmake.org'
-
-description = """
-CMake, the cross-platform, open-source build system.  CMake is a family of
-tools designed to build, test and package software.
-"""
-
-toolchain = SYSTEM
-
-source_urls = ['https://www.cmake.org/files/v%(version_major_minor)s']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('ncurses', '6.2'),
-    ('OpenSSL', '1.1', '', True),
-]
-
-hidden = True
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/c/CMake/CMake-3.23.1-GCCcore-11.2.0.eb b/Golden_Repo/c/CMake/CMake-3.23.1-GCCcore-11.2.0.eb
deleted file mode 100644
index 3d966ce0c..000000000
--- a/Golden_Repo/c/CMake/CMake-3.23.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,30 +0,0 @@
-name = 'CMake'
-version = '3.23.1'
-
-homepage = 'https://www.cmake.org'
-
-description = """
-CMake, the cross-platform, open-source build system.  CMake is a family of
-tools designed to build, test and package software.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://www.cmake.org/files/v%(version_major_minor)s']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['33fd10a8ec687a4d0d5b42473f10459bb92b3ae7def2b745dc10b192760869f3']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('ncurses', '6.2'),
-    ('zlib', '1.2.11'),
-    ('bzip2', '1.0.8'),
-    ('cURL', '7.78.0'),
-    ('libarchive', '3.5.1'),
-    ('OpenSSL', '1.1', '', True),
-]
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/c/CP2K/CP2K-8.2.0-intel-para-2021b.eb b/Golden_Repo/c/CP2K/CP2K-8.2.0-intel-para-2021b.eb
deleted file mode 100644
index 250241c88..000000000
--- a/Golden_Repo/c/CP2K/CP2K-8.2.0-intel-para-2021b.eb
+++ /dev/null
@@ -1,94 +0,0 @@
-name = 'CP2K'
-version = '8.2.0'
-
-homepage = 'http://www.cp2k.org/'
-description = """CP2K is a freely available (GPL) program, written in Fortran 95, to perform atomistic and molecular
- simulations of solid state, liquid, molecular and biological systems. It provides a general framework for different
- methods such as e.g. density functional theory (DFT) using a mixed Gaussian and plane waves approach (GPW), and
- classical pair and many-body potentials. 
- The default eigensolver is set to Scalapack. This setting can be overridden by specifiying 
- PREFERRED_DIAG_LIBRARY ELPA in the global section of the cp2k input. Note, that application-dependent 
- - in particular for small basis sizes - the use of the ELPA eigensolver library can cause dead-locks:
- the program might be killed with a corresponding message from the MPI library ( parastation mpi) 
- or even hang (openmpi). The user is advised to check whether the particular application is prone to 
- deadlocks if ELPA is switched on.
- The Libvori library for  Voronoi integration and the BQB compressed volumetric trajectory data is included
- (https://brehm-research.de/voronoi, https://brehm-research.de/bqb).
- Tree-Monte-Carlo is disfunctional;
-"""
-
-toolchain = {'name': 'intel-para', 'version': '2021b'}
-toolchainopts = {'pic': True, 'openmp': True}
-
-local_dbcsr_version = '2.1.0m'
-local_libvori_version = '-210412'
-
-sources = [
-    'v%(version)s.tar.gz',
-    'v%s.tar.gz' % local_dbcsr_version,
-    'libvori%s.tar.gz' % local_libvori_version,
-]
-source_urls = [
-    'https://github.com/cp2k/cp2k/archive/',
-    'https://github.com/cp2k/dbcsr/archive/'
-]
-
-patches = [
-    'CP2K-8.2_fftw3_lib.patch',
-    'CP2K-8.2_elpa.patch',
-]
-
-checksums = [
-    'd82c554e764dc16f94c1f671d0cf6523be58360bf9a2d2cbabbad0e73fbcffb2',
-    'ba6b53dae5afaccd5d80199c61989ab34405608b50bef16577f780a86518e6b8',
-    '331886aea9d093d8c44b95a07fab13d47f101b1f94a0640d7d670eb722bf90ac',
-    'a8f484930953c3689b4bffbb45d1d3e9abec69a7425b79dfb2d2b64459359c97',
-    '33c765f5e119541d943c0d9386059e1ef6f82ca1f2e9490adeca6b86656b5b2d'
-]
-
-dependencies = [
-    ('ELPA', '2021.11.001'),
-    ('Libint', '2.7.0-beta.6', '_cp2k_lmax5', ('intel-compilers', '2021.4.0')),
-    ('libxsmm', '1.16.3', '', ('intel-compilers', '2021.4.0')),
-    ('libxc', '5.1.7', '', ('intel-compilers', '2021.4.0')),
-    ('FFTW', '3.3.10'),
-    ('PLUMED', '2.7.2'),
-]
-
-builddependencies = [
-    ('flex', '2.6.4'),
-    ('Bison', '3.7.6'),
-    ('CMake', '3.21.1'),
-    ('Python', '3.9.6', '', ('GCCcore', '11.2.0')),
-]
-
-
-# Add PLUMED support
-plumed = True
-
-# Disable CUDA
-cuda = False
-
-# explicit unrolled loops up to __MAX_CONTR, 4 gives excessive compiler times
-configopts = '-D__MAX_CONTR=3'
-
-# popt or psmp
-type = 'psmp'
-
-# run tests separately (2 nodes of juwels approx 1 hour)
-runtest = False
-
-# which dbcsr_version
-dbcsr_version = '2.1.0'
-
-# additional DFLAGS
-extradflags = '-D__MKL -D__LIBVORI'
-
-# regression test reports failures
-ignore_regtest_fails = False
-
-modextravars = {
-    'CP2K_DATA_DIR': '%(installdir)s/data',
-}
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/c/CP2K/CP2K-8.2.0-iomkl-2021b.eb b/Golden_Repo/c/CP2K/CP2K-8.2.0-iomkl-2021b.eb
deleted file mode 100644
index 19d13eccc..000000000
--- a/Golden_Repo/c/CP2K/CP2K-8.2.0-iomkl-2021b.eb
+++ /dev/null
@@ -1,94 +0,0 @@
-name = 'CP2K'
-version = '8.2.0'
-
-homepage = 'http://www.cp2k.org/'
-description = """CP2K is a freely available (GPL) program, written in Fortran 95, to perform atomistic and molecular
- simulations of solid state, liquid, molecular and biological systems. It provides a general framework for different
- methods such as e.g. density functional theory (DFT) using a mixed Gaussian and plane waves approach (GPW), and
- classical pair and many-body potentials. 
- The default eigensolver is set to Scalapack. This setting can be overridden by specifiying 
- PREFERRED_DIAG_LIBRARY ELPA in the global section of the cp2k input. Note, that application-dependent 
- - in particular for small basis sizes - the use of the ELPA eigensolver library can cause dead-locks:
- the program might be killed with a corresponding message from the MPI library ( parastation mpi) 
- or even hang (openmpi). The user is advised to check whether the particular application is prone to 
- deadlocks if ELPA is switched on.
- The Libvori library for  Voronoi integration and the BQB compressed volumetric trajectory data is included
- (https://brehm-research.de/voronoi, https://brehm-research.de/bqb).
- Tree-Monte-Carlo is disfunctional;
-"""
-
-toolchain = {'name': 'iomkl', 'version': '2021b'}
-toolchainopts = {'pic': True, 'openmp': True}
-
-local_dbcsr_version = '2.1.0m'
-local_libvori_version = '-210412'
-
-sources = [
-    'v%(version)s.tar.gz',
-    'v%s.tar.gz' % local_dbcsr_version,
-    'libvori%s.tar.gz' % local_libvori_version,
-]
-source_urls = [
-    'https://github.com/cp2k/cp2k/archive/',
-    'https://github.com/cp2k/dbcsr/archive/'
-]
-
-patches = [
-    'CP2K-8.2_fftw3_lib.patch',
-    'CP2K-8.2_elpa.patch',
-]
-
-checksums = [
-    'd82c554e764dc16f94c1f671d0cf6523be58360bf9a2d2cbabbad0e73fbcffb2',
-    'ba6b53dae5afaccd5d80199c61989ab34405608b50bef16577f780a86518e6b8',
-    '331886aea9d093d8c44b95a07fab13d47f101b1f94a0640d7d670eb722bf90ac',
-    'a8f484930953c3689b4bffbb45d1d3e9abec69a7425b79dfb2d2b64459359c97',
-    '33c765f5e119541d943c0d9386059e1ef6f82ca1f2e9490adeca6b86656b5b2d'
-]
-
-dependencies = [
-    ('ELPA', '2021.11.001'),
-    ('Libint', '2.7.0-beta.6', '_cp2k_lmax5', ('intel-compilers', '2021.4.0')),
-    ('libxsmm', '1.16.3', '', ('intel-compilers', '2021.4.0')),
-    ('libxc', '5.1.7', '', ('intel-compilers', '2021.4.0')),
-    ('FFTW', '3.3.10'),
-    ('PLUMED', '2.7.2'),
-]
-
-builddependencies = [
-    ('flex', '2.6.4'),
-    ('Bison', '3.7.6'),
-    ('CMake', '3.21.1'),
-    ('Python', '3.9.6', '', ('GCCcore', '11.2.0')),
-]
-
-
-# Add PLUMED support
-plumed = True
-
-# Disable CUDA
-cuda = False
-
-# explicit unrolled loops up to __MAX_CONTR, 4 gives excessive compiler times
-configopts = '-D__MAX_CONTR=3'
-
-# popt or psmp
-type = 'psmp'
-
-# run tests separately (2 nodes of juwels approx 1 hour)
-runtest = False
-
-# which dbcsr_version
-dbcsr_version = '2.1.0'
-
-# additional DFLAGS
-extradflags = '-D__MKL -D__LIBVORI'
-
-# regression test reports failures
-ignore_regtest_fails = False
-
-modextravars = {
-    'CP2K_DATA_DIR': '%(installdir)s/data',
-}
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/c/CP2K/CP2K-9.1.0-intel-para-2021b.eb b/Golden_Repo/c/CP2K/CP2K-9.1.0-intel-para-2021b.eb
deleted file mode 100644
index 3ce9ed501..000000000
--- a/Golden_Repo/c/CP2K/CP2K-9.1.0-intel-para-2021b.eb
+++ /dev/null
@@ -1,95 +0,0 @@
-name = 'CP2K'
-version = '9.1.0'
-
-homepage = 'http://www.cp2k.org/'
-description = """CP2K is a freely available (GPL) program, written in Fortran 95, to perform atomistic and molecular
- simulations of solid state, liquid, molecular and biological systems. It provides a general framework for different
- methods such as e.g. density functional theory (DFT) using a mixed Gaussian and plane waves approach (GPW), and
- classical pair and many-body potentials. 
- The default eigensolver is set to Scalapack. This setting can be overridden by specifiying 
- PREFERRED_DIAG_LIBRARY ELPA in the global section of the cp2k input. Note, that application-dependent 
- - in particular for small basis sizes - the use of the ELPA eigensolver library can cause dead-locks:
- the program might be killed with a corresponding message from the MPI library ( parastation mpi) 
- or even hang (openmpi). The user is advised to check whether the particular application is prone to 
- deadlocks if ELPA is switched on.
- The Libvori library for  Voronoi integration and the BQB compressed volumetric trajectory data is included
- (https://brehm-research.de/voronoi, https://brehm-research.de/bqb).
- Tree-Monte-Carlo is disfunctional; this is the hybrid MPI/OpenMP version of CP2K.
-"""
-
-toolchain = {'name': 'intel-para', 'version': '2021b'}
-toolchainopts = {'pic': True, 'openmp': True}
-
-# which dbcsr_version
-dbcsr_version = '2.2.0'
-local_libvori_version = '-210412'
-
-sources = [
-    'v%(version)s.tar.gz',
-    'v%s.tar.gz' % dbcsr_version,
-    'libvori%s.tar.gz' % local_libvori_version,
-]
-source_urls = [
-    'https://github.com/cp2k/cp2k/archive/',
-    'https://github.com/cp2k/dbcsr/archive/'
-]
-
-patches = [
-    'CP2K-9.1_fftw3_lib.patch',
-    'CP2K-9.1_elpa.patch',
-    'CP2K-9.1_dbcsr.patch',
-]
-
-checksums = [
-    'e0cd859e506435a38454eeaaa3bc2c1656ffd5d22698062957c84f8b4f426126',
-    '96ce3c630b78529b9cf063b6d710a682a9c6702a6e74d642e7f469d754f954a5',
-    '331886aea9d093d8c44b95a07fab13d47f101b1f94a0640d7d670eb722bf90ac',
-    '1b7674b0046d329f9913ed99e92b53481e878a04a4856c817228d4816d0ea624',
-    '33c765f5e119541d943c0d9386059e1ef6f82ca1f2e9490adeca6b86656b5b2d',
-    'c480c46d31290056079f6a9d5fa17454d34169d1a7850af22378dd794257c3b7'
-]
-
-dependencies = [
-    ('ELPA', '2021.11.001'),
-    ('Libint', '2.7.0-beta.6', '_cp2k_lmax5', ('intel-compilers', '2021.4.0')),
-    ('libxsmm', '1.16.3', '', ('intel-compilers', '2021.4.0')),
-    ('libxc', '5.1.7', '', ('intel-compilers', '2021.4.0')),
-    ('FFTW', '3.3.10'),
-    ('PLUMED', '2.7.2'),
-]
-
-builddependencies = [
-    ('flex', '2.6.4'),
-    ('Bison', '3.7.6'),
-    ('CMake', '3.21.1'),
-    ('Python', '3.9.6', '', ('GCCcore', '11.2.0')),
-]
-
-
-# Add PLUMED support
-plumed = True
-
-# Disable CUDA
-cuda = False
-
-# explicit unrolled loops up to __MAX_CONTR, 4 gives excessive compiler times
-configopts = '-D__MAX_CONTR=3'
-
-# popt or psmp
-type = 'psmp'
-
-# run tests separately (2 nodes of juwels approx 1 hour)
-runtest = False
-
-
-# additional DFLAGS
-extradflags = '-D__MKL -D__LIBVORI'
-
-# regression test reports failures
-ignore_regtest_fails = False
-
-modextravars = {
-    'CP2K_DATA_DIR': '%(installdir)s/data',
-}
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/c/CP2K/CP2K-9.1.0-iomkl-2021b.eb b/Golden_Repo/c/CP2K/CP2K-9.1.0-iomkl-2021b.eb
deleted file mode 100644
index c2a37d0c3..000000000
--- a/Golden_Repo/c/CP2K/CP2K-9.1.0-iomkl-2021b.eb
+++ /dev/null
@@ -1,95 +0,0 @@
-name = 'CP2K'
-version = '9.1.0'
-
-homepage = 'http://www.cp2k.org/'
-description = """CP2K is a freely available (GPL) program, written in Fortran 95, to perform atomistic and molecular
- simulations of solid state, liquid, molecular and biological systems. It provides a general framework for different
- methods such as e.g. density functional theory (DFT) using a mixed Gaussian and plane waves approach (GPW), and
- classical pair and many-body potentials. 
- The default eigensolver is set to Scalapack. This setting can be overridden by specifiying 
- PREFERRED_DIAG_LIBRARY ELPA in the global section of the cp2k input. Note, that application-dependent 
- - in particular for small basis sizes - the use of the ELPA eigensolver library can cause dead-locks:
- the program might be killed with a corresponding message from the MPI library ( parastation mpi) 
- or even hang (openmpi). The user is advised to check whether the particular application is prone to 
- deadlocks if ELPA is switched on.
- The Libvori library for  Voronoi integration and the BQB compressed volumetric trajectory data is included
- (https://brehm-research.de/voronoi, https://brehm-research.de/bqb).
- Tree-Monte-Carlo is disfunctional; this is the hybrid MPI/OpenMP version of CP2K.
-"""
-
-toolchain = {'name': 'iomkl', 'version': '2021b'}
-toolchainopts = {'pic': True, 'openmp': True}
-
-# which dbcsr_version
-dbcsr_version = '2.2.0'
-local_libvori_version = '-210412'
-
-sources = [
-    'v%(version)s.tar.gz',
-    'v%s.tar.gz' % dbcsr_version,
-    'libvori%s.tar.gz' % local_libvori_version,
-]
-source_urls = [
-    'https://github.com/cp2k/cp2k/archive/',
-    'https://github.com/cp2k/dbcsr/archive/'
-]
-
-patches = [
-    'CP2K-9.1_fftw3_lib.patch',
-    'CP2K-9.1_elpa.patch',
-    'CP2K-9.1_dbcsr.patch',
-]
-
-checksums = [
-    'e0cd859e506435a38454eeaaa3bc2c1656ffd5d22698062957c84f8b4f426126',
-    '96ce3c630b78529b9cf063b6d710a682a9c6702a6e74d642e7f469d754f954a5',
-    '331886aea9d093d8c44b95a07fab13d47f101b1f94a0640d7d670eb722bf90ac',
-    '1b7674b0046d329f9913ed99e92b53481e878a04a4856c817228d4816d0ea624',
-    '33c765f5e119541d943c0d9386059e1ef6f82ca1f2e9490adeca6b86656b5b2d',
-    'c480c46d31290056079f6a9d5fa17454d34169d1a7850af22378dd794257c3b7'
-]
-
-dependencies = [
-    ('ELPA', '2021.11.001'),
-    ('Libint', '2.7.0-beta.6', '_cp2k_lmax5', ('intel-compilers', '2021.4.0')),
-    ('libxsmm', '1.16.3', '', ('intel-compilers', '2021.4.0')),
-    ('libxc', '5.1.7', '', ('intel-compilers', '2021.4.0')),
-    ('FFTW', '3.3.10'),
-    ('PLUMED', '2.7.2'),
-]
-
-builddependencies = [
-    ('flex', '2.6.4'),
-    ('Bison', '3.7.6'),
-    ('CMake', '3.21.1'),
-    ('Python', '3.9.6', '', ('GCCcore', '11.2.0')),
-]
-
-
-# Add PLUMED support
-plumed = True
-
-# Disable CUDA
-cuda = False
-
-# explicit unrolled loops up to __MAX_CONTR, 4 gives excessive compiler times
-configopts = '-D__MAX_CONTR=3'
-
-# popt or psmp
-type = 'psmp'
-
-# run tests separately (2 nodes of juwels approx 1 hour)
-runtest = False
-
-
-# additional DFLAGS
-extradflags = '-D__MKL -D__LIBVORI'
-
-# regression test reports failures
-ignore_regtest_fails = False
-
-modextravars = {
-    'CP2K_DATA_DIR': '%(installdir)s/data',
-}
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/c/CPMD/CPMD-4.3-intel-2021b.eb b/Golden_Repo/c/CPMD/CPMD-4.3-intel-2021b.eb
deleted file mode 100644
index 50de59477..000000000
--- a/Golden_Repo/c/CPMD/CPMD-4.3-intel-2021b.eb
+++ /dev/null
@@ -1,69 +0,0 @@
-name = 'CPMD'
-version = '4.3'
-
-homepage = 'http://cpmd.org'
-description = """The CPMD code is a parallelized plane wave / pseudopotential
-implementation of Density Functional Theory, particularly designed for
-ab-initio molecular dynamics.
-"""
-
-toolchain = {'name': 'intel', 'version': '2021b'}
-toolchainopts = {'usempi': True}
-
-# This package requires registration prior to download. Having registered,
-# you can download the source code from http://cpmd.org/download, then put
-# it in your local sources directory.
-sources = [
-    '%(namelower)s-v%(version)s.tar.gz',
-    'pseudo-extlib.tar.gz',
-    'pseudo_std.tar.gz',
-    'pseudo_vdb.tar.gz',
-    'cpmd4.3_manual.pdf'
-]
-
-# These	patches	are on the source directory, not on the	git repo, as they come from CPMD
-patches = [
-    '%(namelower)s-v%(version)s-4612.patch',
-    '%(namelower)s-v%(version)s-4615.patch',
-    '%(namelower)s-v%(version)s-4616.patch',
-    '%(namelower)s-v%(version)s-4621.patch',
-    '%(namelower)s-v%(version)s-4624.patch',
-    'cppflags.patch',
-    '%(namelower)s-v%(version)s-config.patch'
-]
-
-checksums = [
-    '4f31ddf045f1ae5d6f25559d85ddbdab4d7a6200362849df833632976d095df4',
-    '547f9b96b3b0bc7578d4682ec7c7040303d8b6ccaa34f8dafdfdb528818071be',
-    '0de6e6b465f91e12988e9869039f490b65dab1508615c4b008012989548b96c2',
-    '56c4f5d5b4c1ca1923c169fa6cabaddfae11f0ae897dd5cdc4aedff1b0c2b864',
-    '2bfe01db05df1cb21cc8eae500da92b7744c786beeef25e6b2c86116ffc2e135',
-    '3b7d91e04c40418ad958069234ec7253fbf6c4be361a1d5cfd804774eeb44915',
-    '5ec5790fb6ca64632bcc1b0f5b8f3423c54455766a0979ff4136624bbe8d49eb',
-    'ac0bc215c4259f55da4dc59803fe636f797e241f8a01974e05730c9778ad44c4',
-    '2d2bc7e37246032fc354f51da7dbdb5a219dd228867399931b0e94da1265d5ca',
-    '0a19687528264bf91c9f50ffdc0b920a8511eecf5259b667c8c29350f9dabc53',
-    '36c57801d5643c5e07f81ce7d4e973ae2e3100fb61220bccbbe4de3629c20d8c',
-    '45719bf7ca0c567c9c78b3f23201976fceda565d47fea2d1bc998b72fdc53caa'
-]
-
-prefix_opt = '-DEST='
-
-postinstallcmds = [
-    'rm -rf %(installdir)s/obj',
-    'mkdir %(installdir)s/doc',
-    'cp %(builddir)s/cpmd4.3_manual.pdf %(installdir)s/doc'
-]
-
-group = "cpmd"
-
-sanity_check_paths = {
-    'files': ['bin/cpmd.x', 'lib/libcpmd.a'],
-    'dirs': ['bin', 'lib'],
-}
-
-modloadmsg = 'MPI-Version: cpmd.x \n'
-modloadmsg += '\n'
-modloadmsg += 'NOTE: This software is restricted to members of the group cpmd\n'
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/c/CPMD/CPMD-4.3-intel-para-2021bhybrid.eb b/Golden_Repo/c/CPMD/CPMD-4.3-intel-para-2021bhybrid.eb
deleted file mode 100644
index 6c1d10c19..000000000
--- a/Golden_Repo/c/CPMD/CPMD-4.3-intel-para-2021bhybrid.eb
+++ /dev/null
@@ -1,71 +0,0 @@
-name = 'CPMD'
-version = '4.3'
-versionsuffix = 'hybrid'
-
-homepage = 'http://cpmd.org'
-description = """The CPMD code is a parallelized plane wave / pseudopotential
-implementation of Density Functional Theory, particularly designed for
-ab-initio molecular dynamics.
-"""
-
-
-toolchain = {'name': 'intel-para', 'version': '2021b'}
-toolchainopts = {'usempi': True, 'openmp': True}
-
-# This package requires registration prior to download. Having registered,
-# you can download the source code from http://cpmd.org/download, then put
-# it in your local sources directory.
-sources = [
-    '%(namelower)s-v%(version)s.tar.gz',
-    'pseudo-extlib.tar.gz',
-    'pseudo_std.tar.gz',
-    'pseudo_vdb.tar.gz',
-    'cpmd4.3_manual.pdf'
-]
-
-# These	patches	are on the source directory, not on the	git repo, as they come from CPMD
-patches = [
-    '%(namelower)s-v%(version)s-4612.patch',
-    '%(namelower)s-v%(version)s-4615.patch',
-    '%(namelower)s-v%(version)s-4616.patch',
-    '%(namelower)s-v%(version)s-4621.patch',
-    '%(namelower)s-v%(version)s-4624.patch',
-    'cppflags.patch',
-    '%(namelower)s-v%(version)s-config.patch'
-]
-
-checksums = [
-    '4f31ddf045f1ae5d6f25559d85ddbdab4d7a6200362849df833632976d095df4',
-    '547f9b96b3b0bc7578d4682ec7c7040303d8b6ccaa34f8dafdfdb528818071be',
-    '0de6e6b465f91e12988e9869039f490b65dab1508615c4b008012989548b96c2',
-    '56c4f5d5b4c1ca1923c169fa6cabaddfae11f0ae897dd5cdc4aedff1b0c2b864',
-    '2bfe01db05df1cb21cc8eae500da92b7744c786beeef25e6b2c86116ffc2e135',
-    '3b7d91e04c40418ad958069234ec7253fbf6c4be361a1d5cfd804774eeb44915',
-    '5ec5790fb6ca64632bcc1b0f5b8f3423c54455766a0979ff4136624bbe8d49eb',
-    'ac0bc215c4259f55da4dc59803fe636f797e241f8a01974e05730c9778ad44c4',
-    '2d2bc7e37246032fc354f51da7dbdb5a219dd228867399931b0e94da1265d5ca',
-    '0a19687528264bf91c9f50ffdc0b920a8511eecf5259b667c8c29350f9dabc53',
-    '36c57801d5643c5e07f81ce7d4e973ae2e3100fb61220bccbbe4de3629c20d8c',
-    '45719bf7ca0c567c9c78b3f23201976fceda565d47fea2d1bc998b72fdc53caa'
-]
-
-prefix_opt = '-omp -DEST='
-
-postinstallcmds = [
-    'rm -rf %(installdir)s/obj',
-    'mkdir %(installdir)s/doc',
-    'cp %(builddir)s/cpmd4.3_manual.pdf %(installdir)s/doc'
-]
-
-group = "cpmd"
-
-sanity_check_paths = {
-    'files': ['bin/cpmd.x', 'lib/libcpmd.a'],
-    'dirs': ['bin', 'lib'],
-}
-
-modloadmsg = 'MPI-Version: cpmd.x \n'
-modloadmsg += '\n'
-modloadmsg += 'NOTE: This software is restricted to members of the group cpmd\n'
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/c/CPMD/cpmd-v4.3-config.patch b/Golden_Repo/c/CPMD/cpmd-v4.3-config.patch
deleted file mode 100644
index 78cbb8e59..000000000
--- a/Golden_Repo/c/CPMD/cpmd-v4.3-config.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- CPMD/configure/LINUX-X86_64-INTEL-MPI-FFTW	2022-01-25 16:09:38.049050000 +0100
-+++ CPMD.patched/configure/LINUX-X86_64-INTEL-MPI-FFTW	2022-01-25 15:45:03.803830000 +0100
-@@ -11,29 +11,25 @@
- #INFO#
- 
-      IRAT=2
--     FC='mpif90'
--     CC='icc'
--     LD='mpif90'
-+#     FC='mpif90'
-+#     CC='icc'
-+     LD='$(FC)'
-      FFLAGS_GROMOS='$(FFLAGS) -fixed'
-      FFLAGS_GROMOS_MODULES='$(FFLAGS)'
-      CPP='/usr/bin/cpp -P -C -traditional'
-      CPPFLAGS='-D__Linux -D__HAS_FFT_FFTW3 -D__PARALLEL -DLINUX_IFC -D__HASNT_OMP_45 -D__HASNT_F03_EXECUTE_COMMAND_LINE -D__HASNT_F08_ISO_FORTRAN_ENV -D_HASNT_MPI_30'
-      NOOPT_FLAG=' -O1 '
-      NOOPT_OBJS=' jrotation_utils.mod.o '
--     AR='/usr/bin/ar ruv'
--     RANLIB='/usr/bin/ranlib'
-+     AR='ar ruv'
-+     RANLIB='ranlib'
-      if [ $debug ]; then
-        FFLAGS='-g -O0 -I$(MKLROOT)/include/fftw -gen_interfaces -traceback -check all,noarg_temp_created '
-        CFLAGS='-g -O0 '
-      else
--       FFLAGS='-O2 -I$(MKLROOT)/include/fftw -axAVX'
-+       FFLAGS='-O2 -I$(MKLROOT)/include/fftw'
-        CFLAGS='-O2'
-      fi
-      if [ $omp ]; then
--       FFLAGS=${FFLAGS}' -openmp '
--       LIBS='-mkl=parallel -axAVX'
--       OMP3_DISABLED=`{ ${FC} -v; } 2>&1 | ${AWK} '{ print ( $2 < "12.0.4" ) ? "true" : "false" }'`
--     else
--       LIBS='-mkl=sequential -axAVX'
-+       OMP3_DISABLED='true'
-      fi
--     LFLAGS='-static-intel '${LIBS}
-+     LFLAGS=${LIBS}
diff --git a/Golden_Repo/c/CUDA/CUDA-11.5.eb b/Golden_Repo/c/CUDA/CUDA-11.5.eb
deleted file mode 100644
index 36a22cc46..000000000
--- a/Golden_Repo/c/CUDA/CUDA-11.5.eb
+++ /dev/null
@@ -1,48 +0,0 @@
-name = 'CUDA'
-version = '11.5'
-local_complete_version = '%(version)s.0'
-
-homepage = 'https://developer.nvidia.com/cuda-toolkit'
-description = """CUDA (formerly Compute Unified Device Architecture) is a parallel
- computing platform and programming model created by NVIDIA and implemented by the
- graphics processing units (GPUs) that they produce. CUDA gives developers access
- to the virtual instruction set and memory of the parallel computational elements
- in CUDA GPUs.
-"""
-
-site_contacts = 'sc@fz-juelich.de'
-
-toolchain = SYSTEM
-
-source_urls = [
-    'https://developer.download.nvidia.com/compute/cuda/%s/local_installers/' % local_complete_version,
-    'https://developer.download.nvidia.com/compute/cuda/%(version_major_minor)s/Prod/local_installers/',
-    'https://developer.nvidia.com/compute/cuda/%(version_major_minor)s/prod/local_installers/',
-    'https://developer.nvidia.com/compute/cuda/%(version_major_minor)s/Prod2/local_installers/',
-]
-sources = [
-    '%%(namelower)s_%s_495.29.05_linux%%(cudaarch)s.run' % local_complete_version,
-]
-# checksums = ['ae0a1693d9497cf3d81e6948943e3794636900db71c98d58eefdacaf7f1a1e4c']
-checksums = [
-    {
-        '%%(namelower)s_%s_495.29.05_linux.run' % local_complete_version:
-            'ae0a1693d9497cf3d81e6948943e3794636900db71c98d58eefdacaf7f1a1e4c',
-        '%%(namelower)s_%s_495.29.05_linux_ppc64le.run' % local_complete_version:
-            '95baefdc5adf165189407b119861ffb2e9800fd94d7fc81d10fb81ed36dc12db',
-        '%%(namelower)s_%s_495.29.05_linux_sbsa.run' % local_complete_version:
-            '6ea9d520cc956cc751a5ac54f4acc39109627f4e614dd0b1a82cc86f2aa7d8c4',
-    }
-]
-
-dependencies = [
-    ('nvidia-driver', 'default', '', SYSTEM),
-]
-
-installopts = '--samplespath=%(installdir)s --samples'
-
-modluafooter = '''
-add_property("arch","gpu")
-'''
-
-moduleclass = 'system'
diff --git a/Golden_Repo/c/CVS/CVS-1.11.23-GCCcore-11.2.0.eb b/Golden_Repo/c/CVS/CVS-1.11.23-GCCcore-11.2.0.eb
deleted file mode 100644
index 660f6035e..000000000
--- a/Golden_Repo/c/CVS/CVS-1.11.23-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,45 +0,0 @@
-##
-# This file is an EasyBuild reciPY as per https://github.com/easybuilders/easybuild
-#
-##
-
-easyblock = 'ConfigureMake'
-
-name = 'CVS'
-version = '1.11.23'
-
-homepage = 'https://savannah.nongnu.org/projects/cvs'
-description = """CVS is a version control system, an important component of
-Source Configuration Management (SCM).
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [' http://ftp.gnu.org/non-gnu/cvs/source/stable/%(version)s/']
-sources = [SOURCELOWER_TAR_BZ2]
-patches = [
-    'CVS-1.11.23-zlib-1.patch',
-    'CVS-1.11.23-getline.patch',
-]
-checksums = [
-    '400f51b59d85116e79b844f2d5dbbad4759442a789b401a94aa5052c3d7a4aa9',  # cvs-1.11.23.tar.bz2
-    # CVS-1.11.23-zlib-1.patch
-    '3c0ee6509c4622778c093316437a5b047c51820e11cee3ed3a405c2a590a9ff4',
-    # CVS-1.11.23-getline.patch
-    '6a1aa65acfbb41b7639adc70248d908981f172c2529bb52d84359713f9541874',
-]
-
-builddependencies = [
-    ('binutils', '2.37')
-]
-
-dependencies = [
-    ('zlib', '1.2.11')
-]
-
-sanity_check_paths = {
-    'files': ['bin/cvs', 'bin/cvsbug', 'bin/rcs2log'],
-    'dirs': [],
-}
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/c/CVXOPT/CVXOPT-1.2.1-fix-setup-py.patch b/Golden_Repo/c/CVXOPT/CVXOPT-1.2.1-fix-setup-py.patch
deleted file mode 100644
index 5975c4bb3..000000000
--- a/Golden_Repo/c/CVXOPT/CVXOPT-1.2.1-fix-setup-py.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-# Patches the setup.py to use EB settings for BLAS/LAPACK, FFTW, etc
-# original by wpoely86@gmail.com, ported to v1.2.1 by Kenneth Hoste (HPC-UGent)
---- cvxopt-1.2.1/setup.py.orig	2018-08-30 19:54:12.000000000 +0200
-+++ cvxopt-1.2.1/setup.py	2018-10-02 16:28:57.252340779 +0200
-@@ -91,9 +91,11 @@
- LAPACK_LIB = os.environ.get("CVXOPT_LAPACK_LIB",LAPACK_LIB)
- BLAS_LIB_DIR = os.environ.get("CVXOPT_BLAS_LIB_DIR",BLAS_LIB_DIR)
- BLAS_EXTRA_LINK_ARGS = os.environ.get("CVXOPT_BLAS_EXTRA_LINK_ARGS",BLAS_EXTRA_LINK_ARGS)
-+FFTW_EXTRA_LINK_ARGS = os.environ.get("CVXOPT_FFTW_EXTRA_LINK_ARGS",'')
- if type(BLAS_LIB) is str: BLAS_LIB = BLAS_LIB.strip().split(';')
- if type(LAPACK_LIB) is str: LAPACK_LIB = LAPACK_LIB.strip().split(';')
--if type(BLAS_EXTRA_LINK_ARGS) is str: BLAS_EXTRA_LINK_ARGS = BLAS_EXTRA_LINK_ARGS.strip().split(';')
-+if type(BLAS_EXTRA_LINK_ARGS) is str: BLAS_EXTRA_LINK_ARGS = BLAS_EXTRA_LINK_ARGS.strip().split(' ')
-+if type(FFTW_EXTRA_LINK_ARGS) is str: FFTW_EXTRA_LINK_ARGS = FFTW_EXTRA_LINK_ARGS.strip().split(' ')
- BUILD_GSL = int(os.environ.get("CVXOPT_BUILD_GSL",BUILD_GSL))
- GSL_LIB_DIR = os.environ.get("CVXOPT_GSL_LIB_DIR",GSL_LIB_DIR)
- GSL_INC_DIR = os.environ.get("CVXOPT_GSL_INC_DIR",GSL_INC_DIR)
-@@ -126,7 +128,7 @@
- # optional modules
- 
- if BUILD_GSL:
--    gsl = Extension('gsl', libraries = M_LIB + ['gsl'] + BLAS_LIB,
-+    gsl = Extension('gsl', libraries = M_LIB + ['gsl'],
-         include_dirs = [ GSL_INC_DIR ],
-         library_dirs = [ GSL_LIB_DIR, BLAS_LIB_DIR ],
-         define_macros = GSL_MACROS,
-@@ -135,11 +137,11 @@
-     extmods += [gsl];
- 
- if BUILD_FFTW:
--    fftw = Extension('fftw', libraries = ['fftw3'] + BLAS_LIB,
-+    fftw = Extension('fftw',
-         include_dirs = [ FFTW_INC_DIR ],
-         library_dirs = [ FFTW_LIB_DIR, BLAS_LIB_DIR ],
-         define_macros = FFTW_MACROS,
--        extra_link_args = BLAS_EXTRA_LINK_ARGS,
-+        extra_link_args = BLAS_EXTRA_LINK_ARGS + FFTW_EXTRA_LINK_ARGS,
-         sources = ['src/C/fftw.c'] )
-     extmods += [fftw];
- 
-@@ -151,7 +153,7 @@
-     extmods += [glpk];
- 
- if BUILD_DSDP:
--    dsdp = Extension('dsdp', libraries = ['dsdp'] + LAPACK_LIB + BLAS_LIB,
-+    dsdp = Extension('dsdp', libraries = ['dsdp'],
-         include_dirs = [ DSDP_INC_DIR ],
-         library_dirs = [ DSDP_LIB_DIR, BLAS_LIB_DIR ],
-         extra_link_args = BLAS_EXTRA_LINK_ARGS,
-@@ -160,19 +162,19 @@
- 
- # Required modules
- 
--base = Extension('base', libraries = M_LIB + LAPACK_LIB + BLAS_LIB,
-+base = Extension('base',
-     library_dirs = [ BLAS_LIB_DIR ],
-     define_macros = MACROS,
-     extra_link_args = BLAS_EXTRA_LINK_ARGS,
-     sources = ['src/C/base.c','src/C/dense.c','src/C/sparse.c'])
- 
--blas = Extension('blas', libraries = BLAS_LIB,
-+blas = Extension('blas',
-     library_dirs = [ BLAS_LIB_DIR ],
-     define_macros = MACROS,
-     extra_link_args = BLAS_EXTRA_LINK_ARGS,
-     sources = ['src/C/blas.c'] )
- 
--lapack = Extension('lapack', libraries = LAPACK_LIB + BLAS_LIB,
-+lapack = Extension('lapack',
-     library_dirs = [ BLAS_LIB_DIR ],
-     define_macros = MACROS,
-     extra_link_args = BLAS_EXTRA_LINK_ARGS,
-@@ -180,9 +182,10 @@
- 
- if not SUITESPARSE_SRC_DIR:
-     umfpack = Extension('umfpack',
--        libraries = ['umfpack','cholmod','amd','colamd','suitesparseconfig'] + LAPACK_LIB + BLAS_LIB + RT_LIB,
-+        libraries = ['umfpack','cholmod','amd','colamd','suitesparseconfig'] + RT_LIB,
-         include_dirs = [SUITESPARSE_INC_DIR],
-         library_dirs = [SUITESPARSE_LIB_DIR, BLAS_LIB_DIR],
-+        extra_link_args = BLAS_EXTRA_LINK_ARGS,
-         sources = ['src/C/umfpack.c'])
- else:
-     umfpack = Extension('umfpack',
-@@ -193,7 +196,6 @@
-             SUITESPARSE_SRC_DIR + '/SuiteSparse_config' ],
-         library_dirs = [ BLAS_LIB_DIR ],
-         define_macros = MACROS + [('NTIMER', '1'), ('NCHOLMOD', '1')],
--        libraries = LAPACK_LIB + BLAS_LIB,
-         extra_compile_args = UMFPACK_EXTRA_COMPILE_ARGS,
-         extra_link_args = BLAS_EXTRA_LINK_ARGS,
-         sources = [ 'src/C/umfpack.c',
-@@ -206,14 +208,13 @@
- 
- if not SUITESPARSE_SRC_DIR:
-     cholmod = Extension('cholmod',
--        libraries = ['cholmod','colamd','amd','suitesparseconfig'] + LAPACK_LIB + BLAS_LIB + RT_LIB,
-+        libraries = ['cholmod','colamd','amd','suitesparseconfig'] + RT_LIB,
-         include_dirs = [SUITESPARSE_INC_DIR],
-         library_dirs = [SUITESPARSE_LIB_DIR, BLAS_LIB_DIR],
-         sources = [ 'src/C/cholmod.c' ])
- else:
-     cholmod = Extension('cholmod',
-         library_dirs = [ BLAS_LIB_DIR ],
--        libraries = LAPACK_LIB + BLAS_LIB,
-         include_dirs = [ SUITESPARSE_SRC_DIR + '/CHOLMOD/Include',
-             SUITESPARSE_SRC_DIR + '/COLAMD',
-             SUITESPARSE_SRC_DIR + '/AMD/Include',
-@@ -235,17 +236,18 @@
-         libraries = ['amd','suitesparseconfig'] + RT_LIB,
-         include_dirs = [SUITESPARSE_INC_DIR],
-         library_dirs = [SUITESPARSE_LIB_DIR],
-+        extra_link_args = BLAS_EXTRA_LINK_ARGS,
-         sources = ['src/C/amd.c'])
- else:
-     amd = Extension('amd',
-         include_dirs = [SUITESPARSE_SRC_DIR + '/AMD/Include',
-             SUITESPARSE_SRC_DIR + '/SuiteSparse_config' ],
-         define_macros = MACROS + [('NTIMER', '1')],
-+        extra_link_args = BLAS_EXTRA_LINK_ARGS,
-         sources = [ 'src/C/amd.c', SUITESPARSE_SRC_DIR + '/SuiteSparse_config/SuiteSparse_config.c'] +
-         glob(SUITESPARSE_SRC_DIR + '/AMD/Source/*.c') )
- 
- misc_solvers = Extension('misc_solvers',
--    libraries = LAPACK_LIB + BLAS_LIB,
-     library_dirs = [ BLAS_LIB_DIR ],
-     define_macros = MACROS,
-     extra_link_args = BLAS_EXTRA_LINK_ARGS,
diff --git a/Golden_Repo/c/CVXOPT/CVXOPT-1.2.7-gpsmkl-2021b.eb b/Golden_Repo/c/CVXOPT/CVXOPT-1.2.7-gpsmkl-2021b.eb
deleted file mode 100644
index 7f883a811..000000000
--- a/Golden_Repo/c/CVXOPT/CVXOPT-1.2.7-gpsmkl-2021b.eb
+++ /dev/null
@@ -1,43 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'CVXOPT'
-version = '1.2.7'
-
-homepage = 'http://cvxopt.org'
-description = """CVXOPT is a free software package for convex optimization based on the Python programming language.
- Its main purpose is to make the development of software for convex optimization applications straightforward by
- building on Python's extensive standard library and on the strengths of Python as a high-level programming language.
-"""
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': True}
-
-source_urls = [PYPI_LOWER_SOURCE]
-sources = [SOURCELOWER_TAR_GZ]
-patches = ['CVXOPT-1.2.1-fix-setup-py.patch']
-checksums = [
-    '3f9db1f4d4e820aaea81d6fc21054c89dc6327c84f935dd5a1eda1af11e1d504',  # cvxopt-1.2.7.tar.gz
-    '85d8475098895e9af45f330489a712b5b944489c5fb4a6c67f59bef8fed4303d',  # CVXOPT-1.2.1-fix-setup-py.patch
-]
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SuiteSparse', '5.10.1'),
-    ('GSL', '2.7'),
-]
-
-download_dep_fail = True
-use_pip = True
-
-preinstallopts = 'CVXOPT_BUILD_FFTW=1 CVXOPT_BUILD_GSL=1 CVXOPT_BLAS_EXTRA_LINK_ARGS="$LIBLAPACK" '
-preinstallopts += 'CVXOPT_FFTW_EXTRA_LINK_ARGS="$LIBFFT" CVXOPT_SUITESPARSE_SRC_DIR=$EBROOTSUITESPARSE'
-
-installopts = ' --no-binary cvxopt'
-
-sanity_check_commands = ['nosetests']
-
-moduleclass = 'math'
diff --git a/Golden_Repo/c/Cartopy/Cartopy-0.20.0-GCCcore-11.2.0.eb b/Golden_Repo/c/Cartopy/Cartopy-0.20.0-GCCcore-11.2.0.eb
deleted file mode 100644
index edaaf6e97..000000000
--- a/Golden_Repo/c/Cartopy/Cartopy-0.20.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,50 +0,0 @@
-# This file is an EasyBuild reciPY as per https://github.com/easybuilders/easybuild
-# Updated: Denis Kristak
-easyblock = 'PythonBundle'
-
-name = 'Cartopy'
-version = '0.20.0'
-
-homepage = 'https://scitools.org.uk/cartopy/docs/latest/'
-description = """Cartopy is a Python package designed to make drawing maps for data analysis and visualisation easy."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('Fiona', '1.8.20'),
-    ('GDAL', '3.3.2'),
-    ('GEOS', '3.9.1'),
-    ('matplotlib', '3.4.3', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('pyproj', '3.3.0'),
-    ('SciPy-bundle', '2021.10', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('Shapely', '1.8.0'),
-    ('lxml', '4.6.3'),
-    ('Pillow-SIMD', '9.0.1'),
-    ('PROJ', '8.1.0'),
-    ('PyYAML', '5.4.1'),
-]
-
-use_pip = True
-sanity_pip_check = True
-
-exts_list = [
-    ('OWSLib', '0.25.0', {
-        'checksums': ['20d79bce0be10277caa36f3134826bd0065325df0301a55b2c8b1c338d8d8f0a'],
-    }),
-    ('pyepsg', '0.4.0', {
-        'checksums': ['2d08fad1e7a8b47a90a4e43da485ba95705923425aefc4e2a3efa540dbd470d7'],
-    }),
-    ('pykdtree', '1.3.4', {
-        'checksums': ['bebe5c608129f2997e88510c00010b9a78581b394924c0e3ecd131d52415165d'],
-    }),
-    ('pyshp', '2.1.3', {
-        'modulename': 'shapefile',
-        'checksums': ['e32b4a6832a3b97986df442df63b4c4a7dcc846b326c903189530a5cc6df0260'],
-    }),
-    (name, version, {
-        'checksums': ['eae58aff26806e63cf115b2bce9477cedc4aa9f578c5e477b2c25cfa404f2b7a'],
-    }),
-]
-
-moduleclass = 'geo'
diff --git a/Golden_Repo/c/Cirq/Cirq-0.13.1-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/c/Cirq/Cirq-0.13.1-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index 0d848eeef..000000000
--- a/Golden_Repo/c/Cirq/Cirq-0.13.1-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,109 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'Cirq'
-version = '0.13.1'
-
-homepage = 'https://github.com/quantumlib/cirq'
-description = """A python framework for creating, editing,
-and invoking Noisy Intermediate Scale Quantum (NISQ) circuits."""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-Stack', '2021b'),
-    ('protobuf-python', '3.17.3'),
-    ('PyQuil', '3.0.1'),
-    ('texlive', '20200406'),
-]
-
-exts_default_options = {
-    'download_dep_fail': True,
-    'source_urls': [PYPI_SOURCE],
-    'use_pip': True,
-    'use_pip_for_deps': False,
-    'sanity_pip_check': True,
-}
-
-exts_list = [
-    ('cachetools', '4.2.4', {
-        'checksums': ['89ea6f1b638d5a73a4f9226be57ac5e4f399d22770b92355f92dcb0f7f001693'],
-    }),
-    ('pyasn1-modules', '0.2.8', {
-        'checksums': ['905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e'],
-    }),
-    ('rsa', '4.6', {
-        'checksums': ['109ea5a66744dd859bf16fe904b8d8b627adafb9408753161e766a92e7d681fa'],
-    }),
-    ('google-auth', '1.35.0', {
-        'checksums': ['b7033be9028c188ee30200b204ea00ed82ea1162e8ac1df4aa6ded19a191d88e'],
-        'modulename': 'google.auth',
-    }),
-    ('googleapis-common-protos', '1.54.0', {
-        'checksums': ['a4031d6ec6c2b1b6dc3e0be7e10a1bd72fb0b18b07ef9be7b51f2c1004ce2437'],
-        'modulename': 'google',
-    }),
-    ('grpcio', '1.42.0', {
-        'checksums': ['4a8f2c7490fe3696e0cdd566e2f099fb91b51bc75446125175c55581c2f7bc11'],
-        'modulename': 'grpc',
-    }),
-    ('google-api-core', '1.31.4', {
-        'checksums': ['c77ffc8b4981b44efdb9d68431fd96d21dbd39545c29552bbe79b9b7dd2c3689'],
-        'modulename': 'google',
-    }),
-    ('duet', '0.2.3', {
-        'source_tmpl': 'duet-%(version)s-py3-none-any.whl',
-        'checksums': ['33e9dfe13c15a2fc8f79aa531957e8d020064261a82a103449e4eaf62ea0389b'],
-        'unpack_sources': False,
-    }),
-    ('tqdm', '4.62.3', {
-        'checksums': ['d359de7217506c9851b7869f3708d8ee53ed70a1b8edbba4dbcb47442592920d'],
-    }),
-    ('cirq-core', version, {
-        'source_tmpl': 'cirq_core-%(version)s-py3-none-any.whl',
-        'checksums': ['31f88210f00b43c6d10c83c0e2e5291c6e4a1750f436dcb8044b3343c6bd73b9'],
-        'unpack_sources': False,
-        'modulename': False,
-    }),
-    ('cirq-aqt', version, {
-        'source_tmpl': 'cirq_aqt-%(version)s-py3-none-any.whl',
-        'checksums': ['b30c7c9f957e8586f5b00e3dc55d83718849630ece82241e04f6731e5c815b56'],
-        'unpack_sources': False,
-    }),
-    ('cirq-google', version, {
-        'source_tmpl': 'cirq_google-%(version)s-py3-none-any.whl',
-        'checksums': ['4319fade78e7ecb3fc846a82d426d14426079df3b219d82325e70e34b564af98'],
-        'unpack_sources': False,
-    }),
-    ('cirq-ionq', version, {
-        'source_tmpl': 'cirq_ionq-%(version)s-py3-none-any.whl',
-        'checksums': ['5f25d7ee8c271bb473b4e79dedbd041829f7932cb7b65481dd3d45861d8d803a'],
-        'unpack_sources': False,
-    }),
-    ('cirq-pasqal', version, {
-        'source_tmpl': 'cirq_pasqal-%(version)s-py3-none-any.whl',
-        'checksums': ['0344227cdf2cea262b065ac1cf26875c63647a4dd666bce2c48364e7649c5890'],
-        'unpack_sources': False,
-    }),
-    ('idna', '2.10', {  # downgrade
-        'checksums': ['b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6'],
-    }),
-    ('cirq-rigetti', version, {
-        'source_tmpl': 'cirq_rigetti-%(version)s-py3-none-any.whl',
-        'checksums': ['5ec2a05d55f5ad3609658e7c0e4c5808aca96fbc48824cb83bc8664c339381c8'],
-        'unpack_sources': False,
-    }),
-    ('cirq-web', version, {
-        'source_tmpl': 'cirq_web-%(version)s-py3-none-any.whl',
-        'checksums': ['79e42d64d1293c071ecc9163a177e02dedc11e056808b3c98b64f150568e727d'],
-        'unpack_sources': False,
-    }),
-    ('cirq', version, {
-        'source_tmpl': 'cirq-%(version)s-py3-none-any.whl',
-        'checksums': ['774babc4a2e5df348c5e34dbb9c692db574637335c55526fa76a09a64762dd65'],
-        'unpack_sources': False,
-    }),
-]
-
-moduleclass = 'quantum'
diff --git a/Golden_Repo/c/Cirq/Cirq-0.14.1-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/c/Cirq/Cirq-0.14.1-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index 2d3c7490a..000000000
--- a/Golden_Repo/c/Cirq/Cirq-0.14.1-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,109 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'Cirq'
-version = '0.14.1'
-
-homepage = 'https://github.com/quantumlib/cirq'
-description = """A python framework for creating, editing,
-and invoking Noisy Intermediate Scale Quantum (NISQ) circuits."""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-Stack', '2021b'),
-    ('protobuf-python', '3.17.3'),
-    ('PyQuil', '3.0.1'),
-    ('texlive', '20200406'),
-]
-
-exts_default_options = {
-    'download_dep_fail': True,
-    'source_urls': [PYPI_SOURCE],
-    'use_pip': True,
-    'use_pip_for_deps': False,
-    'sanity_pip_check': True,
-}
-
-exts_list = [
-    ('cachetools', '4.2.4', {
-        'checksums': ['89ea6f1b638d5a73a4f9226be57ac5e4f399d22770b92355f92dcb0f7f001693'],
-    }),
-    ('pyasn1-modules', '0.2.8', {
-        'checksums': ['905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e'],
-    }),
-    ('rsa', '4.6', {
-        'checksums': ['109ea5a66744dd859bf16fe904b8d8b627adafb9408753161e766a92e7d681fa'],
-    }),
-    ('google-auth', '1.35.0', {
-        'checksums': ['b7033be9028c188ee30200b204ea00ed82ea1162e8ac1df4aa6ded19a191d88e'],
-        'modulename': 'google.auth',
-    }),
-    ('googleapis-common-protos', '1.54.0', {
-        'checksums': ['a4031d6ec6c2b1b6dc3e0be7e10a1bd72fb0b18b07ef9be7b51f2c1004ce2437'],
-        'modulename': 'google',
-    }),
-    ('grpcio', '1.42.0', {
-        'checksums': ['4a8f2c7490fe3696e0cdd566e2f099fb91b51bc75446125175c55581c2f7bc11'],
-        'modulename': 'grpc',
-    }),
-    ('google-api-core', '1.31.4', {
-        'checksums': ['c77ffc8b4981b44efdb9d68431fd96d21dbd39545c29552bbe79b9b7dd2c3689'],
-        'modulename': 'google',
-    }),
-    ('duet', '0.2.3', {
-        'source_tmpl': 'duet-%(version)s-py3-none-any.whl',
-        'checksums': ['33e9dfe13c15a2fc8f79aa531957e8d020064261a82a103449e4eaf62ea0389b'],
-        'unpack_sources': False,
-    }),
-    ('tqdm', '4.62.3', {
-        'checksums': ['d359de7217506c9851b7869f3708d8ee53ed70a1b8edbba4dbcb47442592920d'],
-    }),
-    ('cirq-core', version, {
-        'source_tmpl': 'cirq_core-%(version)s-py3-none-any.whl',
-        'checksums': ['8038655ff716d8683c5212ca22388708511c9fdf6b4adb5409d5cbc9c71e090b'],
-        'unpack_sources': False,
-        'modulename': False,
-    }),
-    ('cirq-aqt', version, {
-        'source_tmpl': 'cirq_aqt-%(version)s-py3-none-any.whl',
-        'checksums': ['bd5a1c5b6fffa342e27db37c8c3b1dd31ac42e1e67c12d32cc1ba39ee3c742e3'],
-        'unpack_sources': False,
-    }),
-    ('cirq-google', version, {
-        'source_tmpl': 'cirq_google-%(version)s-py3-none-any.whl',
-        'checksums': ['00ac63412aeadcc75c2ab1090cc2b6ed3d6101519f11d64b3f0bd90bf531b3c4'],
-        'unpack_sources': False,
-    }),
-    ('cirq-ionq', version, {
-        'source_tmpl': 'cirq_ionq-%(version)s-py3-none-any.whl',
-        'checksums': ['ead7a81d33e071c42e6512eedc43803ce2c801725e5e86af4a69616fd93ba089'],
-        'unpack_sources': False,
-    }),
-    ('cirq-pasqal', version, {
-        'source_tmpl': 'cirq_pasqal-%(version)s-py3-none-any.whl',
-        'checksums': ['db0910e178f27f1547bb705ddb4515c26dde1d89fdad78b4ce0e87b5b1ec2746'],
-        'unpack_sources': False,
-    }),
-    ('idna', '2.10', {  # downgrade
-        'checksums': ['b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6'],
-    }),
-    ('cirq-rigetti', version, {
-        'source_tmpl': 'cirq_rigetti-%(version)s-py3-none-any.whl',
-        'checksums': ['063b9509ed2ff5850500fa0c23edb39efadd02a6ce35022aa38526b4eb1a44d9'],
-        'unpack_sources': False,
-    }),
-    ('cirq-web', version, {
-        'source_tmpl': 'cirq_web-%(version)s-py3-none-any.whl',
-        'checksums': ['53601a8d96c5bd1a0a66f895b864895ae3f2325f8d94e6c33c15980ac0e6ff0e'],
-        'unpack_sources': False,
-    }),
-    ('cirq', version, {
-        'source_tmpl': 'cirq-%(version)s-py3-none-any.whl',
-        'checksums': ['cc64f02f42dd7301bc20b4dd6f1ea45c486380fb708385fac6e0d57ebc477f3a'],
-        'unpack_sources': False,
-    }),
-]
-
-moduleclass = 'quantum'
diff --git a/Golden_Repo/c/Clang/Clang-13.0.1-GCCcore-11.2.0.eb b/Golden_Repo/c/Clang/Clang-13.0.1-GCCcore-11.2.0.eb
deleted file mode 100644
index f76552024..000000000
--- a/Golden_Repo/c/Clang/Clang-13.0.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,112 +0,0 @@
-# For using $SYSTEMNAME to determine compute capability. The local prefix is to appease the checker
-import os as local_os
-
-##
-# This file is an EasyBuild reciPY as per https://github.com/easybuilders/easybuild
-#
-# Copyright:: Copyright 2013-2015 Dmitri Gribenko, Ward Poelmans
-# Authors:: Dmitri Gribenko <gribozavr@gmail.com>
-# Authors:: Ward Poelmans <wpoely86@gmail.com>
-# License:: GPLv2 or later, MIT, three-clause BSD.
-# $Id$
-##
-
-name = 'Clang'
-version = '13.0.1'
-
-homepage = 'https://clang.llvm.org/'
-description = """C, C++, Objective-C compiler, based on LLVM.  Does not
- include C++ standard library -- use libstdc++ from GCC."""
-
-# Clang also depends on libstdc++ during runtime, but this dependency is
-# already specified as the toolchain.
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [
-    "https://github.com/llvm/llvm-project/releases/download/llvmorg-%(version)s"]
-sources = [
-    'llvm-%(version)s.src.tar.xz',
-    'clang-%(version)s.src.tar.xz',
-    'compiler-rt-%(version)s.src.tar.xz',
-    'polly-%(version)s.src.tar.xz',
-    'openmp-%(version)s.src.tar.xz',
-    # Also include the LLVM linker
-    'lld-%(version)s.src.tar.xz',
-    'libcxx-%(version)s.src.tar.xz',
-    'libcxxabi-%(version)s.src.tar.xz',
-    'clang-tools-extra-%(version)s.src.tar.xz',
-    'libunwind-%(version)s.src.tar.xz',
-]
-checksums = [
-    # llvm-13.0.1.src.tar.xz
-    'ec6b80d82c384acad2dc192903a6cf2cdbaffb889b84bfb98da9d71e630fc834',
-    # clang-13.0.1.src.tar.xz
-    '787a9e2d99f5c8720aa1773e4be009461cd30d3bd40fdd24591e473467c917c9',
-    # compiler-rt-13.0.1.src.tar.xz
-    '7b33955031f9a9c5d63077dedb0f99d77e4e7c996266952c1cec55626dca5dfc',
-    # polly-13.0.1.src.tar.xz
-    'f4003e03da57b53bf206faadd0cf53f7b198c38498c605dec45743db23c10ad0',
-    # openmp-13.0.1.src.tar.xz
-    '6b79261371616c31fea18cd3ee1797c79ee38bcaf8417676d4fa366a24c96b4f',
-    # lld-13.0.1.src.tar.xz
-    '666af745e8bf7b680533b4d18b7a31dc7cab575b1e6e4d261922bbafd9644cfb',
-    # libcxx-13.0.1.src.tar.xz
-    '2f446acc00bb7cfb4e866c2fa46d1b6dbf4e7d2ab62e3c3d84e56f7b9e28110f',
-    # libcxxabi-13.0.1.src.tar.xz
-    'db5fa6093c786051e8b1c85527240924eceb6c95eeff0a2bbc57be8422b3cef1',
-    # clang-tools-extra-13.0.1.src.tar.xz
-    'cc2bc8598848513fa2257a270083e986fd61048347eccf1d801926ea709392d0',
-    # libunwind-13.0.1.src.tar.xz
-    'e206dbf1bbe058a113bffe189386ded99a160b2443ee1e2cd41ff810f78551ba',
-]
-
-dependencies = [
-    # since Clang is a compiler, binutils is a runtime dependency too
-    ('binutils', '2.37'),
-    ('hwloc', '2.5.0'),
-    ('libxml2', '2.9.10'),
-    ('ncurses', '6.2'),
-    ('GMP', '6.2.1'),
-    ('Z3', '4.8.12'),
-]
-
-builddependencies = [
-    ('CMake', '3.21.1'),
-    ('Python', '3.9.6'),
-    ('Perl', '5.34.0'),
-    ('elfutils', '0.185'),
-]
-
-default_cuda_capability = {
-    'juwels': '7.0',
-    'juwelsbooster': '8.0',
-    'jurecadc': '8.0',
-    'jusuf': '7.0',
-    'hdfml': '7.0',
-    'deep': '7.0',
-}[local_os.environ['SYSTEMNAME']]
-
-configopts = '-DLIBOMP_INSTALL_ALIASES=OFF'
-
-assertions = True
-usepolly = True
-build_lld = True
-libcxx = True
-enable_rtti = True
-build_extra_clang_tools = True
-
-skip_all_tests = True
-
-sanity_check_paths = {
-    'files': ['bin/clang', 'bin/clang++', 'bin/llvm-ar', 'bin/llvm-nm',
-              'bin/llvm-as', 'bin/opt', 'bin/llvm-link', 'bin/llvm-config',
-              'bin/llvm-symbolizer', 'include/llvm-c/Core.h', 'include/clang-c/Index.h',
-              'lib/libclang.so', 'lib/clang/13.0.1/include/stddef.h', 'bin/scan-build',
-              'bin/scan-view', 'bin/clang-tidy', 'lib/LLVMPolly.so', 'bin/lld',
-              'lib/libc++.so', 'lib/libc++abi.so', 'lib/libomp.so',
-              'lib/clang/13.0.1/include/omp.h', 'lib/libomptarget.so',
-              'lib/libomptarget.rtl.cuda.so', 'lib/libomptarget.rtl.x86_64.so'],
-    'dirs': ['include/clang', 'include/llvm', 'lib/clang/13.0.1/lib', 'include/polly'],
-}
-
-moduleclass = 'sidecompiler'
diff --git a/Golden_Repo/c/Cling/Cling-0.9-GCCcore-11.2.0.eb b/Golden_Repo/c/Cling/Cling-0.9-GCCcore-11.2.0.eb
deleted file mode 100644
index 34cc5ec43..000000000
--- a/Golden_Repo/c/Cling/Cling-0.9-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,76 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'Cling'
-version = '0.9'
-
-homepage = "https://cdn.rawgit.com/root-project/cling/master/www/index.html"
-description = """Cling is an interactive C++ interpreter, built on the top of LLVM and Clang libraries.
-Its advantages over the standard interpreters are that it has command line prompt
-and uses just-in-time (JIT) compiler for compilation.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/root-project/cling/archive/']
-sources = ['v%(version)s.tar.gz']
-patches = [('patchgcc11fix.patch', 0)]
-checksums = [
-    '5fe545b4ca2884dc861e1241f2ae7b975b60514062675995cfbc401e3b3e8258',  # v0.9.tar.gz
-    'e2a38f1ed28518dc91168da42ce77dfbb0b51b8865cb07c7d0629f2d58c5da50',  # patchgcc11fix.patch
-]
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-    ('binutils', '2.37',),
-]
-
-separate_build_dir = True
-srcdir = "%(builddir)s/src"
-
-# get source
-preconfigopts = (
-
-    # get compatible LLVM version id
-    'pushd %(builddir)s/cling-%(version)s && '
-    'LLVM_RELEASE=$(cat LastKnownGoodLLVMSVNRevision.txt) && '
-
-    # clone compatible LLVM branch
-    'cd .. && '
-    'git clone http://root.cern.ch/git/llvm.git src && '
-    'cd src && '
-    'git checkout cling-patches-r${LLVM_RELEASE} && '
-
-    # clone compatible Clang branch to the correct position in LLVM src
-    'cd tools && '
-    'git clone http://root.cern.ch/git/clang.git && '
-    'cd clang && '
-    'git checkout cling-patches-r${LLVM_RELEASE} && '
-
-    # add cling src to the correct position LLVM src
-    'cd .. && '
-    'ln -s ../../cling-%(version)s cling && '
-
-    # cd to easybuild standard build directory
-    'popd && '
-
-    # patch source
-    'pushd %(builddir)s && '
-    'patch -p0 < ./cling-%(version)s/gcc11fix.patch && '
-    'popd && '
-)
-
-# copy jupyter kernel files
-postinstallcmds = [
-    # copy Jupyter kernel install files
-    # https://cdn.rawgit.com/root-project/cling/master/www/jupyter.html
-    'mkdir -p %(installdir)s/share/cling/ ',
-    'cp -a %(builddir)s/cling-%(version)s/tools/Jupyter %(installdir)s/share/cling ',
-]
-
-sanity_check_paths = {
-    'files': ['bin/cling'],
-    'dirs': ['bin', 'include', 'lib', 'share'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/c/Cling/patchgcc11fix.patch b/Golden_Repo/c/Cling/patchgcc11fix.patch
deleted file mode 100644
index f7b8238b1..000000000
--- a/Golden_Repo/c/Cling/patchgcc11fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur cling-0.9.orig/gcc11fix.patch cling-0.9/gcc11fix.patch
-+++ gcc11fix.patch	2021-11-14 20:32:56.024163292 +0100
-@@ -0,0 +1,12 @@
-+diff -Naur src.orig/utils/benchmark/src/benchmark_register.h src/utils/benchmark/src/benchmark_register.h
-+--- src.orig/utils/benchmark/src/benchmark_register.h	2021-11-14 20:27:51.974357437 +0100
-++++ src/utils/benchmark/src/benchmark_register.h	2021-11-14 20:31:22.536143070 +0100
-+@@ -2,7 +2,7 @@
-+ #define BENCHMARK_REGISTER_H
-+ 
-+ #include <vector>
-+-
-++#include <limits>
-+ #include "check.h"
-+ 
-+ template <typename T>
diff --git a/Golden_Repo/c/Code_Saturne/Code_Saturne-7.0.2-gpsmkl-2021b.eb b/Golden_Repo/c/Code_Saturne/Code_Saturne-7.0.2-gpsmkl-2021b.eb
deleted file mode 100644
index f1d1254fe..000000000
--- a/Golden_Repo/c/Code_Saturne/Code_Saturne-7.0.2-gpsmkl-2021b.eb
+++ /dev/null
@@ -1,55 +0,0 @@
-# easyconfig file for Code_Saturne
-name = 'Code_Saturne'
-version = '7.0.2'
-
-# extra option for the SLURM batch system
-slurm = True
-
-homepage = 'https://www.code-saturne.org'
-description = """
-Code_saturne is the free, open-source software developed to analyze CFD applications.
-It solves the Navier-Stokes equations for 2D, 2D-axisymmetric and 3D flows, steady or
-unsteady, laminar or turbulent, incompressible or weakly dilatable, isothermal or not,
-with scalar transport.
-
-Code_Saturne %(version)s%(versionsuffix)s is installed in
-$EBROOTCODE_SATURNE
-"""
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-toolchainopts = {'optarch': True, 'pic': True, 'usempi': True}
-
-source_urls = ['https://github.com/code-saturne/code_saturne/archive/refs/tags/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['639879201b42fa5e47ef5acc797a61deadac9d2a6ad82fbb192ebccaa75a0c43']
-
-builddependencies = [
-    ('Autotools', '20210726', '', SYSTEM),
-    ('gettext', '0.21', '', SYSTEM),
-    ('Bison', '3.7.6', '', SYSTEM),
-    ('flex', '2.6.4', '', SYSTEM),
-    ('texlive', '20200406'),
-    ('Doxygen', '1.9.1'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('HDF5', '1.12.1'),
-    ('CGNS', '4.2.0'),
-    ('ParMETIS', '4.0.3'),
-    ('SCOTCH', '6.1.2'),
-    ('MED', '4.1.0'),
-    ('PyQt5', '5.15.4'),
-]
-
-configopts = '--with-med=$EBROOTMED --without-medcoupling '
-configopts += '--with-cgns=$EBROOTCGNS '
-configopts += '--with-metis=$EBROOTPARMETIS '
-configopts += '--with-scotch=$EBROOTSCOTCH '
-configopts += '--with-python_prefix=%(installdir)s --with-python_exec_prefix=%(installdir)s '
-
-modloadmsg = "To benefit from shell completion for %(name)s commands and\n"
-modloadmsg += "options, you may also source a bash completion file by;\n"
-modloadmsg += "source $CS_BASH\n"
-
-moduleclass = 'cae'
diff --git a/Golden_Repo/c/Colmap/Colmap-3.7-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/c/Colmap/Colmap-3.7-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index e2a6ee22e..000000000
--- a/Golden_Repo/c/Colmap/Colmap-3.7-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,48 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'Colmap'
-version = '3.7'
-
-homepage = 'https://colmap.github.io'
-description = """COLMAP is a general-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline
-with a graphical and command-line interface.
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'cstd': 'c++14'}
-
-github_account = 'colmap'
-source_urls = [GITHUB_SOURCE]
-sources = ['%(version)s.tar.gz']
-checksums = ['ceb7cca204550d65b890cd0082c66f4bc69193daf9da64616d8147a46b76cc55']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1'),
-]
-
-dependencies = [
-    ('Eigen', '3.3.9'),
-    ('Boost', '1.78.0'),
-    ('gflags', '2.2.2'),
-    ('glog', '0.5.0'),
-    ('SuiteSparse', '5.10.1', '-nompi'),
-    ('CGAL', '5.2'),
-    ('ceres-solver', '2.0.0'),
-    ('FreeImage', '3.18.0'),
-    ('CUDA', '11.5', '', SYSTEM),
-    ('OpenGL', '2021b'),
-    ('Qt5', '5.15.2'),
-]
-
-configopts = "-DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF "
-configopts += "-DCUDA_ENABLED=ON "
-configopts += "-DCUDA_ARCHS='%(cuda_cc_space_sep)s' "
-configopts += "-DCUDA_NVCC_FLAGS='--std c++14' "
-
-sanity_check_paths = {
-    'files': ['bin/colmap', 'lib/colmap/libcolmap.a'],
-    'dirs': [],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/c/Coreutils/Coreutils-9.0-GCCcore-11.2.0.eb b/Golden_Repo/c/Coreutils/Coreutils-9.0-GCCcore-11.2.0.eb
deleted file mode 100644
index e0604032f..000000000
--- a/Golden_Repo/c/Coreutils/Coreutils-9.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,28 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = "Coreutils"
-version = "9.0"
-
-homepage = 'http://www.gnu.org/software/coreutils/'
-description = """The GNU Core Utilities are the basic file, shell and text
-manipulation utilities of the GNU operating system. These are
-the core utilities which are expected to exist on every
-operating system.
-"""
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [GNU_SOURCE]
-sources = [SOURCELOWER_TAR_XZ]
-checksums = ['ce30acdf4a41bc5bb30dd955e9eaa75fa216b4e3deb08889ed32433c7b3b97ce']
-
-builddependencies = [('binutils', '2.37')]
-
-sanity_check_paths = {
-    'files': ['bin/sort', 'bin/echo', 'bin/du', 'bin/date', 'bin/true'],
-    'dirs': []
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/c/CubeGUI/CubeGUI-4.6-GCCcore-11.2.0.eb b/Golden_Repo/c/CubeGUI/CubeGUI-4.6-GCCcore-11.2.0.eb
deleted file mode 100644
index 46dc5ee27..000000000
--- a/Golden_Repo/c/CubeGUI/CubeGUI-4.6-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,62 +0,0 @@
-##
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-#
-# Copyright:: Copyright 2018-2021 Juelich Supercomputing Centre, Germany
-# Authors::   Markus Geimer <m.geimer@fz-juelich.de>
-#             Christian Feld <c.feld@fz-juelich.de>
-# License::   3-clause BSD
-#
-# This work is based on experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-easyblock = 'EB_Score_minus_P'
-
-name = 'CubeGUI'
-version = '4.6'
-
-homepage = 'https://www.scalasca.org/software/cube-4.x/download.html'
-description = """
-Cube, which is used as performance report explorer for Scalasca and Score-P,
-is a generic tool for displaying a multi-dimensional performance space
-consisting of the dimensions (i) performance metric, (ii) call path, and
-(iii) system resource. Each dimension can be represented as a tree, where
-non-leaf nodes of the tree can be collapsed or expanded to achieve the
-desired level of granularity.
-
-This module provides the Cube graphical report explorer.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['http://perftools.pages.jsc.fz-juelich.de/cicd/cubegui/tags/cubegui-%(version)s']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = [
-    '1871c6736121d94a22314cb5daa8f3cbb978b58bfe54f677c4c9c9693757d0c5',  # cubegui-4.6.tar.gz
-]
-
-builddependencies = [
-    # use same binutils version that was used when building GCCcore
-    ('binutils', '2.37'),
-    ('CubeLib', '4.6'),
-]
-
-dependencies = [
-    ('Qt5', '5.15.2'),
-]
-
-sanity_check_paths = {
-    'files': ['bin/cube', 'bin/cubegui-config',
-              ('lib/libcube4gui.a', 'lib64/libcube4gui.a'),
-              ('lib/libcube4gui.%s' % SHLIB_EXT, 'lib64/libcube4gui.%s' % SHLIB_EXT)],
-    'dirs': ['include/cubegui', 'lib/cube-plugins'],
-}
-
-# CubeGUI (and other Qt apps that use OpenGl) crash from time to time
-# or don't show any output when using Qt's WebEngine with the default
-# KNOB_MAX_WORKER_THREADS value of 65535. Even with a value of 10 this
-# behavior doesn't vanish. Thus, don't use WebEngine at all, although
-# it makes nicer output.
-configopts = '--without-web-engine'
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/c/CubeGUI/CubeGUI-4.7-GCCcore-11.2.0.eb b/Golden_Repo/c/CubeGUI/CubeGUI-4.7-GCCcore-11.2.0.eb
deleted file mode 100644
index 47f4bee2c..000000000
--- a/Golden_Repo/c/CubeGUI/CubeGUI-4.7-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,62 +0,0 @@
-##
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-#
-# Copyright:: Copyright 2018-2022 Juelich Supercomputing Centre, Germany
-# Authors::   Markus Geimer <m.geimer@fz-juelich.de>
-#             Christian Feld <c.feld@fz-juelich.de>
-# License::   3-clause BSD
-#
-# This work is based on experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-easyblock = 'EB_Score_minus_P'
-
-name = 'CubeGUI'
-version = '4.7'
-
-homepage = 'https://www.scalasca.org/software/cube-4.x/download.html'
-description = """
-Cube, which is used as performance report explorer for Scalasca and Score-P,
-is a generic tool for displaying a multi-dimensional performance space
-consisting of the dimensions (i) performance metric, (ii) call path, and
-(iii) system resource. Each dimension can be represented as a tree, where
-non-leaf nodes of the tree can be collapsed or expanded to achieve the
-desired level of granularity.
-
-This module provides the Cube graphical report explorer.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['http://perftools.pages.jsc.fz-juelich.de/cicd/cubegui/tags/cubegui-%(version)s']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = [
-    '103fe00fa9846685746ce56231f64d850764a87737dc0407c9d0a24037590f68',  # cubegui-4.7.tar.gz
-]
-
-builddependencies = [
-    # use same binutils version that was used when building GCCcore
-    ('binutils', '2.37'),
-    ('CubeLib', '4.7'),
-]
-
-dependencies = [
-    ('Qt5', '5.15.2'),
-]
-
-sanity_check_paths = {
-    'files': ['bin/cube', 'bin/cubegui-config',
-              ('lib/libcube4gui.a', 'lib64/libcube4gui.a'),
-              ('lib/libcube4gui.%s' % SHLIB_EXT, 'lib64/libcube4gui.%s' % SHLIB_EXT)],
-    'dirs': ['include/cubegui', 'lib/cube-plugins'],
-}
-
-# CubeGUI (and other Qt apps that use OpenGl) crash from time to time
-# or don't show any output when using Qt's WebEngine with the default
-# KNOB_MAX_WORKER_THREADS value of 65535. Even with a value of 10 this
-# behavior doesn't vanish. Thus, don't use WebEngine at all, although
-# it makes nicer output.
-configopts = '--without-web-engine'
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/c/CubeLib/CubeLib-4.6-GCCcore-11.2.0.eb b/Golden_Repo/c/CubeLib/CubeLib-4.6-GCCcore-11.2.0.eb
deleted file mode 100644
index 7d2af0839..000000000
--- a/Golden_Repo/c/CubeLib/CubeLib-4.6-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,58 +0,0 @@
-##
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-#
-# Copyright:: Copyright 2018-2021 Juelich Supercomputing Centre, Germany
-# Authors::   Markus Geimer <m.geimer@fz-juelich.de>
-#             Christian Feld <c.feld@fz-juelich.de>
-# License::   3-clause BSD
-#
-# This work is based on experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-easyblock = 'EB_Score_minus_P'
-
-name = 'CubeLib'
-version = '4.6'
-
-homepage = 'https://www.scalasca.org/software/cube-4.x/download.html'
-description = """
-Cube, which is used as performance report explorer for Scalasca and Score-P,
-is a generic tool for displaying a multi-dimensional performance space
-consisting of the dimensions (i) performance metric, (ii) call path, and
-(iii) system resource. Each dimension can be represented as a tree, where
-non-leaf nodes of the tree can be collapsed or expanded to achieve the
-desired level of granularity.
-
-This module provides the Cube general purpose C++ library component and
-command-line tools.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['http://perftools.pages.jsc.fz-juelich.de/cicd/cubelib/tags/cubelib-%(version)s']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = [
-    '36eaffa7688db8b9304c9e48ca5dc4edc2cb66538aaf48657b9b5ccd7979385b',  # cubelib-4.6.tar.gz
-]
-
-builddependencies = [
-    # use same binutils version that was used when building GCCcore
-    ('binutils', '2.37'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-]
-
-configopts = '--enable-shared'
-
-sanity_check_paths = {
-    'files': ['bin/cubelib-config',
-              ('lib/libcube4.a', 'lib64/libcube4.a'),
-              ('lib/libcube4.%s' % SHLIB_EXT, 'lib64/libcube4.%s' % SHLIB_EXT)],
-    'dirs': ['include/cubelib'],
-}
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/c/CubeLib/CubeLib-4.7-GCCcore-11.2.0.eb b/Golden_Repo/c/CubeLib/CubeLib-4.7-GCCcore-11.2.0.eb
deleted file mode 100644
index b6362939a..000000000
--- a/Golden_Repo/c/CubeLib/CubeLib-4.7-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,58 +0,0 @@
-##
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-#
-# Copyright:: Copyright 2018-2022 Juelich Supercomputing Centre, Germany
-# Authors::   Markus Geimer <m.geimer@fz-juelich.de>
-#             Christian Feld <c.feld@fz-juelich.de>
-# License::   3-clause BSD
-#
-# This work is based on experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-easyblock = 'EB_Score_minus_P'
-
-name = 'CubeLib'
-version = '4.7'
-
-homepage = 'https://www.scalasca.org/software/cube-4.x/download.html'
-description = """
-Cube, which is used as performance report explorer for Scalasca and Score-P,
-is a generic tool for displaying a multi-dimensional performance space
-consisting of the dimensions (i) performance metric, (ii) call path, and
-(iii) system resource. Each dimension can be represented as a tree, where
-non-leaf nodes of the tree can be collapsed or expanded to achieve the
-desired level of granularity.
-
-This module provides the Cube general purpose C++ library component and
-command-line tools.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['http://perftools.pages.jsc.fz-juelich.de/cicd/cubelib/tags/cubelib-%(version)s']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = [
-    'e44352c80a25a49b0fa0748792ccc9f1be31300a96c32de982b92477a8740938',  # cubelib-4.7.tar.gz
-]
-
-builddependencies = [
-    # use same binutils version that was used when building GCCcore
-    ('binutils', '2.37'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-]
-
-configopts = '--enable-shared'
-
-sanity_check_paths = {
-    'files': ['bin/cubelib-config',
-              ('lib/libcube4.a', 'lib64/libcube4.a'),
-              ('lib/libcube4.%s' % SHLIB_EXT, 'lib64/libcube4.%s' % SHLIB_EXT)],
-    'dirs': ['include/cubelib'],
-}
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/c/CubeLib/CubeLib-4.7.1-GCCcore-11.2.0.eb b/Golden_Repo/c/CubeLib/CubeLib-4.7.1-GCCcore-11.2.0.eb
deleted file mode 100644
index a0796077d..000000000
--- a/Golden_Repo/c/CubeLib/CubeLib-4.7.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,58 +0,0 @@
-##
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-#
-# Copyright:: Copyright 2018-2022 Juelich Supercomputing Centre, Germany
-# Authors::   Markus Geimer <m.geimer@fz-juelich.de>
-#             Christian Feld <c.feld@fz-juelich.de>
-# License::   3-clause BSD
-#
-# This work is based on experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-easyblock = 'EB_Score_minus_P'
-
-name = 'CubeLib'
-version = '4.7.1'
-
-homepage = 'https://www.scalasca.org/software/cube-4.x/download.html'
-description = """
-Cube, which is used as performance report explorer for Scalasca and Score-P,
-is a generic tool for displaying a multi-dimensional performance space
-consisting of the dimensions (i) performance metric, (ii) call path, and
-(iii) system resource. Each dimension can be represented as a tree, where
-non-leaf nodes of the tree can be collapsed or expanded to achieve the
-desired level of granularity.
-
-This module provides the Cube general purpose C++ library component and
-command-line tools.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['http://perftools.pages.jsc.fz-juelich.de/cicd/cubelib/tags/cubelib-%(version)s']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = [
-    '62cf33a51acd9a723fff9a4a5411cd74203e24e0c4ffc5b9e82e011778ed4f2f',  # cubelib-4.7.1.tar.gz
-]
-
-builddependencies = [
-    # use same binutils version that was used when building GCCcore
-    ('binutils', '2.37'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-]
-
-configopts = '--enable-shared'
-
-sanity_check_paths = {
-    'files': ['bin/cubelib-config',
-              ('lib/libcube4.a', 'lib64/libcube4.a'),
-              ('lib/libcube4.%s' % SHLIB_EXT, 'lib64/libcube4.%s' % SHLIB_EXT)],
-    'dirs': ['include/cubelib'],
-}
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/c/CubeWriter/CubeWriter-4.6-GCCcore-11.2.0.eb b/Golden_Repo/c/CubeWriter/CubeWriter-4.6-GCCcore-11.2.0.eb
deleted file mode 100644
index 6426eb932..000000000
--- a/Golden_Repo/c/CubeWriter/CubeWriter-4.6-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,57 +0,0 @@
-##
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-#
-# Copyright:: Copyright 2018-2021 Juelich Supercomputing Centre, Germany
-# Authors::   Markus Geimer <m.geimer@fz-juelich.de>
-#             Christian Feld <c.feld@fz-juelich.de>
-# License::   3-clause BSD
-#
-# This work is based on experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-easyblock = 'EB_Score_minus_P'
-
-name = 'CubeWriter'
-version = '4.6'
-
-homepage = 'https://www.scalasca.org/software/cube-4.x/download.html'
-description = """
-Cube, which is used as performance report explorer for Scalasca and Score-P,
-is a generic tool for displaying a multi-dimensional performance space
-consisting of the dimensions (i) performance metric, (ii) call path, and
-(iii) system resource. Each dimension can be represented as a tree, where
-non-leaf nodes of the tree can be collapsed or expanded to achieve the
-desired level of granularity.
-
-This module provides the Cube high-performance C writer library component.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['http://perftools.pages.jsc.fz-juelich.de/cicd/cubew/tags/cubew-%(version)s']
-sources = ['cubew-%(version)s.tar.gz']
-checksums = [
-    '99fe58ce7ab13061ebfbc360aedaecc28099a30636c5269a42c0cbaf57149aa8',  # cubew-4.6.tar.gz
-]
-
-builddependencies = [
-    # use same binutils version that was used when building GCCcore
-    ('binutils', '2.37'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-]
-
-configopts = '--enable-shared'
-
-sanity_check_paths = {
-    'files': ['bin/cubew-config',
-              ('lib/libcube4w.a', 'lib64/libcube4w.a'),
-              ('lib/libcube4w.%s' % SHLIB_EXT, 'lib64/libcube4w.%s' % SHLIB_EXT)],
-    'dirs': ['include/cubew'],
-}
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/c/CubeWriter/CubeWriter-4.7-GCCcore-11.2.0.eb b/Golden_Repo/c/CubeWriter/CubeWriter-4.7-GCCcore-11.2.0.eb
deleted file mode 100644
index 9792f9618..000000000
--- a/Golden_Repo/c/CubeWriter/CubeWriter-4.7-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,57 +0,0 @@
-##
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-#
-# Copyright:: Copyright 2018-2022 Juelich Supercomputing Centre, Germany
-# Authors::   Markus Geimer <m.geimer@fz-juelich.de>
-#             Christian Feld <c.feld@fz-juelich.de>
-# License::   3-clause BSD
-#
-# This work is based on experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-easyblock = 'EB_Score_minus_P'
-
-name = 'CubeWriter'
-version = '4.7'
-
-homepage = 'https://www.scalasca.org/software/cube-4.x/download.html'
-description = """
-Cube, which is used as performance report explorer for Scalasca and Score-P,
-is a generic tool for displaying a multi-dimensional performance space
-consisting of the dimensions (i) performance metric, (ii) call path, and
-(iii) system resource. Each dimension can be represented as a tree, where
-non-leaf nodes of the tree can be collapsed or expanded to achieve the
-desired level of granularity.
-
-This module provides the Cube high-performance C writer library component.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['http://perftools.pages.jsc.fz-juelich.de/cicd/cubew/tags/cubew-%(version)s']
-sources = ['cubew-%(version)s.tar.gz']
-checksums = [
-    'a7c7fca13e6cb252f08d4380223d7c56a8e86a67de147bcc0279ebb849c884a5',  # cubew-4.7.tar.gz
-]
-
-builddependencies = [
-    # use same binutils version that was used when building GCCcore
-    ('binutils', '2.37'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-]
-
-configopts = '--enable-shared'
-
-sanity_check_paths = {
-    'files': ['bin/cubew-config',
-              ('lib/libcube4w.a', 'lib64/libcube4w.a'),
-              ('lib/libcube4w.%s' % SHLIB_EXT, 'lib64/libcube4w.%s' % SHLIB_EXT)],
-    'dirs': ['include/cubew'],
-}
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/c/CubeWriter/CubeWriter-4.7.1-GCCcore-11.2.0.eb b/Golden_Repo/c/CubeWriter/CubeWriter-4.7.1-GCCcore-11.2.0.eb
deleted file mode 100644
index d12334adf..000000000
--- a/Golden_Repo/c/CubeWriter/CubeWriter-4.7.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,57 +0,0 @@
-##
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-#
-# Copyright:: Copyright 2018-2022 Juelich Supercomputing Centre, Germany
-# Authors::   Markus Geimer <m.geimer@fz-juelich.de>
-#             Christian Feld <c.feld@fz-juelich.de>
-# License::   3-clause BSD
-#
-# This work is based on experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-easyblock = 'EB_Score_minus_P'
-
-name = 'CubeWriter'
-version = '4.7.1'
-
-homepage = 'https://www.scalasca.org/software/cube-4.x/download.html'
-description = """
-Cube, which is used as performance report explorer for Scalasca and Score-P,
-is a generic tool for displaying a multi-dimensional performance space
-consisting of the dimensions (i) performance metric, (ii) call path, and
-(iii) system resource. Each dimension can be represented as a tree, where
-non-leaf nodes of the tree can be collapsed or expanded to achieve the
-desired level of granularity.
-
-This module provides the Cube high-performance C writer library component.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['http://perftools.pages.jsc.fz-juelich.de/cicd/cubew/tags/cubew-%(version)s']
-sources = ['cubew-%(version)s.tar.gz']
-checksums = [
-    '0d364a4930ca876aa887ec40d12399d61a225dbab69e57379b293516d7b6db8d',  # cubew-4.7.1.tar.gz
-]
-
-builddependencies = [
-    # use same binutils version that was used when building GCCcore
-    ('binutils', '2.37'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-]
-
-configopts = '--enable-shared'
-
-sanity_check_paths = {
-    'files': ['bin/cubew-config',
-              ('lib/libcube4w.a', 'lib64/libcube4w.a'),
-              ('lib/libcube4w.%s' % SHLIB_EXT, 'lib64/libcube4w.%s' % SHLIB_EXT)],
-    'dirs': ['include/cubew'],
-}
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/c/cURL/cURL-7.78.0-GCCcore-11.2.0.eb b/Golden_Repo/c/cURL/cURL-7.78.0-GCCcore-11.2.0.eb
deleted file mode 100644
index e66d05453..000000000
--- a/Golden_Repo/c/cURL/cURL-7.78.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,43 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'cURL'
-version = '7.78.0'
-
-homepage = 'https://curl.haxx.se'
-
-description = """
- libcurl is a free and easy-to-use client-side URL transfer library,
- supporting DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP,
- LDAPS, POP3, POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP.
- libcurl supports SSL certificates, HTTP POST, HTTP PUT, FTP uploading, HTTP
- form based upload, proxies, cookies, user+password authentication (Basic,
- Digest, NTLM, Negotiate, Kerberos), file transfer resume, http proxy tunneling
- and more.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://curl.haxx.se/download/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['ed936c0b02c06d42cf84b39dd12bb14b62d77c7c4e875ade022280df5dcc81d7']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('OpenSSL', '1.1', '', True),
-]
-
-configopts = '--with-zlib '
-configopts += '--with-ssl=$EBROOTOPENSSL '
-
-modextravars = {'CURL_INCLUDES': '%(installdir)s/include'}
-
-sanity_check_paths = {
-    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
-    'dirs': ['lib/pkgconfig', 'include/curl'],
-}
-
-moduleclass = 'tools'
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
deleted file mode 100644
index d3b687e15..000000000
--- a/Golden_Repo/c/cairo/cairo-1.16.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,47 +0,0 @@
-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'}
-toolchainopts = {'pic': True}
-
-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/c/ccache/ccache-4.3.eb b/Golden_Repo/c/ccache/ccache-4.3.eb
deleted file mode 100644
index 41469a2e9..000000000
--- a/Golden_Repo/c/ccache/ccache-4.3.eb
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
-# Authors::   Fotis Georgatos <fotis@cern.ch>
-# License::   MIT/GPL
-
-easyblock = 'CMakeNinja'
-
-name = 'ccache'
-version = '4.3'
-
-homepage = 'https://ccache.dev/'
-description = """Ccache (or “ccache”) is a compiler cache. It speeds up recompilation by
-caching previous compilations and detecting when the same compilation is being done again"""
-
-toolchain = SYSTEM
-
-source_urls = ['https://github.com/ccache/ccache/releases/download/v%(version)s/']
-sources = [SOURCE_TAR_GZ]
-checksums = ['b9789c42e52c73e99428f311a34def9ffec3462736439afd12dbacc7987c1533']
-
-osdependencies = [('glibc-static', 'libc6-dev')]
-
-local_gccver = '11.2.0'
-builddependencies = [
-    ('GCC', local_gccver),
-    ('CMake', '3.21.1', '', ('GCCcore', local_gccver)),
-    ('Ninja', '1.10.2', '', ('GCCcore', local_gccver)),
-    ('zstd', '1.5.0', '', ('GCCcore', local_gccver)),
-]
-
-# use BFD linker rather than default ld.gold (required on CentOS 8)
-preconfigopts = 'LDFLAGS="-static -fuse-ld=bfd"'
-configopts = '-DENABLE_DOCUMENTATION=OFF -DENABLE_IPO=ON -DZSTD_LIBRARY="$EBROOTZSTD/lib/libzstd.a" '
-# disable hunt for faster linker, since using ld.gold may fail (on CentOS 8, for example)
-configopts += '-DUSE_FASTER_LINKER=OFF'
-
-sanity_check_paths = {
-    'files': ['bin/ccache'],
-    'dirs': []
-}
-sanity_check_commands = ['ccache --help']
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/c/ceres-solver/ceres-solver-2.0.0-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/c/ceres-solver/ceres-solver-2.0.0-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index 6b5de316c..000000000
--- a/Golden_Repo/c/ceres-solver/ceres-solver-2.0.0-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,38 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'ceres-solver'
-version = '2.0.0'
-
-homepage = 'http://ceres-solver.org'
-description = """
-Ceres Solver is an open source C++ library for modeling and solving large, complicated optimization problems.
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['http://ceres-solver.org/']
-sources = ['%(name)s-%(version)s.tar.gz']
-checksums = ['10298a1d75ca884aa0507d1abb0e0f04800a92871cd400d4c361b56a777a7603']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1', '', SYSTEM)
-]
-
-dependencies = [
-    ('Eigen', '3.3.9'),
-    ('SuiteSparse', '5.10.1', '-nompi'),  # ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('gflags', '2.2.2'),
-    ('glog', '0.5.0'),
-]
-
-configopts = '-DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF '
-configopts += '-DBUILD_SHARED_LIBS=on '
-
-sanity_check_paths = {
-    'files': ['lib/libceres.so', 'include/ceres/ceres.h'],
-    'dirs': [],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/c/cppcheck/cppcheck-2.6-GCCcore-11.2.0.eb b/Golden_Repo/c/cppcheck/cppcheck-2.6-GCCcore-11.2.0.eb
deleted file mode 100644
index 7ad617e42..000000000
--- a/Golden_Repo/c/cppcheck/cppcheck-2.6-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,29 +0,0 @@
-easyblock = 'CMakeMake'
-name = 'cppcheck'
-version = '2.6'
-
-homepage = 'http://cppcheck.sourceforge.net/'
-description = """Cppcheck is a static analysis tool for C/C++ code"""
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [SOURCEFORGE_SOURCE]
-sources = ['%(name)s-%(version)s.tar.bz2']
-checksums = ['ad0baf8558295417700827a4ada1be72ac51f4f52cff09b9a635501f34e968a2']
-
-dependencies = [
-    ('binutils', '2.37'),
-    ('Qt5', '5.15.2'),
-    ('PCRE', '8.45'),
-    ('CMake', '3.21.1', '', SYSTEM),
-]
-
-configopts = '-DUSE_Z3:BOOL=OFF'
-
-sanity_check_paths = {
-    'files': ['bin/cppcheck'],
-    'dirs': [],
-}
-
-moduleclass = 'lang'
diff --git a/Golden_Repo/c/cppy/cppy-1.1.0-GCCcore-11.2.0.eb b/Golden_Repo/c/cppy/cppy-1.1.0-GCCcore-11.2.0.eb
deleted file mode 100644
index c117ab102..000000000
--- a/Golden_Repo/c/cppy/cppy-1.1.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,29 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'cppy'
-version = '1.1.0'
-
-homepage = "https://github.com/nucleic/cppy"
-description = """A small C++ header library which makes it easier to write
-Python extension modules. The primary feature is a PyObject smart pointer
-which automatically handles reference counting and provides convenience
-methods for performing common object operations."""
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [
-    ('Python', '3.9.6'),
-]
-
-source_urls = ['https://github.com/nucleic/cppy/archive/refs/tags/']
-sources = ['%(version)s.tar.gz']
-checksums = ['40a9672df1ec2d7f0b54f70e574101f42131c0f5e47980769f68085e728a4934']
-
-download_dep_fail = True
-sanity_pip_check = True
-use_pip = True
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/c/cuDNN/cuDNN-8.3.1.22-CUDA-11.5.eb b/Golden_Repo/c/cuDNN/cuDNN-8.3.1.22-CUDA-11.5.eb
deleted file mode 100644
index be7b380d4..000000000
--- a/Golden_Repo/c/cuDNN/cuDNN-8.3.1.22-CUDA-11.5.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-name = 'cuDNN'
-version = '8.3.1.22'
-local_cuda_version = '11.5'
-local_cuda_version_majmin = '.'.join(local_cuda_version.split('.')[:2])
-versionsuffix = '-CUDA-%s' % local_cuda_version
-
-homepage = 'https://developer.nvidia.com/cudnn'
-description = """The NVIDIA CUDA Deep Neural Network library (cuDNN) is
-a GPU-accelerated library of primitives for deep neural networks."""
-
-toolchain = SYSTEM
-
-# By downloading, you accept the cuDNN Software License Agreement
-# (https://docs.nvidia.com/deeplearning/sdk/cudnn-sla/index.html)
-# accept_eula = True
-# Url now is
-# https://developer.nvidia.com/compute/cudnn/secure/8.3.1/local_installers/11.5/ \
-# cudnn-linux-x86_64-8.3.1.22_cuda11.5-archive.tar.xz
-# so I doubt this will ever work
-
-source_urls = ['https://developer.download.nvidia.com/compute/redist/cudnn/v%s/' %
-               '.'.join(version.split('.')[:3])]
-local_tarball_tmpl = '-'.join(['%%(namelower)s', local_cuda_version_majmin,
-                              'linux', '%s', 'v%%(version)s.tar.xz'])
-sources = [local_tarball_tmpl % '%(cudnnarch)s']
-checksums = ['f5ff3c69b6a8a9454289b42eca1dd41c3527f70fcf49428eb80502bcf6b02f6e']
-
-
-dependencies = [('CUDA', local_cuda_version)]
-
-sanity_check_paths = {
-    'files': ['include/cudnn.h', 'lib64/libcudnn.so.8'],
-    'dirs': ['include', 'lib64'],
-}
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/c/cuTENSOR/cuTENSOR-1.4.0.6-GCCcore-11.2.0.eb b/Golden_Repo/c/cuTENSOR/cuTENSOR-1.4.0.6-GCCcore-11.2.0.eb
deleted file mode 100644
index 2f13445df..000000000
--- a/Golden_Repo/c/cuTENSOR/cuTENSOR-1.4.0.6-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,41 +0,0 @@
-easyblock = 'Tarball'
-
-name = 'cuTENSOR'
-version = '1.4.0.6'
-
-homepage = 'https://developer.nvidia.com/cutensor'
-description = """The cuTENSOR Library is a GPU-accelerated tensor linear algebra library providing tensor contraction,
-reduction and elementwise operations."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [
-    'https://developer.download.nvidia.com/compute/cutensor/redist/libcutensor/linux-%(arch)s/'
-]
-sources = ['libcutensor-linux-%(arch)s-%(version)s-archive.tar.xz']
-checksums = [
-    {
-        'libcutensor-linux-x86_64-1.4.0.6-archive.tar.xz':
-            '467ba189195fcc4b868334fc16a0ae1e51574139605975cc8004cedebf595964',
-        'libcutensor-linux-ppc64le-1.4.0.6-archive.tar.xz':
-            '5da44ff2562ab7b9286122653e54f28d2222c8aab4bb02e9bdd4cf7e4b7809be',
-        'libcutensor-linux-sbsa-1.4.0.6-archive.tar.xz':
-            '6b06d63a5bc49c1660be8c307795f8a901c93dcde7b064455a6c81333c7327f4',
-    }
-]
-
-dependencies = [('CUDA', '11.5', '', SYSTEM)]
-
-sanity_check_paths = {
-    'files': ['include/cutensor.h', 'include/cutensor/types.h',
-              'lib/%s/libcutensor.%s' % ('%(cudamajver)s', SHLIB_EXT),
-              'lib/%s/libcutensor_static.a' % '%(cudamajver)s'],
-    'dirs': [],
-}
-
-modextrapaths = {
-    'LD_LIBRARY_PATH': ['lib/%s' % '%(cudamajver)s'],
-    'LIBRARY_PATH': ['lib/%s' % '%(cudamajver)s'],
-}
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/d/DB/DB-18.1.40-GCCcore-11.2.0.eb b/Golden_Repo/d/DB/DB-18.1.40-GCCcore-11.2.0.eb
deleted file mode 100644
index 94dd6b092..000000000
--- a/Golden_Repo/d/DB/DB-18.1.40-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,33 +0,0 @@
-name = 'DB'
-version = '18.1.40'
-
-homepage = 'https://www.oracle.com/technetwork/products/berkeleydb'
-
-description = """Berkeley DB enables the development of custom data management
- solutions, without the overhead traditionally associated with such custom
- projects."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-# use http to allow auto-downloading...
-source_urls = ['http://download.oracle.com/berkeley-db/']
-sources = [SOURCELOWER_TAR_GZ]
-patches = ['%(name)s-%(version)s_fix_doc_install.patch']
-checksums = [
-    '0cecb2ef0c67b166de93732769abdeba0555086d51de1090df325e18ee8da9c8',  # db-18.1.40.tar.gz
-    '441f48568156f72f02a8662998d293cc7edad687604b4f8af722f21c6db2a52d',  # DB-18.1.40_fix_doc_install.patch
-]
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [('OpenSSL', '1.1', '', True)]
-
-sanity_check_paths = {
-    'files': ['bin/db_%s' % x for x in ['archive', 'checkpoint', 'convert', 'deadlock', 'dump', 'hotbackup',
-                                        'load', 'log_verify', 'printlog', 'recover', 'replicate', 'stat',
-                                        'tuner', 'upgrade', 'verify']] +
-             ['include/db.h', 'lib/libdb.a', 'lib/libdb.%s' % SHLIB_EXT],
-    'dirs': [],
-}
-
-moduleclass = 'tools'
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
deleted file mode 100644
index 3591a2519..000000000
--- a/Golden_Repo/d/DBus/DBus-1.13.18-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,42 +0,0 @@
-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/DWave/DWave-4.2.0-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/d/DWave/DWave-4.2.0-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index 51437e8ff..000000000
--- a/Golden_Repo/d/DWave/DWave-4.2.0-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,161 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'DWave'
-version = '4.2.0'
-
-homepage = 'https://docs.ocean.dwavesys.com'
-description = """Ocean software is a suite of tools D-Wave Systems for solving hard problems with quantum computers."""
-
-site_contacts = 'c.gonzalez.calaza@fz-juelich.de'
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1', '', SYSTEM),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10'),
-    ('protobuf-python', '3.17.3'),
-]
-
-exts_default_options = {
-    'source_urls': [PYPI_SOURCE],
-    'use_pip': True,
-    'sanity_pip_check': True,
-    'download_dep_fail': True,
-    'use_pip_for_deps': False,
-}
-
-exts_list = [
-    ('PySocks', '1.7.1', {
-        'modulename': 'socks',
-
-        'checksums': ['3f8804571ebe159c380ac6de37643bb4685970655d3bba243530d6558b799aa0'],
-    }),
-    ('pydantic', '1.8.2', {
-        'checksums': ['26464e57ccaafe72b7ad156fdaa4e9b9ef051f69e175dbbb463283000c05ab7b'],
-    }),
-    ('homebase', '1.0.1', {
-        'checksums': ['9ee008df4298b420852d815e6df488822229c4bd8d571bcd0a454e04232c635e'],
-    }),
-    ('plucky', '0.4.3', {
-        'checksums': ['5bc75d43ae6b40f1b7ba42000b37e4934fa6bd2d6a6cd4e47461f803a404c194'],
-    }),
-    ('diskcache', '5.2.1', {
-        'checksums': ['1805acd5868ac10ad547208951a1190a0ab7bbff4e70f9a07cde4dbdfaa69f64'],
-    }),
-    ('dwave-cloud-client', '0.9.2', {
-        'modulename': 'dwave.cloud',
-        'checksums': ['495427ca999eebaf9d753dc85792329b0c0a69cd7fe0791dc53dc222e9f1c22d'],
-    }),
-    ('dwave_networkx', '0.8.10', {
-        'modulename': 'dwave_networkx',
-        'patches': ['dwave_networkx_fix_decorator-5.0.9.patch'],
-        'checksums': [
-            # dwave_networkx-0.8.10.tar.gz
-            'fc4e6b16b233d4cb66915bc14c5d88228d3efbc2f762bce14860496b60e6af6f',
-            # dwave_networkx_fix_decorator-5.0.9.patch
-            'f84f859cb153de6920b03e9ea218d450682984b08c0a905c5d954a9063f3f856',
-        ],
-    }),
-    ('dwave-system', '1.10.0', {
-        'modulename': 'dwave.system',
-        'checksums': ['391f93b8d6b22a6cae89ea3f39f2ccbb56f736cae050d6a60fe86d2834dbaab3'],
-    }),
-    ('dwave-qbsolv', '0.3.3', {
-        'modulename': 'dwave_qbsolv',
-        'checksums': ['aa5ac45698dc6254b603aa41c62e9a59043d9c03f8be131b134c9800a23f7d34'],
-    }),
-    ('dwave-hybrid', '0.6.4', {
-        'modulename': 'hybrid',
-        'checksums': ['f7b6b104ba2da12d6a5cddf6164621603814cb8599d0ebcbe8c7f7f4a164291c'],
-    }),
-    ('dwave-neal', '0.5.8', {
-        'modulename': 'neal',
-        'checksums': ['1855edb23fe1636c1f0cd4872baee2f4baabb7bd3fcfb54d8f9dfe4711fa44ea'],
-    }),
-    ('dimod', '0.10.7', {
-        'checksums': ['c4df0bee13962542cd2cc357be863b25cbf3b660a970b2033ebcdac1549b4d4a'],
-    }),
-    ('dwave-preprocessing', '0.3.1.post0', {
-        'modulename': 'dwave.preprocessing',
-        'source_tmpl': 'dwave_preprocessing-%(version)s-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl',
-        'checksums': ['d6dafe2cae21bcd7f301768d6506331c469d8c5b336be63ce8f0d761d6464c27'],
-    }),
-    ('dwavebinarycsp', '0.1.3', {
-        'checksums': ['f2fbd920170da48bfb8fb2d794e92300330408b3d017ff103c99898a2a5a542c'],
-    }),
-    ('fasteners', '0.16.3', {
-        'checksums': ['b1ab4e5adfbc28681ce44b3024421c4f567e705cc3963c732bf1cba3348307de'],
-    }),
-    ('minorminer', '0.2.6', {
-        'checksums': ['1b78cd0fb24dd9fc00be61a536fb982d4cf8d5120ca5a1be94a71914b9ba0943'],
-    }),
-    ('penaltymodel', '0.16.5', {
-        'checksums': ['67b14851fcc7c695276ee075f125cb6299adc603032090641ada80cf49c542c2'],
-    }),
-    ('penaltymodel-cache', '0.4.4', {
-        'modulename': 'penaltymodel.cache',
-        'checksums': ['126cd21c38966fb0b03fbb030eb6ba041622951d35838e725bc727063634aa52'],
-    }),
-    ('penaltymodel-lp', '0.1.5', {
-        'modulename': 'penaltymodel.lp',
-        'checksums': ['9e09b826925a343ae1e282f5899722b7ec97464121e20fed65ca1aba1b092d29'],
-    }),
-    ('ortools', '8.0.8283', {
-        'source_tmpl': 'ortools-%(version)s-cp39-cp39-manylinux1_x86_64.whl',
-        'unpack_sources': False,
-        'checksums': ['fc4582a69497a5790115afd5a3b4d246487138eaa055ad68350457653dffc6af'],
-    }),
-    ('penaltymodel-mip', '0.2.5', {
-        'modulename': 'penaltymodel.mip',
-        'checksums': ['8cd5ecb70c9381687c705bcf0992de44596701d2d9afa6490182db91f4ebe12f'],
-    }),
-    ('wrapt', '1.12.1', {
-        'checksums': ['b62ffa81fb85f4332a4f609cab4ac40709470da05643a082ec1eb88e6d9b97d7'],
-    }),
-    ('Deprecated', '1.2.13', {
-        'checksums': ['43ac5335da90c31c24ba028af536a91d41d53f9e6901ddb021bcc572ce44e38d'],
-    }),
-    ('pyqubo', '1.0.13', {
-        'checksums': ['2590845871585d72d90e0062717aecee74a682f8aa1561100be691fc99f36e42'],
-    }),
-    ('dwave-inspector', '0.2.7', {
-        'modulename': 'dwave.inspector',
-        'checksums': ['4928c1587549db0d9ea536e8172a8eb2911068f51447903fc564f4898cee52fe'],
-    }),
-    ('dwave-tabu', '0.4.2', {
-        'modulename': 'tabu',
-        'checksums': ['2fa92ebfa57531de3071eaab1d074c9de8510562c3115b25adade40668ec6991'],
-    }),
-    ('dwave-greedy', '0.2.1', {
-        'modulename': 'greedy',
-        'checksums': ['61ad1dbe72921d0b5d4679257346aa225b33c62825a8eb504573286c2fc1a8a7'],
-    }),
-    ('dwave-ocean-sdk', version, {
-        'modulename': 'dwave.system',
-        'skipsteps': ['sanitycheck'],
-        'checksums': ['5f43fc38c75d9be607f50c6f15641ddb0a671804e6367ab7a333bba1e13b0cd0'],
-    }),
-    ('dwave-drivers', '0.4.4', {
-        'modulename': 'dwave.drivers',
-        'pip_no_index': True,
-        'source_tmpl': 'dwave_drivers-%(version)s-py3-none-any.whl',
-        'source_urls': ['https://pypi.dwavesys.com/simple/%(name)s'],
-        'checksums': ['8e5b37e97be7610c00005e5f8a3c10f27f7cec4bd2b88c80f9c6fef8172a3c3f'],
-    }),
-    ('dwave-inspectorapp', '0.2.3', {
-        'modulename': 'dwave.inspector',
-        'pip_no_index': True,
-        'source_tmpl': 'dwave_inspectorapp-%(version)s-py3-none-any.whl',
-        'source_urls': ['https://pypi.dwavesys.com/simple/%(name)s'],
-        'checksums': ['19ea82284720a5e92c075fb2d5af9854d6ddfc3d0c123b26238274ab75e3d1dd'],
-    }),
-]
-
-moduleclass = 'quantum'
diff --git a/Golden_Repo/d/DWave/dwave_networkx_fix_decorator-5.0.9.patch b/Golden_Repo/d/DWave/dwave_networkx_fix_decorator-5.0.9.patch
deleted file mode 100644
index 4932df36f..000000000
--- a/Golden_Repo/d/DWave/dwave_networkx_fix_decorator-5.0.9.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.original	2021-11-24 17:50:10.783653460 +0100
-+++ setup.py	2021-11-24 17:50:41.154058903 +0100
-@@ -30,7 +30,7 @@
-             ]
- 
- install_requires = ['networkx>=2.0,<3.0',
--                    'decorator>=4.1.0,<5.0.0',
-+                    'decorator>=4.1.0,<=5.0.9',
-                     'dimod>=0.8.0,!=0.10.0,!=0.10.1,!=0.10.2,!=0.10.3,!=0.10.4',
-                     ]
- 
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
deleted file mode 100644
index 394f61d36..000000000
--- a/Golden_Repo/d/Doxygen/Doxygen-1.9.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,28 +0,0 @@
-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/darshan-runtime/darshan-runtime-3.3.1-gompi-2021b.eb b/Golden_Repo/d/darshan-runtime/darshan-runtime-3.3.1-gompi-2021b.eb
deleted file mode 100644
index ef7283d66..000000000
--- a/Golden_Repo/d/darshan-runtime/darshan-runtime-3.3.1-gompi-2021b.eb
+++ /dev/null
@@ -1,63 +0,0 @@
-easyblock = "ConfigureMake"
-name = "darshan-runtime"
-version = "3.3.1"
-
-homepage = 'http://www.mcs.anl.gov/research/projects/darshan/'
-
-description = """Darshan is designed to capture an accurate picture of
-application I/O behavior, including properties such as patterns of
-access within files, with minimum overhead.  The name is taken from a
-Sanskrit word for “sight” or “vision”.
-
-Darshan can be used to investigate and tune the I/O behavior of
-complex HPC applications.  In addition, Darshan’s lightweight design
-makes it suitable for full time deployment for workload
-characterization of large systems.  We hope that such studies will
-help the storage research community to better serve the needs of
-scientific computing.
-
-Darshan was originally developed on the IBM Blue Gene series of
-computers deployed at the Argonne Leadership Computing Facility, but
-it is portable across a wide variety of platforms include the Cray
-XE6, Cray XC30, and Linux clusters.  Darshan routinely instruments
-jobs using up to 786,432 compute cores on the Mira system at ALCF.
-"""
-
-usage = """
-Export the environment variable DARSHAN_LOG_PATH to where the logging
-data should be written, e.g.
-
-LD_PRELOAD=$EBROOTDARSHANMINRUNTIME/lib/libdarshan.so \
-DARSHAN_LOG_PATH=/path/to/your/logdir \
-srun -n 32 ./executable
-
-Note:
-
-Darshan currently only works with C or C++ codes, not with Fortran.
-"""
-
-toolchain = {'name': 'gompi', 'version': '2021b'}
-
-sources = ['ftp://ftp.mcs.anl.gov/pub/darshan/releases/darshan-%s.tar.gz' % version]
-checksums = ['281d871335977d0592a49d053df93d68ce1840f6fdec27fea7a59586a84395f7']  # darshan-3.3.1.tar.gz
-
-local_subpath = 'darshan-runtime'
-preconfigopts = 'cd %s;' % local_subpath
-configopts = '--with-mem-align=8 --with-log-path-by-env=DARSHAN_LOG_PATH '
-configopts += ' --with-jobid-env=SLURM_JOBID CC=mpicc --enable-hdf5-mod=$EBROOTHDF5'
-
-prebuildopts = 'cd %s;' % local_subpath
-
-preinstallopts = 'cd %s;' % local_subpath
-
-sanity_check_paths = {
-    'files': ["lib/libdarshan.so"],
-    'dirs': []
-}
-
-dependencies = [
-    ("HDF5", "1.12.1"),
-]
-
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/d/darshan-runtime/darshan-runtime-3.3.1-gpsmpi-2021b.eb b/Golden_Repo/d/darshan-runtime/darshan-runtime-3.3.1-gpsmpi-2021b.eb
deleted file mode 100644
index 3db5103a8..000000000
--- a/Golden_Repo/d/darshan-runtime/darshan-runtime-3.3.1-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,63 +0,0 @@
-easyblock = "ConfigureMake"
-name = "darshan-runtime"
-version = "3.3.1"
-
-homepage = 'http://www.mcs.anl.gov/research/projects/darshan/'
-
-description = """Darshan is designed to capture an accurate picture of
-application I/O behavior, including properties such as patterns of
-access within files, with minimum overhead.  The name is taken from a
-Sanskrit word for “sight” or “vision”.
-
-Darshan can be used to investigate and tune the I/O behavior of
-complex HPC applications.  In addition, Darshan’s lightweight design
-makes it suitable for full time deployment for workload
-characterization of large systems.  We hope that such studies will
-help the storage research community to better serve the needs of
-scientific computing.
-
-Darshan was originally developed on the IBM Blue Gene series of
-computers deployed at the Argonne Leadership Computing Facility, but
-it is portable across a wide variety of platforms include the Cray
-XE6, Cray XC30, and Linux clusters.  Darshan routinely instruments
-jobs using up to 786,432 compute cores on the Mira system at ALCF.
-"""
-
-usage = """
-Export the environment variable DARSHAN_LOG_PATH to where the logging
-data should be written, e.g.
-
-LD_PRELOAD=$EBROOTDARSHANMINRUNTIME/lib/libdarshan.so \
-DARSHAN_LOG_PATH=/path/to/your/logdir \
-srun -n 32 ./executable
-
-Note:
-
-Darshan currently only works with C or C++ codes, not with Fortran.
-"""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-
-sources = ['ftp://ftp.mcs.anl.gov/pub/darshan/releases/darshan-%s.tar.gz' % version]
-checksums = ['281d871335977d0592a49d053df93d68ce1840f6fdec27fea7a59586a84395f7']  # darshan-3.3.1.tar.gz
-
-local_subpath = 'darshan-runtime'
-preconfigopts = 'cd %s;' % local_subpath
-configopts = '--with-mem-align=8 --with-log-path-by-env=DARSHAN_LOG_PATH '
-configopts += ' --with-jobid-env=SLURM_JOBID CC=mpicc --enable-hdf5-mod=$EBROOTHDF5'
-
-prebuildopts = 'cd %s;' % local_subpath
-
-preinstallopts = 'cd %s;' % local_subpath
-
-sanity_check_paths = {
-    'files': ["lib/libdarshan.so"],
-    'dirs': []
-}
-
-dependencies = [
-    ("HDF5", "1.12.1"),
-]
-
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/d/darshan-runtime/darshan-runtime-3.3.1-iimpi-2021b.eb b/Golden_Repo/d/darshan-runtime/darshan-runtime-3.3.1-iimpi-2021b.eb
deleted file mode 100644
index 5d066b91b..000000000
--- a/Golden_Repo/d/darshan-runtime/darshan-runtime-3.3.1-iimpi-2021b.eb
+++ /dev/null
@@ -1,63 +0,0 @@
-easyblock = "ConfigureMake"
-name = "darshan-runtime"
-version = "3.3.1"
-
-homepage = 'http://www.mcs.anl.gov/research/projects/darshan/'
-
-description = """Darshan is designed to capture an accurate picture of
-application I/O behavior, including properties such as patterns of
-access within files, with minimum overhead.  The name is taken from a
-Sanskrit word for “sight” or “vision”.
-
-Darshan can be used to investigate and tune the I/O behavior of
-complex HPC applications.  In addition, Darshan’s lightweight design
-makes it suitable for full time deployment for workload
-characterization of large systems.  We hope that such studies will
-help the storage research community to better serve the needs of
-scientific computing.
-
-Darshan was originally developed on the IBM Blue Gene series of
-computers deployed at the Argonne Leadership Computing Facility, but
-it is portable across a wide variety of platforms include the Cray
-XE6, Cray XC30, and Linux clusters.  Darshan routinely instruments
-jobs using up to 786,432 compute cores on the Mira system at ALCF.
-"""
-
-usage = """
-Export the environment variable DARSHAN_LOG_PATH to where the logging
-data should be written, e.g.
-
-LD_PRELOAD=$EBROOTDARSHANMINRUNTIME/lib/libdarshan.so \
-DARSHAN_LOG_PATH=/path/to/your/logdir \
-srun -n 32 ./executable
-
-Note:
-
-Darshan currently only works with C or C++ codes, not with Fortran.
-"""
-
-toolchain = {'name': 'iimpi', 'version': '2021b'}
-
-sources = ['ftp://ftp.mcs.anl.gov/pub/darshan/releases/darshan-%s.tar.gz' % version]
-checksums = ['281d871335977d0592a49d053df93d68ce1840f6fdec27fea7a59586a84395f7']  # darshan-3.3.1.tar.gz
-
-local_subpath = 'darshan-runtime'
-preconfigopts = 'cd %s;' % local_subpath
-configopts = '--with-mem-align=8 --with-log-path-by-env=DARSHAN_LOG_PATH '
-configopts += ' --with-jobid-env=SLURM_JOBID CC=mpicc --enable-hdf5-mod=$EBROOTHDF5'
-
-prebuildopts = 'cd %s;' % local_subpath
-
-preinstallopts = 'cd %s;' % local_subpath
-
-sanity_check_paths = {
-    'files': ["lib/libdarshan.so"],
-    'dirs': []
-}
-
-dependencies = [
-    ("HDF5", "1.12.1"),
-]
-
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/d/darshan-runtime/darshan-runtime-3.3.1-ipsmpi-2021b.eb b/Golden_Repo/d/darshan-runtime/darshan-runtime-3.3.1-ipsmpi-2021b.eb
deleted file mode 100644
index e1326d967..000000000
--- a/Golden_Repo/d/darshan-runtime/darshan-runtime-3.3.1-ipsmpi-2021b.eb
+++ /dev/null
@@ -1,63 +0,0 @@
-easyblock = "ConfigureMake"
-name = "darshan-runtime"
-version = "3.3.1"
-
-homepage = 'http://www.mcs.anl.gov/research/projects/darshan/'
-
-description = """Darshan is designed to capture an accurate picture of
-application I/O behavior, including properties such as patterns of
-access within files, with minimum overhead.  The name is taken from a
-Sanskrit word for “sight” or “vision”.
-
-Darshan can be used to investigate and tune the I/O behavior of
-complex HPC applications.  In addition, Darshan’s lightweight design
-makes it suitable for full time deployment for workload
-characterization of large systems.  We hope that such studies will
-help the storage research community to better serve the needs of
-scientific computing.
-
-Darshan was originally developed on the IBM Blue Gene series of
-computers deployed at the Argonne Leadership Computing Facility, but
-it is portable across a wide variety of platforms include the Cray
-XE6, Cray XC30, and Linux clusters.  Darshan routinely instruments
-jobs using up to 786,432 compute cores on the Mira system at ALCF.
-"""
-
-usage = """
-Export the environment variable DARSHAN_LOG_PATH to where the logging
-data should be written, e.g.
-
-LD_PRELOAD=$EBROOTDARSHANMINRUNTIME/lib/libdarshan.so \
-DARSHAN_LOG_PATH=/path/to/your/logdir \
-srun -n 32 ./executable
-
-Note:
-
-Darshan currently only works with C or C++ codes, not with Fortran.
-"""
-
-toolchain = {'name': 'ipsmpi', 'version': '2021b'}
-
-sources = ['ftp://ftp.mcs.anl.gov/pub/darshan/releases/darshan-%s.tar.gz' % version]
-checksums = ['281d871335977d0592a49d053df93d68ce1840f6fdec27fea7a59586a84395f7']  # darshan-3.3.1.tar.gz
-
-local_subpath = 'darshan-runtime'
-preconfigopts = 'cd %s;' % local_subpath
-configopts = '--with-mem-align=8 --with-log-path-by-env=DARSHAN_LOG_PATH '
-configopts += ' --with-jobid-env=SLURM_JOBID CC=mpicc --enable-hdf5-mod=$EBROOTHDF5'
-
-prebuildopts = 'cd %s;' % local_subpath
-
-preinstallopts = 'cd %s;' % local_subpath
-
-sanity_check_paths = {
-    'files': ["lib/libdarshan.so"],
-    'dirs': []
-}
-
-dependencies = [
-    ("HDF5", "1.12.1"),
-]
-
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/d/darshan-runtime/darshan-runtime-3.3.1-npsmpic-2021b.eb b/Golden_Repo/d/darshan-runtime/darshan-runtime-3.3.1-npsmpic-2021b.eb
deleted file mode 100644
index c017cc32a..000000000
--- a/Golden_Repo/d/darshan-runtime/darshan-runtime-3.3.1-npsmpic-2021b.eb
+++ /dev/null
@@ -1,63 +0,0 @@
-easyblock = "ConfigureMake"
-name = "darshan-runtime"
-version = "3.3.1"
-
-homepage = 'http://www.mcs.anl.gov/research/projects/darshan/'
-
-description = """Darshan is designed to capture an accurate picture of
-application I/O behavior, including properties such as patterns of
-access within files, with minimum overhead.  The name is taken from a
-Sanskrit word for “sight” or “vision”.
-
-Darshan can be used to investigate and tune the I/O behavior of
-complex HPC applications.  In addition, Darshan’s lightweight design
-makes it suitable for full time deployment for workload
-characterization of large systems.  We hope that such studies will
-help the storage research community to better serve the needs of
-scientific computing.
-
-Darshan was originally developed on the IBM Blue Gene series of
-computers deployed at the Argonne Leadership Computing Facility, but
-it is portable across a wide variety of platforms include the Cray
-XE6, Cray XC30, and Linux clusters.  Darshan routinely instruments
-jobs using up to 786,432 compute cores on the Mira system at ALCF.
-"""
-
-usage = """
-Export the environment variable DARSHAN_LOG_PATH to where the logging
-data should be written, e.g.
-
-LD_PRELOAD=$EBROOTDARSHANMINRUNTIME/lib/libdarshan.so \
-DARSHAN_LOG_PATH=/path/to/your/logdir \
-srun -n 32 ./executable
-
-Note:
-
-Darshan currently only works with C or C++ codes, not with Fortran.
-"""
-
-toolchain = {'name': 'npsmpic', 'version': '2021b'}
-
-sources = ['ftp://ftp.mcs.anl.gov/pub/darshan/releases/darshan-%s.tar.gz' % version]
-checksums = ['281d871335977d0592a49d053df93d68ce1840f6fdec27fea7a59586a84395f7']  # darshan-3.3.1.tar.gz
-
-local_subpath = 'darshan-runtime'
-preconfigopts = 'cd %s;' % local_subpath
-configopts = '--with-mem-align=8 --with-log-path-by-env=DARSHAN_LOG_PATH '
-configopts += ' --with-jobid-env=SLURM_JOBID CC=mpicc --enable-hdf5-mod=$EBROOTHDF5'
-
-prebuildopts = 'cd %s;' % local_subpath
-
-preinstallopts = 'cd %s;' % local_subpath
-
-sanity_check_paths = {
-    'files': ["lib/libdarshan.so"],
-    'dirs': []
-}
-
-dependencies = [
-    ("HDF5", "1.12.1"),
-]
-
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/d/darshan-runtime/darshan-runtime-3.3.1-nvompic-2021b.eb b/Golden_Repo/d/darshan-runtime/darshan-runtime-3.3.1-nvompic-2021b.eb
deleted file mode 100644
index 23e2bdb8b..000000000
--- a/Golden_Repo/d/darshan-runtime/darshan-runtime-3.3.1-nvompic-2021b.eb
+++ /dev/null
@@ -1,63 +0,0 @@
-easyblock = "ConfigureMake"
-name = "darshan-runtime"
-version = "3.3.1"
-
-homepage = 'http://www.mcs.anl.gov/research/projects/darshan/'
-
-description = """Darshan is designed to capture an accurate picture of
-application I/O behavior, including properties such as patterns of
-access within files, with minimum overhead.  The name is taken from a
-Sanskrit word for “sight” or “vision”.
-
-Darshan can be used to investigate and tune the I/O behavior of
-complex HPC applications.  In addition, Darshan’s lightweight design
-makes it suitable for full time deployment for workload
-characterization of large systems.  We hope that such studies will
-help the storage research community to better serve the needs of
-scientific computing.
-
-Darshan was originally developed on the IBM Blue Gene series of
-computers deployed at the Argonne Leadership Computing Facility, but
-it is portable across a wide variety of platforms include the Cray
-XE6, Cray XC30, and Linux clusters.  Darshan routinely instruments
-jobs using up to 786,432 compute cores on the Mira system at ALCF.
-"""
-
-usage = """
-Export the environment variable DARSHAN_LOG_PATH to where the logging
-data should be written, e.g.
-
-LD_PRELOAD=$EBROOTDARSHANMINRUNTIME/lib/libdarshan.so \
-DARSHAN_LOG_PATH=/path/to/your/logdir \
-srun -n 32 ./executable
-
-Note:
-
-Darshan currently only works with C or C++ codes, not with Fortran.
-"""
-
-toolchain = {'name': 'nvompic', 'version': '2021b'}
-
-sources = ['ftp://ftp.mcs.anl.gov/pub/darshan/releases/darshan-%s.tar.gz' % version]
-checksums = ['281d871335977d0592a49d053df93d68ce1840f6fdec27fea7a59586a84395f7']  # darshan-3.3.1.tar.gz
-
-local_subpath = 'darshan-runtime'
-preconfigopts = 'cd %s;' % local_subpath
-configopts = '--with-mem-align=8 --with-log-path-by-env=DARSHAN_LOG_PATH '
-configopts += ' --with-jobid-env=SLURM_JOBID CC=mpicc --enable-hdf5-mod=$EBROOTHDF5'
-
-prebuildopts = 'cd %s;' % local_subpath
-
-preinstallopts = 'cd %s;' % local_subpath
-
-sanity_check_paths = {
-    'files': ["lib/libdarshan.so"],
-    'dirs': []
-}
-
-dependencies = [
-    ("HDF5", "1.12.1"),
-]
-
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/d/darshan-runtime/darshan-runtime-3.4.0-gompi-2021b.eb b/Golden_Repo/d/darshan-runtime/darshan-runtime-3.4.0-gompi-2021b.eb
deleted file mode 100644
index 526ca0193..000000000
--- a/Golden_Repo/d/darshan-runtime/darshan-runtime-3.4.0-gompi-2021b.eb
+++ /dev/null
@@ -1,63 +0,0 @@
-easyblock = "ConfigureMake"
-name = "darshan-runtime"
-version = "3.4.0"
-
-homepage = 'http://www.mcs.anl.gov/research/projects/darshan/'
-
-description = """Darshan is designed to capture an accurate picture of
-application I/O behavior, including properties such as patterns of
-access within files, with minimum overhead.  The name is taken from a
-Sanskrit word for “sight” or “vision”.
-
-Darshan can be used to investigate and tune the I/O behavior of
-complex HPC applications.  In addition, Darshan’s lightweight design
-makes it suitable for full time deployment for workload
-characterization of large systems.  We hope that such studies will
-help the storage research community to better serve the needs of
-scientific computing.
-
-Darshan was originally developed on the IBM Blue Gene series of
-computers deployed at the Argonne Leadership Computing Facility, but
-it is portable across a wide variety of platforms include the Cray
-XE6, Cray XC30, and Linux clusters.  Darshan routinely instruments
-jobs using up to 786,432 compute cores on the Mira system at ALCF.
-"""
-
-usage = """
-Export the environment variable DARSHAN_LOG_PATH to where the logging
-data should be written, e.g.
-
-LD_PRELOAD=$EBROOTDARSHANMINRUNTIME/lib/libdarshan.so \
-DARSHAN_LOG_PATH=/path/to/your/logdir \
-srun -n 32 ./executable
-
-Note:
-
-Darshan currently only works with C or C++ codes, not with Fortran.
-"""
-
-toolchain = {'name': 'gompi', 'version': '2021b'}
-
-sources = ['ftp://ftp.mcs.anl.gov/pub/darshan/releases/darshan-%s.tar.gz' % version]
-checksums = ['7cc88b7c130ec3b574f6b73c63c3c05deec67b1350245de6d39ca91d4cff0842']  # darshan-3.3.1.tar.gz
-
-local_subpath = 'darshan-runtime'
-preconfigopts = 'cd %s; ../prepare.sh;' % local_subpath
-configopts = '--with-mem-align=8 --with-log-path-by-env=DARSHAN_LOG_PATH '
-configopts += ' --with-jobid-env=SLURM_JOBID CC=mpicc --enable-hdf5-mod --with-hdf5=$EBROOTHDF5'
-
-prebuildopts = 'cd %s;' % local_subpath
-
-preinstallopts = 'cd %s;' % local_subpath
-
-sanity_check_paths = {
-    'files': ["lib/libdarshan.so"],
-    'dirs': []
-}
-
-dependencies = [
-    ("HDF5", "1.12.1"),
-]
-
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/d/darshan-runtime/darshan-runtime-3.4.0-gpsmpi-2021b.eb b/Golden_Repo/d/darshan-runtime/darshan-runtime-3.4.0-gpsmpi-2021b.eb
deleted file mode 100644
index f3feded55..000000000
--- a/Golden_Repo/d/darshan-runtime/darshan-runtime-3.4.0-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,63 +0,0 @@
-easyblock = "ConfigureMake"
-name = "darshan-runtime"
-version = "3.4.0"
-
-homepage = 'http://www.mcs.anl.gov/research/projects/darshan/'
-
-description = """Darshan is designed to capture an accurate picture of
-application I/O behavior, including properties such as patterns of
-access within files, with minimum overhead.  The name is taken from a
-Sanskrit word for “sight” or “vision”.
-
-Darshan can be used to investigate and tune the I/O behavior of
-complex HPC applications.  In addition, Darshan’s lightweight design
-makes it suitable for full time deployment for workload
-characterization of large systems.  We hope that such studies will
-help the storage research community to better serve the needs of
-scientific computing.
-
-Darshan was originally developed on the IBM Blue Gene series of
-computers deployed at the Argonne Leadership Computing Facility, but
-it is portable across a wide variety of platforms include the Cray
-XE6, Cray XC30, and Linux clusters.  Darshan routinely instruments
-jobs using up to 786,432 compute cores on the Mira system at ALCF.
-"""
-
-usage = """
-Export the environment variable DARSHAN_LOG_PATH to where the logging
-data should be written, e.g.
-
-LD_PRELOAD=$EBROOTDARSHANMINRUNTIME/lib/libdarshan.so \
-DARSHAN_LOG_PATH=/path/to/your/logdir \
-srun -n 32 ./executable
-
-Note:
-
-Darshan currently only works with C or C++ codes, not with Fortran.
-"""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-
-sources = ['ftp://ftp.mcs.anl.gov/pub/darshan/releases/darshan-%s.tar.gz' % version]
-checksums = ['7cc88b7c130ec3b574f6b73c63c3c05deec67b1350245de6d39ca91d4cff0842']
-
-local_subpath = 'darshan-runtime'
-preconfigopts = 'cd %s; ../prepare.sh;' % local_subpath
-configopts = '--with-mem-align=8 --with-log-path-by-env=DARSHAN_LOG_PATH '
-configopts += ' --with-jobid-env=SLURM_JOBID CC=mpicc --enable-hdf5-mod --with-hdf5=$EBROOTHDF5'
-
-prebuildopts = 'cd %s;' % local_subpath
-
-preinstallopts = 'cd %s;' % local_subpath
-
-sanity_check_paths = {
-    'files': ["lib/libdarshan.so"],
-    'dirs': []
-}
-
-dependencies = [
-    ("HDF5", "1.12.1"),
-]
-
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/d/darshan-runtime/darshan-runtime-3.4.0-npsmpic-2021b.eb b/Golden_Repo/d/darshan-runtime/darshan-runtime-3.4.0-npsmpic-2021b.eb
deleted file mode 100644
index cf5c6309c..000000000
--- a/Golden_Repo/d/darshan-runtime/darshan-runtime-3.4.0-npsmpic-2021b.eb
+++ /dev/null
@@ -1,63 +0,0 @@
-easyblock = "ConfigureMake"
-name = "darshan-runtime"
-version = "3.4.0"
-
-homepage = 'http://www.mcs.anl.gov/research/projects/darshan/'
-
-description = """Darshan is designed to capture an accurate picture of
-application I/O behavior, including properties such as patterns of
-access within files, with minimum overhead.  The name is taken from a
-Sanskrit word for “sight” or “vision”.
-
-Darshan can be used to investigate and tune the I/O behavior of
-complex HPC applications.  In addition, Darshan’s lightweight design
-makes it suitable for full time deployment for workload
-characterization of large systems.  We hope that such studies will
-help the storage research community to better serve the needs of
-scientific computing.
-
-Darshan was originally developed on the IBM Blue Gene series of
-computers deployed at the Argonne Leadership Computing Facility, but
-it is portable across a wide variety of platforms include the Cray
-XE6, Cray XC30, and Linux clusters.  Darshan routinely instruments
-jobs using up to 786,432 compute cores on the Mira system at ALCF.
-"""
-
-usage = """
-Export the environment variable DARSHAN_LOG_PATH to where the logging
-data should be written, e.g.
-
-LD_PRELOAD=$EBROOTDARSHANMINRUNTIME/lib/libdarshan.so \
-DARSHAN_LOG_PATH=/path/to/your/logdir \
-srun -n 32 ./executable
-
-Note:
-
-Darshan currently only works with C or C++ codes, not with Fortran.
-"""
-
-toolchain = {'name': 'npsmpic', 'version': '2021b'}
-
-sources = ['ftp://ftp.mcs.anl.gov/pub/darshan/releases/darshan-%s.tar.gz' % version]
-checksums = ['7cc88b7c130ec3b574f6b73c63c3c05deec67b1350245de6d39ca91d4cff0842']
-
-local_subpath = 'darshan-runtime'
-preconfigopts = 'cd %s; ../prepare.sh;' % local_subpath
-configopts = '--with-mem-align=8 --with-log-path-by-env=DARSHAN_LOG_PATH '
-configopts += ' --with-jobid-env=SLURM_JOBID CC=mpicc --enable-hdf5-mod --with-hdf5=$EBROOTHDF5'
-
-prebuildopts = 'cd %s;' % local_subpath
-
-preinstallopts = 'cd %s;' % local_subpath
-
-sanity_check_paths = {
-    'files': ["lib/libdarshan.so"],
-    'dirs': []
-}
-
-dependencies = [
-    ("HDF5", "1.12.1"),
-]
-
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/d/darshan-runtime/darshan-runtime-3.4.0-nvompic-2021b.eb b/Golden_Repo/d/darshan-runtime/darshan-runtime-3.4.0-nvompic-2021b.eb
deleted file mode 100644
index 789cc76aa..000000000
--- a/Golden_Repo/d/darshan-runtime/darshan-runtime-3.4.0-nvompic-2021b.eb
+++ /dev/null
@@ -1,63 +0,0 @@
-easyblock = "ConfigureMake"
-name = "darshan-runtime"
-version = "3.4.0"
-
-homepage = 'http://www.mcs.anl.gov/research/projects/darshan/'
-
-description = """Darshan is designed to capture an accurate picture of
-application I/O behavior, including properties such as patterns of
-access within files, with minimum overhead.  The name is taken from a
-Sanskrit word for “sight” or “vision”.
-
-Darshan can be used to investigate and tune the I/O behavior of
-complex HPC applications.  In addition, Darshan’s lightweight design
-makes it suitable for full time deployment for workload
-characterization of large systems.  We hope that such studies will
-help the storage research community to better serve the needs of
-scientific computing.
-
-Darshan was originally developed on the IBM Blue Gene series of
-computers deployed at the Argonne Leadership Computing Facility, but
-it is portable across a wide variety of platforms include the Cray
-XE6, Cray XC30, and Linux clusters.  Darshan routinely instruments
-jobs using up to 786,432 compute cores on the Mira system at ALCF.
-"""
-
-usage = """
-Export the environment variable DARSHAN_LOG_PATH to where the logging
-data should be written, e.g.
-
-LD_PRELOAD=$EBROOTDARSHANMINRUNTIME/lib/libdarshan.so \
-DARSHAN_LOG_PATH=/path/to/your/logdir \
-srun -n 32 ./executable
-
-Note:
-
-Darshan currently only works with C or C++ codes, not with Fortran.
-"""
-
-toolchain = {'name': 'nvompic', 'version': '2021b'}
-
-sources = ['ftp://ftp.mcs.anl.gov/pub/darshan/releases/darshan-%s.tar.gz' % version]
-checksums = ['7cc88b7c130ec3b574f6b73c63c3c05deec67b1350245de6d39ca91d4cff0842']
-
-local_subpath = 'darshan-runtime'
-preconfigopts = 'cd %s; ../prepare.sh;' % local_subpath
-configopts = '--with-mem-align=8 --with-log-path-by-env=DARSHAN_LOG_PATH '
-configopts += ' --with-jobid-env=SLURM_JOBID CC=mpicc --enable-hdf5-mod --with-hdf5=$EBROOTHDF5'
-
-prebuildopts = 'cd %s;' % local_subpath
-
-preinstallopts = 'cd %s;' % local_subpath
-
-sanity_check_paths = {
-    'files': ["lib/libdarshan.so"],
-    'dirs': []
-}
-
-dependencies = [
-    ("HDF5", "1.12.1"),
-]
-
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/d/darshan-util/darshan-util-3.3.1-gompi-2021b.eb b/Golden_Repo/d/darshan-util/darshan-util-3.3.1-gompi-2021b.eb
deleted file mode 100644
index f20e0c52e..000000000
--- a/Golden_Repo/d/darshan-util/darshan-util-3.3.1-gompi-2021b.eb
+++ /dev/null
@@ -1,74 +0,0 @@
-easyblock = "ConfigureMake"
-name = "darshan-util"
-version = "3.3.1"
-
-homepage = 'http://www.mcs.anl.gov/research/projects/darshan/'
-
-description = """Darshan is designed to capture an accurate picture of
-application I/O behavior, including properties such as patterns of
-access within files, with minimum overhead.  The name is taken from a
-Sanskrit word for “sight” or “vision”.
-
-Darshan can be used to investigate and tune the I/O behavior of
-complex HPC applications.  In addition, Darshan’s lightweight design
-makes it suitable for full time deployment for workload
-characterization of large systems.  We hope that such studies will
-help the storage research community to better serve the needs of
-scientific computing.
-
-Darshan was originally developed on the IBM Blue Gene series of
-computers deployed at the Argonne Leadership Computing Facility, but
-it is portable across a wide variety of platforms include the Cray
-XE6, Cray XC30, and Linux clusters.  Darshan routinely instruments
-jobs using up to 786,432 compute cores on the Mira system at ALCF.
-"""
-
-usage = """
-The result is a darshan log file which can be converted using
-
-darshan-job-summary.pl /path/to/your/logdir/mylog.darshan.gz
-
-Note:
-
-Darshan currently only works with C or C++ codes, not with Fortran.
-"""
-
-toolchain = {'name': 'gompi', 'version': '2021b'}
-
-sources = ['ftp://ftp.mcs.anl.gov/pub/darshan/releases/darshan-%s.tar.gz' % version]
-checksums = ['281d871335977d0592a49d053df93d68ce1840f6fdec27fea7a59586a84395f7']  # darshan-3.3.1.tar.gz
-
-local_subpath = 'darshan-util'
-
-preconfigopts = 'cd %s;' % local_subpath
-
-prebuildopts = 'cd %s;' % local_subpath
-
-preinstallopts = 'cd %s;' % local_subpath
-
-configopts = '--enable-hdf5-mod=$EBROOTHDF5'
-
-sanity_check_paths = {
-    'files': ["bin/darshan-job-summary.pl"],
-    'dirs': []
-}
-
-dependencies = [
-    ("gnuplot", "5.4.2"),
-    ("Perl", "5.34.0"),
-    ("HDF5", "1.12.1"),
-    ('texlive', '20200406'),
-]
-
-exts_defaultclass = 'PerlModule'
-exts_list = [
-    ('Pod::Parser', '1.63', {
-        'source_tmpl': 'Pod-Parser-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MAREKR/'],
-        'checksums': ['dbe0b56129975b2f83a02841e8e0ed47be80f060686c66ea37e529d97aa70ccd'],
-    }),
-]
-
-modextrapaths = {'PERL5LIB': 'lib/perl5/%(perlver)s/'}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/d/darshan-util/darshan-util-3.3.1-gpsmpi-2021b.eb b/Golden_Repo/d/darshan-util/darshan-util-3.3.1-gpsmpi-2021b.eb
deleted file mode 100644
index cdbee8877..000000000
--- a/Golden_Repo/d/darshan-util/darshan-util-3.3.1-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,74 +0,0 @@
-easyblock = "ConfigureMake"
-name = "darshan-util"
-version = "3.3.1"
-
-homepage = 'http://www.mcs.anl.gov/research/projects/darshan/'
-
-description = """Darshan is designed to capture an accurate picture of
-application I/O behavior, including properties such as patterns of
-access within files, with minimum overhead.  The name is taken from a
-Sanskrit word for “sight” or “vision”.
-
-Darshan can be used to investigate and tune the I/O behavior of
-complex HPC applications.  In addition, Darshan’s lightweight design
-makes it suitable for full time deployment for workload
-characterization of large systems.  We hope that such studies will
-help the storage research community to better serve the needs of
-scientific computing.
-
-Darshan was originally developed on the IBM Blue Gene series of
-computers deployed at the Argonne Leadership Computing Facility, but
-it is portable across a wide variety of platforms include the Cray
-XE6, Cray XC30, and Linux clusters.  Darshan routinely instruments
-jobs using up to 786,432 compute cores on the Mira system at ALCF.
-"""
-
-usage = """
-The result is a darshan log file which can be converted using
-
-darshan-job-summary.pl /path/to/your/logdir/mylog.darshan.gz
-
-Note:
-
-Darshan currently only works with C or C++ codes, not with Fortran.
-"""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-
-sources = ['ftp://ftp.mcs.anl.gov/pub/darshan/releases/darshan-%s.tar.gz' % version]
-checksums = ['281d871335977d0592a49d053df93d68ce1840f6fdec27fea7a59586a84395f7']  # darshan-3.3.1.tar.gz
-
-local_subpath = 'darshan-util'
-
-preconfigopts = 'cd %s;' % local_subpath
-
-prebuildopts = 'cd %s;' % local_subpath
-
-preinstallopts = 'cd %s;' % local_subpath
-
-configopts = '--enable-hdf5-mod=$EBROOTHDF5'
-
-sanity_check_paths = {
-    'files': ["bin/darshan-job-summary.pl"],
-    'dirs': []
-}
-
-dependencies = [
-    ("gnuplot", "5.4.2"),
-    ("Perl", "5.34.0"),
-    ("HDF5", "1.12.1"),
-    ('texlive', '20200406'),
-]
-
-exts_defaultclass = 'PerlModule'
-exts_list = [
-    ('Pod::Parser', '1.63', {
-        'source_tmpl': 'Pod-Parser-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MAREKR/'],
-        'checksums': ['dbe0b56129975b2f83a02841e8e0ed47be80f060686c66ea37e529d97aa70ccd'],
-    }),
-]
-
-modextrapaths = {'PERL5LIB': 'lib/perl5/%(perlver)s/'}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/d/darshan-util/darshan-util-3.3.1-iimpi-2021b.eb b/Golden_Repo/d/darshan-util/darshan-util-3.3.1-iimpi-2021b.eb
deleted file mode 100644
index 4f1ce548d..000000000
--- a/Golden_Repo/d/darshan-util/darshan-util-3.3.1-iimpi-2021b.eb
+++ /dev/null
@@ -1,74 +0,0 @@
-easyblock = "ConfigureMake"
-name = "darshan-util"
-version = "3.3.1"
-
-homepage = 'http://www.mcs.anl.gov/research/projects/darshan/'
-
-description = """Darshan is designed to capture an accurate picture of
-application I/O behavior, including properties such as patterns of
-access within files, with minimum overhead.  The name is taken from a
-Sanskrit word for “sight” or “vision”.
-
-Darshan can be used to investigate and tune the I/O behavior of
-complex HPC applications.  In addition, Darshan’s lightweight design
-makes it suitable for full time deployment for workload
-characterization of large systems.  We hope that such studies will
-help the storage research community to better serve the needs of
-scientific computing.
-
-Darshan was originally developed on the IBM Blue Gene series of
-computers deployed at the Argonne Leadership Computing Facility, but
-it is portable across a wide variety of platforms include the Cray
-XE6, Cray XC30, and Linux clusters.  Darshan routinely instruments
-jobs using up to 786,432 compute cores on the Mira system at ALCF.
-"""
-
-usage = """
-The result is a darshan log file which can be converted using
-
-darshan-job-summary.pl /path/to/your/logdir/mylog.darshan.gz
-
-Note:
-
-Darshan currently only works with C or C++ codes, not with Fortran.
-"""
-
-toolchain = {'name': 'iimpi', 'version': '2021b'}
-
-sources = ['ftp://ftp.mcs.anl.gov/pub/darshan/releases/darshan-%s.tar.gz' % version]
-checksums = ['281d871335977d0592a49d053df93d68ce1840f6fdec27fea7a59586a84395f7']  # darshan-3.3.1.tar.gz
-
-local_subpath = 'darshan-util'
-
-preconfigopts = 'cd %s;' % local_subpath
-
-prebuildopts = 'cd %s;' % local_subpath
-
-preinstallopts = 'cd %s;' % local_subpath
-
-configopts = '--enable-hdf5-mod=$EBROOTHDF5'
-
-sanity_check_paths = {
-    'files': ["bin/darshan-job-summary.pl"],
-    'dirs': []
-}
-
-dependencies = [
-    ("gnuplot", "5.4.2"),
-    ("Perl", "5.34.0"),
-    ("HDF5", "1.12.1"),
-    ('texlive', '20200406'),
-]
-
-exts_defaultclass = 'PerlModule'
-exts_list = [
-    ('Pod::Parser', '1.63', {
-        'source_tmpl': 'Pod-Parser-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MAREKR/'],
-        'checksums': ['dbe0b56129975b2f83a02841e8e0ed47be80f060686c66ea37e529d97aa70ccd'],
-    }),
-]
-
-modextrapaths = {'PERL5LIB': 'lib/perl5/%(perlver)s/'}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/d/darshan-util/darshan-util-3.3.1-ipsmpi-2021b.eb b/Golden_Repo/d/darshan-util/darshan-util-3.3.1-ipsmpi-2021b.eb
deleted file mode 100644
index 4987e2237..000000000
--- a/Golden_Repo/d/darshan-util/darshan-util-3.3.1-ipsmpi-2021b.eb
+++ /dev/null
@@ -1,74 +0,0 @@
-easyblock = "ConfigureMake"
-name = "darshan-util"
-version = "3.3.1"
-
-homepage = 'http://www.mcs.anl.gov/research/projects/darshan/'
-
-description = """Darshan is designed to capture an accurate picture of
-application I/O behavior, including properties such as patterns of
-access within files, with minimum overhead.  The name is taken from a
-Sanskrit word for “sight” or “vision”.
-
-Darshan can be used to investigate and tune the I/O behavior of
-complex HPC applications.  In addition, Darshan’s lightweight design
-makes it suitable for full time deployment for workload
-characterization of large systems.  We hope that such studies will
-help the storage research community to better serve the needs of
-scientific computing.
-
-Darshan was originally developed on the IBM Blue Gene series of
-computers deployed at the Argonne Leadership Computing Facility, but
-it is portable across a wide variety of platforms include the Cray
-XE6, Cray XC30, and Linux clusters.  Darshan routinely instruments
-jobs using up to 786,432 compute cores on the Mira system at ALCF.
-"""
-
-usage = """
-The result is a darshan log file which can be converted using
-
-darshan-job-summary.pl /path/to/your/logdir/mylog.darshan.gz
-
-Note:
-
-Darshan currently only works with C or C++ codes, not with Fortran.
-"""
-
-toolchain = {'name': 'ipsmpi', 'version': '2021b'}
-
-sources = ['ftp://ftp.mcs.anl.gov/pub/darshan/releases/darshan-%s.tar.gz' % version]
-checksums = ['281d871335977d0592a49d053df93d68ce1840f6fdec27fea7a59586a84395f7']  # darshan-3.3.1.tar.gz
-
-local_subpath = 'darshan-util'
-
-preconfigopts = 'cd %s;' % local_subpath
-
-prebuildopts = 'cd %s;' % local_subpath
-
-preinstallopts = 'cd %s;' % local_subpath
-
-configopts = '--enable-hdf5-mod=$EBROOTHDF5'
-
-sanity_check_paths = {
-    'files': ["bin/darshan-job-summary.pl"],
-    'dirs': []
-}
-
-dependencies = [
-    ("gnuplot", "5.4.2"),
-    ("Perl", "5.34.0"),
-    ("HDF5", "1.12.1"),
-    ('texlive', '20200406'),
-]
-
-exts_defaultclass = 'PerlModule'
-exts_list = [
-    ('Pod::Parser', '1.63', {
-        'source_tmpl': 'Pod-Parser-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MAREKR/'],
-        'checksums': ['dbe0b56129975b2f83a02841e8e0ed47be80f060686c66ea37e529d97aa70ccd'],
-    }),
-]
-
-modextrapaths = {'PERL5LIB': 'lib/perl5/%(perlver)s/'}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/d/darshan-util/darshan-util-3.3.1-npsmpic-2021b.eb b/Golden_Repo/d/darshan-util/darshan-util-3.3.1-npsmpic-2021b.eb
deleted file mode 100644
index b43c37bbc..000000000
--- a/Golden_Repo/d/darshan-util/darshan-util-3.3.1-npsmpic-2021b.eb
+++ /dev/null
@@ -1,74 +0,0 @@
-easyblock = "ConfigureMake"
-name = "darshan-util"
-version = "3.3.1"
-
-homepage = 'http://www.mcs.anl.gov/research/projects/darshan/'
-
-description = """Darshan is designed to capture an accurate picture of
-application I/O behavior, including properties such as patterns of
-access within files, with minimum overhead.  The name is taken from a
-Sanskrit word for “sight” or “vision”.
-
-Darshan can be used to investigate and tune the I/O behavior of
-complex HPC applications.  In addition, Darshan’s lightweight design
-makes it suitable for full time deployment for workload
-characterization of large systems.  We hope that such studies will
-help the storage research community to better serve the needs of
-scientific computing.
-
-Darshan was originally developed on the IBM Blue Gene series of
-computers deployed at the Argonne Leadership Computing Facility, but
-it is portable across a wide variety of platforms include the Cray
-XE6, Cray XC30, and Linux clusters.  Darshan routinely instruments
-jobs using up to 786,432 compute cores on the Mira system at ALCF.
-"""
-
-usage = """
-The result is a darshan log file which can be converted using
-
-darshan-job-summary.pl /path/to/your/logdir/mylog.darshan.gz
-
-Note:
-
-Darshan currently only works with C or C++ codes, not with Fortran.
-"""
-
-toolchain = {'name': 'npsmpic', 'version': '2021b'}
-
-sources = ['ftp://ftp.mcs.anl.gov/pub/darshan/releases/darshan-%s.tar.gz' % version]
-checksums = ['281d871335977d0592a49d053df93d68ce1840f6fdec27fea7a59586a84395f7']  # darshan-3.3.1.tar.gz
-
-local_subpath = 'darshan-util'
-
-preconfigopts = 'cd %s;' % local_subpath
-
-prebuildopts = 'cd %s;' % local_subpath
-
-preinstallopts = 'cd %s;' % local_subpath
-
-configopts = '--enable-hdf5-mod=$EBROOTHDF5'
-
-sanity_check_paths = {
-    'files': ["bin/darshan-job-summary.pl"],
-    'dirs': []
-}
-
-dependencies = [
-    ("gnuplot", "5.4.2"),
-    ("Perl", "5.34.0"),
-    ("HDF5", "1.12.1"),
-    ('texlive', '20200406'),
-]
-
-exts_defaultclass = 'PerlModule'
-exts_list = [
-    ('Pod::Parser', '1.63', {
-        'source_tmpl': 'Pod-Parser-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MAREKR/'],
-        'checksums': ['dbe0b56129975b2f83a02841e8e0ed47be80f060686c66ea37e529d97aa70ccd'],
-    }),
-]
-
-modextrapaths = {'PERL5LIB': 'lib/perl5/%(perlver)s/'}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/d/darshan-util/darshan-util-3.3.1-nvompic-2021b.eb b/Golden_Repo/d/darshan-util/darshan-util-3.3.1-nvompic-2021b.eb
deleted file mode 100644
index 80669fe7e..000000000
--- a/Golden_Repo/d/darshan-util/darshan-util-3.3.1-nvompic-2021b.eb
+++ /dev/null
@@ -1,74 +0,0 @@
-easyblock = "ConfigureMake"
-name = "darshan-util"
-version = "3.3.1"
-
-homepage = 'http://www.mcs.anl.gov/research/projects/darshan/'
-
-description = """Darshan is designed to capture an accurate picture of
-application I/O behavior, including properties such as patterns of
-access within files, with minimum overhead.  The name is taken from a
-Sanskrit word for “sight” or “vision”.
-
-Darshan can be used to investigate and tune the I/O behavior of
-complex HPC applications.  In addition, Darshan’s lightweight design
-makes it suitable for full time deployment for workload
-characterization of large systems.  We hope that such studies will
-help the storage research community to better serve the needs of
-scientific computing.
-
-Darshan was originally developed on the IBM Blue Gene series of
-computers deployed at the Argonne Leadership Computing Facility, but
-it is portable across a wide variety of platforms include the Cray
-XE6, Cray XC30, and Linux clusters.  Darshan routinely instruments
-jobs using up to 786,432 compute cores on the Mira system at ALCF.
-"""
-
-usage = """
-The result is a darshan log file which can be converted using
-
-darshan-job-summary.pl /path/to/your/logdir/mylog.darshan.gz
-
-Note:
-
-Darshan currently only works with C or C++ codes, not with Fortran.
-"""
-
-toolchain = {'name': 'nvompic', 'version': '2021b'}
-
-sources = ['ftp://ftp.mcs.anl.gov/pub/darshan/releases/darshan-%s.tar.gz' % version]
-checksums = ['281d871335977d0592a49d053df93d68ce1840f6fdec27fea7a59586a84395f7']  # darshan-3.3.1.tar.gz
-
-local_subpath = 'darshan-util'
-
-preconfigopts = 'cd %s;' % local_subpath
-
-prebuildopts = 'cd %s;' % local_subpath
-
-preinstallopts = 'cd %s;' % local_subpath
-
-configopts = '--enable-hdf5-mod=$EBROOTHDF5'
-
-sanity_check_paths = {
-    'files': ["bin/darshan-job-summary.pl"],
-    'dirs': []
-}
-
-dependencies = [
-    ("gnuplot", "5.4.2"),
-    ("Perl", "5.34.0"),
-    ("HDF5", "1.12.1"),
-    ('texlive', '20200406'),
-]
-
-exts_defaultclass = 'PerlModule'
-exts_list = [
-    ('Pod::Parser', '1.63', {
-        'source_tmpl': 'Pod-Parser-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MAREKR/'],
-        'checksums': ['dbe0b56129975b2f83a02841e8e0ed47be80f060686c66ea37e529d97aa70ccd'],
-    }),
-]
-
-modextrapaths = {'PERL5LIB': 'lib/perl5/%(perlver)s/'}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/d/darshan-util/darshan-util-3.4.0-gompi-2021b.eb b/Golden_Repo/d/darshan-util/darshan-util-3.4.0-gompi-2021b.eb
deleted file mode 100644
index 081eb24c3..000000000
--- a/Golden_Repo/d/darshan-util/darshan-util-3.4.0-gompi-2021b.eb
+++ /dev/null
@@ -1,74 +0,0 @@
-easyblock = "ConfigureMake"
-name = "darshan-util"
-version = "3.4.0"
-
-homepage = 'http://www.mcs.anl.gov/research/projects/darshan/'
-
-description = """Darshan is designed to capture an accurate picture of
-application I/O behavior, including properties such as patterns of
-access within files, with minimum overhead.  The name is taken from a
-Sanskrit word for “sight” or “vision”.
-
-Darshan can be used to investigate and tune the I/O behavior of
-complex HPC applications.  In addition, Darshan’s lightweight design
-makes it suitable for full time deployment for workload
-characterization of large systems.  We hope that such studies will
-help the storage research community to better serve the needs of
-scientific computing.
-
-Darshan was originally developed on the IBM Blue Gene series of
-computers deployed at the Argonne Leadership Computing Facility, but
-it is portable across a wide variety of platforms include the Cray
-XE6, Cray XC30, and Linux clusters.  Darshan routinely instruments
-jobs using up to 786,432 compute cores on the Mira system at ALCF.
-"""
-
-usage = """
-The result is a darshan log file which can be converted using
-
-darshan-job-summary.pl /path/to/your/logdir/mylog.darshan.gz
-
-Note:
-
-Darshan currently only works with C or C++ codes, not with Fortran.
-"""
-
-toolchain = {'name': 'gompi', 'version': '2021b'}
-
-sources = ['ftp://ftp.mcs.anl.gov/pub/darshan/releases/darshan-%s.tar.gz' % version]
-checksums = ['7cc88b7c130ec3b574f6b73c63c3c05deec67b1350245de6d39ca91d4cff0842']
-
-local_subpath = 'darshan-util'
-
-preconfigopts = 'cd %s; ../prepare.sh;' % local_subpath
-
-prebuildopts = 'cd %s;' % local_subpath
-
-preinstallopts = 'cd %s;' % local_subpath
-
-configopts = '--enable-hdf5-mod=$EBROOTHDF5'
-
-sanity_check_paths = {
-    'files': ["bin/darshan-job-summary.pl"],
-    'dirs': []
-}
-
-dependencies = [
-    ("gnuplot", "5.4.2"),
-    ("Perl", "5.34.0"),
-    ("HDF5", "1.12.1"),
-    ('texlive', '20200406'),
-]
-
-exts_defaultclass = 'PerlModule'
-exts_list = [
-    ('Pod::Parser', '1.63', {
-        'source_tmpl': 'Pod-Parser-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MAREKR/'],
-        'checksums': ['dbe0b56129975b2f83a02841e8e0ed47be80f060686c66ea37e529d97aa70ccd'],
-    }),
-]
-
-modextrapaths = {'PERL5LIB': 'lib/perl5/%(perlver)s/'}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/d/darshan-util/darshan-util-3.4.0-gpsmpi-2021b.eb b/Golden_Repo/d/darshan-util/darshan-util-3.4.0-gpsmpi-2021b.eb
deleted file mode 100644
index ba938c285..000000000
--- a/Golden_Repo/d/darshan-util/darshan-util-3.4.0-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,74 +0,0 @@
-easyblock = "ConfigureMake"
-name = "darshan-util"
-version = "3.4.0"
-
-homepage = 'http://www.mcs.anl.gov/research/projects/darshan/'
-
-description = """Darshan is designed to capture an accurate picture of
-application I/O behavior, including properties such as patterns of
-access within files, with minimum overhead.  The name is taken from a
-Sanskrit word for “sight” or “vision”.
-
-Darshan can be used to investigate and tune the I/O behavior of
-complex HPC applications.  In addition, Darshan’s lightweight design
-makes it suitable for full time deployment for workload
-characterization of large systems.  We hope that such studies will
-help the storage research community to better serve the needs of
-scientific computing.
-
-Darshan was originally developed on the IBM Blue Gene series of
-computers deployed at the Argonne Leadership Computing Facility, but
-it is portable across a wide variety of platforms include the Cray
-XE6, Cray XC30, and Linux clusters.  Darshan routinely instruments
-jobs using up to 786,432 compute cores on the Mira system at ALCF.
-"""
-
-usage = """
-The result is a darshan log file which can be converted using
-
-darshan-job-summary.pl /path/to/your/logdir/mylog.darshan.gz
-
-Note:
-
-Darshan currently only works with C or C++ codes, not with Fortran.
-"""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-
-sources = ['ftp://ftp.mcs.anl.gov/pub/darshan/releases/darshan-%s.tar.gz' % version]
-checksums = ['7cc88b7c130ec3b574f6b73c63c3c05deec67b1350245de6d39ca91d4cff0842']
-
-local_subpath = 'darshan-util'
-
-preconfigopts = 'cd %s; ../prepare.sh;' % local_subpath
-
-prebuildopts = 'cd %s;' % local_subpath
-
-preinstallopts = 'cd %s;' % local_subpath
-
-configopts = '--enable-hdf5-mod=$EBROOTHDF5'
-
-sanity_check_paths = {
-    'files': ["bin/darshan-job-summary.pl"],
-    'dirs': []
-}
-
-dependencies = [
-    ("gnuplot", "5.4.2"),
-    ("Perl", "5.34.0"),
-    ("HDF5", "1.12.1"),
-    ('texlive', '20200406'),
-]
-
-exts_defaultclass = 'PerlModule'
-exts_list = [
-    ('Pod::Parser', '1.63', {
-        'source_tmpl': 'Pod-Parser-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MAREKR/'],
-        'checksums': ['dbe0b56129975b2f83a02841e8e0ed47be80f060686c66ea37e529d97aa70ccd'],
-    }),
-]
-
-modextrapaths = {'PERL5LIB': 'lib/perl5/%(perlver)s/'}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/d/darshan-util/darshan-util-3.4.0-npsmpic-2021b.eb b/Golden_Repo/d/darshan-util/darshan-util-3.4.0-npsmpic-2021b.eb
deleted file mode 100644
index 6d75d3198..000000000
--- a/Golden_Repo/d/darshan-util/darshan-util-3.4.0-npsmpic-2021b.eb
+++ /dev/null
@@ -1,74 +0,0 @@
-easyblock = "ConfigureMake"
-name = "darshan-util"
-version = "3.4.0"
-
-homepage = 'http://www.mcs.anl.gov/research/projects/darshan/'
-
-description = """Darshan is designed to capture an accurate picture of
-application I/O behavior, including properties such as patterns of
-access within files, with minimum overhead.  The name is taken from a
-Sanskrit word for “sight” or “vision”.
-
-Darshan can be used to investigate and tune the I/O behavior of
-complex HPC applications.  In addition, Darshan’s lightweight design
-makes it suitable for full time deployment for workload
-characterization of large systems.  We hope that such studies will
-help the storage research community to better serve the needs of
-scientific computing.
-
-Darshan was originally developed on the IBM Blue Gene series of
-computers deployed at the Argonne Leadership Computing Facility, but
-it is portable across a wide variety of platforms include the Cray
-XE6, Cray XC30, and Linux clusters.  Darshan routinely instruments
-jobs using up to 786,432 compute cores on the Mira system at ALCF.
-"""
-
-usage = """
-The result is a darshan log file which can be converted using
-
-darshan-job-summary.pl /path/to/your/logdir/mylog.darshan.gz
-
-Note:
-
-Darshan currently only works with C or C++ codes, not with Fortran.
-"""
-
-toolchain = {'name': 'npsmpic', 'version': '2021b'}
-
-sources = ['ftp://ftp.mcs.anl.gov/pub/darshan/releases/darshan-%s.tar.gz' % version]
-checksums = ['7cc88b7c130ec3b574f6b73c63c3c05deec67b1350245de6d39ca91d4cff0842']
-
-local_subpath = 'darshan-util'
-
-preconfigopts = 'cd %s; ../prepare.sh;' % local_subpath
-
-prebuildopts = 'cd %s;' % local_subpath
-
-preinstallopts = 'cd %s;' % local_subpath
-
-configopts = '--enable-hdf5-mod=$EBROOTHDF5'
-
-sanity_check_paths = {
-    'files': ["bin/darshan-job-summary.pl"],
-    'dirs': []
-}
-
-dependencies = [
-    ("gnuplot", "5.4.2"),
-    ("Perl", "5.34.0"),
-    ("HDF5", "1.12.1"),
-    ('texlive', '20200406'),
-]
-
-exts_defaultclass = 'PerlModule'
-exts_list = [
-    ('Pod::Parser', '1.63', {
-        'source_tmpl': 'Pod-Parser-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MAREKR/'],
-        'checksums': ['dbe0b56129975b2f83a02841e8e0ed47be80f060686c66ea37e529d97aa70ccd'],
-    }),
-]
-
-modextrapaths = {'PERL5LIB': 'lib/perl5/%(perlver)s/'}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/d/darshan-util/darshan-util-3.4.0-nvompic-2021b.eb b/Golden_Repo/d/darshan-util/darshan-util-3.4.0-nvompic-2021b.eb
deleted file mode 100644
index b09698a41..000000000
--- a/Golden_Repo/d/darshan-util/darshan-util-3.4.0-nvompic-2021b.eb
+++ /dev/null
@@ -1,74 +0,0 @@
-easyblock = "ConfigureMake"
-name = "darshan-util"
-version = "3.4.0"
-
-homepage = 'http://www.mcs.anl.gov/research/projects/darshan/'
-
-description = """Darshan is designed to capture an accurate picture of
-application I/O behavior, including properties such as patterns of
-access within files, with minimum overhead.  The name is taken from a
-Sanskrit word for “sight” or “vision”.
-
-Darshan can be used to investigate and tune the I/O behavior of
-complex HPC applications.  In addition, Darshan’s lightweight design
-makes it suitable for full time deployment for workload
-characterization of large systems.  We hope that such studies will
-help the storage research community to better serve the needs of
-scientific computing.
-
-Darshan was originally developed on the IBM Blue Gene series of
-computers deployed at the Argonne Leadership Computing Facility, but
-it is portable across a wide variety of platforms include the Cray
-XE6, Cray XC30, and Linux clusters.  Darshan routinely instruments
-jobs using up to 786,432 compute cores on the Mira system at ALCF.
-"""
-
-usage = """
-The result is a darshan log file which can be converted using
-
-darshan-job-summary.pl /path/to/your/logdir/mylog.darshan.gz
-
-Note:
-
-Darshan currently only works with C or C++ codes, not with Fortran.
-"""
-
-toolchain = {'name': 'nvompic', 'version': '2021b'}
-
-sources = ['ftp://ftp.mcs.anl.gov/pub/darshan/releases/darshan-%s.tar.gz' % version]
-checksums = ['7cc88b7c130ec3b574f6b73c63c3c05deec67b1350245de6d39ca91d4cff0842']
-
-local_subpath = 'darshan-util'
-
-preconfigopts = 'cd %s; ../prepare.sh;' % local_subpath
-
-prebuildopts = 'cd %s;' % local_subpath
-
-preinstallopts = 'cd %s;' % local_subpath
-
-configopts = '--enable-hdf5-mod=$EBROOTHDF5'
-
-sanity_check_paths = {
-    'files': ["bin/darshan-job-summary.pl"],
-    'dirs': []
-}
-
-dependencies = [
-    ("gnuplot", "5.4.2"),
-    ("Perl", "5.34.0"),
-    ("HDF5", "1.12.1"),
-    ('texlive', '20200406'),
-]
-
-exts_defaultclass = 'PerlModule'
-exts_list = [
-    ('Pod::Parser', '1.63', {
-        'source_tmpl': 'Pod-Parser-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MAREKR/'],
-        'checksums': ['dbe0b56129975b2f83a02841e8e0ed47be80f060686c66ea37e529d97aa70ccd'],
-    }),
-]
-
-modextrapaths = {'PERL5LIB': 'lib/perl5/%(perlver)s/'}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/d/dask/dask-2021.9.1-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/d/dask/dask-2021.9.1-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index 780ddcaa2..000000000
--- a/Golden_Repo/d/dask/dask-2021.9.1-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,72 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'dask'
-version = '2021.9.1'
-
-homepage = 'https://dask.org/'
-description = """Dask natively scales Python. Dask provides advanced parallelism for analytics, enabling performance
- at scale for the tools you love."""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('PyYAML', '5.4.1'),
-    ('SciPy-bundle', '2021.10'),
-    ('bokeh', '2.4.1'),
-]
-
-use_pip = True
-
-exts_list = [
-    ('fsspec', '2021.10.1', {
-        'checksums': ['c245626e3cb8de5cd91485840b215a385fa6f2b0f6ab87978305e99e2d842753'],
-    }),
-    ('toolz', '0.11.1', {
-        'checksums': ['c7a47921f07822fe534fb1c01c9931ab335a4390c782bd28c6bcc7c2f71f3fbf'],
-    }),
-    ('locket', '0.2.1', {
-        'checksums': ['3e1faba403619fe201552f083f1ecbf23f550941bc51985ac6ed4d02d25056dd'],
-    }),
-    ('partd', '1.2.0', {
-        'checksums': ['aa67897b84d522dcbc86a98b942afab8c6aa2f7f677d904a616b74ef5ddbc3eb'],
-    }),
-    ('HeapDict', '1.0.1', {
-        'checksums': ['8495f57b3e03d8e46d5f1b2cc62ca881aca392fd5cc048dc0aa2e1a6d23ecdb6'],
-    }),
-    ('zict', '2.0.0', {
-        'checksums': ['8e2969797627c8a663575c2fc6fcb53a05e37cdb83ee65f341fc6e0c3d0ced16'],
-    }),
-    ('tblib', '1.7.0', {
-        'checksums': ['059bd77306ea7b419d4f76016aef6d7027cc8a0785579b5aad198803435f882c'],
-    }),
-    ('cloudpickle', '2.0.0', {
-        'checksums': ['5cd02f3b417a783ba84a4ec3e290ff7929009fe51f6405423cfccfadd43ba4a4'],
-    }),
-    (name, version, {
-        'checksums': ['e11f2bf2cac809e5408fc107dcf727af3bc3472160f206cb4b828211396ad65c'],
-    }),
-    ('distributed', version, {
-        'checksums': ['f4deb96a9dbef5b04ad030ab905dfed71b893d79a368bd5787b21268b4ed5ff8'],
-    }),
-    ('dask-mpi', '2.21.0', {
-        'checksums': ['76e153fc8c58047d898970b33ede0ab1990bd4e69cc130c6627a96f11b12a1a7'],
-    }),
-    ('docrep', '0.3.2', {
-        'checksums': ['ed8a17e201abd829ef8da78a0b6f4d51fb99a4cbd0554adbed3309297f964314'],
-    }),
-    ('dask-jobqueue', '0.7.2', {
-        'checksums': ['1767f4146b2663d9d2eaef62b882a86e1df0bccdb8ae68ae3e5e546aa6796d35'],
-    }),
-]
-
-sanity_check_paths = {
-    'files': ['bin/dask-%s' % x for x in ['mpi', 'scheduler', 'ssh', 'worker']],
-    'dirs': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-sanity_check_commands = ["dask-scheduler --help"]
-
-sanity_pip_check = True
-
-moduleclass = 'data'
diff --git a/Golden_Repo/d/distributed/distributed-2.30.1-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/d/distributed/distributed-2.30.1-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index ff8c7e9fb..000000000
--- a/Golden_Repo/d/distributed/distributed-2.30.1-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,43 +0,0 @@
-easyblock = 'Bundle'
-
-name = 'distributed'
-version = '2.30.1'
-
-homepage = 'https://distributed.readthedocs.io/'
-description = """Dask.distributed is a lightweight library for distributed computing in Python.
- It extends both the concurrent.futures and dask APIs to moderate sized clusters."""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-
-# this is a bundle of Python packages
-exts_defaultclass = 'PythonPackage'
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('dask', '2021.9.1'),
-    ('SciPy-Stack', '2021b'),
-    ('bokeh', '2.4.1'),
-]
-
-
-exts_default_options = {
-    'source_urls': [PYPI_SOURCE],
-    'sanity_pip_check': True,
-}
-
-exts_list = [
-    (name, version, {
-        'source_urls': ['https://pypi.python.org/packages/source/d/distributed'],
-        'checksums': ['1421d3b84a0885aeb2c4bdc9e8896729c0f053a9375596c9de8864e055e2ac8e'],
-    }),
-]
-
-sanity_check_paths = {
-    'files': ['bin/dask-scheduler', 'bin/dask-ssh', 'bin/dask-worker'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/d/double-conversion/double-conversion-3.1.6-GCCcore-11.2.0.eb b/Golden_Repo/d/double-conversion/double-conversion-3.1.6-GCCcore-11.2.0.eb
deleted file mode 100644
index f5b2c34f0..000000000
--- a/Golden_Repo/d/double-conversion/double-conversion-3.1.6-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,40 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'double-conversion'
-version = '3.1.6'
-
-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 = ['8a79e87d02ce1333c9d6c5e47f452596442a343d8c3e9b234e8a62fce1b1d49c']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1'),
-    ('Python', '3.9.6'),
-]
-
-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/ELPA/ELPA-2021.11.001-gomkl-2021b.eb b/Golden_Repo/e/ELPA/ELPA-2021.11.001-gomkl-2021b.eb
deleted file mode 100644
index cd313db7f..000000000
--- a/Golden_Repo/e/ELPA/ELPA-2021.11.001-gomkl-2021b.eb
+++ /dev/null
@@ -1,107 +0,0 @@
-name = 'ELPA'
-version = '2021.11.001'
-
-homepage = 'https://elpa.rzg.mpg.de'
-description = """Eigenvalue SoLvers for Petaflop-Applications. ELPA has been installed as module in
-$EBROOTELPA ($ELPA_ROOT is also defined). This installation
-contains the pure MPI version and the hybrid MPI/OpenMP version.
-Notice: If you want to use OpenMP threads you have to set
-export ELPA_DEFAULT_omp=<number of threads per MPI process>
-in your batch job and start MPI with MPI_INIT_THREAD(MPI_THREAD_MULTIPLE,....
-
-Several assembly kernels have been compiled. They can be chosen at runtime when calling the library or
-with the environment variables REAL_ELPA_KERNEL or COMPLEX_ELPA_KERNEL.
-
-An example is
-export REAL_ELPA_KERNEL=REAL_ELPA_KERNEL_GENERIC
-which chooses the generic real kernel for elpa2.
-Starting with version 2019.11.001 the legacy interface is no longer available.
-"""
-
-usage = """You can get an overview over the available kernels by loading ELPA and then submitting a batch job with
-
-srun --ntasks=1 $EBROOTELPA/bin/elpa2_print_kernels
-
-Programs using this ELPA library have to be compiled with
-
--I$ELPA_INCLUDE[_OPENMP]/ -I$ELPA_INCLUDE[_OPENMP]/elpa -I$ELPA_MODULES[_OPENMP]
-
-and linked with
-
--L$EBROOTELPA/lib -lelpa[_openmp]
--lmkl_scalapack_lp64
-${MKLROOT}/lib/intel64/libmkl_blacs_openmpi_lp64.a
--lmkl_gf_lp64 -lmkl_sequential[-lmkl_gnu_thread]
--lmkl_core -lgomp -lpthread -lm -ldl -lstdc++
-"""
-
-examples = 'Examples can be found in $EBROOTELPA/examples'
-
-toolchain = {'name': 'gomkl', 'version': '2021b'}
-toolchainopts = {'openmp': True, 'usempi': True}
-
-source_urls = ['https://gitlab.mpcdf.mpg.de/elpa/elpa/-/archive/new_release_%(version)s/']
-sources = ["elpa-new_release_%(version)s.tar.gz"]
-patches = [
-    '%(name)s-%(version)s_fix_hardcoded_perl_path.patch',
-    'ELPA-%(version)s_install-libelpatest.patch',
-]
-checksums = [
-    'e61048393a5e5f460858a11b216547fa3f434dd620c478cb20a52ebf543260f1',  # elpa-new_release_2021.11.001.tar.gz
-    # ELPA-2021.11.001_fix_hardcoded_perl_path.patch
-    '5fc40b6f3f948fd026efc688f9bafba0461d68ad007d9dc161bfd1507e2fc13b',
-    '2ce155ccbcdd61e8036d859aa204b48883695eff5f4decee3e5c2677516d8272',  # ELPA-2021.11.001_install-libelpatest.patch
-]
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    # remove_xcompiler script requires 'python' command,
-    ('Python', '3.9.6'),
-    ('Perl', '5.34.0'),
-]
-
-preconfigopts = './autogen.sh && '
-preconfigopts += 'export LDFLAGS="-lm $LDFLAGS" && '
-preconfigopts += 'autoreconf && '
-
-# The checking of MPI_THREAD_MULTIPLE does not work because the check uses an
-# MPI program that is then executed by just ./conftest
-# Unfortunately you cannot turn of checking during runtime, too
-configopts = '--without-threading-support-check-during-build '
-
-with_single = False
-
-# When building in parallel, the file test_setup_mpi.mod is sometimes
-# used before it is built, leading to an error.  This must be a bug in
-# the makefile affecting parallel builds.
-maxparallel = 1
-
-
-postinstallcmds = [
-    'cp -r %(builddir)s/elpa-new_release_%(version)s/examples %(installdir)s/examples/',
-    'rm %(installdir)s/examples/*.orig',
-    'rm %(installdir)s/examples/*_cuda',
-    'rm %(installdir)s/examples/C/*.orig',
-    'rm %(installdir)s/examples/C/*_cuda',
-    'rm %(installdir)s/examples/Fortran/*.orig',
-    'rm %(installdir)s/examples/Fortran/*_cuda',
-    'cp %(builddir)s/elpa-new_release_%(version)s/test/shared/generated.h %(installdir)s/examples/C/generated.h',
-    'cp config.h config-f90.h %(installdir)s/include/elpa_openmp-%(version)s/elpa/',
-    'grep -v WITH_OPENMP config.h > %(installdir)s/include/elpa-%(version)s/elpa/config.h',
-    'grep -v WITH_OPENMP config-f90.h > %(installdir)s/include/elpa-%(version)s/elpa/config-f90.h',
-    'cp %(builddir)s/elpa-new_release_%(version)s/private_modules/* %(installdir)s/include/elpa-%(version)s/modules',
-    'cp %(builddir)s/elpa-new_release_%(version)s/test_modules/* %(installdir)s/include/elpa-%(version)s/modules',
-]
-
-modextravars = {
-    'ELPA_ROOT': '%(installdir)s',
-    'ELPAROOT': '%(installdir)s',
-    'ELPA_INCLUDE': '%(installdir)s/include/elpa-%(version)s/',
-    'ELPA_INCLUDE_OPENMP': '%(installdir)s/include/elpa_openmp-%(version)s/',
-    'ELPA_LIB': '%(installdir)s/lib',
-    'ELPA_LIB_OPENMP': '%(installdir)s/lib',
-    'ELPA_MODULES': '%(installdir)s/include/elpa-%(version)s/modules',
-    'ELPA_MODULES_OPENMP': '%(installdir)s/include/elpa_openmp-%(version)s/modules',
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/e/ELPA/ELPA-2021.11.001-gpsmkl-2021b.eb b/Golden_Repo/e/ELPA/ELPA-2021.11.001-gpsmkl-2021b.eb
deleted file mode 100644
index eeeef09bf..000000000
--- a/Golden_Repo/e/ELPA/ELPA-2021.11.001-gpsmkl-2021b.eb
+++ /dev/null
@@ -1,105 +0,0 @@
-name = 'ELPA'
-version = '2021.11.001'
-
-homepage = 'https://elpa.rzg.mpg.de'
-description = """Eigenvalue SoLvers for Petaflop-Applications. ELPA has been installed as module in
-$EBROOTELPA ($ELPA_ROOT is also defined). This installation
-contains the pure MPI version and the hybrid MPI/OpenMP version.
-Notice: If you want to use OpenMP threads you have to set
-export ELPA_DEFAULT_omp=<number of threads per MPI process>
-in your batch job and start MPI with MPI_INIT_THREAD(MPI_THREAD_MULTIPLE,....
-
-Several assembly kernels have been compiled. They can be chosen at runtime when calling the library or
-with the environment variables REAL_ELPA_KERNEL or COMPLEX_ELPA_KERNEL.
-
-An example is
-export REAL_ELPA_KERNEL=REAL_ELPA_KERNEL_GENERIC
-which chooses the generic real kernel for elpa2.
-Starting with version 2019.11.001 the legacy interface is no longer available.
-"""
-
-usage = """You can get an overview over the available kernels by loading ELPA and then submitting a batch job with
-
-srun --ntasks=1 $EBROOTELPA/bin/elpa2_print_kernels
-
-Programs using this ELPA library have to be compiled with
-
--I$ELPA_INCLUDE[_OPENMP]/ -I$ELPA_INCLUDE[_OPENMP]/elpa -I$ELPA_MODULES[_OPENMP]
-
-and linked with
-
--L$EBROOTELPA/lib -lelpa[_openmp]
--lmkl_scalapack_lp64 -lmkl_blacs_intelmpi_lp64 -lmkl_gf_lp64
--lmkl_sequential[-lmkl_gnu_thread]
--lmkl_core -lgomp -lpthread -lm -ldl -lstdc++
-"""
-
-examples = 'Examples can be found in $EBROOTELPA/examples'
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-toolchainopts = {'openmp': True, 'usempi': True}
-
-source_urls = ['https://gitlab.mpcdf.mpg.de/elpa/elpa/-/archive/new_release_%(version)s/']
-sources = ["elpa-new_release_%(version)s.tar.gz"]
-patches = [
-    '%(name)s-%(version)s_fix_hardcoded_perl_path.patch',
-    'ELPA-%(version)s_install-libelpatest.patch',
-]
-checksums = [
-    'e61048393a5e5f460858a11b216547fa3f434dd620c478cb20a52ebf543260f1',  # elpa-new_release_2021.11.001.tar.gz
-    # ELPA-2021.11.001_fix_hardcoded_perl_path.patch
-    '5fc40b6f3f948fd026efc688f9bafba0461d68ad007d9dc161bfd1507e2fc13b',
-    '2ce155ccbcdd61e8036d859aa204b48883695eff5f4decee3e5c2677516d8272',  # ELPA-2021.11.001_install-libelpatest.patch
-]
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    # remove_xcompiler script requires 'python' command,
-    ('Python', '3.9.6'),
-    ('Perl', '5.34.0'),
-]
-
-preconfigopts = './autogen.sh && '
-preconfigopts += 'export LDFLAGS="-lm $LDFLAGS" && '
-preconfigopts += 'autoreconf && '
-
-# The checking of MPI_THREAD_MULTIPLE does not work because the check uses an
-# MPI program that is then executed by just ./conftest
-# Unfortunately you cannot turn of checking during runtime, too
-configopts = '--without-threading-support-check-during-build '
-
-with_single = False
-
-# When building in parallel, the file test_setup_mpi.mod is sometimes
-# used before it is built, leading to an error.  This must be a bug in
-# the makefile affecting parallel builds.
-maxparallel = 1
-
-postinstallcmds = [
-    'cp -r %(builddir)s/elpa-new_release_%(version)s/examples %(installdir)s/examples/',
-    'rm %(installdir)s/examples/*.orig',
-    'rm %(installdir)s/examples/*_cuda',
-    'rm %(installdir)s/examples/C/*.orig',
-    'rm %(installdir)s/examples/C/*_cuda',
-    'rm %(installdir)s/examples/Fortran/*.orig',
-    'rm %(installdir)s/examples/Fortran/*_cuda',
-    'cp config.h config-f90.h %(installdir)s/include/elpa_openmp-%(version)s/elpa/',
-    'grep -v WITH_OPENMP config.h > %(installdir)s/include/elpa-%(version)s/elpa/config.h',
-    'grep -v WITH_OPENMP config-f90.h > %(installdir)s/include/elpa-%(version)s/elpa/config-f90.h',
-    'cp %(builddir)s/elpa-new_release_%(version)s/test/shared/generated.h %(installdir)s/examples/C/generated.h',
-    'cp %(builddir)s/elpa-new_release_%(version)s/private_modules/* %(installdir)s/include/elpa-%(version)s/modules',
-    'cp %(builddir)s/elpa-new_release_%(version)s/test_modules/* %(installdir)s/include/elpa-%(version)s/modules',
-]
-
-modextravars = {
-    'ELPA_ROOT': '%(installdir)s',
-    'ELPAROOT': '%(installdir)s',
-    'ELPA_INCLUDE': '%(installdir)s/include/elpa-%(version)s/',
-    'ELPA_INCLUDE_OPENMP': '%(installdir)s/include/elpa_openmp-%(version)s/',
-    'ELPA_LIB': '%(installdir)s/lib',
-    'ELPA_LIB_OPENMP': '%(installdir)s/lib',
-    'ELPA_MODULES': '%(installdir)s/include/elpa-%(version)s/modules',
-    'ELPA_MODULES_OPENMP': '%(installdir)s/include/elpa_openmp-%(version)s/modules',
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/e/ELPA/ELPA-2021.11.001-intel-2021b.eb b/Golden_Repo/e/ELPA/ELPA-2021.11.001-intel-2021b.eb
deleted file mode 100644
index 2f80e05e2..000000000
--- a/Golden_Repo/e/ELPA/ELPA-2021.11.001-intel-2021b.eb
+++ /dev/null
@@ -1,104 +0,0 @@
-name = 'ELPA'
-version = '2021.11.001'
-
-homepage = 'https://elpa.rzg.mpg.de'
-description = """Eigenvalue SoLvers for Petaflop-Applications. ELPA has been installed as module in
-$EBROOTELPA ($ELPA_ROOT is also defined). This installation
-contains the pure MPI version and the hybrid MPI/OpenMP version.
-Notice: If you want to use OpenMP threads you have to set
-export ELPA_DEFAULT_omp=<number of threads per MPI process>
-in your batch job and start MPI with MPI_INIT_THREAD(MPI_THREAD_MULTIPLE,....
-
-Several assembly kernels have been compiled. They can be chosen at runtime when calling the library or
-with the environment variables REAL_ELPA_KERNEL or COMPLEX_ELPA_KERNEL.
-
-An example is
-export REAL_ELPA_KERNEL=REAL_ELPA_KERNEL_GENERIC
-which chooses the generic real kernel for elpa2.
-Starting with version 2019.11.001 the legacy interface is no longer available.
-"""
-
-usage = """You can get an overview over the available kernels by loading ELPA and then submitting a batch job with
-
-srun --ntasks=1 $EBROOTELPA/bin/elpa2_print_kernels
-
-Programs using this ELPA library have to be compiled with
-
--I$ELPA_INCLUDE[_OPENMP]/ -I$ELPA_INCLUDE[_OPENMP]/elpa -I$ELPA_MODULES[_OPENMP]
-
-and linked with
-
--L$EBROOTELPA/lib -lelpa[_openmp]
--lmkl_scalapack_lp64 -lmkl_blacs_intelmpi_lp64 -lmkl_intel_lp64
--lmkl_sequential[-lmkl_intel_thread]
--lmkl_core -liomp5 -lpthread -lstdc++
-"""
-
-examples = 'Examples can be found in $EBROOTELPA/examples'
-
-toolchain = {'name': 'intel', 'version': '2021b'}
-toolchainopts = {'openmp': True, 'usempi': True}
-
-source_urls = ['https://gitlab.mpcdf.mpg.de/elpa/elpa/-/archive/new_release_%(version)s/']
-sources = ["elpa-new_release_%(version)s.tar.gz"]
-patches = [
-    '%(name)s-%(version)s_fix_hardcoded_perl_path.patch',
-    'ELPA-%(version)s_install-libelpatest.patch',
-]
-checksums = [
-    'e61048393a5e5f460858a11b216547fa3f434dd620c478cb20a52ebf543260f1',  # elpa-new_release_2021.11.001.tar.gz
-    # ELPA-2021.11.001_fix_hardcoded_perl_path.patch
-    '5fc40b6f3f948fd026efc688f9bafba0461d68ad007d9dc161bfd1507e2fc13b',
-    '2ce155ccbcdd61e8036d859aa204b48883695eff5f4decee3e5c2677516d8272',  # ELPA-2021.11.001_install-libelpatest.patch
-]
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    # remove_xcompiler script requires 'python' command,
-    ('Python', '3.9.6'),
-    ('Perl', '5.34.0'),
-]
-
-preconfigopts = './autogen.sh && '
-preconfigopts += 'autoreconf && '
-
-# The checking of MPI_THREAD_MULTIPLE does not work because the check uses an
-# MPI program that is then executed by just ./conftest
-# Unfortunately you cannot turn of checking during runtime, too
-configopts = '--without-threading-support-check-during-build '
-
-with_single = False
-
-# When building in parallel, the file test_setup_mpi.mod is sometimes
-# used before it is built, leading to an error.  This must be a bug in
-# the makefile affecting parallel builds.
-maxparallel = 1
-
-postinstallcmds = [
-    'cp -r %(builddir)s/elpa-new_release_%(version)s/examples %(installdir)s/examples/',
-    'rm %(installdir)s/examples/*.orig',
-    'rm %(installdir)s/examples/*_cuda',
-    'rm %(installdir)s/examples/C/*.orig',
-    'rm %(installdir)s/examples/C/*_cuda',
-    'rm %(installdir)s/examples/Fortran/*.orig',
-    'rm %(installdir)s/examples/Fortran/*_cuda',
-    'cp config.h config-f90.h %(installdir)s/include/elpa_openmp-%(version)s/elpa/',
-    'grep -v WITH_OPENMP config.h > %(installdir)s/include/elpa-%(version)s/elpa/config.h',
-    'grep -v WITH_OPENMP config-f90.h > %(installdir)s/include/elpa-%(version)s/elpa/config-f90.h',
-    'cp %(builddir)s/elpa-new_release_%(version)s/test/shared/generated.h %(installdir)s/examples/C/generated.h',
-    'cp %(builddir)s/elpa-new_release_%(version)s/private_modules/* %(installdir)s/include/elpa-%(version)s/modules',
-    'cp %(builddir)s/elpa-new_release_%(version)s/test_modules/* %(installdir)s/include/elpa-%(version)s/modules',
-]
-
-modextravars = {
-    'ELPA_ROOT': '%(installdir)s',
-    'ELPAROOT': '%(installdir)s',
-    'ELPA_INCLUDE': '%(installdir)s/include/elpa-%(version)s/',
-    'ELPA_INCLUDE_OPENMP': '%(installdir)s/include/elpa_openmp-%(version)s/',
-    'ELPA_LIB': '%(installdir)s/lib',
-    'ELPA_LIB_OPENMP': '%(installdir)s/lib',
-    'ELPA_MODULES': '%(installdir)s/include/elpa-%(version)s/modules',
-    'ELPA_MODULES_OPENMP': '%(installdir)s/include/elpa_openmp-%(version)s/modules',
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/e/ELPA/ELPA-2021.11.001-intel-para-2021b.eb b/Golden_Repo/e/ELPA/ELPA-2021.11.001-intel-para-2021b.eb
deleted file mode 100644
index 8eda37582..000000000
--- a/Golden_Repo/e/ELPA/ELPA-2021.11.001-intel-para-2021b.eb
+++ /dev/null
@@ -1,104 +0,0 @@
-name = 'ELPA'
-version = '2021.11.001'
-
-homepage = 'https://elpa.rzg.mpg.de'
-description = """Eigenvalue SoLvers for Petaflop-Applications. ELPA has been installed as module in
-$EBROOTELPA ($ELPA_ROOT is also defined). This installation
-contains the pure MPI version and the hybrid MPI/OpenMP version.
-Notice: If you want to use OpenMP threads you have to set
-export ELPA_DEFAULT_omp=<number of threads per MPI process>
-in your batch job and start MPI with MPI_INIT_THREAD(MPI_THREAD_MULTIPLE,....
-
-Several assembly kernels have been compiled. They can be chosen at runtime when calling the library or
-with the environment variables REAL_ELPA_KERNEL or COMPLEX_ELPA_KERNEL.
-
-An example is
-export REAL_ELPA_KERNEL=REAL_ELPA_KERNEL_GENERIC
-which chooses the generic real kernel for elpa2.
-Starting with version 2019.11.001 the legacy interface is no longer available.
-"""
-
-usage = """You can get an overview over the available kernels by loading ELPA and then submitting a batch job with
-
-srun --ntasks=1 $EBROOTELPA/bin/elpa2_print_kernels
-
-Programs using this ELPA library have to be compiled with
-
--I$ELPA_INCLUDE[_OPENMP]/ -I$ELPA_INCLUDE[_OPENMP]/elpa -I$ELPA_MODULES[_OPENMP]
-
-and linked with
-
--L$EBROOTELPA/lib -lelpa[_openmp]
--lmkl_scalapack_lp64 -lmkl_blacs_intelmpi_lp64 -lmkl_intel_lp64
--lmkl_sequential[-lmkl_intel_thread]
--lmkl_core -liomp5 -lpthread -lstdc++
-"""
-
-examples = 'Examples can be found in $EBROOTELPA/examples'
-
-toolchain = {'name': 'intel-para', 'version': '2021b'}
-toolchainopts = {'openmp': True, 'usempi': True}
-
-source_urls = ['https://gitlab.mpcdf.mpg.de/elpa/elpa/-/archive/new_release_%(version)s/']
-sources = ["elpa-new_release_%(version)s.tar.gz"]
-patches = [
-    '%(name)s-%(version)s_fix_hardcoded_perl_path.patch',
-    'ELPA-%(version)s_install-libelpatest.patch',
-]
-checksums = [
-    'e61048393a5e5f460858a11b216547fa3f434dd620c478cb20a52ebf543260f1',  # elpa-new_release_2021.11.001.tar.gz
-    # ELPA-2021.11.001_fix_hardcoded_perl_path.patch
-    '5fc40b6f3f948fd026efc688f9bafba0461d68ad007d9dc161bfd1507e2fc13b',
-    '2ce155ccbcdd61e8036d859aa204b48883695eff5f4decee3e5c2677516d8272',  # ELPA-2021.11.001_install-libelpatest.patch
-]
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    # remove_xcompiler script requires 'python' command,
-    ('Python', '3.9.6'),
-    ('Perl', '5.34.0'),
-]
-
-preconfigopts = './autogen.sh && '
-preconfigopts += 'autoreconf && '
-
-# The checking of MPI_THREAD_MULTIPLE does not work because the check uses an
-# MPI program that is then executed by just ./conftest
-# Unfortunately you cannot turn of checking during runtime, too
-configopts = '--without-threading-support-check-during-build '
-
-with_single = False
-
-# When building in parallel, the file test_setup_mpi.mod is sometimes
-# used before it is built, leading to an error.  This must be a bug in
-# the makefile affecting parallel builds.
-maxparallel = 1
-
-postinstallcmds = [
-    'cp -r %(builddir)s/elpa-new_release_%(version)s/examples %(installdir)s/examples/',
-    'rm %(installdir)s/examples/*.orig',
-    'rm %(installdir)s/examples/*_cuda',
-    'rm %(installdir)s/examples/C/*.orig',
-    'rm %(installdir)s/examples/C/*_cuda',
-    'rm %(installdir)s/examples/Fortran/*.orig',
-    'rm %(installdir)s/examples/Fortran/*_cuda',
-    'cp config.h config-f90.h %(installdir)s/include/elpa_openmp-%(version)s/elpa/',
-    'grep -v WITH_OPENMP config.h > %(installdir)s/include/elpa-%(version)s/elpa/config.h',
-    'grep -v WITH_OPENMP config-f90.h > %(installdir)s/include/elpa-%(version)s/elpa/config-f90.h',
-    'cp %(builddir)s/elpa-new_release_%(version)s/test/shared/generated.h %(installdir)s/examples/C/generated.h',
-    'cp %(builddir)s/elpa-new_release_%(version)s/private_modules/* %(installdir)s/include/elpa-%(version)s/modules',
-    'cp %(builddir)s/elpa-new_release_%(version)s/test_modules/* %(installdir)s/include/elpa-%(version)s/modules',
-]
-
-modextravars = {
-    'ELPA_ROOT': '%(installdir)s',
-    'ELPAROOT': '%(installdir)s',
-    'ELPA_INCLUDE': '%(installdir)s/include/elpa-%(version)s/',
-    'ELPA_INCLUDE_OPENMP': '%(installdir)s/include/elpa_openmp-%(version)s/',
-    'ELPA_LIB': '%(installdir)s/lib',
-    'ELPA_LIB_OPENMP': '%(installdir)s/lib',
-    'ELPA_MODULES': '%(installdir)s/include/elpa-%(version)s/modules',
-    'ELPA_MODULES_OPENMP': '%(installdir)s/include/elpa_openmp-%(version)s/modules',
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/e/ELPA/ELPA-2021.11.001-iomkl-2021b.eb b/Golden_Repo/e/ELPA/ELPA-2021.11.001-iomkl-2021b.eb
deleted file mode 100644
index 08e7f2424..000000000
--- a/Golden_Repo/e/ELPA/ELPA-2021.11.001-iomkl-2021b.eb
+++ /dev/null
@@ -1,105 +0,0 @@
-name = 'ELPA'
-version = '2021.11.001'
-
-homepage = 'https://elpa.rzg.mpg.de'
-description = """Eigenvalue SoLvers for Petaflop-Applications. ELPA has been installed as module in
-$EBROOTELPA ($ELPA_ROOT is also defined). This installation
-contains the pure MPI version and the hybrid MPI/OpenMP version.
-Notice: If you want to use OpenMP threads you have to set
-export ELPA_DEFAULT_omp=<number of threads per MPI process>
-in your batch job and start MPI with MPI_INIT_THREAD(MPI_THREAD_MULTIPLE,....
-
-Several assembly kernels have been compiled. They can be chosen at runtime when calling the library or
-with the environment variables REAL_ELPA_KERNEL or COMPLEX_ELPA_KERNEL.
-
-An example is
-export REAL_ELPA_KERNEL=REAL_ELPA_KERNEL_GENERIC
-which chooses the generic real kernel for elpa2.
-Starting with version 2019.11.001 the legacy interface is no longer available.
-"""
-
-usage = """You can get an overview over the available kernels by loading ELPA and then submitting a batch job with
-
-srun --ntasks=1 $EBROOTELPA/bin/elpa2_print_kernels
-
-Programs using this ELPA library have to be compiled with
-
--I$ELPA_INCLUDE[_OPENMP]/ -I$ELPA_INCLUDE[_OPENMP]/elpa -I$ELPA_MODULES[_OPENMP]
-
-and linked with
-
--L$EBROOTELPA/lib -lelpa[_openmp]
--lmkl_scalapack_lp64
-${MKLROOT}/lib/intel64/libmkl_blacs_openmpi_lp64.a
--lmkl_intel_lp64 -lmkl_sequential[-lmkl_intel_thread]
--lmkl_core -liomp -lpthread -ldl -lstdc++
-"""
-
-examples = 'Examples can be found in $EBROOTELPA/examples'
-
-toolchain = {'name': 'iomkl', 'version': '2021b'}
-toolchainopts = {'openmp': True, 'usempi': True}
-
-source_urls = ['https://gitlab.mpcdf.mpg.de/elpa/elpa/-/archive/new_release_%(version)s/']
-sources = ["elpa-new_release_%(version)s.tar.gz"]
-patches = [
-    '%(name)s-%(version)s_fix_hardcoded_perl_path.patch',
-    'ELPA-%(version)s_install-libelpatest.patch',
-]
-checksums = [
-    'e61048393a5e5f460858a11b216547fa3f434dd620c478cb20a52ebf543260f1',  # elpa-new_release_2021.11.001.tar.gz
-    # ELPA-2021.11.001_fix_hardcoded_perl_path.patch
-    '5fc40b6f3f948fd026efc688f9bafba0461d68ad007d9dc161bfd1507e2fc13b',
-    '2ce155ccbcdd61e8036d859aa204b48883695eff5f4decee3e5c2677516d8272',  # ELPA-2021.11.001_install-libelpatest.patch
-]
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    # remove_xcompiler script requires 'python' command,
-    ('Python', '3.9.6'),
-    ('Perl', '5.34.0'),
-]
-
-preconfigopts = './autogen.sh && '
-preconfigopts += 'autoreconf && '
-
-# The checking of MPI_THREAD_MULTIPLE does not work because the check uses an
-# MPI program that is then executed by just ./conftest
-# Unfortunately you cannot turn of checking during runtime, too
-configopts = '--without-threading-support-check-during-build '
-
-with_single = False
-
-# When building in parallel, the file test_setup_mpi.mod is sometimes
-# used before it is built, leading to an error.  This must be a bug in
-# the makefile affecting parallel builds.
-maxparallel = 1
-
-postinstallcmds = [
-    'cp -r %(builddir)s/elpa-new_release_%(version)s/examples %(installdir)s/examples/',
-    'rm %(installdir)s/examples/*.orig',
-    'rm %(installdir)s/examples/*_cuda',
-    'rm %(installdir)s/examples/C/*.orig',
-    'rm %(installdir)s/examples/C/*_cuda',
-    'rm %(installdir)s/examples/Fortran/*.orig',
-    'rm %(installdir)s/examples/Fortran/*_cuda',
-    'cp %(builddir)s/elpa-new_release_%(version)s/test/shared/generated.h %(installdir)s/examples/C/generated.h',
-    'cp config.h config-f90.h %(installdir)s/include/elpa_openmp-%(version)s/elpa/',
-    'grep -v WITH_OPENMP config.h > %(installdir)s/include/elpa-%(version)s/elpa/config.h',
-    'grep -v WITH_OPENMP config-f90.h > %(installdir)s/include/elpa-%(version)s/elpa/config-f90.h',
-    'cp %(builddir)s/elpa-new_release_%(version)s/private_modules/* %(installdir)s/include/elpa-%(version)s/modules',
-    'cp %(builddir)s/elpa-new_release_%(version)s/test_modules/* %(installdir)s/include/elpa-%(version)s/modules',
-]
-
-modextravars = {
-    'ELPA_ROOT': '%(installdir)s',
-    'ELPAROOT': '%(installdir)s',
-    'ELPA_INCLUDE': '%(installdir)s/include/elpa-%(version)s/',
-    'ELPA_INCLUDE_OPENMP': '%(installdir)s/include/elpa_openmp-%(version)s/',
-    'ELPA_LIB': '%(installdir)s/lib',
-    'ELPA_LIB_OPENMP': '%(installdir)s/lib',
-    'ELPA_MODULES': '%(installdir)s/include/elpa-%(version)s/modules',
-    'ELPA_MODULES_OPENMP': '%(installdir)s/include/elpa_openmp-%(version)s/modules',
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/e/ELPA/ELPA-2021.11.001_fix_hardcoded_perl_path.patch b/Golden_Repo/e/ELPA/ELPA-2021.11.001_fix_hardcoded_perl_path.patch
deleted file mode 100644
index 5c7ae5eae..000000000
--- a/Golden_Repo/e/ELPA/ELPA-2021.11.001_fix_hardcoded_perl_path.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- elpa-new_release_2021.11.001/test_project_1stage/fdep/fortran_dependencies.pl	2021-12-17 08:20:49.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/test_project_1stage/fdep/fortran_dependencies.pl	2022-01-25 17:07:21.169362000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- 
- use strict;
- 
---- elpa-new_release_2021.11.001/fdep/fortran_dependencies.pl	2021-12-17 08:20:49.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/fdep/fortran_dependencies.pl	2022-01-25 17:08:17.272544000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- #
- # Copyright 2015 Lorenz Hüdepohl
- #
---- elpa-new_release_2021.11.001/test_project_C_2stage/fdep/fortran_dependencies.pl	2021-12-17 08:20:49.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/test_project_C_2stage/fdep/fortran_dependencies.pl	2022-01-25 17:06:20.088471000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- 
- use strict;
- 
---- elpa-new_release_2021.11.001/test_project_2stage/fdep/fortran_dependencies.pl	2021-12-17 08:20:49.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/test_project_2stage/fdep/fortran_dependencies.pl	2022-01-25 17:05:10.675886000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- 
- use strict;
- 
---- elpa-new_release_2021.11.001/test_project_C/fdep/fortran_dependencies.pl	2021-12-17 08:20:49.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/test_project_C/fdep/fortran_dependencies.pl	2022-01-25 17:04:14.834326000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- 
- use strict;
- 
diff --git a/Golden_Repo/e/ELPA/ELPA-2021.11.001_install-libelpatest.patch b/Golden_Repo/e/ELPA/ELPA-2021.11.001_install-libelpatest.patch
deleted file mode 100644
index ad5240130..000000000
--- a/Golden_Repo/e/ELPA/ELPA-2021.11.001_install-libelpatest.patch
+++ /dev/null
@@ -1,12790 +0,0 @@
---- elpa-new_release_2021.11.001/Makefile.am	2021-12-17 08:20:49.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/Makefile.am	2022-01-26 10:47:31.956245709 +0100
-@@ -665,7 +665,7 @@
- test_program_fcflags = $(AM_FCFLAGS) $(FC_MODOUT)test_modules $(FC_MODINC)test_modules $(FC_MODINC)modules $(FC_MODINC)private_modules
- 
- # library with shared sources for the test files
--noinst_LTLIBRARIES += libelpatest@SUFFIX@.la
-+lib_LTLIBRARIES += libelpatest@SUFFIX@.la
- libelpatest@SUFFIX@_la_FCFLAGS = $(test_program_fcflags)
- libelpatest@SUFFIX@_la_SOURCES = \
-   test/shared/tests_variable_definitions.F90 \
-diff -ruN elpa-new_release_2021.11.001/examples/C/Makefile_examples_hybrid elpa-new_release_2021.11.001_ok/examples/C/Makefile_examples_hybrid
---- elpa-new_release_2021.11.001/examples/C/Makefile_examples_hybrid	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/C/Makefile_examples_hybrid	2022-01-28 09:53:19.118256000 +0100
-@@ -0,0 +1,31 @@
-+# MPICH, that is IntelMPI or ParaStationMPI
-+SCALAPACK_LIB = -lmkl_scalapack_lp64 -lmkl_blacs_intelmpi_lp64
-+# OpenMPI
-+# SCALAPACK_LIB = -lmkl_scalapack_lp64 $(MKLROOT)/lib/intel64/libmkl_blacs_openmpi_lp64.a
-+LAPACK_LIB = 
-+# Intel compiler
-+MKL = -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lpthread -lstdc++
-+# GCC
-+# MKL = -lmkl_gf_lp64 -lmkl_gnu_thread -lmkl_core -lgomp -lpthread -lstdc++ -lm
-+F90 = mpif90 -O3 -qopenmp -I$(ELPA_MODULES_OPENMP) -I$(ELPA_INCLUDE_OPENMP) -I$(ELPA_INCLUDE_OPENMP)/elpa -I$(ELPA_INCLUDE) -I$(ELPA_INCLUDE)/elpa
-+# GCC
-+# F90 = mpif90 -O3 -fopenmp -I$(ELPA_MODULES_OPENMP) -I$(ELPA_INCLUDE_OPENMP) -I$(ELPA_INCLUDE_OPENMP)/elpa -I$(ELPA_INCLUDE) -I$(ELPA_INCLUDE)/elpa
-+LIBS = -L$(ELPA_LIB_OPENMP) -lelpa_openmp -lelpatest_openmp $(SCALAPACK_LIB) $(MKL)
-+CC            = mpicc -O3 -qopenmp
-+# GCC
-+# CC            = mpicc -O3 -fopenmp
-+
-+all: test_real_1stage_hybrid test_real_2stage_all_kernels_hybrid test_autotune_hybrid test_multiple_objs_hybrid
-+
-+test_real_1stage_hybrid: test.c
-+	$(CC) -DCURRENT_API_VERSION=20211125 -DTEST_GPU=0 -DTEST_REAL -DTEST_DOUBLE -DTEST_SOLVER_1STAGE -DWITH_OPENMP_TRADITIONAL -DTEST_EIGENVECTORS -DWITH_MPI -I$(ELPA_INCLUDE_OPENMP) -I$(ELPA_INCLUDE_OPENMP)/elpa -I$(ELPA_INCLUDE) -I$(ELPA_INCLUDE)/elpa -I. -o $@ test.c $(LIBS)
-+
-+test_real_2stage_all_kernels_hybrid: test.c
-+	$(CC) -DCURRENT_API_VERSION=20211125 -DTEST_GPU=0 -DTEST_GPU=0 -DTEST_REAL -DTEST_DOUBLE -DTEST_SOLVER_2STAGE -DWITH_OPENMP_TRADITIONAL -DTEST_EIGENVECTORS -DTEST_ALL_KERNELS -DWITH_MPI -I$(ELPA_INCLUDE_OPENMP) -I$(ELPA_INCLUDE_OPENMP)/elpa -I$(ELPA_INCLUDE) -I$(ELPA_INCLUDE)/elpa -I. -o $@ test.c $(LIBS)
-+
-+test_autotune_hybrid: test_autotune.c
-+	$(CC) -DCURRENT_API_VERSION=20211125 -DTEST_GPU=0 -DTEST_REAL -DTEST_DOUBLE -DWITH_MPI -DWITH_OPENMP_TRADITIONAL -I$(ELPA_INCLUDE_OPENMP) -I$(ELPA_INCLUDE_OPENMP)/elpa -I$(ELPA_INCLUDE) -I$(ELPA_INCLUDE)/elpa -I. -o $@ test_autotune.c $(LIBS)
-+
-+test_multiple_objs_hybrid: test_multiple_objs.c
-+	$(CC) -DCURRENT_API_VERSION=20211125 -DTEST_GPU=0 -DTEST_REAL -DTEST_DOUBLE -DWITH_MPI -DWITH_OPENMP_TRADITIONAL -I$(ELPA_INCLUDE_OPENMP) -I$(ELPA_INCLUDE_OPENMP)/elpa -I$(ELPA_INCLUDE) -I$(ELPA_INCLUDE)/elpa -I. -o $@ test_multiple_objs.c $(LIBS)
-+
-diff -ruN elpa-new_release_2021.11.001/examples/C/Makefile_examples_pure elpa-new_release_2021.11.001_ok/examples/C/Makefile_examples_pure
---- elpa-new_release_2021.11.001/examples/C/Makefile_examples_pure	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/C/Makefile_examples_pure	2022-01-28 09:53:42.223490000 +0100
-@@ -0,0 +1,27 @@
-+# MPICH, that is IntelMPI or ParaStationMPI
-+SCALAPACK_LIB = -lmkl_scalapack_lp64 -lmkl_blacs_intelmpi_lp64
-+# OpenMPI
-+# SCALAPACK_LIB = -lmkl_scalapack_lp64 $(MKLROOT)/lib/intel64/libmkl_blacs_openmpi_lp64.a
-+LAPACK_LIB = 
-+# Intel compiler
-+MKL = -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -liomp5 -lpthread -lstdc++
-+# GCC
-+# MKL = -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lgomp -lpthread -lstdc++ -lm
-+F90 = mpif90 -O3 -I$(ELPA_MODULES) -I$(ELPA_INCLUDE) -I$(ELPA_INCLUDE)/elpa
-+LIBS = -L$(ELPA_LIB) -lelpa -lelpatest $(SCALAPACK_LIB) $(MKL)
-+CC            = mpicc -O3 
-+
-+all: test_real_1stage test_real_2stage_all_kernels test_autotune test_multiple_objs
-+
-+test_real_1stage: test.c
-+	$(CC) -DCURRENT_API_VERSION=20211125 -DTEST_GPU=0 -DTEST_REAL -DTEST_DOUBLE -DTEST_SOLVER_1STAGE -DTEST_EIGENVECTORS -DWITH_MPI -I$(ELPA_INCLUDE) -I$(ELPA_INCLUDE)/elpa -I. -o $@ test.c $(LIBS)
-+
-+test_real_2stage_all_kernels: test.c
-+	$(CC) -DCURRENT_API_VERSION=20211125 -DTEST_GPU=0 -DTEST_GPU=0 -DTEST_REAL -DTEST_DOUBLE -DTEST_SOLVER_2STAGE -DTEST_EIGENVECTORS -DTEST_ALL_KERNELS -DWITH_MPI -I$(ELPA_INCLUDE) -I$(ELPA_INCLUDE)/elpa -I. -o $@ test.c $(LIBS)
-+
-+test_autotune: test_autotune.c
-+	$(CC) -DCURRENT_API_VERSION=20211125 -DTEST_GPU=0 -DTEST_REAL -DTEST_DOUBLE -DWITH_MPI -I$(ELPA_INCLUDE) -I$(ELPA_INCLUDE)/elpa -I. -o $@ test_autotune.c $(LIBS)
-+
-+test_multiple_objs: test_multiple_objs.c
-+	$(CC) -DCURRENT_API_VERSION=20211125 -DTEST_GPU=0 -DTEST_REAL -DTEST_DOUBLE -DWITH_MPI -I$(ELPA_INCLUDE) -I$(ELPA_INCLUDE)/elpa -I. -o $@ test_multiple_objs.c $(LIBS)
-+
-diff -ruN elpa-new_release_2021.11.001/examples/C/Makefile_examples_pure_cuda elpa-new_release_2021.11.001_ok/examples/C/Makefile_examples_pure_cuda
---- elpa-new_release_2021.11.001/examples/C/Makefile_examples_pure_cuda	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/C/Makefile_examples_pure_cuda	2022-01-28 09:53:55.785592000 +0100
-@@ -0,0 +1,27 @@
-+# MPICH, that is IntelMPI or ParaStationMPI
-+SCALAPACK_LIB = -lmkl_scalapack_lp64 -lmkl_blacs_intelmpi_lp64
-+# OpenMPI
-+# SCALAPACK_LIB = -lmkl_scalapack_lp64 $(MKLROOT)/lib/intel64/libmkl_blacs_openmpi_lp64.a
-+LAPACK_LIB = 
-+# Intel compiler
-+MKL = -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -liomp5 -lpthread -lstdc++
-+# GCC
-+# MKL = -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lgomp -lpthread -lstdc++ -lm
-+F90 = mpif90 -O3 -I$(ELPA_MODULES) -I$(ELPA_INCLUDE) -I$(ELPA_INCLUDE)/elpa
-+LIBS = -L$(ELPA_LIB) -lelpa -lelpatest $(SCALAPACK_LIB) $(MKL) -lcublas -lcudart
-+CC            = mpicc -O3 
-+
-+all: test_real_1stage test_real_2stage_all_kernels test_autotune test_multiple_objs
-+
-+test_real_1stage: test.c
-+	$(CC) -DCURRENT_API_VERSION=20211125 -DTEST_NVIDIA_GPU=1 -DTEST_REAL -DTEST_DOUBLE -DTEST_SOLVER_1STAGE -DTEST_EIGENVECTORS -DWITH_MPI -I$(ELPA_INCLUDE) -I$(ELPA_INCLUDE)/elpa -I. -o $@ test.c $(LIBS)
-+
-+test_real_2stage_all_kernels: test.c
-+	$(CC) -DCURRENT_API_VERSION=20211125 -DTEST_NVIDIA_GPU=1 -DTEST_REAL -DTEST_DOUBLE -DTEST_SOLVER_2STAGE -DTEST_EIGENVECTORS -DTEST_ALL_KERNELS -DWITH_MPI -I$(ELPA_INCLUDE) -I$(ELPA_INCLUDE)/elpa -I. -o $@ test.c $(LIBS)
-+
-+test_autotune: test_autotune.c
-+	$(CC) -DCURRENT_API_VERSION=20211125 -DTEST_NVIDIA_GPU=1 -DTEST_REAL -DTEST_DOUBLE -DWITH_MPI -I$(ELPA_INCLUDE) -I$(ELPA_INCLUDE)/elpa -I. -o $@ test_autotune.c $(LIBS)
-+
-+test_multiple_objs: test_multiple_objs.c
-+	$(CC) -DCURRENT_API_VERSION=20211125 -DTEST_NVIDIA_GPU=1 -DTEST_REAL -DTEST_DOUBLE -DWITH_MPI -I$(ELPA_INCLUDE) -I$(ELPA_INCLUDE)/elpa -I. -o $@ test_multiple_objs.c $(LIBS)
-+
-diff -ruN elpa-new_release_2021.11.001/examples/C/test_autotune.c elpa-new_release_2021.11.001_ok/examples/C/test_autotune.c
---- elpa-new_release_2021.11.001/examples/C/test_autotune.c	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/C/test_autotune.c	2022-02-01 18:20:00.273429184 +0100
-@@ -0,0 +1,342 @@
-+/*   This file is part of ELPA.
-+
-+     The ELPA library was originally created by the ELPA consortium,
-+     consisting of the following organizations:
-+
-+     - Max Planck Computing and Data Facility (MPCDF), formerly known as
-+       Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+     - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+       Informatik,
-+     - Technische Universität München, Lehrstuhl für Informatik mit
-+       Schwerpunkt Wissenschaftliches Rechnen ,
-+     - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+     - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+       Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+       and
-+     - IBM Deutschland GmbH
-+
-+
-+     More information can be found here:
-+     http://elpa.mpcdf.mpg.de/
-+
-+     ELPA is free software: you can redistribute it and/or modify
-+     it under the terms of the version 3 of the license of the
-+     GNU Lesser General Public License as published by the Free
-+     Software Foundation.
-+
-+     ELPA is distributed in the hope that it will be useful,
-+     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+     GNU Lesser General Public License for more details.
-+
-+     You should have received a copy of the GNU Lesser General Public License
-+     along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+
-+     ELPA reflects a substantial effort on the part of the original
-+     ELPA consortium, and we ask you to respect the spirit of the
-+     license that we chose: i.e., please contribute any changes you
-+     may have back to the original ELPA library distribution, and keep
-+     any derivatives of ELPA under the same license that we chose for
-+     the original distribution, the GNU Lesser General Public License.
-+*/
-+
-+#include "config.h"
-+
-+#include <string.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#ifdef WITH_MPI
-+#include <mpi.h>
-+#endif
-+#include <math.h>
-+
-+#include <elpa/elpa.h>
-+#include <assert.h>
-+
-+#if !(defined(TEST_REAL) ^ defined(TEST_COMPLEX))
-+//#error "define exactly one of TEST_REAL or TEST_COMPLEX"
-+#endif
-+
-+#if !(defined(TEST_SINGLE) ^ defined(TEST_DOUBLE))
-+//#error "define exactly one of TEST_SINGLE or TEST_DOUBLE"
-+#endif
-+
-+#if !(defined(TEST_SOLVER_1STAGE) ^ defined(TEST_SOLVER_2STAGE))
-+//#error "define exactly one of TEST_SOLVER_1STAGE or TEST_SOLVER_2STAGE"
-+#endif
-+
-+#ifdef TEST_SINGLE
-+#  define EV_TYPE float
-+#  ifdef TEST_REAL
-+#    define MATRIX_TYPE float
-+#  else
-+#    define MATRIX_TYPE complex float
-+#  endif
-+#else
-+#  define EV_TYPE double
-+#  ifdef TEST_REAL
-+#    define MATRIX_TYPE double
-+#  else
-+#    define MATRIX_TYPE complex double
-+#  endif
-+#endif
-+
-+#define assert_elpa_ok(x) assert(x == ELPA_OK)
-+
-+#ifdef HAVE_64BIT_INTEGER_SUPPORT
-+#define TEST_C_INT_TYPE_PTR long int*
-+#define C_INT_TYPE_PTR long int*
-+#define TEST_C_INT_TYPE long int
-+#define C_INT_TYPE long int
-+#else
-+#define TEST_C_INT_TYPE_PTR int*
-+#define C_INT_TYPE_PTR int*
-+#define TEST_C_INT_TYPE int
-+#define C_INT_TYPE int
-+#endif
-+
-+#include "generated.h"
-+
-+int main(int argc, char** argv) {
-+   /* matrix dimensions */
-+   C_INT_TYPE na, nev, nblk;
-+
-+   /* mpi */
-+   C_INT_TYPE myid, nprocs;
-+   C_INT_TYPE na_cols, na_rows;
-+   C_INT_TYPE np_cols, np_rows;
-+   C_INT_TYPE my_prow, my_pcol;
-+   C_INT_TYPE mpi_comm;
-+
-+   /* blacs */
-+   C_INT_TYPE my_blacs_ctxt, sc_desc[9], info;
-+
-+   /* The Matrix */
-+   MATRIX_TYPE *a, *as, *z;
-+   EV_TYPE *ev;
-+
-+   C_INT_TYPE status;
-+   int error_elpa; 
-+   elpa_t handle;
-+
-+   elpa_autotune_t autotune_handle;
-+   C_INT_TYPE i, unfinished;
-+
-+   C_INT_TYPE value;
-+#ifdef WITH_MPI
-+   MPI_Init_thread(&argc, &argv, MPI_THREAD_SERIALIZED, &info);
-+   MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
-+   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
-+#else
-+   nprocs = 1;
-+   myid = 0;
-+#endif
-+
-+   if (argc == 4) {
-+     na = atoi(argv[1]);
-+     nev = atoi(argv[2]);
-+     nblk = atoi(argv[3]);
-+   } else {
-+     na = 500;
-+     nev = 250;
-+     nblk = 16;
-+   }
-+
-+   for (np_cols = (C_INT_TYPE) sqrt((double) nprocs); np_cols > 1; np_cols--) {
-+     if (nprocs % np_cols == 0) {
-+       break;
-+     }
-+   }
-+
-+   np_rows = nprocs/np_cols;
-+
-+   /* set up blacs */
-+   /* convert communicators before */
-+#ifdef WITH_MPI
-+   mpi_comm = MPI_Comm_c2f(MPI_COMM_WORLD);
-+#else
-+   mpi_comm = 0;
-+#endif
-+   set_up_blacsgrid_f(mpi_comm, np_rows, np_cols, 'C', &my_blacs_ctxt, &my_prow, &my_pcol);
-+   set_up_blacs_descriptor_f(na, nblk, my_prow, my_pcol, np_rows, np_cols, &na_rows, &na_cols, sc_desc, my_blacs_ctxt, &info);
-+
-+   /* allocate the matrices needed for elpa */
-+   a  = calloc(na_rows*na_cols, sizeof(MATRIX_TYPE));
-+   z  = calloc(na_rows*na_cols, sizeof(MATRIX_TYPE));
-+   as = calloc(na_rows*na_cols, sizeof(MATRIX_TYPE));
-+   ev = calloc(na, sizeof(EV_TYPE));
-+
-+#ifdef TEST_REAL
-+#ifdef TEST_DOUBLE
-+   prepare_matrix_random_real_double_f(na, myid, na_rows, na_cols, sc_desc, a, z, as);
-+#else
-+   prepare_matrix_random_real_single_f(na, myid, na_rows, na_cols, sc_desc, a, z, as);
-+#endif
-+#else
-+#ifdef TEST_DOUBLE
-+   prepare_matrix_random_complex_double_f(na, myid, na_rows, na_cols, sc_desc, a, z, as);
-+#else
-+   prepare_matrix_random_complex_single_f(na, myid, na_rows, na_cols, sc_desc, a, z, as);
-+#endif
-+#endif
-+
-+   if (elpa_init(CURRENT_API_VERSION) != ELPA_OK) {
-+     fprintf(stderr, "Error: ELPA API version not supported");
-+     exit(1);
-+   }
-+
-+#if OPTIONAL_C_ERROR_ARGUMENT == 1
-+   handle = elpa_allocate();
-+#else
-+   handle = elpa_allocate(&error_elpa);
-+   assert_elpa_ok(error_elpa);
-+#endif
-+   assert_elpa_ok(error_elpa);
-+
-+   /* Set parameters */
-+   elpa_set(handle, "na", (int) na, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+
-+   elpa_set(handle, "nev", (int) nev, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+
-+   if (myid == 0) {
-+     printf("Setting the matrix parameters na=%d, nev=%d \n",na,nev);
-+   }
-+   elpa_set(handle, "local_nrows", (int) na_rows, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+
-+   elpa_set(handle, "local_ncols", (int) na_cols, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+
-+   elpa_set(handle, "nblk", (int) nblk, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+
-+#ifdef WITH_MPI
-+   elpa_set(handle, "mpi_comm_parent", (int) (MPI_Comm_c2f(MPI_COMM_WORLD)), &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+
-+   elpa_set(handle, "process_row", (int) my_prow, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+
-+   elpa_set(handle, "process_col", (int) my_pcol, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+#endif
-+
-+   /* Setup */
-+   assert_elpa_ok(elpa_setup(handle));
-+
-+#if TEST_NVIDIA_GPU == 1
-+   elpa_set(handle, "nvidia-gpu", 0, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+#endif
-+
-+#if TEST_INTEL_GPU == 1
-+   elpa_set(handle, "intel-gpu", 0, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+#endif
-+ 
-+   autotune_handle = elpa_autotune_setup(handle, ELPA_AUTOTUNE_FAST, ELPA_AUTOTUNE_DOMAIN_REAL, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+   /* mimic 20 scf steps */
-+
-+   for (i=0; i < 20; i++) {
-+
-+      unfinished = elpa_autotune_step(handle, autotune_handle, &error_elpa);
-+
-+      if (unfinished == 0) {
-+        if (myid == 0) {
-+       	  printf("ELPA autotuning finished in the %d th scf step \n",i);
-+        }
-+	break;
-+      }
-+      if (myid == 0) {
-+	printf("The current setting of the ELPA object: \n");
-+        elpa_print_settings(handle, &error_elpa);
-+
-+	printf("The state of the autotuning: \n");
-+        elpa_autotune_print_state(handle, autotune_handle, &error_elpa);
-+      }
-+
-+
-+      /* Solve EV problem */
-+      elpa_eigenvectors(handle, a, ev, z, &error_elpa);
-+      assert_elpa_ok(error_elpa);
-+
-+      /* check the results */
-+#ifdef TEST_REAL
-+#ifdef TEST_DOUBLE
-+      status = check_correctness_evp_numeric_residuals_real_double_f(na, nev, na_rows, na_cols, as, z, ev,
-+                                sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol);
-+      memcpy(a, as, na_rows*na_cols*sizeof(double));
-+
-+#else
-+      status = check_correctness_evp_numeric_residuals_real_single_f(na, nev, na_rows, na_cols, as, z, ev,
-+                                sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol);
-+      memcpy(a, as, na_rows*na_cols*sizeof(float));
-+#endif
-+#else
-+#ifdef TEST_DOUBLE
-+      status = check_correctness_evp_numeric_residuals_complex_double_f(na, nev, na_rows, na_cols, as, z, ev,
-+                                sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol);
-+      memcpy(a, as, na_rows*na_cols*sizeof(complex double));
-+#else
-+      status = check_correctness_evp_numeric_residuals_complex_single_f(na, nev, na_rows, na_cols, as, z, ev,
-+                                sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol);
-+      memcpy(a, as, na_rows*na_cols*sizeof(complex float));
-+#endif
-+#endif
-+
-+      if (status !=0){
-+        printf("The computed EVs are not correct !\n");
-+	break;
-+      }
-+      printf("hier %d \n",myid);
-+   }
-+
-+   if (unfinished == 1) {
-+     if (myid == 0) {
-+        printf("ELPA autotuning did not finished during %d scf cycles\n",i);
-+
-+     }	     
-+
-+   }
-+   elpa_autotune_set_best(handle, autotune_handle, &error_elpa);
-+
-+   if (myid == 0) {
-+     printf("The best combination found by the autotuning:\n");
-+     elpa_autotune_print_best(handle, autotune_handle, &error_elpa);
-+   }
-+
-+#if OPTIONAL_C_ERROR_ARGUMENT == 1
-+   elpa_autotune_deallocate(autotune_handle);
-+   elpa_deallocate(handle);
-+#else
-+   elpa_autotune_deallocate(autotune_handle, &error_elpa);
-+   elpa_deallocate(handle, &error_elpa);
-+#endif
-+   elpa_uninit(&error_elpa);
-+
-+   if (myid == 0) {
-+     printf("\n");
-+     printf("2stage ELPA real solver complete\n");
-+     printf("\n");
-+   }
-+
-+   if (status ==0){
-+     if (myid ==0) {
-+       printf("All ok!\n");
-+     }
-+   }
-+
-+   free(a);
-+   free(z);
-+   free(as);
-+   free(ev);
-+
-+#ifdef WITH_MPI
-+   MPI_Finalize();
-+#endif
-+
-+   return !!status;
-+}
-diff -ruN elpa-new_release_2021.11.001/examples/C/test.c elpa-new_release_2021.11.001_ok/examples/C/test.c
---- elpa-new_release_2021.11.001/examples/C/test.c	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/C/test.c	2022-01-28 09:45:19.528434910 +0100
-@@ -0,0 +1,359 @@
-+/*   This file is part of ELPA.
-+
-+     The ELPA library was originally created by the ELPA consortium,
-+     consisting of the following organizations:
-+
-+     - Max Planck Computing and Data Facility (MPCDF), formerly known as
-+       Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+     - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+       Informatik,
-+     - Technische Universität München, Lehrstuhl für Informatik mit
-+       Schwerpunkt Wissenschaftliches Rechnen ,
-+     - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+     - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+       Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+       and
-+     - IBM Deutschland GmbH
-+
-+
-+     More information can be found here:
-+     http://elpa.mpcdf.mpg.de/
-+
-+     ELPA is free software: you can redistribute it and/or modify
-+     it under the terms of the version 3 of the license of the
-+     GNU Lesser General Public License as published by the Free
-+     Software Foundation.
-+
-+     ELPA is distributed in the hope that it will be useful,
-+     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+     GNU Lesser General Public License for more details.
-+
-+     You should have received a copy of the GNU Lesser General Public License
-+     along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+
-+     ELPA reflects a substantial effort on the part of the original
-+     ELPA consortium, and we ask you to respect the spirit of the
-+     license that we chose: i.e., please contribute any changes you
-+     may have back to the original ELPA library distribution, and keep
-+     any derivatives of ELPA under the same license that we chose for
-+     the original distribution, the GNU Lesser General Public License.
-+*/
-+
-+#include "config.h"
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#ifdef WITH_MPI
-+#include <mpi.h>
-+#endif
-+#include <math.h>
-+
-+#include <elpa/elpa.h>
-+#include <assert.h>
-+
-+#if !(defined(TEST_REAL) ^ defined(TEST_COMPLEX))
-+#error "define exactly one of TEST_REAL or TEST_COMPLEX"
-+#endif
-+
-+#if !(defined(TEST_SINGLE) ^ defined(TEST_DOUBLE))
-+#error "define exactly one of TEST_SINGLE or TEST_DOUBLE"
-+#endif
-+
-+#if !(defined(TEST_SOLVER_1STAGE) ^ defined(TEST_SOLVER_2STAGE))
-+#error "define exactly one of TEST_SOLVER_1STAGE or TEST_SOLVER_2STAGE"
-+#endif
-+
-+#ifdef TEST_GENERALIZED_DECOMP_EIGENPROBLEM
-+#define TEST_GENERALIZED_EIGENPROBLEM
-+#endif
-+
-+#ifdef TEST_SINGLE
-+#  define EV_TYPE float
-+#  ifdef TEST_REAL
-+#    define MATRIX_TYPE float
-+#    define PREPARE_MATRIX_RANDOM prepare_matrix_random_real_single_f
-+#    define PREPARE_MATRIX_RANDOM_SPD prepare_matrix_random_spd_real_single_f
-+#    define CHECK_CORRECTNESS_EVP_NUMERIC_RESIDUALS check_correctness_evp_numeric_residuals_real_single_f
-+#    define CHECK_CORRECTNESS_EVP_GEN_NUMERIC_RESIDUALS check_correctness_evp_gen_numeric_residuals_real_single_f
-+#  else
-+#    define MATRIX_TYPE complex float
-+#    define PREPARE_MATRIX_RANDOM prepare_matrix_random_complex_single_f
-+#    define PREPARE_MATRIX_RANDOM_SPD prepare_matrix_random_spd_complex_single_f
-+#    define CHECK_CORRECTNESS_EVP_NUMERIC_RESIDUALS check_correctness_evp_numeric_residuals_complex_single_f
-+#    define CHECK_CORRECTNESS_EVP_GEN_NUMERIC_RESIDUALS check_correctness_evp_gen_numeric_residuals_complex_single_f
-+#  endif
-+#else
-+#  define EV_TYPE double
-+#  ifdef TEST_REAL
-+#    define MATRIX_TYPE double
-+#    define PREPARE_MATRIX_RANDOM prepare_matrix_random_real_double_f
-+#    define PREPARE_MATRIX_RANDOM_SPD prepare_matrix_random_spd_real_double_f
-+#    define CHECK_CORRECTNESS_EVP_NUMERIC_RESIDUALS check_correctness_evp_numeric_residuals_real_double_f
-+#    define CHECK_CORRECTNESS_EVP_GEN_NUMERIC_RESIDUALS check_correctness_evp_gen_numeric_residuals_real_double_f
-+#  else
-+#    define MATRIX_TYPE complex double
-+#    define PREPARE_MATRIX_RANDOM prepare_matrix_random_complex_double_f
-+#    define PREPARE_MATRIX_RANDOM_SPD prepare_matrix_random_spd_complex_double_f
-+#    define CHECK_CORRECTNESS_EVP_NUMERIC_RESIDUALS check_correctness_evp_numeric_residuals_complex_double_f
-+#    define CHECK_CORRECTNESS_EVP_GEN_NUMERIC_RESIDUALS check_correctness_evp_gen_numeric_residuals_complex_double_f
-+#  endif
-+#endif
-+
-+#define assert_elpa_ok(x) assert(x == ELPA_OK)
-+
-+
-+#ifdef HAVE_64BIT_INTEGER_MATH_SUPPORT
-+#define TEST_C_INT_TYPE_PTR long int*
-+#define C_INT_TYPE_PTR long int*
-+#define TEST_C_INT_TYPE long int
-+#define C_INT_TYPE long int
-+#else
-+#define TEST_C_INT_TYPE_PTR int*
-+#define C_INT_TYPE_PTR int*
-+#define TEST_C_INT_TYPE int
-+#define C_INT_TYPE int
-+#endif
-+
-+#ifdef HAVE_64BIT_INTEGER_MPI_SUPPORT
-+#define TEST_C_INT_MPI_TYPE_PTR long int*
-+#define C_INT_MPI_TYPE_PTR long int*
-+#define TEST_C_INT_MPI_TYPE long int
-+#define C_INT_MPI_TYPE long int
-+#else
-+#define TEST_C_INT_MPI_TYPE_PTR int*
-+#define C_INT_MPI_TYPE_PTR int*
-+#define TEST_C_INT_MPI_TYPE int
-+#define C_INT_MPI_TYPE int
-+#endif
-+
-+#define TEST_GPU  0
-+#if (TEST_NVIDIA_GPU == 1) || (TEST_AMD_GPU == 1) || (TEST_INTEL_GPU == 1)
-+#undef TEST_GPU
-+#define TEST_GPU  1
-+#endif
-+
-+
-+#include "generated.h"
-+
-+int main(int argc, char** argv) {
-+   /* matrix dimensions */
-+   C_INT_TYPE na, nev, nblk;
-+
-+   /* mpi */
-+   C_INT_TYPE myid, nprocs;
-+   C_INT_MPI_TYPE myidMPI, nprocsMPI;
-+   C_INT_TYPE na_cols, na_rows;
-+   C_INT_TYPE np_cols, np_rows;
-+   C_INT_TYPE my_prow, my_pcol;
-+   C_INT_TYPE mpi_comm;
-+   C_INT_MPI_TYPE provided_mpi_thread_level;
-+
-+   /* blacs */
-+   C_INT_TYPE my_blacs_ctxt, sc_desc[9], info;
-+
-+   /* The Matrix */
-+   MATRIX_TYPE *a, *as, *z, *b, *bs;
-+   EV_TYPE *ev;
-+
-+   C_INT_TYPE error, status;
-+   int error_elpa;
-+
-+   elpa_t handle;
-+
-+   int  value;
-+#ifdef WITH_MPI
-+#ifndef WITH_OPENMP_TRADITIONAL
-+   MPI_Init(&argc, &argv);
-+#else
-+   MPI_Init_thread(&argc, &argv, MPI_THREAD_SERIALIZED, &provided_mpi_thread_level);
-+
-+   if (provided_mpi_thread_level != MPI_THREAD_SERIALIZED) {
-+     fprintf(stderr, "MPI ERROR: MPI_THREAD_SERIALIZED is not provided on this system\n");
-+     MPI_Finalize();
-+     exit(77);
-+   }
-+#endif
-+
-+   MPI_Comm_size(MPI_COMM_WORLD, &nprocsMPI);
-+   nprocs = (C_INT_TYPE) nprocsMPI;
-+   MPI_Comm_rank(MPI_COMM_WORLD, &myidMPI);
-+   myid = (C_INT_TYPE) myidMPI;
-+
-+#else
-+   nprocs = 1;
-+   myid = 0;
-+#endif
-+
-+   if (argc == 4) {
-+     na = atoi(argv[1]);
-+     nev = atoi(argv[2]);
-+     nblk = atoi(argv[3]);
-+   } else {
-+     na = 500;
-+     nev = 250;
-+     nblk = 16;
-+   }
-+
-+   for (np_cols = (C_INT_TYPE) sqrt((double) nprocs); np_cols > 1; np_cols--) {
-+     if (nprocs % np_cols == 0) {
-+       break;
-+     }
-+   }
-+
-+   np_rows = nprocs/np_cols;
-+
-+   /* set up blacs */
-+   /* convert communicators before */
-+#ifdef WITH_MPI
-+   mpi_comm = MPI_Comm_c2f(MPI_COMM_WORLD);
-+#else
-+   mpi_comm = 0;
-+#endif
-+   set_up_blacsgrid_f(mpi_comm, np_rows, np_cols, 'C', &my_blacs_ctxt, &my_prow, &my_pcol);
-+   set_up_blacs_descriptor_f(na, nblk, my_prow, my_pcol, np_rows, np_cols, &na_rows, &na_cols, sc_desc, my_blacs_ctxt, &info);
-+
-+   /* allocate the matrices needed for elpa */
-+   a  = calloc(na_rows*na_cols, sizeof(MATRIX_TYPE));
-+   z  = calloc(na_rows*na_cols, sizeof(MATRIX_TYPE));
-+   as = calloc(na_rows*na_cols, sizeof(MATRIX_TYPE));
-+   ev = calloc(na, sizeof(EV_TYPE));
-+
-+   PREPARE_MATRIX_RANDOM(na, myid, na_rows, na_cols, sc_desc, a, z, as);
-+
-+#if defined(TEST_GENERALIZED_EIGENPROBLEM)
-+   b  = calloc(na_rows*na_cols, sizeof(MATRIX_TYPE));
-+   bs = calloc(na_rows*na_cols, sizeof(MATRIX_TYPE));
-+   PREPARE_MATRIX_RANDOM_SPD(na, myid, na_rows, na_cols, sc_desc, b, z, bs, nblk, np_rows, np_cols, my_prow, my_pcol);
-+#endif
-+
-+   if (elpa_init(CURRENT_API_VERSION) != ELPA_OK) {
-+     fprintf(stderr, "Error: ELPA API version not supported");
-+     exit(1);
-+   }
-+
-+   handle = elpa_allocate(&error_elpa);
-+   //assert_elpa_ok(error_elpa);
-+
-+   /* Set parameters */
-+   elpa_set(handle, "na", (int) na, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+
-+   elpa_set(handle, "nev", (int) nev, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+
-+   if (myid == 0) {
-+     printf("Setting the matrix parameters na=%d, nev=%d \n",na,nev);
-+   }
-+   elpa_set(handle, "local_nrows", (int) na_rows, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+
-+   elpa_set(handle, "local_ncols", (int) na_cols, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+
-+   elpa_set(handle, "nblk", (int) nblk, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+
-+#ifdef WITH_MPI
-+   elpa_set(handle, "mpi_comm_parent", (int) (MPI_Comm_c2f(MPI_COMM_WORLD)), &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+
-+   elpa_set(handle, "process_row", (int) my_prow, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+
-+   elpa_set(handle, "process_col", (int) my_pcol, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+#endif
-+#ifdef TEST_GENERALIZED_EIGENPROBLEM
-+   elpa_set(handle, "blacs_context", (int) my_blacs_ctxt, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+#endif
-+
-+   /* Setup */
-+   assert_elpa_ok(elpa_setup(handle));
-+
-+   /* Set tunables */
-+#ifdef TEST_SOLVER_1STAGE
-+   elpa_set(handle, "solver", ELPA_SOLVER_1STAGE, &error_elpa);
-+#else
-+   elpa_set(handle, "solver", ELPA_SOLVER_2STAGE, &error_elpa);
-+#endif
-+   assert_elpa_ok(error_elpa);
-+
-+#if TEST_NVIDIA_GPU == 1
-+   elpa_set(handle, "nvidia-gpu", TEST_GPU, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+#endif
-+
-+#if TEST_AMD_GPU == 1
-+   elpa_set(handle, "amd-gpu", TEST_GPU, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+#endif
-+
-+#if TEST_INTEL_GPU == 1
-+   elpa_set(handle, "intel-gpu", TEST_GPU, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+#endif
-+
-+#if defined(TEST_SOLVE_2STAGE) && defined(TEST_KERNEL)
-+# ifdef TEST_COMPLEX
-+   elpa_set(handle, "complex_kernel", TEST_KERNEL, &error_elpa);
-+# else
-+   elpa_set(handle, "real_kernel", TEST_KERNEL, &error_elpa);
-+# endif
-+   assert_elpa_ok(error_elpa);
-+#endif
-+
-+   elpa_get(handle, "solver", &value, &error_elpa);
-+   if (myid == 0) {
-+     printf("Solver is set to %d \n", value);
-+   }
-+
-+#if defined(TEST_GENERALIZED_EIGENPROBLEM)
-+     elpa_generalized_eigenvectors(handle, a, b, ev, z, 0, &error_elpa);
-+#if defined(TEST_GENERALIZED_DECOMP_EIGENPROBLEM)
-+     //a = as, so that the problem can be solved again
-+     memcpy(a, as, na_rows * na_cols * sizeof(MATRIX_TYPE));
-+     elpa_generalized_eigenvectors(handle, a, b, ev, z, 1, &error_elpa);
-+#endif
-+#else
-+   /* Solve EV problem */
-+   elpa_eigenvectors(handle, a, ev, z, &error_elpa);
-+#endif
-+   assert_elpa_ok(error_elpa);
-+
-+   elpa_deallocate(handle, &error_elpa);
-+   elpa_uninit(&error_elpa);
-+
-+   /* check the results */
-+#if defined(TEST_GENERALIZED_EIGENPROBLEM)
-+   status = CHECK_CORRECTNESS_EVP_GEN_NUMERIC_RESIDUALS(na, nev, na_rows, na_cols, as, z, ev,
-+                                sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol, bs);
-+#else
-+   status = CHECK_CORRECTNESS_EVP_NUMERIC_RESIDUALS(na, nev, na_rows, na_cols, as, z, ev,
-+                                sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol);
-+#endif
-+
-+   if (status !=0){
-+     printf("The computed EVs are not correct !\n");
-+   }
-+   if (status ==0){
-+     printf("All ok!\n");
-+   }
-+
-+   free(a);
-+   free(z);
-+   free(as);
-+   free(ev);
-+#if defined(TEST_GENERALIZED_EIGENPROBLEM)
-+   free(b);
-+   free(bs);
-+#endif
-+
-+#ifdef WITH_MPI
-+   MPI_Finalize();
-+#endif
-+
-+   return !!status;
-+}
-diff -ruN elpa-new_release_2021.11.001/examples/C/test_multiple_objs.c elpa-new_release_2021.11.001_ok/examples/C/test_multiple_objs.c
---- elpa-new_release_2021.11.001/examples/C/test_multiple_objs.c	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/C/test_multiple_objs.c	2022-02-01 18:20:51.698668546 +0100
-@@ -0,0 +1,401 @@
-+/*   This file is part of ELPA.
-+
-+     The ELPA library was originally created by the ELPA consortium,
-+     consisting of the following organizations:
-+
-+     - Max Planck Computing and Data Facility (MPCDF), formerly known as
-+       Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+     - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+       Informatik,
-+     - Technische Universität München, Lehrstuhl für Informatik mit
-+       Schwerpunkt Wissenschaftliches Rechnen ,
-+     - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+     - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+       Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+       and
-+     - IBM Deutschland GmbH
-+
-+
-+     More information can be found here:
-+     http://elpa.mpcdf.mpg.de/
-+
-+     ELPA is free software: you can redistribute it and/or modify
-+     it under the terms of the version 3 of the license of the
-+     GNU Lesser General Public License as published by the Free
-+     Software Foundation.
-+
-+     ELPA is distributed in the hope that it will be useful,
-+     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+     GNU Lesser General Public License for more details.
-+
-+     You should have received a copy of the GNU Lesser General Public License
-+     along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+
-+     ELPA reflects a substantial effort on the part of the original
-+     ELPA consortium, and we ask you to respect the spirit of the
-+     license that we chose: i.e., please contribute any changes you
-+     may have back to the original ELPA library distribution, and keep
-+     any derivatives of ELPA under the same license that we chose for
-+     the original distribution, the GNU Lesser General Public License.
-+*/
-+
-+#include "config.h"
-+
-+#include <string.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#ifdef WITH_MPI
-+#include <mpi.h>
-+#endif
-+#include <math.h>
-+
-+#include <elpa/elpa.h>
-+#include <assert.h>
-+
-+#if !(defined(TEST_REAL) ^ defined(TEST_COMPLEX))
-+//#error "define exactly one of TEST_REAL or TEST_COMPLEX"
-+#endif
-+
-+#if !(defined(TEST_SINGLE) ^ defined(TEST_DOUBLE))
-+//#error "define exactly one of TEST_SINGLE or TEST_DOUBLE"
-+#endif
-+
-+#if !(defined(TEST_SOLVER_1STAGE) ^ defined(TEST_SOLVER_2STAGE))
-+//#error "define exactly one of TEST_SOLVER_1STAGE or TEST_SOLVER_2STAGE"
-+#endif
-+
-+#ifdef TEST_SINGLE
-+#  define EV_TYPE float
-+#  ifdef TEST_REAL
-+#    define MATRIX_TYPE float
-+#  else
-+#    define MATRIX_TYPE complex float
-+#  endif
-+#else
-+#  define EV_TYPE double
-+#  ifdef TEST_REAL
-+#    define MATRIX_TYPE double
-+#  else
-+#    define MATRIX_TYPE complex double
-+#  endif
-+#endif
-+
-+#define assert_elpa_ok(x) assert(x == ELPA_OK)
-+#ifdef HAVE_64BIT_INTEGER_SUPPORT
-+#define TEST_C_INT_TYPE_PTR long int*
-+#define C_INT_TYPE_PTR long int*
-+#define TEST_C_INT_TYPE long int
-+#define C_INT_TYPE long int
-+#else
-+#define TEST_C_INT_TYPE_PTR int*
-+#define C_INT_TYPE_PTR int*
-+#define TEST_C_INT_TYPE int
-+#define C_INT_TYPE int
-+#endif
-+
-+#include "generated.h"
-+void set_basic_parameters(elpa_t *handle, C_INT_TYPE na, C_INT_TYPE nev, C_INT_TYPE na_rows, C_INT_TYPE na_cols, C_INT_TYPE nblk, C_INT_TYPE my_prow, C_INT_TYPE my_pcol){
-+   int error_elpa;
-+   elpa_set(*handle, "na", (int) na, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+
-+   elpa_set(*handle, "nev", (int) nev, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+
-+   elpa_set(*handle, "local_nrows", (int) na_rows, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+
-+   elpa_set(*handle, "local_ncols", (int) na_cols, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+
-+   elpa_set(*handle, "nblk", (int) nblk, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+
-+#ifdef WITH_MPI
-+   elpa_set(*handle, "mpi_comm_parent", (int) (MPI_Comm_c2f(MPI_COMM_WORLD)), &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+
-+   elpa_set(*handle, "process_row", (int) my_prow, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+
-+   elpa_set(*handle, "process_col", (int) my_pcol, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+#endif
-+}
-+
-+
-+int main(int argc, char** argv) {
-+   /* matrix dimensions */
-+   C_INT_TYPE na, nev, nblk;
-+
-+   /* mpi */
-+   C_INT_TYPE myid, nprocs;
-+   C_INT_TYPE na_cols, na_rows;
-+   C_INT_TYPE np_cols, np_rows;
-+   C_INT_TYPE my_prow, my_pcol;
-+   C_INT_TYPE mpi_comm;
-+
-+   /* blacs */
-+   C_INT_TYPE my_blacs_ctxt, sc_desc[9], info;
-+
-+   /* The Matrix */
-+   MATRIX_TYPE *a, *as, *z;
-+   EV_TYPE *ev;
-+
-+   C_INT_TYPE status;
-+   int error_elpa;
-+   int gpu, timings, debug; 
-+   char str[400];
-+
-+   elpa_t elpa_handle_1, elpa_handle_2, *elpa_handle_ptr;
-+
-+   elpa_autotune_t autotune_handle;
-+   C_INT_TYPE i, unfinished;
-+
-+   C_INT_TYPE value;
-+#ifdef WITH_MPI
-+   MPI_Init_thread(&argc, &argv, MPI_THREAD_SERIALIZED, &info);
-+   MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
-+   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
-+#else
-+   nprocs = 1;
-+   myid = 0;
-+#endif
-+
-+   if (argc == 4) {
-+     na = atoi(argv[1]);
-+     nev = atoi(argv[2]);
-+     nblk = atoi(argv[3]);
-+   } else {
-+     na = 500;
-+     nev = 250;
-+     nblk = 16;
-+   }
-+
-+   for (np_cols = (C_INT_TYPE) sqrt((double) nprocs); np_cols > 1; np_cols--) {
-+     if (nprocs % np_cols == 0) {
-+       break;
-+     }
-+   }
-+
-+   np_rows = nprocs/np_cols;
-+
-+   /* set up blacs */
-+   /* convert communicators before */
-+#ifdef WITH_MPI
-+   mpi_comm = MPI_Comm_c2f(MPI_COMM_WORLD);
-+#else
-+   mpi_comm = 0;
-+#endif
-+   set_up_blacsgrid_f(mpi_comm, np_rows, np_cols, 'C', &my_blacs_ctxt, &my_prow, &my_pcol);
-+   set_up_blacs_descriptor_f(na, nblk, my_prow, my_pcol, np_rows, np_cols, &na_rows, &na_cols, sc_desc, my_blacs_ctxt, &info);
-+
-+   /* allocate the matrices needed for elpa */
-+   a  = calloc(na_rows*na_cols, sizeof(MATRIX_TYPE));
-+   z  = calloc(na_rows*na_cols, sizeof(MATRIX_TYPE));
-+   as = calloc(na_rows*na_cols, sizeof(MATRIX_TYPE));
-+   ev = calloc(na, sizeof(EV_TYPE));
-+
-+#ifdef TEST_REAL
-+#ifdef TEST_DOUBLE
-+   prepare_matrix_random_real_double_f(na, myid, na_rows, na_cols, sc_desc, a, z, as);
-+#else
-+   prepare_matrix_random_real_single_f(na, myid, na_rows, na_cols, sc_desc, a, z, as);
-+#endif
-+#else
-+#ifdef TEST_DOUBLE
-+   prepare_matrix_random_complex_double_f(na, myid, na_rows, na_cols, sc_desc, a, z, as);
-+#else
-+   prepare_matrix_random_complex_single_f(na, myid, na_rows, na_cols, sc_desc, a, z, as);
-+#endif
-+#endif
-+
-+   if (elpa_init(CURRENT_API_VERSION) != ELPA_OK) {
-+     fprintf(stderr, "Error: ELPA API version not supported");
-+     exit(1);
-+   }
-+
-+   elpa_handle_1 = elpa_allocate(&error_elpa);
-+   assert_elpa_ok(error_elpa);
-+
-+   set_basic_parameters(&elpa_handle_1, na, nev, na_rows, na_cols, nblk, my_prow, my_pcol);
-+   /* Setup */
-+   assert_elpa_ok(elpa_setup(elpa_handle_1));
-+
-+#if TEST_NVIDIA_GPU == 1
-+   elpa_set(elpa_handle_1, "nvidia-gpu", 0, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+#endif
-+
-+#if TEST_INTEL_GPU == 1
-+   elpa_set(elpa_handle_1, "intel-gpu", 0, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+#endif
-+
-+   elpa_set(elpa_handle_1, "timings", 1, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+
-+   elpa_set(elpa_handle_1, "debug", 1, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+
-+   elpa_store_settings(elpa_handle_1, "initial_parameters.txt", &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+
-+#ifdef WITH_MPI
-+     // barrier after store settings, file created from one MPI rank only, but loaded everywhere
-+     MPI_Barrier(MPI_COMM_WORLD);
-+#endif
-+
-+#if OPTIONAL_C_ERROR_ARGUMENT == 1
-+   elpa_handle_2 = elpa_allocate();
-+#else
-+   elpa_handle_2 = elpa_allocate(&error_elpa);
-+   assert_elpa_ok(error_elpa);
-+#endif
-+
-+   set_basic_parameters(&elpa_handle_2, na, nev, na_rows, na_cols, nblk, my_prow, my_pcol);
-+   /* Setup */
-+   assert_elpa_ok(elpa_setup(elpa_handle_2));
-+
-+   elpa_load_settings(elpa_handle_2, "initial_parameters.txt", &error_elpa);
-+
-+#if TEST_NVIDIA_GPU == 1
-+   elpa_get(elpa_handle_2, "nvidia-gpu", &gpu, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+#endif
-+
-+#if TEST_INTEL_GPU == 1
-+   elpa_get(elpa_handle_2, "intel-gpu", &gpu, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+#endif
-+
-+   elpa_get(elpa_handle_2, "timings", &timings, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+
-+   elpa_get(elpa_handle_2, "debug", &debug, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+
-+   if ((timings != 1) || (debug != 1) || (gpu != 0)){
-+     printf("Parameters not stored or loaded correctly. Aborting... %d, %d, %d\n", timings, debug, gpu);
-+     exit(1);
-+   }
-+
-+   elpa_handle_ptr = &elpa_handle_2;
-+
-+   autotune_handle = elpa_autotune_setup(*elpa_handle_ptr, ELPA_AUTOTUNE_FAST, ELPA_AUTOTUNE_DOMAIN_REAL, &error_elpa);
-+   assert_elpa_ok(error_elpa);
-+   /* mimic 20 scf steps */
-+
-+   for (i=0; i < 20; i++) {
-+
-+      unfinished = elpa_autotune_step(*elpa_handle_ptr, autotune_handle, &error_elpa);
-+
-+      if (unfinished == 0) {
-+        if (myid == 0) {
-+          printf("ELPA autotuning finished in the %d th scf step \n",i);
-+        }
-+        break;
-+      }
-+
-+      elpa_print_settings(*elpa_handle_ptr, &error_elpa);
-+      elpa_autotune_print_state(*elpa_handle_ptr, autotune_handle, &error_elpa);
-+
-+      sprintf(str, "saved_parameters_%d.txt", i);
-+      elpa_store_settings(*elpa_handle_ptr, str, &error_elpa);
-+      assert_elpa_ok(error_elpa);
-+
-+      /* Solve EV problem */
-+      elpa_eigenvectors(*elpa_handle_ptr, a, ev, z, &error_elpa);
-+      assert_elpa_ok(error_elpa);
-+
-+      /* check the results */
-+#ifdef TEST_REAL
-+#ifdef TEST_DOUBLE
-+      status = check_correctness_evp_numeric_residuals_real_double_f(na, nev, na_rows, na_cols, as, z, ev,
-+                                sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol);
-+      memcpy(a, as, na_rows*na_cols*sizeof(double));
-+
-+#else
-+      status = check_correctness_evp_numeric_residuals_real_single_f(na, nev, na_rows, na_cols, as, z, ev,
-+                                sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol);
-+      memcpy(a, as, na_rows*na_cols*sizeof(float));
-+#endif
-+#else
-+#ifdef TEST_DOUBLE
-+      status = check_correctness_evp_numeric_residuals_complex_double_f(na, nev, na_rows, na_cols, as, z, ev,
-+                                sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol);
-+      memcpy(a, as, na_rows*na_cols*sizeof(complex double));
-+#else
-+      status = check_correctness_evp_numeric_residuals_complex_single_f(na, nev, na_rows, na_cols, as, z, ev,
-+                                sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol);
-+      memcpy(a, as, na_rows*na_cols*sizeof(complex float));
-+#endif
-+#endif
-+
-+      if (status !=0){
-+        printf("The computed EVs are not correct !\n");
-+        break;
-+      }
-+
-+     elpa_autotune_print_state(*elpa_handle_ptr, autotune_handle, &error_elpa);
-+     assert_elpa_ok(error_elpa);
-+
-+     sprintf(str, "saved_state_%d.txt", i);
-+     elpa_autotune_save_state(*elpa_handle_ptr, autotune_handle, str, &error_elpa);
-+     assert_elpa_ok(error_elpa);
-+
-+#ifdef WITH_MPI
-+     //barrier after save state, file created from one MPI rank only, but loaded everywhere
-+     MPI_Barrier(MPI_COMM_WORLD);
-+#endif
-+
-+     elpa_autotune_load_state(*elpa_handle_ptr, autotune_handle, str, &error_elpa);
-+     assert_elpa_ok(error_elpa);
-+
-+     if (unfinished == 1) {
-+       if (myid == 0) {
-+          printf("ELPA autotuning did not finished during %d scf cycles\n",i);
-+       }
-+     }
-+
-+   }
-+   elpa_autotune_set_best(*elpa_handle_ptr, autotune_handle, &error_elpa);
-+
-+   if (myid == 0) {
-+     printf("The best combination found by the autotuning:\n");
-+     elpa_autotune_print_best(*elpa_handle_ptr, autotune_handle, &error_elpa);
-+   }
-+
-+   elpa_autotune_deallocate(autotune_handle, &error_elpa);
-+   elpa_deallocate(elpa_handle_1, &error_elpa);
-+#if OPTIONAL_C_ERROR_ARGUMENT == 1
-+   elpa_deallocate(elpa_handle_2);
-+#else
-+   elpa_deallocate(elpa_handle_2, &error_elpa);
-+#endif
-+   elpa_uninit(&error_elpa);
-+
-+   if (myid == 0) {
-+     printf("\n");
-+     printf("2stage ELPA real solver complete\n");
-+     printf("\n");
-+   }
-+
-+   if (status ==0){
-+     if (myid ==0) {
-+       printf("All ok!\n");
-+     }
-+   }
-+
-+   free(a);
-+   free(z);
-+   free(as);
-+   free(ev);
-+
-+#ifdef WITH_MPI
-+   MPI_Finalize();
-+#endif
-+
-+   return !!status;
-+}
-diff -ruN elpa-new_release_2021.11.001/examples/Fortran/assert.h elpa-new_release_2021.11.001_ok/examples/Fortran/assert.h
---- elpa-new_release_2021.11.001/examples/Fortran/assert.h	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/Fortran/assert.h	2022-01-26 10:05:16.438246000 +0100
-@@ -0,0 +1,7 @@
-+#define stringify_(x) "x"
-+#define stringify(x) stringify_(x)
-+#define assert(x) call x_a(x, stringify(x), "F", __LINE__)
-+
-+#define assert_elpa_ok(error_code) call x_ao(error_code, stringify(error_code), __FILE__, __LINE__)
-+
-+! vim: syntax=fortran
-diff -ruN elpa-new_release_2021.11.001/examples/Fortran/elpa2/complex_2stage_banded.F90 elpa-new_release_2021.11.001_ok/examples/Fortran/elpa2/complex_2stage_banded.F90
---- elpa-new_release_2021.11.001/examples/Fortran/elpa2/complex_2stage_banded.F90	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/Fortran/elpa2/complex_2stage_banded.F90	2022-01-26 10:09:19.163552000 +0100
-@@ -0,0 +1,300 @@
-+!    This file is part of ELPA.
-+!
-+!    The ELPA library was originally created by the ELPA consortium,
-+!    consisting of the following organizations:
-+!
-+!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
-+!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+!      Informatik,
-+!    - Technische Universität München, Lehrstuhl für Informatik mit
-+!      Schwerpunkt Wissenschaftliches Rechnen ,
-+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+!      and
-+!    - IBM Deutschland GmbH
-+!
-+!
-+!    More information can be found here:
-+!    http://elpa.mpcdf.mpg.de/
-+!
-+!    ELPA is free software: you can redistribute it and/or modify
-+!    it under the terms of the version 3 of the license of the
-+!    GNU Lesser General Public License as published by the Free
-+!    Software Foundation.
-+!
-+!    ELPA is distributed in the hope that it will be useful,
-+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+!    GNU Lesser General Public License for more details.
-+!
-+!    You should have received a copy of the GNU Lesser General Public License
-+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+!
-+!    ELPA reflects a substantial effort on the part of the original
-+!    ELPA consortium, and we ask you to respect the spirit of the
-+!    license that we chose: i.e., please contribute any changes you
-+!    may have back to the original ELPA library distribution, and keep
-+!    any derivatives of ELPA under the same license that we chose for
-+!    the original distribution, the GNU Lesser General Public License.
-+!
-+!
-+#include "config-f90.h"
-+#include "../assert.h"
-+!>
-+!> Fortran test programm to demonstrates the use of
-+!> ELPA 2 complex case library.
-+!> If "HAVE_REDIRECT" was defined at build time
-+!> the stdout and stderr output of each MPI task
-+!> can be redirected to files if the environment
-+!> variable "REDIRECT_ELPA_TEST_OUTPUT" is set
-+!> to "true".
-+!>
-+!> By calling executable [arg1] [arg2] [arg3] [arg4]
-+!> one can define the size (arg1), the number of
-+!> Eigenvectors to compute (arg2), and the blocking (arg3).
-+!> If these values are not set default values (500, 150, 16)
-+!> are choosen.
-+!> If these values are set the 4th argument can be
-+!> "output", which specifies that the EV's are written to
-+!> an ascii file.
-+!>
-+!> The complex ELPA 2 kernel is set as the default kernel.
-+!> However, this can be overriden by setting
-+!> the environment variable "COMPLEX_ELPA_KERNEL" to an
-+!> appropiate value.
-+!>
-+
-+#include "config-f90.h"
-+
-+#ifdef HAVE_64BIT_INTEGER_MATH_SUPPORT
-+#define TEST_INT_TYPE integer(kind=c_int64_t)
-+#define INT_TYPE c_int64_t
-+#else
-+#define TEST_INT_TYPE integer(kind=c_int32_t)
-+#define INT_TYPE c_int32_t
-+#endif
-+#ifdef HAVE_64BIT_INTEGER_MPI_SUPPORT
-+#define TEST_INT_MPI_TYPE integer(kind=c_int64_t)
-+#define INT_MPI_TYPE c_int64_t
-+#else
-+#define TEST_INT_MPI_TYPE integer(kind=c_int32_t)
-+#define INT_MPI_TYPE c_int32_t
-+#endif
-+
-+program test_complex2_double_banded
-+
-+!-------------------------------------------------------------------------------
-+! Standard eigenvalue problem - COMPLEX version
-+!
-+! This program demonstrates the use of the ELPA module
-+! together with standard scalapack routines
-+!
-+! Copyright of the original code rests with the authors inside the ELPA
-+! consortium. The copyright of any additional modifications shall rest
-+! with their original authors, but shall adhere to the licensing terms
-+! distributed along with the original code in the file "COPYING".
-+!-------------------------------------------------------------------------------
-+   use elpa
-+
-+   !use test_util
-+   use test_read_input_parameters
-+   use test_check_correctness
-+   use test_setup_mpi
-+   use test_blacs_infrastructure
-+   use test_prepare_matrix
-+#ifdef HAVE_REDIRECT
-+   use test_redirect
-+#endif
-+   use test_output_type
-+   implicit none
-+
-+   !-------------------------------------------------------------------------------
-+   ! Please set system size parameters below!
-+   ! na:   System size
-+   ! nev:  Number of eigenvectors to be calculated
-+   ! nblk: Blocking factor in block cyclic distribution
-+   !-------------------------------------------------------------------------------
-+
-+   TEST_INT_TYPE              :: nblk
-+   TEST_INT_TYPE              :: na, nev
-+
-+   TEST_INT_TYPE              :: np_rows, np_cols, na_rows, na_cols
-+
-+   TEST_INT_TYPE              :: myid, nprocs, my_prow, my_pcol, mpi_comm_rows, mpi_comm_cols
-+   TEST_INT_TYPE              :: i, my_blacs_ctxt, sc_desc(9), info, nprow, npcol
-+   TEST_INT_MPI_TYPE          :: mpierr
-+#ifdef WITH_MPI
-+   !TEST_INT_TYPE, external    :: numroc
-+#endif
-+   complex(kind=ck8), parameter   :: CZERO = (0.0_rk8,0.0_rk8), CONE = (1.0_rk8,0.0_rk8)
-+   real(kind=rk8), allocatable    :: ev(:)
-+
-+   complex(kind=ck8), allocatable :: a(:,:), z(:,:), as(:,:)
-+
-+   TEST_INT_TYPE              :: STATUS
-+#ifdef WITH_OPENMP_TRADITIONAL
-+   TEST_INT_TYPE              :: omp_get_max_threads,  required_mpi_thread_level, provided_mpi_thread_level
-+#endif
-+   type(output_t)                :: write_to_file
-+   integer(kind=c_int)          :: error_elpa
-+   character(len=8)              :: task_suffix
-+   TEST_INT_TYPE              :: j
-+
-+
-+   TEST_INT_TYPE              :: numberOfDevices
-+   TEST_INT_TYPE              :: global_row, global_col, local_row, local_col
-+   TEST_INT_TYPE              :: bandwidth
-+   class(elpa_t), pointer        :: e
-+
-+#define COMPLEXCASE
-+#define DOUBLE_PRECISION_COMPLEX 1
-+
-+   call read_input_parameters(na, nev, nblk, write_to_file)
-+
-+   if (nblk .eq. 1) then
-+     stop 77
-+   endif
-+
-+   !-------------------------------------------------------------------------------
-+   !  MPI Initialization
-+   call setup_mpi(myid, nprocs)
-+
-+   STATUS = 0
-+
-+   !-------------------------------------------------------------------------------
-+   ! Selection of number of processor rows/columns
-+   ! We try to set up the grid square-like, i.e. start the search for possible
-+   ! divisors of nprocs with a number next to the square root of nprocs
-+   ! and decrement it until a divisor is found.
-+
-+   do np_cols = NINT(SQRT(REAL(nprocs))),2,-1
-+      if(mod(nprocs,np_cols) == 0 ) exit
-+   enddo
-+   ! at the end of the above loop, nprocs is always divisible by np_cols
-+
-+   np_rows = nprocs/np_cols
-+
-+   if(myid==0) then
-+      print *
-+      print '(a)','Standard eigenvalue problem - COMPLEX version'
-+      print *
-+      print '(3(a,i0))','Matrix size=',na,', Number of eigenvectors=',nev,', Block size=',nblk
-+      print '(3(a,i0))','Number of processor rows=',np_rows,', cols=',np_cols,', total=',nprocs
-+      print *
-+   endif
-+
-+   !-------------------------------------------------------------------------------
-+   ! Set up BLACS context and MPI communicators
-+   !
-+   ! The BLACS context is only necessary for using Scalapack.
-+   !
-+   ! For ELPA, the MPI communicators along rows/cols are sufficient,
-+   ! and the grid setup may be done in an arbitrary way as long as it is
-+   ! consistent (i.e. 0<=my_prow<np_rows, 0<=my_pcol<np_cols and every
-+   ! process has a unique (my_prow,my_pcol) pair).
-+
-+   call set_up_blacsgrid(int(mpi_comm_world,kind=BLAS_KIND), np_rows, np_cols, 'C', &
-+                         my_blacs_ctxt, my_prow, my_pcol)
-+
-+   if (myid==0) then
-+     print '(a)','| Past BLACS_Gridinfo.'
-+   end if
-+
-+   ! Determine the necessary size of the distributed matrices,
-+   ! we use the Scalapack tools routine NUMROC for that.
-+
-+   call set_up_blacs_descriptor(na ,nblk, my_prow, my_pcol, np_rows, np_cols, &
-+                                na_rows, na_cols, sc_desc, my_blacs_ctxt, info)
-+
-+   if (myid==0) then
-+     print '(a)','| Past scalapack descriptor setup.'
-+   end if
-+   !-------------------------------------------------------------------------------
-+   ! Allocate matrices and set up a test matrix for the eigenvalue problem
-+
-+   allocate(a (na_rows,na_cols))
-+   allocate(z (na_rows,na_cols))
-+   allocate(as(na_rows,na_cols))
-+
-+   allocate(ev(na))
-+
-+   call prepare_matrix_random(na, myid, sc_desc, a, z, as)
-+
-+   ! set values outside of the bandwidth to zero
-+   bandwidth = nblk
-+
-+   do local_row = 1, na_rows
-+     global_row = index_l2g( local_row, nblk, my_prow, np_rows )
-+     do local_col = 1, na_cols
-+       global_col = index_l2g( local_col, nblk, my_pcol, np_cols )
-+
-+       if (ABS(global_row-global_col) > bandwidth) then
-+         a(local_row, local_col) = 0
-+         as(local_row, local_col) = 0
-+       end if
-+     end do
-+   end do
-+
-+
-+   if (elpa_init(CURRENT_API_VERSION) /= ELPA_OK) then
-+     print *, "ELPA API version not supported"
-+     stop 1
-+   endif
-+
-+   e => elpa_allocate(error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   call e%set("na", int(na,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("nev", int(nev,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("local_nrows", int(na_rows,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("local_ncols", int(na_cols,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("nblk", int(nblk,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+#ifdef WITH_MPI
-+   call e%set("mpi_comm_parent", int(MPI_COMM_WORLD,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("process_row", int(my_prow,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("process_col", int(my_pcol,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+#endif
-+
-+   call e%set("bandwidth", int(bandwidth,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   assert(e%setup() .eq. ELPA_OK)
-+
-+   call e%set("solver", ELPA_SOLVER_2STAGE, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%eigenvectors(a, ev, z, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call elpa_deallocate(e, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   call elpa_uninit(error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   !-------------------------------------------------------------------------------
-+   ! Test correctness of result (using plain scalapack routines)
-+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
-+
-+   deallocate(a)
-+   deallocate(as)
-+
-+   deallocate(z)
-+   deallocate(ev)
-+
-+#ifdef WITH_MPI
-+   call blacs_gridexit(my_blacs_ctxt)
-+   call mpi_finalize(mpierr)
-+#endif
-+   call EXIT(STATUS)
-+end
-+
-+!-------------------------------------------------------------------------------
-diff -ruN elpa-new_release_2021.11.001/examples/Fortran/elpa2/double_instance.F90 elpa-new_release_2021.11.001_ok/examples/Fortran/elpa2/double_instance.F90
---- elpa-new_release_2021.11.001/examples/Fortran/elpa2/double_instance.F90	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/Fortran/elpa2/double_instance.F90	2022-01-26 10:09:19.164133000 +0100
-@@ -0,0 +1,244 @@
-+!    This file is part of ELPA.
-+!
-+!    The ELPA library was originally created by the ELPA consortium,
-+!    consisting of the following organizations:
-+!
-+!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
-+!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+!      Informatik,
-+!    - Technische Universität München, Lehrstuhl für Informatik mit
-+!      Schwerpunkt Wissenschaftliches Rechnen ,
-+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+!      and
-+!    - IBM Deutschland GmbH
-+!
-+!
-+!    More information can be found here:
-+!    http://elpa.mpcdf.mpg.de/
-+!
-+!    ELPA is free software: you can redistribute it and/or modify
-+!    it under the terms of the version 3 of the license of the
-+!    GNU Lesser General Public License as published by the Free
-+!    Software Foundation.
-+!
-+!    ELPA is distributed in the hope that it will be useful,
-+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+!    GNU Lesser General Public License for more details.
-+!
-+!    You should have received a copy of the GNU Lesser General Public License
-+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+!
-+!    ELPA reflects a substantial effort on the part of the original
-+!    ELPA consortium, and we ask you to respect the spirit of the
-+!    license that we chose: i.e., please contribute any changes you
-+!    may have back to the original ELPA library distribution, and keep
-+!    any derivatives of ELPA under the same license that we chose for
-+!    the original distribution, the GNU Lesser General Public License.
-+!
-+!
-+#include "config-f90.h"
-+
-+#ifdef HAVE_64BIT_INTEGER_MATH_SUPPORT
-+#define TEST_INT_TYPE integer(kind=c_int64_t)
-+#define INT_TYPE c_int64_t
-+#else
-+#define TEST_INT_TYPE integer(kind=c_int32_t)
-+#define INT_TYPE c_int32_t
-+#endif
-+#ifdef HAVE_64BIT_INTEGER_MPI_SUPPORT
-+#define TEST_INT_MPI_TYPE integer(kind=c_int64_t)
-+#define INT_MPI_TYPE c_int64_t
-+#else
-+#define TEST_INT_MPI_TYPE integer(kind=c_int32_t)
-+#define INT_MPI_TYPE c_int32_t
-+#endif
-+#include "../assert.h"
-+
-+program test_interface
-+   use elpa
-+
-+   use precision_for_tests
-+   !use test_util
-+   use test_setup_mpi
-+   use test_prepare_matrix
-+   use test_read_input_parameters
-+   use test_blacs_infrastructure
-+   use test_check_correctness
-+   implicit none
-+
-+   ! matrix dimensions
-+   TEST_INT_TYPE :: na, nev, nblk
-+
-+   ! mpi
-+   TEST_INT_TYPE :: myid, nprocs
-+   TEST_INT_TYPE :: na_cols, na_rows  ! local matrix size
-+   TEST_INT_TYPE :: np_cols, np_rows  ! number of MPI processes per column/row
-+   TEST_INT_TYPE :: my_prow, my_pcol  ! local MPI task position (my_prow, my_pcol) in the grid (0..np_cols -1, 0..np_rows -1)
-+   TEST_INT_MPI_TYPE :: mpierr
-+
-+   ! blacs
-+   TEST_INT_TYPE :: my_blacs_ctxt, sc_desc(9), info, nprow, npcol
-+
-+   ! The Matrix
-+   real(kind=C_DOUBLE), allocatable :: a1(:,:), as1(:,:)
-+   ! eigenvectors
-+   real(kind=C_DOUBLE), allocatable :: z1(:,:)
-+   ! eigenvalues
-+   real(kind=C_DOUBLE), allocatable :: ev1(:)
-+
-+   ! The Matrix
-+   complex(kind=C_DOUBLE_COMPLEX), allocatable :: a2(:,:), as2(:,:)
-+   ! eigenvectors
-+   complex(kind=C_DOUBLE_COMPLEX), allocatable :: z2(:,:)
-+   ! eigenvalues
-+   real(kind=C_DOUBLE), allocatable :: ev2(:)
-+   TEST_INT_TYPE :: status
-+   integer(kind=c_int) :: error_elpa
-+
-+   TEST_INT_TYPE :: solver
-+   TEST_INT_TYPE :: qr
-+
-+   type(output_t) :: write_to_file
-+   class(elpa_t), pointer :: e1, e2
-+
-+   call read_input_parameters(na, nev, nblk, write_to_file)
-+   call setup_mpi(myid, nprocs)
-+
-+   status = 0
-+
-+   do np_cols = NINT(SQRT(REAL(nprocs))),2,-1
-+      if(mod(nprocs,np_cols) == 0 ) exit
-+   enddo
-+
-+   np_rows = nprocs/np_cols
-+
-+   my_prow = mod(myid, np_cols)
-+   my_pcol = myid / np_cols
-+
-+   call set_up_blacsgrid(int(mpi_comm_world,kind=BLAS_KIND), np_rows, np_cols, 'C', &
-+                         my_blacs_ctxt, my_prow, my_pcol)
-+
-+   call set_up_blacs_descriptor(na, nblk, my_prow, my_pcol, np_rows, np_cols, &
-+                                na_rows, na_cols, sc_desc, my_blacs_ctxt, info)
-+
-+   allocate(a1 (na_rows,na_cols), as1(na_rows,na_cols))
-+   allocate(z1 (na_rows,na_cols))
-+   allocate(ev1(na))
-+
-+   a1(:,:) = 0.0
-+   z1(:,:) = 0.0
-+   ev1(:) = 0.0
-+
-+   call prepare_matrix_random(na, myid, sc_desc, a1, z1, as1)
-+   allocate(a2 (na_rows,na_cols), as2(na_rows,na_cols))
-+   allocate(z2 (na_rows,na_cols))
-+   allocate(ev2(na))
-+
-+   a2(:,:) = 0.0
-+   z2(:,:) = 0.0
-+   ev2(:) = 0.0
-+
-+   call prepare_matrix_random(na, myid, sc_desc, a2, z2, as2)
-+
-+   if (elpa_init(CURRENT_API_VERSION) /= ELPA_OK) then
-+     print *, "ELPA API version not supported"
-+     stop 1
-+   endif
-+
-+   e1 => elpa_allocate(error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   call e1%set("na", int(na,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e1%set("nev", int(nev,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e1%set("local_nrows", int(na_rows,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e1%set("local_ncols", int(na_cols,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e1%set("nblk", int(nblk,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+#ifdef WITH_MPI
-+   call e1%set("mpi_comm_parent", int(MPI_COMM_WORLD,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e1%set("process_row", int(my_prow,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e1%set("process_col", int(my_pcol,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+#endif
-+
-+   assert(e1%setup() .eq. ELPA_OK)
-+
-+   call e1%set("solver", ELPA_SOLVER_2STAGE, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   call e1%set("real_kernel", ELPA_2STAGE_REAL_DEFAULT, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+
-+   e2 => elpa_allocate(error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   call e2%set("na", int(na,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e2%set("nev", int(nev,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e2%set("local_nrows", int(na_rows,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e2%set("local_ncols", int(na_cols,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e2%set("nblk", int(nblk,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+#ifdef WITH_MPI
-+   call e2%set("mpi_comm_parent", int(MPI_COMM_WORLD,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e2%set("process_row", int(my_prow,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e2%set("process_col", int(my_pcol,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+#endif
-+   assert(e2%setup() .eq. ELPA_OK)
-+
-+   call e2%set("solver", ELPA_SOLVER_1STAGE, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   call e1%eigenvectors(a1, ev1, z1, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   call elpa_deallocate(e1, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   call e2%eigenvectors(a2, ev2, z2, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   call elpa_deallocate(e2, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   call elpa_uninit(error_elpa)
-+
-+   status = check_correctness_evp_numeric_residuals(na, nev, as1, z1, ev1, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
-+
-+   deallocate(a1)
-+   deallocate(as1)
-+   deallocate(z1)
-+   deallocate(ev1)
-+
-+   status = check_correctness_evp_numeric_residuals(na, nev, as2, z2, ev2, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
-+
-+   deallocate(a2)
-+   deallocate(as2)
-+   deallocate(z2)
-+   deallocate(ev2)
-+
-+#ifdef WITH_MPI
-+   call blacs_gridexit(my_blacs_ctxt)
-+   call mpi_finalize(mpierr)
-+#endif
-+   call EXIT(STATUS)
-+
-+
-+end program
-diff -ruN elpa-new_release_2021.11.001/examples/Fortran/elpa2/real_2stage_banded.F90 elpa-new_release_2021.11.001_ok/examples/Fortran/elpa2/real_2stage_banded.F90
---- elpa-new_release_2021.11.001/examples/Fortran/elpa2/real_2stage_banded.F90	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/Fortran/elpa2/real_2stage_banded.F90	2022-01-26 10:09:19.164859000 +0100
-@@ -0,0 +1,298 @@
-+!    This file is part of ELPA.
-+!
-+!    The ELPA library was originally created by the ELPA consortium,
-+!    consisting of the following organizations:
-+!
-+!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
-+!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+!      Informatik,
-+!    - Technische Universität München, Lehrstuhl für Informatik mit
-+!      Schwerpunkt Wissenschaftliches Rechnen ,
-+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+!      and
-+!    - IBM Deutschland GmbH
-+!
-+!
-+!    More information can be found here:
-+!    http://elpa.mpcdf.mpg.de/
-+!
-+!    ELPA is free software: you can redistribute it and/or modify
-+!    it under the terms of the version 3 of the license of the
-+!    GNU Lesser General Public License as published by the Free
-+!    Software Foundation.
-+!
-+!    ELPA is distributed in the hope that it will be useful,
-+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+!    GNU Lesser General Public License for more details.
-+!
-+!    You should have received a copy of the GNU Lesser General Public License
-+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+!
-+!    ELPA reflects a substantial effort on the part of the original
-+!    ELPA consortium, and we ask you to respect the spirit of the
-+!    license that we chose: i.e., please contribute any changes you
-+!    may have back to the original ELPA library distribution, and keep
-+!    any derivatives of ELPA under the same license that we chose for
-+!    the original distribution, the GNU Lesser General Public License.
-+!
-+!
-+#include "config-f90.h"
-+#include "../assert.h"
-+!>
-+!> Fortran test programm to demonstrates the use of
-+!> ELPA 2 real case library.
-+!> If "HAVE_REDIRECT" was defined at build time
-+!> the stdout and stderr output of each MPI task
-+!> can be redirected to files if the environment
-+!> variable "REDIRECT_ELPA_TEST_OUTPUT" is set
-+!> to "true".
-+!>
-+!> By calling executable [arg1] [arg2] [arg3] [arg4]
-+!> one can define the size (arg1), the number of
-+!> Eigenvectors to compute (arg2), and the blocking (arg3).
-+!> If these values are not set default values (500, 150, 16)
-+!> are choosen.
-+!> If these values are set the 4th argument can be
-+!> "output", which specifies that the EV's are written to
-+!> an ascii file.
-+!>
-+!> The real ELPA 2 kernel is set as the default kernel.
-+!> However, this can be overriden by setting
-+!> the environment variable "REAL_ELPA_KERNEL" to an
-+!> appropiate value.
-+!>
-+
-+#include "config-f90.h"
-+
-+#ifdef HAVE_64BIT_INTEGER_MATH_SUPPORT
-+#define TEST_INT_TYPE integer(kind=c_int64_t)
-+#define INT_TYPE c_int64_t
-+#else
-+#define TEST_INT_TYPE integer(kind=c_int32_t)
-+#define INT_TYPE c_int32_t
-+#endif
-+
-+#ifdef HAVE_64BIT_INTEGER_MPI_SUPPORT
-+#define TEST_INT_MPI_TYPE integer(kind=c_int64_t)
-+#define INT_MPI_TYPE c_int64_t
-+#else
-+#define TEST_INT_MPI_TYPE integer(kind=c_int32_t)
-+#define INT_MPI_TYPE c_int32_t
-+#endif
-+
-+program test_real2_double_banded
-+
-+!-------------------------------------------------------------------------------
-+! Standard eigenvalue problem - REAL version
-+!
-+! This program demonstrates the use of the ELPA module
-+! together with standard scalapack routines
-+!
-+! Copyright of the original code rests with the authors inside the ELPA
-+! consortium. The copyright of any additional modifications shall rest
-+! with their original authors, but shall adhere to the licensing terms
-+! distributed along with the original code in the file "COPYING".
-+!
-+!-------------------------------------------------------------------------------
-+   use elpa
-+
-+   !use test_util
-+   use test_read_input_parameters
-+   use test_check_correctness
-+   use test_setup_mpi
-+   use test_blacs_infrastructure
-+   use test_prepare_matrix
-+#ifdef HAVE_REDIRECT
-+   use test_redirect
-+#endif
-+   use test_output_type
-+   implicit none
-+
-+   !-------------------------------------------------------------------------------
-+   ! Please set system size parameters below!
-+   ! na:   System size
-+   ! nev:  Number of eigenvectors to be calculated
-+   ! nblk: Blocking factor in block cyclic distribution
-+   !-------------------------------------------------------------------------------
-+
-+   TEST_INT_TYPE           :: nblk
-+   TEST_INT_TYPE           :: na, nev
-+
-+   TEST_INT_TYPE           :: np_rows, np_cols, na_rows, na_cols
-+
-+   TEST_INT_TYPE           :: myid, nprocs, my_prow, my_pcol, mpi_comm_rows, mpi_comm_cols
-+   TEST_INT_TYPE           :: i,  my_blacs_ctxt, sc_desc(9), info, nprow, npcol
-+   TEST_INT_MPI_TYPE       :: mpierr
-+   !TEST_INT_TYPE, external :: numroc
-+
-+   real(kind=rk8), allocatable :: a(:,:), z(:,:), as(:,:), ev(:)
-+
-+   TEST_INT_TYPE           :: STATUS
-+#ifdef WITH_OPENMP_TRADITIONAL
-+   TEST_INT_TYPE           :: omp_get_max_threads,  required_mpi_thread_level, provided_mpi_thread_level
-+#endif
-+   integer(kind=c_int)          :: error_elpa
-+   TEST_INT_TYPE           :: numberOfDevices
-+   type(output_t)             :: write_to_file
-+   character(len=8)           :: task_suffix
-+   TEST_INT_TYPE           :: j
-+   TEST_INT_TYPE           :: global_row, global_col, local_row, local_col
-+   TEST_INT_TYPE           :: bandwidth
-+   class(elpa_t), pointer     :: e
-+#define DOUBLE_PRECISION_REAL 1
-+
-+
-+   call read_input_parameters(na, nev, nblk, write_to_file)
-+
-+   if (nblk .eq. 1) then
-+     stop 77
-+   endif
-+
-+   !-------------------------------------------------------------------------------
-+   !  MPI Initialization
-+   call setup_mpi(myid, nprocs)
-+
-+   STATUS = 0
-+
-+#define REALCASE
-+
-+   !-------------------------------------------------------------------------------
-+   ! Selection of number of processor rows/columns
-+   ! We try to set up the grid square-like, i.e. start the search for possible
-+   ! divisors of nprocs with a number next to the square root of nprocs
-+   ! and decrement it until a divisor is found.
-+
-+   do np_cols = NINT(SQRT(REAL(nprocs))),2,-1
-+      if(mod(nprocs,np_cols) == 0 ) exit
-+   enddo
-+   ! at the end of the above loop, nprocs is always divisible by np_cols
-+
-+   np_rows = nprocs/np_cols
-+
-+   if(myid==0) then
-+      print *
-+      print '(a)','Standard eigenvalue problem - REAL version'
-+      print *
-+      print '(3(a,i0))','Matrix size=',na,', Number of eigenvectors=',nev,', Block size=',nblk
-+      print '(3(a,i0))','Number of processor rows=',np_rows,', cols=',np_cols,', total=',nprocs
-+      print *
-+   endif
-+
-+   !-------------------------------------------------------------------------------
-+   ! Set up BLACS context and MPI communicators
-+   !
-+   ! The BLACS context is only necessary for using Scalapack.
-+   !
-+   ! For ELPA, the MPI communicators along rows/cols are sufficient,
-+   ! and the grid setup may be done in an arbitrary way as long as it is
-+   ! consistent (i.e. 0<=my_prow<np_rows, 0<=my_pcol<np_cols and every
-+   ! process has a unique (my_prow,my_pcol) pair).
-+
-+   call set_up_blacsgrid(int(mpi_comm_world,kind=BLAS_KIND), np_rows, np_cols, 'C', &
-+                         my_blacs_ctxt, my_prow, my_pcol)
-+
-+   if (myid==0) then
-+     print '(a)','| Past BLACS_Gridinfo.'
-+   end if
-+
-+   call set_up_blacs_descriptor(na ,nblk, my_prow, my_pcol, np_rows, np_cols, &
-+                                na_rows, na_cols, sc_desc, my_blacs_ctxt, info)
-+
-+   if (myid==0) then
-+     print '(a)','| Past scalapack descriptor setup.'
-+   end if
-+
-+   !-------------------------------------------------------------------------------
-+   ! Allocate matrices and set up a test matrix for the eigenvalue problem
-+   allocate(a (na_rows,na_cols))
-+   allocate(z (na_rows,na_cols))
-+   allocate(as(na_rows,na_cols))
-+
-+   allocate(ev(na))
-+
-+   call prepare_matrix_random(na, myid, sc_desc, a, z, as)
-+
-+   ! set values outside of the bandwidth to zero
-+   bandwidth = nblk
-+
-+   do local_row = 1, na_rows
-+     global_row = index_l2g(local_row, nblk, my_prow, np_rows)
-+     do local_col = 1, na_cols
-+       global_col = index_l2g(local_col, nblk, my_pcol, np_cols)
-+
-+       if (ABS(global_row-global_col) > bandwidth) then
-+         a(local_row, local_col) = 0.0
-+         as(local_row, local_col) = 0.0
-+       end if
-+     end do
-+   end do
-+
-+   if (elpa_init(CURRENT_API_VERSION) /= ELPA_OK) then
-+     print *, "ELPA API version not supported"
-+     stop 1
-+   endif
-+   e => elpa_allocate(error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   call e%set("na", int(na,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("nev", int(nev,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("local_nrows", int(na_rows,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("local_ncols", int(na_cols,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("nblk", int(nblk,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+#ifdef WITH_MPI
-+   call e%set("mpi_comm_parent", int(MPI_COMM_WORLD,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("process_row", int(my_prow,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("process_col", int(my_pcol,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+#endif
-+
-+   call e%set("bandwidth", int(bandwidth,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   assert(e%setup() .eq. ELPA_OK)
-+
-+   call e%set("solver", ELPA_SOLVER_2STAGE, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   call e%eigenvectors(a, ev, z, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   call elpa_deallocate(e, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   call elpa_uninit(error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+
-+   !-------------------------------------------------------------------------------
-+   ! Test correctness of result (using plain scalapack routines)
-+
-+   
-+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
-+
-+
-+   deallocate(a)
-+   deallocate(as)
-+
-+   deallocate(z)
-+   deallocate(ev)
-+
-+#ifdef WITH_MPI
-+   call blacs_gridexit(my_blacs_ctxt)
-+   call mpi_finalize(mpierr)
-+#endif
-+   call EXIT(STATUS)
-+end
-+
-+!-------------------------------------------------------------------------------
-diff -ruN elpa-new_release_2021.11.001/examples/Fortran/elpa2/single_complex_2stage_banded.F90 elpa-new_release_2021.11.001_ok/examples/Fortran/elpa2/single_complex_2stage_banded.F90
---- elpa-new_release_2021.11.001/examples/Fortran/elpa2/single_complex_2stage_banded.F90	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/Fortran/elpa2/single_complex_2stage_banded.F90	2022-01-26 10:09:19.166040000 +0100
-@@ -0,0 +1,299 @@
-+!    This file is part of ELPA.
-+!
-+!    The ELPA library was originally created by the ELPA consortium,
-+!    consisting of the following organizations:
-+!
-+!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
-+!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+!      Informatik,
-+!    - Technische Universität München, Lehrstuhl für Informatik mit
-+!      Schwerpunkt Wissenschaftliches Rechnen ,
-+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+!      and
-+!    - IBM Deutschland GmbH
-+!
-+!
-+!    More information can be found here:
-+!    http://elpa.mpcdf.mpg.de/
-+!
-+!    ELPA is free software: you can redistribute it and/or modify
-+!    it under the terms of the version 3 of the license of the
-+!    GNU Lesser General Public License as published by the Free
-+!    Software Foundation.
-+!
-+!    ELPA is distributed in the hope that it will be useful,
-+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+!    GNU Lesser General Public License for more details.
-+!
-+!    You should have received a copy of the GNU Lesser General Public License
-+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+!
-+!    ELPA reflects a substantial effort on the part of the original
-+!    ELPA consortium, and we ask you to respect the spirit of the
-+!    license that we chose: i.e., please contribute any changes you
-+!    may have back to the original ELPA library distribution, and keep
-+!    any derivatives of ELPA under the same license that we chose for
-+!    the original distribution, the GNU Lesser General Public License.
-+!
-+!
-+#include "config-f90.h"
-+
-+
-+
-+#ifdef HAVE_64BIT_INTEGER_MATH_SUPPORT
-+#define TEST_INT_TYPE integer(kind=c_int64_t)
-+#define INT_TYPE c_int64_t
-+#else
-+#define TEST_INT_TYPE integer(kind=c_int32_t)
-+#define INT_TYPE c_int32_t
-+#endif
-+#ifdef HAVE_64BIT_INTEGER_MPI_SUPPORT
-+#define TEST_INT_MPI_TYPE integer(kind=c_int64_t)
-+#define INT_MPI_TYPE c_int64_t
-+#else
-+#define TEST_INT_MPI_TYPE integer(kind=c_int32_t)
-+#define INT_MPI_TYPE c_int32_t
-+#endif
-+
-+#include "../assert.h"
-+!>
-+!> Fortran test programm to demonstrates the use of
-+!> ELPA 2 complex case library.
-+!> If "HAVE_REDIRECT" was defined at build time
-+!> the stdout and stderr output of each MPI task
-+!> can be redirected to files if the environment
-+!> variable "REDIRECT_ELPA_TEST_OUTPUT" is set
-+!> to "true".
-+!>
-+!> By calling executable [arg1] [arg2] [arg3] [arg4]
-+!> one can define the size (arg1), the number of
-+!> Eigenvectors to compute (arg2), and the blocking (arg3).
-+!> If these values are not set default values (500, 150, 16)
-+!> are choosen.
-+!> If these values are set the 4th argument can be
-+!> "output", which specifies that the EV's are written to
-+!> an ascii file.
-+!>
-+!> The complex ELPA 2 kernel is set as the default kernel.
-+!> However, this can be overriden by setting
-+!> the environment variable "COMPLEX_ELPA_KERNEL" to an
-+!> appropiate value.
-+!>
-+program test_complex2_single_banded
-+
-+!-------------------------------------------------------------------------------
-+! Standard eigenvalue problem - COMPLEX version
-+!
-+! This program demonstrates the use of the ELPA module
-+! together with standard scalapack routines
-+!
-+! Copyright of the original code rests with the authors inside the ELPA
-+! consortium. The copyright of any additional modifications shall rest
-+! with their original authors, but shall adhere to the licensing terms
-+! distributed along with the original code in the file "COPYING".
-+!-------------------------------------------------------------------------------
-+   use elpa
-+
-+   use test_util
-+   use test_read_input_parameters
-+   use test_check_correctness
-+   use test_setup_mpi
-+   use test_blacs_infrastructure
-+   use test_prepare_matrix
-+#ifdef HAVE_REDIRECT
-+  use test_redirect
-+#endif
-+
-+ use test_output_type
-+   implicit none
-+
-+   !-------------------------------------------------------------------------------
-+   ! Please set system size parameters below!
-+   ! na:   System size
-+   ! nev:  Number of eigenvectors to be calculated
-+   ! nblk: Blocking factor in block cyclic distribution
-+   !-------------------------------------------------------------------------------
-+
-+   TEST_INT_TYPE              :: nblk
-+   TEST_INT_TYPE              :: na, nev
-+
-+   TEST_INT_TYPE              :: np_rows, np_cols, na_rows, na_cols
-+
-+   TEST_INT_TYPE              :: myid, nprocs, my_prow, my_pcol, mpi_comm_rows, mpi_comm_cols
-+   TEST_INT_TYPE              :: i, my_blacs_ctxt, sc_desc(9), info, nprow, npcol
-+   TEST_INT_MPI_TYPE          :: mpierr
-+#ifdef WITH_MPI
-+   !TEST_INT_TYPE, external    :: numroc
-+#endif
-+   complex(kind=ck4), parameter   :: CZERO = (0.0_rk4,0.0_rk4), CONE = (1.0_rk4,0.0_rk4)
-+   real(kind=rk4), allocatable    :: ev(:)
-+
-+   complex(kind=ck4), allocatable :: a(:,:), z(:,:), as(:,:)
-+
-+   TEST_INT_TYPE              :: STATUS
-+#ifdef WITH_OPENMP_TRADITIONAL
-+   TEST_INT_TYPE              :: omp_get_max_threads,  required_mpi_thread_level, provided_mpi_thread_level
-+#endif
-+   type(output_t)                :: write_to_file
-+   integer(kind=ik)              :: error_elpa
-+   character(len=8)              :: task_suffix
-+   TEST_INT_TYPE              :: j
-+
-+
-+   TEST_INT_TYPE              :: global_row, global_col, local_row, local_col
-+   TEST_INT_TYPE              :: bandwidth
-+   class(elpa_t), pointer        :: e
-+
-+#define COMPLEXCASE
-+#define DOUBLE_PRECISION_COMPLEX 1
-+
-+   call read_input_parameters(na, nev, nblk, write_to_file)
-+   if (nblk .eq. 1) then
-+     stop 77
-+   endif
-+
-+   !-------------------------------------------------------------------------------
-+   !  MPI Initialization
-+   call setup_mpi(myid, nprocs)
-+
-+   STATUS = 0
-+
-+   !-------------------------------------------------------------------------------
-+   ! Selection of number of processor rows/columns
-+   ! We try to set up the grid square-like, i.e. start the search for possible
-+   ! divisors of nprocs with a number next to the square root of nprocs
-+   ! and decrement it until a divisor is found.
-+
-+   do np_cols = NINT(SQRT(REAL(nprocs))),2,-1
-+      if(mod(nprocs,np_cols) == 0 ) exit
-+   enddo
-+   ! at the end of the above loop, nprocs is always divisible by np_cols
-+
-+   np_rows = nprocs/np_cols
-+
-+   if(myid==0) then
-+      print *
-+      print '(a)','Standard eigenvalue problem - COMPLEX version'
-+      print *
-+      print '(3(a,i0))','Matrix size=',na,', Number of eigenvectors=',nev,', Block size=',nblk
-+      print '(3(a,i0))','Number of processor rows=',np_rows,', cols=',np_cols,', total=',nprocs
-+      print *
-+   endif
-+
-+   !-------------------------------------------------------------------------------
-+   ! Set up BLACS context and MPI communicators
-+   !
-+   ! The BLACS context is only necessary for using Scalapack.
-+   !
-+   ! For ELPA, the MPI communicators along rows/cols are sufficient,
-+   ! and the grid setup may be done in an arbitrary way as long as it is
-+   ! consistent (i.e. 0<=my_prow<np_rows, 0<=my_pcol<np_cols and every
-+   ! process has a unique (my_prow,my_pcol) pair).
-+
-+   call set_up_blacsgrid(int(mpi_comm_world,kind=BLAS_KIND), np_rows, np_cols, 'C', &
-+                         my_blacs_ctxt, my_prow, my_pcol)
-+
-+   if (myid==0) then
-+     print '(a)','| Past BLACS_Gridinfo.'
-+   end if
-+
-+   ! Determine the necessary size of the distributed matrices,
-+   ! we use the Scalapack tools routine NUMROC for that.
-+
-+   call set_up_blacs_descriptor(na ,nblk, my_prow, my_pcol, np_rows, np_cols, &
-+                                na_rows, na_cols, sc_desc, my_blacs_ctxt, info)
-+
-+   if (myid==0) then
-+     print '(a)','| Past scalapack descriptor setup.'
-+   end if
-+   !-------------------------------------------------------------------------------
-+   ! Allocate matrices and set up a test matrix for the eigenvalue problem
-+
-+   allocate(a (na_rows,na_cols))
-+   allocate(z (na_rows,na_cols))
-+   allocate(as(na_rows,na_cols))
-+
-+   allocate(ev(na))
-+
-+   call prepare_matrix_random(na, myid, sc_desc, a, z, as)
-+
-+   ! set values outside of the bandwidth to zero
-+   bandwidth = nblk
-+
-+   do local_row = 1, na_rows
-+     global_row = index_l2g( local_row, nblk, my_prow, np_rows )
-+     do local_col = 1, na_cols
-+       global_col = index_l2g( local_col, nblk, my_pcol, np_cols )
-+
-+       if (ABS(global_row-global_col) > bandwidth) then
-+         a(local_row, local_col) = 0
-+         as(local_row, local_col) = 0
-+       end if
-+     end do
-+   end do
-+
-+   if (elpa_init(CURRENT_API_VERSION) /= ELPA_OK) then
-+     print *, "ELPA API version not supported"
-+     stop 1
-+   endif
-+
-+   e => elpa_allocate(error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   call e%set("na", int(na,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("nev", int(nev,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("local_nrows", int(na_rows,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("local_ncols", int(na_cols,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("nblk", int(nblk,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+#ifdef WITH_MPI
-+   call e%set("mpi_comm_parent", int(MPI_COMM_WORLD,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("process_row", int(my_prow,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("process_col", int(my_pcol,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+#endif
-+
-+   call e%set("bandwidth", int(bandwidth,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   assert(e%setup() .eq. ELPA_OK)
-+
-+   call e%set("solver", ELPA_SOLVER_2STAGE, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%eigenvectors(a, ev, z, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   call elpa_deallocate(e, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   call elpa_uninit(error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   !-------------------------------------------------------------------------------
-+   ! Test correctness of result (using plain scalapack routines)
-+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
-+
-+   deallocate(a)
-+   deallocate(as)
-+
-+   deallocate(z)
-+   deallocate(ev)
-+
-+#ifdef WITH_MPI
-+   call blacs_gridexit(my_blacs_ctxt)
-+   call mpi_finalize(mpierr)
-+#endif
-+   call EXIT(STATUS)
-+end
-+
-+!-------------------------------------------------------------------------------
-diff -ruN elpa-new_release_2021.11.001/examples/Fortran/elpa2/single_real_2stage_banded.F90 elpa-new_release_2021.11.001_ok/examples/Fortran/elpa2/single_real_2stage_banded.F90
---- elpa-new_release_2021.11.001/examples/Fortran/elpa2/single_real_2stage_banded.F90	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/Fortran/elpa2/single_real_2stage_banded.F90	2022-01-26 10:09:19.166871000 +0100
-@@ -0,0 +1,290 @@
-+!    This file is part of ELPA.
-+!
-+!    The ELPA library was originally created by the ELPA consortium,
-+!    consisting of the following organizations:
-+!
-+!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
-+!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+!      Informatik,
-+!    - Technische Universität München, Lehrstuhl für Informatik mit
-+!      Schwerpunkt Wissenschaftliches Rechnen ,
-+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+!      and
-+!    - IBM Deutschland GmbH
-+!
-+!
-+!    More information can be found here:
-+!    http://elpa.mpcdf.mpg.de/
-+!
-+!    ELPA is free software: you can redistribute it and/or modify
-+!    it under the terms of the version 3 of the license of the
-+!    GNU Lesser General Public License as published by the Free
-+!    Software Foundation.
-+!
-+!    ELPA is distributed in the hope that it will be useful,
-+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+!    GNU Lesser General Public License for more details.
-+!
-+!    You should have received a copy of the GNU Lesser General Public License
-+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+!
-+!    ELPA reflects a substantial effort on the part of the original
-+!    ELPA consortium, and we ask you to respect the spirit of the
-+!    license that we chose: i.e., please contribute any changes you
-+!    may have back to the original ELPA library distribution, and keep
-+!    any derivatives of ELPA under the same license that we chose for
-+!    the original distribution, the GNU Lesser General Public License.
-+!
-+!
-+#include "config-f90.h"
-+
-+
-+#ifdef HAVE_64BIT_INTEGER_MATH_SUPPORT
-+#define TEST_INT_TYPE integer(kind=c_int64_t)
-+#define INT_TYPE c_int64_t
-+#else
-+#define TEST_INT_TYPE integer(kind=c_int32_t)
-+#define INT_TYPE c_int32_t
-+#endif
-+#ifdef HAVE_64BIT_INTEGER_MPI_SUPPORT
-+#define TEST_INT_MPI_TYPE integer(kind=c_int64_t)
-+#define INT_MPI_TYPE c_int64_t
-+#else
-+#define TEST_INT_MPI_TYPE integer(kind=c_int32_t)
-+#define INT_MPI_TYPE c_int32_t
-+#endif
-+#include "../assert.h"
-+!>
-+!> Fortran test programm to demonstrates the use of
-+!> ELPA 2 real case library.
-+!> If "HAVE_REDIRECT" was defined at build time
-+!> the stdout and stderr output of each MPI task
-+!> can be redirected to files if the environment
-+!> variable "REDIRECT_ELPA_TEST_OUTPUT" is set
-+!> to "true".
-+!>
-+!> By calling executable [arg1] [arg2] [arg3] [arg4]
-+!> one can define the size (arg1), the number of
-+!> Eigenvectors to compute (arg2), and the blocking (arg3).
-+!> If these values are not set default values (500, 150, 16)
-+!> are choosen.
-+!> If these values are set the 4th argument can be
-+!> "output", which specifies that the EV's are written to
-+!> an ascii file.
-+!>
-+!> The real ELPA 2 kernel is set as the default kernel.
-+!> However, this can be overriden by setting
-+!> the environment variable "REAL_ELPA_KERNEL" to an
-+!> appropiate value.
-+!>
-+program test_real2_single_banded
-+
-+!-------------------------------------------------------------------------------
-+! Standard eigenvalue problem - REAL version
-+!
-+! This program demonstrates the use of the ELPA module
-+! together with standard scalapack routines
-+!
-+! Copyright of the original code rests with the authors inside the ELPA
-+! consortium. The copyright of any additional modifications shall rest
-+! with their original authors, but shall adhere to the licensing terms
-+! distributed along with the original code in the file "COPYING".
-+!
-+!-------------------------------------------------------------------------------
-+   use elpa
-+
-+   !use test_util
-+   use test_read_input_parameters
-+   use test_check_correctness
-+   use test_setup_mpi
-+   use test_blacs_infrastructure
-+   use test_prepare_matrix
-+#ifdef HAVE_REDIRECT
-+   use test_redirect
-+#endif
-+   use test_output_type
-+   use tests_scalapack_interfaces
-+   implicit none
-+
-+   !-------------------------------------------------------------------------------
-+   ! Please set system size parameters below!
-+   ! na:   System size
-+   ! nev:  Number of eigenvectors to be calculated
-+   ! nblk: Blocking factor in block cyclic distribution
-+   !-------------------------------------------------------------------------------
-+
-+   TEST_INT_TYPE           :: nblk
-+   TEST_INT_TYPE           :: na, nev
-+
-+   TEST_INT_TYPE           :: np_rows, np_cols, na_rows, na_cols
-+
-+   TEST_INT_TYPE           :: myid, nprocs, my_prow, my_pcol, mpi_comm_rows, mpi_comm_cols
-+   TEST_INT_TYPE           :: i, my_blacs_ctxt, sc_desc(9), info, nprow, npcol
-+   TEST_INT_MPI_TYPE       :: mpierr
-+
-+   real(kind=rk4), allocatable :: a(:,:), z(:,:), as(:,:), ev(:)
-+
-+   TEST_INT_TYPE           :: STATUS
-+#ifdef WITH_OPENMP_TRADITIONAL
-+   TEST_INT_TYPE           :: omp_get_max_threads,  required_mpi_thread_level, provided_mpi_thread_level
-+#endif
-+   integer(kind=c_int)     :: error_elpa
-+   type(output_t)          :: write_to_file
-+   character(len=8)        :: task_suffix
-+   TEST_INT_TYPE           :: j
-+   TEST_INT_TYPE           :: global_row, global_col, local_row, local_col
-+   TEST_INT_TYPE           :: bandwidth
-+   class(elpa_t), pointer  :: e
-+#define DOUBLE_PRECISION_REAL 1
-+
-+   call read_input_parameters(na, nev, nblk, write_to_file)
-+   if (nblk .eq. 1) then
-+     stop 77
-+   endif
-+
-+   !-------------------------------------------------------------------------------
-+   !  MPI Initialization
-+   call setup_mpi(myid, nprocs)
-+
-+
-+   STATUS = 0
-+
-+#define REALCASE
-+
-+   !-------------------------------------------------------------------------------
-+   ! Selection of number of processor rows/columns
-+   ! We try to set up the grid square-like, i.e. start the search for possible
-+   ! divisors of nprocs with a number next to the square root of nprocs
-+   ! and decrement it until a divisor is found.
-+
-+   do np_cols = NINT(SQRT(REAL(nprocs))),2,-1
-+      if(mod(nprocs,np_cols) == 0 ) exit
-+   enddo
-+   ! at the end of the above loop, nprocs is always divisible by np_cols
-+
-+   np_rows = nprocs/np_cols
-+
-+   if(myid==0) then
-+      print *
-+      print '(a)','Standard eigenvalue problem - REAL version'
-+      print *
-+      print '(3(a,i0))','Matrix size=',na,', Number of eigenvectors=',nev,', Block size=',nblk
-+      print '(3(a,i0))','Number of processor rows=',np_rows,', cols=',np_cols,', total=',nprocs
-+      print *
-+   endif
-+
-+   !-------------------------------------------------------------------------------
-+   ! Set up BLACS context and MPI communicators
-+   !
-+   ! The BLACS context is only necessary for using Scalapack.
-+   !
-+   ! For ELPA, the MPI communicators along rows/cols are sufficient,
-+   ! and the grid setup may be done in an arbitrary way as long as it is
-+   ! consistent (i.e. 0<=my_prow<np_rows, 0<=my_pcol<np_cols and every
-+   ! process has a unique (my_prow,my_pcol) pair).
-+
-+   call set_up_blacsgrid(int(mpi_comm_world,kind=BLAS_KIND), np_rows, np_cols, 'C', &
-+                         my_blacs_ctxt, my_prow, my_pcol)
-+
-+   if (myid==0) then
-+     print '(a)','| Past BLACS_Gridinfo.'
-+   end if
-+
-+   call set_up_blacs_descriptor(na ,nblk, my_prow, my_pcol, np_rows, np_cols, &
-+                                na_rows, na_cols, sc_desc, my_blacs_ctxt, info)
-+
-+   if (myid==0) then
-+     print '(a)','| Past scalapack descriptor setup.'
-+   end if
-+
-+   !-------------------------------------------------------------------------------
-+   ! Allocate matrices and set up a test matrix for the eigenvalue problem
-+   allocate(a (na_rows,na_cols))
-+   allocate(z (na_rows,na_cols))
-+   allocate(as(na_rows,na_cols))
-+
-+   allocate(ev(na))
-+
-+   call prepare_matrix_random(na, myid, sc_desc, a, z, as)
-+
-+   ! set values outside of the bandwidth to zero
-+   bandwidth = nblk
-+
-+   do local_row = 1, na_rows
-+     global_row = index_l2g( local_row, nblk, my_prow, np_rows )
-+     do local_col = 1, na_cols
-+       global_col = index_l2g( local_col, nblk, my_pcol, np_cols )
-+
-+       if (ABS(global_row-global_col) > bandwidth) then
-+         a(local_row, local_col) = 0.0
-+         as(local_row, local_col) = 0.0
-+       end if
-+     end do
-+   end do
-+
-+   if (elpa_init(CURRENT_API_VERSION) /= ELPA_OK) then
-+     print *, "ELPA API version not supported"
-+     stop 1
-+   endif
-+   e => elpa_allocate(error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   call e%set("na", int(na,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("nev", int(nev,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("local_nrows", int(na_rows,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("local_ncols", int(na_cols,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("nblk", int(nblk,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+#ifdef WITH_MPI
-+   call e%set("mpi_comm_parent", int(MPI_COMM_WORLD,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("process_row", int(my_prow,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("process_col", int(my_pcol,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+#endif
-+
-+   call e%set("bandwidth", int(bandwidth,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   assert(e%setup() .eq. ELPA_OK)
-+
-+   call e%set("solver", ELPA_SOLVER_2STAGE, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   call e%eigenvectors(a, ev, z, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   call elpa_deallocate(e, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   call elpa_uninit(error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+
-+   !-------------------------------------------------------------------------------
-+   ! Test correctness of result (using plain scalapack routines)
-+
-+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
-+   deallocate(a)
-+   deallocate(as)
-+
-+   deallocate(z)
-+   deallocate(ev)
-+
-+#ifdef WITH_MPI
-+   call blacs_gridexit(my_blacs_ctxt)
-+   call mpi_finalize(mpierr)
-+#endif
-+   call EXIT(STATUS)
-+end
-+
-+!-------------------------------------------------------------------------------
-diff -ruN elpa-new_release_2021.11.001/examples/Fortran/elpa_generalized/test_bindings.F90 elpa-new_release_2021.11.001_ok/examples/Fortran/elpa_generalized/test_bindings.F90
---- elpa-new_release_2021.11.001/examples/Fortran/elpa_generalized/test_bindings.F90	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/Fortran/elpa_generalized/test_bindings.F90	2022-01-26 10:09:56.136747000 +0100
-@@ -0,0 +1,168 @@
-+#include "config-f90.h"
-+
-+#include "../assert.h"
-+
-+program test_bindings
-+   use elpa
-+
-+   use test_util
-+   use test_setup_mpi
-+!   use test_prepare_matrix
-+   use test_read_input_parameters
-+   use test_blacs_infrastructure
-+!   use test_check_correctness
-+!   use test_analytic
-+!   use test_scalapack
-+
-+
-+   implicit none
-+
-+#include "src/elpa_generated_fortran_interfaces.h"
-+
-+   ! matrix dimensions
-+   integer                     :: na, nev, nblk
-+
-+   ! mpi
-+   integer                     :: myid, nprocs
-+   integer                     :: na_cols, na_rows  ! local matrix size
-+   integer                     :: np_cols, np_rows  ! number of MPI processes per column/row
-+   integer                     :: my_prow, my_pcol  ! local MPI task position (my_prow, my_pcol) in the grid (0..np_cols -1, 0..np_rows -1)
-+   integer                     :: mpierr, mpi_comm_rows, mpi_comm_cols
-+   type(output_t)              :: write_to_file
-+
-+   ! blacs
-+   integer                     :: my_blacs_ctxt, sc_desc(9), info, nprow, npcol, i, j
-+   character(len=1)            :: layout
-+
-+
-+   ! The Matrix
-+   real(kind=C_DOUBLE) , allocatable    :: a(:,:), res(:,:)
-+
-+   logical                     :: skip_check_correctness
-+
-+   class(elpa_t), pointer      :: e
-+
-+   integer                     :: error, status
-+
-+     call read_input_parameters_traditional(na, nev, nblk, write_to_file, skip_check_correctness)
-+     call setup_mpi(myid, nprocs)
-+#ifdef WITH_MPI
-+     call MPI_BARRIER(MPI_COMM_WORLD, mpierr)
-+     !call redirect_stdout(myid)
-+#endif
-+
-+   if (elpa_init(CURRENT_API_VERSION) /= ELPA_OK) then
-+     print *, "ELPA API version not supported"
-+     stop 1
-+   endif
-+
-+   layout = 'C'
-+   do np_cols = NINT(SQRT(REAL(nprocs))),2,-1
-+      if(mod(nprocs,np_cols) == 0 ) exit
-+   enddo
-+
-+   np_rows = nprocs/np_cols
-+   assert(nprocs == np_rows * np_cols)
-+
-+   if (myid == 0) then
-+     print '((a,i0))', 'Matrix size: ', na
-+     print '((a,i0))', 'Num eigenvectors: ', nev
-+     print '((a,i0))', 'Blocksize: ', nblk
-+#ifdef WITH_MPI
-+     print '((a,i0))', 'Num MPI proc: ', nprocs
-+     print '(3(a,i0))','Number of processor rows=',np_rows,', cols=',np_cols,', total=',nprocs
-+     print '(a)',      'Process layout: ' // layout
-+#endif
-+     print *,''
-+   endif
-+
-+
-+   call set_up_blacsgrid(mpi_comm_world, np_rows, np_cols, layout, &
-+                         my_blacs_ctxt, my_prow, my_pcol)
-+
-+   call set_up_blacs_descriptor(na, nblk, my_prow, my_pcol, np_rows, np_cols, &
-+                                na_rows, na_cols, sc_desc, my_blacs_ctxt, info)
-+
-+   allocate(a (na_rows,na_cols))
-+   allocate(res(na_rows,na_cols))   
-+
-+   e => elpa_allocate(error)
-+   assert_elpa_ok(error)
-+
-+   call e%set("na", na, error)
-+   assert_elpa_ok(error)
-+   call e%set("nev", nev, error)
-+   assert_elpa_ok(error)
-+   call e%set("local_nrows", na_rows, error)
-+   assert_elpa_ok(error)
-+   call e%set("local_ncols", na_cols, error)
-+   assert_elpa_ok(error)
-+   call e%set("nblk", nblk, error)
-+   assert_elpa_ok(error)
-+
-+#ifdef WITH_MPI
-+   call e%set("mpi_comm_parent", MPI_COMM_WORLD, error)
-+   assert_elpa_ok(error)
-+   call e%set("process_row", my_prow, error)
-+   assert_elpa_ok(error)
-+   call e%set("process_col", my_pcol, error)
-+   assert_elpa_ok(error)
-+#endif
-+
-+   call e%get("mpi_comm_rows",mpi_comm_rows, error)
-+   assert_elpa_ok(error)
-+   call e%get("mpi_comm_cols",mpi_comm_cols, error)
-+   assert_elpa_ok(error)
-+
-+   a(:,:) = 1.0
-+   res(:,:) = 0.0
-+
-+   call test_c_bindings(a, na_rows, na_cols, np_rows, np_cols, my_prow, my_pcol, sc_desc, res, mpi_comm_rows, mpi_comm_cols)
-+
-+   status = 0
-+   do i = 1, na_rows
-+     do j = 1, na_cols
-+       if(a(i,j) .ne. 1.0) then
-+         write(*,*) i, j, ": wrong value of A: ", a(i,j), ", should be 1"
-+         status = 1
-+       endif
-+       if(res(i,j) .ne. 3.0) then
-+         write(*,*) i, j, ": wrong value of res: ", res(i,j), ", should be 3"
-+         status = 1
-+       endif
-+     enddo
-+   enddo
-+
-+   call check_status(status, myid)
-+
-+   call elpa_deallocate(e, error)
-+   assert_elpa_ok(error)
-+
-+   deallocate(a)
-+   deallocate(res)
-+   call elpa_uninit(error)
-+   assert_elpa_ok(error)
-+
-+#ifdef WITH_MPI
-+   call blacs_gridexit(my_blacs_ctxt)
-+   call mpi_finalize(mpierr)
-+#endif
-+
-+   call exit(status)
-+
-+   contains
-+
-+     subroutine check_status(status, myid)
-+       implicit none
-+       integer, intent(in) :: status, myid
-+       integer :: mpierr
-+       if (status /= 0) then
-+         if (myid == 0) print *, "Result incorrect!"
-+#ifdef WITH_MPI
-+         call mpi_finalize(mpierr)
-+#endif
-+         call exit(status)
-+       endif
-+     end subroutine
-+
-+end program
-diff -ruN elpa-new_release_2021.11.001/examples/Fortran/elpa_print_headers.F90 elpa-new_release_2021.11.001_ok/examples/Fortran/elpa_print_headers.F90
---- elpa-new_release_2021.11.001/examples/Fortran/elpa_print_headers.F90	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/Fortran/elpa_print_headers.F90	2022-01-26 10:04:52.441241000 +0100
-@@ -0,0 +1,282 @@
-+#if 0
-+!    This file is part of ELPA.
-+!
-+!    The ELPA library was originally created by the ELPA consortium,
-+!    consisting of the following organizations:
-+!
-+!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
-+!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+!      Informatik,
-+!    - Technische Universität München, Lehrstuhl für Informatik mit
-+!      Schwerpunkt Wissenschaftliches Rechnen ,
-+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+!      and
-+!    - IBM Deutschland GmbH
-+!
-+!
-+!    More information can be found here:
-+!    http://elpa.mpcdf.mpg.de/
-+!
-+!    ELPA is free software: you can redistribute it and/or modify
-+!    it under the terms of the version 3 of the license of the
-+!    GNU Lesser General Public License as published by the Free
-+!    Software Foundation.
-+!
-+!    ELPA is distributed in the hope that it will be useful,
-+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+!    GNU Lesser General Public License for more details.
-+!
-+!    You should have received a copy of the GNU Lesser General Public License
-+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+!
-+!    ELPA reflects a substantial effort on the part of the original
-+!    ELPA consortium, and we ask you to respect the spirit of the
-+!    license that we chose: i.e., please contribute any changes you
-+!    may have back to the original ELPA library distribution, and keep
-+!    any derivatives of ELPA under the same license that we chose for
-+!    the original distribution, the GNU Lesser General Public License.
-+!
-+!
-+! ELPA1 -- Faster replacements for ScaLAPACK symmetric eigenvalue routines
-+!
-+! Copyright of the original code rests with the authors inside the ELPA
-+! consortium. The copyright of any additional modifications shall rest
-+! with their original authors, but shall adhere to the licensing terms
-+! distributed along with the original code in the file "COPYING".
-+#endif
-+
-+#ifdef WITH_OPENMP_TRADITIONAL
-+   if (myid .eq. 0) then
-+      print *,"Threaded version of test program"
-+      print *,"Using ",omp_get_max_threads()," threads"
-+      print *," "
-+   endif
-+#endif
-+
-+#ifndef WITH_MPI
-+   if (myid .eq. 0) then
-+     print *,"This version of ELPA does not support MPI parallelisation"
-+     print *,"For MPI support re-build ELPA with appropiate flags"
-+     print *," "
-+   endif
-+#endif
-+
-+#ifdef ELPA1
-+
-+#ifdef REALCASE
-+#ifdef DOUBLE_PRECISION_REAL
-+   if (myid .eq. 0) then
-+     print *," "
-+     print *,"Real valued double-precision version of ELPA1 is used"
-+     print *," "
-+   endif
-+#else
-+   if (myid .eq. 0) then
-+     print *," "
-+     print *,"Real valued single-precision version of ELPA1 is used"
-+     print *," "
-+   endif
-+#endif
-+
-+#endif
-+
-+#ifdef COMPLEXCASE
-+#ifdef DOUBLE_PRECISION_COMPLEX
-+   if (myid .eq. 0) then
-+     print *," "
-+     print *,"Complex valued double-precision version of ELPA1 is used"
-+     print *," "
-+   endif
-+#else
-+   if (myid .eq. 0) then
-+     print *," "
-+     print *,"Complex valued single-precision version of ELPA1 is used"
-+     print *," "
-+   endif
-+#endif
-+
-+#endif /* DATATYPE */
-+
-+#else /* ELPA1 */
-+
-+#ifdef REALCASE
-+#ifdef DOUBLE_PRECISION_REAL
-+   if (myid .eq. 0) then
-+     print *," "
-+     print *,"Real valued double-precision version of ELPA2 is used"
-+     print *," "
-+   endif
-+#else
-+   if (myid .eq. 0) then
-+     print *," "
-+     print *,"Real valued single-precision version of ELPA2 is used"
-+     print *," "
-+   endif
-+#endif
-+
-+#endif
-+
-+#ifdef COMPLEXCASE
-+#ifdef DOUBLE_PRECISION_COMPLEX
-+   if (myid .eq. 0) then
-+     print *," "
-+     print *,"Complex valued double-precision version of ELPA2 is used"
-+     print *," "
-+   endif
-+#else
-+   if (myid .eq. 0) then
-+     print *," "
-+     print *,"Complex valued single-precision version of ELPA2 is used"
-+     print *," "
-+   endif
-+#endif
-+
-+#endif /* DATATYPE */
-+
-+#endif /* ELPA1 */
-+
-+#ifdef WITH_MPI
-+    call MPI_BARRIER(MPI_COMM_WORLD, mpierr)
-+#endif
-+#ifdef HAVE_REDIRECT
-+   if (check_redirect_environment_variable()) then
-+     if (myid .eq. 0) then
-+       print *," "
-+       print *,"Redirection of mpi processes is used"
-+       print *," "
-+       if (create_directories() .ne. 1) then
-+         write(error_unit,*) "Unable to create directory for stdout and stderr!"
-+         stop 1
-+       endif
-+     endif
-+#ifdef WITH_MPI
-+     call MPI_BARRIER(MPI_COMM_WORLD, mpierr)
-+#endif
-+     call redirect_stdout(myid)
-+   endif
-+#endif
-+
-+#ifndef ELPA1
-+
-+   if (myid .eq. 0) then
-+      print *," "
-+      print *,"This ELPA2 is build with"
-+#ifdef WITH_NVIDIA_GPU_KERNEL
-+        print *,"CUDA GPU support"
-+#endif
-+#ifdef WITH_NVIDIA_SM80_GPU_KERNEL
-+        print *,"CUDA sm_80 GPU support"
-+#endif
-+#ifdef WITH_INTEL_GPU_KERNEL
-+        print *,"INTEL GPU support"
-+#endif
-+#ifdef WITH_AMD_GPU_KERNEL
-+        print *,"AMD GPU support"
-+#endif
-+      print *," "
-+#ifdef REALCASE
-+
-+#ifdef HAVE_AVX2
-+
-+#ifdef WITH_REAL_AVX_BLOCK2_KERNEL
-+      print *,"AVX2 optimized kernel (2 blocking) for real matrices"
-+#endif
-+#ifdef WITH_REAL_AVX_BLOCK4_KERNEL
-+      print *,"AVX2 optimized kernel (4 blocking) for real matrices"
-+#endif
-+#ifdef WITH_REAL_AVX_BLOCK6_KERNEL
-+      print *,"AVX2 optimized kernel (6 blocking) for real matrices"
-+#endif
-+
-+#else /* no HAVE_AVX2 */
-+
-+#ifdef HAVE_AVX
-+
-+#ifdef WITH_REAL_AVX_BLOCK2_KERNEL
-+      print *,"AVX optimized kernel (2 blocking) for real matrices"
-+#endif
-+#ifdef WITH_REAL_AVX_BLOCK4_KERNEL
-+      print *,"AVX optimized kernel (4 blocking) for real matrices"
-+#endif
-+#ifdef WITH_REAL_AVX_BLOCK6_KERNEL
-+      print *,"AVX optimized kernel (6 blocking) for real matrices"
-+#endif
-+
-+#endif
-+
-+#endif /* HAVE_AVX2 */
-+
-+
-+#ifdef WITH_REAL_GENERIC_KERNEL
-+     print *,"GENERIC kernel for real matrices"
-+#endif
-+#ifdef WITH_REAL_GENERIC_SIMPLE_KERNEL
-+     print *,"GENERIC SIMPLE kernel for real matrices"
-+#endif
-+#ifdef WITH_REAL_SSE_ASSEMBLY_KERNEL
-+     print *,"SSE ASSEMBLER kernel for real matrices"
-+#endif
-+#ifdef WITH_REAL_BGP_KERNEL
-+     print *,"BGP kernel for real matrices"
-+#endif
-+#ifdef WITH_REAL_BGQ_KERNEL
-+     print *,"BGQ kernel for real matrices"
-+#endif
-+
-+#endif /* DATATYPE == REAL */
-+
-+#ifdef COMPLEXCASE
-+
-+#ifdef HAVE_AVX2
-+
-+#ifdef  WITH_COMPLEX_AVX_BLOCK2_KERNEL
-+      print *,"AVX2 optimized kernel (2 blocking) for complex matrices"
-+#endif
-+#ifdef WITH_COMPLEX_AVX_BLOCK1_KERNEL
-+      print *,"AVX2 optimized kernel (1 blocking) for complex matrices"
-+#endif
-+
-+#else /* no HAVE_AVX2 */
-+
-+#ifdef HAVE_AVX
-+
-+#ifdef  WITH_COMPLEX_AVX_BLOCK2_KERNEL
-+      print *,"AVX optimized kernel (2 blocking) for complex matrices"
-+#endif
-+#ifdef WITH_COMPLEX_AVX_BLOCK1_KERNEL
-+      print *,"AVX optimized kernel (1 blocking) for complex matrices"
-+#endif
-+
-+#endif
-+
-+#endif /* HAVE_AVX2 */
-+
-+
-+#ifdef WITH_COMPLEX_GENERIC_KERNEL
-+     print *,"GENERIC kernel for complex matrices"
-+#endif
-+#ifdef WITH_COMPLEX_GENERIC_SIMPLE_KERNEL
-+     print *,"GENERIC SIMPLE kernel for complex matrices"
-+#endif
-+#ifdef WITH_COMPLEX_SSE_ASSEMBLY_KERNEL
-+     print *,"SSE ASSEMBLER kernel for complex matrices"
-+#endif
-+
-+#endif /* DATATYPE == COMPLEX */
-+
-+   endif
-+#endif /* ELPA1 */
-+
-+   if (write_to_file%eigenvectors) then
-+     if (myid .eq. 0) print *,"Writing Eigenvectors to files"
-+   endif
-+
-+   if (write_to_file%eigenvalues) then
-+     if (myid .eq. 0) print *,"Writing Eigenvalues to files"
-+   endif
-+
-+
-diff -ruN elpa-new_release_2021.11.001/examples/Fortran/Makefile_examples_hybrid elpa-new_release_2021.11.001_ok/examples/Fortran/Makefile_examples_hybrid
---- elpa-new_release_2021.11.001/examples/Fortran/Makefile_examples_hybrid	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/Fortran/Makefile_examples_hybrid	2022-01-28 09:55:45.556223000 +0100
-@@ -0,0 +1,38 @@
-+# MPICH, that is IntelMPI or ParaStationMPI
-+SCALAPACK_LIB = -lmkl_scalapack_lp64 -lmkl_blacs_intelmpi_lp64
-+# OpenMPI
-+# SCALAPACK_LIB = -lmkl_scalapack_lp64 $(MKLROOT)/lib/intel64/libmkl_blacs_openmpi_lp64.a
-+LAPACK_LIB = 
-+# Intel compiler
-+MKL = -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lpthread -lstdc++
-+# GCC
-+# MKL = -lmkl_gf_lp64 -lmkl_gnu_thread -lmkl_core -lgomp -lpthread -lstdc++ -lm
-+F90 = mpif90 -O3 -qopenmp -I$(ELPA_MODULES_OPENMP) -I$(ELPA_MODULES) -I$(ELPA_INCLUDE_OPENMP) -I$(ELPA_INCLUDE_OPENMP)/elpa
-+# GCC
-+# F90 = mpif90 -O3 -fopenmp -I$(ELPA_MODULES_OPENMP) -I$(ELPA_MODULES) -I$(ELPA_INCLUDE_OPENMP) -I$(ELPA_INCLUDE_OPENMP)/elpa
-+LIBS = -L$(ELPA_LIB) -lelpatest_openmp -lelpa_openmp $(SCALAPACK_LIB) $(MKL)
-+# CC            = mpicc -qopenmp -O3 
-+# GCC
-+# CC            = mpicc -fopenmp -O3
-+
-+all: test_real_1stage_omp test_real_2stage_all_kernels_omp test_autotune_omp test_multiple_objs_omp test_split_comm_omp test_skewsymmetric_omp
-+
-+test_real_1stage_omp: test.F90
-+	/usr/bin/cpp -P -DTEST_GPU=0 -DTEST_REAL -DTEST_DOUBLE -DTEST_SOLVER_1STAGE -DTEST_EIGENVECTORS -DWITH_OPENMP_TRADITIONAL -DCURRENT_API_VERSION=20211125 -DWITH_MPI -I$(ELPA_INCLUDE_OPENMP)/elpa -o test_real_1stage_omp.F90 test.F90
-+	$(F90) -o $@ test_real_1stage_omp.F90 $(LIBS)
-+
-+test_real_2stage_all_kernels_omp: test.F90
-+	/usr/bin/cpp -P -DTEST_GPU=0 -DTEST_REAL -DTEST_DOUBLE -DTEST_SOLVER_2STAGE -DTEST_EIGENVECTORS -DTEST_ALL_KERNELS -DWITH_OPENMP_TRADITIONAL -DCURRENT_API_VERSION=20211125 -DWITH_MPI -I$(ELPA_INCLUDE_OPENMP)/elpa -o test_real_2stage_all_kernels_omp.F90 test.F90
-+	$(F90) -o $@ test_real_2stage_all_kernels_omp.F90 $(LIBS)
-+
-+test_autotune_omp: test_autotune.F90
-+	$(F90) -DTEST_REAL -DTEST_DOUBLE -DWITH_MPI -DWITH_OPENMP_TRADITIONAL -DCURRENT_API_VERSION=20211125 -I$(ELPA_INCLUDE_OPENMP)/elpa -o $@ test_autotune.F90 $(LIBS)
-+
-+test_multiple_objs_omp: test_multiple_objs.F90
-+	$(F90) -DTEST_REAL -DTEST_DOUBLE -DWITH_MPI -DWITH_OPENMP_TRADITIONAL -DCURRENT_API_VERSION=20211125 -I$(ELPA_INCLUDE_OPENMP)/elpa -o $@ test_multiple_objs.F90 $(LIBS)
-+
-+test_split_comm_omp: test_split_comm.F90
-+	$(F90) -DTEST_REAL -DTEST_DOUBLE -DWITH_MPI -DWITH_OPENMP_TRADITIONAL -DCURRENT_API_VERSION=20211125 -I$(ELPA_INCLUDE_OPENMP)/elpa -o $@ test_split_comm.F90 $(LIBS)
-+
-+test_skewsymmetric_omp: test_skewsymmetric.F90
-+	$(F90) -DTEST_REAL -DTEST_DOUBLE -DWITH_MPI -DWITH_OPENMP_TRADITIONAL -DCURRENT_API_VERSION=20211125 -I$(ELPA_INCLUDE_OPENMP)/elpa -o $@ test_skewsymmetric.F90 $(LIBS)
-diff -ruN elpa-new_release_2021.11.001/examples/Fortran/Makefile_examples_pure elpa-new_release_2021.11.001_ok/examples/Fortran/Makefile_examples_pure
---- elpa-new_release_2021.11.001/examples/Fortran/Makefile_examples_pure	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/Fortran/Makefile_examples_pure	2022-01-28 09:54:41.176236000 +0100
-@@ -0,0 +1,34 @@
-+# MPICH, that is IntelMPI or ParaStationMPI
-+SCALAPACK_LIB = -lmkl_scalapack_lp64 -lmkl_blacs_intelmpi_lp64
-+# OpenMPI
-+# SCALAPACK_LIB = -lmkl_scalapack_lp64 $(MKLROOT)/lib/intel64/libmkl_blacs_openmpi_lp64.a
-+LAPACK_LIB = 
-+# Intel compiler
-+MKL = -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -liomp5 -lpthread -lstdc++
-+# GCC
-+# MKL = -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lgomp -lpthread -lstdc++ -lm
-+F90 = mpif90 -O3 -I$(ELPA_MODULES) -I$(ELPA_INCLUDE) -I$(ELPA_INCLUDE)/elpa
-+LIBS = -L$(ELPA_LIB) -lelpa -lelpatest $(SCALAPACK_LIB) $(MKL)
-+# CC            = mpicc -O3 
-+
-+all: test_real_1stage test_real_2stage_all_kernels test_autotune test_multiple_objs test_split_comm test_skewsymmetric
-+
-+test_real_1stage: test.F90
-+	/usr/bin/cpp -P -DTEST_GPU=0 -DTEST_REAL -DTEST_DOUBLE -DTEST_SOLVER_1STAGE -DTEST_EIGENVECTORS -DWITH_MPI -DCURRENT_API_VERSION=20211125 -I$(ELPA_INCLUDE)/elpa -o test_real_1stage.F90 test.F90
-+	$(F90) -o $@ test_real_1stage.F90 $(LIBS)
-+
-+test_real_2stage_all_kernels: test.F90
-+	/usr/bin/cpp -P -DTEST_GPU=0 -DTEST_REAL -DTEST_DOUBLE -DTEST_SOLVER_2STAGE -DTEST_EIGENVECTORS -DTEST_ALL_KERNELS -DWITH_MPI -DCURRENT_API_VERSION=20211125 -I$(ELPA_INCLUDE)/elpa -o test_real_2stage_all_kernels.F90 test.F90
-+	$(F90) -o $@ test_real_2stage_all_kernels.F90 $(LIBS)
-+
-+test_autotune: test_autotune.F90
-+	$(F90) -DTEST_REAL -DTEST_DOUBLE -DWITH_MPI -DCURRENT_API_VERSION=20211125 -I$(ELPA_INCLUDE)/elpa -o $@ test_autotune.F90 $(LIBS)
-+
-+test_multiple_objs: test_multiple_objs.F90
-+	$(F90) -DTEST_REAL -DTEST_DOUBLE -DWITH_MPI -DCURRENT_API_VERSION=20211125 -I$(ELPA_INCLUDE)/elpa -o $@ test_multiple_objs.F90 $(LIBS)
-+
-+test_split_comm: test_split_comm.F90
-+	$(F90) -DTEST_REAL -DTEST_DOUBLE -DWITH_MPI -DCURRENT_API_VERSION=20211125 -I$(ELPA_INCLUDE)/elpa -o $@ test_split_comm.F90 $(LIBS)
-+
-+test_skewsymmetric: test_skewsymmetric.F90
-+	$(F90) -DTEST_REAL -DTEST_DOUBLE -DWITH_MPI -DCURRENT_API_VERSION=20211125 -I$(ELPA_INCLUDE)/elpa -o $@ test_skewsymmetric.F90 $(LIBS)
-diff -ruN elpa-new_release_2021.11.001/examples/Fortran/Makefile_examples_pure_cuda elpa-new_release_2021.11.001_ok/examples/Fortran/Makefile_examples_pure_cuda
---- elpa-new_release_2021.11.001/examples/Fortran/Makefile_examples_pure_cuda	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/Fortran/Makefile_examples_pure_cuda	2022-01-28 09:54:52.690358000 +0100
-@@ -0,0 +1,34 @@
-+# MPICH, that is IntelMPI or ParaStationMPI
-+SCALAPACK_LIB = -lmkl_scalapack_lp64 -lmkl_blacs_intelmpi_lp64
-+# OpenMPI
-+# SCALAPACK_LIB = -lmkl_scalapack_lp64 $(MKLROOT)/lib/intel64/libmkl_blacs_openmpi_lp64.a
-+LAPACK_LIB = 
-+# Intel compiler
-+MKL = -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -liomp5 -lpthread -lstdc++
-+# GCC
-+# MKL = -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lgomp -lpthread -lstdc++ -lm
-+F90 = mpif90 -O3 -I$(ELPA_MODULES) -I$(ELPA_INCLUDE) -I$(ELPA_INCLUDE)/elpa
-+LIBS = -L$(ELPA_LIB) -lelpa -lelpatest $(SCALAPACK_LIB) $(MKL) -lcudart
-+# CC            = mpicc -O3 
-+
-+all: test_real_1stage test_real_2stage_all_kernels test_autotune test_multiple_objs test_split_comm test_skewsymmetric
-+
-+test_real_1stage: test.F90
-+	/usr/bin/cpp -P -DTEST_NVIDIA_GPU=1 -DTEST_REAL -DTEST_DOUBLE -DTEST_SOLVER_1STAGE -DTEST_EIGENVECTORS -DWITH_MPI -DCURRENT_API_VERSION=20211125 -I$(ELPA_INCLUDE)/elpa -o test_real_1stage.F90 test.F90
-+	$(F90) -o $@ test_real_1stage.F90 $(LIBS)
-+
-+test_real_2stage_all_kernels: test.F90
-+	/usr/bin/cpp -P -DTEST_NVIDIA_GPU=1 -DTEST_REAL -DTEST_DOUBLE -DTEST_SOLVER_2STAGE -DTEST_EIGENVECTORS -DTEST_ALL_KERNELS -DWITH_MPI -DCURRENT_API_VERSION=20211125 -I$(ELPA_INCLUDE)/elpa -o test_real_2stage_all_kernels.F90 test.F90
-+	$(F90) -o $@ test_real_2stage_all_kernels.F90 $(LIBS)
-+
-+test_autotune: test_autotune.F90
-+	$(F90) -DTEST_REAL -DTEST_NVIDIA_GPU=1 -DTEST_DOUBLE -DWITH_MPI -DCURRENT_API_VERSION=20211125 -I$(ELPA_INCLUDE)/elpa -o $@ test_autotune.F90 $(LIBS)
-+
-+test_multiple_objs: test_multiple_objs.F90
-+	$(F90) -DTEST_REAL -DTEST_NVIDIA_GPU=1 -DTEST_DOUBLE -DWITH_MPI -DCURRENT_API_VERSION=20211125 -I$(ELPA_INCLUDE)/elpa -o $@ test_multiple_objs.F90 $(LIBS)
-+
-+test_split_comm: test_split_comm.F90
-+	$(F90) -DTEST_NVIDIA_GPU=1 -DTEST_REAL -DTEST_DOUBLE -DWITH_MPI -DCURRENT_API_VERSION=20211125 -I$(ELPA_INCLUDE)/elpa -o $@ test_split_comm.F90 $(LIBS)
-+
-+test_skewsymmetric: test_skewsymmetric.F90
-+	$(F90) -DTEST_REAL -DTEST_NVIDIA_GPU=1 -DTEST_DOUBLE -DWITH_MPI -DCURRENT_API_VERSION=20211125 -I$(ELPA_INCLUDE)/elpa -o $@ test_skewsymmetric.F90 $(LIBS)
-diff -ruN elpa-new_release_2021.11.001/examples/Fortran/test_autotune.F90 elpa-new_release_2021.11.001_ok/examples/Fortran/test_autotune.F90
---- elpa-new_release_2021.11.001/examples/Fortran/test_autotune.F90	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/Fortran/test_autotune.F90	2022-01-28 18:31:05.305617544 +0100
-@@ -0,0 +1,345 @@
-+!    This file is part of ELPA.
-+!
-+!    The ELPA library was originally created by the ELPA consortium,
-+!    consisting of the following organizations:
-+!
-+!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
-+!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+!      Informatik,
-+!    - Technische Universität München, Lehrstuhl für Informatik mit
-+!      Schwerpunkt Wissenschaftliches Rechnen ,
-+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+!      and
-+!    - IBM Deutschland GmbH
-+!
-+!
-+!    More information can be found here:
-+!    http://elpa.mpcdf.mpg.de/
-+!
-+!    ELPA is free software: you can redistribute it and/or modify
-+!    it under the terms of the version 3 of the license of the
-+!    GNU Lesser General Public License as published by the Free
-+!    Software Foundation.
-+!
-+!    ELPA is distributed in the hope that it will be useful,
-+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+!    GNU Lesser General Public License for more details.
-+!
-+!    You should have received a copy of the GNU Lesser General Public License
-+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+!
-+!    ELPA reflects a substantial effort on the part of the original
-+!    ELPA consortium, and we ask you to respect the spirit of the
-+!    license that we chose: i.e., please contribute any changes you
-+!    may have back to the original ELPA library distribution, and keep
-+!    any derivatives of ELPA under the same license that we chose for
-+!    the original distribution, the GNU Lesser General Public License.
-+!
-+!
-+#include "config-f90.h"
-+
-+! Define one of TEST_REAL or TEST_COMPLEX
-+! Define one of TEST_SINGLE or TEST_DOUBLE
-+! Define one of TEST_SOLVER_1STAGE or TEST_SOLVER_2STAGE
-+! Define TEST_NVIDIA_GPU \in [0, 1]
-+! Define TEST_INTEL_GPU \in [0, 1]
-+! Define TEST_AMD_GPU \in [0, 1]
-+! Define either TEST_ALL_KERNELS or a TEST_KERNEL \in [any valid kernel]
-+
-+#if !(defined(TEST_REAL) ^ defined(TEST_COMPLEX))
-+error: define exactly one of TEST_REAL or TEST_COMPLEX
-+#endif
-+
-+#if !(defined(TEST_SINGLE) ^ defined(TEST_DOUBLE))
-+error: define exactly one of TEST_SINGLE or TEST_DOUBLE
-+#endif
-+
-+#ifdef TEST_SINGLE
-+#  define EV_TYPE real(kind=C_FLOAT)
-+#  ifdef TEST_REAL
-+#    define MATRIX_TYPE real(kind=C_FLOAT)
-+#  else
-+#    define MATRIX_TYPE complex(kind=C_FLOAT_COMPLEX)
-+#  endif
-+#else
-+#  define EV_TYPE real(kind=C_DOUBLE)
-+#  ifdef TEST_REAL
-+#    define MATRIX_TYPE real(kind=C_DOUBLE)
-+#  else
-+#    define MATRIX_TYPE complex(kind=C_DOUBLE_COMPLEX)
-+#  endif
-+#endif
-+
-+
-+#ifdef TEST_REAL
-+#  define AUTOTUNE_DOMAIN ELPA_AUTOTUNE_DOMAIN_REAL
-+#else
-+#  define AUTOTUNE_DOMAIN ELPA_AUTOTUNE_DOMAIN_COMPLEX
-+#endif
-+
-+#ifdef HAVE_64BIT_INTEGER_MATH_SUPPORT
-+#define TEST_INT_TYPE integer(kind=c_int64_t)
-+#define INT_TYPE c_int64_t
-+#else
-+#define TEST_INT_TYPE integer(kind=c_int32_t)
-+#define INT_TYPE c_int32_t
-+#endif
-+
-+#ifdef HAVE_64BIT_INTEGER_MPI_SUPPORT
-+#define TEST_INT_MPI_TYPE integer(kind=c_int64_t)
-+#define INT_MPI_TYPE c_int64_t
-+#else
-+#define TEST_INT_MPI_TYPE integer(kind=c_int32_t)
-+#define INT_MPI_TYPE c_int32_t
-+#endif
-+
-+
-+
-+#define TEST_GPU 0
-+#if (TEST_NVIDIA_GPU == 1) || (TEST_AMD_GPU == 1)
-+#undef TEST_GPU
-+#define TEST_GPU 1
-+#endif
-+
-+
-+#include "assert.h"
-+
-+program test
-+   use elpa
-+
-+   !use test_util
-+   use test_setup_mpi
-+   use test_prepare_matrix
-+   use test_read_input_parameters
-+   use test_blacs_infrastructure
-+   use test_check_correctness
-+   use test_analytic
-+   use iso_fortran_env
-+
-+#ifdef HAVE_REDIRECT
-+   use test_redirect
-+#endif
-+   implicit none
-+
-+   ! matrix dimensions
-+   TEST_INT_TYPE                     :: na, nev, nblk
-+
-+   ! mpi
-+   TEST_INT_TYPE                     :: myid, nprocs
-+   TEST_INT_TYPE                     :: na_cols, na_rows  ! local matrix size
-+   TEST_INT_TYPE                     :: np_cols, np_rows  ! number of MPI processes per column/row
-+   TEST_INT_TYPE                     :: my_prow, my_pcol  ! local MPI task position (my_prow, my_pcol) in the grid (0..np_cols -1, 0..np_rows -1)
-+   TEST_INT_MPI_TYPE                 :: mpierr
-+
-+   ! blacs
-+   character(len=1)            :: layout
-+   TEST_INT_TYPE                     :: my_blacs_ctxt, sc_desc(9), info, nprow, npcol
-+
-+   ! The Matrix
-+   MATRIX_TYPE, allocatable    :: a(:,:), as(:,:)
-+   ! eigenvectors
-+   MATRIX_TYPE, allocatable    :: z(:,:)
-+   ! eigenvalues
-+   EV_TYPE, allocatable        :: ev(:)
-+
-+   TEST_INT_TYPE               :: status
-+   integer(kind=c_int)         :: error_elpa
-+
-+   type(output_t)              :: write_to_file
-+   class(elpa_t), pointer      :: e
-+   class(elpa_autotune_t), pointer :: tune_state
-+
-+   TEST_INT_TYPE                     :: iter
-+   character(len=5)            :: iter_string
-+
-+   call read_input_parameters(na, nev, nblk, write_to_file)
-+!   call setup_mpi(myid, nprocs)
-+    call MPI_INIT_THREAD(MPI_THREAD_SERIALIZED,info, mpierr)
-+    call MPI_COMM_SIZE(MPI_COMM_WORLD,nprocs, mpierr)
-+    call MPI_COMM_RANK(MPI_COMM_WORLD,myid, mpierr)
-+#ifdef HAVE_REDIRECT
-+#ifdef WITH_MPI
-+   call MPI_BARRIER(MPI_COMM_WORLD, mpierr)
-+   call redirect_stdout(myid)
-+#endif
-+#endif
-+
-+   if (elpa_init(CURRENT_API_VERSION) /= ELPA_OK) then
-+     print *, "ELPA API version not supported"
-+     stop 1
-+   endif
-+
-+   layout = 'C'
-+   do np_cols = NINT(SQRT(REAL(nprocs))),2,-1
-+      if(mod(nprocs,np_cols) == 0 ) exit
-+   enddo
-+   np_rows = nprocs/np_cols
-+   assert(nprocs == np_rows * np_cols)
-+
-+   if (myid == 0) then
-+     print '((a,i0))', 'Matrix size: ', na
-+     print '((a,i0))', 'Num eigenvectors: ', nev
-+     print '((a,i0))', 'Blocksize: ', nblk
-+#ifdef WITH_MPI
-+     print '((a,i0))', 'Num MPI proc: ', nprocs
-+     print '(3(a,i0))','Number of processor rows=',np_rows,', cols=',np_cols,', total=',nprocs
-+     print '(a)',      'Process layout: ' // layout
-+#endif
-+     print *,''
-+   endif
-+
-+   call set_up_blacsgrid(int(mpi_comm_world,kind=BLAS_KIND), np_rows, np_cols, layout, &
-+                         my_blacs_ctxt, my_prow, my_pcol)
-+
-+   call set_up_blacs_descriptor(na, nblk, my_prow, my_pcol, np_rows, np_cols, &
-+                                na_rows, na_cols, sc_desc, my_blacs_ctxt, info)
-+
-+   allocate(a (na_rows,na_cols))
-+   allocate(as(na_rows,na_cols))
-+   allocate(z (na_rows,na_cols))
-+   allocate(ev(na))
-+
-+   a(:,:) = 0.0
-+   z(:,:) = 0.0
-+   ev(:) = 0.0
-+
-+   call prepare_matrix_analytic(na, a, nblk, myid, np_rows, np_cols, my_prow, my_pcol, print_times=.false.)
-+   as(:,:) = a(:,:)
-+
-+   e => elpa_allocate(error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   call e%set("na", int(na,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("nev", int(nev,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("local_nrows", int(na_rows,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("local_ncols", int(na_cols,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("nblk", int(nblk,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   if (layout .eq. 'C') then
-+     call e%set("matrix_order",COLUMN_MAJOR_ORDER,error_elpa)
-+   else
-+     call e%set("matrix_order",ROW_MAJOR_ORDER,error_elpa)
-+   endif
-+
-+#ifdef WITH_MPI
-+   call e%set("mpi_comm_parent", int(MPI_COMM_WORLD,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("process_row", int(my_prow,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("process_col", int(my_pcol,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+#endif
-+   call e%set("timings",1, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   call e%set("debug",1, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+#if TEST_NVIDIA_GPU == 1 || (TEST_NVIDIA_GPU == 0) && (TEST_AMD_GPU == 0) && (TEST_INTEL_GPU == 0)
-+   call e%set("nvidia-gpu", 0, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+#endif
-+#if TEST_AMD_GPU == 1
-+   call e%set("amd-gpu", 0, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+#endif
-+#if TEST_INTEL_GPU == 1
-+   call e%set("intel-gpu", 0, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+#endif
-+
-+   !call e%set("max_stored_rows", 15, error_elpa)
-+
-+   !call e%set("solver", ELPA_SOLVER_2STAGE, error_elpa)
-+
-+   assert_elpa_ok(e%setup())
-+
-+   if (myid == 0) print *, ""
-+
-+   ! if you want to use the new autotuning implentation
-+   !call e%autotune_set_api_version(20211125, error_elpa)
-+   !assert_elpa_ok(error_elpa)
-+   ! if you want to use the old one, either do not set autotune_set_api_version
-+   ! or set autotune_set_api_version to a supported api version < 20211125
-+   tune_state => e%autotune_setup(ELPA_AUTOTUNE_MEDIUM, AUTOTUNE_DOMAIN, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   iter=0
-+   do while (e%autotune_step(tune_state, error_elpa))
-+     assert_elpa_ok(error_elpa)
-+     iter=iter+1
-+     write(iter_string,'(I5.5)') iter
-+     !call e%print_settings()
-+     !call e%store_settings("saved_parameters_"//trim(iter_string)//".txt")
-+     call e%timer_start("eigenvectors: iteration "//trim(iter_string))
-+     call e%eigenvectors(a, ev, z, error_elpa)
-+     assert_elpa_ok(error_elpa)
-+     call e%timer_stop("eigenvectors: iteration "//trim(iter_string))
-+
-+     assert_elpa_ok(error_elpa)
-+     if (myid .eq. 0) then
-+       print *, ""
-+       call e%print_times("eigenvectors: iteration "//trim(iter_string))
-+     endif
-+     status = check_correctness_analytic(na, nev, ev, z, nblk, myid, np_rows, np_cols, my_prow, my_pcol, &
-+                                         .true., .true., print_times=.false.)
-+     a(:,:) = as(:,:)
-+     call e%autotune_print_state(tune_state)
-+     call e%autotune_save_state(tune_state, "saved_state_"//trim(iter_string)//".txt")
-+   end do
-+
-+   !! set and print the autotuned-settings
-+   call e%autotune_set_best(tune_state, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   if (myid .eq. 0) then
-+     flush(output_unit)
-+     print *, "The best combination found by the autotuning:"
-+     call e%autotune_print_best(tune_state, error_elpa)
-+     assert_elpa_ok(error_elpa)
-+   endif
-+   ! de-allocate autotune object
-+   call elpa_autotune_deallocate(tune_state, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   if (myid .eq. 0) then
-+     print *, "Running once more time with the best found setting..."
-+   endif
-+   call e%timer_start("eigenvectors: best setting")
-+   call e%eigenvectors(a, ev, z, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%timer_stop("eigenvectors: best setting")
-+   assert_elpa_ok(error_elpa)
-+   if (myid .eq. 0) then
-+   !  print *, ""
-+     call e%print_times("eigenvectors: best setting")
-+   endif
-+   status = check_correctness_analytic(na, nev, ev, z, nblk, myid, np_rows, np_cols, my_prow, my_pcol, &
-+                                       .true., .true., print_times=.false.)
-+
-+   call elpa_deallocate(e,error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   deallocate(a)
-+   deallocate(as)
-+   deallocate(z)
-+   deallocate(ev)
-+
-+   call elpa_uninit(error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+#ifdef WITH_MPI
-+   call blacs_gridexit(my_blacs_ctxt)
-+   call mpi_finalize(mpierr)
-+#endif
-+
-+   call exit(status)
-+
-+end program
-diff -ruN elpa-new_release_2021.11.001/examples/Fortran/test.F90 elpa-new_release_2021.11.001_ok/examples/Fortran/test.F90
---- elpa-new_release_2021.11.001/examples/Fortran/test.F90	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/Fortran/test.F90	2022-01-28 12:00:32.452129948 +0100
-@@ -0,0 +1,1207 @@
-+!    This file is part of ELPA.
-+!
-+!    The ELPA library was originally created by the ELPA consortium,
-+!    consisting of the following organizations:
-+!
-+!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
-+!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+!      Informatik,
-+!    - Technische Universität München, Lehrstuhl für Informatik mit
-+!      Schwerpunkt Wissenschaftliches Rechnen ,
-+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+!      and
-+!    - IBM Deutschland GmbH
-+!
-+!
-+!    More information can be found here:
-+!    http://elpa.mpcdf.mpg.de/
-+!
-+!    ELPA is free software: you can redistribute it and/or modify
-+!    it under the terms of the version 3 of the license of the
-+!    GNU Lesser General Public License as published by the Free
-+!    Software Foundation.
-+!
-+!    ELPA is distributed in the hope that it will be useful,
-+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+!    GNU Lesser General Public License for more details.
-+!
-+!    You should have received a copy of the GNU Lesser General Public License
-+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+!
-+!    ELPA reflects a substantial effort on the part of the original
-+!    ELPA consortium, and we ask you to respect the spirit of the
-+!    license that we chose: i.e., please contribute any changes you
-+!    may have back to the original ELPA library distribution, and keep
-+!    any derivatives of ELPA under the same license that we chose for
-+!    the original distribution, the GNU Lesser General Public License.
-+!
-+!
-+#include "config-f90.h"
-+
-+! Define one of TEST_REAL or TEST_COMPLEX
-+! Define one of TEST_SINGLE or TEST_DOUBLE
-+! Define one of TEST_SOLVER_1STAGE or TEST_SOLVER_2STAGE
-+! Define TEST_NVIDIA_GPU \in [0, 1]
-+! Define TEST_INTEL_GPU \in [0, 1]
-+! Define TEST_AMD_GPU \in [0, 1]
-+! Define either TEST_ALL_KERNELS or a TEST_KERNEL \in [any valid kernel]
-+
-+#if !(defined(TEST_REAL) ^ defined(TEST_COMPLEX))
-+error: define exactly one of TEST_REAL or TEST_COMPLEX
-+#endif
-+
-+#if !(defined(TEST_SINGLE) ^ defined(TEST_DOUBLE))
-+error: define exactly one of TEST_SINGLE or TEST_DOUBLE
-+#endif
-+
-+#if !(defined(TEST_SOLVER_1STAGE) ^ defined(TEST_SOLVER_2STAGE) ^ defined(TEST_SCALAPACK_ALL) ^ defined(TEST_SCALAPACK_PART))
-+error: define exactly one of TEST_SOLVER_1STAGE or TEST_SOLVER_2STAGE or TEST_SCALAPACK_ALL or TEST_SCALAPACK_PART
-+#endif
-+
-+#ifdef TEST_SOLVER_1STAGE
-+#ifdef TEST_ALL_KERNELS
-+error: TEST_ALL_KERNELS cannot be defined for TEST_SOLVER_1STAGE
-+#endif
-+#ifdef TEST_KERNEL
-+error: TEST_KERNEL cannot be defined for TEST_SOLVER_1STAGE
-+#endif
-+#endif
-+
-+#ifdef TEST_SOLVER_2STAGE
-+#if !(defined(TEST_KERNEL) ^ defined(TEST_ALL_KERNELS))
-+error: define either TEST_ALL_KERNELS or a valid TEST_KERNEL
-+#endif
-+#endif
-+
-+#ifdef TEST_GENERALIZED_DECOMP_EIGENPROBLEM
-+#define TEST_GENERALIZED_EIGENPROBLEM
-+#endif
-+
-+#ifdef TEST_SINGLE
-+#  define EV_TYPE real(kind=C_FLOAT)
-+#  ifdef TEST_REAL
-+#    define MATRIX_TYPE real(kind=C_FLOAT)
-+#  else
-+#    define MATRIX_TYPE complex(kind=C_FLOAT_COMPLEX)
-+#  endif
-+#else
-+#  define EV_TYPE real(kind=C_DOUBLE)
-+#  ifdef TEST_REAL
-+#    define MATRIX_TYPE real(kind=C_DOUBLE)
-+#  else
-+#    define MATRIX_TYPE complex(kind=C_DOUBLE_COMPLEX)
-+#  endif
-+#endif
-+
-+#ifdef TEST_REAL
-+#define KERNEL_KEY "real_kernel"
-+#endif
-+#ifdef TEST_COMPLEX
-+#define KERNEL_KEY "complex_kernel"
-+#endif
-+
-+#ifdef HAVE_64BIT_INTEGER_MATH_SUPPORT
-+#define TEST_INT_TYPE integer(kind=c_int64_t)
-+#define INT_TYPE c_int64_t
-+#else
-+#define TEST_INT_TYPE integer(kind=c_int32_t)
-+#define INT_TYPE c_int32_t
-+#endif
-+#ifdef HAVE_64BIT_INTEGER_MPI_SUPPORT
-+#define TEST_INT_MPI_TYPE integer(kind=c_int64_t)
-+#define INT_MPI_TYPE c_int64_t
-+#else
-+#define TEST_INT_MPI_TYPE integer(kind=c_int32_t)
-+#define INT_MPI_TYPE c_int32_t
-+#endif
-+
-+#define TEST_GPU 0
-+#if (TEST_NVIDIA_GPU == 1) || (TEST_AMD_GPU == 1) || (TEST_INTEL_GPU == 1)
-+#undef TEST_GPU
-+#define TEST_GPU 1
-+#endif
-+
-+#include "assert.h"
-+
-+program test
-+   use elpa 
-+   !use test_util
-+   use test_setup_mpi
-+   use test_prepare_matrix
-+   use test_read_input_parameters
-+   use test_blacs_infrastructure
-+   use test_check_correctness
-+   use test_analytic
-+#ifdef WITH_SCALAPACK_TESTS
-+   use test_scalapack
-+#endif
-+
-+#ifdef HAVE_REDIRECT
-+   use test_redirect
-+#endif
-+#ifdef WITH_OPENMP_TRADITIONAL
-+   use omp_lib
-+#endif
-+   use precision_for_tests
-+
-+#if TEST_GPU_DEVICE_POINTER_API == 1
-+   use test_gpu
-+#if TEST_NVIDIA_GPU == 1
-+   use test_cuda_functions
-+#endif
-+#if TEST_AMD_GPU == 1
-+   use test_hip_functions
-+#endif
-+
-+#endif /* TEST_GPU_DEVICE_POINTER_API */
-+
-+   implicit none
-+
-+   ! matrix dimensions
-+   TEST_INT_TYPE     :: na, nev, nblk
-+
-+   ! mpi
-+   TEST_INT_TYPE     :: myid, nprocs
-+   TEST_INT_MPI_TYPE :: myidMPI, nprocsMPI
-+   TEST_INT_TYPE     :: na_cols, na_rows  ! local matrix size
-+   TEST_INT_TYPE     :: np_cols, np_rows  ! number of MPI processes per column/row
-+   TEST_INT_TYPE     :: my_prow, my_pcol  ! local MPI task position (my_prow, my_pcol) in the grid (0..np_cols -1, 0..np_rows -1)
-+   TEST_INT_MPI_TYPE :: mpierr
-+
-+   ! blacs
-+   TEST_INT_TYPE     :: my_blacs_ctxt, sc_desc(9), info, nprow, npcol
-+
-+   ! The Matrix
-+   MATRIX_TYPE, allocatable, target    :: a(:,:)
-+   MATRIX_TYPE, allocatable           :: as(:,:)
-+#if defined(TEST_HERMITIAN_MULTIPLY)
-+   MATRIX_TYPE, allocatable    :: b(:,:), c(:,:)
-+#endif
-+#if defined(TEST_GENERALIZED_EIGENPROBLEM)
-+   MATRIX_TYPE, allocatable    :: b(:,:), bs(:,:)
-+#endif
-+   ! eigenvectors
-+   MATRIX_TYPE, allocatable, target    :: z(:,:)
-+   ! eigenvalues
-+   EV_TYPE, allocatable, target        :: ev(:)
-+
-+#if TEST_GPU_DEVICE_POINTER_API == 1
-+   type(c_ptr)                :: a_dev, q_dev, ev_dev
-+#endif
-+
-+
-+   logical                     :: check_all_evals, skip_check_correctness
-+
-+#if defined(TEST_MATRIX_TOEPLITZ) || defined(TEST_MATRIX_FRANK)
-+   EV_TYPE, allocatable        :: d(:), sd(:), ds(:), sds(:)
-+   EV_TYPE                     :: diagonalELement, subdiagonalElement
-+#endif
-+
-+   TEST_INT_TYPE               :: status
-+   integer(kind=c_int)         :: error_elpa
-+
-+   type(output_t)              :: write_to_file
-+   class(elpa_t), pointer      :: e
-+#ifdef TEST_ALL_KERNELS
-+   TEST_INT_TYPE      :: i
-+#endif
-+#ifdef TEST_ALL_LAYOUTS
-+   TEST_INT_TYPE      :: i_layout
-+#ifdef BUILD_FUGAKU
-+   character(len=1) :: layouts(2)
-+#else
-+   character(len=1), parameter :: layouts(2) = [ 'C', 'R' ]
-+#endif
-+#endif
-+   integer(kind=c_int):: kernel
-+   character(len=1)   :: layout
-+   logical            :: do_test_numeric_residual, do_test_numeric_residual_generalized, &
-+                         do_test_analytic_eigenvalues, &
-+                         do_test_analytic_eigenvalues_eigenvectors,   &
-+                         do_test_frank_eigenvalues,  &
-+                         do_test_toeplitz_eigenvalues, do_test_cholesky,   &
-+                         do_test_hermitian_multiply
-+   logical            :: ignoreError, success, successGPU
-+#ifdef WITH_OPENMP_TRADITIONAL
-+   TEST_INT_TYPE      :: max_threads, threads_caller
-+#endif
-+#if TEST_GPU_SET_ID == 1
-+   TEST_INT_TYPE      :: gpuID
-+#endif
-+#ifdef SPLIT_COMM_MYSELF
-+   TEST_INT_MPI_TYPE  :: mpi_comm_rows, mpi_comm_cols, mpi_string_length, mpierr2
-+   character(len=MPI_MAX_ERROR_STRING) :: mpierr_string
-+#endif
-+
-+
-+#if TEST_GPU_DEVICE_POINTER_API == 1
-+#if TEST_REAL == 1
-+#if TEST_DOUBLE
-+   integer(kind=c_intptr_t), parameter           :: size_of_datatype = size_of_double_real
-+#endif
-+#if TEST_SINGLE
-+   integer(kind=c_intptr_t), parameter           :: size_of_datatype = size_of_single_real
-+#endif
-+#endif /* TEST_REAL == 1 */
-+
-+#if TEST_COMPLEX == 1
-+#if TEST_DOUBLE
-+   integer(kind=c_intptr_t), parameter           :: size_of_datatype = size_of_double_complex
-+#endif
-+#if TEST_SINGLE
-+   integer(kind=c_intptr_t), parameter           :: size_of_datatype = size_of_single_complex
-+#endif
-+#endif
-+#endif /* TEST_GPU_DEVICE_POINTER_API == 1 */
-+
-+#ifdef TEST_ALL_LAYOUTS
-+#ifdef BUILD_FUGAKU
-+   layouts(1) = 'C'
-+   layouts(2) = 'R'
-+#endif
-+#endif
-+
-+   ignoreError = .false.
-+
-+   call read_input_parameters_traditional(na, nev, nblk, write_to_file, skip_check_correctness)
-+!   call setup_mpi(myid, nprocs)
-+    call MPI_INIT_THREAD(MPI_THREAD_SERIALIZED,info, mpierr)
-+    call MPI_COMM_SIZE(MPI_COMM_WORLD,nprocs, mpierr)
-+    call MPI_COMM_RANK(MPI_COMM_WORLD,myid, mpierr)
-+
-+#ifdef HAVE_REDIRECT
-+#ifdef WITH_MPI
-+     call MPI_BARRIER(MPI_COMM_WORLD, mpierr)
-+     call redirect_stdout(myid)
-+#endif
-+#endif
-+
-+   check_all_evals = .true.
-+
-+
-+   do_test_numeric_residual = .false.
-+   do_test_numeric_residual_generalized = .false.
-+   do_test_analytic_eigenvalues = .false.
-+   do_test_analytic_eigenvalues_eigenvectors = .false.
-+   do_test_frank_eigenvalues = .false.
-+   do_test_toeplitz_eigenvalues = .false. 
-+
-+   do_test_cholesky = .false.
-+#if defined(TEST_CHOLESKY)
-+   do_test_cholesky = .true.
-+#endif
-+   do_test_hermitian_multiply = .false.
-+#if defined(TEST_HERMITIAN_MULTIPLY)
-+   do_test_hermitian_multiply = .true.
-+#endif
-+
-+   status = 0
-+   if (elpa_init(CURRENT_API_VERSION) /= ELPA_OK) then
-+     print *, "ELPA API version not supported"
-+     stop 1
-+   endif
-+
-+   if (myid == 0) then
-+     print '((a,i0))', 'Program '
-+     // TEST_CASE
-+     print *, ""
-+   endif
-+
-+#ifdef TEST_ALL_LAYOUTS
-+   do i_layout = 1, size(layouts)               ! layouts
-+     layout = layouts(i_layout)
-+     do np_cols = 1, nprocs                     ! factors
-+       if (mod(nprocs,np_cols) /= 0 ) then
-+         cycle
-+       endif
-+#else
-+   layout = 'C'
-+   do np_cols = NINT(SQRT(REAL(nprocs))),2,-1
-+      if(mod(nprocs,np_cols) == 0 ) exit
-+   enddo
-+#endif
-+
-+   np_rows = nprocs/np_cols
-+   assert(nprocs == np_rows * np_cols)
-+
-+   if (myid == 0) then
-+     print '((a,i0))', 'Matrix size: ', na
-+     print '((a,i0))', 'Num eigenvectors: ', nev
-+     print '((a,i0))', 'Blocksize: ', nblk
-+#ifdef WITH_MPI
-+     print '((a,i0))', 'Num MPI proc: ', nprocs
-+     print '(3(a,i0))','Number of processor rows=',np_rows,', cols=',np_cols,', total=',nprocs
-+     print '(a)',      'Process layout: ' // layout
-+#endif
-+     print *,''
-+   endif
-+
-+#if TEST_QR_DECOMPOSITION == 1
-+
-+#if (TEST_NVIDIA_GPU == 1) || (TEST_INTEL_GPU == 1) || (TEST_AMD_GPU == 1)
-+#ifdef WITH_MPI
-+     call mpi_finalize(mpierr)
-+#endif
-+     stop 77
-+#endif /* TEST_NVIDIA_GPU || TEST_INTEL_GPU */
-+   if (nblk .lt. 64) then
-+     if (myid .eq. 0) then
-+       print *,"At the moment QR decomposition need blocksize of at least 64"
-+     endif
-+     if ((na .lt. 64) .and. (myid .eq. 0)) then
-+       print *,"This is why the matrix size must also be at least 64 or only 1 MPI task can be used"
-+     endif
-+
-+#ifdef WITH_MPI
-+     call mpi_finalize(mpierr)
-+#endif
-+     stop 77
-+   endif
-+#endif /* TEST_QR_DECOMPOSITION */
-+
-+
-+   call set_up_blacsgrid(int(mpi_comm_world,kind=BLAS_KIND), np_rows, &
-+                         np_cols, layout, my_blacs_ctxt, my_prow, &
-+                         my_pcol)
-+
-+
-+#if defined(TEST_GENERALIZED_EIGENPROBLEM) && defined(TEST_ALL_LAYOUTS)
-+#ifdef WITH_MPI
-+     call mpi_finalize(mpierr)
-+#endif
-+     stop 77
-+#endif
-+
-+
-+   call set_up_blacs_descriptor(na, nblk, my_prow, my_pcol, &
-+                                np_rows, np_cols, &
-+                                na_rows, na_cols, sc_desc, my_blacs_ctxt, info)
-+
-+   allocate(a (na_rows,na_cols))
-+   allocate(as(na_rows,na_cols))
-+   allocate(z (na_rows,na_cols))
-+   allocate(ev(na))
-+
-+#ifdef TEST_HERMITIAN_MULTIPLY
-+   allocate(b (na_rows,na_cols))
-+   allocate(c (na_rows,na_cols))
-+#endif
-+
-+#ifdef TEST_GENERALIZED_EIGENPROBLEM
-+   allocate(b (na_rows,na_cols))
-+   allocate(bs (na_rows,na_cols))
-+#endif
-+
-+#if defined(TEST_MATRIX_TOEPLITZ) || defined(TEST_MATRIX_FRANK)
-+   allocate(d (na), ds(na))
-+   allocate(sd (na), sds(na))
-+#endif
-+
-+   a(:,:) = 0.0
-+   z(:,:) = 0.0
-+   ev(:) = 0.0
-+
-+#if defined(TEST_MATRIX_RANDOM) && !defined(TEST_SOLVE_TRIDIAGONAL) && !defined(TEST_CHOLESKY) && !defined(TEST_EIGENVALUES)
-+   ! the random matrix can be used in allmost all tests; but for some no
-+   ! correctness checks have been implemented; do not allow these
-+   ! combinations
-+   ! RANDOM + TEST_SOLVE_TRIDIAGONAL: we need a TOEPLITZ MATRIX
-+   ! RANDOM + TEST_CHOLESKY: wee need SPD matrix
-+   ! RANDOM + TEST_EIGENVALUES: no correctness check known
-+
-+   ! We also have to take care of special case in TEST_EIGENVECTORS
-+#if !defined(TEST_EIGENVECTORS)
-+    call prepare_matrix_random(na, myid, sc_desc, a, z, as)
-+#else /* TEST_EIGENVECTORS */
-+    if (nev .ge. 1) then
-+      call prepare_matrix_random(na, myid, sc_desc, a, z, as)
-+#ifndef TEST_HERMITIAN_MULTIPLY
-+      do_test_numeric_residual = .true.
-+#endif
-+   else
-+     if (myid .eq. 0) then
-+       print *,"At the moment with the random matrix you need nev >=1"
-+     endif
-+#ifdef WITH_MPI
-+     call mpi_finalize(mpierr)
-+#endif
-+     stop 77
-+   endif
-+#endif /* TEST_EIGENVECTORS */
-+    do_test_analytic_eigenvalues = .false.
-+    do_test_analytic_eigenvalues_eigenvectors = .false.
-+    do_test_frank_eigenvalues = .false.
-+    do_test_toeplitz_eigenvalues = .false.
-+#endif /* (TEST_MATRIX_RANDOM) */
-+
-+#if defined(TEST_MATRIX_RANDOM) && defined(TEST_CHOLESKY)
-+     call prepare_matrix_random_spd(na, myid, sc_desc, a, z, as, &
-+                 nblk, np_rows, np_cols, my_prow, my_pcol)
-+    do_test_analytic_eigenvalues = .false.
-+    do_test_analytic_eigenvalues_eigenvectors = .false.
-+    do_test_frank_eigenvalues = .false.
-+    do_test_toeplitz_eigenvalues = .false.
-+#endif /* TEST_MATRIX_RANDOM and TEST_CHOLESKY */
-+
-+#if defined(TEST_MATRIX_RANDOM) && defined(TEST_GENERALIZED_EIGENPROBLEM)
-+   ! call prepare_matrix_random(na, myid, sc_desc, a, z, as)
-+    call prepare_matrix_random_spd(na, myid, sc_desc, b, z, bs, &
-+                 nblk, np_rows, np_cols, my_prow, my_pcol)
-+    do_test_analytic_eigenvalues = .false.
-+    do_test_analytic_eigenvalues_eigenvectors = .false.
-+    do_test_frank_eigenvalues = .false.
-+    do_test_toeplitz_eigenvalues = .false.
-+    do_test_numeric_residual = .false.
-+    do_test_numeric_residual_generalized = .true.
-+#endif /* TEST_MATRIX_RANDOM and TEST_GENERALIZED_EIGENPROBLEM */
-+
-+#if defined(TEST_MATRIX_RANDOM) && (defined(TEST_SOLVE_TRIDIAGONAL) || defined(TEST_EIGENVALUES))
-+#error "Random matrix is not allowed in this configuration"
-+#endif
-+
-+#if defined(TEST_MATRIX_ANALYTIC)  && !defined(TEST_SOLVE_TRIDIAGONAL) && !defined(TEST_CHOLESKY)
-+   ! the analytic matrix can be used in allmost all tests; but for some no
-+   ! correctness checks have been implemented; do not allow these
-+   ! combinations
-+   ! ANALYTIC + TEST_SOLVE_TRIDIAGONAL: we need a TOEPLITZ MATRIX
-+   ! ANALTIC  + TEST_CHOLESKY: no correctness check yet implemented
-+
-+   call prepare_matrix_analytic(na, a, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
-+   as(:,:) = a
-+
-+   do_test_numeric_residual = .false.
-+   do_test_analytic_eigenvalues_eigenvectors = .false.
-+#ifndef TEST_HERMITIAN_MULTIPLY
-+   do_test_analytic_eigenvalues = .true.
-+#endif
-+#if defined(TEST_EIGENVECTORS)
-+   if (nev .ge. 1) then
-+     do_test_analytic_eigenvalues_eigenvectors = .true.
-+     do_test_analytic_eigenvalues = .false.
-+   else
-+     do_test_analytic_eigenvalues_eigenvectors = .false.
-+   endif
-+#endif
-+   do_test_frank_eigenvalues = .false.
-+   do_test_toeplitz_eigenvalues = .false.
-+#endif /* TEST_MATRIX_ANALYTIC */
-+#if defined(TEST_MATRIX_ANALYTIC) && (defined(TEST_SOLVE_TRIDIAGONAL) || defined(TEST_CHOLESKY))
-+#error "Analytic matrix is not allowd in this configuration"
-+#endif
-+
-+#if defined(TEST_MATRIX_TOEPLITZ)
-+   ! The Toeplitz matrix works in each test
-+#ifdef TEST_SINGLE
-+   diagonalElement = 0.45_c_float
-+   subdiagonalElement =  0.78_c_float
-+#else
-+   diagonalElement = 0.45_c_double
-+   subdiagonalElement =  0.78_c_double
-+#endif
-+
-+! actually we test cholesky for diagonal matrix only
-+#if defined(TEST_CHOLESKY)
-+#ifdef TEST_SINGLE
-+  diagonalElement = (2.546_c_float, 0.0_c_float)
-+  subdiagonalElement =  (0.0_c_float, 0.0_c_float)
-+#else
-+  diagonalElement = (2.546_c_double, 0.0_c_double)
-+  subdiagonalElement =  (0.0_c_double, 0.0_c_double)
-+#endif
-+#endif /* TEST_CHOLESKY */
-+
-+   ! check first whether to abort
-+   if (na < 10) then
-+#ifdef WITH_MPI
-+     call mpi_finalize(mpierr)
-+#endif
-+     stop 77
-+   endif
-+   call prepare_matrix_toeplitz(na, diagonalElement, subdiagonalElement, &
-+                                d, sd, ds, sds, a, as, nblk, np_rows, &
-+                                np_cols, my_prow, my_pcol)
-+
-+
-+   do_test_numeric_residual = .false.
-+#if defined(TEST_EIGENVECTORS)
-+   if (nev .ge. 1) then
-+     do_test_numeric_residual = .true.
-+   else
-+     do_test_numeric_residual = .false.
-+   endif
-+#endif
-+
-+   do_test_analytic_eigenvalues = .false.
-+   do_test_analytic_eigenvalues_eigenvectors = .false.
-+   do_test_frank_eigenvalues = .false.
-+#if defined(TEST_CHOLESKY)
-+   do_test_toeplitz_eigenvalues = .false.
-+#else
-+   do_test_toeplitz_eigenvalues = .true.
-+#endif
-+
-+#endif /* TEST_MATRIX_TOEPLITZ */
-+
-+
-+#if defined(TEST_MATRIX_FRANK) && !defined(TEST_SOLVE_TRIDIAGONAL) && !defined(TEST_CHOLESKY)
-+   ! the random matrix can be used in allmost all tests; but for some no
-+   ! correctness checks have been implemented; do not allow these
-+   ! combinations
-+   ! FRANK + TEST_SOLVE_TRIDIAGONAL: we need a TOEPLITZ MATRIX
-+   ! FRANK + TEST_CHOLESKY: no correctness check yet implemented
-+
-+   ! We also have to take care of special case in TEST_EIGENVECTORS
-+#if !defined(TEST_EIGENVECTORS)
-+    call prepare_matrix_frank(na, a, z, as, nblk, np_rows, np_cols, my_prow, my_pcol)
-+
-+    do_test_analytic_eigenvalues = .false.
-+    do_test_analytic_eigenvalues_eigenvectors = .false.
-+#ifndef TEST_HERMITIAN_MULTIPLY
-+    do_test_frank_eigenvalues = .true.
-+#endif
-+    do_test_toeplitz_eigenvalues = .false.
-+
-+#else /* TEST_EIGENVECTORS */
-+
-+    if (nev .ge. 1) then
-+      call prepare_matrix_frank(na, a, z, as, nblk, np_rows, np_cols, my_prow, my_pcol)
-+
-+    do_test_analytic_eigenvalues = .false.
-+    do_test_analytic_eigenvalues_eigenvectors = .false.
-+#ifndef TEST_HERMITIAN_MULTIPLY
-+    do_test_frank_eigenvalues = .true.
-+#endif
-+    do_test_toeplitz_eigenvalues = .false.
-+    do_test_numeric_residual = .false.
-+   else
-+    do_test_analytic_eigenvalues = .false.
-+    do_test_analytic_eigenvalues_eigenvectors = .false.
-+#ifndef TEST_HERMITIAN_MULTIPLY
-+    do_test_frank_eigenvalues = .true.
-+#endif
-+    do_test_toeplitz_eigenvalues = .false.
-+    do_test_numeric_residual = .false.
-+
-+   endif
-+
-+#endif /* TEST_EIGENVECTORS */
-+#endif /* (TEST_MATRIX_FRANK) */
-+#if defined(TEST_MATRIX_FRANK) && (defined(TEST_SOLVE_TRIDIAGONAL) || defined(TEST_CHOLESKY))
-+#error "FRANK matrix is not allowed in this configuration"
-+#endif
-+
-+
-+#ifdef TEST_HERMITIAN_MULTIPLY
-+#ifdef TEST_REAL
-+
-+#ifdef TEST_DOUBLE
-+   b(:,:) = 2.0_c_double * a(:,:)
-+   c(:,:) = 0.0_c_double
-+#else
-+   b(:,:) = 2.0_c_float * a(:,:)
-+   c(:,:) = 0.0_c_float
-+#endif
-+
-+#endif /* TEST_REAL */
-+
-+#ifdef TEST_COMPLEX
-+
-+#ifdef TEST_DOUBLE
-+   b(:,:) = 2.0_c_double * a(:,:)
-+   c(:,:) = (0.0_c_double, 0.0_c_double)
-+#else
-+   b(:,:) = 2.0_c_float * a(:,:)
-+   c(:,:) = (0.0_c_float, 0.0_c_float)
-+#endif
-+
-+#endif /* TEST_COMPLEX */
-+
-+#endif /* TEST_HERMITIAN_MULTIPLY */
-+
-+! if the test is used for (repeated) performacne tests, one might want to skip the checking
-+! of the results, which might be time-consuming and not necessary.
-+   if(skip_check_correctness) then
-+     do_test_numeric_residual = .false.
-+     do_test_numeric_residual_generalized = .false.
-+     do_test_analytic_eigenvalues = .false.
-+     do_test_analytic_eigenvalues_eigenvectors = .false.
-+     do_test_frank_eigenvalues = .false.
-+     do_test_toeplitz_eigenvalues = .false. 
-+     do_test_cholesky = .false.
-+   endif
-+
-+
-+#ifdef WITH_OPENMP_TRADITIONAL
-+   threads_caller = omp_get_max_threads()
-+   if (myid == 0) then
-+     print *,"The calling program uses ",threads_caller," threads"
-+   endif
-+#endif
-+
-+   e => elpa_allocate(error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   call e%set("na", int(na,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("nev", int(nev,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("local_nrows", int(na_rows,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("local_ncols", int(na_cols,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("nblk", int(nblk,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   if (layout .eq. 'C') then
-+     call e%set("matrix_order",COLUMN_MAJOR_ORDER,error_elpa)
-+   else
-+     call e%set("matrix_order",ROW_MAJOR_ORDER,error_elpa)
-+   endif
-+
-+#ifdef WITH_MPI
-+#ifdef SPLIT_COMM_MYSELF
-+   call mpi_comm_split(MPI_COMM_WORLD, int(my_pcol,kind=MPI_KIND), int(my_prow,kind=MPI_KIND), &
-+                       mpi_comm_rows, mpierr)
-+   if (mpierr .ne. MPI_SUCCESS) then
-+     call MPI_ERROR_STRING(mpierr, mpierr_string, mpi_string_length, mpierr2)
-+     write(error_unit,*) "MPI ERROR occured during mpi_comm_split for row communicator: ", trim(mpierr_string)
-+     stop 1
-+   endif
-+
-+   call mpi_comm_split(MPI_COMM_WORLD, int(my_prow,kind=MPI_KIND), int(my_pcol,kind=MPI_KIND), &
-+                       mpi_comm_cols, mpierr)
-+   if (mpierr .ne. MPI_SUCCESS) then
-+     call MPI_ERROR_STRING(mpierr,mpierr_string, mpi_string_length, mpierr2)
-+     write(error_unit,*) "MPI ERROR occured during mpi_comm_split for col communicator: ", trim(mpierr_string)
-+     stop 1
-+   endif
-+
-+   call e%set("mpi_comm_parent", int(MPI_COMM_WORLD,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("mpi_comm_rows", int(mpi_comm_rows,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("mpi_comm_cols", int(mpi_comm_cols,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+#else
-+   call e%set("mpi_comm_parent", int(MPI_COMM_WORLD,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("process_row", int(my_prow,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("process_col", int(my_pcol,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+   call e%set("verbose", 1, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+#endif
-+#endif
-+#ifdef TEST_GENERALIZED_EIGENPROBLEM
-+   call e%set("blacs_context", int(my_blacs_ctxt,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+#endif
-+   call e%set("timings", 1_ik, error_elpa)
-+   assert_elpa_ok(e%setup())
-+
-+#ifdef TEST_SOLVER_1STAGE
-+   call e%set("solver", ELPA_SOLVER_1STAGE, error_elpa)
-+#else
-+   call e%set("solver", ELPA_SOLVER_2STAGE, error_elpa)
-+#endif
-+   assert_elpa_ok(error_elpa)
-+
-+#if TEST_NVIDIA_GPU == 1
-+   call e%set("nvidia-gpu", TEST_GPU, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+#endif
-+
-+#if TEST_AMD_GPU == 1
-+   call e%set("amd-gpu", TEST_GPU, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+#endif
-+
-+#if TEST_INTEL_GPU == 1
-+   call e%set("intel-gpu", TEST_GPU, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+#endif
-+
-+#if (TEST_GPU_SET_ID == 1) && (TEST_INTEL_GPU == 0)
-+   ! simple test
-+   ! Can (and should) fail often
-+   !gpuID = mod(myid,2)
-+   gpuID = mod(myid,1)
-+   call e%set("use_gpu_id", int(gpuID,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+#endif
-+
-+#if TEST_GPU_DEVICE_POINTER_API == 1
-+#if defined(TEST_EIGENVECTORS) && defined(TEST_MATRIX_RANDOM)
-+   ! create device pointers for a,q, ev copy a to
-+#if TEST_NVIDIA_GPU == 1
-+   if (gpu_vendor(NVIDIA_GPU) == NVIDIA_GPU) then
-+     call set_gpu_parameters()
-+   endif
-+#endif
-+#if TEST_AMD_GPU == 1
-+   if (gpu_vendor(AMD_GPU) == AMD_GPU) then
-+     call set_gpu_parameters()
-+   endif
-+#endif
-+
-+   ! set device
-+   success = .true.
-+#if TEST_NVIDIA_GPU == 1
-+   success = cuda_setdevice(gpuID)
-+#endif
-+#if TEST_AMD_GPU == 1
-+   success = cuda_setdevice(gpuID)
-+#endif
-+   if (.not.(success)) then
-+     print *,"Cannot set GPU device. Aborting..."
-+     stop
-+   endif
-+
-+   ! malloc
-+   successGPU = gpu_malloc(a_dev, na_rows*na_cols*size_of_datatype)
-+   if (.not.(successGPU)) then
-+     print *,"Cannot allocate matrix a on GPU! Aborting..."
-+     stop
-+   endif
-+   successGPU = gpu_malloc(q_dev, na_rows*na_cols*size_of_datatype)
-+   if (.not.(successGPU)) then
-+     print *,"Cannot allocate matrix q on GPU! Aborting..."
-+     stop
-+   endif
-+   successGPU = gpu_malloc(ev_dev, na*size_of_datatype)
-+   if (.not.(successGPU)) then
-+     print *,"Cannot allocate vector of eigenvalues on GPU! Aborting..."
-+     stop
-+   endif
-+
-+   successGPU = gpu_memcpy(a_dev, c_loc(a), na_rows*na_cols*size_of_datatype, &
-+                           gpuMemcpyHostToDevice)
-+   if (.not.(successGPU)) then
-+     print *,"Cannot copy matrix a to GPU! Aborting..."
-+     stop
-+   endif
-+#endif
-+#endif /* TEST_GPU_DEVICE_POINTER_API */
-+
-+#if TEST_QR_DECOMPOSITION == 1
-+   call e%set("qr", 1_ik, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+#endif
-+
-+#ifdef WITH_OPENMP_TRADITIONAL
-+   max_threads=omp_get_max_threads()
-+   call e%set("omp_threads", int(max_threads,kind=c_int), error_elpa)
-+   assert_elpa_ok(error_elpa)
-+#endif
-+
-+   if (myid == 0) print *, ""
-+
-+#ifdef TEST_ALL_KERNELS
-+   do i = 0, elpa_option_cardinality(KERNEL_KEY)  ! kernels
-+#if (TEST_NVIDIA_GPU == 0) && (TEST_INTEL_GPU == 0) && (TEST_AMD_GPU == 0)
-+     !if (TEST_GPU .eq. 0) then
-+       kernel = elpa_option_enumerate(KERNEL_KEY, int(i,kind=c_int))
-+       if (kernel .eq. ELPA_2STAGE_REAL_NVIDIA_GPU) continue
-+       if (kernel .eq. ELPA_2STAGE_COMPLEX_NVIDIA_GPU) continue
-+       if (kernel .eq. ELPA_2STAGE_REAL_AMD_GPU) continue
-+       if (kernel .eq. ELPA_2STAGE_COMPLEX_AMD_GPU) continue
-+       if (kernel .eq. ELPA_2STAGE_REAL_INTEL_GPU) continue
-+       if (kernel .eq. ELPA_2STAGE_COMPLEX_INTEL_GPU) continue
-+     !endif
-+#endif
-+#endif
-+
-+#ifdef TEST_KERNEL
-+     kernel = TEST_KERNEL
-+#endif
-+
-+#ifdef TEST_SOLVER_2STAGE
-+#if TEST_NVIDIA_GPU == 1
-+#if defined TEST_REAL
-+#if (TEST_NVIDIA_GPU == 1)
-+#if WITH_NVIDIA_GPU_SM80_COMPUTE_CAPABILITY == 1
-+     kernel = ELPA_2STAGE_REAL_NVIDIA_SM80_GPU
-+#else
-+     kernel = ELPA_2STAGE_REAL_NVIDIA_GPU
-+#endif
-+#endif /* TEST_NVIDIA_GPU */
-+#if (TEST_AMD_GPU == 1)
-+     kernel = ELPA_2STAGE_REAL_AMD_GPU
-+#endif
-+#if (TEST_INTEL_GPU == 1)
-+     kernel = ELPA_2STAGE_REAL_INTEL_GPU
-+#endif
-+#endif /* TEST_REAL */
-+
-+#if defined TEST_COMPLEX
-+#if (TEST_NVIDIA_GPU == 1)
-+     kernel = ELPA_2STAGE_COMPLEX_NVIDIA_GPU
-+#endif
-+#if (TEST_AMD_GPU == 1)
-+     kernel = ELPA_2STAGE_COMPLEX_AMD_GPU
-+#endif
-+#if (TEST_INTEL_GPU == 1)
-+     kernel = ELPA_2STAGE_COMPLEX_INTEL_GPU
-+#endif
-+#endif /* TEST_COMPLEX */
-+#endif /* TEST_GPU == 1 */
-+
-+
-+     call e%set(KERNEL_KEY, kernel, error_elpa)
-+#ifdef TEST_KERNEL
-+     assert_elpa_ok(error_elpa)
-+#else
-+     if (error_elpa /= ELPA_OK) then
-+       cycle
-+     endif
-+     ! actually used kernel might be different if forced via environment variables
-+     call e%get(KERNEL_KEY, kernel, error_elpa)
-+     assert_elpa_ok(error_elpa)
-+#endif
-+     if (myid == 0) then
-+       print *, elpa_int_value_to_string(KERNEL_KEY, kernel) // " kernel"
-+     endif
-+#endif
-+
-+#if !defined(TEST_ALL_LAYOUTS)
-+! print all parameters
-+     call e%print_settings(error_elpa)
-+     assert_elpa_ok(error_elpa)
-+#endif
-+
-+#ifdef TEST_ALL_KERNELS
-+     call e%timer_start(elpa_int_value_to_string(KERNEL_KEY, kernel))
-+#endif
-+
-+     ! The actual solve step
-+#if defined(TEST_EIGENVECTORS)
-+#if TEST_QR_DECOMPOSITION == 1
-+     call e%timer_start("e%eigenvectors_qr()")
-+#else
-+     call e%timer_start("e%eigenvectors()")
-+#endif
-+#ifdef TEST_SCALAPACK_ALL
-+     call solve_scalapack_all(na, a, sc_desc, ev, z)
-+#elif TEST_SCALAPACK_PART
-+     call solve_scalapack_part(na, a, sc_desc, nev, ev, z)
-+     check_all_evals = .false. ! scalapack does not compute all eigenvectors
-+#else /* TEST_SCALAPACK_PART */
-+#ifdef TEST_EXPLICIT_NAME
-+#if defined(TEST_REAL)
-+#if defined(TEST_DOUBLE)
-+#if (TEST_GPU_DEVICE_POINTER_API == 1) && defined(TEST_MATRIX_RANDOM) && defined(TEST_EIGENVECTORS)
-+     call e%eigenvectors_double(a_dev, ev_dev, q_dev, error_elpa)
-+#else
-+     call e%eigenvectors_double(a, ev, z, error_elpa)
-+#endif
-+#endif /* TEST_DOUBLE */
-+#if defined(TEST_SINGLE)
-+#if (TEST_GPU_DEVICE_POINTER_API == 1) && defined(TEST_MATRIX_RANDOM) && defined(TEST_EIGENVECTORS)
-+     call e%eigenvectors_float(a_dev, ev_dev, q_dev, error_elpa)
-+#else
-+     call e%eigenvectors_float(a, ev, z, error_elpa)
-+#endif
-+#endif /* TEST_SINGLE */
-+#endif /* TEST_REAL */
-+#if defined(TEST_COMPLEX)
-+#if defined(TEST_DOUBLE)
-+#if (TEST_GPU_DEVICE_POINTER_API == 1) && defined(TEST_MATRIX_RANDOM) && defined(TEST_EIGENVECTORS)
-+     call e%eigenvectors_double_complex(a_dev, ev_dev, q_dev, error_elpa)
-+#else
-+     call e%eigenvectors_double_complex(a, ev, z, error_elpa)
-+#endif
-+#endif /* TEST_DOUBLE */
-+#if defined(TEST_SINGLE)
-+#if (TEST_GPU_DEVICE_POINTER_API == 1) && defined(TEST_MATRIX_RANDOM) && defined(TEST_EIGENVECTORS)
-+     call e%eigenvectors_float_complex(a_dev, ev_dev, q_dev, error_elpa)
-+#else
-+     call e%eigenvectors_float_complex(a, ev, z, error_elpa)
-+#endif
-+#endif /* TEST_SINGLE */
-+#endif /* TEST_COMPLEX */
-+#else /* TEST_EXPLICIT_NAME */
-+     call e%eigenvectors(a, ev, z, error_elpa)
-+#endif /* TEST_EXPLICIT_NAME */
-+#endif /* TEST_SCALAPACK_PART */
-+#if TEST_QR_DECOMPOSITION == 1
-+     call e%timer_stop("e%eigenvectors_qr()")
-+#else
-+     call e%timer_stop("e%eigenvectors()")
-+#endif
-+#endif /* TEST_EIGENVECTORS  */
-+
-+#ifdef TEST_EIGENVALUES
-+     call e%timer_start("e%eigenvalues()")
-+#ifdef TEST_EXPLICIT_NAME
-+#if defined(TEST_REAL)
-+#if defined(TEST_DOUBLE)
-+     call e%eigenvalues_double(a, ev, error_elpa)
-+#endif
-+#if defined(TEST_SINGLE)
-+     call e%eigenvalues_float(a, ev, error_elpa)
-+#endif
-+#endif /* TEST_REAL */
-+#if defined(TEST_COMPLEX)
-+#if defined(TEST_DOUBLE)
-+     call e%eigenvalues_double_complex(a, ev, error_elpa)
-+#endif
-+#if defined(TEST_SINGLE)
-+     call e%eigenvalues_float_complex(a, ev, error_elpa)
-+#endif
-+#endif
-+#else /* TEST_EXPLICIT_NAME */
-+     call e%eigenvalues(a, ev, error_elpa)
-+#endif /* TEST_EXPLICIT_NAME */
-+     call e%timer_stop("e%eigenvalues()")
-+#endif
-+
-+#if defined(TEST_SOLVE_TRIDIAGONAL)
-+     call e%timer_start("e%solve_tridiagonal()")
-+     call e%solve_tridiagonal(d, sd, z, error_elpa)
-+     call e%timer_stop("e%solve_tridiagonal()")
-+     ev(:) = d(:)
-+#endif
-+
-+#if defined(TEST_CHOLESKY)
-+     call e%timer_start("e%cholesky()")
-+     call e%cholesky(a, error_elpa)
-+     assert_elpa_ok(error_elpa)
-+     call e%timer_stop("e%cholesky()")
-+#endif
-+
-+#if defined(TEST_HERMITIAN_MULTIPLY)
-+     call e%timer_start("e%hermitian_multiply()")
-+     call e%hermitian_multiply('F','F', int(na,kind=c_int), a, b, int(na_rows,kind=c_int), &
-+                               int(na_cols,kind=c_int), c, int(na_rows,kind=c_int),        &
-+                               int(na_cols,kind=c_int), error_elpa)
-+     call e%timer_stop("e%hermitian_multiply()")
-+#endif
-+
-+#if defined(TEST_GENERALIZED_EIGENPROBLEM)
-+     call e%timer_start("e%generalized_eigenvectors()")
-+#if defined(TEST_GENERALIZED_DECOMP_EIGENPROBLEM)
-+     call e%timer_start("is_already_decomposed=.false.")
-+#endif
-+     call e%generalized_eigenvectors(a, b, ev, z, .false., error_elpa)
-+#if defined(TEST_GENERALIZED_DECOMP_EIGENPROBLEM)
-+     call e%timer_stop("is_already_decomposed=.false.")
-+     a = as
-+     call e%timer_start("is_already_decomposed=.true.")
-+     call e%generalized_eigenvectors(a, b, ev, z, .true., error_elpa)
-+     call e%timer_stop("is_already_decomposed=.true.")
-+#endif
-+     call e%timer_stop("e%generalized_eigenvectors()")
-+#endif
-+
-+     assert_elpa_ok(error_elpa)
-+
-+#ifdef TEST_ALL_KERNELS
-+     call e%timer_stop(elpa_int_value_to_string(KERNEL_KEY, kernel))
-+#endif
-+
-+     if (myid .eq. 0) then
-+#ifdef TEST_ALL_KERNELS
-+       call e%print_times(elpa_int_value_to_string(KERNEL_KEY, kernel))
-+#else /* TEST_ALL_KERNELS */
-+
-+#if defined(TEST_EIGENVECTORS)
-+#if TEST_QR_DECOMPOSITION == 1
-+       call e%print_times("e%eigenvectors_qr()")
-+#else
-+       call e%print_times("e%eigenvectors()")
-+#endif
-+#endif
-+#ifdef TEST_EIGENVALUES
-+       call e%print_times("e%eigenvalues()")
-+#endif
-+#ifdef TEST_SOLVE_TRIDIAGONAL
-+       call e%print_times("e%solve_tridiagonal()")
-+#endif
-+#ifdef TEST_CHOLESKY
-+       call e%print_times("e%cholesky()")
-+#endif
-+#ifdef TEST_HERMITIAN_MULTIPLY
-+       call e%print_times("e%hermitian_multiply()")
-+#endif
-+#ifdef TEST_GENERALIZED_EIGENPROBLEM
-+      call e%print_times("e%generalized_eigenvectors()")
-+#endif
-+#endif /* TEST_ALL_KERNELS */
-+     endif
-+
-+
-+
-+
-+#if TEST_GPU_DEVICE_POINTER_API == 1
-+#if defined(TEST_EIGENVECTORS) && defined(TEST_MATRIX_RANDOM)
-+   ! copy for testing
-+   successGPU = gpu_memcpy(c_loc(z), q_dev, na_rows*na_cols*size_of_datatype, &
-+                           gpuMemcpyDeviceToHost)
-+   if (.not.(successGPU)) then
-+     print *,"cannot copy matrix of eigenvectors from GPU to host! Aborting..."
-+     stop
-+   endif
-+
-+   successGPU = gpu_memcpy(c_loc(ev), ev_dev, na*&
-+#ifdef TEST_DOUBLE
-+           size_of_double_real, &
-+#endif
-+#ifdef TEST_SINGLE
-+           size_of_single_real, &
-+#endif
-+                           gpuMemcpyDeviceToHost)
-+   if (.not.(successGPU)) then
-+     print *,"cannot copy vector of eigenvalues from GPU to host! Aborting..."
-+     stop
-+   endif
-+
-+   ! and deallocate device pointer
-+   successGPU = gpu_free(a_dev)
-+   if (.not.(successGPU)) then
-+     print *,"cannot free memory of a_dev on GPU. Aborting..."
-+     stop
-+   endif
-+   successGPU = gpu_free(q_dev)
-+   if (.not.(successGPU)) then
-+     print *,"cannot free memory of q_dev on GPU. Aborting..."
-+     stop
-+   endif
-+   successGPU = gpu_free(ev_dev)
-+   if (.not.(successGPU)) then
-+     print *,"cannot free memory of ev_dev on GPU. Aborting..."
-+     stop
-+   endif
-+#endif
-+#endif
-+
-+
-+     if (do_test_analytic_eigenvalues) then
-+       status = check_correctness_analytic(na, nev, ev, z, nblk, myid, np_rows, np_cols, &
-+                                           my_prow, my_pcol, check_all_evals, .false.)
-+       call check_status(status, myid)
-+     endif
-+
-+     if (do_test_analytic_eigenvalues_eigenvectors) then
-+       status = check_correctness_analytic(na, nev, ev, z, nblk, myid, np_rows, np_cols, &
-+                                           my_prow, my_pcol, check_all_evals, .true.)
-+       call check_status(status, myid)
-+     endif
-+
-+     if(do_test_numeric_residual) then
-+       status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, &
-+                                                        np_rows,np_cols, my_prow, my_pcol)
-+       call check_status(status, myid)
-+     endif
-+
-+     if (do_test_frank_eigenvalues) then
-+       status = check_correctness_eigenvalues_frank(na, ev, z, myid)
-+       call check_status(status, myid)
-+     endif
-+
-+     if (do_test_toeplitz_eigenvalues) then
-+#if defined(TEST_EIGENVALUES) || defined(TEST_SOLVE_TRIDIAGONAL)
-+       status = check_correctness_eigenvalues_toeplitz(na, diagonalElement, &
-+                                                       subdiagonalElement, ev, z, myid)
-+       call check_status(status, myid)
-+#endif
-+     endif
-+
-+     if (do_test_cholesky) then
-+       status = check_correctness_cholesky(na, a, as, na_rows, sc_desc, myid )
-+       call check_status(status, myid)
-+     endif
-+
-+#ifdef TEST_HERMITIAN_MULTIPLY
-+     if (do_test_hermitian_multiply) then
-+       status = check_correctness_hermitian_multiply(na, a, b, c, na_rows, sc_desc, myid )
-+       call check_status(status, myid)
-+     endif
-+#endif
-+
-+#ifdef TEST_GENERALIZED_EIGENPROBLEM
-+     if(do_test_numeric_residual_generalized) then
-+       status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, &
-+                                                        np_cols, my_prow, &
-+       my_pcol, bs)
-+       call check_status(status, myid)
-+     endif
-+#endif
-+
-+
-+#ifdef WITH_OPENMP_TRADITIONAL
-+     if (threads_caller .ne. omp_get_max_threads()) then
-+       if (myid .eq. 0) then
-+         print *, " ERROR! the number of OpenMP threads has not been restored correctly"
-+       endif
-+       status = 1
-+     endif
-+#endif
-+     if (myid == 0) then
-+       print *, ""
-+     endif
-+
-+#ifdef TEST_ALL_KERNELS
-+     a(:,:) = as(:,:)
-+#if defined(TEST_MATRIX_TOEPLITZ) || defined(TEST_MATRIX_FRANK)
-+     d = ds
-+     sd = sds
-+#endif
-+   end do ! kernels
-+#endif
-+
-+   call elpa_deallocate(e, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   deallocate(a)
-+   deallocate(as)
-+   deallocate(z)
-+   deallocate(ev)
-+
-+#ifdef TEST_HERMITIAN_MULTIPLY
-+   deallocate(b)
-+   deallocate(c)
-+#endif
-+#if defined(TEST_MATRIX_TOEPLITZ) || defined(TEST_MATRIX_FRANK)
-+   deallocate(d, ds)
-+   deallocate(sd, sds)
-+#endif
-+#if defined(TEST_GENERALIZED_EIGENPROBLEM)
-+  deallocate(b, bs)
-+#endif
-+
-+#ifdef TEST_ALL_LAYOUTS
-+   end do ! factors
-+   end do ! layouts
-+#endif
-+   call elpa_uninit(error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+#ifdef WITH_MPI
-+   call blacs_gridexit(my_blacs_ctxt)
-+   call mpi_finalize(mpierr)
-+#endif
-+
-+   call exit(status)
-+
-+   contains
-+
-+     subroutine check_status(status, myid)
-+       implicit none
-+       TEST_INT_TYPE, intent(in) :: status, myid
-+       TEST_INT_MPI_TYPE         :: mpierr
-+       if (status /= 0) then
-+         if (myid == 0) print *, "Result incorrect!"
-+#ifdef WITH_MPI
-+         call mpi_finalize(mpierr)
-+#endif
-+         call exit(status)
-+       endif
-+     end subroutine
-+
-+end program
-diff -ruN elpa-new_release_2021.11.001/examples/Fortran/test_multiple_objs.F90 elpa-new_release_2021.11.001_ok/examples/Fortran/test_multiple_objs.F90
---- elpa-new_release_2021.11.001/examples/Fortran/test_multiple_objs.F90	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/Fortran/test_multiple_objs.F90	2022-01-28 09:48:29.071140954 +0100
-@@ -0,0 +1,411 @@
-+!    This file is part of ELPA.
-+!
-+!    The ELPA library was originally created by the ELPA consortium,
-+!    consisting of the following organizations:
-+!
-+!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
-+!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+!      Informatik,
-+!    - Technische Universität München, Lehrstuhl für Informatik mit
-+!      Schwerpunkt Wissenschaftliches Rechnen ,
-+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+!      and
-+!    - IBM Deutschland GmbH
-+!
-+!
-+!    More information can be found here:
-+!    http://elpa.mpcdf.mpg.de/
-+!
-+!    ELPA is free software: you can redistribute it and/or modify
-+!    it under the terms of the version 3 of the license of the
-+!    GNU Lesser General Public License as published by the Free
-+!    Software Foundation.
-+!
-+!    ELPA is distributed in the hope that it will be useful,
-+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+!    GNU Lesser General Public License for more details.
-+!
-+!    You should have received a copy of the GNU Lesser General Public License
-+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+!
-+!    ELPA reflects a substantial effort on the part of the original
-+!    ELPA consortium, and we ask you to respect the spirit of the
-+!    license that we chose: i.e., please contribute any changes you
-+!    may have back to the original ELPA library distribution, and keep
-+!    any derivatives of ELPA under the same license that we chose for
-+!    the original distribution, the GNU Lesser General Public License.
-+!
-+!
-+#include "config-f90.h"
-+
-+! Define one of TEST_REAL or TEST_COMPLEX
-+! Define one of TEST_SINGLE or TEST_DOUBLE
-+! Define one of TEST_SOLVER_1STAGE or TEST_SOLVER_2STAGE
-+! Define TEST_NVIDIA_GPU \in [0, 1]
-+! Define TEST_INTEL_GPU \in [0, 1]
-+! Define TEST_AMD_GPU \in [0, 1]
-+! Define either TEST_ALL_KERNELS or a TEST_KERNEL \in [any valid kernel]
-+
-+#if !(defined(TEST_REAL) ^ defined(TEST_COMPLEX))
-+error: define exactly one of TEST_REAL or TEST_COMPLEX
-+#endif
-+
-+#if !(defined(TEST_SINGLE) ^ defined(TEST_DOUBLE))
-+error: define exactly one of TEST_SINGLE or TEST_DOUBLE
-+#endif
-+
-+#ifdef TEST_SINGLE
-+#  define EV_TYPE real(kind=C_FLOAT)
-+#  ifdef TEST_REAL
-+#    define MATRIX_TYPE real(kind=C_FLOAT)
-+#  else
-+#    define MATRIX_TYPE complex(kind=C_FLOAT_COMPLEX)
-+#  endif
-+#else
-+#  define EV_TYPE real(kind=C_DOUBLE)
-+#  ifdef TEST_REAL
-+#    define MATRIX_TYPE real(kind=C_DOUBLE)
-+#  else
-+#    define MATRIX_TYPE complex(kind=C_DOUBLE_COMPLEX)
-+#  endif
-+#endif
-+
-+
-+#ifdef TEST_REAL
-+#  define AUTOTUNE_DOMAIN ELPA_AUTOTUNE_DOMAIN_REAL
-+#else
-+#  define AUTOTUNE_DOMAIN ELPA_AUTOTUNE_DOMAIN_COMPLEX
-+#endif
-+
-+#ifdef HAVE_64BIT_INTEGER_MATH_SUPPORT
-+#define TEST_INT_TYPE integer(kind=c_int64_t)
-+#define INT_TYPE c_int64_t
-+#else
-+#define TEST_INT_TYPE integer(kind=c_int32_t)
-+#define INT_TYPE c_int32_t
-+#endif
-+
-+#ifdef HAVE_64BIT_INTEGER_MPI_SUPPORT
-+#define TEST_INT_MPI_TYPE integer(kind=c_int64_t)
-+#define INT_MPI_TYPE c_int64_t
-+#else
-+#define TEST_INT_MPI_TYPE integer(kind=c_int32_t)
-+#define INT_MPI_TYPE c_int32_t
-+#endif
-+
-+#define TEST_GPU 0
-+#if (TEST_NVIDIA_GPU == 1) || (TEST_AMD_GPU == 1) || (TEST_INTEL_GPU == 1)
-+#undef TEST_GPU
-+#define TEST_GPU 1
-+#endif
-+
-+#include "assert.h"
-+
-+program test
-+   use elpa
-+
-+   !use test_util
-+   use test_setup_mpi
-+   use test_prepare_matrix
-+   use test_read_input_parameters
-+   use test_blacs_infrastructure
-+   use test_check_correctness
-+   use test_analytic
-+   use iso_fortran_env
-+
-+#ifdef HAVE_REDIRECT
-+   use test_redirect
-+#endif
-+   implicit none
-+
-+   ! matrix dimensions
-+   TEST_INT_TYPE                     :: na, nev, nblk
-+
-+   ! mpi
-+   TEST_INT_TYPE                     :: myid, nprocs
-+   TEST_INT_TYPE                     :: na_cols, na_rows  ! local matrix size
-+   TEST_INT_TYPE                     :: np_cols, np_rows  ! number of MPI processes per column/row
-+   TEST_INT_TYPE                     :: my_prow, my_pcol  ! local MPI task position (my_prow, my_pcol) in the grid (0..np_cols -1, 0..np_rows -1)
-+   TEST_INT_TYPE                     :: ierr
-+   TEST_INT_MPI_TYPE                 :: mpierr
-+   ! blacs
-+   character(len=1)                  :: layout
-+   TEST_INT_TYPE                     :: my_blacs_ctxt, sc_desc(9), info, nprow, npcol
-+
-+   ! The Matrix
-+   MATRIX_TYPE, allocatable    :: a(:,:), as(:,:)
-+   ! eigenvectors
-+   MATRIX_TYPE, allocatable    :: z(:,:)
-+   ! eigenvalues
-+   EV_TYPE, allocatable        :: ev(:)
-+
-+   TEST_INT_TYPE               :: status
-+   integer(kind=c_int)         :: error_elpa
-+
-+   type(output_t)              :: write_to_file
-+   class(elpa_t), pointer      :: e1, e2, e_ptr
-+   class(elpa_autotune_t), pointer :: tune_state
-+
-+   TEST_INT_TYPE                     :: iter
-+   character(len=5)            :: iter_string
-+   integer(kind=c_int)         :: timings, debug, gpu
-+
-+   call read_input_parameters(na, nev, nblk, write_to_file)
-+!   call setup_mpi(myid, nprocs)
-+    call MPI_INIT_THREAD(MPI_THREAD_SERIALIZED,info, mpierr)
-+    call MPI_COMM_SIZE(MPI_COMM_WORLD,nprocs, mpierr)
-+    call MPI_COMM_RANK(MPI_COMM_WORLD,myid, mpierr)
-+#ifdef HAVE_REDIRECT
-+#ifdef WITH_MPI
-+   call MPI_BARRIER(MPI_COMM_WORLD, mpierr)
-+   call redirect_stdout(myid)
-+#endif
-+#endif
-+
-+   if (elpa_init(CURRENT_API_VERSION) /= ELPA_OK) then
-+     print *, "ELPA API version not supported"
-+     stop 1
-+   endif
-+
-+   layout = 'C'
-+   do np_cols = NINT(SQRT(REAL(nprocs))),2,-1
-+      if(mod(nprocs,np_cols) == 0 ) exit
-+   enddo
-+   np_rows = nprocs/np_cols
-+   assert(nprocs == np_rows * np_cols)
-+
-+   if (myid == 0) then
-+     print '((a,i0))', 'Matrix size: ', na
-+     print '((a,i0))', 'Num eigenvectors: ', nev
-+     print '((a,i0))', 'Blocksize: ', nblk
-+#ifdef WITH_MPI
-+     print '((a,i0))', 'Num MPI proc: ', nprocs
-+     print '(3(a,i0))','Number of processor rows=',np_rows,', cols=',np_cols,', total=',nprocs
-+     print '(a)',      'Process layout: ' // layout
-+#endif
-+     print *,''
-+   endif
-+
-+   call set_up_blacsgrid(int(mpi_comm_world,kind=BLAS_KIND), np_rows, np_cols, layout, &
-+                         my_blacs_ctxt, my_prow, my_pcol)
-+
-+   call set_up_blacs_descriptor(na, nblk, my_prow, my_pcol, np_rows, np_cols, &
-+                                na_rows, na_cols, sc_desc, my_blacs_ctxt, info)
-+
-+   allocate(a (na_rows,na_cols))
-+   allocate(as(na_rows,na_cols))
-+   allocate(z (na_rows,na_cols))
-+   allocate(ev(na))
-+
-+   a(:,:) = 0.0
-+   z(:,:) = 0.0
-+   ev(:) = 0.0
-+
-+   call prepare_matrix_analytic(na, a, nblk, myid, np_rows, np_cols, my_prow, my_pcol, print_times=.false.)
-+   as(:,:) = a(:,:)
-+
-+   e1 => elpa_allocate(error_elpa)
-+   !assert_elpa_ok(error_elpa)
-+
-+   call set_basic_params(e1, na, nev, na_rows, na_cols, my_prow, my_pcol)
-+
-+   call e1%set("timings",1, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   call e1%set("debug",1, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+#if TEST_NVIDIA_GPU == 1 || (TEST_NVIDIA_GPU == 0) && (TEST_AMD_GPU == 0) && (TEST_INTEL_GPU == 0)
-+   call e1%set("nvidia-gpu", TEST_GPU, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+#endif
-+
-+#if TEST_AMD_GPU == 1
-+   call e1%set("amd-gpu", TEST_GPU, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+#endif
-+
-+#if TEST_INTEL_GPU == 1
-+   call e1%set("intel-gpu", TEST_GPU, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+#endif
-+   !call e1%set("max_stored_rows", 15, error_elpa)
-+
-+   assert_elpa_ok(e1%setup())
-+
-+   call e1%store_settings("initial_parameters.txt", error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+#ifdef WITH_MPI
-+     ! barrier after store settings, file created from one MPI rank only, but loaded everywhere
-+     call MPI_BARRIER(MPI_COMM_WORLD, mpierr)
-+#endif
-+
-+   ! try to load parameters into another object
-+   e2 => elpa_allocate(error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   call set_basic_params(e2, na, nev, na_rows, na_cols, my_prow, my_pcol)
-+   call e2%load_settings("initial_parameters.txt", error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   assert_elpa_ok(e2%setup())
-+
-+   call e2%get("timings", timings, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   call e2%get("debug", debug, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+#if TEST_NVIDIA_GPU == 1 || (TEST_NVIDIA_GPU == 0) && (TEST_AMD_GPU == 0) && (TEST_INTEL_GPU == 0)
-+   call e2%get("nvidia-gpu", gpu, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+#endif
-+#if TEST_AMD_GPU == 1
-+   call e2%get("amd-gpu", gpu, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+#endif
-+#if TEST_INTEL_GPU == 1
-+   call e2%get("intel-gpu", gpu, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+#endif
-+
-+   if ((timings .ne. 1) .or. (debug .ne. 1) .or. (gpu .ne. 0)) then
-+     print *, "Parameters not stored or loaded correctly. Aborting...", timings, debug, gpu
-+     stop 1
-+   endif
-+
-+   if(myid == 0) print *, "parameters of e1"
-+   call e1%print_settings(error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   if(myid == 0) print *, ""
-+   if(myid == 0) print *, "parameters of e2"
-+   call e2%print_settings(error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   e_ptr => e2
-+
-+
-+   tune_state => e_ptr%autotune_setup(ELPA_AUTOTUNE_FAST, AUTOTUNE_DOMAIN, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+
-+   iter=0
-+   do while (e_ptr%autotune_step(tune_state, error_elpa))
-+     assert_elpa_ok(error_elpa)
-+ 
-+     iter=iter+1
-+     write(iter_string,'(I5.5)') iter
-+     call e_ptr%print_settings(error_elpa)
-+     assert_elpa_ok(error_elpa)
-+
-+     call e_ptr%store_settings("saved_parameters_"//trim(iter_string)//".txt", error_elpa)
-+     assert_elpa_ok(error_elpa)
-+
-+     call e_ptr%timer_start("eigenvectors: iteration "//trim(iter_string))
-+     call e_ptr%eigenvectors(a, ev, z, error_elpa)
-+     assert_elpa_ok(error_elpa)
-+     call e_ptr%timer_stop("eigenvectors: iteration "//trim(iter_string))
-+
-+     assert_elpa_ok(error_elpa)
-+     if (myid .eq. 0) then
-+       print *, ""
-+       call e_ptr%print_times("eigenvectors: iteration "//trim(iter_string))
-+     endif
-+     status = check_correctness_analytic(na, nev, ev, z, nblk, myid, np_rows, np_cols, my_prow, my_pcol, &
-+                                         .true., .true., print_times=.false.)
-+     a(:,:) = as(:,:)
-+     call e_ptr%autotune_print_state(tune_state, error_elpa)
-+     assert_elpa_ok(error_elpa)
-+
-+     call e_ptr%autotune_save_state(tune_state, "saved_state_"//trim(iter_string)//".txt", error_elpa)
-+     assert_elpa_ok(error_elpa)
-+#ifdef WITH_MPI
-+     ! barrier after save state, file created from one MPI rank only, but loaded everywhere
-+     call MPI_BARRIER(MPI_COMM_WORLD, mpierr)
-+#endif
-+     call e_ptr%autotune_load_state(tune_state, "saved_state_"//trim(iter_string)//".txt", error_elpa)
-+     assert_elpa_ok(error_elpa)
-+
-+   end do
-+
-+   ! set and print the autotuned-settings
-+   call e_ptr%autotune_set_best(tune_state, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   if (myid .eq. 0) then
-+     print *, "The best combination found by the autotuning:"
-+     flush(output_unit)
-+     call e_ptr%autotune_print_best(tune_state, error_elpa)
-+     assert_elpa_ok(error_elpa)
-+   endif
-+   ! de-allocate autotune object
-+   call elpa_autotune_deallocate(tune_state, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   if (myid .eq. 0) then
-+     print *, "Running once more time with the best found setting..."
-+   endif
-+   call e_ptr%timer_start("eigenvectors: best setting")
-+   call e_ptr%eigenvectors(a, ev, z, error_elpa)
-+   assert_elpa_ok(error_elpa)
-+
-+   call e_ptr%timer_stop("eigenvectors: best setting")
-+   assert_elpa_ok(error_elpa)
-+   if (myid .eq. 0) then
-+     print *, ""
-+     call e_ptr%print_times("eigenvectors: best setting")
-+   endif
-+   status = check_correctness_analytic(na, nev, ev, z, nblk, myid, np_rows, np_cols, my_prow, my_pcol, &
-+                                       .true., .true., print_times=.false.)
-+
-+   call elpa_deallocate(e_ptr, error_elpa)
-+   !assert_elpa_ok(error_elpa)
-+
-+   deallocate(a)
-+   deallocate(as)
-+   deallocate(z)
-+   deallocate(ev)
-+
-+   call elpa_uninit(error_elpa)
-+   !assert_elpa_ok(error_elpa)
-+
-+#ifdef WITH_MPI
-+   call blacs_gridexit(my_blacs_ctxt)
-+   call mpi_finalize(mpierr)
-+#endif
-+
-+   call exit(status)
-+
-+contains
-+   subroutine set_basic_params(elpa, na, nev, na_rows, na_cols, my_prow, my_pcol)
-+     implicit none
-+     class(elpa_t), pointer      :: elpa
-+     TEST_INT_TYPE, intent(in)   :: na, nev, na_rows, na_cols, my_prow, my_pcol
-+
-+     call elpa%set("na", int(na,kind=c_int), error_elpa)
-+     assert_elpa_ok(error_elpa)
-+     call elpa%set("nev", int(nev,kind=c_int), error_elpa)
-+     assert_elpa_ok(error_elpa)
-+     call elpa%set("local_nrows", int(na_rows,kind=c_int), error_elpa)
-+     assert_elpa_ok(error_elpa)
-+     call elpa%set("local_ncols", int(na_cols,kind=c_int), error_elpa)
-+     assert_elpa_ok(error_elpa)
-+     call elpa%set("nblk", int(nblk,kind=c_int), error_elpa)
-+     assert_elpa_ok(error_elpa)
-+
-+#ifdef WITH_MPI
-+     call elpa%set("mpi_comm_parent", int(MPI_COMM_WORLD,kind=c_int), error_elpa)
-+     assert_elpa_ok(error_elpa)
-+     call elpa%set("process_row", int(my_prow,kind=c_int), error_elpa)
-+     assert_elpa_ok(error_elpa)
-+     call elpa%set("process_col", int(my_pcol,kind=c_int), error_elpa)
-+     assert_elpa_ok(error_elpa)
-+#endif
-+   end subroutine
-+
-+end program
-diff -ruN elpa-new_release_2021.11.001/examples/Fortran/test_skewsymmetric.F90 elpa-new_release_2021.11.001_ok/examples/Fortran/test_skewsymmetric.F90
---- elpa-new_release_2021.11.001/examples/Fortran/test_skewsymmetric.F90	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/Fortran/test_skewsymmetric.F90	2022-01-28 09:50:11.240867016 +0100
-@@ -0,0 +1,431 @@
-+!    This file is part of ELPA.
-+!
-+!    The ELPA library was originally created by the ELPA consortium,
-+!    consisting of the following organizations:
-+!
-+!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
-+!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+!      Informatik,
-+!    - Technische Universität München, Lehrstuhl für Informatik mit
-+!      Schwerpunkt Wissenschaftliches Rechnen ,
-+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+!      and
-+!    - IBM Deutschland GmbH
-+!
-+!
-+!    More information can be found here:
-+!    http://elpa.mpcdf.mpg.de/
-+!
-+!    ELPA is free software: you can redistribute it and/or modify
-+!    it under the terms of the version 3 of the license of the
-+!    GNU Lesser General Public License as published by the Free
-+!    Software Foundation.
-+!
-+!    ELPA is distributed in the hope that it will be useful,
-+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+!    GNU Lesser General Public License for more details.
-+!
-+!    You should have received a copy of the GNU Lesser General Public License
-+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+!
-+!    ELPA reflects a substantial effort on the part of the original
-+!    ELPA consortium, and we ask you to respect the spirit of the
-+!    license that we chose: i.e., please contribute any changes you
-+!    may have back to the original ELPA library distribution, and keep
-+!    any derivatives of ELPA under the same license that we chose for
-+!    the original distribution, the GNU Lesser General Public License.
-+!
-+!
-+#include "config-f90.h"
-+
-+! Define one of TEST_REAL or TEST_COMPLEX
-+! Define one of TEST_SINGLE or TEST_DOUBLE
-+! Define one of TEST_SOLVER_1STAGE or TEST_SOLVER_2STAGE
-+! Define TEST_NVIDIA_GPU \in [0, 1]
-+! Define TEST_INTEL_GPU \in [0, 1]
-+! Define TEST_AMD_GPU \in [0, 1]
-+! Define either TEST_ALL_KERNELS or a TEST_KERNEL \in [any valid kernel]
-+
-+#if !(defined(TEST_REAL) ^ defined(TEST_COMPLEX))
-+error: define exactly one of TEST_REAL or TEST_COMPLEX
-+#endif
-+
-+#if !(defined(TEST_SINGLE) ^ defined(TEST_DOUBLE))
-+error: define exactly one of TEST_SINGLE or TEST_DOUBLE
-+#endif
-+
-+#ifdef TEST_SINGLE
-+#  define EV_TYPE real(kind=C_FLOAT)
-+#  define EV_TYPE_COMPLEX complex(kind=C_FLOAT_COMPLEX)
-+#  define MATRIX_TYPE_COMPLEX complex(kind=C_FLOAT_COMPLEX)
-+#  ifdef TEST_REAL
-+#    define MATRIX_TYPE real(kind=C_FLOAT)
-+#  else
-+#    define MATRIX_TYPE complex(kind=C_FLOAT_COMPLEX)
-+#  endif
-+#else
-+#  define MATRIX_TYPE_COMPLEX complex(kind=C_DOUBLE_COMPLEX)
-+#  define EV_TYPE_COMPLEX complex(kind=C_DOUBLE_COMPLEX)
-+#  define EV_TYPE real(kind=C_DOUBLE)
-+#  ifdef TEST_REAL
-+#    define MATRIX_TYPE real(kind=C_DOUBLE)
-+#  else
-+#    define MATRIX_TYPE complex(kind=C_DOUBLE_COMPLEX)
-+#  endif
-+#endif
-+
-+#ifdef TEST_REAL
-+#  define AUTOTUNE_DOMAIN ELPA_AUTOTUNE_DOMAIN_REAL
-+#else
-+#  define AUTOTUNE_DOMAIN ELPA_AUTOTUNE_DOMAIN_COMPLEX
-+#endif
-+#ifdef HAVE_64BIT_INTEGER_MATH_SUPPORT
-+#define TEST_INT_TYPE integer(kind=c_int64_t)
-+#define INT_TYPE c_int64_t
-+#else
-+#define TEST_INT_TYPE integer(kind=c_int32_t)
-+#define INT_TYPE c_int32_t
-+#endif
-+#ifdef HAVE_64BIT_INTEGER_MPI_SUPPORT
-+#define TEST_INT_MPI_TYPE integer(kind=c_int64_t)
-+#define INT_MPI_TYPE c_int64_t
-+#else
-+#define TEST_INT_MPI_TYPE integer(kind=c_int32_t)
-+#define INT_MPI_TYPE c_int32_t
-+#endif
-+
-+#define TEST_GPU 0
-+#if (TEST_NVIDIA_GPU == 1) || (TEST_AMD_GPU == 1) || (TEST_INTEL_GPU == 1)
-+#undef TEST_GPU
-+#define TEST_GPU 1
-+#endif
-+
-+#include "assert.h"
-+
-+program test
-+   use elpa
-+
-+   !use test_util
-+   use test_setup_mpi
-+   use test_prepare_matrix
-+   use test_read_input_parameters
-+   use test_blacs_infrastructure
-+   use test_check_correctness
-+   use precision_for_tests
-+   use iso_fortran_env
-+
-+#ifdef HAVE_REDIRECT
-+   use test_redirect
-+#endif
-+   implicit none
-+
-+   ! matrix dimensions
-+   TEST_INT_TYPE                          :: na, nev, nblk
-+
-+   ! mpi
-+   TEST_INT_TYPE                          :: myid, nprocs
-+   TEST_INT_TYPE                          :: na_cols, na_rows  ! local matrix size
-+   TEST_INT_TYPE                          :: np_cols, np_rows  ! number of MPI processes per column/row
-+   TEST_INT_TYPE                          :: my_prow, my_pcol  ! local MPI task position (my_prow, my_pcol) in the grid (0..np_cols -1, 0..np_rows -1)
-+   TEST_INT_MPI_TYPE                      :: mpierr
-+
-+   ! blacs
-+   character(len=1)                 :: layout
-+   TEST_INT_TYPE                          :: my_blacs_ctxt, sc_desc(9), info, nprow, npcol
-+
-+   ! The Matrix
-+   MATRIX_TYPE, allocatable         :: a_skewsymmetric(:,:), as_skewsymmetric(:,:)
-+   MATRIX_TYPE_COMPLEX, allocatable :: a_complex(:,:), as_complex(:,:)
-+   ! eigenvectors
-+   MATRIX_TYPE, allocatable         :: z_skewsymmetric(:,:)
-+   MATRIX_TYPE_COMPLEX, allocatable :: z_complex(:,:)
-+   ! eigenvalues
-+   EV_TYPE, allocatable             :: ev_skewsymmetric(:), ev_complex(:)
-+
-+   TEST_INT_TYPE                    :: status, i, j
-+   integer(kind=c_int)              :: error_elpa
-+
-+   type(output_t)                   :: write_to_file
-+   class(elpa_t), pointer           :: e_complex, e_skewsymmetric
-+           
-+   call read_input_parameters(na, nev, nblk, write_to_file)
-+!   call setup_mpi(myid, nprocs)
-+    call MPI_INIT_THREAD(MPI_THREAD_SERIALIZED,info, mpierr)
-+    call MPI_COMM_SIZE(MPI_COMM_WORLD,nprocs, mpierr)
-+    call MPI_COMM_RANK(MPI_COMM_WORLD,myid, mpierr)
-+#ifdef HAVE_REDIRECT
-+#ifdef WITH_MPI
-+   call MPI_BARRIER(MPI_COMM_WORLD, mpierr)
-+   call redirect_stdout(myid)
-+#endif
-+#endif
-+
-+   if (elpa_init(CURRENT_API_VERSION) /= ELPA_OK) then
-+     print *, "ELPA API version not supported"
-+     stop 1
-+   endif
-+! 
-+   layout = 'C'
-+   do np_cols = NINT(SQRT(REAL(nprocs))),2,-1
-+      if(mod(nprocs,np_cols) == 0 ) exit
-+   enddo
-+   np_rows = nprocs/np_cols
-+   assert(nprocs == np_rows * np_cols)
-+
-+   if (myid == 0) then
-+     print '((a,i0))', 'Matrix size: ', na
-+     print '((a,i0))', 'Num eigenvectors: ', nev
-+     print '((a,i0))', 'Blocksize: ', nblk
-+#ifdef WITH_MPI
-+     print '((a,i0))', 'Num MPI proc: ', nprocs
-+     print '(3(a,i0))','Number of processor rows=',np_rows,', cols=',np_cols,', total=',nprocs
-+     print '(a)',      'Process layout: ' // layout
-+#endif
-+     print *,''
-+   endif
-+
-+   call set_up_blacsgrid(int(mpi_comm_world,kind=BLAS_KIND), np_rows, &
-+                             np_cols, layout, &
-+                             my_blacs_ctxt, my_prow, my_pcol)
-+
-+   call set_up_blacs_descriptor(na, nblk, my_prow, my_pcol, np_rows, np_cols, &
-+                                na_rows, na_cols, sc_desc, my_blacs_ctxt, info)
-+
-+   allocate(a_skewsymmetric (na_rows,na_cols))
-+   allocate(as_skewsymmetric(na_rows,na_cols))
-+   allocate(z_skewsymmetric (na_rows,2*na_cols))
-+   allocate(ev_skewsymmetric(na))
-+
-+   a_skewsymmetric(:,:) = 0.0
-+   z_skewsymmetric(:,:) = 0.0
-+   ev_skewsymmetric(:) = 0.0
-+
-+   call prepare_matrix_random(na, myid, sc_desc, a_skewsymmetric, &
-+   z_skewsymmetric(:,1:na_cols), as_skewsymmetric, is_skewsymmetric=1)
-+   
-+   !call MPI_BARRIER(MPI_COMM_WORLD, mpierr)  
-+   as_skewsymmetric(:,:) = a_skewsymmetric(:,:)
-+   
-+
-+   ! prepare the complex matrix for the "brute force" case
-+   allocate(a_complex (na_rows,na_cols))
-+   allocate(as_complex(na_rows,na_cols))
-+   allocate(z_complex (na_rows,na_cols))
-+   allocate(ev_complex(na))
-+
-+   a_complex(1:na_rows,1:na_cols) = 0.0
-+   z_complex(1:na_rows,1:na_cols) = 0.0
-+   as_complex(1:na_rows,1:na_cols) = 0.0
-+   
-+
-+      do j=1, na_cols
-+        do i=1,na_rows
-+#ifdef TEST_DOUBLE
-+          a_complex(i,j) = dcmplx(0.0, a_skewsymmetric(i,j))
-+#endif
-+#ifdef TEST_SINGLE
-+          a_complex(i,j) = cmplx(0.0, a_skewsymmetric(i,j))
-+#endif
-+        enddo
-+      enddo
-+   
-+
-+
-+   z_complex(1:na_rows,1:na_cols)  = a_complex(1:na_rows,1:na_cols)
-+   as_complex(1:na_rows,1:na_cols) = a_complex(1:na_rows,1:na_cols)
-+
-+   ! first set up and solve the brute force problem
-+   e_complex => elpa_allocate(error_elpa)
-+   call set_basic_params(e_complex, na, nev, na_rows, na_cols, my_prow, my_pcol)
-+
-+   call e_complex%set("timings",1, error_elpa)
-+
-+   call e_complex%set("debug",1,error_elpa)
-+
-+#if TEST_NVIDIA_GPU == 1 || (TEST_NVIDIA_GPU == 0) && (TEST_AMD_GPU == 0) && (TEST_INTEL_GPU == 0)  
-+   call e_complex%set("nvidia-gpu", TEST_GPU,error_elpa)
-+#endif
-+#if TEST_AMD_GPU == 1
-+   call e_complex%set("amd-gpu", TEST_GPU,error_elpa)
-+#endif
-+#if TEST_INTEL_GPU == 1
-+   call e_complex%set("intel-gpu", TEST_GPU,error_elpa)
-+#endif
-+
-+   call e_complex%set("omp_threads", 8, error_elpa)
-+
-+   assert_elpa_ok(e_complex%setup())
-+   call e_complex%set("solver", elpa_solver_2stage, error_elpa)
-+
-+   call e_complex%timer_start("eigenvectors: brute force as complex matrix")
-+   call e_complex%eigenvectors(a_complex, ev_complex, z_complex, error_elpa)
-+   call e_complex%timer_stop("eigenvectors: brute force as complex matrix")
-+
-+   if (myid .eq. 0) then
-+     print *, ""
-+     call e_complex%print_times("eigenvectors: brute force as complex matrix")
-+   endif 
-+#ifdef WITH_MPI
-+     call MPI_BARRIER(MPI_COMM_WORLD, mpierr)
-+#endif     
-+!      as_complex(:,:) = z_complex(:,:)
-+#ifdef TEST_SINGLE
-+     status = check_correctness_evp_numeric_residuals_complex_single(na, nev, as_complex, z_complex, ev_complex, sc_desc, &
-+                                                    nblk, myid, np_rows,np_cols, my_prow, my_pcol)
-+#else
-+     status = check_correctness_evp_numeric_residuals_complex_double(na, nev, as_complex, z_complex, ev_complex, sc_desc, &
-+                                                    nblk, myid, np_rows,np_cols, my_prow, my_pcol)
-+#endif
-+    status = 0
-+    call check_status(status, myid)
-+
-+#ifdef WITH_MPI
-+     call MPI_BARRIER(MPI_COMM_WORLD, mpierr)
-+#endif
-+   ! now run the skewsymmetric case
-+   e_skewsymmetric => elpa_allocate(error_elpa)
-+   call set_basic_params(e_skewsymmetric, na, nev, na_rows, na_cols, my_prow, my_pcol)
-+
-+   call e_skewsymmetric%set("timings",1, error_elpa)
-+
-+   call e_skewsymmetric%set("debug",1,error_elpa)
-+
-+#if TEST_NVIDIA_GPU == 1 || (TEST_NVIDIA_GPU == 0) && (TEST_AMD_GPU == 0) && (TEST_INTEL_GPU == 0)
-+   call e_skewsymmetric%set("nvidia-gpu", TEST_GPU,error_elpa)
-+#endif
-+#if TEST_AMD_GPU == 1
-+   call e_skewsymmetric%set("amd-gpu", TEST_GPU,error_elpa)
-+#endif
-+#if TEST_INTEL_GPU == 1
-+   call e_skewsymmetric%set("intel-gpu", TEST_GPU,error_elpa)
-+#endif
-+   call e_skewsymmetric%set("omp_threads",8, error_elpa)
-+
-+   assert_elpa_ok(e_skewsymmetric%setup())
-+   
-+   call e_skewsymmetric%set("solver", elpa_solver_2stage, error_elpa)
-+
-+   call e_skewsymmetric%timer_start("eigenvectors: skewsymmetric ")
-+   call e_skewsymmetric%skew_eigenvectors(a_skewsymmetric, ev_skewsymmetric, z_skewsymmetric, error_elpa)
-+   call e_skewsymmetric%timer_stop("eigenvectors: skewsymmetric ")
-+
-+   if (myid .eq. 0) then
-+     print *, ""
-+     call e_skewsymmetric%print_times("eigenvectors: skewsymmetric")
-+   endif
-+   
-+   ! check eigenvalues
-+   do i=1, na
-+     if (myid == 0) then
-+#ifdef TEST_DOUBLE
-+       if (abs(ev_complex(i)-ev_skewsymmetric(i))/abs(ev_complex(i)) .gt. 1e-10) then
-+#endif
-+#ifdef TEST_SINGLE
-+       if (abs(ev_complex(i)-ev_skewsymmetric(i))/abs(ev_complex(i)) .gt. 1e-4) then
-+#endif
-+         print *,"ev: i=",i,ev_complex(i),ev_skewsymmetric(i)
-+         status = 1
-+     endif
-+     endif
-+   enddo
-+
-+
-+!    call check_status(status, myid)
-+   
-+   z_complex(:,:) = 0
-+   do j=1, na_cols
-+     do i=1,na_rows
-+#ifdef TEST_DOUBLE
-+       z_complex(i,j) = dcmplx(z_skewsymmetric(i,j), z_skewsymmetric(i,na_cols+j))
-+#endif
-+#ifdef TEST_SINGLE
-+       z_complex(i,j) = cmplx(z_skewsymmetric(i,j), z_skewsymmetric(i,na_cols+j))
-+#endif
-+     enddo
-+   enddo
-+#ifdef WITH_MPI
-+   call MPI_BARRIER(MPI_COMM_WORLD, mpierr)
-+#endif
-+
-+#ifdef TEST_SINGLE
-+   status = check_correctness_evp_numeric_residuals_ss_real_single(na, nev, as_skewsymmetric, z_complex, ev_skewsymmetric, &
-+                              sc_desc, nblk, myid, np_rows,np_cols, my_prow, my_pcol)
-+#else
-+   status = check_correctness_evp_numeric_residuals_ss_real_double(na, nev, as_skewsymmetric, z_complex, ev_skewsymmetric, &
-+                              sc_desc, nblk, myid, np_rows,np_cols, my_prow, my_pcol)
-+#endif
-+   
-+#ifdef WITH_MPI
-+    call MPI_BARRIER(MPI_COMM_WORLD, mpierr)
-+#endif
-+   call elpa_deallocate(e_complex,error_elpa)
-+   call elpa_deallocate(e_skewsymmetric,error_elpa)
-+
-+
-+   !to do 
-+   ! - check whether brute-force check_correctness_evp_numeric_residuals worsk (complex ev)
-+   ! - invent a test for skewsymmetric residuals
-+
-+   deallocate(a_complex)
-+   deallocate(as_complex)
-+   deallocate(z_complex)
-+   deallocate(ev_complex)
-+
-+   deallocate(a_skewsymmetric)
-+   deallocate(as_skewsymmetric)
-+   deallocate(z_skewsymmetric)
-+   deallocate(ev_skewsymmetric)
-+   call elpa_uninit(error_elpa)
-+
-+
-+
-+#ifdef WITH_MPI
-+   call blacs_gridexit(my_blacs_ctxt)
-+   call mpi_finalize(mpierr)
-+#endif
-+
-+   call exit(status)
-+
-+contains
-+   subroutine set_basic_params(elpa, na, nev, na_rows, na_cols, my_prow, my_pcol)
-+     implicit none
-+     class(elpa_t), pointer      :: elpa
-+     TEST_INT_TYPE, intent(in)         :: na, nev, na_rows, na_cols, my_prow, my_pcol
-+
-+     call elpa%set("na", int(na,kind=c_int), error_elpa)
-+     assert_elpa_ok(error_elpa)
-+     call elpa%set("nev", int(nev,kind=c_int), error_elpa)
-+     assert_elpa_ok(error_elpa)
-+     call elpa%set("local_nrows", int(na_rows,kind=c_int), error_elpa)
-+     assert_elpa_ok(error_elpa)
-+     call elpa%set("local_ncols", int(na_cols,kind=c_int), error_elpa)
-+     assert_elpa_ok(error_elpa)
-+     call elpa%set("nblk", int(nblk,kind=c_int), error_elpa)
-+     assert_elpa_ok(error_elpa)
-+
-+#ifdef WITH_MPI
-+     call elpa%set("mpi_comm_parent", int(MPI_COMM_WORLD,kind=c_int), error_elpa)
-+     assert_elpa_ok(error_elpa)
-+     call elpa%set("process_row", int(my_prow,kind=c_int), error_elpa)
-+     assert_elpa_ok(error_elpa)
-+     call elpa%set("process_col", int(my_pcol,kind=c_int), error_elpa)
-+     assert_elpa_ok(error_elpa)
-+#endif
-+   end subroutine
-+   subroutine check_status(status, myid)
-+     implicit none
-+     TEST_INT_TYPE, intent(in) :: status, myid
-+     TEST_INT_MPI_TYPE         :: mpierr
-+     if (status /= 0) then
-+       if (myid == 0) print *, "Result incorrect!"
-+#ifdef WITH_MPI
-+       call mpi_finalize(mpierr)
-+#endif
-+       call exit(status)
-+     endif
-+   end subroutine
-+end program
-diff -ruN elpa-new_release_2021.11.001/examples/Fortran/test_split_comm.F90 elpa-new_release_2021.11.001_ok/examples/Fortran/test_split_comm.F90
---- elpa-new_release_2021.11.001/examples/Fortran/test_split_comm.F90	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/Fortran/test_split_comm.F90	2022-02-01 17:13:58.420500580 +0100
-@@ -0,0 +1,346 @@
-+!    This file is part of ELPA.
-+!
-+!    The ELPA library was originally created by the ELPA consortium,
-+!    consisting of the following organizations:
-+!
-+!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
-+!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+!      Informatik,
-+!    - Technische Universität München, Lehrstuhl für Informatik mit
-+!      Schwerpunkt Wissenschaftliches Rechnen ,
-+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+!      and
-+!    - IBM Deutschland GmbH
-+!
-+!
-+!    More information can be found here:
-+!    http://elpa.mpcdf.mpg.de/
-+!
-+!    ELPA is free software: you can redistribute it and/or modify
-+!    it under the terms of the version 3 of the license of the
-+!    GNU Lesser General Public License as published by the Free
-+!    Software Foundation.
-+!
-+!    ELPA is distributed in the hope that it will be useful,
-+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+!    GNU Lesser General Public License for more details.
-+!
-+!    You should have received a copy of the GNU Lesser General Public License
-+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+!
-+!    ELPA reflects a substantial effort on the part of the original
-+!    ELPA consortium, and we ask you to respect the spirit of the
-+!    license that we chose: i.e., please contribute any changes you
-+!    may have back to the original ELPA library distribution, and keep
-+!    any derivatives of ELPA under the same license that we chose for
-+!    the original distribution, the GNU Lesser General Public License.
-+!
-+!
-+#include "config-f90.h"
-+
-+! Define one of TEST_REAL or TEST_COMPLEX
-+! Define one of TEST_SINGLE or TEST_DOUBLE
-+! Define one of TEST_SOLVER_1STAGE or TEST_SOLVER_2STAGE
-+! Define TEST_NVIDIA_GPU \in [0, 1]
-+! Define TEST_INTEL_GPU \in [0, 1]
-+! Define either TEST_ALL_KERNELS or a TEST_KERNEL \in [any valid kernel]
-+
-+#if !(defined(TEST_REAL) ^ defined(TEST_COMPLEX))
-+error: define exactly one of TEST_REAL or TEST_COMPLEX
-+#endif
-+
-+#if !(defined(TEST_SINGLE) ^ defined(TEST_DOUBLE))
-+error: define exactly one of TEST_SINGLE or TEST_DOUBLE
-+#endif
-+
-+#ifdef TEST_SINGLE
-+#  define EV_TYPE real(kind=C_FLOAT)
-+#  ifdef TEST_REAL
-+#    define MATRIX_TYPE real(kind=C_FLOAT)
-+#  else
-+#    define MATRIX_TYPE complex(kind=C_FLOAT_COMPLEX)
-+#  endif
-+#else
-+#  define EV_TYPE real(kind=C_DOUBLE)
-+#  ifdef TEST_REAL
-+#    define MATRIX_TYPE real(kind=C_DOUBLE)
-+#  else
-+#    define MATRIX_TYPE complex(kind=C_DOUBLE_COMPLEX)
-+#  endif
-+#endif
-+
-+
-+#ifdef TEST_REAL
-+#  define AUTOTUNE_DOMAIN ELPA_AUTOTUNE_DOMAIN_REAL
-+#else
-+#  define AUTOTUNE_DOMAIN ELPA_AUTOTUNE_DOMAIN_COMPLEX
-+#endif
-+
-+
-+#ifdef HAVE_64BIT_INTEGER_MATH_SUPPORT
-+#define TEST_INT_TYPE integer(kind=c_int64_t)
-+#define INT_TYPE c_int64_t
-+#else
-+#define TEST_INT_TYPE integer(kind=c_int32_t)
-+#define INT_TYPE c_int32_t
-+#endif
-+
-+#ifdef HAVE_64BIT_INTEGER_MPI_SUPPORT
-+#define TEST_INT_MPI_TYPE integer(kind=c_int64_t)
-+#define INT_MPI_TYPE c_int64_t
-+#else
-+#define TEST_INT_MPI_TYPE integer(kind=c_int32_t)
-+#define INT_MPI_TYPE c_int32_t
-+#endif
-+#include "assert.h"
-+
-+program test
-+   use elpa
-+
-+   !use test_util
-+   use test_setup_mpi
-+   use test_prepare_matrix
-+   use test_read_input_parameters
-+   use test_blacs_infrastructure
-+   use test_check_correctness
-+   use test_analytic
-+   use iso_fortran_env
-+
-+#ifdef HAVE_REDIRECT
-+   use test_redirect
-+#endif
-+   implicit none
-+
-+   ! matrix dimensions
-+   TEST_INT_TYPE                     :: na, nev, nblk
-+   TEST_INT_TYPE                     :: num_groups, group_size, color, key
-+
-+   ! mpi
-+   TEST_INT_TYPE                     :: myid, nprocs
-+   TEST_INT_TYPE                     :: na_cols, na_rows  ! local matrix size
-+   TEST_INT_TYPE                     :: np_cols, np_rows  ! number of MPI processes per column/row
-+   TEST_INT_TYPE                     :: my_prow, my_pcol  ! local MPI task position (my_prow, my_pcol) in the grid (0..np_cols -1, 0..np_rows -1)
-+   TEST_INT_MPI_TYPE                 :: mpierr, ierr,mpi_sub_commMPI, myidMPI, nprocsMPI, colorMPI, keyMPI, &
-+                                        myid_subMPI, nprocs_subMPI
-+   TEST_INT_TYPE                     :: mpi_sub_comm
-+   TEST_INT_TYPE                     :: myid_sub, nprocs_sub
-+
-+   ! blacs
-+   character(len=1)            :: layout
-+   TEST_INT_TYPE                     :: my_blacs_ctxt, sc_desc(9), info, nprow, npcol
-+
-+   ! The Matrix
-+   MATRIX_TYPE, allocatable    :: a(:,:), as(:,:)
-+   ! eigenvectors
-+   MATRIX_TYPE, allocatable    :: z(:,:)
-+   ! eigenvalues
-+   EV_TYPE, allocatable        :: ev(:)
-+
-+   TEST_INT_TYPE               :: status
-+   integer(kind=c_int)         :: error_elpa
-+
-+   type(output_t)              :: write_to_file
-+   class(elpa_t), pointer      :: e
-+
-+   TEST_INT_TYPE                     :: iter
-+   character(len=5)            :: iter_string
-+
-+   status = 0
-+#ifdef WITH_MPI
-+
-+   call read_input_parameters(na, nev, nblk, write_to_file)
-+   !call setup_mpi(myid, nprocs)
-+   call mpi_init_thread(MPI_THREAD_SERIALIZED, info, mpierr)
-+   call mpi_comm_rank(mpi_comm_world, myidMPI,mpierr)
-+   call mpi_comm_size(mpi_comm_world, nprocsMPI,mpierr)
-+   myid = int(myidMPI,kind=BLAS_KIND)
-+   nprocs = int(nprocsMPI,kind=BLAS_KIND)
-+
-+   if((mod(nprocs, 4) == 0) .and. (nprocs > 4)) then
-+     num_groups = 4
-+   else if(mod(nprocs, 3) == 0) then
-+     num_groups = 3
-+   else if(mod(nprocs, 2) == 0) then
-+     num_groups = 2
-+   else
-+     num_groups = 1
-+   endif
-+
-+   group_size = nprocs / num_groups
-+
-+   if(num_groups * group_size .ne. nprocs) then 
-+     print *, "Something went wrong before splitting the communicator"
-+     stop 1
-+   else
-+     if(myid == 0) then
-+       print '((a,i0,a,i0))', "The test will split the global communicator into ", num_groups, " groups of size ", group_size
-+     endif
-+   endif
-+
-+   ! each group of processors will have the same color
-+   color = mod(myid, num_groups)
-+   ! this will determine the myid in each group
-+   key = myid/num_groups
-+   !split the communicator
-+   colorMPI=int(color,kind=MPI_KIND)
-+   keyMPI = int(key, kind=MPI_KIND)
-+   call mpi_comm_split(mpi_comm_world, colorMPI, keyMPI, mpi_sub_commMPI, mpierr)
-+   mpi_sub_comm = int(mpi_sub_commMPI,kind=BLAS_KIND)
-+   color = int(colorMPI,kind=BLAS_KIND)
-+   key = int(keyMPI,kind=BLAS_KIND)
-+   if(mpierr .ne. MPI_SUCCESS) then 
-+     print *, "communicator splitting not successfull", mpierr
-+     stop 1
-+   endif
-+
-+   call mpi_comm_rank(mpi_sub_commMPI, myid_subMPI, mpierr)
-+   call mpi_comm_size(mpi_sub_commMPI, nprocs_subMPI, mpierr)
-+   myid_sub = int(myid_subMPI,kind=BLAS_KIND)
-+   nprocs_sub = int(nprocs_subMPI,kind=BLAS_KIND)
-+
-+   !print *, "glob ", myid, nprocs, ", loc ", myid_sub, nprocs_sub, ", color ", color, ", key ", key
-+
-+   if((mpierr .ne. MPI_SUCCESS) .or. (nprocs_sub .ne. group_size) .or. (myid_sub >= group_size)) then
-+     print *, "something wrong with the sub communicators"
-+     stop 1
-+   endif
-+
-+
-+#ifdef HAVE_REDIRECT
-+   call MPI_BARRIER(MPI_COMM_WORLD, mpierr)
-+   call redirect_stdout(myid)
-+#endif
-+
-+   if (elpa_init(CURRENT_API_VERSION) /= ELPA_OK) then
-+     print *, "ELPA API version not supported"
-+     stop 1
-+   endif
-+
-+   layout = 'C'
-+   do np_cols = NINT(SQRT(REAL(nprocs_sub))),2,-1
-+      if(mod(nprocs_sub,np_cols) == 0 ) exit
-+   enddo
-+   np_rows = nprocs_sub/np_cols
-+   assert(nprocs_sub == np_rows * np_cols)
-+   assert(nprocs == np_rows * np_cols * num_groups)
-+
-+   if (myid == 0) then
-+     print '((a,i0))', 'Matrix size: ', na
-+     print '((a,i0))', 'Num eigenvectors: ', nev
-+     print '((a,i0))', 'Blocksize: ', nblk
-+     print '(a)',      'Process layout: ' // layout
-+     print *,''
-+   endif
-+   if (myid_sub == 0) then
-+     print '(4(a,i0))','GROUP ', color, ': Number of processor rows=',np_rows,', cols=',np_cols,', total=',nprocs_sub
-+   endif
-+
-+   ! USING the subcommunicator
-+   call set_up_blacsgrid(int(mpi_sub_comm,kind=BLAS_KIND), np_rows, np_cols, layout, &
-+                         my_blacs_ctxt, my_prow, my_pcol)
-+
-+   call set_up_blacs_descriptor(na, nblk, my_prow, my_pcol, np_rows, np_cols, &
-+                                na_rows, na_cols, sc_desc, my_blacs_ctxt, info)
-+
-+   allocate(a (na_rows,na_cols))
-+   allocate(as(na_rows,na_cols))
-+   allocate(z (na_rows,na_cols))
-+   allocate(ev(na))
-+
-+   a(:,:) = 0.0
-+   z(:,:) = 0.0
-+   ev(:) = 0.0
-+
-+   !call prepare_matrix_analytic(na, a, nblk, myid_sub, np_rows, np_cols, my_prow, my_pcol, print_times=.false.)
-+   call prepare_matrix_random(na, myid_sub, sc_desc, a, z, as)
-+   as(:,:) = a(:,:)
-+
-+   e => elpa_allocate(error_elpa)
-+   call set_basic_params(e, na, nev, na_rows, na_cols, mpi_sub_comm, my_prow, my_pcol)
-+
-+   call e%set("timings",1, error_elpa)
-+
-+   call e%set("debug",1, error_elpa)
-+#if TEST_NVIDIA_GPU == 1 || (TEST_NVIDIA_GPU == 0) && (TEST_AMD_GPU == 0) && (TEST_INTEL_GPU == 0)
-+   call e%set("nvidia-gpu", 0, error_elpa)
-+#endif
-+#if TEST_INTEL_GPU == 1
-+   call e%set("intel-gpu", 0, error_elpa)
-+#endif
-+   !call e%set("max_stored_rows", 15, error_elpa)
-+
-+   assert_elpa_ok(e%setup())
-+
-+
-+
-+!   if(myid == 0) print *, "parameters of e"
-+!   call e%print_all_parameters()
-+!   if(myid == 0) print *, ""
-+
-+
-+   call e%timer_start("eigenvectors")
-+   call e%eigenvectors(a, ev, z, error_elpa)
-+   call e%timer_stop("eigenvectors")
-+
-+   assert_elpa_ok(error_elpa)
-+
-+   !status = check_correctness_analytic(na, nev, ev, z, nblk, myid_sub, np_rows, np_cols, my_prow, my_pcol, &
-+    !                   .true., .true., print_times=.false.)
-+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid_sub, &
-+                    np_rows,np_cols, my_prow, my_pcol)
-+   if (status /= 0) &
-+     print *, "processor ", myid, ": Result incorrect for processor group ", color
-+
-+   if (myid .eq. 0) then
-+     print *, "Showing times of one goup only"
-+     call e%print_times("eigenvectors")
-+   endif
-+
-+   call elpa_deallocate(e, error_elpa)
-+
-+   deallocate(a)
-+   deallocate(as)
-+   deallocate(z)
-+   deallocate(ev)
-+
-+   call elpa_uninit(error_elpa)
-+
-+   call blacs_gridexit(my_blacs_ctxt)
-+   call mpi_finalize(mpierr)
-+
-+#endif
-+   call exit(status)
-+
-+contains
-+   subroutine set_basic_params(elpa, na, nev, na_rows, na_cols, communicator, my_prow, my_pcol)
-+     use iso_c_binding
-+     implicit none
-+     class(elpa_t), pointer      :: elpa
-+     TEST_INT_TYPE, intent(in)         :: na, nev, na_rows, na_cols, my_prow, my_pcol, communicator
-+
-+#ifdef WITH_MPI
-+     call elpa%set("na", int(na,kind=c_int), error_elpa)
-+     assert_elpa_ok(error_elpa)
-+     call elpa%set("nev", int(nev,kind=c_int), error_elpa)
-+     assert_elpa_ok(error_elpa)
-+     call elpa%set("local_nrows", int(na_rows,kind=c_int), error_elpa)
-+     assert_elpa_ok(error_elpa)
-+     call elpa%set("local_ncols", int(na_cols,kind=c_int), error_elpa)
-+     assert_elpa_ok(error_elpa)
-+     call elpa%set("nblk", int(nblk,kind=c_int), error_elpa)
-+     assert_elpa_ok(error_elpa)
-+
-+     call elpa%set("mpi_comm_parent", int(communicator,kind=c_int), error_elpa)
-+     assert_elpa_ok(error_elpa)
-+     call elpa%set("process_row", int(my_prow,kind=c_int), error_elpa)
-+     assert_elpa_ok(error_elpa)
-+     call elpa%set("process_col", int(my_pcol,kind=c_int), error_elpa)
-+     assert_elpa_ok(error_elpa)
-+#endif
-+   end subroutine
-+
-+end program
-diff -ruN elpa-new_release_2021.11.001/examples/Makefile_hybrid elpa-new_release_2021.11.001_ok/examples/Makefile_hybrid
---- elpa-new_release_2021.11.001/examples/Makefile_hybrid	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/Makefile_hybrid	2022-01-28 09:56:18.548921000 +0100
-@@ -0,0 +1,24 @@
-+# MPICH, that is IntelMPI or ParaStationMPI
-+SCALAPACK_LIB = -lmkl_scalapack_lp64 -lmkl_blacs_intelmpi_lp64
-+# OpenMPI
-+# SCALAPACK_LIB = -lmkl_scalapack_lp64 $(MKLROOT)/lib/intel64/libmkl_blacs_openmpi_lp64.a
-+LAPACK_LIB =
-+# Intel compiler
-+MKL = -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lpthread -lstdc++
-+# GCC
-+# MKL = -lmkl_gf_lp64 -lmkl_gnu_thread -lmkl_core -lgomp -lpthread -lstdc++ -lm
-+F90 = mpif90 -O3 -qopenmp -I$(ELPA_MODULES_OPENMP) -I$(ELPA_INCLUDE_OPENMP) -I$(ELPA_INCLUDE_OPENMP)/elpa
-+# GCC
-+# F90 = mpif90 -O3 -fopenmp -I$(ELPA_MODULES_OPENMP) -I$(ELPA_INCLUDE_OPENMP) -I$(ELPA_INCLUDE_OPENMP)/elpa
-+LIBS = -L$(ELPA_LIB_OPENMP) -lelpa_openmp -lelpatest_openmp -lelpa $(SCALAPACK_LIB) $(MKL)
-+CC            = mpicc -O3 -qopenmp
-+# GCC
-+# CC            = mpicc -O3 -fopenmp
-+
-+all: test_real_e1_omp test_real_e2_omp
-+
-+test_real_e1_omp: test_real_e1.F90
-+	$(F90) -DWITH_OPENMP_TRADITIONAL -o $@ test_real_e1.F90 $(LIBS)
-+
-+test_real_e2_omp: test_real_e2.F90
-+	$(F90) -DWITH_OPENMP_TRADITIONAL -o $@ test_real_e2.F90 $(LIBS)
-diff -ruN elpa-new_release_2021.11.001/examples/Makefile_pure elpa-new_release_2021.11.001_ok/examples/Makefile_pure
---- elpa-new_release_2021.11.001/examples/Makefile_pure	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/Makefile_pure	2022-01-26 09:43:16.599164000 +0100
-@@ -0,0 +1,20 @@
-+# MPICH, that is IntelMPI or ParaStationMPI
-+SCALAPACK_LIB = -lmkl_scalapack_lp64 -lmkl_blacs_intelmpi_lp64
-+# OpenMPI
-+# SCALAPACK_LIB = -lmkl_scalapack_lp64 $(MKLROOT)/lib/intel64/libmkl_blacs_openmpi_lp64.a
-+LAPACK_LIB =
-+# Intel compiler
-+MKL = -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -liomp5 -lpthread -lstdc++
-+# GCC
-+# MKL = -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lgomp -lpthread -lstdc++ -lm
-+F90 = mpif90 -O3 -I$(ELPA_MODULES) -I$(ELPA_INCLUDE) -I$(ELPA_INCLUDE)/elpa
-+LIBS = -L$(ELPA_LIB) -lelpa -lelpatest $(SCALAPACK_LIB) $(MKL)
-+CC            = mpicc -O3
-+
-+all: test_real_e1 test_real_e2
-+
-+test_real_e1: test_real_e1.F90
-+	$(F90) -o $@ test_real_e1.F90 $(LIBS)
-+
-+test_real_e2: test_real_e2.F90
-+	$(F90) -o $@ test_real_e2.F90 $(LIBS)
-diff -ruN elpa-new_release_2021.11.001/examples/Makefile_pure_cuda elpa-new_release_2021.11.001_ok/examples/Makefile_pure_cuda
---- elpa-new_release_2021.11.001/examples/Makefile_pure_cuda	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/Makefile_pure_cuda	2022-01-26 09:43:16.600617000 +0100
-@@ -0,0 +1,20 @@
-+# MPICH, that is IntelMPI or ParaStationMPI
-+SCALAPACK_LIB = -lmkl_scalapack_lp64 -lmkl_blacs_intelmpi_lp64
-+# OpenMPI
-+# SCALAPACK_LIB = -lmkl_scalapack_lp64 $(MKLROOT)/lib/intel64/libmkl_blacs_openmpi_lp64.a
-+LAPACK_LIB =
-+# Intel compiler
-+MKL = -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -liomp5 -lpthread -lstdc++
-+# GCC
-+# MKL = -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lgomp -lpthread -lstdc++ -lm
-+F90 = mpif90 -O3 -I$(ELPA_MODULES) -I$(ELPA_INCLUDE) -I$(ELPA_INCLUDE)/elpa
-+LIBS = -L$(ELPA_LIB) -lelpa -lelpatest $(SCALAPACK_LIB) $(MKL) -lcudart
-+CC            = mpicc -O3
-+
-+all: test_real_e1 test_real_e2
-+
-+test_real_e1: test_real_e1.F90
-+	$(F90) -DCUDA -o $@ test_real_e1.F90 $(LIBS)
-+
-+test_real_e2: test_real_e2.F90
-+	$(F90) -DCUDA -DCUDAKERNEL -o $@ test_real_e2.F90 $(LIBS)
-diff -ruN elpa-new_release_2021.11.001/examples/shared/GPU/CUDA/test_cuda.F90 elpa-new_release_2021.11.001_ok/examples/shared/GPU/CUDA/test_cuda.F90
---- elpa-new_release_2021.11.001/examples/shared/GPU/CUDA/test_cuda.F90	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/shared/GPU/CUDA/test_cuda.F90	2022-01-26 10:10:58.319812000 +0100
-@@ -0,0 +1,455 @@
-+!    Copyright 2014, A. Marek
-+!
-+!    This file is part of ELPA.
-+!
-+!    The ELPA library was originally created by the ELPA consortium,
-+!    consisting of the following organizations:
-+!
-+!    - Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+!      Informatik,
-+!    - Technische Universität München, Lehrstuhl für Informatik mit
-+!      Schwerpunkt Wissenschaftliches Rechnen ,
-+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+!      and
-+!    - IBM Deutschland GmbH
-+!
-+!
-+!    More information can be found here:
-+!    http://elpa.mpcdf.mpg.de/
-+!
-+!    ELPA is free software: you can redistribute it and/or modify
-+!    it under the terms of the version 3 of the license of the
-+!    GNU Lesser General Public License as published by the Free
-+!    Software Foundation.
-+!
-+!    ELPA is distributed in the hope that it will be useful,
-+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+!    GNU Lesser General Public License for more details.
-+!
-+!    You should have received a copy of the GNU Lesser General Public License
-+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+!
-+!    ELPA reflects a substantial effort on the part of the original
-+!    ELPA consortium, and we ask you to respect the spirit of the
-+!    license that we chose: i.e., please contribute any changes you
-+!    may have back to the original ELPA library distribution, and keep
-+!    any derivatives of ELPA under the same license that we chose for
-+!    the original distribution, the GNU Lesser General Public License.
-+!
-+! This file was written by A. Marek, MPCDF
-+
-+
-+#include "config-f90.h"
-+module test_cuda_functions
-+  use, intrinsic :: iso_c_binding
-+  use precision_for_tests
-+  implicit none
-+
-+  public
-+
-+  integer(kind=ik) :: cudaMemcpyHostToDevice
-+  integer(kind=ik) :: cudaMemcpyDeviceToHost
-+  integer(kind=ik) :: cudaMemcpyDeviceToDevice
-+  integer(kind=ik) :: cudaHostRegisterDefault
-+  integer(kind=ik) :: cudaHostRegisterPortable
-+  integer(kind=ik) :: cudaHostRegisterMapped
-+
-+  ! TODO global variable, has to be changed
-+  integer(kind=C_intptr_T) :: cublasHandle = -1
-+
-+  ! functions to set and query the CUDA devices
-+  interface
-+    function cuda_setdevice_c(n) result(istat) &
-+             bind(C, name="cudaSetDeviceFromC")
-+
-+      use, intrinsic :: iso_c_binding
-+      implicit none
-+      integer(kind=C_INT), value    :: n
-+      integer(kind=C_INT)           :: istat
-+    end function cuda_setdevice_c
-+  end interface
-+
-+  ! functions to copy CUDA memory
-+  interface
-+    function cuda_memcpyDeviceToDevice_c() result(flag) &
-+            bind(C, name="cudaMemcpyDeviceToDeviceFromC")
-+      use, intrinsic :: iso_c_binding
-+      implicit none
-+      integer(kind=c_int) :: flag
-+    end function
-+  end interface
-+
-+  interface
-+    function cuda_memcpyHostToDevice_c() result(flag) &
-+             bind(C, name="cudaMemcpyHostToDeviceFromC")
-+      use, intrinsic :: iso_c_binding
-+      implicit none
-+      integer(kind=c_int) :: flag
-+    end function
-+  end interface
-+
-+  interface
-+    function cuda_memcpyDeviceToHost_c() result(flag) &
-+             bind(C, name="cudaMemcpyDeviceToHostFromC")
-+      use, intrinsic :: iso_c_binding
-+      implicit none
-+      integer(kind=c_int) :: flag
-+    end function
-+  end interface
-+
-+  interface
-+    function cuda_hostRegisterDefault_c() result(flag) &
-+             bind(C, name="cudaHostRegisterDefaultFromC")
-+      use, intrinsic :: iso_c_binding
-+      implicit none
-+      integer(kind=c_int) :: flag
-+    end function
-+  end interface
-+
-+  interface
-+    function cuda_hostRegisterPortable_c() result(flag) &
-+             bind(C, name="cudaHostRegisterPortableFromC")
-+      use, intrinsic :: iso_c_binding
-+      implicit none
-+      integer(kind=c_int) :: flag
-+    end function
-+  end interface
-+
-+  interface
-+    function cuda_hostRegisterMapped_c() result(flag) &
-+             bind(C, name="cudaHostRegisterMappedFromC")
-+      use, intrinsic :: iso_c_binding
-+      implicit none
-+      integer(kind=c_int) :: flag
-+    end function
-+  end interface
-+
-+  interface
-+    function cuda_memcpy_intptr_c(dst, src, size, dir) result(istat) &
-+             bind(C, name="cudaMemcpyFromC")
-+
-+      use, intrinsic :: iso_c_binding
-+
-+      implicit none
-+      integer(kind=C_intptr_t), value              :: dst
-+      integer(kind=C_intptr_t), value              :: src
-+      integer(kind=c_intptr_t), intent(in), value    :: size
-+      integer(kind=C_INT), intent(in), value       :: dir
-+      integer(kind=C_INT)                          :: istat
-+
-+    end function cuda_memcpy_intptr_c
-+  end interface
-+
-+  interface
-+    function cuda_memcpy_cptr_c(dst, src, size, dir) result(istat) &
-+             bind(C, name="cudaMemcpyFromC")
-+
-+      use, intrinsic :: iso_c_binding
-+
-+      implicit none
-+      type(c_ptr), value                           :: dst
-+      type(c_ptr), value                           :: src
-+      integer(kind=c_intptr_t), intent(in), value  :: size
-+      integer(kind=C_INT), intent(in), value       :: dir
-+      integer(kind=C_INT)                          :: istat
-+
-+    end function cuda_memcpy_cptr_c
-+  end interface
-+
-+  interface
-+    function cuda_memcpy_mixed_c(dst, src, size, dir) result(istat) &
-+             bind(C, name="cudaMemcpyFromC")
-+
-+      use, intrinsic :: iso_c_binding
-+
-+      implicit none
-+      type(c_ptr), value                           :: dst
-+      integer(kind=C_intptr_t), value              :: src
-+      integer(kind=c_intptr_t), intent(in), value  :: size
-+      integer(kind=C_INT), intent(in), value       :: dir
-+      integer(kind=C_INT)                          :: istat
-+
-+    end function cuda_memcpy_mixed_c
-+  end interface
-+
-+  ! functions to allocate and free CUDA memory
-+
-+  interface
-+    function cuda_free_intptr_c(a) result(istat) &
-+             bind(C, name="cudaFreeFromC")
-+
-+      use, intrinsic :: iso_c_binding
-+
-+      implicit none
-+      integer(kind=C_intptr_T), value  :: a
-+      integer(kind=C_INT)              :: istat
-+
-+    end function cuda_free_intptr_c
-+  end interface
-+
-+  interface
-+    function cuda_free_cptr_c(a) result(istat) &
-+             bind(C, name="cudaFreeFromC")
-+
-+      use, intrinsic :: iso_c_binding
-+
-+      implicit none
-+      type(c_ptr), value  :: a
-+      integer(kind=C_INT)              :: istat
-+
-+    end function cuda_free_cptr_c
-+  end interface
-+
-+  interface cuda_memcpy
-+    module procedure cuda_memcpy_intptr
-+    module procedure cuda_memcpy_cptr
-+    module procedure cuda_memcpy_mixed
-+  end interface
-+
-+  interface cuda_free
-+    module procedure cuda_free_intptr
-+    module procedure cuda_free_cptr
-+  end interface
-+
-+  interface
-+    function cuda_malloc_intptr_c(a, width_height) result(istat) &
-+             bind(C, name="cudaMallocFromC")
-+
-+      use, intrinsic :: iso_c_binding
-+      implicit none
-+
-+      integer(kind=C_intptr_T)                    :: a
-+      integer(kind=c_intptr_t), intent(in), value :: width_height
-+      integer(kind=C_INT)                         :: istat
-+
-+    end function cuda_malloc_intptr_c
-+  end interface
-+
-+  interface
-+    function cuda_malloc_cptr_c(a, width_height) result(istat) &
-+             bind(C, name="cudaMallocFromC")
-+
-+      use, intrinsic :: iso_c_binding
-+      implicit none
-+
-+      type(c_ptr)                    :: a
-+      integer(kind=c_intptr_t), intent(in), value :: width_height
-+      integer(kind=C_INT)                         :: istat
-+
-+    end function cuda_malloc_cptr_c
-+  end interface
-+
-+  !interface cuda_malloc
-+  !  module procedure cuda_malloc_intptr
-+  !  module procedure cuda_malloc_cptr
-+  !end interface
-+
-+  contains
-+
-+    function cuda_setdevice(n) result(success)
-+      use, intrinsic :: iso_c_binding
-+
-+      implicit none
-+
-+      integer(kind=ik), intent(in)  :: n
-+      logical                       :: success
-+#ifdef WITH_NVIDIA_GPU_VERSION
-+      success = cuda_setdevice_c(int(n,kind=c_int)) /= 0
-+#else
-+      success = .true.
-+#endif
-+    end function cuda_setdevice
-+
-+
-+    function cuda_malloc_intptr(a, width_height) result(success)
-+
-+     use, intrinsic :: iso_c_binding
-+     implicit none
-+
-+     integer(kind=c_intptr_t)                  :: a
-+     integer(kind=c_intptr_t), intent(in)      :: width_height
-+     logical                                   :: success
-+#ifdef WITH_NVIDIA_GPU_VERSION
-+     success = cuda_malloc_intptr_c(a, width_height) /= 0
-+#else
-+     success = .true.
-+#endif
-+   end function
-+
-+
-+    function cuda_malloc_cptr(a, width_height) result(success)
-+
-+     use, intrinsic :: iso_c_binding
-+     implicit none
-+
-+     type(c_ptr)                  :: a
-+     integer(kind=c_intptr_t), intent(in)      :: width_height
-+     logical                                   :: success
-+#ifdef WITH_NVIDIA_GPU_VERSION
-+     success = cuda_malloc_cptr_c(a, width_height) /= 0
-+#else
-+     success = .true.
-+#endif
-+   end function
-+
-+   function cuda_free_intptr(a) result(success)
-+
-+     use, intrinsic :: iso_c_binding
-+
-+     implicit none
-+     integer(kind=C_intptr_T) :: a
-+     logical                  :: success
-+#ifdef WITH_NVIDIA_GPU_VERSION
-+     success = cuda_free_intptr_c(a) /= 0
-+#else
-+     success = .true.
-+#endif
-+   end function cuda_free_intptr
-+
-+   function cuda_free_cptr(a) result(success)
-+
-+     use, intrinsic :: iso_c_binding
-+
-+     implicit none
-+     type(c_ptr) :: a
-+     logical                  :: success
-+#ifdef WITH_NVIDIA_GPU_VERSION
-+     success = cuda_free_cptr_c(a) /= 0
-+#else
-+     success = .true.
-+#endif
-+   end function cuda_free_cptr
-+
-+ ! functions to memcopy CUDA memory
-+
-+ function cuda_memcpyDeviceToDevice() result(flag)
-+   use, intrinsic :: iso_c_binding
-+   implicit none
-+   integer(kind=ik) :: flag
-+#ifdef WITH_NVIDIA_GPU_VERSION
-+   flag = int(cuda_memcpyDeviceToDevice_c())
-+#else
-+   flag = 0
-+#endif
-+ end function
-+
-+ function cuda_memcpyHostToDevice() result(flag)
-+   use, intrinsic :: iso_c_binding
-+   use precision_for_tests
-+   implicit none
-+   integer(kind=ik) :: flag
-+#ifdef WITH_NVIDIA_GPU_VERSION
-+   flag = int(cuda_memcpyHostToDevice_c())
-+#else
-+   flag = 0
-+#endif
-+ end function
-+
-+ function cuda_memcpyDeviceToHost() result(flag)
-+   use, intrinsic :: iso_c_binding
-+   use precision_for_tests
-+   implicit none
-+   integer(kind=ik) :: flag
-+#ifdef WITH_NVIDIA_GPU_VERSION
-+   flag = int( cuda_memcpyDeviceToHost_c())
-+#else
-+   flag = 0
-+#endif
-+ end function
-+
-+ function cuda_hostRegisterDefault() result(flag)
-+   use, intrinsic :: iso_c_binding
-+   use precision_for_tests
-+   implicit none
-+   integer(kind=ik) :: flag
-+#ifdef WITH_NVIDIA_GPU_VERSION
-+   flag = int(cuda_hostRegisterDefault_c())
-+#else
-+   flag = 0
-+#endif
-+ end function
-+
-+ function cuda_hostRegisterPortable() result(flag)
-+   use, intrinsic :: iso_c_binding
-+   use precision_for_tests
-+   implicit none
-+   integer(kind=ik) :: flag
-+#ifdef WITH_NVIDIA_GPU_VERSION
-+   flag = int(cuda_hostRegisterPortable_c())
-+#else
-+   flag = 0
-+#endif
-+ end function
-+
-+ function cuda_hostRegisterMapped() result(flag)
-+   use, intrinsic :: iso_c_binding
-+   use precision_for_tests
-+   implicit none
-+   integer(kind=ik) :: flag
-+#ifdef WITH_NVIDIA_GPU_VERSION
-+   flag = int(cuda_hostRegisterMapped_c())
-+#else
-+   flag = 0
-+#endif
-+ end function
-+
-+ function cuda_memcpy_intptr(dst, src, size, dir) result(success)
-+
-+      use, intrinsic :: iso_c_binding
-+
-+      implicit none
-+      integer(kind=C_intptr_t)              :: dst
-+      integer(kind=C_intptr_t)              :: src
-+      integer(kind=c_intptr_t), intent(in)  :: size
-+      integer(kind=C_INT), intent(in)       :: dir
-+      logical :: success
-+
-+#ifdef WITH_NVIDIA_GPU_VERSION
-+        success = cuda_memcpy_intptr_c(dst, src, size, dir) /= 0
-+#else
-+        success = .true.
-+#endif
-+    end function
-+
-+ function cuda_memcpy_cptr(dst, src, size, dir) result(success)
-+
-+      use, intrinsic :: iso_c_binding
-+
-+      implicit none
-+      type(c_ptr)                           :: dst
-+      type(c_ptr)                           :: src
-+      integer(kind=c_intptr_t), intent(in)  :: size
-+      integer(kind=C_INT), intent(in)       :: dir
-+      logical :: success
-+
-+#ifdef WITH_NVIDIA_GPU_VERSION
-+        success = cuda_memcpy_cptr_c(dst, src, size, dir) /= 0
-+#else
-+        !success = .true.
-+         success = .false.
-+#endif
-+    end function
-+
-+ function cuda_memcpy_mixed(dst, src, size, dir) result(success)
-+
-+      use, intrinsic :: iso_c_binding
-+
-+      implicit none
-+      type(c_ptr)                           :: dst
-+      integer(kind=C_intptr_t)              :: src
-+      integer(kind=c_intptr_t), intent(in)  :: size
-+      integer(kind=C_INT), intent(in)       :: dir
-+      logical :: success
-+
-+#ifdef WITH_NVIDIA_GPU_VERSION
-+        success = cuda_memcpy_mixed_c(dst, src, size, dir) /= 0
-+#else
-+        success = .true.
-+#endif
-+    end function
-+
-+end module test_cuda_functions
-diff -ruN elpa-new_release_2021.11.001/examples/shared/GPU/CUDA/test_cudaFunctions.cu elpa-new_release_2021.11.001_ok/examples/shared/GPU/CUDA/test_cudaFunctions.cu
---- elpa-new_release_2021.11.001/examples/shared/GPU/CUDA/test_cudaFunctions.cu	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/shared/GPU/CUDA/test_cudaFunctions.cu	2022-01-26 10:10:58.320705000 +0100
-@@ -0,0 +1,152 @@
-+//
-+//    Copyright 2014, A. Marek
-+//
-+//    This file is part of ELPA.
-+//
-+//    The ELPA library was originally created by the ELPA consortium,
-+//    consisting of the following organizations:
-+//
-+//    - Max Planck Computing and Data Facility (MPCDF), formerly known as
-+//      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+//    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+//      Informatik,
-+//    - Technische Universität München, Lehrstuhl für Informatik mit
-+//      Schwerpunkt Wissenschaftliches Rechnen ,
-+//    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+//    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+//      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+//      and
-+//    - IBM Deutschland GmbH
-+//
-+//    This particular source code file contains additions, changes and
-+//    enhancements authored by Intel Corporation which is not part of
-+//    the ELPA consortium.
-+//
-+//    More information can be found here:
-+//    http://elpa.mpcdf.mpg.de/
-+//
-+//    ELPA is free software: you can redistribute it and/or modify
-+//    it under the terms of the version 3 of the license of the
-+//    GNU Lesser General Public License as published by the Free
-+//    Software Foundation.
-+//
-+//    ELPA is distributed in the hope that it will be useful,
-+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+//    GNU Lesser General Public License for more details.
-+//
-+//    You should have received a copy of the GNU Lesser General Public License
-+//    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+//
-+//    ELPA reflects a substantial effort on the part of the original
-+//    ELPA consortium, and we ask you to respect the spirit of the
-+//    license that we chose: i.e., please contribute any changes you
-+//    may have back to the original ELPA library distribution, and keep
-+//    any derivatives of ELPA under the same license that we chose for
-+//    the original distribution, the GNU Lesser General Public License.
-+//
-+//
-+// --------------------------------------------------------------------------------------------------
-+//
-+// This file was written by A. Marek, MPCDF
-+#include "config-f90.h"
-+
-+#include <stdio.h>
-+#include <math.h>
-+#include <stdio.h>
-+
-+#include <stdlib.h>
-+#include <string.h>
-+#include <time.h>
-+#include <alloca.h>
-+#include <stdint.h>
-+#include <complex.h>
-+#ifdef WITH_NVIDIA_GPU_VERSION
-+#include <cublas_v2.h>
-+#endif
-+
-+
-+#define errormessage(x, ...) do { fprintf(stderr, "%s:%d " x, __FILE__, __LINE__, __VA_ARGS__ ); } while (0)
-+
-+#ifdef DEBUG_CUDA
-+#define debugmessage(x, ...) do { fprintf(stderr, "%s:%d " x, __FILE__, __LINE__, __VA_ARGS__ ); } while (0)
-+#else
-+#define debugmessage(x, ...)
-+#endif
-+
-+#ifdef WITH_NVIDIA_GPU_VERSION
-+extern "C" {
-+
-+  int cudaSetDeviceFromC(int n) {
-+
-+    cudaError_t cuerr = cudaSetDevice(n);
-+    if (cuerr != cudaSuccess) {
-+      errormessage("Error in cudaSetDevice: %s\n",cudaGetErrorString(cuerr));
-+      return 0;
-+    }
-+    return 1;
-+  }
-+
-+  int cudaMallocFromC(intptr_t *a, size_t width_height) {
-+
-+    cudaError_t cuerr = cudaMalloc((void **) a, width_height);
-+#ifdef DEBUG_CUDA
-+    printf("CUDA Malloc,  pointer address: %p, size: %d \n", *a, width_height);
-+#endif
-+    if (cuerr != cudaSuccess) {
-+      errormessage("Error in cudaMalloc: %s\n",cudaGetErrorString(cuerr));
-+      return 0;
-+    }
-+    return 1;
-+  }
-+
-+  int cudaFreeFromC(intptr_t *a) {
-+#ifdef DEBUG_CUDA
-+    printf("CUDA Free, pointer address: %p \n", a);
-+#endif
-+    cudaError_t cuerr = cudaFree(a);
-+
-+    if (cuerr != cudaSuccess) {
-+      errormessage("Error in cudaFree: %s\n",cudaGetErrorString(cuerr));
-+      return 0;
-+    }
-+    return 1;
-+  }
-+
-+  int cudaMemcpyFromC(intptr_t *dest, intptr_t *src, size_t count, int dir) {
-+
-+    cudaError_t cuerr = cudaMemcpy( dest, src, count, (cudaMemcpyKind)dir);
-+    if (cuerr != cudaSuccess) {
-+      errormessage("Error in cudaMemcpy: %s\n",cudaGetErrorString(cuerr));
-+      return 0;
-+    }
-+    return 1;
-+  }
-+
-+  int cudaMemcpyDeviceToDeviceFromC(void) {
-+      int val = cudaMemcpyDeviceToDevice;
-+      return val;
-+  }
-+  int cudaMemcpyHostToDeviceFromC(void) {
-+      int val = cudaMemcpyHostToDevice;
-+      return val;
-+  }
-+  int cudaMemcpyDeviceToHostFromC(void) {
-+      int val = cudaMemcpyDeviceToHost;
-+      return val;
-+  }
-+  int cudaHostRegisterDefaultFromC(void) {
-+      int val = cudaHostRegisterDefault;
-+      return val;
-+  }
-+  int cudaHostRegisterPortableFromC(void) {
-+      int val = cudaHostRegisterPortable;
-+      return val;
-+  }
-+  int cudaHostRegisterMappedFromC(void) {
-+      int val = cudaHostRegisterMapped;
-+      return val;
-+  }
-+
-+}
-+#endif /* TEST_NVIDIA_GPU == 1 */
-diff -ruN elpa-new_release_2021.11.001/examples/shared/GPU/ROCm/test_hip.F90 elpa-new_release_2021.11.001_ok/examples/shared/GPU/ROCm/test_hip.F90
---- elpa-new_release_2021.11.001/examples/shared/GPU/ROCm/test_hip.F90	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/shared/GPU/ROCm/test_hip.F90	2022-01-26 10:10:58.327011000 +0100
-@@ -0,0 +1,449 @@
-+!    Copyright 2021, A. Marek
-+!
-+!    This file is part of ELPA.
-+!
-+!    The ELPA library was originally created by the ELPA consortium,
-+!    consisting of the following organizations:
-+!
-+!    - Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+!      Informatik,
-+!    - Technische Universität München, Lehrstuhl für Informatik mit
-+!      Schwerpunkt Wissenschaftliches Rechnen ,
-+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+!      and
-+!    - IBM Deutschland GmbH
-+!
-+!
-+!    More information can be found here:
-+!    http://elpa.mpcdf.mpg.de/
-+!
-+!    ELPA is free software: you can redistribute it and/or modify
-+!    it under the terms of the version 3 of the license of the
-+!    GNU Lesser General Public License as published by the Free
-+!    Software Foundation.
-+!
-+!    ELPA is distributed in the hope that it will be useful,
-+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+!    GNU Lesser General Public License for more details.
-+!
-+!    You should have received a copy of the GNU Lesser General Public License
-+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+!
-+!    ELPA reflects a substantial effort on the part of the original
-+!    ELPA consortium, and we ask you to respect the spirit of the
-+!    license that we chose: i.e., please contribute any changes you
-+!    may have back to the original ELPA library distribution, and keep
-+!    any derivatives of ELPA under the same license that we chose for
-+!    the original distribution, the GNU Lesser General Public License.
-+!
-+! This file was written by A. Marek, MPCDF
-+
-+
-+#include "config-f90.h"
-+module test_hip_functions
-+  use, intrinsic :: iso_c_binding
-+  use precision_for_tests
-+  implicit none
-+
-+  public
-+
-+  integer(kind=ik) :: hipMemcpyHostToDevice
-+  integer(kind=ik) :: hipMemcpyDeviceToHost
-+  integer(kind=ik) :: hipMemcpyDeviceToDevice
-+  integer(kind=ik) :: hipHostRegisterDefault
-+  integer(kind=ik) :: hipHostRegisterPortable
-+  integer(kind=ik) :: hipHostRegisterMapped
-+
-+  ! TODO global variable, has to be changed
-+  integer(kind=C_intptr_T) :: rocblasHandle = -1
-+
-+  ! functions to set and query the CUDA devices
-+  interface
-+    function hip_setdevice_c(n) result(istat) &
-+             bind(C, name="hipSetDeviceFromC")
-+
-+      use, intrinsic :: iso_c_binding
-+      implicit none
-+      integer(kind=C_INT), value    :: n
-+      integer(kind=C_INT)           :: istat
-+    end function hip_setdevice_c
-+  end interface
-+
-+  ! functions to copy CUDA memory
-+  interface
-+    function hip_memcpyDeviceToDevice_c() result(flag) &
-+             bind(C, name="hipMemcpyDeviceToDeviceFromC")
-+      use, intrinsic :: iso_c_binding
-+      implicit none
-+      integer(kind=c_int) :: flag
-+    end function
-+  end interface
-+
-+  interface
-+    function hip_memcpyHostToDevice_c() result(flag) &
-+             bind(C, name="hipMemcpyHostToDeviceFromC")
-+      use, intrinsic :: iso_c_binding
-+      implicit none
-+      integer(kind=c_int) :: flag
-+    end function
-+  end interface
-+
-+  interface
-+    function hip_memcpyDeviceToHost_c() result(flag) &
-+             bind(C, name="hipMemcpyDeviceToHostFromC")
-+      use, intrinsic :: iso_c_binding
-+      implicit none
-+      integer(kind=c_int) :: flag
-+    end function
-+  end interface
-+
-+  interface
-+    function hip_hostRegisterDefault_c() result(flag) &
-+             bind(C, name="hipHostRegisterDefaultFromC")
-+      use, intrinsic :: iso_c_binding
-+      implicit none
-+      integer(kind=c_int) :: flag
-+    end function
-+  end interface
-+
-+  interface
-+    function hip_hostRegisterPortable_c() result(flag) &
-+             bind(C, name="hipHostRegisterPortableFromC")
-+      use, intrinsic :: iso_c_binding
-+      implicit none
-+      integer(kind=c_int) :: flag
-+    end function
-+  end interface
-+
-+  interface
-+    function hip_hostRegisterMapped_c() result(flag) &
-+             bind(C, name="hipHostRegisterMappedFromC")
-+      use, intrinsic :: iso_c_binding
-+      implicit none
-+      integer(kind=c_int) :: flag
-+    end function
-+  end interface
-+
-+  interface
-+    function hip_memcpy_intptr_c(dst, src, size, dir) result(istat) &
-+             bind(C, name="hipMemcpyFromC")
-+
-+      use, intrinsic :: iso_c_binding
-+
-+      implicit none
-+      integer(kind=C_intptr_t), value              :: dst
-+      integer(kind=C_intptr_t), value              :: src
-+      integer(kind=c_intptr_t), intent(in), value  :: size
-+      integer(kind=C_INT), intent(in), value       :: dir
-+      integer(kind=C_INT)                          :: istat
-+
-+    end function hip_memcpy_intptr_c
-+  end interface
-+
-+  interface
-+    function hip_memcpy_cptr_c(dst, src, size, dir) result(istat) &
-+             bind(C, name="hipMemcpyFromC")
-+
-+      use, intrinsic :: iso_c_binding
-+
-+      implicit none
-+      type(c_ptr), value                           :: dst
-+      type(c_ptr), value                           :: src
-+      integer(kind=c_intptr_t), intent(in), value  :: size
-+      integer(kind=C_INT), intent(in), value       :: dir
-+      integer(kind=C_INT)                          :: istat
-+
-+    end function hip_memcpy_cptr_c
-+  end interface
-+
-+  interface
-+    function hip_memcpy_mixed_c(dst, src, size, dir) result(istat) &
-+             bind(C, name="hipMemcpyFromC")
-+
-+      use, intrinsic :: iso_c_binding
-+
-+      implicit none
-+      type(c_ptr), value                           :: dst
-+      integer(kind=c_intptr_t), value              :: src
-+      integer(kind=c_intptr_t), intent(in), value  :: size
-+      integer(kind=C_INT), intent(in), value       :: dir
-+      integer(kind=C_INT)                          :: istat
-+
-+    end function hip_memcpy_mixed_c
-+  end interface
-+
-+  ! functions to allocate and free CUDA memory
-+
-+  interface
-+    function hip_free_intptr_c(a) result(istat) &
-+             bind(C, name="hipFreeFromC")
-+
-+      use, intrinsic :: iso_c_binding
-+
-+      implicit none
-+      integer(kind=C_intptr_T), value  :: a
-+      integer(kind=C_INT)              :: istat
-+
-+    end function hip_free_intptr_c
-+  end interface
-+
-+  interface
-+    function hip_free_cptr_c(a) result(istat) &
-+             bind(C, name="hipFreeFromC")
-+
-+      use, intrinsic :: iso_c_binding
-+
-+      implicit none
-+      type(c_ptr), value  :: a
-+      integer(kind=C_INT)              :: istat
-+
-+    end function hip_free_cptr_c
-+  end interface
-+
-+  interface hip_memcpy
-+    module procedure hip_memcpy_intptr
-+    module procedure hip_memcpy_cptr
-+    module procedure hip_memcpy_mixed
-+  end interface
-+
-+  interface hip_free
-+    module procedure hip_free_intptr
-+    module procedure hip_free_cptr
-+  end interface
-+
-+  interface
-+    function hip_malloc_intptr_c(a, width_height) result(istat) &
-+             bind(C, name="hipMallocFromC")
-+
-+      use, intrinsic :: iso_c_binding
-+      implicit none
-+
-+      integer(kind=C_intptr_T)                    :: a
-+      integer(kind=c_intptr_t), intent(in), value   :: width_height
-+      integer(kind=C_INT)                         :: istat
-+
-+    end function hip_malloc_intptr_c
-+  end interface
-+
-+  interface
-+    function hip_malloc_cptr_c(a, width_height) result(istat) &
-+             bind(C, name="hipMallocFromC")
-+
-+      use, intrinsic :: iso_c_binding
-+      implicit none
-+
-+      type(c_ptr)                    :: a
-+      integer(kind=c_intptr_t), intent(in), value   :: width_height
-+      integer(kind=C_INT)                         :: istat
-+
-+    end function hip_malloc_cptr_c
-+  end interface
-+
-+  contains
-+
-+    function hip_setdevice(n) result(success)
-+      use, intrinsic :: iso_c_binding
-+
-+      implicit none
-+
-+      integer(kind=ik), intent(in)  :: n
-+      logical                       :: success
-+#ifdef WITH_AMD_GPU_VERSION
-+      success = hip_setdevice_c(int(n,kind=c_int)) /= 0
-+#else
-+      success = .true.
-+#endif
-+    end function hip_setdevice
-+
-+    ! functions to allocate and free memory
-+
-+    function hip_malloc_intptr(a, width_height) result(success)
-+
-+     use, intrinsic :: iso_c_binding
-+     implicit none
-+
-+     integer(kind=C_intptr_t)                  :: a
-+     integer(kind=c_intptr_t), intent(in)        :: width_height
-+     logical                                   :: success
-+#ifdef WITH_AMD_GPU_VERSION
-+     success = hip_malloc_intptr_c(a, width_height) /= 0
-+#else
-+     success = .true.
-+#endif
-+   end function
-+
-+    function hip_malloc_cptr(a, width_height) result(success)
-+
-+     use, intrinsic :: iso_c_binding
-+     implicit none
-+
-+     type(c_ptr)                  :: a
-+     integer(kind=c_intptr_t), intent(in)        :: width_height
-+     logical                                   :: success
-+#ifdef WITH_AMD_GPU_VERSION
-+     success = hip_malloc_cptr_c(a, width_height) /= 0
-+#else
-+     success = .true.
-+#endif
-+   end function
-+
-+   function hip_free_intptr(a) result(success)
-+
-+     use, intrinsic :: iso_c_binding
-+
-+     implicit none
-+     integer(kind=C_intptr_T) :: a
-+     logical                  :: success
-+#ifdef WITH_AMD_GPU_VERSION
-+     success = hip_free_intptr_c(a) /= 0
-+#else
-+     success = .true.
-+#endif
-+   end function hip_free_intptr
-+
-+   function hip_free_cptr(a) result(success)
-+
-+     use, intrinsic :: iso_c_binding
-+
-+     implicit none
-+     type(c_ptr) :: a
-+     logical                  :: success
-+#ifdef WITH_AMD_GPU_VERSION
-+     success = hip_free_cptr_c(a) /= 0
-+#else
-+     success = .true.
-+#endif
-+   end function hip_free_cptr
-+
-+ ! functions to memcopy CUDA memory
-+
-+ function hip_memcpyDeviceToDevice() result(flag)
-+   use, intrinsic :: iso_c_binding
-+   implicit none
-+   integer(kind=ik) :: flag
-+#ifdef WITH_AMD_GPU_VERSION
-+   flag = int(hip_memcpyDeviceToDevice_c())
-+#else
-+   flag = 0
-+#endif
-+ end function
-+
-+ function hip_memcpyHostToDevice() result(flag)
-+   use, intrinsic :: iso_c_binding
-+   use precision_for_tests
-+   implicit none
-+   integer(kind=ik) :: flag
-+#ifdef WITH_AMD_GPU_VERSION
-+   flag = int(hip_memcpyHostToDevice_c())
-+#else
-+   flag = 0
-+#endif
-+ end function
-+
-+ function hip_memcpyDeviceToHost() result(flag)
-+   use, intrinsic :: iso_c_binding
-+   use precision_for_tests
-+   implicit none
-+   integer(kind=ik) :: flag
-+#ifdef WITH_AMD_GPU_VERSION
-+   flag = int( hip_memcpyDeviceToHost_c())
-+#else
-+   flag = 0
-+#endif
-+ end function
-+
-+ function hip_hostRegisterDefault() result(flag)
-+   use, intrinsic :: iso_c_binding
-+   use precision_for_tests
-+   implicit none
-+   integer(kind=ik) :: flag
-+#ifdef WITH_AMD_GPU_VERSION
-+   flag = int(hip_hostRegisterDefault_c())
-+#else
-+   flag = 0
-+#endif
-+ end function
-+
-+ function hip_hostRegisterPortable() result(flag)
-+   use, intrinsic :: iso_c_binding
-+   use precision_for_tests
-+   implicit none
-+   integer(kind=ik) :: flag
-+#ifdef WITH_AMD_GPU_VERSION
-+   flag = int(hip_hostRegisterPortable_c())
-+#else
-+   flag = 0
-+#endif
-+ end function
-+
-+ function hip_hostRegisterMapped() result(flag)
-+   use, intrinsic :: iso_c_binding
-+   use precision_for_tests
-+   implicit none
-+   integer(kind=ik) :: flag
-+#ifdef WITH_AMD_GPU_VERSION
-+   flag = int(hip_hostRegisterMapped_c())
-+#else
-+   flag = 0
-+#endif
-+ end function
-+
-+ function hip_memcpy_intptr(dst, src, size, dir) result(success)
-+
-+      use, intrinsic :: iso_c_binding
-+
-+      implicit none
-+      integer(kind=C_intptr_t)              :: dst
-+      integer(kind=C_intptr_t)              :: src
-+      integer(kind=c_intptr_t), intent(in)    :: size
-+      integer(kind=C_INT), intent(in)       :: dir
-+      logical :: success
-+
-+#ifdef WITH_AMD_GPU_VERSION
-+        success = hip_memcpy_intptr_c(dst, src, size, dir) /= 0
-+#else
-+        success = .true.
-+#endif
-+    end function
-+
-+ function hip_memcpy_cptr(dst, src, size, dir) result(success)
-+
-+      use, intrinsic :: iso_c_binding
-+
-+      implicit none
-+      type(c_ptr)                           :: dst
-+      type(c_ptr)                           :: src
-+      integer(kind=c_intptr_t), intent(in)  :: size
-+      integer(kind=C_INT), intent(in)       :: dir
-+      logical :: success
-+
-+#ifdef WITH_AMD_GPU_VERSION
-+        success = hip_memcpy_cptr_c(dst, src, size, dir) /= 0
-+#else
-+        success = .true.
-+#endif
-+    end function
-+
-+ function hip_memcpy_mixed(dst, src, size, dir) result(success)
-+
-+      use, intrinsic :: iso_c_binding
-+
-+      implicit none
-+      type(c_ptr)                           :: dst
-+      integer(kind=c_intptr_t)              :: src
-+      integer(kind=c_intptr_t), intent(in)  :: size
-+      integer(kind=C_INT), intent(in)       :: dir
-+      logical :: success
-+
-+#ifdef WITH_AMD_GPU_VERSION
-+        success = hip_memcpy_mixed_c(dst, src, size, dir) /= 0
-+#else
-+        success = .true.
-+#endif
-+    end function
-+
-+end module test_hip_functions
-diff -ruN elpa-new_release_2021.11.001/examples/shared/GPU/ROCm/test_rocmFunctions.cpp elpa-new_release_2021.11.001_ok/examples/shared/GPU/ROCm/test_rocmFunctions.cpp
---- elpa-new_release_2021.11.001/examples/shared/GPU/ROCm/test_rocmFunctions.cpp	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/shared/GPU/ROCm/test_rocmFunctions.cpp	2022-01-26 10:10:58.328343000 +0100
-@@ -0,0 +1,153 @@
-+//
-+//    Copyright 2021, A. Marek
-+//
-+//    This file is part of ELPA.
-+//
-+//    The ELPA library was originally created by the ELPA consortium,
-+//    consisting of the following organizations:
-+//
-+//    - Max Planck Computing and Data Facility (MPCDF), formerly known as
-+//      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+//    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+//      Informatik,
-+//    - Technische Universität München, Lehrstuhl für Informatik mit
-+//      Schwerpunkt Wissenschaftliches Rechnen ,
-+//    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+//    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+//      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+//      and
-+//    - IBM Deutschland GmbH
-+//
-+//    This particular source code file contains additions, changes and
-+//    enhancements authored by Intel Corporation which is not part of
-+//    the ELPA consortium.
-+//
-+//    More information can be found here:
-+//    http://elpa.mpcdf.mpg.de/
-+//
-+//    ELPA is free software: you can redistribute it and/or modify
-+//    it under the terms of the version 3 of the license of the
-+//    GNU Lesser General Public License as published by the Free
-+//    Software Foundation.
-+//
-+//    ELPA is distributed in the hope that it will be useful,
-+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+//    GNU Lesser General Public License for more details.
-+//
-+//    You should have received a copy of the GNU Lesser General Public License
-+//    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+//
-+//    ELPA reflects a substantial effort on the part of the original
-+//    ELPA consortium, and we ask you to respect the spirit of the
-+//    license that we chose: i.e., please contribute any changes you
-+//    may have back to the original ELPA library distribution, and keep
-+//    any derivatives of ELPA under the same license that we chose for
-+//    the original distribution, the GNU Lesser General Public License.
-+//
-+//
-+// --------------------------------------------------------------------------------------------------
-+//
-+// This file was written by A. Marek, MPCDF
-+#include "config-f90.h"
-+
-+#include <stdio.h>
-+#include <math.h>
-+#include <stdio.h>
-+
-+#include <stdlib.h>
-+#include <string.h>
-+#include <time.h>
-+#include <alloca.h>
-+#include <stdint.h>
-+#include <complex.h>
-+#ifdef WITH_AMD_GPU_VERSION
-+//missing header for rocblas
-+#include "rocblas.h"
-+#include "hip/hip_runtime_api.h"
-+#endif
-+
-+#define errormessage(x, ...) do { fprintf(stderr, "%s:%d " x, __FILE__, __LINE__, __VA_ARGS__ ); } while (0)
-+
-+#ifdef DEBUG_HIP
-+#define debugmessage(x, ...) do { fprintf(stderr, "%s:%d " x, __FILE__, __LINE__, __VA_ARGS__ ); } while (0)
-+#else
-+#define debugmessage(x, ...)
-+#endif
-+
-+#ifdef WITH_AMD_GPU_VERSION
-+extern "C" {
-+
-+  int hipSetDeviceFromC(int n) {
-+
-+    hipError_t hiperr = hipSetDevice(n);
-+    if (hiperr != hipSuccess) {
-+      errormessage("Error in hipSetDevice: %s\n",hipGetErrorString(hiperr));
-+      return 0;
-+    }
-+    return 1;
-+  }
-+
-+  int hipMallocFromC(intptr_t *a, size_t width_height) {
-+
-+    hipError_t hiperr = hipMalloc((void **) a, width_height);
-+#ifdef DEBUG_HIP
-+    printf("HIP Malloc,  pointer address: %p, size: %d \n", *a, width_height);
-+#endif
-+    if (hiperr != hipSuccess) {
-+      errormessage("Error in hipMalloc: %s\n",hipGetErrorString(hiperr));
-+      return 0;
-+    }
-+    return 1;
-+  }
-+
-+  int hipFreeFromC(intptr_t *a) {
-+#ifdef DEBUG_HIP
-+    printf("HIP Free, pointer address: %p \n", a);
-+#endif
-+    hipError_t hiperr = hipFree(a);
-+
-+    if (hiperr != hipSuccess) {
-+      errormessage("Error in hipFree: %s\n",hipGetErrorString(hiperr));
-+      return 0;
-+    }
-+    return 1;
-+  }
-+
-+  int hipMemcpyFromC(intptr_t *dest, intptr_t *src, size_t count, int dir) {
-+
-+    hipError_t hiperr = hipMemcpy( dest, src, count, (hipMemcpyKind)dir);
-+    if (hiperr != hipSuccess) {
-+      errormessage("Error in hipMemcpy: %s\n",hipGetErrorString(hiperr));
-+      return 0;
-+    }
-+    return 1;
-+  }
-+
-+  int hipMemcpyDeviceToDeviceFromC(void) {
-+      int val = (int)hipMemcpyDeviceToDevice;
-+      return val;
-+  }
-+  int hipMemcpyHostToDeviceFromC(void) {
-+      int val = (int)hipMemcpyHostToDevice;
-+      return val;
-+  }
-+  int hipMemcpyDeviceToHostFromC(void) {
-+      int val = (int)hipMemcpyDeviceToHost;
-+      return val;
-+  }
-+  int hipHostRegisterDefaultFromC(void) {
-+      int val = (int)hipHostRegisterDefault;
-+      return val;
-+  }
-+  int hipHostRegisterPortableFromC(void) {
-+      int val = (int)hipHostRegisterPortable;
-+      return val;
-+  }
-+  int hipHostRegisterMappedFromC(void) {
-+      int val = (int)hipHostRegisterMapped;
-+      return val;
-+  }
-+
-+}
-+#endif /* TEST_AMD_GPU == 1 */
-diff -ruN elpa-new_release_2021.11.001/examples/shared/GPU/test_gpu_vendor_agnostic_layer.F90 elpa-new_release_2021.11.001_ok/examples/shared/GPU/test_gpu_vendor_agnostic_layer.F90
---- elpa-new_release_2021.11.001/examples/shared/GPU/test_gpu_vendor_agnostic_layer.F90	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/shared/GPU/test_gpu_vendor_agnostic_layer.F90	2022-01-26 10:10:58.329439000 +0100
-@@ -0,0 +1,357 @@
-+#if 0
-+!    Copyright 2021, A. Marek, MPCDF
-+!
-+!    This file is part of ELPA.
-+!
-+!    The ELPA library was originally created by the ELPA consortium,
-+!    consisting of the following organizations:
-+!
-+!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
-+!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+!      Informatik,
-+!    - Technische Universität München, Lehrstuhl für Informatik mit
-+!      Schwerpunkt Wissenschaftliches Rechnen ,
-+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+!      and
-+!    - IBM Deutschland GmbH
-+!
-+!    This particular source code file contains additions, changes and
-+!    enhancements authored by Intel Corporation which is not part of
-+!    the ELPA consortium.
-+!
-+!    More information can be found here:
-+!    http://elpa.mpcdf.mpg.de/
-+!
-+!    ELPA is free software: you can redistribute it and/or modify
-+!    it under the terms of the version 3 of the license of the
-+!    GNU Lesser General Public License as published by the Free
-+!    Software Foundation.
-+!
-+!    ELPA is distributed in the hope that it will be useful,
-+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+!    GNU Lesser General Public License for more details.
-+!
-+!    You should have received a copy of the GNU Lesser General Public License
-+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+!
-+!    ELPA reflects a substantial effort on the part of the original
-+!    ELPA consortium, and we ask you to respect the spirit of the
-+!    license that we chose: i.e., please contribute any changes you
-+!    may have back to the original ELPA library distribution, and keep
-+!    any derivatives of ELPA under the same license that we chose for
-+!    the original distribution, the GNU Lesser General Public License.
-+#endif
-+
-+
-+#include "config-f90.h"
-+module test_gpu
-+  !use precision_for_tests
-+  use precision_for_tests
-+  use iso_c_binding
-+!#if TEST_INTEL_GPU == 1
-+!  use mkl_offload
-+!#endif
-+  integer(kind=c_int), parameter :: nvidia_gpu = 1
-+  integer(kind=c_int), parameter :: amd_gpu = 2
-+  integer(kind=c_int), parameter :: intel_gpu = 3
-+  integer(kind=c_int), parameter :: no_gpu = -1
-+  integer(kind=c_int)            :: use_gpu_vendor
-+  integer(kind=c_int)            :: gpuHostRegisterDefault    
-+  integer(kind=c_int)            :: gpuMemcpyHostToDevice    
-+  integer(kind=c_int)            :: gpuMemcpyDeviceToHost   
-+  integer(kind=c_int)            :: gpuMemcpyDeviceToDevice
-+  integer(kind=c_int)            :: gpuHostRegisterMapped
-+  integer(kind=c_int)            :: gpuHostRegisterPortable
-+
-+  integer(kind=c_intptr_t), parameter :: size_of_double_real    = 8_rk8
-+#ifdef WANT_SINGLE_PRECISION_REAL
-+  integer(kind=c_intptr_t), parameter :: size_of_single_real    = 4_rk4
-+#endif
-+
-+  integer(kind=c_intptr_t), parameter :: size_of_double_complex = 16_ck8
-+#ifdef WANT_SINGLE_PRECISION_COMPLEX
-+  integer(kind=c_intptr_t), parameter :: size_of_single_complex = 8_ck4
-+#endif
-+
-+  interface gpu_memcpy
-+    module procedure gpu_memcpy_intptr
-+    module procedure gpu_memcpy_cptr
-+    module procedure gpu_memcpy_mixed
-+  end interface
-+
-+  interface gpu_malloc
-+    module procedure gpu_malloc_intptr
-+    module procedure gpu_malloc_cptr
-+  end interface
-+
-+  interface gpu_free
-+    module procedure gpu_free_intptr
-+    module procedure gpu_free_cptr
-+  end interface
-+
-+  contains
-+    function gpu_vendor(set_vendor) result(vendor)
-+      use precision_for_tests
-+      implicit none
-+      integer(kind=c_int)             :: vendor
-+      integer(kind=c_int), intent(in) :: set_vendor
-+      ! default
-+      vendor = no_gpu
-+      if (set_vendor == nvidia_gpu) then
-+        vendor = nvidia_gpu
-+      endif
-+      if (set_vendor == amd_gpu) then
-+        vendor = amd_gpu
-+      endif
-+!#if TEST_INTEL_GPU == 1
-+!      vendor = intel_gpu
-+!#endif
-+      use_gpu_vendor = vendor
-+      return
-+    end function
-+
-+    subroutine set_gpu_parameters
-+#ifdef WITH_NVIDIA_GPU_VERSION
-+      use test_cuda_functions
-+#endif
-+#ifdef WITH_AMD_GPU_VERSION
-+      use test_hip_functions
-+#endif
-+      implicit none
-+
-+#ifdef WITH_NVIDIA_GPU_VERSION
-+      if (use_gpu_vendor == nvidia_gpu) then
-+        cudaMemcpyHostToDevice   = cuda_memcpyHostToDevice()
-+        gpuMemcpyHostToDevice    = cudaMemcpyHostToDevice
-+        cudaMemcpyDeviceToHost   = cuda_memcpyDeviceToHost()
-+        gpuMemcpyDeviceToHost    = cudaMemcpyDeviceToHost
-+        cudaMemcpyDeviceToDevice = cuda_memcpyDeviceToDevice()
-+        gpuMemcpyDeviceToDevice  = cudaMemcpyDeviceToDevice
-+        cudaHostRegisterPortable = cuda_hostRegisterPortable()
-+        gpuHostRegisterPortable  = cudaHostRegisterPortable
-+        cudaHostRegisterMapped   = cuda_hostRegisterMapped()
-+        gpuHostRegisterMapped    = cudaHostRegisterMapped
-+        cudaHostRegisterDefault  = cuda_hostRegisterDefault()
-+        gpuHostRegisterDefault   = cudaHostRegisterDefault
-+      endif
-+#endif
-+
-+#ifdef WITH_AMD_GPU_VERSION
-+      if (use_gpu_vendor == amd_gpu) then
-+        hipMemcpyHostToDevice   = hip_memcpyHostToDevice()
-+        gpuMemcpyHostToDevice   = hipMemcpyHostToDevice
-+        hipMemcpyDeviceToHost   = hip_memcpyDeviceToHost()
-+        gpuMemcpyDeviceToHost   = hipMemcpyDeviceToHost
-+        hipMemcpyDeviceToDevice = hip_memcpyDeviceToDevice()
-+        gpuMemcpyDeviceToDevice = hipMemcpyDeviceToDevice
-+        hipHostRegisterPortable = hip_hostRegisterPortable()
-+        gpuHostRegisterPortable = hipHostRegisterPortable
-+        hipHostRegisterMapped   = hip_hostRegisterMapped()
-+        gpuHostRegisterMapped   = hipHostRegisterMapped
-+        hipHostRegisterDefault  = hip_hostRegisterDefault()
-+        gpuHostRegisterDefault  = hipHostRegisterDefault
-+      endif
-+#endif
-+
-+    end subroutine
-+
-+    function gpu_malloc_intptr(array, elements) result(success)
-+      use, intrinsic :: iso_c_binding
-+#ifdef WITH_NVIDIA_GPU_VERSION
-+      use test_cuda_functions
-+#endif
-+#ifdef WITH_AMD_GPU_VERSION
-+      use test_hip_functions
-+#endif
-+      implicit none
-+      integer(kind=C_intptr_T)             :: array
-+      integer(kind=c_intptr_t), intent(in) :: elements
-+      logical                              :: success
-+
-+#ifdef WITH_NVIDIA_GPU_VERSION
-+      if (use_gpu_vendor == nvidia_gpu) then
-+        success = cuda_malloc_intptr(array, elements)
-+      endif
-+#endif
-+#ifdef WITH_AMD_GPU_VERSION
-+      if (use_gpu_vendor == amd_gpu) then
-+        success = hip_malloc_intptr(array, elements)
-+      endif
-+#endif
-+
-+    end function
-+
-+    function gpu_malloc_cptr(array, elements) result(success)
-+      use, intrinsic :: iso_c_binding
-+#ifdef WITH_NVIDIA_GPU_VERSION
-+      use test_cuda_functions
-+#endif
-+#ifdef WITH_AMD_GPU_VERSION
-+      use test_hip_functions
-+#endif
-+      implicit none
-+      type(c_ptr)                          :: array
-+      integer(kind=c_intptr_t), intent(in) :: elements
-+      logical                              :: success
-+      success = .false.
-+
-+#ifdef WITH_NVIDIA_GPU_VERSION
-+      if (use_gpu_vendor == nvidia_gpu) then
-+        success = cuda_malloc_cptr(array, elements)
-+      endif
-+#endif
-+
-+#ifdef WITH_AMD_GPU_VERSION
-+      if (use_gpu_vendor == amd_gpu) then
-+        success = hip_malloc_cptr(array, elements)
-+      endif
-+#endif
-+
-+    end function
-+
-+    function gpu_memcpy_intptr(dst, src, size, dir) result(success)
-+      use, intrinsic :: iso_c_binding
-+#ifdef WITH_NVIDIA_GPU_VERSION
-+      use test_cuda_functions
-+#endif
-+#ifdef WITH_AMD_GPU_VERSION
-+      use test_hip_functions
-+#endif
-+      implicit none
-+      integer(kind=C_intptr_t)              :: dst
-+      integer(kind=C_intptr_t)              :: src
-+      integer(kind=c_intptr_t), intent(in)  :: size
-+      integer(kind=C_INT), intent(in)       :: dir
-+      logical :: success
-+
-+#ifdef WITH_NVIDIA_GPU_VERSION
-+      if (use_gpu_vendor == nvidia_gpu) then
-+        success = cuda_memcpy_intptr(dst, src, size, dir)
-+      endif
-+#endif
-+
-+#ifdef WITH_AMD_GPU_VERSION
-+      if (use_gpu_vendor == amd_gpu) then
-+        success = hip_memcpy_intptr(dst, src, size, dir)
-+      endif
-+#endif
-+
-+    end function
-+    
-+    function gpu_memcpy_cptr(dst, src, size, dir) result(success)
-+      use, intrinsic :: iso_c_binding
-+#ifdef WITH_NVIDIA_GPU_VERSION
-+      use test_cuda_functions
-+#endif
-+#ifdef WITH_AMD_GPU_VERSION
-+      use test_hip_functions
-+#endif
-+      implicit none
-+      type(c_ptr)                           :: dst
-+      type(c_ptr)                           :: src
-+      integer(kind=c_intptr_t), intent(in)  :: size
-+      integer(kind=C_INT), intent(in)       :: dir
-+      logical :: success
-+
-+#ifdef WITH_NVIDIA_GPU_VERSION
-+      if (use_gpu_vendor == nvidia_gpu) then
-+        success = cuda_memcpy_cptr(dst, src, size, dir)
-+      endif
-+#endif
-+
-+#ifdef WITH_AMD_GPU_VERSION
-+      if (use_gpu_vendor == amd_gpu) then
-+        success = hip_memcpy_cptr(dst, src, size, dir)
-+      endif
-+#endif
-+
-+    end function
-+    
-+    function gpu_memcpy_mixed(dst, src, size, dir) result(success)
-+      use, intrinsic :: iso_c_binding
-+#ifdef WITH_NVIDIA_GPU_VERSION
-+      use test_cuda_functions
-+#endif
-+#ifdef WITH_AMD_GPU_VERSION
-+      use test_hip_functions
-+#endif
-+      implicit none
-+      type(c_ptr)                           :: dst
-+      integer(kind=C_intptr_t)              :: src
-+      integer(kind=c_intptr_t), intent(in)  :: size
-+      integer(kind=C_INT), intent(in)       :: dir
-+      logical :: success
-+
-+#ifdef WITH_NVIDIA_GPU_VERSION
-+      if (use_gpu_vendor == nvidia_gpu) then
-+        success = cuda_memcpy_mixed(dst, src, size, dir)
-+      endif
-+#endif
-+
-+#ifdef WITH_AMD_GPU_VERSION
-+      if (use_gpu_vendor == amd_gpu) then
-+        success = hip_memcpy_mixed(dst, src, size, dir)
-+      endif
-+#endif
-+
-+    end function
-+
-+    function gpu_free_intptr(a) result(success)
-+      use, intrinsic :: iso_c_binding
-+#ifdef WITH_NVIDIA_GPU_VERSION
-+      use test_cuda_functions
-+#endif
-+#ifdef WITH_AMD_GPU_VERSION
-+      use test_hip_functions
-+#endif
-+      implicit none
-+      integer(kind=c_intptr_t)                :: a
-+
-+      logical :: success
-+
-+#ifdef WITH_NVIDIA_GPU_VERSION
-+      if (use_gpu_vendor == nvidia_gpu) then
-+        success = cuda_free_intptr(a)
-+      endif
-+#endif
-+
-+#ifdef WITH_AMD_GPU_VERSION
-+      if (use_gpu_vendor == amd_gpu) then
-+        success = hip_free_intptr(a)
-+      endif
-+#endif
-+
-+    end function
-+
-+    function gpu_free_cptr(a) result(success)
-+      use, intrinsic :: iso_c_binding
-+#ifdef WITH_NVIDIA_GPU_VERSION
-+      use test_cuda_functions
-+#endif
-+#ifdef WITH_AMD_GPU_VERSION
-+      use test_hip_functions
-+#endif
-+      implicit none
-+      type(c_ptr)                :: a
-+
-+      logical :: success
-+
-+#ifdef WITH_NVIDIA_GPU_VERSION
-+      if (use_gpu_vendor == nvidia_gpu) then
-+        success = cuda_free_cptr(a)
-+      endif
-+#endif
-+
-+#ifdef WITH_AMD_GPU_VERSION
-+      if (use_gpu_vendor == amd_gpu) then
-+        success = hip_free_cptr(a)
-+      endif
-+#endif
-+
-+    end function
-+
-+end module 
-diff -ruN elpa-new_release_2021.11.001/examples/shared/mod_tests_blas_interfaces.F90 elpa-new_release_2021.11.001_ok/examples/shared/mod_tests_blas_interfaces.F90
---- elpa-new_release_2021.11.001/examples/shared/mod_tests_blas_interfaces.F90	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/shared/mod_tests_blas_interfaces.F90	2022-01-26 10:10:58.330923000 +0100
-@@ -0,0 +1,53 @@
-+!    This file is part of ELPA.
-+!
-+!    The ELPA library was originally created by the ELPA consortium,
-+!    consisting of the following organizations:
-+!
-+!    - Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+!      Informatik,
-+!    - Technische Universität München, Lehrstuhl für Informatik mit
-+!      Schwerpunkt Wissenschaftliches Rechnen ,
-+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+!      and
-+!    - IBM Deutschland GmbH
-+!
-+!
-+!    More information can be found here:
-+!    https://elpa.mpcdf.mpg.de/
-+!
-+!    ELPA is free software: you can redistribute it and/or modify
-+!    it under the terms of the version 3 of the license of the
-+!    GNU Lesser General Public License as published by the Free
-+!    Software Foundation.
-+!
-+!    ELPA is distributed in the hope that it will be useful,
-+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+!    GNU Lesser General Public License for more details.
-+!
-+!    You should have received a copy of the GNU Lesser General Public License
-+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+!
-+!    ELPA reflects a substantial effort on the part of the original
-+!    ELPA consortium, and we ask you to respect the spirit of the
-+!    license that we chose: i.e., please contribute any changes you
-+!    may have back to the original ELPA library distribution, and keep
-+!    any derivatives of ELPA under the same license that we chose for
-+!    the original distribution, the GNU Lesser General Public License.
-+!
-+! This file was written by A. Marek, MPCDF
-+
-+#include "config-f90.h"
-+#define PRECISION_MODULE precision_for_tests
-+module tests_blas_interfaces
-+  use iso_c_binding
-+  use precision_for_tests
-+
-+  implicit none
-+
-+#include "../../src/helpers/fortran_blas_interfaces.F90"
-+
-+end module
-diff -ruN elpa-new_release_2021.11.001/examples/shared/mod_tests_scalapack_interfaces.F90 elpa-new_release_2021.11.001_ok/examples/shared/mod_tests_scalapack_interfaces.F90
---- elpa-new_release_2021.11.001/examples/shared/mod_tests_scalapack_interfaces.F90	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/shared/mod_tests_scalapack_interfaces.F90	2022-01-26 10:10:58.331765000 +0100
-@@ -0,0 +1,56 @@
-+!    This file is part of ELPA.
-+!
-+!    The ELPA library was originally created by the ELPA consortium,
-+!    consisting of the following organizations:
-+!
-+!    - Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+!      Informatik,
-+!    - Technische Universität München, Lehrstuhl für Informatik mit
-+!      Schwerpunkt Wissenschaftliches Rechnen ,
-+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+!      and
-+!    - IBM Deutschland GmbH
-+!
-+!
-+!    More information can be found here:
-+!    https://elpa.mpcdf.mpg.de/
-+!
-+!    ELPA is free software: you can redistribute it and/or modify
-+!    it under the terms of the version 3 of the license of the
-+!    GNU Lesser General Public License as published by the Free
-+!    Software Foundation.
-+!
-+!    ELPA is distributed in the hope that it will be useful,
-+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+!    GNU Lesser General Public License for more details.
-+!
-+!    You should have received a copy of the GNU Lesser General Public License
-+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+!
-+!    ELPA reflects a substantial effort on the part of the original
-+!    ELPA consortium, and we ask you to respect the spirit of the
-+!    license that we chose: i.e., please contribute any changes you
-+!    may have back to the original ELPA library distribution, and keep
-+!    any derivatives of ELPA under the same license that we chose for
-+!    the original distribution, the GNU Lesser General Public License.
-+!
-+! This file was written by A. Marek, MPCDF
-+
-+
-+#include "config-f90.h"
-+#define PRECISION_MODULE precision_for_tests
-+module tests_scalapack_interfaces
-+  use iso_c_binding
-+  use precision_for_tests
-+
-+  implicit none
-+
-+#include "../../src/helpers/fortran_scalapack_interfaces.F90"
-+
-+end module
-+
-+
-diff -ruN elpa-new_release_2021.11.001/examples/shared/test_analytic.F90 elpa-new_release_2021.11.001_ok/examples/shared/test_analytic.F90
---- elpa-new_release_2021.11.001/examples/shared/test_analytic.F90	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/shared/test_analytic.F90	2022-01-26 10:10:58.332553000 +0100
-@@ -0,0 +1,204 @@
-+! (c) Copyright Pavel Kus, 2017, MPCDF
-+!
-+!    This file is part of ELPA.
-+!
-+!    The ELPA library was originally created by the ELPA consortium,
-+!    consisting of the following organizations:
-+!
-+!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
-+!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+!      Informatik,
-+!    - Technische Universität München, Lehrstuhl für Informatik mit
-+!      Schwerpunkt Wissenschaftliches Rechnen ,
-+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+!      and
-+!    - IBM Deutschland GmbH
-+!
-+!
-+!    More information can be found here:
-+!    http://elpa.mpcdf.mpg.de/
-+!
-+!    ELPA is free software: you can redistribute it and/or modify
-+!    it under the terms of the version 3 of the license of the
-+!    GNU Lesser General Public License as published by the Free
-+!    Software Foundation.
-+!
-+!    ELPA is distributed in the hope that it will be useful,
-+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+!    GNU Lesser General Public License for more details.
-+!
-+!    You should have received a copy of the GNU Lesser General Public License
-+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+!
-+!    ELPA reflects a substantial effort on the part of the original
-+!    ELPA consortium, and we ask you to respect the spirit of the
-+!    license that we chose: i.e., please contribute any changes you
-+!    may have back to the original ELPA library distribution, and keep
-+!    any derivatives of ELPA under the same license that we chose for
-+!    the original distribution, the GNU Lesser General Public License.
-+
-+#include "../Fortran/assert.h"
-+#include "config-f90.h"
-+
-+#ifdef HAVE_64BIT_INTEGER_MATH_SUPPORT
-+#define TEST_INT_TYPE integer(kind=c_int64_t)
-+#define INT_TYPE c_int64_t
-+#else
-+#define TEST_INT_TYPE integer(kind=c_int32_t)
-+#define INT_TYPE c_int32_t
-+#endif
-+#ifdef HAVE_64BIT_INTEGER_MPI_SUPPORT
-+#define TEST_INT_MPI_TYPE integer(kind=c_int64_t)
-+#define INT_MPI_TYPE c_int64_t
-+#else
-+#define TEST_INT_MPI_TYPE integer(kind=c_int32_t)
-+#define INT_MPI_TYPE c_int32_t
-+#endif
-+
-+module test_analytic
-+
-+  use test_util
-+#ifdef HAVE_DETAILED_TIMINGS
-+  use ftimings
-+#else
-+  use timings_dummy
-+#endif
-+  use precision_for_tests
-+
-+  interface prepare_matrix_analytic
-+    module procedure prepare_matrix_analytic_complex_double
-+    module procedure prepare_matrix_analytic_real_double
-+#ifdef WANT_SINGLE_PRECISION_REAL
-+    module procedure prepare_matrix_analytic_real_single
-+#endif
-+#ifdef WANT_SINGLE_PRECISION_COMPLEX
-+    module procedure prepare_matrix_analytic_complex_single
-+#endif
-+  end interface
-+
-+  interface check_correctness_analytic
-+    module procedure check_correctness_analytic_complex_double
-+    module procedure check_correctness_analytic_real_double
-+#ifdef WANT_SINGLE_PRECISION_REAL
-+    module procedure check_correctness_analytic_real_single
-+#endif
-+#ifdef WANT_SINGLE_PRECISION_COMPLEX
-+    module procedure check_correctness_analytic_complex_single
-+#endif
-+  end interface
-+
-+
-+  interface print_matrix
-+    module procedure print_matrix_complex_double
-+    module procedure print_matrix_real_double
-+#ifdef WANT_SINGLE_PRECISION_REAL
-+    module procedure print_matrix_real_single
-+#endif
-+#ifdef WANT_SINGLE_PRECISION_COMPLEX
-+    module procedure print_matrix_complex_single
-+#endif
-+  end interface
-+
-+  TEST_INT_TYPE, parameter, private  :: num_primes = 3
-+#ifdef BUILD_FUGAKU
-+  TEST_INT_TYPE, private  :: primes(num_primes)
-+#else
-+  TEST_INT_TYPE, parameter, private  :: primes(num_primes) = (/2,3,5/)
-+#endif
-+
-+  TEST_INT_TYPE, parameter, private  :: ANALYTIC_MATRIX = 0
-+  TEST_INT_TYPE, parameter, private  :: ANALYTIC_EIGENVECTORS = 1
-+  TEST_INT_TYPE, parameter, private  :: ANALYTIC_EIGENVALUES = 2
-+
-+  contains
-+
-+  function decompose(num, decomposition) result(possible)
-+    implicit none
-+    TEST_INT_TYPE, intent(in)   :: num
-+    TEST_INT_TYPE, intent(out)  :: decomposition(num_primes)
-+    logical                        :: possible
-+    TEST_INT_TYPE               :: reminder, prime, prime_id
-+
-+#ifdef BUILD_FUGAKU
-+    primes(1) = 2
-+    primes(2) = 3
-+    primes(3) = 5
-+#endif
-+    decomposition = 0
-+    possible = .true.
-+    reminder = num
-+    do prime_id = 1, num_primes
-+      prime = primes(prime_id)
-+      do while (MOD(reminder, prime) == 0)
-+        decomposition(prime_id) = decomposition(prime_id) + 1
-+        reminder = reminder / prime
-+      end do
-+    end do
-+    if(reminder > 1) then
-+      possible = .false.
-+    end if
-+  end function
-+
-+  function compose(decomposition) result(num)
-+    implicit none
-+    TEST_INT_TYPE, intent(in)   :: decomposition(num_primes)
-+    TEST_INT_TYPE               :: num, prime_id
-+
-+    num = 1;
-+#ifdef BUILD_FUGAKU
-+    primes(1) = 2
-+    primes(2) = 3
-+    primes(3) = 5
-+#endif
-+    do prime_id = 1, num_primes
-+      num = num * primes(prime_id) ** decomposition(prime_id)
-+    end do
-+  end function
-+
-+
-+#include "../../src/general/prow_pcol.F90"
-+#include "../../src/general/map_global_to_local.F90"
-+
-+
-+#define COMPLEXCASE 1
-+#define DOUBLE_PRECISION 1
-+#include "../../src/general/precision_macros.h"
-+#include "test_analytic_template.F90"
-+#undef DOUBLE_PRECISION
-+#undef COMPLEXCASE
-+
-+#ifdef WANT_SINGLE_PRECISION_COMPLEX
-+
-+#define COMPLEXCASE 1
-+#define SINGLE_PRECISION 1
-+#include "../../src/general/precision_macros.h"
-+#include "test_analytic_template.F90"
-+#undef SINGLE_PRECISION
-+#undef COMPLEXCASE
-+
-+#endif /* WANT_SINGLE_PRECISION_COMPLEX */
-+
-+#define REALCASE 1
-+#define DOUBLE_PRECISION 1
-+#include "../../src/general/precision_macros.h"
-+#include "test_analytic_template.F90"
-+#undef DOUBLE_PRECISION
-+#undef REALCASE
-+
-+#ifdef WANT_SINGLE_PRECISION_REAL
-+
-+#define REALCASE 1
-+#define SINGLE_PRECISION 1
-+#include "../../src/general/precision_macros.h"
-+#include "test_analytic_template.F90"
-+#undef SINGLE_PRECISION
-+#undef REALCASE
-+
-+#endif /* WANT_SINGLE_PRECISION_REAL */
-+
-+
-+end module
-diff -ruN elpa-new_release_2021.11.001/examples/shared/test_analytic_template.F90 elpa-new_release_2021.11.001_ok/examples/shared/test_analytic_template.F90
---- elpa-new_release_2021.11.001/examples/shared/test_analytic_template.F90	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/shared/test_analytic_template.F90	2022-01-26 10:10:58.333552000 +0100
-@@ -0,0 +1,701 @@
-+!  (c) Copyright Pavel Kus, 2017, MPCDF
-+!
-+!    This file is part of ELPA.
-+!
-+!    The ELPA library was originally created by the ELPA consortium,
-+!    consisting of the following organizations:
-+!
-+!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
-+!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+!      Informatik,
-+!    - Technische Universität München, Lehrstuhl für Informatik mit
-+!      Schwerpunkt Wissenschaftliches Rechnen ,
-+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+!      and
-+!    - IBM Deutschland GmbH
-+!
-+!
-+!    More information can be found here:
-+!    http://elpa.mpcdf.mpg.de/
-+!
-+!    ELPA is free software: you can redistribute it and/or modify
-+!    it under the terms of the version 3 of the license of the
-+!    GNU Lesser General Public License as published by the Free
-+!    Software Foundation.
-+!
-+!    ELPA is distributed in the hope that it will be useful,
-+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+!    GNU Lesser General Public License for more details.
-+!
-+!    You should have received a copy of the GNU Lesser General Public License
-+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+!
-+!    ELPA reflects a substantial effort on the part of the original
-+!    ELPA consortium, and we ask you to respect the spirit of the
-+!    license that we chose: i.e., please contribute any changes you
-+!    may have back to the original ELPA library distribution, and keep
-+!    any derivatives of ELPA under the same license that we chose for
-+!    the original distribution, the GNU Lesser General Public License.
-+
-+#include "config-f90.h"
-+
-+#ifdef HAVE_64BIT_INTEGER_MATH_SUPPORT
-+#define TEST_INT_TYPE integer(kind=c_int64_t)
-+#define INT_TYPE c_int64_t
-+#else
-+#define TEST_INT_TYPE integer(kind=c_int32_t)
-+#define INT_TYPE c_int32_t
-+#endif
-+#ifdef HAVE_64BIT_INTEGER_MPI_SUPPORT
-+#define TEST_INT_MPI_TYPE integer(kind=c_int64_t)
-+#define INT_MPI_TYPE c_int64_t
-+#else
-+#define TEST_INT_MPI_TYPE integer(kind=c_int32_t)
-+#define INT_MPI_TYPE c_int32_t
-+#endif
-+
-+
-+  subroutine prepare_matrix_analytic_&
-+    &MATH_DATATYPE&
-+    &_&
-+    &PRECISION&
-+    &(na, a, nblk, myid, np_rows, np_cols, my_prow, my_pcol, print_times)
-+    use precision_for_tests
-+
-+    implicit none
-+    TEST_INT_TYPE, intent(in)                       :: na, nblk, myid, np_rows, np_cols, my_prow, my_pcol
-+    MATH_DATATYPE(kind=REAL_DATATYPE), intent(inout):: a(:,:)
-+    logical, optional                               :: print_times
-+    logical                                         :: print_timer
-+    TEST_INT_TYPE                                   :: globI, globJ, locI, locJ, pi, pj, levels(num_primes)
-+    integer(kind=c_int)                             :: loc_I, loc_J, p_i, p_j
-+#ifdef HAVE_DETAILED_TIMINGS
-+    type(timer_t)                                   :: timer
-+#else
-+    type(timer_dummy_t)                             :: timer
-+#endif
-+
-+    call timer%enable()
-+    call timer%start("prepare_matrix_analytic")
-+
-+    print_timer = .true.
-+
-+    if (present(print_times)) then
-+      print_timer = print_times
-+    endif
-+
-+    ! for debug only, do it systematicaly somehow ... unit tests
-+    call check_module_sanity_&
-+            &MATH_DATATYPE&
-+            &_&
-+            &PRECISION&
-+            &(myid)
-+
-+    if(.not. decompose(na, levels)) then
-+      if(myid == 0) then
-+        print *, "Analytic test can be run only with matrix sizes of the form 2^n * 3^m * 5^o"
-+        stop 1
-+      end if
-+    end if
-+
-+    call timer%start("loop")
-+    do globI = 1, na
-+
-+      p_i = prow(int(globI,kind=c_int), int(nblk,kind=c_int), int(np_rows,kind=c_int))
-+      pi = int(p_i,kind=INT_TYPE)
-+      if (my_prow .ne. pi) cycle
-+
-+      do globJ = 1, na
-+
-+        p_j = pcol(int(globJ,kind=c_int), int(nblk,kind=c_int), int(np_cols,kind=c_int))
-+        pj = int(p_j,kind=INT_TYPE)
-+        if (my_pcol .ne. pj) cycle
-+
-+        if(map_global_array_index_to_local_index(int(globI,kind=c_int), int(globJ,kind=c_int), loc_I, loc_J, &
-+                 int(nblk,kind=c_int), int(np_rows,kind=c_int), int(np_cols,kind=c_int), &
-+                 int(my_prow,kind=c_int), int(my_pcol,kind=c_int) )) then
-+           locI = int(loc_i,kind=INT_TYPE)      
-+           locJ = int(loc_j,kind=INT_TYPE)      
-+           call timer%start("evaluation")
-+           a(locI, locJ) = analytic_matrix_&
-+              &MATH_DATATYPE&
-+              &_&
-+              &PRECISION&
-+              &(na, globI, globJ)
-+          call timer%stop("evaluation")
-+        else
-+          print *, "Warning ... error in preparation loop of the analytic test"
-+        end if
-+      end do
-+    end do
-+    call timer%stop("loop")
-+
-+    call timer%stop("prepare_matrix_analytic")
-+    if(myid == 0 .and. print_timer) then
-+      call timer%print("prepare_matrix_analytic")
-+    end if
-+    call timer%free()
-+  end subroutine
-+
-+  function check_correctness_analytic_&
-+    &MATH_DATATYPE&
-+    &_&
-+    &PRECISION&
-+    &(na, nev, ev, z, nblk, myid, np_rows, np_cols, my_prow, my_pcol, check_all_evals, &
-+      check_eigenvectors, print_times) result(status)
-+    use precision_for_tests
-+    
-+    implicit none
-+#include "./test_precision_kinds.F90"
-+    TEST_INT_TYPE, intent(in)              :: na, nev, nblk, myid, np_rows, &
-+                                              np_cols, my_prow, my_pcol
-+    TEST_INT_TYPE                          :: status
-+    TEST_INT_MPI_TYPE                      :: mpierr
-+    MATH_DATATYPE(kind=rck), intent(inout) :: z(:,:)
-+    real(kind=rk), intent(inout)           :: ev(:)
-+    logical, intent(in)                    :: check_all_evals, check_eigenvectors
-+
-+    TEST_INT_TYPE                          :: globI, globJ, locI, locJ, &
-+                                              levels(num_primes)
-+    integer(kind=c_int)                    :: loc_I, loc_J
-+    real(kind=rk)                          :: diff, max_z_diff, max_ev_diff, &
-+                                              glob_max_z_diff, max_curr_z_diff
-+#ifdef DOUBLE_PRECISION
-+    real(kind=rk), parameter               :: tol_eigenvalues = 5e-14_rk8
-+    real(kind=rk), parameter               :: tol_eigenvectors = 6e-11_rk8
-+#endif
-+#ifdef SINGLE_PRECISION
-+    ! tolerance needs to be very high due to qr tests
-+    ! it should be distinguished somehow!
-+    real(kind=rk), parameter               :: tol_eigenvalues = 7e-6_rk4
-+    real(kind=rk), parameter               :: tol_eigenvectors = 4e-3_rk4
-+#endif
-+    real(kind=rk)                          :: computed_ev, expected_ev
-+    MATH_DATATYPE(kind=rck)                :: computed_z,  expected_z
-+
-+    MATH_DATATYPE(kind=rck)                :: max_value_for_normalization, &
-+                                              computed_z_on_max_position,  &
-+                                              normalization_quotient
-+    MATH_DATATYPE(kind=rck)                :: max_values_array(np_rows * np_cols), &
-+                                              corresponding_exact_value
-+    integer(kind=c_int)                    :: max_value_idx, rank_with_max, &
-+                                              rank_with_max_reduced,        &
-+                                              num_checked_evals
-+    integer(kind=c_int)                    :: max_idx_array(np_rows * np_cols), &
-+                                              rank
-+    logical, optional                      :: print_times
-+    logical                                :: print_timer
-+
-+#ifdef HAVE_DETAILED_TIMINGS
-+    type(timer_t)    :: timer
-+#else
-+    type(timer_dummy_t)    :: timer
-+#endif
-+
-+    call timer%enable()
-+    call timer%start("check_correctness_analytic")
-+
-+
-+    print_timer = .true.
-+    if (present(print_times)) then
-+      print_timer = print_times
-+    endif
-+
-+    if(.not. decompose(na, levels)) then
-+      print *, "can not decomopse matrix size"
-+      stop 1
-+    end if
-+
-+    if(check_all_evals) then
-+        num_checked_evals = na
-+    else
-+        num_checked_evals = nev
-+    endif
-+    !call print_matrix(myid, na, z, "z")
-+    max_z_diff = 0.0_rk
-+    max_ev_diff = 0.0_rk
-+    call timer%start("loop_eigenvalues")
-+    do globJ = 1, num_checked_evals
-+      computed_ev = ev(globJ)
-+      call timer%start("evaluation")
-+      expected_ev = analytic_eigenvalues_real_&
-+              &PRECISION&
-+              &(na, globJ)
-+      call timer%stop("evaluation")
-+      diff = abs(computed_ev - expected_ev)
-+      max_ev_diff = max(diff, max_ev_diff)
-+    end do
-+    call timer%stop("loop_eigenvalues")
-+
-+    call timer%start("loop_eigenvectors")
-+    do globJ = 1, nev
-+      max_curr_z_diff = 0.0_rk
-+
-+      ! eigenvectors are unique up to multiplication by scalar (complex in complex case)
-+      ! to be able to compare them with analytic, we have to normalize them somehow
-+      ! we will find a value in computed eigenvector with highest absolut value and enforce
-+      ! such multiple of computed eigenvector, that the value on corresponding position is the same
-+      ! as an corresponding value in the analytical eigenvector
-+
-+      ! find the maximal value in the local part of given eigenvector (with index globJ)
-+      max_value_for_normalization = 0.0_rk
-+      max_value_idx = -1
-+      do globI = 1, na
-+        if(map_global_array_index_to_local_index(int(globI,kind=c_int), int(globJ,kind=c_int), loc_I, loc_J, &
-+                 int(nblk,kind=c_int), int(np_rows,kind=c_int), int(np_cols,kind=c_int), &
-+                 int(my_prow,kind=c_int), int(my_pcol,kind=c_int) )) then
-+          locI = int(loc_I,kind=INT_TYPE)
-+          locJ = int(loc_J,kind=INT_TYPE)
-+          computed_z = z(locI, locJ)
-+          if(abs(computed_z) > abs(max_value_for_normalization)) then
-+            max_value_for_normalization = computed_z
-+            max_value_idx = int(globI,kind=c_int)
-+          end if
-+        end if
-+      end do
-+
-+      ! find the global maximum and its position. From technical reasons (looking for a 
-+      ! maximum of complex number), it is not so easy to do it nicely. Therefore we 
-+      ! communicate local maxima to mpi rank 0 and resolve there. If we wanted to do
-+      ! it without this, it would be tricky.. question of uniquness - two complex numbers
-+      ! with the same absolut values, but completely different... 
-+#ifdef WITH_MPI
-+      call MPI_Gather(max_value_for_normalization, 1_MPI_KIND, MPI_MATH_DATATYPE_PRECISION, &
-+                      max_values_array, 1_MPI_KIND, MPI_MATH_DATATYPE_PRECISION, 0_MPI_KIND, &
-+                      int(MPI_COMM_WORLD,kind=MPI_KIND), mpierr)
-+      call MPI_Gather(max_value_idx, 1_MPI_KIND, MPI_INT, max_idx_array, 1_MPI_KIND, MPI_INT, &
-+                      0_MPI_KIND, int(MPI_COMM_WORLD,kind=MPI_KIND), mpierr)
-+      max_value_for_normalization = 0.0_rk
-+      max_value_idx = -1
-+      do rank = 1, np_cols * np_rows 
-+        if(abs(max_values_array(rank)) > abs(max_value_for_normalization)) then
-+          max_value_for_normalization = max_values_array(rank)
-+          max_value_idx = max_idx_array(rank)
-+        end if
-+      end do
-+      call MPI_Bcast(max_value_for_normalization, 1_MPI_KIND, MPI_MATH_DATATYPE_PRECISION, &
-+                     0_MPI_KIND, int(MPI_COMM_WORLD,kind=MPI_KIND), mpierr)
-+      call MPI_Bcast(max_value_idx, 1_MPI_KIND, MPI_INT, 0_MPI_KIND, &
-+                     int(MPI_COMM_WORLD,kind=MPI_KIND), mpierr)
-+#endif
-+      ! we decided what the maximum computed value is. Calculate expected value on the same 
-+      if(abs(max_value_for_normalization) < 0.0001_rk) then 
-+        if(myid == 0) print *, 'Maximal value in eigenvector too small     :', max_value_for_normalization
-+        status =1
-+        return
-+      end if
-+      call timer%start("evaluation_helper")
-+      corresponding_exact_value  = analytic_eigenvectors_&
-+                                       &MATH_DATATYPE&
-+                                       &_&
-+                                       &PRECISION&
-+                                       &(na, int(max_value_idx,kind=INT_TYPE), globJ)
-+      call timer%stop("evaluation_helper")
-+      normalization_quotient = corresponding_exact_value / max_value_for_normalization
-+      ! write(*,*) "normalization q", normalization_quotient
-+
-+      ! compare computed and expected eigenvector values, but take into account normalization quotient
-+      do globI = 1, na
-+        if(map_global_array_index_to_local_index(int(globI,kind=c_int), int(globJ,kind=c_int), loc_I, loc_J, &
-+                 int(nblk,kind=c_int), int(np_rows,kind=c_int), int(np_cols,kind=c_int), &
-+                 int(my_prow,kind=c_int), int(my_pcol,kind=c_int) )) then
-+           locI = int(loc_I,kind=INT_TYPE)
-+           locJ = int(loc_J,kind=INT_TYPE)
-+           computed_z = z(locI, locJ)
-+           call timer%start("evaluation")
-+           expected_z = analytic_eigenvectors_&
-+              &MATH_DATATYPE&
-+              &_&
-+              &PRECISION&
-+              &(na, globI, globJ)
-+           call timer%stop("evaluation")
-+           max_curr_z_diff = max(abs(normalization_quotient * computed_z - expected_z), max_curr_z_diff)
-+        end if
-+      end do
-+      ! we have max difference of one of the eigenvectors, update global
-+      max_z_diff = max(max_z_diff, max_curr_z_diff)
-+    end do !globJ
-+    call timer%stop("loop_eigenvectors")
-+
-+#ifdef WITH_MPI
-+    call mpi_allreduce(max_z_diff, glob_max_z_diff, 1_MPI_KIND, MPI_REAL_PRECISION, MPI_MAX, &
-+                       int(MPI_COMM_WORLD,kind=MPI_KIND), mpierr)
-+#else
-+    glob_max_z_diff = max_z_diff
-+#endif
-+    if(myid == 0) print *, 'Maximum error in eigenvalues      :', max_ev_diff
-+    if (check_eigenvectors) then
-+      if(myid == 0) print *, 'Maximum error in eigenvectors     :', glob_max_z_diff
-+    endif
-+
-+    status = 0
-+    if (nev .gt. 2) then
-+      if (max_ev_diff .gt. tol_eigenvalues .or. max_ev_diff .eq. 0.0_rk) status = 1
-+      if (check_eigenvectors) then
-+        if (glob_max_z_diff .gt. tol_eigenvectors .or. glob_max_z_diff .eq. 0.0_rk) status = 1
-+      endif
-+    else
-+      if (max_ev_diff .gt. tol_eigenvalues) status = 1
-+      if (check_eigenvectors) then
-+        if (glob_max_z_diff .gt. tol_eigenvectors) status = 1
-+      endif
-+    endif
-+
-+    call timer%stop("check_correctness_analytic")
-+    if(myid == 0 .and. print_timer) then
-+      call timer%print("check_correctness_analytic")
-+    end if
-+    call timer%free()
-+  end function
-+
-+
-+  function analytic_matrix_&
-+    &MATH_DATATYPE&
-+    &_&
-+    &PRECISION&
-+    &(na, i, j) result(element)
-+    use precision_for_tests
-+
-+    implicit none
-+    TEST_INT_TYPE, intent(in) :: na, i, j
-+    MATH_DATATYPE(kind=REAL_DATATYPE)     :: element
-+
-+    element = analytic_&
-+    &MATH_DATATYPE&
-+    &_&
-+    &PRECISION&
-+    &(na, i, j, ANALYTIC_MATRIX)
-+
-+  end function
-+
-+  function analytic_eigenvectors_&
-+    &MATH_DATATYPE&
-+    &_&
-+    &PRECISION&
-+    &(na, i, j) result(element)
-+    use precision_for_tests
-+
-+    implicit none
-+    TEST_INT_TYPE, intent(in) :: na, i, j
-+    MATH_DATATYPE(kind=REAL_DATATYPE)               :: element
-+
-+    element = analytic_&
-+    &MATH_DATATYPE&
-+    &_&
-+    &PRECISION&
-+    &(na, i, j, ANALYTIC_EIGENVECTORS)
-+
-+  end function
-+
-+  function analytic_eigenvalues_&
-+    &MATH_DATATYPE&
-+    &_&
-+    &PRECISION&
-+    &(na, i) result(element)
-+    use precision_for_tests
-+
-+    implicit none
-+    TEST_INT_TYPE, intent(in) :: na, i
-+    real(kind=REAL_DATATYPE)              :: element
-+
-+    element = analytic_real_&
-+    &PRECISION&
-+    &(na, i, i, ANALYTIC_EIGENVALUES)
-+
-+  end function
-+
-+  function analytic_&
-+    &MATH_DATATYPE&
-+    &_&
-+    &PRECISION&
-+    &(na, i, j, what) result(element)
-+    use precision_for_tests
-+
-+    implicit none
-+#include "./test_precision_kinds.F90"
-+    TEST_INT_TYPE, intent(in)     :: na, i, j, what
-+    MATH_DATATYPE(kind=rck)       :: element, mat2x2(2,2), mat(5,5)
-+    real(kind=rk)                 :: a, am, amp
-+    TEST_INT_TYPE                 :: levels(num_primes)
-+    TEST_INT_TYPE                 :: ii, jj, m, prime_id, prime, total_level, level
-+
-+    real(kind=rk), parameter      :: s = 0.5_rk
-+    real(kind=rk), parameter      :: c = 0.86602540378443864679_rk
-+    real(kind=rk), parameter      :: sq2 = 1.4142135623730950488_rk
-+
-+    real(kind=rk), parameter      :: largest_ev = 2.0_rk
-+
-+    assert(i <= na)
-+    assert(j <= na)
-+    assert(i >= 0)
-+    assert(j >= 0)
-+    assert(decompose(na, levels))
-+    ! go to zero-based indexing
-+    ii = i - 1
-+    jj = j - 1
-+    if (na .gt. 2) then
-+      a = exp(log(largest_ev)/(na-1))
-+    else
-+      a = exp(log(largest_ev)/(1))
-+    endif
-+
-+    element = 1.0_rck
-+#ifdef COMPLEXCASE
-+    element = (1.0_rk, 0.0_rk)
-+#endif
-+    total_level = 0
-+    am = a
-+#ifdef BUILD_FUGAKU
-+    primes(1) = 2
-+    primes(2) = 3
-+    primes(3) = 5
-+#endif
-+    do prime_id = 1,num_primes
-+      prime = primes(prime_id)
-+      do  level = 1, levels(prime_id)
-+        amp = am**(prime-1)
-+        total_level = total_level + 1
-+        if(what == ANALYTIC_MATRIX) then
-+#ifdef REALCASE
-+#ifndef FUGAKU
-+          mat2x2 = reshape((/ c*c + amp * s*s, (amp - 1.0_rk) * s*c,  &
-+                           (amp - 1.0_rk) * s*c, s*s + amp * c*c  /), &
-+                                      (/2, 2/), order=(/2,1/))
-+#endif
-+#endif
-+#ifdef COMPLEXCASE
-+#ifndef FUGAKU
-+          mat2x2 = reshape((/ 0.5_rck * (amp + 1.0_rck) * (1.0_rk, 0.0_rk),   sq2/4.0_rk * (amp - 1.0_rk) * (1.0_rk, 1.0_rk),   &
-+                              sq2/4.0_rk * (amp - 1.0_rk) * (1.0_rk, -1.0_rk),  0.5_rck * (amp + 1.0_rck) * (1.0_rk, 0.0_rk) /), &
-+                                      (/2, 2/), order=(/2,1/))
-+! intel 2018 does not reshape correctly (one would have to specify order=(/1,2/)
-+! until this is resolved, I resorted to the following
-+          mat2x2(1,2) = sq2/4.0_rk * (amp - 1.0_rk) * (1.0_rk, 1.0_rk)
-+          mat2x2(2,1) = sq2/4.0_rk * (amp - 1.0_rk) * (1.0_rk, -1.0_rk)
-+#endif
-+#endif
-+        else if(what == ANALYTIC_EIGENVECTORS) then
-+#ifdef REALCASE
-+#ifndef FUGAKU
-+          mat2x2 = reshape((/ c, s,  &
-+                           -s,  c  /), &
-+                                (/2, 2/), order=(/2,1/))
-+! intel 2018 does not reshape correctly (one would have to specify order=(/1,2/)
-+! until this is resolved, I resorted to the following
-+          mat2x2(1,2) = s
-+          mat2x2(2,1) = -s
-+#endif
-+#endif
-+#ifdef COMPLEXCASE
-+#ifndef FUGAKU
-+          mat2x2 = reshape((/ -sq2/2.0_rck * (1.0_rk, 0.0_rk),       -sq2/2.0_rck * (1.0_rk, 0.0_rk),  &
-+                              0.5_rk * (1.0_rk, -1.0_rk),  0.5_rk * (-1.0_rk, 1.0_rk)  /), &
-+                                (/2, 2/), order=(/2,1/))
-+! intel 2018 does not reshape correctly (one would have to specify order=(/1,2/)
-+! until this is resolved, I resorted to the following
-+          mat2x2(1,2) = -sq2/2.0_rck * (1.0_rk, 0.0_rk)
-+          mat2x2(2,1) = 0.5_rk * (1.0_rk, -1.0_rk)
-+#endif
-+#endif
-+        else if(what == ANALYTIC_EIGENVALUES) then
-+#ifndef FUGAKU
-+          mat2x2 = reshape((/ 1.0_rck, 0.0_rck,  &
-+                           0.0_rck, amp  /), &
-+                                 (/2, 2/), order=(/2,1/))
-+#endif
-+        else
-+          assert(.false.)
-+        end if
-+
-+        mat = 0.0_rck
-+        if(prime == 2) then
-+#ifndef BUILD_FUGAKU
-+          mat(1:2, 1:2) = mat2x2
-+#endif
-+        else if(prime == 3) then
-+#ifndef BUILD_FUGAKU
-+          mat((/1,3/),(/1,3/)) = mat2x2
-+#endif
-+          if(what == ANALYTIC_EIGENVECTORS) then
-+            mat(2,2) = 1.0_rck
-+          else
-+            mat(2,2) = am
-+          end if
-+        else if(prime == 5) then
-+#ifndef BUILD_FUGAKU
-+          mat((/1,5/),(/1,5/)) = mat2x2
-+#endif
-+          if(what == ANALYTIC_EIGENVECTORS) then
-+            mat(2,2) = 1.0_rck
-+            mat(3,3) = 1.0_rck
-+            mat(4,4) = 1.0_rck
-+          else
-+            mat(2,2) = am
-+            mat(3,3) = am**2
-+            mat(4,4) = am**3
-+          end if
-+        else
-+          assert(.false.)
-+        end if
-+
-+  !      write(*,*) "calc value, elem: ", element, ", mat: ", mod(ii,2), mod(jj,2),  mat(mod(ii,2), mod(jj,2)), "am ", am
-+  !      write(*,*) " matrix mat", mat
-+        element = element * mat(mod(ii,prime) + 1, mod(jj,prime) + 1)
-+        ii = ii / prime
-+        jj = jj / prime
-+
-+        am = am**prime
-+      end do
-+    end do
-+    !write(*,*) "returning value ", element
-+  end function
-+
-+
-+  subroutine print_matrix_&
-+    &MATH_DATATYPE&
-+    &_&
-+    &PRECISION&
-+    &(myid, na, mat, mat_name)
-+    use precision_for_tests
-+
-+    implicit none
-+#include "./test_precision_kinds.F90"
-+    TEST_INT_TYPE, intent(in)    :: myid, na
-+    character(len=*), intent(in) :: mat_name
-+    MATH_DATATYPE(kind=rck)      :: mat(na, na)
-+    TEST_INT_TYPE                :: i,j
-+    character(len=20)            :: na_str
-+
-+    if(myid .ne. 0) &
-+      return
-+    write(*,*) "Matrix: "//trim(mat_name)
-+    write(na_str, *) na
-+    do i = 1, na
-+#ifdef REALCASE
-+      write(*, '('//trim(na_str)//'f8.3)') mat(i, :)
-+#endif
-+#ifdef COMPLEXCASE
-+      write(*,'('//trim(na_str)//'(A,f8.3,A,f8.3,A))') ('(', real(mat(i,j)), ',', aimag(mat(i,j)), ')', j=1,na)
-+#endif
-+    end do
-+    write(*,*)
-+  end subroutine
-+
-+
-+  subroutine check_matrices_&
-+    &MATH_DATATYPE&
-+    &_&
-+    &PRECISION&
-+    &(myid, na)
-+    use precision_for_tests
-+
-+    implicit none
-+#include "./test_precision_kinds.F90"
-+    TEST_INT_TYPE, intent(in) :: myid, na
-+    MATH_DATATYPE(kind=rck)   :: A(na, na), S(na, na), L(na, na), res(na, na)
-+    TEST_INT_TYPE             :: i, j, decomposition(num_primes)
-+
-+    real(kind=rk)             :: err
-+#ifdef DOUBLE_PRECISION
-+    real(kind=rk), parameter  :: TOL =  1e-8
-+#endif
-+#ifdef SINGLE_PRECISION
-+    real(kind=rk), parameter  :: TOL =  1e-4
-+#endif
-+
-+    assert(decompose(na, decomposition))
-+
-+    do i = 1, na
-+      do j = 1, na
-+        A(i,j) = analytic_matrix_&
-+              &MATH_DATATYPE&
-+              &_&
-+              &PRECISION&
-+              &(na, i, j)
-+        S(i,j) = analytic_eigenvectors_&
-+              &MATH_DATATYPE&
-+              &_&
-+              &PRECISION&
-+              &(na, i, j)
-+        L(i,j) = analytic_&
-+              &MATH_DATATYPE&
-+              &_&
-+              &PRECISION&
-+              &(na, i, j, ANALYTIC_EIGENVALUES)
-+      end do
-+    end do
-+
-+    res = matmul(A,S) - matmul(S,L)
-+    err = maxval(abs(res))
-+    
-+    if(err > TOL) then
-+      print *, "WARNING: sanity test in module analytic failed, error is ", err
-+    end if
-+
-+    if(.false.) then
-+    !if(na == 2 .or. na == 5) then
-+      call print_matrix(myid, na, A, "A")
-+      call print_matrix(myid, na, S, "S")
-+      call print_matrix(myid, na, L, "L")
-+
-+      call print_matrix(myid, na, matmul(A,S), "AS")
-+      call print_matrix(myid, na, matmul(S,L), "SL")
-+
-+      call print_matrix(myid, na, res , "res")
-+    end if
-+
-+  end subroutine
-+
-+  subroutine check_module_sanity_&
-+    &MATH_DATATYPE&
-+    &_&
-+    &PRECISION&
-+    &(myid)
-+    use precision_for_tests
-+
-+    implicit none
-+    TEST_INT_TYPE, intent(in)   :: myid
-+    TEST_INT_TYPE               :: decomposition(num_primes), i
-+#ifndef BUILD_FUGAKU
-+    TEST_INT_TYPE, parameter    :: check_sizes(7) = (/2, 3, 5, 6, 10, 25, 150/)
-+#else
-+    TEST_INT_TYPE    :: check_sizes(7)
-+#endif
-+    if(myid == 0) print *, "Checking test_analytic module sanity.... "
-+#ifndef BUILD_FUGAKU
-+#ifdef HAVE_64BIT_INTEGER_MATH_SUPPORT
-+    assert(decompose(1500_lik, decomposition))
-+#else
-+    assert(decompose(1500_ik, decomposition))
-+#endif
-+    assert(all(decomposition == (/2,1,3/)))
-+#ifdef HAVE_64BIT_INTEGER_MATH_SUPPORT
-+    assert(decompose(6_lik,decomposition))
-+#else
-+    assert(decompose(6_ik,decomposition))
-+#endif
-+    assert(all(decomposition == (/1,1,0/)))
-+
-+#ifdef BUILD_FUGAKU
-+    check_sizes(1) = 2
-+    check_sizes(2) = 3
-+    check_sizes(3) = 5
-+    check_sizes(4) = 10
-+    check_sizes(5) = 25
-+    check_sizes(6) = 150
-+#endif
-+    do i =1, size(check_sizes)
-+      call check_matrices_&
-+          &MATH_DATATYPE&
-+          &_&
-+          &PRECISION&
-+          &(myid, check_sizes(i))
-+    end do
-+
-+    if(myid == 0) print *, "Checking test_analytic module sanity.... DONE"
-+#endif
-+  end subroutine
-diff -ruN elpa-new_release_2021.11.001/examples/shared/test_blacs_infrastructure.F90 elpa-new_release_2021.11.001_ok/examples/shared/test_blacs_infrastructure.F90
---- elpa-new_release_2021.11.001/examples/shared/test_blacs_infrastructure.F90	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/shared/test_blacs_infrastructure.F90	2022-01-26 10:10:58.368066000 +0100
-@@ -0,0 +1,208 @@
-+!    This file is part of ELPA.
-+!
-+!    The ELPA library was originally created by the ELPA consortium,
-+!    consisting of the following organizations:
-+!
-+!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
-+!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+!      Informatik,
-+!    - Technische Universität München, Lehrstuhl für Informatik mit
-+!      Schwerpunkt Wissenschaftliches Rechnen ,
-+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+!      and
-+!    - IBM Deutschland GmbH
-+!
-+!
-+!    More information can be found here:
-+!    http://elpa.mpcdf.mpg.de/
-+!
-+!    ELPA is free software: you can redistribute it and/or modify
-+!    it under the terms of the version 3 of the license of the
-+!    GNU Lesser General Public License as published by the Free
-+!    Software Foundation.
-+!
-+!    ELPA is distributed in the hope that it will be useful,
-+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+!    GNU Lesser General Public License for more details.
-+!
-+!    You should have received a copy of the GNU Lesser General Public License
-+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+!
-+!    ELPA reflects a substantial effort on the part of the original
-+!    ELPA consortium, and we ask you to respect the spirit of the
-+!    license that we chose: i.e., please contribute any changes you
-+!    may have back to the original ELPA library distribution, and keep
-+!    any derivatives of ELPA under the same license that we chose for
-+!    the original distribution, the GNU Lesser General Public License.
-+!
-+!
-+#include "config-f90.h"
-+
-+#ifdef HAVE_64BIT_INTEGER_MATH_SUPPORT
-+#define TEST_INT_TYPE integer(kind=c_int64_t)
-+#define INT_TYPE c_int64_t
-+#define TEST_C_INT_TYPE_PTR long int*
-+#define TEST_C_INT_TYPE long int
-+#else
-+#define TEST_INT_TYPE integer(kind=c_int32_t)
-+#define INT_TYPE c_int32_t
-+#define TEST_C_INT_TYPE_PTR int*
-+#define TEST_C_INT_TYPE int
-+#endif
-+#ifdef HAVE_64BIT_INTEGER_MPI_SUPPORT
-+#define TEST_INT_MPI_TYPE integer(kind=c_int64_t)
-+#define INT_MPI_TYPE c_int64_t
-+#define TEST_C_INT_MPI_TYPE_PTR long int*
-+#define TEST_C_INT_MPI_TYPE long int
-+#else
-+#define TEST_INT_MPI_TYPE integer(kind=c_int32_t)
-+#define INT_MPI_TYPE c_int32_t
-+#define TEST_C_INT_MPI_TYPE_PTR int*
-+#define TEST_C_INT_MPI_TYPE int
-+#endif
-+
-+module test_blacs_infrastructure
-+
-+  contains
-+
-+    !c> void set_up_blacsgrid_f(TEST_C_INT_TYPE mpi_comm_parent, TEST_C_INT_TYPE np_rows, 
-+    !c>                         TEST_C_INT_TYPE np_cols, char layout,
-+    !c>                         TEST_C_INT_TYPE_PTR my_blacs_ctxt, TEST_C_INT_TYPE_PTR my_prow, 
-+    !c>                         TEST_C_INT_TYPE_PTR my_pcol);
-+    subroutine set_up_blacsgrid(mpi_comm_parent, np_rows, np_cols, layout, &
-+                                my_blacs_ctxt, my_prow, my_pcol) bind(C, name="set_up_blacsgrid_f")
-+
-+      use precision_for_tests
-+      use test_util
-+      use iso_c_binding
-+
-+      implicit none
-+      TEST_INT_TYPE, intent(in), value          :: mpi_comm_parent, np_rows, np_cols
-+#ifdef SXAURORA
-+      character(len=1), intent(in)              :: layout
-+#else
-+      character(kind=c_char), intent(in), value :: layout
-+#endif
-+      TEST_INT_TYPE, intent(out)                :: my_blacs_ctxt, my_prow, my_pcol
-+
-+#ifdef WITH_MPI
-+      TEST_INT_TYPE :: np_rows_, np_cols_
-+#endif
-+
-+      if (layout /= 'R' .and. layout /= 'C') then
-+        print *, "layout must be 'R' or 'C'"
-+        stop 1
-+      end if
-+
-+      my_blacs_ctxt = mpi_comm_parent
-+#ifdef WITH_MPI
-+      call BLACS_Gridinit(my_blacs_ctxt, layout, np_rows, np_cols)
-+      call BLACS_Gridinfo(my_blacs_ctxt, np_rows_, np_cols_, my_prow, my_pcol)
-+      if (np_rows /= np_rows_) then
-+        print *, "BLACS_Gridinfo returned different values for np_rows as set by BLACS_Gridinit"
-+        stop 1
-+      endif
-+      if (np_cols /= np_cols_) then
-+        print *, "BLACS_Gridinfo returned different values for np_cols as set by BLACS_Gridinit"
-+        stop 1
-+      endif
-+#else
-+      my_prow = 0
-+      my_pcol = 0
-+#endif
-+    end subroutine
-+
-+    subroutine set_up_blacs_descriptor(na, nblk, my_prow, my_pcol, &
-+                                       np_rows, np_cols, na_rows,  &
-+                                       na_cols, sc_desc, my_blacs_ctxt, info)
-+
-+      use elpa_utilities, only : error_unit
-+      use test_util
-+      use precision_for_tests
-+      use tests_scalapack_interfaces
-+      implicit none
-+
-+      TEST_INT_TYPE, intent(in)    :: na, nblk, my_prow, my_pcol, np_rows,   &
-+                                       np_cols, &
-+                                       my_blacs_ctxt
-+      TEST_INT_TYPE, intent(inout) :: info
-+      TEST_INT_TYPE, intent(out)   :: na_rows, na_cols, sc_desc(1:9)
-+
-+#ifdef WITH_MPI
-+      TEST_INT_MPI_TYPE            :: mpierr
-+
-+      sc_desc(:) = 0
-+      ! determine the neccessary size of the distributed matrices,
-+      ! we use the scalapack tools routine NUMROC
-+
-+      na_rows = numroc(na, nblk, my_prow, 0_BLAS_KIND, np_rows)
-+      na_cols = numroc(na, nblk, my_pcol, 0_BLAS_KIND, np_cols)
-+
-+      ! set up the scalapack descriptor for the checks below
-+      ! For ELPA the following restrictions hold:
-+      ! - block sizes in both directions must be identical (args 4 a. 5)
-+      ! - first row and column of the distributed matrix must be on
-+      !   row/col 0/0 (arg 6 and 7)
-+
-+      call descinit(sc_desc, na, na, nblk, nblk, 0_BLAS_KIND, 0_BLAS_KIND, &
-+                    my_blacs_ctxt, na_rows, info)
-+
-+      if (info .ne. 0) then
-+        write(error_unit,*) 'Error in BLACS descinit! info=',info
-+        write(error_unit,*) 'Most likely this happend since you want to use'
-+        write(error_unit,*) 'more MPI tasks than are possible for your'
-+        write(error_unit,*) 'problem size (matrix size and blocksize)!'
-+        write(error_unit,*) 'The blacsgrid can not be set up properly'
-+        write(error_unit,*) 'Try reducing the number of MPI tasks...'
-+        call MPI_ABORT(int(mpi_comm_world,kind=MPI_KIND), 1_MPI_KIND, mpierr)
-+      endif
-+#else /* WITH_MPI */
-+      na_rows = na
-+      na_cols = na
-+#endif /* WITH_MPI */
-+
-+    end subroutine
-+
-+    !c> void set_up_blacs_descriptor_f(TEST_C_INT_TYPE na, TEST_C_INT_TYPE nblk, 
-+    !c>                                TEST_C_INT_TYPE my_prow, TEST_C_INT_TYPE my_pcol,
-+    !c>                                TEST_C_INT_TYPE np_rows, TEST_C_INT_TYPE np_cols,
-+    !c>                                TEST_C_INT_TYPE_PTR na_rows, TEST_C_INT_TYPE_PTR na_cols,
-+    !c>                                TEST_C_INT_TYPE sc_desc[9],
-+    !c>                                TEST_C_INT_TYPE my_blacs_ctxt,
-+    !c>                                TEST_C_INT_TYPE_PTR info);
-+    subroutine set_up_blacs_descriptor_f(na, nblk, my_prow, my_pcol, &
-+                                         np_rows, np_cols, na_rows,  &
-+                                         na_cols, sc_desc,           &
-+                                         my_blacs_ctxt, info)        &
-+                                         bind(C, name="set_up_blacs_descriptor_f")
-+
-+      use iso_c_binding
-+      implicit none
-+
-+
-+      TEST_INT_TYPE, value :: na, nblk, my_prow, my_pcol, np_rows, &
-+                                    np_cols, my_blacs_ctxt
-+      TEST_INT_TYPE        :: na_rows, na_cols, info, sc_desc(1:9)
-+
-+      call set_up_blacs_descriptor(na, nblk, my_prow, my_pcol, &
-+                                   np_rows, np_cols, na_rows,  &
-+                                   na_cols, sc_desc, my_blacs_ctxt, info)
-+
-+
-+    end subroutine
-+
-+    
-+   function index_l2g(idx_loc, nblk, iproc, nprocs) result(indexl2g)
-+     use precision_for_tests
-+     implicit none
-+     TEST_INT_TYPE :: indexl2g
-+     TEST_INT_TYPE :: idx_loc, nblk, iproc, nprocs
-+     indexl2g = nprocs * nblk * ((idx_loc-1) / nblk) + mod(idx_loc-1,nblk) + mod(nprocs+iproc, nprocs)*nblk + 1
-+     return
-+   end function
-+
-+end module
-diff -ruN elpa-new_release_2021.11.001/examples/shared/test_check_correctness.F90 elpa-new_release_2021.11.001_ok/examples/shared/test_check_correctness.F90
---- elpa-new_release_2021.11.001/examples/shared/test_check_correctness.F90	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/shared/test_check_correctness.F90	2022-01-26 10:10:58.369246000 +0100
-@@ -0,0 +1,156 @@
-+!    This file is part of ELPA.
-+!
-+!    The ELPA library was originally created by the ELPA consortium,
-+!    consisting of the following organizations:
-+!
-+!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
-+!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+!      Informatik,
-+!    - Technische Universität München, Lehrstuhl für Informatik mit
-+!      Schwerpunkt Wissenschaftliches Rechnen ,
-+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+!      and
-+!    - IBM Deutschland GmbH
-+!
-+!
-+!    More information can be found here:
-+!    http://elpa.mpcdf.mpg.de/
-+!
-+!    ELPA is free software: you can redistribute it and/or modify
-+!    it under the terms of the version 3 of the license of the
-+!    GNU Lesser General Public License as published by the Free
-+!    Software Foundation.
-+!
-+!    ELPA is distributed in the hope that it will be useful,
-+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+!    GNU Lesser General Public License for more details.
-+!
-+!    You should have received a copy of the GNU Lesser General Public License
-+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+!
-+!    ELPA reflects a substantial effort on the part of the original
-+!    ELPA consortium, and we ask you to respect the spirit of the
-+!    license that we chose: i.e., please contribute any changes you
-+!    may have back to the original ELPA library distribution, and keep
-+!    any derivatives of ELPA under the same license that we chose for
-+!    the original distribution, the GNU Lesser General Public License.
-+!
-+! Author: A. Marek, MPCDF
-+#include "config-f90.h"
-+
-+module test_check_correctness
-+  use test_util
-+
-+  interface check_correctness_evp_numeric_residuals
-+    module procedure check_correctness_evp_numeric_residuals_complex_double
-+    module procedure check_correctness_evp_numeric_residuals_real_double
-+#ifdef WANT_SINGLE_PRECISION_REAL
-+    module procedure check_correctness_evp_numeric_residuals_real_single
-+#endif
-+#ifdef WANT_SINGLE_PRECISION_COMPLEX
-+    module procedure check_correctness_evp_numeric_residuals_complex_single
-+#endif
-+  end interface
-+  
-+  interface check_correctness_evp_numeric_residuals_ss
-+!     module procedure check_correctness_evp_numeric_residuals_ss_complex_double
-+    module procedure check_correctness_evp_numeric_residuals_ss_real_double
-+#ifdef WANT_SINGLE_PRECISION_REAL
-+    module procedure check_correctness_evp_numeric_residuals_ss_real_single
-+#endif
-+! #ifdef WANT_SINGLE_PRECISION_COMPLEX
-+!     module procedure check_correctness_evp_numeric_residuals_ss_complex_single
-+! #endif
-+  end interface
-+
-+  interface check_correctness_eigenvalues_toeplitz
-+    module procedure check_correctness_eigenvalues_toeplitz_complex_double
-+    module procedure check_correctness_eigenvalues_toeplitz_real_double
-+#ifdef WANT_SINGLE_PRECISION_REAL
-+    module procedure check_correctness_eigenvalues_toeplitz_real_single
-+#endif
-+#ifdef WANT_SINGLE_PRECISION_COMPLEX
-+    module procedure check_correctness_eigenvalues_toeplitz_complex_single
-+#endif
-+  end interface
-+
-+  interface check_correctness_eigenvalues_frank
-+    module procedure check_correctness_eigenvalues_frank_complex_double
-+    module procedure check_correctness_eigenvalues_frank_real_double
-+#ifdef WANT_SINGLE_PRECISION_REAL
-+    module procedure check_correctness_eigenvalues_frank_real_single
-+#endif
-+#ifdef WANT_SINGLE_PRECISION_COMPLEX
-+    module procedure check_correctness_eigenvalues_frank_complex_single
-+#endif
-+  end interface
-+
-+  interface check_correctness_cholesky
-+    module procedure check_correctness_cholesky_complex_double
-+    module procedure check_correctness_cholesky_real_double
-+#ifdef WANT_SINGLE_PRECISION_REAL
-+    module procedure check_correctness_cholesky_real_single
-+#endif
-+#ifdef WANT_SINGLE_PRECISION_COMPLEX
-+    module procedure check_correctness_cholesky_complex_single
-+#endif
-+  end interface
-+
-+  interface check_correctness_hermitian_multiply
-+    module procedure check_correctness_hermitian_multiply_complex_double
-+    module procedure check_correctness_hermitian_multiply_real_double
-+#ifdef WANT_SINGLE_PRECISION_REAL
-+    module procedure check_correctness_hermitian_multiply_real_single
-+#endif
-+#ifdef WANT_SINGLE_PRECISION_COMPLEX
-+    module procedure check_correctness_hermitian_multiply_complex_single
-+#endif
-+  end interface
-+
-+
-+  contains
-+
-+#define COMPLEXCASE 1
-+#define DOUBLE_PRECISION 1
-+#include "../../src/general/precision_macros.h"
-+#include "test_check_correctness_template.F90"
-+#undef DOUBLE_PRECISION
-+#undef COMPLEXCASE
-+
-+#ifdef WANT_SINGLE_PRECISION_COMPLEX
-+
-+#define COMPLEXCASE 1
-+#define SINGLE_PRECISION 1
-+#include "../../src/general/precision_macros.h"
-+#include "test_check_correctness_template.F90"
-+#undef SINGLE_PRECISION
-+#undef COMPLEXCASE
-+#endif /* WANT_SINGLE_PRECISION_COMPLEX */
-+
-+#define REALCASE 1
-+#define DOUBLE_PRECISION 1
-+#include "../../src/general/precision_macros.h"
-+#include "test_check_correctness_template.F90"
-+#undef DOUBLE_PRECISION
-+#undef REALCASE
-+
-+#ifdef WANT_SINGLE_PRECISION_REAL
-+
-+#define REALCASE 1
-+#define SINGLE_PRECISION 1
-+#include "../../src/general/precision_macros.h"
-+#include "test_check_correctness_template.F90"
-+#undef SINGLE_PRECISION
-+#undef REALCASE
-+
-+
-+#endif /* WANT_SINGLE_PRECISION_REAL */
-+
-+#include "../../src/general/prow_pcol.F90"
-+#include "../../src/general/map_global_to_local.F90"
-+
-+end module
-diff -ruN elpa-new_release_2021.11.001/examples/shared/test_check_correctness_template.F90 elpa-new_release_2021.11.001_ok/examples/shared/test_check_correctness_template.F90
---- elpa-new_release_2021.11.001/examples/shared/test_check_correctness_template.F90	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/shared/test_check_correctness_template.F90	2022-01-26 10:10:58.370443000 +0100
-@@ -0,0 +1,1134 @@
-+!    This file is part of ELPA.
-+!
-+!    The ELPA library was originally created by the ELPA consortium,
-+!    consisting of the following organizations:
-+!
-+!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
-+!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+!      Informatik,
-+!    - Technische Universität München, Lehrstuhl für Informatik mit
-+!      Schwerpunkt Wissenschaftliches Rechnen ,
-+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+!      and
-+!    - IBM Deutschland GmbH
-+!
-+!
-+!    More information can be found here:
-+!    http://elpa.mpcdf.mpg.de/
-+!
-+!    ELPA is free software: you can redistribute it and/or modify
-+!    it under the terms of the version 3 of the license of the
-+!    GNU Lesser General Public License as published by the Free
-+!    Software Foundation.
-+!
-+!    ELPA is distributed in the hope that it will be useful,
-+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+!    GNU Lesser General Public License for more details.
-+!
-+!    You should have received a copy of the GNU Lesser General Public License
-+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+!
-+!    ELPA reflects a substantial effort on the part of the original
-+!    ELPA consortium, and we ask you to respect the spirit of the
-+!    license that we chose: i.e., please contribute any changes you
-+!    may have back to the original ELPA library distribution, and keep
-+!    any derivatives of ELPA under the same license that we chose for
-+!    the original distribution, the GNU Lesser General Public License.
-+!
-+! Author: A. Marek, MPCDF
-+
-+
-+#include "config-f90.h"
-+
-+#ifdef HAVE_64BIT_INTEGER_MATH_SUPPORT
-+#define TEST_INT_TYPE integer(kind=c_int64_t)
-+#define INT_TYPE lik
-+#define TEST_C_INT_TYPE_PTR long int*
-+#define TEST_C_INT_TYPE long int
-+#else
-+#define TEST_INT_TYPE integer(kind=c_int32_t)
-+#define INT_TYPE ik
-+#define TEST_C_INT_TYPE_PTR int*
-+#define TEST_C_INT_TYPE int
-+#endif
-+
-+#ifdef HAVE_64BIT_INTEGER_MPI_SUPPORT
-+#define TEST_INT_MPI_TYPE integer(kind=c_int64_t)
-+#define INT_MPI_TYPE lik
-+#define TEST_C_INT_MPI_TYPE_PTR long int*
-+#define TEST_C_INT_MPI_TYPE long int
-+#else
-+#define TEST_INT_MPI_TYPE integer(kind=c_int32_t)
-+#define INT_MPI_TYPE ik
-+#define TEST_C_INT_MPI_TYPE_PTR int*
-+#define TEST_C_INT_MPI_TYPE int
-+#endif
-+
-+#if REALCASE == 1
-+    function check_correctness_evp_numeric_residuals_ss_real_&
-+    &PRECISION&
-+    & (na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol) result(status)
-+      use tests_blas_interfaces
-+      use tests_scalapack_interfaces
-+      use precision_for_tests
-+      use iso_c_binding
-+      implicit none
-+#include "../../src/general/precision_kinds.F90"
-+      integer(kind=BLAS_KIND)             :: status, na_cols, na_rows
-+      integer(kind=BLAS_KIND), intent(in) :: na, nev, nblk, myid, np_rows, np_cols, my_prow, my_pcol
-+      real(kind=rk), intent(in)           :: as(:,:)
-+      real(kind=rk)                       :: tmpr
-+      complex(kind=rck), intent(in)       :: z(:,:)
-+      real(kind=rk)                       :: ev(:)
-+      complex(kind=rck), dimension(size(as,dim=1),size(as,dim=2)) :: tmp1, tmp2
-+      complex(kind=rck)                   :: xc
-+      
-+      complex(kind=rck), allocatable      :: as_complex(:,:)
-+
-+      integer(kind=BLAS_KIND)             :: sc_desc(:)
-+
-+      integer(kind=BLAS_KIND)             :: i, j, rowLocal, colLocal
-+      integer(kind=c_int)                 :: row_Local, col_Local
-+      real(kind=rck)                      :: err, errmax
-+
-+      integer :: mpierr
-+
-+      ! tolerance for the residual test for different math type/precision setups
-+      real(kind=rk), parameter       :: tol_res_real_double      = 5e-4_rk
-+      real(kind=rk), parameter       :: tol_res_real_single      = 3e-2_rk
-+      real(kind=rk), parameter       :: tol_res_complex_double   = 5e-12_rk
-+      real(kind=rk), parameter       :: tol_res_complex_single   = 3e-2_rk
-+      real(kind=rk)                  :: tol_res                  = tol_res_&
-+                                                                          &MATH_DATATYPE&
-+                                                                          &_&
-+                                                                          &PRECISION
-+      ! precision of generalized problem is lower
-+      real(kind=rk), parameter       :: generalized_penalty = 10.0_rk
-+
-+      ! tolerance for the orthogonality test for different math type/precision setups
-+!       real(kind=rk), parameter       :: tol_orth_real_double     = 5e-11_rk
-+      real(kind=rk), parameter       :: tol_orth_real_double     = 5e-4_rk
-+      real(kind=rk), parameter       :: tol_orth_real_single     = 9e-2_rk
-+      real(kind=rk), parameter       :: tol_orth_complex_double  = 5e-11_rk
-+      real(kind=rk), parameter       :: tol_orth_complex_single  = 9e-3_rk
-+      real(kind=rk), parameter       :: tol_orth                 = tol_orth_&
-+                                                                          &MATH_DATATYPE&
-+                                                                          &_&
-+                                                                          &PRECISION
-+                                                  
-+      complex(kind=rck), parameter   :: CZERO = (0.0_rck,0.0_rck), CONE = (1.0_rck,0.0_rck)
-+
-+
-+      status = 0
-+      ! Setup complex matrices and eigenvalues
-+      na_rows = size(as,dim=1)
-+      na_cols = size(as,dim=2)
-+      
-+      allocate(as_complex(na_rows,na_cols))
-+      do j=1, na_cols
-+        do i=1,na_rows
-+#ifdef DOUBLE_PRECISION_REAL
-+          as_complex(i,j) = dcmplx(as(i,j),0.0_rk)
-+#else
-+          as_complex(i,j) = cmplx(as(i,j),0.0_rk)
-+#endif
-+       enddo
-+      enddo
-+      
-+      ! 1. Residual (maximum of || A*Zi - Zi*EVi ||)
-+
-+      ! tmp1 = Zi*EVi
-+      tmp1(:,:) = z(:,:)
-+      do i=1,nev
-+#ifdef DOUBLE_PRECISION_REAL
-+        xc = dcmplx(0.0_rk,ev(i))
-+#else
-+        xc = cmplx(0.0_rk,ev(i))
-+#endif
-+#ifdef WITH_MPI
-+#ifdef DOUBLE_PRECISION_REAL
-+        call pzscal(int(na,kind=BLAS_KIND), xc, tmp1, 1_BLAS_KIND, int(i,kind=BLAS_KIND), sc_desc, 1_BLAS_KIND)
-+#else
-+        call pcscal(int(na,kind=BLAS_KIND), xc, tmp1, 1_BLAS_KIND, int(i,kind=BLAS_KIND), sc_desc, 1_BLAS_KIND)
-+#endif
-+#else /* WITH_MPI */
-+#ifdef DOUBLE_PRECISION_REAL
-+        call zscal(int(na,kind=BLAS_KIND), xc, tmp1(:,i), 1_BLAS_KIND)
-+#else
-+        call cscal(int(na,kind=BLAS_KIND), xc, tmp1(:,i), 1_BLAS_KIND)
-+#endif
-+#endif /* WITH_MPI */
-+      enddo
-+
-+      ! normal eigenvalue problem .. no need to multiply
-+        tmp2(:,:) = tmp1(:,:)
-+
-+      ! tmp1 =  A * Z
-+      ! as is original stored matrix, Z are the EVs
-+#ifdef WITH_MPI
-+#ifdef DOUBLE_PRECISION_REAL
-+      call PZGEMM('N', 'N', int(na,kind=BLAS_KIND), int(nev,kind=BLAS_KIND), int(na,kind=BLAS_KIND), &
-+                  CONE, as_complex, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc, &
-+                  z, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc, CZERO, tmp1, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc)
-+#else
-+      call PCGEMM('N', 'N', int(na,kind=BLAS_KIND), int(nev,kind=BLAS_KIND), int(na,kind=BLAS_KIND), &
-+                  CONE, as_complex, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc, &
-+                  z, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc, CZERO, tmp1, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc)
-+#endif
-+#else /* WITH_MPI */
-+#ifdef DOUBLE_PRECISION_REAL
-+      call ZGEMM('N','N',int(na,kind=BLAS_KIND), int(nev,kind=BLAS_KIND), int(na,kind=BLAS_KIND), CONE, &
-+                 as_complex, int(na,kind=BLAS_KIND), z,int(na,kind=BLAS_KIND), CZERO, tmp1, int(na,kind=BLAS_KIND) )
-+#else
-+      call CGEMM('N','N', int(na,kind=BLAS_KIND), int(nev,kind=BLAS_KIND), int(na,kind=BLAS_KIND), CONE, &
-+                  as_complex, int(na,kind=BLAS_KIND), z, int(na,kind=BLAS_KIND), CZERO, tmp1, int(na,kind=BLAS_KIND) )
-+#endif
-+#endif /* WITH_MPI */
-+
-+      !  tmp1 = A*Zi - Zi*EVi
-+      tmp1(:,:) =  tmp1(:,:) - tmp2(:,:)
-+      
-+      ! Get maximum norm of columns of tmp1
-+      errmax = 0.0_rk
-+
-+      do i=1,nev
-+        xc = (0.0_rk,0.0_rk)
-+#ifdef WITH_MPI
-+#ifdef DOUBLE_PRECISION_REAL
-+        call PZDOTC(int(na,kind=BLAS_KIND), xc, tmp1, 1_BLAS_KIND, int(i,kind=BLAS_KIND), sc_desc, &
-+                    1_BLAS_KIND, tmp1, 1_BLAS_KIND, int(i,kind=BLAS_KIND), sc_desc, 1_BLAS_KIND)
-+#else
-+        call PCDOTC(int(na,kind=BLAS_KIND), xc, tmp1, 1_BLAS_KIND, int(i,kind=BLAS_KIND), sc_desc, &
-+                    1_BLAS_KIND, tmp1, 1_BLAS_KIND, int(i,kind=BLAS_KIND), sc_desc, 1_BLAS_KIND)
-+#endif
-+#else /* WITH_MPI */
-+#ifdef DOUBLE_PRECISION_REAL
-+        xc = ZDOTC(int(na,kind=BLAS_KIND) ,tmp1, 1_BLAS_KIND, tmp1, 1_BLAS_KIND)
-+#else
-+        xc = CDOTC(int(na,kind=BLAS_KIND) ,tmp1, 1_BLAS_KIND, tmp1, 1_BLAS_KIND)
-+#endif
-+#endif /* WITH_MPI */
-+        errmax = max(errmax, sqrt(real(xc,kind=REAL_DATATYPE)))
-+      enddo
-+
-+      ! Get maximum error norm over all processors
-+      err = errmax
-+#ifdef WITH_MPI
-+      call mpi_allreduce(err, errmax, 1_MPI_KIND, MPI_REAL_PRECISION, MPI_MAX, int(MPI_COMM_WORLD,kind=MPI_KIND), mpierr)
-+#else /* WITH_MPI */
-+      errmax = err
-+#endif /* WITH_MPI */
-+      if (myid==0) print *,'%Results of numerical residual checks, using complex arithmetic:'
-+      if (myid==0) print *,'%Error Residual     :',errmax
-+      if (nev .ge. 2) then
-+        if (errmax .gt. tol_res .or. errmax .eq. 0.0_rk) then
-+          status = 1
-+        endif
-+      else
-+        if (errmax .gt. tol_res) then
-+          status = 1
-+        endif
-+      endif
-+
-+      ! 2. Eigenvector orthogonality
-+        tmp2(:,:) = z(:,:)
-+      tmp1 = 0
-+#ifdef WITH_MPI
-+#ifdef DOUBLE_PRECISION_REAL
-+      call PZGEMM('C', 'N', int(nev,kind=BLAS_KIND), int(nev,kind=BLAS_KIND), int(na,kind=BLAS_KIND), &
-+                  CONE, z, 1_BLAS_KIND, 1_BLAS_KIND, &
-+                  sc_desc, tmp2, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc, CZERO, tmp1, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc)
-+#else
-+      call PCGEMM('C', 'N', int(nev,kind=BLAS_KIND), int(nev,kind=BLAS_KIND), int(na,kind=BLAS_KIND), &
-+                  CONE, z, 1_BLAS_KIND, 1_BLAS_KIND, &
-+                  sc_desc, tmp2, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc, CZERO, tmp1, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc)
-+#endif
-+
-+#else /* WITH_MPI */
-+#ifdef DOUBLE_PRECISION_REAL
-+      call ZGEMM('C','N', int(nev,kind=BLAS_KIND) , int(nev,kind=BLAS_KIND), int(na,kind=BLAS_KIND),CONE, z, &
-+                 int(na,kind=BLAS_KIND), tmp2, int(na,kind=BLAS_KIND), CZERO, tmp1, int(na,kind=BLAS_KIND))
-+#else
-+      call CGEMM('C','N', int(nev,kind=BLAS_KIND) , int(nev,kind=BLAS_KIND), int(na,kind=BLAS_KIND),CONE, z, &
-+                 int(na,kind=BLAS_KIND), tmp2, int(na,kind=BLAS_KIND), CZERO, tmp1, int(na,kind=BLAS_KIND))
-+#endif
-+#endif /* WITH_MPI */
-+      ! First check, whether the elements on diagonal are 1 .. "normality" of the vectors
-+      err = 0.0_rk
-+      do i=1, nev
-+        if (map_global_array_index_to_local_index(int(i,kind=c_int), int(i,kind=c_int), row_Local, col_Local, &
-+                                                  int(nblk,kind=c_int), int(np_rows,kind=c_int), int(np_cols,kind=c_int), &
-+                                                  int(my_prow,kind=c_int), int(my_pcol,kind=c_int)) ) then
-+           rowLocal = int(row_Local,kind=INT_TYPE)
-+           colLocal = int(col_Local,kind=INT_TYPE)
-+           err = max(err, abs(tmp1(rowLocal,colLocal) - CONE))
-+         endif
-+      end do
-+#ifdef WITH_MPI
-+      call mpi_allreduce(err, errmax, 1_MPI_KIND, MPI_REAL_PRECISION, MPI_MAX, int(MPI_COMM_WORLD,kind=MPI_KIND), mpierr)
-+#else /* WITH_MPI */
-+      errmax = err
-+#endif /* WITH_MPI */
-+      if (myid==0) print *,'%Maximal error in eigenvector lengths:',errmax
-+
-+      ! Second, find the maximal error in the whole Z**T * Z matrix (its diference from identity matrix)
-+      ! Initialize tmp2 to unit matrix
-+      tmp2 = 0
-+#ifdef WITH_MPI
-+#ifdef DOUBLE_PRECISION_REAL
-+      call PZLASET('A', int(nev,kind=BLAS_KIND), int(nev,kind=BLAS_KIND), CZERO, CONE, tmp2, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc)
-+#else
-+      call PCLASET('A', int(nev,kind=BLAS_KIND), int(nev,kind=BLAS_KIND), CZERO, CONE, tmp2, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc)
-+#endif
-+#else /* WITH_MPI */
-+#ifdef DOUBLE_PRECISION_REAL
-+      call ZLASET('A',int(nev,kind=BLAS_KIND) ,int(nev,kind=BLAS_KIND) ,CZERO, CONE, tmp2, int(na,kind=BLAS_KIND))
-+#else
-+      call CLASET('A',int(nev,kind=BLAS_KIND) ,int(nev,kind=BLAS_KIND) ,CZERO, CONE, tmp2, int(na,kind=BLAS_KIND))
-+#endif
-+#endif /* WITH_MPI */
-+
-+      !      ! tmp1 = Z**T * Z - Unit Matrix
-+      tmp1(:,:) =  tmp1(:,:) - tmp2(:,:)
-+
-+      ! Get maximum error (max abs value in tmp1)
-+      err = maxval(abs(tmp1))
-+#ifdef WITH_MPI
-+      call mpi_allreduce(err, errmax, 1_MPI_KIND, MPI_REAL_PRECISION, MPI_MAX, int(MPI_COMM_WORLD,kind=MPI_KIND), mpierr)
-+#else /* WITH_MPI */
-+      errmax = err
-+#endif /* WITH_MPI */
-+      if (myid==0) print *,'%Error Orthogonality:',errmax
-+
-+      if (nev .ge. 2) then
-+        if (errmax .gt. tol_orth .or. errmax .eq. 0.0_rk) then
-+          status = 1
-+        endif
-+      else
-+        if (errmax .gt. tol_orth) then
-+          status = 1
-+        endif
-+      endif
-+      
-+      deallocate(as_complex)
-+    end function
-+
-+#endif /* REALCASE */
-+
-+#if REALCASE == 1
-+#ifdef DOUBLE_PRECISION_REAL
-+    !c> TEST_C_INT_TYPE check_correctness_evp_numeric_residuals_ss_real_double_f(TEST_C_INT_TYPE na, TEST_C_INT_TYPE nev, TEST_C_INT_TYPE na_rows, TEST_C_INT_TYPE na_cols,
-+    !c>                                         double *as, complex double *z, double *ev,  TEST_C_INT_TYPE sc_desc[9],
-+    !c>                                         TEST_C_INT_TYPE nblk, TEST_C_INT_TYPE myid, TEST_C_INT_TYPE np_rows, TEST_C_INT_TYPE np_cols, TEST_C_INT_TYPE my_prow, TEST_C_INT_TYPE my_pcol);
-+#else
-+    !c> TEST_C_INT_TYPE check_correctness_evp_numeric_residuals_ss_real_single_f(TEST_C_INT_TYPE na, TEST_C_INT_TYPE nev, TEST_C_INT_TYPE na_rows, TEST_C_INT_TYPE na_cols,
-+    !c>                                         float *as, complex float *z, float *ev, TEST_C_INT_TYPE sc_desc[9],
-+    !c>                                         TEST_C_INT_TYPE nblk, TEST_C_INT_TYPE myid, TEST_C_INT_TYPE np_rows, TEST_C_INT_TYPE np_cols, TEST_C_INT_TYPE my_prow, TEST_C_INT_TYPE my_pcol);
-+#endif
-+#endif /* REALCASE */
-+
-+#if REALCASE == 1
-+function check_correctness_evp_numeric_residuals_ss_real_&
-+&PRECISION&
-+&_f (na, nev, na_rows, na_cols, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol) result(status) &
-+      bind(C,name="check_correctness_evp_numeric_residuals_ss_&
-+      &MATH_DATATYPE&
-+      &_&
-+      &PRECISION&
-+      &_f")
-+
-+      use precision_for_tests
-+      use iso_c_binding
-+
-+      implicit none
-+#include "./test_precision_kinds.F90"
-+
-+      TEST_INT_TYPE            :: status
-+      TEST_INT_TYPE, value     :: na, nev, myid, na_rows, na_cols, nblk, np_rows, np_cols, my_prow, my_pcol
-+      real(kind=rck)            :: as(1:na_rows,1:na_cols)
-+      complex(kind=rck)         :: z(1:na_rows,1:na_cols)
-+      real(kind=rck)            :: ev(1:na)
-+      TEST_INT_TYPE            :: sc_desc(1:9)
-+
-+      status = check_correctness_evp_numeric_residuals_ss_real_&
-+      &PRECISION&
-+      & (na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
-+    end function
-+#endif /* REALCASE */
-+
-+function check_correctness_evp_numeric_residuals_&
-+    &MATH_DATATYPE&
-+    &_&
-+    &PRECISION&
-+    & (na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol, bs) result(status)
-+ 
-+      use tests_blas_interfaces
-+      use tests_scalapack_interfaces
-+      use precision_for_tests
-+      implicit none
-+#include "./test_precision_kinds.F90"
-+      TEST_INT_TYPE                                 :: status
-+      TEST_INT_TYPE, intent(in)                     :: na, nev, nblk, myid, np_rows, np_cols, my_prow, my_pcol
-+      MATH_DATATYPE(kind=rck), intent(in)           :: as(:,:), z(:,:)
-+      MATH_DATATYPE(kind=rck), intent(in), optional :: bs(:,:)
-+      real(kind=rk)                                 :: ev(:)
-+      MATH_DATATYPE(kind=rck), dimension(size(as,dim=1),size(as,dim=2)) :: tmp1, tmp2
-+      MATH_DATATYPE(kind=rck)                       :: xc
-+
-+      TEST_INT_TYPE                 :: sc_desc(:)
-+
-+      TEST_INT_TYPE                 :: i, rowLocal, colLocal
-+      integer(kind=c_int)           :: row_Local, col_Local
-+      real(kind=rck)                :: err, errmax
-+
-+      TEST_INT_MPI_TYPE             :: mpierr
-+
-+! tolerance for the residual test for different math type/precision setups
-+      real(kind=rk), parameter       :: tol_res_real_double      = 5e-12_rk
-+      real(kind=rk), parameter       :: tol_res_real_single      = 3e-2_rk
-+      real(kind=rk), parameter       :: tol_res_complex_double   = 5e-12_rk
-+      real(kind=rk), parameter       :: tol_res_complex_single   = 3e-2_rk
-+      real(kind=rk)                  :: tol_res                  = tol_res_&
-+                                                                          &MATH_DATATYPE&
-+                                                                          &_&
-+                                                                          &PRECISION
-+      ! precision of generalized problem is lower
-+      real(kind=rk), parameter       :: generalized_penalty = 10.0_rk
-+
-+      ! tolerance for the orthogonality test for different math type/precision setups
-+      real(kind=rk), parameter       :: tol_orth_real_double     = 5e-11_rk
-+      real(kind=rk), parameter       :: tol_orth_real_single     = 9e-2_rk
-+      real(kind=rk), parameter       :: tol_orth_complex_double  = 5e-11_rk
-+      real(kind=rk), parameter       :: tol_orth_complex_single  = 9e-3_rk
-+      real(kind=rk), parameter       :: tol_orth                 = tol_orth_&
-+                                                                          &MATH_DATATYPE&
-+                                                                          &_&
-+                                                                          &PRECISION
-+
-+      if (present(bs)) then
-+        tol_res = generalized_penalty * tol_res
-+      endif
-+      status = 0
-+
-+      ! 1. Residual (maximum of || A*Zi - Zi*EVi ||)
-+     
-+!       tmp1 = Zi*EVi
-+      tmp1(:,:) = z(:,:)
-+      do i=1,nev
-+        xc = ev(i)
-+#ifdef WITH_MPI
-+        call p&
-+            &BLAS_CHAR&
-+            &scal(na, xc, tmp1, 1_BLAS_KIND, i, sc_desc, 1_BLAS_KIND)
-+#else /* WITH_MPI */
-+        call BLAS_CHAR&
-+            &scal(na, xc, tmp1(:,i), 1_BLAS_KIND)
-+#endif /* WITH_MPI */
-+      enddo
-+
-+      ! for generalized EV problem, multiply by bs as well
-+      ! tmp2 = B * tmp1
-+      if(present(bs)) then
-+#ifdef WITH_MPI
-+      call scal_PRECISION_GEMM('N', 'N', na, nev, na, ONE, bs, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc, &
-+                               tmp1, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc, ZERO, tmp2, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc)
-+#else /* WITH_MPI */
-+      call PRECISION_GEMM('N','N',na,nev,na,ONE,bs,na,tmp1,na,ZERO,tmp2,na)
-+#endif /* WITH_MPI */
-+      else
-+        ! normal eigenvalue problem .. no need to multiply
-+        tmp2(:,:) = tmp1(:,:)
-+      end if
-+
-+      ! tmp1 =  A * Z
-+      ! as is original stored matrix, Z are the EVs
-+#ifdef WITH_MPI
-+      call scal_PRECISION_GEMM('N', 'N', na, nev, na, ONE, as, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc, &
-+                  z, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc, ZERO, tmp1, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc)
-+#else /* WITH_MPI */
-+      call PRECISION_GEMM('N','N',na,nev,na,ONE,as,na,z,na,ZERO,tmp1,na)
-+#endif /* WITH_MPI */
-+
-+      !  tmp1 = A*Zi - Zi*EVi
-+      tmp1(:,:) =  tmp1(:,:) - tmp2(:,:)
-+
-+      ! Get maximum norm of columns of tmp1
-+      errmax = 0.0_rk
-+
-+      do i=1,nev
-+#if REALCASE == 1
-+        err = 0.0_rk
-+#ifdef WITH_MPI
-+        call scal_PRECISION_NRM2(na, err, tmp1, 1_BLAS_KIND, i, sc_desc, 1_BLAS_KIND)
-+#else /* WITH_MPI */
-+        err = PRECISION_NRM2(na,tmp1(1,i),1_BLAS_KIND)
-+#endif /* WITH_MPI */
-+        errmax = max(errmax, err)
-+#endif /* REALCASE */
-+
-+#if COMPLEXCASE == 1
-+        xc = 0
-+#ifdef WITH_MPI
-+        call scal_PRECISION_DOTC(na, xc, tmp1, 1_BLAS_KIND, i, sc_desc, &
-+                                 1_BLAS_KIND, tmp1, 1_BLAS_KIND, i, sc_desc, 1_BLAS_KIND)
-+#else /* WITH_MPI */
-+        xc = PRECISION_DOTC(na,tmp1,1_BLAS_KIND,tmp1,1_BLAS_KIND)
-+#endif /* WITH_MPI */
-+        errmax = max(errmax, sqrt(real(xc,kind=REAL_DATATYPE)))
-+#endif /* COMPLEXCASE */
-+      enddo
-+
-+      ! Get maximum error norm over all processors
-+      err = errmax
-+#ifdef WITH_MPI
-+      call mpi_allreduce(err, errmax, 1_MPI_KIND, MPI_REAL_PRECISION, MPI_MAX, MPI_COMM_WORLD, mpierr)
-+#else /* WITH_MPI */
-+      errmax = err
-+#endif /* WITH_MPI */
-+      if (myid==0) print *,'Results of numerical residual checks:'
-+      if (myid==0) print *,'Error Residual     :',errmax
-+      if (nev .ge. 2) then
-+        if (errmax .gt. tol_res .or. errmax .eq. 0.0_rk) then
-+          status = 1
-+        endif
-+      else
-+        if (errmax .gt. tol_res) then
-+          status = 1
-+        endif
-+      endif
-+
-+      ! 2. Eigenvector orthogonality
-+      if(present(bs)) then
-+        !for the generalized EVP, the eigenvectors should be B-orthogonal, not orthogonal
-+        ! tmp2 = B * Z
-+        tmp2(:,:) = 0.0_rck
-+#ifdef WITH_MPI
-+        call scal_PRECISION_GEMM('N', 'N', na, nev, na, ONE, bs, 1_BLAS_KIND, 1_BLAS_KIND, &
-+                        sc_desc, z, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc, ZERO, tmp2, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc)
-+#else /* WITH_MPI */
-+        call PRECISION_GEMM('N','N', na, nev, na, ONE, bs, na, z, na, ZERO, tmp2, na)
-+#endif /* WITH_MPI */
-+
-+      else
-+        tmp2(:,:) = z(:,:)
-+      endif
-+      ! tmp1 = Z**T * tmp2
-+      ! actually tmp1 = Z**T * Z for standard case and tmp1 = Z**T * B * Z for generalized
-+      tmp1 = 0
-+#ifdef WITH_MPI
-+      call scal_PRECISION_GEMM(BLAS_TRANS_OR_CONJ, 'N', nev, nev, na, ONE, z, 1_BLAS_KIND, 1_BLAS_KIND, &
-+                        sc_desc, tmp2, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc, ZERO, &
-+                        tmp1, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc)
-+#else /* WITH_MPI */
-+      call PRECISION_GEMM(BLAS_TRANS_OR_CONJ,'N',nev,nev,na,ONE,z,na,tmp2,na,ZERO,tmp1,na)
-+#endif /* WITH_MPI */
-+      ! First check, whether the elements on diagonal are 1 .. "normality" of the vectors
-+      err = 0.0_rk
-+      do i=1, nev
-+        if (map_global_array_index_to_local_index(int(i,kind=c_int), int(i,kind=c_int) , row_Local, col_Local, &
-+                                                  int(nblk,kind=c_int), int(np_rows,kind=c_int), &
-+                                                  int(np_cols,kind=c_int), int(my_prow,kind=c_int), &
-+                                                  int(my_pcol,kind=c_int) )) then
-+           rowLocal = int(row_Local,kind=INT_TYPE)
-+           colLocal = int(col_Local,kind=INT_TYPE)
-+           err = max(err, abs(tmp1(rowLocal,colLocal) - 1.0_rk))
-+         endif
-+      end do
-+#ifdef WITH_MPI
-+      call mpi_allreduce(err, errmax, 1_MPI_KIND, MPI_REAL_PRECISION, MPI_MAX, MPI_COMM_WORLD, mpierr)
-+#else /* WITH_MPI */
-+      errmax = err
-+#endif /* WITH_MPI */
-+      if (myid==0) print *,'Maximal error in eigenvector lengths:',errmax
-+
-+      ! Second, find the maximal error in the whole Z**T * Z matrix (its diference from identity matrix)
-+      ! Initialize tmp2 to unit matrix
-+      tmp2 = 0
-+#ifdef WITH_MPI
-+      call scal_PRECISION_LASET('A', nev, nev, ZERO, ONE, tmp2, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc)
-+#else /* WITH_MPI */
-+      call PRECISION_LASET('A',nev,nev,ZERO,ONE,tmp2,na)
-+#endif /* WITH_MPI */
-+
-+      !      ! tmp1 = Z**T * Z - Unit Matrix
-+      tmp1(:,:) =  tmp1(:,:) - tmp2(:,:)
-+
-+      ! Get maximum error (max abs value in tmp1)
-+      err = maxval(abs(tmp1))
-+#ifdef WITH_MPI
-+      call mpi_allreduce(err, errmax, 1_MPI_KIND, MPI_REAL_PRECISION, MPI_MAX, MPI_COMM_WORLD, mpierr)
-+#else /* WITH_MPI */
-+      errmax = err
-+#endif /* WITH_MPI */
-+      if (myid==0) print *,'Error Orthogonality:',errmax
-+
-+      if (nev .ge. 2) then
-+        if (errmax .gt. tol_orth .or. errmax .eq. 0.0_rk) then
-+          status = 1
-+        endif
-+      else
-+        if (errmax .gt. tol_orth) then
-+          status = 1
-+        endif
-+      endif
-+    end function
-+
-+#if REALCASE == 1
-+#ifdef DOUBLE_PRECISION_REAL
-+    !c> TEST_C_INT_TYPE check_correctness_evp_numeric_residuals_real_double_f(TEST_C_INT_TYPE na, TEST_C_INT_TYPE nev,
-+    !c>                                                                       TEST_C_INT_TYPE na_rows, TEST_C_INT_TYPE na_cols,
-+    !c>                                                                       double *as, double *z, double *ev, 
-+    !c>                                                                       TEST_C_INT_TYPE sc_desc[9],
-+    !c>                                                                       TEST_C_INT_TYPE nblk, TEST_C_INT_TYPE myid, 
-+    !c>                                                                       TEST_C_INT_TYPE np_rows, 
-+    !c>                                                                       TEST_C_INT_TYPE np_cols, 
-+    !c>                                                                       TEST_C_INT_TYPE my_prow, TEST_C_INT_TYPE my_pcol);
-+#else
-+    !c> TEST_C_INT_TYPE check_correctness_evp_numeric_residuals_real_single_f(TEST_C_INT_TYPE na, TEST_C_INT_TYPE nev, 
-+    !c>                                                                       TEST_C_INT_TYPE na_rows, TEST_C_INT_TYPE na_cols,
-+    !c>                                                                       float *as, float *z, float *ev, 
-+    !c>                                                                       TEST_C_INT_TYPE sc_desc[9],
-+    !c>                                                                       TEST_C_INT_TYPE nblk, TEST_C_INT_TYPE myid, 
-+    !c>                                                                       TEST_C_INT_TYPE np_rows, 
-+    !c>                                                                       TEST_C_INT_TYPE np_cols, 
-+    !c>                                                                       TEST_C_INT_TYPE my_prow, TEST_C_INT_TYPE my_pcol);
-+#endif
-+#endif /* REALCASE */
-+
-+#if COMPLEXCASE == 1
-+#ifdef DOUBLE_PRECISION_COMPLEX
-+    !c> TEST_C_INT_TYPE check_correctness_evp_numeric_residuals_complex_double_f(TEST_C_INT_TYPE na, TEST_C_INT_TYPE nev, 
-+    !c>                                                              TEST_C_INT_TYPE na_rows, TEST_C_INT_TYPE na_cols,
-+    !c>                                                              complex double *as, complex double *z, double *ev, 
-+    !c>                                                              TEST_C_INT_TYPE sc_desc[9],
-+    !c>                                                              TEST_C_INT_TYPE nblk, TEST_C_INT_TYPE myid, 
-+    !c>                                                              TEST_C_INT_TYPE np_rows, TEST_C_INT_TYPE np_cols, 
-+    !c>                                                              TEST_C_INT_TYPE my_prow, TEST_C_INT_TYPE my_pcol);
-+#else
-+    !c> TEST_C_INT_TYPE check_correctness_evp_numeric_residuals_complex_single_f(TEST_C_INT_TYPE na, TEST_C_INT_TYPE nev, 
-+    !c>                                                                  TEST_C_INT_TYPE na_rows, TEST_C_INT_TYPE na_cols,
-+    !c>                                                                  complex float *as, complex float *z, float *ev, 
-+    !c>                                                                  TEST_C_INT_TYPE sc_desc[9],
-+    !c>                                                                  TEST_C_INT_TYPE nblk, TEST_C_INT_TYPE myid, 
-+    !c>                                                                  TEST_C_INT_TYPE np_rows, TEST_C_INT_TYPE np_cols, 
-+    !c>                                                                  TEST_C_INT_TYPE my_prow, TEST_C_INT_TYPE my_pcol);
-+#endif
-+#endif /* COMPLEXCASE */
-+
-+function check_correctness_evp_numeric_residuals_&
-+&MATH_DATATYPE&
-+&_&
-+&PRECISION&
-+&_f (na, nev, na_rows, na_cols, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol) result(status) &
-+      bind(C,name="check_correctness_evp_numeric_residuals_&
-+      &MATH_DATATYPE&
-+      &_&
-+      &PRECISION&
-+      &_f")
-+
-+      use precision_for_tests
-+      use iso_c_binding
-+
-+      implicit none
-+#include "./test_precision_kinds.F90"
-+
-+      TEST_INT_TYPE            :: status
-+      TEST_INT_TYPE, value     :: na, nev, myid, na_rows, na_cols, nblk, np_rows, np_cols, my_prow, my_pcol
-+      MATH_DATATYPE(kind=rck)  :: as(1:na_rows,1:na_cols), z(1:na_rows,1:na_cols)
-+      real(kind=rck)           :: ev(1:na)
-+      TEST_INT_TYPE            :: sc_desc(1:9)
-+
-+      status = check_correctness_evp_numeric_residuals_&
-+      &MATH_DATATYPE&
-+      &_&
-+      &PRECISION&
-+      & (na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
-+
-+    end function
-+
-+!---- variant for the generalized eigenproblem
-+!---- unlike in Fortran, we cannot use optional parameter
-+!---- we thus define a different function
-+#if REALCASE == 1
-+#ifdef DOUBLE_PRECISION_REAL
-+    !c> TEST_C_INT_TYPE check_correctness_evp_gen_numeric_residuals_real_double_f(TEST_C_INT_TYPE na, TEST_C_INT_TYPE nev, 
-+    !c>                                                               TEST_C_INT_TYPE na_rows, TEST_C_INT_TYPE na_cols,
-+    !c>                                                               double *as, double *z, double *ev,
-+    !c>                                                               TEST_C_INT_TYPE sc_desc[9],
-+    !c>                                                               TEST_C_INT_TYPE nblk, TEST_C_INT_TYPE myid, 
-+    !c>                                                               TEST_C_INT_TYPE np_rows, TEST_C_INT_TYPE np_cols, 
-+    !c>                                                               TEST_C_INT_TYPE my_prow, TEST_C_INT_TYPE my_pcol,
-+    !c>                                                               double *bs);
-+#else
-+    !c> TEST_C_INT_TYPE check_correctness_evp_gen_numeric_residuals_real_single_f(TEST_C_INT_TYPE na, TEST_C_INT_TYPE nev, 
-+    !c>                                                                           TEST_C_INT_TYPE na_rows, TEST_C_INT_TYPE na_cols,
-+    !c>                                                                           float *as, float *z, float *ev, 
-+    !c>                                                                           TEST_C_INT_TYPE sc_desc[9],
-+    !c>                                                                           TEST_C_INT_TYPE nblk, TEST_C_INT_TYPE myid,
-+    !c>                                                                           TEST_C_INT_TYPE np_rows, 
-+    !c>                                                                           TEST_C_INT_TYPE np_cols, 
-+    !c>                                                                           TEST_C_INT_TYPE my_prow, 
-+    !c>                                                                           TEST_C_INT_TYPE my_pcol, 
-+    !c>                                                                           float *bs);
-+#endif
-+#endif /* REALCASE */
-+
-+#if COMPLEXCASE == 1
-+#ifdef DOUBLE_PRECISION_COMPLEX
-+    !c> TEST_C_INT_TYPE check_correctness_evp_gen_numeric_residuals_complex_double_f(TEST_C_INT_TYPE na, TEST_C_INT_TYPE nev,
-+    !c>                                                                    TEST_C_INT_TYPE na_rows, TEST_C_INT_TYPE na_cols,
-+    !c>                                                                    complex double *as, complex double *z, double *ev,
-+    !c>                                                                    TEST_C_INT_TYPE sc_desc[9],
-+    !c>                                                                    TEST_C_INT_TYPE nblk, TEST_C_INT_TYPE myid, 
-+    !c>                                                                    TEST_C_INT_TYPE np_rows, TEST_C_INT_TYPE np_cols,
-+    !c>                                                                    TEST_C_INT_TYPE my_prow, TEST_C_INT_TYPE my_pcol,
-+    !c>                                                                    complex double *bs);
-+#else
-+    !c> TEST_C_INT_TYPE check_correctness_evp_gen_numeric_residuals_complex_single_f(TEST_C_INT_TYPE na, TEST_C_INT_TYPE nev,
-+    !c>                                                                    TEST_C_INT_TYPE na_rows, TEST_C_INT_TYPE na_cols,
-+    !c>                                                                    complex float *as, complex float *z, float *ev, 
-+    !c>                                                                    TEST_C_INT_TYPE sc_desc[9],
-+    !c>                                                                    TEST_C_INT_TYPE nblk, TEST_C_INT_TYPE myid, 
-+    !c>                                                                    TEST_C_INT_TYPE np_rows, TEST_C_INT_TYPE np_cols, 
-+    !c>                                                                    TEST_C_INT_TYPE my_prow, TEST_C_INT_TYPE my_pcol,
-+    !c>                                                                    complex float *bs);
-+#endif
-+#endif /* COMPLEXCASE */
-+
-+function check_correctness_evp_gen_numeric_residuals_&
-+&MATH_DATATYPE&
-+&_&
-+&PRECISION&
-+&_f (na, nev, na_rows, na_cols, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol, bs) result(status) &
-+      bind(C,name="check_correctness_evp_gen_numeric_residuals_&
-+      &MATH_DATATYPE&
-+      &_&
-+      &PRECISION&
-+      &_f")
-+
-+      use iso_c_binding
-+      use precision_for_tests
-+      implicit none
-+#include "./test_precision_kinds.F90"
-+
-+      TEST_INT_TYPE            :: status
-+      TEST_INT_TYPE, value     :: na, nev, myid, na_rows, na_cols, nblk, np_rows, np_cols, my_prow, my_pcol
-+      MATH_DATATYPE(kind=rck)  :: as(1:na_rows,1:na_cols), z(1:na_rows,1:na_cols), bs(1:na_rows,1:na_cols)
-+      real(kind=rck)           :: ev(1:na)
-+      TEST_INT_TYPE            :: sc_desc(1:9)
-+
-+      status = check_correctness_evp_numeric_residuals_&
-+      &MATH_DATATYPE&
-+      &_&
-+      &PRECISION&
-+      & (na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol, bs)
-+
-+    end function
-+
-+    !-----------------------------------------------------------------------------------------------------------
-+
-+    function check_correctness_eigenvalues_toeplitz_&
-+    &MATH_DATATYPE&
-+    &_&
-+    &PRECISION&
-+    & (na, diagonalElement, subdiagonalElement, ev, z, myid) result(status)
-+      use iso_c_binding
-+      use precision_for_tests
-+      implicit none
-+#include "./test_precision_kinds.F90"
-+
-+      TEST_INT_TYPE               :: status, ii, j, myid
-+      TEST_INT_TYPE, intent(in)   :: na
-+      real(kind=rck) :: diagonalElement, subdiagonalElement
-+      real(kind=rck) :: ev_analytic(na), ev(na)
-+      MATH_DATATYPE(kind=rck) :: z(:,:)
-+
-+#if defined(DOUBLE_PRECISION_REAL) || defined(DOUBLE_PRECISION_COMPLEX)
-+      real(kind=rck), parameter   :: pi = 3.141592653589793238462643383279_c_double
-+#else
-+      real(kind=rck), parameter   :: pi = 3.1415926535897932_c_float
-+#endif
-+      real(kind=rck)              :: tmp, maxerr
-+      TEST_INT_TYPE               :: loctmp
-+      status = 0
-+
-+     ! analytic solution
-+     do ii=1, na
-+       ev_analytic(ii) = diagonalElement + 2.0_rk * &
-+                         subdiagonalElement *cos( pi*real(ii,kind=rk)/ &
-+                         real(na+1,kind=rk) )
-+     enddo
-+
-+     ! sort analytic solution:
-+
-+     ! this hack is neither elegant, nor optimized: for huge matrixes it might be expensive
-+     ! a proper sorting algorithmus might be implemented here
-+
-+     tmp    = minval(ev_analytic)
-+     loctmp = minloc(ev_analytic, 1)
-+
-+     ev_analytic(loctmp) = ev_analytic(1)
-+     ev_analytic(1) = tmp
-+     do ii=2, na
-+       tmp = ev_analytic(ii)
-+       do j= ii, na
-+         if (ev_analytic(j) .lt. tmp) then
-+           tmp    = ev_analytic(j)
-+           loctmp = j
-+         endif
-+       enddo
-+       ev_analytic(loctmp) = ev_analytic(ii)
-+       ev_analytic(ii) = tmp
-+     enddo
-+
-+     ! compute a simple error max of eigenvalues
-+     maxerr = 0.0
-+     maxerr = maxval( (ev(:) - ev_analytic(:))/ev_analytic(:) , 1)
-+
-+#if defined(DOUBLE_PRECISION_REAL) || defined(DOUBLE_PRECISION_COMPLEX)
-+     if (abs(maxerr) .gt. 8.e-13_c_double) then
-+#else
-+     if (abs(maxerr) .gt. 8.e-4_c_float) then
-+#endif
-+       status = 1
-+       if (myid .eq. 0) then
-+         print *,"Result of Toeplitz matrix test: "
-+         print *,"Eigenvalues differ from analytic solution: maxerr = ",abs(maxerr)
-+       endif
-+     endif
-+
-+    if (status .eq. 0) then
-+       if (myid .eq. 0) then
-+         print *,"Result of Toeplitz matrix test: test passed"
-+         print *,"Eigenvalues differ from analytic solution: maxerr = ",abs(maxerr)
-+       endif
-+    endif
-+    end function
-+
-+    function check_correctness_cholesky_&
-+    &MATH_DATATYPE&
-+    &_&
-+    &PRECISION&
-+    & (na, a, as, na_rows, sc_desc, myid) result(status)
-+      use precision_for_tests
-+      use tests_blas_interfaces
-+      use tests_scalapack_interfaces
-+      implicit none
-+#include "./test_precision_kinds.F90"
-+      TEST_INT_TYPE                                                     :: status
-+      TEST_INT_TYPE, intent(in)                                         :: na, myid, na_rows
-+
-+      MATH_DATATYPE(kind=rck), intent(in)                               :: a(:,:), as(:,:)
-+      MATH_DATATYPE(kind=rck), dimension(size(as,dim=1),size(as,dim=2)) :: tmp1, tmp2
-+#if COMPLEXCASE == 1
-+      ! needed for [z,c]lange from scalapack
-+      real(kind=rk), dimension(2*size(as,dim=1),size(as,dim=2))         :: tmp1_real
-+#endif
-+      real(kind=rk)                                                     :: norm, normmax
-+
-+      TEST_INT_TYPE                                                     :: sc_desc(:)
-+      real(kind=rck)                                                    :: err, errmax
-+      TEST_INT_MPI_TYPE                                                 :: mpierr
-+
-+      status = 0
-+      tmp1(:,:) = 0.0_rck
-+
-+
-+#if REALCASE == 1
-+      ! tmp1 = a**T
-+#ifdef WITH_MPI
-+      call p&
-+          &BLAS_CHAR&
-+          &tran(na, na, 1.0_rck, a, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc, &
-+                0.0_rck, tmp1, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc)
-+#else /* WITH_MPI */
-+      tmp1 = transpose(a)
-+#endif /* WITH_MPI */
-+#endif /* REALCASE == 1 */
-+
-+#if COMPLEXCASE == 1
-+      ! tmp1 = a**H
-+#ifdef WITH_MPI
-+      call p&
-+            &BLAS_CHAR&
-+            &tranc(na, na, ONE, a, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc, &
-+                   ZERO, tmp1, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc)
-+#else /* WITH_MPI */
-+      tmp1 = transpose(conjg(a))
-+#endif /* WITH_MPI */
-+#endif /* COMPLEXCASE == 1 */
-+
-+      ! tmp2 = a**T * a
-+#ifdef WITH_MPI
-+      call p&
-+            &BLAS_CHAR&
-+            &gemm("N","N", na, na, na, ONE, tmp1, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc, &
-+                  a, 1_BLAS_KIND, 1_BLAS_KIND, &
-+                  sc_desc, ZERO, tmp2, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc)
-+#else /* WITH_MPI */
-+      call BLAS_CHAR&
-+                    &gemm("N","N", na, na, na, ONE, tmp1, na, a, na, ZERO, tmp2, na)
-+#endif /* WITH_MPI */
-+
-+      ! compare tmp2 with original matrix
-+      tmp2(:,:) = tmp2(:,:) - as(:,:)
-+
-+#ifdef WITH_MPI
-+      norm = p&
-+              &BLAS_CHAR&
-+              &lange("M",na, na, tmp2, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc, &
-+#if COMPLEXCASE == 1
-+              tmp1_real)
-+#else
-+              tmp1)
-+#endif
-+#else /* WITH_MPI */
-+      norm = BLAS_CHAR&
-+             &lange("M", na, na, tmp2, na_rows, &
-+#if COMPLEXCASE == 1
-+             tmp1_real)
-+#else
-+             tmp1)
-+#endif
-+#endif /* WITH_MPI */
-+
-+
-+#ifdef WITH_MPI
-+      call mpi_allreduce(norm, normmax, 1_MPI_KIND, MPI_REAL_PRECISION, MPI_MAX, MPI_COMM_WORLD, mpierr)
-+#else /* WITH_MPI */
-+      normmax = norm
-+#endif /* WITH_MPI */
-+
-+      if (myid .eq. 0) then
-+        print *," Maximum error of result: ", normmax
-+      endif
-+
-+#if REALCASE == 1
-+#ifdef DOUBLE_PRECISION_REAL
-+!      if (normmax .gt. 5e-12_rk8 .or. normmax .eq. 0.0_rk8) then
-+      if (normmax .gt. 5e-12_rk8) then
-+        status = 1
-+      endif
-+#else
-+!      if (normmax .gt. 5e-4_rk4 .or. normmax .eq. 0.0_rk4) then
-+      if (normmax .gt. 5e-4_rk4 ) then
-+        status = 1
-+      endif
-+#endif
-+#endif
-+
-+#if COMPLEXCASE == 1
-+#ifdef DOUBLE_PRECISION_COMPLEX
-+!      if (normmax .gt. 5e-11_rk8 .or. normmax .eq. 0.0_rk8) then
-+      if (normmax .gt. 5e-11_rk8 ) then
-+        status = 1
-+      endif
-+#else
-+!      if (normmax .gt. 5e-3_rk4 .or. normmax .eq. 0.0_rk4) then
-+      if (normmax .gt. 5e-3_rk4) then
-+        status = 1
-+      endif
-+#endif
-+#endif
-+    end function
-+
-+    function check_correctness_hermitian_multiply_&
-+    &MATH_DATATYPE&
-+    &_&
-+    &PRECISION&
-+    & (na, a, b, c, na_rows, sc_desc, myid) result(status)
-+      use precision_for_tests
-+      use tests_blas_interfaces
-+      use tests_scalapack_interfaces
-+      implicit none
-+#include "./test_precision_kinds.F90"
-+      TEST_INT_TYPE                                                   :: status
-+      TEST_INT_TYPE, intent(in)                                       :: na, myid, na_rows
-+      MATH_DATATYPE(kind=rck), intent(in)                             :: a(:,:), b(:,:), c(:,:)
-+      MATH_DATATYPE(kind=rck), dimension(size(a,dim=1),size(a,dim=2)) :: tmp1, tmp2
-+#if COMPLEXCASE == 1
-+      real(kind=rk), dimension(2*size(a,dim=1),size(a,dim=2))         :: tmp1_real
-+#endif
-+      real(kind=rck)                                                  :: norm, normmax
-+
-+
-+      TEST_INT_TYPE                                                   :: sc_desc(:)
-+      real(kind=rck)                                                  :: err, errmax
-+      TEST_INT_MPI_TYPE                                               :: mpierr
-+
-+      status = 0
-+      tmp1(:,:) = ZERO
-+
-+#if REALCASE == 1
-+      ! tmp1 = a**T
-+#ifdef WITH_MPI
-+      call p&
-+            &BLAS_CHAR&
-+            &tran(na, na, ONE, a, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc, ZERO, tmp1, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc)
-+#else /* WITH_MPI */
-+      tmp1 = transpose(a)
-+#endif /* WITH_MPI */
-+
-+#endif /* REALCASE == 1 */
-+
-+#if COMPLEXCASE == 1
-+      ! tmp1 = a**H
-+#ifdef WITH_MPI
-+      call p&
-+            &BLAS_CHAR&
-+            &tranc(na, na, ONE, a, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc, ZERO, tmp1, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc)
-+#else /* WITH_MPI */
-+      tmp1 = transpose(conjg(a))
-+#endif /* WITH_MPI */
-+#endif /* COMPLEXCASE == 1 */
-+
-+   ! tmp2 = tmp1 * b
-+#ifdef WITH_MPI
-+   call p&
-+         &BLAS_CHAR&
-+         &gemm("N","N", na, na, na, ONE, tmp1, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc, b, 1_BLAS_KIND, 1_BLAS_KIND, &
-+               sc_desc, ZERO, tmp2, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc)
-+#else
-+   call BLAS_CHAR&
-+        &gemm("N","N", na, na, na, ONE, tmp1, na, b, na, ZERO, tmp2, na)
-+#endif
-+
-+      ! compare tmp2 with c
-+      tmp2(:,:) = tmp2(:,:) - c(:,:)
-+
-+#ifdef WITH_MPI
-+      ! dirty hack: the last argument should be a real array, but is not referenced
-+      ! if mode = "M", thus we get away with a complex argument
-+      norm = p&
-+              &BLAS_CHAR&
-+              &lange("M", na, na, tmp2, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc, &
-+#if COMPLEXCASE == 1              
-+              tmp1_real)
-+#else
-+              tmp1)
-+#endif
-+#else /* WITH_MPI */
-+      ! dirty hack: the last argument should be a real array, but is not referenced
-+      ! if mode = "M", thus we get away with a complex argument
-+      norm = BLAS_CHAR&
-+             &lange("M", na, na, tmp2, na_rows, &
-+#if COMPLEXCASE == 1              
-+              tmp1_real)
-+#else
-+              tmp1)
-+#endif
-+#endif /* WITH_MPI */
-+
-+#ifdef WITH_MPI
-+      call mpi_allreduce(norm, normmax, 1_MPI_KIND, MPI_REAL_PRECISION, MPI_MAX, MPI_COMM_WORLD, mpierr)
-+#else /* WITH_MPI */
-+      normmax = norm
-+#endif /* WITH_MPI */
-+
-+      if (myid .eq. 0) then
-+        print *," Maximum error of result: ", normmax
-+      endif
-+
-+#ifdef DOUBLE_PRECISION_REAL
-+      if (normmax .gt. 5e-11_rk8 ) then
-+        status = 1
-+      endif
-+#else
-+      if (normmax .gt. 5e-3_rk4 ) then
-+        status = 1
-+      endif
-+#endif
-+
-+#ifdef DOUBLE_PRECISION_COMPLEX
-+      if (normmax .gt. 5e-11_rk8 ) then
-+        status = 1
-+      endif
-+#else
-+      if (normmax .gt. 5e-3_rk4 ) then
-+        status = 1
-+      endif
-+#endif
-+    end function
-+
-+    function check_correctness_eigenvalues_frank_&
-+    &MATH_DATATYPE&
-+    &_&
-+    &PRECISION&
-+    & (na, ev, z, myid) result(status)
-+      use iso_c_binding
-+      use precision_for_tests
-+      implicit none
-+#include "./test_precision_kinds.F90"
-+
-+      TEST_INT_TYPE                   :: status, i, j, myid
-+      TEST_INT_TYPE, intent(in)       :: na
-+      real(kind=rck)            :: ev_analytic(na), ev(na)
-+      MATH_DATATYPE(kind=rck)   :: z(:,:)
-+
-+#if defined(DOUBLE_PRECISION_REAL) || defined(DOUBLE_PRECISION_COMPLEX)
-+      real(kind=rck), parameter :: pi = 3.141592653589793238462643383279_c_double
-+#else
-+      real(kind=rck), parameter :: pi = 3.1415926535897932_c_float
-+#endif
-+      real(kind=rck)            :: tmp, maxerr
-+      TEST_INT_TYPE                  :: loctmp
-+      status = 0
-+
-+     ! analytic solution
-+     do i = 1, na
-+       j = na - i
-+#if defined(DOUBLE_PRECISION_REAL) || defined(DOUBLE_PRECISION_COMPLEX)
-+       ev_analytic(i) = pi * (2.0_c_double * real(j,kind=c_double) + 1.0_c_double) / &
-+           (2.0_c_double * real(na,kind=c_double) + 1.0_c_double)
-+       ev_analytic(i) = 0.5_c_double / (1.0_c_double - cos(ev_analytic(i)))
-+#else
-+       ev_analytic(i) = pi * (2.0_c_float * real(j,kind=c_float) + 1.0_c_float) / &
-+           (2.0_c_float * real(na,kind=c_float) + 1.0_c_float)
-+       ev_analytic(i) = 0.5_c_float / (1.0_c_float - cos(ev_analytic(i)))
-+#endif
-+     enddo
-+
-+     ! sort analytic solution:
-+
-+     ! this hack is neither elegant, nor optimized: for huge matrixes it might be expensive
-+     ! a proper sorting algorithmus might be implemented here
-+
-+     tmp    = minval(ev_analytic)
-+     loctmp = minloc(ev_analytic, 1)
-+
-+     ev_analytic(loctmp) = ev_analytic(1)
-+     ev_analytic(1) = tmp
-+     do i=2, na
-+       tmp = ev_analytic(i)
-+       do j= i, na
-+         if (ev_analytic(j) .lt. tmp) then
-+           tmp    = ev_analytic(j)
-+           loctmp = j
-+         endif
-+       enddo
-+       ev_analytic(loctmp) = ev_analytic(i)
-+       ev_analytic(i) = tmp
-+     enddo
-+
-+     ! compute a simple error max of eigenvalues
-+     maxerr = 0.0
-+     maxerr = maxval( (ev(:) - ev_analytic(:))/ev_analytic(:) , 1)
-+
-+#if defined(DOUBLE_PRECISION_REAL) || defined(DOUBLE_PRECISION_COMPLEX)
-+     if (maxerr .gt. 8.e-13_c_double) then
-+#else
-+     if (maxerr .gt. 8.e-4_c_float) then
-+#endif
-+       status = 1
-+       if (myid .eq. 0) then
-+         print *,"Result of Frank matrix test: "
-+         print *,"Eigenvalues differ from analytic solution: maxerr = ",maxerr
-+       endif
-+     endif
-+    end function
-+
-+! vim: syntax=fortran
-diff -ruN elpa-new_release_2021.11.001/examples/shared/test_output_type.F90 elpa-new_release_2021.11.001_ok/examples/shared/test_output_type.F90
---- elpa-new_release_2021.11.001/examples/shared/test_output_type.F90	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/shared/test_output_type.F90	2022-01-26 10:10:58.372166000 +0100
-@@ -0,0 +1,11 @@
-+#include "config-f90.h"
-+
-+module test_output_type
-+
-+ type :: output_t
-+   logical :: eigenvectors
-+   logical :: eigenvalues
-+ end type
-+
-+
-+end module
-diff -ruN elpa-new_release_2021.11.001/examples/shared/test_precision_kinds.F90 elpa-new_release_2021.11.001_ok/examples/shared/test_precision_kinds.F90
---- elpa-new_release_2021.11.001/examples/shared/test_precision_kinds.F90	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/shared/test_precision_kinds.F90	2022-01-26 10:10:58.373135000 +0100
-@@ -0,0 +1,25 @@
-+#ifdef REALCASE
-+#ifdef DOUBLE_PRECISION
-+  integer, parameter :: rk = C_DOUBLE
-+  integer, parameter :: rck = C_DOUBLE
-+#endif
-+#ifdef SINGLE_PRECISION
-+  integer, parameter :: rk = C_FLOAT
-+  integer, parameter :: rck = C_FLOAT
-+#endif
-+  real(kind=rck), parameter      :: ZERO=0.0_rk, ONE = 1.0_rk
-+#endif
-+
-+#ifdef COMPLEXCASE
-+#ifdef DOUBLE_PRECISION
-+  integer, parameter :: rk = C_DOUBLE
-+  integer, parameter :: ck = C_DOUBLE_COMPLEX
-+  integer, parameter :: rck = C_DOUBLE_COMPLEX
-+#endif
-+#ifdef SINGLE_PRECISION
-+  integer, parameter :: rk = C_FLOAT
-+  integer, parameter :: ck = C_FLOAT_COMPLEX
-+  integer, parameter :: rck = C_FLOAT_COMPLEX
-+#endif
-+  complex(kind=rck), parameter     :: ZERO = (0.0_rk,0.0_rk), ONE = (1.0_rk,0.0_rk)
-+#endif
-diff -ruN elpa-new_release_2021.11.001/examples/shared/test_prepare_matrix.F90 elpa-new_release_2021.11.001_ok/examples/shared/test_prepare_matrix.F90
---- elpa-new_release_2021.11.001/examples/shared/test_prepare_matrix.F90	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/shared/test_prepare_matrix.F90	2022-01-26 10:10:58.374062000 +0100
-@@ -0,0 +1,145 @@
-+!    This file is part of ELPA.
-+!
-+!    The ELPA library was originally created by the ELPA consortium,
-+!    consisting of the following organizations:
-+!
-+!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
-+!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+!      Informatik,
-+!    - Technische Universität München, Lehrstuhl für Informatik mit
-+!      Schwerpunkt Wissenschaftliches Rechnen ,
-+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+!      and
-+!    - IBM Deutschland GmbH
-+!
-+!
-+!    More information can be found here:
-+!    http://elpa.mpcdf.mpg.de/
-+!
-+!    ELPA is free software: you can redistribute it and/or modify
-+!    it under the terms of the version 3 of the license of the
-+!    GNU Lesser General Public License as published by the Free
-+!    Software Foundation.
-+!
-+!    ELPA is distributed in the hope that it will be useful,
-+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+!    GNU Lesser General Public License for more details.
-+!
-+!    You should have received a copy of the GNU Lesser General Public License
-+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+!
-+!    ELPA reflects a substantial effort on the part of the original
-+!    ELPA consortium, and we ask you to respect the spirit of the
-+!    license that we chose: i.e., please contribute any changes you
-+!    may have back to the original ELPA library distribution, and keep
-+!    any derivatives of ELPA under the same license that we chose for
-+!    the original distribution, the GNU Lesser General Public License.
-+!
-+! Author: A. Marek, MPCDF
-+#include "config-f90.h"
-+
-+module test_prepare_matrix
-+
-+  use precision_for_tests
-+  interface prepare_matrix_random
-+    module procedure prepare_matrix_random_complex_double
-+    module procedure prepare_matrix_random_real_double
-+#ifdef WANT_SINGLE_PRECISION_REAL
-+    module procedure prepare_matrix_random_real_single
-+#endif
-+#ifdef WANT_SINGLE_PRECISION_COMPLEX
-+    module procedure prepare_matrix_random_complex_single
-+#endif
-+   end interface
-+
-+
-+  interface prepare_matrix_random_spd
-+    module procedure prepare_matrix_random_spd_complex_double
-+    module procedure prepare_matrix_random_spd_real_double
-+#ifdef WANT_SINGLE_PRECISION_REAL
-+    module procedure prepare_matrix_random_spd_real_single
-+#endif
-+#ifdef WANT_SINGLE_PRECISION_COMPLEX
-+    module procedure prepare_matrix_random_spd_complex_single
-+#endif
-+   end interface
-+
-+
-+  interface prepare_matrix_toeplitz
-+    module procedure prepare_matrix_toeplitz_complex_double
-+    module procedure prepare_matrix_toeplitz_real_double
-+    module procedure prepare_matrix_toeplitz_mixed_complex_complex_double
-+#ifdef WANT_SINGLE_PRECISION_REAL
-+    module procedure prepare_matrix_toeplitz_real_single
-+#endif
-+#ifdef WANT_SINGLE_PRECISION_COMPLEX
-+    module procedure prepare_matrix_toeplitz_complex_single
-+    module procedure prepare_matrix_toeplitz_mixed_complex_complex_single
-+#endif
-+   end interface
-+
-+  interface prepare_matrix_frank
-+    module procedure prepare_matrix_frank_complex_double
-+    module procedure prepare_matrix_frank_real_double
-+#ifdef WANT_SINGLE_PRECISION_REAL
-+    module procedure prepare_matrix_frank_real_single
-+#endif
-+#ifdef WANT_SINGLE_PRECISION_COMPLEX
-+    module procedure prepare_matrix_frank_complex_single
-+#endif
-+   end interface
-+
-+
-+
-+   private prows, pcols, map_global_array_index_to_local_index
-+
-+  contains
-+
-+#include "../../src/general/prow_pcol.F90"
-+#include "../../src/general/map_global_to_local.F90"
-+
-+#define COMPLEXCASE 1
-+#define DOUBLE_PRECISION 1
-+#include "../../src/general/precision_macros.h"
-+#include "test_prepare_matrix_template.F90"
-+#undef DOUBLE_PRECISION
-+#undef COMPLEXCASE
-+
-+
-+#ifdef WANT_SINGLE_PRECISION_COMPLEX
-+
-+
-+#define COMPLEXCASE 1
-+#define SINGLE_PRECISION 1
-+#include "../../src/general/precision_macros.h"
-+#include "test_prepare_matrix_template.F90"
-+#undef SINGLE_PRECISION
-+#undef COMPLEXCASE
-+#endif /* WANT_SINGLE_PRECISION_COMPLEX */
-+
-+
-+#define REALCASE 1
-+#define DOUBLE_PRECISION 1
-+#include "../../src/general/precision_macros.h"
-+#include "test_prepare_matrix_template.F90"
-+#undef DOUBLE_PRECISION
-+#undef REALCASE
-+
-+#ifdef WANT_SINGLE_PRECISION_REAL
-+
-+
-+#define REALCASE 1
-+#define SINGLE_PRECISION 1
-+#include "../../src/general/precision_macros.h"
-+#include "test_prepare_matrix_template.F90"
-+#undef SINGLE_PRECISION
-+#undef REALCASE
-+
-+#endif /* WANT_SINGLE_PRECISION_REAL */
-+
-+
-+end module
-diff -ruN elpa-new_release_2021.11.001/examples/shared/test_prepare_matrix_template.F90 elpa-new_release_2021.11.001_ok/examples/shared/test_prepare_matrix_template.F90
---- elpa-new_release_2021.11.001/examples/shared/test_prepare_matrix_template.F90	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/shared/test_prepare_matrix_template.F90	2022-01-26 10:10:58.375330000 +0100
-@@ -0,0 +1,510 @@
-+!    This file is part of ELPA.
-+!
-+!    The ELPA library was originally created by the ELPA consortium,
-+!    consisting of the following organizations:
-+!
-+!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
-+!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+!      Informatik,
-+!    - Technische Universität München, Lehrstuhl für Informatik mit
-+!      Schwerpunkt Wissenschaftliches Rechnen ,
-+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+!      and
-+!    - IBM Deutschland GmbH
-+!
-+!
-+!    More information can be found here:
-+!    http://elpa.mpcdf.mpg.de/
-+!
-+!    ELPA is free software: you can redistribute it and/or modify
-+!    it under the terms of the version 3 of the license of the
-+!    GNU Lesser General Public License as published by the Free
-+!    Software Foundation.
-+!
-+!    ELPA is distributed in the hope that it will be useful,
-+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+!    GNU Lesser General Public License for more details.
-+!
-+!    You should have received a copy of the GNU Lesser General Public License
-+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+!
-+!    ELPA reflects a substantial effort on the part of the original
-+!    ELPA consortium, and we ask you to respect the spirit of the
-+!    license that we chose: i.e., please contribute any changes you
-+!    may have back to the original ELPA library distribution, and keep
-+!    any derivatives of ELPA under the same license that we chose for
-+!    the original distribution, the GNU Lesser General Public License.
-+!
-+! Author: A. Marek, MPCDF
-+
-+#include "config-f90.h"
-+
-+#ifdef HAVE_64BIT_INTEGER_MATH_SUPPORT
-+#define TEST_INT_TYPE integer(kind=c_int64_t)
-+#define INT_TYPE c_int64_t
-+#define TEST_C_INT_TYPE_PTR long int*
-+#define TEST_C_INT_TYPE long int
-+#else
-+#define TEST_INT_TYPE integer(kind=c_int32_t)
-+#define INT_TYPE c_int32_t
-+#define TEST_C_INT_TYPE_PTR int*
-+#define TEST_C_INT_TYPE int
-+#endif
-+#ifdef HAVE_64BIT_INTEGER_MPI_SUPPORT
-+#define TEST_INT_MPI_TYPE integer(kind=c_int64_t)
-+#define INT_MPI_TYPE c_int64_t
-+#define TEST_C_INT_MPI_TYPE_PTR long int*
-+#define TEST_C_INT_MPI_TYPE long int
-+#else
-+#define TEST_INT_MPI_TYPE integer(kind=c_int32_t)
-+#define INT_MPI_TYPE c_int32_t
-+#define TEST_C_INT_MPI_TYPE_PTR int*
-+#define TEST_C_INT_MPI_TYPE int
-+#endif
-+
-+
-+    subroutine prepare_matrix_random_&
-+    &MATH_DATATYPE&
-+    &_&
-+    &PRECISION&
-+    & (na, myid, sc_desc, a, z, as, is_skewsymmetric)
-+
-+
-+      !use test_util
-+      use tests_scalapack_interfaces
-+
-+      implicit none
-+#include "./test_precision_kinds.F90"
-+      TEST_INT_TYPE, intent(in)                 :: myid, na, sc_desc(:)
-+      MATH_DATATYPE(kind=rck), intent(inout)    :: z(:,:), a(:,:), as(:,:)
-+
-+#if COMPLEXCASE == 1
-+      real(kind=rk)                             :: xr(size(a,dim=1), size(a,dim=2))
-+#endif /* COMPLEXCASE */
-+
-+      integer(kind=c_int), allocatable          :: iseed(:)
-+      integer(kind=c_int)                       ::  n
-+      integer(kind=c_int), intent(in), optional :: is_skewsymmetric
-+      logical                                   :: skewsymmetric
-+
-+      if (present(is_skewsymmetric)) then
-+        if (is_skewsymmetric .eq. 1) then
-+          skewsymmetric = .true.
-+        else
-+          skewsymmetric = .false.
-+        endif      
-+      else
-+        skewsymmetric = .false.
-+      endif
-+
-+      ! for getting a hermitian test matrix A we get a random matrix Z
-+      ! and calculate A = Z + Z**H
-+      ! in case of a skewsymmetric matrix A = Z - Z**H
-+
-+      ! we want different random numbers on every process
-+      ! (otherwise A might get rank deficient):
-+
-+      call random_seed(size=n)
-+      allocate(iseed(n))
-+      iseed(:) = myid
-+      call random_seed(put=iseed)
-+#if REALCASE == 1
-+      call random_number(z)
-+
-+      a(:,:) = z(:,:)
-+#endif /* REALCASE */
-+
-+#if COMPLEXCASE == 1
-+      call random_number(xr)
-+
-+      z(:,:) = xr(:,:)
-+      call RANDOM_NUMBER(xr)
-+      z(:,:) = z(:,:) + (0.0_rk,1.0_rk)*xr(:,:)
-+      a(:,:) = z(:,:)
-+#endif /* COMPLEXCASE */
-+
-+      if (myid == 0) then
-+        print '(a)','| Random matrix block has been set up. (only processor 0 confirms this step)'
-+      endif
-+
-+#if REALCASE == 1
-+#ifdef WITH_MPI
-+      if (skewsymmetric) then
-+        call p&
-+             &BLAS_CHAR&
-+             &tran(int(na,kind=BLAS_KIND), int(na,kind=BLAS_KIND), -ONE, z, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc, &
-+                   ONE, a, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc) ! A = A + Z**T
-+      else
-+        call p&
-+             &BLAS_CHAR&
-+             &tran(int(na,kind=BLAS_KIND), int(na,kind=BLAS_KIND), ONE, z, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc, &
-+                   ONE, a, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc) ! A = A + Z**T
-+      endif
-+#else /* WITH_MPI */
-+      if (skewsymmetric) then
-+        a = a - transpose(z)
-+      else
-+        a = a + transpose(z)
-+      endif
-+#endif /* WITH_MPI */
-+#endif /* REALCASE */
-+
-+#if COMPLEXCASE == 1
-+#ifdef WITH_MPI
-+      if (skewsymmetric) then
-+        call p&
-+             &BLAS_CHAR&
-+             &tranc(int(na,kind=BLAS_KIND), int(na,kind=BLAS_KIND), -ONE, z, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc, &
-+                    ONE, a, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc) ! A = A + Z**H
-+      else
-+        call p&
-+             &BLAS_CHAR&
-+             &tranc(int(na,kind=BLAS_KIND), int(na,kind=BLAS_KIND), ONE, z, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc, &
-+                    ONE, a, 1_BLAS_KIND, 1_BLAS_KIND, sc_desc) ! A = A + Z**H
-+      endif
-+#else /* WITH_MPI */
-+      if (skewsymmetric) then
-+        a = a - transpose(conjg(z))
-+      else
-+        a = a + transpose(conjg(z))
-+      endif
-+#endif /* WITH_MPI */
-+#endif /* COMPLEXCASE */
-+
-+
-+      if (myid == 0) then
-+        print '(a)','| Random matrix block has been symmetrized'
-+      endif
-+
-+      ! save original matrix A for later accuracy checks
-+
-+      as = a
-+
-+      deallocate(iseed)
-+
-+    end subroutine
-+
-+#if REALCASE == 1
-+#ifdef DOUBLE_PRECISION_REAL
-+    !c> void prepare_matrix_random_real_double_f(TEST_C_INT_TYPE na, TEST_C_INT_TYPE myid, TEST_C_INT_TYPE na_rows, 
-+    !c>                                          TEST_C_INT_TYPE na_cols, TEST_C_INT_TYPE sc_desc[9],
-+    !c>                                          double *a, double *z, double *as);
-+#else
-+    !c> void prepare_matrix_random_real_single_f(TEST_C_INT_TYPE na, TEST_C_INT_TYPE myid, TEST_C_INT_TYPE na_rows, 
-+    !c>                                          TEST_C_INT_TYPE na_cols, TEST_C_INT_TYPE sc_desc[9],
-+    !c>                                          float *a, float *z, float *as);
-+#endif
-+#endif /* REALCASE */
-+
-+#if COMPLEXCASE == 1
-+#ifdef DOUBLE_PRECISION_COMPLEX
-+    !c> void prepare_matrix_random_complex_double_f(TEST_C_INT_TYPE na, TEST_C_INT_TYPE myid, TEST_C_INT_TYPE na_rows, 
-+    !c>                                             TEST_C_INT_TYPE na_cols, TEST_C_INT_TYPE sc_desc[9],
-+    !c>                                             complex double *a, complex double *z, complex double *as);
-+#else
-+    !c> void prepare_matrix_random_complex_single_f(TEST_C_INT_TYPE na, TEST_C_INT_TYPE myid, TEST_C_INT_TYPE na_rows, 
-+    !c>                                             TEST_C_INT_TYPE na_cols, TEST_C_INT_TYPE sc_desc[9],
-+    !c>                                             complex float *a, complex float *z, complex float *as);
-+#endif
-+#endif /* COMPLEXCASE */
-+
-+subroutine prepare_matrix_random_&
-+&MATH_DATATYPE&
-+&_wrapper_&
-+&PRECISION&
-+& (na, myid, na_rows, na_cols, sc_desc, a, z, as) &
-+   bind(C, name="prepare_matrix_random_&
-+   &MATH_DATATYPE&
-+   &_&
-+   &PRECISION&
-+   &_f")
-+      use iso_c_binding
-+
-+      implicit none
-+#include "./test_precision_kinds.F90"
-+
-+      TEST_INT_TYPE , value   :: myid, na, na_rows, na_cols
-+      TEST_INT_TYPE           :: sc_desc(1:9)
-+      MATH_DATATYPE(kind=rck) :: z(1:na_rows,1:na_cols), a(1:na_rows,1:na_cols),  &
-+                                 as(1:na_rows,1:na_cols)
-+      call prepare_matrix_random_&
-+      &MATH_DATATYPE&
-+      &_&
-+      &PRECISION&
-+      & (na, myid, sc_desc, a, z, as)
-+    end subroutine
-+
-+!----------------------------------------------------------------------------------------------------------------
-+
-+    subroutine prepare_matrix_random_spd_&
-+    &MATH_DATATYPE&
-+    &_&
-+    &PRECISION&
-+    & (na, myid, sc_desc, a, z, as, nblk, np_rows, np_cols, my_prow, my_pcol)
-+
-+      !use test_util
-+      use precision_for_tests
-+      implicit none
-+#include "./test_precision_kinds.F90"
-+      TEST_INT_TYPE, intent(in)              :: myid, na, sc_desc(:)
-+      MATH_DATATYPE(kind=rck), intent(inout) :: z(:,:), a(:,:), as(:,:)
-+      TEST_INT_TYPE, intent(in)              ::  nblk, np_rows, np_cols, my_prow, my_pcol
-+
-+      TEST_INT_TYPE                          :: ii
-+      integer(kind=c_int)                    :: rowLocal, colLocal
-+
-+
-+      call prepare_matrix_random_&
-+        &MATH_DATATYPE&
-+        &_&
-+        &PRECISION&
-+        & (na, myid, sc_desc, a, z, as)
-+
-+      ! hermitian diagonaly dominant matrix => positive definite
-+      do ii=1, na
-+        if (map_global_array_index_to_local_index(int(ii,kind=c_int), int(ii,kind=c_int), &
-+                                                  rowLocal, colLocal, &
-+                                                  int(nblk,kind=c_int), int(np_rows,kind=c_int),      &
-+                                                  int(np_cols,kind=c_int), int(my_prow,kind=c_int),  &
-+                                                  int(my_pcol,kind=c_int) )) then
-+          a(int(rowLocal,kind=INT_TYPE),int(colLocal,kind=INT_TYPE)) = &
-+                  real(a(int(rowLocal,kind=INT_TYPE), int(colLocal,kind=INT_TYPE))) + na + 1
-+        end if
-+      end do
-+
-+      as = a
-+
-+   end subroutine
-+
-+#if REALCASE == 1
-+#ifdef DOUBLE_PRECISION_REAL
-+    !c> void prepare_matrix_random_spd_real_double_f(TEST_C_INT_TYPE na, TEST_C_INT_TYPE myid, TEST_C_INT_TYPE na_rows, 
-+    !c>                                              TEST_C_INT_TYPE na_cols, TEST_C_INT_TYPE sc_desc[9],
-+    !c>                                              double *a, double *z, double *as,
-+    !c>                                              TEST_C_INT_TYPE nblk, TEST_C_INT_TYPE np_rows, TEST_C_INT_TYPE np_cols, 
-+    !c>                                              TEST_C_INT_TYPE my_prow, TEST_C_INT_TYPE my_pcol);
-+#else
-+    !c> void prepare_matrix_random_spd_real_single_f(TEST_C_INT_TYPE na, TEST_C_INT_TYPE myid, TEST_C_INT_TYPE na_rows, 
-+    !c>                                              TEST_C_INT_TYPE na_cols, TEST_C_INT_TYPE sc_desc[9],
-+    !c>                                              float *a, float *z, float *as,
-+    !c>                                              TEST_C_INT_TYPE nblk, TEST_C_INT_TYPE np_rows, TEST_C_INT_TYPE np_cols,
-+    !c>                                              TEST_C_INT_TYPE my_prow, TEST_C_INT_TYPE my_pcol);
-+#endif
-+#endif /* REALCASE */
-+
-+#if COMPLEXCASE == 1
-+#ifdef DOUBLE_PRECISION_COMPLEX
-+    !c> void prepare_matrix_random_spd_complex_double_f(TEST_C_INT_TYPE na, TEST_C_INT_TYPE myid, TEST_C_INT_TYPE na_rows, 
-+    !c>                                                 TEST_C_INT_TYPE na_cols, TEST_C_INT_TYPE sc_desc[9],
-+    !c>                                                 complex double *a, complex double *z, complex double *as,
-+    !c>                                                 TEST_C_INT_TYPE nblk, TEST_C_INT_TYPE np_rows, 
-+    !c>                                                 TEST_C_INT_TYPE np_cols, TEST_C_INT_TYPE my_prow, TEST_C_INT_TYPE my_pcol);
-+#else
-+    !c> void prepare_matrix_random_spd_complex_single_f(TEST_C_INT_TYPE na, TEST_C_INT_TYPE myid, TEST_C_INT_TYPE na_rows,
-+    !c>                                                 TEST_C_INT_TYPE na_cols, TEST_C_INT_TYPE sc_desc[9],
-+    !c>                                                 complex float *a, complex float *z, complex float *as,
-+    !c>                                                 TEST_C_INT_TYPE nblk, TEST_C_INT_TYPE np_rows, 
-+    !c>                                                 TEST_C_INT_TYPE np_cols, TEST_C_INT_TYPE my_prow, TEST_C_INT_TYPE my_pcol);
-+#endif
-+#endif /* COMPLEXCASE */
-+
-+subroutine prepare_matrix_random_spd_&
-+&MATH_DATATYPE&
-+&_wrapper_&
-+&PRECISION&
-+& (na, myid, na_rows, na_cols, sc_desc, a, z, as, nblk, np_rows, np_cols, my_prow, my_pcol) &
-+   bind(C, name="prepare_matrix_random_spd_&
-+   &MATH_DATATYPE&
-+   &_&
-+   &PRECISION&
-+   &_f")
-+      use iso_c_binding
-+
-+      implicit none
-+#include "./test_precision_kinds.F90"
-+
-+      TEST_INT_TYPE , value   :: myid, na, na_rows, na_cols
-+      TEST_INT_TYPE           :: sc_desc(1:9)
-+      MATH_DATATYPE(kind=rck) :: z(1:na_rows,1:na_cols), a(1:na_rows,1:na_cols),  &
-+                                 as(1:na_rows,1:na_cols)
-+      TEST_INT_TYPE , value   :: nblk, np_rows, np_cols, my_prow, my_pcol
-+      call prepare_matrix_random_spd_&
-+      &MATH_DATATYPE&
-+      &_&
-+      &PRECISION&
-+      & (na, myid, sc_desc, a, z, as, nblk, np_rows, np_cols, my_prow, my_pcol)
-+    end subroutine
-+
-+
-+!----------------------------------------------------------------------------------------------------------------
-+
-+   subroutine prepare_matrix_toeplitz_&
-+   &MATH_DATATYPE&
-+   &_&
-+   &PRECISION&
-+   & (na, diagonalElement, subdiagonalElement, d, sd, ds, sds, a, as, &
-+      nblk, np_rows, np_cols, my_prow, my_pcol)
-+     !use test_util
-+     use precision_for_tests
-+     implicit none
-+#include "./test_precision_kinds.F90"
-+
-+     TEST_INT_TYPE, intent(in) :: na, nblk, np_rows, np_cols, my_prow, my_pcol
-+     MATH_DATATYPE(kind=rck)   :: diagonalElement, subdiagonalElement
-+     MATH_DATATYPE(kind=rck)   :: d(:), sd(:), ds(:), sds(:)
-+     MATH_DATATYPE(kind=rck)   :: a(:,:), as(:,:)
-+
-+     TEST_INT_TYPE             :: ii
-+     integer(kind=c_int)       :: rowLocal, colLocal
-+
-+     d(:) = diagonalElement
-+     sd(:) = subdiagonalElement
-+     a(:,:) = ZERO
-+
-+     ! set up the diagonal and subdiagonals (for general solver test)
-+     do ii=1, na ! for diagonal elements
-+       if (map_global_array_index_to_local_index(int(ii,kind=c_int), int(ii,kind=c_int), rowLocal, &
-+                                                 colLocal, int(nblk,kind=c_int), int(np_rows,kind=c_int), &
-+                                                 int(np_cols,kind=c_int), int(my_prow,kind=c_int), &
-+                                                 int(my_pcol,kind=c_int) ) ) then
-+         a(int(rowLocal,kind=INT_TYPE),int(colLocal,kind=INT_TYPE)) = diagonalElement
-+       endif
-+     enddo
-+     do ii=1, na-1
-+       if (map_global_array_index_to_local_index(int(ii,kind=c_int), int(ii+1,kind=c_int), rowLocal, &
-+                                                 colLocal, int(nblk,kind=c_int), int(np_rows,kind=c_int), &
-+                                                 int(np_cols,kind=c_int), int(my_prow,kind=c_int), &
-+                                                 int(my_pcol,kind=c_int) ) ) then
-+         a(int(rowLocal,kind=INT_TYPE),int(colLocal,kind=INT_TYPE)) = subdiagonalElement
-+       endif
-+     enddo
-+
-+     do ii=2, na
-+       if (map_global_array_index_to_local_index(int(ii,kind=c_int), int(ii-1,kind=c_int), rowLocal, &
-+                                                 colLocal, int(nblk,kind=c_int), int(np_rows,kind=c_int), &
-+                                                 int(np_cols,kind=c_int), int(my_prow,kind=c_int), &
-+                                                 int(my_pcol,kind=c_int) ) ) then
-+         a(int(rowLocal,kind=INT_TYPE),int(colLocal,kind=INT_TYPE)) = subdiagonalElement
-+       endif
-+     enddo
-+
-+     ds = d
-+     sds = sd
-+     as = a
-+   end subroutine
-+
-+   subroutine prepare_matrix_toeplitz_mixed_complex&
-+   &_&
-+   &MATH_DATATYPE&
-+   &_&
-+   &PRECISION&
-+#if COMPLEXCASE == 1
-+   & (na, diagonalElement, subdiagonalElement, d, sd, ds, sds, a, as, &
-+      nblk, np_rows, np_cols, my_prow, my_pcol)
-+#endif
-+#if REALCASE == 1
-+   & (na, diagonalElement, subdiagonalElement, d, sd, ds, sds, &
-+      nblk, np_rows, np_cols, my_prow, my_pcol)
-+#endif
-+     !use test_util
-+     implicit none
-+
-+     TEST_INT_TYPE, intent(in)     :: na, nblk, np_rows, np_cols, my_prow, my_pcol
-+     real(kind=C_DATATYPE_KIND)    :: diagonalElement, subdiagonalElement
-+
-+     real(kind=C_DATATYPE_KIND)    :: d(:), sd(:), ds(:), sds(:)
-+
-+#if COMPLEXCASE == 1
-+     complex(kind=C_DATATYPE_KIND) :: a(:,:), as(:,:)
-+#endif
-+#if REALCASE == 1
-+#endif
-+
-+     TEST_INT_TYPE                 :: ii
-+     integer(kind=c_int)           :: rowLocal, colLocal
-+#if COMPLEXCASE == 1
-+     d(:) = diagonalElement
-+     sd(:) = subdiagonalElement
-+
-+     ! set up the diagonal and subdiagonals (for general solver test)
-+     do ii=1, na ! for diagonal elements
-+       if (map_global_array_index_to_local_index(int(ii,kind=c_int), int(ii,kind=c_int), rowLocal, &
-+                                                 colLocal, int(nblk,kind=c_int),                   &
-+                                                 int(np_rows,kind=c_int), int(np_cols,kind=c_int),                 &
-+                                                 int(my_prow,kind=c_int), int(my_pcol,kind=c_int) )) then
-+         a(int(rowLocal,kind=INT_TYPE),int(colLocal,kind=INT_TYPE)) = diagonalElement
-+       endif
-+     enddo
-+     do ii=1, na-1
-+       if (map_global_array_index_to_local_index(int(ii,kind=c_int), int(ii+1,kind=c_int), rowLocal, &
-+                                                 colLocal, int(nblk,kind=c_int),                   &
-+                                                 int(np_rows,kind=c_int), int(np_cols,kind=c_int),                 &
-+                                                 int(my_prow,kind=c_int), int(my_pcol,kind=c_int) )) then
-+         a(int(rowLocal,kind=INT_TYPE),int(colLocal,kind=INT_TYPE)) = subdiagonalElement
-+       endif
-+     enddo
-+
-+     do ii=2, na
-+       if (map_global_array_index_to_local_index(int(ii,kind=c_int), int(ii-1,kind=c_int), rowLocal, &
-+                                                 colLocal, int(nblk,kind=c_int),                   &
-+                                                 int(np_rows,kind=c_int), int(np_cols,kind=c_int),                 &
-+                                                 int(my_prow,kind=c_int), int(my_pcol,kind=c_int) )) then
-+         a(int(rowLocal,kind=INT_TYPE),int(colLocal,kind=INT_TYPE)) = subdiagonalElement
-+       endif
-+     enddo
-+
-+     ds = d
-+     sds = sd
-+     as = a
-+#endif
-+   end subroutine
-+
-+   subroutine prepare_matrix_frank_&
-+   &MATH_DATATYPE&
-+   &_&
-+   &PRECISION&
-+   & (na, a, z, as, nblk, np_rows, np_cols, my_prow, my_pcol)
-+     !use test_util
-+     use precision_for_tests
-+     implicit none
-+
-+     TEST_INT_TYPE, intent(in)     :: na, nblk, np_rows, np_cols, my_prow, my_pcol
-+
-+#if REALCASE == 1
-+     real(kind=C_DATATYPE_KIND)    :: a(:,:), z(:,:), as(:,:)
-+#endif
-+#if COMPLEXCASE == 1
-+     complex(kind=C_DATATYPE_KIND) :: a(:,:), z(:,:), as(:,:)
-+#endif
-+
-+     TEST_INT_TYPE                 :: i, j
-+     integer(kind=c_int)           :: rowLocal, colLocal
-+
-+     do i = 1, na
-+       do j = 1, na
-+         if (map_global_array_index_to_local_index(int(i,kind=c_int), int(j,kind=c_int), rowLocal, &
-+                                                 colLocal, int(nblk,kind=c_int),                   &
-+                                                 int(np_rows,kind=c_int), int(np_cols,kind=c_int),                 &
-+                                                 int(my_prow,kind=c_int), int(my_pcol,kind=c_int) )) then
-+           if (j .le. i) then
-+             a(int(rowLocal,kind=INT_TYPE),int(colLocal,kind=INT_TYPE)) = &
-+                     real((na+1-i), kind=C_DATATYPE_KIND) / real(na, kind=C_DATATYPE_KIND)
-+           else
-+             a(int(rowLocal,kind=INT_TYPE),int(colLocal,kind=INT_TYPE)) = &
-+                     real((na+1-j), kind=C_DATATYPE_KIND) / real(na, kind=C_DATATYPE_KIND)
-+           endif
-+         endif
-+       enddo
-+     enddo
-+
-+     z(:,:)  = a(:,:)
-+     as(:,:) = a(:,:)
-+
-+   end subroutine
-+
-+
-+! vim: syntax=fortran
-diff -ruN elpa-new_release_2021.11.001/examples/shared/test_read_input_parameters.F90 elpa-new_release_2021.11.001_ok/examples/shared/test_read_input_parameters.F90
---- elpa-new_release_2021.11.001/examples/shared/test_read_input_parameters.F90	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/shared/test_read_input_parameters.F90	2022-01-26 10:10:58.376155000 +0100
-@@ -0,0 +1,455 @@
-+!    This file is part of ELPA.
-+!
-+!    The ELPA library was originally created by the ELPA consortium,
-+!    consisting of the following organizations:
-+!
-+!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
-+!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+!      Informatik,
-+!    - Technische Universität München, Lehrstuhl für Informatik mit
-+!      Schwerpunkt Wissenschaftliches Rechnen ,
-+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+!      and
-+!    - IBM Deutschland GmbH
-+!
-+!
-+!    More information can be found here:
-+!    http://elpa.mpcdf.mpg.de/
-+!
-+!    ELPA is free software: you can redistribute it and/or modify
-+!    it under the terms of the version 3 of the license of the
-+!    GNU Lesser General Public License as published by the Free
-+!    Software Foundation.
-+!
-+!    ELPA is distributed in the hope that it will be useful,
-+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+!    GNU Lesser General Public License for more details.
-+!
-+!    You should have received a copy of the GNU Lesser General Public License
-+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+!
-+!    ELPA reflects a substantial effort on the part of the original
-+!    ELPA consortium, and we ask you to respect the spirit of the
-+!    license that we chose: i.e., please contribute any changes you
-+!    may have back to the original ELPA library distribution, and keep
-+!    any derivatives of ELPA under the same license that we chose for
-+!    the original distribution, the GNU Lesser General Public License.
-+!
-+!
-+#include "config-f90.h"
-+
-+
-+#ifdef HAVE_64BIT_INTEGER_MATH_SUPPORT
-+#define TEST_INT_TYPE integer(kind=c_int64_t)
-+#define INT_TYPE c_int64_t
-+#else
-+#define TEST_INT_TYPE integer(kind=c_int32_t)
-+#define INT_TYPE c_int32_t
-+#endif
-+
-+module test_read_input_parameters
-+  use elpa, only : ELPA_2STAGE_COMPLEX_DEFAULT, ELPA_2STAGE_REAL_DEFAULT, elpa_int_string_to_value, &
-+                   elpa_int_value_to_string, ELPA_OK
-+  use elpa_utilities, only : error_unit
-+  use iso_c_binding
-+  use test_util, only : x_ao, x_a
-+  use test_output_type
-+
-+  implicit none
-+
-+  type input_options_t
-+    TEST_INT_TYPE        :: datatype
-+    TEST_INT_TYPE        :: na, nev, nblk
-+    type(output_t) :: write_to_file
-+    TEST_INT_TYPE        :: this_real_kernel, this_complex_kernel
-+    logical        :: realKernelIsSet, complexKernelIsSet
-+    TEST_INT_TYPE        :: useQrIsSet, useGPUIsSet
-+    logical        :: doSolveTridi, do1stage, do2stage, justHelpMessage, &
-+                      doCholesky, doInvertTrm, doTransposeMultiply
-+  end type
-+
-+  interface read_input_parameters
-+    module procedure read_input_parameters_general
-+    module procedure read_input_parameters_traditional
-+    module procedure read_input_parameters_traditional_noskip
-+  end interface
-+
-+  contains
-+
-+    subroutine parse_arguments(command_line_argument, input_options)
-+      implicit none
-+
-+      type(input_options_t)  :: input_options
-+      character(len=128)     :: command_line_argument
-+      integer(kind=c_int)    :: elpa_error
-+
-+      if (command_line_argument == "--help") then
-+        print *,"usage: elpa_tests [--help] [datatype={real|complex}] [na=number] [nev=number] "
-+        print *,"                  [nblk=size of block cyclic distribution] [--output_eigenvalues]"
-+        print *,"                  [--output_eigenvectors] [--real-kernel=name_of_kernel]"
-+        print *,"                  [--complex-kernel=name_of_kernel] [--use-gpu={0|1}]"
-+        print *,"                  [--use-qr={0,1}] [--tests={all|solve-tridi|1stage|2stage|cholesky&
-+            &|invert-triangular|transpose-mulitply}]"
-+        input_options%justHelpMessage=.true.
-+        return
-+      endif
-+
-+
-+      if (command_line_argument(1:11) == "--datatype=") then
-+        if (command_line_argument(12:15) == "real") then
-+          input_options%datatype=1
-+        else
-+          if (command_line_argument(12:18) == "complex") then
-+            input_options%datatype=2
-+          else
-+            print *,"datatype unknown! use either --datatype=real or --datatpye=complex"
-+            stop 1
-+          endif
-+        endif
-+      endif
-+
-+      if (command_line_argument(1:3) == "na=") then
-+        read(command_line_argument(4:), *) input_options%na
-+      endif
-+      if (command_line_argument(1:4) == "nev=") then
-+        read(command_line_argument(5:), *) input_options%nev
-+      endif
-+      if (command_line_argument(1:5) == "nblk=") then
-+        read(command_line_argument(6:), *) input_options%nblk
-+      endif
-+
-+      if (command_line_argument(1:21)   == "--output_eigenvectors") then
-+        input_options%write_to_file%eigenvectors = .true.
-+      endif
-+
-+      if (command_line_argument(1:20)   == "--output_eigenvalues") then
-+        input_options%write_to_file%eigenvalues = .true.
-+      endif
-+
-+      if (command_line_argument(1:14) == "--real-kernel=") then
-+        input_options%this_real_kernel = int(elpa_int_string_to_value("real_kernel",     &
-+                                             command_line_argument(15:), elpa_error), &
-+                                             kind=INT_TYPE)
-+        if (elpa_error /= ELPA_OK) then
-+          print *, "Invalid argument for --real-kernel"
-+          stop 1
-+        endif
-+        print *,"Setting ELPA2 real kernel to ", elpa_int_value_to_string("real_kernel", &
-+                                                                        int(input_options%this_real_kernel,kind=c_int))
-+        input_options%realKernelIsSet = .true.
-+      endif
-+
-+      if (command_line_argument(1:17) == "--complex-kernel=") then
-+        input_options%this_complex_kernel = int(elpa_int_string_to_value("complex_kernel",    &
-+                                                command_line_argument(18:), elpa_error), kind=INT_TYPE)
-+        if (elpa_error /= ELPA_OK) then
-+          print *, "Invalid argument for --complex-kernel"
-+          stop 1
-+        endif
-+        print *,"Setting ELPA2 complex kernel to ", elpa_int_value_to_string("complex_kernel", &
-+                                                                          int(input_options%this_complex_kernel,kind=c_int))
-+        input_options%complexKernelIsSet = .true.
-+      endif
-+
-+      if (command_line_argument(1:9) == "--use-qr=") then
-+        read(command_line_argument(10:), *) input_options%useQrIsSet
-+      endif
-+
-+      if (command_line_argument(1:10) == "--use-gpu=") then
-+        read(command_line_argument(11:), *) input_options%useGPUIsSet
-+      endif
-+
-+      if (command_line_argument(1:8) == "--tests=") then
-+        if (command_line_argument(9:11) == "all") then
-+          input_options%doSolveTridi=.true.
-+          input_options%do1stage=.true.
-+          input_options%do2stage=.true.
-+          input_options%doCholesky=.true.
-+          input_options%doInvertTrm=.true.
-+          input_options%doTransposeMultiply=.true.
-+        else if (command_line_argument(9:19) == "solve-tride") then
-+          input_options%doSolveTridi=.true.
-+          input_options%do1stage=.false.
-+          input_options%do2stage=.false.
-+          input_options%doCholesky=.false.
-+          input_options%doInvertTrm=.false.
-+          input_options%doTransposeMultiply=.false.
-+        else if (command_line_argument(9:14) == "1stage") then
-+          input_options%doSolveTridi=.false.
-+          input_options%do1stage=.true.
-+          input_options%do2stage=.false.
-+          input_options%doCholesky=.false.
-+          input_options%doInvertTrm=.false.
-+          input_options%doTransposeMultiply=.false.
-+        else if (command_line_argument(9:14) == "2stage") then
-+          input_options%doSolveTridi=.false.
-+          input_options%do1stage=.false.
-+          input_options%do2stage=.true.
-+          input_options%doCholesky=.false.
-+          input_options%doInvertTrm=.false.
-+          input_options%doTransposeMultiply=.false.
-+        else if (command_line_argument(9:16) == "cholesky") then
-+          input_options%doSolveTridi=.false.
-+          input_options%do1stage=.false.
-+          input_options%do2stage=.false.
-+          input_options%doCholesky=.true.
-+          input_options%doInvertTrm=.false.
-+          input_options%doTransposeMultiply=.false.
-+        else if (command_line_argument(9:25) == "invert-triangular") then
-+          input_options%doSolveTridi=.false.
-+          input_options%do1stage=.false.
-+          input_options%do2stage=.false.
-+          input_options%doCholesky=.false.
-+          input_options%doInvertTrm=.true.
-+          input_options%doTransposeMultiply=.false.
-+        else if (command_line_argument(9:26) == "transpose-multiply") then
-+          input_options%doSolveTridi=.false.
-+          input_options%do1stage=.false.
-+          input_options%do2stage=.false.
-+          input_options%doCholesky=.false.
-+          input_options%doInvertTrm=.false.
-+          input_options%doTransposeMultiply=.true.
-+        else
-+           print *,"unknown test specified"
-+           stop 1
-+        endif
-+      endif
-+
-+    end subroutine
-+
-+    subroutine read_input_parameters_general(input_options)
-+      use precision_for_tests
-+      implicit none
-+
-+      type(input_options_t)         :: input_options
-+
-+      ! Command line arguments
-+      character(len=128)            :: arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10
-+
-+      ! default parameters
-+      input_options%datatype = 1
-+      input_options%na = 500
-+      input_options%nev = 150
-+      input_options%nblk = 16
-+
-+      input_options%write_to_file%eigenvectors = .false.
-+      input_options%write_to_file%eigenvalues  = .false.
-+
-+      input_options%this_real_kernel = ELPA_2STAGE_REAL_DEFAULT
-+      input_options%this_complex_kernel = ELPA_2STAGE_COMPLEX_DEFAULT
-+      input_options%realKernelIsSet = .false.
-+      input_options%complexKernelIsSet = .false.
-+
-+      input_options%useQrIsSet = 0
-+
-+      input_options%useGPUIsSet = 0
-+
-+      input_options%do1Stage = .true.
-+      input_options%do2Stage = .true.
-+      input_options%doSolveTridi = .true.
-+      input_options%doCholesky=.true.
-+      input_options%doInvertTrm=.true.
-+      input_options%doTransposeMultiply=.true.
-+      input_options%justHelpMessage=.false.
-+
-+      ! test na=1500 nev=50 nblk=16 --help --kernel --output_eigenvectors --output_eigenvalues
-+      if (COMMAND_ARGUMENT_COUNT() .gt. 8) then
-+        write(error_unit, '(a,i0,a)') "Invalid number (", COMMAND_ARGUMENT_COUNT(), ") of command line arguments!"
-+        stop 1
-+      endif
-+
-+      if (COMMAND_ARGUMENT_COUNT() .gt. 0) then
-+
-+        call get_COMMAND_ARGUMENT(1, arg1)
-+
-+        call parse_arguments(arg1, input_options)
-+
-+
-+
-+        if (COMMAND_ARGUMENT_COUNT() .ge. 2) then
-+          ! argument 2
-+          call get_COMMAND_ARGUMENT(2, arg2)
-+
-+          call parse_arguments(arg2, input_options)
-+        endif
-+
-+        ! argument 3
-+        if (COMMAND_ARGUMENT_COUNT() .ge. 3) then
-+
-+          call get_COMMAND_ARGUMENT(3, arg3)
-+
-+          call parse_arguments(arg3, input_options)
-+        endif
-+
-+        ! argument 4
-+        if (COMMAND_ARGUMENT_COUNT() .ge. 4) then
-+
-+          call get_COMMAND_ARGUMENT(4, arg4)
-+
-+          call parse_arguments(arg4, input_options)
-+
-+        endif
-+
-+        ! argument 5
-+        if (COMMAND_ARGUMENT_COUNT() .ge. 5) then
-+
-+          call get_COMMAND_ARGUMENT(5, arg5)
-+
-+          call parse_arguments(arg5, input_options)
-+        endif
-+
-+        ! argument 6
-+        if (COMMAND_ARGUMENT_COUNT() .ge. 6) then
-+
-+          call get_COMMAND_ARGUMENT(6, arg6)
-+
-+          call parse_arguments(arg6, input_options)
-+        endif
-+
-+        ! argument 7
-+        if (COMMAND_ARGUMENT_COUNT() .ge. 7) then
-+
-+          call get_COMMAND_ARGUMENT(7, arg7)
-+
-+          call parse_arguments(arg7, input_options)
-+
-+        endif
-+
-+        ! argument 8
-+        if (COMMAND_ARGUMENT_COUNT() .ge. 8) then
-+
-+          call get_COMMAND_ARGUMENT(8, arg8)
-+
-+          call parse_arguments(arg8, input_options)
-+
-+        endif
-+
-+        ! argument 9
-+        if (COMMAND_ARGUMENT_COUNT() .ge. 9) then
-+
-+          call get_COMMAND_ARGUMENT(9, arg9)
-+
-+          call parse_arguments(arg8, input_options)
-+
-+        endif
-+
-+        ! argument 10
-+        if (COMMAND_ARGUMENT_COUNT() .ge. 10) then
-+
-+          call get_COMMAND_ARGUMENT(10, arg10)
-+
-+          call parse_arguments(arg8, input_options)
-+
-+        endif
-+
-+      endif
-+
-+      if (input_options%useQrIsSet .eq. 1 .and. input_options%datatype .eq. 2) then
-+        print *,"You cannot use QR-decomposition in complex case"
-+        stop 1
-+      endif
-+
-+    end subroutine
-+
-+    subroutine read_input_parameters_traditional_noskip(na, nev, nblk, write_to_file)
-+      use precision_for_tests
-+      implicit none
-+
-+      TEST_INT_TYPE, intent(out) :: na, nev, nblk
-+
-+      type(output_t), intent(out)   :: write_to_file
-+      logical                       :: skip_check_correctness
-+
-+      call read_input_parameters_traditional(na, nev, nblk, write_to_file, skip_check_correctness)
-+    end subroutine
-+
-+    subroutine read_input_parameters_traditional(na, nev, nblk, write_to_file, skip_check_correctness)
-+      use precision_for_tests
-+      implicit none
-+
-+      TEST_INT_TYPE, intent(out) :: na, nev, nblk
-+
-+      type(output_t), intent(out)   :: write_to_file
-+      logical, intent(out)          :: skip_check_correctness
-+
-+      ! Command line arguments
-+      character(len=128)            :: arg1, arg2, arg3, arg4, arg5
-+
-+      ! default parameters
-+      na = 5000
-+      nev = 150
-+      nblk = 16
-+      write_to_file%eigenvectors = .false.
-+      write_to_file%eigenvalues  = .false.
-+      skip_check_correctness = .false.
-+
-+      if (.not. any(COMMAND_ARGUMENT_COUNT() == [0, 3, 4, 5])) then
-+        write(error_unit, '(a,i0,a)') "Invalid number (", COMMAND_ARGUMENT_COUNT(), ") of command line arguments!"
-+        write(error_unit, *) "Expected: program [ [matrix_size num_eigenvalues block_size] &
-+            ""output_eigenvalues"" ""output_eigenvectors""]"
-+        stop 1
-+      endif
-+
-+      if (COMMAND_ARGUMENT_COUNT() == 3) then
-+        call GET_COMMAND_ARGUMENT(1, arg1)
-+        call GET_COMMAND_ARGUMENT(2, arg2)
-+        call GET_COMMAND_ARGUMENT(3, arg3)
-+
-+        read(arg1, *) na
-+        read(arg2, *) nev
-+        read(arg3, *) nblk
-+      endif
-+
-+      if (COMMAND_ARGUMENT_COUNT() == 4) then
-+        call GET_COMMAND_ARGUMENT(1, arg1)
-+        call GET_COMMAND_ARGUMENT(2, arg2)
-+        call GET_COMMAND_ARGUMENT(3, arg3)
-+        call GET_COMMAND_ARGUMENT(4, arg4)
-+        read(arg1, *) na
-+        read(arg2, *) nev
-+        read(arg3, *) nblk
-+
-+        if (arg4 .eq. "output_eigenvalues") then
-+          write_to_file%eigenvalues = .true.
-+        elseif (arg4 .eq. "skip_check_correctness") then
-+          skip_check_correctness = .true.
-+        else
-+          write(error_unit, *) &
-+          "Invalid value for parameter 4.  Must be ""output_eigenvalues"", ""skip_check_correctness"" or omitted"
-+          stop 1
-+        endif
-+
-+      endif
-+
-+      if (COMMAND_ARGUMENT_COUNT() == 5) then
-+        call GET_COMMAND_ARGUMENT(1, arg1)
-+        call GET_COMMAND_ARGUMENT(2, arg2)
-+        call GET_COMMAND_ARGUMENT(3, arg3)
-+        call GET_COMMAND_ARGUMENT(4, arg4)
-+        call GET_COMMAND_ARGUMENT(5, arg5)
-+        read(arg1, *) na
-+        read(arg2, *) nev
-+        read(arg3, *) nblk
-+
-+        if (arg4 .eq. "output_eigenvalues") then
-+          write_to_file%eigenvalues = .true.
-+        else
-+          write(error_unit, *) "Invalid value for output flag! Must be ""output_eigenvalues"" or omitted"
-+          stop 1
-+        endif
-+
-+        if (arg5 .eq. "output_eigenvectors") then
-+          write_to_file%eigenvectors = .true.
-+        else
-+          write(error_unit, *) "Invalid value for output flag! Must be ""output_eigenvectors"" or omitted"
-+          stop 1
-+        endif
-+
-+      endif
-+    end subroutine
-+
-+end module
-diff -ruN elpa-new_release_2021.11.001/examples/shared/test_redir.c elpa-new_release_2021.11.001_ok/examples/shared/test_redir.c
---- elpa-new_release_2021.11.001/examples/shared/test_redir.c	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/shared/test_redir.c	2022-01-26 10:10:58.378020000 +0100
-@@ -0,0 +1,125 @@
-+//    This file is part of ELPA.
-+//
-+//    The ELPA library was originally created by the ELPA consortium,
-+//    consisting of the following organizations:
-+//
-+//    - Max Planck Computing and Data Facility (MPCDF), formerly known as
-+//      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+//    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+//      Informatik,
-+//    - Technische Universität München, Lehrstuhl für Informatik mit
-+//      Schwerpunkt Wissenschaftliches Rechnen ,
-+//    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+//    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+//      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+//      and
-+//    - IBM Deutschland GmbH
-+//
-+//
-+//    More information can be found here:
-+//    http://elpa.mpcdf.mpg.de/
-+//
-+//    ELPA is free software: you can redistribute it and/or modify
-+//    it under the terms of the version 3 of the license of the
-+//    GNU Lesser General Public License as published by the Free
-+//    Software Foundation.
-+//
-+//    ELPA is distributed in the hope that it will be useful,
-+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+//    GNU Lesser General Public License for more details.
-+//
-+//    You should have received a copy of the GNU Lesser General Public License
-+//    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+//
-+//    ELPA reflects a substantial effort on the part of the original
-+//    ELPA consortium, and we ask you to respect the spirit of the
-+//    license that we chose: i.e., please contribute any changes you
-+//    may have back to the original ELPA library distribution, and keep
-+//    any derivatives of ELPA under the same license that we chose for
-+//    the original distribution, the GNU Lesser General Public License.
-+//
-+//
-+// --------------------------------------------------------------------------------------------------
-+#include <stdio.h>
-+#include <fcntl.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <sys/stat.h>
-+#include <sys/types.h>
-+#include <unistd.h>
-+#include <errno.h>
-+
-+#define NAME_LENGTH 4096
-+#define FILENAME "./mpi_stdout/std%3s_rank%04d.txt"
-+
-+FILE *tout, *terr;
-+void dup_filename(char *filename, int dupfd);
-+void dup_fd(int fd, int dupfd);
-+
-+int _mkdirifnotexists(const char *dir) {
-+    struct stat s;
-+    if (stat(dir, &s) != 0) {
-+        if (errno == ENOENT) {
-+            if (mkdir(dir, 0755) != 0) {
-+                perror("mkdir");
-+                return 0;
-+            } else {
-+                return 1;
-+            }
-+        } else {
-+            perror("stat()");
-+	    return 0;
-+        }
-+    } else if (!S_ISDIR(s.st_mode)) {
-+        fprintf(stderr, "\"%s\" does exist and is not a directory\n", dir);
-+        return 0;
-+    } else {
-+        return 1;
-+    }
-+}
-+
-+int create_directories(void) {
-+    if (!_mkdirifnotexists("mpi_stdout")) return 0;
-+    return 1;
-+}
-+
-+void redirect_stdout(int *myproc) {
-+  char buf[NAME_LENGTH];
-+
-+  if (*myproc == 0) {
-+    snprintf(buf, NAME_LENGTH, "tee " FILENAME, "out", *myproc);
-+    tout = popen(buf, "w");
-+    dup_fd(fileno(tout), 1);
-+
-+    snprintf(buf, NAME_LENGTH, "tee " FILENAME, "err", *myproc);
-+    terr = popen(buf, "w");
-+    dup_fd(fileno(terr), 2);
-+  } else {
-+    snprintf(buf, NAME_LENGTH, FILENAME, "out", *myproc);
-+    dup_filename(buf, 1);
-+
-+    snprintf(buf, NAME_LENGTH, FILENAME, "err", *myproc);
-+    dup_filename(buf, 2);
-+  }
-+
-+  return;
-+}
-+
-+/* Redirect file descriptor dupfd to file filename */
-+void dup_filename(char *filename, int dupfd) {
-+  int fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0644);
-+  if(fd < 0) {
-+    perror("open()");
-+    exit(1);
-+  }
-+  dup_fd(fd, dupfd);
-+}
-+
-+/* Redirect file descriptor dupfd to file descriptor fd */
-+void dup_fd(int fd, int dupfd) {
-+  if(dup2(fd,dupfd) < 0) {
-+    perror("dup2()");
-+    exit(1);
-+  }
-+}
-diff -ruN elpa-new_release_2021.11.001/examples/shared/test_redirect.F90 elpa-new_release_2021.11.001_ok/examples/shared/test_redirect.F90
---- elpa-new_release_2021.11.001/examples/shared/test_redirect.F90	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/shared/test_redirect.F90	2022-01-26 10:10:58.379123000 +0100
-@@ -0,0 +1,116 @@
-+!    This file is part of ELPA.
-+!
-+!    The ELPA library was originally created by the ELPA consortium,
-+!    consisting of the following organizations:
-+!
-+!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
-+!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+!      Informatik,
-+!    - Technische Universität München, Lehrstuhl für Informatik mit
-+!      Schwerpunkt Wissenschaftliches Rechnen ,
-+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+!      and
-+!    - IBM Deutschland GmbH
-+!
-+!
-+!    More information can be found here:
-+!    http://elpa.mpcdf.mpg.de/
-+!
-+!    ELPA is free software: you can redistribute it and/or modify
-+!    it under the terms of the version 3 of the license of the
-+!    GNU Lesser General Public License as published by the Free
-+!    Software Foundation.
-+!
-+!    ELPA is distributed in the hope that it will be useful,
-+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+!    GNU Lesser General Public License for more details.
-+!
-+!    You should have received a copy of the GNU Lesser General Public License
-+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+!
-+!    ELPA reflects a substantial effort on the part of the original
-+!    ELPA consortium, and we ask you to respect the spirit of the
-+!    license that we chose: i.e., please contribute any changes you
-+!    may have back to the original ELPA library distribution, and keep
-+!    any derivatives of ELPA under the same license that we chose for
-+!    the original distribution, the GNU Lesser General Public License.
-+!
-+!
-+#include "config-f90.h"
-+
-+module test_redirect
-+  use, intrinsic :: iso_c_binding
-+
-+  implicit none
-+  public
-+
-+  logical :: use_redirect_stdout
-+
-+  interface
-+    integer(kind=C_INT) function create_directories_c() bind(C, name="create_directories")
-+      use, intrinsic :: iso_c_binding
-+      implicit none
-+    end function
-+  end interface
-+
-+  interface
-+    subroutine redirect_stdout_c(myproc) bind(C, name="redirect_stdout")
-+      use, intrinsic :: iso_c_binding
-+      implicit none
-+      integer(kind=C_INT), intent(in) :: myproc
-+    end subroutine
-+  end interface
-+
-+  contains
-+!>
-+!> This function is the Fortran driver for the
-+!> C program to create the redirect output
-+!> directory
-+!>
-+!> \param none
-+!> \result res integer indicates success or failure
-+    function create_directories() result(res)
-+      implicit none
-+      integer(kind=C_INT) :: res
-+      res = int(create_directories_c())
-+    end function
-+!>
-+!> This subroutine is the Fortran driver for the
-+!> redirection of stdout and stderr of each MPI
-+!> task
-+!>
-+!> \param myproc MPI task id
-+    subroutine redirect_stdout(myproc)
-+      use, intrinsic :: iso_c_binding
-+      implicit none
-+      integer(kind=C_INT), intent(in) :: myproc
-+      call redirect_stdout_c(int(myproc, kind=C_INT))
-+    end subroutine
-+!>
-+!> This function checks, whether the environment variable
-+!> "REDIRECT_ELPA_TEST_OUTPUT" is set to "true".
-+!> Returns ".true." if variable is set, otherwise ".false."
-+!> This function only works if the during the build process
-+!> "HAVE_ENVIRONMENT_CHECKING" was tested successfully
-+!>
-+!> \param none
-+!> \return logical
-+    function check_redirect_environment_variable() result(redirect)
-+      implicit none
-+      logical            :: redirect
-+      character(len=255) :: REDIRECT_VARIABLE
-+
-+      redirect = .false.
-+
-+#if defined(HAVE_ENVIRONMENT_CHECKING)
-+      call get_environment_variable("REDIRECT_ELPA_TEST_OUTPUT",REDIRECT_VARIABLE)
-+#endif
-+      if (trim(REDIRECT_VARIABLE) .eq. "true") redirect = .true.
-+
-+    end function
-+
-+end module test_redirect
-diff -ruN elpa-new_release_2021.11.001/examples/shared/test_scalapack.F90 elpa-new_release_2021.11.001_ok/examples/shared/test_scalapack.F90
---- elpa-new_release_2021.11.001/examples/shared/test_scalapack.F90	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/shared/test_scalapack.F90	2022-01-26 10:10:58.380143000 +0100
-@@ -0,0 +1,111 @@
-+! (c) Copyright Pavel Kus, 2017, MPCDF
-+!
-+!    This file is part of ELPA.
-+!
-+!    The ELPA library was originally created by the ELPA consortium,
-+!    consisting of the following organizations:
-+!
-+!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
-+!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+!      Informatik,
-+!    - Technische Universität München, Lehrstuhl für Informatik mit
-+!      Schwerpunkt Wissenschaftliches Rechnen ,
-+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+!      and
-+!    - IBM Deutschland GmbH
-+!
-+!
-+!    More information can be found here:
-+!    http://elpa.mpcdf.mpg.de/
-+!
-+!    ELPA is free software: you can redistribute it and/or modify
-+!    it under the terms of the version 3 of the license of the
-+!    GNU Lesser General Public License as published by the Free
-+!    Software Foundation.
-+!
-+!    ELPA is distributed in the hope that it will be useful,
-+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+!    GNU Lesser General Public License for more details.
-+!
-+!    You should have received a copy of the GNU Lesser General Public License
-+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+!
-+!    ELPA reflects a substantial effort on the part of the original
-+!    ELPA consortium, and we ask you to respect the spirit of the
-+!    license that we chose: i.e., please contribute any changes you
-+!    may have back to the original ELPA library distribution, and keep
-+!    any derivatives of ELPA under the same license that we chose for
-+!    the original distribution, the GNU Lesser General Public License.
-+
-+#include "../Fortran/assert.h"
-+#include "config-f90.h"
-+
-+module test_scalapack
-+  use test_util
-+
-+  interface solve_scalapack_all
-+    module procedure solve_pdsyevd
-+    module procedure solve_pzheevd
-+#ifdef WANT_SINGLE_PRECISION_REAL
-+    module procedure solve_pssyevd
-+#endif
-+#ifdef WANT_SINGLE_PRECISION_COMPLEX
-+    module procedure solve_pcheevd
-+#endif
-+  end interface
-+
-+  interface solve_scalapack_part
-+    module procedure solve_pdsyevr
-+    module procedure solve_pzheevr
-+#ifdef WANT_SINGLE_PRECISION_REAL
-+    module procedure solve_pssyevr
-+#endif
-+#ifdef WANT_SINGLE_PRECISION_COMPLEX
-+    module procedure solve_pcheevr
-+#endif
-+  end interface
-+
-+contains
-+
-+#define COMPLEXCASE 1
-+#define DOUBLE_PRECISION 1
-+#include "../../src/general/precision_macros.h"
-+#include "test_scalapack_template.F90"
-+#undef DOUBLE_PRECISION
-+#undef COMPLEXCASE
-+
-+#ifdef WANT_SINGLE_PRECISION_COMPLEX
-+
-+#define COMPLEXCASE 1
-+#define SINGLE_PRECISION 1
-+#include "../../src/general/precision_macros.h"
-+#include "test_scalapack_template.F90"
-+#undef SINGLE_PRECISION
-+#undef COMPLEXCASE
-+
-+#endif /* WANT_SINGLE_PRECISION_COMPLEX */
-+
-+#define REALCASE 1
-+#define DOUBLE_PRECISION 1
-+#include "../../src/general/precision_macros.h"
-+#include "test_scalapack_template.F90"
-+#undef DOUBLE_PRECISION
-+#undef REALCASE
-+
-+#ifdef WANT_SINGLE_PRECISION_REAL
-+
-+#define REALCASE 1
-+#define SINGLE_PRECISION 1
-+#include "../../src/general/precision_macros.h"
-+#include "test_scalapack_template.F90"
-+#undef SINGLE_PRECISION
-+#undef REALCASE
-+
-+#endif /* WANT_SINGLE_PRECISION_REAL */
-+
-+
-+end module
-diff -ruN elpa-new_release_2021.11.001/examples/shared/test_scalapack_template.F90 elpa-new_release_2021.11.001_ok/examples/shared/test_scalapack_template.F90
---- elpa-new_release_2021.11.001/examples/shared/test_scalapack_template.F90	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/shared/test_scalapack_template.F90	2022-01-26 10:10:58.381125000 +0100
-@@ -0,0 +1,161 @@
-+! (c) Copyright Pavel Kus, 2017, MPCDF
-+!
-+!    This file is part of ELPA.
-+!
-+!    The ELPA library was originally created by the ELPA consortium,
-+!    consisting of the following organizations:
-+!
-+!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
-+!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+!      Informatik,
-+!    - Technische Universität München, Lehrstuhl für Informatik mit
-+!      Schwerpunkt Wissenschaftliches Rechnen ,
-+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+!      and
-+!    - IBM Deutschland GmbH
-+!
-+!
-+!    More information can be found here:
-+!    http://elpa.mpcdf.mpg.de/
-+!
-+!    ELPA is free software: you can redistribute it and/or modify
-+!    it under the terms of the version 3 of the license of the
-+!    GNU Lesser General Public License as published by the Free
-+!    Software Foundation.
-+!
-+!    ELPA is distributed in the hope that it will be useful,
-+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+!    GNU Lesser General Public License for more details.
-+!
-+!    You should have received a copy of the GNU Lesser General Public License
-+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+!
-+!    ELPA reflects a substantial effort on the part of the original
-+!    ELPA consortium, and we ask you to respect the spirit of the
-+!    license that we chose: i.e., please contribute any changes you
-+!    may have back to the original ELPA library distribution, and keep
-+!    any derivatives of ELPA under the same license that we chose for
-+!    the original distribution, the GNU Lesser General Public License.
-+
-+  ! compute all eigenvectors
-+  subroutine solve_p&
-+      &BLAS_CHAR_AND_SY_OR_HE&
-+      &evd(na, a, sc_desc, ev, z)
-+    implicit none
-+#include "./test_precision_kinds.F90"
-+    integer(kind=ik), intent(in)     :: na
-+    MATH_DATATYPE(kind=rck), intent(in)       :: a(:,:)
-+    MATH_DATATYPE(kind=rck), intent(inout)    :: z(:,:)
-+    real(kind=rk), intent(inout)    :: ev(:)
-+    integer(kind=ik), intent(in)     :: sc_desc(:)
-+    integer(kind=ik)                 :: info, lwork, liwork, lrwork
-+    MATH_DATATYPE(kind=rck), allocatable      :: work(:)
-+    real(kind=rk), allocatable       :: rwork(:)
-+    integer, allocatable             :: iwork(:)
-+
-+    allocate(work(1), iwork(1), rwork(1))
-+
-+    ! query for required workspace
-+#ifdef REALCASE
-+    call p&
-+         &BLAS_CHAR&
-+         &syevd('V', 'U', na, a, 1, 1, sc_desc, ev, z, 1, 1, sc_desc, work, -1, iwork, -1, info)
-+#endif
-+#ifdef COMPLEXCASE
-+    call p&
-+         &BLAS_CHAR&
-+         &heevd('V', 'U', na, a, 1, 1, sc_desc, ev, z, 1, 1, sc_desc, work, -1, rwork, -1, iwork, -1, info)
-+#endif
-+    !  write(*,*) "computed sizes", lwork, liwork, "required sizes ", work(1), iwork(1)
-+    lwork = work(1)
-+    liwork = iwork(1)
-+    deallocate(work, iwork)
-+    allocate(work(lwork), stat = info)
-+    allocate(iwork(liwork), stat = info)
-+#ifdef COMPLEXCASE
-+    lrwork = rwork(1)
-+    deallocate(rwork)
-+    allocate(rwork(lrwork), stat = info)
-+#endif
-+    ! the actuall call to the method
-+#ifdef REALCASE
-+    call p&
-+         &BLAS_CHAR&
-+         &syevd('V', 'U', na, a, 1, 1, sc_desc, ev, z, 1, 1, sc_desc, work, lwork, iwork, liwork, info)
-+#endif
-+#ifdef COMPLEXCASE
-+    call p&
-+         &BLAS_CHAR&
-+         &heevd('V', 'U', na, a, 1, 1, sc_desc, ev, z, 1, 1, sc_desc, work, lwork, rwork, lrwork, iwork, liwork, info)
-+#endif
-+
-+    deallocate(iwork, work, rwork)
-+  end subroutine
-+
-+
-+  ! compute part of eigenvectors
-+  subroutine solve_p&
-+      &BLAS_CHAR_AND_SY_OR_HE&
-+      &evr(na, a, sc_desc, nev, ev, z)
-+    implicit none
-+#include "./test_precision_kinds.F90"
-+    integer(kind=ik), intent(in)     :: na, nev
-+    MATH_DATATYPE(kind=rck), intent(in)       :: a(:,:)
-+    MATH_DATATYPE(kind=rck), intent(inout)    :: z(:,:)
-+    real(kind=rk), intent(inout)    :: ev(:)
-+    integer(kind=ik), intent(in)     :: sc_desc(:)
-+    integer(kind=ik)                 :: info, lwork, liwork, lrwork
-+    MATH_DATATYPE(kind=rck), allocatable      :: work(:)
-+    real(kind=rk), allocatable       :: rwork(:)
-+    integer, allocatable             :: iwork(:)
-+    integer(kind=ik)                 :: comp_eigenval, comp_eigenvec, smallest_ev_idx, largest_ev_idx
-+
-+    allocate(work(1), iwork(1), rwork(1))
-+    smallest_ev_idx = 1
-+    largest_ev_idx = nev
-+    ! query for required workspace
-+#ifdef REALCASE
-+    call p&
-+         &BLAS_CHAR&
-+         &syevr('V', 'I', 'U', na, a, 1, 1, sc_desc, 0.0_rk, 0.0_rk, smallest_ev_idx, largest_ev_idx, &
-+                comp_eigenval, comp_eigenvec,  ev, z, 1, 1, sc_desc, work, -1, iwork, -1, info)
-+#endif
-+#ifdef COMPLEXCASE
-+    call p&
-+         &BLAS_CHAR&
-+         &heevr('V', 'I', 'U', na, a, 1, 1, sc_desc, 0.0_rk, 0.0_rk, smallest_ev_idx, largest_ev_idx, &
-+                comp_eigenval, comp_eigenvec,  ev, z, 1, 1, sc_desc, work, -1, rwork, -1, iwork, -1, info)
-+#endif
-+    !  write(*,*) "computed sizes", lwork, liwork, "required sizes ", work(1), iwork(1)
-+    lwork = work(1)
-+    liwork = iwork(1)
-+    deallocate(work, iwork)
-+    allocate(work(lwork), stat = info)
-+    allocate(iwork(liwork), stat = info)
-+#ifdef COMPLEXCASE
-+    lrwork = rwork(1)
-+    deallocate(rwork)
-+    allocate(rwork(lrwork), stat = info)
-+#endif
-+    ! the actuall call to the method
-+#ifdef REALCASE
-+    call p&
-+         &BLAS_CHAR&
-+         &syevr('V', 'I', 'U', na, a, 1, 1, sc_desc, 0.0_rk, 0.0_rk, smallest_ev_idx, largest_ev_idx, &
-+                comp_eigenval, comp_eigenvec,  ev, z, 1, 1, sc_desc, work, lwork, iwork, liwork, info)
-+#endif
-+#ifdef COMPLEXCASE
-+    call p&
-+         &BLAS_CHAR&
-+         &heevr('V', 'I', 'U', na, a, 1, 1, sc_desc, 0.0_rk, 0.0_rk, smallest_ev_idx, largest_ev_idx, &
-+                comp_eigenval, comp_eigenvec,  ev, z, 1, 1, sc_desc, work, lwork, rwork, lrwork, iwork, liwork, info)
-+#endif
-+    assert(comp_eigenval == nev)
-+    assert(comp_eigenvec == nev)
-+    deallocate(iwork, work, rwork)
-+  end subroutine
-+
-diff -ruN elpa-new_release_2021.11.001/examples/shared/test_setup_mpi.F90 elpa-new_release_2021.11.001_ok/examples/shared/test_setup_mpi.F90
---- elpa-new_release_2021.11.001/examples/shared/test_setup_mpi.F90	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/shared/test_setup_mpi.F90	2022-01-26 10:10:58.382203000 +0100
-@@ -0,0 +1,115 @@
-+!    This file is part of ELPA.
-+!
-+!    The ELPA library was originally created by the ELPA consortium,
-+!    consisting of the following organizations:
-+!
-+!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
-+!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+!      Informatik,
-+!    - Technische Universität München, Lehrstuhl für Informatik mit
-+!      Schwerpunkt Wissenschaftliches Rechnen ,
-+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+!      and
-+!    - IBM Deutschland GmbH
-+!
-+!
-+!    More information can be found here:
-+!    http://elpa.mpcdf.mpg.de/
-+!
-+!    ELPA is free software: you can redistribute it and/or modify
-+!    it under the terms of the version 3 of the license of the
-+!    GNU Lesser General Public License as published by the Free
-+!    Software Foundation.
-+!
-+!    ELPA is distributed in the hope that it will be useful,
-+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+!    GNU Lesser General Public License for more details.
-+!
-+!    You should have received a copy of the GNU Lesser General Public License
-+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+!
-+!    ELPA reflects a substantial effort on the part of the original
-+!    ELPA consortium, and we ask you to respect the spirit of the
-+!    license that we chose: i.e., please contribute any changes you
-+!    may have back to the original ELPA library distribution, and keep
-+!    any derivatives of ELPA under the same license that we chose for
-+!    the original distribution, the GNU Lesser General Public License.
-+!
-+!
-+#include "config-f90.h"
-+
-+#ifdef HAVE_64BIT_INTEGER_MATH_SUPPORT
-+#define TEST_INT_TYPE integer(kind=c_int64_t)
-+#define INT_TYPE c_int64_t
-+#else
-+#define TEST_INT_TYPE integer(kind=c_int32_t)
-+#define INT_TYPE c_int32_t
-+#endif
-+#ifdef HAVE_64BIT_INTEGER_MPI_SUPPORT
-+#define TEST_INT_MPI_TYPE integer(kind=c_int64_t)
-+#define INT_MPI_TYPE c_int64_t
-+#else
-+#define TEST_INT_MPI_TYPE integer(kind=c_int32_t)
-+#define INT_MPI_TYPE c_int32_t
-+#endif
-+
-+module test_setup_mpi
-+
-+  contains
-+
-+    subroutine setup_mpi(myid, nprocs)
-+      use test_util
-+      use ELPA_utilities
-+      use precision_for_tests
-+      implicit none
-+
-+      TEST_INT_MPI_TYPE              :: mpierr
-+
-+      TEST_INT_TYPE, intent(out)     :: myid, nprocs
-+      TEST_INT_MPI_TYPE              :: myidMPI, nprocsMPI
-+#ifdef WITH_OPENMP_TRADITIONAL
-+      TEST_INT_MPI_TYPE              :: required_mpi_thread_level, &
-+                                        provided_mpi_thread_level
-+#endif
-+
-+
-+#ifdef WITH_MPI
-+
-+#ifndef WITH_OPENMP_TRADITIONAL
-+      call mpi_init(mpierr)
-+#else
-+      required_mpi_thread_level = MPI_THREAD_MULTIPLE
-+
-+      call mpi_init_thread(required_mpi_thread_level,     &
-+                           provided_mpi_thread_level, mpierr)
-+
-+      if (required_mpi_thread_level .ne. provided_mpi_thread_level) then
-+        write(error_unit,*) "MPI ERROR: MPI_THREAD_MULTIPLE is not provided on this system"
-+        write(error_unit,*) "           only ", mpi_thread_level_name(provided_mpi_thread_level), " is available"
-+        call MPI_FINALIZE(mpierr)
-+        call exit(77)
-+      endif
-+#endif
-+      call mpi_comm_rank(mpi_comm_world, myidMPI,  mpierr)
-+      call mpi_comm_size(mpi_comm_world, nprocsMPI,mpierr)
-+
-+      myid   = int(myidMPI,kind=BLAS_KIND)
-+      nprocs = int(nprocsMPI,kind=BLAS_KIND)
-+
-+      if (nprocs <= 1) then
-+        print *, "The test programs must be run with more than 1 task to ensure that usage with MPI is actually tested"
-+        stop 1
-+      endif
-+#else
-+      myid = 0
-+      nprocs = 1
-+#endif
-+
-+    end subroutine
-+
-+
-+end module
-diff -ruN elpa-new_release_2021.11.001/examples/shared/tests_variable_definitions.F90 elpa-new_release_2021.11.001_ok/examples/shared/tests_variable_definitions.F90
---- elpa-new_release_2021.11.001/examples/shared/tests_variable_definitions.F90	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/shared/tests_variable_definitions.F90	2022-01-26 10:10:58.385037000 +0100
-@@ -0,0 +1,65 @@
-+!    This file is part of ELPA.
-+!
-+!    The ELPA library was originally created by the ELPA consortium,
-+!    consisting of the following organizations:
-+!
-+!    - Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+!      Informatik,
-+!    - Technische Universität München, Lehrstuhl für Informatik mit
-+!      Schwerpunkt Wissenschaftliches Rechnen ,
-+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+!      and
-+!    - IBM Deutschland GmbH
-+!
-+!
-+!    More information can be found here:
-+!    https://elpa.mpcdf.mpg.de/
-+!
-+!    ELPA is free software: you can redistribute it and/or modify
-+!    it under the terms of the version 3 of the license of the
-+!    GNU Lesser General Public License as published by the Free
-+!    Software Foundation.
-+!
-+!    ELPA is distributed in the hope that it will be useful,
-+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+!    GNU Lesser General Public License for more details.
-+!
-+!    You should have received a copy of the GNU Lesser General Public License
-+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+!
-+!    ELPA reflects a substantial effort on the part of the original
-+!    ELPA consortium, and we ask you to respect the spirit of the
-+!    license that we chose: i.e., please contribute any changes you
-+!    may have back to the original ELPA library distribution, and keep
-+!    any derivatives of ELPA under the same license that we chose for
-+!    the original distribution, the GNU Lesser General Public License.
-+!
-+! This file was written by A. Marek, MPC
-+
-+#include "config-f90.h"
-+module precision_for_tests
-+  use iso_c_binding, only : C_FLOAT, C_DOUBLE, C_FLOAT_COMPLEX, C_DOUBLE_COMPLEX, C_INT32_T, C_INT64_T, C_INT
-+
-+  implicit none
-+  integer, parameter :: rk8  = C_DOUBLE
-+  integer, parameter :: rk4  = C_FLOAT
-+  integer, parameter :: ck8  = C_DOUBLE_COMPLEX
-+  integer, parameter :: ck4  = C_FLOAT_COMPLEX
-+  integer, parameter :: ik  = C_INT32_T
-+  integer, parameter :: lik = C_INT64_T
-+
-+#ifdef HAVE_64BIT_INTEGER_MATH_SUPPORT
-+  integer, parameter :: BLAS_KIND = C_INT64_T
-+#else
-+  integer, parameter :: BLAS_KIND = C_INT32_T
-+#endif
-+#ifdef HAVE_64BIT_INTEGER_MPI_SUPPORT
-+  integer, parameter :: MPI_KIND  = C_INT64_T
-+#else
-+  integer, parameter :: MPI_KIND  = C_INT32_T
-+#endif
-+end module precision_for_tests
-diff -ruN elpa-new_release_2021.11.001/examples/shared/test_util.F90 elpa-new_release_2021.11.001_ok/examples/shared/test_util.F90
---- elpa-new_release_2021.11.001/examples/shared/test_util.F90	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/shared/test_util.F90	2022-01-26 10:10:58.383252000 +0100
-@@ -0,0 +1,156 @@
-+!    This file is part of ELPA.
-+!
-+!    The ELPA library was originally created by the ELPA consortium,
-+!    consisting of the following organizations:
-+!
-+!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
-+!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+!      Informatik,
-+!    - Technische Universität München, Lehrstuhl für Informatik mit
-+!      Schwerpunkt Wissenschaftliches Rechnen ,
-+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+!      and
-+!    - IBM Deutschland GmbH
-+!
-+!
-+!    More information can be found here:
-+!    http://elpa.mpcdf.mpg.de/
-+!
-+!    ELPA is free software: you can redistribute it and/or modify
-+!    it under the terms of the version 3 of the license of the
-+!    GNU Lesser General Public License as published by the Free
-+!    Software Foundation.
-+!
-+!    ELPA is distributed in the hope that it will be useful,
-+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+!    GNU Lesser General Public License for more details.
-+!
-+!    You should have received a copy of the GNU Lesser General Public License
-+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+!
-+!    ELPA reflects a substantial effort on the part of the original
-+!    ELPA consortium, and we ask you to respect the spirit of the
-+!    license that we chose: i.e., please contribute any changes you
-+!    may have back to the original ELPA library distribution, and keep
-+!    any derivatives of ELPA under the same license that we chose for
-+!    the original distribution, the GNU Lesser General Public License.
-+!
-+!
-+#include "config-f90.h"
-+#undef TEST_INT_TYPE
-+#undef INT_TYPE
-+#undef TEST_INT_MPI_TYPE
-+#undef INT_MPI_TYPE
-+
-+#ifdef HAVE_64BIT_INTEGER_MATH_SUPPORT
-+#define TEST_INT_TYPE integer(kind=c_int64_t)
-+#define INT_TYPE c_int64_t
-+#else
-+#define TEST_INT_TYPE integer(kind=c_int32_t)
-+#define INT_TYPE c_int32_t
-+#endif
-+#ifdef HAVE_64BIT_INTEGER_MPI_SUPPORT
-+#define TEST_INT_MPI_TYPE integer(kind=c_int64_t)
-+#define INT_MPI_TYPE c_int64_t
-+#else
-+#define TEST_INT_MPI_TYPE integer(kind=c_int32_t)
-+#define INT_MPI_TYPE c_int32_t
-+#endif
-+
-+module test_util
-+  use iso_c_binding
-+  use precision_for_tests
-+#ifdef WITH_MPI
-+#ifdef HAVE_MPI_MODULE
-+  use mpi
-+  implicit none
-+#else
-+  implicit none
-+  include 'mpif.h'
-+#endif
-+#else
-+  TEST_INT_MPI_TYPE, parameter :: mpi_comm_world = -1
-+#endif
-+
-+  contains
-+!>
-+!> This function translates, if ELPA was build with OpenMP support,
-+!> the found evel of "thread safetiness" from the internal number
-+!> of the MPI library into a human understandable value
-+!>
-+!> \param level thread-saftiness of the MPI library
-+!> \return str human understandable value of thread saftiness
-+  pure function mpi_thread_level_name(level) result(str)
-+    use, intrinsic :: iso_c_binding
-+    implicit none
-+    integer(kind=c_int), intent(in) :: level
-+    character(len=21)            :: str
-+#ifdef WITH_MPI
-+    select case(level)
-+      case (MPI_THREAD_SINGLE)
-+        str = "MPI_THREAD_SINGLE"
-+      case (MPI_THREAD_FUNNELED)
-+        str = "MPI_THREAD_FUNNELED"
-+      case (MPI_THREAD_SERIALIZED)
-+        str = "MPI_THREAD_SERIALIZED"
-+      case (MPI_THREAD_MULTIPLE)
-+        str = "MPI_THREAD_MULTIPLE"
-+      case default
-+        write(str,'(i0,1x,a)') level, "(Unknown level)"
-+    end select
-+#endif
-+  end function
-+
-+  function seconds() result(s)
-+    integer :: ticks, tick_rate
-+    real(kind=c_double) :: s
-+
-+    call system_clock(count=ticks, count_rate=tick_rate)
-+    s = real(ticks, kind=c_double) / tick_rate
-+  end function
-+
-+    subroutine x_a(condition, condition_string, file, line)
-+#ifdef HAVE_ISO_FORTRAN_ENV
-+      use iso_fortran_env, only : error_unit
-+#endif
-+      implicit none
-+#ifndef HAVE_ISO_FORTRAN_ENV
-+      integer, parameter :: error_unit = 0
-+#endif
-+      logical, intent(in) :: condition
-+      character(len=*), intent(in) :: condition_string
-+      character(len=*), intent(in) :: file
-+      integer, intent(in) :: line
-+
-+      if (.not. condition) then
-+        write(error_unit,'(a,i0)') "Assertion `" // condition_string // "` failed at " // file // ":", line
-+        stop 1
-+      end if
-+    end subroutine
-+
-+    subroutine x_ao(error_code, error_code_string, file, line)
-+      use elpa
-+#ifdef HAVE_ISO_FORTRAN_ENV
-+      use iso_fortran_env, only : error_unit
-+#endif
-+      implicit none
-+#ifndef HAVE_ISO_FORTRAN_ENV
-+      integer, parameter :: error_unit = 0
-+#endif
-+      integer, intent(in) :: error_code
-+      character(len=*), intent(in) :: error_code_string
-+      character(len=*), intent(in) :: file
-+      integer, intent(in) :: line
-+
-+      if (error_code /= ELPA_OK) then
-+        write(error_unit,'(a,i0)') "Assertion failed: `" // error_code_string // &
-+           " is " // elpa_strerr(error_code) // "` at " // file // ":", line
-+        stop 1
-+      end if
-+    end subroutine
-+end module
-+
-diff -ruN elpa-new_release_2021.11.001/examples/test_real_e1.F90 elpa-new_release_2021.11.001_ok/examples/test_real_e1.F90
---- elpa-new_release_2021.11.001/examples/test_real_e1.F90	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/test_real_e1.F90	2022-01-28 16:43:29.688434545 +0100
-@@ -0,0 +1,255 @@
-+!    This file is part of ELPA.
-+!
-+!    The ELPA library was originally created by the ELPA consortium,
-+!    consisting of the following organizations:
-+!
-+!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
-+!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+!      Informatik,
-+!    - Technische Universität München, Lehrstuhl für Informatik mit
-+!      Schwerpunkt Wissenschaftliches Rechnen ,
-+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+!      and
-+!    - IBM Deutschland GmbH
-+!
-+!
-+!    More information can be found here:
-+!    http://elpa.mpcdf.mpg.de/
-+!
-+!    ELPA is free software: you can redistribute it and/or modify
-+!    it under the terms of the version 3 of the license of the
-+!    GNU Lesser General Public License as published by the Free
-+!    Software Foundation.
-+!
-+!    ELPA is distributed in the hope that it will be useful,
-+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+!    GNU Lesser General Public License for more details.
-+!
-+!    You should have received a copy of the GNU Lesser General Public License
-+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+!
-+!    ELPA reflects a substantial effort on the part of the original
-+!    ELPA consortium, and we ask you to respect the spirit of the
-+!    license that we chose: i.e., please contribute any changes you
-+!    may have back to the original ELPA library distribution, and keep
-+!    any derivatives of ELPA under the same license that we chose for
-+!    the original distribution, the GNU Lesser General Public License.
-+!
-+!
-+!>
-+!> Fortran test programm to demonstrates the use of
-+!> ELPA 1 real case library.
-+!> If "HAVE_REDIRECT" was defined at build time
-+!> the stdout and stderr output of each MPI task
-+!> can be redirected to files if the environment
-+!> variable "REDIRECT_ELPA_TEST_OUTPUT" is set
-+!> to "true".
-+!>
-+!> By calling executable [arg1] [arg2] [arg3] [arg4]
-+!> one can define the size (arg1), the number of
-+!> Eigenvectors to compute (arg2), and the blocking (arg3).
-+!> If these values are not set default values (4000, 1500, 16)
-+!> are choosen.
-+!> If these values are set the 4th argument can be
-+!> "output", which specifies that the EV's are written to
-+!> an ascii file.
-+!>
-+program test_real_example
-+
-+!-------------------------------------------------------------------------------
-+! Standard eigenvalue problem - REAL version
-+!
-+! This program demonstrates the use of the ELPA module
-+! together with standard scalapack routines
-+!
-+! Copyright of the original code rests with the authors inside the ELPA
-+! consortium. The copyright of any additional modifications shall rest
-+! with their original authors, but shall adhere to the licensing terms
-+! distributed along with the original code in the file "COPYING".
-+!
-+!-------------------------------------------------------------------------------
-+
-+   use iso_c_binding
-+
-+   use elpa
-+#ifdef WITH_OPENMP_TRADITIONAL
-+   use omp_lib
-+#endif
-+
-+
-+#ifdef HAVE_MPI_MODULE
-+   use mpi
-+   implicit none
-+#else
-+   implicit none
-+   include 'mpif.h'
-+#endif
-+
-+   !-------------------------------------------------------------------------------
-+   ! Please set system size parameters below!
-+   ! na:   System size
-+   ! nev:  Number of eigenvectors to be calculated
-+   ! nblk: Blocking factor in block cyclic distribution
-+   !-------------------------------------------------------------------------------
-+
-+   integer           :: nblk
-+   integer                          :: na, nev
-+
-+   integer                          :: np_rows, np_cols, na_rows, na_cols
-+
-+   integer                          :: myid, nprocs, my_prow, my_pcol, mpi_comm_rows, mpi_comm_cols
-+   integer                          :: i, mpierr, my_blacs_ctxt, sc_desc(9), info, nprow, npcol
-+
-+   integer, external                :: numroc
-+
-+   real(kind=c_double), allocatable :: a(:,:), z(:,:), ev(:)
-+
-+   integer                          :: iseed(4096) ! Random seed, size should be sufficient for every generator
-+
-+   integer                          :: STATUS
-+   integer                          :: success
-+   character(len=8)                 :: task_suffix
-+   integer                          :: j
-+
-+   integer, parameter               :: error_units = 0
-+
-+#ifdef WITH_OPENMP_TRADITIONAL
-+   integer n_threads
-+#endif
-+   class(elpa_t), pointer           :: e
-+   !-------------------------------------------------------------------------------
-+
-+
-+   ! default parameters
-+   na = 1000
-+   nev = 500
-+   nblk = 16
-+
-+   call mpi_init_thread(MPI_THREAD_SERIALIZED,info,mpierr)
-+   call mpi_comm_rank(mpi_comm_world,myid,mpierr)
-+   call mpi_comm_size(mpi_comm_world,nprocs,mpierr)
-+
-+   do np_cols = NINT(SQRT(REAL(nprocs))),2,-1
-+     if(mod(nprocs,np_cols) == 0 ) exit
-+   enddo
-+   ! at the end of the above loop, nprocs is always divisible by np_cols
-+
-+   np_rows = nprocs/np_cols
-+
-+   ! initialise BLACS
-+   my_blacs_ctxt = mpi_comm_world
-+   call BLACS_Gridinit(my_blacs_ctxt, 'C', np_rows, np_cols)
-+   call BLACS_Gridinfo(my_blacs_ctxt, nprow, npcol, my_prow, my_pcol)
-+
-+   if (myid==0) then
-+     print '(a)','| Past BLACS_Gridinfo.'
-+   end if
-+   ! determine the neccessary size of the distributed matrices,
-+   ! we use the scalapack tools routine NUMROC
-+
-+#ifdef WITH_OPENMP_TRADITIONAL
-+   n_threads=omp_get_max_threads()
-+#endif
-+
-+
-+   na_rows = numroc(na, nblk, my_prow, 0, np_rows)
-+   na_cols = numroc(na, nblk, my_pcol, 0, np_cols)
-+
-+
-+   ! set up the scalapack descriptor for the checks below
-+   ! For ELPA the following restrictions hold:
-+   ! - block sizes in both directions must be identical (args 4 a. 5)
-+   ! - first row and column of the distributed matrix must be on
-+   !   row/col 0/0 (arg 6 and 7)
-+
-+   call descinit(sc_desc, na, na, nblk, nblk, 0, 0, my_blacs_ctxt, na_rows, info)
-+
-+   if (info .ne. 0) then
-+     write(error_units,*) 'Error in BLACS descinit! info=',info
-+     write(error_units,*) 'Most likely this happend since you want to use'
-+     write(error_units,*) 'more MPI tasks than are possible for your'
-+     write(error_units,*) 'problem size (matrix size and blocksize)!'
-+     write(error_units,*) 'The blacsgrid can not be set up properly'
-+     write(error_units,*) 'Try reducing the number of MPI tasks...'
-+     call MPI_ABORT(mpi_comm_world, 1, mpierr)
-+   endif
-+
-+   if (myid==0) then
-+     print '(a)','| Past scalapack descriptor setup.'
-+   end if
-+
-+   allocate(a (na_rows,na_cols))
-+   allocate(z (na_rows,na_cols))
-+
-+   allocate(ev(na))
-+
-+   ! we want different random numbers on every process
-+   ! (otherwise A might get rank deficient):
-+
-+   iseed(:) = myid
-+   call RANDOM_SEED(put=iseed)
-+   call RANDOM_NUMBER(z)
-+
-+   a(:,:) = z(:,:)
-+
-+   if (myid == 0) then
-+     print '(a)','| Random matrix block has been set up. (only processor 0 confirms this step)'
-+   endif
-+   call pdtran(na, na, 1.d0, z, 1, 1, sc_desc, 1.d0, a, 1, 1, sc_desc) ! A = A + Z**T
-+
-+   !-------------------------------------------------------------------------------
-+
-+   if (elpa_init(20171201) /= elpa_ok) then
-+     print *, "ELPA API version not supported"
-+     stop
-+   endif
-+   e => elpa_allocate()
-+
-+   ! set parameters decribing the matrix and it's MPI distribution
-+   call e%set("na", na, success)
-+   call e%set("nev", nev, success)
-+   call e%set("local_nrows", na_rows, success)
-+   call e%set("local_ncols", na_cols, success)
-+   call e%set("nblk", nblk, success)
-+   call e%set("mpi_comm_parent", mpi_comm_world, success)
-+   call e%set("process_row", my_prow, success)
-+   call e%set("process_col", my_pcol, success)
-+
-+#ifdef CUDA
-+         call e%set("nvidia-gpu", 1, success)
-+#endif
-+#ifdef WITH_OPENMP_TRADITIONAL
-+   call e%set("omp_threads", n_threads, success)
-+#endif
-+   success = e%setup()
-+
-+   call e%set("solver", elpa_solver_1stage, success)
-+
-+
-+   ! Calculate eigenvalues/eigenvectors
-+
-+   if (myid==0) then
-+     print '(a)','| Entering one-step ELPA solver ... '
-+     print *
-+   end if
-+
-+   call mpi_barrier(mpi_comm_world, mpierr) ! for correct timings only
-+   call e%eigenvectors(a, ev, z, success)
-+
-+   if (myid==0) then
-+     print '(a)','| One-step ELPA solver complete.'
-+     print *
-+   end if
-+
-+   call elpa_deallocate(e)
-+   call elpa_uninit()
-+
-+   call blacs_gridexit(my_blacs_ctxt)
-+   call mpi_finalize(mpierr)
-+
-+end
-+
-diff -ruN elpa-new_release_2021.11.001/examples/test_real_e2.F90 elpa-new_release_2021.11.001_ok/examples/test_real_e2.F90
---- elpa-new_release_2021.11.001/examples/test_real_e2.F90	1970-01-01 01:00:00.000000000 +0100
-+++ elpa-new_release_2021.11.001_ok/examples/test_real_e2.F90	2022-02-01 09:28:16.102146696 +0100
-@@ -0,0 +1,262 @@
-+!    This file is part of ELPA.
-+!
-+!    The ELPA library was originally created by the ELPA consortium,
-+!    consisting of the following organizations:
-+!
-+!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
-+!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
-+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
-+!      Informatik,
-+!    - Technische Universität München, Lehrstuhl für Informatik mit
-+!      Schwerpunkt Wissenschaftliches Rechnen ,
-+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
-+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaften,
-+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
-+!      and
-+!    - IBM Deutschland GmbH
-+!
-+!
-+!    More information can be found here:
-+!    http://elpa.mpcdf.mpg.de/
-+!
-+!    ELPA is free software: you can redistribute it and/or modify
-+!    it under the terms of the version 3 of the license of the
-+!    GNU Lesser General Public License as published by the Free
-+!    Software Foundation.
-+!
-+!    ELPA is distributed in the hope that it will be useful,
-+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+!    GNU Lesser General Public License for more details.
-+!
-+!    You should have received a copy of the GNU Lesser General Public License
-+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
-+!
-+!    ELPA reflects a substantial effort on the part of the original
-+!    ELPA consortium, and we ask you to respect the spirit of the
-+!    license that we chose: i.e., please contribute any changes you
-+!    may have back to the original ELPA library distribution, and keep
-+!    any derivatives of ELPA under the same license that we chose for
-+!    the original distribution, the GNU Lesser General Public License.
-+!
-+!
-+!>
-+!> Fortran test programm to demonstrates the use of
-+!> ELPA 2 real case library.
-+!> If "HAVE_REDIRECT" was defined at build time
-+!> the stdout and stderr output of each MPI task
-+!> can be redirected to files if the environment
-+!> variable "REDIRECT_ELPA_TEST_OUTPUT" is set
-+!> to "true".
-+!>
-+!> By calling executable [arg1] [arg2] [arg3] [arg4]
-+!> one can define the size (arg1), the number of
-+!> Eigenvectors to compute (arg2), and the blocking (arg3).
-+!> If these values are not set default values (4000, 1500, 16)
-+!> are choosen.
-+!> If these values are set the 4th argument can be
-+!> "output", which specifies that the EV's are written to
-+!> an ascii file.
-+!>
-+program test_real_example
-+
-+!-------------------------------------------------------------------------------
-+! Standard eigenvalue problem - REAL version
-+!
-+! This program demonstrates the use of the ELPA module
-+! together with standard scalapack routines
-+!
-+! Copyright of the original code rests with the authors inside the ELPA
-+! consortium. The copyright of any additional modifications shall rest
-+! with their original authors, but shall adhere to the licensing terms
-+! distributed along with the original code in the file "COPYING".
-+!
-+!-------------------------------------------------------------------------------
-+
-+   use iso_c_binding
-+
-+   use elpa
-+
-+#ifdef HAVE_MPI_MODULE
-+   use mpi
-+   implicit none
-+#else
-+   implicit none
-+   include 'mpif.h'
-+#endif
-+
-+   !-------------------------------------------------------------------------------
-+   ! Please set system size parameters below!
-+   ! na:   System size
-+   ! nev:  Number of eigenvectors to be calculated
-+   ! nblk: Blocking factor in block cyclic distribution
-+   !-------------------------------------------------------------------------------
-+
-+   integer           :: nblk
-+   integer                          :: na, nev
-+
-+   integer                          :: np_rows, np_cols, na_rows, na_cols
-+
-+   integer                          :: myid, nprocs, my_prow, my_pcol, mpi_comm_rows, mpi_comm_cols
-+   integer                          :: i, mpierr, my_blacs_ctxt, sc_desc(9), info, nprow, npcol
-+
-+   integer, external                :: numroc
-+
-+   real(kind=c_double), allocatable :: a(:,:), z(:,:), ev(:)
-+
-+   integer                          :: iseed(4096) ! Random seed, size should be sufficient for every generator
-+
-+   integer                          :: STATUS
-+   integer                          :: success
-+   character(len=8)                 :: task_suffix
-+   integer                          :: j
-+
-+   integer, parameter               :: error_units = 0
-+
-+   class(elpa_t), pointer           :: e
-+   !-------------------------------------------------------------------------------
-+
-+
-+   ! default parameters
-+   na = 1000
-+   nev = 500
-+   nblk = 16
-+
-+   call mpi_init_thread(MPI_THREAD_SERIALIZED,info,mpierr)
-+   call mpi_comm_rank(mpi_comm_world,myid,mpierr)
-+   call mpi_comm_size(mpi_comm_world,nprocs,mpierr)
-+
-+   do np_cols = NINT(SQRT(REAL(nprocs))),2,-1
-+     if(mod(nprocs,np_cols) == 0 ) exit
-+   enddo
-+   ! at the end of the above loop, nprocs is always divisible by np_cols
-+
-+   np_rows = nprocs/np_cols
-+
-+   ! initialise BLACS
-+   my_blacs_ctxt = mpi_comm_world
-+   call BLACS_Gridinit(my_blacs_ctxt, 'C', np_rows, np_cols)
-+   call BLACS_Gridinfo(my_blacs_ctxt, nprow, npcol, my_prow, my_pcol)
-+
-+   if (myid==0) then
-+     print '(a)','| Past BLACS_Gridinfo.'
-+   end if
-+   ! determine the neccessary size of the distributed matrices,
-+   ! we use the scalapack tools routine NUMROC
-+
-+   na_rows = numroc(na, nblk, my_prow, 0, np_rows)
-+   na_cols = numroc(na, nblk, my_pcol, 0, np_cols)
-+
-+
-+   ! set up the scalapack descriptor for the checks below
-+   ! For ELPA the following restrictions hold:
-+   ! - block sizes in both directions must be identical (args 4 a. 5)
-+   ! - first row and column of the distributed matrix must be on
-+   !   row/col 0/0 (arg 6 and 7)
-+
-+   call descinit(sc_desc, na, na, nblk, nblk, 0, 0, my_blacs_ctxt, na_rows, info)
-+
-+   if (info .ne. 0) then
-+     write(error_units,*) 'Error in BLACS descinit! info=',info
-+     write(error_units,*) 'Most likely this happend since you want to use'
-+     write(error_units,*) 'more MPI tasks than are possible for your'
-+     write(error_units,*) 'problem size (matrix size and blocksize)!'
-+     write(error_units,*) 'The blacsgrid can not be set up properly'
-+     write(error_units,*) 'Try reducing the number of MPI tasks...'
-+     call MPI_ABORT(mpi_comm_world, 1, mpierr)
-+   endif
-+
-+   if (myid==0) then
-+     print '(a)','| Past scalapack descriptor setup.'
-+   end if
-+
-+   allocate(a (na_rows,na_cols))
-+   allocate(z (na_rows,na_cols))
-+
-+   allocate(ev(na))
-+
-+   ! we want different random numbers on every process
-+   ! (otherwise A might get rank deficient):
-+
-+   iseed(:) = myid
-+   call RANDOM_SEED(put=iseed)
-+   call RANDOM_NUMBER(z)
-+
-+   a(:,:) = z(:,:)
-+
-+   if (myid == 0) then
-+     print '(a)','| Random matrix block has been set up. (only processor 0 confirms this step)'
-+   endif
-+   call pdtran(na, na, 1.d0, z, 1, 1, sc_desc, 1.d0, a, 1, 1, sc_desc) ! A = A + Z**T
-+
-+   !-------------------------------------------------------------------------------
-+
-+   if (elpa_init(20171201) /= elpa_ok) then
-+     print *, "ELPA API version not supported"
-+     stop
-+   endif
-+   e => elpa_allocate()
-+
-+   ! set parameters decribing the matrix and it's MPI distribution
-+   call e%set("na", na, success)
-+   call e%set("nev", nev, success)
-+   call e%set("local_nrows", na_rows, success)
-+   call e%set("local_ncols", na_cols, success)
-+   call e%set("nblk", nblk, success)
-+   call e%set("mpi_comm_parent", mpi_comm_world, success)
-+   call e%set("process_row", my_prow, success)
-+   call e%set("process_col", my_pcol, success)
-+#ifdef CUDA
-+   call e%set("nvidia-gpu", 1, success)
-+#endif
-+
-+   success = e%setup()
-+
-+#ifdef CUDAKERNEL
-+         call e%set("real_kernel", ELPA_2STAGE_REAL_NVIDIA_GPU, success)
-+#endif
-+#ifdef AVX512
-+         call e%set("real_kernel", ELPA_2STAGE_REAL_AVX512_BLOCK2,success )
-+#endif
-+#ifdef AVX2_B6
-+         call e%set("real_kernel", ELPA_2STAGE_REAL_AVX2_BLOCK6,success )
-+#endif
-+#ifdef AVX2_B4
-+         call e%set("real_kernel", ELPA_2STAGE_REAL_AVX2_BLOCK4,success )
-+#endif
-+#ifdef AVX2_B2
-+         call e%set("real_kernel", ELPA_2STAGE_REAL_AVX2_BLOCK2,success )
-+#endif
-+#ifdef GENERIC
-+         call e%set("real_kernel", ELPA_2STAGE_REAL_GENERIC,success )
-+#endif
-+#ifdef GENERIC_SIMPLE
-+         call e%set("real_kernel", ELPA_2STAGE_REAL_GENERIC_SIMPLE,success )
-+#endif
-+
-+   call e%set("solver", elpa_solver_2stage, success)
-+
-+
-+   ! Calculate eigenvalues/eigenvectors
-+
-+   if (myid==0) then
-+     print '(a)','| Entering two-step ELPA solver ... '
-+     print *
-+   end if
-+
-+   call mpi_barrier(mpi_comm_world, mpierr) ! for correct timings only
-+   call e%eigenvectors(a, ev, z, success)
-+
-+   if (myid==0) then
-+     print '(a)','| Two-step ELPA solver complete.'
-+     print *
-+   end if
-+
-+   call elpa_deallocate(e)
-+   call elpa_uninit()
-+
-+   call blacs_gridexit(my_blacs_ctxt)
-+   call mpi_finalize(mpierr)
-+
-+end
-+
diff --git a/Golden_Repo/e/ESMF/ESMF-8.2.0-gpsmkl-2021b.eb b/Golden_Repo/e/ESMF/ESMF-8.2.0-gpsmkl-2021b.eb
deleted file mode 100644
index a3eb1ab4c..000000000
--- a/Golden_Repo/e/ESMF/ESMF-8.2.0-gpsmkl-2021b.eb
+++ /dev/null
@@ -1,44 +0,0 @@
-name = 'ESMF'
-version = '8.2.0'
-
-homepage = 'https://www.earthsystemcog.org/projects/esmf/'
-description = """The Earth System Modeling Framework (ESMF) is software for building and coupling weather,
- climate, and related models.
-"""
-
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-toolchainopts = {'usempi': True, 'openmp': True, 'cstd': 'c++11', 'pic': True}
-
-source_urls = ['https://github.com/esmf-org/esmf/archive/']
-sources = ['%%(name)s_%s.tar.gz' % '_'.join(version.split('.'))]
-patches = [
-    'psmpi_lmpifort.patch',
-]
-checksums = [
-    '3693987aba2c8ae8af67a0e222bea4099a48afe09b8d3d334106f9d7fc311485',  # ESMF_8_2_0.tar.gz
-    '6a73efa223312e8036a99d27a75250e89a72d5eb732a617b5e751e12f6c322a5',  # psmpi_lmpifort.patch
-]
-
-dependencies = [
-    ('netCDF', '4.8.1'),
-    ('netCDF-Fortran', '4.5.3'),
-    ('netCDF-C++4', '4.3.1'),
-]
-
-# ESMF ignores xxFLAGS
-preconfigopts = 'export ESMF_BOPT="O" && '
-preconfigopts += 'export ESMF_OPTLEVEL="2" && '
-
-# disable errors from GCC 10 on mismatches between actual and dummy argument lists (GCC 9 behaviour)
-prebuildopts = 'ESMF_F90COMPILEOPTS="${ESMF_F90COMPILEOPTS} -fallow-argument-mismatch"'
-
-buildopts = 'ESMF_NETCDF_INCLUDE=$EBROOTNETCDFMINFORTRAN/include '
-buildopts += 'ESMF_NETCDF_LIBS="`nc-config --libs` `nf-config --flibs` `ncxx4-config --libs`"'
-
-preinstallopts = 'export ESMF_CXXLINKOPTS="-lmpifort" && '
-
-# too parallel causes the build to become really slow
-maxparallel = 8
-
-moduleclass = 'geo'
diff --git a/Golden_Repo/e/ESMF/psmpi_lmpifort.patch b/Golden_Repo/e/ESMF/psmpi_lmpifort.patch
deleted file mode 100644
index 7038af504..000000000
--- a/Golden_Repo/e/ESMF/psmpi_lmpifort.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- esmf/build_config/Linux.intel.default/build_rules.mk.orig	2016-04-25 17:31:54.667689000 +0200
-+++ esmf/build_config/Linux.intel.default/build_rules.mk	2016-04-25 17:32:22.991830000 +0200
-@@ -45,6 +45,7 @@ ifeq ($(ESMF_COMM),mpich2)
- # Mpich2 ---------------------------------------------------
- ESMF_F90DEFAULT         = mpif90
- ESMF_CXXDEFAULT         = mpicxx
-+ESMF_CXXLINKLIBS       += -lmpifort
- ESMF_MPIRUNDEFAULT      = mpirun $(ESMF_MPILAUNCHOPTIONS)
- ESMF_MPIMPMDRUNDEFAULT  = mpiexec $(ESMF_MPILAUNCHOPTIONS)
- else
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
deleted file mode 100644
index 0b4155d94..000000000
--- a/Golden_Repo/e/Eigen/Eigen-3.3.9-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,21 +0,0 @@
-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/e/Emacs/Emacs-27.1-GCCcore-11.2.0.eb b/Golden_Repo/e/Emacs/Emacs-27.1-GCCcore-11.2.0.eb
deleted file mode 100644
index 5b8d81a1c..000000000
--- a/Golden_Repo/e/Emacs/Emacs-27.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,40 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'Emacs'
-version = '27.1'
-
-homepage = 'http://www.gnu.org/software/emacs/'
-description = """GNU Emacs is an extensible, customizable text editor--and more.
- At its core is an interpreter for Emacs Lisp, a dialect of the Lisp programming
- language with extensions to support text editing."""
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [GNU_SOURCE]
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['ffbfa61dc951b92cf31ebe3efc86c5a9d4411a1222b8a4ae6716cfd0e2a584db']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('libpng', '1.6.37'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('ncurses', '6.2'),
-    ('GTK+', '3.24.23'),
-    ('X11', '20210802'),
-    ('LibTIFF', '4.3.0'),
-]
-
-configopts = '--x-includes=$EBROOTX11/include --x-libraries=$EBROOTX11/lib --with-gif=no --with-gnutls=no '
-configopts += '--with-x-toolkit=gtk3 --with-modules'
-
-sanity_check_paths = {
-    'files': ["bin/emacs", "bin/emacs-%(version)s", "bin/emacsclient", "bin/etags"],
-    'dirs': []
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/e/Embree/Embree-3.13.2-GCC-11.2.0.eb b/Golden_Repo/e/Embree/Embree-3.13.2-GCC-11.2.0.eb
deleted file mode 100644
index caa036d96..000000000
--- a/Golden_Repo/e/Embree/Embree-3.13.2-GCC-11.2.0.eb
+++ /dev/null
@@ -1,59 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'Embree'
-version = '3.13.2'
-
-homepage = 'http://www.ospray.org/'
-description = """
-Embree is a collection of high-performance ray tracing kernels, developed at Intel. The target user of Embree are
-graphics application engineers that want to improve the performance of their application by leveraging the optimized ray
-tracing kernels of Embree. The kernels are optimized for photo-realistic rendering on the latest Intel processors with
-support for SSE, AVX, AVX2, and AVX512.
-"""
-
-toolchain = {'name': 'GCC', 'version': '11.2.0'}
-toolchainopts = {'optarch': True, 'pic': True}
-
-source_urls = ['https://github.com/embree/embree/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['dcda827e5b7a606c29d00c1339f1ef00f7fa6867346bc46a2318e8f0a601c6f9']
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-    ('pkg-config', '0.29.2'),
-    ('ispc', '1.16.1', '', SYSTEM),
-]
-
-dependencies = [
-    ('X11', '20210802'),
-    ('OpenGL', '2021b'),
-    ('freeglut', '3.2.1'),
-    ('libpng', '1.6.37'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('ImageMagick', '7.1.0-13'),
-    ('OpenEXR', '3.1.1'),
-]
-
-separate_build_dir = True
-
-configopts = '-DCMAKE_BUILD_TYPE=Release '
-configopts += '-DEMBREE_ISPC_SUPPORT=ON '
-configopts += '-DEMBREE_TASKING_SYSTEM=INTERNAL '
-# Select highest supported ISA (SSE2, SSE4.2, AVX, AVX2, AVX512KNL, AVX512SKX, or NONE)
-configopts += '-DEMBREE_MAX_ISA=AVX2 '
-configopts += '-DEMBREE_GEOMETRY_HAIR:BOOL=ON '
-configopts += '-DEMBREE_GEOMETRY_LINES:BOOL=OFF '
-configopts += '-DEMBREE_GEOMETRY_QUADS:BOOL=OFF '
-configopts += '-DEMBREE_GEOMETRY_SUBDIV:BOOL=OFF '
-configopts += '-DEMBREE_TUTORIALS=OFF '
-
-sanity_check_paths = {
-    'dirs': ['include/embree3'],
-    'files': ['lib64/libembree3.so']
-}
-
-modextrapaths = {
-    'CMAKE_MODULE_PATH': 'lib64/cmake/embree-%(version)s/'
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/e/Exiv2/Exiv2-0.27.5-GCCcore-11.2.0.eb b/Golden_Repo/e/Exiv2/Exiv2-0.27.5-GCCcore-11.2.0.eb
deleted file mode 100644
index 651d8579f..000000000
--- a/Golden_Repo/e/Exiv2/Exiv2-0.27.5-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'Exiv2'
-version = '0.27.5'
-
-homepage = 'http://www.exiv2.org'
-description = """
- Exiv2 is a C++ library and a command line utility to manage image metadata. It provides fast and easy read and write
- access to the Exif, IPTC and XMP metadata of digital images in various formats. Exiv2 is available as free software and
- with a commercial license, and is used in many projects.
-"""
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['http://www.exiv2.org/builds']
-sources = ['%(namelower)s-%(version)s-Source.tar.gz']
-checksums = ['35a58618ab236a901ca4928b0ad8b31007ebdc0386d904409d825024e45ea6e2']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1', '', SYSTEM),
-]
-
-dependencies = [
-    ('expat', '2.4.1'),
-]
-
-sanity_check_paths = {
-    'files': ['bin/exiv2', 'lib/libexiv2.%s' % SHLIB_EXT],
-    'dirs': []
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/e/Extrae/Extrae-3.8.3-gompi-2021b.eb b/Golden_Repo/e/Extrae/Extrae-3.8.3-gompi-2021b.eb
deleted file mode 100644
index 71338e645..000000000
--- a/Golden_Repo/e/Extrae/Extrae-3.8.3-gompi-2021b.eb
+++ /dev/null
@@ -1,55 +0,0 @@
-# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild
-# Copyright:: Copyright 2013-2016 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-# Authors::   Damian Alvarez <d.alvarez@fz-juelich.de>
-# License::   New BSD
-#
-# This work is based from experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-easyblock = 'ConfigureMake'
-
-name = "Extrae"
-version = "3.8.3"
-
-homepage = 'http://www.bsc.es/computer-sciences/performance-tools'
-description = """Extrae is the core instrumentation package developed by the Performance Tools
- group at BSC. Extrae is capable of instrumenting applications based on MPI, OpenMP, pthreads,
- CUDA1, OpenCL1, and StarSs1 using different instrumentation approaches. The information gathered
- by Extrae typically includes timestamped events of runtime calls, performance counters and source
- code references. Besides, Extrae provides its own API to allow the user to manually instrument his
- or her application.
-"""
-
-toolchain = {'name': 'gompi', 'version': '2021b'}
-toolchainopts = {"usempi": True}
-
-source_urls = ['https://ftp.tools.bsc.es/extrae/']
-sources = ['extrae-%s-src.tar.bz2' % version]
-checksums = ['1495dc9d16eef7f1966228c7301e0cab30a3861fe46d9551770c40ffd758d198']
-
-builddependencies = [
-    ('Autotools', '20210726'),
-]
-
-dependencies = [
-    ('libunwind', '1.5.0'),
-    ('libxml2', '2.9.10'),
-    ('PAPI', '6.0.0.1'),
-    ('Boost', '1.78.0'),
-    ('libdwarf', '20210528'),
-    ('zlib', '1.2.11'),
-    ('CUDA', '11.5', '', SYSTEM)
-]
-
-preconfigopts = 'autoreconf -vif && '
-
-# Without Dyninst and without SIONlib
-configopts = '--enable-posix-clock --with-libgomp-version=4.9 --enable-openmp --enable-sampling '
-configopts += '--with-binutils=$EBROOTBINUTILS --with-boost=$EBROOTBOOST --with-dwarf=$EBROOTLIBDWARF '
-configopts += '--with-mpi=$EBROOTOPENMPI --with-papi=$EBROOTPAPI --with-unwind=$EBROOTLIBUNWIND --with-libz=$EBROOTZLIB'
-configopts += ' --without-dyninst '
-configopts += '--with-cuda=$EBROOTCUDA --with-cupti=$EBROOTCUDA/extras/CUPTI'
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/e/Extrae/Extrae-3.8.3-gpsmpi-2021b.eb b/Golden_Repo/e/Extrae/Extrae-3.8.3-gpsmpi-2021b.eb
deleted file mode 100644
index 05169b8b2..000000000
--- a/Golden_Repo/e/Extrae/Extrae-3.8.3-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,55 +0,0 @@
-# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild
-# Copyright:: Copyright 2013-2016 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-# Authors::   Damian Alvarez <d.alvarez@fz-juelich.de>
-# License::   New BSD
-#
-# This work is based from experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-easyblock = 'ConfigureMake'
-
-name = "Extrae"
-version = "3.8.3"
-
-homepage = 'http://www.bsc.es/computer-sciences/performance-tools'
-description = """Extrae is the core instrumentation package developed by the Performance Tools
- group at BSC. Extrae is capable of instrumenting applications based on MPI, OpenMP, pthreads,
- CUDA1, OpenCL1, and StarSs1 using different instrumentation approaches. The information gathered
- by Extrae typically includes timestamped events of runtime calls, performance counters and source
- code references. Besides, Extrae provides its own API to allow the user to manually instrument his
- or her application.
-"""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-toolchainopts = {"usempi": True}
-
-source_urls = ['https://ftp.tools.bsc.es/extrae/']
-sources = ['extrae-%s-src.tar.bz2' % version]
-checksums = ['1495dc9d16eef7f1966228c7301e0cab30a3861fe46d9551770c40ffd758d198']
-
-builddependencies = [
-    ('Autotools', '20210726'),
-]
-
-dependencies = [
-    ('libunwind', '1.5.0'),
-    ('libxml2', '2.9.10'),
-    ('PAPI', '6.0.0.1'),
-    ('Boost', '1.78.0'),
-    ('libdwarf', '20210528'),
-    ('zlib', '1.2.11'),
-    ('CUDA', '11.5', '', SYSTEM)
-]
-
-preconfigopts = 'autoreconf -vif && '
-
-# Without Dyninst and without SIONlib
-configopts = '--enable-posix-clock --with-libgomp-version=4.9 --enable-openmp --enable-sampling '
-configopts += '--with-binutils=$EBROOTBINUTILS --with-boost=$EBROOTBOOST --with-dwarf=$EBROOTLIBDWARF '
-configopts += '--with-mpi=$EBROOTPSMPI --with-papi=$EBROOTPAPI --with-unwind=$EBROOTLIBUNWIND --with-libz=$EBROOTZLIB '
-configopts += '--without-dyninst '
-configopts += '--with-cuda=$EBROOTCUDA --with-cupti=$EBROOTCUDA/extras/CUPTI'
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/e/Extrae/Extrae-3.8.3-iompi-2021b.eb b/Golden_Repo/e/Extrae/Extrae-3.8.3-iompi-2021b.eb
deleted file mode 100644
index 2cf1dbe2e..000000000
--- a/Golden_Repo/e/Extrae/Extrae-3.8.3-iompi-2021b.eb
+++ /dev/null
@@ -1,55 +0,0 @@
-# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild
-# Copyright:: Copyright 2013-2016 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-# Authors::   Damian Alvarez <d.alvarez@fz-juelich.de>
-# License::   New BSD
-#
-# This work is based from experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-easyblock = 'ConfigureMake'
-
-name = "Extrae"
-version = "3.8.3"
-
-homepage = 'http://www.bsc.es/computer-sciences/performance-tools'
-description = """Extrae is the core instrumentation package developed by the Performance Tools
- group at BSC. Extrae is capable of instrumenting applications based on MPI, OpenMP, pthreads,
- CUDA1, OpenCL1, and StarSs1 using different instrumentation approaches. The information gathered
- by Extrae typically includes timestamped events of runtime calls, performance counters and source
- code references. Besides, Extrae provides its own API to allow the user to manually instrument his
- or her application.
-"""
-
-toolchain = {'name': 'iompi', 'version': '2021b'}
-toolchainopts = {"usempi": True}
-
-source_urls = ['https://ftp.tools.bsc.es/extrae/']
-sources = ['extrae-%s-src.tar.bz2' % version]
-checksums = ['1495dc9d16eef7f1966228c7301e0cab30a3861fe46d9551770c40ffd758d198']
-
-builddependencies = [
-    ('Autotools', '20210726'),
-]
-
-dependencies = [
-    ('libunwind', '1.5.0'),
-    ('libxml2', '2.9.10'),
-    ('PAPI', '6.0.0.1'),
-    ('Boost', '1.78.0'),
-    ('libdwarf', '20210528'),
-    ('zlib', '1.2.11'),
-    ('CUDA', '11.5', '', SYSTEM)
-]
-
-preconfigopts = 'autoreconf -vif && '
-
-# Without Dyninst and without SIONlib
-configopts = '--enable-posix-clock --with-libgomp-version=4.9 --enable-openmp --enable-sampling '
-configopts += '--with-binutils=$EBROOTBINUTILS --with-boost=$EBROOTBOOST --with-dwarf=$EBROOTLIBDWARF '
-configopts += '--with-mpi=$EBROOTOPENMPI --with-papi=$EBROOTPAPI --with-unwind=$EBROOTLIBUNWIND --with-libz=$EBROOTZLIB'
-configopts += ' --without-dyninst '
-configopts += '--with-cuda=$EBROOTCUDA --with-cupti=$EBROOTCUDA/extras/CUPTI'
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/e/Extrae/Extrae-3.8.3-ipsmpi-2021b.eb b/Golden_Repo/e/Extrae/Extrae-3.8.3-ipsmpi-2021b.eb
deleted file mode 100644
index 7f9f303a2..000000000
--- a/Golden_Repo/e/Extrae/Extrae-3.8.3-ipsmpi-2021b.eb
+++ /dev/null
@@ -1,55 +0,0 @@
-# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild
-# Copyright:: Copyright 2013-2016 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-# Authors::   Damian Alvarez <d.alvarez@fz-juelich.de>
-# License::   New BSD
-#
-# This work is based from experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-easyblock = 'ConfigureMake'
-
-name = "Extrae"
-version = "3.8.3"
-
-homepage = 'http://www.bsc.es/computer-sciences/performance-tools'
-description = """Extrae is the core instrumentation package developed by the Performance Tools
- group at BSC. Extrae is capable of instrumenting applications based on MPI, OpenMP, pthreads,
- CUDA1, OpenCL1, and StarSs1 using different instrumentation approaches. The information gathered
- by Extrae typically includes timestamped events of runtime calls, performance counters and source
- code references. Besides, Extrae provides its own API to allow the user to manually instrument his
- or her application.
-"""
-
-toolchain = {'name': 'ipsmpi', 'version': '2021b'}
-toolchainopts = {"usempi": True}
-
-source_urls = ['https://ftp.tools.bsc.es/extrae/']
-sources = ['extrae-%s-src.tar.bz2' % version]
-checksums = ['1495dc9d16eef7f1966228c7301e0cab30a3861fe46d9551770c40ffd758d198']
-
-builddependencies = [
-    ('Autotools', '20210726'),
-]
-
-dependencies = [
-    ('libunwind', '1.5.0'),
-    ('libxml2', '2.9.10'),
-    ('PAPI', '6.0.0.1'),
-    ('Boost', '1.78.0'),
-    ('libdwarf', '20210528'),
-    ('zlib', '1.2.11'),
-    ('CUDA', '11.5', '', SYSTEM)
-]
-
-preconfigopts = 'autoreconf -vif && '
-
-# Without Dyninst and without SIONlib
-configopts = '--enable-posix-clock --with-libgomp-version=4.9 --enable-openmp --enable-sampling '
-configopts += '--with-binutils=$EBROOTBINUTILS --with-boost=$EBROOTBOOST --with-dwarf=$EBROOTLIBDWARF '
-configopts += '--with-mpi=$EBROOTPSMPI --with-papi=$EBROOTPAPI --with-unwind=$EBROOTLIBUNWIND --with-libz=$EBROOTZLIB '
-configopts += '--without-dyninst '
-configopts += '--with-cuda=$EBROOTCUDA --with-cupti=$EBROOTCUDA/extras/CUPTI'
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/e/ecCodes/ecCodes-2.22.1-GCCcore-11.2.0-nompi.eb b/Golden_Repo/e/ecCodes/ecCodes-2.22.1-GCCcore-11.2.0-nompi.eb
deleted file mode 100644
index 251583022..000000000
--- a/Golden_Repo/e/ecCodes/ecCodes-2.22.1-GCCcore-11.2.0-nompi.eb
+++ /dev/null
@@ -1,48 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'ecCodes'
-version = '2.22.1'
-versionsuffix = '-nompi'
-
-homepage = 'https://software.ecmwf.int/wiki/display/ECC/ecCodes+Home'
-description = """ecCodes is a package developed by ECMWF which provides an application programming interface and
- a set of tools for decoding and encoding messages in the following formats: WMO FM-92 GRIB edition 1 and edition 2,
- WMO FM-94 BUFR edition 3 and edition 4, WMO GTS abbreviated header (only decoding)."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'openmp': True}
-
-source_urls = ['https://confluence.ecmwf.int/download/attachments/45757960/']
-sources = ['eccodes-%(version)s-Source.tar.gz']
-checksums = ['75c7ee96469bb30b0c8f7edbdc4429ece4415897969f75c36173545242bc9e85']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1'),
-]
-
-dependencies = [
-    ('netCDF', '4.8.1', '-serial'),
-    ('JasPer', '2.0.33'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('libpng', '1.6.37'),
-    ('zlib', '1.2.11'),
-]
-
-# Python bindings are now provided by a separate package 'eccodes-python'
-configopts = "-DENABLE_NETCDF=ON -DENABLE_PNG=ON "
-configopts += "-DENABLE_JPG=ON -DENABLE_JPG_LIBJASPER=ON "
-configopts += "-DENABLE_ECCODES_OMP_THREADS=ON"
-
-local_exes = ['%s_%s' % (a, b)
-              for a in ['bufr', 'grib', 'gts', 'metar']
-              for b in ['compare', 'copy', 'dump', 'filter', 'get', 'ls']]
-local_exes += ['codes_%s' % c for c in ['count', 'info', 'split_file']]
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in local_exes] +
-             ['lib/libeccodes_f90.%s' % SHLIB_EXT, 'lib/libeccodes.%s' % SHLIB_EXT],
-    'dirs': ['include'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/e/ecCodes/ecCodes-2.22.1-gompi-2021b.eb b/Golden_Repo/e/ecCodes/ecCodes-2.22.1-gompi-2021b.eb
deleted file mode 100644
index b870a44fb..000000000
--- a/Golden_Repo/e/ecCodes/ecCodes-2.22.1-gompi-2021b.eb
+++ /dev/null
@@ -1,44 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'ecCodes'
-version = '2.22.1'
-
-homepage = 'https://software.ecmwf.int/wiki/display/ECC/ecCodes+Home'
-description = """ecCodes is a package developed by ECMWF which provides an application programming interface and
- a set of tools for decoding and encoding messages in the following formats: WMO FM-92 GRIB edition 1 and edition 2,
- WMO FM-94 BUFR edition 3 and edition 4, WMO GTS abbreviated header (only decoding)."""
-
-toolchain = {'name': 'gompi', 'version': '2021b'}
-toolchainopts = {'usempi': False, 'openmp': True}
-
-source_urls = ['https://confluence.ecmwf.int/download/attachments/45757960/']
-sources = ['eccodes-%(version)s-Source.tar.gz']
-checksums = ['75c7ee96469bb30b0c8f7edbdc4429ece4415897969f75c36173545242bc9e85']
-
-builddependencies = [('CMake', '3.21.1')]
-
-dependencies = [
-    ('netCDF', '4.8.1'),
-    ('JasPer', '2.0.33'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('libpng', '1.6.37'),
-    ('zlib', '1.2.11'),
-]
-
-# Python bindings are now provided by a separate package 'eccodes-python'
-configopts = "-DENABLE_NETCDF=ON -DENABLE_PNG=ON "
-configopts += "-DENABLE_JPG=ON -DENABLE_JPG_LIBJASPER=ON "
-configopts += "-DENABLE_ECCODES_OMP_THREADS=ON"
-
-local_exes = ['%s_%s' % (a, b)
-              for a in ['bufr', 'grib', 'gts', 'metar']
-              for b in ['compare', 'copy', 'dump', 'filter', 'get', 'ls']]
-local_exes += ['codes_%s' % c for c in ['count', 'info', 'split_file']]
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in local_exes] +
-             ['lib/libeccodes_f90.%s' % SHLIB_EXT, 'lib/libeccodes.%s' % SHLIB_EXT],
-    'dirs': ['include'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/e/ecCodes/ecCodes-2.22.1-gpsmpi-2021b.eb b/Golden_Repo/e/ecCodes/ecCodes-2.22.1-gpsmpi-2021b.eb
deleted file mode 100644
index 825af9345..000000000
--- a/Golden_Repo/e/ecCodes/ecCodes-2.22.1-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,44 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'ecCodes'
-version = '2.22.1'
-
-homepage = 'https://software.ecmwf.int/wiki/display/ECC/ecCodes+Home'
-description = """ecCodes is a package developed by ECMWF which provides an application programming interface and
- a set of tools for decoding and encoding messages in the following formats: WMO FM-92 GRIB edition 1 and edition 2,
- WMO FM-94 BUFR edition 3 and edition 4, WMO GTS abbreviated header (only decoding)."""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-toolchainopts = {'usempi': False, 'openmp': True}
-
-source_urls = ['https://confluence.ecmwf.int/download/attachments/45757960/']
-sources = ['eccodes-%(version)s-Source.tar.gz']
-checksums = ['75c7ee96469bb30b0c8f7edbdc4429ece4415897969f75c36173545242bc9e85']
-
-builddependencies = [('CMake', '3.21.1')]
-
-dependencies = [
-    ('netCDF', '4.8.1'),
-    ('JasPer', '2.0.33'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('libpng', '1.6.37'),
-    ('zlib', '1.2.11'),
-]
-
-# Python bindings are now provided by a separate package 'eccodes-python'
-configopts = "-DENABLE_NETCDF=ON -DENABLE_PNG=ON "
-configopts += "-DENABLE_JPG=ON -DENABLE_JPG_LIBJASPER=ON "
-configopts += "-DENABLE_ECCODES_OMP_THREADS=ON"
-
-local_exes = ['%s_%s' % (a, b)
-              for a in ['bufr', 'grib', 'gts', 'metar']
-              for b in ['compare', 'copy', 'dump', 'filter', 'get', 'ls']]
-local_exes += ['codes_%s' % c for c in ['count', 'info', 'split_file']]
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in local_exes] +
-             ['lib/libeccodes_f90.%s' % SHLIB_EXT, 'lib/libeccodes.%s' % SHLIB_EXT],
-    'dirs': ['include'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/e/ecCodes/ecCodes-2.22.1-iimpi-2021b.eb b/Golden_Repo/e/ecCodes/ecCodes-2.22.1-iimpi-2021b.eb
deleted file mode 100644
index 81c01d7d0..000000000
--- a/Golden_Repo/e/ecCodes/ecCodes-2.22.1-iimpi-2021b.eb
+++ /dev/null
@@ -1,44 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'ecCodes'
-version = '2.22.1'
-
-homepage = 'https://software.ecmwf.int/wiki/display/ECC/ecCodes+Home'
-description = """ecCodes is a package developed by ECMWF which provides an application programming interface and
- a set of tools for decoding and encoding messages in the following formats: WMO FM-92 GRIB edition 1 and edition 2,
- WMO FM-94 BUFR edition 3 and edition 4, WMO GTS abbreviated header (only decoding)."""
-
-toolchain = {'name': 'iimpi', 'version': '2021b'}
-toolchainopts = {'usempi': False, 'openmp': True}
-
-source_urls = ['https://confluence.ecmwf.int/download/attachments/45757960/']
-sources = ['eccodes-%(version)s-Source.tar.gz']
-checksums = ['75c7ee96469bb30b0c8f7edbdc4429ece4415897969f75c36173545242bc9e85']
-
-builddependencies = [('CMake', '3.21.1')]
-
-dependencies = [
-    ('netCDF', '4.8.1'),
-    ('JasPer', '2.0.33'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('libpng', '1.6.37'),
-    ('zlib', '1.2.11'),
-]
-
-# Python bindings are now provided by a separate package 'eccodes-python'
-configopts = "-DENABLE_NETCDF=ON -DENABLE_PNG=ON "
-configopts += "-DENABLE_JPG=ON -DENABLE_JPG_LIBJASPER=ON "
-configopts += "-DENABLE_ECCODES_OMP_THREADS=ON"
-
-local_exes = ['%s_%s' % (a, b)
-              for a in ['bufr', 'grib', 'gts', 'metar']
-              for b in ['compare', 'copy', 'dump', 'filter', 'get', 'ls']]
-local_exes += ['codes_%s' % c for c in ['count', 'info', 'split_file']]
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in local_exes] +
-             ['lib/libeccodes_f90.%s' % SHLIB_EXT, 'lib/libeccodes.%s' % SHLIB_EXT],
-    'dirs': ['include'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/e/ecCodes/ecCodes-2.22.1-iompi-2021b.eb b/Golden_Repo/e/ecCodes/ecCodes-2.22.1-iompi-2021b.eb
deleted file mode 100644
index 0539fe589..000000000
--- a/Golden_Repo/e/ecCodes/ecCodes-2.22.1-iompi-2021b.eb
+++ /dev/null
@@ -1,44 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'ecCodes'
-version = '2.22.1'
-
-homepage = 'https://software.ecmwf.int/wiki/display/ECC/ecCodes+Home'
-description = """ecCodes is a package developed by ECMWF which provides an application programming interface and
- a set of tools for decoding and encoding messages in the following formats: WMO FM-92 GRIB edition 1 and edition 2,
- WMO FM-94 BUFR edition 3 and edition 4, WMO GTS abbreviated header (only decoding)."""
-
-toolchain = {'name': 'iompi', 'version': '2021b'}
-toolchainopts = {'usempi': False, 'openmp': True}
-
-source_urls = ['https://confluence.ecmwf.int/download/attachments/45757960/']
-sources = ['eccodes-%(version)s-Source.tar.gz']
-checksums = ['75c7ee96469bb30b0c8f7edbdc4429ece4415897969f75c36173545242bc9e85']
-
-builddependencies = [('CMake', '3.21.1')]
-
-dependencies = [
-    ('netCDF', '4.8.1'),
-    ('JasPer', '2.0.33'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('libpng', '1.6.37'),
-    ('zlib', '1.2.11'),
-]
-
-# Python bindings are now provided by a separate package 'eccodes-python'
-configopts = "-DENABLE_NETCDF=ON -DENABLE_PNG=ON "
-configopts += "-DENABLE_JPG=ON -DENABLE_JPG_LIBJASPER=ON "
-configopts += "-DENABLE_ECCODES_OMP_THREADS=ON"
-
-local_exes = ['%s_%s' % (a, b)
-              for a in ['bufr', 'grib', 'gts', 'metar']
-              for b in ['compare', 'copy', 'dump', 'filter', 'get', 'ls']]
-local_exes += ['codes_%s' % c for c in ['count', 'info', 'split_file']]
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in local_exes] +
-             ['lib/libeccodes_f90.%s' % SHLIB_EXT, 'lib/libeccodes.%s' % SHLIB_EXT],
-    'dirs': ['include'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/e/ecCodes/ecCodes-2.22.1-ipsmpi-2021b.eb b/Golden_Repo/e/ecCodes/ecCodes-2.22.1-ipsmpi-2021b.eb
deleted file mode 100644
index 7b096bfe9..000000000
--- a/Golden_Repo/e/ecCodes/ecCodes-2.22.1-ipsmpi-2021b.eb
+++ /dev/null
@@ -1,44 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'ecCodes'
-version = '2.22.1'
-
-homepage = 'https://software.ecmwf.int/wiki/display/ECC/ecCodes+Home'
-description = """ecCodes is a package developed by ECMWF which provides an application programming interface and
- a set of tools for decoding and encoding messages in the following formats: WMO FM-92 GRIB edition 1 and edition 2,
- WMO FM-94 BUFR edition 3 and edition 4, WMO GTS abbreviated header (only decoding)."""
-
-toolchain = {'name': 'ipsmpi', 'version': '2021b'}
-toolchainopts = {'usempi': False, 'openmp': True}
-
-source_urls = ['https://confluence.ecmwf.int/download/attachments/45757960/']
-sources = ['eccodes-%(version)s-Source.tar.gz']
-checksums = ['75c7ee96469bb30b0c8f7edbdc4429ece4415897969f75c36173545242bc9e85']
-
-builddependencies = [('CMake', '3.21.1')]
-
-dependencies = [
-    ('netCDF', '4.8.1'),
-    ('JasPer', '2.0.33'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('libpng', '1.6.37'),
-    ('zlib', '1.2.11'),
-]
-
-# Python bindings are now provided by a separate package 'eccodes-python'
-configopts = "-DENABLE_NETCDF=ON -DENABLE_PNG=ON "
-configopts += "-DENABLE_JPG=ON -DENABLE_JPG_LIBJASPER=ON "
-configopts += "-DENABLE_ECCODES_OMP_THREADS=ON"
-
-local_exes = ['%s_%s' % (a, b)
-              for a in ['bufr', 'grib', 'gts', 'metar']
-              for b in ['compare', 'copy', 'dump', 'filter', 'get', 'ls']]
-local_exes += ['codes_%s' % c for c in ['count', 'info', 'split_file']]
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in local_exes] +
-             ['lib/libeccodes_f90.%s' % SHLIB_EXT, 'lib/libeccodes.%s' % SHLIB_EXT],
-    'dirs': ['include'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/e/ecCodes/ecCodes-2.22.1-npsmpic-2021b.eb b/Golden_Repo/e/ecCodes/ecCodes-2.22.1-npsmpic-2021b.eb
deleted file mode 100644
index 464f97763..000000000
--- a/Golden_Repo/e/ecCodes/ecCodes-2.22.1-npsmpic-2021b.eb
+++ /dev/null
@@ -1,44 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'ecCodes'
-version = '2.22.1'
-
-homepage = 'https://software.ecmwf.int/wiki/display/ECC/ecCodes+Home'
-description = """ecCodes is a package developed by ECMWF which provides an application programming interface and
- a set of tools for decoding and encoding messages in the following formats: WMO FM-92 GRIB edition 1 and edition 2,
- WMO FM-94 BUFR edition 3 and edition 4, WMO GTS abbreviated header (only decoding)."""
-
-toolchain = {'name': 'npsmpic', 'version': '2021b'}
-toolchainopts = {'usempi': False, 'openmp': True}
-
-source_urls = ['https://confluence.ecmwf.int/download/attachments/45757960/']
-sources = ['eccodes-%(version)s-Source.tar.gz']
-checksums = ['75c7ee96469bb30b0c8f7edbdc4429ece4415897969f75c36173545242bc9e85']
-
-builddependencies = [('CMake', '3.21.1')]
-
-dependencies = [
-    ('netCDF', '4.8.1'),
-    ('JasPer', '2.0.33'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('libpng', '1.6.37'),
-    ('zlib', '1.2.11'),
-]
-
-# Python bindings are now provided by a separate package 'eccodes-python'
-configopts = "-DENABLE_NETCDF=ON -DENABLE_PNG=ON "
-configopts += "-DENABLE_JPG=ON -DENABLE_JPG_LIBJASPER=ON "
-configopts += "-DENABLE_ECCODES_OMP_THREADS=ON"
-
-local_exes = ['%s_%s' % (a, b)
-              for a in ['bufr', 'grib', 'gts', 'metar']
-              for b in ['compare', 'copy', 'dump', 'filter', 'get', 'ls']]
-local_exes += ['codes_%s' % c for c in ['count', 'info', 'split_file']]
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in local_exes] +
-             ['lib/libeccodes_f90.%s' % SHLIB_EXT, 'lib/libeccodes.%s' % SHLIB_EXT],
-    'dirs': ['include'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/e/ecCodes/ecCodes-2.22.1-nvompic-2021b.eb b/Golden_Repo/e/ecCodes/ecCodes-2.22.1-nvompic-2021b.eb
deleted file mode 100644
index 1d870b9f9..000000000
--- a/Golden_Repo/e/ecCodes/ecCodes-2.22.1-nvompic-2021b.eb
+++ /dev/null
@@ -1,44 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'ecCodes'
-version = '2.22.1'
-
-homepage = 'https://software.ecmwf.int/wiki/display/ECC/ecCodes+Home'
-description = """ecCodes is a package developed by ECMWF which provides an application programming interface and
- a set of tools for decoding and encoding messages in the following formats: WMO FM-92 GRIB edition 1 and edition 2,
- WMO FM-94 BUFR edition 3 and edition 4, WMO GTS abbreviated header (only decoding)."""
-
-toolchain = {'name': 'nvompic', 'version': '2021b'}
-toolchainopts = {'usempi': False, 'openmp': True}
-
-source_urls = ['https://confluence.ecmwf.int/download/attachments/45757960/']
-sources = ['eccodes-%(version)s-Source.tar.gz']
-checksums = ['75c7ee96469bb30b0c8f7edbdc4429ece4415897969f75c36173545242bc9e85']
-
-builddependencies = [('CMake', '3.21.1')]
-
-dependencies = [
-    ('netCDF', '4.8.1'),
-    ('JasPer', '2.0.33'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('libpng', '1.6.37'),
-    ('zlib', '1.2.11'),
-]
-
-# Python bindings are now provided by a separate package 'eccodes-python'
-configopts = "-DENABLE_NETCDF=ON -DENABLE_PNG=ON "
-configopts += "-DENABLE_JPG=ON -DENABLE_JPG_LIBJASPER=ON "
-configopts += "-DENABLE_ECCODES_OMP_THREADS=ON"
-
-local_exes = ['%s_%s' % (a, b)
-              for a in ['bufr', 'grib', 'gts', 'metar']
-              for b in ['compare', 'copy', 'dump', 'filter', 'get', 'ls']]
-local_exes += ['codes_%s' % c for c in ['count', 'info', 'split_file']]
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in local_exes] +
-             ['lib/libeccodes_f90.%s' % SHLIB_EXT, 'lib/libeccodes.%s' % SHLIB_EXT],
-    'dirs': ['include'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/e/elfutils/elfutils-0.185-GCCcore-11.2.0.eb b/Golden_Repo/e/elfutils/elfutils-0.185-GCCcore-11.2.0.eb
deleted file mode 100644
index e71a4d764..000000000
--- a/Golden_Repo/e/elfutils/elfutils-0.185-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,41 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'elfutils'
-version = '0.185'
-
-homepage = 'https://elfutils.org/'
-
-description = """
- The elfutils project provides libraries and tools for ELF files
- and DWARF data.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://sourceware.org/elfutils/ftp/%(version)s/']
-sources = [SOURCE_TAR_BZ2]
-checksums = ['dc8d3e74ab209465e7f568e1b3bb9a5a142f8656e2b57d10049a73da2ae6b5a6']
-
-builddependencies = [
-    ('M4', '1.4.19'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('binutils', '2.37'),
-    ('bzip2', '1.0.8'),
-    ('libarchive', '3.5.1'),
-    ('XZ', '5.2.5'),
-    ('zstd', '1.5.0'),
-]
-
-configopts = "--disable-debuginfod --disable-libdebuginfod"
-
-sanity_check_paths = {
-    'files': ['bin/eu-elfcmp', 'include/dwarf.h', 'lib/libelf.%s' % SHLIB_EXT],
-    'dirs': []
-}
-
-sanity_check_commands = ["eu-elfcmp --help"]
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/e/eudev/eudev-3.2.9-GCCcore-11.2.0.eb b/Golden_Repo/e/eudev/eudev-3.2.9-GCCcore-11.2.0.eb
deleted file mode 100644
index d13b4e591..000000000
--- a/Golden_Repo/e/eudev/eudev-3.2.9-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,44 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'eudev'
-version = '3.2.9'
-
-homepage = 'https://wiki.gentoo.org/wiki/Project:Eudev'
-
-description = """
- eudev is a fork of systemd-udev with the goal of obtaining better
- compatibility with existing software such as OpenRC and Upstart,
- older kernels, various toolchains and anything else required by
- users and various distributions.
-"""
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['http://dev.gentoo.org/~blueness/%(name)s/']
-sources = [SOURCE_TAR_GZ]
-patches = ['%(name)s-%(version)s_python3.patch']
-checksums = [
-    '89618619084a19e1451d373c43f141b469c9fd09767973d73dd268b92074d4fc',
-    '846b1e72e12853c4146d3a4e312301001bbfb13110ce76de2afdf860f4d085a8',
-]
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('gperf', '3.1'),
-    ('Python', '3.9.6'),
-]
-
-osdependencies = [('kernel-headers', 'linux-libc-dev')]
-
-configopts = '--disable-blkid --disable-selinux --disable-manpages '
-
-runtest = 'check'
-
-sanity_check_paths = {
-    'files': ['bin/udevadm', 'include/libudev.h', 'include/udev.h',
-              'lib/libudev.so.1'],
-    'dirs': [],
-}
-
-moduleclass = 'system'
diff --git a/Golden_Repo/e/eudev/eudev-3.2.9_python3.patch b/Golden_Repo/e/eudev/eudev-3.2.9_python3.patch
deleted file mode 100644
index 6730aacf0..000000000
--- a/Golden_Repo/e/eudev/eudev-3.2.9_python3.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -ruN eudev-3.2.9.orig/test/rule-syntax-check.py eudev-3.2.9/test/rule-syntax-check.py
---- eudev-3.2.9.orig/test/rule-syntax-check.py	2016-11-17 22:14:19.000000000 +0100
-+++ eudev-3.2.9/test/rule-syntax-check.py	2020-11-06 15:22:12.238868994 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/env python3
- # Simple udev rules syntax checker
- #
- # (C) 2010 Canonical Ltd.
diff --git a/Golden_Repo/e/expat/expat-2.4.1-GCCcore-11.2.0.eb b/Golden_Repo/e/expat/expat-2.4.1-GCCcore-11.2.0.eb
deleted file mode 100644
index b22163b95..000000000
--- a/Golden_Repo/e/expat/expat-2.4.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'expat'
-version = '2.4.1'
-
-homepage = 'https://libexpat.github.io'
-
-description = """
-Expat is an XML parser library written in C. It is a stream-oriented parser
-in which an application registers handlers for things the parser might find
-in the XML document (like start tags)
-"""
-
-site_contacts = 'sc@fz-juelich.de'
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/libexpat/libexpat/releases/download/R_%s/' %
-               version.replace('.', '_')]
-sources = [SOURCE_TAR_BZ2]
-checksums = ['2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40']
-
-builddependencies = [('binutils', '2.37')]
-
-# Since expat 2.2.6, docbook2X is needed to produce manpage of xmlwf.
-# Docbook2X needs XML-Parser and XML-Parser needs expat.
-# -> circular dependency. "--without-docbook" breaks this circle.
-configopts = ['--without-docbook']
-
-sanity_check_paths = {
-    'files': ['include/expat.h', 'lib/libexpat.a', 'lib/libexpat.%s' % SHLIB_EXT],
-    'dirs': [],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/e/expecttest/expecttest-0.1.3-GCCcore-11.2.0.eb b/Golden_Repo/e/expecttest/expecttest-0.1.3-GCCcore-11.2.0.eb
deleted file mode 100644
index db551fcac..000000000
--- a/Golden_Repo/e/expecttest/expecttest-0.1.3-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,25 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'expecttest'
-version = '0.1.3'
-
-homepage = "https://github.com/ezyang/expecttest"
-description = """This library implements expect tests (also known as "golden" tests). Expect tests are a method of
- writing tests where instead of hard-coding the expected output of a test, you run the test to get the output, and
- the test framework automatically populates the expected output. If the output of the test changes, you can rerun
- the test with the environment variable EXPECTTEST_ACCEPT=1 to automatically update the expected output."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-sources = [SOURCE_TAR_GZ]
-checksums = ['83057695811d94128aed13ed094a070db90e0a92ea40071f8ee073cbab57149a']
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [('Python', '3.9.6')]
-
-use_pip = True
-download_dep_fail = True
-sanity_pip_check = True
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/f/FFTW/FFTW-3.3.10-GCCcore-11.2.0-nompi.eb b/Golden_Repo/f/FFTW/FFTW-3.3.10-GCCcore-11.2.0-nompi.eb
deleted file mode 100644
index b3c912aea..000000000
--- a/Golden_Repo/f/FFTW/FFTW-3.3.10-GCCcore-11.2.0-nompi.eb
+++ /dev/null
@@ -1,37 +0,0 @@
-name = 'FFTW'
-version = '3.3.10'
-versionsuffix = '-nompi'
-
-homepage = 'http://www.fftw.org'
-description = """FFTW is a C subroutine library for computing the discrete
-Fourier transform (DFT) in one or more dimensions, of arbitrary input size,
-and of both real and complex data."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [homepage]
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['56c932549852cddcfafdab3820b0200c7742675be92179e59e6215b340e26467']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-# We hide it here since this should be used just for Jupyter and the MPI version should be preferred for normal cases
-hidden = True
-
-with_quad_prec = True
-
-use_fma4 = True
-
-# can't find mpirun/mpiexec and fails
-# runtest = 'check'
-
-modextravars = {
-    'FFTW_ROOT': '%(installdir)s',
-    'FFTW_INCLUDE': '%(installdir)s/include',
-    'FFTW_LIB': '%(installdir)s/lib',
-}
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/f/FFTW/FFTW-3.3.10-gompi-2021b.eb b/Golden_Repo/f/FFTW/FFTW-3.3.10-gompi-2021b.eb
deleted file mode 100644
index 188ab5d07..000000000
--- a/Golden_Repo/f/FFTW/FFTW-3.3.10-gompi-2021b.eb
+++ /dev/null
@@ -1,25 +0,0 @@
-name = 'FFTW'
-version = '3.3.10'
-
-homepage = 'http://www.fftw.org'
-description = """FFTW is a C subroutine library for computing the discrete
-Fourier transform (DFT) in one or more dimensions, of arbitrary input size,
-and of both real and complex data."""
-
-toolchain = {'name': 'gompi', 'version': '2021b'}
-toolchainopts = {'pic': True}
-
-source_urls = [homepage]
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['56c932549852cddcfafdab3820b0200c7742675be92179e59e6215b340e26467']
-
-# can't find mpirun/mpiexec and fails
-# runtest = 'check'
-
-modextravars = {
-    'FFTW_ROOT': '%(installdir)s',
-    'FFTW_INCLUDE': '%(installdir)s/include',
-    'FFTW_LIB': '%(installdir)s/lib',
-}
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/f/FFTW/FFTW-3.3.10-gpsmpi-2021b.eb b/Golden_Repo/f/FFTW/FFTW-3.3.10-gpsmpi-2021b.eb
deleted file mode 100644
index de17200c1..000000000
--- a/Golden_Repo/f/FFTW/FFTW-3.3.10-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,25 +0,0 @@
-name = 'FFTW'
-version = '3.3.10'
-
-homepage = 'http://www.fftw.org'
-description = """FFTW is a C subroutine library for computing the discrete
-Fourier transform (DFT) in one or more dimensions, of arbitrary input size,
-and of both real and complex data."""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-toolchainopts = {'pic': True}
-
-source_urls = [homepage]
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['56c932549852cddcfafdab3820b0200c7742675be92179e59e6215b340e26467']
-
-# can't find mpirun/mpiexec and fails
-# runtest = 'check'
-
-modextravars = {
-    'FFTW_ROOT': '%(installdir)s',
-    'FFTW_INCLUDE': '%(installdir)s/include',
-    'FFTW_LIB': '%(installdir)s/lib',
-}
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/f/FFTW/FFTW-3.3.10-iimpi-2021b.eb b/Golden_Repo/f/FFTW/FFTW-3.3.10-iimpi-2021b.eb
deleted file mode 100644
index 7640339aa..000000000
--- a/Golden_Repo/f/FFTW/FFTW-3.3.10-iimpi-2021b.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-name = 'FFTW'
-version = '3.3.10'
-
-homepage = 'http://www.fftw.org'
-description = """FFTW is a C subroutine library for computing the discrete
-Fourier transform (DFT) in one or more dimensions, of arbitrary input size,
-and of both real and complex data."""
-
-toolchain = {'name': 'iimpi', 'version': '2021b'}
-toolchainopts = {'pic': True}
-
-source_urls = [homepage]
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['56c932549852cddcfafdab3820b0200c7742675be92179e59e6215b340e26467']
-
-# no quad precision, requires GCC v4.6 or higher
-# see also
-# http://www.fftw.org/doc/Extended-and-quadruple-precision-in-Fortran.html
-with_quad_prec = False
-
-# compilation fails on AMD systems when configuring with --enable-avx-128-fma,
-# because Intel compilers do not support FMA4 instructions
-use_fma4 = False
-
-# can't find mpirun/mpiexec and fails
-# runtest = 'check'
-
-modextravars = {
-    'FFTW_ROOT': '%(installdir)s',
-    'FFTW_INCLUDE': '%(installdir)s/include',
-    'FFTW_LIB': '%(installdir)s/lib',
-}
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/f/FFTW/FFTW-3.3.10-iompi-2021b.eb b/Golden_Repo/f/FFTW/FFTW-3.3.10-iompi-2021b.eb
deleted file mode 100644
index 2b3ff1afe..000000000
--- a/Golden_Repo/f/FFTW/FFTW-3.3.10-iompi-2021b.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-name = 'FFTW'
-version = '3.3.10'
-
-homepage = 'http://www.fftw.org'
-description = """FFTW is a C subroutine library for computing the discrete
-Fourier transform (DFT) in one or more dimensions, of arbitrary input size,
-and of both real and complex data."""
-
-toolchain = {'name': 'iompi', 'version': '2021b'}
-toolchainopts = {'pic': True}
-
-source_urls = [homepage]
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['56c932549852cddcfafdab3820b0200c7742675be92179e59e6215b340e26467']
-
-# no quad precision, requires GCC v4.6 or higher
-# see also
-# http://www.fftw.org/doc/Extended-and-quadruple-precision-in-Fortran.html
-with_quad_prec = False
-
-# compilation fails on AMD systems when configuring with --enable-avx-128-fma,
-# because Intel compilers do not support FMA4 instructions
-use_fma4 = False
-
-# can't find mpirun/mpiexec and fails
-# runtest = 'check'
-
-modextravars = {
-    'FFTW_ROOT': '%(installdir)s',
-    'FFTW_INCLUDE': '%(installdir)s/include',
-    'FFTW_LIB': '%(installdir)s/lib',
-}
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/f/FFTW/FFTW-3.3.10-ipsmpi-2021b.eb b/Golden_Repo/f/FFTW/FFTW-3.3.10-ipsmpi-2021b.eb
deleted file mode 100644
index 8297fe106..000000000
--- a/Golden_Repo/f/FFTW/FFTW-3.3.10-ipsmpi-2021b.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-name = 'FFTW'
-version = '3.3.10'
-
-homepage = 'http://www.fftw.org'
-description = """FFTW is a C subroutine library for computing the discrete
-Fourier transform (DFT) in one or more dimensions, of arbitrary input size,
-and of both real and complex data."""
-
-toolchain = {'name': 'ipsmpi', 'version': '2021b'}
-toolchainopts = {'pic': True}
-
-source_urls = [homepage]
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['56c932549852cddcfafdab3820b0200c7742675be92179e59e6215b340e26467']
-
-# no quad precision, requires GCC v4.6 or higher
-# see also
-# http://www.fftw.org/doc/Extended-and-quadruple-precision-in-Fortran.html
-with_quad_prec = False
-
-# compilation fails on AMD systems when configuring with --enable-avx-128-fma,
-# because Intel compilers do not support FMA4 instructions
-use_fma4 = False
-
-# can't find mpirun/mpiexec and fails
-# runtest = 'check'
-
-modextravars = {
-    'FFTW_ROOT': '%(installdir)s',
-    'FFTW_INCLUDE': '%(installdir)s/include',
-    'FFTW_LIB': '%(installdir)s/lib',
-}
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/f/FFTW/FFTW-3.3.10-npsmpic-2021b.eb b/Golden_Repo/f/FFTW/FFTW-3.3.10-npsmpic-2021b.eb
deleted file mode 100644
index afbbb5b26..000000000
--- a/Golden_Repo/f/FFTW/FFTW-3.3.10-npsmpic-2021b.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-name = 'FFTW'
-version = '3.3.10'
-
-homepage = 'http://www.fftw.org'
-description = """FFTW is a C subroutine library for computing the discrete
-Fourier transform (DFT) in one or more dimensions, of arbitrary input size,
-and of both real and complex data."""
-
-toolchain = {'name': 'npsmpic', 'version': '2021b'}
-toolchainopts = {'pic': True}
-
-source_urls = [homepage]
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['56c932549852cddcfafdab3820b0200c7742675be92179e59e6215b340e26467']
-
-# no quad precision, not supportd with nv 
-# see also
-# https://github.com/FFTW/fftw3/issues/83
-with_quad_prec = False
-
-# compilation fails on AMD systems when configuring with --enable-avx-128-fma,
-# because Intel compilers do not support FMA4 instructions
-use_fma4 = True
-
-# can't find mpirun/mpiexec and fails
-# runtest = 'check'
-
-modextravars = {
-    'FFTW_ROOT': '%(installdir)s',
-    'FFTW_INCLUDE': '%(installdir)s/include',
-    'FFTW_LIB': '%(installdir)s/lib',
-}
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/f/FFTW/FFTW-3.3.10-nvompic-2021b.eb b/Golden_Repo/f/FFTW/FFTW-3.3.10-nvompic-2021b.eb
deleted file mode 100644
index 78584aeb0..000000000
--- a/Golden_Repo/f/FFTW/FFTW-3.3.10-nvompic-2021b.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-name = 'FFTW'
-version = '3.3.10'
-
-homepage = 'http://www.fftw.org'
-description = """FFTW is a C subroutine library for computing the discrete
-Fourier transform (DFT) in one or more dimensions, of arbitrary input size,
-and of both real and complex data."""
-
-toolchain = {'name': 'nvompic', 'version': '2021b'}
-toolchainopts = {'pic': True}
-
-source_urls = [homepage]
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['56c932549852cddcfafdab3820b0200c7742675be92179e59e6215b340e26467']
-
-# no quad precision, not supportd with nv 
-# see also
-# https://github.com/FFTW/fftw3/issues/83
-with_quad_prec = False
-
-# compilation fails on AMD systems when configuring with --enable-avx-128-fma,
-# because Intel compilers do not support FMA4 instructions
-use_fma4 = True
-
-# can't find mpirun/mpiexec and fails
-# runtest = 'check'
-
-modextravars = {
-    'FFTW_ROOT': '%(installdir)s',
-    'FFTW_INCLUDE': '%(installdir)s/include',
-    'FFTW_LIB': '%(installdir)s/lib',
-}
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/f/FFmpeg/FFmpeg-4.4.1-GCCcore-11.2.0.eb b/Golden_Repo/f/FFmpeg/FFmpeg-4.4.1-GCCcore-11.2.0.eb
deleted file mode 100644
index 057b52007..000000000
--- a/Golden_Repo/f/FFmpeg/FFmpeg-4.4.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,70 +0,0 @@
-# Built with EasyBuild version 4.4.0 on 2021-06-21_20-21-54
-easyblock = 'ConfigureMake'
-
-name = 'FFmpeg'
-version = '4.4.1'
-local_ffnvcodec_version = '11.1.5.0'
-
-homepage = 'https://www.ffmpeg.org/'
-description = """A complete, cross-platform solution to record, convert and stream audio and video."""
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [
-    'https://ffmpeg.org/releases/',
-    'https://github.com/FFmpeg/nv-codec-headers/releases/download/n%s/' % local_ffnvcodec_version,
-]
-sources = [
-    SOURCELOWER_TAR_BZ2,
-    'nv-codec-headers-%s.tar.gz' % local_ffnvcodec_version,
-]
-checksums = [
-    '8fc9f20ac5ed95115a9e285647add0eedd5cc1a98a039ada14c132452f98ac42',
-    '5b3692da3215006ea9fb5585b046605133cd111eb63e376feb5309ccb5ff13dc',
-]
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('pkg-config', '0.29.2')
-]
-
-dependencies = [
-    ('NASM', '2.15.05'),
-    ('zlib', '1.2.11'),
-    ('bzip2', '1.0.8'),
-    ('x264', '20210613'),
-    ('LAME', '3.100'),
-    ('x265', '3.4'),
-    ('libvpx', '1.11.0'),
-    ('X11', '20210802'),
-    ('freetype', '2.11.0'),
-    ('fontconfig', '2.13.94'),
-    ('FriBidi', '1.0.10'),
-    ('CUDA', '11.5', '', SYSTEM),
-]
-
-preconfigopts = 'pushd %%(builddir)s/nv-codec-headers-%s/ && ' % local_ffnvcodec_version
-preconfigopts += 'make install PREFIX=%(builddir)s/ffnvcodec && '
-preconfigopts += 'popd && '
-preconfigopts += 'export PKG_CONFIG_PATH=%(builddir)s/ffnvcodec/lib/pkgconfig/:$PKG_CONFIG_PATH && '
-
-configopts = '--enable-pic --enable-shared --enable-gpl --enable-version3 --enable-nonfree --cc="$CC" --cxx="$CXX" '
-configopts += '--enable-libx264 --enable-libx265 --enable-libmp3lame --enable-libfreetype --enable-fontconfig '
-configopts += '--enable-libfribidi --enable-libvpx '
-configopts += '--enable-cuda-nvcc --enable-libnpp --enable-nvenc --enable-cuvid '
-configopts += '--extra-cflags=-I${EBROOTCUDA}/include --extra-ldflags=-L${EBROOTCUDA}/lib64 '
-#  FFmpeg embeds ptx assembly code. Hence, '-ptx' is added to nvccflags by configure.
-#  This means that we cannot add more than a single architecture here.
-#  But new NVIDIA GPUs should be backward compatible.
-configopts += '--nvccflags="-O2 -gencode=arch=compute_60,code=sm_60" '
-configopts += '--logfile=log.txt '
-
-sanity_check_paths = {
-    'files': ['bin/ff%s' % x for x in ['mpeg', 'probe']] +
-             ['lib/lib%s.%s' % (x, y) for x in ['avdevice', 'avfilter', 'avformat', 'avcodec', 'postproc',
-                                                'swresample', 'swscale', 'avutil'] for y in [SHLIB_EXT, 'a']],
-    'dirs': ['include']
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/f/FLINT/FLINT-2.7.1-GCC-11.2.0.eb b/Golden_Repo/f/FLINT/FLINT-2.7.1-GCC-11.2.0.eb
deleted file mode 100644
index 0e90e3ce0..000000000
--- a/Golden_Repo/f/FLINT/FLINT-2.7.1-GCC-11.2.0.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'FLINT'
-version = '2.7.1'
-
-homepage = 'https://www.flintlib.org/'
-
-description = """FLINT (Fast Library for Number Theory) is a C library in support of computations
- in number theory. Operations that can be performed include conversions, arithmetic, computing GCDs,
- factoring, solving linear systems, and evaluating special functions. In addition, FLINT provides
- various low-level routines for fast arithmetic. FLINT is extensively documented and tested."""
-
-toolchain = {'name': 'GCC', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://www.flintlib.org']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['186e2fd9ab67df8a05b122fb018269b382e4babcdb17353c4be1fe364dca481e']
-
-builddependencies = [
-    ('CMake', '3.21.1'),
-]
-
-dependencies = [
-    ('GMP', '6.2.1'),
-    ('MPFR', '4.1.0'),
-]
-
-separate_build_dir = True
-
-sanity_check_paths = {
-    'files': ['lib/lib%%(namelower)s.%s' % SHLIB_EXT],
-    'dirs': ['include'],
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/f/FLTK/FLTK-1.3.7-GCCcore-11.2.0.eb b/Golden_Repo/f/FLTK/FLTK-1.3.7-GCCcore-11.2.0.eb
deleted file mode 100644
index ef48a7cc7..000000000
--- a/Golden_Repo/f/FLTK/FLTK-1.3.7-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,45 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'FLTK'
-version = '1.3.7'
-
-homepage = 'https://www.fltk.org'
-description = """FLTK is a cross-platform C++ GUI toolkit for UNIX/Linux (X11), Microsoft Windows,
- and MacOS X. FLTK provides modern GUI functionality without the bloat and supports 3D graphics via OpenGL
- and its built-in GLUT emulation."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://fltk.org/pub/%(namelower)s/%(version)s/']
-sources = ['%(namelower)s-%(version)s-source.tar.gz']
-patches = ['FLTK-1.3.6_fix-LDFLAGS.patch']
-checksums = [
-    # fltk-1.3.7-source.tar.gz
-    '5d2ccb7ad94e595d3d97509c7a931554e059dd970b7b29e6fd84cb70fd5491c6',
-    # FLTK-1.3.6_fix-LDFLAGS.patch
-    'f8af2414a1ee193a186b0d98d1e3567add0ee003f44ec64dce2ce2dfd6d95ebf',
-]
-
-configopts = '--enable-shared --enable-threads --enable-xft'
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('groff', '1.22.4'),
-]
-
-dependencies = [
-    ('X11', '20210802'),
-    ('OpenGL', '2021b'),
-    ('libpng', '1.6.37'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('xprop', '1.2.5'),
-    ('zlib', '1.2.11'),
-]
-
-sanity_check_paths = {
-    'files': ['bin/fltk-config', 'bin/fluid', 'lib/libfltk.a', 'lib/libfltk.%s' % SHLIB_EXT],
-    'dirs': ['lib'],
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/f/Fiona/Fiona-1.8.20-GCCcore-11.2.0.eb b/Golden_Repo/f/Fiona/Fiona-1.8.20-GCCcore-11.2.0.eb
deleted file mode 100644
index 3feb046fd..000000000
--- a/Golden_Repo/f/Fiona/Fiona-1.8.20-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,47 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'Fiona'
-version = '1.8.20'
-
-homepage = 'https://github.com/Toblerity/Fiona'
-description = """Fiona is designed to be simple and dependable. It focuses on reading and writing data
-in standard Python IO style and relies upon familiar Python types and protocols such as files, dictionaries,
-mappings, and iterators instead of classes specific to OGR. Fiona can read and write real-world data using
-multi-layered GIS formats and zipped virtual file systems and integrates readily with other Python GIS
-packages such as pyproj, Rtree, and Shapely."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('GDAL', '3.3.2'),
-    ('Shapely', '1.8.0'),  # optional
-]
-
-use_pip = True
-
-exts_list = [
-    ('cligj', '0.7.2', {
-        'checksums': ['a4bc13d623356b373c2c27c53dbd9c68cae5d526270bfa71f6c6fa69669c6b27'],
-    }),
-    ('click-plugins', '1.1.1', {
-        'checksums': ['46ab999744a9d831159c3411bb0c79346d94a444df9a3a3742e9ed63645f264b'],
-    }),
-    ('munch', '2.5.0', {
-        'checksums': ['2d735f6f24d4dba3417fa448cae40c6e896ec1fdab6cdb5e6510999758a4dbd2'],
-    }),
-    (name, version, {
-        'checksums': ['a70502d2857b82f749c09cb0dea3726787747933a2a1599b5ab787d74e3c143b'],
-    }),
-]
-
-sanity_pip_check = True
-
-sanity_check_paths = {
-    'files': ['bin/fio'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-sanity_check_commands = ["fio --help"]
-
-moduleclass = 'data'
diff --git a/Golden_Repo/f/Flask/Flask-2.0.2-GCCcore-11.2.0.eb b/Golden_Repo/f/Flask/Flask-2.0.2-GCCcore-11.2.0.eb
deleted file mode 100644
index 6ea9aae6e..000000000
--- a/Golden_Repo/f/Flask/Flask-2.0.2-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,40 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'Flask'
-version = '2.0.2'
-
-homepage = 'https://www.palletsprojects.com/p/flask/'
-description = """
-Flask is a lightweight WSGI web application framework. It is designed to make
-getting started quick and easy, with the ability to scale up to complex
-applications.
-This module includes the Flask extensions: Flask-Cors"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-dependencies = [
-    ('Python', '3.9.6'),
-]
-
-builddependencies = [('binutils', '2.37')]
-
-use_pip = True
-sanity_pip_check = True
-
-exts_list = [
-    (name, version, {
-        'checksums': ['7b2fb8e934ddd50731893bdcdb00fc8c0315916f9fcd50d22c7cc1a95ab634e2'],
-    }),
-    ('Flask-Cors', '3.0.10', {
-        'checksums': ['b60839393f3b84a0f3746f6cdca56c1ad7426aa738b70d6c61375857823181de'],
-    }),
-]
-
-sanity_check_paths = {
-    'files': ['bin/flask'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-sanity_check_commands = ['flask --version']
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/f/FreeImage/FreeImage-3.18.0-GCCcore-11.2.0.eb b/Golden_Repo/f/FreeImage/FreeImage-3.18.0-GCCcore-11.2.0.eb
deleted file mode 100644
index 7eca59b71..000000000
--- a/Golden_Repo/f/FreeImage/FreeImage-3.18.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,40 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'FreeImage'
-version = '3.18.0'
-
-homepage = 'http://freeimage.sourceforge.net'
-description = """FreeImage is an Open Source library project for developers who would like to support popular graphics
-image formats like PNG, BMP, JPEG, TIFF and others as needed by today's multimedia applications. FreeImage is easy to
-use, fast, multithreading safe."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True, 'cstd': 'c++11'}
-
-source_urls = [SOURCEFORGE_SOURCE]
-sources = ['%%(name)s%s.zip' % ''.join(version.split('.'))]
-patches = ['%(name)s-%(version)s-fix-makefile.patch']
-checksums = [
-    'f41379682f9ada94ea7b34fe86bf9ee00935a3147be41b6569c9605a53e438fd',  # FreeImage3180.zip
-    '3eaa1eb9562ccfd0cb95a37879bb7e3e8c745166596d75af529478181ef006a0',  # FreeImage-3.18.0-fix-makefile.patch
-]
-
-builddependencies = [('binutils', '2.37')]
-
-skipsteps = ['configure']
-
-buildopts = ['', '-f Makefile.fip']
-installopts = [
-    'INCDIR=%(installdir)s/include INSTALLDIR=%(installdir)s/lib',
-    '-f Makefile.fip INCDIR=%(installdir)s/include INSTALLDIR=%(installdir)s/lib'
-]
-
-dependencies = [('zlib', '1.2.11')]
-
-sanity_check_paths = {
-    'files': ['include/FreeImage.h', 'include/FreeImagePlus.h', 'lib/libfreeimage.a', 'lib/libfreeimage.%s' % SHLIB_EXT,
-              'lib/libfreeimageplus.a', 'lib/libfreeimageplus.%s' % SHLIB_EXT],
-    'dirs': []
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/f/FreeImage/FreeImage-3.18.0-fix-makefile.patch b/Golden_Repo/f/FreeImage/FreeImage-3.18.0-fix-makefile.patch
deleted file mode 100644
index ac35040d4..000000000
--- a/Golden_Repo/f/FreeImage/FreeImage-3.18.0-fix-makefile.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-# Do not install files to root user
-# wpoely86@gmail.com
-diff -ur FreeImage.orig/Makefile.fip FreeImage/Makefile.fip
---- FreeImage.orig/Makefile.fip	2015-03-10 09:03:56.000000000 +0100
-+++ FreeImage/Makefile.fip	2019-04-09 10:32:42.052332853 +0200
-@@ -11,7 +11,7 @@
- # Converts cr/lf to just lf
- DOS2UNIX = dos2unix
- 
--LIBRARIES = -lstdc++
-+LIBRARIES = -lstdc++ $(LIBS)
- 
- MODULES = $(SRCS:.c=.o)
- MODULES := $(MODULES:.cpp=.o)
-@@ -72,10 +72,10 @@
- 
- install:
- 	install -d $(INCDIR) $(INSTALLDIR)
--	install -m 644 -o root -g root $(HEADER) $(INCDIR)
--	install -m 644 -o root -g root $(HEADERFIP) $(INCDIR)
--	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
--	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
-+	install -m 644 $(HEADER) $(INCDIR)
-+	install -m 644 $(HEADERFIP) $(INCDIR)
-+	install -m 644 $(STATICLIB) $(INSTALLDIR)
-+	install -m 755 $(SHAREDLIB) $(INSTALLDIR)
- 	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
- 	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)	
- 
-diff -ur FreeImage.orig/Makefile.gnu FreeImage/Makefile.gnu
---- FreeImage.orig/Makefile.gnu	2015-03-10 09:04:00.000000000 +0100
-+++ FreeImage/Makefile.gnu	2019-04-09 10:31:59.066052732 +0200
-@@ -11,7 +11,7 @@
- # Converts cr/lf to just lf
- DOS2UNIX = dos2unix
- 
--LIBRARIES = -lstdc++
-+LIBRARIES = -lstdc++ $(LIBS)
- 
- MODULES = $(SRCS:.c=.o)
- MODULES := $(MODULES:.cpp=.o)
-@@ -71,9 +71,9 @@
- 
- install:
- 	install -d $(INCDIR) $(INSTALLDIR)
--	install -m 644 -o root -g root $(HEADER) $(INCDIR)
--	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
--	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
-+	install -m 644 $(HEADER) $(INCDIR)
-+	install -m 644 $(STATICLIB) $(INSTALLDIR)
-+	install -m 755 $(SHAREDLIB) $(INSTALLDIR)
- 	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
- 	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)	
- #	ldconfig
diff --git a/Golden_Repo/f/FreeSurfer/FreeSurfer-7.1.1-GCCcore-11.2.0.eb b/Golden_Repo/f/FreeSurfer/FreeSurfer-7.1.1-GCCcore-11.2.0.eb
deleted file mode 100644
index c9be013c2..000000000
--- a/Golden_Repo/f/FreeSurfer/FreeSurfer-7.1.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,38 +0,0 @@
-# For using $FASTDATA_jsc to determine license path. The local prefix is to appease the checker
-import os as local_os
-
-name = 'FreeSurfer'
-version = '7.1.1'
-
-homepage = 'http://surfer.nmr.mgh.harvard.edu/fswiki/FreeSurferWiki'
-description = """
-FreeSurfer is a set of tools for analysis and visualization of structural and functional brain imaging data.
-FreeSurfer contains a fully automatic structural imaging stream for processing cross sectional and longitudinal data.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [
-    'https://surfer.nmr.mgh.harvard.edu/pub/dist/freesurfer/%(version)s/'
-]
-sources = ['%(namelower)s-linux-centos8_x86_64-%(version)s.tar.gz']
-patches = ['freesurfer711-tcsh.patch']
-checksums = [
-    '6098b166fee8644f44f9ec88f3ffe88d05f2bc033cca60443e99e3e56f2e166b',  # freesurfer-linux-centos8_x86_64-7.1.1.tar.gz
-    '92f8b80daaa7a06884d892f3abf5b026cec1387943ff928865b042513c58609a',  # freesurfer711-tcsh.patch
-]
-
-dependencies = [
-    ('X11', '20210802'),
-    ('nvidia-driver', 'default', '', SYSTEM),
-    ('VirtualGL', '2.6.5'),
-    ('protobuf', '3.17.3'),
-    ('tcsh', '6.22.04')
-]
-
-# If FASTDATA_jsc is not defined then assume we are on CI and hence the path is relative to the repo
-local_licdir = local_os.environ.get('FASTDATA_jsc')
-local_licdir = local_os.path.join(local_licdir, 'swmanage', 'EasyBuild', '2022') if local_licdir else '.'
-license_text = open(f'{local_licdir}/Golden_Repo/f/FreeSurfer/license_text.txt', 'r').read()
-
-moduleclass = 'bio'
diff --git a/Golden_Repo/f/FreeSurfer/freesurfer711-tcsh.patch b/Golden_Repo/f/FreeSurfer/freesurfer711-tcsh.patch
deleted file mode 100644
index 5e056c35c..000000000
--- a/Golden_Repo/f/FreeSurfer/freesurfer711-tcsh.patch
+++ /dev/null
@@ -1,2070 +0,0 @@
-diff -rupN freesurfer_orig/bin/IsLTA freesurfer/bin/IsLTA
---- freesurfer_orig/bin/IsLTA	2021-07-19 16:15:27.176318000 +0200
-+++ freesurfer/bin/IsLTA	2021-07-23 14:50:56.924476565 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # IsLTA
- 
- set VERSION = 'IsLTA 7.1.1';
-diff -rupN freesurfer_orig/bin/annot2std freesurfer/bin/annot2std
---- freesurfer_orig/bin/annot2std	2021-07-19 16:15:27.401727000 +0200
-+++ freesurfer/bin/annot2std	2021-07-23 14:50:45.819517410 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- # annot2std
- #
-diff -rupN freesurfer_orig/bin/aparc2feat freesurfer/bin/aparc2feat
---- freesurfer_orig/bin/aparc2feat	2021-07-19 16:15:26.623610000 +0200
-+++ freesurfer/bin/aparc2feat	2021-07-23 14:50:46.219721597 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # aparc2feat
-diff -rupN freesurfer_orig/bin/aparc_stats_aseg freesurfer/bin/aparc_stats_aseg
---- freesurfer_orig/bin/aparc_stats_aseg	2021-07-19 16:15:27.664769000 +0200
-+++ freesurfer/bin/aparc_stats_aseg	2021-07-23 14:50:46.302508129 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- # This script runs Cortical Parcellation, Surface Anatomical Stats and Aparc2aseg using a given .gcs file.
- set RunIt = 1
- set ProgName = `basename $0`;
-diff -rupN freesurfer_orig/bin/aparcstatsdiff freesurfer/bin/aparcstatsdiff
---- freesurfer_orig/bin/aparcstatsdiff	2021-07-19 16:15:27.764540000 +0200
-+++ freesurfer/bin/aparcstatsdiff	2021-07-23 14:50:46.367796527 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- if ( "x$1" == "x" || \
-      "x$2" == "x" || \
-diff -rupN freesurfer_orig/bin/apas2aseg freesurfer/bin/apas2aseg
---- freesurfer_orig/bin/apas2aseg	2021-07-19 16:15:30.358143000 +0200
-+++ freesurfer/bin/apas2aseg	2021-07-23 14:50:46.463586676 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # apas2aseg
- 
- set VERSION = 'apas2aseg 7.1.1';
-diff -rupN freesurfer_orig/bin/aseg2feat freesurfer/bin/aseg2feat
---- freesurfer_orig/bin/aseg2feat	2021-07-19 16:15:36.201381000 +0200
-+++ freesurfer/bin/aseg2feat	2021-07-23 14:50:46.740520024 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # aseg2feat
-diff -rupN freesurfer_orig/bin/asegstatsdiff freesurfer/bin/asegstatsdiff
---- freesurfer_orig/bin/asegstatsdiff	2021-07-19 16:15:35.479244000 +0200
-+++ freesurfer/bin/asegstatsdiff	2021-07-23 14:50:46.795250044 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- set subject1=$1
- set subject2=$2
-diff -rupN freesurfer_orig/bin/bblabel freesurfer/bin/bblabel
---- freesurfer_orig/bin/bblabel	2021-07-19 16:15:28.457602000 +0200
-+++ freesurfer/bin/bblabel	2021-07-23 14:50:46.943673984 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # bblabel
-diff -rupN freesurfer_orig/bin/bbmask freesurfer/bin/bbmask
---- freesurfer_orig/bin/bbmask	2021-07-19 16:15:31.653820000 +0200
-+++ freesurfer/bin/bbmask	2021-07-23 14:50:46.987275953 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # bbmask
- 
- set VERSION = 'bbmask 7.1.1';
-diff -rupN freesurfer_orig/bin/bbregister freesurfer/bin/bbregister
---- freesurfer_orig/bin/bbregister	2021-07-19 16:15:28.618864000 +0200
-+++ freesurfer/bin/bbregister	2021-07-23 14:50:47.095692558 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # bbregister
-diff -rupN freesurfer_orig/bin/beta2sxa freesurfer/bin/beta2sxa
---- freesurfer_orig/bin/beta2sxa	2021-07-19 16:15:27.705715000 +0200
-+++ freesurfer/bin/beta2sxa	2021-07-23 14:50:47.175143757 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # thalseg
- 
- set VERSION = 'beta2sxa 7.1.1';
-diff -rupN freesurfer_orig/bin/biasfield freesurfer/bin/biasfield
---- freesurfer_orig/bin/biasfield	2021-07-19 16:15:26.121294000 +0200
-+++ freesurfer/bin/biasfield	2021-07-23 14:50:47.308101972 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # biasfield
-diff -rupN freesurfer_orig/bin/bmedits2surf freesurfer/bin/bmedits2surf
---- freesurfer_orig/bin/bmedits2surf	2021-07-19 16:15:26.020516000 +0200
-+++ freesurfer/bin/bmedits2surf	2021-07-23 14:50:47.355064523 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # bmedits2surf
- 
- set VERSION = 'bmedits2surf 7.1.1';
-diff -rupN freesurfer_orig/bin/bugr freesurfer/bin/bugr
---- freesurfer_orig/bin/bugr	2021-07-19 16:15:27.679933000 +0200
-+++ freesurfer/bin/bugr	2021-07-23 14:50:47.451209003 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # bugr
-diff -rupN freesurfer_orig/bin/build_desikan_killiany_gcs.csh freesurfer/bin/build_desikan_killiany_gcs.csh
---- freesurfer_orig/bin/build_desikan_killiany_gcs.csh	2021-07-19 16:15:27.610278000 +0200
-+++ freesurfer/bin/build_desikan_killiany_gcs.csh	2021-07-23 14:50:47.470307732 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- # For building a new morph-based cortical parcellation 
- # atlas for each hemisphere
-diff -rupN freesurfer_orig/bin/cblumwmgyri freesurfer/bin/cblumwmgyri
---- freesurfer_orig/bin/cblumwmgyri	2021-07-19 16:15:30.077810000 +0200
-+++ freesurfer/bin/cblumwmgyri	2021-07-23 14:50:47.585600562 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # cblumwmgyri
- 
- set VERSION = 'cblumwmgyri 7.1.1';
-diff -rupN freesurfer_orig/bin/checkMCR.sh freesurfer/bin/checkMCR.sh
---- freesurfer_orig/bin/checkMCR.sh	2021-07-19 16:15:33.107343000 +0200
-+++ freesurfer/bin/checkMCR.sh	2021-07-23 14:50:47.658979870 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- # Eugenio: note that when I used v80, I used to look for libdctprocess.so, 
- # but not I look for libmwlaunchermain.so instead (which is not present in v80)
-diff -rupN freesurfer_orig/bin/clear_fs_env.csh freesurfer/bin/clear_fs_env.csh
---- freesurfer_orig/bin/clear_fs_env.csh	2021-07-19 16:15:31.964443000 +0200
-+++ freesurfer/bin/clear_fs_env.csh	2021-07-23 14:50:47.747409632 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- #
- # clear_fs_env.csh
-diff -rupN freesurfer_orig/bin/compute_interrater_variability.csh freesurfer/bin/compute_interrater_variability.csh
---- freesurfer_orig/bin/compute_interrater_variability.csh	2021-07-19 16:15:27.589771000 +0200
-+++ freesurfer/bin/compute_interrater_variability.csh	2021-07-23 14:50:47.782594580 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- # compute_interrater_variability
- #
-diff -rupN freesurfer_orig/bin/compute_label_vals.csh freesurfer/bin/compute_label_vals.csh
---- freesurfer_orig/bin/compute_label_vals.csh	2021-07-19 16:15:27.286264000 +0200
-+++ freesurfer/bin/compute_label_vals.csh	2021-07-23 14:50:47.820909109 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- if (! $?base) then
-   echo must set base to point to $SUBJECTS_DIR/$subject
-diff -rupN freesurfer_orig/bin/compute_label_volumes.csh freesurfer/bin/compute_label_volumes.csh
---- freesurfer_orig/bin/compute_label_volumes.csh	2021-07-19 16:15:29.981511000 +0200
-+++ freesurfer/bin/compute_label_volumes.csh	2021-07-23 14:50:47.882493164 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- # compute_all_label_volumes
- #
-diff -rupN freesurfer_orig/bin/conf2hires freesurfer/bin/conf2hires
---- freesurfer_orig/bin/conf2hires	2021-07-19 16:15:27.976113000 +0200
-+++ freesurfer/bin/conf2hires	2021-07-23 14:50:48.057220000 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # conf2hires - sources
- if(-e $FREESURFER_HOME/sources.csh) then
-   source $FREESURFER_HOME/sources.csh
-diff -rupN freesurfer_orig/bin/cp-dicom freesurfer/bin/cp-dicom
---- freesurfer_orig/bin/cp-dicom	2021-07-19 16:15:29.617719000 +0200
-+++ freesurfer/bin/cp-dicom	2021-07-23 14:50:48.240344117 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # cp-dicom
-diff -rupN freesurfer_orig/bin/dcmdir-info-mgh freesurfer/bin/dcmdir-info-mgh
---- freesurfer_orig/bin/dcmdir-info-mgh	2021-07-19 16:15:27.495402000 +0200
-+++ freesurfer/bin/dcmdir-info-mgh	2021-07-23 14:50:48.461284892 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # dcmdir-info-mgh
-diff -rupN freesurfer_orig/bin/dcmsplit freesurfer/bin/dcmsplit
---- freesurfer_orig/bin/dcmsplit	2021-07-19 16:15:34.093464000 +0200
-+++ freesurfer/bin/dcmsplit	2021-07-23 14:50:48.689023441 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # dcmsplit
- 
- if(-e $FREESURFER_HOME/sources.csh) then
-diff -rupN freesurfer_orig/bin/dcmunpack freesurfer/bin/dcmunpack
---- freesurfer_orig/bin/dcmunpack	2021-07-19 16:15:29.814252000 +0200
-+++ freesurfer/bin/dcmunpack	2021-07-23 14:50:48.807431402 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # dcmunpack
- # 
- 
-diff -rupN freesurfer_orig/bin/deface_subject freesurfer/bin/deface_subject
---- freesurfer_orig/bin/deface_subject	2021-07-19 16:15:27.780270000 +0200
-+++ freesurfer/bin/deface_subject	2021-07-23 14:50:48.885605717 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- #
- # deface_subject
-diff -rupN freesurfer_orig/bin/defect2seg freesurfer/bin/defect2seg
---- freesurfer_orig/bin/defect2seg	2021-07-19 16:15:34.253547000 +0200
-+++ freesurfer/bin/defect2seg	2021-07-23 14:50:48.911318371 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # defect2seg - sources
- if(-e $FREESURFER_HOME/sources.csh) then
-   source $FREESURFER_HOME/sources.csh
-diff -rupN freesurfer_orig/bin/dt_recon freesurfer/bin/dt_recon
---- freesurfer_orig/bin/dt_recon	2021-07-19 16:15:29.979021000 +0200
-+++ freesurfer/bin/dt_recon	2021-07-23 14:50:51.547412692 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- #
- umask 002;
- 
-diff -rupN freesurfer_orig/bin/epidewarp.fsl freesurfer/bin/epidewarp.fsl
---- freesurfer_orig/bin/epidewarp.fsl	2021-07-19 16:15:35.256304000 +0200
-+++ freesurfer/bin/epidewarp.fsl	2021-07-23 14:50:51.598635768 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # epidewarp.fsl
-diff -rupN freesurfer_orig/bin/feat2segstats freesurfer/bin/feat2segstats
---- freesurfer_orig/bin/feat2segstats	2021-07-19 16:15:33.520695000 +0200
-+++ freesurfer/bin/feat2segstats	2021-07-23 14:50:51.916349456 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # feat2segstats
-diff -rupN freesurfer_orig/bin/feat2surf freesurfer/bin/feat2surf
---- freesurfer_orig/bin/feat2surf	2021-07-19 16:15:28.367723000 +0200
-+++ freesurfer/bin/feat2surf	2021-07-23 14:50:51.959964274 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # reg-feat2anat
-diff -rupN freesurfer_orig/bin/fix_subject freesurfer/bin/fix_subject
---- freesurfer_orig/bin/fix_subject	2021-07-19 16:15:28.354162000 +0200
-+++ freesurfer/bin/fix_subject	2021-07-23 14:50:52.078305105 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- #
- # fix_subject
-diff -rupN freesurfer_orig/bin/fix_subject-lh freesurfer/bin/fix_subject-lh
---- freesurfer_orig/bin/fix_subject-lh	2021-07-19 16:15:31.390420000 +0200
-+++ freesurfer/bin/fix_subject-lh	2021-07-23 14:50:52.252285999 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- #
- # fix_subject-lh
-diff -rupN freesurfer_orig/bin/fix_subject-rh freesurfer/bin/fix_subject-rh
---- freesurfer_orig/bin/fix_subject-rh	2021-07-19 16:15:28.368744000 +0200
-+++ freesurfer/bin/fix_subject-rh	2021-07-23 14:50:52.344126103 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- #
- # fix_subject-rh
-diff -rupN freesurfer_orig/bin/fix_subject_corrected freesurfer/bin/fix_subject_corrected
---- freesurfer_orig/bin/fix_subject_corrected	2021-07-19 16:15:28.848044000 +0200
-+++ freesurfer/bin/fix_subject_corrected	2021-07-23 14:50:52.112804231 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # fix_subject_corrected
-diff -rupN freesurfer_orig/bin/fix_subject_corrected-lh freesurfer/bin/fix_subject_corrected-lh
---- freesurfer_orig/bin/fix_subject_corrected-lh	2021-07-19 16:15:28.684875000 +0200
-+++ freesurfer/bin/fix_subject_corrected-lh	2021-07-23 14:50:52.137486431 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # fix_subject_corrected-lh
-diff -rupN freesurfer_orig/bin/fix_subject_corrected-rh freesurfer/bin/fix_subject_corrected-rh
---- freesurfer_orig/bin/fix_subject_corrected-rh	2021-07-19 16:15:26.971475000 +0200
-+++ freesurfer/bin/fix_subject_corrected-rh	2021-07-23 14:50:52.176553563 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # fix_subject_corrected-rh
-diff -rupN freesurfer_orig/bin/fix_subject_on_seychelles freesurfer/bin/fix_subject_on_seychelles
---- freesurfer_orig/bin/fix_subject_on_seychelles	2021-07-19 16:15:33.781877000 +0200
-+++ freesurfer/bin/fix_subject_on_seychelles	2021-07-23 14:50:52.299766162 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # fix_subject_on_seychelles
-diff -rupN freesurfer_orig/bin/fixup_mni_paths freesurfer/bin/fixup_mni_paths
---- freesurfer_orig/bin/fixup_mni_paths	2021-07-19 16:15:35.257744000 +0200
-+++ freesurfer/bin/fixup_mni_paths	2021-07-23 14:50:52.384079059 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh
-+#!/usr/bin/env/tcsh
- 
- # fixup_mni_paths
- #
-diff -rupN freesurfer_orig/bin/fs_time freesurfer/bin/fs_time
---- freesurfer_orig/bin/fs_time	2021-07-19 16:15:30.090598000 +0200
-+++ freesurfer/bin/fs_time	2021-07-23 14:50:54.570450912 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # fs_time
- 
- # Check whether FS_TIME_ALLOW exists, if not assume it is ok
-diff -rupN freesurfer_orig/bin/fscalc freesurfer/bin/fscalc
---- freesurfer_orig/bin/fscalc	2021-07-19 16:15:28.875617000 +0200
-+++ freesurfer/bin/fscalc	2021-07-23 14:50:52.872411067 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # fscalc
- 
- set VERSION = 'fscalc 7.1.1';
-diff -rupN freesurfer_orig/bin/fscalc.fsl freesurfer/bin/fscalc.fsl
---- freesurfer_orig/bin/fscalc.fsl	2021-07-19 16:15:30.549368000 +0200
-+++ freesurfer/bin/fscalc.fsl	2021-07-23 14:50:52.923206083 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- #
- # This is a utility that extends fslmaths so that an format that can
- # be read/written by freesurfer can be used. It operates in the same
-diff -rupN freesurfer_orig/bin/fsdcmdecompress freesurfer/bin/fsdcmdecompress
---- freesurfer_orig/bin/fsdcmdecompress	2021-07-19 16:15:28.334386000 +0200
-+++ freesurfer/bin/fsdcmdecompress	2021-07-23 14:50:52.952701050 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # fsdcmdecompress - sources
- if(-e $FREESURFER_HOME/sources.csh) then
-   source $FREESURFER_HOME/sources.csh
-diff -rupN freesurfer_orig/bin/fsfirst.fsl freesurfer/bin/fsfirst.fsl
---- freesurfer_orig/bin/fsfirst.fsl	2021-07-19 16:15:25.745863000 +0200
-+++ freesurfer/bin/fsfirst.fsl	2021-07-23 14:50:53.053145016 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # fsfirst.fsl
- 
- if(-e $FREESURFER_HOME/sources.csh) then
-diff -rupN freesurfer_orig/bin/fsl_rigid_register freesurfer/bin/fsl_rigid_register
---- freesurfer_orig/bin/fsl_rigid_register	2021-07-19 16:15:32.098858000 +0200
-+++ freesurfer/bin/fsl_rigid_register	2021-07-23 14:50:53.650866663 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # fsl_rigid_register
-diff -rupN freesurfer_orig/bin/fslregister freesurfer/bin/fslregister
---- freesurfer_orig/bin/fslregister	2021-07-19 16:15:30.757795000 +0200
-+++ freesurfer/bin/fslregister	2021-07-23 14:50:53.601680203 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # fslregister
-diff -rupN freesurfer_orig/bin/fsr-checkxopts freesurfer/bin/fsr-checkxopts
---- freesurfer_orig/bin/fsr-checkxopts	2021-07-19 16:15:34.474820000 +0200
-+++ freesurfer/bin/fsr-checkxopts	2021-07-23 14:50:53.939906286 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # fsr-checkxopts
-diff -rupN freesurfer_orig/bin/fsr-coreg freesurfer/bin/fsr-coreg
---- freesurfer_orig/bin/fsr-coreg	2021-07-19 16:15:29.733098000 +0200
-+++ freesurfer/bin/fsr-coreg	2021-07-23 14:50:54.069050346 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # fsr-coreg 
- 
- #  In theory, it would be better to resample all modes into an
-diff -rupN freesurfer_orig/bin/fsr-getxopts freesurfer/bin/fsr-getxopts
---- freesurfer_orig/bin/fsr-getxopts	2021-07-19 16:15:34.327402000 +0200
-+++ freesurfer/bin/fsr-getxopts	2021-07-23 14:50:54.124321037 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # fsr-getxopts
-diff -rupN freesurfer_orig/bin/fsr-import freesurfer/bin/fsr-import
---- freesurfer_orig/bin/fsr-import	2021-07-19 16:15:29.837494000 +0200
-+++ freesurfer/bin/fsr-import	2021-07-23 14:50:54.215418759 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # fsr-import
- 
- if(-e $FREESURFER_HOME/sources.csh) then
-diff -rupN freesurfer_orig/bin/fvcompare freesurfer/bin/fvcompare
---- freesurfer_orig/bin/fvcompare	2021-07-19 16:15:28.820973000 +0200
-+++ freesurfer/bin/fvcompare	2021-07-23 14:50:54.730760526 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # fvcompare
- 
- set VERSION = 'fvcompare 7.1.1';
-diff -rupN freesurfer_orig/bin/gca-apply freesurfer/bin/gca-apply
---- freesurfer_orig/bin/gca-apply	2021-07-19 16:15:33.825117000 +0200
-+++ freesurfer/bin/gca-apply	2021-07-23 14:50:54.846865779 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # gca-apply
- 
- set VERSION = 'gca-apply 7.1.1';
-diff -rupN freesurfer_orig/bin/gcainit freesurfer/bin/gcainit
---- freesurfer_orig/bin/gcainit	2021-07-19 16:15:27.360665000 +0200
-+++ freesurfer/bin/gcainit	2021-07-23 14:50:54.876976738 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # gcainit
- 
- set VERSION = 'gcainit 7.1.1';
-diff -rupN freesurfer_orig/bin/gcaprepone freesurfer/bin/gcaprepone
---- freesurfer_orig/bin/gcaprepone	2021-07-19 16:15:25.321792000 +0200
-+++ freesurfer/bin/gcaprepone	2021-07-23 14:50:54.958160704 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # gcaprepone
- 
- set VERSION = 'gcaprepone 7.1.1';
-diff -rupN freesurfer_orig/bin/gcatrain freesurfer/bin/gcatrain
---- freesurfer_orig/bin/gcatrain	2021-07-19 16:15:26.003679000 +0200
-+++ freesurfer/bin/gcatrain	2021-07-23 14:50:55.027433286 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # gcatrain
- 
- set VERSION = 'gcatrain 7.1.1';
-diff -rupN freesurfer_orig/bin/gcatrainskull freesurfer/bin/gcatrainskull
---- freesurfer_orig/bin/gcatrainskull	2021-07-19 16:15:25.858987000 +0200
-+++ freesurfer/bin/gcatrainskull	2021-07-23 14:50:55.182043319 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # gcatrainskull
- if(-e $FREESURFER_HOME/sources.csh) then
-   source $FREESURFER_HOME/sources.csh
-diff -rupN freesurfer_orig/bin/get_label_thickness freesurfer/bin/get_label_thickness
---- freesurfer_orig/bin/get_label_thickness	2021-07-19 16:15:31.211503000 +0200
-+++ freesurfer/bin/get_label_thickness	2021-07-23 14:50:55.326332405 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- # script to get the thickness values for the vertices found in a label file.
- # inputs:  label file and ascii thickness file
-diff -rupN freesurfer_orig/bin/getfullpath freesurfer/bin/getfullpath
---- freesurfer_orig/bin/getfullpath	2021-07-19 16:15:35.712927000 +0200
-+++ freesurfer/bin/getfullpath	2021-07-23 14:50:55.314506362 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # getfullpath
-diff -rupN freesurfer_orig/bin/grad_unwarp freesurfer/bin/grad_unwarp
---- freesurfer_orig/bin/grad_unwarp	2021-07-19 16:15:34.546213000 +0200
-+++ freesurfer/bin/grad_unwarp	2021-07-23 14:50:55.411958697 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # grad_unwarp - convert, unwarp, and resample dicom files
-diff -rupN freesurfer_orig/bin/groupstats freesurfer/bin/groupstats
---- freesurfer_orig/bin/groupstats	2021-07-19 16:15:30.702697000 +0200
-+++ freesurfer/bin/groupstats	2021-07-23 14:50:55.449923605 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # groupstats
- 
- set VERSION = 'groupstats 7.1.1';
-diff -rupN freesurfer_orig/bin/groupstatsdiff freesurfer/bin/groupstatsdiff
---- freesurfer_orig/bin/groupstatsdiff	2021-07-19 16:15:28.262329000 +0200
-+++ freesurfer/bin/groupstatsdiff	2021-07-23 14:50:55.514476310 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # groupstatsdiff
- 
- set VERSION = 'groupstatsdiff 7.1.1';
-diff -rupN freesurfer_orig/bin/gtmseg freesurfer/bin/gtmseg
---- freesurfer_orig/bin/gtmseg	2021-07-19 16:15:33.513788000 +0200
-+++ freesurfer/bin/gtmseg	2021-07-23 14:50:55.577776961 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # gtmseg
- 
- set VERSION = 'gtmseg 7.1.1';
-diff -rupN freesurfer_orig/bin/help_xml_validate freesurfer/bin/help_xml_validate
---- freesurfer_orig/bin/help_xml_validate	2021-07-19 16:15:26.567279000 +0200
-+++ freesurfer/bin/help_xml_validate	2021-07-23 14:50:55.631046255 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- # $srcdir is defined in make check runtime environment
- set SRCDIR=$PWD
-diff -rupN freesurfer_orig/bin/inflate_subject freesurfer/bin/inflate_subject
---- freesurfer_orig/bin/inflate_subject	2021-07-19 16:15:33.629827000 +0200
-+++ freesurfer/bin/inflate_subject	2021-07-23 14:50:56.509731355 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- #
- # inflate_subject
-diff -rupN freesurfer_orig/bin/inflate_subject-lh freesurfer/bin/inflate_subject-lh
---- freesurfer_orig/bin/inflate_subject-lh	2021-07-19 16:15:34.087333000 +0200
-+++ freesurfer/bin/inflate_subject-lh	2021-07-23 14:50:56.623485959 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- #
- # inflate_subject-lh
-diff -rupN freesurfer_orig/bin/inflate_subject-rh freesurfer/bin/inflate_subject-rh
---- freesurfer_orig/bin/inflate_subject-rh	2021-07-19 16:15:33.943148000 +0200
-+++ freesurfer/bin/inflate_subject-rh	2021-07-23 14:50:56.749722709 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- #
- # inflate_subject-rh
-diff -rupN freesurfer_orig/bin/inflate_subject3 freesurfer/bin/inflate_subject3
---- freesurfer_orig/bin/inflate_subject3	2021-07-19 16:15:28.332383000 +0200
-+++ freesurfer/bin/inflate_subject3	2021-07-23 14:50:56.548158595 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # inflate_subject3
-diff -rupN freesurfer_orig/bin/inflate_subject_new freesurfer/bin/inflate_subject_new
---- freesurfer_orig/bin/inflate_subject_new	2021-07-19 16:15:31.809629000 +0200
-+++ freesurfer/bin/inflate_subject_new	2021-07-23 14:50:56.645331559 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh
-+#!/usr/bin/env/tcsh
- 
- #
- # inflate_subject_new
-diff -rupN freesurfer_orig/bin/inflate_subject_new-lh freesurfer/bin/inflate_subject_new-lh
---- freesurfer_orig/bin/inflate_subject_new-lh	2021-07-19 16:15:35.108256000 +0200
-+++ freesurfer/bin/inflate_subject_new-lh	2021-07-23 14:50:56.656695360 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh
-+#!/usr/bin/env/tcsh
- 
- #
- # inflate_subject_new-lh
-diff -rupN freesurfer_orig/bin/inflate_subject_new-rh freesurfer/bin/inflate_subject_new-rh
---- freesurfer_orig/bin/inflate_subject_new-rh	2021-07-19 16:15:28.085971000 +0200
-+++ freesurfer/bin/inflate_subject_new-rh	2021-07-23 14:50:56.684402991 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # inflate_subject_new-rh
-diff -rupN freesurfer_orig/bin/inflate_subject_sc freesurfer/bin/inflate_subject_sc
---- freesurfer_orig/bin/inflate_subject_sc	2021-07-19 16:15:25.323969000 +0200
-+++ freesurfer/bin/inflate_subject_sc	2021-07-23 14:50:56.773650206 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- #
- # inflate_subject_sc
-diff -rupN freesurfer_orig/bin/isanalyze freesurfer/bin/isanalyze
---- freesurfer_orig/bin/isanalyze	2021-07-19 16:15:30.894352000 +0200
-+++ freesurfer/bin/isanalyze	2021-07-23 14:50:56.911543529 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # isanalyze - checks whether the passed file is an analyze file
-diff -rupN freesurfer_orig/bin/isnifti freesurfer/bin/isnifti
---- freesurfer_orig/bin/isnifti	2021-07-19 16:15:28.315723000 +0200
-+++ freesurfer/bin/isnifti	2021-07-23 14:50:56.935006434 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # isnifti - checks whether the passed file is a nifti file
-diff -rupN freesurfer_orig/bin/isolate_labels.csh freesurfer/bin/isolate_labels.csh
---- freesurfer_orig/bin/isolate_labels.csh	2021-07-19 16:15:26.911908000 +0200
-+++ freesurfer/bin/isolate_labels.csh	2021-07-23 14:50:56.965275264 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- # isolate_labels
- #
-diff -rupN freesurfer_orig/bin/isolate_labels_keeporigval.csh freesurfer/bin/isolate_labels_keeporigval.csh
---- freesurfer_orig/bin/isolate_labels_keeporigval.csh	2021-07-19 16:15:34.276615000 +0200
-+++ freesurfer/bin/isolate_labels_keeporigval.csh	2021-07-23 14:50:56.986146210 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- # isolate_labels
- #
-diff -rupN freesurfer_orig/bin/jkgcatrain freesurfer/bin/jkgcatrain
---- freesurfer_orig/bin/jkgcatrain	2021-07-19 16:15:26.683257000 +0200
-+++ freesurfer/bin/jkgcatrain	2021-07-23 14:50:57.051301038 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # jkgcatrain
- 
- set VERSION = 'jkgcatrain 7.1.1';
-diff -rupN freesurfer_orig/bin/label_child freesurfer/bin/label_child
---- freesurfer_orig/bin/label_child	2021-07-19 16:15:31.443192000 +0200
-+++ freesurfer/bin/label_child	2021-07-23 14:50:57.297633555 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- #
- # label_child
-diff -rupN freesurfer_orig/bin/label_elderly_subject freesurfer/bin/label_elderly_subject
---- freesurfer_orig/bin/label_elderly_subject	2021-07-19 16:15:27.186840000 +0200
-+++ freesurfer/bin/label_elderly_subject	2021-07-23 14:50:57.326928461 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- #
- # label_elderly_subject
-diff -rupN freesurfer_orig/bin/label_subject freesurfer/bin/label_subject
---- freesurfer_orig/bin/label_subject	2021-07-19 16:15:27.561797000 +0200
-+++ freesurfer/bin/label_subject	2021-07-23 14:50:57.398373271 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- #
- # label_subject
-diff -rupN freesurfer_orig/bin/label_subject_flash freesurfer/bin/label_subject_flash
---- freesurfer_orig/bin/label_subject_flash	2021-07-19 16:15:31.210280000 +0200
-+++ freesurfer/bin/label_subject_flash	2021-07-23 14:50:57.409536822 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- #
- # label_subject_flash
-diff -rupN freesurfer_orig/bin/label_subject_mixed freesurfer/bin/label_subject_mixed
---- freesurfer_orig/bin/label_subject_mixed	2021-07-19 16:15:27.124724000 +0200
-+++ freesurfer/bin/label_subject_mixed	2021-07-23 14:50:57.421549076 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- #
- # label_subject_mixed
-diff -rupN freesurfer_orig/bin/labels_disjoint freesurfer/bin/labels_disjoint
---- freesurfer_orig/bin/labels_disjoint	2021-07-19 16:15:28.264200000 +0200
-+++ freesurfer/bin/labels_disjoint	2021-07-23 14:50:57.356059827 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- # set echo=1
- 
-diff -rupN freesurfer_orig/bin/labels_intersect freesurfer/bin/labels_intersect
---- freesurfer_orig/bin/labels_intersect	2021-07-19 16:15:35.152425000 +0200
-+++ freesurfer/bin/labels_intersect	2021-07-23 14:50:57.385996197 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- # set echo=1
- 
-diff -rupN freesurfer_orig/bin/labels_union freesurfer/bin/labels_union
---- freesurfer_orig/bin/labels_union	2021-07-19 16:15:33.766705000 +0200
-+++ freesurfer/bin/labels_union	2021-07-23 14:50:57.449780079 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- # set echo=1
- 
-diff -rupN freesurfer_orig/bin/long_create_base_sigma freesurfer/bin/long_create_base_sigma
---- freesurfer_orig/bin/long_create_base_sigma	2021-07-19 16:15:28.720270000 +0200
-+++ freesurfer/bin/long_create_base_sigma	2021-07-23 14:50:57.530196931 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- #
- # long_create_base_sigma
- #
-diff -rupN freesurfer_orig/bin/long_create_orig freesurfer/bin/long_create_orig
---- freesurfer_orig/bin/long_create_orig	2021-07-19 16:15:30.146821000 +0200
-+++ freesurfer/bin/long_create_orig	2021-07-23 14:50:57.569077963 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- #
- # long_create_orig
- #
-diff -rupN freesurfer_orig/bin/longmc freesurfer/bin/longmc
---- freesurfer_orig/bin/longmc	2021-07-19 16:15:33.316562000 +0200
-+++ freesurfer/bin/longmc	2021-07-23 14:50:57.611237297 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # longmc - sources
- if(-e $FREESURFER_HOME/sources.csh) then
-   source $FREESURFER_HOME/sources.csh
-diff -rupN freesurfer_orig/bin/lpcregister freesurfer/bin/lpcregister
---- freesurfer_orig/bin/lpcregister	2021-07-19 16:15:34.755805000 +0200
-+++ freesurfer/bin/lpcregister	2021-07-23 14:50:57.773420988 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # lpcregister
-diff -rupN freesurfer_orig/bin/make-segvol-table freesurfer/bin/make-segvol-table
---- freesurfer_orig/bin/make-segvol-table	2021-07-19 16:15:31.870922000 +0200
-+++ freesurfer/bin/make-segvol-table	2021-07-23 14:50:58.504661921 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # make-segvol-table - creates a table of volumes of subcortical
-diff -rupN freesurfer_orig/bin/make_average_subcort freesurfer/bin/make_average_subcort
---- freesurfer_orig/bin/make_average_subcort	2021-07-19 16:15:29.177411000 +0200
-+++ freesurfer/bin/make_average_subcort	2021-07-23 14:50:57.997996795 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # thalseg
- 
- set VERSION = 'make_average_subcort 7.1.1';
-diff -rupN freesurfer_orig/bin/make_average_subject freesurfer/bin/make_average_subject
---- freesurfer_orig/bin/make_average_subject	2021-07-19 16:15:27.472411000 +0200
-+++ freesurfer/bin/make_average_subject	2021-07-23 14:50:58.046744743 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # make_average_subject
-diff -rupN freesurfer_orig/bin/make_average_surface freesurfer/bin/make_average_surface
---- freesurfer_orig/bin/make_average_surface	2021-07-19 16:15:26.037036000 +0200
-+++ freesurfer/bin/make_average_surface	2021-07-23 14:50:58.192458404 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # make_average_surface
-diff -rupN freesurfer_orig/bin/make_average_volume freesurfer/bin/make_average_volume
---- freesurfer_orig/bin/make_average_volume	2021-07-19 16:15:29.566939000 +0200
-+++ freesurfer/bin/make_average_volume	2021-07-23 14:50:58.312748792 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # make_average_volume
-diff -rupN freesurfer_orig/bin/make_cortex_label freesurfer/bin/make_cortex_label
---- freesurfer_orig/bin/make_cortex_label	2021-07-19 16:15:34.328543000 +0200
-+++ freesurfer/bin/make_cortex_label	2021-07-23 14:50:58.393793907 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # make_cortex_label
-diff -rupN freesurfer_orig/bin/make_exvivo_filled freesurfer/bin/make_exvivo_filled
---- freesurfer_orig/bin/make_exvivo_filled	2021-07-19 16:15:35.553332000 +0200
-+++ freesurfer/bin/make_exvivo_filled	2021-07-23 14:50:58.414364212 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- # usage: make_exvivo_filled <subject name> <input samseg> <input intensity vol>
- 
- set echo=1
-diff -rupN freesurfer_orig/bin/make_folding_atlas freesurfer/bin/make_folding_atlas
---- freesurfer_orig/bin/make_folding_atlas	2021-07-19 16:15:32.839573000 +0200
-+++ freesurfer/bin/make_folding_atlas	2021-07-23 14:50:58.450395163 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # make_folding_atlas
- 
- set VERSION = 'make_folding_atlas 7.1.1';
-diff -rupN freesurfer_orig/bin/map_all_labels freesurfer/bin/map_all_labels
---- freesurfer_orig/bin/map_all_labels	2021-07-19 16:15:35.934960000 +0200
-+++ freesurfer/bin/map_all_labels	2021-07-23 14:50:58.664778284 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- #
- # map_all_labels
-diff -rupN freesurfer_orig/bin/map_all_labels-lh freesurfer/bin/map_all_labels-lh
---- freesurfer_orig/bin/map_all_labels-lh	2021-07-19 16:15:30.148733000 +0200
-+++ freesurfer/bin/map_all_labels-lh	2021-07-23 14:50:58.675135141 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- #
- # map_all_labels-lh
-diff -rupN freesurfer_orig/bin/map_central_sulcus freesurfer/bin/map_central_sulcus
---- freesurfer_orig/bin/map_central_sulcus	2021-07-19 16:15:28.236692000 +0200
-+++ freesurfer/bin/map_central_sulcus	2021-07-23 14:50:58.691161530 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- #
- # map_central_sulcus
-diff -rupN freesurfer_orig/bin/meanval freesurfer/bin/meanval
---- freesurfer_orig/bin/meanval	2021-07-19 16:15:36.135593000 +0200
-+++ freesurfer/bin/meanval	2021-07-23 14:50:58.993518261 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # meanval
- 
- set VERSION = 'meanval 7.1.1';
-diff -rupN freesurfer_orig/bin/mergeseg freesurfer/bin/mergeseg
---- freesurfer_orig/bin/mergeseg	2021-07-19 16:15:29.413569000 +0200
-+++ freesurfer/bin/mergeseg	2021-07-23 14:50:59.005974017 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # mergeseg
- 
- set VERSION = 'mergeseg 7.1.1';
-diff -rupN freesurfer_orig/bin/minc2seqinfo freesurfer/bin/minc2seqinfo
---- freesurfer_orig/bin/minc2seqinfo	2021-07-19 16:15:26.332096000 +0200
-+++ freesurfer/bin/minc2seqinfo	2021-07-23 14:50:59.045002429 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- #
- # Name: minc2seqinfo
- #
-diff -rupN freesurfer_orig/bin/mkheadsurf freesurfer/bin/mkheadsurf
---- freesurfer_orig/bin/mkheadsurf	2021-07-19 16:15:30.194202000 +0200
-+++ freesurfer/bin/mkheadsurf	2021-07-23 14:50:59.128999225 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # mkheadsurf
-diff -rupN freesurfer_orig/bin/mksubjdirs freesurfer/bin/mksubjdirs
---- freesurfer_orig/bin/mksubjdirs	2021-07-19 16:15:32.960168000 +0200
-+++ freesurfer/bin/mksubjdirs	2021-07-23 14:50:59.173948388 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # mksubjdirs
-diff -rupN freesurfer_orig/bin/mni152reg freesurfer/bin/mni152reg
---- freesurfer_orig/bin/mni152reg	2021-07-19 16:15:33.426323000 +0200
-+++ freesurfer/bin/mni152reg	2021-07-23 14:50:59.325669011 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # mni152reg
- 
- set VERSION = 'mni152reg 7.1.1';
-diff -rupN freesurfer_orig/bin/morph_only_subject freesurfer/bin/morph_only_subject
---- freesurfer_orig/bin/morph_only_subject	2021-07-19 16:15:35.943532000 +0200
-+++ freesurfer/bin/morph_only_subject	2021-07-23 14:50:59.353593943 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # morph_only_subject
-diff -rupN freesurfer_orig/bin/morph_only_subject-lh freesurfer/bin/morph_only_subject-lh
---- freesurfer_orig/bin/morph_only_subject-lh	2021-07-19 16:15:27.434827000 +0200
-+++ freesurfer/bin/morph_only_subject-lh	2021-07-23 14:50:59.370482704 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # morph_only_subject-lh
-diff -rupN freesurfer_orig/bin/morph_only_subject-rh freesurfer/bin/morph_only_subject-rh
---- freesurfer_orig/bin/morph_only_subject-rh	2021-07-19 16:15:27.612297000 +0200
-+++ freesurfer/bin/morph_only_subject-rh	2021-07-23 14:50:59.382776929 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # morph_only_subject-rh
-diff -rupN freesurfer_orig/bin/morph_rgb-lh freesurfer/bin/morph_rgb-lh
---- freesurfer_orig/bin/morph_rgb-lh	2021-07-19 16:15:33.629014000 +0200
-+++ freesurfer/bin/morph_rgb-lh	2021-07-23 14:50:59.393844149 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # morph_rgb-lh
-diff -rupN freesurfer_orig/bin/morph_rgb-rh freesurfer/bin/morph_rgb-rh
---- freesurfer_orig/bin/morph_rgb-rh	2021-07-19 16:15:34.839761000 +0200
-+++ freesurfer/bin/morph_rgb-rh	2021-07-23 14:50:59.429670640 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # morph_rgb-rh
-diff -rupN freesurfer_orig/bin/morph_subject freesurfer/bin/morph_subject
---- freesurfer_orig/bin/morph_subject	2021-07-19 16:15:26.424545000 +0200
-+++ freesurfer/bin/morph_subject	2021-07-23 14:50:59.439771486 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- #
- # morph_subject
-diff -rupN freesurfer_orig/bin/morph_subject-lh freesurfer/bin/morph_subject-lh
---- freesurfer_orig/bin/morph_subject-lh	2021-07-19 16:15:28.780176000 +0200
-+++ freesurfer/bin/morph_subject-lh	2021-07-23 14:50:59.459022527 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- #
- # morph_subject-lh
-diff -rupN freesurfer_orig/bin/morph_subject-rh freesurfer/bin/morph_subject-rh
---- freesurfer_orig/bin/morph_subject-rh	2021-07-19 16:15:27.496693000 +0200
-+++ freesurfer/bin/morph_subject-rh	2021-07-23 14:50:59.486277266 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- #
- # morph_subject-rh
-diff -rupN freesurfer_orig/bin/morph_subject_on_seychelles freesurfer/bin/morph_subject_on_seychelles
---- freesurfer_orig/bin/morph_subject_on_seychelles	2021-07-19 16:15:36.136283000 +0200
-+++ freesurfer/bin/morph_subject_on_seychelles	2021-07-23 14:50:59.469465945 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # morph_subject_on_seychelles
-diff -rupN freesurfer_orig/bin/morph_tables-lh freesurfer/bin/morph_tables-lh
---- freesurfer_orig/bin/morph_tables-lh	2021-07-19 16:15:28.408541000 +0200
-+++ freesurfer/bin/morph_tables-lh	2021-07-23 14:50:59.497741928 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # morph_tables-lh
-diff -rupN freesurfer_orig/bin/morph_tables-rh freesurfer/bin/morph_tables-rh
---- freesurfer_orig/bin/morph_tables-rh	2021-07-19 16:15:35.005660000 +0200
-+++ freesurfer/bin/morph_tables-rh	2021-07-23 14:50:59.514816960 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # morph_tables-rh
-diff -rupN freesurfer_orig/bin/mpr2mni305 freesurfer/bin/mpr2mni305
---- freesurfer_orig/bin/mpr2mni305	2021-07-19 16:15:34.275146000 +0200
-+++ freesurfer/bin/mpr2mni305	2021-07-23 14:50:59.549781617 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- # Register an image to an average subject  which 
- # itself has been registered to the MNI average_305 subject.
-diff -rupN freesurfer_orig/bin/mri-func2sph freesurfer/bin/mri-func2sph
---- freesurfer_orig/bin/mri-func2sph	2021-07-19 16:15:25.632373000 +0200
-+++ freesurfer/bin/mri-func2sph	2021-07-23 14:51:05.894428405 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # mri-func2sph
-diff -rupN freesurfer_orig/bin/mri-funcvits freesurfer/bin/mri-funcvits
---- freesurfer_orig/bin/mri-funcvits	2021-07-19 16:15:33.377507000 +0200
-+++ freesurfer/bin/mri-funcvits	2021-07-23 14:51:05.950374359 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # mri-funcvits
-diff -rupN freesurfer_orig/bin/mri-sph2surf freesurfer/bin/mri-sph2surf
---- freesurfer_orig/bin/mri-sph2surf	2021-07-19 16:15:33.159462000 +0200
-+++ freesurfer/bin/mri-sph2surf	2021-07-23 14:51:22.497609126 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # mri-sph2surf
-diff -rupN freesurfer_orig/bin/mri_add_new_tp freesurfer/bin/mri_add_new_tp
---- freesurfer_orig/bin/mri_add_new_tp	2021-07-19 16:15:25.681634000 +0200
-+++ freesurfer/bin/mri_add_new_tp	2021-07-23 14:50:59.586477741 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # mri_add_new_tp
-diff -rupN freesurfer_orig/bin/mri_align_long.csh freesurfer/bin/mri_align_long.csh
---- freesurfer_orig/bin/mri_align_long.csh	2021-07-19 16:15:33.780622000 +0200
-+++ freesurfer/bin/mri_align_long.csh	2021-07-23 14:50:59.716840695 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # mri_align_long.csh
-diff -rupN freesurfer_orig/bin/mri_create_t2combined freesurfer/bin/mri_create_t2combined
---- freesurfer_orig/bin/mri_create_t2combined	2021-07-19 16:15:36.026533000 +0200
-+++ freesurfer/bin/mri_create_t2combined	2021-07-23 14:51:03.510269682 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- set bin=mri_create_t2combined
- 
-diff -rupN freesurfer_orig/bin/mri_cvs_check freesurfer/bin/mri_cvs_check
---- freesurfer_orig/bin/mri_cvs_check	2021-07-19 16:15:35.245023000 +0200
-+++ freesurfer/bin/mri_cvs_check	2021-07-23 14:51:03.671224878 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- 
- # mri_cvs_check
-diff -rupN freesurfer_orig/bin/mri_cvs_data_copy freesurfer/bin/mri_cvs_data_copy
---- freesurfer_orig/bin/mri_cvs_data_copy	2021-07-19 16:15:26.266426000 +0200
-+++ freesurfer/bin/mri_cvs_data_copy	2021-07-23 14:51:03.688126399 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- 
- # mri_cvs_data_copy
-diff -rupN freesurfer_orig/bin/mri_cvs_register freesurfer/bin/mri_cvs_register
---- freesurfer_orig/bin/mri_cvs_register	2021-07-19 16:15:35.511311000 +0200
-+++ freesurfer/bin/mri_cvs_register	2021-07-23 14:51:03.722517175 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- 
- # mri_cvs_register
-diff -rupN freesurfer_orig/bin/mri_glmfit-sim freesurfer/bin/mri_glmfit-sim
---- freesurfer_orig/bin/mri_glmfit-sim	2021-07-19 16:15:31.769458000 +0200
-+++ freesurfer/bin/mri_glmfit-sim	2021-07-23 14:51:06.671768036 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- set VERSION = 'mri_glmfit-sim 7.1.1';
- setenv LANG en_US.UTF-8
- 
-diff -rupN freesurfer_orig/bin/mri_mergelabels freesurfer/bin/mri_mergelabels
---- freesurfer_orig/bin/mri_mergelabels	2021-07-19 16:15:33.114345000 +0200
-+++ freesurfer/bin/mri_mergelabels	2021-07-23 14:51:09.349889730 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # mri_mergelabels
-diff -rupN freesurfer_orig/bin/mri_motion_correct.fsl freesurfer/bin/mri_motion_correct.fsl
---- freesurfer_orig/bin/mri_motion_correct.fsl	2021-07-19 16:15:36.238002000 +0200
-+++ freesurfer/bin/mri_motion_correct.fsl	2021-07-23 14:51:09.716917327 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # mri_motion_correct.fsl
-diff -rupN freesurfer_orig/bin/mri_motion_correct2 freesurfer/bin/mri_motion_correct2
---- freesurfer_orig/bin/mri_motion_correct2	2021-07-19 16:15:28.087524000 +0200
-+++ freesurfer/bin/mri_motion_correct2	2021-07-23 14:51:09.677644764 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # mri_motion_correct2
-diff -rupN freesurfer_orig/bin/mri_nu_correct.mni freesurfer/bin/mri_nu_correct.mni
---- freesurfer_orig/bin/mri_nu_correct.mni	2021-07-19 16:15:28.409705000 +0200
-+++ freesurfer/bin/mri_nu_correct.mni	2021-07-23 14:51:10.356590467 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # mri_nu_correct.mni
-diff -rupN freesurfer_orig/bin/mri_reorient_LR.csh freesurfer/bin/mri_reorient_LR.csh
---- freesurfer_orig/bin/mri_reorient_LR.csh	2021-07-19 16:15:35.050505000 +0200
-+++ freesurfer/bin/mri_reorient_LR.csh	2021-07-23 14:51:12.215453857 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- # mri_reorient_LR
- #
-diff -rupN freesurfer_orig/bin/mris_compute_lgi freesurfer/bin/mris_compute_lgi
---- freesurfer_orig/bin/mris_compute_lgi	2021-07-19 16:15:27.578748000 +0200
-+++ freesurfer/bin/mris_compute_lgi	2021-07-23 14:51:14.704682203 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # mris_compute_lgi
-diff -rupN freesurfer_orig/bin/mris_preproc freesurfer/bin/mris_preproc
---- freesurfer_orig/bin/mris_preproc	2021-07-19 16:15:30.028505000 +0200
-+++ freesurfer/bin/mris_preproc	2021-07-23 14:51:22.995374109 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # mris_preproc
-diff -rupN freesurfer_orig/bin/mris_volsmooth freesurfer/bin/mris_volsmooth
---- freesurfer_orig/bin/mris_volsmooth	2021-07-19 16:15:34.269201000 +0200
-+++ freesurfer/bin/mris_volsmooth	2021-07-23 14:51:28.821262717 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # mris_volsmooth
-diff -rupN freesurfer_orig/bin/ms_refine_subject freesurfer/bin/ms_refine_subject
---- freesurfer_orig/bin/ms_refine_subject	2021-07-19 16:15:28.346976000 +0200
-+++ freesurfer/bin/ms_refine_subject	2021-07-23 14:51:31.267555077 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- #
- # ms_refine_subject
-diff -rupN freesurfer_orig/bin/orientLAS freesurfer/bin/orientLAS
---- freesurfer_orig/bin/orientLAS	2021-07-19 16:15:32.158238000 +0200
-+++ freesurfer/bin/orientLAS	2021-07-23 14:51:31.499503611 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- #
- # orientLAS
- #
-diff -rupN freesurfer_orig/bin/parc_atlas_jackknife_test freesurfer/bin/parc_atlas_jackknife_test
---- freesurfer_orig/bin/parc_atlas_jackknife_test	2021-07-19 16:15:33.261580000 +0200
-+++ freesurfer/bin/parc_atlas_jackknife_test	2021-07-23 14:51:31.556605479 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # parc_atlas_jackknife_test
-@@ -291,7 +291,7 @@ foreach test_subj ($ALL_SUBJECTS)
-             if (-e ${sphere_reg}) rm -f ${sphere_reg}
-             if ($PBS) then
-                 set cmdf=(${WD}/${hemi}.${test_subj}${reg_append}.cmd)
--                echo "#! /bin/tcsh -ef" > ${cmdf}
-+                echo "#!/usr/bin/env/tcsh -ef" > ${cmdf}
-                 echo "limit filesize 10megabytes" >> ${cmdf}
-                 echo "${cmd} |& tee -a ${LF}" >> ${cmdf}
-                 chmod a+x ${cmdf}
-diff -rupN freesurfer_orig/bin/pctsurfcon freesurfer/bin/pctsurfcon
---- freesurfer_orig/bin/pctsurfcon	2021-07-19 16:15:30.730392000 +0200
-+++ freesurfer/bin/pctsurfcon	2021-07-23 14:51:31.607526685 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # pctsurfcon
-diff -rupN freesurfer_orig/bin/polyorder freesurfer/bin/polyorder
---- freesurfer_orig/bin/polyorder	2021-07-19 16:15:31.768138000 +0200
-+++ freesurfer/bin/polyorder	2021-07-23 14:51:31.662307344 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # polyorder
- 
- set VERSION = 'polyorder 7.1.1';
-diff -rupN freesurfer_orig/bin/print_unique_labels.csh freesurfer/bin/print_unique_labels.csh
---- freesurfer_orig/bin/print_unique_labels.csh	2021-07-19 16:15:27.276209000 +0200
-+++ freesurfer/bin/print_unique_labels.csh	2021-07-23 14:51:31.699361030 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- # print_unique_labels
- #
-diff -rupN freesurfer_orig/bin/rbbr freesurfer/bin/rbbr
---- freesurfer_orig/bin/rbbr	2021-07-19 16:15:30.391650000 +0200
-+++ freesurfer/bin/rbbr	2021-07-23 14:51:32.307991381 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # rbbr
- 
- set VERSION = 'rbbr 7.1.1';
-diff -rupN freesurfer_orig/bin/rca-base-init freesurfer/bin/rca-base-init
---- freesurfer_orig/bin/rca-base-init	2021-07-19 16:15:28.048787000 +0200
-+++ freesurfer/bin/rca-base-init	2021-07-23 14:51:32.380255596 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # rca-base-init - initialize base subject for recon-all processing. Mostly, code was just
- # cut out of recon-all, so there are some things that look funny (eg, DoCreateBaseSubj is
- # explicitly set to 1 and checked eventhough that is what this script does). I wanted
-diff -rupN freesurfer_orig/bin/rca-long-tp-init freesurfer/bin/rca-long-tp-init
---- freesurfer_orig/bin/rca-long-tp-init	2021-07-19 16:15:32.045465000 +0200
-+++ freesurfer/bin/rca-long-tp-init	2021-07-23 14:51:32.419266823 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- # rca-long-tp-init - initialize long timepoint subject for recon-all
- # processing. Mostly, code was just cut out of recon-all, so there are
-diff -rupN freesurfer_orig/bin/rcbf-prep freesurfer/bin/rcbf-prep
---- freesurfer_orig/bin/rcbf-prep	2021-07-19 16:15:27.427677000 +0200
-+++ freesurfer/bin/rcbf-prep	2021-07-23 14:51:32.496490215 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # rcbf-prep
- 
- set VERSION = 'rcbf-prep 7.1.1';
-diff -rupN freesurfer_orig/bin/rebuild_gca_atlas.csh freesurfer/bin/rebuild_gca_atlas.csh
---- freesurfer_orig/bin/rebuild_gca_atlas.csh	2021-07-19 16:15:29.970526000 +0200
-+++ freesurfer/bin/rebuild_gca_atlas.csh	2021-07-23 14:51:32.542222513 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # rebuild_gca_atlas.csh
-diff -rupN freesurfer_orig/bin/recon-all freesurfer/bin/recon-all
---- freesurfer_orig/bin/recon-all	2021-07-19 16:15:27.112107000 +0200
-+++ freesurfer/bin/recon-all	2021-07-23 14:51:32.632753238 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # recon-all
-diff -rupN freesurfer_orig/bin/recon-all-exvivo freesurfer/bin/recon-all-exvivo
---- freesurfer_orig/bin/recon-all-exvivo	2021-07-19 16:15:26.162046000 +0200
-+++ freesurfer/bin/recon-all-exvivo	2021-07-23 14:51:32.739961427 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- 
- set inputargs = ($argv);
-diff -rupN freesurfer_orig/bin/reg-feat2anat freesurfer/bin/reg-feat2anat
---- freesurfer_orig/bin/reg-feat2anat	2021-07-19 16:15:29.240094000 +0200
-+++ freesurfer/bin/reg-feat2anat	2021-07-23 14:51:32.878670649 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # reg-feat2anat
-diff -rupN freesurfer_orig/bin/reg2subject freesurfer/bin/reg2subject
---- freesurfer_orig/bin/reg2subject	2021-07-19 16:15:27.230038000 +0200
-+++ freesurfer/bin/reg2subject	2021-07-23 14:51:32.815649454 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # reg2subject
- 
- set VERSION = 'reg2subject 7.1.1';
-diff -rupN freesurfer_orig/bin/register.csh freesurfer/bin/register.csh
---- freesurfer_orig/bin/register.csh	2021-07-19 16:15:33.767468000 +0200
-+++ freesurfer/bin/register.csh	2021-07-23 14:51:32.934334640 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # register.csh
-diff -rupN freesurfer_orig/bin/register_child freesurfer/bin/register_child
---- freesurfer_orig/bin/register_child	2021-07-19 16:15:26.780472000 +0200
-+++ freesurfer/bin/register_child	2021-07-23 14:51:32.917911557 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- #
- # register_child
-diff -rupN freesurfer_orig/bin/register_elderly_subject freesurfer/bin/register_elderly_subject
---- freesurfer_orig/bin/register_elderly_subject	2021-07-19 16:15:30.237329000 +0200
-+++ freesurfer/bin/register_elderly_subject	2021-07-23 14:51:32.953411942 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- #
- # register_elderly_subject
-diff -rupN freesurfer_orig/bin/register_subject freesurfer/bin/register_subject
---- freesurfer_orig/bin/register_subject	2021-07-19 16:15:33.783182000 +0200
-+++ freesurfer/bin/register_subject	2021-07-23 14:51:32.969633915 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- #
- # register_subject
-diff -rupN freesurfer_orig/bin/register_subject_flash freesurfer/bin/register_subject_flash
---- freesurfer_orig/bin/register_subject_flash	2021-07-19 16:15:30.222970000 +0200
-+++ freesurfer/bin/register_subject_flash	2021-07-23 14:51:32.981301743 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- #
- # register_subject_flash
-diff -rupN freesurfer_orig/bin/register_subject_mixed freesurfer/bin/register_subject_mixed
---- freesurfer_orig/bin/register_subject_mixed	2021-07-19 16:15:28.276797000 +0200
-+++ freesurfer/bin/register_subject_mixed	2021-07-23 14:51:32.992526110 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- #
- # register_subject_mixed
-diff -rupN freesurfer_orig/bin/reinflate_subject freesurfer/bin/reinflate_subject
---- freesurfer_orig/bin/reinflate_subject	2021-07-19 16:15:30.583129000 +0200
-+++ freesurfer/bin/reinflate_subject	2021-07-23 14:51:33.011572072 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # reinflate_subject
-diff -rupN freesurfer_orig/bin/reinflate_subject-lh freesurfer/bin/reinflate_subject-lh
---- freesurfer_orig/bin/reinflate_subject-lh	2021-07-19 16:15:33.155431000 +0200
-+++ freesurfer/bin/reinflate_subject-lh	2021-07-23 14:51:33.016788279 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # reinflate_subject-lh
-diff -rupN freesurfer_orig/bin/reinflate_subject-rh freesurfer/bin/reinflate_subject-rh
---- freesurfer_orig/bin/reinflate_subject-rh	2021-07-19 16:15:33.389761000 +0200
-+++ freesurfer/bin/reinflate_subject-rh	2021-07-23 14:51:33.035587620 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # reinflate_subject-rh
-diff -rupN freesurfer_orig/bin/remove_talairach freesurfer/bin/remove_talairach
---- freesurfer_orig/bin/remove_talairach	2021-07-19 16:15:25.860599000 +0200
-+++ freesurfer/bin/remove_talairach	2021-07-23 14:51:33.109451700 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- #
- # remove_talairach
-diff -rupN freesurfer_orig/bin/renormalize_T1_subject freesurfer/bin/renormalize_T1_subject
---- freesurfer_orig/bin/renormalize_T1_subject	2021-07-19 16:15:29.113826000 +0200
-+++ freesurfer/bin/renormalize_T1_subject	2021-07-23 14:51:33.239153783 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # renormalize_T1_subject
-diff -rupN freesurfer_orig/bin/renormalize_subject freesurfer/bin/renormalize_subject
---- freesurfer_orig/bin/renormalize_subject	2021-07-19 16:15:25.520921000 +0200
-+++ freesurfer/bin/renormalize_subject	2021-07-23 14:51:33.181963567 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # renormalize_subject
-diff -rupN freesurfer_orig/bin/renormalize_subject_keep_editting freesurfer/bin/renormalize_subject_keep_editting
---- freesurfer_orig/bin/renormalize_subject_keep_editting	2021-07-19 16:15:26.338287000 +0200
-+++ freesurfer/bin/renormalize_subject_keep_editting	2021-07-23 14:51:33.199920395 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # renormalize_subject_keep_editting
-diff -rupN freesurfer_orig/bin/reregister_subject_mixed freesurfer/bin/reregister_subject_mixed
---- freesurfer_orig/bin/reregister_subject_mixed	2021-07-19 16:15:32.678261000 +0200
-+++ freesurfer/bin/reregister_subject_mixed	2021-07-23 14:51:33.314912660 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- #
- # reregister_subject_mixed
-diff -rupN freesurfer_orig/bin/rtview freesurfer/bin/rtview
---- freesurfer_orig/bin/rtview	2021-07-19 16:15:32.225438000 +0200
-+++ freesurfer/bin/rtview	2021-07-23 14:51:33.330561450 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # rtview
- 
- set VERSION = 'rtview 7.1.1';
-diff -rupN freesurfer_orig/bin/run-qdec-glm freesurfer/bin/run-qdec-glm
---- freesurfer_orig/bin/run-qdec-glm	2021-07-19 16:15:25.497320000 +0200
-+++ freesurfer/bin/run-qdec-glm	2021-07-23 14:51:33.389031441 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # run-qdec-glm
-diff -rupN freesurfer_orig/bin/run_mris_preproc freesurfer/bin/run_mris_preproc
---- freesurfer_orig/bin/run_mris_preproc	2021-07-19 16:15:28.778771000 +0200
-+++ freesurfer/bin/run_mris_preproc	2021-07-23 14:51:33.343212181 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- #
- # Script to create a cache of the preprocessed files needed by qdec.
-diff -rupN freesurfer_orig/bin/samseg freesurfer/bin/samseg
---- freesurfer_orig/bin/samseg	2021-07-19 16:15:29.370516000 +0200
-+++ freesurfer/bin/samseg	2021-07-23 14:51:33.615742849 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # samseg
- 
- set VERSION = 'samseg 7.1.1';
-diff -rupN freesurfer_orig/bin/samseg-long freesurfer/bin/samseg-long
---- freesurfer_orig/bin/samseg-long	2021-07-19 16:15:34.096267000 +0200
-+++ freesurfer/bin/samseg-long	2021-07-23 14:51:33.725551496 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # samseg-long - sources
- if(-e $FREESURFER_HOME/sources.csh) then
-   source $FREESURFER_HOME/sources.csh
-diff -rupN freesurfer_orig/bin/samseg2recon freesurfer/bin/samseg2recon
---- freesurfer_orig/bin/samseg2recon	2021-07-19 16:15:27.889841000 +0200
-+++ freesurfer/bin/samseg2recon	2021-07-23 14:51:33.675127082 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- #
- # samseg2recon - create and populate a subjects dir in a way that
- # recon-all can be run on it.
-diff -rupN freesurfer_orig/bin/seg2filled freesurfer/bin/seg2filled
---- freesurfer_orig/bin/seg2filled	2021-07-19 16:15:27.721140000 +0200
-+++ freesurfer/bin/seg2filled	2021-07-23 14:51:33.855629720 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- # seg2filled - creates a filled.mgz from an aseg-style
- # segmentation. The original intent is to use a SAMSEG segmentation to
-diff -rupN freesurfer_orig/bin/segmentBS.sh freesurfer/bin/segmentBS.sh
---- freesurfer_orig/bin/segmentBS.sh	2021-07-19 16:15:31.819964000 +0200
-+++ freesurfer/bin/segmentBS.sh	2021-07-23 14:51:33.889030649 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- set tcsh61706 = (`tcsh --version | grep "6\.17\.06"`)
- if ("$tcsh61706" != "") then
-diff -rupN freesurfer_orig/bin/segmentHA_T1.sh freesurfer/bin/segmentHA_T1.sh
---- freesurfer_orig/bin/segmentHA_T1.sh	2021-07-19 16:15:26.853402000 +0200
-+++ freesurfer/bin/segmentHA_T1.sh	2021-07-23 14:51:33.962202677 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- set tcsh61706 = (`tcsh --version | grep "6\.17\.06"`)
- if ("$tcsh61706" != "") then
-diff -rupN freesurfer_orig/bin/segmentHA_T1_long.sh freesurfer/bin/segmentHA_T1_long.sh
---- freesurfer_orig/bin/segmentHA_T1_long.sh	2021-07-19 16:15:29.807362000 +0200
-+++ freesurfer/bin/segmentHA_T1_long.sh	2021-07-23 14:51:33.937732007 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- set tcsh61706 = (`tcsh --version | grep "6\.17\.06"`)
- if ("$tcsh61706" != "") then
-diff -rupN freesurfer_orig/bin/segmentHA_T2.sh freesurfer/bin/segmentHA_T2.sh
---- freesurfer_orig/bin/segmentHA_T2.sh	2021-07-19 16:15:27.613750000 +0200
-+++ freesurfer/bin/segmentHA_T2.sh	2021-07-23 14:51:34.024551600 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- set tcsh61706 = (`tcsh --version | grep "6\.17\.06"`)
- if ("$tcsh61706" != "") then
-diff -rupN freesurfer_orig/bin/segmentThalamicNuclei.sh freesurfer/bin/segmentThalamicNuclei.sh
---- freesurfer_orig/bin/segmentThalamicNuclei.sh	2021-07-19 16:15:29.384484000 +0200
-+++ freesurfer/bin/segmentThalamicNuclei.sh	2021-07-23 14:51:35.594184370 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- set tcsh61706 = (`tcsh --version | grep "6\.17\.06"`)
- if ("$tcsh61706" != "") then
-diff -rupN freesurfer_orig/bin/segment_monkey freesurfer/bin/segment_monkey
---- freesurfer_orig/bin/segment_monkey	2021-07-19 16:15:31.634965000 +0200
-+++ freesurfer/bin/segment_monkey	2021-07-23 14:51:34.055493141 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- #
- # segment_monkey
-diff -rupN freesurfer_orig/bin/segment_subject freesurfer/bin/segment_subject
---- freesurfer_orig/bin/segment_subject	2021-07-19 16:15:26.789513000 +0200
-+++ freesurfer/bin/segment_subject	2021-07-23 14:51:34.284000324 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # segment_subject
-diff -rupN freesurfer_orig/bin/segment_subject_notal freesurfer/bin/segment_subject_notal
---- freesurfer_orig/bin/segment_subject_notal	2021-07-19 16:15:30.736798000 +0200
-+++ freesurfer/bin/segment_subject_notal	2021-07-23 14:51:34.534758641 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- #
- # segment_subject_notal
-diff -rupN freesurfer_orig/bin/segment_subject_notal2 freesurfer/bin/segment_subject_notal2
---- freesurfer_orig/bin/segment_subject_notal2	2021-07-19 16:15:29.206953000 +0200
-+++ freesurfer/bin/segment_subject_notal2	2021-07-23 14:51:34.564843049 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- #
- # segment_subject_notal2
-diff -rupN freesurfer_orig/bin/segment_subject_old_skull_strip freesurfer/bin/segment_subject_old_skull_strip
---- freesurfer_orig/bin/segment_subject_old_skull_strip	2021-07-19 16:15:33.628104000 +0200
-+++ freesurfer/bin/segment_subject_old_skull_strip	2021-07-23 14:51:34.574829391 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- #
- # segment_subject_old_skull_strip
-diff -rupN freesurfer_orig/bin/segment_subject_sc freesurfer/bin/segment_subject_sc
---- freesurfer_orig/bin/segment_subject_sc	2021-07-19 16:15:33.875674000 +0200
-+++ freesurfer/bin/segment_subject_sc	2021-07-23 14:51:34.586423789 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- #
- # segment_subject_sc
-diff -rupN freesurfer_orig/bin/segment_subject_talmgh freesurfer/bin/segment_subject_talmgh
---- freesurfer_orig/bin/segment_subject_talmgh	2021-07-19 16:15:27.611041000 +0200
-+++ freesurfer/bin/segment_subject_talmgh	2021-07-23 14:51:35.322086104 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- #
- # segment_subject_talmgh
-diff -rupN freesurfer_orig/bin/segpons freesurfer/bin/segpons
---- freesurfer_orig/bin/segpons	2021-07-19 16:15:28.897587000 +0200
-+++ freesurfer/bin/segpons	2021-07-23 14:51:35.629212544 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # segpons
- 
- set VERSION = 'segpons 7.1.1';
-diff -rupN freesurfer_orig/bin/setlabelstat freesurfer/bin/setlabelstat
---- freesurfer_orig/bin/setlabelstat	2021-07-19 16:15:35.247531000 +0200
-+++ freesurfer/bin/setlabelstat	2021-07-23 14:51:35.666509616 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # setlabelstat
-diff -rupN freesurfer_orig/bin/sfa2fieldsign freesurfer/bin/sfa2fieldsign
---- freesurfer_orig/bin/sfa2fieldsign	2021-07-19 16:15:29.615560000 +0200
-+++ freesurfer/bin/sfa2fieldsign	2021-07-23 14:51:35.721448355 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # sfa2fieldsign
- setenv FSLOUTPUTTYPE NIFTI
- 
-diff -rupN freesurfer_orig/bin/show_tal freesurfer/bin/show_tal
---- freesurfer_orig/bin/show_tal	2021-07-19 16:15:35.885699000 +0200
-+++ freesurfer/bin/show_tal	2021-07-23 14:51:35.748574683 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh
-+#!/usr/bin/env/tcsh
- 
- #
- # show_tal
-diff -rupN freesurfer_orig/bin/skip_long_make_checks freesurfer/bin/skip_long_make_checks
---- freesurfer_orig/bin/skip_long_make_checks	2021-07-19 16:15:35.246581000 +0200
-+++ freesurfer/bin/skip_long_make_checks	2021-07-23 14:51:35.787365530 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- # if these are defined, then make check skips these long tests:
- setenv SKIP_MRI_APARC2ASEG_TEST 1
- setenv SKIP_MRIS_EXPAND_TEST 1
-diff -rupN freesurfer_orig/bin/sphere_subject freesurfer/bin/sphere_subject
---- freesurfer_orig/bin/sphere_subject	2021-07-19 16:15:28.277824000 +0200
-+++ freesurfer/bin/sphere_subject	2021-07-23 14:51:35.916491950 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # sphere_subject
-diff -rupN freesurfer_orig/bin/sphere_subject-lh freesurfer/bin/sphere_subject-lh
---- freesurfer_orig/bin/sphere_subject-lh	2021-07-19 16:15:26.419359000 +0200
-+++ freesurfer/bin/sphere_subject-lh	2021-07-23 14:51:35.939838406 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # sphere_subject-lh
-diff -rupN freesurfer_orig/bin/sphere_subject-rh freesurfer/bin/sphere_subject-rh
---- freesurfer_orig/bin/sphere_subject-rh	2021-07-19 16:15:34.260395000 +0200
-+++ freesurfer/bin/sphere_subject-rh	2021-07-23 14:51:35.957177242 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # sphere_subject-rh
-diff -rupN freesurfer_orig/bin/spmmat2register freesurfer/bin/spmmat2register
---- freesurfer_orig/bin/spmmat2register	2021-07-19 16:15:29.828714000 +0200
-+++ freesurfer/bin/spmmat2register	2021-07-23 14:51:36.055551823 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # spmmat2register
-diff -rupN freesurfer_orig/bin/spmregister freesurfer/bin/spmregister
---- freesurfer_orig/bin/spmregister	2021-07-19 16:15:28.846723000 +0200
-+++ freesurfer/bin/spmregister	2021-07-23 14:51:36.111244334 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # spmregister
-diff -rupN freesurfer_orig/bin/sratio freesurfer/bin/sratio
---- freesurfer_orig/bin/sratio	2021-07-19 16:15:31.142948000 +0200
-+++ freesurfer/bin/sratio	2021-07-23 14:51:36.195103037 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # sratio - signed ratio
- #   +A/B if A>B
- #   -B/A if B>A
-diff -rupN freesurfer_orig/bin/surfreg freesurfer/bin/surfreg
---- freesurfer_orig/bin/surfreg	2021-07-19 16:15:31.883339000 +0200
-+++ freesurfer/bin/surfreg	2021-07-23 14:51:36.792543202 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # thalseg
- 
- set VERSION = 'surfreg 7.1.1';
-diff -rupN freesurfer_orig/bin/tal_compare freesurfer/bin/tal_compare
---- freesurfer_orig/bin/tal_compare	2021-07-19 16:15:35.711992000 +0200
-+++ freesurfer/bin/tal_compare	2021-07-23 14:51:37.507107759 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh
-+#!/usr/bin/env/tcsh
- 
- #
- # tal_compare
-diff -rupN freesurfer_orig/bin/talairach freesurfer/bin/talairach
---- freesurfer_orig/bin/talairach	2021-07-19 16:15:31.814815000 +0200
-+++ freesurfer/bin/talairach	2021-07-23 14:51:37.114201419 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # talairach
-diff -rupN freesurfer_orig/bin/talairach2 freesurfer/bin/talairach2
---- freesurfer_orig/bin/talairach2	2021-07-19 16:15:34.838489000 +0200
-+++ freesurfer/bin/talairach2	2021-07-23 14:51:37.164956485 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # talairach2
-diff -rupN freesurfer_orig/bin/talairach_avi freesurfer/bin/talairach_avi
---- freesurfer_orig/bin/talairach_avi	2021-07-19 16:15:26.788493000 +0200
-+++ freesurfer/bin/talairach_avi	2021-07-23 14:51:37.444161124 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # talairach_avi - align an image to the average_305 MNI (talairach) target
-diff -rupN freesurfer_orig/bin/talairach_mgh freesurfer/bin/talairach_mgh
---- freesurfer_orig/bin/talairach_mgh	2021-07-19 16:15:27.399940000 +0200
-+++ freesurfer/bin/talairach_mgh	2021-07-23 14:51:37.491562848 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- #
- # talairach_mgh
-diff -rupN freesurfer_orig/bin/talsegprob freesurfer/bin/talsegprob
---- freesurfer_orig/bin/talsegprob	2021-07-19 16:15:33.962945000 +0200
-+++ freesurfer/bin/talsegprob	2021-07-23 14:51:37.623028466 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # talsegprob
-diff -rupN freesurfer_orig/bin/test_recon-all.csh freesurfer/bin/test_recon-all.csh
---- freesurfer_orig/bin/test_recon-all.csh	2021-07-19 16:15:27.580337000 +0200
-+++ freesurfer/bin/test_recon-all.csh	2021-07-23 14:51:37.824344732 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # Name:    test_recon-all.csh
-diff -rupN freesurfer_orig/bin/thickdiffmap freesurfer/bin/thickdiffmap
---- freesurfer_orig/bin/thickdiffmap	2021-07-19 16:15:27.133033000 +0200
-+++ freesurfer/bin/thickdiffmap	2021-07-23 14:51:37.931476980 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -ef
-+#!/usr/bin/env/tcsh -ef
- 
- if ($#argv < 5) then
-   echo "usage: thickdiffmap <subjscan1> <subjscan2> <commonsubj> <hemi> <step>..."
-diff -rupN freesurfer_orig/bin/tkmeditfv freesurfer/bin/tkmeditfv
---- freesurfer_orig/bin/tkmeditfv	2021-07-19 16:15:28.201818000 +0200
-+++ freesurfer/bin/tkmeditfv	2021-07-23 14:51:38.461792437 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # tkmeditfv
- 
- set VERSION = 'tkmeditfv 7.1.1';
-diff -rupN freesurfer_orig/bin/tkregisterfv freesurfer/bin/tkregisterfv
---- freesurfer_orig/bin/tkregisterfv	2021-07-19 16:15:32.274559000 +0200
-+++ freesurfer/bin/tkregisterfv	2021-07-23 14:51:39.060872088 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # tkregisterfv
- 
- set VERSION = 'tkregisterfv 7.1.1';
-diff -rupN freesurfer_orig/bin/tksurferfv freesurfer/bin/tksurferfv
---- freesurfer_orig/bin/tksurferfv	2021-07-19 16:15:25.139920000 +0200
-+++ freesurfer/bin/tksurferfv	2021-07-23 14:51:39.440422333 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # tkmeditfv
- 
- set VERSION = 'tksurferfv 7.1.1';
-diff -rupN freesurfer_orig/bin/trac-all freesurfer/bin/trac-all
---- freesurfer_orig/bin/trac-all	2021-07-19 16:15:29.591002000 +0200
-+++ freesurfer/bin/trac-all	2021-07-23 14:51:39.483824375 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # trac-all
-diff -rupN freesurfer_orig/bin/trac-paths freesurfer/bin/trac-paths
---- freesurfer_orig/bin/trac-paths	2021-07-19 16:15:27.471204000 +0200
-+++ freesurfer/bin/trac-paths	2021-07-23 14:51:39.518667018 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # trac-paths
-diff -rupN freesurfer_orig/bin/trac-preproc freesurfer/bin/trac-preproc
---- freesurfer_orig/bin/trac-preproc	2021-07-19 16:15:25.610917000 +0200
-+++ freesurfer/bin/trac-preproc	2021-07-23 14:51:39.570452907 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # trac-preproc
-diff -rupN freesurfer_orig/bin/train-gcs-atlas freesurfer/bin/train-gcs-atlas
---- freesurfer_orig/bin/train-gcs-atlas	2021-07-19 16:15:28.669402000 +0200
-+++ freesurfer/bin/train-gcs-atlas	2021-07-23 14:51:39.700855332 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # train-gcs-atlas 
- 
- if(-e $FREESURFER_HOME/sources.csh) then
-diff -rupN freesurfer_orig/bin/unpackimadir freesurfer/bin/unpackimadir
---- freesurfer_orig/bin/unpackimadir	2021-07-19 16:15:28.914437000 +0200
-+++ freesurfer/bin/unpackimadir	2021-07-23 14:51:40.025067817 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # unpackimadir
-diff -rupN freesurfer_orig/bin/unpackmincdir freesurfer/bin/unpackmincdir
---- freesurfer_orig/bin/unpackmincdir	2021-07-19 16:15:28.803083000 +0200
-+++ freesurfer/bin/unpackmincdir	2021-07-23 14:51:40.165126363 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- # Name: unpackmincdir
- # Purpose: unpacks the functionals and anatomicals and copies others
-diff -rupN freesurfer_orig/bin/vertexvol freesurfer/bin/vertexvol
---- freesurfer_orig/bin/vertexvol	2021-07-19 16:15:25.456681000 +0200
-+++ freesurfer/bin/vertexvol	2021-07-23 14:51:40.319594236 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- # Copyright © 2011-2015 The General Hospital Corporation (Boston, MA) "MGH"
- #
-diff -rupN freesurfer_orig/bin/vno_match_check freesurfer/bin/vno_match_check
---- freesurfer_orig/bin/vno_match_check	2021-07-19 16:15:30.271118000 +0200
-+++ freesurfer/bin/vno_match_check	2021-07-23 14:51:40.328061783 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #set echo=1
- 
-diff -rupN freesurfer_orig/bin/vol2segavg freesurfer/bin/vol2segavg
---- freesurfer_orig/bin/vol2segavg	2021-07-19 16:15:33.676469000 +0200
-+++ freesurfer/bin/vol2segavg	2021-07-23 14:51:40.349574764 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # vol2segavg
- 
- set VERSION = 'vol2segavg 7.1.1';
-diff -rupN freesurfer_orig/bin/vol2subfield freesurfer/bin/vol2subfield
---- freesurfer_orig/bin/vol2subfield	2021-07-19 16:15:35.886959000 +0200
-+++ freesurfer/bin/vol2subfield	2021-07-23 14:51:40.373502102 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # vol2subfield - 
- 
- if(-e $FREESURFER_HOME/sources.csh) then
-diff -rupN freesurfer_orig/bin/vol2symsurf freesurfer/bin/vol2symsurf
---- freesurfer_orig/bin/vol2symsurf	2021-07-19 16:15:28.752750000 +0200
-+++ freesurfer/bin/vol2symsurf	2021-07-23 14:51:40.394398779 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # vol2symsurf
- 
- set VERSION = 'vol2symsurf 7.1.1';
-diff -rupN freesurfer_orig/bin/vsm-smooth freesurfer/bin/vsm-smooth
---- freesurfer_orig/bin/vsm-smooth	2021-07-19 16:15:30.127002000 +0200
-+++ freesurfer/bin/vsm-smooth	2021-07-23 14:51:40.405737516 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # vsm-smooth
- 
- set VERSION = 'vsm-smooth 7.1.1';
-diff -rupN freesurfer_orig/bin/wfilemask freesurfer/bin/wfilemask
---- freesurfer_orig/bin/wfilemask	2021-07-19 16:15:29.648335000 +0200
-+++ freesurfer/bin/wfilemask	2021-07-23 14:51:40.426690305 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # wfilemask
-diff -rupN freesurfer_orig/bin/wm-anat-snr freesurfer/bin/wm-anat-snr
---- freesurfer_orig/bin/wm-anat-snr	2021-07-19 16:15:34.094799000 +0200
-+++ freesurfer/bin/wm-anat-snr	2021-07-23 14:51:40.473043255 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- set VERSION = 'wm-anat-snr 7.1.1';
- set inputargs = ($argv);
-diff -rupN freesurfer_orig/bin/wmedits2surf freesurfer/bin/wmedits2surf
---- freesurfer_orig/bin/wmedits2surf	2021-07-19 16:15:31.808577000 +0200
-+++ freesurfer/bin/wmedits2surf	2021-07-23 14:51:40.491966507 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # wmedits2surf
- 
- set VERSION = 'wmedits2surf 7.1.1';
-diff -rupN freesurfer_orig/bin/wmsaseg freesurfer/bin/wmsaseg
---- freesurfer_orig/bin/wmsaseg	2021-07-19 16:15:26.860775000 +0200
-+++ freesurfer/bin/wmsaseg	2021-07-23 14:51:40.526825001 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # wmsaseg
- 
- set VERSION = 'wmsaseg 7.1.1';
-diff -rupN freesurfer_orig/bin/xcerebralseg freesurfer/bin/xcerebralseg
---- freesurfer_orig/bin/xcerebralseg	2021-07-19 16:15:34.267093000 +0200
-+++ freesurfer/bin/xcerebralseg	2021-07-23 14:51:40.576279642 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # xcerebralseg
- 
- set VERSION = 'xcerebralseg 7.1.1';
-diff -rupN freesurfer_orig/bin/xcorr freesurfer/bin/xcorr
---- freesurfer_orig/bin/xcorr	2021-07-19 16:15:28.460983000 +0200
-+++ freesurfer/bin/xcorr	2021-07-23 14:51:40.624493239 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- # xcorr
- 
- set VERSION = 'xcorr 7.1.1';
-diff -rupN freesurfer_orig/bin/xfmrot freesurfer/bin/xfmrot
---- freesurfer_orig/bin/xfmrot	2021-07-19 16:15:30.581830000 +0200
-+++ freesurfer/bin/xfmrot	2021-07-23 14:51:40.654776367 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- if ($#argv < 2 || $#argv > 3) then
-   echo "xfmrot <transform file> <input vector file> [<output vector file>]"
-diff -rupN freesurfer_orig/bin/xhemi-tal freesurfer/bin/xhemi-tal
---- freesurfer_orig/bin/xhemi-tal	2021-07-19 16:15:29.551823000 +0200
-+++ freesurfer/bin/xhemi-tal	2021-07-23 14:51:40.761437425 +0200
-@@ -1,4 +1,4 @@
--#!/bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # xhemi-tal
-diff -rupN freesurfer_orig/bin/xsanatreg freesurfer/bin/xsanatreg
---- freesurfer_orig/bin/xsanatreg	2021-07-19 16:15:29.977642000 +0200
-+++ freesurfer/bin/xsanatreg	2021-07-23 14:51:40.820524247 +0200
-@@ -1,4 +1,4 @@
--#! /bin/tcsh -f
-+#!/usr/bin/env tcsh
- 
- #
- # xsanatreg 
diff --git a/Golden_Repo/f/FreeSurfer/license_text.txt b/Golden_Repo/f/FreeSurfer/license_text.txt
deleted file mode 100644
index 0ebf8864b..000000000
--- a/Golden_Repo/f/FreeSurfer/license_text.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-"""r.deepu@fz-juelich.de
-51392
- *CsaBFnUlfG0.
- FSk7cKa1irCLs"""
-
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
deleted file mode 100644
index 038718153..000000000
--- a/Golden_Repo/f/FriBidi/FriBidi-1.0.10-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,33 +0,0 @@
-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/f/flatbuffers-python/flatbuffers-python-2.0-GCCcore-11.2.0.eb b/Golden_Repo/f/flatbuffers-python/flatbuffers-python-2.0-GCCcore-11.2.0.eb
deleted file mode 100644
index a19cab157..000000000
--- a/Golden_Repo/f/flatbuffers-python/flatbuffers-python-2.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,28 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'flatbuffers-python'
-version = '2.0'
-
-homepage = 'https://github.com/google/flatbuffers/'
-description = """Python Flatbuffers runtime library."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://pypi.python.org/packages/source/f/flatbuffers']
-sources = [
-    {'download_filename': 'flatbuffers-%(version)s.tar.gz', 'filename': SOURCE_TAR_GZ}]
-checksums = ['12158ab0272375eab8db2d663ae97370c33f152b27801fa6024e1d6105fd4dd2']
-
-dependencies = [
-    ('binutils', '2.37'),
-    ('Python', '3.9.6'),
-]
-
-download_dep_fail = True
-use_pip = True
-sanity_pip_check = True
-
-preinstallopts = 'VERSION=%(version)s '
-options = {'modulename': 'flatbuffers'}
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/f/flatbuffers/flatbuffers-2.0.0-GCCcore-11.2.0.eb b/Golden_Repo/f/flatbuffers/flatbuffers-2.0.0-GCCcore-11.2.0.eb
deleted file mode 100644
index 9fc4da31a..000000000
--- a/Golden_Repo/f/flatbuffers/flatbuffers-2.0.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,33 +0,0 @@
-##
-# Author:    Robert Mijakovic <robert.mijakovic@lxp.lu>
-##
-easyblock = 'CMakeNinja'
-
-name = 'flatbuffers'
-version = '2.0.0'
-
-homepage = 'https://github.com/google/flatbuffers/'
-description = """FlatBuffers: Memory Efficient Serialization Library"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/google/flatbuffers/archive/v%(version)s/']
-sources = [SOURCE_TAR_GZ]
-checksums = ['9ddb9031798f4f8754d00fca2f1a68ecf9d0f83dfac7239af1311e4fd9a565c4']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1'),
-    ('Ninja', '1.10.2'),
-    ('Python', '3.9.6'),
-]
-
-configopts = '-DFLATBUFFERS_ENABLE_PCH=ON '
-
-sanity_check_paths = {
-    'files': ['include/flatbuffers/flatbuffers.h', 'bin/flatc', 'lib/libflatbuffers.a'],
-    'dirs': ['lib/cmake'],
-}
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/f/flex/flex-2.6.4-GCCcore-11.2.0.eb b/Golden_Repo/f/flex/flex-2.6.4-GCCcore-11.2.0.eb
deleted file mode 100644
index ed320f24a..000000000
--- a/Golden_Repo/f/flex/flex-2.6.4-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,37 +0,0 @@
-name = 'flex'
-version = '2.6.4'
-
-homepage = 'http://flex.sourceforge.net/'
-
-description = """
- Flex (Fast Lexical Analyzer) is a tool for generating scanners. A scanner,
- sometimes called a tokenizer, is a program which recognizes lexical patterns
- in text.
-"""
-
-site_contacts = 'sc@fz-juelich.de'
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [
-    'https://github.com/westes/flex/releases/download/v%(version)s/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995']
-
-builddependencies = [
-    ('Bison', '3.7.6'),
-    ('help2man', '1.48.3'),
-    # use same binutils version that was used when building GCC toolchain
-    ('binutils', '2.37', '', SYSTEM),
-]
-
-dependencies = [
-    ('M4', '1.4.19'),
-]
-
-# glibc 2.26 requires _GNU_SOURCE defined to expose reallocarray in the correct
-# header, see https://github.com/westes/flex/issues/241
-preconfigopts = 'export CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" && '
-
-moduleclass = 'lang'
diff --git a/Golden_Repo/f/flex/flex-2.6.4.eb b/Golden_Repo/f/flex/flex-2.6.4.eb
deleted file mode 100644
index 7b39d3cec..000000000
--- a/Golden_Repo/f/flex/flex-2.6.4.eb
+++ /dev/null
@@ -1,28 +0,0 @@
-name = 'flex'
-version = '2.6.4'
-
-homepage = 'http://flex.sourceforge.net/'
-description = """Flex (Fast Lexical Analyzer) is a tool for generating scanners. A scanner,
- sometimes called a tokenizer, is a program which recognizes lexical patterns in text."""
-
-site_contacts = 'a.strube@fz-juelich.de'
-
-toolchain = SYSTEM
-toolchainopts = {'pic': True}
-
-source_urls = [
-    'https://github.com/westes/flex/releases/download/v%(version)s/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995']
-
-builddependencies = [
-    ('M4', '1.4.19'),
-]
-
-dependencies = [
-    ('Bison', '3.7.6'),
-]
-
-hidden = True
-
-moduleclass = 'lang'
diff --git a/Golden_Repo/f/fmt/fmt-8.1.1-GCCcore-11.2.0.eb b/Golden_Repo/f/fmt/fmt-8.1.1-GCCcore-11.2.0.eb
deleted file mode 100644
index 188c4dbbb..000000000
--- a/Golden_Repo/f/fmt/fmt-8.1.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,30 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'fmt'
-version = '8.1.1'
-
-homepage = 'http://fmtlib.net/'
-description = "fmt (formerly cppformat) is an open-source formatting library."
-
-site_contacts = 's.nassyr@fz-juelich.de'
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/fmtlib/fmt/releases/download/%(version)s/']
-sources = ['fmt-%(version)s.zip']
-checksums = ['23778bad8edba12d76e4075da06db591f3b0e3c6c04928ced4a7282ca3400e5d']
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-    ('binutils', '2.37')
-]
-
-separate_build_dir = True
-
-sanity_check_paths = {
-    'files': ['lib/libfmt.a'],
-    'dirs': ['include/fmt', 'lib/cmake'],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/f/fontconfig/fontconfig-2.13.94-GCCcore-11.2.0.eb b/Golden_Repo/f/fontconfig/fontconfig-2.13.94-GCCcore-11.2.0.eb
deleted file mode 100644
index 6829e30b0..000000000
--- a/Golden_Repo/f/fontconfig/fontconfig-2.13.94-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,40 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'fontconfig'
-version = '2.13.94'
-
-homepage = 'https://www.freedesktop.org/wiki/Software/fontconfig/'
-
-description = """
- Fontconfig is a library designed to provide system-wide font configuration,
- customization and application access.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://www.freedesktop.org/software/fontconfig/release/']
-sources = [SOURCE_TAR_GZ]
-checksums = ['246d1640a7e54fba697b28e4445f4d9eb63dda1b511d19986249368ee7191882']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('gperf', '3.1'),
-    ('pkg-config', '0.29.2'),
-    ('Python', '3.9.6', '-bare'),
-]
-
-dependencies = [
-    ('expat', '2.4.1'),
-    ('freetype', '2.11.0'),
-    ('util-linux', '2.37'),
-]
-
-configopts = '--disable-docs '
-
-sanity_check_paths = {
-    'files': ['include/fontconfig/fontconfig.h', 'lib/libfontconfig.%s' % SHLIB_EXT],
-    'dirs': []
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/f/freeglut/freeglut-3.2.1-GCCcore-11.2.0.eb b/Golden_Repo/f/freeglut/freeglut-3.2.1-GCCcore-11.2.0.eb
deleted file mode 100644
index 39fbcb8ad..000000000
--- a/Golden_Repo/f/freeglut/freeglut-3.2.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,39 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'freeglut'
-version = '3.2.1'
-
-homepage = 'http://freeglut.sourceforge.net/'
-description = """freeglut is a completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['http://prdownloads.sourceforge.net/%(name)s']
-sources = [SOURCE_TAR_GZ]
-patches = [
-    'freeglut-3.2.1_fixgcc10.patch',
-]
-checksums = [
-    # freeglut-3.2.1.tar.gz
-    'd4000e02102acaf259998c870e25214739d1f16f67f99cb35e4f46841399da68',
-    # freeglut-3.2.1_fixgcc10.patch
-    '8b5f609eb7324b92e8119dcc031692d0694e6e587452b0b8aa05c9789dbf1b41',
-]
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1', '', SYSTEM),
-]
-
-dependencies = [
-    ('X11', '20210802'),
-    ('OpenGL', '2021b'),
-]
-
-sanity_check_paths = {
-    'files': [('lib/libglut.a', 'lib64/libglut.a'), ('lib/libglut.%s' % SHLIB_EXT, 'lib64/libglut.%s' % SHLIB_EXT)],
-    'dirs': ['include/GL'],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/f/freeglut/freeglut-3.2.1_fixgcc10.patch b/Golden_Repo/f/freeglut/freeglut-3.2.1_fixgcc10.patch
deleted file mode 100644
index d507a1795..000000000
--- a/Golden_Repo/f/freeglut/freeglut-3.2.1_fixgcc10.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/src/fg_gl2.c
-+++ b/src/fg_gl2.c
-@@ -27,6 +27,18 @@
- #include "fg_internal.h"
- #include "fg_gl2.h"
- 
-+#ifdef GL_ES_VERSION_2_0
-+/* Use existing functions on GLES 2.0 */
-+#else
-+FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
-+FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
-+FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
-+FGH_PFNGLBUFFERDATAPROC fghBufferData;
-+FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
-+FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
-+FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
-+#endif
-+
- void FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib) {
-   if (fgStructure.CurrentWindow != NULL)
-     fgStructure.CurrentWindow->Window.attribute_v_coord = attrib;
-diff --git a/freeglut/freeglut/src/fg_gl2.h b/freeglut/freeglut/src/fg_gl2.h
-index ab8ba5c7..fb3d4676 100644
---- a/src/fg_gl2.h
-+++ b/src/fg_gl2.h
-@@ -67,13 +67,13 @@ typedef void (APIENTRY *FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
- typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint);
- typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
- 
--FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
--FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
--FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
--FGH_PFNGLBUFFERDATAPROC fghBufferData;
--FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
--FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
--FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
-+extern FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
-+extern FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
-+extern FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
-+extern FGH_PFNGLBUFFERDATAPROC fghBufferData;
-+extern FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
-+extern FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
-+extern FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
- 
- #    endif
-
diff --git a/Golden_Repo/f/freetype/freetype-2.11.0-GCCcore-11.2.0.eb b/Golden_Repo/f/freetype/freetype-2.11.0-GCCcore-11.2.0.eb
deleted file mode 100644
index 553118811..000000000
--- a/Golden_Repo/f/freetype/freetype-2.11.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,43 +0,0 @@
-name = 'freetype'
-version = '2.11.0'
-
-homepage = 'https://www.freetype.org'
-
-description = """
- FreeType 2 is a software font engine that is designed to be small, efficient,
- highly customizable, and portable while capable of producing high-quality
- output (glyph images). It can be used in graphics libraries, display servers,
- font conversion tools, text image generation tools, and many other products
- as well.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [
-    GNU_SAVANNAH_SOURCE,
-    SOURCEFORGE_SOURCE,
-]
-sources = [SOURCE_TAR_GZ]
-checksums = ['a45c6b403413abd5706f3582f04c8339d26397c4304b78fa552f2215df64101f']
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [
-    ('bzip2', '1.0.8'),
-    ('libpng', '1.6.37'),
-    ('zlib', '1.2.11'),
-    ('Brotli', '1.0.9'),
-]
-
-configopts = '--enable-freetype-config --with-harfbuzz=no'
-
-sanity_check_paths = {
-    'files': ['bin/freetype-config', 'lib/libfreetype.a',
-              'lib/libfreetype.%s' % SHLIB_EXT, 'lib/pkgconfig/freetype2.pc'],
-    'dirs': ['include/freetype2'],
-}
-
-sanity_check_commands = ["freetype-config --help"]
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/g/GCC/GCC-11.2.0.eb b/Golden_Repo/g/GCC/GCC-11.2.0.eb
deleted file mode 100644
index 362218324..000000000
--- a/Golden_Repo/g/GCC/GCC-11.2.0.eb
+++ /dev/null
@@ -1,26 +0,0 @@
-easyblock = 'Bundle'
-
-name = 'GCC'
-version = '11.2.0'
-
-homepage = 'https://gcc.gnu.org/'
-description = """The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran, Java, and Ada,
-as well as libraries for these languages (libstdc++, libgcj,...).
-This module supports NVPTX offloading support. If you want to use this you have to load the CUDA module.
-"""
-
-site_contacts = 'Damian Alvarez <d.alvarez@fz-juelich.de>'
-
-toolchain = SYSTEM
-
-dependencies = [
-    ('GCCcore', version),
-    # binutils built on top of GCCcore, which was built on top of (dummy-built) binutils
-    ('binutils', '2.37', '', ('GCCcore', version)),
-]
-
-altroot = 'GCCcore'
-altversion = 'GCCcore'
-
-# this bundle serves as a compiler-only toolchain, so it should be marked as compiler (important for HMNS)
-moduleclass = 'compiler'
diff --git a/Golden_Repo/g/GCCcore/GCCcore-11.2.0.eb b/Golden_Repo/g/GCCcore/GCCcore-11.2.0.eb
deleted file mode 100644
index 9658e22b5..000000000
--- a/Golden_Repo/g/GCCcore/GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,74 +0,0 @@
-easyblock = 'EB_GCC'
-
-name = 'GCCcore'
-version = '11.2.0'
-
-homepage = 'https://gcc.gnu.org/'
-description = """The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran, Java, and Ada,
-as well as libraries for these languages (libstdc++, libgcj,...).
-This module supports NVPTX offloading support. If you want to use this you have to load the CUDA module.
-"""
-
-site_contacts = 'Damian Alvarez <d.alvarez@fz-juelich.de>'
-
-toolchain = SYSTEM
-
-source_urls = [
-    # GCC auto-resolving HTTP mirror
-    'https://ftpmirror.gnu.org/gnu/gcc/gcc-%(version)s',
-    'https://ftpmirror.gnu.org/gnu/gmp',  # idem for GMP
-    'https://ftpmirror.gnu.org/gnu/mpfr',  # idem for MPFR
-    'https://ftpmirror.gnu.org/gnu/mpc',  # idem for MPC
-    'ftp://gcc.gnu.org/pub/gcc/infrastructure/',  # GCC dependencies
-    'http://gcc.cybermirror.org/infrastructure/',  # HTTP mirror for GCC dependencies
-    'http://isl.gforge.inria.fr/',  # original HTTP source for ISL
-    'https://sourceware.org/pub/newlib/',  # for newlib
-    'https://github.com/MentorEmbedded/nvptx-tools/archive',  # for nvptx-tools
-]
-sources = [
-    'gcc-%(version)s.tar.gz',
-    'gmp-6.2.1.tar.bz2',
-    'mpfr-4.1.0.tar.bz2',
-    'mpc-1.2.1.tar.gz',
-    'isl-0.24.tar.bz2',
-    'newlib-4.1.0.tar.gz',
-    {'download_filename': 'd0524fb.tar.gz',
-        'filename': 'nvptx-tools-20210115.tar.gz'},
-]
-patches = [
-    'GCCcore-6.2.0-fix-find-isl.patch',
-    'GCCcore-9.3.0_gmp-c99.patch',
-]
-checksums = [
-    'f0837f1bf8244a5cc23bd96ff6366712a791cfae01df8e25b137698aca26efc1',  # gcc-11.2.0.tar.gz
-    'eae9326beb4158c386e39a356818031bd28f3124cf915f8c5b1dc4c7a36b4d7c',  # gmp-6.2.1.tar.bz2
-    'feced2d430dd5a97805fa289fed3fc8ff2b094c02d05287fd6133e7f1f0ec926',  # mpfr-4.1.0.tar.bz2
-    '17503d2c395dfcf106b622dc142683c1199431d095367c6aacba6eec30340459',  # mpc-1.2.1.tar.gz
-    'fcf78dd9656c10eb8cf9fbd5f59a0b6b01386205fe1934b3b287a0a1898145c0',  # isl-0.24.tar.bz2
-    'f296e372f51324224d387cc116dc37a6bd397198756746f93a2b02e9a5d40154',  # newlib-4.1.0.tar.gz
-    # nvptx-tools-20210115.tar.gz
-    '466abe1cef9cf294318ecb3c221593356f7a9e1674be987d576bc70d833d84a2',
-    # GCCcore-6.2.0-fix-find-isl.patch
-    '5ad909606d17d851c6ad629b4fddb6c1621844218b8d139fed18c502a7696c68',
-    # GCCcore-9.3.0_gmp-c99.patch
-    '0e135e1cc7cec701beea9d7d17a61bab34cfd496b4b555930016b98db99f922e',
-]
-
-builddependencies = [
-    ('M4', '1.4.19'),
-    ('binutils', '2.37'),
-]
-
-languages = ['c', 'c++', 'fortran']
-
-withisl = True
-withnvptx = True
-
-# Perl is only required when building with NVPTX support
-if withnvptx:
-    osdependencies = ['perl']
-
-# Make sure we replace the system cc with gcc with an alias
-modaliases = {'cc': 'gcc'}
-
-moduleclass = 'compiler'
diff --git a/Golden_Repo/g/GCCcore/GCCcore-6.2.0-fix-find-isl.patch b/Golden_Repo/g/GCCcore/GCCcore-6.2.0-fix-find-isl.patch
deleted file mode 100644
index 6334b6be3..000000000
--- a/Golden_Repo/g/GCCcore/GCCcore-6.2.0-fix-find-isl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Don't use libmpc and libmpfr to find libisl
-# by wpoely86@gmail.com
-diff -ur gcc-6.1.0.orig/configure gcc-6.1.0/configure
---- gcc-6.1.0.orig/configure	2016-08-26 17:51:48.470524515 +0200
-+++ gcc-6.1.0/configure	2016-03-17 23:54:19.000000000 +0100
-@@ -6018,7 +6018,7 @@
-     _isl_saved_LIBS=$LIBS
-
-     CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}"
--    LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs} ${gmplibs}"
-+    LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}"
-     LIBS="${_isl_saved_LIBS} -lisl -lgmp"
-
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isl 0.16, 0.15, or deprecated 0.14" >&5
diff --git a/Golden_Repo/g/GCCcore/GCCcore-9.3.0_gmp-c99.patch b/Golden_Repo/g/GCCcore/GCCcore-9.3.0_gmp-c99.patch
deleted file mode 100644
index 7c4c567c8..000000000
--- a/Golden_Repo/g/GCCcore/GCCcore-9.3.0_gmp-c99.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-add -std=c99 when building GMP, to avoid compilation errors with older GCC system compilers
-author: Kenneth Hoste (HPC-UGent)
---- gcc-9.3.0-RC-20200305/Makefile.in.orig	2020-03-10 20:30:39.851898414 +0100
-+++ gcc-9.3.0-RC-20200305/Makefile.in	2020-03-10 20:33:13.011735787 +0100
-@@ -12891,7 +12891,7 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS)  \
- 	(cd $(HOST_SUBDIR)/gmp && \
--	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM -std=c99" \
- 		$(TARGET-gmp))
- @endif gmp
- 
-@@ -12922,7 +12922,7 @@
- 		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
- 		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
- 		$(EXTRA_HOST_FLAGS)  \
--		$(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
-+		$(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM -std=c99" \
- 		TFLAGS="$(STAGE1_TFLAGS)"  \
- 		$(TARGET-stage1-gmp)
- 
-@@ -12937,7 +12937,7 @@
- 	fi; \
- 	cd $(HOST_SUBDIR)/gmp && \
- 	$(MAKE) $(EXTRA_HOST_FLAGS)  \
--	$(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
-+	$(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM -std=c99" clean
- @endif gmp-bootstrap
- 
- 
-@@ -12966,7 +12966,7 @@
- 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
- 		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
- 		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
--		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
-+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM -std=c99" \
- 		TFLAGS="$(STAGE2_TFLAGS)"  \
- 		$(TARGET-stage2-gmp)
- 
-@@ -12980,7 +12980,7 @@
- 	  $(MAKE) stage2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gmp && \
--	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
-+	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM -std=c99" clean
- @endif gmp-bootstrap
- 
- 
-@@ -13009,7 +13009,7 @@
- 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
- 		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
- 		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
--		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
-+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM -std=c99" \
- 		TFLAGS="$(STAGE3_TFLAGS)"  \
- 		$(TARGET-stage3-gmp)
- 
-@@ -13023,7 +13023,7 @@
- 	  $(MAKE) stage3-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gmp && \
--	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
-+	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM -std=c99" clean
- @endif gmp-bootstrap
- 
- 
diff --git a/Golden_Repo/g/GDAL/GDAL-3.3.2-GCCcore-11.2.0.eb b/Golden_Repo/g/GDAL/GDAL-3.3.2-GCCcore-11.2.0.eb
deleted file mode 100644
index f1cc8fa2b..000000000
--- a/Golden_Repo/g/GDAL/GDAL-3.3.2-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,66 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'GDAL'
-version = '3.3.2'
-
-homepage = 'https://www.gdal.org'
-description = """GDAL is a translator library for raster geospatial data formats that is released under an X/MIT style
- Open Source license by the Open Source Geospatial Foundation. As a library, it presents a single abstract data model
- to the calling application for all supported formats. It also comes with a variety of useful commandline utilities for
- data translation and processing."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://download.osgeo.org/gdal/%(version)s/']
-sources = [SOURCELOWER_TAR_XZ]
-patches = ['GDAL-3.0.0_fix-python-CC-CXX.patch']
-checksums = [
-    '630e34141cf398c3078d7d8f08bb44e804c65bbf09807b3610dcbfbc37115cc3',  # gdal-3.3.2.tar.xz
-    # GDAL-3.0.0_fix-python-CC-CXX.patch
-    '223a0ed1afb245527d546bb19e4f80c00f768516ab106d82e53cf36b5a1a2381',
-]
-
-builddependencies = [
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('binutils', '2.37'),
-    ('Python', '3.9.6'),
-    ('netCDF', '4.8.1', '-serial'),
-    ('expat', '2.4.1'),
-    ('GEOS', '3.9.1'),
-    ('SQLite', '3.36'),
-    ('libxml2', '2.9.10'),
-    ('libpng', '1.6.37'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('JasPer', '2.0.33'),
-    ('LibTIFF', '4.3.0'),
-    ('zlib', '1.2.11'),
-    ('cURL', '7.78.0'),
-    ('PCRE', '8.45'),
-    ('PROJ', '8.1.0'),
-    ('libgeotiff', '1.7.0'),
-    ('SciPy-bundle', '2021.10', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('HDF5', '1.12.1', '-serial'),
-    ('HDF', '4.2.15'),
-]
-
-preconfigopts = "sed -e 's/-llapack/\$LIBLAPACK/g' -i.eb configure && "
-configopts = '--with-expat=$EBROOTEXPAT --with-libz=$EBROOTLIBZ'
-configopts += ' --with-hdf5=$EBROOTHDF5 --with-netcdf=$EBROOTNETCDF'
-configopts += ' --with-xml2=yes --with-geos=$EBROOTGEOS/bin/geos-config --with-jpeg=$EBROOTLIBJPEGMINTURBO'
-configopts += ' --with-png=$EBROOTLIBPNG --with-sqlite3=$EBROOTSQLITE --with-jasper=$EBROOTJASPER'
-configopts += ' --with-libtiff=$EBROOTLIBTIFF --with-pcre=$EBROOTPCRE --with-python=$EBROOTPYTHON/bin/python'
-configopts += ' --with-geotiff=$EBROOTLIBGEOTIFF --with-hdf4=$EBROOTHDF'
-
-modextrapaths = {'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages'}
-
-sanity_check_paths = {
-    'files': ['lib/libgdal.a', 'lib/libgdal.%s' % SHLIB_EXT],
-    'dirs': ['bin', 'include', 'lib/python%(pyshortver)s/site-packages']
-}
-
-sanity_check_commands = ["python -c 'import osgeo.gdal'"]
-
-moduleclass = 'data'
diff --git a/Golden_Repo/g/GDB/GDB-11.1-GCCcore-11.2.0.eb b/Golden_Repo/g/GDB/GDB-11.1-GCCcore-11.2.0.eb
deleted file mode 100644
index fe451504a..000000000
--- a/Golden_Repo/g/GDB/GDB-11.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,44 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'GDB'
-version = '11.1'
-
-homepage = 'https://www.gnu.org/software/gdb/gdb.html'
-description = "The GNU Project Debugger"
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [GNU_SOURCE]
-sources = [SOURCELOWER_TAR_XZ]
-checksums = ['cccfcc407b20d343fb320d4a9a2110776dd3165118ffd41f4b1b162340333f94']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('makeinfo', '6.8'),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('libreadline', '8.1'),
-    ('ncurses', '6.2'),
-    ('expat', '2.4.1'),
-    ('Python', '3.9.6'),
-    ('ISL', '0.24'),
-    ('MPC', '1.2.1'),
-]
-
-preconfigopts = "mkdir obj && cd obj && "
-configure_cmd_prefix = '../'
-prebuildopts = "cd obj && "
-preinstallopts = prebuildopts
-
-configopts = '--with-system-zlib --with-system-readline --with-expat=$EBROOTEXPAT '
-configopts += '--with-python=$EBROOTPYTHON/bin/python --with-isl=$EBROOTISL --with-mpc=$EBROOTMPC '
-configopts += '--enable-tui --enable-plugins --disable-install-libbfd '
-
-sanity_check_paths = {
-    'files': ['bin/gdb', 'bin/gdbserver'],
-    'dirs': [],
-}
-
-moduleclass = 'debugger'
diff --git a/Golden_Repo/g/GEOS/GEOS-3.9.1-GCCcore-11.2.0.eb b/Golden_Repo/g/GEOS/GEOS-3.9.1-GCCcore-11.2.0.eb
deleted file mode 100644
index 2f9392b2a..000000000
--- a/Golden_Repo/g/GEOS/GEOS-3.9.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,22 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'GEOS'
-version = '3.9.1'
-
-homepage = 'https://trac.osgeo.org/geos'
-description = """GEOS (Geometry Engine - Open Source) is a C++ port of the Java Topology Suite (JTS)"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://download.osgeo.org/geos/']
-sources = [SOURCELOWER_TAR_BZ2]
-checksums = ['7e630507dcac9dc07565d249a26f06a15c9f5b0c52dd29129a0e3d381d7e382a']
-
-builddependencies = [('binutils', '2.37')]
-
-sanity_check_paths = {
-    'files': ['bin/geos-config', 'lib/libgeos.%s' % SHLIB_EXT, 'lib/libgeos.a', 'include/geos.h'],
-    'dirs': [],
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/g/GL2PS/GL2PS-1.4.2-GCCcore-11.2.0.eb b/Golden_Repo/g/GL2PS/GL2PS-1.4.2-GCCcore-11.2.0.eb
deleted file mode 100644
index 9d99ba96e..000000000
--- a/Golden_Repo/g/GL2PS/GL2PS-1.4.2-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,33 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'GL2PS'
-version = '1.4.2'
-
-homepage = 'https://www.geuz.org/gl2ps/'
-description = """GL2PS: an OpenGL to PostScript printing library"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://geuz.org/gl2ps/src/']
-sources = [SOURCELOWER_TGZ]
-checksums = ['8d1c00c1018f96b4b97655482e57dcb0ce42ae2f1d349cd6d4191e7848d9ffe9']
-
-builddependencies = [
-    ('CMake', '3.21.1'),
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('X11', '20210802'),
-    ('OpenGL', '2021b'),
-    ('freeglut', '3.2.1'),
-    ('libpng', '1.6.37'),
-    ('zlib', '1.2.11'),
-]
-
-sanity_check_paths = {
-    'files': ['include/gl2ps.h', 'lib/libgl2ps.%s' % SHLIB_EXT],
-    'dirs': []
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/g/GLM/GLM-0.9.9.8-GCCcore-11.2.0.eb b/Golden_Repo/g/GLM/GLM-0.9.9.8-GCCcore-11.2.0.eb
deleted file mode 100644
index 2c2e33493..000000000
--- a/Golden_Repo/g/GLM/GLM-0.9.9.8-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'GLM'
-version = '0.9.9.8'
-
-homepage = 'https://github.com/g-truc/glm'
-description = """
-OpenGL Mathematics (GLM) is a header only C++ mathematics library for graphics  
-software based on  the OpenGL Shading Language (GLSL) specifications."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://github.com/g-truc/glm/archive/']
-sources = ['%(version)s.tar.gz']
-patches = [
-    'GLM-0.9.9.8_fix_missing_install.patch',
-]
-checksums = [
-    '7d508ab72cb5d43227a3711420f06ff99b0a0cb63ee2f93631b162bfe1fe9592',  # 0.9.9.8.tar.gz
-    # GLM-0.9.9.8_fix_missing_install.patch
-    '1cc199f9d66679b0b5e9a9fbe20bca0d9b15760fa172ca8759dd15bab35802ca',
-]
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1'),
-]
-
-sanity_check_paths = {
-    'files': [],
-    'dirs': ['include/glm/gtc', 'include/glm/gtx'],
-}
-
-moduleclass = 'lib'
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
deleted file mode 100644
index 13994a378..000000000
--- a/Golden_Repo/g/GLPK/GLPK-5.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,31 +0,0 @@
-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
deleted file mode 100644
index c9f6dab66..000000000
--- a/Golden_Repo/g/GLib/GLib-2.69.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,52 +0,0 @@
-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
deleted file mode 100644
index 53fcb03cd..000000000
--- a/Golden_Repo/g/GMP/GMP-6.2.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,40 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'GMP'
-version = '6.2.1'
-
-homepage = 'https://gmplib.org/'
-description = """
-GMP is a free library for arbitrary precision arithmetic, operating on signed
-integers, rational numbers, and floating point numbers.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'precise': True, 'pic': True}
-
-source_urls = ['https://ftp.gnu.org/gnu/%(namelower)s']
-sources = [SOURCELOWER_TAR_BZ2]
-checksums = ['eae9326beb4158c386e39a356818031bd28f3124cf915f8c5b1dc4c7a36b4d7c']
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('binutils', '2.37'),
-]
-
-# enable C++ interface
-configopts = '--enable-cxx'
-
-# copy libgmp.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 .libs/libgmp.%s* %%(installdir)s/lib && " % SHLIB_EXT
-testopts = " && rm -r %(installdir)s/lib"
-
-runtest = 'check'
-
-sanity_check_paths = {
-    'files': ['lib/lib%s.%s' % (l, e) for l in ['gmp', 'gmpxx'] for e in [SHLIB_EXT, 'a']] +
-             ['include/gmp.h', 'include/gmpxx.h'],
-    'dirs': ['share'],
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/g/GObject-Introspection/GObject-Introspection-1.68.0-GCCcore-11.2.0.eb b/Golden_Repo/g/GObject-Introspection/GObject-Introspection-1.68.0-GCCcore-11.2.0.eb
deleted file mode 100644
index bd4f5b27d..000000000
--- a/Golden_Repo/g/GObject-Introspection/GObject-Introspection-1.68.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,51 +0,0 @@
-easyblock = 'MesonNinja'
-
-name = 'GObject-Introspection'
-version = '1.68.0'
-
-homepage = 'https://gi.readthedocs.io/en/latest/'
-description = """GObject introspection is a middleware layer between C libraries
- (using GObject) and language bindings. The C library can be scanned at
- compile time and generate a metadata file, in addition to the actual
- native C library. Then at runtime, language bindings can read this
- metadata and automatically provide bindings to call into the C library.
-"""
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [FTPGNOME_SOURCE]
-sources = [SOURCELOWER_TAR_XZ]
-checksums = ['d229242481a201b84a0c66716de1752bca41db4133672cfcfb37c93eb6e54a27']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Autotools', '20210726'),
-    ('Meson', '0.58.2'),
-    ('Ninja', '1.10.2'),
-    ('pkg-config', '0.29.2')
-]
-
-dependencies = [
-    ('GLib', '2.69.1'),
-    ('flex', '2.6.4'),
-    ('Bison', '3.7.6'),
-    ('cairo', '1.16.0'),
-    ('libffi', '3.4.2'),
-    ('Python', '3.9.6'),
-]
-
-preconfigopts = "GI_SCANNER_DISABLE_CACHE=true "
-
-modextrapaths = {
-    'GI_TYPELIB_PATH': 'lib64/girepository-1.0',
-    'XDG_DATA_DIRS': 'share',
-}
-
-sanity_check_paths = {
-    'files': ['bin/g-ir-%s' % x for x in ['annotation-tool', 'compiler', 'generate', 'scanner']] +
-             ['lib/libgirepository-1.0.' + SHLIB_EXT],
-    'dirs': ['include', 'share']
-}
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/g/GPAW-setups/GPAW-setups-0.9.9672.eb b/Golden_Repo/g/GPAW-setups/GPAW-setups-0.9.9672.eb
deleted file mode 100644
index 35fa8da70..000000000
--- a/Golden_Repo/g/GPAW-setups/GPAW-setups-0.9.9672.eb
+++ /dev/null
@@ -1,23 +0,0 @@
-easyblock = 'Tarball'
-
-name = 'GPAW-setups'
-version = '0.9.9672'
-
-homepage = 'https://wiki.fysik.dtu.dk/gpaw/'
-description = """PAW setup for the GPAW Density Functional Theory package.  
-Users can install setups manually using 'gpaw install-data' or use setups from this package.  
-The versions of GPAW and GPAW-setups can be intermixed."""
-
-toolchain = SYSTEM
-source_urls = ['https://wiki.fysik.dtu.dk/gpaw-files/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['f0907195df141365cbcc76159b78870e33e45688ac6886640990e153430712ce']
-
-modextrapaths = {'GPAW_SETUP_PATH': ''}
-
-moduleclass = 'chem'
-
-sanity_check_paths = {
-    'files': ['H.LDA.gz'],
-    'dirs': []
-}
diff --git a/Golden_Repo/g/GPAW/GPAW-21.6.0-gpsmkl-2021b.eb b/Golden_Repo/g/GPAW/GPAW-21.6.0-gpsmkl-2021b.eb
deleted file mode 100644
index a5087d2bb..000000000
--- a/Golden_Repo/g/GPAW/GPAW-21.6.0-gpsmkl-2021b.eb
+++ /dev/null
@@ -1,47 +0,0 @@
-easyblock = "PythonPackage"
-
-name = 'GPAW'
-version = '21.6.0'
-
-homepage = 'https://wiki.fysik.dtu.dk/gpaw/'
-description = """GPAW is a density-functional theory (DFT) Python code based on the projector-augmented wave (PAW)
- method and the atomic simulation environment (ASE). It uses real-space uniform grids and multigrid methods or
- atom-centered basis-functions."""
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-# toolchainopts = {'usempi': False, 'openmp': False}
-
-source_urls = [PYPI_LOWER_SOURCE]
-sources = [SOURCELOWER_TAR_GZ]
-patches = [
-    ('GPAW-20.1.0-Add-Easybuild-configuration-files.patch', 1),
-]
-checksums = [
-    '5bb805bf514a7b04e3fdfce6f7864d150032badc5cd2805c57513af982d7a9cc',  # gpaw-21.6.0.tar.gz
-    # GPAW-20.1.0-Add-Easybuild-configuration-files.patch
-    'a12440bf63af70b891a63989b0f048bb8ebf4f60499020ea09259937f04cd042',
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('ASE', '3.22.0'),
-    ('libxc', '5.1.6'),
-    ('libvdwxc', '0.4.0'),
-    ('GPAW-setups', '0.9.9672', '', True),
-]
-
-prebuildopts = 'GPAW_CONFIG=doc/platforms/Linux/EasyBuild/config_foss.py'
-preinstallopts = prebuildopts
-
-download_dep_fail = True
-use_pip = True
-sanity_pip_check = True
-
-sanity_check_paths = {
-    'files': ['bin/gpaw%s' % x for x in ['', '-analyse-basis', '-basis', '-plot-parallel-timings',
-                                         '-runscript', '-setup', '-upfplot']],
-    'dirs': ['lib/python%(pyshortver)s/site-packages']
-}
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/g/GPicView/GPicView-0.2.5-GCCcore-11.2.0.eb b/Golden_Repo/g/GPicView/GPicView-0.2.5-GCCcore-11.2.0.eb
deleted file mode 100644
index ebfb7a3d1..000000000
--- a/Golden_Repo/g/GPicView/GPicView-0.2.5-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'GPicView'
-version = '0.2.5'
-
-homepage = 'http://lxde.sourceforge.net/gpicview'
-description = """GPicView - A Simple and Fast Image Viewer for X"""
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [
-    'https://sourceforge.net/projects/lxde/files/GPicView%20%28image%20Viewer%29/0.2.x/']
-sources = [SOURCELOWER_TAR_XZ]
-checksums = ['38466058e53702450e5899193c4b264339959b563dd5cd81f6f690de32d82942']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('pkg-config', '0.29.2'),
-    ('Perl', '5.34.0'),
-]
-
-dependencies = [
-    ('X11', '20210802'),
-    ('GTK+', '3.24.23'),
-    ('libjpeg-turbo', '2.1.1'),
-]
-
-configopts = '--enable-gtk3 '
-
-sanity_check_paths = {
-    'files': ['bin/gpicview'],
-    'dirs': [],
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/g/GROMACS/GROMACS-2021.4-gpsmkl-2021b-plumed.eb b/Golden_Repo/g/GROMACS/GROMACS-2021.4-gpsmkl-2021b-plumed.eb
deleted file mode 100644
index 57c84d974..000000000
--- a/Golden_Repo/g/GROMACS/GROMACS-2021.4-gpsmkl-2021b-plumed.eb
+++ /dev/null
@@ -1,77 +0,0 @@
-##
-# This file is an EasyBuild reciPY as per https://github.com/easybuilders/easybuild
-#
-# Copyright:: Copyright 2012-2016 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC,
-#                                 Ghent University / The Francis Crick Institute
-# Authors::
-# * Wiktor Jurkowski <wiktor.jurkowski@gmail.com>
-# * Fotis Georgatos <fotis@cern.ch>
-# * George Tsouloupas <g.tsouloupas@cyi.ac.cy>
-# * Kenneth Hoste <kenneth.hoste@ugent.be>
-# * Adam Huffman <adam.huffman@crick.ac.uk>
-# License::   MIT/GPL
-##
-
-name = 'GROMACS'
-version = '2021.4'
-versionsuffix = '-plumed'
-
-homepage = 'http://www.gromacs.org'
-docurls = ['http://manual.gromacs.org/documentation/current/user-guide/index.html',
-           'https://www.plumed.org/doc-v2.7/user-doc/html/index.html']
-description = """
-GROMACS is a versatile package to perform molecular dynamics, i.e. simulate the Newtonian equations
-of motion for systems with hundreds to millions of particles. It is primarily designed for
-biochemical molecules like proteins and lipids that have a lot of complicated bonded interactions,
-but since GROMACS is extremely fast at calculating the non-bonded interactions (that usually
-dominate simulations) many groups are also using it for research on non-biological systems, e.g.
-polymers.
-"""
-usage = """
-Use `gmx` to execute GROMACS commands on a single node, for example, to prepare your run. Use
-`gmx_mpi mdrun` in your job scripts with `srun`. Add `-plumed plumed.dat` to your call to `mdrun`
-to use PLUMED.
-"""
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-toolchainopts = {'openmp': True, 'usempi': True}
-
-source_urls = ['ftp://ftp.gromacs.org/pub/gromacs/']
-sources = [SOURCELOWER_TAR_GZ]
-
-# Fix missing synchronization in GPU code.
-patches = [
-    'GROMACS-2021_add-missing-sync.patch',
-]
-
-checksums = [
-    'cb708a3e3e83abef5ba475fdb62ef8d42ce8868d68f52dafdb6702dc9742ba1d',
-    '52ee257309ff7761c2dd5b26de7dbc63f8ba698082adb88e2843f90e3f9168bf',  # GROMACS-2021_add-missing-sync.patch
-]
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-    ('libxml2', '2.9.10')
-]
-
-dependencies = [
-    ('PLUMED', '2.7.2'),
-    ('hwloc', '2.5.0'),
-    ('CUDA', '11.5', '', SYSTEM),
-]
-
-configopts = '-DCMAKE_PREFIX_PATH=$EBROOTHWLOC -DMPIEXEC_MAX_NUMPROCS="24" '
-configopts += '-DMKL_LIBRARIES="${MKLROOT}/lib/intel64/libmkl_intel_ilp64.so;'
-configopts += '${MKLROOT}/lib/intel64/libmkl_sequential.so;${MKLROOT}/lib/intel64/libmkl_core.so" '
-
-
-mpiexec = 'srun'
-mpiexec_numproc_flag = '"--gres=gpu:1 -n"'
-mpi_numprocs = 24
-
-runtest = False
-
-# Applies PLUMED patch even if version does not match exactly. Use with caution!
-ignore_plumed_version_check = True
-
-moduleclass = 'bio'
diff --git a/Golden_Repo/g/GROMACS/GROMACS-2021.4-gpsmkl-2021b.eb b/Golden_Repo/g/GROMACS/GROMACS-2021.4-gpsmkl-2021b.eb
deleted file mode 100644
index 86da8b06f..000000000
--- a/Golden_Repo/g/GROMACS/GROMACS-2021.4-gpsmkl-2021b.eb
+++ /dev/null
@@ -1,69 +0,0 @@
-##
-# This file is an EasyBuild reciPY as per https://github.com/easybuilders/easybuild
-#
-# Copyright:: Copyright 2012-2016 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC,
-#                                 Ghent University / The Francis Crick Institute
-# Authors::
-# * Wiktor Jurkowski <wiktor.jurkowski@gmail.com>
-# * Fotis Georgatos <fotis@cern.ch>
-# * George Tsouloupas <g.tsouloupas@cyi.ac.cy>
-# * Kenneth Hoste <kenneth.hoste@ugent.be>
-# * Adam Huffman <adam.huffman@crick.ac.uk>
-# License::   MIT/GPL
-##
-
-name = 'GROMACS'
-version = '2021.4'
-
-homepage = 'http://www.gromacs.org'
-docurls = ['http://manual.gromacs.org/documentation/current/user-guide/index.html']
-description = """
-GROMACS is a versatile package to perform molecular dynamics, i.e. simulate the Newtonian equations
-of motion for systems with hundreds to millions of particles. It is primarily designed for
-biochemical molecules like proteins and lipids that have a lot of complicated bonded interactions,
-but since GROMACS is extremely fast at calculating the non-bonded interactions (that usually
-dominate simulations) many groups are also using it for research on non-biological systems, e.g.
-polymers.
-"""
-usage = """
-Use `gmx` to execute GROMACS commands on a single node, for example, to prepare your run. Use
-`gmx_mpi mdrun` in your job scripts with `srun`.
-"""
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-toolchainopts = {'openmp': True, 'usempi': True}
-
-source_urls = ['ftp://ftp.gromacs.org/pub/gromacs/']
-sources = [SOURCELOWER_TAR_GZ]
-
-# Fix missing synchronization in GPU code.
-patches = [
-    'GROMACS-2021_add-missing-sync.patch',
-]
-
-checksums = [
-    'cb708a3e3e83abef5ba475fdb62ef8d42ce8868d68f52dafdb6702dc9742ba1d',
-    '52ee257309ff7761c2dd5b26de7dbc63f8ba698082adb88e2843f90e3f9168bf',  # GROMACS-2021_add-missing-sync.patch
-]
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-    ('libxml2', '2.9.10')
-]
-
-dependencies = [
-    ('hwloc', '2.5.0'),
-    ('CUDA', '11.5', '', SYSTEM),
-]
-
-configopts = '-DCMAKE_PREFIX_PATH=$EBROOTHWLOC -DMPIEXEC_MAX_NUMPROCS="24" '
-configopts += '-DMKL_LIBRARIES="${MKLROOT}/lib/intel64/libmkl_intel_ilp64.so;'
-configopts += '${MKLROOT}/lib/intel64/libmkl_sequential.so;${MKLROOT}/lib/intel64/libmkl_core.so" '
-
-mpiexec = 'srun'
-mpiexec_numproc_flag = '"--gres=gpu:1 -n"'
-mpi_numprocs = 24
-
-runtest = False
-
-moduleclass = 'bio'
diff --git a/Golden_Repo/g/GROMACS/GROMACS-2021_add-missing-sync.patch b/Golden_Repo/g/GROMACS/GROMACS-2021_add-missing-sync.patch
deleted file mode 100644
index 78b6264fe..000000000
--- a/Golden_Repo/g/GROMACS/GROMACS-2021_add-missing-sync.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Add missing sync in LINCS and SETTLE CUDA kernels
-https://gitlab.com/gromacs/gromacs/-/merge_requests/2499
-Patch added to EasyBuild by Simon Branford (University of Birmingham)
-diff --git a/src/gromacs/mdlib/lincs_gpu.cu b/src/gromacs/mdlib/lincs_gpu.cu
-index 27ad86f17f..4964a3d040 100644
---- a/src/gromacs/mdlib/lincs_gpu.cu
-+++ b/src/gromacs/mdlib/lincs_gpu.cu
-@@ -382,11 +382,15 @@ __launch_bounds__(c_maxThreadsPerBlock) __global__
-                             sm_threadVirial[d * blockDim.x + (threadIdx.x + dividedAt)];
-                 }
-             }
--            // Syncronize if not within one warp
-+            // Synchronize if not within one warp
-             if (dividedAt > warpSize / 2)
-             {
-                 __syncthreads();
-             }
-+            else
-+            {
-+                __syncwarp();
-+            }
-         }
-         // First 6 threads in the block add the results of 6 tensor components to the global memory address.
-         if (threadIdx.x < 6)
-diff --git a/src/gromacs/mdlib/settle_gpu.cu b/src/gromacs/mdlib/settle_gpu.cu
-index c02f0d5884..c6ca1e2452 100644
---- a/src/gromacs/mdlib/settle_gpu.cu
-+++ b/src/gromacs/mdlib/settle_gpu.cu
-@@ -352,6 +352,10 @@ __launch_bounds__(c_maxThreadsPerBlock) __global__
-             {
-                 __syncthreads();
-             }
-+            else
-+            {
-+                __syncwarp();
-+            }
-         }
-         // First 6 threads in the block add the 6 components of virial to the global memory address
-         if (tib < 6)
diff --git a/Golden_Repo/g/GSL/GSL-2.7-GCC-11.2.0.eb b/Golden_Repo/g/GSL/GSL-2.7-GCC-11.2.0.eb
deleted file mode 100644
index 7c9005c5f..000000000
--- a/Golden_Repo/g/GSL/GSL-2.7-GCC-11.2.0.eb
+++ /dev/null
@@ -1,25 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'GSL'
-version = '2.7'
-
-homepage = 'https://www.gnu.org/software/gsl/'
-description = """The GNU Scientific Library (GSL) is a numerical library for C and C++ programmers.
- The library provides a wide range of mathematical routines such as random number generators, special functions
- and least-squares fitting."""
-
-toolchain = {'name': 'GCC', 'version': '11.2.0'}
-toolchainopts = {'unroll': True, 'pic': True}
-
-source_urls = [GNU_SOURCE]
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['efbbf3785da0e53038be7907500628b466152dbc3c173a87de1b5eba2e23602b']
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in ['gsl-config', 'gsl-histogram', 'gsl-randist']] +
-             ['include/gsl/gsl_types.h'] +
-             ['lib/lib%s.%s' % (x, SHLIB_EXT) for x in ['gsl', 'gslcblas']],
-    'dirs': [],
-}
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/g/GSL/GSL-2.7-GCCcore-11.2.0.eb b/Golden_Repo/g/GSL/GSL-2.7-GCCcore-11.2.0.eb
deleted file mode 100644
index efd850a31..000000000
--- a/Golden_Repo/g/GSL/GSL-2.7-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,27 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'GSL'
-version = '2.7'
-
-homepage = 'https://www.gnu.org/software/gsl/'
-description = """The GNU Scientific Library (GSL) is a numerical library for C and C++ programmers.
- The library provides a wide range of mathematical routines such as random number generators, special functions
- and least-squares fitting."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'unroll': True, 'pic': True}
-
-builddependencies = [('binutils', '2.37')]
-
-source_urls = [GNU_SOURCE]
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['efbbf3785da0e53038be7907500628b466152dbc3c173a87de1b5eba2e23602b']
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in ['gsl-config', 'gsl-histogram', 'gsl-randist']] +
-             ['include/gsl/gsl_types.h'] +
-             ['lib/lib%s.%s' % (x, SHLIB_EXT) for x in ['gsl', 'gslcblas']],
-    'dirs': [],
-}
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/g/GStreamer/GStreamer-1.18.6-GCCcore-11.2.0.eb b/Golden_Repo/g/GStreamer/GStreamer-1.18.6-GCCcore-11.2.0.eb
deleted file mode 100644
index f23a11eb1..000000000
--- a/Golden_Repo/g/GStreamer/GStreamer-1.18.6-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,74 +0,0 @@
-easyblock = 'Bundle'
-
-name = 'GStreamer'
-version = '1.18.6'
-
-homepage = 'https://gstreamer.freedesktop.org/'
-description = """GStreamer is a library for constructing graphs of media-handling
- components. The applications it supports range from simple
- Ogg/Vorbis playback, audio/video streaming to complex audio
- (mixing) and video (non-linear editing) processing."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Meson', '0.58.2'),
-    ('Ninja', '1.10.2'),
-    ('Bison', '3.7.6'),
-    ('flex', '2.6.4'),
-    ('pkg-config', '0.29.2'),
-    ('CMake', '3.21.1', '', SYSTEM),
-    ('GObject-Introspection', '1.68.0'),
-    ('git', '2.33.1', '-nodocs'),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('GMP', '6.2.1'),
-    ('GSL', '2.7'),
-    ('GLib', '2.69.1'),
-    ('GTK+', '3.24.23'),
-    ('libunwind', '1.5.0'),
-    ('gettext', '0.21'),
-]
-
-default_easyblock = 'MesonNinja'
-
-default_component_specs = {
-    'sources': [SOURCELOWER_TAR_XZ],
-    'start_dir': '%(namelower)s-%(version)s',
-}
-
-components = [
-    (name, version, {
-        'source_urls': ['https://gstreamer.freedesktop.org/src/%(namelower)s'],
-        'checksums': ['4ec816010dd4d3a93cf470ad0a6f25315f52b204eb1d71dfa70ab8a1c3bd06e6'],
-        'configopts': "-Dlibdw=disabled ",
-    }),
-    ('GST-plugins-base', '1.18.6', {
-        'source_urls': ['https://gstreamer.freedesktop.org/src/%(namelower)s'],
-        'checksums': ['56a9ff2fe9e6603b9e658cf6897d412a173d2180829fe01e92568549c6bd0f5b'],
-        'preconfigopts': 'export PKG_CONFIG_PATH="%(installdir)s/lib/pkgconfig:${PKG_CONFIG_PATH}" && ',
-    }),
-    ('GST-plugins-good', '1.18.6', {
-        'source_urls': ['https://gstreamer.freedesktop.org/src/%(namelower)s'],
-        'checksums': ['26723ac01fcb360ade1f41d168c7c322d8af4ceb7e55c8c12ed2690d06a76eed'],
-        'preconfigopts': 'export PKG_CONFIG_PATH="%(installdir)s/lib/pkgconfig:${PKG_CONFIG_PATH}" && ',
-    }),
-    ('GST-plugins-bad', '1.18.6', {
-        'source_urls': ['https://gstreamer.freedesktop.org/src/%(namelower)s'],
-        'checksums': ['0b1b50ac6311f0c510248b6cd64d6d3c94369344828baa602db85ded5bc70ec9'],
-        'preconfigopts': 'export PKG_CONFIG_PATH="%(installdir)s/lib/pkgconfig:${PKG_CONFIG_PATH}" && ',
-    }),
-]
-
-modextrapaths = {'PKG_CONFIG_PATH': 'lib/pkgconfig'}
-
-sanity_check_paths = {
-    'files': ['bin/gst-%s-1.0' % x for x in ['discoverer', 'play', 'device-monitor']] +
-             ['lib/libgst%s-1.0.%s' % (x, SHLIB_EXT) for x in ['app', 'audio', 'video']],
-    'dirs': ['include', 'share']
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/g/GTK+/GTK+-3.24.23-GCCcore-11.2.0.eb b/Golden_Repo/g/GTK+/GTK+-3.24.23-GCCcore-11.2.0.eb
deleted file mode 100644
index 21a018dbc..000000000
--- a/Golden_Repo/g/GTK+/GTK+-3.24.23-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,94 +0,0 @@
-easyblock = 'Bundle'
-
-name = 'GTK+'
-version = '3.24.23'
-
-homepage = 'https://developer.gnome.org/gtk3/stable/'
-description = """GTK+ is the primary library used to construct user interfaces in GNOME. It
- provides all the user interface controls, or widgets, used in a common
- graphical application. Its object-oriented API allows you to construct
- user interfaces without dealing with the low-level details of drawing and
- device interaction.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Autotools', '20210726'),
-    ('GObject-Introspection', '1.68.0'),
-    ('gettext', '0.21'),
-    ('pkg-config', '0.29.2'),
-    ('cairo', '1.16.0'),
-    ('Perl', '5.34.0'),
-    ('Coreutils', '9.0'),
-]
-
-dependencies = [
-    ('ATK', '2.36.0'),
-    ('AT-SPI2-ATK', '2.38.0'),
-    ('Gdk-Pixbuf', '2.42.6'),
-    ('Pango', '1.48.8'),
-    ('X11', '20210802'),
-    ('libepoxy', '1.5.9'),
-    ('zlib', '1.2.11'),
-    ('FriBidi', '1.0.10'),
-    ('X11', '20210802'),  # GDK backend
-    # This installs the SVG loader in Gdk-Pixbuf, which is needed for adwaita
-    ('librsvg', '2.51.2'),
-]
-
-default_easyblock = 'ConfigureMake'
-
-default_component_specs = {
-    'sources': [SOURCELOWER_TAR_XZ],
-    'start_dir': '%(namelower)s-%(version)s',
-}
-
-default_component_specs = {
-    'sources': [SOURCELOWER_TAR_XZ],
-    'start_dir': '%(namelower)s-%(version)s',
-}
-
-components = [
-    (name, version, {
-        'source_urls': [FTPGNOME_SOURCE],
-        'checksums': ['5d864d248357a2251545b3387b35942de5f66e4c66013f0962eb5cb6f8dae2b1'],
-        'configopts': "--disable-silent-rules --disable-glibtest --enable-introspection=yes --disable-visibility ",
-    }),
-    ('hicolor-icon-theme', '0.17', {
-        'source_urls': ['https://icon-theme.freedesktop.org/releases/'],
-        'checksums': ['317484352271d18cbbcfac3868eab798d67fff1b8402e740baa6ff41d588a9d8'],
-    }),
-    ('adwaita-icon-theme', '3.38.0', {
-        'preconfigopts': 'autoreconf -f -i && ',
-        'source_urls': [FTPGNOME_SOURCE],
-        'patches': ['adwaita-icon-theme-3.34.3_disable-svg-conversion.patch'],
-        'checksums': [
-            # adwaita-icon-theme-3.34.3_disable-svg-conversion.patch
-            'f4b86855d50759ecfc1e8f6550ec0f3a7a4ea2c80b9f5fc1685fe8967d1c5342',
-            # adwaita-icon-theme-3.38.0.tar.xz
-            '6683a1aaf2430ccd9ea638dd4bfe1002bc92b412050c3dba20e480f979faaf97',
-        ]
-    }),
-]
-
-postinstallcmds = ['gtk-update-icon-cache']
-
-modextrapaths = {
-    'GI_TYPELIB_PATH': 'lib64/girepository-1.0',
-    'XDG_DATA_DIRS': 'share',
-}
-
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in ['gtk3-demo', 'gtk3-demo-application', 'gtk3-icon-browser', 'gtk3-widget-factory',
-                                     'gtk-builder-tool', 'gtk-launch', 'gtk-query-immodules-3.0', 'gtk-query-settings',
-                                     'gtk-update-icon-cache']] +
-    ['lib/%s-%%(version_major)s.%s' % (x, SHLIB_EXT)
-     for x in ['libgailutil', 'libgdk', 'libgtk']],
-    'dirs': ['include/%s-%%(version_major)s.0' % x for x in ['gail', 'gtk']] +
-            ['share/icons/hicolor', 'share/icons/Adwaita'],
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/g/GTK+/adwaita-icon-theme-3.34.3_disable-svg-conversion.patch b/Golden_Repo/g/GTK+/adwaita-icon-theme-3.34.3_disable-svg-conversion.patch
deleted file mode 100644
index bf0b97f94..000000000
--- a/Golden_Repo/g/GTK+/adwaita-icon-theme-3.34.3_disable-svg-conversion.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-As we don't have SVG support we disable the search for the converter.
-
-Author: Alexander Grund (TU Dresden)
-
-diff -aur a/configure.ac b/configure.ac
---- a/configure.ac	2021-07-16 15:16:15.774630738 +0200
-+++ b/configure.ac	2021-07-16 15:15:10.138814059 +0200
-@@ -49,7 +49,7 @@
- AM_CONDITIONAL(ALLOW_RENDERING, test "x$allow_rendering" = "xyes")
- 
- symbolic_encode_sizes="16x16 24x24 32x32 48x48 64x64 96x96"
--AC_PATH_PROG([GTK_ENCODE_SYMBOLIC_SVG], [gtk-encode-symbolic-svg], [false])
-+GTK_ENCODE_SYMBOLIC_SVG="false"
- if test "x$GTK_ENCODE_SYMBOLIC_SVG" = "xfalse"; then
-    symbolic_encode_sizes=""
- fi
diff --git a/Golden_Repo/g/GTS/GTS-0.7.6-GCCcore-11.2.0.eb b/Golden_Repo/g/GTS/GTS-0.7.6-GCCcore-11.2.0.eb
deleted file mode 100644
index d7ceb0709..000000000
--- a/Golden_Repo/g/GTS/GTS-0.7.6-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,32 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'GTS'
-version = '0.7.6'
-
-homepage = 'http://gts.sourceforge.net/'
-description = """GTS stands for the GNU Triangulated Surface Library.
-It is an Open Source Free Software Library intended to provide a set of useful
-functions to deal with 3D surfaces meshed with interconnected triangles.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [SOURCEFORGE_SOURCE]
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['059c3e13e3e3b796d775ec9f96abdce8f2b3b5144df8514eda0cc12e13e8b81e']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('GLib', '2.69.1'),
-]
-
-sanity_check_paths = {
-    'files': ['lib/libgts.%s' % SHLIB_EXT, 'bin/gts2oogl', 'bin/gtscheck'],
-    'dirs': []
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.6-GCCcore-11.2.0.eb b/Golden_Repo/g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.6-GCCcore-11.2.0.eb
deleted file mode 100644
index c8cb7ee27..000000000
--- a/Golden_Repo/g/Gdk-Pixbuf/Gdk-Pixbuf-2.42.6-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,43 +0,0 @@
-easyblock = 'MesonNinja'
-
-name = 'Gdk-Pixbuf'
-version = '2.42.6'
-
-homepage = 'https://developer.gnome.org/gdk-pixbuf/stable/'
-description = """
- The Gdk Pixbuf is a toolkit for image loading and pixel buffer manipulation.
- It is used by GTK+ 2 and GTK+ 3 to load and manipulate images. In the past it
- was distributed as part of GTK+ 2 but it was split off into a separate package
- in preparation for the change to GTK+ 3.
- """
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [FTPGNOME_SOURCE]
-sources = [SOURCELOWER_TAR_XZ]
-checksums = ['c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('GObject-Introspection', '1.68.0'),
-    ('Meson', '0.58.2'),
-    ('Ninja', '1.10.2'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('GLib', '2.69.1'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('libpng', '1.6.37'),
-    ('LibTIFF', '4.3.0'),
-]
-
-configopts = '-Ddefault_library=both -Dgio_sniffing=false -Dman=false'
-
-modextrapaths = {
-    'GI_TYPELIB_PATH': 'lib64/girepository-1.0',
-    'XDG_DATA_DIRS': 'share',
-}
-
-moduleclass = 'vis'
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
deleted file mode 100644
index 214efb398..000000000
--- a/Golden_Repo/g/Ghostscript/Ghostscript-9.54.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,59 +0,0 @@
-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.1.1'),
-    ('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/Go/Go-1.17.3.eb b/Golden_Repo/g/Go/Go-1.17.3.eb
deleted file mode 100644
index bc03da2a2..000000000
--- a/Golden_Repo/g/Go/Go-1.17.3.eb
+++ /dev/null
@@ -1,30 +0,0 @@
-easyblock = 'Tarball'
-
-name = 'Go'
-version = '1.17.3'
-
-homepage = 'https://www.golang.org'
-description = """Go is an open source programming language that makes it easy to build
- simple, reliable, and efficient software."""
-
-toolchain = SYSTEM
-
-source_urls = ['https://storage.googleapis.com/golang/']
-
-local_archs = {'aarch64': 'arm64', 'x86_64': 'amd64'}
-sources = ['go%%(version)s.linux-%s.tar.gz' % local_archs[ARCH]]
-checksums = [{
-    'go%(version)s.linux-amd64.tar.gz': '550f9845451c0c94be679faf116291e7807a8d78b43149f9506c1b15eb89008c',
-    'go%(version)s.linux-arm64.tar.gz': '06f505c8d27203f78706ad04e47050b49092f1b06dc9ac4fbee4f0e4d015c8d4',
-}]
-
-sanity_check_paths = {
-    'files': ['bin/go', 'bin/gofmt'],
-    'dirs': ['api', 'doc', 'lib', 'pkg'],
-}
-
-sanity_check_commands = ["go help"]
-
-modextravars = {'GOROOT': '%(installdir)s'}
-
-moduleclass = 'compiler'
diff --git a/Golden_Repo/g/Grace/Grace-5.1.25-GCCcore-11.2.0.eb b/Golden_Repo/g/Grace/Grace-5.1.25-GCCcore-11.2.0.eb
deleted file mode 100644
index e5f916ac6..000000000
--- a/Golden_Repo/g/Grace/Grace-5.1.25-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'Grace'
-version = '5.1.25'
-
-homepage = 'http://freecode.com/projects/grace'
-description = 'Grace is a WYSIWYG 2D plotting tool for X Windows System and Motif.'
-
-source_urls = ['ftp://plasma-gate.weizmann.ac.il/pub/grace/src/stable']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['751ab9917ed0f6232073c193aba74046037e185d73b77bab0f5af3e3ff1da2ac']
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('pkg-config',  '0.29.2'),
-]
-
-dependencies = [
-    ('motif', '2.3.8'),
-    ('libpng', '1.6.37'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('X11', '20210802'),
-]
-
-configopts = "--enable-grace-home='$(PREFIX)'"
-
-runtest = 'tests'
-
-sanity_check_paths = {
-    'files': ['bin/xmgrace'],
-    'dirs': [],
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/g/GraphicsMagick/GraphicsMagick-1.3.36-GCCcore-11.2.0.eb b/Golden_Repo/g/GraphicsMagick/GraphicsMagick-1.3.36-GCCcore-11.2.0.eb
deleted file mode 100644
index fc9fa6194..000000000
--- a/Golden_Repo/g/GraphicsMagick/GraphicsMagick-1.3.36-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,53 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'GraphicsMagick'
-version = '1.3.36'
-
-homepage = 'http://www.graphicsmagick.org/'
-description = """GraphicsMagick is the swiss army knife of image processing."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [
-    SOURCEFORGE_SOURCE,
-    'ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/%(version_major_minor)s/',
-]
-sources = [SOURCE_TAR_GZ]
-patches = [
-    'GraphicsMagick_pkgconfig_libtiff.patch'
-]
-checksums = [
-    # GraphicsMagick-1.3.36.tar.gz
-    '1e6723c48c4abbb31197fadf8396b2d579d97e197123edc70a4f057f0533d563',
-    # GraphicsMagick_pkgconfig_libtiff.patch
-    '25b4c5361f30e23c809a078ac4b26e670d2b8341496323480037e2095d969294',
-]
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Autotools', '20210726'),
-]
-
-dependencies = [
-    ('X11', '20210802'),
-    ('bzip2', '1.0.8'),
-    ('freetype', '2.11.0'),
-    ('libpng', '1.6.37'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('LibTIFF', '4.3.0'),
-    ('libxml2', '2.9.10'),
-    ('XZ', '5.2.5'),
-    ('zlib', '1.2.11'),
-    ('Ghostscript', '9.54.0'),
-]
-
-modextrapaths = {'CPATH': ['include/GraphicsMagick']}
-
-sanity_check_paths = {
-    'files': ['bin/gm', 'lib/libGraphicsMagick.a', 'lib/libGraphicsMagick++.a',
-              'lib/libGraphicsMagickWand.a'],
-    'dirs': ['include/GraphicsMagick', 'lib/pkgconfig'],
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/g/Graphviz/Graphviz-2.49.3-GCCcore-11.2.0.eb b/Golden_Repo/g/Graphviz/Graphviz-2.49.3-GCCcore-11.2.0.eb
deleted file mode 100644
index 14eb9a116..000000000
--- a/Golden_Repo/g/Graphviz/Graphviz-2.49.3-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,91 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'Graphviz'
-version = '2.49.3'
-local_pyver_major = '3'
-
-homepage = 'https://www.graphviz.org/'
-description = """Graphviz is open source graph visualization software. Graph visualization
- is a way of representing structural information as diagrams of
- abstract graphs and networks. It has important applications in networking,
- bioinformatics,  software engineering, database and web design, machine learning,
- and in visual interfaces for other technical domains."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'cstd': 'c++11'}
-
-source_urls = ['https://gitlab.com/graphviz/graphviz/-/archive/%(version)s']
-sources = [SOURCELOWER_TAR_GZ]
-
-checksums = [
-    # graphviz-2.49.3.tar.gz
-    '5801664769ab88c2fb8ccb6ab0957cceabe6d4632b193041440e97790f53a9df',
-]
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('binutils', '2.37'),
-    ('Bison', '3.7.6'),
-    ('flex', '2.6.4'),
-    ('SWIG', '4.0.2'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('Java', '15', '', True),
-    ('Python', '3.9.6'),
-    ('FriBidi', '1.0.10'),
-    ('Gdk-Pixbuf', '2.42.6'),
-    ('Ghostscript', '9.54.0'),
-    ('GTS', '0.7.6'),
-    ('libgd', '2.3.1'),
-    ('Pango', '1.48.8'),
-    ('Perl', '5.34.0'),
-    ('Qt5', '5.15.2'),
-    ('Tcl', '8.6.11'),
-    ('zlib', '1.2.11'),
-]
-
-preconfigopts = './autogen.sh NOCONFIG && '
-
-configopts = '--enable-python%s=yes ' % local_pyver_major
-configopts += '--enable-guile=no --enable-lua=no --enable-ocaml=no '
-configopts += '--enable-r=no --enable-ruby=no --enable-php=no '
-# Use ltdl from libtool in EB
-configopts += '--enable-ltdl --without-included-ltdl --disable-ltdl-install '
-configopts += '--with-ltdl-include=$EBROOTLIBTOOL/include --with-ltdl-lib=$EBROOTLIBTOOL/lib '
-# Override the hardcoded paths to Java libraries
-configopts += '--with-javaincludedir=$JAVA_HOME/include --with-javaincludedir=$JAVA_HOME/include/linux '
-configopts += '--with-javalibdir=$JAVA_HOME/lib '
-configopts += '--enable-lefty '
-
-prebuildopts = 'qmake -o cmd/gvedit/qMakefile cmd/gvedit/gvedit.pro && '
-
-postinstallcmds = ['%(installdir)s/bin/dot -c']  # Writes plugin configuration
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in ['acyclic', 'bcomps', 'ccomps', 'cluster', 'diffimg', 'dijkstra', 'dot',
-                                     'dot_builtins', 'dotty', 'edgepaint', 'gc', 'gml2gv', 'graphml2gv', 'gv2gml',
-                                     'gvcolor', 'gvedit', 'gvgen', 'gvmap', 'gvmap.sh', 'gvpack', 'gvpr', 'gxl2gv',
-                                     'lefty', 'lneato', 'mm2gv', 'nop', 'prune', 'sccmap', 'tred', 'unflatten',
-                                     'vimdot']] +
-    ['lib/%s.%s' % (x, SHLIB_EXT) for x in ['libcdt', 'libcgraph', 'libgvc', 'libgvpr', 'liblab_gamut',
-                                            'libpathplan', 'libxdot']],
-    'dirs': ['include', 'lib/graphviz', 'lib/graphviz/java', 'lib/graphviz/python%s' % local_pyver_major,
-             'lib/pkgconfig', 'share']
-}
-
-sanity_check_commands = [
-    ("test ! -d $EBROOTTCL/lib/*/graphviz", ''),
-    ("test ! -d $EBROOTTCL/lib64/*/graphviz", ''),
-    ('python', '-c "import gv"'),
-]
-
-modextrapaths = {
-    'CLASSPATH': 'lib/graphviz/java',
-    'LD_LIBRARY_PATH': 'lib/graphviz/java',
-    'PYTHONPATH': 'lib/graphviz/python%s' % local_pyver_major,
-    'TCLLIBPATH': 'lib/graphviz/tcl',
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/g/GtkSourceView/GtkSourceView-4.4.0-GCCcore-11.2.0.eb b/Golden_Repo/g/GtkSourceView/GtkSourceView-4.4.0-GCCcore-11.2.0.eb
deleted file mode 100644
index e1b725295..000000000
--- a/Golden_Repo/g/GtkSourceView/GtkSourceView-4.4.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,43 +0,0 @@
-easyblock = 'MesonNinja'
-
-name = 'GtkSourceView'
-version = '4.4.0'
-
-homepage = 'https://wiki.gnome.org/Projects/GtkSourceView'
-description = """
- GtkSourceView is a portable C library that extends the standard GTK+ framework for multiline text editing with support
- for configurable syntax highlighting, unlimited undo/redo, search and replace, a completion framework, printing and
- other features typical of a source code editor.
- """
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [FTPGNOME_SOURCE]
-sources = [SOURCELOWER_TAR_XZ]
-checksums = ['9ddb914aef70a29a66acd93b4f762d5681202e44094d2d6370e51c9e389e689a']
-
-builddependencies = [
-    ('Meson', '0.58.2'),
-    ('Ninja', '1.10.2'),
-    ('binutils', '2.37'),
-    ('pkg-config', '0.29.2'),
-    ('GObject-Introspection', '1.68.0'),
-]
-
-dependencies = [
-    ('GLib', '2.69.1'),
-    ('GTK+', '3.24.23'),
-    ('libxml2', '2.9.10'),
-    ('FriBidi', '1.0.10'),
-]
-
-configopts = "--buildtype=release "
-configopts += "-Dgir=true -Dvapi=false "
-
-
-sanity_check_paths = {
-    'files': ['lib/lib%%(namelower)s-%%(version_major)s.%s' % SHLIB_EXT],
-    'dirs': ['include/%(namelower)s-%(version_major)s', 'share'],
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/g/g2clib/g2clib-1.6.3-GCCcore-11.2.0.eb b/Golden_Repo/g/g2clib/g2clib-1.6.3-GCCcore-11.2.0.eb
deleted file mode 100644
index 3977d898c..000000000
--- a/Golden_Repo/g/g2clib/g2clib-1.6.3-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,24 +0,0 @@
-name = 'g2clib'
-version = '1.6.3'
-
-homepage = 'https://www.nco.ncep.noaa.gov/pmb/codes/GRIB2/'
-description = """Library contains GRIB2 encoder/decoder ('C' version)."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [homepage]
-sources = ['%(name)s-%(version)s.tar']
-checksums = ['83e4f2061b3d4a8bd431ba860dda8c5cf103b25f42d265b7b724b9acafad177c']
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [
-    ('JasPer', '2.0.33'),
-    ('libpng', '1.6.37'),
-]
-
-# parallel build tends to fail
-parallel = 1
-
-moduleclass = 'data'
diff --git a/Golden_Repo/g/g2lib/fix_makefile.patch b/Golden_Repo/g/g2lib/fix_makefile.patch
deleted file mode 100644
index f927e114d..000000000
--- a/Golden_Repo/g/g2lib/fix_makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- makefile.orig	2012-03-27 17:04:20.546991277 +0200
-+++ makefile	2012-03-27 17:03:34.706930120 +0200
-@@ -111,7 +111,7 @@
- CPP=cpp -P -C
- MODDIR=.
- CFLAGS=-O3 $(DEFS) $(INCDIR)
--FFLAGS=-O3 -g -I $(MODDIR)
-+FFLAGS=-O3 -g -I$(MODDIR)
- 
- #
- #--------------------------------------
diff --git a/Golden_Repo/g/g2lib/g2lib-3.1.0-kind.patch b/Golden_Repo/g/g2lib/g2lib-3.1.0-kind.patch
deleted file mode 100644
index c808bc39d..000000000
--- a/Golden_Repo/g/g2lib/g2lib-3.1.0-kind.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-# Fix kind of arguments used in iand
-# S.D. Pinches, 30.08.2020
-diff -Nru g2lib-3.1.0-orig/intmath.f g2lib-3.1.0/intmath.f
---- g2lib-3.1.0-orig/intmath.f	2017-06-12 21:38:08.000000000 +0200
-+++ g2lib-3.1.0/intmath.f	2020-08-30 18:24:35.724869000 +0200
-@@ -84,7 +84,7 @@
-       ilog2_8=0
-       i=i_in
-       if(i<=0) return
--      if(iand(i,i-1)/=0) then
-+      if(iand(i,i-1_8)/=0) then
-          !write(0,*) 'iand i-1'
-          ilog2_8=1
-       endif
-@@ -129,7 +129,7 @@
-       ilog2_4=0
-       i=i_in
-       if(i<=0) return
--      if(iand(i,i-1)/=0) then
-+      if(iand(i,i-1_4)/=0) then
-          !write(0,*) 'iand i-1'
-          ilog2_4=1
-       endif
-@@ -169,7 +169,7 @@
-       ilog2_2=0
-       i=i_in
-       if(i<=0) return
--      if(iand(i,i-1)/=0) then
-+      if(iand(i,i-1_2)/=0) then
-          !write(0,*) 'iand i-1'
-          ilog2_2=1
-       endif
-@@ -204,7 +204,7 @@
-       ilog2_1=0
-       i=i_in
-       if(i<=0) return
--      if(iand(i,i-1)/=0) then
-+      if(iand(i,i-1_1)/=0) then
-          !write(0,*) 'iand i-1'
-          ilog2_1=1
-       endif
diff --git a/Golden_Repo/g/g2lib/g2lib-3.1.0_makefile.patch b/Golden_Repo/g/g2lib/g2lib-3.1.0_makefile.patch
deleted file mode 100644
index 59a1c2ea4..000000000
--- a/Golden_Repo/g/g2lib/g2lib-3.1.0_makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-fix order of compilation in makefile
-Author: Samuel Moors, Vrije Universiteit Brussel (VUB)
-diff -ur g2lib-3.1.0.orig/makefile g2lib-3.1.0/makefile
---- g2lib-3.1.0.orig/makefile	2017-06-12 21:39:43.000000000 +0200
-+++ g2lib-3.1.0/makefile	2019-03-28 14:50:24.070862781 +0100
-@@ -134,6 +134,7 @@
- .SUFFIXES: .a .f .F .c
- 
- $(LIB):	$(LIB)(gridtemplates.o) \
-+	$(LIB)(intmath.o) \
- 	$(LIB)(pdstemplates.o) \
- 	$(LIB)(drstemplates.o) \
- 	$(LIB)(gribmod.o) \
-@@ -196,7 +197,6 @@
- 	$(LIB)(params.o) \
-         $(LIB)(params_ecmwf.o) \
- 	$(LIB)(getidx.o) \
--        $(LIB)(intmath.o) \
- 	$(LIB)(gdt2gds.o)
- 
- .F.f:
diff --git a/Golden_Repo/g/g2lib/g2lib-3.2.0-GCCcore-11.2.0.eb b/Golden_Repo/g/g2lib/g2lib-3.2.0-GCCcore-11.2.0.eb
deleted file mode 100644
index 3ec4970e8..000000000
--- a/Golden_Repo/g/g2lib/g2lib-3.2.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,33 +0,0 @@
-name = 'g2lib'
-version = '3.2.0'
-
-homepage = 'https://www.nco.ncep.noaa.gov/pmb/codes/GRIB2/'
-description = """Library contains GRIB2 encoder/decoder and search/indexing routines."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [homepage]
-sources = ['%(name)s-%(version)s.tar']
-patches = [
-    '%(name)s-%(version)s_makefile.patch',
-]
-checksums = [
-    '9d3866de32e13e80798bfb08dbbea9223f32cec3fce3c57b6838e76f27d5a1d3',  # g2lib-3.2.0.tar
-    # g2lib-3.2.0_makefile.patch
-    'e434394a6ec8bd68dbd57e3fdb44c47372b07380e362ed955bb038b78dd81812',
-]
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [
-    ('JasPer', '2.0.33'),
-    ('libpng', '1.6.37'),
-]
-
-buildopts = 'CFLAGS="$CFLAGS -DLINUXG95 -D__64BIT__" FC=$FC CC=$CC '
-buildopts += 'FFLAGS="$FFLAGS -fno-range-check -fallow-invalid-boz -fallow-argument-mismatch -I."'
-
-# parallel build tends to fail
-parallel = 1
-
-moduleclass = 'data'
diff --git a/Golden_Repo/g/g2lib/g2lib-3.2.0_makefile.patch b/Golden_Repo/g/g2lib/g2lib-3.2.0_makefile.patch
deleted file mode 100644
index 1841fa47e..000000000
--- a/Golden_Repo/g/g2lib/g2lib-3.2.0_makefile.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-# Author: maxim-masterov (SURF)
-# Based on: g2lib-3.1.0_makefile.patch by Samuel Moors (VUB)
-# Fixes order of compilation and indentation in the makefile
-diff -Nru g2lib-3.2.0.orig/makefile g2lib-3.2.0/makefile
---- g2lib-3.2.0.orig/makefile	2021-08-20 11:12:18.401270276 +0200
-+++ g2lib-3.2.0/makefile	2021-08-20 11:16:07.212439526 +0200
-@@ -171,6 +171,7 @@
- .SUFFIXES: .a .f .F .c
- 
- $(LIB):	$(LIB)(gridtemplates.o) \
-+	$(LIB)(intmath.o) \
- 	$(LIB)(pdstemplates.o) \
- 	$(LIB)(drstemplates.o) \
- 	$(LIB)(gribmod.o) \
-@@ -182,7 +183,6 @@
- 	$(LIB)(gb_info.o) \
- 	$(LIB)(gf_getfld.o) \
- 	$(LIB)(gf_free.o) \
--        $(LIB)(intmath.o) \
- 	$(LIB)(gf_unpack1.o) \
- 	$(LIB)(gf_unpack2.o) \
- 	$(LIB)(gf_unpack3.o) \
-@@ -217,7 +217,7 @@
- 	$(LIB)(pngunpack.o) \
- 	$(LIB)(enc_png.o) \
- 	$(LIB)(dec_png.o) \
--        $(LIB)(mova2i.o) \
-+	$(LIB)(mova2i.o) \
- 	$(LIB)(g2_gbytesc.o) \
- 	$(LIB)(skgb.o) \
- 	$(LIB)(ixgb2.o) \
-@@ -232,7 +232,7 @@
- 	$(LIB)(putgb2.o) \
- 	$(LIB)(g2grids.o) \
- 	$(LIB)(params.o) \
--        $(LIB)(params_ecmwf.o) \
-+	$(LIB)(params_ecmwf.o) \
- 	$(LIB)(getidx.o) \
- 	$(LIB)(gdt2gds.o)
- 
diff --git a/Golden_Repo/g/gc/gc-8.2.0-GCCcore-11.2.0.eb b/Golden_Repo/g/gc/gc-8.2.0-GCCcore-11.2.0.eb
deleted file mode 100644
index 5812b73e8..000000000
--- a/Golden_Repo/g/gc/gc-8.2.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,44 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'gc'
-version = '8.2.0'
-local_libatomic_version = '7.6.12'
-
-homepage = 'https://hboehm.info/gc/'
-description = """The Boehm-Demers-Weiser conservative garbage collector can be used as a
-garbage collecting replacement for C malloc or C++ new.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [
-    # preferred for gc-%(version)s.tar.gz
-    'https://github.com/ivmai/bdwgc/releases/download/v%(version)s/',
-    'https://hboehm.info/gc/gc_source/',  # alternate for gc-%(version)s.tar.gz
-    'https://github.com/ivmai/libatomic_ops/releases/download/v%s/' % local_libatomic_version,
-]
-sources = [
-    SOURCE_TAR_GZ,
-    'libatomic_ops-%s.tar.gz' % local_libatomic_version,
-]
-checksums = [
-    '2540f7356cb74f6c5b75326c6d38a066edd796361fd7d4ed26e494d9856fed8f',  # gc-8.2.0.tar.gz
-    # libatomic_ops-7.6.12.tar.gz
-    'f0ab566e25fce08b560e1feab6a3db01db4a38e5bc687804334ef3920c549f3e',
-]
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-preconfigopts = 'ln -s %(builddir)s/libatomic_ops*/ libatomic_ops && '
-
-configopts = "--enable-static"
-
-sanity_check_paths = {
-    'files': ['include/gc.h', 'lib/libcord.a', 'lib/libcord.%s' % SHLIB_EXT,
-              'lib/libgc.a', 'lib/libgc.%s' % SHLIB_EXT],
-    'dirs': ['include/gc', 'share'],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/g/gcccoremkl/gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/g/gcccoremkl/gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index ce0fb67c3..000000000
--- a/Golden_Repo/g/gcccoremkl/gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,26 +0,0 @@
-easyblock = "Toolchain"
-
-local_mklver = '2021.4.0'
-local_comp_version = '11.2.0'
-name = 'gcccoremkl'
-version = '%s-%s' % (local_comp_version, local_mklver)
-
-homepage = '(none)'
-description = """GCCcore compiler toolchain with MKL"""
-
-
-toolchain = SYSTEM
-
-local_comp_name = 'GCCcore'
-local_comp = (local_comp_name, local_comp_version)
-
-# compiler toolchain dependencies
-dependencies = [
-    local_comp,
-    ('binutils', '2.37', '', local_comp),
-    ('imkl', local_mklver, '', SYSTEM),
-]
-
-hiddendependencies = [('imkl', local_mklver, '', SYSTEM)]
-
-moduleclass = 'toolchain'
diff --git a/Golden_Repo/g/gettext/gettext-0.21-GCCcore-11.2.0.eb b/Golden_Repo/g/gettext/gettext-0.21-GCCcore-11.2.0.eb
deleted file mode 100644
index 08dfde31e..000000000
--- a/Golden_Repo/g/gettext/gettext-0.21-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'gettext'
-version = '0.21'
-
-homepage = 'https://www.gnu.org/software/gettext/'
-description = """GNU 'gettext' is an important step for the GNU Translation Project, as it is an asset on which we may
-build many other steps. This package offers to programmers, translators, and even users, a well integrated set of tools
-and documentation"""
-
-site_contacts = 'sc@fz-juelich.de'
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [GNU_SOURCE]
-sources = [SOURCE_TAR_GZ]
-checksums = ['c77d0da3102aec9c07f43671e60611ebff89a996ef159497ce8e59d075786b12']
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [
-    ('libxml2', '2.9.10'),
-    ('ncurses', '6.2'),
-]
-
-configopts = '--without-emacs --with-libxml2-prefix=$EBROOTLIBXML2'
-
-sanity_check_paths = {
-    'files': ['bin/gettext', 'lib/libasprintf.a', 'lib/libasprintf.%s' % SHLIB_EXT,
-              'lib/libgettextpo.a', 'lib/libgettextpo.%s' % SHLIB_EXT],
-    'dirs': ['include'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/g/gettext/gettext-0.21.eb b/Golden_Repo/g/gettext/gettext-0.21.eb
deleted file mode 100644
index 4fba60811..000000000
--- a/Golden_Repo/g/gettext/gettext-0.21.eb
+++ /dev/null
@@ -1,40 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'gettext'
-version = '0.21'
-
-homepage = 'https://www.gnu.org/software/gettext/'
-description = """GNU 'gettext' is an important step for the GNU Translation Project, as it is an asset on which we may
-build many other steps. This package offers to programmers, translators, and even users, a well integrated set of tools
-and documentation"""
-
-site_contacts = 'sc@fz-juelich.de'
-
-# This is a basic stripped down version of gettext without any
-# dependencies on other packages used as initial builddep for XZ
-# It is the first step in the cyclic dependency chain of
-# XZ -> libxml2 -> gettext -> XZ
-
-toolchain = SYSTEM
-
-source_urls = [GNU_SOURCE]
-sources = [SOURCE_TAR_GZ]
-checksums = ['c77d0da3102aec9c07f43671e60611ebff89a996ef159497ce8e59d075786b12']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('ncurses', '6.2'),
-]
-
-configopts = '--without-emacs --with-included-libxml --without-xz --without-bzip2'
-
-sanity_check_paths = {
-    'files': ['bin/gettext', 'lib/libasprintf.a', 'lib/libasprintf.%s' % SHLIB_EXT,
-              'lib/libgettextpo.a', 'lib/libgettextpo.%s' % SHLIB_EXT],
-    'dirs': ['include'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/g/gflags/gflags-2.2.2-GCCcore-11.2.0.eb b/Golden_Repo/g/gflags/gflags-2.2.2-GCCcore-11.2.0.eb
deleted file mode 100644
index be6c325ca..000000000
--- a/Golden_Repo/g/gflags/gflags-2.2.2-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,35 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'gflags'
-version = '2.2.2'
-
-homepage = 'https://gflags.github.io/gflags'
-description = """
-The gflags package contains a C++ library that implements commandline flags
-processing.  It includes built-in support for standard types such as string
-and the ability to define flags in the source file in which they are used.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/gflags/gflags/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['34af2f15cf7367513b352bdcd2493ab14ce43692d2dcd9dfc499492966c64dcf']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1'),
-]
-
-configopts = '-DBUILD_SHARED_LIBS=on -DBUILD_STATIC_LIBS=on'
-
-sanity_check_paths = {
-    'files': ['bin/gflags_completions.sh'] +
-             ['lib/%s' % x for x in ['libgflags.%s' % SHLIB_EXT, 'libgflags_nothreads.%s' % SHLIB_EXT,
-                                     'libgflags.a', 'libgflags_nothreads.a']] +
-             ['include/gflags/gflags_completions.h'],
-    'dirs': [],
-}
-
-moduleclass = 'devel'
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
deleted file mode 100644
index 340aaeaf3..000000000
--- a/Golden_Repo/g/giflib/giflib-5.2.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,28 +0,0 @@
-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/git-lfs/git-lfs-2.11.0.eb b/Golden_Repo/g/git-lfs/git-lfs-2.11.0.eb
deleted file mode 100644
index 1e7834749..000000000
--- a/Golden_Repo/g/git-lfs/git-lfs-2.11.0.eb
+++ /dev/null
@@ -1,29 +0,0 @@
-easyblock = 'MakeCp'
-
-name = 'git-lfs'
-version = '2.11.0'
-
-homepage = 'https://git-lfs.github.com'
-description = """Git Large File Storage (LFS) replaces large files such as audio
- samples, videos, datasets, and graphics with text pointers inside Git, while 
- storing the file contents on a remote server like GitHub.com"""
-
-toolchain = SYSTEM
-
-github_account = name
-source_urls = [GITHUB_SOURCE]
-sources = ['v%(version)s.tar.gz']
-checksums = ['8183c4cbef8cf9c2e86b0c0a9822451e2df272f89ceb357c498bfdf0ff1b36c7']
-
-builddependencies = [('Go', '1.17.3')]
-
-files_to_copy = [(['bin/%(name)s'], 'bin')]
-
-sanity_check_paths = {
-    'files': ['bin/git-lfs'],
-    'dirs': [],
-}
-
-sanity_check_commands = [('git-lfs', '--version')]
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/g/git/git-2.33.1-GCCcore-11.2.0-nodocs.eb b/Golden_Repo/g/git/git-2.33.1-GCCcore-11.2.0-nodocs.eb
deleted file mode 100644
index ed7c62fbd..000000000
--- a/Golden_Repo/g/git/git-2.33.1-GCCcore-11.2.0-nodocs.eb
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-# Author:    Robert Mijakovic <robert.mijakovic@lxp.lu>
-##
-# updated to 2.33.1
-# J. Sassmannshausen / GSTT
-
-easyblock = 'ConfigureMake'
-
-name = 'git'
-version = '2.33.1'
-versionsuffix = '-nodocs'
-
-homepage = 'https://git-scm.com/'
-description = """Git is a free and open source distributed version control system designed
-to handle everything from small to very large projects with speed and efficiency."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://github.com/git/git/archive']
-sources = ['v%(version)s.tar.gz']
-checksums = ['fa459f95153a2c51af149c062f614018c027caf75a8dd92b3f64defe0a78f42f']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Autotools', '20210726'),
-]
-
-dependencies = [
-    ('cURL', '7.78.0'),
-    ('expat', '2.4.1'),
-    ('gettext', '0.21'),
-    ('Perl', '5.34.0'),
-    ('OpenSSL', '1.1', '', True),
-]
-
-preconfigopts = 'make configure && '
-
-# Work around git build system bug.  If LIBS contains -lpthread, then configure
-# will not append -lpthread to LDFLAGS, but Makefile ignores LIBS.
-configopts = "--with-perl=${EBROOTPERL}/bin/perl --enable-pthreads='-lpthread'"
-
-sanity_check_paths = {
-    'files': ['bin/git'],
-    'dirs': ['libexec/git-core', 'share'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/g/glog/glog-0.5.0-GCCcore-11.2.0.eb b/Golden_Repo/g/glog/glog-0.5.0-GCCcore-11.2.0.eb
deleted file mode 100644
index 842305bc1..000000000
--- a/Golden_Repo/g/glog/glog-0.5.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,33 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'glog'
-version = '0.5.0'
-
-homepage = 'https://github.com/google/glog'
-description = "A C++ implementation of the Google logging module."
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'cstd': 'c++11'}
-
-source_urls = ['https://github.com/google/glog/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['eede71f28371bf39aa69b45de23b329d37214016e2055269b3b5e7cfd40b59f5']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1', '', SYSTEM)
-]
-
-dependencies = [
-    ('gflags', '2.2.2'),
-    ('libunwind', '1.5.0'),
-]
-
-configopts = '-DBUILD_SHARED_LIBS=ON '
-
-sanity_check_paths = {
-    'files': ['include/glog/logging.h', 'include/glog/raw_logging.h', 'lib/libglog.%s' % SHLIB_EXT],
-    'dirs': [],
-}
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/g/gmpy2/gmpy2-2.1.0b5-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/g/gmpy2/gmpy2-2.1.0b5-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index b3e2567fa..000000000
--- a/Golden_Repo/g/gmpy2/gmpy2-2.1.0b5-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,25 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'gmpy2'
-version = '2.1.0b5'
-
-homepage = 'https://github.com/aleaxit/gmpy'
-description = "GMP/MPIR, MPFR, and MPC interface to Python 2.6+ and 3.x"
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-sources = [SOURCE_TAR_GZ]
-checksums = ['8951bcfc61c0f40102b92a4777daf9eb85445b537c4d09086deb0e097190bef0']
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('GMP', '6.2.1'),
-    ('MPFR', '4.1.0'),
-    ('MPC', '1.2.1'),
-]
-
-use_pip = True
-download_dep_fail = True
-sanity_pip_check = True
-
-moduleclass = 'math'
diff --git a/Golden_Repo/g/gnuplot/gnuplot-5.4.2-GCCcore-11.2.0.eb b/Golden_Repo/g/gnuplot/gnuplot-5.4.2-GCCcore-11.2.0.eb
deleted file mode 100644
index fdbe4b088..000000000
--- a/Golden_Repo/g/gnuplot/gnuplot-5.4.2-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,51 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'gnuplot'
-version = '5.4.2'
-
-homepage = 'http://gnuplot.sourceforge.net/'
-description = """Portable interactive, function plotting utility"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [
-    ('https://sourceforge.net/projects/gnuplot/files/gnuplot/%(version)s', 'download')]
-sources = [SOURCE_TAR_GZ]
-checksums = ['e57c75e1318133951d32a83bcdc4aff17fed28722c4e71f2305cfc2ae1cae7ba']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('pkg-config', '0.29.2'),
-    ('Autotools', '20210726'),
-]
-
-dependencies = [
-    ('ncurses', '6.2'),
-    ('cairo', '1.16.0'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('libpng', '1.6.37'),
-    ('libgd', '2.3.1'),
-    ('Pango', '1.48.8'),
-    ('libcerf', '1.17'),
-    ('X11', '20210802'),
-    ('Qt5', '5.15.2'),
-    ('libreadline', '8.1'),
-]
-
-osdependencies = [
-    ('lua'),
-    ('lua-devel', 'liblua-dev')
-]
-
-preconfigopts = 'autoreconf && '
-
-configopts = '--with-qt=qt5 --without-latex '
-
-sanity_check_paths = {
-    'files': ['bin/gnuplot'],
-    'dirs': []
-}
-# make sure that pdf terminal type is available
-sanity_check_commands = ["gnuplot -e 'set terminal pdf'"]
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/g/gomkl/gomkl-2021b.eb b/Golden_Repo/g/gomkl/gomkl-2021b.eb
deleted file mode 100644
index 2307330e2..000000000
--- a/Golden_Repo/g/gomkl/gomkl-2021b.eb
+++ /dev/null
@@ -1,27 +0,0 @@
-easyblock = "Toolchain"
-
-name = 'gomkl'
-version = '2021b'
-
-homepage = '(none)'
-description = """GCC and GFortran based compiler toolchain, ParaStation MPICH variant for MPI support and MKL"""
-
-toolchain = SYSTEM
-
-local_comp_name = 'GCC'
-local_comp_version = '11.2.0'
-local_comp = (local_comp_name, local_comp_version)
-
-# toolchain used to build  dependencies
-local_comp_mpi_tc_name = 'gompi'
-local_comp_mpi_tc_ver = version
-local_comp_mpi_tc = (local_comp_mpi_tc_name, local_comp_mpi_tc_ver)
-
-# compiler toolchain dependencies
-dependencies = [
-    local_comp,
-    ('OpenMPI', '4.1.2', '', local_comp),  # part of gompi toolchain
-    ('imkl', '2021.4.0', '', local_comp_mpi_tc),
-]
-
-moduleclass = 'toolchain'
diff --git a/Golden_Repo/g/gompi/gompi-2021b.eb b/Golden_Repo/g/gompi/gompi-2021b.eb
deleted file mode 100644
index d522d562f..000000000
--- a/Golden_Repo/g/gompi/gompi-2021b.eb
+++ /dev/null
@@ -1,28 +0,0 @@
-easyblock = "Toolchain"
-
-name = 'gompi'
-version = '2021b'
-
-homepage = '(none)'
-description = """gcc and GFortran based compiler toolchain,
- including OpenMPI for MPI support.
-"""
-
-site_contacts = 'sc@fz-juelich.de'
-
-toolchain = SYSTEM
-
-local_mpilib = 'OpenMPI'
-local_mpiver = '4.1.2'
-
-local_compname = 'GCC'
-local_compver = '11.2.0'
-
-local_comp = (local_compname, local_compver)
-
-dependencies = [
-    local_comp,
-    (local_mpilib, local_mpiver, '', local_comp),
-]
-
-moduleclass = 'toolchain'
diff --git a/Golden_Repo/g/gperf/gperf-3.1-GCCcore-11.2.0.eb b/Golden_Repo/g/gperf/gperf-3.1-GCCcore-11.2.0.eb
deleted file mode 100644
index ee2a133f3..000000000
--- a/Golden_Repo/g/gperf/gperf-3.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,30 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'gperf'
-version = '3.1'
-
-homepage = 'https://www.gnu.org/software/gperf/'
-description = """
-GNU gperf is a perfect hash function generator. For a given list of strings,
-it produces a hash function and hash table, in form of C or C++ code, for
-looking up a value depending on the input string. The hash function is
-perfect, which means that the hash table has no collisions, and the hash
-table lookup needs a single string comparison only.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [GNU_SOURCE]
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-sanity_check_paths = {
-    'files': ['bin/%(name)s'],
-    'dirs': [],
-}
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/g/gpsmkl/gpsmkl-2021b.eb b/Golden_Repo/g/gpsmkl/gpsmkl-2021b.eb
deleted file mode 100644
index b01235e5e..000000000
--- a/Golden_Repo/g/gpsmkl/gpsmkl-2021b.eb
+++ /dev/null
@@ -1,24 +0,0 @@
-easyblock = "Toolchain"
-
-name = 'gpsmkl'
-version = '2021b'
-
-homepage = '(none)'
-description = 'GCC and GFortran based compiler toolchain, ParaStation MPICH variant for MPI support and MKL'
-
-
-toolchain = SYSTEM
-
-local_compiler = ('GCC', '11.2.0')
-
-# toolchain used to build  dependencies
-local_comp_mpi_tc = ('gpsmpi', version)
-
-# compiler toolchain dependencies
-dependencies = [
-    local_compiler,
-    ('psmpi', '5.5.0-1', '', local_compiler),  # part of gpsmpi toolchain
-    ('imkl', '2021.4.0', '', local_comp_mpi_tc),
-]
-
-moduleclass = 'toolchain'
diff --git a/Golden_Repo/g/gpsmpi/gpsmpi-2021b.eb b/Golden_Repo/g/gpsmpi/gpsmpi-2021b.eb
deleted file mode 100644
index c341f1eb3..000000000
--- a/Golden_Repo/g/gpsmpi/gpsmpi-2021b.eb
+++ /dev/null
@@ -1,19 +0,0 @@
-easyblock = 'Toolchain'
-
-name = 'gpsmpi'
-version = '2021b'
-
-homepage = '(none)'
-description = 'GCC and GFortran based compiler toolchain, including Parastation MPICH2 for MPI support.'
-
-
-toolchain = SYSTEM
-
-local_compiler = ('GCC', '11.2.0')
-
-dependencies = [
-    local_compiler,
-    ('psmpi', '5.5.0-1', '', local_compiler),
-]
-
-moduleclass = 'toolchain'
diff --git a/Golden_Repo/g/groff/groff-1.22.4-GCCcore-11.2.0.eb b/Golden_Repo/g/groff/groff-1.22.4-GCCcore-11.2.0.eb
deleted file mode 100644
index cc29aafdf..000000000
--- a/Golden_Repo/g/groff/groff-1.22.4-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,29 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'groff'
-version = '1.22.4'
-
-homepage = 'https://www.gnu.org/software/groff'
-description = """Groff (GNU troff) is a typesetting system that reads plain text mixed with formatting commands
-and produces formatted output."""
-
-site_contacts = 'sc@fz-juelich.de'
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://ftp.gnu.org/gnu/groff']
-sources = [SOURCE_TAR_GZ]
-checksums = ['e78e7b4cb7dec310849004fa88847c44701e8d133b5d4c13057d876c1bad0293']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-configopts = '--with-doc=no'
-
-sanity_check_paths = {
-    'files': ['bin/groff', 'bin/nroff', 'bin/troff'],
-    'dirs': ['lib/groff', 'share'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/g/gsettings-desktop-schemas/gsettings-desktop-schemas-3.34.0-GCCcore-11.2.0.eb b/Golden_Repo/g/gsettings-desktop-schemas/gsettings-desktop-schemas-3.34.0-GCCcore-11.2.0.eb
deleted file mode 100644
index 5f07b4bb6..000000000
--- a/Golden_Repo/g/gsettings-desktop-schemas/gsettings-desktop-schemas-3.34.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,38 +0,0 @@
-easyblock = 'MesonNinja'
-
-name = 'gsettings-desktop-schemas'
-version = '3.34.0'
-
-homepage = 'https://github.com/GNOME/gsettings-desktop-schemas'
-description = '''
-gsettings-desktop-schemas contains a collection of GSettings schemas for settings shared by various components of a
-desktop.'''
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [FTPGNOME_SOURCE]
-sources = [SOURCELOWER_TAR_XZ]
-checksums = ['288b04260f7040b0e004a8d59c773cfb4e32df4f1b4a0f9d705c51afccc95ead']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1', '', SYSTEM),
-    ('pkg-config', '0.29.2'),
-    ('GObject-Introspection', '1.68.0'),
-    ('Meson', '0.58.2'),
-    ('Ninja', '1.10.2'),
-]
-
-dependencies = [
-    ('GTK+', '3.24.23'),
-]
-
-configopts = '-Ddefault_library=both'
-
-sanity_check_paths = {
-    'files': ['include/gsettings-desktop-schemas/gdesktop-enums.h'],
-    'dirs': ['share'],
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/g/guile/guile-2.0.14-GCCcore-11.2.0.eb b/Golden_Repo/g/guile/guile-2.0.14-GCCcore-11.2.0.eb
deleted file mode 100644
index 9451caa21..000000000
--- a/Golden_Repo/g/guile/guile-2.0.14-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,41 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'guile'
-version = '2.0.14'
-
-homepage = 'http://www.gnu.org/software/guile'
-description = """Guile is the GNU Ubiquitous Intelligent Language for Extensions, the official extension language for 
-the GNU operating system.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [GNU_SOURCE]
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['8aeb2f353881282fe01694cce76bb72f7ffdd296a12c7a1a39255c27b0dfe5f1']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('libtool', '2.4.6'),
-    ('GMP', '6.2.1'),
-    ('libunistring', '0.9.10'),
-    ('libffi', '3.4.2'),
-    ('libreadline', '8.1'),
-    ('XZ', '5.2.5'),
-    ('gc', '8.2.0'),
-]
-
-configopts = " --enable-error-on-warning=no"
-
-sanity_check_paths = {
-    'files': ["bin/%s" % x for x in ["guile", 'guile-config', 'guile-snarf', 'guile-tools']] +
-             ["lib/libguile-%(version_major_minor)s.a",
-              "include/guile/%(version_major_minor)s/libguile.h"],
-    'dirs': []
-}
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/g/guile/guile-3.0.7-GCCcore-11.2.0.eb b/Golden_Repo/g/guile/guile-3.0.7-GCCcore-11.2.0.eb
deleted file mode 100644
index c0e5e9cc0..000000000
--- a/Golden_Repo/g/guile/guile-3.0.7-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,43 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'guile'
-version = '3.0.7'
-
-homepage = 'http://www.gnu.org/software/guile'
-description = """Guile is the GNU Ubiquitous Intelligent Language for Extensions, the official extension language for 
-the GNU operating system.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [GNU_SOURCE]
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['c7935b7a29e42443f6a35d35cf20ffa7d028c399303f872cd1219598a83656ae']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('libtool', '2.4.6'),
-    ('GMP', '6.2.1'),
-    ('libunistring', '0.9.10'),
-    ('libffi', '3.4.2'),
-    ('libreadline', '8.1'),
-    ('XZ', '5.2.5'),
-    ('gc', '8.2.0'),
-]
-
-configopts = " --enable-error-on-warning=no"
-
-sanity_check_paths = {
-    'files': ["bin/%s" % x for x in ["guile", 'guile-config', 'guile-snarf', 'guile-tools']] +
-             ["lib/libguile-%(version_major_minor)s.a",
-              "include/guile/%(version_major_minor)s/libguile.h"],
-    'dirs': []
-}
-
-parallel = 1
-
-moduleclass = 'devel'
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
deleted file mode 100644
index 633d7f779..000000000
--- a/Golden_Repo/g/gzip/gzip-1.10-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,24 +0,0 @@
-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/h/HDF/HDF-4.2.15-GCCcore-11.2.0.eb b/Golden_Repo/h/HDF/HDF-4.2.15-GCCcore-11.2.0.eb
deleted file mode 100644
index ba297eae9..000000000
--- a/Golden_Repo/h/HDF/HDF-4.2.15-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,65 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'HDF'
-version = '4.2.15'
-
-homepage = 'https://www.hdfgroup.org/products/hdf4/'
-
-description = """
- HDF (also known as HDF4) is a library and multi-object file format for
- storing and managing data between machines.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%(version)s/src/']
-sources = [SOURCELOWER_TAR_GZ]
-patches = ['HDF-4.2.15_fix-aarch64.patch']
-checksums = [
-    'dbeeef525af7c2d01539906c28953f0fdab7dba603d1bc1ec4a5af60d002c459',  # hdf-4.2.15.tar.gz
-    '1b4341e309cccefc6ea4310c8f8b08cc3dfe1fa9609b7fa7aee80e4dac598473',  # HDF-4.2.15_fix-aarch64.patch
-]
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Bison', '3.7.6'),
-    ('flex', '2.6.4'),
-    ('Java', '15', '', SYSTEM),
-]
-
-dependencies = [
-    ('libjpeg-turbo', '2.1.1'),
-    ('Szip', '2.1.1'),
-    ('zlib', '1.2.11'),
-    ('libtirpc', '1.3.2'),
-]
-
-preconfigopts = "LIBS='-ltirpc' "
-local_common_configopts = '--with-szlib=$EBROOTSZIP --with-zlib=$EBROOTZLIB '
-local_common_configopts += 'CFLAGS="$CFLAGS -I$EBROOTLIBTIRPC/include/tirpc" '
-local_common_configopts += '--includedir=%(installdir)s/include/%(namelower)s '
-local_common_configopts += '--enable-java '
-configopts = [
-    # -fallow-argument-mismatch is required to compile with GCC 10.x
-    local_common_configopts + 'FFLAGS="$FFLAGS -fallow-argument-mismatch"',
-    # Cannot build shared libraries and Fortran...
-    # https://trac.osgeo.org/gdal/wiki/HDF#IncompatibilitywithNetCDFLibraries
-    # netcdf must be disabled to allow HDF to be used by GDAL
-    local_common_configopts + "--enable-shared --disable-fortran --disable-netcdf",
-]
-
-modextrapaths = {'CPATH': 'include/hdf'}
-
-sanity_check_paths = {
-    'files': ['bin/h4cc', 'bin/ncdump', 'lib/libdf.a', 'lib/libhdf4.settings', 'lib/libmfhdf.a',
-              'lib/libmfhdf.%s' % SHLIB_EXT],
-    'dirs': ['include/hdf'],
-}
-
-sanity_check_commands = [
-    "h4cc --help",
-    "ncdump -V",
-]
-
-moduleclass = 'data'
diff --git a/Golden_Repo/h/HDF5/HDF5-1.12.1-GCCcore-11.2.0-serial.eb b/Golden_Repo/h/HDF5/HDF5-1.12.1-GCCcore-11.2.0-serial.eb
deleted file mode 100644
index c7f190a95..000000000
--- a/Golden_Repo/h/HDF5/HDF5-1.12.1-GCCcore-11.2.0-serial.eb
+++ /dev/null
@@ -1,31 +0,0 @@
-name = 'HDF5'
-version = '1.12.1'
-versionsuffix = '-serial'
-
-homepage = 'http://www.hdfgroup.org/HDF5/'
-description = """HDF5 is a unique technology suite that makes possible the management of
- extremely large and complex data collections.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'optarch': True, 'pic': True}
-
-source_urls = [
-    'https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version_major)s.%(version_minor)s/hdf5-%(version)s/src'
-]
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['79c66ff67e666665369396e9c90b32e238e501f345afd2234186bfb8331081ca']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Java', '15.0.1', '', SYSTEM)
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('Szip', '2.1.1'),
-]
-
-configopts = '--enable-java'
-
-moduleclass = 'data'
diff --git a/Golden_Repo/h/HDF5/HDF5-1.12.1-gompi-2021b.eb b/Golden_Repo/h/HDF5/HDF5-1.12.1-gompi-2021b.eb
deleted file mode 100644
index 198bdfe28..000000000
--- a/Golden_Repo/h/HDF5/HDF5-1.12.1-gompi-2021b.eb
+++ /dev/null
@@ -1,21 +0,0 @@
-name = 'HDF5'
-version = '1.12.1'
-
-homepage = 'http://www.hdfgroup.org/HDF5/'
-description = """HDF5 is a unique technology suite that makes possible the management of
- extremely large and complex data collections.
-"""
-
-toolchain = {'name': 'gompi', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': True}
-
-source_urls = ['https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version_major_minor)s/hdf5-%(version)s/src']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['79c66ff67e666665369396e9c90b32e238e501f345afd2234186bfb8331081ca']
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('Szip', '2.1.1'),
-]
-
-moduleclass = 'data'
diff --git a/Golden_Repo/h/HDF5/HDF5-1.12.1-gpsmpi-2021b.eb b/Golden_Repo/h/HDF5/HDF5-1.12.1-gpsmpi-2021b.eb
deleted file mode 100644
index bcf0f4eb9..000000000
--- a/Golden_Repo/h/HDF5/HDF5-1.12.1-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,21 +0,0 @@
-name = 'HDF5'
-version = '1.12.1'
-
-homepage = 'http://www.hdfgroup.org/HDF5/'
-description = """HDF5 is a unique technology suite that makes possible the management of
- extremely large and complex data collections.
-"""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': True}
-
-source_urls = ['https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version_major_minor)s/hdf5-%(version)s/src']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['79c66ff67e666665369396e9c90b32e238e501f345afd2234186bfb8331081ca']
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('Szip', '2.1.1'),
-]
-
-moduleclass = 'data'
diff --git a/Golden_Repo/h/HDF5/HDF5-1.12.1-iimpi-2021b.eb b/Golden_Repo/h/HDF5/HDF5-1.12.1-iimpi-2021b.eb
deleted file mode 100644
index c4e4824cb..000000000
--- a/Golden_Repo/h/HDF5/HDF5-1.12.1-iimpi-2021b.eb
+++ /dev/null
@@ -1,21 +0,0 @@
-name = 'HDF5'
-version = '1.12.1'
-
-homepage = 'http://www.hdfgroup.org/HDF5/'
-description = """HDF5 is a unique technology suite that makes possible the management of
- extremely large and complex data collections.
-"""
-
-toolchain = {'name': 'iimpi', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': True}
-
-source_urls = ['https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version_major_minor)s/hdf5-%(version)s/src']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['79c66ff67e666665369396e9c90b32e238e501f345afd2234186bfb8331081ca']
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('Szip', '2.1.1'),
-]
-
-moduleclass = 'data'
diff --git a/Golden_Repo/h/HDF5/HDF5-1.12.1-iompi-2021b.eb b/Golden_Repo/h/HDF5/HDF5-1.12.1-iompi-2021b.eb
deleted file mode 100644
index f067ae845..000000000
--- a/Golden_Repo/h/HDF5/HDF5-1.12.1-iompi-2021b.eb
+++ /dev/null
@@ -1,21 +0,0 @@
-name = 'HDF5'
-version = '1.12.1'
-
-homepage = 'http://www.hdfgroup.org/HDF5/'
-description = """HDF5 is a unique technology suite that makes possible the management of
- extremely large and complex data collections.
-"""
-
-toolchain = {'name': 'iompi', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': True}
-
-source_urls = ['https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version_major_minor)s/hdf5-%(version)s/src']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['79c66ff67e666665369396e9c90b32e238e501f345afd2234186bfb8331081ca']
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('Szip', '2.1.1'),
-]
-
-moduleclass = 'data'
diff --git a/Golden_Repo/h/HDF5/HDF5-1.12.1-ipsmpi-2021b.eb b/Golden_Repo/h/HDF5/HDF5-1.12.1-ipsmpi-2021b.eb
deleted file mode 100644
index 9a867248d..000000000
--- a/Golden_Repo/h/HDF5/HDF5-1.12.1-ipsmpi-2021b.eb
+++ /dev/null
@@ -1,21 +0,0 @@
-name = 'HDF5'
-version = '1.12.1'
-
-homepage = 'http://www.hdfgroup.org/HDF5/'
-description = """HDF5 is a unique technology suite that makes possible the management of
- extremely large and complex data collections.
-"""
-
-toolchain = {'name': 'ipsmpi', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': True}
-
-source_urls = ['https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version_major_minor)s/hdf5-%(version)s/src']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['79c66ff67e666665369396e9c90b32e238e501f345afd2234186bfb8331081ca']
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('Szip', '2.1.1'),
-]
-
-moduleclass = 'data'
diff --git a/Golden_Repo/h/HDF5/HDF5-1.12.1-npsmpic-2021b.eb b/Golden_Repo/h/HDF5/HDF5-1.12.1-npsmpic-2021b.eb
deleted file mode 100644
index 090a4fcee..000000000
--- a/Golden_Repo/h/HDF5/HDF5-1.12.1-npsmpic-2021b.eb
+++ /dev/null
@@ -1,21 +0,0 @@
-name = 'HDF5'
-version = '1.12.1'
-
-homepage = 'http://www.hdfgroup.org/HDF5/'
-description = """HDF5 is a unique technology suite that makes possible the management of
- extremely large and complex data collections.
-"""
-
-toolchain = {'name': 'npsmpic', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': True}
-
-source_urls = ['https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version_major_minor)s/hdf5-%(version)s/src']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['79c66ff67e666665369396e9c90b32e238e501f345afd2234186bfb8331081ca']
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('Szip', '2.1.1'),
-]
-
-moduleclass = 'data'
diff --git a/Golden_Repo/h/HDF5/HDF5-1.12.1-nvompic-2021b.eb b/Golden_Repo/h/HDF5/HDF5-1.12.1-nvompic-2021b.eb
deleted file mode 100644
index ca07ef964..000000000
--- a/Golden_Repo/h/HDF5/HDF5-1.12.1-nvompic-2021b.eb
+++ /dev/null
@@ -1,21 +0,0 @@
-name = 'HDF5'
-version = '1.12.1'
-
-homepage = 'http://www.hdfgroup.org/HDF5/'
-description = """HDF5 is a unique technology suite that makes possible the management of
- extremely large and complex data collections.
-"""
-
-toolchain = {'name': 'nvompic', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': True}
-
-source_urls = ['https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version_major_minor)s/hdf5-%(version)s/src']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['79c66ff67e666665369396e9c90b32e238e501f345afd2234186bfb8331081ca']
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('Szip', '2.1.1'),
-]
-
-moduleclass = 'data'
diff --git a/Golden_Repo/h/HDFView/HDFView-3.1.3-GCCcore-11.2.0.eb b/Golden_Repo/h/HDFView/HDFView-3.1.3-GCCcore-11.2.0.eb
deleted file mode 100644
index 883edc6a1..000000000
--- a/Golden_Repo/h/HDFView/HDFView-3.1.3-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,31 +0,0 @@
-easyblock = 'Binary'
-
-name = 'HDFView'
-version = '3.1.3'
-
-homepage = 'https://www.hdfgroup.org/downloads/hdfview/'
-description = "HDFView is a visual tool for browsing and editing HDF4 and HDF5 files."
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://support.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/hdfview-%(version)s/bin/']
-sources = ['HDFViewApp-%(version)s-centos8_64.tar.gz']
-checksums = ['e60976ba816afc426bc3bc7a151b6f2e208605711e9bc9bf188ef14771faa4c7']
-
-dependencies = [
-    ('Java', '15', '', SYSTEM)
-]
-
-install_cmd = "tar xfvz *.tar.gz && "
-install_cmd += "mkdir %(installdir)s/lib && mkdir %(installdir)s/bin && "
-install_cmd += "cp -a HDFView/lib/app %(installdir)s/lib && "
-install_cmd += "cp -a HDFView/lib/app/hdfview.sh %(installdir)s/bin/HDFView && "
-install_cmd += 'sed -i "s@export JAVABIN=.*@export JAVABIN=$EBROOTJAVA/bin@g" %(installdir)s/bin/HDFView && '
-install_cmd += 'sed -i "s@export INSTALLDIR=.*@export INSTALLDIR=%(installdir)s@g" %(installdir)s/bin/HDFView'
-
-sanity_check_paths = {
-    'files': ['bin/HDFView'],
-    'dirs': ['lib/app'],
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/h/HTSlib/HTSlib-1.14-GCCcore-11.2.0.eb b/Golden_Repo/h/HTSlib/HTSlib-1.14-GCCcore-11.2.0.eb
deleted file mode 100644
index f14b45c3c..000000000
--- a/Golden_Repo/h/HTSlib/HTSlib-1.14-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,41 +0,0 @@
-# This file is an EasyBuild reciPY as per https://github.com/easybuilders/easybuild
-# Author: Pablo Escobar Lopez
-# Swiss Institute of Bioinformatics
-# Biozentrum - University of Basel
-# 1.4 modified by:
-# Adam Huffman, Jonas Demeulemeester
-# The Francis Crick Institute
-# Updated to 1.14
-# J. Sassmannshausen /GSTT
-
-easyblock = 'ConfigureMake'
-
-name = 'HTSlib'
-version = '1.14'
-
-homepage = "https://www.htslib.org/"
-description = """A C library for reading/writing high-throughput sequencing data.
- This package includes the utilities bgzip and tabix"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [
-    'https://github.com/samtools/%(namelower)s/releases/download/%(version)s/']
-sources = [SOURCELOWER_TAR_BZ2]
-checksums = ['ed221b8f52f4812f810eebe0cc56cd8355a5c9d21c62d142ac05ad0da147935f']
-
-# cURL added for S3 support
-dependencies = [
-    ('binutils', '2.37'),
-    ('zlib', '1.2.11'),
-    ('bzip2', '1.0.8'),
-    ('XZ', '5.2.5'),
-    ('cURL', '7.78.0'),
-]
-
-sanity_check_paths = {
-    'files': ['bin/bgzip', 'bin/tabix', 'lib/libhts.%s' % SHLIB_EXT],
-    'dirs': [],
-}
-
-moduleclass = 'bio'
diff --git a/Golden_Repo/h/HarfBuzz/HarfBuzz-2.8.2-GCCcore-11.2.0.eb b/Golden_Repo/h/HarfBuzz/HarfBuzz-2.8.2-GCCcore-11.2.0.eb
deleted file mode 100644
index 41f8b5c68..000000000
--- a/Golden_Repo/h/HarfBuzz/HarfBuzz-2.8.2-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,45 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'HarfBuzz'
-version = '2.8.2'
-
-homepage = 'http://www.freedesktop.org/wiki/Software/HarfBuzz'
-description = """HarfBuzz is an OpenType text shaping engine.
-"""
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-github_account = 'harfbuzz'
-source_urls = [GITHUB_SOURCE]
-sources = ['%(version)s.tar.gz']
-checksums = ['4164f68103e7b52757a732227cfa2a16cfa9984da513843bb4eb7669adc6f220']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Coreutils', '9.0'),
-    ('pkg-config', '0.29.2'),
-    ('GObject-Introspection', '1.68.0'),
-    ('Autotools', '20210726')
-]
-
-dependencies = [
-    ('X11', '20210802'),
-    ('GLib', '2.69.1'),
-    ('cairo', '1.16.0'),
-    ('freetype', '2.11.0'),
-]
-
-preconfigopts = "./autogen.sh && "
-configopts = "--enable-introspection=yes --with-gobject=yes --enable-static --enable-shared --with-cairo "
-
-modextrapaths = {
-    'GI_TYPELIB_PATH': 'lib64/girepository-1.0',
-}
-
-sanity_check_paths = {
-    'files': ['lib64/libharfbuzz.%s' % SHLIB_EXT, 'bin/hb-view'],
-    'dirs': []
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/h/Harminv/Harminv-1.4.1-intel-2021b.eb b/Golden_Repo/h/Harminv/Harminv-1.4.1-intel-2021b.eb
deleted file mode 100644
index 2e43cb5ff..000000000
--- a/Golden_Repo/h/Harminv/Harminv-1.4.1-intel-2021b.eb
+++ /dev/null
@@ -1,22 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'Harminv'
-version = '1.4.1'
-
-homepage = 'http://ab-initio.mit.edu/wiki/index.php/Harminv'
-description = """
-Harminv is a free program (and accompanying library) to solve the problem of harmonic inversion - given a discrete-time,
-finite-length signal that consists of a sum of finitely-many sinusoids (possibly exponentially decaying) in a given
-bandwidth, it determines the frequencies, decay constants, amplitudes, and phases of those sinusoids.
-"""
-
-toolchain = {'name': 'intel', 'version': '2021b'}
-toolchainopts = {'opt': True, 'unroll': True, 'optarch': True, 'pic': True, 'cstd': 'c99'}
-
-source_urls = ['https://github.com/stevengj/harminv/releases/download/v%(version)s/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['e1b923c508a565f230aac04e3feea23b888b47d8e19b08816a97ee4444233670']  # v1.4.1.tar.gz
-
-configopts = "--with-pic  --with-blas=mkl_em64t --with-lapack=mkl_em64t --enable-shared"
-
-moduleclass = 'math'
diff --git a/Golden_Repo/h/Harminv/Harminv-1.4.1-intel-para-2021b.eb b/Golden_Repo/h/Harminv/Harminv-1.4.1-intel-para-2021b.eb
deleted file mode 100644
index 8ab90e41c..000000000
--- a/Golden_Repo/h/Harminv/Harminv-1.4.1-intel-para-2021b.eb
+++ /dev/null
@@ -1,22 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'Harminv'
-version = '1.4.1'
-
-homepage = 'http://ab-initio.mit.edu/wiki/index.php/Harminv'
-description = """
-Harminv is a free program (and accompanying library) to solve the problem of harmonic inversion - given a discrete-time,
-finite-length signal that consists of a sum of finitely-many sinusoids (possibly exponentially decaying) in a given
-bandwidth, it determines the frequencies, decay constants, amplitudes, and phases of those sinusoids.
-"""
-
-toolchain = {'name': 'intel-para', 'version': '2021b'}
-toolchainopts = {'opt': True, 'unroll': True, 'optarch': True, 'pic': True, 'cstd': 'c99'}
-
-source_urls = ['https://github.com/stevengj/harminv/releases/download/v%(version)s/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['e1b923c508a565f230aac04e3feea23b888b47d8e19b08816a97ee4444233670']  # v1.4.1.tar.gz
-
-configopts = "--with-pic  --with-blas=mkl_em64t --with-lapack=mkl_em64t --enable-shared"
-
-moduleclass = 'math'
diff --git a/Golden_Repo/h/Harminv/Harminv-1.4.1-iomkl-2021b.eb b/Golden_Repo/h/Harminv/Harminv-1.4.1-iomkl-2021b.eb
deleted file mode 100644
index 49c173716..000000000
--- a/Golden_Repo/h/Harminv/Harminv-1.4.1-iomkl-2021b.eb
+++ /dev/null
@@ -1,22 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'Harminv'
-version = '1.4.1'
-
-homepage = 'http://ab-initio.mit.edu/wiki/index.php/Harminv'
-description = """
-Harminv is a free program (and accompanying library) to solve the problem of harmonic inversion - given a discrete-time,
-finite-length signal that consists of a sum of finitely-many sinusoids (possibly exponentially decaying) in a given
-bandwidth, it determines the frequencies, decay constants, amplitudes, and phases of those sinusoids.
-"""
-
-toolchain = {'name': 'iomkl', 'version': '2021b'}
-toolchainopts = {'opt': True, 'unroll': True, 'optarch': True, 'pic': True, 'cstd': 'c99'}
-
-source_urls = ['https://github.com/stevengj/harminv/releases/download/v%(version)s/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['e1b923c508a565f230aac04e3feea23b888b47d8e19b08816a97ee4444233670']  # v1.4.1.tar.gz
-
-configopts = "--with-pic  --with-blas=mkl_em64t --with-lapack=mkl_em64t --enable-shared"
-
-moduleclass = 'math'
diff --git a/Golden_Repo/h/Horovod/Horovod-0.24.3-gomkl-2021b.eb b/Golden_Repo/h/Horovod/Horovod-0.24.3-gomkl-2021b.eb
deleted file mode 100644
index aaf127171..000000000
--- a/Golden_Repo/h/Horovod/Horovod-0.24.3-gomkl-2021b.eb
+++ /dev/null
@@ -1,102 +0,0 @@
-# on juwels booster, one might to call "export UCX_LOG_LEVEL=FATAL; ebw ...
-easyblock = 'PythonBundle'
-
-name = 'Horovod'
-version = '0.24.3'
-local_tf_version = '2.6.0'
-
-homepage = 'https://github.com/uber/horovod'
-description = "Horovod is a distributed training framework for TensorFlow and PyTorch."
-
-toolchain = {'name': 'gomkl', 'version': '2021b'}
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-]
-
-dependencies = [
-    ('CUDA', '11.5', '', True),
-    ('Python', '3.9.6'),
-    ('TensorFlow', local_tf_version, '-CUDA-%(cudaver)s', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('PyTorch', '1.11', '-CUDA-%(cudaver)s', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('NCCL', '2.12.7-1', '-CUDA-%(cudaver)s'),
-
-]
-
-use_pip = True
-sanity_pip_check = True
-parallel = 1  # Bug in CMake causes a race condition on horovod_cuda_kernels_generated_cuda_kernels.cu.o.NVCC-depend
-
-# possible vars:
-# HOROVOD_BUILD_ARCH_FLAGS - additional C++ compilation flags to pass in for your build architecture.
-# HOROVOD_CUDA_HOME - path where CUDA include and lib directories can be found.
-# HOROVOD_BUILD_CUDA_CC_LIST - List of compute capabilities to build Horovod CUDA
-# kernels for (example: HOROVOD_BUILD_CUDA_CC_LIST=60,70,75)
-# HOROVOD_ROCM_HOME - path where ROCm include and lib directories can be found.
-# HOROVOD_NCCL_HOME - path where NCCL include and lib directories can be found.
-# HOROVOD_NCCL_INCLUDE - path to NCCL include directory.
-# HOROVOD_NCCL_LIB - path to NCCL lib directory.
-# HOROVOD_NCCL_LINK - {SHARED, STATIC}. Mode to link NCCL library. Defaults to STATIC for CUDA, SHARED for ROCm.
-# HOROVOD_WITH_GLOO - {1}. Require that Horovod is built with Gloo support enabled.
-# HOROVOD_WITHOUT_GLOO - {1}. Skip building with Gloo support.
-# HOROVOD_WITH_MPI - {1}. Require that Horovod is built with MPI support enabled.
-# HOROVOD_WITHOUT_MPI - {1}. Skip building with MPI support.
-# HOROVOD_GPU - {CUDA, ROCM}. Framework to use for GPU operations.
-# HOROVOD_GPU_OPERATIONS - {NCCL, MPI}. Framework to use for GPU tensor allreduce, allgather, and broadcast.
-# HOROVOD_GPU_ALLREDUCE - {NCCL, MPI}. Framework to use for GPU tensor allreduce.
-# HOROVOD_GPU_ALLGATHER - {NCCL, MPI}. Framework to use for GPU tensor allgather.
-# HOROVOD_GPU_BROADCAST - {NCCL, MPI}. Framework to use for GPU tensor broadcast.
-# HOROVOD_ALLOW_MIXED_GPU_IMPL - {1}. Allow Horovod to install with NCCL allreduce and MPI GPU allgather /
-# broadcast. Not recommended due to a possible deadlock.
-# HOROVOD_CPU_OPERATIONS - {MPI, GLOO, CCL}. Framework to use for CPU tensor allreduce, allgather, and broadcast.
-# HOROVOD_CMAKE - path to the CMake binary used to build Gloo (not required when using MPI).
-# HOROVOD_WITH_TENSORFLOW - {1}. Require Horovod to install with TensorFlow support enabled.
-# HOROVOD_WITHOUT_TENSORFLOW - {1}. Skip installing TensorFlow support.
-# HOROVOD_WITH_PYTORCH - {1}. Require Horovod to install with PyTorch support enabled.
-# HOROVOD_WITHOUT_PYTORCH - {1}. Skip installing PyTorch support.
-# HOROVOD_WITH_MXNET - {1}. Require Horovod to install with MXNet support enabled.
-# HOROVOD_WITHOUT_MXNET - {1}. Skip installing MXNet support.
-
-# prebuildopts = 'export LDSHARED="$CC -shared" && '
-# prebuildopts += ' HOROVOD_WITH_TENSORFLOW=1 HOROVOD_WITHOUT_PYTORCH=1 HOROVOD_WITHOUT_MXNET=1 '
-# prebuildopts += ' HOROVOD_NCCL_LINK=SHARED HOROVOD_NCCL_HOME=$EBROOTNCCL '
-# prebuildopts += ' HOROVOD_GPU_OPERATIONS=NCCL '
-# prebuildopts += ' HOROVOD_CPU_OPERATIONS=MPI '
-# prebuildopts += ' HOROVOD_GPU_ALLREDUCE=NCCL '
-# prebuildopts += ' HOROVOD_GPU_BROADCAST=NCCL '
-# prebuildopts += ' HOROVOD_WITH_MPI=1 '
-
-
-prebuildopts = 'export LDSHARED="$CC -shared" && '
-prebuildopts += ' HOROVOD_WITH_MPI=1 '
-prebuildopts += ' HOROVOD_CPU_OPERATIONS=MPI '
-prebuildopts += ' HOROVOD_NCCL_LINK=SHARED HOROVOD_GPU_ALLREDUCE=NCCL HOROVOD_NCCL_HOME=$EBROOTNCCL '
-prebuildopts += ' HOROVOD_WITH_TENSORFLOW=1 HOROVOD_WITH_PYTORCH=1'
-# prebuildopts += ' NVCC_GENCODE="-gencode=arch=compute_70,code=sm_70 \
-#                                -gencode=arch=compute_75,code=sm_75 \
-#                                -gencode=arch=compute_80,code=sm_80 \
-#                                -gencode=arch=compute_86,code=sm_86"'
-
-preinstallopts = prebuildopts
-
-
-exts_default_options = {'source_urls': [PYPI_SOURCE]}
-
-exts_list = [
-    ('horovod', version, {
-        'checksums': ['af24e4b1ed9adaa0db98f6375c023d438f65f116aa80ad5e7a321780362b3e7f'],
-    }),
-]
-
-sanity_check_paths = {
-    'files': ['bin/horovodrun'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-# This makes openmpi work. It's up to the sysadmins to correct me here.
-modextravars = {'HOROVOD_MPI_THREADS_DISABLE': '1'}
-
-modloadmsg = 'Setting HOROVOD_MPI_THREADS_DISABLE=1. '
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/h/Horovod/Horovod-0.25.0-gomkl-2021b.eb b/Golden_Repo/h/Horovod/Horovod-0.25.0-gomkl-2021b.eb
deleted file mode 100644
index 61af529e0..000000000
--- a/Golden_Repo/h/Horovod/Horovod-0.25.0-gomkl-2021b.eb
+++ /dev/null
@@ -1,101 +0,0 @@
-# on juwels booster, one might to call "export UCX_LOG_LEVEL=FATAL; ebw ...
-easyblock = 'PythonBundle'
-
-name = 'Horovod'
-version = '0.25.0'
-local_tf_version = '2.6.0'
-
-homepage = 'https://github.com/uber/horovod'
-description = "Horovod is a distributed training framework for TensorFlow and PyTorch."
-
-toolchain = {'name': 'gomkl', 'version': '2021b'}
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-]
-
-dependencies = [
-    ('CUDA', '11.5', '', True),
-    ('Python', '3.9.6'),
-    ('TensorFlow', local_tf_version, '-CUDA-%(cudaver)s', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('PyTorch', '1.11', '-CUDA-%(cudaver)s', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('NCCL', '2.14.3-1', '-CUDA-%(cudaver)s'),
-]
-
-use_pip = True
-sanity_pip_check = True
-parallel = 1  # Bug in CMake causes a race condition on horovod_cuda_kernels_generated_cuda_kernels.cu.o.NVCC-depend
-
-# possible vars:
-# HOROVOD_BUILD_ARCH_FLAGS - additional C++ compilation flags to pass in for your build architecture.
-# HOROVOD_CUDA_HOME - path where CUDA include and lib directories can be found.
-# HOROVOD_BUILD_CUDA_CC_LIST - List of compute capabilities to build Horovod CUDA
-# kernels for (example: HOROVOD_BUILD_CUDA_CC_LIST=60,70,75)
-# HOROVOD_ROCM_HOME - path where ROCm include and lib directories can be found.
-# HOROVOD_NCCL_HOME - path where NCCL include and lib directories can be found.
-# HOROVOD_NCCL_INCLUDE - path to NCCL include directory.
-# HOROVOD_NCCL_LIB - path to NCCL lib directory.
-# HOROVOD_NCCL_LINK - {SHARED, STATIC}. Mode to link NCCL library. Defaults to STATIC for CUDA, SHARED for ROCm.
-# HOROVOD_WITH_GLOO - {1}. Require that Horovod is built with Gloo support enabled.
-# HOROVOD_WITHOUT_GLOO - {1}. Skip building with Gloo support.
-# HOROVOD_WITH_MPI - {1}. Require that Horovod is built with MPI support enabled.
-# HOROVOD_WITHOUT_MPI - {1}. Skip building with MPI support.
-# HOROVOD_GPU - {CUDA, ROCM}. Framework to use for GPU operations.
-# HOROVOD_GPU_OPERATIONS - {NCCL, MPI}. Framework to use for GPU tensor allreduce, allgather, and broadcast.
-# HOROVOD_GPU_ALLREDUCE - {NCCL, MPI}. Framework to use for GPU tensor allreduce.
-# HOROVOD_GPU_ALLGATHER - {NCCL, MPI}. Framework to use for GPU tensor allgather.
-# HOROVOD_GPU_BROADCAST - {NCCL, MPI}. Framework to use for GPU tensor broadcast.
-# HOROVOD_ALLOW_MIXED_GPU_IMPL - {1}. Allow Horovod to install with NCCL allreduce and MPI GPU allgather /
-# broadcast. Not recommended due to a possible deadlock.
-# HOROVOD_CPU_OPERATIONS - {MPI, GLOO, CCL}. Framework to use for CPU tensor allreduce, allgather, and broadcast.
-# HOROVOD_CMAKE - path to the CMake binary used to build Gloo (not required when using MPI).
-# HOROVOD_WITH_TENSORFLOW - {1}. Require Horovod to install with TensorFlow support enabled.
-# HOROVOD_WITHOUT_TENSORFLOW - {1}. Skip installing TensorFlow support.
-# HOROVOD_WITH_PYTORCH - {1}. Require Horovod to install with PyTorch support enabled.
-# HOROVOD_WITHOUT_PYTORCH - {1}. Skip installing PyTorch support.
-# HOROVOD_WITH_MXNET - {1}. Require Horovod to install with MXNet support enabled.
-# HOROVOD_WITHOUT_MXNET - {1}. Skip installing MXNet support.
-
-# prebuildopts = 'export LDSHARED="$CC -shared" && '
-# prebuildopts += ' HOROVOD_WITH_TENSORFLOW=1 HOROVOD_WITHOUT_PYTORCH=1 HOROVOD_WITHOUT_MXNET=1 '
-# prebuildopts += ' HOROVOD_NCCL_LINK=SHARED HOROVOD_NCCL_HOME=$EBROOTNCCL '
-# prebuildopts += ' HOROVOD_GPU_OPERATIONS=NCCL '
-# prebuildopts += ' HOROVOD_CPU_OPERATIONS=MPI '
-# prebuildopts += ' HOROVOD_GPU_ALLREDUCE=NCCL '
-# prebuildopts += ' HOROVOD_GPU_BROADCAST=NCCL '
-# prebuildopts += ' HOROVOD_WITH_MPI=1 '
-
-
-prebuildopts = 'export LDSHARED="$CC -shared" && '
-prebuildopts += ' HOROVOD_WITH_MPI=1 '
-prebuildopts += ' HOROVOD_CPU_OPERATIONS=MPI '
-prebuildopts += ' HOROVOD_NCCL_LINK=SHARED HOROVOD_GPU_ALLREDUCE=NCCL HOROVOD_NCCL_HOME=$EBROOTNCCL '
-prebuildopts += ' HOROVOD_WITH_TENSORFLOW=1 HOROVOD_WITH_PYTORCH=1'
-# prebuildopts += ' NVCC_GENCODE="-gencode=arch=compute_70,code=sm_70 \
-#                                -gencode=arch=compute_75,code=sm_75 \
-#                                -gencode=arch=compute_80,code=sm_80 \
-#                                -gencode=arch=compute_86,code=sm_86"'
-
-preinstallopts = prebuildopts
-
-
-exts_default_options = {'source_urls': [PYPI_SOURCE]}
-
-exts_list = [
-    ('horovod', version, {
-        'checksums': ['bc9fed57b67c1b55259671d2439cdbc93aa897ea6e5da459e11e7556972b2355'],
-    }),
-]
-
-sanity_check_paths = {
-    'files': ['bin/horovodrun'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-# This makes openmpi work. It's up to the sysadmins to correct me here.
-modextravars = {'HOROVOD_MPI_THREADS_DISABLE': '1'}
-
-modloadmsg = 'Setting HOROVOD_MPI_THREADS_DISABLE=1. '
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/h/Hypre/Hypre-2.23.0-gomkl-2021b-mixedint.eb b/Golden_Repo/h/Hypre/Hypre-2.23.0-gomkl-2021b-mixedint.eb
deleted file mode 100644
index 22b169d00..000000000
--- a/Golden_Repo/h/Hypre/Hypre-2.23.0-gomkl-2021b-mixedint.eb
+++ /dev/null
@@ -1,58 +0,0 @@
-name = "Hypre"
-version = "2.23.0"
-versionsuffix = "-mixedint"
-
-homepage = "https://computation.llnl.gov/casc/linear_solvers/sls_hypre.html"
-description = """Hypre is a library for solving large, sparse linear 
-systems of equations on massively parallel computers.
-The problems of interest arise in the simulation codes being developed 
-at LLNL and elsewhere to study physical phenomena in the defense, 
-environmental, energy, and biological sciences.
-"""
-
-examples = """Examples can be found in $EBROOTHYPRE/examples."""
-
-usage = """
-Hypre uses LAPACK, programs using Hypre can be linked with
--L$HYPRE_LIB -lHYPRE -lm -lmkl_gf_lp64 -lmkl_gnu_thread -lmkl_core -lgomp -lpthread
-"""
-
-toolchain = {'name': 'gomkl', 'version': '2021b'}
-
-toolchainopts = {'pic': True, 'usempi': True, 'openmp': True}
-
-source_urls = ["https://github.com/hypre-space/hypre/archive/"]
-sources = ['v%(version)s.tar.gz']
-patches = ["hypre-%(version)s_examples_mkl.patch"]
-checksums = [
-    '8a9f9fb6f65531b77e4c319bf35bfc9d34bf529c36afe08837f56b635ac052e2',  # v2.23.0.tar.gz
-    '33acfe9f0bcae8bdf3f3405351a8dd06d9c2d424f2b16d9eb1bc05c3d8dd6190',  # hypre-2.23.0_examples_mkl.patch
-]
-
-start_dir = 'src'
-
-dependencies = [('CUDA', '11.5', '', SYSTEM)]
-
-
-configopts = '--with-openmp '
-configopts += '--enable-mixedint '
-configopts += '--enable-unified-memory '
-
-
-postinstallcmds = [
-    "cp -r %(builddir)s/hypre-%(version)s/src/examples %(installdir)s/examples",
-    "mv %(installdir)s/examples/Makefile_gnu %(installdir)s/examples/Makefile",
-    "rm %(installdir)s/examples/Makefile*orig",
-    "rm %(installdir)s/examples/Makefile_*",
-    "cp %(builddir)s/hypre-%(version)s/src/HYPRE_config.h %(installdir)s/include",
-    "chmod 755 %(installdir)s/examples/vis",
-    "chmod 755 %(installdir)s/examples/docs",
-]
-
-modextravars = {
-    'HYPRE_ROOT': '%(installdir)s',
-    'HYPRE_LIB': '%(installdir)s/lib',
-    'HYPRE_INCLUDE': '%(installdir)s/include/'
-}
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/h/Hypre/Hypre-2.23.0-gomkl-2021b.eb b/Golden_Repo/h/Hypre/Hypre-2.23.0-gomkl-2021b.eb
deleted file mode 100644
index 70e2d1f70..000000000
--- a/Golden_Repo/h/Hypre/Hypre-2.23.0-gomkl-2021b.eb
+++ /dev/null
@@ -1,56 +0,0 @@
-name = "Hypre"
-version = "2.23.0"
-
-homepage = "https://computation.llnl.gov/casc/linear_solvers/sls_hypre.html"
-description = """Hypre is a library for solving large, sparse linear 
-systems of equations on massively parallel computers.
-The problems of interest arise in the simulation codes being developed 
-at LLNL and elsewhere to study physical phenomena in the defense, 
-environmental, energy, and biological sciences.
-"""
-
-examples = """Examples can be found in $EBROOTHYPRE/examples."""
-
-usage = """
-Hypre uses LAPACK, programs using Hypre can be linked with
--L$HYPRE_LIB -lHYPRE -lm -lmkl_gf_lp64 -lmkl_gnu_thread -lmkl_core -lgomp -lpthread
-"""
-
-toolchain = {'name': 'gomkl', 'version': '2021b'}
-
-toolchainopts = {'pic': True, 'usempi': True, 'openmp': True}
-
-source_urls = ["https://github.com/hypre-space/hypre/archive/"]
-sources = ['v%(version)s.tar.gz']
-patches = ["hypre-%(version)s_examples_mkl.patch"]
-checksums = [
-    '8a9f9fb6f65531b77e4c319bf35bfc9d34bf529c36afe08837f56b635ac052e2',  # v2.23.0.tar.gz
-    '33acfe9f0bcae8bdf3f3405351a8dd06d9c2d424f2b16d9eb1bc05c3d8dd6190',  # hypre-2.23.0_examples_mkl.patch
-]
-
-start_dir = 'src'
-
-dependencies = [('CUDA', '11.5', '', SYSTEM)]
-
-
-configopts = '--with-openmp '
-configopts += '--enable-unified-memory '
-
-
-postinstallcmds = [
-    "cp -r %(builddir)s/hypre-%(version)s/src/examples %(installdir)s/examples",
-    "mv %(installdir)s/examples/Makefile_gnu %(installdir)s/examples/Makefile",
-    "rm %(installdir)s/examples/Makefile*orig",
-    "rm %(installdir)s/examples/Makefile_*",
-    "cp %(builddir)s/hypre-%(version)s/src/HYPRE_config.h %(installdir)s/include",
-    "chmod 755 %(installdir)s/examples/vis",
-    "chmod 755 %(installdir)s/examples/docs",
-]
-
-modextravars = {
-    'HYPRE_ROOT': '%(installdir)s',
-    'HYPRE_LIB': '%(installdir)s/lib',
-    'HYPRE_INCLUDE': '%(installdir)s/include/'
-}
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/h/Hypre/Hypre-2.23.0-gpsmkl-2021b-mixedint.eb b/Golden_Repo/h/Hypre/Hypre-2.23.0-gpsmkl-2021b-mixedint.eb
deleted file mode 100644
index b3f6202e9..000000000
--- a/Golden_Repo/h/Hypre/Hypre-2.23.0-gpsmkl-2021b-mixedint.eb
+++ /dev/null
@@ -1,57 +0,0 @@
-name = "Hypre"
-version = "2.23.0"
-versionsuffix = "-mixedint"
-
-homepage = "https://computation.llnl.gov/casc/linear_solvers/sls_hypre.html"
-description = """Hypre is a library for solving large, sparse linear 
-systems of equations on massively parallel computers.
-The problems of interest arise in the simulation codes being developed 
-at LLNL and elsewhere to study physical phenomena in the defense, 
-environmental, energy, and biological sciences.
-"""
-
-examples = """Examples can be found in $EBROOTHYPRE/examples."""
-
-usage = """
-Hypre uses LAPACK, programs using Hypre can be linked with
--L$HYPRE_LIB -lHYPRE -lm -lmkl_gf_lp64 -lmkl_gnu_thread -lmkl_core -lgomp -lpthread
-"""
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-
-toolchainopts = {'pic': True, 'usempi': True, 'openmp': True}
-
-source_urls = ["https://github.com/hypre-space/hypre/archive/"]
-sources = ['v%(version)s.tar.gz']
-patches = ["hypre-%(version)s_examples_mkl.patch"]
-checksums = [
-    '8a9f9fb6f65531b77e4c319bf35bfc9d34bf529c36afe08837f56b635ac052e2',  # v2.23.0.tar.gz
-    '33acfe9f0bcae8bdf3f3405351a8dd06d9c2d424f2b16d9eb1bc05c3d8dd6190',  # hypre-2.23.0_examples_mkl.patch
-]
-
-start_dir = 'src'
-
-dependencies = [('CUDA', '11.5', '', SYSTEM)]
-
-
-configopts = '--with-openmp '
-configopts += '--enable-mixedint '
-configopts += '--enable-unified-memory '
-
-postinstallcmds = [
-    "cp -r %(builddir)s/hypre-%(version)s/src/examples %(installdir)s/examples",
-    "mv %(installdir)s/examples/Makefile_gnu %(installdir)s/examples/Makefile",
-    "rm %(installdir)s/examples/Makefile*orig",
-    "rm %(installdir)s/examples/Makefile_*",
-    "cp %(builddir)s/hypre-%(version)s/src/HYPRE_config.h %(installdir)s/include",
-    "chmod 755 %(installdir)s/examples/vis",
-    "chmod 755 %(installdir)s/examples/docs",
-]
-
-modextravars = {
-    'HYPRE_ROOT': '%(installdir)s',
-    'HYPRE_LIB': '%(installdir)s/lib',
-    'HYPRE_INCLUDE': '%(installdir)s/include/'
-}
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/h/Hypre/Hypre-2.23.0-gpsmkl-2021b.eb b/Golden_Repo/h/Hypre/Hypre-2.23.0-gpsmkl-2021b.eb
deleted file mode 100644
index c61f5ff24..000000000
--- a/Golden_Repo/h/Hypre/Hypre-2.23.0-gpsmkl-2021b.eb
+++ /dev/null
@@ -1,54 +0,0 @@
-name = "Hypre"
-version = "2.23.0"
-
-homepage = "https://computation.llnl.gov/casc/linear_solvers/sls_hypre.html"
-description = """Hypre is a library for solving large, sparse linear 
-systems of equations on massively parallel computers.
-The problems of interest arise in the simulation codes being developed 
-at LLNL and elsewhere to study physical phenomena in the defense, 
-environmental, energy, and biological sciences.
-"""
-
-examples = """Examples can be found in $EBROOTHYPRE/examples."""
-
-usage = """
-Hypre uses LAPACK, programs using Hypre can be linked with
--L$HYPRE_LIB -lHYPRE -lm -lmkl_gf_lp64 -lmkl_gnu_thread -lmkl_core -lgomp -lpthread
-"""
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-
-toolchainopts = {'pic': True, 'usempi': True, 'openmp': True}
-
-source_urls = ["https://github.com/hypre-space/hypre/archive/"]
-sources = ['v%(version)s.tar.gz']
-patches = ["hypre-%(version)s_examples_mkl.patch"]
-checksums = [
-    '8a9f9fb6f65531b77e4c319bf35bfc9d34bf529c36afe08837f56b635ac052e2',  # v2.23.0.tar.gz
-    '33acfe9f0bcae8bdf3f3405351a8dd06d9c2d424f2b16d9eb1bc05c3d8dd6190',  # hypre-2.23.0_examples_mkl.patch
-]
-
-start_dir = 'src'
-
-dependencies = [('CUDA', '11.5', '', SYSTEM)]
-
-configopts = '--with-openmp '
-configopts += '--enable-unified-memory '
-
-postinstallcmds = [
-    "cp -r %(builddir)s/hypre-%(version)s/src/examples %(installdir)s/examples",
-    "mv %(installdir)s/examples/Makefile_gnu %(installdir)s/examples/Makefile",
-    "rm %(installdir)s/examples/Makefile*orig",
-    "rm %(installdir)s/examples/Makefile_*",
-    "cp %(builddir)s/hypre-%(version)s/src/HYPRE_config.h %(installdir)s/include",
-    "chmod 755 %(installdir)s/examples/vis",
-    "chmod 755 %(installdir)s/examples/docs",
-]
-
-modextravars = {
-    'HYPRE_ROOT': '%(installdir)s',
-    'HYPRE_LIB': '%(installdir)s/lib',
-    'HYPRE_INCLUDE': '%(installdir)s/include/'
-}
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/h/Hypre/Hypre-2.23.0-intel-2021b-mixedint.eb b/Golden_Repo/h/Hypre/Hypre-2.23.0-intel-2021b-mixedint.eb
deleted file mode 100644
index e11bc3a89..000000000
--- a/Golden_Repo/h/Hypre/Hypre-2.23.0-intel-2021b-mixedint.eb
+++ /dev/null
@@ -1,56 +0,0 @@
-name = "Hypre"
-version = "2.23.0"
-versionsuffix = "-mixedint"
-
-homepage = "https://computation.llnl.gov/casc/linear_solvers/sls_hypre.html"
-description = """Hypre is a library for solving large, sparse linear 
-systems of equations on massively parallel computers.
-The problems of interest arise in the simulation codes being developed 
-at LLNL and elsewhere to study physical phenomena in the defense, 
-environmental, energy, and biological sciences.
-"""
-
-examples = """Examples can be found in $EBROOTHYPRE/examples."""
-
-usage = """
-Hypre uses LAPACK, programs using Hypre can be linked with
--L$HYPRE_LIB -lHYPRE -lm -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lpthread
-"""
-
-toolchain = {'name': 'intel', 'version': '2021b'}
-
-toolchainopts = {'pic': True, 'usempi': True, 'openmp': True}
-
-source_urls = ["https://github.com/hypre-space/hypre/archive/"]
-sources = ['v%(version)s.tar.gz']
-patches = ["hypre-%(version)s_examples_mkl.patch"]
-checksums = [
-    '8a9f9fb6f65531b77e4c319bf35bfc9d34bf529c36afe08837f56b635ac052e2',  # v2.23.0.tar.gz
-    '33acfe9f0bcae8bdf3f3405351a8dd06d9c2d424f2b16d9eb1bc05c3d8dd6190',  # hypre-2.23.0_examples_mkl.patch
-]
-
-start_dir = 'src'
-
-dependencies = [('CUDA', '11.5', '', SYSTEM)]
-
-
-configopts = '--with-openmp '
-configopts += '--enable-mixedint '
-configopts += '--enable-unified-memory '
-
-postinstallcmds = [
-    "cp -r %(builddir)s/hypre-%(version)s/src/examples %(installdir)s/examples",
-    "rm %(installdir)s/examples/Makefile_gnu*",
-    "rm %(installdir)s/examples/Makefile*orig",
-    "cp %(builddir)s/hypre-%(version)s/src/HYPRE_config.h %(installdir)s/include",
-    "chmod 755 %(installdir)s/examples/vis",
-    "chmod 755 %(installdir)s/examples/docs",
-]
-
-modextravars = {
-    'HYPRE_ROOT': '%(installdir)s',
-    'HYPRE_LIB': '%(installdir)s/lib',
-    'HYPRE_INCLUDE': '%(installdir)s/include/'
-}
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/h/Hypre/Hypre-2.23.0-intel-2021b.eb b/Golden_Repo/h/Hypre/Hypre-2.23.0-intel-2021b.eb
deleted file mode 100644
index 9f1ea53d6..000000000
--- a/Golden_Repo/h/Hypre/Hypre-2.23.0-intel-2021b.eb
+++ /dev/null
@@ -1,54 +0,0 @@
-name = "Hypre"
-version = "2.23.0"
-
-homepage = "https://computation.llnl.gov/casc/linear_solvers/sls_hypre.html"
-description = """Hypre is a library for solving large, sparse linear 
-systems of equations on massively parallel computers.
-The problems of interest arise in the simulation codes being developed 
-at LLNL and elsewhere to study physical phenomena in the defense, 
-environmental, energy, and biological sciences.
-"""
-
-examples = """Examples can be found in $EBROOTHYPRE/examples."""
-
-usage = """
-Hypre uses LAPACK, programs using Hypre can be linked with
--L$HYPRE_LIB -lHYPRE -lm -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lpthread
-"""
-
-toolchain = {'name': 'intel', 'version': '2021b'}
-
-toolchainopts = {'pic': True, 'usempi': True, 'openmp': True}
-
-source_urls = ["https://github.com/hypre-space/hypre/archive/"]
-sources = ['v%(version)s.tar.gz']
-patches = ["hypre-%(version)s_examples_mkl.patch"]
-checksums = [
-    '8a9f9fb6f65531b77e4c319bf35bfc9d34bf529c36afe08837f56b635ac052e2',  # v2.23.0.tar.gz
-    '33acfe9f0bcae8bdf3f3405351a8dd06d9c2d424f2b16d9eb1bc05c3d8dd6190',  # hypre-2.23.0_examples_mkl.patch
-]
-
-start_dir = 'src'
-
-dependencies = [('CUDA', '11.5', '', SYSTEM)]
-
-
-configopts = '--with-openmp '
-configopts += '--enable-unified-memory '
-
-postinstallcmds = [
-    "cp -r %(builddir)s/hypre-%(version)s/src/examples %(installdir)s/examples",
-    "rm %(installdir)s/examples/Makefile_gnu*",
-    "rm %(installdir)s/examples/Makefile*orig",
-    "cp %(builddir)s/hypre-%(version)s/src/HYPRE_config.h %(installdir)s/include",
-    "chmod 755 %(installdir)s/examples/vis",
-    "chmod 755 %(installdir)s/examples/docs",
-]
-
-modextravars = {
-    'HYPRE_ROOT': '%(installdir)s',
-    'HYPRE_LIB': '%(installdir)s/lib',
-    'HYPRE_INCLUDE': '%(installdir)s/include/'
-}
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/h/Hypre/Hypre-2.23.0-intel-para-2021b-mixedint.eb b/Golden_Repo/h/Hypre/Hypre-2.23.0-intel-para-2021b-mixedint.eb
deleted file mode 100644
index 51d4fec56..000000000
--- a/Golden_Repo/h/Hypre/Hypre-2.23.0-intel-para-2021b-mixedint.eb
+++ /dev/null
@@ -1,56 +0,0 @@
-name = "Hypre"
-version = "2.23.0"
-versionsuffix = "-mixedint"
-
-homepage = "https://computation.llnl.gov/casc/linear_solvers/sls_hypre.html"
-description = """Hypre is a library for solving large, sparse linear 
-systems of equations on massively parallel computers.
-The problems of interest arise in the simulation codes being developed 
-at LLNL and elsewhere to study physical phenomena in the defense, 
-environmental, energy, and biological sciences.
-"""
-
-examples = """Examples can be found in $EBROOTHYPRE/examples."""
-
-usage = """
-Hypre uses LAPACK, programs using Hypre can be linked with
--L$HYPRE_LIB -lHYPRE -lm -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lpthread
-"""
-
-toolchain = {'name': 'intel-para', 'version': '2021b'}
-
-toolchainopts = {'pic': True, 'usempi': True, 'openmp': True}
-
-source_urls = ["https://github.com/hypre-space/hypre/archive/"]
-sources = ['v%(version)s.tar.gz']
-patches = ["hypre-%(version)s_examples_mkl.patch"]
-checksums = [
-    '8a9f9fb6f65531b77e4c319bf35bfc9d34bf529c36afe08837f56b635ac052e2',  # v2.23.0.tar.gz
-    '33acfe9f0bcae8bdf3f3405351a8dd06d9c2d424f2b16d9eb1bc05c3d8dd6190',  # hypre-2.23.0_examples_mkl.patch
-]
-
-start_dir = 'src'
-
-dependencies = [('CUDA', '11.5', '', SYSTEM)]
-
-
-configopts = '--with-openmp '
-configopts += '--enable-mixedint '
-configopts += '--enable-unified-memory '
-
-postinstallcmds = [
-    "cp -r %(builddir)s/hypre-%(version)s/src/examples %(installdir)s/examples",
-    "rm %(installdir)s/examples/Makefile_gnu*",
-    "rm %(installdir)s/examples/Makefile*orig",
-    "cp %(builddir)s/hypre-%(version)s/src/HYPRE_config.h %(installdir)s/include",
-    "chmod 755 %(installdir)s/examples/vis",
-    "chmod 755 %(installdir)s/examples/docs",
-]
-
-modextravars = {
-    'HYPRE_ROOT': '%(installdir)s',
-    'HYPRE_LIB': '%(installdir)s/lib',
-    'HYPRE_INCLUDE': '%(installdir)s/include/'
-}
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/h/Hypre/Hypre-2.23.0-intel-para-2021b.eb b/Golden_Repo/h/Hypre/Hypre-2.23.0-intel-para-2021b.eb
deleted file mode 100644
index 69a9691b7..000000000
--- a/Golden_Repo/h/Hypre/Hypre-2.23.0-intel-para-2021b.eb
+++ /dev/null
@@ -1,54 +0,0 @@
-name = "Hypre"
-version = "2.23.0"
-
-homepage = "https://computation.llnl.gov/casc/linear_solvers/sls_hypre.html"
-description = """Hypre is a library for solving large, sparse linear 
-systems of equations on massively parallel computers.
-The problems of interest arise in the simulation codes being developed 
-at LLNL and elsewhere to study physical phenomena in the defense, 
-environmental, energy, and biological sciences.
-"""
-
-examples = """Examples can be found in $EBROOTHYPRE/examples."""
-
-usage = """
-Hypre uses LAPACK, programs using Hypre can be linked with
--L$HYPRE_LIB -lHYPRE -lm -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lpthread
-"""
-
-toolchain = {'name': 'intel-para', 'version': '2021b'}
-
-toolchainopts = {'pic': True, 'usempi': True, 'openmp': True}
-
-source_urls = ["https://github.com/hypre-space/hypre/archive/"]
-sources = ['v%(version)s.tar.gz']
-patches = ["hypre-%(version)s_examples_mkl.patch"]
-checksums = [
-    '8a9f9fb6f65531b77e4c319bf35bfc9d34bf529c36afe08837f56b635ac052e2',  # v2.23.0.tar.gz
-    '33acfe9f0bcae8bdf3f3405351a8dd06d9c2d424f2b16d9eb1bc05c3d8dd6190',  # hypre-2.23.0_examples_mkl.patch
-]
-
-start_dir = 'src'
-
-dependencies = [('CUDA', '11.5', '', SYSTEM)]
-
-
-configopts = '--with-openmp '
-configopts += '--enable-unified-memory '
-
-postinstallcmds = [
-    "cp -r %(builddir)s/hypre-%(version)s/src/examples %(installdir)s/examples",
-    "rm %(installdir)s/examples/Makefile_gnu*",
-    "rm %(installdir)s/examples/Makefile*orig",
-    "cp %(builddir)s/hypre-%(version)s/src/HYPRE_config.h %(installdir)s/include",
-    "chmod 755 %(installdir)s/examples/vis",
-    "chmod 755 %(installdir)s/examples/docs",
-]
-
-modextravars = {
-    'HYPRE_ROOT': '%(installdir)s',
-    'HYPRE_LIB': '%(installdir)s/lib',
-    'HYPRE_INCLUDE': '%(installdir)s/include/'
-}
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/h/Hypre/Hypre-2.23.0-iomkl-2021b-mixedint.eb b/Golden_Repo/h/Hypre/Hypre-2.23.0-iomkl-2021b-mixedint.eb
deleted file mode 100644
index 937b180e9..000000000
--- a/Golden_Repo/h/Hypre/Hypre-2.23.0-iomkl-2021b-mixedint.eb
+++ /dev/null
@@ -1,56 +0,0 @@
-name = "Hypre"
-version = "2.23.0"
-versionsuffix = "-mixedint"
-
-homepage = "https://computation.llnl.gov/casc/linear_solvers/sls_hypre.html"
-description = """Hypre is a library for solving large, sparse linear 
-systems of equations on massively parallel computers.
-The problems of interest arise in the simulation codes being developed 
-at LLNL and elsewhere to study physical phenomena in the defense, 
-environmental, energy, and biological sciences.
-"""
-
-examples = """Examples can be found in $EBROOTHYPRE/examples."""
-
-usage = """
-Hypre uses LAPACK, programs using Hypre can be linked with
--L$HYPRE_LIB -lHYPRE -lm -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lpthread
-"""
-
-toolchain = {'name': 'iomkl', 'version': '2021b'}
-
-toolchainopts = {'pic': True, 'usempi': True, 'openmp': True}
-
-source_urls = ["https://github.com/hypre-space/hypre/archive/"]
-sources = ['v%(version)s.tar.gz']
-patches = ["hypre-%(version)s_examples_mkl.patch"]
-checksums = [
-    '8a9f9fb6f65531b77e4c319bf35bfc9d34bf529c36afe08837f56b635ac052e2',  # v2.23.0.tar.gz
-    '33acfe9f0bcae8bdf3f3405351a8dd06d9c2d424f2b16d9eb1bc05c3d8dd6190',  # hypre-2.23.0_examples_mkl.patch
-]
-
-start_dir = 'src'
-
-dependencies = [('CUDA', '11.5', '', SYSTEM)]
-
-
-configopts = '--with-openmp '
-configopts += '--enable-mixedint '
-configopts += '--enable-unified-memory '
-
-postinstallcmds = [
-    "cp -r %(builddir)s/hypre-%(version)s/src/examples %(installdir)s/examples",
-    "rm %(installdir)s/examples/Makefile_gnu*",
-    "rm %(installdir)s/examples/Makefile*orig",
-    "cp %(builddir)s/hypre-%(version)s/src/HYPRE_config.h %(installdir)s/include",
-    "chmod 755 %(installdir)s/examples/vis",
-    "chmod 755 %(installdir)s/examples/docs",
-]
-
-modextravars = {
-    'HYPRE_ROOT': '%(installdir)s',
-    'HYPRE_LIB': '%(installdir)s/lib',
-    'HYPRE_INCLUDE': '%(installdir)s/include/'
-}
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/h/Hypre/Hypre-2.23.0-iomkl-2021b.eb b/Golden_Repo/h/Hypre/Hypre-2.23.0-iomkl-2021b.eb
deleted file mode 100644
index e004201ef..000000000
--- a/Golden_Repo/h/Hypre/Hypre-2.23.0-iomkl-2021b.eb
+++ /dev/null
@@ -1,54 +0,0 @@
-name = "Hypre"
-version = "2.23.0"
-
-homepage = "https://computation.llnl.gov/casc/linear_solvers/sls_hypre.html"
-description = """Hypre is a library for solving large, sparse linear 
-systems of equations on massively parallel computers.
-The problems of interest arise in the simulation codes being developed 
-at LLNL and elsewhere to study physical phenomena in the defense, 
-environmental, energy, and biological sciences.
-"""
-
-examples = """Examples can be found in $EBROOTHYPRE/examples."""
-
-usage = """
-Hypre uses LAPACK, programs using Hypre can be linked with
--L$HYPRE_LIB -lHYPRE -lm -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lpthread
-"""
-
-toolchain = {'name': 'iomkl', 'version': '2021b'}
-
-toolchainopts = {'pic': True, 'usempi': True, 'openmp': True}
-
-source_urls = ["https://github.com/hypre-space/hypre/archive/"]
-sources = ['v%(version)s.tar.gz']
-patches = ["hypre-%(version)s_examples_mkl.patch"]
-checksums = [
-    '8a9f9fb6f65531b77e4c319bf35bfc9d34bf529c36afe08837f56b635ac052e2',  # v2.23.0.tar.gz
-    '33acfe9f0bcae8bdf3f3405351a8dd06d9c2d424f2b16d9eb1bc05c3d8dd6190',  # hypre-2.23.0_examples_mkl.patch
-]
-
-start_dir = 'src'
-
-dependencies = [('CUDA', '11.5', '', SYSTEM)]
-
-
-configopts = '--with-openmp '
-configopts += '--enable-unified-memory '
-
-postinstallcmds = [
-    "cp -r %(builddir)s/hypre-%(version)s/src/examples %(installdir)s/examples",
-    "rm %(installdir)s/examples/Makefile_gnu*",
-    "rm %(installdir)s/examples/Makefile*orig",
-    "cp %(builddir)s/hypre-%(version)s/src/HYPRE_config.h %(installdir)s/include",
-    "chmod 755 %(installdir)s/examples/vis",
-    "chmod 755 %(installdir)s/examples/docs",
-]
-
-modextravars = {
-    'HYPRE_ROOT': '%(installdir)s',
-    'HYPRE_LIB': '%(installdir)s/lib',
-    'HYPRE_INCLUDE': '%(installdir)s/include/'
-}
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/h/Hypre/hypre-2.23.0_examples_mkl.patch b/Golden_Repo/h/Hypre/hypre-2.23.0_examples_mkl.patch
deleted file mode 100644
index 78bf894f6..000000000
--- a/Golden_Repo/h/Hypre/hypre-2.23.0_examples_mkl.patch
+++ /dev/null
@@ -1,536 +0,0 @@
-diff -Nru hypre-2.23.0/src/examples/Makefile hypre-2.23.0_ok/src/examples/Makefile
---- hypre-2.23.0/src/examples/Makefile	2021-10-01 00:54:27.000000000 +0200
-+++ hypre-2.23.0_ok/src/examples/Makefile	2021-12-03 15:40:22.296944000 +0100
-@@ -10,15 +10,16 @@
- F77       = mpif77
- CXX       = mpicxx
- F90       = mpifort
--HYPRE_DIR = ../hypre
-+HYPRE_DIR = $(EBROOTHYPRE)
-+BLASLAPACKLIB = -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -liomp5 -lpthread
- 
- ########################################################################
- # Compiling and linking options
- ########################################################################
--COPTS     = -g -Wall
-+COPTS     = -g 
- CINCLUDES = -I$(HYPRE_DIR)/include
- #CDEFS     = -DHYPRE_EXVIS
--CDEFS     = 
-+CDEFS     = -DHAVE_CONFIG_H -DHYPRE_TIMING
- CFLAGS    = $(COPTS) $(CINCLUDES) $(CDEFS)
- FOPTS     = -g
- FINCLUDES = $(CINCLUDES)
-@@ -33,7 +34,7 @@
- 
- 
- LINKOPTS  = $(COPTS)
--LIBS      = -L$(HYPRE_DIR)/lib -lHYPRE -lm
-+LIBS      = -L$(HYPRE_DIR)/lib -lHYPRE $(BLASLAPACKLIB)  -lcurand -lcusparse -lcudart -lm
- LFLAGS    = $(LINKOPTS) $(LIBS) -lstdc++
- LFLAGS_B =\
-  -L${HYPRE_DIR}/lib\
-diff -Nru hypre-2.23.0/src/examples/Makefile_gnu hypre-2.23.0_ok/src/examples/Makefile_gnu
---- hypre-2.23.0/src/examples/Makefile_gnu	1970-01-01 01:00:00.000000000 +0100
-+++ hypre-2.23.0_ok/src/examples/Makefile_gnu	2021-12-03 15:41:04.128749000 +0100
-@@ -0,0 +1,237 @@
-+# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
-+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
-+#
-+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-+
-+########################################################################
-+# Compiler and external dependences
-+########################################################################
-+CC        = mpicc
-+F77       = mpif77
-+CXX       = mpicxx
-+F90       = mpifort
-+HYPRE_DIR = $(EBROOTHYPRE)
-+BLASLAPACKLIB = -lmkl_gf_lp64 -lmkl_gnu_thread -lmkl_core -lgomp -lpthread -lm -ldl
-+
-+########################################################################
-+# Compiling and linking options
-+########################################################################
-+COPTS     = -g 
-+CINCLUDES = -I$(HYPRE_DIR)/include
-+#CDEFS     = -DHYPRE_EXVIS
-+CDEFS     = -DHAVE_CONFIG_H -DHYPRE_TIMING
-+CFLAGS    = $(COPTS) $(CINCLUDES) $(CDEFS)
-+FOPTS     = -g
-+FINCLUDES = $(CINCLUDES)
-+FFLAGS    = $(FOPTS) $(FINCLUDES)
-+CXXOPTS   = $(COPTS) -Wno-deprecated
-+CXXINCLUDES = $(CINCLUDES) -I..
-+CXXDEFS   = $(CDEFS)
-+IFLAGS_BXX = 
-+CXXFLAGS  = $(CXXOPTS) $(CXXINCLUDES) $(CXXDEFS) $(IFLAGS_BXX)
-+IF90FLAGS = 
-+F90FLAGS = $(FFLAGS) $(IF90FLAGS)
-+
-+
-+LINKOPTS  = $(COPTS)
-+LIBS      = -L$(HYPRE_DIR)/lib -lHYPRE $(BLASLAPACKLIB) -lcurand -lcusparse -lcudart -lm
-+LFLAGS    = $(LINKOPTS) $(LIBS) -lstdc++
-+LFLAGS_B =\
-+ -L${HYPRE_DIR}/lib\
-+ -lbHYPREClient-C\
-+ -lbHYPREClient-CX\
-+ -lbHYPREClient-F\
-+ -lbHYPRE\
-+ -lsidl -ldl -lxml2
-+LFLAGS77 = $(LFLAGS)
-+LFLAGS90 =
-+
-+########################################################################
-+# Rules for compiling the source files
-+########################################################################
-+.SUFFIXES: .c .f .cxx .f90
-+
-+.c.o:
-+	$(CC) $(CFLAGS) -c $<
-+.f.o:
-+	$(F77) $(FFLAGS) -c $<
-+.cxx.o:
-+	$(CXX) $(CXXFLAGS) -c $<
-+
-+########################################################################
-+# List of all programs to be compiled
-+########################################################################
-+ALLPROGS = ex1 ex2 ex3 ex4 ex5 ex5f ex6 ex7 ex8 ex9 ex11 ex12 ex12f \
-+           ex13 ex14 ex15 ex16
-+BIGINTPROGS = ex5big ex15big
-+FORTRANPROGS = ex5f ex12f
-+MAXDIMPROGS = ex17 ex18
-+COMPLEXPROGS = ex18comp
-+
-+all: $(ALLPROGS)
-+
-+default: all
-+
-+bigint: $(BIGINTPROGS)
-+
-+fortran: $(FORTRANPROGS)
-+
-+maxdim: $(MAXDIMPROGS)
-+
-+complex: $(COMPLEXPROGS)
-+
-+########################################################################
-+# Example 1
-+########################################################################
-+ex1: ex1.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 2
-+########################################################################
-+ex2: ex2.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 3
-+########################################################################
-+ex3: ex3.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 4
-+########################################################################
-+ex4: ex4.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 5
-+########################################################################
-+ex5: ex5.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 5 with 64-bit integers
-+########################################################################
-+ex5big: ex5big.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 5 Fortran 77
-+########################################################################
-+ex5f: ex5f.o
-+	$(F77) -o $@ $^ $(LFLAGS77)
-+
-+########################################################################
-+# Example 6
-+########################################################################
-+ex6: ex6.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 7
-+########################################################################
-+ex7: ex7.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 8
-+########################################################################
-+ex8: ex8.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 9
-+########################################################################
-+ex9: ex9.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 10
-+########################################################################
-+ex10: ex10.o
-+	$(CXX) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 11
-+########################################################################
-+ex11: ex11.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 12
-+########################################################################
-+ex12: ex12.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 12 Fortran 77
-+########################################################################
-+ex12f: ex12f.o
-+	$(F77) -o $@ $^ $(LFLAGS77)
-+
-+########################################################################
-+# Example 13
-+########################################################################
-+ex13: ex13.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 14
-+########################################################################
-+ex14: ex14.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 15
-+########################################################################
-+ex15: ex15.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 15 with 64-bit integers
-+########################################################################
-+ex15big: ex15big.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 16
-+########################################################################
-+ex16: ex16.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 17
-+########################################################################
-+ex17: ex17.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 18
-+########################################################################
-+ex18: ex18.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 18 (complex)
-+########################################################################
-+ex18comp: ex18comp.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Clean up
-+########################################################################
-+clean:
-+	rm -f $(ALLPROGS:=.o)
-+	rm -f $(BIGINTPROGS:=.o)
-+	rm -f $(FORTRANPROGS:=.o)
-+	rm -f $(MAXDIMPROGS:=.o)
-+	rm -f $(COMPLEXPROGS:=.o)
-+	cd vis; make clean
-+distclean: clean
-+	rm -f $(ALLPROGS) $(ALLPROGS:=*~)
-+	rm -f $(BIGINTPROGS) $(BIGINTPROGS:=*~)
-+	rm -f $(FORTRANLPROGS) $(FORTRANPROGS:=*~)
-+	rm -f $(MAXDIMPROGS) $(MAXDIMPROGS:=*~)
-+	rm -f $(COMPLEXPROGS) $(COMPLEXPROGS:=*~)
-+	rm -fr README*
-diff -Nru hypre-2.23.0/src/examples/Makefile_gnu_cuda hypre-2.23.0_ok/src/examples/Makefile_gnu_cuda
---- hypre-2.23.0/src/examples/Makefile_gnu_cuda	1970-01-01 01:00:00.000000000 +0100
-+++ hypre-2.23.0_ok/src/examples/Makefile_gnu_cuda	2021-12-03 15:41:40.160122000 +0100
-@@ -0,0 +1,238 @@
-+# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
-+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
-+#
-+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-+
-+########################################################################
-+# Compiler and external dependences
-+########################################################################
-+CC        = mpicc
-+F77       = mpif77
-+CXX       = mpicxx
-+F90       = mpifort
-+HYPRE_DIR = $(EBROOTHYPRE)
-+BLASLAPACKLIB = -lmkl_gf_lp64 -lmkl_gnu_thread -lmkl_core -lgomp -lpthread -lm -ldl
-+
-+########################################################################
-+# Compiling and linking options
-+########################################################################
-+COPTS     = -g 
-+CINCLUDES = -I$(HYPRE_DIR)/include
-+#CDEFS     = -DHYPRE_EXVIS
-+CDEFS     = -DHAVE_CONFIG_H -DHYPRE_TIMING
-+CFLAGS    = $(COPTS) $(CINCLUDES) $(CDEFS)
-+FOPTS     = -g
-+FINCLUDES = $(CINCLUDES)
-+FFLAGS    = $(FOPTS) $(FINCLUDES)
-+CXXOPTS   = $(COPTS) -Wno-deprecated
-+CXXINCLUDES = $(CINCLUDES) -I..
-+CXXDEFS   = $(CDEFS)
-+IFLAGS_BXX = 
-+CXXFLAGS  = $(CXXOPTS) $(CXXINCLUDES) $(CXXDEFS) $(IFLAGS_BXX)
-+IF90FLAGS = 
-+F90FLAGS = $(FFLAGS) $(IF90FLAGS)
-+
-+
-+LINKOPTS  = $(COPTS)
-+LIBS      = -L$(HYPRE_DIR)/lib -lHYPRE $(BLASLAPACKLIB) -lcurand -lcusparse -lcudart -lm
-+LFLAGS    = $(LINKOPTS) $(LIBS) -lstdc++
-+LFLAGS_B =\
-+ -L${HYPRE_DIR}/lib\
-+ -lbHYPREClient-C\
-+ -lbHYPREClient-CX\
-+ -lbHYPREClient-F\
-+ -lbHYPRE\
-+ -lsidl -ldl -lxml2
-+LFLAGS77 = $(LFLAGS)
-+LFLAGS90 =
-+
-+########################################################################
-+# Rules for compiling the source files
-+########################################################################
-+.SUFFIXES: .c .f .cxx .f90
-+
-+.c.o:
-+	$(CC) $(CFLAGS) -c $<
-+.f.o:
-+	$(F77) $(FFLAGS) -c $<
-+.cxx.o:
-+	$(CXX) $(CXXFLAGS) -c $<
-+
-+########################################################################
-+# List of all programs to be compiled
-+########################################################################
-+ALLPROGS = ex1 ex2 ex3 ex4 ex5 ex5f ex6 ex7 ex8 ex9 ex11 ex12 ex12f \
-+           ex13 ex14 ex15 ex16
-+BIGINTPROGS = ex5big ex15big
-+FORTRANPROGS = ex5f ex12f
-+MAXDIMPROGS = ex17 ex18
-+COMPLEXPROGS = ex18comp
-+
-+all: $(ALLPROGS)
-+
-+default: all
-+
-+bigint: $(BIGINTPROGS)
-+
-+fortran: $(FORTRANPROGS)
-+
-+maxdim: $(MAXDIMPROGS)
-+
-+complex: $(COMPLEXPROGS)
-+
-+########################################################################
-+# Example 1
-+########################################################################
-+ex1: ex1.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 2
-+########################################################################
-+ex2: ex2.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 3
-+########################################################################
-+ex3: ex3.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 4
-+########################################################################
-+ex4: ex4.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 5
-+########################################################################
-+ex5: ex5.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 5 with 64-bit integers
-+########################################################################
-+ex5big: ex5big.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 5 Fortran 77
-+########################################################################
-+ex5f: ex5f.o
-+	$(F77) -o $@ $^ $(LFLAGS77)
-+
-+########################################################################
-+# Example 6
-+########################################################################
-+ex6: ex6.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 7
-+########################################################################
-+ex7: ex7.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 8
-+########################################################################
-+ex8: ex8.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 9
-+########################################################################
-+ex9: ex9.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 10
-+########################################################################
-+ex10: ex10.o
-+	$(CXX) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 11
-+########################################################################
-+ex11: ex11.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 12
-+########################################################################
-+ex12: ex12.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 12 Fortran 77
-+########################################################################
-+ex12f: ex12f.o
-+	$(F77) -o $@ $^ $(LFLAGS77)
-+
-+########################################################################
-+# Example 13
-+########################################################################
-+ex13: ex13.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 14
-+########################################################################
-+ex14: ex14.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 15
-+########################################################################
-+ex15: ex15.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 15 with 64-bit integers
-+########################################################################
-+ex15big: ex15big.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 16
-+########################################################################
-+ex16: ex16.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 17
-+########################################################################
-+ex17: ex17.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 18
-+########################################################################
-+ex18: ex18.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 18 (complex)
-+########################################################################
-+ex18comp: ex18comp.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Clean up
-+########################################################################
-+clean:
-+	rm -f $(ALLPROGS:=.o)
-+	rm -f $(BIGINTPROGS:=.o)
-+	rm -f $(FORTRANPROGS:=.o)
-+	rm -f $(MAXDIMPROGS:=.o)
-+	rm -f $(COMPLEXPROGS:=.o)
-+	cd vis; make clean
-+distclean: clean
-+	rm -f $(ALLPROGS) $(ALLPROGS:=*~)
-+	rm -f $(BIGINTPROGS) $(BIGINTPROGS:=*~)
-+	rm -f $(FORTRANLPROGS) $(FORTRANPROGS:=*~)
-+	rm -f $(MAXDIMPROGS) $(MAXDIMPROGS:=*~)
-+	rm -f $(COMPLEXPROGS) $(COMPLEXPROGS:=*~)
-+	rm -fr README*
-+
-diff -Nru hypre-2.23.0/src/examples/Makefile_gpu hypre-2.23.0_ok/src/examples/Makefile_gpu
---- hypre-2.23.0/src/examples/Makefile_gpu	2021-12-02 09:45:27.675453000 +0100
-+++ hypre-2.23.0_ok/src/examples/Makefile_gpu	2021-12-03 15:42:30.442247000 +0100
-@@ -26,7 +26,7 @@
- ########################################################################
- # Compiling and linking options
- ########################################################################
--COPTS     = -g -Wall
-+COPTS     = -g 
- CINCLUDES = -I$(HYPRE_DIR)/include $(CUDA_INCL)
- #CDEFS     = -DHYPRE_EXVIS
- CDEFS     = 
-@@ -43,7 +43,7 @@
- F90FLAGS = $(FFLAGS) $(IF90FLAGS)
- 
- LINKOPTS  =
--LIBS      = -L$(HYPRE_DIR)/lib -lHYPRE -lm ${CUDA_LIBS}
-+LIBS      = -L$(HYPRE_DIR)/lib -lHYPRE -lcurand -lcusparse -lcudart -lm ${CUDA_LIBS}
- LFLAGS    = $(LINKOPTS) $(LIBS) $(NVCC_LDFLAGS) -lstdc++
- LFLAGS_B =\
-  -L${HYPRE_DIR}/lib\
diff --git a/Golden_Repo/h/h5py/h5py-3.5.0-GCCcore-11.2.0-serial.eb b/Golden_Repo/h/h5py/h5py-3.5.0-GCCcore-11.2.0-serial.eb
deleted file mode 100644
index 505704584..000000000
--- a/Golden_Repo/h/h5py/h5py-3.5.0-GCCcore-11.2.0-serial.eb
+++ /dev/null
@@ -1,38 +0,0 @@
-easyblock = "PythonPackage"
-
-name = 'h5py'
-version = '3.5.0'
-versionsuffix = '-serial'
-
-homepage = 'http://www.h5py.org/'
-description = """HDF5 for Python (h5py) is a general-purpose Python interface to the Hierarchical Data Format library,
- version 5. HDF5 is a versatile, mature scientific software library designed for the fast, flexible storage of enormous
- amounts of data.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-sources = [SOURCE_TAR_GZ]
-checksums = ['77c7be4001ac7d3ed80477de5b6942501d782de1bbe4886597bdfec2a7ab821f']
-
-builddependencies = [
-    ('pkgconfig', '1.5.5', '-python'),
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('HDF5', '1.12.1', '-serial'),
-]
-
-use_pip = True
-sanity_pip_check = True
-download_dep_fail = True
-
-# h5py's setup.py will disable setup_requires if H5PY_SETUP_REQUIRES is set to 0
-# without this environment variable, pip will fetch the minimum numpy version h5py supports during install,
-# even though SciPy-bundle provides a newer version that satisfies h5py's install_requires dependency.
-preinstallopts = 'HDF5_DIR="$EBROOTHDF5" H5PY_SETUP_REQUIRES=0 '
-
-moduleclass = 'data'
diff --git a/Golden_Repo/h/h5py/h5py-3.5.0-gompi-2021b.eb b/Golden_Repo/h/h5py/h5py-3.5.0-gompi-2021b.eb
deleted file mode 100644
index 39a64a03e..000000000
--- a/Golden_Repo/h/h5py/h5py-3.5.0-gompi-2021b.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-easyblock = "PythonPackage"
-
-name = 'h5py'
-version = '3.5.0'
-
-homepage = 'http://www.h5py.org/'
-description = """HDF5 for Python (h5py) is a general-purpose Python interface to the Hierarchical Data Format library,
- version 5. HDF5 is a versatile, mature scientific software library designed for the fast, flexible storage of enormous
- amounts of data.
-"""
-
-toolchain = {'name': 'gompi', 'version': '2021b'}
-toolchainopts = {'usempi': True}
-
-sources = [SOURCE_TAR_GZ]
-checksums = ['77c7be4001ac7d3ed80477de5b6942501d782de1bbe4886597bdfec2a7ab821f']
-
-builddependencies = [('pkgconfig', '1.5.5', '-python')]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('HDF5', '1.12.1'),
-    ('mpi4py', '3.1.3')
-]
-
-use_pip = True
-sanity_pip_check = True
-download_dep_fail = True
-
-# h5py's setup.py will disable setup_requires if H5PY_SETUP_REQUIRES is set to 0
-# without this environment variable, pip will fetch the minimum numpy version h5py supports during install,
-# even though SciPy-bundle provides a newer version that satisfies h5py's install_requires dependency.
-preinstallopts = 'HDF5_MPI=ON HDF5_DIR="$EBROOTHDF5" H5PY_SETUP_REQUIRES=0 '
-
-moduleclass = 'data'
diff --git a/Golden_Repo/h/h5py/h5py-3.5.0-gpsmpi-2021b.eb b/Golden_Repo/h/h5py/h5py-3.5.0-gpsmpi-2021b.eb
deleted file mode 100644
index b14e5f3d2..000000000
--- a/Golden_Repo/h/h5py/h5py-3.5.0-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-easyblock = "PythonPackage"
-
-name = 'h5py'
-version = '3.5.0'
-
-homepage = 'http://www.h5py.org/'
-description = """HDF5 for Python (h5py) is a general-purpose Python interface to the Hierarchical Data Format library,
- version 5. HDF5 is a versatile, mature scientific software library designed for the fast, flexible storage of enormous
- amounts of data.
-"""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-toolchainopts = {'usempi': True}
-
-sources = [SOURCE_TAR_GZ]
-checksums = ['77c7be4001ac7d3ed80477de5b6942501d782de1bbe4886597bdfec2a7ab821f']
-
-builddependencies = [('pkgconfig', '1.5.5', '-python')]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('HDF5', '1.12.1'),
-    ('mpi4py', '3.1.3')
-]
-
-use_pip = True
-sanity_pip_check = True
-download_dep_fail = True
-
-# h5py's setup.py will disable setup_requires if H5PY_SETUP_REQUIRES is set to 0
-# without this environment variable, pip will fetch the minimum numpy version h5py supports during install,
-# even though SciPy-bundle provides a newer version that satisfies h5py's install_requires dependency.
-preinstallopts = 'HDF5_MPI=ON HDF5_DIR="$EBROOTHDF5" H5PY_SETUP_REQUIRES=0 '
-
-moduleclass = 'data'
diff --git a/Golden_Repo/h/h5py/h5py-3.5.0-iimpi-2021b.eb b/Golden_Repo/h/h5py/h5py-3.5.0-iimpi-2021b.eb
deleted file mode 100644
index 613db3eba..000000000
--- a/Golden_Repo/h/h5py/h5py-3.5.0-iimpi-2021b.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-easyblock = "PythonPackage"
-
-name = 'h5py'
-version = '3.5.0'
-
-homepage = 'http://www.h5py.org/'
-description = """HDF5 for Python (h5py) is a general-purpose Python interface to the Hierarchical Data Format library,
- version 5. HDF5 is a versatile, mature scientific software library designed for the fast, flexible storage of enormous
- amounts of data.
-"""
-
-toolchain = {'name': 'iimpi', 'version': '2021b'}
-toolchainopts = {'usempi': True}
-
-sources = [SOURCE_TAR_GZ]
-checksums = ['77c7be4001ac7d3ed80477de5b6942501d782de1bbe4886597bdfec2a7ab821f']
-
-builddependencies = [('pkgconfig', '1.5.5', '-python')]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('HDF5', '1.12.1'),
-    ('mpi4py', '3.1.3')
-]
-
-use_pip = True
-sanity_pip_check = True
-download_dep_fail = True
-
-# h5py's setup.py will disable setup_requires if H5PY_SETUP_REQUIRES is set to 0
-# without this environment variable, pip will fetch the minimum numpy version h5py supports during install,
-# even though SciPy-bundle provides a newer version that satisfies h5py's install_requires dependency.
-preinstallopts = 'HDF5_MPI=ON HDF5_DIR="$EBROOTHDF5" H5PY_SETUP_REQUIRES=0 '
-
-moduleclass = 'data'
diff --git a/Golden_Repo/h/h5py/h5py-3.5.0-iompi-2021b.eb b/Golden_Repo/h/h5py/h5py-3.5.0-iompi-2021b.eb
deleted file mode 100644
index 9a0125557..000000000
--- a/Golden_Repo/h/h5py/h5py-3.5.0-iompi-2021b.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-easyblock = "PythonPackage"
-
-name = 'h5py'
-version = '3.5.0'
-
-homepage = 'http://www.h5py.org/'
-description = """HDF5 for Python (h5py) is a general-purpose Python interface to the Hierarchical Data Format library,
- version 5. HDF5 is a versatile, mature scientific software library designed for the fast, flexible storage of enormous
- amounts of data.
-"""
-
-toolchain = {'name': 'iompi', 'version': '2021b'}
-toolchainopts = {'usempi': True}
-
-sources = [SOURCE_TAR_GZ]
-checksums = ['77c7be4001ac7d3ed80477de5b6942501d782de1bbe4886597bdfec2a7ab821f']
-
-builddependencies = [('pkgconfig', '1.5.5', '-python')]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('HDF5', '1.12.1'),
-    ('mpi4py', '3.1.3')
-]
-
-use_pip = True
-sanity_pip_check = True
-download_dep_fail = True
-
-# h5py's setup.py will disable setup_requires if H5PY_SETUP_REQUIRES is set to 0
-# without this environment variable, pip will fetch the minimum numpy version h5py supports during install,
-# even though SciPy-bundle provides a newer version that satisfies h5py's install_requires dependency.
-preinstallopts = 'HDF5_MPI=ON HDF5_DIR="$EBROOTHDF5" H5PY_SETUP_REQUIRES=0 '
-
-moduleclass = 'data'
diff --git a/Golden_Repo/h/h5py/h5py-3.5.0-ipsmpi-2021b.eb b/Golden_Repo/h/h5py/h5py-3.5.0-ipsmpi-2021b.eb
deleted file mode 100644
index 8d5f0b5c8..000000000
--- a/Golden_Repo/h/h5py/h5py-3.5.0-ipsmpi-2021b.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-easyblock = "PythonPackage"
-
-name = 'h5py'
-version = '3.5.0'
-
-homepage = 'http://www.h5py.org/'
-description = """HDF5 for Python (h5py) is a general-purpose Python interface to the Hierarchical Data Format library,
- version 5. HDF5 is a versatile, mature scientific software library designed for the fast, flexible storage of enormous
- amounts of data.
-"""
-
-toolchain = {'name': 'ipsmpi', 'version': '2021b'}
-toolchainopts = {'usempi': True}
-
-sources = [SOURCE_TAR_GZ]
-checksums = ['77c7be4001ac7d3ed80477de5b6942501d782de1bbe4886597bdfec2a7ab821f']
-
-builddependencies = [('pkgconfig', '1.5.5', '-python')]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('HDF5', '1.12.1'),
-    ('mpi4py', '3.1.3')
-]
-
-use_pip = True
-sanity_pip_check = True
-download_dep_fail = True
-
-# h5py's setup.py will disable setup_requires if H5PY_SETUP_REQUIRES is set to 0
-# without this environment variable, pip will fetch the minimum numpy version h5py supports during install,
-# even though SciPy-bundle provides a newer version that satisfies h5py's install_requires dependency.
-preinstallopts = 'HDF5_MPI=ON HDF5_DIR="$EBROOTHDF5" H5PY_SETUP_REQUIRES=0 '
-
-moduleclass = 'data'
diff --git a/Golden_Repo/h/h5py/h5py-3.5.0-npsmpic-2021b.eb b/Golden_Repo/h/h5py/h5py-3.5.0-npsmpic-2021b.eb
deleted file mode 100644
index 05f9ce4c0..000000000
--- a/Golden_Repo/h/h5py/h5py-3.5.0-npsmpic-2021b.eb
+++ /dev/null
@@ -1,37 +0,0 @@
-easyblock = "PythonPackage"
-
-name = 'h5py'
-version = '3.5.0'
-
-homepage = 'http://www.h5py.org/'
-description = """HDF5 for Python (h5py) is a general-purpose Python interface to the Hierarchical Data Format library,
- version 5. HDF5 is a versatile, mature scientific software library designed for the fast, flexible storage of enormous
- amounts of data.
-"""
-
-toolchain = {'name': 'npsmpic', 'version': '2021b'}
-toolchainopts = {'usempi': True}
-
-sources = [SOURCE_TAR_GZ]
-checksums = ['77c7be4001ac7d3ed80477de5b6942501d782de1bbe4886597bdfec2a7ab821f']
-
-builddependencies = [('pkgconfig', '1.5.5', '-python')]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('HDF5', '1.12.1'),
-    ('mpi4py', '3.1.3')
-]
-
-use_pip = True
-sanity_pip_check = True
-download_dep_fail = True
-
-# h5py's setup.py will disable setup_requires if H5PY_SETUP_REQUIRES is set to 0
-# without this environment variable, pip will fetch the minimum numpy version h5py supports during install,
-# even though SciPy-bundle provides a newer version that satisfies h5py's install_requires dependency.
-preinstallopts = 'HDF5_MPI=ON HDF5_DIR="$EBROOTHDF5" H5PY_SETUP_REQUIRES=0 '
-preinstallopts += 'CFLAGS="-noswitcherror" '
-
-moduleclass = 'data'
diff --git a/Golden_Repo/h/h5py/h5py-3.5.0-nvompic-2021b.eb b/Golden_Repo/h/h5py/h5py-3.5.0-nvompic-2021b.eb
deleted file mode 100644
index 5b422172d..000000000
--- a/Golden_Repo/h/h5py/h5py-3.5.0-nvompic-2021b.eb
+++ /dev/null
@@ -1,37 +0,0 @@
-easyblock = "PythonPackage"
-
-name = 'h5py'
-version = '3.5.0'
-
-homepage = 'http://www.h5py.org/'
-description = """HDF5 for Python (h5py) is a general-purpose Python interface to the Hierarchical Data Format library,
- version 5. HDF5 is a versatile, mature scientific software library designed for the fast, flexible storage of enormous
- amounts of data.
-"""
-
-toolchain = {'name': 'nvompic', 'version': '2021b'}
-toolchainopts = {'usempi': True}
-
-sources = [SOURCE_TAR_GZ]
-checksums = ['77c7be4001ac7d3ed80477de5b6942501d782de1bbe4886597bdfec2a7ab821f']
-
-builddependencies = [('pkgconfig', '1.5.5', '-python')]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('HDF5', '1.12.1'),
-    ('mpi4py', '3.1.3')
-]
-
-use_pip = True
-sanity_pip_check = True
-download_dep_fail = True
-
-# h5py's setup.py will disable setup_requires if H5PY_SETUP_REQUIRES is set to 0
-# without this environment variable, pip will fetch the minimum numpy version h5py supports during install,
-# even though SciPy-bundle provides a newer version that satisfies h5py's install_requires dependency.
-preinstallopts = 'HDF5_MPI=ON HDF5_DIR="$EBROOTHDF5" H5PY_SETUP_REQUIRES=0 '
-preinstallopts += 'CFLAGS="-noswitcherror" '
-
-moduleclass = 'data'
diff --git a/Golden_Repo/h/help2man/help2man-1.48.3-GCCcore-11.2.0.eb b/Golden_Repo/h/help2man/help2man-1.48.3-GCCcore-11.2.0.eb
deleted file mode 100644
index c0c5e7c26..000000000
--- a/Golden_Repo/h/help2man/help2man-1.48.3-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,27 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'help2man'
-version = '1.48.3'
-
-homepage = 'https://www.gnu.org/software/help2man/'
-description = """help2man produces simple manual pages from the '--help' and '--version' output of other commands."""
-
-site_contacts = 'sc@fz-juelich.de'
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [GNU_SOURCE]
-sources = [SOURCE_TAR_XZ]
-checksums = ['8361ff3c643fbd391064e97e5f54592ca28b880eaffbf566a68e0ad800d1a8ac']
-
-builddependencies = [
-    # use same binutils version that was used when building GCC toolchain
-    ('binutils', '2.37', '', True),
-]
-
-sanity_check_paths = {
-    'files': ['bin/help2man'],
-    'dirs': [],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/h/hwloc/hwloc-2.5.0-GCCcore-11.2.0.eb b/Golden_Repo/h/hwloc/hwloc-2.5.0-GCCcore-11.2.0.eb
deleted file mode 100644
index 0798e4dae..000000000
--- a/Golden_Repo/h/hwloc/hwloc-2.5.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,52 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'hwloc'
-version = '2.5.0'
-
-homepage = 'https://www.open-mpi.org/projects/hwloc/'
-
-description = """
- The Portable Hardware Locality (hwloc) software package provides a portable
- abstraction (across OS, versions, architectures, ...) of the hierarchical
- topology of modern architectures, including NUMA memory nodes, sockets, shared
- caches, cores and simultaneous multithreading. It also gathers various system
- attributes such as cache and memory information as well as the locality of I/O
- devices such as network interfaces, InfiniBand HCAs or GPUs. It primarily
- aims at helping applications with gathering information about modern computing
- hardware so as to exploit it accordingly and efficiently.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-# need to build with -fno-tree-vectorize to avoid segfaulting lstopo on Intel Skylake
-# cfr. https://github.com/open-mpi/hwloc/issues/315
-toolchainopts = {'vectorize': False}
-
-source_urls = ['https://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
-sources = [SOURCE_TAR_GZ]
-checksums = ['38aa8102faec302791f6b4f0d23960a3ffa25af3af6af006c64dbecac23f852c']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('numactl', '2.0.14', '', SYSTEM),
-    ('libxml2', '2.9.10'),
-    ('libpciaccess', '0.16'),
-    ('CUDA', '11.5', '', SYSTEM),
-]
-
-configopts = "--enable-libnuma=$EBROOTNUMACTL --enable-cuda --enable-nvml --enable-opencl "
-configopts += "--disable-cairo --disable-gl --disable-libudev "
-
-sanity_check_paths = {
-    'files': ['bin/lstopo', 'include/hwloc/linux.h',
-              'lib/libhwloc.%s' % SHLIB_EXT],
-    'dirs': ['share/man/man3'],
-}
-sanity_check_commands = ['lstopo']
-
-modluafooter = '''
-add_property("arch","gpu")
-'''
-moduleclass = 'system'
diff --git a/Golden_Repo/h/hypothesis/hypothesis-6.14.6-GCCcore-11.2.0.eb b/Golden_Repo/h/hypothesis/hypothesis-6.14.6-GCCcore-11.2.0.eb
deleted file mode 100644
index c0818d95b..000000000
--- a/Golden_Repo/h/hypothesis/hypothesis-6.14.6-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,24 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'hypothesis'
-version = '6.14.6'
-
-homepage = "https://github.com/HypothesisWorks/hypothesis"
-description = """Hypothesis is an advanced testing library for Python. It lets you write tests which are parametrized
- by a source of examples, and then generates simple and comprehensible examples that make your tests fail. This lets
- you find more bugs in your code with less work."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-sources = [SOURCE_TAR_GZ]
-checksums = ['2586eae07e48b35ab5a2d61d607d29ba76939ce140c427d66ccf5db4ddc788d2']
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [('Python', '3.9.6')]
-
-use_pip = True
-download_dep_fail = True
-sanity_pip_check = True
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/i/ICU/ICU-70.1-GCCcore-11.2.0.eb b/Golden_Repo/i/ICU/ICU-70.1-GCCcore-11.2.0.eb
deleted file mode 100644
index b84f818ba..000000000
--- a/Golden_Repo/i/ICU/ICU-70.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,27 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'ICU'
-version = '70.1'
-
-homepage = 'https://site.icu-project.org/home'
-description = """ICU is a mature, widely used set of C/C++ and Java libraries providing Unicode and Globalization
-support for software applications."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-
-source_urls = ['https://github.com/unicode-org/icu/releases/download/release-%(version_major)s-%(version_minor)s']
-sources = ['icu4c-%(version_major)s_%(version_minor)s-src.tgz']
-checksums = ['8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5']
-
-builddependencies = [('binutils', '2.37')]
-
-start_dir = 'source'
-
-sanity_check_paths = {
-    'files': ['lib/libicu%s.%s' % (x, SHLIB_EXT) for x in ['data', 'i18n', 'io', 'test', 'tu', 'uc']],
-    'dirs': ['bin', 'include/unicode', 'share/icu', 'share/man'],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/i/IRkernel/IRkernel-1.3-gcccoremkl-11.2.0-2021.4.0-R-4.1.2.eb b/Golden_Repo/i/IRkernel/IRkernel-1.3-gcccoremkl-11.2.0-2021.4.0-R-4.1.2.eb
deleted file mode 100644
index d5aee92b1..000000000
--- a/Golden_Repo/i/IRkernel/IRkernel-1.3-gcccoremkl-11.2.0-2021.4.0-R-4.1.2.eb
+++ /dev/null
@@ -1,66 +0,0 @@
-easyblock = 'Bundle'
-
-name = 'IRkernel'
-version = '1.3'
-versionsuffix = '-R-%(rver)s'
-
-homepage = 'https://github.com/baktoft/yaps'
-description = "IRKernel"
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-dependencies = [
-    ('R', '4.1.2'),
-    ('ZeroMQ', '4.3.4'),  # for pbdZMQ needed by IRkernel
-]
-
-exts_default_options = {
-    'source_urls': [
-        'https://cran.r-project.org/src/contrib/Archive/%(name)s',  # package archive
-        'https://cran.r-project.org/src/contrib/',  # current version of packages
-        'https://cran.freestatistics.org/src/contrib',  # mirror alternative for current packages
-    ],
-    'source_tmpl': '%(name)s_%(version)s.tar.gz'
-}
-
-exts_defaultclass = 'RPackage'
-exts_filter = ("R -q --no-save", "library(%(ext_name)s)")
-
-exts_list = [
-    ('repr', '1.1.4', {
-        'checksums': ['6f799ca83e0940618dd8c22e62ffdce5ec11ba3366c5306ae58b55b53c097040'],
-    }),
-    ('IRdisplay', '1.1', {
-        'checksums': ['83eb030ff91f546cb647899f8aa3f5dc9fe163a89a981696447ea49cc98e8d2b'],
-    }),
-    ('pbdZMQ', '0.3-7', {
-        'checksums': ['df2d2be14b2f57a64d76cdda4c01fd1c3d9aa12221c63524c01c71849df11808'],
-    }),
-    ('xmlparsedata', '1.0.5', {
-        'checksums': ['766034ab5e9728609bd240c9954d23ca0cdb881a98a31b9d3e1c8767c7b7cbb0'],
-    }),
-    ('cyclocomp', '1.1.0', {
-        'checksums': ['cdbf65f87bccac53c1527a2f1269ec7840820c18503a7bb854910b30b71e7e3e'],
-    }),
-    ('collections', '0.3.5', {
-        'checksums': ['bf76ab5c6a8082b6bb70b9bf3bdb30658e823e3b7b28cf7be7e8a87d117a7114'],
-    }),
-    ('lintr', '2.0.1', {
-        'checksums': ['fe0723757b653ef83ec7a5005d0a7524cd917d646d35a5627ee639158881ce93'],
-    }),
-    ('languageserver', '0.3.12', {
-        'checksums': ['431514b49f8049c07b24e1571f79663b791239ebbc87e4f2a77c6482ac95ba36'],
-    }),
-    (name, version, {
-        'checksums': ['5a7fcbfd978dfb3cca6702a68a21c147551995fc400084ae8382ffcbbdae1903'],
-    }),
-]
-
-modextrapaths = {'R_LIBS': ''}
-
-sanity_check_paths = {
-    'files': [],
-    'dirs': [name],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/i/ISL/ISL-0.24-GCCcore-11.2.0.eb b/Golden_Repo/i/ISL/ISL-0.24-GCCcore-11.2.0.eb
deleted file mode 100644
index 6138d673f..000000000
--- a/Golden_Repo/i/ISL/ISL-0.24-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,23 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'ISL'
-version = '0.24'
-
-homepage = 'http://isl.gforge.inria.fr/'
-description = "isl is a library for manipulating sets and relations of integer points bounded by linear constraints."
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['http://isl.gforge.inria.fr/']
-sources = [SOURCELOWER_TAR_BZ2]
-checksums = ['fcf78dd9656c10eb8cf9fbd5f59a0b6b01386205fe1934b3b287a0a1898145c0']
-
-builddependencies = [('binutils', '2.37')]
-dependencies = [('GMP', '6.2.1')]
-
-sanity_check_paths = {
-    'files': ['lib/libisl.%s' % SHLIB_EXT, 'lib/libisl.a'],
-    'dirs': ['include/isl']
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/i/ITK/ITK-5.2.1-GCCcore-11.2.0-nompi.eb b/Golden_Repo/i/ITK/ITK-5.2.1-GCCcore-11.2.0-nompi.eb
deleted file mode 100644
index f1fffd576..000000000
--- a/Golden_Repo/i/ITK/ITK-5.2.1-GCCcore-11.2.0-nompi.eb
+++ /dev/null
@@ -1,176 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'ITK'
-version = '5.2.1'
-versionsuffix = '-nompi'
-
-homepage = 'https://itk.org'
-description = """Insight Segmentation and Registration Toolkit (ITK) provides
- an extensive suite of software tools for registering and segmenting
- multidimensional imaging data."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/InsightSoftwareConsortium/ITK/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['6022b2b64624b8bcec3333fe48d5f74ff6ebceb3bdf98258ba7d7fbbc76b99ab']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1', '', SYSTEM),
-    ('Bison', '3.7.6'),
-    ('pkg-config', '0.29.2'),
-    ('Perl', '5.34.0'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('HDF5', '1.12.1', '-serial'),
-    ('SWIG', '4.0.2',),
-    ('libpng', '1.6.37'),
-    ('LibTIFF', '4.3.0'),
-    ('expat', '2.4.1'),
-    ('Eigen', '3.3.9'),
-    ('FFTW', '3.3.10', '-nompi'),
-    ('ICU', '70.1'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('double-conversion', '3.1.6'),
-    # ('ParaView', '5.9.1'),
-    ('tbb', '2020.3'),
-    ('Qt5', '5.15.2'),
-    ('OpenGL', '2021b'),
-    ('X11', '20210802'),
-    ('SciPy-bundle', '2021.10', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-]
-
-separate_build_dir = True
-
-configopts = "-DCMAKE_BUILD_TYPE=Release "
-configopts += "-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON "
-
-configopts += "-DBUILD_SHARED_LIBS=ON "
-configopts += "-DBUILD_TESTING=OFF "
-# configopts += "-DITK_FORBID_DOWNLOADS=ON "
-
-configopts += "-DITK_LEGACY_SILENT=ON "
-
-configopts += "-DITK_USE_SYSTEM_SWIG=ON "
-configopts += "-DSWIG_EXECUTABLE=${EBROOTSWIG}/bin/swig "
-configopts += "-DSWIG_DIR=${EBROOTSWIG} "
-
-configopts += "-DITK_USE_SYSTEM_EIGEN=ON "
-configopts += "-DEigen3_DIR=$EBROOTEIGEN/share/eigen3/cmake "
-
-configopts += "-DITK_USE_SYSTEM_HDF5=ON "
-configopts += "-DHDF5_DIR=$EBROOTHDF5 "
-
-configopts += "-DITK_USE_SYSTEM_ICU=ON "
-configopts += "-DICU_DIR=$EBROOTICU "
-
-configopts += "-DITK_USE_SYSTEM_FFTW=ON "
-configopts += "-DFFTW_DIR=$EBROOTFFTW "
-
-configopts += "-DITK_USE_SYSTEM_JPEG=ON "
-configopts += "-DJPEG_DIR=$EBROOTLIBJPEGMINTURBO "
-
-configopts += "-DITK_USE_SYSTEM_DOUBLECONVERSION=ON "
-configopts += "-DDOUBLECONVERSION_DIR=$EBROOTDOUBLEMINCONVERSION "
-
-configopts += "-DITK_USE_SYSTEM_PNG=ON "
-configopts += "-DPNG_DIR=$EBROOTLIBPNG "
-
-configopts += "-DITK_USE_SYSTEM_TIFF=ON "
-configopts += "-DTIFF_DIR=$EBROOTTIFF "
-
-configopts += "-DITK_USE_SYSTEM_ZLIB=ON "
-configopts += "-DZLIB_DIR=$EBROOTZLIB "
-
-configopts += "-DITK_WRAP_PYTHON=ON "
-configopts += "-DModule_ITKReview=ON "
-
-# configopts += "-DITK_USE_CUFFTW=ON "
-# configopts += "-DITK_USE_GPU=ON "  # GPU acceleration via OpenCL"
-
-# configopts="-DModule_ITKVtkGlue=ON ${configopts} "
-# configopts="-DVTK_DIR=$EBROOTPARAVIEW/lib64/cmake/paraview-5.8/vtk ${configopts} "
-# configopts="-DVTK_INCLUDE_DIRS=$EBROOTPARAVIEW/include/paraview-5.8 ${configopts} "
-# configopts="-DVTK_LIBRARIES=$EBROOTPARAVIEW/lib64 ${configopts} "
-
-# Module_AdaptiveDenoising         OFF
-# Module_AnalyzeObjectLabelMap     OFF
-# Module_AnisotropicDiffusionLBR   OFF
-# Module_BSplineGradient           OFF
-# Module_BioCell                   OFF
-# Module_BoneEnhancement           OFF
-# Module_BoneMorphometry           OFF
-# Module_Cuberille                 OFF
-# Module_FixedPointInverseDispla   OFF
-# Module_GenericLabelInterpolato   OFF
-# Module_HigherOrderAccurateGrad   OFF
-# Module_IOFDF                     OFF
-# Module_IOMeshSTL                 OFF
-# Module_IOOpenSlide               OFF
-# Module_IOScanco                  OFF
-# Module_IOTransformDCMTK          OFF
-# Module_ITKDCMTK                  OFF
-# Module_ITKDeprecated             OFF
-# Module_ITKFEM                    OFF
-# Module_ITKFEMRegistration        OFF
-# Module_ITKIODCMTK                OFF
-# Module_ITKIOPhilipsREC           OFF
-# Module_ITKIOTransformMINC        OFF
-# Module_ITKReview                 ON
-# Module_ITKTBB                    OFF
-# Module_ITKVideoBridgeOpenCV      OFF
-# Module_ITKVideoBridgeVXL         OFF
-# Module_ITKVtkGlue                OFF
-# Module_IsotropicWavelets         OFF
-# Module_LabelErodeDilate          OFF
-# Module_LesionSizingToolkit       OFF
-# Module_MGHIO                     OFF
-# Module_MeshNoise                 OFF
-# Module_MinimalPathExtraction     OFF
-# Module_Montage                   OFF
-# Module_MorphologicalContourInt   OFF
-# Module_MultipleImageIterator     OFF
-# Module_ParabolicMorphology       OFF
-# Module_PerformanceBenchmarking   OFF
-# Module_PhaseSymmetry             OFF
-# Module_PolarTransform            OFF
-# Module_PrincipalComponentsAnal   OFF
-# Module_RLEImage                  OFF
-# Module_RTK                       OFF
-# Module_SCIFIO                    OFF
-# Module_SimpleITKFilters          OFF
-# Module_SkullStrip                OFF
-# Module_SmoothingRecursiveYvvGa   OFF
-# Module_SphinxExamples            OFF
-# Module_SplitComponents           OFF
-# Module_Strain                    OFF
-# Module_SubdivisionQuadEdgeMesh   OFF
-# Module_TextureFeatures           OFF
-# Module_Thickness3D               OFF
-# Module_TotalVariation            OFF
-# Module_TubeTK                    OFF
-# Module_TwoProjectionRegistrati   OFF
-# Module_Ultrasound                OFF
-# Module_VariationalRegistration   OFF
-
-preinstallopts = "export PYTHONPATH=%(installdir)s/lib/python%(pyshortver)s/site-packages:$PYTHONPATH && "
-
-modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
-
-sanity_check_paths = {
-    'files': ['bin/itkTestDriver',
-              'lib/libITKVTK-%(version_major_minor)s.so',
-              'lib/libITKIOJPEG-%(version_major_minor)s.so',
-              'lib/libITKCommon-%(version_major_minor)s.so'],
-    'dirs': ['include/ITK-%(version_major_minor)s',
-             'lib/python%(pyshortver)s/site-packages',
-             'share'],
-}
-
-sanity_check_commands = [('python', "-c 'import %(namelower)s'")]
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/i/ITK/ITK-5.2.1-gompi-2021b.eb b/Golden_Repo/i/ITK/ITK-5.2.1-gompi-2021b.eb
deleted file mode 100644
index 1f846c3bf..000000000
--- a/Golden_Repo/i/ITK/ITK-5.2.1-gompi-2021b.eb
+++ /dev/null
@@ -1,175 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'ITK'
-version = '5.2.1'
-
-homepage = 'https://itk.org'
-description = """Insight Segmentation and Registration Toolkit (ITK) provides
- an extensive suite of software tools for registering and segmenting
- multidimensional imaging data."""
-
-toolchain = {'name': 'gompi', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': False}
-
-source_urls = ['https://github.com/InsightSoftwareConsortium/ITK/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['6022b2b64624b8bcec3333fe48d5f74ff6ebceb3bdf98258ba7d7fbbc76b99ab']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1', '', SYSTEM),
-    ('Bison', '3.7.6'),
-    ('pkg-config', '0.29.2'),
-    ('Perl', '5.34.0'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('HDF5', '1.12.1', '-serial'),
-    ('SWIG', '4.0.2',),
-    ('libpng', '1.6.37'),
-    ('LibTIFF', '4.3.0'),
-    ('expat', '2.4.1'),
-    ('Eigen', '3.3.9'),
-    ('FFTW', '3.3.10', '-nompi'),
-    ('ICU', '70.1'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('double-conversion', '3.1.6'),
-    # ('ParaView', '5.9.1'),
-    ('tbb', '2020.3'),
-    ('Qt5', '5.15.2'),
-    ('OpenGL', '2021b'),
-    ('X11', '20210802'),
-    ('SciPy-bundle', '2021.10', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-]
-
-separate_build_dir = True
-
-configopts = "-DCMAKE_BUILD_TYPE=Release "
-configopts += "-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON "
-
-configopts += "-DBUILD_SHARED_LIBS=ON "
-configopts += "-DBUILD_TESTING=OFF "
-# configopts += "-DITK_FORBID_DOWNLOADS=ON "
-
-configopts += "-DITK_LEGACY_SILENT=ON "
-
-configopts += "-DITK_USE_SYSTEM_SWIG=ON "
-configopts += "-DSWIG_EXECUTABLE=${EBROOTSWIG}/bin/swig "
-configopts += "-DSWIG_DIR=${EBROOTSWIG} "
-
-configopts += "-DITK_USE_SYSTEM_EIGEN=ON "
-configopts += "-DEigen3_DIR=$EBROOTEIGEN/share/eigen3/cmake "
-
-configopts += "-DITK_USE_SYSTEM_HDF5=ON "
-configopts += "-DHDF5_DIR=$EBROOTHDF5 "
-
-configopts += "-DITK_USE_SYSTEM_ICU=ON "
-configopts += "-DICU_DIR=$EBROOTICU "
-
-configopts += "-DITK_USE_SYSTEM_FFTW=ON "
-configopts += "-DFFTW_DIR=$EBROOTFFTW "
-
-configopts += "-DITK_USE_SYSTEM_JPEG=ON "
-configopts += "-DJPEG_DIR=$EBROOTLIBJPEGMINTURBO "
-
-configopts += "-DITK_USE_SYSTEM_DOUBLECONVERSION=ON "
-configopts += "-DDOUBLECONVERSION_DIR=$EBROOTDOUBLEMINCONVERSION "
-
-configopts += "-DITK_USE_SYSTEM_PNG=ON "
-configopts += "-DPNG_DIR=$EBROOTLIBPNG "
-
-configopts += "-DITK_USE_SYSTEM_TIFF=ON "
-configopts += "-DTIFF_DIR=$EBROOTTIFF "
-
-configopts += "-DITK_USE_SYSTEM_ZLIB=ON "
-configopts += "-DZLIB_DIR=$EBROOTZLIB "
-
-configopts += "-DITK_WRAP_PYTHON=ON "
-configopts += "-DModule_ITKReview=ON "
-
-# configopts += "-DITK_USE_CUFFTW=ON "
-# configopts += "-DITK_USE_GPU=ON "  # GPU acceleration via OpenCL"
-
-# configopts="-DModule_ITKVtkGlue=ON ${configopts} "
-# configopts="-DVTK_DIR=$EBROOTPARAVIEW/lib64/cmake/paraview-5.8/vtk ${configopts} "
-# configopts="-DVTK_INCLUDE_DIRS=$EBROOTPARAVIEW/include/paraview-5.8 ${configopts} "
-# configopts="-DVTK_LIBRARIES=$EBROOTPARAVIEW/lib64 ${configopts} "
-
-# Module_AdaptiveDenoising         OFF
-# Module_AnalyzeObjectLabelMap     OFF
-# Module_AnisotropicDiffusionLBR   OFF
-# Module_BSplineGradient           OFF
-# Module_BioCell                   OFF
-# Module_BoneEnhancement           OFF
-# Module_BoneMorphometry           OFF
-# Module_Cuberille                 OFF
-# Module_FixedPointInverseDispla   OFF
-# Module_GenericLabelInterpolato   OFF
-# Module_HigherOrderAccurateGrad   OFF
-# Module_IOFDF                     OFF
-# Module_IOMeshSTL                 OFF
-# Module_IOOpenSlide               OFF
-# Module_IOScanco                  OFF
-# Module_IOTransformDCMTK          OFF
-# Module_ITKDCMTK                  OFF
-# Module_ITKDeprecated             OFF
-# Module_ITKFEM                    OFF
-# Module_ITKFEMRegistration        OFF
-# Module_ITKIODCMTK                OFF
-# Module_ITKIOPhilipsREC           OFF
-# Module_ITKIOTransformMINC        OFF
-# Module_ITKReview                 ON
-# Module_ITKTBB                    OFF
-# Module_ITKVideoBridgeOpenCV      OFF
-# Module_ITKVideoBridgeVXL         OFF
-# Module_ITKVtkGlue                OFF
-# Module_IsotropicWavelets         OFF
-# Module_LabelErodeDilate          OFF
-# Module_LesionSizingToolkit       OFF
-# Module_MGHIO                     OFF
-# Module_MeshNoise                 OFF
-# Module_MinimalPathExtraction     OFF
-# Module_Montage                   OFF
-# Module_MorphologicalContourInt   OFF
-# Module_MultipleImageIterator     OFF
-# Module_ParabolicMorphology       OFF
-# Module_PerformanceBenchmarking   OFF
-# Module_PhaseSymmetry             OFF
-# Module_PolarTransform            OFF
-# Module_PrincipalComponentsAnal   OFF
-# Module_RLEImage                  OFF
-# Module_RTK                       OFF
-# Module_SCIFIO                    OFF
-# Module_SimpleITKFilters          OFF
-# Module_SkullStrip                OFF
-# Module_SmoothingRecursiveYvvGa   OFF
-# Module_SphinxExamples            OFF
-# Module_SplitComponents           OFF
-# Module_Strain                    OFF
-# Module_SubdivisionQuadEdgeMesh   OFF
-# Module_TextureFeatures           OFF
-# Module_Thickness3D               OFF
-# Module_TotalVariation            OFF
-# Module_TubeTK                    OFF
-# Module_TwoProjectionRegistrati   OFF
-# Module_Ultrasound                OFF
-# Module_VariationalRegistration   OFF
-
-preinstallopts = "export PYTHONPATH=%(installdir)s/lib/python%(pyshortver)s/site-packages:$PYTHONPATH && "
-
-modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
-
-sanity_check_paths = {
-    'files': ['bin/itkTestDriver',
-              'lib/libITKVTK-%(version_major_minor)s.so',
-              'lib/libITKIOJPEG-%(version_major_minor)s.so',
-              'lib/libITKCommon-%(version_major_minor)s.so'],
-    'dirs': ['include/ITK-%(version_major_minor)s',
-             'lib/python%(pyshortver)s/site-packages',
-             'share'],
-}
-
-sanity_check_commands = [('python', "-c 'import %(namelower)s'")]
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/i/ITK/ITK-5.2.1-gpsmpi-2021b.eb b/Golden_Repo/i/ITK/ITK-5.2.1-gpsmpi-2021b.eb
deleted file mode 100644
index 79ae70414..000000000
--- a/Golden_Repo/i/ITK/ITK-5.2.1-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,177 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'ITK'
-version = '5.2.1'
-
-homepage = 'https://itk.org'
-description = """Insight Segmentation and Registration Toolkit (ITK) provides
- an extensive suite of software tools for registering and segmenting
- multidimensional imaging data."""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': False}
-
-source_urls = ['https://github.com/InsightSoftwareConsortium/ITK/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['6022b2b64624b8bcec3333fe48d5f74ff6ebceb3bdf98258ba7d7fbbc76b99ab']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1', '', SYSTEM),
-    ('Bison', '3.7.6'),
-    ('pkg-config', '0.29.2'),
-    ('Perl', '5.34.0'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('HDF5', '1.12.1', '-serial'),
-    ('SWIG', '4.0.2',),
-    ('libpng', '1.6.37'),
-    ('LibTIFF', '4.3.0'),
-    ('expat', '2.4.1'),
-    ('Eigen', '3.3.9'),
-    ('FFTW', '3.3.10', '-nompi'),
-    ('ICU', '70.1'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('double-conversion', '3.1.6'),
-    # ('ParaView', '5.9.1'),
-    ('tbb', '2020.3'),
-    ('Qt5', '5.15.2'),
-    ('OpenGL', '2021b'),
-    ('X11', '20210802'),
-    ('SciPy-bundle', '2021.10', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-]
-
-separate_build_dir = True
-
-configopts = "-DCMAKE_BUILD_TYPE=Release "
-configopts += "-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON "
-
-configopts += "-DBUILD_SHARED_LIBS=ON "
-configopts += "-DBUILD_TESTING=OFF "
-# configopts += "-DITK_FORBID_DOWNLOADS=ON "
-
-configopts += "-DITKV4_COMPATIBILITY=ON "
-configopts += "-DITK_LEGACY_SILENT=ON "
-
-configopts += "-DITK_USE_SYSTEM_SWIG=ON "
-configopts += "-DSWIG_EXECUTABLE=${EBROOTSWIG}/bin/swig "
-configopts += "-DSWIG_DIR=${EBROOTSWIG} "
-
-configopts += "-DITK_USE_SYSTEM_EIGEN=ON "
-configopts += "-DEigen3_DIR=$EBROOTEIGEN/share/eigen3/cmake "
-
-configopts += "-DITK_USE_SYSTEM_HDF5=ON "
-configopts += "-DHDF5_DIR=$EBROOTHDF5 "
-
-configopts += "-DITK_USE_SYSTEM_ICU=ON "
-configopts += "-DICU_DIR=$EBROOTICU "
-
-configopts += "-DITK_USE_SYSTEM_FFTW=ON "
-configopts += "-DFFTW_DIR=$EBROOTFFTW "
-
-configopts += "-DITK_USE_SYSTEM_JPEG=ON "
-configopts += "-DJPEG_DIR=$EBROOTLIBJPEGMINTURBO "
-
-# req. double-conversion > 3.1.5 (which is not released, yet)
-# configopts += "-DITK_USE_SYSTEM_DOUBLECONVERSION=ON "
-# configopts += "-DDOUBLECONVERSION_DIR=$EBROOTDOUBLEMINCONVERSION "
-
-configopts += "-DITK_USE_SYSTEM_PNG=ON "
-configopts += "-DPNG_DIR=$EBROOTLIBPNG "
-
-configopts += "-DITK_USE_SYSTEM_TIFF=ON "
-configopts += "-DTIFF_DIR=$EBROOTTIFF "
-
-configopts += "-DITK_USE_SYSTEM_ZLIB=ON "
-configopts += "-DZLIB_DIR=$EBROOTZLIB "
-
-configopts += "-DITK_WRAP_PYTHON=ON "
-configopts += "-DModule_ITKReview=ON "
-
-# configopts += "-DITK_USE_CUFFTW=ON "
-# configopts += "-DITK_USE_GPU=ON "  # GPU acceleration via OpenCL"
-
-# configopts="-DModule_ITKVtkGlue=ON ${configopts} "
-# configopts="-DVTK_DIR=$EBROOTPARAVIEW/lib64/cmake/paraview-5.8/vtk ${configopts} "
-# configopts="-DVTK_INCLUDE_DIRS=$EBROOTPARAVIEW/include/paraview-5.8 ${configopts} "
-# configopts="-DVTK_LIBRARIES=$EBROOTPARAVIEW/lib64 ${configopts} "
-
-# Module_AdaptiveDenoising         OFF
-# Module_AnalyzeObjectLabelMap     OFF
-# Module_AnisotropicDiffusionLBR   OFF
-# Module_BSplineGradient           OFF
-# Module_BioCell                   OFF
-# Module_BoneEnhancement           OFF
-# Module_BoneMorphometry           OFF
-# Module_Cuberille                 OFF
-# Module_FixedPointInverseDispla   OFF
-# Module_GenericLabelInterpolato   OFF
-# Module_HigherOrderAccurateGrad   OFF
-# Module_IOFDF                     OFF
-# Module_IOMeshSTL                 OFF
-# Module_IOOpenSlide               OFF
-# Module_IOScanco                  OFF
-# Module_IOTransformDCMTK          OFF
-# Module_ITKDCMTK                  OFF
-# Module_ITKDeprecated             OFF
-# Module_ITKFEM                    OFF
-# Module_ITKFEMRegistration        OFF
-# Module_ITKIODCMTK                OFF
-# Module_ITKIOPhilipsREC           OFF
-# Module_ITKIOTransformMINC        OFF
-# Module_ITKReview                 ON
-# Module_ITKTBB                    OFF
-# Module_ITKVideoBridgeOpenCV      OFF
-# Module_ITKVideoBridgeVXL         OFF
-# Module_ITKVtkGlue                OFF
-# Module_IsotropicWavelets         OFF
-# Module_LabelErodeDilate          OFF
-# Module_LesionSizingToolkit       OFF
-# Module_MGHIO                     OFF
-# Module_MeshNoise                 OFF
-# Module_MinimalPathExtraction     OFF
-# Module_Montage                   OFF
-# Module_MorphologicalContourInt   OFF
-# Module_MultipleImageIterator     OFF
-# Module_ParabolicMorphology       OFF
-# Module_PerformanceBenchmarking   OFF
-# Module_PhaseSymmetry             OFF
-# Module_PolarTransform            OFF
-# Module_PrincipalComponentsAnal   OFF
-# Module_RLEImage                  OFF
-# Module_RTK                       OFF
-# Module_SCIFIO                    OFF
-# Module_SimpleITKFilters          OFF
-# Module_SkullStrip                OFF
-# Module_SmoothingRecursiveYvvGa   OFF
-# Module_SphinxExamples            OFF
-# Module_SplitComponents           OFF
-# Module_Strain                    OFF
-# Module_SubdivisionQuadEdgeMesh   OFF
-# Module_TextureFeatures           OFF
-# Module_Thickness3D               OFF
-# Module_TotalVariation            OFF
-# Module_TubeTK                    OFF
-# Module_TwoProjectionRegistrati   OFF
-# Module_Ultrasound                OFF
-# Module_VariationalRegistration   OFF
-
-preinstallopts = "export PYTHONPATH=%(installdir)s/lib/python%(pyshortver)s/site-packages:$PYTHONPATH && "
-
-modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
-
-sanity_check_paths = {
-    'files': ['bin/itkTestDriver',
-              'lib/libITKVTK-%(version_major_minor)s.so',
-              'lib/libITKIOJPEG-%(version_major_minor)s.so',
-              'lib/libITKCommon-%(version_major_minor)s.so'],
-    'dirs': ['include/ITK-%(version_major_minor)s',
-             'lib/python%(pyshortver)s/site-packages',
-             'share'],
-}
-
-sanity_check_commands = [('python', "-c 'import %(namelower)s'")]
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/i/ITSTool/ITSTool-2.0.7-GCCcore-11.2.0.eb b/Golden_Repo/i/ITSTool/ITSTool-2.0.7-GCCcore-11.2.0.eb
deleted file mode 100644
index 35a7384ad..000000000
--- a/Golden_Repo/i/ITSTool/ITSTool-2.0.7-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,28 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'ITSTool'
-version = '2.0.7'
-
-homepage = 'http://itstool.org/'
-description = "ITS Tool allows you to translate your XML documents with PO files"
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['http://files.itstool.org/itstool/']
-sources = [SOURCELOWER_TAR_BZ2]
-checksums = ['6b9a7cd29a12bb95598f5750e8763cee78836a1a207f85b74d8b3275b27e87ca']
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('libxml2-python', '2.9.10'),
-]
-
-sanity_check_paths = {
-    'files': ['bin/itstool'],
-    'dirs': ['share/itstool/its', 'share/man'],
-}
-sanity_check_commands = ["itstool --help"]
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/i/ImageMagick/ImageMagick-7.1.0-13-GCCcore-11.2.0.eb b/Golden_Repo/i/ImageMagick/ImageMagick-7.1.0-13-GCCcore-11.2.0.eb
deleted file mode 100644
index 8ce94893b..000000000
--- a/Golden_Repo/i/ImageMagick/ImageMagick-7.1.0-13-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,44 +0,0 @@
-# This file is an EasyBuild reciPY as per https://github.com/easybuilders/easybuild
-# Author: Ravi Tripathi
-# Email: ravi89@uab.edu
-
-easyblock = 'ConfigureMake'
-
-name = 'ImageMagick'
-version = '7.1.0-13'
-
-homepage = 'http://www.imagemagick.org/'
-description = """ImageMagick is a software suite to create, edit, compose, or convert bitmap images"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://github.com/ImageMagick/ImageMagick/archive/']
-sources = ['%(version)s.tar.gz']
-checksums = ['7272dbf89734a30b3e1801dffcd6139c771bb9ab5de1abd3ec9efa3798fdfc0c']
-
-dependencies = [
-    ('bzip2', '1.0.8'),
-    ('X11', '20210802'),
-    ('Ghostscript', '9.54.0'),
-    ('JasPer', '2.0.33'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('LibTIFF', '4.3.0'),
-    ('LittleCMS', '2.12'),
-    ('OpenEXR', '3.1.1'),
-]
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('pkg-config', '0.29.2'),
-]
-
-configopts = "--with-gslib --with-x"
-
-sanity_check_paths = {
-    'files': [],
-    'dirs': ['bin', 'etc/%(name)s-%(version_major)s', 'include/%(name)s-%(version_major)s', 'lib', 'share'],
-}
-
-modextravars = {'MAGICK_HOME': '%(installdir)s'}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/i/Inspector/Inspector-2022.0.0.eb b/Golden_Repo/i/Inspector/Inspector-2022.0.0.eb
deleted file mode 100644
index 2c901cebf..000000000
--- a/Golden_Repo/i/Inspector/Inspector-2022.0.0.eb
+++ /dev/null
@@ -1,24 +0,0 @@
-name = 'Inspector'
-version = '2022.0.0'
-
-homepage = 'https://software.intel.com/en-us/inspector'
-description = """Intel Inspector is a dynamic memory and threading error
- checking tool for users developing serial and parallel applications"""
-
-toolchain = SYSTEM
-
-source_urls = [
-    'https://registrationcenter-download.intel.com/akdlm/irc_nas/18239/']
-sources = ['l_inspector_oneapi_p_%(version)s.266_offline.sh']
-checksums = ['79a0eb2ae3f1de1e3456076685680c468702922469c3fda3e074718fb0bea741']
-
-dontcreateinstalldir = True
-
-requires_runtime_license = False
-
-sanity_check_paths = {
-    'files': ['inspector/%s/bin64/inspxe-cl' % version],
-    'dirs': ['inspector/%s/bin64' % version, 'inspector/%s/bin32' % version]
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/i/iimpi/iimpi-2021b.eb b/Golden_Repo/i/iimpi/iimpi-2021b.eb
deleted file mode 100644
index 16600a0f9..000000000
--- a/Golden_Repo/i/iimpi/iimpi-2021b.eb
+++ /dev/null
@@ -1,18 +0,0 @@
-# This is an easyconfig file for EasyBuild, see http://easybuilders.github.io/easybuild
-easyblock = 'Toolchain'
-
-name = 'iimpi'
-version = '2021b'
-
-homepage = 'https://software.intel.com/parallel-studio-xe'
-description = """Intel C/C++ and Fortran compilers, alongside Intel MPI."""
-
-toolchain = SYSTEM
-
-local_comp_ver = '2021.4.0'
-dependencies = [
-    ('intel-compilers', local_comp_ver),
-    ('impi', local_comp_ver, '', ('intel-compilers', local_comp_ver)),
-]
-
-moduleclass = 'toolchain'
diff --git a/Golden_Repo/i/imkl/imkl-2021.4.0-gompi-2021b.eb b/Golden_Repo/i/imkl/imkl-2021.4.0-gompi-2021b.eb
deleted file mode 100644
index a324b655e..000000000
--- a/Golden_Repo/i/imkl/imkl-2021.4.0-gompi-2021b.eb
+++ /dev/null
@@ -1,39 +0,0 @@
-name = 'imkl'
-version = '2021.4.0'
-
-homepage = 'https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onemkl.html'
-description = "Intel oneAPI Math Kernel Library"
-
-toolchain = {'name': 'gompi', 'version': '2021b'}
-
-# see https://software.intel.com/content/www/us/en/develop/articles/oneapi-standalone-components.html
-source_urls = [
-    'https://registrationcenter-download.intel.com/akdlm/irc_nas/18222/']
-sources = ['l_onemkl_p_%(version)s.640_offline.sh']
-checksums = ['9ad546f05a421b4f439e8557fd0f2d83d5e299b0d9bd84bdd86be6feba0c3915']
-
-local_libdir = '%(installdir)s/mkl/latest/lib/intel64'
-
-postinstallcmds = [
-    # create sym links
-    'ln -s %s/libmkl_vml_avx2.so.1       %s/libmkl_vml_avx2.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_avx512_mic.so.1 %s/libmkl_vml_avx512_mic.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_avx512.so.1     %s/libmkl_vml_avx512.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_avx.so.1        %s/libmkl_vml_avx.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_cmpt.so.1       %s/libmkl_vml_cmpt.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_def.so.1        %s/libmkl_vml_def.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_mc2.so.1        %s/libmkl_vml_mc2.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_mc3.so.1        %s/libmkl_vml_mc3.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_mc.so.1         %s/libmkl_vml_mc.so' % (
-        local_libdir, local_libdir),
-]
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/i/imkl/imkl-2021.4.0-gpsmpi-2021b.eb b/Golden_Repo/i/imkl/imkl-2021.4.0-gpsmpi-2021b.eb
deleted file mode 100644
index aa8b0d0fc..000000000
--- a/Golden_Repo/i/imkl/imkl-2021.4.0-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,39 +0,0 @@
-name = 'imkl'
-version = '2021.4.0'
-
-homepage = 'https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onemkl.html'
-description = "Intel oneAPI Math Kernel Library"
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-
-# see https://software.intel.com/content/www/us/en/develop/articles/oneapi-standalone-components.html
-source_urls = [
-    'https://registrationcenter-download.intel.com/akdlm/irc_nas/18222/']
-sources = ['l_onemkl_p_%(version)s.640_offline.sh']
-checksums = ['9ad546f05a421b4f439e8557fd0f2d83d5e299b0d9bd84bdd86be6feba0c3915']
-
-local_libdir = '%(installdir)s/mkl/latest/lib/intel64'
-
-postinstallcmds = [
-    # create sym links
-    'ln -s %s/libmkl_vml_avx2.so.1       %s/libmkl_vml_avx2.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_avx512_mic.so.1 %s/libmkl_vml_avx512_mic.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_avx512.so.1     %s/libmkl_vml_avx512.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_avx.so.1        %s/libmkl_vml_avx.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_cmpt.so.1       %s/libmkl_vml_cmpt.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_def.so.1        %s/libmkl_vml_def.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_mc2.so.1        %s/libmkl_vml_mc2.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_mc3.so.1        %s/libmkl_vml_mc3.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_mc.so.1         %s/libmkl_vml_mc.so' % (
-        local_libdir, local_libdir),
-]
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/i/imkl/imkl-2021.4.0-iimpi-2021b.eb b/Golden_Repo/i/imkl/imkl-2021.4.0-iimpi-2021b.eb
deleted file mode 100644
index 3807d69f8..000000000
--- a/Golden_Repo/i/imkl/imkl-2021.4.0-iimpi-2021b.eb
+++ /dev/null
@@ -1,39 +0,0 @@
-name = 'imkl'
-version = '2021.4.0'
-
-homepage = 'https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onemkl.html'
-description = "Intel oneAPI Math Kernel Library"
-
-toolchain = {'name': 'iimpi', 'version': '2021b'}
-
-# see https://software.intel.com/content/www/us/en/develop/articles/oneapi-standalone-components.html
-source_urls = [
-    'https://registrationcenter-download.intel.com/akdlm/irc_nas/18222/']
-sources = ['l_onemkl_p_%(version)s.640_offline.sh']
-checksums = ['9ad546f05a421b4f439e8557fd0f2d83d5e299b0d9bd84bdd86be6feba0c3915']
-
-local_libdir = '%(installdir)s/mkl/latest/lib/intel64'
-
-postinstallcmds = [
-    # create sym links
-    'ln -s %s/libmkl_vml_avx2.so.1       %s/libmkl_vml_avx2.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_avx512_mic.so.1 %s/libmkl_vml_avx512_mic.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_avx512.so.1     %s/libmkl_vml_avx512.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_avx.so.1        %s/libmkl_vml_avx.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_cmpt.so.1       %s/libmkl_vml_cmpt.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_def.so.1        %s/libmkl_vml_def.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_mc2.so.1        %s/libmkl_vml_mc2.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_mc3.so.1        %s/libmkl_vml_mc3.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_mc.so.1         %s/libmkl_vml_mc.so' % (
-        local_libdir, local_libdir),
-]
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/i/imkl/imkl-2021.4.0-iompi-2021b.eb b/Golden_Repo/i/imkl/imkl-2021.4.0-iompi-2021b.eb
deleted file mode 100644
index 600183356..000000000
--- a/Golden_Repo/i/imkl/imkl-2021.4.0-iompi-2021b.eb
+++ /dev/null
@@ -1,39 +0,0 @@
-name = 'imkl'
-version = '2021.4.0'
-
-homepage = 'https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onemkl.html'
-description = "Intel oneAPI Math Kernel Library"
-
-toolchain = {'name': 'iompi', 'version': '2021b'}
-
-# see https://software.intel.com/content/www/us/en/develop/articles/oneapi-standalone-components.html
-source_urls = [
-    'https://registrationcenter-download.intel.com/akdlm/irc_nas/18222/']
-sources = ['l_onemkl_p_%(version)s.640_offline.sh']
-checksums = ['9ad546f05a421b4f439e8557fd0f2d83d5e299b0d9bd84bdd86be6feba0c3915']
-
-local_libdir = '%(installdir)s/mkl/latest/lib/intel64'
-
-postinstallcmds = [
-    # create sym links
-    'ln -s %s/libmkl_vml_avx2.so.1       %s/libmkl_vml_avx2.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_avx512_mic.so.1 %s/libmkl_vml_avx512_mic.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_avx512.so.1     %s/libmkl_vml_avx512.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_avx.so.1        %s/libmkl_vml_avx.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_cmpt.so.1       %s/libmkl_vml_cmpt.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_def.so.1        %s/libmkl_vml_def.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_mc2.so.1        %s/libmkl_vml_mc2.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_mc3.so.1        %s/libmkl_vml_mc3.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_mc.so.1         %s/libmkl_vml_mc.so' % (
-        local_libdir, local_libdir),
-]
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/i/imkl/imkl-2021.4.0-ipsmpi-2021b.eb b/Golden_Repo/i/imkl/imkl-2021.4.0-ipsmpi-2021b.eb
deleted file mode 100644
index e9d316563..000000000
--- a/Golden_Repo/i/imkl/imkl-2021.4.0-ipsmpi-2021b.eb
+++ /dev/null
@@ -1,39 +0,0 @@
-name = 'imkl'
-version = '2021.4.0'
-
-homepage = 'https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onemkl.html'
-description = "Intel oneAPI Math Kernel Library"
-
-toolchain = {'name': 'ipsmpi', 'version': '2021b'}
-
-# see https://software.intel.com/content/www/us/en/develop/articles/oneapi-standalone-components.html
-source_urls = [
-    'https://registrationcenter-download.intel.com/akdlm/irc_nas/18222/']
-sources = ['l_onemkl_p_%(version)s.640_offline.sh']
-checksums = ['9ad546f05a421b4f439e8557fd0f2d83d5e299b0d9bd84bdd86be6feba0c3915']
-
-local_libdir = '%(installdir)s/mkl/latest/lib/intel64'
-
-postinstallcmds = [
-    # create sym links
-    'ln -s %s/libmkl_vml_avx2.so.1       %s/libmkl_vml_avx2.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_avx512_mic.so.1 %s/libmkl_vml_avx512_mic.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_avx512.so.1     %s/libmkl_vml_avx512.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_avx.so.1        %s/libmkl_vml_avx.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_cmpt.so.1       %s/libmkl_vml_cmpt.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_def.so.1        %s/libmkl_vml_def.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_mc2.so.1        %s/libmkl_vml_mc2.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_mc3.so.1        %s/libmkl_vml_mc3.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_mc.so.1         %s/libmkl_vml_mc.so' % (
-        local_libdir, local_libdir),
-]
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/i/imkl/imkl-2021.4.0.eb b/Golden_Repo/i/imkl/imkl-2021.4.0.eb
deleted file mode 100644
index 51bbc0bb6..000000000
--- a/Golden_Repo/i/imkl/imkl-2021.4.0.eb
+++ /dev/null
@@ -1,45 +0,0 @@
-name = 'imkl'
-version = '2021.4.0'
-
-homepage = 'https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onemkl.html'
-description = "Intel oneAPI Math Kernel Library"
-
-toolchain = SYSTEM
-
-# see https://software.intel.com/content/www/us/en/develop/articles/oneapi-standalone-components.html
-source_urls = [
-    'https://registrationcenter-download.intel.com/akdlm/irc_nas/18222/']
-sources = ['l_onemkl_p_%(version)s.640_offline.sh']
-checksums = ['9ad546f05a421b4f439e8557fd0f2d83d5e299b0d9bd84bdd86be6feba0c3915']
-
-dontcreateinstalldir = 'True'
-
-interfaces = False
-
-hidden = True
-
-local_libdir = '%(installdir)s/mkl/latest/lib/intel64'
-
-postinstallcmds = [
-    # create sym links
-    'ln -s %s/libmkl_vml_avx2.so.1       %s/libmkl_vml_avx2.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_avx512_mic.so.1 %s/libmkl_vml_avx512_mic.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_avx512.so.1     %s/libmkl_vml_avx512.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_avx.so.1        %s/libmkl_vml_avx.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_cmpt.so.1       %s/libmkl_vml_cmpt.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_def.so.1        %s/libmkl_vml_def.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_mc2.so.1        %s/libmkl_vml_mc2.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_mc3.so.1        %s/libmkl_vml_mc3.so' % (
-        local_libdir, local_libdir),
-    'ln -s %s/libmkl_vml_mc.so.1         %s/libmkl_vml_mc.so' % (
-        local_libdir, local_libdir),
-]
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/i/impi-settings/impi-settings-2021-UCX.eb b/Golden_Repo/i/impi-settings/impi-settings-2021-UCX.eb
deleted file mode 100644
index f6fc6d888..000000000
--- a/Golden_Repo/i/impi-settings/impi-settings-2021-UCX.eb
+++ /dev/null
@@ -1,25 +0,0 @@
-easyblock = 'SystemBundle'
-
-name = 'impi-settings'
-version = '2021'
-versionsuffix = 'UCX'
-
-homepage = ''
-description = 'This module loads the IntelMPI configuration with UCX.'
-
-site_contacts = 'd.alvarez@fz-juelich.de'
-
-toolchain = SYSTEM
-
-source_urls = []
-
-sources = []
-
-modextravars = {
-    'FI_PROVIDER': 'mlx',
-    'I_MPI_PMI_VALUE_LENGTH_MAX': '900',
-    # Needed for PSM and harmless for InfiniBand. For ParaStation it is set on the pscom module
-    'HFI_NO_CPUAFFINITY': 'YES',
-}
-
-moduleclass = 'system'
diff --git a/Golden_Repo/i/impi-settings/impi-settings-2021-plain.eb b/Golden_Repo/i/impi-settings/impi-settings-2021-plain.eb
deleted file mode 100644
index 2f238b67f..000000000
--- a/Golden_Repo/i/impi-settings/impi-settings-2021-plain.eb
+++ /dev/null
@@ -1,24 +0,0 @@
-easyblock = 'SystemBundle'
-
-name = 'impi-settings'
-version = '2021'
-versionsuffix = 'plain'
-
-homepage = ''
-description = 'This module loads the default IntelMPI configuration. It relies on the default order for libfabric.'
-
-site_contacts = 'd.alvarez@fz-juelich.de'
-
-toolchain = SYSTEM
-
-source_urls = []
-
-sources = []
-
-modextravars = {
-    'I_MPI_PMI_VALUE_LENGTH_MAX': '900',
-    # Needed for PSM and harmless for InfiniBand. For ParaStation it is set on the pscom module
-    'HFI_NO_CPUAFFINITY': 'YES',
-}
-
-moduleclass = 'system'
diff --git a/Golden_Repo/i/impi/impi-2021.4.0-intel-compilers-2021.4.0.eb b/Golden_Repo/i/impi/impi-2021.4.0-intel-compilers-2021.4.0.eb
deleted file mode 100644
index 84023b3f8..000000000
--- a/Golden_Repo/i/impi/impi-2021.4.0-intel-compilers-2021.4.0.eb
+++ /dev/null
@@ -1,17 +0,0 @@
-name = 'impi'
-version = '2021.4.0'
-
-homepage = 'https://software.intel.com/content/www/us/en/develop/tools/mpi-library.html'
-description = "Intel MPI Library, compatible with MPICH ABI"
-
-toolchain = {'name': 'intel-compilers', 'version': '2021.4.0'}
-
-# see https://software.intel.com/content/www/us/en/develop/articles/oneapi-standalone-components.html
-source_urls = [
-    'https://registrationcenter-download.intel.com/akdlm/irc_nas/18186/']
-sources = ['l_mpi_oneapi_p_%(version)s.441_offline.sh']
-checksums = ['cc4b7072c61d0bd02b1c431b22d2ea3b84b967b59d2e587e77a9e7b2c24f2a29']
-
-dependencies = [('UCX', '1.11.2', '', SYSTEM)]
-
-moduleclass = 'mpi'
diff --git a/Golden_Repo/i/intel-compilers/intel-compilers-2021.4.0.eb b/Golden_Repo/i/intel-compilers/intel-compilers-2021.4.0.eb
deleted file mode 100644
index caf699924..000000000
--- a/Golden_Repo/i/intel-compilers/intel-compilers-2021.4.0.eb
+++ /dev/null
@@ -1,33 +0,0 @@
-name = 'intel-compilers'
-version = '2021.4.0'
-
-homepage = 'https://software.intel.com/content/www/us/en/develop/tools/oneapi/hpc-toolkit.html'
-description = "Intel C, C++ & Fortran compilers (classic and oneAPI)"
-
-toolchain = SYSTEM
-
-# see https://software.intel.com/content/www/us/en/develop/articles/oneapi-standalone-components.html
-sources = [
-    {
-        'source_urls': ['https://registrationcenter-download.intel.com/akdlm/irc_nas/18209/'],
-        'filename': 'l_dpcpp-cpp-compiler_p_%(version)s.3201_offline.sh',
-    },
-    {
-        'source_urls': ['https://registrationcenter-download.intel.com/akdlm/irc_nas/18210/'],
-        'filename': 'l_fortran-compiler_p_%(version)s.3224_offline.sh',
-    },
-]
-checksums = [
-    # l_dpcpp-cpp-compiler_p_2021.4.0.3201_offline.sh
-    '9206bff1c2fdeb1ca0d5f79def90dcf3e6c7d5711b9b5adecd96a2ba06503828',
-    # l_fortran-compiler_p_2021.4.0.3224_offline.sh
-    'de2fcf40e296c2e882e1ddf2c45bb8d25aecfbeff2f75fcd7494068d621eb7e0',
-]
-
-local_gccver = '11.2.0'
-dependencies = [
-    ('GCCcore', local_gccver),
-    ('binutils', '2.37', '', ('GCCcore', local_gccver)),
-]
-
-moduleclass = 'compiler'
diff --git a/Golden_Repo/i/intel-para/intel-para-2021b.eb b/Golden_Repo/i/intel-para/intel-para-2021b.eb
deleted file mode 100644
index 253debd46..000000000
--- a/Golden_Repo/i/intel-para/intel-para-2021b.eb
+++ /dev/null
@@ -1,27 +0,0 @@
-easyblock = 'Toolchain'
-
-name = 'intel-para'
-version = '2021b'
-versionsuffix = ''
-
-local_intelversion = '2021.4.0'
-
-homepage = ''
-description = """intel-para provides Intel C/C++ and Fortran compilers, ParaStationMPI & Intel MKL.
-"""
-
-toolchain = SYSTEM
-
-local_compiler = ('intel-compilers', local_intelversion)
-
-# toolchain used to build  dependencies
-local_comp_mpi_tc = ('ipsmpi', version)
-
-dependencies = [
-    local_compiler,
-    ('psmpi', '5.5.0-1', '', local_compiler),
-    ('imkl', local_intelversion, '', local_comp_mpi_tc),
-]
-
-
-moduleclass = 'toolchain'
diff --git a/Golden_Repo/i/intel/intel-2021b.eb b/Golden_Repo/i/intel/intel-2021b.eb
deleted file mode 100644
index e7e39fae9..000000000
--- a/Golden_Repo/i/intel/intel-2021b.eb
+++ /dev/null
@@ -1,21 +0,0 @@
-easyblock = 'Toolchain'
-
-name = 'intel'
-version = '2021b'
-
-homepage = 'https://easybuild.readthedocs.io/en/master/Common-toolchains.html#intel-toolchain'
-description = "Compiler toolchain including Intel compilers, Intel MPI and Intel Math Kernel Library (MKL)."
-
-toolchain = SYSTEM
-
-local_comp_ver = '2021.4.0'
-local_gccver = '11.2.0'
-dependencies = [
-    ('GCCcore', local_gccver),
-    ('binutils', '2.37', '', ('GCCcore', local_gccver)),
-    ('intel-compilers', local_comp_ver),
-    ('impi', local_comp_ver, '', ('intel-compilers', local_comp_ver)),
-    ('imkl', local_comp_ver, '', ('iimpi', version)),
-]
-
-moduleclass = 'toolchain'
diff --git a/Golden_Repo/i/intltool/intltool-0.51.0-GCCcore-11.2.0.eb b/Golden_Repo/i/intltool/intltool-0.51.0-GCCcore-11.2.0.eb
deleted file mode 100644
index b387403f1..000000000
--- a/Golden_Repo/i/intltool/intltool-0.51.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,37 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'intltool'
-version = '0.51.0'
-
-homepage = 'https://freedesktop.org/wiki/Software/intltool/'
-description = """intltool is a set of tools to centralize translation of
- many different file formats using GNU gettext-compatible PO files."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://launchpad.net/intltool/trunk/%(version)s/+download/']
-sources = [SOURCE_TAR_GZ]
-patches = ['intltool-%(version)s_fix-Perl-compat.patch']
-checksums = [
-    # intltool-0.51.0.tar.gz
-    '67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd',
-    # intltool-0.51.0_fix-Perl-compat.patch
-    'e839f7228b2b92301831bca88ed0bc7bce5dbf862568f1644642988204903db6',
-]
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('Perl', '5.34.0'),
-]
-
-sanity_check_paths = {
-    'files': ['bin/intltool%s' % x for x in ['-extract', '-merge', '-prepare', '-update', 'ize']],
-    'dirs': []
-}
-
-sanity_check_commands = ["intltool-merge --help"]
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/i/intltool/intltool-0.51.0_fix-Perl-compat.patch b/Golden_Repo/i/intltool/intltool-0.51.0_fix-Perl-compat.patch
deleted file mode 100644
index cbb0f37a4..000000000
--- a/Golden_Repo/i/intltool/intltool-0.51.0_fix-Perl-compat.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-fix for "Unescaped left brace in regex is illegal here in regex"
-see https://github.com/Alexpux/MSYS2-packages/blob/master/intltool/perl-5.22-compatibility.patch
---- intltool-0.51.0.orig/intltool-update.in	2015-03-09 02:39:54.000000000 +0100
-+++ intltool-0.51.0.orig/intltool-update.in	2015-06-19 01:52:07.171228154 +0200
-@@ -1062,7 +1062,7 @@ 
- 	}
-     }
- 
--    if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
-+    if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)
-     {
- 	my $rest = $3;
- 	my $untouched = $1;
-@@ -1190,10 +1190,10 @@ 
- 	$name    =~ s/\(+$//g;
- 	$version =~ s/\(+$//g;
- 
--	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
--	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
--	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
--	$varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
-+	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
-+	$varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
-+	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
-+	$varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
-     }
- 
-     if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)
-@@ -1219,11 +1219,11 @@ 
- 	$version =~ s/\(+$//g;
-         $bugurl  =~ s/\(+$//g if (defined $bugurl);
- 
--	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
--	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
--	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
--	$varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
--        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);
-+	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
-+	$varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
-+	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
-+	$varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
-+        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/);
-     }
- 
-     # \s makes this not work, why?
diff --git a/Golden_Repo/i/iomkl/iomkl-2021b.eb b/Golden_Repo/i/iomkl/iomkl-2021b.eb
deleted file mode 100644
index a4dd74df5..000000000
--- a/Golden_Repo/i/iomkl/iomkl-2021b.eb
+++ /dev/null
@@ -1,23 +0,0 @@
-easyblock = 'Toolchain'
-
-name = 'iomkl'
-version = '2021b'
-versionsuffix = ''
-
-local_intelversion = '2021.4.0'
-
-homepage = ''
-description = """iomkl provides Intel C/C++ and Fortran compilers, ParaStationMPI & Intel MKL.
-"""
-
-toolchain = SYSTEM
-
-dependencies = [
-    ('intel-compilers', local_intelversion),
-    ('OpenMPI', '4.1.2', versionsuffix,
-     ('intel-compilers', local_intelversion)),
-    ('imkl', local_intelversion, versionsuffix, ('iompi', version)),
-]
-
-
-moduleclass = 'toolchain'
diff --git a/Golden_Repo/i/iompi/iompi-2021b.eb b/Golden_Repo/i/iompi/iompi-2021b.eb
deleted file mode 100644
index 10b97e3bb..000000000
--- a/Golden_Repo/i/iompi/iompi-2021b.eb
+++ /dev/null
@@ -1,18 +0,0 @@
-easyblock = "Toolchain"
-
-name = 'iompi'
-version = '2021b'
-
-homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/'
-description = """Intel C/C++ and Fortran compilers, alongside ParaStationMPI.
-"""
-
-toolchain = SYSTEM
-
-local_comp_ver = '2021.4.0'
-dependencies = [
-    ('intel-compilers', local_comp_ver),
-    ('OpenMPI', '4.1.2', '', ('intel-compilers', local_comp_ver)),
-]
-
-moduleclass = 'toolchain'
diff --git a/Golden_Repo/i/ipp/ipp-2021.5.1.eb b/Golden_Repo/i/ipp/ipp-2021.5.1.eb
deleted file mode 100644
index da8035d73..000000000
--- a/Golden_Repo/i/ipp/ipp-2021.5.1.eb
+++ /dev/null
@@ -1,22 +0,0 @@
-name = 'ipp'
-version = '2021.5.1'
-
-homepage = 'https://software.intel.com/en-us/articles/intel-ipp/'
-description = """Intel Integrated Performance Primitives (Intel IPP) is an extensive library
- of multicore-ready, highly optimized software functions for multimedia, data processing,
- and communications applications. Intel IPP offers thousands of optimized functions
- covering frequently used fundamental algorithms."""
-
-toolchain = SYSTEM
-
-source_urls = [
-    'https://registrationcenter-download.intel.com/akdlm/irc_nas/18440']
-sources = ['l_ipp_oneapi_p_%(version)s.522_offline.sh']
-checksums = ['be99f9b0b2cc815e017188681ab997f3ace94e3010738fa6f702f2416dac0de4']
-
-sanity_check_paths = {
-    'files': ['ipp/%s/lib/intel64/libippcc.so' % version],
-    'dirs': ['ipp/%s/lib' % version, 'ipp/%s/include' % version],
-}
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/i/ipsmpi/ipsmpi-2021b.eb b/Golden_Repo/i/ipsmpi/ipsmpi-2021b.eb
deleted file mode 100644
index 2c6558140..000000000
--- a/Golden_Repo/i/ipsmpi/ipsmpi-2021b.eb
+++ /dev/null
@@ -1,18 +0,0 @@
-easyblock = "Toolchain"
-
-name = 'ipsmpi'
-version = '2021b'
-
-homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/'
-description = """Intel C/C++ and Fortran compilers, alongside ParaStationMPI."""
-
-toolchain = SYSTEM
-
-local_comp_ver = '2021.4.0'
-local_compiler = ('intel-compilers', local_comp_ver)
-dependencies = [
-    local_compiler,
-    ('psmpi', '5.5.0-1', '', local_compiler),
-]
-
-moduleclass = 'toolchain'
diff --git a/Golden_Repo/i/ispc/ispc-1.16.1.eb b/Golden_Repo/i/ispc/ispc-1.16.1.eb
deleted file mode 100644
index 7caf2e779..000000000
--- a/Golden_Repo/i/ispc/ispc-1.16.1.eb
+++ /dev/null
@@ -1,26 +0,0 @@
-easyblock = 'Tarball'
-
-name = 'ispc'
-version = '1.16.1'
-
-homepage = 'http://ispc.github.io/ , https://github.com/ispc/ispc/'
-description = """Intel SPMD Program Compilers; An open-source compiler for high-performance
- SIMD programming on the CPU. ispc is a compiler for a variant of the C programming language,
- with extensions for 'single program, multiple data' (SPMD) programming.
- Under the SPMD model, the programmer writes a program that generally appears
- to be a regular serial program, though the execution model is actually that
- a number of program instances execute in parallel on the hardware.
-"""
-
-toolchain = SYSTEM
-
-sources = ['ispc-v%(version)s-linux.tar.gz']
-source_urls = [('https://github.com/ispc/ispc/releases/download/v%(version)s')]
-checksums = ['88db3d0461147c10ed81053a561ec87d3e14265227c03318f4fcaaadc831037f']
-
-sanity_check_paths = {
-    'files': ["bin/ispc"],
-    'dirs': []
-}
-
-moduleclass = 'system'
diff --git a/Golden_Repo/i/itac/itac-2021.5.0.eb b/Golden_Repo/i/itac/itac-2021.5.0.eb
deleted file mode 100644
index cc416baee..000000000
--- a/Golden_Repo/i/itac/itac-2021.5.0.eb
+++ /dev/null
@@ -1,18 +0,0 @@
-name = 'itac'
-version = '2021.5.0'
-
-homepage = 'https://software.intel.com/en-us/intel-trace-analyzer/'
-description = """The Intel Trace Collector is a low-overhead tracing library that performs
- event-based tracing in applications. The Intel Trace Analyzer provides a convenient way to monitor application
- activities gathered by the Intel Trace Collector through graphical displays. """
-
-toolchain = SYSTEM
-
-source_urls = [
-    'https://registrationcenter-download.intel.com/akdlm/irc_nas/18367/']
-sources = ['l_itac_oneapi_p_%(version)s.370_offline.sh']
-checksums = ['c2b31298d8b4069a62d9352873c7f6e17ce240ad7293f9bacdc6de3794675b58']
-
-preferredmpi = 'impi5'
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/JUBE/JUBE-2.4.2.eb b/Golden_Repo/j/JUBE/JUBE-2.4.2.eb
deleted file mode 100644
index 7fe48f84a..000000000
--- a/Golden_Repo/j/JUBE/JUBE-2.4.2.eb
+++ /dev/null
@@ -1,31 +0,0 @@
-easyblock = "VersionIndependentPythonPackage"
-
-name = "JUBE"
-version = "2.4.2"
-
-homepage = "https://www.fz-juelich.de/jsc/jube"
-description = """The JUBE benchmarking environment provides a script based
-framework to easily create benchmark sets, run those sets on different
-computer systems and evaluate the results.
-"""
-
-toolchain = SYSTEM
-
-source_urls = ['https://apps.fz-juelich.de/jsc/jube/jube2/download.php?file=']
-sources = [SOURCE_TAR_GZ]
-checksums = ['d1de15e9792802f83521b582d1d144ec81e3d5a28c01dbd945288ea29b946729']
-
-options = {'modulename': 'jube2'}
-
-sanity_check_paths = {
-    'files': ['bin/jube'],
-    'dirs': [],
-}
-
-modextrapaths = {
-    'JUBE_INCLUDE_PATH': 'share/jube/platform/slurm'
-}
-
-modluafooter = 'execute {cmd=\'eval "$(jube complete)"\',modeA={"load"}}'
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/JUBE/JUBE-2.4.3.eb b/Golden_Repo/j/JUBE/JUBE-2.4.3.eb
deleted file mode 100644
index bee87a9f1..000000000
--- a/Golden_Repo/j/JUBE/JUBE-2.4.3.eb
+++ /dev/null
@@ -1,31 +0,0 @@
-easyblock = "VersionIndependentPythonPackage"
-
-name = "JUBE"
-version = "2.4.3"
-
-homepage = "https://www.fz-juelich.de/jsc/jube"
-description = """The JUBE benchmarking environment provides a script based
-framework to easily create benchmark sets, run those sets on different
-computer systems and evaluate the results.
-"""
-
-toolchain = SYSTEM
-
-source_urls = ['https://apps.fz-juelich.de/jsc/jube/jube2/download.php?file=']
-sources = [SOURCE_TAR_GZ]
-checksums = ['5ff37495a0c8ef4ec501866217b758d8ea474e985b678af757f7906cc56c6d7e']
-
-options = {'modulename': 'jube2'}
-
-sanity_check_paths = {
-    'files': ['bin/jube'],
-    'dirs': [],
-}
-
-modextrapaths = {
-    'JUBE_INCLUDE_PATH': 'share/jube/platform/slurm'
-}
-
-modluafooter = 'execute {cmd=\'eval "$(jube complete)"\',modeA={"load"}}'
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/JUBE/JUBE-2.5.0.eb b/Golden_Repo/j/JUBE/JUBE-2.5.0.eb
deleted file mode 100644
index 2007b8799..000000000
--- a/Golden_Repo/j/JUBE/JUBE-2.5.0.eb
+++ /dev/null
@@ -1,31 +0,0 @@
-easyblock = "VersionIndependentPythonPackage"
-
-name = "JUBE"
-version = "2.5.0"
-
-homepage = "https://www.fz-juelich.de/jsc/jube"
-description = """The JUBE benchmarking environment provides a script based
-framework to easily create benchmark sets, run those sets on different
-computer systems and evaluate the results.
-"""
-
-toolchain = SYSTEM
-
-source_urls = ['https://apps.fz-juelich.de/jsc/jube/jube2/download.php?file=']
-sources = [SOURCE_TAR_GZ]
-checksums = ['2f136f9c46069e62b7b818e102527bbe7adc84190dbbcb3eb153b7c5b23d7162']
-
-options = {'modulename': 'jube2'}
-
-sanity_check_paths = {
-    'files': ['bin/jube'],
-    'dirs': [],
-}
-
-modextrapaths = {
-    'JUBE_INCLUDE_PATH': 'share/jube/platform/slurm'
-}
-
-modluafooter = 'execute {cmd=\'eval "$(jube complete)"\',modeA={"load"}}'
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/JUBE/JUBE-2.5.1.eb b/Golden_Repo/j/JUBE/JUBE-2.5.1.eb
deleted file mode 100644
index c5ab12e1a..000000000
--- a/Golden_Repo/j/JUBE/JUBE-2.5.1.eb
+++ /dev/null
@@ -1,31 +0,0 @@
-easyblock = "VersionIndependentPythonPackage"
-
-name = "JUBE"
-version = "2.5.1"
-
-homepage = "https://www.fz-juelich.de/jsc/jube"
-description = """The JUBE benchmarking environment provides a script based
-framework to easily create benchmark sets, run those sets on different
-computer systems and evaluate the results.
-"""
-
-toolchain = SYSTEM
-
-source_urls = ['https://apps.fz-juelich.de/jsc/jube/jube2/download.php?file=']
-sources = [SOURCE_TAR_GZ]
-checksums = ['4c9a754b0e6f2b5e8cd0f5bd643dcfd7863a96b05cd02141d5eb301f2b89f6a3']
-
-options = {'modulename': 'jube2'}
-
-sanity_check_paths = {
-    'files': ['bin/jube'],
-    'dirs': [],
-}
-
-modextrapaths = {
-    'JUBE_INCLUDE_PATH': 'share/jube/platform/slurm'
-}
-
-modluafooter = 'execute {cmd=\'eval "$(jube complete)"\',modeA={"load"}}'
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/JasPer/JasPer-2.0.33-GCCcore-11.2.0.eb b/Golden_Repo/j/JasPer/JasPer-2.0.33-GCCcore-11.2.0.eb
deleted file mode 100644
index 2da4ac154..000000000
--- a/Golden_Repo/j/JasPer/JasPer-2.0.33-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,42 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'JasPer'
-version = '2.0.33'
-
-homepage = 'http://www.ece.uvic.ca/~frodo/jasper/'
-description = """The JasPer Project is an open-source initiative to provide a
- free software-based reference implementation of the codec specified in the
- JPEG-2000 Part-1 standard.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-sources = ['version-%(version)s.tar.gz']
-source_urls = ['https://github.com/mdadams/jasper/archive/']
-checksums = ['38b8f74565ee9e7fec44657e69adb5c9b2a966ca5947ced5717cde18a7d2eca6']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1', '', SYSTEM)
-]
-
-dependencies = [
-    ('OpenGL', '2021b'),
-    ('freeglut', '3.2.1'),
-    ('libjpeg-turbo', '2.1.1'),
-]
-
-separate_build_dir = True
-
-# For some reason on KNL it fails to build without this
-preconfigopts = 'export LDFLAGS="$LDFLAGS -lGLU" && '
-
-configopts = '-DJAS_ENABLE_AUTOMATIC_DEPENDENCIES=OFF -DJAS_ENABLE_DOC=OFF'
-
-sanity_check_paths = {
-    'files': ["bin/jasper", "bin/jiv", "lib64/libjasper.so"],
-    'dirs': ["include"],
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/j/Java/Java-15.0.1.eb b/Golden_Repo/j/Java/Java-15.0.1.eb
deleted file mode 100644
index bb6dfec42..000000000
--- a/Golden_Repo/j/Java/Java-15.0.1.eb
+++ /dev/null
@@ -1,15 +0,0 @@
-name = 'Java'
-version = '15.0.1'
-
-homepage = 'http://openjdk.java.net'
-description = """Java Platform, Standard Edition (Java SE) lets you develop and deploy
- Java applications on desktops and servers."""
-
-toolchain = SYSTEM
-
-source_urls = [
-    'https://download.java.net/java/GA/jdk%(version)s/51f4f36ad4ef43e39d0dfdbaf6549e32/9/GPL/']
-sources = ['openjdk-%(version)s_linux-x64_bin.tar.gz']
-checksums = ['83ec3a7b1649a6b31e021cde1e58ab447b07fb8173489f27f427e731c89ed84a']
-
-moduleclass = 'lang'
diff --git a/Golden_Repo/j/Java/Java-15.eb b/Golden_Repo/j/Java/Java-15.eb
deleted file mode 100644
index 78c52a44d..000000000
--- a/Golden_Repo/j/Java/Java-15.eb
+++ /dev/null
@@ -1,14 +0,0 @@
-easyblock = 'ModuleRC'
-
-name = 'Java'
-version = '15'
-
-homepage = 'https://java.com/'
-description = """Java Platform, Standard Edition (Java SE) lets you develop and deploy
- Java applications on desktops and servers."""
-
-toolchain = SYSTEM
-
-dependencies = [('Java', '%(version)s.0.1')]
-
-moduleclass = 'lang'
diff --git a/Golden_Repo/j/JsonCpp/JsonCpp-1.9.4-GCCcore-11.2.0.eb b/Golden_Repo/j/JsonCpp/JsonCpp-1.9.4-GCCcore-11.2.0.eb
deleted file mode 100644
index f20d7f783..000000000
--- a/Golden_Repo/j/JsonCpp/JsonCpp-1.9.4-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,40 +0,0 @@
-easyblock = "CMakeNinja"
-
-name = 'JsonCpp'
-version = '1.9.4'
-
-homepage = 'https://open-source-parsers.github.io/jsoncpp-docs/doxygen/index.html'
-description = """ JsonCpp is a C++ library that allows manipulating JSON values,
- including serialization and deserialization to and from strings. It can also preserve existing comment in
- unserialization/serialization steps, making it a convenient format to store user input files. """
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://github.com/open-source-parsers/jsoncpp/archive']
-sources = ['%(version)s.tar.gz']
-checksums = ['e34a628a8142643b976c7233ef381457efad79468c67cb1ae0b83a33d7493999']
-
-builddependencies = [
-    ('Python', '3.9.6'),
-    ('CMake', '3.21.1'),
-    ('Ninja', '1.10.2'),
-    ('pkg-config', '0.29.2'),
-    ('binutils', '2.37'),
-]
-
-# generate source for non-library solution
-postinstallcmds = [
-    (
-        'pushd %(builddir)s/%(namelower)s-%(version)s/ && '
-        'python amalgamate.py && '
-        'cp -a dist %(installdir)s/dist && '
-        'popd'
-    ),
-]
-
-sanity_check_paths = {
-    'files': ['include/json/json.h', 'lib/libjsoncpp.so'],
-    'dirs': [],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/j/Julia/Julia-1.7.1-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/j/Julia/Julia-1.7.1-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index be496699f..000000000
--- a/Golden_Repo/j/Julia/Julia-1.7.1-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,216 +0,0 @@
-name = 'Julia'
-version = '1.7.1'
-
-homepage = 'https://julialang.org/'
-description = """Julia was designed from the beginning for high performance.
-Julia programs compile to efficient native code for multiple platforms via LLVM
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True, 'verbose': True}
-
-source_urls = ['https://github.com/JuliaLang/julia/releases/download/v%(version)s/']
-sources = ['julia-%(version)s-full.tar.gz']
-checksums = ['add869121b7e788ff487a234fd39484469dbb3ded29b17041c63c4757515dd58']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('git', '2.33.1', '-nodocs'),
-    ('CMake', '3.21.1', '', SYSTEM),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('GMP', '6.2.1'),
-    ('CUDA', '11.5', '', SYSTEM),
-    ('SciPy-bundle', '2021.10'),
-    ('matplotlib', '3.4.3'),
-    ('OpenGL', '2021b'),
-    ('OpenSSL', '1.1', '', SYSTEM),
-]
-
-skipsteps = ['configure']
-buildopts = " USE_SYSTEM_GMP=1 USE_INTEL_MKL=1 "
-installopts = "prefix=%(installdir)s "
-
-arch_name = 'gpu'
-
-exts_defaultclass = 'JuliaPackage'
-exts_list = [
-    # General Purpose
-    ('PackageCompiler.jl', '2.0.2', {
-        'source_tmpl': 'v%(version)s.tar.gz',
-        'source_urls': ['https://github.com/JuliaLang/PackageCompiler.jl/archive/'],
-        'checksums': ['1f82248057d57acbcb41bc7420d2955174cafa07865fca7e2e6f92a552fca841'],
-    }),
-    ('HTTP.jl', '0.9.17', {
-        'source_tmpl': 'v0.9.17.tar.gz',
-        'source_urls': ['https://github.com/JuliaWeb/HTTP.jl/archive/'],
-        'checksums': ['ce66e5a58c5439c9716e44d97fd03e9856718755dd2276789b5097eeb8d31ca4'],
-    }),
-    ('Parsers.jl', '2.1.2', {
-        'source_tmpl': 'v2.1.2.tar.gz',
-        'source_urls': ['https://github.com/JuliaData/Parsers.jl/archive/'],
-        'checksums': ['5c9dcf1607d6f7d199c0d3e1f58c7235b63a6fa9d14d41e41d222a7943f73558'],
-    }),
-    ('VersionParsing.jl', '1.2.0', {
-        'source_tmpl': 'v1.2.0.tar.gz',
-        'source_urls': ['https://github.com/JuliaInterop/VersionParsing.jl/archive/'],
-        'checksums': ['329f62b69dac7675cd12ede1d91fc1da2147f3e74c0d86606cb616b4d2719f51'],
-    }),
-    ('JSON.jl', '0.21.2', {
-        'source_tmpl': 'v0.21.2.tar.gz',
-        'source_urls': ['https://github.com/JuliaIO/JSON.jl/archive/'],
-        'checksums': ['505668060495089bde44e14f5865425654e17715158ea80c8e0badcfd5d2893d'],
-    }),
-    ('WebIO.jl', '0.8.16', {
-        'source_tmpl': 'v0.8.16.tar.gz',
-        'source_urls': ['https://github.com/JuliaGizmos/WebIO.jl/archive/'],
-        'checksums': ['c727d9f015f3c9b54972b2d10738ed26bc1ddd8a5fcb1fac7f26d4e665193a4e'],
-    }),
-    ('ProgressMeter.jl', '1.7.1', {
-        'source_tmpl': 'v1.7.1.tar.gz',
-        'source_urls': ['https://github.com/timholy/ProgressMeter.jl/archive/'],
-        'checksums': ['b9eaea12ec5b4e8e58069f9476321e23c5434027218cf596acbfe4ae9222c694'],
-    }),
-    ('Conda.jl', '1.6.0', {
-        'source_tmpl': 'v1.6.0.tar.gz',
-        'source_urls': ['https://github.com/JuliaPy/Conda.jl/archive/'],
-        'checksums': ['f1bd98719c059dfc115631bc23460910b7e2ae557d3246002936f2b3750f98b7'],
-    }),
-    ('PyCall.jl', '1.92.5', {
-        'source_tmpl': 'v1.92.5.tar.gz',
-        'source_urls': ['https://github.com/JuliaPy/PyCall.jl/archive/'],
-        'checksums': ['b441e41c5af1cd7ac39e200902b4f070138a2219fad46d6e49501a192af6775a'],
-    }),
-    ('LaTeXStrings.jl', '1.3.0', {
-        'source_tmpl': 'v1.3.0.tar.gz',
-        'source_urls': ['https://github.com/stevengj/LaTeXStrings.jl/archive/'],
-        'checksums': ['9754cee3991d3a92827112b60064b381bec62e383634984dc0cad1fbc3301bda'],
-    }),
-    ('DocumentFormat.jl', '3.2.4', {
-        'source_tmpl': 'v3.2.4.tar.gz',
-        'source_urls': ['https://github.com/julia-vscode/DocumentFormat.jl/archive/'],
-        'checksums': ['d282bb08aded9c9f46731837022d3667fa94f9a2e7446cfcf3e33d54d0bc99e2'],
-    }),
-    # Data Science
-    ('CSV.jl', '0.9.1', {
-        'source_tmpl': 'v0.9.1.tar.gz',
-        'source_urls': ['https://github.com/JuliaData/CSV.jl/archive/'],
-        'checksums': ['1c8a67f4f06cb4c85349d2901f486a8d4d5d9b0c5a453876013d49fd6e56f40c'],
-    }),
-    ('DataFrames.jl', '1.2.2', {
-        'source_tmpl': 'v1.2.2.tar.gz',
-        'source_urls': ['https://github.com/JuliaData/DataFrames.jl/archive/'],
-        'checksums': ['9bd034e4185f0b8d5e85bcc0ea3596c068b7387acef2c3b2f92bb800581ab6e7'],
-    }),
-    ('Arrow.jl', '2.2.0', {
-        'source_tmpl': 'v2.2.0.tar.gz',
-        'source_urls': ['https://github.com/JuliaData/Arrow.jl/archive/'],
-        'checksums': ['af0d92896fda48eb559971529cfb30be5cf5c4a3fa5e67723ae50c22ec32a67f'],
-    }),
-    ('OnlineStats.jl', '1.5.13', {
-        'source_tmpl': 'v1.5.13.tar.gz',
-        'source_urls': ['https://github.com/joshday/OnlineStats.jl/archive/'],
-        'checksums': ['72d38bbdd65caf069dbd5d216658334817eeae5d0dae03f483fb3459cf884edc'],
-    }),
-    ('Query.jl', '1.0.0', {
-        'source_tmpl': 'v1.0.0.tar.gz',
-        'source_urls': ['https://github.com/queryverse/Query.jl/archive/'],
-        'checksums': ['76c05e3ffc8f3c2ce2cd3f6824f40a107cdba6fc58c4ce42de2289132de988e0'],
-    }),
-    # Scientific Domains
-    ('GSL.jl', '1.0.1', {
-        'source_tmpl': 'v1.0.1.tar.gz',
-        'source_urls': ['https://github.com/JuliaMath/GSL.jl/archive/refs/tags/'],
-        'checksums': ['91a5acbb752610c5989b9acef126f2231f612debb7ba6d1d4625c68d2af5776e'],
-    }),
-    ('DifferentialEquations.jl', '6.20.0', {
-        'source_tmpl': 'v6.20.0.tar.gz',
-        'source_urls': ['https://github.com/SciML/DifferentialEquations.jl/archive/'],
-        'checksums': ['6cb82c5df713c762bdbdd2e3e320c2f8e7bdf47d0a840e229d044223f408a067'],
-    }),
-    ('Distributions.jl', '0.24.18', {
-        'source_tmpl': 'v0.24.18.tar.gz',
-        'source_urls': ['https://github.com/JuliaStats/Distributions.jl/archive/'],
-        'checksums': ['471464cf0a60be21338b9252464e5cf9f0f34a48ade1d24270fd27439e6218ac'],
-    }),
-    ('Optim.jl', '1.5.0', {
-        'source_tmpl': 'v1.5.0.tar.gz',
-        'source_urls': ['https://github.com/JuliaNLSolvers/Optim.jl/archive/'],
-        'checksums': ['a26b2e2f006494c26d3ec94c2c019e3e63017cf83b94dda25edf53210200bca7'],
-    }),
-    ('IterativeSolvers.jl', '0.9.2', {
-        'source_tmpl': 'v0.9.2.tar.gz',
-        'source_urls': ['https://github.com/JuliaLinearAlgebra/IterativeSolvers.jl/archive/'],
-        'checksums': ['95fbfa39aa68e989ae6bad2f51ce0fe5635ba3f3375d0ea4d9422e77ff924a9b'],
-    }),
-    ('AbstractFFTs.jl', '1.0.1', {
-        'source_tmpl': 'v1.0.1.tar.gz',
-        'source_urls': ['https://github.com/JuliaMath/AbstractFFTs.jl/archive/'],
-        'checksums': ['91a5acbb752610c5989b9acef126f2231f612debb7ba6d1d4625c68d2af5776e'],
-    }),
-    ('OrdinaryDiffEq.jl', '5.68.0', {
-        'source_tmpl': 'v5.68.0.tar.gz',
-        'source_urls': ['https://github.com/SciML/OrdinaryDiffEq.jl/archive/'],
-        'checksums': ['f6ba667089421cc0eac68036a39eb041b2e4c8bb6f72c19ea98cc5e229c97070'],
-    }),
-    ('SpecialFunctions.jl', '1.8.1', {
-        'source_tmpl': 'v1.8.1.tar.gz',
-        'source_urls': ['https://github.com/JuliaMath/SpecialFunctions.jl/archive/'],
-        'checksums': ['94d061a62a379024010b9b4aac5eee075133617c683e27681f8bedcf3f16c76e'],
-    }),
-    ('JuMP.jl', '0.22.1', {
-        'source_tmpl': 'v0.22.1.tar.gz',
-        'source_urls': ['https://github.com/jump-dev/JuMP.jl/archive/'],
-        'checksums': ['96b77527641aa5771240dba23290727c84da3c631e2cc5a1a85342262bf8beee'],
-    }),
-    # Visualization
-    ('GR.jl', '0.62.1', {
-        'source_tmpl': 'v0.62.1.tar.gz',
-        'source_urls': ['https://github.com/jheinen/GR.jl/archive/'],
-        'checksums': ['7da2bb2b689a5e6ea123625f6332ca7e2d71f9c31f3ea5a284b540df484a67b6'],
-    }),
-    ('PlotlyJS.jl', '0.18.8', {
-        'source_tmpl': 'v0.18.8.tar.gz',
-        'source_urls': ['https://github.com/JuliaPlots/PlotlyJS.jl/archive/'],
-        'checksums': ['4ede1001b496420dc128b8f9fd52c762ca2a554c0b4a8e53c151783c988447c0'],
-    }),
-    ('PyPlot.jl', '2.10.0', {
-        'source_tmpl': 'v2.10.0.tar.gz',
-        'source_urls': ['https://github.com/JuliaPy/PyPlot.jl/archive/'],
-        'checksums': ['49a5be38b894a31843b1d4c8eba849c3581d0505d9325f76d6c471a947338fe3'],
-    }),
-    ('Plots.jl', '1.24.2', {
-        'source_tmpl': 'v1.24.2.tar.gz',
-        'source_urls': ['https://github.com/JuliaPlots/Plots.jl/archive/'],
-        'checksums': ['a021e6ed039616c2a407fe479da83baf8be33902eb88db9d232e5d5fed34b8c1'],
-    }),
-    ('UnicodePlots.jl', '2.5.0', {
-        'source_tmpl': 'v2.5.0.tar.gz',
-        'source_urls': ['https://github.com/Evizero/UnicodePlots.jl/archive/'],
-        'checksums': ['aec66957ff453f85195001022d9b4e5fd9beaa38e5b66d1a2c85d3b3b6479eeb'],
-    }),
-    ('StatsPlots.jl', '0.14.29', {
-        'source_tmpl': 'v0.14.29.tar.gz',
-        'source_urls': ['https://github.com/JuliaPlots/StatsPlots.jl/archive/'],
-        'checksums': ['d3ff91e1d8d6e16136607cb7ceae0aaa675adfe5ceb27ac55020981ef6c09560'],
-    }),
-    # CUDA
-    ('CUDA.jl', '3.5.0', {
-        'source_tmpl': 'v3.5.0.tar.gz',
-        'source_urls': ['https://github.com/JuliaGPU/CUDA.jl/archive/'],
-        'checksums': ['4c09ccfa78c5b9fba183edf2faa96b015c218305a0ae3ba318df5437e1746818'],
-    }),
-]
-
-modextravars = {
-    'JULIA_CUDA_USE_BINARYBUILDER': 'false',
-}
-
-sanity_check_paths = {
-    'files': ['bin/julia', 'include/julia/julia.h', 'lib/libjulia.so'],
-    'dirs': ['bin', 'etc', 'include', 'lib', 'share']
-}
-
-moduleclass = 'lang'
diff --git a/Golden_Repo/j/Julia/Julia-1.7.1-gomkl-2021b.eb b/Golden_Repo/j/Julia/Julia-1.7.1-gomkl-2021b.eb
deleted file mode 100644
index 9c8136158..000000000
--- a/Golden_Repo/j/Julia/Julia-1.7.1-gomkl-2021b.eb
+++ /dev/null
@@ -1,230 +0,0 @@
-name = 'Julia'
-version = '1.7.1'
-
-homepage = 'https://julialang.org/'
-description = """Julia was designed from the beginning for high performance.
-Julia programs compile to efficient native code for multiple platforms via LLVM
-"""
-
-toolchain = {'name': 'gomkl', 'version': '2021b'}
-toolchainopts = {'usempi': True, 'pic': True}
-
-source_urls = ['https://github.com/JuliaLang/julia/releases/download/v%(version)s/']
-sources = ['julia-%(version)s-full.tar.gz']
-checksums = ['add869121b7e788ff487a234fd39484469dbb3ded29b17041c63c4757515dd58']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('git', '2.33.1', '-nodocs'),
-    ('CMake', '3.21.1', '', SYSTEM),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('GMP', '6.2.1'),
-    ('CUDA', '11.5', '', SYSTEM),
-    ('SciPy-bundle', '2021.10', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('matplotlib', '3.4.3', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('OpenGL', '2021b'),
-    ('OpenSSL', '1.1', '', SYSTEM),
-]
-
-skipsteps = ['configure']
-buildopts = " USE_SYSTEM_GMP=1 USE_INTEL_MKL=1 "
-installopts = "prefix=%(installdir)s "
-
-arch_name = 'gpu'
-
-exts_defaultclass = 'JuliaPackage'
-exts_list = [
-    # General Purpose
-    ('PackageCompiler.jl', '2.0.2', {
-        'source_tmpl': 'v%(version)s.tar.gz',
-        'source_urls': ['https://github.com/JuliaLang/PackageCompiler.jl/archive/'],
-        'checksums': ['1f82248057d57acbcb41bc7420d2955174cafa07865fca7e2e6f92a552fca841'],
-    }),
-    ('HTTP.jl', '0.9.17', {
-        'source_tmpl': 'v0.9.17.tar.gz',
-        'source_urls': ['https://github.com/JuliaWeb/HTTP.jl/archive/'],
-        'checksums': ['ce66e5a58c5439c9716e44d97fd03e9856718755dd2276789b5097eeb8d31ca4'],
-    }),
-    ('Parsers.jl', '2.1.2', {
-        'source_tmpl': 'v2.1.2.tar.gz',
-        'source_urls': ['https://github.com/JuliaData/Parsers.jl/archive/'],
-        'checksums': ['5c9dcf1607d6f7d199c0d3e1f58c7235b63a6fa9d14d41e41d222a7943f73558'],
-    }),
-    ('VersionParsing.jl', '1.2.0', {
-        'source_tmpl': 'v1.2.0.tar.gz',
-        'source_urls': ['https://github.com/JuliaInterop/VersionParsing.jl/archive/'],
-        'checksums': ['329f62b69dac7675cd12ede1d91fc1da2147f3e74c0d86606cb616b4d2719f51'],
-    }),
-    ('JSON.jl', '0.21.2', {
-        'source_tmpl': 'v0.21.2.tar.gz',
-        'source_urls': ['https://github.com/JuliaIO/JSON.jl/archive/'],
-        'checksums': ['505668060495089bde44e14f5865425654e17715158ea80c8e0badcfd5d2893d'],
-    }),
-    ('WebIO.jl', '0.8.16', {
-        'source_tmpl': 'v0.8.16.tar.gz',
-        'source_urls': ['https://github.com/JuliaGizmos/WebIO.jl/archive/'],
-        'checksums': ['c727d9f015f3c9b54972b2d10738ed26bc1ddd8a5fcb1fac7f26d4e665193a4e'],
-    }),
-    ('ProgressMeter.jl', '1.7.1', {
-        'source_tmpl': 'v1.7.1.tar.gz',
-        'source_urls': ['https://github.com/timholy/ProgressMeter.jl/archive/'],
-        'checksums': ['b9eaea12ec5b4e8e58069f9476321e23c5434027218cf596acbfe4ae9222c694'],
-    }),
-    ('Conda.jl', '1.6.0', {
-        'source_tmpl': 'v1.6.0.tar.gz',
-        'source_urls': ['https://github.com/JuliaPy/Conda.jl/archive/'],
-        'checksums': ['f1bd98719c059dfc115631bc23460910b7e2ae557d3246002936f2b3750f98b7'],
-    }),
-    ('PyCall.jl', '1.92.5', {
-        'source_tmpl': 'v1.92.5.tar.gz',
-        'source_urls': ['https://github.com/JuliaPy/PyCall.jl/archive/'],
-        'checksums': ['b441e41c5af1cd7ac39e200902b4f070138a2219fad46d6e49501a192af6775a'],
-    }),
-    ('LaTeXStrings.jl', '1.3.0', {
-        'source_tmpl': 'v1.3.0.tar.gz',
-        'source_urls': ['https://github.com/stevengj/LaTeXStrings.jl/archive/'],
-        'checksums': ['9754cee3991d3a92827112b60064b381bec62e383634984dc0cad1fbc3301bda'],
-    }),
-    ('DocumentFormat.jl', '3.2.4', {
-        'source_tmpl': 'v3.2.4.tar.gz',
-        'source_urls': ['https://github.com/julia-vscode/DocumentFormat.jl/archive/'],
-        'checksums': ['d282bb08aded9c9f46731837022d3667fa94f9a2e7446cfcf3e33d54d0bc99e2'],
-    }),
-    # Data Science
-    ('CSV.jl', '0.9.1', {
-        'source_tmpl': 'v0.9.1.tar.gz',
-        'source_urls': ['https://github.com/JuliaData/CSV.jl/archive/'],
-        'checksums': ['1c8a67f4f06cb4c85349d2901f486a8d4d5d9b0c5a453876013d49fd6e56f40c'],
-    }),
-    ('DataFrames.jl', '1.2.2', {
-        'source_tmpl': 'v1.2.2.tar.gz',
-        'source_urls': ['https://github.com/JuliaData/DataFrames.jl/archive/'],
-        'checksums': ['9bd034e4185f0b8d5e85bcc0ea3596c068b7387acef2c3b2f92bb800581ab6e7'],
-    }),
-    ('Arrow.jl', '2.2.0', {
-        'source_tmpl': 'v2.2.0.tar.gz',
-        'source_urls': ['https://github.com/JuliaData/Arrow.jl/archive/'],
-        'checksums': ['af0d92896fda48eb559971529cfb30be5cf5c4a3fa5e67723ae50c22ec32a67f'],
-    }),
-    ('OnlineStats.jl', '1.5.13', {
-        'source_tmpl': 'v1.5.13.tar.gz',
-        'source_urls': ['https://github.com/joshday/OnlineStats.jl/archive/'],
-        'checksums': ['72d38bbdd65caf069dbd5d216658334817eeae5d0dae03f483fb3459cf884edc'],
-    }),
-    ('Query.jl', '1.0.0', {
-        'source_tmpl': 'v1.0.0.tar.gz',
-        'source_urls': ['https://github.com/queryverse/Query.jl/archive/'],
-        'checksums': ['76c05e3ffc8f3c2ce2cd3f6824f40a107cdba6fc58c4ce42de2289132de988e0'],
-    }),
-    # Scientific Domains
-    ('GSL.jl', '1.0.1', {
-        'source_tmpl': 'v1.0.1.tar.gz',
-        'source_urls': ['https://github.com/JuliaMath/GSL.jl/archive/refs/tags/'],
-        'checksums': ['91a5acbb752610c5989b9acef126f2231f612debb7ba6d1d4625c68d2af5776e'],
-    }),
-    ('DifferentialEquations.jl', '6.20.0', {
-        'source_tmpl': 'v6.20.0.tar.gz',
-        'source_urls': ['https://github.com/SciML/DifferentialEquations.jl/archive/'],
-        'checksums': ['6cb82c5df713c762bdbdd2e3e320c2f8e7bdf47d0a840e229d044223f408a067'],
-    }),
-    ('Distributions.jl', '0.24.18', {
-        'source_tmpl': 'v0.24.18.tar.gz',
-        'source_urls': ['https://github.com/JuliaStats/Distributions.jl/archive/'],
-        'checksums': ['471464cf0a60be21338b9252464e5cf9f0f34a48ade1d24270fd27439e6218ac'],
-    }),
-    ('Optim.jl', '1.5.0', {
-        'source_tmpl': 'v1.5.0.tar.gz',
-        'source_urls': ['https://github.com/JuliaNLSolvers/Optim.jl/archive/'],
-        'checksums': ['a26b2e2f006494c26d3ec94c2c019e3e63017cf83b94dda25edf53210200bca7'],
-    }),
-    ('IterativeSolvers.jl', '0.9.2', {
-        'source_tmpl': 'v0.9.2.tar.gz',
-        'source_urls': ['https://github.com/JuliaLinearAlgebra/IterativeSolvers.jl/archive/'],
-        'checksums': ['95fbfa39aa68e989ae6bad2f51ce0fe5635ba3f3375d0ea4d9422e77ff924a9b'],
-    }),
-    ('AbstractFFTs.jl', '1.0.1', {
-        'source_tmpl': 'v1.0.1.tar.gz',
-        'source_urls': ['https://github.com/JuliaMath/AbstractFFTs.jl/archive/'],
-        'checksums': ['91a5acbb752610c5989b9acef126f2231f612debb7ba6d1d4625c68d2af5776e'],
-    }),
-    ('OrdinaryDiffEq.jl', '5.68.0', {
-        'source_tmpl': 'v5.68.0.tar.gz',
-        'source_urls': ['https://github.com/SciML/OrdinaryDiffEq.jl/archive/'],
-        'checksums': ['f6ba667089421cc0eac68036a39eb041b2e4c8bb6f72c19ea98cc5e229c97070'],
-    }),
-    ('SpecialFunctions.jl', '1.8.1', {
-        'source_tmpl': 'v1.8.1.tar.gz',
-        'source_urls': ['https://github.com/JuliaMath/SpecialFunctions.jl/archive/'],
-        'checksums': ['94d061a62a379024010b9b4aac5eee075133617c683e27681f8bedcf3f16c76e'],
-    }),
-    ('JuMP.jl', '0.22.1', {
-        'source_tmpl': 'v0.22.1.tar.gz',
-        'source_urls': ['https://github.com/jump-dev/JuMP.jl/archive/'],
-        'checksums': ['96b77527641aa5771240dba23290727c84da3c631e2cc5a1a85342262bf8beee'],
-    }),
-    # Visualization
-    ('GR.jl', '0.62.1', {
-        'source_tmpl': 'v0.62.1.tar.gz',
-        'source_urls': ['https://github.com/jheinen/GR.jl/archive/'],
-        'checksums': ['7da2bb2b689a5e6ea123625f6332ca7e2d71f9c31f3ea5a284b540df484a67b6'],
-    }),
-    ('PlotlyJS.jl', '0.18.8', {
-        'source_tmpl': 'v0.18.8.tar.gz',
-        'source_urls': ['https://github.com/JuliaPlots/PlotlyJS.jl/archive/'],
-        'checksums': ['4ede1001b496420dc128b8f9fd52c762ca2a554c0b4a8e53c151783c988447c0'],
-    }),
-    ('PyPlot.jl', '2.10.0', {
-        'source_tmpl': 'v2.10.0.tar.gz',
-        'source_urls': ['https://github.com/JuliaPy/PyPlot.jl/archive/'],
-        'checksums': ['49a5be38b894a31843b1d4c8eba849c3581d0505d9325f76d6c471a947338fe3'],
-    }),
-    ('Plots.jl', '1.24.2', {
-        'source_tmpl': 'v1.24.2.tar.gz',
-        'source_urls': ['https://github.com/JuliaPlots/Plots.jl/archive/'],
-        'checksums': ['a021e6ed039616c2a407fe479da83baf8be33902eb88db9d232e5d5fed34b8c1'],
-    }),
-    ('UnicodePlots.jl', '2.5.0', {
-        'source_tmpl': 'v2.5.0.tar.gz',
-        'source_urls': ['https://github.com/Evizero/UnicodePlots.jl/archive/'],
-        'checksums': ['aec66957ff453f85195001022d9b4e5fd9beaa38e5b66d1a2c85d3b3b6479eeb'],
-    }),
-    ('StatsPlots.jl', '0.14.29', {
-        'source_tmpl': 'v0.14.29.tar.gz',
-        'source_urls': ['https://github.com/JuliaPlots/StatsPlots.jl/archive/'],
-        'checksums': ['d3ff91e1d8d6e16136607cb7ceae0aaa675adfe5ceb27ac55020981ef6c09560'],
-    }),
-    # MPI
-    ('MPI.jl', '0.19.2', {
-        'mpi_path': '$EBROOTOPENMPI',
-        'mpiexec': 'srun',
-        'source_tmpl': 'v0.19.2.tar.gz',
-        'source_urls': ['https://github.com/JuliaParallel/MPI.jl/archive/'],
-        'checksums': ['5edcc1baf35c5535c1688c45b355bc67d91ac95ea717f7f92c4f26a6e2ff2283'],
-    }),
-    # CUDA
-    ('CUDA.jl', '3.5.0', {
-        'source_tmpl': 'v3.5.0.tar.gz',
-        'source_urls': ['https://github.com/JuliaGPU/CUDA.jl/archive/'],
-        'checksums': ['4c09ccfa78c5b9fba183edf2faa96b015c218305a0ae3ba318df5437e1746818'],
-    }),
-]
-
-modextravars = {
-    'JULIA_MPICC': 'mpicc',
-    'JULIA_MPIEXEC': 'srun',
-    #  'JULIA_MPIEXEC_ARGS': '',
-    'JULIA_MPI_ABI': 'OpenMPI',
-    'JULIA_MPI_BINARY': 'system',
-    'JULIA_MPI_PATH': '$::env(EBROOTOPENMPI)',
-    'JULIA_CUDA_USE_BINARYBUILDER': 'false',
-}
-
-sanity_check_paths = {
-    'files': ['bin/julia', 'include/julia/julia.h', 'lib/libjulia.so'],
-    'dirs': ['bin', 'etc', 'include', 'lib', 'share']
-}
-
-moduleclass = 'lang'
diff --git a/Golden_Repo/j/Jupyter/401html.patch b/Golden_Repo/j/Jupyter/401html.patch
deleted file mode 100644
index c3e71a800..000000000
--- a/Golden_Repo/j/Jupyter/401html.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-diff -Naur jupyterlab-2.2.9.orig/401.html jupyterlab-2.2.9/401.html
---- jupyterlab-2.2.9.orig/401.html	1970-01-01 01:00:00.000000000 +0100
-+++ jupyterlab-2.2.9/401.html	2020-12-11 23:24:45.301738818 +0100
-@@ -0,0 +1,131 @@
-+<!DOCTYPE html>
-+<html><head>
-+  <meta http-equiv="Refresh" content="0; url=https://jupyter-jsc.fz-juelich.de/hub/logout?stopall=false&alldevices=false" />
-+
-+  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-+  <meta charset="utf-8">
-+
-+  <title>jupyter-jsc</title>
-+  <meta http-equiv="X-UA-Compatible" content="chrome=1">
-+  <meta property="og:image" content="/hub/static/images/mini_website.jpg">
-+  <meta property="og:locale" content="en_US">
-+  <meta property="og:site_name" content="jupyter-jsc">
-+  <meta property="og:title" content="jupyter-jsc">
-+  <meta property="og:type" content="website">
-+  <meta property="og:url" content="https://jupyter-jsc.fz-juelich.de/">
-+
-+  <link rel="stylesheet" href="/hub/static/css/style.min.css" type="text/css">
-+  <link rel="stylesheet" href="/hub/static/css/j4j_font.min.htm" type="text/css">
-+  <link rel="stylesheet" href="/hub/static/css/j4j_base.min.css" type="text/css">
-+  <link rel="stylesheet" href="/hub/static/css/j4j_base_header.min.css" type="text/css">
-+  <link rel="stylesheet" href="/hub/static/css/j4j_base_footer.min.css" type="text/css">
-+  <link rel="icon" href="/hub//static/images/favicon.svg" type="jpg/png">
-+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jquery-confirm/3.3.2/jquery-confirm.min.css">  
-+  <link rel="stylesheet" href="/hub/static/css/j4j_page_home.min.css" type="text/css">
-+  <link rel="stylesheet" href="/hub/static/css/spawn_style.css" type="text/css">
-+
-+<body>
-+
-+<div id="container">
-+
-+  <div id="header-background">
-+  <div id="header">
-+  <nav class="navbar navbar-default">
-+    <div class="container-fluid">
-+      <div class="navbar-header">
-+        <span id="jupyterhub-logo" class="pull-left"><a href="https://www.fz-juelich.de/jsc" target="_blank"><img src="/hub/static/images/jsc.png" alt="JupyterHub" class="jpy-logo" title="Home"></a></span>
-+      </div>
-+
-+      <div id="thenavbar">
-+        <ul class="nav navbar-nav">
-+          
-+          <li><a href="https://jupyter-jsc.fz-juelich.de/hub/start">Start</a></li>
-+          
-+          <li id="navbarbtn-links" class="main-menu-btn menu-btn"><a>Links</a>
-+            <div id="navbarmenu-links" class="menu-box">
-+              <ul>
-+                <li id="navbarbtn-links-1" class="menu-btn"><a>jupyter-jsc</a>
-+                  <div id="navbarmenu-links-1" class="menu-box menu-sub-box show-sub-header" style="">
-+                    <ul>
-+                      <li class=""><a href="https://jupyter-jsc.fz-juelich.de/nbviewer/github/kreuzert/Jupyter-JSC/blob/master/Extensions.ipynb">Extensions at jupyter-jsc</a></li>
-+                      <li class=""><a href="https://jupyter-jsc.fz-juelich.de/nbviewer/github/kreuzert/Jupyter-JSC/blob/master/FAQ.ipynb">HDFCloud FAQ</a></li>
-+                      <li class=""><a href="https://jupyter-jsc.fz-juelich.de/static/files/projects.html">Link Projects to Home</a></li>
-+                      <li class=""><a href="https://jupyter-jsc.fz-juelich.de/static/files/kernel.html">Setup your own kernel</a></li>
-+                      <li class=""><a target="_blank" href="https://www.unicore.eu/about-unicore/case-studies/jupyter-at-jsc/">jupyter-jsc at unicore.eu</a></li>
-+                    </ul>
-+                  </div>
-+                </li>
-+                <li id="navbarbtn-links-2" class="menu-btn"><a>Jupyter</a>
-+                  <div id="navbarmenu-links-2" class="menu-box menu-sub-box show-sub-header" style="">
-+                    <ul>
-+                      <li class=""><a target="_blank" href="https://www-jupyter.org/">Home</a></li>
-+                      <li class=""><a target="_blank" href="https://newsletter.jupyter.org/">Newsletter</a></li>
-+                      <li class=""><a target="_blank" href="https://www.youtube.com/watch?v=HW29067qVWk">Introduction Video</a></li>
-+                      <li class=""><a target="_blank" href="https://blog.jupyter.org/">Blog</a></li>
-+                      <li class=""><a target="_blank" href="https://jupyter.org/documentation.html">Documentation</a></li>
-+                      <li class=""><a target="_blank" href="https://www.oreilly.com/topics/jupyter">O'Reilly on Jupyter</a></li>
-+                      <li class=""><a target="_blank" href="https://twitter.com/projectjupyter">Twitter</a></li>
-+                      <li class=""><a target="_blank" href="https://github.com/trending/jupyter-notebook">Jupyter-Notebooks</a></li>
-+                    </ul>
-+                  </div>
-+                </li>
-+                <li id="navbarbtn-links-3" class="menu-btn"><a>JSC</a>
-+                  <div id="navbarmenu-links-3" class="menu-box menu-sub-box show-sub-header" style="">
-+                    <ul>
-+                      <li class=""><a target="_blank" href="https://www.fz-juelich.de/ias/jsc/EN/Expertise/Supercomputers/JUWELS/JUWELS_node.html">JUWELS</a></li>
-+                      <li class=""><a target="_blank" href="https://www.fz-juelich.de/ias/jsc/EN/Expertise/Supercomputers/JURECA/JURECA_node.html">JURECA</a></li>
-+                      <li class=""><a target="_blank" href="https://hbp-hpc-platform.fz-juelich.de/?page_id=1073">JURON</a></li>
-+                      <li class=""><a target="_blank" href="https://www.fz-juelich.de/ias/jsc/EN/News/Newsletter/newsletter_node.html">Newsletter</a></li>
-+                      <li class=""><a target="_blank" href="https://www.fz-juelich.de/ias/jsc/EN/News/Events/events_node.html">Events</a></li>
-+                      <li class=""><a target="_blank" href="https://twitter.com/fzj_jsc">Twitter</a></li>
-+                    </ul>
-+                  </div>
-+                </li>
-+              </ul>
-+            </div>
-+          </li>
-+          
-+        </ul>
-+      </div>
-+    </div>
-+  </nav>
-+  </div>
-+  </div>
-+
-+<div id="body">
-+<div class="background-wrapper">
-+  <div class="content" id="JupyterLabs-div">
-+    
-+      <!--<center><h2 style="color:red">jupyter-jsc maintenance: 25-02-2020 - 26-02-2020</h2></center>-->
-+      <h2>
-+      The access token of your browser session to the running JupyterLab has expired.
-+      </h2>
-+      <p>
-+        Unfortunately you have to log out and log in again from the Jupyter-JSC to regain access permission.<br>
-+        <a href="https://jupyter-jsc.fz-juelich.de/hub/logout?stopall=false&alldevices=false"> Logout now </a>
-+      </p>
-+    
-+  </div>
-+</div>
-+</div>
-+
-+<div class="footer">
-+  <div class="footer-top-background">
-+  </div>
-+  <div class="footer-bottom-background">
-+    <div class="footer-bottom">
-+      <div class="footer-links">
-+        <span>© Forschungszentrum Jülich</span>
-+        <a href="https://jupyter-jsc.fz-juelich.de/hub/imprint">Imprint</a>
-+        <a href="https://jupyter-jsc.fz-juelich.de/hub/privacy">Privacy Policy</a>
-+        <a href="mailto:ds-support@fz-juelich.de?subject=jupyter-jsc Support&amp;body=Please describe your problem here. (english or german)">Support</a>
-+        <a href="https://jupyter-jsc.fz-juelich.de/hub/terms">Terms of Service</a>
-+      </div>
-+      <a href="https://www.helmholtz.de/en/" target="_blank"><img class="helmholtz-logo" src="/hub/static/images/helmholtz.png"></a>
-+    </div>
-+  </div>
-+</div>
-+
-+</div> <!-- container -->
-+
-+</body></html>
diff --git a/Golden_Repo/j/Jupyter/Jupyter-2022.3.3-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/j/Jupyter/Jupyter-2022.3.3-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index 821c3e109..000000000
--- a/Golden_Repo/j/Jupyter/Jupyter-2022.3.3-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,1293 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'Jupyter'
-version = '2022.3.3'
-
-local_jlab_version = '3.3.4'
-
-homepage = 'http://www.jupyter.org'
-description = """
-Project Jupyter exists to develop open-source software, open-standards, and services for interactive computing across
-dozens of programming languages.
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('UnZip', '6.0'),
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2'),
-    ('CMake', '3.21.1'),  # for line_profiler
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('libyaml', '0.2.5'),
-    ('Pandoc', '2.16.1', '', SYSTEM),  # For doc-generation
-    ('texlive', '20200406'),
-    ('ITK', '5.2.1', '-nompi'),
-    ('HDF5', '1.12.1', '-serial'),
-    ('h5py', '3.5.0', '-serial'),
-    ('netcdf4-python', '1.5.7', '-serial'),
-    ('FFmpeg', '4.4.1'),  # for pydub
-    ('LLVM', '13.0.0'),  # llvmlite
-    ('git', '2.33.1', '-nodocs'),  # for jupyterlab_git (req. >=2.0)
-    ('SciPy-bundle', '2021.10'),
-    ('matplotlib', '3.4.3'),
-    ('Seaborn', '0.11.2'),
-    ('sympy', '1.8'),
-    ('xarray', '0.20.1'),
-    ('scikit-build', '0.11.1'),
-    ('scikit-learn', '1.0.1'),
-    ('scikit-image', '0.18.3'),
-    ('numba', '0.55.1'),
-    ('Shapely', '1.8.0'),
-    ('yarn', '1.22.17'),
-]
-
-osdependencies = [('openssl')]
-
-# this is a bundle of Python packages
-exts_defaultclass = 'PythonPackage'
-exts_default_options = {
-    'filter': ('python -c "import %(ext_name)s"', ''),
-    'download_dep_fail': True,
-    'source_urls': [PYPI_SOURCE],
-    'use_pip': True,
-    'sanity_pip_check':  True,
-    'use_pip_for_deps': False,
-}
-
-components = [
-    # ('nodejs', '16.14.0', {  # fails because printf-argument-list too long
-    ('nodejs', '14.18.3', {
-        'easyblock': 'ConfigureMake',
-        'source_urls': ['http://nodejs.org/dist/v%(version)s/'],
-        'sources': ['node-v%(version)s.tar.gz'],
-        'start_dir': 'node-v%(version)s',
-        'checksums': ['96d51324e4eb9dd88082a1effe328d272a6568121930e51ec089db1b966f891a'],
-    }),
-]
-
-# Dependencies can partly tested, created and updated using findPythonDeps.sh:
-# https://gist.github.com/Flamefire/49426e502cd8983757bd01a08a10ae0d
-exts_list = [
-    ('ptvsd', '4.3.2', {
-        'source_tmpl': 'ptvsd-4.3.2.zip',
-        'checksums': ['3b05c06018fdbce5943c50fb0baac695b5c11326f9e21a5266c854306bda28ab'],
-    }),
-    ('pyOpenSSL', '21.0.0', {
-        'modulename': 'OpenSSL',
-        'checksums': ['5e2d8c5e46d0d865ae933bef5230090bdaf5506281e9eec60fa250ee80600cb3'],
-    }),
-    ('entrypoints', '0.4', {
-        'checksums': ['b706eddaa9218a19ebcd67b56818f05bb27589b1ca9e8d797b74affad4ccacd4'],
-    }),
-    ('async_generator', '1.10', {
-        'checksums': ['6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144'],
-    }),
-    ('nest_asyncio', '1.5.5', {
-        'checksums': ['e442291cd942698be619823a17a86a5759eabe1f8613084790de189fe9e16d65'],
-    }),
-    ('absl-py', '0.15.0', {
-        'modulename': 'absl',
-        'checksums': ['72d782fbeafba66ba3e525d46bccac949b9a174dbf66233e50ece09ee688dc81'],
-    }),
-    ('websockets', '10.1', {
-        'checksums': ['181d2b25de5a437b36aefedaf006ecb6fa3aa1328ec0236cdde15f32f9d3ff6d'],
-    }),
-    ('websockify', '0.10.0', {
-        'checksums': ['6c4cc1bc132abb4a99834bcb1b4bd72f51d35a08d08093a817646ecc226ac44e'],
-    }),
-    # General Python packages
-    ('tornado', '6.1', {
-        'patches': ['tornado-timeouts.patch'],
-        'checksums': [
-            '33c6e81d7bd55b468d2e793517c909b139960b6c790a60b7991b9b6b76fb9791',
-            # Increase the request timeout when using jupyter-server-proxy
-            '1bb4e7d9d3a108764085018077ac552d8107915e6ce63b9196964608d746903f',  # tornado-timeouts.patch
-        ],
-    }),
-    ('bokeh', '2.4.2', {
-        'checksums': ['f0a4b53364ed3b7eb936c5cb1a4f4132369e394c7ae0a8ef420459410958033d'],
-    }),
-    ('nbformat', '5.2.0', {
-        'checksums': ['93df0b9c67221d38fb970c48f6d361819a6c388299a0ef3171bbb912edfe1324'],
-    }),
-    ('param', '1.12.0', {
-        'checksums': ['35d0281c8e3beb6dd469f46ff0b917752a54bed94d1b0c567346c76d0ff59c4a'],
-    }),
-    # Jupyter-core and dependencies
-    ('ipynb', '0.5.1', {
-        'checksums': ['8d834c777ca3885289938728cc382f081c86a58e92961e86f0aba60c96938ce5'],
-    }),
-    ('jupyter_core', '4.9.1', {
-        'checksums': ['dce8a7499da5a53ae3afd5a9f4b02e5df1d57250cf48f3ad79da23b4778cd6fa'],
-    }),
-    ('jupyter_packaging', '0.11.1', {
-        'checksums': ['6f5c7eeea98f7f3c8fb41d565a94bf59791768a93f93148b3c2dfb7ebade8eec'],
-    }),
-    ('retrying', '1.3.3', {
-        'checksums': ['08c039560a6da2fe4f2c426d0766e284d3b736e355f8dd24b37367b0bb41973b'],
-    }),
-    ('tikzplotlib', '0.9.17', {
-        'checksums': ['d422464188844b1c5cf2f6c31fbd492a0834f0071c8e452da5a5589ad8521364'],
-    }),
-    #  Jupyter client
-    ('jupyter_client', '7.1.2', {
-        'checksums': ['4ea61033726c8e579edb55626d8ee2e6bf0a83158ddf3751b8dd46b2c5cd1e96'],
-    }),
-    ('pynvml', '11.4.1', {
-        'checksums': ['b2e4a33b80569d093b513f5804db0c7f40cfc86f15a013ae7a8e99c5e175d5dd'],
-    }),
-    #  Jupyter notebook and dependencies
-    ('singledispatch', '3.7.0', {
-        'checksums': ['c1a4d5c1da310c3fd8fccfb8d4e1cb7df076148fd5d858a819e37fffe44f3092'],
-    }),
-    ('debugpy', '1.6.0', {
-        'source_tmpl': 'debugpy-%(version)s.zip',
-        'checksums': ['7b79c40852991f7b6c3ea65845ed0f5f6b731c37f4f9ad9c61e2ab4bd48a9275'],
-    }),
-    ('ipykernel', '6.13.0', {
-        'checksums': ['0e28273e290858393e86e152b104e5506a79c13d25b951ac6eca220051b4be60'],
-    }),
-    ('flit_core', '3.7.1', {
-        'checksums': ['14955af340c43035dbfa96b5ee47407e377ee337f69e70f73064940d27d0a44f'],
-    }),
-    ('ipyparallel', '8.3.0', {
-        'checksums': ['275d6d0c89c812679f0addc6a399bd75384bdf199ade12922d2ab3e2f7a99dc1'],
-    }),
-    ('terminado', '0.13.3', {
-        'checksums': ['94d1cfab63525993f7d5c9b469a50a18d0cdf39435b59785715539dd41e36c0d'],
-    }),
-    ('bleach', '4.1.0', {
-        'checksums': ['0900d8b37eba61a802ee40ac0061f8c2b5dee29c1927dd1d233e075ebf5a71da'],
-    }),
-    ('mistune', '0.8.4', {
-        'checksums': ['59a3429db53c50b5c6bcc8a07f8848cb00d7dc8bdb431a4ab41920d201d4756e'],
-    }),
-    ('pandocfilters', '1.5.0', {
-        'checksums': ['0b679503337d233b4339a817bfc8c50064e2eff681314376a47cb582305a7a38'],
-    }),
-    ('testpath', '0.5.0', {
-        'use_pip': False,
-        'checksums': ['1acf7a0bcd3004ae8357409fc33751e16d37ccc650921da1094a86581ad1e417'],
-    }),
-    ('nbclient', '0.5.10', {
-        'checksums': ['b5fdea88d6fa52ca38de6c2361401cfe7aaa7cd24c74effc5e489cec04d79088'],
-    }),
-    ('jupyterlab_pygments', '0.1.2', {
-        'checksums': ['cfcda0873626150932f438eccf0f8bf22bfa92345b814890ab360d666b254146'],
-    }),
-    ('defusedxml', '0.7.1', {
-        'checksums': ['1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51aa3e69'],
-    }),
-    ('pluggy', '1.0.0', {
-        'checksums': ['4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159'],
-    }),
-    ('tomli', '2.0.1', {
-        'checksums': ['de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f'],
-    }),
-    ('pathspec', '0.9.0', {
-        'checksums': ['e564499435a2673d586f6b2130bb5b95f04a3ba06f81b8f895b651a3c76aabb1'],
-    }),
-    ('editables', '0.3', {
-        'checksums': ['167524e377358ed1f1374e61c268f0d7a4bf7dbd046c656f7b410cde16161b1a'],
-    }),
-    ('soupsieve', '2.3.1', {
-        'checksums': ['b8d49b1cd4f037c7082a9683dfa1801aa2597fb11c3a1155b7a5b94829b4f1f9'],
-    }),
-    ('beautifulsoup4', '4.11.1', {
-        'checksums': ['ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693'],
-        'modulename': False,
-    }),
-    ('tinycss2', '1.1.1', {
-        'checksums': ['b2e44dd8883c360c35dd0d1b5aad0b610e5156c2cb3b33434634e539ead9d8bf'],
-    }),
-    ('pyee', '8.2.2', {
-        'checksums': ['5c7e60f8df95710dbe17550e16ce0153f83990c00ef744841b43f371ed53ebea']
-    }),
-    ('pytest-dependency', '0.5.1', {
-        'checksums': ['c2a892906192663f85030a6ab91304e508e546cddfe557d692d61ec57a1d946b']
-    }),
-    ('pyppeteer', '1.0.2', {
-        'checksums': ['ddb0d15cb644720160d49abb1ad0d97e87a55581febf1b7531be9e983aad7742']
-    }),
-    ('nbconvert', '6.5.0', {
-        # !!! nbconvert will try to read from all paths in <jupyter-config-path> the file nbconvert/templates/conf.json
-        #     ensure it has permissions (https://github.com/jupyter/nbconvert/issues/1430)
-        'checksums': ['223e46e27abe8596b8aed54301fadbba433b7ffea8196a68fd7b1ff509eee99d'],
-    }),
-    ('nbsphinx', '0.8.8', {
-        'checksums': ['b5090c824b330b36c2715065a1a179ad36526bff208485a9865453d1ddfc34ec']
-    }),
-    ('Send2Trash', '1.8.0', {
-        'modulename': 'send2trash',
-        'checksums': ['d2c24762fd3759860a0aff155e45871447ea58d2be6bdd39b5c8f966a0c99c2d'],
-    }),
-    ('argon2-cffi-bindings', '21.2.0', {
-        'modulename': '_argon2_cffi_bindings',
-        'checksums': ['bb89ceffa6c791807d1305ceb77dbfacc5aa499891d2c55661c6459651fc39e3'],
-    }),
-    ('argon2-cffi', '21.3.0', {
-        'modulename': 'argon2',
-        'checksums': ['d384164d944190a7dd7ef22c6aa3ff197da12962bd04b17f64d4e93d934dba5b'],
-    }),
-    ('notebook', '6.4.7', {
-        'patches': ['notebook-6.0.3_jsc.patch'],  # allow others to read/write in .ipynb_checkpoints
-        'checksums': [
-            'b01da66f11a203b3839d6afa4013674bcfff41c36552f9ad0fbcb2d93c92764a',  # notebook-6.4.7.tar.gz
-            '5e326a33ed0893dbec07d076ff572ee370b8cb1cf43fe8d56af091acc48afe81',  # notebook-6.0.3_jsc.patch
-        ],
-    }),
-    ('version_information', '1.0.4', {
-        'checksums': ['0d8418dcdad34e11f8f1cc78c513260defbbb723dd23941bd89f17a01466d912'],
-    }),
-    ('lesscpy', '0.15.0', {
-        'checksums': ['ef058fb3fca077f0136222c415bc6d20fe256e92648ccbf4b3de874ba03b9b9d'],
-    }),
-    ('prometheus_client', '0.12.0', {
-        'checksums': ['1b12ba48cee33b9b0b9de64a1047cbd3c5f2d0ab6ebcead7ddda613a750ec3c5'],
-    }),
-    ('jupyterthemes', '0.20.0', {
-        'checksums': ['2a8ebc0c84b212ab99b9f1757fc0582a3f53930d3a75b2492d91a7c8b36ab41e'],
-    }),
-    #  Jupyter Lab and dependencies
-    ('jupyterlab_launcher', '0.13.1', {
-        'checksums': ['f880eada0b8b1f524d5951dc6fcae0d13b169897fc8a247d75fb5beadd69c5f0'],
-    }),
-    ('sphinx_rtd_theme', '1.0.0', {
-        'checksums': ['eec6d497e4c2195fa0e8b2016b337532b8a699a68bcb22a512870e16925c6a5c'],
-    }),
-    ('commonmark', '0.9.1', {
-        'checksums': ['452f9dc859be7f06631ddcb328b6919c67984aca654e5fefb3914d54691aed60'],
-    }),
-    ('recommonmark', '0.7.1', {
-        'checksums': ['bdb4db649f2222dcd8d2d844f0006b958d627f732415d399791ee436a3686d67'],
-    }),
-    ('json5', '0.9.6', {
-        'checksums': ['9175ad1bc248e22bb8d95a8e8d765958bf0008fef2fe8abab5bc04e0f1ac8302'],
-    }),
-    ('ipython', '7.33.0', {
-        'modulename': 'IPython',
-        'checksums': ['bcffb865a83b081620301ba0ec4d95084454f26b91d6d66b475bff3dfb0218d4'],
-    }),
-    ('sniffio', '1.2.0', {
-        'checksums': ['c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de'],
-    }),
-    ('anyio', '3.5.0', {
-        'checksums': ['a0aeffe2fb1fdf374a8e4b471444f0f3ac4fb9f5a5b542b48824475e0042a5a6'],
-    }),
-    ('deprecation', '2.1.0', {
-        'checksums': ['72b3bde64e5d778694b0cf68178aed03d15e15477116add3fb773e581f9518ff'],
-    }),
-    ('websocket-client', '1.2.3', {
-        'modulename': 'websocket',
-        'checksums': ['1315816c0acc508997eb3ae03b9d3ff619c9d12d544c9a9b553704b1cc4f6af5'],
-    }),
-    ('requests-unixsocket', '0.3.0', {
-        'checksums': ['28304283ea9357d45fff58ad5b11e47708cfbf5806817aa59b2a363228ee971e'],
-    }),
-    ('cfgv', '3.3.1', {
-        'checksums': ['f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736'],
-    }),
-    ('identify', '2.5.0', {
-        'checksums': ['c83af514ea50bf2be2c4a3f2fb349442b59dc87284558ae9ff54191bff3541d2'],
-    }),
-    ('nodeenv', '1.6.0', {
-        'checksums': ['3ef13ff90291ba2a4a7a4ff9a979b63ffdd00a464dbe04acf0ea6471517a4c2b'],
-    }),
-    ('pre_commit', '2.18.1', {
-        'checksums': ['5d445ee1fa8738d506881c5d84f83c62bb5be6b2838e32207433647e8e5ebe10'],
-    }),
-    ('jupyter_server', '15c9635c8980cda43cc9153375c3bb908d98c697', {  # branch 1.x on 7.5.22
-        # do not use pypi for download -> we need >1.17.0 which is not released, yet
-        'source_urls': ['https://github.com/jupyter-server/jupyter_server/archive/'],
-        'source_tmpl': '%(version)s.tar.gz',
-        'checksums': ['050684eb2037e1f817306fd1a29b4595cebabcba0c5587250428211a477e8744'],
-    }),
-    ('Jinja2', '3.0.3', {
-        'checksums': ['611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7'],
-    }),
-    ('jupyterlab_server', '2.13.0', {
-        'checksums': ['2040298a133458aa22f287a877d6bb91ff973f6298d562264f9f7b75e92a5ace'],
-    }),
-    ('nbclassic', '0.3.5', {
-        'checksums': ['99444dd63103af23c788d9b5172992f12caf8c3098dd5a35c787f0df31490c29'],
-    }),
-    ('jupyterlab', local_jlab_version, {
-        'patches': [('401html.patch', 1)],
-        'checksums': [
-            'e04355848b3d91ac4d95c2e3846a0429b33e9c2edc79668fb4fc4d212f1e5107',  # jupyterlab-3.3.4.tar.gz
-            '094c89560472168c5ca24b3907d4a6a5b090352ef0c7657995d735246cc338f5',  # 401html.patch
-        ],
-    }),
-    ('jupyter_kernel_gateway', '2.5.1', {
-        'modulename': 'kernel_gateway',
-        'checksums': ['1d40df18e1c5a346faf44716573dfd531343936bf479cb05e9391dbe28b90779'],
-    }),
-    ('jupyter_console', '6.4.3', {
-        'checksums': ['55f32626b0be647a85e3217ddcdb22db69efc79e8b403b9771eb9ecc696019b5'],
-    }),
-    #  Jupyter Widgets and dependencies
-    ('traittypes', '0.2.1', {
-        'checksums': ['be6fa26294733e7489822ded4ae25da5b4824a8a7a0e0c2dccfde596e3489bd6'],
-    }),
-    ('widgetsnbextension', '3.6.0', {
-        'checksums': ['e84a7a9fcb9baf3d57106e184a7389a8f8eb935bf741a5eb9d60aa18cc029a80'],
-    }),
-    ('jupyterlab_widgets', '1.1.0', {  # uses PEP 517 and cannot be installed directly from source
-        'source_tmpl': 'jupyterlab_widgets-%(version)s-py3-none-any.whl',
-        'unpack_sources': False,
-        'checksums': ['c2a9bd3789f120f64d73268c066ed3b000c56bc1dda217be5cdc43e7b4ebad3f'],
-    }),
-    ('ipywidgets', '7.7.0', {
-        'checksums': ['ab4a5596855a88b83761921c768707d65e5847068139bc1729ddfe834703542a'],
-    }),
-    ('ipydatawidgets', '4.2.0', {  # uses PEP 517 and cannot be installed directly from source
-        'source_tmpl': 'ipydatawidgets-4.2.0-py2.py3-none-any.whl',
-        'unpack_sources': False,
-        'checksums': ['ace4d2aa68c0667290873bbc8a5a2948afe40c80f7c93c7c2b19d38c2e91c08f'],
-    }),
-    ('plotly', '5.5.0', {
-        'checksums': ['20b8a1a0f0434f9b8d10eb7caa66e947a9a1d698e5a53d40d447bbc0d2ae41f0'],
-    }),
-    ('bqplot', '0.12.32', {
-        'checksums': ['6fbfb93955ac15f87b6fa37368b04fd00da1f2d43843d8d9bc3d59116c6f5f00'],
-    }),
-    ('jupyter_bokeh', '3.0.4', {
-        'checksums': ['ba3b032f52a039d9e5ed8f6c50f3f9a00dcb97005871c24673a3b3a05465aef5'],
-    }),
-    ('pythreejs', '2.3.0', {
-        'checksums': ['231b7fced2485fa0945e01e4dd11fbb92d4aef74376a5ebe6e7c400dcc4e3c25'],
-    }),
-    ('ipywebrtc', '0.6.0', {
-        'checksums': ['f8ac3cc02b3633b59f388aef67961cff57f90028fd303bb3886c63c3d631da13'],
-    }),
-    ('ipyvolume', '0.6.0a10', {
-        'checksums': ['358bcc717b892c80c0fd5ecc58b27177fd2abe576492760eb2105eca3333ab6e'],
-    }),
-    ('xyzservices', '2022.1.1', {
-        'checksums': ['042ddd3c27a7c8707cc555737d0c8a86137e70bb00f8530117bee484993bd6e4'],
-    }),
-    ('ipyleaflet', '0.16.0', {
-        'checksums': ['e702d91cef608f67dd98e04d637367e5559e42541da81288c7d52068b082beaa'],
-    }),
-    ('ipympl', '0.8.7', {
-        'checksums': ['c69f55668758e6e18ab5754ed3e6f74faea81939594467717345f1ca62858b3d'],
-    }),   # respect version lookup table: https://github.com/matplotlib/ipympl
-    # Jupyter-Server-Proxy
-    ('idna-ssl', '1.1.0', {
-        'checksums': ['a933e3bb13da54383f9e8f35dc4f9cb9eb9b3b78c6b36f311254d6d0d92c6c7c'],
-    }),
-    ('multidict', '5.2.0', {
-        'checksums': ['0dd1c93edb444b33ba2274b66f63def8a327d607c6c790772f448a53b6ea59ce'],
-    }),
-    ('yarl', '1.6.3', {
-        'checksums': ['8a9066529240171b68893d60dca86a763eae2139dd42f42106b03cf4b426bf10'],
-    }),
-    ('async-timeout', '4.0.2', {
-        'checksums': ['2163e1640ddb52b7a8c80d0a67a08587e5d245cc9c553a74a847056bc2976b15'],
-    }),
-    ('aiosignal', '1.2.0', {
-        'checksums': ['78ed67db6c7b7ced4f98e495e572106d5c432a93e1ddd1bf475e1dc05f5b7df2'],
-    }),
-    ('frozenlist', '1.3.0', {
-        'checksums': ['ce6f2ba0edb7b0c1d8976565298ad2deba6f8064d2bebb6ffce2ca896eb35b0b'],
-    }),
-    ('aiohttp', '3.8.1', {
-        'checksums': ['fc5471e1a54de15ef71c1bc6ebe80d4dc681ea600e68bfd1cbce40427f0b7578'],
-    }),
-    ('simpervisor', '0.4', {
-        'checksums': ['cec79e13cdbd6edb04a5c98c1ff8d4bd9713e706c069226909a1ef0e89d393c5'],
-    }),
-    ('jupyter-server-proxy', '3.2.1', {
-        'patches': ['jupyter-server-proxy_timeout.patch'],  # timeout after 15s instead of 5s
-        'checksums': [
-            '080e9910592d06422bdd93dfc1fa8350c6fdaec9fbbd050630e90f7a5593a4f7',  # jupyter-server-proxy-3.2.1.tar.gz
-            'dc74e299b9fbc7e2fc55bc58fc742399a6cad7ab7a6f6c1b9858f3df65ca57d9',  # jupyter-server-proxy_timeout.patch
-        ],
-    }),
-    # Jupyter Lab Extensions
-    # JLab 3 support: https://github.com/jupyterlab/jupyterlab-github/pull/112
-    #    ('jupyterlab_github', '3.0.1', dict(list(local_common_opts.items()) + [
-    #        # ('checksums', [('sha256', '1f560a91711b779d08118161af044caff4419e315cb80ae830d3dfbded7bac9')]),
-    #        # do not use pypi for download -> we need to patch drive.json
-    #        ('source_urls', ['https://github.com/jupyterlab/jupyterlab-github/archive']),
-    #        ('source_tmpl', 'v%(version)s.tar.gz'),
-    #        ('patches', ['jupyterlab_github-%(version)s_jsc.patch']),
-    #    ])),
-    ('jupyterlab_gitlab', '3.0.0', {
-        'checksums': ['5b0367b82e3170d8274465285a36be9c331dac5674d9ba7e8e2b5dd4972d64f7'],
-    }),
-    ('jupyterlab-topbar', '0.6.1', {
-        'modulename': 'jupyterlab',
-        'checksums': ['f1f9144fd09c29b8921f378662f26c65a460967d9c48eeea8018cea49626fb5f'],
-    }),
-    ('jupyterlab-controlbtn', '0.5.1', {
-        'modulename': 'jupyterlab',
-        'source_tmpl': '%(version)s.tar.gz',
-        'source_urls': ['https://github.com/jhgoebbert/jupyterlab-controlbtn/archive/'],
-        'checksums': ['ac4c2165d79dd84f2fea0086cc6c3a851cfb239918bb628163b812abb54a4b46'],
-    }),
-    ('jupyter-resource-usage', '0.6.1', {
-        'checksums': ['8b766b9dded49e582cc38ebeb7f19af2eae50ccf77730afbe96f4a09def9874b'],
-    }),
-    ('jupyterlab-system-monitor', '0.8.0', {
-        'modulename': 'jupyterlab',
-        'checksums': ['f8d03d3ee26c84300c85e570f1a9d5f69bdcfa85e9a298f5716b67e36d0d94df'],
-    }),
-    ('jupyterlab-spellchecker', '0.7.2', {
-        'checksums': ['e13732cf5a277d40cd1a25eaa9264c13b67a4231e4bd90695722ddf6eebf6ab1'],
-    }),
-    ('tornado_proxy_handlers', '0.0.5', {
-        'checksums': ['8250177dbc7567fa2d3cfd22d0a7de71e34cceb8e56c7b7d7c2e5f92ffb5c60a'],
-    }),
-    ('jupyterlab_iframe', '0.4.4', {
-        'checksums': ['f381ffef2a866eea0a9e3e56f428064b117a9155f9f7605c4bf0eb74d03dc378'],
-    }),
-    ('zstandard', '0.16.0', {
-        'checksums': ['eaae2d3e8fdf8bfe269628385087e4b648beef85bb0c187644e7df4fb0fe9046'],
-    }),
-    ('itk_core', '5.2.1', {
-        'modulename': 'itk',
-        'source_tmpl': 'itk_core-%(version)s-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl',
-        'unpack_sources': False,
-        'checksums': ['467b34a91d933e46b850380d9d68d77642100129d67b303efa852cd67dba5d9b'],
-    }),
-    ('itk_filtering', '5.2.1', {
-        'modulename': 'itk',
-        'source_tmpl': 'itk_filtering-%(version)s-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl',
-        'unpack_sources': False,
-        'checksums': ['785ba8f032315747bb52227c38c6c9a912c21754c61289d785e6430563635d85'],
-    }),
-    ('itk_segmentation', '5.2.1', {
-        'modulename': 'itk',
-        'source_tmpl': 'itk_segmentation-%(version)s-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl',
-        'unpack_sources': False,
-        'checksums': ['dd361248ed5f52c645e6baaa3936cce84558673a8b7c4103f7bbeb7c11ef7798'],
-    }),
-    ('itk_numerics', '5.2.1', {
-        'modulename': 'itk',
-        'source_tmpl': 'itk_numerics-%(version)s-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl',
-        'unpack_sources': False,
-        'checksums': ['a5117e0a57fca0709330c32037c9359de7dd1614a74f5fe707de7e596b0db8d6'],
-    }),
-    ('itk_registration', '5.2.1', {
-        'modulename': 'itk',
-        'source_tmpl': 'itk_registration-%(version)s-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl',
-        'unpack_sources': False,
-        'checksums': ['d03d112ddb37732151ed0a145d982c2ff51885f9d8cfb01091af3758f059ff36'],
-    }),
-    ('itk_io', '5.2.1', {
-        'modulename': 'itk',
-        'source_tmpl': 'itk_io-%(version)s-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl',
-        'unpack_sources': False,
-        'checksums': ['feb23278b74026d61fbd9ea9edf567a885aae95b2f62cf1a5a636d6afba486f0'],
-    }),
-    ('itk_meshtopolydata', '0.7.1', {
-        'modulename': 'itk',
-        'source_tmpl': 'itk_meshtopolydata-%(version)s-cp39-cp39-manylinux2014_x86_64.whl',
-        'unpack_sources': False,
-        'checksums': ['17dd1425e110583a4d94f6079ea243709182c1349d0b1015dd68e02607d55c63'],
-    }),
-    ('pyct', '0.4.8', {
-        'checksums': ['23d7525b5a1567535c093aea4b9c33809415aa5f018dd77f6eb738b1226df6f7'],
-    }),
-    ('colorcet', '3.0.0', {
-        'checksums': ['21c522346a7aa81a603729f2996c22ac3f7822f4c8c303c59761e27d2dfcf3db'],
-    }),
-    # ('itkwidgets', '0.32.1', dict(list(local_common_opts.items()) + [  # no JLab3
-    #     ('checksums', [('sha256', '42d0d8f06bf57a0b013720f81f7cfc8fe150b949a49c6c4df9d95ef420af1f45')]),
-    # ])),  # no JLab>=3
-    ('python-dotenv', '0.19.2', {
-        'modulename': 'dotenv',
-        'checksums': ['a5de49a31e953b45ff2d2fd434bbc2670e8db5273606c1e737cc6b93eff3655f'],
-    }),
-    ('jupyterlab_latex', '3.1.0', {
-        'checksums': ['f44df285405b5b552b70d10f1f0573d61ca3a4d2ca50bd3097a63a27cdcde16e'],
-    }),
-    # ('jupyterlab_slurm', '3.0.1', {
-    #     'checksums': ['40157e9dd4e67acf43aab17e9c4faca922da8364181bc321551550768d5dd6a2'],
-    # }),
-    # version from 6-jan-2021
-    # ('jupyterlmod', '9ddb49d5f3cc6ddc196f5e1c597f2e1b76af7d2d', dict(list(local_common_opts.items()) + [
-    #    ('source_urls', ['https://github.com/cmd-ntrf/jupyter-lmod/archive/']),
-    #    ('source_tmpl', '%(version)s.tar.gz'),
-    #    ('checksums', [('sha256', '65c656306c9ba4948bb3d800238cb524484ef158ae6f9e1dbaa224b3635f65d8')]),
-    #    ('patches', ['jupyterlmod-urlfile.patch']),
-    # ])),
-    ('jupyter_server_mathjax', '0.2.5', {
-        'checksums': ['64d96c8e6dfe6edba737902b2dc3a2dc058f17516776c25f4d30ca24617ee7b3'],
-    }),
-    ('nbdime', '3.1.1', {
-        'checksums': ['67767320e971374f701a175aa59abd3a554723039d39fae908e72d16330d648b'],
-    }),
-    ('smmap', '5.0.0', {
-        'checksums': ['c840e62059cd3be204b0c9c9f74be2c09d5648eddd4580d9314c3ecde0b30936'],
-    }),
-    ('gitdb', '4.0.9', {
-        'checksums': ['bac2fd45c0a1c9cf619e63a90d62bdc63892ef92387424b855792a6cabe789aa'],
-    }),
-    ('GitPython', '3.1.26', {
-        'modulename': 'git',
-        'checksums': ['fc8868f63a2e6d268fb25f481995ba185a85a66fcad126f039323ff6635669ee'],
-    }),
-    ('jupyterlab_git', '0.34.2', {
-        'checksums': ['58d061b87177ae10166440f8762f41f4ba2afac851ce926e68038e70d0f56041'],
-    }),
-    ('sidecar', '0.5.1', {
-        'checksums': ['47a39299ee78ee81a55fb2aa84225b45aa649655c97a7e0e06e3728e85b90bc3'],
-    }),
-    ('pycodestyle', '2.8.0', {
-        'checksums': ['eddd5847ef438ea1c7870ca7eb78a9d47ce0cdb4851a5523949f2601d0cbbe7f'],
-    }),
-    ('autopep8', '1.5.7', {
-        'checksums': ['276ced7e9e3cb22e5d7c14748384a5cf5d9002257c0ed50c0e075b68011bb6d0'],
-    }),
-    ('yapf', '0.32.0', {
-        'checksums': ['a3f5085d37ef7e3e004c4ba9f9b3e40c54ff1901cd111f05145ae313a7c67d1b'],
-    }),
-    ('isort', '4.3.21', {
-        'checksums': ['54da7e92468955c4fceacd0c86bd0ec997b0e1ee80d97f67c35a78b719dccab1'],
-    }),
-    ('typed_ast', '1.5.1', {
-        'checksums': ['484137cab8ecf47e137260daa20bafbba5f4e3ec7fda1c1e69ab299b75fa81c5'],
-    }),
-    ('black', '19.3b0', {
-        'checksums': ['68950ffd4d9169716bcb8719a56c07a2f4485354fec061cdd5910aa07369731c'],
-    }),  # do not update without changing Jupyter-JSC´s ".start.sh", https://github.com/psf/black/pull/1539
-    ('jupyterlab_code_formatter', '1.4.10', {
-        'checksums': ['1645fd80b99d590d60fe0f3c078c9101ad62dfdbfac5e78b4c2d334896ab526f'],
-    }),
-    ('jsonmerge', '1.8.0', {
-        'checksums': ['a86bfc44f32f6a28b749743df8960a4ce1930666b3b73882513825f845cb9558'],
-    }),
-    ('jupyterlab_favorites', '3.0.1', {
-        'patches': [('update_favorites_json', '.')],
-        'checksums': [
-            '6102c164775b67ffa0f97df275c4d76a3603eaf49eed2887f2368012b1924f2c',
-            '496a9ef8bb7f399907a8923e1386d541528e77e237ea7e3abe5b28d432a9bd11',
-        ],
-    }),
-    ('jupyterlab_recents', '3.0.1', {
-        'checksums': ['bc45d51ec22c8924197044af151c401644ab649eb2bc36123b167294a396cf23'],
-    }),
-    ('jupyterlab_plugin_playground', '0.4.0', {
-        'checksums': ['81783712c286f334af46b55b912635671b68e1fe445439e7f8c817242f702d2f'],
-    }),
-    ###############
-    # extras
-    ('mccabe', '0.7.0', {
-        'checksums': ['348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325'],
-    }),
-    ('pyflakes', '2.4.0', {
-        'checksums': ['05a85c2872edf37a4ed30b0cce2f6093e1d0581f8c19d7393122da7e25b2b24c'],
-    }),
-    ('flake8', '4.0.1', {
-        'patches': ['flake8_mccabe07.patch'],
-        'checksums': [
-            '806e034dda44114815e23c16ef92f95c91e4c71100ff52813adf7132a6ad870d',
-            '824ed4b2d20a2d69edd2470d848c1f6e87bba31f816d96f1f677977e8cf34fab',
-        ],
-    }),
-    ('pydocstyle', '5.0.2', {
-        'checksums': ['f4f5d210610c2d153fae39093d44224c17429e2ad7da12a8b419aba5c2f614b5'],
-    }),
-    ('rope', '1.0.0', {
-        'checksums': ['16f652d3002296778d463db329da6a05d914a4dbde30ea6da76362da06c0ebb7'],
-    }),
-    # base for python language server
-    ('python-jsonrpc-server', '0.4.0', {
-        'modulename': 'pyls_jsonrpc',
-        'checksums': ['62c543e541f101ec5b57dc654efc212d2c2e3ea47ff6f54b2e7dcb36ecf20595'],
-    }),
-    # test
-    ('lazy-object-proxy', '1.7.1', {
-        'checksums': ['d609c75b986def706743cdebe5e47553f4a5a1da9c5ff66d76013ef396b5a8a4'],
-    }),
-    ('wrapt', '1.13.3', {
-        'checksums': ['1fea9cd438686e6682271d36f3481a9f3636195578bab9ca3382e2f5f01fc185'],
-    }),
-    ('astroid', '2.11.2', {
-        'checksums': ['8d0a30fe6481ce919f56690076eafbb2fb649142a89dc874f1ec0e7a011492d0'],
-    }),
-    ('pylint', '2.13.5', {
-        'checksums': ['dab221658368c7a05242e673c275c488670144123f4bd262b2777249c1c0de9b'],
-    }),
-    ('pytest', '6.2.5', {
-        'checksums': ['131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89'],
-    }),
-    ('pytest-cov', '2.12.1', {
-        'checksums': ['261ceeb8c227b726249b376b8526b600f38667ee314f910353fa318caa01f4d7'],
-    }),
-    ('pytest-xprocess', '0.18.1', {
-        'checksums': ['fd9f30ed1584b5833bc34494748adf0fb9de3ca7bacc4e88ad71989c21cba266'],
-    }),
-    # python language server
-    ('python-lsp-jsonrpc', '1.0.0', {
-        'modulename': 'pylsp_jsonrpc',
-        'checksums': ['7bec170733db628d3506ea3a5288ff76aa33c70215ed223abdb0d95e957660bd'],
-    }),
-    ('python-lsp-server', '1.4.1', {
-        'modulename': 'pylsp',
-        'checksums': ['be7f83298af9f0951a93972cafc9db04fd7cf5c05f20812515275f0ba70e342f'],
-    }),
-    ('jupyter-lsp', '1.5.1', {
-        'checksums': ['751abd35413be99a4331f3597b09341adc755589ed32091ac2f686db3d61267e'],
-    }),
-    ('jupyterlab-lsp', '3.10.1', {
-        'checksums': ['9ad6ef22c4972b85480797034fc7914728eb78f1856b4dab3361686e4f20c9dd'],
-    }),
-    ('jupyterlab-tour', '3.1.4', {
-        'checksums': ['f1d80ec906f689134d259203caf281ea53b8c2353c4a265c29947b557e009229'],
-    }),
-    # jupyterlab_hdf
-    ('orjson', '3.6.7', {
-        'source_tmpl': 'orjson-%(version)s-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl',
-        'checksums': ['a08b6940dd9a98ccf09785890112a0f81eadb4f35b51b9a80736d1725437e22c'],
-        # 'source_tmpl': 'orjson-%(version)s-cp39-cp39-manylinux_2_24_x86_64.whl',
-        # 'checksums': ['e6201494e8dff2ce7fd21da4e3f6dfca1a3fed38f9dcefc972f552f6596a7621'],
-        'unpack_sources': False,
-    }),
-    ('tifffile', '2022.2.9', {
-        'checksums': ['7eda74117643681bb2caa695b48f39e2243b4887f7cf991d5adffd813e5c8373'],
-    }),
-    ('h5grove', '0.0.14', {
-        'checksums': ['ead42d2d98f28ef363c83bd4ba421f25f02c111c615201093707a670b9978704'],
-    }),
-    ('jupyterlab_hdf', '1.2.0', {
-        'checksums': ['60a5b6808966d26af15f93c9339f81f1c194324fd94339d0bf700b5aa64f659d'],
-    }),
-    ####################
-    # Jupyter Hub
-    ('pamela', '1.0.0', {
-        'checksums': ['65c9389bef7d1bb0b168813b6be21964df32016923aac7515bdf05366acbab6c'],
-    }),
-    ('certipy', '0.1.3', {
-        'checksums': ['695704b7716b033375c9a1324d0d30f27110a28895c40151a90ec07ff1032859'],
-    }),
-    ('oauthlib', '3.1.1', {
-        'checksums': ['8f0215fcc533dd8dd1bee6f4c412d4f0cd7297307d43ac61666389e3bc3198a3'],
-    }),
-    ('ruamel.yaml', '0.17.20', {
-        'checksums': ['4b8a33c1efb2b443a93fcaafcfa4d2e445f8e8c29c528d9f5cdafb7cc9e4004c'],
-    }),
-    ('ruamel.yaml.clib', '0.2.6', {
-        'modulename': 'ruamel.yaml',
-        'checksums': ['4ff604ce439abb20794f05613c374759ce10e3595d1867764dd1ae675b85acbd'],
-    }),
-    ('python-json-logger', '0.1.11', {
-        'modulename': 'pythonjsonlogger',
-        'checksums': ['b7a31162f2a01965a5efb94453ce69230ed208468b0bbc7fdfc56e6d8df2e281'],
-    }),
-    ('jupyter_telemetry', '0.1.0', {
-        'checksums': ['445c613ae3df70d255fe3de202f936bba8b77b4055c43207edf22468ac875314'],
-    }),
-    ('jupyterhub', '1.5.0', {
-        'patches': ['jupyterhub-1.1.0_logoutcookie-2.0.patch'],
-        'checksums': [
-            'dc618f657c23ba46280e36257e50931806674ba0e9e6498afb091efc6226d69d',
-            '3b72d8178499bef7ed8562ab08e329f1136f80f21884fbed461f589d4c5de212',
-        ],
-    }),  # copy 401.html -> <jupyter-install-dir>/share/jupyter/lab/static/
-    ('HeapDict', '1.0.1', {
-        'checksums': ['8495f57b3e03d8e46d5f1b2cc62ca881aca392fd5cc048dc0aa2e1a6d23ecdb6'],
-    }),
-    ('zict', '2.0.0', {
-        'checksums': ['8e2969797627c8a663575c2fc6fcb53a05e37cdb83ee65f341fc6e0c3d0ced16'],
-    }),
-    ('tblib', '1.7.0', {
-        'checksums': ['059bd77306ea7b419d4f76016aef6d7027cc8a0785579b5aad198803435f882c'],
-    }),
-    ('dask', '2022.1.0', {
-        'checksums': ['aee6eb6517f13dc00a3cc7ed9e13c728baa5850b8a35a2b93793d593a23ecbb8'],
-    }),
-    ('distributed', '2022.1.0', {
-        'checksums': ['71caba36b831ae4d4baacd44c702936198f236cae7d422edb50fe36ef5a68156'],
-    }),
-    ('dask_labextension', '5.2.0', {
-        'checksums': ['c51952c3bbbb7b7d6280bfd9e537dc7b849fd3eda37faac7a3a30f4ea06cb2cc'],
-    }),  # if you change the version ensure you sync it with postcommands (cp plugin.json)
-    ('dask-jobqueue', '0.7.3', {
-        'checksums': ['682d7cc0e6b319b6ab83a7a898680c12e9c77ddc77df380b40041290f55d4e79'],
-    }),
-    ('Automat', '0.8.0', {
-        'checksums': ['269a09dfb063a3b078983f4976d83f0a0d3e6e7aaf8e27d8df1095e09dc4a484'],
-    }),
-    ('PyHamcrest', '1.9.0', {
-        'modulename': 'hamcrest',
-        'checksums': ['8ffaa0a53da57e89de14ced7185ac746227a8894dbd5a3c718bf05ddbd1d56cd'],
-    }),
-    ('pyasn1-modules', '0.2.8', {
-        'checksums': ['905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e'],
-    }),
-    ('service-identity', '21.1.0', {
-        'checksums': ['6e6c6086ca271dc11b033d17c3a8bea9f24ebff920c587da090afc9519419d34'],
-    }),
-    ('incremental', '21.3.0', {
-        'checksums': ['02f5de5aff48f6b9f665d99d48bfc7ec03b6e3943210de7cfc88856d755d6f57'],
-    }),
-    ('Twisted', '21.7.0', {
-        'checksums': ['2cd652542463277378b0d349f47c62f20d9306e57d1247baabd6d1d38a109006'],
-    }),
-    ('autobahn', '21.11.1', {
-        'checksums': ['bd6f46315419ca0a5be4109f737410208ad5f19718f67ca6a4a674cc66ca9b18'],
-    }),
-    ('constantly', '15.1.0', {
-        'checksums': ['586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35'],
-    }),
-    ('hyperlink', '21.0.0', {
-        'checksums': ['427af957daa58bc909471c6c40f74c5450fa123dd093fc53efd2e91d2705a56b'],
-    }),
-    ('incremental', '21.3.0', {
-        'checksums': ['02f5de5aff48f6b9f665d99d48bfc7ec03b6e3943210de7cfc88856d755d6f57'],
-    }),
-    ('txaio', '21.2.1', {
-        'checksums': ['7d6f89745680233f1c4db9ddb748df5e88d2a7a37962be174c0fd04c8dba1dc8'],
-    }),
-    ('zope.interface', '5.4.0', {
-        'checksums': ['5dba5f530fec3f0988d83b78cc591b58c0b6eb8431a85edd1569a0539a8a5a0e'],
-    }),
-    ('wslink', '1.5.2', {
-        'checksums': ['99edcc1decd2ef71323b2799efc1b394addf4a62cb57d8323d2e7804f8087699'],
-    }),
-    ('ipyvue', '1.7.0', {
-        'checksums': ['fa8ff9b9a73b5a925c4af4c05f1839df2bd0fae0063871f403ee821792d5ab72'],
-    }),
-    ('ipyvuetify', '1.8.1', {
-        'checksums': ['2d17367ce7da45a2622107d55c8b4c5475aace99ed5d95e5d7d3f93aa4c0c566'],
-    }),
-    ('voila', '0.3.5', {
-        'checksums': ['640acadb6e787370f32a5264e0f644c0bcb0d0c8026823f6d296cea725c6b289'],
-    }),
-    ('voila-material', '0.4.0', {
-        'modulename': 'voila',
-        'checksums': ['0827a27f0f23ca87bd8f565c4c227c754516d2a120ffce0f7ab1ee12fdec959f'],
-    }),
-    ('voila-gridstack', '0.3.0', {
-        'checksums': ['fafc7eb8773ca07d2cec26da4547078071f628c056007f0cfaa73b19641c58ec'],
-        'modulename': 'voila',
-    }),
-    # ('voila-vuetify', '0.5.2', dict(list(local_common_opts.items()) + [  # req. voila<0.3,>=0.2.0b1
-    #     ('checksums', [('sha256', '63f7da1efb2a48df44206da2504b70adf549279d572046e2d04adcc57e5b6f66')]),
-    #     ('modulename', 'voila'), # req. voila<0.3 which req. nbconvert<6, req. jupyter-client<7,>=6.1.3
-    # ])),
-    ('pydicom', '2.2.2', {
-        'checksums': ['f51078da1fe1285431a6f14a5ca0273520391ef28a68b32b9de73cc7f93f38be'],
-    }),
-    # ('dicom_upload', '0.2.0', dict(list(local_common_opts.items()) + [
-    #     ('checksums', [('sha256', 'd03f309bbae2094d3db75ffaa9753cca5982d2096ec55720a1f54343cc4a6877')]),
-    # ])),  # too old deps: "@jupyter-widgets/base": "^1.1 || ^2|| ^3"
-    # ('jsfileupload', '0.2.0', dict(list(local_common_opts.items()) + [
-    #     ('checksums', [('sha256', '245cd74a3c2ed4356df9a33d0072d8ab295b60b6fdfd69c6795396d455fc8a77')]),
-    # ])),  # older deps: "@jupyter-widgets/base": "^1.1.10 || ^2"
-    # ('pvlink', '0.3.1', dict(list(local_common_opts.items()) + [
-    #     ('checksums', [('sha256', 'a2d5f2c204e0e779a5b865742019b4646b8592d76de87cac724dc84f64eaf80f')]),
-    # ])),  # older deps: "@jupyter-widgets/base": { "version": "3.0.0"
-    ('textwrap3', '0.9.2', {
-        'source_tmpl': 'textwrap3-0.9.2.zip',
-        'checksums': ['5008eeebdb236f6303dcd68f18b856d355f6197511d952ba74bc75e40e0c3414'],
-    }),
-    ('ansiwrap', '0.8.4', {
-        'source_tmpl': 'ansiwrap-0.8.4.zip',
-        'checksums': ['ca0c740734cde59bf919f8ff2c386f74f9a369818cdc60efe94893d01ea8d9b7'],
-    }),
-    ('tqdm', '4.62.3', {
-        'checksums': ['d359de7217506c9851b7869f3708d8ee53ed70a1b8edbba4dbcb47442592920d'],
-    }),
-    ('tenacity', '8.0.1', {
-        'checksums': ['43242a20e3e73291a28bcbcacfd6e000b02d3857a9a9fff56b297a27afdc932f'],
-    }),
-    ('papermill', '2.3.4', {
-        'checksums': ['be12d2728989c0ae17b42fcb05b623500004e94b34f56bd153355ccebb84a59a'],
-    }),
-    ('pyviz_comms', '2.1.0', {
-        'checksums': ['f4a7126f318fb6b964fef3f92fa55bc46b9218f62a8464a8b18e968b3087dbc0'],
-    }),
-    ('Markdown', '3.3.6', {
-        'modulename': 'markdown',
-        'checksums': ['76df8ae32294ec39dcf89340382882dfa12975f87f45c3ed1ecdb1e8cefc7006'],
-    }),
-    ('panel', '0.12.7', {
-        'checksums': ['119b525c954df0d630e7bc7ef2cb7e50b406cca73a4caa823c43e49d58b52ebb'],
-    }),
-    ('holoviews', '1.14.7', {
-        'checksums': ['8d8d171227e9c9eaadd4b037b3ddaa01055a33bacbdbeb57a5efbd273986665f'],
-    }),
-    # PythonPackages for Tutorials
-    ('patsy', '0.5.2', {
-        'checksums': ['5053de7804676aba62783dbb0f23a2b3d74e35e5bfa238b88b7cbf148a38b69d'],
-    }),
-    ('statsmodels', '0.13.1', {
-        'checksums': ['006ec8d896d238873af8178d5475203844f2c391194ed8d42ddac37f5ff77a69'],
-    }),
-    ('cftime', '1.5.2', {
-        'checksums': ['375d37d9ab8bf501c048e44efce2276296e3d67bb276e891e0e93b0a8bbb988a'],
-    }),
-    ('vega_datasets', '0.9.0', {
-        'checksums': ['9dbe9834208e8ec32ab44970df315de9102861e4cda13d8e143aab7a80d93fc0'],
-    }),
-    ('Theano', '1.0.5', {
-        'modulename': 'theano',
-        'checksums': ['6e9439dd53ba995fcae27bf20626074bfc2fff446899dc5c53cb28c1f9202e89'],
-    }),
-    ('altair', '4.2.0', {
-        'checksums': ['d87d9372e63b48cd96b2a6415f0cf9457f50162ab79dc7a31cd7e024dd840026'],
-    }),
-    ('cssselect', '1.1.0', {
-        'checksums': ['f95f8dedd925fd8f54edb3d2dfb44c190d9d18512377d3c1e2388d16126879bc'],
-    }),
-    ('smopy', '0.0.7', {
-        'checksums': ['578b5bc2502176d210f176ab94e77974f43b32c95cd0768fb817ea2499199592'],
-    }),
-    ('memory_profiler', '0.60.0', {
-        'checksums': ['6a12869511d6cebcb29b71ba26985675a58e16e06b3c523b49f67c5497a33d1c'],
-    }),
-    ('line_profiler', '3.4.0', {
-        'checksums': ['b6b0a8100a2829358e31ef7c6f427b1dcf2b1d8e5d38b55b219719ecf758aee5'],
-    }),
-    ('arviz', '0.11.4', {
-        'checksums': ['01872758eeabb9941479ec5dd378117337bf95d14cc2c298b437cfda1780b436'],
-    }),
-    ('cachetools', '4.2.4', {
-        'checksums': ['89ea6f1b638d5a73a4f9226be57ac5e4f399d22770b92355f92dcb0f7f001693'],
-    }),
-    ('dill', '0.3.4', {
-        'source_tmpl': '%(name)s-%(version)s.zip',
-        'checksums': ['9f9734205146b2b353ab3fec9af0070237b6ddae78452af83d2fca84d739e675'],
-    }),
-    ('fastprogress', '1.0.0', {
-        'checksums': ['89e28ac1d2a5412aab18ee3f3dfd1ee8b5c1f2f7a44d0add0d0d4f69f0191bfe'],
-    }),
-    ('Theano-PyMC', '1.1.2', {
-        'modulename': 'theano.tensor',
-        'checksums': ['5da6c2242ea72a991c8446d7fe7d35189ea346ef7d024c890397011114bf10fc'],
-    }),
-    ('semver', '2.13.0', {
-        'checksums': ['fa0fe2722ee1c3f57eac478820c3a5ae2f624af8264cbdf9000c980ff7f75e3f'],
-    }),
-    ('pymc3', '3.11.4', {
-        'checksums': ['3b88d1e6c85f7fb8a9b99d6f136ac860672170370ec4146338fdd160c3b3fd3f'],
-    }),
-    ('ipythonblocks', '1.9.0', {
-        'checksums': ['ba923cb7a003bddee755b5a7ac9e046ffc093a04b0bdede8a0a51ef900aed0ba'],
-    }),
-    ('pydub', '0.25.1', {
-        'checksums': ['980a33ce9949cab2a569606b65674d748ecbca4f0796887fd6f46173a7b0d30f'],
-    }),
-    ('multipledispatch', '0.6.0', {
-        'checksums': ['a7ab1451fd0bf9b92cab3edbd7b205622fb767aeefb4fb536c2e3de9e0a38bea'],
-    }),
-    ('partd', '1.2.0', {
-        'checksums': ['aa67897b84d522dcbc86a98b942afab8c6aa2f7f677d904a616b74ef5ddbc3eb'],
-    }),
-    ('locket', '0.2.1', {
-        'checksums': ['3e1faba403619fe201552f083f1ecbf23f550941bc51985ac6ed4d02d25056dd'],
-    }),
-    ('datashape', '0.5.2', {
-        'checksums': ['2356ea690c3cf003c1468a243a9063144235de45b080b3652de4f3d44e57d783'],
-    }),
-    ('datashader', '0.13.0', {
-        'checksums': ['e89b1c1e6d508c399738b2daf37aa102f63fc70be53cce9db90d654b19c2555f'],
-    }),
-    ('selenium', '3.141.0', {
-        'checksums': ['deaf32b60ad91a4611b98d8002757f29e6f2c2d5fcaf202e1c9ad06d6772300d'],
-    }),
-    ('graphviz', '0.19.1', {
-        'source_tmpl': 'graphviz-0.19.1.zip',
-        'checksums': ['09ed0cde452d015fe77c4845a210eb642f28d245f5bc250d4b97808cb8f49078'],
-    }),
-    ('vincent', '0.4.4', {
-        'checksums': ['5765bcd360140d2304e52728ad1d4382f3f919ea259a13932828680f2d84fcd3'],
-    }),
-    ('tailer', '0.4.1', {
-        'checksums': ['78d60f23a1b8a2d32f400b3c8c06b01142ac7841b75d8a1efcb33515877ba531'],
-    }),
-    # Dash
-    ('Brotli', '1.0.9', {
-        'modulename': 'brotli',
-        'source_tmpl': 'Brotli-1.0.9.zip',
-        'checksums': ['4d1b810aa0ed773f81dceda2cc7b403d01057458730e309856356d4ef4188438'],
-    }),
-    ('Flask-Compress', '1.10.1', {
-        'modulename': 'flask_compress',
-        'checksums': ['28352387efbbe772cfb307570019f81957a13ff718d994a9125fa705efb73680'],
-    }),
-    ('hiredis', '1.1.0', {
-        'checksums': ['996021ef33e0f50b97ff2d6b5f422a0fe5577de21a8873b58a779a5ddd1c3132'],
-    }),
-    ('redis', '3.5.3', {
-        'checksums': ['0e7e0cfca8660dea8b7d5cd8c4f6c5e29e11f31158c0b0ae91a397f00e5a05a2'],
-    }),
-    ('Flask-Caching', '1.10.1', {
-        'modulename': 'flask_caching',
-        'checksums': ['cf19b722fcebc2ba03e4ae7c55b532ed53f0cbf683ce36fafe5e881789a01c00'],
-    }),
-    ('dash', '2.0.0', {
-        'checksums': ['29277c24e2f795b069cb102ce1ab0cd3ad5cf9d3b4fd16c03da9671a5eea28a4'],
-    }),
-    ('dash_renderer', '1.9.1', {
-        'checksums': ['73a69e3d145880e68e42723ad10182251d92b44f3efe92b8763145cfd2158e7e'],
-    }),
-    ('dash_core_components', '2.0.0', {
-        'checksums': ['c6733874af975e552f95a1398a16c2ee7df14ce43fa60bb3718a3c6e0b63ffee'],
-    }),
-    ('dash_html_components', '2.0.0', {
-        'checksums': ['8703a601080f02619a6390998e0b3da4a5daabe97a1fd7a9cebc09d015f26e50'],
-    }),
-    ('dash_table', '5.0.0', {
-        'checksums': ['18624d693d4c8ef2ddec99a6f167593437a7ea0bf153aa20f318c170c5bc7308'],
-    }),
-    ('dash-bootstrap-components', '1.0.2', {
-        'checksums': ['d385fa959159cdfd11885a753341fba67bad8622c84e5f61585930953f55f54f'],
-    }),
-    ('dash_daq', '0.5.0', {
-        'checksums': ['a1d85b6799f7b885652fbc44aebdb58c41254616a8d350b943beeb42ade4256a'],
-    }),
-    ('dash_player', '0.0.1', {
-        'checksums': ['46114910b497f35f1aa496ed8b9ff1457d07c96171227961b671ba4164c537a0'],
-    }),
-    # ('dash_canvas', '0.1.0', dict(list(local_common_opts.items()) + [
-    #     ('checksums', [('sha256', '72fcfb37e1c0f68c08f6fa6cf0b5be67ecc66fcfb5253231ffc450957b640b31')]),
-    # ])), # req. Pillow-9.0.1 PyWavelets-1.2.0 imageio-2.15.0
-    # ('dash_bio', '1.0.2', dict(list(local_common_opts.items()) + [
-    #     ('checksums', [('sha256', '6de28e412a37aef19429579f3285c27a5d4f21d8f387564d0698d63466259a36')]),
-    # ])),
-    # ('dash_cytoscape', '0.3.0', dict(list(local_common_opts.items()) + [
-    #     # ('checksums', [('sha256', '0669c79c197e4b150a5db7a278d1c7acebc947f3f5cbad5274835ebb44f712cd')]),
-    # ])),  # https://github.com/plotly/dash-cytoscape/issues/158
-    ('ansi2html', '1.6.0', {
-        'checksums': ['0f124ea7efcf3f24f1f9398e527e688c9ae6eab26b0b84e1299ef7f94d92c596'],
-    }),
-    ('jupyter-dash', '0.4.0', {
-        'checksums': ['eb5eb42ec8cb5e3388d41d895b5ef6e66812e3345cb271cc374318a1a589e687'],
-    }),
-    # more
-    ('fastcore', '1.4.1', {
-        'checksums': ['737effc54a6ed1189e0ea514342def4d9693c0d219f3a49d1ef44f616890ff2d'],
-    }),
-    ('fastscript', '1.0.0', {
-        'checksums': ['67d2315a508ffd0499af590fffaa63d276ce6eaff73ffbd60eb3315ba38d08fa'],
-    }),
-    ('fastrelease', '0.1.12', {
-        'checksums': ['5ac6ca023c453ebdaad7ab5dab678d7369d50d1496b09681d3d1b0ae06a8f878'],
-    }),
-    ('ghapi', '0.1.19', {
-        'checksums': ['d8d7012a6b275c1b691de9854504b11d6c41b36db7002992c2e2d51320f9758b'],
-    }),
-    ('nbdev', '1.2.5', {
-        'patches': ['nbdev_noqtconsole.patch'],
-        'checksums': [
-            '655f59618fc5f6542f6b454e8ebc72870487922a6e1815024aa690d98a37d6ff',
-            '88be9a113f55057679f244b2feba18fdc526145417c25a8666f57220259faa55',
-        ],
-    }),
-    ('PyJWT', '2.3.0', {
-        'modulename': 'jwt',
-        'checksums': ['b888b4d56f06f6dcd777210c334e69c737be74755d3e5e9ee3fe67dc18a0ee41'],
-    }),
-    ('pyunicore', '0.9.18', {
-        'checksums': ['d4675e4594777795ac7d70798955695a321f6e0feeda5e02070b12c233ff41c5'],
-    }),
-]
-
-local_jupyter_config_path = 'etc/jupyter'
-local_jupyter_path = 'share/jupyter'
-local_jupyterlab_dir = 'share/jupyter/lab'
-
-modextrapaths = {
-    #  search path to find installable data files, such as kernelspecs and notebook extensions
-    'JUPYTER_PATH': [local_jupyter_path],
-    #  do NOT set JUPYTER_CONFIG_DIR: if not set, if will be ${HOME}/.jupyter, which is just right
-    'JUPYTER_CONFIG_PATH': [local_jupyter_config_path],   # config dir at install time.
-    #  ATTENTION: not config dir at runtime, because this is fixed to {sys.prefix}/etc/jupyter/
-}
-
-modextravars = {
-    'JUPYTER': '%(installdir)s/bin/jupyter',
-    'JUPYTERLAB_DIR': '%%(installdir)s/%s' % local_jupyterlab_dir,
-    'MKL_THREADING_LAYER': 'GNU',  # https://github.com/Theano/Theano/issues/6568
-}
-
-# Ensure that the user-specific $HOME/.local/share/jupyter is first entry in JUPYTHER_PATH and JUPYTER_DATA_DIR
-# and the JUPYTER_CONFIG_PATH starts with $HOME/.jupyter
-# https://jupyter.readthedocs.io/en/latest/projects/jupyter-directories.html#envvar-JUPYTER_PATH
-modluafooter = """
-setenv("JUPYTER_DATA_DIR", pathJoin(os.getenv("HOME"), ".local/share/jupyter"))
-prepend_path("JUPYTER_PATH", pathJoin(os.getenv("HOME"), ".local/share/jupyter"))
-prepend_path("JUPYTER_CONFIG_PATH", pathJoin(os.getenv("HOME"), ".jupyter"))
-"""
-
-postinstallcmds = [
-    #  ensure we install in the correct directory !!!
-    'cd %(builddir)s',
-    'python3 -m venv %(installdir)s --system-site-packages',
-
-    'echo "#!/bin/bash" > %(builddir)s/env.sh',
-    'echo "source %(installdir)s/bin/activate" >> %(builddir)s/env.sh',
-    (
-        'echo "export PYTHONPATH='
-        '%(installdir)s/lib/python%(pyshortver)s/site-packages:'
-        '${EBROOTPYTHON}/lib/python%(pyshortver)s/site-packages:'
-        '${PYTHONPATH}" >> %(builddir)s/env.sh'
-    ),
-
-    #  Jupyter Paths - http://jupyter.readthedocs.io/en/latest/projects/jupyter-directories.html
-    'echo "export JUPYTER=%(installdir)s/bin/jupyter" >> %(builddir)s/env.sh',
-    'echo "export JUPYTER_PATH=%%(installdir)s/%s" >> %%(builddir)s/env.sh' % local_jupyter_path,
-    'echo "export JUPYTERLAB_DIR=%%(installdir)s/%s" >> %%(builddir)s/env.sh' % local_jupyterlab_dir,
-    #  Config dir at install time. ATTENTION: not config dir at runtime. This is picked up by JUPYTER_CONFIG_PATH
-    'echo "export JUPYTER_CONFIG_DIR=%%(installdir)s/%s" >> %%(builddir)s/env.sh' % local_jupyter_config_path,
-    #  jupyter will use $JUPYTER_CONFIG_DIR with "--user"
-    'echo "export JUPYTER_DATA_DIR=%%(installdir)s/%s" >> %%(builddir)s/env.sh' % local_jupyter_path,
-    'echo "export PATH=%(installdir)s/bin:${PATH}" >> %(builddir)s/env.sh',
-
-    #  JupyterLab Extensions
-    'source %(builddir)s/env.sh && jupyter labextension install jupyterlab_iframe@0.4.3 --no-build',
-    'source %(builddir)s/env.sh && jupyter labextension install jupyterlab-theme-toggle@0.6.1 --no-build',
-    'source %(builddir)s/env.sh && jupyter labextension install jupyterlab-plotly@5.5.0 --no-build',
-
-    #  store default in ../share/jupyter/lab/schemas/jupyterlab-favorites/favorites.json
-    #  create dynamic defaults for $HOME, $SCRATCH, $PROJECT with the following script
-    (
-        'install -m 0755 '
-        '        %(builddir)s/jupyterlab_favorites/jupyterlab_favorites-3.0.1/update_favorites_json '
-        '        %(installdir)s/bin/ '
-    ),
-
-    #   tour-state on/off is saved in workspace-file in ~/.jupyter/lab/workspaces/
-    #   respect the version lookup table at https://github.com/matplotlib/ipympl
-
-    #    'source %(builddir)s/env.sh && jupyter labextension install @jupyterlab/github@2.0.0 --no-build',
-    #    'source %(builddir)s/env.sh && jupyter labextension install jupyterlab-lmod@0.8.1 --no-build',
-    #    #  this might interfer with Xpra-icon: https://github.com/cmd-ntrf/jupyter-lmod/issues/30
-    # ('source %(builddir)s/env.sh && '
-    #  '  cd %(builddir)s/jupyterlmod/jupyter-lmod-9ddb49d5f3cc6ddc196f5e1c597f2e1b76af7d2d/jupyterlab/ && '
-    #  '    npm install && '                            # install npm package dependencies in current directory
-    #  '    npm run build && '                          # optional build step if using TypeScript, babel, etc.
-    #  '    jupyter labextension install --no-build'),  # install the current directory as an extension
-    #    'source %(builddir)s/env.sh && jupyter labextension install jupyterlab-slurm@2.0.0 --no-build',
-    # 'source %(builddir)s/env.sh && jupyter labextension install dicom-upload@0.2.0 --no-build',  # deps too old
-    # 'source %(builddir)s/env.sh && jupyter labextension install jsfileupload@0.2.0 --no-build',  # deps too old
-    # 'source %(builddir)s/env.sh && jupyter labextension install pvlink@0.3.1 --no-build',  # deps too old
-    #    'source %(builddir)s/env.sh && jupyter labextension install itkwidgets@0.32.1 --no-build',  # no JLab>=3
-
-    #  build JupyterLab app directory for all previous installed extensions in one go
-    'source %(builddir)s/env.sh && jupyter lab build --dev-build=False',  # --minimize=False
-
-    #  NodeJS packages
-    #  bokeh req. phantomjs in $PATH or $BOKEH_PHANTOMJS_PATH for bokeh's export-feature
-    (
-        'source %(builddir)s/env.sh && npm install -g '
-        '        phantomjs-prebuilt@2.1.16 '
-    ),
-    # language server for jupyter-lsp (last update 30.04.22)
-    # https://jupyterlab-lsp.readthedocs.io/en/latest/Language%20Servers.html
-    # must be installed _after_ 'jupyter lab build' as this clears the prefix
-    (
-        'source %(builddir)s/env.sh && npm install --prefix %(installdir)s/share/jupyter/lab/staging/ '
-        '        bash-language-server@2.1.0 '
-        '        dockerfile-language-server-nodejs@0.8.0 '
-        '        pyright@1.1.245 '
-        '        sql-language-server@1.2.1 '
-        '        typescript-language-server@0.9.7 typescript@4.1 '
-        '        vscode-css-languageserver-bin@1.4.0 '
-        '        vscode-html-languageserver-bin@1.4.0 '
-        '        vscode-json-languageserver-bin@1.0.1 '
-        '        yaml-language-server@1.7.0 '
-    ),
-
-    #  jupyterlab server extensions
-    # 'source %(builddir)s/env.sh && jupyter serverextension enable --py jupyterlab_sql',
-    'source %(builddir)s/env.sh && jupyter serverextension enable --py jupyterlab_iframe',
-
-    #  enable 'allow hidden files'
-    (
-        '{ cat >> %(installdir)s/etc/jupyter/jupyter_server_config.d/jupyterlab_allowhidden.json; } << \'EOF\'\n'
-        '{\n'
-        '  "ContentsManager": {\n'
-        '    "allow_hidden": true\n'
-        '  }\n'
-        '}\n'
-        'EOF'
-    ),
-
-    #  Send2Trash
-    #  disable
-    (
-        '{ cat >> %(installdir)s/etc/jupyter/jupyter_notebook_config.py; } << \'EOF\'\n'
-        'c.FileContentsManager.delete_to_trash = False\n'
-        'EOF'
-    ),
-
-    #  dask_labextension
-    (
-        'cp %(builddir)s/dask_labextension/dask_labextension-5.2.0/'
-        'dask_labextension/labextension/schemas/dask-labextension/plugin.json '
-        '   %(installdir)s/share/jupyter/labextensions/dask-labextension/schemas/dask-labextension/plugin.json'
-    ),
-
-    #  GitLab-extension
-    #  for security reasons access-token must be set in the server extension:
-    (
-        '{ cat >> %(installdir)s/etc/jupyter/jupyter_notebook_config.py; } << \'EOF\'\n'
-        '# no username+password needed, if repo is public or we have the token for a specific URL\n'
-        '# c.GitLabConfig.access_token = "<API-TOKEN>"\n'
-        '# c.GitLabConfig.allow_client_side_access_token = False\n'
-        'c.GitLabConfig.url = "https://gitlab.version.fz-juelich.de"\n'
-        'c.GitLabConfig.validate_cert = True\n'
-        'EOF'
-    ),
-
-    #  GitHub-extension
-    #  for security reasons access-token must be set in the server extension:
-    # (
-    #    '{ cat >> %(installdir)s/etc/jupyter/jupyter_notebook_config.py; } << \'EOF\'\n'
-    #    '# no username+password needed, if repo is public or we have the token for a specific URL\n'
-    #    '# c.GitHubConfig.access_token = "<API-TOKEN>"\n'
-    #    '# c.GitHubConfig.allow_client_side_access_token = False\n'
-    #    'c.GitHubConfig.url = "https://github.com"\n'
-    #    'c.GitHubConfig.validate_cert = True\n'
-    #    'EOF'
-    # ),
-
-    #  iframe-extension
-    (
-        '{ cat >> %(installdir)s/etc/jupyter/jupyter_notebook_config.py; } << \'EOF\'\n'
-        '# c.JupyterLabIFrame.iframes = [\'list\', \'of\', \'sites\']\n'
-        'c.JupyterLabIFrame.welcome = "http://www.fz-juelich.de/jsc"\n'
-        'EOF'
-    ),
-
-    #  define .ipynb_checkpoints permissions
-    (
-        '{ cat >> %(installdir)s/etc/jupyter/jupyter_notebook_config.py; } << \'EOF\'\n'
-        'c.FileCheckpoints.checkpoint_permissions = 0o664\n'
-        'c.FileCheckpoints.restore_permissions = 0o644\n'
-        'c.FileCheckpoints.checkpoint_dir_umask = 0o002\n'
-        'EOF'
-    ),
-
-    #  configure jupyter-resource-usage displayed by jupyterlab-system-monitor
-    (
-        '{ cat >> %(installdir)s/etc/jupyter/jupyter_notebook_config.py; } << \'EOF\'\n'
-        'import os\n'
-        'c.ResourceUseDisplay.mem_limit = os.sysconf(\'SC_PAGE_SIZE\') * os.sysconf(\'SC_PHYS_PAGES\')\n'
-        'c.ResourceUseDisplay.mem_warning_threshold = 0.1\n'
-        'c.ResourceUseDisplay.track_cpu_percent = True\n'
-        'c.ResourceUseDisplay.cpu_limit = os.cpu_count()\n'
-        'c.ResourceUseDisplay.cpu_warning_threshold = 0.1\n'
-        'EOF'
-    ),
-
-    # Add the default_setting_override.json file for modifications of the system-wide default settings
-    'mkdir -p %(installdir)s/etc/jupyter/labconfig/ ',
-    (
-        '{ cat > %(installdir)s/etc/jupyter/labconfig/default_setting_overrides.json; } << \'EOF\'\n'
-        '{\n'
-        '    "jupyterlab-gitlab:drive": {\n'
-        '        "baseUrl": "https://gitlab.jsc.fz-juelich.de",\n'
-        '        "defaultRepo": "jupyter4jsc/j4j_notebooks"\n'
-        '    },\n'
-        '    "@krassowski/jupyterlab-lsp:plugin": {\n'
-        '        "language_servers": {\n'
-        '            "pyright": {\n'
-        '                "serverSettings": {\n'
-        '                    "python.analysis.useLibraryCodeForTypes": true\n'
-        '                },\n'
-        '                "priority": 75\n'
-        '            }\n'
-        '        },\n'
-        '        "loggingConsole": "browser",\n'
-        '        "loggingLevel": "warn",\n'
-        '        "logAllCommunication": false,\n'
-        '        "setTrace": null\n'
-        '    },\n'
-        '    "@jupyterlab/extensionmanager-extension:plugin": {\n'
-        '        "enabled": false\n'
-        '    }\n'
-        '}\n'
-        'EOF'
-    ),
-    # Disable extensions we do not want to show up, but which we want to have installed
-    (
-        '{ cat > %(installdir)s/etc/jupyter/labconfig/page_config.json; } << \'EOF\'\n'
-        '{\n'
-        '    "disabledExtensions": {\n'
-        '        "ipyparallel-labextension": true\n'
-        '    }\n'
-        '}\n'
-        'EOF'
-    ),
-
-    # add webpage, which leads back to https://jupyter-jsc.fz-juelich.de
-    'cp %%(builddir)s/jupyterlab/jupyterlab-%s/401.html %%(installdir)s/share/jupyter/lab/static/' % local_jlab_version,
-
-    #  ###################################################
-    #  IMPORTANT:
-    #  start JupyterLab once (for 60 seconds) to allow some cleanup at first start
-    #  ###################################################
-    (
-        'source %(builddir)s/env.sh && '
-        '{(jupyter lab --no-browser) & } && JLAB_PID=$! && '
-        'sleep 60 && '
-        'jupyter lab list --json | grep $JLAB_PID | '
-        'awk \'{for(i=1;i<=NF;i++)if($i=="\\"port\\":")print $(i+1)}\' | sed \'s/,*$//g\' | '
-        'xargs -i jupyter lab stop {}'
-    ),
-
-    #  Ensure Jupyter does not want to build anything on startup
-    #  The build_config.json file is used to track the local directories that have been installed
-    #  using jupyter labextension install <directory>, as well as core extensions that have been explicitly uninstalled.
-    # 'if [ -e %(installdir)s/share/jupyter/lab/settings/build_config.json ]; then exit 1; fi ',
-    (
-        '{ cat > %(installdir)s/share/jupyter/lab/settings/build_config.json; } << \'EOF\'\n'
-        '{\n'
-        '    "local_extensions": {}\n'
-        '}\n'
-        'EOF'
-    ),
-
-    # Ensure we remove the virtuel environment to avoid wrong search path for python packages
-    'rm -f %(installdir)s/pyvenv.cfg',
-    'rm -f %(installdir)s/bin/python',
-    'rm -f %(installdir)s/bin/python3',
-    'rm -f %(installdir)s/bin/activate',
-    'rm -f %(installdir)s/bin/activate*',
-    'rm -f %(installdir)s/bin/easy_install*',
-    'rm -f %(installdir)s/bin/pip*',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/_distutils_hack',
-    'rm -f %(installdir)s/lib/python%(pyshortver)s/site-packages/distutils-precedence.pth',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/pip',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/pip-*',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/pkg_resources',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/setuptools',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/setuptools-*',
-
-    #  Compile Python files to byte-code to speedup execution
-    #  ERROR: returns with exit code 1, because some files cannot be compiled for different reasons
-    #  ###################################################
-    #   Disable possible, because sanity check will    #
-    #   force the compile of all python packages anyway#
-    #  ###################################################
-    #  'source %(builddir)s/env.sh && python -m compileall %(installdir)s',
-
-    #  ###################################################
-    #   IMPORTANT: must be done manual after eb-install: #
-    #  ###################################################
-    #  'chmod -R g-w %(installdir)s ',          # software-group must not modify the installation on accident
-    #  'chmod -R ugo-w %(installdir)s/share ', # Noone should add files/configs to the global share after install
-    #  'chmod -R ug-w ...../2020/software/Python/3.9.6-GCCcore-9.3.0/share ',  # Python module, too
-]
-
-#  specify that Bundle easyblock should run a full sanity check, rather than just trying to load the module
-#  full_sanity_check = True # would result in sanity-errors about yaml,ipython_genutils,IPython,traitlets
-sanity_check_paths = {
-    'files': [],
-    'dirs': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/Jupyter/Jupyter-2022.3.4-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/j/Jupyter/Jupyter-2022.3.4-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index e5e812cf9..000000000
--- a/Golden_Repo/j/Jupyter/Jupyter-2022.3.4-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,1359 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'Jupyter'
-version = '2022.3.4'
-
-local_jlab_version = '3.4.5'
-
-homepage = 'http://www.jupyter.org'
-description = """
-Project Jupyter exists to develop open-source software, open-standards, and services for interactive computing across
-dozens of programming languages.
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('UnZip', '6.0'),
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2'),
-    ('CMake', '3.21.1'),  # for line_profiler
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('libyaml', '0.2.5'),
-    ('Pandoc', '2.16.1', '', SYSTEM),  # For doc-generation
-    ('texlive', '20200406'),
-    ('ITK', '5.2.1', '-nompi'),
-    ('HDF5', '1.12.1', '-serial'),
-    ('h5py', '3.5.0', '-serial'),
-    ('netcdf4-python', '1.5.7', '-serial'),
-    ('FFmpeg', '4.4.1'),  # for pydub
-    ('LLVM', '13.0.0'),  # llvmlite
-    ('git', '2.33.1', '-nodocs'),  # for jupyterlab_git (req. >=2.0)
-    ('SciPy-bundle', '2021.10'),
-    ('matplotlib', '3.4.3'),
-    ('Seaborn', '0.11.2'),
-    ('sympy', '1.8'),
-    ('xarray', '0.20.1'),
-    ('scikit-build', '0.11.1'),
-    ('scikit-learn', '1.0.1'),
-    ('scikit-image', '0.18.3'),
-    ('numba', '0.55.1'),
-    ('Shapely', '1.8.0'),
-    ('yarn', '1.22.17'),
-]
-
-osdependencies = [('openssl')]
-
-# this is a bundle of Python packages
-exts_defaultclass = 'PythonPackage'
-exts_default_options = {
-    'filter': ('python -c "import %(ext_name)s"', ''),
-    'download_dep_fail': True,
-    'source_urls': [PYPI_SOURCE],
-    'use_pip': True,
-    'sanity_pip_check':  True,
-    'use_pip_for_deps': False,
-}
-
-components = [
-    # ('nodejs', '16.14.0', {  # fails because printf-argument-list too long
-    ('nodejs', '14.20.0', {
-        'easyblock': 'ConfigureMake',
-        'source_urls': ['http://nodejs.org/dist/v%(version)s/'],
-        'sources': ['node-v%(version)s.tar.gz'],
-        'start_dir': 'node-v%(version)s',
-        'checksums': ['53098eafccdd69120b9d9187eb3bbb872c91ee17bfa0ee33aaeb300803c113f5'],
-    }),
-]
-
-# Dependencies can partly tested, created and updated using findPythonDeps.sh:
-# https://gist.github.com/Flamefire/49426e502cd8983757bd01a08a10ae0d
-exts_list = [
-    ('typing_extensions', '4.2.0', {
-        'checksums': ['f1c24655a0da0d1b67f07e17a5e6b2a105894e6824b92096378bb3668ef02376'],
-    }),  # updating the version from Python module
-    ('ptvsd', '4.3.2', {
-        'source_tmpl': 'ptvsd-4.3.2.zip',
-        'checksums': ['3b05c06018fdbce5943c50fb0baac695b5c11326f9e21a5266c854306bda28ab'],
-    }),
-    ('pyOpenSSL', '21.0.0', {
-        'modulename': 'OpenSSL',
-        'checksums': ['5e2d8c5e46d0d865ae933bef5230090bdaf5506281e9eec60fa250ee80600cb3'],
-    }),
-    ('entrypoints', '0.4', {
-        'checksums': ['b706eddaa9218a19ebcd67b56818f05bb27589b1ca9e8d797b74affad4ccacd4'],
-    }),
-    ('async_generator', '1.10', {
-        'checksums': ['6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144'],
-    }),
-    ('nest_asyncio', '1.5.5', {
-        'checksums': ['e442291cd942698be619823a17a86a5759eabe1f8613084790de189fe9e16d65'],
-    }),
-    ('absl-py', '0.15.0', {
-        'modulename': 'absl',
-        'checksums': ['72d782fbeafba66ba3e525d46bccac949b9a174dbf66233e50ece09ee688dc81'],
-    }),
-    ('websockets', '10.1', {
-        'checksums': ['181d2b25de5a437b36aefedaf006ecb6fa3aa1328ec0236cdde15f32f9d3ff6d'],
-    }),
-    ('websockify', '0.10.0', {
-        'checksums': ['6c4cc1bc132abb4a99834bcb1b4bd72f51d35a08d08093a817646ecc226ac44e'],
-    }),
-    # General Python packages
-    ('tornado', '6.2', {
-        'patches': ['tornado-timeouts.patch'],
-        'checksums': [
-            '9b630419bde84ec666bfd7ea0a4cb2a8a651c2d5cccdbdd1972a0c859dfc3c13',
-            # Increase the request timeout when using jupyter-server-proxy
-            '1bb4e7d9d3a108764085018077ac552d8107915e6ce63b9196964608d746903f',  # tornado-timeouts.patch
-        ],
-    }),
-    ('bokeh', '2.4.2', {
-        'checksums': ['f0a4b53364ed3b7eb936c5cb1a4f4132369e394c7ae0a8ef420459410958033d'],
-    }),
-    ('nbformat', '5.2.0', {
-        'checksums': ['93df0b9c67221d38fb970c48f6d361819a6c388299a0ef3171bbb912edfe1324'],
-    }),
-    ('param', '1.12.0', {
-        'checksums': ['35d0281c8e3beb6dd469f46ff0b917752a54bed94d1b0c567346c76d0ff59c4a'],
-    }),
-    ('deprecation', '2.1.0', {
-        'checksums': ['72b3bde64e5d778694b0cf68178aed03d15e15477116add3fb773e581f9518ff'],
-    }),
-    ('pathspec', '0.9.0', {
-        'checksums': ['e564499435a2673d586f6b2130bb5b95f04a3ba06f81b8f895b651a3c76aabb1'],
-    }),
-    ('tomli', '2.0.1', {
-        'checksums': ['de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f'],
-    }),
-    ('editables', '0.3', {
-        'checksums': ['167524e377358ed1f1374e61c268f0d7a4bf7dbd046c656f7b410cde16161b1a'],
-    }),
-    ('pluggy', '1.0.0', {
-        'checksums': ['4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159'],
-    }),
-    # ('packaging', '21.3', {
-    #     'checksums': ['dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb'],
-    # }),  # poetry 1.1.7 has requirement packaging<21.0,>=20.4 (poetry 1.2 solves this)
-    # ('hatchling', '1.8.1', {
-    #     'checksums': ['448b04b23faed669b2b565b998ac955af4feea66c5deed3a1212ac9399d2e1cd'],
-    # }),  # hatchling 1.8.1 has requirement packaging >= 21.3 
-    # Jupyter-core and dependencies
-    ('ipynb', '0.5.1', {
-        'checksums': ['8d834c777ca3885289938728cc382f081c86a58e92961e86f0aba60c96938ce5'],
-    }),
-    ('jupyter_core', '4.9.1', {
-        'checksums': ['dce8a7499da5a53ae3afd5a9f4b02e5df1d57250cf48f3ad79da23b4778cd6fa'],
-    }),
-    ('jupyter_packaging', '0.11.1', {
-        'checksums': ['6f5c7eeea98f7f3c8fb41d565a94bf59791768a93f93148b3c2dfb7ebade8eec'],
-    }),
-    ('retrying', '1.3.3', {
-        'checksums': ['08c039560a6da2fe4f2c426d0766e284d3b736e355f8dd24b37367b0bb41973b'],
-    }),
-    ('tikzplotlib', '0.9.17', {
-        'checksums': ['d422464188844b1c5cf2f6c31fbd492a0834f0071c8e452da5a5589ad8521364'],
-    }),
-    #  Jupyter client
-    ('jupyter_client', '7.1.2', {
-        'checksums': ['4ea61033726c8e579edb55626d8ee2e6bf0a83158ddf3751b8dd46b2c5cd1e96'],
-    }),
-    ('pynvml', '11.4.1', {
-        'checksums': ['b2e4a33b80569d093b513f5804db0c7f40cfc86f15a013ae7a8e99c5e175d5dd'],
-    }),
-    #  Jupyter notebook and dependencies
-    ('singledispatch', '3.7.0', {
-        'checksums': ['c1a4d5c1da310c3fd8fccfb8d4e1cb7df076148fd5d858a819e37fffe44f3092'],
-    }),
-    ('debugpy', '1.6.0', {
-        'source_tmpl': 'debugpy-%(version)s.zip',
-        'checksums': ['7b79c40852991f7b6c3ea65845ed0f5f6b731c37f4f9ad9c61e2ab4bd48a9275'],
-    }),
-    ('ipykernel', '6.13.0', {
-        'checksums': ['0e28273e290858393e86e152b104e5506a79c13d25b951ac6eca220051b4be60'],
-    }),
-    ('flit_core', '3.7.1', {
-        'checksums': ['14955af340c43035dbfa96b5ee47407e377ee337f69e70f73064940d27d0a44f'],
-    }),
-    ('ipyparallel', '8.3.0', {
-        'checksums': ['275d6d0c89c812679f0addc6a399bd75384bdf199ade12922d2ab3e2f7a99dc1'],
-    }),
-    ('terminado', '0.13.3', {
-        'checksums': ['94d1cfab63525993f7d5c9b469a50a18d0cdf39435b59785715539dd41e36c0d'],
-    }),
-    ('bleach', '4.1.0', {
-        'checksums': ['0900d8b37eba61a802ee40ac0061f8c2b5dee29c1927dd1d233e075ebf5a71da'],
-    }),
-    ('mistune', '0.8.4', {
-        'checksums': ['59a3429db53c50b5c6bcc8a07f8848cb00d7dc8bdb431a4ab41920d201d4756e'],
-    }),
-    ('pandocfilters', '1.5.0', {
-        'checksums': ['0b679503337d233b4339a817bfc8c50064e2eff681314376a47cb582305a7a38'],
-    }),
-    ('testpath', '0.5.0', {
-        'use_pip': False,
-        'checksums': ['1acf7a0bcd3004ae8357409fc33751e16d37ccc650921da1094a86581ad1e417'],
-    }),
-    ('nbclient', '0.5.10', {
-        'checksums': ['b5fdea88d6fa52ca38de6c2361401cfe7aaa7cd24c74effc5e489cec04d79088'],
-    }),
-    ('jupyterlab_pygments', '0.1.2', {
-        'checksums': ['cfcda0873626150932f438eccf0f8bf22bfa92345b814890ab360d666b254146'],
-    }),
-    ('defusedxml', '0.7.1', {
-        'checksums': ['1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51aa3e69'],
-    }),
-    ('soupsieve', '2.3.1', {
-        'checksums': ['b8d49b1cd4f037c7082a9683dfa1801aa2597fb11c3a1155b7a5b94829b4f1f9'],
-    }),
-    ('beautifulsoup4', '4.11.1', {
-        'checksums': ['ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693'],
-        'modulename': False,
-    }),
-    ('tinycss2', '1.1.1', {
-        'checksums': ['b2e44dd8883c360c35dd0d1b5aad0b610e5156c2cb3b33434634e539ead9d8bf'],
-    }),
-    ('pyee', '8.2.2', {
-        'checksums': ['5c7e60f8df95710dbe17550e16ce0153f83990c00ef744841b43f371ed53ebea']
-    }),
-    ('pytest-dependency', '0.5.1', {
-        'checksums': ['c2a892906192663f85030a6ab91304e508e546cddfe557d692d61ec57a1d946b']
-    }),
-    ('pyppeteer', '1.0.2', {
-        'checksums': ['ddb0d15cb644720160d49abb1ad0d97e87a55581febf1b7531be9e983aad7742']
-    }),
-    ('nbconvert', '6.5.3', {
-        # !!! nbconvert will try to read from all paths in <jupyter-config-path> the file nbconvert/templates/conf.json
-        #     ensure it has permissions (https://github.com/jupyter/nbconvert/issues/1430)
-        'checksums': ['10ed693c4cfd3c63583c87ca5c3a2f6ed874145103595f3824efcc8dfcb7522c'],
-    }),
-    ('nbsphinx', '0.8.8', {
-        'checksums': ['b5090c824b330b36c2715065a1a179ad36526bff208485a9865453d1ddfc34ec']
-    }),
-    ('Send2Trash', '1.8.0', {
-        'modulename': 'send2trash',
-        'checksums': ['d2c24762fd3759860a0aff155e45871447ea58d2be6bdd39b5c8f966a0c99c2d'],
-    }),
-    ('argon2-cffi-bindings', '21.2.0', {
-        'modulename': '_argon2_cffi_bindings',
-        'checksums': ['bb89ceffa6c791807d1305ceb77dbfacc5aa499891d2c55661c6459651fc39e3'],
-    }),
-    ('argon2-cffi', '21.3.0', {
-        'modulename': 'argon2',
-        'checksums': ['d384164d944190a7dd7ef22c6aa3ff197da12962bd04b17f64d4e93d934dba5b'],
-    }),
-    ('notebook', '6.4.12', {
-        'patches': ['notebook-6.4.11_jsc.patch'],  # allow others to read/write in .ipynb_checkpoints
-        'checksums': [
-            '6268c9ec9048cff7a45405c990c29ac9ca40b0bc3ec29263d218c5e01f2b4e86',  # notebook-6.4.12.tar.gz
-            'cfe5f4e69cb87affdd4aff925ec8581e374f2f9c7656c1a7117bad738b3f2fcd',  # notebook-6.4.11_jsc.patch
-        ],
-    }),
-    ('notebook_shim', '0.1.0', {
-        'checksums': ['7897e47a36d92248925a2143e3596f19c60597708f7bef50d81fcd31d7263e85'],
-    }),
-    ('version_information', '1.0.4', {
-        'checksums': ['0d8418dcdad34e11f8f1cc78c513260defbbb723dd23941bd89f17a01466d912'],
-    }),
-    ('lesscpy', '0.15.0', {
-        'checksums': ['ef058fb3fca077f0136222c415bc6d20fe256e92648ccbf4b3de874ba03b9b9d'],
-    }),
-    ('prometheus_client', '0.12.0', {
-        'checksums': ['1b12ba48cee33b9b0b9de64a1047cbd3c5f2d0ab6ebcead7ddda613a750ec3c5'],
-    }),
-    ('jupyterthemes', '0.20.0', {
-        'checksums': ['2a8ebc0c84b212ab99b9f1757fc0582a3f53930d3a75b2492d91a7c8b36ab41e'],
-    }),
-    #  Jupyter Lab and dependencies
-    ('jupyterlab_launcher', '0.13.1', {
-        'checksums': ['f880eada0b8b1f524d5951dc6fcae0d13b169897fc8a247d75fb5beadd69c5f0'],
-    }),
-    ('sphinx_rtd_theme', '1.0.0', {
-        'checksums': ['eec6d497e4c2195fa0e8b2016b337532b8a699a68bcb22a512870e16925c6a5c'],
-    }),
-    ('commonmark', '0.9.1', {
-        'checksums': ['452f9dc859be7f06631ddcb328b6919c67984aca654e5fefb3914d54691aed60'],
-    }),
-    ('recommonmark', '0.7.1', {
-        'checksums': ['bdb4db649f2222dcd8d2d844f0006b958d627f732415d399791ee436a3686d67'],
-    }),
-    ('json5', '0.9.6', {
-        'checksums': ['9175ad1bc248e22bb8d95a8e8d765958bf0008fef2fe8abab5bc04e0f1ac8302'],
-    }),
-    ('ipython', '7.34.0', {
-        'modulename': 'IPython',
-        'checksums': ['af3bdb46aa292bce5615b1b2ebc76c2080c5f77f54bda2ec72461317273e7cd6'],
-    }),
-    ('sniffio', '1.2.0', {
-        'checksums': ['c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de'],
-    }),
-    ('anyio', '3.5.0', {
-        'checksums': ['a0aeffe2fb1fdf374a8e4b471444f0f3ac4fb9f5a5b542b48824475e0042a5a6'],
-    }),
-    ('websocket-client', '1.2.3', {
-        'modulename': 'websocket',
-        'checksums': ['1315816c0acc508997eb3ae03b9d3ff619c9d12d544c9a9b553704b1cc4f6af5'],
-    }),
-    ('requests-unixsocket', '0.3.0', {
-        'checksums': ['28304283ea9357d45fff58ad5b11e47708cfbf5806817aa59b2a363228ee971e'],
-    }),
-    ('cfgv', '3.3.1', {
-        'checksums': ['f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736'],
-    }),
-    ('identify', '2.5.0', {
-        'checksums': ['c83af514ea50bf2be2c4a3f2fb349442b59dc87284558ae9ff54191bff3541d2'],
-    }),
-    ('nodeenv', '1.6.0', {
-        'checksums': ['3ef13ff90291ba2a4a7a4ff9a979b63ffdd00a464dbe04acf0ea6471517a4c2b'],
-    }),
-    ('pre_commit', '2.18.1', {
-        'checksums': ['5d445ee1fa8738d506881c5d84f83c62bb5be6b2838e32207433647e8e5ebe10'],
-    }),
-    ('jupyter_server', '1.18.1', {
-        'patches': [('jupyter-server_i11934.patch')],  # more details: issue 11934 of jupyterlab
-        'checksums': [
-            '2b72fc595bccae292260aad8157a0ead8da2c703ec6ae1bb7b36dbad0e267ea7',
-            'ac96366c26616fec6ce7eeaed9cc744574e3f05b6e29b59aea13275b37a0e8b7'
-        ],
-    }),
-    ('Jinja2', '3.0.3', {
-        'checksums': ['611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7'],
-    }),
-    ('jupyterlab_server', '2.13.0', {
-        'checksums': ['2040298a133458aa22f287a877d6bb91ff973f6298d562264f9f7b75e92a5ace'],
-    }),  # jupyterlab_server > 2.13.0 requires hatchling
-    ('nbclassic', '0.3.7', {
-        'checksums': ['36dbaa88ffaf5dc05d149deb97504b86ba648f4a80a60b8a58ac94acab2daeb5'],
-        # Pin nbclassic below 0.4.0 - https://github.com/jupyterlab/jupyterlab/pull/12767
-    }),
-    ('jupyterlab', local_jlab_version, {
-        'patches': [
-            ('401html.patch', 1),
-        ],
-        'checksums': [
-            '472f6b7996c75f6991592483c26d9fe205a59a71ccbce15842400155dc64f59b',  # jupyterlab-3.4.5.tar.gz
-            '094c89560472168c5ca24b3907d4a6a5b090352ef0c7657995d735246cc338f5',  # 401html.patch
-        ],
-    }),
-    ('jupyter_kernel_gateway', '2.5.1', {
-        'modulename': 'kernel_gateway',
-        'checksums': ['1d40df18e1c5a346faf44716573dfd531343936bf479cb05e9391dbe28b90779'],
-    }),
-    ('jupyter_console', '6.4.3', {
-        'checksums': ['55f32626b0be647a85e3217ddcdb22db69efc79e8b403b9771eb9ecc696019b5'],
-    }),
-    #  Jupyter Widgets and dependencies
-    ('traittypes', '0.2.1', {
-        'checksums': ['be6fa26294733e7489822ded4ae25da5b4824a8a7a0e0c2dccfde596e3489bd6'],
-    }),
-    ('widgetsnbextension', '3.6.0', {
-        'checksums': ['e84a7a9fcb9baf3d57106e184a7389a8f8eb935bf741a5eb9d60aa18cc029a80'],
-    }),
-    ('jupyterlab_widgets', '1.1.1', {  # uses PEP 517 and cannot be installed directly from source
-        'source_tmpl': 'jupyterlab_widgets-%(version)s-py3-none-any.whl',
-        'unpack_sources': False,
-        'checksums': ['90ab47d99da03a3697074acb23b2975ead1d6171aa41cb2812041a7f2a08177a'],
-    }),
-    ('ipywidgets', '7.7.2', {
-        'checksums': ['449ab8e7872d0f388ee5c5b3666b9d6af5e5618a5749fd62652680be37dff2af'],
-    }),
-    ('ipydatawidgets', '4.3.2', {  # uses PEP 517 and cannot be installed directly from source
-        'source_tmpl': 'ipydatawidgets-%(version)s-py2.py3-none-any.whl',
-        'unpack_sources': False,
-        'checksums': ['c1d8e479f3adafba42378fe39126ddc14293ccb90341eeb2f6c1f568aa019c64'],
-    }),
-    ('plotly', '5.5.0', {
-        'checksums': ['20b8a1a0f0434f9b8d10eb7caa66e947a9a1d698e5a53d40d447bbc0d2ae41f0'],
-    }),
-    ('bqplot', '0.12.32', {
-        'checksums': ['6fbfb93955ac15f87b6fa37368b04fd00da1f2d43843d8d9bc3d59116c6f5f00'],
-    }),
-    ('jupyter_bokeh', '3.0.4', {
-        'checksums': ['ba3b032f52a039d9e5ed8f6c50f3f9a00dcb97005871c24673a3b3a05465aef5'],
-    }),
-    ('pythreejs', '2.4.1', {
-        'checksums': ['0ba5063a76312c45f65c376ce45f5af33199484b4ce7a59e791ad8c4d746a867'],
-    }),
-    ('ipywebrtc', '0.6.0', {
-        'checksums': ['f8ac3cc02b3633b59f388aef67961cff57f90028fd303bb3886c63c3d631da13'],
-    }),
-    ('ipyvolume', '0.6.0a10', {
-        'checksums': ['358bcc717b892c80c0fd5ecc58b27177fd2abe576492760eb2105eca3333ab6e'],
-    }),
-    ('xyzservices', '2022.1.1', {
-        'checksums': ['042ddd3c27a7c8707cc555737d0c8a86137e70bb00f8530117bee484993bd6e4'],
-    }),
-    ('branca', '0.5.0', {
-        'checksums': ['e6f2f7eba7dd368ceef8f63822b867f5e11d4d3abdd099a787db9ed2b7065ae1'],
-    }),
-    ('ipyleaflet', '0.17.1', {
-        'checksums': ['ee8d19c02cc465f8b10808fcc54f55db685ba0fdd8a0b0f409c3d8370d53782f'],
-    }),
-    ('ipympl', '0.9.2', {
-        'checksums': ['c865c1992248f9966fbe4b6006239ae2959b00fc7e887ae32b0bd389808f0f8b'],
-    }),   # respect version lookup table: https://github.com/matplotlib/ipympl
-    # Jupyter-Server-Proxy
-    ('idna-ssl', '1.1.0', {
-        'checksums': ['a933e3bb13da54383f9e8f35dc4f9cb9eb9b3b78c6b36f311254d6d0d92c6c7c'],
-    }),
-    ('multidict', '5.2.0', {
-        'checksums': ['0dd1c93edb444b33ba2274b66f63def8a327d607c6c790772f448a53b6ea59ce'],
-    }),
-    ('yarl', '1.6.3', {
-        'checksums': ['8a9066529240171b68893d60dca86a763eae2139dd42f42106b03cf4b426bf10'],
-    }),
-    ('async-timeout', '4.0.2', {
-        'checksums': ['2163e1640ddb52b7a8c80d0a67a08587e5d245cc9c553a74a847056bc2976b15'],
-    }),
-    ('aiosignal', '1.2.0', {
-        'checksums': ['78ed67db6c7b7ced4f98e495e572106d5c432a93e1ddd1bf475e1dc05f5b7df2'],
-    }),
-    ('frozenlist', '1.3.0', {
-        'checksums': ['ce6f2ba0edb7b0c1d8976565298ad2deba6f8064d2bebb6ffce2ca896eb35b0b'],
-    }),
-    ('aiohttp', '3.8.1', {
-        'checksums': ['fc5471e1a54de15ef71c1bc6ebe80d4dc681ea600e68bfd1cbce40427f0b7578'],
-    }),
-    ('simpervisor', '0.4', {
-        'checksums': ['cec79e13cdbd6edb04a5c98c1ff8d4bd9713e706c069226909a1ef0e89d393c5'],
-    }),
-    ('jupyter-server-proxy', '3.2.1', {
-        'patches': [
-            'jupyter-server-proxy_timeout.patch',  # timeout after 15s instead of 5s
-            'jupyter-server-proxy_pr337_unixsockets.patch',  # add unix-socket-support
-        ],
-        'checksums': [
-            '080e9910592d06422bdd93dfc1fa8350c6fdaec9fbbd050630e90f7a5593a4f7',
-            'dc74e299b9fbc7e2fc55bc58fc742399a6cad7ab7a6f6c1b9858f3df65ca57d9',
-            'ec57954ce13221c4de3744278b792fc6ff92e7dc35011ba4451a2ab83e9b3d80',
-        ],
-    }),
-    # Jupyter Lab Extensions
-    # JLab 3 support: https://github.com/jupyterlab/jupyterlab-github/pull/112
-    #    ('jupyterlab_github', '3.0.1', dict(list(local_common_opts.items()) + [
-    #        # ('checksums', [('sha256', '1f560a91711b779d08118161af044caff4419e315cb80ae830d3dfbded7bac9')]),
-    #        # do not use pypi for download -> we need to patch drive.json
-    #        ('source_urls', ['https://github.com/jupyterlab/jupyterlab-github/archive']),
-    #        ('source_tmpl', 'v%(version)s.tar.gz'),
-    #        ('patches', ['jupyterlab_github-%(version)s_jsc.patch']),
-    #    ])),
-    ('jupyterlab_gitlab', '3.0.0', {
-        'checksums': ['5b0367b82e3170d8274465285a36be9c331dac5674d9ba7e8e2b5dd4972d64f7'],
-    }),
-    ('jupyterlab-topbar', '0.6.1', {
-        'modulename': 'jupyterlab',
-        'checksums': ['f1f9144fd09c29b8921f378662f26c65a460967d9c48eeea8018cea49626fb5f'],
-    }),
-    ('jupyterlab-controlbtn', '0.5.1', {
-        'modulename': 'jupyterlab',
-        'source_tmpl': '%(version)s.tar.gz',
-        'source_urls': ['https://github.com/jhgoebbert/jupyterlab-controlbtn/archive/'],
-        'checksums': ['ac4c2165d79dd84f2fea0086cc6c3a851cfb239918bb628163b812abb54a4b46'],
-    }),
-    ('jupyter-resource-usage', '0.6.1', {
-        'checksums': ['8b766b9dded49e582cc38ebeb7f19af2eae50ccf77730afbe96f4a09def9874b'],
-    }),
-    ('jupyterlab-system-monitor', '0.8.0', {
-        'modulename': 'jupyterlab',
-        'checksums': ['f8d03d3ee26c84300c85e570f1a9d5f69bdcfa85e9a298f5716b67e36d0d94df'],
-    }),
-    ('jupyterlab-spellchecker', '0.7.2', {
-        'checksums': ['e13732cf5a277d40cd1a25eaa9264c13b67a4231e4bd90695722ddf6eebf6ab1'],
-    }),
-    ('tornado_proxy_handlers', '0.0.5', {
-        'checksums': ['8250177dbc7567fa2d3cfd22d0a7de71e34cceb8e56c7b7d7c2e5f92ffb5c60a'],
-    }),
-    ('jupyterlab_iframe', '0.4.4', {
-        'checksums': ['f381ffef2a866eea0a9e3e56f428064b117a9155f9f7605c4bf0eb74d03dc378'],
-    }),
-    ('zstandard', '0.16.0', {
-        'checksums': ['eaae2d3e8fdf8bfe269628385087e4b648beef85bb0c187644e7df4fb0fe9046'],
-    }),
-    ('itk_core', '5.2.1', {
-        'modulename': 'itk',
-        'source_tmpl': 'itk_core-%(version)s-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl',
-        'unpack_sources': False,
-        'checksums': ['467b34a91d933e46b850380d9d68d77642100129d67b303efa852cd67dba5d9b'],
-    }),
-    ('itk_filtering', '5.2.1', {
-        'modulename': 'itk',
-        'source_tmpl': 'itk_filtering-%(version)s-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl',
-        'unpack_sources': False,
-        'checksums': ['785ba8f032315747bb52227c38c6c9a912c21754c61289d785e6430563635d85'],
-    }),
-    ('itk_segmentation', '5.2.1', {
-        'modulename': 'itk',
-        'source_tmpl': 'itk_segmentation-%(version)s-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl',
-        'unpack_sources': False,
-        'checksums': ['dd361248ed5f52c645e6baaa3936cce84558673a8b7c4103f7bbeb7c11ef7798'],
-    }),
-    ('itk_numerics', '5.2.1', {
-        'modulename': 'itk',
-        'source_tmpl': 'itk_numerics-%(version)s-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl',
-        'unpack_sources': False,
-        'checksums': ['a5117e0a57fca0709330c32037c9359de7dd1614a74f5fe707de7e596b0db8d6'],
-    }),
-    ('itk_registration', '5.2.1', {
-        'modulename': 'itk',
-        'source_tmpl': 'itk_registration-%(version)s-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl',
-        'unpack_sources': False,
-        'checksums': ['d03d112ddb37732151ed0a145d982c2ff51885f9d8cfb01091af3758f059ff36'],
-    }),
-    ('itk_io', '5.2.1', {
-        'modulename': 'itk',
-        'source_tmpl': 'itk_io-%(version)s-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl',
-        'unpack_sources': False,
-        'checksums': ['feb23278b74026d61fbd9ea9edf567a885aae95b2f62cf1a5a636d6afba486f0'],
-    }),
-    ('itk_meshtopolydata', '0.7.1', {
-        'modulename': 'itk',
-        'source_tmpl': 'itk_meshtopolydata-%(version)s-cp39-cp39-manylinux2014_x86_64.whl',
-        'unpack_sources': False,
-        'checksums': ['17dd1425e110583a4d94f6079ea243709182c1349d0b1015dd68e02607d55c63'],
-    }),
-    ('pyct', '0.4.8', {
-        'checksums': ['23d7525b5a1567535c093aea4b9c33809415aa5f018dd77f6eb738b1226df6f7'],
-    }),
-    ('colorcet', '3.0.0', {
-        'checksums': ['21c522346a7aa81a603729f2996c22ac3f7822f4c8c303c59761e27d2dfcf3db'],
-    }),
-    # ('itkwidgets', '0.32.1', {
-    #     'checksums': ['42d0d8f06bf57a0b013720f81f7cfc8fe150b949a49c6c4df9d95ef420af1f45'],
-    # }),  # no JLab>=3
-    ('python-dotenv', '0.19.2', {
-        'modulename': 'dotenv',
-        'checksums': ['a5de49a31e953b45ff2d2fd434bbc2670e8db5273606c1e737cc6b93eff3655f'],
-    }),
-    ('jupyterlab_latex', '3.1.0', {
-        'checksums': ['f44df285405b5b552b70d10f1f0573d61ca3a4d2ca50bd3097a63a27cdcde16e'],
-    }),
-    # ('jupyterlab_slurm', '3.0.1', {
-    #     'checksums': ['40157e9dd4e67acf43aab17e9c4faca922da8364181bc321551550768d5dd6a2'],
-    # }),
-    # version from 6-jan-2021
-    # ('jupyterlmod', '9ddb49d5f3cc6ddc196f5e1c597f2e1b76af7d2d', {
-    #    'source_urls':, ['https://github.com/cmd-ntrf/jupyter-lmod/archive/'],
-    #    'source_tmpl': '%(version)s.tar.gz',
-    #    'checksums': ['65c656306c9ba4948bb3d800238cb524484ef158ae6f9e1dbaa224b3635f65d8'],
-    #    'patches': ['jupyterlmod-urlfile.patch'],
-    # }),
-    ('jupyter_server_mathjax', '0.2.5', {
-        'checksums': ['64d96c8e6dfe6edba737902b2dc3a2dc058f17516776c25f4d30ca24617ee7b3'],
-    }),
-    ('nbdime', '3.1.1', {
-        'checksums': ['67767320e971374f701a175aa59abd3a554723039d39fae908e72d16330d648b'],
-    }),
-    ('smmap', '5.0.0', {
-        'checksums': ['c840e62059cd3be204b0c9c9f74be2c09d5648eddd4580d9314c3ecde0b30936'],
-    }),
-    ('gitdb', '4.0.9', {
-        'checksums': ['bac2fd45c0a1c9cf619e63a90d62bdc63892ef92387424b855792a6cabe789aa'],
-    }),
-    ('GitPython', '3.1.26', {
-        'modulename': 'git',
-        'checksums': ['fc8868f63a2e6d268fb25f481995ba185a85a66fcad126f039323ff6635669ee'],
-    }),
-    ('jupyterlab_git', '0.39.0', {
-        'checksums': ['d813126d9e4808849abe0d4938dedf88a7787b8bc0c965be81e4a0c5b328c22b'],
-    }),
-    ('sidecar', '0.5.1', {
-        'checksums': ['47a39299ee78ee81a55fb2aa84225b45aa649655c97a7e0e06e3728e85b90bc3'],
-    }),
-    ('pycodestyle', '2.8.0', {
-        'checksums': ['eddd5847ef438ea1c7870ca7eb78a9d47ce0cdb4851a5523949f2601d0cbbe7f'],
-    }),
-    ('autopep8', '1.5.7', {
-        'checksums': ['276ced7e9e3cb22e5d7c14748384a5cf5d9002257c0ed50c0e075b68011bb6d0'],
-    }),
-    ('yapf', '0.32.0', {
-        'checksums': ['a3f5085d37ef7e3e004c4ba9f9b3e40c54ff1901cd111f05145ae313a7c67d1b'],
-    }),
-    ('isort', '4.3.21', {
-        'checksums': ['54da7e92468955c4fceacd0c86bd0ec997b0e1ee80d97f67c35a78b719dccab1'],
-    }),
-    ('typed_ast', '1.5.1', {
-        'checksums': ['484137cab8ecf47e137260daa20bafbba5f4e3ec7fda1c1e69ab299b75fa81c5'],
-    }),
-    ('black', '19.3b0', {
-        'checksums': ['68950ffd4d9169716bcb8719a56c07a2f4485354fec061cdd5910aa07369731c'],
-    }),  # do not update without changing Jupyter-JSC´s ".start.sh", https://github.com/psf/black/pull/1539
-    ('jupyterlab_code_formatter', '1.4.10', {
-        'checksums': ['1645fd80b99d590d60fe0f3c078c9101ad62dfdbfac5e78b4c2d334896ab526f'],
-    }),
-    ('jsonmerge', '1.8.0', {
-        'checksums': ['a86bfc44f32f6a28b749743df8960a4ce1930666b3b73882513825f845cb9558'],
-    }),
-    ('jupyterlab_favorites', '3.0.1', {
-        'patches': [('update_favorites_json', '.')],
-        'checksums': [
-            '6102c164775b67ffa0f97df275c4d76a3603eaf49eed2887f2368012b1924f2c',
-            '496a9ef8bb7f399907a8923e1386d541528e77e237ea7e3abe5b28d432a9bd11',
-        ],
-    }),
-    ('jupyterlab_recents', '3.0.1', {
-        'checksums': ['bc45d51ec22c8924197044af151c401644ab649eb2bc36123b167294a396cf23'],
-    }),
-    ('jupyterlab_plugin_playground', '0.4.0', {
-        'checksums': ['81783712c286f334af46b55b912635671b68e1fe445439e7f8c817242f702d2f'],
-    }),
-    # jupyterlab-s3-browser
-    ('jmespath', '1.0.0', {
-        'checksums': ['a490e280edd1f57d6de88636992d05b71e97d69a26a19f058ecf7d304474bf5e'],
-    }),
-    ('botocore', '1.24.21', {
-        'checksums': ['7e976cfd0a61601e74624ef8f5246b40a01f2cce73a011ef29cf80a6e371d0fa'],
-    }),
-    ('aioitertools', '0.10.0', {
-        'checksums': ['7d1d1d4a03d462c5a0840787d3df098f125847e0d38b833b30f8f8cbc45a1420'],
-    }),
-    ('s3transfer', '0.5.2', {
-        'checksums': ['95c58c194ce657a5f4fb0b9e60a84968c808888aed628cd98ab8771fe1db98ed'],
-    }),
-    ('fsspec', '2022.5.0', {
-        'checksums': ['7a5459c75c44e760fbe6a3ccb1f37e81e023cde7da8ba20401258d877ec483b4'],
-    }),
-    ('aiobotocore', '2.3.3', {
-        'checksums': ['13d403a067e1afc997f756a3107d125ffe964e7213f117f327c62fe763c67e2e'],
-    }),
-    ('singleton-decorator', '1.0.0', {
-        'checksums': ['1a90ad8a8a738be591c9c167fdd677c5d4a43d1bc6b1c128227be1c5e03bee07'],
-    }),
-    ('s3fs', '2022.5.0', {
-        'checksums': ['b40a3cbfaf80cbabaf0e332331117ccac69290efdac347184fb3ab6003f70465'],
-    }),
-    ('boto3', '1.21.21', {
-        'checksums': ['6fa0622f308cfd1da758966fc98b52fbd74b80606d14586c8ad82c7a6c4f32d0'],
-    }),
-    ('jupyterlab_s3_browser', 'c8e319b717251cc3265cfaab2fdb5221c3072238', {
-        'source_tmpl': '%(version)s.tar.gz',
-        'source_urls': ['https://github.com/IBM/jupyterlab-s3-browser/archive/'],
-        'patches': ['jupyterlab-s3-browser_pr86_s3v2.patch'],
-        'checksums': [
-            'e614d3ba4d28af503f6a01f3ac37c626bcf6335c22174643ac1527b681e5b770',
-            '7f35ed49cb705f7f85962e09996516c54be2386d98d28cf0320810b589fba1bf',
-        ],
-    }),
-    ###############
-    # extras
-    ('mccabe', '0.7.0', {
-        'checksums': ['348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325'],
-    }),
-    ('pyflakes', '2.4.0', {
-        'checksums': ['05a85c2872edf37a4ed30b0cce2f6093e1d0581f8c19d7393122da7e25b2b24c'],
-    }),
-    ('flake8', '4.0.1', {
-        'patches': ['flake8_mccabe07.patch'],
-        'checksums': [
-            '806e034dda44114815e23c16ef92f95c91e4c71100ff52813adf7132a6ad870d',
-            '824ed4b2d20a2d69edd2470d848c1f6e87bba31f816d96f1f677977e8cf34fab',
-        ],
-    }),
-    ('pydocstyle', '5.0.2', {
-        'checksums': ['f4f5d210610c2d153fae39093d44224c17429e2ad7da12a8b419aba5c2f614b5'],
-    }),
-    ('rope', '1.0.0', {
-        'checksums': ['16f652d3002296778d463db329da6a05d914a4dbde30ea6da76362da06c0ebb7'],
-    }),
-    # base for python language server
-    ('python-jsonrpc-server', '0.4.0', {
-        'modulename': 'pyls_jsonrpc',
-        'checksums': ['62c543e541f101ec5b57dc654efc212d2c2e3ea47ff6f54b2e7dcb36ecf20595'],
-    }),
-    # test
-    ('lazy-object-proxy', '1.7.1', {
-        'checksums': ['d609c75b986def706743cdebe5e47553f4a5a1da9c5ff66d76013ef396b5a8a4'],
-    }),
-    ('wrapt', '1.13.3', {
-        'checksums': ['1fea9cd438686e6682271d36f3481a9f3636195578bab9ca3382e2f5f01fc185'],
-    }),
-    ('astroid', '2.11.2', {
-        'checksums': ['8d0a30fe6481ce919f56690076eafbb2fb649142a89dc874f1ec0e7a011492d0'],
-    }),
-    ('pylint', '2.13.5', {
-        'checksums': ['dab221658368c7a05242e673c275c488670144123f4bd262b2777249c1c0de9b'],
-    }),
-    ('pytest', '6.2.5', {
-        'checksums': ['131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89'],
-    }),
-    ('pytest-cov', '2.12.1', {
-        'checksums': ['261ceeb8c227b726249b376b8526b600f38667ee314f910353fa318caa01f4d7'],
-    }),
-    ('pytest-xprocess', '0.18.1', {
-        'checksums': ['fd9f30ed1584b5833bc34494748adf0fb9de3ca7bacc4e88ad71989c21cba266'],
-    }),
-    # python language server
-    ('python-lsp-jsonrpc', '1.0.0', {
-        'modulename': 'pylsp_jsonrpc',
-        'checksums': ['7bec170733db628d3506ea3a5288ff76aa33c70215ed223abdb0d95e957660bd'],
-    }),
-    ('python-lsp-server', '1.4.1', {
-        'modulename': 'pylsp',
-        'checksums': ['be7f83298af9f0951a93972cafc9db04fd7cf5c05f20812515275f0ba70e342f'],
-    }),
-    ('jupyter-lsp', '1.5.1', {
-        'checksums': ['751abd35413be99a4331f3597b09341adc755589ed32091ac2f686db3d61267e'],
-    }),
-    ('jupyterlab-lsp', '3.10.1', {
-        'checksums': ['9ad6ef22c4972b85480797034fc7914728eb78f1856b4dab3361686e4f20c9dd'],
-    }),
-    ('jupyterlab-tour', '3.1.4', {
-        'checksums': ['f1d80ec906f689134d259203caf281ea53b8c2353c4a265c29947b557e009229'],
-    }),
-    # jupyterlab_hdf
-    ('orjson', '3.6.7', {
-        'source_tmpl': 'orjson-%(version)s-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl',
-        'checksums': ['a08b6940dd9a98ccf09785890112a0f81eadb4f35b51b9a80736d1725437e22c'],
-        # 'source_tmpl': 'orjson-%(version)s-cp39-cp39-manylinux_2_24_x86_64.whl',
-        # 'checksums': ['e6201494e8dff2ce7fd21da4e3f6dfca1a3fed38f9dcefc972f552f6596a7621'],
-        'unpack_sources': False,
-    }),
-    ('tifffile', '2022.2.9', {
-        'checksums': ['7eda74117643681bb2caa695b48f39e2243b4887f7cf991d5adffd813e5c8373'],
-    }),
-    ('h5grove', '0.0.14', {
-        'checksums': ['ead42d2d98f28ef363c83bd4ba421f25f02c111c615201093707a670b9978704'],
-    }),
-    ('jupyterlab_hdf', '1.2.0', {
-        'checksums': ['60a5b6808966d26af15f93c9339f81f1c194324fd94339d0bf700b5aa64f659d'],
-    }),
-    ####################
-    # Jupyter Hub
-    ('pamela', '1.0.0', {
-        'checksums': ['65c9389bef7d1bb0b168813b6be21964df32016923aac7515bdf05366acbab6c'],
-    }),
-    ('certipy', '0.1.3', {
-        'checksums': ['695704b7716b033375c9a1324d0d30f27110a28895c40151a90ec07ff1032859'],
-    }),
-    ('oauthlib', '3.1.1', {
-        'checksums': ['8f0215fcc533dd8dd1bee6f4c412d4f0cd7297307d43ac61666389e3bc3198a3'],
-    }),
-    ('ruamel.yaml', '0.17.20', {
-        'checksums': ['4b8a33c1efb2b443a93fcaafcfa4d2e445f8e8c29c528d9f5cdafb7cc9e4004c'],
-    }),
-    ('ruamel.yaml.clib', '0.2.6', {
-        'modulename': 'ruamel.yaml',
-        'checksums': ['4ff604ce439abb20794f05613c374759ce10e3595d1867764dd1ae675b85acbd'],
-    }),
-    ('python-json-logger', '0.1.11', {
-        'modulename': 'pythonjsonlogger',
-        'checksums': ['b7a31162f2a01965a5efb94453ce69230ed208468b0bbc7fdfc56e6d8df2e281'],
-    }),
-    ('jupyter_telemetry', '0.1.0', {
-        'checksums': ['445c613ae3df70d255fe3de202f936bba8b77b4055c43207edf22468ac875314'],
-    }),
-    ('jupyterhub', '2.3.1', {
-        'checksums': [
-            'f968f4f1392a9bb21e0fd6e1452bc925f7e3d2dc1f02efbe4afd63ecb9e81e0f',
-        ],
-    }),  # copy 401.html -> <jupyter-install-dir>/share/jupyter/lab/static/
-    ('HeapDict', '1.0.1', {
-        'checksums': ['8495f57b3e03d8e46d5f1b2cc62ca881aca392fd5cc048dc0aa2e1a6d23ecdb6'],
-    }),
-    ('zict', '2.0.0', {
-        'checksums': ['8e2969797627c8a663575c2fc6fcb53a05e37cdb83ee65f341fc6e0c3d0ced16'],
-    }),
-    ('tblib', '1.7.0', {
-        'checksums': ['059bd77306ea7b419d4f76016aef6d7027cc8a0785579b5aad198803435f882c'],
-    }),
-    ('dask', '2022.8.1', {
-        'checksums': ['84f9f229e4fc6c0df8a23620f2b03f277b1bfb15a497603c704743443e38d420'],
-    }),
-    ('distributed', '2022.8.1', {
-        'patches': ['distributed-2022.8.1_unpin-tornado6.2.patch'],  # tornado6.2 fails only for tests/CI (issue 6669)
-        'checksums': [
-            '09ffd3433ba44b856320f8ec657f221af5207d99c9db6bb5101b14f4fca42f56',
-            '019a75f9e22a0f1730c641682cfe39d6386d9e5c50b2f784334f1f4ec2e99766',
-        ],
-    }),
-    ('dask_labextension', '5.3.0', {
-        'checksums': ['ff722654e6e23baaad0f8b97216a25b1fad668fd86ec02088a1222a225d1ce80'],
-    }),  # if you change the version ensure you sync it with postcommands (cp plugin.json)
-    ('dask-jobqueue', '0.7.4', {
-        'checksums': ['5e84306b3809b85be1a047b38611aed98bc8a7e54501eedd846204567b90e643'],
-    }),
-    ('Automat', '0.8.0', {
-        'checksums': ['269a09dfb063a3b078983f4976d83f0a0d3e6e7aaf8e27d8df1095e09dc4a484'],
-    }),
-    ('PyHamcrest', '1.9.0', {
-        'modulename': 'hamcrest',
-        'checksums': ['8ffaa0a53da57e89de14ced7185ac746227a8894dbd5a3c718bf05ddbd1d56cd'],
-    }),
-    ('pyasn1-modules', '0.2.8', {
-        'checksums': ['905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e'],
-    }),
-    ('service-identity', '21.1.0', {
-        'checksums': ['6e6c6086ca271dc11b033d17c3a8bea9f24ebff920c587da090afc9519419d34'],
-    }),
-    ('incremental', '21.3.0', {
-        'checksums': ['02f5de5aff48f6b9f665d99d48bfc7ec03b6e3943210de7cfc88856d755d6f57'],
-    }),
-    ('Twisted', '21.7.0', {
-        'checksums': ['2cd652542463277378b0d349f47c62f20d9306e57d1247baabd6d1d38a109006'],
-    }),
-    ('autobahn', '21.11.1', {
-        'checksums': ['bd6f46315419ca0a5be4109f737410208ad5f19718f67ca6a4a674cc66ca9b18'],
-    }),
-    ('constantly', '15.1.0', {
-        'checksums': ['586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35'],
-    }),
-    ('hyperlink', '21.0.0', {
-        'checksums': ['427af957daa58bc909471c6c40f74c5450fa123dd093fc53efd2e91d2705a56b'],
-    }),
-    ('incremental', '21.3.0', {
-        'checksums': ['02f5de5aff48f6b9f665d99d48bfc7ec03b6e3943210de7cfc88856d755d6f57'],
-    }),
-    ('txaio', '21.2.1', {
-        'checksums': ['7d6f89745680233f1c4db9ddb748df5e88d2a7a37962be174c0fd04c8dba1dc8'],
-    }),
-    ('zope.interface', '5.4.0', {
-        'checksums': ['5dba5f530fec3f0988d83b78cc591b58c0b6eb8431a85edd1569a0539a8a5a0e'],
-    }),
-    ('wslink', '1.5.2', {
-        'checksums': ['99edcc1decd2ef71323b2799efc1b394addf4a62cb57d8323d2e7804f8087699'],
-    }),
-    ('ipyvue', '1.7.0', {
-        'checksums': ['fa8ff9b9a73b5a925c4af4c05f1839df2bd0fae0063871f403ee821792d5ab72'],
-    }),
-    ('ipyvuetify', '1.8.1', {
-        'checksums': ['2d17367ce7da45a2622107d55c8b4c5475aace99ed5d95e5d7d3f93aa4c0c566'],
-    }),
-    ('voila', '0.3.5', {  # voila > 0.3.5 req. hatchling
-        'checksums': ['640acadb6e787370f32a5264e0f644c0bcb0d0c8026823f6d296cea725c6b289'],
-    }),
-    ('voila-material', '0.4.0', {
-        'modulename': 'voila',
-        'checksums': ['0827a27f0f23ca87bd8f565c4c227c754516d2a120ffce0f7ab1ee12fdec959f'],
-    }),
-    ('voila-gridstack', '0.3.0', {
-        'checksums': ['fafc7eb8773ca07d2cec26da4547078071f628c056007f0cfaa73b19641c58ec'],
-        'modulename': 'voila',
-    }),
-    # ('voila-vuetify', '0.5.2', dict(list(local_common_opts.items()) + [  # req. voila<0.3,>=0.2.0b1
-    #     ('checksums', [('sha256', '63f7da1efb2a48df44206da2504b70adf549279d572046e2d04adcc57e5b6f66')]),
-    #     ('modulename', 'voila'), # req. voila<0.3 which req. nbconvert<6, req. jupyter-client<7,>=6.1.3
-    # ])),
-    ('pydicom', '2.2.2', {
-        'checksums': ['f51078da1fe1285431a6f14a5ca0273520391ef28a68b32b9de73cc7f93f38be'],
-    }),
-    # ('dicom_upload', '0.2.0', dict(list(local_common_opts.items()) + [
-    #     ('checksums', [('sha256', 'd03f309bbae2094d3db75ffaa9753cca5982d2096ec55720a1f54343cc4a6877')]),
-    # ])),  # too old deps: "@jupyter-widgets/base": "^1.1 || ^2|| ^3"
-    # ('jsfileupload', '0.2.0', dict(list(local_common_opts.items()) + [
-    #     ('checksums', [('sha256', '245cd74a3c2ed4356df9a33d0072d8ab295b60b6fdfd69c6795396d455fc8a77')]),
-    # ])),  # older deps: "@jupyter-widgets/base": "^1.1.10 || ^2"
-    # ('pvlink', '0.3.1', dict(list(local_common_opts.items()) + [
-    #     ('checksums', [('sha256', 'a2d5f2c204e0e779a5b865742019b4646b8592d76de87cac724dc84f64eaf80f')]),
-    # ])),  # older deps: "@jupyter-widgets/base": { "version": "3.0.0"
-    ('textwrap3', '0.9.2', {
-        'source_tmpl': 'textwrap3-0.9.2.zip',
-        'checksums': ['5008eeebdb236f6303dcd68f18b856d355f6197511d952ba74bc75e40e0c3414'],
-    }),
-    ('ansiwrap', '0.8.4', {
-        'source_tmpl': 'ansiwrap-0.8.4.zip',
-        'checksums': ['ca0c740734cde59bf919f8ff2c386f74f9a369818cdc60efe94893d01ea8d9b7'],
-    }),
-    ('tqdm', '4.62.3', {
-        'checksums': ['d359de7217506c9851b7869f3708d8ee53ed70a1b8edbba4dbcb47442592920d'],
-    }),
-    ('tenacity', '8.0.1', {
-        'checksums': ['43242a20e3e73291a28bcbcacfd6e000b02d3857a9a9fff56b297a27afdc932f'],
-    }),
-    ('papermill', '2.3.4', {
-        'checksums': ['be12d2728989c0ae17b42fcb05b623500004e94b34f56bd153355ccebb84a59a'],
-    }),
-    ('pyviz_comms', '2.1.0', {
-        'checksums': ['f4a7126f318fb6b964fef3f92fa55bc46b9218f62a8464a8b18e968b3087dbc0'],
-    }),
-    ('Markdown', '3.3.6', {
-        'modulename': 'markdown',
-        'checksums': ['76df8ae32294ec39dcf89340382882dfa12975f87f45c3ed1ecdb1e8cefc7006'],
-    }),
-    ('panel', '0.12.7', {
-        'checksums': ['119b525c954df0d630e7bc7ef2cb7e50b406cca73a4caa823c43e49d58b52ebb'],
-    }),
-    ('holoviews', '1.14.7', {
-        'checksums': ['8d8d171227e9c9eaadd4b037b3ddaa01055a33bacbdbeb57a5efbd273986665f'],
-    }),
-    # PythonPackages for Tutorials
-    ('patsy', '0.5.2', {
-        'checksums': ['5053de7804676aba62783dbb0f23a2b3d74e35e5bfa238b88b7cbf148a38b69d'],
-    }),
-    ('statsmodels', '0.13.1', {
-        'checksums': ['006ec8d896d238873af8178d5475203844f2c391194ed8d42ddac37f5ff77a69'],
-    }),
-    ('cftime', '1.5.2', {
-        'checksums': ['375d37d9ab8bf501c048e44efce2276296e3d67bb276e891e0e93b0a8bbb988a'],
-    }),
-    ('vega_datasets', '0.9.0', {
-        'checksums': ['9dbe9834208e8ec32ab44970df315de9102861e4cda13d8e143aab7a80d93fc0'],
-    }),
-    ('Theano', '1.0.5', {
-        'modulename': 'theano',
-        'checksums': ['6e9439dd53ba995fcae27bf20626074bfc2fff446899dc5c53cb28c1f9202e89'],
-    }),
-    ('altair', '4.2.0', {
-        'checksums': ['d87d9372e63b48cd96b2a6415f0cf9457f50162ab79dc7a31cd7e024dd840026'],
-    }),
-    ('cssselect', '1.1.0', {
-        'checksums': ['f95f8dedd925fd8f54edb3d2dfb44c190d9d18512377d3c1e2388d16126879bc'],
-    }),
-    ('smopy', '0.0.7', {
-        'checksums': ['578b5bc2502176d210f176ab94e77974f43b32c95cd0768fb817ea2499199592'],
-    }),
-    ('memory_profiler', '0.60.0', {
-        'checksums': ['6a12869511d6cebcb29b71ba26985675a58e16e06b3c523b49f67c5497a33d1c'],
-    }),
-    ('line_profiler', '3.4.0', {
-        'checksums': ['b6b0a8100a2829358e31ef7c6f427b1dcf2b1d8e5d38b55b219719ecf758aee5'],
-    }),
-    ('xarray-einstats', '0.2.2', {
-        'checksums': ['47ed7eba5b073641040fe3dad3bdefe8e9f58bdfed3f1f2e003d5fa4bf4ebb43'],
-    }),
-    ('arviz', '0.12.1', {
-        'checksums': ['57d80eacc51909f18e6ab63c96a6b02227c3b077c5ffa406d5f4dabe03b8f019'],
-    }),
-    ('cachetools', '4.2.4', {
-        'checksums': ['89ea6f1b638d5a73a4f9226be57ac5e4f399d22770b92355f92dcb0f7f001693'],
-    }),
-    ('dill', '0.3.4', {
-        'source_tmpl': '%(name)s-%(version)s.zip',
-        'checksums': ['9f9734205146b2b353ab3fec9af0070237b6ddae78452af83d2fca84d739e675'],
-    }),
-    ('fastprogress', '1.0.0', {
-        'checksums': ['89e28ac1d2a5412aab18ee3f3dfd1ee8b5c1f2f7a44d0add0d0d4f69f0191bfe'],
-    }),
-    ('Theano-PyMC', '1.1.2', {
-        'modulename': 'theano.tensor',
-        'checksums': ['5da6c2242ea72a991c8446d7fe7d35189ea346ef7d024c890397011114bf10fc'],
-    }),
-    ('semver', '2.13.0', {
-        'checksums': ['fa0fe2722ee1c3f57eac478820c3a5ae2f624af8264cbdf9000c980ff7f75e3f'],
-    }),
-    ('pymc3', '3.11.4', {
-        'checksums': ['3b88d1e6c85f7fb8a9b99d6f136ac860672170370ec4146338fdd160c3b3fd3f'],
-    }),
-    ('ipythonblocks', '1.9.0', {
-        'checksums': ['ba923cb7a003bddee755b5a7ac9e046ffc093a04b0bdede8a0a51ef900aed0ba'],
-    }),
-    ('pydub', '0.25.1', {
-        'checksums': ['980a33ce9949cab2a569606b65674d748ecbca4f0796887fd6f46173a7b0d30f'],
-    }),
-    ('multipledispatch', '0.6.0', {
-        'checksums': ['a7ab1451fd0bf9b92cab3edbd7b205622fb767aeefb4fb536c2e3de9e0a38bea'],
-    }),
-    ('partd', '1.2.0', {
-        'checksums': ['aa67897b84d522dcbc86a98b942afab8c6aa2f7f677d904a616b74ef5ddbc3eb'],
-    }),
-    ('locket', '1.0.0', {
-        'checksums': ['5c0d4c052a8bbbf750e056a8e65ccd309086f4f0f18a2eac306a8dfa4112a632'],
-    }),
-    ('datashape', '0.5.2', {
-        'checksums': ['2356ea690c3cf003c1468a243a9063144235de45b080b3652de4f3d44e57d783'],
-    }),
-    ('datashader', '0.13.0', {
-        'checksums': ['e89b1c1e6d508c399738b2daf37aa102f63fc70be53cce9db90d654b19c2555f'],
-    }),
-    ('selenium', '3.141.0', {
-        'checksums': ['deaf32b60ad91a4611b98d8002757f29e6f2c2d5fcaf202e1c9ad06d6772300d'],
-    }),
-    ('graphviz', '0.19.1', {
-        'source_tmpl': 'graphviz-0.19.1.zip',
-        'checksums': ['09ed0cde452d015fe77c4845a210eb642f28d245f5bc250d4b97808cb8f49078'],
-    }),
-    ('vincent', '0.4.4', {
-        'checksums': ['5765bcd360140d2304e52728ad1d4382f3f919ea259a13932828680f2d84fcd3'],
-    }),
-    ('tailer', '0.4.1', {
-        'checksums': ['78d60f23a1b8a2d32f400b3c8c06b01142ac7841b75d8a1efcb33515877ba531'],
-    }),
-    # Dash
-    ('Brotli', '1.0.9', {
-        'modulename': 'brotli',
-        'source_tmpl': 'Brotli-1.0.9.zip',
-        'checksums': ['4d1b810aa0ed773f81dceda2cc7b403d01057458730e309856356d4ef4188438'],
-    }),
-    ('Flask-Compress', '1.10.1', {
-        'modulename': 'flask_compress',
-        'checksums': ['28352387efbbe772cfb307570019f81957a13ff718d994a9125fa705efb73680'],
-    }),
-    ('hiredis', '1.1.0', {
-        'checksums': ['996021ef33e0f50b97ff2d6b5f422a0fe5577de21a8873b58a779a5ddd1c3132'],
-    }),
-    ('redis', '3.5.3', {
-        'checksums': ['0e7e0cfca8660dea8b7d5cd8c4f6c5e29e11f31158c0b0ae91a397f00e5a05a2'],
-    }),
-    ('Flask-Caching', '1.10.1', {
-        'modulename': 'flask_caching',
-        'checksums': ['cf19b722fcebc2ba03e4ae7c55b532ed53f0cbf683ce36fafe5e881789a01c00'],
-    }),
-    ('dash', '2.0.0', {
-        'checksums': ['29277c24e2f795b069cb102ce1ab0cd3ad5cf9d3b4fd16c03da9671a5eea28a4'],
-    }),
-    ('dash_renderer', '1.9.1', {
-        'checksums': ['73a69e3d145880e68e42723ad10182251d92b44f3efe92b8763145cfd2158e7e'],
-    }),
-    ('dash_core_components', '2.0.0', {
-        'checksums': ['c6733874af975e552f95a1398a16c2ee7df14ce43fa60bb3718a3c6e0b63ffee'],
-    }),
-    ('dash_html_components', '2.0.0', {
-        'checksums': ['8703a601080f02619a6390998e0b3da4a5daabe97a1fd7a9cebc09d015f26e50'],
-    }),
-    ('dash_table', '5.0.0', {
-        'checksums': ['18624d693d4c8ef2ddec99a6f167593437a7ea0bf153aa20f318c170c5bc7308'],
-    }),
-    ('dash-bootstrap-components', '1.0.2', {
-        'checksums': ['d385fa959159cdfd11885a753341fba67bad8622c84e5f61585930953f55f54f'],
-    }),
-    ('dash_daq', '0.5.0', {
-        'checksums': ['a1d85b6799f7b885652fbc44aebdb58c41254616a8d350b943beeb42ade4256a'],
-    }),
-    ('dash_player', '0.0.1', {
-        'checksums': ['46114910b497f35f1aa496ed8b9ff1457d07c96171227961b671ba4164c537a0'],
-    }),
-    # ('dash_canvas', '0.1.0', dict(list(local_common_opts.items()) + [
-    #     ('checksums', [('sha256', '72fcfb37e1c0f68c08f6fa6cf0b5be67ecc66fcfb5253231ffc450957b640b31')]),
-    # ])), # req. Pillow-9.0.1 PyWavelets-1.2.0 imageio-2.15.0
-    # ('dash_bio', '1.0.2', dict(list(local_common_opts.items()) + [
-    #     ('checksums', [('sha256', '6de28e412a37aef19429579f3285c27a5d4f21d8f387564d0698d63466259a36')]),
-    # ])),
-    # ('dash_cytoscape', '0.3.0', dict(list(local_common_opts.items()) + [
-    #     # ('checksums', [('sha256', '0669c79c197e4b150a5db7a278d1c7acebc947f3f5cbad5274835ebb44f712cd')]),
-    # ])),  # https://github.com/plotly/dash-cytoscape/issues/158
-    ('ansi2html', '1.6.0', {
-        'checksums': ['0f124ea7efcf3f24f1f9398e527e688c9ae6eab26b0b84e1299ef7f94d92c596'],
-    }),
-    ('jupyter-dash', '0.4.2', {
-        'checksums': ['d546c7c25a2867c14c95a48af0ad572803b26915a5ce6052158c9dede4dbf48c'],
-    }),
-    # more
-    ('fastcore', '1.4.1', {
-        'checksums': ['737effc54a6ed1189e0ea514342def4d9693c0d219f3a49d1ef44f616890ff2d'],
-    }),
-    ('fastscript', '1.0.0', {
-        'checksums': ['67d2315a508ffd0499af590fffaa63d276ce6eaff73ffbd60eb3315ba38d08fa'],
-    }),
-    ('fastrelease', '0.1.12', {
-        'checksums': ['5ac6ca023c453ebdaad7ab5dab678d7369d50d1496b09681d3d1b0ae06a8f878'],
-    }),
-    ('ghapi', '0.1.19', {
-        'checksums': ['d8d7012a6b275c1b691de9854504b11d6c41b36db7002992c2e2d51320f9758b'],
-    }),
-    ('nbdev', '1.2.5', {
-        'patches': ['nbdev_noqtconsole.patch'],
-        'checksums': [
-            '655f59618fc5f6542f6b454e8ebc72870487922a6e1815024aa690d98a37d6ff',
-            '88be9a113f55057679f244b2feba18fdc526145417c25a8666f57220259faa55',
-        ],
-    }),
-    ('PyJWT', '2.3.0', {
-        'modulename': 'jwt',
-        'checksums': ['b888b4d56f06f6dcd777210c334e69c737be74755d3e5e9ee3fe67dc18a0ee41'],
-    }),
-    ('pyunicore', '0.9.19', {
-        'checksums': ['bb828825fd8a56e71dab1cb8a959302d81d7097496a048126761b09ebffaa670'],
-    }),
-]
-
-local_jupyter_config_path = 'etc/jupyter'
-local_jupyter_path = 'share/jupyter'
-local_jupyterlab_dir = 'share/jupyter/lab'
-
-modextrapaths = {
-    #  search path to find installable data files, such as kernelspecs and notebook extensions
-    'JUPYTER_PATH': [local_jupyter_path],
-    #  do NOT set JUPYTER_CONFIG_DIR: if not set, if will be ${HOME}/.jupyter, which is just right
-    'JUPYTER_CONFIG_PATH': [local_jupyter_config_path],   # config dir at install time.
-    #  ATTENTION: not config dir at runtime, because this is fixed to {sys.prefix}/etc/jupyter/
-}
-
-modextravars = {
-    'JUPYTER': '%(installdir)s/bin/jupyter',
-    'JUPYTERLAB_DIR': '%%(installdir)s/%s' % local_jupyterlab_dir,
-    'MKL_THREADING_LAYER': 'GNU',  # https://github.com/Theano/Theano/issues/6568
-}
-
-# Ensure that the user-specific $HOME/.local/share/jupyter is first entry in JUPYTHER_PATH and JUPYTER_DATA_DIR
-# and the JUPYTER_CONFIG_PATH starts with $HOME/.jupyter
-# https://jupyter.readthedocs.io/en/latest/projects/jupyter-directories.html#envvar-JUPYTER_PATH
-modluafooter = """
-setenv("JUPYTER_DATA_DIR", pathJoin(os.getenv("HOME"), ".local/share/jupyter"))
-prepend_path("JUPYTER_PATH", pathJoin(os.getenv("HOME"), ".local/share/jupyter"))
-prepend_path("JUPYTER_CONFIG_PATH", pathJoin(os.getenv("HOME"), ".jupyter"))
-"""
-
-postinstallcmds = [
-    #  ensure we install in the correct directory !!!
-    'cd %(builddir)s',
-    'python3 -m venv %(installdir)s --system-site-packages',
-
-    'echo "#!/bin/bash" > %(builddir)s/env.sh',
-    'echo "source %(installdir)s/bin/activate" >> %(builddir)s/env.sh',
-    (
-        'echo "export PYTHONPATH='
-        '%(installdir)s/lib/python%(pyshortver)s/site-packages:'
-        '${EBROOTPYTHON}/lib/python%(pyshortver)s/site-packages:'
-        '${PYTHONPATH}" >> %(builddir)s/env.sh'
-    ),
-
-    #  Jupyter Paths - http://jupyter.readthedocs.io/en/latest/projects/jupyter-directories.html
-    'echo "export JUPYTER=%(installdir)s/bin/jupyter" >> %(builddir)s/env.sh',
-    'echo "export JUPYTER_PATH=%%(installdir)s/%s" >> %%(builddir)s/env.sh' % local_jupyter_path,
-    'echo "export JUPYTERLAB_DIR=%%(installdir)s/%s" >> %%(builddir)s/env.sh' % local_jupyterlab_dir,
-    #  Config dir at install time. ATTENTION: not config dir at runtime. This is picked up by JUPYTER_CONFIG_PATH
-    'echo "export JUPYTER_CONFIG_DIR=%%(installdir)s/%s" >> %%(builddir)s/env.sh' % local_jupyter_config_path,
-    #  jupyter will use $JUPYTER_CONFIG_DIR with "--user"
-    'echo "export JUPYTER_DATA_DIR=%%(installdir)s/%s" >> %%(builddir)s/env.sh' % local_jupyter_path,
-    'echo "export PATH=%(installdir)s/bin:${PATH}" >> %(builddir)s/env.sh',
-
-    #  JupyterLab Extensions
-    'source %(builddir)s/env.sh && jupyter labextension install jupyterlab_iframe@0.4.3 --no-build',
-    'source %(builddir)s/env.sh && jupyter labextension install jupyterlab-theme-toggle@0.6.1 --no-build',
-    'source %(builddir)s/env.sh && jupyter labextension install jupyterlab-plotly@5.5.0 --no-build',
-
-    #  store default in ../share/jupyter/lab/schemas/jupyterlab-favorites/favorites.json
-    #  create dynamic defaults for $HOME, $SCRATCH, $PROJECT with the following script
-    (
-        'install -m 0755 '
-        '        %(builddir)s/jupyterlab_favorites/jupyterlab_favorites-3.0.1/update_favorites_json '
-        '        %(installdir)s/bin/ '
-    ),
-
-    #   tour-state on/off is saved in workspace-file in ~/.jupyter/lab/workspaces/
-    #   respect the version lookup table at https://github.com/matplotlib/ipympl
-
-    #    'source %(builddir)s/env.sh && jupyter labextension install @jupyterlab/github@2.0.0 --no-build',
-    #    'source %(builddir)s/env.sh && jupyter labextension install jupyterlab-lmod@0.8.1 --no-build',
-    #    #  this might interfer with Xpra-icon: https://github.com/cmd-ntrf/jupyter-lmod/issues/30
-    # ('source %(builddir)s/env.sh && '
-    #  '  cd %(builddir)s/jupyterlmod/jupyter-lmod-9ddb49d5f3cc6ddc196f5e1c597f2e1b76af7d2d/jupyterlab/ && '
-    #  '    npm install && '                            # install npm package dependencies in current directory
-    #  '    npm run build && '                          # optional build step if using TypeScript, babel, etc.
-    #  '    jupyter labextension install --no-build'),  # install the current directory as an extension
-    #    'source %(builddir)s/env.sh && jupyter labextension install jupyterlab-slurm@2.0.0 --no-build',
-    # 'source %(builddir)s/env.sh && jupyter labextension install dicom-upload@0.2.0 --no-build',  # deps too old
-    # 'source %(builddir)s/env.sh && jupyter labextension install jsfileupload@0.2.0 --no-build',  # deps too old
-    # 'source %(builddir)s/env.sh && jupyter labextension install pvlink@0.3.1 --no-build',  # deps too old
-    #    'source %(builddir)s/env.sh && jupyter labextension install itkwidgets@0.32.1 --no-build',  # no JLab>=3
-
-    #  build JupyterLab app directory for all previous installed extensions in one go
-    'source %(builddir)s/env.sh && jupyter lab build --dev-build=False',  # --minimize=False
-
-    #  NodeJS packages
-    #  bokeh req. phantomjs in $PATH or $BOKEH_PHANTOMJS_PATH for bokeh's export-feature
-    (
-        'source %(builddir)s/env.sh && npm install -g '
-        '        phantomjs-prebuilt@2.1.16 '
-    ),
-    # language server for jupyter-lsp (last update 30.04.22)
-    # https://jupyterlab-lsp.readthedocs.io/en/latest/Language%20Servers.html
-    # must be installed _after_ 'jupyter lab build' as this clears the prefix
-    (
-        'source %(builddir)s/env.sh && npm install --prefix %(installdir)s/share/jupyter/lab/staging/ '
-        '        bash-language-server@2.1.0 '
-        '        dockerfile-language-server-nodejs@0.8.0 '
-        '        pyright@1.1.245 '
-        '        sql-language-server@1.2.1 '
-        '        typescript-language-server@0.9.7 typescript@4.1 '
-        '        vscode-css-languageserver-bin@1.4.0 '
-        '        vscode-html-languageserver-bin@1.4.0 '
-        '        vscode-json-languageserver-bin@1.0.1 '
-        '        yaml-language-server@1.7.0 '
-    ),
-
-    #  jupyterlab server extensions
-    # 'source %(builddir)s/env.sh && jupyter serverextension enable --py jupyterlab_sql',
-    'source %(builddir)s/env.sh && jupyter serverextension enable --py jupyterlab_iframe',
-    'source %(builddir)s/env.sh && jupyter serverextension enable --py jupyterlab_s3_browser',
-
-    #  enable 'allow hidden files'
-    (
-        '{ cat >> %(installdir)s/etc/jupyter/jupyter_server_config.d/jupyterlab_allowhidden.json; } << \'EOF\'\n'
-        '{\n'
-        '  "ContentsManager": {\n'
-        '    "allow_hidden": true\n'
-        '  }\n'
-        '}\n'
-        'EOF'
-    ),
-
-    #  Send2Trash
-    #  disable
-    (
-        '{ cat >> %(installdir)s/etc/jupyter/jupyter_notebook_config.py; } << \'EOF\'\n'
-        'c.FileContentsManager.delete_to_trash = False\n'
-        'EOF'
-    ),
-
-    #  dask_labextension
-    (
-        'cp %(builddir)s/dask_labextension/dask_labextension-5.3.0/'
-        'dask_labextension/labextension/schemas/dask-labextension/plugin.json '
-        '   %(installdir)s/share/jupyter/labextensions/dask-labextension/schemas/dask-labextension/plugin.json'
-    ),
-
-    #  GitLab-extension
-    #  for security reasons access-token must be set in the server extension:
-    (
-        '{ cat >> %(installdir)s/etc/jupyter/jupyter_notebook_config.py; } << \'EOF\'\n'
-        '# no username+password needed, if repo is public or we have the token for a specific URL\n'
-        '# c.GitLabConfig.access_token = "<API-TOKEN>"\n'
-        '# c.GitLabConfig.allow_client_side_access_token = False\n'
-        'c.GitLabConfig.url = "https://gitlab.version.fz-juelich.de"\n'
-        'c.GitLabConfig.validate_cert = True\n'
-        'EOF'
-    ),
-
-    #  GitHub-extension
-    #  for security reasons access-token must be set in the server extension:
-    # (
-    #    '{ cat >> %(installdir)s/etc/jupyter/jupyter_notebook_config.py; } << \'EOF\'\n'
-    #    '# no username+password needed, if repo is public or we have the token for a specific URL\n'
-    #    '# c.GitHubConfig.access_token = "<API-TOKEN>"\n'
-    #    '# c.GitHubConfig.allow_client_side_access_token = False\n'
-    #    'c.GitHubConfig.url = "https://github.com"\n'
-    #    'c.GitHubConfig.validate_cert = True\n'
-    #    'EOF'
-    # ),
-
-    #  iframe-extension
-    (
-        '{ cat >> %(installdir)s/etc/jupyter/jupyter_notebook_config.py; } << \'EOF\'\n'
-        '# c.JupyterLabIFrame.iframes = [\'list\', \'of\', \'sites\']\n'
-        'c.JupyterLabIFrame.welcome = "http://www.fz-juelich.de/jsc"\n'
-        'EOF'
-    ),
-
-    #  define .ipynb_checkpoints permissions
-    (
-        '{ cat >> %(installdir)s/etc/jupyter/jupyter_notebook_config.py; } << \'EOF\'\n'
-        'c.FileCheckpoints.checkpoint_permissions = 0o664\n'
-        'c.FileCheckpoints.restore_permissions = 0o644\n'
-        'c.FileCheckpoints.checkpoint_dir_umask = 0o002\n'
-        'EOF'
-    ),
-
-    #  configure jupyter-resource-usage displayed by jupyterlab-system-monitor
-    (
-        '{ cat >> %(installdir)s/etc/jupyter/jupyter_notebook_config.py; } << \'EOF\'\n'
-        'import os\n'
-        'c.ResourceUseDisplay.mem_limit = os.sysconf(\'SC_PAGE_SIZE\') * os.sysconf(\'SC_PHYS_PAGES\')\n'
-        'c.ResourceUseDisplay.mem_warning_threshold = 0.1\n'
-        'c.ResourceUseDisplay.track_cpu_percent = True\n'
-        'c.ResourceUseDisplay.cpu_limit = os.cpu_count()\n'
-        'c.ResourceUseDisplay.cpu_warning_threshold = 0.1\n'
-        'EOF'
-    ),
-
-    # Add the default_setting_override.json file for modifications of the system-wide default settings
-    'mkdir -p %(installdir)s/etc/jupyter/labconfig/ ',
-    (
-        '{ cat > %(installdir)s/etc/jupyter/labconfig/default_setting_overrides.json; } << \'EOF\'\n'
-        '{\n'
-        '    "jupyterlab-gitlab:drive": {\n'
-        '        "baseUrl": "https://gitlab.jsc.fz-juelich.de",\n'
-        '        "defaultRepo": "jupyter4jsc/j4j_notebooks"\n'
-        '    },\n'
-        '    "@krassowski/jupyterlab-lsp:plugin": {\n'
-        '        "language_servers": {\n'
-        '            "pyright": {\n'
-        '                "serverSettings": {\n'
-        '                    "python.analysis.useLibraryCodeForTypes": true\n'
-        '                },\n'
-        '                "priority": 75\n'
-        '            }\n'
-        '        },\n'
-        '        "loggingConsole": "browser",\n'
-        '        "loggingLevel": "warn",\n'
-        '        "logAllCommunication": false,\n'
-        '        "setTrace": null\n'
-        '    },\n'
-        '    "@jupyterlab/extensionmanager-extension:plugin": {\n'
-        '        "enabled": false\n'
-        '    }\n'
-        '}\n'
-        'EOF'
-    ),
-    # Disable extensions we do not want to show up, but which we want to have installed
-    (
-        '{ cat > %(installdir)s/etc/jupyter/labconfig/page_config.json; } << \'EOF\'\n'
-        '{\n'
-        '    "disabledExtensions": {\n'
-        '        "ipyparallel-labextension": true\n'
-        '    }\n'
-        '}\n'
-        'EOF'
-    ),
-
-    # add webpage, which leads back to https://jupyter-jsc.fz-juelich.de
-    'cp %%(builddir)s/jupyterlab/jupyterlab-%s/401.html %%(installdir)s/share/jupyter/lab/static/' % local_jlab_version,
-
-    #  ###################################################
-    #  IMPORTANT:
-    #  start JupyterLab once (for 60 seconds) to allow some cleanup at first start
-    #  ###################################################
-    (
-        'source %(builddir)s/env.sh && '
-        '{(jupyter lab --no-browser) & } && JLAB_PID=$! && '
-        'sleep 60 && '
-        'jupyter lab list --json | grep $JLAB_PID | '
-        'awk \'{for(i=1;i<=NF;i++)if($i=="\\"port\\":")print $(i+1)}\' | sed \'s/,*$//g\' | '
-        'xargs -i jupyter lab stop {}'
-    ),
-
-    #  Ensure Jupyter does not want to build anything on startup
-    #  The build_config.json file is used to track the local directories that have been installed
-    #  using jupyter labextension install <directory>, as well as core extensions that have been explicitly uninstalled.
-    # 'if [ -e %(installdir)s/share/jupyter/lab/settings/build_config.json ]; then exit 1; fi ',
-    (
-        '{ cat > %(installdir)s/share/jupyter/lab/settings/build_config.json; } << \'EOF\'\n'
-        '{\n'
-        '    "local_extensions": {}\n'
-        '}\n'
-        'EOF'
-    ),
-
-    # Ensure we remove the virtuel environment to avoid wrong search path for python packages
-    'rm -f %(installdir)s/pyvenv.cfg',
-    'rm -f %(installdir)s/bin/python',
-    'rm -f %(installdir)s/bin/python3',
-    'rm -f %(installdir)s/bin/activate',
-    'rm -f %(installdir)s/bin/activate*',
-    'rm -f %(installdir)s/bin/easy_install*',
-    'rm -f %(installdir)s/bin/pip*',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/_distutils_hack',
-    'rm -f %(installdir)s/lib/python%(pyshortver)s/site-packages/distutils-precedence.pth',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/pip',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/pip-*',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/pkg_resources',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/setuptools',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/setuptools-*',
-
-    #  Compile Python files to byte-code to speedup execution
-    #  ERROR: returns with exit code 1, because some files cannot be compiled for different reasons
-    #  ###################################################
-    #   Disable possible, because sanity check will    #
-    #   force the compile of all python packages anyway#
-    #  ###################################################
-    #  'source %(builddir)s/env.sh && python -m compileall %(installdir)s',
-
-    #  ###################################################
-    #   IMPORTANT: must be done manual after eb-install: #
-    #  ###################################################
-    #  'chmod -R g-w %(installdir)s ',          # software-group must not modify the installation on accident
-    #  'chmod -R ugo-w %(installdir)s/share ', # Noone should add files/configs to the global share after install
-    #  'chmod -R ug-w ...../2020/software/Python/3.9.6-GCCcore-9.3.0/share ',  # Python module, too
-]
-
-#  specify that Bundle easyblock should run a full sanity check, rather than just trying to load the module
-#  full_sanity_check = True # would result in sanity-errors about yaml,ipython_genutils,IPython,traitlets
-sanity_check_paths = {
-    'files': [],
-    'dirs': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/Jupyter/distributed-2022.8.1_unpin-tornado6.2.patch b/Golden_Repo/j/Jupyter/distributed-2022.8.1_unpin-tornado6.2.patch
deleted file mode 100644
index 0060c752c..000000000
--- a/Golden_Repo/j/Jupyter/distributed-2022.8.1_unpin-tornado6.2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/distributed-2022.8.1/requirements.txt b/distributed-2022.8.1/requirements.txt
-index 4d2232a9eb..ef942b313b 100644
---- a/distributed-2022.8.1/requirements.txt
-+++ b/distributed-2022.8.1//requirements.txt
-@@ -9,7 +9,7 @@ psutil >= 5.0
- sortedcontainers !=2.0.0, !=2.0.1
- tblib >= 1.6.0
- toolz >= 0.8.2
--tornado >= 6.0.3, <6.2
-+tornado >= 6.0.3
- urllib3
- zict >= 0.1.3
- pyyaml
diff --git a/Golden_Repo/j/Jupyter/flake8_mccabe07.patch b/Golden_Repo/j/Jupyter/flake8_mccabe07.patch
deleted file mode 100644
index df9bb27c7..000000000
--- a/Golden_Repo/j/Jupyter/flake8_mccabe07.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur flake8-4.0.1.orig/setup.cfg flake8-4.0.1/setup.cfg
---- flake8-4.0.1.orig/setup.cfg	2021-10-11 14:42:30.357466700 +0200
-+++ flake8-4.0.1/setup.cfg	2022-04-09 20:28:42.531345080 +0200
-@@ -35,7 +35,7 @@
- package_dir = 
- 	=src
- install_requires = 
--	mccabe>=0.6.0,<0.7.0
-+	mccabe>=0.6.0,<0.8.0
- 	pycodestyle>=2.8.0,<2.9.0
- 	pyflakes>=2.4.0,<2.5.0
- 	importlib-metadata<4.3;python_version<"3.8"
diff --git a/Golden_Repo/j/Jupyter/jupyter-resource-usage_fixpsutil.patch b/Golden_Repo/j/Jupyter/jupyter-resource-usage_fixpsutil.patch
deleted file mode 100644
index 7977ecf8b..000000000
--- a/Golden_Repo/j/Jupyter/jupyter-resource-usage_fixpsutil.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur jupyter-resource-usage-orig/jupyter_resource_usage/api.py jupyter-resource-usage/jupyter_resource_usage/api.py
---- jupyter-resource-usage-orig/jupyter_resource_usage/api.py	2021-11-19 17:38:30.603046000 +0100
-+++ jupyter-resource-usage/jupyter_resource_usage/api.py	2021-11-19 17:30:56.961609000 +0100
-@@ -27,7 +27,12 @@
-         all_processes = [cur_process] + cur_process.children(recursive=True)
- 
-         # Get memory information
--        rss = sum([p.memory_info().rss for p in all_processes])
-+        rss = 0
-+        for p in all_processes:
-+            try:
-+                rss += p.memory_info().rss
-+            except (psutil.NoSuchProcess, psutil.AccessDenied) as e:
-+                pass
- 
-         if callable(config.mem_limit):
-             mem_limit = config.mem_limit(rss=rss)
diff --git a/Golden_Repo/j/Jupyter/jupyter-server-proxy_pr337_unixsockets.patch b/Golden_Repo/j/Jupyter/jupyter-server-proxy_pr337_unixsockets.patch
deleted file mode 100644
index 342aa529c..000000000
--- a/Golden_Repo/j/Jupyter/jupyter-server-proxy_pr337_unixsockets.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-diff -Naur jupyter-server-proxy-3.2.1.orig/jupyter_server_proxy/config.py jupyter-server-proxy-3.2.1/jupyter_server_proxy/config.py
---- jupyter-server-proxy-3.2.1.orig/jupyter_server_proxy/config.py      2021-08-16 19:38:33.440690000 +0200
-+++ jupyter-server-proxy-3.2.1/jupyter_server_proxy/config.py   2021-08-16 19:11:07.061678000 +0200
-@@ -17,7 +17,7 @@
- except ImportError:
-     from .utils import Callable
- 
--def _make_serverproxy_handler(name, command, environment, timeout, absolute_url, port, mappath, request_headers_override, rewrite_response):
-+def _make_serverproxy_handler(name, command, environment, timeout, absolute_url, port, unix, mappath, request_headers_override, rewrite_response):
-     """
-     Create a SuperviseAndProxyHandler subclass with given parameters
-     """
-@@ -29,6 +29,7 @@ def __init__(self, *args, **kwargs):
-             self.proxy_base = name
-             self.absolute_url = absolute_url
-             self.requested_port = port
-+            self.unix_sock = unix
-             self.mappath = mappath
-             self.rewrite_response = rewrite_response
- 
-@@ -99,6 +100,7 @@ def make_handlers(base_url, server_processes):
-             sp.timeout,
-             sp.absolute_url,
-             sp.port,
-+            sp.unix,
-             sp.mappath,
-             sp.request_headers_override,
-             sp.rewrite_response,
-@@ -113,7 +115,7 @@ def make_handlers(base_url, server_processes):
- 
- LauncherEntry = namedtuple('LauncherEntry', ['enabled', 'icon_path', 'title', 'path_info'])
- ServerProcess = namedtuple('ServerProcess', [
--    'name', 'command', 'environment', 'timeout', 'absolute_url', 'port',
-+    'name', 'command', 'environment', 'timeout', 'absolute_url', 'port', 'unix',
-     'mappath', 'launcher_entry', 'new_browser_tab', 'request_headers_override', 'rewrite_response',
- ])
- 
-@@ -126,6 +128,7 @@ def make_server_process(name, server_process_config, serverproxy_config):
-         timeout=server_process_config.get('timeout', 5),
-         absolute_url=server_process_config.get('absolute_url', False),
-         port=server_process_config.get('port', 0),
-+        unix=server_process_config.get('unix', False),
-         mappath=server_process_config.get('mappath', {}),
-         launcher_entry=LauncherEntry(
-             enabled=le.get('enabled', True),
-diff -Naur jupyter-server-proxy-3.2.1.orig/jupyter_server_proxy/handlers.py jupyter-server-proxy-3.2.1/jupyter_server_proxy/handlers.py
---- jupyter-server-proxy-3.2.1.orig/jupyter_server_proxy/handlers.py      2021-08-16 19:38:33.440690000 +0200
-+++ jupyter-server-proxy-3.2.1/jupyter_server_proxy/handlers.py   2021-08-16 19:11:07.061678000 +0200
-@@ -11,14 +11,17 @@
- import aiohttp
- from asyncio import Lock
- from copy import copy
-+from tempfile import mkdtemp
- 
- from tornado import gen, web, httpclient, httputil, process, websocket, ioloop, version_info
-+from tornado.simple_httpclient import SimpleAsyncHTTPClient
- 
- from jupyter_server.utils import ensure_async, url_path_join
- from jupyter_server.base.handlers import JupyterHandler, utcnow
- from traitlets.traitlets import HasTraits
- from traitlets import Bytes, Dict, Instance, Integer, Unicode, Union, default, observe
- 
-+from .unixsock import UnixResolver
- from .utils import call_with_asked_args
- from .websocket import WebSocketHandlerMixin, pingable_ws_connect
- from simpervisor import SupervisedProcess
-@@ -265,6 +268,11 @@ def _check_host_allowlist(self, host):
-         else:
-             return host in self.host_allowlist
- 
-+    @staticmethod
-+    def is_unix_sock(port):
-+        """Distinguish Unix socket path from numeric TCP port"""
-+        return isinstance(port, (str, bytes)) and not port.isdigit()
-+
-     @web.authenticated
-     async def proxy(self, host, port, proxied_path):
-         '''
-@@ -298,7 +306,13 @@ async def proxy(self, host, port, proxied_path):
-             else:
-                 body = None
- 
--        client = httpclient.AsyncHTTPClient()
-+        if self.is_unix_sock(port):
-+            # Port points to a Unix domain socket
-+            self.log.debug("Making client for Unix socket %r", port)
-+            assert host == 'localhost', "Unix sockets only possible on localhost"
-+            client = SimpleAsyncHTTPClient(resolver=UnixResolver(port))
-+        else:
-+            client = httpclient.AsyncHTTPClient()
- 
-         req = self._build_proxy_request(host, port, proxied_path, body)
-         self.log.debug(f"Proxying request to {req.url}")
-@@ -557,6 +571,7 @@ class SuperviseAndProxyHandler(LocalProxyHandler):
- 
-     def __init__(self, *args, **kwargs):
-         self.requested_port = 0
-+        self.unix_sock = False
-         self.mappath = {}
-         super().__init__(*args, **kwargs)
- 
-@@ -574,10 +589,14 @@ def port(self):
-         application
-         """
-         if 'port' not in self.state:
--            sock = socket.socket()
--            sock.bind(('', self.requested_port))
--            self.state['port'] = sock.getsockname()[1]
--            sock.close()
-+            if self.unix_sock:
-+                sock_dir = mkdtemp(prefix='jupyter-server-proxy-')
-+                self.state['port'] = os.path.join(sock_dir, 'socket')
-+            else:
-+                sock = socket.socket()
-+                sock.bind(('', self.requested_port))
-+                self.state['port'] = sock.getsockname()[1]
-+                sock.close()
-         return self.state['port']
- 
-     def get_cwd(self):
-@@ -600,8 +619,13 @@ def get_timeout(self):
-         return 5
- 
-     async def _http_ready_func(self, p):
--        url = 'http://localhost:{}'.format(self.port)
--        async with aiohttp.ClientSession() as session:
-+        if self.is_unix_sock(self.port):
-+            url = 'http://localhost'
-+            connector = aiohttp.UnixConnector(self.port)
-+        else:
-+            url = 'http://localhost:{}'.format(self.port)
-+            connector = None  # Default, TCP connector
-+        async with aiohttp.ClientSession(connector=connector) as session:
-             try:
-                 async with session.get(url, allow_redirects=False) as resp:
-                     # We only care if we get back *any* response, not just 200
-@@ -648,6 +672,10 @@ async def ensure_process(self):
-                     del self.state['proc']
-                     raise
- 
-+    def get_client_uri(self, protocol, host, port, proxied_path):
-+        if self.is_unix_sock(port):
-+            port = 0   # Unix socket - port won't be used
-+        return super().get_client_uri(protocol, host, port, proxied_path)
- 
-     @web.authenticated
-     async def proxy(self, port, path):
-@@ -668,6 +696,10 @@ async def http_get(self, path):
-         return await ensure_async(self.proxy(self.port, path))
- 
-     async def open(self, path):
-+        if self.is_unix_sock(self.port):
-+            self.set_status(501)
-+            self.write("Proxying websockets on a Unix socket is not supported yet")
-+            return
-         await self.ensure_process()
-         return await super().open(self.port, path)
- 
-diff -Naur jupyter-server-proxy-3.2.1.orig/jupyter_server_proxy/unixsock.py jupyter-server-proxy-3.2.1/jupyter_server_proxy/unixsock.py
-new file mode 100644
-index 00000000..fe3bfcdb
---- /dev/null
-+++ jupyter-server-proxy-3.2.1/jupyter_server_proxy/unixsock.py
-@@ -0,0 +1,10 @@
-+import socket
-+from tornado.netutil import Resolver
-+
-+
-+class UnixResolver(Resolver):
-+    def initialize(self, socket_path):
-+        self.socket_path = socket_path
-+
-+    async def resolve(self, host, port, *args, **kwargs):
-+        return [(socket.AF_UNIX, self.socket_path)]
-
diff --git a/Golden_Repo/j/Jupyter/jupyter-server-proxy_timeout.patch b/Golden_Repo/j/Jupyter/jupyter-server-proxy_timeout.patch
deleted file mode 100644
index ccb8795a6..000000000
--- a/Golden_Repo/j/Jupyter/jupyter-server-proxy_timeout.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur jupyter-server-proxy.orig/jupyter_server_proxy/handlers.py jupyter-server-proxy/jupyter_server_proxy/handlers.py
---- jupyter-server-proxy.orig/jupyter_server_proxy/handlers.py  2021-10-13 23:47:07.172600888 +0200
-+++ jupyter-server-proxy/jupyter_server_proxy/handlers.py       2021-10-13 23:48:39.703350797 +0200
-@@ -469,7 +469,7 @@
-         """
-         Return timeout (in s) to wait before giving up on process readiness
-         """
--        return 5
-+        return 15
-
-     async def _http_ready_func(self, p):
-         url = 'http://localhost:{}'.format(self.port)
-diff -Naur jupyter-server-proxy.orig/jupyter_server_proxy/config.py jupyter-server-proxy/jupyter_server_proxy/config.py
---- jupyter-server-proxy.orig/jupyter_server_proxy/config.py    2021-10-13 23:47:06.723213000 +0200
-+++ jupyter-server-proxy/jupyter_server_proxy/config.py 2021-10-14 14:12:16.396449527 +0200
-@@ -116,7 +116,7 @@
-         name=name,
-         command=server_process_config['command'],
-         environment=server_process_config.get('environment', {}),
--        timeout=server_process_config.get('timeout', 5),
-+        timeout=server_process_config.get('timeout', 15),
-         absolute_url=server_process_config.get('absolute_url', False),
-         port=server_process_config.get('port', 0),
-         mappath=server_process_config.get('mappath', {}),
diff --git a/Golden_Repo/j/Jupyter/jupyter-server_i11934.patch b/Golden_Repo/j/Jupyter/jupyter-server_i11934.patch
deleted file mode 100644
index 5168f1672..000000000
--- a/Golden_Repo/j/Jupyter/jupyter-server_i11934.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur jupyter_server-1.18.1.orig/jupyter_server/serverapp.py jupyter_server-1.18.1/jupyter_server/serverapp.py
---- jupyter_server-1.18.1.orig/jupyter_server/serverapp.py	2022-07-05 22:24:09.000000000 +0200
-+++ jupyter_server-1.18.1/jupyter_server/serverapp.py	2022-08-29 13:29:32.615573688 +0200
-@@ -2804,6 +2804,8 @@
- 
-     def init_ioloop(self):
-         """init self.io_loop so that an extension can use it by io_loop.call_later() to create background tasks"""
-+        import nest_asyncio
-+        nest_asyncio.apply()
-         self.io_loop = ioloop.IOLoop.current()
- 
-     def start(self):
diff --git a/Golden_Repo/j/Jupyter/jupyter_contrib_nbextensions-template_paths.patch b/Golden_Repo/j/Jupyter/jupyter_contrib_nbextensions-template_paths.patch
deleted file mode 100644
index c51dfd38d..000000000
--- a/Golden_Repo/j/Jupyter/jupyter_contrib_nbextensions-template_paths.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-diff -Naur jupyter_contrib_nbextensions.orig/CHANGELOG.md jupyter_contrib_nbextensions/CHANGELOG.md
---- jupyter_contrib_nbextensions.orig/CHANGELOG.md	2020-11-22 12:43:10.086824740 +0100
-+++ jupyter_contrib_nbextensions/CHANGELOG.md	2020-11-22 12:47:11.839564000 +0100
-@@ -21,6 +21,9 @@
- This is where each new PR to the project should add a summary of its changes,
- which makes it much easier to fill in each release's changelog :)
- 
-+- Replace `template_path` with `template_paths` [#1532](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1532). Nbconvert 6.0 replaced `template_path` with `template_paths` (see https://nbconvert.readthedocs.io/en/latest/changelog.html#significant-changes). This change in Nbconvert 6.0 causes errors in jupyter_latex_envs and in jupyter_contrib_nbextensions (see [#1529](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/issues/1529).
-+- Update `install_requires` list in `setup.py` with 'nbconvert >=6.0' 
-+
- 0.5.1
- -----
- 
-diff -Naur jupyter_contrib_nbextensions.orig/setup.py jupyter_contrib_nbextensions/setup.py
---- jupyter_contrib_nbextensions.orig/setup.py	2020-11-22 12:43:10.325780000 +0100
-+++ jupyter_contrib_nbextensions/setup.py	2020-11-22 12:47:11.842264000 +0100
-@@ -67,7 +67,7 @@
-             'jupyter_highlight_selected_word >=0.1.1',
-             'jupyter_latex_envs >=1.3.8',
-             'jupyter_nbextensions_configurator >=0.4.0',
--            'nbconvert >=4.2',
-+            'nbconvert >=6.0',
-             'notebook >=4.0',
-             'pyyaml',
-             'tornado',
-@@ -81,7 +81,7 @@
-                 'pip',
-                 'requests',
-             ],
--            'test:python_version == "2.7"': [
-+            'test:python_version == "3.8"': [
-                 'mock',
-             ],
-         },
-diff -Naur jupyter_contrib_nbextensions.orig/src/jupyter_contrib_nbextensions/config_scripts/highlight_html_cfg.py jupyter_contrib_nbextensions/src/jupyter_contrib_nbextensions/config_scripts/highlight_html_cfg.py
---- jupyter_contrib_nbextensions.orig/src/jupyter_contrib_nbextensions/config_scripts/highlight_html_cfg.py	2020-11-22 12:43:10.330209000 +0100
-+++ jupyter_contrib_nbextensions/src/jupyter_contrib_nbextensions/config_scripts/highlight_html_cfg.py	2020-11-22 12:47:11.799365000 +0100
-@@ -7,7 +7,7 @@
- 
- c = get_config()  # noqa
- c.NbConvertApp.export_format = "html"
--c.Exporter.template_path = [
-+c.Exporter.template_paths = [
-     '.',
-     jupyter_contrib_nbextensions.nbconvert_support.templates_directory(),
-     os.path.join(jcnbe_dir, 'nbextensions', 'highlighter')
-diff -Naur jupyter_contrib_nbextensions.orig/src/jupyter_contrib_nbextensions/config_scripts/highlight_latex_cfg.py jupyter_contrib_nbextensions/src/jupyter_contrib_nbextensions/config_scripts/highlight_latex_cfg.py
---- jupyter_contrib_nbextensions.orig/src/jupyter_contrib_nbextensions/config_scripts/highlight_latex_cfg.py	2020-11-22 12:43:10.331124000 +0100
-+++ jupyter_contrib_nbextensions/src/jupyter_contrib_nbextensions/config_scripts/highlight_latex_cfg.py	2020-11-22 12:47:11.801863000 +0100
-@@ -7,7 +7,7 @@
- 
- c = get_config()  # noqa
- c.NbConvertApp.export_format = "latex"
--c.Exporter.template_path = [
-+c.Exporter.template_paths = [
-     '.',
-     jupyter_contrib_nbextensions.nbconvert_support.templates_directory(),
-     os.path.join(jcnbe_dir, 'nbextensions', 'highlighter')
-diff -Naur jupyter_contrib_nbextensions.orig/src/jupyter_contrib_nbextensions/install.py jupyter_contrib_nbextensions/src/jupyter_contrib_nbextensions/install.py
---- jupyter_contrib_nbextensions.orig/src/jupyter_contrib_nbextensions/install.py	2020-11-22 12:43:10.332127000 +0100
-+++ jupyter_contrib_nbextensions/src/jupyter_contrib_nbextensions/install.py	2020-11-22 12:47:11.804683000 +0100
-@@ -124,7 +124,7 @@
-     if logger:
-         logger.info('--  Configuring nbconvert template path')
-     # our templates directory
--    _update_config_list(config, 'Exporter.template_path', [
-+    _update_config_list(config, 'Exporter.template_paths', [
-         '.',
-         jupyter_contrib_nbextensions.nbconvert_support.templates_directory(),
-     ], install)
-diff -Naur jupyter_contrib_nbextensions.orig/src/jupyter_contrib_nbextensions/migrate.py jupyter_contrib_nbextensions/src/jupyter_contrib_nbextensions/migrate.py
---- jupyter_contrib_nbextensions.orig/src/jupyter_contrib_nbextensions/migrate.py	2020-11-22 12:43:10.333126000 +0100
-+++ jupyter_contrib_nbextensions/src/jupyter_contrib_nbextensions/migrate.py	2020-11-22 12:47:11.807881000 +0100
-@@ -128,7 +128,7 @@
-     config = Config(cm.get(config_basename))
-     if config and logger:
-         logger.info('- Removing old config values from {}'.format(config_path))
--    _update_config_list(config, 'Exporter.template_path', [
-+    _update_config_list(config, 'Exporter.template_paths', [
-         '.', os.path.join(jupyter_data_dir(), 'templates'),
-     ], False)
-     _update_config_list(config, 'Exporter.preprocessors', [
-diff -Naur jupyter_contrib_nbextensions.orig/src/jupyter_contrib_nbextensions/nbconvert_support/exporter_inliner.py jupyter_contrib_nbextensions/src/jupyter_contrib_nbextensions/nbconvert_support/exporter_inliner.py
---- jupyter_contrib_nbextensions.orig/src/jupyter_contrib_nbextensions/nbconvert_support/exporter_inliner.py	2020-11-22 12:43:10.337543000 +0100
-+++ jupyter_contrib_nbextensions/src/jupyter_contrib_nbextensions/nbconvert_support/exporter_inliner.py	2020-11-22 12:47:11.811491000 +0100
-@@ -39,8 +39,8 @@
-             templates_directory)
-         contrib_templates_dir = templates_directory()
- 
--        template_path = c.TemplateExporter.setdefault('template_path', [])
--        if contrib_templates_dir not in template_path:
--            template_path.append(contrib_templates_dir)
-+        template_paths = c.TemplateExporter.setdefault('template_paths', [])
-+        if contrib_templates_dir not in template_paths:
-+            template_paths.append(contrib_templates_dir)
- 
-         return c
-diff -Naur jupyter_contrib_nbextensions.orig/src/jupyter_contrib_nbextensions/nbconvert_support/toc2.py jupyter_contrib_nbextensions/src/jupyter_contrib_nbextensions/nbconvert_support/toc2.py
---- jupyter_contrib_nbextensions.orig/src/jupyter_contrib_nbextensions/nbconvert_support/toc2.py	2020-11-22 12:45:58.854592000 +0100
-+++ jupyter_contrib_nbextensions/src/jupyter_contrib_nbextensions/nbconvert_support/toc2.py	2020-11-22 12:47:11.814530000 +0100
-@@ -52,7 +52,7 @@
-             templates_directory)
-         c.merge(super(TocExporter, self).default_config)
- 
--        c.TemplateExporter.template_path = [
-+        c.TemplateExporter.template_paths = [
-             '.',
-             templates_directory(),
-         ]
-diff -Naur jupyter_contrib_nbextensions.orig/src/jupyter_contrib_nbextensions/nbextensions/runtools/readme.md jupyter_contrib_nbextensions/src/jupyter_contrib_nbextensions/nbextensions/runtools/readme.md
---- jupyter_contrib_nbextensions.orig/src/jupyter_contrib_nbextensions/nbextensions/runtools/readme.md	2020-11-22 12:43:10.871469000 +0100
-+++ jupyter_contrib_nbextensions/src/jupyter_contrib_nbextensions/nbextensions/runtools/readme.md	2020-11-22 12:47:11.816660000 +0100
-@@ -78,7 +78,7 @@
- ```
- 
- The template needs to be in a path where nbconvert can find it. This can be your local path or specified in 
--`jupyter_nbconvert_config` or `jupyter_notebook_config` as `c.Exporter.template_path`, see [Jupyter docs](https://jupyter-notebook.readthedocs.io/en/latest/config.html).
-+`jupyter_nbconvert_config` or `jupyter_notebook_config` as `c.Exporter.template_paths`, see [Jupyter docs](https://jupyter-notebook.readthedocs.io/en/latest/config.html).
- 
- For HTML export a template is provided as `nbextensions.tpl` in the `jupyter_contrib_nbextensions` templates directory. Alternatively you can create your own template:
- ```
diff --git a/Golden_Repo/j/Jupyter/jupyter_latex_envs-template_paths.patch b/Golden_Repo/j/Jupyter/jupyter_latex_envs-template_paths.patch
deleted file mode 100644
index 451f439ae..000000000
--- a/Golden_Repo/j/Jupyter/jupyter_latex_envs-template_paths.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Naur jupyter_latex_envs.orig/src/latex_envs/latex_envs.py jupyter_latex_envs/src/latex_envs/latex_envs.py
---- jupyter_latex_envs.orig/src/latex_envs/latex_envs.py	2020-11-22 17:04:43.617982112 +0100
-+++ jupyter_latex_envs/src/latex_envs/latex_envs.py	2020-11-22 17:05:35.063217000 +0100
-@@ -301,12 +301,12 @@
-         )
-         c.merge(super(LenvsHTMLExporter, self).default_config)
-         if os.path.isdir(os.path.join(os.path.dirname(__file__), 'templates')):
--            c.TemplateExporter.template_path = ['.',
-+            c.TemplateExporter.template_paths = ['.',
-                                                 os.path.join(os.path.dirname(__file__), 'templates')]
-         else:
-             from jupyter_contrib_nbextensions.nbconvert_support import (
-                 templates_directory)
--            c.TemplateExporter.template_path = ['.', templates_directory()]
-+            c.TemplateExporter.template_paths = ['.', templates_directory()]
- 
-         return c
- 
-@@ -364,12 +364,12 @@
-         )
-         c.merge(super(LenvsSlidesExporter, self).default_config)
-         if os.path.isdir(os.path.join(os.path.dirname(__file__), 'templates')):
--            c.TemplateExporter.template_path = ['.',
-+            c.TemplateExporter.template_paths = ['.',
-                                                 os.path.join(os.path.dirname(__file__), 'templates')]
-         else:
-             from jupyter_contrib_nbextensions.nbconvert_support import (
-                 templates_directory)
--            c.TemplateExporter.template_path = ['.', templates_directory()]
-+            c.TemplateExporter.template_paths = ['.', templates_directory()]
- 
-         return c
- 
-@@ -483,12 +483,12 @@
-         c.merge(super(LenvsLatexExporter, self).default_config)
- 
-         if os.path.isdir(os.path.join(os.path.dirname(__file__), 'templates')):
--            c.TemplateExporter.template_path = ['.',
-+            c.TemplateExporter.template_paths = ['.',
-                                                 os.path.join(os.path.dirname(__file__), 'templates')]
-         else:
-             from jupyter_contrib_nbextensions.nbconvert_support import (
-                 templates_directory)
--            c.TemplateExporter.template_path = ['.', templates_directory()]
-+            c.TemplateExporter.template_paths = ['.', templates_directory()]
-         return c
- 
-     def tocrefrm(self, text):
diff --git a/Golden_Repo/j/Jupyter/jupyterhub-1.1.0_logoutcookie-2.0.patch b/Golden_Repo/j/Jupyter/jupyterhub-1.1.0_logoutcookie-2.0.patch
deleted file mode 100644
index dc420a9b2..000000000
--- a/Golden_Repo/j/Jupyter/jupyterhub-1.1.0_logoutcookie-2.0.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-diff -Naur jupyterhub-1.1.0.orig/jupyterhub/services/auth.py jupyterhub-1.1.0/jupyterhub/services/auth.py
---- jupyterhub-1.1.0.orig/jupyterhub/services/auth.py	2019-12-03 10:13:48.000000000 +0100
-+++ jupyterhub-1.1.0/jupyterhub/services/auth.py	2020-12-23 08:24:38.868452725 +0100
-@@ -28,6 +28,7 @@
- from tornado.log import app_log
- from tornado.web import HTTPError
- from tornado.web import RequestHandler
-+from traitlets import Bool
- from traitlets import default
- from traitlets import Dict
- from traitlets import Instance
-@@ -191,6 +192,29 @@
-         """,
-     ).tag(config=True)
- 
-+    session_id_required = Bool(
-+        os.getenv('JUPYTERHUB_SESSION_ID_REQUIRED', 'false').lower()=="true",
-+        help="""
-+        Blocks any requests, if there's no jupyterhub-session-id cookie.
-+        """,
-+    ).tag(config=True)
-+
-+    session_id_required_user = Bool(
-+        os.getenv('JUPYTERHUB_SESSION_ID_REQUIRED_USER', 'false').lower()=="true",
-+        help="""
-+        Blocks any requests to /user, if there's no jupyterhub-session-id cookie.
-+        """,
-+    ).tag(config=True)
-+
-+    last_session_id_validation = 0
-+    last_session_id_validation_result = None
-+
-+    last_session_id_validation_cache_time = Integer(
-+        int(os.getenv('JUPYTERHUB_SESSION_ID_CACHE_TIME', "10")),
-+        help="""The maximum time (in seconds) to cache the Hub's responses for session_id verification. Default is 10.
-+        """,
-+    ).tag(config=True)
-+
-     hub_prefix = Unicode(
-         '/hub/',
-         help="""The URL prefix for the Hub itself.
-@@ -461,6 +485,18 @@
-         """
-         return handler.get_cookie('jupyterhub-session-id', '')
- 
-+    def validate_session_id(self, username, session_id):
-+        if time.time() - self.last_session_id_validation > self.last_session_id_validation_cache_time:
-+            self.last_session_id_validation = int(time.time())
-+            url = url_path_join(
-+                self.api_url, "authorizations/sessionid", quote(username, safe=''),
-+            )
-+            headers = {"sessionid": session_id}
-+            self.last_session_id_validation_result = self._api_request(
-+                'GET', url, allow_404=True, headers=headers
-+            )
-+        return self.last_session_id_validation_result
-+
-     def get_user(self, handler):
-         """Get the Hub user for a given tornado handler.
- 
-@@ -484,16 +520,33 @@
-         handler._cached_hub_user = user_model = None
-         session_id = self.get_session_id(handler)
- 
--        # check token first
--        token = self.get_token(handler)
--        if token:
--            user_model = self.user_for_token(token, session_id=session_id)
-+        if self.session_id_required and not session_id:
-+            app_log.info("Unauthorized access. Only users with a session id are allowed.")
-+            return {'name': '<session_id_required>', 'kind': 'User'}
-+        elif self.session_id_required_user and not session_id and handler.request.uri.startswith('/user'):
-+            app_log.info("Unauthorized access. Only users with a session id are allowed to access /user.")
-+            return {'name': '<session_id_required>', 'kind': 'User'}
-+        elif self.session_id_required or ( self.session_id_required_user and handler.request.uri.startswith('/user')):
-+            token = self.get_token(handler)
-+            if token:
-+                user_model = self.user_for_token(token)
-+                if user_model:
-+                    handler._token_authenticated = True
-+            if user_model is None:
-+                user_model = self._get_user_cookie(handler)
-             if user_model:
--                handler._token_authenticated = True
-+                user_model = self.validate_session_id(user_model.get('name', ''), session_id)
-+        else:
-+            # check token first
-+            token = self.get_token(handler)
-+            if token:
-+                user_model = self.user_for_token(token, session_id=session_id)
-+                if user_model:
-+                    handler._token_authenticated = True
- 
--        # no token, check cookie
--        if user_model is None:
--            user_model = self._get_user_cookie(handler)
-+            # no token, check cookie
-+            if user_model is None:
-+                user_model = self._get_user_cookie(handler)
- 
-         # cache result
-         handler._cached_hub_user = user_model
-@@ -904,10 +957,16 @@
-             # tries to redirect to login URL, 403 will be raised instead.
-             # This is not the best, but avoids problems that can be caused
-             # when get_current_user is allowed to raise.
--            def raise_on_redirect(*args, **kwargs):
--                raise HTTPError(
--                    403, "{kind} {name} is not allowed.".format(**user_model)
--                )
-+            if user_model.get('name', '') == '<session_id_required>':
-+                def raise_on_redirect(*args, **kwargs):
-+                    raise HTTPError(
-+                        401, "Please login to proceed."
-+                    )
-+            else:
-+                def raise_on_redirect(*args, **kwargs):
-+                    raise HTTPError(
-+                        403, "{kind} {name} is not allowed.".format(**user_model)
-+                    )
- 
-             self.redirect = raise_on_redirect
-             return
diff --git a/Golden_Repo/j/Jupyter/jupyterlab-gitlab-2.0.0_jsc.patch b/Golden_Repo/j/Jupyter/jupyterlab-gitlab-2.0.0_jsc.patch
deleted file mode 100644
index 26e4d34a3..000000000
--- a/Golden_Repo/j/Jupyter/jupyterlab-gitlab-2.0.0_jsc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff
---- jupyterlab-gitlab-2.0.0.orig/schema/drive.json    2019-05-02 08:22:45.219143000 +0200
-+++ jupyterlab-gitlab-2.0.0/schema/drive.json         2019-05-02 08:25:15.392631000 +0200
-@@ -6,8 +6,8 @@
-   "properties": {
-     "baseUrl": {
-       "type": "string",
--      "title": "The GitLab Base URL",
--      "default": "https://gitlab.com"
-+      "title": "JSC GitLab Base URL",
-+      "default": "https://gitlab.jsc.fz-juelich.de"
-     },
-     "accessToken": {
-       "type": "string",
-@@ -18,7 +18,7 @@
-     "defaultRepo": {
-       "type": "string",
-       "title": "Default Repository",
--      "default": ""
-+      "default": "jupyter4jsc/j4j_notebooks"
-     }
-   },
-   "type": "object"
diff --git a/Golden_Repo/j/Jupyter/jupyterlab-gitlab-widget3.patch b/Golden_Repo/j/Jupyter/jupyterlab-gitlab-widget3.patch
deleted file mode 100644
index ee720792b..000000000
--- a/Golden_Repo/j/Jupyter/jupyterlab-gitlab-widget3.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Naur jupyterlabgitlab.orig/jupyterlab-gitlab-jupyterlab-3/src/browser.ts jupyterlabgitlab/jupyterlab-gitlab-jupyterlab-3/src/browser.ts
---- jupyterlabgitlab.orig/jupyterlab-gitlab-jupyterlab-3/src/browser.ts	2021-03-01 22:09:06.000000000 +0100
-+++ jupyterlabgitlab/jupyterlab-gitlab-jupyterlab-3/src/browser.ts	2021-08-18 09:03:59.611953578 +0200
-@@ -107,7 +107,7 @@
-       // appears to revert to document.body. If the user has subsequently
-       // focused another element, don't focus the browser listing.
-       if (document.activeElement === document.body) {
--        const listing = (this._browser.layout as PanelLayout).widgets[2];
-+        const listing = (this._browser.layout as PanelLayout).widgets[3];
-         listing.node.focus();
-       }
-     });
-@@ -146,7 +146,7 @@
- 
-     // If we currently have an error panel, remove it.
-     if (this._errorPanel) {
--      const listing = (this._browser.layout as PanelLayout).widgets[2];
-+      const listing = (this._browser.layout as PanelLayout).widgets[3];
-       listing.node.removeChild(this._errorPanel.node);
-       this._errorPanel.dispose();
-       this._errorPanel = null;
-@@ -159,7 +159,7 @@
-           'You will need to wait about an hour before ' +
-           'continuing'
-       );
--      const listing = (this._browser.layout as PanelLayout).widgets[2];
-+      const listing = (this._browser.layout as PanelLayout).widgets[3];
-       listing.node.appendChild(this._errorPanel.node);
-       return;
-     }
-@@ -170,7 +170,7 @@
-         ? `"${resource.user}" appears to be an invalid user name!`
-         : 'Please enter a GitLab user name';
-       this._errorPanel = new GitLabErrorPanel(message);
--      const listing = (this._browser.layout as PanelLayout).widgets[2];
-+      const listing = (this._browser.layout as PanelLayout).widgets[3];
-       listing.node.appendChild(this._errorPanel.node);
-       return;
-     }
diff --git a/Golden_Repo/j/Jupyter/jupyterlab-s3-browser_pr86_s3v2.patch b/Golden_Repo/j/Jupyter/jupyterlab-s3-browser_pr86_s3v2.patch
deleted file mode 100644
index 1b050fb96..000000000
--- a/Golden_Repo/j/Jupyter/jupyterlab-s3-browser_pr86_s3v2.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From ceb148c0e7af29e8b18ae6f6f17d080b4aed7196 Mon Sep 17 00:00:00 2001
-From: Tom Ridley <ridley2@jsfl05.jusuf>
-Date: Fri, 22 Jul 2022 16:57:10 +0200
-Subject: [PATCH 1/2] Added signature version variable and try/except behaviour
- to account for older S3 interfaces
-
----
- jupyterlab_s3_browser/__init__.py |  6 ++++++
- jupyterlab_s3_browser/handlers.py | 28 +++++++++++++++++++++++++++-
- 2 files changed, 33 insertions(+), 1 deletion(-)
-
-diff --git a/jupyterlab_s3_browser/__init__.py b/jupyterlab_s3_browser/__init__.py
-index 9d56a88..ebb06ec 100755
---- a/jupyterlab_s3_browser/__init__.py
-+++ b/jupyterlab_s3_browser/__init__.py
-@@ -45,6 +45,12 @@ class JupyterLabS3(Configurable):
-         config=True,
-         help="(Optional) Token if you use STS as auth method",
-     )
-+    
-+    signature_version = Unicode(
-+        default_value="",
-+        config=True,
-+        help="Signature version variable to support older S3 interfaces",
-+    )
- 
- 
- def _load_jupyter_server_extension(server_app):
-diff --git a/jupyterlab_s3_browser/handlers.py b/jupyterlab_s3_browser/handlers.py
-index a611be7..b9494c6 100644
---- a/jupyterlab_s3_browser/handlers.py
-+++ b/jupyterlab_s3_browser/handlers.py
-@@ -8,6 +8,8 @@
- import boto3
- import tornado
- from botocore.exceptions import NoCredentialsError
-+from botocore.exceptions import ClientError
-+from botocore.client import Config
- from jupyter_server.base.handlers import APIHandler
- from jupyter_server.utils import url_path_join
- from pathlib import Path
-@@ -28,6 +30,7 @@ def create_s3fs(config):
-             secret=config.client_secret,
-             token=config.session_token,
-             client_kwargs={"endpoint_url": config.endpoint_url},
-+            config_kwargs={'signature_version': config.signature_version},
-         )
- 
-     else:
-@@ -43,6 +46,7 @@ def create_s3_resource(config):
-             aws_secret_access_key=config.client_secret,
-             aws_session_token=config.session_token,
-             endpoint_url=config.endpoint_url,
-+            config=Config(signature_version=config.signature_version)
-         )
- 
-     else:
-@@ -107,6 +111,7 @@ def test_s3_credentials(endpoint_url, client_id, client_secret, session_token):
-         aws_secret_access_key=client_secret,
-         endpoint_url=endpoint_url,
-         aws_session_token=session_token,
-+        config=Config(signature_version=signature_version),
-     )
-     all_buckets = test.buckets.all()
-     logging.debug(
-@@ -146,6 +151,7 @@ def get(self, path=""):
-                         config.client_id,
-                         config.client_secret,
-                         config.session_token,
-+                        config.signature_version
-                     )
-                     logging.debug("...successfully authenticated")
- 
-@@ -174,14 +180,34 @@ def post(self, path=""):
-             client_id = req["client_id"]
-             client_secret = req["client_secret"]
-             session_token = req["session_token"]
-+            signature_version = 's3v4'
- 
--            test_s3_credentials(endpoint_url, client_id, client_secret, session_token)
-+            test_s3_credentials(endpoint_url, client_id, client_secret, session_token, signature_version)
- 
-             self.config.endpoint_url = endpoint_url
-             self.config.client_id = client_id
-             self.config.client_secret = client_secret
-             self.config.session_token = session_token
-+            self.config.signature_version = signature_version
- 
-+            self.finish(json.dumps({"success": True}))
-+        except ClientError as pe:
-+            req = json.loads(self.request.body)
-+            endpoint_url = req["endpoint_url"]
-+            client_id = req["client_id"]
-+            client_secret = req["client_secret"]
-+            session_token = req["session_token"]
-+            signature_version = 's3'
-+
-+            test_s3_credentials(endpoint_url, client_id, client_secret, session_token,signature_version)
-+
-+            self.config.endpoint_url = endpoint_url
-+            self.config.client_id = client_id
-+            self.config.client_secret = client_secret
-+            self.config.session_token = session_token
-+            self.config.signature_version = signature_version
-+            
-+            logging.info("authenticated with s3 credentials signature_version")
-             self.finish(json.dumps({"success": True}))
-         except Exception as err:
-             logging.info("unable to authenticate using credentials")
-
-From 73770b0eaf865a52fe100d705796407e4bbd8af9 Mon Sep 17 00:00:00 2001
-From: tktridley <77678086+tktridley@users.noreply.github.com>
-Date: Wed, 27 Jul 2022 10:56:26 +0200
-Subject: [PATCH 2/2] Update handlers.py
-
-Fixed function definition
----
- jupyterlab_s3_browser/handlers.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/jupyterlab_s3_browser/handlers.py b/jupyterlab_s3_browser/handlers.py
-index b9494c6..301ff7b 100644
---- a/jupyterlab_s3_browser/handlers.py
-+++ b/jupyterlab_s3_browser/handlers.py
-@@ -100,7 +100,7 @@ def has_aws_s3_role_access():
-         return False
- 
- 
--def test_s3_credentials(endpoint_url, client_id, client_secret, session_token):
-+def test_s3_credentials(endpoint_url, client_id, client_secret, session_token, signature_version):
-     """
-     Checks if we're able to list buckets with these credentials.
-     If not, it throws an exception.
diff --git a/Golden_Repo/j/Jupyter/jupyterlab_github-2.0.0_jsc.patch b/Golden_Repo/j/Jupyter/jupyterlab_github-2.0.0_jsc.patch
deleted file mode 100644
index ebee87027..000000000
--- a/Golden_Repo/j/Jupyter/jupyterlab_github-2.0.0_jsc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff
---- jupyterlab-github-2.0.0.orig/schema/drive.json     2018-10-10 21:14:53.986184891 +0200
-+++ jupyterlab_github-2.0.0/schema/drive.json          2018-10-11 00:28:34.846777384 +0200
-@@ -18,7 +18,7 @@
-     "defaultRepo": {
-       "type": "string",
-       "title": "Default Repository",
--      "default": ""
-+      "default": "FZJ-JSC/jupyter-jsc-notebooks"
-     }
-   },
-   "type": "object"
-
diff --git a/Golden_Repo/j/Jupyter/jupyterlab_i7081_retry503.patch b/Golden_Repo/j/Jupyter/jupyterlab_i7081_retry503.patch
deleted file mode 100644
index a86cbd50d..000000000
--- a/Golden_Repo/j/Jupyter/jupyterlab_i7081_retry503.patch
+++ /dev/null
@@ -1,232 +0,0 @@
-diff -Naurx jupyterlab.orig/jupyterlab/packages/services/src/kernel/default.ts jupyterlab/jupyterlab/packages/services/src/kernel/default.ts
---- jupyterlab.orig/jupyterlab-3.4.5/packages/services/src/kernel/default.ts	2022-08-29 14:11:12.227222014 +0200
-+++ jupyterlab/jupyterlab-3.4.5/packages/services/src/kernel/default.ts	2022-08-29 14:36:33.747237205 +0200
-@@ -1274,29 +1274,38 @@
-       }
-       this._reason = '';
-       this._model = undefined;
--      try {
--        const model = await restapi.getKernelModel(this._id, settings);
--        this._model = model;
--        if (model?.execution_state === 'dead') {
--          this._updateStatus('dead');
--        } else {
--          this._onWSClose(evt);
--        }
--      } catch (err) {
--        // Try again, if there is a network failure
--        // Handle network errors, as well as cases where we are on a
--        // JupyterHub and the server is not running. JupyterHub returns a
--        // 503 (<2.0) or 424 (>2.0) in that case.
--        if (
--          err instanceof ServerConnection.NetworkError ||
--          err.response?.status === 503 ||
--          err.response?.status === 424
--        ) {
--          const timeout = Private.getRandomIntInclusive(10, 30) * 1e3;
--          setTimeout(getKernelModel, timeout, evt);
--        } else {
--          this._reason = 'Kernel died unexpectedly';
--          this._updateStatus('dead');
-+      
-+      for (let _retryAttempt = 1; _retryAttempt <= this._retryLimit ; _retryAttempt++) {
-+        try {
-+          const model = await restapi.getKernelModel(this._id, settings);
-+          this._model = model;
-+          if (model?.execution_state === 'dead') {
-+            this._updateStatus('dead');
-+          } else {
-+            this._onWSClose(evt);
-+          }
-+          break;
-+        } catch (err) {
-+          if (_retryAttempt >= this._retryLimit) {
-+            // Try again, if there is a network failure
-+            // Handle network errors, as well as cases where we are on a
-+            // JupyterHub and the server is not running. JupyterHub returns a
-+            // 503 (<2.0) or 424 (>2.0) in that case.
-+            if (
-+              err instanceof ServerConnection.NetworkError ||
-+              err.response?.status === 503 ||
-+              err.response?.status === 424
-+            ) {
-+              const timeout = Private.getRandomIntInclusive(10, 30) * 1e3;
-+              setTimeout(getKernelModel, timeout, evt);
-+            } else {
-+              this._reason = 'Kernel died unexpectedly';
-+              this._updateStatus('dead');
-+            }
-+          } else {
-+            console.log("Caught bad kernelmodel request - Try again in " + (_retryAttempt * 1000) + "seconds.");
-+            await new Promise(resolve => setTimeout(resolve, _retryAttempt * 1000));
-+          }
-         }
-       }
-       return;
-@@ -1641,6 +1650,7 @@
-   private _noOp = () => {
-     /* no-op */
-   };
-+  private _retryLimit = 10;
- }
- 
- /**
-diff -Naurx .git -x node_modules -x share -x __pycache__ ../jupyterlab/jupyterlab/packages/services/src/kernel/manager.ts ../jupyterlab-patched/jupyterlab/packages/services/src/kernel/manager.ts
---- jupyterlab/jupyterlab/packages/services/src/kernel/manager.ts	2022-08-29 14:11:12.227222014 +0200
-+++ jupyterlab-patched/jupyterlab/packages/services/src/kernel/manager.ts	2022-08-29 14:31:00.477233878 +0200
-@@ -236,22 +236,29 @@
-    */
-   protected async requestRunning(): Promise<void> {
-     let models: Kernel.IModel[];
--    try {
--      models = await listRunning(this.serverSettings);
--    } catch (err) {
--      // Handle network errors, as well as cases where we are on a
--      // JupyterHub and the server is not running. JupyterHub returns a
--      // 503 (<2.0) or 424 (>2.0) in that case.
--      if (
--        err instanceof ServerConnection.NetworkError ||
--        err.response?.status === 503 ||
--        err.response?.status === 424
--      ) {
--        this._connectionFailure.emit(err);
-+    for (let _retryAttempt = 1; _retryAttempt <= this._retryLimit ; _retryAttempt++) {
-+      try {
-+        models = await listRunning(this.serverSettings);
-+        break;
-+      } catch (err) {
-+        if (_retryAttempt >= this._retryLimit) {
-+          // Handle network errors, as well as cases where we are on a
-+          // JupyterHub and the server is not running. JupyterHub returns a
-+          // 503 (<2.0) or 424 (>2.0) in that case.
-+          if (
-+            err instanceof ServerConnection.NetworkError ||
-+            err.response?.status === 503 ||
-+            err.response?.status === 424
-+          ) {
-+            this._connectionFailure.emit(err);
-+          }
-+          throw err;
-+        } else {
-+          console.log("Caught bad kernel request - Try again in " + (_retryAttempt * 1000) + "seconds.");
-+          await new Promise(resolve => setTimeout(resolve, _retryAttempt * 1000));
-+        }
-       }
--      throw err;
-     }
--
-     if (this.isDisposed) {
-       return;
-     }
-@@ -326,6 +333,7 @@
-   private _pollModels: Poll;
-   private _runningChanged = new Signal<this, Kernel.IModel[]>(this);
-   private _connectionFailure = new Signal<this, Error>(this);
-+  private _retryLimit = 10;
- }
- 
- /**
-diff -Naurx .git -x node_modules -x share -x __pycache__ ../jupyterlab/jupyterlab/packages/services/src/session/manager.ts ../jupyterlab-patched/jupyterlab/packages/services/src/session/manager.ts
---- jupyterlab/jupyterlab/packages/services/src/session/manager.ts	2022-08-29 14:11:12.227222014 +0200
-+++ jupyterlab-patched/jupyterlab/packages/services/src/session/manager.ts	2022-08-29 14:31:42.487234297 +0200
-@@ -246,20 +246,28 @@
-    */
-   protected async requestRunning(): Promise<void> {
-     let models: Session.IModel[];
--    try {
--      models = await listRunning(this.serverSettings);
--    } catch (err) {
--      // Handle network errors, as well as cases where we are on a
--      // JupyterHub and the server is not running. JupyterHub returns a
--      // 503 (<2.0) or 424 (>2.0) in that case.
--      if (
--        err instanceof ServerConnection.NetworkError ||
--        err.response?.status === 503 ||
--        err.response?.status === 424
--      ) {
--        this._connectionFailure.emit(err);
-+    for (let _retryAttempt = 1; _retryAttempt <= this._retryLimit ; _retryAttempt++) {
-+      try {
-+        models = await listRunning(this.serverSettings);
-+        break;
-+      } catch (err) {
-+        if (_retryAttempt >= this._retryLimit) {
-+          // Handle network errors, as well as cases where we are on a
-+          // JupyterHub and the server is not running. JupyterHub returns a
-+          // 503 (<2.0) or 424 (>2.0) in that case.
-+          if (
-+            err instanceof ServerConnection.NetworkError ||
-+            err.response?.status === 503 ||
-+            err.response?.status === 424
-+          ) {
-+            this._connectionFailure.emit(err);
-+          }
-+          throw err;
-+        } else {
-+          console.log("Caught bad session request - Try again in " + (_retryAttempt * 1000) + "seconds.");
-+          await new Promise(resolve => setTimeout(resolve, _retryAttempt * 1000));
-+        }
-       }
--      throw err;
-     }
- 
-     if (this.isDisposed) {
-@@ -335,6 +343,7 @@
-   private _ready: Promise<void>;
-   private _runningChanged = new Signal<this, Session.IModel[]>(this);
-   private _connectionFailure = new Signal<this, Error>(this);
-+  private _retryLimit = 10;
- 
-   // We define these here so they bind `this` correctly
-   private readonly _connectToKernel = (
-diff -Naurx .git -x node_modules -x share -x __pycache__ ../jupyterlab/jupyterlab/packages/services/src/terminal/manager.ts ../jupyterlab-patched/jupyterlab/packages/services/src/terminal/manager.ts
---- jupyterlab/jupyterlab/packages/services/src/terminal/manager.ts	2022-08-29 14:11:12.227222014 +0200
-+++ jupyterlab-patched/jupyterlab/packages/services/src/terminal/manager.ts	2022-08-29 14:33:54.457235615 +0200
-@@ -215,20 +215,28 @@
-    */
-   protected async requestRunning(): Promise<void> {
-     let models: Terminal.IModel[];
--    try {
--      models = await listRunning(this.serverSettings);
--    } catch (err) {
--      // Handle network errors, as well as cases where we are on a
--      // JupyterHub and the server is not running. JupyterHub returns a
--      // 503 (<2.0) or 424 (>2.0) in that case.
--      if (
--        err instanceof ServerConnection.NetworkError ||
--        err.response?.status === 503 ||
--        err.response?.status === 424
--      ) {
--        this._connectionFailure.emit(err);
-+    for (let _retryAttempt = 1; _retryAttempt <= this._retryLimit ; _retryAttempt++) {
-+      try {
-+        models = await listRunning(this.serverSettings);
-+        break;
-+      } catch (err) {
-+        if (_retryAttempt >= this._retryLimit) {
-+          // Handle network errors, as well as cases where we are on a
-+          // JupyterHub and the server is not running. JupyterHub returns a
-+          // 503 (<2.0) or 424 (>2.0) in that case.
-+          if (
-+            err instanceof ServerConnection.NetworkError ||
-+            err.response?.status === 503 ||
-+            err.response?.status === 424
-+          ) {
-+            this._connectionFailure.emit(err);
-+          }
-+          throw err;
-+        } else {
-+          console.log("Caught bad terminal request - Try again in " + (_retryAttempt * 1000) + "seconds.");
-+          await new Promise(resolve => setTimeout(resolve, _retryAttempt * 1000));
-+        }
-       }
--      throw err;
-     }
- 
-     if (this.isDisposed) {
-@@ -284,6 +292,7 @@
-   private _ready: Promise<void>;
-   private _runningChanged = new Signal<this, Terminal.IModel[]>(this);
-   private _connectionFailure = new Signal<this, Error>(this);
-+  private _retryLimit = 10;
- }
diff --git a/Golden_Repo/j/Jupyter/jupyterlmod-packagejson.patch b/Golden_Repo/j/Jupyter/jupyterlmod-packagejson.patch
deleted file mode 100644
index 0d166fec2..000000000
--- a/Golden_Repo/j/Jupyter/jupyterlmod-packagejson.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur jupyter-lmod-2.0.2.orig/jupyterlab/package.json jupyter-lmod-2.0.2/jupyterlab/package.json
---- jupyter-lmod-2.0.2.orig/jupyterlab/package.json	2020-11-25 16:19:57.000000000 +0100
-+++ jupyter-lmod-2.0.2/jupyterlab/package.json	2020-12-29 16:50:58.803504000 +0100
-@@ -31,10 +31,12 @@
-     "prepare": "npm run clean && npm run build"
-   },
-   "dependencies": {
--    "@jupyterlab/application": ">=2.0.0",
-+    "@jupyterlab/application": "^2.0.0",
-+    "@jupyterlab/apputils": "^2.1.0",
-     "@jupyterlab/launcher": "^2.1.0"
-   },
-   "devDependencies": {
-+    "@types/react": "^16.9.16",
-     "rimraf": "~2.6.2",
-     "typescript": "~3.7.3"
-   },
diff --git a/Golden_Repo/j/Jupyter/jupyterlmod-urlfile.patch b/Golden_Repo/j/Jupyter/jupyterlmod-urlfile.patch
deleted file mode 100644
index 0b56aa3e3..000000000
--- a/Golden_Repo/j/Jupyter/jupyterlmod-urlfile.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Naur jupyter-lmod-2.0.1/jupyterlab/src/index.ts jupyter-lmod-2.0.1_devel/jupyterlab/src/index.ts
---- jupyter-lmod-2.0.1/jupyterlab/src/index.ts	2020-10-05 17:08:01.000000000 +0200
-+++ jupyter-lmod-2.0.1_devel/jupyterlab/src/index.ts	2020-11-25 11:55:24.000000000 +0100
-@@ -244,7 +244,13 @@
-   const namespace = 'server-proxy';
-   const command = namespace + ':' + 'open';
-   for (let server_process of data.server_processes) {
--    const url = PageConfig.getBaseUrl() + server_process.name + '/';
-+
-+    let urlfile = '';
-+    if (server_process.launcher_entry.urlfile) {
-+       urlfile =  server_process.launcher_entry.urlfile;
-+    }
-+    const url = PageConfig.getBaseUrl() + server_process.name + '/' + urlfile;
-+    
-     const title = server_process.launcher_entry.title;
-     const newBrowserTab = server_process.new_browser_tab;
-     const id = namespace + ':' + server_process.name;
-diff -Naur jupyter-lmod-2.0.1/jupyterlmod/static/main.js jupyter-lmod-2.0.1_devel/jupyterlmod/static/main.js
---- jupyter-lmod-2.0.1/jupyterlmod/static/main.js	2020-10-05 17:08:01.000000000 +0200
-+++ jupyter-lmod-2.0.1_devel/jupyterlmod/static/main.js	2020-11-25 11:55:24.000000000 +0100
-@@ -316,10 +316,14 @@
-                 .addClass('new-' + server_process.name);
- 
-             /* create our list item's link */
-+            let urlfile = '';
-+            if (server_process.launcher_entry.urlfile) {
-+                urlfile =  server_process.launcher_entry.urlfile;
-+            }
-             let entry_link = $('<a>')
-                 .attr('role', 'menuitem')
-                 .attr('tabindex', '-1')
--                .attr('href', base_url + server_process.name + '/')
-+                .attr('href', base_url + server_process.name + '/' + urlfile)
-                 .attr('target', '_blank')
-                 .text(server_process.launcher_entry.title);
- 
diff --git a/Golden_Repo/j/Jupyter/jupyterserverproxy-urlfile.patch b/Golden_Repo/j/Jupyter/jupyterserverproxy-urlfile.patch
deleted file mode 100644
index de8835614..000000000
--- a/Golden_Repo/j/Jupyter/jupyterserverproxy-urlfile.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff -Naur jupyter-server-proxy.orig/jupyterlab-server-proxy/src/index.ts jupyter-server-proxy/jupyterlab-server-proxy/src/index.ts
---- jupyter-server-proxy.orig/jupyterlab-server-proxy/src/index.ts	2020-11-19 06:40:34.521630000 +0100
-+++ jupyter-server-proxy/jupyterlab-server-proxy/src/index.ts	2020-11-19 06:41:35.023864000 +0100
-@@ -79,8 +79,11 @@
-     if (!server_process.launcher_entry.enabled) {
-       continue;
-     }
--
--    const url = PageConfig.getBaseUrl() + server_process.name + '/';
-+    var urlfile = '';
-+    if (server_process.launcher_entry.urlfile) {
-+       urlfile =  server_process.launcher_entry.urlfile;
-+    }
-+    const url = PageConfig.getBaseUrl() + server_process.name + '/' + urlfile;
-     const title = server_process.launcher_entry.title;
-     const newBrowserTab = server_process.new_browser_tab;
-     const id = namespace + ':' + server_process.name;
-diff -Naur jupyter-server-proxy.orig/jupyter_server_proxy/api.py jupyter-server-proxy/jupyter_server_proxy/api.py
---- jupyter-server-proxy.orig/jupyter_server_proxy/api.py	2020-11-19 06:40:34.516286000 +0100
-+++ jupyter-server-proxy/jupyter_server_proxy/api.py	2020-11-19 06:41:35.015090000 +0100
-@@ -19,7 +19,8 @@
-                 'name': sp.name,
-                 'launcher_entry': {
-                     'enabled': sp.launcher_entry.enabled,
--                    'title': sp.launcher_entry.title
-+                    'title': sp.launcher_entry.title,
-+                    'urlfile': sp.launcher_entry.urlfile,
-                 },
-                 'new_browser_tab' : sp.new_browser_tab
-             }
-diff -Naur jupyter-server-proxy.orig/jupyter_server_proxy/config.py jupyter-server-proxy/jupyter_server_proxy/config.py
---- jupyter-server-proxy.orig/jupyter_server_proxy/config.py	2020-11-19 06:40:34.516753000 +0100
-+++ jupyter-server-proxy/jupyter_server_proxy/config.py	2020-11-19 06:41:35.016181000 +0100
-@@ -99,7 +99,7 @@
-         ))
-     return handlers
- 
--LauncherEntry = namedtuple('LauncherEntry', ['enabled', 'icon_path', 'title'])
-+LauncherEntry = namedtuple('LauncherEntry', ['enabled', 'icon_path', 'title', 'urlfile'])
- ServerProcess = namedtuple('ServerProcess', [
-     'name', 'command', 'environment', 'timeout', 'absolute_url', 'port', 'mappath', 'launcher_entry', 'new_browser_tab'])
- 
-@@ -116,7 +116,8 @@
-         launcher_entry=LauncherEntry(
-             enabled=le.get('enabled', True),
-             icon_path=le.get('icon_path'),
--            title=le.get('title', name)
-+            title=le.get('title', name),
-+            urlfile=le.get('urlfile', ''),
-         ),
-         new_browser_tab=server_process_config.get('new_browser_tab', True)
-     )
-@@ -175,6 +176,10 @@
-             title
-               Title to be used for the launcher entry. Defaults to the name of the server if missing.
- 
-+            urlfile
-+              URL file name and URL parameters to be added to the base URL of the launcher entry.
-+              Default is none.
-+
-           new_browser_tab
-             Set to True (default) to make the proxied server interface opened as a new browser tab. Set to False
-             to have it open a new JupyterLab tab. This has no effect in classic notebook.
-diff -Naur jupyter-server-proxy.orig/jupyter_server_proxy/static/tree.js jupyter-server-proxy/jupyter_server_proxy/static/tree.js
---- jupyter-server-proxy.orig/jupyter_server_proxy/static/tree.js	2020-11-19 06:40:34.519694000 +0100
-+++ jupyter-server-proxy/jupyter_server_proxy/static/tree.js	2020-11-19 06:41:35.020051000 +0100
-@@ -33,10 +33,14 @@
-                     .addClass('new-' + server_process.name);
- 
-                 /* create our list item's link */
-+                var urlfile = '';
-+                if (server_process.launcher_entry.urlfile) {
-+                    urlfile =  server_process.launcher_entry.urlfile;
-+                }
-                 var $entry_link = $('<a>')
-                     .attr('role', 'menuitem')
-                     .attr('tabindex', '-1')
--                    .attr('href', base_url + server_process.name + '/')
-+                    .attr('href', base_url + server_process.name + '/' + urlfile)
-                     .attr('target', '_blank')
-                     .text(server_process.launcher_entry.title);
- 
diff --git a/Golden_Repo/j/Jupyter/jupyterserverproxy-urlfile3.patch b/Golden_Repo/j/Jupyter/jupyterserverproxy-urlfile3.patch
deleted file mode 100644
index dee6665c4..000000000
--- a/Golden_Repo/j/Jupyter/jupyterserverproxy-urlfile3.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff -Naur jupyter-server-proxy.orig/jupyterlab-server-proxy/src/index.ts jupyter-server-proxy/jupyterlab-server-proxy/src/index.ts
---- jupyter-server-proxy.orig/jupyterlab-server-proxy/src/index.ts	2021-08-16 19:38:33.440690000 +0200
-+++ jupyter-server-proxy/jupyterlab-server-proxy/src/index.ts	2021-08-16 19:11:07.061678000 +0200
-@@ -79,8 +79,11 @@
-     if (!server_process.launcher_entry.enabled) {
-       continue;
-     }
--
--    const url = PageConfig.getBaseUrl() + server_process.name + '/';
-+    var urlfile = '';
-+    if (server_process.launcher_entry.urlfile) {
-+       urlfile =  server_process.launcher_entry.urlfile;
-+    }
-+    const url = PageConfig.getBaseUrl() + server_process.name + '/' + urlfile;
-     const title = server_process.launcher_entry.title;
-     const newBrowserTab = server_process.new_browser_tab;
-     const id = namespace + ':' + server_process.name;
-diff -Naur jupyter-server-proxy.orig/jupyter_server_proxy/api.py jupyter-server-proxy/jupyter_server_proxy/api.py
---- jupyter-server-proxy.orig/jupyter_server_proxy/api.py	2021-08-16 19:38:33.426478000 +0200
-+++ jupyter-server-proxy/jupyter_server_proxy/api.py	2021-08-16 19:27:14.875158000 +0200
-@@ -20,7 +20,8 @@
-                 'launcher_entry': {
-                     'enabled': sp.launcher_entry.enabled,
-                     'title': sp.launcher_entry.title,
--                    'path_info': sp.launcher_entry.path_info
-+                    'path_info': sp.launcher_entry.path_info,
-+                    'urlfile': sp.launcher_entry.urlfile
-                 },
-                 'new_browser_tab' : sp.new_browser_tab
-             }
-diff -Naur jupyter-server-proxy.orig/jupyter_server_proxy/config.py jupyter-server-proxy/jupyter_server_proxy/config.py
---- jupyter-server-proxy.orig/jupyter_server_proxy/config.py	2021-08-16 19:38:33.427114000 +0200
-+++ jupyter-server-proxy/jupyter_server_proxy/config.py	2021-08-16 19:28:19.426005625 +0200
-@@ -106,7 +106,7 @@
-         ))
-     return handlers
- 
--LauncherEntry = namedtuple('LauncherEntry', ['enabled', 'icon_path', 'title', 'path_info'])
-+LauncherEntry = namedtuple('LauncherEntry', ['enabled', 'icon_path', 'title', 'path_info', 'urlfile'])
- ServerProcess = namedtuple('ServerProcess', [
-     'name', 'command', 'environment', 'timeout', 'absolute_url', 'port', 'mappath', 'launcher_entry', 'new_browser_tab', 'request_headers_override'])
- 
-@@ -124,7 +124,8 @@
-             enabled=le.get('enabled', True),
-             icon_path=le.get('icon_path'),
-             title=le.get('title', name),
--            path_info=le.get('path_info', name + "/")
-+            path_info=le.get('path_info', name + "/"),
-+            urlfile=le.get('urlfile', '')
-         ),
-         new_browser_tab=server_process_config.get('new_browser_tab', True),
-         request_headers_override=server_process_config.get('request_headers_override', {})
-@@ -184,6 +185,10 @@
-             title
-               Title to be used for the launcher entry. Defaults to the name of the server if missing.
- 
-+            urlfile
-+              URL file name and URL parameters to be added to the base URL of the launcher entry.
-+              Default is none.
-+
-           new_browser_tab
-             Set to True (default) to make the proxied server interface opened as a new browser tab. Set to False
-             to have it open a new JupyterLab tab. This has no effect in classic notebook.
-diff -Naur jupyter-server-proxy.orig/jupyter_server_proxy/static/tree.js jupyter-server-proxy/jupyter_server_proxy/static/tree.js
---- jupyter-server-proxy.orig/jupyter_server_proxy/static/tree.js	2021-08-16 19:38:33.434248000 +0200
-+++ jupyter-server-proxy/jupyter_server_proxy/static/tree.js	2021-08-16 19:20:16.484639000 +0200
-@@ -33,10 +33,14 @@
-                     .addClass('new-' + server_process.name);
- 
-                 /* create our list item's link */
-+                var urlfile = '';
-+                if (server_process.launcher_entry.urlfile) {
-+                    urlfile =  server_process.launcher_entry.urlfile;
-+                }
-                 var $entry_link = $('<a>')
-                     .attr('role', 'menuitem')
-                     .attr('tabindex', '-1')
--                    .attr('href', base_url + server_process.launcher_entry.path_info)
-+                    .attr('href', base_url + server_process.launcher_entry.path_info + urlfile)
-                     .attr('target', '_blank')
-                     .text(server_process.launcher_entry.title);
- 
diff --git a/Golden_Repo/j/Jupyter/nbdev_noqtconsole.patch b/Golden_Repo/j/Jupyter/nbdev_noqtconsole.patch
deleted file mode 100644
index aa8a92bf3..000000000
--- a/Golden_Repo/j/Jupyter/nbdev_noqtconsole.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur nbdev-1.2.5.orig/settings.ini nbdev-1.2.5/settings.ini
---- nbdev-1.2.5.orig/settings.ini	2022-03-31 05:48:42.000000000 +0200
-+++ nbdev-1.2.5/settings.ini	2022-04-08 22:11:30.666026608 +0200
-@@ -15,7 +15,7 @@
- min_python = 3.7
- audience = Developers
- language = English
--requirements = fastcore>=1.4.1 nbformat>=4.4.0 nbconvert>=6.1 pyyaml jupyter jupyter_client<8 ipykernel ghapi fastrelease Jinja2<3.1.0
-+requirements = fastcore>=1.4.1 nbformat>=4.4.0 nbconvert>=6.1 pyyaml notebook jupyter-console nbconvert ipykernel ipywidgets jupyter_client<8 ipykernel ghapi fastrelease Jinja2<3.1.0
- console_scripts = nbdev_build_lib=nbdev.export2html:nbdev_build_lib
- 	nbdev_update_lib=nbdev.sync:nbdev_update_lib
- 	nbdev_diff_nbs=nbdev.sync:nbdev_diff_nbs
diff --git a/Golden_Repo/j/Jupyter/notebook-6.0.3_jsc.patch b/Golden_Repo/j/Jupyter/notebook-6.0.3_jsc.patch
deleted file mode 100644
index d7a9bb20d..000000000
--- a/Golden_Repo/j/Jupyter/notebook-6.0.3_jsc.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-diff
---- notebook-6.0.3.orig/notebook/services/contents/filecheckpoints.py   2020-04-28 06:26:51.384296390 +0200
-+++ notebook-6.0.3/notebook/services/contents/filecheckpoints.py        2020-04-28 06:30:55.139342947 +0200
-@@ -14,7 +14,7 @@
- 
- from jupyter_core.utils import ensure_dir_exists
- from ipython_genutils.py3compat import getcwd
--from traitlets import Unicode
-+from traitlets import Unicode, Integer
- 
- from notebook import _tz as tz
- 
-@@ -28,6 +28,35 @@
-     you want file-based checkpoints with another ContentsManager.
-     """
- 
-+    checkpoint_permissions = Integer(
-+        0o644,
-+        config=True,
-+        help="""The permission of your checkpoint files.
-+
-+        By default, it is 0o644
-+        """,
-+    )
-+
-+    restore_permissions = Integer(
-+        0o644,
-+        config=True,
-+        help="""The permission of a restored checkpoint.
-+
-+        By default, it is 0o644
-+        """,
-+    )
-+
-+    checkpoint_dir_umask = Integer(
-+        0o022,
-+        config=True,
-+        help="""The umask for the checkpoint directory.
-+
-+        Keep in mind that it depends on your system umask, too.
-+
-+        By default, it is 0o022
-+        """,
-+    )
-+
-     checkpoint_dir = Unicode(
-         '.ipynb_checkpoints',
-         config=True,
-@@ -50,21 +79,29 @@
-     # ContentsManager-dependent checkpoint API
-     def create_checkpoint(self, contents_mgr, path):
-         """Create a checkpoint."""
-+        original_umask = os.umask(self.checkpoint_dir_umask)
-         checkpoint_id = u'checkpoint'
-         src_path = contents_mgr._get_os_path(path)
-         dest_path = self.checkpoint_path(checkpoint_id, path)
-         self._copy(src_path, dest_path)
--        return self.checkpoint_model(checkpoint_id, dest_path)
-+        os.chmod(dest_path, self.checkpoint_permissions)
-+        ret = self.checkpoint_model(checkpoint_id, dest_path)
-+        os.umask(original_umask)
-+        return ret
- 
-     def restore_checkpoint(self, contents_mgr, checkpoint_id, path):
-         """Restore a checkpoint."""
-+        original_umask = os.umask(self.checkpoint_dir_umask)
-         src_path = self.checkpoint_path(checkpoint_id, path)
-         dest_path = contents_mgr._get_os_path(path)
-         self._copy(src_path, dest_path)
-+        os.chmod(dest_path, self.restore_permissions)
-+        os.umask(original_umask)
- 
-     # ContentsManager-independent checkpoint API
-     def rename_checkpoint(self, checkpoint_id, old_path, new_path):
-         """Rename a checkpoint from old_path to new_path."""
-+        original_umask = os.umask(self.checkpoint_dir_umask)
-         old_cp_path = self.checkpoint_path(checkpoint_id, old_path)
-         new_cp_path = self.checkpoint_path(checkpoint_id, new_path)
-         if os.path.isfile(old_cp_path):
-@@ -75,9 +112,11 @@
-             )
-             with self.perm_to_403():
-                 shutil.move(old_cp_path, new_cp_path)
-+        os.umask(original_umask)
- 
-     def delete_checkpoint(self, checkpoint_id, path):
-         """delete a file's checkpoint"""
-+        original_umask = os.umask(self.checkpoint_dir_umask)
-         path = path.strip('/')
-         cp_path = self.checkpoint_path(checkpoint_id, path)
-         if not os.path.isfile(cp_path):
-@@ -86,23 +125,29 @@
-         self.log.debug("unlinking %s", cp_path)
-         with self.perm_to_403():
-             os.unlink(cp_path)
-+        os.umask(original_umask)
- 
-     def list_checkpoints(self, path):
-         """list the checkpoints for a given file
- 
-         This contents manager currently only supports one checkpoint per file.
-         """
-+        original_umask = os.umask(self.checkpoint_dir_umask)
-         path = path.strip('/')
-         checkpoint_id = "checkpoint"
-         os_path = self.checkpoint_path(checkpoint_id, path)
-         if not os.path.isfile(os_path):
-+            os.umask(original_umask)
-             return []
-         else:
--            return [self.checkpoint_model(checkpoint_id, os_path)]
-+            ret = self.checkpoint_model(checkpoint_id, os_path)
-+            os.umask(original_umask)
-+            return [ret]
- 
-     # Checkpoint-related utilities
-     def checkpoint_path(self, checkpoint_id, path):
-         """find the path to a checkpoint"""
-+        original_umask = os.umask(self.checkpoint_dir_umask)
-         path = path.strip('/')
-         parent, name = ('/' + path).rsplit('/', 1)
-         parent = parent.strip('/')
-@@ -117,16 +162,19 @@
-         with self.perm_to_403():
-             ensure_dir_exists(cp_dir)
-         cp_path = os.path.join(cp_dir, filename)
-+        os.umask(original_umask)
-         return cp_path
- 
-     def checkpoint_model(self, checkpoint_id, os_path):
-         """construct the info dict for a given checkpoint"""
-+        original_umask = os.umask(self.checkpoint_dir_umask)
-         stats = os.stat(os_path)
-         last_modified = tz.utcfromtimestamp(stats.st_mtime)
-         info = dict(
-             id=checkpoint_id,
-             last_modified=last_modified,
-         )
-+        os.umask(original_umask)
-         return info
- 
-     # Error Handling
-
diff --git a/Golden_Repo/j/Jupyter/notebook-6.4.11_jsc.patch b/Golden_Repo/j/Jupyter/notebook-6.4.11_jsc.patch
deleted file mode 100644
index 53b83f653..000000000
--- a/Golden_Repo/j/Jupyter/notebook-6.4.11_jsc.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-diff
---- notebook-6.4.11.orig/notebook/services/contents/filecheckpoints.py   2022-08-25 06:26:51.384296390 +0200
-+++ notebook-6.4.11/notebook/services/contents/filecheckpoints.py        2022-08-25 06:30:55.139342947 +0200
-@@ -14,7 +14,7 @@
- 
- from jupyter_core.utils import ensure_dir_exists
- from ipython_genutils.py3compat import getcwd
--from traitlets import Unicode
-+from traitlets import Unicode, Integer
- 
- from notebook import _tz as tz
- 
-@@ -28,6 +28,35 @@
-     you want file-based checkpoints with another ContentsManager.
-     """
- 
-+    checkpoint_permissions = Integer(
-+        0o644,
-+        config=True,
-+        help="""The permission of your checkpoint files.
-+
-+        By default, it is 0o644
-+        """,
-+    )
-+
-+    restore_permissions = Integer(
-+        0o644,
-+        config=True,
-+        help="""The permission of a restored checkpoint.
-+
-+        By default, it is 0o644
-+        """,
-+    )
-+
-+    checkpoint_dir_umask = Integer(
-+        0o022,
-+        config=True,
-+        help="""The umask for the checkpoint directory.
-+
-+        Keep in mind that it depends on your system umask, too.
-+
-+        By default, it is 0o022
-+        """,
-+    )
-+
-     checkpoint_dir = Unicode(
-         '.ipynb_checkpoints',
-         config=True,
-@@ -51,20 +80,28 @@
-     def create_checkpoint(self, contents_mgr, path):
-         """Create a checkpoint."""
-         checkpoint_id = 'checkpoint'
-+        original_umask = os.umask(self.checkpoint_dir_umask)
-         src_path = contents_mgr._get_os_path(path)
-         dest_path = self.checkpoint_path(checkpoint_id, path)
-         self._copy(src_path, dest_path)
--        return self.checkpoint_model(checkpoint_id, dest_path)
-+        os.chmod(dest_path, self.checkpoint_permissions)
-+        ret = self.checkpoint_model(checkpoint_id, dest_path)
-+        os.umask(original_umask)
-+        return ret
- 
-     def restore_checkpoint(self, contents_mgr, checkpoint_id, path):
-         """Restore a checkpoint."""
-+        original_umask = os.umask(self.checkpoint_dir_umask)
-         src_path = self.checkpoint_path(checkpoint_id, path)
-         dest_path = contents_mgr._get_os_path(path)
-         self._copy(src_path, dest_path)
-+        os.chmod(dest_path, self.restore_permissions)
-+        os.umask(original_umask)
- 
-     # ContentsManager-independent checkpoint API
-     def rename_checkpoint(self, checkpoint_id, old_path, new_path):
-         """Rename a checkpoint from old_path to new_path."""
-+        original_umask = os.umask(self.checkpoint_dir_umask)
-         old_cp_path = self.checkpoint_path(checkpoint_id, old_path)
-         new_cp_path = self.checkpoint_path(checkpoint_id, new_path)
-         if os.path.isfile(old_cp_path):
-@@ -75,9 +112,11 @@
-             )
-             with self.perm_to_403():
-                 shutil.move(old_cp_path, new_cp_path)
-+        os.umask(original_umask)
- 
-     def delete_checkpoint(self, checkpoint_id, path):
-         """delete a file's checkpoint"""
-+        original_umask = os.umask(self.checkpoint_dir_umask)
-         path = path.strip('/')
-         cp_path = self.checkpoint_path(checkpoint_id, path)
-         if not os.path.isfile(cp_path):
-@@ -86,23 +125,29 @@
-         self.log.debug("unlinking %s", cp_path)
-         with self.perm_to_403():
-             os.unlink(cp_path)
-+        os.umask(original_umask)
- 
-     def list_checkpoints(self, path):
-         """list the checkpoints for a given file
- 
-         This contents manager currently only supports one checkpoint per file.
-         """
-+        original_umask = os.umask(self.checkpoint_dir_umask)
-         path = path.strip('/')
-         checkpoint_id = "checkpoint"
-         os_path = self.checkpoint_path(checkpoint_id, path)
-         if not os.path.isfile(os_path):
-+            os.umask(original_umask)
-             return []
-         else:
--            return [self.checkpoint_model(checkpoint_id, os_path)]
-+            ret = self.checkpoint_model(checkpoint_id, os_path)
-+            os.umask(original_umask)
-+            return [ret]
- 
-     # Checkpoint-related utilities
-     def checkpoint_path(self, checkpoint_id, path):
-         """find the path to a checkpoint"""
-+        original_umask = os.umask(self.checkpoint_dir_umask)
-         path = path.strip('/')
-         parent, name = ('/' + path).rsplit('/', 1)
-         parent = parent.strip('/')
-@@ -113,16 +158,19 @@
-         with self.perm_to_403():
-             ensure_dir_exists(cp_dir)
-         cp_path = os.path.join(cp_dir, filename)
-+        os.umask(original_umask)
-         return cp_path
- 
-     def checkpoint_model(self, checkpoint_id, os_path):
-         """construct the info dict for a given checkpoint"""
-+        original_umask = os.umask(self.checkpoint_dir_umask)
-         stats = os.stat(os_path)
-         last_modified = tz.utcfromtimestamp(stats.st_mtime)
-         info = dict(
-             id=checkpoint_id,
-             last_modified=last_modified,
-         )
-+        os.umask(original_umask)
-         return info
- 
-     # Error Handling
diff --git a/Golden_Repo/j/Jupyter/tornado-timeouts.patch b/Golden_Repo/j/Jupyter/tornado-timeouts.patch
deleted file mode 100644
index 38835ef48..000000000
--- a/Golden_Repo/j/Jupyter/tornado-timeouts.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur tornado.orig/tornado-6.1/tornado/httpclient.py tornado/tornado-6.1/tornado/httpclient.py
---- tornado.orig/tornado-6.1/tornado/httpclient.py	2020-10-30 21:17:45.000000000 +0100
-+++ tornado/tornado-6.1/tornado/httpclient.py	2022-05-01 22:01:50.923741948 +0200
-@@ -345,8 +345,8 @@
-     # Merged with the values on the request object by AsyncHTTPClient
-     # implementations.
-     _DEFAULTS = dict(
--        connect_timeout=20.0,
--        request_timeout=20.0,
-+        connect_timeout=60.0,
-+        request_timeout=1200.0,
-         follow_redirects=True,
-         max_redirects=5,
-         decompress_response=True,
diff --git a/Golden_Repo/j/Jupyter/update_favorites_json b/Golden_Repo/j/Jupyter/update_favorites_json
deleted file mode 100755
index 23447ca8a..000000000
--- a/Golden_Repo/j/Jupyter/update_favorites_json
+++ /dev/null
@@ -1,157 +0,0 @@
-#!/usr/bin/env python3
-
-import logging
-import argparse
-import os
-
-import json5
-import jsonschema
-
-from jsonmerge import Merger
-
-parser = argparse.ArgumentParser()
-parser.add_argument('--debug', action='store_true')
-
-logging.basicConfig()
-if parser.parse_args().debug:
-    logging.getLogger().setLevel(logging.DEBUG)
-else:
-    logging.getLogger().setLevel(logging.INFO)
-
-merge_schema = {
-    "jupyter.lab.setting-icon": "jupyterlab-favorites:filledStar",
-    "jupyter.lab.setting-icon-label": "Favorites",
-    "title": "Favorites",
-    "description": "Favorites settings.",
-    "type": "object",
-    "additionalProperties": False,
-    "properties": {
-        "favorites": {
-            "title": "Favorites",
-            "description": "The list of favorites.",
-            "items": {"$ref": "#/definitions/favorite"},
-            "type": "array",
-            "default": [],
-            "mergeStrategy": "arrayMergeById",
-            "mergeOptions": {"idRef": "name"},
-        },
-        "showWidget": {
-            "title": "Show Widget",
-            "description": "Toggles the favorites widget above the filebrowser breadcrumbs.",
-            "type": "boolean",
-            "default": True,
-        },
-    },
-    "definitions": {
-        "favorite": {
-            "properties": {
-                "root": {"type": "string"},
-                "path": {"type": "string"},
-                "contentType": {"type": "string"},
-                "iconLabel": {"type": "string"},
-                "name": {"type": "string"},
-                "default": {"type": "boolean"},
-                "hidden": {"type": "boolean"},
-            },
-            "required": ["root", "path"],
-            "type": "object",
-        }
-    },
-}
-logging.debug(f"JSON schema for merging: {json5.dumps(merge_schema, indent=4)}")
-
-
-def validate(instance, schema):
-    try:
-        jsonschema.validate(instance=instance, schema=schema)
-    except jsonschema.ValidationError as e:
-        logging.error("Exception occurred", exc_info=True)
-        return e.schema["error_msg"]
-
-
-def fav_jsonstr(envvar, jsonstr):
-    path = os.getenv(envvar)
-    hidden = "true" if not path else "false"
-    jsonstr += f"""
-        {{
-            "root": "/",
-            "contentType": "directory",
-            "iconLabel": "ui-components:folder",
-            "path": "{path}",
-            "name": "${envvar}",
-            "hidden": {hidden}
-        }}"""
-    return jsonstr
-
-
-# create favorite-json for $HOME, $SCRATCH, $PROJECT
-sys_fav_jsonstr = """{
-    "favorites": ["""
-sys_fav_jsonstr = fav_jsonstr("HOME", sys_fav_jsonstr) + ","
-sys_fav_jsonstr = fav_jsonstr("PROJECT", sys_fav_jsonstr) + ","
-sys_fav_jsonstr = fav_jsonstr("SCRATCH", sys_fav_jsonstr)
-sys_fav_jsonstr += """
-    ],
-    "showWidget": true
-}"""
-logging.debug(f"JSON for additional favorites: {sys_fav_jsonstr}")
-validate(instance=json5.loads(sys_fav_jsonstr), schema=merge_schema)
-
-# get path to favorites.jupyterlab-settings
-settings_dpath = os.getenv(
-    "JUPYTERLAB_SETTINGS_DIR",
-    os.path.join(os.environ["HOME"], ".jupyter/lab/user-settings"),
-)
-fav_settings_dpath = os.path.join(settings_dpath, "@jlab-enhanced/favorites/")
-fav_settings_fpath = os.path.join(fav_settings_dpath, "favorites.jupyterlab-settings")
-logging.debug(f"settings file path: {fav_settings_fpath}")
-
-# if user settings file exists we need to merge
-if os.path.exists(fav_settings_fpath):
-    logging.debug(f"settings file exists: {fav_settings_fpath}")
-
-    # read user-settings
-    user_fav_json = {}
-    with open(fav_settings_fpath, "r") as fav_file:
-        try:
-            user_fav_json = json5.load(fav_file)
-        except ValueError:  # includes simplejson.decoder.JSONDecodeError
-            logging.error("Decoding JSON has FAILED", exc_info=True)
-
-    # merge JSONs
-    fav_merger = Merger(merge_schema)
-    try:
-        merged_json = fav_merger.merge(user_fav_json, json5.loads(sys_fav_jsonstr))
-    except:
-        logging.error("Merging JSONs has FAILED", exc_info=True)
-
-    # print result
-    logging.debug(f"merged settings file: {json5.dumps(merged_json, indent=4)}")
-
-    # validate result
-    validate(instance=merged_json, schema=merge_schema)
-
-    # write JSON to file
-    jsonstr = json5.dumps(merged_json, indent=4)
-    try:
-        with open(fav_settings_fpath, "w") as fav_file:
-            fav_file.write(jsonstr)
-        logging.info(f"Writing merged settings file SUCCESSFULL")
-    except:
-        logging.error("Writing settings file FAILED", exc_info=True)
-
-# if user settings file does NOT exist - we need to create it
-else:
-    logging.debug(
-        f"settings file {fav_settings_fpath} does not exist - creating a new one"
-    )
-
-    # create file with content
-    try:
-        os.makedirs(fav_settings_dpath, exist_ok=True)
-        with open(fav_settings_fpath, "w") as fav_file:
-            fav_file.write(sys_fav_jsonstr)
-        logging.info(f"Writing new settings file SUCCESSFULL")
-    except:
-        logging.error("Writing settings file FAILED", exc_info=True)
-
diff --git a/Golden_Repo/j/JupyterCollection/JupyterCollection-2022.3.3-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/j/JupyterCollection/JupyterCollection-2022.3.3-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index 7e624b7ee..000000000
--- a/Golden_Repo/j/JupyterCollection/JupyterCollection-2022.3.3-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-easyblock = 'Bundle'
-
-name = 'JupyterCollection'
-version = '2022.3.3'
-
-homepage = 'http://www.jupyter.org'
-description = """
-Project Jupyter exists to develop open-source software, open-standards, and services
-for interactive computing across dozens of programming languages.
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-dependencies = [
-    # ('JupyterKernel-XPython',        '0.12.3', '-' + version),
-    ('JupyterProxy-XpraHTML5',        '0.3.2',  '-' + version),
-    # ('JupyterProxy-RStudio',          '1.4',    '-' + version),
-    # ('JupyterProxy-Matlab',           '0.2.0',  '-' + version),
-    ('JupyterKernel-Bash',            '0.7.2',  '-' + version),
-    ('JupyterKernel-Cling',           '0.9',    '-' + version),
-    ('JupyterKernel-JavaScript',      '5.2.1',  '-' + version),
-    ('JupyterKernel-Julia',           '1.7.1',  '-' + version),
-    ('JupyterKernel-Octave',          '6.4.0',  '-' + version),
-    ('JupyterKernel-PyVisualization', '1.0',    '-' + version),
-    # ('JupyterKernel-PyQuantum',      '1.1',    '-' + version),
-    ('JupyterKernel-PyDeepLearning',  '1.1',    '-' + version),
-    ('JupyterKernel-R',               '4.1.2',  '-' + version),
-    ('JupyterKernel-Ruby',            '3.0.1',  '-' + version),
-    ('Jupyter', version),
-]
-
-skipsteps = ['configure', 'build', 'install', 'sanity_check']
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/JupyterCollection/JupyterCollection-2022.3.4-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/j/JupyterCollection/JupyterCollection-2022.3.4-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index a9f6c10c4..000000000
--- a/Golden_Repo/j/JupyterCollection/JupyterCollection-2022.3.4-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-easyblock = 'Bundle'
-
-name = 'JupyterCollection'
-version = '2022.3.4'
-
-homepage = 'http://www.jupyter.org'
-description = """
-Project Jupyter exists to develop open-source software, open-standards, and services
-for interactive computing across dozens of programming languages.
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-dependencies = [
-    # ('JupyterKernel-XPython',        '0.12.3', '-' + version),
-    ('JupyterProxy-XpraHTML5',        '0.3.4',  '-' + version),
-    # ('JupyterProxy-RStudio',          '1.4',    '-' + version),
-    # ('JupyterProxy-Matlab',           '0.2.0',  '-' + version),
-    ('JupyterKernel-Bash',            '0.7.2',  '-' + version),
-    ('JupyterKernel-Cling',           '0.9',    '-' + version),
-    ('JupyterKernel-JavaScript',      '5.2.1',  '-' + version),
-    ('JupyterKernel-Julia',           '1.7.1',  '-' + version),
-    ('JupyterKernel-Octave',          '6.4.0',  '-' + version),
-    ('JupyterKernel-PyVisualization', '1.0',    '-' + version),
-    ('JupyterKernel-PyQuantum',       '3.0',    '-' + version),
-    ('JupyterKernel-PyDeepLearning',  '1.1',    '-' + version),
-    ('JupyterKernel-R',               '4.1.2',  '-' + version),
-    ('JupyterKernel-Ruby',            '3.0.1',  '-' + version),
-    ('Jupyter', version),
-]
-
-skipsteps = ['configure', 'build', 'install', 'sanity_check']
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/JupyterExtension-elyra/JupyterExtension-elyra-3.11.0-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb b/Golden_Repo/j/JupyterExtension-elyra/JupyterExtension-elyra-3.11.0-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
deleted file mode 100644
index 2cbbaf9bf..000000000
--- a/Golden_Repo/j/JupyterExtension-elyra/JupyterExtension-elyra-3.11.0-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
+++ /dev/null
@@ -1,182 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'JupyterExtension-elyra'
-version = '3.11.0'
-local_jupyterver = '2022.3.4'
-versionsuffix = '-' + local_jupyterver
-
-homepage = 'https://elyra.readthedocs.io'
-description = """
-A JupyterLab extension for handling pipelines
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('protobuf-python', '3.17.3'),
-    ('Jupyter', local_jupyterver),
-]
-
-# this is a bundle of Python packages
-exts_defaultclass = 'PythonPackage'
-exts_default_options = {
-    'filter': ('python -c "import %(ext_name)s"', ''),
-    'download_dep_fail': True,
-    'source_urls': [PYPI_SOURCE],
-    'use_pip': True,
-    'sanity_pip_check':  True,
-}
-
-exts_list = [
-    ('MarkupSafe', '2.1.1', {
-        'checksums': ['7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b'],
-    }),
-    ('httplib2', '0.20.4', {
-        'checksums': ['58a98e45b4b1a48273073f905d2961666ecf0fbac4250ea5b47aef259eb5c585'],
-    }),
-    ('rsa', '4.8', {
-        'checksums': ['5c6bd9dc7a543b7fe4304a631f8a8a3b674e2bbfc49c2ae96200cdbe55df6b17'],
-    }),
-    ('google-crc32c', '1.3.0', {
-        'checksums': ['276de6273eb074a35bc598f8efbc00c7869c5cf2e29c90748fccc8c898c244df'],
-        'modulename': 'google',
-    }),
-    ('google-resumable-media', '2.3.2', {
-        'checksums': ['06924e8b1e79f158f0202e7dd151ad75b0ea9d59b997c850f56bdd4a5a361513'],
-        'modulename': 'google',
-    }),
-    ('googleapis-common-protos', '1.56.0', {
-        'checksums': ['4007500795bcfc269d279f0f7d253ae18d6dc1ff5d5a73613ffe452038b1ec5f'],
-        'modulename': 'google',
-    }),
-    ('google-auth', '1.35.0', {
-        'checksums': ['b7033be9028c188ee30200b204ea00ed82ea1162e8ac1df4aa6ded19a191d88e'],
-        'modulename': 'google.auth',
-    }),
-    ('google-auth-httplib2', '0.1.0', {
-        'checksums': ['a07c39fd632becacd3f07718dfd6021bf396978f03ad3ce4321d060015cc30ac'],
-        'modulename': 'google.auth',
-    }),
-    ('google-api-python-client', '1.12.11', {
-        'checksums': ['1b4bd42a46321e13c0542a9e4d96fa05d73626f07b39f83a73a947d70ca706a9'],
-        'modulename': 'google',
-    }),
-    ('google-cloud-core', '2.2.3', {
-        'checksums': ['89d2f7189bc6dc74de128d423ea52cc8719f0a5dbccd9ca80433f6504a20255c'],
-        'modulename': 'google',
-    }),
-    ('google-cloud-storage', '1.44.0', {
-        'checksums': ['29edbfeedd157d853049302bf5d104055c6f0cb7ef283537da3ce3f730073001'],
-        'modulename': 'google',
-    }),
-    ('google-api-core', '2.7.1', {
-        'checksums': ['b0fa577e512f0c8e063386b974718b8614586a798c5894ed34bedf256d9dae24'],
-        'modulename': 'google',
-    }),
-    ('pydantic', '1.9.0', {
-        'checksums': ['742645059757a56ecd886faf4ed2441b9c0cd406079c2b4bee51bcc3fbcd510a'],
-    }),
-    ('uritemplate', '3.0.1', {
-        'checksums': ['5af8ad10cec94f215e3f48112de2022e1d5a37ed427fbd88652fa908f2ab7cae'],
-    }),
-    ('termcolor', '1.1.0', {
-        'checksums': ['1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b'],
-    }),
-    ('fire', '0.4.0', {
-        'checksums': ['c5e2b8763699d1142393a46d0e3e790c5eb2f0706082df8f647878842c216a62'],
-    }),
-    ('Deprecated', '1.2.13', {
-        'checksums': ['43ac5335da90c31c24ba028af536a91d41d53f9e6901ddb021bcc572ce44e38d'],
-        'modulename': 'deprecated',
-    }),
-    ('docstring_parser', '0.13', {
-        'checksums': ['66dd7eac7232202bf220fd98a5f11491863c01f958a75fdd535c7eccac9ced78'],
-    }),
-    ('typer', '0.4.1', {
-        'checksums': ['5646aef0d936b2c761a10393f0384ee6b5c7fe0bb3e5cd710b17134ca1d99cff'],
-    }),
-    ('strip-hints', '0.1.10', {
-        'checksums': ['307c2bd147cd35997c8ed2e9a3bdca48ad9c9617e04ea46599095201b4ce998f'],
-    }),
-    ('kfp_pipeline_spec', '0.1.14', {
-        'checksums': ['bf9bdb244688b5084e75fc733a1a0855ee7ae789b8f5c8d82c6a5032762accba'],
-        'source_tmpl': 'kfp_pipeline_spec-0.1.14-py3-none-any.whl',
-        'unpack_sources': False,
-        'modulename': False,
-    }),
-    ('kfp-server-api', '1.8.1', {
-        'checksums': ['8057c4835a1685598cf3077f86b711a02dc5085f0d87f96a49b43c1fbfc263ec'],
-    }),
-    ('kfp', '1.8.12', {
-        'checksums': ['3d6e1c6faaa99de13cfab3d1997f3b6d92d4458af814d19e88d3eb9cd711f131'],
-    }),
-    ('requests-oauthlib', '1.3.1', {
-        'checksums': ['75beac4a47881eeb94d5ea5d6ad31ef88856affe2332b9aafb52c6452ccf0d7a'],
-    }),
-    ('kubernetes', '18.20.0', {
-        'checksums': ['0c72d00e7883375bd39ae99758425f5e6cb86388417cf7cc84305c211b2192cf'],
-    }),
-    ('minio', '7.1.5', {
-        'checksums': ['f33bb3d2a1b790d6ffc7b981c3f38c4f404d61c46de3cbd087fbf9d36a5f05ea'],
-    }),
-    ('watchdog', '2.1.7', {
-        'checksums': ['3fd47815353be9c44eebc94cc28fe26b2b0c5bd889dafc4a5a7cbdf924143480'],
-    }),
-    ('PyGithub', '1.55', {
-        'checksums': ['1bbfff9372047ff3f21d5cd8e07720f3dbfdaf6462fcaed9d815f528f1ba7283'],
-        'modulename': 'github',
-    }),
-    ('yaspin', '2.1.0', {
-        'checksums': ['c8d34eca9fda3f4dfbe59f57f3cf0f3641af3eefbf1544fbeb9b3bacf82c580a'],
-    }),
-    ('rfc3986_validator', '0.1.1', {
-        'checksums': ['3d44bde7921b3b9ec3ae4e3adca370438eccebc676456449b145d533b240d055'],
-    }),
-    ('elyra-server', version, {
-        'checksums': ['3bb8fd758aa0d010800720bd9323b82c6d03f780474e0c8e414428273fbd7554'],
-        'modulename': 'elyra',
-    }),
-    ('elyra-pipeline-editor-extension', version, {
-        'checksums': ['ba52d073b9ebcc142b893f5a9da0a70299c153170ebbc38117b7ddd23524c842'],
-        'modulename': 'elyra.pipeline',
-    }),
-]
-
-postinstallcmds = [
-    (
-        # clean unwanted extensions
-        'rm %(installdir)s/etc/jupyter/jupyter_notebook_config.d/jupyterlab_git.json & '
-        'rm %(installdir)s/etc/jupyter/jupyter_notebook_config.d/jupyter_resource_usage.json & '
-        'rm %(installdir)s/etc/jupyter/jupyter_server_config.d/jupyterlab_git.json & '
-        'rm %(installdir)s/etc/jupyter/jupyter_server_config.d/jupyter_resource_usage.json & '
-        'rm -rf %(installdir)s/share/jupyter/labextensions/\@elyra/theme-extension/ & '
-        'rm -rf %(installdir)s/share/jupyter/lab/ & '
-    )
-]
-
-modextrapaths = {
-    'JUPYTER_EXTRA_LABEXTENSIONS_PATH': ['share/jupyter/labextensions'],
-    'JUPYTER_PATH': ['share/jupyter'],
-    'JUPYTER_CONFIG_PATH': ['etc/jupyter'],
-}
-
-# Ensure that the user-specific $HOME/.local/share/jupyter is always first entry in JUPYTHER_PATH
-modluafooter = """
-prepend_path("JUPYTER_PATH", pathJoin(os.getenv("HOME"), ".local/share/jupyter"))
-"""
-
-sanity_check_paths = {
-    'files': [],
-    'dirs': [
-        'share/jupyter/labextensions',
-        'lib/python%(pyshortver)s/site-packages'
-    ],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/JupyterExtension-elyra/JupyterExtension-elyra-3.7.0-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb b/Golden_Repo/j/JupyterExtension-elyra/JupyterExtension-elyra-3.7.0-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb
deleted file mode 100644
index 348354751..000000000
--- a/Golden_Repo/j/JupyterExtension-elyra/JupyterExtension-elyra-3.7.0-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb
+++ /dev/null
@@ -1,179 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'JupyterExtension-elyra'
-version = '3.7.0'
-local_jupyterver = '2022.3.3'
-versionsuffix = '-' + local_jupyterver
-
-homepage = 'https://elyra.readthedocs.io'
-description = """
-A JupyterLab extension for handling pipelines
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('protobuf-python', '3.17.3'),
-    ('Jupyter', '2022.3.3'),
-]
-
-# this is a bundle of Python packages
-exts_defaultclass = 'PythonPackage'
-exts_default_options = {
-    'filter': ('python -c "import %(ext_name)s"', ''),
-    'download_dep_fail': True,
-    'source_urls': [PYPI_SOURCE],
-    'use_pip': True,
-    'sanity_pip_check':  True,
-}
-
-exts_list = [
-    ('httplib2', '0.20.4', {
-        'checksums': ['58a98e45b4b1a48273073f905d2961666ecf0fbac4250ea5b47aef259eb5c585'],
-    }),
-    ('rsa', '4.8', {
-        'checksums': ['5c6bd9dc7a543b7fe4304a631f8a8a3b674e2bbfc49c2ae96200cdbe55df6b17'],
-    }),
-    ('google-crc32c', '1.3.0', {
-        'checksums': ['276de6273eb074a35bc598f8efbc00c7869c5cf2e29c90748fccc8c898c244df'],
-        'modulename': 'google',
-    }),
-    ('google-resumable-media', '2.3.2', {
-        'checksums': ['06924e8b1e79f158f0202e7dd151ad75b0ea9d59b997c850f56bdd4a5a361513'],
-        'modulename': 'google',
-    }),
-    ('googleapis-common-protos', '1.56.0', {
-        'checksums': ['4007500795bcfc269d279f0f7d253ae18d6dc1ff5d5a73613ffe452038b1ec5f'],
-        'modulename': 'google',
-    }),
-    ('google-auth', '1.35.0', {
-        'checksums': ['b7033be9028c188ee30200b204ea00ed82ea1162e8ac1df4aa6ded19a191d88e'],
-        'modulename': 'google.auth',
-    }),
-    ('google-auth-httplib2', '0.1.0', {
-        'checksums': ['a07c39fd632becacd3f07718dfd6021bf396978f03ad3ce4321d060015cc30ac'],
-        'modulename': 'google.auth',
-    }),
-    ('google-api-python-client', '1.12.11', {
-        'checksums': ['1b4bd42a46321e13c0542a9e4d96fa05d73626f07b39f83a73a947d70ca706a9'],
-        'modulename': 'google',
-    }),
-    ('google-cloud-core', '2.2.3', {
-        'checksums': ['89d2f7189bc6dc74de128d423ea52cc8719f0a5dbccd9ca80433f6504a20255c'],
-        'modulename': 'google',
-    }),
-    ('google-cloud-storage', '1.44.0', {
-        'checksums': ['29edbfeedd157d853049302bf5d104055c6f0cb7ef283537da3ce3f730073001'],
-        'modulename': 'google',
-    }),
-    ('google-api-core', '2.7.1', {
-        'checksums': ['b0fa577e512f0c8e063386b974718b8614586a798c5894ed34bedf256d9dae24'],
-        'modulename': 'google',
-    }),
-    ('pydantic', '1.9.0', {
-        'checksums': ['742645059757a56ecd886faf4ed2441b9c0cd406079c2b4bee51bcc3fbcd510a'],
-    }),
-    ('uritemplate', '3.0.1', {
-        'checksums': ['5af8ad10cec94f215e3f48112de2022e1d5a37ed427fbd88652fa908f2ab7cae'],
-    }),
-    ('termcolor', '1.1.0', {
-        'checksums': ['1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b'],
-    }),
-    ('fire', '0.4.0', {
-        'checksums': ['c5e2b8763699d1142393a46d0e3e790c5eb2f0706082df8f647878842c216a62'],
-    }),
-    ('Deprecated', '1.2.13', {
-        'checksums': ['43ac5335da90c31c24ba028af536a91d41d53f9e6901ddb021bcc572ce44e38d'],
-        'modulename': 'deprecated',
-    }),
-    ('docstring_parser', '0.13', {
-        'checksums': ['66dd7eac7232202bf220fd98a5f11491863c01f958a75fdd535c7eccac9ced78'],
-    }),
-    ('typer', '0.4.1', {
-        'checksums': ['5646aef0d936b2c761a10393f0384ee6b5c7fe0bb3e5cd710b17134ca1d99cff'],
-    }),
-    ('strip-hints', '0.1.10', {
-        'checksums': ['307c2bd147cd35997c8ed2e9a3bdca48ad9c9617e04ea46599095201b4ce998f'],
-    }),
-    ('kfp_pipeline_spec', '0.1.14', {
-        'checksums': ['bf9bdb244688b5084e75fc733a1a0855ee7ae789b8f5c8d82c6a5032762accba'],
-        'source_tmpl': 'kfp_pipeline_spec-0.1.14-py3-none-any.whl',
-        'unpack_sources': False,
-        'modulename': False,
-    }),
-    ('kfp-server-api', '1.8.1', {
-        'checksums': ['8057c4835a1685598cf3077f86b711a02dc5085f0d87f96a49b43c1fbfc263ec'],
-    }),
-    ('kfp', '1.8.12', {
-        'checksums': ['3d6e1c6faaa99de13cfab3d1997f3b6d92d4458af814d19e88d3eb9cd711f131'],
-    }),
-    ('requests-oauthlib', '1.3.1', {
-        'checksums': ['75beac4a47881eeb94d5ea5d6ad31ef88856affe2332b9aafb52c6452ccf0d7a'],
-    }),
-    ('kubernetes', '18.20.0', {
-        'checksums': ['0c72d00e7883375bd39ae99758425f5e6cb86388417cf7cc84305c211b2192cf'],
-    }),
-    ('minio', '7.1.5', {
-        'checksums': ['f33bb3d2a1b790d6ffc7b981c3f38c4f404d61c46de3cbd087fbf9d36a5f05ea'],
-    }),
-    ('watchdog', '2.1.7', {
-        'checksums': ['3fd47815353be9c44eebc94cc28fe26b2b0c5bd889dafc4a5a7cbdf924143480'],
-    }),
-    ('PyGithub', '1.55', {
-        'checksums': ['1bbfff9372047ff3f21d5cd8e07720f3dbfdaf6462fcaed9d815f528f1ba7283'],
-        'modulename': 'github',
-    }),
-    ('yaspin', '2.1.0', {
-        'checksums': ['c8d34eca9fda3f4dfbe59f57f3cf0f3641af3eefbf1544fbeb9b3bacf82c580a'],
-    }),
-    ('rfc3986_validator', '0.1.1', {
-        'checksums': ['3d44bde7921b3b9ec3ae4e3adca370438eccebc676456449b145d533b240d055'],
-    }),
-    ('elyra-server', '3.7.0', {
-        'checksums': ['bb31e66a5a6c6a9adf12d2f85386b3841c7faf9beffb96e05835136a44c9df8d'],
-        'modulename': 'elyra',
-    }),
-    ('elyra-pipeline-editor-extension', '3.7.0', {
-        'checksums': ['863748f6bf1ba823ae97a1664c49c3a815e95244c7412136293a30bb4793a64c'],
-        'modulename': 'elyra.pipeline',
-    }),
-]
-
-postinstallcmds = [
-    (
-        # clean unwanted extensions
-        'rm %(installdir)s/etc/jupyter/jupyter_notebook_config.d/jupyterlab_git.json & '
-        'rm %(installdir)s/etc/jupyter/jupyter_notebook_config.d/jupyter_resource_usage.json & '
-        'rm %(installdir)s/etc/jupyter/jupyter_server_config.d/jupyterlab_git.json & '
-        'rm %(installdir)s/etc/jupyter/jupyter_server_config.d/jupyter_resource_usage.json & '
-        'rm -rf %(installdir)s/share/jupyter/labextensions/\@elyra/theme-extension/ & '
-        'rm -rf %(installdir)s/share/jupyter/lab/ & '
-    )
-]
-
-modextrapaths = {
-    'JUPYTER_EXTRA_LABEXTENSIONS_PATH': ['share/jupyter/labextensions'],
-    'JUPYTER_PATH': ['share/jupyter'],
-    'JUPYTER_CONFIG_PATH': ['etc/jupyter'],
-}
-
-# Ensure that the user-specific $HOME/.local/share/jupyter is always first entry in JUPYTHER_PATH
-modluafooter = """
-prepend_path("JUPYTER_PATH", pathJoin(os.getenv("HOME"), ".local/share/jupyter"))
-"""
-
-sanity_check_paths = {
-    'files': [],
-    'dirs': [
-        'share/jupyter/labextensions',
-        'lib/python%(pyshortver)s/site-packages'
-    ],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/JupyterExtension-nvdashboard/JupyterExtension-nvdashboard-0.6.0-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb b/Golden_Repo/j/JupyterExtension-nvdashboard/JupyterExtension-nvdashboard-0.6.0-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb
deleted file mode 100644
index ab3acb0c3..000000000
--- a/Golden_Repo/j/JupyterExtension-nvdashboard/JupyterExtension-nvdashboard-0.6.0-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb
+++ /dev/null
@@ -1,55 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'JupyterExtension-nvdashboard'
-version = '0.6.0'
-local_jupyterver = '2022.3.3'
-versionsuffix = '-' + local_jupyterver
-
-homepage = 'https://github.com/rapidsai/jupyterlab-nvdashboard'
-description = """
-A JupyterLab extension for displaying GPU usage dashboards
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('Jupyter', local_jupyterver),
-    # NVIDIA Management Library is on our clusters located at system level
-]
-
-# this is a bundle of Python packages
-exts_defaultclass = 'PythonPackage'
-exts_default_options = {
-    'source_urls': [PYPI_SOURCE],
-    'use_pip': True,
-    'download_dep_fail': True,
-    'use_pip_for_deps': False,
-    'sanity_pip_check':  True,
-    'filter': ('python -c "import %(ext_name)s"', ''),
-}
-
-exts_list = [
-    ('jupyterlab_nvdashboard', '0.6.0', {
-        'checksums': ['0522834b7160046140542bf6abaeecf8527e3ebd82f89730ca5d87890807e1fd'],
-    }),
-]
-
-modextrapaths = {
-    'JUPYTER_EXTRA_LABEXTENSIONS_PATH': ['share/jupyter/labextensions'],
-}
-
-sanity_check_paths = {
-    'files': [],
-    'dirs': [
-        'share/jupyter/labextensions',
-        'lib/python%(pyshortver)s/site-packages'
-    ],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/JupyterExtension-nvdashboard/JupyterExtension-nvdashboard-0.7.0-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb b/Golden_Repo/j/JupyterExtension-nvdashboard/JupyterExtension-nvdashboard-0.7.0-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
deleted file mode 100644
index ddeb29888..000000000
--- a/Golden_Repo/j/JupyterExtension-nvdashboard/JupyterExtension-nvdashboard-0.7.0-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
+++ /dev/null
@@ -1,55 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'JupyterExtension-nvdashboard'
-version = '0.7.0'
-local_jupyterver = '2022.3.4'
-versionsuffix = '-' + local_jupyterver
-
-homepage = 'https://github.com/rapidsai/jupyterlab-nvdashboard'
-description = """
-A JupyterLab extension for displaying GPU usage dashboards
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('Jupyter', local_jupyterver),
-    # NVIDIA Management Library is on our clusters located at system level
-]
-
-# this is a bundle of Python packages
-exts_defaultclass = 'PythonPackage'
-exts_default_options = {
-    'source_urls': [PYPI_SOURCE],
-    'use_pip': True,
-    'download_dep_fail': True,
-    'use_pip_for_deps': False,
-    'sanity_pip_check':  True,
-    'filter': ('python -c "import %(ext_name)s"', ''),
-}
-
-exts_list = [
-    ('jupyterlab_nvdashboard', '0.7.0', {
-        'checksums': ['d14f6915d7eb8c9e5143934f81dce7b38bfc0f4f437671ae60ca53889b0af0e9'],
-    }),
-]
-
-modextrapaths = {
-    'JUPYTER_EXTRA_LABEXTENSIONS_PATH': ['share/jupyter/labextensions'],
-}
-
-sanity_check_paths = {
-    'files': [],
-    'dirs': [
-        'share/jupyter/labextensions',
-        'lib/python%(pyshortver)s/site-packages'
-    ],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/JupyterHub/JupyterHub-1.5.0-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb b/Golden_Repo/j/JupyterHub/JupyterHub-1.5.0-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
deleted file mode 100644
index 9bf934731..000000000
--- a/Golden_Repo/j/JupyterHub/JupyterHub-1.5.0-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
+++ /dev/null
@@ -1,52 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'JupyterHub'
-version = '1.5.0'
-local_jupyterver = '2022.3.4'
-versionsuffix = '-' + local_jupyterver
-
-homepage = 'https://jupyter.org'
-description = """
-With JupyterHub you can create a multi-user Hub that spawns, manages,
-and proxies multiple instances of the single-user Jupyter notebook server.
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('Jupyter', local_jupyterver),
-]
-
-# this is a bundle of Python packages
-exts_defaultclass = 'PythonPackage'
-exts_default_options = {
-    'filter': ('python -c "import %(ext_name)s"', ''),
-    'download_dep_fail': True,
-    'source_urls': [PYPI_SOURCE],
-    'use_pip': True,
-    'sanity_pip_check':  True,
-    'use_pip_for_deps': False,
-}
-
-exts_list = [
-    ('jupyterhub', '1.5.0', {
-        'patches': ['jupyterhub-1.1.0_logoutcookie-2.0.patch'],
-        'checksums': [
-            'dc618f657c23ba46280e36257e50931806674ba0e9e6498afb091efc6226d69d',
-            '3b72d8178499bef7ed8562ab08e329f1136f80f21884fbed461f589d4c5de212',
-        ],
-    }),  # copy 401.html -> <jupyter-install-dir>/share/jupyter/lab/static/
-]
-
-sanity_check_paths = {
-    'files': [],
-    'dirs': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/JupyterKernel-Bash/JupyterKernel-Bash-0.7.2-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb b/Golden_Repo/j/JupyterKernel-Bash/JupyterKernel-Bash-0.7.2-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb
deleted file mode 100644
index 803f43171..000000000
--- a/Golden_Repo/j/JupyterKernel-Bash/JupyterKernel-Bash-0.7.2-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb
+++ /dev/null
@@ -1,96 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'JupyterKernel-Bash'
-version = '0.7.2'
-local_jupyterver = '2022.3.3'
-versionsuffix = '-' + local_jupyterver
-
-homepage = 'https://github.com/takluyver/bash_kernel'
-description = """
-Native Bash kernel for Jupyter.
-Project Jupyter exists to develop open-source software, open-standards, and services
-for interactive computing across dozens of programming languages.
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('Jupyter', local_jupyterver),
-]
-
-# this is a bundle of Python packages
-exts_defaultclass = 'PythonPackage'
-exts_default_options = {
-    'filter': ('python -c "import %(ext_name)s"', ''),
-    'download_dep_fail': True,
-    'source_urls': [PYPI_SOURCE],
-    'use_pip': True,
-    'sanity_pip_check':  True,
-    'use_pip_for_deps': False,
-}
-
-exts_list = [
-    ('bash_kernel', '0.7.2', {
-        'checksums': ['a08c84eddd8179de5234105821fd5cc210015671a0bd3cd0bc4f631c475e1670'],
-    }),
-]
-
-local_jupyter_path = 'share/jupyter'
-
-modextrapaths = {
-    'JUPYTER_PATH': ['share/jupyter'],  # add search path for kernelspecs
-}
-
-# Ensure that the user-specific $HOME/.local/share/jupyter is always first entry in JUPYTHER_PATH
-modluafooter = """
-prepend_path("JUPYTER_PATH", pathJoin(os.getenv("HOME"), ".local/share/jupyter"))
-"""
-
-postinstallcmds = [
-    # Create virtual environment to ensure we install in the correct directory !!!
-    'python3 -m venv %(installdir)s --system-site-packages',
-    (
-        '{ cat > %%(builddir)s/env.sh; } << \'EOF\'\n'
-        '#!/bin/bash\n'
-        'source %%(installdir)s/bin/activate\n'
-        'export PYTHONPATH=%%(installdir)s/lib/python%%(pyshortver)s/site-packages:${PYTHONPATH}\n'
-        'export JUPYTER_DATA_DIR=%%(installdir)s/%s\n'
-        'EOF'
-    ) % (local_jupyter_path),
-
-    # Jupyter Kernel: Bash - https://github.com/takluyver/bash_kernel
-    # installs bash_kernel in $JUPYTER_DATA_DIR/kernels
-    'source %(builddir)s/env.sh && ${EBROOTPYTHON}/bin/python3 -m bash_kernel.install --user',
-    'source %(builddir)s/env.sh && chmod -R o+x %(installdir)s/share',
-
-    # Ensure we remove the virtuel environment to avoid wrong search path for python packages
-    'rm -f %(installdir)s/pyvenv.cfg',
-    'rm -rf %(installdir)s/bin',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/_distutils_hack',
-    'rm -f %(installdir)s/lib/python%(pyshortver)s/site-packages/distutils-precedence.pth',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/pip',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/pip-*',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/pkg_resources',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/setuptools',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/setuptools-*',
-]
-
-# specify that Bundle easyblock should run a full sanity check, rather than just trying to load the module
-# full_sanity_check = True
-sanity_check_paths = {
-    'files': [
-        'share/jupyter/kernels/bash/kernel.json',
-    ],
-    'dirs': [
-        'lib/python%(pyshortver)s/site-packages',
-        'share/jupyter/kernels/bash/',
-    ],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/JupyterKernel-Bash/JupyterKernel-Bash-0.7.2-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb b/Golden_Repo/j/JupyterKernel-Bash/JupyterKernel-Bash-0.7.2-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
deleted file mode 100644
index 354bc74de..000000000
--- a/Golden_Repo/j/JupyterKernel-Bash/JupyterKernel-Bash-0.7.2-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
+++ /dev/null
@@ -1,96 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'JupyterKernel-Bash'
-version = '0.7.2'
-local_jupyterver = '2022.3.4'
-versionsuffix = '-' + local_jupyterver
-
-homepage = 'https://github.com/takluyver/bash_kernel'
-description = """
-Native Bash kernel for Jupyter.
-Project Jupyter exists to develop open-source software, open-standards, and services
-for interactive computing across dozens of programming languages.
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('Jupyter', local_jupyterver),
-]
-
-# this is a bundle of Python packages
-exts_defaultclass = 'PythonPackage'
-exts_default_options = {
-    'filter': ('python -c "import %(ext_name)s"', ''),
-    'download_dep_fail': True,
-    'source_urls': [PYPI_SOURCE],
-    'use_pip': True,
-    'sanity_pip_check':  True,
-    'use_pip_for_deps': False,
-}
-
-exts_list = [
-    ('bash_kernel', '0.7.2', {
-        'checksums': ['a08c84eddd8179de5234105821fd5cc210015671a0bd3cd0bc4f631c475e1670'],
-    }),
-]
-
-local_jupyter_path = 'share/jupyter'
-
-modextrapaths = {
-    'JUPYTER_PATH': ['share/jupyter'],  # add search path for kernelspecs
-}
-
-# Ensure that the user-specific $HOME/.local/share/jupyter is always first entry in JUPYTHER_PATH
-modluafooter = """
-prepend_path("JUPYTER_PATH", pathJoin(os.getenv("HOME"), ".local/share/jupyter"))
-"""
-
-postinstallcmds = [
-    # Create virtual environment to ensure we install in the correct directory !!!
-    'python3 -m venv %(installdir)s --system-site-packages',
-    (
-        '{ cat > %%(builddir)s/env.sh; } << \'EOF\'\n'
-        '#!/bin/bash\n'
-        'source %%(installdir)s/bin/activate\n'
-        'export PYTHONPATH=%%(installdir)s/lib/python%%(pyshortver)s/site-packages:${PYTHONPATH}\n'
-        'export JUPYTER_DATA_DIR=%%(installdir)s/%s\n'
-        'EOF'
-    ) % (local_jupyter_path),
-
-    # Jupyter Kernel: Bash - https://github.com/takluyver/bash_kernel
-    # installs bash_kernel in $JUPYTER_DATA_DIR/kernels
-    'source %(builddir)s/env.sh && ${EBROOTPYTHON}/bin/python3 -m bash_kernel.install --user',
-    'source %(builddir)s/env.sh && chmod -R o+x %(installdir)s/share',
-
-    # Ensure we remove the virtuel environment to avoid wrong search path for python packages
-    'rm -f %(installdir)s/pyvenv.cfg',
-    'rm -rf %(installdir)s/bin',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/_distutils_hack',
-    'rm -f %(installdir)s/lib/python%(pyshortver)s/site-packages/distutils-precedence.pth',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/pip',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/pip-*',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/pkg_resources',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/setuptools',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/setuptools-*',
-]
-
-# specify that Bundle easyblock should run a full sanity check, rather than just trying to load the module
-# full_sanity_check = True
-sanity_check_paths = {
-    'files': [
-        'share/jupyter/kernels/bash/kernel.json',
-    ],
-    'dirs': [
-        'lib/python%(pyshortver)s/site-packages',
-        'share/jupyter/kernels/bash/',
-    ],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/JupyterKernel-Cling/JupyterKernel-Cling-0.9-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb b/Golden_Repo/j/JupyterKernel-Cling/JupyterKernel-Cling-0.9-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb
deleted file mode 100644
index 828b6aa16..000000000
--- a/Golden_Repo/j/JupyterKernel-Cling/JupyterKernel-Cling-0.9-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb
+++ /dev/null
@@ -1,95 +0,0 @@
-easyblock = 'Bundle'
-
-name = 'JupyterKernel-Cling'
-version = '0.9'
-local_jupyterver = '2022.3.3'
-versionsuffix = '-' + local_jupyterver
-
-homepage = 'https://github.com/root-project/cling'
-description = """
-Native C kernel for Jupyter.
-Project Jupyter exists to develop open-source software, open-standards, and services
-for interactive computing across dozens of programming languages.
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('Jupyter', local_jupyterver),
-    ('Cling', version),
-]
-
-local_jupyter_path = 'share/jupyter'
-
-modextrapaths = {
-    'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages'],
-    'JUPYTER_PATH': ['share/jupyter'],  # add search path for kernelspecs
-}
-
-# Ensure that the user-specific $HOME/.local/share/jupyter is always first entry in JUPYTHER_PATH
-modluafooter = """
-prepend_path("JUPYTER_PATH", pathJoin(os.getenv("HOME"), ".local/share/jupyter"))
-"""
-
-postinstallcmds = [
-    # Create virtual environment to ensure we install in the correct directory !!!
-    'python3 -m venv %(installdir)s --system-site-packages',
-    (
-        '{ cat > %%(builddir)s/env.sh; } << \'EOF\'\n'
-        '#!/bin/bash\n'
-        'source %%(installdir)s/bin/activate\n'
-        'export PYTHONPATH=%%(installdir)s/lib/python%%(pyshortver)s/site-packages:${PYTHONPATH}\n'
-        'export JUPYTER_DATA_DIR=%%(installdir)s/%s\n'
-        'EOF'
-    ) % (local_jupyter_path),
-
-    # Jupyter Kernel: Cling (C++)
-    (
-        'source %(builddir)s/env.sh && '
-        ' pip3 install --upgrade --no-deps --force-reinstall ${EBROOTCLING}/share/cling/Jupyter/kernel && '
-        ' jupyter-kernelspec install --prefix=%(installdir)s ${EBROOTCLING}/share/cling/Jupyter/kernel/cling-cpp17 && '
-        ' install -m 0755 ${EBROOTCLING}/share/cling/Jupyter/kernel/scripts/jupyter-cling-kernel %(installdir)s/bin/ '
-    ),
-
-    # correct shebang to correct python binary
-    (
-        'source %(builddir)s/env.sh && '
-        ' abs2python="#! ${EBROOTPYTHON}/bin/python" && '
-        ' sed "1s@^.*@$abs2python@g" -i %(installdir)s/bin/jupyter-cling-kernel'
-    ),
-    'source %(builddir)s/env.sh && chmod -R o+x %(installdir)s/share',
-
-    # Ensure we remove the virtuel environment to avoid wrong search path for python packages
-    'rm -f %(installdir)s/pyvenv.cfg',
-    'rm -f %(installdir)s/bin/python',
-    'rm -f %(installdir)s/bin/python3',
-    'rm -f %(installdir)s/bin/activate',
-    'rm -f %(installdir)s/bin/activate*',
-    'rm -f %(installdir)s/bin/easy_install*',
-    'rm -f %(installdir)s/bin/pip*',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/_distutils_hack',
-    'rm -f %(installdir)s/lib/python%(pyshortver)s/site-packages/distutils-precedence.pth',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/pip',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/pip-*',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/pkg_resources',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/setuptools',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/setuptools-*',
-]
-
-sanity_check_paths = {
-    'files': [
-        'share/jupyter/kernels/cling-cpp17/kernel.json',
-    ],
-    'dirs': [
-        'lib/python%(pyshortver)s/site-packages',
-        'share/jupyter/kernels/cling-cpp17/',
-    ],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/JupyterKernel-Cling/JupyterKernel-Cling-0.9-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb b/Golden_Repo/j/JupyterKernel-Cling/JupyterKernel-Cling-0.9-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
deleted file mode 100644
index 33e6d1b5d..000000000
--- a/Golden_Repo/j/JupyterKernel-Cling/JupyterKernel-Cling-0.9-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
+++ /dev/null
@@ -1,95 +0,0 @@
-easyblock = 'Bundle'
-
-name = 'JupyterKernel-Cling'
-version = '0.9'
-local_jupyterver = '2022.3.4'
-versionsuffix = '-' + local_jupyterver
-
-homepage = 'https://github.com/root-project/cling'
-description = """
-Native C kernel for Jupyter.
-Project Jupyter exists to develop open-source software, open-standards, and services
-for interactive computing across dozens of programming languages.
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('Jupyter', local_jupyterver),
-    ('Cling', version),
-]
-
-local_jupyter_path = 'share/jupyter'
-
-modextrapaths = {
-    'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages'],
-    'JUPYTER_PATH': ['share/jupyter'],  # add search path for kernelspecs
-}
-
-# Ensure that the user-specific $HOME/.local/share/jupyter is always first entry in JUPYTHER_PATH
-modluafooter = """
-prepend_path("JUPYTER_PATH", pathJoin(os.getenv("HOME"), ".local/share/jupyter"))
-"""
-
-postinstallcmds = [
-    # Create virtual environment to ensure we install in the correct directory !!!
-    'python3 -m venv %(installdir)s --system-site-packages',
-    (
-        '{ cat > %%(builddir)s/env.sh; } << \'EOF\'\n'
-        '#!/bin/bash\n'
-        'source %%(installdir)s/bin/activate\n'
-        'export PYTHONPATH=%%(installdir)s/lib/python%%(pyshortver)s/site-packages:${PYTHONPATH}\n'
-        'export JUPYTER_DATA_DIR=%%(installdir)s/%s\n'
-        'EOF'
-    ) % (local_jupyter_path),
-
-    # Jupyter Kernel: Cling (C++)
-    (
-        'source %(builddir)s/env.sh && '
-        ' pip3 install --upgrade --no-deps --force-reinstall ${EBROOTCLING}/share/cling/Jupyter/kernel && '
-        ' jupyter-kernelspec install --prefix=%(installdir)s ${EBROOTCLING}/share/cling/Jupyter/kernel/cling-cpp17 && '
-        ' install -m 0755 ${EBROOTCLING}/share/cling/Jupyter/kernel/scripts/jupyter-cling-kernel %(installdir)s/bin/ '
-    ),
-
-    # correct shebang to correct python binary
-    (
-        'source %(builddir)s/env.sh && '
-        ' abs2python="#! ${EBROOTPYTHON}/bin/python" && '
-        ' sed "1s@^.*@$abs2python@g" -i %(installdir)s/bin/jupyter-cling-kernel'
-    ),
-    'source %(builddir)s/env.sh && chmod -R o+x %(installdir)s/share',
-
-    # Ensure we remove the virtuel environment to avoid wrong search path for python packages
-    'rm -f %(installdir)s/pyvenv.cfg',
-    'rm -f %(installdir)s/bin/python',
-    'rm -f %(installdir)s/bin/python3',
-    'rm -f %(installdir)s/bin/activate',
-    'rm -f %(installdir)s/bin/activate*',
-    'rm -f %(installdir)s/bin/easy_install*',
-    'rm -f %(installdir)s/bin/pip*',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/_distutils_hack',
-    'rm -f %(installdir)s/lib/python%(pyshortver)s/site-packages/distutils-precedence.pth',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/pip',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/pip-*',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/pkg_resources',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/setuptools',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/setuptools-*',
-]
-
-sanity_check_paths = {
-    'files': [
-        'share/jupyter/kernels/cling-cpp17/kernel.json',
-    ],
-    'dirs': [
-        'lib/python%(pyshortver)s/site-packages',
-        'share/jupyter/kernels/cling-cpp17/',
-    ],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/JupyterKernel-JavaScript/JupyterKernel-JavaScript-5.2.1-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb b/Golden_Repo/j/JupyterKernel-JavaScript/JupyterKernel-JavaScript-5.2.1-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb
deleted file mode 100644
index 09452d0e4..000000000
--- a/Golden_Repo/j/JupyterKernel-JavaScript/JupyterKernel-JavaScript-5.2.1-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb
+++ /dev/null
@@ -1,64 +0,0 @@
-easyblock = 'Bundle'
-
-name = 'JupyterKernel-JavaScript'
-version = '5.2.1'
-local_jupyterver = '2022.3.3'
-versionsuffix = '-' + local_jupyterver
-
-homepage = 'https://www.npmjs.com/package/ijavascript'
-description = """
-Native JavaScript kernel for Jupyter.
-Project Jupyter exists to develop open-source software, open-standards, and services
-for interactive computing across dozens of programming languages.
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('Jupyter', local_jupyterver),
-]
-
-local_jupyter_path = 'share/jupyter'
-
-modextrapaths = {
-    'NODE_PATH': ['lib/node_modules'],  # npm´s search path to extra modules
-    'JUPYTER_PATH': ['share/jupyter'],  # add search path for kernelspecs
-}
-
-# Ensure that the user-specific $HOME/.local/share/jupyter is always first entry in JUPYTHER_PATH
-modluafooter = """
-prepend_path("JUPYTER_PATH", pathJoin(os.getenv("HOME"), ".local/share/jupyter"))
-"""
-
-postinstallcmds = [
-    (
-        '{ cat > %%(builddir)s/env.sh; } << \'EOF\'\n'
-        '#!/bin/bash\n'
-        'export PATH=%%(installdir)s/bin:${PATH}\n'
-        'export NODE_PATH=%%(installdir)s/lib/node_modules\n'
-        'export JUPYTER_DATA_DIR=%%(installdir)s/%s\n'
-        'EOF'
-    ) % (local_jupyter_path),
-
-    'source %(builddir)s/env.sh && npm install ijavascript@%(version)s -g --prefix %(installdir)s',
-    # installs ijavascript in $JUPYTER_DATA_DIR/kernels
-    'source %(builddir)s/env.sh && ijsinstall --install=local',
-    'source %(builddir)s/env.sh && chmod -R o+x %(installdir)s/share',
-]
-
-sanity_check_paths = {
-    'files': [
-        'share/jupyter/kernels/javascript/kernel.json',
-    ],
-    'dirs': [
-        'lib/node_modules/',
-        'share/jupyter/kernels/javascript/',
-    ],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/JupyterKernel-JavaScript/JupyterKernel-JavaScript-5.2.1-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb b/Golden_Repo/j/JupyterKernel-JavaScript/JupyterKernel-JavaScript-5.2.1-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
deleted file mode 100644
index 0586a380d..000000000
--- a/Golden_Repo/j/JupyterKernel-JavaScript/JupyterKernel-JavaScript-5.2.1-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
+++ /dev/null
@@ -1,64 +0,0 @@
-easyblock = 'Bundle'
-
-name = 'JupyterKernel-JavaScript'
-version = '5.2.1'
-local_jupyterver = '2022.3.4'
-versionsuffix = '-' + local_jupyterver
-
-homepage = 'https://www.npmjs.com/package/ijavascript'
-description = """
-Native JavaScript kernel for Jupyter.
-Project Jupyter exists to develop open-source software, open-standards, and services
-for interactive computing across dozens of programming languages.
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('Jupyter', local_jupyterver),
-]
-
-local_jupyter_path = 'share/jupyter'
-
-modextrapaths = {
-    'NODE_PATH': ['lib/node_modules'],  # npm´s search path to extra modules
-    'JUPYTER_PATH': ['share/jupyter'],  # add search path for kernelspecs
-}
-
-# Ensure that the user-specific $HOME/.local/share/jupyter is always first entry in JUPYTHER_PATH
-modluafooter = """
-prepend_path("JUPYTER_PATH", pathJoin(os.getenv("HOME"), ".local/share/jupyter"))
-"""
-
-postinstallcmds = [
-    (
-        '{ cat > %%(builddir)s/env.sh; } << \'EOF\'\n'
-        '#!/bin/bash\n'
-        'export PATH=%%(installdir)s/bin:${PATH}\n'
-        'export NODE_PATH=%%(installdir)s/lib/node_modules\n'
-        'export JUPYTER_DATA_DIR=%%(installdir)s/%s\n'
-        'EOF'
-    ) % (local_jupyter_path),
-
-    'source %(builddir)s/env.sh && npm install ijavascript@%(version)s -g --prefix %(installdir)s',
-    # installs ijavascript in $JUPYTER_DATA_DIR/kernels
-    'source %(builddir)s/env.sh && ijsinstall --install=local',
-    'source %(builddir)s/env.sh && chmod -R o+x %(installdir)s/share',
-]
-
-sanity_check_paths = {
-    'files': [
-        'share/jupyter/kernels/javascript/kernel.json',
-    ],
-    'dirs': [
-        'lib/node_modules/',
-        'share/jupyter/kernels/javascript/',
-    ],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/JupyterKernel-Julia/JupyterKernel-Julia-1.7.1-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb b/Golden_Repo/j/JupyterKernel-Julia/JupyterKernel-Julia-1.7.1-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb
deleted file mode 100644
index 92156b458..000000000
--- a/Golden_Repo/j/JupyterKernel-Julia/JupyterKernel-Julia-1.7.1-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb
+++ /dev/null
@@ -1,129 +0,0 @@
-easyblock = 'JuliaBundle'
-
-name = 'JupyterKernel-Julia'
-version = '1.7.1'
-local_jupyterver = '2022.3.3'
-versionsuffix = '-' + local_jupyterver
-
-homepage = 'https://github.com/JuliaLang/IJulia.jl'
-description = """
-Native Julia kernel for Jupyter.
-Project Jupyter exists to develop open-source software, open-standards, and services
-for interactive computing across dozens of programming languages.
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('Julia', version),
-]
-
-components = [
-    ('julia', '0.5.6', {
-        'easyblock': 'PythonPackage',
-        'use_pip': True,
-        'sources': ['v%(version)s.tar.gz'],
-        'source_urls': ['https://github.com/JuliaPy/pyjulia/archive/'],
-        'checksums': [('sha256', 'ca4a1dc3df9b770dacbbecab5495cae817a5dde0ac2d3ff1db1f8e447f0e48b7')],
-        'download_dep_fail': True,
-        'start_dir': 'pyjulia-%(version)s',
-    }),
-]
-
-local_jupyter_path = 'share/jupyter'
-
-exts_defaultclass = 'JuliaPackage'
-exts_list = [
-    ('ZMQ', '1.2.1', {
-        'source_tmpl': 'v%(version)s.tar.gz',
-        'source_urls': ['https://github.com/JuliaInterop/ZMQ.jl/archive/'],
-        'checksums': [('sha256', '8b42555340d0208e5a36cd5e8f29a3f0d44c13c064382d4b1e5d00c1c4a9dd96')],
-    }),
-    ('Interact', '0.10.4', {
-        'source_tmpl': 'v%(version)s.tar.gz',
-        'source_urls': ['https://github.com/JuliaGizmos/Interact.jl/archive/'],
-        'checksums': ['e1014435b806a656af56a6b635c7bfac82ba46ffe6a1fe8830d29dd60600fb81'],
-    }),
-    ('LanguageServer', '4.1.0', {
-        'source_tmpl': 'v%(version)s.tar.gz',
-        'source_urls': ['https://github.com/julia-vscode/LanguageServer.jl/archive/'],
-        'checksums': ['20353fc0d34ca31ed0c78ab9cf565524700e4e4731aab87dfe9f05eca603f614'],
-    }),
-    ('SymbolServer', '7.0.1', {
-        'source_tmpl': 'v%(version)s.tar.gz',
-        'source_urls': ['https://github.com/julia-vscode/SymbolServer.jl/archive/'],
-        'checksums': ['5186b777358af611c6b99d7d2c04345e866dfc0b74bc282d45357ed73c4a0ee2'],
-    }),
-    ('IJulia', '1.23.3', {
-        # installs ijulia in JULIA_DEPOT_PATH and kernel in $JUPYTER_DATA_DIR/kernels
-        'source_tmpl': 'v%(version)s.tar.gz',
-        'source_urls': ['https://github.com/JuliaLang/IJulia.jl/archive/'],
-        'checksums': ['1471ed94093efd24bae5e6ff1d3f7fa61901bf8834a737eeae2a9e620f50f07c'],
-        'preinstallopts': 'export JUPYTER_DATA_DIR=%%(installdir)s/%s' % local_jupyter_path
-    }),
-]
-
-modextrapaths = {
-    'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages'],
-    'JUPYTER_PATH': [local_jupyter_path],  # add search path for kernelspecs
-}
-
-# Ensure that the user-specific $HOME/.local/share/jupyter is always first entry in JUPYTHER_PATH
-modluafooter = """
-prepend_path("JUPYTER_PATH", pathJoin(os.getenv("HOME"), ".local/share/jupyter"))
-"""
-
-postinstallcmds = [
-    # Create virtual environment to ensure we install in the correct directory !!!
-    'python3 -m venv %(installdir)s --system-site-packages',
-    'mkdir -p %%(installdir)s/%s' % local_jupyter_path,
-    (
-        '{ cat > %%(builddir)s/env.sh; } << \'EOF\'\n'
-        '#!/bin/bash\n'
-        'source %%(installdir)s/bin/activate\n'
-        'export PYTHONPATH=%%(installdir)s/lib/python%%(pyshortver)s/site-packages:${PYTHONPATH}\n'
-        ''
-        'export JULIA_DEPOT_PATH=${EBJULIA_STD_DEPOT_PATH}:${EBJULIA_ADMIN_DEPOT_PATH}\n'
-        'export JUPYTER_DATA_DIR=%%(installdir)s/%s\n'
-        'EOF'
-    ) % (local_jupyter_path),
-
-    # configure Python<->Julia bridge (of python package julia)
-    'source %(builddir)s/env.sh && python -c "import julia; julia.install()"',
-
-    # Ensure we remove the virtuel environment to avoid wrong search path for python packages
-    'rm -f %(installdir)s/pyvenv.cfg',
-    'rm -f %(installdir)s/bin/python',
-    'rm -f %(installdir)s/bin/python3',
-    'rm -f %(installdir)s/bin/activate',
-    'rm -f %(installdir)s/bin/activate*',
-    'rm -f %(installdir)s/bin/easy_install*',
-    'rm -f %(installdir)s/bin/pip*',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/_distutils_hack',
-    'rm -f %(installdir)s/lib/python%(pyshortver)s/site-packages/distutils-precedence.pth',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/pip',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/pip-*',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/pkg_resources',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/setuptools',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/setuptools-*',
-]
-
-# specify that Bundle easyblock should run a full sanity check, rather than just trying to load the module
-# full_sanity_check = True
-sanity_check_paths = {
-    'files': [
-        'share/jupyter/kernels/julia-%(version_major_minor)s/kernel.json',
-    ],
-    'dirs': [
-        'lib/python%(pyshortver)s/site-packages',
-        'share/jupyter/kernels/julia-%(version_major_minor)s/',
-    ],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/JupyterKernel-Julia/JupyterKernel-Julia-1.7.1-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb b/Golden_Repo/j/JupyterKernel-Julia/JupyterKernel-Julia-1.7.1-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
deleted file mode 100644
index abc3d48e0..000000000
--- a/Golden_Repo/j/JupyterKernel-Julia/JupyterKernel-Julia-1.7.1-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
+++ /dev/null
@@ -1,129 +0,0 @@
-easyblock = 'JuliaBundle'
-
-name = 'JupyterKernel-Julia'
-version = '1.7.1'
-local_jupyterver = '2022.3.4'
-versionsuffix = '-' + local_jupyterver
-
-homepage = 'https://github.com/JuliaLang/IJulia.jl'
-description = """
-Native Julia kernel for Jupyter.
-Project Jupyter exists to develop open-source software, open-standards, and services
-for interactive computing across dozens of programming languages.
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('Julia', version),
-]
-
-components = [
-    ('julia', '0.5.6', {
-        'easyblock': 'PythonPackage',
-        'use_pip': True,
-        'sources': ['v%(version)s.tar.gz'],
-        'source_urls': ['https://github.com/JuliaPy/pyjulia/archive/'],
-        'checksums': [('sha256', 'ca4a1dc3df9b770dacbbecab5495cae817a5dde0ac2d3ff1db1f8e447f0e48b7')],
-        'download_dep_fail': True,
-        'start_dir': 'pyjulia-%(version)s',
-    }),
-]
-
-local_jupyter_path = 'share/jupyter'
-
-exts_defaultclass = 'JuliaPackage'
-exts_list = [
-    ('ZMQ', '1.2.1', {
-        'source_tmpl': 'v%(version)s.tar.gz',
-        'source_urls': ['https://github.com/JuliaInterop/ZMQ.jl/archive/'],
-        'checksums': [('sha256', '8b42555340d0208e5a36cd5e8f29a3f0d44c13c064382d4b1e5d00c1c4a9dd96')],
-    }),
-    ('Interact', '0.10.4', {
-        'source_tmpl': 'v%(version)s.tar.gz',
-        'source_urls': ['https://github.com/JuliaGizmos/Interact.jl/archive/'],
-        'checksums': ['e1014435b806a656af56a6b635c7bfac82ba46ffe6a1fe8830d29dd60600fb81'],
-    }),
-    ('LanguageServer', '4.1.0', {
-        'source_tmpl': 'v%(version)s.tar.gz',
-        'source_urls': ['https://github.com/julia-vscode/LanguageServer.jl/archive/'],
-        'checksums': ['20353fc0d34ca31ed0c78ab9cf565524700e4e4731aab87dfe9f05eca603f614'],
-    }),
-    ('SymbolServer', '7.0.1', {
-        'source_tmpl': 'v%(version)s.tar.gz',
-        'source_urls': ['https://github.com/julia-vscode/SymbolServer.jl/archive/'],
-        'checksums': ['5186b777358af611c6b99d7d2c04345e866dfc0b74bc282d45357ed73c4a0ee2'],
-    }),
-    ('IJulia', '1.23.3', {
-        # installs ijulia in JULIA_DEPOT_PATH and kernel in $JUPYTER_DATA_DIR/kernels
-        'source_tmpl': 'v%(version)s.tar.gz',
-        'source_urls': ['https://github.com/JuliaLang/IJulia.jl/archive/'],
-        'checksums': ['1471ed94093efd24bae5e6ff1d3f7fa61901bf8834a737eeae2a9e620f50f07c'],
-        'preinstallopts': 'export JUPYTER_DATA_DIR=%%(installdir)s/%s' % local_jupyter_path
-    }),
-]
-
-modextrapaths = {
-    'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages'],
-    'JUPYTER_PATH': [local_jupyter_path],  # add search path for kernelspecs
-}
-
-# Ensure that the user-specific $HOME/.local/share/jupyter is always first entry in JUPYTHER_PATH
-modluafooter = """
-prepend_path("JUPYTER_PATH", pathJoin(os.getenv("HOME"), ".local/share/jupyter"))
-"""
-
-postinstallcmds = [
-    # Create virtual environment to ensure we install in the correct directory !!!
-    'python3 -m venv %(installdir)s --system-site-packages',
-    'mkdir -p %%(installdir)s/%s' % local_jupyter_path,
-    (
-        '{ cat > %%(builddir)s/env.sh; } << \'EOF\'\n'
-        '#!/bin/bash\n'
-        'source %%(installdir)s/bin/activate\n'
-        'export PYTHONPATH=%%(installdir)s/lib/python%%(pyshortver)s/site-packages:${PYTHONPATH}\n'
-        ''
-        'export JULIA_DEPOT_PATH=${EBJULIA_STD_DEPOT_PATH}:${EBJULIA_ADMIN_DEPOT_PATH}\n'
-        'export JUPYTER_DATA_DIR=%%(installdir)s/%s\n'
-        'EOF'
-    ) % (local_jupyter_path),
-
-    # configure Python<->Julia bridge (of python package julia)
-    'source %(builddir)s/env.sh && python -c "import julia; julia.install()"',
-
-    # Ensure we remove the virtuel environment to avoid wrong search path for python packages
-    'rm -f %(installdir)s/pyvenv.cfg',
-    'rm -f %(installdir)s/bin/python',
-    'rm -f %(installdir)s/bin/python3',
-    'rm -f %(installdir)s/bin/activate',
-    'rm -f %(installdir)s/bin/activate*',
-    'rm -f %(installdir)s/bin/easy_install*',
-    'rm -f %(installdir)s/bin/pip*',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/_distutils_hack',
-    'rm -f %(installdir)s/lib/python%(pyshortver)s/site-packages/distutils-precedence.pth',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/pip',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/pip-*',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/pkg_resources',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/setuptools',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/setuptools-*',
-]
-
-# specify that Bundle easyblock should run a full sanity check, rather than just trying to load the module
-# full_sanity_check = True
-sanity_check_paths = {
-    'files': [
-        'share/jupyter/kernels/julia-%(version_major_minor)s/kernel.json',
-    ],
-    'dirs': [
-        'lib/python%(pyshortver)s/site-packages',
-        'share/jupyter/kernels/julia-%(version_major_minor)s/',
-    ],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/JupyterKernel-Octave/JupyterKernel-Octave-6.4.0-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb b/Golden_Repo/j/JupyterKernel-Octave/JupyterKernel-Octave-6.4.0-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb
deleted file mode 100644
index 25f507385..000000000
--- a/Golden_Repo/j/JupyterKernel-Octave/JupyterKernel-Octave-6.4.0-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb
+++ /dev/null
@@ -1,141 +0,0 @@
-easyblock = 'Bundle'
-
-name = 'JupyterKernel-Octave'
-version = '6.4.0'
-local_octavever = '6.4.0'
-local_jupyterver = '2022.3.3'
-versionsuffix = '-' + local_jupyterver
-
-homepage = 'https://github.com/Calysto/octave_kernel'
-description = """
-Native Octave kernel for Jupyter.
-Project Jupyter exists to develop open-source software, open-standards, and services
-for interactive computing across dozens of programming languages.
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Octave', local_octavever, '-nompi'),  # ensure it is available
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('Jupyter', local_jupyterver),
-    # no dependency to Octave as it is loaded in kernel.sh
-]
-
-local_jupyter_path = 'share/jupyter'
-local_kernel_dir = 'octave'
-local_kernel_name = 'Octave-%s' % local_octavever
-
-modextrapaths = {
-    'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages'],
-    'JUPYTER_PATH': ['share/jupyter'],  # add search path for kernelspecs
-}
-
-# Ensure that the user-specific $HOME/.local/share/jupyter is always first entry in JUPYTHER_PATH
-modluafooter = """
-prepend_path("JUPYTER_PATH", pathJoin(os.getenv("HOME"), ".local/share/jupyter"))
-"""
-
-postinstallcmds = [
-    # Create virtual environment to ensure we install in the correct directory !!!
-    'python3 -m venv %(installdir)s --system-site-packages',
-    (
-        '{ cat > %%(builddir)s/env.sh; } << \'EOF\'\n'
-        '#!/bin/bash\n'
-        'source %%(installdir)s/bin/activate\n'
-        'export PYTHONPATH=%%(installdir)s/lib/python%%(pyshortver)s/site-packages:${PYTHONPATH}\n'
-        'export JUPYTER_DATA_DIR=%%(installdir)s/%s\n'
-        'EOF'
-    ) % (local_jupyter_path),
-
-    # enable use of Octave from production stage
-    # '--no-deps' only because we know its installed in module Jupyter
-    'source %(builddir)s/env.sh && pip3 install --upgrade --no-deps --force-reinstall ipykernel ',
-    'rm -rf %(installdir)s/share/jupyter/kernels/',  # remove any kernel installed by ipykernel
-    # 'source %(builddir)s/env.sh && pip3 install --upgrade --no-deps --force-reinstall ipyparallel ',
-
-    # install Python package octave_kernel
-    # we rely on pip for automatic installation of dependencies!
-    'source %(builddir)s/env.sh && pip3 install --upgrade --no-deps --force-reinstall metakernel==0.29.0 ',
-    'source %(builddir)s/env.sh && pip3 install --upgrade --no-deps --force-reinstall octave_kernel==0.34.2 ',
-
-    # write kernel.sh
-    (
-        '{ cat >> %%(builddir)s/env.sh; } << \'EOF\'\n'
-        'export KERNEL_DIR=%s\n'
-        'export KERNEL_NAME=%s\n'
-        'EOF'
-    ) % (local_kernel_dir, local_kernel_name),
-    (
-        '{ source %%(builddir)s/env.sh && '
-        '  cat > %%(installdir)s/share/jupyter/kernels/%s/kernel.sh; } << EOF\n'
-        '#!/bin/bash \n'
-        '\n'
-        '# Load required modules \n'
-        'module purge \n'
-        'module load Stages/${STAGE} \n'
-        'module load GCCcore/.11.2.0 \n'
-        '\n'
-        'module load Python/%%(pyver)s \n'
-        'module load Jupyter/%s \n'
-        'module load Octave/%s-nompi \n'
-        '\n'
-        'export PYTHONPATH=%%(installdir)s/lib/python%%(pyshortver)s/site-packages:\${PYTHONPATH} \n'
-        '\n'
-        'exec python \$@\n'
-        'EOF'
-    ) % (local_kernel_dir, local_jupyterver, local_octavever),
-    'source %(builddir)s/env.sh && chmod +x %(installdir)s/share/jupyter/kernels/${KERNEL_DIR}/kernel.sh',
-
-    # write kernel.json
-    (
-        '{ source %%(builddir)s/env.sh && '
-        '  cat > %%(installdir)s/share/jupyter/kernels/%s/kernel.json; } << \'EOF\'\n'
-        '{ \n'
-        '  "argv": [ \n'
-        '    "%%(installdir)s/share/jupyter/kernels/%s/kernel.sh", \n'
-        '    "-m", \n'
-        '    "octave_kernel", \n'
-        '    "-f", \n'
-        '    "{connection_file}" \n'
-        '  ], \n'
-        '  "display_name": "%s", \n'
-        '  "mimetype": "text/x-octave", \n'
-        '  "language": "python", \n'
-        '  "name": "%s" \n'
-        '}\n'
-        'EOF'
-    ) % (local_kernel_dir, local_kernel_dir, local_kernel_name, local_kernel_name),
-
-    # ensure correct permissions
-    'source %(builddir)s/env.sh && chmod -R o+x %(installdir)s/share',
-
-    # Ensure we remove the virtuel environment to avoid wrong search path for python packages
-    'rm -f %(installdir)s/pyvenv.cfg',
-    'rm -rf %(installdir)s/bin',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/_distutils_hack',
-    'rm -f %(installdir)s/lib/python%(pyshortver)s/site-packages/distutils-precedence.pth',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/pip',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/pip-*',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/pkg_resources',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/setuptools',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/setuptools-*',
-]
-
-sanity_check_paths = {
-    'files': [
-        'share/jupyter/kernels/%s/kernel.sh' % local_kernel_dir,
-        'share/jupyter/kernels/%s/kernel.json' % local_kernel_dir,
-    ],
-    'dirs': [
-        'lib/python%(pyshortver)s/site-packages',
-        'share/jupyter/kernels/octave/',
-    ],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/JupyterKernel-Octave/JupyterKernel-Octave-6.4.0-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb b/Golden_Repo/j/JupyterKernel-Octave/JupyterKernel-Octave-6.4.0-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
deleted file mode 100644
index 9185d44ee..000000000
--- a/Golden_Repo/j/JupyterKernel-Octave/JupyterKernel-Octave-6.4.0-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
+++ /dev/null
@@ -1,141 +0,0 @@
-easyblock = 'Bundle'
-
-name = 'JupyterKernel-Octave'
-version = '6.4.0'
-local_octavever = version
-local_jupyterver = '2022.3.4'
-versionsuffix = '-' + local_jupyterver
-
-homepage = 'https://github.com/Calysto/octave_kernel'
-description = """
-Native Octave kernel for Jupyter.
-Project Jupyter exists to develop open-source software, open-standards, and services
-for interactive computing across dozens of programming languages.
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Octave', local_octavever, '-nompi'),  # ensure it is available
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('Jupyter', local_jupyterver),
-    # no dependency to Octave as it is loaded in kernel.sh
-]
-
-local_jupyter_path = 'share/jupyter'
-local_kernel_dir = 'octave'
-local_kernel_name = 'Octave-%s' % local_octavever
-
-modextrapaths = {
-    'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages'],
-    'JUPYTER_PATH': ['share/jupyter'],  # add search path for kernelspecs
-}
-
-# Ensure that the user-specific $HOME/.local/share/jupyter is always first entry in JUPYTHER_PATH
-modluafooter = """
-prepend_path("JUPYTER_PATH", pathJoin(os.getenv("HOME"), ".local/share/jupyter"))
-"""
-
-postinstallcmds = [
-    # Create virtual environment to ensure we install in the correct directory !!!
-    'python3 -m venv %(installdir)s --system-site-packages',
-    (
-        '{ cat > %%(builddir)s/env.sh; } << \'EOF\'\n'
-        '#!/bin/bash\n'
-        'source %%(installdir)s/bin/activate\n'
-        'export PYTHONPATH=%%(installdir)s/lib/python%%(pyshortver)s/site-packages:${PYTHONPATH}\n'
-        'export JUPYTER_DATA_DIR=%%(installdir)s/%s\n'
-        'EOF'
-    ) % (local_jupyter_path),
-
-    # enable use of Octave from production stage
-    # '--no-deps' only because we know its installed in module Jupyter
-    'source %(builddir)s/env.sh && pip3 install --upgrade --no-deps --force-reinstall ipykernel ',
-    'rm -rf %(installdir)s/share/jupyter/kernels/',  # remove any kernel installed by ipykernel
-    # 'source %(builddir)s/env.sh && pip3 install --upgrade --no-deps --force-reinstall ipyparallel ',
-
-    # install Python package octave_kernel
-    # we rely on pip for automatic installation of dependencies!
-    'source %(builddir)s/env.sh && pip3 install --upgrade --no-deps --force-reinstall metakernel==0.29.0 ',
-    'source %(builddir)s/env.sh && pip3 install --upgrade --no-deps --force-reinstall octave_kernel==0.34.2 ',
-
-    # write kernel.sh
-    (
-        '{ cat >> %%(builddir)s/env.sh; } << \'EOF\'\n'
-        'export KERNEL_DIR=%s\n'
-        'export KERNEL_NAME=%s\n'
-        'EOF'
-    ) % (local_kernel_dir, local_kernel_name),
-    (
-        '{ source %%(builddir)s/env.sh && '
-        '  cat > %%(installdir)s/share/jupyter/kernels/%s/kernel.sh; } << EOF\n'
-        '#!/bin/bash \n'
-        '\n'
-        '# Load required modules \n'
-        'module purge \n'
-        'module load Stages/${STAGE} \n'
-        'module load GCCcore/.11.2.0 \n'
-        '\n'
-        'module load Python/%%(pyver)s \n'
-        'module load Jupyter/%s \n'
-        'module load Octave/%s-nompi \n'
-        '\n'
-        'export PYTHONPATH=%%(installdir)s/lib/python%%(pyshortver)s/site-packages:\${PYTHONPATH} \n'
-        '\n'
-        'exec python \$@\n'
-        'EOF'
-    ) % (local_kernel_dir, local_jupyterver, local_octavever),
-    'source %(builddir)s/env.sh && chmod +x %(installdir)s/share/jupyter/kernels/${KERNEL_DIR}/kernel.sh',
-
-    # write kernel.json
-    (
-        '{ source %%(builddir)s/env.sh && '
-        '  cat > %%(installdir)s/share/jupyter/kernels/%s/kernel.json; } << \'EOF\'\n'
-        '{ \n'
-        '  "argv": [ \n'
-        '    "%%(installdir)s/share/jupyter/kernels/%s/kernel.sh", \n'
-        '    "-m", \n'
-        '    "octave_kernel", \n'
-        '    "-f", \n'
-        '    "{connection_file}" \n'
-        '  ], \n'
-        '  "display_name": "%s", \n'
-        '  "mimetype": "text/x-octave", \n'
-        '  "language": "python", \n'
-        '  "name": "%s" \n'
-        '}\n'
-        'EOF'
-    ) % (local_kernel_dir, local_kernel_dir, local_kernel_name, local_kernel_name),
-
-    # ensure correct permissions
-    'source %(builddir)s/env.sh && chmod -R o+x %(installdir)s/share',
-
-    # Ensure we remove the virtuel environment to avoid wrong search path for python packages
-    'rm -f %(installdir)s/pyvenv.cfg',
-    'rm -rf %(installdir)s/bin',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/_distutils_hack',
-    'rm -f %(installdir)s/lib/python%(pyshortver)s/site-packages/distutils-precedence.pth',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/pip',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/pip-*',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/pkg_resources',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/setuptools',
-    'rm -rf %(installdir)s/lib/python%(pyshortver)s/site-packages/setuptools-*',
-]
-
-sanity_check_paths = {
-    'files': [
-        'share/jupyter/kernels/%s/kernel.sh' % local_kernel_dir,
-        'share/jupyter/kernels/%s/kernel.json' % local_kernel_dir,
-    ],
-    'dirs': [
-        'lib/python%(pyshortver)s/site-packages',
-        'share/jupyter/kernels/octave/',
-    ],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/JupyterKernel-PyDeepLearning/JupyterKernel-PyDeepLearning-1.1-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb b/Golden_Repo/j/JupyterKernel-PyDeepLearning/JupyterKernel-PyDeepLearning-1.1-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb
deleted file mode 100644
index 1899f9ea8..000000000
--- a/Golden_Repo/j/JupyterKernel-PyDeepLearning/JupyterKernel-PyDeepLearning-1.1-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb
+++ /dev/null
@@ -1,163 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'JupyterKernel-PyDeepLearning'
-version = '1.1'
-local_jupyterver = '2022.3.3'
-versionsuffix = '-' + local_jupyterver
-
-homepage = 'https://www.fz-juelich.de'
-description = """
-Special DeepLearning kernel for Jupyter.
-Project Jupyter exists to develop open-source software, open-standards, and services
-for interactive computing across dozens of programming languages.
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('binutils', '2.37'),
-    # just ensure they exist
-    ('CUDA', '11.5', '', SYSTEM),
-    ('OpenCV', '4.5.4'),
-    ('TensorFlow', '2.6.0', '-CUDA-%(cudaver)s'),
-    ('protobuf-python', '3.17.3'),
-    ('PyTorch', '1.11', '-CUDA-%(cudaver)s'),
-    ('PyTorch-Geometric', '2.0.4'),
-    ('torchvision', '0.12.0', '-CUDA-11.5'),
-    # ('OpenAI-Gym', '0.18.0'),
-    # ('DeepSpeed', '0.5.4', '', ('gomkl', '2021b')),
-    # ('Horovod', '0.24.3', '', ('gomkl', '2021b')),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('Jupyter', local_jupyterver),
-]
-
-components = [
-    ('logos', '1.0', {
-        'easyblock': 'Binary',
-        'sources': [
-            {'filename': 'logo-32x32.png.base64', 'extract_cmd': "base64 -d %s > %%(builddir)s/logo-32x32.png"},
-            {'filename': 'logo-64x64.png.base64', 'extract_cmd': "base64 -d %s > %%(builddir)s/logo-64x64.png"},
-            {'filename': 'logo-128x128.png.base64', 'extract_cmd': "base64 -d %s > %%(builddir)s/logo-128x128.png"},
-        ],
-        'checksums': [
-            '08651dd90fd0ce20a8f3d62bdbeacf34dfae7a73e61fde912d080222aa00e6b7',
-            'c3230068b407ff172b369208c20a24ed04971ce38e2fdf9116100102e14221a8',
-            'baa78f71dd2bb4e51eab0c653535365e54a717506622bcff4f834d653a17a2bf',
-        ],
-    }),
-]
-
-exts_default_options = {
-    'source_urls': [PYPI_SOURCE],
-    'use_pip': True,
-    'sanity_pip_check': False,  # skip as it requires protobuf, TensorFlow
-    'download_dep_fail': True,
-    'use_pip_for_deps': False,
-}
-
-exts_list = [
-    ('lmdb', '1.1.1', {
-        'checksums': ['165cd1669b29b16c2d5cc8902b90fede15a7ee475c54d466f1444877a3f511ac'],
-    }),
-    ('gviz_api', '1.9.0', {
-        'checksums': ['43d13ccc21834d0501b33a291ef3265e933dbb4bbdca3d34b1ed0a048c0ef640'],
-    }),
-    ('tensorboard_plugin_profile', '2.5.0', {
-        'checksums': ['f832698d87a773b9a017fc4dd5cf598a1ff942ccfbf3392c83fe12c949ab9f52'],
-    }),
-    ('tensorflow_hub', '0.12.0', {
-        'source_tmpl': 'tensorflow_hub-0.12.0-py2.py3-none-any.whl',
-        'checksums': ['822fe5f7338c95efcc3a534011c6689e4309ba2459def87194179c4de8a6e1fc'],
-        'unpack_sources': False,
-        'modulename': False,  # skip sanity check as 'import' will fail without TensorFlow
-    }),
-]
-
-local_kernel_dir = 'pydeeplearning'
-local_kernel_name = 'PyDeepLearning-%s' % version
-
-modextrapaths = {
-    'JUPYTER_PATH': ['share/jupyter'],  # add search path for kernelspecs
-    'HOROVOD_MPI_THREADS_DISABLE': ['1'],  # no mpi by default
-}
-
-# Ensure that the user-specific $HOME/.local/share/jupyter is first entry in JUPYTHER_PATH
-modluafooter = """
-prepend_path("JUPYTER_PATH", pathJoin(os.getenv("HOME"), ".local/share/jupyter"))
-"""
-
-postinstallcmds = [
-    # create kernel skeleton
-    (
-        'python -m ipykernel install --name=%s --prefix=%%(installdir)s && '
-        'mv %%(installdir)s/logo-32x32.png   %%(installdir)s/share/jupyter/kernels/%s/logo-32x32.png && '
-        'mv %%(installdir)s/logo-64x64.png   %%(installdir)s/share/jupyter/kernels/%s/logo-64x64.png && '
-        'mv %%(installdir)s/logo-128x128.png %%(installdir)s/share/jupyter/kernels/%s/logo-128x128.png'
-    ) % (local_kernel_dir, local_kernel_dir, local_kernel_dir, local_kernel_dir),
-
-    # write kernel.sh
-    (
-        '{ cat > %%(installdir)s/share/jupyter/kernels/%s/kernel.sh; } << EOF\n'
-        '#!/bin/bash \n'
-        '\n'
-        '# Load required modules \n'
-        'module purge \n'
-        'module load Stages/${STAGE} \n'
-        'module load GCC/11.2.0 \n'
-        'module load OpenMPI \n'
-        'module load %s/.%s%s \n'
-        '\n'
-        'module load OpenCV/4.5.4 \n'
-        'module load TensorFlow/2.6.0-CUDA-11.5 \n'
-        'module load protobuf-python/.3.17.3 \n'
-        'module load PyTorch/1.11-CUDA-11.5 \n'
-        'module load PyTorch-Geometric/2.0.4 \n'
-        'module load torchvision/0.12.0-CUDA-11.5 \n'
-        '# module load OpenAI-Gym/0.18.0 \n'
-        '# module load DeepSpeed/0.5.4 \n'
-        'module load Horovod/0.24.3 \n'
-        '\n'
-        'export PYTHONPATH=%%(installdir)s/lib/python%%(pyshortver)s/site-packages:\$PYTHONPATH \n'
-        'exec python -m ipykernel \$@\n'
-        '\n'
-        'EOF'
-    ) % (local_kernel_dir, name, version, versionsuffix),
-    'chmod +x %%(installdir)s/share/jupyter/kernels/%s/kernel.sh' % local_kernel_dir,
-
-    # write kernel.json
-    (
-        '{ cat > %%(installdir)s/share/jupyter/kernels/%s/kernel.json; } << \'EOF\'\n'
-        '{ \n'
-        '  "argv": [ \n'
-        '    "%%(installdir)s/share/jupyter/kernels/%s/kernel.sh", \n'
-        '    "-m", \n'
-        '    "ipykernel_launcher", \n'
-        '    "-f", \n'
-        '    "{connection_file}" \n'
-        '  ], \n'
-        '  "display_name": "%s", \n'
-        '  "language": "python", \n'
-        '  "name": "%s", \n'
-        '  "metadata": { \n'
-        '    "debugger": true \n'
-        '  } \n'
-        '}\n'
-        'EOF'
-    ) % (local_kernel_dir, local_kernel_dir, local_kernel_name, local_kernel_name),
-]
-
-sanity_check_paths = {
-    'files': [
-        'share/jupyter/kernels/%s/kernel.sh' % local_kernel_dir,
-        'share/jupyter/kernels/%s/kernel.json' % local_kernel_dir,
-    ],
-    'dirs': [
-        'share/jupyter/kernels/',
-    ],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/JupyterKernel-PyDeepLearning/JupyterKernel-PyDeepLearning-1.1-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb b/Golden_Repo/j/JupyterKernel-PyDeepLearning/JupyterKernel-PyDeepLearning-1.1-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
deleted file mode 100644
index 34f96208d..000000000
--- a/Golden_Repo/j/JupyterKernel-PyDeepLearning/JupyterKernel-PyDeepLearning-1.1-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
+++ /dev/null
@@ -1,163 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'JupyterKernel-PyDeepLearning'
-version = '1.1'
-local_jupyterver = '2022.3.4'
-versionsuffix = '-' + local_jupyterver
-
-homepage = 'https://www.fz-juelich.de'
-description = """
-Special DeepLearning kernel for Jupyter.
-Project Jupyter exists to develop open-source software, open-standards, and services
-for interactive computing across dozens of programming languages.
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('binutils', '2.37'),
-    # just ensure they exist
-    ('CUDA', '11.5', '', SYSTEM),
-    ('OpenCV', '4.5.4'),
-    ('TensorFlow', '2.6.0', '-CUDA-%(cudaver)s'),
-    ('protobuf-python', '3.17.3'),
-    ('PyTorch', '1.11', '-CUDA-%(cudaver)s'),
-    ('PyTorch-Geometric', '2.0.4'),
-    ('torchvision', '0.12.0', '-CUDA-11.5'),
-    # ('OpenAI-Gym', '0.18.0'),
-    # ('DeepSpeed', '0.5.4', '', ('gomkl', '2021b')),
-    # ('Horovod', '0.24.3', '', ('gomkl', '2021b')),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('Jupyter', local_jupyterver),
-]
-
-components = [
-    ('logos', '1.0', {
-        'easyblock': 'Binary',
-        'sources': [
-            {'filename': 'logo-32x32.png.base64', 'extract_cmd': "base64 -d %s > %%(builddir)s/logo-32x32.png"},
-            {'filename': 'logo-64x64.png.base64', 'extract_cmd': "base64 -d %s > %%(builddir)s/logo-64x64.png"},
-            {'filename': 'logo-128x128.png.base64', 'extract_cmd': "base64 -d %s > %%(builddir)s/logo-128x128.png"},
-        ],
-        'checksums': [
-            '08651dd90fd0ce20a8f3d62bdbeacf34dfae7a73e61fde912d080222aa00e6b7',
-            'c3230068b407ff172b369208c20a24ed04971ce38e2fdf9116100102e14221a8',
-            'baa78f71dd2bb4e51eab0c653535365e54a717506622bcff4f834d653a17a2bf',
-        ],
-    }),
-]
-
-exts_default_options = {
-    'source_urls': [PYPI_SOURCE],
-    'use_pip': True,
-    'sanity_pip_check': False,  # skip as it requires protobuf, TensorFlow
-    'download_dep_fail': True,
-    'use_pip_for_deps': False,
-}
-
-exts_list = [
-    ('lmdb', '1.1.1', {
-        'checksums': ['165cd1669b29b16c2d5cc8902b90fede15a7ee475c54d466f1444877a3f511ac'],
-    }),
-    ('gviz_api', '1.9.0', {
-        'checksums': ['43d13ccc21834d0501b33a291ef3265e933dbb4bbdca3d34b1ed0a048c0ef640'],
-    }),
-    ('tensorboard_plugin_profile', '2.5.0', {
-        'checksums': ['f832698d87a773b9a017fc4dd5cf598a1ff942ccfbf3392c83fe12c949ab9f52'],
-    }),
-    ('tensorflow_hub', '0.12.0', {
-        'source_tmpl': 'tensorflow_hub-0.12.0-py2.py3-none-any.whl',
-        'checksums': ['822fe5f7338c95efcc3a534011c6689e4309ba2459def87194179c4de8a6e1fc'],
-        'unpack_sources': False,
-        'modulename': False,  # skip sanity check as 'import' will fail without TensorFlow
-    }),
-]
-
-local_kernel_dir = 'pydeeplearning'
-local_kernel_name = 'PyDeepLearning-%s' % version
-
-modextrapaths = {
-    'JUPYTER_PATH': ['share/jupyter'],  # add search path for kernelspecs
-    'HOROVOD_MPI_THREADS_DISABLE': ['1'],  # no mpi by default
-}
-
-# Ensure that the user-specific $HOME/.local/share/jupyter is first entry in JUPYTHER_PATH
-modluafooter = """
-prepend_path("JUPYTER_PATH", pathJoin(os.getenv("HOME"), ".local/share/jupyter"))
-"""
-
-postinstallcmds = [
-    # create kernel skeleton
-    (
-        'python -m ipykernel install --name=%s --prefix=%%(installdir)s && '
-        'mv %%(installdir)s/logo-32x32.png   %%(installdir)s/share/jupyter/kernels/%s/logo-32x32.png && '
-        'mv %%(installdir)s/logo-64x64.png   %%(installdir)s/share/jupyter/kernels/%s/logo-64x64.png && '
-        'mv %%(installdir)s/logo-128x128.png %%(installdir)s/share/jupyter/kernels/%s/logo-128x128.png'
-    ) % (local_kernel_dir, local_kernel_dir, local_kernel_dir, local_kernel_dir),
-
-    # write kernel.sh
-    (
-        '{ cat > %%(installdir)s/share/jupyter/kernels/%s/kernel.sh; } << EOF\n'
-        '#!/bin/bash \n'
-        '\n'
-        '# Load required modules \n'
-        'module purge \n'
-        'module load Stages/${STAGE} \n'
-        'module load GCC/11.2.0 \n'
-        'module load OpenMPI \n'
-        'module load %s/.%s%s \n'
-        '\n'
-        'module load OpenCV/4.5.4 \n'
-        'module load TensorFlow/2.6.0-CUDA-11.5 \n'
-        'module load protobuf-python/.3.17.3 \n'
-        'module load PyTorch/1.11-CUDA-11.5 \n'
-        'module load PyTorch-Geometric/2.0.4 \n'
-        'module load torchvision/0.12.0-CUDA-11.5 \n'
-        '# module load OpenAI-Gym/0.18.0 \n'
-        '# module load DeepSpeed/0.5.4 \n'
-        'module load Horovod/0.24.3 \n'
-        '\n'
-        'export PYTHONPATH=%%(installdir)s/lib/python%%(pyshortver)s/site-packages:\$PYTHONPATH \n'
-        'exec python -m ipykernel \$@\n'
-        '\n'
-        'EOF'
-    ) % (local_kernel_dir, name, version, versionsuffix),
-    'chmod +x %%(installdir)s/share/jupyter/kernels/%s/kernel.sh' % local_kernel_dir,
-
-    # write kernel.json
-    (
-        '{ cat > %%(installdir)s/share/jupyter/kernels/%s/kernel.json; } << \'EOF\'\n'
-        '{ \n'
-        '  "argv": [ \n'
-        '    "%%(installdir)s/share/jupyter/kernels/%s/kernel.sh", \n'
-        '    "-m", \n'
-        '    "ipykernel_launcher", \n'
-        '    "-f", \n'
-        '    "{connection_file}" \n'
-        '  ], \n'
-        '  "display_name": "%s", \n'
-        '  "language": "python", \n'
-        '  "name": "%s", \n'
-        '  "metadata": { \n'
-        '    "debugger": true \n'
-        '  } \n'
-        '}\n'
-        'EOF'
-    ) % (local_kernel_dir, local_kernel_dir, local_kernel_name, local_kernel_name),
-]
-
-sanity_check_paths = {
-    'files': [
-        'share/jupyter/kernels/%s/kernel.sh' % local_kernel_dir,
-        'share/jupyter/kernels/%s/kernel.json' % local_kernel_dir,
-    ],
-    'dirs': [
-        'share/jupyter/kernels/',
-    ],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/JupyterKernel-PyDeepLearning/logo-128x128.png.base64 b/Golden_Repo/j/JupyterKernel-PyDeepLearning/logo-128x128.png.base64
deleted file mode 100644
index a45503592..000000000
--- a/Golden_Repo/j/JupyterKernel-PyDeepLearning/logo-128x128.png.base64
+++ /dev/null
@@ -1,164 +0,0 @@
-iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI
-WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH5QIGDS0A/QTlkQAAAB1pVFh0Q29tbWVudAAAAAAAQ3Jl
-YXRlZCB3aXRoIEdJTVBkLmUHAAAgAElEQVR42u2d+XNb15XnP+dh4aZ9swBosyxvsmzHu53I8e7E
-jmNn7XGnDIBO0tXprq781FM1P03X/ANTNVMz6YwnbYkP7lTSsTNxnHhTvMuWLe9rtDqWROBR+y5u
-wDvzw70PeABBEgQpiRF5q1CiQPDhvXv271kuTK8pvWTKPrlbEKAFiNh3SsAAmaQ/lbYhOoWZvwO4
-BZhv/38AeB04Os0AU0P5xYALEFL2jT3AO1NtF6ayBgjUfjH0s061DXCm3aCpvaYZYJoBptc0A0yv
-KRsOR6cJj1P+V6ceI0xlBjgC/Lws/YraSGB6Ta/pNb2mnZ9zfLkFB2hDJJwL6CWdmM4FTJE1E+R7
-QML+Pw88hckJTDPAX8Va77XgaDtIC2gURBAtoTKA+r1kUydHUH5GA5ikEPbnKRcW//UxwL/tEmKx
-JCLnoSQRWYAyC6QVwQEZAE4gziFyXg+wFyVPJnGqztUU8EM/6zQDTOaV85YCq4FVwBJDcEpIDfGE
-+cBKK9GHEL7A9bZR9D/hh6mB+hdXpnGAyboe625BI9cBVwOLLbEHQ46sU6O+fSAg9AzgSwiriDkX
-43pvkkn8ZSj9p6Y/PPkZwPVmotwNrAHiVNK3USAG9AP7gOOgRZA4MAtYiKn2GbCvFuByhEXkvLdQ
-Pjoj9//ITofWtkUoLSADxPp6+MH5Os0AjawubwbwAHCRlfSSJWoM5c/ARwgFS+CiQfPUAaIIrags
-Q7jOevqDlnkWALcBqZD9Pw3mKj8H5GaQ5UDMmiufYusgOW8X8CrpxFmvPpq8ei/ntQL3AV8KOWgt
-qO4BngXxKPm9PJzyR2CgCA5xVK9A5B7LPBoyE2rfi6B0A0+QSewb/70XrgL5GtBqhUxr9nwQ6EP5
-I5nEJ9MMUI9wwvUID4RseQuwGdhAOnFsbNcrCKILECcDzKnj7U8cA+S8a4BvhSKL2r3WKkZQ/S2Z
-5FljgskZ9zrMR7g35OjFgbdQnhkz8QGySSWT2g/6M5Qjp43xuwqLgW/XhJQOqqes5jpeE4JGEbmf
-rvzMaR8gLP3KnQgRa7OjwDaUV4aJ5Rtf6WQvj+XXoc5Pa8zBBDGufKNGwg+h+gyZ5JaQU3sJwrct
-8GSY25E7gN9NXQ3QlXfIeS24XgfoPOAyS3wBjqO6mUzi4IR8V1EOo/qsjSAmzhi6hbnABZYBBDiG
-8ocq4gNkEltQ/kgl9RwBuYh13dGpxwBdXpScNxuRq4EHgX/Gkf+ClDfHAT7n1KnPJuw7O5MKfISp
-B3CqWGB8THBRKEQF2E8msb3uJzOJj4CTIVPgEIksn1omoMubiXA5sBaR+RhErxTaGLE/f85PVk1s
-uCZSBD4Gbi47meM3BjNCP5dQRtZYqj2IzAox+sypwQA/2yHM7FiBchvChTYc66+jiI0a9fliTNdf
-n2/DkRKZ5MCwn+nXQeKyC+G2UJQx3tVXo03aR/l8a41DOHjuM8Avdwml2BXAnQgL7eaLtccl4ASU
-N05Q+sgm9o9uf70YJjewFAMV/9lKeP3146SS8w4xsSVgX1jHsmQl+jzWF2bSmTxex+fpQGRR6DkV
-2Htu+wCP7BeK8atA7rVoXH8ZJFE+Bp4E3grdkwKNef2i8xD+E3APcAOwmvWF1pFVMEUblk1MSJhJ
-5lH22uspMJeI3E2X1z7E9DnOfSENoMBBMokD57YGaBu8BOTr1lYO2g3Yg+pGfN1JZ+o4buFiRKSM
-1EmVWh1pBdcr2teFRGQlMJLz6KP0I2VCTAAj6KsgfxMKX9fgMBu30I3QCzITSALLapjxtXMbB8gV
-FoDcb4lftMDOZygbyCQLIcupNXF0pKHr+xxD2IRwl9UabaC3ksvvI50aRrLUN4wjEwcKiVxMdX1B
-FLgAkeX2uWMhMwEmp7GRbGLLuc0AKt9GmBXahK2o/oFM8mCNZ3wcJILgW1PQ0SDSV8T13rf4gYko
-kAQq38P1flMfQxCtCdvGiQN4twKXhhhAqCSwxDK9hnyEOMrLKBtGuOY8RFehzC+bCtEdpFOH/3oY
-wPVuQFhBJZNXAP3TEOIDcWdw34C2hDHzVnJeO+kGEMBMYh+u9xzwNzbzpghJlL/DLbxCJrlpiBdQ
-nQ1sPhDMeVfYkDLsU/ViZg2ssCZKrY6LgRaA50C2kU0U64TIHTjcZRhKYiGEwgcp4nqfA8+SGX82
-8fQywKO7o1YtB1LQC/oe6eSeeh8feGhFCbeQtx6yAh2oLgG2NeZn9H5Gb9sfgW9YYqgJx+Tr5Lxb
-UT4DvkD0IKqtION//py3HLi3BlnsR/U/GBzcSSyWtEzQYXAN+QJTplYim9A6ArPIJsGWMzRdbVLh
-wmXAEnLeU6QT2yYvA8SiN1nnzLcM0ENR3hrlrz4B7rLqeQ4iFzbMAN9fqcBmct4A8HW76QE024Zw
-LXCtddTF+hyBZhq7BlhfmA98J/Q92Pt+kUxyh/1/3r4a0ZbzEL6BKWcbrKOdwv7KXOA+XO93ZBKf
-T9IwUG4IcXEv6Mc8nBjZ7grvhpwkB1iOW0iO6WvTiQ+AdcBfqC4d0/JLxB+X2n/UixCRB6zPoaHI
-4gPSiU1NmMo4wvWYmsdBe78+ymGUD0A3ofpFaG98YCHCWtx8x+TTAG4hBcwOSeAJSvrB6B69nLAe
-/c12I5Ygcg3ruvfy8JLSGJhgL/AobmE1Ijda7CEW8sTDDBH8r3GGiHGHDedCaV+2kkn8ftS/7cpH
-EEdC8q2IngdcD9JXcR71JTLJV2r29UJEHqRSHrcSkUuAdyebBlgTkv4SSp7OVP/oHn3CR9how7nA
-i76KaOR6/senYw/ZMsnPSCcexffXAX8CfR/YCXghSRsbEuB61xhTUq72iVg1/+tR//YXPRHEuQq4
-qfwSvmy0pQSmJAa8RdF5vc7zbEd1g/2MAu2opHisEJtsPsDy0JYW7aY3GjfOQGW/hXZLmGqg25g7
-T1nnvcvDibHj5tnUfmB/SIW3EqXTfkc1C/zPHebfeKwSvBWBSC+0zFppPf6ZloFiQDeq/04mOXpY
-GderrZMXG4JmmHyCY1HSnTy8uDgM3rCFCoxeRJiHLzOBQ5OHAUyGr/JwoqNj3f93j0Nr9ArgRoTl
-IftdAjoQ7iHCAnLeR6QTu8d1f5GqTiC1INUN5LyT5f6AsEaIA8QFk/NfbAkQBQ7g62/JJkevVMp5
-CcxoOqWSAKOGAQWl11Q4Dwtj+8ARhHn2WnGkOVqeHgZ49IsISiRUBacox0f2qLvjRCJ3YLD8eEg9
-h5s3HYS1wPnkvJ3AblT3O6JH/HQD5mUkLNH4K2sZvS6gaIkfAU7i69Nkk14DxG8B7sCUrGuZrdTS
-wKTC+2zo2kGlYqgehuWABNcxGkObyyaeHgaIxFuHJHZ1hLTr/9kdJRK5n0oFcIClDwA7UByrEeL2
-vcWYsu7DiBzxkVPkvBPgf0w6taNJ78cfRioZRlJ9lJchsrXBv7nRag8J2fk3MPMJHZTFCLdYJoiD
-XEpXz3ayiwfqIKuXIrRRSagdoOgfmzwMII6ifjXMrhIbdoPbY98Argg5jVGUbQivoRxEFZDlCHda
-b37QaoQZVqKs3XT2AjuavGsHpaUs/wFupxo2a0EX0iDwgoi+rZnz/Aak/wLrNMbsMzqo7kflebKJ
-PuvdL0LlCiv9g8AaxO/DLbxAJtkLwCNehFauD9UxmJoJ2MMPU6XJwwDodaG+++C9dky+v9ajXm1j
-34p1Vn0BlU1VRaCP7jtKtFhA5GaU6yyZSqHXICqNVw5VQyuOdRDfAD1qEULHNpmEdIWWUAYQOQns
-13Ry9GKSLm+2NWvzyjG8MY//j0yiL6R/DhJhk0UV+4CILZVbRc47bO90tgWd2i0jxVA+waHpZNLE
-MkBXfgaO801M82akSrocmYtp4apVptfZBzIkUX2PUulFHl5aHZP/cJEC+8l5f0B43TZ7XGhNgU3p
-arNhraD0A1+QTu5nfbfgCPg+SMTohJIPqNK5VMeoV1YA4SxhG2YOwa6qz3UmS7iFtxFZaLVFoN4X
-WOahDG+ba0WBbuBFHkoMnH0G6MovxHG+AyypQdgcwwxaqvs3plEj/NlnhxC/GuAZAPbiFl4EXrbq
-tM2EZc6x5s1WmBhLtI6uaAYMm2/AHaJW+qO2pe0d0nWmkmeSJ1lfeIaIOMCV9m/8Gj8l2KfdKL8Z
-b7X0xDCAW5iPyP029i/WqNrNqL5CNjk0c+U4C22MH5AgTyZ5skGApxSCRfsxVb7jsFoTbAVzXsw6
-tavs/Yl1hJ8dsb+hM3mCX+15nIHIHkRutRojbLBOoLqRI8VN/HTZuItlx88ArtdmnZILqRRYCspf
-EP0NmeTw4Z/6BVSexLHmwucY585aAdwe2pMY8CI+o9c4Pri0ZCOEN3C9ZajOR8RH2Ec64U3kTY6P
-AR7dLQhXAdeEvFIF3UQm+fToUpw6Mm7JnbDIBQcljtsdB3FQfLKhYRJdBQGNCz6IiCIllCLZlFot
-GKnsp8xAuScUT0RRfR90M52pscXrmcRuYPfpeuzxMUA0tsSCJ6WyFVXdyIC/4a9MWg0QJHo76vRb
-wOkE8IcQg8wB+ZriBNj/dpQPQxK+0gqCgnYgkrKqPwLsQ+Q10g2atzO4mmYAcb0WFa7BDGLotdf6
-AJFX+fGSyTEA4edbhdY2h85lo8XIJqmCXGpxAAEOVzOAtBsCiylrU+0FP9zVuwCRK6lkGPuptIK/
-STpRmIyc3zQDqLDYcnyv5fL9KBurYtuzsUxFzTyUGUA7olFcr4hw0sDReoBMsl5PgIY0mYzw+wCS
-1ho0sXbUbDCD+FP8MzSN5IwxgPFwr7GOzQCgqL5Lb299B2V93lTkdKZOnUbCr0C4yDpfixFmGAKI
-ls2TcASkm5y3BdUeK821UHBQvXSyjpk4QZABVPpq6gcGqW7/FgsuvUY2Mf7n/kV3hKh0gDhEpI/0
-xAhacwygzEC40j60LfRkB39/QX3V7zitwPfJeUeBHnx/K9kJqmzN5VtRZ62tk1scksS+sjRLOX5u
-taDMSkTyFoMIKpAPofq6dUqlTjh7BHjclpM7plJHBkLk3mmqmqvWMTLJnnE+32JwLgEW2ZBQgAFy
-3kF8/ZRssnt8vu/YY34BbkTkWyG06nXSiT+OIJ0zgX9BGAROoewHPkTZTDZRGofULwzV0EVCKjxm
-iXoStN9mzqJUcggBpl8ZE6PsBn5DJnFo0uhn17sRKU9Gi9WgFb5FVt+hOPgWDy87Y7kAwSRugnTt
-cVS7RwVag0FOJne91HL0Yrp6nia7uL+JzVmO8C17ncA2xwxQwpsI26zK9i2Bkwg3WLCqb4iNlzE0
-opyJlfNusRFWm32GeuHjIuAuorE4672NdCaKZ4IB4oissDfkWG/ZG8VkiHHIyiPbDLGEa8AfoKvw
-PNlk4/FxrnAx8E1McqTiuKm+C7wEctxCxpW1Lt9D1NmKcgPC3VCn7UwnDfGvtsQPV1THy+pfabVt
-c75l+ltxOARjdzabYABZEfpPBDhOJjnaYKUTwH9FWWqlcJXVBorIWtCddO3ZSraBREuucBnIfZhU
-cPD5EvAHMsnhz/0z08SO0+W9AvQh3D+ECSbDyCy3sAgzELOdoGRdOQS6ARGb6tYFZoyOXGQFKoaw
-lpyXJz223MDYs2fCMipJiSKNnLSZSSiZxDEyiU+BLqhqh/JBbkeioxc1ut4VIN+sIb4CvyadaOzQ
-x2xiEHgHZTPhujwTvZ/9UfEiS4DzqbSQ7Uf0EdCPSSdOkU6cIpPcDfJblC0EiSbV81FdirtPTrMG
-YCGVUu8BVMfWnpROlOjKb8JxEpjK4SLCSlTnAT0jEP96WxDSTnWG7PekE38eI7zah1t4FZXViJ1N
-ICRQ/omcV8/ncVAtkEn+vOZ+7sAksxwzxyhpgCN3rwP+1aDfRaRvVJEa+v9SKGp5lpKcsKNtws9w
-BNfbjHKRMYBSRFkFpa0WmzlNDKA6F5FQF4yMPcbNpvrIed02JHOAAYQrcb0joEUjiRLUvnUAN9um
-CQnZRB/0FdLJd5sUtQEbpy8p+xEyrBPoDHUQVezI+Yj5vVZ+75RMc7vZ32YdS0E5BeynMzGcaTyG
-Od9gnt2X+WOlabQJFRXuQikh2lwxpupxKx3tlpFusyDOVkQOmo2TFMIa+4D9VBdBvk4m+eIEB8BS
-5zdW28kw7wchpRM2ahL6Xe01dZS7CTer6CieiU84D1NBH08jAyjx0I35dtJGU8au5o0B41/I+SHf
-JDjbt59KNcxh1H+RTOr98Rnbqr2VEJJXrKuWhVrgqtdqkBarAY6FgC/F93utSesfg4tpcxLMtMTt
-QFnE8KeYzEKYS7lCSI8yxrE30XFKjtBsd5HoTJDWkEQEDZqDNdePVAjPF8BrZFITME/HsRuuVJBA
-/3lUD1Vhh44j+ApOTZ2+r9sR3ysXkZa0YncfWuzTld8Ourf8fCpiFYnUiT1N8amvg0ScKxG50/6y
-H+GruN6BISNsXW+2RWPbygIi8hd8+k4vA5gvi5eJJuWfG19dXiumry5mJc7BtFbFMEWPwTVPGcLg
-AduGnbvXnAmqIBTmpyI4B8k2GEZ1pvrqYglhPwfGjte7hU+sbxRgLecj3Euu8KHdCxCZgxlGcbml
-R8xoG91BNlk63SbgBFKeaRdBpW1Mf7/ea7UVRCtC6F3Q7xY1ZdESN6TRk/gcoDN5OgYo1Tsi5uxP
-Ts0kD5Dz3rbRViDdF9ux84ctwwbVwUGDSi+qr+L7Y64PbMYEHMYMOvKtpI4+4ND1osDFiM63Me4y
-KrWAvSgvkKk/NGJc67E9cUrR81C8ITBppaxcmGxnBZX4EId2G/YGXVJRC/0GzBu0pvWj+jKqH9K5
-xD/9DKD0WM8ci0DNboBpWoAHbL19C5UkTBTleRydWOK7+QWIcwNKCkfnAT+zIVPYBAQzAsIaYXIc
-HduZKNHlvYlwxA7OTth7C7RWxL56UF5A/c/ILmnKGW/GB9hDJfNmmipz+XbSI+b6BdPBMxhCuCKo
-/gmf98gkJwaBW79LcOLXUenejVocITKMH6ChYKQFdAluweTcfS3SmcyHbHMcc/JI0DN0AvUPl6XO
-LczETO3QcgCn2kd08AAPrRj782UTRbr2fIpEd6O6CuRCRBfakPQgqtsR2YYvx5uR/HEwgOyh0i+l
-wCzUWQQNjXR17HceQnkO9BM6UxMzqasrH0XkFttfF6h1f4ShD2GJL5lOW/lmmYAROWw1RxC1zgOy
-BJPOhLfxnRcrjp5calV2yMTIAH7LSzQ5vMHmRo7h5j8A+TTko/ioFm1p/LhWEwygRVPyXZ6OMRch
-OSIDqPrALpC9mHk/O8kkeidMZZoTRr5sCTAYCvKDBlN/mHi2toEl3KPQVod5WyuOq0ahKDW/b6u5
-ZgfC1biFPQ0kzEZwDFNjaVw97QzgA1ssYBNM6EyRy8dJD3MmXyZ5CvjX02Ivc55Yx/KeEIYQAfbg
-8wJ+aScP11GRzWf+dISgQYe4c6b66GrWec/z8OQ7l3jsYU8mqYiEq2GLwFLUWXpWnkBpQfkOlRIu
-ATbjs45sYntd4lvopcY8FK2jeNiCTkdrPl+y7x3GTOI4Va1ZtA9TTnaU6hnHReBaIlzEJFzNyYHr
-xYHv22hg0KrOl/B1w1iBiPF7/IVbEfm6VfUO8AklfkvnKA2TucIM4H6QNZYddqP8iuwEHOXmeq0I
-P7LhcsmGcltRnpxUJWc0WxTqM0iEtzCjWbFMcBWO7AS2n0Hix0C+QqU66QDqb6QzNdCA5ggnW9RC
-uvEJua9Mog/XewohY03kALAa0Txu/kUyDTi+6zwhyiygHaUdUR+kD9VTOM4xHlo8IdhFc8iXSU92
-Y2byx60qnAPchFuYdQYZeJUt/1YrxR6ZVHfTum8iK4J88sCroav2gdyENGAqc147Ua4Gvgv8E8I/
-gvwU+Efgu6heTc6bdfY0AEA60YdbeBORVZYJ+oHLEXl7COjiFqLAJXZAZzDVIk8m0VwI6ObngNOO
-6aMPrjGAaOONk/USrROJB3YmSuS8DzHlbxeGHOY7cQu/HLYL2gyUuANTFhacnFY5Rsfs9yrgY3Le
-S6QTPWeHAcz9HETZhXAJ9dOoFZBFeMCe6+tgJng+BQ10ylbi/Lk4zgoLxiywwNKCEClL6BiLU1TC
-A6Em/tiWdOIorve+DZkj9vqrQL4MdaaE57wOzIjbYFzOYAj1w74X7PMaYAZd3pNkmz/scrzt4eHE
-qe2mqVciJr71npfYzy/BZ1FDDNCVn43INYistMTvCEHJ4XGvam36WPxfJwSvzgC9Frdwwv6yj0zy
-/ZAW6wCuDOUQtpBOHm1A02wxoSBXEWD4wlpc73MyiZ1VQJbRaOFZSTFMZ3CBYDSskf6gDH45wlq6
-vKfLs4bOiA9QeTozWKmyo0dB6knRIOb0jmBIUiuOXksuP2MUb/pLOM7fIvJVTPNHMCUsdOZeefxr
-3Ixib/TWNVyp4wOzELkJkTvta201v8hMRO4GuQPkHuBa1neP/n3ZRC+qL1ufKZgsGkX4Jv++J1RG
-JrOBL4e0kQIbUJ4AfR7f34A5XPJxW4QTtLutxmHV2TIBDpWOFSM19SprM4kiOW8L8BWLlhVBVqFy
-H+u939NZ0zv3s+3CjBnfQPgSlcaIoiV44G/sRfWQma2r/XbGrjcm3YVGaqqC4nV+rkUCbcQhXyYS
-+dyas1GYIHkQt/CGzeN3WAZeQCn6XVwvj2k1W2QP1TC+grIR9A0yybBk9+HmjyBOO+ZU9V6juVjB
-o95Wfjj2CarOuE1A+BpaN8ce/G4f8ALhUmzhUiL8HW7hS1WfnTnjB3Z4VAtBylaJoXyO8hjw34FH
-gScwLdzPobxipazRW/dBWqgev+KEbG6kzrOGh1a2odyB681oEED7CGVbSL37CKsRbke4NYSpCHAK
-YUcN8cOw8J+tYyhl02BCxjOsAaQ2harxYZkqk/BxC+/ZwxJvCzkz8xF5ANe7G3SrPVjp4pAajAK7
-EH0OpBtfS2SSzfnrXd2zkMgSYB6oraeToMr4BMpOK1X2cIsqk3EE4S3gcqv5igirUL2GdfmNPNzA
-nD7VDfb8oGDEq1NnvwRT9DoSllHENNsEJ6G3gp6FYdGqJePUiOFEkbYRr5lJDpDzXjAxMbcRnrYt
-zAC5piZIGwQ2MsAL/KhJhHF9dxuOcwMiV6PMtU6ohFR/kF8/ivAK6WHOKcwkT/Jvu54gHt8L5ZPN
-BxC5m6h8jkmTj2YKjuMWNlrkMjas26jaMgptxGrHYJ+KlpHPtBNI0Q5NDCqE56KjoGnpRIl04lVM
-h5A3QvTdh/IS6cTz/KiJDuLHvCiudzORyH9G5C5gzihl1qPDQD9ariifAltDBPJR/pacN7NBU/A2
-6JtmbH359QFmbqARCJF2RJbQ5Q1lgq6CWIh5bkiLHEb9E2cuF1AJXWI4zq3AndYxawN+je+/RzbV
-GEfmvLXAV6k+SrWEGavyXFP3lSvMt7n9iwl6ECvPWiJ8yEPFtncDT5BuIKbOeasxzalB+XYU1Q/R
-4n+QXdakefIWI/yDPfAKVAeB3yFsRbVoI9YIyAILMXeEdMZTZBKbz7wGyKYGa2L5IspKRBrH1NOJ
-jcAWwpk1pbtp4rteEuT7wCUhp0ot+tiDOZPoTeAd60g5VYFXY/f8mYXBNaQJr0KiFzTvT/lHEX2H
-oAxeJGZPBvk+ItdbZPAe4O+p9EY6mNxL0wdHTcSgyMOWCeZYabvIlmE1Bkys3xXD5PNDfQH+M00S
-fyHCvfZ6wYSu46DbUN6uKjzNee2YtrDZTX2Xz2YclmFG1VqAR75Fl/e/yTZR7JJJ9ZLz3rT3tKQS
-+spqA7GXAbUilakm+0yHVKLpUXvjL4Mu+fvRsP1iNsKl5AqNmRcntsaq/0CadpFJFZpQoW3ArYYB
-y5NLDqE8TTr52yFVx0q8ph5gbOYwmzgAbKIyigbrZ9w7Duh4P6pPoXxOpaKpZJ+nv4JBlE3Ws1Vo
-4llhgM7UKYTPQ+FTH7AWlcYkyxx41FK+H+WtsRM/7yB6iR2nEhy7chx4jkzio2G97dF770Yj2IfW
-pIRj+ytwvSubvmYm2Y3yO0wmsdsKRhumZczMHIRN+DxJOrF1vOSbmFnBvr8Vx7nM2l173p/eYYGa
-EVR2dzsmoVOZ16OlsXO0I60gt1A9TPlthD+PgmH443aIff9PiCyzU74DjPE2urzuhruMhmqXg8Dz
-uIVPEDkPpcPWK/SieoCIs5v04gkpL5sYBsimTuB679ni0BkGr5crcT2PTOKN4XGEyHm2tSyQxENN
-1rfPxzSbBNmz3ah+TPoMVCdlUydxC88BD4XenYfDnTRyitjI2qCASQSdtjVx4+IziU/sMarXlcMr
-4XZy3iDpxNvDSGFbNeSqzQ2LVvYj/CuqF2Jy7x+TSe4d5W+kHHJVAKFmCbUNt/CO9dYDZPECXO8u
-0JNAEpE4islXFPVDfpg8xSRYE3xiiGxAdbE9LFqtbb+LnDeTdOLFOgwgNUQpNUmAPmA7bmE3sJGG
-SqjVDIeuDLsYHyai+owt1phbhmeFG+2gSjO2zqCQlxKTtbiFt8kkXz7bDDCxzZDpxQOoPoGpmpUK
-Ts1act7DdHmLagherJI8kZZxqsx+MsljZJKN1NBHqK7jH189UDY1iOrjNXtq0tSVvQgg3FmI3ELO
-y55bDACQTR7BnNt7uEbTnI/DT3C9LG5hjbN+dwyfk1SSSWodwjOzRKI2PTtxhWCZ5G6UHuoneMLT
-O4L8w0pc7wfnFgOY8OgIJf4XOiQ9G0W4AJEHfSf234jwI6rP0WunqzDnDD37HIZ28oxvdXmXW0c4
-7KH34PMMvv4S5U925KyGjOAqXO/yc8QHCOMDiQHgEVzv63Y2YJD6VBsv+wzNuZcQrrAx8OlbbiGO
-6oVI1azf8bOCw+1UilR94H3SiSdrPvUKOS+NKe0SKxRfwUDL54gGqI4OnkX1FxbdOkWl8DJQiTXO
-VzklfDr1f5uFWBLAM1gAAAPJSURBVEtDFHWzK1dYCJwXsvUHKJWer/vZUulxqjuZZpMrnHduMoCx
-jXkyiS58fx2qr6FsRcljhh8dryHCXHKFG04v/bkCYQHVCSgdlwZQOT9EVAUO0rmkfk7AvN9T5Q8o
-iXPLBNT3lHuCB2/51afS3z9nIY6zAFMMuSxEoVvIeTvGOva0MfXvpTDFKH0TzFTtYXzQnkM40uqr
-EcSWc1cD1Fn9D16mZFP7SCc+w+cpqg9oMH17E9T9UlHT3nx7dHsLEz0WRjkRMiKRBianzKtimDFM
-9zwnGKBaMyT2Yg6BjITs4vnAfXR58ybkO9Z7SzCVtEtDtn/imsFUd9RcbxGut2oYLbQmxADBaNhd
-Z2Prhcm0ct59mOqgvrJfbg5yeJVMoumiB9zCtSA32hAtKEaNWKmLWRtsKoIyzXfZ4HoPIawu+wJq
-M3eq2ymVThGJzkK4BOEmwnUIykdkEo+f+z7AaMvnBRziwE0E6WVzbPy3cAvbUX2bbKp7DIRfjchV
-mJF0bSHil1BeBS7GHH41QeLkP406y6w/4COcB3wNketxoiW73/OhKgF2DOX5s7Xlk0sDmHCqA+V2
-RG6hMmjBodIkeQjVz0H2IP4h0GPse7PEnJvixJgNstAeaLGMyjy9wNt2LPEfxwymfBAhZX87fg1g
-tMAKW7NX6WmovDT0MkOy0fWkk7vP1nZHJx0DpJMncQsbzCEJ3BvK2zsY1HCmPZSxCI6pIVj0FQkx
-dDCIKhoiPFbqulF9gkzSw/XmnBYBcHQXKuuB71lcoHZGUdB1dBDVx8gkvbO53ZOPAQxu0EfX3k2I
-vwe4j0quX0P3Pdq9h2cQD6L6FCKbyZSPppE6unD8kcFDSQV24xYeQeRG4HpU5yASIA09oO/ae+k/
-21stTPbl5qPgXIZwK5V28MYiHOUE6LuobiSb6q1R1XOBH1jHEHvw1RPjmuY13HpsTyu+E+NU6RQ/
-WVaaTNsbnfQMYMapfAh8iFtYCqyxE8oWhNhY7QEOGKdKv0DlUwYHd/LjBo9Yl9M4Mfahpc0Njp5m
-gCGmYQ/hFiw3PxucDhtB9PLFkSP8y6VjoWJNLkKUKbaif9V3n0kdpZFDq4YLOs3fthKcfwj+NANM
-maUngGdCQyUGETnK9Jpe02t6TZklU/bJH/OiKAtRDRpZ+4GDIZxg2gc4p5dPO3A7IkGlcg/wHKai
-eZoBpsCKYGr4F4U0wJTbj6nMAEBVf+BYJgScM8thek3pNc0A0wwwvabymuo+wEiHPE8zwDm+SsAR
-0KAc+whIcVonTK/pNb2mzvr/Sc4lJD0JFvgAAAAASUVORK5CYII=
diff --git a/Golden_Repo/j/JupyterKernel-PyDeepLearning/logo-32x32.png.base64 b/Golden_Repo/j/JupyterKernel-PyDeepLearning/logo-32x32.png.base64
deleted file mode 100644
index 598dc9165..000000000
--- a/Golden_Repo/j/JupyterKernel-PyDeepLearning/logo-32x32.png.base64
+++ /dev/null
@@ -1,24 +0,0 @@
-iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/AP+gvaeTAAAACXBI
-WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH5QIGDS0sz9yJcgAAAB1pVFh0Q29tbWVudAAAAAAAQ3Jl
-YXRlZCB3aXRoIEdJTVBkLmUHAAAEtUlEQVRYw8XXf6ifVR0H8Nd5vrvb6Eort7HOvckoytAFAxM0
-ZNpiWX+I/fpDqp27MaEIwjkVtRQjjWUzGIGlaNh2nyhKaOZCilbzB3OMJmVz0Ia2yrWzldW0/WD3
-7vs9/XEfr997d+/d9DJ24OF5zjmf8/m8z+f3w3TGYO5X55unw6IyvTGEg+cSwH+weToMZpwxZZ0r
-XKpYLHgNO3QcF3we688ugDrPwNexRyhbCb24TuVVnJiA/j1Yit1S3DE9ABsOzMAAfiXFbV07z6vz
-ahwf55hz8GWdzgOq6lp1bktx51vzgcG8RCvchwtHhde5V53f1lD8Fq0xZ4KF2GVF/z6lPIcFb80J
-6/wxwWIprkFP184HsRyU8t9TtVj24RJ1vl0In1Q8q84tdZ6nzq0zM8EPXwq4Roqrm5Vj6twrxaNS
-3KHOfeq8jvIihsceDrfjYZ3Ofiv6X2suczeO4B342liFTXz7KzBfio8186vxAXxfiu0uukvxYTzS
-rCzHS1Lc0uxf35jgT1L8ZcPnuBSfOZ0JzsP/GiafxiK8gLXqfEsX3QH041al3IqhLuEfxWzFo7jI
-j3IPLmxyxxQmGLnVUgw2K0ukeFPzvXWsuRG8LMXvTRC2nzFstVWxrc7bFXfid1LcPbkJ6jwL67ps
-P5mD9igC5gm+gt3YRrlc8bwQvoBNUnzuzSaiT+AnTQguwyEDcdc44TdhvqCDDv5ueOinqllF6BwU
-wrB2e62V7z42eubBHPS6oQnZ9VIsk/nAh5rbMBC3CK5S58u6hH8D26X4VSnegacwbNXCk1qlqKoT
-Qiiq6rg6V036pteNeErxBG6eSgPvdOzfR7rmW7BSnS/CxXhcitu79ndjmTrfhX3YgUua9c+io84j
-fFP8Y3OJL04FYMjsuTNxwsZ/zMQybKL8VerbMIbykYMtpRTBfine37Wzt3nv6tLcUnX+ZuO2m6cC
-8KLKQuxVVVfhSSm+MC499wluUcpDlFcIF6jzCjyNK/AHDOi4x4o4os0Ut6rzM833yakA7GyY7JXi
-byZ02+BGpdxpoO+Y+sBcvCyodRDsRxuPqVyP774RsoWBvpNT14IUf4/Fo2obzB/pUuN7m/brXwb6
-Rjy8hJFLtDuzlFLRaUmxM+ondb68ed8rhNvUeZ37c3W6WvA6yicF31HnDt6Pt+MHY3N/mUuYr6o+
-NZIHwhqsAW0PaFmrzsuwTYqb1flqcyxpomeSWlDne7XdZWUcaqrXl5CluGlMpRxx0FfwqhQfatY/
-jndJcWMzP08p/UL4nNK+T2itxs+l+OepasGzWq5sTNLG+8YJX4xFUrwNGzC7y4S/xgXqvKiZHzHQ
-twc/Flo34Bfdwic2QYqPq/Pd6ny46WQ6p0TKyEMpPUIo4/YfxBp1Poy/SfFnUtyLb515QxLcgyVN
-5mNDntkF8KgUjzaE/af2A03/wMOYNeqIb6ojWh6Hpbhex7fxtJY0CdBrJtBQH/ZL8TD+gnlTAQhn
-2BWvwvlNqj3UNCdX4glcPEE5fr1nWIA7pDg0PQBvtNqXNeG4BzsVcwTXSfHU/4LBAwucDP+0KhZn
-bQzmGeo851z+mp2Pa88lgJ7TOdnZBnCIsnE6DP4PRyPEcw8t2PkAAAAASUVORK5CYII=
diff --git a/Golden_Repo/j/JupyterKernel-PyDeepLearning/logo-64x64.png.base64 b/Golden_Repo/j/JupyterKernel-PyDeepLearning/logo-64x64.png.base64
deleted file mode 100644
index 769950452..000000000
--- a/Golden_Repo/j/JupyterKernel-PyDeepLearning/logo-64x64.png.base64
+++ /dev/null
@@ -1,63 +0,0 @@
-iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI
-WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH5QIGDS0XftdgVgAAAB1pVFh0Q29tbWVudAAAAAAAQ3Jl
-YXRlZCB3aXRoIEdJTVBkLmUHAAANRklEQVR42u2be5BU1Z3HP7/bPQ+eQwiv2z2AoEaECLIkQdeA
-UdSovHbXLfMo7p0ZshvMJoba7Jq19o8taytbZcWNKc2uWElWpvuaWleNEFejosQnIbobw4quiEQN
-0H1QwSAzMI/uvmf/uL8Zenq6Z9qZgdmKniqq6el7zz2/7/n9vr/XucJojnR2OjATOIifODQaS3BG
-FQBkHiJfQuTc0VrBKANACOT080MJAIAA9sMKwAHgKeAgH43RU79R9AJmNsI84DU8963RWEL8lM38
-47eE2rpGYA4wAegAfgccwHe79arZwAqgE/gDAiAwi4DPA1OAQpGmOUAbgdlJu2xX7guxo8aBpwCA
-wFwDLNG5DwJ7wR4BqdcdXwBcwni7AMv/RuBUaYlBZjI4nwTGYTmI7+7+/8UBgbkSWAYUsHYzfuLN
-ftekMnU4zlcAt1crLNvw3acHmfsCYK1qlKOxw3sU8rfTPDM/+m4wbaapPYfA7WWFB2hKduG5dwDZ
-qv1/2rjAnwF5rH0Oa38KvAtMIha/dnTjgFRmLGnzWYQvAt3A43ju4UHvKxQ2A3VV6aFwsc79GH7i
-UfzErznO7UAMmM9d2djpByDIOqTNGhznJoSrgI8DOSy/qer+5sZO4LcA2EEhmKjXnUyYrnMt1h4F
-QuIy6fSSYKupAb6OMA04AbwOzMfShu+2lRBXDJwvAzV47l0lMx1SYhx4WN5EmImwGNinZvFxhI9h
-yeG7R04vADG+DkwHXqNQuAdHYoizEKGj37VeskBg5gB1BNmz8BL7TgpmjyMyuPqK3Q2yAlhEYJJA
-u6bRAjxxet1g2lwNTAX24rmtRSwdB8ZXuOs+oBnEJ23ux3dfUsm6Bn3e3SaGpVk5IAQaIzLEAX6O
-7z5btIbPAAuVXF/Bc381sgCkD9YrIXViw38v+dUADQRmOp77dl8tcF8lMFuAtQjXEpjVwF6snQxi
-B/QGlg3AWKANz72FVGYSIhPwEwdK3KQPnKNzCTCHwCwhxybWu+HIkKDElulOPI+f7Cz59RkF9NKy
-90a7cRuQAeqBRYjMHLAWEAGVACwhd6gbPdpf+OyFwHzgGJZ7sLYVeAdIUMPnR9IEzgMEy+4yAr5A
-YK4GziMwb+G5O8tccwjYRDo7ESEJsgBYgpQBITALgQv12w9oco+XmOIyhPm649N01/8NX11wKnMA
-x/lH4DzSmUfxk3YkAJgaRWL5bEltbzwi64EaXcgaAjMX2O7ku98JW2b3FdBPHAOOkTZTECxwoQp8
-UvFhRgS2TeEn3i4BxwWuBCyWMQidUfQZdhYFXJ0EpjuS0Ylr5WnYAET25c8sFO3ERIRvAbXA77D8
-N8IyjfkXhPHadgKzB899oEIgboHJ6lUs1oJIz9oexE/sKSFFB8s6NZ3dwDYsqxDmI85y4Oe6rgs1
-UDqM7+aGbwKBuULjcGjNjqU5cUKF+DIQw9pn8BOP6tW/Jm2WIyxVG357ADhjWJ5A7PNY4jqXBTrw
-9Rl977kcaAC68dx7dW1bgXmqSYsV2jq9fuvwOSAwTcDZev3LiM33qj7MAmJFwquau88oMUIqWzdI
-qNuNl2irYh0NwHIgjmVTEbe0E5hbga8CPVHhe1gCfPed4QEQmKvUvZwg5E6aiuP8sIPQ+S5iCwPO
-0ZToGlD86ssBTWr3z+K7mRKCfQ+4mdZsA46E/SLSIaXDgZkO/DXQSRjeQlPy+AiXxJZpHtGuJLUd
-z30xAt2ej7X34Sf3kc5ei8hs3d0jeO6tp6sgsjqq2LBlWMIHZgrwGWAmlhjCMeAFLAVlgnoNdmr1
-jjEgDepVQGSsltUKwD1VPfPOg8J1jXboAKSy41T138V3/6dk5/4B2IVlG01u5yDCrwGWKiM7SG9B
-YwFCuxLVM9jweSAylZBHkHA7oRzXnOFerI0DhQE3ImXqcFgDzAWEwOwHHsCrvMb4AMaxRKO+l8v8
-lgDqEBaTynyfpuSx/jH8fgdb81WN3XNYtiLsBlsAmQN8qXfHhW785EmbbXI7tIjaEzecqELLaoGN
-mjqPUc0aD5zBZnMLLeVdYeVQWORs/X1f/2IG1wM7gRocp7nf75tNDFtzvbrA3yPyHXz3v/DcTrxE
-Ds/dS8h3iyKB3AiY85Uq/BuEhRvx3L/VmuM4YnbVUDhgOpAntP13t9nNAQ8RmDOipCPTgJd8X9Vw
-Ig4bdDGdILexbkb/ml2T20HaPImwAmEVgVnbuyZr78VPvEBgWoCF2HATfnIv6ex1iJxRgchzyiUB
-TY09gG7FsgCRc4YCwHggh9iBbPydCCjnBgLzhs43V8nqMKFsomlGfgAzy6mWdav9i1aJe9xqB3Ac
-nJ45uqLvOGUyyLgmTVIUNFkcQsAhbQTftUMJhJxBtER0YWfqoo5g+SW+u2PwwFosYmNYnqJw4lny
-jkO8RnDykcC57vuI2Z/SGUbfC/kAJxQKcYjFVNAQjrblmdzwJ8ASHL5AkNmKFRAuVxn3lRN+MADa
-gHHgjAXeK0l+piKyVAE4QKHQSswZjwX8xMDlqc2HammZoZ0h25MkhbScWegNtXvG+tl9/9YyKz8A
-CT4MfAI4F5yzNbyqAY5RCH82FBMwwCcQPkZp91bkxsi+6SYkRXNjV68Lqxz0fBLhSghfB3RBtqCZ
-T5xUtp68zfOVZJ5UphaIE9JFS7JAKlMHOBSsZX1jZ4V6Qxd3m+8RsgrhXNXMlyjwnzQnuz84AJY3
-EM7SWGB3Ge3YRYGHlRAHi/hWIFymav9WH38CeYRLEFlBrTwE7MRxVgNLcexm4FUcZx0wB4cYaZPC
-d/eUfc46Nwds0X/DLYuHv1FWPYfWbLwE7Zvw3K1VCn8WwhVAB5Y78d37i6udulNhlM8rsUWfhSKi
-y+v/cwjXcJeJMUKjsgb4yTYCsw+YTUw+BfxqSE8QrgW6sfaH/Q5CibUgcSw/wy8qYPruA8ADRYCn
-1M6/BjRSw58C91cAfAxiLV6icyQaIw/qDq0mna0vIsHJpE1DFbs/V+OBbIVTYFZBqq02q1Bt+RSB
-mdUv3wjMRoTvgPwTgdlIYBLDA6Agh4AjQC1CrIgEvw3cQKsZU6ZVNpHAXE1g/gahSQOU31dwgz3n
-g8aSzk4nnR2rADcQZF3uNlJieu1YnlaTaOJfD4kKPwH4pnqlt4n6jjOAvyJlpg0dACd0NF5vw/ap
-4b+MADFWluz4chznBuCzRN3fbi1MtFdg2pgKcxEi30RkkQJ8GchGLEv7m6b7hHqoOibaPydtphN1
-jWuAp8iFt9DVfSuWB4E4DmuHng6LyMmCRZ844n7gRuB8ApPA2icRORP4tFLYdmAH/gCZYtpMBTtd
-J25Xt9qTAL2vJLiaVGZ3vwww5Cc43AAsRFikZhFi2cn63urvTgKzCphGKltLU6L7gwMQhgUcpxth
-MlacIlXsJDA3A+uBJCJfUEHeB36A73ZUSFfrNV1drAj3BDk78NzniuZ/gsCMAz6tZwluL8kjjhJk
-t4Gcr8+dpNlpnbpoCEyNakWesHLFavADEoHZAMzFsgm/zEGmwFwMXAaECDezroLwgZkNbNDdymse
-UQ9MwfJYvwMSgYkB3wbGYe12/MSTlbUpexEiKyO+sluw5BBZq2a4E899aOidIcsrQAHhggpXjFMg
-H68ofERE1+luPaZxxB1YntNCSbnIrqCu0EHkClIDeB0/sYOoQz0FZAMi3wCSwH7yWiYfMgBiX1Qm
-P58gU64PvxiopSv85QBPWafCP4RX1MyU3udLBRBeA3YBORxaBlyn524G/kOB+C2whUP8kBY3HF5V
-2EucIDDbgKvA2UBgvofn5nVnG3q9xF8kyz8oyNQquR0u2y4bbORy91FTMw+YQmAux9q9IGMJ2U9z
-SbvMc3cpYFWP6pqjnrtDK0PjgW+p64kqfCdD1Qr3Jrvx3E1Y+/3+5mXrGeyc0PpZFkipqSxH5C8R
-1hHj77UXOaxRfXc4OgvwOtCAsJHAfA2rbu9kM4IB7NSWcbPT+qXA5cYxOaDkKUSHo/boc/+YtLn0
-9AAQgZDWAKM7cn9crDuTI23mfeCnW86qyhdNtJcqAC/iubfhuQHYf1Yd/NzpAyCKxJ7Hc2/C0orl
-EWA/0TGnlR+wV/BHSO/hp8Hq92doQPZKETcdBY4CQjo77fQBcBKIffjuDjz3Rxp8TCIw1Z3ZS5tZ
-wDWqSdWMNtWUqaW6EQFj209VZ6jasQn4O2AhgZlEGG6hKflu/3LYgRjx+MVEp0hEg6Hk4KZif4HI
-EuByAjNeS3QXKQ/soSl5YqgLH7mjsqnMJBzneqK2tAUOK2ke0781asU4psD/BMsEhDVYHqniqOwC
-wNeYRFR7M3juvwxn2SP/vkBgVmo2GNL3/I+o4LtUQ7q0OboSax/BTzxdxdwTsPYCkBrgTXz31VNX
-ERrq8NyHgYdJZxeAzADGIfYE8C7vy0t8o095WjTUrXbuNuDxkVzuqXthwk+8AkWsXX4cAJ7Uz4/G
-aIzRfmdojtbw9+C5b4zGEkb7tbmZwCVE54z4MAJQWv//0AHQ489HzRTjowzAPrBbGaVX5j4awP8B
-/cDmGnd36/sAAAAASUVORK5CYII=
diff --git a/Golden_Repo/j/JupyterKernel-PyQuantum/JupyterKernel-PyQuantum-3.0-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb b/Golden_Repo/j/JupyterKernel-PyQuantum/JupyterKernel-PyQuantum-3.0-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
deleted file mode 100644
index 3d590084e..000000000
--- a/Golden_Repo/j/JupyterKernel-PyQuantum/JupyterKernel-PyQuantum-3.0-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
+++ /dev/null
@@ -1,141 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'JupyterKernel-PyQuantum'
-version = '3.0'
-local_jupyterver = '2022.3.4'
-versionsuffix = '-' + local_jupyterver
-
-homepage = 'https://www.fz-juelich.de'
-description = """
-Kernel for quantum computing in Jupyter.
-Project Jupyter exists to develop open-source software, open-standards, and services for interactive computing across
-dozens of programming languages.
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Cirq', '0.14.1'),
-    ('DWave', '4.2.0', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('PyQuil', '3.0.1'),
-    # ('Qiskit', '0.36.2', '', ('gpsmkl', '2022')),
-    # ('Qiskit-juqcs', '0.5.0', '', ('gpsmkl', '2022')),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('Jupyter', local_jupyterver),
-]
-
-components = [
-    ('logos', '1.0', {
-        'easyblock': 'Binary',
-        'sources': [
-            {'filename': 'logo-32x32.png.base64', 'extract_cmd': "base64 -d %s > %%(builddir)s/logo-32x32.png"},
-            {'filename': 'logo-64x64.png.base64', 'extract_cmd': "base64 -d %s > %%(builddir)s/logo-64x64.png"},
-            {'filename': 'logo-128x128.png.base64', 'extract_cmd': "base64 -d %s > %%(builddir)s/logo-128x128.png"},
-        ],
-        'checksums': [
-            'd252acdbbd8838aff9ff183ce249b5a4c2ef43a6309680f2a4cb13029813e3e9',
-            'b7c900cab9761d24acb1ff98e42cc61c5a14d7c71ee2c91aa4de35508a927dc9',
-            'c2ed9885240b3fbeabf7f8eeef14152f80cf55dc13d8de26f4d8a7a046a8e015',
-        ],
-
-    }),
-]
-
-exts_default_options = {
-    'source_urls': [PYPI_SOURCE],
-    'use_pip': True,
-    'sanity_pip_check': True,
-    'download_dep_fail': True,
-    'use_pip_for_deps': False,
-}
-
-# additional Python packages
-exts_list = [
-]
-
-local_kernel_dir = 'pyquantum'
-local_kernel_name = 'PyQuantum-%s' % version
-
-modextrapaths = {
-    'JUPYTER_PATH': ['share/jupyter'],  # add search path for kernelspecs
-}
-
-# Ensure that the user-specific $HOME/.local/share/jupyter is first entry in JUPYTHER_PATH
-modluafooter = """
-prepend_path("JUPYTER_PATH", pathJoin(os.getenv("HOME"), ".local/share/jupyter"))
-"""
-
-postinstallcmds = [
-    # create kernel skeleton
-    (
-        'python -m ipykernel install --name=%s --prefix=%%(installdir)s && '
-        'mv %%(installdir)s/logo-32x32.png   %%(installdir)s/share/jupyter/kernels/%s/logo-32x32.png && '
-        'mv %%(installdir)s/logo-64x64.png   %%(installdir)s/share/jupyter/kernels/%s/logo-64x64.png && '
-        'mv %%(installdir)s/logo-128x128.png %%(installdir)s/share/jupyter/kernels/%s/logo-128x128.png'
-    ) % (local_kernel_dir, local_kernel_dir, local_kernel_dir, local_kernel_dir),
-
-    # write kernel.sh
-    (
-        '{ cat > %%(installdir)s/share/jupyter/kernels/%s/kernel.sh; } << EOF \n'
-        '#!/bin/bash \n'
-        '\n'
-        '# Load required modules \n'
-        'module purge \n'
-        'module use \$OTHERSTAGES \n'
-        'module load Stages/${STAGE} \n'
-        'module load GCC/11.2.0 \n'
-        'module load ParaStationMPI \n'
-        'module load Cirq/0.14.1 \n'
-        'module load DWave/4.2.0 \n'
-        'module load PyQuil/3.0.1 \n'
-        'module load Qiskit/0.36.2 \n'
-        'module load Qiskit-juqcs/0.5.0 \n'
-        'module load %s/.%s%s \n'
-        '\n'
-        'export PYTHONPATH=%%(installdir)s/lib/python%%(pyshortver)s/site-packages:\$PYTHONPATH \n'
-        'exec python -m ipykernel \$@\n'
-        '\n'
-        'EOF'
-    ) % (local_kernel_dir, name, version, versionsuffix),
-    'chmod +x %%(installdir)s/share/jupyter/kernels/%s/kernel.sh' % local_kernel_dir,
-
-    # write kernel.json
-    (
-        '{ cat > %%(installdir)s/share/jupyter/kernels/%s/kernel.json; } << \'EOF\'\n'
-        '{ \n'
-        '  "argv": [ \n'
-        '    "%%(installdir)s/share/jupyter/kernels/%s/kernel.sh", \n'
-        '    "-m", \n'
-        '    "ipykernel_launcher", \n'
-        '    "-f", \n'
-        '    "{connection_file}" \n'
-        '  ], \n'
-        '  "display_name": "%s", \n'
-        '  "language": "python", \n'
-        '  "name": "%s", \n'
-        '  "metadata": { \n'
-        '    "debugger": true \n'
-        '  } \n'
-        '}\n'
-        'EOF'
-    ) % (local_kernel_dir, local_kernel_dir, local_kernel_name, local_kernel_name),
-]
-
-# specify that Bundle easyblock should run a full sanity check, rather than just trying to load the module
-# full_sanity_check = True
-sanity_check_paths = {
-    'files': [
-        'share/jupyter/kernels/%s/kernel.sh' % local_kernel_dir,
-        'share/jupyter/kernels/%s/kernel.json' % local_kernel_dir,
-    ],
-    'dirs': [
-        'share/jupyter/kernels/',
-    ],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/JupyterKernel-PyQuantum/logo-128x128.png.base64 b/Golden_Repo/j/JupyterKernel-PyQuantum/logo-128x128.png.base64
deleted file mode 100644
index 4a8f99672..000000000
--- a/Golden_Repo/j/JupyterKernel-PyQuantum/logo-128x128.png.base64
+++ /dev/null
@@ -1,217 +0,0 @@
-iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAIAAABMXPacAAAACXBIWXMAAC4jAAAuIwF4pT92AAAA
-B3RJTUUH5AQCEAI2/yLJFAAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUH
-AAAgAElEQVR42u1dd3wcxfV/M7N7/XQqJ+lUrWJJLrItdwPGxg2MgYReEkPihFACDgkhISQhIYEE
-AkmopgRCC8UUA6Y4GAM2uMvIRUKyZUuyetedpKtbZub3x55O7SSrJ86P+fhjn+/29mbfm3nl+8og
-zjl8M/5zA39Dgm8YMDbjNN3Kpz0DXG7fE+/s2FdShRA6HVlwejPgkwPHzl7/tzue3LRlfzEAsNOQ
-A6c3A3YXl1fUt3BgonC6PsjpzYDfX7fm44fWi4IQkJRvGDDRg3GOMUpPsBOEVcYAAH3DgP8IGziA
-QScGbaFvGDBxU0eoud29q7BMUdXS6sZmlxvQ6bcJhNN6+T/4+rYn39nBqPr2Z/lMVl+6e51RL37D
-gIkbly+dk+aIjrGa3L7AJIddL55+j4P+x7Agfrqp4tNVBwy4bk639XSa7QAOAJwzzgnGALC3+ORb
-OwrKG5y5aY7Ll8yenZ0CAJQxjBBC6BsGjO2SBwDek6z3vfzxg6/92+31A0bAudVo/NMNl6y/7Jze
-u+S/nRGnnw7o8PrdvsD7u4tuf/wNSZKBdElRSiMslqfu+M7SvOwIs9Fq1H+zA8aM4gWl1QXHa4oq
-6qoaW1vavd6AVN/qUilFqPf8GTPodXHRNovJGG01ZibGzchMnjM5eXZ2SqTF+A0DTjEoY5pkBwC3
-TzpR27yt4OjW/OJDpTVuv18TQozxkJpFGPeZPEKIUwqa0EEIY6y9spj0s7NSz5s/dWle9rS0RJvZ
-0P8Xv2FAcBw8UbMtv+TDvUWHTtR4/YG+4AJC3XZOWOk+2OMgg16Xl5164cLc8xZOn5eT+v99B3De
-i4afHDj60sf7tuYXtXv8VFEAY4QxZ6wXuTkQQRAJxgA+SerFBs6Bc4vJSDD2yapKKeesJ0uCd2Oc
-iILVaFi9IPfa1YvWLJr+/5QBnHebNJ8VHPvjix/lHz0pqSpXVVEvMgZUVQEhQRAAwGY2piXY5+RM
-mpGekJ3iSHfEON3ei365obWjEzgHjIBxQCgtIe7Dv9xisxiqm1wnG1oLK+oPHq86VtXY5OrknKmU
-AWVYwIRgJaAgQdCL4rycSXddu3rNotz+s/pfZkDoObcdOPrg65/sKjwRkGXgHDDGGDFZRYJg0Isz
-M5IWTc88Z3bO4twMe6Slz02+Kq2+/Ym3Dh6vklRq0olnTst8+LYrp6TG97lMVun+ksrth47vLio7
-UlbT1ulRZRkLhENQYegEcemsrF+tPX/53JyJ58F/bAdUNbnue+mj1z/N9/r8gBEAAuDAuCCKGYlx
-31o8c8XcKcvn5OgEMshNGONfFpbVOztT7JFnz8w85Y8WVtRv2VP04d6igtLKQECCoJJGoFKb1XLZ
-OXPv/dG3EmNs//s74NkPdv/hxQ/qWl3AGBEJVRgg0Ani9Iyk269auXLuFEd0RIjECIV3pxjnuPfb
-/d8JbbiQ86yZWHuLKx7ftP3TgpKAJAPnWCRMVgHhjMS4P17/7e+umv+/xoDQvm50dt744Csf538t
-KwoimGCsyqqoExdMzbhr7erzF04Pmo5DGBq59x89eai0+qaLlw5X8QDAgdLqB175+N/7ivz+gCAS
-yoGrVK/XXbZ07hO3XxM1Ia7DRDAgZO18frD0hgdfKa9rAuCIEE4pYJyREHvH1efefPGSkfkNT7//
-5b+27N311C9HLLg/2vv1fS9vKSitVGQZCQKnFACmpye/8Ovvz58yCcYZYZ0IN0SjzNObd377rifL
-axsRwYAQV6lBr//J5St3bfjlCKgfGiIhptEFYS44I3fHY7c/cNNlUbYIrlJACGFcXF6z5o7H3vy8
-AMYZ3x5fBoQSde55/sPbHtvo8XoFncgpA4DUhNiN99zw6PorEmIiVMpGvBEVlfpHlxJBKdOLwu1X
-rvji8TsW5U5GCHPGRIOu1dWx7v4XH3p9Ww9o77RiAO9SiT968JU/v7JFliSsE1RFIQK5cvmCgud+
-8+3FM7XLBIJHLEAiLMbE2KjRzJMQrNF2Rkbirid/efuV5+r1ekVSsE7w+fy/ffbdu/7xnoZzjEfi
-17jrgHUP/Ovlj/cwShHBXFWNRuNda8+/+3trxkqxt3V6XZ3eyclxYzjn5/+972ePb+zs9CBB4KpK
-RPG2y1f+7ZbLxsNLGBcGhGa57v6X//XJXkopwpgrqs1mffDmy2+46KyxepLxc5re21W47s8vtHe6
-sShwygghd61d88cfXjTmOhmPA/WDVvvPN2z61yd7qaoijLlKrRbzy79ZN4bUD4kFlbKxnT8AXLx4
-5ub7b4mNimQKRQJWFeWh1z5+/O3tY66T8ThQHwDg4bc+f3zTZ1RVESEa9d+698ZvnTVzbJetpmYE
-MpZPgVBQ3y6ZNXnTn26yRZg1aCTgD/z22fc+2vP12CrkMWaARtiP9n591zPvKIpCRMJV1WIx/fNX
-1523YFpo2Y6ViYUQOlJe9+q2A2P9FMEZnj1z8ku//oHJbOKUIp3Y6fFc/5eXSiobx1Du4TFd/hwA
-6lo7rn/wX5IkCaJAFWowGP52yxVXnDNnPDQNAOwtLt/w9ufjZ0p8e/HMe3/4bUEUOaWiQd/Y1n7D
-X16WVfpfx4BQ/Pv797/U2OZChKgqFUTxrmsvuOGixeNnRwsYG/XjlY+lzfn2K1fccskyhLGiqIjg
-3V+X/WLD2/99O4BzAPjTKx9vP3g0NPUzcjN/973zx9VcQQiNX0ZoKOb8yPorzp0/PfhUnL2wZffn
-B0s1rPC/hQEIoYLjNX96eYtm9gAAIJxgj+xpF43HUCkLKOp44ihIo/KGn30n2hYBjCFBcHt8dz61
-KaBQjEdbFzWWOuA3z232ByRBFLqkDddk5TgRX3OzL10y+9k7rx3XEIoG0GYm2f96y+U6UeSMAUaH
-TlQ/vHHb6J9uzBjw/JY9nx0oAehllY9rurgmH2IjLVPTEmBCxrrzz7jorFnAuagTqSRveGd7SWXj
-f1gEaUvdLyn3vrxFVVWY4IDqhKe9/fraNREWiyLJxKiva2p95M1t/2EGMMYA4On3d9Y0tU18XvLE
-h/PmZKesPXchFgSqUiD4zc+/Kq1phlFU5oyWAQTj1g7vU+/toCqd4OWvWVb1bR0FpdUT84uUMQC4
-87vnxUVFaHZ3h8//pxc/Gg0+MQY64JVt+RX1rRO//DVw+P3dhev//vrEbAUtqpwaF7Xu/LMAI0AI
-KPtoX9Gx6qYRm6SjZYAnIL+9o6Db9JzwIRJsNkx0WdJtVyyPspiBccC40x94+eN9IzaHRku1/cUV
-B45VYhIW1p6IJH3KmDJ2wMAQR3yU9brViwCAiET1+bfsK3R2+kbWK2G0Tvyrn+bLkowFHC4pk3NG
-AcDtdnPOTyklMMaEEEEQCCEY4yEaOaIg6HX/gcK8759/5j8/2u3x+kSjvqy2eev+r69ZtWAE621U
-DOjw+jfvLgTUT/xxCpQCox5nS1lZ2cmTJyVJYuwUqL0oihaLJTIy0mq1ms1mk8lkMBgwHjBaqTli
-S/Oy0h0xE2+PzpqcvHLu1Pe+KACMvR2eLfuLr1m1YCRY1mgmsbuovL3T25UODsABGAVVAtkHkhcU
-f3WR8+mn22tra/1+P6V0cItep9NZrda4uLi4uLj4+PikpKSUlJSYmBiLxaLT6QZyAjIS7BkJ9onf
-AQhg1fxpW/YVyYoCAvnyyPH61o5Eu21CGfDOziM8aAFzUFVQAiC5wdcOXheSPKBKNS3qqycKvF4v
-pXRwEYQQwhiLomg2myMiI6MiIxMTEqdOnTJlypScnJysrCyr1TpWxiulTMNuEQKk/YuGexNACNYs
-yv3r61tP1jeDQKob2/Z8XX758FH3kTAgFBTdV1zOOQfOQZXB5wJvG3hawdcOATeXfQDgA1CtMTpr
-gs5gEcw2wWAhOiMW9YgICDhnjKkykwNqwK14O9SA1+9xuerqcH29IAhms/nIkSPJKSnZU6bm5s1J
-mJRptkYqlHf6AgFZIUSQFFVWVZEQgeCArHLgJp1ICCaM6Q16o14UBGIxGQx6MdJstJoMFqPObNAj
-hIRw+aZaQdkQjRntmjRHdF526snGNgAOnH+SXzJRDGAcYVRYXtfk7ATGgMrgaQNXDXQ2g88FqgQA
-lsRsW3qeJTHLEBmvt8UL5ggsGhAgDhw469LYPOTCMEVS/B65s8XfVutrqe6sKXGdPOJyuU6Ule06
-cMi4ZbvJkR7pSDPaYkwmE8EYEyIIRCcIjc5OZ4c7O9WBEVYppVRVVaowpioUiyIDUFQVGMMABCOr
-1WK3Wexmgz3SnJYYl2i3JcVEpCXYLUb9cHcBYxxjtHLe1A92HVYpA4R2HC6dIB3AOMeACk7Utnt8
-QBXwucBVA64a8LoAIDJzTtKZV5riM/QR0QiLTPFTVaKST/V7Abi2WLp3sibBOAAChLExJsniyOCc
-Kz5XoLW+4eC/W4p2qB6XIELWpLiV85OXr1gxM3eaUa/XVLpOFF7Zlv/ujoK37r0RY6yqlHEOCAVk
-JSArjIMvIPsl2euXvH7J5fY1dXgaWjsaWtuPVjfv+Lqio90jqUxn0MWa9akJ9uyU+FkZSbkZiY7o
-CHHQrOyQBjp7RibCBCgFzhtaO042tKUnxPQpPBkPHcAB4PCJakopSB5ob4D2evC6iN6UecH62Jkr
-sKhniqQGvJxRQEhb6AgDAAIOgHiXHA29AC03nTGJKQEARERTROo0a1K2I+/cik+ec7tqT5QejbJZ
-01MSp2dnCiZjqDiSqrTD7dfM1pBs0QkkwmQY/BkkRfUH5LZOb2lt84mapuN1bV8cLH3jswKfJEVH
-mKdNciycmj4vJzUzOa67pozSUOWZRuLcjKTE6IiqplYA4MC/Ol6dnhDDgQ8dBh4JAwRCAKCysY2r
-CgQ6wdMCnlaiN0777n1RWQsUbzuV/QCAiciJwFQFgPVY8n3Wfpcs4j0QLc6ZEmCKHyFsm5Q7/Zrf
-l777UGN18b59+8xmc3x8/KJFiywWi5ZxrjKGEB9BxE0vCnpRiLSaMpNiYWGwUMnjl45VNxadbMgv
-rnj1k/zH3v7coBcXTElbNid7SV52fJS1vy00IyulqqkVEKiMFZRUXLF0NgxnC4zQCnK5fY3ODqAy
-BNzg7wSAtFU/ispaIHe2AkJY1ANn3oZyQNjsyOCMMjUAHIWRPH2p3+M1B86Z4msXTdbJa24p3vgH
-l8tZUnK0pKQkOzvbaDRiQgBAocwnjZknbDHq5+VMmpczad3qRQBwvKb5q2OVnxaU3v/Kx7974cMz
-pqRdvmLemoW9ysrmZqV8uOsQICTJ6slGl+ZRjrsZ2uRyN7s6QFVA8YPk1Uc5YmetVH2dgBARDYGO
-xvIPHnXXHkOAbBl56ef/WDBYOFX6UZ8PTP2Qlkaq322Iik8587ITH21obGqqqKhoa2tLSEjQysdW
-zMnJGDtHjAMEnXYOhODslLjslLjvrFrQ4fXnH6184/OCnz365u/MxmvPXXDDt87WWuPkZiRiIjCm
-gkprW5zD3YsjZIDT7W/r8AKVQVWAytbEbCzqOVUxEThVKj56or38oHZl29HdRG/OOP/HiBCuqgNL
-nrDUD7oZTA5Eps0yx6d73C0NDQ2tra2yLGveWVZyXNbYJYYGi3H6UdBmNq6aN3XVvKnOTu9rn371
-/Jbdz7y/86dXLL/hW2fPzkoRCJYpAGPtHe6WDm9cv3K2sQfjOry+gKwihIBTAEBYAEaBc4SJ7HG6
-ThzoaTC7SvcpvnZMxH70HZz63UqBygGdNcoUk6iqamdnp9vtVpT/TJe+6AjzrZcuPfjcr3921cqH
-Xtt2+W+eqahvi+hqi+CTVXdAmgg01B+QOWOhgizOaLCbBnAIoTddCSNIEBB0oXW8t0PZfx9AP05w
-DsARwggTSqksy7IsnxJZGsc4BOMA8KMLzyp4/tcZybHX//lFbyBYseyT1Wanu4/BMS4M6PT5AXiP
-eq4gEZmqiOZox7wLg84lZwAQP+d80RTBVKlLAfT0Bnqv/W7F0JP6QcuIMw4hGd013L5AbbNLUXtB
-HZxzlTKVMkoZZazPR5QxyhhjvM9HmosT+tPfVWZcM7eC/40wGa5aMb/V7fEHJEAIRKG5zbXuvueP
-VjUOPTwwQgYEZJUy3sPY5RxxzkGT8inLrk1Y+G1TbKopLi3l7GsSF17MOeVBMI6fau3zHtYR76kd
-g55zaNtxAIBtXx373n0viAIJJVFpalAgWCCYEEwwDiH12kcEY4IxxqjrI94FRQBGKPSnz3ZFCGlt
-iLQJIIRcHv8PH3jJF5Chy+xBglBaWXfzX18bdyXM+4SheZd5g4DJfizoM1bfHHDVI4T1tngq+zhV
-T0F9Dv1sU957e4VgC+hBB6htad9/rPLnG95eu2qh1rAJIVTd5Hxj+yEG3KzXGXTC0rzsrCS79lGj
-s/Pf+SUGUYww6wVCZmUmaSWxCCG3L3DgWJVeJxh1olGvc0RHRFlNQeEekOta2gWRmHSiQSdaTHqC
-8eZdh4/VNPYsGOCcg0D2FZcVHKuaO2XSODIAI9wXyeLdSB1XZUUNiOYo4Ezxd3S5hUOx/Xk46vex
-VoFzrtfrAeD+V7b+8/0vL1qcd7K+tcnZGZqPNyAXVTY0Ojs45z6/FB9j0xigGdAvbNmrKDLn0OTy
-PHjzpVecM1v7qLal/ecb3vEHAoxzAHTfjy6+ctlsrRazqLLxtsffdro9Br1OkugLd37nzOnpVQ1t
-arhUBEbpyUbnmDGAc84YUxRFURQN04+MjJT9HqTKXFFAa4ihyW8NZeMcECCOuKoA4ghQEHXg0IVD
-8B7bh/d2CMJSP3QdBwC/39/Q0FBSUhIdHZVggr/88Nwls3IUxjjnTU1NVqtVp9NNSY1/+VdrNYXJ
-OetpmM/MSPz07z9hjDHGOaVij2haTmr8F4/9zC8rkqwEZFXbGdpSm5me8Opvruvw+gOy6vYFcpLj
-ACDCbMQY949zMEA2i2FsRJCiKF6vt729vbW1ta2tzefzcc4tFktF8WHibuC+DpB8mlAgoh4445j0
-U7Ah6nWxQVvSVO0tlwajfsh9UxSlqqZ29+7d9fX1ZrPZYrE0A3y9b4coikaj0W63p6enJyYmxsbG
-avEDjBEA6Y3jI51Aer7ZM8QWYTZEmA19cH/OwagXMxP7hn2WzZ1iMepdkgykWzZyRU1Ksi+cmj5U
-z2OgOAljzOPx1NTUlJeXl5WVVVVVNTQ0eDwexpgoivUtzkMnakCVecANsk8028zxGZqF0iti0C2X
-emkzVfLF5i6Nn7kcgHPGBpY8XQYQo6I54sQHj7eU7EZIiI2NNpvNhBDNGMUYY4wNBoPdbs/MzJw2
-bdrMmTNzcnLi4uJEcVzCxaHne+KdHbc9tpFRFmw7QanVbHry9u+uPW/hqHaAoigtLS3FxcV79uwp
-LCysrKxsbW31eDyKomiGBKWU+3zd13s72isODesZjFEJ8bNWdGnvwajPewkoEATu9bl8vvYegoUr
-CmcMiaJYWlpaWHikuLh46dKlZ511VlJSUthw5ihjaqGf9gWUCJOx0+djXGtaZ3rkJ1cPnfrhGaAo
-SmVl5d69ez///PP9+fn1dXVerxcEvdmRoTNHEVHPGeUA5iBJUG+Umvfy63tur9BuQJjKPlvaTAi7
-9jnvCYvyHsCRZpuvXmr/2++mO1tljIOXEQytTjm/qGPrztZd+XUtLS11dXVNTU2KoixZsiQlJWWs
-eKBJJI36Ow6fuPsfmzHA32654rbHNnr8AaAsNS76qhXzYTj1EH0ZQCltbm7es2fPBx98cODAgYaG
-BoaIY+GlUdkLrIk5gtEKQcM5HJ6sIfu8tzfbl8RBqjE5oKHW4ez9MNQPbYK4GH3W/Gho8ANB3QYS
-hnMvSvitU3781erf/u14fX0DpQfMZrOWYOFwOMYGKUIAAJ/klzy5+csjJ2ovOTvv7+svP3iixq9Q
-AACMIywmrW8CGhkczTnv7OwsLCzctm1bfn5+U1OTPjY986LbrMlTgTPV75E9Tt7XghzElOwF8fcB
-QbV4eD+LaCDqd99JVRl4VdVHCe7W85xz1q4IBrz+poy8KdbLbz3U3NxSUFAQHx/vcDhsNpvRONrW
-J+X1LW9tL9i8s7Clw3PegqkP3XRpVkocAOwpKqOqqu3E5NjIkYckOed+v7+8vHzHjh378/Pr6+vN
-ydOnffdenSVK8bZzSgEBIIygK4ClRbFRtwsWPs6lUTBEa8QB0NDkPvRGJngPxBJwryauHAFgAbjC
-UGvg7BX2TRvyzl9XUFtbu2fPnuTk5OTk5JSUFEJI+NieBj9zzoELva/p8PpP1DRv++rY9oPHTja0
-pcRFfve8RZctmZXQo6nTkfJ6bYYGvT4nJT4ULh42Axhj7e3tRUVFBQUH62prRVt89uV3iWab7HZq
-j83DLPy+Int4aPOQ1j7vAVXwHl53H63THd+HJmnxMvvdt2b86qGyysrKgwcPzpkzJzY21mw2h8Wf
-uzIog9+ub+s4Udty8FhV/rHKstpmT0CeFB99zuzsv/x4xuzJyf3vcOhEDSAEjAsIzZ2a0UctDoMB
-sizX1NQcOXKkoqLc7/dP+dYvDFEOxeMKKtNhUB+GhDb3eqc/9ft5EqHXCMLzm/e4bYd629qU596s
-q6rvKC87UVFRMXv27LAM8EtKZWNbWV1LaU3zieqGEw3O1rYOhlFSjG1GRtLFi2fNzknNDhdv0CzR
-Zpe7rLYpOAEEszKTYJh1Qd0M8Hg8FRUVR48edTqdUZPn26cvUb3tI6I+H5TW/TG4sGu/nx8H3Z0r
-+3yrL/UBQKL6SHH9dSm33Xu8qamxqLgkc0pujCO5pdNb39pe39re3O6taXE1tbg6/XJAoQaCYmNs
-aY6YSxfPzJucnBofnRwX1bP7maJSQnCvfmicA0K7iyt8GhaNUXJsVJojGoaZJi2E5I/T6Tx+/HhV
-VZXP58s645Kg0BmZ5DkF9fmQJU9PiLS3wucDU59zYACMr1kcc79drKpufHnzts2Fzab4NL3FatQJ
-kUZdjM2Sk+JYPjs7JTYyKzk+NT7KMGiGb/8sFc3Q3Lq/JAhcM75y/rSR5wVRSp1OZ21tbXt7uxgR
-Z0ubRWU/BFHc4UsePiZyv8dXEHCmMqpqwHevW/EBfsirZqYalyyIeuvfLWl28+VrFl5wwfmpiQnR
-EeYxMUkxxrJKDxyrpCoFjDDB5y/MHcl9QgqgpaWlqanZ7/dHZMzFWOBa+GMkkgeGJHlOqXV7hGgw
-Jqrfo/g6AcBowN1f5+GgbO0jhYGVzJlqxRgbCHJEmlLjojXq8x5RF85HXt716VdHS6sbAABUmhQX
-NXNy0sgZIElSS0tLS2uLJEmRGXmAcSjKOHy5zweWPEOnPu8pf7Co97saPY2VAJCeZACVBZOxB1Lm
-2vsSy8sx60Xe0dHR3Nzc3t6uqmootIKDAZaR11Zt2V/sDUiCKABlaxZOTx5R4y5BI0IgEHA6ne7O
-TkqZPsoR3lQfrdaFYVC/V/IoRoA6qouBSQB4wSwbBCgK/0PQ7RsjAD/NSjHG2XWccy09ewzLCGqa
-XR/uKQRKEUbWSOvqhTNGKMpCDHC73T6fT4ywC3qzVtkyCEgQJrdniDbP8NY+AOeCwexz1jUc2gYA
-cbHimbMjQWYIhXGSe4RuAICDwhLjdDbruLTy+HBvUXVTGxFFxS9Nio9ePHPyyBnAGAsEAh6PV5Zl
-0RyFiciZekpoPozIPjX1u+822NoPyhaOEBZNViXgLv/0RTXgBYDrLknUW0WgfeQ+D0N9DsC5XkSn
-yrIdISr3xKbtXKVUpYLRcOEZM+0288gqNbtFkMfrkWVZjIlEggjdCuBUkiccfbsh/l5yv5tSfFBf
-DBBgIhCdkVO1s7b05I5XPY0nASDJYfjFujRgDCgPJ3l6K+GQtcrHmPQIwbMf7iytbgSMgLJos/WG
-i5cCDCsjtB8DVFWVZYVSKuhNmAjBzvtDkTz96IuwIOj0SBBQuE95N76Pgkm7vEfSg5YayFTZ7XLX
-lTnLDzYXf8nUYA7Wc3+eHpdgAI8yAPUHhgLHNBLgl5W/v/kp1cAxjC9YnJfuiO6Kvo2UAaFkG0TE
-HqdUDEfyICCiAWFB7mhpq9obcDWoAS+nKuth6Gnk7TJg+mVZcABAnCqq3y172v2ttQDBPjRRNvHF
-h2asXh4HbqXvl3m4bDve218bUwY8sWlHWW0zIADGIy2mO65eNZp7Cr0zbTQ7AQ1WSdFfYXIAhESD
-2ddSXbf/fVd5gexpH5NHx4RERpBvLY/9/frJaWlG8Cg8lGM9yKofh7Ufcr4qG52Pvv0ZVRSiE2lA
-vmhx3rQ0x2gZENIeCCHOGQAbAvV7PbNosDYXbS/f+g8qBeOURgOaPtWWmWJ2xBl0Yo8K5r47oE++
-IkcAnCNCUFSEMD3TfNb8qKhYPagMvGrQCQ4veSBcfhEfc0bc+fQ7dc1OQS/SgOyIi/7V2tWjvGFw
-B4QSnZgqc0q7+w6civqcU50psu34/uPvP6J9Q6fH63+YddGK+LkzIi0Og3bKWsiwGVBq8z6WDAfG
-IUBBYuBWgPG+uZa8txroa7z2gWPHZrz08b73dh4CBKpMsSD+YM1Z00bdqijIAFEU9XodIYTKfk5V
-TPR8aBYnEfWB9sbKz1/S3p09M+qpB2YvPDMWOId2mTYGemd89ggUh8ESQlI7GLrRArBocM4NjkuP
-RQ8RLcBS19px51ObZFlGhHBZyUpx/Pyac0ds/PRlgMFgsJgter2+09fBqQzIeGq5DxwAsKBrPPSJ
-v60OABYviv3wpTNtCQZwyVxhCAEhQaECgIIveCgihrpI1vXfbjES+ko4UHoY1IfR6wPOOcaIA6y7
-/8UmZwcgxCkzmY0P3nJ5tNXEGMOj61KCNd1iMBi0gnTV28FUBSE8FOoTUR9ob3aVfQUAsXbDiw/P
-tcUbWHMAVIZQWIk8iPnYL4zTf3OEp/7AuDQCb4BKSq/U6OEH4hEA3PboW58VHAXgCNJNMJkAAA+w
-SURBVGPg/KrlC7QuwHjUPWKCPTH0er3VajEajbK7jUp+1Cf0EY76wDkWdAFXg7e5CgB+cPWkzBmR
-vDXQNaVT6cOBhPgpYc6+1OcDRgVEVFUXcLWrIT03XJ9LG0+888XTm7czSokocEnOTkl44OZLx8yy
-CjEgKirKao0giMvu1kGp3+0Rcs4CLq1rHfr+FangVrp2zkALeQRCfJCvDEZ9zgFM5Gilr6FFFkVR
-r9cTQobOg5Bk/2BP0a+e2aS1YaYB2R4T+cwv1w6rCGlIcLTBYIiJiYmOidbpdO66Us5U1CtnhPeW
-BsEIOFcVubMVALIyLDkZVmD9qdbTPOfjQP0BYzKa6t5f7EGYaE1YDAbDEBnAu8KK7+8uvOqeZ70+
-PyKEylRvNPz5xkvPmZ09htZVkAGiKMbExMTa7QaDoePkod7WOh+ohotzzqgEAOkpZoQ4sEFI2Y92
-w6U+hKU+H+ArAAbsbpL2HHGLohgVFWW324fOAO2izbsLr/z9P/yBACKEU4YJ+ekVq3500WKA4WY+
-DI0B0dHRCQkJERER/qbKQHsjwkIviKYXvUJR8mBJuMVEBlv7/YU4H4IK5eEiCkOkPnAwk4PHvLsP
-dhqNRofDERsbO6wExZc/yV/7x39KkiR0nat09Yr5D9x08dh71yFdHx0dPXny5MTERJ1Img5v03JA
-+0uesG5Bt9Ie6kLmp1ahI6O+doEA4KOPbWwQRTEpKSEnJychIUGn0w2+A2hXy9kHX99240P/8ni9
-iBCqUgB07bmLXvndD8cF3gi9slgs6enpGRkZVqu1tXhnoL2R6Ax9pUqfRd0LRh7WQoYhBNbhVNSH
-sBExzgGswmd72t/9zGmxWNLTM6dOnRoTExM2M67nIATXtXZc88d/3v3cewF/AAkCZ4xzfu15Z7x0
-9w/GqSVXNwMMBkNqampubm5SUhL1uur3byaiAREycAIo7y0Ix3ohc36Kr/RHOznnHFAEcdYHfvKX
-kzqdLikpKS8vLzs7O2xWVp+xNf/o0vV/3fhpvqwoSCCcUoLx9Rcuefm369A4wXs9GUAIsdvtM2fO
-zM2dERUVVZ//YevRXTpLNEIkXOwJADjqZcVPJPXDqBDOOBCEogS3U776rhMlFT673Z6Xlzd//nyH
-w6H1NRhotHZ4b334jUt/82R5TSMhGBACxox63a/Xrnn2zrVBnHh8GCD0dPmsVuu0adOWLDm7pqa6
-oKDgxPuPYCzE5CxSAx4tTShY8BUkFtYSO/qRbCCAvhcpGdMSX4YcWukDS/S4p5aZiyIFAMg/0HHz
-n8sPH/XHxMTMmzd35cqVs2bN6tPujAOwrsPMJUX9x/s773tpS3N7J3CGBEIZA8rMZuMLd627vKt+
-b/yaAvZiACEkNjZ2/vz5NTU1bre7tLT02DsPpiy+In7mCn2EnVGlq9mD5uhjJAiICP1s6H7Js+Go
-j00EjLiHjhlgW/BTQRoIgPLOZqmw0LV5p+uxVxs4J7GxsTNmzFi5ctXChQtjY2P7AAYIgGBMGX93
-5+FH3vx0X0mFdng0hA6pR6BSWtXUBuM/+m5MvV6flpa2bNkySZKIIBwtKanZ+UZryR5b+kyLI0M0
-WLU4IuccYYwwkTpaBoUKwlCfUkYixZdfq317a6Ne1+f8Wd7n335SvpfExwgEgvwybWhTS8p83gBY
-LBGJCY7puTOWLFmybNmysOUxAVl58/ODz36483BZtcftwyIBjIEFq0sQxkBIQJLvfOrtwrLap+/4
-rtYVZZyO9AwjGc1m87Rp0wghUVFRX9rtx0uPNzc3tR7e2sg4JmJXuLhrMkzRwvADAG1hhDijQMzk
-k71tH2xvGVlYShAEQRBMJpMsy1pHUp1OFx2dMCM5OdbhmDZt+ty5c3Jzc9PS0noW6VHGSyobXvz3
-ng92H6ludkqSTBAWDKIqqYCxUa8/a1bmvq8rPD4/whgLAmf0X1v3nKhteuMPN6TERaHxOYhFCPuE
-MTExeXl58fHxkydPLiwsPH78eH19vcvlCnXJ0Cr8A4GAy+Xyer3hwvfh8kSCzTwAfHTJ3MiahoBe
-pzUF6LfMUS9TlXPQ69DBo56GFiU2NjYzMzMxMfFkfUtRea0sqICQIuiIMXLW4uXXXnZRenp6XFww
-oVxRaW1Le/HJ+vxjlVv2fl1cWR+Q5OA0BEJVChKzWkxLZmX/7KqVK+bkfFZw7Oo//LPV1YEQ44A4
-Z3uLTsy//k9P/+Lai8+epT31xB1lqChKZ2dnU1NTXV2d1qXH7/eHGEApbWhoOJCff6y0dPUS26an
-5gIHUNipFKm2YTgyYNDhLsd40NAuB1AZxOpuvLno2U1NKemTzzvvXHtyxpPv7ezw+bUSCyAiYDHB
-Ef/avbfaIqx1be7qhpajNY2VDW1HKxvqWl2BgNxVqNOtnGwWy3kLp19/wVmr5k8NPXVhRf2Vv/9H
-aWV9sHkQQlxRIqzmmy9e9sBNl4y5CBqMAVqqhKqqkiT5/X6/36+qajB5AiFFUYqLi1977bXt27cv
-X2R8e8McAACZDpYh0kOFcq5hR9Av6hLGeFVVJtp16+4oeXFzM45MiM6aTSMSXf4eB3YgBAgDB7vN
-QojgDkgqpYpKOaXAOBEFDlxrM6N1iI2xWdedf8aVy+bNyU7pGfbSFnij033NH5774vAxzhgiBCHE
-ZIWI4vK8KRvu+E5Wcuz4iqCedpHWUVhrKhx2f1it1i4PM2zMZICogGZWY9SN+qEupjBODBgQ4n7K
-ATDuWrgoWAvNALW6JSAy6E199TLnre0e7bYIY4FgxjHllKoUi4JBR2KjrGdMz7xq+byV86b0aavY
-1QsRAYAj2vrpwz+9Y8PbT723Q5JlLAggEErVbQeKFt/8l9//4KKbL14aPPFw1PJo5HmToRAH53w4
-1B8gwKs9DkEkQqw76ZMklpFpQirjfoYQDyVMdGMewSIB1n9amj3DGacIjAZ9hNk0bZIjNyNx0bSM
-5XNy4qKG1AKZYPTw+ivyslJ/+tjG9k43EAIYA4ZmV8dPH9v4cX7xI+uvzEi0w6g188gZ0DOdq1+9
-ysDUBx4+IsYBEQSY//rB8re3tigKW7og8pGfZ0TaCA/wEPJBCImMsESmOGoVncRYX8OQ0ogIS1ZK
-giPSMskRk50Sl5FgT3XETE2N14kjedLvrV44MzNp3f0vHimr0eKRnGCF0g92HvrqWOXd37vw5ouX
-jHIPjE3mMEKnyhA5VXCRUk4ihfserrj/mSrtvcp3G2WZvfbXKSjEV44wxtPSE9bfeIlkSbzh7xv9
-Ph9gjDDmjAFjkVbLpvt+fEZuOufcpNf1zmxgPNhNbXj0mp2VvP3R23/z7OYXtuwOBCTACCGERdLQ
-7Lzt0dff33Xk4Z9cOSU1vqf5NkIsaGQiSBAEhJBAUA8VOlBEbCCkgQMAEZCnRdq4tTmoUAEAYMuX
-zqIiNxhxz/pInSgY9Pq1q8985LarY6IjRVHgnOtE0WGPeebO65bPyTbqxD7Uh+DpEHhkYeEoq+nJ
-2695/Z4fpTjsodNukSgoqvrxvsIzb3rgjy981OENjCxKMyodoNfrDQaDKIqdHhUwAIXBAiwQNrzV
-/Q+l3TnBoapIWWVdEooLOLiW3W632+2+4YIzF+dmbN552On2OSKtFy+dnRkUymN2nFPP+1y8eNbs
-rJS7nnnvnS8KJEkGgrVOZa5Ozx9e/OC9XYf/8Ytr501JnTgGYIzNZnNUVKTRaCz4usHvU41mAjIf
-GTLKVGaL069aGFVywhuSTPNzrXNzreAPxoVUBtoZAzqdTlFVAJg2yTFt0uqeagmN27k1jPFJ8dGv
-/e4Hr22b8etn361qbAPOACEkYEBw6GjFlb9/5vALd5+yZ/VYiiCr1ZqYmGS32zs8/IV368BAgkGl
-4QdYEALwKn+9Pf37lzisFmIxk5VnRL70xyzAwBgIetxRLx054dXpdDabLSIiQieKGrrwzpeH73xq
-08bPv5IVOt4nSmoWx3dWzT/8/N0/vmS52WhACHGVChgD8GZnp7PTB8PMPhqVEjabzWlpaWlpaSdP
-nvzDo2XnL7GnZ5ipUyYEhgvxIwRc4oIBvfBAzj03pvglNiXTCBy4l2LMwSZufK/5q689SUkJCQkJ
-2rkmAHD3Pz945M1P9QRLdMfer08++pMrxhW51LovIgSRFuOGn121bs0ZD7/x6Ud7C70ByWq1/uDC
-xV2F2sNYB+See+4Z8YQIIVqDlfr6+qrqps/2tl641B6ZYACV9UpRGUp4iwNCHCgHhUXaBHukCBIF
-hSMRgV387HPn9feUAdJlZ2etWLFyzpw5Nputusl17X3PX3hG7vsPrm9pd2/aUbBm0YwhmvljohUS
-7bbLls5ekpczJdVx5fJ5d1y9Cg9/C44qs44QkpCQsGDBgkWLFqWkJBcf9y2+av9HHzeCmUCUCGbS
-lRrNhxERY5wHKMgUTAQiCOjQq683XPLTY34JJycnzZkzLy8vLzo6GgBcHh9G6LKlc5JiIq5cNk9W
-1Jb2TpjAoWEbZ+am//zqldeet5BgNILUx9H6AVarNTc3NxAISJK0e/fu2trai28qvHB59K1rU2Zn
-WaIT9CAIEKDgp6CyrpN8OOpBd+0vjAEjAAGBHiM9ggBztcq7jnT+/ZWGLw50WiyWrMnJZ5x55urV
-q6dMmaIFeDkHQRC003M55whhOrFHe/avSRqBEhJGPQkcHR09Z84cxpjNZsvPz6+oqNi6s+39Tw/l
-TbOsXhKTl23JTDKkOvT2WJEYCJDeKRShskiVgVdtblPK6/xltVLhce+2fe1Fx/06nS42Nnby5MkL
-FixYtmyZJnxC+lxVVe3UDA0oJhN+mtj4gnFDF0R2u33BggUxMTEZGRmHDh0qKSmuq6uvqG3/63N1
-qqrGRwsJDr09Soy2CNE2wWoRdGIwDKCoXJKox0tb2pV2D3V2qLUNAWcnI4To9fqkpKTExITMzMkL
-FiyYO3duVlZWdHR0KLvEZjYyxrfmF1+1fO4nB4p1Ag41uj2NBhqrc0gppX6/v62traqq6tixY+Vl
-ZdXVVQ0N9c0trW63R5NRrF+z7J6bVwt1GY3GiAhrdJQtxh6Xnp6RlZWVlZU1efLkuLg4k8nUJ7fn
-1oc3PvfRLpNBH5Ckq5cveO5X12H0/5UBoSFJUkdHR2tra1NTU21tbVNTU2trq9Pp7Ozs1LpeDsQA
-7RQ3LY8zLi7O4XAkJyfb7fbIyEij0dhHvGo+l0rZhne/2Hnk+Bm5mbdeeo5eFMYjaniaMQCCp9VR
-SZJ8Pp/X6/V0jVA8JywDtDCvxWKxWCyhsyQ1rAn+dwcav6OQtTszxhhjlFJK6eCnLmgNcAVB0F4M
-0aigLNiDEeHTklFo4o9l/2aMmSP2zRj9+D+DR9d4QOwo3AAAAABJRU5ErkJggg==
diff --git a/Golden_Repo/j/JupyterKernel-PyQuantum/logo-32x32.png.base64 b/Golden_Repo/j/JupyterKernel-PyQuantum/logo-32x32.png.base64
deleted file mode 100644
index 83d4dafe0..000000000
--- a/Golden_Repo/j/JupyterKernel-PyQuantum/logo-32x32.png.base64
+++ /dev/null
@@ -1,35 +0,0 @@
-iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAACXBIWXMAAC4jAAAuIwF4pT92AAAA
-B3RJTUUH5AQCEAQQe3XrbwAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUH
-AAAHLklEQVRIx7VWe1CU1xU/937fvtiFXWBBdkFZgSKsRLSAJpK2GmpoJsRqh1hSJ5OmHZO2g7Gx
-Gm3TNkmn0Zia2CQmxjhtOqZTTVLbamyc6CDS0EokQTERkFd5dNkluyz7/N733v6xBhDXDv7R8+e5
-95zf7zzuPQcxxmDOEhPluCRn29IQmqsJhluRuCifarsSl+S5m9wagNVi0uk4g47/fwH0jIxPRoRw
-XJyp/N85RjerAQOYyvPZi1fPtHdfHfG1dPYFe4fLq8tLXc6yhc7aKndlST4AUMowRrcGkJBjLR37
-3m3yh6LLiubfuaTIH4519I7cXemOS8o/P+vvG/3c7XI89XBdeWHeLE4zA0wuqqZ9d9ebjnXbd711
-yuOfTCgJpV1D3qk7vaPjjb894lz/xN4jpxMaSuksP8kBQjHhq5v3Vm7aNToenKmXVS0Yic/y0nKp
-17Xhp1tefvsaxlwA7tu5f9VjLxAym46kqIFwjHwBMHU84PEvqN/57OH3GWMaITcFSFg+/eZJS+1m
-TyB0Y8jhuNgz4tM0ciOnDzv77HVbz18ZvGmKEnyHfUFDzY8KHvg5TRaZRogoK5QmL9vW/e+seuyF
-Wcrpd0AZBYADx8/JowGDXjcxMSFGQ7FwUIhFpu4QQn0T4Vn/BGWMUgYAOzd+499ef9MnPTNPp98k
-z3ERQT7X2Q/RkfGPx378ZAjxegYAqpRtxl+pvuO221dHBEmSlcmYCAAIoXRLSl62jcM40Z5ZttSa
-ytJ3mj+uqShJAgAAvZ7AlbZmW6bZ+eW7L8gGUDBijMiC5Jk40nzwe2u7Nn7/h/7JiN1q0fEcoTQq
-Sh91DykqIZTOs6WWFTjXVLr3/6U5SQSMMYTQ6Jg36g9U3PPgaPtJ68Jl88q/TqQoQghx+rF0R8v5
-lsZNYnFFKc9N50iUVUIpx2HvRPjDzn4e44lwLBKX0szG6b8o4R0AEMcDGPSp6ZjTcRyPMKaqTKQ4
-EUIpKRbNYA2EIhIgABgen5RVzRMIAQChVJSVLKtlafH8i30jPd1Dx1o6ErUBAD7hXYhFLrW3nX6v
-CQIDga7WzNJqIoS9F46nu8o5vREYNfBocjK0e8+rhvR56+9ZXbZsKcacKKuyUZNVjVKKDdio5wVJ
-gZjY7/EneANCPEJodGjwJ08+c/FzjM3pBavWA6+TJ73AKAAwRoBRYExWcJopvmF5q8VsPHr4mHd0
-+6OPPFSUmzWVYVFRh30BV459fllB47dWAQCHMQDwwNhvXnqt2W/LrarVI6LnEFFloAQYA0oYUZmm
-AkKyrOZadevuyoBss3uB94kDL7qK3SuWLwlF4r5gJBoXMUKVJfl589ILc7MdmdbpIvd1f3phMJi3
-dK2Jo1RVNI0iRoExYDTBHYAhhABjIRYXJTAFqdPtuNPdd+KDc7kFLqIqi105qSnGRKqbO3rcLsd1
-XeQbHw8pXIbZQoVJYBQhxIAXJIUSihhjFDEGiMO+visVGcOmjBIa1bCRd9o5o9VetiBrZhOGYuLp
-9u4DW79zHYCsEg0wUDVBmQHvudxqDHdaLRgQBkoBQIhFau2BvVvyQGWIUSCES9Twi4mWaMLn//SB
-I8M685UBAM9zGDMCjDGi6oyWwbYztZnv7Xu2wJZlBEUDioBRICnAuQDzLK4ioMAwo5RQOnP6/euz
-gdePt5zcs3n2TM6wWc081RQZA2gaS1P7nv6Bw/alLNA4QDrAPCAeOD0QDIKKgAFjgGkgpMYl7tpQ
-RGhgzF//y4Nb6mtWlhUk/qVpgMLikqJMnbf/U86UplGcm21CgCGmgUZBpaBDYMCgR2BAYMFgAcjA
-oX5fa5d55YqqhIvWy/11O/Y33FX11MN1AICuH868OdX6SMN93c8d8lCJ8am6aAgjfK2FgHZ2RARB
-Y4xxiJl0KEUHwXD8ZJvxa/duq6osuzrie+nPZw8cPX2bu+DFxvsBQNWIjueSDP1/NDf97cSJiYgW
-8n308raU/CIrxFUA9vyhwVBYcdj1k2Hx7bNS14QTON3a+nW3V9/R3j3YPeRZ4V5YVeLa/cdTFYvy
-f7fjIbvVPGv6X7dVEALP/WpTw8pLhSVZENUYoyidk73SW38ff3CNZc+7bHdHpaRC9fLSYmfGYpdj
-TaV7SWEuAFwd9dX/4o2xQOjVxx9oqKlK8ptSShEChHFUQIIgggWBAkhlIGqXe6PPHBxanJtjwFlv
-bP02MZnrVrjtttRrnChljC2an/PJoZ/tOPjXjb/+fWf/f3Y/un72ZocxZgwwgqVV9/7hfdxxZiA8
-HqKSCFGhzIWaXsm/1BsNsgpnXu7F3pFMq2XKnsOY5zgA0Ov4fY33n39tx+pli5JPNIwxADRs+Cbm
-9IfPHU3Xe8wGlUMgKbq46iApG7Ztf9wvaVlWi6ioKQZ90kVtealrTpudrNC+gZFoTAAGPM85cux5
-zkwA0AiJCLLNbLrZonjjfvdfnaDvjRTC2QYAAAAASUVORK5CYII=
diff --git a/Golden_Repo/j/JupyterKernel-PyQuantum/logo-64x64.png.base64 b/Golden_Repo/j/JupyterKernel-PyQuantum/logo-64x64.png.base64
deleted file mode 100644
index cbb1ae369..000000000
--- a/Golden_Repo/j/JupyterKernel-PyQuantum/logo-64x64.png.base64
+++ /dev/null
@@ -1,87 +0,0 @@
-iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAIAAAAlC+aJAAAACXBIWXMAAC4jAAAuIwF4pT92AAAA
-B3RJTUUH5AQCEAMhZep9kgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUH
-AAASyUlEQVRo3u1aeXRURbr/qu69vXenOztJCFkgCYSQhBB2RUAWBYawKYorOjoMigviuM4ct1Fw
-1FGBYdxGBEVZBNkc9kV2CJiEQEL2naTTSSfp9HKXqvnj9pYYksCBee+d8+7pk3PvTd2q71ff9vuq
-ClFK4dZflFKE0K3oGd9q0XNLauosLbdI+lsOIL+sLuvVNdlXKm/dELcWQHJsn+mjU3hBAoBbZKq3
-FoAokRqz9UJRJQDcIiO6tQDKrlpMenWAVu3ixVs0BPrvRKH/Az5ACBUlqdPLVVuPDH38r/e98WV5
-ncX/vUSIKJGbMnU3WQOE0vyy2uIac31Ta15Z7eoNe4AXgNAhQ5Memjoq1KSPCjEmRYf3CQr4X2dC
-5worfzx6/nheycWymqbKemizA4sh0AAKDiiFlnawOYBjINiYGBuRNiB6cuagOeOGBmhV7kwHgP6b
-ACj1RZWD5ws/+GHf7pO5UNcISgUEBSTHRGQmxZj0mtXbDrvqm4Bjp0zIHJbYL6+s9mxBeV1NA1jb
-QMGFxUctmjluUda4UJP+hjHcCABCKMYIAM4VVLzy+bZ9B89Cm13Xv++dGUkzx6ZNzEjqG2qSWx7I
-Lli393R8RMiy+yapFJz88kJR1c6TeTuO5569UAgWa0Biv1ceuPuZuROUCtbb8/WxlBu4BFH885fb
-4fYnIXam4a5nlq3eXFhZ32XL1nbHtTr5+VT+jJdWQfoDEJc1+o8rzhVUyO/J9UhyIwCqG5rHP/MB
-JMyBtAVPvL/eKzohhJAOo7fZnau3Hi4or+vUgyT5mu04npv66FsQn4XHPfn17hPerm4+AHnUi2W1
-/ea9DHFZgdOf33Lkgve/XQ7Z7nSt23OqpNrcZYfeTwRReuqjDTB4PqTe//ba3e7heofh+jSQW1IT
-nrUM4rPSF75dVFXfY3tCSJvdyYtibzpf89NRyHwYBs9//Yvtns9vKoDK+qboeS9D3Myxi1c0tth6
-VDTparK7b/nt3tMw7CFIuW/llkM3zYS8vd/21PuQMCdt4VsNzW2UUlGSevzW4RJ+PnWxuqG596N8
-tOkAJM+H0Y8dzC68mQCeW7kJkuYFTnsur7Sm90prszv/tmFvfu8+8WJY8vEPMGB2v7kvNbfae/wK
-98iHEcD+7IKPNu4DjNITowdEhfY+RitYZlRyXLBR36uU5KkZViyanTl+WMWFgte+2CYH+hsncyyD
-RYm8tXYX2BygUQmi5OSF3mdrBceOTokPNel7mS4RAlEiSo5d/uRsCDau+vHQmUtlCHWXbXtmo5sP
-nz96Kg8bNNed5BHIiUwQpd7XxCyDKaXjhybee9cYqDV/vPkgAHTzeQ8AHC7h75sPgCQhL0+5nsrK
-7hK+P5DdiUv3zprgjUdnQGTod/8+eTK/9MZNKPtK5enzBaBVSxQAY8ywCGEAIIQQIhEiydm3G0FY
-fN0rEnL7xOiw+XcOh6uN24/n3DiZW/LJxk/X7QadBogIzeakCO1DtyWJjjaX2yoQAKWEanW6uP4D
-EgcOGjAgQavV+vfg4gWlh8Zd77Xr1MXpv38ndlDc5fVvKDm2a5PrvosdJ3KBSqjNTOsuQ2N5WaXq
-3fNHJMQyKi3DqQCACC7RaQPJpVUwIQbVsGGZd2fNG5IxnCBGFEUKSK1kXYJICMUIEEIUEALKMoxW
-pdBrVCa9phPPJZQyGMlay0zsl5iWUJhTdK6wcszguOsAIC+kFVQ11Jot0FpLK84oVJqQjCmGfqmK
-4GiFIRhhBigBoEApSCLf3txWW9RQnrdu275vftgyeto9k6fPDgoMdApibnFVTJ/gMJPe4XRRQBQh
-RCnGiGNZJceqlZxKwSJAgQZtUnRYZIgR+xUFoSb9HWkJhafyDmUXXC8AQAguFNfwrc1Qfs4QHh0/
-41lj/FCJd4qudsnVDgLvlh4IUFBpDJrE4X0Gj20fMb1k71eWnEMjHp87dfo4AFj788nJmQP7BBs7
-DeESRLPVVm1uvmppdQliraXlSnVDW7tDo1KMT09Ijo2Qm6XERQHGJ/NLrhm1ugYAFAAVVddDfQVS
-KWOnLtL3HdTw677G/CMhQybqI5MI4YFSjxKAUkESnaKzTWMKS5i2KO+7N9d89nnasBGh4eFRoSZC
-AQAkiXjLLoSRkmOjQoxRIT5gltb2+qbW5jb70dzitf8+NTI5bvbtaan9oyDEdKm87joBUACAqvom
-sJp1gX20ffq7rPWFm94Rnbbm4uy0Jz5llGrCO91IgcgqQ4BFZ7vKEBQ6ZHzhpYO1dXXh4eETM5Jk
-uRkGywFDtm9KAYD6R/gggzbIoAWAkcmxbXbXnjOX3vjXrpjwQKNB29Jut7sEjZLzL2W7C6NyG2ub
-HSQCCIjIA0JYoQQAhlMihIESdykuSy+bk6wTQji11ul0Op0uAHDwAqUUueMj8khPEQL54bdRkMHY
-qFPfOyHjuXsm/nQs19pobbE7dxzPAQBCSa80wDAYAHhCARCilIguRqlJnPdaS+mvxvh0xLJE4H1y
-y3rwwSBUEjHGOo0aAP6548TA6LApmUl2l3Aqv4xh8NCEvnq1srjGXN/c1jfUFB1q4kWptNbMsUxU
-iEnJsc1t9nYnHxVibGyxnSkoAwYTu/OVf24dMSg2JjzomonMPyE4XTwAEFEAoIhhWaWW4VSB/TPj
-71pkiktnORWn0nEaPcIYKPFzBurxH5Ak0dJYn325qLGhVoVcRBIQQg5BrGm0OnkRAJpa27MLKwoq
-rwIAL0hHc4p/OpZjaWkHgNzSujU7jp0pqKy4aqkprmLVSuDYSnNTlxm9QyIjhJSUlJ45cyo/L0eB
-YcOBc1fOHOd0+ojhMzDDyXqXKTgApZIYOGCYyhhORN5nQkA5tb7+4uGinasGpowOCQlhEKiU3JAh
-iVkzp2UOy2RYtjcpTCKEwdjuEsYsXvHr+QJQcneNTd/45hM6tfKaJuRwOLZt2/rFmlW5l67wqmBG
-oaaUBMQOIqJgzjsElAKSjd6tLiI4tWGx6sBIf+llfAJPI0wwPq1GxVUDpQ1N/Jef7di4aftrrzy7
-YMH9SqWqRwAMxgCw/+zlzIR+OUWVaqXiw6fn6dRKGVjXALZu3frqi0vNTGi/aS9qAiMBIaCSh5yg
-jhbvvkGYlXg7UNlq3NIDBYdLTO6vWvl6CjIy4BKBJ4VXWh55OffFl98ODQ2ZPn1Gd/zPydscrl9y
-is8UlI9Jib97VMrXe06GGHVJ0eFeYF0AyM3N+fD95Ve5yCH3/0Wh0hJJoET0k8wTajpNtshTIvke
-ZWukBAElhDqdotpBwSkCgsTMwO2r0m9bcPL9v60cOXx4cGiYvxBmq63O0uLkBbPVll9Wa7U5Rg+O
-W3rvnaEm/YYD54SrlpTMQd3lAULIru3bLlXUJyxYzilUgr3F65H+2covYoLPaztI73kEoBQkiYJE
-QCRAAeqcIfH6ZQtjnv/g7NcbdwwfN6HeYhVEiVKQiyQnL4pEig0PWjhtTHCAjw6evlQKPD9mcHx3
-AOqvXj1x/Lg6JkMXHCm6bL5M1kF62pX0fpbTwcBAIoQSAhT5vrW45k0OX/FVzY49v0QmpaqVChZj
-lmWCA7Qx4UH+69XebNXS7jhxsQRUygkZSd0BqKqqKq+oMKU+6DEb0pX0pLP04NYJ9fcKBEBJe1OD
-RscpOQTEB4zwxBCmTOynwAo6a0yySq3ptC5PCEEIYYS9ubawsv5sdkF0UsxgDzXquqCpqqpssrnU
-QZEeQX9rOd4pJ54fBSIBJZQSIHJjQomEWSVva267eGzIQJPCxAIveTI0RQAgktREDVDe7uA7ZR6M
-EMswDMb+TGHtv0+CxfrwXaM0KkV3GrCYGyROhxkGiNRZeo9NI8x6Mn+HiImol5NShlU4WxrPb1+r
-wJb7po8EQQKpo2lJ1KBlsQUR0nONX91g/WLnMYgImT5qSHc1NADY7XZglRhhH5/xSS8hzDCsUnTa
-6ksL261Wj4+6PQDJwiFEeKfdUu0ozQXJvPqdQUOHGkkrj71cx21LSOakvbmWb9jDl1bPfXDa8IEx
-PQCQJehKegIACOGGvINFu9drVa39orRBAQqG6cjAqBsSNriSZmueuG9keoYR2kU3U+vkNj1NvSgR
-lsG/5JWs3LgfosKW3ntn9ycVWABgWQ4kkcrDdJSeYZWNl48V7Vw5YaT+rWUjRw8LAhUGSn3e6fvJ
-CykAEoF2kYoEdZDezZIwot0vJbEMdvHis5/8AFcbn/zj3JHJcd2fs2ABIMBowqKTSKJ7htzSU8wq
-qKv1yt4tU28z/PzdZNBhsLrARn2RqhMMoEDcQiNvmPL2SQCASoQSj/n9popyR88XVm8+f/R8ZGrC
-24/N7HEhBwNAaFiYgjpFpx0AeaUHChgzbY31Sqn61WdSQQ2S2QESdU8/BSDee/+/4Enb8o0nJFBK
-KQEOFVc6JAmxDO6iCgcAgE9/PLTym12g03zyzPxgow562jjDANC3b3R4SJCtrogSyWdFQCklVnPD
-wHjl4AF6aBcZDCAHTaBASIdZ9y9ofDfguwGKAcDKXyh0hYT20Wo7JwHZSD7bcWzJ8m/Ayb/3/ILZ
-49J7u9EdERmZmDDAeuUUIOTLVpQApZJENCpWySGQiC/1Ek+ugK6cwVtUU1+2poSCid1+tLG8gRs1
-Ik2hUPgvGMrBf8WGfU++/SW02pYunvenBVN6eT4EA4DRaLxj/ATcXG4py2NVOs8sgpx95BqrI6EA
-H63w5xRuayB+CYQCUMCATKxocS1fWxUbnzpx/NhOQrTaXQve+upPH30HTtcLT9/7t8VzvWVnz2up
-so/fPWPmrl07dx34SmtYqguOBCJRQhiFCnMKN1Mg0MlfqURRAAsc48tW3h+hQCggAIkAUBCk5mr7
-wjeLLlaFrFm1KC4ujnhKQUGUNh0+//qXP5VeLgOO+/DVx567Z6KHDvVqRZKV24WFhT3z/LKrtc+d
-3/Je6NC7NIERiFLEKdrqK+TFUDcV9bN7pEC7d9ZV1jmUHPLkb3eKYxmkUgDPi0qWYTCU1Lq+/Km+
-me/7xl+WzJk9S9Z7m911JOfKB9/vO3z4HDh50GuQRtlis3vXdVDvtr19JSUh5PTp0+u+/urokcMW
-mwsQgzCqq2sak8rs/Wq4Rs243cBr9zr2nicv7D9lCdCx/pGQY6G+kW+1QVT0gNomG7G1AKt95OFZ
-LyxemJw+zMGLv+QUHfn1yp4z+dln8qHdEZmasGTuhAPZBXv3nASM5mXd8Y+lC+T1lRvZqbdaW4qK
-iyoryokkMQyz/rutTbX7d65J02lZEImf1wIAbbMJgigTNapTYwS03S4FBDDrd9Q9+OeG0bNm51uk
-llYbMNyEkRlJcdEXy2pLaxqqa8zQ1AIKLj6l/5I5E7LGpkaHBdocrsdXrPth62EQhEEZA1c9d/8d
-6Qk34ajBu8s/3r/9va2fJhv0CpCon38TSilSYsAAhIICORqcQEEdxIKB2bOxdurT5ZA8AcLiWAyU
-Uqm5FUQROJY1aAdEhd6RljhvfMbYlHiOZfyHe+/bPS+v2QINTRAauOz+KW8+9juVgpOP5eBuqEQ3
-lyCIHpYP/tEJKCAAcEqUUKREhbnt979y2doqrn87YdSdQQ6nqNAHzrt79Ldna8UmKwjiiNvSH5g0
-IiI4ICk6fFBMn2sN99KCKYNjI57++/fleUXvr9585Ncr7zwx6055be8ahILtacOHQQgxCDqVYN6w
-I+th037z+fw2ANi8v3HU1CCOpQFa9WsP3T3rd8y3e070Cw186YGpYaZebfVNH50yNKHvi2u2frvz
-lzOHsyfll/5xzoR3n5hl0KpuZIcmPi6qugEKy1sggAUCv6VxCCg4Sda4wOg+KqOBnXGbCTA1NwsE
-kCDROWNTHp8+Zun8SWEmvSBJkkR6PKYlSiQi2Lj+tUe//+vifmmJ0Gpb/eG3q348dIM+UFFRtuDB
-P+jh7JZPhmr6KKGRlwQJIYr81hIpoVgBdpuEEKhjVFdzrZMWX44f8rt1//rHrgsV/9x6KMig++jp
-ed4zOD1vb3r4T5vD9fcf9p/ML3nr8ayMxOgb0UB0dMyLLyy+VNVn4sKzP20qlySBCWKxnkEahDQI
-qRBSI6xFoEKaSE7Nkc3flE95KreVxP/h949o9MZzl8o+fXa+QaMsqTFf3xYfAADo1crXH5m2+/0l
-GYnR15potqf9NjR16tTP1ig+/Pjzxe8d/+vn1QnR7OD+mohgTqdhGAyCQFrbxNpGV36xs7BSrGxU
-DRo86d1lT02ePAljzDH4aE5Rq92pvnZR2+PhKgBAnk2nGz+xZbE0Hjp84uCRU8VFV5qb6ojEswyW
-yzhRIoC5AGNY//4Dxt8+YtztoyIi3IsIeaW1z36y8Y70hJcfmMIyzP/8uVFJkpqbrQ1mi8Ph9Koa
-IVCplMFBpsBAE3vttdvf7k38/8FXAID/ANxlBEavIDdPAAAAAElFTkSuQmCC
diff --git a/Golden_Repo/j/JupyterKernel-PyVisualization/JupyterKernel-PyVisualization-1.0-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb b/Golden_Repo/j/JupyterKernel-PyVisualization/JupyterKernel-PyVisualization-1.0-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb
deleted file mode 100644
index 12c0c7402..000000000
--- a/Golden_Repo/j/JupyterKernel-PyVisualization/JupyterKernel-PyVisualization-1.0-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb
+++ /dev/null
@@ -1,131 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'JupyterKernel-PyVisualization'
-version = '1.0'
-local_jupyterver = '2022.3.3'
-versionsuffix = '-' + local_jupyterver
-
-homepage = 'https://www.fz-juelich.de'
-description = """
-Special Jupyter kernel including visualization tools.
-Project Jupyter exists to develop open-source software, open-standards, and services
-for interactive computing across dozens of programming languages.
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('binutils', '2.37'),
-    # check for existance
-    # ('ParaView', '5.10.0', '-EGL', ('gpsmkl', '2021b')),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('Jupyter', local_jupyterver),
-]
-
-components = [
-    ('logos', '1.0', {
-        'easyblock': 'Binary',
-        'sources': [
-            {'filename': 'logo-32x32.png.base64', 'extract_cmd': "base64 -d %s > %%(builddir)s/logo-32x32.png"},
-            {'filename': 'logo-64x64.png.base64', 'extract_cmd': "base64 -d %s > %%(builddir)s/logo-64x64.png"},
-            {'filename': 'logo-128x128.png.base64', 'extract_cmd': "base64 -d %s > %%(builddir)s/logo-128x128.png"},
-        ],
-        'checksums': [
-            ('sha256', '84323b573eabc75b9fae94109186e2978939d09bcc5df3e851a27b9888a2d844'),
-            ('sha256', 'b4e80ac4ad7f3bc319ccde862518c148727474afdb3afd098bd4fcaebb7d7bf3'),
-            ('sha256', '567e6571a1770da70df1bb0a9dbe28b3b83fee2975490a65a09731516b27d8c7'),
-        ],
-    }),
-]
-
-exts_default_options = {
-    'source_urls': [PYPI_SOURCE],
-    'use_pip': True,
-    'sanity_pip_check': True,
-    'download_dep_fail': True,
-    'use_pip_for_deps': False,
-}
-
-exts_list = [
-]
-
-local_kernel_dir = 'pyvisualization'
-local_kernel_name = 'PyVisualization-%s' % version
-
-modextrapaths = {
-    'JUPYTER_PATH': ['share/jupyter'],  # add search path for kernelspecs
-}
-
-# Ensure that the user-specific $HOME/.local/share/jupyter is first entry in JUPYTHER_PATH
-modluafooter = """
-prepend_path("JUPYTER_PATH", pathJoin(os.getenv("HOME"), ".local/share/jupyter"))
-"""
-
-postinstallcmds = [
-    # create kernel skeleton
-    (
-        'python -m ipykernel install --name=%s --prefix=%%(installdir)s && '
-        'mv %%(installdir)s/logo-32x32.png   %%(installdir)s/share/jupyter/kernels/%s/logo-32x32.png && '
-        'mv %%(installdir)s/logo-64x64.png   %%(installdir)s/share/jupyter/kernels/%s/logo-64x64.png && '
-        'mv %%(installdir)s/logo-128x128.png %%(installdir)s/share/jupyter/kernels/%s/logo-128x128.png'
-    ) % (local_kernel_dir, local_kernel_dir, local_kernel_dir, local_kernel_dir),
-
-    # write kernel.sh
-    (
-        '{ cat > %%(installdir)s/share/jupyter/kernels/%s/kernel.sh; } << EOF\n'
-        '#!/bin/bash \n'
-        '\n'
-        '# Load required modules \n'
-        'module purge \n'
-        'module load Stages/${STAGE} \n'
-        'module load GCC/11.2.0 \n'
-        'module load ParaStationMPI \n'
-        'module load %s/.%s%s \n'
-        '\n'
-        'module load ParaView/5.10.0-EGL \n'
-        'module unload VTK \n'
-        '\n'
-        'export PYTHONPATH=%%(installdir)s/lib/python%%(pyshortver)s/site-packages:\$PYTHONPATH \n'
-        'exec python -m ipykernel \$@\n'
-        '\n'
-        'EOF'
-    ) % (local_kernel_dir, name, version, versionsuffix),
-    'chmod +x %%(installdir)s/share/jupyter/kernels/%s/kernel.sh' % local_kernel_dir,
-
-    # write kernel.json
-    (
-        '{ cat > %%(installdir)s/share/jupyter/kernels/%s/kernel.json; } << \'EOF\'\n'
-        '{ \n'
-        '  "argv": [ \n'
-        '    "%%(installdir)s/share/jupyter/kernels/%s/kernel.sh", \n'
-        '    "-m", \n'
-        '    "ipykernel_launcher", \n'
-        '    "-f", \n'
-        '    "{connection_file}" \n'
-        '  ], \n'
-        '  "display_name": "%s", \n'
-        '  "language": "python", \n'
-        '  "name": "%s", \n'
-        '  "metadata": { \n'
-        '    "debugger": true \n'
-        '  } \n'
-        '}\n'
-        'EOF'
-    ) % (local_kernel_dir, local_kernel_dir, local_kernel_name, local_kernel_name),
-]
-
-sanity_check_paths = {
-    'files': [
-        'share/jupyter/kernels/%s/kernel.sh' % local_kernel_dir,
-        'share/jupyter/kernels/%s/kernel.json' % local_kernel_dir,
-    ],
-    'dirs': [
-        'share/jupyter/kernels/',
-    ],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/JupyterKernel-PyVisualization/JupyterKernel-PyVisualization-1.0-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb b/Golden_Repo/j/JupyterKernel-PyVisualization/JupyterKernel-PyVisualization-1.0-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
deleted file mode 100644
index 3d78205cb..000000000
--- a/Golden_Repo/j/JupyterKernel-PyVisualization/JupyterKernel-PyVisualization-1.0-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
+++ /dev/null
@@ -1,131 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'JupyterKernel-PyVisualization'
-version = '1.0'
-local_jupyterver = '2022.3.4'
-versionsuffix = '-' + local_jupyterver
-
-homepage = 'https://www.fz-juelich.de'
-description = """
-Special Jupyter kernel including visualization tools.
-Project Jupyter exists to develop open-source software, open-standards, and services
-for interactive computing across dozens of programming languages.
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('binutils', '2.37'),
-    # check for existance
-    # ('ParaView', '5.10.1', '-EGL', ('gpsmkl', '2021b')),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('Jupyter', local_jupyterver),
-]
-
-components = [
-    ('logos', '1.0', {
-        'easyblock': 'Binary',
-        'sources': [
-            {'filename': 'logo-32x32.png.base64', 'extract_cmd': "base64 -d %s > %%(builddir)s/logo-32x32.png"},
-            {'filename': 'logo-64x64.png.base64', 'extract_cmd': "base64 -d %s > %%(builddir)s/logo-64x64.png"},
-            {'filename': 'logo-128x128.png.base64', 'extract_cmd': "base64 -d %s > %%(builddir)s/logo-128x128.png"},
-        ],
-        'checksums': [
-            ('sha256', '84323b573eabc75b9fae94109186e2978939d09bcc5df3e851a27b9888a2d844'),
-            ('sha256', 'b4e80ac4ad7f3bc319ccde862518c148727474afdb3afd098bd4fcaebb7d7bf3'),
-            ('sha256', '567e6571a1770da70df1bb0a9dbe28b3b83fee2975490a65a09731516b27d8c7'),
-        ],
-    }),
-]
-
-exts_default_options = {
-    'source_urls': [PYPI_SOURCE],
-    'use_pip': True,
-    'sanity_pip_check': True,
-    'download_dep_fail': True,
-    'use_pip_for_deps': False,
-}
-
-exts_list = [
-]
-
-local_kernel_dir = 'pyvisualization'
-local_kernel_name = 'PyVisualization-%s' % version
-
-modextrapaths = {
-    'JUPYTER_PATH': ['share/jupyter'],  # add search path for kernelspecs
-}
-
-# Ensure that the user-specific $HOME/.local/share/jupyter is first entry in JUPYTHER_PATH
-modluafooter = """
-prepend_path("JUPYTER_PATH", pathJoin(os.getenv("HOME"), ".local/share/jupyter"))
-"""
-
-postinstallcmds = [
-    # create kernel skeleton
-    (
-        'python -m ipykernel install --name=%s --prefix=%%(installdir)s && '
-        'mv %%(installdir)s/logo-32x32.png   %%(installdir)s/share/jupyter/kernels/%s/logo-32x32.png && '
-        'mv %%(installdir)s/logo-64x64.png   %%(installdir)s/share/jupyter/kernels/%s/logo-64x64.png && '
-        'mv %%(installdir)s/logo-128x128.png %%(installdir)s/share/jupyter/kernels/%s/logo-128x128.png'
-    ) % (local_kernel_dir, local_kernel_dir, local_kernel_dir, local_kernel_dir),
-
-    # write kernel.sh
-    (
-        '{ cat > %%(installdir)s/share/jupyter/kernels/%s/kernel.sh; } << EOF\n'
-        '#!/bin/bash \n'
-        '\n'
-        '# Load required modules \n'
-        'module purge \n'
-        'module load Stages/${STAGE} \n'
-        'module load GCC/11.2.0 \n'
-        'module load ParaStationMPI \n'
-        'module load %s/.%s%s \n'
-        '\n'
-        'module load ParaView/5.10.1-EGL \n'
-        'module unload VTK \n'
-        '\n'
-        'export PYTHONPATH=%%(installdir)s/lib/python%%(pyshortver)s/site-packages:\$PYTHONPATH \n'
-        'exec python -m ipykernel \$@\n'
-        '\n'
-        'EOF'
-    ) % (local_kernel_dir, name, version, versionsuffix),
-    'chmod +x %%(installdir)s/share/jupyter/kernels/%s/kernel.sh' % local_kernel_dir,
-
-    # write kernel.json
-    (
-        '{ cat > %%(installdir)s/share/jupyter/kernels/%s/kernel.json; } << \'EOF\'\n'
-        '{ \n'
-        '  "argv": [ \n'
-        '    "%%(installdir)s/share/jupyter/kernels/%s/kernel.sh", \n'
-        '    "-m", \n'
-        '    "ipykernel_launcher", \n'
-        '    "-f", \n'
-        '    "{connection_file}" \n'
-        '  ], \n'
-        '  "display_name": "%s", \n'
-        '  "language": "python", \n'
-        '  "name": "%s", \n'
-        '  "metadata": { \n'
-        '    "debugger": true \n'
-        '  } \n'
-        '}\n'
-        'EOF'
-    ) % (local_kernel_dir, local_kernel_dir, local_kernel_name, local_kernel_name),
-]
-
-sanity_check_paths = {
-    'files': [
-        'share/jupyter/kernels/%s/kernel.sh' % local_kernel_dir,
-        'share/jupyter/kernels/%s/kernel.json' % local_kernel_dir,
-    ],
-    'dirs': [
-        'share/jupyter/kernels/',
-    ],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/JupyterKernel-PyVisualization/logo-128x128.png.base64 b/Golden_Repo/j/JupyterKernel-PyVisualization/logo-128x128.png.base64
deleted file mode 100644
index eb5597085..000000000
--- a/Golden_Repo/j/JupyterKernel-PyVisualization/logo-128x128.png.base64
+++ /dev/null
@@ -1,229 +0,0 @@
-iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAIAAABMXPacAAAACXBIWXMAAC4jAAAuIwF4pT92AAAA
-B3RJTUUH5AQCEAgKKqJdGQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUH
-AAAgAElEQVR42u29Z5Rd13UmuPc+5973KqKAKsRCFVIhRyJngCTEIMuWljXukS1pJLdlyZZ7eVn2
-uMczy251tyW3renxyBqLLVmeNXTbbXnUa0maHpEKzCQyQOScUwEVX7180zl7z4/7Ur0CQJAE0Wta
-dRZZKBRe3XvP/s7Z8dvnoojA+PivN2hcBOMAjAMwPsYBGAdgfIwDMA7A+BgHYByA8TEOwDgA42Mc
-gHEAxsc4AOMAjI9xAMYBGB/jAIwDMD7GARgHYHyMAzAOwPh4+EN/QNe11lpmfP8XQhRmItK6/lGN
-Me+f1ISIzIyIjuPc7foMgA/lFkoppdQjAuDw4cNf+MIXRnIFx3UACRAAEBDjuSDGf8RPBwggpT/r
-hwBoY5qSyW9/+9urVq2q/acXX3zxD//wX0aB0UoTImD5/5pLlW5UI0KsXjh+JjEk5Kqv/cXXdu3a
-VXv9o0ePfv7zv5kdSbmuS4Tx1UozwPh3KzOo3q/u4eMRMrqJ5HPPPbdu3bpHBMDPXnrpyJEjn9ix
-NsE2KhYlshAZsVasBWPZMAuDEbEMLCAoDKW1jCAiMT4CkiT6aSad7OycNnVq3S1+8P0fnDl3+mOf
-eKIQeZ4NAxOFbCNrI7ZWrBURYSvMAhYEBK0AIBgAkJJoBEA05Y/3dkStc+fOrbv+T37848OH3173
-9MetkFcMwtBGxoaWjRWxzMyGwYgYFgvCIvEygngWIiASryxF2l49NLOzbcaMGY9OBf3spVc2LJ77
-/Jc+4/X1ecMjnCuYQpELHvuRFH0TBBxaG1gJWEIBI2KBRUBABIBZykso4dKxTHrZzp3Tpk+vvX4Y
-hm+8/tazH93+le/87oXbN4aKuUxQyITFvO8XbOCZIDA2kjC0JhSJGAxDxCCIoYAVYBAQEESTdG78
-mbeqYdlYAPbsfmv2ouX//E/+um8wPZzKpbNBvhjk/SgIoiCIQmN8K55lz5rQimGORKwwMIsAxvMh
-BAGN2g5c2bJpbWdn5yMCoL+//+0jb3/+qY3iFUdS6ShftIWiLXrWD8Qz1gvZRBwyR1YiFitiARhE
-WASFAYQRkAGSABeLwUWA39mypbqvRRDx7Jmzl69c+sRv7UplMiPpXMYv5COvEPieCXwTBCaKrAlt
-GFqORAyLEWBBC8AxxiAsIAmNvYXg7MDTf/x03RTu3Lmzd8+eTR/7TNEP06lUPut7hcD3otAPTRiZ
-yIbGRszWWGYGyyCMIuVv4ikAADA5unA7KPQ+set/eXRGeN+Bg/lMesO8Lm8kE+U9WwhMMeTAWD/i
-IGRjbCQQltaMWAABEREBsbGES7rUITrh5XVjw+aNG+sAeOut3YJ2werugUw6F/r5yC+EYdGEngn9
-MIrERNZElk2ML5dWfQyDAIAggJDCYm8Oi7h+4/q6KZw8cWIkm+tauDKTLRbyQdEPikHkhWEYGWNj
-RceRsZG1lsUwGxEWRmEBQGEBYQAUIFI8fDXp0Jq16x4dAK+8+urkCU1LOtoyV/r8/hQXfev57Pkc
-RBwxR1aMgBWxsaqMNU/5a2w5BQiRAQ/nc93z5q1asaLWowCAV15+pWdht2p3zg3f6c9lMmHRj0I/
-CkI2hk1k2YAYBitgBQSRAYxIyTiLCCIhgqLiqYE5M2evXP1Y3RR+/OILja2T2mcuuHVn6PZILlsI
-PD+0kQ0i6xsOrI1EImtLNoYZRKC08CvrB5FII5o7Z5csnL9s2fJHBEAYhnv37V/RPb0dYLgvbdN5
-m/dNIbCBAcNsWLgi71ji8RMLAGKsHpCQQAtmFRzPF35p8xalFDMTUQzA8PDwoYOH1z3Vk1fBrdxI
-yssXQi+wUWhNxMIChsUCioAFYUBhQAEGjG+rCBABEdhI5vTA1seemDBhQu0UmPnw4UMz5izgxISB
-G7eHsp7nhWFgfGN9a0NrIxEWEeZ438bmiwAIkGMLjICIqDRaPxq4vOZDH00kEpUpfLCB2PXr1y9c
-uLChZxal81GmYLNBOOKZbMAFY33LkWVjmUVYmBnKcoeyAUaKNwA4iL0mHAR4Ytu2WocSAE6fOj04
-2D93xewBLzviF3JBIRt42TDKRZI3kjPgMQQsAYOxaC2wiJF4t2G8OpUwOcRDXngr+6Gnn6qbwsWL
-F8+cOTNn+YaCb1P5oueHnh+lgzAVhrko8iJjjLHGoLVgLVhGERIQQRZBAQQBJCK0ytH5fgjTOx9/
-sm4KH+AO2L1nTz47smNeV75/xOaLUcazRSPGCogIS8lLj1d67A5K2SkvedpIAIAu4sFstqm9ff26
-9XVP//LLrzgN1Lly+pXsSD4o5iM/byQSjAREsCxoESmjCygiBAgICkUjKAFJUP5iqgkb1q5fWzeF
-t99+O5XOdi1aPTCSzxc83zfpICyayFhGZhQBEBLgamjBEj9gvJmRiIhAFGk7cGlSS8OGjZvuA8BD
-3gH79h+YOqF5dlODl87bYmQ9I8bassNfjVBkTMQVw0AIEPsRcjCbXrpk8ew5s+tucfDAwe5502GC
-HinkPRN6VjwLIYMpGdvKPUq6WESwrBwUgAIAQkLKnLozv2f+woUL667/+muvtbRPbp4ye3AkE1j2
-oqhoIhMZtIZiALg2AJfSjWJ9CkCkNBIhoVj/1qnlK1d1d3U9olxQoVB4+bXXdiye0+JHQabInmFj
-GGz1OaU+JK3+FQERiQAVJoT6wJwp+k/ufFyPzhBcuXLlwP4Dy7ctzkCQ973AWN+iEbQMKIBSATNW
-BVIb/SoETUgEisDkTf700IaNG1tbW2uvHwTB7rfemLN4TYBN2XwxDEwhMmwsMVM5xqqN5QkABBAA
-BAgAiIiQAAQ1FNN26MrWbduTycQHDkC8JK5evXb10qWNc7okW2QvsoEpLwuoJBxKyr5G8lLOTxAh
-EAJCguB84BW02rxhQ92Nzpw9k86NdC2fmfLyvo18ZiMCUtZnGMu8ouOwdp4KwUHQAKBV2F+AdLTj
-8R11Uzh//tylS5e6l6wbKfhBZAJjA7YQB7plpRbfDGvyDfHPGZGINCAhsnJo5KZLZv3GTY8iGxo/
-/c9efjmB/NjkScVUzvqRGMvCUpP2kXJOqCp9ACz5PoSESECACnFfZmT6rFlrVq+uu8WLP/rxxI6W
-iT0TU7lcxDZkYAYGkNJlyhLCWjWHAqAQXAKK/81RuQvpVrdlw+aNddff/dZbkYX2WUtHcvkwNEVj
-ImPLaZKK8So9eZw1iacjAEKoEIkIEQkx7Ds7Y2rHhvUbHl06+rU335o7tb3T1V6uKKFhYajV+2MU
-j0AlH4dEggoAUSF6LCeKhcWLl0yfPp2ZayOA/fv2z1naHTVKwfMCa40AS7xtBHFUMCFlKcX3VYQK
-gFCQEAEzp/tWLF8+d+6cuim8+vJL7Z1zVMuUTLYQRDY0FmPLXl7no9KviFJJ/wAQkkZSAICKbGj7
-Lqx87LGp06bdP2X7cAAgosHBwWPHj6/rnpb0oyAf2tAIS+1t7uoECIAIAiEQgUJAcAVvc3TV2Me3
-basszHicO3fu/LnzPetmZyPPN1HIUo5sY/FjdV9JVU+IAIFoFE2IiKQxKtr8+aH1m9YDYuX6RJTJ
-ZI4fPzZj3jKPnaLnG2OZWVWSbFjNeFYfquJREClShKgQQCnx0pC9tWnL1jiweBQ74Njx4703r2+b
-02nTeVMMJYrdnqqrKWPUFpQdHyJABUgIiA7D+dD3FT67a1csl8pv7N93wA8L05ZOGy7kfBNFJQUH
-UnLAoWJQKso51s4KwQFABBRgh8IbOcjyzl1P1HmHhw4dvHGrd8ai9emCHwZhYCzHybWyrLEieqxk
-oQUQBREJXSKFCAiWNA5fcZRs3/F43RQ+QAB2793XpGBpW2s+XeDIQFyNqU39S32dIoYFkVAhKhQE
-EBTAt7Ppzjnz5vf01AnojdfeaJs+ITmjOVcoRmxNOYSInfDSasSqYSxrOHEINCEBoABrzJwbnjpx
-8soVK+umcOjgQQuqrXN+NpePjPHjrHY5T46VwKUG4XiCjKhQaQAXgQCtYNR/obtzxvIVK+8TATxM
-AJj59TffXDh1UqdSxazHoS3lR6Rmw1YWUq0ziogEqBA0IiEZKNhoby69c8uWOgcxm80ePHBg9vKu
-qNEWAz9isYwiVaFI2aQjlAMjQAJwEB2E+A5CKBEMHb21ecvm7u7uUfUva1977dUpXQuxsSNfKAZW
-QmZkIam4byVTVMKk7M4xCCE6RLGKM0gY5oKbp7du39Hc3PyIasI3b9w4fuLk9rkzsRhyYMQKiGDZ
-XcDyDhCRUk5MqpsaFaKOdSc6Fq6Z4A7Dts2b625x9uzZK1euzN0wOxf4obWGQQC46uRWXB+s+lsi
-iKAJNALF5SwH/VQQXM+tWbum7voD/QPHjrzdufCxvKEwCANjYhNT+7yjKl/lEh8iaSKXSMc2mbTk
-BiEY3rhl66Moyser4ejRo5nB/q3dM/xMkUMjlu9m+SWu6tVOhRSig+gQEqFAEvBwMdcwsW1bTQ2g
-FGPv2xeyP2XJ1EyxGDFHAhaAoOSh12BQWp0ssXZDDaAJFaIggKNyF1NN1LD98e11U9i/f99gKjNl
-/ppswYsMh5ahlHiocZpHBzHx9kMiTeRgrEfRoopun53U2rRhw8ZHx4p4+bXXOxqc2Q0JP+9JZJm5
-4pcD1ljD0TZ41PIXQIMG5dDISM/8BWMzEK+89Or0+dOc9kTR8wyIYYTS6oxBrXqcsSmOs0oaxSFR
-iISIiBYxdy41o2Pa6jVr6gDYs3u329CSaO8uFAqR5YirCYc4mpRRtrc0N4uISA6SptiHQCs26j/f
-M2/u0qVLHwUA8exfe/PNVV3T2owE+RCikq6RmvkhVoKXqg2mWPoa4xSQwzDC5lwUbli3rrGxqc4A
-HD50ePbK7sCxQRRFUja4tamMMROLnZ+SehMQQgk4da5//Yb1TU1NFe+QiKy1e3a/OXn2kogaPM8P
-LNuShzu6AF/jZpX8LkSHMEGoEADAEKGfg4Fr6zZsdF33Ee2A02fOXL54cXPnVCz4kR+ysbEqLqcH
-yiYgXvLVMBiRAB0ElwARBF3AC35xCODJHTvGJOAO9Q3e6VrdmQu8wNrQCpejCKy6uFh1ywUAgRAc
-AkfFbhaJJn8o4GuFHU/urLv+5UuXTp44MX3BGi+SIIwCa0EYavewQI1TXQoLLCIqcpBcQo1ERJZc
-ydwGzj6566lHR8zad+BAVCw8Nnmil/U4LDnncVmiPuNW91eN6CApREQUVAwnIy/ZNmHLpvr8ye63
-3ko0Om2z2wq+b0REsKz3UWLHp+oIIQIIIoE4KA4iAVH8SY25KyONbsPGzRvrvMP9+/cVA9vWuShf
-KMa1Rh7tbsY1nFpzzACAqIFcRZqUQkQAC2gGLk9saVq56rFHB8Crr7/R3ZLsaUgWM0WJSgQHRODR
-MRdINSJDQVJELpFDiARCGInH5mAqtWLlyq6ZM+s4Xq+/+sb0RVNgos4X/ZDFVBNMghUnqExriUOM
-OPnjEGoiIgUABmHkSN/iRYuXLltWB8Drr73qtnbo9u5CsRhay8yqVFWoxjClb8vkJkFURA2KEkQa
-EQmYMLJR1Hty5apVc+fNe0QAZDOZg4cOr5zW0WI5CCKxzNVHHb34y1kyFAAC1AAOgo71DyiGYWtO
-huFTOx+vu0Xvrd6zp8/MWNYZUBRFxsTZtyqmUGNcBBFjBJyScUFCIgAhsAWTPj+wbsO6utA0k8ke
-eftwe/dig64fhAGzERCO44maZJbUwA4iAESxA4oKgQAMKCmM2KHrmx7MAX04AJw6ffralcs7Z80I
-cx6HFrjs8I9Ot9VHwYToILoIigBJBByG04VcQLhjzNPv3bt3ODs0c3VntlgMrbWl6mWlnlxO0pQY
-XYAgGkEjOIQOaQVKgNjFwo2cDJsnnnyiPsI4d/bMmbPTF60vhjZiG7EV4Sp9rmqyRuUkiMhFShK6
-RJoQQAxqM3hVY/j4k7seHQAHDh7kwF/dPsHL+WBEWOJlSKOvXpuMQ0RSSA6SE+duURi15QNeZvqs
-2cuWL6u7xf59+xMtbsus1qIXRAymVNXHUoSHAjU7jgEIwQF0SRwkJaUMNGgaPjc4fdLkx8ZwIA7s
-2xcJtU5f4BU9Y0v109oSxhjPD4RIETmxEkUkRIvAAH7v6a6Z05csXvzoAHjtzbcWt7dMVcoWjWNF
-I7iIbml9l77G38TfJ5ASWrkuOa7SpBAIBDGSgjVH0tlVq1ZNHc1CNMbs2b135vIZURK8KDIAXHKm
-BLHEZKwJq4HiypcSTahRESkkBITIcubU4IL5C3rmzx9Tg3ylZUo3Nk8tBn5gxYKUKjA16mdU+QVR
-EB2ihMIEESEIAgP5oSd9F1Y9tvpeJLiHX5RPp9Nv7tnzyTmdicD2FgIvMgOBX2BTn35DqOYUkbTG
-DtdtU4lGwiRpDtkxcpnDawC/vXNnXbx25cqVE8eO7/y9LT6EgbFWSsXlspeLlSJbJcRWCA6iQ6RI
-oSIAEY1BOvSupLZ8vj7AHh4eOnzo0JS5myJQQRD6bJktlQAYxe2tKFUGUEQaMUnxHgZGiFBx5jYU
-72zZ+rvvSobvC4Cjx4/nhgYm9Uz5zxdv7rnRl/K8O2GQrXlovGvhHWBqUnU0N3a1tK5qmzBXNcxi
-OJPPseusrwlQYyLN3t17Iwzbeto9P2QAK2Myq7HZrVS+CBwUB0EhKVQIyIKsrXczD1ne9fSH6m3Y
-yZO37vSv2bHcC6LQWGbG0Q9f4S1VlJIQOkhJogSiRhSFAhwBmeHrDsG27TseEQDW2r/9zneY5Z9O
-XbmRLYQA2DwxMa3HbZ6YaOlQjRN0QzM5CUQFwGKN8QvGz4XZ4TCXGswNmaFbMJRro94FLW3PNLa+
-mhuZ29Ozbm09SeSnL/50QueEhhkNKT9tBW05whAoZ8lq/HVCiH0rh8hBh4AQyYq1gEOn+2dOnrHy
-sVX1KvTVV8Bpapwyb9jz4gCYKmFFhcNeW31BVESOooRSriIgBEJmioT926cXzp29bPnyRwHA8PDw
-t7/9N//lB98HgMs+T9308UnzVicnzUhOmEKJBgQSsWKtsK0sfUREUiAiJoqKaT91J9d3ue/YSwf7
-Lp/JpPMAvzB3XiKRqK2y5bK5E8dPTFs0JXTYz5lQhAXjbHNV/gJYrsRTXHYnVEQaiZQWQgEbRGbk
-+J1n1u6Y1D6p3sXas7t5crck2oJ8KmQrwsxCo5d/bfaNkRyiBGIDoUOECi2ARQzDoty5sPZXnm5s
-bIoJrB8gAH19fV/56le/9c2/tgLdOz89fdPHnaY2YBYbWhPafKYcdAmMymaVWfOAykk2z1zQ2rV4
-+uqn09dPXvrZ38LgjTOnT3/ve9/75V/+5UozzLHjx65cu7Ll4xs9G4SWLSNwNQKuaeyIfX+Jcw8J
-RBeVUooIrYAoKA4Wwmu57b+5vW4ily5dPnHiRMeiZwIrxTC0LMJcKb1IjQWOvzISEiVQJYkShHH4
-a0QMakjfgTAVk+DeXTX3PeSff/rTn/7jf3zeCiz59L+b8+wXSSnrZTn02BopEQ5rqi5SU44sVcGY
-bWj9QlTM2qA4cdaKNb/+v05euv3q1at/9fWvnzx5ssZBPGC1beuZVPQDw6PNL1ZILTE/oZT50QhE
-pEgr1IQKBCNHchfTSUpu2VYfYRw/fqx/aKRt1nI/CEPDLLEBKFFW47oOVlk1Igia0EVKkNJKxT40
-gniizOClCY2J9Rs2vmMJ7P0CMDAw8MILPxrJ5ns+9oftizb7qduARDoRFkeMn9duQ5m+IaOkL7V/
-HVXFiooZNuGCj/7ehLmr9+3b993vfjcIgvhee97a0zq9RU12fd+UWG+ItTurYttj5eMCaEIHlSJN
-pMoGAAZP9c3umjXWAd23dw8lW5JtMzzfNzHltpyDqzYzYTUVoZAcUgmFCYVKoUIUwkgwMlH+xqkF
-ixbNnTPnA98Bly9fPnLoYKK9a9raX4jyKVRaTHTh+39++C8/deh//3Tv3u/FM39A6YMIEsWGYf6z
-XxCAF1544dKlSwDQe7v38KHD3eu6jOLIlh1QHlWRrTg/JfefwEHSpDUqQi2AliQshJlT/RvWr+/o
-6Kgro7780k/bu5dxss0Pg0hYWGJec20RWMoFA0ZUSiUQ4/yPgxSnNAxSkE/BwKXtO3Y2NTV+4ADk
-cvlsJtM0dU7MFdPJ5lu7/2nw5GudjtNmo2sv/Z+Z6yfITT6g9CsupTVBonli2/wNI0P9uVwurkHe
-6r81deV030QGkAWlnOUWwFjHcVkTIaFDsfOjHNJKaSIUENGQ68vDYLhxy6a6Cszly5cuXbo8edZy
-P7KBtVak3LAA9XUGxDjz4yAliBKISpFSFENlUJmhm8jeunfiYD2kSBirLgIiso0yt88nAZ5tbtvS
-MhEA8r0XqjSFB5K+AMQEK9U4ZVa8yOMSmG7WTV3Nnh8aKSWZyvZQEDCuucfepwvgAjqIGlVsAACQ
-UayC/LlUk9P01DNP1659AHjj9dcKXtAwY3EQBBEzMCPUKp/R7ApEReQiJhS5SjmEilAILaJnwb9z
-pnNK+9Zt2x4JABXTKiDCqJzmyXN8gD251OncCAA0TZ0NMSdOaiOwCjfobtKvIBQnkxEA4PVXXps8
-f7K0YBjauKemvBxL5bWyJhJC1CSaQCEppbXSGim2FpZ5+OzAnK5Zs2bNqqvi7du7x22dpponF30/
-7rko9Y/VxIxlyAUJNZKrKIHkKNIalUIBsYI2DEzfxUWLF3V2znwPfcv0HjZAZVELi/Fy3Ts/OXH+
-+rOC17Tbtf1X2+atsUGxKn2RejDkbluhBCoDgOO4t27eOnP2zPSV0wM0gQWuVh+lTPgtYYCADoBG
-0EQuKUc5ihxCEhBLEGaDzMm+pz/8jNKqlgSXTo/s2f3WhK6lETV4UcQ8ijmG5RJ87HAJIpFKECWJ
-3Hh/KYWEghAB+YVhGLm26+ln6nh8H2wgVhWbWCS1+BNfzt2+oNyGpsndxs9DJRv9oNKXWrPa0NBw
-YN/+bCE7aVG7HxoT95aO5kdJmaKjETSBi+CQUuQ4pBOoBFEYWEu2vwAZ3rSlvkXi3Llzt3rvzNzx
-i8UwjNgycK3bX5tFj4kPishBSCp0FTqKFJEgWmGDFA7fBLAbN215tw7ouwYgDvBYxMaEYWEABkZm
-K9a0TJ8vYo2XrV/7Y1G7u/RLzjcpFfj+G6+/mehINHQ2pTzPMnL5M7EnSqW2FwAAheiQaEQHlSbt
-KEcRWURmMWBTx/umd0xbt76+D/LNN94oBDY5bVE68CK2cb+XKocVlaoLCAoBKXKRkkq5MRKKiDAC
-EJB8xObmyZ5ZM+Ma5AcLQHz1jvaOmIChnCTrBCCVHpUtgJBO1gRipW/YhtUa9z2lX6LdJFw3k83s
-37e/Y9FknKTNAIpCZKK4cSYmK2ApHaQQdez+K1KktHJcVIRkQFjYZzt8om/jouVju9T379vbOGkm
-NE70MzkuFferNVQpl+8EBVBpUK5Cl8hR5GrSClEhM0eMfrHg955Z9ezmtra296ZL9P3TbZWYKB6N
-jY2+73uer/1c9vpJ42VLANTWfutkCtDY0UlKy931fvWTcZOeMeaVV169dOXS1KemDZwdymYCHzCu
-katmR7c3oEKxDAIEqOPEJ6FGrVA7SivSiCjMhiQYKhavpXf+weN1B3309Q8cPLBv0qzNBp2ALbMg
-l44bqGQ3ykYGFVEp+lWoFbqaFKnYYQpARZk+8Aa3btsB73Xoe4W7Bw8efPPNN2/evAnlEh0AOFpf
-uXK1GERw7cSxb3/xAe+x8rNfa5wyS6JgtPmQOumDiFbq9u3+r/7Zv2frjfwwBz+8UCX/NKiGGU3N
-q6c2Lu1wJjfG/cQOxtpfx/+5qDUpRmAQ60jqcsr19cbNm+q06PHjx3r7hpZtXp4PIxNrHxG8i52D
-mDuQULH5Va5SrtJEaEUsSyiUv32+Oak3jSFSvncArLX79x/41reee+VnP7kzMAwAzoSpOtksbKQc
-9TRNm3c3wvPdyIhsSTnkuFBiQd1r7VctoAH42JMtH/+FRflMVOG4pXLhC68M7H475V1INa2YMvHZ
-ucmeiQogZv07SBqVVo5DWhHFBwYwcPpM/4wpU1fX1CBjAF595WVQjaqt2w/92PtUoycQJ0EZIPY+
-E0gJIofQ1UorQkXC1iD6kYl6zyydN2/xu6lB3g+AIAief/75b3zjG2fOnKHmybM//LsdizfrZDMQ
-QalOHQfrNbHVaA0+Ktoq/5WjkG1077UvdV7Qzo0dn/oX82EgqAZDIn/0L+a/fWzkM79//PSJAQlM
-x8cWJOe1OQo1oRNrf+06SiEis1gUrxikTg58ZNUT7R0dtX3eALD7zTdaZ/REbkuQzVkRFI71T7XI
-gKUAz0HlKkpQyflxNClFgsAALOjn0jBwef2zH2tpaXk4ALz44otf/epXbt68NXXdL859+vO6ocUU
-cyJGTDWlXJJWzEuQyjdQTRCIVImsWAPMPaVf004hAgBFz0IqhHQw6vMCax5rO/Kjzc/++tuv7kul
-X7nW2rHImdaohQiVVk4ClUYlQCzGkHiDxehm7pnff6bOj7h8+fK5M2dalnwkEIxsJKMorFXeA2Ns
-ANBFTCh0FDqaHK0UoUVkYE8wytwGm9nx+BPvp6pYDcROnjz5V3/19Zs3b3Vu+9VFH/8jRBXlUsym
-fPgEj45XuezYVJJkXCNrLgXD/CDSF6jl+EANGFKVPoBIOnQV/uz5tUvmNmUP92cP3VEsrnIcclzS
-rtZKaUCwAoY4dXnIifSmbfXu+aGDB1LZQvOMxcUwiESYGaUsBawUj+KzHpRLlERKKOUolVDKVUop
-JQgsEljI37k4odHdvHXbQwCgUCj8/d///VtvvNkyd/WcD30uLKTZBFINeuocm9HL9h3zPO8o/aoV
-kDEWpYKBIAIXrWqgb/27JQCSOdIf9ftaKa2cBGlNWhMJghUJbDRw5PbCBQvm9cyrA5AwdpsAABIx
-SURBVOCtN14HpxXaZgaBL8zEXFaCFe8TBAGINKJLlFDoEDqKdCnDDYJiRLwwDG+eWrZiZXf3rIcA
-wKVLl372k58wQM+zv80mkCgc7TXCg+f3x0gf7ml16y4yKicBtWu/8kkigGy0bf3ED+9oz1xKZ86l
-EJSrHYeUJi2AAsjIBc9PnxlYs25tY+Oo/LDneYcPH2qaNi/UjZE11YxPqdm4dGcWQCInXv5EWpGj
-yFFKESIBCxjAXG4Ehi6v37j5/i1gDwrASy+9fOrkyckrnmzpXGgDbxTbtV768i6lL6Oi4neQvowi
-UUhNlqLyeRZw8HP//UwAGD6TAk8S2nGVo1ABEotEyuauj0gq3PVUPUPtzNmzp06eap2zJrQl3Vpq
-qSm3GMRbhYg0YgNRUmMseldr11FKxf4H5yxGfZcRwvdpAEoAjIyM7D9wwAJMW/2sDYpA9JA0z10u
-cg/pl5xWNmE54XDXHVD+ed5sf6x1RoczfCNnspGrtaMdIgWALBBpSJ0bbHWbl69cUV+DPHasGJrk
-tB4/ClkAK0f9ANRUvgAIXaL4P03klgNgImSAiK1nIdt7dvrkSStXrHgIAAwNDV25dAEbJzVNmc3x
-xrz/2ocH1Pv1m+A+0kcEsaY4fBsAWloUsNRLvxYB37bPbFi7rCUcLESpIKETWsUZUDDIQRj2H+1d
-tXzl2B6Vn7z4I9XaCS1Tgygo09+qPRcV4gkhJYgaiFxSrkOuo1yHHKUQiQV8hqCQh5sn165fX5vl
-fu8AXL9+vffGtdauRZRs5AqR5F5rH8b4+w+QZYO6lsm6tQ8CgBwFmVvnAGDxvGYI7JjAreYXBQBl
-0dwmENCIrtIOKkIEEEuSSxe8S6nVa9fUZSA8zzt86ODErsUhupYNg9gaDmjVA1Nl0qdCRagVOUpp
-pbQmjP0fpnx6EIr969ZveA/Zt7sAkMlk8vlcY/tMchIQA3CftS/vwed5B+mLNTrR2H/qDevnm5uc
-DavaoGDuJ30Q8Hj9shZQ6JB2yFFKCyKLRGTTV1KQ4bEG4OCB/Td6bydnLPUtW2bkcoON1PTAIGik
-BFFSKZfI1ZTQ2tHoOKQIAcGAeAzhnYuaZOf7NgAlAAhRaddpaR81w4ez9t9J74OAiNPYmu+/cnPv
-9wHgo7smt3Q4YuuILVD/bKHtnOoColLKUbqkf0ACtJkLA21NE9ZtWDc2A2qtoo7ZYRSwlA8OEZTK
-iWkIQEoTJRQlFDpKOZocRY5WDpUqMAagENpC34Wu6VNWPfbY+wdAxyIi7erGVmFbz6YaleO8l/Qr
-R8VgVZViKWdfIomVKJZSPVyEEEmR0khq5MrRiz/+to1CAPgfvzAHAosId/F3R5nl+IBR1KS10iIA
-YI2I5wV3jt18YsOGKWPOet2/dw+2ddpEm/E8KrUAj/K6GFEROqQSRC6iVugq0ppcrVxNQCAWjEDo
-FeXO+TXPbmpubnk4AAAIaa0TDWLNaOnLO6x9EVQ65gKJNSX3pfxJqdHXIPWIsgnDfLo4fHPo7N6h
-8wfj23znz5evWt4K6Wi0dyRjnKJKzgw0KU3aIFuREG16MBOez2z71fr88K1bt44cebula10RNbPB
-0rlXQtXDJYSIXFRJwoQiR5FL6CqV0CrhKKXIAhtmjyGbugNe/66nnqlk9x4CAIiE5NRJ8H7SZyHH
-UU5DcfBa38VD+f5rYSFnTNygJPW5UQQYUyy1UWhywxCOlBLdDn3z3y753CdnykgUd5zXu/93CQsE
-ADRphcqAWBZDPHJlULFav75e/xw7dux238Ck5Uv9KGQRQaFq31dp+SOSQ+jG6VWFrlbaUY4m1yGl
-0Fi0zDkD5vaFxoSOO43fvxHW1TzVu1j7QI5r/cLlH39r8OTrFdE6AM2NNWxWuWs5v8o8xgQ0dyQm
-tyc/vHPyFz/VPbUzCZnwAaQvNfQR1KgIFaCNrC1Q0H/o5pyZs1fXnPQUj91vvWkgCe2zIxOCCAnL
-aEYCkoqdnyQpl9Al5WjtapV0lKsUELIVAzLiRfnrx9YuWbJ0yVJ4GEOXyGXCzKYqnnda+zYonvxP
-f+IN9wIAEfwP/2z2k1un9HQ3trdqKp+cNDovDaMz1RD7360tevK0BLgEmRBGwjGx3r2kLzErBQHK
-FEQJwRQKxaGzfbvWfXRSe/sYAF5PTpsPbrMUsyBcOriisiAIkFATJYjc2PWsmF+tlUJGYOGCgSAz
-IoNX1370E42NDQ8RABBrOPRLhKr7rn0BQaTzP/zfYun/8kdmfv3fruia2wIEEFqID9Gos8/3FCKA
-YShayEY1CI39Cnf9dRFARIWEiIYlIE7dHIbb/tYaEm6so69du3r86LGmxz7hCwpblGrerXLggyZK
-IibiuFeRq5XrKldTwiFHk8/WghSYMn1X0OZ2jGnlfF8AxAQ34+fLSYh7Sh9AnGTTwMk3MtdPAcBv
-fXbuf/jmBsiEMOJXe0frpX9XPOq80vtI/57gKcIYAAC0YAM0QxcGkpTYur0egH179uT9qGnyHI8j
-EbECKKAqNyYAQg2UUCqpUCty4+WvKOEoVytSKCyRiG/Ev3l2cvuE2qMmHkIcIABswqgwgqPaYO8i
-fUSyYTB0bg8AbFzb/h/+fDUM++KZEnHwvUlfHlz6NbtB4/BIBAIIZEFCtkUbjJzunzWze+mypXU0
-0DffeA2SE8PmaRyFIqJBsOYcAgHEmPUWNz4qcpRyHOVq5TrKcZQgWIFIaKTgmf6LC+fPnz9/wft/
-eUcVAKU0IQbpQWELCPeSflyjDgupkaunAOBf/8FiSJCEjAD3yFzeSxeNQehB136F4iiQpH0nMsyx
-GuMIbSGdHz51e/v27dpxKtJRSuXzuQP79zpT5rPTxDaSCsOgErEQOUQx8S1e/gmtXK0SDiUdpQgE
-xDAXLHipARi+sn3HzvdGgrsnAN3dXVOndxaGbtjQqx5PJGNywgKIGOVSYIMpkxs/tHUKpAJEuJuY
-YHSRa2zNa/RP5L62t77uX/rJyYtFQGSESKxPNnsnDQPRzl2P13mHFy5cuHr1mtu5OGCuMH+rcR4i
-xdJX6CqMl7/W5GjlOlorYhDDEjDnQskO3AAIH9/11ENxQKsAzJjROWvuPK/3fJQfwbi8UC/9avrT
-hkUAWLaohVoda/ie0r+L/bzXT+66OeoMw+gPJ3D4pnfoZK59altje7MXhUXj95640dE6af2GehLc
-nt2704XInbIQTIhxVzFi9fRDRE2UJEqSckraXzlaJbRyFDFwKPG7D2zaCwvXTnRN61ixctVDBqCt
-rW3BwsUAnL99EZVTSgXXaZXa1CbApAkuMCPCfaUv70b6UF+Tufu2ABCBJvXS4cydFHf2TElMasqH
-QSYoDh3tXbxkyazZs+tmuHfPW9DYEbZMARtYAcL4hG8QAiEiUi6SQ+ggEqEiVAqJUFAs29DYwFjf
-sBfJYKZgb595bO26yZMnw8MbBACJRGL9urUtTcnbh/5fRCy/1gLultYvnQ1MNecUPoD04V1Iv/4D
-Uv8BBPDtN/+hF0DP2TgvSkjeFFODqcKlkc1btzh61FnTfX39B/fvb561EpQbk09K2fYSwRFVfNKV
-xCQDiERCa4vGFqIoG5qsH2X9KBtEIwH7A7egcPvdtgE/aEly8+bNS5evzN06l756XDe0lOshY9P6
-tcdgyQNLX96r9Ot3ABuBifp7Px7afSw/Y8mUpp62EVNMc2Hk8qDyYOfYs6AvXLh2o1fNWAxs4tmW
-s84U97UyADMEAh6LZ23B2HQYpYMw5UXDxWCoGKaKYdaPBn3O9V1qdPTGTZs/EABmzpy5a9eHCODy
-S/+XWENu4h7SrzGkAu9J+vAupS+1zAma5Fy5UPztf30RtJq0sTPbFNzJ96fCdP/p3hmTpi2tOegj
-BmDv7jcZXDWh01hDgAhApdZHKbGsRSK2BWPSUTQUREPFcKgQDOb925nijZHC9XT++kihN+1nc4F/
-8/Ss2d0LFy56uADoCiX/M5/5zJEjR1588cVLP35u4S/9nphIbFStF1W9/Lq6OY4i+L+z9B8sLBjt
-ngoLEsAU98jB9Ed/52yqwBOfnOUva7mYGxJmcHXm5MCuFZu7uroq6cn4689+8iJOnhM2tKMJmJAZ
-gIjiN2XF2Qg2IYBFKEblnBCCKjUeQ4mvi45iAwMX1//Khx6uARjFjOvp6fnSl750+/adY8deM0Gw
-4NnPO00TOArLjCsAEHKTqN36HXC/vLEAADTrd3L2R7dp8GgflAU15oeC/+Mvr/6b524EBtq2d7V+
-aDY3O2HE5BKnw+BGZtsnt9bmhxHxdm/v+XPnk9M2C2kQX6r91tUzLuN3O0jNRAxCFB96KiAIJMIO
-NeQGIRjetHkLPOwxqmq6a9eur33tL7785S/v27f38PUTMzf84oSuJcptqEgHnUSUHap38++TOyOM
-Iv7md676ISPK6ObzWj5ouWzAo9hxAKAVFAr22LnCSwcyhYKByU2Tt81s3dmtpzRxZElAmh17dlB7
-+NSHn4b6k+D23hkcad2wOlIOOAkUofilPszl5scyC7S81uveM1GK5txmfeN6U8J54oGP4nvv7Ohd
-u3Y1NTX9zd/8zf/9T9+9/sZ37/l7VbYz3s/zIfCtfOkr5x7OwyaAkpy/mfK+lym9ZVMAXCqcG5rV
-2Tl3DAnutdffAODcsR8JvQRgUUTKffCjjiO+z4g/o5zw5omli+bOnj3nAwcAETdv3jx//vxisXjo
-4MFkMlEbuiOgZXvxyh2pZdTcx/ZacAn/5edmF32LdWWZaqWs9IOkS3uOZ/YeLS5cOK+luZnLpwaX
-oIwbo1kkZPFGsUi91gkf/9VfqXsbVRAEnucvWbKkKREiBPc5AOsBhpdvnPHZ3/jNsW9cff8D75XT
-yGazQRCMivdEHNft7b316//8dzonnP3+P2ziobDEy7u/7W1zYq/v3iZXAADanH//tfP/5q/9H/7w
-Hzdv2mSMqfVnsHLu8ZjnFZFkMuGMPihVRAqFQtkkjDpY9N3DIMLS2NR01/fRPuQdUBl1h5dXRhgG
-bsKtNPFD7aa+x1c7FIzmOccuuCCitdWzGSjkQs6Sopbm5oaG91vuQMQHObz8v/p4122qXNH+8M41
-k/irIqic6BkzEDFBkFQQWuUoyETxMUCgQCko0x1+Xsa7Zvb6vh/4fvkki3eZdQBgy9ikrtz0f+lz
-R1d+dP9XvnEVXEKN8HMk8/e3A65fv3712rWuVTiKwHI3vsKY7kkAEVKQGYke//WjN+5EOtH2J9+4
-5gX81T+YA9koJmsC/nwB8K53QLFYLBQKjsYaPh/U08rvUnEsf9+iX3hr+MadYMfOHX/2p380Y+as
-//iD21K0dznlbxyAu44JEya0t0+62e+BVF+ic9/61+iNEvG0dgcAMun0mdMnUqnM1A4XdclHIhQc
-B+D+o7Nz5tzZXfuPZnov51WjAr5XrfHuKQrJmSc2TfyNX5l+7NjR5//uH0Iv/Re/Pw+o5Er1D0XG
-8sOq9v23ugPaFi6czwx//PUL0OaAg/dNq9X/BAnA57/9454Xnlv23L/qOfv/rHlyXavkIkgqP2P+
-038ZmDK55WFRbv7bNMITJrR++tOf2rdv//P/+cScrqZ/9T8vhOFAQq4GunJfahuAGEYFH945ERAg
-YvAYXQSCX/ufzg1l4J99cldPT8/4Drjf2LRp0xe/+FuTJrV/+S8vfua3Do8UDHa40KzAoXdOz8Wv
-mbICBQu+BY3Qrq/3B49/9tgPXk1v2rTp137tU01NTT8/AOB7U7hBEPzd3/3dc8996/jxo8kE/P5v
-zPnvnp66sKuhscMBAAgthFw65adiJOJTixWARnAQDBdT0fFLxX98ceCvv9sHgDt37vjTP/3TrVu3
-ws/TwPds8YwxBw8efP7553/yk5/dvHkdAJYvSK5e2rKsp3lhd+PUDndim25poKSDBGBYir7NFWwq
-Fd4ZDi/d8o6fy5+4mD9zxQDQ/Pk9H/nIL3z2s59d8b573n6OAIhHoVA4fPjwSy+9dOToiVOnL/b1
-D0dBAcTTWjkOOgqJSlQjYyUyHBlhC8ptdhONXTOnr1u9bOPGdZs3b168ePH7z//8PAJQ2Q2pVOrG
-jRtDQ0NXrly91XsbK29+lWr/bRzoaq0XzO+ZMWP61KlTZ86cea+s3zgADzrqukSY+f4vcAWAuv7F
-999n8vO+A8bHI3VDx8c4AOMAjI9xAMYBGB/jAIwDMD7GAfj/9/j/ALx5l+6hc4KdAAAAAElFTkSu
-QmCC
diff --git a/Golden_Repo/j/JupyterKernel-PyVisualization/logo-32x32.png.base64 b/Golden_Repo/j/JupyterKernel-PyVisualization/logo-32x32.png.base64
deleted file mode 100644
index 3d6f3a3f2..000000000
--- a/Golden_Repo/j/JupyterKernel-PyVisualization/logo-32x32.png.base64
+++ /dev/null
@@ -1,30 +0,0 @@
-iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAACXBIWXMAAC4jAAAuIwF4pT92AAAA
-B3RJTUUH5AQCEAg5lXI8DwAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUH
-AAAGFklEQVRIx+1We2yVdxl+3u/+nUvb03PoWVs6ymUt6yB0QGIpjMvYHN3YMq3ZBJ0yI9MoWdRk
-+8MtJjONidENcbiKToiIbogxE2HOsQkGWaUtXWdpC+1pDwUKpffLufR83/f7vf7RaaCXxMzsDxOf
-P99f8jy/95LnfYmZ8XFCwceM/wt8FIG52v7R4jTr864vfzEfQiTSYtJhlyBFqjD/h6++umfPS/HR
-jqFUMiMcR8JlDnuBgy/v3/uTV87FboyOpdKukFKAcS3edr7uBABtJnvC9Ur7O+83A8meAXfMkY6M
-Mv28fDmAhu6T4UfnjwxODGUySY+dHKOsvhjAWw0dzoIH4omhvslUynUkU3k4OcU2i8Dufft2+CKd
-py+SoQAgonMjA/d/dlvf5RvD0WRDLOZJlQAimuzu+/S6Z9x0omvCirfGPDejAiqBA9HqO/PmbnJv
-12jbNZgEAhPrpvpWYnzzihUH9x/IqVyQ8VQCAeTXMHjq0poH76nduzu0bLOTmdSIiIhUjS+1Plb9
-yJwC/Sf+NDKaJBAYJMkylfyqLQCuupfar/ZpBAIzEDRw78L1AGIDTmdPr67QVGN9honeppLyitkF
-WnuurMq4kgAABMVUQqTgnkoA73afTKQlEQGwiI2QVRm6G8DRuq6x8TEQMSAUJdvyPbyudM4xfe31
-39ybnQeFFSKSMMPmsVj3zqeeavxrY05FVEgFgGCETTVW1/Xkti/EO1rSOSVSCgLA8Ou61OxNd0Xm
-FMjpaD7TeqG5v6e5L94yfNX2KRcNuzgn9OaJY/qSCDED0BWETNO5kCwoLTp8+Ii14G6FBQCPUODz
-XWl8e+dXvvpvwlumqP6908+827Nox48tXxYRuRPDz7XXlxY5AJpH3+/rn1RIkUBYg+kP3Ld4I4Cz
-XRM3Ur0KFIB1TY/Yhh+DgVB09gx2Pv/S8oeeVI6+GDKsgJMOGeZdK9b1Fj/a3tR4dqjJ8xQGFPA8
-005r/InQCgDH6+OumwHBYxRYFnzBxysWzWkVqmEbdhBl6+FlwBLSY+FlR6KHag/M31rGIGbO0jjX
-n3vuWMOubz79t3eOWqUbVBZgKJo6P2APpNKbVy28mfPDEr1Y87wdyL7eWif7hwk82t1cWPGIlZMH
-lrapH/nDYT2T1z3oLX1iadiVWVYwNB6EiePv1CF7GUauC3DEtMNZvtPHDm+vPTJdIFJcdvvndmvC
-KPnaQUgPUoDZnRiUboZZOg698J3cbdtLh2Nj+V9vWvnsfUqWsbFwDYC3P7iRsG8ziDxFKbQNy2fe
-UWBNmxrt5R/UFFR/15AppMYzSQmWkAJSgiWzgJQK8ehABldSuZa6c6EwQnnxwf7PlzwIoCk2aiwT
-kjnbMPKzfZOmf0tZ3nS77rg8EAxHp34NlgoppJqk6lB1UnQjmHv+5JtVlYWQAp6ouNP2yeDZ371X
-/aXHfnvgFWNVFaQUpBT4rGgocCHWWV21dnoGZs48OZkEC7DUTfvML/esXpLRFAIzCImR67/aZRUv
-uB0JFyRVkrYZuMO/CMCpf1zxsEgDfIae77fmhfzdrx/f8Iuj0wUy40NKWBNSKJpRv78m1VJkmToc
-78NCiRBGHCRcSAGwEMILaiuDZQB+fbqDivI8ULFtRUN+02+Wl0RnOptWkG38PZ1UpSTV2Lo2aWWA
-4RSYIQSknGoGpICQ0Plsm9O3vO3ZLTucxMj4ZFAHa4ZeFLBvC/ljKWwti8wUIGam3JIN36oVAvNa
-nv79jxYjJdjzKFeHyv/ScEHc1Ti0/Kce+RLJI5f3fL/mG61LKNGvKGrAUAO22dvZHv/Z9uKl5dMz
-ANDX+pdPVj2cW7jY9klIhhTkU5+rae+5ljZUpB2nLT5/XiRryI1sWpdXohUBGBp3NzhnVE0AgMc8
-QYXqpZns03fy9174zLefSGJSsJSkAuB9b1ze8YD9Rk/t459ae/M2nzLtmVt+ZvwWq3i/OY6wDmaS
-Eo6o+2Bg70FV9/H42Mgtn5qNfc4434T6htaN6+3zfyzjWCV3reGW1acO5VeuLOb/ArOcLYde+3Pb
-xU5d1yXzQ1s2Vawunasm/wnof/66/ifc3TKUs8YffwAAAABJRU5ErkJggg==
diff --git a/Golden_Repo/j/JupyterKernel-PyVisualization/logo-64x64.png.base64 b/Golden_Repo/j/JupyterKernel-PyVisualization/logo-64x64.png.base64
deleted file mode 100644
index 3803d7335..000000000
--- a/Golden_Repo/j/JupyterKernel-PyVisualization/logo-64x64.png.base64
+++ /dev/null
@@ -1,79 +0,0 @@
-iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAIAAAAlC+aJAAAACXBIWXMAAC4jAAAuIwF4pT92AAAA
-B3RJTUUH5AQCEAgk9nRQ1gAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUH
-AAAQ20lEQVRo3u1aaZRV1ZX+9jnn3vumGhhEhgKVqiiTErVUjCiRQcIk4sAoHdeKMZ1eHV1pu81K
-Z+gk2itZbRtjMHa6E5MYFRkNKjYRY0tkViNgCUIV1CBQRY3v1ZvvdHb/uLcGMAnDH81a3HXrrVX3
-7fPO/vb59nD2ucTM+Fu+BP7Gr/MAzgM4D+A8gPMAzgM4D+CTvNSZi27ftu2NHbusSAQkIIiIIEAE
-gPrsofXEqqrpM2YAsG37x4/9xFKWJCkECRCBiELpcIzg4VWj5s2dB4CBx/7jR6YSUgpBRESCQIBA
-OIZBAOc8cd9990Wj0bMGcNeSpb9cPqO9rt5LpnUm72bzft7jgq9dMMBaE2h7qo2ffDIAsPqFNbs/
-/N+qyaOPdXd0ZnMZN1/07ILWtgeXyNVgQsehEz9M3R8AeGPza0+/tGXs5FuPH+/qytrFQjHr6rTr
-ae1DazBD+zAS2PH4Aw88cNYrUHScAbCnVVU0FgpOLOJ1ZrxozM+6usDsae2BmUuFfC7V9tOFC4Mh
-v/n1bx96amltpllmE9F8Km3nc04x72vbR5Hha+iY6thSf/cX7w7kn33m1wvu+0ZnVjqRtJHOZ/KO
-dBxyvKL2Xc+D9gGw694295ZzodCLL7185zXjGrbUZJs73FTWL3jsau2DocFgZiKSQnw0cMDwCy4I
-hhyqe79RTdvRcqS7mMm7btHXLsNl0gzWDIK0VOKYqLhkVCD/xpa3lsz7znv7arKZYrroZHzf9Txf
-a2gtwBogaXpHti381rJzAfDcqtUPV16c2VVXPJHWnq+hiYjBBDBARCTpqFO4ftbsQP5I3ZHhYwbt
-bW48lu5Ie3A0McCaQAwmIopA28n89Ik3BvLdqRTHBtcd72xP5lrzBc/ziLXQDCD0MyKyYmjc9YW5
-T59LFNrz9vZRHtvtOc91NXwQGAyAGWCQJEPIV1qP37N0aSC/bs36q279bGPriU4XeY88hg6XChpQ
-xKYhWrfXL1q6JJDf+PKGMZ+b03C0uSNf8G1bej75zAABxMxgQxkEMapcl5aWnTWAlta2KoOzje2+
-7UKEJgkvAgQJJcqV2FzMz5k+PQSwdu2Q6hGpou36PeEjlCYCRwWMqJHaemzu7fMC+ZXP/3bYFVOS
-6VzRdQUzCEHsCWeS0hTCbW+8ddb0c8kDq1/ccOeEqq7mLs3+KV8xWAoig3wNu3K0ZZrB86Pt9V2U
-y/saoMCGQSxksBJkCsCUQ4sDEmUlgfw7ez7IUmm2YAutGRTYngFmMGAKJZWpD229c8mycwHw/OoX
-bhl2YSFV6BfxQ/UFkzCJpNifTs+9447g8ds736moHtbU1uZoAjOBCNyjD6LEkihzLD37xpmBfEP9
-YXVBVfOJ9qLrUc8vh7mCwFLGpNRGFM17pkybeS4Aju3fW5Z1fM/v/WkOLEMgIciSlhZrWj5afsed
-4YqtXD1m9rhkOufp0O6BPgwyiSISypCNf6hdfs/yQP5369dWXjunvbPT0X5g/BAxg8GWVKYg17Un
-Vg4+l1Jib80HnxsYSzYn2dchKznMqKwhLRKWLNViB/wbrr029MhXXy4dMzDvaVDQ8gjyLzPDEmxJ
-ibiRe7fj8zOnhoBXrS6rrM4WbGKfg6TLvQ4m40qaUmabahYuvONcAKxct/6OS0dnOnIM3eu4we9L
-QRSTIJG2nUHV1/TyqlO3dTlZm4m4l3QMQAnEJBSR62NsYnTvFAcaWrptyns+MQWO0lM9QEgZl8I3
-LBx869bbF54LgA2/W39NosQtuDg59oBBppBRKbXYkey4a/Gi4KtXX361asolrcm0pymgTaASg0zi
-qJSCVNuHrYsW3BXIv/v2rsSoq9o7Ojzfo764DwY0UYlSESldaSFzZMLEK88FgNt0RHYXtK855AN6
-O2EiJshUUZ/WdbQsu21B8HDVs6sunlqZydoaYHCwWgGrYxKmMIQlmzbXzr/rtkB+zarnR1w1I5nN
-aK17qR+AFlKWKmUI5DOpqdWXnUs5/cYf37plWHmuPRsVlBAyLkRMiETwaRnRhBJCWg4fiEY+Mzqk
-xJadb6oRsYIfELl3BdgSiEthkOKY4kOFiVd/NpB/+ZWNsaFjC45H3JO5CAC0oJhSCSVYyu7a3YuW
-LDmXcvr5tWvnjhyxYe9HNemkw5pYh2UtifKoMTEy9PoBQ7tymTFTQ3dMJVPFsnxnPutBoMf8Aemi
-kiPKEFLmcvb1F1/V4xq6ocOzCm5Be6InbYVjhChV0pIyoywc+uPc+d8/awDFov3Mz578jTQTn502
-qKo6UjZUWFESgj3Hy6dz7UdXH9xV3LfjUuDhRx8OHWb1hqoZVal00Q+IgzAjmcRRSSZZJGXTrsZv
-Lb4vkN+86dUBl03uTHXB173aE6CBiKHKDIOUyJOKi+TwipF/Vkn6S83dXD6fiMdHz31g5JSl8Dw7
-08naAxjMYA1mEkJZMRDtXfm9S6P5P+2rATBzyszEV+N1uXze6w0krEFlSl9oWSVWqRPBy9/acHTj
-wRGjKgB8celd+6LT6rN+0bEFM3PAH/akHGrFRiZMUqK2MzXdeX3V7zaenQ888eNHy6+cN/y6+fnm
-uprV34d2wRpaB9qDNfuum0s56Y6r7374vcbk07/8BYD3Dr7rlUpX9265WAMmcUySJS0pTFvqeKsR
-aA9g85vbRNlw2/eJNfcM8kERqcpNaSrpSaOz5s3FS+8+6z3xwf0fDL7sWqHMd566r/rDt/b89ptG
-rAwIte9dCgIVu1svnfXlP+3efuzocVmpUrmAP8wIDWoJigkVMaIkqKslNeuaaT0O05n0S5O5gtZ+
-4LphzSdEQqmEUkopW1o4smvmnLlnDUBKyZ7rO4XBY2/cZhcvHDdZO/lg7xjqxhqMABIJGY1EXnxh
-/egZlZmsxxxqQ4Agikm2lGlJSytqeqtu0dLFwRSvbFg/aNzNqWx3EBvC2hBsSFWmVNSSQiFre5cM
-kdFY4qwBaK0Z7OW7L7vt65d/c0PFpAW+XQi1x0nag5lZl5WVr3tx3YDLhxR9aA6EoMERwTEpo0bM
-koZvom378dnzw03PqhdWlldeW3DtngQDJmgh4kqWGDJiKk2i63jdbfPnnEtbpay0jLUPZjfXzV7R
-K2aZNWt9iu3BTMwAp5LJA+2HsqxtWwtARhUBEhQVsKQZM6JCiDw7Fc7gaDwWTLHtnQ+cSLnWPvdF
-T1ZClSoVM5VpSIdUas/m2xcuOaO2Sk1Nzdf+/t6DtXVmrFQIOnGizS7mGz42YMiEKVVzv+bbuZBI
-YA2ORiIrnvqf6TcOzj/8x1GCtuzrjn2uYsS9V5i+H5ciqiJxZbmCWmpb5k8PdzC1tQft+CXJXIY1
-iyC5EHwSJUqVGiphmSREjk20vD/5pptPD+BXTz/9pXvv/cySf6+aPZm1ZvZHChFSBRx2NcDE7DsF
-v5jtqRiZWQPwPX3dFZFNb81ARx5gKMyZvfX3P9xV/b3rLS1iZtyURkF69Zs/XPFP3w1mfGnd6kET
-piaLOWIdlNDMEEqWKBkzRNRSnqDuZLp67LDTN7aampq+dO+9N/zgD9rOe9mugBuaAw6jf8wJmdNf
-+zCNsOMxuvJoKwQO9OrrN1aN3pTd1Vxx02UJIyKlsg2n+522G6aGu/g1a9Za1d9wkp2KwUG1LRBR
-qkzJuGVELCOt/Za6PV9dsuj0rcVv/suDFTO+op2i9v1eZv9F7XuYw6eEo/B5zz6/Ibf211cf+M3B
-eCweVxaTSOUzlw8a09clqGvNkSHCkABmsJBlUsZNFbdMpahIqrDv9dnz7zw9gA0vbbjohju0556x
-9rpPe2gCfDvbbxOlAUDzlVeXIVOQOUTMqCZq+FNDbwm9a8c2Gj4xm8+QDjbNYIKlZJmhYqYRjxok
-KOlC5JrGjZ9wGgAtLc0FjgrDOhvtuZ8kSyt6ombrlZcPRsYJtQ9GuXrSuLilDVOavsmHN+1fsOj2
-YNa1q54bOH6q6xZ0GHvAgkqUETNkPGLEIgYDrSdaZkyacPrutPZ8Y1AFa6+XG6dqDyJBwR8JAgkK
-bkFCGlbJwFTD3uShbQ/dX4Wc16c9GHnvopGRqBElIfLK13X5cVeMD1PYK5t40MXwtQQxwASljDJD
-xkwjZhkRQ7pStBzYtainy/TXnJjZNxPl7Doftz0RjFh5smFftrPN8wBoZoTAwAC5ue5k7Xa3q3HF
-I+Mrh0eRdfqcgRmA7+uoEQFES1vHTVXXBVPadrGuw4t5HjRrQAA+oVzKhFIJU5XEDMOQWQf+/jfn
-3PajM2yvU0/e7K892anWXf+5DMDC2UMuqjC0DptxfUkfGDG19J6F0weWK6SdPvP3YWBLRlzwgS3v
-f3f5P4SbpNc2iYsmecUMoAXAzMowS5WKGTIWNUsiJgRO5L2BZnbIkAtPD4BIePk0CTqZOSyUseeX
-X//Klyp//t+TkHNR9E/SrJdvRQ9FHxkXwKnfai0lGUIlDa9x88E5D4UpbNVzz5SMuznvBV15aCFK
-pCoxVNwy4lEjHjXSvnO0vnberClndELDRHbXcRLqZO3VRzteGl8V/fkvrufGDNqLSNtIO0i7SDt9
-d7eDot87qp/5Ac2w6FiLDRLdnE+0G0OGh+bc9OYOL34BtA6KHwhZZqi4KeMRozRqGqYosjqxd8ui
-xcvOCMCIESNML6M9t58eWgiVPFr74P3j0Zgh9Ivx0OjpsfXdH9c+sIWi7e/ntYmmxmO33jArmK/1
-REuHV+65xWC/rIGYocoMGbeMeMRMRA1H+20OULfzC3PnnxEAInHFhLGpphrofrU+2Pf14MFmn2Yf
-Z8ifv9Fbse7a2RkfOswtkXtffXfx8jCebNywHpfepO2cAFiApIxLaUlpKAFJecdNFp2G1nRVRYSE
-PNNDvge/8a/7n/1BZOAwaL/fTgXs65O17/EBffJ9kvl7BEZF5iyvue7LV9YWjrZtbZw55wth13r1
-mnhlNQUlFAhCFD3d4brHs8X6ZHZ/W/pwR/7wgb0L5s89i0O+xYuXPPnET9579ntXL/22k+8Ga2nG
-QLKvLui1q2ZEBaLiJNrowBl7/pXKTTnjJmy1J4386DNoam6opBFmJOxav/72B9bicu13EBS0hq/T
-vp1yiozgvIQhLbz32p3ffvTsTim37dw9a+aM3//bzPIxkwGQUIVjh4jGnVTnMMMUK37V+LOVRw2j
-X8cELIksk23HkQLJlNfQwhhfMmjSoM63P8onc/84O2Tz3vfe9Ytm/tBOuEX4fr8WSk94JsBI4MTu
-a6+/8ayPWTe99vrjjz/uOkUAplKvbCq1i0f7ypsAgOPPm3bB2PEJ0bcsIOLDx7I/fX7o/Q/eY9s2
-M5uGYkdr2yNQYUhh2Vf+LtymmpGfPPrPEcXoPbv4WL+e2R/49VVnfnb6F9sqTzz5qwvEY0unXXQq
-v7mHLQIYYiDlIOfvru9asXHac8/89FN0Ul9/5IiU8uTg2C9/Ee8+mKFhr3/niXqUSCb4vv50vWpw
-vLlZKdETW3HqIgxQDzyy//4HHnzk50cRJSX693w/HQBmzfz8j588gJFRaP4zRUS7/cp/XbX1tRXr
-HhuDvH+4PqfUJwOA/sp7owMGVtx9O6947Cp0Osh5YcTsq7oZgw0YaHg/NXrW3g8/PDBmzNhP19sq
-ba31+xuuoPKNDz2yb1ttZ7LgwPQRY0R0wXcPteeeefZw9c1bRs+q3bZt2yei/WlWILgOHz7y3Mr1
-//fmzsamI6apiAiA5+mSkrLq6qu/uGzBlCmTP8HXbej8q8fnAZwH8Ld9/T+f4wZfL+hhXAAAAABJ
-RU5ErkJggg==
diff --git a/Golden_Repo/j/JupyterKernel-R/JupyterKernel-R-4.1.2-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb b/Golden_Repo/j/JupyterKernel-R/JupyterKernel-R-4.1.2-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb
deleted file mode 100644
index 4384d59ec..000000000
--- a/Golden_Repo/j/JupyterKernel-R/JupyterKernel-R-4.1.2-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb
+++ /dev/null
@@ -1,112 +0,0 @@
-easyblock = 'Bundle'
-
-name = 'JupyterKernel-R'
-version = '4.1.2'
-local_jupyterver = '2022.3.3'
-versionsuffix = '-' + local_jupyterver
-
-homepage = 'https://github.com/IRkernel/IRkernel'
-description = """
-Native R kernel for Jupyter.
-Project Jupyter exists to develop open-source software, open-standards, and services
-for interactive computing across dozens of programming languages.
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('R', version),
-    ('IRkernel', '1.3', '-R-%(version)s'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('Jupyter', local_jupyterver),
-]
-
-local_kernel_dir = 'ir40'
-local_kernel_name = 'R-%s' % version
-
-modextrapaths = {
-    'JUPYTER_PATH': ['share/jupyter'],  # add search path for kernelspecs
-}
-
-# Ensure that the user-specific $HOME/.local/share/jupyter is first entry in JUPYTHER_PATH
-modluafooter = """
-prepend_path("JUPYTER_PATH", pathJoin(os.getenv("HOME"), ".local/share/jupyter"))
-"""
-
-postinstallcmds = [
-    # create kernel skeleton
-    (
-        'module purge && '
-        'module use $OTHERSTAGES && '
-        'module load Stages/${STAGE} && '
-        'module load GCCcore/.11.2.0 && '
-        'module load Jupyter/%s && '
-        'module load R/%s && '
-        'module load IRkernel/1.3-R-%s && '
-        'R -e \'IRkernel::installspec(name="%s", displayname="%s", prefix="%%(installdir)s")\' && '
-        # force options(bitmapType='cairo') -> https://github.com/IRkernel/IRkernel/issues/388
-        'sed -i "s#IRkernel::main()#options(bitmapType=\'cairo\') ; IRkernel::main()#g" '
-        '       %%(installdir)s/share/jupyter/kernels/%s/kernel.json'
-    ) % (local_jupyterver, version, version,
-         local_kernel_dir, local_kernel_name, local_kernel_dir),
-
-    # write kernel.sh
-    (
-        '{ cat > %%(installdir)s/share/jupyter/kernels/%s/kernel.sh; } << EOF \n'
-        '#!/bin/bash \n'
-        '\n'
-        '# Load required modules \n'
-        'module purge \n'
-        'module use \$OTHERSTAGES \n'
-        'module load Stages/\${STAGE} \n'
-        'module load GCCcore/.11.2.0 \n'
-        'module load R/%s \n'
-        'module load IRkernel/1.3-R-%s \n'
-        '\n'
-        'exec \${EBROOTR}/lib64/R/bin/R "\$@"\n'
-        '\n'
-        'EOF'
-    ) % (local_kernel_dir, version, version),
-    'chmod +x %%(installdir)s/share/jupyter/kernels/%s/kernel.sh' % local_kernel_dir,
-
-    # write kernel.json
-    (
-        'cp %%(installdir)s/share/jupyter/kernels/%s/kernel.json '
-        '   %%(installdir)s/share/jupyter/kernels/%s/kernel.json.orig && '
-        '{ cat > %%(installdir)s/share/jupyter/kernels/%s/kernel.json; } << \'EOF\'\n'
-        '{ \n'
-        '  "argv": [ \n'
-        '    "%%(installdir)s/share/jupyter/kernels/%s/kernel.sh", \n'
-        '    "--slave", \n'
-        '    "-e", \n'
-        '    "options(bitmapType=\'cairo\') ; IRkernel::main()", \n'
-        '    "--args", \n'
-        '    "{connection_file}" \n'
-        '  ], \n'
-        '  "display_name": "%s", \n'
-        '  "language": "R", \n'
-        '  "name": "%s" \n'
-        '}\n'
-        'EOF'
-    ) % (local_kernel_dir, local_kernel_dir, local_kernel_dir, local_kernel_dir,
-         local_kernel_name, local_kernel_dir),
-]
-
-# specify that Bundle easyblock should run a full sanity check, rather than just trying to load the module
-# full_sanity_check = True
-sanity_check_paths = {
-    'files': [
-        'share/jupyter/kernels/%s/kernel.sh' % local_kernel_dir,
-        'share/jupyter/kernels/%s/kernel.json' % local_kernel_dir,
-    ],
-    'dirs': [
-        'share/jupyter/kernels/',
-    ],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/JupyterKernel-R/JupyterKernel-R-4.1.2-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb b/Golden_Repo/j/JupyterKernel-R/JupyterKernel-R-4.1.2-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
deleted file mode 100644
index 303bbea73..000000000
--- a/Golden_Repo/j/JupyterKernel-R/JupyterKernel-R-4.1.2-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
+++ /dev/null
@@ -1,112 +0,0 @@
-easyblock = 'Bundle'
-
-name = 'JupyterKernel-R'
-version = '4.1.2'
-local_jupyterver = '2022.3.4'
-versionsuffix = '-' + local_jupyterver
-
-homepage = 'https://github.com/IRkernel/IRkernel'
-description = """
-Native R kernel for Jupyter.
-Project Jupyter exists to develop open-source software, open-standards, and services
-for interactive computing across dozens of programming languages.
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('R', version),
-    ('IRkernel', '1.3', '-R-%(version)s'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('Jupyter', local_jupyterver),
-]
-
-local_kernel_dir = 'ir40'
-local_kernel_name = 'R-%s' % version
-
-modextrapaths = {
-    'JUPYTER_PATH': ['share/jupyter'],  # add search path for kernelspecs
-}
-
-# Ensure that the user-specific $HOME/.local/share/jupyter is first entry in JUPYTHER_PATH
-modluafooter = """
-prepend_path("JUPYTER_PATH", pathJoin(os.getenv("HOME"), ".local/share/jupyter"))
-"""
-
-postinstallcmds = [
-    # create kernel skeleton
-    (
-        'module purge && '
-        'module use $OTHERSTAGES && '
-        'module load Stages/${STAGE} && '
-        'module load GCCcore/.11.2.0 && '
-        'module load Jupyter/%s && '
-        'module load R/%s && '
-        'module load IRkernel/1.3-R-%s && '
-        'R -e \'IRkernel::installspec(name="%s", displayname="%s", prefix="%%(installdir)s")\' && '
-        # force options(bitmapType='cairo') -> https://github.com/IRkernel/IRkernel/issues/388
-        'sed -i "s#IRkernel::main()#options(bitmapType=\'cairo\') ; IRkernel::main()#g" '
-        '       %%(installdir)s/share/jupyter/kernels/%s/kernel.json'
-    ) % (local_jupyterver, version, version,
-         local_kernel_dir, local_kernel_name, local_kernel_dir),
-
-    # write kernel.sh
-    (
-        '{ cat > %%(installdir)s/share/jupyter/kernels/%s/kernel.sh; } << EOF \n'
-        '#!/bin/bash \n'
-        '\n'
-        '# Load required modules \n'
-        'module purge \n'
-        'module use \$OTHERSTAGES \n'
-        'module load Stages/\${STAGE} \n'
-        'module load GCCcore/.11.2.0 \n'
-        'module load R/%s \n'
-        'module load IRkernel/1.3-R-%s \n'
-        '\n'
-        'exec \${EBROOTR}/lib64/R/bin/R "\$@"\n'
-        '\n'
-        'EOF'
-    ) % (local_kernel_dir, version, version),
-    'chmod +x %%(installdir)s/share/jupyter/kernels/%s/kernel.sh' % local_kernel_dir,
-
-    # write kernel.json
-    (
-        'cp %%(installdir)s/share/jupyter/kernels/%s/kernel.json '
-        '   %%(installdir)s/share/jupyter/kernels/%s/kernel.json.orig && '
-        '{ cat > %%(installdir)s/share/jupyter/kernels/%s/kernel.json; } << \'EOF\'\n'
-        '{ \n'
-        '  "argv": [ \n'
-        '    "%%(installdir)s/share/jupyter/kernels/%s/kernel.sh", \n'
-        '    "--slave", \n'
-        '    "-e", \n'
-        '    "options(bitmapType=\'cairo\') ; IRkernel::main()", \n'
-        '    "--args", \n'
-        '    "{connection_file}" \n'
-        '  ], \n'
-        '  "display_name": "%s", \n'
-        '  "language": "R", \n'
-        '  "name": "%s" \n'
-        '}\n'
-        'EOF'
-    ) % (local_kernel_dir, local_kernel_dir, local_kernel_dir, local_kernel_dir,
-         local_kernel_name, local_kernel_dir),
-]
-
-# specify that Bundle easyblock should run a full sanity check, rather than just trying to load the module
-# full_sanity_check = True
-sanity_check_paths = {
-    'files': [
-        'share/jupyter/kernels/%s/kernel.sh' % local_kernel_dir,
-        'share/jupyter/kernels/%s/kernel.json' % local_kernel_dir,
-    ],
-    'dirs': [
-        'share/jupyter/kernels/',
-    ],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/JupyterKernel-Ruby/JupyterKernel-Ruby-3.0.1-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb b/Golden_Repo/j/JupyterKernel-Ruby/JupyterKernel-Ruby-3.0.1-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb
deleted file mode 100644
index f218a98a2..000000000
--- a/Golden_Repo/j/JupyterKernel-Ruby/JupyterKernel-Ruby-3.0.1-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb
+++ /dev/null
@@ -1,59 +0,0 @@
-easyblock = 'Bundle'
-
-name = 'JupyterKernel-Ruby'
-version = '3.0.1'
-local_jupyterver = '2022.3.3'
-versionsuffix = '-' + local_jupyterver
-
-homepage = 'https://github.com/SciRuby/iruby'
-description = """
-Native Ruby kernel for Jupyter.
-Project Jupyter exists to develop open-source software, open-standards, and services
-for interactive computing across dozens of programming languages.
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('Python',  '3.9.6'),
-    ('Jupyter', local_jupyterver),
-    ('Ruby', '%(version)s'),
-]
-
-local_jupyter_path = 'share/jupyter'
-
-modextrapaths = {
-    'JUPYTER_PATH': ['share/jupyter'],  # add search path for kernelspecs
-}
-
-# Ensure that the user-specific $HOME/.local/share/jupyter is always first entry in JUPYTHER_PATH
-modluafooter = """
-prepend_path("JUPYTER_PATH", pathJoin(os.getenv("HOME"), ".local/share/jupyter"))
-"""
-
-postinstallcmds = [
-    'echo "#!/bin/bash" > %(builddir)s/env.sh',
-    'echo "export JUPYTER_DATA_DIR=%%(installdir)s/%s" >> %%(builddir)s/env.sh' % local_jupyter_path,
-
-    # install Ruby kernel in $JUPYTHER_PATH
-    'source %(builddir)s/env.sh && iruby register --force ',
-
-    # ensure correct permissions
-    'source %(builddir)s/env.sh && chmod -R o+x %(installdir)s/share',
-]
-
-sanity_check_paths = {
-    'files': [
-        'share/jupyter/kernels/ruby/kernel.json',
-    ],
-    'dirs': [
-        'share/jupyter/kernels/ruby/',
-    ],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/JupyterKernel-Ruby/JupyterKernel-Ruby-3.0.1-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb b/Golden_Repo/j/JupyterKernel-Ruby/JupyterKernel-Ruby-3.0.1-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
deleted file mode 100644
index 5a0c75455..000000000
--- a/Golden_Repo/j/JupyterKernel-Ruby/JupyterKernel-Ruby-3.0.1-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
+++ /dev/null
@@ -1,59 +0,0 @@
-easyblock = 'Bundle'
-
-name = 'JupyterKernel-Ruby'
-version = '3.0.1'
-local_jupyterver = '2022.3.4'
-versionsuffix = '-' + local_jupyterver
-
-homepage = 'https://github.com/SciRuby/iruby'
-description = """
-Native Ruby kernel for Jupyter.
-Project Jupyter exists to develop open-source software, open-standards, and services
-for interactive computing across dozens of programming languages.
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('Python',  '3.9.6'),
-    ('Jupyter', local_jupyterver),
-    ('Ruby', '%(version)s'),
-]
-
-local_jupyter_path = 'share/jupyter'
-
-modextrapaths = {
-    'JUPYTER_PATH': ['share/jupyter'],  # add search path for kernelspecs
-}
-
-# Ensure that the user-specific $HOME/.local/share/jupyter is always first entry in JUPYTHER_PATH
-modluafooter = """
-prepend_path("JUPYTER_PATH", pathJoin(os.getenv("HOME"), ".local/share/jupyter"))
-"""
-
-postinstallcmds = [
-    'echo "#!/bin/bash" > %(builddir)s/env.sh',
-    'echo "export JUPYTER_DATA_DIR=%%(installdir)s/%s" >> %%(builddir)s/env.sh' % local_jupyter_path,
-
-    # install Ruby kernel in $JUPYTHER_PATH
-    'source %(builddir)s/env.sh && iruby register --force ',
-
-    # ensure correct permissions
-    'source %(builddir)s/env.sh && chmod -R o+x %(installdir)s/share',
-]
-
-sanity_check_paths = {
-    'files': [
-        'share/jupyter/kernels/ruby/kernel.json',
-    ],
-    'dirs': [
-        'share/jupyter/kernels/ruby/',
-    ],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/JupyterProxy-XpraHTML5/JupyterProxy-XpraHTML5-0.3.2-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb b/Golden_Repo/j/JupyterProxy-XpraHTML5/JupyterProxy-XpraHTML5-0.3.2-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb
deleted file mode 100644
index 2dff161b1..000000000
--- a/Golden_Repo/j/JupyterProxy-XpraHTML5/JupyterProxy-XpraHTML5-0.3.2-gcccoremkl-11.2.0-2021.4.0-2022.3.3.eb
+++ /dev/null
@@ -1,83 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'JupyterProxy-XpraHTML5'
-version = '0.3.2'
-local_jupyterver = '2022.3.3'
-versionsuffix = '-' + local_jupyterver
-
-homepage = 'https://xpra.org'
-description = """
-Jupyter proxy for Xpra HTML5 sessions.
-Xpra is an open-source multi-platform persistent remote display server and client
-for forwarding applications and desktop screens.
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('binutils', '2.37'),
-    # check for existance
-    ('xpra', '4.3.3'),
-    ('jsc-xdg-menu', '2022.5', '', ('GCCcore', '11.2.0')),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('Jupyter', local_jupyterver),
-]
-
-exts_defaultclass = 'PythonPackage'
-exts_default_options = {
-    'download_dep_fail': True,
-    'source_urls': [PYPI_SOURCE],
-    'use_pip': True,
-}
-
-exts_list = [
-    ('jupyter-xprahtml5-proxy', '0.3.2', {
-        'checksums': ['94601d0b0511b6b1ce3572c8ef65d23fc0516b0628225185e764e9f0897d2b36'],
-        'source_urls': ['https://github.com/FZJ-JSC/jupyter-xprahtml5-proxy/archive/'],
-        'source_tmpl': 'v0.3.2.tar.gz',
-        'patches': ['jupyter_xprahtml5_fixfont.patch'],
-        'checksums': [
-            '94601d0b0511b6b1ce3572c8ef65d23fc0516b0628225185e764e9f0897d2b36',
-            '78880abe6a11f99645c1137255124b27177a037586532ed7d844ddd6fd91df7b',
-        ],
-        'modulename': 'jupyter_xprahtml5_proxy',
-    }),
-]
-
-postinstallcmds = [
-    # write xpra
-    (
-        '{ cat > %(installdir)s/lib/python%(pyshortver)s/'
-        'site-packages/jupyter_xprahtml5_proxy/bin/xpra; } << EOF \n'
-        '#!/bin/bash \n'
-        '\n'
-        '# Load required modules \n'
-        'module purge \n'
-        'module load Stages/${STAGE} \n'
-        'module load GCCcore/.11.2.0 \n'
-        'module load xpra/4.3.3 \n'
-        'module load jsc-xdg-menu/.2022.5 \n'
-        '\n'
-        'if ! command -v xterm &> /dev/null \n'
-        'then \n'
-        '    echo "xterm not found - trying to load the xterm-module" \n'
-        '    module load xterm \n'
-        'fi \n'
-        '\n'
-        'xpra "\$@" \n'
-        '\n'
-        'EOF'
-    ),
-    'chmod +x %(installdir)s/lib/python%(pyshortver)s/site-packages/jupyter_xprahtml5_proxy/bin/xpra'
-]
-
-sanity_check_paths = {
-    'files': [],
-    'dirs': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/JupyterProxy-XpraHTML5/JupyterProxy-XpraHTML5-0.3.4-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb b/Golden_Repo/j/JupyterProxy-XpraHTML5/JupyterProxy-XpraHTML5-0.3.4-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
deleted file mode 100644
index 5dbf85873..000000000
--- a/Golden_Repo/j/JupyterProxy-XpraHTML5/JupyterProxy-XpraHTML5-0.3.4-gcccoremkl-11.2.0-2021.4.0-2022.3.4.eb
+++ /dev/null
@@ -1,79 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'JupyterProxy-XpraHTML5'
-version = '0.3.4'
-local_jupyterver = '2022.3.4'
-versionsuffix = '-' + local_jupyterver
-
-homepage = 'https://xpra.org'
-description = """
-Jupyter proxy for Xpra HTML5 sessions.
-Xpra is an open-source multi-platform persistent remote display server and client
-for forwarding applications and desktop screens.
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('binutils', '2.37'),
-    # check for existance
-    ('xpra', '4.3.4'),
-    ('jsc-xdg-menu', '2022.5', '', ('GCCcore', '11.2.0')),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('Jupyter', local_jupyterver),
-]
-
-exts_defaultclass = 'PythonPackage'
-exts_default_options = {
-    'download_dep_fail': True,
-    'source_urls': [PYPI_SOURCE],
-    'use_pip': True,
-}
-
-exts_list = [
-    ('jupyter-xprahtml5-proxy', version, {
-        'patches': ['jupyter_xprahtml5_fixfont.patch'],
-        'checksums': [
-            '9201dbe43f78b2951e7a2bad8fb4bcbd7872450587a44a2fede8f8dfe3b2d028',
-            '78880abe6a11f99645c1137255124b27177a037586532ed7d844ddd6fd91df7b',
-        ],
-    }),
-]
-
-postinstallcmds = [
-    # write xpra
-    (
-        '{ cat > %(installdir)s/lib/python%(pyshortver)s/'
-        'site-packages/jupyter_xprahtml5_proxy/bin/xpra; } << EOF \n'
-        '#!/bin/bash \n'
-        '\n'
-        '# Load required modules \n'
-        'module purge \n'
-        'module load Stages/${STAGE} \n'
-        'module load GCCcore/.11.2.0 \n'
-        'module load xpra/4.3.4 \n'
-        'module load jsc-xdg-menu/.2022.5 \n'
-        '\n'
-        'if ! command -v xterm &> /dev/null \n'
-        'then \n'
-        '    echo "xterm not found - trying to load the xterm-module" \n'
-        '    module load xterm \n'
-        'fi \n'
-        '\n'
-        'xpra "\$@" \n'
-        '\n'
-        'EOF'
-    ),
-    'chmod +x %(installdir)s/lib/python%(pyshortver)s/site-packages/jupyter_xprahtml5_proxy/bin/xpra'
-]
-
-sanity_check_paths = {
-    'files': [],
-    'dirs': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/JupyterProxy-XpraHTML5/jupyter_xprahtml5_fixfont.patch b/Golden_Repo/j/JupyterProxy-XpraHTML5/jupyter_xprahtml5_fixfont.patch
deleted file mode 100644
index 3f9209ace..000000000
--- a/Golden_Repo/j/JupyterProxy-XpraHTML5/jupyter_xprahtml5_fixfont.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/python3.9/site-packages/jupyter_xprahtml5_proxy/__init__.py.orig    2022-03-20 14:05:36.153477000 +0100
-+++ lib/python3.9/site-packages/jupyter_xprahtml5_proxy/__init__.py 2022-03-20 13:59:41.650109000 +0100
-@@ -109,7 +109,7 @@
-         # '--socket-dir="' + socket_path + '/"',  # fixme: socket_dir not recognized
-         # '--server-idle-timeout=86400',  # stop server after 24h with no client connection
-         # '--exit-with-client=yes',  # stop Xpra when the browser disconnects
--        '--start=xterm -fa Monospace',
-+        '--start=xterm -fa "DejaVu Sans Mono" -fs 14', # -fa Monospace',
-         # '--start-child=xterm', '--exit-with-children',
-         '--tcp-auth=file:filename=' + fpath_passwd,
-         '--tcp-encryption=AES',
diff --git a/Golden_Repo/j/JupyterProxy-XpraHTML5/jupyter_xprahtml5_proxy-launch_xpra.patch b/Golden_Repo/j/JupyterProxy-XpraHTML5/jupyter_xprahtml5_proxy-launch_xpra.patch
deleted file mode 100644
index 100eb76f2..000000000
--- a/Golden_Repo/j/JupyterProxy-XpraHTML5/jupyter_xprahtml5_proxy-launch_xpra.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur jupyter-xprahtml5-proxy.orig/jupyter_xprahtml5_proxy/share/launch_xpra.sh jupyter-xprahtml5-proxy/jupyter_xprahtml5_proxy/share/launch_xpra.sh
---- jupyter-xprahtml5-proxy.orig/jupyter_xprahtml5_proxy/share/launch_xpra.sh   2020-11-19 00:13:39.000000000 +0100
-+++ jupyter-xprahtml5-proxy/jupyter_xprahtml5_proxy/share/launch_xpra.sh        2020-11-20 18:49:09.557792000 +0100
-@@ -5,10 +5,17 @@
- # Do it here.
-
- # example
--# module purge > /dev/null
--# module use $OTHERSTAGES > /dev/null
--# module load Stages/2020 > /dev/null
--# module load GCCcore/.9.3.0 > /dev/null
--# module load xpra/4.0.4-Python-3.8.5 > /dev/null
-+module purge
-+module use $OTHERSTAGES
-+module load Stages/2020
-+module load GCCcore/.9.3.0
-+module load xpra/4.0.4-Python-3.8.5
-+module load jsc-xdg-menu/.2020.4
-+
-+if ! command -v xterm &> /dev/null
-+then
-+    echo "xterm not found - trying to load the xterm-module"
-+    module load xterm
-+fi
-
- xpra "$@"
-
diff --git a/Golden_Repo/j/jax/TensorFlow-2.7.0_cuda-noncanonical-include-paths.patch b/Golden_Repo/j/jax/TensorFlow-2.7.0_cuda-noncanonical-include-paths.patch
deleted file mode 100644
index 93157c49a..000000000
--- a/Golden_Repo/j/jax/TensorFlow-2.7.0_cuda-noncanonical-include-paths.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Use non-canonical paths to populate the include paths in the toolchain in Bazel.
-Otherwise, build will fail due to mismatch in include paths.
-author: Alex Domingo (Vrije Universiteit Brussel)
---- third_party/gpus/cuda_configure.bzl.orig	2021-10-25 11:48:32.896463000 +0200
-+++ third_party/gpus/cuda_configure.bzl	2021-10-25 11:51:56.719009257 +0200
-@@ -274,8 +274,12 @@
-     sysroot = []
-     if tf_sysroot:
-         sysroot += ["--sysroot", tf_sysroot]
--    result = raw_exec(repository_ctx, [cc, "-E", "-x" + lang, "-", "-v"] +
--                                      sysroot)
-+
-+    result = raw_exec(
-+        repository_ctx,
-+        [cc, "-no-canonical-prefixes", "-E", "-x" + lang, "-", "-v"] + sysroot
-+    )
-+
-     stderr = err_out(result)
-     index1 = stderr.find(_INC_DIR_MARKER_BEGIN)
-     if index1 == -1:
diff --git a/Golden_Repo/j/jax/jax-0.2.19_fix-update-of-cache-access-time.patch b/Golden_Repo/j/jax/jax-0.2.19_fix-update-of-cache-access-time.patch
deleted file mode 100644
index adf64ed50..000000000
--- a/Golden_Repo/j/jax/jax-0.2.19_fix-update-of-cache-access-time.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Recent kernels do not update the access time on read.
-So do that manually.
-See https://github.com/google/jax/issues/7944
-
-Author: Alexander Grund (TU Dresden)
-
-diff --git a/jax/experimental/compilation_cache/file_system_cache.py b/jax/experimental/compilation_cache/file_system_cache.py
-index b85969de..4c22d8e3 100644
---- a/jax/experimental/compilation_cache/file_system_cache.py
-+++ b/jax/experimental/compilation_cache/file_system_cache.py
-@@ -33,6 +33,7 @@ class FileSystemCache(CacheInterface):
-     path_to_key = os.path.join(self._path, key)
-     if os.path.exists(path_to_key):
-       with open(path_to_key, "rb") as file:
-+        os.utime(file.fileno())
-         return file.read()
-     else:
-       return None
diff --git a/Golden_Repo/j/jax/jax-0.3.9-gcccoremkl-11.2.0-2021.4.0-CUDA-11.5.eb b/Golden_Repo/j/jax/jax-0.3.9-gcccoremkl-11.2.0-2021.4.0-CUDA-11.5.eb
deleted file mode 100644
index 87d585f45..000000000
--- a/Golden_Repo/j/jax/jax-0.3.9-gcccoremkl-11.2.0-2021.4.0-CUDA-11.5.eb
+++ /dev/null
@@ -1,118 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'jax'
-version = '0.3.9'
-versionsuffix = '-CUDA-%(cudaver)s'
-
-homepage = 'https://pypi.python.org/pypi/jax'
-description = """Composable transformations of Python+NumPy programs:
-differentiate, vectorize, JIT to GPU/TPU, and more"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-builddependencies = [
-    ('Bazel', '3.7.2'),
-    ('pytest-xdist', '2.5.0'),
-    # git 2.x required to fetch repository 'io_bazel_rules_docker'
-    ('git', '2.33.1', '-nodocs'),
-]
-
-dependencies = [
-    ('CUDA', '11.5', '', True),
-    ('cuDNN', '8.3.1.22', versionsuffix, True),
-    ('NCCL', '2.11.4', versionsuffix),
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10'),
-    ('flatbuffers-python', '2.0'),
-    ('typing-extensions', '3.10.0.0'),
-]
-
-# downloading TensorFlow tarball to avoid that Bazel downloads it during the build
-# note: this *must* be the exact same commit as used in jaxlib-*/WORKSPACE
-local_tf_commit = 'e011187e26dbeed80dede66eb48729d184e3bb1d'
-local_tf_dir = 'tensorflow-%s' % local_tf_commit
-local_tf_builddir = '%(builddir)s/' + local_tf_dir
-
-# replace remote TensorFlow repository with the local one from EB
-local_jax_prebuildopts = "sed -i -f jaxlib_local-tensorflow-repo.sed WORKSPACE && "
-local_jax_prebuildopts += "sed -i 's|EB_TF_REPOPATH|%s|' WORKSPACE && " % local_tf_builddir
-
-use_pip = True
-
-default_easyblock = 'PythonPackage'
-default_component_specs = {
-    'sources': [SOURCE_TAR_GZ],
-    'source_urls': [PYPI_SOURCE],
-    'start_dir': '%(name)s-%(version)s',
-    'use_pip': True,
-    'sanity_pip_check': True,
-    'download_dep_fail': True,
-}
-
-components = [
-    ('absl-py', '0.15.0', {
-        'options': {'modulename': 'absl'},
-        'checksums': ['72d782fbeafba66ba3e525d46bccac949b9a174dbf66233e50ece09ee688dc81'],
-    }),
-    ('jaxlib', '0.3.7', {
-        'sources': [
-            '%(name)s-v%(version)s.tar.gz',
-            {
-                'download_filename': '%s.tar.gz' % local_tf_commit,
-                'filename': 'tensorflow-%s.tar.gz' % local_tf_commit,
-            }
-        ],
-        'source_urls': [
-            'https://github.com/google/jax/archive/',
-            'https://github.com/tensorflow/tensorflow/archive/'
-        ],
-        'patches': [
-            ('jaxlib_local-tensorflow-repo.sed', '.'),
-            'jaxlib-0.1.70_add-bazel-args-to-shutdown.patch',
-            ('TensorFlow-2.7.0_cuda-noncanonical-include-paths.patch',
-             '../' + local_tf_dir),
-        ],
-        'checksums': [
-            # jaxlib-v0.3.7.tar.gz
-            '60a1ec2f32e28eda90998440c3a3f71dd55abd3e5b033849255ab157c4765632',
-            # tensorflow-e011187e26dbeed80dede66eb48729d184e3bb1d.tar.gz
-            'ef5a001226c37f59eca9c9bf0506b962cf220906bcc8f24df4d1ed6011a593e9',
-            # jaxlib_local-tensorflow-repo.sed
-            'abb5c3b97f4e317bce9f22ed3eeea3b9715365818d8b50720d937e2d41d5c4e5',
-            # jaxlib-0.1.70_add-bazel-args-to-shutdown.patch
-            'c0ea6abd7827d3c37bdd60c30c7b0613fc86b91274c6a1a4cf13a3c7f9ce7631',
-            # TensorFlow-2.7.0_cuda-noncanonical-include-paths.patch
-            '0a759010c253d49755955cd5f028e75de4a4c447dcc8f5a0d9f47cce6881a9db',
-        ],
-        'start_dir': 'jax-jaxlib-v%(version)s',
-        'prebuildopts': local_jax_prebuildopts,
-    }),
-]
-
-exts_list = [
-    ('opt_einsum', '3.3.0', {
-        'checksums': ['59f6475f77bbc37dcf7cd748519c0ec60722e91e63ca114e68821c0c54a46549'],
-    }),
-    (name, version, {
-        'source_tmpl': '%(name)s-v%(version)s.tar.gz',
-        'source_urls': ['https://github.com/google/jax/archive/'],
-        'patches': ['jax-0.2.19_fix-update-of-cache-access-time.patch'],
-        'checksums': [
-            '45c526496d525fd04c0c9c705971f4cfa31e6a9f7d25e55a4e3bdcb3a4bbe6ce',  # jax-v0.3.9.tar.gz
-            # jax-0.2.19_fix-update-of-cache-access-time.patch
-            'e20562f67d63cc7e3478f7a92940291b2c8e328d605426bbabf89d8c2e1dd806',
-        ],
-        # deliberately not testing in parallel, as that results in (additional) failing tests;
-        # use XLA_PYTHON_CLIENT_ALLOCATOR=platform to allocate and deallocate GPU memory during testing,
-        # see https://github.com/google/jax/issues/7323 and
-        # https://github.com/google/jax/blob/main/docs/gpu_memory_allocation.rst;
-        # use CUDA_VISIBLE_DEVICES=0 to avoid failing tests on systems with multiple GPUs;
-        # use NVIDIA_TF32_OVERRIDE=0 to avoid lossing numerical precision by disabling TF32 Tensor Cores;
-        'runtest': "NVIDIA_TF32_OVERRIDE=0 CUDA_VISIBLE_DEVICES=0 XLA_PYTHON_CLIENT_ALLOCATOR=platform "
-                   "JAX_ENABLE_X64=true pytest -vv tests",
-    }),
-]
-
-sanity_pip_check = True
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/j/jax/jaxlib-0.1.70_add-bazel-args-to-shutdown.patch b/Golden_Repo/j/jax/jaxlib-0.1.70_add-bazel-args-to-shutdown.patch
deleted file mode 100644
index 674500ea8..000000000
--- a/Golden_Repo/j/jax/jaxlib-0.1.70_add-bazel-args-to-shutdown.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Pass bazel_startup_options also to the shutdown call to avoid it still using $HOME.
-See https://github.com/google/jax/issues/7639
-
-Author: Alexander Grund (TU Dresden)
-
-diff --git a/build/build.py b/build/build.py
-index dc275042..44a68a71 100755
---- a/build/build.py
-+++ b/build/build.py
-@@ -597,7 +597,7 @@ def main():
-     f"--cpu={wheel_cpu}"])
-   print(" ".join(command))
-   shell(command)
--  shell([bazel_path, "shutdown"])
-+  shell([bazel_path] + args.bazel_startup_options + ["shutdown"])
- 
- 
- if __name__ == "__main__":
diff --git a/Golden_Repo/j/jax/jaxlib_local-tensorflow-repo.sed b/Golden_Repo/j/jax/jaxlib_local-tensorflow-repo.sed
deleted file mode 100644
index 1116ca24c..000000000
--- a/Golden_Repo/j/jax/jaxlib_local-tensorflow-repo.sed
+++ /dev/null
@@ -1,12 +0,0 @@
-/^http_archive(/{
-    :a;N;/\n)/!ba;
-    /org_tensorflow/{
-        s/^/# /;
-        s/\n/\n# /g;
-        s|$|\
-local_repository(\
-    name = "org_tensorflow",\
-    path = "EB_TF_REPOPATH",\
-)|;
-    }
-}
diff --git a/Golden_Repo/j/jemalloc/jemalloc-5.2.1-GCCcore-11.2.0.eb b/Golden_Repo/j/jemalloc/jemalloc-5.2.1-GCCcore-11.2.0.eb
deleted file mode 100644
index 8d8d04374..000000000
--- a/Golden_Repo/j/jemalloc/jemalloc-5.2.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,37 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'jemalloc'
-version = '5.2.1'
-
-homepage = 'http://jemalloc.net'
-description = """jemalloc is a general purpose malloc(3) implementation that emphasizes fragmentation avoidance and
- scalable concurrency support."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://github.com/jemalloc/jemalloc/archive']
-sources = ['%(version)s.tar.gz']
-checksums = ['ed51b0b37098af4ca6ed31c22324635263f8ad6471889e0592a9c0dba9136aea']
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('binutils', '2.37'),
-]
-
-# From version 5.2.1 (or maybe earlier) it does no longer build,
-# nor try to install, documentation if xsltproc is missing.
-# So we can use normal installation.
-preconfigopts = "./autogen.sh && "
-configopts = "--with-version=%(version)s-0-g0000 "  # build with version info
-
-sanity_check_paths = {
-    'files': ['bin/jeprof', 'lib/libjemalloc.a', 'lib/libjemalloc_pic.a', 'lib/libjemalloc.%s' % SHLIB_EXT,
-              'include/jemalloc/jemalloc.h'],
-    'dirs': [],
-}
-
-# jemalloc can be used via $LD_PRELOAD, but we don't enable this by
-# default, you need to opt-in to it
-# modextrapaths = {'LD_PRELOAD': ['lib/libjemalloc.%s' % SHLIB_EXT]}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/j/jsc-xdg-menu/jsc-xdg-menu-2022.5-GCCcore-11.2.0.eb b/Golden_Repo/j/jsc-xdg-menu/jsc-xdg-menu-2022.5-GCCcore-11.2.0.eb
deleted file mode 100644
index 12f03025e..000000000
--- a/Golden_Repo/j/jsc-xdg-menu/jsc-xdg-menu-2022.5-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,40 +0,0 @@
-easyblock = 'Binary'
-
-name = 'jsc-xdg-menu'
-version = '2022.5'
-
-homepage = ''
-description = """setup JSC`s desktop menu"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://gitlab.version.fz-juelich.de/goebbert1/jsc-xdg-menu/-/archive/%(version)s/']
-sources = ['%(name)s-%(version)s.tar.gz']
-checksums = ['841ca882ee551f79a393e469dc803bca69d1b13397d078e994710572c32a6fdc']
-
-builddependencies = [
-    # just ensure they exist
-    ('Blender', '3.1.2', '-binary'),
-    ('CubeGUI', '4.6'),
-    ('GPicView', '0.2.5'),
-    ('HDFView', '3.1.3'),
-    ('Nsight-Compute', '2022.1.0'),
-    ('Nsight-Systems', '2022.1.1'),
-    # ('ParaView', '5.10.1', '', ('gpsmkl', '2021')),
-    ('TotalView', '2021.4.10'),
-    ('Vampir', '10.0.0', '', SYSTEM),
-]
-
-extract_sources = True,
-install_cmd = 'cp -a %(builddir)s/%(name)s-%(version)s/* %(installdir)s/'
-
-modextravars = {'XDG_MENU_PREFIX': 'jsc-'}
-modextrapaths = {'XDG_CONFIG_DIRS': 'config',
-                 'XDG_DATA_DIRS': 'data'}
-
-sanity_check_paths = {
-    'files': ['README.md', 'config/menus/jsc-applications.menu'],
-    'dirs': ['bin', 'config/menus', 'data/applications', 'data/desktop-directories'],
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/k/kim-api/kim-api-2.2.1-GCCcore-11.2.0.eb b/Golden_Repo/k/kim-api/kim-api-2.2.1-GCCcore-11.2.0.eb
deleted file mode 100644
index de05c01f4..000000000
--- a/Golden_Repo/k/kim-api/kim-api-2.2.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,47 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'kim-api'
-version = '2.2.1'
-
-homepage = 'https://openkim.org/'
-description = """Open Knowledgebase of Interatomic Models.
-
-KIM is an API and OpenKIM is a collection of interatomic models (potentials) for
-atomistic simulations.  This is a library that can be used by simulation programs
-to get access to the models in the OpenKIM database.
-
-This EasyBuild only installs the API, the models can be installed with the
-package openkim-models, or the user can install them manually by running
-    kim-api-collections-management install user MODELNAME
-or
-    kim-api-collections-management install user OpenKIM
-to install them all.
- """
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://s3.openkim.org/kim-api/']
-sources = ['%(name)s-%(version)s.txz']
-checksums = ['1d5a12928f7e885ebe74759222091e48a7e46f77e98d9147e26638c955efbc8e']
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [
-    # Also needed to install models, thus not just a builddependency.
-    ('CMake', '3.21.1'),
-]
-
-parallel = 1
-separate_build_dir = True
-build_type = 'Release'
-
-modextravars = {
-    'KIM_API_CMAKE_PREFIX_DIR': '%(installdir)s/lib64'
-}
-
-sanity_check_paths = {
-    'files': ['bin/kim-api-collections-management', 'lib64/libkim-api.%s' % SHLIB_EXT],
-    'dirs': []
-}
-
-moduleclass = 'chem'
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
deleted file mode 100644
index 402c7be40..000000000
--- a/Golden_Repo/l/LAME/LAME-3.100-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,38 +0,0 @@
-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/LAMMPS/LAMMPS-7Jan2022-gpsmkl-2021b.eb b/Golden_Repo/l/LAMMPS/LAMMPS-7Jan2022-gpsmkl-2021b.eb
deleted file mode 100644
index 67ca2d090..000000000
--- a/Golden_Repo/l/LAMMPS/LAMMPS-7Jan2022-gpsmkl-2021b.eb
+++ /dev/null
@@ -1,166 +0,0 @@
-# Installation command used: 
-# eb --include-easyblocks=$PWD/Custom_EasyBlocks/lammps.py,"$EASYBUILD_INCLUDE_EASYBLOCKS"\\
-# --mpi-cmd-template='echo %(nr_ranks)s && %(cmd)s' \\
-# Golden_Repo/l/LAMMPS/LAMMPS-22Oct2020-intel-para-2020-Python-3.9.6.eb
-name = 'LAMMPS'
-version = '7Jan2022'
-
-homepage = 'https://lammps.sandia.gov/'
-description = """LAMMPS is a classical molecular dynamics code, and an acronym
-for Large-scale Atomic/Molecular Massively Parallel Simulator. LAMMPS has
-potentials for solid-state materials (metals, semiconductors) and soft matter
-(biomolecules, polymers) and coarse-grained or mesoscopic systems. It can be
-used to model atoms or, more generically, as a parallel particle simulator at
-the atomic, meso, or continuum scale. LAMMPS runs on single processors or in
-parallel using message-passing techniques and a spatial-decomposition of the
-simulation domain. The code is designed to be easy to modify or extend with new
-functionality.
-"""
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-toolchainopts = {'openmp': True, 'cstd': 'c++14', 'usempi': True}
-
-# 'https://github.com/lammps/lammps/archive/'
-source_urls = [GITHUB_LOWER_SOURCE]
-sources = [
-    'patch_%(version)s.tar.gz',
-    # Since we are dropping yaff for the time being, drop this too
-    # {'extract_cmd': 'cp %s %(builddir)s', 'filename': 'lammps_vs_yaff_test_single_point_energy.py'},
-]
-checksums = ['fbf6c6814968ae0d772d7b6783079ff4f249a8faeceb39992c344969e9f1edbb']
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-    ('pkg-config', '0.29.2'),
-    ('archspec', '0.1.3'),
-    ('git', '2.33.1', '-nodocs'),
-]
-dependencies = [
-    ('CUDA', '11.5', '', SYSTEM),
-    ('Python', '3.9.6'),
-    ('libpng', '1.6.37'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('netCDF', '4.8.1'),
-    ('GSL', '2.7'),
-    ('zlib', '1.2.11'),
-    ('gzip', '1.10'),
-    ('cURL', '7.78.0'),
-    ('HDF5', '1.12.1'),
-    ('tbb', '2021.4.0'),
-    ('PCRE', '8.45'),
-    ('libxml2', '2.9.10'),
-    ('FFmpeg', '4.4.1'),
-    ('Voro++', '0.4.6'),
-    ('kim-api', '2.2.1'),
-    ('Eigen', '3.3.9'),
-    # 'YAFF', # yaff needs an old version of h5py, which needs an old version of HDF5. Let's drop it
-    # ('yaff', '1.6.0'),
-    ('PLUMED', '2.7.2'),
-    ('ScaFaCoS', '1.0.1'),
-    # See below for why this is not included
-    # ('VTK', '8.2.0', local_python_versionsuffix),
-]
-
-enhance_sanity_check = True
-
-# To use additional custom configuration options, use the 'configopts' easyconfig parameter
-# See docs and lammps easyblock for more information.
-# https://github.com/lammps/lammps/blob/master/cmake/README.md#lammps-configuration-options
-
-# Use the bfd linker for C++ (this will only be picked up when using Kokkos)
-preconfigopts = 'export CXXFLAGS="-fuse-ld=bfd $CXXFLAGS" &&'
-# docs require virtualenv (which we don't have)
-configopts = ' -DBUILD_DOC=off -DPKG_USER-INTEL=off '
-
-# auto-enabled by easyblock
-# 'GPU'    - if cuda package is present and kokkos is disabled
-# 'KOKKOS' - if kokkos is enabled (by default)
-#
-# not enabled (yet), needs more work/additional dependencies:
-# 'LATTE', - https://lammps.sandia.gov/doc/Build_extras.html#latte-package
-# 'MSCG',  - https://lammps.sandia.gov/doc/Build_extras.html#mscg-package
-# ADIOS - https://lammps.sandia.gov/doc/Build_extras.html#user-adios-package
-# AWPMD - https://lammps.sandia.gov/doc/Build_extras.html#user-awpmd-package
-# QMMM  - https://lammps.sandia.gov/doc/Packages_details.html#pkg-user-qmmm
-# QUIP  - https://lammps.sandia.gov/doc/Build_extras.html#user-quip-package
-# VTK - support is available in the foss version but currently fails to build for intel
-# due to https://software.intel.com/en-us/forums/intel-fortran-compiler/topic/746611
-# see https://github.com/lammps/lammps/issues/1964 for details
-
-# user packages seem to be deprecated in ver 7Jan2022, in favour of having everything in general_packages
-user_packages = []
-general_packages = [
-    'ASPHERE',
-    'ATC',
-    'BOCS',
-    'BODY',
-    'CG-DNA',
-    'CG-SDK',
-    'CLASS2',
-    'COLLOID',
-    'COLVARS',
-    'COMPRESS',
-    'CORESHELL',
-    'DIFFRACTION',
-    'DIPOLE',
-    'DPD-BASIC',
-    'DPD-MESO',
-    'DPD-REACT',
-    'DPD-SMOOTH',
-    'DRUDE',
-    'EFF',
-    'EXTRA-PAIR',
-    'FEP',
-    'GRANULAR',
-    'H5MD',
-    'KIM',
-    'KSPACE',
-    'LATBOLTZ',
-    'MACHDYN',
-    'MANIFOLD',
-    'MANYBODY',
-    'MC',
-    'MEAM',
-    'MESONT',
-    'MESSAGE',
-    'MGPT',
-    'MISC',
-    'MISC',
-    'ML-IAP',
-    'ML-SNAP',
-    'MOFFF',
-    'MOLECULE',
-    'MOLFILE',
-    'MPIIO',
-    'NETCDF',
-    'PERI',
-    'PHONON',
-    'PLUMED',
-    'POEMS',
-    'PTM',
-    'PYTHON',
-    'QEQ',
-    'QTB',
-    'REACTION',
-    'REAXFF',
-    'REPLICA',
-    'RIGID',
-    'SCAFACOS',
-    'SHOCK',
-    'SMTBQ',
-    'SPH',
-    'SPIN',
-    'SRD',
-    'TALLY',
-    'UEF',
-    'VORONOI',
-    # 'YAFF', # yaff needs an old version of h5py, which needs an old version of HDF5. Let's drop it
-]
-
-# run short test case to make sure installation doesn't produce blatently incorrect results;
-# this catches a problem where having the USER-INTEL package enabled causes trouble when installing with intel/2019b
-# (requires an MPI context for intel/2020a)
-# Since we are dropping yaff for the time being, drop this too
-# sanity_check_commands = ['cd %(builddir)s && %(mpi_cmd_prefix)s python lammps_vs_yaff_test_single_point_energy.py']
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/l/LCov/LCov-1.15-GCCcore-11.2.0.eb b/Golden_Repo/l/LCov/LCov-1.15-GCCcore-11.2.0.eb
deleted file mode 100644
index ec2bd3280..000000000
--- a/Golden_Repo/l/LCov/LCov-1.15-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,29 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'LCov'
-version = '1.15'
-
-homepage = 'http://ltp.sourceforge.net/coverage/lcov.php'
-description = "LCOV - the LTP GCOV extension"
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-github_account = 'linux-test-project'
-source_urls = [GITHUB_LOWER_SOURCE]
-sources = ['v%(version)s.tar.gz']
-checksums = ['d88b0718f59815862785ac379aed56974b9edd8037567347ae70081cd4a3542a']
-
-builddependencies = [
-    ('binutils', '2.37')
-]
-
-skipsteps = ['configure']
-
-installopts = "PREFIX=%(installdir)s"
-
-sanity_check_paths = {
-    'files': ['bin/lcov', 'bin/genhtml'],
-    'dirs': [],
-}
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/l/LLVM/LLVM-13.0.0-GCCcore-11.2.0.eb b/Golden_Repo/l/LLVM/LLVM-13.0.0-GCCcore-11.2.0.eb
deleted file mode 100644
index 71097bbaa..000000000
--- a/Golden_Repo/l/LLVM/LLVM-13.0.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,41 +0,0 @@
-name = 'LLVM'
-version = '13.0.0'
-
-homepage = "https://llvm.org/"
-description = """The LLVM Core libraries provide a modern source- and target-independent
-optimizer, along with code generation support for many popular CPUs
-(as well as some less common ones!) These libraries are built around a well
-specified code representation known as the LLVM intermediate representation
-("LLVM IR"). The LLVM Core libraries are well documented, and it is
-particularly easy to invent your own language (or port an existing compiler)
-to use LLVM as an optimizer and code generator."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'cstd': 'gnu++11', 'pic': 'True'}
-
-source_urls = [
-    'https://github.com/llvm/llvm-project/releases/download/llvmorg-%(version)s/']
-sources = ['llvm-%(version)s.src.tar.xz']
-checksums = ['408d11708643ea826f519ff79761fcdfc12d641a2510229eec459e72f8163020']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1', '', SYSTEM),
-    ('Python', '3.9.6'),
-]
-
-dependencies = [
-    ('ncurses', '6.2'),
-    ('zlib', '1.2.11'),
-]
-
-build_shared_libs = True
-
-sanity_check_paths = {
-    'files': ['bin/llvm-ar', 'bin/FileCheck'],
-    'dirs': ['include/llvm', 'include/llvm-c'],
-}
-
-sanity_check_commands = ["llvm-ar --help"]
-
-moduleclass = 'compiler'
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
deleted file mode 100644
index 8ed7a0228..000000000
--- a/Golden_Repo/l/LMDB/LMDB-0.9.29-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-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
deleted file mode 100644
index 1a0309261..000000000
--- a/Golden_Repo/l/LibTIFF/LibTIFF-4.3.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,32 +0,0 @@
-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.1.1')
-]
-
-configopts = " --enable-ld-version-script "
-
-sanity_check_paths = {
-    'files': ['bin/tiffinfo'],
-    'dirs': [],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/l/Libint/Libint-2.7.0-beta.6-intel-compilers-2021.4.0_cp2k_lmax5.eb b/Golden_Repo/l/Libint/Libint-2.7.0-beta.6-intel-compilers-2021.4.0_cp2k_lmax5.eb
deleted file mode 100644
index 7516f8526..000000000
--- a/Golden_Repo/l/Libint/Libint-2.7.0-beta.6-intel-compilers-2021.4.0_cp2k_lmax5.eb
+++ /dev/null
@@ -1,56 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'Libint'
-version = '2.7.0-beta.6'
-versionsuffix = '_cp2k_lmax5'
-
-
-homepage = 'https://github.com/evaleev/libint'
-description = '''Libint library is used to evaluate the traditional (electron repulsion) and certain novel two-body
- matrix elements (integrals) over Cartesian Gaussian functions used in modern atomic and molecular theory.
- Libint is configured for maximum angular momentum Lmax=5 suitable for CP2K 8.2'''
-
-toolchain = {'name': 'intel-compilers', 'version': '2021.4.0'}
-toolchainopts = {'pic': True, 'cstd': 'c++11'}
-
-source_urls = ['https://github.com/evaleev/libint/archive']
-sources = ['v%(version)s.tar.gz']
-checksums = ['e3fa24d535c77a88ba86b6633449cd5332be53f91612a396b198fac4c2bcb321']
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('GMP', '6.2.1'),
-    ('Boost', '1.78.0'),
-    ('Eigen', '3.3.9'),
-    ('Python', '3.9.6'),
-    ('CMake', '3.21.1'),
-]
-
-
-local_expdir = 'libint_temp'
-local_l = 5
-local_compiler_configopts = '--enable-eri=1 --enable-eri2=1 --enable-eri3=1 --with-opt-am=3 --enable-generic-code '
-local_compiler_configopts += '--disable-unrolling --enable-shared --with-libint-exportdir=%s ' % local_expdir
-local_compiler_configopts += '--with-max-am={} '.format(local_l)
-local_compiler_configopts += '--with-eri-max-am={},{} '.format(local_l, local_l - 1)
-local_compiler_configopts += '--with-eri2-max-am={},{} '.format(local_l + 1, local_l + 2)
-local_compiler_configopts += '--with-eri3-max-am={},{} '.format(local_l + 1, local_l + 2)
-
-preconfigopts = './autogen.sh && mkdir objects && pushd objects && ../configure %s && ' % local_compiler_configopts
-preconfigopts += 'make -j 24 export && popd && tar xvf objects/%s.tgz && pushd %s && ' % (local_expdir, local_expdir)
-preconfigopts += 'CMAKE_PREFIX_PATH=$EBROOTEIGEN:$CMAKE_PREFIX_PATH '
-
-configopts = '-DENABLE_FORTRAN=ON -DBUILD_SHARED_LIBS=ON'
-
-prebuildopts = 'pushd %s && ' % local_expdir
-preinstallopts = prebuildopts
-pretestopts = prebuildopts
-separate_build_dir = False
-
-runtest = 'check'
-
-sanity_check_paths = {
-    'files': ['include/libint2.h', 'include/libint2.hpp', 'include/libint_f.mod', 'lib/libint2.%s' % SHLIB_EXT],
-    'dirs': ['include', 'include/libint2', 'lib', 'share']
-}
-moduleclass = 'chem'
diff --git a/Golden_Repo/l/LittleCMS/LittleCMS-2.12-GCCcore-11.2.0.eb b/Golden_Repo/l/LittleCMS/LittleCMS-2.12-GCCcore-11.2.0.eb
deleted file mode 100644
index db20d8f20..000000000
--- a/Golden_Repo/l/LittleCMS/LittleCMS-2.12-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,30 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'LittleCMS'
-version = '2.12'
-
-homepage = 'http://www.littlecms.com/'
-description = """ Little CMS intends to be an OPEN SOURCE small-footprint color management engine,
- with special focus on accuracy and performance. """
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['http://sourceforge.net/projects/lcms/files/lcms/%(version)s/']
-sources = ['lcms2-%(version)s.tar.gz']
-checksums = ['18663985e864100455ac3e507625c438c3710354d85e5cbb7cd4043e11fe10f5']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('libjpeg-turbo', '2.1.1')
-]
-
-sanity_check_paths = {
-    'files': ['bin/jpgicc', 'bin/linkicc', 'bin/psicc', 'bin/transicc', 'include/lcms2.h', 'include/lcms2_plugin.h',
-              'lib/liblcms2.a', 'lib/liblcms2.%s' % SHLIB_EXT, 'lib/pkgconfig/lcms2.pc'],
-    'dirs': ['share/man'],
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/l/LuaJIT2-OpenResty/LuaJIT2-OpenResty-2.1-20220411-GCCcore-11.2.0.eb b/Golden_Repo/l/LuaJIT2-OpenResty/LuaJIT2-OpenResty-2.1-20220411-GCCcore-11.2.0.eb
deleted file mode 100644
index 0b2fddf3f..000000000
--- a/Golden_Repo/l/LuaJIT2-OpenResty/LuaJIT2-OpenResty-2.1-20220411-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,38 +0,0 @@
-# This is the LuaJIT fork from openresty, not to be mixed up
-# with the original LuaJIT version!
-# Autor: J. Sassmannshausen (Imperial College London/UK)
-
-easyblock = 'ConfigureMake'
-
-name = "LuaJIT2-OpenResty"
-version = "2.1-20220411"
-
-homepage = "https://github.com/openresty/luajit2"
-description = """openresty/luajit2 - OpenResty's maintained branch of LuaJIT.
-LuaJIT is a Just-In-Time Compiler (JIT) for the Lua
-programming language. Lua is a powerful, dynamic and light-weight programming
-language. It may be embedded or used as a general-purpose, stand-alone
-language. """
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://github.com/openresty/luajit2/archive']
-sources = ['v%(version)s.tar.gz']
-checksums = ['d3f2c870f8f88477b01726b32accab30f6e5d57ae59c5ec87374ff73d0794316']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-skipsteps = ['configure']
-
-installopts = 'PREFIX=%(installdir)s'
-
-sanity_check_commands = ['luajit -v']
-
-sanity_check_paths = {
-    'files': ["bin/luajit"],
-    'dirs': []
-}
-
-moduleclass = "lang"
diff --git a/Golden_Repo/l/libGDSII/libGDSII-0.21-GCCcore-11.2.0.eb b/Golden_Repo/l/libGDSII/libGDSII-0.21-GCCcore-11.2.0.eb
deleted file mode 100644
index 82ecd218e..000000000
--- a/Golden_Repo/l/libGDSII/libGDSII-0.21-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,26 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'libGDSII'
-version = '0.21'
-
-homepage = 'https://github.com/HomerReid/libGDSII'
-description = """libGDSII is a C++ library for working with GDSII binary data files,
- intended primarily for use with the computational electromagnetism codes
- scuff-em and meep but sufficiently general-purpose to allow other uses as well."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://github.com/HomerReid/libGDSII/releases/download/v%(version)s/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['31c90a4fb699746d051c0c597ef0543889c9f17b2a711fed398756ac4f1b1f4c']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-sanity_check_paths = {
-    'files': ['bin/GDSIIConvert', 'include/libGDSII.h', 'lib/libGDSII.a', 'lib/libGDSII.%s' % SHLIB_EXT],
-    'dirs': [],
-}
-
-moduleclass = 'data'
diff --git a/Golden_Repo/l/libaec/libaec-1.0.6-GCCcore-11.2.0.eb b/Golden_Repo/l/libaec/libaec-1.0.6-GCCcore-11.2.0.eb
deleted file mode 100644
index 9887d7ce7..000000000
--- a/Golden_Repo/l/libaec/libaec-1.0.6-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,28 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'libaec'
-version = '1.0.6'
-
-homepage = 'https://gitlab.dkrz.de/k202009/libaec/'
-description = """Libaec provides fast lossless compression of 1 up to 32 bit wide
-signed or unsigned integers (samples). The library achieves best
-results for low entropy data as often encountered in space imaging
-instrument data or numerical model output from weather or climate
-simulations. While floating point representations are not directly
-supported, they can also be efficiently coded by grouping exponents
-and mantissa."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://gitlab.dkrz.de/k202009/libaec/-/archive/v1.0.6/']
-sources = ['libaec-v1.0.6.tar.gz']
-checksums = ['2675d26b24a081cdaaa48e0d085632e568e3f85f843f62b91fc51e1b3f5fe93f']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1')
-]
-
-separate_build_dir = True
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/l/libaio/libaio-0.3.112-GCCcore-11.2.0.eb b/Golden_Repo/l/libaio/libaio-0.3.112-GCCcore-11.2.0.eb
deleted file mode 100644
index c5944ed6e..000000000
--- a/Golden_Repo/l/libaio/libaio-0.3.112-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,32 +0,0 @@
-easyblock = 'MakeCp'
-
-name = 'libaio'
-version = '0.3.112'
-local_libversion = '1.0.1'
-
-homepage = 'https://pagure.io/libaio'
-description = "Asynchronous input/output library that uses the kernels native interface."
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://pagure.io/%(name)s/archive/%(name)s-%(version)s/']
-sources = ['%(name)s-%(version)s.tar.gz']
-checksums = ['4410c033237828c9e1205537df3cc94d4956f39164ef6d17a7813c2c787504c4']
-
-builddependencies = [('binutils', '2.37')]
-
-files_to_copy = [
-    (["src/libaio.a", "src/libaio.%s.%s" % (SHLIB_EXT, local_libversion)], "lib"),
-    (["src/libaio.h"], "include"),
-]
-
-postinstallcmds = ["cd %%(installdir)s/lib; ln -s libaio.%s.%s libaio.%s" %
-                   (SHLIB_EXT, local_libversion, SHLIB_EXT)]
-
-sanity_check_paths = {
-    'files': ['lib/libaio.a', 'lib/libaio.%s.%s' % (SHLIB_EXT, local_libversion), 'include/libaio.h'],
-    'dirs': [],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/l/libarchive/libarchive-3.5.1-GCCcore-11.2.0.eb b/Golden_Repo/l/libarchive/libarchive-3.5.1-GCCcore-11.2.0.eb
deleted file mode 100644
index a5bba4c08..000000000
--- a/Golden_Repo/l/libarchive/libarchive-3.5.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,33 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'libarchive'
-version = '3.5.1'
-
-homepage = 'https://www.libarchive.org/'
-
-description = """
- Multi-format archive and compression library
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://www.libarchive.org/downloads/']
-sources = [SOURCE_TAR_GZ]
-checksums = ['9015d109ec00bb9ae1a384b172bf2fc1dff41e2c66e5a9eeddf933af9db37f5a']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('XZ', '5.2.5'),
-    ('OpenSSL', '1.1', '', True),
-]
-
-sanity_check_paths = {
-    'files': ['include/archive.h', 'lib/libarchive.%s' % SHLIB_EXT],
-    'dirs': ['bin', 'share/man/man3'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/l/libcerf/libcerf-1.17-GCCcore-11.2.0.eb b/Golden_Repo/l/libcerf/libcerf-1.17-GCCcore-11.2.0.eb
deleted file mode 100644
index 55f3fa5a8..000000000
--- a/Golden_Repo/l/libcerf/libcerf-1.17-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,33 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'libcerf'
-version = '1.17'
-
-homepage = 'https://jugit.fz-juelich.de/mlz/libcerf'
-
-description = """
- libcerf is a self-contained numeric library that provides an efficient and
- accurate implementation of complex error functions, along with Dawson,
- Faddeeva, and Voigt functions.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [
-    'https://jugit.fz-juelich.de/mlz/libcerf/-/archive/v%(version)s/']
-sources = ['libcerf-v%(version)s.tar.gz']
-checksums = ['b1916b292cb37f2d0d0b699fbcf0fe260cca97ec7266ea20ff0c5cd8ef2eaab4']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1'),
-    ('Perl', '5.34.0'),  # required for pod2html
-]
-
-sanity_check_paths = {
-    'files': ['lib/libcerf.%s' % SHLIB_EXT],
-    'dirs': []
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/l/libcint/libcint-4.4.0-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/l/libcint/libcint-4.4.0-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index c68aaa29f..000000000
--- a/Golden_Repo/l/libcint/libcint-4.4.0-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,40 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'libcint'
-version = '4.4.0'
-
-homepage = 'https://github.com/sunqm/libcint'
-description = """libcint is an open source library for analytical Gaussian integrals."""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-source_urls = ['https://github.com/sunqm/libcint/archive/']
-sources = ['v%(version)s.tar.gz']
-patches = ['%(name)s-%(version)s_remove_pyscftest.patch']
-checksums = [
-    '39a831e9131395e7ac312608981495aed3e44d0511b0700b2a1fb163b32c89c1',  # v4.4.0.tar.gz
-    # libcint-4.4.0_remove_pyscftest.patch
-    '6449297a6aee30fef3d6a268aa892dea8dd5c3ca9669a50ae694ab9bcf17842d',
-]
-
-builddependencies = [
-    ('CMake', '3.21.1'),
-    # Python with numpy only required for 'make test'
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10'),
-]
-
-separate_build_dir = False  # Must use the same directory for tests
-
-configopts = '-DWITH_RANGE_COULOMB=on -DWITH_COULOMB_ERF=on -DWITH_F12=on -DENABLE_TEST=on'
-
-buildopts = "VERBOSE=1"
-
-runtest = 'test '
-
-sanity_check_paths = {
-    'files': ['include/cint.h', 'lib/libcint.%s' % SHLIB_EXT],
-    'dirs': [],
-}
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/l/libcint/libcint-4.4.0_remove_pyscftest.patch b/Golden_Repo/l/libcint/libcint-4.4.0_remove_pyscftest.patch
deleted file mode 100644
index d66fee600..000000000
--- a/Golden_Repo/l/libcint/libcint-4.4.0_remove_pyscftest.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Remove single test with circular dependency on PySCF.
-Author: micketeer@gmail.com
---- testsuite/test_3c2e.py.orig	2021-06-14 13:15:11.316287035 +0200
-+++ testsuite/test_3c2e.py	2021-06-14 13:11:51.777769636 +0200
-@@ -307,9 +307,10 @@
-              ):
-         test_int3c2e_sph(*f)
-     if "--quick" not in sys.argv:
--        for f in (('cint3c2e', 'cint3c2e_sph', 4412.363002589966, 1, 10),
--                 ):
--            test_int3c2e_spinor(*f)
-+#        for f in (('cint3c2e', 'cint3c2e_sph', 4412.363002589966, 1, 10),
-+#                 ):
-+#            test_int3c2e_spinor(*f)
-+         pass
- 
- #    for f in (('cint2c2e_sph', 'cint2e_sph', 782.3104849606677, 1, 10),
- #              ('cint2c2e_ip1_sph', 'cint2e_ip1_sph', 394.6515972715189, 3, 10),
diff --git a/Golden_Repo/l/libcroco/libcroco-0.6.13-GCCcore-11.2.0.eb b/Golden_Repo/l/libcroco/libcroco-0.6.13-GCCcore-11.2.0.eb
deleted file mode 100644
index 064a1161b..000000000
--- a/Golden_Repo/l/libcroco/libcroco-0.6.13-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'libcroco'
-version = '0.6.13'
-
-homepage = 'https://github.com/GNOME/libcroco'
-description = """Libcroco is a standalone css2 parsing and manipulation library."""
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [
-    'http://ftp.gnome.org/pub/GNOME/sources/libcroco/%(version_major_minor)s/']
-sources = [SOURCE_TAR_XZ]
-checksums = ['767ec234ae7aa684695b3a735548224888132e063f92db585759b422570621d4']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('libxml2', '2.9.10'),
-    ('GLib', '2.69.1'),
-]
-
-sanity_check_paths = {
-    'files': ['bin/csslint-%(version_major_minor)s', 'lib/libcroco-%%(version_major_minor)s.%s' % SHLIB_EXT,
-              'lib/libcroco-%(version_major_minor)s.a'],
-    'dirs': ['include/libcroco-%(version_major_minor)s', 'share']
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/l/libctl/libctl-4.5.1-GCC-11.2.0.eb b/Golden_Repo/l/libctl/libctl-4.5.1-GCC-11.2.0.eb
deleted file mode 100644
index a5d4dbccd..000000000
--- a/Golden_Repo/l/libctl/libctl-4.5.1-GCC-11.2.0.eb
+++ /dev/null
@@ -1,21 +0,0 @@
-easyblock = 'ConfigureMake'
-name = 'libctl'
-version = '4.5.1'
-
-homepage = 'http://ab-initio.mit.edu/libctl'
-description = """libctl is a free Guile-based library implementing flexible control files for scientific simulations."""
-
-toolchain = {'name': 'GCC', 'version': '11.2.0'}
-toolchainopts = {'optarch': True}
-
-source_urls = ['https://github.com/stevengj/libctl/releases/download/v%(version)s/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['fcfeb2f13dda05b560f0ec6872757d9318fdfe8f4bc587eb2053a29ba328ae25']  # libctl-4.5.1.tar.gz
-
-dependencies = [
-    ('guile', '3.0.7')
-]
-
-configopts = '--enable-shared '
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/l/libctl/libctl-4.5.1-intel-compilers-2021.4.0.eb b/Golden_Repo/l/libctl/libctl-4.5.1-intel-compilers-2021.4.0.eb
deleted file mode 100644
index 6f27a6be8..000000000
--- a/Golden_Repo/l/libctl/libctl-4.5.1-intel-compilers-2021.4.0.eb
+++ /dev/null
@@ -1,25 +0,0 @@
-easyblock = 'ConfigureMake'
-name = 'libctl'
-version = '4.5.1'
-
-homepage = 'http://ab-initio.mit.edu/libctl'
-description = """libctl is a free Guile-based library implementing flexible control files for scientific simulations."""
-
-toolchain = {'name': 'intel-compilers', 'version': '2021.4.0'}
-toolchainopts = {'optarch': True}
-
-source_urls = ['https://github.com/stevengj/libctl/releases/download/v%(version)s/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['fcfeb2f13dda05b560f0ec6872757d9318fdfe8f4bc587eb2053a29ba328ae25']  # libctl-4.5.1.tar.gz
-
-dependencies = [
-    ('guile', '3.0.7')
-]
-
-# builddependencies = [
-#     ('guile', '3.0.7')
-# ]
-
-configopts = '--enable-shared '
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/l/libdap/libdap-3.20.8-GCCcore-11.2.0.eb b/Golden_Repo/l/libdap/libdap-3.20.8-GCCcore-11.2.0.eb
deleted file mode 100644
index af3d39305..000000000
--- a/Golden_Repo/l/libdap/libdap-3.20.8-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'libdap'
-version = '3.20.8'
-
-homepage = 'http://opendap.org/download/libdap'
-description = """A C++ SDK which contains an implementation of DAP 2.0
- and DAP 4.0. This includes both Client- and Server-side support classes.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['http://www.opendap.org/pub/source/']
-sources = [SOURCE_TAR_GZ]
-checksums = ['65eb5c8f693cf74d58eece5eaa2e7c3c65f368926b1bffab0cf5b207757b94eb']
-
-builddependencies = [
-    ('Bison', '3.7.6'),
-    ('flex', '2.6.4'),
-    ('util-linux', '2.37'),
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('cURL', '7.78.0'),
-    ('Python', '3.9.6')
-]
-
-sanity_check_paths = {
-    'files': ['bin/getdap', 'bin/getdap4', 'bin/dap-config', 'lib/libdap.a', 'lib/libdap.%s' % SHLIB_EXT],
-    'dirs': ['include'],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/l/libdrm/libdrm-2.4.107-GCCcore-11.2.0.eb b/Golden_Repo/l/libdrm/libdrm-2.4.107-GCCcore-11.2.0.eb
deleted file mode 100644
index 842abee08..000000000
--- a/Golden_Repo/l/libdrm/libdrm-2.4.107-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,32 +0,0 @@
-easyblock = 'MesonNinja'
-
-name = 'libdrm'
-version = '2.4.107'
-
-homepage = 'https://dri.freedesktop.org'
-description = """Direct Rendering Manager runtime library."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://dri.freedesktop.org/libdrm/']
-sources = [SOURCELOWER_TAR_XZ]
-checksums = ['c554cef03b033636a975543eab363cc19081cb464595d3da1ec129f87370f888']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('pkg-config', '0.29.2'),
-    ('Meson', '0.58.2'),
-    ('Ninja', '1.10.2'),
-]
-dependencies = [('X11', '20210802')]
-
-# installing manpages requires an extra build dependency (docbook xsl)
-configopts = '-Dman-pages=false'
-
-sanity_check_paths = {
-    'files': ['lib/libdrm.%s' % SHLIB_EXT, 'include/libdrm/drm.h'],
-    'dirs': ['include', 'lib'],
-}
-
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/l/libdrm/libdrm-2.4.108-GCCcore-11.2.0.eb b/Golden_Repo/l/libdrm/libdrm-2.4.108-GCCcore-11.2.0.eb
deleted file mode 100644
index 6ecd87421..000000000
--- a/Golden_Repo/l/libdrm/libdrm-2.4.108-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-easyblock = 'MesonNinja'
-
-name = 'libdrm'
-version = '2.4.108'
-
-homepage = 'https://dri.freedesktop.org'
-description = """Direct Rendering Manager runtime library."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://dri.freedesktop.org/libdrm/']
-sources = [SOURCELOWER_TAR_XZ]
-checksums = ['a1d7948cbc536763fde14b4beb5e4da7867607966d4cf46301087e8b8fe3d6a0']
-
-# checksums = ['92d8ac54429b171e087e61c2894dc5399fe6a549b1fbba09fa6a3cb9d4e57bd4']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('pkg-config', '0.29.2'),
-    ('Meson', '0.58.2'),
-    ('Ninja', '1.10.2'),
-]
-dependencies = [('X11', '20210802')]
-
-# installing manpages requires an extra build dependency (docbook xsl)
-configopts = '-Dman-pages=false'
-
-sanity_check_paths = {
-    'files': ['lib/libdrm.%s' % SHLIB_EXT, 'include/libdrm/drm.h'],
-    'dirs': ['include', 'lib'],
-}
-
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/l/libdwarf/libdwarf-20210528-GCCcore-11.2.0.eb b/Golden_Repo/l/libdwarf/libdwarf-20210528-GCCcore-11.2.0.eb
deleted file mode 100644
index 1e4742bb1..000000000
--- a/Golden_Repo/l/libdwarf/libdwarf-20210528-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Author:    Robert Mijakovic <robert.mijakovic@lxp.lu>
-#
-easyblock = 'ConfigureMake'
-
-name = 'libdwarf'
-version = '20210528'
-
-homepage = 'https://www.prevanders.net/dwarf.html'
-description = """The DWARF Debugging Information Format is of interest to programmers working on compilers
-and debuggers (and anyone interested in reading or writing DWARF information))"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://www.prevanders.net']
-sources = [SOURCE_TAR_GZ]
-checksums = ['b8ba0ee9b70d2052d45272489d79bf456c4d342fc8c3bba45038afc50ec6e28b']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-dependencies = [
-    ('libelf', '0.8.13'),
-]
-
-configopts = "--enable-shared "
-
-sanity_check_paths = {
-    'files': ['bin/dwarfdump', 'lib/libdwarf.a', 'lib/libdwarf.%s' % SHLIB_EXT],
-    'dirs': ['include']
-}
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/l/libelf/libelf-0.8.13-GCCcore-11.2.0.eb b/Golden_Repo/l/libelf/libelf-0.8.13-GCCcore-11.2.0.eb
deleted file mode 100644
index 3697875c7..000000000
--- a/Golden_Repo/l/libelf/libelf-0.8.13-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'libelf'
-version = '0.8.13'
-
-homepage = 'https://web.archive.org/web/20190223180146/http://www.mr511.de/software/english.html'
-# The original existed here http://www.mr511.de/software/english.html'
-# The only available source code is for an earlier version at https://github.com/WolfgangSt/libelf
-description = """libelf is a free ELF object file access library
-"""
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [
-    # source is actually a tar named as tar.gz, will fail. Download the source and gzip it
-    'https://web.archive.org/web/20170808201535/http://www.mr511.de/software/',
-    'https://fossies.org/linux/misc/old/'
-]
-sources = [SOURCE_TAR_GZ]
-checksums = ['7b69d752e76b6ce80bb8c00139a7a8b9a5cf71eb3d0b7b6d11269c6fc7314705']
-
-builddependencies = [
-    ('binutils', '2.37')
-]
-
-modextrapaths = {'CPATH': 'include/libelf'}
-
-sanity_check_paths = {
-    'files': ['lib/libelf.a', 'lib/libelf.%s' % SHLIB_EXT, 'lib/libelf.so.0', 'include/libelf/libelf.h'],
-    'dirs': ['lib/pkgconfig']
-}
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/l/libepoxy/libepoxy-1.5.9-GCCcore-11.2.0.eb b/Golden_Repo/l/libepoxy/libepoxy-1.5.9-GCCcore-11.2.0.eb
deleted file mode 100644
index ddc8a6406..000000000
--- a/Golden_Repo/l/libepoxy/libepoxy-1.5.9-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,37 +0,0 @@
-easyblock = 'MesonNinja'
-
-name = 'libepoxy'
-version = '1.5.9'
-
-homepage = 'https://github.com/anholt/libepoxy'
-description = "Epoxy is a library for handling OpenGL function pointer management for you"
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-github_account = 'anholt'
-source_urls = [GITHUB_LOWER_SOURCE]
-sources = ['%(version)s.tar.gz']
-checksums = ['ee8048d20179a2e86156ac842ddb6428732d9cd7a2cfc2eca905165bf24887a2']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Meson', '0.58.2'),
-    ('Ninja', '1.10.2'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('X11', '20210802'),
-    ('OpenGL', '2021b'),
-]
-
-configopts = '-Degl=yes --libdir %(installdir)s/lib '
-
-sanity_check_paths = {
-    'files': ['include/epoxy/%s.h' % x for x in ['common', 'egl_generated', 'egl', 'gl_generated',
-                                                 'gl', 'glx_generated', 'glx']] +
-             ['lib/libepoxy.%s' % SHLIB_EXT],
-    'dirs': ['lib']
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/l/libevent/libevent-2.1.12-GCCcore-11.2.0.eb b/Golden_Repo/l/libevent/libevent-2.1.12-GCCcore-11.2.0.eb
deleted file mode 100644
index 15c33ceb2..000000000
--- a/Golden_Repo/l/libevent/libevent-2.1.12-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,40 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'libevent'
-version = '2.1.12'
-
-homepage = 'https://libevent.org/'
-
-description = """
-The libevent API provides a mechanism to execute a callback function when
-a specific event occurs on a file descriptor or after a timeout has been
-reached. Furthermore, libevent also support callbacks due to signals or
-regular timeouts.
-"""
-
-site_contacts = 'sc@fz-juelich.de'
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/%(name)s/%(name)s/releases/download/release-%(version)s-stable/']
-sources = ['%(name)s-%(version)s-stable.tar.gz']
-checksums = ['92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('OpenSSL', '1.1', '', SYSTEM),
-]
-
-sanity_check_paths = {
-    'files': ['bin/event_rpcgen.py', 'include/event.h', 'include/event2/event.h',
-              'lib/libevent_core.%s' % SHLIB_EXT, 'lib/pkgconfig/libevent.pc'],
-    'dirs': [],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/l/libffi/libffi-3.4.2-GCCcore-11.2.0.eb b/Golden_Repo/l/libffi/libffi-3.4.2-GCCcore-11.2.0.eb
deleted file mode 100644
index 479b36b9f..000000000
--- a/Golden_Repo/l/libffi/libffi-3.4.2-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,30 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'libffi'
-version = '3.4.2'
-
-homepage = 'https://sourceware.org/libffi/'
-description = """The libffi library provides a portable, high level programming interface to
- various calling conventions. This allows a programmer to call any function
- specified by a call interface description at run-time."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/libffi/libffi/releases/download/v3.4.2/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['540fb721619a6aba3bdeef7d940d8e9e0e6d2c193595bc243241b77ff9e93620']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-# work-around for https://github.com/libffi/libffi/pull/647
-configopts = '--disable-exec-static-tramp '
-
-sanity_check_paths = {
-    'files': ['lib/libffi.a', 'lib/libffi.%s' % SHLIB_EXT],
-    'dirs': ['include', 'share'],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/l/libgd/libgd-2.3.1-GCCcore-11.2.0.eb b/Golden_Repo/l/libgd/libgd-2.3.1-GCCcore-11.2.0.eb
deleted file mode 100644
index 796ba87d2..000000000
--- a/Golden_Repo/l/libgd/libgd-2.3.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,35 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'libgd'
-version = '2.3.1'
-
-homepage = 'https://github.com/libgd'
-description = """GD is an open source code library for the dynamic creation of
-images by programmers.
-"""
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [
-    'https://github.com/libgd/libgd/releases/download/gd-%(version)s/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['e904a35fd3379ddb2d7c64f929b7cbdf0422863646dae252be0029b9e47c9fe3']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('X11', '20210802'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('libpng', '1.6.37'),
-    ('zlib', '1.2.11'),
-]
-
-sanity_check_paths = {
-    'files': ["lib/libgd.a", "lib/libgd.%s" % SHLIB_EXT],
-    'dirs': ["bin", "include"],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/l/libgeotiff/libgeotiff-1.7.0-GCCcore-11.2.0.eb b/Golden_Repo/l/libgeotiff/libgeotiff-1.7.0-GCCcore-11.2.0.eb
deleted file mode 100644
index eb9d9974e..000000000
--- a/Golden_Repo/l/libgeotiff/libgeotiff-1.7.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,41 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'libgeotiff'
-version = '1.7.0'
-
-homepage = 'https://trac.osgeo.org/geotiff/'
-description = """Library for reading and writing coordinate system information
- from/to GeoTIFF files"""
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://download.osgeo.org/geotiff/libgeotiff']
-sources = [SOURCE_TAR_GZ]
-checksums = ['fc304d8839ca5947cfbeb63adb9d1aa47acef38fc6d6689e622926e672a99a7e']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('PROJ', '8.1.0'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('zlib', '1.2.11'),
-    ('SQLite', '3.36'),
-    ('LibTIFF', '4.3.0'),
-    ('cURL', '7.78.0'),
-]
-
-configopts = '--with-libtiff=$EBROOTLIBTIFF'
-configopts += ' --with-proj=$EBROOTPROJ '
-configopts += ' --with-zlib=$EBROOTZLIB'
-configopts += ' --with-jpeg=$EBROOTLIBJPEGMINTURBO'
-
-sanity_check_paths = {
-    'files': ['bin/listgeo', 'lib/libgeotiff.a',
-              'lib/libgeotiff.%s' % SHLIB_EXT],
-    'dirs': ['include', 'share'],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/l/libgit2/libgit2-1.1.1-GCCcore-11.2.0.eb b/Golden_Repo/l/libgit2/libgit2-1.1.1-GCCcore-11.2.0.eb
deleted file mode 100644
index 085a5fb9f..000000000
--- a/Golden_Repo/l/libgit2/libgit2-1.1.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'libgit2'
-version = '1.1.1'
-
-homepage = 'https://libgit2.org/'
-description = """libgit2 is a portable, pure C implementation of the Git core methods provided as a re-entrant
-linkable library with a solid API, allowing you to write native speed custom Git applications in any language
-which supports C bindings."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-github_account = 'libgit2'
-source_urls = [GITHUB_SOURCE]
-sources = [{'download_filename': 'v%(version)s.tar.gz', 'filename': SOURCE_TAR_GZ}]
-checksums = ['13a525373f64c711a00a058514d890d1512080265f98e0935ab279393f21a620']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('PCRE', '8.45'),
-    ('OpenSSL', '1.1', '', True),
-]
-
-sanity_check_paths = {
-    'files': ['include/git2.h', 'lib64/libgit2.%s' % SHLIB_EXT, 'lib64/pkgconfig/libgit2.pc'],
-    'dirs': []
-}
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/l/libglvnd/libglvnd-1.3.3-GCCcore-11.2.0.eb b/Golden_Repo/l/libglvnd/libglvnd-1.3.3-GCCcore-11.2.0.eb
deleted file mode 100644
index 50dad3027..000000000
--- a/Golden_Repo/l/libglvnd/libglvnd-1.3.3-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,35 +0,0 @@
-easyblock = 'MesonNinja'
-
-name = 'libglvnd'
-version = '1.3.3'
-
-homepage = 'https://gitlab.freedesktop.org/glvnd/libglvnd'
-description = "libglvnd is a vendor-neutral dispatch layer for arbitrating OpenGL API calls between multiple vendors."
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [
-    'https://gitlab.freedesktop.org/glvnd/libglvnd/-/archive/v%(version)s/']
-sources = ['libglvnd-v%(version)s.tar.gz']
-checksums = ['e768f43a0b23d9a8c9f1bed425f7f15d8491a1780253945a4445ddc40e5f6f84']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('pkg-config', '0.29.2'),
-    ('Meson', '0.58.2'),
-    ('Ninja', '1.10.2'),
-]
-
-dependencies = [('X11', '20210802')]
-
-# Let EGL find system-installed vendor files in /etc/glvnd/egl_vendor.d etc.
-allow_prepend_abs_path = True
-modextrapaths = {
-    "__EGL_VENDOR_LIBRARY_DIRS": "/etc/glvnd/egl_vendor.d:/usr/share/glvnd/egl_vendor.d"}
-
-sanity_check_paths = {
-    'files': ['lib/lib%s.%s' % (x, SHLIB_EXT) for x in ['EGL', 'GL', 'GLX', 'OpenGL']],
-    'dirs': ['include/%s' % x for x in ['EGL', 'GL', 'GLES', 'GLES2', 'GLES3', 'glvnd', 'KHR']] + ['lib/pkgconfig'],
-}
-
-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
deleted file mode 100644
index c306c634e..000000000
--- a/Golden_Repo/l/libiconv/libiconv-1.16-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,23 +0,0 @@
-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/libjpeg-turbo/libjpeg-turbo-2.1.1-GCCcore-11.2.0.eb b/Golden_Repo/l/libjpeg-turbo/libjpeg-turbo-2.1.1-GCCcore-11.2.0.eb
deleted file mode 100644
index 21fd134ba..000000000
--- a/Golden_Repo/l/libjpeg-turbo/libjpeg-turbo-2.1.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,42 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'libjpeg-turbo'
-version = '2.1.1'
-
-homepage = 'https://sourceforge.net/projects/libjpeg-turbo/'
-
-description = """
- libjpeg-turbo is a fork of the original IJG libjpeg which uses SIMD to
- accelerate baseline JPEG compression and decompression. libjpeg is a library
- that implements JPEG image encoding, decoding and transcoding.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [SOURCEFORGE_SOURCE]
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510']
-
-builddependencies = [
-    ('CMake', '3.21.1'),
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('NASM', '2.15.05'),
-]
-
-configopts = ' -G"Unix Makefiles" -DWITH_JPEG8=1'
-
-runtest = "test"
-
-sanity_check_paths = {
-    'files': ['bin/cjpeg', 'bin/djpeg', 'bin/jpegtran', 'bin/rdjpgcom',
-              'bin/tjbench', 'bin/wrjpgcom', 'lib/libjpeg.a',
-              'lib/libjpeg.%s' % SHLIB_EXT, 'lib/libturbojpeg.a',
-              'lib/libturbojpeg.%s' % SHLIB_EXT],
-    'dirs': ['include', 'share'],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/l/libmatheval/003-guile2.0.patch b/Golden_Repo/l/libmatheval/003-guile2.0.patch
deleted file mode 100644
index e12f9c45f..000000000
--- a/Golden_Repo/l/libmatheval/003-guile2.0.patch
+++ /dev/null
@@ -1,403 +0,0 @@
-Description: Increase precision of floating point tests
- guile-2.0 has increased the precision of the floating point maths returns,
- so the test suite needs to allow for the correct values to be returned
- with higher precision. Thanks to Dave Pigott <dave.pigott@linaro.org>
- Also adapt the configure script to build against guile-2.0 - patch from
- Hilo Bengen <bengen@debian.org>.
- .
- libmatheval (1.1.11+dfsg-1.1) unstable; urgency=low
- .
-   * Non-maintainer upload.
-   * Migrate to guile-2.0 - patch from Hilo Bengen,
-     extended to support higher precision of return values
-     by guile-2.0. (Closes: #746013)
-Author: Neil Williams <codehelp@debian.org>
-Bug-Debian: https://bugs.debian.org/746013
-
----
-
---- libmatheval-1.1.11+dfsg.orig/configure.in
-+++ libmatheval-1.1.11+dfsg/configure.in
-@@ -60,10 +60,11 @@ dnl Checks for library functions.
- AC_CHECK_FUNCS([bzero memset], [break])
- 
- dnl Additional Guile feature checks.
-+CFLAGS="$CFLAGS $GUILE_CFLAGS"
- AC_CHECK_TYPE([scm_t_bits], [AC_DEFINE([HAVE_SCM_T_BITS], [1], [Define to 1 if you have the `scm_t_bits' type.])], [], [#include <libguile.h>])
--AC_CHECK_LIB([guile], [scm_c_define_gsubr], [AC_DEFINE([HAVE_SCM_C_DEFINE_GSUBR], [1], [Define to 1 if you have the `scm_c_define_gsubr' function.])], [], [$GUILE_LDFLAGS])
--AC_CHECK_LIB([guile], [scm_make_gsubr], [AC_DEFINE([HAVE_SCM_MAKE_GSUBR], [1], [Define to 1 if you have the `scm_make_gsubr' function.])], [], [$GUILE_LDFLAGS])
--AC_CHECK_LIB([guile], [scm_num2dbl], [AC_DEFINE([HAVE_SCM_NUM2DBL], [1], [Define to 1 if you have the `scm_num2dbl' function.])], [], [$GUILE_LDFLAGS])
-+AC_CHECK_LIB([guile-2.0], [scm_c_define_gsubr], [AC_DEFINE([HAVE_SCM_C_DEFINE_GSUBR], [1], [Define to 1 if you have the `scm_c_define_gsubr' function.])], [], [$GUILE_LDFLAGS])
-+AC_CHECK_LIB([guile-2.0], [scm_make_gsubr], [AC_DEFINE([HAVE_SCM_MAKE_GSUBR], [1], [Define to 1 if you have the `scm_make_gsubr' function.])], [], [$GUILE_LDFLAGS])
-+AC_CHECK_LIB([guile-2.0], [scm_num2dbl], [AC_DEFINE([HAVE_SCM_NUM2DBL], [1], [Define to 1 if you have the `scm_num2dbl' function.])], [], [$GUILE_LDFLAGS])
- 
- AC_CONFIG_FILES([Makefile doc/Makefile lib/Makefile])
- AC_OUTPUT(libmatheval.pc)
---- libmatheval-1.1.11+dfsg.orig/tests/basics.at
-+++ libmatheval-1.1.11+dfsg/tests/basics.at
-@@ -62,7 +62,7 @@ AT_DATA([basics.scm],
- (display (evaluator-evaluate-x f 0))
- ]])
- 
--AT_CHECK([matheval.sh basics.scm], [ignore], [10.0], [ignore])
-+AT_CHECK([matheval.sh basics.scm], [ignore], [10.000000000000002], [ignore])
- 
- AT_DATA([basics.scm],
- [[
-@@ -70,7 +70,7 @@ AT_DATA([basics.scm],
- (display (evaluator-evaluate-x f 0.7))
- ]])
- 
--AT_CHECK([matheval.sh basics.scm], [ignore], [0.220966666722528], [ignore])
-+AT_CHECK([matheval.sh basics.scm], [ignore], [0.22096666672252796], [ignore])
- 
- AT_DATA([basics.scm],
- [[
-@@ -78,7 +78,7 @@ AT_DATA([basics.scm],
- (display (evaluator-evaluate-x-y f 0.4 -0.7))
- ]])
- 
--AT_CHECK([matheval.sh basics.scm], [ignore], [-1.14962406520749], [ignore])
-+AT_CHECK([matheval.sh basics.scm], [ignore], [-1.1496240652074883], [ignore])
- 
- AT_DATA([basics.scm],
- [[
-@@ -86,7 +86,7 @@ AT_DATA([basics.scm],
- (display (evaluator-evaluate-x-y-z f 11.2 0.41 -0.66))
- ]])
- 
--AT_CHECK([matheval.sh basics.scm], [ignore], [3.99876152571934], [ignore])
-+AT_CHECK([matheval.sh basics.scm], [ignore], [3.9987615257193383], [ignore])
- 
- AT_DATA([basics.scm],
- [[
---- libmatheval-1.1.11+dfsg.orig/tests/constants.at
-+++ libmatheval-1.1.11+dfsg/tests/constants.at
-@@ -29,7 +29,7 @@ AT_DATA([constant.scm],
- (display (evaluator-evaluate-x f 0))
- ]])
- 
--AT_CHECK([matheval.sh constant.scm], [ignore], [2.71828182845905], [ignore])
-+AT_CHECK([matheval.sh constant.scm], [ignore], [2.718281828459045], [ignore])
- 
- AT_DATA([constant.scm],
- [[
-@@ -37,7 +37,7 @@ AT_DATA([constant.scm],
- (display (evaluator-evaluate-x f 0))
- ]])
- 
--AT_CHECK([matheval.sh constant.scm], [ignore], [1.44269504088896], [ignore])
-+AT_CHECK([matheval.sh constant.scm], [ignore], [1.4426950408889634], [ignore])
- 
- AT_DATA([constant.scm],
- [[
-@@ -45,7 +45,7 @@ AT_DATA([constant.scm],
- (display (evaluator-evaluate-x f 0))
- ]])
- 
--AT_CHECK([matheval.sh constant.scm], [ignore], [0.434294481903252], [ignore])
-+AT_CHECK([matheval.sh constant.scm], [ignore], [0.4342944819032518], [ignore])
- 
- AT_DATA([constant.scm],
- [[
-@@ -53,7 +53,7 @@ AT_DATA([constant.scm],
- (display (evaluator-evaluate-x f 0))
- ]])
- 
--AT_CHECK([matheval.sh constant.scm], [ignore], [0.693147180559945], [ignore])
-+AT_CHECK([matheval.sh constant.scm], [ignore], [0.6931471805599453], [ignore])
- 
- AT_DATA([constant.scm],
- [[
-@@ -61,7 +61,7 @@ AT_DATA([constant.scm],
- (display (evaluator-evaluate-x f 0))
- ]])
- 
--AT_CHECK([matheval.sh constant.scm], [ignore], [2.30258509299405], [ignore])
-+AT_CHECK([matheval.sh constant.scm], [ignore], [2.302585092994046], [ignore])
- 
- AT_DATA([constant.scm],
- [[
-@@ -69,7 +69,7 @@ AT_DATA([constant.scm],
- (display (evaluator-evaluate-x f 0))
- ]])
- 
--AT_CHECK([matheval.sh constant.scm], [ignore], [3.14159265358979], [ignore])
-+AT_CHECK([matheval.sh constant.scm], [ignore], [3.141592653589793], [ignore])
- 
- AT_DATA([constant.scm],
- [[
-@@ -77,7 +77,7 @@ AT_DATA([constant.scm],
- (display (evaluator-evaluate-x f 0))
- ]])
- 
--AT_CHECK([matheval.sh constant.scm], [ignore], [1.5707963267949], [ignore])
-+AT_CHECK([matheval.sh constant.scm], [ignore], [1.5707963267948966], [ignore])
- 
- AT_DATA([constant.scm],
- [[
-@@ -85,7 +85,7 @@ AT_DATA([constant.scm],
- (display (evaluator-evaluate-x f 0))
- ]])
- 
--AT_CHECK([matheval.sh constant.scm], [ignore], [0.785398163397448], [ignore])
-+AT_CHECK([matheval.sh constant.scm], [ignore], [0.7853981633974483], [ignore])
- 
- AT_DATA([constant.scm],
- [[
-@@ -93,7 +93,7 @@ AT_DATA([constant.scm],
- (display (evaluator-evaluate-x f 0))
- ]])
- 
--AT_CHECK([matheval.sh constant.scm], [ignore], [0.318309886183791], [ignore])
-+AT_CHECK([matheval.sh constant.scm], [ignore], [0.3183098861837907], [ignore])
- 
- AT_DATA([constant.scm],
- [[
-@@ -101,7 +101,7 @@ AT_DATA([constant.scm],
- (display (evaluator-evaluate-x f 0))
- ]])
- 
--AT_CHECK([matheval.sh constant.scm], [ignore], [0.636619772367581], [ignore])
-+AT_CHECK([matheval.sh constant.scm], [ignore], [0.6366197723675814], [ignore])
- 
- AT_DATA([constant.scm],
- [[
-@@ -109,7 +109,7 @@ AT_DATA([constant.scm],
- (display (evaluator-evaluate-x f 0))
- ]])
- 
--AT_CHECK([matheval.sh constant.scm], [ignore], [1.12837916709551], [ignore])
-+AT_CHECK([matheval.sh constant.scm], [ignore], [1.1283791670955126], [ignore])
- 
- AT_DATA([constant.scm],
- [[
-@@ -117,7 +117,7 @@ AT_DATA([constant.scm],
- (display (evaluator-evaluate-x f 0))
- ]])
- 
--AT_CHECK([matheval.sh constant.scm], [ignore], [1.4142135623731], [ignore])
-+AT_CHECK([matheval.sh constant.scm], [ignore], [1.4142135623730951], [ignore])
- 
- AT_DATA([constant.scm],
- [[
-@@ -125,7 +125,7 @@ AT_DATA([constant.scm],
- (display (evaluator-evaluate-x f 0))
- ]])
- 
--AT_CHECK([matheval.sh constant.scm], [ignore], [0.707106781186548], [ignore])
-+AT_CHECK([matheval.sh constant.scm], [ignore], [0.7071067811865476], [ignore])
- 
- AT_DATA([constant.scm],
- [[
-@@ -133,7 +133,7 @@ AT_DATA([constant.scm],
- (display (evaluator-evaluate-x f 0))
- ]])
- 
--AT_CHECK([matheval.sh constant.scm], [ignore], [10.0], [ignore])
-+AT_CHECK([matheval.sh constant.scm], [ignore], [10.000000000000002], [ignore])
- 
- AT_DATA([constant.scm],
- [[
---- libmatheval-1.1.11+dfsg.orig/tests/functions.at
-+++ libmatheval-1.1.11+dfsg/tests/functions.at
-@@ -29,7 +29,7 @@ AT_DATA([function.scm],
- (display (evaluator-evaluate-x f 1))
- ]])
- 
--AT_CHECK([matheval.sh function.scm], [ignore], [2.71828182845905], [ignore])
-+AT_CHECK([matheval.sh function.scm], [ignore], [2.718281828459045], [ignore])
- 
- AT_DATA([function.scm],
- [[
-@@ -80,7 +80,7 @@ AT_DATA([function.scm],
- (display (evaluator-evaluate-x f 1))
- ]])
- 
--AT_CHECK([matheval.sh function.scm], [ignore], [0.841470984807897], [ignore])
-+AT_CHECK([matheval.sh function.scm], [ignore], [0.8414709848078965], [ignore])
- 
- AT_DATA([function.scm],
- [[
-@@ -97,7 +97,7 @@ AT_DATA([function.scm],
- (display (evaluator-evaluate-x f 1))
- ]])
- 
--AT_CHECK([matheval.sh function.scm], [ignore], [0.54030230586814], [ignore])
-+AT_CHECK([matheval.sh function.scm], [ignore], [0.5403023058681398], [ignore])
- 
- AT_DATA([function.scm],
- [[
-@@ -114,7 +114,7 @@ AT_DATA([function.scm],
- (display (evaluator-evaluate-x f 1))
- ]])
- 
--AT_CHECK([matheval.sh function.scm], [ignore], [1.5574077246549], [ignore])
-+AT_CHECK([matheval.sh function.scm], [ignore], [1.5574077246549023], [ignore])
- 
- AT_DATA([function.scm],
- [[
-@@ -131,7 +131,7 @@ AT_DATA([function.scm],
- (display (evaluator-evaluate-x f 1))
- ]])
- 
--AT_CHECK([matheval.sh function.scm], [ignore], [0.642092615934331], [ignore])
-+AT_CHECK([matheval.sh function.scm], [ignore], [0.6420926159343306], [ignore])
- 
- AT_DATA([function.scm],
- [[
-@@ -148,7 +148,7 @@ AT_DATA([function.scm],
- (display (evaluator-evaluate-x f 1))
- ]])
- 
--AT_CHECK([matheval.sh function.scm], [ignore], [1.85081571768093], [ignore])
-+AT_CHECK([matheval.sh function.scm], [ignore], [1.8508157176809255], [ignore])
- 
- AT_DATA([function.scm],
- [[
-@@ -165,7 +165,7 @@ AT_DATA([function.scm],
- (display (evaluator-evaluate-x f 1))
- ]])
- 
--AT_CHECK([matheval.sh function.scm], [ignore], [1.18839510577812], [ignore])
-+AT_CHECK([matheval.sh function.scm], [ignore], [1.1883951057781212], [ignore])
- 
- AT_DATA([function.scm],
- [[
-@@ -182,7 +182,7 @@ AT_DATA([function.scm],
- (display (evaluator-evaluate-x f 1))
- ]])
- 
--AT_CHECK([matheval.sh function.scm], [ignore], [1.5707963267949], [ignore])
-+AT_CHECK([matheval.sh function.scm], [ignore], [1.5707963267948966], [ignore])
- 
- AT_DATA([function.scm],
- [[
-@@ -216,7 +216,7 @@ AT_DATA([function.scm],
- (display (evaluator-evaluate-x f 1))
- ]])
- 
--AT_CHECK([matheval.sh function.scm], [ignore], [0.785398163397448], [ignore])
-+AT_CHECK([matheval.sh function.scm], [ignore], [0.7853981633974483], [ignore])
- 
- AT_DATA([function.scm],
- [[
-@@ -233,7 +233,7 @@ AT_DATA([function.scm],
- (display (evaluator-evaluate-x f 1))
- ]])
- 
--AT_CHECK([matheval.sh function.scm], [ignore], [0.785398163397448], [ignore])
-+AT_CHECK([matheval.sh function.scm], [ignore], [0.7853981633974483], [ignore])
- 
- AT_DATA([function.scm],
- [[
-@@ -267,7 +267,7 @@ AT_DATA([function.scm],
- (display (evaluator-evaluate-x f 1))
- ]])
- 
--AT_CHECK([matheval.sh function.scm], [ignore], [1.5707963267949], [ignore])
-+AT_CHECK([matheval.sh function.scm], [ignore], [1.5707963267948966], [ignore])
- 
- AT_DATA([function.scm],
- [[
-@@ -284,7 +284,7 @@ AT_DATA([function.scm],
- (display (evaluator-evaluate-x f 1))
- ]])
- 
--AT_CHECK([matheval.sh function.scm], [ignore], [1.1752011936438], [ignore])
-+AT_CHECK([matheval.sh function.scm], [ignore], [1.1752011936438014], [ignore])
- 
- AT_DATA([function.scm],
- [[
-@@ -301,7 +301,7 @@ AT_DATA([function.scm],
- (display (evaluator-evaluate-x f 1))
- ]])
- 
--AT_CHECK([matheval.sh function.scm], [ignore], [1.54308063481524], [ignore])
-+AT_CHECK([matheval.sh function.scm], [ignore], [1.5430806348152437], [ignore])
- 
- AT_DATA([function.scm],
- [[
-@@ -318,7 +318,7 @@ AT_DATA([function.scm],
- (display (evaluator-evaluate-x f 1))
- ]])
- 
--AT_CHECK([matheval.sh function.scm], [ignore], [0.761594155955765], [ignore])
-+AT_CHECK([matheval.sh function.scm], [ignore], [0.7615941559557649], [ignore])
- 
- AT_DATA([function.scm],
- [[
-@@ -335,7 +335,7 @@ AT_DATA([function.scm],
- (display (evaluator-evaluate-x f 1))
- ]])
- 
--AT_CHECK([matheval.sh function.scm], [ignore], [1.31303528549933], [ignore])
-+AT_CHECK([matheval.sh function.scm], [ignore], [1.3130352854993315], [ignore])
- 
- AT_DATA([function.scm],
- [[
-@@ -352,7 +352,7 @@ AT_DATA([function.scm],
- (display (evaluator-evaluate-x f 1))
- ]])
- 
--AT_CHECK([matheval.sh function.scm], [ignore], [0.648054273663885], [ignore])
-+AT_CHECK([matheval.sh function.scm], [ignore], [0.6480542736638855], [ignore])
- 
- AT_DATA([function.scm],
- [[
-@@ -368,7 +368,7 @@ AT_DATA([function.scm],
- (display (evaluator-evaluate-x f 1))
- ]])
- 
--AT_CHECK([matheval.sh function.scm], [ignore], [0.850918128239322], [ignore])
-+AT_CHECK([matheval.sh function.scm], [ignore], [0.8509181282393216], [ignore])
- 
- AT_DATA([function.scm],
- [[
-@@ -385,7 +385,7 @@ AT_DATA([function.scm],
- (display (evaluator-evaluate-x f 1))
- ]])
- 
--AT_CHECK([matheval.sh function.scm], [ignore], [0.881373587019543], [ignore])
-+AT_CHECK([matheval.sh function.scm], [ignore], [0.8813735870195429], [ignore])
- 
- AT_DATA([function.scm],
- [[
-@@ -419,7 +419,7 @@ AT_DATA([function.scm],
- (display (evaluator-evaluate-x f 0.5))
- ]])
- 
--AT_CHECK([matheval.sh function.scm], [ignore], [0.549306144334055], [ignore])
-+AT_CHECK([matheval.sh function.scm], [ignore], [0.5493061443340549], [ignore])
- 
- AT_DATA([function.scm],
- [[
-@@ -436,7 +436,7 @@ AT_DATA([function.scm],
- (display (evaluator-evaluate-x f 2))
- ]])
- 
--AT_CHECK([matheval.sh function.scm], [ignore], [0.549306144334055], [ignore])
-+AT_CHECK([matheval.sh function.scm], [ignore], [0.5493061443340549], [ignore])
- 
- AT_DATA([function.scm],
- [[
-@@ -470,7 +470,7 @@ AT_DATA([function.scm],
- (display (evaluator-evaluate-x f 1))
- ]])
- 
--AT_CHECK([matheval.sh function.scm], [ignore], [0.881373587019543], [ignore])
-+AT_CHECK([matheval.sh function.scm], [ignore], [0.8813735870195429], [ignore])
- 
- AT_DATA([function.scm],
- [[
---- libmatheval-1.1.11+dfsg.orig/tests/numbers.at
-+++ libmatheval-1.1.11+dfsg/tests/numbers.at
-@@ -53,6 +53,6 @@ AT_DATA([number.scm],
- (display (evaluator-evaluate-x f 0))
- ]])
- 
--AT_CHECK([matheval.sh number.scm], [ignore], [0.644394014977254], [ignore])
-+AT_CHECK([matheval.sh number.scm], [ignore], [0.6443940149772542], [ignore])
- 
- AT_CLEANUP
-
diff --git a/Golden_Repo/l/libmatheval/libmatheval-1.1.11-GCCcore-11.2.0.eb b/Golden_Repo/l/libmatheval/libmatheval-1.1.11-GCCcore-11.2.0.eb
deleted file mode 100644
index 858fab2c1..000000000
--- a/Golden_Repo/l/libmatheval/libmatheval-1.1.11-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,48 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'libmatheval'
-version = '1.1.11'  # still the latest version available on the ftp mirror
-
-homepage = 'http://www.gnu.org/software/libmatheval/'
-description = """GNU libmatheval is a library (callable from C and Fortran) to parse
- and evaluate symbolic expressions input as text.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [GNU_SOURCE]
-sources = [SOURCELOWER_TAR_GZ]
-patches = [
-    '003-guile2.0.patch',
-    'libmatheval-1.1.11_fix-matheval-test.patch'
-]
-
-checksums = [
-    # libmatheval-1.1.11.tar.gz
-    '474852d6715ddc3b6969e28de5e1a5fbaff9e8ece6aebb9dc1cc63e9e88e89ab',
-    '718f2cba02ee9d891976a3f078681c9e36d6c5f6050762db70fa8c9a889ec655',  # 003-guile2.0.patch
-    # libmatheval-1.1.11_fix-matheval-test.patch
-    'c619203df01157c25a384a1f3e7cbdb8838571a17b74da3b5bdabd15d8d681ff',
-]
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('flex', '2.6.4'),
-    ('Bison', '3.7.6'),
-    ('byacc', '20210808'),
-    # guile 2.2.X, 3.0.7 removed scm_num2dbl (among others), which are needed for libmatheval (at least for 1.1.11)
-    ('guile', '2.0.14')
-]
-
-configopts = '--with-pic '
-
-# fix for guile-config being broken because shebang line contains full path to bin/guile
-configopts += 'GUILE_CONFIG="$EBROOTGUILE/bin/guile -e main -s $EBROOTGUILE/bin/guile-config"'
-
-sanity_check_paths = {
-    'files': ['lib/libmatheval.a', 'include/matheval.h'],
-    'dirs': [],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/l/libmatheval/libmatheval-1.1.11_fix-matheval-test.patch b/Golden_Repo/l/libmatheval/libmatheval-1.1.11_fix-matheval-test.patch
deleted file mode 100644
index dd10e0915..000000000
--- a/Golden_Repo/l/libmatheval/libmatheval-1.1.11_fix-matheval-test.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-fix for "matheval.c:37:2: error: #error Neither scm_num2dbl() nor SCM_NUM2DBL available"
-patch obtained via https://aur.archlinux.org/cgit/aur.git/tree/removeifndefs.patch?h=libmatheval
-diff -aur a/tests/matheval.c b/tests/matheval.c
---- a/tests/matheval.c	2016-03-24 13:55:00.163074189 +0000
-+++ b/tests/matheval.c	2016-03-24 13:52:59.492996682 +0000
-@@ -26,26 +26,6 @@
- #include <matheval.h>
- #include "config.h"
- 
--#ifndef HAVE_SCM_T_BITS
--typedef long    scm_t_bits;
--#endif
--
--#ifndef HAVE_SCM_NUM2DBL
--#ifdef SCM_NUM2DBL
--#define scm_num2dbl(x,s) SCM_NUM2DBL(x)
--#else
--#error Neither scm_num2dbl() nor SCM_NUM2DBL available
--#endif
--#endif
--
--#ifndef HAVE_SCM_C_DEFINE_GSUBR
--#ifdef HAVE_SCM_MAKE_GSUBR
--#define scm_c_define_gsubr scm_make_gsubr
--#else
--#error Neither scm_c_define_gsubr() nor scm_make_gsubr() available
--#endif
--#endif
--
- static scm_t_bits evaluator_tag;	/* Unique identifier for Guile
- 					 * objects of evaluator 
-
diff --git a/Golden_Repo/l/libmpack-lua/libmpack-lua-1.0.9-GCCcore-11.2.0.eb b/Golden_Repo/l/libmpack-lua/libmpack-lua-1.0.9-GCCcore-11.2.0.eb
deleted file mode 100644
index d1d621829..000000000
--- a/Golden_Repo/l/libmpack-lua/libmpack-lua-1.0.9-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,58 +0,0 @@
-# EasyConfig for libmpack-lua (NeoVim dependency)
-#
-# Copyright 2019-2022 Stepan Nassyr @ Forschungszentrum Juelich
-easyblock = 'ConfigureMake'
-
-name = 'libmpack-lua'
-version = '1.0.9'
-
-homepage = 'https://github.com/libmpack/libmpack-lua'
-description = """libmpack lua binding
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-github_account = 'libmpack'
-source_urls = [GITHUB_SOURCE]
-sources = [{
-    'download_filename': '%(version)s.tar.gz',
-    'filename':          SOURCELOWER_TAR_GZ,
-}]
-checksums = ['e94d5cf95d7479dca00ff23755fe05a440f11f9d203635e862ad8842de95f40a']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('LuaJIT2-OpenResty', '2.1-20220411')
-]
-
-
-skipsteps = ['configure']
-build_cmd = ("LUA_TARGET=linux LUA=$EBROOTLUAJIT2MINOPENRESTY/bin/luajit "
-             "LUA_IMPL=luajit MPACK_LUA_VERSION=5.1 "
-             "LUA_CMOD_INSTALLDIR=/lib/lua/5.1/ "
-             "make PREFIX=%(installdir)s USE_SYSTEM_LUA=yes USE_SYSTEM_MPACK=no")
-install_cmd = ("LUA_TARGET=linux LUA=$EBROOTLUAJIT2MINOPENRESTY/bin/luajit "
-               "LUA_IMPL=luajit MPACK_LUA_VERSION=5.1 "
-               "LUA_CMOD_INSTALLDIR=/lib/lua/5.1/ "
-               "make DESTDIR=%(installdir)s USE_SYSTEM_LUA=yes USE_SYSTEM_MPACK=no install")
-
-sanity_check_paths = {
-    'files': ['lib/lua/5.1/mpack.%s' % SHLIB_EXT],
-    'dirs': [],
-}
-
-modluafooter = """
-libmpack_lua_root = os.getenv("EBROOTLIBMPACKMINLUA")
-lua_cpath          = os.getenv("LUA_CPATH")
-if nil == lua_cpath then
-  setenv("LUA_CPATH", libmpack_lua_root .. "/lib/lua/5.1/?.so;;")
-else
-  prepend_path("LUA_CPATH", libmpack_lua_root .. "/lib/lua/5.1/?.so", ";")
-end
-"""
-
-
-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
deleted file mode 100644
index 56d0c9048..000000000
--- a/Golden_Repo/l/libpciaccess/libpciaccess-0.16-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,26 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'libpciaccess'
-version = '0.16'
-
-homepage = 'https://cgit.freedesktop.org/xorg/lib/libpciaccess/'
-description = """Generic PCI access library."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://www.x.org/releases/individual/lib/']
-sources = [SOURCE_TAR_GZ]
-checksums = ['84413553994aef0070cf420050aa5c0a51b1956b404920e21b81e96db6a61a27']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Autotools', '20210726'),
-    ('xorg-macros', '1.19.3'),
-]
-
-sanity_check_paths = {
-    'files': ['include/pciaccess.h', 'lib/libpciaccess.a'],
-    'dirs': ['lib/pkgconfig'],
-}
-
-moduleclass = 'system'
diff --git a/Golden_Repo/l/libpng/libpng-1.6.37-GCCcore-11.2.0.eb b/Golden_Repo/l/libpng/libpng-1.6.37-GCCcore-11.2.0.eb
deleted file mode 100644
index 6b6d0e8ea..000000000
--- a/Golden_Repo/l/libpng/libpng-1.6.37-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,30 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'libpng'
-version = '1.6.37'
-
-homepage = 'http://www.libpng.org/pub/png/libpng.html'
-description = "libpng is the official PNG reference library"
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [SOURCEFORGE_SOURCE]
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['daeb2620d829575513e35fecc83f0d3791a620b9b93d800b763542ece9390fb4']
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [('zlib', '1.2.11')]
-
-local_majminver = ''.join(version.split('.')[:2])
-
-sanity_check_paths = {
-    'files': ['include/pngconf.h', 'include/png.h', 'include/pnglibconf.h',
-              'lib/libpng.a', 'lib/libpng.%s' % SHLIB_EXT,
-              'lib/libpng%s.a' % local_majminver,
-              'lib/libpng%s.%s' % (local_majminver, SHLIB_EXT)],
-    'dirs': ['bin', 'include/libpng%s' % local_majminver, 'share/man'],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/l/libreadline/libreadline-8.1-GCCcore-11.2.0.eb b/Golden_Repo/l/libreadline/libreadline-8.1-GCCcore-11.2.0.eb
deleted file mode 100644
index 1d8d26e4e..000000000
--- a/Golden_Repo/l/libreadline/libreadline-8.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,43 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'libreadline'
-version = '8.1'
-
-homepage = 'https://tiswww.case.edu/php/chet/readline/rltop.html'
-description = """
-The GNU Readline library provides a set of functions for use by applications
-that allow users to edit command lines as they are typed in. Both Emacs and
-vi editing modes are available. The Readline library includes additional
-functions to maintain a list of previously-entered command lines, to recall
-and perhaps reedit those lines, and perform csh-like history expansion on
-previous commands.
-"""
-
-site_contacts = 'sc@fz-juelich.de'
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://ftp.gnu.org/gnu/readline']
-sources = ['readline-%(version)s.tar.gz']
-checksums = ['f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-dependencies = [
-    ('ncurses', '6.2'),
-]
-
-# for the termcap symbols, use EB ncurses
-buildopts = "SHLIB_LIBS='-lncurses'"
-
-sanity_check_paths = {
-    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
-             ['include/readline/%s' % x
-              for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h',
-                        'rlconf.h', 'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs': [],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/l/librosa/librosa-0.9.2-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/l/librosa/librosa-0.9.2-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index ea623f6a0..000000000
--- a/Golden_Repo/l/librosa/librosa-0.9.2-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,41 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'librosa'
-version = '0.9.2'
-
-
-homepage = 'https://librosa.github.io'
-description = "Python module for audio and music processing"
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10'),
-    ('FFmpeg', '4.4.1'),
-    ('matplotlib', '3.4.3'),
-    ('numba', '0.55.1'),
-    ('libsndfile', '1.0.31'),
-    ('scikit-learn', '1.0.1'),
-    ('scikit-image', '0.18.3'),
-]
-
-exts_list = [
-    ('audioread', '2.1.9', {
-        'checksums': ['a3480e42056c8e80a8192a54f6729a280ef66d27782ee11cbd63e9d4d1523089'],
-    }),
-    ('SoundFile', '0.10.3.post1', {
-        'checksums': ['490cff42650733d1832728b937fe99fa1802896f5ef4d61bcf78cf7ebecb107b'],
-    }),
-    ('resampy', '0.2.2', {
-        'checksums': ['62af020d8a6674d8117f62320ce9470437bb1d738a5d06cd55591b69b463929e'],
-    }),
-    (name, version, {
-        'checksums': ['5b576b5efdce428e90bc988bdd5a953d12a727e5f931f30d74c53b63abbe3c89'],
-    }),
-]
-
-use_pip = True
-sanity_pip_check = True
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/l/librsvg/librsvg-2.51.2-GCCcore-11.2.0.eb b/Golden_Repo/l/librsvg/librsvg-2.51.2-GCCcore-11.2.0.eb
deleted file mode 100644
index e805e28e5..000000000
--- a/Golden_Repo/l/librsvg/librsvg-2.51.2-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,45 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'librsvg'
-version = '2.51.2'
-
-homepage = 'https://wiki.gnome.org/action/show/Projects/LibRsvg'
-description = """librsvg is a library to render SVG files using cairo."""
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [
-    'https://download.gnome.org/sources/librsvg/%(version_major_minor)s']
-sources = [SOURCE_TAR_XZ]
-checksums = ['6b80840ef3e4724624e715398bb4470fa68368943cdbd507e681708bbe32b289']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('pkg-config', '0.29.2'),
-    ('GObject-Introspection', '1.68.0'),
-]
-
-dependencies = [
-    ('Gdk-Pixbuf', '2.42.6'),
-    ('libcroco', '0.6.13'),
-    ('Pango', '1.48.8'),
-    ('cairo', '1.16.0'),
-    ('Rust', '1.54.0'),
-]
-
-# This loader wants to install in the directory of Gdk-Pixbuf itself. If we disable it, Gdk-Pixbuf can't manage SVG
-# files, which is bad for creating icons
-# configopts = '--disable-pixbuf-loader'
-
-sanity_check_paths = {
-    'files': ['bin/rsvg-convert', 'lib/librsvg-%%(version_major)s.%s' % SHLIB_EXT, 'lib/librsvg-2.a'],
-    'dirs': ['include/librsvg-2.0', 'share']
-}
-
-modextrapaths = {
-    'GI_TYPELIB_PATH': 'lib/girepository-1.0',
-    'XDG_DATA_DIRS': 'share',
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/l/libsndfile/libsndfile-1.0.31-GCCcore-11.2.0.eb b/Golden_Repo/l/libsndfile/libsndfile-1.0.31-GCCcore-11.2.0.eb
deleted file mode 100644
index c4d476478..000000000
--- a/Golden_Repo/l/libsndfile/libsndfile-1.0.31-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,29 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'libsndfile'
-version = '1.0.31'
-
-homepage = 'http://www.mega-nerd.com/libsndfile'
-description = """Libsndfile is a C library for reading and writing files
-containing sampled sound (such as MS Windows WAV and the Apple/SGI AIFF format)
-through one standard library interface."""
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [
-    'https://github.com/libsndfile/libsndfile/releases/download/%(version)s/']
-sources = [SOURCE_TAR_BZ2]
-checksums = ['a8cfb1c09ea6e90eff4ca87322d4168cdbe5035cb48717b40bf77e751cc02163']
-
-builddependencies = [('binutils', '2.37')]
-
-configopts = '--enable-octave=no'
-
-sanity_check_paths = {
-    'files': ['include/sndfile.h', 'include/sndfile.hh', 'lib/libsndfile.a',
-              'lib/libsndfile.%s' % SHLIB_EXT],
-    'dirs': ['bin'],
-}
-
-moduleclass = 'lib'
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
deleted file mode 100644
index 7b5cad31e..000000000
--- a/Golden_Repo/l/libsodium/libsodium-1.0.18-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,33 +0,0 @@
-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/libspatialindex/libspatialindex-1.9.3-GCCcore-11.2.0.eb b/Golden_Repo/l/libspatialindex/libspatialindex-1.9.3-GCCcore-11.2.0.eb
deleted file mode 100644
index ce651667a..000000000
--- a/Golden_Repo/l/libspatialindex/libspatialindex-1.9.3-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,26 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'libspatialindex'
-version = '1.9.3'
-
-homepage = 'http://libspatialindex.github.io'
-description = """C++ implementation of R*-tree, an MVR-tree and a TPR-tree with C API"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [
-    'https://github.com/libspatialindex/libspatialindex/releases/download/%(version)s/']
-sources = ['spatialindex-src-%(version)s.tar.gz']
-checksums = ['47d8779e32477b330e46b62fb7e62cb812caee5d8e684c35cb635a42a749f3fc']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1'),
-]
-
-sanity_check_paths = {
-    'files': ['lib/libspatialindex.so', 'lib/libspatialindex.%s' % SHLIB_EXT],
-    'dirs': ['include/spatialindex'],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/l/libspng/libspng-0.7.1-GCCcore-11.2.0.eb b/Golden_Repo/l/libspng/libspng-0.7.1-GCCcore-11.2.0.eb
deleted file mode 100644
index 9ca195bdc..000000000
--- a/Golden_Repo/l/libspng/libspng-0.7.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,43 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'libspng'
-version = '0.7.1'
-
-homepage = 'https://libspng.org'
-description = "Simple, modern libpng alternative "
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-github_account = 'randy408'
-source_urls = [GITHUB_SOURCE]
-sources = ['v%(version)s.tar.gz']
-checksums = ['0726a4914ad7155028f3baa94027244d439cd2a2fbe8daf780c2150c4c951d8e']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1'),
-    ('pkg-config', '0.29.2'),
-]
-dependencies = [('zlib', '1.2.11')]
-
-separate_build_dir = True
-configopts = "-DCMAKE_VERBOSE_MAKEFILE=ON "
-
-postinstallcmds = [
-    (
-        'pushd %(installdir)s/lib64/pkgconfig/ && '
-        'cp libspng.pc spng.pc && '
-        'popd'
-    )
-]
-
-sanity_check_paths = {
-    'files': [
-        'include/spng.h',
-        'lib/libspng_static.a', 'lib/libspng.%s' % SHLIB_EXT,
-    ],
-    'dirs': ['include', 'lib'],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/l/libtermkey/libtermkey-0.22-GCCcore-11.2.0.eb b/Golden_Repo/l/libtermkey/libtermkey-0.22-GCCcore-11.2.0.eb
deleted file mode 100644
index 4b7bf1229..000000000
--- a/Golden_Repo/l/libtermkey/libtermkey-0.22-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-# EasyConfig for libtermkey (NeoVim dependency)
-# Copyright 2019-2022 Stepan Nassyr @ Forschungszentrum Juelich
-easyblock = 'ConfigureMake'
-
-name = 'libtermkey'
-version = '0.22'
-
-homepage = 'https://www.leonerd.org.uk/code/libtermkey/'
-description = """This library allows easy processing of keyboard entry from terminal-based
-programs. It handles all the necessary logic to recognise special keys,
-UTF-8 combining, and so on, with a simple interface.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://www.leonerd.org.uk/code/libtermkey/']
-sources = ['%(name)s-%(version)s.tar.gz']
-checksums = ['6945bd3c4aaa83da83d80a045c5563da4edd7d0374c62c0d35aec09eb3014600']
-
-builddependencies = [
-    ('libtool', '2.4.6'),
-    ('binutils', '2.37'),
-]
-
-
-skipsteps = ['configure']
-build_cmd = "make PREFIX=%(installdir)s"
-install_cmd = "make PREFIX=%(installdir)s install"
-
-sanity_check_paths = {
-    'files': ['lib/libtermkey.%s' % SHLIB_EXT,
-              'include/termkey.h'],
-    'dirs': ['lib/pkgconfig'],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/l/libtirpc/libtirpc-1.3.2-GCCcore-11.2.0.eb b/Golden_Repo/l/libtirpc/libtirpc-1.3.2-GCCcore-11.2.0.eb
deleted file mode 100644
index 1721b5f77..000000000
--- a/Golden_Repo/l/libtirpc/libtirpc-1.3.2-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,28 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'libtirpc'
-version = '1.3.2'
-
-homepage = 'https://sourceforge.net/projects/libtirpc/'
-description = "Libtirpc is a port of Suns Transport-Independent RPC library to Linux."
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [SOURCEFORGE_SOURCE]
-sources = [SOURCE_TAR_BZ2]
-checksums = ['e24eb88b8ce7db3b7ca6eb80115dd1284abc5ec32a8deccfed2224fc2532b9fd']
-
-configopts = '--enable-static --enable-shared --disable-gssapi'
-
-builddependencies = [
-    ('binutils', '2.37')
-]
-
-sanity_check_paths = {
-    'files': ['lib/libtirpc.%s' % (x,) for x in ['a', SHLIB_EXT]],
-    'dirs': ['include/tirpc', 'lib'],
-}
-
-modextrapaths = {'CPATH': 'include/tirpc'}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/l/libtool/libtool-2.4.6-GCCcore-11.2.0.eb b/Golden_Repo/l/libtool/libtool-2.4.6-GCCcore-11.2.0.eb
deleted file mode 100644
index 1a51dc796..000000000
--- a/Golden_Repo/l/libtool/libtool-2.4.6-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'libtool'
-version = '2.4.6'
-
-homepage = 'https://www.gnu.org/software/libtool'
-
-description = """
-GNU libtool is a generic library support script. Libtool hides the complexity
-of using shared libraries behind a consistent, portable interface.
-"""
-
-site_contacts = 'sc@fz-juelich.de'
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [GNU_SOURCE]
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('M4', '1.4.19'),
-]
-
-sanity_check_paths = {
-    'files': ['bin/libtool', 'bin/libtoolize', 'lib/libltdl.%s' % SHLIB_EXT],
-    'dirs': ['include/libltdl', 'share/libtool/loaders', 'share/man/man1'],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/l/libtool/libtool-2.4.6.eb b/Golden_Repo/l/libtool/libtool-2.4.6.eb
deleted file mode 100644
index fc147d405..000000000
--- a/Golden_Repo/l/libtool/libtool-2.4.6.eb
+++ /dev/null
@@ -1,27 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'libtool'
-version = '2.4.6'
-
-homepage = 'http://www.gnu.org/software/libtool'
-description = """GNU libtool is a generic library support script. Libtool hides the complexity of using shared libraries
- behind a consistent, portable interface.
-"""
-
-site_contacts = 'sc@fz-juelich.de'
-
-toolchain = SYSTEM
-
-source_urls = [GNU_SOURCE]
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3']
-
-builddependencies = [
-    ('binutils', '2.37')
-]
-
-dependencies = [
-    ('M4', '1.4.19'),
-]
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/l/libunistring/libunistring-0.9.10-GCCcore-11.2.0.eb b/Golden_Repo/l/libunistring/libunistring-0.9.10-GCCcore-11.2.0.eb
deleted file mode 100644
index 742316bf7..000000000
--- a/Golden_Repo/l/libunistring/libunistring-0.9.10-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,31 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'libunistring'
-version = '0.9.10'
-
-homepage = 'https://www.gnu.org/software/libunistring/'
-
-description = """This library provides functions for manipulating Unicode strings and for
- manipulating C strings according to the Unicode standard."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [GNU_SOURCE]
-sources = [SOURCELOWER_TAR_XZ]
-checksums = ['eb8fb2c3e4b6e2d336608377050892b54c3c983b646c561836550863003c05d7']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-parallel = 1
-
-sanity_check_paths = {
-    'files': ['lib/libunistring.a', 'lib/libunistring.%s' % SHLIB_EXT] +
-             ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm',
-                                              'stdio', 'str', 'types', 'wbrk', 'width']],
-    'dirs': ['include/unistring'],
-}
-
-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
deleted file mode 100644
index d7312b13e..000000000
--- a/Golden_Repo/l/libunwind/libunwind-1.5.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,38 +0,0 @@
-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/libuv/libuv-1.44.2-GCCcore-11.2.0.eb b/Golden_Repo/l/libuv/libuv-1.44.2-GCCcore-11.2.0.eb
deleted file mode 100644
index 7a95ad765..000000000
--- a/Golden_Repo/l/libuv/libuv-1.44.2-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,33 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'libuv'
-version = '1.44.2'
-
-homepage = 'https://libuv.org'
-description = "libuv is a multi-platform support library with a focus on asynchronous I/O."
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-github_account = 'libuv'
-source_urls = [GITHUB_SOURCE]
-sources = [
-    {
-        'download_filename': 'v%(version)s.tar.gz',
-        'filename': SOURCELOWER_TAR_GZ
-    }
-]
-checksums = ['e6e2ba8b4c349a4182a33370bb9be5e23c51b32efb9b9e209d0e8556b73a48da']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Autotools', '20210726'),
-]
-
-preconfigopts = './autogen.sh; '
-
-sanity_check_paths = {
-    'files': ['include/uv.h', 'lib/libuv.a', 'lib/libuv.%s' % SHLIB_EXT, 'lib/pkgconfig/libuv.pc'],
-    'dirs': []
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/l/libvdwxc/libvdwxc-0.4.0-gpsmpi-2021b.eb b/Golden_Repo/l/libvdwxc/libvdwxc-0.4.0-gpsmpi-2021b.eb
deleted file mode 100644
index 52b305f6d..000000000
--- a/Golden_Repo/l/libvdwxc/libvdwxc-0.4.0-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,33 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'libvdwxc'
-version = '0.4.0'
-
-homepage = 'https://libvdwxc.org'
-description = """libvdwxc is a general library for evaluating energy and potential for
-exchange-correlation (XC) functionals from the vdW-DF family that can be used with various
-of density functional theory (DFT) codes."""
-
-# FFTW depends on mpi?
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-
-
-source_urls = ['https://launchpad.net/libvdwxc/stable/%(version)s/+download/']
-sources = [SOURCE_TAR_GZ]
-checksums = ['3524feb5bb2be86b4688f71653502146b181e66f3f75b8bdaf23dd1ae4a56b33']
-
-dependencies = [
-    ('FFTW', '3.3.10'),
-]
-
-preconfigopts = 'unset CC && unset FC && '
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in ['libvdwxc_fdtest', 'libvdwxc_maintest',
-                                     'libvdwxc_q0test', 'libvdwxc_q0test2']] +
-    ['lib/lib%s.%s' % (x, y) for x in ['vdwxc', 'vdwxcfort']
-     for y in ['a', SHLIB_EXT]],
-    'dirs': ['include'],
-}
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/l/libvips/libvips-8.13.1-GCCcore-11.2.0.eb b/Golden_Repo/l/libvips/libvips-8.13.1-GCCcore-11.2.0.eb
deleted file mode 100644
index dbffff3be..000000000
--- a/Golden_Repo/l/libvips/libvips-8.13.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,40 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'libvips'
-version = '8.13.1'
-
-homepage = 'https://libvips.github.io/libvips/'
-description = """libvips is a demand-driven, horizontally threaded image processing library."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-github_account = 'libvips'
-source_urls = ['https://github.com/libvips/libvips/releases/download/v%(version)s']
-sources = ['vips-%(version)s.tar.gz']
-checksums = ['ad377b7e561bb2118de9a3864fcaa60c61ba7f47e849f6044d1b339906197702']
-
-builddependencies = [
-    ('pkg-config', '0.29.2'),
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('libpng', '1.6.37'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('LibTIFF', '4.3.0'),
-    ('giflib', '5.2.1'),
-    ('FFTW', '3.3.10', '-nompi'),
-    ('GLib', '2.69.1'),
-    ('expat', '2.4.1'),
-    ('librsvg', '2.51.2'),
-    ('ImageMagick', '7.1.0-13'),
-    ('OpenSlide', '3.4.1'),
-]
-
-sanity_check_paths = {
-    'files': ['bin/vips', 'bin/batch_image_convert', 'bin/vipsthumbnail',
-              'lib/libvips.%s' % SHLIB_EXT],
-    'dirs': ['include/vips']
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/l/libvpx/libvpx-1.11.0-GCCcore-11.2.0.eb b/Golden_Repo/l/libvpx/libvpx-1.11.0-GCCcore-11.2.0.eb
deleted file mode 100644
index 1295f1116..000000000
--- a/Golden_Repo/l/libvpx/libvpx-1.11.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,35 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'libvpx'
-version = '1.11.0'
-
-homepage = 'http://www.webmproject.org'
-description = """VPx are open and royalty free video compression formats owned by Google.
-"""
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/webmproject/libvpx/archive/v%(version)s/']
-sources = ['%(name)s-%(version)s.tar.gz']
-checksums = ['965e51c91ad9851e2337aebcc0f517440c637c506f3a03948062e3d5ea129a83']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('pkg-config', '0.29.2'),
-    ('NASM', '2.15.05'),
-]
-
-
-configopts = '--enable-pic --enable-shared '
-# https://github.com/Xpra-org/xpra/issues/3082
-configopts += '--enable-vp9-highbitdepth'
-
-sanity_check_paths = {
-    # 'lib/libvpx.%s' % SHLIB_EXT],
-    'files': ['bin/vpxdec', 'bin/vpxenc', 'include/vpx/vpx_codec.h', 'lib/libvpx.a'],
-    'dirs': [],
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/l/libvterm/libvterm-0.1.3-GCCcore-11.2.0.eb b/Golden_Repo/l/libvterm/libvterm-0.1.3-GCCcore-11.2.0.eb
deleted file mode 100644
index f05a04ec0..000000000
--- a/Golden_Repo/l/libvterm/libvterm-0.1.3-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,35 +0,0 @@
-# EasyConfig for libvterm (NeoVim dependency)
-# Copyright 2019 Stepan Nassyr @ Forschungszentrum Juelich
-easyblock = 'ConfigureMake'
-
-name = 'libvterm'
-version = '0.1.3'
-
-homepage = 'https://github.com/nvim/libvterm'
-description = """ An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://www.leonerd.org.uk/code/libvterm/']
-sources = ['%(name)s-%(version)s.tar.gz']
-checksums = ['e41724466a4658e0f095e8fc5aeae26026c0726dce98ee71d6920d06f7d78e2b']
-
-builddependencies = [
-    ('libtool', '2.4.6'),
-    ('binutils', '2.37'),
-]
-
-
-skipsteps = ['configure']
-build_cmd = "make PREFIX=%(installdir)s"
-install_cmd = "make PREFIX=%(installdir)s install"
-
-sanity_check_paths = {
-    'files': ['lib/libvterm.%s' % SHLIB_EXT,
-              'include/vterm.h'],
-    'dirs': ['lib/pkgconfig'],
-}
-
-
-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
deleted file mode 100644
index 3f0fd8e30..000000000
--- a/Golden_Repo/l/libwebp/libwebp-1.2.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,38 +0,0 @@
-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.1.1'),
-    ('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/libxc/libxc-5.1.7-GCC-11.2.0.eb b/Golden_Repo/l/libxc/libxc-5.1.7-GCC-11.2.0.eb
deleted file mode 100644
index 66e7b5570..000000000
--- a/Golden_Repo/l/libxc/libxc-5.1.7-GCC-11.2.0.eb
+++ /dev/null
@@ -1,47 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'libxc'
-version = '5.1.7'
-
-homepage = 'https://www.tddft.org/programs/libxc'
-description = """Libxc is a library of exchange-correlation functionals for density-functional theory.
- The aim is to provide a portable, well tested and reliable set of exchange and correlation functionals."""
-
-toolchain = {'name': 'GCC', 'version': '11.2.0'}
-
-source_urls = [
-    'https://www.tddft.org/programs/libxc/down.php?file=%(version)s/']
-sources = [SOURCE_TAR_GZ]
-checksums = ['1a818fdfe5c5f74270bc8ef0c59064e8feebcd66b8f642c08aecc1e7d125be34']
-
-builddependencies = [
-    ('CMake', '3.21.1'),
-    ('Perl', '5.34.0'),
-]
-
-separate_build_dir = True
-
-local_common_configopts = "-DENABLE_FORTRAN=ON -DENABLE_FORTRAN03=ON -DENABLE_XHOST=OFF"
-
-# perform iterative build to get both static and shared libraries
-configopts = [
-    local_common_configopts + ' -DBUILD_SHARED_LIBS=OFF',
-    local_common_configopts + ' -DBUILD_SHARED_LIBS=ON',
-]
-
-parallel = 1
-
-# make sure that built libraries (libxc*.so*) in build directory are picked when running tests
-# this is required when RPATH linking is used
-pretestopts = "export LD_LIBRARY_PATH=%(builddir)s/easybuild_obj:$LD_LIBRARY_PATH && "
-
-runtest = 'test'
-
-sanity_check_paths = {
-    'files': ['bin/xc-info'] +
-             ['lib/libxc%s.%s' % (x, y) for x in ['', 'f03', 'f90']
-              for y in ['a', SHLIB_EXT]],
-    'dirs': ['include', 'lib/pkgconfig', 'share/cmake/Libxc'],
-}
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/l/libxc/libxc-5.1.7-intel-compilers-2021.4.0.eb b/Golden_Repo/l/libxc/libxc-5.1.7-intel-compilers-2021.4.0.eb
deleted file mode 100644
index 4043b4cce..000000000
--- a/Golden_Repo/l/libxc/libxc-5.1.7-intel-compilers-2021.4.0.eb
+++ /dev/null
@@ -1,47 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'libxc'
-version = '5.1.7'
-
-homepage = 'https://www.tddft.org/programs/libxc'
-description = """Libxc is a library of exchange-correlation functionals for density-functional theory.
- The aim is to provide a portable, well tested and reliable set of exchange and correlation functionals."""
-
-toolchain = {'name': 'intel-compilers', 'version': '2021.4.0'}
-
-source_urls = [
-    'https://www.tddft.org/programs/libxc/down.php?file=%(version)s/']
-sources = [SOURCE_TAR_GZ]
-checksums = ['1a818fdfe5c5f74270bc8ef0c59064e8feebcd66b8f642c08aecc1e7d125be34']
-
-builddependencies = [
-    ('CMake', '3.21.1'),
-    ('Perl', '5.34.0'),
-]
-
-separate_build_dir = True
-
-local_common_configopts = "-DENABLE_FORTRAN=ON -DENABLE_FORTRAN03=ON -DENABLE_XHOST=OFF"
-
-# perform iterative build to get both static and shared libraries
-configopts = [
-    local_common_configopts + ' -DBUILD_SHARED_LIBS=OFF',
-    local_common_configopts + ' -DBUILD_SHARED_LIBS=ON',
-]
-
-parallel = 1
-
-# make sure that built libraries (libxc*.so*) in build directory are picked when running tests
-# this is required when RPATH linking is used
-pretestopts = "export LD_LIBRARY_PATH=%(builddir)s/easybuild_obj:$LD_LIBRARY_PATH && "
-
-runtest = 'test'
-
-sanity_check_paths = {
-    'files': ['bin/xc-info'] +
-             ['lib/libxc%s.%s' % (x, y) for x in ['', 'f03', 'f90']
-              for y in ['a', SHLIB_EXT]],
-    'dirs': ['include', 'lib/pkgconfig', 'share/cmake/Libxc'],
-}
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/l/libxml2-python/libxml2-2.9.10-parenthesize-type-checks.patch b/Golden_Repo/l/libxml2-python/libxml2-2.9.10-parenthesize-type-checks.patch
deleted file mode 100644
index 14f5332f9..000000000
--- a/Golden_Repo/l/libxml2-python/libxml2-2.9.10-parenthesize-type-checks.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From edc7b6abb0c125eeb888748c334897f60aab0854 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Fri, 28 Feb 2020 12:48:14 +0100
-Subject: [PATCH] Parenthesize Py<type>_Check() in ifs
-
-In C, if expressions should be parenthesized.
-PyLong_Check, PyUnicode_Check etc. happened to expand to a parenthesized
-expression before, but that's not API to rely on.
-
-Since Python 3.9.0a4 it needs to be parenthesized explicitly.
-
-Fixes https://gitlab.gnome.org/GNOME/libxml2/issues/149
----
- python/libxml.c |  4 ++--
- python/types.c  | 12 ++++++------
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/python/libxml.c b/python/libxml.c
-index bc676c4e..81e709f3 100644
---- a/python/libxml.c
-+++ b/python/libxml.c
-@@ -294,7 +294,7 @@ xmlPythonFileReadRaw (void * context, char * buffer, int len) {
- 	lenread = PyBytes_Size(ret);
- 	data = PyBytes_AsString(ret);
- #ifdef PyUnicode_Check
--    } else if PyUnicode_Check (ret) {
-+    } else if (PyUnicode_Check (ret)) {
- #if PY_VERSION_HEX >= 0x03030000
-         Py_ssize_t size;
- 	const char *tmp;
-@@ -359,7 +359,7 @@ xmlPythonFileRead (void * context, char * buffer, int len) {
- 	lenread = PyBytes_Size(ret);
- 	data = PyBytes_AsString(ret);
- #ifdef PyUnicode_Check
--    } else if PyUnicode_Check (ret) {
-+    } else if (PyUnicode_Check (ret)) {
- #if PY_VERSION_HEX >= 0x03030000
-         Py_ssize_t size;
- 	const char *tmp;
-diff --git a/python/types.c b/python/types.c
-index c2bafeb1..ed284ec7 100644
---- a/python/types.c
-+++ b/python/types.c
-@@ -602,16 +602,16 @@ libxml_xmlXPathObjectPtrConvert(PyObject *obj)
-     if (obj == NULL) {
-         return (NULL);
-     }
--    if PyFloat_Check (obj) {
-+    if (PyFloat_Check (obj)) {
-         ret = xmlXPathNewFloat((double) PyFloat_AS_DOUBLE(obj));
--    } else if PyLong_Check(obj) {
-+    } else if (PyLong_Check(obj)) {
- #ifdef PyLong_AS_LONG
-         ret = xmlXPathNewFloat((double) PyLong_AS_LONG(obj));
- #else
-         ret = xmlXPathNewFloat((double) PyInt_AS_LONG(obj));
- #endif
- #ifdef PyBool_Check
--    } else if PyBool_Check (obj) {
-+    } else if (PyBool_Check (obj)) {
- 
-         if (obj == Py_True) {
-           ret = xmlXPathNewBoolean(1);
-@@ -620,14 +620,14 @@ libxml_xmlXPathObjectPtrConvert(PyObject *obj)
-           ret = xmlXPathNewBoolean(0);
-         }
- #endif
--    } else if PyBytes_Check (obj) {
-+    } else if (PyBytes_Check (obj)) {
-         xmlChar *str;
- 
-         str = xmlStrndup((const xmlChar *) PyBytes_AS_STRING(obj),
-                          PyBytes_GET_SIZE(obj));
-         ret = xmlXPathWrapString(str);
- #ifdef PyUnicode_Check
--    } else if PyUnicode_Check (obj) {
-+    } else if (PyUnicode_Check (obj)) {
- #if PY_VERSION_HEX >= 0x03030000
-         xmlChar *str;
- 	const char *tmp;
-@@ -650,7 +650,7 @@ libxml_xmlXPathObjectPtrConvert(PyObject *obj)
- 	ret = xmlXPathWrapString(str);
- #endif
- #endif
--    } else if PyList_Check (obj) {
-+    } else if (PyList_Check (obj)) {
-         int i;
-         PyObject *node;
-         xmlNodePtr cur;
--- 
-2.24.1
-
diff --git a/Golden_Repo/l/libxml2-python/libxml2-python-2.9.10-GCCcore-11.2.0.eb b/Golden_Repo/l/libxml2-python/libxml2-python-2.9.10-GCCcore-11.2.0.eb
deleted file mode 100644
index 1e1d46621..000000000
--- a/Golden_Repo/l/libxml2-python/libxml2-python-2.9.10-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,54 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'libxml2-python'
-version = '2.9.10'
-
-homepage = 'http://xmlsoft.org/'
-description = """
- Libxml2 is the XML C parser and toolchain developed for the Gnome project
- (but usable outside of the Gnome platform). This is the Python binding."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [
-    'http://xmlsoft.org/sources/',
-    'http://xmlsoft.org/sources/old/'
-]
-sources = ['libxml2-%(version)s.tar.gz']
-patches = [
-    'libxml2-2.9.7_fix-hardcoded-paths.patch',
-    'libxml2-2.9.10-parenthesize-type-checks.patch'  # See https://src.fedoraproject.org/rpms/libxml2/pull-request/9#
-]
-checksums = [
-    'aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f',  # libxml2-2.9.10.tar.gz
-    '3d5651c015fd375d855421983b7d33ffd4af797b7411f46e05cd8c57b210e542',  # libxml2-2.9.7_fix-hardcoded-paths.patch
-    'b63c161e4c8a6f0a65ba091c3d3ed09d3110d21f997ee61077c782b311fd4b33',  # libxml2-2.9.10-parenthesize-type-checks.patch
-]
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('XZ', '5.2.5'),
-    ('Python', '3.9.6'),
-    ('libxml2', version),
-    ('libiconv', '1.16'),
-]
-
-start_dir = 'python'
-
-download_dep_fail = True
-use_pip = True
-sanity_pip_check = True
-
-sanity_check_paths = {
-    'files': [],
-    'dirs': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-options = {'modulename': 'libxml2'}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/l/libxml2/libxml2-2.9.10-GCCcore-11.2.0.eb b/Golden_Repo/l/libxml2/libxml2-2.9.10-GCCcore-11.2.0.eb
deleted file mode 100644
index 73332f9da..000000000
--- a/Golden_Repo/l/libxml2/libxml2-2.9.10-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,30 +0,0 @@
-name = 'libxml2'
-version = '2.9.10'
-
-homepage = 'http://xmlsoft.org/'
-
-description = """
-Libxml2 is the XML C parser and toolchain developed for the Gnome project
-(but usable outside of the Gnome platform).
-"""
-
-site_contacts = 'sc@fz-juelich.de'
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [
-    'http://xmlsoft.org/sources/',
-    'http://xmlsoft.org/sources/old/'
-]
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f']
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [
-    ('XZ', '5.2.5'),
-    ('zlib', '1.2.11'),
-]
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/l/libxslt/libxslt-1.1.34-GCCcore-11.2.0.eb b/Golden_Repo/l/libxslt/libxslt-1.1.34-GCCcore-11.2.0.eb
deleted file mode 100644
index 22a0c0a33..000000000
--- a/Golden_Repo/l/libxslt/libxslt-1.1.34-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,31 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'libxslt'
-version = '1.1.34'
-
-homepage = 'http://xmlsoft.org/'
-description = """Libxslt is the XSLT C library developed for the GNOME project
- (but usable outside of the Gnome platform)."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [
-    'http://xmlsoft.org/sources/',
-    'http://xmlsoft.org/sources/old/'
-]
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f']
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('libxml2', '2.9.10'),
-]
-
-sanity_check_paths = {
-    'files': ['bin/xsltproc', 'include/libxslt/xslt.h', 'lib/%%(name)s.%s' % SHLIB_EXT],
-    'dirs': [],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/l/libxsmm/libxsmm-1.16.3-GCC-11.2.0.eb b/Golden_Repo/l/libxsmm/libxsmm-1.16.3-GCC-11.2.0.eb
deleted file mode 100755
index a975cc19a..000000000
--- a/Golden_Repo/l/libxsmm/libxsmm-1.16.3-GCC-11.2.0.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'libxsmm'
-version = '1.16.3'
-
-homepage = 'https://github.com/hfp/libxsmm'
-description = """LIBXSMM is a library for small dense and small sparse matrix-matrix multiplications
-targeting Intel Architecture (x86)."""
-
-toolchain = {'name': 'GCC', 'version': '11.2.0'}
-
-sources = ['%(version)s.tar.gz']
-source_urls = ['https://github.com/hfp/libxsmm/archive/']
-
-checksums = ['e491ccadebc5cdcd1fc08b5b4509a0aba4e2c096f53d7880062a66b82a0baf84']
-
-dependencies = [
-    ('imkl', '2021.4.0', '', SYSTEM),
-]
-
-# install both static and dynamic version
-installopts = ['PREFIX=%(installdir)s', 'PREFIX=%(installdir)s STATIC=0']
-
-skipsteps = ['configure']
-maxparallel = 1
-
-runtest = "STATIC=0 test"
-
-sanity_check_paths = {
-    'files': ['bin/libxsmm_gemm_generator', 'include/libxsmm.h', 'lib/libxsmm.a', 'lib/libxsmm.%s' % SHLIB_EXT],
-    'dirs': ['share']
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/l/libxsmm/libxsmm-1.16.3-intel-compilers-2021.4.0.eb b/Golden_Repo/l/libxsmm/libxsmm-1.16.3-intel-compilers-2021.4.0.eb
deleted file mode 100755
index 81cedc6e6..000000000
--- a/Golden_Repo/l/libxsmm/libxsmm-1.16.3-intel-compilers-2021.4.0.eb
+++ /dev/null
@@ -1,33 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'libxsmm'
-version = '1.16.3'
-
-homepage = 'https://github.com/hfp/libxsmm'
-description = """LIBXSMM is a library for small dense and small sparse matrix-matrix multiplications
-targeting Intel Architecture (x86)."""
-
-toolchain = {'name': 'intel-compilers', 'version': '2021.4.0'}
-
-sources = ['%(version)s.tar.gz']
-source_urls = ['https://github.com/hfp/libxsmm/archive/']
-checksums = ['e491ccadebc5cdcd1fc08b5b4509a0aba4e2c096f53d7880062a66b82a0baf84']
-
-dependencies = [
-    ('imkl', '2021.4.0', '', SYSTEM),
-]
-
-# install both static and dynamic version
-installopts = ['PREFIX=%(installdir)s', 'PREFIX=%(installdir)s STATIC=0']
-
-skipsteps = ['configure']
-maxparallel = 1
-
-runtest = "STATIC=0 test"
-
-sanity_check_paths = {
-    'files': ['bin/libxsmm_gemm_generator', 'include/libxsmm.h', 'lib/libxsmm.a', 'lib/libxsmm.%s' % SHLIB_EXT],
-    'dirs': ['share']
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/l/libyaml/libyaml-0.2.5-GCCcore-11.2.0.eb b/Golden_Repo/l/libyaml/libyaml-0.2.5-GCCcore-11.2.0.eb
deleted file mode 100644
index 87d72c1f7..000000000
--- a/Golden_Repo/l/libyaml/libyaml-0.2.5-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,23 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'libyaml'
-version = '0.2.5'
-
-homepage = 'https://pyyaml.org/wiki/LibYAML'
-
-description = """LibYAML is a YAML parser and emitter written in C."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://pyyaml.org/download/libyaml/']
-sources = ['yaml-%(version)s.tar.gz']
-checksums = ['c642ae9b75fee120b2d96c712538bd2cf283228d2337df2cf2988e3c02678ef4']
-
-builddependencies = [('binutils', '2.37')]
-
-sanity_check_paths = {
-    'files': ["include/yaml.h", "lib/libyaml.a", "lib/libyaml.%s" % SHLIB_EXT],
-    'dirs': ["lib/pkgconfig"]
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/l/libyuv/libyuv-20210428-GCCcore-11.2.0.eb b/Golden_Repo/l/libyuv/libyuv-20210428-GCCcore-11.2.0.eb
deleted file mode 100644
index 69aed046c..000000000
--- a/Golden_Repo/l/libyuv/libyuv-20210428-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,60 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'libyuv'
-version = '20210428'
-
-homepage = 'https://chromium.googlesource.com/libyuv/libyuv/'
-description = """
-libyuv for colorspace conversion. libyuv is Optimized for SSE2/SSSE3/AVX2 on x86/x64.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-sources = [
-    {
-        'source_urls': ['https://chromium.googlesource.com/libyuv/libyuv/+archive/'],
-        'filename': '%(name)s-eb6e7bb63738e29efd82ea3cf2a115238a89fa51.tar.gz',
-        'download_filename': 'eb6e7bb63738e29efd82ea3cf2a115238a89fa51.tar.gz',
-    }
-]
-# checksum changes with every download
-checksums = ['df3300c3c9d56b5d6b0ef02f330ca508ef4428b1b9af67083201004deb93991a']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1', '', SYSTEM)
-]
-
-separate_build_dir = True
-start_dir = './'
-
-configopts = '-DCMAKE_VERBOSE_MAKEFILE=ON '
-
-postinstallcmds = [
-    (
-        '{ cat >> %(installdir)s/libyuv.pc; } << \'EOF\'\n'
-        'prefix=%(installdir)s\n'
-        'exec_prefix=${prefix}\n'
-        'libdir=${prefix}/lib\n'
-        'includedir=${prefix}/include\n'
-        '\n'
-        'Name: libyuv\n'
-        'Description: YUV conversion and scaling functionality library\n'
-        'Version: 0\n'
-        'Cflags: -I${includedir}\n'
-        'Libs: -L${libdir} -lyuv\n'
-        'EOF'
-    ),
-]
-
-sanity_check_paths = {
-    'files': ['lib/libyuv.a', 'include/libyuv.h'],
-    'dirs': [],
-}
-
-modextrapaths = {
-    'PKG_CONFIG_PATH': ''
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/l/likwid/likwid-5.2.1-GCCcore-11.2.0.eb b/Golden_Repo/l/likwid/likwid-5.2.1-GCCcore-11.2.0.eb
deleted file mode 100644
index 289ac5b0d..000000000
--- a/Golden_Repo/l/likwid/likwid-5.2.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,50 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'likwid'
-version = '5.2.1'
-
-homepage = 'https://github.com/RRZE-HPC/likwid'
-
-description = """
-Likwid stands for Like I knew what I am doing. This project contributes easy
-to use command line tools for Linux to support programmers in developing high
-performance multi threaded programs.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/RRZE-HPC/likwid/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['1b8e668da117f24302a344596336eca2c69d2bc2f49fa228ca41ea0688f6cbc2']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Perl', '5.34.0'),
-]
-
-skipsteps = ['configure']
-
-# include_GCC.mk is using ifort by default.
-# Changing it to gfortran, to be consistent with GCCcore toolchain
-prebuildopts = """sed -i 's@FC  = ifort@FC  = gfortran@g' make/include_GCC.mk && """
-prebuildopts += """sed -i 's@FCFLAGS  = -module ./  # ifort@FCFLAGS  = -J ./  -fsyntax-only  #gfortran@g' """
-prebuildopts += """ make/include_GCC.mk && """
-
-buildopts = 'CC="$CC" CFLAGS="$CFLAGS -std=c99" PREFIX=%(installdir)s BUILDFREQ="" ACCESSMODE=perf_event '
-buildopts += 'FORTRAN_INTERFACE=true '
-buildopts += 'CFG_FILE_PATH=%(installdir)s/etc/likwid.cfg  TOPO_FILE_PATH=%(installdir)s/etc/likwid_topo.cfg '
-
-maxparallel = 1
-
-installopts = buildopts + 'INSTALL_CHOWN="" '
-
-sanity_check_paths = {
-    'files': ['bin/likwid-memsweeper', 'bin/likwid-mpirun', 'bin/likwid-perfctr',
-              'bin/likwid-perfscope', 'bin/likwid-pin', 'bin/likwid-powermeter',
-              'bin/likwid-topology', 'lib/liblikwidpin.%s' % SHLIB_EXT,
-              'lib/liblikwid.%s' % SHLIB_EXT],
-    'dirs': ['man/man1']
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/l/lpeg/lpeg-1.0.2-GCCcore-11.2.0.eb b/Golden_Repo/l/lpeg/lpeg-1.0.2-GCCcore-11.2.0.eb
deleted file mode 100644
index bd9860ab1..000000000
--- a/Golden_Repo/l/lpeg/lpeg-1.0.2-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,57 +0,0 @@
-# EasyConfig for lpeg (NeoVim dependency)
-# Copyright 2019-2022 Stepan Nassyr @ Forschungszentrum Juelich
-easyblock = 'MakeCp'
-
-name = 'lpeg'
-version = '1.0.2'
-
-homepage = 'http://www.inf.puc-rio.br/~roberto/lpeg/'
-description = """LPeg is a new pattern-matching library for Lua, based on Parsing Expression Grammars (PEGs). 
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['http://www.inf.puc-rio.br/~roberto/%(name)s/']
-sources = ['%(name)s-%(version)s.tar.gz']
-checksums = ['48d66576051b6c78388faad09b70493093264588fcd0f258ddaab1cdd4a15ffe']
-
-builddependencies = [
-    ('LuaJIT2-OpenResty', '2.1-20220411'),
-    ('binutils', '2.37'),
-]
-
-prebuildopts = (
-    "sed 's/^CFLAGS =/CFLAGS +=/' -i \"%(builddir)s/%(name)s-%(version)s\"/makefile &&"
-    "sed 's/^LUADIR =/LUADIR ?=/' -i \"%(builddir)s/%(name)s-%(version)s\"/makefile &&"
-    "sed 's/^COPT =/# COPT =/' -i \"%(builddir)s/%(name)s-%(version)s\"/makefile && "
-)
-build_cmd = "make LUADIR=$EBROOTLUAJIT2MINOPENRESTY/include/luajit-2.1/ DLLFLAGS=-lluajit-5.1"
-
-files_to_copy = [
-    (['%(name)s.so'], 'lib/lua/5.1/'),
-    (['re.lua'], 'share/lua/5.1/')
-]
-
-sanity_check_paths = {
-    'files': ['lib/lua/5.1/%(name)s.so',
-              'share/lua/5.1/re.lua'],
-    'dirs': [],
-}
-
-modluafooter = """
-libmpack_lua_root = os.getenv("EBROOTLPEG")
-lua_cpath         = os.getenv("LUA_CPATH")
-lua_path          = os.getenv("LUA_PATH")
-if nil == lua_cpath then
-  setenv("LUA_CPATH", libmpack_lua_root .. "/lib/lua/5.1/?.so;;")
-else
-  prepend_path("LUA_CPATH", libmpack_lua_root .. "/lib/lua/5.1/?.so", ";")
-end
-if nil == lua_path then
-  setenv("LUA_PATH", libmpack_lua_root .. "/share/lua/5.1/?.lua;;")
-else
-  prepend_path("LUA_PATH", libmpack_lua_root .. "/share/lua/5.1/?.lua", ";")
-end
-"""
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/l/luv/compat-5.3.c b/Golden_Repo/l/luv/compat-5.3.c
deleted file mode 100644
index 42b0a4bb5..000000000
--- a/Golden_Repo/l/luv/compat-5.3.c
+++ /dev/null
@@ -1,948 +0,0 @@
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-#include "compat-5.3.h"
-
-/* don't compile it again if it already is included via compat53.h */
-#ifndef COMPAT53_C_
-#define COMPAT53_C_
-
-
-
-/* definitions for Lua 5.1 only */
-#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM == 501
-
-#ifndef COMPAT53_FOPEN_NO_LOCK
-#  if defined(_MSC_VER)
-#    define COMPAT53_FOPEN_NO_LOCK 1
-#  else /* otherwise */
-#    define COMPAT53_FOPEN_NO_LOCK 0
-#  endif /* VC++ only so far */
-#endif /* No-lock fopen_s usage if possible */
-
-#if defined(_MSC_VER) && COMPAT53_FOPEN_NO_LOCK
-#  include <share.h>
-#endif /* VC++ _fsopen for share-allowed file read */
-
-#ifndef COMPAT53_HAVE_STRERROR_R
-#  if (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L) || \
-      (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600) || \
-      defined(__APPLE__)
-#    define COMPAT53_HAVE_STRERROR_R 1
-#  else /* none of the defines matched: define to 0 */
-#    define COMPAT53_HAVE_STRERROR_R 0
-#  endif /* have strerror_r of some form */
-#endif /* strerror_r */
-
-#ifndef COMPAT53_HAVE_STRERROR_S
-#  if defined(_MSC_VER) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && \
-      defined(__STDC_LIB_EXT1__) && __STDC_LIB_EXT1__)
-#    define COMPAT53_HAVE_STRERROR_S 1
-#  else /* not VC++ or C11 */
-#    define COMPAT53_HAVE_STRERROR_S 0
-#  endif /* strerror_s from VC++ or C11 */
-#endif /* strerror_s */
-
-#ifndef COMPAT53_LUA_FILE_BUFFER_SIZE
-#  define COMPAT53_LUA_FILE_BUFFER_SIZE 4096
-#endif /* Lua File Buffer Size */
-
-
-static char* compat53_strerror (int en, char* buff, size_t sz) {
-#if COMPAT53_HAVE_STRERROR_R
-  /* use strerror_r here, because it's available on these specific platforms */
-  if (sz > 0) {
-    buff[0] = '\0';
-    /* we don't care whether the GNU version or the XSI version is used: */
-    if (strerror_r(en, buff, sz)) {
-      /* Yes, we really DO want to ignore the return value!
-       * GCC makes that extra hard, not even a (void) cast will do. */
-    }
-    if (buff[0] == '\0') {
-      /* Buffer is unchanged, so we probably have called GNU strerror_r which
-       * returned a static constant string. Chances are that strerror will
-       * return the same static constant string and therefore be thread-safe. */
-      return strerror(en);
-    }
-  }
-  return buff; /* sz is 0 *or* strerror_r wrote into the buffer */
-#elif COMPAT53_HAVE_STRERROR_S
-  /* for MSVC and other C11 implementations, use strerror_s since it's
-   * provided by default by the libraries */
-  strerror_s(buff, sz, en);
-  return buff;
-#else
-  /* fallback, but strerror is not guaranteed to be threadsafe due to modifying
-   * errno itself and some impls not locking a static buffer for it ... but most
-   * known systems have threadsafe errno: this might only change if the locale
-   * is changed out from under someone while this function is being called */
-  (void)buff;
-  (void)sz;
-  return strerror(en);
-#endif
-}
-
-
-COMPAT53_API int lua_absindex (lua_State *L, int i) {
-  if (i < 0 && i > LUA_REGISTRYINDEX)
-    i += lua_gettop(L) + 1;
-  return i;
-}
-
-
-static void compat53_call_lua (lua_State *L, char const code[], size_t len,
-                               int nargs, int nret) {
-  lua_rawgetp(L, LUA_REGISTRYINDEX, (void*)code);
-  if (lua_type(L, -1) != LUA_TFUNCTION) {
-    lua_pop(L, 1);
-    if (luaL_loadbuffer(L, code, len, "=none"))
-      lua_error(L);
-    lua_pushvalue(L, -1);
-    lua_rawsetp(L, LUA_REGISTRYINDEX, (void*)code);
-  }
-  lua_insert(L, -nargs-1);
-  lua_call(L, nargs, nret);
-}
-
-
-static const char compat53_arith_code[] =
-  "local op,a,b=...\n"
-  "if op==0 then return a+b\n"
-  "elseif op==1 then return a-b\n"
-  "elseif op==2 then return a*b\n"
-  "elseif op==3 then return a/b\n"
-  "elseif op==4 then return a%b\n"
-  "elseif op==5 then return a^b\n"
-  "elseif op==6 then return -a\n"
-  "end\n";
-
-COMPAT53_API void lua_arith (lua_State *L, int op) {
-  if (op < LUA_OPADD || op > LUA_OPUNM)
-    luaL_error(L, "invalid 'op' argument for lua_arith");
-  luaL_checkstack(L, 5, "not enough stack slots");
-  if (op == LUA_OPUNM)
-    lua_pushvalue(L, -1);
-  lua_pushnumber(L, op);
-  lua_insert(L, -3);
-  compat53_call_lua(L, compat53_arith_code,
-                    sizeof(compat53_arith_code)-1, 3, 1);
-}
-
-
-static const char compat53_compare_code[] =
-  "local a,b=...\n"
-  "return a<=b\n";
-
-COMPAT53_API int lua_compare (lua_State *L, int idx1, int idx2, int op) {
-  int result = 0;
-  switch (op) {
-    case LUA_OPEQ:
-      return lua_equal(L, idx1, idx2);
-    case LUA_OPLT:
-      return lua_lessthan(L, idx1, idx2);
-    case LUA_OPLE:
-      luaL_checkstack(L, 5, "not enough stack slots");
-      idx1 = lua_absindex(L, idx1);
-      idx2 = lua_absindex(L, idx2);
-      lua_pushvalue(L, idx1);
-      lua_pushvalue(L, idx2);
-      compat53_call_lua(L, compat53_compare_code,
-                        sizeof(compat53_compare_code)-1, 2, 1);
-      result = lua_toboolean(L, -1);
-      lua_pop(L, 1);
-      return result;
-    default:
-      luaL_error(L, "invalid 'op' argument for lua_compare");
-  }
-  return 0;
-}
-
-
-COMPAT53_API void lua_copy (lua_State *L, int from, int to) {
-  int abs_to = lua_absindex(L, to);
-  luaL_checkstack(L, 1, "not enough stack slots");
-  lua_pushvalue(L, from);
-  lua_replace(L, abs_to);
-}
-
-
-COMPAT53_API void lua_len (lua_State *L, int i) {
-  switch (lua_type(L, i)) {
-    case LUA_TSTRING:
-      lua_pushnumber(L, (lua_Number)lua_objlen(L, i));
-      break;
-    case LUA_TTABLE:
-      if (!luaL_callmeta(L, i, "__len"))
-        lua_pushnumber(L, (lua_Number)lua_objlen(L, i));
-      break;
-    case LUA_TUSERDATA:
-      if (luaL_callmeta(L, i, "__len"))
-        break;
-      /* FALLTHROUGH */
-    default:
-      luaL_error(L, "attempt to get length of a %s value",
-                 lua_typename(L, lua_type(L, i)));
-  }
-}
-
-
-COMPAT53_API int lua_rawgetp (lua_State *L, int i, const void *p) {
-  int abs_i = lua_absindex(L, i);
-  lua_pushlightuserdata(L, (void*)p);
-  lua_rawget(L, abs_i);
-  return lua_type(L, -1);
-}
-
-COMPAT53_API void lua_rawsetp (lua_State *L, int i, const void *p) {
-  int abs_i = lua_absindex(L, i);
-  luaL_checkstack(L, 1, "not enough stack slots");
-  lua_pushlightuserdata(L, (void*)p);
-  lua_insert(L, -2);
-  lua_rawset(L, abs_i);
-}
-
-
-COMPAT53_API lua_Number lua_tonumberx (lua_State *L, int i, int *isnum) {
-  lua_Number n = lua_tonumber(L, i);
-  if (isnum != NULL) {
-    *isnum = (n != 0 || lua_isnumber(L, i));
-  }
-  return n;
-}
-
-
-COMPAT53_API void luaL_checkversion (lua_State *L) {
-  (void)L;
-}
-
-
-COMPAT53_API void luaL_checkstack (lua_State *L, int sp, const char *msg) {
-  if (!lua_checkstack(L, sp+LUA_MINSTACK)) {
-    if (msg != NULL)
-      luaL_error(L, "stack overflow (%s)", msg);
-    else {
-      lua_pushliteral(L, "stack overflow");
-      lua_error(L);
-    }
-  }
-}
-
-
-COMPAT53_API int luaL_getsubtable (lua_State *L, int i, const char *name) {
-  int abs_i = lua_absindex(L, i);
-  luaL_checkstack(L, 3, "not enough stack slots");
-  lua_pushstring(L, name);
-  lua_gettable(L, abs_i);
-  if (lua_istable(L, -1))
-    return 1;
-  lua_pop(L, 1);
-  lua_newtable(L);
-  lua_pushstring(L, name);
-  lua_pushvalue(L, -2);
-  lua_settable(L, abs_i);
-  return 0;
-}
-
-
-COMPAT53_API lua_Integer luaL_len (lua_State *L, int i) {
-  lua_Integer res = 0;
-  int isnum = 0;
-  luaL_checkstack(L, 1, "not enough stack slots");
-  lua_len(L, i);
-  res = lua_tointegerx(L, -1, &isnum);
-  lua_pop(L, 1);
-  if (!isnum)
-    luaL_error(L, "object length is not an integer");
-  return res;
-}
-
-
-COMPAT53_API void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) {
-  luaL_checkstack(L, nup+1, "too many upvalues");
-  for (; l->name != NULL; l++) {  /* fill the table with given functions */
-    int i;
-    lua_pushstring(L, l->name);
-    for (i = 0; i < nup; i++)  /* copy upvalues to the top */
-      lua_pushvalue(L, -(nup + 1));
-    lua_pushcclosure(L, l->func, nup);  /* closure with those upvalues */
-    lua_settable(L, -(nup + 3)); /* table must be below the upvalues, the name and the closure */
-  }
-  lua_pop(L, nup);  /* remove upvalues */
-}
-
-
-COMPAT53_API void luaL_setmetatable (lua_State *L, const char *tname) {
-  luaL_checkstack(L, 1, "not enough stack slots");
-  luaL_getmetatable(L, tname);
-  lua_setmetatable(L, -2);
-}
-
-
-COMPAT53_API void *luaL_testudata (lua_State *L, int i, const char *tname) {
-  void *p = lua_touserdata(L, i);
-  luaL_checkstack(L, 2, "not enough stack slots");
-  if (p == NULL || !lua_getmetatable(L, i))
-    return NULL;
-  else {
-    int res = 0;
-    luaL_getmetatable(L, tname);
-    res = lua_rawequal(L, -1, -2);
-    lua_pop(L, 2);
-    if (!res)
-      p = NULL;
-  }
-  return p;
-}
-
-
-static int compat53_countlevels (lua_State *L) {
-  lua_Debug ar;
-  int li = 1, le = 1;
-  /* find an upper bound */
-  while (lua_getstack(L, le, &ar)) { li = le; le *= 2; }
-  /* do a binary search */
-  while (li < le) {
-    int m = (li + le)/2;
-    if (lua_getstack(L, m, &ar)) li = m + 1;
-    else le = m;
-  }
-  return le - 1;
-}
-
-static int compat53_findfield (lua_State *L, int objidx, int level) {
-  if (level == 0 || !lua_istable(L, -1))
-    return 0;  /* not found */
-  lua_pushnil(L);  /* start 'next' loop */
-  while (lua_next(L, -2)) {  /* for each pair in table */
-    if (lua_type(L, -2) == LUA_TSTRING) {  /* ignore non-string keys */
-      if (lua_rawequal(L, objidx, -1)) {  /* found object? */
-        lua_pop(L, 1);  /* remove value (but keep name) */
-        return 1;
-      }
-      else if (compat53_findfield(L, objidx, level - 1)) {  /* try recursively */
-        lua_remove(L, -2);  /* remove table (but keep name) */
-        lua_pushliteral(L, ".");
-        lua_insert(L, -2);  /* place '.' between the two names */
-        lua_concat(L, 3);
-        return 1;
-      }
-    }
-    lua_pop(L, 1);  /* remove value */
-  }
-  return 0;  /* not found */
-}
-
-static int compat53_pushglobalfuncname (lua_State *L, lua_Debug *ar) {
-  int top = lua_gettop(L);
-  lua_getinfo(L, "f", ar);  /* push function */
-  lua_pushvalue(L, LUA_GLOBALSINDEX);
-  if (compat53_findfield(L, top + 1, 2)) {
-    lua_copy(L, -1, top + 1);  /* move name to proper place */
-    lua_pop(L, 2);  /* remove pushed values */
-    return 1;
-  }
-  else {
-    lua_settop(L, top);  /* remove function and global table */
-    return 0;
-  }
-}
-
-static void compat53_pushfuncname (lua_State *L, lua_Debug *ar) {
-  if (*ar->namewhat != '\0')  /* is there a name? */
-    lua_pushfstring(L, "function " LUA_QS, ar->name);
-  else if (*ar->what == 'm')  /* main? */
-      lua_pushliteral(L, "main chunk");
-  else if (*ar->what == 'C') {
-    if (compat53_pushglobalfuncname(L, ar)) {
-      lua_pushfstring(L, "function " LUA_QS, lua_tostring(L, -1));
-      lua_remove(L, -2);  /* remove name */
-    }
-    else
-      lua_pushliteral(L, "?");
-  }
-  else
-    lua_pushfstring(L, "function <%s:%d>", ar->short_src, ar->linedefined);
-}
-
-#define COMPAT53_LEVELS1 12  /* size of the first part of the stack */
-#define COMPAT53_LEVELS2 10  /* size of the second part of the stack */
-
-COMPAT53_API void luaL_traceback (lua_State *L, lua_State *L1,
-                                  const char *msg, int level) {
-  lua_Debug ar;
-  int top = lua_gettop(L);
-  int numlevels = compat53_countlevels(L1);
-  int mark = (numlevels > COMPAT53_LEVELS1 + COMPAT53_LEVELS2) ? COMPAT53_LEVELS1 : 0;
-  if (msg) lua_pushfstring(L, "%s\n", msg);
-  lua_pushliteral(L, "stack traceback:");
-  while (lua_getstack(L1, level++, &ar)) {
-    if (level == mark) {  /* too many levels? */
-      lua_pushliteral(L, "\n\t...");  /* add a '...' */
-      level = numlevels - COMPAT53_LEVELS2;  /* and skip to last ones */
-    }
-    else {
-      lua_getinfo(L1, "Slnt", &ar);
-      lua_pushfstring(L, "\n\t%s:", ar.short_src);
-      if (ar.currentline > 0)
-        lua_pushfstring(L, "%d:", ar.currentline);
-      lua_pushliteral(L, " in ");
-      compat53_pushfuncname(L, &ar);
-      lua_concat(L, lua_gettop(L) - top);
-    }
-  }
-  lua_concat(L, lua_gettop(L) - top);
-}
-
-
-COMPAT53_API int luaL_fileresult (lua_State *L, int stat, const char *fname) {
-  const char *serr = NULL;
-  int en = errno;  /* calls to Lua API may change this value */
-  char buf[512] = { 0 };
-  if (stat) {
-    lua_pushboolean(L, 1);
-    return 1;
-  }
-  else {
-    lua_pushnil(L);
-    serr = compat53_strerror(en, buf, sizeof(buf));
-    if (fname)
-      lua_pushfstring(L, "%s: %s", fname, serr);
-    else
-      lua_pushstring(L, serr);
-    lua_pushnumber(L, (lua_Number)en);
-    return 3;
-  }
-}
-
-
-static int compat53_checkmode (lua_State *L, const char *mode, const char *modename, int err) {
-  if (mode && strchr(mode, modename[0]) == NULL) {
-    lua_pushfstring(L, "attempt to load a %s chunk (mode is '%s')", modename, mode);
-    return err;
-  }
-  return LUA_OK;
-}
-
-
-typedef struct {
-  lua_Reader reader;
-  void *ud;
-  int has_peeked_data;
-  const char *peeked_data;
-  size_t peeked_data_size;
-} compat53_reader_data;
-
-
-static const char *compat53_reader (lua_State *L, void *ud, size_t *size) {
-  compat53_reader_data *data = (compat53_reader_data *)ud;
-  if (data->has_peeked_data) {
-    data->has_peeked_data = 0;
-    *size = data->peeked_data_size;
-    return data->peeked_data;
-  } else
-    return data->reader(L, data->ud, size);
-}
-
-
-COMPAT53_API int lua_load (lua_State *L, lua_Reader reader, void *data, const char *source, const char *mode) {
-  int status = LUA_OK;
-  compat53_reader_data compat53_data = { 0, NULL, 1, 0, 0 };
-  compat53_data.reader = reader;
-  compat53_data.ud = data;
-  compat53_data.peeked_data = reader(L, data, &(compat53_data.peeked_data_size));
-  if (compat53_data.peeked_data && compat53_data.peeked_data_size &&
-      compat53_data.peeked_data[0] == LUA_SIGNATURE[0]) /* binary file? */
-      status = compat53_checkmode(L, mode, "binary", LUA_ERRSYNTAX);
-  else
-      status = compat53_checkmode(L, mode, "text", LUA_ERRSYNTAX);
-  if (status != LUA_OK)
-    return status;
-  /* we need to call the original 5.1 version of lua_load! */
-#undef lua_load
-  return lua_load(L, compat53_reader, &compat53_data, source);
-#define lua_load COMPAT53_CONCAT(COMPAT53_PREFIX, _load_53)
-}
-
-
-typedef struct {
-  int n;  /* number of pre-read characters */
-  FILE *f;  /* file being read */
-  char buff[COMPAT53_LUA_FILE_BUFFER_SIZE];  /* area for reading file */
-} compat53_LoadF;
-
-
-static const char *compat53_getF (lua_State *L, void *ud, size_t *size) {
-  compat53_LoadF *lf = (compat53_LoadF *)ud;
-  (void)L;  /* not used */
-  if (lf->n > 0) {  /* are there pre-read characters to be read? */
-    *size = lf->n;  /* return them (chars already in buffer) */
-    lf->n = 0;  /* no more pre-read characters */
-  }
-  else {  /* read a block from file */
-    /* 'fread' can return > 0 *and* set the EOF flag. If next call to
-       'compat53_getF' called 'fread', it might still wait for user input.
-       The next check avoids this problem. */
-    if (feof(lf->f)) return NULL;
-    *size = fread(lf->buff, 1, sizeof(lf->buff), lf->f);  /* read block */
-  }
-  return lf->buff;
-}
-
-
-static int compat53_errfile (lua_State *L, const char *what, int fnameindex) {
-  char buf[512] = {0};
-  const char *serr = compat53_strerror(errno, buf, sizeof(buf));
-  const char *filename = lua_tostring(L, fnameindex) + 1;
-  lua_pushfstring(L, "cannot %s %s: %s", what, filename, serr);
-  lua_remove(L, fnameindex);
-  return LUA_ERRFILE;
-}
-
-
-static int compat53_skipBOM (compat53_LoadF *lf) {
-  const char *p = "\xEF\xBB\xBF";  /* UTF-8 BOM mark */
-  int c;
-  lf->n = 0;
-  do {
-    c = getc(lf->f);
-    if (c == EOF || c != *(const unsigned char *)p++) return c;
-    lf->buff[lf->n++] = (char)c;  /* to be read by the parser */
-  } while (*p != '\0');
-  lf->n = 0;  /* prefix matched; discard it */
-  return getc(lf->f);  /* return next character */
-}
-
-
-/*
-** reads the first character of file 'f' and skips an optional BOM mark
-** in its beginning plus its first line if it starts with '#'. Returns
-** true if it skipped the first line.  In any case, '*cp' has the
-** first "valid" character of the file (after the optional BOM and
-** a first-line comment).
-*/
-static int compat53_skipcomment (compat53_LoadF *lf, int *cp) {
-  int c = *cp = compat53_skipBOM(lf);
-  if (c == '#') {  /* first line is a comment (Unix exec. file)? */
-    do {  /* skip first line */
-      c = getc(lf->f);
-    } while (c != EOF && c != '\n');
-    *cp = getc(lf->f);  /* skip end-of-line, if present */
-    return 1;  /* there was a comment */
-  }
-  else return 0;  /* no comment */
-}
-
-
-COMPAT53_API int luaL_loadfilex (lua_State *L, const char *filename, const char *mode) {
-  compat53_LoadF lf;
-  int status, readstatus;
-  int c;
-  int fnameindex = lua_gettop(L) + 1;  /* index of filename on the stack */
-  if (filename == NULL) {
-    lua_pushliteral(L, "=stdin");
-    lf.f = stdin;
-  }
-  else {
-    lua_pushfstring(L, "@%s", filename);
-#if defined(_MSC_VER)
-    /* This code is here to stop a deprecation error that stops builds
-     * if a certain macro is defined. While normally not caring would
-     * be best, some header-only libraries and builds can't afford to
-     * dictate this to the user. A quick check shows that fopen_s this
-     * goes back to VS 2005, and _fsopen goes back to VS 2003 .NET,
-     * possibly even before that so we don't need to do any version
-     * number checks, since this has been there since forever.  */
-
-    /* TO USER: if you want the behavior of typical fopen_s/fopen,
-     * which does lock the file on VC++, define the macro used below to 0 */
-#if COMPAT53_FOPEN_NO_LOCK
-    lf.f = _fsopen(filename, "r", _SH_DENYNO); /* do not lock the file in any way */
-    if (lf.f == NULL)
-      return compat53_errfile(L, "open", fnameindex);
-#else /* use default locking version */
-    if (fopen_s(&lf.f, filename, "r") != 0)
-      return compat53_errfile(L, "open", fnameindex);
-#endif /* Locking vs. No-locking fopen variants */
-#else
-    lf.f = fopen(filename, "r"); /* default stdlib doesn't forcefully lock files here */
-    if (lf.f == NULL) return compat53_errfile(L, "open", fnameindex);
-#endif
-  }
-  if (compat53_skipcomment(&lf, &c))  /* read initial portion */
-    lf.buff[lf.n++] = '\n';  /* add line to correct line numbers */
-  if (c == LUA_SIGNATURE[0] && filename) {  /* binary file? */
-#if defined(_MSC_VER)
-    if (freopen_s(&lf.f, filename, "rb", lf.f) != 0)
-      return compat53_errfile(L, "reopen", fnameindex);
-#else
-    lf.f = freopen(filename, "rb", lf.f);  /* reopen in binary mode */
-    if (lf.f == NULL) return compat53_errfile(L, "reopen", fnameindex);
-#endif
-    compat53_skipcomment(&lf, &c);  /* re-read initial portion */
-  }
-  if (c != EOF)
-    lf.buff[lf.n++] = (char)c;  /* 'c' is the first character of the stream */
-  status = lua_load(L, &compat53_getF, &lf, lua_tostring(L, -1), mode);
-  readstatus = ferror(lf.f);
-  if (filename) fclose(lf.f);  /* close file (even in case of errors) */
-  if (readstatus) {
-    lua_settop(L, fnameindex);  /* ignore results from 'lua_load' */
-    return compat53_errfile(L, "read", fnameindex);
-  }
-  lua_remove(L, fnameindex);
-  return status;
-}
-
-
-COMPAT53_API int luaL_loadbufferx (lua_State *L, const char *buff, size_t sz, const char *name, const char *mode) {
-  int status = LUA_OK;
-  if (sz > 0 && buff[0] == LUA_SIGNATURE[0]) {
-    status = compat53_checkmode(L, mode, "binary", LUA_ERRSYNTAX);
-  }
-  else {
-    status = compat53_checkmode(L, mode, "text", LUA_ERRSYNTAX);
-  }
-  if (status != LUA_OK)
-    return status;
-  return luaL_loadbuffer(L, buff, sz, name);
-}
-
-
-#if !defined(l_inspectstat) && \
-    (defined(unix) || defined(__unix) || defined(__unix__) || \
-     defined(__TOS_AIX__) || defined(_SYSTYPE_BSD) || \
-     (defined(__APPLE__) && defined(__MACH__)))
-/* some form of unix; check feature macros in unistd.h for details */
-#  include <unistd.h>
-/* check posix version; the relevant include files and macros probably
- * were available before 2001, but I'm not sure */
-#  if defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L
-#    include <sys/wait.h>
-#    define l_inspectstat(stat,what) \
-  if (WIFEXITED(stat)) { stat = WEXITSTATUS(stat); } \
-  else if (WIFSIGNALED(stat)) { stat = WTERMSIG(stat); what = "signal"; }
-#  endif
-#endif
-
-/* provide default (no-op) version */
-#if !defined(l_inspectstat)
-#  define l_inspectstat(stat,what) ((void)0)
-#endif
-
-
-COMPAT53_API int luaL_execresult (lua_State *L, int stat) {
-  const char *what = "exit";
-  if (stat == -1)
-    return luaL_fileresult(L, 0, NULL);
-  else {
-    l_inspectstat(stat, what);
-    if (*what == 'e' && stat == 0)
-      lua_pushboolean(L, 1);
-    else
-      lua_pushnil(L);
-    lua_pushstring(L, what);
-    lua_pushinteger(L, stat);
-    return 3;
-  }
-}
-
-
-COMPAT53_API void luaL_buffinit (lua_State *L, luaL_Buffer_53 *B) {
-  /* make it crash if used via pointer to a 5.1-style luaL_Buffer */
-  B->b.p = NULL;
-  B->b.L = NULL;
-  B->b.lvl = 0;
-  /* reuse the buffer from the 5.1-style luaL_Buffer though! */
-  B->ptr = B->b.buffer;
-  B->capacity = LUAL_BUFFERSIZE;
-  B->nelems = 0;
-  B->L2 = L;
-}
-
-
-COMPAT53_API char *luaL_prepbuffsize (luaL_Buffer_53 *B, size_t s) {
-  if (B->capacity - B->nelems < s) { /* needs to grow */
-    char* newptr = NULL;
-    size_t newcap = B->capacity * 2;
-    if (newcap - B->nelems < s)
-      newcap = B->nelems + s;
-    if (newcap < B->capacity) /* overflow */
-      luaL_error(B->L2, "buffer too large");
-    newptr = (char*)lua_newuserdata(B->L2, newcap);
-    memcpy(newptr, B->ptr, B->nelems);
-    if (B->ptr != B->b.buffer)
-      lua_replace(B->L2, -2); /* remove old buffer */
-    B->ptr = newptr;
-    B->capacity = newcap;
-  }
-  return B->ptr+B->nelems;
-}
-
-
-COMPAT53_API void luaL_addlstring (luaL_Buffer_53 *B, const char *s, size_t l) {
-  memcpy(luaL_prepbuffsize(B, l), s, l);
-  luaL_addsize(B, l);
-}
-
-
-COMPAT53_API void luaL_addvalue (luaL_Buffer_53 *B) {
-  size_t len = 0;
-  const char *s = lua_tolstring(B->L2, -1, &len);
-  if (!s)
-    luaL_error(B->L2, "cannot convert value to string");
-  if (B->ptr != B->b.buffer)
-    lua_insert(B->L2, -2); /* userdata buffer must be at stack top */
-  luaL_addlstring(B, s, len);
-  lua_remove(B->L2, B->ptr != B->b.buffer ? -2 : -1);
-}
-
-
-void luaL_pushresult (luaL_Buffer_53 *B) {
-  lua_pushlstring(B->L2, B->ptr, B->nelems);
-  if (B->ptr != B->b.buffer)
-    lua_replace(B->L2, -2); /* remove userdata buffer */
-}
-
-
-#endif /* Lua 5.1 */
-
-
-
-/* definitions for Lua 5.1 and Lua 5.2 */
-#if defined( LUA_VERSION_NUM ) && LUA_VERSION_NUM <= 502
-
-
-COMPAT53_API int lua_geti (lua_State *L, int index, lua_Integer i) {
-  index = lua_absindex(L, index);
-  lua_pushinteger(L, i);
-  lua_gettable(L, index);
-  return lua_type(L, -1);
-}
-
-
-#ifndef LUA_EXTRASPACE
-#define LUA_EXTRASPACE (sizeof(void*))
-#endif
-
-COMPAT53_API void *lua_getextraspace (lua_State *L) {
-  int is_main = 0;
-  void *ptr = NULL;
-  luaL_checkstack(L, 4, "not enough stack slots available");
-  lua_pushliteral(L, "__compat53_extraspace");
-  lua_pushvalue(L, -1);
-  lua_rawget(L, LUA_REGISTRYINDEX);
-  if (!lua_istable(L, -1)) {
-    lua_pop(L, 1);
-    lua_createtable(L, 0, 2);
-    lua_createtable(L, 0, 1);
-    lua_pushliteral(L, "k");
-    lua_setfield(L, -2, "__mode");
-    lua_setmetatable(L, -2);
-    lua_pushvalue(L, -2);
-    lua_pushvalue(L, -2);
-    lua_rawset(L, LUA_REGISTRYINDEX);
-  }
-  lua_replace(L, -2);
-  is_main = lua_pushthread(L);
-  lua_rawget(L, -2);
-  ptr = lua_touserdata(L, -1);
-  if (!ptr) {
-    lua_pop(L, 1);
-    ptr = lua_newuserdata(L, LUA_EXTRASPACE);
-    if (is_main) {
-      memset(ptr, '\0', LUA_EXTRASPACE);
-      lua_pushthread(L);
-      lua_pushvalue(L, -2);
-      lua_rawset(L, -4);
-      lua_pushboolean(L, 1);
-      lua_pushvalue(L, -2);
-      lua_rawset(L, -4);
-    } else {
-      void* mptr = NULL;
-      lua_pushboolean(L, 1);
-      lua_rawget(L, -3);
-      mptr = lua_touserdata(L, -1);
-      if (mptr)
-        memcpy(ptr, mptr, LUA_EXTRASPACE);
-      else
-        memset(ptr, '\0', LUA_EXTRASPACE);
-      lua_pop(L, 1);
-      lua_pushthread(L);
-      lua_pushvalue(L, -2);
-      lua_rawset(L, -4);
-    }
-  }
-  lua_pop(L, 2);
-  return ptr;
-}
-
-
-COMPAT53_API int lua_isinteger (lua_State *L, int index) {
-  if (lua_type(L, index) == LUA_TNUMBER) {
-    lua_Number n = lua_tonumber(L, index);
-    lua_Integer i = lua_tointeger(L, index);
-    if (i == n)
-      return 1;
-  }
-  return 0;
-}
-
-
-COMPAT53_API lua_Integer lua_tointegerx (lua_State *L, int i, int *isnum) {
-  int ok = 0;
-  lua_Number n = lua_tonumberx(L, i, &ok);
-  if (ok) {
-    if (n == (lua_Integer)n) {
-      if (isnum)
-        *isnum = 1;
-      return (lua_Integer)n;
-    }
-  }
-  if (isnum)
-    *isnum = 0;
-  return 0;
-}
-
-
-static void compat53_reverse (lua_State *L, int a, int b) {
-  for (; a < b; ++a, --b) {
-    lua_pushvalue(L, a);
-    lua_pushvalue(L, b);
-    lua_replace(L, a);
-    lua_replace(L, b);
-  }
-}
-
-
-COMPAT53_API void lua_rotate (lua_State *L, int idx, int n) {
-  int n_elems = 0;
-  idx = lua_absindex(L, idx);
-  n_elems = lua_gettop(L)-idx+1;
-  if (n < 0)
-    n += n_elems;
-  if ( n > 0 && n < n_elems) {
-    luaL_checkstack(L, 2, "not enough stack slots available");
-    n = n_elems - n;
-    compat53_reverse(L, idx, idx+n-1);
-    compat53_reverse(L, idx+n, idx+n_elems-1);
-    compat53_reverse(L, idx, idx+n_elems-1);
-  }
-}
-
-
-COMPAT53_API void lua_seti (lua_State *L, int index, lua_Integer i) {
-  luaL_checkstack(L, 1, "not enough stack slots available");
-  index = lua_absindex(L, index);
-  lua_pushinteger(L, i);
-  lua_insert(L, -2);
-  lua_settable(L, index);
-}
-
-
-#if !defined(lua_str2number)
-#  define lua_str2number(s, p)  strtod((s), (p))
-#endif
-
-COMPAT53_API size_t lua_stringtonumber (lua_State *L, const char *s) {
-  char* endptr;
-  lua_Number n = lua_str2number(s, &endptr);
-  if (endptr != s) {
-    while (*endptr != '\0' && isspace((unsigned char)*endptr))
-      ++endptr;
-    if (*endptr == '\0') {
-      lua_pushnumber(L, n);
-      return endptr - s + 1;
-    }
-  }
-  return 0;
-}
-
-
-COMPAT53_API const char *luaL_tolstring (lua_State *L, int idx, size_t *len) {
-  if (!luaL_callmeta(L, idx, "__tostring")) {
-    int t = lua_type(L, idx), tt = 0;
-    char const* name = NULL;
-    switch (t) {
-      case LUA_TNIL:
-        lua_pushliteral(L, "nil");
-        break;
-      case LUA_TSTRING:
-      case LUA_TNUMBER:
-        lua_pushvalue(L, idx);
-        break;
-      case LUA_TBOOLEAN:
-        if (lua_toboolean(L, idx))
-          lua_pushliteral(L, "true");
-        else
-          lua_pushliteral(L, "false");
-        break;
-      default:
-        tt = luaL_getmetafield(L, idx, "__name");
-        name = (tt == LUA_TSTRING) ? lua_tostring(L, -1) : lua_typename(L, t);
-        lua_pushfstring(L, "%s: %p", name, lua_topointer(L, idx));
-        if (tt != LUA_TNIL)
-          lua_replace(L, -2);
-        break;
-    }
-  } else {
-    if (!lua_isstring(L, -1))
-      luaL_error(L, "'__tostring' must return a string");
-  }
-  return lua_tolstring(L, -1, len);
-}
-
-
-COMPAT53_API void luaL_requiref (lua_State *L, const char *modname,
-                                 lua_CFunction openf, int glb) {
-  luaL_checkstack(L, 3, "not enough stack slots available");
-  luaL_getsubtable(L, LUA_REGISTRYINDEX, "_LOADED");
-  if (lua_getfield(L, -1, modname) == LUA_TNIL) {
-    lua_pop(L, 1);
-    lua_pushcfunction(L, openf);
-    lua_pushstring(L, modname);
-    lua_call(L, 1, 1);
-    lua_pushvalue(L, -1);
-    lua_setfield(L, -3, modname);
-  }
-  if (glb) {
-    lua_pushvalue(L, -1);
-    lua_setglobal(L, modname);
-  }
-  lua_replace(L, -2);
-}
-
-
-#endif /* Lua 5.1 and 5.2 */
-
-
-#endif /* COMPAT53_C_ */
-
-
-/*********************************************************************
-* This file contains parts of Lua 5.2's and Lua 5.3's source code:
-*
-* Copyright (C) 1994-2014 Lua.org, PUC-Rio.
-*
-* Permission is hereby granted, free of charge, to any person obtaining
-* a copy of this software and associated documentation files (the
-* "Software"), to deal in the Software without restriction, including
-* without limitation the rights to use, copy, modify, merge, publish,
-* distribute, sublicense, and/or sell copies of the Software, and to
-* permit persons to whom the Software is furnished to do so, subject to
-* the following conditions:
-*
-* The above copyright notice and this permission notice shall be
-* included in all copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*********************************************************************/
-
diff --git a/Golden_Repo/l/luv/compat-5.3.h b/Golden_Repo/l/luv/compat-5.3.h
deleted file mode 100644
index 082a6a076..000000000
--- a/Golden_Repo/l/luv/compat-5.3.h
+++ /dev/null
@@ -1,424 +0,0 @@
-#ifndef COMPAT53_H_
-#define COMPAT53_H_
-
-#include <stddef.h>
-#include <limits.h>
-#include <string.h>
-#if defined(__cplusplus) && !defined(COMPAT53_LUA_CPP)
-extern "C" {
-#endif
-#include <lua.h>
-#include <lauxlib.h>
-#include <lualib.h>
-#if defined(__cplusplus) && !defined(COMPAT53_LUA_CPP)
-}
-#endif
-
-
-#undef COMPAT53_INCLUDE_SOURCE
-#if defined(COMPAT53_PREFIX)
-/* - change the symbol names of functions to avoid linker conflicts
- * - compat-5.3.c needs to be compiled (and linked) separately
- */
-#  if !defined(COMPAT53_API)
-#    define COMPAT53_API extern
-#  endif
-#else /* COMPAT53_PREFIX */
-/* - make all functions static and include the source.
- * - compat-5.3.c doesn't need to be compiled (and linked) separately
- */
-#  define COMPAT53_PREFIX compat53
-#  undef COMPAT53_API
-#  if defined(__GNUC__) || defined(__clang__)
-#    define COMPAT53_API __attribute__((__unused__)) static
-#  else
-#    define COMPAT53_API static
-#  endif
-#  define COMPAT53_INCLUDE_SOURCE
-#endif /* COMPAT53_PREFIX */
-
-#define COMPAT53_CONCAT_HELPER(a, b) a##b
-#define COMPAT53_CONCAT(a, b) COMPAT53_CONCAT_HELPER(a, b)
-
-
-
-/* declarations for Lua 5.1 */
-#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM == 501
-
-/* XXX not implemented:
- * lua_arith (new operators)
- * lua_upvalueid
- * lua_upvaluejoin
- * lua_version
- * lua_yieldk
- */
-
-#ifndef LUA_OK
-#  define LUA_OK 0
-#endif
-#ifndef LUA_OPADD
-#  define LUA_OPADD 0
-#endif
-#ifndef LUA_OPSUB
-#  define LUA_OPSUB 1
-#endif
-#ifndef LUA_OPMUL
-#  define LUA_OPMUL 2
-#endif
-#ifndef LUA_OPDIV
-#  define LUA_OPDIV 3
-#endif
-#ifndef LUA_OPMOD
-#  define LUA_OPMOD 4
-#endif
-#ifndef LUA_OPPOW
-#  define LUA_OPPOW 5
-#endif
-#ifndef LUA_OPUNM
-#  define LUA_OPUNM 6
-#endif
-#ifndef LUA_OPEQ
-#  define LUA_OPEQ 0
-#endif
-#ifndef LUA_OPLT
-#  define LUA_OPLT 1
-#endif
-#ifndef LUA_OPLE
-#  define LUA_OPLE 2
-#endif
-
-/* LuaJIT/Lua 5.1 does not have the updated
- * error codes for thread status/function returns (but some patched versions do)
- * define it only if it's not found
- */
-#if !defined(LUA_ERRGCMM)
-/* Use + 2 because in some versions of Lua (Lua 5.1)
- * LUA_ERRFILE is defined as (LUA_ERRERR+1)
- * so we need to avoid it (LuaJIT might have something at this
- * integer value too)
- */
-#  define LUA_ERRGCMM (LUA_ERRERR + 2)
-#endif /* LUA_ERRGCMM define */
-
-typedef size_t lua_Unsigned;
-
-typedef struct luaL_Buffer_53 {
-  luaL_Buffer b; /* make incorrect code crash! */
-  char *ptr;
-  size_t nelems;
-  size_t capacity;
-  lua_State *L2;
-} luaL_Buffer_53;
-#define luaL_Buffer luaL_Buffer_53
-
-/* In PUC-Rio 5.1, userdata is a simple FILE*
- * In LuaJIT, it's a struct where the first member is a FILE*
- * We can't support the `closef` member
- */
-typedef struct luaL_Stream {
-  FILE *f;
-} luaL_Stream;
-
-#define lua_absindex COMPAT53_CONCAT(COMPAT53_PREFIX, _absindex)
-COMPAT53_API int lua_absindex (lua_State *L, int i);
-
-#define lua_arith COMPAT53_CONCAT(COMPAT53_PREFIX, _arith)
-COMPAT53_API void lua_arith (lua_State *L, int op);
-
-#define lua_compare COMPAT53_CONCAT(COMPAT53_PREFIX, _compare)
-COMPAT53_API int lua_compare (lua_State *L, int idx1, int idx2, int op);
-
-#define lua_copy COMPAT53_CONCAT(COMPAT53_PREFIX, _copy)
-COMPAT53_API void lua_copy (lua_State *L, int from, int to);
-
-#define lua_getuservalue(L, i) \
-  (lua_getfenv((L), (i)), lua_type((L), -1))
-#define lua_setuservalue(L, i) \
-  (luaL_checktype((L), -1, LUA_TTABLE), lua_setfenv((L), (i)))
-
-#define lua_len COMPAT53_CONCAT(COMPAT53_PREFIX, _len)
-COMPAT53_API void lua_len (lua_State *L, int i);
-
-#define lua_pushstring(L, s) \
-  (lua_pushstring((L), (s)), lua_tostring((L), -1))
-
-#define lua_pushlstring(L, s, len) \
-  ((((len) == 0) ? lua_pushlstring((L), "", 0) : lua_pushlstring((L), (s), (len))), lua_tostring((L), -1))
-
-#ifndef luaL_newlibtable
-#  define luaL_newlibtable(L, l) \
-  (lua_createtable((L), 0, sizeof((l))/sizeof(*(l))-1))
-#endif
-#ifndef luaL_newlib
-#  define luaL_newlib(L, l) \
-  (luaL_newlibtable((L), (l)), luaL_register((L), NULL, (l)))
-#endif
-
-#define lua_pushglobaltable(L) \
-  lua_pushvalue((L), LUA_GLOBALSINDEX)
-
-#define lua_rawgetp COMPAT53_CONCAT(COMPAT53_PREFIX, _rawgetp)
-COMPAT53_API int lua_rawgetp (lua_State *L, int i, const void *p);
-
-#define lua_rawsetp COMPAT53_CONCAT(COMPAT53_PREFIX, _rawsetp)
-COMPAT53_API void lua_rawsetp(lua_State *L, int i, const void *p);
-
-#define lua_rawlen(L, i) lua_objlen((L), (i))
-
-#define lua_tointeger(L, i) lua_tointegerx((L), (i), NULL)
-
-#define lua_tonumberx COMPAT53_CONCAT(COMPAT53_PREFIX, _tonumberx)
-COMPAT53_API lua_Number lua_tonumberx (lua_State *L, int i, int *isnum);
-
-#define luaL_checkversion COMPAT53_CONCAT(COMPAT53_PREFIX, L_checkversion)
-COMPAT53_API void luaL_checkversion (lua_State *L);
-
-#define lua_load COMPAT53_CONCAT(COMPAT53_PREFIX, _load_53)
-COMPAT53_API int lua_load (lua_State *L, lua_Reader reader, void *data, const char* source, const char* mode);
-
-#define luaL_loadfilex COMPAT53_CONCAT(COMPAT53_PREFIX, L_loadfilex)
-COMPAT53_API int luaL_loadfilex (lua_State *L, const char *filename, const char *mode);
-
-#define luaL_loadbufferx COMPAT53_CONCAT(COMPAT53_PREFIX, L_loadbufferx)
-COMPAT53_API int luaL_loadbufferx (lua_State *L, const char *buff, size_t sz, const char *name, const char *mode);
-
-#define luaL_checkstack COMPAT53_CONCAT(COMPAT53_PREFIX, L_checkstack_53)
-COMPAT53_API void luaL_checkstack (lua_State *L, int sp, const char *msg);
-
-#define luaL_getsubtable COMPAT53_CONCAT(COMPAT53_PREFIX, L_getsubtable)
-COMPAT53_API int luaL_getsubtable (lua_State* L, int i, const char *name);
-
-#define luaL_len COMPAT53_CONCAT(COMPAT53_PREFIX, L_len)
-COMPAT53_API lua_Integer luaL_len (lua_State *L, int i);
-
-#define luaL_setfuncs COMPAT53_CONCAT(COMPAT53_PREFIX, L_setfuncs)
-COMPAT53_API void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup);
-
-#define luaL_setmetatable COMPAT53_CONCAT(COMPAT53_PREFIX, L_setmetatable)
-COMPAT53_API void luaL_setmetatable (lua_State *L, const char *tname);
-
-#define luaL_testudata COMPAT53_CONCAT(COMPAT53_PREFIX, L_testudata)
-COMPAT53_API void *luaL_testudata (lua_State *L, int i, const char *tname);
-
-#define luaL_traceback COMPAT53_CONCAT(COMPAT53_PREFIX, L_traceback)
-COMPAT53_API void luaL_traceback (lua_State *L, lua_State *L1, const char *msg, int level);
-
-#define luaL_fileresult COMPAT53_CONCAT(COMPAT53_PREFIX, L_fileresult)
-COMPAT53_API int luaL_fileresult (lua_State *L, int stat, const char *fname);
-
-#define luaL_execresult COMPAT53_CONCAT(COMPAT53_PREFIX, L_execresult)
-COMPAT53_API int luaL_execresult (lua_State *L, int stat);
-
-#define lua_callk(L, na, nr, ctx, cont) \
-  ((void)(ctx), (void)(cont), lua_call((L), (na), (nr)))
-#define lua_pcallk(L, na, nr, err, ctx, cont) \
-  ((void)(ctx), (void)(cont), lua_pcall((L), (na), (nr), (err)))
-
-#define lua_resume(L, from, nargs) \
-  ((void)(from), lua_resume((L), (nargs)))
-
-#define luaL_buffinit COMPAT53_CONCAT(COMPAT53_PREFIX, _buffinit_53)
-COMPAT53_API void luaL_buffinit (lua_State *L, luaL_Buffer_53 *B);
-
-#define luaL_prepbuffsize COMPAT53_CONCAT(COMPAT53_PREFIX, _prepbufsize_53)
-COMPAT53_API char *luaL_prepbuffsize (luaL_Buffer_53 *B, size_t s);
-
-#define luaL_addlstring COMPAT53_CONCAT(COMPAT53_PREFIX, _addlstring_53)
-COMPAT53_API void luaL_addlstring (luaL_Buffer_53 *B, const char *s, size_t l);
-
-#define luaL_addvalue COMPAT53_CONCAT(COMPAT53_PREFIX, _addvalue_53)
-COMPAT53_API void luaL_addvalue (luaL_Buffer_53 *B);
-
-#define luaL_pushresult COMPAT53_CONCAT(COMPAT53_PREFIX, _pushresult_53)
-COMPAT53_API void luaL_pushresult (luaL_Buffer_53 *B);
-
-#undef luaL_buffinitsize
-#define luaL_buffinitsize(L, B, s) \
-  (luaL_buffinit((L), (B)), luaL_prepbuffsize((B), (s)))
-
-#undef luaL_prepbuffer
-#define luaL_prepbuffer(B) \
-  luaL_prepbuffsize((B), LUAL_BUFFERSIZE)
-
-#undef luaL_addchar
-#define luaL_addchar(B, c) \
-  ((void)((B)->nelems < (B)->capacity || luaL_prepbuffsize((B), 1)), \
-   ((B)->ptr[(B)->nelems++] = (c)))
-
-#undef luaL_addsize
-#define luaL_addsize(B, s) \
-  ((B)->nelems += (s))
-
-#undef luaL_addstring
-#define luaL_addstring(B, s) \
-  luaL_addlstring((B), (s), strlen((s)))
-
-#undef luaL_pushresultsize
-#define luaL_pushresultsize(B, s) \
-  (luaL_addsize((B), (s)), luaL_pushresult((B)))
-
-#if defined(LUA_COMPAT_APIINTCASTS)
-#define lua_pushunsigned(L, n) \
-  lua_pushinteger((L), (lua_Integer)(n))
-#define lua_tounsignedx(L, i, is) \
-  ((lua_Unsigned)lua_tointegerx((L), (i), (is)))
-#define lua_tounsigned(L, i) \
-  lua_tounsignedx((L), (i), NULL)
-#define luaL_checkunsigned(L, a) \
-  ((lua_Unsigned)luaL_checkinteger((L), (a)))
-#define luaL_optunsigned(L, a, d) \
-  ((lua_Unsigned)luaL_optinteger((L), (a), (lua_Integer)(d)))
-#endif
-
-#endif /* Lua 5.1 only */
-
-
-
-/* declarations for Lua 5.1 and 5.2 */
-#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM <= 502
-
-typedef int lua_KContext;
-
-typedef int (*lua_KFunction)(lua_State *L, int status, lua_KContext ctx);
-
-#define lua_dump(L, w, d, s) \
-  ((void)(s), lua_dump((L), (w), (d)))
-
-#define lua_getfield(L, i, k) \
-  (lua_getfield((L), (i), (k)), lua_type((L), -1))
-
-#define lua_gettable(L, i) \
-  (lua_gettable((L), (i)), lua_type((L), -1))
-
-#define lua_geti COMPAT53_CONCAT(COMPAT53_PREFIX, _geti)
-COMPAT53_API int lua_geti (lua_State *L, int index, lua_Integer i);
-
-#define lua_getextraspace COMPAT53_CONCAT(COMPAT53_PREFIX, _getextraspace)
-COMPAT53_API void *lua_getextraspace (lua_State *L);
-
-#define lua_isinteger COMPAT53_CONCAT(COMPAT53_PREFIX, _isinteger)
-COMPAT53_API int lua_isinteger (lua_State *L, int index);
-
-#define lua_tointegerx COMPAT53_CONCAT(COMPAT53_PREFIX, _tointegerx_53)
-COMPAT53_API lua_Integer lua_tointegerx (lua_State *L, int i, int *isnum);
-
-#define lua_numbertointeger(n, p) \
-  ((*(p) = (lua_Integer)(n)), 1)
-
-#define lua_rawget(L, i) \
-  (lua_rawget((L), (i)), lua_type((L), -1))
-
-#define lua_rawgeti(L, i, n) \
-  (lua_rawgeti((L), (i), (n)), lua_type((L), -1))
-
-#define lua_rotate COMPAT53_CONCAT(COMPAT53_PREFIX, _rotate)
-COMPAT53_API void lua_rotate (lua_State *L, int idx, int n);
-
-#define lua_seti COMPAT53_CONCAT(COMPAT53_PREFIX, _seti)
-COMPAT53_API void lua_seti (lua_State *L, int index, lua_Integer i);
-
-#define lua_stringtonumber COMPAT53_CONCAT(COMPAT53_PREFIX, _stringtonumber)
-COMPAT53_API size_t lua_stringtonumber (lua_State *L, const char *s);
-
-#define luaL_tolstring COMPAT53_CONCAT(COMPAT53_PREFIX, L_tolstring)
-COMPAT53_API const char *luaL_tolstring (lua_State *L, int idx, size_t *len);
-
-#define luaL_getmetafield(L, o, e) \
-  (luaL_getmetafield((L), (o), (e)) ? lua_type((L), -1) : LUA_TNIL)
-
-#define luaL_newmetatable(L, tn) \
-  (luaL_newmetatable((L), (tn)) ? (lua_pushstring((L), (tn)), lua_setfield((L), -2, "__name"), 1) : 0)
-
-#define luaL_requiref COMPAT53_CONCAT(COMPAT53_PREFIX, L_requiref_53)
-COMPAT53_API void luaL_requiref (lua_State *L, const char *modname,
-                                 lua_CFunction openf, int glb );
-
-#endif /* Lua 5.1 and Lua 5.2 */
-
-
-
-/* declarations for Lua 5.2 */
-#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM == 502
-
-/* XXX not implemented:
- * lua_isyieldable
- * lua_arith (new operators)
- * lua_pushfstring (new formats)
- */
-
-#define lua_getglobal(L, n) \
-  (lua_getglobal((L), (n)), lua_type((L), -1))
-
-#define lua_getuservalue(L, i) \
-  (lua_getuservalue((L), (i)), lua_type((L), -1))
-
-#define lua_pushlstring(L, s, len) \
-  (((len) == 0) ? lua_pushlstring((L), "", 0) : lua_pushlstring((L), (s), (len)))
-
-#define lua_rawgetp(L, i, p) \
-  (lua_rawgetp((L), (i), (p)), lua_type((L), -1))
-
-#define LUA_KFUNCTION(_name) \
-  static int (_name)(lua_State *L, int status, lua_KContext ctx); \
-  static int (_name ## _52)(lua_State *L) { \
-    lua_KContext ctx; \
-    int status = lua_getctx(L, &ctx); \
-    return (_name)(L, status, ctx); \
-  } \
-  static int (_name)(lua_State *L, int status, lua_KContext ctx)
-
-#define lua_pcallk(L, na, nr, err, ctx, cont) \
-  lua_pcallk((L), (na), (nr), (err), (ctx), cont ## _52)
-
-#define lua_callk(L, na, nr, ctx, cont) \
-  lua_callk((L), (na), (nr), (ctx), cont ## _52)
-
-#define lua_yieldk(L, nr, ctx, cont) \
-  lua_yieldk((L), (nr), (ctx), cont ## _52)
-
-#ifdef lua_call
-#  undef lua_call
-#  define lua_call(L, na, nr) \
-  (lua_callk)((L), (na), (nr), 0, NULL)
-#endif
-
-#ifdef lua_pcall
-#  undef lua_pcall
-#  define lua_pcall(L, na, nr, err) \
-  (lua_pcallk)((L), (na), (nr), (err), 0, NULL)
-#endif
-
-#ifdef lua_yield
-#  undef lua_yield
-#  define lua_yield(L, nr) \
-  (lua_yieldk)((L), (nr), 0, NULL)
-#endif
-
-#endif /* Lua 5.2 only */
-
-
-
-/* other Lua versions */
-#if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 501 || LUA_VERSION_NUM > 503
-
-#  error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)"
-
-#endif /* other Lua versions except 5.1, 5.2, and 5.3 */
-
-
-
-/* helper macro for defining continuation functions (for every version
- * *except* Lua 5.2) */
-#ifndef LUA_KFUNCTION
-#define LUA_KFUNCTION(_name) \
-  static int (_name)(lua_State *L, int status, lua_KContext ctx)
-#endif
-
-
-#if defined(COMPAT53_INCLUDE_SOURCE)
-#  include "compat-5.3.c"
-#endif
-
-
-#endif /* COMPAT53_H_ */
-
diff --git a/Golden_Repo/l/luv/luv-1.44.2-0-GCCcore-11.2.0.eb b/Golden_Repo/l/luv/luv-1.44.2-0-GCCcore-11.2.0.eb
deleted file mode 100644
index 126d96641..000000000
--- a/Golden_Repo/l/luv/luv-1.44.2-0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,59 +0,0 @@
-# EasyConfig for libLUV (NeoVim dependency)
-#
-# Copyright 2019-2022 Stepan Nassyr @ Forschungszentrum Juelich
-easyblock = 'CMakeNinja'
-
-name = 'luv'
-version = '1.44.2-0'
-
-homepage = 'https://github.com/luvit/luv'
-description = """libuv bindings for lua
-"""
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ["https://github.com/luvit/luv/archive/"]
-sources = ["%(version)s.tar.gz"]
-
-patches = [
-    ("compat-5.3.h", "deps/lua-compat-5.3/"),
-    ("compat-5.3.c", "deps/lua-compat-5.3/")
-]
-
-checksums = [
-    '44ccda27035bfe683e6325a2a93f2c254be1eb76bde6efc2bd37c56a7af7b00a',
-    'cb4863e357ac45445349b6255805c4c243cedc83f01bed76efc7af7f470b1217',
-    'a558b546caa4a353d8d073d26d22d2c175b60c4c0a2d00751338e7ef50d69008',
-]
-
-dependencies = [
-    ('libuv', '1.44.2'),
-    ('LuaJIT2-OpenResty', '2.1-20220411'),
-]
-
-builddependencies = [
-    ('CMake', '3.23.1'),
-    ('Ninja', '1.10.2'),
-    ('binutils', '2.37'),
-]
-
-separate_build_dir = True
-
-osdependencies = ['lua']
-
-preconfigopts = ("mkdir %(builddir)s/luv-%(version)s/deps/lua-compat-5.3/c-api &&"
-                 "mv %(builddir)s/luv-%(version)s/deps/lua-compat-5.3/{,c-api/}compat-5.3.h && "
-                 "mv %(builddir)s/luv-%(version)s/deps/lua-compat-5.3/{,c-api/}compat-5.3.c && ")
-
-configopts = ("-DBUILD_MODULE=OFF -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON "
-              "-DWITH_LUA_ENGINE=LuaJIT -DWITH_SHARED_LIBUV=ON -DLUA_BUILD_TYPE=System")
-
-sanity_check_paths = {
-    'files': [('include/luv/%s' % f) for f in ['lhandle.h', 'lreq.h', 'luv.h', 'util.h']] +
-             ['lib/libluv.a', 'lib/libluv.so'],
-    'dirs': ['include/luv', 'lib/pkgconfig'],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/l/lxml/lxml-4.6.3-GCCcore-11.2.0.eb b/Golden_Repo/l/lxml/lxml-4.6.3-GCCcore-11.2.0.eb
deleted file mode 100644
index fe506e065..000000000
--- a/Golden_Repo/l/lxml/lxml-4.6.3-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,26 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'lxml'
-version = '4.6.3'
-
-homepage = 'https://lxml.de/'
-description = """The lxml XML toolkit is a Pythonic binding for the C libraries libxml2 and libxslt."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-sources = [SOURCE_TAR_GZ]
-checksums = ['39b78571b3b30645ac77b95f7c69d1bffc4cf8c3b157c435a34da72e78c82468']
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('libxml2', '2.9.10'),
-    ('libxslt', '1.1.34'),
-]
-
-download_dep_fail = True
-use_pip = True
-sanity_pip_check = True
-
-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
deleted file mode 100644
index 09b737707..000000000
--- a/Golden_Repo/l/lz4/lz4-1.9.3-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,30 +0,0 @@
-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/M4/M4-1.4.19-GCCcore-11.2.0.eb b/Golden_Repo/m/M4/M4-1.4.19-GCCcore-11.2.0.eb
deleted file mode 100644
index 2ad0bebcd..000000000
--- a/Golden_Repo/m/M4/M4-1.4.19-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,31 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'M4'
-version = '1.4.19'
-
-homepage = 'https://www.gnu.org/software/m4/m4.html'
-description = """GNU M4 is an implementation of the traditional Unix macro processor. It is mostly SVR4 compatible
-  although it has some extensions (for example, handling more than 9 positional parameters to macros).
- GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc."""
-
-site_contacts = 'sc@fz-juelich.de'
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [GNU_SOURCE]
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70']
-
-# use same binutils version that was used when building GCC toolchain
-builddependencies = [('binutils', '2.37', '', SYSTEM)]
-
-# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
-# see https://github.com/easybuilders/easybuild-easyconfigs/issues/529
-configopts = "--enable-c++ CPPFLAGS=-fgnu89-inline"
-
-sanity_check_paths = {
-    'files': ['bin/m4'],
-    'dirs': [],
-}
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/m/M4/M4-1.4.19.eb b/Golden_Repo/m/M4/M4-1.4.19.eb
deleted file mode 100644
index ac5fa24ed..000000000
--- a/Golden_Repo/m/M4/M4-1.4.19.eb
+++ /dev/null
@@ -1,33 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'M4'
-version = '1.4.19'
-
-homepage = 'https://www.gnu.org/software/m4/m4.html'
-
-description = """
- GNU M4 is an implementation of the traditional Unix macro processor. It is
- mostly SVR4 compatible although it has some extensions (for example, handling
- more than 9 positional parameters to macros). GNU M4 also has built-in
- functions for including files, running shell commands, doing arithmetic, etc.
-"""
-
-site_contacts = 'sc@fz-juelich.de'
-
-toolchain = SYSTEM
-
-sources = [SOURCELOWER_TAR_GZ]
-source_urls = [GNU_SOURCE]
-
-checksums = ['3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70']
-
-# '-fgnu89-inline' is required to avoid linking errors with older glibc's,
-# see https://github.com/easybuilders/easybuild-easyconfigs/issues/529
-configopts = "--enable-c++ CPPFLAGS=-fgnu89-inline"
-
-sanity_check_paths = {
-    'files': ['bin/m4'],
-    'dirs': [],
-}
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/m/MATLAB/MATLAB-2022a-GCCcore-11.2.0.eb b/Golden_Repo/m/MATLAB/MATLAB-2022a-GCCcore-11.2.0.eb
deleted file mode 100644
index 91e921bb5..000000000
--- a/Golden_Repo/m/MATLAB/MATLAB-2022a-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,60 +0,0 @@
-name = 'MATLAB'
-version = '2022a'
-
-homepage = 'https://www.mathworks.com/products/matlab.html'
-description = """MATLAB is a high-level language and interactive environment
-that enables you to perform computationally intensive tasks faster than with
-traditional programming languages such as C, C++, and Fortran.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['77c3c5ca229f038cc3dab8edcf6059b3d3e0545e8854a1924739f6701f75ed4e']
-
-dependencies = [
-    ('X11', '20210802'),  # mlab req. libXt.so which is not on the computes
-    ('Java', '15', '', SYSTEM)
-]
-
-java_options = '-Xmx2048m'
-
-# Attention: before calling 'eb':
-# export EB_MATLAB_KEY as fileInstallationKey
-# or export EB_MATLAB_LICFILE as license file
-
-postinstallcmds = [
-    # create a wrapper script to ensure we do not mess up the environment
-    # because MATLAB comes with its own libstdc++ and other system libs
-    # in $EBROOTMATLAB/sys/os/glnxa64/
-    'mv %(installdir)s/bin/matlab %(installdir)s/bin/matlab.bin ',
-    (
-        '{ cat > %(installdir)s/bin/matlab; } << EOF\n'
-        '#!/bin/bash\n'
-        '\n'
-        'MYPATH=\$(readlink -f \$0)\n'
-        'export MATLAB_PATH=\$(realpath \$(dirname "\$MYPATH")/..)\n'
-        '\n'
-        'export LD_LIBRARY_PATH=\$MATLAB_PATH/runtime/glnxa64:\$LD_LIBRARY_PATH\n'
-        'export LD_LIBRARY_PATH=\$MATLAB_PATH/bin/glnxa64:\$LD_LIBRARY_PATH\n'
-        'export LD_LIBRARY_PATH=\$MATLAB_PATH/sys/os/glnxa64:\$LD_LIBRARY_PATH\n'
-        '\n'
-        '"\$MATLAB_PATH/bin/matlab.bin" "\$@"\n'
-        'EOF'
-    ),
-    'chmod +x %(installdir)s/bin/matlab',
-]
-
-modloadmsg = """
-Attention: We do NOT supply MATLAB licenses but just the complete software installation.
-Without access to a valid license you are not able to run MATLAB and its toolboxes.
-You need to set MLM_LICENSE_FILE which guides MATLAB to your license server(s) before:
-    `export MLM_LICENSE_FILE=<port>@<license-server1>,<port>@license-server2,<...>`
-"""
-
-sanity_check_paths = {
-    'files': ['bin/matlab', 'bin/glnxa64/MATLAB'],
-    'dirs': [],
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/m/MATLAB/README.txt b/Golden_Repo/m/MATLAB/README.txt
deleted file mode 100644
index b4f6e995a..000000000
--- a/Golden_Repo/m/MATLAB/README.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Before running `eb` to install MATLAB you need to
-
-a) export the file installation key as EB_MATLAB_KEY, like the following example
-export EB_MATLAB_KEY='00000-00000-00000-00000-00000-00000-00000-00000-00000-00000-00000-00000-00000-00000-00000-00000-00000-00000-00000-00000-00000-00000'
-
-b) or export the absolute path to the license file as EB_MATLAB_LICFILE, like the following example
-export EB_MATLAB_LICFILE=/home/matlab/matlab.lic
-
-c) download the ISO installation file from MATHWORKS
-
-d) unpack it with `7z x <iso-file>` and repack it again with `tar -czf matlab-2022a.tar.gz`
-
-e) copy the packed matlab sources as 'matlab-2020b.tar.gz' to the working directory
diff --git a/Golden_Repo/m/MCR/MCR-R2021b.2.eb b/Golden_Repo/m/MCR/MCR-R2021b.2.eb
deleted file mode 100644
index b7e3e8310..000000000
--- a/Golden_Repo/m/MCR/MCR-R2021b.2.eb
+++ /dev/null
@@ -1,21 +0,0 @@
-##
-# Author:    Robert Mijakovic <robert.mijakovic@lxp.lu>
-##
-name = 'MCR'
-version = 'R2021b'  # runtime version 9.11
-local_update = '2'
-versionsuffix = '.%s' % local_update
-
-homepage = 'https://www.mathworks.com/products/compiler/mcr/'
-description = """The MATLAB Runtime is a standalone set of shared libraries
- that enables the execution of compiled MATLAB applications
- or components on computers that do not have MATLAB installed."""
-
-toolchain = SYSTEM
-
-source_urls = ['https://ssd.mathworks.com/supportfiles/downloads/%%(version)s/Release/%s/deployment_files/'
-               'installer/complete/glnxa64/' % local_update]
-sources = ['MATLAB_Runtime_%%(version)s_Update_%s_glnxa64.zip' % local_update]
-checksums = ['731ea5ff34a64ec05024ccf36dc24cfb77d5de4dfabec678e3b964e1110aa6e2']
-
-moduleclass = 'math'
diff --git a/Golden_Repo/m/MCR/MCR-R2022a.eb b/Golden_Repo/m/MCR/MCR-R2022a.eb
deleted file mode 100644
index f4e33dcd2..000000000
--- a/Golden_Repo/m/MCR/MCR-R2022a.eb
+++ /dev/null
@@ -1,20 +0,0 @@
-##
-# Author:    Robert Mijakovic <robert.mijakovic@lxp.lu>
-##
-name = 'MCR'
-version = 'R2022a'  # runtime version 9.12
-local_update = '0'
-
-homepage = 'https://www.mathworks.com/products/compiler/mcr/'
-description = """The MATLAB Runtime is a standalone set of shared libraries
- that enables the execution of compiled MATLAB applications
- or components on computers that do not have MATLAB installed."""
-
-toolchain = SYSTEM
-
-source_urls = ['https://ssd.mathworks.com/supportfiles/downloads/%%(version)s/Release/%s/deployment_files/'
-               'installer/complete/glnxa64/' % local_update]
-sources = ['MATLAB_Runtime_%(version)s_glnxa64.zip']
-checksums = ['ce013fa6d46148741ad55abaddd26d8d85d6fa4cf94917c8f3a66f350230cfc7']
-
-moduleclass = 'math'
diff --git a/Golden_Repo/m/MDAnalysis/MDAnalysis-2.0.0-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/m/MDAnalysis/MDAnalysis-2.0.0-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index 10262dd9b..000000000
--- a/Golden_Repo/m/MDAnalysis/MDAnalysis-2.0.0-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,46 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'MDAnalysis'
-version = '2.0.0'
-
-homepage = 'https://www.mdanalysis.org/'
-description = """MDAnalysis is an object-oriented Python library to analyze trajectories from molecular dynamics (MD)
-simulations in many popular formats."""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10'),
-    ('matplotlib', '3.4.3'),
-    ('Biopython', '1.79'),
-    ('networkx', '2.6.3'),
-    ('tqdm', '4.62.3'),
-]
-
-use_pip = True
-download_dep_fail = True
-sanity_pip_check = True
-
-exts_list = [
-    ('GridDataFormats', '0.6.0', {
-        'modulename': 'gridData',
-        'checksums': ['f14e00e8b795f8021f6069935e1133352224775c9bd97f395beb2bcd64a19b86'],
-    }),
-    ('gsd', '2.5.1', {
-        'checksums': ['76bf228b1d8e95e7d6a334e8cc7712c0bd8c256148007f7ce88a489c21996593'],
-    }),
-    ('msgpack', '1.0.3', {
-        'checksums': ['51fdc7fb93615286428ee7758cecc2f374d5ff363bdd884c7ea622a7a327a81e'],
-    }),
-    ('mmtf-python', '1.1.2', {
-        'modulename': 'mmtf',
-        'checksums': ['a5caa7fcd2c1eaa16638b5b1da2d3276cbd3ed3513f0c2322957912003b6a8df'],
-    }),
-    (name, version, {
-        'modulename': name,
-        'checksums': ['aa3079d1a82305eba58cf567fac8fc231940184ed88f9a4451be8433f4a06d3e'],
-    }),
-]
-
-moduleclass = 'bio'
diff --git a/Golden_Repo/m/MED/MED-4.1.0-gpsmpi-2021b.eb b/Golden_Repo/m/MED/MED-4.1.0-gpsmpi-2021b.eb
deleted file mode 100644
index acce8bba8..000000000
--- a/Golden_Repo/m/MED/MED-4.1.0-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,44 +0,0 @@
-# easyconfig file for MED Library
-easyblock = 'ConfigureMake'
-
-name = 'MED'
-version = '4.1.0'
-
-homepage = 'http://salome-platform.org/'
-description = """Initially defined by EDF R&D,
-this format has been defined and maintained
-through a MED working group comprising members of
-EDF R&D and CEA (the Code Saturne team being represented).
-"""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-toolchainopts = {'optarch': True, 'pic': True, 'usempi': True}
-
-source_urls = ['http://files.salome-platform.org/Salome/other/']
-sources = ['med-%(version)s.tar.gz']
-patches = [
-    'med-%(version)s_hdf5_v11201.patch',
-    'med-%(version)s_hdf5_H5Oget_info.patch',
-]
-checksums = [
-    '847db5d6fbc9ce6924cb4aea86362812c9a5ef6b9684377e4dd6879627651fce',  # med-4.1.0.tar.gz
-    # med-4.1.0_hdf5_v11201.patch
-    '6176281bcead9c1d5587daa1d0a82553f3bf8071282282e31c8275700aebf761',
-    # med-4.1.0_hdf5_H5Oget_info.patch
-    'ded71c03da362efffdb24dcc76e9fae3e36eb58130c70ebe2df8d05c0ec08437',
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SWIG', '4.0.2'),
-    ('HDF5', '1.12.1')
-]
-
-prebuildopts = 'autoreconf -f -i && '
-
-# better to configure these dependents explicitly
-configopts = '--with-f90 '
-configopts += '--with-swig=$EBROOTSWIG '
-configopts += '--with-hdf5=$EBROOTHDF5 '
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/m/MED/med-4.1.0_hdf5_H5Oget_info.patch b/Golden_Repo/m/MED/med-4.1.0_hdf5_H5Oget_info.patch
deleted file mode 100644
index d7d76637d..000000000
--- a/Golden_Repo/m/MED/med-4.1.0_hdf5_H5Oget_info.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff -ruN med-4.1.0-orig/src/hdfi/_MEDattributeNumWrByName.c med-4.1.0/src/hdfi/_MEDattributeNumWrByName.c
---- med-4.1.0-orig/src/hdfi/_MEDattributeNumWrByName.c	2020-03-11 10:36:37.000000000 +0100
-+++ med-4.1.0/src/hdfi/_MEDattributeNumWrByName.c	2022-01-20 18:42:35.685834000 +0100
-@@ -68,7 +68,7 @@
- 
-   if  ( (_attid=H5Aopen_by_name( pid, path, attname, H5P_DEFAULT, H5P_DEFAULT )) >= 0 ) {
- 
--    if ( H5Oget_info( pid, &_oinfo ) <0) {
-+    if ( H5Oget_info( pid, &_oinfo, H5O_INFO_BASIC ) <0) {
- 	MED_ERR_(_ret,MED_ERR_CALL,MED_ERR_API,"H5Oget_info");
- 	goto ERROR;
-     }
-diff -ruN med-4.1.0-orig/src/hdfi/_MEDattributeNumWr.c med-4.1.0/src/hdfi/_MEDattributeNumWr.c
---- med-4.1.0-orig/src/hdfi/_MEDattributeNumWr.c	2020-03-11 10:36:37.000000000 +0100
-+++ med-4.1.0/src/hdfi/_MEDattributeNumWr.c	2022-01-20 18:42:47.171221000 +0100
-@@ -77,7 +77,7 @@
- 
-   if  ( (_attid=H5Aopen( pid, attname, H5P_DEFAULT )) >= 0 ) {
- 
--    if ( H5Oget_info( pid, &_oinfo ) <0) {
-+    if ( H5Oget_info( pid, &_oinfo, H5O_INFO_BASIC ) <0) {
- 	MED_ERR_(_ret,MED_ERR_CALL,MED_ERR_API,"H5Oget_info");
- 	goto ERROR;
-     }
-diff -ruN med-4.1.0-orig/src/hdfi/_MEDcheckAttributeStringFunc.c med-4.1.0/src/hdfi/_MEDcheckAttributeStringFunc.c
---- med-4.1.0-orig/src/hdfi/_MEDcheckAttributeStringFunc.c	2020-03-11 10:36:37.000000000 +0100
-+++ med-4.1.0/src/hdfi/_MEDcheckAttributeStringFunc.c	2022-01-20 18:23:28.503780000 +0100
-@@ -40,7 +40,7 @@
-     oinfo.type=H5G_LINK;
-     break;
-   case H5L_TYPE_HARD:
--    if ( H5Oget_info_by_name( id, lname, &oinfo, H5P_DEFAULT ) <0) {
-+    if ( H5Oget_info_by_name( id, lname, &oinfo, H5O_INFO_BASIC, H5P_DEFAULT ) <0) {
-       MED_ERR_(_ret,MED_ERR_CALL,MED_ERR_API,"H5Oget_info_by_name");
-       SSCRUTE(lname);
-     }
-diff -ruN med-4.1.0-orig/src/hdfi/_MEDchecknSublinkFunc.c med-4.1.0/src/hdfi/_MEDchecknSublinkFunc.c
---- med-4.1.0-orig/src/hdfi/_MEDchecknSublinkFunc.c	2020-03-11 10:36:36.000000000 +0100
-+++ med-4.1.0/src/hdfi/_MEDchecknSublinkFunc.c	2022-01-20 18:22:11.761793000 +0100
-@@ -41,7 +41,7 @@
-     oinfo.type=H5G_LINK;
-     break;
-   case H5L_TYPE_HARD:
--    if ( H5Oget_info_by_name( id, lname, &oinfo, H5P_DEFAULT ) <0) {
-+    if ( H5Oget_info_by_name( id, lname, &oinfo, H5O_INFO_BASIC, H5P_DEFAULT ) <0) {
-       MED_ERR_(_ret,MED_ERR_CALL,MED_ERR_API,"H5Oget_info_by_name");
-       SSCRUTE(lname);
-     }
-diff -ruN med-4.1.0-orig/src/hdfi/_MEDdatagroupExist.c med-4.1.0/src/hdfi/_MEDdatagroupExist.c
---- med-4.1.0-orig/src/hdfi/_MEDdatagroupExist.c	2020-03-11 10:36:37.000000000 +0100
-+++ med-4.1.0/src/hdfi/_MEDdatagroupExist.c	2022-01-20 18:22:51.586949000 +0100
-@@ -45,7 +45,7 @@
- 
-     case H5L_TYPE_HARD:
-       *isasoftlink  = MED_FALSE;
--      if ( H5Oget_info_by_name( gid, datagroupname, &_oinfo, H5P_DEFAULT ) <0) {
-+      if ( H5Oget_info_by_name( gid, datagroupname, &_oinfo, H5O_INFO_BASIC, H5P_DEFAULT ) <0) {
- 	MED_ERR_(_ret,MED_ERR_CALL,MED_ERR_API,"H5Oget_info_by_name");
- 	SSCRUTE( datagroupname);
-       }
-diff -ruN med-4.1.0-orig/src/hdfi/_MEDdatasetExist.c med-4.1.0/src/hdfi/_MEDdatasetExist.c
---- med-4.1.0-orig/src/hdfi/_MEDdatasetExist.c	2020-03-11 10:36:37.000000000 +0100
-+++ med-4.1.0/src/hdfi/_MEDdatasetExist.c	2022-01-20 18:22:38.394310000 +0100
-@@ -47,7 +47,7 @@
- 
-     case H5L_TYPE_HARD:
-       *isasoftlink  = MED_FALSE;
--      if ( H5Oget_info_by_name( gid, datasetname, &_oinfo, H5P_DEFAULT ) <0) {
-+      if ( H5Oget_info_by_name( gid, datasetname, &_oinfo, H5O_INFO_BASIC, H5P_DEFAULT ) <0) {
- 	MED_ERR_(_ret,MED_ERR_CALL,MED_ERR_API,"H5Oget_info_by_name");
- 	SSCRUTE( datasetname);
-       }
-diff -ruN med-4.1.0-orig/src/hdfi/_MEDlinkObjs.c med-4.1.0/src/hdfi/_MEDlinkObjs.c
---- med-4.1.0-orig/src/hdfi/_MEDlinkObjs.c	2020-03-11 10:36:37.000000000 +0100
-+++ med-4.1.0/src/hdfi/_MEDlinkObjs.c	2022-01-20 18:22:25.480007000 +0100
-@@ -62,7 +62,7 @@
-        sur un lien hard
-        Sur un lien soft H5O_TYPE_UNKNOWN
-     */
--    if ( H5Oget_info_by_name( id, lname, &oinfo, H5P_DEFAULT ) <0) {
-+    if ( H5Oget_info_by_name( id, lname, &oinfo, H5O_INFO_BASIC, H5P_DEFAULT ) <0) {
-       MED_ERR_(_ret,MED_ERR_CALL,MED_ERR_API,"H5Oget_info_by_name");
-       SSCRUTE(lname);
-     }
-diff -ruN med-4.1.0-orig/tools/medimport/2.3.6/_MEDconvertStringDatasets.c med-4.1.0/tools/medimport/2.3.6/_MEDconvertStringDatasets.c
---- med-4.1.0-orig/tools/medimport/2.3.6/_MEDconvertStringDatasets.c	2020-03-11 10:36:40.000000000 +0100
-+++ med-4.1.0/tools/medimport/2.3.6/_MEDconvertStringDatasets.c	2022-01-20 18:23:07.202747000 +0100
-@@ -52,7 +52,7 @@
-     oinfo.type=(H5O_type_t) H5G_LINK;
-     break;
-   case H5L_TYPE_HARD:
--    if ( H5Oget_info_by_name( id, lname, &oinfo, H5P_DEFAULT ) <0) {
-+    if ( H5Oget_info_by_name( id, lname, &oinfo, H5O_INFO_BASIC, H5P_DEFAULT ) <0) {
-       MED_ERR_(_ret,MED_ERR_CALL,MED_ERR_API,"H5Oget_info_by_name");
-       SSCRUTE(lname);
-     }
diff --git a/Golden_Repo/m/MED/med-4.1.0_hdf5_v11201.patch b/Golden_Repo/m/MED/med-4.1.0_hdf5_v11201.patch
deleted file mode 100644
index c0900e784..000000000
--- a/Golden_Repo/m/MED/med-4.1.0_hdf5_v11201.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff -ruN med-4.1.0-orig/config/cmake_files/medMacros.cmake med-4.1.0/config/cmake_files/medMacros.cmake
---- med-4.1.0-orig/config/cmake_files/medMacros.cmake	2020-01-30 17:04:19.000000000 +0100
-+++ med-4.1.0/config/cmake_files/medMacros.cmake	2021-12-19 17:43:22.912215417 +0100
-@@ -447,7 +447,7 @@
-     ##
-     ## Requires 1.10.x version
-     ##
--    IF (NOT HDF_VERSION_MAJOR_REF EQUAL 1 OR NOT HDF_VERSION_MINOR_REF EQUAL 10 OR NOT HDF_VERSION_RELEASE_REF GREATER 1)
-+    IF (HDF5_VERSION VERSION_LESS 1.10.2)
-         MESSAGE(FATAL_ERROR "HDF5 version is ${HDF_VERSION_REF}. Only versions >= 1.10.2 are supported.")
-     ENDIF()
-     ##
-diff -ruN med-4.1.0-orig/src/hdfi/_MEDfileCreate.c med-4.1.0/src/hdfi/_MEDfileCreate.c
---- med-4.1.0-orig/src/hdfi/_MEDfileCreate.c	2020-03-11 10:36:37.000000000 +0100
-+++ med-4.1.0/src/hdfi/_MEDfileCreate.c	2021-12-19 17:45:54.776831000 +0100
-@@ -159,7 +159,7 @@
-    * En HDF5-1.10.0p1 cela n'a aucun effet ! 
-    * Un test autoconf permet de fixer un intervalle de version HDF à MED.
-    */
--#if H5_VERS_MINOR > 10
-+#if H5_VERS_MINOR > 12
- #error "Don't forget to change the compatibility version of the library !"
- #endif
-    
-diff -ruN med-4.1.0-orig/src/hdfi/_MEDfileOpen.c med-4.1.0/src/hdfi/_MEDfileOpen.c
---- med-4.1.0-orig/src/hdfi/_MEDfileOpen.c	2020-03-12 16:27:49.000000000 +0100
-+++ med-4.1.0/src/hdfi/_MEDfileOpen.c	2021-12-19 17:47:06.339960000 +0100
-@@ -72,7 +72,7 @@
- 
-    •   The creation order tracking property, H5P_CRT_ORDER_TRACKED, has been set in the group creation property list (see H5Pset_link_creation_order). 
-   */
--#if H5_VERS_MINOR > 10
-+#if H5_VERS_MINOR > 12
- #error "Don't forget to change the compatibility version of the library !"
- #endif
- /* L'avantage de bloquer le modèle interne HDF5 
-diff -ruN med-4.1.0-orig/src/hdfi/_MEDmemFileOpen.c med-4.1.0/src/hdfi/_MEDmemFileOpen.c
---- med-4.1.0-orig/src/hdfi/_MEDmemFileOpen.c	2020-03-11 11:06:04.000000000 +0100
-+++ med-4.1.0/src/hdfi/_MEDmemFileOpen.c	2021-12-19 17:47:36.424414488 +0100
-@@ -434,7 +434,7 @@
-     goto ERROR;
-   }
- 
--#if H5_VERS_MINOR > 10
-+#if H5_VERS_MINOR > 12
- #error "Don't forget to change the compatibility version of the library !"
- #endif
-   if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18) ) {
-diff -ruN med-4.1.0-orig/src/hdfi/_MEDparFileCreate.c med-4.1.0/src/hdfi/_MEDparFileCreate.c
---- med-4.1.0-orig/src/hdfi/_MEDparFileCreate.c	2020-03-11 10:36:37.000000000 +0100
-+++ med-4.1.0/src/hdfi/_MEDparFileCreate.c	2021-12-19 17:48:04.197197000 +0100
-@@ -64,7 +64,7 @@
-    * En HDF5-1.10.0p1 cela n'a aucun effet ! 
-    * Un test autoconf permet de fixer un intervalle de version HDF à MED.
-    */
--#if H5_VERS_MINOR > 10
-+#if H5_VERS_MINOR > 12
- #error "Don't forget to change the compatibility version of the library !"
- #endif
-    
-diff -ruN med-4.1.0-orig/src/hdfi/_MEDparFileOpen.c med-4.1.0/src/hdfi/_MEDparFileOpen.c
---- med-4.1.0-orig/src/hdfi/_MEDparFileOpen.c	2020-03-11 10:36:36.000000000 +0100
-+++ med-4.1.0/src/hdfi/_MEDparFileOpen.c	2021-12-19 17:48:23.560680000 +0100
-@@ -55,7 +55,7 @@
-     MED_ERR_(_fid,MED_ERR_INIT,MED_ERR_PROPERTY,MED_ERR_PARALLEL_MSG);
-     goto ERROR;
-   }
--#if H5_VERS_MINOR > 10
-+#if H5_VERS_MINOR > 12
- #error "Don't forget to change the compatibility version of the library !"
- #endif
-   if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18 ) ) {
-diff -ruN med-4.1.0-orig/config/med_check_hdf5.m4 med-4.1.0/config/med_check_hdf5.m4
---- med-4.1.0-orig/config/med_check_hdf5.m4	2020-03-11 10:36:32.000000000 +0100
-+++ med-4.1.0/config/med_check_hdf5.m4	2022-01-20 15:31:06.868449943 +0100
-@@ -133,8 +133,9 @@
-          H5_VER_MAJOR=`  grep '#define *H5_VERS_MAJOR' $HDF5_ABS_PATH | sed  's/^.*H5_VERS_MAJOR[[ \t]]*\([0-9]*\)[[ \t]]*.*$/\1/g' `
-          H5_VER_MINOR=`  grep '#define *H5_VERS_MINOR' $HDF5_ABS_PATH | sed  's/^.*H5_VERS_MINOR[[ \t]]*\([0-9]*\)[[ \t]]*.*$/\1/g' `
-          H5_VER_RELEASE=`grep '#define *H5_VERS_RELEASE' $HDF5_ABS_PATH | sed  's/^.*H5_VERS_RELEASE[[ \t]]*\([0-9]*\)[[ \t]]*.*$/\1/g' `
--         HDF5_VERSION=`  expr 10000 \* ${H5_VER_MAJOR} + 100 \* ${H5_VER_MINOR} + ${H5_VER_RELEASE} `
--         test "0${HDF5_VERSION}" -gt "11100" || test "0${HDF5_VERSION}" -lt "11002" && AC_MSG_ERROR([
-+         # HDF5_VERSION=`  expr 10000 \* ${H5_VER_MAJOR} + 100 \* ${H5_VER_MINOR} + ${H5_VER_RELEASE} `
-+         HDF5_VERSION="11201"
-+         test "0${HDF5_VERSION}" -gt "11210" || test "0${HDF5_VERSION}" -lt "11002" && AC_MSG_ERROR([
- This HDF5 version ${H5_VER_MAJOR}.${H5_VER_MINOR}.${H5_VER_RELEASE} must not be used with med-fichier${MED_NUM_MAJEUR}.${MED_NUM_MINEUR}.${MED_NUM_RELEASE}.
- The HDF5 library version used by med-fichier${MED_NUM_MAJEUR}.y.z MUST NOT be > 1.10 and have to be at least HDF${HDF_VERSION_REF}.
- DO NOT TRY TO COMPILE med-fichier${MED_NUM_MAJEUR}.${MED_NUM_MINEUR}.${MED_NUM_RELEASE} version with an HDF5 library which would generate an hdf5 file not compliant with HDF5-${HDF_VERSION_MAJOR_REF}.${HDF_VERSION_MINOR_REF}.z library.
-diff -ruN med-4.1.0-orig/configure med-4.1.0/configure
---- med-4.1.0-orig/configure	2020-03-11 12:53:46.000000000 +0100
-+++ med-4.1.0/configure	2022-01-20 16:07:15.956942479 +0100
-@@ -7576,8 +7576,12 @@
-          H5_VER_MAJOR=`  grep '#define *H5_VERS_MAJOR' $HDF5_ABS_PATH | sed  's/^.*H5_VERS_MAJOR[[ \t]]*\([0-9]*\)[[ \t]]*.*$/\1/g' `
-          H5_VER_MINOR=`  grep '#define *H5_VERS_MINOR' $HDF5_ABS_PATH | sed  's/^.*H5_VERS_MINOR[[ \t]]*\([0-9]*\)[[ \t]]*.*$/\1/g' `
-          H5_VER_RELEASE=`grep '#define *H5_VERS_RELEASE' $HDF5_ABS_PATH | sed  's/^.*H5_VERS_RELEASE[[ \t]]*\([0-9]*\)[[ \t]]*.*$/\1/g' `
--         HDF5_VERSION=`  expr 10000 \* ${H5_VER_MAJOR} + 100 \* ${H5_VER_MINOR} + ${H5_VER_RELEASE} `
--         test "0${HDF5_VERSION}" -gt "11100" || test "0${HDF5_VERSION}" -lt "11002" && as_fn_error $? "
-+         H5_VER_MAJOR="1"
-+         H5_VER_MINOR="12"
-+         H5_VER_RELEASE="1"
-+         # HDF5_VERSION=`  expr 10000 \* ${H5_VER_MAJOR} + 100 \* ${H5_VER_MINOR} + ${H5_VER_RELEASE} `
-+         HDF5_VERSION="11201"
-+         test "0${HDF5_VERSION}" -gt "11210" || test "0${HDF5_VERSION}" -lt "11002" && as_fn_error $? "
- This HDF5 version ${H5_VER_MAJOR}.${H5_VER_MINOR}.${H5_VER_RELEASE} must not be used with med-fichier${MED_NUM_MAJEUR}.${MED_NUM_MINEUR}.${MED_NUM_RELEASE}.
- The HDF5 library version used by med-fichier${MED_NUM_MAJEUR}.y.z MUST NOT be > 1.10 and have to be at least HDF${HDF_VERSION_REF}.
- DO NOT TRY TO COMPILE med-fichier${MED_NUM_MAJEUR}.${MED_NUM_MINEUR}.${MED_NUM_RELEASE} version with an HDF5 library which would generate an hdf5 file not compliant with HDF5-${HDF_VERSION_MAJOR_REF}.${HDF_VERSION_MINOR_REF}.z library.
-diff -ruN med-4.1.0-orig/src/ci/MEDfileCompatibility.c med-4.1.0/src/ci/MEDfileCompatibility.c
---- med-4.1.0-orig/src/ci/MEDfileCompatibility.c	2020-03-11 10:36:34.000000000 +0100
-+++ med-4.1.0/src/ci/MEDfileCompatibility.c	2022-01-20 16:10:40.474811000 +0100
-@@ -71,7 +71,7 @@
-   _hversionMMR=10000*_hmajeur+100*_hmineur+_hrelease;
-   /* ISCRUTE(_hversionMMR); */
-   /* ISCRUTE(HDF_VERSION_NUM_REF); */
--  if ( (_hversionMMR >= HDF_VERSION_NUM_REF) && (_hmineur == HDF_VERSION_MINOR_REF) ) *hdfok = MED_TRUE;
-+  if (_hversionMMR >= HDF_VERSION_NUM_REF) *hdfok = MED_TRUE;
- 
-   /* TODO : Vérifier si la version mineure HDF du fichier est supérieure
-      à la version mineure de la bibliothèque HDF utilisée :
-@@ -113,7 +113,7 @@
- #if MED_NUM_MAJEUR != 4
- #error "Don't forget to update the test version here when you change the major version of the library !"
- #endif
--#if H5_VERS_MINOR > 10
-+#if H5_VERS_MINOR > 12
- #error "Don't forget to check the compatibility version of the library, depending on the internal hdf model choice !"
- #error "Cf. _MEDfileCreate ..."
- #endif
diff --git a/Golden_Repo/m/METIS/METIS-5.1.0-GCC-11.2.0-RTW64-IDX32.eb b/Golden_Repo/m/METIS/METIS-5.1.0-GCC-11.2.0-RTW64-IDX32.eb
deleted file mode 100644
index 42832ef60..000000000
--- a/Golden_Repo/m/METIS/METIS-5.1.0-GCC-11.2.0-RTW64-IDX32.eb
+++ /dev/null
@@ -1,32 +0,0 @@
-name = 'METIS'
-version = '5.1.0'
-versionsuffix = '-RTW64-IDX32'
-
-homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/metis/overview'
-description = """METIS is a set of serial programs for partitioning graphs, partitioning finite element meshes,
-and producing fill reducing orderings for sparse matrices. The algorithms implemented in METIS are based on the
-multilevel recursive-bisection, multilevel k-way, and multi-constraint partitioning schemes.
-"""
-
-toolchain = {'name': 'GCC', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [
-    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis',
-    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/OLD',
-]
-sources = [SOURCELOWER_TAR_GZ]
-patches = ['METIS-5.1.0-use-doubles.patch']
-checksums = [
-    '76faebe03f6c963127dbb73c13eab58c9a3faeae48779f049066a21c087c5db2',  # metis-5.1.0.tar.gz
-    '8e79f5970c0fb36394dd6338dd3160eb346dc00e38c37ac90303e1ee5eb4c53f',  # METIS-5.1.0-use-doubles.patch
-]
-
-# We use 32bit for indices and 64bit for content
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM)
-]
-
-configopts = ['', 'shared=1']
-
-moduleclass = 'math'
diff --git a/Golden_Repo/m/METIS/METIS-5.1.0-GCC-11.2.0.eb b/Golden_Repo/m/METIS/METIS-5.1.0-GCC-11.2.0.eb
deleted file mode 100644
index 9da314203..000000000
--- a/Golden_Repo/m/METIS/METIS-5.1.0-GCC-11.2.0.eb
+++ /dev/null
@@ -1,26 +0,0 @@
-name = 'METIS'
-version = '5.1.0'
-
-homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/metis/overview'
-description = """METIS is a set of serial programs for partitioning graphs, partitioning finite element meshes,
-and producing fill reducing orderings for sparse matrices. The algorithms implemented in METIS are based on the
-multilevel recursive-bisection, multilevel k-way, and multi-constraint partitioning schemes.
-"""
-
-toolchain = {'name': 'GCC', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [
-    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis',
-    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/OLD',
-]
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['76faebe03f6c963127dbb73c13eab58c9a3faeae48779f049066a21c087c5db2']
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM)
-]
-
-configopts = ['', 'shared=1']
-
-moduleclass = 'math'
diff --git a/Golden_Repo/m/METIS/METIS-5.1.0-GCCcore-11.2.0-IDX64.eb b/Golden_Repo/m/METIS/METIS-5.1.0-GCCcore-11.2.0-IDX64.eb
deleted file mode 100644
index 2c53569e8..000000000
--- a/Golden_Repo/m/METIS/METIS-5.1.0-GCCcore-11.2.0-IDX64.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-name = 'METIS'
-version = '5.1.0'
-versionsuffix = '-IDX64'
-
-homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/metis/overview'
-description = """METIS is a set of serial programs for partitioning graphs, partitioning finite element meshes,
-and producing fill reducing orderings for sparse matrices. The algorithms implemented in METIS are based on the
-multilevel recursive-bisection, multilevel k-way, and multi-constraint partitioning schemes.
-"""
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [
-    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis',
-    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/OLD',
-]
-sources = [SOURCELOWER_TAR_GZ]
-patches = ['METIS-5.1.0-IDX64.patch']
-checksums = [
-    '76faebe03f6c963127dbb73c13eab58c9a3faeae48779f049066a21c087c5db2',  # metis-5.1.0.tar.gz
-    # METIS-5.1.0-IDX64.patch
-    '382337016508006671e5495652f25a7f835e56134681a21b0c8525b4b88ab99e',
-]
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1', '', SYSTEM)
-]
-
-configopts = ['', 'shared=1']
-
-moduleclass = 'math'
diff --git a/Golden_Repo/m/METIS/METIS-5.1.0-IDX64.patch b/Golden_Repo/m/METIS/METIS-5.1.0-IDX64.patch
deleted file mode 100644
index 708166923..000000000
--- a/Golden_Repo/m/METIS/METIS-5.1.0-IDX64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/metis_orig.h	2021-01-20 15:05:51.807203000 +0100
-+++ include/metis.h	2021-01-20 15:07:06.391591000 +0100
-@@ -30,7 +30,7 @@
-  GCC does provides these definitions in stdint.h, but it may require some
-  modifications on other architectures.
- --------------------------------------------------------------------------*/
--#define IDXTYPEWIDTH 32
-+#define IDXTYPEWIDTH 64
- 
- 
- /*--------------------------------------------------------------------------
diff --git a/Golden_Repo/m/METIS/METIS-5.1.0-intel-compilers-2021.4.0.eb b/Golden_Repo/m/METIS/METIS-5.1.0-intel-compilers-2021.4.0.eb
deleted file mode 100644
index c3a1605ba..000000000
--- a/Golden_Repo/m/METIS/METIS-5.1.0-intel-compilers-2021.4.0.eb
+++ /dev/null
@@ -1,26 +0,0 @@
-name = 'METIS'
-version = '5.1.0'
-
-homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/metis/overview'
-description = """METIS is a set of serial programs for partitioning graphs, partitioning finite element meshes,
-and producing fill reducing orderings for sparse matrices. The algorithms implemented in METIS are based on the
-multilevel recursive-bisection, multilevel k-way, and multi-constraint partitioning schemes.
-"""
-
-toolchain = {'name': 'intel-compilers', 'version': '2021.4.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [
-    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis',
-    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/OLD',
-]
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['76faebe03f6c963127dbb73c13eab58c9a3faeae48779f049066a21c087c5db2']
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM)
-]
-
-configopts = ['', 'shared=1']
-
-moduleclass = 'math'
diff --git a/Golden_Repo/m/METIS/METIS-5.1.0-use-doubles.patch b/Golden_Repo/m/METIS/METIS-5.1.0-use-doubles.patch
deleted file mode 100644
index c7b875167..000000000
--- a/Golden_Repo/m/METIS/METIS-5.1.0-use-doubles.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-# Use double for floating point (64 bit) in METIS by default
-# OpenFOAM 4 uses doubles be default
-diff -ur metis-5.1.0.orig/include/metis.h metis-5.1.0/include/metis.h
---- metis-5.1.0.orig/include/metis.h	2013-03-30 17:24:45.000000000 +0100
-+++ metis-5.1.0/include/metis.h	2016-09-05 11:39:33.004384533 +0200
-@@ -40,7 +40,7 @@
-    32 : single precission floating point (float)
-    64 : double precission floating point (double)
- --------------------------------------------------------------------------*/
--#define REALTYPEWIDTH 32
-+#define REALTYPEWIDTH 64
diff --git a/Golden_Repo/m/MPB/MPB-1.11.1-ipsmpi-2021b.eb b/Golden_Repo/m/MPB/MPB-1.11.1-ipsmpi-2021b.eb
deleted file mode 100644
index 2ce4a0184..000000000
--- a/Golden_Repo/m/MPB/MPB-1.11.1-ipsmpi-2021b.eb
+++ /dev/null
@@ -1,51 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'MPB'
-version = '1.11.1'
-
-homepage = 'https://mpb.readthedocs.io/en/latest/'
-description = """MPB is a free and open-source software package for computing
- the band structures, or dispersion relations, and electromagnetic
- modes of periodic dielectric structures, on both serial
- and parallel computers. MPB is an acronym for MIT Photonic Bands."""
-
-toolchain = {'name': 'ipsmpi', 'version': '2021b'}
-toolchainopts = {'usempi': True, 'pic': True}
-
-source_urls = ['https://github.com/NanoComp/mpb/releases/download/v%(version)s/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['dc55b081c56079727dac92d309f8e4ea84ca6eea9122ec24b7955f8c258608e1']
-
-builddependencies = [
-    ('Autotools', '20210726'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('imkl', '2021.4.0'),
-    ('HDF5', '1.12.1'),
-    ('libctl', '4.5.1'),
-    ('FFTW', '3.3.10'),
-    ('GSL', '2.7'),
-    ('guile', '3.0.7'),
-    ('libreadline', '8.1'),
-]
-
-local_common_configopts = "--with-pic --with-blas=mkl_em64t --with-lapack=mkl_em64t "
-local_common_configopts += "--with-libctl=$EBROOTLIBCTL/share/libctl --enable-shared "
-local_common_configopts += "--with-hermitian-eps "
-configopts = [
-    local_common_configopts + " ",
-    local_common_configopts + " --with-inv-symmetry",
-    local_common_configopts + " --with-mpi CC=mpicc CXX=mpic++ F77=mpif90 MPIRUN=srun ",
-    local_common_configopts + " --with-mpi --with-inv-symmetry CC=mpicc CXX=mpic++ F77=mpif90 MPIRUN=srun ",
-]
-
-sanity_check_paths = {
-    'files': ['bin/mpb%s' % x for x in ['', '-data', 'i', 'i-data', 'i-mpi', 'i-split', '-mpi', '-split']] +
-             ['lib/libmpb.a', 'lib/libmpbi_mpi.a', 'lib/libmpbi.a', 'lib/libmpb_mpi.a', 'lib/libmpb.%s' % SHLIB_EXT,
-              'lib/libmpbi_mpi.%s' % SHLIB_EXT, 'lib/libmpbi.%s' % SHLIB_EXT, 'lib/libmpb_mpi.%s' % SHLIB_EXT],
-    'dirs': ['include'],
-}
-
-moduleclass = 'phys'
diff --git a/Golden_Repo/m/MPC/MPC-1.2.1-GCCcore-11.2.0.eb b/Golden_Repo/m/MPC/MPC-1.2.1-GCCcore-11.2.0.eb
deleted file mode 100644
index 167126ce6..000000000
--- a/Golden_Repo/m/MPC/MPC-1.2.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,35 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'MPC'
-version = '1.2.1'
-
-homepage = 'http://www.multiprecision.org/'
-description = """Gnu Mpc is a C library for the arithmetic of
- complex numbers with arbitrarily high precision and correct
- rounding of the result. It extends the principles of the IEEE-754
- standard for fixed precision real floating point numbers to
- complex numbers, providing well-defined semantics for every
- operation. At the same time, speed of operation at high precision
- is a major design goal."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://ftpmirror.gnu.org/gnu/mpc/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['17503d2c395dfcf106b622dc142683c1199431d095367c6aacba6eec30340459']
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [
-    ('GMP', '6.2.1'),
-    ('MPFR', '4.1.0'),
-]
-
-runtest = 'check'
-
-sanity_check_paths = {
-    'files': ['lib/libmpc.%s' % SHLIB_EXT, 'include/mpc.h'],
-    'dirs': []
-}
-
-moduleclass = 'math'
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
deleted file mode 100644
index cf9642666..000000000
--- a/Golden_Repo/m/MPFR/MPFR-4.1.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,39 +0,0 @@
-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/m/MUMPS/MUMPS-5.4.1-gomkl-2021b.eb b/Golden_Repo/m/MUMPS/MUMPS-5.4.1-gomkl-2021b.eb
deleted file mode 100644
index 67e381777..000000000
--- a/Golden_Repo/m/MUMPS/MUMPS-5.4.1-gomkl-2021b.eb
+++ /dev/null
@@ -1,68 +0,0 @@
-name = 'MUMPS'
-version = '5.4.1'
-
-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 are 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."""
-
-toolchain = {'name': 'gomkl', 'version': '2021b'}
-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
-    'MUMPS-%(version)s_shared-mumps.patch',   # builds the shared libs of MUMPS
-]
-checksums = [
-    'aa1c53976279922853aaed70deb507b3339de187cc62f4c1d0fd0fadea38529f',  # MUMPS_5.4.1.tar.gz
-    '58cda1412904416075ad11212be6c08f977b120237e0206331c7930763edbe84',  # MUMPS-5.4.1_examples_mkl.patch
-    '5ff803839563190df5c582e60581e54e34475df5ea6fbad01e9f1b89a49836bd',  # MUMPS-5.4.1_shared-pord.patch
-    '30f02a1eab570a0550175afacf7eca095c4a2c7862843fd846033045d401c6da',  # MUMPS-5.4.1_shared-mumps.patch
-]
-
-dependencies = [
-    ('SCOTCH', '6.1.2'),
-    ('ParMETIS', '4.0.3'),
-]
-
-buildopts = 'all SONAME_VERSION="%(version)s"'
-
-parallel = 1
-
-# fix 'Type mismatch between actual argument' errors with GCC 10.x
-prebuildopts = 'export FFLAGS="$FFLAGS -fallow-argument-mismatch" && '
-
-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_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/*",
-]
-
-moduleclass = 'math'
diff --git a/Golden_Repo/m/MUMPS/MUMPS-5.4.1-gpsmkl-2021b.eb b/Golden_Repo/m/MUMPS/MUMPS-5.4.1-gpsmkl-2021b.eb
deleted file mode 100644
index 9bf517729..000000000
--- a/Golden_Repo/m/MUMPS/MUMPS-5.4.1-gpsmkl-2021b.eb
+++ /dev/null
@@ -1,68 +0,0 @@
-name = 'MUMPS'
-version = '5.4.1'
-
-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 are 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."""
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-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
-    'MUMPS-%(version)s_shared-mumps.patch',   # builds the shared libs of MUMPS
-]
-checksums = [
-    '93034a1a9fe0876307136dcde7e98e9086e199de76f1c47da822e7d4de987fa8',  # MUMPS_5.4.1.tar.gz
-    '58cda1412904416075ad11212be6c08f977b120237e0206331c7930763edbe84',  # MUMPS-5.4.1_examples_mkl.patch
-    '5ff803839563190df5c582e60581e54e34475df5ea6fbad01e9f1b89a49836bd',  # MUMPS-5.4.1_shared-pord.patch
-    '30f02a1eab570a0550175afacf7eca095c4a2c7862843fd846033045d401c6da',  # MUMPS-5.4.1_shared-mumps.patch
-]
-
-dependencies = [
-    ('SCOTCH', '6.1.2'),
-    ('ParMETIS', '4.0.3'),
-]
-
-buildopts = 'all SONAME_VERSION="%(version)s"'
-
-parallel = 1
-
-# fix 'Type mismatch between actual argument' errors with GCC 10.x
-prebuildopts = 'export FFLAGS="$FFLAGS -fallow-argument-mismatch" && '
-
-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_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/*",
-]
-
-moduleclass = 'math'
diff --git a/Golden_Repo/m/MUMPS/MUMPS-5.4.1_examples_mkl.patch b/Golden_Repo/m/MUMPS/MUMPS-5.4.1_examples_mkl.patch
deleted file mode 100644
index 1e6752642..000000000
--- a/Golden_Repo/m/MUMPS/MUMPS-5.4.1_examples_mkl.patch
+++ /dev/null
@@ -1,270 +0,0 @@
---- MUMPS_5.4.1/examples/Makefile	2021-08-03 11:49:48.000000000 +0200
-+++ MUMPS_5.4.1_ok/examples/Makefile	2022-01-18 10:16:07.296717000 +0100
-@@ -21,28 +21,28 @@
- 
- include $(topdir)/Makefile.inc
- 
--LIBMUMPS_COMMON = $(libdir)/libmumps_common$(PLAT)$(LIBEXT)
-+LIBMUMPS_COMMON = $(libdir)/libmumps_common$(PLAT).so
- 
- 
--LIBSMUMPS = $(libdir)/libsmumps$(PLAT)$(LIBEXT) $(LIBMUMPS_COMMON)
-+LIBSMUMPS = $(libdir)/libsmumps$(PLAT).so $(LIBMUMPS_COMMON)
- 
- ssimpletest:  $(LIBSMUMPS)  $$@.o
- 	$(FL) -o $@ $(OPTL) ssimpletest.o  $(LIBSMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS)
- 
- 
--LIBDMUMPS = $(libdir)/libdmumps$(PLAT)$(LIBEXT) $(LIBMUMPS_COMMON)
-+LIBDMUMPS = $(libdir)/libdmumps$(PLAT).so $(LIBMUMPS_COMMON)
- 
- dsimpletest: $(LIBDMUMPS)  $$@.o 
- 	$(FL) -o $@ $(OPTL) dsimpletest.o  $(LIBDMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS)
- 
- 
--LIBCMUMPS = $(libdir)/libcmumps$(PLAT)$(LIBEXT) $(LIBMUMPS_COMMON)
-+LIBCMUMPS = $(libdir)/libcmumps$(PLAT).so $(LIBMUMPS_COMMON)
- 
- csimpletest: $(LIBCMUMPS)  $$@.o
- 	$(FL) -o $@ $(OPTL) csimpletest.o  $(LIBCMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS)
- 
- 
--LIBZMUMPS = $(libdir)/libzmumps$(PLAT)$(LIBEXT) $(LIBMUMPS_COMMON)
-+LIBZMUMPS = $(libdir)/libzmumps$(PLAT).so $(LIBMUMPS_COMMON)
- 
- zsimpletest: $(LIBZMUMPS)  $$@.o
- 	$(FL) -o $@ $(OPTL) zsimpletest.o  $(LIBZMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS)
-@@ -76,19 +76,19 @@
- 	$(CC) $(OPTC) $(CDEFS) -I. -I$(topdir)/include -I$(topdir)/src $(INCS) -c $*.c $(OUTC)$*.o
- 
- 
--$(libdir)/libsmumps$(PLAT)$(LIBEXT):
-+$(libdir)/libsmumps$(PLAT).so:
- 	@echo 'Error: you should build the library' $@ 'first'
- 	exit 1
- 
--$(libdir)/libdmumps$(PLAT)$(LIBEXT):
-+$(libdir)/libdmumps$(PLAT).so:
- 	@echo 'Error: you should build the library' $@ 'first'
- 	exit 1
- 
--$(libdir)/libcmumps$(PLAT)$(LIBEXT):
-+$(libdir)/libcmumps$(PLAT).so:
- 	@echo 'Error: you should build the library' $@ 'first'
- 	exit 1
- 
--$(libdir)/libzmumps$(PLAT)$(LIBEXT):
-+$(libdir)/libzmumps$(PLAT).so:
- 	@echo 'Error: you should build the library' $@ 'first'
- 	exit 1
- 
---- MUMPS_5.4.1/examples/Makefile_installed	1970-01-01 01:00:00.000000000 +0100
-+++ MUMPS_5.4.1_ok/examples/Makefile_installed	2022-01-18 10:17:16.204268000 +0100
-@@ -0,0 +1,102 @@
-+#
-+#  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
-+# OpenMPI
-+# SCALAP = -lmkl_scalapack_lp64 $(MKLROOT)/lib/intel64/libmkl_blacs_openmpi_lp64.a
-+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 $(LIBMUMPS_COMMON)
-+
-+csimpletest:  $$@.o
-+	$(FL) -o $@ $(OPTL) csimpletest.o  $(LIBCMUMPS) $(LORDERINGS) $(LIBPAR)
-+
-+
-+LIBZMUMPS = -L$(MUMPS_LIB) -lzmumps $(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
-+
-+
-+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.4.1/examples/Makefile_installed_gnu	1970-01-01 01:00:00.000000000 +0100
-+++ MUMPS_5.4.1_ok/examples/Makefile_installed_gnu	2022-01-18 10:17:42.163557000 +0100
-@@ -0,0 +1,102 @@
-+#
-+#  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
-+# OpenMPI
-+# SCALAP = -lmkl_scalapack_lp64 $(MKLROOT)/lib/intel64/libmkl_blacs_openmpi_lp64.a
-+LIBPAR = $(SCALAP) $(LIBBLAS)
-+
-+#Preprocessor defs for calling Fortran from C (-DAdd_ or -DAdd__ or -DUPPER)
-+CDEFS   = -DAdd_
-+
-+#Begin Optimized options
-+OPTF    = -O -fopenmp -DALLOW_NON_INIT
-+OPTL    = -O -fopenmp
-+OPTC    = -O -fopenmp
-+#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 $(LIBMUMPS_COMMON)
-+
-+csimpletest:  $$@.o
-+	$(FL) -o $@ $(OPTL) csimpletest.o  $(LIBCMUMPS) $(LORDERINGS) $(LIBPAR)
-+
-+
-+LIBZMUMPS = -L$(MUMPS_LIB) -lzmumps $(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
-+
-+
-+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.4.1_shared-mumps.patch b/Golden_Repo/m/MUMPS/MUMPS-5.4.1_shared-mumps.patch
deleted file mode 100644
index eaf919ce5..000000000
--- a/Golden_Repo/m/MUMPS/MUMPS-5.4.1_shared-mumps.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- MUMPS_5.4.1/src/Makefile	2021-08-03 11:49:43.000000000 +0200
-+++ MUMPS_5.4.1_ok/src/Makefile	2022-01-18 11:39:09.181814202 +0100
-@@ -14,19 +14,24 @@
- all: $(incdir)/mumps_int_def.h libcommon s d c z
- 
- libcommon: $(incdir)/mumps_int_def.h
-+	$(MAKE) $(libdir)/libmumps_common$(PLAT).so
- 	$(MAKE) $(libdir)/libmumps_common$(PLAT)$(LIBEXT)
- 
- s: $(incdir)/mumps_int_def.h libcommon
-+	$(MAKE) ARITH=s $(libdir)/libsmumps$(PLAT).so
- 	$(MAKE) ARITH=s $(libdir)/libsmumps$(PLAT)$(LIBEXT)
- 
- d: $(incdir)/mumps_int_def.h libcommon
- 	$(MAKE) ARITH=d $(libdir)/libdmumps$(PLAT)$(LIBEXT)
-+	$(MAKE) ARITH=d $(libdir)/libdmumps$(PLAT).so
- 
- c: $(incdir)/mumps_int_def.h libcommon
- 	$(MAKE) ARITH=c $(libdir)/libcmumps$(PLAT)$(LIBEXT)
-+	$(MAKE) ARITH=c $(libdir)/libcmumps$(PLAT).so
- 
- z: $(incdir)/mumps_int_def.h libcommon
- 	$(MAKE) ARITH=z $(libdir)/libzmumps$(PLAT)$(LIBEXT)
-+	$(MAKE) ARITH=z $(libdir)/libzmumps$(PLAT).so
- 
- include $(topdir)/Makefile.inc
- 
-@@ -200,6 +205,14 @@
- 	$(AR)$@ $?
- 	$(RANLIB) $@
- 
-+$(libdir)/libmumps_common$(PLAT).so:      $(OBJS_COMMON_MOD) $(OBJS_COMMON_OTHER)
-+	$(FC) -shared $^ -Wl,-soname,libmumps_common$(PLAT)-$(SONAME_VERSION).so $(OPTL) -L$(libdir) $(LORDERINGS) -lpthread $(MUMPS_LIBF77) $(MPIFLIB) $(MPICLIB) $(METISLIB) -o $(libdir)/libmumps_common$(PLAT)-$(SONAME_VERSION).so $(OPTL) -Wl,-z,defs
-+	ln -fs libmumps_common$(PLAT)-$(SONAME_VERSION).so $@
-+
-+$(libdir)/lib$(ARITH)mumps$(PLAT).so:    $(OBJS_MOD) $(OBJS_OTHER)
-+	$(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumps$(PLAT)-$(SONAME_VERSION).so $(OPTL) -L$(libdir) -lmumps_common$(PLAT) -lpthread $(MUMPS_LIBF77) $(LORDERINGS) $(MPIFLIB) $(METISLIB) $(SCALAP) -o $(libdir)/lib$(ARITH)mumps$(PLAT)-$(SONAME_VERSION).so $(OPTL) -Wl,-z,defs
-+	ln -fs lib$(ARITH)mumps$(PLAT)-$(SONAME_VERSION).so $@
-+
- # Dependencies between modules:
- # i) arithmetic-dependent modules:
- $(ARITH)ana_aux.o:              $(ARITH)mumps_struc_def.o \
-@@ -411,13 +424,13 @@
- 
- .SUFFIXES: .c .F .o
- .F.o:
--	$(FC) $(OPTF) -I. -I../include $(INCS) $(IORDERINGSF) $(ORDERINGSF) -c $*.F $(OUTF)$*.o
-+	$(FC) $(OPTF) -I. -I../include $(INCS) $(IORDERINGSF) $(ORDERINGSF) -fPIC -c $*.F $(OUTF)$*.o
- .c.o:
--	$(CC) $(OPTC) -I../include $(INCS) $(CDEFS) $(IORDERINGSC) $(ORDERINGSC) -c $*.c $(OUTC)$*.o
-+	$(CC) $(OPTC) -I../include $(INCS) $(CDEFS) $(IORDERINGSC) $(ORDERINGSC) -fPIC -c $*.c $(OUTC)$*.o
- 
- $(ARITH)mumps_c.o:	mumps_c.c
- 	$(CC) $(OPTC) -I../include $(INCS) $(CDEFS) -DMUMPS_ARITH=MUMPS_ARITH_$(ARITH) \
--	      $(IORDERINGSC) $(ORDERINGSC) -c mumps_c.c $(OUTC)$@
-+	      $(IORDERINGSC) $(ORDERINGSC) -fPIC -c mumps_c.c $(OUTC)$@
- 
- clean:
- 	$(RM) *.o *.mod $(incdir)/mumps_int_def.h build_mumps_int_def
diff --git a/Golden_Repo/m/MUMPS/MUMPS-5.4.1_shared-pord.patch b/Golden_Repo/m/MUMPS/MUMPS-5.4.1_shared-pord.patch
deleted file mode 100644
index be31db7b9..000000000
--- a/Golden_Repo/m/MUMPS/MUMPS-5.4.1_shared-pord.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- MUMPS_5.4.1/Makefile	2021-08-03 11:49:43.000000000 +0200
-+++ MUMPS_5.4.1_ok/Makefile	2022-01-14 16:21:56.000514000 +0100
-@@ -42,7 +42,7 @@
- 
- include Makefile.inc
- 
--prerequisites: Makefile.inc $(LIBSEQNEEDED) $(libdir)/libpord$(PLAT)$(LIBEXT)
-+prerequisites: Makefile.inc $(LIBSEQNEEDED) $(libdir)/libpord$(PLAT)$(LIBEXT) $(libdir)/libpord$(PLAT).so
- 
- # dummy MPI library (sequential version)
- 
-@@ -59,6 +59,12 @@
- 	  cp $(LPORDDIR)/libpord$(LIBEXT) $@; \
- 	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)
---- MUMPS_5.4.1/PORD/lib/Makefile	2021-08-03 11:49:43.000000000 +0200
-+++ MUMPS_5.4.1_ok/PORD/lib/Makefile	2022-01-14 16:24:27.990175000 +0100
-@@ -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 \
-@@ -28,6 +28,10 @@
- 	$(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
- 
diff --git a/Golden_Repo/m/MUST/MUST-1.7.2-gompi-2021b.eb b/Golden_Repo/m/MUST/MUST-1.7.2-gompi-2021b.eb
deleted file mode 100644
index 75f2ce6d0..000000000
--- a/Golden_Repo/m/MUST/MUST-1.7.2-gompi-2021b.eb
+++ /dev/null
@@ -1,53 +0,0 @@
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-# Copyright:: Copyright 2013-2021 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-# Authors::   Damian Alvarez <d.alvarez@fz-juelich.de>
-# Authors::   Benedikt Steinbusch <b.steinbusch@fz-juelich.de>
-# License::   New BSD
-#
-# This work is based from experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-easyblock = 'CMakeMake'
-
-name = "MUST"
-version = "1.7.2"
-
-homepage = 'https://hpc.rwth-aachen.de/must/'
-description = """MUST detects usage errors of the Message Passing Interface (MPI) and reports them
-to the user. As MPI calls are complex and usage errors common, this functionality is extremely helpful
-for application developers that want to develop correct MPI applications. This includes errors that
-already manifest --segmentation faults or incorrect results -- as well as many errors that are not
-visible to the application developer or do not manifest on a certain system or MPI implementation.
-"""
-
-toolchain = {'name': 'gompi', 'version': '2021b'}
-
-source_urls = ['https://hpc.rwth-aachen.de/must/files/']
-sources = ['%(name)s-v%(version)s.tar.gz']
-patches = [
-    'wrap-config.cmake.in.patch',
-]
-checksums = [
-    '616c54b7487923959df126ac4b47ae8c611717d679fe7ec29f57a89bf0e2e0d0',  # MUST-v1.7.2.tar.gz
-    'a7adba726fb68f928556dc6e16ad9b624c528a2c807b73e1a61e79a2b2431681',  # wrap-config.cmake.in.patch
-]
-
-builddependencies = [
-    ('CMake', '3.21.1'),
-]
-
-dependencies = [
-    ('Graphviz', '2.49.3'),
-    ('libxml2', '2.9.10'),
-    ('Python', '3.9.6'),
-]
-
-configopts = ' -DCMAKE_BUILD_TYPE=Release -DPython_ROOT_DIR="$EBROOTPYTHON" '
-
-sanity_check_paths = {
-    'files': ["bin/mustrun", "include/mustConfig.h"],
-    'dirs': [],
-}
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/m/MUST/MUST-1.7.2-gpsmpi-2021b.eb b/Golden_Repo/m/MUST/MUST-1.7.2-gpsmpi-2021b.eb
deleted file mode 100644
index 942c3f758..000000000
--- a/Golden_Repo/m/MUST/MUST-1.7.2-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,53 +0,0 @@
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-# Copyright:: Copyright 2013-2021 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-# Authors::   Damian Alvarez <d.alvarez@fz-juelich.de>
-# Authors::   Benedikt Steinbusch <b.steinbusch@fz-juelich.de>
-# License::   New BSD
-#
-# This work is based from experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-easyblock = 'CMakeMake'
-
-name = "MUST"
-version = "1.7.2"
-
-homepage = 'https://hpc.rwth-aachen.de/must/'
-description = """MUST detects usage errors of the Message Passing Interface (MPI) and reports them
-to the user. As MPI calls are complex and usage errors common, this functionality is extremely helpful
-for application developers that want to develop correct MPI applications. This includes errors that
-already manifest --segmentation faults or incorrect results -- as well as many errors that are not
-visible to the application developer or do not manifest on a certain system or MPI implementation.
-"""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-
-source_urls = ['https://hpc.rwth-aachen.de/must/files/']
-sources = ['%(name)s-v%(version)s.tar.gz']
-patches = [
-    'wrap-config.cmake.in.patch',
-]
-checksums = [
-    '616c54b7487923959df126ac4b47ae8c611717d679fe7ec29f57a89bf0e2e0d0',  # MUST-v1.7.2.tar.gz
-    'a7adba726fb68f928556dc6e16ad9b624c528a2c807b73e1a61e79a2b2431681',  # wrap-config.cmake.in.patch
-]
-
-builddependencies = [
-    ('CMake', '3.21.1'),
-]
-
-dependencies = [
-    ('Graphviz', '2.49.3'),
-    ('libxml2', '2.9.10'),
-    ('Python', '3.9.6'),
-]
-
-configopts = ' -DCMAKE_BUILD_TYPE=Release -DPython_ROOT_DIR="$EBROOTPYTHON" '
-
-sanity_check_paths = {
-    'files': ["bin/mustrun", "include/mustConfig.h"],
-    'dirs': [],
-}
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/m/MUST/MUST-1.7.2-iimpi-2021b.eb b/Golden_Repo/m/MUST/MUST-1.7.2-iimpi-2021b.eb
deleted file mode 100644
index 389bb3efa..000000000
--- a/Golden_Repo/m/MUST/MUST-1.7.2-iimpi-2021b.eb
+++ /dev/null
@@ -1,53 +0,0 @@
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-# Copyright:: Copyright 2013-2021 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-# Authors::   Damian Alvarez <d.alvarez@fz-juelich.de>
-# Authors::   Benedikt Steinbusch <b.steinbusch@fz-juelich.de>
-# License::   New BSD
-#
-# This work is based from experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-easyblock = 'CMakeMake'
-
-name = "MUST"
-version = "1.7.2"
-
-homepage = 'https://hpc.rwth-aachen.de/must/'
-description = """MUST detects usage errors of the Message Passing Interface (MPI) and reports them
-to the user. As MPI calls are complex and usage errors common, this functionality is extremely helpful
-for application developers that want to develop correct MPI applications. This includes errors that
-already manifest --segmentation faults or incorrect results -- as well as many errors that are not
-visible to the application developer or do not manifest on a certain system or MPI implementation.
-"""
-
-toolchain = {'name': 'iimpi', 'version': '2021b'}
-
-source_urls = ['https://hpc.rwth-aachen.de/must/files/']
-sources = ['%(name)s-v%(version)s.tar.gz']
-patches = [
-    'wrap-config.cmake.in.patch',
-]
-checksums = [
-    '616c54b7487923959df126ac4b47ae8c611717d679fe7ec29f57a89bf0e2e0d0',  # MUST-v1.7.2.tar.gz
-    'a7adba726fb68f928556dc6e16ad9b624c528a2c807b73e1a61e79a2b2431681',  # wrap-config.cmake.in.patch
-]
-
-builddependencies = [
-    ('CMake', '3.21.1'),
-]
-
-dependencies = [
-    ('Graphviz', '2.49.3'),
-    ('libxml2', '2.9.10'),
-    ('Python', '3.9.6'),
-]
-
-configopts = ' -DCMAKE_BUILD_TYPE=Release -DPython_ROOT_DIR="$EBROOTPYTHON" '
-
-sanity_check_paths = {
-    'files': ["bin/mustrun", "include/mustConfig.h"],
-    'dirs': [],
-}
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/m/MUST/MUST-1.7.2-iompi-2021b.eb b/Golden_Repo/m/MUST/MUST-1.7.2-iompi-2021b.eb
deleted file mode 100644
index 11728e6d4..000000000
--- a/Golden_Repo/m/MUST/MUST-1.7.2-iompi-2021b.eb
+++ /dev/null
@@ -1,53 +0,0 @@
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-# Copyright:: Copyright 2013-2021 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-# Authors::   Damian Alvarez <d.alvarez@fz-juelich.de>
-# Authors::   Benedikt Steinbusch <b.steinbusch@fz-juelich.de>
-# License::   New BSD
-#
-# This work is based from experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-easyblock = 'CMakeMake'
-
-name = "MUST"
-version = "1.7.2"
-
-homepage = 'https://hpc.rwth-aachen.de/must/'
-description = """MUST detects usage errors of the Message Passing Interface (MPI) and reports them
-to the user. As MPI calls are complex and usage errors common, this functionality is extremely helpful
-for application developers that want to develop correct MPI applications. This includes errors that
-already manifest --segmentation faults or incorrect results -- as well as many errors that are not
-visible to the application developer or do not manifest on a certain system or MPI implementation.
-"""
-
-toolchain = {'name': 'iompi', 'version': '2021b'}
-
-source_urls = ['https://hpc.rwth-aachen.de/must/files/']
-sources = ['%(name)s-v%(version)s.tar.gz']
-patches = [
-    'wrap-config.cmake.in.patch',
-]
-checksums = [
-    '616c54b7487923959df126ac4b47ae8c611717d679fe7ec29f57a89bf0e2e0d0',  # MUST-v1.7.2.tar.gz
-    'a7adba726fb68f928556dc6e16ad9b624c528a2c807b73e1a61e79a2b2431681',  # wrap-config.cmake.in.patch
-]
-
-builddependencies = [
-    ('CMake', '3.21.1'),
-]
-
-dependencies = [
-    ('Graphviz', '2.49.3'),
-    ('libxml2', '2.9.10'),
-    ('Python', '3.9.6'),
-]
-
-configopts = ' -DCMAKE_BUILD_TYPE=Release -DPython_ROOT_DIR="$EBROOTPYTHON" '
-
-sanity_check_paths = {
-    'files': ["bin/mustrun", "include/mustConfig.h"],
-    'dirs': [],
-}
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/m/MUST/MUST-1.7.2-ipsmpi-2021b.eb b/Golden_Repo/m/MUST/MUST-1.7.2-ipsmpi-2021b.eb
deleted file mode 100644
index 13a188222..000000000
--- a/Golden_Repo/m/MUST/MUST-1.7.2-ipsmpi-2021b.eb
+++ /dev/null
@@ -1,53 +0,0 @@
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-# Copyright:: Copyright 2013-2021 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-# Authors::   Damian Alvarez <d.alvarez@fz-juelich.de>
-# Authors::   Benedikt Steinbusch <b.steinbusch@fz-juelich.de>
-# License::   New BSD
-#
-# This work is based from experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-easyblock = 'CMakeMake'
-
-name = "MUST"
-version = "1.7.2"
-
-homepage = 'https://hpc.rwth-aachen.de/must/'
-description = """MUST detects usage errors of the Message Passing Interface (MPI) and reports them
-to the user. As MPI calls are complex and usage errors common, this functionality is extremely helpful
-for application developers that want to develop correct MPI applications. This includes errors that
-already manifest --segmentation faults or incorrect results -- as well as many errors that are not
-visible to the application developer or do not manifest on a certain system or MPI implementation.
-"""
-
-toolchain = {'name': 'ipsmpi', 'version': '2021b'}
-
-source_urls = ['https://hpc.rwth-aachen.de/must/files/']
-sources = ['%(name)s-v%(version)s.tar.gz']
-patches = [
-    'wrap-config.cmake.in.patch',
-]
-checksums = [
-    '616c54b7487923959df126ac4b47ae8c611717d679fe7ec29f57a89bf0e2e0d0',  # MUST-v1.7.2.tar.gz
-    'a7adba726fb68f928556dc6e16ad9b624c528a2c807b73e1a61e79a2b2431681',  # wrap-config.cmake.in.patch
-]
-
-builddependencies = [
-    ('CMake', '3.21.1'),
-]
-
-dependencies = [
-    ('Graphviz', '2.49.3'),
-    ('libxml2', '2.9.10'),
-    ('Python', '3.9.6'),
-]
-
-configopts = ' -DCMAKE_BUILD_TYPE=Release -DPython_ROOT_DIR="$EBROOTPYTHON" '
-
-sanity_check_paths = {
-    'files': ["bin/mustrun", "include/mustConfig.h"],
-    'dirs': [],
-}
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/m/MUST/wrap-config.cmake.in.patch b/Golden_Repo/m/MUST/wrap-config.cmake.in.patch
deleted file mode 100644
index 5240d39fd..000000000
--- a/Golden_Repo/m/MUST/wrap-config.cmake.in.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- externals/wrap/wrap-config.cmake.in.orig	2020-08-26 21:13:57.739359000 +0200
-+++ externals/wrap/wrap-config.cmake.in	2020-08-26 21:05:11.535717000 +0200
-@@ -39,9 +39,9 @@
- 
-     # Play nice with FindPythonInterp -- use the interpreter if it was found,
-     # otherwise use the script directly.
--    find_package(PythonInterp 2.6)
--    if (PYTHON_EXECUTABLE)
--      set(command ${PYTHON_EXECUTABLE})
-+    find_package(Python)
-+    if (Python_EXECUTABLE)
-+      set(command ${Python_EXECUTABLE})
-       set(script_arg ${Wrap_EXECUTABLE})
-     else()
-       set(command ${Wrap_EXECUTABLE})
---- externals/GTI/externals/wrap/wrap-config.cmake.in.orig	2020-08-26 21:12:21.579754000 +0200
-+++ externals/GTI/externals/wrap/wrap-config.cmake.in	2020-08-26 21:14:34.723726000 +0200
-@@ -39,9 +39,9 @@
- 
-     # Play nice with FindPythonInterp -- use the interpreter if it was found,
-     # otherwise use the script directly.
--    find_package(PythonInterp 2.6)
--    if (PYTHON_EXECUTABLE)
--      set(command ${PYTHON_EXECUTABLE})
-+    find_package(Python)
-+    if (Python_EXECUTABLE)
-+      set(command ${Python_EXECUTABLE})
-       set(script_arg ${Wrap_EXECUTABLE})
-     else()
-       set(command ${Wrap_EXECUTABLE})
---- externals/GTI/externals/PnMPI/externals/wrap/wrap-config.cmake.in.orig	2020-08-26 21:13:22.408675000 +0200
-+++ externals/GTI/externals/PnMPI/externals/wrap/wrap-config.cmake.in	2020-08-26 21:00:55.200196000 +0200
-@@ -39,9 +39,9 @@
- 
-     # Play nice with FindPythonInterp -- use the interpreter if it was found,
-     # otherwise use the script directly.
--    find_package(PythonInterp 2.6)
--    if (PYTHON_EXECUTABLE)
--      set(command ${PYTHON_EXECUTABLE})
-+    find_package(Python)
-+    if (Python_EXECUTABLE)
-+      set(command ${Python_EXECUTABLE})
-       set(script_arg ${Wrap_EXECUTABLE})
-     else()
-       set(command ${Wrap_EXECUTABLE})
---- externals/wrap/WrapConfig.cmake.orig	2021-05-27 10:35:39.000000000 +0200
-+++ externals/wrap/WrapConfig.cmake	2021-05-27 10:36:23.000000000 +0200
-@@ -29,9 +29,9 @@
- 
-     # Play nice with FindPythonInterp -- use the interpreter if it was found,
-     # otherwise use the script directly.
--    find_package(PythonInterp 2.6)
--    if (PYTHON_EXECUTABLE)
--      set(command ${PYTHON_EXECUTABLE})
-+    find_package(Python)
-+    if (Python_EXECUTABLE)
-+      set(command ${Python_EXECUTABLE})
-       set(script_arg ${Wrap_EXECUTABLE})
-     else()
-       set(command ${Wrap_EXECUTABLE})
---- externals/GTI/externals/wrap/WrapConfig.cmake.orig	2021-05-27 10:35:39.000000000 +0200
-+++ externals/GTI/externals/wrap/WrapConfig.cmake	2021-05-27 10:36:23.000000000 +0200
-@@ -29,9 +29,9 @@
- 
-     # Play nice with FindPythonInterp -- use the interpreter if it was found,
-     # otherwise use the script directly.
--    find_package(PythonInterp 2.6)
--    if (PYTHON_EXECUTABLE)
--      set(command ${PYTHON_EXECUTABLE})
-+    find_package(Python)
-+    if (Python_EXECUTABLE)
-+      set(command ${Python_EXECUTABLE})
-       set(script_arg ${Wrap_EXECUTABLE})
-     else()
-       set(command ${Wrap_EXECUTABLE})
---- externals/GTI/externals/PnMPI/externals/wrap/WrapConfig.cmake.orig	2021-05-27 10:35:39.000000000 +0200
-+++ externals/GTI/externals/PnMPI/externals/wrap/WrapConfig.cmake	2021-05-27 10:36:23.000000000 +0200
-@@ -29,9 +29,9 @@
- 
-     # Play nice with FindPythonInterp -- use the interpreter if it was found,
-     # otherwise use the script directly.
--    find_package(PythonInterp 2.6)
--    if (PYTHON_EXECUTABLE)
--      set(command ${PYTHON_EXECUTABLE})
-+    find_package(Python)
-+    if (Python_EXECUTABLE)
-+      set(command ${Python_EXECUTABLE})
-       set(script_arg ${Wrap_EXECUTABLE})
-     else()
-       set(command ${Wrap_EXECUTABLE})
diff --git a/Golden_Repo/m/Mako/Mako-1.1.4-GCCcore-11.2.0.eb b/Golden_Repo/m/Mako/Mako-1.1.4-GCCcore-11.2.0.eb
deleted file mode 100644
index df4dac07a..000000000
--- a/Golden_Repo/m/Mako/Mako-1.1.4-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,29 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'Mako'
-version = '1.1.4'
-
-homepage = 'https://www.makotemplates.org'
-description = """A super-fast templating language that borrows the best ideas from the existing templating languages"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-sources = [SOURCE_TAR_GZ]
-checksums = ['17831f0b7087c313c0ffae2bcbbd3c1d5ba9eeac9c38f2eb7b50e8c99fe9d5ab']
-
-download_dep_fail = True
-use_pip = True
-sanity_pip_check = True
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [('Python', '3.9.6')]
-
-sanity_check_paths = {
-    'files': ['bin/mako-render'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages/%(namelower)s'],
-}
-
-sanity_check_commands = ["mako-render --help"]
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/m/Meep/Meep-1.24.0-intel-para-2021b.eb b/Golden_Repo/m/Meep/Meep-1.24.0-intel-para-2021b.eb
deleted file mode 100644
index f1865d6fc..000000000
--- a/Golden_Repo/m/Meep/Meep-1.24.0-intel-para-2021b.eb
+++ /dev/null
@@ -1,59 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'Meep'
-version = '1.24.0'
-
-homepage = 'https://meep.readthedocs.io/en/latest/'
-description = """Meep (or MEEP) is a free finite-difference time-domain (FDTD) simulation software package
- developed at MIT to model electromagnetic systems."""
-
-toolchain = {'name': 'intel-para', 'version': '2021b'}
-toolchainopts = {'usempi': True, 'opt': True, 'unroll': True, 'pic': True}
-
-source_urls = ['https://github.com/NanoComp/meep/releases/download/v%(version)s/']
-sources = [SOURCELOWER_TAR_GZ]
-
-checksums = [
-    'e98332b8cc2ffaf32a7232897dfd617a1861352f8dd315a2bd21a3d439be3b99',  # meep-1.24.0.tar.gz
-]
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2'),
-    ('SWIG', '4.0.2')
-]
-
-dependencies = [
-    # ('imkl', '2021.4.0'),
-    ('Python', '3.9.6'),
-    ('HDF5', '1.12.1'),
-    ('FFTW', '3.3.10'),
-    ('libctl', '4.5.1'),
-    ('GSL', '2.7'),
-    ('guile', '3.0.7'),
-    ('libreadline', '8.1'),
-    ('MPB', '1.11.1'),
-    ('Harminv', '1.4.1'),
-    ('libGDSII', '0.21'),
-    ('mpi4py', '3.1.3'),
-    ('h5py', '3.5.0'),
-]
-
-configopts = "--with-mpi CC=mpicc CXX=mpic++ F77=mpif90 MPIRUN=srun PYTHON=python3 "
-configopts += "--with-pic --with-blas=mkl_intel_lp64 --with-lapack=mkl_intel_lp64 "
-configopts += "--with-libctl=$EBROOTLIBCTL/share/libctl --enable-shared "
-
-sanity_check_paths = {
-    'files': ['bin/meep', 'include/meep.hpp', 'lib/libmeep.a', 'lib/libpympb.a',
-              'lib/libmeep.%s' % SHLIB_EXT, 'lib/libpympb.%s' % SHLIB_EXT],
-    'dirs': ['include/meep', 'lib/python%(pyshortver)s/site-packages/meep', 'share/meep'],
-}
-
-sanity_check_commands = [
-    "meep --help",
-    "python -c 'import meep'",
-]
-
-modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
-
-moduleclass = 'phys'
diff --git a/Golden_Repo/m/Mercurial/Mercurial-5.8-GCCcore-11.2.0-Python-3.9.6.eb b/Golden_Repo/m/Mercurial/Mercurial-5.8-GCCcore-11.2.0-Python-3.9.6.eb
deleted file mode 100644
index 7bf424ba5..000000000
--- a/Golden_Repo/m/Mercurial/Mercurial-5.8-GCCcore-11.2.0-Python-3.9.6.eb
+++ /dev/null
@@ -1,31 +0,0 @@
-easyblock = "PythonPackage"
-
-name = 'Mercurial'
-version = '5.8'
-versionsuffix = "-Python-%(pyver)s"
-
-homepage = 'http://mercurial.selenic.com/'
-description = """Mercurial is a free, distributed source control management tool. It efficiently handles projects
-of any size and offers an easy and intuitive interface.
-"""
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-source_urls = ['http://mercurial-scm.org/release/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['fc5d6a8f6478d88ef83cdd0ab6d86ad68ee722bbdf4964e6a0b47c3c6ba5309f']
-
-download_dep_fail = True
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [
-    ('Python', '3.9.6')
-]
-
-sanity_check_paths = {
-    'files': ['bin/hg'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages/mercurial'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/m/Meson/Meson-0.58.2-GCCcore-11.2.0.eb b/Golden_Repo/m/Meson/Meson-0.58.2-GCCcore-11.2.0.eb
deleted file mode 100644
index 7557cb24d..000000000
--- a/Golden_Repo/m/Meson/Meson-0.58.2-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'Meson'
-version = '0.58.2'
-
-homepage = 'https://mesonbuild.com'
-description = "Meson is a cross-platform build system designed to be both as fast and as user friendly as possible."
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['7634ec32955d3f897d623b88e9d2988451035f43d73c17a29caf767387baedb7']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('Ninja', '1.10.2'),
-]
-
-download_dep_fail = True
-use_pip = True
-sanity_pip_check = True
-
-options = {'modulename': 'mesonbuild'}
-
-sanity_check_paths = {
-    'files': ['bin/meson'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/m/MethPipe/MethPipe-5.0.0-gpsmkl-2021b.eb b/Golden_Repo/m/MethPipe/MethPipe-5.0.0-gpsmkl-2021b.eb
deleted file mode 100644
index 29532e5c6..000000000
--- a/Golden_Repo/m/MethPipe/MethPipe-5.0.0-gpsmkl-2021b.eb
+++ /dev/null
@@ -1,45 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'MethPipe'
-version = '5.0.0'
-
-homepage = 'http://smithlab.usc.edu/methpipe/'
-description = """The MethPipe software package is a computational pipeline for
- analyzing bisulfite sequencing data (BS-seq, WGBS and RRBS).
-"""
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-toolchainopts = {'cstd': 'c++11'}
-
-source_urls = [
-    'https://github.com/smithlabcode/methpipe/releases/download/v%(version)s/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['587a8c577b90f4fcb268bbb170a86306e209795363960edd6ab69cd73769961b']
-
-dependencies = [
-    ('GSL', '2.7'),
-    ('zlib', '1.2.11'),
-    ('HTSlib', '1.14'),
-]
-
-local_libs = '"-L$EBROOTGSL/lib -lgsl -lgslcblas -L$EBROOTZLIB/lib -lz -lhts"'
-buildopts = 'all LIBS=%s CC=$CC CXX=$CXX CFLAGS="$CFLAGS -I$EBROOTHTSLIB/include/htslib" ' % local_libs
-buildopts += 'CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" '
-
-installopts = 'LIBS=%s' % local_libs
-
-# removed  "hmr_plant" "rmapbs-pe"  "rmapbs" from sanity check --
-# do not seem to be a make target in vers >=3.3.1
-# removed include and lib from dirs, as methpipe5 only installs binaries
-
-sanity_check_paths = {
-    'files': ["bin/%s" % x for x in ["allelicmeth", "amrfinder", "amrtester",
-                                     "bsrate", "dmr", "duplicate-remover",
-                                     "hmr", "lc_approx", "levels",
-                                     "merge-bsrate", "merge-methcounts",
-                                     "methcounts", "methdiff", "methstates",
-                                     "pmd",  "roimethstat"]],
-    'dirs': ['bin'],
-}
-
-moduleclass = 'bio'
diff --git a/Golden_Repo/m/magma/magma-2.6.1-gcccoremkl-11.2.0-2021.4.0-CUDA-11.5.eb b/Golden_Repo/m/magma/magma-2.6.1-gcccoremkl-11.2.0-2021.4.0-CUDA-11.5.eb
deleted file mode 100644
index cc7cf0750..000000000
--- a/Golden_Repo/m/magma/magma-2.6.1-gcccoremkl-11.2.0-2021.4.0-CUDA-11.5.eb
+++ /dev/null
@@ -1,41 +0,0 @@
-easyblock = "CMakeMake"
-
-name = 'magma'
-version = '2.6.1'
-versionsuffix = '-CUDA-%(cudaver)s'
-
-homepage = 'https://icl.cs.utk.edu/magma/'
-description = """The MAGMA project aims to develop a dense linear algebra library similar to
- LAPACK but for heterogeneous/hybrid architectures, starting with current Multicore+GPU systems."""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True, 'openmp': True}
-
-source_urls = ['https://icl.cs.utk.edu/projectsfiles/magma/downloads/']
-sources = [SOURCE_TAR_GZ]
-patches = ['magma-%(version)s_allow-all-sms.patch']
-checksums = [
-    '6cd83808c6e8bc7a44028e05112b3ab4e579bcc73202ed14733f66661127e213',  # magma-2.6.1.tar.gz
-    # magma-2.6.1_allow-all-sms.patch
-    'b89285bac007b68e88e3b5ddbb7f94dbc8a9d77590e58c352e477574d8dca738',
-]
-
-builddependencies = [
-    ('CMake', '3.21.1'),
-]
-
-dependencies = [
-    ('CUDA', '11.5', '', True),
-]
-
-# make sure both static and shared libs are built
-configopts = [
-    '-DBUILD_SHARED_LIBS=%s -DGPU_TARGET="%%(cuda_sm_space_sep)s" ' % local_shared for local_shared in ('ON', 'OFF')
-]
-
-sanity_check_paths = {
-    'files': ['lib/libmagma.%s' % SHLIB_EXT, 'lib/libmagma.a'],
-    'dirs': ['include'],
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/m/magma/magma-2.6.1_allow-all-sms.patch b/Golden_Repo/m/magma/magma-2.6.1_allow-all-sms.patch
deleted file mode 100644
index 5f077c673..000000000
--- a/Golden_Repo/m/magma/magma-2.6.1_allow-all-sms.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-This allows to process any sm_xx passed to GPU_TARGET. Previously some were silently ignored
-See https://bitbucket.org/icl/magma/issues/32/list-of-whitelisted-sm_-values-for-cuda-is
-and https://bitbucket.org/icl/magma/pull-requests/5
-
-Author: Alexander Grund (TU Dresden)
-Updated to 2.6.1: micketeer@gmail.com
-
---- CMakeLists.txt.orig	2021-07-06 17:02:37.125227748 +0200
-+++ CMakeLists.txt	2021-07-06 18:43:13.400804473 +0200
-@@ -124,14 +124,6 @@
-     #message( STATUS "    CUDA_CUBLAS_LIBRARIES: ${CUDA_CUBLAS_LIBRARIES}" )
-     include_directories( ${CUDA_INCLUDE_DIRS} )
- 
--    # NVCC options for the different cards
--    # sm_xx is binary, compute_xx is PTX for forward compatability
--    # MIN_ARCH is lowest requested version
--    # NV_SM    accumulates sm_xx for all requested versions
--    # NV_COMP  is compute_xx for highest requested version
--    set( NV_SM    "" )
--    set( NV_COMP  "" )
--
-     set(CUDA_SEPARABLE_COMPILATION ON)
- 
-     # nvcc >= 6.5 supports -std=c++11, so propagate CXXFLAGS to NVCCFLAGS.
-@@ -140,168 +132,44 @@
-     ##    set( CUDA_PROPAGATE_HOST_FLAGS OFF )
-     ##endif()
- 
--    if (GPU_TARGET MATCHES Fermi)
--        set( GPU_TARGET "${GPU_TARGET} sm_20" )
--    endif()
--
--    if (GPU_TARGET MATCHES Kepler)
--        set( GPU_TARGET "${GPU_TARGET} sm_30 sm_35 sm_37" )
--    endif()
--
--    if (GPU_TARGET MATCHES Maxwell)
--        set( GPU_TARGET "${GPU_TARGET} sm_50" )
--    endif()
--
--    if (GPU_TARGET MATCHES Pascal)
--        set( GPU_TARGET "${GPU_TARGET} sm_60" )
--    endif()
--
--    if (GPU_TARGET MATCHES Volta)
--        set( GPU_TARGET "${GPU_TARGET} sm_70" )
--    endif()
--
--    if (GPU_TARGET MATCHES Turing)
--        set( GPU_TARGET "${GPU_TARGET} sm_75" )
--    endif()
--
--    if (GPU_TARGET MATCHES Ampere)
--        set( GPU_TARGET "${GPU_TARGET} sm_80" )
--    endif()
--
--    if (GPU_TARGET MATCHES sm_20)
--        if (NOT MIN_ARCH)
--            set( MIN_ARCH 200 )
--        endif()
--        set( NV_SM ${NV_SM} -gencode arch=compute_20,code=sm_20 )
--        set( NV_COMP        -gencode arch=compute_20,code=compute_20 )
--        message( STATUS "    compile for CUDA arch 2.0 (Fermi)" )
--    endif()
--
--    if (GPU_TARGET MATCHES sm_30)
--        if (NOT MIN_ARCH)
--            set( MIN_ARCH 300 )
--        endif()
--        set( NV_SM ${NV_SM} -gencode arch=compute_30,code=sm_30 )
--        set( NV_COMP        -gencode arch=compute_30,code=compute_30 )
--        message( STATUS "    compile for CUDA arch 3.0 (Kepler)" )
--    endif()
--
--    if (GPU_TARGET MATCHES sm_35)
--        if (NOT MIN_ARCH)
--            set( MIN_ARCH 300 )
--        endif()
--        set( NV_SM ${NV_SM} -gencode arch=compute_35,code=sm_35 )
--        set( NV_COMP        -gencode arch=compute_35,code=compute_35 )
--        message( STATUS "    compile for CUDA arch 3.5 (Kepler)" )
--    endif()
--
--    if (GPU_TARGET MATCHES sm_37)
--        if (NOT MIN_ARCH)
--            set( MIN_ARCH 300 )
--        endif()
--        set( NV_SM ${NV_SM} -gencode arch=compute_37,code=sm_37 )
--        set( NV_COMP        -gencode arch=compute_37,code=compute_37 )
--        message( STATUS "    compile for CUDA arch 3.7 (Kepler)" )
--    endif()
--
--    if (GPU_TARGET MATCHES sm_50)
--        if (NOT MIN_ARCH)
--            set( MIN_ARCH 500 )
--        endif()
--        set( NV_SM ${NV_SM} -gencode arch=compute_50,code=sm_50 )
--        set( NV_COMP        -gencode arch=compute_50,code=compute_50 )
--        message( STATUS "    compile for CUDA arch 5.0 (Maxwell)" )
--    endif()
--
--    if (GPU_TARGET MATCHES sm_52)
--        if (NOT MIN_ARCH)
--            set( MIN_ARCH 520 )
--        endif()
--        set( NV_SM ${NV_SM} -gencode arch=compute_52,code=sm_52 )
--        set( NV_COMP        -gencode arch=compute_52,code=compute_52 )
--        message( STATUS "    compile for CUDA arch 5.2 (Maxwell)" )
--    endif()
--
--    if (GPU_TARGET MATCHES sm_53)
--        if (NOT MIN_ARCH)
--            set( MIN_ARCH 530 )
--        endif()
--        set( NV_SM ${NV_SM} -gencode arch=compute_53,code=sm_53 )
--        set( NV_COMP        -gencode arch=compute_53,code=compute_53 )
--        message( STATUS "    compile for CUDA arch 5.3 (Maxwell)" )
--    endif()
--
--    if (GPU_TARGET MATCHES sm_60)
--        if (NOT MIN_ARCH)
--            set( MIN_ARCH 600 )
--        endif()
--        set( NV_SM ${NV_SM} -gencode arch=compute_60,code=sm_60 )
--        set( NV_COMP        -gencode arch=compute_60,code=compute_60 )
--        message( STATUS "    compile for CUDA arch 6.0 (Pascal)" )
--    endif()
--
--    if (GPU_TARGET MATCHES sm_61)
--        if (NOT MIN_ARCH)
--            set( MIN_ARCH 610 )
--        endif()
--        set( NV_SM ${NV_SM} -gencode arch=compute_61,code=sm_61 )
--        set( NV_COMP        -gencode arch=compute_61,code=compute_61 )
--        message( STATUS "    compile for CUDA arch 6.1 (Pascal)" )
--    endif()
--
--    if (GPU_TARGET MATCHES sm_62)
--        if (NOT MIN_ARCH)
--            set( MIN_ARCH 620 )
--        endif()
--        set( NV_SM ${NV_SM} -gencode arch=compute_62,code=sm_62 )
--        set( NV_COMP        -gencode arch=compute_62,code=compute_62 )
--        message( STATUS "    compile for CUDA arch 6.2 (Pascal)" )
--    endif()
--
--    if (GPU_TARGET MATCHES sm_70)
--        if (NOT MIN_ARCH)
--            set( MIN_ARCH 700 )
--        endif()
--        set( NV_SM ${NV_SM} -gencode arch=compute_70,code=sm_70 )
--        set( NV_COMP        -gencode arch=compute_70,code=compute_70 )
--        message( STATUS "    compile for CUDA arch 7.0 (Volta)" )
--    endif()
--
--    if (GPU_TARGET MATCHES sm_71)
--        if (NOT MIN_ARCH)
--            set( MIN_ARCH 710 )
--        endif()
--        set( NV_SM ${NV_SM} -gencode arch=compute_71,code=sm_71 )
--        set( NV_COMP        -gencode arch=compute_71,code=compute_71 )
--        message( STATUS "    compile for CUDA arch 7.1 (Volta)" )
--    endif()
--
--    if (GPU_TARGET MATCHES sm_75)
--        if (NOT MIN_ARCH)
--            set( MIN_ARCH 750 )
--        endif()
--        set( NV_SM ${NV_SM} -gencode arch=compute_75,code=sm_75 )
--        set( NV_COMP        -gencode arch=compute_75,code=compute_75 )
--        message( STATUS "    compile for CUDA arch 7.5 (Turing)" )
--    endif()
--
--    if (GPU_TARGET MATCHES sm_80)
--        if (NOT MIN_ARCH)
--            set( MIN_ARCH 800 )
--        endif()
--        set( NV_SM ${NV_SM} -gencode arch=compute_80,code=sm_80 )
--        set( NV_COMP        -gencode arch=compute_80,code=compute_80 )
--        message( STATUS "    compile for CUDA arch 8.0 (Ampere)" )
--    endif()
--
--    if (NOT MIN_ARCH)
--        message( FATAL_ERROR "GPU_TARGET must contain one or more of Fermi, Kepler, Maxwell, Pascal, Volta, Turing, Ampere, or valid sm_[0-9][0-9]" )
--    endif()
-+    # NVCC options for the different cards
-+    # sm_xx is binary, compute_xx is PTX for forward compatability
-+    # MIN_SM/MAX_SM is lowest/highest requested version
-+    # NV_SM    accumulates sm_xx for all requested versions
-+    # NV_COMP  is compute_xx for highest requested version
-+    set( MIN_SM 99 )
-+    set( MAX_SM 0 )
-+    set( NV_SM    "" )
-+    set( NV_COMP  "" )
- 
--    set( CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} -Xcompiler -fPIC ${NV_SM} ${NV_COMP} ${FORTRAN_CONVENTION} )
--    #add_definitions( "-DMAGMA_HAVE_CUDA -DMAGMA_CUDA_ARCH_MIN=${MIN_ARCH}" )
--    set(MAGMA_HAVE_CUDA "1")
--    set(MAGMA_CUDA_ARCH_MIN "${MIN_ARCH}")
-+    string( REGEX MATCHALL "sm_[0-9][0-9]" sms "${GPU_TARGET}" )
-+    list( SORT sms ) # To make output easier to reason about
-+    foreach (sm IN LISTS sms)
-+        string( REPLACE "sm_" "" sm "${sm}") # Remove sm_ prefix
-+        if (sm LESS MIN_SM)
-+            set( MIN_SM "${sm}" )
-+        endif()
-+        if (sm GREATER MAX_SM)
-+            set( MAX_SM "${sm}" )
-+        endif()
-+        list( APPEND NV_SM -gencode arch=compute_${sm},code=sm_${sm} )
-+        string( REGEX REPLACE "([0-9])([0-9])" "\\1.\\2" cuda_arch "${sm}" )
-+        message( STATUS "    compile for CUDA arch ${cuda_arch}" )
-+    endforeach()
-+
-+    if (NOT NV_SM)
-+        message( FATAL_ERROR
-+                 "GPU_TARGET must contain one or more of "
-+                 "Fermi, Kepler, Maxwell, Pascal, Volta, Turing, Ampere, or valid sm_[0-9][0-9]"
-+                 "Was: ${GPU_TARGET}" )
-+    endif()
-+
-+    set( MIN_ARCH ${MIN_SM}0 )
-+    set( NV_COMP -gencode arch=compute_${MAX_SM},code=compute_${MAX_SM} )
-+
-+    list( APPEND CUDA_NVCC_FLAGS -Xcompiler -fPIC ${NV_SM} ${NV_COMP} ${FORTRAN_CONVENTION} )
-+    add_definitions( -DMAGMA_HAVE_CUDA=1 ) 
-+    add_definitions( -DMAGMA_CUDA_ARCH_MIN=${MIN_ARCH} ) 
-     message( STATUS "Define -DMAGMA_HAVE_CUDA -DMAGMA_CUDA_ARCH_MIN=${MIN_ARCH}" )
-   else()
-     message( STATUS "Could not find CUDA" )
diff --git a/Golden_Repo/m/makeinfo/makeinfo-6.8-GCCcore-11.2.0.eb b/Golden_Repo/m/makeinfo/makeinfo-6.8-GCCcore-11.2.0.eb
deleted file mode 100644
index e820f74f0..000000000
--- a/Golden_Repo/m/makeinfo/makeinfo-6.8-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,25 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'makeinfo'
-version = '6.8'
-
-homepage = 'https://www.gnu.org/software/texinfo/'
-description = """makeinfo is part of the Texinfo project, the official documentation format of the GNU project."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://ftpmirror.gnu.org/gnu/texinfo']
-sources = ['texinfo-%(version)s.tar.xz']
-checksums = ['8eb753ed28bca21f8f56c1a180362aed789229bd62fff58bf8368e9beb59fec4']
-
-builddependencies = [('binutils', '2.37')]
-dependencies = [('Perl', '5.34.0')]
-
-sanity_check_paths = {
-    'files': ['bin/makeinfo'],
-    'dirs': ['share'],
-}
-
-sanity_check_commands = ["makeinfo --help"]
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/m/matplotlib/matplotlib-3.4.3-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/m/matplotlib/matplotlib-3.4.3-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index acbb9fa36..000000000
--- a/Golden_Repo/m/matplotlib/matplotlib-3.4.3-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,64 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'matplotlib'
-version = '3.4.3'
-
-homepage = 'https://matplotlib.org'
-description = """matplotlib is a python 2D plotting library which produces publication quality figures in a variety of
- hardcopy formats and interactive environments across platforms. matplotlib can be used in python scripts, the python
- and ipython shell, web application servers, and six graphical user interface toolkits."""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-builddependencies = [
-    ('pkg-config', '0.29.2'),
-    ('cppy', '1.1.0')
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10'),
-    ('libpng', '1.6.37'),
-    ('freetype', '2.11.0'),
-    ('Tkinter', '%(pyver)s'),
-    ('Pillow-SIMD', '9.0.1'),
-    ('Qhull', '2020.2')
-]
-
-use_pip = True
-sanity_pip_check = True
-
-# avoid that matplotlib downloads and builds its own copies of freetype and qhull
-_fix_setup = "sed -e 's/#system_freetype = False/system_freetype = True/g' "
-_fix_setup += "-e 's/#system_qhull = False/system_qhull = True/g' setup.cfg.template >setup.cfg && "
-
-_include_path = "export CPLUS_INCLUDE_PATH=$EBROOTFREETYPE/include/freetype2:${CPLUS_INCLUDE_PATH} && "
-
-exts_list = [
-    ('Cycler', '0.11.0', {
-        'modulename': 'cycler',
-        'source_tmpl': 'cycler-%(version)s.tar.gz',
-        'source_urls': ['https://pypi.python.org/packages/source/C/Cycler'],
-        'checksums': ['9c87405839a19696e837b3b818fed3f5f69f16f1eec1a1ad77e043dcea9c772f'],
-    }),
-    ('kiwisolver', '1.3.2', {
-        'source_urls': ['https://pypi.python.org/packages/source/k/kiwisolver'],
-        'checksums': ['fc4453705b81d03568d5b808ad8f09c77c47534f6ac2e72e733f9ca4714aa75c'],
-    }),
-    (name, version, {
-        'preinstallopts': _fix_setup + _include_path,
-        'source_urls': ['https://pypi.python.org/packages/source/m/matplotlib'],
-        'checksums': ['fc4f526dfdb31c9bd6b8ca06bf9fab663ca12f3ec9cdf4496fb44bc680140318'],
-    }),
-]
-
-sanity_check_commands = [
-    """python -c 'import matplotlib; matplotlib.use("Agg"); import matplotlib.pyplot' """,
-    "python -c 'from mpl_toolkits.mplot3d import Axes3D'",
-]
-
-# use non-interactive plotting backend as default
-# see https://matplotlib.org/tutorials/introductory/usage.html#what-is-a-backend
-modextravars = {'MPLBACKEND': 'Agg'}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/m/memkind/memkind-1.12.0-GCCcore-11.2.0.eb b/Golden_Repo/m/memkind/memkind-1.12.0-GCCcore-11.2.0.eb
deleted file mode 100644
index 6812f5536..000000000
--- a/Golden_Repo/m/memkind/memkind-1.12.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,31 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'memkind'
-version = '1.12.0'
-
-homepage = 'http://memkind.github.io'
-description = """User Extensible Heap Manager built on top of jemalloc which enables control of memory characteristics
-and a partitioning of the heap between kinds of memory. """
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/memkind/memkind/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['b0781d493dec0da0089884fd54bcfdde03311019c56f90505ed0b884100bfbad']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Coreutils', '9.0'),  # needed to ensure that ./build_jemalloc.sh works properly
-    ('Autotools', '20210726'),  # needed to ensure that ./build_jemalloc.sh works properly
-]
-
-dependencies = [
-    ('numactl', '2.0.14', '', SYSTEM),
-    ('tbb', '2021.4.0'),  # optional, to enable the tbb heap manager
-]
-
-# The build_jemalloc.sh is gone, autogen should take care of it.
-preconfigopts = './autogen.sh && '
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/m/motif/motif-2.3.8-GCCcore-11.2.0.eb b/Golden_Repo/m/motif/motif-2.3.8-GCCcore-11.2.0.eb
deleted file mode 100644
index 0d426ad2e..000000000
--- a/Golden_Repo/m/motif/motif-2.3.8-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,42 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'motif'
-version = '2.3.8'
-
-homepage = 'https://motif.ics.com/'
-description = """Motif refers to both a graphical user interface (GUI) specification and the widget toolkit for building
- applications that follow that specification under the X Window System on Unix and other POSIX-compliant systems.
- It was the standard toolkit for the Common Desktop Environment and thus for Unix."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [SOURCEFORGE_SOURCE]
-sources = ['%(name)s-%(version)s.tar.gz']
-checksums = ['859b723666eeac7df018209d66045c9853b50b4218cecadb794e2359619ebce7']
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('flex', '2.6.4'),
-    ('Bison', '3.7.6'),
-    ('binutils', '2.37'),
-    ('pkg-config', '0.29.2'),
-    ('util-linux', '2.37'),
-]
-
-dependencies = [
-    ('X11', '20210802'),
-    ('libpng', '1.6.37'),
-    ('freetype', '2.11.0'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('bzip2', '1.0.8'),
-]
-
-# makefile is not parallel safe
-parallel = 1
-
-sanity_check_paths = {
-    'files': ['lib/libMrm.a', 'lib/libUil.a', 'lib/libXm.a', 'bin/mwm', 'bin/uil', 'bin/xmbind'],
-    'dirs': ['include/Mrm', 'include/uil', 'include/X11', 'include/Xm'],
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/m/mpi4py/mpi4py-3.1.3-gompi-2021b.eb b/Golden_Repo/m/mpi4py/mpi4py-3.1.3-gompi-2021b.eb
deleted file mode 100644
index 6eca41a13..000000000
--- a/Golden_Repo/m/mpi4py/mpi4py-3.1.3-gompi-2021b.eb
+++ /dev/null
@@ -1,24 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'mpi4py'
-version = '3.1.3'
-
-homepage = 'https://bitbucket.org/mpi4py/mpi4py'
-description = """MPI for Python (mpi4py) provides bindings of the Message Passing Interface (MPI) standard for
- the Python programming language, allowing any Python program to exploit multiple processors.
-"""
-
-toolchain = {'name': 'gompi', 'version': '2021b'}
-
-source_urls = ['https://github.com/%(name)s/%(name)s/archive/']
-sources = ['%(version)s.tar.gz']
-checksums = ['a25f7e521ac5706a4e7284d986df006c26a2d13cc7ccee646cfc07c05bd65f05']
-
-dependencies = [('Python', '3.9.6')]
-
-sanity_check_paths = {
-    'files': [],
-    'dirs': ['lib/python%(pyshortver)s/site-packages/mpi4py'],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/m/mpi4py/mpi4py-3.1.3-gpsmpi-2021b.eb b/Golden_Repo/m/mpi4py/mpi4py-3.1.3-gpsmpi-2021b.eb
deleted file mode 100644
index 15e9e0bc5..000000000
--- a/Golden_Repo/m/mpi4py/mpi4py-3.1.3-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,25 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'mpi4py'
-version = '3.1.3'
-
-homepage = 'https://bitbucket.org/mpi4py/mpi4py'
-description = """MPI for Python (mpi4py) provides bindings of the Message Passing Interface (MPI) standard for
- the Python programming language, allowing any Python program to exploit multiple processors.
-"""
-
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-
-source_urls = ['https://github.com/%(name)s/%(name)s/archive/']
-sources = ['%(version)s.tar.gz']
-checksums = ['a25f7e521ac5706a4e7284d986df006c26a2d13cc7ccee646cfc07c05bd65f05']
-
-dependencies = [('Python', '3.9.6')]
-
-sanity_check_paths = {
-    'files': [],
-    'dirs': ['lib/python%(pyshortver)s/site-packages/mpi4py'],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/m/mpi4py/mpi4py-3.1.3-iimpi-2021b.eb b/Golden_Repo/m/mpi4py/mpi4py-3.1.3-iimpi-2021b.eb
deleted file mode 100644
index 075bbede2..000000000
--- a/Golden_Repo/m/mpi4py/mpi4py-3.1.3-iimpi-2021b.eb
+++ /dev/null
@@ -1,25 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'mpi4py'
-version = '3.1.3'
-
-homepage = 'https://bitbucket.org/mpi4py/mpi4py'
-description = """MPI for Python (mpi4py) provides bindings of the Message Passing Interface (MPI) standard for
- the Python programming language, allowing any Python program to exploit multiple processors.
-"""
-
-
-toolchain = {'name': 'iimpi', 'version': '2021b'}
-
-source_urls = ['https://github.com/%(name)s/%(name)s/archive/']
-sources = ['%(version)s.tar.gz']
-checksums = ['a25f7e521ac5706a4e7284d986df006c26a2d13cc7ccee646cfc07c05bd65f05']
-
-dependencies = [('Python', '3.9.6')]
-
-sanity_check_paths = {
-    'files': [],
-    'dirs': ['lib/python%(pyshortver)s/site-packages/mpi4py'],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/m/mpi4py/mpi4py-3.1.3-iompi-2021b.eb b/Golden_Repo/m/mpi4py/mpi4py-3.1.3-iompi-2021b.eb
deleted file mode 100644
index aad19e990..000000000
--- a/Golden_Repo/m/mpi4py/mpi4py-3.1.3-iompi-2021b.eb
+++ /dev/null
@@ -1,25 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'mpi4py'
-version = '3.1.3'
-
-homepage = 'https://bitbucket.org/mpi4py/mpi4py'
-description = """MPI for Python (mpi4py) provides bindings of the Message Passing Interface (MPI) standard for
- the Python programming language, allowing any Python program to exploit multiple processors.
-"""
-
-
-toolchain = {'name': 'iompi', 'version': '2021b'}
-
-source_urls = ['https://github.com/%(name)s/%(name)s/archive/']
-sources = ['%(version)s.tar.gz']
-checksums = ['a25f7e521ac5706a4e7284d986df006c26a2d13cc7ccee646cfc07c05bd65f05']
-
-dependencies = [('Python', '3.9.6')]
-
-sanity_check_paths = {
-    'files': [],
-    'dirs': ['lib/python%(pyshortver)s/site-packages/mpi4py'],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/m/mpi4py/mpi4py-3.1.3-ipsmpi-2021b.eb b/Golden_Repo/m/mpi4py/mpi4py-3.1.3-ipsmpi-2021b.eb
deleted file mode 100644
index ca5f7076a..000000000
--- a/Golden_Repo/m/mpi4py/mpi4py-3.1.3-ipsmpi-2021b.eb
+++ /dev/null
@@ -1,25 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'mpi4py'
-version = '3.1.3'
-
-homepage = 'https://bitbucket.org/mpi4py/mpi4py'
-description = """MPI for Python (mpi4py) provides bindings of the Message Passing Interface (MPI) standard for
- the Python programming language, allowing any Python program to exploit multiple processors.
-"""
-
-
-toolchain = {'name': 'ipsmpi', 'version': '2021b'}
-
-source_urls = ['https://github.com/%(name)s/%(name)s/archive/']
-sources = ['%(version)s.tar.gz']
-checksums = ['a25f7e521ac5706a4e7284d986df006c26a2d13cc7ccee646cfc07c05bd65f05']
-
-dependencies = [('Python', '3.9.6')]
-
-sanity_check_paths = {
-    'files': [],
-    'dirs': ['lib/python%(pyshortver)s/site-packages/mpi4py'],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/m/mpi4py/mpi4py-3.1.3-npsmpic-2021b.eb b/Golden_Repo/m/mpi4py/mpi4py-3.1.3-npsmpic-2021b.eb
deleted file mode 100644
index c4703a6e0..000000000
--- a/Golden_Repo/m/mpi4py/mpi4py-3.1.3-npsmpic-2021b.eb
+++ /dev/null
@@ -1,26 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'mpi4py'
-version = '3.1.3'
-
-homepage = 'https://bitbucket.org/mpi4py/mpi4py'
-description = """MPI for Python (mpi4py) provides bindings of the Message Passing Interface (MPI) standard for
- the Python programming language, allowing any Python program to exploit multiple processors.
-"""
-
-toolchain = {'name': 'npsmpic', 'version': '2021b'}
-
-source_urls = ['https://github.com/%(name)s/%(name)s/archive/']
-sources = ['%(version)s.tar.gz']
-checksums = ['a25f7e521ac5706a4e7284d986df006c26a2d13cc7ccee646cfc07c05bd65f05']
-
-dependencies = [('Python', '3.9.6')]
-
-prebuildopts = 'CFLAGS=-noswitcherror'
-
-sanity_check_paths = {
-    'files': [],
-    'dirs': ['lib/python%(pyshortver)s/site-packages/mpi4py'],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/m/mpi4py/mpi4py-3.1.3-nvompic-2021b.eb b/Golden_Repo/m/mpi4py/mpi4py-3.1.3-nvompic-2021b.eb
deleted file mode 100644
index 2dd6a85c1..000000000
--- a/Golden_Repo/m/mpi4py/mpi4py-3.1.3-nvompic-2021b.eb
+++ /dev/null
@@ -1,26 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'mpi4py'
-version = '3.1.3'
-
-homepage = 'https://bitbucket.org/mpi4py/mpi4py'
-description = """MPI for Python (mpi4py) provides bindings of the Message Passing Interface (MPI) standard for
- the Python programming language, allowing any Python program to exploit multiple processors.
-"""
-
-toolchain = {'name': 'nvompic', 'version': '2021b'}
-
-source_urls = ['https://github.com/%(name)s/%(name)s/archive/']
-sources = ['%(version)s.tar.gz']
-checksums = ['a25f7e521ac5706a4e7284d986df006c26a2d13cc7ccee646cfc07c05bd65f05']
-
-dependencies = [('Python', '3.9.6')]
-
-prebuildopts = 'CFLAGS=-noswitcherror'
-
-sanity_check_paths = {
-    'files': [],
-    'dirs': ['lib/python%(pyshortver)s/site-packages/mpi4py'],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/m/mpiP/mpiP-3.5-gpsmpi-2021b.eb b/Golden_Repo/m/mpiP/mpiP-3.5-gpsmpi-2021b.eb
deleted file mode 100644
index e4557e6d3..000000000
--- a/Golden_Repo/m/mpiP/mpiP-3.5-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,44 +0,0 @@
-easyblock = 'ConfigureMake'
-version = '3.5'
-
-homepage = 'https://github.com/LLNL/mpiP'
-name = "mpiP"
-
-description = """mpiP is a lightweight profiling library for MPI applications. Because it only collects statistical
-information about MPI functions, mpiP generates considerably less overhead and much less data than tracing tools. All
-the information captured by mpiP is task-local. It only uses communication during report generation, typically at the
-end of the experiment, to merge results from all of the tasks into one output file.
-"""
-
-usage = """
- Example usage (take special note of the order, the mpiP library has to appear AFTER your code):
-
-    mpifort -g -o mpitest mpitest.f90 -lmpiP -lm -lbfd -liberty -lunwind -lz
-"""
-
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-toolchainopts = {'usempi': True}
-
-source_urls = ['https://github.com/LLNL/mpiP/releases/download/%(version)s/']
-sources = [SOURCELOWER_TGZ]
-checksums = ['e366843d53fa016fb03903e51c8aac901aa5155edabe64698a8d6fa618a03bbd']
-
-builddependencies = [
-    ('Python', '3.9.6'),
-]
-
-dependencies = [
-    ('libunwind', '1.5.0'),
-]
-
-configopts = "--with-cc=$CC --with-cxx=$CXX --with-f77=$F77 CFLAGS='-DPACKAGE=mpiP -DPACKAGE_VERSION=3.5' "
-
-buildopts = "PACKAGE='mpiP' PACKAGE_VERSION='3.5'"
-
-sanity_check_paths = {
-    'files': ['lib/libmpiP.so'],
-    'dirs': ['lib', 'share']
-}
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/m/msgpack-c/msgpack-c-4.0.0-GCCcore-11.2.0.eb b/Golden_Repo/m/msgpack-c/msgpack-c-4.0.0-GCCcore-11.2.0.eb
deleted file mode 100644
index b053367a7..000000000
--- a/Golden_Repo/m/msgpack-c/msgpack-c-4.0.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,35 +0,0 @@
-# Thomas Hoffmann, EMBL Heidelberg, structures-it@embl.de, 2021/04
-# Stepan Nassyr, JSC/Forschungszentrum Juelich GmbH, s.nassyr@fz-juelich.de, 2022/05
-easyblock = 'CMakeNinja'
-
-name = 'msgpack-c'
-version = '4.0.0'
-
-homepage = 'http://msgpack.org/'
-description = """MessagePack is an efficient binary serialization format, which lets you exchange
-data among multiple languages like JSON, except that it's faster and smaller.   
-Small integers are encoded into a single byte while typical short strings       
-require only one extra byte in addition to the strings themselves."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://github.com/msgpack/msgpack-c/archive']
-sources = ['c-%(version)s.tar.gz']
-checksums = ['656ebe4566845e7bda9c097b625ba59ac72ddfd45df6017172d46d9ac7365aa3']
-
-builddependencies = [
-    ('CMake', '3.23.1'),
-    ('Ninja', '1.10.2'),
-    ('binutils', '2.37'),
-]
-
-sanity_check_paths = {
-    'files': [
-        ['lib/libmsgpackc.%s' % x for x in ['a', '%s' % SHLIB_EXT]],
-        # check for both, C and C++ headers
-        ['include/msgpack.%s' % x for x in ['h', 'hpp']]
-    ],
-    'dirs': ['lib/pkgconfig', 'include/msgpack'],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/m/muparserx/muparserx-4.0.8-GCCcore-11.2.0.eb b/Golden_Repo/m/muparserx/muparserx-4.0.8-GCCcore-11.2.0.eb
deleted file mode 100644
index c311761b9..000000000
--- a/Golden_Repo/m/muparserx/muparserx-4.0.8-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,27 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'muparserx'
-version = '4.0.8'
-
-homepage = "https://github.com/beltoforion/muparserx"
-description = """A C++ math parser library with array and string support. 
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/beltoforion/muparserx/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['5913e0a4ca29a097baad1b78a4674963bc7a06e39ff63df3c73fbad6fadb34e1']
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-    ('binutils', '2.37')
-]
-
-configopts = ['-DBUILD_SHARED_LIBS=OFF', '-DBUILD_SHARED_LIBS=ON']
-
-sanity_check_paths = {
-    'files': [],
-    'dirs': [('include', 'lib64')]
-}
diff --git a/Golden_Repo/n/NAMD/NAMD-2.14-gompi-2021b.eb b/Golden_Repo/n/NAMD/NAMD-2.14-gompi-2021b.eb
deleted file mode 100644
index c084a1544..000000000
--- a/Golden_Repo/n/NAMD/NAMD-2.14-gompi-2021b.eb
+++ /dev/null
@@ -1,45 +0,0 @@
-name = 'NAMD'
-version = '2.14'
-
-homepage = 'http://www.ks.uiuc.edu/Research/namd/'
-description = """NAMD is a parallel molecular dynamics code designed for high-performance simulation of large
-biomolecular systems.
-"""
-
-toolchain = {'name': 'gompi', 'version': '2021b'}
-toolchainopts = {'opt': True, 'pic': True, 'usempi': True, 'cstd': 'c++11'}
-
-runtest = False
-
-sources = ['NAMD_%(version)s_Source.tar.gz']
-patches = ['namd-2.14-fix-gnu-casting.patch']
-checksums = [
-    '34044d85d9b4ae61650ccdba5cda4794088c3a9075932392dd0752ef8c049235',  # NAMD_2.14_Source.tar.gz
-    '51f8601e5b7791f99f583fa7d97058f052e319f3003c06f54d9b2514611a1750',  # namd-2.14-fix-gnu-casting.patch
-]
-
-group = "namd"
-
-dependencies = [
-    ('Tcl', '8.6.11'),
-    ('FFTW', '3.3.10'),
-]
-
-charm_arch = 'mpi-linux-x86_64'
-
-cuda = False
-
-namd_cfg_opts = " --with-tcl --tcl-prefix $EBROOTTCL "
-
-prebuildopts = 'echo "TCLLIB=-L\$(TCLDIR)/lib -ltcl8.6 -ldl -lpthread" >> Make.config && '
-
-# We should use srun. charmrun results in serial executions
-postinstallcmds = ['rm %(installdir)s/charmrun']
-
-# We must overwrite the default sanity check, otherwise if fails because it can't find charmrun
-sanity_check_paths = {
-    'files': ['flipbinpdb', 'flipdcd', 'namd%s' % version.split('.')[0], 'psfgen'],
-    'dirs': ['inc'],
-}
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/n/NAMD/NAMD-2.14-gpsmpi-2021b.eb b/Golden_Repo/n/NAMD/NAMD-2.14-gpsmpi-2021b.eb
deleted file mode 100644
index 977fdb4dd..000000000
--- a/Golden_Repo/n/NAMD/NAMD-2.14-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,45 +0,0 @@
-name = 'NAMD'
-version = '2.14'
-
-homepage = 'http://www.ks.uiuc.edu/Research/namd/'
-description = """NAMD is a parallel molecular dynamics code designed for high-performance simulation of large
-biomolecular systems.
-"""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-toolchainopts = {'opt': True, 'pic': True, 'usempi': True, 'cstd': 'c++11'}
-
-runtest = False
-
-sources = ['NAMD_%(version)s_Source.tar.gz']
-patches = ['namd-2.14-fix-gnu-casting.patch']
-checksums = [
-    '34044d85d9b4ae61650ccdba5cda4794088c3a9075932392dd0752ef8c049235',  # NAMD_2.14_Source.tar.gz
-    '51f8601e5b7791f99f583fa7d97058f052e319f3003c06f54d9b2514611a1750',  # namd-2.14-fix-gnu-casting.patch
-]
-
-group = "namd"
-
-dependencies = [
-    ('Tcl', '8.6.11'),
-    ('FFTW', '3.3.10'),
-]
-
-charm_arch = 'mpi-linux-x86_64'
-
-cuda = False
-
-namd_cfg_opts = " --with-tcl --tcl-prefix $EBROOTTCL "
-
-prebuildopts = 'echo "TCLLIB=-L\$(TCLDIR)/lib -ltcl8.6 -ldl -lpthread" >> Make.config && '
-
-# We should use srun. charmrun results in serial executions
-postinstallcmds = ['rm %(installdir)s/charmrun']
-
-# We must overwrite the default sanity check, otherwise if fails because it can't find charmrun
-sanity_check_paths = {
-    'files': ['flipbinpdb', 'flipdcd', 'namd%s' % version.split('.')[0], 'psfgen'],
-    'dirs': ['inc'],
-}
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/n/NAMD/NAMD-2.14-iimpi-2021b.eb b/Golden_Repo/n/NAMD/NAMD-2.14-iimpi-2021b.eb
deleted file mode 100644
index 396be5880..000000000
--- a/Golden_Repo/n/NAMD/NAMD-2.14-iimpi-2021b.eb
+++ /dev/null
@@ -1,45 +0,0 @@
-name = 'NAMD'
-version = '2.14'
-
-homepage = 'http://www.ks.uiuc.edu/Research/namd/'
-description = """NAMD is a parallel molecular dynamics code designed for high-performance simulation of large
-biomolecular systems.
-"""
-
-toolchain = {'name': 'iimpi', 'version': '2021b'}
-toolchainopts = {'opt': True, 'pic': True, 'usempi': True, 'cstd': 'c++11'}
-
-runtest = False
-
-sources = ['NAMD_%(version)s_Source.tar.gz']
-patches = ['namd-2.14-fix-gnu-casting.patch']
-checksums = [
-    '34044d85d9b4ae61650ccdba5cda4794088c3a9075932392dd0752ef8c049235',  # NAMD_2.14_Source.tar.gz
-    '51f8601e5b7791f99f583fa7d97058f052e319f3003c06f54d9b2514611a1750',  # namd-2.14-fix-gnu-casting.patch
-]
-
-group = "namd"
-
-dependencies = [
-    ('Tcl', '8.6.11'),
-    ('FFTW', '3.3.10'),
-]
-
-charm_arch = 'mpi-linux-x86_64'
-
-cuda = False
-
-namd_cfg_opts = " --with-tcl --tcl-prefix $EBROOTTCL "
-
-prebuildopts = 'echo "TCLLIB=-L\$(TCLDIR)/lib -ltcl8.6 -ldl -lpthread" >> Make.config && '
-
-# We should use srun. charmrun results in serial executions
-postinstallcmds = ['rm %(installdir)s/charmrun']
-
-# We must overwrite the default sanity check, otherwise if fails because it can't find charmrun
-sanity_check_paths = {
-    'files': ['flipbinpdb', 'flipdcd', 'namd%s' % version.split('.')[0], 'psfgen'],
-    'dirs': ['inc'],
-}
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/n/NAMD/NAMD-2.14-iompi-2021b.eb b/Golden_Repo/n/NAMD/NAMD-2.14-iompi-2021b.eb
deleted file mode 100644
index c1e7544c1..000000000
--- a/Golden_Repo/n/NAMD/NAMD-2.14-iompi-2021b.eb
+++ /dev/null
@@ -1,45 +0,0 @@
-name = 'NAMD'
-version = '2.14'
-
-homepage = 'http://www.ks.uiuc.edu/Research/namd/'
-description = """NAMD is a parallel molecular dynamics code designed for high-performance simulation of large
-biomolecular systems.
-"""
-
-toolchain = {'name': 'iompi', 'version': '2021b'}
-toolchainopts = {'opt': True, 'pic': True, 'usempi': True, 'cstd': 'c++11'}
-
-runtest = False
-
-sources = ['NAMD_%(version)s_Source.tar.gz']
-patches = ['namd-2.14-fix-gnu-casting.patch']
-checksums = [
-    '34044d85d9b4ae61650ccdba5cda4794088c3a9075932392dd0752ef8c049235',  # NAMD_2.14_Source.tar.gz
-    '51f8601e5b7791f99f583fa7d97058f052e319f3003c06f54d9b2514611a1750',  # namd-2.14-fix-gnu-casting.patch
-]
-
-group = "namd"
-
-dependencies = [
-    ('Tcl', '8.6.11'),
-    ('FFTW', '3.3.10'),
-]
-
-charm_arch = 'mpi-linux-x86_64'
-
-cuda = False
-
-namd_cfg_opts = " --with-tcl --tcl-prefix $EBROOTTCL "
-
-prebuildopts = 'echo "TCLLIB=-L\$(TCLDIR)/lib -ltcl8.6 -ldl -lpthread" >> Make.config && '
-
-# We should use srun. charmrun results in serial executions
-postinstallcmds = ['rm %(installdir)s/charmrun']
-
-# We must overwrite the default sanity check, otherwise if fails because it can't find charmrun
-sanity_check_paths = {
-    'files': ['flipbinpdb', 'flipdcd', 'namd%s' % version.split('.')[0], 'psfgen'],
-    'dirs': ['inc'],
-}
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/n/NAMD/NAMD-2.14-ipsmpi-2021b.eb b/Golden_Repo/n/NAMD/NAMD-2.14-ipsmpi-2021b.eb
deleted file mode 100644
index 1f183e214..000000000
--- a/Golden_Repo/n/NAMD/NAMD-2.14-ipsmpi-2021b.eb
+++ /dev/null
@@ -1,45 +0,0 @@
-name = 'NAMD'
-version = '2.14'
-
-homepage = 'http://www.ks.uiuc.edu/Research/namd/'
-description = """NAMD is a parallel molecular dynamics code designed for high-performance simulation of large
-biomolecular systems.
-"""
-
-toolchain = {'name': 'ipsmpi', 'version': '2021b'}
-toolchainopts = {'opt': True, 'pic': True, 'usempi': True, 'cstd': 'c++11'}
-
-runtest = False
-
-sources = ['NAMD_%(version)s_Source.tar.gz']
-patches = ['namd-2.14-fix-gnu-casting.patch']
-checksums = [
-    '34044d85d9b4ae61650ccdba5cda4794088c3a9075932392dd0752ef8c049235',  # NAMD_2.14_Source.tar.gz
-    '51f8601e5b7791f99f583fa7d97058f052e319f3003c06f54d9b2514611a1750',  # namd-2.14-fix-gnu-casting.patch
-]
-
-group = "namd"
-
-dependencies = [
-    ('Tcl', '8.6.11'),
-    ('FFTW', '3.3.10'),
-]
-
-charm_arch = 'mpi-linux-x86_64'
-
-cuda = False
-
-namd_cfg_opts = " --with-tcl --tcl-prefix $EBROOTTCL "
-
-prebuildopts = 'echo "TCLLIB=-L\$(TCLDIR)/lib -ltcl8.6 -ldl -lpthread" >> Make.config && '
-
-# We should use srun. charmrun results in serial executions
-postinstallcmds = ['rm %(installdir)s/charmrun']
-
-# We must overwrite the default sanity check, otherwise if fails because it can't find charmrun
-sanity_check_paths = {
-    'files': ['flipbinpdb', 'flipdcd', 'namd%s' % version.split('.')[0], 'psfgen'],
-    'dirs': ['inc'],
-}
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/n/NAMD/namd-2.14-fix-gnu-casting.patch b/Golden_Repo/n/NAMD/namd-2.14-fix-gnu-casting.patch
deleted file mode 100644
index f0716420d..000000000
--- a/Golden_Repo/n/NAMD/namd-2.14-fix-gnu-casting.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- charm-6.10.2/src/conv-core/memoryaffinity.C.orig	2020-10-20 16:01:45.475695293 +0200
-+++ charm-6.10.2/src/conv-core/memoryaffinity.C	2020-10-20 16:02:19.481016605 +0200
-@@ -182,7 +182,7 @@
-         for (i=0; i<strlen((const char *)nodemap); i++) {
-             if (nodemap[i]==',') nodemapArrSize++;
-         }
--        nodemapArr = malloc(nodemapArrSize*sizeof(int));
-+        nodemapArr = (int*)malloc(nodemapArrSize*sizeof(int));
-         prevIntStart=j=0;
-         for (i=0; i<strlen((const char *)nodemap); i++) {
-             if (nodemap[i]==',') {
diff --git a/Golden_Repo/n/NASM/NASM-2.15.05-GCCcore-11.2.0.eb b/Golden_Repo/n/NASM/NASM-2.15.05-GCCcore-11.2.0.eb
deleted file mode 100644
index 31ceb5909..000000000
--- a/Golden_Repo/n/NASM/NASM-2.15.05-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,25 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'NASM'
-version = '2.15.05'
-
-homepage = 'https://www.nasm.us/'
-
-description = """NASM: General-purpose x86 assembler"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://www.nasm.us/pub/nasm/releasebuilds/%(version)s']
-sources = [SOURCELOWER_TAR_BZ2]
-checksums = ['3c4b8339e5ab54b1bcb2316101f8985a5da50a3f9e504d43fa6f35668bee2fd0']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-sanity_check_paths = {
-    'files': ['bin/nasm'],
-    'dirs': [],
-}
-
-moduleclass = 'lang'
diff --git a/Golden_Repo/n/NCCL/NCCL-2.11.4-GCCcore-11.2.0-CUDA-11.5.eb b/Golden_Repo/n/NCCL/NCCL-2.11.4-GCCcore-11.2.0-CUDA-11.5.eb
deleted file mode 100644
index 86ce1c89d..000000000
--- a/Golden_Repo/n/NCCL/NCCL-2.11.4-GCCcore-11.2.0-CUDA-11.5.eb
+++ /dev/null
@@ -1,23 +0,0 @@
-name = 'NCCL'
-version = '2.11.4'
-versionsuffix = '-CUDA-%(cudaver)s'
-
-homepage = 'https://developer.nvidia.com/nccl'
-description = """The NVIDIA Collective Communications Library (NCCL) implements multi-GPU and multi-node collective
-communication primitives that are performance optimized for NVIDIA GPUs."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-github_account = 'NVIDIA'
-source_urls = [GITHUB_SOURCE]
-sources = ['v%(version)s-1.tar.gz']
-checksums = ['db4e9a0277a64f9a31ea9b5eea22e63f10faaed36dded4587bbc8a0d8eceed10']
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [
-    ('CUDA', '11.5', '', True),
-    ('UCX', '1.11.2', '', SYSTEM),
-]
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/n/NCCL/NCCL-2.12.7-1-GCCcore-11.2.0-CUDA-11.5.eb b/Golden_Repo/n/NCCL/NCCL-2.12.7-1-GCCcore-11.2.0-CUDA-11.5.eb
deleted file mode 100644
index 07d51a9e9..000000000
--- a/Golden_Repo/n/NCCL/NCCL-2.12.7-1-GCCcore-11.2.0-CUDA-11.5.eb
+++ /dev/null
@@ -1,30 +0,0 @@
-name = 'NCCL'
-version = '2.12.7-1'
-versionsuffix = '-CUDA-%(cudaver)s'
-
-homepage = 'https://developer.nvidia.com/nccl'
-description = """The NVIDIA Collective Communications Library (NCCL) implements multi-GPU and multi-node collective
-communication primitives that are performance optimized for NVIDIA GPUs."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-github_account = 'NVIDIA'
-sources = [{
-    'filename': '%(name)s-%(version)s.tar.gz',
-    'git_config': {
-        'url': 'https://github.com/NVIDIA/',
-        'repo_name': 'nccl',
-        'tag': 'v%(version)s',
-        'recursive': True,
-    },
-}]
-checksums = ['277bc85e1b4fa5550aa3371065fb14be62393e6c3df41f0382008b05bb93a7e4']
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [
-    ('CUDA', '11.5', '', True),
-    ('UCX', '1.11.2', '', SYSTEM),
-]
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/n/NCCL/NCCL-2.14.3-1-GCCcore-11.2.0-CUDA-11.5.eb b/Golden_Repo/n/NCCL/NCCL-2.14.3-1-GCCcore-11.2.0-CUDA-11.5.eb
deleted file mode 100644
index 78d9c7ecc..000000000
--- a/Golden_Repo/n/NCCL/NCCL-2.14.3-1-GCCcore-11.2.0-CUDA-11.5.eb
+++ /dev/null
@@ -1,30 +0,0 @@
-name = 'NCCL'
-version = '2.14.3-1'
-versionsuffix = '-CUDA-%(cudaver)s'
-
-homepage = 'https://developer.nvidia.com/nccl'
-description = """The NVIDIA Collective Communications Library (NCCL) implements multi-GPU and multi-node collective
-communication primitives that are performance optimized for NVIDIA GPUs."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-github_account = 'NVIDIA'
-sources = [{
-    'filename': '%(name)s-%(version)s.tar.gz',
-    'git_config': {
-        'url': 'https://github.com/NVIDIA/',
-        'repo_name': 'nccl',
-        'tag': 'v%(version)s',
-        'recursive': True,
-    },
-}]
-checksums = ['8108e00bcf995666330484cf24a5cc52c3a392acaa5aeabf88e2e168e07c291d']
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [
-    ('CUDA', '11.5', '', True),
-    ('UCX', 'default', '', SYSTEM),
-]
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/n/NCO/NCO-5.0.3-gompi-2021b.eb b/Golden_Repo/n/NCO/NCO-5.0.3-gompi-2021b.eb
deleted file mode 100644
index 7080eb6dc..000000000
--- a/Golden_Repo/n/NCO/NCO-5.0.3-gompi-2021b.eb
+++ /dev/null
@@ -1,43 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'NCO'
-version = '5.0.3'
-
-homepage = "https://github.com/nco/nco"
-description = """The NCO toolkit manipulates and analyzes data stored in netCDF-accessible formats, 
-including DAP, HDF4, and HDF5."""
-
-toolchain = {'name': 'gompi', 'version': '2021b'}
-
-source_urls = ['https://github.com/nco/nco/archive/']
-sources = ['%(version)s.tar.gz']
-checksums = ['61b45cdfbb772718f00d40da1a4ce268201fd00a61ebb9515460b8dda8557bdb']
-
-builddependencies = [
-    ('Bison', '3.7.6'),
-    ('flex', '2.6.4'),
-]
-
-dependencies = [
-    ('netCDF', '4.8.1'),
-    ('UDUNITS', '2.2.28'),
-    ('GSL', '2.7'),
-    ('expat', '2.4.1'),
-    ('ANTLR', '2.7.7'),
-    ('libdap', '3.20.8')
-]
-
-configopts = "--enable-nco_cplusplus"
-
-sanity_check_paths = {
-    'files': ['bin/nc%s' % x for x in ('ap2', 'atted', 'bo', 'diff', 'ea', 'ecat', 'es',
-                                       'flint', 'ks', 'pdq', 'ra', 'rcat', 'rename', 'wa')] +
-             ['lib/libnco.a', 'lib/libnco.%s' % SHLIB_EXT, 'lib/libnco_c++.a', 'lib/libnco_c++.%s' % SHLIB_EXT],
-    'dirs': ['include'],
-}
-sanity_check_commands = [
-    "ncks -O -7 --cnk_dmn time,10 "
-    "%(builddir)s/%(namelower)s-%(version)s/data/in.nc %(builddir)s/%(namelower)s-%(version)s/data/in4.cdl"
-]
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/NCO/NCO-5.0.3-gpsmpi-2021b.eb b/Golden_Repo/n/NCO/NCO-5.0.3-gpsmpi-2021b.eb
deleted file mode 100644
index aa14c20ec..000000000
--- a/Golden_Repo/n/NCO/NCO-5.0.3-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,43 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'NCO'
-version = '5.0.3'
-
-homepage = "https://github.com/nco/nco"
-description = """The NCO toolkit manipulates and analyzes data stored in netCDF-accessible formats, 
-including DAP, HDF4, and HDF5."""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-
-source_urls = ['https://github.com/nco/nco/archive/']
-sources = ['%(version)s.tar.gz']
-checksums = ['61b45cdfbb772718f00d40da1a4ce268201fd00a61ebb9515460b8dda8557bdb']
-
-builddependencies = [
-    ('Bison', '3.7.6'),
-    ('flex', '2.6.4'),
-]
-
-dependencies = [
-    ('netCDF', '4.8.1'),
-    ('UDUNITS', '2.2.28'),
-    ('GSL', '2.7'),
-    ('expat', '2.4.1'),
-    ('ANTLR', '2.7.7'),
-    ('libdap', '3.20.8')
-]
-
-configopts = "--enable-nco_cplusplus"
-
-sanity_check_paths = {
-    'files': ['bin/nc%s' % x for x in ('ap2', 'atted', 'bo', 'diff', 'ea', 'ecat', 'es',
-                                       'flint', 'ks', 'pdq', 'ra', 'rcat', 'rename', 'wa')] +
-             ['lib/libnco.a', 'lib/libnco.%s' % SHLIB_EXT, 'lib/libnco_c++.a', 'lib/libnco_c++.%s' % SHLIB_EXT],
-    'dirs': ['include'],
-}
-sanity_check_commands = [
-    "ncks -O -7 --cnk_dmn time,10 "
-    "%(builddir)s/%(namelower)s-%(version)s/data/in.nc %(builddir)s/%(namelower)s-%(version)s/data/in4.cdl"
-]
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/NCO/NCO-5.0.3-iimpi-2021b.eb b/Golden_Repo/n/NCO/NCO-5.0.3-iimpi-2021b.eb
deleted file mode 100644
index a5afb6bb2..000000000
--- a/Golden_Repo/n/NCO/NCO-5.0.3-iimpi-2021b.eb
+++ /dev/null
@@ -1,43 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'NCO'
-version = '5.0.3'
-
-homepage = "https://github.com/nco/nco"
-description = """The NCO toolkit manipulates and analyzes data stored in netCDF-accessible formats, 
-including DAP, HDF4, and HDF5."""
-
-toolchain = {'name': 'iimpi', 'version': '2021b'}
-
-source_urls = ['https://github.com/nco/nco/archive/']
-sources = ['%(version)s.tar.gz']
-checksums = ['61b45cdfbb772718f00d40da1a4ce268201fd00a61ebb9515460b8dda8557bdb']
-
-builddependencies = [
-    ('Bison', '3.7.6'),
-    ('flex', '2.6.4'),
-]
-
-dependencies = [
-    ('netCDF', '4.8.1'),
-    ('UDUNITS', '2.2.28'),
-    ('GSL', '2.7'),
-    ('expat', '2.4.1'),
-    ('ANTLR', '2.7.7'),
-    ('libdap', '3.20.8')
-]
-
-configopts = "--enable-nco_cplusplus"
-
-sanity_check_paths = {
-    'files': ['bin/nc%s' % x for x in ('ap2', 'atted', 'bo', 'diff', 'ea', 'ecat', 'es',
-                                       'flint', 'ks', 'pdq', 'ra', 'rcat', 'rename', 'wa')] +
-             ['lib/libnco.a', 'lib/libnco.%s' % SHLIB_EXT, 'lib/libnco_c++.a', 'lib/libnco_c++.%s' % SHLIB_EXT],
-    'dirs': ['include'],
-}
-sanity_check_commands = [
-    "ncks -O -7 --cnk_dmn time,10 "
-    "%(builddir)s/%(namelower)s-%(version)s/data/in.nc %(builddir)s/%(namelower)s-%(version)s/data/in4.cdl"
-]
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/NCO/NCO-5.0.3-iompi-2021b.eb b/Golden_Repo/n/NCO/NCO-5.0.3-iompi-2021b.eb
deleted file mode 100644
index 3595b85bb..000000000
--- a/Golden_Repo/n/NCO/NCO-5.0.3-iompi-2021b.eb
+++ /dev/null
@@ -1,43 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'NCO'
-version = '5.0.3'
-
-homepage = "https://github.com/nco/nco"
-description = """The NCO toolkit manipulates and analyzes data stored in netCDF-accessible formats, 
-including DAP, HDF4, and HDF5."""
-
-toolchain = {'name': 'iompi', 'version': '2021b'}
-
-source_urls = ['https://github.com/nco/nco/archive/']
-sources = ['%(version)s.tar.gz']
-checksums = ['61b45cdfbb772718f00d40da1a4ce268201fd00a61ebb9515460b8dda8557bdb']
-
-builddependencies = [
-    ('Bison', '3.7.6'),
-    ('flex', '2.6.4'),
-]
-
-dependencies = [
-    ('netCDF', '4.8.1'),
-    ('UDUNITS', '2.2.28'),
-    ('GSL', '2.7'),
-    ('expat', '2.4.1'),
-    ('ANTLR', '2.7.7'),
-    ('libdap', '3.20.8')
-]
-
-configopts = "--enable-nco_cplusplus"
-
-sanity_check_paths = {
-    'files': ['bin/nc%s' % x for x in ('ap2', 'atted', 'bo', 'diff', 'ea', 'ecat', 'es',
-                                       'flint', 'ks', 'pdq', 'ra', 'rcat', 'rename', 'wa')] +
-             ['lib/libnco.a', 'lib/libnco.%s' % SHLIB_EXT, 'lib/libnco_c++.a', 'lib/libnco_c++.%s' % SHLIB_EXT],
-    'dirs': ['include'],
-}
-sanity_check_commands = [
-    "ncks -O -7 --cnk_dmn time,10 "
-    "%(builddir)s/%(namelower)s-%(version)s/data/in.nc %(builddir)s/%(namelower)s-%(version)s/data/in4.cdl"
-]
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/NCO/NCO-5.0.3-ipsmpi-2021b.eb b/Golden_Repo/n/NCO/NCO-5.0.3-ipsmpi-2021b.eb
deleted file mode 100644
index bea3f6c78..000000000
--- a/Golden_Repo/n/NCO/NCO-5.0.3-ipsmpi-2021b.eb
+++ /dev/null
@@ -1,43 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'NCO'
-version = '5.0.3'
-
-homepage = "https://github.com/nco/nco"
-description = """The NCO toolkit manipulates and analyzes data stored in netCDF-accessible formats, 
-including DAP, HDF4, and HDF5."""
-
-toolchain = {'name': 'ipsmpi', 'version': '2021b'}
-
-source_urls = ['https://github.com/nco/nco/archive/']
-sources = ['%(version)s.tar.gz']
-checksums = ['61b45cdfbb772718f00d40da1a4ce268201fd00a61ebb9515460b8dda8557bdb']
-
-builddependencies = [
-    ('Bison', '3.7.6'),
-    ('flex', '2.6.4'),
-]
-
-dependencies = [
-    ('netCDF', '4.8.1'),
-    ('UDUNITS', '2.2.28'),
-    ('GSL', '2.7'),
-    ('expat', '2.4.1'),
-    ('ANTLR', '2.7.7'),
-    ('libdap', '3.20.8')
-]
-
-configopts = "--enable-nco_cplusplus"
-
-sanity_check_paths = {
-    'files': ['bin/nc%s' % x for x in ('ap2', 'atted', 'bo', 'diff', 'ea', 'ecat', 'es',
-                                       'flint', 'ks', 'pdq', 'ra', 'rcat', 'rename', 'wa')] +
-             ['lib/libnco.a', 'lib/libnco.%s' % SHLIB_EXT, 'lib/libnco_c++.a', 'lib/libnco_c++.%s' % SHLIB_EXT],
-    'dirs': ['include'],
-}
-sanity_check_commands = [
-    "ncks -O -7 --cnk_dmn time,10 "
-    "%(builddir)s/%(namelower)s-%(version)s/data/in.nc %(builddir)s/%(namelower)s-%(version)s/data/in4.cdl"
-]
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/NCO/NCO-5.0.3-npsmpic-2021b.eb b/Golden_Repo/n/NCO/NCO-5.0.3-npsmpic-2021b.eb
deleted file mode 100644
index 108ec37f9..000000000
--- a/Golden_Repo/n/NCO/NCO-5.0.3-npsmpic-2021b.eb
+++ /dev/null
@@ -1,43 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'NCO'
-version = '5.0.3'
-
-homepage = "https://github.com/nco/nco"
-description = """The NCO toolkit manipulates and analyzes data stored in netCDF-accessible formats, 
-including DAP, HDF4, and HDF5."""
-
-toolchain = {'name': 'npsmpic', 'version': '2021b'}
-
-source_urls = ['https://github.com/nco/nco/archive/']
-sources = ['%(version)s.tar.gz']
-checksums = ['61b45cdfbb772718f00d40da1a4ce268201fd00a61ebb9515460b8dda8557bdb']
-
-builddependencies = [
-    ('Bison', '3.7.6'),
-    ('flex', '2.6.4'),
-]
-
-dependencies = [
-    ('netCDF', '4.8.1'),
-    ('UDUNITS', '2.2.28'),
-    ('GSL', '2.7'),
-    ('expat', '2.4.1'),
-    ('ANTLR', '2.7.7'),
-    ('libdap', '3.20.8')
-]
-
-configopts = "--enable-nco_cplusplus"
-
-sanity_check_paths = {
-    'files': ['bin/nc%s' % x for x in ('ap2', 'atted', 'bo', 'diff', 'ea', 'ecat', 'es',
-                                       'flint', 'ks', 'pdq', 'ra', 'rcat', 'rename', 'wa')] +
-             ['lib/libnco.a', 'lib/libnco.%s' % SHLIB_EXT, 'lib/libnco_c++.a', 'lib/libnco_c++.%s' % SHLIB_EXT],
-    'dirs': ['include'],
-}
-sanity_check_commands = [
-    "ncks -O -7 --cnk_dmn time,10 "
-    "%(builddir)s/%(namelower)s-%(version)s/data/in.nc %(builddir)s/%(namelower)s-%(version)s/data/in4.cdl"
-]
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/NCO/NCO-5.0.3-nvompic-2021b.eb b/Golden_Repo/n/NCO/NCO-5.0.3-nvompic-2021b.eb
deleted file mode 100644
index d48648426..000000000
--- a/Golden_Repo/n/NCO/NCO-5.0.3-nvompic-2021b.eb
+++ /dev/null
@@ -1,43 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'NCO'
-version = '5.0.3'
-
-homepage = "https://github.com/nco/nco"
-description = """The NCO toolkit manipulates and analyzes data stored in netCDF-accessible formats, 
-including DAP, HDF4, and HDF5."""
-
-toolchain = {'name': 'nvompic', 'version': '2021b'}
-
-source_urls = ['https://github.com/nco/nco/archive/']
-sources = ['%(version)s.tar.gz']
-checksums = ['61b45cdfbb772718f00d40da1a4ce268201fd00a61ebb9515460b8dda8557bdb']
-
-builddependencies = [
-    ('Bison', '3.7.6'),
-    ('flex', '2.6.4'),
-]
-
-dependencies = [
-    ('netCDF', '4.8.1'),
-    ('UDUNITS', '2.2.28'),
-    ('GSL', '2.7'),
-    ('expat', '2.4.1'),
-    ('ANTLR', '2.7.7'),
-    ('libdap', '3.20.8')
-]
-
-configopts = "--enable-nco_cplusplus"
-
-sanity_check_paths = {
-    'files': ['bin/nc%s' % x for x in ('ap2', 'atted', 'bo', 'diff', 'ea', 'ecat', 'es',
-                                       'flint', 'ks', 'pdq', 'ra', 'rcat', 'rename', 'wa')] +
-             ['lib/libnco.a', 'lib/libnco.%s' % SHLIB_EXT, 'lib/libnco_c++.a', 'lib/libnco_c++.%s' % SHLIB_EXT],
-    'dirs': ['include'],
-}
-sanity_check_commands = [
-    "ncks -O -7 --cnk_dmn time,10 "
-    "%(builddir)s/%(namelower)s-%(version)s/data/in.nc %(builddir)s/%(namelower)s-%(version)s/data/in4.cdl"
-]
-
-moduleclass = 'data'
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
deleted file mode 100644
index 5d5877cfd..000000000
--- a/Golden_Repo/n/NLopt/NLopt-2.7.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,33 +0,0 @@
-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
deleted file mode 100644
index d97f4b7a4..000000000
--- a/Golden_Repo/n/NSPR/NSPR-4.32-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,30 +0,0 @@
-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
deleted file mode 100644
index 827396691..000000000
--- a/Golden_Repo/n/NSS/NSS-3.39_pkgconfig.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-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
deleted file mode 100644
index 56e2edda9..000000000
--- a/Golden_Repo/n/NSS/NSS-3.51_fix_kremlin_ppc64le.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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.73-GCCcore-11.2.0.eb b/Golden_Repo/n/NSS/NSS-3.73-GCCcore-11.2.0.eb
deleted file mode 100644
index 7639d4525..000000000
--- a/Golden_Repo/n/NSS/NSS-3.73-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,55 +0,0 @@
-easyblock = 'MakeCp'
-
-name = 'NSS'
-version = '3.73'
-
-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 = [
-    '566d3a68da9b10d7da9ef84eb4fe182f8f04e20d85c55d1bf360bb2c0096d8e5',  # nss-3.73.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/NVHPC/NVHPC-21.11.eb b/Golden_Repo/n/NVHPC/NVHPC-21.11.eb
deleted file mode 100644
index b0b11c617..000000000
--- a/Golden_Repo/n/NVHPC/NVHPC-21.11.eb
+++ /dev/null
@@ -1,70 +0,0 @@
-name = 'NVHPC'
-version = '21.11'
-local_gccver = '11.2.0'
-
-homepage = 'https://developer.nvidia.com/hpc-sdk/'
-description = """C, C++ and Fortran compilers included with the NVIDIA HPC SDK (previously: PGI)"""
-
-toolchain = SYSTEM
-
-# By downloading, you accept the HPC SDK Software License Agreement (https://docs.nvidia.com/hpc-sdk/eula/index.html)
-accept_eula = True
-source_urls = ['https://developer.download.nvidia.com/hpc-sdk/%(version)s/']
-local_tarball_tmpl = 'nvhpc_2021_%%(version_major)s%%(version_minor)s_Linux_%s_cuda_multi.tar.gz'
-sources = [local_tarball_tmpl % '%(arch)s']
-checksums = [
-    {
-        local_tarball_tmpl % 'x86_64':
-            'd8d8ccd0e558d22bcddd955f2233219c96f7de56aa8e09e7be833e384d32d6aa',
-    }
-]
-
-dependencies = [
-    ('GCCcore', local_gccver),
-    ('binutils', '2.37', '', ('GCCcore', local_gccver)),
-    ('CUDA', '11.5', '', SYSTEM),
-    # This is necessary to avoid cases where just libnuma.so.1 is present in the system and -lnuma fails
-    ('numactl', '2.0.14', '', SYSTEM)
-]
-
-module_add_cuda = False
-
-# specify default CUDA version that should be used by NVHPC
-# should match one of the CUDA versions that are included with this NVHPC version
-# (see install_components/Linux_x86_64/20.7/cuda/)
-# for NVHPC 20.7, those are: 11.0, 10.2, 10.1;
-# this version can be tweaked from the EasyBuild command line with
-# --try-amend=default_cuda_version="10.2" (for example)
-default_cuda_version = '11.5'
-
-# NVHPC EasyBlock supports some features, which can be set via CLI or this easyconfig.
-# The following list gives examples for the easyconfig
-#
-# NVHPC needs CUDA to work. Two options are available: 1) Use NVHPC-bundled CUDA, 2) use system CUDA
-# 1) Bundled CUDA
-#    If no easybuild dependency to CUDA is present, the bundled CUDA is taken. A version needs to be specified with
-#      default_cuda_version = "11.0"
-#    in this easyconfig file; alternatively, it can be specified through the command line during installation with
-#      --try-amend=default_cuda_version="10.2"
-# 2) CUDA provided via EasyBuild
-#    Use CUDAcore as a dependency, for example
-#      dependencies = [('CUDAcore', '11.0.2')]
-#    The parameter default_cuda_version still can be set as above.
-#    If not set, it will be deduced from the CUDA module (via $EBVERSIONCUDA)
-#
-# Define a NVHPC-default Compute Capability
-#   cuda_compute_capabilities = "8.0"
-# Can also be specified on the EasyBuild command line via --cuda-compute-capabilities=8.0
-# Only single values supported, not lists of values!
-#
-# Options to add/remove things to/from environment module (defaults shown)
-#   module_byo_compilers = False  # Remove compilers from PATH (Bring-your-own compilers)
-#   module_nvhpc_own_mpi = False  # Add NVHPC's own pre-compiled OpenMPI
-#   module_add_math_libs = False  # Add NVHPC's math libraries (which should be there from CUDA anyway)
-#   module_add_profilers = False  # Add NVHPC's NVIDIA Profilers
-#   module_add_nccl = False       # Add NVHPC's NCCL library
-#   module_add_nvshmem = False    # Add NVHPC's NVSHMEM library
-#   module_add_cuda = False       # Add NVHPC's bundled CUDA
-
-# this bundle serves as a compiler-only toolchain, so it should be marked as compiler (important for HMNS)
-moduleclass = 'compiler'
diff --git a/Golden_Repo/n/NVHPC/NVHPC-22.1.eb b/Golden_Repo/n/NVHPC/NVHPC-22.1.eb
deleted file mode 100644
index 4ee4e193c..000000000
--- a/Golden_Repo/n/NVHPC/NVHPC-22.1.eb
+++ /dev/null
@@ -1,72 +0,0 @@
-name = 'NVHPC'
-version = '22.1'
-local_gccver = '11.2.0'
-
-homepage = 'https://developer.nvidia.com/hpc-sdk/'
-description = """C, C++ and Fortran compilers included with the NVIDIA HPC SDK (previously: PGI)"""
-
-toolchain = SYSTEM
-
-# By downloading, you accept the HPC SDK Software License Agreement (https://docs.nvidia.com/hpc-sdk/eula/index.html)
-accept_eula = True
-source_urls = ['https://developer.download.nvidia.com/hpc-sdk/%(version)s/']
-local_tarball_tmpl = 'nvhpc_2022_%%(version_major)s%%(version_minor)s_Linux_%s_cuda_multi.tar.gz'
-sources = [local_tarball_tmpl % '%(arch)s']
-checksums = [
-    {
-        local_tarball_tmpl % 'aarch64':
-            '05cfa8c520a34eab01272a261b157d421a9ff7129fca7d859b944ce6a16d2255',
-        local_tarball_tmpl % 'x86_64':
-            '7e4366509ed9031ff271e73327dd3121909902a81ac436307801a5373efaff5e',
-    }
-]
-
-dependencies = [
-    ('GCCcore', local_gccver),
-    ('binutils', '2.37', '', ('GCCcore', local_gccver)),
-    ('CUDA', '11.5', '', SYSTEM),
-    # This is necessary to avoid cases where just libnuma.so.1 is present in the system and -lnuma fails
-    ('numactl', '2.0.14', '', SYSTEM)
-]
-
-module_add_cuda = False
-
-# specify default CUDA version that should be used by NVHPC
-# should match one of the CUDA versions that are included with this NVHPC version
-# (see install_components/Linux_x86_64/20.7/cuda/)
-# for NVHPC 20.7, those are: 11.0, 10.2, 10.1;
-# this version can be tweaked from the EasyBuild command line with
-# --try-amend=default_cuda_version="10.2" (for example)
-default_cuda_version = '11.5'
-
-# NVHPC EasyBlock supports some features, which can be set via CLI or this easyconfig.
-# The following list gives examples for the easyconfig
-#
-# NVHPC needs CUDA to work. Two options are available: 1) Use NVHPC-bundled CUDA, 2) use system CUDA
-# 1) Bundled CUDA
-#    If no easybuild dependency to CUDA is present, the bundled CUDA is taken. A version needs to be specified with
-#      default_cuda_version = "11.0"
-#    in this easyconfig file; alternatively, it can be specified through the command line during installation with
-#      --try-amend=default_cuda_version="10.2"
-# 2) CUDA provided via EasyBuild
-#    Use CUDAcore as a dependency, for example
-#      dependencies = [('CUDAcore', '11.0.2')]
-#    The parameter default_cuda_version still can be set as above.
-#    If not set, it will be deduced from the CUDA module (via $EBVERSIONCUDA)
-#
-# Define a NVHPC-default Compute Capability
-#   cuda_compute_capabilities = "8.0"
-# Can also be specified on the EasyBuild command line via --cuda-compute-capabilities=8.0
-# Only single values supported, not lists of values!
-#
-# Options to add/remove things to/from environment module (defaults shown)
-#   module_byo_compilers = False  # Remove compilers from PATH (Bring-your-own compilers)
-#   module_nvhpc_own_mpi = False  # Add NVHPC's own pre-compiled OpenMPI
-#   module_add_math_libs = False  # Add NVHPC's math libraries (which should be there from CUDA anyway)
-#   module_add_profilers = False  # Add NVHPC's NVIDIA Profilers
-#   module_add_nccl = False       # Add NVHPC's NCCL library
-#   module_add_nvshmem = False    # Add NVHPC's NVSHMEM library
-#   module_add_cuda = False       # Add NVHPC's bundled CUDA
-
-# this bundle serves as a compiler-only toolchain, so it should be marked as compiler (important for HMNS)
-moduleclass = 'compiler'
diff --git a/Golden_Repo/n/NVHPC/NVHPC-22.3.eb b/Golden_Repo/n/NVHPC/NVHPC-22.3.eb
deleted file mode 100644
index 8a75360c8..000000000
--- a/Golden_Repo/n/NVHPC/NVHPC-22.3.eb
+++ /dev/null
@@ -1,73 +0,0 @@
-name = 'NVHPC'
-version = '22.3'
-local_gccver = '11.2.0'
-
-homepage = 'https://developer.nvidia.com/hpc-sdk/'
-description = """C, C++ and Fortran compilers included with the NVIDIA HPC SDK (previously: PGI)"""
-
-toolchain = SYSTEM
-
-# By downloading, you accept the HPC SDK Software License Agreement (https://docs.nvidia.com/hpc-sdk/eula/index.html)
-source_urls = ['https://developer.download.nvidia.com/hpc-sdk/%(version)s/']
-local_tarball_tmpl = 'nvhpc_2022_%%(version_major)s%%(version_minor)s_Linux_%s_cuda_multi.tar.gz'
-sources = [local_tarball_tmpl % '%(arch)s']
-checksums = [
-    {
-        local_tarball_tmpl % 'aarch64':
-            'e0ea1cbb726556f6879f4b5dfe17238f8e7680c772368577945a85c0e08328f0',
-        local_tarball_tmpl % 'ppc64le':
-            '5e80db6010adc85fe799dac961ae69e43fdf18d35243666c96a70ecdb80bd280',
-        local_tarball_tmpl % 'x86_64':
-            'bc60a6faf2237bf20550718f71079a714563fa85df62c341cb833f70eb2fe7bb',
-    }
-]
-
-dependencies = [
-    ('GCCcore', local_gccver),
-    ('binutils', '2.37', '', ('GCCcore', local_gccver)),
-    ('CUDA', '11.5', '', SYSTEM),
-    # This is necessary to avoid cases where just libnuma.so.1 is present in the system and -lnuma fails
-    ('numactl', '2.0.14', '', SYSTEM)
-]
-
-module_add_cuda = False
-
-# specify default CUDA version that should be used by NVHPC
-# should match one of the CUDA versions that are included with this NVHPC version
-# (see install_components/Linux_x86_64/22.3/cuda/)
-# for NVHPC 22.3, those are: 11.6, 11.0, 10.2;
-# this version can be tweaked from the EasyBuild command line with
-# --try-amend=default_cuda_version="11.0" (for example)
-default_cuda_version = '%(cudaver)s'
-
-# NVHPC EasyBlock supports some features, which can be set via CLI or this easyconfig.
-# The following list gives examples for the easyconfig
-#
-# NVHPC needs CUDA to work. Two options are available: 1) Use NVHPC-bundled CUDA, 2) use system CUDA
-# 1) Bundled CUDA
-#    If no easybuild dependency to CUDA is present, the bundled CUDA is taken. A version needs to be specified with
-#      default_cuda_version = "11.0"
-#    in this easyconfig file; alternatively, it can be specified through the command line during installation with
-#      --try-amend=default_cuda_version="10.2"
-# 2) CUDA provided via EasyBuild
-#    Use CUDA as a dependency, for example
-#      dependencies = [('CUDA', '11.5.0')]
-#    The parameter default_cuda_version still can be set as above.
-#    If not set, it will be deduced from the CUDA module (via $EBVERSIONCUDA)
-#
-# Define a NVHPC-default Compute Capability
-#   cuda_compute_capabilities = "8.0"
-# Can also be specified on the EasyBuild command line via --cuda-compute-capabilities=8.0
-# Only single values supported, not lists of values!
-#
-# Options to add/remove things to/from environment module (defaults shown)
-#   module_byo_compilers = False  # Remove compilers from PATH (Bring-your-own compilers)
-#   module_nvhpc_own_mpi = False  # Add NVHPC's own pre-compiled OpenMPI
-#   module_add_math_libs = False  # Add NVHPC's math libraries (which should be there from CUDA anyway)
-#   module_add_profilers = False  # Add NVHPC's NVIDIA Profilers
-#   module_add_nccl = False       # Add NVHPC's NCCL library
-#   module_add_nvshmem = False    # Add NVHPC's NVSHMEM library
-#   module_add_cuda = False       # Add NVHPC's bundled CUDA
-
-# this bundle serves as a compiler-only toolchain, so it should be marked as compiler (important for HMNS)
-moduleclass = 'compiler'
diff --git a/Golden_Repo/n/NVHPC/NVHPC-22.7.eb b/Golden_Repo/n/NVHPC/NVHPC-22.7.eb
deleted file mode 100644
index eca87e2ba..000000000
--- a/Golden_Repo/n/NVHPC/NVHPC-22.7.eb
+++ /dev/null
@@ -1,73 +0,0 @@
-name = 'NVHPC'
-version = '22.7'
-local_gccver = '11.2.0'
-
-homepage = 'https://developer.nvidia.com/hpc-sdk/'
-description = """C, C++ and Fortran compilers included with the NVIDIA HPC SDK (previously: PGI)"""
-
-toolchain = SYSTEM
-
-# By downloading, you accept the HPC SDK Software License Agreement (https://docs.nvidia.com/hpc-sdk/eula/index.html)
-source_urls = ['https://developer.download.nvidia.com/hpc-sdk/%(version)s/']
-local_tarball_tmpl = 'nvhpc_2022_%%(version_major)s%%(version_minor)s_Linux_%s_cuda_multi.tar.gz'
-sources = [local_tarball_tmpl % '%(arch)s']
-checksums = [
-    {
-        local_tarball_tmpl % 'aarch64':
-            '2aae3fbfd2d0d2d09448a36166c42311368f5600c7c346f159c280b412fe924a',
-        local_tarball_tmpl % 'ppc64le':
-            '5e80db6010adc85fe799dac961ae69e43fdf18d35243666c96a70ecdb80bd280',
-        local_tarball_tmpl % 'x86_64':
-            '3ce1c346f8bc7e50defb41c545c8907fdc012ff60b27eb8985cf3213f19d863a',
-    }
-]
-
-dependencies = [
-    ('GCCcore', local_gccver),
-    ('binutils', '2.37', '', ('GCCcore', local_gccver)),
-    ('CUDA', '11.5', '', SYSTEM),
-    # This is necessary to avoid cases where just libnuma.so.1 is present in the system and -lnuma fails
-    ('numactl', '2.0.14', '', SYSTEM)
-]
-
-module_add_cuda = False
-
-# specify default CUDA version that should be used by NVHPC
-# should match one of the CUDA versions that are included with this NVHPC version
-# (see install_components/Linux_x86_64/22.3/cuda/)
-# for NVHPC 22.3, those are: 11.6, 11.0, 10.2;
-# this version can be tweaked from the EasyBuild command line with
-# --try-amend=default_cuda_version="11.0" (for example)
-default_cuda_version = '%(cudaver)s'
-
-# NVHPC EasyBlock supports some features, which can be set via CLI or this easyconfig.
-# The following list gives examples for the easyconfig
-#
-# NVHPC needs CUDA to work. Two options are available: 1) Use NVHPC-bundled CUDA, 2) use system CUDA
-# 1) Bundled CUDA
-#    If no easybuild dependency to CUDA is present, the bundled CUDA is taken. A version needs to be specified with
-#      default_cuda_version = "11.0"
-#    in this easyconfig file; alternatively, it can be specified through the command line during installation with
-#      --try-amend=default_cuda_version="10.2"
-# 2) CUDA provided via EasyBuild
-#    Use CUDA as a dependency, for example
-#      dependencies = [('CUDA', '11.5.0')]
-#    The parameter default_cuda_version still can be set as above.
-#    If not set, it will be deduced from the CUDA module (via $EBVERSIONCUDA)
-#
-# Define a NVHPC-default Compute Capability
-#   cuda_compute_capabilities = "8.0"
-# Can also be specified on the EasyBuild command line via --cuda-compute-capabilities=8.0
-# Only single values supported, not lists of values!
-#
-# Options to add/remove things to/from environment module (defaults shown)
-#   module_byo_compilers = False  # Remove compilers from PATH (Bring-your-own compilers)
-#   module_nvhpc_own_mpi = False  # Add NVHPC's own pre-compiled OpenMPI
-#   module_add_math_libs = False  # Add NVHPC's math libraries (which should be there from CUDA anyway)
-#   module_add_profilers = False  # Add NVHPC's NVIDIA Profilers
-#   module_add_nccl = False       # Add NVHPC's NCCL library
-#   module_add_nvshmem = False    # Add NVHPC's NVSHMEM library
-#   module_add_cuda = False       # Add NVHPC's bundled CUDA
-
-# this bundle serves as a compiler-only toolchain, so it should be marked as compiler (important for HMNS)
-moduleclass = 'compiler'
diff --git a/Golden_Repo/n/NVSHMEM/NVSHMEM-2.4.1-gompi-2021b.eb b/Golden_Repo/n/NVSHMEM/NVSHMEM-2.4.1-gompi-2021b.eb
deleted file mode 100644
index fe28d5f0f..000000000
--- a/Golden_Repo/n/NVSHMEM/NVSHMEM-2.4.1-gompi-2021b.eb
+++ /dev/null
@@ -1,65 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'NVSHMEM'
-version = '2.4.1'
-
-local_cuda_version = '11.5'
-
-homepage = 'https://developer.nvidia.com/nvshmem'
-description = """NVSHMEM is a parallel programming interface based on OpenSHMEM that provides 
-efficient and scalable communication for NVIDIA GPU clusters. NVSHMEM creates a 
-global address space for data that spans the memory of multiple GPUs and can be 
-accessed with fine-grained GPU-initiated operations, CPU-initiated operations, 
-and operations on CUDA streams.
-"""
-
-toolchain = {'name': 'gompi', 'version': '2021b'}
-
-# You need to download the source manully from https://developer.nvidia.com/nvshmem-downloads
-sources = ['%(namelower)s_src_%(version)s-3.txz']
-checksums = ['8b6c0eab321b6352911e470f9e81a777a49e58148ec3728453b9522446dba178']
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('CUDA', local_cuda_version, '', SYSTEM),
-    ('NCCL', '2.11.4', f'-CUDA-{local_cuda_version}'),
-]
-
-skipsteps = ['configure']
-
-prebuildopts = 'export NVSHMEM_USE_GDRCOPY=1 && '
-prebuildopts += 'export GDRCOPY_HOME=/usr && '
-
-prebuildopts += 'export MPI_HOME=${EBROOTPSMPI} && '
-prebuildopts += 'export NVSHMEM_MPI_SUPPORT=1 && '
-prebuildopts += 'export NVSHMEMTEST_USE_MPI_LAUNCHER=1 && '
-
-prebuildopts += 'export NCCL_HOME=${EBROOTNCCL} && '
-prebuildopts += 'export NVSHMEM_USE_NCCL=1 && '
-
-prebuildopts += 'export NVSHMEM_BUILDDIR=%(builddir)s && '
-prebuildopts += 'export NVSHMEM_EXAMPLES_BUILDDIR=${NVSHMEM_BUILDDIR}/examples/obj && '
-prebuildopts += 'export NVSHMEM_OTHERTEST_BUILDDIR=${NVSHMEM_BUILDDIR}/othertest/obj && '
-prebuildopts += 'export NVSHMEM_TEST_BUILDDIR=${NVSHMEM_BUILDDIR}/test/obj && '
-prebuildopts += 'export NVSHMEM_PERFTEST_BUILDDIR=${NVSHMEM_BUILDDIR}/perftest/obj && '
-
-prebuildopts += 'export NVSHMEM_PREFIX=%(installdir)s && '
-prebuildopts += 'export NVSHMEM_EXAMPLES_INSTALL=${NVSHMEM_PREFIX}/examples && '
-prebuildopts += 'export NVSHMEM_OTHERTEST_INSTALL=${NVSHMEM_PREFIX}/othertest && '
-prebuildopts += 'export NVSHMEM_PERFTEST_INSTALL=${NVSHMEM_PREFIX}/perftest && '
-prebuildopts += 'export NVSHMEM_TEST_INSTALL=${NVSHMEM_PREFIX}/test && '
-
-preinstallopts = prebuildopts
-
-sanity_check_paths = {
-    'files': ['lib/libnvshmem.a', 'lib/nvshmem_bootstrap_mpi.%s' % SHLIB_EXT],
-    'dirs': ['include']
-}
-
-modextravars = {'NVSHMEM_HOME': '%(installdir)s'}
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/n/NVSHMEM/NVSHMEM-2.4.1-gpsmpi-2021b.eb b/Golden_Repo/n/NVSHMEM/NVSHMEM-2.4.1-gpsmpi-2021b.eb
deleted file mode 100644
index 1b2e6a9b6..000000000
--- a/Golden_Repo/n/NVSHMEM/NVSHMEM-2.4.1-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,65 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'NVSHMEM'
-version = '2.4.1'
-
-local_cuda_version = '11.5'
-
-homepage = 'https://developer.nvidia.com/nvshmem'
-description = """NVSHMEM is a parallel programming interface based on OpenSHMEM that provides 
-efficient and scalable communication for NVIDIA GPU clusters. NVSHMEM creates a 
-global address space for data that spans the memory of multiple GPUs and can be 
-accessed with fine-grained GPU-initiated operations, CPU-initiated operations, 
-and operations on CUDA streams.
-"""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-
-# You need to download the source manully from https://developer.nvidia.com/nvshmem-downloads
-sources = ['%(namelower)s_src_%(version)s-3.txz']
-checksums = ['8b6c0eab321b6352911e470f9e81a777a49e58148ec3728453b9522446dba178']
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('CUDA', local_cuda_version, '', SYSTEM),
-    ('NCCL', '2.11.4', f'-CUDA-{local_cuda_version}'),
-]
-
-skipsteps = ['configure']
-
-prebuildopts = 'export NVSHMEM_USE_GDRCOPY=1 && '
-prebuildopts += 'export GDRCOPY_HOME=/usr && '
-
-prebuildopts += 'export MPI_HOME=${EBROOTPSMPI} && '
-prebuildopts += 'export NVSHMEM_MPI_SUPPORT=1 && '
-prebuildopts += 'export NVSHMEMTEST_USE_MPI_LAUNCHER=1 && '
-
-prebuildopts += 'export NCCL_HOME=${EBROOTNCCL} && '
-prebuildopts += 'export NVSHMEM_USE_NCCL=1 && '
-
-prebuildopts += 'export NVSHMEM_BUILDDIR=%(builddir)s && '
-prebuildopts += 'export NVSHMEM_EXAMPLES_BUILDDIR=${NVSHMEM_BUILDDIR}/examples/obj && '
-prebuildopts += 'export NVSHMEM_OTHERTEST_BUILDDIR=${NVSHMEM_BUILDDIR}/othertest/obj && '
-prebuildopts += 'export NVSHMEM_TEST_BUILDDIR=${NVSHMEM_BUILDDIR}/test/obj && '
-prebuildopts += 'export NVSHMEM_PERFTEST_BUILDDIR=${NVSHMEM_BUILDDIR}/perftest/obj && '
-
-prebuildopts += 'export NVSHMEM_PREFIX=%(installdir)s && '
-prebuildopts += 'export NVSHMEM_EXAMPLES_INSTALL=${NVSHMEM_PREFIX}/examples && '
-prebuildopts += 'export NVSHMEM_OTHERTEST_INSTALL=${NVSHMEM_PREFIX}/othertest && '
-prebuildopts += 'export NVSHMEM_PERFTEST_INSTALL=${NVSHMEM_PREFIX}/perftest && '
-prebuildopts += 'export NVSHMEM_TEST_INSTALL=${NVSHMEM_PREFIX}/test && '
-
-preinstallopts = prebuildopts
-
-sanity_check_paths = {
-    'files': ['lib/libnvshmem.a', 'lib/nvshmem_bootstrap_mpi.%s' % SHLIB_EXT],
-    'dirs': ['include']
-}
-
-modextravars = {'NVSHMEM_HOME': '%(installdir)s'}
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/n/NVSHMEM/NVSHMEM-2.5.0-gpsmpi-2021b.eb b/Golden_Repo/n/NVSHMEM/NVSHMEM-2.5.0-gpsmpi-2021b.eb
deleted file mode 100644
index 6fa265e2b..000000000
--- a/Golden_Repo/n/NVSHMEM/NVSHMEM-2.5.0-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,65 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'NVSHMEM'
-version = '2.5.0'
-
-local_cuda_version = '11.5'
-
-homepage = 'https://developer.nvidia.com/nvshmem'
-description = """NVSHMEM is a parallel programming interface based on OpenSHMEM that provides 
-efficient and scalable communication for NVIDIA GPU clusters. NVSHMEM creates a 
-global address space for data that spans the memory of multiple GPUs and can be 
-accessed with fine-grained GPU-initiated operations, CPU-initiated operations, 
-and operations on CUDA streams.
-"""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-
-# You need to download the source manully from https://developer.nvidia.com/nvshmem-downloads
-sources = ['%(namelower)s_src_%(version)s-19.txz']
-checksums = ['dd800b40f1d296e1d3ed2a9885adcfe745c3e57582bc809860e87bd32abcdc60']
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('CUDA', local_cuda_version, '', SYSTEM),
-    ('NCCL', '2.12.7-1', f'-CUDA-{local_cuda_version}'),
-]
-
-skipsteps = ['configure']
-
-prebuildopts = 'export NVSHMEM_USE_GDRCOPY=1 && '
-prebuildopts += 'export GDRCOPY_HOME=/usr && '
-
-prebuildopts += 'export MPI_HOME=${EBROOTPSMPI} && '
-prebuildopts += 'export NVSHMEM_MPI_SUPPORT=1 && '
-prebuildopts += 'export NVSHMEMTEST_USE_MPI_LAUNCHER=1 && '
-
-prebuildopts += 'export NCCL_HOME=${EBROOTNCCL} && '
-prebuildopts += 'export NVSHMEM_USE_NCCL=1 && '
-
-prebuildopts += 'export NVSHMEM_BUILDDIR=%(builddir)s && '
-prebuildopts += 'export NVSHMEM_EXAMPLES_BUILDDIR=${NVSHMEM_BUILDDIR}/examples/obj && '
-prebuildopts += 'export NVSHMEM_OTHERTEST_BUILDDIR=${NVSHMEM_BUILDDIR}/othertest/obj && '
-prebuildopts += 'export NVSHMEM_TEST_BUILDDIR=${NVSHMEM_BUILDDIR}/test/obj && '
-prebuildopts += 'export NVSHMEM_PERFTEST_BUILDDIR=${NVSHMEM_BUILDDIR}/perftest/obj && '
-
-prebuildopts += 'export NVSHMEM_PREFIX=%(installdir)s && '
-prebuildopts += 'export NVSHMEM_EXAMPLES_INSTALL=${NVSHMEM_PREFIX}/examples && '
-prebuildopts += 'export NVSHMEM_OTHERTEST_INSTALL=${NVSHMEM_PREFIX}/othertest && '
-prebuildopts += 'export NVSHMEM_PERFTEST_INSTALL=${NVSHMEM_PREFIX}/perftest && '
-prebuildopts += 'export NVSHMEM_TEST_INSTALL=${NVSHMEM_PREFIX}/test && '
-
-preinstallopts = prebuildopts
-
-sanity_check_paths = {
-    'files': ['lib/libnvshmem.a', 'lib/nvshmem_bootstrap_mpi.%s' % SHLIB_EXT],
-    'dirs': ['include']
-}
-
-modextravars = {'NVSHMEM_HOME': '%(installdir)s'}
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/n/NWChem/NWChem-7.0.2-intel-2021b.eb b/Golden_Repo/n/NWChem/NWChem-7.0.2-intel-2021b.eb
deleted file mode 100644
index 561ec9515..000000000
--- a/Golden_Repo/n/NWChem/NWChem-7.0.2-intel-2021b.eb
+++ /dev/null
@@ -1,49 +0,0 @@
-name = 'NWChem'
-version = '7.0.2'
-local_verdate = '2020-10-12'
-local_revision = 'b9985dfa'
-
-
-homepage = 'https://nwchemgit.github.io'
-description = """NWChem aims to provide its users with computational chemistry tools that are scalable both in
- their ability to treat large scientific computational chemistry problems efficiently, and in their use of available
- parallel computing resources from high-performance parallel supercomputers to conventional workstation clusters.
- NWChem software can handle: biomolecules, nanostructures, and solid-state; from quantum to classical, and all
- combinations; Gaussian basis functions or plane-waves; scaling from one to thousands of processors; properties
- and relativity."""
-
-toolchain = {'name': 'intel', 'version': '2021b'}
-toolchainopts = {'i8': True}
-source_urls = ['https://github.com/nwchemgit/nwchem/releases/download/v%(version)s-release/']
-sources = ['nwchem-%%(version)s-release.revision-%s-src.%s.tar.bz2' % (local_revision, local_verdate)]
-patches = [
-    'NWChem_fix-date.patch',
-]
-checksums = [
-    'd9d19d87e70abf43d61b2d34e60c293371af60d14df4a6333bf40ea63f6dc8ce',
-    '215ec54f6132f2c9306bd636456722a36f0f1d98a67a0c8cbd10c5d1eed68feb'
-]
-
-dependencies = [('Python', '3.9.6')]
-
-# This easyconfig is using the default for armci_network (OPENIB) and
-# thus needs infiniband libraries.
-osdependencies = [
-    ('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel'),
-]
-
-preconfigopts = 'export EXTRA_LIBS=-lutil && '
-
-# (tm)
-# tests in the form  defined in nwchem.py are of little use and take too long
-# preferentially, the tests should be done separately,  running 12-16 testcases 
-# including verification simultaneously using 8 cores/test; in some expensive test cases
-# 16 cores/test are more adequate. 
-# the acceptable test failure quota of 50% as indicated in nwchem.py would imply a useless code.
-# jurecadc/intel-para-2021 delivers 6 failures out of 244 tests (subset of the qm test suite).
-
-tests = False
-
-modules = 'all python'
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/n/NWChem/NWChem-7.0.2-intel-para-2021b.eb b/Golden_Repo/n/NWChem/NWChem-7.0.2-intel-para-2021b.eb
deleted file mode 100644
index ebebd8b0a..000000000
--- a/Golden_Repo/n/NWChem/NWChem-7.0.2-intel-para-2021b.eb
+++ /dev/null
@@ -1,49 +0,0 @@
-name = 'NWChem'
-version = '7.0.2'
-local_verdate = '2020-10-12'
-local_revision = 'b9985dfa'
-
-
-homepage = 'https://nwchemgit.github.io'
-description = """NWChem aims to provide its users with computational chemistry tools that are scalable both in
- their ability to treat large scientific computational chemistry problems efficiently, and in their use of available
- parallel computing resources from high-performance parallel supercomputers to conventional workstation clusters.
- NWChem software can handle: biomolecules, nanostructures, and solid-state; from quantum to classical, and all
- combinations; Gaussian basis functions or plane-waves; scaling from one to thousands of processors; properties
- and relativity."""
-
-toolchain = {'name': 'intel-para', 'version': '2021b'}
-toolchainopts = {'i8': True}
-source_urls = ['https://github.com/nwchemgit/nwchem/releases/download/v%(version)s-release/']
-sources = ['nwchem-%%(version)s-release.revision-%s-src.%s.tar.bz2' % (local_revision, local_verdate)]
-patches = [
-    'NWChem_fix-date.patch',
-]
-checksums = [
-    'd9d19d87e70abf43d61b2d34e60c293371af60d14df4a6333bf40ea63f6dc8ce',
-    '215ec54f6132f2c9306bd636456722a36f0f1d98a67a0c8cbd10c5d1eed68feb'
-]
-
-dependencies = [('Python', '3.9.6')]
-
-# This easyconfig is using the default for armci_network (OPENIB) and
-# thus needs infiniband libraries.
-osdependencies = [
-    ('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel'),
-]
-
-preconfigopts = 'export EXTRA_LIBS=-lutil && '
-
-# (tm)
-# tests in the form  defined in nwchem.py are of little use and take too long
-# preferentially, the tests should be done separately,  running 12-16 testcases 
-# including verification simultaneously using 8 cores/test; in some expensive test cases
-# 16 cores/test are more adequate. 
-# the acceptable test failure quota of 50% as indicated in nwchem.py would imply a useless code.
-# jurecadc/intel-para-2021 delivers 6 failures out of 244 tests (subset of the qm test suite).
-
-tests = False
-
-modules = 'all python'
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/n/NWChem/NWChem_fix-date.patch b/Golden_Repo/n/NWChem/NWChem_fix-date.patch
deleted file mode 100644
index 5d846acc3..000000000
--- a/Golden_Repo/n/NWChem/NWChem_fix-date.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nwchem-6.1.1-src/src/GNUmakefile.orig	2012-12-10 17:23:43.236474825 +0100
-+++ nwchem-6.1.1-src/src/GNUmakefile	2012-12-10 17:23:55.916623423 +0100
-@@ -7,7 +7,7 @@
- 
-   SUBDIRS =  $(NWSUBDIRS)
- 
--  LIB_DEFINES =  -DCOMPILATION_DATE="'`date +%a_%b_%d_%H:%M:%S_%Y`'" \
-+  LIB_DEFINES =  -DCOMPILATION_DATE="'`date`'" \
-                  -DCOMPILATION_DIR="'$(TOPDIR)'" \
-                  -DNWCHEM_BRANCH="'$(CODE_BRANCH)'"
- ifeq ($(TARGET),FUJITSU_VPP)
diff --git a/Golden_Repo/n/NeoVim/NeoVim-0.7.2-GCCcore-11.2.0.eb b/Golden_Repo/n/NeoVim/NeoVim-0.7.2-GCCcore-11.2.0.eb
deleted file mode 100644
index 32f41fca3..000000000
--- a/Golden_Repo/n/NeoVim/NeoVim-0.7.2-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,74 +0,0 @@
-# NeoVim EasyConfig
-# Copyright 2019-2022 Stepan Nassyr @ Forschungszentrum Juelich
-easyblock = 'CMakeNinja'
-
-name = 'NeoVim'
-version = '0.7.2'
-# versionsuffix = "-Python-%(pyver)s"
-
-homepage = 'https://neovim.io'
-description = """hyperextensible Vim-based text editor
-"""
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-github_account = 'neovim'
-source_urls = [GITHUB_LOWER_SOURCE]
-sources = [
-    {
-        'download_filename': 'v%(version)s.tar.gz',
-        'filename':          SOURCELOWER_TAR_GZ,
-    }
-]
-
-checksums = [
-    'ccab8ca02a0c292de9ea14b39f84f90b635a69282de38a6b4ccc8565bc65d096',
-]
-
-
-builddependencies = [
-    ('CMake', '3.23.1'),
-    ('Ninja', '1.10.2'),
-    ('binutils', '2.37'),
-    ('Autoconf', '2.71'),
-    ('Automake', '1.16.4'),
-    ('pkg-config', '0.29.2'),
-    ('UnZip',      '6.0'),
-]
-
-dependencies = [
-    ('Python',      '3.9.6'),
-    ('Perl',        '5.34.0'),
-    ('jemalloc',    '5.2.1'),
-    ('msgpack-c',   '4.0.0'),
-    ('gperf',       '3.1'),
-    ('libmpack-lua', '1.0.9'),
-    ('libvterm',    '0.1.3'),
-    ('libtermkey',  '0.22'),
-    ('libuv',       '1.44.2'),
-    ('LuaJIT2-OpenResty', '2.1-20220411'),
-    ('luv',         '1.44.2-0'),
-    ('lpeg',        '1.0.2'),
-    ('tree-sitter', '0.20.6'),
-    ('unibilium',   '2.1.1'),
-    ('utf8proc',    '2.6.1'),
-]
-
-separate_build_dir = True
-
-# Use system libs
-configopts = (" -DDEPS_CMAKE_FLAGS=\"-DUSE_BUNDLED_UNIBILIUM=OFF -DUSE_BUNDLED_LIBTERMKEY=OFF "
-              " -DUSE_BUNDLED_LIBVTERM=OFF -DUSE_BUNDLED_LUAJIT=OFF\" ")
-
-# Use bundled
-# osdependencies = ['unibilium-devel']
-
-
-sanity_check_paths = {
-    'files': ['bin/nvim'],
-    'dirs': ['bin'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/n/Ninja-Python/Ninja-Python-1.10.2-GCCcore-11.2.0.eb b/Golden_Repo/n/Ninja-Python/Ninja-Python-1.10.2-GCCcore-11.2.0.eb
deleted file mode 100644
index 653794074..000000000
--- a/Golden_Repo/n/Ninja-Python/Ninja-Python-1.10.2-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,38 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'Ninja-Python'
-version = '1.10.2'
-
-homepage = 'https://ninja-build.org/'
-description = "Ninja is a small build system with a focus on speed."
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://pypi.python.org/packages/source/n/ninja']
-sources = [
-    {'download_filename': 'ninja-%(version)s.tar.gz', 'filename': SOURCE_TAR_GZ}]
-checksums = ['bb5e54b9a7343b3a8fc6532ae2c169af387a45b0d4dd5b72c2803e21658c5791']
-
-builddependencies = [
-    ('CMake', '3.21.1'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('scikit-build', '0.11.1'),
-    ('Ninja', '1.10.2'),
-]
-
-download_dep_fail = True
-use_pip = True
-sanity_pip_check = True
-
-
-options = {'modulename': 'ninja'}
-
-sanity_check_paths = {
-    'files': [],
-    'dirs': ['lib/python%(pyshortver)s/site-packages/ninja'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/n/Ninja/Ninja-1.10.2-GCCcore-11.2.0.eb b/Golden_Repo/n/Ninja/Ninja-1.10.2-GCCcore-11.2.0.eb
deleted file mode 100644
index a6c7d11dd..000000000
--- a/Golden_Repo/n/Ninja/Ninja-1.10.2-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,31 +0,0 @@
-easyblock = 'CmdCp'
-
-name = 'Ninja'
-version = '1.10.2'
-
-homepage = 'https://ninja-build.org/'
-description = "Ninja is a small build system with a focus on speed."
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://github.com/ninja-build/ninja/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['ce35865411f0490368a8fc383f29071de6690cbadc27704734978221f25e2bed']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Python', '3.9.6', '-bare'),
-]
-
-cmds_map = [('.*', "./configure.py --bootstrap")]
-
-files_to_copy = [(['ninja'], 'bin')]
-
-sanity_check_paths = {
-    'files': ['bin/ninja'],
-    'dirs': [],
-}
-
-sanity_check_commands = ["ninja --version"]
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/n/Nsight-Compute/Nsight-Compute-2022.1.0-GCCcore-11.2.0.eb b/Golden_Repo/n/Nsight-Compute/Nsight-Compute-2022.1.0-GCCcore-11.2.0.eb
deleted file mode 100644
index fc4f34571..000000000
--- a/Golden_Repo/n/Nsight-Compute/Nsight-Compute-2022.1.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,47 +0,0 @@
-# jg (CSCS)
-# AH (JSC)
-easyblock = 'Binary'
-
-name = 'Nsight-Compute'
-version = '2022.1.0'
-homepage = 'https://developer.nvidia.com/nsight-compute'
-description = 'NVIDIA Nsight Compute is an interactive kernel profiler for CUDA applications'
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-# Download source binary package manually, requires Nvidia Developer Account
-# source_urls = 'https://developer.nvidia.com/nsight-compute'
-sources = [{
-    'filename': 'nsight-compute-linux-%(version)s.12-30763755.run',
-    'extract_cmd': '/bin/sh %s'
-}]
-checksums = ['af4a24ec023aa812faf7fb93b6083ca3670c147e9a7b599873af26019dd3ceab']
-
-# Not really necessary, but useful if we use this as a template for another package
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('X11', '20210802')
-]
-
-extract_sources = True
-unpack_options = '--nochown --noexec --nox11 --target %(builddir)s'
-
-install_cmd = 'cp -r %(builddir)s/pkg/* %(installdir)s/'
-
-# Workaround due to wrong permissions once the files are extracted from the .run file
-postinstallcmds = [
-    'find %(installdir)s -type f -and -executable -and ! -name "lib*" -exec chmod go+x {} \;']
-
-sanity_check_paths = {
-    'files': ['ncu-ui', 'ncu'],
-    'dirs': ['docs', 'extras', 'host', 'sections', 'target']
-}
-
-modluafooter = """
-add_property("arch","gpu")
-"""
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/n/Nsight-Compute/Nsight-Compute-2022.1.1-GCCcore-11.2.0.eb b/Golden_Repo/n/Nsight-Compute/Nsight-Compute-2022.1.1-GCCcore-11.2.0.eb
deleted file mode 100644
index c0c2d9edc..000000000
--- a/Golden_Repo/n/Nsight-Compute/Nsight-Compute-2022.1.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,47 +0,0 @@
-# jg (CSCS)
-# AH (JSC)
-easyblock = 'Binary'
-
-name = 'Nsight-Compute'
-version = '2022.1.1'
-homepage = 'https://developer.nvidia.com/nsight-compute'
-description = 'NVIDIA Nsight Compute is an interactive kernel profiler for CUDA applications'
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-# Download source binary package manually, requires Nvidia Developer Account
-# source_urls = 'https://developer.nvidia.com/nsight-compute'
-sources = [{
-    'filename': 'nsight-compute-linux-%(version)s.2-30914944.run',
-    'extract_cmd': '/bin/sh %s'
-}]
-checksums = ['bae875391de5fb9ff7238b3c06fea5f77eff4afae9720e7021c90908d1f84081']
-
-# Not really necessary, but useful if we use this as a template for another package
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('X11', '20210802')
-]
-
-extract_sources = True
-unpack_options = '--nochown --noexec --nox11 --target %(builddir)s'
-
-install_cmd = 'cp -r %(builddir)s/pkg/* %(installdir)s/'
-
-# Workaround due to wrong permissions once the files are extracted from the .run file
-postinstallcmds = [
-    'find %(installdir)s -type f -and -executable -and ! -name "lib*" -exec chmod go+x {} \;']
-
-sanity_check_paths = {
-    'files': ['ncu-ui', 'ncu'],
-    'dirs': ['docs', 'extras', 'host', 'sections', 'target']
-}
-
-modluafooter = """
-add_property("arch","gpu")
-"""
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/n/Nsight-Compute/Nsight-Compute-2022.2.0-GCCcore-11.2.0.eb b/Golden_Repo/n/Nsight-Compute/Nsight-Compute-2022.2.0-GCCcore-11.2.0.eb
deleted file mode 100644
index d9a6c0529..000000000
--- a/Golden_Repo/n/Nsight-Compute/Nsight-Compute-2022.2.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,47 +0,0 @@
-# jg (CSCS)
-# AH (JSC)
-easyblock = 'Binary'
-
-name = 'Nsight-Compute'
-version = '2022.2.0'
-homepage = 'https://developer.nvidia.com/nsight-compute'
-description = 'NVIDIA Nsight Compute is an interactive kernel profiler for CUDA applications'
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-# Download source binary package manually, requires Nvidia Developer Account
-# source_urls = 'https://developer.nvidia.com/nsight-compute'
-sources = [{
-    'filename': 'nsight-compute-linux-%(version)s.13-31140043.run',
-    'extract_cmd': '/bin/sh %s'
-}]
-checksums = ['c54e232419c8f167240f694dd1bd88d7c5e49535b81f7887280ac65dbacfaaf4']
-
-# Not really necessary, but useful if we use this as a template for another package
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('X11', '20210802')
-]
-
-extract_sources = True
-unpack_options = '--nochown --noexec --nox11 --target %(builddir)s'
-
-install_cmd = 'cp -r %(builddir)s/pkg/* %(installdir)s/'
-
-# Workaround due to wrong permissions once the files are extracted from the .run file
-postinstallcmds = [
-    'find %(installdir)s -type f -and -executable -and ! -name "lib*" -exec chmod go+x {} \;']
-
-sanity_check_paths = {
-    'files': ['ncu-ui', 'ncu'],
-    'dirs': ['docs', 'extras', 'host', 'sections', 'target']
-}
-
-modluafooter = """
-add_property("arch","gpu")
-"""
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/n/Nsight-Systems/Nsight-Systems-2021.5.1-GCCcore-11.2.0.eb b/Golden_Repo/n/Nsight-Systems/Nsight-Systems-2021.5.1-GCCcore-11.2.0.eb
deleted file mode 100644
index 4a69cef73..000000000
--- a/Golden_Repo/n/Nsight-Systems/Nsight-Systems-2021.5.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,44 +0,0 @@
-# jg (CSCS)
-# AH (JSC)
-easyblock = 'Binary'
-
-name = 'Nsight-Systems'
-version = '2021.5.1'
-homepage = 'https://developer.nvidia.com/nsight-systems'
-description = 'NVIDIA Nsight Systems is a system-wide performance analysis tool'
-
-# GCCcore toolchain is not strictly necessary, but used to bring it to same level as Nsight Compute
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-# Download source binary package manually, requires Nvidia Developer Account
-# source_urls = 'https://developer.nvidia.com/nsight-systems'
-sources = [{
-    'filename': 'NsightSystems-linux-public-%(version)s.118-f89f9cd.run',
-    'extract_cmd': '/bin/sh %s'
-}]
-checksums = ['315951ce6902c3756e9de5c42e329f72576e0bfb2d5b12393ebf455ec6841a99']
-
-dependencies = [
-    ('X11', '20210802')
-]
-
-
-extract_sources = True
-unpack_options = '--accept --nochown --noexec --nox11 --target %(builddir)s'
-
-install_cmd = 'cp -r %(builddir)s/pkg/* %(installdir)s/'
-
-sanity_check_paths = {
-    'files': ['bin/nsys'],
-    'dirs': ['target-linux-x64', 'host-linux-x64']
-}
-
-modextravars = {
-    'NSIGHT_DOC': '%(installdir)s/documentation/nsys-exporter'
-}
-
-modluafooter = """
-add_property("arch","gpu")
-"""
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/n/Nsight-Systems/Nsight-Systems-2022.1.1-GCCcore-11.2.0.eb b/Golden_Repo/n/Nsight-Systems/Nsight-Systems-2022.1.1-GCCcore-11.2.0.eb
deleted file mode 100644
index c9abbfe25..000000000
--- a/Golden_Repo/n/Nsight-Systems/Nsight-Systems-2022.1.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,44 +0,0 @@
-# jg (CSCS)
-# AH (JSC)
-easyblock = 'Binary'
-
-name = 'Nsight-Systems'
-version = '2022.1.1'
-homepage = 'https://developer.nvidia.com/nsight-systems'
-description = 'NVIDIA Nsight Systems is a system-wide performance analysis tool'
-
-# GCCcore toolchain is not strictly necessary, but used to bring it to same level as Nsight Compute
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-# Download source binary package manually, requires Nvidia Developer Account
-# source_urls = 'https://developer.nvidia.com/nsight-systems'
-sources = [{
-    'filename': 'NsightSystems-linux-public-%(version)s.61-1d07dc0.run',
-    'extract_cmd': '/bin/sh %s'
-}]
-checksums = ['1241924ec32de9c0c608bd1e436cc72e03adc6e052eff889cca00d000ccb38ee']
-
-dependencies = [
-    ('X11', '20210802')
-]
-
-
-extract_sources = True
-unpack_options = '--accept --nochown --noexec --nox11 --target %(builddir)s'
-
-install_cmd = 'cp -r %(builddir)s/pkg/* %(installdir)s/'
-
-sanity_check_paths = {
-    'files': ['bin/nsys'],
-    'dirs': ['target-linux-x64', 'host-linux-x64']
-}
-
-modextravars = {
-    'NSIGHT_DOC': '%(installdir)s/documentation/nsys-exporter'
-}
-
-modluafooter = """
-add_property("arch","gpu")
-"""
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/n/Nsight-Systems/Nsight-Systems-2022.2.1-GCCcore-11.2.0.eb b/Golden_Repo/n/Nsight-Systems/Nsight-Systems-2022.2.1-GCCcore-11.2.0.eb
deleted file mode 100644
index eea01c49a..000000000
--- a/Golden_Repo/n/Nsight-Systems/Nsight-Systems-2022.2.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,44 +0,0 @@
-# jg (CSCS)
-# AH (JSC)
-easyblock = 'Binary'
-
-name = 'Nsight-Systems'
-version = '2022.2.1'
-homepage = 'https://developer.nvidia.com/nsight-systems'
-description = 'NVIDIA Nsight Systems is a system-wide performance analysis tool'
-
-# GCCcore toolchain is not strictly necessary, but used to bring it to same level as Nsight Compute
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-# Download source binary package manually, requires Nvidia Developer Account
-# source_urls = 'https://developer.nvidia.com/nsight-systems'
-sources = [{
-    'filename': 'NsightSystems-linux-public-%(version)s.31-5fe97ab.run',
-    'extract_cmd': '/bin/sh %s'
-}]
-checksums = ['01753300e6a418a4cb6104f11eb13961263ccaecc768f74801d261dab90e569a']
-
-dependencies = [
-    ('X11', '20210802')
-]
-
-
-extract_sources = True
-unpack_options = '--accept --nochown --noexec --nox11 --target %(builddir)s'
-
-install_cmd = 'cp -r %(builddir)s/pkg/* %(installdir)s/'
-
-sanity_check_paths = {
-    'files': ['bin/nsys'],
-    'dirs': ['target-linux-x64', 'host-linux-x64']
-}
-
-modextravars = {
-    'NSIGHT_DOC': '%(installdir)s/documentation/nsys-exporter'
-}
-
-modluafooter = """
-add_property("arch","gpu")
-"""
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/n/nano/nano-5.9-GCCcore-11.2.0.eb b/Golden_Repo/n/nano/nano-5.9-GCCcore-11.2.0.eb
deleted file mode 100644
index 7bae1a12f..000000000
--- a/Golden_Repo/n/nano/nano-5.9-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,25 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'nano'
-version = '5.9'
-
-homepage = 'https://www.nano-editor.org/'
-description = """GNU nano is a small and friendly text editor. Besides basic text editing, nano
-offers features like undo/redo, syntax coloring, interactive search-and-replace,
-auto-indentation, line numbers, word completion, file locking, backup files, and
-internationalization support."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [GNU_SOURCE]
-sources = [SOURCE_TAR_GZ]
-checksums = ['cb6ac9edc7fb8f723b92a7e5626537e6d546b95abfaddd3f790f65dcdc43a95d']
-
-builddependencies = [('binutils', '2.37')]
-
-sanity_check_paths = {
-    'files': ['bin/nano'],
-    'dirs': ['bin', 'share'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/n/ncurses/ncurses-6.2-GCCcore-11.2.0.eb b/Golden_Repo/n/ncurses/ncurses-6.2-GCCcore-11.2.0.eb
deleted file mode 100644
index 14f68726d..000000000
--- a/Golden_Repo/n/ncurses/ncurses-6.2-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,49 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'ncurses'
-version = '6.2'
-
-homepage = 'https://www.gnu.org/software/ncurses/'
-description = """
-The Ncurses (new curses) library is a free software emulation of curses in
-System V Release 4.0, and more. It uses Terminfo format, supports pads and
-color and multiple highlights and forms characters and function-key mapping,
-and has all the other SYSV-curses enhancements over BSD Curses.
-"""
-
-site_contacts = 'sc@fz-juelich.de'
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [GNU_SOURCE]
-sources = [SOURCE_TAR_GZ]
-checksums = ['30306e0c76e0f9f1f0de987cf1c82a5c21e1ce6568b9227f7da5b71cbea86c9d']
-
-builddependencies = [('binutils', '2.37')]
-
-local_common_configopts = "--with-shared --enable-overwrite --without-ada --enable-symlinks "
-configopts = [
-    # default build
-    local_common_configopts,
-    # the UTF-8 enabled version (ncursesw)
-    local_common_configopts + "--enable-ext-colors --enable-widec --includedir=%(installdir)s/include/ncursesw/",
-]
-
-# Symlink libtinfo to libncurses (since it can handle the API) so it doesn't get picked up from the OS
-postinstallcmds = [
-    "ln -s %(installdir)s/lib/libncurses.so %(installdir)s/lib/libtinfo.so",
-    "ln -s %(installdir)s/lib/libncurses.a %(installdir)s/lib/libtinfo.a"
-]
-
-local_libs = ["form", "menu", "ncurses", "panel"]
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in ["captoinfo", "clear", "infocmp", "infotocap", "ncurses%(version_major)s-config",
-                                     "reset", "tabs", "tic", "toe", "tput", "tset"]] +
-    ['lib/lib%s%s.a' % (x, y) for x in local_libs for y in ['', '_g', 'w', 'w_g']] +
-    ['lib/lib%s%s.%s' % (x, y, SHLIB_EXT) for x in local_libs for y in ['', 'w']] +
-    ['lib/libncurses++%s.a' % x for x in ['', 'w']],
-    'dirs': ['include', 'include/ncursesw'],
-}
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/n/ncurses/ncurses-6.2.eb b/Golden_Repo/n/ncurses/ncurses-6.2.eb
deleted file mode 100644
index 04bedcb9b..000000000
--- a/Golden_Repo/n/ncurses/ncurses-6.2.eb
+++ /dev/null
@@ -1,48 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'ncurses'
-version = '6.2'
-
-homepage = 'https://www.gnu.org/software/ncurses/'
-description = """The Ncurses (new curses) library is a free software emulation of curses in System V Release 4.0,
- and more. It uses Terminfo format, supports pads and color and multiple highlights and forms characters and
- function-key mapping, and has all the other SYSV-curses enhancements over BSD Curses."""
-
-site_contacts = 'sc@fz-juelich.de'
-
-toolchain = SYSTEM
-
-source_urls = [GNU_SOURCE]
-sources = [SOURCE_TAR_GZ]
-checksums = ['30306e0c76e0f9f1f0de987cf1c82a5c21e1ce6568b9227f7da5b71cbea86c9d']
-
-local_common_configopts = "--with-shared --enable-overwrite --without-ada --enable-symlinks "
-configopts = [
-    # default build
-    local_common_configopts,
-    # the UTF-8 enabled version (ncursesw)
-    local_common_configopts + \
-    "--enable-ext-colors --enable-widec --includedir=%(installdir)s/include/ncursesw/",
-]
-
-# need to take care of $CFLAGS ourselves with dummy toolchain
-# we need to add -fPIC, but should also include -O* option to avoid compiling with -O0 (default for GCC)
-buildopts = 'CFLAGS="-O2 -fPIC"'
-
-# Symlink libtinfo to libncurses (since it can handle the API) so it doesn't get picked up from the OS
-postinstallcmds = [
-    "ln -s %(installdir)s/lib/libncurses.so %(installdir)s/lib/libtinfo.so",
-    "ln -s %(installdir)s/lib/libncurses.a %(installdir)s/lib/libtinfo.a"
-]
-
-local_libs = ["form", "menu", "ncurses", "panel"]
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in ["captoinfo", "clear", "infocmp", "infotocap", "ncurses%(version_major)s-config",
-                                     "reset", "tabs", "tic", "toe", "tput", "tset"]] +
-    ['lib/lib%s%s.a' % (x, y) for x in local_libs for y in ['', '_g', 'w', 'w_g']] +
-    ['lib/lib%s%s.%s' % (x, y, SHLIB_EXT) for x in local_libs for y in ['', 'w']] +
-    ['lib/libncurses++%s.a' % x for x in ['', 'w']],
-    'dirs': ['include', 'include/ncursesw'],
-}
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/n/ncview/ncview-2.1.8-GCCcore-11.2.0.eb b/Golden_Repo/n/ncview/ncview-2.1.8-GCCcore-11.2.0.eb
deleted file mode 100644
index e6ab03122..000000000
--- a/Golden_Repo/n/ncview/ncview-2.1.8-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,40 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'ncview'
-version = "2.1.8"
-
-homepage = 'http://meteora.ucsd.edu/~pierce/ncview_home_page.html'
-description = """Ncview is a visual browser for netCDF format files. 
-Typically you would use ncview to get a quick and easy, push-button 
-look at your netCDF files. You can view simple movies of the data, 
-view along various dimensions, take a look at the actual data values, 
-change color maps, invert the data, etc."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['ftp://cirrus.ucsd.edu/pub/ncview/']
-sources = [SOURCE_TAR_GZ]
-checksums = ['e8badc507b9b774801288d1c2d59eb79ab31b004df4858d0674ed0d87dfc91be']
-
-preconfigopts = 'CC=$(which $CC) '
-configopts = '--with-udunits2_incdir=$EBROOTUDUNITS/include --with-udunits2_libdir=$EBROOTUDUNITS/lib '
-configopts += '--with-png_libdir=$EBROOTLIBPNG/lib --with-png_incdir=$EBROOTLIBPNG/include'
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('netCDF', '4.8.1', '-serial'),
-    ('UDUNITS', '2.2.28'),
-    ('X11', '20210802'),
-    ('libpng', '1.6.37'),
-    ('zlib', '1.2.11'),
-]
-
-sanity_check_paths = {
-    'files': ['bin/ncview'],
-    'dirs': [],
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/n/netCDF-C++4/netCDF-C++4-4.3.1-GCCcore-11.2.0-serial.eb b/Golden_Repo/n/netCDF-C++4/netCDF-C++4-4.3.1-GCCcore-11.2.0-serial.eb
deleted file mode 100644
index 33bd3a211..000000000
--- a/Golden_Repo/n/netCDF-C++4/netCDF-C++4-4.3.1-GCCcore-11.2.0-serial.eb
+++ /dev/null
@@ -1,28 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'netCDF-C++4'
-version = '4.3.1'
-versionsuffix = '-serial'
-
-homepage = 'http://www.unidata.ucar.edu/software/netcdf/'
-description = """NetCDF (network Common Data Form) is a set of software libraries 
- and machine-independent data formats that support the creation, access, and sharing of array-oriented 
- scientific data.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/Unidata/netcdf-cxx4/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['e3fe3d2ec06c1c2772555bf1208d220aab5fee186d04bd265219b0bc7a978edc']
-
-builddependencies = [('binutils', '2.37')]
-dependencies = [('netCDF', '4.8.1', '-serial')]
-
-sanity_check_paths = {
-    'files': ['include/netcdf', 'lib/libnetcdf_c++4.a', 'lib/libnetcdf_c++4.%s' % SHLIB_EXT],
-    'dirs': [],
-}
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/netCDF-C++4/netCDF-C++4-4.3.1-gompi-2021b.eb b/Golden_Repo/n/netCDF-C++4/netCDF-C++4-4.3.1-gompi-2021b.eb
deleted file mode 100644
index 31e655f1e..000000000
--- a/Golden_Repo/n/netCDF-C++4/netCDF-C++4-4.3.1-gompi-2021b.eb
+++ /dev/null
@@ -1,26 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'netCDF-C++4'
-version = '4.3.1'
-
-homepage = 'http://www.unidata.ucar.edu/software/netcdf/'
-description = """NetCDF (network Common Data Form) is a set of software libraries 
- and machine-independent data formats that support the creation, access, and sharing of array-oriented 
- scientific data.
-"""
-
-toolchain = {'name': 'gompi', 'version': '2021b'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/Unidata/netcdf-cxx4/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['e3fe3d2ec06c1c2772555bf1208d220aab5fee186d04bd265219b0bc7a978edc']
-
-dependencies = [('netCDF', '4.8.1')]
-
-sanity_check_paths = {
-    'files': ['include/netcdf', 'lib/libnetcdf_c++4.a', 'lib/libnetcdf_c++4.%s' % SHLIB_EXT],
-    'dirs': [],
-}
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/netCDF-C++4/netCDF-C++4-4.3.1-gpsmpi-2021b.eb b/Golden_Repo/n/netCDF-C++4/netCDF-C++4-4.3.1-gpsmpi-2021b.eb
deleted file mode 100644
index ee54e9b0e..000000000
--- a/Golden_Repo/n/netCDF-C++4/netCDF-C++4-4.3.1-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,26 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'netCDF-C++4'
-version = '4.3.1'
-
-homepage = 'http://www.unidata.ucar.edu/software/netcdf/'
-description = """NetCDF (network Common Data Form) is a set of software libraries 
- and machine-independent data formats that support the creation, access, and sharing of array-oriented 
- scientific data.
-"""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/Unidata/netcdf-cxx4/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['e3fe3d2ec06c1c2772555bf1208d220aab5fee186d04bd265219b0bc7a978edc']
-
-dependencies = [('netCDF', '4.8.1')]
-
-sanity_check_paths = {
-    'files': ['include/netcdf', 'lib/libnetcdf_c++4.a', 'lib/libnetcdf_c++4.%s' % SHLIB_EXT],
-    'dirs': [],
-}
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/netCDF-C++4/netCDF-C++4-4.3.1-iimpi-2021b.eb b/Golden_Repo/n/netCDF-C++4/netCDF-C++4-4.3.1-iimpi-2021b.eb
deleted file mode 100644
index f58519867..000000000
--- a/Golden_Repo/n/netCDF-C++4/netCDF-C++4-4.3.1-iimpi-2021b.eb
+++ /dev/null
@@ -1,26 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'netCDF-C++4'
-version = '4.3.1'
-
-homepage = 'http://www.unidata.ucar.edu/software/netcdf/'
-description = """NetCDF (network Common Data Form) is a set of software libraries 
- and machine-independent data formats that support the creation, access, and sharing of array-oriented 
- scientific data.
-"""
-
-toolchain = {'name': 'iimpi', 'version': '2021b'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/Unidata/netcdf-cxx4/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['e3fe3d2ec06c1c2772555bf1208d220aab5fee186d04bd265219b0bc7a978edc']
-
-dependencies = [('netCDF', '4.8.1')]
-
-sanity_check_paths = {
-    'files': ['include/netcdf', 'lib/libnetcdf_c++4.a', 'lib/libnetcdf_c++4.%s' % SHLIB_EXT],
-    'dirs': [],
-}
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/netCDF-C++4/netCDF-C++4-4.3.1-iompi-2021b.eb b/Golden_Repo/n/netCDF-C++4/netCDF-C++4-4.3.1-iompi-2021b.eb
deleted file mode 100644
index 717f84720..000000000
--- a/Golden_Repo/n/netCDF-C++4/netCDF-C++4-4.3.1-iompi-2021b.eb
+++ /dev/null
@@ -1,26 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'netCDF-C++4'
-version = '4.3.1'
-
-homepage = 'http://www.unidata.ucar.edu/software/netcdf/'
-description = """NetCDF (network Common Data Form) is a set of software libraries 
- and machine-independent data formats that support the creation, access, and sharing of array-oriented 
- scientific data.
-"""
-
-toolchain = {'name': 'iompi', 'version': '2021b'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/Unidata/netcdf-cxx4/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['e3fe3d2ec06c1c2772555bf1208d220aab5fee186d04bd265219b0bc7a978edc']
-
-dependencies = [('netCDF', '4.8.1')]
-
-sanity_check_paths = {
-    'files': ['include/netcdf', 'lib/libnetcdf_c++4.a', 'lib/libnetcdf_c++4.%s' % SHLIB_EXT],
-    'dirs': [],
-}
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/netCDF-C++4/netCDF-C++4-4.3.1-ipsmpi-2021b.eb b/Golden_Repo/n/netCDF-C++4/netCDF-C++4-4.3.1-ipsmpi-2021b.eb
deleted file mode 100644
index d5df1ef64..000000000
--- a/Golden_Repo/n/netCDF-C++4/netCDF-C++4-4.3.1-ipsmpi-2021b.eb
+++ /dev/null
@@ -1,26 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'netCDF-C++4'
-version = '4.3.1'
-
-homepage = 'http://www.unidata.ucar.edu/software/netcdf/'
-description = """NetCDF (network Common Data Form) is a set of software libraries 
- and machine-independent data formats that support the creation, access, and sharing of array-oriented 
- scientific data.
-"""
-
-toolchain = {'name': 'ipsmpi', 'version': '2021b'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/Unidata/netcdf-cxx4/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['e3fe3d2ec06c1c2772555bf1208d220aab5fee186d04bd265219b0bc7a978edc']
-
-dependencies = [('netCDF', '4.8.1')]
-
-sanity_check_paths = {
-    'files': ['include/netcdf', 'lib/libnetcdf_c++4.a', 'lib/libnetcdf_c++4.%s' % SHLIB_EXT],
-    'dirs': [],
-}
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/netCDF-C++4/netCDF-C++4-4.3.1-npsmpic-2021b.eb b/Golden_Repo/n/netCDF-C++4/netCDF-C++4-4.3.1-npsmpic-2021b.eb
deleted file mode 100644
index 069ac0003..000000000
--- a/Golden_Repo/n/netCDF-C++4/netCDF-C++4-4.3.1-npsmpic-2021b.eb
+++ /dev/null
@@ -1,26 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'netCDF-C++4'
-version = '4.3.1'
-
-homepage = 'http://www.unidata.ucar.edu/software/netcdf/'
-description = """NetCDF (network Common Data Form) is a set of software libraries 
- and machine-independent data formats that support the creation, access, and sharing of array-oriented 
- scientific data.
-"""
-
-toolchain = {'name': 'npsmpic', 'version': '2021b'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/Unidata/netcdf-cxx4/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['e3fe3d2ec06c1c2772555bf1208d220aab5fee186d04bd265219b0bc7a978edc']
-
-dependencies = [('netCDF', '4.8.1')]
-
-sanity_check_paths = {
-    'files': ['include/netcdf', 'lib/libnetcdf_c++4.a', 'lib/libnetcdf_c++4.%s' % SHLIB_EXT],
-    'dirs': [],
-}
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/netCDF-C++4/netCDF-C++4-4.3.1-nvompic-2021b.eb b/Golden_Repo/n/netCDF-C++4/netCDF-C++4-4.3.1-nvompic-2021b.eb
deleted file mode 100644
index 2c3d0a151..000000000
--- a/Golden_Repo/n/netCDF-C++4/netCDF-C++4-4.3.1-nvompic-2021b.eb
+++ /dev/null
@@ -1,26 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'netCDF-C++4'
-version = '4.3.1'
-
-homepage = 'http://www.unidata.ucar.edu/software/netcdf/'
-description = """NetCDF (network Common Data Form) is a set of software libraries 
- and machine-independent data formats that support the creation, access, and sharing of array-oriented 
- scientific data.
-"""
-
-toolchain = {'name': 'nvompic', 'version': '2021b'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/Unidata/netcdf-cxx4/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['e3fe3d2ec06c1c2772555bf1208d220aab5fee186d04bd265219b0bc7a978edc']
-
-dependencies = [('netCDF', '4.8.1')]
-
-sanity_check_paths = {
-    'files': ['include/netcdf', 'lib/libnetcdf_c++4.a', 'lib/libnetcdf_c++4.%s' % SHLIB_EXT],
-    'dirs': [],
-}
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/netCDF-Fortran/netCDF-Fortran-4.5.3-GCCcore-11.2.0-serial.eb b/Golden_Repo/n/netCDF-Fortran/netCDF-Fortran-4.5.3-GCCcore-11.2.0-serial.eb
deleted file mode 100644
index 442673ee8..000000000
--- a/Golden_Repo/n/netCDF-Fortran/netCDF-Fortran-4.5.3-GCCcore-11.2.0-serial.eb
+++ /dev/null
@@ -1,28 +0,0 @@
-name = 'netCDF-Fortran'
-version = '4.5.3'
-versionsuffix = '-serial'
-
-homepage = 'http://www.unidata.ucar.edu/software/netcdf/'
-description = """NetCDF (network Common Data Form) is a set of software libraries 
- and machine-independent data formats that support the creation, access, and sharing of array-oriented 
- scientific data.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/Unidata/netcdf-fortran/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['c6da30c2fe7e4e614c1dff4124e857afbd45355c6798353eccfa60c0702b495a']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('M4', '1.4.19'),
-]
-
-dependencies = [('netCDF', '4.8.1', '-serial')]
-
-# (too) parallel build fails, but single-core build is fairly quick anyway (~1min)
-parallel = 1
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/netCDF-Fortran/netCDF-Fortran-4.5.3-gompi-2021b.eb b/Golden_Repo/n/netCDF-Fortran/netCDF-Fortran-4.5.3-gompi-2021b.eb
deleted file mode 100644
index 95cc674a8..000000000
--- a/Golden_Repo/n/netCDF-Fortran/netCDF-Fortran-4.5.3-gompi-2021b.eb
+++ /dev/null
@@ -1,26 +0,0 @@
-name = 'netCDF-Fortran'
-version = '4.5.3'
-
-homepage = 'http://www.unidata.ucar.edu/software/netcdf/'
-description = """NetCDF (network Common Data Form) is a set of software libraries 
- and machine-independent data formats that support the creation, access, and sharing of array-oriented 
- scientific data.
-"""
-
-toolchain = {'name': 'gompi', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': True}
-
-source_urls = ['https://github.com/Unidata/netcdf-fortran/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['c6da30c2fe7e4e614c1dff4124e857afbd45355c6798353eccfa60c0702b495a']
-
-builddependencies = [
-    ('M4', '1.4.19'),
-]
-
-dependencies = [('netCDF', '4.8.1')]
-
-# (too) parallel build fails, but single-core build is fairly quick anyway (~1min)
-parallel = 1
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/netCDF-Fortran/netCDF-Fortran-4.5.3-gpsmpi-2021b.eb b/Golden_Repo/n/netCDF-Fortran/netCDF-Fortran-4.5.3-gpsmpi-2021b.eb
deleted file mode 100644
index e3ba3e6f7..000000000
--- a/Golden_Repo/n/netCDF-Fortran/netCDF-Fortran-4.5.3-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,26 +0,0 @@
-name = 'netCDF-Fortran'
-version = '4.5.3'
-
-homepage = 'http://www.unidata.ucar.edu/software/netcdf/'
-description = """NetCDF (network Common Data Form) is a set of software libraries 
- and machine-independent data formats that support the creation, access, and sharing of array-oriented 
- scientific data.
-"""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': True}
-
-source_urls = ['https://github.com/Unidata/netcdf-fortran/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['c6da30c2fe7e4e614c1dff4124e857afbd45355c6798353eccfa60c0702b495a']
-
-builddependencies = [
-    ('M4', '1.4.19'),
-]
-
-dependencies = [('netCDF', '4.8.1')]
-
-# (too) parallel build fails, but single-core build is fairly quick anyway (~1min)
-parallel = 1
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/netCDF-Fortran/netCDF-Fortran-4.5.3-iimpi-2021b.eb b/Golden_Repo/n/netCDF-Fortran/netCDF-Fortran-4.5.3-iimpi-2021b.eb
deleted file mode 100644
index 673f04196..000000000
--- a/Golden_Repo/n/netCDF-Fortran/netCDF-Fortran-4.5.3-iimpi-2021b.eb
+++ /dev/null
@@ -1,26 +0,0 @@
-name = 'netCDF-Fortran'
-version = '4.5.3'
-
-homepage = 'http://www.unidata.ucar.edu/software/netcdf/'
-description = """NetCDF (network Common Data Form) is a set of software libraries 
- and machine-independent data formats that support the creation, access, and sharing of array-oriented 
- scientific data.
-"""
-
-toolchain = {'name': 'iimpi', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': True}
-
-source_urls = ['https://github.com/Unidata/netcdf-fortran/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['c6da30c2fe7e4e614c1dff4124e857afbd45355c6798353eccfa60c0702b495a']
-
-builddependencies = [
-    ('M4', '1.4.19'),
-]
-
-dependencies = [('netCDF', '4.8.1')]
-
-# (too) parallel build fails, but single-core build is fairly quick anyway (~1min)
-parallel = 1
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/netCDF-Fortran/netCDF-Fortran-4.5.3-iompi-2021b.eb b/Golden_Repo/n/netCDF-Fortran/netCDF-Fortran-4.5.3-iompi-2021b.eb
deleted file mode 100644
index 729f6f7aa..000000000
--- a/Golden_Repo/n/netCDF-Fortran/netCDF-Fortran-4.5.3-iompi-2021b.eb
+++ /dev/null
@@ -1,26 +0,0 @@
-name = 'netCDF-Fortran'
-version = '4.5.3'
-
-homepage = 'http://www.unidata.ucar.edu/software/netcdf/'
-description = """NetCDF (network Common Data Form) is a set of software libraries 
- and machine-independent data formats that support the creation, access, and sharing of array-oriented 
- scientific data.
-"""
-
-toolchain = {'name': 'iompi', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': True}
-
-source_urls = ['https://github.com/Unidata/netcdf-fortran/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['c6da30c2fe7e4e614c1dff4124e857afbd45355c6798353eccfa60c0702b495a']
-
-builddependencies = [
-    ('M4', '1.4.19'),
-]
-
-dependencies = [('netCDF', '4.8.1')]
-
-# (too) parallel build fails, but single-core build is fairly quick anyway (~1min)
-parallel = 1
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/netCDF-Fortran/netCDF-Fortran-4.5.3-ipsmpi-2021b.eb b/Golden_Repo/n/netCDF-Fortran/netCDF-Fortran-4.5.3-ipsmpi-2021b.eb
deleted file mode 100644
index 4c39e9fa6..000000000
--- a/Golden_Repo/n/netCDF-Fortran/netCDF-Fortran-4.5.3-ipsmpi-2021b.eb
+++ /dev/null
@@ -1,26 +0,0 @@
-name = 'netCDF-Fortran'
-version = '4.5.3'
-
-homepage = 'http://www.unidata.ucar.edu/software/netcdf/'
-description = """NetCDF (network Common Data Form) is a set of software libraries 
- and machine-independent data formats that support the creation, access, and sharing of array-oriented 
- scientific data.
-"""
-
-toolchain = {'name': 'ipsmpi', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': True}
-
-source_urls = ['https://github.com/Unidata/netcdf-fortran/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['c6da30c2fe7e4e614c1dff4124e857afbd45355c6798353eccfa60c0702b495a']
-
-builddependencies = [
-    ('M4', '1.4.19'),
-]
-
-dependencies = [('netCDF', '4.8.1')]
-
-# (too) parallel build fails, but single-core build is fairly quick anyway (~1min)
-parallel = 1
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/netCDF-Fortran/netCDF-Fortran-4.5.3-npsmpic-2021b.eb b/Golden_Repo/n/netCDF-Fortran/netCDF-Fortran-4.5.3-npsmpic-2021b.eb
deleted file mode 100644
index 87a01083d..000000000
--- a/Golden_Repo/n/netCDF-Fortran/netCDF-Fortran-4.5.3-npsmpic-2021b.eb
+++ /dev/null
@@ -1,26 +0,0 @@
-name = 'netCDF-Fortran'
-version = '4.5.3'
-
-homepage = 'http://www.unidata.ucar.edu/software/netcdf/'
-description = """NetCDF (network Common Data Form) is a set of software libraries 
- and machine-independent data formats that support the creation, access, and sharing of array-oriented 
- scientific data.
-"""
-
-toolchain = {'name': 'npsmpic', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': True}
-
-source_urls = ['https://github.com/Unidata/netcdf-fortran/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['c6da30c2fe7e4e614c1dff4124e857afbd45355c6798353eccfa60c0702b495a']
-
-builddependencies = [
-    ('M4', '1.4.19'),
-]
-
-dependencies = [('netCDF', '4.8.1')]
-
-# (too) parallel build fails, but single-core build is fairly quick anyway (~1min)
-parallel = 1
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/netCDF-Fortran/netCDF-Fortran-4.5.3-nvompic-2021b.eb b/Golden_Repo/n/netCDF-Fortran/netCDF-Fortran-4.5.3-nvompic-2021b.eb
deleted file mode 100644
index df7e0191f..000000000
--- a/Golden_Repo/n/netCDF-Fortran/netCDF-Fortran-4.5.3-nvompic-2021b.eb
+++ /dev/null
@@ -1,26 +0,0 @@
-name = 'netCDF-Fortran'
-version = '4.5.3'
-
-homepage = 'http://www.unidata.ucar.edu/software/netcdf/'
-description = """NetCDF (network Common Data Form) is a set of software libraries 
- and machine-independent data formats that support the creation, access, and sharing of array-oriented 
- scientific data.
-"""
-
-toolchain = {'name': 'nvompic', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': True}
-
-source_urls = ['https://github.com/Unidata/netcdf-fortran/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['c6da30c2fe7e4e614c1dff4124e857afbd45355c6798353eccfa60c0702b495a']
-
-builddependencies = [
-    ('M4', '1.4.19'),
-]
-
-dependencies = [('netCDF', '4.8.1')]
-
-# (too) parallel build fails, but single-core build is fairly quick anyway (~1min)
-parallel = 1
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/netCDF/netCDF-4.8.1-GCCcore-11.2.0-serial.eb b/Golden_Repo/n/netCDF/netCDF-4.8.1-GCCcore-11.2.0-serial.eb
deleted file mode 100644
index aad6a8034..000000000
--- a/Golden_Repo/n/netCDF/netCDF-4.8.1-GCCcore-11.2.0-serial.eb
+++ /dev/null
@@ -1,40 +0,0 @@
-name = 'netCDF'
-version = '4.8.1'
-versionsuffix = '-serial'
-
-homepage = 'http://www.unidata.ucar.edu/software/netcdf/'
-description = """NetCDF (network Common Data Form) is a set of software libraries 
- and machine-independent data formats that support the creation, access, and sharing of array-oriented 
- scientific data.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/Unidata/netcdf-c/archive/']
-sources = ['v%s.tar.gz' % (version)]
-checksums = ['bc018cc30d5da402622bf76462480664c6668b55eb16ba205a0dfb8647161dd0']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Autotools', '20210726'),
-    ('CMake', '3.21.1'),
-    ('Doxygen', '1.9.1'),
-]
-
-dependencies = [
-    ('HDF5', '1.12.1', '-serial'),
-    ('cURL', '7.78.0'),
-    ('Szip', '2.1.1'),
-]
-
-# HDF5 version detection is missed in netCDF 4.8.1 when HDF5_C_LIBRARY, HDF5_INCLUDE_DIR, and HDF5_HL_LIBRARY are set
-local_hdf5_version_fix = '-DHDF5_VERSION=$EBVERSIONHDF5'
-
-# make sure both static and shared libs are built
-configopts = [
-    "-DBUILD_SHARED_LIBS=OFF %s " % local_hdf5_version_fix,
-    "-DBUILD_SHARED_LIBS=ON %s " % local_hdf5_version_fix,
-]
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/netCDF/netCDF-4.8.1-gompi-2021b.eb b/Golden_Repo/n/netCDF/netCDF-4.8.1-gompi-2021b.eb
deleted file mode 100644
index 772611734..000000000
--- a/Golden_Repo/n/netCDF/netCDF-4.8.1-gompi-2021b.eb
+++ /dev/null
@@ -1,40 +0,0 @@
-name = 'netCDF'
-version = '4.8.1'
-
-homepage = 'http://www.unidata.ucar.edu/software/netcdf/'
-description = """NetCDF (network Common Data Form) is a set of software libraries 
- and machine-independent data formats that support the creation, access, and sharing of array-oriented 
- scientific data.
-"""
-
-toolchain = {'name': 'gompi', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': True}
-
-source_urls = ['https://github.com/Unidata/netcdf-c/archive/']
-sources = ['v%s.tar.gz' % (version)]
-checksums = ['bc018cc30d5da402622bf76462480664c6668b55eb16ba205a0dfb8647161dd0']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Autotools', '20210726'),
-    ('CMake', '3.21.1'),
-    ('Doxygen', '1.9.1'),
-]
-
-dependencies = [
-    ('HDF5', '1.12.1'),
-    ('cURL', '7.78.0'),
-    ('Szip', '2.1.1'),
-    ('PnetCDF', '1.12.2')
-]
-
-# HDF5 version detection is missed in netCDF 4.8.1 when HDF5_C_LIBRARY, HDF5_INCLUDE_DIR, and HDF5_HL_LIBRARY are set
-local_hdf5_version_fix = '-DHDF5_VERSION=$EBVERSIONHDF5'
-
-# make sure both static and shared libs are built
-configopts = [
-    "-DENABLE_PNETCDF=ON -DBUILD_SHARED_LIBS=OFF %s " % local_hdf5_version_fix,
-    "-DENABLE_PNETCDF=ON -DBUILD_SHARED_LIBS=ON %s " % local_hdf5_version_fix,
-]
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/netCDF/netCDF-4.8.1-gpsmpi-2021b.eb b/Golden_Repo/n/netCDF/netCDF-4.8.1-gpsmpi-2021b.eb
deleted file mode 100644
index 5d8cb7f79..000000000
--- a/Golden_Repo/n/netCDF/netCDF-4.8.1-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,40 +0,0 @@
-name = 'netCDF'
-version = '4.8.1'
-
-homepage = 'http://www.unidata.ucar.edu/software/netcdf/'
-description = """NetCDF (network Common Data Form) is a set of software libraries 
- and machine-independent data formats that support the creation, access, and sharing of array-oriented 
- scientific data.
-"""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': True}
-
-source_urls = ['https://github.com/Unidata/netcdf-c/archive/']
-sources = ['v%s.tar.gz' % (version)]
-checksums = ['bc018cc30d5da402622bf76462480664c6668b55eb16ba205a0dfb8647161dd0']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Autotools', '20210726'),
-    ('CMake', '3.21.1'),
-    ('Doxygen', '1.9.1'),
-]
-
-dependencies = [
-    ('HDF5', '1.12.1'),
-    ('cURL', '7.78.0'),
-    ('Szip', '2.1.1'),
-    ('PnetCDF', '1.12.2')
-]
-
-# HDF5 version detection is missed in netCDF 4.8.1 when HDF5_C_LIBRARY, HDF5_INCLUDE_DIR, and HDF5_HL_LIBRARY are set
-local_hdf5_version_fix = '-DHDF5_VERSION=$EBVERSIONHDF5'
-
-# make sure both static and shared libs are built
-configopts = [
-    "-DENABLE_PNETCDF=ON -DBUILD_SHARED_LIBS=OFF %s " % local_hdf5_version_fix,
-    "-DENABLE_PNETCDF=ON -DBUILD_SHARED_LIBS=ON %s " % local_hdf5_version_fix,
-]
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/netCDF/netCDF-4.8.1-iimpi-2021b.eb b/Golden_Repo/n/netCDF/netCDF-4.8.1-iimpi-2021b.eb
deleted file mode 100644
index 0a6cda738..000000000
--- a/Golden_Repo/n/netCDF/netCDF-4.8.1-iimpi-2021b.eb
+++ /dev/null
@@ -1,40 +0,0 @@
-name = 'netCDF'
-version = '4.8.1'
-
-homepage = 'http://www.unidata.ucar.edu/software/netcdf/'
-description = """NetCDF (network Common Data Form) is a set of software libraries 
- and machine-independent data formats that support the creation, access, and sharing of array-oriented 
- scientific data.
-"""
-
-toolchain = {'name': 'iimpi', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': True}
-
-source_urls = ['https://github.com/Unidata/netcdf-c/archive/']
-sources = ['v%s.tar.gz' % (version)]
-checksums = ['bc018cc30d5da402622bf76462480664c6668b55eb16ba205a0dfb8647161dd0']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Autotools', '20210726'),
-    ('CMake', '3.21.1'),
-    ('Doxygen', '1.9.1'),
-]
-
-dependencies = [
-    ('HDF5', '1.12.1'),
-    ('cURL', '7.78.0'),
-    ('Szip', '2.1.1'),
-    ('PnetCDF', '1.12.2')
-]
-
-# HDF5 version detection is missed in netCDF 4.8.1 when HDF5_C_LIBRARY, HDF5_INCLUDE_DIR, and HDF5_HL_LIBRARY are set
-local_hdf5_version_fix = '-DHDF5_VERSION=$EBVERSIONHDF5'
-
-# make sure both static and shared libs are built
-configopts = [
-    "-DENABLE_PNETCDF=ON -DBUILD_SHARED_LIBS=OFF %s " % local_hdf5_version_fix,
-    "-DENABLE_PNETCDF=ON -DBUILD_SHARED_LIBS=ON %s " % local_hdf5_version_fix,
-]
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/netCDF/netCDF-4.8.1-iompi-2021b.eb b/Golden_Repo/n/netCDF/netCDF-4.8.1-iompi-2021b.eb
deleted file mode 100644
index d98424709..000000000
--- a/Golden_Repo/n/netCDF/netCDF-4.8.1-iompi-2021b.eb
+++ /dev/null
@@ -1,40 +0,0 @@
-name = 'netCDF'
-version = '4.8.1'
-
-homepage = 'http://www.unidata.ucar.edu/software/netcdf/'
-description = """NetCDF (network Common Data Form) is a set of software libraries 
- and machine-independent data formats that support the creation, access, and sharing of array-oriented 
- scientific data.
-"""
-
-toolchain = {'name': 'iompi', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': True}
-
-source_urls = ['https://github.com/Unidata/netcdf-c/archive/']
-sources = ['v%s.tar.gz' % (version)]
-checksums = ['bc018cc30d5da402622bf76462480664c6668b55eb16ba205a0dfb8647161dd0']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Autotools', '20210726'),
-    ('CMake', '3.21.1'),
-    ('Doxygen', '1.9.1'),
-]
-
-dependencies = [
-    ('HDF5', '1.12.1'),
-    ('cURL', '7.78.0'),
-    ('Szip', '2.1.1'),
-    ('PnetCDF', '1.12.2')
-]
-
-# HDF5 version detection is missed in netCDF 4.8.1 when HDF5_C_LIBRARY, HDF5_INCLUDE_DIR, and HDF5_HL_LIBRARY are set
-local_hdf5_version_fix = '-DHDF5_VERSION=$EBVERSIONHDF5'
-
-# make sure both static and shared libs are built
-configopts = [
-    "-DENABLE_PNETCDF=ON -DBUILD_SHARED_LIBS=OFF %s " % local_hdf5_version_fix,
-    "-DENABLE_PNETCDF=ON -DBUILD_SHARED_LIBS=ON %s " % local_hdf5_version_fix,
-]
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/netCDF/netCDF-4.8.1-ipsmpi-2021b.eb b/Golden_Repo/n/netCDF/netCDF-4.8.1-ipsmpi-2021b.eb
deleted file mode 100644
index a152d402f..000000000
--- a/Golden_Repo/n/netCDF/netCDF-4.8.1-ipsmpi-2021b.eb
+++ /dev/null
@@ -1,40 +0,0 @@
-name = 'netCDF'
-version = '4.8.1'
-
-homepage = 'http://www.unidata.ucar.edu/software/netcdf/'
-description = """NetCDF (network Common Data Form) is a set of software libraries 
- and machine-independent data formats that support the creation, access, and sharing of array-oriented 
- scientific data.
-"""
-
-toolchain = {'name': 'ipsmpi', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': True}
-
-source_urls = ['https://github.com/Unidata/netcdf-c/archive/']
-sources = ['v%s.tar.gz' % (version)]
-checksums = ['bc018cc30d5da402622bf76462480664c6668b55eb16ba205a0dfb8647161dd0']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Autotools', '20210726'),
-    ('CMake', '3.21.1'),
-    ('Doxygen', '1.9.1'),
-]
-
-dependencies = [
-    ('HDF5', '1.12.1'),
-    ('cURL', '7.78.0'),
-    ('Szip', '2.1.1'),
-    ('PnetCDF', '1.12.2')
-]
-
-# HDF5 version detection is missed in netCDF 4.8.1 when HDF5_C_LIBRARY, HDF5_INCLUDE_DIR, and HDF5_HL_LIBRARY are set
-local_hdf5_version_fix = '-DHDF5_VERSION=$EBVERSIONHDF5'
-
-# make sure both static and shared libs are built
-configopts = [
-    "-DENABLE_PNETCDF=ON -DBUILD_SHARED_LIBS=OFF %s " % local_hdf5_version_fix,
-    "-DENABLE_PNETCDF=ON -DBUILD_SHARED_LIBS=ON %s " % local_hdf5_version_fix,
-]
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/netCDF/netCDF-4.8.1-npsmpic-2021b.eb b/Golden_Repo/n/netCDF/netCDF-4.8.1-npsmpic-2021b.eb
deleted file mode 100644
index cdc042f18..000000000
--- a/Golden_Repo/n/netCDF/netCDF-4.8.1-npsmpic-2021b.eb
+++ /dev/null
@@ -1,40 +0,0 @@
-name = 'netCDF'
-version = '4.8.1'
-
-homepage = 'http://www.unidata.ucar.edu/software/netcdf/'
-description = """NetCDF (network Common Data Form) is a set of software libraries 
- and machine-independent data formats that support the creation, access, and sharing of array-oriented 
- scientific data.
-"""
-
-toolchain = {'name': 'npsmpic', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': True}
-
-source_urls = ['https://github.com/Unidata/netcdf-c/archive/']
-sources = ['v%s.tar.gz' % (version)]
-checksums = ['bc018cc30d5da402622bf76462480664c6668b55eb16ba205a0dfb8647161dd0']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Autotools', '20210726'),
-    ('CMake', '3.21.1'),
-    ('Doxygen', '1.9.1'),
-]
-
-dependencies = [
-    ('HDF5', '1.12.1'),
-    ('cURL', '7.78.0'),
-    ('Szip', '2.1.1'),
-    ('PnetCDF', '1.12.2')
-]
-
-# HDF5 version detection is missed in netCDF 4.8.1 when HDF5_C_LIBRARY, HDF5_INCLUDE_DIR, and HDF5_HL_LIBRARY are set
-local_hdf5_version_fix = '-DHDF5_VERSION=$EBVERSIONHDF5'
-
-# make sure both static and shared libs are built
-configopts = [
-    "-DENABLE_PNETCDF=ON -DBUILD_SHARED_LIBS=OFF %s " % local_hdf5_version_fix,
-    "-DENABLE_PNETCDF=ON -DBUILD_SHARED_LIBS=ON %s " % local_hdf5_version_fix,
-]
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/netCDF/netCDF-4.8.1-nvompic-2021b.eb b/Golden_Repo/n/netCDF/netCDF-4.8.1-nvompic-2021b.eb
deleted file mode 100644
index cd29d352d..000000000
--- a/Golden_Repo/n/netCDF/netCDF-4.8.1-nvompic-2021b.eb
+++ /dev/null
@@ -1,40 +0,0 @@
-name = 'netCDF'
-version = '4.8.1'
-
-homepage = 'http://www.unidata.ucar.edu/software/netcdf/'
-description = """NetCDF (network Common Data Form) is a set of software libraries 
- and machine-independent data formats that support the creation, access, and sharing of array-oriented 
- scientific data.
-"""
-
-toolchain = {'name': 'nvompic', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': True}
-
-source_urls = ['https://github.com/Unidata/netcdf-c/archive/']
-sources = ['v%s.tar.gz' % (version)]
-checksums = ['bc018cc30d5da402622bf76462480664c6668b55eb16ba205a0dfb8647161dd0']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Autotools', '20210726'),
-    ('CMake', '3.21.1'),
-    ('Doxygen', '1.9.1'),
-]
-
-dependencies = [
-    ('HDF5', '1.12.1'),
-    ('cURL', '7.78.0'),
-    ('Szip', '2.1.1'),
-    ('PnetCDF', '1.12.2')
-]
-
-# HDF5 version detection is missed in netCDF 4.8.1 when HDF5_C_LIBRARY, HDF5_INCLUDE_DIR, and HDF5_HL_LIBRARY are set
-local_hdf5_version_fix = '-DHDF5_VERSION=$EBVERSIONHDF5'
-
-# make sure both static and shared libs are built
-configopts = [
-    "-DENABLE_PNETCDF=ON -DBUILD_SHARED_LIBS=OFF %s " % local_hdf5_version_fix,
-    "-DENABLE_PNETCDF=ON -DBUILD_SHARED_LIBS=ON %s " % local_hdf5_version_fix,
-]
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/netcdf4-python/netcdf4-python-1.1.8-avoid-diskless-test.patch b/Golden_Repo/n/netcdf4-python/netcdf4-python-1.1.8-avoid-diskless-test.patch
deleted file mode 100644
index d146f6495..000000000
--- a/Golden_Repo/n/netcdf4-python/netcdf4-python-1.1.8-avoid-diskless-test.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# this test seems to always fall. The diskless thing is not really diskless it seems
-# By Ward Poelmans <ward.poelmans@ugent.be>
-diff -ur netcdf4-python-1.1.8rel/test/tst_diskless.py netcdf4-python-1.1.8rel.new/test/tst_diskless.py
---- netcdf4-python-1.1.8rel/test/tst_diskless.py	2015-05-13 16:27:00.000000000 +0200
-+++ netcdf4-python-1.1.8rel.new/test/tst_diskless.py	2016-01-07 14:16:21.851971913 +0100
-@@ -65,7 +65,7 @@
-         assert_array_almost_equal(foo[:], ranarr)
-         assert_array_almost_equal(bar[:], ranarr2)
-         # file does not actually exist on disk
--        assert(os.path.isfile(self.file)==False)
-+#        assert(os.path.isfile(self.file)==False)
-         # open persisted file.
-         # first, check that file does actually exist on disk
-         assert(os.path.isfile(self.file2)==True)
diff --git a/Golden_Repo/n/netcdf4-python/netcdf4-python-1.5.7-GCCcore-11.2.0-serial.eb b/Golden_Repo/n/netcdf4-python/netcdf4-python-1.5.7-GCCcore-11.2.0-serial.eb
deleted file mode 100644
index 3bfec371a..000000000
--- a/Golden_Repo/n/netcdf4-python/netcdf4-python-1.5.7-GCCcore-11.2.0-serial.eb
+++ /dev/null
@@ -1,57 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'netcdf4-python'
-version = '1.5.7'
-versionsuffix = '-serial'
-
-homepage = 'https://unidata.github.io/netcdf4-python/'
-description = """Python/numpy interface to netCDF."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {}
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('netCDF', '4.8.1', '-serial'),
-    ('cURL', '7.78.0'),
-]
-
-use_pip = True
-sanity_pip_check = True
-
-exts_default_options = {'source_urls': [PYPI_SOURCE]}
-
-exts_list = [
-    ('cftime', '1.5.0', {
-        'checksums': ['b644bcb53346b6f4fe2fcc9f3b574740a2097637492dcca29632c817e0604f29'],
-    }),
-    (name, version, {
-        'patches': ['netcdf4-python-1.1.8-avoid-diskless-test.patch'],
-        'source_tmpl': 'netCDF4-%(version)s.tar.gz',
-        'source_urls': ['https://pypi.python.org/packages/source/n/netCDF4'],
-        'checksums': [
-            'd145f9c12da29da3922d8b8aafea2a2a89501bcb28a219a46b7b828b57191594',  # netCDF4-1.5.7.tar.gz
-            # netcdf4-python-1.1.8-avoid-diskless-test.patch
-            'a8b262fa201d55f59015e1bc14466c1d113f807543bc1e05a22481ab0d216d72',
-        ],
-    }),
-]
-
-fix_python_shebang_for = ['bin/*']
-
-sanity_check_paths = {
-    'files': ['bin/nc3tonc4', 'bin/nc4tonc3', 'bin/ncinfo'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-sanity_check_commands = [
-    "nc4tonc3 --help",
-    "nc3tonc4 --help",
-    "ncinfo --help",
-]
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/netcdf4-python/netcdf4-python-1.5.7-gompi-2021b.eb b/Golden_Repo/n/netcdf4-python/netcdf4-python-1.5.7-gompi-2021b.eb
deleted file mode 100644
index 5191ee23a..000000000
--- a/Golden_Repo/n/netcdf4-python/netcdf4-python-1.5.7-gompi-2021b.eb
+++ /dev/null
@@ -1,56 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'netcdf4-python'
-version = '1.5.7'
-
-homepage = 'https://unidata.github.io/netcdf4-python/'
-description = """Python/numpy interface to netCDF."""
-
-toolchain = {'name': 'gompi', 'version': '2021b'}
-toolchainopts = {'usempi': True}
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('netCDF', '4.8.1'),
-    ('cURL', '7.78.0'),
-    ('mpi4py', '3.1.3')
-]
-
-use_pip = True
-sanity_pip_check = True
-runtest = False  # mpirun problems
-skipsteps = ['sanitycheck']  # mpirun problems
-
-exts_default_options = {'source_urls': [PYPI_SOURCE]}
-
-exts_list = [
-    ('cftime', '1.5.0', {
-        'checksums': ['b644bcb53346b6f4fe2fcc9f3b574740a2097637492dcca29632c817e0604f29'],
-    }),
-    (name, version, {
-        'patches': ['netcdf4-python-1.1.8-avoid-diskless-test.patch'],
-        'source_tmpl': 'netCDF4-%(version)s.tar.gz',
-        'source_urls': ['https://pypi.python.org/packages/source/n/netCDF4'],
-        'checksums': [
-            'd145f9c12da29da3922d8b8aafea2a2a89501bcb28a219a46b7b828b57191594',  # netCDF4-1.5.7.tar.gz
-            # netcdf4-python-1.1.8-avoid-diskless-test.patch
-            'a8b262fa201d55f59015e1bc14466c1d113f807543bc1e05a22481ab0d216d72',
-        ],
-    }),
-]
-
-fix_python_shebang_for = ['bin/*']
-
-sanity_check_paths = {
-    'files': ['bin/nc3tonc4', 'bin/nc4tonc3', 'bin/ncinfo'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-sanity_check_commands = [
-    "nc4tonc3 --help",
-    "nc3tonc4 --help",
-    "ncinfo --help",
-]
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/netcdf4-python/netcdf4-python-1.5.7-gpsmpi-2021b.eb b/Golden_Repo/n/netcdf4-python/netcdf4-python-1.5.7-gpsmpi-2021b.eb
deleted file mode 100644
index 000cb4d87..000000000
--- a/Golden_Repo/n/netcdf4-python/netcdf4-python-1.5.7-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,56 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'netcdf4-python'
-version = '1.5.7'
-
-homepage = 'https://unidata.github.io/netcdf4-python/'
-description = """Python/numpy interface to netCDF."""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-toolchainopts = {'usempi': True}
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('netCDF', '4.8.1'),
-    ('cURL', '7.78.0'),
-    ('mpi4py', '3.1.3')
-]
-
-use_pip = True
-sanity_pip_check = True
-runtest = False  # mpirun problems
-skipsteps = ['sanitycheck']  # mpirun problems
-
-exts_default_options = {'source_urls': [PYPI_SOURCE]}
-
-exts_list = [
-    ('cftime', '1.5.0', {
-        'checksums': ['b644bcb53346b6f4fe2fcc9f3b574740a2097637492dcca29632c817e0604f29'],
-    }),
-    (name, version, {
-        'patches': ['netcdf4-python-1.1.8-avoid-diskless-test.patch'],
-        'source_tmpl': 'netCDF4-%(version)s.tar.gz',
-        'source_urls': ['https://pypi.python.org/packages/source/n/netCDF4'],
-        'checksums': [
-            'd145f9c12da29da3922d8b8aafea2a2a89501bcb28a219a46b7b828b57191594',  # netCDF4-1.5.7.tar.gz
-            # netcdf4-python-1.1.8-avoid-diskless-test.patch
-            'a8b262fa201d55f59015e1bc14466c1d113f807543bc1e05a22481ab0d216d72',
-        ],
-    }),
-]
-
-fix_python_shebang_for = ['bin/*']
-
-sanity_check_paths = {
-    'files': ['bin/nc3tonc4', 'bin/nc4tonc3', 'bin/ncinfo'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-sanity_check_commands = [
-    "nc4tonc3 --help",
-    "nc3tonc4 --help",
-    "ncinfo --help",
-]
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/netcdf4-python/netcdf4-python-1.5.7-iimpi-2021b.eb b/Golden_Repo/n/netcdf4-python/netcdf4-python-1.5.7-iimpi-2021b.eb
deleted file mode 100644
index cd70ee753..000000000
--- a/Golden_Repo/n/netcdf4-python/netcdf4-python-1.5.7-iimpi-2021b.eb
+++ /dev/null
@@ -1,56 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'netcdf4-python'
-version = '1.5.7'
-
-homepage = 'https://unidata.github.io/netcdf4-python/'
-description = """Python/numpy interface to netCDF."""
-
-toolchain = {'name': 'iimpi', 'version': '2021b'}
-toolchainopts = {'usempi': True}
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('netCDF', '4.8.1'),
-    ('cURL', '7.78.0'),
-    ('mpi4py', '3.1.3')
-]
-
-use_pip = True
-sanity_pip_check = True
-runtest = False  # mpirun problems
-skipsteps = ['sanitycheck']  # mpirun problems
-
-exts_default_options = {'source_urls': [PYPI_SOURCE]}
-
-exts_list = [
-    ('cftime', '1.5.0', {
-        'checksums': ['b644bcb53346b6f4fe2fcc9f3b574740a2097637492dcca29632c817e0604f29'],
-    }),
-    (name, version, {
-        'patches': ['netcdf4-python-1.1.8-avoid-diskless-test.patch'],
-        'source_tmpl': 'netCDF4-%(version)s.tar.gz',
-        'source_urls': ['https://pypi.python.org/packages/source/n/netCDF4'],
-        'checksums': [
-            'd145f9c12da29da3922d8b8aafea2a2a89501bcb28a219a46b7b828b57191594',  # netCDF4-1.5.7.tar.gz
-            # netcdf4-python-1.1.8-avoid-diskless-test.patch
-            'a8b262fa201d55f59015e1bc14466c1d113f807543bc1e05a22481ab0d216d72',
-        ],
-    }),
-]
-
-fix_python_shebang_for = ['bin/*']
-
-sanity_check_paths = {
-    'files': ['bin/nc3tonc4', 'bin/nc4tonc3', 'bin/ncinfo'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-sanity_check_commands = [
-    "nc4tonc3 --help",
-    "nc3tonc4 --help",
-    "ncinfo --help",
-]
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/netcdf4-python/netcdf4-python-1.5.7-iompi-2021b.eb b/Golden_Repo/n/netcdf4-python/netcdf4-python-1.5.7-iompi-2021b.eb
deleted file mode 100644
index e92256f45..000000000
--- a/Golden_Repo/n/netcdf4-python/netcdf4-python-1.5.7-iompi-2021b.eb
+++ /dev/null
@@ -1,56 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'netcdf4-python'
-version = '1.5.7'
-
-homepage = 'https://unidata.github.io/netcdf4-python/'
-description = """Python/numpy interface to netCDF."""
-
-toolchain = {'name': 'iompi', 'version': '2021b'}
-toolchainopts = {'usempi': True}
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('netCDF', '4.8.1'),
-    ('cURL', '7.78.0'),
-    ('mpi4py', '3.1.3')
-]
-
-use_pip = True
-sanity_pip_check = True
-runtest = False  # mpirun problems
-skipsteps = ['sanitycheck']  # mpirun problems
-
-exts_default_options = {'source_urls': [PYPI_SOURCE]}
-
-exts_list = [
-    ('cftime', '1.5.0', {
-        'checksums': ['b644bcb53346b6f4fe2fcc9f3b574740a2097637492dcca29632c817e0604f29'],
-    }),
-    (name, version, {
-        'patches': ['netcdf4-python-1.1.8-avoid-diskless-test.patch'],
-        'source_tmpl': 'netCDF4-%(version)s.tar.gz',
-        'source_urls': ['https://pypi.python.org/packages/source/n/netCDF4'],
-        'checksums': [
-            'd145f9c12da29da3922d8b8aafea2a2a89501bcb28a219a46b7b828b57191594',  # netCDF4-1.5.7.tar.gz
-            # netcdf4-python-1.1.8-avoid-diskless-test.patch
-            'a8b262fa201d55f59015e1bc14466c1d113f807543bc1e05a22481ab0d216d72',
-        ],
-    }),
-]
-
-fix_python_shebang_for = ['bin/*']
-
-sanity_check_paths = {
-    'files': ['bin/nc3tonc4', 'bin/nc4tonc3', 'bin/ncinfo'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-sanity_check_commands = [
-    "nc4tonc3 --help",
-    "nc3tonc4 --help",
-    "ncinfo --help",
-]
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/netcdf4-python/netcdf4-python-1.5.7-ipsmpi-2021b.eb b/Golden_Repo/n/netcdf4-python/netcdf4-python-1.5.7-ipsmpi-2021b.eb
deleted file mode 100644
index c7daa5a2e..000000000
--- a/Golden_Repo/n/netcdf4-python/netcdf4-python-1.5.7-ipsmpi-2021b.eb
+++ /dev/null
@@ -1,56 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'netcdf4-python'
-version = '1.5.7'
-
-homepage = 'https://unidata.github.io/netcdf4-python/'
-description = """Python/numpy interface to netCDF."""
-
-toolchain = {'name': 'ipsmpi', 'version': '2021b'}
-toolchainopts = {'usempi': True}
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('netCDF', '4.8.1'),
-    ('cURL', '7.78.0'),
-    ('mpi4py', '3.1.3')
-]
-
-use_pip = True
-sanity_pip_check = True
-runtest = False  # mpirun problems
-skipsteps = ['sanitycheck']  # mpirun problems
-
-exts_default_options = {'source_urls': [PYPI_SOURCE]}
-
-exts_list = [
-    ('cftime', '1.5.0', {
-        'checksums': ['b644bcb53346b6f4fe2fcc9f3b574740a2097637492dcca29632c817e0604f29'],
-    }),
-    (name, version, {
-        'patches': ['netcdf4-python-1.1.8-avoid-diskless-test.patch'],
-        'source_tmpl': 'netCDF4-%(version)s.tar.gz',
-        'source_urls': ['https://pypi.python.org/packages/source/n/netCDF4'],
-        'checksums': [
-            'd145f9c12da29da3922d8b8aafea2a2a89501bcb28a219a46b7b828b57191594',  # netCDF4-1.5.7.tar.gz
-            # netcdf4-python-1.1.8-avoid-diskless-test.patch
-            'a8b262fa201d55f59015e1bc14466c1d113f807543bc1e05a22481ab0d216d72',
-        ],
-    }),
-]
-
-fix_python_shebang_for = ['bin/*']
-
-sanity_check_paths = {
-    'files': ['bin/nc3tonc4', 'bin/nc4tonc3', 'bin/ncinfo'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-sanity_check_commands = [
-    "nc4tonc3 --help",
-    "nc3tonc4 --help",
-    "ncinfo --help",
-]
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/netcdf4-python/netcdf4-python-1.5.7-npsmpic-2021b.eb b/Golden_Repo/n/netcdf4-python/netcdf4-python-1.5.7-npsmpic-2021b.eb
deleted file mode 100644
index 50d951f86..000000000
--- a/Golden_Repo/n/netcdf4-python/netcdf4-python-1.5.7-npsmpic-2021b.eb
+++ /dev/null
@@ -1,57 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'netcdf4-python'
-version = '1.5.7'
-
-homepage = 'https://unidata.github.io/netcdf4-python/'
-description = """Python/numpy interface to netCDF."""
-
-toolchain = {'name': 'npsmpic', 'version': '2021b'}
-toolchainopts = {'usempi': True}
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('netCDF', '4.8.1'),
-    ('cURL', '7.78.0'),
-    ('mpi4py', '3.1.3')
-]
-
-use_pip = True
-sanity_pip_check = True
-runtest = False  # mpirun problems
-skipsteps = ['sanitycheck']  # mpirun problems
-preinstallopts = 'CFLAGS=-noswitcherror'  # fix compiler problem during extension installation
-
-exts_default_options = {'source_urls': [PYPI_SOURCE]}
-
-exts_list = [
-    ('cftime', '1.5.0', {
-        'checksums': ['b644bcb53346b6f4fe2fcc9f3b574740a2097637492dcca29632c817e0604f29'],
-    }),
-    (name, version, {
-        'patches': ['netcdf4-python-1.1.8-avoid-diskless-test.patch'],
-        'source_tmpl': 'netCDF4-%(version)s.tar.gz',
-        'source_urls': ['https://pypi.python.org/packages/source/n/netCDF4'],
-        'checksums': [
-            'd145f9c12da29da3922d8b8aafea2a2a89501bcb28a219a46b7b828b57191594',  # netCDF4-1.5.7.tar.gz
-            # netcdf4-python-1.1.8-avoid-diskless-test.patch
-            'a8b262fa201d55f59015e1bc14466c1d113f807543bc1e05a22481ab0d216d72',
-        ],
-    }),
-]
-
-fix_python_shebang_for = ['bin/*']
-
-sanity_check_paths = {
-    'files': ['bin/nc3tonc4', 'bin/nc4tonc3', 'bin/ncinfo'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-sanity_check_commands = [
-    "nc4tonc3 --help",
-    "nc3tonc4 --help",
-    "ncinfo --help",
-]
-
-moduleclass = 'data'
diff --git a/Golden_Repo/n/netcdf4-python/netcdf4-python-1.5.7-nvompic-2021b.eb b/Golden_Repo/n/netcdf4-python/netcdf4-python-1.5.7-nvompic-2021b.eb
deleted file mode 100644
index 72d07c9d5..000000000
--- a/Golden_Repo/n/netcdf4-python/netcdf4-python-1.5.7-nvompic-2021b.eb
+++ /dev/null
@@ -1,57 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'netcdf4-python'
-version = '1.5.7'
-
-homepage = 'https://unidata.github.io/netcdf4-python/'
-description = """Python/numpy interface to netCDF."""
-
-toolchain = {'name': 'nvompic', 'version': '2021b'}
-toolchainopts = {'usempi': True}
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('netCDF', '4.8.1'),
-    ('cURL', '7.78.0'),
-    ('mpi4py', '3.1.3')
-]
-
-use_pip = True
-sanity_pip_check = True
-runtest = False  # mpirun problems
-skipsteps = ['sanitycheck']  # mpirun problems
-preinstallopts = 'CFLAGS=-noswitcherror'  # fix compiler problem during extension installation
-
-exts_default_options = {'source_urls': [PYPI_SOURCE]}
-
-exts_list = [
-    ('cftime', '1.5.0', {
-        'checksums': ['b644bcb53346b6f4fe2fcc9f3b574740a2097637492dcca29632c817e0604f29'],
-    }),
-    (name, version, {
-        'patches': ['netcdf4-python-1.1.8-avoid-diskless-test.patch'],
-        'source_tmpl': 'netCDF4-%(version)s.tar.gz',
-        'source_urls': ['https://pypi.python.org/packages/source/n/netCDF4'],
-        'checksums': [
-            'd145f9c12da29da3922d8b8aafea2a2a89501bcb28a219a46b7b828b57191594',  # netCDF4-1.5.7.tar.gz
-            # netcdf4-python-1.1.8-avoid-diskless-test.patch
-            'a8b262fa201d55f59015e1bc14466c1d113f807543bc1e05a22481ab0d216d72',
-        ],
-    }),
-]
-
-fix_python_shebang_for = ['bin/*']
-
-sanity_check_paths = {
-    'files': ['bin/nc3tonc4', 'bin/nc4tonc3', 'bin/ncinfo'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-sanity_check_commands = [
-    "nc4tonc3 --help",
-    "nc3tonc4 --help",
-    "ncinfo --help",
-]
-
-moduleclass = 'data'
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
deleted file mode 100644
index a39edd034..000000000
--- a/Golden_Repo/n/nettle/nettle-3.7.3-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,39 +0,0 @@
-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/n/networkx/networkx-2.6.3-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/n/networkx/networkx-2.6.3-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index 5f378c9c6..000000000
--- a/Golden_Repo/n/networkx/networkx-2.6.3-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,24 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'networkx'
-version = '2.6.3'
-
-homepage = 'https://pypi.python.org/pypi/networkx'
-description = """NetworkX is a Python package for the creation, manipulation,
-and study of the structure, dynamics, and functions of complex networks."""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-sources = [SOURCE_TAR_GZ]
-checksums = ['c0946ed31d71f1b732b5aaa6da5a0388a345019af232ce2f49c766e2d6795c51']
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10'),  # required for numpy, scipy, ...
-]
-
-use_pip = True
-download_dep_fail = True
-sanity_pip_check = True
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/n/nlohmann-json/nlohmann-json-3.10.4-GCCcore-11.2.0.eb b/Golden_Repo/n/nlohmann-json/nlohmann-json-3.10.4-GCCcore-11.2.0.eb
deleted file mode 100644
index 4848ca122..000000000
--- a/Golden_Repo/n/nlohmann-json/nlohmann-json-3.10.4-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,26 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'nlohmann-json'
-version = '3.10.4'
-
-homepage = "https://github.com/nlohmann/json"
-description = """JSON for modern C++ by Niels Lohmann
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/nlohmann/json/archive']
-sources = ['v%(version)s.tar.gz']
-
-checksums = ['1155fd1a83049767360e9a120c43c578145db3204d2b309eba49fbbedd0f4ed3']
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-    ('binutils', '2.37')
-]
-
-sanity_check_paths = {
-    'files': [],
-    'dirs': [('include', 'lib64')]
-}
diff --git a/Golden_Repo/n/nodejs/nodejs-16.13.0-GCCcore-11.2.0.eb b/Golden_Repo/n/nodejs/nodejs-16.13.0-GCCcore-11.2.0.eb
deleted file mode 100644
index d7f61677d..000000000
--- a/Golden_Repo/n/nodejs/nodejs-16.13.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,44 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'nodejs'
-version = '16.13.0'
-local_libversion = '93'
-
-homepage = 'https://nodejs.org'
-description = """Node.js is a platform built on Chrome's JavaScript runtime
- for easily building fast, scalable network applications. Node.js uses an
- event-driven, non-blocking I/O model that makes it lightweight and efficient,
- perfect for data-intensive real-time applications that run across distributed devices."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['http://%(name)s.org/dist/v%(version)s/']
-sources = ['node-v%(version)s.tar.gz']
-checksums = ['9c00e5b6024cfcbc9105f9c58cf160762e78659a345d100c5bd80a7fb38c684f']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Python', '3.9.6'),
-]
-
-configopts = [
-    '--with-intl=none',           # Fully disable ICU to avoid issues with the embedded icu-small library
-    '--shared --with-intl=none',  # Build libnode.so in a second run
-]
-
-# Link libv8 libs to libnode
-postinstallcmds = [
-    "cd %%(installdir)s/lib; ln -s libnode.%s.%s libnode.%s" % (SHLIB_EXT, local_libversion, SHLIB_EXT),
-    "cd %%(installdir)s/lib; ln -s libnode.%s.%s libv8.%s" % (SHLIB_EXT, local_libversion, SHLIB_EXT),
-    "cd %%(installdir)s/lib; ln -s libnode.%s.%s libv8_libbase.%s" % (SHLIB_EXT, local_libversion, SHLIB_EXT),
-    "cd %%(installdir)s/lib; ln -s libnode.%s.%s libv8_libplatform.%s" % (SHLIB_EXT, local_libversion, SHLIB_EXT),
-]
-
-sanity_check_paths = {
-    'files': ['bin/node', 'bin/npm', 'lib/libnode.%s.%s' % (SHLIB_EXT, local_libversion)],
-    'dirs': ['lib/node_modules', 'include/node']
-}
-
-modextrapaths = {'CPATH': 'include/node'}
-
-moduleclass = 'lang'
diff --git a/Golden_Repo/n/npsmpic/npsmpic-2021b.eb b/Golden_Repo/n/npsmpic/npsmpic-2021b.eb
deleted file mode 100644
index 18fb5bcb4..000000000
--- a/Golden_Repo/n/npsmpic/npsmpic-2021b.eb
+++ /dev/null
@@ -1,19 +0,0 @@
-easyblock = 'Toolchain'
-
-name = 'npsmpic'
-version = '2021b'
-
-homepage = '(none)'
-description = 'NVHPC based compiler toolchain, including Parastation MPICH2 for MPI support.'
-
-toolchain = SYSTEM
-
-local_compiler = ('NVHPC', '22.1')
-
-dependencies = [
-    local_compiler,
-    ('CUDA', '11.5', '', SYSTEM),
-    ('psmpi', '5.5.0-1', '', local_compiler),
-]
-
-moduleclass = 'toolchain'
diff --git a/Golden_Repo/n/nsync/nsync-1.24.0-GCCcore-11.2.0.eb b/Golden_Repo/n/nsync/nsync-1.24.0-GCCcore-11.2.0.eb
deleted file mode 100644
index 0cdb6dc38..000000000
--- a/Golden_Repo/n/nsync/nsync-1.24.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,26 +0,0 @@
-easyblock = 'CMakeNinja'
-
-name = 'nsync'
-version = '1.24.0'
-
-homepage = 'https://github.com/google/nsync'
-description = """nsync is a C library that exports various synchronization primitives, such as mutexes"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://github.com/google/nsync/archive/v%(version)s/']
-sources = [SOURCE_TAR_GZ]
-checksums = ['47a6eb2a295be5121a1904a6a775722338a20dc02ee3eec4169ed2c3f203617a']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1'),
-    ('Ninja', '1.10.2'),
-]
-
-sanity_check_paths = {
-    'files': ['include/nsync.h', 'lib/libnsync.a', 'lib/libnsync_cpp.a'],
-    'dirs': [],
-}
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/n/numactl/numactl-2.0.14.eb b/Golden_Repo/n/numactl/numactl-2.0.14.eb
deleted file mode 100644
index dc52fd4e5..000000000
--- a/Golden_Repo/n/numactl/numactl-2.0.14.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'numactl'
-version = '2.0.14'
-
-homepage = 'https://github.com/numactl/numactl'
-
-description = """
- The numactl program allows you to run your application program on specific
- cpu's and memory nodes. It does this by supplying a NUMA memory policy to
- the operating system before running your program. The libnuma library provides
- convenient ways for you to add NUMA memory policies into your own program.
-"""
-
-site_contacts = 'Damian Alvarez <d.alvarez@fz-juelich.de>'
-
-toolchain = SYSTEM
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/numactl/numactl/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['1ee27abd07ff6ba140aaf9bc6379b37825e54496e01d6f7343330cf1a4487035']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Autotools', '20210726', '', SYSTEM),
-]
-
-preconfigopts = './autogen.sh && '
-
-sanity_check_paths = {
-    'files': ['bin/numactl', 'bin/numastat', 'lib/libnuma.%s' % SHLIB_EXT, 'lib/libnuma.a'],
-    'dirs': ['share/man', 'include']
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/n/numba/llvmlite-0.38.0-llvm13.patch b/Golden_Repo/n/numba/llvmlite-0.38.0-llvm13.patch
deleted file mode 100644
index 66b2b8ea3..000000000
--- a/Golden_Repo/n/numba/llvmlite-0.38.0-llvm13.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 1d928ebcd59b23b5050234a2bf71f9be7f5f6bd1 Mon Sep 17 00:00:00 2001
-From: Richard Barnes <rbarnes@umn.edu>
-Date: Wed, 1 Dec 2021 10:29:08 -0700
-Subject: [PATCH] Enable LLVM-12 and LLVM-13
-
----
- ffi/build.py                   |  5 ++---
- ffi/targets.cpp                |  2 ++
- llvmlite/tests/test_binding.py | 19 ++++++++++++++++---
- 3 files changed, 20 insertions(+), 6 deletions(-)
-
-diff --git a/ffi/build.py b/ffi/build.py
-index 6408bf5f..95e33c64 100755
---- a/ffi/build.py
-+++ b/ffi/build.py
-@@ -162,9 +162,8 @@ def main_posix(kind, library_ext):
-         print(msg)
-         print(warning + '\n')
-     else:
--
--        if not out.startswith('11'):
--            msg = ("Building llvmlite requires LLVM 11.x.x, got "
-+        if not (out.startswith('11') or out.startswith('12') or out.startswith('13')):
-+            msg = ("Building llvmlite requires LLVM 11-13.x.x, got "
-                    "{!r}. Be sure to set LLVM_CONFIG to the right executable "
-                    "path.\nRead the documentation at "
-                    "http://llvmlite.pydata.org/ for more information about "
-diff --git a/ffi/targets.cpp b/ffi/targets.cpp
-index 1ce472c2..4ba33e79 100644
---- a/ffi/targets.cpp
-+++ b/ffi/targets.cpp
-@@ -233,7 +233,9 @@ LLVMPY_CreateTargetMachine(LLVMTargetRef T,
-         rm = Reloc::DynamicNoPIC;
- 
-     TargetOptions opt;
-+#if LLVM_VERSION_MAJOR < 12
-     opt.PrintMachineCode = PrintMC;
-+#endif
-     opt.MCOptions.ABIName = ABIName;
- 
-     bool jit = JIT;
-diff --git a/llvmlite/tests/test_binding.py b/llvmlite/tests/test_binding.py
-index 80495787..fee2372a 100644
---- a/llvmlite/tests/test_binding.py
-+++ b/llvmlite/tests/test_binding.py
-@@ -18,6 +18,16 @@
- from llvmlite.tests import TestCase
- 
- 
-+def clean_string_whitespace(x: str) -> str:
-+    # Remove trailing whitespace from the end of each line
-+    x = re.sub(r"\s+$", "", x, flags=re.MULTILINE)
-+    # Remove intermediate blank lines
-+    x = re.sub(r"\n\s*\n", r"\n", x, flags=re.MULTILINE)
-+    # Remove extraneous whitespace from the beginning and end of the string
-+    x = x.strip()
-+    return x
-+
-+
- # arvm7l needs extra ABI symbols to link successfully
- if platform.machine() == 'armv7l':
-     llvm.load_library_permanently('libgcc_s.so.1')
-@@ -158,7 +168,7 @@ def no_de_locale():
- target triple = "unknown-unknown-unknown"
- target datalayout = ""
- 
--define i32 @"foo"() 
-+define i32 @"foo"()
- {
- "<>!*''#":
-   ret i32 12345
-@@ -424,7 +434,10 @@ def test_nonalphanum_block_name(self):
-         bd = ir.IRBuilder(fn.append_basic_block(name="<>!*''#"))
-         bd.ret(ir.Constant(ir.IntType(32), 12345))
-         asm = str(mod)
--        self.assertEqual(asm, asm_nonalphanum_blocklabel)
-+        self.assertEqual(
-+            clean_string_whitespace(asm),
-+            clean_string_whitespace(asm_nonalphanum_blocklabel)
-+        )
- 
-     def test_global_context(self):
-         gcontext1 = llvm.context.get_global_context()
-@@ -509,7 +522,7 @@ def test_set_option(self):
-     def test_version(self):
-         major, minor, patch = llvm.llvm_version_info
-         # one of these can be valid
--        valid = [(11,)]
-+        valid = [(11,), (12,), (13,)]
-         self.assertIn((major,), valid)
-         self.assertIn(patch, range(10))
- 
\ No newline at end of file
diff --git a/Golden_Repo/n/numba/numba-0.55.1-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/n/numba/numba-0.55.1-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index fefe43a77..000000000
--- a/Golden_Repo/n/numba/numba-0.55.1-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,75 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'numba'
-version = '0.55.1'
-
-homepage = 'https://numba.pydata.org/'
-description = """Numba is an Open Source NumPy-aware optimizing compiler for
-Python sponsored by Continuum Analytics, Inc. It uses the remarkable LLVM
-compiler infrastructure to compile Python syntax to machine code."""
-
-usage = '''
-In case you intend to use CUDA functionality of Numba please ensure that CUDA_HOME is set.
-For more details please check: http://numba.pydata.org/numba-doc/latest/cuda/overview.html
-'''
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10'),
-    ('LLVM', '13.0.0'),
-    ('CUDA', '11.5', '', SYSTEM),
-]
-
-use_pip = True
-sanity_pip_check = True
-
-local_llvmlite_preinstallopts = "export LLVM_CONFIG=${EBROOTLLVM}/bin/llvm-config && "
-local_llvmlite_preinstallopts += "export LLVMLITE_SKIP_LLVM_VERSION_CHECK=1 && export NUMBA_DISABLE_INTEL_SVML=1 && "
-
-exts_default_options = {'source_urls': [PYPI_SOURCE]}
-
-exts_list = [
-    ('icc-rt', '2020.0.133', {
-        'modulename': False,
-        'source_tmpl': 'icc_rt-%(version)s-py2.py3-none-manylinux1_x86_64.whl',
-        'unpack_sources': False,
-        'checksums': ['17a173e65cee0c516358172b9cc96fe297dd54f4d6b23d57f79c62d9e105e3cf'],
-    }),
-    ('intel-openmp', '2020.0.133', {
-        'modulename': False,
-        'source_tmpl': 'intel_openmp-%(version)s-py2.py3-none-manylinux1_x86_64.whl',
-        'unpack_sources': False,
-        'checksums': ['cb9a12b0a1cb3f9c44a75959f687e548dc642a9470be3c63f73bccf291b8dcc8'],
-    }),
-    ('llvmlite', '0.38.0', {
-        'patches': ['llvmlite-0.38.0-llvm13.patch'],
-        'preinstallopts': """export LLVM_CONFIG=${EBROOTLLVM}/bin/llvm-config && \\
-            export LLVMLITE_SKIP_LLVM_VERSION_CHECK=1 && export NUMBA_DISABLE_INTEL_SVML=1 && """,
-        'source_urls': ['https://github.com/numba/llvmlite/archive/refs/tags/'],
-        'sources': ['v%(version)s.tar.gz'],
-        'checksums': [
-            '90d2d3fa26a410bd976b83f7534dc0dcf484135370ef5bf8d9d7f0103dbc054b',  # v0.38.0.tar.gz
-            '9100416ee18ea480cfde81307e375eec45c9adf79a81a846489000786b77a838',  # llvmlite-0.38.0-llvm13.patch
-        ],
-    }),
-    (name, version, {
-        'source_urls': ['https://pypi.python.org/packages/source/n/numba/'],
-        'checksums': ['03e9069a2666d1c84f93b00dbd716fb8fedde8bb2c6efafa2f04842a46442ea3'],
-    }),
-]
-
-fix_python_shebang_for = ['bin/*']
-
-sanity_check_paths = {
-    'files': ['bin/numba', 'bin/pycc'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-sanity_check_commands = ["numba --help"]
-
-modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
-
-moduleclass = 'lang'
diff --git a/Golden_Repo/n/nvidia-Video_Codec_SDK/nvidia-Video_Codec_SDK-11.1.5.eb b/Golden_Repo/n/nvidia-Video_Codec_SDK/nvidia-Video_Codec_SDK-11.1.5.eb
deleted file mode 100644
index b39a2e216..000000000
--- a/Golden_Repo/n/nvidia-Video_Codec_SDK/nvidia-Video_Codec_SDK-11.1.5.eb
+++ /dev/null
@@ -1,47 +0,0 @@
-easyblock = 'Tarball'
-
-name = 'nvidia-Video_Codec_SDK'
-version = '11.1.5'
-
-homepage = 'https://developer.nvidia.com/nvidia-video-codec-sdk'
-description = """NVDECODE and NVENCODE APIs for low-level granular control over various encode/decode parameters
-and if you want to directly tap into the hardware decoder/encoder."""
-
-toolchain = SYSTEM
-
-sources = ['Video_Codec_SDK_%(version)s.tar.gz']
-checksums = ['5facddff252cc15fd93a00f24d60e8bea85515e573ddd0341e84e756e286584a']
-
-dependencies = [
-    ('nvidia-driver', 'default', '', SYSTEM),
-]
-
-postinstallcmds = [
-    (
-        '{ cat > %(installdir)s/nvenc.pc; } << EOF\n'
-        'prefix=%(installdir)s \n'
-        'exec_prefix=\${prefix} \n'
-        'includedir=\${prefix}/Interface \n'
-        'libdir=${EBROOTNVIDIAMINDRIVER}/lib64 \n'
-        '\n'
-        'Name: nvenc \n'
-        'Description: NVENC \n'
-        'Version: %(version_major)s \n'
-        'Requires: \n'
-        'Conflicts: \n'
-        'Libs: -L\${libdir} -lnvidia-encode \n'
-        'Cflags: -I\${includedir} \n'
-        'EOF'
-    ),
-]
-
-modextrapaths = {
-    'PKG_CONFIG_PATH': ''
-}
-
-sanity_check_paths = {
-    'files': ['Interface/nvEncodeAPI.h'],
-    'dirs': ['Interface', 'Lib'],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/n/nvidia-driver/nvidia-driver-default.eb b/Golden_Repo/n/nvidia-driver/nvidia-driver-default.eb
deleted file mode 100644
index c844f598d..000000000
--- a/Golden_Repo/n/nvidia-driver/nvidia-driver-default.eb
+++ /dev/null
@@ -1,23 +0,0 @@
-name = 'nvidia-driver'
-version = 'default'
-realversion = '515.65.01'
-
-homepage = 'https://developer.nvidia.com/cuda-toolkit'
-description = """This is a set of libraries normally installed by the NVIDIA driver installer."""
-
-site_contacts = 'sc@fz-juelich.de'
-
-toolchain = SYSTEM
-
-source_urls = ['http://us.download.nvidia.com/tesla/%s/' % realversion]
-sources = ['NVIDIA-Linux-x86_64-%s.run' % realversion]
-checksums = ['0492ddc5b5e65aa00cbc762e8d6680205c8d08e103b7131087a15126aee495e9']
-
-# To avoid conflicts between NVML and the kernel driver
-postinstallcmds = ['rm %(installdir)s/lib64/libnvidia-ml.so*']
-
-modluafooter = '''
-add_property("arch","gpu")
-'''
-
-moduleclass = 'system'
diff --git a/Golden_Repo/n/nvompic/nvompic-2021b.eb b/Golden_Repo/n/nvompic/nvompic-2021b.eb
deleted file mode 100644
index e033d2eea..000000000
--- a/Golden_Repo/n/nvompic/nvompic-2021b.eb
+++ /dev/null
@@ -1,19 +0,0 @@
-easyblock = 'Toolchain'
-
-name = 'nvompic'
-version = '2021b'
-
-homepage = '(none)'
-description = 'NVHPC based compiler toolchain, including OpenMPI for MPI support.'
-
-toolchain = SYSTEM
-
-local_compiler = ('NVHPC', '22.1')
-
-dependencies = [
-    local_compiler,
-    ('CUDA', '11.5', '', SYSTEM),
-    ('OpenMPI', '4.1.2', '', local_compiler),
-]
-
-moduleclass = 'toolchain'
diff --git a/Golden_Repo/o/OPARI2/OPARI2-2.0.6-GCCcore-11.2.0.eb b/Golden_Repo/o/OPARI2/OPARI2-2.0.6-GCCcore-11.2.0.eb
deleted file mode 100644
index 44f1cac26..000000000
--- a/Golden_Repo/o/OPARI2/OPARI2-2.0.6-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,44 +0,0 @@
-##
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-# Copyright:: Copyright 2013-2021 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-#             Markus Geimer <m.geimer@fz-juelich.de>
-#             Christian Feld <c.feld@fz-juelich.de>
-# License::   3-clause BSD
-#
-# This work is based on experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-easyblock = 'ConfigureMake'
-
-name = 'OPARI2'
-version = '2.0.6'
-
-homepage = 'https://www.score-p.org'
-description = """
-OPARI2, the successor of Forschungszentrum Juelich's OPARI, is a
-source-to-source instrumentation tool for OpenMP and hybrid codes.
-It surrounds OpenMP directives and runtime library calls with calls
-to the POMP2 measurement interface.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['http://perftools.pages.jsc.fz-juelich.de/cicd/opari2/tags/opari2-%(version)s']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = [
-    '55972289ce66080bb48622110c3189a36e88a12917635f049b37685b9d3bbcb0',  # opari2-2.0.6.tar.gz
-]
-
-builddependencies = [
-    # use same binutils version that was used when building GCCcore
-    ('binutils', '2.37'),
-]
-
-sanity_check_paths = {
-    'files': ['bin/opari2', 'include/opari2/pomp2_lib.h'],
-    'dirs': [],
-}
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/o/OSPRay/OSPRay-2.8.0-gpsmpi-2021b.eb b/Golden_Repo/o/OSPRay/OSPRay-2.8.0-gpsmpi-2021b.eb
deleted file mode 100644
index ff8dfc07b..000000000
--- a/Golden_Repo/o/OSPRay/OSPRay-2.8.0-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,63 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'OSPRay'
-version = '2.8.0'
-
-homepage = 'http://www.ospray.org/'
-description = """
-OSPRay is an open source, scalable, and portable ray tracing engine for
-high-performance, high-fidelity visualization on Intel® Architecture CPUs.
-"""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/ospray/OSPRay/archive/']
-sources = ['v%(version)s.tar.gz']
-
-checksums = ['2dabc75446a0e2e970952d325f930853a51a9b4d1868c8135f05552a4ae04d39']
-
-builddependencies = [
-    ('ispc', '1.16.1', '', SYSTEM),
-    ('CMake', '3.21.1', '', SYSTEM),
-    ('Doxygen', '1.9.1')
-]
-
-dependencies = [
-    ('X11', '20210802'),
-    ('OpenGL', '2021b'),
-    ('freeglut', '3.2.1'),
-    ('Qt5', '5.15.2'),
-    ('tbb', '2020.3'),
-    ('Embree', '3.13.2'),
-    ('rkcommon', '1.8.0'),
-    ('openvkl', '1.1.0'),
-    ('OpenImageDenoise', '1.4.2', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-]
-
-separate_build_dir = True
-
-configopts = '-DCMAKE_VERBOSE_MAKEFILE=ON '
-configopts += '-DOSPRAY_TASKING_SYSTEM=OPENMP '
-configopts += '-DOSPRAY_INSTALL_DEPENDENCIES=OFF '
-configopts += '-DCMAKE_BUILD_TYPE=Release '
-configopts += '-DOSPRAY_BUILD_ISA=ALL '
-configopts += '-Dembree_DIR=$EBROOTEMBREE/lib64/cmake/embree-3.13.2 '
-configopts += '-DOSPRAY_APPS_EXAMPLES:BOOL=OFF '
-configopts += '-DOSPRAY_APPS_TESTING:BOOL=OFF '
-configopts += '-DOSPRAY_ENABLE_APPS:BOOL=OFF '
-configopts += '-DOSPRAY_MODULE_DENOISER:BOOL=ON '
-configopts += '-DOSPRAY_MODULE_MPI:BOOL=True '
-configopts += '-DOSPRAY_MPI_BUILD_TUTORIALS:BOOL=OFF '
-
-sanity_check_paths = {
-    'dirs': ['include/ospray/',
-             'lib64/cmake/%(namelower)s-%(version)s', 'share/doc/OSPRay'],
-    'files': ['include/ospray/version.h',
-              'lib64/libospray.so',
-              'share/doc/OSPRay/README.md'],
-}
-
-modextrapaths = {'CMAKE_MODULE_PATH': ['lib64/cmake/ospray-%(version)s']}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/o/OTF2/OTF2-2.3-GCCcore-11.2.0.eb b/Golden_Repo/o/OTF2/OTF2-2.3-GCCcore-11.2.0.eb
deleted file mode 100644
index 7bb728b9c..000000000
--- a/Golden_Repo/o/OTF2/OTF2-2.3-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,49 +0,0 @@
-##
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-# Copyright:: Copyright 2013-2021 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-#             Markus Geimer <m.geimer@fz-juelich.de>
-#             Christian Feld <c.feld@fz-juelich.de>
-# License::   3-clause BSD
-#
-# This work is based on experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-easyblock = 'EB_Score_minus_P'
-
-name = 'OTF2'
-version = '2.3'
-
-homepage = 'https://www.score-p.org'
-description = """
-The Open Trace Format 2 is a highly scalable, memory efficient event trace
-data format plus support library. It is the new standard trace format for
-Scalasca, Vampir, and TAU and is open for other tools.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['http://perftools.pages.jsc.fz-juelich.de/cicd/otf2/tags/otf2-%(version)s']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = [
-    '36957428d37c40d35b6b45208f050fb5cfe23c54e874189778a24b0e9219c7e3',  # otf2-2.3.tar.gz
-]
-
-builddependencies = [
-    # use same binutils version that was used when building GCCcore
-    ('binutils', '2.37'),
-    # SIONlib container support (optional):
-    ('SIONlib', '1.7.7', '-tools'),
-]
-
-configopts = '--enable-shared'
-
-sanity_check_paths = {
-    'files': ['bin/otf2-config', 'include/otf2/otf2.h',
-              ('lib/libotf2.a', 'lib64/libotf2.a'),
-              ('lib/libotf2.%s' % SHLIB_EXT, 'lib64/libotf2.%s' % SHLIB_EXT)],
-    'dirs': [],
-}
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/o/OTF2/OTF2-3.0-GCCcore-11.2.0.eb b/Golden_Repo/o/OTF2/OTF2-3.0-GCCcore-11.2.0.eb
deleted file mode 100644
index 1272d1e20..000000000
--- a/Golden_Repo/o/OTF2/OTF2-3.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,49 +0,0 @@
-##
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-# Copyright:: Copyright 2013-2022 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-#             Markus Geimer <m.geimer@fz-juelich.de>
-#             Christian Feld <c.feld@fz-juelich.de>
-# License::   3-clause BSD
-#
-# This work is based on experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-easyblock = 'EB_Score_minus_P'
-
-name = 'OTF2'
-version = '3.0'
-
-homepage = 'https://www.score-p.org'
-description = """
-The Open Trace Format 2 is a highly scalable, memory efficient event trace
-data format plus support library. It is the new standard trace format for
-Scalasca, Vampir, and TAU and is open for other tools.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['http://perftools.pages.jsc.fz-juelich.de/cicd/otf2/tags/otf2-%(version)s']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = [
-    '6fff0728761556e805b140fd464402ced394a3c622ededdb618025e6cdaa6d8c',  # otf2-3.0.tar.gz
-]
-
-builddependencies = [
-    # use same binutils version that was used when building GCCcore
-    ('binutils', '2.37'),
-    # SIONlib container support (optional):
-    ('SIONlib', '1.7.7', '-tools'),
-]
-
-configopts = '--enable-shared'
-
-sanity_check_paths = {
-    'files': ['bin/otf2-config', 'include/otf2/otf2.h',
-              ('lib/libotf2.a', 'lib64/libotf2.a'),
-              ('lib/libotf2.%s' % SHLIB_EXT, 'lib64/libotf2.%s' % SHLIB_EXT)],
-    'dirs': [],
-}
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/o/Octave/Octave-6.4.0-gcccoremkl-11.2.0-2021.4.0-nompi.eb b/Golden_Repo/o/Octave/Octave-6.4.0-gcccoremkl-11.2.0-2021.4.0-nompi.eb
deleted file mode 100644
index 2cdbff6db..000000000
--- a/Golden_Repo/o/Octave/Octave-6.4.0-gcccoremkl-11.2.0-2021.4.0-nompi.eb
+++ /dev/null
@@ -1,86 +0,0 @@
-name = 'Octave'
-version = '6.4.0'
-versionsuffix = '-nompi'
-
-homepage = 'https://www.gnu.org/software/octave/'
-description = """GNU Octave is a high-level interpreted language, primarily intended for numerical computations."""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-source_urls = [GNU_SOURCE]
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['b48f33d4fceaf394cfbea73a8c850000936d83a41739a24f7568b5b0a7b39acd']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Bison', '3.7.6'),
-    ('flex', '2.6.4'),
-    ('Autotools', '20210726'),
-    ('texinfo', '6.8'),
-    ('gperf', '3.1'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('X11', '20210802'),
-    ('PCRE', '8.45'),
-    ('ncurses', '6.2'),
-    ('libreadline', '8.1'),
-    ('ARPACK-NG', '3.8.0', '-nompi'),
-    ('cURL', '7.78.0'),
-    ('FLTK', '1.3.7'),
-    ('fontconfig', '2.13.94'),
-    ('freetype', '2.11.0'),
-    ('GLPK', '5.0'),
-    ('GL2PS', '1.4.2'),
-    ('gnuplot', '5.4.2'),
-    ('Java', '15', '', SYSTEM),
-    ('zlib', '1.2.11'),
-    ('OpenGL', '2021b'),
-    ('freeglut', '3.2.1'),
-    ('Ghostscript', '9.54.0'),
-    ('Qhull', '2020.2'),
-    ('Qt5', '5.15.2'),
-    ('HDF5', '1.12.1', '-serial'),
-    ('qrupdate', '1.1.2'),
-    ('SuiteSparse', '5.10.1', '-nompi'),
-    ('libsndfile', '1.0.31'),
-    ('FFTW', '3.3.10', '-nompi'),
-    ('texlive', '20200406'),
-    ('GraphicsMagick', '1.3.36'),
-]
-
-configopts = 'MOC=$EBROOTQT5/bin/moc '
-configopts += 'UIC=$EBROOTQT5/bin/uic '
-configopts += 'RCC=$EBROOTQT5/bin/rcc '
-configopts += 'LRELEASE=$EBROOTQT5/bin/lrelease '
-configopts += '--with-blas="$LIBBLAS" --with-lapack="$LIBLAPACK" --disable-docs '
-# correct for both GCC and Intel compilers
-configopts += '--enable-fortran-calling-convention=gfortran'
-
-local_pkg_url = 'https://downloads.sourceforge.net/'
-local_pkg_url += 'project/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases/'
-exts_default_options = {'source_urls': [local_pkg_url]}
-
-exts_list = [
-    ('control', '3.4.0', {
-        'checksums': ['6ec6a06e13ad288afad8631cc41f7247e47096fa1e8d04240d4ed01efbe4a77a'],
-    }),
-    ('general', '2.1.2', {
-        'checksums': ['a30cd1a79743c62528dae46ebd4a83f848ae46a1c1dac3eaabc36662d42294cf'],
-    }),
-    ('io', '2.6.4', {
-        'checksums': ['a74a400bbd19227f6c07c585892de879cd7ae52d820da1f69f1a3e3e89452f5a'],
-    }),
-    ('signal', '1.4.1', {
-        'checksums': ['d978600f8b8f61339b986136c9862cad3e8f7015f84132f214bf63e9e281aeaa'],
-    }),
-    ('statistics', '1.4.3', {
-        'checksums': ['9801b8b4feb26c58407c136a9379aba1e6a10713829701bb3959d9473a67fa05'],
-    }),
-    ('struct', '1.0.17', {
-        'checksums': ['0137bbb5df650f29104f6243502f3a2302aaaa5e42ea9f02d8a3943aaf668433'],
-    }),
-]
-
-moduleclass = 'math'
diff --git a/Golden_Repo/o/OpenCV/OpenCV-4.5.4-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/o/OpenCV/OpenCV-4.5.4-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index 3a05dd7a1..000000000
--- a/Golden_Repo/o/OpenCV/OpenCV-4.5.4-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,77 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'OpenCV'
-version = '4.5.4'
-
-homepage = 'https://opencv.org/'
-description = """OpenCV (Open Source Computer Vision Library) is an open source computer vision
- and machine learning software library. OpenCV was built to provide
- a common infrastructure for computer vision applications and to accelerate
- the use of machine perception in the commercial products."""
-
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True, 'optarch': True}
-
-source_urls = [
-    'https://github.com/opencv/opencv/archive/',
-]
-
-sources = [
-    '%(version)s.zip',
-]
-
-checksums = [
-    '5deac7f7341faf4b23c38d65f8f89dbf5b4b30d345390a60853640967a2bf61b'
-]
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1', '', SYSTEM),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-Stack', '2021b'),
-    ('zlib', '1.2.11'),
-    ('FFmpeg', '4.4.1'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('libpng', '1.6.37'),
-    ('LibTIFF', '4.3.0'),
-    ('JasPer', '2.0.33'),
-    ('GLib', '2.69.1'),
-    ('GTK+', '3.24.23',),
-    ('protobuf', '3.17.3'),
-    ('Eigen', '3.3.9'),
-    ('OpenEXR', '3.1.1'),
-    ('freetype', '2.11.0'),
-    ('OpenGL', '2021b'),
-]
-
-separate_build_dir = True
-
-configopts = "-D CMAKE_BUILD_TYPE=RELEASE "
-configopts += '-D CMAKE_CXX_FLAGS="-Wdeprecated-declarations" '
-
-configopts += "-D OPENCV_GENERATE_PKGCONFIG=ON "
-configopts += "-D ENABLE_PRECOMPILED_HEADERS=OFF "
-
-configopts += "-D BUILD_EXAMPLES=ON "
-configopts += "-D INSTALL_PYTHON_EXAMPLES=ON "
-
-configopts += "-D Protobuf_INCLUDE_DIR=$EBROOTPROTOBUF/include "
-configopts += "-D Protobuf_LIBRARY=$EBROOTPROTOBUF/lib64/libprotobuf.so "
-configopts += "-D Protobuf_LITE_LIBRARY_RELEASE=$EBROOTPROTOBUF/lib64/libprotobuf-lite.so "
-configopts += "-D Protobuf_PROTOC_LIBRARY_RELEASE=$EBROOTPROTOBUF/lib64/bprotoc.so "
-configopts += "-D BUILD_PROTOBUF=OFF -DPROTOBUF_UPDATE_FILES=ON "
-
-configopts += "-D BUILD_JAVA=OFF "
-
-configopts += "-D PYTHON_DEFAULT_EXECUTABLE=$EBROOTPYTHON/bin/python3 "
-configopts += "-D PYTHON2_EXECUTABLE='' "  # ensure python2 is NOT used
-
-configopts += "-D WITH_OPENMP=ON "
-
-modextrapaths = {'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages/'}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/o/OpenCV/OpenCV-4.5.5-gcccoremkl-11.2.0-2021.4.0-contrib.eb b/Golden_Repo/o/OpenCV/OpenCV-4.5.5-gcccoremkl-11.2.0-2021.4.0-contrib.eb
deleted file mode 100644
index 9d783c79c..000000000
--- a/Golden_Repo/o/OpenCV/OpenCV-4.5.5-gcccoremkl-11.2.0-2021.4.0-contrib.eb
+++ /dev/null
@@ -1,139 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'OpenCV'
-version = '4.5.5'
-versionsuffix = '-contrib'
-
-# the hash is version dependent! see 3rdparty/ippicv/ippicv.cmake
-local_ippicv_hash = 'a56b6ac6f030c312b2dce17430eef13aed9af274'
-
-homepage = 'https://opencv.org/'
-description = """OpenCV (Open Source Computer Vision Library) is an open source computer vision
- and machine learning software library. OpenCV was built to provide
- a common infrastructure for computer vision applications and to accelerate
- the use of machine perception in the commercial products.
- Includes extra modules for OpenCV from the contrib repository."""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True, 'optarch': True}
-
-sources = [
-    {'source_urls': ['https://github.com/opencv/opencv/archive/'],
-     'download_filename': '%(version)s.zip', 'filename': SOURCELOWER_ZIP},
-    {'source_urls': ['https://github.com/opencv/opencv_contrib/archive/'],
-     'download_filename': '%(version)s.zip', 'filename': '%(namelower)s_contrib-%(version)s.zip'},
-    {'source_urls': ['https://raw.githubusercontent.com/opencv/opencv_3rdparty/%s/ippicv' % local_ippicv_hash],
-     'filename': 'ippicv_2020_lnx_intel64_20191018_general.tgz', 'extract_cmd': "cp %s %(builddir)s"},
-]
-checksums = [
-    'fb16b734db3a28e5119d513bd7c61ef417edf3756165dc6259519bb9d23d04e2',  # opencv-4.5.5.zip
-    'f53a0e531b2e284d2d1af013f5d96a86dfc1165d71eb47ddc9e7b834cc803091',  # opencv_contrib-4.5.5.zip
-    '08627fa5660d52d59309a572dd7db5b9c8aea234cfa5aee0942a1dd903554246',  # ippicv_2020_lnx_intel64_20191018_general.tgz
-]
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1', '', SYSTEM),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10'),  # for numpy
-    ('zlib', '1.2.11'),
-    ('FFmpeg', '4.4.1'),
-    ('GStreamer', '1.18.6'),
-    ('freetype', '2.11.0'),
-    ('HarfBuzz', '2.8.2'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('libpng', '1.6.37'),
-    ('LibTIFF', '4.3.0'),
-    ('libwebp', '1.2.0'),
-    ('OpenEXR', '3.1.1'),
-    ('JasPer', '2.0.33'),
-    ('Java', '15', '', True),
-    ('ant', '1.10.12', '-Java-%(javaver)s', True),
-    ('GLib', '2.69.1'),
-    ('GTK+', '3.24.23',),
-    ('HDF5', '1.12.1', '-serial'),  # needed by hdf from contrib
-    ('protobuf', '3.17.3'),
-    ('Eigen', '3.3.9'),
-    ('CUDA', '11.5', '', SYSTEM),
-    ('cuDNN', '8.3.1.22', '-CUDA-11.5', SYSTEM),
-    ('nvidia-Video_Codec_SDK', '11.1.5', '', SYSTEM),
-    ('OpenGL', '2021b'),
-]
-
-separate_build_dir = True
-
-configopts = "-D CMAKE_BUILD_TYPE=RELEASE "
-configopts += '-D CMAKE_CXX_FLAGS="-Wdeprecated-declarations" '
-
-configopts += "-D OPENCV_GENERATE_PKGCONFIG=ON "
-configopts += "-D ENABLE_PRECOMPILED_HEADERS=OFF "
-
-configopts += "-D BUILD_EXAMPLES=ON "
-configopts += "-D INSTALL_PYTHON_EXAMPLES=ON "
-
-# configopts += "-D ENABLE_FAST_MATH=ON "
-# configopts += "-D CUDA_FAST_MATH=ON "
-
-configopts += "-D WITH_CUDA=ON "
-configopts += "-D WITH_CUDNN=ON "
-configopts += "-D WITH_CUBLAS=ON "
-configopts += "-D WITH_CUFFT=ON "
-configopts += "-D CUDA_ARCH_BIN='%(cuda_cc_space_sep)s' "
-# configopts += "-D CUDA_ARCH_PTX='' "
-configopts += "-D BUILD_CUDA_STUBS=ON "
-configopts += "-D OPENCV_DNN_CUDA=ON "
-configopts += "-D BUILD_opencv_cudacodec=ON "
-
-configopts += "-D WITH_NVCUVID=ON "
-
-configopts += "-D WITH_GSTREAMER=ON "
-
-configopts += '-DOPENCV_EXTRA_MODULES_PATH=%(builddir)s/%(namelower)s_contrib-%(version)s/modules '
-
-configopts += "-DProtobuf_INCLUDE_DIR=$EBROOTPROTOBUF/include "
-configopts += "-DProtobuf_LIBRARY=$EBROOTPROTOBUF/lib64/libprotobuf.so "
-configopts += "-DProtobuf_LITE_LIBRARY_RELEASE=$EBROOTPROTOBUF/lib64/libprotobuf-lite.so "
-configopts += "-DProtobuf_PROTOC_LIBRARY_RELEASE=$EBROOTPROTOBUF/lib64/bprotoc.so "
-configopts += "-DBUILD_PROTOBUF=OFF -DPROTOBUF_UPDATE_FILES=ON "
-
-# XXXX in configurations is a bug fix in OpenCV because ocv_check_modules is not able to recognize freetype and harfbuzz
-# ref: https://github.com/opencv/opencv/blob/6e8daaec0f46aaba9ea22e2afce47307b1dbff9f/cmake/OpenCVUtils.cmake#L861
-
-configopts += '-DFREETYPE_FOUND=ON '
-configopts += '-DFREETYPE_INCLUDE_DIRS=$EBROOTFREETYPE/include/freetype2/ '
-configopts += '-DFREETYPE_LIBRARIES=$EBROOTFREETYPE/lib64/libfreetype.so '
-configopts += '-DFREETYPE_LINK_LIBRARIES=$EBROOTFREETYPE/lib64/libfreetype.so '
-configopts += '-DFREETYPE_LINK_LIBRARIES_XXXXX=ON '
-
-configopts += '-DHARFBUZZ_FOUND=ON '
-configopts += '-DHARFBUZZ_INCLUDE_DIRS=$EBROOTHARFBUZZ/include/harfbuzz '
-configopts += '-DHARFBUZZ_LIBRARIES=$EBROOTHARFBUZZ/lib64/libharfbuzz.so '
-configopts += '-DHARFBUZZ_LINK_LIBRARIES=$EBROOTHARFBUZZ/lib64/libharfbuzz.so '
-configopts += '-DHARFBUZZ_LINK_LIBRARIES_XXXXX=ON '
-
-configopts += "-D PYTHON_DEFAULT_EXECUTABLE=$EBROOTPYTHON/bin/python3 "
-configopts += "-D PYTHON2_EXECUTABLE='' "  # ensure python2 is NOT used
-configopts += '-DBUILD_opencv_python2=OFF '
-
-configopts += "-D WITH_OPENMP=ON "
-
-modextrapaths = {'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages/'}
-
-enhance_sanity_check = True
-
-local_contrib_libs = [
-    'aruco', 'bgsegm', 'bioinspired', 'ccalib', 'datasets', 'dnn_objdetect', 'dnn_superres', 'dpm', 'face', 'freetype',
-    'fuzzy', 'hdf', 'hfs', 'img_hash', 'line_descriptor', 'optflow', 'phase_unwrapping', 'plot', 'quality', 'reg',
-    'rgbd', 'saliency', 'shape', 'stereo', 'structured_light', 'superres', 'surface_matching', 'text', 'tracking',
-    'videostab', 'xfeatures2d', 'ximgproc', 'xobjdetect', 'xphoto'
-]
-
-sanity_check_paths = {
-    'files': ['lib64/libopencv_%s.%s' % (l, SHLIB_EXT) for l in local_contrib_libs],
-    'dirs': [],
-}
-
-moduleclass = 'vis'
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
deleted file mode 100644
index 6e9e8261d..000000000
--- a/Golden_Repo/o/OpenEXR/OpenEXR-3.1.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,31 +0,0 @@
-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/OpenFOAM/OpenFOAM-v1906-wmake-ompi.patch b/Golden_Repo/o/OpenFOAM/OpenFOAM-v1906-wmake-ompi.patch
deleted file mode 100644
index 78291300d..000000000
--- a/Golden_Repo/o/OpenFOAM/OpenFOAM-v1906-wmake-ompi.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-# - Corrected output of "wmake -show-c" and "wmake -show-c++" with OpenMPI in order to allow compilation of paraFoam
-#
-# author: Jiri Furst <Jiri.Furst@gmail.com>
---- OpenFOAM-v1906/wmake/makefiles/info.orig	2019-11-07 18:12:53.000000000 +0100
-+++ OpenFOAM-v1906/wmake/makefiles/info	2019-11-23 12:52:50.700688579 +0100
-@@ -73,19 +73,19 @@
- 
- .PHONY: c
- c:
--	@echo "$(firstword $(cc))"
-+	@echo "$(lastword $(cc))"
- 
- .PHONY: cxx
- cxx:
--	@echo "$(firstword $(CC))"
-+	@echo "$(lastword $(CC))"
- 
- .PHONY: cflags
- cflags:
--	@echo "$(wordlist 2,$(words $(COMPILE_C)), $(COMPILE_C))"
-+	@echo "$(wordlist 3,$(words $(COMPILE_C)), $(COMPILE_C))"
- 
- .PHONY: cxxflags
- cxxflags:
--	@echo "$(wordlist 2,$(words $(COMPILE_CXX)), $(COMPILE_CXX))"
-+	@echo "$(wordlist 3,$(words $(COMPILE_CXX)), $(COMPILE_CXX))"
- 
- .PHONY: cflags-arch
- cflags-arch:
diff --git a/Golden_Repo/o/OpenFOAM/OpenFOAM-v2012-cleanup.patch b/Golden_Repo/o/OpenFOAM/OpenFOAM-v2012-cleanup.patch
deleted file mode 100644
index daccb9439..000000000
--- a/Golden_Repo/o/OpenFOAM/OpenFOAM-v2012-cleanup.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-# Replaces OpenFOAM third-party libraries with EASYBUILD variants.
-# Uses the OpenFOAM prefs mechanism and the FOAM_CONFIG_ETC variable
-# to define the preferred settings without patching the original files
-#
-# Authors: Mark Olesen <Mark.Olesen@esi-group.com>
-# -------------------------------------------------------------------------
---- /dev/null	2020-12-14 09:05:45.272769166 +0100
-+++ OpenFOAM-v2012/etc/prefs.sh	2020-12-14 10:02:26.488430802 +0100
-@@ -0,0 +1,7 @@
-+##Easybuild## settings -*- sh -*-
-+
-+export FOAM_CONFIG_ETC="etc/easybuild"
-+
-+export WM_MPLIB=EASYBUILDMPI
-+
-+##Easybuild##
---- /dev/null	2020-12-14 09:05:45.272769166 +0100
-+++ OpenFOAM-v2012/etc/easybuild/config.sh/CGAL	2020-12-14 10:10:55.991841204 +0100
-@@ -0,0 +1,6 @@
-+##Easybuild## settings -*- sh -*-
-+
-+export BOOST_ARCH_PATH="$EBROOTBOOST"
-+export CGAL_ARCH_PATH="$EBROOTCGAL"
-+
-+##Easybuild##
---- /dev/null	2020-12-14 09:05:45.272769166 +0100
-+++ OpenFOAM-v2012/etc/easybuild/config.sh/FFTW	2020-12-14 10:10:53.735843322 +0100
-@@ -0,0 +1,5 @@
-+##Easybuild## settings -*- sh -*-
-+
-+export FFTW_ARCH_PATH="$EBROOTFFTW"
-+
-+##EasyBuild##
---- /dev/null	2020-12-14 09:05:45.272769166 +0100
-+++ OpenFOAM-v2012/etc/easybuild/config.sh/metis	2020-12-11 21:23:28.774934024 +0100
-@@ -0,0 +1,6 @@
-+##Easybuild## settings -*- sh -*-
-+
-+METIS_VERSION="metis-$EBVERSIONMETIS"
-+[ -d "$METIS_ARCH_PATH" ] || METIS_ARCH_PATH="$METIS_ROOT"
-+
-+##Easybuild##
---- /dev/null	2020-12-14 09:05:45.272769166 +0100
-+++ OpenFOAM-v2012/etc/easybuild/config.sh/readline	2020-12-11 21:23:22.534951043 +0100
-@@ -0,0 +1,5 @@
-+##Easybuild## settings -*- sh -*-
-+
-+export READLINE_ARCH_PATH="$EBROOTLIBREADLINE"
-+
-+##Easybuild##
---- /dev/null	2020-12-14 09:05:45.272769166 +0100
-+++ OpenFOAM-v2012/etc/easybuild/config.sh/scotch	2020-12-11 21:23:17.586964539 +0100
-@@ -0,0 +1,7 @@
-+##Easybuild## settings -*- sh -*-
-+
-+export SCOTCH_VERSION="scotch_$EBVERSIONSCOTCH"
-+export SCOTCH_ARCH_PATH="$EBROOTSCOTCH"
-+[ -d "$SCOTCH_ARCH_PATH" ] || SCOTCH_ARCH_PATH="$SCOTCH_ROOT"
-+
-+##Easybuild##
---- /dev/null	2020-12-14 09:05:45.272769166 +0100
-+++ OpenFOAM-v2012/etc/easybuild/config.sh/vtk	2020-12-11 21:22:55.463024882 +0100
-@@ -0,0 +1,9 @@
-+##Easybuild## settings -*- sh -*-
-+
-+export VTK_DIR="$EBROOTVTK"
-+export MESA_ARCH_PATH="$EBROOTMESA"
-+
-+# Define paraview-mesa directory as required
-+unset ParaView_MESA_DIR
-+
-+##Easybuild##
---- /dev/null	2020-12-14 09:05:45.272769166 +0100
-+++ OpenFOAM-v2012/etc/easybuild/config.sh/paraview	2020-12-14 10:13:53.583674383 +0100
-@@ -0,0 +1,75 @@
-+##Easybuild## settings -*- sh -*-
-+#
-+# Largely a knockoff of the OpenFOAM etc/config.sh/paraview-system
-+# readjusted for easybuild
-+#
-+# Copyright (C) 2020 OpenCFD Ltd.
-+#
-+#------------------------------------------------------------------------------
-+# Compiler-specific location for ThirdParty installations
-+archDir="$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER"
-+
-+# Clean path and library path of previous settings
-+eval \
-+    "$($WM_PROJECT_DIR/bin/foamCleanPath -sh-env=PATH \
-+    $ParaView_DIR $archDir/ParaView- $archDir/qt-)"
-+
-+eval \
-+    "$($WM_PROJECT_DIR/bin/foamCleanPath -sh-env=LD_LIBRARY_PATH \
-+    $ParaView_DIR $archDir/ParaView- $archDir/qt-)"
-+
-+
-+#------------------------------------------------------------------------------
-+
-+##Easybuild## settings
-+
-+ParaView_VERSION="$EBVERSIONPARAVIEW"
-+export ParaView_DIR="$EBROOTPARAVIEW"
-+
-+#------------------------------------------------------------------------------
-+
-+unset PV_PLUGIN_PATH
-+
-+# Set API to correspond to VERSION
-+# pv_api is <digits>.<digits> from ParaView_VERSION
-+#-
-+# Extract API from VERSION
-+pv_api=$(echo "$ParaView_VERSION" | \
-+    sed -ne 's/^[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/p')
-+
-+pv_plugin_dir="$FOAM_LIBBIN/paraview-$pv_api"
-+
-+# Set paths if binaries are present
-+if [ -r "$ParaView_DIR" ]
-+then
-+    export PATH="$ParaView_DIR/bin:$PATH"
-+
-+    # ParaView libraries
-+    # - 5.5 and later:   lib/, but could also be lib64/
-+    for libDir in lib64 lib
-+    do
-+        pvLibDir="$libDir/paraview-$pv_api"
-+        if [ -d "$ParaView_DIR/$pvLibDir" ]
-+        then
-+            export LD_LIBRARY_PATH="$ParaView_DIR/$libDir:$LD_LIBRARY_PATH"
-+            break
-+        fi
-+    done
-+
-+    # OpenFOAM plugin directory must be the first in PV_PLUGIN_PATH
-+    # and have paraview-major.minor encoded in its name
-+    if [ -d "$pv_plugin_dir" ]
-+    then
-+        export PV_PLUGIN_PATH="$pv_plugin_dir"
-+    fi
-+fi
-+
-+
-+#------------------------------------------------------------------------------
-+
-+unset ParaView_VERSION
-+
-+unset archDir libDir
-+unset pv_api pv_plugin_dir pvLibDir
-+
-+#------------------------------------------------------------------------------
diff --git a/Golden_Repo/o/OpenFOAM/OpenFOAM-v2112-gpsmpi-2021b.eb b/Golden_Repo/o/OpenFOAM/OpenFOAM-v2112-gpsmpi-2021b.eb
deleted file mode 100644
index 23de983cd..000000000
--- a/Golden_Repo/o/OpenFOAM/OpenFOAM-v2112-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,41 +0,0 @@
-name = 'OpenFOAM'
-version = 'v2112'
-
-homepage = 'https://www.openfoam.com/'
-description = """OpenFOAM is a free, open source CFD software package.
- OpenFOAM has an extensive range of features to solve anything from complex fluid flows
- involving chemical reactions, turbulence and heat transfer,
- to solid dynamics and electromagnetics."""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-toolchainopts = {'opt': True, 'cstd': 'c++17'}
-
-source_urls = ['https://sourceforge.net/projects/openfoam/files/%(version)s/']
-sources = [SOURCE_TGZ]
-patches = [
-    ('OpenFOAM-v2012-cleanup.patch', 1),
-    'OpenFOAM-v1906-wmake-ompi.patch',
-]
-checksums = [
-    '3e838731e79db1c288acc27aad8cc8a43d9dac1f24e5773e3b9fa91419a8c3f7',  # OpenFOAM-v2112.tgz
-    'cdd2597a1ac1448e9bd33a364a8dfe17f51cc9ab5a8e0ab67cf92bba3ed9da43',  # OpenFOAM-v2012-cleanup.patch
-    '518e27683c5c41400cfbc17b31effa50b31b25916dccbf85b18b0b955f642505',  # OpenFOAM-v1906-wmake-ompi.patch
-]
-
-builddependencies = [
-    ('Bison', '3.7.6'),
-    ('CMake', '3.21.1'),
-    ('flex', '2.6.4'),
-]
-
-dependencies = [
-    ('libreadline', '8.1'),
-    ('ncurses', '6.2'),
-    # OpenFOAM requires 64 bit METIS using 32 bit indexes (array indexes)
-    ('METIS', '5.1.0', '-RTW64-IDX32'),
-    ('SCOTCH', '6.1.2'),
-    ('CGAL', '5.2'),
-    ('gnuplot', '5.4.2'),
-]
-
-moduleclass = 'cae'
diff --git a/Golden_Repo/o/OpenGL/OpenGL-2021b-GCCcore-11.2.0.eb b/Golden_Repo/o/OpenGL/OpenGL-2021b-GCCcore-11.2.0.eb
deleted file mode 100644
index ddafe0ab0..000000000
--- a/Golden_Repo/o/OpenGL/OpenGL-2021b-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,235 +0,0 @@
-easyblock = 'Bundle'
-
-name = 'OpenGL'
-version = '2021b'
-
-homepage = 'http://www.opengl.org/'
-description = """
-Open Graphics Library (OpenGL) is a cross-language, cross-platform application programming interface (API) for rendering
-2D and 3D vector graphics. Mesa is an open-source implementation of the OpenGL specification - a system for rendering
-interactive 3D graphics. NVIDIA supports OpenGL and a complete set of OpenGL extensions, designed to give a maximum
-performance on NVIDIA GPUs.
-
-This is a GL vendor neutral dispatch (GLVND) installation with Mesa and NVIDIA in the same lib-directory. Mesa or NVIDIA
-OpenGL is set individually for each XScreen.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-# swr detects and builds parts specific for AVX and AVX2. If we use
-# -xHost, this always gets overwritten and will fail.
-toolchainopts = {'optarch': False}
-
-builddependencies = [
-    ('Python', '3.9.6'),
-    ('binutils', '2.37'),
-    ('flex', '2.6.4'),
-    ('Bison', '3.7.6'),
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2'),
-    ('expat', '2.4.1'),
-    ('libxml2', '2.9.10'),
-    ('Meson', '0.58.2'),
-    ('Ninja', '1.10.2'),
-    ('CMake', '3.21.1', '', SYSTEM),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('nettle', '3.7.3'),
-    ('libdrm', '2.4.108'),
-    ('LLVM', '13.0.0'),
-    ('X11', '20210802'),
-    ('libunwind', '1.5.0'),
-    ('nvidia-driver', 'default', '', SYSTEM),
-]
-
-default_easyblock = 'ConfigureMake'
-
-default_component_specs = {
-    'sources': [SOURCE_TAR_GZ],
-    'start_dir': '%(name)s-%(version)s',
-}
-
-local_pkg_config = ('export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:%(installdir)s/lib/pkgconfig && '
-                    'export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:%(installdir)s/lib64/pkgconfig && ')
-
-components = [
-    # A vendor neutral dispatch layer
-    ('libglvnd', '1.3.4', {
-        'source_urls': [
-            'https://gitlab.freedesktop.org/glvnd/libglvnd/-/archive/v%(version)s/'
-        ],
-        'sources':   ['%(name)s-v%(version)s.tar.gz'],
-        'start_dir':  '%(name)s-v%(version)s',
-        'checksums': ['c42061da999f75234f9bca501c21144d9a5768c5911d674eceb8650ce3fb94bb'],
-        'preconfigopts': './autogen.sh && '
-    }),
-    # Mesa for software rendering, not hardware rendering.
-    ('Mesa', '21.2.5', {
-        # We build:
-        # - llvmpipe: the high-performance Gallium LLVM driver (only possible with glx=gallium-xlib)
-        # - swr: Intel's OpenSWR
-        'easyblock': 'MesonNinja',
-        'source_urls': [
-            'https://mesa.freedesktop.org/archive/',
-            'https://mesa.freedesktop.org/archive/%(version)s',
-            'ftp://ftp.freedesktop.org/pub/mesa/%(version)s',
-            'ftp://ftp.freedesktop.org/pub/mesa/older-versions/%(version_major)s.x/%(version)s',
-            'ftp://ftp.freedesktop.org/pub/mesa/older-versions/%(version_major)s.x',
-        ],
-        'sources': [SOURCELOWER_TAR_XZ],
-        'checksums': [
-            '8e49585fb760d973723dab6435d0c86f7849b8305b1e6d99f475138d896bacbb',
-            # o/OpenGL/ofnone-fix.patch
-            '37d1c37fd3a8563b9dd78ecd361e5a39440310facd1ed656ca1e12f667b54d6b',
-            # o/OpenGL/swrllvm-fix.patch
-            '8bc00dc99a88684fcf469115914269b716622ef33648cf80c8a80d05d38e9540',
-        ],
-        'patches': [
-            # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11568
-            'ofnone-fix.patch',
-            # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13267
-            'swrllvm-fix.patch'
-        ],
-        'start_dir': '%(namelower)s-%(version)s',
-        'separate_build_dir': True,
-        'preconfigopts': local_pkg_config,
-        # https://gitlab.freedesktop.org/mesa/mesa/-/blob/master/meson_options.txt
-        'configopts': (' -D libdir=%(installdir)s/lib'
-                       ' -D gbm=enabled'
-                       ' -D glx=auto'
-                       ' -D osmesa=true'
-                       ' -D llvm=enabled'
-                       ' -D shared-llvm=enabled'
-                       ' -D dri-drivers=""'
-                       ' -D vulkan-drivers="swrast"'
-                       ' -D gallium-drivers="swr,swrast"'
-                       ' -D swr-arches=avx,avx2,skx,knl'
-                       ' -D platforms=x11'  # surfaceless taken automatically, see logs
-                       ' -D glvnd=true'
-                       ' -D libunwind=disabled'
-                       ' -D valgrind=disabled'
-                       ' -D egl=enabled'
-                       ' -D gles1=enabled -Dgles2=enabled'
-                       ' -D shared-glapi=enabled'
-                       ' -D gallium-vdpau=disabled'  # only for r300, r600, radeonsi, nouveau
-                       ' -D buildtype=release'),
-    }),
-    # OpenGL Utility Library - offers higher level GL-graphics functions
-    ('glu', '9.0.2', {
-        'preconfigopts': local_pkg_config,
-        'source_urls': [
-            'ftp://ftp.freedesktop.org/pub/mesa/glu/'
-        ],
-        'sources': [
-            'glu-%(version)s.tar.gz'
-        ],
-        'checksums': [
-            '24effdfb952453cc00e275e1c82ca9787506aba0282145fff054498e60e19a65',
-        ],
-    }),
-    # OpenGL Extension Wrangler Library - determines which OpenGL extensions are supported at run-time
-    # This is just GLEW for GLX (which requires DISPLAY to be set) and not GLEW for EGL as GLEW selects GLX/EGL at
-    # compile-time and not run-time (https://github.com/nigels-com/glew/issues/172#issuecomment-357400019)
-    # Compile+Load GLEW-EGL on top to enable GLEW for EGL
-    ('glew', '2.2.0', {
-        'source_urls': [
-            'https://sourceforge.net/projects/glew/files/glew/snapshots/',
-        ],
-        'sources': [
-            'glew-20200115.tgz',
-        ],
-        'checksums': [
-            '314219ba1db50d49b99705e8eb00e83b230ee7e2135289a00b5b570e4a4db43a',
-        ],
-        'skipsteps': ['configure'],
-        'buildopts': ('GLEW_PREFIX=%(installdir)s GLEW_DEST=%(installdir)s LIBDIR=%(installdir)s/lib '
-                      'LDFLAGS.EXTRA="-L${EBROOTX11}/lib/ -lX11" LDFLAGS.GL="-L%(installdir)s/lib -lGL"'),
-        'installopts': 'GLEW_PREFIX=%(installdir)s GLEW_DEST=%(installdir)s LIBDIR=%(installdir)s/lib ',
-        'install_cmd': 'make install.all ',
-    }),
-    # MESA demos - offers the important command 'eglinfo'
-    ('demos', '95c1a57cfdd1ef2852c828cba4659a72575c5c5d', {
-        'source_urls': [
-            'https://gitlab.freedesktop.org/mesa/demos/-/archive/%(version)s/',
-        ],
-        'sources': [SOURCELOWER_TAR_GZ],
-        'checksums': [
-            '7738beca8f6f6981ba04c8a22fde24d69d6b2aaab1758ac695c9475bf704249c',
-        ],
-        'preconfigopts': ('./autogen.sh && ' +
-                          local_pkg_config +
-                          'GLEW_CFLAGS="-I%(installdir)s/include/" GLEW_LIBS="-L%(installdir)s/lib/ -lGLEW -lGL" '
-                          'EGL_CFLAGS="-I%(installdir)s/include/" EGL_LIBS="-L%(installdir)s/lib/ -lEGL" '),
-        'configopts': '--disable-osmesa ',
-    }),
-]
-
-postinstallcmds = [
-    'cd %(installdir)s/lib && ln -sf libGL.so.1.7.0 libGL.so.1',
-    'rm %(installdir)s/lib/*.la',
-    'cd %(installdir)s/lib && ln -sf ${EBROOTNVIDIA}/lib64/libEGL_nvidia.so.0 .',
-    'cd %(installdir)s/lib && ln -sf ${EBROOTNVIDIA}/lib64/libGLX_nvidia.so.0 .',
-    'cd %(installdir)s/lib && ln -sf libGLX_mesa.so.0 libGLX_indirect.so.0',
-    'cd %(installdir)s/lib && ln -sf ${EBROOTNVIDIA}/lib64/libGLESv1_CM_nvidia.so.1 .',
-    'cd %(installdir)s/lib && ln -sf ${EBROOTNVIDIA}/lib64/libGLESv2_nvidia.so.2 .',
-    # EGL vendor ICDs
-    (
-        '{ cat > %(installdir)s/share/glvnd/egl_vendor.d/10_nvidia.json; } << \'EOF\'\n'
-        '{\n'
-        '  \"file_format_version\" : \"1.0.0\",\n'
-        '  \"ICD\" : {\n'
-        '     \"library_path\" : \"libEGL_nvidia.so.0\"\n'
-        '  }\n'
-        '}\n'
-        'EOF'
-    ),
-    (
-        '{ cat > %(installdir)s/share/glvnd/egl_vendor.d/50_mesa.json; } << \'EOF\'\n'
-        '{\n'
-        '  \"file_format_version\" : \"1.0.0\",\n'
-        '  \"ICD\" : {\n'
-        '     \"library_path\" : \"libEGL_mesa.so.0\"\n'
-        '  }\n'
-        '}\n'
-        'EOF'
-    ),
-    # correct pkg-config of GLEW
-    'sed -i "/^libdir=/c\libdir=\${exec_prefix}\/lib" %(installdir)s/lib/pkgconfig/glew.pc',
-    'sed -i "/^prefix=/c\prefix=%(installdir)s"       %(installdir)s/lib/pkgconfig/glew.pc',
-]
-
-modextravars = {
-    # '__GLX_VENDOR_LIBRARY_NAME': 'mesa' or 'nvidia'
-    '__EGL_VENDOR_LIBRARY_FILENAMES': ('%(installdir)s/share/glvnd/egl_vendor.d/10_nvidia.json:'
-                                       '%(installdir)s/share/glvnd/egl_vendor.d/50_mesa.json'),
-    'EGL_PLATFORM': 'surfaceless',
-    'EGL_DRIVER': 'swr',
-    'EGL_LOG_LEVEL': 'fatal',
-    'GALLIUM_DRIVER': 'swr',
-    'KNOB_MAX_WORKER_THREADS': '65535',
-}
-
-modluafooter = '''
-add_property("arch","gpu")
-
-conflict("Mesa")
-conflict("libGLU")
-'''
-
-sanity_check_paths = {
-    'files': [
-        'lib/libEGL_mesa.%s' % SHLIB_EXT, 'lib/libOSMesa.%s' % SHLIB_EXT,
-        'lib/libGLESv1_CM.%s' % SHLIB_EXT, 'lib/libGLESv2.%s' % SHLIB_EXT,
-        'include/GL/glext.h', 'include/GL/glx.h',
-        'include/GL/osmesa.h', 'include/GL/gl.h', 'include/GL/glxext.h',
-        'include/GLES/gl.h', 'include/GLES2/gl2.h', 'include/GLES3/gl3.h',
-        'lib/libOpenGL.%s' % SHLIB_EXT,
-        'lib/libGLEW.a', 'lib/libGLEW.%s' % SHLIB_EXT,
-        'bin/glewinfo', 'bin/visualinfo',
-        'include/GL/glew.h', 'include/GL/glxew.h', 'include/GL/wglew.h',
-    ],
-    'dirs': []
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/o/OpenGL/ofnone-fix.patch b/Golden_Repo/o/OpenGL/ofnone-fix.patch
deleted file mode 100644
index c5cf04b32..000000000
--- a/Golden_Repo/o/OpenGL/ofnone-fix.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From a20dc1dd150a6c31153197ceda01827daab4203e Mon Sep 17 00:00:00 2001
-From: Vinson Lee <vlee@freedesktop.org>
-Date: Wed, 23 Jun 2021 21:58:08 -0700
-Subject: [PATCH] swr: Fix build with llvm-13.
-
-Fix build after llvm-13 commit 3302af9d4c39 ("Support: Remove
-F_{None,Text,Append} compatibility synonyms, NFC").
-
-Signed-off-by: Vinson Lee <vlee@freedesktop.org>
----
- .../swr/rasterizer/jitter/JitManager.cpp      | 24 +++++++++++++++++++
- 1 file changed, 24 insertions(+)
-
-diff --git a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
-index 44482939c76..2487f754dc1 100644
---- a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
-+++ b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
-@@ -437,7 +437,11 @@ void JitManager::DumpAsm(Function* pFunction, const char* fileName)
-         sprintf(fName, "%s.%s.asm", funcName, fileName);
- #endif
- 
-+#if LLVM_VERSION_MAJOR >= 13
-+        raw_fd_ostream filestream(fName, EC, llvm::sys::fs::OF_None);
-+#else
-         raw_fd_ostream filestream(fName, EC, llvm::sys::fs::F_None);
-+#endif
- 
-         legacy::PassManager* pMPasses         = new legacy::PassManager();
-         auto*                pTarget          = mpExec->getTargetMachine();
-@@ -490,7 +494,11 @@ void JitManager::DumpToFile(Module*                         M,
- #else
-         sprintf(fName, "%s.%s.ll", funcName, fileName);
- #endif
-+#if LLVM_VERSION_MAJOR >= 13
-+        raw_fd_ostream fd(fName, EC, llvm::sys::fs::OF_None);
-+#else
-         raw_fd_ostream fd(fName, EC, llvm::sys::fs::F_None);
-+#endif
-         M->print(fd, annotater);
-         fd.flush();
-     }
-@@ -512,7 +520,11 @@ void JitManager::DumpToFile(Function* f, const char* fileName)
- #else
-         sprintf(fName, "%s.%s.ll", funcName, fileName);
- #endif
-+#if LLVM_VERSION_MAJOR >= 13
-+        raw_fd_ostream fd(fName, EC, llvm::sys::fs::OF_None);
-+#else
-         raw_fd_ostream fd(fName, EC, llvm::sys::fs::F_None);
-+#endif
-         f->print(fd, nullptr);
- 
- #if defined(_WIN32)
-@@ -522,7 +534,11 @@ void JitManager::DumpToFile(Function* f, const char* fileName)
- #endif
-         fd.flush();
- 
-+#if LLVM_VERSION_MAJOR >= 13
-+        raw_fd_ostream fd_cfg(fName, EC, llvm::sys::fs::OF_Text);
-+#else
-         raw_fd_ostream fd_cfg(fName, EC, llvm::sys::fs::F_Text);
-+#endif
-         WriteGraph(fd_cfg, (const Function*)f);
- 
-         fd_cfg.flush();
-@@ -726,7 +742,11 @@ void JitCache::notifyObjectCompiled(const llvm::Module* M, llvm::MemoryBufferRef
- 
-     {
-         std::error_code      err;
-+#if LLVM_VERSION_MAJOR >= 13
-+        llvm::raw_fd_ostream fileObj(objPath.c_str(), err, llvm::sys::fs::OF_None);
-+#else
-         llvm::raw_fd_ostream fileObj(objPath.c_str(), err, llvm::sys::fs::F_None);
-+#endif
-         fileObj << Obj.getBuffer();
-         fileObj.flush();
-     }
-@@ -734,7 +754,11 @@ void JitCache::notifyObjectCompiled(const llvm::Module* M, llvm::MemoryBufferRef
- 
-     {
-         std::error_code      err;
-+#if LLVM_VERSION_MAJOR >= 13
-+        llvm::raw_fd_ostream fileObj(filePath.c_str(), err, llvm::sys::fs::OF_None);
-+#else
-         llvm::raw_fd_ostream fileObj(filePath.c_str(), err, llvm::sys::fs::F_None);
-+#endif
- 
-         uint32_t objcrc = ComputeCRC(0, Obj.getBufferStart(), Obj.getBufferSize());
- 
--- 
-GitLab
-
diff --git a/Golden_Repo/o/OpenGL/swrllvm-fix.patch b/Golden_Repo/o/OpenGL/swrllvm-fix.patch
deleted file mode 100644
index 83f433deb..000000000
--- a/Golden_Repo/o/OpenGL/swrllvm-fix.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-diff --git a/src/gallium/drivers/swr/rasterizer/jitter/builder_gfx_mem.h b/src/gallium/drivers/swr/rasterizer/jitter/builder_gfx_mem.h
-index c361959b76ff0799f5102ad4b8ddf23d345105d9..64a690b47fac9ee99eba8f1259ffccf20f0e5fa0 100644
---- a/src/gallium/drivers/swr/rasterizer/jitter/builder_gfx_mem.h
-+++ b/src/gallium/drivers/swr/rasterizer/jitter/builder_gfx_mem.h
-@@ -41,31 +41,29 @@ namespace SwrJit
-         BuilderGfxMem(JitManager* pJitMgr);
-         virtual ~BuilderGfxMem() {}
- 
--        virtual Value* GEP(Value* Ptr, Value* Idx, Type* Ty = nullptr, bool isReadOnly = true, const Twine& Name = "");
--        virtual Value* GEP(Type* Ty, Value* Ptr, Value* Idx, const Twine& Name = "");
--        virtual Value*
--        GEP(Value* Ptr, const std::initializer_list<Value*>& indexList, Type* Ty = nullptr);
--        virtual Value*
--        GEP(Value* Ptr, const std::initializer_list<uint32_t>& indexList, Type* Ty = nullptr);
-+        virtual Value* GEP(Value* Ptr, Value* Idx, Type* Ty = nullptr, bool isReadOnly = true, const Twine& Name = "") override;
-+        virtual Value* GEP(Type* Ty, Value* Ptr, Value* Idx, const Twine& Name = "") override;
-+        virtual Value* GEP(Value* Ptr, const std::initializer_list<Value*>& indexList, Type* Ty = nullptr) override;
-+        virtual Value* GEP(Value* Ptr, const std::initializer_list<uint32_t>& indexList, Type* Ty = nullptr) override;
- 
-         virtual LoadInst* LOAD(Value*         Ptr,
-                                const char*    Name,
-                                Type*          Ty    = nullptr,
--                               MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL);
-+                               MEM_CLIENT     usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override;
-         virtual LoadInst* LOAD(Value*         Ptr,
-                                const Twine&   Name  = "",
-                                Type*          Ty    = nullptr,
--                               MEM_CLIENT     usage = MEM_CLIENT::MEM_CLIENT_INTERNAL);
-+                               MEM_CLIENT     usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override;
-         virtual LoadInst* LOAD(Value*         Ptr,
-                                bool           isVolatile,
-                                const Twine&   Name  = "",
-                                Type*          Ty    = nullptr,
--                               MEM_CLIENT     usage = MEM_CLIENT::MEM_CLIENT_INTERNAL);
-+                               MEM_CLIENT     usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override;
-         virtual LoadInst* LOAD(Value*                                 BasePtr,
-                                const std::initializer_list<uint32_t>& offset,
-                                const llvm::Twine&                     Name  = "",
-                                Type*                                  Ty    = nullptr,
--                               MEM_CLIENT                         usage = MEM_CLIENT::MEM_CLIENT_INTERNAL);
-+                               MEM_CLIENT                             usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override;
- 
-         virtual CallInst* MASKED_LOAD(Value*         Ptr,
-                                       unsigned       Align,
-@@ -73,32 +71,32 @@ namespace SwrJit
-                                       Value*         PassThru = nullptr,
-                                       const Twine&   Name     = "",
-                                       Type*          Ty       = nullptr,
--                                      MEM_CLIENT     usage    = MEM_CLIENT::MEM_CLIENT_INTERNAL);
-+                                      MEM_CLIENT     usage    = MEM_CLIENT::MEM_CLIENT_INTERNAL) override;
- 
--        virtual StoreInst* STORE(Value *Val, Value *Ptr, bool isVolatile = false, Type* Ty = nullptr, MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL);
--        
--        virtual StoreInst* STORE(Value* Val, Value* BasePtr, const std::initializer_list<uint32_t>& offset, Type* Ty = nullptr, MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL);
-+        virtual StoreInst* STORE(Value *Val, Value *Ptr, bool isVolatile = false, Type* Ty = nullptr, MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override;
- 
--        virtual CallInst* MASKED_STORE(Value *Val, Value *Ptr, unsigned Align, Value *Mask, Type* Ty = nullptr, MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL);
-+        virtual StoreInst* STORE(Value* Val, Value* BasePtr, const std::initializer_list<uint32_t>& offset, Type* Ty = nullptr, MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override;
-+
-+        virtual CallInst* MASKED_STORE(Value *Val, Value *Ptr, unsigned Align, Value *Mask, Type* Ty = nullptr, MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override;
- 
-         virtual Value* GATHERPS(Value*         src,
-                                 Value*         pBase,
-                                 Value*         indices,
-                                 Value*         mask,
-                                 uint8_t        scale = 1,
--                                MEM_CLIENT     usage = MEM_CLIENT::MEM_CLIENT_INTERNAL);
-+                                MEM_CLIENT     usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override;
-         virtual Value* GATHERDD(Value*         src,
-                                 Value*         pBase,
-                                 Value*         indices,
-                                 Value*         mask,
-                                 uint8_t        scale = 1,
--                                MEM_CLIENT     usage = MEM_CLIENT::MEM_CLIENT_INTERNAL);
-+                                MEM_CLIENT     usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override;
- 
-         virtual void SCATTERPS(Value*         pDst,
-                                Value*         vSrc,
-                                Value*         vOffsets,
-                                Value*         vMask,
--                               MEM_CLIENT     usage = MEM_CLIENT::MEM_CLIENT_INTERNAL);
-+                               MEM_CLIENT     usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override;
- 
-         Value* TranslateGfxAddressForRead(Value*         xpGfxAddress,
-                                           Type*          PtrTy = nullptr,
-@@ -108,13 +106,13 @@ namespace SwrJit
-                                            Type*          PtrTy = nullptr,
-                                            const Twine&   Name  = "",
-                                            MEM_CLIENT     usage = MEM_CLIENT::MEM_CLIENT_INTERNAL);
--        
-+
-     protected:
-         void AssertGFXMemoryParams(Value* ptr, MEM_CLIENT usage);
- 
-         virtual void NotifyPrivateContextSet();
- 
--        virtual Value* OFFSET_TO_NEXT_COMPONENT(Value* base, Constant* offset);
-+        virtual Value* OFFSET_TO_NEXT_COMPONENT(Value* base, Constant* offset) override;
- 
-         Value* TranslationHelper(Value* Ptr, Type* Ty, Value* pfnTranslateGfxAddress);
-         void   TrackerHelper(Value* Ptr, Type* Ty, MEM_CLIENT usage, bool isRead);
-diff --git a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp
-index b5eb0a782b15214bcf954a7893cd628649a990fc..a16b5d11dbb2f2f1a0bcdc07e4d306b14a90dc4c 100644
---- a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp
-+++ b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp
-@@ -82,7 +82,12 @@ namespace SwrJit
-         std::vector<Value*> indices;
-         for (auto i : indexList)
-             indices.push_back(i);
-+#if LLVM_VERSION_MAJOR >= 13
-+        Type *EltTy = cast<PointerType>(ptr->getType())->getElementType();
-+        return IN_BOUNDS_GEP(EltTy, ptr, indices);
-+#else
-         return IN_BOUNDS_GEP(ptr, indices);
-+#endif
-     }
- 
-     Value* Builder::IN_BOUNDS_GEP(Value* ptr, const std::initializer_list<uint32_t>& indexList)
-@@ -90,7 +95,12 @@ namespace SwrJit
-         std::vector<Value*> indices;
-         for (auto i : indexList)
-             indices.push_back(C(i));
-+#if LLVM_VERSION_MAJOR >= 13
-+        Type *EltTy = cast<PointerType>(ptr->getType())->getElementType();
-+        return IN_BOUNDS_GEP(EltTy, ptr, indices);
-+#else
-         return IN_BOUNDS_GEP(ptr, indices);
-+#endif
-     }
- 
-     LoadInst* Builder::LOAD(Value* Ptr, const char* Name, Type* Ty, MEM_CLIENT usage)
-@@ -130,6 +140,22 @@ namespace SwrJit
-         return Builder::LOAD(GEPA(basePtr, valIndices), name);
-     }
- 
-+    CallInst* Builder::MASKED_LOAD(Value*         Ptr,
-+                                   unsigned       Align,
-+                                   Value*         Mask,
-+                                   Value*         PassThru,
-+                                   const Twine&   Name,
-+                                   Type*          Ty,
-+                                   MEM_CLIENT     usage)
-+    {
-+#if LLVM_VERSION_MAJOR >= 13
-+        Type *EltTy = cast<PointerType>(Ptr->getType())->getElementType();
-+        return IRB()->CreateMaskedLoad(EltTy, Ptr, AlignType(Align), Mask, PassThru, Name);
-+#else
-+        return IRB()->CreateMaskedLoad(Ptr, AlignType(Align), Mask, PassThru, Name);
-+#endif
-+    }
-+
-     LoadInst* Builder::LOADV(Value*                               basePtr,
-                              const std::initializer_list<Value*>& indices,
-                              const llvm::Twine&                   name)
-@@ -234,7 +260,12 @@ namespace SwrJit
-     /// @param pVecPassthru - SIMD wide vector of values to load when lane is inactive
-     Value* Builder::GATHER_PTR(Value* pVecSrcPtr, Value* pVecMask, Value* pVecPassthru)
-     {
-+#if LLVM_VERSION_MAJOR >= 13
-+        Type *EltTy = cast<PointerType>(pVecSrcPtr->getType())->getElementType();
-+        return MASKED_GATHER(EltTy, pVecSrcPtr, AlignType(4), pVecMask, pVecPassthru);
-+#else
-         return MASKED_GATHER(pVecSrcPtr, AlignType(4), pVecMask, pVecPassthru);
-+#endif
-     }
- 
-     void Builder::SCATTER_PTR(Value* pVecDstPtr, Value* pVecSrc, Value* pVecMask)
-diff --git a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h
-index 429d5779a4db2a6a3b6c7a7d02169773c935bb95..6682ad892b4038d4b3172b932a34e31a89cd7790 100644
---- a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h
-+++ b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h
-@@ -82,10 +82,7 @@ virtual CallInst* MASKED_LOAD(Value*         Ptr,
-                               Value*         PassThru = nullptr,
-                               const Twine&   Name     = "",
-                               Type*          Ty       = nullptr,
--                              MEM_CLIENT usage    = MEM_CLIENT::MEM_CLIENT_INTERNAL)
--{
--    return IRB()->CreateMaskedLoad(Ptr, AlignType(Align), Mask, PassThru, Name);
--}
-+                              MEM_CLIENT usage    = MEM_CLIENT::MEM_CLIENT_INTERNAL);
- 
- virtual StoreInst* STORE(Value *Val, Value *Ptr, bool isVolatile = false, Type* Ty = nullptr, MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL)
- {
-diff --git a/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp b/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp
-index bd5f7588c9189275ddaf3075b0a75e2e8fc1ecf5..2a4cf74722bc9ef1831d25fe6c2bb2f510b8fceb 100644
---- a/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp
-+++ b/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp
-@@ -276,7 +276,8 @@ Function* FetchJit::Create(const FETCH_COMPILE_STATE& fetchState)
-     JitManager::DumpToFile(fetch, "src");
- 
- #if defined(_DEBUG)
--    verifyFunction(*fetch);
-+    // Note that false is returned if there are no errors
-+    SWR_ASSERT(!verifyFunction(*fetch, &llvm::errs()));
- #endif
- 
-     ::FunctionPassManager setupPasses(JM()->mpCurrentModule);
-diff --git a/src/gallium/drivers/swr/swr_shader.cpp b/src/gallium/drivers/swr/swr_shader.cpp
-index 315036920fb3ad364d0039349e148c70e5ba1818..a643b46cd081c026b5a3558d22be557338d4f220 100644
---- a/src/gallium/drivers/swr/swr_shader.cpp
-+++ b/src/gallium/drivers/swr/swr_shader.cpp
-@@ -1557,8 +1557,10 @@ BuilderSWR::CompileGS(struct swr_context *ctx, swr_jit_gs_key &key)
-    AttributeSet attrSet = AttributeSet::get(
-       JM()->mContext, AttributeSet::FunctionIndex, attrBuilder);
-    pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet);
--#else
-+#elif LLVM_VERSION_MAJOR < 14
-    pFunction->addAttributes(AttributeList::FunctionIndex, attrBuilder);
-+#else
-+   pFunction->addFnAttrs(attrBuilder);
- #endif
- 
-    BasicBlock *block = BasicBlock::Create(JM()->mContext, "entry", pFunction);
-@@ -1785,8 +1787,10 @@ BuilderSWR::CompileTES(struct swr_context *ctx, swr_jit_tes_key &key)
-    AttributeSet attrSet = AttributeSet::get(
-       JM()->mContext, AttributeSet::FunctionIndex, attrBuilder);
-    pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet);
--#else
-+#elif LLVM_VERSION_MAJOR < 14
-    pFunction->addAttributes(AttributeList::FunctionIndex, attrBuilder);
-+#else
-+   pFunction->addFnAttrs(attrBuilder);
- #endif
- 
-    BasicBlock *block = BasicBlock::Create(JM()->mContext, "entry", pFunction);
-@@ -2086,8 +2090,10 @@ BuilderSWR::CompileTCS(struct swr_context *ctx, swr_jit_tcs_key &key)
-    AttributeSet attrSet = AttributeSet::get(
-       JM()->mContext, AttributeSet::FunctionIndex, attrBuilder);
-    pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet);
--#else
-+#elif LLVM_VERSION_MAJOR < 14
-    pFunction->addAttributes(AttributeList::FunctionIndex, attrBuilder);
-+#else
-+   pFunction->addFnAttrs(attrBuilder);
- #endif
- 
-    BasicBlock *block = BasicBlock::Create(JM()->mContext, "entry", pFunction);
-@@ -2341,8 +2347,10 @@ BuilderSWR::CompileVS(struct swr_context *ctx, swr_jit_vs_key &key)
-    AttributeSet attrSet = AttributeSet::get(
-       JM()->mContext, AttributeSet::FunctionIndex, attrBuilder);
-    pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet);
--#else
-+#elif LLVM_VERSION_MAJOR < 14
-    pFunction->addAttributes(AttributeList::FunctionIndex, attrBuilder);
-+#else
-+   pFunction->addFnAttrs(attrBuilder);
- #endif
- 
-    BasicBlock *block = BasicBlock::Create(JM()->mContext, "entry", pFunction);
-@@ -2646,8 +2654,10 @@ BuilderSWR::CompileFS(struct swr_context *ctx, swr_jit_fs_key &key)
-    AttributeSet attrSet = AttributeSet::get(
-       JM()->mContext, AttributeSet::FunctionIndex, attrBuilder);
-    pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet);
--#else
-+#elif LLVM_VERSION_MAJOR < 14
-    pFunction->addAttributes(AttributeList::FunctionIndex, attrBuilder);
-+#else
-+   pFunction->addFnAttrs(attrBuilder);
- #endif
- 
-    BasicBlock *block = BasicBlock::Create(JM()->mContext, "entry", pFunction);
-
diff --git a/Golden_Repo/o/OpenImageDenoise/OpenImageDenoise-1.4.2-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/o/OpenImageDenoise/OpenImageDenoise-1.4.2-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index 7360d6bea..000000000
--- a/Golden_Repo/o/OpenImageDenoise/OpenImageDenoise-1.4.2-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,39 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'OpenImageDenoise'
-version = '1.4.2'
-
-homepage = 'https://www.openimagedenoise.org/'
-description = """
-Intel Open Image Denoise is an open source library of high-performance,
-high-quality denoising filters for images rendered with ray tracing.
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/OpenImageDenoise/oidn/releases/download/v%(version)s/']
-sources = ['oidn-%(version)s.src.tar.gz']
-checksums = ['e70d27ce24b41364782376c1b3b4f074f77310ccfe5f8ffec4a13a347e48a0ea']
-
-builddependencies = [
-    ('ispc', '1.16.1', '', SYSTEM),
-    ('CMake', '3.21.1', '', SYSTEM),
-    ('Python', '3.9.6'),
-]
-
-dependencies = [
-    ('tbb', '2020.3'),
-]
-
-separate_build_dir = True
-start_dir = 'oidn-%(version)s'
-
-configopts = '-DOIDN_APPS:BOOL=OFF '
-
-sanity_check_paths = {
-    'dirs': ['include/OpenImageDenoise'],
-    'files': ['lib/libOpenImageDenoise.so'],
-}
-
-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
deleted file mode 100644
index ad834747c..000000000
--- a/Golden_Repo/o/OpenJPEG/OpenJPEG-2.4.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,43 +0,0 @@
-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-settings/OpenMPI-settings-4.1-plain.eb b/Golden_Repo/o/OpenMPI-settings/OpenMPI-settings-4.1-plain.eb
deleted file mode 100644
index b2e1cc5b8..000000000
--- a/Golden_Repo/o/OpenMPI-settings/OpenMPI-settings-4.1-plain.eb
+++ /dev/null
@@ -1,42 +0,0 @@
-easyblock = 'SystemBundle'
-
-name = 'OpenMPI-settings'
-version = '4.1'
-versionsuffix = 'plain'
-
-homepage = ''
-description = 'This module loads the default OpenMPI configuration. It relies on UCX.'
-
-site_contacts = 'd.alvarez@fz-juelich.de'
-
-toolchain = SYSTEM
-
-source_urls = []
-
-sources = []
-modextravars = {
-    'SLURM_MPI_TYPE': 'pspmix',
-    'OMPI_MCA_mca_base_component_show_load_errors': '1',
-    'OMPI_MCA_mpi_param_check': '1',
-    'OMPI_MCA_mpi_show_handle_leaks': '1',
-    'OMPI_MCA_mpi_warn_on_fork': '1',
-    # Disable uct for the time being due to:
-    # https://github.com/openucx/ucx/wiki/OpenMPI-and-OpenSHMEM-installation-with-UCX#running-open-mpi-with-ucx
-    # Also openib, since it is deprecated and should be substituted by the UCX support in the pml
-    'OMPI_MCA_btl': '^uct,openib',
-    'OMPI_MCA_btl_openib_allow_ib': '1',
-    'OMPI_MCA_bml_r2_show_unreach_errors': '0',
-    'OMPI_MCA_coll': '^ml',
-    'OMPI_MCA_coll_hcoll_enable': '1',
-    'OMPI_MCA_coll_hcoll_np': '0',
-    'OMPI_MCA_pml': 'ucx',
-    'OMPI_MCA_osc': '^rdma',
-    'OMPI_MCA_opal_abort_print_stack': '1',
-    'OMPI_MCA_opal_set_max_sys_limits': '1',
-    'OMPI_MCA_opal_event_include': 'epoll',
-    'OMPI_MCA_btl_openib_warn_default_gid_prefix': '0',
-    # OMPIO does not seem to work reliably on our system
-    'OMPI_MCA_io': 'romio321',
-}
-
-moduleclass = 'system'
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
deleted file mode 100644
index a5fbbe15c..000000000
--- a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb
+++ /dev/null
@@ -1,61 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'OpenMPI'
-version = '4.1.1'
-
-homepage = 'https://www.open-mpi.org/'
-description = """The Open MPI Project is an open source MPI-3 implementation."""
-
-toolchain = {'name': 'GCC', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [
-    'https://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
-sources = [SOURCELOWER_TAR_BZ2]
-checksums = ['e24f7a778bd11a71ad0c14587a7f5b00e68a71aa5623e2157bafee3d44c07cda']
-
-osdependencies = [
-    # needed for --with-verbs
-    ('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel'),
-    # needed for --with-pmix
-    ('pmix-devel'),
-]
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('hwloc', '2.5.0'),
-    ('UCX', '1.11.2', '', SYSTEM),
-    ('CUDA', '11.5', '', SYSTEM),
-    ('libevent', '2.1.12'),
-]
-
-configopts = '--enable-shared '
-configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
-configopts += '--with-ucx=$EBROOTUCX '
-configopts += '--with-verbs '
-configopts += '--with-libevent=$EBROOTLIBEVENT '
-configopts += '--without-orte '
-configopts += '--without-psm2 '
-configopts += '--disable-oshmem '
-configopts += '--with-cuda=$EBROOTCUDA '
-configopts += '--with-ime=/opt/ddn/ime '
-configopts += '--with-gpfs '
-
-# to enable SLURM integration (site-specific)
-configopts += '--with-slurm --with-pmix=external --with-libevent=external --with-ompi-pmix-rte'
-
-local_libs = ["mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte"]
-sanity_check_paths = {
-    'files': ["bin/%s" % local_binfile for local_binfile in ["ompi_info", "opal_wrapper"]] +
-             ["lib/lib%s.%s" % (local_libfile, SHLIB_EXT) for local_libfile in local_libs] +
-             ["include/%s.h" % x for x in ["mpi-ext", "mpif-config",
-                                           "mpif", "mpi", "mpi_portable_platform"]],
-    'dirs': [],
-}
-
-moduleclass = 'mpi'
diff --git a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-intel-compilers-2021.4.0.eb b/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-intel-compilers-2021.4.0.eb
deleted file mode 100644
index 794e25c32..000000000
--- a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-intel-compilers-2021.4.0.eb
+++ /dev/null
@@ -1,61 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'OpenMPI'
-version = '4.1.1'
-
-homepage = 'https://www.open-mpi.org/'
-description = """The Open MPI Project is an open source MPI-3 implementation."""
-
-toolchain = {'name': 'intel-compilers', 'version': '2021.4.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [
-    'https://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
-sources = [SOURCELOWER_TAR_BZ2]
-checksums = ['e24f7a778bd11a71ad0c14587a7f5b00e68a71aa5623e2157bafee3d44c07cda']
-
-osdependencies = [
-    # needed for --with-verbs
-    ('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel'),
-    # needed for --with-pmix
-    ('pmix-devel'),
-]
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('hwloc', '2.5.0'),
-    ('UCX', '1.11.2', '', SYSTEM),
-    ('CUDA', '11.5', '', SYSTEM),
-    ('libevent', '2.1.12'),
-]
-
-configopts = '--enable-shared '
-configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
-configopts += '--with-ucx=$EBROOTUCX '
-configopts += '--with-verbs '
-configopts += '--with-libevent=$EBROOTLIBEVENT '
-configopts += '--without-orte '
-configopts += '--without-psm2 '
-configopts += '--disable-oshmem '
-configopts += '--with-cuda=$EBROOTCUDA '
-configopts += '--with-ime=/opt/ddn/ime '
-configopts += '--with-gpfs '
-
-# to enable SLURM integration (site-specific)
-configopts += '--with-slurm --with-pmix=external --with-libevent=external --with-ompi-pmix-rte'
-
-local_libs = ["mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte"]
-sanity_check_paths = {
-    'files': ["bin/%s" % local_binfile for local_binfile in ["ompi_info", "opal_wrapper"]] +
-             ["lib/lib%s.%s" % (local_libfile, SHLIB_EXT) for local_libfile in local_libs] +
-             ["include/%s.h" % x for x in ["mpi-ext", "mpif-config",
-                                           "mpif", "mpi", "mpi_portable_platform"]],
-    'dirs': [],
-}
-
-moduleclass = 'mpi'
diff --git a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.2-GCC-11.2.0.eb b/Golden_Repo/o/OpenMPI/OpenMPI-4.1.2-GCC-11.2.0.eb
deleted file mode 100644
index a1495b7f5..000000000
--- a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.2-GCC-11.2.0.eb
+++ /dev/null
@@ -1,61 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'OpenMPI'
-version = '4.1.2'
-
-homepage = 'https://www.open-mpi.org/'
-description = """The Open MPI Project is an open source MPI-3 implementation."""
-
-toolchain = {'name': 'GCC', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [
-    'https://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
-sources = [SOURCELOWER_TAR_BZ2]
-checksums = ['9b78c7cf7fc32131c5cf43dd2ab9740149d9d87cadb2e2189f02685749a6b527']
-
-osdependencies = [
-    # needed for --with-verbs
-    ('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel'),
-    # needed for --with-pmix
-    ('pmix-devel'),
-]
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('hwloc', '2.5.0'),
-    ('UCX', '1.11.2', '', SYSTEM),
-    ('CUDA', '11.5', '', SYSTEM),
-    ('libevent', '2.1.12'),
-]
-
-configopts = '--enable-shared '
-configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
-configopts += '--with-ucx=$EBROOTUCX '
-configopts += '--with-verbs '
-configopts += '--with-libevent=$EBROOTLIBEVENT '
-configopts += '--without-orte '
-configopts += '--without-psm2 '
-configopts += '--disable-oshmem '
-configopts += '--with-cuda=$EBROOTCUDA '
-configopts += '--with-ime=/opt/ddn/ime '
-configopts += '--with-gpfs '
-
-# to enable SLURM integration (site-specific)
-configopts += '--with-slurm --with-pmix=external --with-libevent=external --with-ompi-pmix-rte'
-
-local_libs = ["mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte"]
-sanity_check_paths = {
-    'files': ["bin/%s" % local_binfile for local_binfile in ["ompi_info", "opal_wrapper"]] +
-             ["lib/lib%s.%s" % (local_libfile, SHLIB_EXT) for local_libfile in local_libs] +
-             ["include/%s.h" % x for x in ["mpi-ext", "mpif-config",
-                                           "mpif", "mpi", "mpi_portable_platform"]],
-    'dirs': [],
-}
-
-moduleclass = 'mpi'
diff --git a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.2-NVHPC-22.1.eb b/Golden_Repo/o/OpenMPI/OpenMPI-4.1.2-NVHPC-22.1.eb
deleted file mode 100644
index c0a192ba3..000000000
--- a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.2-NVHPC-22.1.eb
+++ /dev/null
@@ -1,61 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'OpenMPI'
-version = '4.1.2'
-
-homepage = 'https://www.open-mpi.org/'
-description = """The Open MPI Project is an open source MPI-3 implementation."""
-
-toolchain = {'name': 'NVHPC', 'version': '22.1'}
-toolchainopts = {'pic': True}
-
-source_urls = [
-    'https://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
-sources = [SOURCELOWER_TAR_BZ2]
-checksums = ['9b78c7cf7fc32131c5cf43dd2ab9740149d9d87cadb2e2189f02685749a6b527']
-
-osdependencies = [
-    # needed for --with-verbs
-    ('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel'),
-    # needed for --with-pmix
-    ('pmix-devel'),
-]
-
-builddependencies = [
-    ('Autotools', '20210726', '', SYSTEM),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('hwloc', '2.5.0'),
-    ('UCX', '1.11.2', '', SYSTEM),
-    ('CUDA', '11.5', '', SYSTEM),
-    ('libevent', '2.1.12'),
-]
-
-configopts = '--enable-shared '
-configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
-configopts += '--with-ucx=$EBROOTUCX '
-configopts += '--with-verbs '
-configopts += '--with-libevent=$EBROOTLIBEVENT '
-configopts += '--without-orte '
-configopts += '--without-psm2 '
-configopts += '--disable-oshmem '
-configopts += '--with-cuda=$EBROOTCUDA '
-configopts += '--with-ime=/opt/ddn/ime '
-configopts += '--with-gpfs '
-
-# to enable SLURM integration (site-specific)
-configopts += '--with-slurm --with-pmix=external --with-libevent=external --with-ompi-pmix-rte'
-
-local_libs = ["mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte"]
-sanity_check_paths = {
-    'files': ["bin/%s" % local_binfile for local_binfile in ["ompi_info", "opal_wrapper"]] +
-             ["lib/lib%s.%s" % (local_libfile, SHLIB_EXT) for local_libfile in local_libs] +
-             ["include/%s.h" % x for x in ["mpi-ext", "mpif-config",
-                                           "mpif", "mpi", "mpi_portable_platform"]],
-    'dirs': [],
-}
-
-moduleclass = 'mpi'
diff --git a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.2-intel-compilers-2021.4.0.eb b/Golden_Repo/o/OpenMPI/OpenMPI-4.1.2-intel-compilers-2021.4.0.eb
deleted file mode 100644
index 5e6c33537..000000000
--- a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.2-intel-compilers-2021.4.0.eb
+++ /dev/null
@@ -1,61 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'OpenMPI'
-version = '4.1.2'
-
-homepage = 'https://www.open-mpi.org/'
-description = """The Open MPI Project is an open source MPI-3 implementation."""
-
-toolchain = {'name': 'intel-compilers', 'version': '2021.4.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [
-    'https://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
-sources = [SOURCELOWER_TAR_BZ2]
-checksums = ['9b78c7cf7fc32131c5cf43dd2ab9740149d9d87cadb2e2189f02685749a6b527']
-
-osdependencies = [
-    # needed for --with-verbs
-    ('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel'),
-    # needed for --with-pmix
-    ('pmix-devel'),
-]
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('hwloc', '2.5.0'),
-    ('UCX', '1.11.2', '', SYSTEM),
-    ('CUDA', '11.5', '', SYSTEM),
-    ('libevent', '2.1.12'),
-]
-
-configopts = '--enable-shared '
-configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
-configopts += '--with-ucx=$EBROOTUCX '
-configopts += '--with-verbs '
-configopts += '--with-libevent=$EBROOTLIBEVENT '
-configopts += '--without-orte '
-configopts += '--without-psm2 '
-configopts += '--disable-oshmem '
-configopts += '--with-cuda=$EBROOTCUDA '
-configopts += '--with-ime=/opt/ddn/ime '
-configopts += '--with-gpfs '
-
-# to enable SLURM integration (site-specific)
-configopts += '--with-slurm --with-pmix=external --with-libevent=external --with-ompi-pmix-rte'
-
-local_libs = ["mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte"]
-sanity_check_paths = {
-    'files': ["bin/%s" % local_binfile for local_binfile in ["ompi_info", "opal_wrapper"]] +
-             ["lib/lib%s.%s" % (local_libfile, SHLIB_EXT) for local_libfile in local_libs] +
-             ["include/%s.h" % x for x in ["mpi-ext", "mpif-config",
-                                           "mpif", "mpi", "mpi_portable_platform"]],
-    'dirs': [],
-}
-
-moduleclass = 'mpi'
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
deleted file mode 100644
index 9f0c766e8..000000000
--- a/Golden_Repo/o/OpenPGM/OpenPGM-5.2.122-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,49 +0,0 @@
-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/o/OpenSSL/OpenSSL-1.1.eb b/Golden_Repo/o/OpenSSL/OpenSSL-1.1.eb
deleted file mode 100644
index 6e5337f36..000000000
--- a/Golden_Repo/o/OpenSSL/OpenSSL-1.1.eb
+++ /dev/null
@@ -1,39 +0,0 @@
-easyblock = 'EB_OpenSSL_wrapper'
-
-name = 'OpenSSL'
-version = '1.1'
-minimum_openssl_version = '1.1.1'
-
-homepage = 'https://www.openssl.org/'
-description = """The OpenSSL Project is a collaborative effort to develop a robust, commercial-grade, full-featured,
-and Open Source toolchain implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) 
-protocols as well as a full-strength general purpose cryptography library. """
-
-site_contacts = 'sc@fz-juelich.de'
-
-toolchain = SYSTEM
-toolchainopts = {'pic': True}
-
-osdependencies = ['perl']
-
-# This easyconfig will wrap the OpenSSL installation in the host system.
-# If the system provides the required binary, header files, and libraries for
-# this version of OpenSSL, the installation directory of this module will be
-# populated with symlinks to the system files. The minimum required version of
-# OpenSSL can be finely controled with 'minimum_openssl_version' (defaults to
-# easyconfig version).
-# If the host system does not have this version of OpenSSL (or with the option
-# wrap_system_openssl = False), EasyBuild will fall back to the following
-# component list, which will be build and installed as usual.
-
-components = [
-    (name, '1.1.1k', {
-        'easyblock': 'EB_OpenSSL',
-        'source_urls': ['https://www.openssl.org/source/'],
-        'sources': [SOURCELOWER_TAR_GZ],
-        'checksums': ['892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5'],
-        'start_dir': '%(namelower)s-%(version)s',
-    }),
-]
-
-moduleclass = 'system'
diff --git a/Golden_Repo/o/OpenSlide/OpenSlide-3.4.1-GCCcore-11.2.0.eb b/Golden_Repo/o/OpenSlide/OpenSlide-3.4.1-GCCcore-11.2.0.eb
deleted file mode 100644
index c95b41d41..000000000
--- a/Golden_Repo/o/OpenSlide/OpenSlide-3.4.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,45 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'OpenSlide'
-version = '3.4.1'
-
-homepage = 'https://openslide.org/'
-description = """OpenSlide is a C library that provides a simple interface to
-read whole-slide images (also known as virtual slides)."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://github.com/openslide/openslide/archive']
-sources = ['v%(version)s.tar.gz']
-checksums = ['a5d869916e370125421535dcce778b2ba625dc50d920aa4ca93bbaaa6a7b470c']
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('M4', '1.4.19'),
-    ('pkg-config', '0.29.2'),
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('libpng', '1.6.37'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('LibTIFF', '4.3.0'),
-    ('OpenJPEG', '2.4.0'),
-    ('libxml2', '2.9.10'),
-    ('SQLite', '3.36'),
-    ('cairo', '1.16.0'),
-    ('Gdk-Pixbuf', '2.42.6'),
-]
-
-preconfigopts = 'autoreconf -f -i && '
-
-sanity_check_paths = {
-    'files': ['bin/openslide-quickhash1sum', 'bin/openslide-show-properties', 'bin/openslide-write-png',
-              'lib/libopenslide.la', 'lib/libopenslide.%s' % SHLIB_EXT],
-    'dirs': ['include/openslide']
-}
-
-sanity_check_commands = ['openslide-show-properties --help']
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/o/OpenStackClient/OpenStackClient-5.8.0-GCCcore-11.2.0.eb b/Golden_Repo/o/OpenStackClient/OpenStackClient-5.8.0-GCCcore-11.2.0.eb
deleted file mode 100644
index e590dd730..000000000
--- a/Golden_Repo/o/OpenStackClient/OpenStackClient-5.8.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,133 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'OpenStackClient'
-version = '5.8.0'
-
-homepage = 'https://docs.openstack.org/python-openstackclient/latest/'
-description = """OpenStackClient (aka OSC) is a command-line client for OpenStack that brings the
-command set for Compute, Identity, Image, Network, Object Store and Block       
-Storage APIs together in a single shell with a uniform command structure."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-dependencies = [
-    ('Python', '3.9.6'),
-    ('PyYAML', '5.4.1'),
-    ('typing-extensions', '3.10.0.2'),
-]
-builddependencies = [('binutils', '2.37')]
-
-exts_default_options = {
-    'use_pip': True,
-}
-exts_list = [
-    ('pyperclip', '1.8.2', {
-        'checksums': ['105254a8b04934f0bc84e9c24eb360a591aaf6535c9def5f29d92af107a9bf57'],
-    }),
-    ('importlib_metadata', '4.11.4', {
-        'checksums': ['5d26852efe48c0a32b0509ffbc583fda1a2266545a78d104a6f4aff3db17d700'],
-    }),
-    ('cmd2', '2.4.1', {
-        'checksums': ['f3b0467daca18fca0dc7838de7726a72ab64127a018a377a86a6ed8ebfdbb25f'],
-    }),
-    ('charset-normalizer', '2.0.12', {
-        'checksums': ['2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597'],
-    }),
-    ('jsonpointer', '2.3', {
-        'checksums': ['97cba51526c829282218feb99dab1b1e6bdf8efd1c43dc9d57be093c0d69c99a'],
-    }),
-    ('prettytable', '3.3.0', {
-        'checksums': ['118eb54fd2794049b810893653b20952349df6d3bc1764e7facd8a18064fa9b0'],
-    }),
-    ('autopage', '0.5.0', {
-        'checksums': ['5305b43cc0798170d7124e5a2feecf969e45f4a0baf75cb351138114eaf76b83'],
-    }),
-    ('stevedore', '3.5.0', {
-        'checksums': ['f40253887d8712eaa2bb0ea3830374416736dc8ec0e22f5a65092c1174c44335'],
-    }),
-    ('cliff', '3.10.1', {
-        'checksums': ['045aee3f3c64471965d7ad507ce8474a4e2f20815fbb5405a770f8596a2a00a0'],
-    }),
-    ('dogpile.cache', '1.1.5', {
-        'checksums': ['0f01bdc329329a8289af9705ff40fadb1f82a28c336f3174e12142b70d31c756'],
-    }),
-    ('iso8601', '1.0.2', {
-        'checksums': ['27f503220e6845d9db954fb212b95b0362d8b7e6c1b2326a87061c3de93594b1'],
-    }),
-    ('jmespath', '1.0.0', {
-        'checksums': ['a490e280edd1f57d6de88636992d05b71e97d69a26a19f058ecf7d304474bf5e'],
-    }),
-    ('jsonpatch', '1.32', {
-        'checksums': ['b6ddfe6c3db30d81a96aaeceb6baf916094ffa23d7dd5fa2c13e13f8b6e600c2'],
-    }),
-    ('os-service-types', '1.7.0', {
-        'checksums': ['31800299a82239363995b91f1ebf9106ac7758542a1e4ef6dc737a5932878c6c'],
-    }),
-    ('keystoneauth1', '4.6.0', {
-        'checksums': ['066f1addd89114cd6a1b9cb3555c8eaa7d013673ee1034bdfe506068804a9e05'],
-    }),
-    ('munch', '2.5.0', {
-        'checksums': ['2d735f6f24d4dba3417fa448cae40c6e896ec1fdab6cdb5e6510999758a4dbd2'],
-    }),
-    ('requestsexceptions', '1.4.0', {
-        'checksums': ['b095cbc77618f066d459a02b137b020c37da9f46d9b057704019c9f77dba3065'],
-    }),
-    ('openstacksdk', '0.99.0', {
-        'modulename': 'openstack',
-        'checksums': ['3f73c3cc28089e93b342eb7f348b285f5a65ffe505898be15db250c75bb855eb'],
-    }),
-    ('oslo.i18n', '5.1.0', {
-        'modulename': 'oslo_i18n',
-        'checksums': ['6bf111a6357d5449640852de4640eae4159b5562bbba4c90febb0034abc095d0'],
-    }),
-    ('wrapt', '1.14.1', {
-        'checksums': ['380a85cf89e0e69b7cfbe2ea9f765f004ff419f34194018a6827ac0e3edfed4d'],
-    }),
-    ('debtcollector', '2.5.0', {
-        'checksums': ['dc9d1ad3f745c43f4bbedbca30f9ffe8905a8c028c9926e61077847d5ea257ab'],
-    }),
-    ('oslo.utils', '4.13.0', {
-        'modulename': 'oslo_utils',
-        'checksums': ['45ba8aaa5ed056a8e8e46059ef93d5c2d7b9c99bc7480e361cf5783e47f28fba'],
-    }),
-    ('osc-lib', '2.6.0', {
-        'checksums': ['854eabb14ad3480f4cdc63a55944e0ce2d9cc4ce2683cdfddadcd149821e67ab'],
-    }),
-    ('oslo.serialization', '4.3.0', {
-        'modulename': 'oslo_serialization',
-        'checksums': ['3aa472f434aee8bbcc0725312b7f409aa1fa54bbc134904124cf49b0e86b9115'],
-    }),
-    ('rfc3986', '2.0.0', {
-        'checksums': ['97aacf9dbd4bfd829baad6e6309fa6573aaf1be3f6fa735c8ab05e46cecb261c'],
-    }),
-    ('oslo.config', '8.8.0', {
-        'modulename': 'oslo_config',
-        'checksums': ['96933d3011dae15608a11616bfb00d947e22da3cb09b6ff37ddd7576abd4764c'],
-    }),
-    ('python-novaclient', '18.0.0', {
-        'modulename': 'novaclient',
-        'checksums': ['e9eb2a9bdba464d820c100775c3c2f6493088df66af13dfb9325cc6b865c8d23'],
-    }),
-    ('python-keystoneclient', '4.5.0', {
-        'modulename': 'keystoneclient',
-        'checksums': ['6d7f05c692e7db2692778284c779ae6cea8b2159914b4417a5fa0bfea1e29cdc'],
-    }),
-    ('python-cinderclient', '8.3.0', {
-        'modulename': 'cinderclient',
-        'checksums': ['e00103875029dc85cbb59131d00ccc8534f692956acde32b5a3cc5af4c24580b'],
-    }),
-    ('python-openstackclient', version, {
-        'modulename': 'openstackclient',
-        'checksums': ['334852df8897b95f0581ec12ee287de8c7a9289a208a18f0a8b38777019fd986'],
-    }),
-]
-
-sanity_pip_check = True
-enhance_sanity_check = True
-sanity_check_commands = ['openstack -h']
-
-sanity_check_paths = {
-    'files': ['bin/openstack'],
-    'dirs': ["bin", 'lib/python%(pyshortver)s/site-packages']
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/o/OptiX/OptiX-6.5.0.eb b/Golden_Repo/o/OptiX/OptiX-6.5.0.eb
deleted file mode 100644
index 77618d08b..000000000
--- a/Golden_Repo/o/OptiX/OptiX-6.5.0.eb
+++ /dev/null
@@ -1,31 +0,0 @@
-##
-# Author:    Robert Mijakovic <robert.mijakovic@lxp.lu>
-##
-easyblock = 'Binary'
-
-name = 'OptiX'
-version = '6.5.0'
-
-homepage = 'https://developer.nvidia.com/optix'
-description = """OptiX is NVIDIA SDK for easy ray tracing performance.
- It provides a simple framework for accessing the GPU’s massive ray tracing
- power using state-of-the-art GPU algorithms."""
-
-toolchain = SYSTEM
-
-# Registration required. Download links:
-# https://developer.nvidia.com/designworks/optix/download
-# https://developer.nvidia.com/designworks/optix/downloads/legacy
-sources = ['NVIDIA-OptiX-SDK-%(version)s-linux64.sh']
-checksums = ['eca09e617a267e18403ecccc715c5bc3a88729b81589a828fcb696435100a62e']
-
-install_cmd = "./" + sources[0] + " --skip-license --prefix=%(installdir)s"
-
-sanity_check_paths = {
-    'files': ["include/optix.h", "include/optix_device.h"],
-    'dirs': []
-}
-
-modextravars = {'OPTIX_HOME': '%(installdir)s'}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/o/OptiX/OptiX-7.4.0.eb b/Golden_Repo/o/OptiX/OptiX-7.4.0.eb
deleted file mode 100644
index 46f64c309..000000000
--- a/Golden_Repo/o/OptiX/OptiX-7.4.0.eb
+++ /dev/null
@@ -1,31 +0,0 @@
-##
-# Author:    Robert Mijakovic <robert.mijakovic@lxp.lu>
-##
-easyblock = 'Binary'
-
-name = 'OptiX'
-version = '7.4.0'
-
-homepage = 'https://developer.nvidia.com/optix'
-description = """OptiX is NVIDIA SDK for easy ray tracing performance.
- It provides a simple framework for accessing the GPU’s massive ray tracing
- power using state-of-the-art GPU algorithms."""
-
-toolchain = SYSTEM
-
-# Registration required. Download links:
-# https://developer.nvidia.com/designworks/optix/download
-# https://developer.nvidia.com/designworks/optix/downloads/legacy
-sources = ['NVIDIA-OptiX-SDK-%(version)s-linux64-x86_64.sh']
-checksums = ['d5f17a50054d24db06e0fd789f79ba8a510efa780bfd940f0da1da9aff499ca0']
-
-install_cmd = "./" + sources[0] + " --skip-license --prefix=%(installdir)s"
-
-sanity_check_paths = {
-    'files': ["include/optix.h", "include/optix_device.h"],
-    'dirs': []
-}
-
-modextravars = {'OPTIX_HOME': '%(installdir)s'}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/o/openslide-python/openslide-python-1.2.0-GCCcore-11.2.0.eb b/Golden_Repo/o/openslide-python/openslide-python-1.2.0-GCCcore-11.2.0.eb
deleted file mode 100644
index d97d2a3d2..000000000
--- a/Golden_Repo/o/openslide-python/openslide-python-1.2.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,29 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'openslide-python'
-version = '1.2.0'
-
-homepage = 'https://github.com/openslide/openslide-python'
-description = "OpenSlide Python is a Python interface to the OpenSlide library."
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://github.com/openslide/openslide-python/archive']
-sources = ['v%(version)s.tar.gz']
-checksums = ['8162829d3d0ea44dd82602ced7390d9b10dd339337a58f17a8eb81a30bc0883b']
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('OpenSlide', '3.4.1'),
-    ('Pillow-SIMD', '8.3.1'),
-]
-
-use_pip = True
-download_dep_fail = True
-sanity_pip_check = True
-
-options = {'modulename': 'openslide'}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/o/openvkl/openvkl-1.1.0-GCC-11.2.0.eb b/Golden_Repo/o/openvkl/openvkl-1.1.0-GCC-11.2.0.eb
deleted file mode 100644
index a15c97029..000000000
--- a/Golden_Repo/o/openvkl/openvkl-1.1.0-GCC-11.2.0.eb
+++ /dev/null
@@ -1,43 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'openvkl'
-version = '1.1.0'
-
-homepage = 'http://www.openvkl.org/'
-description = """
-Intel® Open Volume Kernel Library (Intel® Open VKL) is a collection
-of high-performance volume computation kernels, developed at Intel.
-"""
-
-toolchain = {'name': 'GCC', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/openvkl/openvkl/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['d193c75a2c57acd764649215b244c432694a0169da374a9d769a81b02a9132e9']
-
-builddependencies = [
-    ('ispc', '1.16.1', '', SYSTEM),
-    ('CMake', '3.21.1', '', SYSTEM),
-]
-
-dependencies = [
-    ('tbb', '2020.3'),
-    ('Embree', '3.13.2'),
-    ('rkcommon', '1.8.0'),
-]
-
-separate_build_dir = True
-
-start_dir = '%(name)s-%(version)s'
-
-configopts = '-DBUILD_BENCHMARKS:BOOL=OFF '
-configopts += '-DBUILD_EXAMPLES:BOOL=OFF '
-configopts += '-DBUILD_TESTING:BOOL=OFF '
-
-sanity_check_paths = {
-    'dirs': ['include/openvkl'],
-    'files': ['lib/libopenvkl.so'],
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/p/PAPI/PAPI-6.0.0.1-GCCcore-11.2.0.eb b/Golden_Repo/p/PAPI/PAPI-6.0.0.1-GCCcore-11.2.0.eb
deleted file mode 100644
index 448668097..000000000
--- a/Golden_Repo/p/PAPI/PAPI-6.0.0.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,49 +0,0 @@
-##
-# Author:    Robert Mijakovic <robert.mijakovic@lxp.lu>
-##
-
-easyblock = 'ConfigureMake'
-
-name = 'PAPI'
-version = '6.0.0.1'
-
-homepage = 'https://icl.cs.utk.edu/projects/papi/'
-
-description = """
- PAPI provides the tool designer and application engineer with a consistent
- interface and methodology for use of the performance counter hardware found
- in most major microprocessors. PAPI enables software engineers to see, in near
- real time, the relation between software performance and processor events.
- In addition Component PAPI provides access to a collection of components
- that expose performance measurement opportunites across the hardware and
- software stack.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://icl.cs.utk.edu/projects/papi/downloads/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['3cd7ed50c65b0d21d66e46d0ba34cd171178af4bbf9d94e693915c1aca1e287f']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-start_dir = 'src'
-
-configopts = "--with-components=rapl "  # for energy measurements
-
-parallel = 1
-
-runtest = 'fulltest'
-
-sanity_check_paths = {
-    'files': ["bin/papi_%s" % x
-              for x in ["avail", "clockres", "command_line", "component_avail",
-                        "cost", "decode", "error_codes", "event_chooser",
-                        "mem_info", "multiplex_cost", "native_avail",
-                        "version", "xml_event_info"]],
-    'dirs': [],
-}
-
-moduleclass = 'perf'
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
deleted file mode 100644
index b20423ccc..000000000
--- a/Golden_Repo/p/PCRE/PCRE-8.45-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,45 +0,0 @@
-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
deleted file mode 100644
index 257c390e0..000000000
--- a/Golden_Repo/p/PCRE2/PCRE2-10.37-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,28 +0,0 @@
-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/PDT/PDT-3.25.1-GCCcore-11.2.0.eb b/Golden_Repo/p/PDT/PDT-3.25.1-GCCcore-11.2.0.eb
deleted file mode 100644
index d1110e1fb..000000000
--- a/Golden_Repo/p/PDT/PDT-3.25.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,40 +0,0 @@
-##
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-#
-# Copyright:: Copyright 2013-2018 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-#             Markus Geimer <m.geimer@fz-juelich.de>
-#             Christian Feld <c.feld@fz-juelich.de>
-# License::   3-clause BSD
-#
-# This work is based on experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-name = 'PDT'
-version = '3.25.1'
-
-homepage = 'http://www.cs.uoregon.edu/research/pdt/'
-description = """
-Program Database Toolkit (PDT) is a framework for analyzing source code
-written in several programming languages and for making rich program
-knowledge accessible to developers of static and dynamic analysis tools.
-PDT implements a standard program representation, the program database
-(PDB), that can be accessed in a uniform way through a class library
-supporting common PDB operations.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['http://tau.uoregon.edu/pdt_releases/']
-sources = ['pdtoolkit-%(version)s.tar.gz']
-checksums = [
-    '0b6f8a6b8769c181b2ae6cae7298f04b8e3e3d68066f598ed24574e19500bc97',  # pdtoolkit-3.25.1.tar.gz
-]
-
-builddependencies = [
-    # use same binutils version that was used when building GCCcore
-    ('binutils', '2.37'),
-]
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/p/PETSc/PETSc-3.16.3-gomkl-2021b.eb b/Golden_Repo/p/PETSc/PETSc-3.16.3-gomkl-2021b.eb
deleted file mode 100644
index c25307af1..000000000
--- a/Golden_Repo/p/PETSc/PETSc-3.16.3-gomkl-2021b.eb
+++ /dev/null
@@ -1,56 +0,0 @@
-name = "PETSc"
-version = "3.16.3"
-
-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/lib/petsc/conf/configure-hash.
-"""
-
-toolchain = {'name': 'gomkl', 'version': '2021b'}
-
-toolchainopts = {'usempi': True, 'pic': True}
-
-source_urls = ['http://ftp.mcs.anl.gov/pub/petsc/release-snapshots']
-sources = ['petsc-%s.tar.gz' % version]
-checksums = [
-    'eff44c7e7f12991dc7d2b627c477807a215ce16c2ce8a1c78aa8237ddacf6ca5',  # petsc-3.16.3.tar.gz
-]
-
-builddependencies = [
-    ('CMake', '3.21.1')
-]
-
-download_deps = [
-    'triangle',
-]
-
-dependencies = [
-    ('HDF5', '1.12.1'),
-    ('METIS', '5.1.0'),
-    ('ParMETIS', '4.0.3'),
-]
-
-download_deps_static = [
-    'hypre',
-    'spooles',
-    'superlu',
-    'superlu_dist',
-    'mumps',
-    'spai',
-    'chaco',
-    'sundials2',
-    'parms',
-]
-
-configopts = '--with-large-file-io --with-cxx-dialect=C++11 '
-
-shared_libs = 1
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/p/PETSc/PETSc-3.16.3-gpsmkl-2021b.eb b/Golden_Repo/p/PETSc/PETSc-3.16.3-gpsmkl-2021b.eb
deleted file mode 100644
index 5a5eca3e0..000000000
--- a/Golden_Repo/p/PETSc/PETSc-3.16.3-gpsmkl-2021b.eb
+++ /dev/null
@@ -1,56 +0,0 @@
-name = "PETSc"
-version = "3.16.3"
-
-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/lib/petsc/conf/configure-hash.
-"""
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-
-toolchainopts = {'usempi': True, 'pic': True}
-
-source_urls = ['http://ftp.mcs.anl.gov/pub/petsc/release-snapshots']
-sources = ['petsc-%s.tar.gz' % version]
-checksums = [
-    'eff44c7e7f12991dc7d2b627c477807a215ce16c2ce8a1c78aa8237ddacf6ca5',  # petsc-3.16.3.tar.gz
-]
-
-builddependencies = [
-    ('CMake', '3.21.1')
-]
-
-download_deps = [
-    'triangle',
-]
-
-dependencies = [
-    ('HDF5', '1.12.1'),
-    ('METIS', '5.1.0'),
-    ('ParMETIS', '4.0.3'),
-]
-
-download_deps_static = [
-    'hypre',
-    'spooles',
-    'superlu',
-    'superlu_dist',
-    'mumps',
-    'spai',
-    'chaco',
-    'sundials2',
-    'parms',
-]
-
-configopts = '--with-large-file-io --with-cxx-dialect=C++11 '
-
-shared_libs = 1
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/p/PETSc/petsc4py-3.16.3-gomkl-2021b-Python-3.9.6.eb b/Golden_Repo/p/PETSc/petsc4py-3.16.3-gomkl-2021b-Python-3.9.6.eb
deleted file mode 100644
index ceda2e0d6..000000000
--- a/Golden_Repo/p/PETSc/petsc4py-3.16.3-gomkl-2021b-Python-3.9.6.eb
+++ /dev/null
@@ -1,29 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'petsc4py'
-version = '3.16.3'
-versionsuffix = '-Python-%(pyver)s'
-
-homepage = 'https://bitbucket.org/petsc/petsc4py'
-description = "petsc4py are Python bindings for PETSc, the Portable, Extensible Toolchain for Scientific Computation."
-
-toolchain = {'name': 'gomkl', 'version': '2021b'}
-
-source_urls = [PYPI_SOURCE]
-sources = [SOURCE_TAR_GZ]
-checksums = ['10e730d50716e40de55b200ff53b461bc4f3fcc798ba89b74dfe6bdf63fa7b6e']
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-Stack', '2021b', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('PETSc', '3.16.3'),
-]
-
-download_dep_fail = True
-
-sanity_check_paths = {
-    'files': [],
-    'dirs': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/p/PETSc/petsc4py-3.16.3-gspmkl-2021b-Python-3.9.6.eb b/Golden_Repo/p/PETSc/petsc4py-3.16.3-gspmkl-2021b-Python-3.9.6.eb
deleted file mode 100644
index f80cb5f53..000000000
--- a/Golden_Repo/p/PETSc/petsc4py-3.16.3-gspmkl-2021b-Python-3.9.6.eb
+++ /dev/null
@@ -1,29 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'petsc4py'
-version = '3.16.3'
-versionsuffix = '-Python-%(pyver)s'
-
-homepage = 'https://bitbucket.org/petsc/petsc4py'
-description = "petsc4py are Python bindings for PETSc, the Portable, Extensible Toolchain for Scientific Computation."
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-
-source_urls = [PYPI_SOURCE]
-sources = [SOURCE_TAR_GZ]
-checksums = ['10e730d50716e40de55b200ff53b461bc4f3fcc798ba89b74dfe6bdf63fa7b6e']
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-Stack', '2021b', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('PETSc', '3.16.3'),
-]
-
-download_dep_fail = True
-
-sanity_check_paths = {
-    'files': [],
-    'dirs': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/p/PLUMED/PLUMED-2.7.2-gpsmkl-2021b.eb b/Golden_Repo/p/PLUMED/PLUMED-2.7.2-gpsmkl-2021b.eb
deleted file mode 100644
index 78ba66281..000000000
--- a/Golden_Repo/p/PLUMED/PLUMED-2.7.2-gpsmkl-2021b.eb
+++ /dev/null
@@ -1,43 +0,0 @@
-# by Ward Poelmans <wpoely86@gmail.com>
-
-easyblock = 'ConfigureMake'
-
-name = 'PLUMED'
-version = '2.7.2'
-
-homepage = 'http://www.plumed.org'
-description = """PLUMED is an open source library for free energy calculations in molecular systems which
- works together with some of the most popular molecular dynamics engines. Free energy calculations can be 
- performed as a function of many order parameters with a particular  focus on biological problems, using
- state of the art methods such as metadynamics, umbrella sampling and Jarzynski-equation based steered MD.
- The software, written in C++, can be easily interfaced with both fortran and C/C++ codes.
-"""
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-toolchainopts = {'usempi': 'True'}
-
-source_urls = ['https://github.com/plumed/plumed2/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['c9a31e68d6440828cf186ca43c9e11a5e5c7ad1c96b2b66ed5a5a141fc954373']
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('GSL', '2.7'),
-    ('libmatheval', '1.1.11'),
-]
-
-preconfigopts = 'env FC=$MPIF90 LIBS="$LIBLAPACK $LIBS" '
-configopts = ' --exec-prefix=%(installdir)s --enable-gsl --enable-modules=all'
-prebuildopts = 'source sourceme.sh && '
-
-sanity_check_paths = {
-    'files': ['bin/plumed', 'lib/libplumedKernel.%s' % SHLIB_EXT, 'lib/libplumed.%s' % SHLIB_EXT],
-    'dirs': ['lib/plumed']
-}
-
-modextrapaths = {
-    'PLUMED_KERNEL': 'lib/libplumedKernel.%s' % SHLIB_EXT,
-    'PLUMED_ROOT': 'lib/plumed',
-}
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/p/PLUMED/PLUMED-2.7.2-intel-para-2021b.eb b/Golden_Repo/p/PLUMED/PLUMED-2.7.2-intel-para-2021b.eb
deleted file mode 100644
index 872823a50..000000000
--- a/Golden_Repo/p/PLUMED/PLUMED-2.7.2-intel-para-2021b.eb
+++ /dev/null
@@ -1,43 +0,0 @@
-# by Ward Poelmans <wpoely86@gmail.com>
-
-easyblock = 'ConfigureMake'
-
-name = 'PLUMED'
-version = '2.7.2'
-
-homepage = 'http://www.plumed.org'
-description = """PLUMED is an open source library for free energy calculations in molecular systems which
- works together with some of the most popular molecular dynamics engines. Free energy calculations can be 
- performed as a function of many order parameters with a particular  focus on biological problems, using
- state of the art methods such as metadynamics, umbrella sampling and Jarzynski-equation based steered MD.
- The software, written in C++, can be easily interfaced with both fortran and C/C++ codes.
-"""
-
-toolchain = {'name': 'intel-para', 'version': '2021b'}
-toolchainopts = {'usempi': 'True'}
-
-source_urls = ['https://github.com/plumed/plumed2/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['c9a31e68d6440828cf186ca43c9e11a5e5c7ad1c96b2b66ed5a5a141fc954373']
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('GSL', '2.7'),
-    ('libmatheval', '1.1.11'),
-]
-
-preconfigopts = 'env FC=$MPIF90 LIBS="$LIBLAPACK $LIBS" '
-configopts = ' --exec-prefix=%(installdir)s --enable-gsl --enable-modules=all'
-prebuildopts = 'source sourceme.sh && '
-
-sanity_check_paths = {
-    'files': ['bin/plumed', 'lib/libplumedKernel.%s' % SHLIB_EXT, 'lib/libplumed.%s' % SHLIB_EXT],
-    'dirs': ['lib/plumed']
-}
-
-modextrapaths = {
-    'PLUMED_KERNEL': 'lib/libplumedKernel.%s' % SHLIB_EXT,
-    'PLUMED_ROOT': 'lib/plumed',
-}
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/p/PLUMED/PLUMED-2.7.2-iomkl-2021b.eb b/Golden_Repo/p/PLUMED/PLUMED-2.7.2-iomkl-2021b.eb
deleted file mode 100644
index 837eb7c27..000000000
--- a/Golden_Repo/p/PLUMED/PLUMED-2.7.2-iomkl-2021b.eb
+++ /dev/null
@@ -1,43 +0,0 @@
-# by Ward Poelmans <wpoely86@gmail.com>
-
-easyblock = 'ConfigureMake'
-
-name = 'PLUMED'
-version = '2.7.2'
-
-homepage = 'http://www.plumed.org'
-description = """PLUMED is an open source library for free energy calculations in molecular systems which
- works together with some of the most popular molecular dynamics engines. Free energy calculations can be 
- performed as a function of many order parameters with a particular  focus on biological problems, using
- state of the art methods such as metadynamics, umbrella sampling and Jarzynski-equation based steered MD.
- The software, written in C++, can be easily interfaced with both fortran and C/C++ codes.
-"""
-
-toolchain = {'name': 'iomkl', 'version': '2021b'}
-toolchainopts = {'usempi': 'True'}
-
-source_urls = ['https://github.com/plumed/plumed2/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['c9a31e68d6440828cf186ca43c9e11a5e5c7ad1c96b2b66ed5a5a141fc954373']
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('GSL', '2.7'),
-    ('libmatheval', '1.1.11'),
-]
-
-preconfigopts = 'env FC=$MPIF90 LIBS="$LIBLAPACK $LIBS" '
-configopts = ' --exec-prefix=%(installdir)s --enable-gsl --enable-modules=all'
-prebuildopts = 'source sourceme.sh && '
-
-sanity_check_paths = {
-    'files': ['bin/plumed', 'lib/libplumedKernel.%s' % SHLIB_EXT, 'lib/libplumed.%s' % SHLIB_EXT],
-    'dirs': ['lib/plumed']
-}
-
-modextrapaths = {
-    'PLUMED_KERNEL': 'lib/libplumedKernel.%s' % SHLIB_EXT,
-    'PLUMED_ROOT': 'lib/plumed',
-}
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/p/POV-Ray/POV-Ray-3.7.0.10-GCCcore-11.2.0.eb b/Golden_Repo/p/POV-Ray/POV-Ray-3.7.0.10-GCCcore-11.2.0.eb
deleted file mode 100644
index 3f5d4e7c0..000000000
--- a/Golden_Repo/p/POV-Ray/POV-Ray-3.7.0.10-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,64 +0,0 @@
-##
-# This file is an EasyBuild reciPY as per https://github.com/easybuilders/easybuild
-#
-# Copyright:: Copyright 2012-2014 Uni.Lu, NTUA
-# Authors::   Fotis Georgatos <fotis@cern.ch>
-# 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/
-##
-
-easyblock = 'ConfigureMake'
-
-name = 'POV-Ray'
-version = '3.7.0.10'
-
-homepage = 'https://www.povray.org/'
-description = """The Persistence of Vision Raytracer, or POV-Ray, is a ray tracing program
- which generates images from a text-based scene description, and is available for a variety
- of computer platforms. POV-Ray is a high-quality, Free Software tool for creating stunning
- three-dimensional graphics. The source code is available for those wanting to do their own ports."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/POV-Ray/povray/archive/']
-sources = ['v%(version)s.tar.gz']
-patches = ['POV-Ray-3.7.0.7_dont-touch-home.patch']
-checksums = [
-    '7bee83d9296b98b7956eb94210cf30aa5c1bbeada8ef6b93bb52228bbc83abff',  # v3.7.0.10.tar.gz
-    '45103afca808e279dcdee80194c65e2a760c76d011d351392a46e817b0b655f7',  # POV-Ray-3.7.0.7_dont-touch-home.patch
-]
-
-builddependencies = [
-    ('Autotools', '20210726'),
-]
-
-dependencies = [
-    ('Boost', '1.78.0'),
-    ('zlib', '1.2.11'),
-    ('libpng', '1.6.37'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('X11', '20210802'),
-    ('LibTIFF', '4.3.0'),
-    ('SDL2', '2.0.18', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-]
-
-preconfigopts = "cd unix && sed -i 's/^automake/automake --add-missing; automake/g' prebuild.sh && "
-preconfigopts += " ./prebuild.sh && cd .. && "
-configopts = "COMPILED_BY='EasyBuild' "
-configopts += "--with-boost=$EBROOTBOOST --with-zlib=$EBROOTZLIB --with-libpng=$EBROOTLIBPNG "
-configopts += "--with-libtiff=$EBROOTLIBTIFF --with-libjpeg=$EBROOTLIBJPEGMINTURBO --with-libsdl=$EBROOTSDL2 "
-configopts += "CXXFLAGS='-DBOOST_BIND_GLOBAL_PLACEHOLDERS ' "
-# configopts += " --with-libmkl=DIR " ## upstream needs to fix this, still in BETA
-
-runtest = 'check'
-
-sanity_check_paths = {
-    'files': ['bin/povray'],
-    'dirs': ['etc/povray/%(version_major_minor)s', 'share']
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/p/POV-Ray/POV-Ray-3.7.0.7_dont-touch-home.patch b/Golden_Repo/p/POV-Ray/POV-Ray-3.7.0.7_dont-touch-home.patch
deleted file mode 100644
index 097174a9e..000000000
--- a/Golden_Repo/p/POV-Ray/POV-Ray-3.7.0.7_dont-touch-home.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# Do not let povray do anything in the user home directory
-# wpoely86@gmail.com
-diff -ur povray-3.7.0.7.orig/unix/prebuild.sh povray-3.7.0.7/unix/prebuild.sh
---- povray-3.7.0.7.orig/unix/prebuild.sh	2018-01-05 10:06:48.000000000 +0100
-+++ povray-3.7.0.7/unix/prebuild.sh	2018-04-10 10:14:08.621514093 +0200
-@@ -641,19 +641,6 @@
- 	for f in \$\$filelist ; do \\
- 	  \$(INSTALL_DATA) \$(top_srcdir)/doc/\$\$f \$(DESTDIR)\$(povdocdir)/\$\$f && echo "\$(DESTDIR)\$(povdocdir)/\$\$f" >> \$(povinstall); \\
- 	done
--	@echo "Creating user directories..."; \\
--	for p in \$(povuser) \$(povconfuser) ; do \\
--	  \$(mkdir_p) \$\$p && chown \$(povowner) \$\$p && chgrp \$(povgroup) \$\$p && printf "%s\\n" "\$\$p" "\`cat \$(povinstall)\`" > \$(povinstall); \\
--	done
--	@echo "Copying user configuration and INI files..."; \\
--	for f in povray.conf povray.ini ; do \\
--	  if test -f \$(povconfuser)/\$\$f; then \\
--	    echo "Creating backup of \$(povconfuser)/\$\$f"; \\
--	    mv -f \$(povconfuser)/\$\$f \$(povconfuser)/\$\$f.bak; \\
--	  fi; \\
--	done; \\
--	\$(INSTALL_DATA) \$(top_srcdir)/povray.conf \$(povconfuser)/povray.conf && chown \$(povowner) \$(povconfuser)/povray.conf && chgrp \$(povgroup) \$(povconfuser)/povray.conf  && echo "\$(povconfuser)/povray.conf" >> \$(povinstall); \\
--	\$(INSTALL_DATA) \$(top_builddir)/povray.ini \$(povconfuser)/povray.ini && chown \$(povowner) \$(povconfuser)/povray.ini && chgrp \$(povgroup) \$(povconfuser)/povray.ini  && echo "\$(povconfuser)/povray.ini" >> \$(povinstall)
- 
- # Remove data, config, and empty folders for 'make uninstall'.
- # Use 'hook' instead of 'local' so as to properly remove *empty* folders (e.g. scripts).
diff --git a/Golden_Repo/p/PROJ/PROJ-8.1.0-GCCcore-11.2.0.eb b/Golden_Repo/p/PROJ/PROJ-8.1.0-GCCcore-11.2.0.eb
deleted file mode 100644
index 1349ced0d..000000000
--- a/Golden_Repo/p/PROJ/PROJ-8.1.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,41 +0,0 @@
-##
-# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
-#
-# Copyright:: Copyright 2014-2015 The Cyprus Institute
-# Authors:: Thekla Loizou <t.loizou@cyi.ac.cy>
-# License:: MIT/GPL
-#
-##
-easyblock = 'ConfigureMake'
-
-name = 'PROJ'
-version = '8.1.0'
-
-homepage = 'http://trac.osgeo.org/proj/'
-description = """Program proj is a standard Unix filter function which converts
-geographic longitude and latitude coordinates into cartesian coordinates
-"""
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['http://download.osgeo.org/proj/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['22c5cdc5aa0832077b16c95ebeec748a0942811c1c3438c33d43c8d2ead59f48']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('SQLite', '3.36'),
-    ('LibTIFF', '4.3.0'),
-    ('cURL', '7.78.0'),
-    ('pkg-config', '0.29.2'),
-]
-
-sanity_check_paths = {
-    'files': ['bin/cct', 'bin/cs2cs', 'bin/geod', 'bin/gie', 'bin/proj',
-              'bin/projinfo', 'lib/libproj.a', 'lib/libproj.%s' % SHLIB_EXT],
-    'dirs': ['include'],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/p/Pandoc/Pandoc-2.16.1.eb b/Golden_Repo/p/Pandoc/Pandoc-2.16.1.eb
deleted file mode 100644
index 423e23db2..000000000
--- a/Golden_Repo/p/Pandoc/Pandoc-2.16.1.eb
+++ /dev/null
@@ -1,22 +0,0 @@
-easyblock = 'Tarball'
-
-name = 'Pandoc'
-version = '2.16.1'
-
-homepage = 'http://pandoc.org'
-description = """
-If you need to convert files from one markup format into another,
-pandoc is your swiss-army knife"""
-
-toolchain = SYSTEM
-
-source_urls = ['https://github.com/jgm/pandoc/releases/download/%(version)s']
-sources = ['pandoc-%(version)s-linux-amd64.tar.gz']
-checksums = ['3fe3d42179af289d4f5452b9317d2bc9cd139a4f33a37f68d70e128f1d415aa4']
-
-sanity_check_paths = {
-    'files': ['bin/pandoc'],
-    'dirs': ['share'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/p/Pango/Pango-1.48.8-GCCcore-11.2.0.eb b/Golden_Repo/p/Pango/Pango-1.48.8-GCCcore-11.2.0.eb
deleted file mode 100644
index da0fe7098..000000000
--- a/Golden_Repo/p/Pango/Pango-1.48.8-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,43 +0,0 @@
-easyblock = 'MesonNinja'
-
-name = 'Pango'
-version = '1.48.8'
-
-homepage = 'http://www.pango.org/'
-description = """Pango is a library for laying out and rendering of text, with an emphasis on internationalization.
-Pango can be used anywhere that text layout is needed, though most of the work on Pango so far has been done in the
-context of the GTK+ widget toolkit. Pango forms the core of text and font handling for GTK+-2.x.
-"""
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [FTPGNOME_SOURCE]
-sources = [SOURCELOWER_TAR_XZ]
-checksums = ['009d9d830ecbe11911d6637e48eec1c51390d3d12eb286035ef7c641f3c87410']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Coreutils', '9.0'),
-    ('GObject-Introspection', '1.68.0'),
-    ('Meson', '0.58.2'),
-    ('Ninja', '1.10.2'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('X11', '20210802'),
-    ('GLib', '2.69.1'),
-    ('cairo', '1.16.0'),
-    ('HarfBuzz', '2.8.2'),
-    ('FriBidi', '1.0.10'),
-]
-
-configopts = '-Ddefault_library=both'
-
-modextrapaths = {
-    'GI_TYPELIB_PATH': 'lib64/girepository-1.0',
-    'XDG_DATA_DIRS': 'share',
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/p/Panoply/Panoply-4.12.13.eb b/Golden_Repo/p/Panoply/Panoply-4.12.13.eb
deleted file mode 100644
index cc24efdf0..000000000
--- a/Golden_Repo/p/Panoply/Panoply-4.12.13.eb
+++ /dev/null
@@ -1,32 +0,0 @@
-easyblock = 'PackedBinary'
-
-name = 'Panoply'
-version = '4.12.13'
-
-homepage = 'https://www.giss.nasa.gov/tools/panoply'
-description = "Panoply plots geo-referenced and other arrays from netCDF, HDF, GRIB, and other datasets."
-
-
-toolchain = SYSTEM
-
-source_urls = ['https://www.giss.nasa.gov/tools/panoply/download/']
-sources = ['%(name)sJ-%(version)s.tgz']
-checksums = ['b1d82573e18e5a5fae7c50bfc449f9a1461712379ed20f9b0dab729e3bce3cb0']
-
-dependencies = [
-    ('Java', '15', '', SYSTEM),
-]
-
-postinstallcmds = [
-    'mkdir %(installdir)s/bin',
-    'mv %(installdir)s/panoply.sh %(installdir)s/bin',
-    'sed -i "s/jars/..\/jars/g" %(installdir)s/bin/panoply.sh',
-    'ln -s %(installdir)s/bin/panoply.sh %(installdir)s/bin/panoply',
-]
-
-sanity_check_paths = {
-    'files': ['bin/panoply'],
-    'dirs': ['jars']
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-gompi-2021b-double.eb b/Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-gompi-2021b-double.eb
deleted file mode 100644
index 44affccb7..000000000
--- a/Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-gompi-2021b-double.eb
+++ /dev/null
@@ -1,40 +0,0 @@
-name = 'ParMETIS'
-version = '4.0.3'
-versionsuffix = '-double'
-
-homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview'
-description = """ParMETIS is an MPI-based parallel library that implements a variety of algorithms for partitioning
-unstructured graphs, meshes, and for computing fill-reducing orderings of sparse matrices. ParMETIS extends the
-functionality provided by METIS and includes routines that are especially suited for parallel AMR computations and large
-scale numerical simulations. The algorithms implemented in ParMETIS are based on the parallel multilevel k-way
-graph-partitioning, adaptive repartitioning, and parallel multi-constrained partitioning schemes.
-"""
-
-toolchain = {'name': 'gompi', 'version': '2021b'}
-toolchainopts = {'optarch': True, 'usempi': True, 'pic': True, 'openmp': True}
-
-source_urls = ['http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis']
-sources = [SOURCELOWER_TAR_GZ]
-patches = [
-    # Needed for elemental
-    'parmetis_computevertexseparator.patch',
-    # Patch for double precision
-    'parmetis-4.0.3-double.patch'
-]
-checksums = [
-    'f2d9a231b7cf97f1fee6e8c9663113ebf6c240d407d3c118c55b3633d6be6e5f',  # parmetis-4.0.3.tar.gz
-    'b82f5e869b971b5e49566091a79783cc267276bcddcd939abf2240f415287fa7',  # parmetis_computevertexseparator.patch
-    '1eaa6436798f7fbb3ae7eee6e1803a3bb887be1bd56f55d2742389dd6b60f301',  # parmetis-4.0.3-double.patch
-]
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM)
-]
-
-modextravars = {
-    'PARMETIS_ROOT': '%(installdir)s',
-    'PARMETIS_LIB':  '%(installdir)s/lib',
-    'PARMETIS_INCLUDE': '%(installdir)s/include'
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-gompi-2021b.eb b/Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-gompi-2021b.eb
deleted file mode 100644
index c4fc8d160..000000000
--- a/Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-gompi-2021b.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-name = 'ParMETIS'
-version = '4.0.3'
-
-homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview'
-description = """ParMETIS is an MPI-based parallel library that implements a variety of algorithms for partitioning
-unstructured graphs, meshes, and for computing fill-reducing orderings of sparse matrices. ParMETIS extends the
-functionality provided by METIS and includes routines that are especially suited for parallel AMR computations and large
-scale numerical simulations. The algorithms implemented in ParMETIS are based on the parallel multilevel k-way
-graph-partitioning, adaptive repartitioning, and parallel multi-constrained partitioning schemes.
-"""
-
-toolchain = {'name': 'gompi', 'version': '2021b'}
-toolchainopts = {'optarch': True, 'usempi': True, 'pic': True, 'openmp': True}
-
-source_urls = ['http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis']
-sources = [SOURCELOWER_TAR_GZ]
-patches = [
-    # Needed for elemental
-    'parmetis_computevertexseparator.patch'
-]
-checksums = [
-    'f2d9a231b7cf97f1fee6e8c9663113ebf6c240d407d3c118c55b3633d6be6e5f',  # parmetis-4.0.3.tar.gz
-    'b82f5e869b971b5e49566091a79783cc267276bcddcd939abf2240f415287fa7',  # parmetis_computevertexseparator.patch
-]
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM)
-]
-
-modextravars = {
-    'PARMETIS_ROOT': '%(installdir)s',
-    'PARMETIS_LIB':  '%(installdir)s/lib',
-    'PARMETIS_INCLUDE': '%(installdir)s/include'
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-gpsmpi-2021b-double.eb b/Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-gpsmpi-2021b-double.eb
deleted file mode 100644
index 12a3b1532..000000000
--- a/Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-gpsmpi-2021b-double.eb
+++ /dev/null
@@ -1,40 +0,0 @@
-name = 'ParMETIS'
-version = '4.0.3'
-versionsuffix = '-double'
-
-homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview'
-description = """ParMETIS is an MPI-based parallel library that implements a variety of algorithms for partitioning
-unstructured graphs, meshes, and for computing fill-reducing orderings of sparse matrices. ParMETIS extends the
-functionality provided by METIS and includes routines that are especially suited for parallel AMR computations and large
-scale numerical simulations. The algorithms implemented in ParMETIS are based on the parallel multilevel k-way
-graph-partitioning, adaptive repartitioning, and parallel multi-constrained partitioning schemes.
-"""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-toolchainopts = {'optarch': True, 'usempi': True, 'pic': True, 'openmp': True}
-
-source_urls = ['http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis']
-sources = [SOURCELOWER_TAR_GZ]
-patches = [
-    # Needed for elemental
-    'parmetis_computevertexseparator.patch',
-    # Patch for double precision
-    'parmetis-4.0.3-double.patch'
-]
-checksums = [
-    'f2d9a231b7cf97f1fee6e8c9663113ebf6c240d407d3c118c55b3633d6be6e5f',  # parmetis-4.0.3.tar.gz
-    'b82f5e869b971b5e49566091a79783cc267276bcddcd939abf2240f415287fa7',  # parmetis_computevertexseparator.patch
-    '1eaa6436798f7fbb3ae7eee6e1803a3bb887be1bd56f55d2742389dd6b60f301',  # parmetis-4.0.3-double.patch
-]
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM)
-]
-
-modextravars = {
-    'PARMETIS_ROOT': '%(installdir)s',
-    'PARMETIS_LIB':  '%(installdir)s/lib',
-    'PARMETIS_INCLUDE': '%(installdir)s/include'
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-gpsmpi-2021b.eb b/Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-gpsmpi-2021b.eb
deleted file mode 100644
index 4f94dd609..000000000
--- a/Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-name = 'ParMETIS'
-version = '4.0.3'
-
-homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview'
-description = """ParMETIS is an MPI-based parallel library that implements a variety of algorithms for partitioning
-unstructured graphs, meshes, and for computing fill-reducing orderings of sparse matrices. ParMETIS extends the
-functionality provided by METIS and includes routines that are especially suited for parallel AMR computations and large
-scale numerical simulations. The algorithms implemented in ParMETIS are based on the parallel multilevel k-way
-graph-partitioning, adaptive repartitioning, and parallel multi-constrained partitioning schemes.
-"""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-toolchainopts = {'optarch': True, 'usempi': True, 'pic': True, 'openmp': True}
-
-source_urls = ['http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis']
-sources = [SOURCELOWER_TAR_GZ]
-patches = [
-    # Needed for elemental
-    'parmetis_computevertexseparator.patch'
-]
-checksums = [
-    'f2d9a231b7cf97f1fee6e8c9663113ebf6c240d407d3c118c55b3633d6be6e5f',  # parmetis-4.0.3.tar.gz
-    'b82f5e869b971b5e49566091a79783cc267276bcddcd939abf2240f415287fa7',  # parmetis_computevertexseparator.patch
-]
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM)
-]
-
-modextravars = {
-    'PARMETIS_ROOT': '%(installdir)s',
-    'PARMETIS_LIB':  '%(installdir)s/lib',
-    'PARMETIS_INCLUDE': '%(installdir)s/include'
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-iimpi-2021b-double.eb b/Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-iimpi-2021b-double.eb
deleted file mode 100644
index e6e2ecc30..000000000
--- a/Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-iimpi-2021b-double.eb
+++ /dev/null
@@ -1,40 +0,0 @@
-name = 'ParMETIS'
-version = '4.0.3'
-versionsuffix = '-double'
-
-homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview'
-description = """ParMETIS is an MPI-based parallel library that implements a variety of algorithms for partitioning
-unstructured graphs, meshes, and for computing fill-reducing orderings of sparse matrices. ParMETIS extends the
-functionality provided by METIS and includes routines that are especially suited for parallel AMR computations and large
-scale numerical simulations. The algorithms implemented in ParMETIS are based on the parallel multilevel k-way
-graph-partitioning, adaptive repartitioning, and parallel multi-constrained partitioning schemes.
-"""
-
-toolchain = {'name': 'iimpi', 'version': '2021b'}
-toolchainopts = {'optarch': True, 'usempi': True, 'pic': True, 'openmp': True}
-
-source_urls = ['http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis']
-sources = [SOURCELOWER_TAR_GZ]
-patches = [
-    # Needed for elemental
-    'parmetis_computevertexseparator.patch',
-    # Patch for double precision
-    'parmetis-4.0.3-double.patch'
-]
-checksums = [
-    'f2d9a231b7cf97f1fee6e8c9663113ebf6c240d407d3c118c55b3633d6be6e5f',  # parmetis-4.0.3.tar.gz
-    'b82f5e869b971b5e49566091a79783cc267276bcddcd939abf2240f415287fa7',  # parmetis_computevertexseparator.patch
-    '1eaa6436798f7fbb3ae7eee6e1803a3bb887be1bd56f55d2742389dd6b60f301',  # parmetis-4.0.3-double.patch
-]
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM)
-]
-
-modextravars = {
-    'PARMETIS_ROOT': '%(installdir)s',
-    'PARMETIS_LIB':  '%(installdir)s/lib',
-    'PARMETIS_INCLUDE': '%(installdir)s/include'
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-iimpi-2021b.eb b/Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-iimpi-2021b.eb
deleted file mode 100644
index 6768b9ea0..000000000
--- a/Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-iimpi-2021b.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-name = 'ParMETIS'
-version = '4.0.3'
-
-homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview'
-description = """ParMETIS is an MPI-based parallel library that implements a variety of algorithms for partitioning
-unstructured graphs, meshes, and for computing fill-reducing orderings of sparse matrices. ParMETIS extends the
-functionality provided by METIS and includes routines that are especially suited for parallel AMR computations and large
-scale numerical simulations. The algorithms implemented in ParMETIS are based on the parallel multilevel k-way
-graph-partitioning, adaptive repartitioning, and parallel multi-constrained partitioning schemes.
-"""
-
-toolchain = {'name': 'iimpi', 'version': '2021b'}
-toolchainopts = {'optarch': True, 'usempi': True, 'pic': True, 'openmp': True}
-
-source_urls = ['http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis']
-sources = [SOURCELOWER_TAR_GZ]
-patches = [
-    # Needed for elemental
-    'parmetis_computevertexseparator.patch'
-]
-checksums = [
-    'f2d9a231b7cf97f1fee6e8c9663113ebf6c240d407d3c118c55b3633d6be6e5f',  # parmetis-4.0.3.tar.gz
-    'b82f5e869b971b5e49566091a79783cc267276bcddcd939abf2240f415287fa7',  # parmetis_computevertexseparator.patch
-]
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM)
-]
-
-modextravars = {
-    'PARMETIS_ROOT': '%(installdir)s',
-    'PARMETIS_LIB':  '%(installdir)s/lib',
-    'PARMETIS_INCLUDE': '%(installdir)s/include'
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-iompi-2021b-double.eb b/Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-iompi-2021b-double.eb
deleted file mode 100644
index 136f61a75..000000000
--- a/Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-iompi-2021b-double.eb
+++ /dev/null
@@ -1,40 +0,0 @@
-name = 'ParMETIS'
-version = '4.0.3'
-versionsuffix = '-double'
-
-homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview'
-description = """ParMETIS is an MPI-based parallel library that implements a variety of algorithms for partitioning
-unstructured graphs, meshes, and for computing fill-reducing orderings of sparse matrices. ParMETIS extends the
-functionality provided by METIS and includes routines that are especially suited for parallel AMR computations and large
-scale numerical simulations. The algorithms implemented in ParMETIS are based on the parallel multilevel k-way
-graph-partitioning, adaptive repartitioning, and parallel multi-constrained partitioning schemes.
-"""
-
-toolchain = {'name': 'iompi', 'version': '2021b'}
-toolchainopts = {'optarch': True, 'usempi': True, 'pic': True, 'openmp': True}
-
-source_urls = ['http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis']
-sources = [SOURCELOWER_TAR_GZ]
-patches = [
-    # Needed for elemental
-    'parmetis_computevertexseparator.patch',
-    # Patch for double precision
-    'parmetis-4.0.3-double.patch'
-]
-checksums = [
-    'f2d9a231b7cf97f1fee6e8c9663113ebf6c240d407d3c118c55b3633d6be6e5f',  # parmetis-4.0.3.tar.gz
-    'b82f5e869b971b5e49566091a79783cc267276bcddcd939abf2240f415287fa7',  # parmetis_computevertexseparator.patch
-    '1eaa6436798f7fbb3ae7eee6e1803a3bb887be1bd56f55d2742389dd6b60f301',  # parmetis-4.0.3-double.patch
-]
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM)
-]
-
-modextravars = {
-    'PARMETIS_ROOT': '%(installdir)s',
-    'PARMETIS_LIB':  '%(installdir)s/lib',
-    'PARMETIS_INCLUDE': '%(installdir)s/include'
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-iompi-2021b.eb b/Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-iompi-2021b.eb
deleted file mode 100644
index 5baa8072b..000000000
--- a/Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-iompi-2021b.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-name = 'ParMETIS'
-version = '4.0.3'
-
-homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview'
-description = """ParMETIS is an MPI-based parallel library that implements a variety of algorithms for partitioning
-unstructured graphs, meshes, and for computing fill-reducing orderings of sparse matrices. ParMETIS extends the
-functionality provided by METIS and includes routines that are especially suited for parallel AMR computations and large
-scale numerical simulations. The algorithms implemented in ParMETIS are based on the parallel multilevel k-way
-graph-partitioning, adaptive repartitioning, and parallel multi-constrained partitioning schemes.
-"""
-
-toolchain = {'name': 'iompi', 'version': '2021b'}
-toolchainopts = {'optarch': True, 'usempi': True, 'pic': True, 'openmp': True}
-
-source_urls = ['http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis']
-sources = [SOURCELOWER_TAR_GZ]
-patches = [
-    # Needed for elemental
-    'parmetis_computevertexseparator.patch'
-]
-checksums = [
-    'f2d9a231b7cf97f1fee6e8c9663113ebf6c240d407d3c118c55b3633d6be6e5f',  # parmetis-4.0.3.tar.gz
-    'b82f5e869b971b5e49566091a79783cc267276bcddcd939abf2240f415287fa7',  # parmetis_computevertexseparator.patch
-]
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM)
-]
-
-modextravars = {
-    'PARMETIS_ROOT': '%(installdir)s',
-    'PARMETIS_LIB':  '%(installdir)s/lib',
-    'PARMETIS_INCLUDE': '%(installdir)s/include'
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-ipsmpi-2021b-double.eb b/Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-ipsmpi-2021b-double.eb
deleted file mode 100644
index 45cb88cec..000000000
--- a/Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-ipsmpi-2021b-double.eb
+++ /dev/null
@@ -1,40 +0,0 @@
-name = 'ParMETIS'
-version = '4.0.3'
-versionsuffix = '-double'
-
-homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview'
-description = """ParMETIS is an MPI-based parallel library that implements a variety of algorithms for partitioning
-unstructured graphs, meshes, and for computing fill-reducing orderings of sparse matrices. ParMETIS extends the
-functionality provided by METIS and includes routines that are especially suited for parallel AMR computations and large
-scale numerical simulations. The algorithms implemented in ParMETIS are based on the parallel multilevel k-way
-graph-partitioning, adaptive repartitioning, and parallel multi-constrained partitioning schemes.
-"""
-
-toolchain = {'name': 'ipsmpi', 'version': '2021b'}
-toolchainopts = {'optarch': True, 'usempi': True, 'pic': True, 'openmp': True}
-
-source_urls = ['http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis']
-sources = [SOURCELOWER_TAR_GZ]
-patches = [
-    # Needed for elemental
-    'parmetis_computevertexseparator.patch',
-    # Patch for double precision
-    'parmetis-4.0.3-double.patch'
-]
-checksums = [
-    'f2d9a231b7cf97f1fee6e8c9663113ebf6c240d407d3c118c55b3633d6be6e5f',  # parmetis-4.0.3.tar.gz
-    'b82f5e869b971b5e49566091a79783cc267276bcddcd939abf2240f415287fa7',  # parmetis_computevertexseparator.patch
-    '1eaa6436798f7fbb3ae7eee6e1803a3bb887be1bd56f55d2742389dd6b60f301',  # parmetis-4.0.3-double.patch
-]
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM)
-]
-
-modextravars = {
-    'PARMETIS_ROOT': '%(installdir)s',
-    'PARMETIS_LIB':  '%(installdir)s/lib',
-    'PARMETIS_INCLUDE': '%(installdir)s/include'
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-ipsmpi-2021b.eb b/Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-ipsmpi-2021b.eb
deleted file mode 100644
index dc753fe5c..000000000
--- a/Golden_Repo/p/ParMETIS/ParMETIS-4.0.3-ipsmpi-2021b.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-name = 'ParMETIS'
-version = '4.0.3'
-
-homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview'
-description = """ParMETIS is an MPI-based parallel library that implements a variety of algorithms for partitioning
-unstructured graphs, meshes, and for computing fill-reducing orderings of sparse matrices. ParMETIS extends the
-functionality provided by METIS and includes routines that are especially suited for parallel AMR computations and large
-scale numerical simulations. The algorithms implemented in ParMETIS are based on the parallel multilevel k-way
-graph-partitioning, adaptive repartitioning, and parallel multi-constrained partitioning schemes.
-"""
-
-toolchain = {'name': 'ipsmpi', 'version': '2021b'}
-toolchainopts = {'optarch': True, 'usempi': True, 'pic': True, 'openmp': True}
-
-source_urls = ['http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis']
-sources = [SOURCELOWER_TAR_GZ]
-patches = [
-    # Needed for elemental
-    'parmetis_computevertexseparator.patch'
-]
-checksums = [
-    'f2d9a231b7cf97f1fee6e8c9663113ebf6c240d407d3c118c55b3633d6be6e5f',  # parmetis-4.0.3.tar.gz
-    'b82f5e869b971b5e49566091a79783cc267276bcddcd939abf2240f415287fa7',  # parmetis_computevertexseparator.patch
-]
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM)
-]
-
-modextravars = {
-    'PARMETIS_ROOT': '%(installdir)s',
-    'PARMETIS_LIB':  '%(installdir)s/lib',
-    'PARMETIS_INCLUDE': '%(installdir)s/include'
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/p/ParMETIS/parmetis-4.0.3-double.patch b/Golden_Repo/p/ParMETIS/parmetis-4.0.3-double.patch
deleted file mode 100644
index bf6f1c5a8..000000000
--- a/Golden_Repo/p/ParMETIS/parmetis-4.0.3-double.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- parmetis-4.0.3/metis/include/metis.h.orig	2013-03-30 17:24:50.000000000 +0100
-+++ parmetis-4.0.3/metis/include/metis.h	2016-04-20 11:07:49.485844000 +0200
-@@ -40,7 +40,7 @@
-    32 : single precission floating point (float)
-    64 : double precission floating point (double)
- --------------------------------------------------------------------------*/
--#define REALTYPEWIDTH 32
-+#define REALTYPEWIDTH 64
- 
- 
- 
diff --git a/Golden_Repo/p/ParMETIS/parmetis_computevertexseparator.patch b/Golden_Repo/p/ParMETIS/parmetis_computevertexseparator.patch
deleted file mode 100644
index adbc37c85..000000000
--- a/Golden_Repo/p/ParMETIS/parmetis_computevertexseparator.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-diff -ruN parmetis-4.0.3.old/include/parmetis.h parmetis-4.0.3/include/parmetis.h
---- parmetis-4.0.3.old/include/parmetis.h	2017-04-05 17:20:11.888709466 +0200
-+++ parmetis-4.0.3/include/parmetis.h	2017-04-05 17:21:38.247478696 +0200
-@@ -113,6 +113,12 @@
-              idx_t *vtxdist, idx_t *xadj, idx_t *adjncy, idx_t *numflag, 
-              idx_t *options, idx_t *order, idx_t *sizes, MPI_Comm *comm);
- 
-+void ParMETIS_ComputeVertexSeparator(
-+             idx_t *vtxdist, idx_t *xadj, idx_t *adjncy,
-+             idx_t *p_nseps, idx_t *s_nseps,
-+             real_t *ubfrac, idx_t *idbglvl, idx_t *order, idx_t *sizes,
-+             MPI_Comm *comm);
-+
- #ifdef __cplusplus
- }
- #endif
-diff -ruN parmetis-4.0.3.old/libparmetis/ComputeVertexSeparator.c parmetis-4.0.3/libparmetis/ComputeVertexSeparator.c
---- parmetis-4.0.3.old/libparmetis/ComputeVertexSeparator.c	1970-01-01 01:00:00.000000000 +0100
-+++ parmetis-4.0.3/libparmetis/ComputeVertexSeparator.c	2017-04-05 17:22:32.477589755 +0200
-@@ -0,0 +1,166 @@
-+/*
-+ * Copyright 1997, Regents of the University of Minnesota
-+ * Created by modifying ParMETIS routines by Jack Poulson, 2012-2015
-+ */
-+#include <parmetislib.h>
-+
-+void ElParallelLabelVertices
-+( ctrl_t *ctrl, graph_t *graph, idx_t *order, idx_t *sizes )
-+{ 
-+  idx_t i, j, nvtxs, id; 
-+  idx_t *where, *lpwgts, *gpwgts;
-+  idx_t sizescan[3];
-+
-+  nvtxs  = graph->nvtxs;
-+  where  = graph->where;
-+  lpwgts = graph->lpwgts;
-+  gpwgts = graph->gpwgts;
-+
-+  /* Compute the local sizes of the left side, right side, and separator */
-+  iset(3, 0, lpwgts);
-+  for (i=0; i<nvtxs; i++) 
-+      lpwgts[where[i]]++;
-+
-+  /* Perform a Prefix scan of the separator size to determine the boundaries */
-+  gkMPI_Scan((void *)lpwgts, (void *)sizescan, 3, IDX_T, MPI_SUM, ctrl->comm);
-+  gkMPI_Allreduce
-+  ((void *)lpwgts, (void *)gpwgts, 3, IDX_T, MPI_SUM, ctrl->comm);
-+
-+  /* Fill in the size of the partition */
-+  sizes[0] = gpwgts[0];
-+  sizes[1] = gpwgts[1];
-+  sizes[2] = gpwgts[2];
-+
-+  for( i=2; i>=0; --i )
-+      for( j=i+1; j<3; ++j )
-+          sizescan[i] += gpwgts[j];
-+  for( i=0; i<3; i++ )
-+      sizescan[i] -= lpwgts[i];
-+
-+  for( i=0; i<nvtxs; i++ ) 
-+  {
-+      id = where[i];
-+      PASSERT(ctrl, id <= 2);
-+      sizescan[id]++;
-+      PASSERT(ctrl, order[i] == -1);
-+      order[i] = graph->gnvtxs - sizescan[id];
-+  }
-+}
-+
-+void ElParallelOrder
-+( ctrl_t *ctrl, graph_t *graph, idx_t *order, idx_t *sizes )
-+{
-+  idx_t i, nvtxs;
-+
-+  nvtxs = graph->nvtxs;
-+  iset(nvtxs, -1, order);
-+
-+  /* graph->where = ismalloc(nvtxs, 0, "ElOrder: graph->where"); */
-+  /* If we computed an initial partition with Global_Partition, then we 
-+     should run the following instead of the above ismalloc of graph->where*/
-+  iset(nvtxs, 0, graph->where); 
-+  gk_free((void **)&graph->match, 
-+          (void **)&graph->cmap, 
-+          (void **)&graph->rlens, 
-+          (void **)&graph->slens, 
-+          (void **)&graph->rcand, LTERM);
-+
-+  Order_Partition_Multiple(ctrl, graph);
-+
-+  ElParallelLabelVertices(ctrl, graph, order, sizes);
-+}
-+
-+void ParMETIS_ComputeVertexSeparator
-+( idx_t *vtxdist, idx_t *xadj, idx_t *adjncy, 
-+  idx_t *p_nseps, idx_t *s_nseps, 
-+  real_t *ubfrac, idx_t *idbglvl, idx_t *order, idx_t *sizes, 
-+  MPI_Comm *comm )
-+{
-+  idx_t i, j, npes, npesNonzero, mype, mypeNonzero, dbglvl, status, haveData;
-+  ctrl_t *ctrl;
-+  graph_t *graph;
-+  MPI_Comm nonzeroComm, nullComm;
-+  size_t curmem;
-+
-+  gkMPI_Comm_size(*comm, &npes);
-+  gkMPI_Comm_rank(*comm, &mype);
-+
-+  if( vtxdist[npes] == 0 )
-+  {
-+      sizes[0] = 0;
-+      sizes[1] = 0;
-+      sizes[2] = 0;
-+      return;
-+  }
-+
-+  haveData = ( vtxdist[mype+1]-vtxdist[mype] != 0 );
-+  if( haveData )
-+      gkMPI_Comm_split(*comm, 1, mype, &nonzeroComm);
-+  else
-+      gkMPI_Comm_split(*comm, MPI_UNDEFINED, 0, &nullComm);
-+
-+  if( !haveData )
-+  {
-+      sizes[0] = sizes[1] = sizes[2] = 0;
-+      gkMPI_Allreduce(MPI_IN_PLACE, (void *)sizes, 3, IDX_T, MPI_SUM, *comm);
-+      return;
-+  }
-+
-+  gkMPI_Comm_size(nonzeroComm, &npesNonzero);
-+  gkMPI_Comm_rank(nonzeroComm, &mypeNonzero);
-+
-+  /* Compress the vtxdist data to make it match the new communicator */
-+  j=0;
-+  for( i=1; i<npes+1; ++i )
-+      if( vtxdist[i] != vtxdist[j] )
-+          vtxdist[++j] = vtxdist[i];
-+
-+  status = METIS_OK;
-+  gk_malloc_init();
-+  curmem = gk_GetCurMemoryUsed();
-+
-+  ctrl = SetupCtrl(PARMETIS_OP_KMETIS, NULL, 1, 2, NULL, NULL, nonzeroComm);
-+
-+  dbglvl = (idbglvl == NULL ? 0 : *idbglvl);
-+  ctrl->dbglvl = dbglvl;
-+
-+  graph = SetupGraph(ctrl, 1, vtxdist, xadj, NULL, NULL, adjncy, NULL, 0);
-+  AllocateWSpace(ctrl, 10*graph->nvtxs);
-+
-+  /* Compute an initial partition: for some reason this improves the quality */
-+  ctrl->CoarsenTo = gk_min(vtxdist[npesNonzero]+1, 
-+                           200*gk_max(npesNonzero,ctrl->nparts));
-+  Global_Partition(ctrl, graph); 
-+
-+  /* Compute an ordering */
-+  ctrl->optype    = PARMETIS_OP_OMETIS;
-+  ctrl->partType  = ORDER_PARTITION;
-+  ctrl->mtype     = PARMETIS_MTYPE_GLOBAL;
-+  ctrl->rtype     = PARMETIS_SRTYPE_2PHASE;
-+  ctrl->p_nseps   = (p_nseps  == NULL ? 1 : *p_nseps);
-+  ctrl->s_nseps   = (s_nseps  == NULL ? 1 : *s_nseps);
-+  ctrl->ubfrac    = (ubfrac == NULL ? ORDER_UNBALANCE_FRACTION : *ubfrac);
-+  ctrl->dbglvl    = dbglvl;
-+  ctrl->ipart     = ISEP_NODE;
-+  ctrl->CoarsenTo = gk_min(graph->gnvtxs-1,1500*npesNonzero); 
-+  ElParallelOrder(ctrl, graph, order, sizes);
-+
-+  FreeInitialGraphAndRemap(graph);
-+
-+  /* Pass the data to the early-exiting processes with an allreduce */
-+  if( mypeNonzero != 0 )
-+      sizes[0] = sizes[1] = sizes[2] = 0;
-+  gkMPI_Allreduce(MPI_IN_PLACE, (void*)sizes, 3, IDX_T, MPI_SUM, *comm);
-+
-+  MPI_Comm_free( &nonzeroComm );
-+
-+  goto DONE;
-+
-+DONE:
-+  FreeCtrl(&ctrl);
-+  if (gk_GetCurMemoryUsed() - curmem > 0) {
-+    printf("ParMETIS appears to have a memory leak of %zdbytes. Report this.\n",
-+        (ssize_t)(gk_GetCurMemoryUsed() - curmem));
-+  }
-+  gk_malloc_cleanup(0);
-+}
diff --git a/Golden_Repo/p/ParaView/ParaView-5.10.0-gpsmkl-2021b-EGL.eb b/Golden_Repo/p/ParaView/ParaView-5.10.0-gpsmkl-2021b-EGL.eb
deleted file mode 100644
index 3b2ee47af..000000000
--- a/Golden_Repo/p/ParaView/ParaView-5.10.0-gpsmkl-2021b-EGL.eb
+++ /dev/null
@@ -1,317 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'ParaView'
-version = '5.10.0'
-versionsuffix = '-EGL'
-
-homepage = "http://www.paraview.org"
-description = "Paraview is a scientific parallel visualizer."
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': True}
-
-local_dwnlsfx_src = 'download.php?submit=Download&version=v%(version_major_minor)s&type=source&os=Sources&downloadFile='
-source_urls = [('http://www.paraview.org/paraview-downloads/%s' %
-                local_dwnlsfx_src)]
-sources = [("ParaView-v%(version)s.tar.gz")]
-checksums = [
-    ('sha256', '4273dd90c858a6440a72d9c1ad054e76f336446138c895148a797b486603afbd')]
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-    ('git', '2.33.1', '-nodocs'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('Boost', '1.78.0'),
-    ('X11', '20210802'),
-    ('bzip2', '1.0.8'),
-    ('HDF5', '1.12.1'),
-    ('ADIOS2', '2.7.1'),
-    ('FFmpeg', '4.4.1'),
-    ('Embree', '3.13.2'),
-    ('OSPRay', '2.8.0'),
-    ('libpng', '1.6.37'),
-    ('expat', '2.4.1'),
-    ('freetype', '2.11.0'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('libxml2', '2.9.10'),
-    ('LibTIFF', '4.3.0'),
-    ('zlib', '1.2.11'),
-    ('netCDF', '4.8.1'),
-    ('netCDF-C++4', '4.3.1'),
-    ('netCDF-Fortran', '4.5.3'),
-    ('nlohmann-json', '3.10.4'),  # for ParFlow plugin
-    ('mpi4py', '3.1.3'),
-    ('double-conversion', '3.1.6'),
-    ('Eigen', '3.3.9'),
-    ('Qt5', '5.15.2'),
-    ('SciPy-Stack', '2021b', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('OpenGL', '2021b'),
-    ('ParaViewData', '%(version)s'),
-    ('VTKData', '9.1.0'),
-]
-
-separate_build_dir = True
-
-# ensure we do not use a too advanced GL-version at config/build-time, which might not be available at run-time
-preconfigopts = "export __EGL_VENDOR_LIBRARY_FILENAMES=${EBROOTOPENGL}/share/glvnd/egl_vendor.d/50_mesa.json && "
-prebuildopts = "export __EGL_VENDOR_LIBRARY_FILENAMES=${EBROOTOPENGL}/share/glvnd/egl_vendor.d/50_mesa.json && "
-
-########################################################################################
-# check ParaView Superbuild options                                                    #
-# https://gitlab.kitware.com/paraview/paraview-superbuild/tree/master                  #
-#                                                                                      #
-# check ParaView Build documenation                                                    #
-# https://gitlab.kitware.com/paraview/paraview/blob/master/Documentation/dev/build.md  #
-########################################################################################
-
-# --- general settings --- #
-configopts = '-DCMAKE_VERBOSE_MAKEFILE=ON '
-configopts += '-DCMAKE_CXX_STANDARD=11 '
-configopts += '-DPARAVIEW_BUILD_LEGACY_SILENT=ON '
-
-# https://forum.openframeworks.cc/t/nvidia-drivers-pthreads-and-segfaults/2524
-# configopts += '-DCMAKE_CXX_FLAGS="-lpthread $CMAKE_CXX_FLAGS" '
-# configopts += '-DCMAKE_C_FLAGS="-lpthread $CMAKE_C_FLAGS" '
-
-configopts += '-DPARAVIEW_BUILD_EDITION=CANONICAL '
-configopts += '-DPARAVIEW_BUILD_WITH_KITS=OFF '
-configopts += '-DPARAVIEW_USE_QT=OFF '
-
-# --- tuning --- #
-configopts += '-DVTK_BUILD_SCALED_SOA_ARRAYS=ON '
-configopts += '-DVTK_DISPATCH_SOA_ARRAYS=ON '
-configopts += '-DVTK_DISPATCH_TYPED_ARRAYS=ON '
-
-# --- web --- #
-configopts += '-DPARAVIEW_ENABLE_WEB=ON '
-configopts += '-DPARAVIEW_USE_QTWEBENGINE=ON '
-configopts += '-DVTK_MODULE_ENABLE_ParaView_PVWebPython=YES '
-
-# --- python --- #
-configopts += '-DPARAVIEW_USE_PYTHON=ON '
-configopts += "-DPython3_EXECUTABLE=$EBROOTPYTHON/bin/python "
-
-configopts += '-DVTK_PYTHON_VERSION=3 '
-configopts += '-DVTK_NO_PYTHON_THREADS=OFF '
-# visibility depends on VTK_NO_PYTHON_THREADS=OFF
-configopts += '-DVTK_PYTHON_FULL_THREADSAFE=OFF '
-# If you pass VTK_PYTHON_FULL_THREADSAFE to true, then each and every call to python will be protected with GIL,
-# ensuring that you can have eg. other python interpreter in your application and still use python wrapping in vtk.
-
-# --- VTKm --- #
-configopts += '-DPARAVIEW_USE_VTKM=ON '
-configopts += '-DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmCore=YES '
-configopts += '-DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmDataModel=YES '
-configopts += '-DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmFilters=YES '
-configopts += '-DVTKm_Vectorization=AVX2 '
-# configopts += '-DVTKm_ENABLE_KOKKOS=OFF '
-# configopts += '-DVTKm_ENABLE_TBB=OFF '
-# configopts += '-DVTKm_ENABLE_CUDA=ON '
-# configopts += '-DVTKm_ENABLE_LOGGING=ON '
-
-# --- parallel (on-node) --- #
-# https://blog.kitware.com/simple-parallel-computing-with-vtksmptools-2/
-configopts += '-DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP '
-configopts += '-DVTK_MAX_THREADS=64 '
-configopts += '-DVTKm_ENABLE_OPENMP=ON '
-
-# --- parallel (distributed) --- #
-configopts += '-DMPIEXEC_MAX_NUMPROCS=24 '
-configopts += '-DPARAVIEW_USE_MPI=ON '
-configopts += '-DVTKm_ENABLE_MPI=ON '
-
-# --- IO --- #
-configopts += '-DXDMF_BUILD_MPI=ON '
-configopts += '-DPARAVIEW_ENABLE_XDMF3=ON '
-configopts += '-DPARAVIEW_ENABLE_ADIOS2=OFF '  # error: adios2.h not found
-# configopts += '-DPARAVIEW_PLUGIN_ENABLE_AdiosReaderPixie=ON '  # req. ADIOS1
-# configopts += '-DPARAVIEW_PLUGIN_ENABLE_AdiosReaderStaging=ON ' # req. ADIOS1
-configopts += '-DVTKm_ENABLE_HDF5_IO=ON '
-
-# --- large data --- #
-configopts += '-DVTK_USE_64BIT_IDS=ON '
-
-# --- rendering --- #
-
-# OpenGL (hardware)
-#  https://kitware.github.io/paraview-docs/latest/cxx/Offscreen.html
-#    If VTK_OPENGL_HAS_EGL or VTK_OPENGL_HAS_OSMESA is ON, the build supports headless rendering,
-#       otherwise VTK_USE_X must be ON and the build does not support headless,
-#       but can still support offscreen rendering.
-#    If VTK_USE_X is OFF, then either VTK_OPENGL_HAS_OSMESA or VTK_OPENGL_HAS_EGL must be ON.
-#       Then the build does not support onscreen rendering, but only headless rendering.
-#    If PARAVIEW_BUILD_QT_GUI is ON and VTK_USE_X is ON, while ParaView command line tools won't link against
-#       or use X calls, Qt will and hence an accessible X server is still needed to run the desktop client.
-#    If VTK_OPENGL_HAS_OSMESA is ON, and VTK_USE_X is ON,
-#       then all the OpenGL and OSMesa variables should point to the Mesa libraries.
-#    Likewise, if VTK_OPENGL_HAS_EGL is ON and VTK_USE_X is ON, then all the OpenGL and EGL variables
-#       should point to the system libraries providing both, typically the NVidia libraries.
-
-configopts += '-DOpenGL_GL_PREFERENCE=GLVND '
-configopts += '-DVTK_REPORT_OPENGL_ERRORS_IN_RELEASE_BUILDS=OFF '
-
-configopts += "-DOPENGL_INCLUDE_DIR=${EBROOTOPENGL}/include "
-configopts += "-DOPENGL_GLX_INCLUDE_DIR=${EBROOTOPENGL}/include "
-configopts += "-DOPENGL_EGL_INCLUDE_DIR=${EBROOTOPENGL}/include "
-# configopts += "-DOPENGL_xmesa_INCLUDE_DIR=IGNORE "
-
-configopts += "-DOPENGL_opengl_LIBRARY=${EBROOTOPENGL}/lib/libOpenGL.so.0 "
-configopts += "-DOPENGL_gl_LIBRARY=${EBROOTOPENGL}/lib/libGL.so "
-configopts += "-DOPENGL_glx_LIBRARY=${EBROOTOPENGL}/lib/libGLX.so.0 "
-configopts += "-DOPENGL_glu_LIBRARY=${EBROOTOPENGL}/lib/libGLU.so "
-configopts += "-DOPENGL_egl_LIBRARY=${EBROOTOPENGL}/lib/libEGL.so.1 "
-
-# OpenGL over X
-# configopts += '-DVTK_USE_X=ON '  # OFF:headless rendering
-# already considered by Qt (https://gitlab.kitware.com/lorensen/vtk/commit/b29f6db3f746d84f830c81e4212e48db192e4dbb)
-# configopts += '-DVTK_DEFAULT_RENDER_WINDOW_OFFSCREEN=OFF '
-# configopts += '-DVTK_OPENGL_HAS_OSMESA=OFF '  # http://www.paraview.org/Wiki/ParaView_And_Mesa_3D
-
-# EGL (off-screen rendering with OpenGL, but without the need for X)
-# call pvserver with –egl-device-index=0 or 1 and –disable-xdisplay-test
-configopts += '-DVTK_OPENGL_HAS_EGL=ON '
-# http://www.paraview.org/Wiki/ParaView_And_Mesa_3D
-configopts += '-DVTK_OPENGL_HAS_OSMESA=OFF '
-configopts += '-DVTK_USE_X=OFF '
-configopts += '-DVTK_DEFAULT_EGL_DEVICE_INDEX=0 '
-# configopts += '-DEGL_INCLUDE_DIR=${EBROOTOPENGL}/include/EGL/ ' # https://www.khronos.org/registry/EGL/
-# configopts += '-DEGL_LIBRARY=${EBROOTOPENGL}/lib/libEGL.so.1 '
-# configopts += '-DEGL_opengl_LIBRARY=${EBROOTOPENGL}/lib/libOpenGL.so.0 '
-# configopts += '-DEGL_gldispatch_LIBRARY=${EBROOTOPENGL}/lib/libGLdispatch.so.0 ' # <path_to_libGLdispatch.so.0>
-
-# OSMesa (software)
-# With OSMesa the DISPLAY variable has no meaning and is not needed
-# When ON, implies that ParaView can use OSMesa to support headless modes of operation.
-# configopts += '-DVTK_OPENGL_HAS_OSMESA=ON ' # http://www.paraview.org/Wiki/ParaView_And_Mesa_3D
-# configopts += '-DVTK_USE_X=OFF '
-# configopts += '-DVTK_DEFAULT_RENDER_WINDOW_OFFSCREEN=ON '
-# configopts += '-DOSMESA_INCLUDE_DIR=${EBROOTOPENGL}/include '
-# configopts += '-DOSMESA_LIBRARY=${EBROOTOPENGL}/lib/libOSMesa.so '
-
-# Raytracing
-configopts += '-DPARAVIEW_ENABLE_RAYTRACING=ON '
-configopts += '-DVTK_ENABLE_OSPRAY=ON '
-configopts += '-DVTK_ENABLE_VISRTX=OFF '
-
-configopts += "-Dospray_DIR=${EBROOTOSPRAY} "
-configopts += "-Dembree_DIR=${EBROOTEMBREE}/lib64/cmake/embree-3.12.2 "
-configopts += '-DVTKOSPRAY_ENABLE_DENOISER=ON '
-
-# configopts += '-DPARAVIEW_PLUGIN_ENABLE_pvNVIDIAIndeX=YES '
-
-# --- extra features --- #
-configopts += '-DPARAVIEW_PLUGIN_ENABLE_GeographicalMap=ON '
-
-configopts += "-DFFMPEG_ROOT=$EBROOTFFMPEG "
-configopts += '-DPARAVIEW_ENABLE_FFMPEG=ON '
-configopts += '-DVTK_MODULE_ENABLE_VTK_IOFFMPEG=YES '
-configopts += '-DVTK_MODULE_ENABLE_VTK_IOVideo=YES '
-
-configopts += '-DVTK_MODULE_ENABLE_VTK_DICOMParser=YES '
-configopts += '-DVTK_MODULE_ENABLE_VTK_FiltersReebGraph=YES '
-configopts += '-DVTK_MODULE_ENABLE_VTK_FiltersSMP=YES '
-configopts += '-DVTK_MODULE_ENABLE_VTK_FiltersSelection=YES '
-configopts += '-DVTK_MODULE_ENABLE_VTK_FiltersTopology=YES '
-configopts += '-DVTK_MODULE_ENABLE_VTK_FiltersTexture=YES '
-# configopts += '-DVTK_MODULE_ENABLE_VTK_FiltersStatisticsGnu=YES '
-# configopts += '-DVTK_MODULE_ENABLE_VTK_FiltersMatlab=YES '
-
-# --- coupling --- #
-configopts += '-DCATALYST_BUILD_TOOLS=ON '
-configopts += '-DVTK_MODULE_ENABLE_ParaView_InSitu=YES '
-configopts += '-DVTK_MODULE_ENABLE_ParaView_PythonCatalyst=YES '
-
-# --- development & testing --- #
-configopts += '-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON '
-configopts += '-DPARAVIEW_BUILD_DEVELOPER_DOCUMENTATION=OFF '
-configopts += '-DPARAVIEW_BUILD_EXAMPLES=OFF '
-configopts += '-DPARAVIEW_BUILD_TESTING=WANT '
-configopts += '-DPARAVIEW_BUILD_VTK_TESTING=WANT '
-
-# --- external data --- #
-# https://cmake.org/cmake/help/latest/module/ExternalData.html
-# https://gitlab.kitware.com/vtk/vtk/blob/master/Documentation/dev/git/data.md
-# configopts += '-DExternalData_TIMEOUT_INACTIVITY=10 '  # download inactivity, 0 = no timeout
-# configopts += '-DExternalData_TIMEOUT_ABSOLUTE=60 '  # download abs. time, 0 = no timeout
-# Exclude test data download from default 'all' target.
-configopts += '-DPARAVIEW_DATA_EXCLUDE_FROM_ALL=ON '
-# Local directory holding ExternalData objects in the layout %(algo)/%(hash).
-configopts += '-DPARAVIEW_DATA_STORE=${EBROOTPARAVIEWDATA}/.ExternalData '
-configopts += '-DVTK_DATA_STORE=${EBROOTVTKDATA}/.ExternalData '
-# Local directory holding the real data files of ExternalData.
-configopts += '-DExternalData_BINARY_ROOT=${EBROOTPARAVIEWDATA} '
-# we need to combine VTK and ParaView's External data files as there can only be one ExternalData_BINARY_ROOT
-
-# --- XDMF options --- #
-configopts += '-DXDMF_USE_BZIP2=ON '
-configopts += '-DXDMF_USE_GZIP=ON '
-
-# --- VTK external libraries --- #
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_expat=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_freetype=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_hdf5=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_jpeg=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_libxml2=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_mpi4py=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_netcdf=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_png=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_tiff=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_zlib=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_eigen=ON '
-
-# --- ParaView Extra-Reader --- #
-# nlohmann-bug in Plugins/ParFlow/IO/vtkVectorJSON.h
-configopts += '-DPARAVIEW_PLUGIN_ENABLE_ParFlow=OFF '
-configopts += '-DPARAVIEW_ENABLE_MOTIONFX=ON '
-# configopts += '-DPARAVIEW_ENABLE_FIDES=ON '  # req. ADIOS2 as dependency
-# configopts += '-DPARAVIEW_ENABLE_GDAL=ON '  # req. GDAL as dependency
-# configopts += '-DPARAVIEW_ENABLE_LAS=ON '  # req. LAS as dependency
-# configopts += '-DPARAVIEW_ENABLE_PDAL=ON '  # req. PDAL as dependency
-# configopts += '-DPARAVIEW_ENABLE_OPENVDB=ON '  # req. OpenVDB as dependency
-
-# https://gitlab.kitware.com/paraview/visitbridge/-/blob/master/databases/CMakeLists.txt
-configopts += '-DPARAVIEW_ENABLE_VISITBRIDGE=ON '
-configopts += '-DVTK_MODULE_ENABLE_ParaView_IOVisItBridge=YES '
-# configopts += '-DVISIT_BUILD_READER_Boxlib3D=ON '  # req. external dependency
-# configopts += '-DVISIT_BUILD_READER_Mili=ON '  # req. external dependency
-# configopts += '-DVISIT_BUILD_READER_Silo=ON '  # req. external dependency
-# https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7503
-# configopts += '-DVISIT_BUILD_READER_Nek5000=ON '  # MR still open
-
-postinstallcmds = [
-    'python -m compileall %(installdir)s/lib64/python3.6/site-packages/']
-#    'cp -a %(builddir)s/ParaView-v%(version)s/  %(installdir)s/src', # copy source from build dir to install dir
-#    '', # move debug info to separate files:
-#          http://stackoverflow.com/questions/866721/how-to-generate-gcc-debug-symbol-outside-the-build-target
-#    '', # debugedit -i --base-dir=%(builddir)s/ParaView-v%(version)s --dest-dir= %(installdir)s/src <file.debug>
-#        # change path to source in debug info
-
-modextravars = {
-    # 'CUDA_VISIBLE_DEVICES': '0,1',
-    # OpenSWR fully supports OpenGL 3.0 and most of 3.3, but ParaView requires 3.3 -> clame to fully support 3.3
-    'MESA_GL_VERSION_OVERRIDE': '3.3',
-    'MESA_GLSL_VERSION_OVERRIDE': '330',
-    #  OpenMP will choose an optimum number of threads by default, which is usually the number of cores
-    # 'OMP_NUM_THREADS': '28', # fix number of threads used by paraview filters and parallel sections in the code
-    #  threads used by ospray - details https://github.com/ospray/ospray/blob/release-2.0.x/ospray/api/Device.cpp#L88
-    #  unset => OSPRAY uses all hardware threads
-    # 'OSPRAY_THREADS': '14',     # OSPRay <  2.0
-    # 'OSPRAY_NUM_THREADS': '14', # OSPRay >= 2.0
-    #  When TBB is used for OSPRAY: tbb::task_scheduler_init::default_num_threads() is default if no OSPRAY_NUM_THREADS
-    #    https://github.com/ospray/ospcommon/blob/master/ospcommon/tasking/detail/tasking_system_init.cpp#L47
-    #    https://www.threadingbuildingblocks.org/docs/doxygen/a00150.html
-    #  more ospray definitions: https://www.ospray.org/documentation.html#environment-variables
-    # max. threads used by OpenSWR (limited by number of hardware threads)
-    'KNOB_MAX_WORKER_THREADS': '65535',
-    #  details in https://gitlab.version.fz-juelich.de/vis/vis-software/issues/14
-    #  more knob defs: https://github.com/mesa3d/mesa/blob/master/src/gallium/docs/source/drivers/openswr/knobs.rst
-}
-
-modextrapaths = {'PYTHONPATH': 'lib64/python%(pyshortver)s/site-packages'}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/p/ParaView/ParaView-5.10.0-gpsmkl-2021b.eb b/Golden_Repo/p/ParaView/ParaView-5.10.0-gpsmkl-2021b.eb
deleted file mode 100644
index 6041b7295..000000000
--- a/Golden_Repo/p/ParaView/ParaView-5.10.0-gpsmkl-2021b.eb
+++ /dev/null
@@ -1,315 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'ParaView'
-version = '5.10.0'
-
-homepage = "http://www.paraview.org"
-description = "Paraview is a scientific parallel visualizer."
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': True}
-
-local_dwnlsfx_src = 'download.php?submit=Download&version=v%(version_major_minor)s&type=source&os=Sources&downloadFile='
-source_urls = [('http://www.paraview.org/paraview-downloads/%s' %
-                local_dwnlsfx_src)]
-sources = [("ParaView-v%(version)s.tar.gz")]
-checksums = [
-    ('sha256', '4273dd90c858a6440a72d9c1ad054e76f336446138c895148a797b486603afbd')]
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-    ('git', '2.33.1', '-nodocs'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('Boost', '1.78.0'),
-    ('X11', '20210802'),
-    ('bzip2', '1.0.8'),
-    ('HDF5', '1.12.1'),
-    ('ADIOS2', '2.7.1'),
-    ('FFmpeg', '4.4.1'),
-    ('Embree', '3.13.2'),
-    ('OSPRay', '2.8.0'),
-    ('libpng', '1.6.37'),
-    ('expat', '2.4.1'),
-    ('freetype', '2.11.0'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('libxml2', '2.9.10'),
-    ('LibTIFF', '4.3.0'),
-    ('zlib', '1.2.11'),
-    ('netCDF', '4.8.1'),
-    ('netCDF-C++4', '4.3.1'),
-    ('netCDF-Fortran', '4.5.3'),
-    ('nlohmann-json', '3.10.4'),  # for ParFlow plugin
-    ('mpi4py', '3.1.3'),
-    ('double-conversion', '3.1.6'),
-    ('Eigen', '3.3.9'),
-    ('Qt5', '5.15.2'),
-    ('SciPy-Stack', '2021b', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('OpenGL', '2021b'),
-    ('ParaViewData', '%(version)s'),
-    ('VTKData', '9.1.0'),
-]
-
-separate_build_dir = True
-
-########################################################################################
-# check ParaView Superbuild options                                                    #
-# https://gitlab.kitware.com/paraview/paraview-superbuild/tree/master                  #
-#                                                                                      #
-# check ParaView Build documenation                                                    #
-# https://gitlab.kitware.com/paraview/paraview/blob/master/Documentation/dev/build.md  #
-########################################################################################
-
-# --- general settings --- #
-configopts = '-DCMAKE_VERBOSE_MAKEFILE=ON '
-configopts += '-DCMAKE_CXX_STANDARD=11 '
-configopts += '-DPARAVIEW_BUILD_LEGACY_SILENT=ON '
-
-# https://forum.openframeworks.cc/t/nvidia-drivers-pthreads-and-segfaults/2524
-# configopts += '-DCMAKE_CXX_FLAGS="-lpthread $CMAKE_CXX_FLAGS" '
-# configopts += '-DCMAKE_C_FLAGS="-lpthread $CMAKE_C_FLAGS" '
-
-configopts += '-DPARAVIEW_BUILD_EDITION=CANONICAL '
-configopts += '-DPARAVIEW_BUILD_WITH_KITS=OFF '
-configopts += '-DPARAVIEW_USE_QT=ON '
-
-# --- tuning --- #
-configopts += '-DVTK_BUILD_SCALED_SOA_ARRAYS=ON '
-configopts += '-DVTK_DISPATCH_SOA_ARRAYS=ON '
-configopts += '-DVTK_DISPATCH_TYPED_ARRAYS=ON '
-
-# --- web --- #
-configopts += '-DPARAVIEW_ENABLE_WEB=ON '
-configopts += '-DPARAVIEW_USE_QTWEBENGINE=ON '
-configopts += '-DVTK_MODULE_ENABLE_ParaView_PVWebPython=YES '
-
-# --- python --- #
-configopts += '-DPARAVIEW_USE_PYTHON=ON '
-configopts += "-DPython3_EXECUTABLE=$EBROOTPYTHON/bin/python "
-
-configopts += '-DVTK_PYTHON_VERSION=3 '
-configopts += '-DVTK_NO_PYTHON_THREADS=OFF '
-# visibility depends on VTK_NO_PYTHON_THREADS=OFF
-configopts += '-DVTK_PYTHON_FULL_THREADSAFE=OFF '
-# If you pass VTK_PYTHON_FULL_THREADSAFE to true, then each and every call to python will be protected with GIL,
-# ensuring that you can have eg. other python interpreter in your application and still use python wrapping in vtk.
-
-# --- VTKm --- #
-configopts += '-DPARAVIEW_USE_VTKM=ON '
-configopts += '-DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmCore=YES '
-configopts += '-DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmDataModel=YES '
-configopts += '-DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmFilters=YES '
-configopts += '-DVTKm_Vectorization=AVX2 '
-# configopts += '-DVTKm_ENABLE_KOKKOS=OFF '
-# configopts += '-DVTKm_ENABLE_TBB=OFF '
-# configopts += '-DVTKm_ENABLE_CUDA=ON '
-# configopts += '-DVTKm_ENABLE_LOGGING=ON '
-
-# --- parallel (on-node) --- #
-# https://blog.kitware.com/simple-parallel-computing-with-vtksmptools-2/
-configopts += '-DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP '
-configopts += '-DVTK_MAX_THREADS=64 '
-configopts += '-DVTKm_ENABLE_OPENMP=ON '
-
-# --- parallel (distributed) --- #
-configopts += '-DMPIEXEC_MAX_NUMPROCS=24 '
-configopts += '-DPARAVIEW_USE_MPI=ON '
-configopts += '-DVTKm_ENABLE_MPI=ON '
-
-# --- IO --- #
-configopts += '-DXDMF_BUILD_MPI=ON '
-configopts += '-DPARAVIEW_ENABLE_XDMF3=ON '
-configopts += '-DPARAVIEW_ENABLE_ADIOS2=OFF '  # error: adios2.h not found
-# configopts += '-DPARAVIEW_PLUGIN_ENABLE_AdiosReaderPixie=ON '  # req. ADIOS1
-# configopts += '-DPARAVIEW_PLUGIN_ENABLE_AdiosReaderStaging=ON ' # req. ADIOS1
-configopts += '-DVTKm_ENABLE_HDF5_IO=ON '
-
-# --- large data --- #
-configopts += '-DVTK_USE_64BIT_IDS=ON '
-
-# --- rendering --- #
-
-# OpenGL (hardware)
-#  https://kitware.github.io/paraview-docs/latest/cxx/Offscreen.html
-#    If VTK_OPENGL_HAS_EGL or VTK_OPENGL_HAS_OSMESA is ON, the build supports headless rendering,
-#       otherwise VTK_USE_X must be ON and the build does not support headless,
-#       but can still support offscreen rendering.
-#    If VTK_USE_X is OFF, then either VTK_OPENGL_HAS_OSMESA or VTK_OPENGL_HAS_EGL must be ON.
-#       Then the build does not support onscreen rendering, but only headless rendering.
-#    If PARAVIEW_BUILD_QT_GUI is ON and VTK_USE_X is ON, while ParaView command line tools won't link against
-#       or use X calls, Qt will and hence an accessible X server is still needed to run the desktop client.
-#    If VTK_OPENGL_HAS_OSMESA is ON, and VTK_USE_X is ON,
-#       then all the OpenGL and OSMesa variables should point to the Mesa libraries.
-#    Likewise, if VTK_OPENGL_HAS_EGL is ON and VTK_USE_X is ON, then all the OpenGL and EGL variables
-#       should point to the system libraries providing both, typically the NVidia libraries.
-
-configopts += '-DOpenGL_GL_PREFERENCE=GLVND '
-configopts += '-DVTK_REPORT_OPENGL_ERRORS_IN_RELEASE_BUILDS=OFF '
-
-configopts += "-DOPENGL_INCLUDE_DIR=${EBROOTOPENGL}/include "
-configopts += "-DOPENGL_GLX_INCLUDE_DIR=${EBROOTOPENGL}/include "
-configopts += "-DOPENGL_EGL_INCLUDE_DIR=${EBROOTOPENGL}/include "
-# configopts += "-DOPENGL_xmesa_INCLUDE_DIR=IGNORE "
-
-configopts += "-DOPENGL_opengl_LIBRARY=${EBROOTOPENGL}/lib/libOpenGL.so.0 "
-configopts += "-DOPENGL_gl_LIBRARY=${EBROOTOPENGL}/lib/libGL.so "
-configopts += "-DOPENGL_glx_LIBRARY=${EBROOTOPENGL}/lib/libGLX.so.0 "
-configopts += "-DOPENGL_glu_LIBRARY=${EBROOTOPENGL}/lib/libGLU.so "
-configopts += "-DOPENGL_egl_LIBRARY=${EBROOTOPENGL}/lib/libEGL.so.1 "
-
-# OpenGL over X
-configopts += '-DVTK_USE_X=ON '  # OFF:headless rendering
-# already considered by Qt (https://gitlab.kitware.com/lorensen/vtk/commit/b29f6db3f746d84f830c81e4212e48db192e4dbb)
-configopts += '-DVTK_DEFAULT_RENDER_WINDOW_OFFSCREEN=OFF '
-# http://www.paraview.org/Wiki/ParaView_And_Mesa_3D
-configopts += '-DVTK_OPENGL_HAS_OSMESA=OFF '
-
-# EGL (off-screen rendering with OpenGL, but without the need for X)
-# call pvserver with –egl-device-index=0 or 1 and –disable-xdisplay-test
-# configopts += '-DVTK_OPENGL_HAS_EGL=ON '
-# configopts += '-DVTK_OPENGL_HAS_OSMESA=OFF '  # http://www.paraview.org/Wiki/ParaView_And_Mesa_3D
-# configopts += '-DVTK_USE_X=OFF '
-# configopts += '-DVTK_DEFAULT_EGL_DEVICE_INDEX=0 '
-# #configopts += '-DEGL_INCLUDE_DIR=${EBROOTOPENGL}/include/EGL/ ' # https://www.khronos.org/registry/EGL/
-# #configopts += '-DEGL_LIBRARY=${EBROOTOPENGL}/lib/libEGL.so.1 '
-# #configopts += '-DEGL_opengl_LIBRARY=${EBROOTOPENGL}/lib/libOpenGL.so.0 '
-# #configopts += '-DEGL_gldispatch_LIBRARY=${EBROOTOPENGL}/lib/libGLdispatch.so.0 ' # <path_to_libGLdispatch.so.0>
-
-# OSMesa (software)
-# With OSMesa the DISPLAY variable has no meaning and is not needed
-# When ON, implies that ParaView can use OSMesa to support headless modes of operation.
-# configopts += '-DVTK_OPENGL_HAS_OSMESA=ON ' # http://www.paraview.org/Wiki/ParaView_And_Mesa_3D
-# configopts += '-DVTK_USE_X=OFF '
-# configopts += '-DVTK_DEFAULT_RENDER_WINDOW_OFFSCREEN=ON '
-# configopts += '-DOSMESA_INCLUDE_DIR=${EBROOTOPENGL}/include '
-# configopts += '-DOSMESA_LIBRARY=${EBROOTOPENGL}/lib/libOSMesa.so '
-
-# Raytracing
-configopts += '-DPARAVIEW_ENABLE_RAYTRACING=ON '
-configopts += '-DVTK_ENABLE_OSPRAY=ON '
-configopts += '-DVTK_ENABLE_VISRTX=OFF '
-
-configopts += "-Dospray_DIR=${EBROOTOSPRAY} "
-configopts += "-Dembree_DIR=${EBROOTEMBREE}/lib64/cmake/embree-3.12.2 "
-configopts += '-DVTKOSPRAY_ENABLE_DENOISER=ON '
-
-# configopts += '-DPARAVIEW_PLUGIN_ENABLE_pvNVIDIAIndeX=YES '
-
-# --- extra features --- #
-configopts += '-DPARAVIEW_PLUGIN_ENABLE_GeographicalMap=ON '
-
-configopts += "-DFFMPEG_ROOT=$EBROOTFFMPEG "
-configopts += '-DPARAVIEW_ENABLE_FFMPEG=ON '
-configopts += '-DVTK_MODULE_ENABLE_VTK_IOFFMPEG=YES '
-configopts += '-DVTK_MODULE_ENABLE_VTK_IOVideo=YES '
-
-configopts += '-DVTK_MODULE_ENABLE_VTK_DICOMParser=YES '
-configopts += '-DVTK_MODULE_ENABLE_VTK_FiltersReebGraph=YES '
-configopts += '-DVTK_MODULE_ENABLE_VTK_FiltersSMP=YES '
-configopts += '-DVTK_MODULE_ENABLE_VTK_FiltersSelection=YES '
-configopts += '-DVTK_MODULE_ENABLE_VTK_FiltersTopology=YES '
-configopts += '-DVTK_MODULE_ENABLE_VTK_FiltersTexture=YES '
-# configopts += '-DVTK_MODULE_ENABLE_VTK_FiltersStatisticsGnu=YES '
-# configopts += '-DVTK_MODULE_ENABLE_VTK_FiltersMatlab=YES '
-
-# --- coupling --- #
-configopts += '-DCATALYST_BUILD_TOOLS=ON '
-configopts += '-DVTK_MODULE_ENABLE_ParaView_InSitu=YES '
-configopts += '-DVTK_MODULE_ENABLE_ParaView_PythonCatalyst=YES '
-
-# --- development & testing --- #
-configopts += '-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON '
-configopts += '-DPARAVIEW_BUILD_DEVELOPER_DOCUMENTATION=OFF '
-configopts += '-DPARAVIEW_BUILD_EXAMPLES=OFF '
-configopts += '-DPARAVIEW_BUILD_TESTING=WANT '
-configopts += '-DPARAVIEW_BUILD_VTK_TESTING=WANT '
-
-# --- external data --- #
-# https://cmake.org/cmake/help/latest/module/ExternalData.html
-# https://gitlab.kitware.com/vtk/vtk/blob/master/Documentation/dev/git/data.md
-configopts += '-DCTEST_TEST_TIMEOUT=10800 '
-# download inactivity, 0 = no timeout
-configopts += '-DExternalData_TIMEOUT_INACTIVITY=10 '
-# download abs. time, 0 = no timeout
-configopts += '-DExternalData_TIMEOUT_ABSOLUTE=60 '
-# Exclude test data download from default 'all' target.
-configopts += '-DPARAVIEW_DATA_EXCLUDE_FROM_ALL=ON '
-# Local directory holding ExternalData objects in the layout %(algo)/%(hash).
-configopts += '-DPARAVIEW_DATA_STORE=${EBROOTPARAVIEWDATA}/.ExternalData '
-configopts += '-DVTK_DATA_STORE=${EBROOTVTKDATA}/.ExternalData '
-# Local directory holding the real data files of ExternalData.
-configopts += '-DExternalData_BINARY_ROOT=${EBROOTPARAVIEWDATA} '
-# we need to combine VTK and ParaView's External data files as there can only be one ExternalData_BINARY_ROOT
-
-# --- XDMF options --- #
-configopts += '-DXDMF_USE_BZIP2=ON '
-configopts += '-DXDMF_USE_GZIP=ON '
-
-# --- VTK external libraries --- #
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_expat=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_freetype=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_hdf5=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_jpeg=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_libxml2=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_mpi4py=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_netcdf=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_png=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_tiff=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_zlib=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_eigen=ON '
-
-# --- ParaView Extra-Reader --- #
-# nlohmann-bug in Plugins/ParFlow/IO/vtkVectorJSON.h
-configopts += '-DPARAVIEW_PLUGIN_ENABLE_ParFlow=OFF '
-configopts += '-DPARAVIEW_ENABLE_MOTIONFX=ON '
-# configopts += '-DPARAVIEW_ENABLE_FIDES=ON '  # req. ADIOS2 as dependency
-# configopts += '-DPARAVIEW_ENABLE_GDAL=ON '  # req. GDAL as dependency
-# configopts += '-DPARAVIEW_ENABLE_LAS=ON '  # req. LAS as dependency
-# configopts += '-DPARAVIEW_ENABLE_PDAL=ON '  # req. PDAL as dependency
-# configopts += '-DPARAVIEW_ENABLE_OPENVDB=ON '  # req. OpenVDB as dependency
-
-# https://gitlab.kitware.com/paraview/visitbridge/-/blob/master/databases/CMakeLists.txt
-configopts += '-DPARAVIEW_ENABLE_VISITBRIDGE=ON '
-configopts += '-DVTK_MODULE_ENABLE_ParaView_IOVisItBridge=YES '
-# configopts += '-DVISIT_BUILD_READER_Boxlib3D=ON '  # req. external dependency
-# configopts += '-DVISIT_BUILD_READER_Mili=ON '  # req. external dependency
-# configopts += '-DVISIT_BUILD_READER_Silo=ON '  # req. external dependency
-# https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7503
-# configopts += '-DVISIT_BUILD_READER_Nek5000=ON '  # MR still open
-
-postinstallcmds = [
-    'python -m compileall %(installdir)s/lib64/python3.6/site-packages/']
-#    'cp -a %(builddir)s/ParaView-v%(version)s/  %(installdir)s/src', # copy source from build dir to install dir
-#    '', # move debug info to separate files:
-#          http://stackoverflow.com/questions/866721/how-to-generate-gcc-debug-symbol-outside-the-build-target
-#    '', # debugedit -i --base-dir=%(builddir)s/ParaView-v%(version)s --dest-dir= %(installdir)s/src <file.debug>
-#        # change path to source in debug info
-
-modextravars = {
-    # 'CUDA_VISIBLE_DEVICES': '0,1',
-    # OpenSWR fully supports OpenGL 3.0 and most of 3.3, but ParaView requires 3.3 -> clame to fully support 3.3
-    'MESA_GL_VERSION_OVERRIDE': '3.3',
-    'MESA_GLSL_VERSION_OVERRIDE': '330',
-    #  OpenMP will choose an optimum number of threads by default, which is usually the number of cores
-    # 'OMP_NUM_THREADS': '28', # fix number of threads used by paraview filters and parallel sections in the code
-    #  threads used by ospray - details https://github.com/ospray/ospray/blob/release-2.0.x/ospray/api/Device.cpp#L88
-    #  unset => OSPRAY uses all hardware threads
-    # 'OSPRAY_THREADS': '14',     # OSPRay <  2.0
-    # 'OSPRAY_NUM_THREADS': '14', # OSPRay >= 2.0
-    #  When TBB is used for OSPRAY: tbb::task_scheduler_init::default_num_threads() is default if no OSPRAY_NUM_THREADS
-    #    https://github.com/ospray/ospcommon/blob/master/ospcommon/tasking/detail/tasking_system_init.cpp#L47
-    #    https://www.threadingbuildingblocks.org/docs/doxygen/a00150.html
-    #  more ospray definitions: https://www.ospray.org/documentation.html#environment-variables
-    # max. threads used by OpenSWR (limited by number of hardware threads)
-    'KNOB_MAX_WORKER_THREADS': '65535',
-    #  details in https://gitlab.version.fz-juelich.de/vis/vis-software/issues/14
-    #  more knob defs: https://github.com/mesa3d/mesa/blob/master/src/gallium/docs/source/drivers/openswr/knobs.rst
-}
-
-modextrapaths = {'PYTHONPATH': 'lib64/python%(pyshortver)s/site-packages'}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/p/ParaView/ParaView-5.10.1-gpsmkl-2021b-EGL.eb b/Golden_Repo/p/ParaView/ParaView-5.10.1-gpsmkl-2021b-EGL.eb
deleted file mode 100644
index 2572e4213..000000000
--- a/Golden_Repo/p/ParaView/ParaView-5.10.1-gpsmkl-2021b-EGL.eb
+++ /dev/null
@@ -1,316 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'ParaView'
-version = '5.10.1'
-versionsuffix = '-EGL'
-
-homepage = "http://www.paraview.org"
-description = "Paraview is a scientific parallel visualizer."
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': True}
-
-local_dwnlsfx_src = 'download.php?submit=Download&version=v%(version_major_minor)s&type=source&os=Sources&downloadFile='
-source_urls = [('http://www.paraview.org/paraview-downloads/%s' %
-                local_dwnlsfx_src)]
-sources = [("ParaView-v%(version)s.tar.gz")]
-checksums = ['59ca46a929a52d8abec107b72e19447cba3d8e64871b6fbc8e99b0f3b167db46']
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-    ('git', '2.33.1', '-nodocs'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('Boost', '1.78.0'),
-    ('X11', '20210802'),
-    ('bzip2', '1.0.8'),
-    ('HDF5', '1.12.1'),
-    ('ADIOS2', '2.7.1'),
-    ('FFmpeg', '4.4.1'),
-    ('Embree', '3.13.2'),
-    ('OSPRay', '2.8.0'),
-    ('libpng', '1.6.37'),
-    ('expat', '2.4.1'),
-    ('freetype', '2.11.0'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('libxml2', '2.9.10'),
-    ('LibTIFF', '4.3.0'),
-    ('zlib', '1.2.11'),
-    ('netCDF', '4.8.1'),
-    ('netCDF-C++4', '4.3.1'),
-    ('netCDF-Fortran', '4.5.3'),
-    ('nlohmann-json', '3.10.4'),  # for ParFlow plugin
-    ('mpi4py', '3.1.3'),
-    ('double-conversion', '3.1.6'),
-    ('Eigen', '3.3.9'),
-    ('Qt5', '5.15.2'),
-    ('SciPy-Stack', '2021b', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('OpenGL', '2021b'),
-    ('ParaViewData', '5.10.0'),
-    ('VTKData', '9.1.0'),
-]
-
-separate_build_dir = True
-
-# ensure we do not use a too advanced GL-version at config/build-time, which might not be available at run-time
-preconfigopts = "export __EGL_VENDOR_LIBRARY_FILENAMES=${EBROOTOPENGL}/share/glvnd/egl_vendor.d/50_mesa.json && "
-prebuildopts = "export __EGL_VENDOR_LIBRARY_FILENAMES=${EBROOTOPENGL}/share/glvnd/egl_vendor.d/50_mesa.json && "
-
-########################################################################################
-# check ParaView Superbuild options                                                    #
-# https://gitlab.kitware.com/paraview/paraview-superbuild/tree/master                  #
-#                                                                                      #
-# check ParaView Build documenation                                                    #
-# https://gitlab.kitware.com/paraview/paraview/blob/master/Documentation/dev/build.md  #
-########################################################################################
-
-# --- general settings --- #
-configopts = '-DCMAKE_VERBOSE_MAKEFILE=ON '
-configopts += '-DCMAKE_CXX_STANDARD=11 '
-configopts += '-DPARAVIEW_BUILD_LEGACY_SILENT=ON '
-
-# https://forum.openframeworks.cc/t/nvidia-drivers-pthreads-and-segfaults/2524
-# configopts += '-DCMAKE_CXX_FLAGS="-lpthread $CMAKE_CXX_FLAGS" '
-# configopts += '-DCMAKE_C_FLAGS="-lpthread $CMAKE_C_FLAGS" '
-
-configopts += '-DPARAVIEW_BUILD_EDITION=CANONICAL '
-configopts += '-DPARAVIEW_BUILD_WITH_KITS=OFF '
-configopts += '-DPARAVIEW_USE_QT=OFF '
-
-# --- tuning --- #
-configopts += '-DVTK_BUILD_SCALED_SOA_ARRAYS=ON '
-configopts += '-DVTK_DISPATCH_SOA_ARRAYS=ON '
-configopts += '-DVTK_DISPATCH_TYPED_ARRAYS=ON '
-
-# --- web --- #
-configopts += '-DPARAVIEW_ENABLE_WEB=ON '
-configopts += '-DPARAVIEW_USE_QTWEBENGINE=ON '
-configopts += '-DVTK_MODULE_ENABLE_ParaView_PVWebPython=YES '
-
-# --- python --- #
-configopts += '-DPARAVIEW_USE_PYTHON=ON '
-configopts += "-DPython3_EXECUTABLE=$EBROOTPYTHON/bin/python "
-
-configopts += '-DVTK_PYTHON_VERSION=3 '
-configopts += '-DVTK_NO_PYTHON_THREADS=OFF '
-# visibility depends on VTK_NO_PYTHON_THREADS=OFF
-configopts += '-DVTK_PYTHON_FULL_THREADSAFE=OFF '
-# If you pass VTK_PYTHON_FULL_THREADSAFE to true, then each and every call to python will be protected with GIL,
-# ensuring that you can have eg. other python interpreter in your application and still use python wrapping in vtk.
-
-# --- VTKm --- #
-configopts += '-DPARAVIEW_USE_VTKM=ON '
-configopts += '-DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmCore=YES '
-configopts += '-DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmDataModel=YES '
-configopts += '-DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmFilters=YES '
-configopts += '-DVTKm_Vectorization=AVX2 '
-# configopts += '-DVTKm_ENABLE_KOKKOS=OFF '
-# configopts += '-DVTKm_ENABLE_TBB=OFF '
-# configopts += '-DVTKm_ENABLE_CUDA=ON '
-# configopts += '-DVTKm_ENABLE_LOGGING=ON '
-
-# --- parallel (on-node) --- #
-# https://blog.kitware.com/simple-parallel-computing-with-vtksmptools-2/
-configopts += '-DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP '
-configopts += '-DVTK_MAX_THREADS=64 '
-configopts += '-DVTKm_ENABLE_OPENMP=ON '
-
-# --- parallel (distributed) --- #
-configopts += '-DMPIEXEC_MAX_NUMPROCS=24 '
-configopts += '-DPARAVIEW_USE_MPI=ON '
-configopts += '-DVTKm_ENABLE_MPI=ON '
-
-# --- IO --- #
-configopts += '-DXDMF_BUILD_MPI=ON '
-configopts += '-DPARAVIEW_ENABLE_XDMF3=ON '
-configopts += '-DPARAVIEW_ENABLE_ADIOS2=OFF '  # error: adios2.h not found
-# configopts += '-DPARAVIEW_PLUGIN_ENABLE_AdiosReaderPixie=ON '  # req. ADIOS1
-# configopts += '-DPARAVIEW_PLUGIN_ENABLE_AdiosReaderStaging=ON ' # req. ADIOS1
-configopts += '-DVTKm_ENABLE_HDF5_IO=ON '
-
-# --- large data --- #
-configopts += '-DVTK_USE_64BIT_IDS=ON '
-
-# --- rendering --- #
-
-# OpenGL (hardware)
-#  https://kitware.github.io/paraview-docs/latest/cxx/Offscreen.html
-#    If VTK_OPENGL_HAS_EGL or VTK_OPENGL_HAS_OSMESA is ON, the build supports headless rendering,
-#       otherwise VTK_USE_X must be ON and the build does not support headless,
-#       but can still support offscreen rendering.
-#    If VTK_USE_X is OFF, then either VTK_OPENGL_HAS_OSMESA or VTK_OPENGL_HAS_EGL must be ON.
-#       Then the build does not support onscreen rendering, but only headless rendering.
-#    If PARAVIEW_BUILD_QT_GUI is ON and VTK_USE_X is ON, while ParaView command line tools won't link against
-#       or use X calls, Qt will and hence an accessible X server is still needed to run the desktop client.
-#    If VTK_OPENGL_HAS_OSMESA is ON, and VTK_USE_X is ON,
-#       then all the OpenGL and OSMesa variables should point to the Mesa libraries.
-#    Likewise, if VTK_OPENGL_HAS_EGL is ON and VTK_USE_X is ON, then all the OpenGL and EGL variables
-#       should point to the system libraries providing both, typically the NVidia libraries.
-
-configopts += '-DOpenGL_GL_PREFERENCE=GLVND '
-configopts += '-DVTK_REPORT_OPENGL_ERRORS_IN_RELEASE_BUILDS=OFF '
-
-configopts += "-DOPENGL_INCLUDE_DIR=${EBROOTOPENGL}/include "
-configopts += "-DOPENGL_GLX_INCLUDE_DIR=${EBROOTOPENGL}/include "
-configopts += "-DOPENGL_EGL_INCLUDE_DIR=${EBROOTOPENGL}/include "
-# configopts += "-DOPENGL_xmesa_INCLUDE_DIR=IGNORE "
-
-configopts += "-DOPENGL_opengl_LIBRARY=${EBROOTOPENGL}/lib/libOpenGL.so.0 "
-configopts += "-DOPENGL_gl_LIBRARY=${EBROOTOPENGL}/lib/libGL.so "
-configopts += "-DOPENGL_glx_LIBRARY=${EBROOTOPENGL}/lib/libGLX.so.0 "
-configopts += "-DOPENGL_glu_LIBRARY=${EBROOTOPENGL}/lib/libGLU.so "
-configopts += "-DOPENGL_egl_LIBRARY=${EBROOTOPENGL}/lib/libEGL.so.1 "
-
-# OpenGL over X
-# configopts += '-DVTK_USE_X=ON '  # OFF:headless rendering
-# already considered by Qt (https://gitlab.kitware.com/lorensen/vtk/commit/b29f6db3f746d84f830c81e4212e48db192e4dbb)
-# configopts += '-DVTK_DEFAULT_RENDER_WINDOW_OFFSCREEN=OFF '
-# configopts += '-DVTK_OPENGL_HAS_OSMESA=OFF '  # http://www.paraview.org/Wiki/ParaView_And_Mesa_3D
-
-# EGL (off-screen rendering with OpenGL, but without the need for X)
-# call pvserver with –egl-device-index=0 or 1 and –disable-xdisplay-test
-configopts += '-DVTK_OPENGL_HAS_EGL=ON '
-# http://www.paraview.org/Wiki/ParaView_And_Mesa_3D
-configopts += '-DVTK_OPENGL_HAS_OSMESA=OFF '
-configopts += '-DVTK_USE_X=OFF '
-configopts += '-DVTK_DEFAULT_EGL_DEVICE_INDEX=0 '
-# configopts += '-DEGL_INCLUDE_DIR=${EBROOTOPENGL}/include/EGL/ ' # https://www.khronos.org/registry/EGL/
-# configopts += '-DEGL_LIBRARY=${EBROOTOPENGL}/lib/libEGL.so.1 '
-# configopts += '-DEGL_opengl_LIBRARY=${EBROOTOPENGL}/lib/libOpenGL.so.0 '
-# configopts += '-DEGL_gldispatch_LIBRARY=${EBROOTOPENGL}/lib/libGLdispatch.so.0 ' # <path_to_libGLdispatch.so.0>
-
-# OSMesa (software)
-# With OSMesa the DISPLAY variable has no meaning and is not needed
-# When ON, implies that ParaView can use OSMesa to support headless modes of operation.
-# configopts += '-DVTK_OPENGL_HAS_OSMESA=ON ' # http://www.paraview.org/Wiki/ParaView_And_Mesa_3D
-# configopts += '-DVTK_USE_X=OFF '
-# configopts += '-DVTK_DEFAULT_RENDER_WINDOW_OFFSCREEN=ON '
-# configopts += '-DOSMESA_INCLUDE_DIR=${EBROOTOPENGL}/include '
-# configopts += '-DOSMESA_LIBRARY=${EBROOTOPENGL}/lib/libOSMesa.so '
-
-# Raytracing
-configopts += '-DPARAVIEW_ENABLE_RAYTRACING=ON '
-configopts += '-DVTK_ENABLE_OSPRAY=ON '
-configopts += '-DVTK_ENABLE_VISRTX=OFF '
-
-configopts += "-Dospray_DIR=${EBROOTOSPRAY} "
-configopts += "-Dembree_DIR=${EBROOTEMBREE}/lib64/cmake/embree-3.12.2 "
-configopts += '-DVTKOSPRAY_ENABLE_DENOISER=ON '
-
-# configopts += '-DPARAVIEW_PLUGIN_ENABLE_pvNVIDIAIndeX=YES '
-
-# --- extra features --- #
-configopts += '-DPARAVIEW_PLUGIN_ENABLE_GeographicalMap=ON '
-
-configopts += "-DFFMPEG_ROOT=$EBROOTFFMPEG "
-configopts += '-DPARAVIEW_ENABLE_FFMPEG=ON '
-configopts += '-DVTK_MODULE_ENABLE_VTK_IOFFMPEG=YES '
-configopts += '-DVTK_MODULE_ENABLE_VTK_IOVideo=YES '
-
-configopts += '-DVTK_MODULE_ENABLE_VTK_DICOMParser=YES '
-configopts += '-DVTK_MODULE_ENABLE_VTK_FiltersReebGraph=YES '
-configopts += '-DVTK_MODULE_ENABLE_VTK_FiltersSMP=YES '
-configopts += '-DVTK_MODULE_ENABLE_VTK_FiltersSelection=YES '
-configopts += '-DVTK_MODULE_ENABLE_VTK_FiltersTopology=YES '
-configopts += '-DVTK_MODULE_ENABLE_VTK_FiltersTexture=YES '
-# configopts += '-DVTK_MODULE_ENABLE_VTK_FiltersStatisticsGnu=YES '
-# configopts += '-DVTK_MODULE_ENABLE_VTK_FiltersMatlab=YES '
-
-# --- coupling --- #
-configopts += '-DCATALYST_BUILD_TOOLS=ON '
-configopts += '-DVTK_MODULE_ENABLE_ParaView_InSitu=YES '
-configopts += '-DVTK_MODULE_ENABLE_ParaView_PythonCatalyst=YES '
-
-# --- development & testing --- #
-configopts += '-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON '
-configopts += '-DPARAVIEW_BUILD_DEVELOPER_DOCUMENTATION=OFF '
-configopts += '-DPARAVIEW_BUILD_EXAMPLES=OFF '
-configopts += '-DPARAVIEW_BUILD_TESTING=WANT '
-configopts += '-DPARAVIEW_BUILD_VTK_TESTING=WANT '
-
-# --- external data --- #
-# https://cmake.org/cmake/help/latest/module/ExternalData.html
-# https://gitlab.kitware.com/vtk/vtk/blob/master/Documentation/dev/git/data.md
-# configopts += '-DExternalData_TIMEOUT_INACTIVITY=10 '  # download inactivity, 0 = no timeout
-# configopts += '-DExternalData_TIMEOUT_ABSOLUTE=60 '  # download abs. time, 0 = no timeout
-# Exclude test data download from default 'all' target.
-configopts += '-DPARAVIEW_DATA_EXCLUDE_FROM_ALL=ON '
-# Local directory holding ExternalData objects in the layout %(algo)/%(hash).
-configopts += '-DPARAVIEW_DATA_STORE=${EBROOTPARAVIEWDATA}/.ExternalData '
-configopts += '-DVTK_DATA_STORE=${EBROOTVTKDATA}/.ExternalData '
-# Local directory holding the real data files of ExternalData.
-configopts += '-DExternalData_BINARY_ROOT=${EBROOTPARAVIEWDATA} '
-# we need to combine VTK and ParaView's External data files as there can only be one ExternalData_BINARY_ROOT
-
-# --- XDMF options --- #
-configopts += '-DXDMF_USE_BZIP2=ON '
-configopts += '-DXDMF_USE_GZIP=ON '
-
-# --- VTK external libraries --- #
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_expat=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_freetype=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_hdf5=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_jpeg=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_libxml2=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_mpi4py=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_netcdf=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_png=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_tiff=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_zlib=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_eigen=ON '
-
-# --- ParaView Extra-Reader --- #
-# nlohmann-bug in Plugins/ParFlow/IO/vtkVectorJSON.h
-configopts += '-DPARAVIEW_PLUGIN_ENABLE_ParFlow=OFF '
-configopts += '-DPARAVIEW_ENABLE_MOTIONFX=ON '
-# configopts += '-DPARAVIEW_ENABLE_FIDES=ON '  # req. ADIOS2 as dependency
-# configopts += '-DPARAVIEW_ENABLE_GDAL=ON '  # req. GDAL as dependency
-# configopts += '-DPARAVIEW_ENABLE_LAS=ON '  # req. LAS as dependency
-# configopts += '-DPARAVIEW_ENABLE_PDAL=ON '  # req. PDAL as dependency
-# configopts += '-DPARAVIEW_ENABLE_OPENVDB=ON '  # req. OpenVDB as dependency
-
-# https://gitlab.kitware.com/paraview/visitbridge/-/blob/master/databases/CMakeLists.txt
-configopts += '-DPARAVIEW_ENABLE_VISITBRIDGE=ON '
-configopts += '-DVTK_MODULE_ENABLE_ParaView_IOVisItBridge=YES '
-# configopts += '-DVISIT_BUILD_READER_Boxlib3D=ON '  # req. external dependency
-# configopts += '-DVISIT_BUILD_READER_Mili=ON '  # req. external dependency
-# configopts += '-DVISIT_BUILD_READER_Silo=ON '  # req. external dependency
-# https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7503
-# configopts += '-DVISIT_BUILD_READER_Nek5000=ON '  # MR still open
-
-postinstallcmds = [
-    'python -m compileall %(installdir)s/lib64/python3.6/site-packages/']
-#    'cp -a %(builddir)s/ParaView-v%(version)s/  %(installdir)s/src', # copy source from build dir to install dir
-#    '', # move debug info to separate files:
-#          http://stackoverflow.com/questions/866721/how-to-generate-gcc-debug-symbol-outside-the-build-target
-#    '', # debugedit -i --base-dir=%(builddir)s/ParaView-v%(version)s --dest-dir= %(installdir)s/src <file.debug>
-#        # change path to source in debug info
-
-modextravars = {
-    # 'CUDA_VISIBLE_DEVICES': '0,1',
-    # OpenSWR fully supports OpenGL 3.0 and most of 3.3, but ParaView requires 3.3 -> clame to fully support 3.3
-    'MESA_GL_VERSION_OVERRIDE': '3.3',
-    'MESA_GLSL_VERSION_OVERRIDE': '330',
-    #  OpenMP will choose an optimum number of threads by default, which is usually the number of cores
-    # 'OMP_NUM_THREADS': '28', # fix number of threads used by paraview filters and parallel sections in the code
-    #  threads used by ospray - details https://github.com/ospray/ospray/blob/release-2.0.x/ospray/api/Device.cpp#L88
-    #  unset => OSPRAY uses all hardware threads
-    # 'OSPRAY_THREADS': '14',     # OSPRay <  2.0
-    # 'OSPRAY_NUM_THREADS': '14', # OSPRay >= 2.0
-    #  When TBB is used for OSPRAY: tbb::task_scheduler_init::default_num_threads() is default if no OSPRAY_NUM_THREADS
-    #    https://github.com/ospray/ospcommon/blob/master/ospcommon/tasking/detail/tasking_system_init.cpp#L47
-    #    https://www.threadingbuildingblocks.org/docs/doxygen/a00150.html
-    #  more ospray definitions: https://www.ospray.org/documentation.html#environment-variables
-    # max. threads used by OpenSWR (limited by number of hardware threads)
-    'KNOB_MAX_WORKER_THREADS': '65535',
-    #  details in https://gitlab.version.fz-juelich.de/vis/vis-software/issues/14
-    #  more knob defs: https://github.com/mesa3d/mesa/blob/master/src/gallium/docs/source/drivers/openswr/knobs.rst
-}
-
-modextrapaths = {'PYTHONPATH': 'lib64/python%(pyshortver)s/site-packages'}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/p/ParaView/ParaView-5.10.1-gpsmkl-2021b.eb b/Golden_Repo/p/ParaView/ParaView-5.10.1-gpsmkl-2021b.eb
deleted file mode 100644
index dbfb9edbf..000000000
--- a/Golden_Repo/p/ParaView/ParaView-5.10.1-gpsmkl-2021b.eb
+++ /dev/null
@@ -1,314 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'ParaView'
-version = '5.10.1'
-
-homepage = "http://www.paraview.org"
-description = "Paraview is a scientific parallel visualizer."
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': True}
-
-local_dwnlsfx_src = 'download.php?submit=Download&version=v%(version_major_minor)s&type=source&os=Sources&downloadFile='
-source_urls = [('http://www.paraview.org/paraview-downloads/%s' %
-                local_dwnlsfx_src)]
-sources = [("ParaView-v%(version)s.tar.gz")]
-checksums = ['59ca46a929a52d8abec107b72e19447cba3d8e64871b6fbc8e99b0f3b167db46']
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-    ('git', '2.33.1', '-nodocs'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('Boost', '1.78.0'),
-    ('X11', '20210802'),
-    ('bzip2', '1.0.8'),
-    ('HDF5', '1.12.1'),
-    ('ADIOS2', '2.7.1'),
-    ('FFmpeg', '4.4.1'),
-    ('Embree', '3.13.2'),
-    ('OSPRay', '2.8.0'),
-    ('libpng', '1.6.37'),
-    ('expat', '2.4.1'),
-    ('freetype', '2.11.0'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('libxml2', '2.9.10'),
-    ('LibTIFF', '4.3.0'),
-    ('zlib', '1.2.11'),
-    ('netCDF', '4.8.1'),
-    ('netCDF-C++4', '4.3.1'),
-    ('netCDF-Fortran', '4.5.3'),
-    ('nlohmann-json', '3.10.4'),  # for ParFlow plugin
-    ('mpi4py', '3.1.3'),
-    ('double-conversion', '3.1.6'),
-    ('Eigen', '3.3.9'),
-    ('Qt5', '5.15.2'),
-    ('SciPy-Stack', '2021b', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('OpenGL', '2021b'),
-    ('ParaViewData', '5.10.0'),
-    ('VTKData', '9.1.0'),
-]
-
-separate_build_dir = True
-
-########################################################################################
-# check ParaView Superbuild options                                                    #
-# https://gitlab.kitware.com/paraview/paraview-superbuild/tree/master                  #
-#                                                                                      #
-# check ParaView Build documenation                                                    #
-# https://gitlab.kitware.com/paraview/paraview/blob/master/Documentation/dev/build.md  #
-########################################################################################
-
-# --- general settings --- #
-configopts = '-DCMAKE_VERBOSE_MAKEFILE=ON '
-configopts += '-DCMAKE_CXX_STANDARD=11 '
-configopts += '-DPARAVIEW_BUILD_LEGACY_SILENT=ON '
-
-# https://forum.openframeworks.cc/t/nvidia-drivers-pthreads-and-segfaults/2524
-# configopts += '-DCMAKE_CXX_FLAGS="-lpthread $CMAKE_CXX_FLAGS" '
-# configopts += '-DCMAKE_C_FLAGS="-lpthread $CMAKE_C_FLAGS" '
-
-configopts += '-DPARAVIEW_BUILD_EDITION=CANONICAL '
-configopts += '-DPARAVIEW_BUILD_WITH_KITS=OFF '
-configopts += '-DPARAVIEW_USE_QT=ON '
-
-# --- tuning --- #
-configopts += '-DVTK_BUILD_SCALED_SOA_ARRAYS=ON '
-configopts += '-DVTK_DISPATCH_SOA_ARRAYS=ON '
-configopts += '-DVTK_DISPATCH_TYPED_ARRAYS=ON '
-
-# --- web --- #
-configopts += '-DPARAVIEW_ENABLE_WEB=ON '
-configopts += '-DPARAVIEW_USE_QTWEBENGINE=ON '
-configopts += '-DVTK_MODULE_ENABLE_ParaView_PVWebPython=YES '
-
-# --- python --- #
-configopts += '-DPARAVIEW_USE_PYTHON=ON '
-configopts += "-DPython3_EXECUTABLE=$EBROOTPYTHON/bin/python "
-
-configopts += '-DVTK_PYTHON_VERSION=3 '
-configopts += '-DVTK_NO_PYTHON_THREADS=OFF '
-# visibility depends on VTK_NO_PYTHON_THREADS=OFF
-configopts += '-DVTK_PYTHON_FULL_THREADSAFE=OFF '
-# If you pass VTK_PYTHON_FULL_THREADSAFE to true, then each and every call to python will be protected with GIL,
-# ensuring that you can have eg. other python interpreter in your application and still use python wrapping in vtk.
-
-# --- VTKm --- #
-configopts += '-DPARAVIEW_USE_VTKM=ON '
-configopts += '-DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmCore=YES '
-configopts += '-DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmDataModel=YES '
-configopts += '-DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmFilters=YES '
-configopts += '-DVTKm_Vectorization=AVX2 '
-# configopts += '-DVTKm_ENABLE_KOKKOS=OFF '
-# configopts += '-DVTKm_ENABLE_TBB=OFF '
-# configopts += '-DVTKm_ENABLE_CUDA=ON '
-# configopts += '-DVTKm_ENABLE_LOGGING=ON '
-
-# --- parallel (on-node) --- #
-# https://blog.kitware.com/simple-parallel-computing-with-vtksmptools-2/
-configopts += '-DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP '
-configopts += '-DVTK_MAX_THREADS=64 '
-configopts += '-DVTKm_ENABLE_OPENMP=ON '
-
-# --- parallel (distributed) --- #
-configopts += '-DMPIEXEC_MAX_NUMPROCS=24 '
-configopts += '-DPARAVIEW_USE_MPI=ON '
-configopts += '-DVTKm_ENABLE_MPI=ON '
-
-# --- IO --- #
-configopts += '-DXDMF_BUILD_MPI=ON '
-configopts += '-DPARAVIEW_ENABLE_XDMF3=ON '
-configopts += '-DPARAVIEW_ENABLE_ADIOS2=OFF '  # error: adios2.h not found
-# configopts += '-DPARAVIEW_PLUGIN_ENABLE_AdiosReaderPixie=ON '  # req. ADIOS1
-# configopts += '-DPARAVIEW_PLUGIN_ENABLE_AdiosReaderStaging=ON ' # req. ADIOS1
-configopts += '-DVTKm_ENABLE_HDF5_IO=ON '
-
-# --- large data --- #
-configopts += '-DVTK_USE_64BIT_IDS=ON '
-
-# --- rendering --- #
-
-# OpenGL (hardware)
-#  https://kitware.github.io/paraview-docs/latest/cxx/Offscreen.html
-#    If VTK_OPENGL_HAS_EGL or VTK_OPENGL_HAS_OSMESA is ON, the build supports headless rendering,
-#       otherwise VTK_USE_X must be ON and the build does not support headless,
-#       but can still support offscreen rendering.
-#    If VTK_USE_X is OFF, then either VTK_OPENGL_HAS_OSMESA or VTK_OPENGL_HAS_EGL must be ON.
-#       Then the build does not support onscreen rendering, but only headless rendering.
-#    If PARAVIEW_BUILD_QT_GUI is ON and VTK_USE_X is ON, while ParaView command line tools won't link against
-#       or use X calls, Qt will and hence an accessible X server is still needed to run the desktop client.
-#    If VTK_OPENGL_HAS_OSMESA is ON, and VTK_USE_X is ON,
-#       then all the OpenGL and OSMesa variables should point to the Mesa libraries.
-#    Likewise, if VTK_OPENGL_HAS_EGL is ON and VTK_USE_X is ON, then all the OpenGL and EGL variables
-#       should point to the system libraries providing both, typically the NVidia libraries.
-
-configopts += '-DOpenGL_GL_PREFERENCE=GLVND '
-configopts += '-DVTK_REPORT_OPENGL_ERRORS_IN_RELEASE_BUILDS=OFF '
-
-configopts += "-DOPENGL_INCLUDE_DIR=${EBROOTOPENGL}/include "
-configopts += "-DOPENGL_GLX_INCLUDE_DIR=${EBROOTOPENGL}/include "
-configopts += "-DOPENGL_EGL_INCLUDE_DIR=${EBROOTOPENGL}/include "
-# configopts += "-DOPENGL_xmesa_INCLUDE_DIR=IGNORE "
-
-configopts += "-DOPENGL_opengl_LIBRARY=${EBROOTOPENGL}/lib/libOpenGL.so.0 "
-configopts += "-DOPENGL_gl_LIBRARY=${EBROOTOPENGL}/lib/libGL.so "
-configopts += "-DOPENGL_glx_LIBRARY=${EBROOTOPENGL}/lib/libGLX.so.0 "
-configopts += "-DOPENGL_glu_LIBRARY=${EBROOTOPENGL}/lib/libGLU.so "
-configopts += "-DOPENGL_egl_LIBRARY=${EBROOTOPENGL}/lib/libEGL.so.1 "
-
-# OpenGL over X
-configopts += '-DVTK_USE_X=ON '  # OFF:headless rendering
-# already considered by Qt (https://gitlab.kitware.com/lorensen/vtk/commit/b29f6db3f746d84f830c81e4212e48db192e4dbb)
-configopts += '-DVTK_DEFAULT_RENDER_WINDOW_OFFSCREEN=OFF '
-# http://www.paraview.org/Wiki/ParaView_And_Mesa_3D
-configopts += '-DVTK_OPENGL_HAS_OSMESA=OFF '
-
-# EGL (off-screen rendering with OpenGL, but without the need for X)
-# call pvserver with –egl-device-index=0 or 1 and –disable-xdisplay-test
-# configopts += '-DVTK_OPENGL_HAS_EGL=ON '
-# configopts += '-DVTK_OPENGL_HAS_OSMESA=OFF '  # http://www.paraview.org/Wiki/ParaView_And_Mesa_3D
-# configopts += '-DVTK_USE_X=OFF '
-# configopts += '-DVTK_DEFAULT_EGL_DEVICE_INDEX=0 '
-# #configopts += '-DEGL_INCLUDE_DIR=${EBROOTOPENGL}/include/EGL/ ' # https://www.khronos.org/registry/EGL/
-# #configopts += '-DEGL_LIBRARY=${EBROOTOPENGL}/lib/libEGL.so.1 '
-# #configopts += '-DEGL_opengl_LIBRARY=${EBROOTOPENGL}/lib/libOpenGL.so.0 '
-# #configopts += '-DEGL_gldispatch_LIBRARY=${EBROOTOPENGL}/lib/libGLdispatch.so.0 ' # <path_to_libGLdispatch.so.0>
-
-# OSMesa (software)
-# With OSMesa the DISPLAY variable has no meaning and is not needed
-# When ON, implies that ParaView can use OSMesa to support headless modes of operation.
-# configopts += '-DVTK_OPENGL_HAS_OSMESA=ON ' # http://www.paraview.org/Wiki/ParaView_And_Mesa_3D
-# configopts += '-DVTK_USE_X=OFF '
-# configopts += '-DVTK_DEFAULT_RENDER_WINDOW_OFFSCREEN=ON '
-# configopts += '-DOSMESA_INCLUDE_DIR=${EBROOTOPENGL}/include '
-# configopts += '-DOSMESA_LIBRARY=${EBROOTOPENGL}/lib/libOSMesa.so '
-
-# Raytracing
-configopts += '-DPARAVIEW_ENABLE_RAYTRACING=ON '
-configopts += '-DVTK_ENABLE_OSPRAY=ON '
-configopts += '-DVTK_ENABLE_VISRTX=OFF '
-
-configopts += "-Dospray_DIR=${EBROOTOSPRAY} "
-configopts += "-Dembree_DIR=${EBROOTEMBREE}/lib64/cmake/embree-3.12.2 "
-configopts += '-DVTKOSPRAY_ENABLE_DENOISER=ON '
-
-# configopts += '-DPARAVIEW_PLUGIN_ENABLE_pvNVIDIAIndeX=YES '
-
-# --- extra features --- #
-configopts += '-DPARAVIEW_PLUGIN_ENABLE_GeographicalMap=ON '
-
-configopts += "-DFFMPEG_ROOT=$EBROOTFFMPEG "
-configopts += '-DPARAVIEW_ENABLE_FFMPEG=ON '
-configopts += '-DVTK_MODULE_ENABLE_VTK_IOFFMPEG=YES '
-configopts += '-DVTK_MODULE_ENABLE_VTK_IOVideo=YES '
-
-configopts += '-DVTK_MODULE_ENABLE_VTK_DICOMParser=YES '
-configopts += '-DVTK_MODULE_ENABLE_VTK_FiltersReebGraph=YES '
-configopts += '-DVTK_MODULE_ENABLE_VTK_FiltersSMP=YES '
-configopts += '-DVTK_MODULE_ENABLE_VTK_FiltersSelection=YES '
-configopts += '-DVTK_MODULE_ENABLE_VTK_FiltersTopology=YES '
-configopts += '-DVTK_MODULE_ENABLE_VTK_FiltersTexture=YES '
-# configopts += '-DVTK_MODULE_ENABLE_VTK_FiltersStatisticsGnu=YES '
-# configopts += '-DVTK_MODULE_ENABLE_VTK_FiltersMatlab=YES '
-
-# --- coupling --- #
-configopts += '-DCATALYST_BUILD_TOOLS=ON '
-configopts += '-DVTK_MODULE_ENABLE_ParaView_InSitu=YES '
-configopts += '-DVTK_MODULE_ENABLE_ParaView_PythonCatalyst=YES '
-
-# --- development & testing --- #
-configopts += '-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON '
-configopts += '-DPARAVIEW_BUILD_DEVELOPER_DOCUMENTATION=OFF '
-configopts += '-DPARAVIEW_BUILD_EXAMPLES=OFF '
-configopts += '-DPARAVIEW_BUILD_TESTING=WANT '
-configopts += '-DPARAVIEW_BUILD_VTK_TESTING=WANT '
-
-# --- external data --- #
-# https://cmake.org/cmake/help/latest/module/ExternalData.html
-# https://gitlab.kitware.com/vtk/vtk/blob/master/Documentation/dev/git/data.md
-configopts += '-DCTEST_TEST_TIMEOUT=10800 '
-# download inactivity, 0 = no timeout
-configopts += '-DExternalData_TIMEOUT_INACTIVITY=10 '
-# download abs. time, 0 = no timeout
-configopts += '-DExternalData_TIMEOUT_ABSOLUTE=60 '
-# Exclude test data download from default 'all' target.
-configopts += '-DPARAVIEW_DATA_EXCLUDE_FROM_ALL=ON '
-# Local directory holding ExternalData objects in the layout %(algo)/%(hash).
-configopts += '-DPARAVIEW_DATA_STORE=${EBROOTPARAVIEWDATA}/.ExternalData '
-configopts += '-DVTK_DATA_STORE=${EBROOTVTKDATA}/.ExternalData '
-# Local directory holding the real data files of ExternalData.
-configopts += '-DExternalData_BINARY_ROOT=${EBROOTPARAVIEWDATA} '
-# we need to combine VTK and ParaView's External data files as there can only be one ExternalData_BINARY_ROOT
-
-# --- XDMF options --- #
-configopts += '-DXDMF_USE_BZIP2=ON '
-configopts += '-DXDMF_USE_GZIP=ON '
-
-# --- VTK external libraries --- #
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_expat=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_freetype=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_hdf5=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_jpeg=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_libxml2=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_mpi4py=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_netcdf=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_png=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_tiff=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_zlib=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion=ON '
-configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_eigen=ON '
-
-# --- ParaView Extra-Reader --- #
-# nlohmann-bug in Plugins/ParFlow/IO/vtkVectorJSON.h
-configopts += '-DPARAVIEW_PLUGIN_ENABLE_ParFlow=OFF '
-configopts += '-DPARAVIEW_ENABLE_MOTIONFX=ON '
-# configopts += '-DPARAVIEW_ENABLE_FIDES=ON '  # req. ADIOS2 as dependency
-# configopts += '-DPARAVIEW_ENABLE_GDAL=ON '  # req. GDAL as dependency
-# configopts += '-DPARAVIEW_ENABLE_LAS=ON '  # req. LAS as dependency
-# configopts += '-DPARAVIEW_ENABLE_PDAL=ON '  # req. PDAL as dependency
-# configopts += '-DPARAVIEW_ENABLE_OPENVDB=ON '  # req. OpenVDB as dependency
-
-# https://gitlab.kitware.com/paraview/visitbridge/-/blob/master/databases/CMakeLists.txt
-configopts += '-DPARAVIEW_ENABLE_VISITBRIDGE=ON '
-configopts += '-DVTK_MODULE_ENABLE_ParaView_IOVisItBridge=YES '
-# configopts += '-DVISIT_BUILD_READER_Boxlib3D=ON '  # req. external dependency
-# configopts += '-DVISIT_BUILD_READER_Mili=ON '  # req. external dependency
-# configopts += '-DVISIT_BUILD_READER_Silo=ON '  # req. external dependency
-# https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7503
-# configopts += '-DVISIT_BUILD_READER_Nek5000=ON '  # MR still open
-
-postinstallcmds = [
-    'python -m compileall %(installdir)s/lib64/python3.6/site-packages/']
-#    'cp -a %(builddir)s/ParaView-v%(version)s/  %(installdir)s/src', # copy source from build dir to install dir
-#    '', # move debug info to separate files:
-#          http://stackoverflow.com/questions/866721/how-to-generate-gcc-debug-symbol-outside-the-build-target
-#    '', # debugedit -i --base-dir=%(builddir)s/ParaView-v%(version)s --dest-dir= %(installdir)s/src <file.debug>
-#        # change path to source in debug info
-
-modextravars = {
-    # 'CUDA_VISIBLE_DEVICES': '0,1',
-    # OpenSWR fully supports OpenGL 3.0 and most of 3.3, but ParaView requires 3.3 -> clame to fully support 3.3
-    'MESA_GL_VERSION_OVERRIDE': '3.3',
-    'MESA_GLSL_VERSION_OVERRIDE': '330',
-    #  OpenMP will choose an optimum number of threads by default, which is usually the number of cores
-    # 'OMP_NUM_THREADS': '28', # fix number of threads used by paraview filters and parallel sections in the code
-    #  threads used by ospray - details https://github.com/ospray/ospray/blob/release-2.0.x/ospray/api/Device.cpp#L88
-    #  unset => OSPRAY uses all hardware threads
-    # 'OSPRAY_THREADS': '14',     # OSPRay <  2.0
-    # 'OSPRAY_NUM_THREADS': '14', # OSPRay >= 2.0
-    #  When TBB is used for OSPRAY: tbb::task_scheduler_init::default_num_threads() is default if no OSPRAY_NUM_THREADS
-    #    https://github.com/ospray/ospcommon/blob/master/ospcommon/tasking/detail/tasking_system_init.cpp#L47
-    #    https://www.threadingbuildingblocks.org/docs/doxygen/a00150.html
-    #  more ospray definitions: https://www.ospray.org/documentation.html#environment-variables
-    # max. threads used by OpenSWR (limited by number of hardware threads)
-    'KNOB_MAX_WORKER_THREADS': '65535',
-    #  details in https://gitlab.version.fz-juelich.de/vis/vis-software/issues/14
-    #  more knob defs: https://github.com/mesa3d/mesa/blob/master/src/gallium/docs/source/drivers/openswr/knobs.rst
-}
-
-modextrapaths = {'PYTHONPATH': 'lib64/python%(pyshortver)s/site-packages'}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/p/ParaViewData/ParaViewData-5.10.0-GCCcore-11.2.0.eb b/Golden_Repo/p/ParaViewData/ParaViewData-5.10.0-GCCcore-11.2.0.eb
deleted file mode 100644
index 3f6ba2481..000000000
--- a/Golden_Repo/p/ParaViewData/ParaViewData-5.10.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,28 +0,0 @@
-easyblock = 'Tarball'
-
-name = 'ParaViewData'
-version = '5.10.0'
-
-homepage = 'https://www.paraview.org'
-description = "Testdata for ParaView"
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-local_dwnlsfx_src = 'download.php?submit=Download&version=v%(version_major_minor)s&type=data&os=Sources&downloadFile='
-source_urls = [
-    ('https://www.paraview.org/paraview-downloads/%s' % local_dwnlsfx_src)]
-sources = [
-    ('ParaViewTestingDataFiles-v%(version)s.tar.gz'),
-    ('ParaViewTestingDataStore-v%(version)s.tar.gz'),
-]
-checksums = [
-    ('sha256', 'd6383b5be6090fd6584d209c1f06522b6c53ec1e1ded7fdb74b6361515a3f491'),
-    ('sha256', 'fdca5b15a14742d7e4344e6de694c318b4f0ceb3a8bdf324134eddc2a0f20c95'),
-]
-
-sanity_check_paths = {
-    'files': ['.ExternalData/README.rst'],
-    'dirs': ['.ExternalData', 'Clients', 'Plugins', 'Remoting', 'Testing', 'VTKExtensions'],
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/p/ParaViewPlugin-Nek5000/ParaViewPlugin-Nek5000-20221505-gpsmkl-2021b-EGL.eb b/Golden_Repo/p/ParaViewPlugin-Nek5000/ParaViewPlugin-Nek5000-20221505-gpsmkl-2021b-EGL.eb
deleted file mode 100644
index 53f2ca679..000000000
--- a/Golden_Repo/p/ParaViewPlugin-Nek5000/ParaViewPlugin-Nek5000-20221505-gpsmkl-2021b-EGL.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'ParaViewPlugin-Nek5000'
-version = '20221505'
-versionsuffix = '-EGL'
-
-homepage = "http://www.paraview.org"
-description = "Plugin for ParaView. Paraview is a scientific parallel visualizer."
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/jfavre/ParaViewNek5000Plugin/archive/']
-sources = ['11ca7c21e62a63097bc923a1c8fe10b3183f685f.tar.gz']
-checksums = ['6115be7ba1d393d629b750b26be64bd3f68d83f475e4aca96e9780f5215d14d4']
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-]
-
-dependencies = [
-    ('ParaView', '5.10.1', '-EGL'),
-]
-
-separate_build_dir = True
-
-modextrapaths = {'PV_PLUGIN_PATH': '.'}
-
-sanity_check_paths = {
-    'files': ['include/vtkNek5000Reader.h', 'lib/paraview-5.10/plugins/pvNek5000Reader/libNek5000Reader.so'],
-    'dirs': ['include', 'lib', 'lib/paraview-5.10/plugins/pvNek5000Reader']
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/p/ParaViewPlugin-Nek5000/ParaViewPlugin-Nek5000-20221505-gpsmkl-2021b.eb b/Golden_Repo/p/ParaViewPlugin-Nek5000/ParaViewPlugin-Nek5000-20221505-gpsmkl-2021b.eb
deleted file mode 100644
index 1d5e50b03..000000000
--- a/Golden_Repo/p/ParaViewPlugin-Nek5000/ParaViewPlugin-Nek5000-20221505-gpsmkl-2021b.eb
+++ /dev/null
@@ -1,33 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'ParaViewPlugin-Nek5000'
-version = '20221505'
-
-homepage = "http://www.paraview.org"
-description = "Plugin for ParaView. Paraview is a scientific parallel visualizer."
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/jfavre/ParaViewNek5000Plugin/archive/']
-sources = ['11ca7c21e62a63097bc923a1c8fe10b3183f685f.tar.gz']
-checksums = ['6115be7ba1d393d629b750b26be64bd3f68d83f475e4aca96e9780f5215d14d4']
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-]
-
-dependencies = [
-    ('ParaView', '5.10.1'),
-]
-
-separate_build_dir = True
-
-modextrapaths = {'PV_PLUGIN_PATH': '.'}
-
-sanity_check_paths = {
-    'files': ['include/vtkNek5000Reader.h', 'lib/paraview-5.10/plugins/pvNek5000Reader/libNek5000Reader.so'],
-    'dirs': ['include', 'lib', 'lib/paraview-5.10/plugins/pvNek5000Reader']
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/p/Perl/Perl-5.34.0-GCCcore-11.2.0.eb b/Golden_Repo/p/Perl/Perl-5.34.0-GCCcore-11.2.0.eb
deleted file mode 100644
index db7112625..000000000
--- a/Golden_Repo/p/Perl/Perl-5.34.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,1825 +0,0 @@
-name = 'Perl'
-version = '5.34.0'
-
-homepage = 'https://www.perl.org/'
-description = """Larry Wall's Practical Extraction and Report Language"""
-
-site_contacts = 's.achilles@fz-juelich.de'
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://www.cpan.org/src/%(version_major)s.0']
-sources = ['perl-%(version)s.tar.gz']
-checksums = ['551efc818b968b05216024fb0b727ef2ad4c100f8cb6b43fab615fa78ae5be9a']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('groff', '1.22.4'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),  # for Net::SSLeay
-    ('expat', '2.4.1'),  # for XML::Parser
-    ('libxml2', '2.9.10'),  # for XML::LibXML
-    ('ncurses', '6.2'),  # for Term::ReadLine::Gnu
-    ('libreadline', '8.1'),  # for Term::ReadLine::Gnu
-    ('DB', '18.1.40'),  # for DB_File
-    ('OpenSSL', '1.1', '', SYSTEM),  # required for Net::SSLeay
-]
-
-# !! order of extensions is important !!
-# extensions updated on Aug 3rd 2021
-exts_list = [
-    ('Config::General', '2.63', {
-        'source_tmpl': 'Config-General-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TL/TLINDEN'],
-        'checksums': ['0a9bf977b8aabe76343e88095d2296c8a422410fd2a05a1901f2b20e2e1f6fad'],
-    }),
-    ('File::Listing', '6.14', {
-        'source_tmpl': 'File-Listing-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PL/PLICEASE'],
-        'checksums': ['15b3a4871e23164a36f226381b74d450af41f12cc94985f592a669fcac7b48ff'],
-    }),
-    ('ExtUtils::InstallPaths', '0.012', {
-        'source_tmpl': 'ExtUtils-InstallPaths-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
-        'checksums': ['84735e3037bab1fdffa3c2508567ad412a785c91599db3c12593a50a1dd434ed'],
-    }),
-    ('ExtUtils::Helpers', '0.026', {
-        'source_tmpl': 'ExtUtils-Helpers-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
-        'checksums': ['de901b6790a4557cf4ec908149e035783b125bf115eb9640feb1bc1c24c33416'],
-    }),
-    ('Test::Harness', '3.42', {
-        'source_tmpl': 'Test-Harness-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
-        'checksums': ['0fd90d4efea82d6e262e6933759e85d27cbcfa4091b14bf4042ae20bab528e53'],
-    }),
-    ('ExtUtils::Config', '0.008', {
-        'source_tmpl': 'ExtUtils-Config-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
-        'checksums': ['ae5104f634650dce8a79b7ed13fb59d67a39c213a6776cfdaa3ee749e62f1a8c'],
-    }),
-    ('Module::Build::Tiny', '0.039', {
-        'source_tmpl': 'Module-Build-Tiny-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
-        'checksums': ['7d580ff6ace0cbe555bf36b86dc8ea232581530cbeaaea09bccb57b55797f11c'],
-    }),
-    ('aliased', '0.34', {
-        'source_tmpl': 'aliased-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
-        'checksums': ['c350524507cd827fab864e5d4c2cc350b1babaa12fa95aec0ca00843fcc7deeb'],
-    }),
-    ('Text::Glob', '0.11', {
-        'source_tmpl': 'Text-Glob-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RC/RCLAMP'],
-        'checksums': ['069ccd49d3f0a2dedb115f4bdc9fbac07a83592840953d1fcdfc39eb9d305287'],
-    }),
-    ('Regexp::Common', '2017060201', {
-        'source_tmpl': 'Regexp-Common-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/A/AB/ABIGAIL'],
-        'checksums': ['ee07853aee06f310e040b6bf1a0199a18d81896d3219b9b35c9630d0eb69089b'],
-    }),
-    ('GO::Utils', '0.15', {
-        'source_tmpl': 'go-perl-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/C/CM/CMUNGALL'],
-        'checksums': ['423d26155ee85ca51ab2270cee59f4e85b193e57ac3a29aff827298c0a396b12'],
-    }),
-    ('Module::Pluggable', '5.2', {
-        'source_tmpl': 'Module-Pluggable-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SI/SIMONW'],
-        'checksums': ['b3f2ad45e4fd10b3fb90d912d78d8b795ab295480db56dc64e86b9fa75c5a6df'],
-    }),
-    ('Test::Fatal', '0.016', {
-        'source_tmpl': 'Test-Fatal-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['7283d430f2ba2030b8cd979ae3039d3f1b2ec3dde1a11ca6ae09f992a66f788f'],
-    }),
-    ('Test::Warnings', '0.031', {
-        'source_tmpl': 'Test-Warnings-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
-        'checksums': ['1e542909fef305e45563e9878ea1c3b0c7cef1b28bb7ae07eba2e1efabec477b'],
-    }),
-    ('File::ShareDir', '1.118', {
-        'source_tmpl': 'File-ShareDir-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RE/REHSACK'],
-        'checksums': ['3bb2a20ba35df958dc0a4f2306fc05d903d8b8c4de3c8beefce17739d281c958'],
-    }),
-    ('File::ShareDir::Install', '0.13', {
-        'source_tmpl': 'File-ShareDir-Install-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
-        'checksums': ['45befdf0d95cbefe7c25a1daf293d85f780d6d2576146546e6828aad26e580f9'],
-    }),
-    ('DateTime::Locale', '1.32', {
-        'source_tmpl': 'DateTime-Locale-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
-        'checksums': ['78eabec73d13e1a23b0afcd1b05e84e3196258b98d1bbfafbad90d47db9c6679'],
-    }),
-    ('DateTime::TimeZone', '2.47', {
-        'source_tmpl': 'DateTime-TimeZone-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
-        'checksums': ['41617138dbb5e255fe5ac3cab6f1cc8e09f934bc95906b8cd7077192a21ef2b9'],
-    }),
-    ('Test::Requires', '0.11', {
-        'source_tmpl': 'Test-Requires-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TO/TOKUHIROM'],
-        'checksums': ['4b88de549597eecddf7c3c38a4d0204a16f59ad804577b671896ac04e24e040f'],
-    }),
-    ('Module::Implementation', '0.09', {
-        'source_tmpl': 'Module-Implementation-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
-        'checksums': ['c15f1a12f0c2130c9efff3c2e1afe5887b08ccd033bd132186d1e7d5087fd66d'],
-    }),
-    ('Module::Build', '0.4231', {
-        'source_tmpl': 'Module-Build-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
-        'checksums': ['7e0f4c692c1740c1ac84ea14d7ea3d8bc798b2fb26c09877229e04f430b2b717'],
-    }),
-    ('Module::Runtime', '0.016', {
-        'source_tmpl': 'Module-Runtime-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/Z/ZE/ZEFRAM'],
-        'checksums': ['68302ec646833547d410be28e09676db75006f4aa58a11f3bdb44ffe99f0f024'],
-    }),
-    ('Try::Tiny', '0.30', {
-        'source_tmpl': 'Try-Tiny-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
-        'checksums': ['da5bd0d5c903519bbf10bb9ba0cb7bcac0563882bcfe4503aee3fb143eddef6b'],
-    }),
-    ('Params::Validate', '1.30', {
-        'source_tmpl': 'Params-Validate-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
-        'checksums': ['9a3a35583d3125d07e8c802c1f92f5be7d526e76dd496e944da270b1e273d812'],
-    }),
-    ('List::MoreUtils', '0.430', {
-        'source_tmpl': 'List-MoreUtils-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RE/REHSACK'],
-        'checksums': ['63b1f7842cd42d9b538d1e34e0330de5ff1559e4c2737342506418276f646527'],
-    }),
-    ('Exporter::Tiny', '1.002002', {
-        'source_tmpl': 'Exporter-Tiny-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TO/TOBYINK'],
-        'checksums': ['00f0b95716b18157132c6c118ded8ba31392563d19e490433e9a65382e707101'],
-    }),
-    ('Class::Singleton', '1.6', {
-        'source_tmpl': 'Class-Singleton-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SH/SHAY'],
-        'checksums': ['27ba13f0d9512929166bbd8c9ef95d90d630fc80f0c9a1b7458891055e9282a4'],
-    }),
-    ('DateTime', '1.54', {
-        'source_tmpl': 'DateTime-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
-        'checksums': ['b12eda6d900713f227964dc4dc0e2efb86d294e8bc2f16be9e95b659f953b2e7'],
-    }),
-    ('File::Find::Rule::Perl', '1.15', {
-        'source_tmpl': 'File-Find-Rule-Perl-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
-        'checksums': ['9a48433f86e08ce18e03526e2982de52162eb909d19735460f07eefcaf463ea6'],
-    }),
-    ('Readonly', '2.05', {
-        'source_tmpl': 'Readonly-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SA/SANKO'],
-        'checksums': ['4b23542491af010d44a5c7c861244738acc74ababae6b8838d354dfb19462b5e'],
-    }),
-    ('Git', '0.42', {
-        'source_tmpl': 'Git-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MS/MSOUTH'],
-        'checksums': ['9469a9f398f3a2bf2b0500566ee41d3ff6fae460412a137185767a1cc4783a6d'],
-    }),
-    ('Tree::DAG_Node', '1.32', {
-        'source_tmpl': 'Tree-DAG_Node-%(version)s.tgz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RS/RSAVAGE'],
-        'checksums': ['22d9de3d6e6f4afd89e6d825c664f9482878bd49e29cb81342a707af40542d3d'],
-    }),
-    ('Template', '3.009', {
-        'source_tmpl': 'Template-Toolkit-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/A/AT/ATOOMIC'],
-        'checksums': ['d6ad23bbf637a59b5dfd1ac006460dfcb185982e4852cde77150fbd085f1f5b6'],
-    }),
-    ('DBI', '1.643', {
-        'source_tmpl': 'DBI-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TI/TIMB'],
-        'checksums': ['8a2b993db560a2c373c174ee976a51027dd780ec766ae17620c20393d2e836fa'],
-    }),
-    ('DBD::SQLite', '1.70', {
-        'source_tmpl': 'DBD-SQLite-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/I/IS/ISHIGAKI'],
-        'checksums': ['40fd8ddf539e0e773a7a4e6d376794c3301459f9ab0050978bdcf97113dafe3e'],
-    }),
-    ('Math::Bezier', '0.01', {
-        'source_tmpl': 'Math-Bezier-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/A/AB/ABW'],
-        'checksums': ['11a815fc45fdf0efabb1822ab77faad8b9eea162572c5f0940c8ed7d56e6b8b8'],
-    }),
-    ('Archive::Extract', '0.88', {
-        'source_tmpl': 'Archive-Extract-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
-        'checksums': ['cffcf135cd0622287d3b02154f7d6716495449fcaed03966621948e25ea5f742'],
-    }),
-    ('DBIx::Simple', '1.37', {
-        'source_tmpl': 'DBIx-Simple-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/J/JU/JUERD'],
-        'checksums': ['46d311aa2ce08907401c56119658426dbb044c5a40de73d9a7b79bf50390cae3'],
-    }),
-    ('Shell', '0.73', {
-        'source_tmpl': 'Shell-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/F/FE/FERREIRA'],
-        'checksums': ['f7dbebf65261ed0e5abd0f57052b64d665a1a830bab4c8bbc220f235bd39caf5'],
-    }),
-    ('File::Spec', '3.75', {
-        'source_tmpl': 'PathTools-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/X/XS/XSAWYERX'],
-        'checksums': ['a558503aa6b1f8c727c0073339081a77888606aa701ada1ad62dd9d8c3f945a2'],
-    }),
-    ('Test::Simple', '1.302186', {
-        'source_tmpl': 'Test-Simple-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
-        'checksums': ['2895c8da7c3fe632e5714c7cc548705202cdbf3afcbc0e929bc5e6a5172265d4'],
-    }),
-    ('Set::Scalar', '1.29', {
-        'source_tmpl': 'Set-Scalar-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DAVIDO'],
-        'checksums': ['a3dc1526f3dde72d3c64ea00007b86ce608cdcd93567cf6e6e42dc10fdc4511d'],
-    }),
-    ('IO::Stringy', '2.113', {
-        'source_tmpl': 'IO-Stringy-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/C/CA/CAPOEIRAB'],
-        'checksums': ['51220fcaf9f66a639b69d251d7b0757bf4202f4f9debd45bdd341a6aca62fe4e'],
-    }),
-    ('Encode::Locale', '1.05', {
-        'source_tmpl': 'Encode-Locale-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS'],
-        'checksums': ['176fa02771f542a4efb1dbc2a4c928e8f4391bf4078473bd6040d8f11adb0ec1'],
-    }),
-    ('XML::SAX::Base', '1.09', {
-        'source_tmpl': 'XML-SAX-Base-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GR/GRANTM'],
-        'checksums': ['66cb355ba4ef47c10ca738bd35999723644386ac853abbeb5132841f5e8a2ad0'],
-    }),
-    ('XML::NamespaceSupport', '1.12', {
-        'source_tmpl': 'XML-NamespaceSupport-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PE/PERIGRIN'],
-        'checksums': ['47e995859f8dd0413aa3f22d350c4a62da652e854267aa0586ae544ae2bae5ef'],
-    }),
-    ('XML::SAX', '1.02', {
-        'source_tmpl': 'XML-SAX-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GR/GRANTM'],
-        'checksums': ['4506c387043aa6a77b455f00f57409f3720aa7e553495ab2535263b4ed1ea12a'],
-    }),
-    ('Test::LeakTrace', '0.17', {
-        'source_tmpl': 'Test-LeakTrace-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEEJO'],
-        'checksums': ['777d64d2938f5ea586300eef97ef03eacb43d4c1853c9c3b1091eb3311467970'],
-    }),
-    ('Test::Exception', '0.43', {
-        'source_tmpl': 'Test-Exception-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
-        'checksums': ['156b13f07764f766d8b45a43728f2439af81a3512625438deab783b7883eb533'],
-    }),
-    ('Text::Aligner', '0.16', {
-        'source_tmpl': 'Text-Aligner-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF'],
-        'checksums': ['5c857dbce586f57fa3d7c4ebd320023ab3b2963b2049428ae01bd3bc4f215725'],
-    }),
-    ('Text::Table', '1.134', {
-        'source_tmpl': 'Text-Table-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF'],
-        'checksums': ['bacf429b18b7c0b22c088219055063e3902749531d488ebd7b17eab7757cd10b'],
-    }),
-    ('MIME::Types', '2.21', {
-        'source_tmpl': 'MIME-Types-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MARKOV'],
-        'checksums': ['0086454aec7144ddcaf842ec88e01d7fc27a61091454eb8f6f8afd568da68dd7'],
-    }),
-    ('File::Copy::Recursive', '0.45', {
-        'source_tmpl': 'File-Copy-Recursive-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DM/DMUEY'],
-        'checksums': ['d3971cf78a8345e38042b208bb7b39cb695080386af629f4a04ffd6549df1157'],
-    }),
-    ('Cwd::Guard', '0.05', {
-        'source_tmpl': 'Cwd-Guard-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/K/KA/KAZEBURO'],
-        'checksums': ['7afc7ca2b9502e440241938ad97a3e7ebd550180ebd6142e1db394186b268e77'],
-    }),
-    ('Capture::Tiny', '0.48', {
-        'source_tmpl': 'Capture-Tiny-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN'],
-        'checksums': ['6c23113e87bad393308c90a207013e505f659274736638d8c79bac9c67cc3e19'],
-    }),
-    ('File::Copy::Recursive::Reduced', '0.006', {
-        'source_tmpl': 'File-Copy-Recursive-Reduced-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/J/JK/JKEENAN'],
-        'checksums': ['e618f993a69f4355205c58fffff6982609f28b47f646ec6e244e41b5c6707e2c'],
-    }),
-    ('Module::Build::XSUtil', '0.19', {
-        'source_tmpl': 'Module-Build-XSUtil-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HI/HIDEAKIO'],
-        'checksums': ['9063b3c346edeb422807ffe49ffb23038c4f900d4a77b845ce4b53d97bf29400'],
-    }),
-    ('Tie::Function', '0.02', {
-        'source_tmpl': 'Tie-Function-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DAVIDNICO/handy_tied_functions'],
-        'checksums': ['0b1617af218dfab911ba0fbd72210529a246efe140332da77fe3e03d11000117'],
-    }),
-    ('Template::Plugin::Number::Format', '1.06', {
-        'source_tmpl': 'Template-Plugin-Number-Format-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DARREN'],
-        'checksums': ['0865836a1bcbc34d4a0ee34b5ccc14d7b511f1fd300bf390f002dac349539843'],
-    }),
-    ('HTML::Parser', '3.76', {
-        'source_tmpl': 'HTML-Parser-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/O/OA/OALDERS'],
-        'checksums': ['64d9e2eb2b420f1492da01ec0e6976363245b4be9290f03f10b7d2cb63fa2f61'],
-    }),
-    ('Date::Handler', '1.2', {
-        'source_tmpl': 'Date-Handler-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BB/BBEAUSEJ'],
-        'checksums': ['c36fd2b68d48c2e17417bf2873c78820f3ae02460fdf5976b8eeab887d59e16c'],
-    }),
-    ('Params::Util', '1.102', {
-        'source_tmpl': 'Params-Util-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RE/REHSACK'],
-        'checksums': ['499bb1b482db24fda277a51525596ad092c2bd51dd508fa8fec2e9f849097402'],
-    }),
-    ('IO::HTML', '1.004', {
-        'source_tmpl': 'IO-HTML-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/C/CJ/CJM'],
-        'checksums': ['c87b2df59463bbf2c39596773dfb5c03bde0f7e1051af339f963f58c1cbd8bf5'],
-    }),
-    ('Data::Grove', '0.08', {
-        'source_tmpl': 'libxml-perl-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/K/KM/KMACLEOD'],
-        'checksums': ['4571059b7b5d48b7ce52b01389e95d798bf5cf2020523c153ff27b498153c9cb'],
-    }),
-    ('Class::ISA', '0.36', {
-        'source_tmpl': 'Class-ISA-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SM/SMUELLER'],
-        'checksums': ['8816f34e9a38e849a10df756030dccf9fe061a196c11ac3faafd7113c929b964'],
-    }),
-    ('URI', '5.09', {
-        'source_tmpl': 'URI-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/O/OA/OALDERS'],
-        'checksums': ['03e63ada499d2645c435a57551f041f3943970492baa3b3338246dab6f1fae0a'],
-    }),
-    ('Ima::DBI', '0.35', {
-        'source_tmpl': 'Ima-DBI-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PE/PERRIN'],
-        'checksums': ['8b481ceedbf0ae4a83effb80581550008bfdd3885ef01145e3733c7097c00a08'],
-    }),
-    ('Tie::IxHash', '1.23', {
-        'source_tmpl': 'Tie-IxHash-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/C/CH/CHORNY'],
-        'checksums': ['fabb0b8c97e67c9b34b6cc18ed66f6c5e01c55b257dcf007555e0b027d4caf56'],
-    }),
-    ('GO', '0.04', {
-        'source_tmpl': 'go-db-perl-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SJ/SJCARBON'],
-        'checksums': ['8eb73d591ad767e7cf26def40cffd84833875f1ad51e456960b9ed73dc23641b'],
-    }),
-    ('Class::DBI::SQLite', '0.11', {
-        'source_tmpl': 'Class-DBI-SQLite-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MI/MIYAGAWA'],
-        'checksums': ['c4661b00afb7e53c97ac36e13f34dde43c1a93540a2f4ff97e6182b0c731e4e7'],
-    }),
-    ('Pod::POM', '2.01', {
-        'source_tmpl': 'Pod-POM-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/N/NE/NEILB'],
-        'checksums': ['1b50fba9bbdde3ead192beeba0eaddd0c614e3afb1743fa6fff805f57c56f7f4'],
-    }),
-    ('Math::Round', '0.07', {
-        'source_tmpl': 'Math-Round-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GR/GROMMEL'],
-        'checksums': ['73a7329a86e54a5c29a440382e5803095b58f33129e61a1df0093b4824de9327'],
-    }),
-    ('Text::Diff', '1.45', {
-        'source_tmpl': 'Text-Diff-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/N/NE/NEILB'],
-        'checksums': ['e8baa07b1b3f53e00af3636898bbf73aec9a0ff38f94536ede1dbe96ef086f04'],
-    }),
-    ('Log::Message::Simple', '0.10', {
-        'source_tmpl': 'Log-Message-Simple-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
-        'checksums': ['aa12d1a4c0ac260b94d448fa01feba242a8a85cb6cbfdc66432e3b5b468add96'],
-    }),
-    ('Net::SSLeay', '1.90', {
-        'preconfigopts': "export OPENSSL_PREFIX=$EBROOTOPENSSL && ",
-        'source_tmpl': 'Net-SSLeay-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/C/CH/CHRISN'],
-        'checksums': ['f8696cfaca98234679efeedc288a9398fcf77176f1f515dbc589ada7c650dc93'],
-    }),
-    ('IO::Socket::SSL', '2.071', {
-        'source_tmpl': 'IO-Socket-SSL-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SU/SULLR'],
-        'checksums': ['40da40948ecc9c787ed39c95715872679eebfd54243721174993a2003e32ab0a'],
-    }),
-    ('Fennec::Lite', '0.004', {
-        'source_tmpl': 'Fennec-Lite-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
-        'checksums': ['dce28e3932762c2ff92aa52d90405c06e898e81cb7b164ccae8966ae77f1dcab'],
-    }),
-    ('Sub::Uplevel', '0.2800', {
-        'source_tmpl': 'Sub-Uplevel-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN'],
-        'checksums': ['b4f3f63b80f680a421332d8851ddbe5a8e72fcaa74d5d1d98f3c8cc4a3ece293'],
-    }),
-    ('Meta::Builder', '0.004', {
-        'source_tmpl': 'Meta-Builder-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
-        'checksums': ['acb499aa7206eb9db21eb85357a74521bfe3bdae4a6416d50a7c75b939cf56fe'],
-    }),
-    ('Exporter::Declare', '0.114', {
-        'source_tmpl': 'Exporter-Declare-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
-        'checksums': ['4bd70d6ca76f6f6ba7e4c618d4ac93b8593a58f1233ccbe18b10f5f204f1d4e4'],
-    }),
-    ('Getopt::Long', '2.52', {
-        'source_tmpl': 'Getopt-Long-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/J/JV/JV'],
-        'checksums': ['9dc7a7c373353d5c05efae548e7b123aa8a31d1f506eb8dbbec8f0dca77705fa'],
-    }),
-    ('Log::Message', '0.08', {
-        'source_tmpl': 'Log-Message-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
-        'checksums': ['bd697dd62aaf26d118e9f0a0813429deb1c544e4501559879b61fcbdfe99fe46'],
-    }),
-    ('Mouse', 'v2.5.10', {
-        'source_tmpl': 'Mouse-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SK/SKAJI'],
-        'checksums': ['ce8dc23946153a467ff09765167ee2590f5c502120f48a2d9441733f39aa32ee'],
-    }),
-    ('Test::Version', '2.09', {
-        'source_tmpl': 'Test-Version-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PL/PLICEASE'],
-        'checksums': ['9ce1dd2897a5f30e1b7f8966ec66f57d8d8f280f605f28c7ca221fa79aca38e0'],
-    }),
-    ('DBIx::Admin::TableInfo', '3.04', {
-        'source_tmpl': 'DBIx-Admin-TableInfo-%(version)s.tgz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RS/RSAVAGE'],
-        'checksums': ['b9625992683b97378bea0947773f50e3c9f81974048b84f4c3422cae7e6082f4'],
-    }),
-    ('Net::HTTP', '6.21', {
-        'source_tmpl': 'Net-HTTP-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/O/OA/OALDERS'],
-        'checksums': ['375aa35b76be99f06464089174d66ac76f78ce83a5c92a907bbfab18b099eec4'],
-    }),
-    ('Test::Deep', '1.130', {
-        'source_tmpl': 'Test-Deep-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['4064f494f5f62587d0ae501ca439105821ee5846c687dc6503233f55300a7c56'],
-    }),
-    ('Test::Warn', '0.36', {
-        'source_tmpl': 'Test-Warn-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BIGJ'],
-        'checksums': ['ecbca346d379cef8d3c0e4ac0c8eb3b2613d737ffaaeae52271c38d7bf3c6cda'],
-    }),
-    ('MRO::Compat', '0.13', {
-        'source_tmpl': 'MRO-Compat-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HA/HAARG'],
-        'checksums': ['8a2c3b6ccc19328d5579d02a7d91285e2afd85d801f49d423a8eb16f323da4f8'],
-    }),
-    ('Moo', '2.005004', {
-        'source_tmpl': 'Moo-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HA/HAARG'],
-        'checksums': ['e3030b80bd554a66f6b3c27fd53b1b5909d12af05c4c11ece9a58f8d1e478928'],
-    }),
-    ('Clone::Choose', '0.010', {
-        'source_tmpl': 'Clone-Choose-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HE/HERMES'],
-        'checksums': ['5623481f58cee8edb96cd202aad0df5622d427e5f748b253851dfd62e5123632'],
-    }),
-    ('Hash::Merge', '0.302', {
-        'source_tmpl': 'Hash-Merge-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HE/HERMES'],
-        'checksums': ['ae0522f76539608b61dde14670e79677e0f391036832f70a21f31adde2538644'],
-    }),
-    ('SQL::Abstract', '2.000001', {
-        'source_tmpl': 'SQL-Abstract-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MS/MSTROUT'],
-        'checksums': ['35a642662c349420d44be6e0ef7d8765ea743eb12ad14399aa3a232bb94e6e9a'],
-    }),
-    ('HTML::Form', '6.07', {
-        'source_tmpl': 'HTML-Form-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/O/OA/OALDERS'],
-        'checksums': ['7daa8c7eaff4005501c3431c8bf478d58bbee7b836f863581aa14afe1b4b6227'],
-    }),
-    ('Number::Compare', '0.03', {
-        'source_tmpl': 'Number-Compare-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RC/RCLAMP'],
-        'checksums': ['83293737e803b43112830443fb5208ec5208a2e6ea512ed54ef8e4dd2b880827'],
-    }),
-    ('IPC::Run', '20200505.0', {
-        'source_tmpl': 'IPC-Run-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TO/TODDR'],
-        'checksums': ['816ebf217fa0df99c583d73c0acc6ced78ac773787c664c75cbf140bb7e4c901'],
-    }),
-    ('HTML::Entities::Interpolate', '1.10', {
-        'source_tmpl': 'HTML-Entities-Interpolate-%(version)s.tgz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RS/RSAVAGE'],
-        'checksums': ['f15a9df92c282419f7010964aca1ada844ddfae7afc735cd2ba1bb20883e955c'],
-    }),
-    ('File::Remove', '1.60', {
-        'source_tmpl': 'File-Remove-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF'],
-        'checksums': ['e86e2a40ffedc6d5697d071503fd6ba14a5f9b8220af3af022110d8e724f8ca6'],
-    }),
-    ('YAML::Tiny', '1.73', {
-        'source_tmpl': 'YAML-Tiny-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
-        'checksums': ['bc315fa12e8f1e3ee5e2f430d90b708a5dc7e47c867dba8dce3a6b8fbe257744'],
-    }),
-    ('Module::Install', '1.19', {
-        'source_tmpl': 'Module-Install-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
-        'checksums': ['1a53a78ddf3ab9e3c03fc5e354b436319a944cba4281baf0b904fa932a13011b'],
-    }),
-    ('Config::Tiny', '2.26', {
-        'source_tmpl': 'Config-Tiny-%(version)s.tgz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RS/RSAVAGE'],
-        'checksums': ['83b53291baec7884fbdfeb2a231297202df266cac58638b895ce25ec877dcf5f'],
-    }),
-    ('Test::ClassAPI', '1.07', {
-        'source_tmpl': 'Test-ClassAPI-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
-        'checksums': ['30e9dbfc5e0cc2ee14eae8f3465a908a710daecbd0a3ebdb2888fc4504fa18aa'],
-    }),
-    ('Test::Most', '0.37', {
-        'source_tmpl': 'Test-Most-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/O/OV/OVID'],
-        'checksums': ['533370141eb9f18cf4ac380f6ded2ab57802a6e184008a80fd2304bfcc474fc7'],
-    }),
-    ('Class::Accessor', '0.51', {
-        'source_tmpl': 'Class-Accessor-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/K/KA/KASEI'],
-        'checksums': ['bf12a3e5de5a2c6e8a447b364f4f5a050bf74624c56e315022ae7992ff2f411c'],
-    }),
-    ('Test::Differences', '0.68', {
-        'source_tmpl': 'Test-Differences-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DC/DCANTRELL'],
-        'checksums': ['e68547206cb099a2594165ca0adc99fc12adb97c7f02a1222f62961fd775e270'],
-    }),
-    ('HTTP::Tiny', '0.078', {
-        'source_tmpl': 'HTTP-Tiny-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN'],
-        'checksums': ['6d150215b0177bef1ff4f0d9a42abecc08507872e09417b01e6b57092d2e48c2'],
-    }),
-    ('Package::DeprecationManager', '0.17', {
-        'source_tmpl': 'Package-DeprecationManager-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
-        'checksums': ['1d743ada482b5c9871d894966e87d4c20edc96931bb949fb2638b000ddd6684b'],
-    }),
-    ('Digest::SHA1', '2.13', {
-        'source_tmpl': 'Digest-SHA1-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS'],
-        'checksums': ['68c1dac2187421f0eb7abf71452a06f190181b8fc4b28ededf5b90296fb943cc'],
-    }),
-    ('Date::Language', '2.33', {
-        'source_tmpl': 'TimeDate-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/A/AT/ATOOMIC'],
-        'checksums': ['c0b69c4b039de6f501b0d9f13ec58c86b040c1f7e9b27ef249651c143d605eb2'],
-    }),
-    ('version', '0.9929', {
-        'source_tmpl': 'version-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
-        'checksums': ['5056ed481ada4e0fa497096d4091b18658f214d862e1ed164edf10bc6b39c8b0'],
-    }),
-    ('Sub::Uplevel', '0.2800', {
-        'source_tmpl': 'Sub-Uplevel-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN'],
-        'checksums': ['b4f3f63b80f680a421332d8851ddbe5a8e72fcaa74d5d1d98f3c8cc4a3ece293'],
-    }),
-    ('XML::Bare', '0.53', {
-        'source_tmpl': 'XML-Bare-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/C/CO/CODECHILD'],
-        'checksums': ['865e198e98d904be1683ef5a53a4948f02dabdacde59fc554a082ffbcc5baefd'],
-    }),
-    ('Dist::CheckConflicts', '0.11', {
-        'source_tmpl': 'Dist-CheckConflicts-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DO/DOY'],
-        'checksums': ['ea844b9686c94d666d9d444321d764490b2cde2f985c4165b4c2c77665caedc4'],
-    }),
-    ('Sub::Name', '0.26', {
-        'source_tmpl': 'Sub-Name-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
-        'checksums': ['2d2f2d697d516c89547e7c4307f1e79441641cae2c7395e7319b306d390df105'],
-    }),
-    ('Time::Piece', '1.3401', {
-        'source_tmpl': 'Time-Piece-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ES/ESAYM'],
-        'checksums': ['4b55b7bb0eab45cf239a54dfead277dfa06121a43e63b3fce0853aecfdb04c27'],
-    }),
-    ('Digest::HMAC', '1.04', {
-        'source_tmpl': 'Digest-HMAC-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/A/AR/ARODLAND'],
-        'checksums': ['d6bc8156aa275c44d794b7c18f44cdac4a58140245c959e6b19b2c3838b08ed4'],
-    }),
-    ('HTTP::Negotiate', '6.01', {
-        'source_tmpl': 'HTTP-Negotiate-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS'],
-        'checksums': ['1c729c1ea63100e878405cda7d66f9adfd3ed4f1d6cacaca0ee9152df728e016'],
-    }),
-    ('MIME::Lite', '3.033', {
-        'source_tmpl': 'MIME-Lite-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['78a279f1d2e242551c347ef97a13fc675766602cb84c2a80c569400f4f368bab'],
-    }),
-    ('Crypt::Rijndael', '1.16', {
-        'source_tmpl': 'Crypt-Rijndael-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
-        'checksums': ['6540085e3804b82a6f0752c1122cf78cadd221990136dd6fd4c097d056c84d40'],
-    }),
-    ('B::Lint', '1.20', {
-        'source_tmpl': 'B-Lint-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['dc49408964fd8b7963859c92e013f0b9f92f74be5a7c2a78e3996279827c10b3'],
-    }),
-    ('Canary::Stability', '2013', {
-        'source_tmpl': 'Canary-Stability-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/M/ML/MLEHMANN'],
-        'checksums': ['a5c91c62cf95fcb868f60eab5c832908f6905221013fea2bce3ff57046d7b6ea'],
-    }),
-    ('AnyEvent', '7.17', {
-        'source_tmpl': 'AnyEvent-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/M/ML/MLEHMANN'],
-        'checksums': ['50beea689c098fe4aaeb83806c40b9fe7f946d5769acf99f849f099091a4b985'],
-    }),
-    ('Object::Accessor', '0.48', {
-        'source_tmpl': 'Object-Accessor-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
-        'checksums': ['76cb824a27b6b4e560409fcf6fd5b3bfbbd38b72f1f3d37ed0b54bd9c0baeade'],
-    }),
-    ('Data::UUID', '1.226', {
-        'source_tmpl': 'Data-UUID-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['093d57ffa0d411a94bafafae495697db26f5c9d0277198fe3f7cf2be22996453'],
-    }),
-    ('Test::Pod', '1.52', {
-        'source_tmpl': 'Test-Pod-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
-        'checksums': ['60a8dbcc60168bf1daa5cc2350236df9343e9878f4ab9830970a5dde6fe8e5fc'],
-    }),
-    ('AppConfig', '1.71', {
-        'source_tmpl': 'AppConfig-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/N/NE/NEILB'],
-        'checksums': ['1177027025ecb09ee64d9f9f255615c04db5e14f7536c344af632032eb887b0f'],
-    }),
-    ('Net::SMTP::SSL', '1.04', {
-        'source_tmpl': 'Net-SMTP-SSL-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['7b29c45add19d3d5084b751f7ba89a8e40479a446ce21cfd9cc741e558332a00'],
-    }),
-    ('XML::Tiny', '2.07', {
-        'source_tmpl': 'XML-Tiny-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DC/DCANTRELL'],
-        'checksums': ['ce39fcb53e0fe9f1cbcd86ddf152e1db48566266b70ec0769ef364eeabdd8941'],
-    }),
-    ('HTML::Tagset', '3.20', {
-        'source_tmpl': 'HTML-Tagset-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PE/PETDANCE'],
-        'checksums': ['adb17dac9e36cd011f5243881c9739417fd102fce760f8de4e9be4c7131108e2'],
-    }),
-    ('HTML::Tree', '5.07', {
-        'source_tmpl': 'HTML-Tree-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/K/KE/KENTNL'],
-        'checksums': ['f0374db84731c204b86c1d5b90975fef0d30a86bd9def919343e554e31a9dbbf'],
-    }),
-    ('Devel::GlobalDestruction', '0.14', {
-        'source_tmpl': 'Devel-GlobalDestruction-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HA/HAARG'],
-        'checksums': ['34b8a5f29991311468fe6913cadaba75fd5d2b0b3ee3bb41fe5b53efab9154ab'],
-    }),
-    ('WWW::RobotRules', '6.02', {
-        'source_tmpl': 'WWW-RobotRules-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS'],
-        'checksums': ['46b502e7a288d559429891eeb5d979461dd3ecc6a5c491ead85d165b6e03a51e'],
-    }),
-    ('Expect', '1.35', {
-        'source_tmpl': 'Expect-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/J/JA/JACOBY'],
-        'checksums': ['09d92761421decd495853103379165a99efbf452c720f30277602cf23679fd06'],
-    }),
-    ('Term::UI', '0.48', {
-        'source_tmpl': 'Term-UI-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
-        'checksums': ['1e1e300a62b932acd7511c31c6b59efd92b0aab8eaac863a6c0121a4c246dd34'],
-    }),
-    ('Net::SNMP', 'v6.0.1', {
-        'source_tmpl': 'Net-SNMP-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DT/DTOWN'],
-        'checksums': ['14c37bc1cbb3f3cdc7d6c13e0f27a859f14cdcfd5ea54a0467a88bc259b0b741'],
-    }),
-    ('XML::Filter::BufferText', '1.01', {
-        'source_tmpl': 'XML-Filter-BufferText-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RB/RBERJON'],
-        'checksums': ['8fd2126d3beec554df852919f4739e689202cbba6a17506e9b66ea165841a75c'],
-    }),
-    ('XML::SAX::Writer', '0.57', {
-        'source_tmpl': 'XML-SAX-Writer-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PE/PERIGRIN'],
-        'checksums': ['3d61d07ef43b0126f5b4de4f415a256fa859fa88dc4fdabaad70b7be7c682cf0'],
-    }),
-    ('Statistics::Descriptive', '3.0800', {
-        'source_tmpl': 'Statistics-Descriptive-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF'],
-        'checksums': ['b04edeea26bfed435aa6029956798c281f7f52d4545f3f45b2ad44954e96f939'],
-    }),
-    ('Class::Load', '0.25', {
-        'source_tmpl': 'Class-Load-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
-        'checksums': ['2a48fa779b5297e56156380e8b32637c6c58decb4f4a7f3c7350523e11275f8f'],
-    }),
-    ('LWP::Simple', '6.55', {
-        'source_tmpl': 'libwww-perl-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/O/OA/OALDERS'],
-        'checksums': ['c1d0d3a44a039b136ebac7336f576e3f5c232347e8221abd69ceb4108e85c920'],
-    }),
-    ('Time::Piece::MySQL', '0.06', {
-        'source_tmpl': 'Time-Piece-MySQL-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/K/KA/KASEI'],
-        'checksums': ['319601feec17fae344988a5ee91cfc6a0bcfe742af77dba254724c3268b2a60f'],
-    }),
-    ('Package::Stash::XS', '0.29', {
-        'source_tmpl': 'Package-Stash-XS-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
-        'checksums': ['d3676ba94641e03d6a30e951f09266c4c3ca3f5b58aa7b314a67f28e419878aa'],
-    }),
-    ('Set::Array', '0.30', {
-        'source_tmpl': 'Set-Array-%(version)s.tgz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RS/RSAVAGE'],
-        'checksums': ['d9f024c8e3637feccdebcf6479b6754b6c92f1209f567feaf0c23818af31ee3c'],
-    }),
-    ('boolean', '0.46', {
-        'source_tmpl': 'boolean-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/I/IN/INGY'],
-        'checksums': ['95c088085c3e83bf680fe6ce16d8264ec26310490f7d1680e416ea7a118f156a'],
-    }),
-    ('Number::Format', '1.75', {
-        'source_tmpl': 'Number-Format-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/W/WR/WRW'],
-        'checksums': ['82d659cb16461764fd44d11a9ce9e6a4f5e8767dc1069eb03467c6e55de257f3'],
-    }),
-    ('Data::Stag', '0.14', {
-        'source_tmpl': 'Data-Stag-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/C/CM/CMUNGALL'],
-        'checksums': ['4ab122508d2fb86d171a15f4006e5cf896d5facfa65219c0b243a89906258e59'],
-    }),
-    ('Test::NoWarnings', '1.06', {
-        'source_tmpl': 'Test-NoWarnings-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HA/HAARG'],
-        'checksums': ['c2dc51143b7eb63231210e27df20d2c8393772e0a333547ec8b7a205ed62f737'],
-    }),
-    ('Crypt::DES', '2.07', {
-        'source_tmpl': 'Crypt-DES-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DP/DPARIS'],
-        'checksums': ['2db1ebb5837b4cb20051c0ee5b733b4453e3137df0a92306034c867621edd7e7'],
-    }),
-    ('Exporter', '5.74', {
-        'source_tmpl': 'Exporter-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TO/TODDR'],
-        'checksums': ['eadb889ef673ad940da6aa4f6f7d75fc1e625ae786ae3533fd313eaf629945b8'],
-    }),
-    ('Class::Inspector', '1.36', {
-        'source_tmpl': 'Class-Inspector-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PL/PLICEASE'],
-        'checksums': ['cc295d23a472687c24489d58226ead23b9fdc2588e522f0b5f0747741700694e'],
-    }),
-    ('Parse::RecDescent', '1.967015', {
-        'source_tmpl': 'Parse-RecDescent-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/J/JT/JTBRAUN'],
-        'checksums': ['1943336a4cb54f1788a733f0827c0c55db4310d5eae15e542639c9dd85656e37'],
-    }),
-    ('Carp', '1.50', {
-        'source_tmpl': 'Carp-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/X/XS/XSAWYERX'],
-        'checksums': ['f5273b4e1a6d51b22996c48cb3a3cbc72fd456c4038f5c20b127e2d4bcbcebd9'],
-    }),
-    ('XML::Parser', '2.46', {
-        'source_tmpl': 'XML-Parser-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TO/TODDR'],
-        'checksums': ['d331332491c51cccfb4cb94ffc44f9cd73378e618498d4a37df9e043661c515d'],
-    }),
-    ('XML::XPath', '1.44', {
-        'source_tmpl': 'XML-XPath-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MANWAR'],
-        'checksums': ['1cc9110705165dc09dd09974dd7c0b6709c9351d6b6b1cef5a711055f891dd0f'],
-    }),
-    ('JSON', '4.03', {
-        'source_tmpl': 'JSON-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/I/IS/ISHIGAKI'],
-        'checksums': ['e41f8761a5e7b9b27af26fe5780d44550d7a6a66bf3078e337d676d07a699941'],
-    }),
-    ('Sub::Exporter', '0.988', {
-        'source_tmpl': 'Sub-Exporter-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['23324887d6c590f145702f077d8ca42f1b2f26a3b76f08d66c2c1e21e606040c'],
-    }),
-    ('Class::Load::XS', '0.10', {
-        'source_tmpl': 'Class-Load-XS-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
-        'checksums': ['5bc22cf536ebfd2564c5bdaf42f0d8a4cee3d1930fc8b44b7d4a42038622add1'],
-    }),
-    ('Set::IntSpan::Fast', '1.15', {
-        'source_tmpl': 'Set-IntSpan-Fast-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/A/AN/ANDYA'],
-        'checksums': ['cfb1768c24f55208e87405b17f537f0f303fa141891d0b22d509a941aa57e24e'],
-    }),
-    ('Sub::Exporter::Progressive', '0.001013', {
-        'source_tmpl': 'Sub-Exporter-Progressive-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/F/FR/FREW'],
-        'checksums': ['d535b7954d64da1ac1305b1fadf98202769e3599376854b2ced90c382beac056'],
-    }),
-    ('Data::Dumper::Concise', '2.023', {
-        'source_tmpl': 'Data-Dumper-Concise-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
-        'checksums': ['a6c22f113caf31137590def1b7028a7e718eface3228272d0672c25e035d5853'],
-    }),
-    ('File::Slurp::Tiny', '0.004', {
-        'source_tmpl': 'File-Slurp-Tiny-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
-        'checksums': ['452995beeabf0e923e65fdc627a725dbb12c9e10c00d8018c16d10ba62757f1e'],
-    }),
-    ('Algorithm::Diff', '1.201', {
-        'source_tmpl': 'Algorithm-Diff-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['0022da5982645d9ef0207f3eb9ef63e70e9713ed2340ed7b3850779b0d842a7d'],
-    }),
-    ('Text::Iconv', '1.7', {
-        'source_tmpl': 'Text-Iconv-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MP/MPIOTR'],
-        'checksums': ['5b80b7d5e709d34393bcba88971864a17b44a5bf0f9e4bcee383d029e7d2d5c3'],
-    }),
-    ('Class::Data::Inheritable', '0.09', {
-        'source_tmpl': 'Class-Data-Inheritable-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RS/RSHERER'],
-        'checksums': ['44088d6e90712e187b8a5b050ca5b1c70efe2baa32ae123e9bd8f59f29f06e4d'],
-    }),
-    ('Text::Balanced', '2.04', {
-        'source_tmpl': 'Text-Balanced-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SH/SHAY'],
-        'checksums': ['f49c408b85c80ba762785428a87599bed22dc0fd6bb765c9fa6ddfaa32e4e7e2'],
-    }),
-    ('strictures', '2.000006', {
-        'source_tmpl': 'strictures-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HA/HAARG'],
-        'checksums': ['09d57974a6d1b2380c802870fed471108f51170da81458e2751859f2714f8d57'],
-    }),
-    ('Switch', '2.17', {
-        'source_tmpl': 'Switch-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/C/CH/CHORNY'],
-        'checksums': ['31354975140fe6235ac130a109496491ad33dd42f9c62189e23f49f75f936d75'],
-    }),
-    ('File::Which', '1.27', {
-        'source_tmpl': 'File-Which-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PL/PLICEASE'],
-        'checksums': ['3201f1a60e3f16484082e6045c896842261fc345de9fb2e620fd2a2c7af3a93a'],
-    }),
-    ('Email::Date::Format', '1.005', {
-        'source_tmpl': 'Email-Date-Format-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['579c617e303b9d874411c7b61b46b59d36f815718625074ae6832e7bb9db5104'],
-    }),
-    ('Error', '0.17029', {
-        'source_tmpl': 'Error-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF'],
-        'checksums': ['1a23f7913032aed6d4b68321373a3899ca66590f4727391a091ec19c95bf7adc'],
-    }),
-    ('Mock::Quick', '1.111', {
-        'source_tmpl': 'Mock-Quick-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
-        'checksums': ['ff786008bf8c022064ececd3b7ed89c76b35e8d1eac6cf472a9f51771c1c9f2c'],
-    }),
-    ('Text::CSV', '2.01', {
-        'source_tmpl': 'Text-CSV-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/I/IS/ISHIGAKI'],
-        'checksums': ['2a90a5eea3f22c40b87932a929621680609ab5f6b874a77c4134c8a04eb8e74b'],
-    }),
-    ('Test::Output', '1.033', {
-        'source_tmpl': 'Test-Output-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BD/BDFOY'],
-        'checksums': ['f6a8482740b075fad22aaf4d987d38ef927c6d2b452d4ae0d0bd8f779830556e'],
-    }),
-    ('Class::DBI', 'v3.0.17', {
-        'source_tmpl': 'Class-DBI-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TM/TMTM'],
-        'checksums': ['541354fe361c56850cb11261f6ca089a14573fa764792447444ff736ae626206'],
-    }),
-    ('List::SomeUtils', '0.58', {
-        'source_tmpl': 'List-SomeUtils-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
-        'checksums': ['96eafb359339d22bf2a2de421298847a3c40f6a28b6d44005d0965da86a5469d'],
-    }),
-    ('List::UtilsBy', '0.11', {
-        'source_tmpl': 'List-UtilsBy-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PE/PEVANS'],
-        'checksums': ['faddf43b4bc21db8e4c0e89a26e5f23fe626cde3491ec651b6aa338627f5775a'],
-    }),
-    ('List::AllUtils', '0.19', {
-        'source_tmpl': 'List-AllUtils-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
-        'checksums': ['30a8146ab21a7787b8c56d5829cf9a7f2b15276d3b3fca07336ac38d3002ffbc'],
-    }),
-    ('UNIVERSAL::moniker', '0.08', {
-        'source_tmpl': 'UNIVERSAL-moniker-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/K/KA/KASEI'],
-        'checksums': ['94ce27a546cd57cb52e080a8f2533a7cc2350028388582485bd1039a37871f9c'],
-    }),
-    ('Exception::Class', '1.45', {
-        'source_tmpl': 'Exception-Class-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
-        'checksums': ['5482a77ef027ca1f9f39e1f48c558356e954936fc8fbbdee6c811c512701b249'],
-    }),
-    ('File::CheckTree', '4.42', {
-        'source_tmpl': 'File-CheckTree-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['66fb417f8ff8a5e5b7ea25606156e70e204861c59fa8c3831925b4dd3f155f8a'],
-    }),
-    ('Math::VecStat', '0.08', {
-        'source_tmpl': 'Math-VecStat-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/A/AS/ASPINELLI'],
-        'checksums': ['409a8e0e4b1025c8e80f628f65a9778aa77ab285161406ca4a6c097b13656d0d'],
-    }),
-    ('Pod::LaTeX', '0.61', {
-        'source_tmpl': 'Pod-LaTeX-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TJ/TJENNESS'],
-        'checksums': ['15a840ea1c8a76cd3c865fbbf2fec33b03615c0daa50f9c800c54e0cf0659d46'],
-    }),
-    ('Eval::Closure', '0.14', {
-        'source_tmpl': 'Eval-Closure-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DO/DOY'],
-        'checksums': ['ea0944f2f5ec98d895bef6d503e6e4a376fea6383a6bc64c7670d46ff2218cad'],
-    }),
-    ('HTTP::Request', '6.33', {
-        'source_tmpl': 'HTTP-Message-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/O/OA/OALDERS'],
-        'checksums': ['23b967f71b852cb209ec92a1af6bac89a141dff1650d69824d29a345c1eceef7'],
-    }),
-    ('XML::Twig', '3.52', {
-        'source_tmpl': 'XML-Twig-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MI/MIROD'],
-        'checksums': ['fef75826c24f2b877d0a0d2645212fc4fb9756ed4d2711614ac15c497e8680ad'],
-    }),
-    ('IO::String', '1.08', {
-        'source_tmpl': 'IO-String-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS'],
-        'checksums': ['2a3f4ad8442d9070780e58ef43722d19d1ee21a803bf7c8206877a10482de5a0'],
-    }),
-    ('XML::Simple', '2.25', {
-        'source_tmpl': 'XML-Simple-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GR/GRANTM'],
-        'checksums': ['531fddaebea2416743eb5c4fdfab028f502123d9a220405a4100e68fc480dbf8'],
-    }),
-    ('Sub::Install', '0.928', {
-        'source_tmpl': 'Sub-Install-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['61e567a7679588887b7b86d427bc476ea6d77fffe7e0d17d640f89007d98ef0f'],
-    }),
-    ('HTTP::Cookies', '6.10', {
-        'source_tmpl': 'HTTP-Cookies-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/O/OA/OALDERS'],
-        'checksums': ['e36f36633c5ce6b5e4b876ffcf74787cc5efe0736dd7f487bdd73c14f0bd7007'],
-    }),
-    ('Pod::Plainer', '1.04', {
-        'source_tmpl': 'Pod-Plainer-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RM/RMBARKER'],
-        'checksums': ['1bbfbf7d1d4871e5a83bab2137e22d089078206815190eb1d5c1260a3499456f'],
-    }),
-    ('Test::Exception::LessClever', '0.009', {
-        'source_tmpl': 'Test-Exception-LessClever-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
-        'checksums': ['3b2731a44956a11f74b46b3ecf0734fab651e1c0bcf120f8b407aa1b4d43ac34'],
-    }),
-    ('LWP::MediaTypes', '6.04', {
-        'source_tmpl': 'LWP-MediaTypes-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/O/OA/OALDERS'],
-        'checksums': ['8f1bca12dab16a1c2a7c03a49c5e58cce41a6fec9519f0aadfba8dad997919d9'],
-    }),
-    ('Scalar::List::Utils', '1.56', {
-        'modulename': 'List::Util',
-        'source_tmpl': 'Scalar-List-Utils-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PE/PEVANS'],
-        'checksums': ['15b8537d40fb3e6dae64b2e7e983c47a99b2c20816a180bb9c868b787a12ab5b'],
-    }),
-    ('Data::Section::Simple', '0.07', {
-        'source_tmpl': 'Data-Section-Simple-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MI/MIYAGAWA'],
-        'checksums': ['0b3035ffdb909aa1f7ded6b608fa9d894421c82c097d51e7171170d67579a9cb'],
-    }),
-    ('Class::Trigger', '0.15', {
-        'source_tmpl': 'Class-Trigger-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MI/MIYAGAWA'],
-        'checksums': ['b7a878d44dea67d64df2ca18020d9d868a95596debd16f1a264874209332b07f'],
-    }),
-    ('HTTP::Daemon', '6.12', {
-        'source_tmpl': 'HTTP-Daemon-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/O/OA/OALDERS'],
-        'checksums': ['df47bed10c38670c780fd0116867d5fd4693604acde31ba63380dce04c4e1fa6'],
-    }),
-    ('File::HomeDir', '1.006', {
-        'source_tmpl': 'File-HomeDir-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RE/REHSACK'],
-        'checksums': ['593737c62df0f6dab5d4122e0b4476417945bb6262c33eedc009665ef1548852'],
-    }),
-    ('HTTP::Date', '6.05', {
-        'source_tmpl': 'HTTP-Date-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/O/OA/OALDERS'],
-        'checksums': ['365d6294dfbd37ebc51def8b65b81eb79b3934ecbc95a2ec2d4d827efe6a922b'],
-    }),
-    ('Authen::SASL', '2.16', {
-        'source_tmpl': 'Authen-SASL-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GB/GBARR'],
-        'checksums': ['6614fa7518f094f853741b63c73f3627168c5d3aca89b1d02b1016dc32854e09'],
-    }),
-    ('Clone', '0.45', {
-        'source_tmpl': 'Clone-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/A/AT/ATOOMIC'],
-        'checksums': ['cbb6ee348afa95432e4878893b46752549e70dc68fe6d9e430d1d2e99079a9e6'],
-    }),
-    ('Data::Types', '0.17', {
-        'source_tmpl': 'Data-Types-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MANWAR'],
-        'checksums': ['860751feb79b7dfc1af71c4b7fe920220ec6d31c4ab9402b8f178f7f4b8293c1'],
-    }),
-    ('Import::Into', '1.002005', {
-        'source_tmpl': 'Import-Into-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HA/HAARG'],
-        'checksums': ['bd9e77a3fb662b40b43b18d3280cd352edf9fad8d94283e518181cc1ce9f0567'],
-    }),
-    ('DateTime::Tiny', '1.07', {
-        'source_tmpl': 'DateTime-Tiny-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN'],
-        'checksums': ['83568a22838cb518fbeb9e060460ec7f59d5a0b0a1cc06562954c3674d7cf7e4'],
-    }),
-    ('Text::Format', '0.62', {
-        'source_tmpl': 'Text-Format-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF'],
-        'checksums': ['7d429057319e123c590ba0765334f0ade4a5eb9ea8db7c0ec4d3902de5f90404'],
-    }),
-    ('Devel::CheckCompiler', '0.07', {
-        'source_tmpl': 'Devel-CheckCompiler-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SY/SYOHEX'],
-        'checksums': ['768b7697b4b8d4d372c7507b65e9dd26aa4223f7100183bbb4d3af46d43869b5'],
-    }),
-    ('Log::Handler', '0.90', {
-        'source_tmpl': 'Log-Handler-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BL/BLOONIX'],
-        'checksums': ['3a5c80e7128454770f83acab8cbd3e70e5ec3d59a61dc32792a178f0b31bf74d'],
-    }),
-    ('DBIx::ContextualFetch', '1.03', {
-        'source_tmpl': 'DBIx-ContextualFetch-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TM/TMTM'],
-        'checksums': ['85e2f805bfc81cd738c294316b27a515397036f397a0ff1c6c8d754c38530306'],
-    }),
-    ('Devel::StackTrace', '2.04', {
-        'source_tmpl': 'Devel-StackTrace-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
-        'checksums': ['cd3c03ed547d3d42c61fa5814c98296139392e7971c092e09a431f2c9f5d6855'],
-    }),
-    ('Term::ReadKey', '2.38', {
-        'source_tmpl': 'TermReadKey-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/J/JS/JSTOWE'],
-        'checksums': ['5a645878dc570ac33661581fbb090ff24ebce17d43ea53fd22e105a856a47290'],
-    }),
-    ('Set::IntSpan', '1.19', {
-        'source_tmpl': 'Set-IntSpan-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SW/SWMCD'],
-        'checksums': ['11b7549b13ec5d87cc695dd4c777cd02983dd5fe9866012877fb530f48b3dfd0'],
-    }),
-    ('Moose', '2.2015', {
-        'source_tmpl': 'Moose-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
-        'checksums': ['a679d39d3e2c075a88fe7de034923e7ed7caca465da188337eb1043af050f515'],
-    }),
-    ('Algorithm::Dependency', '1.112', {
-        'source_tmpl': 'Algorithm-Dependency-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
-        'checksums': ['7e0fb7c39f56a2dccf9d0295c82f3031ee116e807f6a12a438fa4dd41b0ec187'],
-    }),
-    ('Font::TTF', '1.06', {
-        'source_tmpl': 'Font-TTF-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BH/BHALLISSY'],
-        'checksums': ['4b697d444259759ea02d2c442c9bffe5ffe14c9214084a01f743693a944cc293'],
-    }),
-    ('IPC::Run3', '0.048', {
-        'source_tmpl': 'IPC-Run3-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['3d81c3cc1b5cff69cca9361e2c6e38df0352251ae7b41e2ff3febc850e463565'],
-    }),
-    ('File::Find::Rule', '0.34', {
-        'source_tmpl': 'File-Find-Rule-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RC/RCLAMP'],
-        'checksums': ['7e6f16cc33eb1f29ff25bee51d513f4b8a84947bbfa18edb2d3cc40a2d64cafe'],
-    }),
-    ('SQL::Statement', '1.414', {
-        'source_tmpl': 'SQL-Statement-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RE/REHSACK'],
-        'checksums': ['dde8bdcfa6a136eedda06519ba0f3efaec085c39db0df9c472dc0ec6cd781a49'],
-    }),
-    ('File::Slurp', '9999.32', {
-        'source_tmpl': 'File-Slurp-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/C/CA/CAPOEIRAB'],
-        'checksums': ['4c3c21992a9d42be3a79dd74a3c83d27d38057269d65509a2f555ea0fb2bc5b0'],
-    }),
-    ('Package::Stash', '0.39', {
-        'source_tmpl': 'Package-Stash-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
-        'checksums': ['9165f555112e080493ce0e9129de0886da30b2593fb353a2abd1c76b2d2621b5'],
-    }),
-    ('Data::OptList', '0.112', {
-        'source_tmpl': 'Data-OptList-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['62c60ccaae88d5339ae36bcc8940b03388cf84adbf27828b1f8b300307103bab'],
-    }),
-    ('Package::Constants', '0.06', {
-        'source_tmpl': 'Package-Constants-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
-        'checksums': ['0b58be78706ccc4e4bd9bbad41767470427fd7b2cfad749489de101f85bc5df5'],
-    }),
-    ('CPANPLUS', '0.9910', {
-        'source_tmpl': 'CPANPLUS-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
-        'checksums': ['1315543ee7dc683cb40e6ebf154c939cd095b8cab2cdfd67c53412ccf70e03cb'],
-    }),
-    ('IO::Tty', '1.16', {
-        'source_tmpl': 'IO-Tty-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TO/TODDR'],
-        'checksums': ['8f1a09c070738adc695df903f2e7f74308dd8d991b914c0bc390a0e6021294dd'],
-    }),
-    ('Text::Soundex', '3.05', {
-        'source_tmpl': 'Text-Soundex-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['f6dd55b4280b25dea978221839864382560074e1d6933395faee2510c2db60ed'],
-    }),
-    ('Lingua::EN::PluralToSingular', '0.21', {
-        'source_tmpl': 'Lingua-EN-PluralToSingular-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BK/BKB'],
-        'checksums': ['f8a8b7de28c25c96190d7f48c90b5ad9b9bf517f3835c77641f0e8fa546c0d1d'],
-    }),
-    ('Want', '0.29', {
-        'source_tmpl': 'Want-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RO/ROBIN'],
-        'checksums': ['b4e4740b8d4cb783591273c636bd68304892e28d89e88abf9273b1de17f552f7'],
-    }),
-    ('Mail::Util', '2.21', {
-        'source_tmpl': 'MailTools-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MARKOV'],
-        'checksums': ['4ad9bd6826b6f03a2727332466b1b7d29890c8d99a32b4b3b0a8d926ee1a44cb'],
-    }),
-    ('Text::Template', '1.59', {
-        'source_tmpl': 'Text-Template-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MS/MSCHOUT'],
-        'checksums': ['1dd2c788c05303ed9a970e1881109642151fa93e02c7a80d4c70608276bab1ee'],
-    }),
-    ('PDF::API2', '2.041', {
-        'source_tmpl': 'PDF-API2-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SS/SSIMMS'],
-        'checksums': ['cfa47682471ed4e0c56be92aac2864ef26e6c521723c34e29706d875b6e58537'],
-    }),
-    ('Devel::CheckLib', '1.14', {
-        'source_tmpl': 'Devel-CheckLib-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MATTN'],
-        'checksums': ['f21c5e299ad3ce0fdc0cb0f41378dca85a70e8d6c9a7599f0e56a957200ec294'],
-    }),
-    ('SVG', '2.86', {
-        'source_tmpl': 'SVG-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MANWAR'],
-        'checksums': ['72c6eb6f86bb2c330280f9f3d342bb2673ad5da22d1f44fba3e04cfb5d30a67b'],
-    }),
-    ('Statistics::Basic', '1.6611', {
-        'source_tmpl': 'Statistics-Basic-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/J/JE/JETTERO'],
-        'checksums': ['6855ce5615fd3e1af4cfc451a9bf44ff29a3140b4e7130034f1f0af2511a94fb'],
-    }),
-    ('Log::Log4perl', '1.54', {
-        'source_tmpl': 'Log-Log4perl-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETJ'],
-        'checksums': ['bbabe42d3b4cdaa3a47666b957be81d55bbd1cbcffcdff2b119586d33602eabe'],
-    }),
-    ('Math::CDF', '0.1', {
-        'source_tmpl': 'Math-CDF-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/C/CA/CALLAHAN'],
-        'checksums': ['7896bf250835ce47dcc813cb8cf9dc576c5455de42e822dcd7d8d3fef2125565'],
-    }),
-    ('Array::Utils', '0.5', {
-        'source_tmpl': 'Array-Utils-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/Z/ZM/ZMIJ/Array'],
-        'checksums': ['89dd1b7fcd9b4379492a3a77496e39fe6cd379b773fd03a6b160dd26ede63770'],
-    }),
-    ('File::Grep', '0.02', {
-        'source_tmpl': 'File-Grep-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MN/MNEYLON'],
-        'checksums': ['462e15274eb6278521407ea302d9eea7252cd44cab2382871f7de833d5f85632'],
-    }),
-    ('File::Path', '2.18', {
-        'source_tmpl': 'File-Path-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/J/JK/JKEENAN'],
-        'checksums': ['980f0a17edb353df46e9cd7b357f9f5929cde0f80c45fd7a06cf7e0e8bd6addd'],
-    }),
-    ('File::Slurper', '0.012', {
-        'source_tmpl': 'File-Slurper-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
-        'checksums': ['4efb2ea416b110a1bda6f8133549cc6ea3676402e3caf7529fce0313250aa578'],
-    }),
-    ('File::Temp', '0.2311', {
-        'source_tmpl': 'File-Temp-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
-        'checksums': ['2290d61bf5c39882fc3311da9ce1c7f42dbdf825ae169e552c59fe4598b36f4a'],
-    }),
-    ('Graph', '0.9722', {
-        'source_tmpl': 'Graph-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETJ'],
-        'checksums': ['c113633833f3a1bef8fa8eb96680be36d00e41ef404bddd7fc0bb98703e28d4d'],
-    }),
-    ('Graph::ReadWrite', '2.10', {
-        'source_tmpl': 'Graph-ReadWrite-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/N/NE/NEILB'],
-        'checksums': ['516c1ea9facb995dbc38d1735d58974b2399862567e731b729c8d0bc2ee5a14b'],
-    }),
-    ('PerlIO::utf8_strict', '0.008', {
-        'source_tmpl': 'PerlIO-utf8_strict-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
-        'checksums': ['5f798ded50dcc7d421b57850f837310666d817f4c67c15ba0f5a1d38c74df459'],
-    }),
-    ('Devel::OverloadInfo', '0.007', {
-        'source_tmpl': 'Devel-OverloadInfo-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/I/IL/ILMARI'],
-        'checksums': ['21a184163b90f91f06ffc7f5de0b968356546ae9b400a9d75c573c958c246222'],
-    }),
-    ('Sub::Identify', '0.14', {
-        'source_tmpl': 'Sub-Identify-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RG/RGARCIA'],
-        'checksums': ['068d272086514dd1e842b6a40b1bedbafee63900e5b08890ef6700039defad6f'],
-    }),
-    ('Digest::MD5::File', '0.08', {
-        'source_tmpl': 'Digest-MD5-File-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DM/DMUEY'],
-        'checksums': ['adb43a54e32627b4f7e57c9640e6eb06d0bb79d8ea54cd0bd79ed35688fb1218'],
-    }),
-    ('String::RewritePrefix', '0.008', {
-        'source_tmpl': 'String-RewritePrefix-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['e45a31d6914e8f5fc722ef48d8819400dafc02105e0c61414aabbf01bce208eb'],
-    }),
-    ('Getopt::Long::Descriptive', '0.109', {
-        'source_tmpl': 'Getopt-Long-Descriptive-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['05027ecdaf5bc442e10a5630d7ec407c1c47993b8776fe813ff47c0181db4193'],
-    }),
-    ('App::Cmd', '0.334', {
-        'source_tmpl': 'App-Cmd-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['22e31e0f8f7b8c4303ad62b0ab1f941fcf598ca6e3a146b7e482e5870d6d58d3'],
-    }),
-    ('Path::Tiny', '0.118', {
-        'source_tmpl': 'Path-Tiny-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN'],
-        'checksums': ['32138d8d0f4c9c1a84d2a8f91bc5e913d37d8a7edefbb15a10961bfed560b0fd'],
-    }),
-    ('Carp::Clan', '6.08', {
-        'source_tmpl': 'Carp-Clan-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
-        'checksums': ['c75f92e34422cc5a65ab05d155842b701452434e9aefb649d6e2289c47ef6708'],
-    }),
-    ('Sub::Exporter::ForMethods', '0.100054', {
-        'source_tmpl': 'Sub-Exporter-ForMethods-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['eef61c9421688bb3a7beaca71623df11c8a749307ae428abdabc556e2bfafc3e'],
-    }),
-    ('MooseX::Types', '0.50', {
-        'source_tmpl': 'MooseX-Types-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
-        'checksums': ['9cd87b3492cbf0be9d2df9317b2adf9fc30663770e69906654bea3f41b17cb08'],
-    }),
-    ('B::Hooks::EndOfScope', '0.24', {
-        'source_tmpl': 'B-Hooks-EndOfScope-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
-        'checksums': ['03aa3dfe5d0aa6471a96f43fe8318179d19794d4a640708f0288f9216ec7acc6'],
-    }),
-    ('namespace::clean', '0.27', {
-        'source_tmpl': 'namespace-clean-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RI/RIBASUSHI'],
-        'checksums': ['8a10a83c3e183dc78f9e7b7aa4d09b47c11fb4e7d3a33b9a12912fd22e31af9d'],
-    }),
-    ('namespace::autoclean', '0.29', {
-        'source_tmpl': 'namespace-autoclean-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
-        'checksums': ['45ebd8e64a54a86f88d8e01ae55212967c8aa8fed57e814085def7608ac65804'],
-    }),
-    ('File::pushd', '1.016', {
-        'source_tmpl': 'File-pushd-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN'],
-        'checksums': ['d73a7f09442983b098260df3df7a832a5f660773a313ca273fa8b56665f97cdc'],
-    }),
-    ('MooseX::Types::Perl', '0.101343', {
-        'source_tmpl': 'MooseX-Types-Perl-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['f084beaf3c33209c68d05d4dbc24c25d604a6458b9738d96dceb086c8ef1325a'],
-    }),
-    ('Role::Tiny', '2.002004', {
-        'source_tmpl': 'Role-Tiny-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HA/HAARG'],
-        'checksums': ['d7bdee9e138a4f83aa52d0a981625644bda87ff16642dfa845dcb44d9a242b45'],
-    }),
-    ('Specio', '0.47', {
-        'source_tmpl': 'Specio-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
-        'checksums': ['f41307f14444f8777e572f27eeb6a964084399e7e382c47c577827ad8a286a1c'],
-    }),
-    ('Params::ValidationCompiler', '0.30', {
-        'source_tmpl': 'Params-ValidationCompiler-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
-        'checksums': ['dc5bee23383be42765073db284bed9fbd819d4705ad649c20b644452090d16cb'],
-    }),
-    ('Log::Dispatch', '2.70', {
-        'source_tmpl': 'Log-Dispatch-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
-        'checksums': ['a3d91cc52467d3a3c6683103f3df4472d71e405a45f553289448713ac4293f21'],
-    }),
-    ('String::Flogger', '1.101245', {
-        'source_tmpl': 'String-Flogger-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['aa03c08e01f802a358c175c6093c02adf9688659a087a8ddefdc3e9cef72640b'],
-    }),
-    ('Log::Dispatchouli', '2.023', {
-        'source_tmpl': 'Log-Dispatchouli-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['c4ac41b9729b71439682b34dd2772b040b5adb9e1a611d30322c01f4608e0cf2'],
-    }),
-    ('Data::Section', '0.200007', {
-        'source_tmpl': 'Data-Section-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['cd937e5b70e34aab885ff414e2a6d19e4783b7c28fc3cda5145b230514ebb4de'],
-    }),
-    ('Software::License', '0.104001', {
-        'source_tmpl': 'Software-License-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['51386fdee57de4d38187ad3ffd7c5482431123bbf883f7abc28e0929fb46c387'],
-    }),
-    ('MooseX::SetOnce', '0.201', {
-        'source_tmpl': 'MooseX-SetOnce-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['f55734d9823cab6c77cace28406e6deafa16071d2f574d5c394060def1c07c87'],
-    }),
-    ('Term::Encoding', '0.03', {
-        'source_tmpl': 'Term-Encoding-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MI/MIYAGAWA'],
-        'checksums': ['95ba9687d735d25a3cbe64508d7894f009c7fa2a1726c3e786e9e21da2251d0b'],
-    }),
-    ('Config::MVP', '2.200012', {
-        'source_tmpl': 'Config-MVP-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['d8a6069be317a866d8041b1bb7cfafe34014f19743891f27a5e42a31b5c0ea75'],
-    }),
-    ('Throwable', '1.000', {
-        'source_tmpl': 'Throwable-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['023aac67baad5b7bcdc08dc858ea5e6a8ddb0e291d15dd6d24818cdd702d318f'],
-    }),
-    ('Sub::Quote', '2.006006', {
-        'source_tmpl': 'Sub-Quote-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HA/HAARG'],
-        'checksums': ['6e4e2af42388fa6d2609e0e82417de7cc6be47223f576592c656c73c7524d89d'],
-    }),
-    ('Role::Identifiable::HasIdent', '0.007', {
-        'source_tmpl': 'Role-Identifiable-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['561346d1a1a07a45bd851d859a825a7f67925a7a3ba5ba58e0cdad8bb99073ad'],
-    }),
-    ('Role::HasMessage', '0.006', {
-        'source_tmpl': 'Role-HasMessage-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['f6a6dbe0476ff95ee1ffbef825eb18d9b02b0618deba4686e7c63b99d576d4d3'],
-    }),
-    ('MooseX::OneArgNew', '0.005', {
-        'source_tmpl': 'MooseX-OneArgNew-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['7e4fcf474ea6c4244f0885f1066729cfdc472fbd7190dd41b4b55bcd67c3103f'],
-    }),
-    ('MooseX::Role::Parameterized', '1.11', {
-        'source_tmpl': 'MooseX-Role-Parameterized-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
-        'checksums': ['1cfe766c5d7f0ecab57f733dcca430a2a2acd6b995757141b940ade3692bec9e'],
-    }),
-    ('MooseX::LazyRequire', '0.11', {
-        'source_tmpl': 'MooseX-LazyRequire-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
-        'checksums': ['ef620c1e019daf9cf3f23a943d25a94c91e93ab312bcd63be2e9740ec0b94288'],
-    }),
-    ('Mixin::Linewise::Readers', '0.110', {
-        'source_tmpl': 'Mixin-Linewise-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['a7f120b7aa82dfb1a5ad1aa11abd33232b26a2b09c654e649e97a3c2128b1d8b'],
-    }),
-    ('Config::INI', '0.027', {
-        'source_tmpl': 'Config-INI-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['12eb8b7d43ab13db443b3c7110c8b70a264c19f78ff06ab8823e11f86a4f330e'],
-    }),
-    ('String::Truncate', '1.100602', {
-        'source_tmpl': 'String-Truncate-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['aaa3d4eec01136921484139133eb75d5c571fe51b0ad329f089e6d469a235f6e'],
-    }),
-    ('Pod::Eventual', '0.094002', {
-        'source_tmpl': 'Pod-Eventual-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['80194f3fe66dd8bd91282eb3610f5c7cac8dc5a0cd51a81c4d56a9ec18fea2bc'],
-    }),
-    ('Pod::Elemental', '0.103005', {
-        'source_tmpl': 'Pod-Elemental-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['824336ec18326e3b970e7815922b3921b0a821d2ee0e50b0c5b2bc327f99615e'],
-    }),
-    ('Pod::Weaver', '4.018', {
-        'source_tmpl': 'Pod-Weaver-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['8ca92ec948974023194197c058e33a98ad00a88561f5bf7fe672329227a910b7'],
-    }),
-    ('Dist::Zilla', '6.024', {
-        'source_tmpl': 'Dist-Zilla-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['f063a6839c145a3aafcf0d8d9ec5519601d0c0f61d0174aed424297f65b928a8'],
-    }),
-    ('XML::RegExp', '0.04', {
-        'source_tmpl': 'XML-RegExp-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TJ/TJMATHER'],
-        'checksums': ['df1990096036085c8e2d45904fe180f82bfed40f1a7e05243f334ea10090fc54'],
-    }),
-    ('XML::DOM', '1.46', {
-        'source_tmpl': 'XML-DOM-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TJ/TJMATHER'],
-        'checksums': ['8ba24b0b459b01d6c5e5b0408829c7d5dfe47ff79b3548c813759048099b175e'],
-    }),
-    ('Data::Dump', '1.25', {
-        'source_tmpl': 'Data-Dump-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GARU'],
-        'checksums': ['a4aa6e0ddbf39d5ad49bddfe0f89d9da864e3bc00f627125d1bc580472f53fbd'],
-    }),
-    ('File::Next', '1.18', {
-        'source_tmpl': 'File-Next-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PE/PETDANCE'],
-        'checksums': ['f900cb39505eb6e168a9ca51a10b73f1bbde1914b923a09ecd72d9c02e6ec2ef'],
-    }),
-    ('App::cpanminus', '1.7044', {
-        'source_tmpl': 'App-cpanminus-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MI/MIYAGAWA'],
-        'checksums': ['9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3'],
-    }),
-    ('Parallel::ForkManager', '2.02', {
-        'source_tmpl': 'Parallel-ForkManager-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/Y/YA/YANICK'],
-        'checksums': ['c1b2970a8bb666c3de7caac4a8f4dbcc043ab819bbc337692ec7bf27adae4404'],
-    }),
-    ('Logger::Simple', '2.0', {
-        'source_tmpl': 'Logger-Simple-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TS/TSTANLEY'],
-        'checksums': ['2e63fd3508775b5902132ba1bfb03b42bee468dfaf35dfe42e1909ff6d291b2d'],
-    }),
-    ('Scalar::Util::Numeric', '0.40', {
-        'source_tmpl': 'Scalar-Util-Numeric-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/C/CH/CHOCOLATE'],
-        'checksums': ['d7501b6d410703db5b1c1942fbfc41af8964a35525d7f766058acf5ca2cc4440'],
-    }),
-    ('YAML', '1.30', {
-        'source_tmpl': 'YAML-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TI/TINITA'],
-        'checksums': ['5030a6d6cbffaf12583050bf552aa800d4646ca9678c187add649227f57479cd'],
-    }),
-    ('Object::InsideOut', '4.05', {
-        'source_tmpl': 'Object-InsideOut-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/J/JD/JDHEDDEN'],
-        'checksums': ['9dfd6ca2822724347e0eb6759d00709425814703ad5c66bdb6214579868bcac4'],
-    }),
-    ('Thread::Queue', '3.13', {
-        'source_tmpl': 'Thread-Queue-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/J/JD/JDHEDDEN'],
-        'checksums': ['6ba3dacddd2fbb66822b4aa1d11a0a5273cd04c825cb3ff31c20d7037cbfdce8'],
-    }),
-    ('Time::HiRes', '1.9764', {
-        'source_tmpl': 'Time-HiRes-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/A/AT/ATOOMIC'],
-        'checksums': ['9841be5587bfb7cd1f2fe267b5e5ac04ce25e79d5cc77e5ef9a9c5abd101d7b1'],
-    }),
-    ('Term::ReadLine::Gnu', '1.42', {
-        'source_tmpl': 'Term-ReadLine-Gnu-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HA/HAYASHI'],
-        'checksums': ['3c5f1281da2666777af0f34de0289564e6faa823aea54f3945c74c98e95a5e73'],
-    }),
-    ('ExtUtils::MakeMaker', '7.62', {
-        'source_tmpl': 'ExtUtils-MakeMaker-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
-        'checksums': ['5022ad857fd76bd3f6b16af099fe2324639d9932e08f21e891fb313d9cae1705'],
-    }),
-    ('List::Util', '1.56', {
-        'source_tmpl': 'Scalar-List-Utils-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PE/PEVANS'],
-        'checksums': ['15b8537d40fb3e6dae64b2e7e983c47a99b2c20816a180bb9c868b787a12ab5b'],
-    }),
-    ('Module::CoreList', '5.20210723', {
-        'source_tmpl': 'Module-CoreList-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
-        'checksums': ['509ec984dca1325ef73b2676624f785f56c9ec1d4f1dfdd8c02aa75d37a48e39'],
-    }),
-    ('Module::Metadata', '1.000037', {
-        'source_tmpl': 'Module-Metadata-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
-        'checksums': ['8d5a74c1b07e145edda254602fedf19c0dd0c2d9688a370afdaff89c32cba629'],
-    }),
-    ('Params::Check', '0.38', {
-        'source_tmpl': 'Params-Check-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
-        'checksums': ['f0c9d33876c36b1bca1475276d26d2efaf449b256d7cc8118fae012e89a26290'],
-    }),
-    ('Locale::Maketext::Simple', '0.21', {
-        'source_tmpl': 'Locale-Maketext-Simple-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/J/JE/JESSE'],
-        'checksums': ['b009ff51f4fb108d19961a523e99b4373ccf958d37ca35bf1583215908dca9a9'],
-    }),
-    ('Perl::OSType', '1.010', {
-        'source_tmpl': 'Perl-OSType-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN'],
-        'checksums': ['e7ed4994b5d547cb23aadb84dc6044c5eb085d5a67a6c5624f42542edd3403b2'],
-    }),
-    ('IPC::Cmd', '1.04', {
-        'source_tmpl': 'IPC-Cmd-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
-        'checksums': ['d110a0f60e35c65721454200f0d2f0f8965529a2add9649d1fa6f4f9eccb6430'],
-    }),
-    ('Pod::Escapes', '1.07', {
-        'source_tmpl': 'Pod-Escapes-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/N/NE/NEILB'],
-        'checksums': ['dbf7c827984951fb248907f940fd8f19f2696bc5545c0a15287e0fbe56a52308'],
-    }),
-    ('if', '0.0608', {
-        'source_tmpl': 'if-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/X/XS/XSAWYERX'],
-        'checksums': ['37206e10919c4d99273020008a3581bf0947d364e859b8966521c3145b4b3700'],
-    }),
-    ('Test', '1.26', {
-        'source_tmpl': 'Test-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/J/JE/JESSE'],
-        'checksums': ['f7701bd28e05e7f82fe9a181bbab38f53fa6aeae48d2a810da74d1b981d4f392'],
-    }),
-    ('ExtUtils::Constant', '0.25', {
-        'source_tmpl': 'ExtUtils-Constant-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/N/NW/NWCLARK'],
-        'checksums': ['6933d0e963b62281ef7561068e6aecac8c4ac2b476b2bba09ab0b90fbac9d757'],
-    }),
-    ('ExtUtils::CBuilder', '0.280236', {
-        'source_tmpl': 'ExtUtils-CBuilder-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/A/AM/AMBS'],
-        'checksums': ['abc21827eb8a513171bf7fdecefce9945132cb76db945036518291f607b1491f'],
-    }),
-    ('Carp::Heavy', '1.50', {
-        'source_tmpl': 'Carp-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/X/XS/XSAWYERX'],
-        'checksums': ['f5273b4e1a6d51b22996c48cb3a3cbc72fd456c4038f5c20b127e2d4bcbcebd9'],
-    }),
-    ('Pod::Simple', '3.43', {
-        'source_tmpl': 'Pod-Simple-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/K/KH/KHW'],
-        'checksums': ['65abe3f5363fa4cdc108f5ad9ce5ce91e7a39186a1b297bb7a06fa1b0f45d377'],
-    }),
-    ('Socket', '2.032', {
-        'source_tmpl': 'Socket-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PE/PEVANS'],
-        'checksums': ['20ecb6ad469f4a13c5c7a891abfa12a3cecfdeccc7140ad57b05be12815dd517'],
-    }),
-    ('Time::Local', '1.30', {
-        'source_tmpl': 'Time-Local-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
-        'checksums': ['c7744f6b2986b946d3e2cf034df371bee16cdbafe53e945abb1a542c4f8920cb'],
-    }),
-    ('Storable', '3.15', {
-        'source_tmpl': 'Storable-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/X/XS/XSAWYERX'],
-        'checksums': ['fc3dad06cb2e6fc86a2f2abc5b5491d9da328ca3e6b6306559c224521db174da'],
-    }),
-    ('ExtUtils::ParseXS', '3.35', {
-        'source_tmpl': 'ExtUtils-ParseXS-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SM/SMUELLER'],
-        'checksums': ['41def0511278a2a8ba9afa25ccab45b0453f75e7fd774e8644b5f9a57cc4ee1c'],
-    }),
-    ('Pod::Man', '4.14', {
-        'source_tmpl': 'podlators-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RR/RRA'],
-        'checksums': ['7af1c41de34b2e4dbff700a29d7387549c2b6cf16142214450c924707ddb0f82'],
-    }),
-    ('Mozilla::CA', '20200520', {
-        'source_tmpl': 'Mozilla-CA-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/A/AB/ABH'],
-        'checksums': ['b3ca0002310bf24a16c0d5920bdea97a2f46e77e7be3e7377e850d033387c726'],
-    }),
-    ('Test::More', '1.302186', {
-        'source_tmpl': 'Test-Simple-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
-        'checksums': ['2895c8da7c3fe632e5714c7cc548705202cdbf3afcbc0e929bc5e6a5172265d4'],
-    }),
-    ('Test::RequiresInternet', '0.05', {
-        'source_tmpl': 'Test-RequiresInternet-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MALLEN'],
-        'checksums': ['bba7b32a1cc0d58ce2ec20b200a7347c69631641e8cae8ff4567ad24ef1e833e'],
-    }),
-    ('LWP::Protocol::https', '6.10', {
-        'source_tmpl': 'LWP-Protocol-https-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/O/OA/OALDERS'],
-        'checksums': ['cecfc31fe2d4fc854cac47fce13d3a502e8fdfe60c5bc1c09535743185f2a86c'],
-    }),
-    ('Module::Load', '0.36', {
-        'source_tmpl': 'Module-Load-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
-        'checksums': ['d825020ac00b220e89f9524e24d838f9438b072fcae8c91938e4026677bef6e0'],
-    }),
-    ('Module::Load::Conditional', '0.74', {
-        'source_tmpl': 'Module-Load-Conditional-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
-        'checksums': ['54c354a9393820f1ebc2a095da084ea0392dcbccb0cb38a187a71831cc60a730'],
-    }),
-    ('parent', '0.238', {
-        'source_tmpl': 'parent-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/C/CO/CORION'],
-        'checksums': ['38f58fdef3e28a194c9c8d0dc5d02672faf93c069f40c5bcb1fabeadbbc4d2d1'],
-    }),
-    ('Net::Domain', '3.13', {
-        'source_tmpl': 'libnet-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SH/SHAY'],
-        'checksums': ['5a35fb1f2d4aa291680eb1af38899fab453c22c28e71f7c7bd3747b5a3db348c'],
-    }),
-    ('Scalar::Util', '1.56', {
-        'source_tmpl': 'Scalar-List-Utils-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PE/PEVANS'],
-        'checksums': ['15b8537d40fb3e6dae64b2e7e983c47a99b2c20816a180bb9c868b787a12ab5b'],
-    }),
-    ('Text::ParseWords', '3.30', {
-        'source_tmpl': 'Text-ParseWords-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/C/CH/CHORNY'],
-        'checksums': ['85e0238179dd43997e58c66bd51611182bc7d533505029a2db0d3232edaff5e8'],
-    }),
-    ('Encode', '3.11', {
-        'source_tmpl': 'Encode-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DANKOGAI'],
-        'checksums': ['47e05cefb550ef039808564e6181a22dbf2e50d0475f8eb9de63f9d9f4912e7c'],
-    }),
-    ('constant', '1.33', {
-        'source_tmpl': 'constant-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
-        'checksums': ['79965d4130eb576670e27ca0ae6899ef0060c76da48b02b97682166882f1b504'],
-    }),
-    ('Data::Dumper', '2.183', {
-        'source_tmpl': 'Data-Dumper-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/N/NW/NWCLARK'],
-        'checksums': ['e42736890b7dae1b37818d9c5efa1f1fdc52dec04f446a33a4819bf1d4ab5ad3'],
-    }),
-    ('Cwd', '3.75', {
-        'source_tmpl': 'PathTools-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/X/XS/XSAWYERX'],
-        'checksums': ['a558503aa6b1f8c727c0073339081a77888606aa701ada1ad62dd9d8c3f945a2'],
-    }),
-    ('MIME::Base64', '3.16', {
-        'source_tmpl': 'MIME-Base64-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/C/CA/CAPOEIRAB'],
-        'checksums': ['77f73d6f7aeb8d33be08b0d8c2617f9b6c77fb7fc45422d507ca8bafe4246017'],
-    }),
-    ('ExtUtils::CppGuess', '0.23', {
-        'source_tmpl': 'ExtUtils-CppGuess-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETJ'],
-        'checksums': ['f96c48984eb6d8efb7d933b34f361d0c8b38335e3e5382e9aeccc0aa519a002c'],
-    }),
-    ('XSLoader', '0.24', {
-        'source_tmpl': 'XSLoader-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SA/SAPER'],
-        'checksums': ['e819a35a6b8e55cb61b290159861f0dc00fe9d8c4f54578eb24f612d45c8d85f'],
-    }),
-    ('AutoLoader', '5.74', {
-        'source_tmpl': 'AutoLoader-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SM/SMUELLER'],
-        'checksums': ['2fac75b05309f71a6871804cd25e1a3ba0a28f43f294fb54528077558da3aff4'],
-    }),
-    ('URI::Escape', '5.09', {
-        'source_tmpl': 'URI-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/O/OA/OALDERS'],
-        'checksums': ['03e63ada499d2645c435a57551f041f3943970492baa3b3338246dab6f1fae0a'],
-    }),
-    ('Set::IntervalTree', '0.12', {
-        'source_tmpl': 'Set-IntervalTree-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SL/SLOYD'],
-        'checksums': ['6fd4000e4022968e2ce5b83c07b189219ef1925ecb72977b52a6f7d76adbc349'],
-    }),
-    ('MCE::Mutex', '1.874', {
-        'source_tmpl': 'MCE-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MARIOROY'],
-        'checksums': ['d809e3018475115ad7eccb8bef49bde3bf3e75abbbcd80564728bbcfab86d3d0'],
-    }),
-    ('Text::CSV_XS', '1.46', {
-        'source_tmpl': 'Text-CSV_XS-%(version)s.tgz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HM/HMBRAND'],
-        'checksums': ['27e39f0d5f2322aaf78ff90eb1221f3cbed1d4c514d0956bda19407fcb98bed6'],
-    }),
-    ('DBD::CSV', '0.58', {
-        'source_tmpl': 'DBD-CSV-%(version)s.tgz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HM/HMBRAND'],
-        'checksums': ['6c26f710453b14d7b3cf5f3e1697e8ddaa48c0a66f5d811f4394bd8c32f287ef'],
-    }),
-    ('Array::Transpose', '0.06', {
-        'source_tmpl': 'Array-Transpose-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MR/MRDVT'],
-        'checksums': ['d58667f64381a105f375226f592d0af71068e640a5a9f4d5ecf27c90feb32676'],
-    }),
-    ('Config::Simple', '4.58', {
-        'source_tmpl': 'Config-Simple-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SH/SHERZODR'],
-        'checksums': ['dd9995706f0f9384a15ccffe116c3b6e22f42ba2e58d8f24ed03c4a0e386edb4'],
-    }),
-    ('Business::ISBN', '3.006', {
-        'source_tmpl': 'Business-ISBN-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BD/BDFOY'],
-        'checksums': ['c1fefe68354ffb80cdbd24303ebe684b3b6828df3d5f09b429a09fc4f0919c9a'],
-    }),
-    ('Business::ISBN::Data', '20210112.006', {
-        'source_tmpl': 'Business-ISBN-Data-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BD/BDFOY'],
-        'checksums': ['98c2cfb266b5fdd016989abaa471d9dd4c1d593c508a6f01f66d184d5fee8bae'],
-    }),
-    ('common::sense', '3.75', {
-        'source_tmpl': 'common-sense-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/M/ML/MLEHMANN'],
-        'checksums': ['a86a1c4ca4f3006d7479064425a09fa5b6689e57261fcb994fe67d061cba0e7e'],
-    }),
-    ('IO::Compress::Bzip2', '2.102', {
-        'source_tmpl': 'IO-Compress-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PM/PMQS'],
-        'checksums': ['d6fa7f9a5beee446452a0fbc43589a0c73fe7e925c075b98628b018048dc72a4'],
-    }),
-    ('JSON::XS', '4.03', {
-        'source_tmpl': 'JSON-XS-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/M/ML/MLEHMANN'],
-        'checksums': ['515536f45f2fa1a7e88c8824533758d0121d267ab9cb453a1b5887c8a56b9068'],
-    }),
-    ('List::MoreUtils::XS', '0.430', {
-        'source_tmpl': 'List-MoreUtils-XS-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RE/REHSACK'],
-        'checksums': ['e8ce46d57c179eecd8758293e9400ff300aaf20fefe0a9d15b9fe2302b9cb242'],
-    }),
-    ('Authen::NTLM', '1.09', {
-        'source_tmpl': 'NTLM-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/N/NB/NBEBOUT'],
-        'checksums': ['c823e30cda76bc15636e584302c960e2b5eeef9517c2448f7454498893151f85'],
-    }),
-    ('Types::Serialiser', '1.01', {
-        'source_tmpl': 'Types-Serialiser-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/M/ML/MLEHMANN'],
-        'checksums': ['f8c7173b0914d0e3d957282077b366f0c8c70256715eaef3298ff32b92388a80'],
-    }),
-    ('XML::SAX::Expat', '0.51', {
-        'source_tmpl': 'XML-SAX-Expat-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BJ/BJOERN'],
-        'checksums': ['4c016213d0ce7db2c494e30086b59917b302db8c292dcd21f39deebd9780c83f'],
-    }),
-    ('Inline', '0.86', {
-        'source_tmpl': 'Inline-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/I/IN/INGY'],
-        'checksums': ['510a7de2d011b0db80b0874e8c0f7390010991000ae135cff7474df1e6d51e3a'],
-    }),
-    # Below this point are packages added for JSC, not included in the upstream easybuild repositories
-    ('AnyData', '0.12', {
-        'source_tmpl': 'AnyData-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RE/REHSACK'],
-        'checksums': ['be6a957f04a2feba9b305536b132deceba1f455db295b221a63e75567fadbcfc'],
-    }),
-    ('DBD::AnyData', '0.110', {
-        'source_tmpl': 'DBD-AnyData-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RE/REHSACK'],
-        'checksums': ['247f0d88e55076fd3f6c7bf3fd527989d62fcc1ef9bde9bf2ee11c280adcaeab'],
-    }),
-    ('Bundle::BioPerl', '2.1.9', {
-        'source_tmpl': 'Bundle-BioPerl-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/C/CJ/CJFIELDS'],
-        'checksums': ['c343ba97f49d86e7fb14aef4cfe3124992e2a5c3168e53a54606dd611d73e5c7'],
-    }),
-    ('Alien::Base', '2.41', {
-        'source_tmpl': 'Alien-Build-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PL/PLICEASE'],
-        'checksums': ['aaa738117131b016f17f103b167deae2588f03bb72aa3fe15cbb1bad344cf2a4'],
-    }),
-    ('File::chdir', '0.1011', {
-        'source_tmpl': 'File-chdir-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN'],
-        'checksums': ['31ebf912df48d5d681def74b9880d78b1f3aca4351a0ed1fe3570b8e03af6c79'],
-    }),
-    ('Alien::Libxml2', '0.17', {
-        'source_tmpl': 'Alien-Libxml2-%(version)s.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PL/PLICEASE'],
-        'checksums': ['73b45244f0b5c36e5332c33569b82a1ab2c33e263f1d00785d2003bcaec68db3'],
-    }),
-    ('XML::LibXML', '2.0207', {
-        'source_tmpl': 'XML-LibXML-%(version)s.tar.gz',
-        'source_urls': ['http://search.cpan.org/CPAN/authors/id/S/SH/SHLOMIF'],
-        'checksums': ['903436c9859875bef5593243aae85ced329ad0fb4b57bbf45975e32547c50c15'],
-    }),
-    ('Date::Calc', '6.4', {
-        'source_tmpl': 'Date-Calc-%(version)s.tar.gz',
-        'source_urls': ['http://search.cpan.org/CPAN/authors/id/S/ST/STBEY'],
-        'checksums': ['7ce137b2e797b7c0901f3adf1a05a19343356cd1f04676aa1c56a9f624f859ad'],
-    }),
-]
-
-moduleclass = 'lang'
diff --git a/Golden_Repo/p/Pillow-SIMD/Pillow-SIMD-8.3.1-GCCcore-11.2.0.eb b/Golden_Repo/p/Pillow-SIMD/Pillow-SIMD-8.3.1-GCCcore-11.2.0.eb
deleted file mode 100644
index 663959cea..000000000
--- a/Golden_Repo/p/Pillow-SIMD/Pillow-SIMD-8.3.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,39 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'Pillow-SIMD'
-version = '8.3.1'
-
-homepage = 'https://github.com/uploadcare/pillow-simd'
-description = """Pillow is the 'friendly PIL fork' by Alex Clark and Contributors.
- PIL is the Python Imaging Library by Fredrik Lundh and Contributors."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://github.com/uploadcare/pillow-simd/archive/']
-sources = ['%(version)s.tar.gz']
-checksums = ['bf77f392094e3bb24ca56ef8bbc4ea0d9752226ff348682d849c0aa8c1577980']
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('libpng', '1.6.37'),
-    ('zlib', '1.2.11'),
-    ('LibTIFF', '4.3.0'),
-    ('freetype', '2.11.0')
-]
-
-use_pip = True
-download_dep_fail = True
-
-options = {'modulename': 'PIL'}
-
-sanity_check_paths = {
-    'files': [],
-    'dirs': ['lib/python%(pyshortver)s/site-packages/PIL'],
-}
-
-sanity_pip_check = True
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/p/Pillow-SIMD/Pillow-SIMD-9.0.1-GCCcore-11.2.0.eb b/Golden_Repo/p/Pillow-SIMD/Pillow-SIMD-9.0.1-GCCcore-11.2.0.eb
deleted file mode 100644
index 66f99fe20..000000000
--- a/Golden_Repo/p/Pillow-SIMD/Pillow-SIMD-9.0.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,39 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'Pillow-SIMD'
-version = '9.0.1'
-
-homepage = 'https://github.com/uploadcare/pillow-simd'
-description = """Pillow is the 'friendly PIL fork' by Alex Clark and Contributors.
- PIL is the Python Imaging Library by Fredrik Lundh and Contributors."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://github.com/uploadcare/pillow-simd/archive/']
-sources = ['%(version)s.tar.gz']
-checksums = ['4f91ab5ede15bfc71075941b62a7db3eee337fe810588a57e3c0dc103ac1bb45']
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('libpng', '1.6.37'),
-    ('zlib', '1.2.11'),
-    ('LibTIFF', '4.3.0'),
-    ('freetype', '2.11.0')
-]
-
-use_pip = True
-download_dep_fail = True
-
-options = {'modulename': 'PIL'}
-
-sanity_check_paths = {
-    'files': [],
-    'dirs': ['lib/python%(pyshortver)s/site-packages/PIL'],
-}
-
-sanity_pip_check = True
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/p/PnetCDF/PnetCDF-1.12.2-gompi-2021b.eb b/Golden_Repo/p/PnetCDF/PnetCDF-1.12.2-gompi-2021b.eb
deleted file mode 100644
index 16efa3533..000000000
--- a/Golden_Repo/p/PnetCDF/PnetCDF-1.12.2-gompi-2021b.eb
+++ /dev/null
@@ -1,35 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'PnetCDF'
-version = '1.12.2'
-
-homepage = 'http://trac.mcs.anl.gov/projects/parallel-netcdf'
-description = "Parallel netCDF: A Parallel I/O Library for NetCDF File Access"
-
-toolchain = {'name': 'gompi', 'version': '2021b'}
-
-source_urls = ['https://parallel-netcdf.github.io/Release/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['3ef1411875b07955f519a5b03278c31e566976357ddfc74c2493a1076e7d7c74']
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('Perl', '5.34.0'),
-]
-
-preconfigopts = "autoreconf -f -i && "
-
-configopts = ['', '--enable-shared']
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in ['ncmpidiff', 'ncmpidump', 'ncmpigen', 'ncoffsets',
-                                     'ncvalidator', 'pnetcdf-config', 'pnetcdf_version']] +
-             ['lib/lib%(namelower)s.a', 'lib/lib%%(namelower)s.%s' % SHLIB_EXT],
-    'dirs': ['include'],
-}
-
-modextrapaths = {
-    'PNETCDF': '',
-}
-
-moduleclass = 'data'
diff --git a/Golden_Repo/p/PnetCDF/PnetCDF-1.12.2-gpsmpi-2021b.eb b/Golden_Repo/p/PnetCDF/PnetCDF-1.12.2-gpsmpi-2021b.eb
deleted file mode 100644
index 9dacc3721..000000000
--- a/Golden_Repo/p/PnetCDF/PnetCDF-1.12.2-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,35 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'PnetCDF'
-version = '1.12.2'
-
-homepage = 'http://trac.mcs.anl.gov/projects/parallel-netcdf'
-description = "Parallel netCDF: A Parallel I/O Library for NetCDF File Access"
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-
-source_urls = ['https://parallel-netcdf.github.io/Release/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['3ef1411875b07955f519a5b03278c31e566976357ddfc74c2493a1076e7d7c74']
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('Perl', '5.34.0'),
-]
-
-preconfigopts = "autoreconf -f -i && "
-
-configopts = ['', '--enable-shared']
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in ['ncmpidiff', 'ncmpidump', 'ncmpigen', 'ncoffsets',
-                                     'ncvalidator', 'pnetcdf-config', 'pnetcdf_version']] +
-             ['lib/lib%(namelower)s.a', 'lib/lib%%(namelower)s.%s' % SHLIB_EXT],
-    'dirs': ['include'],
-}
-
-modextrapaths = {
-    'PNETCDF': '',
-}
-
-moduleclass = 'data'
diff --git a/Golden_Repo/p/PnetCDF/PnetCDF-1.12.2-iimpi-2021b.eb b/Golden_Repo/p/PnetCDF/PnetCDF-1.12.2-iimpi-2021b.eb
deleted file mode 100644
index 3f354f078..000000000
--- a/Golden_Repo/p/PnetCDF/PnetCDF-1.12.2-iimpi-2021b.eb
+++ /dev/null
@@ -1,35 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'PnetCDF'
-version = '1.12.2'
-
-homepage = 'http://trac.mcs.anl.gov/projects/parallel-netcdf'
-description = "Parallel netCDF: A Parallel I/O Library for NetCDF File Access"
-
-toolchain = {'name': 'iimpi', 'version': '2021b'}
-
-source_urls = ['https://parallel-netcdf.github.io/Release/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['3ef1411875b07955f519a5b03278c31e566976357ddfc74c2493a1076e7d7c74']
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('Perl', '5.34.0'),
-]
-
-preconfigopts = "autoreconf -f -i && "
-
-configopts = ['', '--enable-shared']
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in ['ncmpidiff', 'ncmpidump', 'ncmpigen', 'ncoffsets',
-                                     'ncvalidator', 'pnetcdf-config', 'pnetcdf_version']] +
-             ['lib/lib%(namelower)s.a', 'lib/lib%%(namelower)s.%s' % SHLIB_EXT],
-    'dirs': ['include'],
-}
-
-modextrapaths = {
-    'PNETCDF': '',
-}
-
-moduleclass = 'data'
diff --git a/Golden_Repo/p/PnetCDF/PnetCDF-1.12.2-iompi-2021b.eb b/Golden_Repo/p/PnetCDF/PnetCDF-1.12.2-iompi-2021b.eb
deleted file mode 100644
index c64b7c6dd..000000000
--- a/Golden_Repo/p/PnetCDF/PnetCDF-1.12.2-iompi-2021b.eb
+++ /dev/null
@@ -1,35 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'PnetCDF'
-version = '1.12.2'
-
-homepage = 'http://trac.mcs.anl.gov/projects/parallel-netcdf'
-description = "Parallel netCDF: A Parallel I/O Library for NetCDF File Access"
-
-toolchain = {'name': 'iompi', 'version': '2021b'}
-
-source_urls = ['https://parallel-netcdf.github.io/Release/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['3ef1411875b07955f519a5b03278c31e566976357ddfc74c2493a1076e7d7c74']
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('Perl', '5.34.0'),
-]
-
-preconfigopts = "autoreconf -f -i && "
-
-configopts = ['', '--enable-shared']
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in ['ncmpidiff', 'ncmpidump', 'ncmpigen', 'ncoffsets',
-                                     'ncvalidator', 'pnetcdf-config', 'pnetcdf_version']] +
-             ['lib/lib%(namelower)s.a', 'lib/lib%%(namelower)s.%s' % SHLIB_EXT],
-    'dirs': ['include'],
-}
-
-modextrapaths = {
-    'PNETCDF': '',
-}
-
-moduleclass = 'data'
diff --git a/Golden_Repo/p/PnetCDF/PnetCDF-1.12.2-ipsmpi-2021b.eb b/Golden_Repo/p/PnetCDF/PnetCDF-1.12.2-ipsmpi-2021b.eb
deleted file mode 100644
index 6f8893f4b..000000000
--- a/Golden_Repo/p/PnetCDF/PnetCDF-1.12.2-ipsmpi-2021b.eb
+++ /dev/null
@@ -1,35 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'PnetCDF'
-version = '1.12.2'
-
-homepage = 'http://trac.mcs.anl.gov/projects/parallel-netcdf'
-description = "Parallel netCDF: A Parallel I/O Library for NetCDF File Access"
-
-toolchain = {'name': 'ipsmpi', 'version': '2021b'}
-
-source_urls = ['https://parallel-netcdf.github.io/Release/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['3ef1411875b07955f519a5b03278c31e566976357ddfc74c2493a1076e7d7c74']
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('Perl', '5.34.0'),
-]
-
-preconfigopts = "autoreconf -f -i && "
-
-configopts = ['', '--enable-shared']
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in ['ncmpidiff', 'ncmpidump', 'ncmpigen', 'ncoffsets',
-                                     'ncvalidator', 'pnetcdf-config', 'pnetcdf_version']] +
-             ['lib/lib%(namelower)s.a', 'lib/lib%%(namelower)s.%s' % SHLIB_EXT],
-    'dirs': ['include'],
-}
-
-modextrapaths = {
-    'PNETCDF': '',
-}
-
-moduleclass = 'data'
diff --git a/Golden_Repo/p/PnetCDF/PnetCDF-1.12.2-npsmpic-2021b.eb b/Golden_Repo/p/PnetCDF/PnetCDF-1.12.2-npsmpic-2021b.eb
deleted file mode 100644
index 58506c7b9..000000000
--- a/Golden_Repo/p/PnetCDF/PnetCDF-1.12.2-npsmpic-2021b.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'PnetCDF'
-version = '1.12.2'
-
-homepage = 'http://trac.mcs.anl.gov/projects/parallel-netcdf'
-description = "Parallel netCDF: A Parallel I/O Library for NetCDF File Access"
-
-toolchain = {'name': 'npsmpic', 'version': '2021b'}
-toolchainopts = {'usempi': True, 'pic': True}
-
-source_urls = ['https://parallel-netcdf.github.io/Release/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['3ef1411875b07955f519a5b03278c31e566976357ddfc74c2493a1076e7d7c74']
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('Perl', '5.34.0'),
-]
-
-preconfigopts = "autoreconf -f -i && "
-
-configopts = ['', '--enable-shared']
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in ['ncmpidiff', 'ncmpidump', 'ncmpigen', 'ncoffsets',
-                                     'ncvalidator', 'pnetcdf-config', 'pnetcdf_version']] +
-             ['lib/lib%(namelower)s.a', 'lib/lib%%(namelower)s.%s' % SHLIB_EXT],
-    'dirs': ['include'],
-}
-
-modextrapaths = {
-    'PNETCDF': '',
-}
-
-moduleclass = 'data'
diff --git a/Golden_Repo/p/PnetCDF/PnetCDF-1.12.2-nvompic-2021b.eb b/Golden_Repo/p/PnetCDF/PnetCDF-1.12.2-nvompic-2021b.eb
deleted file mode 100644
index 41c5f0ebd..000000000
--- a/Golden_Repo/p/PnetCDF/PnetCDF-1.12.2-nvompic-2021b.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'PnetCDF'
-version = '1.12.2'
-
-homepage = 'http://trac.mcs.anl.gov/projects/parallel-netcdf'
-description = "Parallel netCDF: A Parallel I/O Library for NetCDF File Access"
-
-toolchain = {'name': 'nvompic', 'version': '2021b'}
-toolchainopts = {'usempi': True, 'pic': True}
-
-source_urls = ['https://parallel-netcdf.github.io/Release/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['3ef1411875b07955f519a5b03278c31e566976357ddfc74c2493a1076e7d7c74']
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('Perl', '5.34.0'),
-]
-
-preconfigopts = "autoreconf -f -i && "
-
-configopts = ['', '--enable-shared']
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in ['ncmpidiff', 'ncmpidump', 'ncmpigen', 'ncoffsets',
-                                     'ncvalidator', 'pnetcdf-config', 'pnetcdf_version']] +
-             ['lib/lib%(namelower)s.a', 'lib/lib%%(namelower)s.%s' % SHLIB_EXT],
-    'dirs': ['include'],
-}
-
-modextrapaths = {
-    'PNETCDF': '',
-}
-
-moduleclass = 'data'
diff --git a/Golden_Repo/p/PostgreSQL/PostgreSQL-13.4-GCCcore-11.2.0.eb b/Golden_Repo/p/PostgreSQL/PostgreSQL-13.4-GCCcore-11.2.0.eb
deleted file mode 100644
index e34039560..000000000
--- a/Golden_Repo/p/PostgreSQL/PostgreSQL-13.4-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,42 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'PostgreSQL'
-version = '13.4'
-
-homepage = 'https://www.postgresql.org/'
-description = """PostgreSQL is a powerful, open source object-relational database system.
- It is fully ACID compliant, has full support for foreign keys,
- joins, views, triggers, and stored procedures (in multiple languages).
- It includes most SQL:2008 data types, including INTEGER,
- NUMERIC, BOOLEAN, CHAR, VARCHAR, DATE, INTERVAL, and TIMESTAMP.
- It also supports storage of binary large objects, including pictures,
- sounds, or video. It has native programming interfaces for C/C++, Java,
- .Net, Perl, Python, Ruby, Tcl, ODBC, among others, and exceptional documentation."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['http://ftp.postgresql.org/pub/source/v%(version)s/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['59d7bc523e78570c549876fed297ec3e46dd307e90f5b1d22f49181191cf203e']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Bison', '3.7.6'),
-    ('flex', '2.6.4'),
-    ('Perl', '5.34.0'),
-]
-
-dependencies = [
-    ('libreadline', '8.1'),
-    ('zlib', '1.2.11'),
-    ('OpenSSL', '1.1', '', True),
-]
-
-configopts = '--with-openssl'
-
-sanity_check_paths = {
-    'files': ['bin/psql', 'bin/pg_config', 'lib/libpq.a', 'lib/libpq.%s' % SHLIB_EXT],
-    'dirs': ['share/postgresql'],
-}
-
-moduleclass = 'data'
diff --git a/Golden_Repo/p/PyCUDA/PyCUDA-2021.1-GCCcore-11.2.0.eb b/Golden_Repo/p/PyCUDA/PyCUDA-2021.1-GCCcore-11.2.0.eb
deleted file mode 100644
index 35b7de22e..000000000
--- a/Golden_Repo/p/PyCUDA/PyCUDA-2021.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,39 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'PyCUDA'
-version = '2021.1'
-
-homepage = 'https://mathema.tician.de/software/pycuda'
-description = 'PyCUDA lets you access Nvidia’s CUDA parallel computation API from Python.'
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-dependencies = [
-    ('CUDA', '11.5', '', SYSTEM),
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('Boost.Python', '1.78.0'),
-    ('Mako', '1.1.4'),
-]
-
-local_preinstallopts = './configure.py --cuda-root="$EBROOTCUDA" --boost-inc-dir="$EBROOTBOOST/include/boost" '
-local_preinstallopts += '--boost-lib-dir="$EBROOTBOOST/lib" --no-use-shipped-boost '
-local_preinstallopts += '--boost-python-libname=boost_python39 && '
-
-use_pip = True
-sanity_pip_check = True
-
-exts_list = [
-    ('pytools', '2021.2.9', {
-        'checksums': ['db6cf83c9ba0a165d545029e2301621486d1e9ef295684072e5cd75316a13755'],
-    }),
-    (name, version, {
-        'preinstallopts': './configure.py --cuda-root="$EBROOTCUDA" --boost-inc-dir="$EBROOTBOOST/include/boost" \
-                           --boost-lib-dir="$EBROOTBOOST/lib" --no-use-shipped-boost \
-                           --boost-python-libname=boost_python39 && ',
-        'source_tmpl': '%(namelower)s-%(version)s.tar.gz',
-        'checksums': ['ab87312d0fc349d9c17294a087bb9615cffcf966ad7b115f5b051008a48dd6ed'],
-    }),
-]
-
-moduleclass = 'lang'
diff --git a/Golden_Repo/p/PyCairo/PyCairo-1.20.1-GCCcore-11.2.0.eb b/Golden_Repo/p/PyCairo/PyCairo-1.20.1-GCCcore-11.2.0.eb
deleted file mode 100644
index fb8f028ab..000000000
--- a/Golden_Repo/p/PyCairo/PyCairo-1.20.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,45 +0,0 @@
-# Author: Denis Krišťák (INUITS)
-
-easyblock = 'PythonPackage'
-
-name = 'PyCairo'
-version = '1.20.1'
-
-homepage = 'https://pycairo.readthedocs.io/'
-description = """Python bindings for the cairo library"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['1ee72b035b21a475e1ed648e26541b04e5d7e753d75ca79de8c583b25785531b']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Coreutils', '9.0'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('cairo', '1.16.0'),
-]
-
-# PyGTK needs PyCairo installed by pip
-use_pip = True
-sanity_pip_check = True
-download_dep_fail = True
-
-# remove pyproject.toml, which causes trouble (header files and .pc file are not installed)
-preinstallopts = "rm pyproject.toml && "
-
-# Don't build a wheel or the pkg-cfg file won't be installed
-installopts = '--no-binary=%(namelower)s'
-
-sanity_check_paths = {
-    'files': ['%s/py3cairo.%s' % (p, e) for (p, e) in [('include/pycairo', 'h'), ('lib/pkgconfig', 'pc')]],
-    'dirs': ['lib/python%(pyshortver)s/site-packages/cairo'],
-}
-
-options = {'modulename': 'cairo'}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/p/PyFerret/Faddpath b/Golden_Repo/p/PyFerret/Faddpath
deleted file mode 100755
index e97792348..000000000
--- a/Golden_Repo/p/PyFerret/Faddpath
+++ /dev/null
@@ -1,11 +0,0 @@
-# Wrapper to compensate for the lack of function definition (defined when sourcing a PyFerret script)
-#!/bin/sh
-if [ -n "$*" ]
-then
-    export FER_GO="$FER_GO $*"
-    export FER_DATA="$FER_DATA $*"
-    export FER_DESCR="$FER_DESCR $*"
-    export FER_GRIDS="$FER_GRIDS $*"
-else
-    echo "    Usage: Faddpath new_directory_1 ..."
-fi
diff --git a/Golden_Repo/p/PyFerret/PyFerret-7.6.5-gpsmkl-2021b.eb b/Golden_Repo/p/PyFerret/PyFerret-7.6.5-gpsmkl-2021b.eb
deleted file mode 100644
index 632092a9e..000000000
--- a/Golden_Repo/p/PyFerret/PyFerret-7.6.5-gpsmkl-2021b.eb
+++ /dev/null
@@ -1,99 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'PyFerret'
-version = '7.6.5'
-local_dataset_ver = '7.6'
-
-homepage = 'http://ferret.pmel.noaa.gov/'
-description = '''PyFerret is an interactive computer visualization and analysis environment
-designed to meet the needs of oceanographers and meteorologists analyzing large and complex gridded data sets.'''
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-toolchainopts = {'opt': True, 'optarch': True, 'usempi': False}
-
-source_urls = [
-    'https://github.com/NOAA-PMEL/PyFerret/archive/',
-    'https://github.com/NOAA-PMEL/FerretDatasets/archive/'
-]
-sources = [
-    'v%(version)s.tar.gz',
-    'v7.6.tar.gz'
-]
-
-patches = [
-    ('pyferret', 'bin'),
-    ('Faddpath', 'bin'),
-    ('configure_pyferret-7.6.3_stage2021.patch')
-]
-
-checksums = [
-    ('sha256', '1cc96a7b2ac87a2df3808d1c4d14604a2f5bad11f3c0d129b51b5f810c3102c7'),
-    ('sha256', 'b2fef758ec1817c1c19e6225857ca3a82c727d209ed7fd4697d45c5533bb2c72'),
-    ('sha256', 'f8157da29a40691e063487e5e03530c6556b5abc9b3365d196bcf5cc0f09946d'),
-    ('sha256', '49b054c065c79552dca369cb5591a41ebfdfeff5d05e8dcef8c0b36a51cc547e'),
-    ('sha256', '2f5eb994b2977c3a164bfad2675b7a6bd293d8018c79fd181d39a405c68a12bf'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-Stack', '2021b', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('netCDF', '4.8.1', '-serial'),
-    ('netCDF-Fortran', '4.5.3', '-serial'),
-    ('HDF5', '1.12.1', '-serial'),
-    ('zlib', '1.2.11'),
-    ('cURL', '7.78.0'),
-    ('Pango', '1.48.8'),
-    ('libpng', '1.6.37'),
-    ('cairo', '1.16.0'),
-    ('freetype', '2.11.0'),
-    ('fontconfig', '2.13.94'),
-    ('pixman', '0.40.0'),
-    ('GLib', '2.69.1'),
-    ('PyQt5', '5.15.4'),
-    ('pixman', '0.40.0'),
-]
-
-maxparallel = 1  # yes!
-
-skipsteps = ['configure']
-start_dir = '%(builddir)s/%(name)s-%(version)s'
-
-prebuildopts = [(
-    'export FER_SRC_PREFIX=%(builddir)s/%(name)s-%(version)s && '
-)]
-
-preinstallopts = ['export FER_DIR=%(installdir)s && ']
-
-modextrapaths = {
-    'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages',
-    'LD_LIBRARY_PATH': 'lib/python%(pyshortver)s/site-packages/pyferret',
-}
-
-modextravars = {
-    'FER_DIR': '%(installdir)s',
-    'FER_DSETS': '%(installdir)s/datasets',
-    # 'FER_WEB_BROWSER': 'firefox', # Probably nobody should use this
-    'FER_DATA_THREDDS': 'http://ferret.pmel.noaa.gov/geoide/geoIDECleanCatalog.xml %(installdir)s/datasets',
-    'FER_DATA': '. %(installdir)s/datasets/data %(installdir)s/go %(installdir)s/examples',
-    'FER_DESCR': '. %(installdir)s/datasets/descr',
-    'FER_GRIDS': '. %(installdir)s/datasets/grids',
-    'FER_GO': '. %(installdir)s/go %(installdir)s/examples %(installdir)s/contrib',
-    'FER_EXTERNAL_FUNCTIONS': '%(installdir)s/ext_func/libs',
-    'PYFER_EXTERNAL_FUNCTIONS': '%(installdir)s/ext_func/pylibs',
-    'FER_PALETTE': '. %(installdir)s/ppl',
-    'SPECTRA': '%(installdir)s/ppl',
-    'FER_FONTS': '%(installdir)s/ppl/fonts',
-    'PLOTFONTS': '%(installdir)s/ppl/fonts',
-    'FER_LIBS': '%(installdir)s/lib',
-    'FER_DAT': '%(installdir)s',
-}
-
-postinstallcmds = [
-    'chmod +x %(installdir)s/bin/pyferret',
-    'mkdir %(installdir)s/datasets',
-    'mv %%(builddir)s/FerretDatasets-%s/data  %%(installdir)s/datasets' % local_dataset_ver,
-    'mv %%(builddir)s/FerretDatasets-%s/descr %%(installdir)s/datasets' % local_dataset_ver,
-    'mv %%(builddir)s/FerretDatasets-%s/grids %%(installdir)s/datasets' % local_dataset_ver,
-]
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/p/PyFerret/configure_pyferret-7.6.3_stage2021.patch b/Golden_Repo/p/PyFerret/configure_pyferret-7.6.3_stage2021.patch
deleted file mode 100644
index e6e4ce0d5..000000000
--- a/Golden_Repo/p/PyFerret/configure_pyferret-7.6.3_stage2021.patch
+++ /dev/null
@@ -1,438 +0,0 @@
-diff -Naur PyFerret-7.6.3.orig/external_functions/ef_utility/site_specific.mk PyFerret-7.6.3/external_functions/ef_utility/site_specific.mk
---- PyFerret-7.6.3.orig/external_functions/ef_utility/site_specific.mk	1970-01-01 01:00:00.000000000 +0100
-+++ PyFerret-7.6.3/external_functions/ef_utility/site_specific.mk	2020-12-17 15:22:43.154040000 +0100
-@@ -0,0 +1,75 @@
-+## Site-dependent definitions included in external function Makefiles
-+## of an installed PyFerret directory.
-+
-+## =========================
-+## Machine type for which to build Ferret/PyFerret
-+##   x86_64-linux      for 64-bit RHEL
-+##   x86_64-linux-gnu  for 64-bit Ubuntu and many "free" Linux systems
-+##   i386-linux        for 32-bit RHEL
-+##   i386-linux-gnu    for 32-bit Ubuntu and many "free" Linux systems
-+##   intel-mac         for Max OSX
-+## This value is used to determine which platform_specific.mk
-+## file to include in the Makefiles.
-+## =========================
-+# BUILDTYPE = $(HOSTTYPE)
-+BUILDTYPE = x86_64-linux
-+# BUILDTYPE = x86_64-linux-gnu
-+# BUILDTYPE = i386-linux
-+# BUILDTYPE = i386-linux-gnu
-+# BUILDTYPE = intel-mac
-+
-+## =========================
-+## INSTALL_FER_DIR and PYTHON_EXE are only used to construct
-+## the location of pyferret library.  The library should be
-+## (for either 32-bit or 64-bit Linux)
-+## $(INSTALL_FER_DIR)/lib/$(PYTHON_EXE)/site-package/pyferret/libpyferret.so
-+## or possibly (for 64-bit Linux only)
-+## $(INSTALL_FER_DIR)/lib64/$(PYTHON_EXE)/site-package/pyferret/libpyferret.so
-+##
-+## PyFerret installation directory, usually just $(FER_DIR)
-+## Must be $(FER_DIR) when building pyferret from source.
-+## (This file is also found in PyFerret installations, thus the option.)
-+## =========================
-+# INSTALL_FER_DIR = $(HOME)/PyFerret
-+INSTALL_FER_DIR = $(FER_DIR)
-+
-+## =========================
-+## C and Fortran compilers to use.  The construct "$(shell which gcc)" assigns
-+## the response to "which gcc" run from a Bourne shell (such as bash).
-+## When compiling for Mac OS X, one may wish to use clang instead of gcc.
-+## If you wish to use values already defined in you shell environment when 
-+## you run make, comment out all definitions of CC and FC (do NOT leave blank).
-+## =========================
-+# CC = $(shell which clang)
-+CC = $(shell which gcc)
-+FC = $(shell which gfortran) -w -fallow-argument-mismatch -fallow-invalid-boz 
-+
-+## =========================
-+## Linker used to generate executables and shared-object libraries.
-+## Normally the Fortran compiler is used which then calls the actual
-+## linker with appropriate flags and system-level Fortran libraries.
-+## The construct "$(shell which gfortran)" assigns the response to 
-+## "which gfortran" run from a Bourne shell (such as bash).
-+## If you wish to use a value already defined in you shell environment when 
-+## you run make, comment out all definitions of LD (do NOT leave blank).
-+## =========================
-+LD = $(shell which gfortran)
-+
-+## =========================
-+## Python version used by PyFerret
-+## =========================
-+# PYTHON_EXE = python2.6
-+# PYTHON_EXE = python2.7
-+# PYTHON_EXE = python3.6
-+# PYTHON_EXE = python3.7
-+PYTHON_EXE = python3.9
-+
-+## =========================
-+## FER_LOCAL_EXTFCNS is the directory in which to install
-+## the Ferret Fortran external functions.  The example
-+## functions that come with the PyFerret installation are
-+## installed in $(INSTALL_FER_DIR)/ext_func/pylibs
-+## =========================
-+FER_LOCAL_EXTFCNS = $(INSTALL_FER_DIR)/ext_func/pylibs
-+
-+##
-diff -Naur PyFerret-7.6.3.orig/Makefile PyFerret-7.6.3/Makefile
---- PyFerret-7.6.3.orig/Makefile	2020-09-28 21:10:48.000000000 +0200
-+++ PyFerret-7.6.3/Makefile	2020-12-17 14:37:08.501952000 +0100
-@@ -74,10 +74,12 @@
- 	  export CFLAGS="$(CFLAGS) -DNDEBUG -O" ; \
- 	  export BUILDTYPE=$(BUILDTYPE) ; \
- 	  export NETCDF_LIBDIR=$(NETCDF_LIBDIR) ; \
-+          export NETCDFFORTRAN_LIBDIR=$(NETCDFFORTRAN_LIBDIR) ; \
- 	  export HDF5_LIBDIR=$(HDF5_LIBDIR) ; \
- 	  export SZ_LIBDIR=$(SZ_LIBDIR) ; \
- 	  export CAIRO_LIBDIR=$(CAIRO_LIBDIR) ; \
- 	  export PIXMAN_LIBDIR=$(PIXMAN_LIBDIR) ; \
-+          export HARFBUZZ_LIBDIR=$(HARFBUZZ_LIBDIR) ; \
- 	  export PANGO_LIBDIR=$(PANGO_LIBDIR) ; \
- 	  export GLIB2_LIBDIR=$(GLIB2_LIBDIR) ; \
- 	  export GFORTRAN_LIB=$(GFORTRAN_LIB) ; \
-@@ -94,10 +96,12 @@
- 	  export CFLAGS="$(CFLAGS) -DNDEBUG -O" ; \
- 	  export BUILDTYPE=$(BUILDTYPE) ; \
- 	  export NETCDF_LIBDIR=$(NETCDF_LIBDIR) ; \
-+          export NETCDFFORTRAN_LIBDIR=$(NETCDFFORTRAN_LIBDIR) ; \
- 	  export HDF5_LIBDIR=$(HDF5_LIBDIR) ; \
- 	  export SZ_LIBDIR=$(SZ_LIBDIR) ; \
- 	  export CAIRO_LIBDIR=$(CAIRO_LIBDIR) ; \
- 	  export PIXMAN_LIBDIR=$(PIXMAN_LIBDIR) ; \
-+	  export HARFBUZZ_LIBDIR=$(HARFBUZZ_LIBDIR) ; \
- 	  export PANGO_LIBDIR=$(PANGO_LIBDIR) ; \
- 	  export GLIB2_LIBDIR=$(GLIB2_LIBDIR) ; \
- 	  export GFORTRAN_LIB=$(GFORTRAN_LIB) ; \
-@@ -117,10 +121,12 @@
- 	  export CFLAGS="$(CFLAGS) -UNDEBUG -O0 -g" ; \
- 	  export BUILDTYPE=$(BUILDTYPE) ; \
- 	  export NETCDF_LIBDIR=$(NETCDF_LIBDIR) ; \
-+          export NETCDFFORTRAN_LIBDIR=$(NETCDFFORTRAN_LIBDIR) ; \
- 	  export HDF5_LIBDIR=$(HDF5_LIBDIR) ; \
- 	  export SZ_LIBDIR=$(SZ_LIBDIR) ; \
- 	  export CAIRO_LIBDIR=$(CAIRO_LIBDIR) ; \
- 	  export PIXMAN_LIBDIR=$(PIXMAN_LIBDIR) ; \
-+          export HARFBUZZ_LIBDIR=$(HARFBUZZ_LIBDIR) ; \
- 	  export PANGO_LIBDIR=$(PANGO_LIBDIR) ; \
- 	  export GLIB2_LIBDIR=$(GLIB2_LIBDIR) ; \
- 	  export GFORTRAN_LIB=$(GFORTRAN_LIB) ; \
-@@ -137,10 +143,12 @@
- 	  export CFLAGS="$(CFLAGS) -UNDEBUG -O0 -g" ; \
- 	  export BUILDTYPE=$(BUILDTYPE) ; \
- 	  export NETCDF_LIBDIR=$(NETCDF_LIBDIR) ; \
-+          export NETCDFFORTRAN_LIBDIR=$(NETCDFFORTRAN_LIBDIR) ; \
- 	  export HDF5_LIBDIR=$(HDF5_LIBDIR) ; \
- 	  export SZ_LIBDIR=$(SZ_LIBDIR) ; \
- 	  export CAIRO_LIBDIR=$(CAIRO_LIBDIR) ; \
- 	  export PIXMAN_LIBDIR=$(PIXMAN_LIBDIR) ; \
-+          export HARFBUZZ_LIBDIR=$(HARFBUZZ_LIBDIR) ; \
- 	  export PANGO_LIBDIR=$(PANGO_LIBDIR) ; \
- 	  export GLIB2_LIBDIR=$(GLIB2_LIBDIR) ; \
- 	  export GFORTRAN_LIB=$(GFORTRAN_LIB) ; \
-@@ -185,10 +193,12 @@
- 	  export CFLAGS="$(CFLAGS) -O" ; \
- 	  export BUILDTYPE=$(BUILDTYPE) ; \
- 	  export NETCDF_LIBDIR=$(NETCDF_LIBDIR) ; \
-+          export NETCDFFORTRAN_LIBDIR=$(NETCDFFORTRAN_LIBDIR) ; \
- 	  export HDF5_LIBDIR=$(HDF5_LIBDIR) ; \
- 	  export SZ_LIBDIR=$(SZ_LIBDIR) ; \
- 	  export CAIRO_LIBDIR=$(CAIRO_LIBDIR) ; \
- 	  export PIXMAN_LIBDIR=$(PIXMAN_LIBDIR) ; \
-+          export HARFBUZZ_LIBDIR=$(HARFBUZZ_LIBDIR) ; \
- 	  export PANGO_LIBDIR=$(PANGO_LIBDIR) ; \
- 	  export GLIB2_LIBDIR=$(GLIB2_LIBDIR) ; \
- 	  export GFORTRAN_LIB=$(GFORTRAN_LIB) ; \
-diff -Naur PyFerret-7.6.3.orig/platform_specific.mk.x86_64-linux PyFerret-7.6.3/platform_specific.mk.x86_64-linux
---- PyFerret-7.6.3.orig/platform_specific.mk.x86_64-linux	2020-09-28 21:10:48.000000000 +0200
-+++ PyFerret-7.6.3/platform_specific.mk.x86_64-linux	2020-12-17 14:36:27.694118000 +0100
-@@ -17,6 +17,7 @@
- # Include directories
- #
- 	NETCDF_INCLUDE	= -I$(NETCDF_LIBDIR)/../include
-+	NETCDFFORTRAN_INCLUDE = -I$(NETCDFFORTRAN_LIBDIR)/../include
- 
- ifeq ($(strip $(HDF5_LIBDIR)),)
- 	HDF5_INCLUDE	=
-@@ -36,6 +37,12 @@
- 	PIXMAN_INCLUDE	= -I$(PIXMAN_LIBDIR)/../include
- endif
- 
-+ifeq ($(strip $(HARFBUZZ_LIBDIR)),)
-+        HARFBUZZ_INCLUDE   = -I/usr/include/harfbuzz
-+else
-+        HARFBUZZ_INCLUDE   = -I$(HARFBUZZ_LIBDIR)/../include/harfbuzz
-+endif
-+
- ifeq ($(strip $(PANGO_LIBDIR)),)
- 	PANGO_INCLUDE	= -I/usr/include/pango-1.0
- else
-@@ -64,9 +71,11 @@
- 			  -I$(DIR_PREFIX)/pyfermod \
- 			  -I$(DIR_PREFIX)/external_functions/ef_utility \
- 			  $(NETCDF_INCLUDE) \
-+			  $(NETCDFFORTRAN_INCLUDE) \
- 			  $(HDF5_INCLUDE) \
- 			  $(CAIRO_INCLUDE) \
- 			  $(PIXMAN_INCLUDE) \
-+			  $(HARFBUZZ_INCLUDE) \
- 			  $(PANGO_INCLUDE) \
- 			  $(GLIB2_INCLUDE)
- 
-diff -Naur PyFerret-7.6.3.orig/setup.py PyFerret-7.6.3/setup.py
---- PyFerret-7.6.3.orig/setup.py	2020-09-28 21:10:48.000000000 +0200
-+++ PyFerret-7.6.3/setup.py	2020-12-17 14:36:06.465376000 +0100
-@@ -30,6 +30,13 @@
- if not netcdf_libdir:
-     raise ValueError("Environment variable NETCDF_LIBDIR is not defined")
- 
-+# NETCDFFORTAN_LIBDIR must be given, either for the static library or the shared-object library
-+netcdffortran_libdir = os.getenv("NETCDFFORTRAN_LIBDIR")
-+if netcdffortran_libdir:
-+    netcdffortran_libdir = netcdffortran_libdir.strip()
-+else:
-+    netcdffortran_libdir = netcdf_libdir
-+
- # HDF5_LIBDIR is only given if the HDF5 and NetCDF libraries are to be statically linked
- hdf5_libdir = os.getenv("HDF5_LIBDIR")
- if hdf5_libdir:
-@@ -50,6 +57,11 @@
- if pixman_libdir:
-     pixman_libdir = pixman_libdir.strip()
- 
-+# HARFBUZZ gives a non-standard location of the harfbuzz libraries
-+harfbuzz_libdir = os.getenv("HARFBUZZ_LIBDIR")
-+if harfbuzz_libdir:
-+    harfbuzz_libdir = harfbuzz_libdir.strip()
-+
- # PANGO_LIBDIR gives a non-standard location of the pango libraries
- pango_libdir = os.getenv("PANGO_LIBDIR")
- if pango_libdir:
-@@ -66,6 +78,8 @@
- 
- # The list of additional directories to examine for libraries
- libdir_list = [ "lib", netcdf_libdir, ]
-+if netcdffortran_libdir:
-+    libdir_list.append(netcdffortran_libdir)
- if hdf5_libdir:
-     libdir_list.append(hdf5_libdir)
- if sz_libdir:
-@@ -74,6 +88,8 @@
-     libdir_list.append(cairo_libdir)
- if pixman_libdir:
-     libdir_list.append(pixman_libdir)
-+if harfbuzz_libdir:
-+    libdir_list.append(harfbuzz_libdir)
- if pango_libdir:
-     libdir_list.append(pango_libdir)
- libdir_list.append(python_libdir)
-@@ -103,7 +119,7 @@
- # The hdf5 libraries are only used to resolve netcdf library function
- # calls when statically linking in the netcdf libraries.
- if hdf5_libdir:
--    netcdff_lib = os.path.join(netcdf_libdir, "libnetcdff.a")
-+    netcdff_lib = os.path.join(netcdffortran_libdir, "libnetcdff.a")
-     addn_link_args.append(netcdff_lib)
-     netcdf_lib = os.path.join(netcdf_libdir, "libnetcdf.a")
-     addn_link_args.append(netcdf_lib)
-diff -Naur PyFerret-7.6.3.orig/site_specific.mk PyFerret-7.6.3/site_specific.mk
---- PyFerret-7.6.3.orig/site_specific.mk	1970-01-01 01:00:00.000000000 +0100
-+++ PyFerret-7.6.3/site_specific.mk	2020-12-17 14:41:42.140897914 +0100
-@@ -0,0 +1,195 @@
-+## Site-dependent definitions included in Makefiles
-+
-+## !!! Also verify the values in external_functions/ef_utility/site_specific.mk !!!
-+
-+## =========================
-+## Full path name of the directory containing this file (the ferret root directory).
-+## Do not use $(shell pwd) since this is included in Makefiles in other directories.
-+## =========================
-+# DIR_PREFIX = $(HOME)/build/pyferret_dev
-+# DIR_PREFIX = $(HOME)/svn/pyferret
-+DIR_PREFIX = $(FER_SRC_PREFIX)
-+
-+## =========================
-+## Installation directory for built PyFerret.
-+## Using the "install" Makefile target creates a generic pyferret-*.tar.gz file
-+## and then extracts it to create a PyFerret installation at this location.
-+## =========================
-+# INSTALL_FER_DIR = $(HOME)/ferret_distributions/rhel6_64
-+INSTALL_FER_DIR = $(FER_DIR)
-+
-+## =========================
-+## Machine type for which to build Ferret/PyFerret
-+##   x86_64-linux      for 64-bit RHEL
-+##   x86_64-linux-gnu  for 64-bit Ubuntu and many "free" Linux systems
-+##   i386-linux        for 32-bit RHEL
-+##   i386-linux-gnu    for 32-bit Ubuntu and many "free" Linux systems
-+##   intel-mac         for Mac OSX
-+## =========================
-+# BUILDTYPE = $(HOSTTYPE)
-+BUILDTYPE = x86_64-linux
-+# BUILDTYPE = x86_64-linux-gnu
-+# BUILDTYPE = i386-linux
-+# BUILDTYPE = i386-linux-gnu
-+# BUILDTYPE = intel-mac
-+
-+## =========================
-+## C and Fortran compilers to use.  The construct "$(shell which gcc)" assigns
-+## the response to "which gcc" run from a Bourne shell (such as bash).
-+## When compiling for Mac OS X, one may wish to use clang instead of gcc.
-+## If you wish to use values already defined in you shell environment when 
-+## you run make, comment out all definitions of CC and FC (do NOT leave blank).
-+## =========================
-+# CC = $(shell which clang)
-+CC = $(shell which gcc)
-+FC = $(shell which gfortran) -w -fallow-argument-mismatch -fallow-invalid-boz 
-+
-+## =========================
-+## Python executable to invoke for build and install.
-+## =========================
-+# PYTHON_EXE = python2.6
-+# PYTHON_EXE = python2.7
-+# PYTHON_EXE = python3.6
-+# PYTHON_EXE = python3.7
-+PYTHON_EXE = python3.9
-+
-+## =========================
-+## Full path to the python include files directory.
-+## Should not need any modifications.
-+## =========================
-+PYTHONINCDIR := $(shell $(PYTHON_EXE) -c "from __future__ import print_function ; import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())")
-+
-+## =========================
-+## If given and not empty, the full path name to the gfortran library to use.
-+## This is primarily used for the intel-mac build.
-+## The given scripts (commented out) should provide the correct value for the gfortran libraries.
-+## If empty or not given, the gfortran library is linked in using the "-lgfortran" flag.
-+## =========================
-+# GFORTRAN_LIB = $(shell $(FC) --print-file-name=libgfortran.dylib)
-+# GFORTRAN_LIB = $(shell $(FC) --print-file-name=libgfortran.a)
-+GFORTRAN_LIB =
-+
-+## =========================
-+## Directory containing the Cairo static libraries (v1.12 or later).
-+## Include files are assumed to be located in an "include" sibling directory.
-+## If given and not empty, the Cairo static libraries found under this directory will be used.
-+## If empty or not given, the system's Cairo shared libraries will be used.
-+## =========================
-+# CAIRO_LIBDIR = /usr/local/cairo/lib
-+# CAIRO_LIBDIR = $(HOME)/.local/lib
-+# CAIRO_LIBDIR = /usr/local/lib
-+# CAIRO_LIBDIR = /p/software/juwels/stages/Devel-2020/software/cairo/1.17.2-GCCcore-9.3.0/lib64
-+CAIRO_LIBDIR = $(EBROOTCAIRO)/lib
-+
-+## =========================
-+## Directory containing the Pixman static libraries used by the above Cairo static libraries.
-+## Include files are assumed to be located in an "include" sibling directory.
-+## If given and not empty, the Pixman-1 static libraries found in this directory will be used.
-+## If empty or not given, the system's Pixman-1 shared library will be used.
-+## This value should be empty or not given if CAIRO_LIBDIR is empty or not given.
-+## =========================
-+# PIXMAN_LIBDIR = /usr/local/pixman/lib
-+# PIXMAN_LIBDIR = $(HOME)/.local/lib
-+# PIXMAN_LIBDIR = /usr/local/lib
-+# PIXMAN_LIBDIR = /gpfs/software/juwels/stages/Devel-2020/software/pixman/0.40.0-GCCcore-9.3.0/lib
-+PIXMAN_LIBDIR = $(EBROOTPIXMAN)/lib
-+
-+## =========================
-+## Directory containing the HarfBuzz shared libraries.
-+## Include files are assumed to be located in an "include" sibling directory.
-+## If given and not empty, the HarfBuzz shared libraries under this directory are used.
-+## If empty or not given, the system's HarfBuzz shared libraries are used.
-+## This value should be empty or not given if CAIRO_LIBDIR is empty or not given.
-+## =========================
-+#HARFBUZZ_LIBDIR = /p/software/juwels/stages/Devel-2020/software/HarfBuzz/2.6.7-GCCcore-9.3.0/lib64
-+HARFBUZZ_LIBDIR = $(EBROOTHARFBUZZ)/lib
-+
-+## =========================
-+## Directory containing the Pango shared libraries.
-+## Include files are assumed to be located in an "include" sibling directory.
-+## If given and not empty, the Pango shared libraries under this directory are used.
-+## If empty or not given, the system's Pango shared libraries are used.
-+## This value should be empty or not given if CAIRO_LIBDIR is empty or not given.
-+## =========================
-+# PANGO_LIBDIR = $(HOME)/.local/lib
-+# PANGO_LIBDIR = /usr/local/lib
-+# PANGO_LIBDIR = /gpfs/software/juwels/stages/Devel-2020/software/Pango/1.44.7-GCCcore-9.3.0/lib
-+PANGO_LIBDIR = $(EBROOTPANGO)/lib
-+
-+## =========================
-+## Library directory containing a "glib-2.0" subdirectory with GLib-2.0 include file(s)
-+## (yes, a little unusual) used by the above Pango shared libraries.
-+## An "include" sibling directory containing a "glib-2.0" subdirectory with more
-+## GLib-2.0 include files is assumed to exist.
-+## If given and not empty, GLib-2.0 include files under this directory are used.
-+## If empty or not given, the system's GLib-2.0 shared libraries are used.
-+## This value should be empty or not given if PANGO_LIBDIR is empty or not given.
-+## =========================
-+# GLIB2_LIBDIR = $(HOME)/.local/lib
-+# GLIB2_LIBDIR = /usr/local/lib
-+# GLIB2_LIBDIR = /gpfs/software/juwels/stages/Devel-2020/software/GLib/2.64.4-GCCcore-9.3.0/lib
-+GLIB2_LIBDIR = $(EBROOTGLIB)/lib
-+
-+## =========================
-+## Directory containing the HDF5 static libraries.
-+## Include files are assumed to be located in an "include" sibling directory.
-+## If given and not empty, HDF5 and NetCDF static libraries will be used.
-+## If empty or not given, NetCDF shared libraries (which specify the HDF5 and
-+## compression libraries required) will be used.
-+## =========================
-+# HDF5_LIBDIR = /usr/local/hdf5/lib
-+# HDF5_LIBDIR = $(HOME)/.local/lib
-+# HDF5_LIBDIR = /usr/local/lib
-+# HDF5_LIBDIR = /usr/lib64
-+# HDF5_LIBDIR = /usr/lib
-+# HDF5_LIBDIR = /p/software/juwels/stages/Devel-2020/software/HDF5/1.10.6-gompi-2020/lib64
-+# HDF5_LIBDIR = $(EBROOTHDF5)/lib
-+
-+## =========================
-+## Location of the SZ compression static library.
-+## This value should be given only if the SZ compression library was used in
-+## building the HDF5 library, and the NetCDF and HDF5 static libraries are being
-+## used (HDF5_LIBDIR is given and not empty).
-+## If given and not empty, the SZ compression static library is used.
-+## If empty or not given, the SZ compression library will not be used
-+## (which is what you want if the HDF5 libraries were built using the Z compression library).
-+## =========================
-+# SZ_LIBDIR = $(HOME)/.local/lib
-+# SZ_LIBDIR = /usr/local/lib
-+# SZ_LIBDIR = /usr/lib64
-+# SZ_LIBDIR = /usr/lib
-+# SZ_LIBDIR = /gpfs/software/juwels/stages/Devel-2020/software/Szip/2.1.1-GCCcore-9.3.0/lib
-+SZ_LIBDIR = $(EBROOTSZIP)/lib
-+
-+## =========================
-+## Location of the NetCDF libraries.
-+## Include files are assumed to be located in an "include" sibling directory.
-+## If HDF5_LIBDIR is given and not empty, the static libraries will be used
-+## (along with the HDF5 static libraries).
-+## If HDF5_LIBDIR is empty or not given, NetCDF shared libraries will be used.
-+## =========================
-+# NETCDF_LIBDIR = /usr/local/netcdf/lib
-+# NETCDF_LIBDIR = $(HOME)/.local/lib
-+# NETCDF_LIBDIR = /usr/local/lib
-+# NETCDF_LIBDIR = /usr/lib64
-+# NETCDF_LIBDIR = /usr/lib
-+# NETCDF_LIBDIR = /p/software/juwels/stages/Devel-2020/software/netCDF/4.7.4-gompi-2020/lib64
-+NETCDF_LIBDIR = $(EBROOTNETCDF)/lib64
-+
-+## =========================
-+## Location of the NetCDF fortran libraries.
-+## Include files are assumed to be located in an "include" sibling directory.
-+## If HDF5_LIBDIR is given and not empty, the static libraries will be used
-+## (along with the HDF5 static libraries).
-+## If HDF5_LIBDIR is empty or not given, NetCDF fortran shared libraries will be used.
-+## If empty or not given, the netcdf fortran shared libraries will be searched for in NETCDF_LIBDIR
-+## =========================
-+# NETCDFFORTRAN_LIBDIR = /usr/local/netcdf/lib
-+# NETCDFFORTRAN_LIBDIR = $(HOME)/.local/lib
-+# NETCDFFORTRAN_LIBDIR = /usr/local/lib
-+# NETCDFFORTRAN_LIBDIR = /usr/lib64
-+# NETCDFFORTRAN_LIBDIR = /usr/lib
-+# NETCDFFORTRAN_LIBDIR = /p/software/juwels/stages/Devel-2020/software/netCDF-Fortran/4.5.3-gompi-2020/lib64
-+NETCDFFORTRAN_LIBDIR = $(EBROOTNETCDFMINFORTRAN)/lib
-+
-+##
diff --git a/Golden_Repo/p/PyFerret/pyferret b/Golden_Repo/p/PyFerret/pyferret
deleted file mode 100755
index 46e83c36b..000000000
--- a/Golden_Repo/p/PyFerret/pyferret
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-if [ -z "${FER_LIBS}" ]; then
-    echo "**ERROR: Ferret environment variables are not defined"
-    exit 1
-fi
-python -i -c "import sys; import pyferret; (errval, errmsg) = pyferret.init(sys.argv[1:], True)" $*
diff --git a/Golden_Repo/p/PyGObject/PyGObject-3.42.0-GCCcore-11.2.0.eb b/Golden_Repo/p/PyGObject/PyGObject-3.42.0-GCCcore-11.2.0.eb
deleted file mode 100644
index 7033ab568..000000000
--- a/Golden_Repo/p/PyGObject/PyGObject-3.42.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,47 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'PyGObject'
-version = '3.42.0'
-
-homepage = 'https://pygobject.readthedocs.io'
-description = """PyGObject is a Python package which provides bindings for GObject based
-libraries such as GTK, GStreamer, WebKitGTK, GLib, GIO and many more.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [PYPI_SOURCE]
-sources = [SOURCE_TAR_GZ]
-checksums = ['b9803991ec0b0b4175e81fee0ad46090fa7af438fe169348a9b18ae53447afcd']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('GLib', '2.69.1'),
-    ('GObject-Introspection', '1.68.0'),
-    ('PyCairo', '1.20.1'),
-    ('libffi', '3.4.2'),
-]
-
-use_pip = False
-sanity_pip_check = True
-download_dep_fail = True
-
-# install data (pkg-config and include files)
-installopts = '--root=/'
-
-sanity_check_paths = {
-    'files': [
-        'include/pygobject-%(version_major)s.0/pygobject.h',
-        'lib/pkgconfig/pygobject-%(version_major)s.0.pc',
-    ],
-    'dirs': ['lib/python%(pyshortver)s/site-packages/gi'],
-}
-
-options = {'modulename': 'gi'}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/p/PyOpenCL/PyOpenCL-2021.2.13-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/p/PyOpenCL/PyOpenCL-2021.2.13-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index eb0f22399..000000000
--- a/Golden_Repo/p/PyOpenCL/PyOpenCL-2021.2.13-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,39 +0,0 @@
-easyblock = "PythonBundle"
-
-name = "PyOpenCL"
-version = "2021.2.13"
-
-homepage = "https://pypi.python.org/pypi/pyopencl/"
-description = """Python wrapper for OpenCL. PyOpenCL lets you access GPUs and other massively parallel compute devices
-from Python.
-"""
-
-toolchain = {"name": "gcccoremkl", "version": "11.2.0-2021.4.0"}
-
-use_pip = True
-sanity_pip_check = True
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10'),
-    ('CUDA', '11.5', '', SYSTEM),
-    ('PyCUDA', '2021.1'),
-]
-
-exts_download_dep_fail = True
-
-exts_list = [
-    ('pyopencl', version, {
-        'source_urls': ['https://pypi.python.org/packages/source/p/pyopencl'],
-        'checksums': ['8b969c3a9d4153adc6b0915301ffdf626a3784b869a964645de100ae60de7b06'],
-    }),
-]
-
-sanity_check_paths = {
-    "files": [],
-    "dirs": ["lib/python%(pyshortver)s/site-packages"],
-}
-
-modextrapaths = {"PYTHONPATH": ["lib/python%(pyshortver)s/site-packages"]}
-
-moduleclass = "lib"
diff --git a/Golden_Repo/p/PyQt5/PyQt5-5.15.4-GCCcore-11.2.0.eb b/Golden_Repo/p/PyQt5/PyQt5-5.15.4-GCCcore-11.2.0.eb
deleted file mode 100644
index 50e54496b..000000000
--- a/Golden_Repo/p/PyQt5/PyQt5-5.15.4-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,104 +0,0 @@
-easyblock = 'Bundle'
-
-name = 'PyQt5'
-version = '5.15.4'
-
-homepage = 'https://www.riverbankcomputing.com/software/pyqt'
-description = """PyQt5 is a set of Python bindings for v5 of the Qt application framework from The Qt Company.
-This bundle includes PyQtWebEngine, a set of Python bindings for The Qt Company’s Qt WebEngine framework."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'cstd': 'c++11'}
-
-builddependencies = [('binutils', '2.37')]
-dependencies = [
-    ('Python', '3.9.6'),
-    ('Qt5', '5.15.2'),
-]
-
-default_easyblock = 'PythonPackage'
-
-local_pylibdir = '%(installdir)s/lib/python%(pyshortver)s/site-packages'
-
-local_pyqt5_sip_install = " ".join([
-    "sip-install",
-    "--verbose",
-    "--confirm-license",
-    "--target-dir " + local_pylibdir,
-])
-
-local_pyqtweb_configopts = " ".join([
-    "configure.py",
-    "--verbose",
-    "--destdir=%s/PyQt5" % local_pylibdir,
-    "--apidir=%(installdir)s/qsci",
-    "--pyqt-sipdir=%(builddir)s/PyQt5-%(version)s/sip",
-    "--no-stubs",
-    "--no-dist-info",
-])
-
-local_setup_env = "export PATH=%(installdir)s/bin:$PATH && "
-local_setup_env += "export PYTHONPATH=%(installdir)s/lib/python%(pyshortver)s/site-packages:$PYTHONPATH && "
-local_sipver = '5.5.0'
-components = [
-    ('SIP', local_sipver, {
-        'source_urls': [PYPI_SOURCE],
-        'sources': [SOURCELOWER_TAR_GZ],
-        'checksums': ['5d024c419b30fea8a6de8c71a560c7ab0bc3c221fbfb14d55a5b865bd58eaac5'],
-        'start_dir': 'sip-%s' % local_sipver,
-        'use_pip': True,
-        'options': {'modulename': 'PyQt5.sip'},
-    }),
-    ('PyQt-builder', '1.10.1', {
-        'source_urls': [PYPI_SOURCE],
-        'sources': [SOURCE_TAR_GZ],
-        'checksums': ['967b0c7bac0331597e9f8c5b336660f173a9896830b721d6d025e14bde647e17'],
-        'start_dir': 'PyQt-builder-%(version)s',
-        'use_pip': True,
-    }),
-    ('PyQt5_sip', '12.9.0', {
-        'source_urls': [PYPI_SOURCE],
-        'sources': [SOURCE_TAR_GZ],
-        'checksums': ['d3e4489d7c2b0ece9d203ae66e573939f7f60d4d29e089c9f11daa17cfeaae32'],
-        'start_dir': 'PyQt5_sip-%(version)s',
-        'use_pip': True,
-    }),
-    (name, version, {
-        'source_urls': [PYPI_SOURCE],
-        'sources': [SOURCE_TAR_GZ],
-        'checksums': ['2a69597e0dd11caabe75fae133feca66387819fc9bc050f547e5551bce97e5be'],
-        'easyblock': 'Binary',
-        'start_dir': '%(name)s-%(version)s',
-        'skipsteps': ['configure', 'build'],
-        'install_cmd': local_setup_env + local_pyqt5_sip_install,
-    }),
-    ('PyQtWebEngine', version, {
-        'source_urls': [PYPI_SOURCE],
-        'sources': [SOURCE_TAR_GZ],
-        'checksums': ['cedc28f54165f4b8067652145aec7f732a17eadf6736835852868cf76119cc19'],
-        'easyblock': 'ConfigureMakePythonPackage',
-        'start_dir': '%(name)s-%(version)s',
-        'preconfigopts': local_setup_env,
-        'configopts': local_pyqtweb_configopts,
-        'options': {'modulename': 'PyQt5.QtWebEngine'},
-    }),
-]
-
-sanity_check_paths = {
-    'files': ['bin/pyqt-bundle', 'bin/sip-build', 'bin/sip-install', 'bin/sip5'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-sanity_check_commands = [
-    "python -c 'import PyQt5.QtCore'",
-    "python -c 'import PyQt5.pyrcc'",
-    "python -c 'import PyQt5.uic'",
-    "sip5 --help",
-]
-
-modextrapaths = {
-    'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages',
-    'QT_INSTALL_DATA': 'qsci',
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/p/PyQuil/PyQuil-3.0.1-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/p/PyQuil/PyQuil-3.0.1-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index e7ab2e63a..000000000
--- a/Golden_Repo/p/PyQuil/PyQuil-3.0.1-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,134 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'PyQuil'
-version = '3.0.1'
-
-homepage = 'https://github.com/rigetti/pyquil'
-description = """PyQuil is a library for generating and executing Quil programs on the Rigetti Forest platform."""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-Stack', '2021b'),
-]
-
-exts_default_options = {
-    'source_urls': [PYPI_SOURCE],
-    'use_pip': True,
-    'use_pip_for_deps':  False,
-    'download_dep_fail': True,
-    'sanity_pip_check': True,
-}
-
-exts_list = [
-    ('typed_ast', '1.5.1', {
-        'checksums': ['484137cab8ecf47e137260daa20bafbba5f4e3ec7fda1c1e69ab299b75fa81c5'],
-    }),
-    ('immutables', '0.6', {
-        'checksums': ['63023fa0cceedc62e0d1535cd4ca7a1f6df3120a6d8e5c34e89037402a6fd809'],
-    }),
-    ('tomli', '2.0.1', {
-        'checksums': ['de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f'],
-    }),
-    ('mypy_extensions', '0.4.3', {
-        'checksums': ['2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8'],
-    }),
-    ('mypy', '0.961', {
-        'checksums': ['f730d56cb924d371c26b8eaddeea3cc07d78ff51c521c6d04899ac6904b75492'],
-    }),
-    ('requests-mock', '1.8.0', {
-        'checksums': ['e68f46844e4cee9d447150343c9ae875f99fa8037c6dcf5f15bf1fe9ab43d226'],
-    }),
-    ('pytest-cov', '2.12.1', {
-        'checksums': ['261ceeb8c227b726249b376b8526b600f38667ee314f910353fa318caa01f4d7'],
-    }),
-    ('pytest-timeout', '1.4.2', {
-        'checksums': ['20b3113cf6e4e80ce2d403b6fb56e9e1b871b510259206d40ff8d609f48bda76'],
-    }),
-    ('pytest-asyncio', '0.14.0', {
-        'checksums': ['9882c0c6b24429449f5f969a5158b528f39bde47dc32e85b9f0403965017e700'],
-    }),
-    ('pytest-rerunfailures', '9.1.1', {
-        'checksums': ['1cb11a17fc121b3918414eb5eaf314ee325f2e693ac7cb3f6abf7560790827f2'],
-    }),
-    # pyquil application
-    ('python-rapidjson', '1.5', {
-        'checksums': ['04323e63cf57f7ed927fd9bcb1861ef5ecb0d4d7213f2755969d4a1ac3c2de6f'],
-        'modulename': 'rapidjson',
-    }),
-    ('ruamel.yaml', '0.17.17', {
-        'checksums': ['9751de4cbb57d4bfbf8fc394e125ed4a2f170fbff3dc3d78abf50be85924f8be'],
-    }),
-    ('ruamel.yaml.clib', '0.2.6', {
-        'checksums': ['4ff604ce439abb20794f05613c374759ce10e3595d1867764dd1ae675b85acbd'],
-        'modulename': 'ruamel.yaml',
-    }),
-    ('msgpack', '0.6.2', {  # downgrade
-        'checksums': ['ea3c2f859346fcd55fc46e96885301d9c2f7a36d453f5d8f2967840efa1e1830'],
-    }),
-    ('rpcq', '3.10.0', {
-        'checksums': ['bf21780a1cb1e8676b988c44004d49a168d8937ce2a458c00beb37fa41023684'],
-    }),
-    ('antlr4-python3-runtime', '4.7.2', {
-        'checksums': ['168cdcec8fb9152e84a87ca6fd261b3d54c8f6358f42ab3b813b14a7193bb50b'],
-        'modulename': 'antlr4',
-    }),
-    ('lark', '0.11.1', {
-        'checksums': ['f2c6ed79ae128a89714bbaa4a6ecb61b6eec84d1b5d63b9195ad461762f96298'],
-    }),
-    ('retry', '0.9.2', {
-        'checksums': ['f8bfa8b99b69c4506d6f5bd3b0aabf77f98cdb17f3c9fc3f5ca820033336fba4'],
-    }),
-    ('h11', '0.9.0', {
-        'checksums': ['33d4bca7be0fa039f4e84d50ab00531047e53d6ee8ffbc83501ea602c169cae1'],
-    }),
-    ('rfc3986', '1.5.0', {
-        'checksums': ['270aaf10d87d0d4e095063c65bf3ddbc6ee3d0b226328ce21e036f946e421835'],
-    }),
-    ('sniffio', '1.2.0', {
-        'checksums': ['c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de'],
-    }),
-    ('httpx', '0.15.5', {
-        'checksums': ['254b371e3880a8e2387bf9ead6949bac797bd557fda26eba19a6153a0c06bd2b'],
-    }),
-    ('iso8601', '0.1.16', {
-        'checksums': ['36532f77cc800594e8f16641edae7f1baf7932f05d8e508545b95fc53c6dc85b'],
-    }),
-    ('pydantic', '1.8.2', {
-        'checksums': ['26464e57ccaafe72b7ad156fdaa4e9b9ef051f69e175dbbb463283000c05ab7b'],
-    }),
-    ('anyio', '3.4.0', {
-        'checksums': ['24adc69309fb5779bc1e06158e143e0b6d2c56b302a3ac3de3083c705a6ed39d'],
-    }),
-    ('httpcore', '0.11.1', {
-        'checksums': ['a35dddd1f4cc34ff37788337ef507c0ad0276241ece6daf663ac9e77c0b87232'],
-    }),
-    ('PyJWT', '1.7.1', {
-        'checksums': ['8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96'],
-        'modulename': 'jwt',
-    }),
-    ('retrying', '1.3.3', {
-        'checksums': ['08c039560a6da2fe4f2c426d0766e284d3b736e355f8dd24b37367b0bb41973b'],
-    }),
-    ('rfc3339', '6.2', {
-        'checksums': ['d53c3b5eefaef892b7240ba2a91fef012e86faa4d0a0ca782359c490e00ad4d0'],
-    }),
-    ('attrs', '20.3.0', {  # downgrade
-        'checksums': ['832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700'],
-        'modulename': 'attr',
-    }),
-    ('qcs-api-client', '0.8.0', {
-        'checksums': ['68118137337b7ba1688d070bd276c40081938e145759b500699fcc2b941a0fb0'],
-    }),
-    ('pyquil', version, {
-        'checksums': ['5d7f1414c8bcaec6b86577ca1a75a020b0315845eaf3165ae4c0d3633987a387'],
-    }),
-    # addon
-    ('contextvars', '2.3', {
-        'checksums': ['2341042e1c03a271813e07dba29b6b60fa85c1005ea5ed1638a076cf50b4d625'],
-    }),
-]
-
-moduleclass = 'quantum'
diff --git a/Golden_Repo/p/PySCF/PySCF-2.0.1-GCC-11.2.0.eb b/Golden_Repo/p/PySCF/PySCF-2.0.1-GCC-11.2.0.eb
deleted file mode 100644
index 8a634c49c..000000000
--- a/Golden_Repo/p/PySCF/PySCF-2.0.1-GCC-11.2.0.eb
+++ /dev/null
@@ -1,46 +0,0 @@
-easyblock = 'CMakeMakeCp'
-
-name = 'PySCF'
-version = '2.0.1'
-
-homepage = 'http://www.pyscf.org'
-description = "PySCF is an open-source collection of electronic structure modules powered by Python."
-
-toolchain = {'name': 'GCC', 'version': '11.2.0'}
-
-source_urls = ['https://github.com/pyscf/pyscf/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['6a152860787351aae52dc1ef2399bd9564fa314dca070312cfc0f2c3fc7412cf']
-
-builddependencies = [('CMake', '3.21.1')]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10', '',
-     ('gcccoremkl', '11.2.0-2021.4.0')),  # for numpy, scipy
-    ('h5py', '3.5.0', '-serial'),
-    ('libcint', '4.4.0', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('libxc', '5.1.7'),
-    ('XCFun', '2.1.1'),
-]
-
-start_dir = 'pyscf/lib'
-
-separate_build_dir = True
-
-configopts = "-DBUILD_LIBCINT=OFF -DBUILD_LIBXC=OFF -DBUILD_XCFUN=OFF"
-
-prebuildopts = "export PYSCF_INC_DIR=$EBROOTQCINT/include:$EBROOTLIBXC/lib && "
-
-files_to_copy = ['pyscf']
-
-sanity_check_paths = {
-    'files': ['pyscf/__init__.py'],
-    'dirs': ['pyscf/data', 'pyscf/lib'],
-}
-
-sanity_check_commands = ["python -c 'import pyscf'"]
-
-modextrapaths = {'PYTHONPATH': ''}
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/p/PyTorch-Geometric/PyTorch-Geometric-2.0.4-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/p/PyTorch-Geometric/PyTorch-Geometric-2.0.4-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index 6e521d784..000000000
--- a/Golden_Repo/p/PyTorch-Geometric/PyTorch-Geometric-2.0.4-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,124 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'PyTorch-Geometric'
-version = '2.0.4'
-local_pytorch_ver = '1.11'
-
-homepage = 'https://github.com/rusty1s/pytorch_geometric'
-description = "PyTorch Geometric (PyG) is a geometric deep learning extension library for PyTorch."
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-local_pysuff = '-Python-%(pyver)s'
-dependencies = [
-    ('Python', '3.9.6'),
-    ('CUDA', '11.5', '', SYSTEM),
-    ('PyTorch', '1.11', '-CUDA-%(cudaver)s', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('SciPy-bundle', '2021.10'),
-    ('numba', '0.55.1'),
-    ('h5py', '3.5.0', '-serial'),
-    ('matplotlib', '3.4.3'),
-    ('scikit-learn', '1.0.1'),
-    ('scikit-image', '0.18.3'),
-    ('trimesh', '3.9.36'),
-    ('METIS', '5.1.0', '-IDX64'),
-    ('RDFlib', '6.0.2'),
-    ('ASE', '3.22.0', '-nompi'),
-    ('YACS', '0.1.8'),
-    ('tqdm', '4.62.3'),
-    ('torchvision', '0.12.0', '-CUDA-%(cudaver)s', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('YACS', '0.1.8'),
-    ('Java', '15', '', True),  # for HDFML
-    # PyTorch-Lightning needs Tensorboard
-    ('TensorFlow', '2.6.0', '-CUDA-%(cudaver)s', ('gcccoremkl', '11.2.0-2021.4.0'))
-]
-
-use_pip = True
-
-exts_list = [
-    ('pyDeprecate', '0.3.2', {
-        'modulename': 'deprecate',
-        'checksums': ['d481116cc5d7f6c473e7c4be820efdd9b90a16b594b350276e9e66a6cb5bdd29'],
-    }),
-    ('calmsize', '0.1.3', {
-        'checksums': ['e1f1233228ae6b7fafc8c23e52129c7ca58fee6bcf7875ae152eee5123ba122d'],
-    }),
-    ('calmsize', '0.1.3', {
-        'checksums': ['e1f1233228ae6b7fafc8c23e52129c7ca58fee6bcf7875ae152eee5123ba122d'],
-    }),
-    ('antlr4-python3-runtime', '4.8', {
-        'modulename': 'antlr4',
-        'checksums': ['15793f5d0512a372b4e7d2284058ad32ce7dd27126b105fb0b2245130445db33'],
-    }),
-    ('omegaconf', '2.1.2', {
-        'checksums': ['35b347cda95e8ced224179a7059c216b1f38f363812847bd6c856be76936151d'],
-    }),
-    ('typing_extensions', '4.2.0', {
-        'modulename': 'typing_extensions',
-        'source_tmpl': '%(name)s-%(version)s-py3-none-any.whl',
-        'checksums': ['6657594ee297170d19f67d55c05852a874e7eb634f4f753dbd667855e07c1708'],
-    }),
-    ('captum', '0.5.0', {
-        'checksums': ['84af2c8793d34c440a351793b5ca705b8542745e2dc8bc24afb1d9b86f3bf6ec'],
-    }),
-    ('pytorch_memlab', '0.2.4', {
-        'modulename': 'pytorch_memlab',
-        'checksums': ['bd3395c7e122441732de492bb92e5f805086da05f8bcb45a7c5967234db8e812'],
-    }),
-    ('torchmetrics', '0.8.0', {
-        'checksums': ['8516aa79edb8475504f37c6239b1176a5b1d93cf2249d961caccd1a240808208'],
-    }),
-    ('Jinja2', '3.1.1', {
-        'checksums': ['640bed4bb501cbd17194b3cace1dc2126f5b619cf068a726b98192a0fde74ae9'],
-    }),
-    ('hydra-core', '1.1.2', {
-        'modulename': 'hydra',
-        'source_urls': ['https://github.com/facebookresearch/hydra/archive/refs/tags/'],
-        'sources': ['v%(version)s.tar.gz'],
-        'checksums': ['e8d07826e5da25c26b4a1a701817bf7afaa5375a90a4cb229c111d128de56961'],
-    }),
-    ('pytorch-lightning', '1.6.1', {
-        'checksums': ['280b9c7f84f9a6b6d2efb91c7b3caad50031e318d37cfe052f3047faf1f0a2de'],
-    }),
-    ('googledrivedownloader', '0.4', {
-        'modulename': 'google_drive_downloader',
-        'checksums': ['4b34c1337b2ff3bf2bd7581818efbdcaea7d50ffd484ccf80809688f5ca0e204'],
-    }),
-    ('plyfile', '0.7.4', {
-        'checksums': ['9e9a18d22a3158fcd74df38761d43a7facc6df75126f2ab9f4e9a5d4d2188652'],
-    }),
-    ('torch_scatter', '2.0.9', {
-        'checksums': ['08f5511d64473badf0a71d156b36dc2b09b9c2f00a7cd373b935b490c477a7f1'],
-    }),
-    ('torch_sparse', '0.6.13', {
-        'checksums': ['b4896822559f9b47d8b0186d74c94b7449f91db155a57d617fbeae9b722fa1f3'],
-    }),
-    ('torch_cluster', '1.6.0', {
-        'checksums': ['249c1bd8c33a887b22bf569a59d0868545804032123594dd8c76ba1885859c39'],
-    }),
-    ('torch_spline_conv', '1.2.1', {
-        'checksums': ['364f658e0ecb4c5263a728c2961553e022fc44c11a633d5a1bf986cf169ab438'],
-    }),
-    ('python-louvain', '0.16', {
-        'modulename': 'community.community_louvain',
-        'checksums': ['b7ba2df5002fd28d3ee789a49532baad11fe648e4f2117cf0798e7520a1da56b'],
-    }),
-    ('torch_geometric', version, {
-        'checksums': ['d64e4c7486fcf0c7fa82f0acbf5dd52035855469708bf89f8bc7fc607671c8b7'],
-    }),
-]
-
-preinstallopts = 'export TORCH_CUDA_ARCH_LIST="%(cuda_cc_semicolon_sep)s" ; '
-preinstallopts += 'export WITH_METIS=1; '
-preinstallopts += 'export FORCE_CUDA=1; '
-preinstallopts += 'export CUDA_HOME=$EBROOTCUDA; '
-preinstallopts += 'export LD_LIBRARY_PATH=$CUDA_HOME/lib64:$LD_LIBRARY_PATH; '
-preinstallopts += 'export PATH=$CUDA_HOME/bin:$PATH; '
-
-sanity_check_commands = [
-    "python -c 'import torch_sparse'",
-]
-
-sanity_pip_check = True
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/p/PyTorch/PyTorch-1.10.0_fix-test-dataloader-fixed-affinity.patch b/Golden_Repo/p/PyTorch/PyTorch-1.10.0_fix-test-dataloader-fixed-affinity.patch
deleted file mode 100644
index fb66d1b66..000000000
--- a/Golden_Repo/p/PyTorch/PyTorch-1.10.0_fix-test-dataloader-fixed-affinity.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-# Author: Alexander Grund
-# Avoid test failures in CGROUP environments
-# See https://github.com/pytorch/pytorch/issues/44368 and https://github.com/pytorch/pytorch/pull/44369
-diff -Nru pytorch.orig/test/test_dataloader.py pytorch/test/test_dataloader.py
---- pytorch.orig/test/test_dataloader.py	2021-10-28 19:19:23.284526686 +0200
-+++ pytorch/test/test_dataloader.py	2021-10-28 19:21:31.860488973 +0200
-@@ -2374,22 +2374,27 @@
-         after = os.sched_getaffinity(0)
-         return iter(after)
- 
--
--def worker_set_affinity(_):
--    os.sched_setaffinity(0, [multiprocessing.cpu_count() - 1])
--
--
- @unittest.skipIf(
-     not hasattr(os, 'sched_setaffinity'),
-     "os.sched_setaffinity is not available")
- class TestSetAffinity(TestCase):
-     def test_set_affinity_in_worker_init(self):
-+        # Query the current affinity mask to avoid setting a disallowed one
-+        old_affinity = os.sched_getaffinity(0)
-+        if not old_affinity:
-+            self.skipTest("No affinity information")
-+        # Choose any
-+        expected_affinity = list(old_affinity)[-1]
-+
-+        def worker_set_affinity(_):
-+            os.sched_setaffinity(0, [expected_affinity])
-+
-         dataset = SetAffinityDataset()
- 
-         dataloader = torch.utils.data.DataLoader(
-             dataset, num_workers=2, worker_init_fn=worker_set_affinity)
-         for sample in dataloader:
--            self.assertEqual(sample, [multiprocessing.cpu_count() - 1])
-+            self.assertEqual(sample, [expected_affinity])
- 
- class ConvDataset(Dataset):
-     def __init__(self):
diff --git a/Golden_Repo/p/PyTorch/PyTorch-1.10.0_skip_cmake_rpath.patch b/Golden_Repo/p/PyTorch/PyTorch-1.10.0_skip_cmake_rpath.patch
deleted file mode 100644
index 09469cd45..000000000
--- a/Golden_Repo/p/PyTorch/PyTorch-1.10.0_skip_cmake_rpath.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-# Author: Caspar van Leeuwen
-# PyTorch's CMAKE configuration by default sets RUNPATH on libraries if they link other libraries
-# that are outside the build tree, which is done because of the CMAKE config on 
-# https://github.com/pytorch/pytorch/blob/v1.10.0/cmake/Dependencies.cmake#L10.
-# This provides problems, since the cuda stubs library path then also gets added to the RUNPATH.
-# As a result, at runtime, the stub version of things like libcuda.so.1 gets picked up, instead of the real drivers
-# See https://github.com/easybuilders/easybuild-easyconfigs/issues/14359
-# This line https://github.com/pytorch/pytorch/blob/v1.10.0/cmake/Dependencies.cmake#L16
-# Makes sure that any path that is linked, is also added to the RUNPATH.
-# This has been reported upstream in https://github.com/pytorch/pytorch/issues/35418
-# and a fix was attempted in https://github.com/pytorch/pytorch/pull/37737 but it was reverted
-#
-# This EasyBuild patch changes behavior for the libraries that were failing, i.e. the ones in this list:
-# https://github.com/easybuilders/easybuild-easyconfigs/issues/14359#issuecomment-970479904
-# This is done by setting INSTALL_RPATH_USE_LINK_PATH to false, and instead, specifying the RPATH
-# explicitely by defining INSTALL_RPATH, but only adding directories that do not match to the "stubs" regex
-# It has been upstreamed in this PR https://github.com/pytorch/pytorch/pull/68912 (not accepted yet at the time of writing)
-diff -Nru pytorch.orig/caffe2/CMakeLists.txt pytorch/caffe2/CMakeLists.txt
---- pytorch.orig/caffe2/CMakeLists.txt	2021-11-17 11:46:01.797337624 +0100
-+++ pytorch/caffe2/CMakeLists.txt	2021-11-18 19:05:35.637707235 +0100
-@@ -630,8 +630,33 @@
-     else()
-       set(DELAY_LOAD_FLAGS "")
-     endif()
--    target_link_libraries(caffe2_nvrtc ${CUDA_NVRTC} ${CUDA_CUDA_LIB} ${CUDA_NVRTC_LIB} ${DELAY_LOAD_FLAGS})
-+    # message("CUDA_NVRTC: ${CUDA_NVRTC}")
-+    # message("CUDA_NVRTC_LIB: ${CUDA_NVRTC_LIB}")
-+    # message("CUDA_CUDA_LIB: ${CUDA_CUDA_LIB}")
-+    # message("DELAY_LOAD_FLAGS: ${DELAY_LOAD_FLAGS}")
-+    # if(CUDA_CUDA_LIB MATCHES "stubs")
-+    #   message("stubs libraries found in the CUDA_CUDA_LIB: ${CUDA_CUDA_LIB}")
-+    # else()
-+    #   message("Stubs libs not found in CUDA_CUDA_LIB: ${CUDA_CUDA_LIB}")
-+    # endif()
-+    # Make sure the CUDA stubs folder doesn't end up in the RPATH of CAFFE2_NVRTC:
-+    set(CAFFE2_NVRTC_LIBS ${CUDA_NVRTC} ${CUDA_CUDA_LIB} ${CUDA_NVRTC_LIB})
-+    foreach(LIB IN LISTS CAFFE2_NVRTC_LIBS)
-+      message("LIB: ${LIB}")
-+      if(LIB MATCHES "stubs")
-+        message("Filtering ${LIB} from being set in caffe2_nvrtc's RPATH, because it appears to point to the CUDA stubs directory, which should not be RPATHed.")
-+      else()
-+        cmake_path(GET LIB PARENT_PATH LIB_PATH)
-+        message("LIBPATH: ${LIB_PATH}")
-+	list(APPEND CAFFE2_NVRTC_RPATH ${LIB_PATH})
-+      endif()
-+    endforeach()
-+    message("CAFFE2_NVRTC_RPATH: ${CAFFE2_NVRTC_RPATH}")
-+    set_target_properties(caffe2_nvrtc PROPERTIES INSTALL_RPATH_USE_LINK_PATH FALSE)
-+    set_target_properties(caffe2_nvrtc PROPERTIES INSTALL_RPATH "${CAFFE2_NVRTC_RPATH}")
-+    target_link_libraries(caffe2_nvrtc ${CAFFE2_NVRTC_LIBS} ${DELAY_LOAD_FLAGS})
-     target_include_directories(caffe2_nvrtc PRIVATE ${CUDA_INCLUDE_DIRS})
-+#    message(FATAL_ERROR "STOP HERE, we're debugging")
-     install(TARGETS caffe2_nvrtc DESTINATION "${TORCH_INSTALL_LIB_DIR}")
-     if(USE_NCCL AND BUILD_SPLIT_CUDA)
-       list(APPEND Caffe2_GPU_SRCS_CPP
-diff -Nru pytorch.orig/test/cpp/api/CMakeLists.txt pytorch/test/cpp/api/CMakeLists.txt
---- pytorch.orig/test/cpp/api/CMakeLists.txt	2021-11-17 11:46:02.991350652 +0100
-+++ pytorch/test/cpp/api/CMakeLists.txt	2021-11-18 19:06:41.207423777 +0100
-@@ -61,6 +61,22 @@
-     ${CUDA_CUDA_LIB}
-     ${TORCH_CUDA_LIBRARIES})
- 
-+  # Make sure the CUDA stubs folder doesn't end up in the RPATH of test_api:
-+  set(TEST_API_LIBS ${CUDA_LIBRARIES} ${CUDA_NVRTC_LIB} ${CUDA_CUDA_LIB} ${TORCH_CUDA_LIBRARIES})
-+  foreach(LIB IN LISTS TEST_API_LIBS)
-+    message("LIB: ${LIB}")
-+    if(LIB MATCHES "stubs")
-+      message("Filtering ${LIB} from being set in caffe2_nvrtc's RPATH, because it appears to point to the CUDA stubs directory, which should not be RPATHed.")
-+    else()
-+      cmake_path(GET LIB PARENT_PATH LIB_PATH)
-+      message("LIBPATH: ${LIB_PATH}")
-+      list(APPEND TEST_API_RPATH ${LIB_PATH})
-+    endif()
-+  endforeach()
-+  message("TEST_API_RPATH: ${TEST_API_RPATH}")
-+  set_target_properties(test_api PROPERTIES INSTALL_RPATH_USE_LINK_PATH FALSE)
-+  set_target_properties(test_api PROPERTIES INSTALL_RPATH "${TEST_API_RPATH}")
-+
-   target_compile_definitions(test_api PRIVATE "USE_CUDA")
- endif()
- 
-diff -Nru pytorch.orig/test/cpp/dist_autograd/CMakeLists.txt pytorch/test/cpp/dist_autograd/CMakeLists.txt
---- pytorch.orig/test/cpp/dist_autograd/CMakeLists.txt	2021-11-17 11:46:02.993350674 +0100
-+++ pytorch/test/cpp/dist_autograd/CMakeLists.txt	2021-11-18 19:06:18.389174421 +0100
-@@ -16,6 +16,22 @@
-       ${CUDA_CUDA_LIB}
-       ${TORCH_CUDA_LIBRARIES})
- 
-+    # Make sure the CUDA stubs folder doesn't end up in the RPATH of test_dist_autograd:
-+    set(DIST_AUTOGRAD_LIBS ${CUDA_LIBRARIES} ${CUDA_NVRTC_LIB} ${CUDA_CUDA_LIB} ${TORCH_CUDA_LIBRARIES})
-+    foreach(LIB IN LISTS DIST_AUTOGRAD_LIBS)
-+      message("LIB: ${LIB}")
-+      if(LIB MATCHES "stubs")
-+        message("Filtering ${LIB} from being set in caffe2_nvrtc's RPATH, because it appears to point to the CUDA stubs directory, which should not be RPATHed.")
-+      else()
-+        cmake_path(GET LIB PARENT_PATH LIB_PATH)
-+        message("LIBPATH: ${LIB_PATH}")
-+        list(APPEND DIST_AUTOGRAD_RPATH ${LIB_PATH})
-+      endif()
-+    endforeach()
-+    message("DIST_AUTOGRAD_RPATH: ${DIST_AUTOGRAD_RPATH}")
-+    set_target_properties(test_dist_autograd PROPERTIES INSTALL_RPATH_USE_LINK_PATH FALSE)
-+    set_target_properties(test_dist_autograd PROPERTIES INSTALL_RPATH "${DIST_AUTOGRAD_RPATH}")
-+
-     target_compile_definitions(test_dist_autograd PRIVATE "USE_CUDA")
-   endif()
- 
-diff -Nru pytorch.orig/test/cpp/jit/CMakeLists.txt pytorch/test/cpp/jit/CMakeLists.txt
---- pytorch.orig/test/cpp/jit/CMakeLists.txt	2021-11-17 11:46:02.989350630 +0100
-+++ pytorch/test/cpp/jit/CMakeLists.txt	2021-11-18 19:05:41.396770168 +0100
-@@ -94,6 +94,7 @@
-   list(APPEND JIT_TEST_DEPENDENCIES onnx_library)
- endif(MSVC)
- 
-+
- target_link_libraries(test_jit PRIVATE ${JIT_TEST_DEPENDENCIES})
- target_include_directories(test_jit PRIVATE ${ATen_CPU_INCLUDE})
- 
-@@ -109,6 +110,22 @@
-     ${CUDA_CUDA_LIB}
-     ${TORCH_CUDA_LIBRARIES})
- 
-+  # Make sure the CUDA stubs folder doesn't end up in the RPATH of test_jit:
-+  set(TEST_JIT_LIBS ${CUDA_LIBRARIES} ${CUDA_NVRTC_LIB} ${CUDA_CUDA_LIB} ${TORCH_CUDA_LIBRARIES})
-+  foreach(LIB IN LISTS TEST_JIT_LIBS)
-+    message("LIB: ${LIB}")
-+    if(LIB MATCHES "stubs")
-+      message("Filtering ${LIB} from being set in test_jit's RPATH, because it appears to point to the CUDA stubs directory, which should not be RPATHed.")
-+    else()
-+      cmake_path(GET LIB PARENT_PATH LIB_PATH)
-+      message("LIBPATH: ${LIB_PATH}")
-+      list(APPEND TEST_JIT_RPATH ${LIB_PATH})
-+    endif()
-+  endforeach()
-+  message("TEST_JIT_RPATH: ${TEST_JIT_RPATH}")
-+  set_target_properties(test_jit PROPERTIES INSTALL_RPATH_USE_LINK_PATH FALSE)
-+  set_target_properties(test_jit PROPERTIES INSTALL_RPATH "${TEST_JIT_RPATH}")
-+
-   target_compile_definitions(test_jit PRIVATE USE_CUDA)
- elseif(USE_ROCM)
-   target_link_libraries(test_jit PRIVATE
-diff -Nru pytorch.orig/test/cpp/rpc/CMakeLists.txt pytorch/test/cpp/rpc/CMakeLists.txt
---- pytorch.orig/test/cpp/rpc/CMakeLists.txt	2021-11-17 11:46:02.991350652 +0100
-+++ pytorch/test/cpp/rpc/CMakeLists.txt	2021-11-18 19:06:30.502306793 +0100
-@@ -39,6 +39,22 @@
-     ${CUDA_CUDA_LIB}
-     ${TORCH_CUDA_LIBRARIES})
- 
-+  # Make sure the CUDA stubs folder doesn't end up in the RPATH of test_cpp_rpc:
-+  set(CPP_RPC_LIBS ${CUDA_LIBRARIES} ${CUDA_NVRTC_LIB} ${CUDA_CUDA_LIB} ${TORCH_CUDA_LIBRARIES})
-+  foreach(LIB IN LISTS CPP_RPC_LIBS)
-+    message("LIB: ${LIB}")
-+    if(LIB MATCHES "stubs")
-+      message("Filtering ${LIB} from being set in caffe2_nvrtc's RPATH, because it appears to point to the CUDA stubs directory, which should not be RPATHed.")
-+    else()
-+      cmake_path(GET LIB PARENT_PATH LIB_PATH)
-+      message("LIBPATH: ${LIB_PATH}")
-+      list(APPEND CPP_RPC_RPATH ${LIB_PATH})
-+    endif()
-+  endforeach()
-+  message("CPP_RPC_RPATH: ${CPP_RPC_RPATH}")
-+  set_target_properties(test_cpp_rpc PROPERTIES INSTALL_RPATH_USE_LINK_PATH FALSE)
-+  set_target_properties(test_cpp_rpc PROPERTIES INSTALL_RPATH "${CPP_RPC_RPATH}")
-+
-   target_compile_definitions(test_cpp_rpc PRIVATE "USE_CUDA")
- endif()
- 
-diff -Nru pytorch.orig/test/cpp/tensorexpr/CMakeLists.txt pytorch/test/cpp/tensorexpr/CMakeLists.txt
---- pytorch.orig/test/cpp/tensorexpr/CMakeLists.txt	2021-11-17 11:46:02.993350674 +0100
-+++ pytorch/test/cpp/tensorexpr/CMakeLists.txt	2021-11-18 19:06:00.988984273 +0100
-@@ -62,6 +62,24 @@
-     ${CUDA_CUDA_LIB}
-     ${TORCH_CUDA_LIBRARIES})
-   target_compile_definitions(tutorial_tensorexpr PRIVATE USE_CUDA)
-+
-+  # Make sure the CUDA stubs folder doesn't end up in the RPATH of tutorial_tensorexpr:
-+  set(CUDA_LINK_LIBS ${CUDA_LIBRARIES} ${CUDA_NVRTC_LIB} ${CUDA_CUDA_LIB} ${TORCH_CUDA_LIBRARIES})
-+  foreach(LIB IN LISTS CUDA_LINK_LIBS)
-+    message("LIB: ${LIB}")
-+    if(LIB MATCHES "stubs")
-+      message("Filtering ${LIB} from being set in test_tensorexpr and tutorial_tensorexpr RPATH, because it appears to point to the CUDA stubs directory, which should not be RPATHed.")
-+    else()
-+      cmake_path(GET LIB PARENT_PATH LIB_PATH)
-+      message("LIBPATH: ${LIB_PATH}")
-+      list(APPEND TENSOREXPR_RPATH ${LIB_PATH})
-+    endif()
-+  endforeach()
-+  message("TENSOREXPR_RPATH: ${TENSOREXPR_RPATH}")
-+  set_target_properties(test_tensorexpr PROPERTIES INSTALL_RPATH_USE_LINK_PATH FALSE)
-+  set_target_properties(test_tensorexpr PROPERTIES INSTALL_RPATH "${TENSOREXPR_RPATH}")
-+  set_target_properties(tutorial_tensorexpr PROPERTIES INSTALL_RPATH_USE_LINK_PATH FALSE)
-+  set_target_properties(tutorial_tensorexpr PROPERTIES INSTALL_RPATH "${TENSOREXPR_RPATH}")
- elseif(USE_ROCM)
-   target_link_libraries(test_tensorexpr PRIVATE
-     ${ROCM_HIPRTC_LIB}
diff --git a/Golden_Repo/p/PyTorch/PyTorch-1.11-gcccoremkl-11.2.0-2021.4.0-CUDA-11.5.eb b/Golden_Repo/p/PyTorch/PyTorch-1.11-gcccoremkl-11.2.0-2021.4.0-CUDA-11.5.eb
deleted file mode 100644
index 87a033026..000000000
--- a/Golden_Repo/p/PyTorch/PyTorch-1.11-gcccoremkl-11.2.0-2021.4.0-CUDA-11.5.eb
+++ /dev/null
@@ -1,201 +0,0 @@
-name = 'PyTorch'
-version = '1.11'
-versionsuffix = '-CUDA-%(cudaver)s'
-
-homepage = 'https://pytorch.org/'
-description = """Tensors and Dynamic neural networks in Python with strong GPU acceleration.
-PyTorch is a deep learning framework that puts Python first."""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'openmp': True}
-# toolchainopts = {'cstd': 'c++11'}
-
-sources = [{
-    'filename': '%(name)s-%(version)s.tar.gz',
-    'git_config': {
-        'url': 'https://github.com/pytorch',
-        'repo_name': 'pytorch',
-        'tag': 'v1.11.0',
-        'recursive': True,
-    },
-}]
-patches = [
-    'PyTorch-1.7.0_avoid-nan-in-test-torch.patch',
-    'PyTorch-1.7.0_disable-dev-shm-test.patch',
-    # 'PyTorch-1.7.1_correctly-pass-jit_opt_level.patch',
-    'PyTorch-1.8.1_dont-use-gpu-ccc-in-test.patch',
-    # 'PyTorch-1.8.1_increase-distributed-test-timeout.patch',
-    'PyTorch-1.9.0_limit-world-size-for-zero-redundancy-opt-test.patch',
-    'PyTorch-1.10.0_fix-test-dataloader-fixed-affinity.patch',
-    # 'PyTorch-1.10.0_fix-alias-violation-in-bitwise-ops.patch',
-    # 'PyTorch-1.10.0_fix-faulty-asserts-and-skip-test.patch',
-    # 'PyTorch-1.10.0_fix-test-cond-cpu.patch',
-    # 'PyTorch-1.10.0_fix-vnni-detection.patch',
-    # 'PyTorch-1.10.0_increase_zero_optimizer_test_tolerance.patch',
-    # 'PyTorch-1.10.0_skip_failing_ops_tests.patch',
-    # 'PyTorch-1.10.0_skip_nan_tests_openblas.patch',
-    'PyTorch-1.10.0_skip_cmake_rpath.patch',
-    'PyTorch-1.11.0_fix_sharded_imports.patch',
-    # 'PyTorch-1.10.0_fix-gcc11-ideep.patch',
-    # 'PyTorch-1.10.0_fix_gcc11_nullpointer.patch',
-    # 'cub-lint.yaml.patch',
-    # 'cub-cub.cuh.patch',
-    # ('cub-cub-definitions.patch', 1),
-    # 'cub-context_gpu.patch',
-    # 'cub-accuracy_op.patch',
-    # 'cub-affine-channel_op.patch',
-    # 'cub-arg_ops.patch',
-    # 'cub-batch_moments_op.patch',
-    # 'cub-batch_sparse_to_dense_op.patch',
-    # 'cub-boolean_mask_ops.patch',
-    # 'cub-cross_entropy.patch',
-    # 'cub-distance_op.patch',
-    # 'cub-elementwise_div_op.patch',
-    # 'cub-elementwise_linear_op.patch',
-    # 'cub-elementwise_mul_op.patch',
-    # 'cub-elementwise_ops.patch',
-    # 'cub-find_op.patch',
-    # 'cub-generate_proposals_op.patch',
-    # 'cub-normalize_ops.patch',
-    # 'cub-one_hot_ops.patch',
-    # 'cub-pack_segments.patch',
-    # 'cub-prelu_op.patch',
-    # 'cub-reduce_front_back_max_ops.patch',
-    # 'cub-reduce_front_back_sum_mean_ops.patch',
-    # 'cub-reduction_ops.patch',
-    # 'cub-rmac_regions_op.patch',
-    # 'cub-segment_reduction_op_gpu.patch',
-    # 'cub-sequence_ops.patch',
-    # 'cub-softmax_ops.patch',
-    # 'cub-spatial_batch_norm_op_impl.patch',
-    # 'cub-adagrad_fused_op_gpu.patch',
-    # 'cub-adagrad_op_gpu.patch',
-    # 'cub-adam_op_gpu.patch',
-    # ('cub-cub_namespace.patch', 1),
-    # 'cub-reduce.patch',
-    # 'cub-math-gpu.patch',
-    # 'cub-CMake-Dependencies.patch',
-    'PyTorch-1.11.0_fix_skip_jit_cuda_fuser.patch',
-    'PyTorch-1.11.0_increase-distributed-test-timeout.patch',
-    'PyTorch-1.11.0_skip_failing_ops_tests.patch',
-    'PyTorch-1.11.0_hostname_endpoints_mismatch.patch',
-]
-checksums = [
-    '6630eb2a2552a833f53fc56c975f40b950ef5b82c2e53f672bb1aa29cb41799e',  # PyTorch-1.11.tar.gz
-    'b899aa94d9e60f11ee75a706563312ccefa9cf432756c470caa8e623991c8f18',  # PyTorch-1.7.0_avoid-nan-in-test-torch.patch
-    '622cb1eaeadc06e13128a862d9946bcc1f1edd3d02b259c56a9aecc4d5406b8a',  # PyTorch-1.7.0_disable-dev-shm-test.patch
-    '89ac7a8e9e7df2e64cf8404fe3a279f5e9b759fee41c9de3aaff9c22f385c2c6',  # PyTorch-1.8.1_dont-use-gpu-ccc-in-test.patch
-    # PyTorch-1.9.0_limit-world-size-for-zero-redundancy-opt-test.patch
-    'ff573660913ce055e24cfd194ce747ba5685091c631cfd443eae2a99d56b57ea',
-    # PyTorch-1.10.0_fix-test-dataloader-fixed-affinity.patch
-    '313dca681f45ce3bc7c4557fdcdcbe0b77216d2c708fa30a2ec0e22c44876707',
-    'ac05943bb205623f91ef140aa00869efc5fe844184bd666bebf5405808610448',  # PyTorch-1.10.0_skip_cmake_rpath.patch
-    '2e3e2093fce314a9ee9fb73ef44477f4c2cedfcf27570f585c6917ae434311f2',  # PyTorch-1.11.0_fix_sharded_imports.patch
-    '91e67cd498918baafe3fd58e0ba04b610a3561d1d97cec2c934bfd48fffd8324',  # PyTorch-1.11.0_fix_skip_jit_cuda_fuser.patch
-    # PyTorch-1.11.0_increase-distributed-test-timeout.patch
-    'bb9709590ea8bd329360ca345c70afb8ff028be80e112af7ee00abba58482316',
-    '88a312d4752fe72171a2292d0aa5438ada42b124be113015bb4969c83c723766',  # PyTorch-1.11.0_skip_failing_ops_tests.patch
-    # PyTorch-1.11.0_hostname_endpoints_mismatch.patch
-    '05e94fc1af406921f020a6af908375beed2090ca864211b9f07e931c24a61975',
-]
-
-osdependencies = [OS_PKG_IBVERBS_DEV]
-
-builddependencies = [
-    ('CMake', '3.21.1'),
-    ('hypothesis', '6.14.6'),
-]
-
-dependencies = [
-    ('CUDA', '11.5', '', True),
-    ('Ninja', '1.10.2'),  # Required for JIT compilation of C++ extensions
-    ('Python', '3.9.6'),
-    ('protobuf', '3.17.3'),
-    ('protobuf-python', '3.17.3'),
-    ('pybind11', '2.7.1'),
-    ('SciPy-bundle', '2021.10'),
-    ('typing-extensions', '3.10.0.0'),
-    ('PyYAML', '5.4.1'),
-    ('MPFR', '4.1.0'),
-    ('GMP', '6.2.1'),
-    ('numactl', '2.0.14', '', SYSTEM),
-    ('FFmpeg', '4.4.1'),
-    ('Pillow-SIMD', '9.0.1'),
-    ('cuDNN', '8.3.1.22', '-CUDA-%(cudaver)s', True),
-    ('magma', '2.6.1', '-CUDA-%(cudaver)s'),
-    ('NCCL', '2.12.7-1', '-CUDA-%(cudaver)s'),
-    ('expecttest', '0.1.3'),
-]
-
-custom_opts = ["USE_CUPTI_SO=1"]
-configopts = 'MKL_THREADING_LAYER=sequential CFLAGS="$CFLAGS -fopenmp" CXXFLAGS="$CXXFLAGS -fopenmp" LDFLAGS=-fopenmp'
-
-excluded_tests = {
-    '': [
-        # Bad tests: https://github.com/pytorch/pytorch/issues/60260
-        'distributed/elastic/utils/distributed_test',
-        'distributed/elastic/multiprocessing/api_test',
-        # These tests fail on A10s at the very least, they time out forever no matter how long the timeout is.
-        # Possibly related to NCCL 2.8.3: https://docs.nvidia.com/deeplearning/nccl/release-notes/rel_2-8-3.html
-        # 'distributed/test_distributed_fork',
-        'distributed/test_distributed_spawn',
-        # Fails on A10s: https://github.com/pytorch/pytorch/issues/63079
-        'test_optim',
-        'test_jit',  # fails on all systems
-        'test_jit_cuda_fuser',  # fails on all systems
-        'test_jit_legacy',  # fails on all systems
-        'test_jit_profiling',  # fails on all systems
-        'test_jit_fuser_te',  # fails on booster and dc
-        # 'test_xnnpack_integration',
-        'distributed/_shard/sharded_optim/test_sharded_optim',  # fails on booster and dc
-        'distributed/_shard/sharded_tensor/ops/test_linear',  # fails on booster and dc
-        'distributed/_shard/sharded_tensor/test_megatron_prototype',  # fails on booster and dc
-        'distributions/test_distributions',  # fails on all systems
-        'test_cpp_extensions_jit',  # fails on al systems
-        'test_ops',  # fails on booster, dc, jusuf (works on hdfml?)
-        'distributed/fsdp/test_fsdp_memory',  # fails on jusuf and hdfml
-        'distributed/fsdp/test_fsdp_overlap',  # fails on jusuf and hdfml
-
-        # Those tests fail when not running from a container or without latest patches
-        # 'distributed/rpc/test_tensorpipe_agent',
-        # 'test_autograd',  # fails on jureca dc and deep
-        # 'test_cuda',  # fails on jureca dc
-        # 'test_multiprocessing',  # fails on jureca dc
-        # 'test_nn',  # fails on jureca dc
-        # 'test_profiler',  # fails on jureca dc
-        # 'test_quantization',  # fails on jureca dc
-        'distributed/_shard/sharded_tensor/test_sharded_tensor',  # fails on juwels cluster container and deep
-        # 'distributed/algorithms/test_join',  # fails on deep and jureca dc
-        # 'distributed/fsdp/test_fsdp_checkpoint',  # fails on deep and jureca dc
-        # 'distributed/fsdp/test_fsdp_core',  # fails on deep and jureca dc
-        # 'distributed/fsdp/test_fsdp_freezing_weights',  # fails on deep and jureca dc
-        # 'distributed/fsdp/test_fsdp_memory',  # fails on deep
-        # 'distributed/fsdp/test_fsdp_multiple_forward',  # fails on deep and jureca dc
-        # 'distributed/fsdp/test_fsdp_multiple_wrapping',  # fails on deep and jureca dc
-        # 'distributed/fsdp/test_fsdp_overlap',  # fails on deep
-        # 'distributed/fsdp/test_fsdp_pure_fp16',  # fails on deep and jureca dc
-        # 'distributed/fsdp/test_fsdp_uneven',  # fails on deep and jureca dc
-        # 'distributed/fsdp/test_wrap',  # fails on deep and jureca dc
-        # 'distributed/optim/test_zero_redundancy_optimizer',  # fails on deep and jureca dc
-        # 'distributed/rpc/cuda/test_tensorpipe_agent',  # fails on deep
-        # 'distributed/rpc/test_faulty_agent',  # fails on deep
-        # 'distributed/test_c10d_gloo',  # fails on deep
-        # 'test_model_dump',  # fails on deep
-        # 'distributed/test_c10d_nccl',  # fails on jureca dc
-        # 'distributed/test_c10d_spawn_nccl',  # fails on jureca dc
-        # 'distributed/test_data_parallel',  # fails on jureca dc
-    ]
-}
-
-runtest = 'cd test && PYTHONUNBUFFERED=1 %(python)s run_test.py --continue-through-error  --verbose %(excluded_tests)s'
-
-# The readelf sanity check can be taken out once the TestRPATH test from https://github.com/pytorch/pytorch/pull/68912
-# is accepted, since it is then checked as part of the PyTorch test suite
-local_libcaffe2 = "$EBROOTPYTORCH/lib/python%%(pyshortver)s/site-packages/torch/lib/libcaffe2_nvrtc.%s" % SHLIB_EXT
-sanity_check_commands = [
-    "python -c 'import torch'",
-    "readelf -d %s | egrep 'RPATH|RUNPATH' | grep -v stubs" % local_libcaffe2,
-]
-tests = ['PyTorch-check-cpp-extension.py']
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/p/PyTorch/PyTorch-1.11.0_fix_sharded_imports.patch b/Golden_Repo/p/PyTorch/PyTorch-1.11.0_fix_sharded_imports.patch
deleted file mode 100644
index b1e854c38..000000000
--- a/Golden_Repo/p/PyTorch/PyTorch-1.11.0_fix_sharded_imports.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-# Fixes a "NameError: name 'sharded_tensor' is not defined" error 
-# for the test_named_params_with_sharded_tensor test
-# See https://github.com/pytorch/pytorch/pull/73309
-From 012d490ed76d8af8538d310a508b0e09a91b7632 Mon Sep 17 00:00:00 2001
-From: wanchaol <wanchaol@devvm3348.frc0.facebook.com>
-Date: Wed, 23 Feb 2022 12:10:39 -0800
-Subject: [PATCH] [shard] fix some imports in tests
-
-This fix some imports in sharded optimizer tests
-
-Differential Revision: [D34427252](https://our.internmc.facebook.com/intern/diff/D34427252/)
-
-[ghstack-poisoned]
----
- .../_shard/sharded_optim/test_sharded_optim.py           | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/test/distributed/_shard/sharded_optim/test_sharded_optim.py b/test/distributed/_shard/sharded_optim/test_sharded_optim.py
-index 085c928985eb..d3f1468aea3c 100644
---- a/test/distributed/_shard/sharded_optim/test_sharded_optim.py
-+++ b/test/distributed/_shard/sharded_optim/test_sharded_optim.py
-@@ -2,7 +2,10 @@
- 
- import torch
- import torch.optim as optim
--import torch.distributed._shard.sharded_tensor
-+from torch.distributed._shard import (
-+    sharded_tensor,
-+    shard_parameter
-+)
- 
- from copy import deepcopy
- from torch.distributed._shard.sharding_spec import (
-@@ -77,8 +80,8 @@ def shard_parameter(self):
-             ],
-         )
- 
--        sharded_tensor.shard_parameter(self.linear1, "weight", rowwise_sharding_spec)
--        sharded_tensor.shard_parameter(self.linear2, "weight", colwise_sharding_spec)
-+        shard_parameter(self.linear1, "weight", rowwise_sharding_spec)
-+        shard_parameter(self.linear2, "weight", colwise_sharding_spec)
- 
-     def forward(self, inp):
-         return self.linear2(self.gelu(self.linear1(inp)))
\ No newline at end of file
diff --git a/Golden_Repo/p/PyTorch/PyTorch-1.11.0_fix_skip_jit_cuda_fuser.patch b/Golden_Repo/p/PyTorch/PyTorch-1.11.0_fix_skip_jit_cuda_fuser.patch
deleted file mode 100644
index 9c4897f81..000000000
--- a/Golden_Repo/p/PyTorch/PyTorch-1.11.0_fix_skip_jit_cuda_fuser.patch
+++ /dev/null
@@ -1,428 +0,0 @@
-diff -Nru pytorch-1.11.0-rc3.orig/test/test_jit_cuda_fuser.py pytorch-1.11.0-rc3/test/test_jit_cuda_fuser.py
---- pytorch-1.11.0-rc3.orig/test/test_jit_cuda_fuser.py	2022-02-24 18:06:55.180421593 +0100
-+++ pytorch-1.11.0-rc3/test/test_jit_cuda_fuser.py	2022-02-25 13:30:47.112845480 +0100
-@@ -57,18 +57,25 @@
-         torch._C._jit_set_nvfuser_horizontal_mode(old_value)
- 
- def is_pre_volta():
--    prop = torch.cuda.get_device_properties(torch.cuda.current_device())
--    return prop.major < 7
--
--TEST_BF16 = torch.cuda.is_bf16_supported()
-+    if RUN_CUDA:
-+        prop = torch.cuda.get_device_properties(torch.cuda.current_device())
-+        return prop.major < 7
-+    else:
-+        return True
-+
-+if RUN_CUDA:
-+    TEST_BF16 = torch.cuda.is_bf16_supported()
-+else:
-+    TEST_BF16=False
- 
- class TestCudaFuser(JitTestCase):
- 
--    special_values = torch.tensor(
--        [float("-inf"), -10, -math.pi,
--            -1, -0.5, 0, 1, 0.5,
--            math.pi, 10, float("inf"),
--            float("nan")], dtype=torch.float, device='cuda')
-+    if RUN_CUDA:
-+        special_values = torch.tensor(
-+            [float("-inf"), -10, -math.pi,
-+                -1, -0.5, 0, 1, 0.5,
-+                math.pi, 10, float("inf"),
-+                float("nan")], dtype=torch.float, device='cuda')
- 
-     int_types = [
-         torch.int8,
-@@ -253,8 +260,8 @@
-         self.assertEqual(o, jit_o)
-         self.assertGraphContains(t_jit.graph_for(x, y, z, q), FUSION_GUARD)
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     def test_reduction_dtypes_axis(self):
-@@ -1120,8 +1127,8 @@
-         self.assertTrue(self._compare("comparing output failed", o, jit_o, 1e-4))
-         self.assertGraphContains(t_jit.graph_for(x, y), FUSION_GUARD)
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     def test_reduction(self):
-@@ -1170,8 +1177,8 @@
-         FileCheck().check(FUSION_GUARD).run(g)
-         FileCheck().check(FUSION_GUARD).run(v2.graph)
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     def test_layer_norm_autodiff(self):
-@@ -1212,8 +1219,8 @@
-                 args.append(torch.randn(shapes, dtype=torch.float32, device="cuda").requires_grad_())
-             self._layer_norm_autodiff_helper(m, grad, shapes, args)
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     def test_layer_norm_parser(self):
-@@ -1273,8 +1280,8 @@
-         self.assertGraphContains(t_jit.graph_for(x), FUSION_GUARD)
- 
-     @unittest.skipIf(True, "codegen failure awaiting fix")
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     def test_native_layer_norm(self):
-@@ -1288,8 +1295,8 @@
-                     self._native_layer_norm_helper(input_shape, norm_shape, torch.float32, "cuda", 1e-4, affine)
- 
-     @unittest.skipIf(True, "codegen failure awaiting fix")
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     def test_native_layer_norm_half(self):
-@@ -1301,8 +1308,8 @@
-                 norm_shape = [input_shape[idx] for idx in range(dims - offset, dims)]
-                 self._native_layer_norm_helper(input_shape, norm_shape, torch.float16, "cuda", 5e-3)
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     @unittest.skipIf(not TEST_BF16, "device does not support BFloat16")
-@@ -1362,8 +1369,8 @@
-         self.assertTrue(self._compare("comparing running_var failed", eager_running_var, jit_running_var, error))
-         self.assertGraphContains(t_jit.graph_for(x, running_mean, running_var), FUSION_GUARD)
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     def test_norm_channels_last(self):
-@@ -1374,8 +1381,8 @@
-                 for mf in [torch.channels_last, torch.contiguous_format]:
-                     self._norm_helper(size, torch.float32, "cuda", 1e-4, is_batch_norm_else_instance_norm, memory_format=mf)
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     def test_norm(self):
-@@ -1391,8 +1398,8 @@
-                         x[1] = C
-                         self._norm_helper(x, torch.float32, "cuda", 1e-4, is_batch_norm_else_instance_norm)
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     def test_norm_large(self):
-@@ -1407,8 +1414,8 @@
-                     x[1] = C
-                     self._norm_helper(x, torch.float32, "cuda", 1e-4, is_batch_norm_else_instance_norm)
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     def test_norm_half(self):
-@@ -1424,8 +1431,8 @@
-                         x[1] = C
-                         self._norm_helper(x, torch.float16, "cuda", 5e-3, is_batch_norm_else_instance_norm)
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     @unittest.skipIf(not TEST_BF16, "device does not support BFloat16")
-@@ -1469,8 +1476,8 @@
-         self.assertTrue(self._compare("comparing output failed", o, jit_o, error))
-         self.assertGraphContains(t_jit.graph_for(x, y), FUSION_GUARD)
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     def test_softmax_dtype(self):
-@@ -1511,8 +1518,8 @@
-         )[0].graph
-         FileCheck().check(FUSION_GUARD).run(bwd_graph)
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     def test__softmax_function(self):
-@@ -1535,8 +1542,8 @@
-         self.assertTrue(self._compare("comparing output failed", o, jit_o, 1e-3))
-         self.assertGraphContainsExactly(t_jit.graph_for(x, y), FUSION_GUARD, 1, consider_subgraphs=True)
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     def test__softmax_function_half_to_float(self):
-@@ -1559,8 +1566,8 @@
-         self.assertTrue(self._compare("comparing output failed", o, jit_o, 1e-3))
-         self.assertGraphContainsExactly(t_jit.graph_for(x, y), FUSION_GUARD, 1, consider_subgraphs=True)
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     def test_softmax(self):
-@@ -1575,8 +1582,8 @@
-                 x[reduction_dim] = reduction_size
-                 self._softmax_helper(x, reduction_dim, torch.float32, "cuda", 1e-4)
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     def test_softmax_half(self):
-@@ -1591,8 +1598,8 @@
-                 x[reduction_dim] = reduction_size
-                 self._softmax_helper(x, reduction_dim, torch.float16, "cuda", 5e-3)
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     @unittest.skipIf(not TEST_BF16, "device does not support BFloat16")
-@@ -1608,8 +1615,8 @@
-                 x[reduction_dim] = reduction_size
-                 self._softmax_helper(x, reduction_dim, torch.bfloat16, "cuda", 1e-1)
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     def test_reduction_permutation(self):
-@@ -1622,8 +1629,8 @@
-                     for perm1 in itertools.permutations(range(len(x))):
-                         self._reduction_helper(x, axes, torch.float32, "cuda", perm0, perm1)
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     def test_reduction_multiple_output(self):
-@@ -1767,8 +1774,8 @@
-         self.assertEqual(o, jit_o)
-         '''
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     def test_pw_single_reduction_partition(self):
-@@ -1792,8 +1799,8 @@
-         self.assertEqual(o, jit_o)
-         self.assertGraphContains(t_jit.graph_for(x, y, z), FUSION_GUARD)
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     def test_permutation_preservation(self):
-@@ -1830,8 +1837,8 @@
-         self.assertGraphContains(t_jit.graph_for(x), FUSION_GUARD)
-         self.assertTrue(jit_o.is_contiguous(memory_format=torch.channels_last))
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     def test_normalization_partition(self):
-@@ -1858,8 +1865,8 @@
-         self.assertEqual(o, jit_o)
-         self.assertGraphContains(t_jit.graph_for(x, y, z, r_m, r_v), FUSION_GUARD)
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     def test_sum_to_one(self):
-@@ -1879,8 +1886,8 @@
-         self.assertEqual(o, jit_o)
-         self.assertGraphContains(t_jit.graph_for(x), FUSION_GUARD)
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     def test_single_reduction_broadcast(self):
-@@ -1903,8 +1910,8 @@
-         self.assertEqual(o, jit_o)
-         self.assertGraphContains(t_jit.graph_for(x, y, z), FUSION_GUARD)
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     def test_trivial_reduction(self):
-@@ -1940,8 +1947,8 @@
-         repro_jit = torch.jit.script(repro)
-         self._run_helper(repro_jit, repro, x, 0.6)
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     def test_reduction_sizes_op(self):
-@@ -1964,8 +1971,8 @@
-         # have been optimized away
-         self.assertGraphContainsExactly(t_jit.graph_for(x, y), FUSION_GUARD, 0)
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     def test_profile_ivalue(self):
-@@ -1987,8 +1994,8 @@
-         self.assertEqual(o, jit_o)
-         self.assertGraphContains(t_jit.graph_for(x, y, (0, 1), False), FUSION_GUARD)
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     def test_sum_to_size(self):
-@@ -2021,8 +2028,8 @@
-         self.assertEqual(o.dtype, jit_o.dtype)
-         self.assertEqual(o, jit_o)
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     def test_grad_sum_to_size(self):
-@@ -2145,8 +2152,8 @@
-             self.assertTrue((percent_zeros >= (prob - 0.01)) and (percent_zeros <= (prob + 0.01)))
-             self.assertGraphContainsExactly(t_jit.graph_for(x, prob, True), FUSION_GUARD, 1, consider_subgraphs=True)
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     def test_dropout_training_fusion(self):
-@@ -2294,8 +2301,8 @@
-             self.assertEqual(x.grad.dtype, x.dtype)
-             self.assertEqual(y.grad.dtype, y.dtype)
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     def test_autocast_1(self):
-@@ -2331,8 +2338,8 @@
-         self.assertEqual(x.grad.dtype, x.dtype)
-         self.assertEqual(y.grad.dtype, y.dtype)
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     def test_autocast_2(self):
-@@ -2367,8 +2374,8 @@
-         self.assertEqual(jit_o.dtype, torch.float)
-         self.assertEqual(x.grad.dtype, x.dtype)
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     @unittest.skipIf(not TEST_BF16, "device does not support BFloat16")
-@@ -2405,8 +2412,8 @@
-         self.assertEqual(x.grad.dtype, x.dtype)
-         self.assertEqual(y.grad.dtype, y.dtype)
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     @unittest.skipIf(not TEST_BF16, "device does not support BFloat16")
-@@ -2817,8 +2824,8 @@
-                                           ref_module.bn.running_var,
-                                           e0))
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     def test_batch_norm_half(self):
-@@ -2832,8 +2839,8 @@
-                 training, track_running_stats = training_and_track
-                 self._test_batch_norm_impl_index_helper(4, 8, 5, affine, track_running_stats, training, torch.half)
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     def test_batch_norm_impl_index_correctness(self):
-@@ -2947,8 +2954,8 @@
-         self.assertGraphContainsExactly(graph, FUSION_GROUP, 0)
-         self.assertGraphContains(graph, 'prim::add_optional', True)
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     def test_remove_output_used_only_in_dtype(self):
-@@ -2980,8 +2987,8 @@
-             graph = jitted.graph_for(x, y)
-             self.assertGraphContains(graph, FUSION_GROUP, True)
- 
--    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(not RUN_CUDA, "requires CUDA")
-+    @unittest.skipIf(is_pre_volta(), "reduction not supported in pre volta device")
-     @unittest.skipIf(GRAPH_EXECUTOR != ProfilingMode.PROFILING,
-                      "Requires fusion optimization pass to be effective")
-     def test_fix_shape_expression_bn(self):
\ No newline at end of file
diff --git a/Golden_Repo/p/PyTorch/PyTorch-1.11.0_hostname_endpoints_mismatch.patch b/Golden_Repo/p/PyTorch/PyTorch-1.11.0_hostname_endpoints_mismatch.patch
deleted file mode 100644
index 9f1a38d7f..000000000
--- a/Golden_Repo/p/PyTorch/PyTorch-1.11.0_hostname_endpoints_mismatch.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-From 73c4cfd820ed14736c034e77b6cbe33ddbb74110 Mon Sep 17 00:00:00 2001
-From: janEbert <janpublicebert@posteo.net>
-Date: Tue, 12 Jul 2022 10:58:18 +0200
-Subject: [PATCH 1/3] Check all NIC hostnames for master host matching
-
-Previously, these were not included, leading to timeouts as no process
-assumed the root role.
-
-Ref #73656, first error.
----
- torch/distributed/elastic/rendezvous/utils.py | 37 +++++++++++++++++++
- 1 file changed, 37 insertions(+)
-
-diff --git a/torch/distributed/elastic/rendezvous/utils.py b/torch/distributed/elastic/rendezvous/utils.py
-index 14158e8bc708..b838398549d1 100644
---- a/torch/distributed/elastic/rendezvous/utils.py
-+++ b/torch/distributed/elastic/rendezvous/utils.py
-@@ -4,10 +4,12 @@
- # This source code is licensed under the BSD-style license found in the
- # LICENSE file in the root directory of this source tree.
- 
-+import fcntl
- import ipaddress
- import random
- import re
- import socket
-+import struct
- import time
- import weakref
- from datetime import timedelta
-@@ -16,6 +18,37 @@
- 
- __all__ = ['parse_rendezvous_endpoint']
- 
-+
-+# From https://stackoverflow.com/a/27494105.
-+def nic_ip_address(nic_name):
-+    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-+    return socket.inet_ntoa(fcntl.ioctl(
-+        s.fileno(),
-+        0x8915,  # SIOCGIFADDR
-+        struct.pack('256s', nic_name[:15].encode("UTF-8"))
-+    )[20:24])
-+
-+
-+# Adapted from https://stackoverflow.com/a/27494105.
-+def nic_info():
-+    """Return a list of tuples containing each NIC's hostname and its IPv4."""
-+    nics = []
-+    try:
-+        if_nameindex = socket.if_nameindex()
-+    except OSError:
-+        return nics
-+
-+    for (_, nic_name) in if_nameindex:
-+        try:
-+            ip_addr = nic_ip_address(nic_name)
-+        except OSError:
-+            continue
-+
-+        hostname = socket.gethostbyaddr(ip_addr)[0]
-+        nics.append((hostname, ip_addr))
-+    return nics
-+
-+
- def _parse_rendezvous_config(config_str: str) -> Dict[str, str]:
-     """Extracts key-value pairs from a rendezvous configuration string.
- 
-@@ -143,6 +176,10 @@ def _matches_machine_hostname(host: str) -> bool:
-         if addr and addr_info[4][0] == str(addr):
-             return True
- 
-+    for (nic_host, nic_addr) in nic_info():
-+        if nic_host == host or addr and nic_addr == str(addr):
-+            return True
-+
-     return False
- 
- 
-
-From 47945806c1dd12fd1e5a8a4adcd88fbd5780f00a Mon Sep 17 00:00:00 2001
-From: janEbert <janpublicebert@posteo.net>
-Date: Tue, 12 Jul 2022 11:04:21 +0200
-Subject: [PATCH 2/3] Handle getting hostname of specified NIC
-
-`_get_fq_hostname` previously returned the fully qualified version of
-`socket.gethostname()`. This ignored the possibility of other NIC's
-hostnames being supplied as endpoints, leading to possible deadlocks.
-
-We now try to use more available information to get a matching hostname.
-This includes keeping the original `--rdzv_endpoint` as a spec variable.
-That way, we can refer back to it in order to have more options for
-getting the used NIC's hostname.
-
-Ref #73656, second error.
----
- torch/distributed/elastic/agent/server/api.py | 41 +++++++++++++++----
- torch/distributed/launcher/api.py             |  1 +
- 2 files changed, 35 insertions(+), 7 deletions(-)
-
-diff --git a/torch/distributed/elastic/agent/server/api.py b/torch/distributed/elastic/agent/server/api.py
-index 259632869d43..39ffedea89ba 100644
---- a/torch/distributed/elastic/agent/server/api.py
-+++ b/torch/distributed/elastic/agent/server/api.py
-@@ -8,6 +8,7 @@
- 
- import abc
- import functools
-+import ipaddress
- import json
- import os
- import signal
-@@ -60,6 +61,8 @@ class WorkerSpec:
-                      if not specified then will chose a random free port
-         master_addr: fixed master_addr to run the c10d store on rank 0
-                      if not specified then will chose hostname on agent rank 0
-+        endpoint: original endpoint that is discarded when the static
-+                  rendezvous backend is specified
-         redirects: redirect std streams to a file,
-                    selectively redirect for a particular
-                    local rank by passing a map
-@@ -80,6 +83,7 @@ class WorkerSpec:
-     monitor_interval: float = 30.0
-     master_port: Optional[int] = None
-     master_addr: Optional[str] = None
-+    endpoint: str = ''
-     redirects: Union[Std, Dict[int, Std]] = Std.NONE
-     tee: Union[Std, Dict[int, Std]] = Std.NONE
- 
-@@ -381,8 +385,27 @@ def _get_socket_with_port() -> socket.socket:
-     raise RuntimeError("Failed to create a socket")
- 
- 
--def _get_fq_hostname() -> str:
--    return socket.getfqdn(socket.gethostname())
-+def _get_fq_hostname(master_addr: Optional[str], endpoint: str) -> str:
-+    if master_addr:
-+        return master_addr
-+
-+    # `master_addr` is None when we don't have the "static" rendezvous backend.
-+    # `endpoint` may not be given (i.e. it is an empty string); then
-+    # we have to fall back to `socket.gethostname`.
-+    if not endpoint:
-+        return socket.getfqdn(socket.gethostname())
-+
-+    host = rdzv.utils.parse_rendezvous_endpoint(endpoint, default_port=-1)[0]
-+    try:
-+        ipaddress.ip_address(host)
-+        is_ip = True
-+    except ValueError:
-+        is_ip = False
-+
-+    if is_ip:
-+        return socket.gethostbyaddr(host)[0]
-+    else:
-+        return socket.getfqdn(host)
- 
- 
- class ElasticAgent(abc.ABC):
-@@ -504,15 +527,17 @@ def _shutdown(self, death_sig: signal.Signals = signal.SIGTERM) -> None:
- 
-     @staticmethod
-     def _set_master_addr_port(
--        store: Store, master_addr: Optional[str], master_port: Optional[int]
-+            store: Store,
-+            master_addr: Optional[str],
-+            master_port: Optional[int],
-+            endpoint: str,
-     ):
-         if master_port is None:
-             sock = _get_socket_with_port()
-             with closing(sock):
-                 master_port = sock.getsockname()[1]
- 
--        if master_addr is None:
--            master_addr = _get_fq_hostname()
-+        master_addr = _get_fq_hostname(master_addr, endpoint)
- 
-         store.set("MASTER_ADDR", master_addr.encode(encoding="UTF-8"))
-         store.set("MASTER_PORT", str(master_port).encode(encoding="UTF-8"))
-@@ -545,7 +570,9 @@ def _rendezvous(self, worker_group: WorkerGroup) -> None:
-         worker_group.group_world_size = group_world_size
- 
-         if group_rank == 0:
--            self._set_master_addr_port(store, spec.master_addr, spec.master_port)
-+            self._set_master_addr_port(
-+                store, spec.master_addr, spec.master_port, spec.endpoint
-+            )
-         master_addr, master_port = self._get_master_addr_port(store)
-         restart_count = spec.max_restarts - self._remaining_restarts
- 
-@@ -781,7 +808,7 @@ def _construct_event(
-             "group_rank": wg.group_rank,
-             "worker_id": worker_id,
-             "role": spec.role,
--            "hostname": _get_fq_hostname(),
-+            "hostname": _get_fq_hostname(spec.master_addr, spec.endpoint),
-             "state": state,
-             "total_run_time": self._total_execution_time,
-             "rdzv_backend": spec.rdzv_handler.get_backend(),
-diff --git a/torch/distributed/launcher/api.py b/torch/distributed/launcher/api.py
-index b09a31250f2a..c042460a50a2 100644
---- a/torch/distributed/launcher/api.py
-+++ b/torch/distributed/launcher/api.py
-@@ -224,6 +224,7 @@ def launch_agent(
-         tee=config.tee,
-         master_addr=master_addr,
-         master_port=master_port,
-+        endpoint=rdzv_parameters.endpoint.strip(),
-     )
- 
-     agent = LocalElasticAgent(
-
-From f982f75fb111a91c2e4e32915cba68b8c5699bbb Mon Sep 17 00:00:00 2001
-From: janEbert <janpublicebert@posteo.net>
-Date: Tue, 19 Jul 2022 12:39:41 +0200
-Subject: [PATCH 3/3] Also check FQDN of host for machine match test
-
-"Host" refers to the host given via the `--rdzv_endpoint` argument.
-
-This catches cases where users specify a non-fully-qualified name.
----
- torch/distributed/elastic/rendezvous/utils.py | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/torch/distributed/elastic/rendezvous/utils.py b/torch/distributed/elastic/rendezvous/utils.py
-index b838398549d1..187e986f9ffa 100644
---- a/torch/distributed/elastic/rendezvous/utils.py
-+++ b/torch/distributed/elastic/rendezvous/utils.py
-@@ -164,12 +164,13 @@ def _matches_machine_hostname(host: str) -> bool:
-     if host == this_host:
-         return True
- 
-+    host_fqdn = socket.getfqdn(host)
-     addr_list = socket.getaddrinfo(
-         this_host, None, proto=socket.IPPROTO_TCP, flags=socket.AI_CANONNAME
-     )
-     for addr_info in addr_list:
-         # If we have an FQDN in the addr_info, compare it to `host`.
--        if addr_info[3] and addr_info[3] == host:
-+        if addr_info[3] and (addr_info[3] == host or addr_info[3] == host_fqdn):
-             return True
-         # Otherwise if `host` represents an IP address, compare it to our IP
-         # address.
-@@ -177,7 +178,10 @@ def _matches_machine_hostname(host: str) -> bool:
-             return True
- 
-     for (nic_host, nic_addr) in nic_info():
--        if nic_host == host or addr and nic_addr == str(addr):
-+        if (
-+                nic_host == host or nic_host == host_fqdn
-+                or addr and nic_addr == str(addr)
-+        ):
-             return True
- 
-     return False
\ No newline at end of file
diff --git a/Golden_Repo/p/PyTorch/PyTorch-1.11.0_increase-distributed-test-timeout.patch b/Golden_Repo/p/PyTorch/PyTorch-1.11.0_increase-distributed-test-timeout.patch
deleted file mode 100644
index 1c103091c..000000000
--- a/Golden_Repo/p/PyTorch/PyTorch-1.11.0_increase-distributed-test-timeout.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-It seems the timeout for the distributed tests is set to low and spurious failures can be seen
-Increase it by a factor of 6 similar to torch/testing/_internal/distributed/distributed_test.py
-
-Original patch by Alexander Grund (TU Dresden), updated by Caspar van Leeuwen (SURF)
-
-diff -Nru pytorch-1.11.0-rc3.orig/torch/testing/_internal/common_distributed.py pytorch-1.11.0-rc3/torch/testing/_internal/common_distributed.py
---- pytorch-1.11.0-rc3.orig/torch/testing/_internal/common_distributed.py	2022-02-24 18:07:16.414274654 +0100
-+++ pytorch-1.11.0-rc3/torch/testing/_internal/common_distributed.py	2022-02-24 18:08:31.772851148 +0100
-@@ -321,7 +321,7 @@
-     # TSAN runs much slower.
-     TIMEOUT_DEFAULT = 500
- else:
--    TIMEOUT_DEFAULT = 100
-+    TIMEOUT_DEFAULT = 600
- TIMEOUT_OVERRIDE = {"test_ddp_uneven_inputs": 400}
- 
- 
\ No newline at end of file
diff --git a/Golden_Repo/p/PyTorch/PyTorch-1.11.0_increase_test_tolerances_TF32.patch b/Golden_Repo/p/PyTorch/PyTorch-1.11.0_increase_test_tolerances_TF32.patch
deleted file mode 100644
index 3bce7e068..000000000
--- a/Golden_Repo/p/PyTorch/PyTorch-1.11.0_increase_test_tolerances_TF32.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-# Author: Caspar van Leeuwen, SURF
-# Fixes failing tests due to use of TensorFloat32
-# Setting NVIDIA_TF32_OVERRIDE=0 makes these tests pass, proving that TensorFloat32 is the issue
-# We increase tolerances for the asserts to make these tests pass
-diff -Nru pytorch_orig/test/distributed/_shard/sharded_tensor/ops/test_linear.py pytorch/test/distributed/_shard/sharded_tensor/ops/test_linear.py
---- pytorch_orig/test/distributed/_shard/sharded_tensor/ops/test_linear.py	2022-04-07 18:31:13.069599000 +0200
-+++ pytorch/test/distributed/_shard/sharded_tensor/ops/test_linear.py	2022-04-07 18:32:32.877406000 +0200
-@@ -77,7 +77,7 @@
-         local_output = local_linear(inp)
- 
-         # Verify
--        self.assertEqual(local_output, sharded_output)
-+        self.assertEqual(local_output, sharded_output, rtol=0.02, atol=1e-03)
- 
-         # Validate for torch.nn.functional.linear version.
-         local_output = torch.nn.functional.linear(
-@@ -91,7 +91,7 @@
-         # for reshard. We need to squeeze the # of dimensions manually.
-         if inp.dim() == 1:
-             sharded_output = sharded_output.squeeze(reshard_spec.dim)
--        self.assertEqual(local_output, sharded_output)
-+        self.assertEqual(local_output, sharded_output, rtol=0.02, atol=1e-03)
- 
-         # Compute loss and run backward pass.
-         local_output.sum().backward()
-@@ -114,7 +114,7 @@
- 
-         # Test backward gradient calculation.
-         self.assertEqual(sharded_linear.bias.grad, local_bias_grad)
--        self.assertEqual(sharded_weight.grad, local_grad_narrowed)
-+        self.assertEqual(sharded_weight.grad, local_grad_narrowed, rtol=0.01, atol=1e-03)
- 
-         # Test optimizer.
-         previous = local_linear.weight.clone().detach()
-@@ -135,7 +135,7 @@
-         )
-         self.assertEqual(sharded_weight.size(), local_weight_narrowed.size())
-         self.assertNotEqual(previous_sharded_weight, sharded_weight)
--        self.assertEqual(sharded_weight, local_weight_narrowed)
-+        self.assertEqual(sharded_weight, local_weight_narrowed, rtol=0.01, atol=1e-04)
-         self.assertNotEqual(previous_sharded_bias, sharded_linear.bias)
-         self.assertEqual(sharded_linear.bias, local_linear.bias)
- 
-diff -Nru pytorch_orig/test/distributed/_shard/sharded_tensor/test_megatron_prototype.py pytorch/test/distributed/_shard/sharded_tensor/test_megatron_prototype.py
---- pytorch_orig/test/distributed/_shard/sharded_tensor/test_megatron_prototype.py	2022-04-07 18:31:13.091710000 +0200
-+++ pytorch/test/distributed/_shard/sharded_tensor/test_megatron_prototype.py	2022-04-07 18:41:03.744644000 +0200
-@@ -113,7 +113,7 @@
-         local_output = local_megatron_lm(inp)
- 
-         # Verify
--        self.assertEqual(local_output, sharded_output)
-+        self.assertEqual(local_output, sharded_output, rtol=0.01, atol=1e-03)
- 
-         # Compute loss and run backward pass.
-         local_output.sum().backward()
-@@ -161,9 +161,9 @@
-         )
- 
-         # Test backward gradient calculation.
--        self.assertEqual(sharded_weight_fc1.grad, local_grad_narrowed_fc1)
--        self.assertEqual(sharded_weight_fc2.grad, local_grad_narrowed_fc2)
--        self.assertEqual(bias_grad_fc1, local_bias_grad_fc1)
-+        self.assertEqual(sharded_weight_fc1.grad, local_grad_narrowed_fc1, rtol=0.01, atol=2e-03)
-+        self.assertEqual(sharded_weight_fc2.grad, local_grad_narrowed_fc2, rtol=0.01, atol=1e-03)
-+        self.assertEqual(bias_grad_fc1, local_bias_grad_fc1, rtol=0.01, atol=2e-02)
-         self.assertEqual(bias_grad_fc2, local_bias_grad_fc2)
- 
-         # Test optimizer.
-@@ -171,7 +171,7 @@
-         local_bias_fc1, local_bias_fc2 = _get_bias(local_megatron_lm)
-         self.assertEqual(bias_fc1, local_bias_fc1)
-         self.assertEqual(bias_fc2, local_bias_fc2)
--        self.assertEqual(bias_fc1.grad, local_bias_fc1.grad)
-+        self.assertEqual(bias_fc1.grad, local_bias_fc1.grad, rtol=0.01, atol=2e-02)
-         self.assertEqual(bias_fc2.grad, local_bias_fc2.grad)
-         previous_sharded_weight_fc1 = sharded_weight_fc1.clone()
-         previous_sharded_weight_fc2 = sharded_weight_fc2.clone()
-@@ -197,13 +197,13 @@
-         self.assertEqual(sharded_weight_fc2.size(), local_weight_fc2_narrowed.size())
-         self.assertNotEqual(previous_sharded_weight_fc1, sharded_weight_fc1)
-         self.assertNotEqual(previous_sharded_weight_fc2, sharded_weight_fc2)
--        self.assertEqual(sharded_weight_fc1, local_weight_fc1_narrowed)
--        self.assertEqual(sharded_weight_fc2, local_weight_fc2_narrowed)
-+        self.assertEqual(sharded_weight_fc1, local_weight_fc1_narrowed, rtol=0.01, atol=1e-03)
-+        self.assertEqual(sharded_weight_fc2, local_weight_fc2_narrowed, rtol=0.01, atol=1e-03)
- 
-         # Test bias value after optimizer.
-         local_bias_fc1, local_bias_fc2 = _get_bias(local_megatron_lm)
-         self.assertNotEqual(previous_bias_fc1, bias_fc1)
--        self.assertEqual(bias_fc1, local_bias_fc1)
-+        self.assertEqual(bias_fc1, local_bias_fc1, rtol=0.01, atol=1e-03)
-         self.assertNotEqual(previous_bias_fc2, bias_fc2)
-         self.assertEqual(bias_fc2, local_bias_fc2)
- 
-diff -Nru pytorch_orig/test/test_stateless.py pytorch/test/test_stateless.py
---- pytorch_orig/test/test_stateless.py	2022-04-07 18:31:13.029968000 +0200
-+++ pytorch/test/test_stateless.py	2022-04-07 18:43:46.723968000 +0200
-@@ -42,7 +42,7 @@
-         # existing params in module. So here we expect the result to be the
-         # same as the input if the weight swapping went well.
-         res = _stateless.functional_call(module, parameters, x)
--        self.assertEqual(x, res)
-+        self.assertEqual(x, res, rtol=1e-04, atol=1e-04)
-         # check that the weight remain unmodified
-         cur_weight = to_check.l1.weight
-         uur_buffer = to_check.buffer
-c PyTorch-1.11.0_increase_test_tolerances_TF32.patch
-rig/test/test_jit_fuser_te.py pytorch/test/test_jit_fuser_te.py
---- pytorch_orig/test/test_jit_fuser_te.py  2022-04-07 18:31:13.046680000 +0200
-+++ pytorch/test/test_jit_fuser_te.py   2022-04-12 18:21:00.355114000 +0200
-@@ -956,7 +956,7 @@
-     def test_lstm_traced(self):
-         for device in self.devices:
-             inputs = get_lstm_inputs(device)
--            ge = self.checkTrace(LSTMCellF, inputs)
-+            ge = self.checkTrace(LSTMCellF, inputs, atol=1e-4, rtol=1e-5)
-             graph = ge.graph_for(*inputs)
-             fusion_groups = self.findFusionGroups(graph)
-             # TODO: chunk
-diff -Nru pytorch_orig/torch/testing/_internal/jit_utils.py pytorch/torch/testing/_internal/jit_utils.py
---- pytorch_orig/torch/testing/_internal/jit_utils.py   2022-04-07 18:28:54.339477000 +0200
-+++ pytorch/torch/testing/_internal/jit_utils.py    2022-04-12 18:19:59.614272000 +0200
-@@ -525,7 +525,7 @@
-     def checkTrace(self, func, reference_tensors, input_tensors=None,
-                    drop=None, allow_unused=False, verbose=False,
-                    inputs_require_grads=True, check_tolerance=1e-5, export_import=True,
--                   _force_outplace=False):
-+                   _force_outplace=False, rtol=None, atol=None):
-
-         # TODO: check gradients for parameters, not just inputs
-         def allSum(vs):
-@@ -618,7 +618,10 @@
-
-         self.assertEqual(outputs, outputs_ge)
-         if inputs_require_grads:
--            self.assertEqual(grads, grads_ge)
-+            if atol is not None and rtol is not None:
-+                self.assertEqual(grads, grads_ge, atol=atol, rtol=rtol)
-+            else:
-+                self.assertEqual(grads, grads_ge)
-             for g2, g2_ge in zip(grads2, grads2_ge):
-                 if g2 is None and g2_ge is None:
-                     continue
\ No newline at end of file
diff --git a/Golden_Repo/p/PyTorch/PyTorch-1.11.0_skip_failing_ops_tests.patch b/Golden_Repo/p/PyTorch/PyTorch-1.11.0_skip_failing_ops_tests.patch
deleted file mode 100644
index e3d894a3f..000000000
--- a/Golden_Repo/p/PyTorch/PyTorch-1.11.0_skip_failing_ops_tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Nru pytorch-1.11.0-rc3.orig/torch/testing/_internal/common_methods_invocations.py pytorch-1.11.0-rc3/torch/testing/_internal/common_methods_invocations.py
---- pytorch-1.11.0-rc3.orig/torch/testing/_internal/common_methods_invocations.py	2022-02-24 18:07:16.430276050 +0100
-+++ pytorch-1.11.0-rc3/torch/testing/_internal/common_methods_invocations.py	2022-02-24 19:38:11.610293957 +0100
-@@ -8791,7 +8791,10 @@
-            supports_fwgrad_bwgrad=True,
-            autodiff_fusible_nodes=['aten::contiguous'],
-            assert_jit_shape_analysis=True,
--           supports_out=False),
-+           supports_out=False,
-+           skips=(
-+               DecorateInfo(unittest.skip("Skipped!"), 'TestJit', 'test_variant_consistency_jit', device_type='cpu'),
-+           )),
-     OpInfo('sum_to_size',
-            op=lambda x, *args, **kwargs: x.sum_to_size(*args, **kwargs),
-            dtypes=floating_and_complex_types_and(torch.float16, torch.bfloat16),
-@@ -9746,6 +9749,10 @@
-                DecorateInfo(unittest.skip("Skipped!"), 'TestMathBits', 'test_neg_view', device_type='cuda'),
-                DecorateInfo(unittest.skip("Skipped!"), 'TestCommon', 'test_dtypes'),
-                DecorateInfo(unittest.skip("Skipped!"), 'TestGradients', 'test_fn_gradgrad'),
-+               # It also breaks on CPU. We'll revisit this once `linalg.lu_solve` is a thing
-+               # See https://github.com/pytorch/pytorch/pull/64387 and https://github.com/pytorch/pytorch/issues/67767
-+               DecorateInfo(unittest.skip("Skipped!"), 'TestGradients', 'test_fn_grad',
-+                            dtypes=(torch.complex128,)),
-            )),
-     OpInfo('linalg.cholesky',
-            aten_name='linalg_cholesky',
\ No newline at end of file
diff --git a/Golden_Repo/p/PyTorch/PyTorch-1.7.0_avoid-nan-in-test-torch.patch b/Golden_Repo/p/PyTorch/PyTorch-1.7.0_avoid-nan-in-test-torch.patch
deleted file mode 100644
index a14c146be..000000000
--- a/Golden_Repo/p/PyTorch/PyTorch-1.7.0_avoid-nan-in-test-torch.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-This test uses in-place operations which may generate NaNs making subsequent tests fail
-See https://github.com/pytorch/pytorch/issues/48591
-
-Author: Alexander Grund (TU Dresden)
-
-diff --git a/test/test_torch.py b/test/test_torch.py
-index 1f3f568f7b..237fb030f6 100644
---- a/test/test_torch.py
-+++ b/test/test_torch.py
-@@ -15060,7 +15060,7 @@ class TestTorchDeviceType(TestCase):
-                 x_c = x.contiguous()
-                 y_c = y.contiguous()
-                 result_c = fn(x_c, y_c)
--                result = fn(x, y)
-+                result = fn(x.clone(), y)
-                 self.assertEqual(result, result_c)
-                 self.assertTrue(
-                     result.is_contiguous(memory_format=memory_format),
diff --git a/Golden_Repo/p/PyTorch/PyTorch-1.7.0_disable-dev-shm-test.patch b/Golden_Repo/p/PyTorch/PyTorch-1.7.0_disable-dev-shm-test.patch
deleted file mode 100644
index 0f85648a9..000000000
--- a/Golden_Repo/p/PyTorch/PyTorch-1.7.0_disable-dev-shm-test.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-This test fails randomly. I assume some concurrent test runners or another race condition
-Should be safe even if this fails
-See https://github.com/pytorch/pytorch/issues/48579
-
-Author: Alexander Grund (TU Dresden)
-
-diff --git a/test/test_multiprocessing.py b/test/test_multiprocessing.py
-index 49e0a3cb45..e4e5b64ca1 100644
---- a/test/test_multiprocessing.py
-+++ b/test/test_multiprocessing.py
-@@ -202,7 +202,9 @@ class leak_checker(object):
-             # available_fds = self._get_next_fds(10)
-             # self.test_case.assertLessEqual(
-             #     available_fds[-1] - self.next_fds[-1], 5)
--            self.test_case.assertFalse(self.has_shm_files())
-+            # self.test_case.assertFalse(self.has_shm_files())
-+            if self.has_shm_files():
-+                print("WARNING: has_shm_files test would have failed!")
-         return False
- 
-     def check_pid(self, pid):
diff --git a/Golden_Repo/p/PyTorch/PyTorch-1.8.1_dont-use-gpu-ccc-in-test.patch b/Golden_Repo/p/PyTorch/PyTorch-1.8.1_dont-use-gpu-ccc-in-test.patch
deleted file mode 100644
index a5c0731da..000000000
--- a/Golden_Repo/p/PyTorch/PyTorch-1.8.1_dont-use-gpu-ccc-in-test.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Disable a part of a test which uses the current GPUs CUDA compute capability
-This will fail if the GPU is newer than what nvcc supports.
-See https://github.com/pytorch/pytorch/issues/51950
-
-Author: Alexander Grund (TU Dresden)
-
-diff --git a/test/test_cpp_extensions_jit.py b/test/test_cpp_extensions_jit.py
-index efda7cb2cf..64607346c8 100644
---- a/test/test_cpp_extensions_jit.py
-+++ b/test/test_cpp_extensions_jit.py
-@@ -181,11 +181,9 @@ class TestCppExtensionJIT(common.TestCase):
-         #   - With/without '+PTX'
- 
-         n = torch.cuda.device_count()
--        capabilities = {torch.cuda.get_device_capability(i) for i in range(n)}
-         # expected values is length-2 tuple: (list of ELF, list of PTX)
-         # note: there should not be more than one PTX value
-         archflags = {
--            '': (['{}{}'.format(capability[0], capability[1]) for capability in capabilities], None),
-             "Maxwell+Tegra;6.1": (['53', '61'], None),
-             "Pascal 3.5": (['35', '60', '61'], None),
-             "Volta": (['70'], ['70']),
diff --git a/Golden_Repo/p/PyTorch/PyTorch-1.9.0_limit-world-size-for-zero-redundancy-opt-test.patch b/Golden_Repo/p/PyTorch/PyTorch-1.9.0_limit-world-size-for-zero-redundancy-opt-test.patch
deleted file mode 100644
index c360a459f..000000000
--- a/Golden_Repo/p/PyTorch/PyTorch-1.9.0_limit-world-size-for-zero-redundancy-opt-test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Some tests fail when run with anything but 2 GPUs and others when run with anything but 2 or 4 GPUs.
-So limit to 2 GPUs.
-
-See https://github.com/pytorch/pytorch/issues/59548
-
-Author: Alexander Grund (TU Dresden)
-
-diff --git a/test/distributed/optim/test_zero_redundancy_optimizer.py b/test/distributed/optim/test_zero_redundancy_optimizer.py
-index 06f1b4f484..bc82f6c304 100644
---- a/test/distributed/optim/test_zero_redundancy_optimizer.py
-+++ b/test/distributed/optim/test_zero_redundancy_optimizer.py
-@@ -233,7 +233,7 @@ class TestZeroRedundancyOptimizerSingleRank(TestZeroRedundancyOptimizer):
- class TestZeroRedundancyOptimizerDistributed(TestZeroRedundancyOptimizer):
-     @property
-     def world_size(self):
--        return min(4, max(2, torch.cuda.device_count()))
-+        return 2
- 
-     @skip_if_rocm
-     def test_step(self):
diff --git a/Golden_Repo/p/PyYAML/PyYAML-5.4.1-GCCcore-11.2.0.eb b/Golden_Repo/p/PyYAML/PyYAML-5.4.1-GCCcore-11.2.0.eb
deleted file mode 100644
index 85c970dba..000000000
--- a/Golden_Repo/p/PyYAML/PyYAML-5.4.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,27 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'PyYAML'
-version = '5.4.1'
-
-homepage = "https://github.com/yaml/pyyaml"
-description = """PyYAML is a YAML parser and emitter for the Python programming language."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-sources = [SOURCE_TAR_GZ]
-checksums = ['607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e']
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('libyaml', '0.2.5'),
-]
-
-use_pip = True
-download_dep_fail = True
-sanity_pip_check = True
-
-options = {'modulename': 'yaml'}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/p/Python-Neuroimaging/Python-Neuroimaging-2022-gcccoremkl-11.2.0-2021.4.0-Python-3.9.6.eb b/Golden_Repo/p/Python-Neuroimaging/Python-Neuroimaging-2022-gcccoremkl-11.2.0-2021.4.0-Python-3.9.6.eb
deleted file mode 100644
index a638522ff..000000000
--- a/Golden_Repo/p/Python-Neuroimaging/Python-Neuroimaging-2022-gcccoremkl-11.2.0-2021.4.0-Python-3.9.6.eb
+++ /dev/null
@@ -1,113 +0,0 @@
-easyblock = 'Bundle'
-name = 'Python-Neuroimaging'
-version = '2022'
-versionsuffix = '-Python-%(pyver)s'
-
-homepage = ''
-description = """Python Neuroimaging is a collection of open source software for neuroimaging using Python."""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-# This is a bundle of Python packages
-exts_defaultclass = 'PythonPackage'
-
-exts_default_options = {
-    'source_urls': [PYPI_SOURCE],
-    'use_pip': True,
-    'sanity_pip_check': True,
-    'download_dep_fail': True,
-    'use_pip_for_deps': False,
-}
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-Stack', '2021b'),
-    ('SciPy-bundle', '2021.10'),
-    ('scikit-learn', '1.0.1'),
-    ('scikit-build', '0.11.1'),
-    ('scikit-image', '0.18.3'),
-    ('h5py', '3.5.0', '-serial'),
-    ('PyOpenCL', '2021.2.13'),
-    ('tqdm', '4.62.3'),
-]
-
-# Needed to make sure that the sanity check of mdt works
-unwanted_env_vars = ['CUDA_VISIBLE_DEVICES']
-
-exts_list = [
-    ('bz2file', '0.98', {
-        'source_urls': ['https://pypi.python.org/packages/source/b/bz2file'],
-        'checksums': ['64c1f811e31556ba9931953c8ec7b397488726c63e09a4c67004f43bdd28da88'],
-    }),
-    ('nibabel', '3.2.2', {
-        'source_urls': ['https://pypi.python.org/packages/source/n/nibabel'],
-        'checksums': ['b0dcc174b30405ce9e8fec1eab3cbbb20f5c5e4920976c08b22e050b7c124f94'],
-        'skipsteps': ['sanitycheck'],
-    }),
-    ('dipy', '1.5.0', {
-        'source_urls': ['https://pypi.python.org/packages/source/d/dipy'],
-        'checksums': ['a19cf40166be09c5b7c31ab00b12fed136ae9531483a9cd7019cc3f3b95f6271'],
-    }),
-    ('nilearn', '0.9.1', {
-        'source_urls': ['https://pypi.python.org/packages/source/n/nilearn'],
-        'checksums': ['dd821b4ff2b3b87f5e4b034ea0f95fce4375ace586de8ed17e6a667bde1925d7'],
-    }),
-    ('neurdflib', '5.0.1', {
-        'source_urls': ['https://pypi.python.org/packages/source/n/neurdflib'],
-        'checksums': ['d34493cee15029ff5db16157429585ff863ba5542675a4d8a94a0da1bc6e3a50'],
-        'modulename': 'rdflib'
-    }),
-    ('etelemetry', '0.3.0', {
-        'source_urls': ['https://pypi.python.org/packages/source/e/etelemetry'],
-        'source_tmpl': '%(name)s-%(version)s-py3-none-any.whl',
-        'unpack_sources': False,
-        'checksums': ['78febd59a22eb53d052d731f10f24139eb2854fd237348fba683dd8616fb4a67'],
-        'use_pip': True,
-    }),
-    ('ci-info', '0.2.0', {
-        'source_urls': ['https://pypi.python.org/packages/source/c/ci_info'],
-        'checksums': ['dd70632c977feb8797b1e633507166b64ad5f57183cebb2b0ea56934abba4616'],
-        'modulename': 'ci_info'
-    }),
-    ('nipype', '1.7.1', {
-        'source_urls': ['https://pypi.python.org/packages/source/n/nipype'],
-        'checksums': ['360cc5458952bf3ac00a5637ae75f4b5dc706ff123be8464c9fc5760172d1b94'],
-    }),
-    ('nipy', '0.5.0', {
-        'source_urls': ['https://pypi.python.org/packages/source/n/nipy'],
-        'checksums': ['a8a2c97ce854fece4aced5a6394b9fdca5846150ad6d2a36b86590924af3c848'],
-    }),
-    ('mne', '1.0.1', {
-        'source_urls': ['https://pypi.python.org/packages/source/m/mne'],
-        'checksums': ['42db4d1d43dfcc668dc130b82a18b020754b4bf1b4fcac74367bc5f335efdb88'],
-    }),
-    # 0.3.1 and higher import indent from textwrap, which is a Python 3 feature and therefore it doesn't work with py2
-    ('mot', '0.11.3', {
-        'source_urls': ['https://pypi.python.org/packages/source/m/mot'],
-        'checksums': ['20dfe5cc5ca90c562b9af8e0f822c4aad2e27d51f7cd8bf29d4dfad6d6c9311d'],
-        # to disable the test, since it needs a working OpenCL installation, which is not always the case in the logins
-        'modulename': 'os'
-    }),
-    # 0.9.38 and higher import indent from textwrap, which is a Python 3 feature and therefore it doesn't work with py2
-    ('mdt', '1.2.6', {
-        'source_urls': ['https://pypi.python.org/packages/source/m/mdt'],
-        'checksums': ['c06703597f56d91faa81a8ea9bfe9de4d86f1b82b62c7009fa376d3b86c771f7'],
-        # to disable the test, since it needs a working OpenCL installation, which is not always the case in the logins
-        'modulename': 'os'
-    }),
-    ('pysptools', '0.15.0', {
-        'source_urls': ['https://pypi.python.org/packages/source/p/pysptools'],
-        'checksums': ['923c4e1af97c490d7d9ad86d04fdf8918b63106023493e6a4cf54323e244b05e'],
-        'modulename': 'pysptools.util'
-    }),
-]
-
-modextrapaths = {'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages'}
-
-sanity_check_paths = {
-    'files': [],
-    'dirs': ['bin', 'lib/python%(pyshortver)s/site-packages', 'lib64/python%(pyshortver)s/site-packages'],
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/p/Python/Python-2.7.18-GCCcore-11.2.0-bare.eb b/Golden_Repo/p/Python/Python-2.7.18-GCCcore-11.2.0-bare.eb
deleted file mode 100644
index adb1a6314..000000000
--- a/Golden_Repo/p/Python/Python-2.7.18-GCCcore-11.2.0-bare.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-name = 'Python'
-version = '2.7.18'
-versionsuffix = '-bare'
-
-homepage = 'https://python.org/'
-description = """Python is a programming language that lets you work more quickly and integrate your systems
- more effectively."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://www.python.org/ftp/%(namelower)s/%(version)s/']
-sources = [SOURCE_TGZ]
-checksums = ['da3080e3b488f648a3d7a4560ddee895284c3380b11d6de75edb986526b9a814']
-
-builddependencies = [
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('binutils', '2.37'),
-    ('bzip2', '1.0.8'),  # required for bz2 package in Python stdlib
-    ('zlib', '1.2.11'),
-    ('libreadline', '8.1'),
-    ('ncurses', '6.2'),
-    ('SQLite', '3.36'),
-    ('OpenSSL', '1.1', '', True),
-]
-
-install_pip = True
-
-hidden = True
-
-moduleclass = 'lang'
diff --git a/Golden_Repo/p/Python/Python-3.9.6-GCCcore-11.2.0-bare.eb b/Golden_Repo/p/Python/Python-3.9.6-GCCcore-11.2.0-bare.eb
deleted file mode 100644
index 5f35d7f27..000000000
--- a/Golden_Repo/p/Python/Python-3.9.6-GCCcore-11.2.0-bare.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-name = 'Python'
-version = '3.9.6'
-versionsuffix = '-bare'
-
-homepage = 'https://python.org/'
-description = """Python is a programming language that lets you work more quickly and integrate your systems
- more effectively."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://www.python.org/ftp/%(namelower)s/%(version)s/']
-sources = [SOURCE_TGZ]
-checksums = ['d0a35182e19e416fc8eae25a3dcd4d02d4997333e4ad1f2eee6010aadc3fe866']
-
-builddependencies = [
-    ('UnZip', '6.0'),
-]
-
-dependencies = [
-    ('binutils', '2.37'),
-    ('bzip2', '1.0.8'),  # required for bz2 package in Python stdlib
-    ('zlib', '1.2.11'),
-    ('libreadline', '8.1'),
-    ('ncurses', '6.2'),
-    ('SQLite', '3.36'),
-    ('XZ', '5.2.5'),
-    ('libffi', '3.4.2'),
-    ('OpenSSL', '1.1', '', True),
-]
-
-install_pip = True
-
-hidden = True
-
-moduleclass = 'lang'
diff --git a/Golden_Repo/p/Python/Python-3.9.6-GCCcore-11.2.0.eb b/Golden_Repo/p/Python/Python-3.9.6-GCCcore-11.2.0.eb
deleted file mode 100644
index 1bc3b4a15..000000000
--- a/Golden_Repo/p/Python/Python-3.9.6-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,734 +0,0 @@
-name = 'Python'
-version = '3.9.6'
-
-homepage = 'https://python.org/'
-description = """Python is a programming language that lets you work more quickly and integrate your systems
- more effectively."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://www.python.org/ftp/%(namelower)s/%(version)s/']
-sources = [SOURCE_TGZ]
-checksums = ['d0a35182e19e416fc8eae25a3dcd4d02d4997333e4ad1f2eee6010aadc3fe866']
-
-builddependencies = [
-    ('UnZip', '6.0'),
-    ('Rust', '1.54.0'),  # required for setuptools-rust, which is needed for cryptography
-]
-
-dependencies = [
-    ('binutils', '2.37'),
-    ('bzip2', '1.0.8'),  # required for bz2 package in Python stdlib
-    ('zlib', '1.2.11'),
-    ('libreadline', '8.1'),
-    ('ncurses', '6.2'),
-    ('SQLite', '3.36'),
-    ('XZ', '5.2.5'),
-    ('GMP', '6.2.1'),  # required for pycrypto
-    ('libffi', '3.4.2'),
-    ('OpenSSL', '1.1', '', True),
-    # ('Tk', '8.6.11'),  # Disabled to avoid ciruclar dependency
-    ('libxml2', '2.9.10'),
-    ('libxslt', '1.1.34'),
-    ('libyaml', '0.2.5'),
-    ('PostgreSQL', '13.4'),
-    # ('protobuf', '3.17.3'),
-    ('gflags', '2.2.2'),
-    ('libspatialindex', '1.9.3'),  # Needed for rtree
-    ('libjpeg-turbo', '2.1.1'),
-]
-
-install_pip = True
-
-exts_default_options = {
-    'download_dep_fail': True,
-    'sanity_pip_check': True,
-    'source_urls': [PYPI_SOURCE],
-    'use_pip': True,
-}
-
-local_grakover = '3.99.9'
-
-# order is important!
-# package versions updated 06 August 2021
-exts_list = [
-    ('wheel', '0.36.2', {
-        'checksums': ['e11eefd162658ea59a60a0f6c7d493a7190ea4b9a85e335b33489d9f17e0245e'],
-    }),
-    ('setuptools', '57.4.0', {
-        'checksums': ['6bac238ffdf24e8806c61440e755192470352850f3419a52f26ffe0a1a64f465'],
-    }),
-    ('pip', '21.2.2', {
-        'checksums': ['38e9250dfb0d7fa842492bede9259d4b3289a936ce454f7c58f059f28a94c01d'],
-    }),
-    ('nose', '1.3.7', {
-        'checksums': ['f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98'],
-    }),
-    ('blist', '1.3.6', {
-        'patches': ['Python-3_9-blist-1.3.6-fix-undefined_symbol_PyObject_GC_IS_TRACKED.patch'],
-        'checksums': [
-            '3a12c450b001bdf895b30ae818d4d6d3f1552096b8c995f0fe0c74bef04d1fc3',  # blist-1.3.6.tar.gz
-            # Python-3_9-blist-1.3.6-fix-undefined_symbol_PyObject_GC_IS_TRACKED.patch
-            '18a643d1d1565b05df7dcc9a612a86dcf7b3b352435032f6425a61b597f911d0',
-        ],
-    }),
-    ('paycheck', '1.0.2', {
-        'checksums': ['6db7fc367c146cd59d2327ad4d2d6b0a24bc1be2d6953bb0773cbf702ee1ed34'],
-    }),
-    ('pbr', '5.6.0', {
-        'checksums': ['42df03e7797b796625b1029c0400279c7c34fd7df24a7d7818a1abb5b38710dd'],
-    }),
-    ('Cython', '0.29.24', {
-        'checksums': ['cdf04d07c3600860e8c2ebaad4e8f52ac3feb212453c1764a49ac08c827e8443'],
-    }),
-    ('six', '1.16.0', {
-        'checksums': ['1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926'],
-    }),
-    ('toml', '0.10.2', {
-        'checksums': ['b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f'],
-    }),
-    ('setuptools_scm', '6.0.1', {
-        'checksums': ['d1925a69cb07e9b29416a275b9fadb009a23c148ace905b2fb220649a6c18e92'],
-    }),
-    ('python-dateutil', '2.8.2', {
-        'modulename': 'dateutil',
-        'checksums': ['0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86'],
-    }),
-    ('decorator', '5.0.9', {
-        'checksums': ['72ecfba4320a893c53f9706bebb2d55c270c1e51a28789361aa93e4a21319ed5'],
-    }),
-    ('liac-arff', '2.5.0', {
-        'modulename': 'arff',
-        'checksums': ['3220d0af6487c5aa71b47579be7ad1d94f3849ff1e224af3bf05ad49a0b5c4da'],
-    }),
-    ('pycrypto', '2.6.1', {
-        'modulename': 'Crypto',
-        'patches': ['pycrypto-2.6.1_remove-usr-include.patch'],
-        'checksums': [
-            # pycrypto-2.6.1.tar.gz
-            'f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c',
-            # pycrypto-2.6.1_remove-usr-include.patch
-            '06c3d3bb290305e1360a023ea03f9281116c230de62382e6be9474996086712e',
-        ],
-    }),
-    ('ecdsa', '0.17.0', {
-        'checksums': ['b9f500bb439e4153d0330610f5d26baaf18d17b8ced1bc54410d189385ea68aa'],
-    }),
-    ('ipaddress', '1.0.23', {
-        'checksums': ['b7f8e0369580bb4a24d5ba1d7cc29660a4a6987763faf1d8a8046830e020e7e2'],
-    }),
-    ('asn1crypto', '1.4.0', {
-        'checksums': ['f4f6e119474e58e04a2b1af817eb585b4fd72bdd89b998624712b5c99be7641c'],
-    }),
-    ('idna', '3.2', {
-        'checksums': ['467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3'],
-    }),
-    ('pycparser', '2.20', {
-        'checksums': ['2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0'],
-    }),
-    ('cffi', '1.14.6', {
-        'checksums': ['c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd'],
-    }),
-    ('semantic_version', '2.8.5', {
-        'checksums': ['d2cb2de0558762934679b9a104e82eca7af448c9f4974d1f3eeccff651df8a54'],
-    }),
-    ('setuptools-rust', '0.12.1', {
-        'checksums': ['647009e924f0ae439c7f3e0141a184a69ad247ecb9044c511dabde232d3d570e'],
-    }),
-    ('cryptography', '3.4.7', {
-        'checksums': ['3d10de8116d25649631977cb37da6cbdd2d6fa0e0281d014a5b7d337255ca713'],
-        # avoid that cargo uses $HOME/.cargo, which can lead to build failures if home directory is NFS mounted,
-        # see https://github.com/rust-lang/cargo/issues/6652
-        'preinstallopts': "export CARGO_HOME=%(builddir)s/cargo && ",
-    }),
-    ('pyasn1', '0.4.8', {
-        'checksums': ['aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba'],
-    }),
-    ('PyNaCl', '1.4.0', {
-        'modulename': 'nacl',
-        'checksums': ['54e9a2c849c742006516ad56a88f5c74bf2ce92c9f67435187c3c5953b346505'],
-    }),
-    ('bcrypt', '3.2.0', {
-        'checksums': ['5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29'],
-    }),
-    ('paramiko', '2.7.2', {
-        'checksums': ['7f36f4ba2c0d81d219f4595e35f70d56cc94f9ac40a6acdf51d6ca210ce65035'],
-    }),
-    ('pyparsing', '2.4.7', {
-        'checksums': ['c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1'],
-    }),
-    ('netifaces', '0.11.0', {
-        'checksums': ['043a79146eb2907edf439899f262b3dfe41717d34124298ed281139a8b93ca32'],
-    }),
-    ('netaddr', '0.8.0', {
-        'checksums': ['d6cc57c7a07b1d9d2e917aa8b36ae8ce61c35ba3fcd1b83ca31c5a0ee2b5a243'],
-    }),
-    ('mock', '4.0.3', {
-        'checksums': ['7d3fbbde18228f4ff2f1f119a45cdffa458b4c0dee32eb4d2bb2f82554bac7bc'],
-    }),
-    ('pytz', '2021.1', {
-        'checksums': ['83a4a90894bf38e243cf052c8b58f381bfe9a7a483f6a9cab140bc7f702ac4da'],
-    }),
-    ('bitstring', '3.1.9', {
-        'checksums': ['a5848a3f63111785224dca8bb4c0a75b62ecdef56a042c8d6be74b16f7e860e7'],
-    }),
-    ('appdirs', '1.4.4', {
-        'checksums': ['7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41'],
-    }),
-    ('distlib', '0.3.2', {
-        'source_tmpl': 'distlib-%(version)s.zip',
-        'checksums': ['106fef6dc37dd8c0e2c0a60d3fca3e77460a48907f335fa28420463a6f799736'],
-    }),
-    ('filelock', '3.0.12', {
-        'checksums': ['18d82244ee114f543149c66a6e0c14e9c4f8a1044b5cdaadd0f82159d6a6ff59'],
-    }),
-    ('zipp', '3.5.0', {
-        'checksums': ['f5812b1e007e48cff63449a5e9f4e7ebea716b4111f9c4f9a645f91d579bf0c4'],
-    }),
-    ('typing_extensions', '3.10.0.0', {
-        'checksums': ['50b6f157849174217d0656f99dc82fe932884fb250826c18350e159ec6cdf342'],
-    }),
-    ('importlib_metadata', '4.6.3', {
-        'checksums': ['0645585859e9a6689c523927a5032f2ba5919f1f7d0e84bd4533312320de1ff9'],
-    }),
-    ('backports.entry_points_selectable', '1.1.0', {
-        'checksums': ['988468260ec1c196dab6ae1149260e2f5472c9110334e5d51adcb77867361f6a'],
-    }),
-    ('platformdirs', '2.2.0', {
-        'checksums': ['632daad3ab546bd8e6af0537d09805cec458dce201bccfe23012df73332e181e'],
-    }),
-    ('scandir', '1.10.0', {
-        'checksums': ['4d4631f6062e658e9007ab3149a9b914f3548cb38bfb021c64f39a025ce578ae'],
-    }),
-    ('pathlib2', '2.3.6', {
-        'checksums': ['7d8bcb5555003cdf4a8d2872c538faa3a0f5d20630cb360e518ca3b981795e5f'],
-    }),
-    ('importlib_resources', '5.2.2', {
-        'checksums': ['a65882a4d0fe5fbf702273456ba2ce74fe44892c25e42e057aca526b702a6d4b'],
-    }),
-    ('virtualenv', '20.7.0', {
-        'checksums': ['97066a978431ec096d163e72771df5357c5c898ffdd587048f45e0aecc228094'],
-    }),
-    ('docopt', '0.6.2', {
-        'checksums': ['49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491'],
-    }),
-    ('joblib', '1.0.1', {
-        'checksums': ['9c17567692206d2f3fb9ecf5e991084254fe631665c450b443761c4186a613f7'],
-    }),
-    ('chardet', '4.0.0', {
-        'checksums': ['0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa'],
-    }),
-    ('certifi', '2021.5.30', {
-        'checksums': ['2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee'],
-    }),
-    ('urllib3', '1.26.6', {
-        'checksums': ['f57b4c16c62fa2760b7e3d97c35b255512fb6b59a259730f36ba32ce9f8e342f'],
-    }),
-    ('charset-normalizer', '2.0.4', {
-        'checksums': ['f23667ebe1084be45f6ae0538e4a5a865206544097e4e8bbcacf42cd02a348f3'],
-    }),
-    ('requests', '2.26.0', {
-        'checksums': ['b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7'],
-    }),
-    ('xlrd', '2.0.1', {
-        'checksums': ['f72f148f54442c6b056bf931dbc34f986fd0c3b0b6b5a58d013c9aef274d0c88'],
-    }),
-    ('py_expression_eval', '0.3.13', {
-        'checksums': ['6e7d59d391d54a034609ce66b820e7dd68c757672d166dcc514bf7abf15ba57e'],
-    }),
-    ('tabulate', '0.8.9', {
-        'checksums': ['eb1d13f25760052e8931f2ef80aaf6045a6cceb47514db8beab24cded16f13a7'],
-    }),
-    ('ujson', '4.0.2', {
-        'checksums': ['c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d'],
-    }),
-    ('atomicwrites', '1.4.0', {
-        'checksums': ['ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a'],
-    }),
-    ('py', '1.10.0', {
-        'checksums': ['21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3'],
-    }),
-    ('pluggy', '0.13.1', {
-        'checksums': ['15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0'],
-    }),
-    ('more-itertools', '8.8.0', {
-        'checksums': ['83f0308e05477c68f56ea3a888172c78ed5d5b3c282addb67508e7ba6c8f813a'],
-    }),
-    ('attrs', '21.2.0', {
-        'modulename': 'attr',
-        'checksums': ['ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb'],
-    }),
-    ('backports.functools_lru_cache', '1.6.4', {
-        'checksums': ['d5ed2169378b67d3c545e5600d363a923b09c456dab1593914935a68ad478271'],
-    }),
-    ('wcwidth', '0.2.5', {
-        'checksums': ['c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83'],
-    }),
-    ('iniconfig', '1.1.1', {
-        'checksums': ['bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32'],
-    }),
-    ('packaging', '20.9', {
-        'checksums': ['5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5'],
-    }),
-    ('colorama', '0.4.4', {
-        'checksums': ['5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b'],
-    }),
-    ('pytest', '6.2.4', {
-        'checksums': ['50bcad0a0b9c5a72c8e4e7c9855a3ad496ca6a881a3641b4260605450772c54b'],
-    }),
-    ('MarkupSafe', '2.0.1', {
-        'checksums': ['594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a'],
-    }),
-    ('Jinja2', '3.0.1', {
-        'checksums': ['703f484b47a6af502e743c9122595cc812b0271f661722403114f71a79d0f5a4'],
-    }),
-    ('sphinxcontrib-serializinghtml', '1.1.5', {
-        'modulename': 'sphinxcontrib.serializinghtml',
-        'checksums': ['aa5f6de5dfdf809ef505c4895e51ef5c9eac17d0f287933eb49ec495280b6952'],
-    }),
-    ('sphinxcontrib-websupport', '1.2.4', {
-        'modulename': 'sphinxcontrib.websupport',
-        'checksums': ['4edf0223a0685a7c485ae5a156b6f529ba1ee481a1417817935b20bde1956232'],
-    }),
-    ('Pygments', '2.9.0', {
-        'checksums': ['a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f'],
-    }),
-    ('imagesize', '1.2.0', {
-        'checksums': ['b1f6b5a4eab1f73479a50fb79fcf729514a900c341d8503d62a62dbc4127a2b1'],
-    }),
-    ('docutils', '0.17.1', {
-        'checksums': ['686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125'],
-    }),
-    ('snowballstemmer', '2.1.0', {
-        'checksums': ['e997baa4f2e9139951b6f4c631bad912dfd3c792467e2f03d7239464af90e914'],
-    }),
-    ('alabaster', '0.7.12', {
-        'checksums': ['a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02'],
-    }),
-    ('sphinxcontrib-applehelp', '1.0.2', {
-        'modulename': 'sphinxcontrib.applehelp',
-        'checksums': ['a072735ec80e7675e3f432fcae8610ecf509c5f1869d17e2eecff44389cdbc58'],
-    }),
-    ('sphinxcontrib-devhelp', '1.0.2', {
-        'modulename': 'sphinxcontrib.devhelp',
-        'checksums': ['ff7f1afa7b9642e7060379360a67e9c41e8f3121f2ce9164266f61b9f4b338e4'],
-    }),
-    ('sphinxcontrib-htmlhelp', '2.0.0', {
-        'modulename': 'sphinxcontrib.htmlhelp',
-        'checksums': ['f5f8bb2d0d629f398bf47d0d69c07bc13b65f75a81ad9e2f71a63d4b7a2f6db2'],
-    }),
-    ('sphinxcontrib-jsmath', '1.0.1', {
-        'modulename': 'sphinxcontrib.jsmath',
-        'checksums': ['a9925e4a4587247ed2191a22df5f6970656cb8ca2bd6284309578f2153e0c4b8'],
-    }),
-    ('sphinxcontrib-qthelp', '1.0.3', {
-        'modulename': 'sphinxcontrib.qthelp',
-        'checksums': ['4c33767ee058b70dba89a6fc5c1892c0d57a54be67ddd3e7875a18d14cba5a72'],
-    }),
-    ('Babel', '2.9.1', {
-        'checksums': ['bc0c176f9f6a994582230df350aa6e05ba2ebe4b3ac317eab29d9be5d2768da0'],
-    }),
-    ('Sphinx', '4.1.2', {
-        'checksums': ['3092d929cd807926d846018f2ace47ba2f3b671b309c7a89cd3306e80c826b13'],
-    }),
-    ('sphinx-bootstrap-theme', '0.7.1', {
-        'checksums': ['571e43ccb76d4c6c06576aa24a826b6ebc7adac45a5b54985200128806279d08'],
-    }),
-    ('click', '8.0.1', {
-        'checksums': ['8c04c11192119b1ef78ea049e0a6f0463e4c48ef00a30160c704337586f3ad7a'],
-    }),
-    ('psutil', '5.8.0', {
-        'checksums': ['0c9ccb99ab76025f2f0bbecf341d4656e9c1351db8cc8a03ccd62e318ab4b5c6'],
-    }),
-    ('future', '0.18.2', {
-        'checksums': ['b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d'],
-    }),
-    ('sortedcontainers', '2.4.0', {
-        'checksums': ['25caa5a06cc30b6b83d11423433f65d1f9d76c4c6a0c90e3379eaa43b9bfdb88'],
-    }),
-    ('intervaltree', '3.1.0', {
-        'checksums': ['902b1b88936918f9b2a19e0e5eb7ccb430ae45cde4f39ea4b36932920d33952d'],
-    }),
-    ('pytoml', '0.1.21', {
-        'checksums': ['8eecf7c8d0adcff3b375b09fe403407aa9b645c499e5ab8cac670ac4a35f61e7'],
-    }),
-    ('flit-core', '3.3.0', {
-        'source_tmpl': 'flit_core-%(version)s.tar.gz',
-        'checksums': ['b1404accffd6504b5f24eeca9ec5d3c877f828d16825348ba81515fa084bd5f0'],
-    }),
-    ('zipfile36', '0.1.3', {
-        'checksums': ['a78a8dddf4fa114f7fe73df76ffcce7538e23433b7a6a96c1c904023f122aead'],
-    }),
-    ('flit', '3.3.0', {
-        'checksums': ['65fbe22aaa7f880b776b20814bd80b0afbf91d1f95b17235b608aa256325ce57'],
-    }),
-    ('regex', '2021.8.3', {
-        'checksums': ['8935937dad2c9b369c3d932b0edbc52a62647c2afb2fafc0c280f14a8bf56a6a'],
-    }),
-    ('intreehooks', '1.0', {
-        'checksums': ['87e600d3b16b97ed219c078681260639e77ef5a17c0e0dbdd5a302f99b4e34e1'],
-    }),
-    ('pylev', '1.4.0', {
-        'checksums': ['9e77e941042ad3a4cc305dcdf2b2dec1aec2fbe3dd9015d2698ad02b173006d1'],
-    }),
-    ('pastel', '0.2.1', {
-        'source_tmpl': '%(name)s-%(version)s-py2.py3-none-any.whl',
-        'checksums': ['4349225fcdf6c2bb34d483e523475de5bb04a5c10ef711263452cb37d7dd4364'],
-    }),
-    ('crashtest', '0.3.1', {
-        'source_tmpl': SOURCE_PY3_WHL,
-        'checksums': ['300f4b0825f57688b47b6d70c6a31de33512eb2fa1ac614f780939aa0cf91680'],
-    }),
-    ('clikit', '0.6.2', {
-        'source_tmpl': SOURCE_WHL,
-        'checksums': ['71268e074e68082306e23d7369a7b99f824a0ef926e55ba2665e911f7208489e'],
-    }),
-    ('jeepney', '0.7.1', {
-        'source_tmpl': SOURCE_PY3_WHL,
-        'checksums': ['1b5a0ea5c0e7b166b2f5895b91a08c14de8915afda4407fb5022a195224958ac'],
-    }),
-    ('SecretStorage', '3.3.1', {
-        'checksums': ['fd666c51a6bf200643495a04abb261f83229dcb6fd8472ec393df7ffc8b6f195'],
-    }),
-    ('keyring', '21.2.0', {
-        'modulename': False,  # Doesn't work properly if HOME directory contains keys
-        'checksums': ['197fd5903901030ef7b82fe247f43cfed2c157a28e7747d1cfcf4bc5e699dd03'],
-    }),
-    ('keyrings.alt', '4.1.0', {
-        'modulename': False,
-        'checksums': ['52ccb61d6f16c10f32f30d38cceef7811ed48e086d73e3bae86f0854352c4ab2'],
-    }),
-    ('tomlkit', '0.7.2', {
-        'source_tmpl': SOURCE_WHL,
-        'checksums': ['173ad840fa5d2aac140528ca1933c29791b79a374a0861a80347f42ec9328117'],
-    }),
-    ('shellingham', '1.4.0', {
-        'checksums': ['4855c2458d6904829bd34c299f11fdeed7cfefbf8a2c522e4caea6cd76b3171e'],
-    }),
-    ('requests-toolbelt', '0.9.1', {
-        'checksums': ['968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0'],
-    }),
-    ('pyrsistent', '0.18.0', {
-        'checksums': ['773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b'],
-    }),
-    ('pkginfo', '1.7.1', {
-        'checksums': ['e7432f81d08adec7297633191bbf0bd47faf13cd8724c3a13250e51d542635bd'],
-    }),
-    ('ptyprocess', '0.7.0', {
-        'source_tmpl': SOURCE_WHL,
-        'checksums': ['4b41f3967fce3af57cc7e94b888626c18bf37a083e3651ca8feeb66d492fef35'],
-    }),
-    ('pexpect', '4.8.0', {
-        'checksums': ['fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c'],
-    }),
-    ('jsonschema', '3.2.0', {
-        'checksums': ['c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a'],
-    }),
-    ('simplejson', '3.17.3', {
-        'checksums': ['da72a452bcf4349fc467a12b54ab0e63e654a571cacc44084826d52bde12b6ee'],
-    }),
-    ('webencodings', '0.5.1', {
-        'checksums': ['b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923'],
-    }),
-    ('html5lib', '1.1', {
-        'checksums': ['b2e5b40261e20f354d198eae92afc10d750afb487ed5e50f9c4eaf07c184146f'],
-    }),
-    ('cleo', '0.8.1', {
-        'source_tmpl': SOURCE_WHL,
-        'checksums': ['141cda6dc94a92343be626bb87a0b6c86ae291dfc732a57bf04310d4b4201753'],
-    }),
-    ('cachy', '0.3.0', {
-        'checksums': ['186581f4ceb42a0bbe040c407da73c14092379b1e4c0e327fdb72ae4a9b269b1'],
-    }),
-    ('msgpack', '1.0.2', {
-        'checksums': ['fae04496f5bc150eefad4e9571d1a76c55d021325dcd484ce45065ebbdd00984'],
-    }),
-    ('CacheControl', '0.12.6', {
-        'checksums': ['be9aa45477a134aee56c8fac518627e1154df063e85f67d4f83ce0ccc23688e8'],
-    }),
-    ('lockfile', '0.12.2', {
-        'checksums': ['6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799'],
-    }),
-    ('poetry-core', '1.0.3', {
-        'modulename': 'poetry.core',
-        'checksums': ['2315c928249fc3207801a81868b64c66273077b26c8d8da465dccf8f488c90c5'],
-    }),
-    ('glob2', '0.7', {
-        'checksums': ['85c3dbd07c8aa26d63d7aacee34fa86e9a91a3873bc30bf62ec46e531f92ab8c'],
-    }),
-    ('poetry', '1.1.7', {
-        'checksums': ['3833c7b22411b8393e8e594fede94f0ef7a5260c19f51e272cce76512cffe6c8'],
-    }),
-    ('fsspec', '2021.7.0', {
-        'checksums': ['792ebd3b54de0b30f1ce73f0ba0a8bcc864724f2d9f248cb8d0ece47db0cbde8'],
-    }),
-    ('threadpoolctl', '2.2.0', {
-        'checksums': ['86d4b6801456d780e94681d155779058759eaef3c3564758b17b6c99db5f81cb'],
-    }),
-    ('simplegeneric', '0.8.1', {
-        'source_tmpl': 'simplegeneric-%(version)s.zip',
-        'checksums': ['dc972e06094b9af5b855b3df4a646395e43d1c9d0d39ed345b7393560d0b9173'],
-    }),
-
-    #############
-    # Below this point are packages added for JSC, not included in the upstream easybuild repositories
-    #############
-    ('funcsigs', '1.0.2', {
-        'source_urls': ['https://pypi.python.org/packages/source/f/funcsigs'],
-        'checksums': ['a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50'],
-    }),
-    ('lxml', '4.6.3', {
-        'source_urls': ['https://pypi.python.org/packages/source/l/lxml'],
-        'checksums': ['39b78571b3b30645ac77b95f7c69d1bffc4cf8c3b157c435a34da72e78c82468'],
-    }),
-    ('XlsxWriter', '3.0.1', {
-        'modulename': 'xlsxwriter',
-        'source_urls': ['https://pypi.python.org/packages/source/x/xlsxwriter'],
-        'checksums': ['3f39bf581c55f3ad1438bc170d7f4c4649cee8b6b7a80d21f79508118eeea52a'],
-    }),
-    ('prompt_toolkit', '3.0.20', {
-        'source_urls': ['https://pypi.python.org/packages/source/p/prompt_toolkit/'],
-        'checksums': ['eb71d5a6b72ce6db177af4a7d4d7085b99756bf656d98ffcc4fecd36850eea6c'],
-    }),
-    ('PyYAML', '5.4.1', {
-        'modulename': 'yaml',
-        'source_urls': ['https://pypi.python.org/packages/source/p/PyYAML/'],
-        'checksums': ['607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e'],
-    }),
-    ('psycopg2', '2.9.1', {
-        'source_urls': ['https://pypi.python.org/packages/source/p/psycopg2/'],
-        'checksums': ['de5303a6f1d0a7a34b9d40e4d3bef684ccc44a49bbe3eb85e3c0bffb4a131b7c'],
-    }),
-    # ('protobuf', '3.18.0', {
-    #     'modulename': 'google.protobuf',
-    #     'source_urls': ['https://pypi.python.org/packages/source/p/protobuf/'],
-    #     'checksums': ['18b308946a592e245299391e53c01b5b8efc2794f49986e80f37d7b5e60a270f'],
-    # }),
-    ('python-gflags', '3.1.2', {
-        'modulename': 'gflags',
-        'source_urls': ['https://pypi.python.org/packages/source/p/python-gflags/'],
-        'checksums': ['40ae131e899ef68e9e14aa53ca063839c34f6a168afe622217b5b875492a1ee2'],
-    }),
-    ('itsdangerous', '2.0.1', {
-        'source_urls': ['https://pypi.python.org/packages/source/i/itsdangerous'],
-        'checksums': ['9e724d68fc22902a1435351f84c3fb8623f303fffcc566a4cb952df8c572cff0'],
-    }),
-    ('Werkzeug', '2.0.1', {
-        'modulename': 'werkzeug',
-        'source_urls': ['https://pypi.python.org/packages/source/w/werkzeug'],
-        'checksums': ['1de1db30d010ff1af14a009224ec49ab2329ad2cde454c8a708130642d579c42'],
-    }),
-    ('Flask', '2.0.1', {
-        'modulename': 'flask',
-        'source_urls': ['https://pypi.python.org/packages/source/f/flask'],
-        'checksums': ['1c4c257b1892aec1398784c63791cbaa43062f1f7aeb555c4da961b20ee68f55'],
-    }),
-    ('Mako', '1.1.5', {
-        'modulename': 'mako',
-        'source_urls': ['https://pypi.python.org/packages/source/m/mako'],
-        'checksums': ['169fa52af22a91900d852e937400e79f535496191c63712e3b9fda5a9bed6fc3'],
-    }),
-    ('pytest-runner', '5.3.1', {
-        'modulename': 'ptr',
-        'source_urls': ['https://pypi.python.org/packages/source/p/pytest-runner'],
-        'checksums': ['0fce5b8dc68760f353979d99fdd6b3ad46330b6b1837e2077a89ebcf204aac91'],
-    }),
-    ('ply', '3.11', {
-        'source_urls': ['https://pypi.python.org/packages/source/p/ply'],
-        'checksums': ['00c7c1aaa88358b9c765b6d3000c6eec0ba42abca5351b095321aef446081da3'],
-    }),
-    ('ipython_genutils', '0.2.0', {
-        'source_urls': ['https://pypi.python.org/packages/source/i/ipython_genutils'],
-        'checksums': ['eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8'],
-    }),
-    ('traitlets', '5.1.0', {
-        'source_urls': ['https://pypi.python.org/packages/source/t/traitlets'],
-        'checksums': ['bd382d7ea181fbbcce157c133db9a829ce06edffe097bcf3ab945b435452b46d'],
-    }),
-    ('pickleshare', '0.7.5', {
-        'source_urls': ['https://pypi.python.org/packages/source/p/pickleshare'],
-        'checksums': ['87683d47965c1da65cdacaf31c8441d12b8044cdec9aca500cd78fc2c683afca'],
-    }),
-    ('parso', '0.8.2', {
-        'source_urls': ['https://pypi.python.org/packages/source/p/parso'],
-        'checksums': ['12b83492c6239ce32ff5eed6d3639d6a536170723c6f3f1506869f1ace413398'],
-    }),
-    ('jedi', '0.18.0', {
-        'source_urls': ['https://pypi.python.org/packages/source/j/jedi'],
-        'checksums': ['92550a404bad8afed881a137ec9a461fed49eca661414be45059329614ed0707'],
-    }),
-    ('backcall', '0.2.0', {
-        'source_urls': ['https://pypi.python.org/packages/source/b/backcall'],
-        'checksums': ['5cbdbf27be5e7cfadb448baf0aa95508f91f2bbc6c6437cd9cd06e2a4c215e1e'],
-    }),
-    ('matplotlib-inline', '0.1.3', {
-        'checksums': ['a04bfba22e0d1395479f866853ec1ee28eea1485c1d69a6faf00dc3e24ff34ee'],
-    }),
-    ('ipython', '7.27.0', {
-        'modulename': 'IPython',
-        'source_urls': ['https://pypi.python.org/packages/source/i/ipython'],
-        'checksums': ['58b55ebfdfa260dad10d509702dc2857cb25ad82609506b070cf2d7b7df5af13'],
-    }),
-    ('greenlet', '1.1.1', {
-        'checksums': ['c0f22774cd8294078bdf7392ac73cf00bfa1e5e0ed644bd064fdabc5f2a2f481'],
-    }),
-    ('SQLAlchemy', '1.4.23', {
-        'modulename': 'sqlalchemy',
-        'source_urls': ['https://pypi.python.org/packages/source/s/SQLAlchemy'],
-        'checksums': ['76ff246881f528089bf19385131b966197bb494653990396d2ce138e2a447583'],
-    }),
-    ('python-editor', '1.0.4', {
-        'modulename': 'editor',
-        'source_urls': ['https://pypi.python.org/packages/source/p/python-editor'],
-        'checksums': ['51fda6bcc5ddbbb7063b2af7509e43bd84bfc32a4ff71349ec7847713882327b'],
-    }),
-    ('alembic', '1.7.3', {
-        'source_urls': ['https://pypi.python.org/packages/source/a/alembic'],
-        'checksums': ['bc5bdf03d1b9814ee4d72adc0b19df2123f6c50a60c1ea761733f3640feedb8d'],
-    }),
-    ('vcversioner', '2.16.0.0', {
-        'source_urls': ['https://pypi.python.org/packages/source/v/vcversioner'],
-        'checksums': ['dae60c17a479781f44a4010701833f1829140b1eeccd258762a74974aa06e19b'],
-    }),
-    ('python-oauth2', '1.1.1', {
-        'modulename': 'oauth2',
-        'source_urls': ['https://pypi.python.org/packages/source/p/python-oauth2'],
-        'checksums': ['d7a8544927ac18215ba5317edd8f640a5f1f0593921bcf3ce862178312c8c9a4'],
-    }),
-    ('Rtree', '0.9.7', {
-        'source_urls': ['https://pypi.python.org/packages/source/r/rtree'],
-        'checksums': ['be8772ca34699a9ad3fb4cfe2cfb6629854e453c10b3328039301bbfc128ca3e'],
-    }),
-    ('ClusterShell', '1.8.3', {
-        'modulename': 'ClusterShell',
-        'source_urls': ['https://pypi.python.org/packages/source/c/ClusterShell'],
-        'checksums': ['0ebc1925c1aed94f99d74cbc0230215127ade80a25240133204094faa74bc41b'],
-    }),
-    ('cloudpickle', '2.0.0', {
-        'source_urls': ['https://pypi.python.org/packages/source/c/cloudpickle'],
-        'checksums': ['5cd02f3b417a783ba84a4ec3e290ff7929009fe51f6405423cfccfadd43ba4a4'],
-    }),
-    ('Pillow', '8.3.2', {
-        'modulename': 'PIL',
-        'source_urls': ['https://pypi.python.org/packages/source/p/Pillow'],
-        'checksums': ['dde3f3ed8d00c72631bc19cbfff8ad3b6215062a5eed402381ad365f82f0c18c'],
-    }),
-    ('toolz', '0.11.1', {
-        'source_urls': ['https://pypi.python.org/packages/source/t/toolz'],
-        'checksums': ['c7a47921f07822fe534fb1c01c9931ab335a4390c782bd28c6bcc7c2f71f3fbf'],
-    }),
-    ('xvfbwrapper', '0.2.9', {
-        'source_urls': ['https://pypi.python.org/packages/source/x/xvfbwrapper'],
-        'checksums': ['bcf4ae571941b40254faf7a73432dfc119ad21ce688f1fdec533067037ecfc24'],
-    }),
-    ('traits', '6.2.0', {
-        'source_urls': ['https://pypi.python.org/packages/source/t/traits'],
-        'checksums': ['16fa1518b0778fd53bf0547e6a562b1787bf68c8f6b7995a13bd1902529fdb0c'],
-    }),
-    ('isodate', '0.6.0', {
-        'source_urls': ['https://pypi.python.org/packages/source/i/isodate'],
-        'checksums': ['2e364a3d5759479cdb2d37cce6b9376ea504db2ff90252a2e5b7cc89cc9ff2d8'],
-    }),
-    ('rdflib', '6.0.1', {
-        'source_urls': ['https://pypi.python.org/packages/source/r/rdflib'],
-        'checksums': ['f071caff0b68634e4a7bd1d66ea3416ac98f1cc3b915938147ea899c32608728'],
-    }),
-    ('SPARQLWrapper', '1.8.5', {
-        'modulename': 'SPARQLWrapper',
-        'source_urls': ['https://pypi.python.org/packages/source/s/SPARQLWrapper'],
-        'checksums': ['d6a66b5b8cda141660e07aeb00472db077a98d22cb588c973209c7336850fb3c'],
-    }),
-    ('networkx', '2.6.3', {
-        'source_tmpl': '%(name)s-%(version)s.tar.gz',
-        'source_urls': ['https://pypi.python.org/packages/source/n/networkx'],
-        'checksums': ['c0946ed31d71f1b732b5aaa6da5a0388a345019af232ce2f49c766e2d6795c51'],
-    }),
-    ('prov', '2.0.0', {
-        'source_urls': ['https://pypi.python.org/packages/source/p/prov'],
-        'checksums': ['b6438f2195ecb9f6e8279b58971e02bc51814599b5d5383366eef91d867422ee'],
-    }),
-    ('configparser', '5.0.2', {
-        'source_urls': ['https://pypi.python.org/packages/source/c/configparser'],
-        'checksums': ['85d5de102cfe6d14a5172676f09d19c465ce63d6019cf0a4ef13385fc535e828'],
-    }),
-    ('pydot', '1.4.2', {
-        'source_urls': ['https://pypi.python.org/packages/source/p/pydot'],
-        'checksums': ['248081a39bcb56784deb018977e428605c1c758f10897a339fce1dd728ff007d'],
-    }),
-    ('pydotplus', '2.0.2', {
-        'source_urls': ['https://pypi.python.org/packages/source/p/pydotplus'],
-        'checksums': ['91e85e9ee9b85d2391ead7d635e3d9c7f5f44fd60a60e59b13e2403fa66505c4'],
-    }),
-    ('olefile', '0.46', {
-        'source_tmpl': '%(name)s-%(version)s.zip',
-        'source_urls': ['https://pypi.python.org/packages/source/o/olefile'],
-        'checksums': ['133b031eaf8fd2c9399b78b8bc5b8fcbe4c31e85295749bb17a87cba8f3c3964'],
-    }),
-    ('argcomplete', '1.12.3', {
-        'source_urls': ['https://pypi.python.org/packages/source/a/argcomplete'],
-        'checksums': ['2c7dbffd8c045ea534921e63b0be6fe65e88599990d8dc408ac8c542b72a5445'],
-    }),
-    ('grako', local_grakover, {
-        'source_tmpl': '%(name)s-%(version)s.zip',
-        'source_urls': ['https://pypi.python.org/packages/source/g/grako'],
-        'checksums': ['fcc37309eab7cd0cbbb26cfd6a54303fbb80a00a58ab295d1e665bc69189c364'],
-    }),
-    ('pytest-forked', '1.3.0', {
-        'modulename': 'pytest_forked',
-        'source_urls': ['https://pypi.python.org/packages/source/p/pytest-forked'],
-        'checksums': ['6aa9ac7e00ad1a539c41bec6d21011332de671e938c7637378ec9710204e37ca'],
-    }),
-    ('apipkg', '1.5', {
-        'source_urls': ['https://pypi.python.org/packages/source/a/apipkg'],
-        'checksums': ['37228cda29411948b422fae072f57e31d3396d2ee1c9783775980ee9c9990af6'],
-    }),
-    ('execnet', '1.9.0', {
-        'source_urls': ['https://pypi.python.org/packages/source/e/execnet'],
-        'checksums': ['8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5'],
-    }),
-    ('pytest-xdist', '2.4.0', {
-        'modulename': 'xdist',
-        'source_urls': ['https://pypi.python.org/packages/source/p/pytest-xdist'],
-        'checksums': ['89b330316f7fc475f999c81b577c2b926c9569f3d397ae432c0c2e2496d61ff9'],
-    }),
-    ('TatSu', '5.6.1', {
-        'source_tmpl': '%(name)s-%(version)s.zip',
-        'source_urls': ['https://pypi.python.org/packages/source/t/tatsu'],
-        'checksums': ['6a4f07aa7bfe9dfbee8015824feaf13f0b1a89577e2ee5a4a62c18630c309d4e'],
-    }),
-    ('pep8', '1.7.1', {
-        'source_urls': ['https://pypi.python.org/packages/source/p/pep8'],
-        'checksums': ['fe249b52e20498e59e0b5c5256aa52ee99fc295b26ec9eaa85776ffdb9fe6374'],
-    }),
-    ('hypothesis', '6.21.6', {
-        'source_urls': ['https://pypi.python.org/packages/source/h/hypothesis/'],
-        'checksums': ['29b72005910f2a548d727e5d5accf862a6ae84e49176d748fb6ca040ef657592'],
-    }),
-    ('coverage', '5.5', {
-        'source_urls': ['https://pypi.python.org/packages/source/c/coverage/'],
-        'checksums': ['ebe78fe9a0e874362175b02371bdfbee64d8edc42a044253ddf4ee7d3c15212c'],
-    }),
-    ('pyzmq', '22.3.0', {
-        'modulename': 'zmq',
-        'source_urls': ['https://pypi.python.org/packages/source/p/pyzmq/'],
-        'checksums': ['8eddc033e716f8c91c6a2112f0a8ebc5e00532b4a6ae1eb0ccc48e027f9c671c'],
-    }),
-]
-
-# local_grako_egginfo_path = '%(installdir)s/lib/python3.9/site-packages/'
-# local_grako_egginfo_path += 'grako-%s-py3.9-linux-x86_64.egg/EGG-INFO/' % local_grakover
-
-postinstallcmds = [
-    'ln -s %(installdir)s/bin/python3-config %(installdir)s/bin/python-config',
-    # Pip version is not updated mid-stage, so add a var to stop it.
-    'printf "[global]\ndisable-pip-version-check = True\n" > %(installdir)s/etc/pip.conf'
-]
-
-buildopts = "PROFILE_TASK='-m test --pgo -x test_socket'"
-
-modextravars = {
-    'PIP_CONFIG_FILE': '%(installdir)s/etc/pip.conf'
-}
-
-moduleclass = 'lang'
diff --git a/Golden_Repo/p/p7zip/p7zip-17.04-GCCcore-11.2.0.eb b/Golden_Repo/p/p7zip/p7zip-17.04-GCCcore-11.2.0.eb
deleted file mode 100644
index ac2df0865..000000000
--- a/Golden_Repo/p/p7zip/p7zip-17.04-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,47 +0,0 @@
-easyblock = 'MakeCp'
-
-name = 'p7zip'
-version = '17.04'
-
-homepage = 'https://github.com/jinfeihan57/p7zip/'
-description = """p7zip is a quick port of 7z.exe and 7za.exe (CLI version of
-7zip) for Unix. 7-Zip is a file archiver with highest compression ratio."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-github_account = 'jinfeihan57'
-source_urls = [GITHUB_LOWER_SOURCE]
-sources = ['v%(version)s.tar.gz']
-checksums = ['ea029a2e21d2d6ad0a156f6679bd66836204aa78148a4c5e498fe682e77127ef']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-prebuildopts = "cp makefile.linux_amd64 makefile.linux &&"
-buildopts = 'all3 CC="$CC" CXX="$CXX" OPTFLAGS="$CFLAGS"'
-
-files_to_copy = [
-    (['bin/7za', 'bin/7zr', 'bin/7zCon.sfx'], 'bin'),  # stand-alone binaries
-    (['bin/7z', 'bin/7z.%s' % SHLIB_EXT, 'bin/Codecs'], 'libexec'),  # 7z requires 7z.so plugin in same directory
-]
-
-# put script in place for 7z, since it *must* be called full path, to ensure that 7z.so is found in the same directory
-# see also http://sourceforge.net/p/p7zip/discussion/383044/thread/5e4085ab/
-postinstallcmds = [
-    "echo '#!/bin/sh\n%(installdir)s/libexec/7z $@' > %(installdir)s/bin/7z",
-    "chmod +x %(installdir)s/bin/7z",  # set execution bits according to current umask
-]
-
-sanity_check_paths = {
-    'files': ['bin/7z', 'bin/7za', 'bin/7zCon.sfx', 'bin/7zr', 'libexec/7z', 'libexec/7z.%s' % SHLIB_EXT],
-    'dirs': ['libexec/Codecs'],
-}
-
-sanity_check_commands = [
-    '7z --help',
-    '7z x || test $? -gt 0',
-    "! 7z i | grep -q \"Can't load\" ",
-]
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/p/parallel/parallel-20210722-GCCcore-11.2.0.eb b/Golden_Repo/p/parallel/parallel-20210722-GCCcore-11.2.0.eb
deleted file mode 100644
index 8b38cbfbf..000000000
--- a/Golden_Repo/p/parallel/parallel-20210722-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,26 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'parallel'
-version = '20210722'
-
-homepage = 'https://savannah.gnu.org/projects/parallel/'
-description = """parallel: Build and execute shell commands in parallel"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [GNU_SOURCE]
-sources = [SOURCELOWER_TAR_BZ2]
-checksums = ['3239094bc043957be191e1e4376716ef0d1b369e545b5bf7d7824b7d46284a49']
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [('Perl', '5.34.0')]
-
-sanity_check_paths = {
-    'files': ['bin/parallel'],
-    'dirs': []
-}
-
-sanity_check_commands = ["parallel --help"]
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/p/patchelf/patchelf-0.13-GCCcore-11.2.0.eb b/Golden_Repo/p/patchelf/patchelf-0.13-GCCcore-11.2.0.eb
deleted file mode 100644
index f553b4df4..000000000
--- a/Golden_Repo/p/patchelf/patchelf-0.13-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,27 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'patchelf'
-version = '0.13'
-
-homepage = 'https://github.com/NixOS/patchelf'
-description = """PatchELF is a small utility to modify the dynamic linker and RPATH of ELF executables."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://github.com/NixOS/patchelf/archive/']
-sources = ['%(version)s.tar.gz']
-checksums = ['60c6aeadb673de9cc1838b630c81f61e31c501de324ef7f1e8094a2431197d09']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Autotools', '20210726'),
-]
-
-preconfigopts = "sh bootstrap.sh && "
-
-sanity_check_paths = {
-    'files': ['bin/patchelf'],
-    'dirs': ['share'],
-}
-
-moduleclass = 'tools'
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
deleted file mode 100644
index 0ccc7c3c7..000000000
--- a/Golden_Repo/p/pixman/pixman-0.40.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,30 +0,0 @@
-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'}
-toolchainopts = {'pic': True}
-
-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/p/pkg-config/pkg-config-0.29.2-GCCcore-11.2.0.eb b/Golden_Repo/p/pkg-config/pkg-config-0.29.2-GCCcore-11.2.0.eb
deleted file mode 100644
index 22f1afeac..000000000
--- a/Golden_Repo/p/pkg-config/pkg-config-0.29.2-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,37 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'pkg-config'
-version = '0.29.2'
-
-homepage = 'https://www.freedesktop.org/wiki/Software/pkg-config/'
-
-description = """
- pkg-config is a helper tool used when compiling applications and libraries.
- It helps you insert the correct compiler options on the command line so an
- application can use gcc -o test test.c `pkg-config --libs --cflags glib-2.0`
- for instance, rather than hard-coding values on where to find glib (or other
- libraries).
-"""
-
-site_contacts = 'sc@fz-juelich.de'
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://pkg-config.freedesktop.org/releases/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591']
-
-builddependencies = [('binutils', '2.37')]
-
-# don't use PAX, it might break.
-tar_config_opts = True
-
-configopts = " --with-internal-glib"
-configopts += " --with-pc-path=/usr/lib64/pkgconfig:/usr/share/pkgconfig"
-
-sanity_check_paths = {
-    'files': ['bin/pkg-config'],
-    'dirs': [],
-}
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/p/pkg-config/pkg-config-0.29.2.eb b/Golden_Repo/p/pkg-config/pkg-config-0.29.2.eb
deleted file mode 100644
index d33a36127..000000000
--- a/Golden_Repo/p/pkg-config/pkg-config-0.29.2.eb
+++ /dev/null
@@ -1,35 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'pkg-config'
-version = '0.29.2'
-
-homepage = 'http://www.freedesktop.org/wiki/Software/pkg-config/'
-description = """pkg-config is a helper tool used when compiling applications and libraries. It helps you insert the
- correct compiler options on the command line so an application can use
-  gcc -o test test.c `pkg-config --libs --cflags glib-2.0`
- for instance, rather than hard-coding values on where to find glib (or other libraries).
-"""
-
-site_contacts = 'sc@fz-juelich.de'
-
-toolchain = SYSTEM
-
-source_urls = ['http://pkgconfig.freedesktop.org/releases/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591']
-
-builddependencies = [('binutils', '2.37')]
-
-# don't use PAX, it might break.
-tar_config_opts = True
-
-configopts = " --with-internal-glib"
-# add pkg-config path of CentOS packages
-configopts += " --with-pc-path=/usr/lib64/pkgconfig:/usr/share/pkgconfig"
-
-sanity_check_paths = {
-    'files': ['bin/pkg-config'],
-    'dirs': [],
-}
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/p/pkgconfig/pkgconfig-1.5.5-GCCcore-11.2.0-python.eb b/Golden_Repo/p/pkgconfig/pkgconfig-1.5.5-GCCcore-11.2.0-python.eb
deleted file mode 100644
index 5c0847b62..000000000
--- a/Golden_Repo/p/pkgconfig/pkgconfig-1.5.5-GCCcore-11.2.0-python.eb
+++ /dev/null
@@ -1,28 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'pkgconfig'
-version = '1.5.5'
-# The -python versionsuffix is used to avoid confusion between
-# pkg-config (the tool) and pkgconfig (the Python wrappers)
-versionsuffix = '-python'
-
-homepage = 'https://github.com/matze/pkgconfig'
-description = """pkgconfig is a Python module to interface with the pkg-config command line tool"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-sources = [SOURCE_TAR_GZ]
-checksums = ['deb4163ef11f75b520d822d9505c1f462761b4309b1bb713d08689759ea8b899']
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('pkg-config', '0.29.2'),
-]
-
-use_pip = True
-download_dep_fail = True
-sanity_pip_check = True
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/p/pocl/include_cl_header_1_8.patch b/Golden_Repo/p/pocl/include_cl_header_1_8.patch
deleted file mode 100644
index e9bac020c..000000000
--- a/Golden_Repo/p/pocl/include_cl_header_1_8.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- pocl-1.8/include/CL/CMakeLists.txt.orig	2022-05-24 12:22:37.986718118 +0200
-+++ pocl-1.8/include/CL/CMakeLists.txt	2022-05-24 12:22:56.623860385 +0200
-@@ -35,6 +35,7 @@
-                 cl_ext.h
-                 cl_egl.h
-                 cl_ext_intel.h
-+                cl_ext_pocl.h
-                 cl_gl.h
-                 cl_gl_ext.h
-                 cl_half.h
diff --git a/Golden_Repo/p/pocl/pocl-1.8-GCCcore-11.2.0.eb b/Golden_Repo/p/pocl/pocl-1.8-GCCcore-11.2.0.eb
deleted file mode 100644
index 02edadd73..000000000
--- a/Golden_Repo/p/pocl/pocl-1.8-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,47 +0,0 @@
-easyblock = 'CMakeNinja'
-
-name = 'pocl'
-version = '1.8'
-
-homepage = 'https://portablecl.org'
-description = "Pocl is a portable open source (MIT-licensed) implementation of the OpenCL standard"
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://github.com/pocl/pocl/archive/']
-sources = ['v%(version)s.tar.gz']
-patches = [
-    'include_cl_header_1_8.patch',
-]
-checksums = [
-    '0f63377ae1826e16e90038fc8e7f65029be4ff6f9b059f6907174b5c0d1f8ab2',  # v1.8.tar.gz
-    'fa9de4dcf77cbc490d9f367a1eaa91a4feba1314649af107455957b96a17a57b',  # include_cl_header_1_8.patch
-]
-
-builddependencies = [
-    ('CMake', '3.21.1'),
-    ('Ninja', '1.10.2'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('CUDA', '11.5', '', SYSTEM),
-    ('Clang', '13.0.1'),
-    ('hwloc', '2.5.0'),
-    ('libtool', '2.4.6'),
-    ('libxml2', '2.9.10'),
-]
-
-separate_build_dir = True
-
-# disable attempt to find an ICD loader, always build libOpenCL.so, enable CUDA
-configopts = "-DENABLE_ICD=0 -DINSTALL_OPENCL_HEADERS=1 -DENABLE_CUDA=1 "
-# make sure we use the easybuild Clang
-configopts += "-DWITH_LLVM_CONFIG=$EBROOTCLANG/bin/llvm-config -DSTATIC_LLVM=ON"
-
-sanity_check_paths = {
-    'files': ['bin/poclcc', 'lib64/libOpenCL.%s' % SHLIB_EXT],
-    'dirs': ['include/CL', 'lib64/pkgconfig'],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/p/popt/popt-1.18.eb b/Golden_Repo/p/popt/popt-1.18.eb
deleted file mode 100644
index e6f801c8c..000000000
--- a/Golden_Repo/p/popt/popt-1.18.eb
+++ /dev/null
@@ -1,20 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'popt'
-version = '1.18'
-
-homepage = 'https://github.com/rpm-software-management/popt'
-description = 'Popt is a C library for parsing command line parameters.'
-
-toolchain = SYSTEM
-
-sources = [SOURCE_TAR_GZ]
-source_urls = ['http://ftp.rpm.org/popt/releases/popt-1.x']
-checksums = ['5159bc03a20b28ce363aa96765f37df99ea4d8850b1ece17d1e6ad5c24fdc5d1']
-
-sanity_check_paths = {
-    'files': ['include/%(name)s.h', ('lib/libpopt.a', 'lib64/libpopt.a'), ('lib/libpopt.so', 'lib64/libpopt.so')],
-    'dirs': [],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/p/pretty-yaml/pretty-yaml-20.4.0-GCCcore-11.2.0.eb b/Golden_Repo/p/pretty-yaml/pretty-yaml-20.4.0-GCCcore-11.2.0.eb
deleted file mode 100644
index 18dcc556f..000000000
--- a/Golden_Repo/p/pretty-yaml/pretty-yaml-20.4.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,31 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'pretty-yaml'
-local_mod = 'pyaml'
-version = '20.4.0'
-
-homepage = 'https://github.com/mk-fg/pretty-yaml'
-description = """PyYAML-based python module to produce pretty and readable YAML-serialized data.
-This module is for serialization only, see ruamel.yaml module for literate YAML
-parsing (keeping track of comments, spacing, line/column numbers of values, etc)."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://pypi.python.org/packages/source/p/%s/' % local_mod]
-sources = ['%s-%%(version)s.tar.gz' % local_mod]
-checksums = ['29a5c2a68660a799103d6949167bd6c7953d031449d08802386372de1db6ad71']
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('PyYAML', '5.4.1'),
-]
-
-use_pip = True
-download_dep_fail = True
-sanity_pip_check = True
-
-options = {'modulename': local_mod}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/p/protobuf-python/protobuf-python-3.17.3-GCCcore-11.2.0.eb b/Golden_Repo/p/protobuf-python/protobuf-python-3.17.3-GCCcore-11.2.0.eb
deleted file mode 100644
index 2e19a7345..000000000
--- a/Golden_Repo/p/protobuf-python/protobuf-python-3.17.3-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'protobuf-python'
-version = '3.17.3'
-
-homepage = 'https://github.com/google/protobuf/'
-description = """Python Protocol Buffers runtime library."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://pypi.python.org/packages/source/p/protobuf']
-sources = [
-    {'download_filename': 'protobuf-%(version)s.tar.gz', 'filename': SOURCE_TAR_GZ}]
-checksums = ['72804ea5eaa9c22a090d2803813e280fb273b62d5ae497aaf3553d141c4fdd7b']
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('protobuf', version)
-]
-
-download_dep_fail = True
-use_pip = True
-sanity_pip_check = True
-
-# Make sure protobuf is installed as a regular folder or it will not be found if
-# other google packages are installed in other site-packages folders
-sanity_check_paths = {
-    'files': [],
-    'dirs': ['lib/python%(pyshortver)s/site-packages/google/protobuf'],
-}
-
-options = {'modulename': 'google.protobuf'}
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/p/protobuf/protobuf-3.17.3-GCCcore-11.2.0.eb b/Golden_Repo/p/protobuf/protobuf-3.17.3-GCCcore-11.2.0.eb
deleted file mode 100644
index 4234c0d42..000000000
--- a/Golden_Repo/p/protobuf/protobuf-3.17.3-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,31 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'protobuf'
-version = '3.17.3'
-
-homepage = 'https://github.com/google/protobuf/'
-description = """Google Protocol Buffers"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://github.com/google/protobuf/archive/v%(version)s/']
-sources = [SOURCE_TAR_GZ]
-checksums = ['c6003e1d2e7fefa78a3039f19f383b4f3a61e81be8c19356f85b6461998ad3db']
-
-# sources = ['%(name)s-%(version)s_jsc.tar.gz']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1'),
-]
-
-srcdir = 'cmake'
-
-configopts = '-Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_BUILD_SHARED_LIBS=ON '
-
-sanity_check_paths = {
-    'files': ['bin/protoc', 'lib/libprotobuf.%s' % SHLIB_EXT],
-    'dirs': [],
-}
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/p/pscom/pscom-5.4-default.eb b/Golden_Repo/p/pscom/pscom-5.4-default.eb
deleted file mode 100644
index e02be54bc..000000000
--- a/Golden_Repo/p/pscom/pscom-5.4-default.eb
+++ /dev/null
@@ -1,50 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'pscom'
-# Create drop-in replacement version that ensures overriding behaviour
-version = '5.4-default'
-local_realversion = '5.4.8-1'
-homepage = 'http://www.par-tec.com'
-description = """ParaStation is a robust and efficient cluster middleware, consisting of a high-performance
-communication layer (MPI) and a sophisticated management layer.
-"""
-
-toolchain = SYSTEM
-
-source_urls = ['https://github.com/ParaStation/%(name)s/archive/']
-sources = ['%s.tar.gz' % local_realversion]
-checksums = ['16cd928de017720ce7140ec6294c883034b5bc792f67c272f87e5753403af185']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('popt', '1.18'),
-    ('CUDA', '11.5'),
-    ('CMake', '3.21.1'),
-]
-
-dependencies = [
-    ('UCX', '1.11.2'),
-]
-
-build_type = 'RelWithDebInfo'
-
-preconfigopts = 'export UCP_LDFLAGS="-L$EBROOTUCX/lib" && '
-preconfigopts += 'export CUDA_LDFLAGS="-L$EBROOTNVIDIA/lib64" &&'
-
-configopts = '-DCUDA_ENABLED=ON'
-
-sanity_check_paths = {
-    'files': [
-        'include/%(name)s.h',
-        ('lib/libpscom.so', 'lib64/libpscom.so'),
-        ('lib/libpscom4ucp.so', 'lib64/libpscom4ucp.so'),
-        ('lib/libpscom4openib.so', 'lib64/libpscom4openib.so'),
-    ],
-    'dirs': [],
-}
-
-modextravars = {
-    'PSCOMVERSION': '%s' % local_realversion,
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/p/psmpi-settings/psmpi-settings-5.5-CUDA.eb b/Golden_Repo/p/psmpi-settings/psmpi-settings-5.5-CUDA.eb
deleted file mode 100644
index d7328ccff..000000000
--- a/Golden_Repo/p/psmpi-settings/psmpi-settings-5.5-CUDA.eb
+++ /dev/null
@@ -1,41 +0,0 @@
-easyblock = 'SystemBundle'
-
-name = 'psmpi-settings'
-version = '5.5'
-versionsuffix = 'CUDA'
-
-homepage = ''
-description = '''
-This module loads the ParaStationMPI configuration. It enables UCX as a communication library and CUDA-aware features.
-'''
-
-site_contacts = 'd.alvarez@fz-juelich.de'
-
-toolchain = SYSTEM
-
-source_urls = []
-
-sources = []
-modextravars = {
-    'PSP_OPENIB': '0',
-    'PSP_UCP': '1',
-    'PSP_CUDA': '1',
-    'PSP_SHM': '0',
-    'PSP_HARD_ABORT': '1',
-}
-
-modluafooter = '''
-if mode()=="load" then
-    if isloaded("UCX-settings/RC") then
-        try_load("UCX-settings/RC-CUDA")
-    elseif isloaded("UCX-settings/UD") then
-        try_load("UCX-settings/UD-CUDA")
-    elseif isloaded("UCX-settings/DC") then
-        try_load("UCX-settings/DC-CUDA")
-    elseif not isloaded("UCX-settings") then
-        try_load("UCX-settings/RC-CUDA")
-    end
-end
-'''
-
-moduleclass = 'system'
diff --git a/Golden_Repo/p/psmpi-settings/psmpi-settings-5.5-UCX.eb b/Golden_Repo/p/psmpi-settings/psmpi-settings-5.5-UCX.eb
deleted file mode 100644
index 0f8971f2c..000000000
--- a/Golden_Repo/p/psmpi-settings/psmpi-settings-5.5-UCX.eb
+++ /dev/null
@@ -1,23 +0,0 @@
-easyblock = 'SystemBundle'
-
-name = 'psmpi-settings'
-version = '5.5'
-versionsuffix = 'UCX'
-
-homepage = ''
-description = 'This module loads the ParaStationMPI configuration. It enables UCX as a communication library.'
-
-site_contacts = 'd.alvarez@fz-juelich.de'
-
-toolchain = SYSTEM
-
-source_urls = []
-
-sources = []
-modextravars = {
-    'PSP_OPENIB': '0',
-    'PSP_UCP': '1',
-    'PSP_HARD_ABORT': '1',
-}
-
-moduleclass = 'system'
diff --git a/Golden_Repo/p/psmpi-settings/psmpi-settings-5.5-plain.eb b/Golden_Repo/p/psmpi-settings/psmpi-settings-5.5-plain.eb
deleted file mode 100644
index 9e97679f6..000000000
--- a/Golden_Repo/p/psmpi-settings/psmpi-settings-5.5-plain.eb
+++ /dev/null
@@ -1,21 +0,0 @@
-easyblock = 'SystemBundle'
-
-name = 'psmpi-settings'
-version = '5.5'
-versionsuffix = 'plain'
-
-homepage = ''
-description = 'This module loads the ParaStationMPI configuration. It relies on the defaults.'
-
-site_contacts = 'd.alvarez@fz-juelich.de'
-
-toolchain = SYSTEM
-
-source_urls = []
-
-sources = []
-modextravars = {
-    'PSP_HARD_ABORT': '1',
-}
-
-moduleclass = 'system'
diff --git a/Golden_Repo/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb b/Golden_Repo/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
deleted file mode 100644
index 764764e89..000000000
--- a/Golden_Repo/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
+++ /dev/null
@@ -1,54 +0,0 @@
-name = 'psmpi'
-version = '5.5.0-1'
-
-homepage = 'https://github.com/ParaStation/psmpi2'
-description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
-based on MPICH v3. It provides extra low level communication libraries and integration with
-various batch systems for tighter process control.
-"""
-
-toolchain = {'name': 'GCC', 'version': '11.2.0'}
-
-sources = [SOURCE_TAR_BZ2]
-source_urls = ['https://github.com/ParaStation/psmpi/archive/']
-checksums = [
-    # psmpi-5.5.0-1.tar.bz2
-    'c178bf618f139857c1bc191938677145cf4fdbec5b8d3afa2ca1de666c791b48',
-    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
-    # psmpi-5.5.0-1_ime.patch
-    'c2418b9511560dca197242508de9c7b6b117122912b6d3a4aa18398834f465ff',
-]
-
-builddependencies = [
-    # needed for autogen.sh on CentOS 7
-    ('Autotools', '20210726'),
-    # Autoconf >2.69 is generating a buggy configure script, so take it down to the one that works
-    ('Autoconf', '2.69'),
-]
-dependencies = [
-    ('pscom', '5.4-default', '', SYSTEM),
-    # needed due to the inclusion of hwloc
-    ('libxml2', '2.9.10'),
-    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
-    ('CUDA', '11.5', '', SYSTEM)
-]
-
-patches = [
-    'psmpi_shebang.patch',
-    'psmpi-5.5.0-1_ime.patch'
-]
-
-# mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
-# We disable gpfs support, since it seems to be problematic under some circumstances. One can disable it by setting
-# ROMIO_FSTYPE_FORCE="ufs:", but then we loose IME support
-mpich_opts = '--enable-static --with-file-system=ime+ufs --enable-romio'
-
-preconfigopts = "./autogen.sh && "
-preconfigopts += 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
-preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
-
-threaded = False
-
-cuda = True
-
-moduleclass = 'mpi'
diff --git a/Golden_Repo/p/psmpi/psmpi-5.5.0-1-NVHPC-22.1-mt.eb b/Golden_Repo/p/psmpi/psmpi-5.5.0-1-NVHPC-22.1-mt.eb
deleted file mode 100644
index b98b6d504..000000000
--- a/Golden_Repo/p/psmpi/psmpi-5.5.0-1-NVHPC-22.1-mt.eb
+++ /dev/null
@@ -1,55 +0,0 @@
-name = 'psmpi'
-version = '5.5.0-1'
-versionsuffix = '-mt'
-
-homepage = 'https://github.com/ParaStation/psmpi2'
-description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
-based on MPICH v3. It provides extra low level communication libraries and integration with
-various batch systems for tighter process control.
-"""
-
-toolchain = {'name': 'NVHPC', 'version': '22.1'}
-
-sources = [SOURCE_TAR_BZ2]
-source_urls = ['https://github.com/ParaStation/psmpi/archive/']
-checksums = [
-    # psmpi-5.5.0-1.tar.bz2
-    'c178bf618f139857c1bc191938677145cf4fdbec5b8d3afa2ca1de666c791b48',
-    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
-    # psmpi-5.5.0-1_ime.patch
-    'c2418b9511560dca197242508de9c7b6b117122912b6d3a4aa18398834f465ff',
-]
-
-builddependencies = [
-    # needed for autogen.sh on CentOS 7
-    ('Autotools', '20210726'),
-    # Autoconf >2.69 is generating a buggy configure script, so take it down to the one that works
-    ('Autoconf', '2.69'),
-]
-dependencies = [
-    ('pscom', '5.4-default', '', SYSTEM),
-    # needed due to the inclusion of hwloc
-    ('libxml2', '2.9.10'),
-    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
-    ('CUDA', '11.5', '', SYSTEM)
-]
-
-patches = [
-    'psmpi_shebang.patch',
-    'psmpi-5.5.0-1_ime.patch'
-]
-
-# mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
-# We disable gpfs support, since it seems to be problematic under some circumstances. One can disable it by setting
-# ROMIO_FSTYPE_FORCE="ufs:", but then we loose IME support
-mpich_opts = '--enable-static --with-file-system=ime+ufs --enable-romio'
-
-preconfigopts = "./autogen.sh && "
-preconfigopts += 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
-preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
-
-threaded = True
-
-cuda = True
-
-moduleclass = 'mpi'
diff --git a/Golden_Repo/p/psmpi/psmpi-5.5.0-1-NVHPC-22.1.eb b/Golden_Repo/p/psmpi/psmpi-5.5.0-1-NVHPC-22.1.eb
deleted file mode 100644
index ed6ac2d07..000000000
--- a/Golden_Repo/p/psmpi/psmpi-5.5.0-1-NVHPC-22.1.eb
+++ /dev/null
@@ -1,54 +0,0 @@
-name = 'psmpi'
-version = '5.5.0-1'
-
-homepage = 'https://github.com/ParaStation/psmpi2'
-description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
-based on MPICH v3. It provides extra low level communication libraries and integration with
-various batch systems for tighter process control.
-"""
-
-toolchain = {'name': 'NVHPC', 'version': '22.1'}
-
-sources = [SOURCE_TAR_BZ2]
-source_urls = ['https://github.com/ParaStation/psmpi/archive/']
-checksums = [
-    # psmpi-5.5.0-1.tar.bz2
-    'c178bf618f139857c1bc191938677145cf4fdbec5b8d3afa2ca1de666c791b48',
-    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
-    # psmpi-5.5.0-1_ime.patch
-    'c2418b9511560dca197242508de9c7b6b117122912b6d3a4aa18398834f465ff',
-]
-
-builddependencies = [
-    # needed for autogen.sh on CentOS 7
-    ('Autotools', '20210726'),
-    # Autoconf >2.69 is generating a buggy configure script, so take it down to the one that works
-    ('Autoconf', '2.69'),
-]
-dependencies = [
-    ('pscom', '5.4-default', '', SYSTEM),
-    # needed due to the inclusion of hwloc
-    ('libxml2', '2.9.10'),
-    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
-    ('CUDA', '11.5', '', SYSTEM)
-]
-
-patches = [
-    'psmpi_shebang.patch',
-    'psmpi-5.5.0-1_ime.patch'
-]
-
-# mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
-# We disable gpfs support, since it seems to be problematic under some circumstances. One can disable it by setting
-# ROMIO_FSTYPE_FORCE="ufs:", but then we loose IME support
-mpich_opts = '--enable-static --with-file-system=ime+ufs --enable-romio'
-
-preconfigopts = "./autogen.sh && "
-preconfigopts += 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
-preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
-
-threaded = False
-
-cuda = True
-
-moduleclass = 'mpi'
diff --git a/Golden_Repo/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb b/Golden_Repo/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
deleted file mode 100644
index 5d59893bc..000000000
--- a/Golden_Repo/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
+++ /dev/null
@@ -1,55 +0,0 @@
-name = 'psmpi'
-version = '5.5.0-1'
-versionsuffix = '-mt'
-
-homepage = 'https://github.com/ParaStation/psmpi2'
-description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
-based on MPICH v3. It provides extra low level communication libraries and integration with
-various batch systems for tighter process control.
-"""
-
-toolchain = {'name': 'intel-compilers', 'version': '2021.4.0'}
-
-sources = [SOURCE_TAR_BZ2]
-source_urls = ['https://github.com/ParaStation/psmpi/archive/']
-checksums = [
-    # psmpi-5.5.0-1.tar.bz2
-    'c178bf618f139857c1bc191938677145cf4fdbec5b8d3afa2ca1de666c791b48',
-    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
-    # psmpi-5.5.0-1_ime.patch
-    'c2418b9511560dca197242508de9c7b6b117122912b6d3a4aa18398834f465ff',
-]
-
-builddependencies = [
-    # needed for autogen.sh on CentOS 7
-    ('Autotools', '20210726'),
-    # Autoconf >2.69 is generating a buggy configure script, so take it down to the one that works
-    ('Autoconf', '2.69'),
-]
-dependencies = [
-    ('pscom', '5.4-default', '', SYSTEM),
-    # needed due to the inclusion of hwloc
-    ('libxml2', '2.9.10'),
-    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
-    ('CUDA', '11.5', '', SYSTEM)
-]
-
-patches = [
-    'psmpi_shebang.patch',
-    'psmpi-5.5.0-1_ime.patch'
-]
-
-# mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
-# We disable gpfs support, since it seems to be problematic under some circumstances. One can disable it by setting
-# ROMIO_FSTYPE_FORCE="ufs:", but then we loose IME support
-mpich_opts = '--enable-static --with-file-system=ime+ufs --enable-romio'
-
-preconfigopts = "./autogen.sh && "
-preconfigopts += 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
-preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
-
-threaded = True
-
-cuda = True
-
-moduleclass = 'mpi'
diff --git a/Golden_Repo/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb b/Golden_Repo/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
deleted file mode 100644
index 878ad1bed..000000000
--- a/Golden_Repo/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
+++ /dev/null
@@ -1,54 +0,0 @@
-name = 'psmpi'
-version = '5.5.0-1'
-
-homepage = 'https://github.com/ParaStation/psmpi2'
-description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
-based on MPICH v3. It provides extra low level communication libraries and integration with 
-various batch systems for tighter process control.
-"""
-
-toolchain = {'name': 'intel-compilers', 'version': '2021.4.0'}
-
-sources = [SOURCE_TAR_BZ2]
-source_urls = ['https://github.com/ParaStation/psmpi/archive/']
-checksums = [
-    # psmpi-5.5.0-1.tar.bz2
-    'c178bf618f139857c1bc191938677145cf4fdbec5b8d3afa2ca1de666c791b48',
-    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
-    # psmpi-5.5.0-1_ime.patch
-    'c2418b9511560dca197242508de9c7b6b117122912b6d3a4aa18398834f465ff',
-]
-
-builddependencies = [
-    # needed for autogen.sh on CentOS 7
-    ('Autotools', '20210726'),
-    # Autoconf >2.69 is generating a buggy configure script, so take it down to the one that works
-    ('Autoconf', '2.69'),
-]
-dependencies = [
-    ('pscom', '5.4-default', '', SYSTEM),
-    # needed due to the inclusion of hwloc
-    ('libxml2', '2.9.10'),
-    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
-    ('CUDA', '11.5', '', SYSTEM)
-]
-
-patches = [
-    'psmpi_shebang.patch',
-    'psmpi-5.5.0-1_ime.patch'
-]
-
-# mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
-# We disable gpfs support, since it seems to be problematic under some circumstances. One can disable it by setting
-# ROMIO_FSTYPE_FORCE="ufs:", but then we loose IME support
-mpich_opts = '--enable-static --with-file-system=ime+ufs --enable-romio'
-
-preconfigopts = "./autogen.sh && "
-preconfigopts += 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
-preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
-
-threaded = False
-
-cuda = True
-
-moduleclass = 'mpi'
diff --git a/Golden_Repo/p/psmpi/psmpi-5.5.0-1_ime.patch b/Golden_Repo/p/psmpi/psmpi-5.5.0-1_ime.patch
deleted file mode 100644
index 61547f3e4..000000000
--- a/Golden_Repo/p/psmpi/psmpi-5.5.0-1_ime.patch
+++ /dev/null
@@ -1,220 +0,0 @@
-diff -ruN psmpi-5.5.0-1.orig/mpich2/src/mpi/romio/adio/ad_ime/ad_ime.c psmpi-5.5.0-1/mpich2/src/mpi/romio/adio/ad_ime/ad_ime.c
---- psmpi-5.5.0-1.orig/mpich2/src/mpi/romio/adio/ad_ime/ad_ime.c	2021-10-21 20:06:57.000000000 +0200
-+++ psmpi-5.5.0-1/mpich2/src/mpi/romio/adio/ad_ime/ad_ime.c	2021-11-09 14:53:59.545886977 +0100
-@@ -10,8 +10,8 @@
- 
- struct ADIOI_Fns_struct ADIO_IME_operations = {
-     ADIOI_IME_Open,     /* Open */
--    ADIOI_SCALEABLE_OpenColl, /* OpenColl */ /*XXX*/
--        ADIOI_IME_ReadContig,   /* ReadContig */
-+    ADIOI_GEN_OpenColl, /* OpenColl */
-+    ADIOI_IME_ReadContig,   /* ReadContig */
-     ADIOI_IME_WriteContig,      /* WriteContig */
-     ADIOI_GEN_ReadStridedColl,  /* ReadStridedColl */
-     ADIOI_GEN_WriteStridedColl, /* WriteStridedColl */
-diff -ruN psmpi-5.5.0-1.orig/mpich2/src/mpi/romio/adio/ad_ime/ad_ime_common.c psmpi-5.5.0-1/mpich2/src/mpi/romio/adio/ad_ime/ad_ime_common.c
---- psmpi-5.5.0-1.orig/mpich2/src/mpi/romio/adio/ad_ime/ad_ime_common.c	2021-10-21 20:06:57.000000000 +0200
-+++ psmpi-5.5.0-1/mpich2/src/mpi/romio/adio/ad_ime/ad_ime_common.c	2021-11-09 14:53:59.545886977 +0100
-@@ -58,24 +58,38 @@
-     MPI_Attr_put(MPI_COMM_SELF, ADIOI_IME_Initialized, (void *) 0);
- }
- 
--/* Return an IME-compatible filename (add 'ime:' prefix).
-- * New filename must be free'd by the user */
--char *ADIOI_IME_Add_prefix(const char *filename)
-+/**
-+ * Return an IME-compatible filename
-+ * An absolute BFS path will get added the 'ime:' prefix.
-+ * A path on ime-fuse will be converted to a relative ime path,
-+ * with the ime:/ prefix
-+ * The returned filename must be free'd by the user
-+ */
-+char *ADIOI_IME_Convert_filename(const char *filename)
- {
--    static char myname[] = "ADIOI_IME_ADD_PREFIX";
--    size_t f_len = strlen(filename) + 1;
--    char *ime_filename = ADIOI_Malloc(f_len + ADIOI_IME_PREFIX_LEN);
-+    static char myname[] = "ADIOI_IME_CONVERT_FILENAME";
- 
--    if (!ime_filename) {
-+#if (IME_NATIVE_API_VERSION >= 131)
-+    bool is_fuse = ime_native_is_fuse_path_and_convert(filename, NULL);
-+    if (is_fuse) {
-+        return ADIOI_Strdup(filename);
-+    }
-+#endif
- 
-+    size_t f_len = strlen(filename) + 1;
-+    char *ime_filename = ADIOI_Malloc(f_len + IME_FILE_PREFIX_LEN_NO_FWD_SLASH);
-+    if (!ime_filename) {
-         MPIO_Err_create_code(MPI_SUCCESS,
-                              MPIR_ERR_FATAL,
--                             myname, __LINE__, MPI_ERR_UNKNOWN, "Error allocating memory", 0);
-+                             myname, __LINE__, MPI_ERR_UNKNOWN,
-+                             "Error allocating memory", 0);
- 
-         return NULL;
-     }
- 
--    ADIOI_Strncpy(ime_filename, ADIOI_IME_PREFIX, ADIOI_IME_PREFIX_LEN);
--    ADIOI_Strncpy((ime_filename + ADIOI_IME_PREFIX_LEN), filename, f_len);
-+    ADIOI_Strncpy(ime_filename, DEFAULT_IME_PREFIX_NO_FWD_SLASH,
-+                  IME_FILE_PREFIX_LEN_NO_FWD_SLASH);
-+    ADIOI_Strncpy((ime_filename + IME_FILE_PREFIX_LEN_NO_FWD_SLASH),
-+                  filename, f_len);
-     return ime_filename;
- }
-diff -ruN psmpi-5.5.0-1.orig/mpich2/src/mpi/romio/adio/ad_ime/ad_ime_common.h psmpi-5.5.0-1/mpich2/src/mpi/romio/adio/ad_ime/ad_ime_common.h
---- psmpi-5.5.0-1.orig/mpich2/src/mpi/romio/adio/ad_ime/ad_ime_common.h	2021-10-21 20:06:57.000000000 +0200
-+++ psmpi-5.5.0-1/mpich2/src/mpi/romio/adio/ad_ime/ad_ime_common.h	2021-11-09 14:53:59.545886977 +0100
-@@ -17,5 +17,5 @@
- void ADIOI_IME_End(int *error_code);
- int ADIOI_IME_End_call(MPI_Comm comm, int keyval, void *attribute_val, void *extra_state);
- 
--char *ADIOI_IME_Add_prefix(const char *filename);
-+char *ADIOI_IME_Convert_filename(const char *filename);
- #endif /* AD_IME_COMMON_H_INCLUDED */
-diff -ruN psmpi-5.5.0-1.orig/mpich2/src/mpi/romio/adio/ad_ime/ad_ime_delete.c psmpi-5.5.0-1/mpich2/src/mpi/romio/adio/ad_ime/ad_ime_delete.c
---- psmpi-5.5.0-1.orig/mpich2/src/mpi/romio/adio/ad_ime/ad_ime_delete.c	2021-10-21 20:06:57.000000000 +0200
-+++ psmpi-5.5.0-1/mpich2/src/mpi/romio/adio/ad_ime/ad_ime_delete.c	2021-11-09 14:53:59.545886977 +0100
-@@ -13,7 +13,7 @@
-     int ret;
-     static char myname[] = "ADIOI_IME_DELETE";
- 
--    char *ime_filename = ADIOI_IME_Add_prefix(filename);
-+    char *ime_filename = ADIOI_IME_Convert_filename(filename);
-     ret = ime_native_unlink(ime_filename);
-     ADIOI_Free(ime_filename);
-     if (ret)
-diff -ruN psmpi-5.5.0-1.orig/mpich2/src/mpi/romio/adio/ad_ime/ad_ime.h psmpi-5.5.0-1/mpich2/src/mpi/romio/adio/ad_ime/ad_ime.h
---- psmpi-5.5.0-1.orig/mpich2/src/mpi/romio/adio/ad_ime/ad_ime.h	2021-10-21 20:06:57.000000000 +0200
-+++ psmpi-5.5.0-1/mpich2/src/mpi/romio/adio/ad_ime/ad_ime.h	2021-11-09 14:53:59.545886977 +0100
-@@ -7,9 +7,7 @@
- #define AD_IME_H_INCLUDED
- 
- #include "adio.h"
--#ifdef HAVE_IME_NATIVE_H
- #include "ime_native.h"
--#endif
- 
- #define ADIOI_IME_PREFIX        "ime:"
- #define ADIOI_IME_PREFIX_LEN    (sizeof(ADIOI_IME_PREFIX) - 1)
-diff -ruN psmpi-5.5.0-1.orig/mpich2/src/mpi/romio/adio/ad_ime/ad_ime_open.c psmpi-5.5.0-1/mpich2/src/mpi/romio/adio/ad_ime/ad_ime_open.c
---- psmpi-5.5.0-1.orig/mpich2/src/mpi/romio/adio/ad_ime/ad_ime_open.c	2021-10-21 20:06:57.000000000 +0200
-+++ psmpi-5.5.0-1/mpich2/src/mpi/romio/adio/ad_ime/ad_ime_open.c	2021-11-09 14:53:59.545886977 +0100
-@@ -68,7 +68,7 @@
-         return;
-     }
- 
--    ime_fs->ime_filename = ADIOI_IME_Add_prefix(fd->filename);
-+    ime_fs->ime_filename = ADIOI_IME_Convert_filename(fd->filename);
- 
-     /* all processes open the file */
-     ret = ime_native_open(ime_fs->ime_filename, amode, perm);
-diff -ruN psmpi-5.5.0-1.orig/mpich2/src/mpi/romio/adio/common/ad_fstype.c psmpi-5.5.0-1/mpich2/src/mpi/romio/adio/common/ad_fstype.c
---- psmpi-5.5.0-1.orig/mpich2/src/mpi/romio/adio/common/ad_fstype.c	2021-10-21 20:06:57.000000000 +0200
-+++ psmpi-5.5.0-1/mpich2/src/mpi/romio/adio/common/ad_fstype.c	2021-11-09 14:53:59.545886977 +0100
-@@ -97,6 +97,20 @@
- #define DAOS_SUPER_MAGIC (0xDA05AD10)
- #endif
- 
-+# if defined(ROMIO_IME)
-+/* fuse super magic is somehow missing in system includes */
-+# if !defined(FUSE_SUPER_MAGIC)
-+# define FUSE_SUPER_MAGIC 0x65735546
-+# endif
-+# include "ime_native.h"
-+# if (IME_NATIVE_API_VERSION) >= 131
-+# include "ime_ioctl.h"
-+
-+/* Disable auto-switching from posix to IME */
-+#define IME_NO_AUTO_NATIVE "IME_NO_AUTO_NATIVE"
-+# endif
-+# endif /* ROMIO_IME */
-+
- #ifdef ROMIO_HAVE_STRUCT_STATVFS_WITH_F_BASETYPE
- #ifdef HAVE_SYS_STATVFS_H
- #include <sys/statvfs.h>
-@@ -486,6 +500,39 @@
-     }
- #endif
- 
-+#ifdef FUSE_SUPER_MAGIC
-+    if (fsbuf.f_type == FUSE_SUPER_MAGIC) {
-+        /* fuse does not allow to override FUSE_SUPER_MAGIC
-+         * Any file system that is fused based needs to hook in
-+         * here and use its own ioctl.
-+         */
-+        #if defined ROMIO_IME && defined IM_FIOC_GET_F_TYPE
-+        char *dir;
-+        ADIO_FileSysType_parentdir(filename, &dir);
-+        int fd = open(dir, O_RDONLY);
-+        if (fd == -1)
-+        {
-+            /* dir should typically work, but try to fail back to
-+             * filename if it somehow failed
-+             */
-+            fd = open(filename, O_RDONLY);
-+        }
-+
-+        if (fd >= 0) {
-+            uint32_t f_type;
-+            int rc = ioctl(fd, IM_FIOC_GET_F_TYPE, &f_type);
-+            close(fd);
-+            if (rc == 0 && f_type == IME_SUPER_MAGIC &&
-+                getenv(IME_NO_AUTO_NATIVE) == NULL) {
-+                *fstype = ADIO_IME;
-+                return;
-+            }
-+        }
-+        #endif /* ROMIO_IME */
-+    }
-+#endif /* FUSE_SUPER_MAGIC */
-+
-+
- #endif /*ROMIO_HAVE_STRUCT_STATFS_WITH_F_TYPE */
- 
- #ifdef ROMIO_UFS
-diff -ruN psmpi-5.5.0-1.orig/mpich2/src/mpi/romio/configure.ac psmpi-5.5.0-1/mpich2/src/mpi/romio/configure.ac
---- psmpi-5.5.0-1.orig/mpich2/src/mpi/romio/configure.ac	2021-10-21 20:06:57.000000000 +0200
-+++ psmpi-5.5.0-1/mpich2/src/mpi/romio/configure.ac	2021-11-09 14:54:27.824926093 +0100
-@@ -231,6 +231,8 @@
- --with-pvfs2=path - Path to installation of PVFS (version 2)],,)
- AC_ARG_WITH(mpi-impl,[
- --with-mpi-impl=name - Specify MPI implementation to build ROMIO for],,)
-+AC_ARG_WITH(ime,[
-+--with-ime=PATH - Path to installation of IME],,)
- dnl
- AC_ARG_WITH(mpi, [
- --with-mpi=path   - Path to instalation of MPI (headers, libs, etc)],,)
-@@ -806,6 +808,30 @@
-     fi
- fi
- 
-+#
-+# IME specific build path.
-+# Automatically adds IME to the file systems if not present
-+#
-+if test -n "${with_ime}" ; then
-+   AC_SUBST(IME_INSTALL_PATH, ["${with_ime}"])
-+fi
-+
-+ime_default_path="/opt/ddn/ime"
-+if test -n "${with_ime}" -o -e "${ime_default_path}/include/ime_native.h"; then
-+   # Use IME and the default path, if not specified or overriden
-+   with_ime="${ime_default_path}"
-+   file_system_ime=1
-+fi
-+
-+if test -n "${file_system_ime}" ; then
-+    CFLAGS="$CFLAGS -I${with_ime}/include"
-+    CPPFLAGS="$CPPFLAGS -I${with_ime}/include"
-+    LDFLAGS="$LDFLAGS -L${with_ime}/lib"
-+    LIBS="-lim_client -lim_common"
-+    export LD_LIBRARY_PATH="${with_ime}/lib:$LD_LIBRARY_PATH"
-+fi
-+
-+
- #############################################
- # This PVFS2 logic is special because it's hard to get it right if it comes
- # before the known_filesystems check loop above.  So we handle it down here,
diff --git a/Golden_Repo/p/psmpi/psmpi_shebang.patch b/Golden_Repo/p/psmpi/psmpi_shebang.patch
deleted file mode 100644
index 3fa1addb4..000000000
--- a/Golden_Repo/p/psmpi/psmpi_shebang.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ruN psmpi-5.2.0-1.old/mpich2/src/env/mpicc.bash.in psmpi-5.2.0-1/mpich2/src/env/mpicc.bash.in
---- psmpi-5.2.0-1.old/mpich2/src/env/mpicc.bash.in	2017-03-08 20:47:13.159276458 +0100
-+++ psmpi-5.2.0-1/mpich2/src/env/mpicc.bash.in	2017-03-08 20:47:48.430966270 +0100
-@@ -1,4 +1,4 @@
--#! @BASH_SHELL@
-+#!/usr/bin/env bash
- ##
- ## (C) 2006 by Argonne National Laboratory.
- ##     See COPYRIGHT in top-level directory.
-diff -ruN psmpi-5.2.0-1.old/mpich2/src/env/mpicxx.bash.in psmpi-5.2.0-1/mpich2/src/env/mpicxx.bash.in
---- psmpi-5.2.0-1.old/mpich2/src/env/mpicxx.bash.in	2017-03-08 20:47:13.160276506 +0100
-+++ psmpi-5.2.0-1/mpich2/src/env/mpicxx.bash.in	2017-03-08 20:47:51.549115658 +0100
-@@ -1,4 +1,4 @@
--#! @BASH_SHELL@
-+#!/usr/bin/env bash
- ##
- ## (C) 2006 by Argonne National Laboratory.
- ##     See COPYRIGHT in top-level directory.
-diff -ruN psmpi-5.2.0-1.old/mpich2/src/env/mpif77.bash.in psmpi-5.2.0-1/mpich2/src/env/mpif77.bash.in
---- psmpi-5.2.0-1.old/mpich2/src/env/mpif77.bash.in	2017-03-08 20:47:13.160276506 +0100
-+++ psmpi-5.2.0-1/mpich2/src/env/mpif77.bash.in	2017-03-08 20:47:55.148288103 +0100
-@@ -1,4 +1,4 @@
--#! @BASH_SHELL@
-+#!/usr/bin/env bash
- ##
- ## (C) 2006 by Argonne National Laboratory.
- ##     See COPYRIGHT in top-level directory.
-diff -ruN psmpi-5.2.0-1.old/mpich2/src/env/mpifort.bash.in psmpi-5.2.0-1/mpich2/src/env/mpifort.bash.in
---- psmpi-5.2.0-1.old/mpich2/src/env/mpifort.bash.in	2017-03-08 20:47:13.160276506 +0100
-+++ psmpi-5.2.0-1/mpich2/src/env/mpifort.bash.in	2017-03-08 20:48:08.913947609 +0100
-@@ -1,4 +1,4 @@
--#! @BASH_SHELL@
-+#!/usr/bin/env bash
- ##
- ## (C) 2006 by Argonne National Laboratory.
- ##     See COPYRIGHT in top-level directory.
diff --git a/Golden_Repo/p/pybind11/pybind11-2.7.1-GCCcore-11.2.0.eb b/Golden_Repo/p/pybind11/pybind11-2.7.1-GCCcore-11.2.0.eb
deleted file mode 100644
index b04d5c7b9..000000000
--- a/Golden_Repo/p/pybind11/pybind11-2.7.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,23 +0,0 @@
-name = 'pybind11'
-version = '2.7.1'
-
-homepage = 'https://pybind11.readthedocs.io'
-description = """pybind11 is a lightweight header-only library that exposes C++ types in Python and vice versa,
- mainly to create Python bindings of existing C++ code."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://github.com/pybind/pybind11/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['616d1c42e4cf14fa27b2a4ff759d7d7b33006fdc5ad8fd603bb2c22622f27020']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1'),
-    ('Eigen', '3.3.9'),
-]
-dependencies = [('Python', '3.9.6')]
-
-configopts = "-DPYTHON_EXECUTABLE=$EBROOTPYTHON/bin/python"
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/p/pyproj/pyproj-3.3.0-GCCcore-11.2.0.eb b/Golden_Repo/p/pyproj/pyproj-3.3.0-GCCcore-11.2.0.eb
deleted file mode 100644
index 20728600b..000000000
--- a/Golden_Repo/p/pyproj/pyproj-3.3.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,37 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'pyproj'
-version = '3.3.0'
-
-homepage = 'https://pyproj4.github.io/pyproj'
-description = "Python interface to PROJ4 library for cartographic transformations"
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-sources = [SOURCE_TAR_GZ]
-checksums = ['ce8bfbc212729e9a643f5f5d77f7a93394e032eda1e2d8799ae902d08add747e']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('PROJ', '8.1.0'),
-]
-
-download_dep_fail = True
-use_pip = True
-
-preinstallopts = "export PROJ_DIR=$EBROOTPROJ && "
-
-sanity_check_paths = {
-    'files': ['bin/pyproj'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-sanity_check_commands = ['pyproj --help']
-
-sanity_pip_check = True
-
-moduleclass = 'data'
diff --git a/Golden_Repo/p/pytest-xdist/pytest-xdist-2.5.0-GCCcore-11.2.0.eb b/Golden_Repo/p/pytest-xdist/pytest-xdist-2.5.0-GCCcore-11.2.0.eb
deleted file mode 100644
index 073e6f7d2..000000000
--- a/Golden_Repo/p/pytest-xdist/pytest-xdist-2.5.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,62 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'pytest-xdist'
-version = '2.5.0'
-
-homepage = 'https://github.com/pytest-dev/pytest-xdist'
-description = """xdist: pytest distributed testing plugin
-
-The pytest-xdist plugin extends pytest with some unique test execution modes:
-
-    * test run parallelization: if you have multiple CPUs or hosts you
-      can use those for a combined test run. This allows to speed up
-      development or to use special resources of remote machines.
-
-    * --looponfail: run your tests repeatedly in a subprocess. After
-        each run pytest waits until a file in your project changes and
-        then re-runs the previously failing tests. This is repeated
-        until all tests pass after which again a full run is
-        performed.
-
-    * Multi-Platform coverage: you can specify different Python
-      interpreters or different platforms and run tests in parallel on
-      all of them.
-
-Before running tests remotely, pytest efficiently “rsyncs” your
-program source code to the remote place. All test results are reported
-back and displayed to your local terminal. You may specify different
-Python versions and interpreters."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [
-    ('Python', '3.9.6'),
-]
-
-use_pip = True
-sanity_pip_check = True
-
-exts_list = [
-    ('apipkg', '1.5', {
-        'checksums': ['37228cda29411948b422fae072f57e31d3396d2ee1c9783775980ee9c9990af6'],
-    }),
-    ('execnet', '1.9.0', {
-        'checksums': ['8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5'],
-    }),
-    ('pytest-forked', '1.4.0', {
-        'checksums': ['8b67587c8f98cbbadfdd804539ed5455b6ed03802203485dd2f53c1422d7440e'],
-    }),
-    (name, version, {
-        'modulename': 'xdist',
-        'checksums': ['4580deca3ff04ddb2ac53eba39d76cb5dd5edeac050cb6fbc768b0dd712b4edf'],
-    }),
-]
-
-sanity_check_paths = {
-    'files': [],
-    'dirs': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/p/pyvips/pyvips-2.2.1-GCCcore-11.2.0.eb b/Golden_Repo/p/pyvips/pyvips-2.2.1-GCCcore-11.2.0.eb
deleted file mode 100644
index 8526f737c..000000000
--- a/Golden_Repo/p/pyvips/pyvips-2.2.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,31 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'pyvips'
-version = '2.2.1'
-
-homepage = 'https://github.com/libvips/pyvips/tags'
-description = """Pyvips is the python bindings for libvips: a demand-driven, 
-            horizontally threaded image processing library."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://github.com/libvips/pyvips/archive']
-sources = ['v%(version)s.tar.gz']
-checksums = ['37a0fc33556a1057ba05dc5a6f3029975539c5f0b63bd84ecd6eae3862898103']
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('OpenSlide', '3.4.1'),
-    ('libvips', '8.13.1'),
-    ('pkgconfig', '1.5.5', '-python'),
-]
-
-use_pip = True
-download_dep_fail = True
-sanity_pip_check = True
-
-options = {'modulename': 'pyvips'}
-
-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
deleted file mode 100644
index 14e2a0d4b..000000000
--- a/Golden_Repo/q/Qhull/Qhull-2020.2-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,40 +0,0 @@
-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/q/Qiskit-juqcs/Qiskit-juqcs-0.5.0-gpsmkl-2021b.eb b/Golden_Repo/q/Qiskit-juqcs/Qiskit-juqcs-0.5.0-gpsmkl-2021b.eb
deleted file mode 100644
index 74f13226b..000000000
--- a/Golden_Repo/q/Qiskit-juqcs/Qiskit-juqcs-0.5.0-gpsmkl-2021b.eb
+++ /dev/null
@@ -1,39 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'Qiskit-juqcs'
-version = '0.5.0'
-
-homepage = 'https://jugit.fz-juelich.de/qip/juniq-platform/qiskit-juqcs/'
-description = """Qiskit provider for JUQCS (Juelich Universal Quantum Computer Simulator)."""
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-toolchainopts = {'pic': True}
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('Qiskit', '0.36.2'),
-]
-
-exts_default_options = {
-    'source_urls': [PYPI_SOURCE],
-    'use_pip': True,
-    'sanity_pip_check': True,
-    'download_dep_fail': True,
-    'use_pip_for_deps': False,
-}
-
-exts_list = [
-    ('PyJWT', '1.7.1', {
-        'modulename': 'jwt',
-        'checksums': ['8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96'],
-    }),
-    ('pyunicore', '0.9.18', {
-        'checksums': ['d4675e4594777795ac7d70798955695a321f6e0feeda5e02070b12c233ff41c5'],
-    }),
-    ('qiskit-juqcs', version, {
-        'modulename': False,
-        'checksums': ['6d8800986d5924e2e07635a315d15bfbc48297649604c83a4ec282ea7d6ba737'],
-    }),
-]
-
-moduleclass = 'quantum'
diff --git a/Golden_Repo/q/Qiskit/Qiskit-0.36.2-gpsmkl-2021b.eb b/Golden_Repo/q/Qiskit/Qiskit-0.36.2-gpsmkl-2021b.eb
deleted file mode 100644
index 8c3212703..000000000
--- a/Golden_Repo/q/Qiskit/Qiskit-0.36.2-gpsmkl-2021b.eb
+++ /dev/null
@@ -1,191 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'Qiskit'
-version = '0.36.2'
-
-# Qiskit package versions
-local_terraver = '0.20.2'
-local_ignisver = '0.7.1'
-local_ibmqproviderver = '0.19.1'
-local_optimizationver = '0.3.2'
-local_financever = '0.3.1'
-local_naturever = '0.3.2'
-local_machinelearningver = '0.4.0'
-local_aerver = '0.10.4'
-
-homepage = 'https://qiskit.org'
-description = """Qiskit is an open-source framework for working with noisy quantum computers
- at the level of pulses, circuits, and algorithms."""
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1', '', SYSTEM),
-    ('Ninja', '1.10.2'),
-    ('pkg-config', '0.29.2'),
-    ('pybind11', '2.7.1'),  # for aer
-    ('Rust', '1.54.0'),  # for retworkx
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-Stack', '2021b', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('scikit-build', '0.11.1'),  # for aer
-    ('scikit-learn', '1.0.1', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('CVXOPT', '1.2.7'),
-    ('h5py', '3.5.0', '-serial'),
-    ('PySCF', '2.0.1'),
-    ('SymEngine-python', '0.9.2', '', ('GCC', '11.2.0')),
-    ('numba', '0.55.1', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('nlohmann-json', '3.10.4'),  # for qiskit-aer
-    ('spdlog', '1.9.2'),
-    ('muparserx', '4.0.8'),  # for qiskit-aer
-]
-
-local_common_opts = {
-    'req_py_majver': '3',
-    'req_py_minver': '0'
-}
-
-# qiskit-aer must not use CONAN to install dependencies
-modextravars = {'DISABLE_CONAN': 'YES'}
-
-exts_default_options = {
-    'source_urls': [PYPI_SOURCE],
-    'use_pip': True,
-    # DISABLED: because 'pip check' does not find pyscf (not installed with pip)
-    'sanity_pip_check': True,
-    'download_dep_fail': True,
-    'use_pip_for_deps': False,
-}
-
-exts_list = [
-    ('dill', '0.3.4', {
-        'source_tmpl': '%(name)s-%(version)s.zip',
-        'checksums': ['9f9734205146b2b353ab3fec9af0070237b6ddae78452af83d2fca84d739e675'],
-    }),
-    ('marshmallow', '3.13.0', {
-        'checksums': ['c67929438fd73a2be92128caa0325b1b5ed8b626d91a094d2f7f2771bf1f1c0e'],
-    }),
-    ('ply', '3.11', {
-        'checksums': ['00c7c1aaa88358b9c765b6d3000c6eec0ba42abca5351b095321aef446081da3'],
-    }),
-    ('marshmallow-polyfield', '5.10', {
-        'checksums': ['75d0e31b725650e91428f975a66ed30f703cc6f9fcfe45b8436ee6d676921691'],
-    }),
-    ('pylatexenc', '2.10', {
-        'checksums': ['3dd8fd84eb46dc30bee1e23eaab8d8fb5a7f507347b23e5f38ad9675c84f40d3'],
-    }),
-    ('fastdtw', '0.3.4', {
-        'checksums': ['2350fa6ec36bcad186eaf81f46eff35181baf04e324f522de8aeb43d0243f64f'],
-    }),
-    ('dlx', '1.0.4', {
-        'checksums': ['ef75bc9d590216ebde7d4811f9ae6b2d6c6dc2a54772d94ae13384dc517a5aae'],
-    }),
-    ('docloud', '1.0.375', {
-        'checksums': ['996d55407498fd01e6c6c480f367048f92255e9ca9db0e9ea19aaef91328a441'],
-    }),
-    ('docplex', '2.22.213', {
-        'checksums': ['8a86bba42b5b65f2e0f88ed350115efeb783b444661e2cfcf3a67d5c59bcb0bd'],
-    }),
-    ('websockets', '10.0', {
-        'checksums': ['c4fc9a1d242317892590abe5b61a9127f1a61740477bfb121743f290b8054002'],
-    }),
-    ('ntlm-auth', '1.5.0', {
-        'checksums': ['c9667d361dc09f6b3750283d503c689070ff7d89f2f6ff0d38088d5436ff8543'],
-    }),
-    ('requests_ntlm', '1.1.0', {
-        'checksums': ['9189c92e8c61ae91402a64b972c4802b2457ce6a799d658256ebf084d5c7eb71'],
-    }),
-    ('nest-asyncio', '1.5.1', {
-        'source_tmpl': 'nest_asyncio-%(version)s.tar.gz',
-        'checksums': ['afc5a1c515210a23c461932765691ad39e8eba6551c055ac8d5546e69250d0aa'],
-    }),
-    ('python-constraint', '1.4.0', {
-        'modulename': 'constraint',
-        'source_tmpl': '%(name)s-%(version)s.tar.bz2',
-        'checksums': ['501d6f17afe0032dfc6ea6c0f8acc12e44f992733f00e8538961031ef27ccb8e'],
-    }),
-    ('sparse', '0.13.0', {
-        'checksums': ['685dc994aa770ee1b23f2d5392819c8429f27958771f8dceb2c4fb80210d5915'],
-    }),
-    ('fastjsonschema', '2.15.1', {
-        'checksums': ['671f36d225b3493629b5e789428660109528f373cf4b8a22bac6fa2f8191c2d2'],
-    }),
-    ('tweedledum', '1.1.1', {
-        'checksums': ['58d6f7a988b10c31be3faa1faf3e58288ef7e8159584bfa6ded45742f390309f'],
-    }),
-    ('websocket-client', '1.2.1', {
-        'modulename': 'websocket',
-        'checksums': ['8dfb715d8a992f5712fff8c843adae94e22b22a99b2c5e6b0ec4a1a981cc4e0d'],
-    }),
-    ('multitasking', '0.0.9', {
-        'checksums': ['b59d99f709d2e17d60ccaa2be09771b6e9ed9391c63f083c0701e724f624d2e0'],
-    }),
-    ('yfinance', '0.1.63', {
-        'checksums': ['11364fe94f1cf7811c45fc620acb61c8c45fcb88de317c7718bbdbc9c1573a4c'],
-    }),
-    ('semantic_version', '2.8.5', {
-        'checksums': ['d2cb2de0558762934679b9a104e82eca7af448c9f4974d1f3eeccff651df8a54'],
-    }),
-    ('setuptools-rust', '0.11.6', {
-        'checksums': ['a5b5954909cbc5d66b914ee6763f81fa2610916041c7266105a469f504a7c4ca'],
-    }),
-    ('retworkx', '0.11.0', {
-        'checksums': ['a4c2a5ad3f8402493d41ad20ad91a03777ea214a3636c290272bbfaf36161161'],
-    }),
-    ('stevedore', '3.5.0', {
-        'checksums': ['f40253887d8712eaa2bb0ea3830374416736dc8ec0e22f5a65092c1174c44335'],
-    }),
-    ('qiskit-terra', local_terraver, {
-        'modulename': 'qiskit.qobj',
-        'patches': ['qiskit-terra-0.18.3_fix-qiskit-version-env.patch'],
-        'checksums': [
-            # qiskit-terra-0.20.2.tar.gz
-            'e38a932b389108fae87788af308748f64ecbc63a6f3b68849ff91ebd6cb2c09d',
-            # qiskit-terra-0.18.3_fix-qiskit-version-env.patch
-            '1296cc650a7d4d2d908a6a5de6b4ce52106748464a54d47744a4648494f4c24e',
-        ],
-    }),
-    ('qiskit-ignis', local_ignisver, {
-        'modulename': 'qiskit.ignis',
-        'checksums': ['71efb17933717c0b8161a291ebd4f8d4fe8d7dfd1fdc66fa23a0b6d14fd10cf3'],
-    }),
-    ('qiskit-ibmq-provider', local_ibmqproviderver, {
-        'modulename': 'qiskit.providers.ibmq',
-        'checksums': ['67e361f169e2a816904c0a2fa62ff8a843675ff64f57ba9571986206f49f1f31'],
-    }),
-    ('qiskit-optimization', local_optimizationver, {
-        'modulename': 'qiskit_optimization',
-        'checksums': ['3dbddb32e653eff7e5eab2ac415f74214a68b04c44befbb33252ac5377899ed1'],
-    }),
-    ('inflection', '0.5.1', {
-        'checksums': ['1a29730d366e996aaacffb2f1f1cb9593dc38e2ddd30c91250c6dde09ea9b417'],
-    }),
-    ('Quandl', '3.7.0', {
-        'checksums': ['6e0b82fbc7861610b3577c5397277c4220e065eee0fed4e46cd6b6021655b64c'],
-    }),
-    ('qiskit-finance', local_financever, {
-        'modulename': 'qiskit_finance',
-        'checksums': ['aa8355ba87fbc8e8115be2f08396f9701bffbebeeb32c1decca67b5aaec6729e'],
-    }),
-    ('qiskit-nature', local_naturever, {
-        'modulename': 'qiskit_nature',
-        'checksums': ['499361d562d7c6da3e4293032d4b18d16cc9b2874ef4593ee67136db03c5ede0'],
-    }),
-    ('qiskit-machine-learning', local_machinelearningver, {
-        'modulename': 'qiskit_machine_learning',
-        'checksums': ['8534b4cbc8cebaf527487f3a91606f9adc0c4aef8ceb3b91d428203b6a0f5377'],
-    }),
-    ('qiskit-aer', local_aerver, {
-        'modulename': 'qiskit.providers.aer',
-        'checksums': ['55d43ff4338c2d20c13ddec9b476c7032afe5610df25a254505cde675c4d5c34'],
-    }),
-    ('qiskit', version, {
-        'checksums': ['cd373e3fe3cf3ebbabd14caaf9e512f994ab2466ced03abce4167018f4913ee8'],
-    }),
-]
-
-moduleclass = 'quantum'
diff --git a/Golden_Repo/q/Qt5/Qt5-5.13.1_fix-avx2.patch b/Golden_Repo/q/Qt5/Qt5-5.13.1_fix-avx2.patch
deleted file mode 100644
index a2c9a0cdf..000000000
--- a/Golden_Repo/q/Qt5/Qt5-5.13.1_fix-avx2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-build qdrawhelper_avx2.cpp with -mavx2 rather than -march=core-avx2 to avoid compilation failures on non-AVX2 systems
-cfr. https://bugreports.qt.io/browse/QTBUG-71564 (and https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69471)
-author: Kenneth Hoste (HPC-UGent)
---- qt-everywhere-src-5.12.3.orig/qtbase/mkspecs/common/gcc-base.conf	2019-04-09 11:51:26.000000000 +0200
-+++ qt-everywhere-src-5.12.3/qtbase/mkspecs/common/gcc-base.conf	2019-05-01 19:21:50.683489624 +0200
-@@ -109,7 +109,7 @@
- QMAKE_CFLAGS_MIPS_DSPR2 += -mdspr2
- 
- # -march=haswell is supported as of GCC 4.9 and Clang 3.6
--QMAKE_CFLAGS_ARCH_HASWELL           = -march=core-avx2
-+QMAKE_CFLAGS_ARCH_HASWELL           = -mavx2
- 
- # Wrapper tools that understand .o/.a files with GIMPLE instead of machine code
- QMAKE_AR_LTCG           = gcc-ar cqs
diff --git a/Golden_Repo/q/Qt5/Qt5-5.13.1_fix-qmake-libdir.patch b/Golden_Repo/q/Qt5/Qt5-5.13.1_fix-qmake-libdir.patch
deleted file mode 100644
index cd12eeb29..000000000
--- a/Golden_Repo/q/Qt5/Qt5-5.13.1_fix-qmake-libdir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-replaces hardcoded paths to xlib and opengl by EB paths in qmake.conf
-author: Alex Domingo, originally written for Qt-5.12.3, see pr #8544
-diff -Nru qtbase/mkspecs/linux-g++-64/qmake.conf qtbase/mkspecs/linux-g++-64/qmake.conf
---- qtbase/mkspecs/linux-g++-64/qmake.conf	2019-04-09 11:51:26.000000000 +0200
-+++ qtbase/mkspecs/linux-g++-64/qmake.conf	2019-06-04 00:26:20.921468000 +0200
-@@ -18,7 +18,7 @@
- include(../common/g++-unix.conf)
- 
- 
--QMAKE_LIBDIR_X11        = /usr/X11R6/lib64
--QMAKE_LIBDIR_OPENGL     = /usr/X11R6/lib64
-+QMAKE_LIBDIR_X11        = $$(EBROOTX11)/lib
-+QMAKE_LIBDIR_OPENGL     = $$(EBROOTLIBGLU)/lib
- 
- load(qt_config)
-diff -Nru qtbase/mkspecs/linux-icc-64/qmake.conf qtbase/mkspecs/linux-icc-64/qmake.conf
---- qtbase/mkspecs/linux-icc-64/qmake.conf	2019-04-09 11:51:26.000000000 +0200
-+++ qtbase/mkspecs/linux-icc-64/qmake.conf	2019-06-04 00:28:29.070834000 +0200
-@@ -12,5 +12,5 @@
- 
- # Change the all LIBDIR variables to use lib64 instead of lib
- 
--QMAKE_LIBDIR_X11        = /usr/X11R6/lib64
--QMAKE_LIBDIR_OPENGL     = /usr/X11R6/lib64
-+QMAKE_LIBDIR_X11        = $$(EBROOTX11)/lib
-+QMAKE_LIBDIR_OPENGL     = $$(EBROOTLIBGLU)/lib
-diff -Nru qtbase/mkspecs/openbsd-g++/qmake.conf qtbase/mkspecs/openbsd-g++/qmake.conf
---- qtbase/mkspecs/openbsd-g++/qmake.conf	2019-04-09 11:51:26.000000000 +0200
-+++ qtbase/mkspecs/openbsd-g++/qmake.conf	2019-06-04 00:31:07.877995000 +0200
-@@ -12,10 +12,10 @@
- QMAKE_LIBDIR_POST       = /usr/local/lib
- 
- # System provided X11 defaults to X11R6 path on OpenBSD
--QMAKE_INCDIR_X11        = /usr/X11R6/include
--QMAKE_LIBDIR_X11        = /usr/X11R6/lib
--QMAKE_INCDIR_OPENGL     = /usr/X11R6/include
--QMAKE_LIBDIR_OPENGL     = /usr/X11R6/lib
-+QMAKE_INCDIR_X11        = $$(EBROOTX11)/include
-+QMAKE_LIBDIR_X11        = $$(EBROOTX11)/lib
-+QMAKE_INCDIR_OPENGL     = $$(EBROOTLIBGLU)/include
-+QMAKE_LIBDIR_OPENGL     = $$(EBROOTLIBGLU)/lib
- 
- QMAKE_RPATHDIR         += $$QMAKE_LIBDIR_X11
- 
diff --git a/Golden_Repo/q/Qt5/Qt5-5.14.2_fix-std-runtime_error.patch b/Golden_Repo/q/Qt5/Qt5-5.14.2_fix-std-runtime_error.patch
deleted file mode 100644
index b2d883517..000000000
--- a/Golden_Repo/q/Qt5/Qt5-5.14.2_fix-std-runtime_error.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-qtlocation fix "error: 'runtime_error' is not a member of 'std'"
-Patch by Simon Branford, University of Birmingham
---- qtlocation/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp.orig	2021-01-14 19:41:10.485471000 +0000
-+++ qtlocation/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp	2021-01-14 19:41:18.997592000 +0000
-@@ -5,6 +5,7 @@
- #include <unicode/ushape.h>
- 
- #include <memory>
-+#include <stdexcept>
- 
- namespace mbgl {
- 
diff --git a/Golden_Repo/q/Qt5/Qt5-5.15.2-GCCcore-11.2.0.eb b/Golden_Repo/q/Qt5/Qt5-5.15.2-GCCcore-11.2.0.eb
deleted file mode 100644
index 18f2226ad..000000000
--- a/Golden_Repo/q/Qt5/Qt5-5.15.2-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,83 +0,0 @@
-easyblock = 'EB_Qt'
-
-name = 'Qt5'
-version = '5.15.2'
-
-homepage = 'https://qt.io/'
-description = "Qt is a comprehensive cross-platform C++ application framework."
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-# disabling use of -ftree-vectorize is required to avoid compilation failures on some systems (e.g. Intel Skylake X)
-toolchainopts = {'vectorize': False}
-
-source_urls = [
-    'https://download.qt.io/official_releases/qt/%(version_major_minor)s/%(version)s/single/',
-    'https://download.qt.io/archive/qt/%(version_major_minor)s/%(version)s/single/'
-]
-sources = ['qt-everywhere-src-%(version)s.tar.xz']
-patches = [
-    'Qt5-5.13.1_fix-avx2.patch',
-    'Qt5-5.13.1_fix-qmake-libdir.patch',
-    'Qt5-5.14.1_fix-OF-Gentoo.patch',
-    'Qt5-5.15.2_fix-gcc11.patch',
-]
-checksums = [
-    # qt-everywhere-src-5.15.2.tar.xz
-    '3a530d1b243b5dec00bc54937455471aaa3e56849d2593edb8ded07228202240',
-    # Qt5-5.13.1_fix-avx2.patch
-    '6f46005f056bf9e6ff3e5d012a874d18ee03b33e685941f2979c970be91a9dbc',
-    # Qt5-5.13.1_fix-qmake-libdir.patch
-    '511ca9c0599ceb1989f73d8ceea9199c041512d3a26ee8c5fd870ead2c10cb63',
-    # Qt5-5.14.1_fix-OF-Gentoo.patch
-    '0b9defb7ce75314d85bebe07e143db7f7de316fec64c17cbd13f7eec5d2d1afa',
-    # Qt5-5.15.2_fix-gcc11.patch
-    '6606e2434aacaac49545be733bf012f1d489393bf8bd5573691c171ab8bc0976',
-]
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('pkg-config', '0.29.2'),
-    # deps for QtWebEngine
-    ('Bison', '3.7.6'),
-    ('flex', '2.6.4'),
-    ('gperf', '3.1'),
-    ('Ninja', '1.10.2'),
-    # Qt5WebEngine has build dependency on Python 2
-    ('Python', '2.7.18', '-bare'),
-    ('re2c', '2.2'),
-]
-
-dependencies = [
-    ('double-conversion', '3.1.6'),
-    ('GLib', '2.69.1'),
-    ('PCRE2', '10.37'),
-    ('libpng', '1.6.37'),
-    # deps for QtWebEngine
-    ('X11', '20210802'),
-    ('fontconfig', '2.13.94'),
-    ('DBus', '1.13.18'),
-    ('libevent', '2.1.12'),
-    ('OpenGL', '2021b'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('NSS', '3.73'),
-    ('snappy', '1.1.9'),
-    ('JasPer', '2.0.33'),
-    ('bzip2', '1.0.8'),
-    ('ICU', '70.1'),
-    ('OpenSSL', '1.1', '', True),
-]
-
-modextravars = {
-    'QT_XKB_CONFIG_ROOT': '$EBROOTX11/share/X11/xkb'
-}
-
-# qtgamepad needs recent kernel/libevdev (fails on RHEL 6.x)
-# qtwayland fails to build on (some) Centos 7 systems
-configopts = '-skip qtgamepad  -skip qtwayland'
-configopts += ' -icu'
-
-# make sure QtWebEngine component is being built & installed
-check_qtwebengine = True
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/q/Qt5/Qt5-5.15.2_fix-gcc11.patch b/Golden_Repo/q/Qt5/Qt5-5.15.2_fix-gcc11.patch
deleted file mode 100644
index 0a9ec1a4a..000000000
--- a/Golden_Repo/q/Qt5/Qt5-5.15.2_fix-gcc11.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-# Qt 5.15.2 build fixes for GCC 11
-#
-# Upstream patches:
-#   https://code.qt.io/cgit/qt/qtbase.git/commit/?id=813a928c7c3cf986
-#   https://code.qt.io/cgit/qt/qtbase.git/commit/?id=9c56d4da2ff631a8
-#   https://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=367293b18ab0d0a0
-#
-# Third-party software patches (taken from Fedora):
-#   https://src.fedoraproject.org/rpms/qt5-qtwebengine/blob/rawhide/f/qtwebengine-gcc11.patch
-#
-diff -Nrup a/qtbase/src/corelib/global/qendian.h b/qtbase/src/corelib/global/qendian.h
---- a/qtbase/src/corelib/global/qendian.h	2020-10-27 09:02:11.000000000 +0100
-+++ b/qtbase/src/corelib/global/qendian.h	2021-06-21 18:02:01.741899258 +0200
-@@ -1,7 +1,7 @@
- /****************************************************************************
- **
--** Copyright (C) 2016 The Qt Company Ltd.
--** Copyright (C) 2016 Intel Corporation.
-+** Copyright (C) 2021 The Qt Company Ltd.
-+** Copyright (C) 2021 Intel Corporation.
- ** Contact: https://www.qt.io/licensing/
- **
- ** This file is part of the QtCore module of the Qt Toolkit.
-@@ -44,6 +44,8 @@
- #include <QtCore/qfloat16.h>
- #include <QtCore/qglobal.h>
- 
-+#include <limits>
-+
- // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems
- #include <stdlib.h>
- #include <string.h>
-diff -Nrup a/qtbase/src/corelib/global/qfloat16.h b/qtbase/src/corelib/global/qfloat16.h
---- a/qtbase/src/corelib/global/qfloat16.h	2020-10-27 09:02:11.000000000 +0100
-+++ b/qtbase/src/corelib/global/qfloat16.h	2021-06-21 18:02:17.409709370 +0200
-@@ -43,6 +43,7 @@
- 
- #include <QtCore/qglobal.h>
- #include <QtCore/qmetatype.h>
-+#include <limits>
- #include <string.h>
- 
- #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__)
-diff -Nrup a/qtbase/src/corelib/text/qbytearraymatcher.h b/qtbase/src/corelib/text/qbytearraymatcher.h
---- a/qtbase/src/corelib/text/qbytearraymatcher.h	2020-10-27 09:02:11.000000000 +0100
-+++ b/qtbase/src/corelib/text/qbytearraymatcher.h	2021-06-21 18:13:45.885352546 +0200
-@@ -42,6 +42,8 @@
- 
- #include <QtCore/qbytearray.h>
- 
-+#include <limits>
-+
- QT_BEGIN_NAMESPACE
- 
- 
-diff -Nrup a/qtbase/src/corelib/tools/qsharedpointer_impl.h b/qtbase/src/corelib/tools/qsharedpointer_impl.h
---- a/qtbase/src/corelib/tools/qsharedpointer_impl.h	2020-10-27 09:02:11.000000000 +0100
-+++ b/qtbase/src/corelib/tools/qsharedpointer_impl.h	2021-06-21 18:13:45.885352546 +0200
-@@ -155,9 +155,6 @@ namespace QtSharedPointer {
- #endif
-         inline void checkQObjectShared(...) { }
-         inline void setQObjectShared(...) { }
--
--        inline void operator delete(void *ptr) { ::operator delete(ptr); }
--        inline void operator delete(void *, void *) { }
-     };
-     // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit)
- 
-diff -Nrup a/qtbase/src/plugins/platforms/xcb/qxcbwindow.cpp b/qtbase/src/plugins/platforms/xcb/qxcbwindow.cpp
---- a/qtbase/src/plugins/platforms/xcb/qxcbwindow.cpp	2020-10-27 09:02:11.000000000 +0100
-+++ b/qtbase/src/plugins/platforms/xcb/qxcbwindow.cpp	2021-06-21 18:13:45.885352546 +0200
-@@ -698,7 +698,7 @@ void QXcbWindow::show()
-         if (isTransient(window())) {
-             const QWindow *tp = window()->transientParent();
-             if (tp && tp->handle())
--                transientXcbParent = static_cast<const QXcbWindow *>(tp->handle())->winId();
-+                transientXcbParent = tp->handle()->winId();
-             // Default to client leader if there is no transient parent, else modal dialogs can
-             // be hidden by their parents.
-             if (!transientXcbParent)
-diff -Nrup a/qtdeclarative/src/qmldebug/qqmlprofilerevent_p.h b/qtdeclarative/src/qmldebug/qqmlprofilerevent_p.h
---- a/qtdeclarative/src/qmldebug/qqmlprofilerevent_p.h	2020-10-27 09:02:12.000000000 +0100
-+++ b/qtdeclarative/src/qmldebug/qqmlprofilerevent_p.h	2021-06-22 09:35:22.877912946 +0200
-@@ -48,6 +48,7 @@
- #include <QtCore/qmetatype.h>
- 
- #include <initializer_list>
-+#include <limits>
- #include <type_traits>
- 
- //
-diff -Nrup a/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.cc b/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.cc
---- a/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.cc	2020-11-07 02:22:36.000000000 +0100
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.cc	2021-06-22 12:05:40.736177321 +0200
-@@ -14,9 +14,9 @@
-  * limitations under the License.
-  */
- 
-+#include <limits>
- #include "src/trace_processor/containers/string_pool.h"
- 
--#include <limits>
- 
- #include "perfetto/base/logging.h"
- #include "perfetto/ext/base/utils.h"
-diff -Nrup a/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/db/column.cc b/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/db/column.cc
---- a/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/db/column.cc	2020-11-07 02:22:36.000000000 +0100
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/db/column.cc	2021-06-22 12:06:05.087880649 +0200
-@@ -14,6 +14,7 @@
-  * limitations under the License.
-  */
- 
-+#include <limits>
- #include "src/trace_processor/db/column.h"
- 
- #include "src/trace_processor/db/compare.h"
-diff -Nrup a/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/heap_graph_walker.cc b/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/heap_graph_walker.cc
---- a/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/heap_graph_walker.cc	2020-11-07 02:22:36.000000000 +0100
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/heap_graph_walker.cc	2021-06-22 12:06:28.911590412 +0200
-@@ -14,6 +14,8 @@
-  * limitations under the License.
-  */
- 
-+#include <cstddef>
-+
- #include "src/trace_processor/importers/proto/heap_graph_walker.h"
- #include "perfetto/base/logging.h"
- 
-diff -Nrup a/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/types/variadic.cc b/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/types/variadic.cc
---- a/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/types/variadic.cc	2020-11-07 02:22:36.000000000 +0100
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/types/variadic.cc	2021-06-22 12:06:52.631301445 +0200
-@@ -14,6 +14,7 @@
-  * limitations under the License.
-  */
- 
-+#include <limits>
- #include "src/trace_processor/types/variadic.h"
- 
- namespace perfetto {
diff --git a/Golden_Repo/q/qcint/qcint-5.0.0-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/q/qcint/qcint-5.0.0-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index fb288e980..000000000
--- a/Golden_Repo/q/qcint/qcint-5.0.0-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,31 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'qcint'
-version = '5.0.0'
-
-homepage = 'https://github.com/sunqm/qcint'
-description = """libcint is an open source library for analytical Gaussian integrals.
-qcint is an optimized libcint branch for the x86-64 platform."""
-
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-source_urls = ['https://github.com/sunqm/qcint/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['b706d3e73822fff2037727711f38d72cf0e69e90d2e16cdf6c5bcd75d6d9d666']
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-
-]
-
-separate_build_dir = True
-
-buildopts = "VERBOSE=1"
-
-sanity_check_paths = {
-    'files': ['include/cint.h', 'lib/libcint.%s' % SHLIB_EXT],
-    'dirs': [],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/q/qrupdate/qrupdate-1.1.2-GCCcore-11.2.0.eb b/Golden_Repo/q/qrupdate/qrupdate-1.1.2-GCCcore-11.2.0.eb
deleted file mode 100644
index 82129d3f8..000000000
--- a/Golden_Repo/q/qrupdate/qrupdate-1.1.2-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,35 +0,0 @@
-easyblock = 'MakeCp'
-
-name = 'qrupdate'
-version = '1.1.2'
-
-homepage = 'https://sourceforge.net/projects/qrupdate/'
-description = """qrupdate is a Fortran library for fast updates of QR and Cholesky decompositions."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [SOURCEFORGE_SOURCE]
-sources = [SOURCE_TAR_GZ]
-patches = ['%(name)s-%(version)s_makeconf.patch']
-checksums = [
-    'e2a1c711dc8ebc418e21195833814cb2f84b878b90a2774365f0166402308e08',  # qrupdate-1.1.2.tar.gz
-    'b1873ccac7cf5073739988817f13d492f9438cb7e00b0eaf4e09005ea5ad90a9',  # qrupdate-1.1.2_makeconf.patch
-]
-
-builddependencies = [
-    ('binutils', '2.37')
-]
-
-buildopts = 'lib'
-
-files_to_copy = [(['libqrupdate.a'], 'lib')]
-
-sanity_check_paths = {
-    'files': ['lib/libqrupdate.a'],
-    'dirs': [],
-}
-
-parallel = 1
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/q/qrupdate/qrupdate-1.1.2_makeconf.patch b/Golden_Repo/q/qrupdate/qrupdate-1.1.2_makeconf.patch
deleted file mode 100644
index ae58d0059..000000000
--- a/Golden_Repo/q/qrupdate/qrupdate-1.1.2_makeconf.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-# Pick FC and FFLAGS from environmental variables
-# March 8th 2016 B. Hajgato (Free Uviveristy Brussels - VUB)
---- qrupdate-1.1.2/Makeconf.old	2010-01-19 12:35:49.000000000 +0100
-+++ qrupdate-1.1.2/Makeconf	2016-03-08 20:51:11.662603099 +0100
-@@ -1,9 +1,9 @@
- # set this to your compiler's executable name (e.g. gfortran, g77)
--FC=gfortran
-+FC?=gfortran
- # requested flags
--FFLAGS=-fimplicit-none -O3 -funroll-loops 
-+FFLAGS?=-fimplicit-none -O3 -funroll-loops 
- # set if you need shared library
--FPICFLAGS=-fPIC
-+FPICFLAGS=
- 
- # BLAS library (only required for tests)
- BLAS=-lblas
-
diff --git a/Golden_Repo/r/R/R-4.1.2-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/r/R/R-4.1.2-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index c2745abdc..000000000
--- a/Golden_Repo/r/R/R-4.1.2-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,3198 +0,0 @@
-name = 'R'
-version = '4.1.2'
-
-homepage = 'https://www.r-project.org/'
-description = """R is a free software environment for statistical computing
- and graphics."""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-source_urls = ['https://cloud.r-project.org/src/base/R-%(version_major)s']
-sources = [SOURCE_TAR_GZ]
-patches = ['%(name)s-4.1.0_identify-flexiblas-in-configure.patch']
-checksums = [
-    '2036225e9f7207d4ce097e54972aecdaa8b40d7d9911cd26491fac5a0fab38af',  # R-4.1.2.tar.gz
-    '2c6720e2e144ae4fe00842daab0ebba72241080603e0ff1a6ca758738041b257',  # R-4.1.0_identify-flexiblas-in-configure.patch
-]
-
-builddependencies = [
-    ('pkg-config', '0.29.2'),
-    ('XServer', '1.20.13'),
-]
-
-dependencies = [
-    ('Java', '15', '', SYSTEM),
-    ('X11', '20210802'),
-    ('OpenGL', '2021b'),
-    ('cairo', '1.16.0'),
-    ('libreadline', '8.1'),
-    ('ncurses', '6.2'),
-    ('bzip2', '1.0.8'),
-    ('XZ', '5.2.5'),
-    ('zlib', '1.2.11'),
-    ('SQLite', '3.36'),
-    ('PCRE2', '10.37'),
-    ('libpng', '1.6.37'),  # for plotting in R
-    ('libjpeg-turbo', '2.1.1'),  # for plottting in R
-    ('LibTIFF', '4.3.0'),
-    ('Tk', '8.6.11'),  # for tcltk
-    ('cURL', '7.78.0'),  # for RCurl
-    ('libxml2', '2.9.10'),  # for XML
-    ('PROJ', '8.1.0'),  # for rgdal
-    ('GMP', '6.2.1'),  # for igraph
-    ('NLopt', '2.7.0'),  # for nloptr
-    ('FFTW', '3.3.10', '-nompi'),  # for fftw
-    ('libsndfile', '1.0.31'),  # for seewave
-    ('ICU', '70.1'),  # for rJava & gdsfmt
-    ('HDF5', '1.12.1', '-serial'),  # for hdf5r
-    ('UDUNITS', '2.2.28'),  # for units
-    ('GSL', '2.7'),  # for RcppGSL
-    ('ImageMagick', '7.1.0-13'),  # for animation
-    ('GLPK', '5.0'),  # for Rglpk
-    ('netCDF', '4.8.1', '-serial'),  # the ndf4 needs it
-    ('GEOS', '3.9.1'),  # for rgeos
-    ('nodejs', '16.13.0'),  # for V8 (required by rstan)
-    ('GDAL', '3.3.2'),  # for sf
-    ('MPFR', '4.1.0'),  # for Rmpfr
-    ('libgit2', '1.1.1'),
-    ('ZeroMQ', '4.3.4'),  # for pbdZMQ needed by IRkernel
-    ('OpenSSL', '1.1', '', True),
-    ('texlive', '20200406'),
-]
-
-
-# Some R extensions (mclust, quantreg, waveslim for example) require the math library (-lm) to avoid undefined symbols.
-# Adding it to FLIBS makes sure it is present when needed.
-preconfigopts = 'export FLIBS="$FLIBS -lm" && '
-
-configopts = "--with-pic --enable-threads --enable-R-shlib"
-# some recommended packages may fail in a parallel build (e.g. Matrix), and
-# we're installing them anyway below
-configopts += " --with-recommended-packages=no"
-
-# specify that at least EasyBuild v3.5.0 is required,
-# since we rely on the updated easyblock for R to configure correctly w.r.t. BLAS/LAPACK
-easybuild_version = '3.5.0'
-
-exts_default_options = {
-    'source_urls': [
-        'https://cran.r-project.org/src/contrib/Archive/%(name)s',  # package archive
-        'https://cran.r-project.org/src/contrib/',  # current version of packages
-        'https://cran.freestatistics.org/src/contrib',  # mirror alternative for current packages
-    ],
-    'source_tmpl': '%(name)s_%(version)s.tar.gz',
-}
-
-# !! order of packages is important !!
-# packages updated on 1st November 2021
-exts_list = [
-    'base',
-    'compiler',
-    'datasets',
-    'graphics',
-    'grDevices',
-    'grid',
-    'methods',
-    'parallel',
-    'splines',
-    'stats',
-    'stats4',
-    'tcltk',
-    'tools',
-    'utils',
-    # ('Rmpi', '0.6-9.2', {
-    #     'checksums': ['358ac1af97402e676f209261a231f36a35e60f0301edf8ca53dac11af3c3bd1a'],
-    # }),
-    ('abind', '1.4-5', {
-        'checksums': ['3a3ace5afbcb86e56889efcebf3bf5c3bb042a282ba7cc4412d450bb246a3f2c'],
-    }),
-    ('magic', '1.5-9', {
-        'checksums': ['fa1d5ef2d39e880f262d31b77006a2a7e76ea38e306aae4356e682b90d6cd56a'],
-    }),
-    ('Rcpp', '1.0.7', {
-        'checksums': ['15e5a4732216daed16263c79fb37017c2ada84a2d4e785e3b76445d0eba3dc1d'],
-    }),
-    ('RcppProgress', '0.4.2', {
-        'checksums': ['b1624b21b7aeb1dafb30f092b2a4bef4c3504efd2d6b00b2cdf55dc9df194b48'],
-    }),
-    ('lpSolve', '5.6.15', {
-        'checksums': ['4627be4178abad34fc85a7d264c2eb5e27506f007e46687b0b8a4f8fbdf4f3ba'],
-    }),
-    ('linprog', '0.9-2', {
-        'checksums': ['8937b2e30692e38de1713f1513b78f505f73da6f5b4a576d151ad60bac2221ce'],
-    }),
-    ('geometry', '0.4.5', {
-        'checksums': ['8fedd17c64468721d398e3c17a39706321ab71098b29f5e8d8039dd115a220d8'],
-    }),
-    ('bit', '4.0.4', {
-        'checksums': ['e404841fbe4ebefe4ecd4392effe673a8c9fa05f97952c4ce6e2f6159bd2f168'],
-    }),
-    ('filehash', '2.4-2', {
-        'checksums': ['b6d056f75d45e315943a4618f5f62802612cd8931ba3f9f474b595140a3cfb93'],
-    }),
-    ('ff', '4.0.5', {
-        'checksums': ['9aba9e271144ec224063ddba0d791e2fcdb9c912d48fdc49e204fce628355037'],
-    }),
-    ('bnlearn', '4.7', {
-        'checksums': ['2e1dd7ba9b7cf07e51eec3238684310edbeb0573d9b907049fb6b28db3022817'],
-    }),
-    ('bootstrap', '2019.6', {
-        'checksums': ['5252fdfeb944cf1fae35016d35f9333b1bd1fc8c6d4a14e33901160e21968694'],
-    }),
-    ('combinat', '0.0-8', {
-        'checksums': ['1513cf6b6ed74865bfdd9f8ca58feae12b62f38965d1a32c6130bef810ca30c1'],
-    }),
-    ('deal', '1.2-39', {
-        'checksums': ['a349db8f1c86cbd8315c068da49314ce9eb585dbb50d2e5ff09300506bd8806b'],
-    }),
-    ('fdrtool', '1.2.16', {
-        'checksums': ['e7dea648ee018e2c8c8834084051c76f7e8b2b42067772c62035a941c32457a9'],
-    }),
-    ('formatR', '1.11', {
-        'checksums': ['bd81662d09cf363652761e63ba5969c71be4dd5ae6fc9098f440d6729254a30c'],
-    }),
-    ('gtools', '3.9.2', {
-        'checksums': ['03b1898bf581f6d12fa90e23ff700cfa7c834ac10c6654bdac42d7ec943fa953'],
-    }),
-    ('gdata', '2.18.0', {
-        'checksums': ['4b287f59f5bbf5fcbf18db16477852faac4a605b10c5284c46b93fa6e9918d7f'],
-    }),
-    ('GSA', '1.03.1', {
-        'checksums': ['e192d4383f53680dbd556223ea5f8cad6bae62a80a337ba5fd8d05a8aee6a917'],
-    }),
-    ('xfun', '0.27', {
-        'checksums': ['c775bf33a6bc57f8022960cbf7dc20a4e82175a9c71807b2723f46ade6805485'],
-    }),
-    ('highr', '0.9', {
-        'checksums': ['beff11390d936c90fdcc00e7ed0eb72220f3de403a51b56659e3d3e0b6d8ed4d'],
-    }),
-    ('infotheo', '1.2.0', {
-        'checksums': ['9b47ebc3db5708c88dc014b4ffec6734053a9c255a9241fcede30fec3e63aaa3'],
-    }),
-    ('lars', '1.2', {
-        'checksums': ['64745b568f20b2cfdae3dad02fba92ebf78ffee466a71aaaafd4f48c3921922e'],
-    }),
-    ('lazy', '1.2-16', {
-        'checksums': ['c796c8b987ed1bd9dfddd593e17312ed681fc4fa3a1ecfe51da2def0ac1e50df'],
-    }),
-    ('kernlab', '0.9-29', {
-        'checksums': ['c3da693a0041dd34f869e7b63a8d8cf7d4bc588ac601bcdddcf7d44f68b3106f'],
-    }),
-    ('mime', '0.12', {
-        'checksums': ['a9001051d6c1e556e881910b1816b42872a1ee41ab76d0040ce66a27135e3849'],
-    }),
-    ('markdown', '1.1', {
-        'checksums': ['8d8cd47472a37362e615dbb8865c3780d7b7db694d59050e19312f126e5efc1b'],
-    }),
-    ('mlbench', '2.1-3', {
-        'checksums': ['b1f92be633243185ab86e880a1e1ac5a4dd3c535d01ebd187a4872d0a8c6f194'],
-    }),
-    ('NLP', '0.2-1', {
-        'checksums': ['05eaa453ad2757311c073fd30093c738b20a977c5089031eb454345a1d01f2b6'],
-    }),
-    ('mclust', '5.4.7', {
-        'checksums': ['45f5a666caee5bebd3160922b8655295a25e37f624741f6574365e4ac5a14c23'],
-    }),
-    ('RANN', '2.6.1', {
-        'checksums': ['b299c3dfb7be17aa41e66eff5674fddd2992fb6dd3b10bc59ffbf0c401697182'],
-    }),
-    ('rmeta', '3.0', {
-        'checksums': ['b9f9d405935cffcd7a5697ff13b033f9725de45f4dc7b059fd68a7536eb76b6e'],
-    }),
-    ('segmented', '1.3-4', {
-        'checksums': ['8276bfbb3e5c1d7a9a61098f72ac9b2b0f52c89ae9f9b715f76b22303cc3902d'],
-    }),
-    ('som', '0.3-5.1', {
-        'checksums': ['a6f4c0e5b36656b7a8ea144b057e3d7642a8b71972da387a7133f3dd65507fb9'],
-    }),
-    ('SuppDists', '1.1-9.5', {
-        'checksums': ['680b67145c07d44e200275e08e48602fe19cd99fb106c05422b3f4a244c071c4'],
-    }),
-    ('stabledist', '0.7-1', {
-        'checksums': ['06c5704d3a3c179fa389675c537c39a006867bc6e4f23dd7e406476ed2c88a69'],
-    }),
-    ('survivalROC', '1.0.3', {
-        'checksums': ['1449e7038e048e6ad4d3f7767983c0873c9c7a7637ffa03a4cc7f0e25c31cd72'],
-    }),
-    ('pspline', '1.0-18', {
-        'checksums': ['f71cf293bd5462e510ac5ad16c4a96eda18891a0bfa6447dd881c65845e19ac7'],
-    }),
-    ('timeDate', '3043.102', {
-        'checksums': ['377cba03cddab8c6992e31d0683c1db3a73afa9834eee3e95b3b0723f02d7473'],
-    }),
-    ('longmemo', '1.1-2', {
-        'checksums': ['7964e982287427dd58f98e1144e468ae0cbd572d25a4bea6ca9ae9c7522f3207'],
-    }),
-    ('ADGofTest', '0.3', {
-        'checksums': ['9cd9313954f6ecd82480d373f6c5371ca84ab33e3f5c39d972d35cfcf1096846'],
-    }),
-    ('MASS', '7.3-54', {
-        'checksums': ['eb644c0e94b447c46387aa22436ef5a43192960ee9cfd0df2940f4a4116179ae'],
-    }),
-    ('pixmap', '0.4-12', {
-        'checksums': ['893ba894d4348ba05e6edf9c1b4fd201191816b444a214f7a6b2c0a79b0a2aec'],
-    }),
-    ('lattice', '0.20-45', {
-        'checksums': ['22388d92bdb7d3959da84d7308d9026dd8226ef07580783729e8ad2f7d7507ad'],
-    }),
-    ('sp', '1.4-5', {
-        'checksums': ['6beeb216d540475cdead5f2c72d6c7ee400fe2423c1882d72cf57f6df58f09da'],
-    }),
-    ('pkgconfig', '2.0.3', {
-        'checksums': ['330fef440ffeb842a7dcfffc8303743f1feae83e8d6131078b5a44ff11bc3850'],
-    }),
-    ('rlang', '0.4.12', {
-        'checksums': ['2a26915738be120a56ec93e781bcb50ffa1031e11904544198b4a15c35029915'],
-    }),
-    ('ellipsis', '0.3.2', {
-        'checksums': ['a90266e5eb59c7f419774d5c6d6bd5e09701a26c9218c5933c9bce6765aa1558'],
-    }),
-    ('digest', '0.6.28', {
-        'checksums': ['4a328c75e95f8522fc07390d1dd00c19fb643f558e761a8aed04f99c1dc7db00'],
-    }),
-    ('glue', '1.4.2', {
-        'checksums': ['9f7354132a26e9a876428fa87629b9aaddcd558f9932328e6ac065b95b8ef7ad'],
-    }),
-    ('vctrs', '0.3.8', {
-        'checksums': ['7f4e8b75eda115e69dddf714f0643eb889ad61017cdc13af24389aab2a2d1bb1'],
-    }),
-    ('lifecycle', '1.0.1', {
-        'checksums': ['1da76e1c00f1be96ca34e122ae611259430bf99d6a1b999fdef70c00c30f7ba0'],
-    }),
-    ('hms', '1.1.1', {
-        'checksums': ['6b5f30db1845c70d27b5de33f31caa487cdd0787cd80a4073375e5f482269062'],
-    }),
-    ('prettyunits', '1.1.1', {
-        'checksums': ['9a199aa80c6d5e50fa977bc724d6e39dae1fc597a96413053609156ee7fb75c5'],
-    }),
-    ('R6', '2.5.1', {
-        'checksums': ['8d92bd29c2ed7bf15f2778618ffe4a95556193d21d8431a7f75e7e5fc102bf48'],
-    }),
-    ('crayon', '1.4.2', {
-        'checksums': ['ee34397f643e76e30588068d4c93bd3c9afd2193deacccacb3bffcadf141b857'],
-    }),
-    ('progress', '1.2.2', {
-        'checksums': ['b4a4d8ed55db99394b036a29a0fb20b5dd2a91c211a1d651c52a1023cc58ff35'],
-    }),
-    ('ade4', '1.7-18', {
-        'checksums': ['ecb6f4c42c60f39702aa96f454bb536a333049c9608ee2b6bdf8795e059cc525'],
-    }),
-    ('AlgDesign', '1.2.0', {
-        'checksums': ['ff86c9e19505770520e7614970ad19c698664d08001ce888b8603e44c2a3b52a'],
-    }),
-    ('base64enc', '0.1-3', {
-        'checksums': ['6d856d8a364bcdc499a0bf38bfd283b7c743d08f0b288174fba7dbf0a04b688d'],
-    }),
-    ('BH', '1.75.0-0', {
-        'checksums': ['ae4c10992607dd697663f60675a46a5770851da159330bb63c4a68890bdd6f5a'],
-    }),
-    ('brew', '1.0-6', {
-        'checksums': ['d70d1a9a01cf4a923b4f11e4374ffd887ad3ff964f35c6f9dc0f29c8d657f0ed'],
-    }),
-    ('Brobdingnag', '1.2-6', {
-        'checksums': ['19eccaed830ce9d93b70642f6f126ac66722a98bbd48586899cc613dd9966ad4'],
-    }),
-    ('corpcor', '1.6.10', {
-        'checksums': ['71a04c503c93ec95ddde09abe8c7ddeb36175b7da76365a14b27066383e10e09'],
-    }),
-    ('longitudinal', '1.1.12', {
-        'checksums': ['d4f894c38373ba105b1bdc89e3e7c1b215838e2fb6b4470b9f23768b84e603b5'],
-    }),
-    ('backports', '1.3.0', {
-        'checksums': ['4f231e91ca8298fb1a27810ef5dd4c84e05c2b2b6f6748eab68f70ff4827812d'],
-    }),
-    ('checkmate', '2.0.0', {
-        'checksums': ['0dc25b0e20c04836359df1885d099c6e4ad8ae0e585a9e4107f7ea945d9c6fa4'],
-    }),
-    ('cubature', '2.0.4.2', {
-        'checksums': ['605bdd9d90fb6645359cccd1b289c5afae235b46360ef5bdd2001aa307a7694e'],
-    }),
-    ('DEoptimR', '1.0-9', {
-        'checksums': ['6151aa74f52ff4be664343e3992749e63235ebba51c9fded3775c1a2407c6512'],
-    }),
-    ('fastmatch', '1.1-3', {
-        'checksums': ['1defa0b08bc3f48e4c3e4ba8df4f1b9e8299932fd8c747c67d32de44f90b9861'],
-    }),
-    ('ffbase', '0.13.3', {
-        'checksums': ['b3f61f80ba6851130247779786903d42a24ee5219aa24556c8470aece8a2e6b6'],
-    }),
-    ('iterators', '1.0.13', {
-        'checksums': ['778e30e4c292da9f94d62acc637cf55273dae258199d847e62658f44840f11a4'],
-    }),
-    ('maps', '3.4.0', {
-        'checksums': ['7918ccb2393ca19589d4c4e77d9ebe863dc6317ebfc1ff41869dbfaf439f5747'],
-    }),
-    ('nnls', '1.4', {
-        'checksums': ['0e5d77abae12bc50639d34354f96a8e079408c9d7138a360743b73bd7bce6c1f'],
-    }),
-    ('sendmailR', '1.2-1', {
-        'checksums': ['04feb08c6c763d9c58b2db24b1222febe01e28974eac4fe87670be6fb9bff17c'],
-    }),
-    ('dotCall64', '1.0-1', {
-        'checksums': ['f10b28fcffb9453b1d8888a72c8fd2112038b5ac33e02a481492c7bd249aa5c6'],
-    }),
-    ('spam', '2.7-0', {
-        'checksums': ['632b5c48f587a34c997a487b72099c9c89d76a43f2cd9a36cb95fdec1d07850d'],
-    }),
-    ('subplex', '1.6', {
-        'checksums': ['0d05da1622fffcd20a01cc929fc6c2b7df40a8246e7018f7f1f3c175b774cbf9'],
-    }),
-    ('stringi', '1.7.5', {
-        'checksums': ['2914cc34e1cbfb65147090263b0e1bf2727ad32bc9bb860732094fecff4b2565'],
-    }),
-    ('magrittr', '2.0.1', {
-        'checksums': ['75c265d51cc2b34beb27040edb09823c7b954d3990a7a931e40690b75d4aad5f'],
-    }),
-    ('stringr', '1.4.0', {
-        'checksums': ['87604d2d3a9ad8fd68444ce0865b59e2ffbdb548a38d6634796bbd83eeb931dd'],
-    }),
-    ('evaluate', '0.14', {
-        'checksums': ['a8c88bdbe4e60046d95ddf7e181ee15a6f41cdf92127c9678f6f3d328a3c5e28'],
-    }),
-    ('logspline', '2.1.16', {
-        'checksums': ['7418491b8c778483c24e4354ee47b1e1b1d68b0057c12d6e012cce7d4e6c138a'],
-    }),
-    ('ncbit', '2013.03.29', {
-        'checksums': ['4480271f14953615c8ddc2e0666866bb1d0964398ba0fab6cc29046436820738'],
-    }),
-    ('permute', '0.9-5', {
-        'checksums': ['d2885384a07497e8df273689d6713fc7c57a7c161f6935f3572015e16ab94865'],
-    }),
-    ('plotrix', '3.8-2', {
-        'checksums': ['bb72953102889cea41cd6521874e35d2458ebd10aab97ba6f262e102cac0bc1f'],
-    }),
-    ('randomForest', '4.6-14', {
-        'checksums': ['f4b88920419eb0a89d0bc5744af0416d92d112988702dc726882394128a8754d'],
-    }),
-    ('scatterplot3d', '0.3-41', {
-        'checksums': ['4c8326b70a3b2d37126ca806771d71e5e9fe1201cfbe5b0d5a0a83c3d2c75d94'],
-    }),
-    ('SparseM', '1.81', {
-        'checksums': ['bd838f381ace680fa38508ff70b3d83cb9ffa28ac1ab568509249bca53c34b33'],
-    }),
-    ('tripack', '1.3-9.1', {
-        'checksums': ['7f82f8d63741c468767acc6fb35281bd9903f6c3c52e8fada60a6ae317511fbe'],
-    }),
-    ('irace', '3.4.1', {
-        'checksums': ['7eea92ba42e6ba320fa8bdca3c53091ae42f26a0f097244f65e7e117f6d514b6'],
-    }),
-    ('rJava', '1.0-5', {
-        'checksums': ['2fdba5774f6333440e0ef6d96567b37f9f382820242a4d885f2891796fb36fde'],
-    }),
-    ('RColorBrewer', '1.1-2', {
-        'checksums': ['f3e9781e84e114b7a88eb099825936cc5ae7276bbba5af94d35adb1b3ea2ccdd'],
-    }),
-    ('png', '0.1-7', {
-        'checksums': ['e269ff968f04384fc9421d17cfc7c10cf7756b11c2d6d126e9776f5aca65553c'],
-    }),
-    ('jpeg', '0.1-9', {
-        'checksums': ['01a175442ec209b838a56a66a3908193aca6f040d537da7838d9368e46913072'],
-    }),
-    ('latticeExtra', '0.6-29', {
-        'checksums': ['6cadc31d56f73d926e2e8d72e43ae17ac03607a4d1a374719999a4a231e3df11'],
-    }),
-    ('Matrix', '1.3-4', {
-        'checksums': ['ab42179d44545e99bbdf44bb6d04cab051dd2aba552b1f6edd51ed71b55f6c39'],
-    }),
-    ('RcppArmadillo', '0.10.7.0.0', {
-        'checksums': ['01a8eac49d5b2bcefcba076f0ee7b234bee3d22d54d7f4d56d9a6ae7cbea65f4'],
-    }),
-    ('plyr', '1.8.6', {
-        'checksums': ['ea55d26f155443e9774769531daa5d4c20a0697bb53abd832e891b126c935287'],
-    }),
-    ('gtable', '0.3.0', {
-        'checksums': ['fd386cc4610b1cc7627dac34dba8367f7efe114b968503027fb2e1265c67d6d3'],
-    }),
-    ('reshape2', '1.4.4', {
-        'checksums': ['d88dcf9e2530fa9695fc57d0c78adfc5e361305fe8919fe09410b17da5ca12d8'],
-    }),
-    ('dichromat', '2.0-0', {
-        'checksums': ['31151eaf36f70bdc1172da5ff5088ee51cc0a3db4ead59c7c38c25316d580dd1'],
-    }),
-    ('colorspace', '2.0-2', {
-        'checksums': ['b891cd2ec129ed5f116429345947bcaadc33969758a108521eb0cf36bd12183a'],
-    }),
-    ('munsell', '0.5.0', {
-        'checksums': ['d0f3a9fb30e2b5d411fa61db56d4be5733a2621c0edf017d090bdfa5e377e199'],
-    }),
-    ('labeling', '0.4.2', {
-        'checksums': ['e022d79276173e0d62bf9e37d7574db65ab439eb2ae1833e460b1cff529bd165'],
-    }),
-    ('viridisLite', '0.4.0', {
-        'checksums': ['849955dc8ad9bc52bdc50ed4867fd92a510696fc8294e6971efa018437c83c6a'],
-    }),
-    ('farver', '2.1.0', {
-        'checksums': ['e5c8630607049f682fb3002b99ca4f5e7c6b94f8b2a4342df594e7853b77cef4'],
-    }),
-    ('scales', '1.1.1', {
-        'checksums': ['40b2b66522f1f314a20fd09426011b0cdc9d16b23ee2e765fe1930292dd03705'],
-    }),
-    ('utf8', '1.2.2', {
-        'checksums': ['a71aee87d43a9bcf29249c7a5a2e9ca1d2a836e8d5ee3a264d3062f25378d8f4'],
-    }),
-    ('zeallot', '0.1.0', {
-        'checksums': ['439f1213c97c8ddef9a1e1499bdf81c2940859f78b76bc86ba476cebd88ba1e9'],
-    }),
-    ('assertthat', '0.2.1', {
-        'checksums': ['85cf7fcc4753a8c86da9a6f454e46c2a58ffc70c4f47cac4d3e3bcefda2a9e9f'],
-    }),
-    ('fansi', '0.5.0', {
-        'checksums': ['9d1bf8c316969c163abd3dd41cc1425b2671df9471fe806bf8783794a19ca54f'],
-    }),
-    ('cli', '3.1.0', {
-        'checksums': ['c70a61830bf706a84c59eb74a809978846cee93742198ab4192742a5df1ace11'],
-    }),
-    ('pillar', '1.6.4', {
-        'checksums': ['033a92a271ddeec2a17323d070de8257b9ca4d57f5be6181e2ad35fe7e1ea19e'],
-    }),
-    ('tibble', '3.1.5', {
-        'checksums': ['da6387ba683a67cd7fc2a111f6b62468e480a8078bc1867d433a40c5460edbe7'],
-    }),
-    ('lazyeval', '0.2.2', {
-        'checksums': ['d6904112a21056222cfcd5eb8175a78aa063afe648a562d9c42c6b960a8820d4'],
-    }),
-    ('withr', '2.4.2', {
-        'checksums': ['48f96a4cb780cf6fd5fbbea1f1eb04ea3102d7a4a644cae1ed1e91139dcbbac8'],
-    }),
-    ('nlme', '3.1-153', {
-        'checksums': ['3d27a98edf1b16ee868949e823ac0babbf10c937a7220d648b7ef9480cd680e3'],
-    }),
-    ('mgcv', '1.8-38', {
-        'checksums': ['cd12ed5787d6fdcead34e782e48b62b3f9efd523616c906e2da77bd9c142ddbb'],
-    }),
-    ('rprojroot', '2.0.2', {
-        'checksums': ['5fa161f0d4ac3b7a99dc6aa2d832251001dc92e93c828593a51fe90afd019e1f'],
-    }),
-    ('desc', '1.4.0', {
-        'checksums': ['8220e4c706449b8121b822e70b1414f391ef419aed574836a234c63b83e5d649'],
-    }),
-    ('ps', '1.6.0', {
-        'checksums': ['89ad7ddc5e0818bccacfd0673ddf2da0892ac2a3b4d3a821e40884ab1e96bf31'],
-    }),
-    ('processx', '3.5.2', {
-        'checksums': ['ed6f2d1047461c6061e6ed58fb6de65a289b56009867892abad76c6bba46fc2b'],
-    }),
-    ('callr', '3.7.0', {
-        'checksums': ['d67255148595c6d0ba4c4d241bc9f6b5e00cafe25fdc13e38c10acc38653360a'],
-    }),
-    ('pkgbuild', '1.2.0', {
-        'checksums': ['2e19308d3271fefd5e118c6d132d6a2511253b903620b5417892c72d2010a963'],
-    }),
-    ('rstudioapi', '0.13', {
-        'checksums': ['aac35bbdcb4a8e8caba943bc8a2b98120e8940b80cd1020224bb1a26ff776d8b'],
-    }),
-    ('pkgload', '1.2.3', {
-        'checksums': ['105ae5b2caca495bd0702757c5c676353cca8525954d0822f07103ca8a54b349'],
-    }),
-    ('praise', '1.0.0', {
-        'checksums': ['5c035e74fd05dfa59b03afe0d5f4c53fbf34144e175e90c53d09c6baedf5debd'],
-    }),
-    ('brio', '1.1.2', {
-        'checksums': ['42dde6953151e31cc38bbec72335c01ac9e755cc07d11e26f4e1fcd0f9f471ef'],
-    }),
-    ('jsonlite', '1.7.2', {
-        'checksums': ['06354b50435942f67ba264f79831e577809ef89e5f9a5a2201985396fe651fd2'],
-    }),
-    ('diffobj', '0.3.5', {
-        'checksums': ['d860a79b1d4c9e369282d7391b539fe89228954854a65ba47181407c53e3cf60'],
-    }),
-    ('rematch2', '2.1.2', {
-        'checksums': ['fe9cbfe99dd7731a0a2a310900d999f80e7486775b67f3f8f388c30737faf7bb'],
-    }),
-    ('waldo', '0.3.1', {
-        'checksums': ['ec2c8c1afbc413f8db8b6b0c6970194a875f616ad18e1e72a004bc4497ec019b'],
-    }),
-    ('testthat', '3.1.0', {
-        'checksums': ['e714b105891a766d03d5bab09d705b1f6c23f04db56dfe310bff8cfa00464987'],
-    }),
-    ('isoband', '0.2.5', {
-        'checksums': ['46f53fa066f0966f02cb2bf050190c0d5e950dab2cdf565feb63fc092c886ba5'],
-    }),
-    ('ggplot2', '3.3.5', {
-        'checksums': ['b075294faf3af31b18e415f260c62d6000b218770e430484fe38819bdc3224ea'],
-    }),
-    ('pROC', '1.18.0', {
-        'checksums': ['d5ef54b384176ece6d6448014ba40570a98181b58fee742f315604addb5f7ba9'],
-    }),
-    ('quadprog', '1.5-8', {
-        'checksums': ['22128dd6b08d3516c44ff89276719ad4fe46b36b23fdd585274fa3a93e7a49cd'],
-    }),
-    ('BB', '2019.10-1', {
-        'checksums': ['04d0b6ce6e5f070b109478a6005653dbe78613bb4e3ea4903203d851b5d3c94d'],
-    }),
-    ('BBmisc', '1.11', {
-        'checksums': ['1ea48c281825349d8642a661bb447e23bfd651db3599bf72593bfebe17b101d2'],
-    }),
-    ('fail', '1.3', {
-        'checksums': ['ede8aa2a9f2371aff5874cd030ac625adb35c33954835b54ab4abf7aeb34d56d'],
-    }),
-    ('rlecuyer', '0.3-5', {
-        'checksums': ['4723434ff7624d4f404a6854ffa0673fc43daa46f58f064dbeeaa17da28ab626'],
-    }),
-    ('snow', '0.4-4', {
-        'checksums': ['84587f46f222a96f3e2fde10ad6ec6ddbd878f4e917cd926d632f61a87db13c9'],
-    }),
-    ('tree', '1.0-41', {
-        'checksums': ['21cf995b187d97de0bce8330973a52c46235db0fc09a133cad26283b7a6f5c8e'],
-    }),
-    ('pls', '2.8-0', {
-        'checksums': ['eff3a92756ca34cdc1661fa36d2bf7fc8e9f4132d2f1ef9ed0105c83594618bf'],
-    }),
-    ('class', '7.3-19', {
-        'checksums': ['9012f5c65384b441b5738ed7bd18ea735884bab32b31776e80cf3679f38a3769'],
-    }),
-    ('proxy', '0.4-26', {
-        'checksums': ['676bad821343974e0297a0566c4bf0cf0ea890104906a745b87d3b5989c81a4d'],
-    }),
-    ('e1071', '1.7-9', {
-        'checksums': ['9bf9a15e7ce0b9b1a57ce3048d29cbea7f2a5bb2e91271b1b6aaafe07c852226'],
-    }),
-    ('nnet', '7.3-16', {
-        'checksums': ['c5b73eb4fff0d225e14f898cec987a7a88796b6e70cde4cf277374428f2d5c13'],
-    }),
-    ('minqa', '1.2.4', {
-        'checksums': ['cfa193a4a9c55cb08f3faf4ab09c11b70412523767f19894e4eafc6e94cccd0c'],
-    }),
-    ('RcppEigen', '0.3.3.9.1', {
-        'checksums': ['8a0486249b778a4275a1168fc89fc7fc49c2bb031cb14b50a50089acae7fe962'],
-    }),
-    ('MatrixModels', '0.5-0', {
-        'checksums': ['a87faf1a185219f79ea2307e6787d293e1d30bf3af9398e8cfe1e079978946ed'],
-    }),
-    ('matrixStats', '0.61.0', {
-        'checksums': ['dbd3c0ec59b1ae62ff9b4c2c90c4687cbd680d1796f6fdd672319458d4d2fd9a'],
-    }),
-    ('codetools', '0.2-18', {
-        'checksums': ['1a9ea6b9792dbd1688078455929385acc3a5e4bef945c77bec1261fa4a084c28'],
-    }),
-    ('foreach', '1.5.1', {
-        'checksums': ['fb5ad69e295618c52b2ac7dff84a0771462870a97345374d43b3de2dc31a68e1'],
-    }),
-    ('data.table', '1.14.2', {
-        'checksums': ['f741b951e5937440139514aedbae78dbd6862d825066848bdb006aa02c2f3d2b'],
-    }),
-    ('ModelMetrics', '1.2.2.2', {
-        'checksums': ['5e06f1926aebca5654e1329c66ef19b04058376b2277ebb16e3bf8c208d73457'],
-    }),
-    ('generics', '0.1.1', {
-        'checksums': ['a2478ebf1a0faa8855a152f4e747ad969a800597434196ed1f71975a9eb11912'],
-    }),
-    ('purrr', '0.3.4', {
-        'checksums': ['23ebc93bc9aed9e7575e8eb9683ff4acc0270ef7d6436cc2ef4236a9734840b2'],
-    }),
-    ('tidyselect', '1.1.1', {
-        'checksums': ['18eb6a6746196a81ce19ee6cbf1db0c33f494177b97e2419312ef25a00ae486b'],
-    }),
-    ('dplyr', '1.0.7', {
-        'checksums': ['d2fe3aedbce02fdddce09a8a80f85f5918a9d1f15f792ad4a98f254959d7123d'],
-    }),
-    ('gower', '0.2.2', {
-        'checksums': ['3f022010199fafe34f6e7431730642a76893e6b4249b84e5a61012cb83483631'],
-    }),
-    ('rpart', '4.1-15', {
-        'checksums': ['2b8ebe0e9e11592debff893f93f5a44a6765abd0bd956b0eb1f70e9394cfae5c'],
-    }),
-    ('survival', '3.2-13', {
-        'checksums': ['3fab9c0ba2c4e2b6a475207e2629a7f06a104c70093dfb768f50a7caac9a317f'],
-    }),
-    ('KernSmooth', '2.23-20', {
-        'checksums': ['20eb75051e2473933d41eedc9945b03c632847fd581e2207d452cf317fa5ec39'],
-    }),
-    ('globals', '0.14.0', {
-        'checksums': ['203dbccb829ca9cc6aedb6f5e79cb126ea31f8dd379dff9111ec66e3628c32f3'],
-    }),
-    ('listenv', '0.8.0', {
-        'checksums': ['fd2aaf3ff2d8d546ce33d1cb38e68401613975117c1f9eb98a7b41facf5c485f'],
-    }),
-    ('parallelly', '1.28.1', {
-        'checksums': ['f4ae883b18409adb83c561ed69427e740e1b50bf85ef57f48c3f2edf837cc663'],
-    }),
-    ('future', '1.23.0', {
-        'checksums': ['d869c80e837c0937a414b8050deff081aefeac586b796f3d634d64f0f4fdb8f8'],
-    }),
-    ('future.apply', '1.8.1', {
-        'checksums': ['0d5bc3cb0289665bb27ae4ccad51fcc5ebf6dca46872b0a4e57790b9dc0aa6c7'],
-    }),
-    ('progressr', '0.9.0', {
-        'checksums': ['cfe70f8423041ea5b5a2a39122c166462e58b1bba84df935858a7b86362b530f'],
-    }),
-    ('numDeriv', '2016.8-1.1', {
-        'checksums': ['d8c4d19ff9aeb31b0c628bd4a16378e51c1c9a3813b525469a31fe89af00b345'],
-    }),
-    ('SQUAREM', '2021.1', {
-        'checksums': ['66e5e18ca29903e4950750bbd810f0f9df85811ee4195ce0a86d939ba8183a58'],
-    }),
-    ('lava', '1.6.10', {
-        'checksums': ['7a88f8a885872e2abb3011c446e9e1c4884cd4dbe6ab4cfe9207538e5560232e'],
-    }),
-    ('prodlim', '2019.11.13', {
-        'checksums': ['6809924f503a14681de84730489cdaf9240d7951c64f5b98ca37dc1ce7809b0f'],
-    }),
-    ('ipred', '0.9-12', {
-        'checksums': ['d6e1535704d39415a799d7643141ffa4f6f55597f03e763f4ccd5d8106005843'],
-    }),
-    ('cpp11', '0.4.0', {
-        'checksums': ['1768fd07dc30dfbbf8f3fb1a1183947cb7e1dfd909165c4d612a63c163a41e87'],
-    }),
-    ('lubridate', '1.8.0', {
-        'checksums': ['87d66efdb1f3d680db381d7e40a202d35645865a0542e2f270ef008a19002ba5'],
-    }),
-    ('tidyr', '1.1.4', {
-        'checksums': ['0b0c98be98a433e15a2550f60330b31a58529a9c58bc2abd7bff6462ab761241'],
-    }),
-    ('recipes', '0.1.17', {
-        'checksums': ['ed20ba0ea0165310e31864ed7d2e005a2a37b76c7913977fd124d8b567616d3d'],
-    }),
-    ('caret', '6.0-90', {
-        'checksums': ['e851a4ed7d939c665e57e3551a5464b09fe4285e7c951236efdd890b0da866bc'],
-    }),
-    ('conquer', '1.2.0', {
-        'checksums': ['10451223658e02b31b87f7f86a14e3d8c71bfbff62ea30f85b89cdef829f07f9'],
-    }),
-    ('quantreg', '5.86', {
-        'checksums': ['71d1c829af7574ca00575cc0375376ac3ecd54b3d6d36e8eecd71ed8acb9d605'],
-    }),
-    ('robustbase', '0.93-9', {
-        'checksums': ['d75fb5075463fec61d063bced7003936e9198492328b6fae15f67e8415713c45'],
-    }),
-    ('zoo', '1.8-9', {
-        'checksums': ['b7be259067a8b9d4a8f5d387e0946a5ba1eb43474baa67ccf4f8bf4b15f772a3'],
-    }),
-    ('lmtest', '0.9-38', {
-        'checksums': ['32a22cea45398ffc5732d9f5c0391431d0cdd3a9e29cc7b77bea32c1eb4a216b'],
-    }),
-    ('vcd', '1.4-9', {
-        'checksums': ['a5b420ad5ff1a27fa92f98099a8b43f2dded7e5f60297b3e4d947ad6f039568f'],
-    }),
-    ('snowfall', '1.84-6.1', {
-        'checksums': ['5c446df3a931e522a8b138cf1fb7ca5815cc82fcf486dbac964dcbc0690e248d'],
-    }),
-    ('bindr', '0.1.1', {
-        'checksums': ['7c785ca77ceb3ab9282148bcecf64d1857d35f5b800531d49483622fe67505d0'],
-    }),
-    ('plogr', '0.2.0', {
-        'checksums': ['0e63ba2e1f624005fe25c67cdd403636a912e063d682eca07f2f1d65e9870d29'],
-    }),
-    ('bindrcpp', '0.2.2', {
-        'checksums': ['48130709eba9d133679a0e959e49a7b14acbce4f47c1e15c4ab46bd9e48ae467'],
-    }),
-    ('tmvnsim', '1.0-2', {
-        'checksums': ['97f63d0bab3b240cc7bdbe6e6e74e90ad25a4382a345ee51a26fe3959edeba0f'],
-    }),
-    ('mnormt', '2.0.2', {
-        'checksums': ['5c6aa036d3f1035ffe8f9a8e95bb908b191b126b016591cf893c50472851f334'],
-    }),
-    ('foreign', '0.8-81', {
-        'checksums': ['1ae8f9f18f2a037697fa1a9060417ff255c71764f0145080b2bd23ba8262992c'],
-    }),
-    ('psych', '2.1.9', {
-        'checksums': ['1475e03a17f1ae6837834f01c2472aed68887c89d90a84a3e09a532ce218500c'],
-    }),
-    ('broom', '0.7.10', {
-        'checksums': ['129fd5a53abef7f42b7efac6c64ebd71269b136aa648846d640562357927464f'],
-    }),
-    ('nloptr', '1.2.2.2', {
-        'checksums': ['e80ea9619ac18f4bfe44812198b40b9ae5c0ddf3f9cc91778f9ccc82168d1372'],
-    }),
-    ('boot', '1.3-28', {
-        'checksums': ['9f7158fd2714659f590c3955651893dc24bd8f39196bc5a4cc35b0b031744a32'],
-    }),
-    ('statmod', '1.4.36', {
-        'checksums': ['14e897c83d426caca4d920d3d5bead7ae9a679276b3cb2e227f299ad189d7bc2'],
-    }),
-    ('lme4', '1.1-27.1', {
-        'checksums': ['25fa873e39b8192e48c15eec93db8c8bf6f03baf3bd8d5ca9188482ce8442ec5'],
-    }),
-    ('ucminf', '1.1-4', {
-        'checksums': ['a2eb382f9b24e949d982e311578518710f8242070b3aa3314a331c1e1e7f6f07'],
-    }),
-    ('ordinal', '2019.12-10', {
-        'checksums': ['7a41e7b7e852a8fa3e911f8859d36e5709ccec5ca42ee3de14a813b7aaac7725'],
-    }),
-    ('jomo', '2.7-2', {
-        'checksums': ['3962d5cbecc60e72670329dbef0dd74303080f5ea2a79c91e27f75db99ba6ce9'],
-    }),
-    ('clipr', '0.7.1', {
-        'checksums': ['ffad477b07847e3b68f7e4406bbd323025a8dae7e3c768943d4d307ee3248afb'],
-    }),
-    ('tzdb', '0.2.0', {
-        'checksums': ['c335905d452b400af7ed54b916b5246cb3f47ede0602911a2bcb25a1cf56d5a9'],
-    }),
-    ('bit64', '4.0.5', {
-        'checksums': ['25df6826ea5e93241c4874cad4fa8dadc87a40f4ff74c9107aa12a9e033e1578'],
-    }),
-    ('vroom', '1.5.5', {
-        'checksums': ['1d45688c08f162a3300eda532d9e87d144f4bc686769a521bf9a12e3d3b465fe'],
-    }),
-    ('readr', '2.0.2', {
-        'checksums': ['98b05ed751dda2bcf7a29d070ce3d3e8475e0138a3e3ec68941dc45218db7615'],
-    }),
-    ('forcats', '0.5.1', {
-        'checksums': ['c4fb96e874e2bedaa8a1aa32ea22abdee7906d93b5c5c7b42c0894c0c5b6a289'],
-    }),
-    ('haven', '2.4.3', {
-        'checksums': ['95b70f47e77792bed4312441787299d2e3e27d79a176f0638a37e5301b93295f'],
-    }),
-    ('pan', '1.6', {
-        'checksums': ['adc0df816ae38bc188bce0aef3aeb71d19c0fc26e063107eeee71a81a49463b6'],
-    }),
-    ('mitml', '0.4-3', {
-        'checksums': ['49bd3eb68a60fb2a269e7ddca8b862e1e81e0651e2b29759482fb7bcad452102'],
-    }),
-    ('mice', '3.13.0', {
-        'checksums': ['5108e4673512c96ced19c23fdbb0feea2b2a655a4c7dc9afb06a2a1a29f69785'],
-    }),
-    ('urca', '1.3-0', {
-        'checksums': ['621cc82398e25b58b4a16edf000ed0a1484d9a0bc458f734e97b6f371cc76aaa'],
-    }),
-    ('fracdiff', '1.5-1', {
-        'checksums': ['b8103b32a4ca3a59dda1624c07da08ecd144c7a91a747d1f4663e99421950eb6'],
-    }),
-    ('operator.tools', '1.6.3', {
-        'checksums': ['e5b74018fb75bfa02820dec4b822312f1640422f01d9fec1b58d880ffb798dec'],
-    }),
-    ('formula.tools', '1.7.1', {
-        'checksums': ['4fe0e72d9d96f2398e86cbd8536d0c84de38e5583d4ff7dcd73f415ddd8ca395'],
-    }),
-    ('logistf', '1.24', {
-        'checksums': ['6561d311fe21b789954cb33c008b86abdd6509b2a2900385dd6046163679d96b'],
-    }),
-    ('akima', '0.6-2.2', {
-        'checksums': ['deefc9ff82f78e68b7333c2fc88bd23863da9919493f2b73658044436f6b8742'],
-    }),
-    ('bitops', '1.0-7', {
-        'checksums': ['e9b5fc92c39f94a10cd0e13f3d6e2a9c17b75ea01467077a51d47a5f708517c4'],
-    }),
-    ('mixtools', '1.2.0', {
-        'checksums': ['ef033ef13625209065d26767bf70d129972e6808927f755629f1d70a118b9023'],
-    }),
-    ('cluster', '2.1.2', {
-        'checksums': ['5c8aa760fb6dda4fcfe6196e561ffcd2dc12b1a6c7659cb90be2cde747311499'],
-    }),
-    ('gclus', '1.3.2', {
-        'checksums': ['9cc61cdff206c11213e73afca3d570a7234250cf6044a9202c2589932278e0b3'],
-    }),
-    ('coda', '0.19-4', {
-        'checksums': ['422d3cfd34797a3631e9c4812431940599c0ca4bb9937797bed07b7b1d6fe58f'],
-    }),
-    ('doMC', '1.3.7', {
-        'checksums': ['defab27adc298a6746896d83251f8355d62c01012d51ef96d491875a2e74b54d'],
-    }),
-    ('DBI', '1.1.1', {
-        'checksums': ['572ab3b8a6421d0ac3e7665c4c842826f1723af98fca25d4f43edb419e771344'],
-    }),
-    ('gam', '1.20', {
-        'checksums': ['91eb416ba06aa1c3f611661530467f4513992f6c168e3f6e474cf57bae131efe'],
-    }),
-    ('gamlss.data', '6.0-1', {
-        'checksums': ['98fdec571aeacea4318c9e1c9d56b74716f3dc6acce385cbaad0d6128b154bb2'],
-    }),
-    ('gamlss.dist', '5.3-2', {
-        'checksums': ['0caa92cd20c3d2d11b1af4656fd0de09adf145992345cba07fdcd33b7716ced3'],
-    }),
-    ('gamlss', '5.3-4', {
-        'checksums': ['72707187471fd35c5379ae8c9b7b0ca87e302557f09cb3979d1cdb2e2500b01a'],
-    }),
-    ('gamlss.tr', '5.1-7', {
-        'checksums': ['8f9975bceaf8000b1d39317daf490e59c8385b5291326ed6a2630be11dae3137'],
-    }),
-    ('hwriter', '1.3.2', {
-        'checksums': ['6b3531d2e7a239be9d6e3a1aa3256b2745eb68aa0bdffd2076d36552d0d7322b'],
-    }),
-    ('xts', '0.12.1', {
-        'checksums': ['d680584af946fc30be0b2046e838cff7b3a65e00df1eadba325ca5e96f3dca2c'],
-    }),
-    ('curl', '4.3.2', {
-        'checksums': ['90b1facb4be8b6315bb3d272ba2dd90b88973f6ea1ab7f439550230f8500a568'],
-    }),
-    ('TTR', '0.24.2', {
-        'checksums': ['2587b988d9199474a19470b9b999b99133d0d8aa45410813e05c5f0ed763711b'],
-    }),
-    ('quantmod', '0.4.18', {
-        'checksums': ['aa40448e93a1facf399213ac691784007731e869ad243fe762381ab099cd6c35'],
-    }),
-    ('mvtnorm', '1.1-3', {
-        'checksums': ['ff4e302139ba631280fc9c4a2ab168596bfd09e17a805974199b043697c02448'],
-    }),
-    ('pcaPP', '1.9-74', {
-        'checksums': ['50837b434d67e4b5fcec34c689a9e30c7a9fb94c561b39f24e68a1456ff999b6'],
-    }),
-    ('pscl', '1.5.5', {
-        'checksums': ['054c9b88a991abdec3338688f58e81b6ba55f91edb988621864b24fd152fee6f'],
-    }),
-    ('fastmap', '1.1.0', {
-        'checksums': ['9113e526b4c096302cfeae660a06de2c4c82ae4e2d3d6ef53af6de812d4c822b'],
-    }),
-    ('cachem', '1.0.6', {
-        'checksums': ['9a9452f7bcf3f79436c418b3c3290449fb8fd338714d9b992153754d112f1864'],
-    }),
-    ('memoise', '2.0.0', {
-        'checksums': ['ff9ae3a1a95ad6271d98e6eca016768b790e44bd613356b8e86b685aefd9ecaf'],
-    }),
-    ('blob', '1.2.2', {
-        'checksums': ['4976053c65994c769a4c22b4553bea0bd9c623b3b991dbaf023d2a164770c7fa'],
-    }),
-    ('RSQLite', '2.2.8', {
-        'checksums': ['1b8adc1b7ed4bc5ec070b8765837cd4104fcdda482a1d335c030f51b427c4cc3'],
-    }),
-    ('BatchJobs', '1.8', {
-        'checksums': ['35cc2dae31994b1df982d11939509ce965e12578418c4fbb8cd7a422afd6e4ff'],
-    }),
-    ('sandwich', '3.0-1', {
-        'checksums': ['f6584b7084f3223bbc0c4722f53280496be73849747819b0cb4e8f3910284a89'],
-    }),
-    ('sfsmisc', '1.1-12', {
-        'checksums': ['9b12184a28fff87cacd0c3602d0cf63acb4d0f3049ad3a6ff16177f6df350782'],
-    }),
-    ('spatial', '7.3-14', {
-        'checksums': ['50e6daacbacff6c716485d20b15eb7fff7b8108dc5ea0ff508024beb4f0a8b9b'],
-    }),
-    ('VGAM', '1.1-5', {
-        'checksums': ['30190b150f3e5478137d288a45f575b2654ad7c29254b0a1fe5c954ee010a1bb'],
-    }),
-    ('waveslim', '1.8.2', {
-        'checksums': ['133c4f7a027282742fe99b583ca65f178fc7a3df2ce75cb4d60650f0a1dd7145'],
-    }),
-    ('xtable', '1.8-4', {
-        'checksums': ['5abec0e8c27865ef0880f1d19c9f9ca7cc0fd24eadaa72bcd270c3fb4075fd1c'],
-    }),
-    ('profileModel', '0.6.1', {
-        'checksums': ['91dc25e81f52506593f5c8d80a6131510b14525262f65b4ac10ae0cad0b2a506'],
-    }),
-    ('brglm', '0.7.2', {
-        'checksums': ['56098d2ce238478e7a27cacc4cdec0bc65f287fe746b38fbb1edda20c1675023'],
-    }),
-    ('deSolve', '1.30', {
-        'checksums': ['39f65d7af6b4d85eb023cce2a200c2de470644b22d45e210c5b7d558c3abf548'],
-    }),
-    ('tseriesChaos', '0.1-13.1', {
-        'checksums': ['23cb5fea56409a305e02a523ff8b7642ec383942d415c9cffdc92208dacfd961'],
-    }),
-    ('tseries', '0.10-48', {
-        'checksums': ['53bd22708c936205c5f839a10f2e302524d2cc54dc309e7d885ebd081ccb4471'],
-    }),
-    ('fastICA', '1.2-3', {
-        'checksums': ['e9ef82644cb64bb49ae3b7b6e0885f4fb2dc08ae030f8c76fe8dd8507b658950'],
-    }),
-    ('R.methodsS3', '1.8.1', {
-        'checksums': ['8a98fb81bcfa78193450f855f614f6f64e6c65daf115f301d97d1f474f5e619b'],
-    }),
-    ('R.oo', '1.24.0', {
-        'checksums': ['37a1dab8dd668ceba69a1ba36c0c60e9809e29b74bd56d1e8ed519e19c8e3bb6'],
-    }),
-    ('sys', '3.4', {
-        'checksums': ['17f88fbaf222f1f8fd07919461093dac0e7175ae3c3b3264b88470617afd0487'],
-    }),
-    ('askpass', '1.1', {
-        'checksums': ['db40827d1bdbb90c0aa2846a2961d3bf9d76ad1b392302f9dd84cc2fd18c001f'],
-    }),
-    ('openssl', '1.4.5', {
-        'checksums': ['4fc141aba8e94e9f5ecce6eda07e45a5e7048d8609ba909ede4f7f4933e0c1f7'],
-    }),
-    ('httr', '1.4.2', {
-        'checksums': ['462bed6ed0d92f811d5df4d294336025f1dbff357286999d9269bfd9c20b1ef9'],
-    }),
-    ('cgdsr', '1.3.0', {
-        'checksums': ['4aa2a3564cee2449c3ff39ab2ad631deb165d4c78b8107e0ff77a9095340cc1f'],
-    }),
-    ('R.utils', '2.11.0', {
-        'checksums': ['622860f995f78be3a6e439f29d945874c5cb0866f6a73a9b43ac1d4d7f23fed8'],
-    }),
-    ('R.matlab', '3.6.2', {
-        'checksums': ['1ba338f470a24b7f6ef68cadbd04eb468ead4a689f263d2642408ad591b786bb'],
-    }),
-    ('gridExtra', '2.3', {
-        'checksums': ['81b60ce6f237ec308555471ae0119158b115463df696d2eca9b177ded8988e3b'],
-    }),
-    ('gbm', '2.1.8', {
-        'checksums': ['7d5de3b980b8f23275e86ac9bed48a497c9aa53c58e407dfd676309f38272ec1'],
-    }),
-    ('Formula', '1.2-4', {
-        'checksums': ['cb70e373b5ed2fc8450937fb3321d37dfd22dcc6f07cb872a419d51205125caf'],
-    }),
-    ('acepack', '1.4.1', {
-        'checksums': ['82750507926f02a696f6cc03693e8d4a5ee7e92500c8c15a16a9c12addcd28b9'],
-    }),
-    ('proto', '1.0.0', {
-        'checksums': ['9294d9a3b2b680bb6fac17000bfc97453d77c87ef68cfd609b4c4eb6d11d04d1'],
-    }),
-    ('chron', '2.3-56', {
-        'checksums': ['863ecbb951a3da994761ea9062fa96d34e94e19fbc4122521ac179274dfa3f5d'],
-    }),
-    ('viridis', '0.6.2', {
-        'checksums': ['69b58cd1d992710a08b0b227fd0a9590430eea3ed4858099412f910617e41311'],
-    }),
-    ('yaml', '2.2.1', {
-        'checksums': ['1115b7bc2a397fa724956eec916df5160c600c99a3be186d21558dd38d782783'],
-    }),
-    ('htmltools', '0.5.2', {
-        'checksums': ['7dc7d50436e5a82a5801f85bcd2f572a06a98b4027d71aa17b4854ec9b2767fb'],
-    }),
-    ('htmlwidgets', '1.5.4', {
-        'checksums': ['1a3fc60f40717de7f1716b754fd1c31a132e489a2560a278636ee78eba46ffc1'],
-    }),
-    ('knitr', '1.36', {
-        'checksums': ['6ecef5b428d135e95a05f24f9f194d0d828b1180c61be44ad89b6210e32b8e41'],
-    }),
-    ('htmlTable', '2.3.0', {
-        'checksums': ['070d9a0ef6311304f6739d81f7690d8f19899451524b376b403d6a40d477a577'],
-    }),
-    ('Hmisc', '4.6-0', {
-        'checksums': ['2c1ce906b2333c6dc946dc7f10b74cfa552bce2b12dbebf295d143163562a1ad'],
-    }),
-    ('fastcluster', '1.2.3', {
-        'checksums': ['1f229129e1cddc78c7bb5ecc90c4d28ed810ee68cf210004c7cdfa12cfaf2a01'],
-    }),
-    ('registry', '0.5-1', {
-        'checksums': ['dfea36edb0a703ec57e111016789b47a1ba21d9c8ff30672555c81327a3372cc'],
-    }),
-    ('bibtex', '0.4.2.3', {
-        'checksums': ['7bad194920b412781ac9754ad41058d52d3cd7186e1851c2bce3640490e9bc6d'],
-    }),
-    ('pkgmaker', '0.32.2', {
-        'checksums': ['ce45b22def771a9c90a414093823e6befe7e23489c500eeccee5154b44d3ef91'],
-    }),
-    ('rngtools', '1.5.2', {
-        'checksums': ['7f8c76ca4c7851b69a86e27be09b02ddc86357f0388659ef8787634682e8a74d'],
-    }),
-    ('doParallel', '1.0.16', {
-        'checksums': ['f1bb26f964f30d47ae4d6cf2b0a2ca0c2122d376424875e82d9abe9e7b054eb2'],
-    }),
-    ('gridBase', '0.4-7', {
-        'checksums': ['be8718d24cd10f6e323dce91b15fc40ed88bccaa26acf3192d5e38fe33e15f26'],
-    }),
-    ('irlba', '2.3.3', {
-        'checksums': ['6ee233697bcd579813bd0af5e1f4e6dd1eea971e8919c748408130d970fef5c0'],
-    }),
-    ('igraph', '1.2.7', {
-        'checksums': ['25c1a03273359e012e2625d0d8826264c805037f247785e0b432e02c2aae1be5'],
-    }),
-    ('GeneNet', '1.2.15', {
-        'checksums': ['555ac4e1d6c53c099b94b9298b6a8893a07797886a21ce3655a98fa9a1326a85'],
-    }),
-    ('ape', '5.5', {
-        'checksums': ['a3aa01c74b99eafec7d98284e05957b6487b6971ced93f26881f2479bcd5299a'],
-    }),
-    ('RJSONIO', '1.3-1.6', {
-        'checksums': ['82d1c9ea7758b2a64ad683f9c46223dcba9aa8146b43c1115bf9aa76a657a09f'],
-    }),
-    ('caTools', '1.18.2', {
-        'checksums': ['75d61115afec754b053ed1732cc034f2aeb27b13e6e1932aa0f26bf590cf0293'],
-    }),
-    ('gplots', '3.1.1', {
-        'checksums': ['f9ae19c2574b6d41adbeccaf7bc66cf56d7b2769004daba7e0038d5fbd821339'],
-    }),
-    ('ROCR', '1.0-11', {
-        'checksums': ['57385a773220a3aaef5b221a68b2d9c2a94794d4f9e9fc3c1eb9521767debb2a'],
-    }),
-    ('later', '1.3.0', {
-        'checksums': ['08f50882ca3cfd2bb68c83f1fcfbc8f696f5cfb5a42c1448c051540693789829'],
-    }),
-    ('promises', '1.2.0.1', {
-        'checksums': ['8d3a8217909e91f4c2a2eebba5ac8fc902a9ac1a9e9d8a30815c9dc0f162c4b7'],
-    }),
-    ('httpuv', '1.6.3', {
-        'checksums': ['bfe338c86cc09968c5ec2fd1023040db323d3c3aa413d8d3e5ad4b320bf00876'],
-    }),
-    ('rjson', '0.2.20', {
-        'checksums': ['3a287c1e5ee7c333ed8385913c0a307daf99335fbdf803e9dcca6e3d5adb3f6c'],
-    }),
-    ('sourcetools', '0.1.7', {
-        'checksums': ['47984406efb3b3face133979ccbae9fefb7360b9a6ca1a1c11473681418ed2ca'],
-    }),
-    ('xml2', '1.3.2', {
-        'checksums': ['df22f9e7e3189d8c9b8804eaf0105324fdac983cffe743552f6d76613600a4cf'],
-    }),
-    ('commonmark', '1.7', {
-        'checksums': ['d14a767a3ea9778d6165f44f980dd257423ca6043926e3cd8f664f7171f89108'],
-    }),
-    ('jquerylib', '0.1.4', {
-        'checksums': ['f0bcc11dcde3a6ff180277e45c24642d3da3c8690900e38f44495efbc9064411'],
-    }),
-    ('rappdirs', '0.3.3', {
-        'checksums': ['49959f65b45b0b189a2792d6c1339bef59674ecae92f8c2ed9f26ff9e488c184'],
-    }),
-    ('fs', '1.5.0', {
-        'checksums': ['36df1653571de3c628a4f769c4627f6ac53d0f9e4106d9d476afb22ae9603897'],
-    }),
-    ('sass', '0.4.0', {
-        'checksums': ['7d06ca15239142a49e88bb3be494515abdd8c75f00f3f1b0ee7bccb55019bc2b'],
-    }),
-    ('bslib', '0.3.1', {
-        'checksums': ['5f5cb56e5cab9039a24cd9d70d73b69c2cab5b2f5f37afc15f71dae0339d9849'],
-    }),
-    ('fontawesome', '0.2.2', {
-        'checksums': ['572db64d1b3c9be301935e0ca7baec69f3a6e0aa802e23f1f224b3724259df64'],
-    }),
-    ('shiny', '1.7.1', {
-        'checksums': ['c03b2056fb41430352c7c0e812bcc8632e6ec4caef077d2f7633512d91721d00'],
-    }),
-    ('seqinr', '4.2-8', {
-        'checksums': ['584b34e9dec0320cef02096eb356a0f6115bbd24356cf62e67356963e9d5e9f7'],
-    }),
-    ('LearnBayes', '2.15.1', {
-        'checksums': ['9b110858456523ca0b2a63f22013c4e1fbda6674b9d84dc1f4de8bffc5260532'],
-    }),
-    ('deldir', '1.0-6', {
-        'checksums': ['6df6d8325c607e0b7d63cbc53c29e774eff95ad4acf9c7ec8f70693b0505f8c5'],
-    }),
-    ('gmodels', '2.18.1', {
-        'checksums': ['626140a34eb8c53dd0a06511a76c71bc61c48777fa76fcc5e6934c9c276a1369'],
-    }),
-    ('expm', '0.999-6', {
-        'checksums': ['2c79912fd2e03fcf89c29f09555880934402fcb2359af8b4579d79b4f955addc'],
-    }),
-    ('terra', '1.4-11', {
-        'checksums': ['0a8fc0deffd4f2d0065ac6b70ae5cda079a38fe86e40861df94d01d01412fd21'],
-    }),
-    ('raster', '3.5-2', {
-        'checksums': ['99565167f3ef41ade08b8466a172fc471c73184815c9fb199f9555db63e03d72'],
-    }),
-    ('spData', '2.0.1', {
-        'checksums': ['c635a3e2e5123b4cdb2e6877b9b09e3d50169e1512a53b2ba2db7fbe63b990fc'],
-    }),
-    ('units', '0.7-2', {
-        'checksums': ['b90be023431100632b3081747af9e743e615452b4ad38810991f7b024b7040eb'],
-    }),
-    ('classInt', '0.4-3', {
-        'checksums': ['9ede7a2a7a6b6c114919a3315a884fb592e33b037a50a4fe45cbd4fe2fc434ac'],
-    }),
-    ('vegan', '2.5-7', {
-        'checksums': ['e63b586951ea7d8b0118811f329c700212892ec1db3b93951603ce1d68aa462a'],
-    }),
-    ('rncl', '0.8.4', {
-        'checksums': ['6b19d0dd9bb08ecf99766be5ad684bcd1894d1cd9291230bdd709dbd3396496b'],
-    }),
-    ('XML', '3.99-0.8', {
-        'checksums': ['081f691c2ee8ad39c7c95281e7d9153ec04cee79ca2d41f5d82c2ec2f1d36b50'],
-    }),
-    ('tinytex', '0.34', {
-        'checksums': ['1d059397b70579c325b64bfd548ef7b985a7558bd1e3d95716e0ed7a0dd8e69b'],
-    }),
-    ('rmarkdown', '2.11', {
-        'checksums': ['9371255300e7ea4cd936978ad2ca3d205d8605e09f4913cb0d4725005a7a9775'],
-    }),
-    ('reshape', '0.8.8', {
-        'checksums': ['4d5597fde8511e8fe4e4d1fd7adfc7ab37ff41ac68c76a746f7487d7b106d168'],
-    }),
-    ('triebeard', '0.3.0', {
-        'checksums': ['bf1dd6209cea1aab24e21a85375ca473ad11c2eff400d65c6202c0fb4ef91ec3'],
-    }),
-    ('urltools', '1.7.3', {
-        'checksums': ['6020355c1b16a9e3956674e5dea9ac5c035c8eb3eb6bbdd841a2b5528cafa313'],
-    }),
-    ('httpcode', '0.3.0', {
-        'checksums': ['593a030a4f94c3df8c15576837c17344701bac023ae108783d0f06c476062f76'],
-    }),
-    ('crul', '1.1.0', {
-        'checksums': ['f0b6cfd19f7470a8aacc7621530315f83796aa64e24a47b96365963e5f615ace'],
-    }),
-    ('bold', '1.2.0', {
-        'checksums': ['8f1597f04acbe6b090232929325734c802049d82649ae102b438e1fa3af5a464'],
-    }),
-    ('rredlist', '0.7.0', {
-        'checksums': ['d2e66b655c43565a4cc0984dc3fcc9732652cb9677baaa9bb2b82e9f9d65e7f0'],
-    }),
-    ('rentrez', '1.2.3', {
-        'checksums': ['fb256597ebe7780e38bef9c4c2626b3feacd60c7a5a29fc6a218cf0d8d132f74'],
-    }),
-    ('rotl', '3.0.11', {
-        'checksums': ['339bf0b7527449eb495673e406b76a0831aa529fe05952c3448b455cd2c91c2c'],
-    }),
-    ('solrium', '1.2.0', {
-        'checksums': ['7ec64199497cc69f542fded955b709fc548cf8e2734c9db0f4a99a0ea67ca49b'],
-    }),
-    ('ritis', '1.0.0', {
-        'checksums': ['327b221872408b1f0fe0cce953685535b66d2fa5d6cac628e1142a26e4856136'],
-    }),
-    ('worrms', '0.4.2', {
-        'checksums': ['1ab228ea762a431a5e3a565b589b804fcb2865ceaa2b1459bd2ab3ebe8f5ebbe'],
-    }),
-    ('natserv', '1.0.0', {
-        'checksums': ['30f90f938e963191ef19b1433db1e265f67d8efe29c92a1d3603c3dc9a03d5c8'],
-    }),
-    ('WikipediR', '1.5.0', {
-        'checksums': ['f8d0e6f04fb65f7ad9c1c068852a6a8b699ffe8d39edf1f3fa07d32d087e8ff0'],
-    }),
-    ('ratelimitr', '0.4.1', {
-        'checksums': ['2b21e4574521c5336feeb3041eaf096bde7857b140049cdeb6ec97dc652aa71b'],
-    }),
-    ('rex', '1.2.0', {
-        'checksums': ['06b491f1469078862e40543fd74e1d38b2e0fb61fdf01c8083add4b11ac2eb54'],
-    }),
-    ('WikidataQueryServiceR', '1.0.0', {
-        'checksums': ['0e14eec8471a72227f800b41b331cfc49a94b4d4f49e68936448ebbae0b281ae'],
-    }),
-    ('pbapply', '1.5-0', {
-        'checksums': ['effdfee286e5ba9534dc2ac3cee96590a37f5cd2af28c836d00c25ca9f070a55'],
-    }),
-    ('WikidataR', '2.3.1', {
-        'checksums': ['dd349d160c1c0bae9e3efa336efc622ea9dd481cc0a449ceab49852d220eb2da'],
-    }),
-    ('wikitaxa', '0.4.0', {
-        'checksums': ['ba872853af59fdc8f1121d6e205f15e5bf4f2ec5ad68cd5755a423fa783bf7fc'],
-    }),
-    ('phangorn', '2.7.1', {
-        'checksums': ['d8a9d67851f16c3947575eb3344b9ce7ef856354e691211ef23c92b7889e1398'],
-    }),
-    ('uuid', '1.0-2', {
-        'checksums': ['0bed1a3fe298123e818b631c1a2d8bcf5c6ab334f625a482197324a877a6387a'],
-    }),
-    ('conditionz', '0.1.0', {
-        'checksums': ['ccd81e4f2534d29cddf44cf697f76ff01417cbeb22001a93477edc61cdd35646'],
-    }),
-    ('taxize', '0.9.99', {
-        'checksums': ['1a5d2783a82db4b6dd13df3639c7cd07112c1d83ddaabc83706ff235d977681c'],
-    }),
-    ('RNeXML', '2.4.5', {
-        'checksums': ['2b667ecb6400e4c0c125ca73a98cde81330cde3a85b764261f77159e702754f3'],
-    }),
-    ('phylobase', '0.8.10', {
-        'checksums': ['5a44380ff49bab333a56f6f96157324ade8afb4af0730e013194c4badb0bf94b'],
-    }),
-    ('magick', '2.7.3', {
-        'checksums': ['83877b2e23ea43fbc1164de9c2422eafbe7858393ac384df5adf3a7eec122441'],
-    }),
-    ('animation', '2.7', {
-        'checksums': ['88418f1b04ec785963bad492f30eb48b05914e9e5d88c7eef705d949cbd7e469'],
-    }),
-    ('bigmemory.sri', '0.1.3', {
-        'checksums': ['55403252d8bae9627476d1f553236ea5dc7aa6e54da6980526a6cdc66924e155'],
-    }),
-    ('bigmemory', '4.5.36', {
-        'checksums': ['18c67fbe6344b2f8223456c4f19ceebcf6c1166255eab81311001fd67a45ef0e'],
-    }),
-    ('calibrate', '1.7.7', {
-        'checksums': ['713b09b415c954e1ef5216088acd40621b0546c45afbb8c2c6f118ecb5cd6fa6'],
-    }),
-    ('clusterGeneration', '1.3.7', {
-        'checksums': ['534f29d8f7ed11e6e9a496f15845b588ec7133f3da5e6def8140b88500e52d5c'],
-    }),
-    ('dismo', '1.3-5', {
-        'checksums': ['812e1932d42c0f40acf2ab5c5b2d068f93128caf648626e1d11baf1a09340ee7'],
-    }),
-    ('extrafontdb', '1.0', {
-        'checksums': ['faa1bafee5d4fbc24d03ed237f29f1179964ebac6e3a46ac25b0eceda020b684'],
-    }),
-    ('Rttf2pt1', '1.3.9', {
-        'checksums': ['8667e48ed639c80180b1c1b65eff6ca2031bc9633a4fe79b50772f92375e3e71'],
-    }),
-    ('extrafont', '0.17', {
-        'checksums': ['2f6d7d79a890424b56ddbdced361f8b9ddede5edd33e090b816b88a99315332d'],
-    }),
-    ('fields', '13.3', {
-        'checksums': ['c652838b1ae7eb368831522824bfbc1d1db7b9d1db5e9bb52b194098549944c3'],
-    }),
-    ('shapefiles', '0.7', {
-        'checksums': ['eeb18ea4165119519a978d4a2ba1ecbb47649deb96a7f617f5b3100d63b3f021'],
-    }),
-    ('fossil', '0.4.0', {
-        'checksums': ['37c082fa15ebae89db99d6071b2bb2cad6a97a0405e9b4ef77f62a8f6ad274c1'],
-    }),
-    ('phytools', '0.7-90', {
-        'checksums': ['48615a709760af5f298f0af6615d238c96cad7d26e997fb65467520aad37e0d1'],
-    }),
-    ('geiger', '2.0.7', {
-        'checksums': ['d200736c4ad7ed4bc55a13e7d0126ddc7fed88e245cd5706d4692aaa437e9596'],
-    }),
-    ('shape', '1.4.6', {
-        'checksums': ['b9103e5ed05c223c8147dbe3b87a0d73184697343634a353a2ae722f7ace0b7b'],
-    }),
-    ('glmnet', '4.1-2', {
-        'checksums': ['06ab2b58c0b431736605aee2d42e517e0e2640d16b5a6c7867a25f05dd44cdcd'],
-    }),
-    ('crosstalk', '1.1.1', {
-        'checksums': ['ed3234f7f000fb607cc42e005d68be1dd598d95fa687a3f6e6b17ba38e36ccd8'],
-    }),
-    ('miniUI', '0.1.1.1', {
-        'checksums': ['452b41133289f630d8026507263744e385908ca025e9a7976925c1539816b0c0'],
-    }),
-    ('webshot', '0.5.2', {
-        'checksums': ['f183dc970157075b51ac543550a7a48fa3428b9c6838abb72fe987c21982043f'],
-    }),
-    ('shinyjs', '2.0.0', {
-        'checksums': ['c2cdd9fab41f6b46bb41b288cd9b3fb3a7fe9627b664e3a58a0cb5dd4c19f8ff'],
-    }),
-    ('manipulateWidget', '0.11.1', {
-        'checksums': ['5b73728d7d6dcc32f32d861375074cd65112c03a01e4ee4fa94e21b063fdefb6'],
-    }),
-    ('rgl', '0.107.14', {
-        'checksums': ['67213c3215bcadb56e15922fbf0dc7f6a6642cc3d924363dcb1705291727b0fc'],
-    }),
-    ('Rtsne', '0.15', {
-        'checksums': ['56376e4f0a382fad3d3d40e2cb0562224be5265b827622bcd235e8fc63df276c'],
-    }),
-    ('labdsv', '2.0-1', {
-        'checksums': ['5a4d55e9be18222dc47e725008b450996448ab117d83e7caaa191c0f13fd3925'],
-    }),
-    ('stabs', '0.6-4', {
-        'checksums': ['f8507337789f668e421a6ee7b11dd5ea331bf8bff0f9702dd1b93f46c2f3c1d9'],
-    }),
-    ('modeltools', '0.2-23', {
-        'checksums': ['6b3e8d5af1a039db5c178498dbf354ed1c5627a8cea9229726644053443210ef'],
-    }),
-    ('strucchange', '1.5-2', {
-        'checksums': ['7d247c5ae6f5a63c80e478799d009c57fb8803943aa4286d05f71235cc1002f8'],
-    }),
-    ('TH.data', '1.1-0', {
-        'checksums': ['21b37e251da5635ae91668f64b4c6f6a7ccedbe1f01af769d30fb532af83113e'],
-    }),
-    ('multcomp', '1.4-17', {
-        'checksums': ['41509d8457cfad9ce579115e6e0ed1f7c0244455a8639cbd38a6d755d338fb0b'],
-    }),
-    ('libcoin', '1.0-9', {
-        'checksums': ['2d7dd0b7c6dfc20472430570419ea36a714da7bbafd336da1fb53c5c6463d9eb'],
-    }),
-    ('coin', '1.4-2', {
-        'checksums': ['7546d1f27a82d98b4b3e43e4659eba0f74a67d5919ce85d2fb360282ba3cfbb2'],
-    }),
-    ('party', '1.3-9', {
-        'checksums': ['29a1fefdb86369285ebf5d48ab51268a83e2011fb9d9f609a2250b5f0b169089'],
-    }),
-    ('inum', '1.0-4', {
-        'checksums': ['5febef69c43a4b95b376c1418550a949d988a5f26b1383ca01c9728a94fc13ce'],
-    }),
-    ('partykit', '1.2-15', {
-        'checksums': ['b2e9454b2f4b9a39c9581c5871462f00acef4eeee5696ce3e32cfa1468d1e3ac'],
-    }),
-    ('mboost', '2.9-5', {
-        'checksums': ['cf9b13e00efe0b25702cb33151e8c11eff2de07db805db217472e9d09a3be079'],
-    }),
-    ('msm', '1.6.9', {
-        'checksums': ['aefcd9bb40b0167311d088d6fe23fdf7aa35deaac0f8b47ef02377cff5577023'],
-    }),
-    ('nor1mix', '1.3-0', {
-        'checksums': ['9ce4ee92f889a4a4041b5ea1ff09396780785a9f12ac46f40647f74a37e327a0'],
-    }),
-    ('np', '0.60-11', {
-        'checksums': ['a3b31b8ad70c42826076786b2b1b63b79cdbadfa55fe126773bc357686fd33a9'],
-    }),
-    ('polynom', '1.4-0', {
-        'checksums': ['c5b788b26f7118a18d5d8e7ba93a0abf3efa6603fa48603c70ed63c038d3d4dd'],
-    }),
-    ('polspline', '1.1.19', {
-        'checksums': ['953e3c4d007c3ef86ac2af3c71b272a99e8e35b194bdd58575785558c6711f66'],
-    }),
-    ('rms', '6.2-0', {
-        'checksums': ['10d58cbfe39fb434223834e29e5248c9384cded23e6267cfc99367d0f5ee24b6'],
-    }),
-    ('RWekajars', '3.9.3-2', {
-        'checksums': ['16e6b019aab1646f89c5203f0d6fc1cb800129e5169b15aaef30fd6236f5da1a'],
-    }),
-    ('RWeka', '0.4-43', {
-        'checksums': ['8c227a5935cff180d03c30eb73bdd00b16737579c8b8503ec7fccc17e746179a'],
-    }),
-    ('slam', '0.1-48', {
-        'checksums': ['0a0b32d35fd6b8d1ac021b1358e73d32ab942d274a84fbba732d6c02efdcfade'],
-    }),
-    ('tm', '0.7-8', {
-        'checksums': ['b1eb1683d956db1a207b61cc086ae08b3ca7f46b6b8bc46d09ba5a4fafa66256'],
-    }),
-    ('leaps', '3.1', {
-        'checksums': ['3d7c3a102ce68433ecf167ece96a7ebb4207729e4defd0ac8fc00e7003f5c3b6'],
-    }),
-    ('cNORM', '2.1.0', {
-        'checksums': ['52d0f831c2bfac93999b004c6f9ef84fe8230dc954da7b3d10030640fb7e3106'],
-    }),
-    ('TraMineR', '2.2-2', {
-        'checksums': ['0c0823e2f591bb669f8f36dac22199c0d2e2dfb20fc89d62e4a44575d57397a9'],
-    }),
-    ('chemometrics', '1.4.2', {
-        'checksums': ['b705832fa167dc24b52b642f571ed1efd24c5f53ba60d02c7797986481b6186a'],
-    }),
-    ('FNN', '1.1.3', {
-        'checksums': ['de763a25c9cfbd19d144586b9ed158135ec49cf7b812938954be54eb2dc59432'],
-    }),
-    ('miscTools', '0.6-26', {
-        'checksums': ['be3c5a63ca12ce7ce4d43767a1815cd3dcf32664728ade251cfb03ea6f77fc9a'],
-    }),
-    ('maxLik', '1.5-2', {
-        'checksums': ['7cee05be0624b6a76911fa7b0d66f3e1b78460e0c55ed8bc904ce1e8af7bb15d'],
-    }),
-    ('gbRd', '0.4-11', {
-        'checksums': ['0251f6dd6ca987a74acc4765838b858f1edb08b71dbad9e563669b58783ea91b'],
-    }),
-    ('rbibutils', '2.2.4', {
-        'checksums': ['bb9e7bd0ca472f7851704bd9a52ef7eca7540db32523f1b1f7e3bf06268cde97'],
-    }),
-    ('Rdpack', '2.1.2', {
-        'checksums': ['714897ec115344d9a9d423519f4c289e71038f80abccced02a47cdc05d61a168'],
-    }),
-    ('dfidx', '0.0-4', {
-        'checksums': ['04255de9b002b2f89db04144edcd72e21804e0c129a3e5082b4a21630c850702'],
-    }),
-    ('mlogit', '1.1-1', {
-        'checksums': ['6f3ea97db410be929a3078422f3d354d2f17855a21bbdc7c2c09d901e233d143'],
-    }),
-    ('getopt', '1.20.3', {
-        'checksums': ['531f5fdfdcd6b96a73df2b39928418de342160ac1b0043861e9ea844f9fbf57f'],
-    }),
-    ('gsalib', '2.1', {
-        'checksums': ['e1b23b986c18b89a94c58d9db45e552d1bce484300461803740dacdf7c937fcc'],
-    }),
-    ('optparse', '1.7.1', {
-        'checksums': ['324e304c13efd565d766766193d4ccd75e2cd949dfcfb416afc3939489071fe7'],
-    }),
-    ('labelled', '2.9.0', {
-        'checksums': ['36ac0e169ee065a8bced9417efeb85d62e1504a590d4321667d8a6213285d639'],
-    }),
-    ('R.cache', '0.15.0', {
-        'checksums': ['adb4d3b08f7917e10fe6188c7b90a3318701a974c58eaa09943b929382bdf126'],
-    }),
-    ('styler', '1.6.2', {
-        'checksums': ['a62fcc76aac851069f33874f9eaabdd580973b619cfc625d6ec910476015f75c'],
-    }),
-    ('questionr', '0.7.5', {
-        'checksums': ['a1a25d8ab228a8d3bdb6c37d50db3964fe33a3fe1c46a95331b029261977d4a3'],
-    }),
-    ('klaR', '0.6-15', {
-        'checksums': ['5bfe5bc643f8a64b222317732c26e9f93be297cdc318a869f15cc9ab0d9e0fae'],
-    }),
-    ('neuRosim', '0.2-12', {
-        'checksums': ['f4f718c7bea2f4b61a914023015f4c71312f8a180124dcbc2327b71b7be256c3'],
-    }),
-    ('locfit', '1.5-9.4', {
-        'checksums': ['d9d3665c5f3d49f698fb4675daf40a0550601e86db3dc00f296413ceb1099ced'],
-    }),
-    ('GGally', '2.1.2', {
-        'checksums': ['30352f36bf061bc98bdd5fa373ea0f23d007040bd908c7c018c8e627e0fb28e5'],
-    }),
-    ('beanplot', '1.2', {
-        'checksums': ['49da299139a47171c5b4ccdea79ffbbc152894e05d552e676f135147c0c9b372'],
-    }),
-    ('clValid', '0.7', {
-        'checksums': ['037da469891462021eb177f9c9e18caefa8532f08c68fb576fae1668a1f451a1'],
-    }),
-    ('DiscriMiner', '0.1-29', {
-        'checksums': ['5aab7671086ef9940e030324651976456f0e84dab35edb7048693ade885228c6'],
-    }),
-    ('ellipse', '0.4.2', {
-        'checksums': ['1719ce9a00b9ac4d56dbf961803085b892d3359726fda3567bb989ddfed9a5f2'],
-    }),
-    ('pbkrtest', '0.5.1', {
-        'checksums': ['b2a3452003d93890f122423b3f2487dcb6925440f5b8a05578509e98b6aec7c5'],
-    }),
-    ('carData', '3.0-4', {
-        'checksums': ['cda6f5e3efc1d955a4a0625e9c33f90d49f5455840e88b3bd757129b86044724'],
-    }),
-    ('maptools', '1.1-2', {
-        'checksums': ['3995c96e8472cd6717fe3cbd3506358ff460b6c2cf92dbe4b00f75f507514439'],
-    }),
-    ('zip', '2.2.0', {
-        'checksums': ['9f95987c964039834f770ecda2d5f7e3d3a9de553c89db2a5926c4219bf4b9d8'],
-    }),
-    ('openxlsx', '4.2.4', {
-        'checksums': ['af571b3c60cea2a5975f6a394469f1c50266d4a5c5c91896b991b1b3ba8bc86e'],
-    }),
-    ('rematch', '1.0.1', {
-        'checksums': ['a409dec978cd02914cdddfedc974d9b45bd2975a124d8870d52cfd7d37d47578'],
-    }),
-    ('cellranger', '1.1.0', {
-        'checksums': ['5d38f288c752bbb9cea6ff830b8388bdd65a8571fd82d8d96064586bd588cf99'],
-    }),
-    ('readxl', '1.3.1', {
-        'checksums': ['24b441713e2f46a3e7c6813230ad6ea4d4ddf7e0816ad76614f33094fbaaaa96'],
-    }),
-    ('rio', '0.5.27', {
-        'checksums': ['e0eb616cdbba9f2d5c4489ae05336201d717ce65b0ea6854023054d1c2e3dd0a'],
-    }),
-    ('car', '3.0-11', {
-        'checksums': ['b32c927206f515631ff276dbb337b0f22e9b2d851f4abb1d2c272e534c19542c'],
-    }),
-    ('flashClust', '1.01-2', {
-        'checksums': ['48a7849bb86530465ff3fbfac1c273f0df4b846e67d5eee87187d250c8bf9450'],
-    }),
-    ('ggrepel', '0.9.1', {
-        'checksums': ['29fb916d4799ba6503a5dd019717ffdf154d2aaae9ff1736f03e2be24af6bdfc'],
-    }),
-    ('DT', '0.19', {
-        'checksums': ['baa6bdae215ab84a5dee9c0a6c55dd92135c795d13dfce3c3485519c6f0e3b13'],
-    }),
-    ('FactoMineR', '2.4', {
-        'checksums': ['b9e3adce9a66b4daccc85fa67cb0769d6be230beeb126921b386ccde5db2e851'],
-    }),
-    ('flexclust', '1.4-0', {
-        'checksums': ['82fe445075a795c724644864c7ee803c5dd332a89ea9e6ccf7cd1ae2d1ecfc74'],
-    }),
-    ('flexmix', '2.3-17', {
-        'checksums': ['36019b7833032409ac61720dd625fa5a581a1d8bcba9045b04979c90907b5649'],
-    }),
-    ('prabclus', '2.3-2', {
-        'checksums': ['f421bcbcb557281e0de4a06b15f9a496adb5c640e883c0f7bb12051efc69e441'],
-    }),
-    ('diptest', '0.76-0', {
-        'checksums': ['508a5ebb161519cd0fcd156dc047b51becb216d545d62c6522496463f94ec280'],
-    }),
-    ('trimcluster', '0.1-5', {
-        'checksums': ['9239f20e4a06ac2fa89e5d5d89b23a45c8c534a7264d89bede8a35d43dda518b'],
-    }),
-    ('fpc', '2.2-9', {
-        'checksums': ['29b0006e96c8645645d215d3378551bd6525aaf45abde2d9f12933cf6e75fa38'],
-    }),
-    ('BiasedUrn', '1.07', {
-        'checksums': ['2377c2e59d68e758a566452d7e07e88663ae61a182b9ee455d8b4269dda3228e'],
-    }),
-    ('TeachingDemos', '2.12', {
-        'checksums': ['3e75405ce1affa406d6df85e06f96381412bc7a2810b25d8c81bfe64c4698644'],
-    }),
-    ('kohonen', '3.0.10', {
-        'checksums': ['996956ea46a827c9f214e4f940a19304a0ff35bda707d4d7312f80d3479067b2'],
-    }),
-    ('base64', '2.0', {
-        'checksums': ['8e259c2b12446197d1152b83a81bab84ccb5a5b77021a9b5645dd4c63c804bd1'],
-    }),
-    ('doRNG', '1.8.2', {
-        'checksums': ['33e9d45b91b0fde2e35e911b9758d0c376049121a98a1e4c73a1edfcff11cec9'],
-    }),
-    ('nleqslv', '3.3.2', {
-        'checksums': ['f54956cf67f9970bb3c6803684c84a27ac78165055745e444efc45cfecb63fed'],
-    }),
-    ('Deriv', '4.1.3', {
-        'checksums': ['dbdbf5ed8babf706373ae33a937d013c46110a490aa821bcd158a70f761d0f8c'],
-    }),
-    ('RGCCA', '2.1.2', {
-        'checksums': ['20f341fca8f616c556699790814debdf2ac7aa4dd9ace2071100c66af1549d7d'],
-    }),
-    ('pheatmap', '1.0.12', {
-        'checksums': ['579d96ee0417203b85417780eca921969cda3acc210c859bf9dfeff11539b0c1'],
-    }),
-    ('pvclust', '2.2-0', {
-        'checksums': ['7892853bacd413b5a921006429641ad308a344ca171b3081c15e4c522a8b0201'],
-    }),
-    ('RCircos', '1.2.1', {
-        'checksums': ['3b9489ab05ea83ead99ca6e4a1e6830467a2064779834aff1317b42bd41bb8fd'],
-    }),
-    ('lambda.r', '1.2.4', {
-        'checksums': ['d252fee39065326c6d9f45ad798076522cec05e73b8905c1b30f95a61f7801d6'],
-    }),
-    ('futile.options', '1.0.1', {
-        'checksums': ['7a9cc974e09598077b242a1069f7fbf4fa7f85ffe25067f6c4c32314ef532570'],
-    }),
-    ('futile.logger', '1.4.3', {
-        'checksums': ['5e8b32d65f77a86d17d90fd8690fc085aa0612df8018e4d6d6c1a60fa65776e4'],
-    }),
-    ('VennDiagram', '1.7.0', {
-        'checksums': ['7537566ae94ea4bde97ca819ce5ec477943f33847a8eb0042d0859ce11ab35d1'],
-    }),
-    ('xlsxjars', '0.6.1', {
-        'checksums': ['37c1517f95f8bca6e3514429394d2457b9e62383305eba288416fb53ab2e6ae6'],
-    }),
-    ('xlsx', '0.6.5', {
-        'checksums': ['378c5ed475a3d7631ea1ea13e0a69d619c1a52260922abda42818752dbb32107'],
-    }),
-    ('uroot', '2.1-2', {
-        'checksums': ['bd7fd9e35928d09d0e8fae9e4359a2b2bca6e6865b278436319e2f91db0e4b37'],
-    }),
-    ('forecast', '8.15', {
-        'checksums': ['c73aabed083095b457ed875c240716686fbd41d1cbafa116b7b890a54b919174'],
-    }),
-    ('fma', '2.4', {
-        'checksums': ['69a94c3bd464176a80232d49fcd04d478d4dd59f9bf128d6a9f46e49612d27f4'],
-    }),
-    ('expsmooth', '2.3', {
-        'checksums': ['ac7da36347f983d6ec71715daefd2797fe2fc505c019f4965cff9f77ce79982a'],
-    }),
-    ('fpp', '0.5', {
-        'checksums': ['9c87dd8591b8a87327cae7a03fd362a5492495a96609e5845ccbeefb96e916cb'],
-    }),
-    ('tensor', '1.5', {
-        'checksums': ['e1dec23e3913a82e2c79e76313911db9050fb82711a0da227f94fc6df2d3aea6'],
-    }),
-    ('polyclip', '1.10-0', {
-        'checksums': ['74dabc0dfe5a527114f0bb8f3d22f5d1ae694e6ea9345912909bae885525d34b'],
-    }),
-    ('goftest', '1.2-3', {
-        'checksums': ['3a5f74b6ae7ece5b294781ae57782abe12375d61789c55ff5e92e4aacf347f19'],
-    }),
-    ('spatstat.utils', '2.2-0', {
-        'checksums': ['5ad87e524285621dc4ef75c941eba933d980125293ee8f2bef5b7db02f63d7ab'],
-    }),
-    ('spatstat.data', '2.1-0', {
-        'checksums': ['1b9840ad0ec7eddfa98a01e8b8a5291e5cb447c3082aa7d7b4df762577f95533'],
-    }),
-    ('spatstat.geom', '2.3-0', {
-        'checksums': ['7b1746a44509a6d518799332477fffa3474217c6cb3c6b92a325525b48fce9c7'],
-    }),
-    ('spatstat.sparse', '2.0-0', {
-        'checksums': ['27fbce64e21f095a5e9ac54c86f91c9f4b45eac3c2358580e04423b4beba19c7'],
-    }),
-    ('spatstat.core', '2.3-0', {
-        'checksums': ['5795ec6db2961dce740c7cd39a9c1b855d92a4af351a794a9bfd634a3f1526c9'],
-    }),
-    ('spatstat.linnet', '2.3-0', {
-        'checksums': ['f0c089c41db8fe83d09ecb396ce8952a593c265411fb997847201d9784f9a2f9'],
-    }),
-    ('spatstat', '2.2-0', {
-        'checksums': ['8f0f90e8d5af1e2e97ef5f01e595511916290d554fc1ae3ad7b217605bd4e353'],
-    }),
-    ('pracma', '2.3.3', {
-        'checksums': ['cf1f8d7724a385d9a2e1a5496d9ba0e9908940b85669fb2c506b9059722cb93c'],
-    }),
-    ('RCurl', '1.98-1.5', {
-        'checksums': ['73187c9a039188ffdc255fb7fa53811a6abfb31e6375a51eae8c763b37dd698d'],
-    }),
-    ('bio3d', '2.4-2', {
-        'checksums': ['91415766cda0f96557e6bc568dbce8d44254a9460f2e2d0beed0ce14ffad6ccb'],
-    }),
-    ('AUC', '0.3.0', {
-        'checksums': ['e705f2c63d336249d19187f3401120d738d42d323fce905f3e157c2c56643766'],
-    }),
-    ('interpretR', '0.2.4', {
-        'checksums': ['4c08a6dffd6fd5764f27812f3a085c53e6a21d59ae82d903c9c0da93fd1dd059'],
-    }),
-    ('cvAUC', '1.1.0', {
-        'checksums': ['c4d8ed53b93869650aa2f666cf6d1076980cbfea7fa41f0b8227595be849738d'],
-    }),
-    ('SuperLearner', '2.0-28', {
-        'checksums': ['5f42233abd48f1740c33aae1ec4ad8e9952fddb5df1ee49ff2d43d5d89f05601'],
-    }),
-    ('mediation', '4.5.0', {
-        'checksums': ['210206618787c395a67689be268283df044deec7199d9860ed95218ef1e60845'],
-    }),
-    ('CVST', '0.2-2', {
-        'checksums': ['854b8c983427ecf9f2f7798c4fd1c1d06762b5b0bcb1045502baadece6f78316'],
-    }),
-    ('DRR', '0.0.4', {
-        'checksums': ['93e365a4907e301ae01f7d943e6bdcda71ef23c51a4759ba3c94bcf842d4e0f8'],
-    }),
-    ('dimRed', '0.2.3', {
-        'checksums': ['e6e56e3f6999ebdc326e64ead5269f3aaf61dd587beefafb7536ac3890370d84'],
-    }),
-    ('ddalpha', '1.3.11', {
-        'checksums': ['c30b4a3a9549cb4dc0a8e51e06f5b6e4c457c5326acc8f4680968c920f59b6e9'],
-    }),
-    ('RcppRoll', '0.3.0', {
-        'checksums': ['cbff2096443a8a38a6f1dabf8c90b9e14a43d2196b412b5bfe5390393f743f6b'],
-    }),
-    ('adabag', '4.2', {
-        'checksums': ['47019eb8cefc8372996fbb2642f64d4a91d7cedc192690a8d8be6e7e03cd3c81'],
-    }),
-    ('parallelMap', '1.5.1', {
-        'checksums': ['c108a634a335ed47b0018f532a52b032487e239c5061f939ba32355dfefde7e1'],
-    }),
-    ('ParamHelpers', '1.14', {
-        'checksums': ['b17652d0a69de3241a69f20be4ad1bfe02c413328a17f3c1ac7b73886a6ba2eb'],
-    }),
-    ('ggvis', '0.4.7', {
-        'checksums': ['9e6b067e11d497c796d42156570e2481afb554c5db265f42afbb74d2ae0865e3'],
-    }),
-    ('mlr', '2.19.0', {
-        'checksums': ['1149c9b453896481c85906045aa82d511d96979ddecbe5a3faf04f9f4a5e6113'],
-    }),
-    ('unbalanced', '2.0', {
-        'checksums': ['9be32b1ce9d972f1abfff2fbe18f5bb5ba9c3f4fb1282063dc410b82ad4d1ea2'],
-    }),
-    ('RSNNS', '0.4-14', {
-        'checksums': ['7f6262cb2b49b5d5979ccce9ded9cbb2c0b348fd7c9eabc1ea1d31c51a102c20'],
-    }),
-    ('abc.data', '1.0', {
-        'checksums': ['b242f43c3d05de2e8962d25181c6b1bb6ca1852d4838868ae6241ca890b161af'],
-    }),
-    ('abc', '2.1', {
-        'checksums': ['0bd2dcd4ee1915448d325fb5e66bee68e0497cbd91ef67a11b400b2fbe52ff59'],
-    }),
-    ('lhs', '1.1.3', {
-        'checksums': ['e43b8d48db1cf26013697e2a798ed1d31d1ee1790f2ebfecb280176c0e0c06d1'],
-    }),
-    ('tensorA', '0.36.2', {
-        'checksums': ['8e8947566bd3b65a54de4269df1abaa3d49cf5bfd2a963c3274a524c8a819ca7'],
-    }),
-    ('EasyABC', '1.5', {
-        'checksums': ['1dd7b1383a7c891cafb34d9cec65d92f1511a336cff1b219e63c0aa791371b9f'],
-    }),
-    ('whisker', '0.4', {
-        'checksums': ['7a86595be4f1029ec5d7152472d11b16175737e2777134e296ae97341bf8fba8'],
-    }),
-    ('roxygen2', '7.1.2', {
-        'checksums': ['b3693d1eb57bb1c27134447ea7f64c353c085dd2237af7cfacc75fca3d2fc5fd'],
-    }),
-    ('git2r', '0.28.0', {
-        'checksums': ['ce6d148d21d2c87757e98ef4474b2d09faded9b9b866f046bd26d4ca925e55f2'],
-    }),
-    ('rversions', '2.1.1', {
-        'checksums': ['79aaacf5a1258d91ac0ddedf3c8c16a2d10d39010993dcc7b0a2638afee27cb1'],
-    }),
-    ('xopen', '1.0.0', {
-        'checksums': ['e207603844d69c226142be95281ba2f4a056b9d8cbfae7791ba60535637b3bef'],
-    }),
-    ('sessioninfo', '1.2.0', {
-        'checksums': ['adebf738ad3d3af9e018302d949994240311ef06c0a77c645b2f761c1a8c07df'],
-    }),
-    ('rcmdcheck', '1.4.0', {
-        'checksums': ['bbd4ef7d514b8c2076196a7c4a6041d34623d55fbe73f2771758ce61fd32c9d0'],
-    }),
-    ('remotes', '2.4.1', {
-        'checksums': ['d5d777b2e10d70fd0670166d539eab88ec4f7fe030f54ec5cd2703f548473276'],
-    }),
-    ('clisymbols', '1.2.0', {
-        'checksums': ['0649f2ce39541820daee3ed408d765eddf83db5db639b493561f4e5fbf88efe0'],
-    }),
-    ('ini', '0.3.1', {
-        'checksums': ['7b191a54019c8c52d6c2211c14878c95564154ec4865f57007953742868cd813'],
-    }),
-    ('gitcreds', '0.1.1', {
-        'checksums': ['b14aaf4e910a9d2d6c65c93e645f0b0159c00898e669f917f83c03dfedb1dfea'],
-    }),
-    ('gh', '1.3.0', {
-        'checksums': ['a44039054e8ca56496f2d9c7a10cdadf4a7383bc91086e768ba7e7f1fbcaed1c'],
-    }),
-    ('credentials', '1.3.1', {
-        'checksums': ['8795a73a65d1ce2e9f0be66546e85231c846ba6445a11948b9816fbee20a7a60'],
-    }),
-    ('gert', '1.4.1', {
-        'checksums': ['623b58f12c5530b101e91a352269fe011814b074cf7a7ed0b3cd4506390a63f8'],
-    }),
-    ('usethis', '2.1.3', {
-        'checksums': ['2db075980247d854110de60e7afe6f6e0b654a3ba49d0699ff40dd516e8e9bbf'],
-    }),
-    ('covr', '3.5.1', {
-        'checksums': ['a54cfc3623ea56084158ac5d7fe33f216f45191f6dcddab9c9ed4ec1d9d8ac6c'],
-    }),
-    ('devtools', '2.4.2', {
-        'checksums': ['71f0a55054d293fb553702b21b91941bc5c83a933610fad6f9662bf0a6178f05'],
-    }),
-    ('Rook', '1.1-1', {
-        'checksums': ['00f4ecfa4c5c57018acbb749080c07154549a6ecaa8d4130dd9de79427504903'],
-    }),
-    ('Cairo', '1.5-12.2', {
-        'checksums': ['dd524105c83b82b5c3b3ee2583ef90d4cafa54b0c29817dac48b425b79f90f92'],
-    }),
-    ('RMTstat', '0.3', {
-        'checksums': ['81eb4c5434d04cb66c749a434c33ceb1c07d92ba79765d4e9233c13a092ec2da'],
-    }),
-    ('Lmoments', '1.3-1', {
-        'checksums': ['7c9d489a08f93fa5877e2f233ab9732e0d1b2761596b3f6ac91f2295e41a865d'],
-    }),
-    ('distillery', '1.2-1', {
-        'checksums': ['4b88f0b34e472b9134ad403fb32283424f1883a5943e52c55f1fe05995efb5fa'],
-    }),
-    ('extRemes', '2.1-1', {
-        'checksums': ['5a1927bb21f178ec5a3e3f862d792e690e45c16c88190e64e83aa1fb9e3ffa02'],
-    }),
-    ('tkrplot', '0.0-26', {
-        'checksums': ['dd66264c2553f6927aff297c6b1c3b61867d6c63aec080f40a1e9d53cfc9d120'],
-    }),
-    ('misc3d', '0.9-1', {
-        'checksums': ['a07bbb0de153e806cd79675ed478d2d9221cff825654f59a71a9cf61f4293d65'],
-    }),
-    ('multicool', '0.1-12', {
-        'checksums': ['487d28d9c3c606be0cf56e2d8f8b0d79fb71949c68886ea9251fbb1c01664a36'],
-    }),
-    ('plot3D', '1.4', {
-        'checksums': ['d04a45197646fb36bc38870c1c2351cb56b912bd772b1ebfa25eaeef35fda9c0'],
-    }),
-    ('plot3Drgl', '1.0.2', {
-        'checksums': ['aa874891446a395f01791d80a5a0f1f9a1c2c41f029de3a8d5af9aa47f46a496'],
-    }),
-    ('OceanView', '1.0.6', {
-        'checksums': ['2c5165975d6c49fdc83a892cb0406584928dd44000c9774fffc00fbd2fec86f3'],
-    }),
-    ('ks', '1.13.2', {
-        'checksums': ['7c9e4e178adcecb0817213c0210b82d91647f4acf5c4d4056d46d286a5bff609'],
-    }),
-    ('logcondens', '2.1.6', {
-        'checksums': ['785bbda00b9a25e56440e11356ac219cfbf0fdf8b08c7b0728e53a9febe7a365'],
-    }),
-    ('Iso', '0.0-18.1', {
-        'checksums': ['2fa5f78a7603cbae94a5e38e791938596a053d48c609a7c120a19cbb7d93c66f'],
-    }),
-    ('penalized', '0.9-51', {
-        'checksums': ['eaa80dca99981fb9eb576261f30046cfe492d014cc2bf286c447b03a92e299fd'],
-    }),
-    ('clusterRepro', '0.9', {
-        'checksums': ['940d84529ff429b315cf4ad25700f93e1156ccacee7b6c38e4bdfbe2d4c6f868'],
-    }),
-    ('data.tree', '1.0.0', {
-        'checksums': ['40674c90a5bd00f5185db9adbd221c6f1114043e69095249f5fa8b3044af3f5e'],
-    }),
-    ('influenceR', '0.1.0.1', {
-        'checksums': ['63c46f1175fced33fb1b78d4d56e37fbee09b408945b0106dac36e3344cd4766'],
-    }),
-    ('visNetwork', '2.1.0', {
-        'checksums': ['a2b91e7fbbd9d08a9929a5b2c891d9c0bca5977ad772fa37510d96656af1152f'],
-    }),
-    ('downloader', '0.4', {
-        'checksums': ['1890e75b028775154023f2135cafb3e3eed0fe908138ab4f7eff1fc1b47dafab'],
-    }),
-    ('DiagrammeR', '1.0.6.1', {
-        'checksums': ['be4e4c520a3692902ce405e8225aef9f3d5f0cd11fcde614f6541e981b63673d'],
-    }),
-    ('randomForestSRC', '2.13.0', {
-        'checksums': ['beb981cae3a8c7232a2ca67f0a7bf3293eb44d5f1ac14913632ca8f8d4728abd'],
-    }),
-    ('sm', '2.2-5.7', {
-        'checksums': ['2607a2cafc68d7e99005daf99e36f4a66eaf569ebb6b7500e962642cf58be80f'],
-    }),
-    ('pbivnorm', '0.6.0', {
-        'checksums': ['07c37d507cb8f8d2d9ae51a9a6d44dfbebd8a53e93c242c4378eaddfb1cc5f16'],
-    }),
-    ('lavaan', '0.6-9', {
-        'checksums': ['d404c4eb40686534f9c05f24f908cd954041f66d1072caea4a3adfa83a5f108a'],
-    }),
-    ('matrixcalc', '1.0-5', {
-        'checksums': ['5906e1ef06dbc18efc7a4b370adc180ef8941b5438119703bd981d1c76a06fca'],
-    }),
-    ('arm', '1.12-2', {
-        'checksums': ['816ba1c31eec00feef472c57e280488d3d233b592f6f0a1a30e4abb903cb4f5d'],
-    }),
-    ('mi', '1.0', {
-        'checksums': ['34f44353101e8c3cb6bf59c5f4ff5b2391d884dcbb9d23066a11ee756b9987c0'],
-    }),
-    ('servr', '0.23', {
-        'checksums': ['4492d1dabc8f62cf7f7a53c97413a664823a3916dcaf99a7b04bcb279f7b2eb8'],
-    }),
-    ('rgexf', '0.16.2', {
-        'checksums': ['6ee052b0de99d0c7492366b991d345a51b3d0cc890d10a68b8670e1bd4fc8201'],
-    }),
-    ('sem', '3.1-13', {
-        'checksums': ['07749f710ad800f43cacdff8f1aa4f20105a619c72be4465f29860c381242f65'],
-    }),
-    ('statnet.common', '4.5.0', {
-        'checksums': ['3cdb23db86f3080462f15e29bcf3e941590bc17ea719993b301199b22d6f882f'],
-    }),
-    ('network', '1.17.1', {
-        'checksums': ['fc3c3a0014f8895a11c33994c9b44c6ef6cc49c7d026cd41ae6bba5ef63005a7'],
-    }),
-    ('rle', '0.9.2', {
-        'checksums': ['803cbe310af6e882e27be61d37d660dbe5910ac1ee1eff61a480bcf724a04f69'],
-    }),
-    ('sna', '2.6', {
-        'checksums': ['3a016550d9f424a0613c3f5b0b680dbd3a1f20a343173d39a96034340ad9202a'],
-    }),
-    ('glasso', '1.11', {
-        'checksums': ['4c37844b26f55985184a734e16b8fe880b192e3d2763614b0ab3f99b4530e30a'],
-    }),
-    ('huge', '1.3.5', {
-        'checksums': ['9240866e2f773cd0ac8a02514871149d2babaa162a49e151eab9591ad42984ea'],
-    }),
-    ('d3Network', '0.5.2.1', {
-        'checksums': ['5c798dc0c87c6d574abb7c1f1903346e6b0fec8adfd1df7aef5e4f9e7e3a09be'],
-    }),
-    ('BDgraph', '2.64', {
-        'checksums': ['243f3af3724552049f8f4f55dd425e3313adab95e1128ae4d6551d96005fdf5e'],
-    }),
-    ('graphlayouts', '0.7.1', {
-        'checksums': ['380f8ccb0b08735694e83f661fd56a0d592a78448ae91b89c290ba8582d66717'],
-    }),
-    ('tweenr', '1.0.2', {
-        'checksums': ['1805f575da6705ca4e5ec1c4605222fc826ba806d9ff9af41770294fe08ff69f'],
-    }),
-    ('ggforce', '0.3.3', {
-        'checksums': ['2a283bb409da6b96929863a926b153bcc59b2c6f00551805db1d1d43e5929f2f'],
-    }),
-    ('tidygraph', '1.2.0', {
-        'checksums': ['057d6c42fc0144109f3ace7f5058cca7b2fe493c761daa991448b23f86b6129f'],
-    }),
-    ('ggraph', '2.0.5', {
-        'checksums': ['e36ad49dba92ee8652e18b1fb197be0ceb9f0a2f8faee2194453a62578449654'],
-    }),
-    ('qgraph', '1.9', {
-        'checksums': ['e1d7489c4db47878dccd34ded7e8173d58a190ad453d2e6e89f33549ccfd10aa'],
-    }),
-    ('HWxtest', '1.1.9', {
-        'patches': ['HWxtest-1.1.9_add-fcommon.patch'],
-        'checksums': [
-            'a37309bed4a99212ca104561239d834088217e6c5e5e136ff022544c706f25e6',  # HWxtest_1.1.9.tar.gz
-            '4ce08c35035dbcc4edf092cdb405ae32c21c05b3786c15c0aa4bfe13bd81f451',  # HWxtest-1.1.9_add-fcommon.patch
-        ],
-    }),
-    ('diveRsity', '1.9.90', {
-        'checksums': ['b8f49cdbfbd82805206ad293fcb2dad65b962fb5523059a3e3aecaedf5c0ee86'],
-    }),
-    ('doSNOW', '1.0.19', {
-        'checksums': ['4cd2d080628482f4c6ecab593313d7e42516f5ff13fbf9f90e461fcad0580738'],
-    }),
-    ('geepack', '1.3-2', {
-        'checksums': ['99b53e40f7e5fda7422b143e6fee16513e2f880cb04a97cd403e98c4760670a6'],
-    }),
-    ('biom', '0.3.12', {
-        'checksums': ['4ad17f7811c7346dc4923bd6596a007c177eebb1944a9f46e5674afcc5fdd5a1'],
-    }),
-    ('pim', '2.0.2', {
-        'checksums': ['1195dbdbd67348dfef4b6fc34fcec643da685ebe58d34bbe049ab121aca9944f'],
-    }),
-    ('minpack.lm', '1.2-1', {
-        'checksums': ['14cb7dba3ef2b46da0479b46d46c76198e129a31f6157cd8b37f178adb15d5a3'],
-    }),
-    ('rootSolve', '1.8.2.3', {
-        'checksums': ['b5b3d1641642a3fd1279dbd1245f968d2331ac9588d77f872b113f7dc4594ba0'],
-    }),
-    ('diagram', '1.6.5', {
-        'checksums': ['e9c03e7712e0282c5d9f2b760bafe2aac9e99a9723578d9e6369d60301f574e4'],
-    }),
-    ('FME', '1.3.6.2', {
-        'checksums': ['65a200f8171e27f0a3d7ffce3e49b01561f219a11f3cb515ff613a45927ff618'],
-    }),
-    ('bmp', '0.3', {
-        'checksums': ['bdf790249b932e80bc3a188a288fef079d218856cf64ffb88428d915423ea649'],
-    }),
-    ('tiff', '0.1-8', {
-        'checksums': ['4b7482f70d8ecef9596b766ef1c64102c8b09208cb769c39d9e4db81cb3ba1a2'],
-    }),
-    ('readbitmap', '0.1.5', {
-        'checksums': ['737d7d585eb33de2c200da64d16781e3c9522400fe2af352e1460c6a402a0291'],
-    }),
-    ('imager', '0.42.10', {
-        'checksums': ['01939eb03ad2e1369a4240a128c3b246a4c56f572f1ea4967f1acdc555adaeee'],
-    }),
-    ('signal', '0.7-7', {
-        'checksums': ['67a015c46d67de7548c3adb83a1b22524de75501a861d91668c3c2ea761a4e61'],
-    }),
-    ('tuneR', '1.3.3.1', {
-        'checksums': ['cdcbf04ab5b547002ee5b1d3bc46145882c5a551f164cac43df71596f1edd18a'],
-    }),
-    ('pastecs', '1.3.21', {
-        'checksums': ['8c1ef2affe88627f0b23295aa5edb758b8fd6089ef09f60f37c46445128b8d7c'],
-    }),
-    ('audio', '0.1-8', {
-        'checksums': ['1a1c78bca63ed1fb5e30e00c593b67e1230b408e6a77c67082b41373d79b5bb4'],
-    }),
-    ('fftw', '1.0-6', {
-        'checksums': ['397ef5ec354b919884f74fba4202bfc13ad11a70b16285c41677aad1d3b170ce'],
-    }),
-    ('seewave', '2.1.8', {
-        'checksums': ['10e6487325ccd1c3cd64617182733f1472f3170974b32bb61a6b12ba7ddeeceb'],
-    }),
-    ('gsw', '1.0-6', {
-        'checksums': ['147ce73da75777799af9cb712862ef25b52fcae146a64ce0a525460ddfea1deb'],
-    }),
-    ('wk', '0.5.0', {
-        'checksums': ['71d500e0beaeed40501702adf214054d30278acb3171af6db4ae8dcdf5e7423a'],
-    }),
-    ('s2', '1.0.7', {
-        'checksums': ['2010c1c6ae29938ec9cd153a8b2c06a333ea4d647932369b2fc7d0c68d6d9e3f'],
-    }),
-    ('sf', '1.0-3', {
-        'checksums': ['2ee3ece4e5056fe267d76a785912a2285ddfc235b1be67b4c21b74dc39a831f8'],
-    }),
-    ('oce', '1.4-0', {
-        'checksums': ['3b341448001164dc62b54a26c8f86adf50e68705ddc47615b290b950da734408'],
-    }),
-    ('ineq', '0.2-13', {
-        'checksums': ['e0876403f59a3dfc2ea7ffc0d965416e1ecfdecf154e5856e5f54800b3efda25'],
-    }),
-    ('soundecology', '1.3.3', {
-        'checksums': ['276164d5eb92c78726c647be16232d2443acbf7061371ddde2672b4fdb7a069a'],
-    }),
-    ('memuse', '4.2-1', {
-        'checksums': ['f5e9dbaad4efbbfe219a93f446e318a00cad5b294bfc60ca2146eca894b47cf3'],
-    }),
-    ('pinfsc50', '1.2.0', {
-        'checksums': ['ed1fe214b9261feef8abfbf724c2bd9070d68e99a6ea95208aff2c57bbef8794'],
-    }),
-    ('vcfR', '1.12.0', {
-        'checksums': ['dd87ff010365de363864a44ca49887c0fdad0dd18d0d9c66e44e39c2d4581d52'],
-    }),
-    ('glmmML', '1.1.1', {
-        'checksums': ['255fe2640933d83ef7ea5813ba8006038c18195147d1f34f47a759210a674dd4'],
-    }),
-    ('cowplot', '1.1.1', {
-        'checksums': ['c7dce625b456dffc59ba100c816e16226048d12fdd29a7335dc1f6f6e12eed48'],
-    }),
-    ('tsne', '0.1-3', {
-        'checksums': ['66fdf5d73e69594af529a9c4f261d972872b9b7bffd19f85c1adcd66afd80c69'],
-    }),
-    ('sn', '2.0.0', {
-        'checksums': ['abd6ccdb3719b482db43ff2d5b12f2efcb8244792ec08e1176c5eb98fcc7886a'],
-    }),
-    ('tclust', '1.4-2', {
-        'checksums': ['95dcd07dbd16383f07f5cea8561e7f3bf314e4a7483879841103b149fc8c65d9'],
-    }),
-    ('ranger', '0.13.1', {
-        'checksums': ['60934f0accc21edeefddbb4ddebfdd7cd10a3d3e90b31aa2e6e4b7f50d632d0a'],
-    }),
-    ('hexbin', '1.28.2', {
-        'checksums': ['6241f8d3a6c6be2c1c693c3ddb99554bc103e3c6cf602d0c2787c0ce6fd1702d'],
-    }),
-    ('lobstr', '1.1.1', {
-        'checksums': ['b8c9ce00095bd4f304b4883ef71da24572022f0632a18c3e1ba317814e70716e'],
-    }),
-    ('pryr', '0.1.5', {
-        'checksums': ['7b1653ec51850f4633cee8e2eb7d0b2724fb587b801539488b426cf88f0f770b'],
-    }),
-    ('moments', '0.14', {
-        'checksums': ['2a3b81e60dafdd092d2bdd3513d7038855ca7d113dc71df1229f7518382a3e39'],
-    }),
-    ('laeken', '0.5.2', {
-        'checksums': ['22790f7157f23eb0b7b0b89e2ea53478fb3c0d15b5be8ad11525d3e6d5626cdc'],
-    }),
-    ('VIM', '6.1.1', {
-        'checksums': ['7581adca64cf20b93d5a111da83f663215b4529868b065b3463c4238bca97739'],
-    }),
-    ('smoother', '1.1', {
-        'checksums': ['91b55b82f805cfa1deedacc0a4e844a2132aa59df593f3b05676954cf70a195b'],
-    }),
-    ('dynamicTreeCut', '1.63-1', {
-        'checksums': ['831307f64eddd68dcf01bbe2963be99e5cde65a636a13ce9de229777285e4db9'],
-    }),
-    ('beeswarm', '0.4.0', {
-        'checksums': ['51f4339bf4080a2be84bb49a844c636625657fbed994abeaa42aead916c3d504'],
-    }),
-    ('vipor', '0.4.5', {
-        'checksums': ['7d19251ac37639d6a0fed2d30f1af4e578785677df5e53dcdb2a22771a604f84'],
-    }),
-    ('ggbeeswarm', '0.6.0', {
-        'checksums': ['bbac8552f67ff1945180fbcda83f7f1c47908f27ba4e84921a39c45d6e123333'],
-    }),
-    ('shinydashboard', '0.7.2', {
-        'checksums': ['a56ee48572649830cd8d82f1caa2099411461e19e19223cbad36a375299f3843'],
-    }),
-    ('rrcov', '1.6-0', {
-        'checksums': ['795f3a49b3e17c9c6e0fdd865e81a0402cefda970032c8299bcf2056ca7ec944'],
-    }),
-    ('WriteXLS', '6.3.0', {
-        'checksums': ['0b1d987abe4b08f6a32003b77d1cfc2eefdc5a478382e77ca0da98bccf6e526b'],
-    }),
-    ('bst', '0.3-23', {
-        'checksums': ['70957f1db8800bf0d628a9e6f72b7273329786dd119427790b326844591aa0f3'],
-    }),
-    ('pamr', '1.56.1', {
-        'checksums': ['d0e527f2336ee4beee91eefb2a8f0dfa96413d9b5a5841d6fc7ff821e67c9779'],
-    }),
-    ('WeightSVM', '1.7-9', {
-        'checksums': ['983733b618631d9ad754fb12f5e576912aff1f529cafdee4fddfd38d81ccc710'],
-    }),
-    ('mpath', '0.4-2.19', {
-        'checksums': ['fa0d92984910b8f556677850e3d899bc675724f0e2a3a73629d2700040335afe'],
-    }),
-    ('timereg', '2.0.1', {
-        'checksums': ['38429ae21d9d090ed968d2e0c06cd0310cc304e974c353a97cde3d2e49f138d7'],
-    }),
-    ('peperr', '1.3', {
-        'checksums': ['64d30b0ec09bf9b8f7b6edce67dd0f9e0e3dbe665fec8f5411f74142e53e9f5d'],
-    }),
-    ('heatmap3', '1.1.9', {
-        'checksums': ['594c33947b2be2cc8a592075f41a0df2398c892add7d63a15c613a5eeb8fdb69'],
-    }),
-    ('GlobalOptions', '0.1.2', {
-        'checksums': ['47890699668cfa9900a829c51f8a32e02a7a7764ad07cfac972aad66f839753e'],
-    }),
-    ('circlize', '0.4.13', {
-        'checksums': ['6cbadbf8e8b1abbd71a79080677d2b95f2bdd18f2e4d707c32d5c2ff26c5369b'],
-    }),
-    ('GetoptLong', '1.0.5', {
-        'checksums': ['8c237986ed3dfb72d956ad865ef7768644eebf144675ad66140acfd1aca9d701'],
-    }),
-    ('dendextend', '1.15.2', {
-        'checksums': ['4ba3885b66694589d455ffef31c218fe653fa25aff3efb7e8db6c25008d2921b'],
-    }),
-    ('RInside', '0.2.16', {
-        'checksums': ['7ae4ade128ea05f37068d59e610822ff0b277f9d39d8900f7eb31759ad5a2a0e'],
-    }),
-    ('limSolve', '1.5.6', {
-        'checksums': ['b97ea9930383634c8112cdbc42f71c4e93fe0e7bfaa8f401921835cb44cb49a0'],
-    }),
-    ('dbplyr', '2.1.1', {
-        'checksums': ['aba4cf47b85ab240fd3ec4cd8d512f6e1958201e151577c1a2ebc3d6ebc5bc08'],
-    }),
-    ('modelr', '0.1.8', {
-        'checksums': ['825ba77d95d60cfb94920bec910872ca2ffe7790a44148b2992be2759cb361c4'],
-    }),
-    ('debugme', '1.1.0', {
-        'checksums': ['4dae0e2450d6689a6eab560e36f8a7c63853abbab64994028220b8fd4b793ab1'],
-    }),
-    ('reprex', '2.0.1', {
-        'checksums': ['0e6d8667cacb63135476a766fba3a4f91e5ad86274ea66d2b1e6d773b5ca6426'],
-    }),
-    ('selectr', '0.4-2', {
-        'checksums': ['5588aed05f3f5ee63c0d29953ef53da5dac7afccfdd04b7b22ef24e1e3b0c127'],
-    }),
-    ('rvest', '1.0.2', {
-        'checksums': ['89bb477e0944c80298a52ccf650db8f6377fd7ed3c1bc7034d000f695fdf05a4'],
-    }),
-    ('dtplyr', '1.1.0', {
-        'checksums': ['99681b7285d7d5086e5595ca6bbeebf7f4e2ee358a32b694cd9d35916cdfc732'],
-    }),
-    ('gargle', '1.2.0', {
-        'checksums': ['4d46ca2933f19429ca5a2cfe47b4130a75c7cd9931c7758ade55bac0c091d73b'],
-    }),
-    ('googledrive', '2.0.0', {
-        'checksums': ['605c469a6a086ef4b049909c2e20a35411c165ce7ce4f62d68fd39ffed8c5a26'],
-    }),
-    ('ids', '1.0.1', {
-        'checksums': ['b6212a186063c23116c5cbd3cca65dbb8977dd737261e4526ebee8f64852cfe8'],
-    }),
-    ('googlesheets4', '1.0.0', {
-        'checksums': ['0a107d76aac99d6db48d97ce55810c1412b2197f457b8476f676169a36c7cc7a'],
-    }),
-    ('tidyverse', '1.3.1', {
-        'checksums': ['83cf95109d4606236274f5a8ec2693855bf75d3a1b3bc1ab4426dcc275ed6632'],
-    }),
-    ('R.rsp', '0.44.0', {
-        'checksums': ['8969075bdcabd43bad40eef6b82223e119426279fded041163fd41e55cee3a59'],
-    }),
-    ('gdistance', '1.3-6', {
-        'checksums': ['2ccabeb2f8cf44630c0bd2da79815fe357b812737ebece1bed8f90b27c126a24'],
-    }),
-    ('vioplot', '0.3.7', {
-        'checksums': ['06475d9a47644245ec91598e9aaef7db1c393802d9fc314420ac5139ae56adb6'],
-    }),
-    ('emulator', '1.2-21', {
-        'checksums': ['9b50b2c1e673dbc5e846a4fa72e8bd03434add9f659bde6d7b0c4f1bbd713346'],
-    }),
-    ('gmm', '1.6-6', {
-        'checksums': ['b1b321ad1b4a4a14a2825a2c3eb939ce2f2bcef995247a1d638eca250e59739b'],
-    }),
-    ('tmvtnorm', '1.4-10', {
-        'checksums': ['1a9f35e9b4899672e9c0b263affdc322ecb52ec198b2bb015af9d022faad73f0'],
-    }),
-    ('IDPmisc', '1.1.20', {
-        'checksums': ['bcb9cd7b8097e5089d1936286ef310ac2030ea7791350df706382ba470afc67f'],
-    }),
-    ('gap', '1.2.3-1', {
-        'checksums': ['343ae58ca91e75147ae3961285c3413bdf6dedf7cb4743a822a6c5b16d1b89e7'],
-    }),
-    ('qrnn', '2.0.5', {
-        'checksums': ['3bd83ee8bd83941f9defdab1b5573d0ceca02bf06759a67665e5b9358ff92f52'],
-    }),
-    ('TMB', '1.7.22', {
-        'checksums': ['c24125e1a37ed2b3c2554133183465cb6f3c0021cd4d4609c61336f59c3bd384'],
-    }),
-    ('glmmTMB', '1.1.2.3', {
-        'checksums': ['55631e001ff3f1d8e419e3b0b5555317713c733c11a2f7d4db6434d8c4e7dcf9'],
-    }),
-    ('gmp', '0.6-2', {
-        'checksums': ['6bfcb45b3f1e7da27d8773f911027355cab371d150c3dabf7dbaf8fba85b7f0e'],
-    }),
-    ('ROI', '1.0-0', {
-        'checksums': ['b0d87fb4ed2137d982734f3c5cdc0305aabe6e80f95de29655d02a9e82a0a341'],
-    }),
-    ('Rglpk', '0.6-4', {
-        'checksums': ['a28dbc3130b9618d6ed2ef718d2c55df8ed8c44a47161097c53fe15fa3bfbfa6'],
-    }),
-    ('ROI.plugin.glpk', '1.0-0', {
-        'checksums': ['b361b0d4222d74b21432cdc6990762affecdbcec8fd6bbdb13b78b59cb04b444'],
-    }),
-    ('spaMM', '3.9.13', {
-        'checksums': ['f9ded29106c656ff15ddc2564c16d44b77f08dac1f2dea5720028923e83e2514'],
-    }),
-    ('qgam', '1.3.3', {
-        'checksums': ['9a68fe4e74f4188862f7c01d682d50ffadd96ce7b98383404472309c87e3a26f'],
-    }),
-    ('DHARMa', '0.4.4', {
-        'checksums': ['b5a073f84faf7144f2074a43f619f8f264773afb0e09ca0294735e792552edca'],
-    }),
-    ('mvnfast', '0.2.7', {
-        'checksums': ['b67d50936c9a466977669ef6bb7b23df8e7c90a820ac916328c20e41ef8e0b72'],
-    }),
-    ('bridgesampling', '1.1-2', {
-        'checksums': ['54ecd39aa2e36d4d521d3d36425f9fe56a3f8547df6048c814c5931d790f3e6b'],
-    }),
-    ('BayesianTools', '0.1.7', {
-        'checksums': ['af49389bdeb794da3c39e1d63f59e6219438ecb8613c5ef523b00c6fed5a600c'],
-    }),
-    ('gomms', '1.0', {
-        'checksums': ['52828c6fe9b78d66bde5474e45ff153efdb153f2bd9f0e52a20a668e842f2dc5'],
-    }),
-    ('feather', '0.3.5', {
-        'checksums': ['50ff06d5e24d38b5d5d62f84582861bd353b82363e37623f95529b520504adbf'],
-    }),
-    ('dummies', '1.5.6', {
-        'checksums': ['7551bc2df0830b98c53582cac32145d5ce21f5a61d97e2bb69fd848e3323c805'],
-    }),
-    ('SimSeq', '1.4.0', {
-        'checksums': ['5ab9d4fe2cb1b7634432ff125a9e04d2f574fed06246a93859f8004e10790f19'],
-    }),
-    ('uniqueAtomMat', '0.1-3-2', {
-        'checksums': ['f7024e73274e1e76a870ce5e26bd58f76e8f6df0aa9775c631b861d83f4f53d7'],
-    }),
-    ('PoissonSeq', '1.1.2', {
-        'checksums': ['6f3dc30ad22e33e4fcfa37b3427c093d591c02f1b89a014d85e63203f6031dc2'],
-    }),
-    ('aod', '1.3.1', {
-        'checksums': ['052d8802500fcfdb3b37a8e3e6f3fbd5c3a54e48c3f68122402d2ea3a15403bc'],
-    }),
-    ('cghFLasso', '0.2-1', {
-        'checksums': ['6e697959b35a3ceb2baa1542ef81f0335006a5a9c937f0173c6483979cb4302c'],
-    }),
-    ('svd', '0.5', {
-        'checksums': ['d042d448671355d0664d37fd64dc90932eb780e6494c479d4431d1faae2071a1'],
-    }),
-    ('Rssa', '1.0.4', {
-        'checksums': ['4115b516f6782d52f02695bbbd52921a474aafc7232d49aca85010f1c33b08a7'],
-    }),
-    ('JBTools', '0.7.2.9', {
-        'checksums': ['b33cfa17339df7113176ad1832cbb0533acf5d25c36b95e888f561d586c5d62f'],
-    }),
-    ('RUnit', '0.4.32', {
-        'checksums': ['23a393059989000734898685d0d5509ece219879713eb09083f7707f167f81f1'],
-    }),
-    ('DistributionUtils', '0.6-0', {
-        'checksums': ['7443d6cd154760d55b6954142908eae30385672c4f3f838dd49876ec2f297823'],
-    }),
-    ('gapfill', '0.9.6-1', {
-        'checksums': ['22f04755873e34a9077bb1b1de8d16f5bc56cb8c395c4f797f9ad0b209b1b996'],
-    }),
-    ('gee', '4.13-20', {
-        'checksums': ['53014cee059bd87dc22f9679dfbf18fe6813b9ab41dfe90361921159edfbf798'],
-    }),
-    ('Matching', '4.9-11', {
-        'checksums': ['1c71ca8462b3168839bf446ee8e5b4baa6288a72f8c8590c9d7565c91fba7688'],
-    }),
-    ('MatchIt', '4.3.0', {
-        'checksums': ['ca897ab81a7c19ebd4cbc67011c6223668ad5a8876b10f665a86f5f79ed85446'],
-    }),
-    ('RItools', '0.1-17', {
-        'checksums': ['75654780e9ca39cb3c43acfaca74080ad74de50f92c5e36e95694aafdfdc0cea'],
-    }),
-    ('mitools', '2.4', {
-        'checksums': ['f204f3774e29d79810f579f128de892539518f2cbe6ed237e08c8e7283155d30'],
-    }),
-    ('survey', '4.1-1', {
-        'checksums': ['05e89a1678a39e32bfb41af8a31d643b04fc4d2660a96e701825e6bffcd75a52'],
-    }),
-    ('optmatch', '0.9-15', {
-        'checksums': ['7500fdbed939b7f16603a097d734a332793a3ac68e6a80c7957bef2a567691d8'],
-    }),
-    ('SPAtest', '3.1.2', {
-        'checksums': ['b3d74ed2b0a6475a9966dd50eb5d363d0b2985636271dfbf82f0472b8d22b9f4'],
-    }),
-    ('SKAT', '2.0.1', {
-        'checksums': ['c8637cf5786b926f6bbef3f4ef1d3af5130cc0cfd9094d4835839724b2d0e8c7'],
-    }),
-    ('GillespieSSA', '0.6.1', {
-        'checksums': ['272e9b6b26001d166fd7ce8d04f32831ba23c676075fbd1e922e27ba2c962052'],
-    }),
-    ('startupmsg', '0.9.6', {
-        'checksums': ['1d60ff13bb260630f797bde66a377a5d4cd65d78ae81a3936dc4374572ec786e'],
-    }),
-    ('distr', '2.8.0', {
-        'checksums': ['bb7df05d6b946bcdbbec2e3397c7c7e349b537cabfcbb13a34bcf6312a71ceb7'],
-    }),
-    ('distrEx', '2.8.0', {
-        'checksums': ['b064cde7d63ce93ec9969c8c4463c1e327758b6f8ea7765217d77f9ba9d590bf'],
-    }),
-    ('minerva', '1.5.10', {
-        'checksums': ['2f26353d8fcc989ac698c4e45bb683801b1a7bb60b14903d05a4d73c629c590f'],
-    }),
-    ('KODAMA', '1.8', {
-        'checksums': ['1ed9c14826c3c549c7323672cee04a71048c505c130e739ef5a95ed9bfe43444'],
-    }),
-    ('locfdr', '1.1-8', {
-        'checksums': ['42d6e12593ae6d541e6813a140b92591dabeb1df94432a515507fc2eee9a54b9'],
-    }),
-    ('ica', '1.0-2', {
-        'checksums': ['e721596fc6175d3270a60d5e0b5b98be103a8fd0dd93ef16680af21fe0b54179'],
-    }),
-    ('dtw', '1.22-3', {
-        'checksums': ['df7cf9adf613422ddb22a160597eb5f5475ab6c67c0d790092edb7f72ba98f00'],
-    }),
-    ('SDMTools', '1.1-221.2', {
-        'checksums': ['f0dd8c5f98d2f2c012536fa56d8f7a58aaf0c11cbe3527e66d4ee3194f6a6cf7'],
-    }),
-    ('ggridges', '0.5.3', {
-        'checksums': ['f5eafab17f2d4a8a2a83821ad3e96ae7c26b62bbce9de414484c657383c7b42e'],
-    }),
-    ('TFisher', '0.2.0', {
-        'checksums': ['bd9b7484d6fba0165841596275b446f85ba446d40e92f3b9cb37381a3827e76f'],
-    }),
-    ('lsei', '1.3-0', {
-        'checksums': ['6289058f652989ca8a5ad6fa324ce1762cc9e36c42559c00929b70f762066ab6'],
-    }),
-    ('npsurv', '0.5-0', {
-        'checksums': ['bc87db76e7017e178c2832a684fcd49c42e20054644b21b586413d26c8821dc6'],
-    }),
-    ('fitdistrplus', '1.1-6', {
-        'checksums': ['17c2990041a3bb7479f3c3a6d13d96c989db8eaddab17eff7e1fbe172a5b96be'],
-    }),
-    ('here', '1.0.1', {
-        'checksums': ['08ed908033420d3d665c87248b3a14d1b6e2b37844bf736be620578c20ca346b'],
-    }),
-    ('reticulate', '1.22', {
-        'checksums': ['b06e7b39abf08ae9604ea26d02e3c6e4ef6dcc4b6c7c98118fd85192f615f56c'],
-    }),
-    ('hdf5r', '1.3.4', {
-        'installopts': '--configure-args="--with-hdf5=$EBROOTHDF5/bin/h5cc"',
-        'preinstallopts': "unset LIBS && ",
-        'checksums': ['64d057601841b604e04e8514d33a1e5e515dcbfd9cc8369d40d717d7036fab53'],
-    }),
-    ('DTRreg', '1.7', {
-        'checksums': ['f0fad2244d960cec8fc33d9a1078df359ceb0aadff980ce6149aa9f01c62223b'],
-    }),
-    ('pulsar', '0.3.7', {
-        'checksums': ['78c9f7e3b2bf8a8d16a81d6ee43bb05b0c360219be473d920c8c8ccb2aba4e3d'],
-    }),
-    ('bayesm', '3.1-4', {
-        'checksums': ['061b216c62bc72eab8d646ad4075f2f78823f9913344a781fa53ea7cf4a48f94'],
-    }),
-    ('gsl', '2.1-7', {
-        'checksums': ['1a86af59d9864ecf2a85d5371076786e7a0491d6d6b4d5c1a7590ea8919f3b17'],
-    }),
-    ('energy', '1.7-8', {
-        'checksums': ['de08e8de037bb30068bbf0c1880b153a586d342304681f4ba103ab808c7f4789'],
-    }),
-    ('compositions', '2.0-2', {
-        'checksums': ['b5e47a14a1bb010b47b4ad7fbfabfead1a08b009b92e1f7d4bd3bd7f8589f216'],
-    }),
-    ('clustree', '0.4.3', {
-        'checksums': ['5ff3afc3fb3e1d20d033328935084de574250d29545c0a5b69180fe4846fbe53'],
-    }),
-    ('plotly', '4.10.0', {
-        'checksums': ['bd995c654dbc8c09a84adaba8def99766919e3894caf18b551bb26b2f591389a'],
-    }),
-    ('tweedie', '2.3.3', {
-        'checksums': ['a032cad512dac37a8619e6f66cb513eb82a88a5a2ffbe91e92c2d44d1756d0d9'],
-    }),
-    ('RcppGSL', '0.3.10', {
-        'checksums': ['8612087da02fb791f427fed310c23d0482a8eb60fb089119f018878143f95451'],
-    }),
-    ('mvabund', '4.1.12', {
-        'checksums': ['c1af39dbfd048c9bb367765ee266be49622e1a5d964186920a2d47bec4e6f780'],
-    }),
-    ('fishMod', '0.29', {
-        'checksums': ['5989e49ca6d6b2c5d514655e61f75b019528a8c975f0d6056143f17dc4277a5d'],
-    }),
-    ('gllvm', '1.3.1', {
-        'checksums': ['cd3f72b84f0c722e9c0b21c2b2de7683ec742345d7f8e62f67c8c93342c1a5c6'],
-    }),
-    ('grpreg', '3.4.0', {
-        'checksums': ['fd57d20baf63d2cc5821998bca5c3fdcbe46c933c9553caa492911b12654d6ad'],
-    }),
-    ('trust', '0.1-8', {
-        'checksums': ['952e348b62aec35988b103fd152329662cb6a451538f184549252fbf49d7dcac'],
-    }),
-    ('lpSolveAPI', '5.5.2.0-17.7', {
-        'checksums': ['9ebc8e45ad73eb51e0b25049598a5bc758370cf89508e2328cf4bd93d68d55bb'],
-    }),
-    ('ergm', version, {
-        'checksums': ['1abc6ef53376a4132530c376ce477ae7a2590e95fe8feb011c0da9cfb4d49ba0'],
-    }),
-    ('networkDynamic', '0.11.0', {
-        'checksums': ['aa21caaddce75c22e08b94adfb6036f5ee151ffb79d174ad250fe4592d27dad2'],
-    }),
-    ('tergm', '4.0.2', {
-        'checksums': ['5ab1d61166c90f90c77edd12544b5946e01a933cc3e7ca609cae72075b742a64'],
-    }),
-    ('ergm.count', '4.0.2', {
-        'checksums': ['316ed3cbe4b472eec79e8a5fd4183ce953070f6d98056d87423bd6d9ac155bd1'],
-    }),
-    ('tsna', '0.3.4', {
-        'checksums': ['08fd9612388b86077cd877a48f81068d63f20291836eedbc727c9e00c1a2b4d2'],
-    }),
-    ('statnet', '2019.6', {
-        'checksums': ['0903e1a81ed1b6289359cefd12da1424c92456d19e062c3f74197b69e536b29d'],
-    }),
-    ('aggregation', '1.0.1', {
-        'checksums': ['86f88a02479ddc8506bafb154117ebc3b1a4a44fa308e0193c8c315109302f49'],
-    }),
-    ('ComICS', '1.0.4', {
-        'checksums': ['0af7901215876f95f309d7da6e633c38e4d7faf04112dd6fd343bc15fc593a2f'],
-    }),
-    ('dtangle', '2.0.9', {
-        'checksums': ['c375068c1877c2e8cdc5601cfd5a9c821645c3dff90ddef64817f788f372e179'],
-    }),
-    ('mcmc', '0.9-7', {
-        'checksums': ['b7c4d3d5f9364c67a4a3cd49296a61c315ad9bd49324a22deccbacb314aa8260'],
-    }),
-    ('MCMCpack', '1.6-0', {
-        'checksums': ['b5b9493457d11d4dca12f7732bd1b3eb1443852977c8ee78393126f13deaf29b'],
-    }),
-    ('shinythemes', '1.2.0', {
-        'checksums': ['37d68569ce838c7da9f0ea7e2b162ecf38fba2ae448a4888b6dd29c4bb5b2963'],
-    }),
-    ('csSAM', '1.2.4', {
-        'checksums': ['3d6442ad8c41fa84633cbbc275cd67e88490a160927a5c55d29da55a36e148d7'],
-    }),
-    ('bridgedist', '0.1.0', {
-        'checksums': ['dc7c1c8874d6cfa34d550d9af194389e13471dfbc55049a1ab66db112fbf1343'],
-    }),
-    ('asnipe', '1.1.16', {
-        'checksums': ['be50f9fdef0f4bf9676b9c3c2906d0431afc678af55cf48b1119f9fc0adac44f'],
-    }),
-    ('liquidSVM', '1.2.4', {
-        'patches': ['liquidSVM-1.2.4-fix_ppc_and_aarch64_build.patch'],
-        'preinstallopts': 'LIQUIDSVM_TARGET="empty"',
-        'checksums': [
-            '15a9c7f2930e2ed3f4c5bcd9b042884ea580d2b2e52e1c68041600c196046aba',  # liquidSVM_1.2.4.tar.gz
-            # liquidSVM-1.2.4-fix_ppc_and_aarch64_build.patch
-            '46b09e441c3b59af535f20d8db0dee7f1d6a7ddd511175d252115b53cb8b86f8',
-        ],
-    }),
-    ('oddsratio', '2.0.1', {
-        'checksums': ['2097e7a8bf623379d55652de5dce4946d05163e85d30df50dc19055962bf60b5'],
-    }),
-    ('mltools', '0.3.5', {
-        'checksums': ['7093ffceccdf5d4c3f045d8c8143deaa8ab79935cc6d5463973ffc7d3812bb10'],
-    }),
-    ('h2o', '3.34.0.3', {
-        'checksums': ['2a707b9f7271eae611c9e81b13d2024b8829f6b06b3c41c5b97de1aef591931e'],
-    }),
-    ('mlegp', '3.1.8', {
-        'checksums': ['eac1df085a608451828575028ca05b78dc6b5035da14cabc141bfee5ef986de9'],
-    }),
-    ('itertools', '0.1-3', {
-        'checksums': ['b69b0781318e175532ad2d4f2840553bade9637e04de215b581704b5635c45d3'],
-    }),
-    ('missForest', '1.4', {
-        'checksums': ['f785804b03bdf424e1c76095989a803afb3b47d6bebca9a6832074b6326c0278'],
-    }),
-    ('bartMachineJARs', '1.1', {
-        'checksums': ['f2c31cb94d7485174a2519771127a102e35b9fe7f665e27beda3e76a56feeef2'],
-    }),
-    ('bartMachine', '1.2.6', {
-        'checksums': ['5e1ac0033da5b41a96d95782886a167e51ff8e43822800e8d40874ff9c13847f'],
-    }),
-    ('lqa', '1.0-3', {
-        'checksums': ['3889675dc4c8cbafeefe118f4f20c3bd3789d4875bb725933571f9991a133990'],
-    }),
-    ('PresenceAbsence', '1.1.9', {
-        'checksums': ['1a30b0a4317ea227d674ac873ab94f87f8326490304e5b08ad58953cdf23169f'],
-    }),
-    ('GUTS', '1.1.1', {
-        'checksums': ['094b8f51719cc36ddc56e3412dbb146eafc93c5e8fbb2c5999c2e80ea7a7d216'],
-    }),
-    ('GenSA', '1.1.7', {
-        'checksums': ['9d99d3d0a4b7770c3c3a6de44206811272d78ab94481713a8c369f7d6ae7b80f'],
-    }),
-    ('parsedate', '1.2.1', {
-        'checksums': ['6b078da4a47904194bfe29e2c3b6fbbf6e3ad190e33979f840a3ea366c708616'],
-    }),
-    ('circular', '0.4-93', {
-        'checksums': ['76cee2393757390ad91d3db3e5aeb2c2d34c0a46822b7941498571a473417142'],
-    }),
-    ('cobs', '1.3-4', {
-        'checksums': ['a1c7b77e4ca097349884fd1c0d863d74f9092766131094d603f34d33ab2e3c42'],
-    }),
-    ('resample', '0.4', {
-        'checksums': ['f0d5f735e1b812612720845d79167a19f713a438fd10a6a3206e667045fd93e5'],
-    }),
-    ('MIIVsem', '0.5.8', {
-        'checksums': ['a908f51e1598290d25864c358d57201bd50c1c40775d4d0405cbc8077bee61e1'],
-    }),
-    ('medflex', '0.6-7', {
-        'checksums': ['d28107a4bbbb0ace1d571f0aa6884ee4c50d7731c04bceba207fd55a39b83b9c'],
-    }),
-    ('Rserve', '1.7-3.1', {
-        'checksums': ['3ba1e919706e16a8632def5f45d666b6e44eafa6c14b57064d6ddf3415038f99'],
-    }),
-    ('spls', '2.2-3', {
-        'checksums': ['bbd693da80487eef2939c37aba199f6d811ec289828c763d9416a05fa202ab2e'],
-    }),
-    ('Boruta', '7.0.0', {
-        'checksums': ['6ff520d27d68637058c33a34c547a656bb44d5e351b7cc7afed6cd4216275c78'],
-    }),
-    ('dr', '3.0.10', {
-        'checksums': ['ce523c1bdb62a9dda30afc12b1dd96975cc34695c61913012236f3b80e24bf36'],
-    }),
-    ('CovSel', '1.2.1', {
-        'checksums': ['b375d00cc567e125ff106b4357654f43bba3abcadeed2238b6dea4b7a68fda09'],
-    }),
-    ('tmle', '1.5.0.2', {
-        'checksums': ['4772c352e8d3d9b5a0b7480c0e0962de4f5060fb7bf3fcb8ee4fa1cb10f93fd4'],
-    }),
-    ('ctmle', '0.1.2', {
-        'checksums': ['e3fa0722cd87aa0e0b209c2dddf3fc44c6d09993f1e66a6c43285fe950948161'],
-    }),
-    ('BayesPen', '1.0', {
-        'checksums': ['772df9ae12cd8a3da1d5b7d1f1629602c7693f0eb03945784df2809e2bb061b0'],
-    }),
-    ('inline', '0.3.19', {
-        'checksums': ['0ee9309bb7dab0b97761ddd18381aa12bd7d54678ccd7bec00784e831f4c99d5'],
-    }),
-    ('BMA', '3.18.15', {
-        'checksums': ['4be0d52f433503631e9574944067f613bafba129ebe27396bcfccb3b95992b1a'],
-    }),
-    ('BCEE', '1.3.0', {
-        'checksums': ['82afc9b8c6d617f5f728341960ae32922194f637c550916b3bea12c231414fa7'],
-    }),
-    ('bacr', '1.0.1', {
-        'checksums': ['c847272e2c03fd08ed79b3b739f57fe881af77404b6fd087caa0c398c90ef993'],
-    }),
-    ('clue', '0.3-60', {
-        'checksums': ['6d21ddfd0d621ed3bac861890c600884b6ed5ff7d2a36c9778b892636dbbef2a'],
-    }),
-    ('bdsmatrix', '1.3-4', {
-        'checksums': ['251e21f433a016ec85e478811ea3ad34c572eb26137447f48d1bbf3cc8bb06ea'],
-    }),
-    ('fftwtools', '0.9-11', {
-        'checksums': ['f1f0c9a9086c7b2f72c5fb0334717cc917213a004eaef8448eab4940c9852c7f'],
-    }),
-    ('imagerExtra', '1.3.2', {
-        'checksums': ['0ebfa1eabb89459d774630ab73c7a97a93b9481ea5afc55482975475acebd5b8'],
-    }),
-    ('MALDIquant', '1.20', {
-        'checksums': ['fff39d5df295b937cdad57b73d4e06e925f69e68784ef58b5dfcd3cf500931c1'],
-    }),
-    ('threejs', '0.3.3', {
-        'checksums': ['76c759c8b20fb34f4f7a01cbd1b961296e1f19f4df6dded69aae7f1bca80219c'],
-    }),
-    ('LaplacesDemon', '16.1.6', {
-        'checksums': ['57b53882fd7a195b38bbdbbf0b17745405eb3159b1b42f7f11ce80c78ab94eb7'],
-    }),
-    ('rda', '1.0.2-2.1', {
-        'checksums': ['eea3a51a2e132a023146bfbc0c384f5373eb3ea2b61743d7658be86a5b04949e'],
-    }),
-    ('sampling', '2.9', {
-        'checksums': ['7f5ba5978f6cdbbbdb6f51958197b28b6fc63e7eeee59e6845ea09fb37d1b187'],
-    }),
-    ('lda', '1.4.2', {
-        'checksums': ['5606a1e1bc24706988853528023f7a004c725791ae1a7309f1aea2fc6681240f'],
-    }),
-    ('jiebaRD', '0.1', {
-        'checksums': ['045ee670f5378fe325a45b40fd55136b355cbb225e088cb229f512c51abb4df1'],
-    }),
-    ('jiebaR', '0.11', {
-        'checksums': ['adde8b0b21c01ec344735d49cd33929511086719c99f8e10dce4ca9479276623'],
-    }),
-    ('hdm', '0.3.1', {
-        'checksums': ['ba087565e9e0a8ea30a6095919141895fd76b7f3c05a03e60e9e24e602732bce'],
-    }),
-    ('abe', '3.0.1', {
-        'checksums': ['66d2e9ac78ba64b7d27b22b647fc00378ea832f868e51c18df50d6fffb8029b8'],
-    }),
-    ('SignifReg', '4.2', {
-        'checksums': ['53d2ff3ddbb398655b245ad3a19c028d6fb6bb1d59adeb30bb3497606733fc2d'],
-    }),
-    ('bbmle', '1.0.24', {
-        'checksums': ['01edc00479fabf7491e47ff59bc4adbe6f0d4c23d22e76d1d49c4c1b6b4693ad'],
-    }),
-    ('emdbook', '1.3.12', {
-        'checksums': ['0646caf9e15aaa61ff917a4b5fdf82c06ac17ef221a61dec3fbb554e7bff4353'],
-    }),
-    ('SOAR', '0.99-11', {
-        'checksums': ['d5a0fba3664087308ce5295a1d57d10bad149eb9771b4fe67478deae4b7f68d8'],
-    }),
-    ('rasterVis', '0.51.0', {
-        'checksums': ['5225334add4dd3502044cf80a00543b766568c2d93c47af180f66a76942d76be'],
-    }),
-    ('tictoc', '1.0.1', {
-        'checksums': ['a09a1535c417ddf6637bbbda5fca6edab6c7f7b252a64e57e99d4d0748712705'],
-    }),
-    ('ISOcodes', '2021.02.24', {
-        'checksums': ['152769bcb4ae99d06a767384541c2000c94990a2c6983780837f85e885b539a6'],
-    }),
-    ('stopwords', '2.3', {
-        'checksums': ['c5ec1c6ab1bad1786d87d7823d4b63abc94d2fd84ed7d8e985906e96fb6321b2'],
-    }),
-    ('janeaustenr', '0.1.5', {
-        'checksums': ['992f6673653daf7010fe176993a01cd4127d9a88be428da8da7a28241826d6f3'],
-    }),
-    ('SnowballC', '0.7.0', {
-        'checksums': ['b10fee9d322f567a22c580b49b5d4ba1c86eae40a71794ca92552c726b3895f3'],
-    }),
-    ('tokenizers', '0.2.1', {
-        'checksums': ['28617cdc5ddef5276abfe14a2642999833322b6c34697de1d4e9d6dc7670dd00'],
-    }),
-    ('hunspell', '3.0.1', {
-        'checksums': ['1fedbb913bc13c790d2fabfe4edda0a987db3a078bea8c0ca9b777d20af08662'],
-    }),
-    ('topicmodels', '0.2-12', {
-        'checksums': ['afd83a4381bf39e470446ebefd41ed03f314be400c1b2f702a4b1060eb8fd1b4'],
-    }),
-    ('tidytext', '0.3.2', {
-        'checksums': ['6fe0ada78ee2cdf77c16e519a29b9baff61d8e23ab56aa0a9adc1b2a99a6472b'],
-    }),
-    ('splitstackshape', '1.4.8', {
-        'checksums': ['656032c3f1e3dd5b8a3ee19ffcae617e07104c0e342fc3da4d863637a770fe56'],
-    }),
-    ('grImport2', '0.2-0', {
-        'checksums': ['a102a2d877e42cd4e4e346e5510a77b2f3e57b43ae3c6d5c272fdceb506b00a7'],
-    }),
-    ('preseqR', '4.0.0', {
-        'checksums': ['0143db473fb9a811f9cf582a348226a5763e62d9857ce3ef4ec41412abb559bc'],
-    }),
-    ('idr', '1.2', {
-        'checksums': ['8bbfdf82c8c2b5c73eb079127e198b6cb65c437bb36729f502c7bcd6037fdb16'],
-    }),
-    ('entropy', '1.3.1', {
-        'checksums': ['6f5a89f5ce0e90cbed1695b81259326c976e7a8f538157e223ee5f63b54412b8'],
-    }),
-    ('kedd', '1.0.3', {
-        'checksums': ['38760abd8c8e8f69ad85ca7992803060acc44ce68358de1763bd2415fdf83c9f'],
-    }),
-    ('HiddenMarkov', '1.8-13', {
-        'checksums': ['7186d23e561818f3e1f01376a4fb2af9ccee775ce5afc1e3175f3b07a81db515'],
-    }),
-    ('lmerTest', '3.1-3', {
-        'checksums': ['35aa75e9f5f2871398ff56a482b013e6828135ef04916ced7d1d7e35257ea8fd'],
-    }),
-    ('loo', '2.4.1', {
-        'checksums': ['bc21fb6b4a93a7e95ee1be57e4e787d731895fb8b4743c26b30b43adee475b50'],
-    }),
-    ('RcppParallel', '5.1.4', {
-        'checksums': ['76b545a6878c55edba780183fd89a76fe723b7f19709c5243495dcf3d54eea82'],
-    }),
-    ('StanHeaders', '2.21.0-7', {
-        'checksums': ['27546e064f0e907e031d9185ad55245d118d82fbe3074ecb1d76fae8b9f2336b'],
-    }),
-    ('V8', '3.4.2', {
-        'installopts': '--configure-vars="INCLUDE_DIR=$CPATH LIB_DIR=$LIBRARY_PATH"',
-        'preinstallopts': "export CPATH=$EBROOTNODEJS/include/node:$CPATH && ",
-        'checksums': ['210643473ca8bf423fae34ce72ceb37a3e44c3315ec4abae59a77f077542d2ed'],
-    }),
-    ('rstan', '2.21.2', {
-        'checksums': ['e30e04d38a612e2cb3ac69b53eaa19f7ede8b3548bf82f7892a2e9991d46054a'],
-    }),
-    ('Rborist', '0.2-3', {
-        'checksums': ['f3b3f953ca99e0d17425ac6ba9a7b1e9d6098343abace575cdb492bca2a9c461'],
-    }),
-    ('VSURF', '1.1.0', {
-        'checksums': ['eee99e0c441795c2ccb21cc6e0a37b24f580241e494c83e811b726b43469eeab'],
-    }),
-    ('mRMRe', '2.1.2', {
-        'checksums': ['a59a3cb3cca89f51d9ee6702cd479fd7db8bc2e25b72f45cb6712da983777ca0'],
-    }),
-    ('dHSIC', '2.1', {
-        'checksums': ['94c86473790cf69f11c68ed8ba9d6ae98218c7c69b7a9a093f235d175cf83db0'],
-    }),
-    ('ggsci', '2.9', {
-        'checksums': ['4af14e6f3657134c115d5ac5e65a2ed74596f9a8437c03255447cd959fe9e33c'],
-    }),
-    ('ggsignif', '0.6.3', {
-        'checksums': ['ca8545b25590e531512a90a18449a2cbab945f7434a1d60188c41f7d1839a7a9'],
-    }),
-    ('corrplot', '0.90', {
-        'checksums': ['d9871f219351f443f879ae93c45e3a364eb32cc6f41491a801e7b8a91e96d5dd'],
-    }),
-    ('rstatix', '0.7.0', {
-        'checksums': ['a5ae17dc32cc26fc5dcab9ff0a9747ce3786c9fe091699247ad8b9f823f2600c'],
-    }),
-    ('ggfan', '0.1.3', {
-        'checksums': ['5c888b203ecf5e3dc7a317a790ca059c733002fbca4b4bc1a4f62b7ded5f70dc'],
-    }),
-    ('ggpubr', '0.4.0', {
-        'checksums': ['abb21ec0b1ae3fa1c58eedca2d59b9b009621b30e3660f1247b3880c5fa50675'],
-    }),
-    ('yaImpute', '1.0-32', {
-        'checksums': ['08eee5d851b80aad9c7c80f9531aadd50d60e4b16b3a80657a50212269cd73ff'],
-    }),
-    ('intrinsicDimension', '1.2.0', {
-        'checksums': ['6cc9180a83aa0d123f1e420136bb959c0d5877867fa170b79536f5ee22106a32'],
-    }),
-    ('patchwork', '1.1.1', {
-        'checksums': ['cf0d7d9f92945729b499d6e343441c55007d5b371206d5389b9e5154dc7cf481'],
-    }),
-    ('leiden', '0.3.9', {
-        'checksums': ['81754276e026a9a8436476365bbadf0f15a403a525a349cb56418da5d8edea0d'],
-    }),
-    ('sctransform', '0.3.2', {
-        'checksums': ['5dbb0a045e514c19f51bbe11c2dba0b72dca1942d6eb044c36b0538b443475dc'],
-    }),
-    ('packrat', '0.7.0', {
-        'checksums': ['e8bce1fd78f28f3a7bf56e65a2ae2c6802e69bf55466c24e1d1a4b8a5f83dcc2'],
-    }),
-    ('colourpicker', '1.1.1', {
-        'checksums': ['a0d09982b048b143e2c3438ccec039dd20d6f892fa0dedc9fdcb0d40de883ce0'],
-    }),
-    ('ggExtra', '0.9', {
-        'checksums': ['f22db92d6e3e610901998348acbcaa6652fa6c62a285a622d3b962ba9e89aba2'],
-    }),
-    ('findpython', '1.0.7', {
-        'checksums': ['59f904b9c2ec84b589380de59d13afbf14d1ec3b670e3a07e820298aaf04c149'],
-    }),
-    ('argparse', '2.1.2', {
-        'checksums': ['9997359a735359580ab6b054672388a55701fca71c80b54bab1aedc13bc5e5b3'],
-    }),
-    ('intergraph', '2.0-2', {
-        'checksums': ['6cbe77f1e87fa1c110db2d46010f2f3ae72bfdb708ce2ca84c1cdc2cd6eb47a1'],
-    }),
-    ('ggnetwork', '0.5.10', {
-        'checksums': ['1b655dbab8eed8d0aa3ab2148aac8e0e5bfa190468f5e3c06b001ce88b7f0d3f'],
-    }),
-    ('qqman', '0.1.8', {
-        'checksums': ['58da8317df8d726d1fde4805919da5d64f880894a423ee20937cafb479b9d8a8'],
-    }),
-    ('rstantools', '2.1.1', {
-        'checksums': ['c95b15de8ec577eeb24bb5206e7b685d882f88b5e6902efda924b7217f463d2d'],
-    }),
-    ('bayesplot', '1.8.1', {
-        'checksums': ['d8d74201ea91fa5438714686ca22a947ec9375b6c12b0cfef010c57104b1aa2a'],
-    }),
-    ('dygraphs', '1.1.1.6', {
-        'checksums': ['c3d331f30012e721a048e04639f60ea738cd7e54e4f930ac9849b95f0f005208'],
-    }),
-    ('rsconnect', '0.8.24', {
-        'checksums': ['cf6bef1e073d6fa95c8be8a00e9e4982b88f4bab0e8ecd77db816a585be2e4a6'],
-    }),
-    ('shinystan', '2.5.0', {
-        'checksums': ['45f9c552a31035c5de8658bb9e5d72da7ec1f88fbddb520d15fe701c677154a1'],
-    }),
-    ('optimx', '2021-10.12', {
-        'checksums': ['39384c856b5efa3992cd230548b60eff936d428111ad6ad5b8fb98a3bcbb7943'],
-    }),
-    ('gamm4', '0.2-6', {
-        'checksums': ['57c5b66582b2adc32f6a3bb6a259f5b95198e283a96d966a6007e8e48b380c89'],
-    }),
-    ('projpred', '2.0.2', {
-        'checksums': ['af0a9fb53f706090fe81b6381b27b0b6bd3f7ae1e1e44b0ada6f40972b09a55b'],
-    }),
-    ('distributional', '0.2.2', {
-        'checksums': ['028e5a91aabe3a676eb7b7f3dc907f7f34735a123fe0d9adcabc03476504435f'],
-    }),
-    ('posterior', '1.1.0', {
-        'checksums': ['eff6262dbcc1bf18337f535b0c75ba2fe360322e8b170c466e24ed3ee76cf4d2'],
-    }),
-    ('brms', '2.16.1', {
-        'checksums': ['749efbd9fb061fe207cf2e729c1387d9a8538b922f12ceec4e82a9f8dd9c1bc4'],
-    }),
-    ('drgee', '1.1.10', {
-        'checksums': ['e684f07f7dfec922380d4202922c11094f859721f77b31ff38b0d35d0f42c743'],
-    }),
-    ('stdReg', '3.4.1', {
-        'checksums': ['285335dbe29b6898641e1151ab2f06acf76c6f4d6fbeadd66d151c25d7e38a74'],
-    }),
-    ('mcmcse', '1.5-0', {
-        'checksums': ['4a820dc22c48efd32b7f9d1e1b897b4b3f165cd64b2ff85ba7029621cf9e7463'],
-    }),
-    ('copCAR', '2.0-4', {
-        'checksums': ['8b4ed53c58a665f70e48bdca689a992a81d5ecb5a6051ca7361d3870e13c77f3'],
-    }),
-    ('batchmeans', '1.0-4', {
-        'checksums': ['8694573009d9070a76007281407d3314da78902e122a9d8aec1f819d3bbe562c'],
-    }),
-    ('ngspatial', '1.2-2', {
-        'checksums': ['3fa79e45d3a502a58c1454593ec83dfc73144e92b34c14f617a6126557dd0d26'],
-    }),
-    ('BIGL', '1.6.5', {
-        'checksums': ['5be825734d76760723e2d5b8fbe03524a2b59d9163b33841d4a2c9ab2d4257cf'],
-    }),
-    ('drugCombo', '1.2.1', {
-        'checksums': ['9a605c655c159604033558d757711e6d83d33dfc286c1280f722d4cb7d130f80'],
-    }),
-    ('betareg', '3.1-4', {
-        'checksums': ['5106986096a68b2b516215968158589b71969ce7912879253d6e930355a18101'],
-    }),
-    ('unmarked', '1.1.1', {
-        'checksums': ['48474f396c4a91e257490025ede6a998883683e8020a898fff5d4e23a3764bfd'],
-    }),
-    ('maxlike', '0.1-8', {
-        'checksums': ['90aaab9602f259cbfae61fe96e105cc4a0c2a385b42380f85c14f5d544107251'],
-    }),
-    ('coxme', '2.2-16', {
-        'checksums': ['a0ce4b5649c4c1abbfe2c2bf23089744d1f66eb8368dea16e74e090f366a5111'],
-    }),
-    ('AICcmodavg', '2.3-1', {
-        'checksums': ['d0517da15a38e9b1df20fa73f5342b586624e65792d266e7dff278ad7fc458b0'],
-    }),
-    ('pacman', '0.5.1', {
-        'checksums': ['9ec9a72a15eda5b8f727adc877a07c4b36f8372fe7ed80a1bc6c2068dab3ef7c'],
-    }),
-    ('spaa', '0.2.2', {
-        'checksums': ['a5a54454d4a7af473ce797875f849bd893005cb04325bf3e0dbddb19fe8d7198'],
-    }),
-    ('maxnet', '0.1.4', {
-        'checksums': ['fd21e5ecf3c1ac00ef1bbe79fab4cdd62789e0c4c45f126f1b64bda667238216'],
-    }),
-    ('oai', '0.3.2', {
-        'checksums': ['ebfa756e08f6ac0aa61556b1a5bbe611f407bfff8aef1f8d075a24c361678bfd'],
-    }),
-    ('wellknown', '0.7.4', {
-        'checksums': ['483e6fc43edf09ed583e74ce5ca7e2d7838ef8a32291e06d774c37546eed1a34'],
-    }),
-    ('rgbif', '3.6.0', {
-        'checksums': ['2941857c85d89ebaf614ed130ec2f68e326a8ca99e00263ac4e2a9c556917f20'],
-    }),
-    ('rgdal', '1.5-27', {
-        'checksums': ['62a555ed7b5424dd0252b3764e3542fb30c524d06e8245215bcfaedd84ee5756'],
-    }),
-    ('rgeos', '0.5-8', {
-        'checksums': ['0db35392146cefb5eea0392eecb6b0bfee53708222b98b06de54a3e1a04ea314'],
-    }),
-    ('mapproj', '1.2.7', {
-        'checksums': ['f0081281b08bf3cc7052c4f1360d6d3c20d9063be57754448ad9b48ab0d34c5b'],
-    }),
-    ('rbison', '1.0.0', {
-        'checksums': ['9957e5f85ce68f5dd0ddc3c4b2b3c9d2f52d6f37587e1022ab8a44863534a83c'],
-    }),
-    ('rebird', '1.3.0', {
-        'checksums': ['b238d3f246aa0249145894e1f3a90f46902f6615fc2f23b24c99bb5feecc55d3'],
-    }),
-    ('rvertnet', '0.8.2', {
-        'checksums': ['2de9a3ec33a213c7592b49cca1d510a25aef0625369376d9b1b4e5d0da519226'],
-    }),
-    ('ridigbio', '0.3.5', {
-        'checksums': ['e5cfb2e4dd8ddd1452a5afcf24fcc260889179d0f52eff4f41835adf99b64614'],
-    }),
-    ('spocc', '1.2.0', {
-        'checksums': ['4bac45db5e69bfa3bf6cebd1b0c9241214c95561f275cee6d31e00911aa79d84'],
-    }),
-    ('spThin', '0.2.0', {
-        'checksums': ['2e997afb79a2a990eded34c71afaac83986669cfa9ac51b15ae3f2b558902048'],
-    }),
-    ('rangeModelMetadata', '0.1.4', {
-        'checksums': ['529d529ca90437db3d1e45118443e27a920422806383c7edaa2102beb43f5f80'],
-    }),
-    ('ENMeval', '2.0.1', {
-        'checksums': ['2f7b7760ae70a45cd3c766aacf1e39f498de4f2e8c7b6dcde6b9adf6d8100250'],
-    }),
-    ('plotmo', '3.6.1', {
-        'checksums': ['245a0c87f0cca08746c6fdc60da2e3856cd69b1a2b7b5641293c620d4ae04343'],
-    }),
-    ('earth', '5.3.1', {
-        'checksums': ['0bbe06ba974ceb8ec5de1d59cb53f9487d1828d7130fe2503c48b6cb449c4b03'],
-    }),
-    ('mda', '0.5-2', {
-        'checksums': ['344f2053215ddf535d1554b4539e9b09067dac878887cc3eb995cef421fc00c3'],
-    }),
-    ('biomod2', '3.5.1', {
-        'checksums': ['30ed33ff980558a59782ec9e35f9c2c710a540718010654363f63878cdc0ac18'],
-    }),
-    ('poLCA', '1.4.1', {
-        'checksums': ['2e69975b5e7da8c36641bfa9453afdb4861523866b8799bec1d4eace9ab5762e'],
-    }),
-    ('PermAlgo', '1.1', {
-        'checksums': ['d7157b92241c34b71ad19901b52144973b49df453bf2a5edf4497d4bf26bd099'],
-    }),
-    ('coxed', '0.3.3', {
-        'checksums': ['d0d6cb8fea9516b3c63b34d0d81f3804c18a07f97a83e51555575c8ed4c75626'],
-    }),
-    ('testit', '0.13', {
-        'checksums': ['90d47168ab6bdbd1274b600b457626ac07697ce09792c92b2043be5f5b678d80'],
-    }),
-    ('NISTunits', '1.0.1', {
-        'checksums': ['eaccd68db5c73d6a089ce5b323cdd51bc6a6a58ce467987158ba8c9be6a0a94e'],
-    }),
-    ('celestial', '1.4.6', {
-        'checksums': ['9f647f41465ac65b254717698f1978871c378ad8e6ccaa693abf579437069abe'],
-    }),
-    ('fasterize', '1.0.3', {
-        'checksums': ['62b459625e9bdb00251ec5f6cb873e0c59713f3e86dc1e2c8332adc0cea17f81'],
-    }),
-    ('RPMM', '1.25', {
-        'checksums': ['f04a524b13918062616beda50c4e759ce2719ce14150a0e677d07132086c88c8'],
-    }),
-    ('RefFreeEWAS', '2.2', {
-        'checksums': ['de2812f166caabf6ea01c0533402e5cd9d8a525a2a7583e4757decf22319caab'],
-    }),
-    ('wordcloud', '2.6', {
-        'checksums': ['53716954430acd4f164bfd8eacd7068a908ee3358293ded6cd992d53b7f72649'],
-    }),
-    ('JADE', '2.0-3', {
-        'checksums': ['56d68a993fa16fc6dec758c843960eee840814c4ca2271e97681a9d2b9e242ba'],
-    }),
-    ('awsMethods', '1.1-1', {
-        'checksums': ['50934dc20cf4e015f1304a89de6703fed27e7bd54c6b9fc9fb253cdf2ecb7541'],
-    }),
-    ('aws', '2.5-1', {
-        'checksums': ['e8abadc5614f132edc3fb9cb1c82ce4dacc1315b727fbd49db7399aee24115ba'],
-    }),
-    ('ruv', '0.9.7.1', {
-        'checksums': ['a0c54e56ba3d8f6ae178ae4d0e417a79295abf5dcb68bbae26c4b874734d98d8'],
-    }),
-    ('mhsmm', '0.4.16', {
-        'checksums': ['fab573abdc0dd44e8c8bc7242a1428df20b3ec64c4c194e5f1f907393f902d01'],
-    }),
-    ('dbarts', '0.9-20', {
-        'checksums': ['1d75e795812819b7637d38fc909f4d7942bddf359acfb40a7b8e7cd167a5e92a'],
-    }),
-    ('proftools', '0.99-3', {
-        'checksums': ['e034eb1531af54013143da3e15229e1d4c2260f8eb79c93846014db3bdefb724'],
-    }),
-    ('NCmisc', '1.1.6', {
-        'checksums': ['2aa85997d5ec2222e610604022684c004a4925241761d9a0104919f1cf3a8c79'],
-    }),
-    ('reader', '1.0.6', {
-        'checksums': ['905c7c5a1b035ac8213fc533fa26e511abfeea40bd22e3edfde42a49074e88f4'],
-    }),
-    ('gnumeric', '0.7-8', {
-        'checksums': ['28b10c91d693b938ebca610933889095ca160b22e6ca750c46103dfd2b009447'],
-    }),
-    ('tcltk2', '1.2-11', {
-        'checksums': ['ad183ae3b7190501504a0589e0b3be480f04267303e3384fef00987446a37dc5'],
-    }),
-    ('readODS', '1.7.0', {
-        'checksums': ['f6a8ec724df68983c9b176a1b3b3b01239cc4e99aac4bfb42ce1c2b3d40922c2'],
-    }),
-    ('nortest', '1.0-4', {
-        'checksums': ['a3850a048181d5d059c1e74903437569873b430c915b709808237d71fee5209f'],
-    }),
-    ('EnvStats', '2.4.0', {
-        'checksums': ['49459e76412037b3d8021bd83ee93d140bc3e715a2a2282a347ef60061900514'],
-    }),
-    ('outliers', '0.14', {
-        'checksums': ['b6ce8f1db6442481546131def8253cabdf4472116d193daea7cb935d2b76986d'],
-    }),
-    ('elementR', '1.3.7', {
-        'checksums': ['4275f88f372a2efe96ccd0afc20f4f12be92f28c7db35c68b80bb0ffb2c2ab07'],
-    }),
-    ('gWidgets2', '1.0-8', {
-        'checksums': ['1615ce9ab07a251d06c68780be15ab5a4814df877a23aa93e0faf14ccd56d45c'],
-    }),
-    ('gWidgets2tcltk', '1.0-6', {
-        'modulename': False,
-        'preinstallopts': "xvfb-run ",
-        'checksums': ['aa3a2f4612116a652e5573a369e3d89c5939f7c06067c6826ba40ed3bb07302b'],
-    }),
-    ('mgsub', '1.7.3', {
-        'checksums': ['c9ae2560fe2690bedc5248af3fc89e7ef2bc6c147d46ced28f9824584c3791d5'],
-    }),
-    ('ie2misc', '0.8.6', {
-        'checksums': ['f3e2cc8a88f3789a5e339d2676455472a52a303c8273191f27aa2f2f02fdd8cd'],
-    }),
-    ('assertive.base', '0.0-9', {
-        'checksums': ['4bf0910b0eaa507e0e11c3c43c316b524500c548d307eb045d6f89047e6ba01e'],
-    }),
-    ('assertive.properties', '0.0-4', {
-        'checksums': ['5c0663fecb4b7c30f2e1d65da8644534fcfe97fb3d8b51f74c1327cd14291a6b'],
-    }),
-    ('assertive.types', '0.0-3', {
-        'checksums': ['ab6db2eb926e7bc885f2043fab679330aa336d07755375282d89bf9f9d0cb87f'],
-    }),
-    ('assertive.numbers', '0.0-2', {
-        'checksums': ['bae18c0b9e5b960a20636e127eb738ecd8a266e5fc29d8bc5ca712498cd68349'],
-    }),
-    ('assertive.strings', '0.0-3', {
-        'checksums': ['d541d608a01640347d661cc9a67af8202904142031a20caa270f1c83d0ccd258'],
-    }),
-    ('assertive.datetimes', '0.0-3', {
-        'checksums': ['014e2162f5a8d95138ed8330f7477e71c908a29341697c09a1b7198b7e012d94'],
-    }),
-    ('assertive.files', '0.0-2', {
-        'checksums': ['be6adda6f18a0427449249e44c2deff4444a123244b16fe82c92f15d24faee0a'],
-    }),
-    ('assertive.sets', '0.0-3', {
-        'checksums': ['876975a16ed911ea1ad12da284111c6eada6abfc0118585033abc0edb5801bb3'],
-    }),
-    ('assertive.matrices', '0.0-2', {
-        'checksums': ['3462a7a7e11d7cc24180330d48cc3067cf92eab1699b3e4813deec66d99f5e9b'],
-    }),
-    ('assertive.models', '0.0-2', {
-        'checksums': ['b9a6d8786f352d53371dbe8c5f2f2a62a7866e30313f268e69626d5c3691c42e'],
-    }),
-    ('assertive.data', '0.0-3', {
-        'checksums': ['5a00fb48ad870d9b3c872ce3d6aa20a7948687a980f49fe945b455339e789b01'],
-    }),
-    ('assertive.data.uk', '0.0-2', {
-        'checksums': ['ab48dab6977e8f43d6fffb33228d158865f68dde7026d123c693d77339dcf2bb'],
-    }),
-    ('assertive.data.us', '0.0-2', {
-        'checksums': ['180e64dfe6339d25dd27d7fe9e77619ef697ef6e5bb6a3cf4fb732a681bdfaad'],
-    }),
-    ('assertive.reflection', '0.0-5', {
-        'checksums': ['c2ca9b27cdddb9b9876351afd2ebfaf0fbe72c636cd12aa2af5d64e33fbf34bd'],
-    }),
-    ('assertive.code', '0.0-3', {
-        'checksums': ['ef80e8d1d683d776a7618e78ddccffca7f72ab4a0fcead90c670bb8f8cb90be2'],
-    }),
-    ('assertive', '0.3-6', {
-        'checksums': ['c403169e83c433b65e911f7fd640b378e2a4a4765a36063584b8458168a4ea0a'],
-    }),
-    ('rdrop2', '0.8.2.1', {
-        'checksums': ['b9add765fe8e7c966f0d36eef939a9e38f253958bd2a3c656b890cbb0366300b'],
-    }),
-    ('Exact', '3.0', {
-        'checksums': ['a76114e9780c86e4ea0a561300db024b95af9b0ebb6c3bf9a7598d276d009529'],
-    }),
-    ('lmom', '2.8', {
-        'checksums': ['cae2a925c39429d8e9f91bdb2682ea0d1343e9b2e5c9e8752c5929eb5f20d2d2'],
-    }),
-    ('gld', '2.6.2', {
-        'checksums': ['915860ac054ba4d29854c7d274e9c927995c5df2a7d4a6a0122b1fbc4a3c3cf3'],
-    }),
-    ('DescTools', '0.99.43', {
-        'checksums': ['8c3c4e5975428b9f2817907931449cd704d3df0e19e4337010f0dee333e7a4ff'],
-    }),
-    ('orthopolynom', '1.0-5', {
-        'checksums': ['6da4f437aae5c8fafdf791ce3c6a66f68198df4054af3aab8406402a4dc770bf'],
-    }),
-    ('gaussquad', '1.0-2', {
-        'checksums': ['ba3a1ab6ffe92f592c9f2bb1d4070f1fb1019325226dcb4863cf725eb59e9b2d'],
-    }),
-    ('nlsem', '0.8', {
-        'checksums': ['495a5d07aa5f59efdcd43acf429ae842453abd6c0720a80e2102d663fa997c60'],
-    }),
-    ('tableone', '0.13.0', {
-        'checksums': ['1c73a5a7595dc0ae2299d17c74738e077984af7d5429e4858b7be3c55e121346'],
-    }),
-    ('jstable', '1.0.7', {
-        'checksums': ['a8f66172973dc75d1d751d7015e0f028c441263f6649909bd25fa944be0042c3'],
-    }),
-    ('RCAL', '2.0', {
-        'checksums': ['10f5f938a8322d8737159e1e49ce9d12419a5130699b8a19c6ca53d6508da8cc'],
-    }),
-    ('stargazer', '5.2.2', {
-        'checksums': ['70eb4a13a6ac1bfb35af07cb8a63d501ad38dfd9817fc3fba6724260b23932de'],
-    }),
-    ('sensemakr', '0.1.4', {
-        'checksums': ['6a1354f05392fa9343b90f69a54022c995651fb3c3d05cb08fa088ef52258caf'],
-    }),
-    ('CompQuadForm', '1.4.3', {
-        'checksums': ['042fc56c800dd8f5f47a017e2efa832caf74f0602824abf7099898d9708660c4'],
-    }),
-    ('nonnest2', '0.5-5', {
-        'checksums': ['027f510e322122fc75c936251a95ddd392f96047ac86e0fae6cf8f883ac7aab5'],
-    }),
-    ('blavaan', '0.3-17', {
-        'checksums': ['ada14fcc665a22f11fc57392d70141c398d85dbb35f0a3373a501bc51d27f1e5'],
-    }),
-    ('mathjaxr', '1.4-0', {
-        'checksums': ['ba57378236d593a39c5839054adc5473526de0c8f05b7eeb87c99438496ddc67'],
-    }),
-    ('metafor', '3.0-2', {
-        'checksums': ['02df435197b225da736103edf73d19253a542bc31fc0b99610c02daec434138a'],
-    }),
-    ('fmri', '1.9.6', {
-        'checksums': ['7614290d880667512744d3450480a670cc38abdb270f3f776ac9a17a793f07f2'],
-    }),
-    ('AnalyzeFMRI', '1.1-24', {
-        'checksums': ['0d2acfe9ce8f25eb5cc9e6ef1db3ea8e232a31d46a95e50914489b1997e17062'],
-    }),
-    ('linkcomm', '1.0-14', {
-        'checksums': ['36f1557c65d862fc87635eedfad77f18a5deb66da00895e50e2d5eac0f23b597'],
-    }),
-    ('rnetcarto', '0.2.4', {
-        'checksums': ['266702330250e9fbeb8616d86edf1d50d63084a0731d17e84a04dc6faacf653a'],
-    }),
-    ('DEoptim', '2.2-6', {
-        'checksums': ['8c63397d83a067212d003ef3e639fd81f5f00bf61e3c271b4e4999031a69e2e1'],
-    }),
-    ('optextras', '2019-12.4', {
-        'checksums': ['59006383860826be502ea8757e39ed94338f04d246c4fc398a088e004d8b13eb'],
-    }),
-    ('setRNG', '2013.9-1', {
-        'checksums': ['1a1a399682a06a5fea3934985ebb1334005676c6a2a22d06f3c91c3923432908'],
-    }),
-    ('Rvmmin', '2018-4.17.1', {
-        'checksums': ['55000ac4ff57d42f172c46c7d6b0a603da3b65866d6440d6b32bac4d2b81814e'],
-    }),
-    ('Rcgmin', '2013-2.21', {
-        'checksums': ['a824a09c32d7565a3e30607c71333506d5b7197478fbe8b43f8a77dad6c12f0a'],
-    }),
-    ('optimr', '2019-12.16', {
-        'checksums': ['73b1ed560ffd74599517e8baa4c5b293aa062e9c8d50219a3a24b63e72fa7c00'],
-    }),
-    ('DMCfun', '2.0.2', {
-        'checksums': ['430cbc18f17db11a7941e6a8274a0eefbb8a6b0bdac8800970530d60d5881fde'],
-    }),
-    ('miceadds', '3.11-6', {
-        'checksums': ['121d03c812fbcf584a25585ac73f6c44f4b5d6cd21b05362ddd15395fb3909f6'],
-    }),
-    ('visdat', '0.5.3', {
-        'checksums': ['527c76b6643b8475a58516763ef40238cdc61ec62d2dcf690f7c316b93b878c6'],
-    }),
-    ('UpSetR', '1.4.0', {
-        'checksums': ['351e5fee64204cf77fd378cf2a2c0456cc19d4d98a2fd5f3dac74b69a505f100'],
-    }),
-    ('norm', '1.0-9.5', {
-        'checksums': ['305cbf007f3905cfd535ed9bf5ae3e2995e228cc8883d6482e5d3a2f02814106'],
-    }),
-    ('naniar', '0.6.1', {
-        'checksums': ['d546ca15bf6c224f3103eb1441abef91d34feebb7320c2398d598f5d50177450'],
-    }),
-    ('stringdist', '0.9.8', {
-        'checksums': ['efccd6ccc5c74c578be95b7dae1099c52b0d7805452ab14ee91ca34adb8261bb'],
-    }),
-    ('image.binarization', '0.1.2', {
-        'checksums': ['0621ca94a74264bb73f689b1a00484b5a3bbef93fc203d9c001d791a18fcc13f'],
-    }),
-    ('lassosum', '0.4.5', {
-        'source_urls': ['https://github.com/tshmak/%(name)s/releases/download/v%(version)s/'],
-        'sources': ['%(name)s_%(version)s.tar.gz'],
-        'checksums': ['18c0d0b5022bcf81a9bf1b3b6647da3e080f221828b473ea2a45a9bf98474fbc'],
-    }),
-    ('lslx', '0.6.10', {
-        'checksums': ['adc2b2a621625b52165245ab2f3a0bfba4f4db64fcc6ad48a3e5b219c3bd2fa1'],
-    }),
-    ('truncnorm', '1.0-8', {
-        'checksums': ['49564e8d87063cf9610201fbc833859ed01935cc0581b9e21c42a0d21a47c87e'],
-    }),
-    ('Rsolnp', '1.16', {
-        'checksums': ['3142776062beb8e2b45cdbc4fe6e5446b6d33505253d79f2890fe4178d9cf670'],
-    }),
-    ('regsem', '1.8.0', {
-        'checksums': ['28ff1c2dbddcafc6ed6c30154f46074aa0c8974757466680529b71a5f3e463ec'],
-    }),
-    ('semPLS', '1.0-10', {
-        'checksums': ['cb587ccfdaf970f426dc7146035c7e010b1c51c17bf4fc089fd796eda58db460'],
-    }),
-    ('GxEScanR', '2.0.2', {
-        'checksums': ['6d42fd15d83dd1491405b282d26fa472f9f9902a9dc68836d6a48b459ada6a4c'],
-    }),
-    ('alabama', '2015.3-1', {
-        'checksums': ['6600fcf4842488950e196d3f5a8fc4d69e8271b36292ce67ac3ab697449a8f56'],
-    }),
-    ('polycor', '0.7-10', {
-        'checksums': ['caea3beca2c889e12e5b976c20c19cf5a76d42e6329e9ab646112eeae8fcfc73'],
-    }),
-    ('multipol', '1.0-7', {
-        'checksums': ['0abe3c894c0d8e928a920e73708a397133386a0d73a1e7952c4075afe67879e6'],
-    }),
-    ('symmoments', '1.2.1', {
-        'checksums': ['9a6be1f8fe44f6ab5a1790e870fd8b18de1686a48a14a9fca2d035bfb5458672'],
-    }),
-    ('cSEM', '0.4.0', {
-        'checksums': ['7753ac7db9d2c0392e51dd31ec8638e1a7fcbb2546dd9103f5ecc03dd51836c1'],
-    }),
-    ('cubelyr', '1.0.1', {
-        'checksums': ['740a34100592b2c6b7bc89a31bddccf4c8fd95720caf68f530104f17aada77bc'],
-    }),
-    ('broom.mixed', '0.2.7', {
-        'checksums': ['ff29385557af239a41452ffb5ebe230630a2a30f4a91e95505c3178b62df01ba'],
-    }),
-    ('DiceKriging', '1.6.0', {
-        'checksums': ['ab5d1332809f2bb16d156ed234b102eb9fbd6de792e4291f9f6ea4652215cb49'],
-    }),
-    ('grf', '2.0.2', {
-        'checksums': ['043f21a057762a2d5e0febb37c1d9cb8d2f94d19f2eded20c672dec7ff54b505'],
-    }),
-    ('xgboost', '1.4.1.1', {
-        'checksums': ['9f986f3895ce5f6744335c82afe3a87d9ac2e473e60785295edf2be80d34e0c4'],
-    }),
-    ('twang', '2.5', {
-        'checksums': ['fc355527c57e4f6e0f60d26d7c690c4475fcd5fb165d125fea7cc6b9fafc4ce5'],
-    }),
-    ('neuralnet', '1.44.2', {
-        'checksums': ['5f66cd255db633322c0bd158b9320cac5ceff2d56f93e4864a0540f936028826'],
-    }),
-    ('PCAmatchR', '0.3.0', {
-        'checksums': ['73876c6d1cf42928a03a64aba197c67b4a4f4de2c431cfbc6fce615bbea32fa0'],
-    }),
-    ('origami', '1.0.5', {
-        'checksums': ['8d0d08aaecc428cbbf5db4615ad3623777c10c6d7947a1cc3ccc7f8db8cb5263'],
-    }),
-    ('hal9001', '0.4.1', {
-        'checksums': ['386fa93ae6c0f409a9137adc54da25a2770826fbed63787e33a36c95f3f89441'],
-    }),
-    ('cobalt', '4.3.1', {
-        'checksums': ['67e26a700ca083a39beb255df54c6ab495f34ea5847a0bf1c4bac895e980eef8'],
-    }),
-    ('CBPS', '0.22', {
-        'checksums': ['d19247e6765f02737d15a0a2ee86ae24e7206ae740dfaa61821622eb3a309aef'],
-    }),
-    ('SBdecomp', '1.1', {
-        'checksums': ['ad4e4f00bc58eafe551ad6288c0642a16e16ef8f73c2ae649f808b1e559df644'],
-    }),
-    ('naturalsort', '0.1.3', {
-        'checksums': ['cd38a9c5f323f61459e6096cdbf4493851d40497baf671af4f8dfe9a7c00e857'],
-    }),
-    ('lwgeom', '0.2-8', {
-        'checksums': ['f48a92de222da0590b37a30d5cbf2364555044a842795f6b488afecc650b8b34'],
-    }),
-    ('finalfit', '1.0.3', {
-        'checksums': ['bbfa841a2b1a7b1f8c153d773ff076a2e465e451815f8166ff0ce8c4018ff61e'],
-    }),
-    ('broom.helpers', '1.4.0', {
-        'checksums': ['7f6a5c0c79260b57cd31976bc216fffbc79a1641e01b74630dcd37d2c84e3f75'],
-    }),
-    ('gt', '0.3.1', {
-        'checksums': ['ddd1fee446f156d1b52bb2db83262aac2a896db93748e92e08407d317e126019'],
-    }),
-    ('gtsummary', '1.5.0', {
-        'checksums': ['54dd5e11c5b2a808ca93284760a5cd102f820332d2fa40474d5cedea030711a7'],
-    }),
-    ('ncdf4', '1.17', {
-        'checksums': ['db95c4729d3187d1a56dfd019958216f442be6221bd15e23cd597e6129219af6'],
-    }),
-    ('geex', '1.0.12', {
-        'checksums': ['037aece09bc0c4349897cd1d8f5dcf1e680598cdfdf72148b6d1506e02690e7f'],
-    }),
-    ('momentfit', '0.2', {
-        'checksums': ['a10d43ac23bb61b9c67efa4800e3e2b6a444c1afaca8bad351648accd7e003f6'],
-    }),
-    ('StatMatch', '1.4.0', {
-        'checksums': ['820091cd2213734ea16f5fcd616491bbf39d3e6c2bcfb34a7c9fe09f4fd1a459'],
-    }),
-    ('stars', '0.5-3', {
-        'checksums': ['44944a82af36bea09ac1874ff9647acbb7fef021ebdca5aae7c34794be929401'],
-    }),
-    ('rapidjsonr', '1.2.0', {
-        'checksums': ['62c94fcdcf5d0fbdfa2f6168affe526bf547c37c16d94e2e1b78d7bf608eed1f'],
-    }),
-    ('jsonify', '1.2.1', {
-        'checksums': ['929191ab32e34af6a02ad991e29314cc78ea40763fcf232388ef2d132137fbce'],
-    }),
-    ('geometries', '0.2.0', {
-        'checksums': ['8cf5094f3c2458fef5d755799c766afd27c66cd1c292574a6ab532d608360314'],
-    }),
-    ('sfheaders', '0.4.0', {
-        'checksums': ['86bcd61018a0491fc8a1e7fb0422c918296287b82be299a79ccee8fcb515e045'],
-    }),
-    ('geojsonsf', '2.0.1', {
-        'checksums': ['42df40433bfbece5a39cd97b5bd4690b4424855241fcc3e7322ee68a3988bfbf'],
-    }),
-    ('leaflet.providers', '1.9.0', {
-        'checksums': ['9e8fc75c83313ab24663c2e718135459599549ed6e7396086cacb44e36cfd67b'],
-    }),
-    ('leaflet', '2.0.4.1', {
-        'checksums': ['b0f038295f1de5d32d9ffa1d0dbc1562320190f2f1365f3a5e95863fff88901f'],
-    }),
-    ('leafsync', '0.1.0', {
-        'checksums': ['7d8fd8dbbbf66417cf32575f14c0fe68199762ecf1c036c7905c7c5ff859d75c'],
-    }),
-    ('leafem', '0.1.6', {
-        'checksums': ['ca50e0a699f564449248511857a2df0d48cd07de3157e099478a19b533088156'],
-    }),
-    ('widgetframe', '0.3.1', {
-        'checksums': ['44089a2cf8b0941a6f3da55da36353e2f44653ca58bfec7960ee5b71ea380d48'],
-    }),
-    ('tmaptools', '3.1-1', {
-        'checksums': ['fd89cb0d7fb44e0a5dd5311fa3e75a729746bf2e8e158d5ec423e5963f1b542d'],
-    }),
-    ('tmap', '3.3-2', {
-        'checksums': ['2bcb74c5c5546223d79abe5d633581fb2664b910f6246f4b8b7166b208b4629a'],
-    }),
-    ('collapse', '1.6.5', {
-        'checksums': ['1e232a3a62b5eb5ed5d81e7d92ce1bae34c3d877d593d47d7edbd3f515b95a46'],
-    }),
-    ('genoPlotR', '0.8.11', {
-        'checksums': ['f127f7fe8b19c899ecfdf98bf69d2e18926afb593a72fc40097acca66d401607'],
-    }),
-    ('VineCopula', '2.4.3', {
-        'checksums': ['42727aa7345ab544242182222eb97476f5dc04bc837f94f6fd3ea6ccac93ea17'],
-    }),
-    ('Rmpfr', '0.8-7', {
-        'checksums': ['93c2db785ff705dcfc6fa7f0373c2426cdc2ef72ceb5b294edeb2952775f57d2'],
-    }),
-    ('scam', '1.2-12', {
-        'checksums': ['0ce5f844221370884719424eb5b2b22c34a8a8ad64eac3de981e5539b6e88f4a'],
-    }),
-    ('copula', '1.0-1', {
-        'checksums': ['d09b2ccffc7379e48b00952aa6b282baf502feebaf55cc44e93f881d7b909742'],
-    }),
-    ('evd', '2.3-3', {
-        'checksums': ['2fc5ef2e0c3a2a9392425ddd45914445497433d90fb80b8c363877baee4559b4'],
-    }),
-    ('ismev', '1.42', {
-        'checksums': ['0d57fbeca83bd478e84fcff795967d51d8448c629abe7adc6c4c18c7fb8bf1a5'],
-    }),
-    ('GJRM', '0.2-5.1', {
-        'checksums': ['516dd73c70e5c8ab60b24027f94cab42603797c41cb7aa740882cb850f6d6ab4'],
-    }),
-    ('penfa', '0.1.1', {
-        'checksums': ['a22a8ac3d4a040c77e50ddc92328c1989eae536d79fe56013e9372ba27c114e5'],
-    }),
-    ('rngWELL', '0.10-7', {
-        'checksums': ['0c00c54e69d7d552cfa08d766e4854c01c6c1c8e2c558f387760b91a55ef2d38'],
-    }),
-    ('randtoolbox', '1.31.1', {
-        'checksums': ['30992e8156782542e9a2bffb75eb2e35f6d302a8c22cb7c3ed9004f0f0973bad'],
-    }),
-    ('kde1d', '1.0.3', {
-        'checksums': ['d645652d09f1981eb37be9f041034da9b9191885dd38be8a7e485e5e41eb050e'],
-    }),
-    ('RcppThread', '1.0.0', {
-        'checksums': ['544a48ee4ea381e2e1421d4edbec54365f17059084d94ded7c339de36deeccf5'],
-    }),
-    ('wdm', '0.2.2', {
-        'checksums': ['11c616f0896d62993f5eee1daf7b021d27f13751f6617067b57cf463aea32dde'],
-    }),
-    ('rvinecopulib', '0.6.1.1.1', {
-        'checksums': ['779fd288774ebb1a0adde6b960053e5c63750bfa66d5ddf349e0f1d8730f08cd'],
-    }),
-    ('PearsonDS', '1.2.1', {
-        'checksums': ['354be30b8df4e5432d1bc2b6162900522d4c08dc63b207331819d589fb069824'],
-    }),
-    ('covsim', '0.2.1', {
-        'checksums': ['57ca810c6950ab295078b745eb87fdd7f195e15082777eed9f1059b6302f13bf'],
-    }),
-    ('semTools', '0.5-5', {
-        'checksums': ['ddf883753c5964eae8313d7e8a4703be52e649f10d3bc1d12ede6d1707b1fab6'],
-    }),
-    ('GPArotation', '2014.11-1', {
-        'checksums': ['351bc15fc8dc6c8ea5045fbba22180d1e68314fc34d267545687748e312e5096'],
-    }),
-    ('dcurver', '0.9.2', {
-        'checksums': ['cc6c55090d3607910515981ea0c7221e40e7a29e0da0c5a5f42c3847012290ec'],
-    }),
-    ('mirt', '1.35.1', {
-        'checksums': ['788b7e499b7d48f5f590eb5cfdac260c4e993b94a3956d30bc2d8bce8cd2ba3e'],
-    }),
-    ('rpf', '1.0.11', {
-        'checksums': ['e1fd670ae7c3e947db08ce50d6b16ce1b3b8f63a9016b03baba760aee78921fb'],
-    }),
-    ('OpenMx', '2.19.8', {
-        'checksums': ['cb4be9850f61d320dcd47ef0ad7b20e5baafde558ebbc67301b13d883baf6760'],
-    }),
-]
-
-moduleclass = 'lang'
diff --git a/Golden_Repo/r/RDFlib/RDFlib-6.0.2-GCCcore-11.2.0.eb b/Golden_Repo/r/RDFlib/RDFlib-6.0.2-GCCcore-11.2.0.eb
deleted file mode 100644
index c5fb26319..000000000
--- a/Golden_Repo/r/RDFlib/RDFlib-6.0.2-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,26 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'RDFlib'
-version = '6.0.2'
-
-homepage = 'https://github.com/RDFLib/rdflib'
-description = """RDFLib is a Python library for working with RDF, a simple yet powerful language
- for representing information."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [('Python', '3.9.6')]
-
-use_pip = True
-
-exts_list = [
-    ('rdflib', version, {
-        'checksums': ['6136ae056001474ee2aff5fc5b956e62a11c3a9c66bb0f3d9c0aaa5fbb56854e'],
-    }),
-]
-
-sanity_pip_check = True
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/r/RELION/RELION-3.1.3-gpsmpi-2021b.eb b/Golden_Repo/r/RELION/RELION-3.1.3-gpsmpi-2021b.eb
deleted file mode 100644
index b8eea24bb..000000000
--- a/Golden_Repo/r/RELION/RELION-3.1.3-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,48 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'RELION'
-version = "3.1.3"
-
-homepage = 'http://www2.mrc-lmb.cam.ac.uk/relion/index.php/Main_Page'
-description = """RELION (for REgularised LIkelihood OptimisatioN, pronounce
-rely-on) is a stand-alone computer program that employs an empirical Bayesian
-approach to refinement of (multiple) 3D reconstructions or 2D class averages in
-electron cryo-microscopy (cryo-EM). """
-
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-
-source_urls = ['https://github.com/3dem/relion/archive']
-sources = ['%(version)s.tar.gz']
-checksums = ['f10934058e0670807b7004899d7b5103c21ad77841219352c66a33f98586d42e']
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-]
-
-dependencies = [
-    ('CUDA', '11.5', '', SYSTEM),
-    ('FFTW', '3.3.10'),  # RELION uses the threaded libraries from here
-    ('FLTK', '1.3.7'),
-    ('LibTIFF', '4.3.0'),
-    ('X11', '20210802'),
-    ('zlib', '1.2.11'),
-    ('libpng', '1.6.37'),
-    ('freetype', '2.11.0'),
-    ('fontconfig', '2.13.94'),
-]
-
-# Note RELION automatically picks up the threaded fftw3 libs
-preconfigopts = 'export LDFLAGS="-lXft -lfontconfig -lXext -lXinerama '
-preconfigopts += ' -lXcursor -lXfixes -ldl -lpthread -lXrender $LDFLAGS" && '
-
-configopts = '-DCUDA_SDK_ROOT_DIR=$EBROOTCUDA '
-configopts += '-DFLTK_DIR=$EBROOTFLTK -DX11_INCLUDES=$EBROOTX11/include'
-
-
-sanity_check_paths = {
-    'files': ['bin/relion'],
-    'dirs': []
-}
-
-moduleclass = 'bio'
diff --git a/Golden_Repo/r/ROOT/ROOT-6.26.04-gpsmpi-2021b.eb b/Golden_Repo/r/ROOT/ROOT-6.26.04-gpsmpi-2021b.eb
deleted file mode 100644
index 71cd6d106..000000000
--- a/Golden_Repo/r/ROOT/ROOT-6.26.04-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,57 +0,0 @@
-name = 'ROOT'
-version = '6.26.04'
-
-homepage = 'https://root.cern.ch/drupal/'
-description = """The ROOT system provides a set of OO frameworks with all the functionality
-    needed to handle and analyze large amounts of data in a very efficient way."""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://root.cern.ch/download/']
-sources = ['%(namelower)s_v%(version)s.source.tar.gz']
-checksums = ['a271cf82782d6ed2c87ea5eef6681803f2e69e17b3036df9d863636e9358421e']
-
-builddependencies = [
-    ('CMake', '3.21.1'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('GSL', '2.7'),
-    ('libxml2', '2.9.10'),
-    ('PCRE', '8.45'),
-    ('CFITSIO', '4.0.0'),
-    ('freetype', '2.11.0'),
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('zlib', '1.2.11'),
-    ('X11', '20210802'),
-    ('OpenGL', '2021b'),
-    ('GL2PS', '1.4.2'),
-    ('FFTW', '3.3.10'),
-    ('SQLite', '3.36'),
-    ('XZ', '5.2.5'),
-    ('libpng', '1.6.37'),
-    ('tbb', '2020.3'),
-    ('Perl', '5.34.0'),
-    ('Go', '1.17.3', '', SYSTEM),
-    ('nlohmann-json', '3.10.4'),
-    ('LibTIFF', '4.3.0'),
-]
-
-# NOTE: Ensure that each configopts string begins with a blank
-# disable some components
-configopts = " -Dxrootd=OFF -Dmysql=OFF -Dkrb5=OFF -Dodbc=OFF -Doracle=OFF -Dpgsql=OFF -Dqt=OFF"
-
-# make sure some components are enabled
-configopts += " -Dpcre=ON -Dzlib=ON -Dpyroot=ON"
-configopts += " -Dunuran=ON -Dexplicitlink=ON -Dminuit2=ON -Droofit=ON "
-
-# Add component-specific settings based on dependencies
-configopts += ' -Dfftw3=ON -Dgsl=ON -DOpenGL_GL_PREFERENCE=GLVND'
-
-# Set C++ standard to C++17 for better stability
-configopts += ' -DCMAKE_CXX_STANDARD=17'
-
-moduleclass = 'data'
diff --git a/Golden_Repo/r/Ruby/Ruby-3.0.1-GCCcore-11.2.0.eb b/Golden_Repo/r/Ruby/Ruby-3.0.1-GCCcore-11.2.0.eb
deleted file mode 100644
index 9ace71ceb..000000000
--- a/Golden_Repo/r/Ruby/Ruby-3.0.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,202 +0,0 @@
-name = 'Ruby'
-version = '3.0.1'
-
-homepage = 'https://www.ruby-lang.org'
-description = """Ruby is a dynamic, open source programming language with
- a focus on simplicity and productivity. It has an elegant syntax that is
- natural to read and easy to write."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://cache.ruby-lang.org/pub/ruby/%(version_major_minor)s']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['369825db2199f6aeef16b408df6a04ebaddb664fb9af0ec8c686b0ce7ab77727']
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [
-    ('ZeroMQ', '4.3.4')
-]
-
-exts_default_options = {
-    'source_urls': ['https://rubygems.org/downloads/'],
-    'source_tmpl': '%(name)s-%(version)s.gem',
-}
-
-# !! order of packages is important !!
-# some packages have dependencies with minimum and maximum version requirements
-# each version is picked as high as possible to fullfill all requirements
-# packages updated on 2021-07-02
-exts_list = [
-    ('ffi', '1.15.5', {
-        'checksums': ['6f2ed2fa68047962d6072b964420cba91d82ce6fa8ee251950c17fca6af3c2a0'],
-    }),
-    ('childprocess', '4.1.0', {
-        'checksums': ['3616ce99ccb242361ce7f2b19bf9ff3e6bc1d98b927c7edc29af8ca617ba6cd3'],
-    }),
-    ('json', '2.6.1', {
-        'checksums': ['7ff682a2db805d6b924e4e87341c3c0036824713a23c58ca53267ce7e5ce2ffd'],
-    }),
-    ('cabin', '0.9.0', {
-        'checksums': ['91c5394289e993e7037a6c869e3f212f31a5984d2b1811ac934f591c87446b2c'],
-    }),
-    ('backports', '3.23.0', {
-        'checksums': ['88fc26a40083a51015faa2ba02cbdc3605cb59f183cf0868f4fb3ac02900148f'],
-    }),
-    ('arr-pm', '0.0.11', {
-        'checksums': ['f1ab088421276f446da1971c5071defd1504855ec46e196815fa43cd62d61a9f'],
-    }),
-    ('clamp', '1.3.2', {
-        'checksums': ['4f6a99a8678d51abbf1650263a74d1ac50939edc11986271431d2e03a0d7a022'],
-    }),
-    ('multipart-post', '2.1.1', {
-        'checksums': ['d2dd7aa957650e0d99e0513cd388401b069f09528441b87d884609c8e94ffcfd'],
-    }),
-    ('ruby2_keywords', '0.0.5', {
-        'checksums': ['ffd13740c573b7301cf7a2e61fc857b2a8e3d3aff32545d6f8300d8bae10e3ef'],
-    }),
-    ('faraday-net_http', '2.0.1', {
-        'checksums': ['f867b028552c3cf018b9293b58b993dc238ba62683568b3e194c673afe62d700'],
-    }),
-    ('faraday', '1.0.0', {
-        'checksums': ['e67631809ae5633a1d2b03adfa83939a91a095f6dc61a1f322826612613dd687'],
-    }),
-    ('faraday_middleware', '1.2.0', {
-        'checksums': ['ded15d574d50e92bd04448d5566913af5cb1a01b2fa311ceecc2464fa0ab88af'],
-    }),
-    ('highline', '2.0.3', {
-        'checksums': ['2ddd5c127d4692721486f91737307236fe005352d12a4202e26c48614f719479'],
-    }),
-    ('net-http-pipeline', '1.0.1', {
-        'checksums': ['6923ce2f28bfde589a9f385e999395eead48ccfe4376d4a85d9a77e8c7f0b22f'],
-    }),
-    ('connection_pool', '2.2.5', {
-        'checksums': ['13a8fc3921ce4df8e04fb65f1037251decb08d74757b41163688bd1c1feccd39'],
-    }),
-    ('net-http-persistent', '2.9.4', {
-        'checksums': ['24274d207ffe66222ef70c78a052c7ea6e66b4ff21e2e8a99e3335d095822ef9'],
-    }),
-    ('multi_json', '1.15.0', {
-        'checksums': ['1fd04138b6e4a90017e8d1b804c039031399866ff3fbabb7822aea367c78615d'],
-    }),
-    ('public_suffix', '4.0.6', {
-        'checksums': ['a99967c7b2d1d2eb00e1142e60de06a1a6471e82af574b330e9af375e87c0cf7'],
-    }),
-    ('addressable', '2.8.0', {
-        'checksums': ['f76d29d2d1f54b6c6a49aec58f9583b08d97e088c227a3fcba92f6c6531d5908'],
-    }),
-    ('concurrent-ruby', '1.1.9', {
-        'checksums': ['0ec0846d991c38f355b4228ad8ea77aa69c3fdaa320cd574dafedc10c4688a5b'],
-    }),
-    ('i18n', '1.8.11', {
-        'checksums': ['ae133354590b49070b87c83f8fe8cc064ffdc40ca76364535e100312e30cad6d'],
-    }),
-    ('minitest', '5.15.0', {
-        'checksums': ['6d2d5bfa301257ef2c2fe8818abeaa0932ed54735c8ed039459cb4f85029ae1b'],
-    }),
-    ('thread_safe', '0.3.6', {
-        'checksums': ['9ed7072821b51c57e8d6b7011a8e282e25aeea3a4065eab326e43f66f063b05a'],
-    }),
-    ('tzinfo', '1.1.0', {
-        'checksums': ['715a47c25f8e4c2f106c92d5a97e612f84eb7e85f5822bf3d6cf615b44492abc'],
-    }),
-    ('zeitwerk', '2.5.3', {
-        'checksums': ['ddfeb36d24444b10f402cae2ee5a05c580f54115ae25bcf2ac29bf814c4faf52'],
-    }),
-    ('activesupport', '5.2.6', {
-        'checksums': ['7249ee13859fc99ed2c833048674fd28c11605c679f1c65035190a2219e9cbef'],
-    }),
-    ('gh', '0.18.0', {
-        'checksums': ['eb93f18a88db3ba92eb888610fc53fae731d9dacfe55922b58cc3f3aca776a47'],
-    }),
-    ('launchy', '2.5.0', {
-        'checksums': ['954243c4255920982ce682f89a42e76372dba94770bf09c23a523e204bdebef5'],
-    }),
-    ('ethon', '0.15.0', {
-        'checksums': ['0809805a035bc10f54162ca99f15ded49e428e0488bcfe1c08c821e18261a74d'],
-    }),
-    ('typhoeus', '1.4.0', {
-        'checksums': ['fff9880d5dc35950e7706cf132fd297f377c049101794be1cf01c95567f642d4'],
-    }),
-    ('websocket', '1.2.9', {
-        'checksums': ['884b12dee993217795bb5f58acc89c0121c88bdc99df4d1636c0505dca352b36'],
-    }),
-    ('pusher-client', '0.6.2', {
-        'checksums': ['c405c931090e126c056d99f6b69a01b1bcb6cbfdde02389c93e7d547c6efd5a3'],
-    }),
-    ('diff-lcs', '1.5.0', {
-        'checksums': ['49b934001c8c6aedb37ba19daec5c634da27b318a7a3c654ae979d6ba1929b67'],
-    }),
-    ('rspec-support', '3.10.3', {
-        'checksums': ['65c88f8cbe579461f411097682e6402960eae327eef08e86ef581b8c609e4c5e'],
-    }),
-    ('rspec-mocks', '3.10.2', {
-        'checksums': ['93fc76e312c3d19cacc1cb2eb64bf82731de2e216295cf2b4d0ce31ba77923b4'],
-    }),
-    ('rspec-expectations', '3.10.1', {
-        'checksums': ['27acf5d5df13f8cc8f7158001ebf572513bcec3d45404ba76e0a8998895ce9eb'],
-    }),
-    ('rspec-core', '3.10.1', {
-        'checksums': ['ac9abdc9577a3a34e9e92815603da8343931055ab4fba1c2a49de6dd3b749673'],
-    }),
-    ('rspec', '3.10.0', {
-        'checksums': ['b870b43d49ae4a4e063b94976d2742b0854ec10458c425d569b5556ee5898ab7'],
-    }),
-    ('rack', '2.2.3', {
-        'checksums': ['2638e7eb6689a5725c7e16f30cc4aa4e31694dc3ca30d790952526781bd0bb44'],
-    }),
-    ('rack-protection', '2.1.0', {
-        'checksums': ['1f523c16e5b32f139c8f6f1e3b3eb53aaa7a69bc79a30f3e80f8a93c89242a95'],
-    }),
-    ('tilt', '2.0.10', {
-        'checksums': ['9b664f0e9ae2b500cfa00f9c65c34abc6ff1799cf0034a8c0a0412d520fac866'],
-    }),
-    ('mustermann', '1.1.1', {
-        'checksums': ['0a21cfe505869cce9ce17998db5260344e78df81ae857c07a62143fd30299531'],
-    }),
-    ('sinatra', '2.1.0', {
-        'checksums': ['f323e4446f3e2a132dcaaa134f89caddb29dd88370317f4f32faf5797f1ea535'],
-    }),
-    ('rack-test', '1.1.0', {
-        'checksums': ['154161f40f162b1c009a655b7b0c5de3a3102cc6d7d2e94b64e1f46ace800866'],
-    }),
-    ('bundler', '2.3.5', {
-        'checksums': ['2553cbd138b466bc56a3c724c5c28648dff8e2343b13a7c696cf9c2818c8d629'],
-    }),
-    # for Jupyter kernel
-    ('mime-types-data', '3.2022.0105', {
-        'checksums': ['d8c401ba9ea8b648b7145b90081789ec714e91fd625d82c5040079c5ea696f00'],
-    }),
-    ('mime-types', '3.4.1', {
-        'checksums': ['6bcf8b0e656b6ae9977bdc1351ef211d0383252d2f759a59ef4bcf254542fc46'],
-    }),
-    ('data_uri', '0.1.0', {
-        'checksums': ['7eb2f63487ccb943fae0eca561729c48d4d5654d76f8330aa16ed1dcdbebf33b'],
-    }),
-    ('io-console', '0.5.11', {
-        'checksums': ['7e2418376fd185ad66e7aee2c58c207e9be0f2197aa89bc4c89931995cee3365'],
-    }),
-    ('reline', '0.3.1', {
-        'checksums': ['b101d93607bf7564657f082f68abfa19ae939d14a709eff89be048eae2d7f4c7'],
-    }),
-    ('irb', '1.4.1', {
-        'checksums': ['4a6698d9ab9de30ffd2def6fb17327f5d0fc089ace62337eff95396f379bf0a8'],
-    }),
-    ('multi_json', '1.15.0', {
-        'checksums': ['1fd04138b6e4a90017e8d1b804c039031399866ff3fbabb7822aea367c78615d'],
-    }),
-    ('ffi-rzmq-core', '1.0.7', {
-        'checksums': ['6541625a0f80016e4cb1b22a68b3870bd711c30de7d77625d8d6c92be95eb32a'],
-    }),
-    ('ffi-rzmq', '2.0.7', {
-        'checksums': ['2feb3bc5bf46df633e2211514ac408521df0c198f54134fdb38322675d9f4591'],
-    }),
-    ('native-package-installer', '1.1.3', {
-        'checksums': ['ba899df70489b748a3fe1b48afe6325d1cb8ca67fdff759266c275b911c797dd'],
-    }),
-    ('iruby', '0.7.4', {
-        'checksums': ['cc219e2ac797c3fbf8c2b937ee7d26547723c8ae0e5ad65f2975aa3325b3a620'],
-    }),
-]
-
-moduleclass = 'lang'
diff --git a/Golden_Repo/r/Rust/Rust-1.54.0-GCCcore-11.2.0.eb b/Golden_Repo/r/Rust/Rust-1.54.0-GCCcore-11.2.0.eb
deleted file mode 100644
index 290dc6903..000000000
--- a/Golden_Repo/r/Rust/Rust-1.54.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,48 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'Rust'
-version = '1.54.0'
-
-homepage = 'https://www.rust-lang.org'
-description = """Rust is a systems programming language that runs blazingly fast, prevents segfaults,
-and guarantees thread safety."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://static.rust-lang.org/dist/']
-sources = ['rustc-%(version)s-src.tar.gz']
-checksums = ['ac8511633e9b5a65ad030a1a2e5bdaa841fdfe3132f2baaa52cc04e71c6c6976']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1'),
-    ('Python', '3.9.6', '-bare'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('OpenSSL', '1.1', '', True),
-]
-
-configopts = "--enable-extended --sysconfdir=%(installdir)s/etc "
-
-# avoid build dependency on Ninja, which requires Python,
-# since Rust is a build dependency for cryptography that is included with Python
-configopts += "--set=llvm.ninja=false "
-
-# avoid failure when home directory is an NFS mount,
-# see https://github.com/rust-lang/cargo/issues/6652
-prebuildopts = "export CARGO_HOME=%(builddir)s/cargo && "
-preinstallopts = prebuildopts
-
-sanity_check_paths = {
-    'files': ['bin/cargo', 'bin/rustc', 'bin/rustdoc'],
-    'dirs': ['lib/rustlib', 'share/doc', 'share/man'],
-}
-
-sanity_check_commands = [
-    "cargo --version",
-    "rustc --version",
-]
-
-moduleclass = 'lang'
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
deleted file mode 100644
index 7d742df5c..000000000
--- a/Golden_Repo/r/re2c/re2c-2.2-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,28 +0,0 @@
-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/r/rencode/rencode-1.0.5-GCCcore-11.2.0.eb b/Golden_Repo/r/rencode/rencode-1.0.5-GCCcore-11.2.0.eb
deleted file mode 100644
index 386e924ca..000000000
--- a/Golden_Repo/r/rencode/rencode-1.0.5-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,42 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'rencode'
-version = '1.0.5'
-
-homepage = 'https://pypi.python.org/pypi/rencode/'
-description = """
-The rencode module is similar to bencode from the BitTorrent project. 
-For complex, heterogeneous data structures with many small elements,
-r-encodings take up significantly less space than b-encodings. 
-This version of rencode is a complete rewrite in Cython to attempt to 
-increase the performance over the pure Python module written by Petru Paler, Connelly Barnes et al.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-sources = [SOURCE_TAR_GZ]
-source_urls = [PYPI_SOURCE]
-checksums = ['fb66c92d35355d6098956204e663ddadf7f2cc8f64962846f67e1e1d036efc57']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-]
-
-maxparallel = 12
-
-use_pip = True
-sanity_pip_check = True
-download_dep_fail = True
-
-options = {'modulename': 'rencode'}
-
-sanity_check_paths = {
-    'files': [],
-    'dirs': ['lib/python%(pyshortver)s/site-packages/'],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/r/rkcommon/rkcommon-1.8.0-GCC-11.2.0.eb b/Golden_Repo/r/rkcommon/rkcommon-1.8.0-GCC-11.2.0.eb
deleted file mode 100644
index 9fa0bbfdf..000000000
--- a/Golden_Repo/r/rkcommon/rkcommon-1.8.0-GCC-11.2.0.eb
+++ /dev/null
@@ -1,37 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'rkcommon'
-version = '1.8.0'
-
-homepage = 'http://www.ospray.org/'
-description = """
-OSPRay is an open source, scalable, and portable ray tracing engine for
-high-performance, high-fidelity visualization on Intel® Architecture CPUs.
-"""
-
-
-toolchain = {'name': 'GCC', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/ospray/rkcommon/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['f037c15f7049610ef8bca37500b2ab00775af60ebbb9d491ba5fc2e5c04a7794']
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-]
-
-dependencies = [
-    ('tbb', '2020.3'),
-]
-
-separate_build_dir = True
-
-start_dir = '%(name)s-%(version)s'
-
-sanity_check_paths = {
-    'dirs': ['bin', 'include/rkcommon'],
-    'files': ['lib/librkcommon.so'],
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/r/rpmrebuild/rpmrebuild-2.16.eb b/Golden_Repo/r/rpmrebuild/rpmrebuild-2.16.eb
deleted file mode 100644
index e7c01c64a..000000000
--- a/Golden_Repo/r/rpmrebuild/rpmrebuild-2.16.eb
+++ /dev/null
@@ -1,33 +0,0 @@
-##
-# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
-#
-# Copyright:: Copyright 2016 Forschungszentrum Juelich GmbH
-# Authors::   Damian Alvarez <d.alvarez@fz-juelich.de>
-# License::   MIT/GPL
-# $Id$
-##
-
-easyblock = "Tarball"
-
-name = "rpmrebuild"
-version = "2.16"
-
-homepage = 'http://rpmrebuild.sourceforge.net/'
-description = """rpmrebuild is a tool to build an RPM file from a package that has already been installed"""
-
-
-toolchain = SYSTEM
-
-source_urls = [SOURCEFORGE_SOURCE]
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['b8a9830a6c4040667d0c78b025e80d046ec9f51afb515dc7882f242e4095f34e']
-
-modextrapaths = {'PATH': ['']}
-modextravars = {'RPMREBUILD_ROOT_DIR': '%(installdir)s'}
-
-sanity_check_paths = {
-    'files': ["rpmrebuild"],
-    'dirs': []
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/s/SCOTCH/SCOTCH-6.1.2-gompi-2021b.eb b/Golden_Repo/s/SCOTCH/SCOTCH-6.1.2-gompi-2021b.eb
deleted file mode 100644
index 43b6bef02..000000000
--- a/Golden_Repo/s/SCOTCH/SCOTCH-6.1.2-gompi-2021b.eb
+++ /dev/null
@@ -1,32 +0,0 @@
-name = 'SCOTCH'
-version = '6.1.2'
-
-homepage = 'http://gforge.inria.fr/projects/scotch/'
-description = """Software package and libraries for sequential and parallel graph partitioning,
-static mapping, and sparse matrix block ordering, and sequential mesh and hypergraph partitioning.
-"""
-
-toolchain = {'name': 'gompi', 'version': '2021b'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://gitlab.inria.fr/scotch/scotch/-/archive/v%(version)s/']
-sources = ['%(namelower)s-v%(version)s.tar.gz']
-checksums = ['9c2c75c75f716914a2bd1c15dffac0e29a2f8069b2df1ad2b6207c984b699450']
-
-dependencies = [
-    ('zlib', '1.2.11'),
-]
-
-configopts = '-DIDXSIZE64 '
-
-modloadmsg = """
-Notice: We do not support the Fortran interface
-"""
-
-modextravars = {
-    'SCOTCH_ROOT': '%(installdir)s',
-    'SCOTCH_INCLUDE': '%(installdir)s/include/',
-    'SCOTCH_LIB': '%(installdir)s/lib',
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/s/SCOTCH/SCOTCH-6.1.2-gpsmpi-2021b.eb b/Golden_Repo/s/SCOTCH/SCOTCH-6.1.2-gpsmpi-2021b.eb
deleted file mode 100644
index e8e7e4d00..000000000
--- a/Golden_Repo/s/SCOTCH/SCOTCH-6.1.2-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,31 +0,0 @@
-name = 'SCOTCH'
-version = '6.1.2'
-
-homepage = 'http://gforge.inria.fr/projects/scotch/'
-description = """Software package and libraries for sequential and parallel graph partitioning,
-static mapping, and sparse matrix block ordering, and sequential mesh and hypergraph partitioning.
-"""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://gitlab.inria.fr/scotch/scotch/-/archive/v%(version)s/']
-sources = ['%(namelower)s-v%(version)s.tar.gz']
-checksums = ['9c2c75c75f716914a2bd1c15dffac0e29a2f8069b2df1ad2b6207c984b699450']
-
-# ParaStationMPI is not threaded
-threadedmpi = False
-
-configopts = '-DIDXSIZE64 '
-
-modloadmsg = """
-Notice: We do not support the Fortran interface
-"""
-
-modextravars = {
-    'SCOTCH_ROOT': '%(installdir)s',
-    'SCOTCH_INCLUDE': '%(installdir)s/include/',
-    'SCOTCH_LIB': '%(installdir)s/lib',
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/s/SCOTCH/SCOTCH-6.1.2-iimpi-2021b.eb b/Golden_Repo/s/SCOTCH/SCOTCH-6.1.2-iimpi-2021b.eb
deleted file mode 100644
index 9e59596c9..000000000
--- a/Golden_Repo/s/SCOTCH/SCOTCH-6.1.2-iimpi-2021b.eb
+++ /dev/null
@@ -1,28 +0,0 @@
-name = 'SCOTCH'
-version = '6.1.2'
-
-homepage = 'http://gforge.inria.fr/projects/scotch/'
-description = """Software package and libraries for sequential and parallel graph partitioning,
-static mapping, and sparse matrix block ordering, and sequential mesh and hypergraph partitioning.
-"""
-
-toolchain = {'name': 'iimpi', 'version': '2021b'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://gitlab.inria.fr/scotch/scotch/-/archive/v%(version)s/']
-sources = ['%(namelower)s-v%(version)s.tar.gz']
-checksums = ['9c2c75c75f716914a2bd1c15dffac0e29a2f8069b2df1ad2b6207c984b699450']
-
-configopts = '-DIDXSIZE64 '
-
-modloadmsg = """
-Notice: We do not support the Fortran interface
-"""
-
-modextravars = {
-    'SCOTCH_ROOT': '%(installdir)s',
-    'SCOTCH_INCLUDE': '%(installdir)s/include/',
-    'SCOTCH_LIB': '%(installdir)s/lib',
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/s/SCOTCH/SCOTCH-6.1.2-iompi-2021b.eb b/Golden_Repo/s/SCOTCH/SCOTCH-6.1.2-iompi-2021b.eb
deleted file mode 100644
index 6d757872e..000000000
--- a/Golden_Repo/s/SCOTCH/SCOTCH-6.1.2-iompi-2021b.eb
+++ /dev/null
@@ -1,28 +0,0 @@
-name = 'SCOTCH'
-version = '6.1.2'
-
-homepage = 'http://gforge.inria.fr/projects/scotch/'
-description = """Software package and libraries for sequential and parallel graph partitioning,
-static mapping, and sparse matrix block ordering, and sequential mesh and hypergraph partitioning.
-"""
-
-toolchain = {'name': 'iompi', 'version': '2021b'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://gitlab.inria.fr/scotch/scotch/-/archive/v%(version)s/']
-sources = ['%(namelower)s-v%(version)s.tar.gz']
-checksums = ['9c2c75c75f716914a2bd1c15dffac0e29a2f8069b2df1ad2b6207c984b699450']
-
-configopts = '-DIDXSIZE64 '
-
-modloadmsg = """
-Notice: We do not support the Fortran interface
-"""
-
-modextravars = {
-    'SCOTCH_ROOT': '%(installdir)s',
-    'SCOTCH_INCLUDE': '%(installdir)s/include/',
-    'SCOTCH_LIB': '%(installdir)s/lib',
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/s/SCOTCH/SCOTCH-6.1.2-ipsmpi-2021b.eb b/Golden_Repo/s/SCOTCH/SCOTCH-6.1.2-ipsmpi-2021b.eb
deleted file mode 100644
index 951aeff99..000000000
--- a/Golden_Repo/s/SCOTCH/SCOTCH-6.1.2-ipsmpi-2021b.eb
+++ /dev/null
@@ -1,31 +0,0 @@
-name = 'SCOTCH'
-version = '6.1.2'
-
-homepage = 'http://gforge.inria.fr/projects/scotch/'
-description = """Software package and libraries for sequential and parallel graph partitioning,
-static mapping, and sparse matrix block ordering, and sequential mesh and hypergraph partitioning.
-"""
-
-toolchain = {'name': 'ipsmpi', 'version': '2021b'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://gitlab.inria.fr/scotch/scotch/-/archive/v%(version)s/']
-sources = ['%(namelower)s-v%(version)s.tar.gz']
-checksums = ['9c2c75c75f716914a2bd1c15dffac0e29a2f8069b2df1ad2b6207c984b699450']
-
-# ParaStationMPI is not threaded
-threadedmpi = False
-
-configopts = '-DIDXSIZE64 '
-
-modloadmsg = """
-Notice: We do not support the Fortran interface
-"""
-
-modextravars = {
-    'SCOTCH_ROOT': '%(installdir)s',
-    'SCOTCH_INCLUDE': '%(installdir)s/include/',
-    'SCOTCH_LIB': '%(installdir)s/lib',
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/s/SCons/SCons-4.2.0-GCCcore-11.2.0.eb b/Golden_Repo/s/SCons/SCons-4.2.0-GCCcore-11.2.0.eb
deleted file mode 100644
index 221297553..000000000
--- a/Golden_Repo/s/SCons/SCons-4.2.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,33 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'SCons'
-version = '4.2.0'
-
-homepage = 'https://www.scons.org/'
-description = "SCons is a software construction tool."
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-sources = [SOURCE_TAR_GZ]
-checksums = ['691893b63f38ad14295f5104661d55cb738ec6514421c6261323351c25432b0a']
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [('Python', '3.9.6')]
-
-download_dep_fail = True
-use_pip = True
-
-sanity_check_paths = {
-    'files': ['bin/scons', 'bin/sconsign'],
-    'dirs': [],
-}
-
-sanity_check_commands = ["scons --help"]
-
-sanity_pip_check = True
-
-# no Python module to import during sanity check
-options = {'modulename': False}
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/s/SDL2/SDL2-2.0.18-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/s/SDL2/SDL2-2.0.18-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index 2dc3570d1..000000000
--- a/Golden_Repo/s/SDL2/SDL2-2.0.18-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,41 +0,0 @@
-##
-# This file is an EasyBuild reciPY as per https://github.com/easybuilders/easybuild
-#
-# Copyright:: Copyright 2012-2014 Uni.Lu, NTUA
-# Authors::   Fotis Georgatos <fotis@cern.ch>
-# 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/
-##
-
-easyblock = 'ConfigureMake'
-
-name = 'SDL2'
-version = '2.0.18'
-
-homepage = 'http://www.libsdl.org/'
-description = "SDL: Simple DirectMedia Layer, a cross-platform multimedia library"
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-source_urls = ['http://www.libsdl.org/release/']
-sources = [SOURCE_TAR_GZ]
-checksums = ['94d40cd73dbfa10bb6eadfbc28f355992bb2d6ef6761ad9d4074eff95ee5711c']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('X11', '20210802'),
-    ('CUDA', '11.5', '', SYSTEM),
-]
-
-sanity_check_paths = {
-    'files': ['bin/sdl2-config', 'lib/libSDL2.%s' % SHLIB_EXT],
-    'dirs': [],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-gompi-2021b.eb b/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-gompi-2021b.eb
deleted file mode 100644
index 51423a86f..000000000
--- a/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-gompi-2021b.eb
+++ /dev/null
@@ -1,22 +0,0 @@
-easyblock = "CMakeMake"
-name = "SIONfwd"
-version = "1.0.1"
-
-homepage = 'https://gitlab.version.fz-juelich.de/SIONlib/SIONfwd'
-description = 'I/O forwarding for SIONlib'
-
-toolchain = {'name': 'gompi', 'version': '2021b'}
-toolchainopts = {'pic': True}
-
-builddependencies = [('CMake', '3.21.1', '', SYSTEM)]
-
-source_urls = ['https://gitlab.jsc.fz-juelich.de/SIONlib/SIONfwd/-/archive/v%(version)s/']
-sources = ['SIONfwd-v%(version)s.tar.gz']
-checksums = ['bb4b0381dec8729ed792225f90b7a2b04049886989e53216bc1033585448a780']
-
-sanity_check_paths = {
-    'files': ["bin/sionfwd-server"],
-    'dirs': []
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-gpsmpi-2021b.eb b/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-gpsmpi-2021b.eb
deleted file mode 100644
index d44a588a2..000000000
--- a/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,22 +0,0 @@
-easyblock = "CMakeMake"
-name = "SIONfwd"
-version = "1.0.1"
-
-homepage = 'https://gitlab.version.fz-juelich.de/SIONlib/SIONfwd'
-description = 'I/O forwarding for SIONlib'
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-toolchainopts = {'pic': True}
-
-builddependencies = [('CMake', '3.21.1', '', SYSTEM)]
-
-source_urls = ['https://gitlab.jsc.fz-juelich.de/SIONlib/SIONfwd/-/archive/v%(version)s/']
-sources = ['SIONfwd-v%(version)s.tar.gz']
-checksums = ['bb4b0381dec8729ed792225f90b7a2b04049886989e53216bc1033585448a780']
-
-sanity_check_paths = {
-    'files': ["bin/sionfwd-server"],
-    'dirs': []
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-iimpi-2021b.eb b/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-iimpi-2021b.eb
deleted file mode 100644
index d0c69f3d2..000000000
--- a/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-iimpi-2021b.eb
+++ /dev/null
@@ -1,22 +0,0 @@
-easyblock = "CMakeMake"
-name = "SIONfwd"
-version = "1.0.1"
-
-homepage = 'https://gitlab.version.fz-juelich.de/SIONlib/SIONfwd'
-description = 'I/O forwarding for SIONlib'
-
-toolchain = {'name': 'iimpi', 'version': '2021b'}
-toolchainopts = {'pic': True}
-
-builddependencies = [('CMake', '3.21.1', '', SYSTEM)]
-
-source_urls = ['https://gitlab.jsc.fz-juelich.de/SIONlib/SIONfwd/-/archive/v%(version)s/']
-sources = ['SIONfwd-v%(version)s.tar.gz']
-checksums = ['bb4b0381dec8729ed792225f90b7a2b04049886989e53216bc1033585448a780']
-
-sanity_check_paths = {
-    'files': ["bin/sionfwd-server"],
-    'dirs': []
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-iompi-2021b.eb b/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-iompi-2021b.eb
deleted file mode 100644
index 9578e6924..000000000
--- a/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-iompi-2021b.eb
+++ /dev/null
@@ -1,22 +0,0 @@
-easyblock = "CMakeMake"
-name = "SIONfwd"
-version = "1.0.1"
-
-homepage = 'https://gitlab.version.fz-juelich.de/SIONlib/SIONfwd'
-description = 'I/O forwarding for SIONlib'
-
-toolchain = {'name': 'iompi', 'version': '2021b'}
-toolchainopts = {'pic': True}
-
-builddependencies = [('CMake', '3.21.1', '', SYSTEM)]
-
-source_urls = ['https://gitlab.jsc.fz-juelich.de/SIONlib/SIONfwd/-/archive/v%(version)s/']
-sources = ['SIONfwd-v%(version)s.tar.gz']
-checksums = ['bb4b0381dec8729ed792225f90b7a2b04049886989e53216bc1033585448a780']
-
-sanity_check_paths = {
-    'files': ["bin/sionfwd-server"],
-    'dirs': []
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-ipsmpi-2021b.eb b/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-ipsmpi-2021b.eb
deleted file mode 100644
index d94cdc4b2..000000000
--- a/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-ipsmpi-2021b.eb
+++ /dev/null
@@ -1,22 +0,0 @@
-easyblock = "CMakeMake"
-name = "SIONfwd"
-version = "1.0.1"
-
-homepage = 'https://gitlab.version.fz-juelich.de/SIONlib/SIONfwd'
-description = 'I/O forwarding for SIONlib'
-
-toolchain = {'name': 'ipsmpi', 'version': '2021b'}
-toolchainopts = {'pic': True}
-
-builddependencies = [('CMake', '3.21.1', '', SYSTEM)]
-
-source_urls = ['https://gitlab.jsc.fz-juelich.de/SIONlib/SIONfwd/-/archive/v%(version)s/']
-sources = ['SIONfwd-v%(version)s.tar.gz']
-checksums = ['bb4b0381dec8729ed792225f90b7a2b04049886989e53216bc1033585448a780']
-
-sanity_check_paths = {
-    'files': ["bin/sionfwd-server"],
-    'dirs': []
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-npsmpic-2021b.eb b/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-npsmpic-2021b.eb
deleted file mode 100644
index ef13cf36a..000000000
--- a/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-npsmpic-2021b.eb
+++ /dev/null
@@ -1,22 +0,0 @@
-easyblock = "CMakeMake"
-name = "SIONfwd"
-version = "1.0.1"
-
-homepage = 'https://gitlab.version.fz-juelich.de/SIONlib/SIONfwd'
-description = 'I/O forwarding for SIONlib'
-
-toolchain = {'name': 'npsmpic', 'version': '2021b'}
-toolchainopts = {'pic': True}
-
-builddependencies = [('CMake', '3.21.1', '', SYSTEM)]
-
-source_urls = ['https://gitlab.jsc.fz-juelich.de/SIONlib/SIONfwd/-/archive/v%(version)s/']
-sources = ['SIONfwd-v%(version)s.tar.gz']
-checksums = ['bb4b0381dec8729ed792225f90b7a2b04049886989e53216bc1033585448a780']
-
-sanity_check_paths = {
-    'files': ["bin/sionfwd-server"],
-    'dirs': []
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-nvompic-2021b.eb b/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-nvompic-2021b.eb
deleted file mode 100644
index 0b530b897..000000000
--- a/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-nvompic-2021b.eb
+++ /dev/null
@@ -1,22 +0,0 @@
-easyblock = "CMakeMake"
-name = "SIONfwd"
-version = "1.0.1"
-
-homepage = 'https://gitlab.version.fz-juelich.de/SIONlib/SIONfwd'
-description = 'I/O forwarding for SIONlib'
-
-toolchain = {'name': 'nvompic', 'version': '2021b'}
-toolchainopts = {'pic': True}
-
-builddependencies = [('CMake', '3.21.1', '', SYSTEM)]
-
-source_urls = ['https://gitlab.jsc.fz-juelich.de/SIONlib/SIONfwd/-/archive/v%(version)s/']
-sources = ['SIONfwd-v%(version)s.tar.gz']
-checksums = ['bb4b0381dec8729ed792225f90b7a2b04049886989e53216bc1033585448a780']
-
-sanity_check_paths = {
-    'files': ["bin/sionfwd-server"],
-    'dirs': []
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/s/SIONlib/SIONlib-1.7.7-GCCcore-11.2.0-tools.eb b/Golden_Repo/s/SIONlib/SIONlib-1.7.7-GCCcore-11.2.0-tools.eb
deleted file mode 100644
index b17b2690d..000000000
--- a/Golden_Repo/s/SIONlib/SIONlib-1.7.7-GCCcore-11.2.0-tools.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-easyblock = "ConfigureMake"
-name = "SIONlib"
-version = "1.7.7"
-versionsuffix = '-tools'
-
-homepage = 'http://www.fz-juelich.de/ias/jsc/EN/Expertise/Support/Software/SIONlib/_node.html'
-description = """SIONlib is a scalable I/O library for parallel access to task-local files.
-The library not only supports writing and reading binary data to or from several thousands of
-processors into a single or a small number of physical files, but also provides global open
-and close functions to access SIONlib files in parallel. This package provides a stripped-down
-installation of SIONlib for use with performance tools (e.g., Score-P), with renamed symbols
-to avoid conflicts when an application using SIONlib itself is linked against a tool requiring
-a different SIONlib version.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['http://apps.fz-juelich.de/jsc/sionlib/download.php?version=%(version)sl']
-sources = ['sionlib-%(version)sl.tar.gz']
-checksums = ['3b5072d8a32a9e9858d85dfe4dc01e7cfdbf54cdaa60660e760b634ee08d8a4c']
-
-builddependencies = [
-    ('binutils', '2.37')
-]
-
-hidden = True
-
-configopts = '--disable-mic --disable-cxx --disable-fortran --disable-ompi'
-
-sanity_check_paths = {
-    'files': ['bin/sionconfig'] +
-             ['lib/lib%s_64.a' % x for x in ['lsioncom', 'lsiongen', 'lsionser']],
-    'dirs': []
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/s/SIONlib/SIONlib-1.7.7-gompi-2021b.eb b/Golden_Repo/s/SIONlib/SIONlib-1.7.7-gompi-2021b.eb
deleted file mode 100644
index e3ca3c986..000000000
--- a/Golden_Repo/s/SIONlib/SIONlib-1.7.7-gompi-2021b.eb
+++ /dev/null
@@ -1,37 +0,0 @@
-easyblock = "ConfigureMake"
-name = "SIONlib"
-version = "1.7.7"
-
-homepage = 'http://www.fz-juelich.de/ias/jsc/EN/Expertise/Support/Software/SIONlib/_node.html'
-description = """SIONlib is a scalable I/O library for the parallel access to
-task-local files. The library not only supports writing and reading
-binary data to or from from several thousands of processors into a
-single or a small number of physical files but also provides for
-global open and close functions to access SIONlib file in
-parallel. SIONlib provides different interfaces: parallel access using
-MPI, OpenMP, or their combination and sequential access for
-post-processing utilities.
-"""
-
-toolchain = {'name': 'gompi', 'version': '2021b'}
-
-dependencies = [('SIONfwd', '1.0.1')]
-
-builddependencies = [('pkg-config', '0.29.2')]
-
-configopts = '--disable-mic --compiler=gnu --mpi=openmpi --disable-cxx '
-configopts += '--enable-sionfwd="$EBROOTSIONFWD" CFLAGS="$CFLAGS -fPIC" '
-
-source_urls = ['http://apps.fz-juelich.de/jsc/sionlib/download.php?version=%(version)s']
-sources = ['sionlib-%(version)s.tar.gz']
-checksums = ['a73574b1c17c030b1d256c5f0eac5ff596395f8b827d759af83473bf94f74477']
-
-sanity_check_paths = {
-    'files': [
-        "bin/sionconfig",
-        ("lib64/libsioncom_64.a", "lib/libsionmpi_64.a", "lib64/libsionmpi_64.a"),
-    ],
-    'dirs': []
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/s/SIONlib/SIONlib-1.7.7-gpsmpi-2021b.eb b/Golden_Repo/s/SIONlib/SIONlib-1.7.7-gpsmpi-2021b.eb
deleted file mode 100644
index 8a41fbc09..000000000
--- a/Golden_Repo/s/SIONlib/SIONlib-1.7.7-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,41 +0,0 @@
-easyblock = "ConfigureMake"
-name = "SIONlib"
-version = "1.7.7"
-
-homepage = 'http://www.fz-juelich.de/ias/jsc/EN/Expertise/Support/Software/SIONlib/_node.html'
-description = """SIONlib is a scalable I/O library for the parallel access to
-task-local files. The library not only supports writing and reading
-binary data to or from from several thousands of processors into a
-single or a small number of physical files but also provides for
-global open and close functions to access SIONlib file in
-parallel. SIONlib provides different interfaces: parallel access using
-MPI, OpenMP, or their combination and sequential access for
-post-processing utilities.
-"""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-
-dependencies = [('SIONfwd', '1.0.1')]
-
-builddependencies = [('pkg-config', '0.29.2')]
-
-source_urls = ['http://apps.fz-juelich.de/jsc/sionlib/download.php?version=%(version)s']
-sources = ['sionlib-%(version)s.tar.gz']
-patches = ['sionlib_psmpi.patch']
-checksums = [
-    'a73574b1c17c030b1d256c5f0eac5ff596395f8b827d759af83473bf94f74477',  # sionlib-1.7.7.tar.gz
-    'b947e51eb3c7768661a027ee21b548383ec57a9fe9cc9563d998f3bf01ac4fb0',  # sionlib_psmpi.patch
-]
-
-configopts = '--disable-mic --compiler=gnu --mpi=psmpi --disable-cxx '
-configopts += '--enable-sionfwd="$EBROOTSIONFWD" CFLAGS="$CFLAGS -fPIC" '
-
-sanity_check_paths = {
-    'files': [
-        "bin/sionconfig",
-        ("lib64/libsioncom_64.a", "lib/libsionmpi_64.a", "lib64/libsionmpi_64.a"),
-    ],
-    'dirs': []
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/s/SIONlib/SIONlib-1.7.7-iimpi-2021b.eb b/Golden_Repo/s/SIONlib/SIONlib-1.7.7-iimpi-2021b.eb
deleted file mode 100644
index ddf0026b1..000000000
--- a/Golden_Repo/s/SIONlib/SIONlib-1.7.7-iimpi-2021b.eb
+++ /dev/null
@@ -1,37 +0,0 @@
-easyblock = "ConfigureMake"
-name = "SIONlib"
-version = "1.7.7"
-
-homepage = 'http://www.fz-juelich.de/ias/jsc/EN/Expertise/Support/Software/SIONlib/_node.html'
-description = """SIONlib is a scalable I/O library for the parallel access to
-task-local files. The library not only supports writing and reading
-binary data to or from from several thousands of processors into a
-single or a small number of physical files but also provides for
-global open and close functions to access SIONlib file in
-parallel. SIONlib provides different interfaces: parallel access using
-MPI, OpenMP, or their combination and sequential access for
-post-processing utilities.
-"""
-
-toolchain = {'name': 'iimpi', 'version': '2021b'}
-
-dependencies = [('SIONfwd', '1.0.1')]
-
-builddependencies = [('pkg-config', '0.29.2')]
-
-configopts = '--disable-mic --compiler=intel --mpi=mpich3 --disable-cxx '
-configopts += '--enable-sionfwd="$EBROOTSIONFWD" CFLAGS="$CFLAGS -fPIC" '
-
-source_urls = ['http://apps.fz-juelich.de/jsc/sionlib/download.php?version=%(version)s']
-sources = ['sionlib-%(version)s.tar.gz']
-checksums = ['a73574b1c17c030b1d256c5f0eac5ff596395f8b827d759af83473bf94f74477']
-
-sanity_check_paths = {
-    'files': [
-        "bin/sionconfig",
-        ("lib64/libsioncom_64.a", "lib/libsionmpi_64.a", "lib64/libsionmpi_64.a"),
-    ],
-    'dirs': []
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/s/SIONlib/SIONlib-1.7.7-iompi-2021b.eb b/Golden_Repo/s/SIONlib/SIONlib-1.7.7-iompi-2021b.eb
deleted file mode 100644
index 8488c00b1..000000000
--- a/Golden_Repo/s/SIONlib/SIONlib-1.7.7-iompi-2021b.eb
+++ /dev/null
@@ -1,37 +0,0 @@
-easyblock = "ConfigureMake"
-name = "SIONlib"
-version = "1.7.7"
-
-homepage = 'http://www.fz-juelich.de/ias/jsc/EN/Expertise/Support/Software/SIONlib/_node.html'
-description = """SIONlib is a scalable I/O library for the parallel access to
-task-local files. The library not only supports writing and reading
-binary data to or from from several thousands of processors into a
-single or a small number of physical files but also provides for
-global open and close functions to access SIONlib file in
-parallel. SIONlib provides different interfaces: parallel access using
-MPI, OpenMP, or their combination and sequential access for
-post-processing utilities.
-"""
-
-toolchain = {'name': 'iompi', 'version': '2021b'}
-
-dependencies = [('SIONfwd', '1.0.1')]
-
-builddependencies = [('pkg-config', '0.29.2')]
-
-configopts = '--disable-mic --compiler=intel --mpi=openmpi --disable-cxx '
-configopts += '--enable-sionfwd="$EBROOTSIONFWD" CFLAGS="$CFLAGS -fPIC" '
-
-source_urls = ['http://apps.fz-juelich.de/jsc/sionlib/download.php?version=%(version)s']
-sources = ['sionlib-%(version)s.tar.gz']
-checksums = ['a73574b1c17c030b1d256c5f0eac5ff596395f8b827d759af83473bf94f74477']
-
-sanity_check_paths = {
-    'files': [
-        "bin/sionconfig",
-        ("lib64/libsioncom_64.a", "lib/libsionmpi_64.a", "lib64/libsionmpi_64.a"),
-    ],
-    'dirs': []
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/s/SIONlib/SIONlib-1.7.7-ipsmpi-2021b.eb b/Golden_Repo/s/SIONlib/SIONlib-1.7.7-ipsmpi-2021b.eb
deleted file mode 100644
index 2cf8c1b89..000000000
--- a/Golden_Repo/s/SIONlib/SIONlib-1.7.7-ipsmpi-2021b.eb
+++ /dev/null
@@ -1,41 +0,0 @@
-easyblock = "ConfigureMake"
-name = "SIONlib"
-version = "1.7.7"
-
-homepage = 'http://www.fz-juelich.de/ias/jsc/EN/Expertise/Support/Software/SIONlib/_node.html'
-description = """SIONlib is a scalable I/O library for the parallel access to
-task-local files. The library not only supports writing and reading
-binary data to or from from several thousands of processors into a
-single or a small number of physical files but also provides for
-global open and close functions to access SIONlib file in
-parallel. SIONlib provides different interfaces: parallel access using
-MPI, OpenMP, or their combination and sequential access for
-post-processing utilities.
-"""
-
-toolchain = {'name': 'ipsmpi', 'version': '2021b'}
-
-dependencies = [('SIONfwd', '1.0.1')]
-
-builddependencies = [('pkg-config', '0.29.2')]
-
-source_urls = ['http://apps.fz-juelich.de/jsc/sionlib/download.php?version=%(version)s']
-sources = ['sionlib-%(version)s.tar.gz']
-patches = ['sionlib_psmpi.patch']
-checksums = [
-    'a73574b1c17c030b1d256c5f0eac5ff596395f8b827d759af83473bf94f74477',  # sionlib-1.7.7.tar.gz
-    'b947e51eb3c7768661a027ee21b548383ec57a9fe9cc9563d998f3bf01ac4fb0',  # sionlib_psmpi.patch
-]
-
-configopts = '--disable-mic --compiler=intel --mpi=psmpi --disable-cxx '
-configopts += '--enable-sionfwd="$EBROOTSIONFWD" CFLAGS="$CFLAGS -fPIC" '
-
-sanity_check_paths = {
-    'files': [
-        "bin/sionconfig",
-        ("lib64/libsioncom_64.a", "lib/libsionmpi_64.a", "lib64/libsionmpi_64.a"),
-    ],
-    'dirs': []
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/s/SIONlib/SIONlib-1.7.7-npsmpic-2021b.eb b/Golden_Repo/s/SIONlib/SIONlib-1.7.7-npsmpic-2021b.eb
deleted file mode 100644
index 61cc962d2..000000000
--- a/Golden_Repo/s/SIONlib/SIONlib-1.7.7-npsmpic-2021b.eb
+++ /dev/null
@@ -1,41 +0,0 @@
-easyblock = "ConfigureMake"
-name = "SIONlib"
-version = "1.7.7"
-
-homepage = 'http://www.fz-juelich.de/ias/jsc/EN/Expertise/Support/Software/SIONlib/_node.html'
-description = """SIONlib is a scalable I/O library for the parallel access to
-task-local files. The library not only supports writing and reading
-binary data to or from from several thousands of processors into a
-single or a small number of physical files but also provides for
-global open and close functions to access SIONlib file in
-parallel. SIONlib provides different interfaces: parallel access using
-MPI, OpenMP, or their combination and sequential access for
-post-processing utilities.
-"""
-
-toolchain = {'name': 'npsmpic', 'version': '2021b'}
-
-dependencies = [('SIONfwd', '1.0.1')]
-
-builddependencies = [('pkg-config', '0.29.2')]
-
-source_urls = ['http://apps.fz-juelich.de/jsc/sionlib/download.php?version=%(version)s']
-sources = ['sionlib-%(version)s.tar.gz']
-patches = ['sionlib_psmpi.patch']
-checksums = [
-    'a73574b1c17c030b1d256c5f0eac5ff596395f8b827d759af83473bf94f74477',  # sionlib-1.7.7.tar.gz
-    'b947e51eb3c7768661a027ee21b548383ec57a9fe9cc9563d998f3bf01ac4fb0',  # sionlib_psmpi.patch
-]
-
-configopts = '--disable-mic --compiler=pgi --mpi=psmpi --disable-cxx '
-configopts += '--enable-sionfwd="$EBROOTSIONFWD" CFLAGS="$CFLAGS -fPIC" '
-
-sanity_check_paths = {
-    'files': [
-        "bin/sionconfig",
-        ("lib64/libsioncom_64.a", "lib/libsionmpi_64.a", "lib64/libsionmpi_64.a"),
-    ],
-    'dirs': []
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/s/SIONlib/SIONlib-1.7.7-nvompic-2021b.eb b/Golden_Repo/s/SIONlib/SIONlib-1.7.7-nvompic-2021b.eb
deleted file mode 100644
index 3a500b2ca..000000000
--- a/Golden_Repo/s/SIONlib/SIONlib-1.7.7-nvompic-2021b.eb
+++ /dev/null
@@ -1,37 +0,0 @@
-easyblock = "ConfigureMake"
-name = "SIONlib"
-version = "1.7.7"
-
-homepage = 'http://www.fz-juelich.de/ias/jsc/EN/Expertise/Support/Software/SIONlib/_node.html'
-description = """SIONlib is a scalable I/O library for the parallel access to
-task-local files. The library not only supports writing and reading
-binary data to or from from several thousands of processors into a
-single or a small number of physical files but also provides for
-global open and close functions to access SIONlib file in
-parallel. SIONlib provides different interfaces: parallel access using
-MPI, OpenMP, or their combination and sequential access for
-post-processing utilities.
-"""
-
-toolchain = {'name': 'nvompic', 'version': '2021b'}
-
-dependencies = [('SIONfwd', '1.0.1')]
-
-builddependencies = [('pkg-config', '0.29.2')]
-
-configopts = '--disable-mic --compiler=pgi --mpi=openmpi --disable-cxx '
-configopts += '--enable-sionfwd="$EBROOTSIONFWD" CFLAGS="$CFLAGS -fPIC" '
-
-source_urls = ['http://apps.fz-juelich.de/jsc/sionlib/download.php?version=%(version)s']
-sources = ['sionlib-%(version)s.tar.gz']
-checksums = ['a73574b1c17c030b1d256c5f0eac5ff596395f8b827d759af83473bf94f74477']
-
-sanity_check_paths = {
-    'files': [
-        "bin/sionconfig",
-        ("lib64/libsioncom_64.a", "lib/libsionmpi_64.a", "lib64/libsionmpi_64.a"),
-    ],
-    'dirs': []
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/s/SIONlib/sionlib_psmpi.patch b/Golden_Repo/s/SIONlib/sionlib_psmpi.patch
deleted file mode 100644
index 75df0efb0..000000000
--- a/Golden_Repo/s/SIONlib/sionlib_psmpi.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -rupN sionlib.orig/mf/mpi-psmpi.def sionlib/mf/mpi-psmpi.def
---- sionlib.orig/mf/mpi-psmpi.def 1970-01-01 01:00:00.000000000 +0100
-+++ sionlib/mf/mpi-psmpi.def  2016-04-29 15:09:02.535739000 +0200
-@@ -0,0 +1,7 @@
-+MPIENABLE = 1
-+MPICC     = MPICH_CC="$(CC)" mpicc
-+MPICXX    = MPICH_CXX="$(CXX)" mpicxx
-+MPIF77    = MPICH_FC="$(F77)" mpif77
-+MPIF90    = MPICH_FC="$(F90)" mpif90
-+MPILIB    = 
-+MPITESTRUN = mpiexec -np 4 --envall 
-diff -rupN sionlib.orig/README sionlib/README
---- sionlib.orig/README 2016-04-29 15:26:26.538865000 +0200
-+++ sionlib/README      2016-04-29 15:26:52.652997000 +0200
-@@ -144,3 +144,4 @@ License:
- --------
- 
- See the file COPYRIGHT in the package base directory for details
-+
diff --git a/Golden_Repo/s/SLEPc/SLEPc-3.16.1-gomkl-2021b.eb b/Golden_Repo/s/SLEPc/SLEPc-3.16.1-gomkl-2021b.eb
deleted file mode 100644
index 45a15fd90..000000000
--- a/Golden_Repo/s/SLEPc/SLEPc-3.16.1-gomkl-2021b.eb
+++ /dev/null
@@ -1,30 +0,0 @@
-name = 'SLEPc'
-version = '3.16.1'
-
-homepage = 'http://slepc.upv.es/'
-description = """SLEPc (Scalable Library for Eigenvalue Problem Computations) is a software library for the solution
- of large scale sparse eigenvalue problems on parallel computers. It is an extension of PETSc and can be used for
- either standard or generalized eigenproblems, with real or complex arithmetic. It can also be used for computing a
- partial SVD of a large, sparse, rectangular matrix, and to solve quadratic eigenvalue problems."""
-
-examples = 'Examples can be found in $EBROOTSLEPC/share/slepc/examples/'
-
-toolchain = {'name': 'gomkl', 'version': '2021b'}
-toolchainopts = {'usempi': True, 'openmp': True}
-
-source_urls = ['http://slepc.upv.es/download/distrib']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['b1a8ad8db1ad88c60616e661ab48fc235d5a8b6965023cb6d691b9a2cfa94efb']
-
-dependencies = [('PETSc', '3.16.3')]
-
-petsc_arch = 'installed-arch-linux2-c-opt'
-
-modextravars = {
-    'SLEPc_ROOT': '%(installdir)s',
-    'SLEPcROOT': '%(installdir)s',
-    'SLEPc_INCLUDE': '%(installdir)s/include/',
-    'SLEPc_LIB': '%(installdir)s/lib',
-}
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/s/SLEPc/SLEPc-3.16.1-gpsmkl-2021b.eb b/Golden_Repo/s/SLEPc/SLEPc-3.16.1-gpsmkl-2021b.eb
deleted file mode 100644
index cb0a4e098..000000000
--- a/Golden_Repo/s/SLEPc/SLEPc-3.16.1-gpsmkl-2021b.eb
+++ /dev/null
@@ -1,30 +0,0 @@
-name = 'SLEPc'
-version = '3.16.1'
-
-homepage = 'http://slepc.upv.es/'
-description = """SLEPc (Scalable Library for Eigenvalue Problem Computations) is a software library for the solution
- of large scale sparse eigenvalue problems on parallel computers. It is an extension of PETSc and can be used for
- either standard or generalized eigenproblems, with real or complex arithmetic. It can also be used for computing a
- partial SVD of a large, sparse, rectangular matrix, and to solve quadratic eigenvalue problems."""
-
-examples = 'Examples can be found in $EBROOTSLEPC/share/slepc/examples/'
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-toolchainopts = {'usempi': True, 'openmp': True}
-
-source_urls = ['http://slepc.upv.es/download/distrib']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['b1a8ad8db1ad88c60616e661ab48fc235d5a8b6965023cb6d691b9a2cfa94efb']
-
-dependencies = [('PETSc', '3.16.3')]
-
-petsc_arch = 'installed-arch-linux2-c-opt'
-
-modextravars = {
-    'SLEPc_ROOT': '%(installdir)s',
-    'SLEPcROOT': '%(installdir)s',
-    'SLEPc_INCLUDE': '%(installdir)s/include/',
-    'SLEPc_LIB': '%(installdir)s/lib',
-}
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/s/SOCI/SOCI-4.0.2-GCCcore-11.2.0.eb b/Golden_Repo/s/SOCI/SOCI-4.0.2-GCCcore-11.2.0.eb
deleted file mode 100644
index 339f4e92c..000000000
--- a/Golden_Repo/s/SOCI/SOCI-4.0.2-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,53 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'SOCI'
-version = '4.0.2'
-
-homepage = 'http://soci.sourceforge.net/'
-description = """SOCI is a database access library for C++ that makes the illusion of embedding SQL queries in the
- regular C++ code, staying entirely within the Standard C++."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://github.com/SOCI/soci/archive']
-sources = ['v%(version)s.tar.gz']
-checksums = ['f293192a412ed82693d17dfe46e2734b140bff835bc3259e3cbd7c315e5e2d74']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1', '', SYSTEM),
-]
-
-dependencies = [
-    ('Boost', '1.78.0'),
-    ('SQLite', '3.36'),
-    ('PostgreSQL', '13.4'),
-]
-
-# Matches RStudio (1.4.1717) install options
-# https://github.com/rstudio/rstudio/blob/ddcd7191ec89c4da00e77afae7e9f27e61e87c36/dependencies/common/install-soci
-configopts = "-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=true "
-configopts += "-DSOCI_TESTS=OFF "
-configopts += "-DSOCI_CXX11=ON "
-configopts += "-DSOCI_EMPTY=OFF "
-configopts += '-DCMAKE_INCLUDE_PATH="$EBROOTBOOST/include" '
-configopts += "-DBoost_USE_STATIC_LIBS=ON "
-configopts += '-DCMAKE_LIBRARY_PATH="$EBROOTBOOST/lib" '
-configopts += "-DWITH_BOOST=ON "
-configopts += "-DWITH_POSTGRESQL=ON "
-configopts += "-DWITH_SQLITE3=ON "
-configopts += "-DWITH_DB2=OFF "
-configopts += "-DWITH_MYSQL=OFF "
-configopts += "-DWITH_ORACLE=OFF "
-configopts += "-DWITH_FIREBIRD=OFF "
-configopts += "-DWITH_ODBC=OFF "
-configopts += "-DBoost_DEBUG=1 "
-
-local_dbs = ['postgresql', 'sqlite3']
-
-sanity_check_paths = {
-    'files': ['lib/libsoci_%s.%s' % (x, SHLIB_EXT) for x in local_dbs + ['core']],
-    'dirs': ['include/soci/%s' % x for x in local_dbs],
-}
-
-moduleclass = 'lang'
diff --git a/Golden_Repo/s/SQLite/SQLite-3.36-GCCcore-11.2.0.eb b/Golden_Repo/s/SQLite/SQLite-3.36-GCCcore-11.2.0.eb
deleted file mode 100644
index f299b6d76..000000000
--- a/Golden_Repo/s/SQLite/SQLite-3.36-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,40 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'SQLite'
-version = '3.36'
-local_filename_version = '3360000'
-
-homepage = 'https://www.sqlite.org/'
-description = "SQLite: SQL Database Engine in a C Library"
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://www.sqlite.org/2021/']
-sources = ['%%(namelower)s-autoconf-%s.tar.gz' % (local_filename_version)]
-checksums = ['bd90c3eb96bee996206b83be7065c9ce19aef38c3f4fb53073ada0d0b69bbce3']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-dependencies = [
-    ('libreadline', '8.1'),
-    ('Tcl', '8.6.11'),
-]
-
-# enable additional APIs that provide access to meta-data about tables and queries
-# needed for GDAL when it used as a dep for QGIS
-buildopts = 'CC="$CC" CFLAGS="$CFLAGS -DSQLITE_ENABLE_COLUMN_METADATA"'
-
-
-sanity_check_paths = {
-    'files': ['bin/sqlite3', 'include/sqlite3ext.h', 'include/sqlite3.h',
-              'lib/libsqlite3.a', 'lib/libsqlite3.%s' % SHLIB_EXT],
-    'dirs': ['lib/pkgconfig'],
-}
-
-sanity_check_commands = [
-    'sqlite3 --version | grep ^%(version)s',
-]
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/s/SUNDIALS/SUNDIALS-6.1.0-gomkl-2021b.eb b/Golden_Repo/s/SUNDIALS/SUNDIALS-6.1.0-gomkl-2021b.eb
deleted file mode 100644
index 69a041832..000000000
--- a/Golden_Repo/s/SUNDIALS/SUNDIALS-6.1.0-gomkl-2021b.eb
+++ /dev/null
@@ -1,71 +0,0 @@
-name = 'SUNDIALS'
-version = '6.1.0'
-
-homepage = 'https://computation.llnl.gov/casc/sundials/'
-description = """SUNDIALS is a SUite of Nonlinear and DIfferential/ALgebraic equation Solvers.  It consists of the
-following six solvers: CVODE, solves initial value problems for ordinary differential equation (ODE) systems; CVODES,
-solves ODE systems and includes sensitivity analysis capabilities (forward and adjoint); ARKODE, solves initial value
-ODE problems with additive Runge-Kutta methods, include support for IMEX methods; IDA, solves initial value problems for
-differential-algebraic equation (DAE) systems; IDAS, solves DAE systems and includes sensitivity analysis capabilities
-(forward and adjoint); KINSOL, solves nonlinear algebraic systems.
-"""
-
-examples = 'Examples can be found in $EBROOTSUNDIALS/examples'
-
-toolchain = {'name': 'gomkl', 'version': '2021b'}
-toolchainopts = {'openmp': True, 'usempi': True, 'pic': True}
-
-source_urls = ['https://github.com/LLNL/sundials/releases/download/v%(version)s/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['eea49f52140640e54931c779e73aece65f34efa996a26b2263db6a1e27d0901c']
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-]
-
-separate_build_dir = 'True'
-
-preconfigopts = 'export CUDA_TOOLKIT_ROOT_DIR=$EBROOTCUDA && '
-
-configopts = '-DBUILD_SHARED_LIBS=ON '
-configopts += '-DENABLE_MPI=ON '
-configopts += '-DENABLE_FORTRAN=ON '
-configopts += '-DBUILD_FORTRAN_MODULE_INTERFACE=ON '
-configopts += '-DEXAMPLES_ENABLE_F2003=ON '
-configopts += '-DENABLE_OPENMP=ON '
-configopts += '-DEXAMPLES_ENABLE_CXX=ON '
-configopts += '-DSUNDIALS_BUILD_PACKAGE_FUSED_KERNELS=ON '
-configopts += '-DENABLE_LAPACK=ON -DLAPACK_LIBRARIES="$LIBLAPACK" '
-configopts += '-DENABLE_CUDA=ON '
-configopts += '-DCMAKE_C_STANDARD=17 '
-configopts += '-DCMAKE_C_COMPILER=mpicc '
-
-
-postinstallcmds = [
-    "cp -r examples %(installdir)s/examples",
-    "ln -s %(installdir)s/lib64 %(installdir)s/lib",
-]
-
-local_solvers = ['arkode', 'cvode', 'cvodes', 'ida', 'idas', 'kinsol']
-
-sanity_check_paths = {
-    'files': ['lib/libsundials_%s.a' % s for s in local_solvers +
-              ['nvecopenmp', 'nvecparallel', 'nvecserial']] +
-             ['lib/libsundials_%s.%s' % (s, SHLIB_EXT) for s in local_solvers +
-              ['nvecopenmp', 'nvecparallel', 'nvecserial']],
-    'dirs': ['examples/%s' % s for s in local_solvers] +
-            ['include/%s' % s for s in local_solvers] +
-            ['examples/nvector', 'include/nvector', 'include/sundials'],
-}
-
-postinstallcmds = [
-    'cp %(builddir)s/sundials-%(version)s/src/sundials/sundials_context_impl.h %(installdir)s/include',
-]
-
-modextravars = {
-    'SUNDIALS_ROOT': '%(installdir)s',
-    'SUNDIALS_LIB': '%(installdir)s/lib64',
-    'SUNDIALS_INCLUDE': '%(installdir)s/include'
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/s/SUNDIALS/SUNDIALS-6.1.0-gpsmkl-2021b.eb b/Golden_Repo/s/SUNDIALS/SUNDIALS-6.1.0-gpsmkl-2021b.eb
deleted file mode 100644
index d9aede91a..000000000
--- a/Golden_Repo/s/SUNDIALS/SUNDIALS-6.1.0-gpsmkl-2021b.eb
+++ /dev/null
@@ -1,70 +0,0 @@
-name = 'SUNDIALS'
-version = '6.1.0'
-
-homepage = 'https://computation.llnl.gov/casc/sundials/'
-description = """SUNDIALS is a SUite of Nonlinear and DIfferential/ALgebraic equation Solvers.  It consists of the
-following six solvers: CVODE, solves initial value problems for ordinary differential equation (ODE) systems; CVODES,
-solves ODE systems and includes sensitivity analysis capabilities (forward and adjoint); ARKODE, solves initial value
-ODE problems with additive Runge-Kutta methods, include support for IMEX methods; IDA, solves initial value problems for
-differential-algebraic equation (DAE) systems; IDAS, solves DAE systems and includes sensitivity analysis capabilities
-(forward and adjoint); KINSOL, solves nonlinear algebraic systems.
-"""
-
-examples = 'Examples can be found in $EBROOTSUNDIALS/examples'
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-toolchainopts = {'openmp': True, 'usempi': True, 'pic': True}
-
-source_urls = ['https://github.com/LLNL/sundials/releases/download/v%(version)s/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['eea49f52140640e54931c779e73aece65f34efa996a26b2263db6a1e27d0901c']
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-]
-
-separate_build_dir = 'True'
-
-preconfigopts = 'export CUDA_TOOLKIT_ROOT_DIR=$EBROOTCUDA && '
-
-configopts = '-DBUILD_SHARED_LIBS=ON '
-configopts += '-DENABLE_MPI=ON '
-configopts += '-DENABLE_FORTRAN=ON '
-configopts += '-DBUILD_FORTRAN_MODULE_INTERFACE=ON '
-configopts += '-DEXAMPLES_ENABLE_F2003=ON '
-configopts += '-DENABLE_OPENMP=ON '
-configopts += '-DEXAMPLES_ENABLE_CXX=ON '
-configopts += '-DSUNDIALS_BUILD_PACKAGE_FUSED_KERNELS=ON '
-configopts += '-DENABLE_LAPACK=ON -DLAPACK_LIBRARIES="$LIBLAPACK" '
-configopts += '-DENABLE_CUDA=ON '
-configopts += '-DCMAKE_C_STANDARD=17 '
-configopts += '-DCMAKE_C_COMPILER=mpicc '
-
-postinstallcmds = [
-    "cp -r examples %(installdir)s/examples",
-    "ln -s %(installdir)s/lib64 %(installdir)s/lib",
-]
-
-local_solvers = ['arkode', 'cvode', 'cvodes', 'ida', 'idas', 'kinsol']
-
-sanity_check_paths = {
-    'files': ['lib/libsundials_%s.a' % s for s in local_solvers +
-              ['nvecopenmp', 'nvecparallel', 'nvecserial']] +
-             ['lib/libsundials_%s.%s' % (s, SHLIB_EXT) for s in local_solvers +
-              ['nvecopenmp', 'nvecparallel', 'nvecserial']],
-    'dirs': ['examples/%s' % s for s in local_solvers] +
-            ['include/%s' % s for s in local_solvers] +
-            ['examples/nvector', 'include/nvector', 'include/sundials'],
-}
-
-postinstallcmds = [
-    'cp %(builddir)s/sundials-%(version)s/src/sundials/sundials_context_impl.h %(installdir)s/include',
-]
-
-modextravars = {
-    'SUNDIALS_ROOT': '%(installdir)s',
-    'SUNDIALS_LIB': '%(installdir)s/lib64',
-    'SUNDIALS_INCLUDE': '%(installdir)s/include'
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/s/SUNDIALS/SUNDIALS-6.1.0-intel-2021b.eb b/Golden_Repo/s/SUNDIALS/SUNDIALS-6.1.0-intel-2021b.eb
deleted file mode 100644
index c36269310..000000000
--- a/Golden_Repo/s/SUNDIALS/SUNDIALS-6.1.0-intel-2021b.eb
+++ /dev/null
@@ -1,70 +0,0 @@
-name = 'SUNDIALS'
-version = '6.1.0'
-
-homepage = 'https://computation.llnl.gov/casc/sundials/'
-description = """SUNDIALS is a SUite of Nonlinear and DIfferential/ALgebraic equation Solvers.  It consists of the
-following six solvers: CVODE, solves initial value problems for ordinary differential equation (ODE) systems; CVODES,
-solves ODE systems and includes sensitivity analysis capabilities (forward and adjoint); ARKODE, solves initial value
-ODE problems with additive Runge-Kutta methods, include support for IMEX methods; IDA, solves initial value problems for
-differential-algebraic equation (DAE) systems; IDAS, solves DAE systems and includes sensitivity analysis capabilities
-(forward and adjoint); KINSOL, solves nonlinear algebraic systems.
-"""
-
-examples = 'Examples can be found in $EBROOTSUNDIALS/examples'
-
-toolchain = {'name': 'intel', 'version': '2021b'}
-toolchainopts = {'openmp': True, 'usempi': True, 'pic': True}
-
-source_urls = ['https://github.com/LLNL/sundials/releases/download/v%(version)s/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['eea49f52140640e54931c779e73aece65f34efa996a26b2263db6a1e27d0901c']
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-]
-
-separate_build_dir = 'True'
-
-preconfigopts = 'export CUDA_TOOLKIT_ROOT_DIR=$EBROOTCUDA && '
-
-configopts = '-DBUILD_SHARED_LIBS=ON '
-configopts += '-DENABLE_MPI=ON '
-configopts += '-DBUILD_FORTRAN_MODULE_INTERFACE=ON '
-configopts += '-DEXAMPLES_ENABLE_F2003=ON '
-configopts += '-DENABLE_FORTRAN=ON '
-configopts += '-DENABLE_OPENMP=ON '
-configopts += '-DEXAMPLES_ENABLE_CXX=ON '
-configopts += '-DSUNDIALS_BUILD_PACKAGE_FUSED_KERNELS=ON '
-configopts += '-DENABLE_LAPACK=ON -DLAPACK_LIBRARIES="$LIBLAPACK" '
-configopts += '-DENABLE_CUDA=ON '
-configopts += '-DCMAKE_C_STANDARD=17 '
-configopts += '-DCMAKE_C_COMPILER=mpicc '
-
-postinstallcmds = [
-    "cp -r examples %(installdir)s/examples",
-    "ln -s %(installdir)s/lib64 %(installdir)s/lib",
-]
-
-local_solvers = ['arkode', 'cvode', 'cvodes', 'ida', 'idas', 'kinsol']
-
-sanity_check_paths = {
-    'files': ['lib/libsundials_%s.a' % s for s in local_solvers +
-              ['nvecopenmp', 'nvecparallel', 'nvecserial']] +
-             ['lib/libsundials_%s.%s' % (s, SHLIB_EXT) for s in local_solvers +
-              ['nvecopenmp', 'nvecparallel', 'nvecserial']],
-    'dirs': ['examples/%s' % s for s in local_solvers] +
-            ['include/%s' % s for s in local_solvers] +
-            ['examples/nvector', 'include/nvector', 'include/sundials'],
-}
-
-postinstallcmds = [
-    'cp %(builddir)s/sundials-%(version)s/src/sundials/sundials_context_impl.h %(installdir)s/include',
-]
-
-modextravars = {
-    'SUNDIALS_ROOT': '%(installdir)s',
-    'SUNDIALS_LIB': '%(installdir)s/lib64',
-    'SUNDIALS_INCLUDE': '%(installdir)s/include'
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/s/SUNDIALS/SUNDIALS-6.1.0-intel-para-2021b.eb b/Golden_Repo/s/SUNDIALS/SUNDIALS-6.1.0-intel-para-2021b.eb
deleted file mode 100644
index ae0071319..000000000
--- a/Golden_Repo/s/SUNDIALS/SUNDIALS-6.1.0-intel-para-2021b.eb
+++ /dev/null
@@ -1,70 +0,0 @@
-name = 'SUNDIALS'
-version = '6.1.0'
-
-homepage = 'https://computation.llnl.gov/casc/sundials/'
-description = """SUNDIALS is a SUite of Nonlinear and DIfferential/ALgebraic equation Solvers.  It consists of the
-following six solvers: CVODE, solves initial value problems for ordinary differential equation (ODE) systems; CVODES,
-solves ODE systems and includes sensitivity analysis capabilities (forward and adjoint); ARKODE, solves initial value
-ODE problems with additive Runge-Kutta methods, include support for IMEX methods; IDA, solves initial value problems for
-differential-algebraic equation (DAE) systems; IDAS, solves DAE systems and includes sensitivity analysis capabilities
-(forward and adjoint); KINSOL, solves nonlinear algebraic systems.
-"""
-
-examples = 'Examples can be found in $EBROOTSUNDIALS/examples'
-
-toolchain = {'name': 'intel-para', 'version': '2021b'}
-toolchainopts = {'openmp': True, 'usempi': True, 'pic': True}
-
-source_urls = ['https://github.com/LLNL/sundials/releases/download/v%(version)s/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['eea49f52140640e54931c779e73aece65f34efa996a26b2263db6a1e27d0901c']
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-]
-
-separate_build_dir = 'True'
-
-preconfigopts = 'export CUDA_TOOLKIT_ROOT_DIR=$EBROOTCUDA && '
-
-configopts = '-DBUILD_SHARED_LIBS=ON '
-configopts += '-DENABLE_MPI=ON '
-configopts += '-DENABLE_FORTRAN=ON '
-configopts += '-DBUILD_FORTRAN_MODULE_INTERFACE=ON '
-configopts += '-DEXAMPLES_ENABLE_F2003=ON '
-configopts += '-DENABLE_OPENMP=ON '
-configopts += '-DEXAMPLES_ENABLE_CXX=ON '
-configopts += '-DSUNDIALS_BUILD_PACKAGE_FUSED_KERNELS=ON '
-configopts += '-DENABLE_LAPACK=ON -DLAPACK_LIBRARIES="$LIBLAPACK" '
-configopts += '-DENABLE_CUDA=ON '
-configopts += '-DCMAKE_C_STANDARD=17 '
-configopts += '-DCMAKE_C_COMPILER=mpicc '
-
-postinstallcmds = [
-    "cp -r examples %(installdir)s/examples",
-    "ln -s %(installdir)s/lib64 %(installdir)s/lib",
-]
-
-local_solvers = ['arkode', 'cvode', 'cvodes', 'ida', 'idas', 'kinsol']
-
-sanity_check_paths = {
-    'files': ['lib/libsundials_%s.a' % s for s in local_solvers +
-              ['nvecopenmp', 'nvecparallel', 'nvecserial']] +
-             ['lib/libsundials_%s.%s' % (s, SHLIB_EXT) for s in local_solvers +
-              ['nvecopenmp', 'nvecparallel', 'nvecserial']],
-    'dirs': ['examples/%s' % s for s in local_solvers] +
-            ['include/%s' % s for s in local_solvers] +
-            ['examples/nvector', 'include/nvector', 'include/sundials'],
-}
-
-postinstallcmds = [
-    'cp %(builddir)s/sundials-%(version)s/src/sundials/sundials_context_impl.h %(installdir)s/include',
-]
-
-modextravars = {
-    'SUNDIALS_ROOT': '%(installdir)s',
-    'SUNDIALS_LIB': '%(installdir)s/lib64',
-    'SUNDIALS_INCLUDE': '%(installdir)s/include'
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/s/SUNDIALS/SUNDIALS-6.1.0-iomkl-2021b.eb b/Golden_Repo/s/SUNDIALS/SUNDIALS-6.1.0-iomkl-2021b.eb
deleted file mode 100644
index fe4b01d06..000000000
--- a/Golden_Repo/s/SUNDIALS/SUNDIALS-6.1.0-iomkl-2021b.eb
+++ /dev/null
@@ -1,70 +0,0 @@
-name = 'SUNDIALS'
-version = '6.1.0'
-
-homepage = 'https://computation.llnl.gov/casc/sundials/'
-description = """SUNDIALS is a SUite of Nonlinear and DIfferential/ALgebraic equation Solvers.  It consists of the
-following six solvers: CVODE, solves initial value problems for ordinary differential equation (ODE) systems; CVODES,
-solves ODE systems and includes sensitivity analysis capabilities (forward and adjoint); ARKODE, solves initial value
-ODE problems with additive Runge-Kutta methods, include support for IMEX methods; IDA, solves initial value problems for
-differential-algebraic equation (DAE) systems; IDAS, solves DAE systems and includes sensitivity analysis capabilities
-(forward and adjoint); KINSOL, solves nonlinear algebraic systems.
-"""
-
-examples = 'Examples can be found in $EBROOTSUNDIALS/examples'
-
-toolchain = {'name': 'iomkl', 'version': '2021b'}
-toolchainopts = {'openmp': True, 'usempi': True, 'pic': True}
-
-source_urls = ['https://github.com/LLNL/sundials/releases/download/v%(version)s/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['eea49f52140640e54931c779e73aece65f34efa996a26b2263db6a1e27d0901c']
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-]
-
-separate_build_dir = 'True'
-
-preconfigopts = 'export CUDA_TOOLKIT_ROOT_DIR=$EBROOTCUDA && '
-
-configopts = '-DBUILD_SHARED_LIBS=ON '
-configopts += '-DENABLE_MPI=ON '
-configopts += '-DENABLE_FORTRAN=ON '
-configopts += '-DBUILD_FORTRAN_MODULE_INTERFACE=ON '
-configopts += '-DEXAMPLES_ENABLE_F2003=ON '
-configopts += '-DENABLE_OPENMP=ON '
-configopts += '-DEXAMPLES_ENABLE_CXX=ON '
-configopts += '-DSUNDIALS_BUILD_PACKAGE_FUSED_KERNELS=ON '
-configopts += '-DENABLE_LAPACK=ON -DLAPACK_LIBRARIES="$LIBLAPACK" '
-configopts += '-DENABLE_CUDA=ON '
-configopts += '-DCMAKE_C_STANDARD=17 '
-configopts += '-DCMAKE_C_COMPILER=mpicc '
-
-postinstallcmds = [
-    "cp -r examples %(installdir)s/examples",
-    "ln -s %(installdir)s/lib64 %(installdir)s/lib",
-]
-
-local_solvers = ['arkode', 'cvode', 'cvodes', 'ida', 'idas', 'kinsol']
-
-sanity_check_paths = {
-    'files': ['lib/libsundials_%s.a' % s for s in local_solvers +
-              ['nvecopenmp', 'nvecparallel', 'nvecserial']] +
-             ['lib/libsundials_%s.%s' % (s, SHLIB_EXT) for s in local_solvers +
-              ['nvecopenmp', 'nvecparallel', 'nvecserial']],
-    'dirs': ['examples/%s' % s for s in local_solvers] +
-            ['include/%s' % s for s in local_solvers] +
-            ['examples/nvector', 'include/nvector', 'include/sundials'],
-}
-
-postinstallcmds = [
-    'cp %(builddir)s/sundials-%(version)s/src/sundials/sundials_context_impl.h %(installdir)s/include',
-]
-
-modextravars = {
-    'SUNDIALS_ROOT': '%(installdir)s',
-    'SUNDIALS_LIB': '%(installdir)s/lib64',
-    'SUNDIALS_INCLUDE': '%(installdir)s/include'
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/s/SWIG/SWIG-4.0.2-GCCcore-11.2.0.eb b/Golden_Repo/s/SWIG/SWIG-4.0.2-GCCcore-11.2.0.eb
deleted file mode 100644
index 065ac6afc..000000000
--- a/Golden_Repo/s/SWIG/SWIG-4.0.2-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,24 +0,0 @@
-name = 'SWIG'
-version = '4.0.2'
-
-homepage = 'http://www.swig.org/'
-description = """SWIG is a software development tool that connects programs written in C and C++ with
- a variety of high-level programming languages."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [SOURCEFORGE_SOURCE]
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['d53be9730d8d58a16bf0cbd1f8ac0c0c3e1090573168bfa151b01eb47fa906fc']
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('PCRE', '8.45'),
-]
-
-configopts = '--without-alllang --with-boost=no'
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/s/SZ/SZ-2.1.12-GCCcore-11.2.0.eb b/Golden_Repo/s/SZ/SZ-2.1.12-GCCcore-11.2.0.eb
deleted file mode 100644
index 9d5d3edbf..000000000
--- a/Golden_Repo/s/SZ/SZ-2.1.12-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,43 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'SZ'
-version = '2.1.12'
-
-homepage = 'https://szcompressor.org'
-description = """SZ is a modular parametrizable lossy compressor framework
-for scientific data (floating point and integers)."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-github_account = 'szcompressor'
-source_urls = [GITHUB_SOURCE]
-sources = ['v%(version)s.tar.gz']
-checksums = ['3712b2cd7170d1511569e48a208f02dfb72ecd7ad053c321e2880b9083e150de']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('HDF5', '1.12.1', '-serial'),
-    ('netCDF', '4.8.1', '-serial'),
-]
-
-separate_build_dir = True
-
-configopts = "-DCMAKE_VERBOSE_MAKEFILE=ON "
-
-configopts += "-DBUILD_FORTRAN=ON "
-configopts += "-DBUILD_HDF5_FILTER=ON "
-configopts += "-DBUILD_NETCDF_READER=ON "
-configopts += "-DBUILD_OPENMP=ON "
-
-sanity_check_paths = {
-    'files': ['bin/sz', 'lib/libSZ.%s' % SHLIB_EXT],
-    'dirs': ['bin', 'include', 'lib'],
-}
-
-moduleclass = 'data'
diff --git a/Golden_Repo/s/ScaFaCoS/ScaFaCoS-1.0.1-gpsmpi-2021b.eb b/Golden_Repo/s/ScaFaCoS/ScaFaCoS-1.0.1-gpsmpi-2021b.eb
deleted file mode 100644
index d21bbb483..000000000
--- a/Golden_Repo/s/ScaFaCoS/ScaFaCoS-1.0.1-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,44 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'ScaFaCoS'
-version = '1.0.1'
-
-homepage = 'http://www.scafacos.de/'
-description = "ScaFaCoS is a library of scalable fast coulomb solvers."
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-toolchainopts = {'usempi': True}
-
-source_urls = ['https://github.com/%(namelower)s/%(namelower)s/releases/download/v%(version)s']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = [
-    '2b125f313795c81b0e87eb920082e91addf94c17444f9486d979e691aaded99b',  # scafacos-1.0.1.tar.gz
-]
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('GMP', '6.2.1'),
-    ('GSL', '2.7'),
-    ('FFTW', '3.3.10'),
-]
-
-preconfigopts = 'unset F77 && '
-
-configopts = 'FCFLAGS="-fallow-argument-mismatch $FCFLAGS" '
-configopts += '--enable-shared --enable-static --disable-doc '
-# tell it where to find provided FFTW
-configopts += '--without-internal-fftw --with-fftw3-includedir=$EBROOTFFTW/include --with-fftw3-libdir=$EBROOTFFTW/lib '
-# only include the solvers supported for LAMMPS
-# (for p2nfft we need an additonal dependency)
-configopts += '--enable-fcs-solvers=direct,ewald,fmm,p3m '
-
-sanity_check_paths = {
-    'files': ['lib/libfcs.a', 'include/fcs.h', 'include/fcs_module.mod'],
-    'dirs': [],
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/s/Scalasca/Scalasca-2.6-gompi-2021b.eb b/Golden_Repo/s/Scalasca/Scalasca-2.6-gompi-2021b.eb
deleted file mode 100644
index 256eccb9d..000000000
--- a/Golden_Repo/s/Scalasca/Scalasca-2.6-gompi-2021b.eb
+++ /dev/null
@@ -1,64 +0,0 @@
-##
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-# Copyright:: Copyright 2013-2021 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-#             Markus Geimer <m.geimer@fz-juelich.de>
-#             Christian Feld <c.feld@fz-juelich.de>
-# License::   3-clause BSD
-#
-# This work is based on experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-easyblock = 'EB_Score_minus_P'
-
-name = 'Scalasca'
-version = '2.6'
-
-homepage = 'https://www.scalasca.org/'
-description = """
-Scalasca is a software tool that supports the performance optimization of
-parallel programs by measuring and analyzing their runtime behavior. The
-analysis identifies potential performance bottlenecks -- in particular
-those concerning communication and synchronization -- and offers guidance
-in exploring their causes.
-"""
-
-toolchain = {'name': 'gompi', 'version': '2021b'}
-
-source_urls = ['https://apps.fz-juelich.de/scalasca/releases/scalasca/%(version_major_minor)s/dist']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = [
-    'b3f9cb1d58f3e25090a39da777bae8ca2769fd10cbd6dfb9a4887d873ee2441e',  # scalasca-2.6.tar.gz
-]
-builddependencies = [
-    ('CubeWriter', '4.6'),
-]
-
-dependencies = [
-    ('CubeGUI', '4.6'),
-    ('CubeLib', '4.6'),
-    ('OTF2', '2.3'),
-    ('Score-P', '7.1'),
-]
-
-sanity_check_paths = {
-    'files': ['bin/scalasca', ('lib/libpearl.replay.a', 'lib64/libpearl.replay.a')],
-    'dirs': [],
-}
-
-# note that modextrapaths can be used for relative paths only
-modextrapaths = {
-    # Ensure that local metric documentation is found by CubeGUI
-    'CUBE_DOCPATH': 'share/doc/scalasca/patterns'
-}
-
-modextravars = {
-    # Specifies an optional list of colon separated paths identifying
-    # suitable file systems for tracing. If set, the file system of
-    # trace measurements has to match at least one of the specified
-    # file systems.
-    'SCAN_TRACE_FILESYS': '/p/project:/p/scratch:/p/cscratch:/p/fastdata:/p/largedata:/p/largedata2'
-}
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/s/Scalasca/Scalasca-2.6-gpsmpi-2021b.eb b/Golden_Repo/s/Scalasca/Scalasca-2.6-gpsmpi-2021b.eb
deleted file mode 100644
index 3d712d190..000000000
--- a/Golden_Repo/s/Scalasca/Scalasca-2.6-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,64 +0,0 @@
-##
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-# Copyright:: Copyright 2013-2021 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-#             Markus Geimer <m.geimer@fz-juelich.de>
-#             Christian Feld <c.feld@fz-juelich.de>
-# License::   3-clause BSD
-#
-# This work is based on experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-easyblock = 'EB_Score_minus_P'
-
-name = 'Scalasca'
-version = '2.6'
-
-homepage = 'https://www.scalasca.org/'
-description = """
-Scalasca is a software tool that supports the performance optimization of
-parallel programs by measuring and analyzing their runtime behavior. The
-analysis identifies potential performance bottlenecks -- in particular
-those concerning communication and synchronization -- and offers guidance
-in exploring their causes.
-"""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-
-source_urls = ['https://apps.fz-juelich.de/scalasca/releases/scalasca/%(version_major_minor)s/dist']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = [
-    'b3f9cb1d58f3e25090a39da777bae8ca2769fd10cbd6dfb9a4887d873ee2441e',  # scalasca-2.6.tar.gz
-]
-builddependencies = [
-    ('CubeWriter', '4.6'),
-]
-
-dependencies = [
-    ('CubeGUI', '4.6'),
-    ('CubeLib', '4.6'),
-    ('OTF2', '2.3'),
-    ('Score-P', '7.1'),
-]
-
-sanity_check_paths = {
-    'files': ['bin/scalasca', ('lib/libpearl.replay.a', 'lib64/libpearl.replay.a')],
-    'dirs': [],
-}
-
-# note that modextrapaths can be used for relative paths only
-modextrapaths = {
-    # Ensure that local metric documentation is found by CubeGUI
-    'CUBE_DOCPATH': 'share/doc/scalasca/patterns'
-}
-
-modextravars = {
-    # Specifies an optional list of colon separated paths identifying
-    # suitable file systems for tracing. If set, the file system of
-    # trace measurements has to match at least one of the specified
-    # file systems.
-    'SCAN_TRACE_FILESYS': '/p/project:/p/scratch:/p/cscratch:/p/fastdata:/p/largedata:/p/largedata2'
-}
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/s/Scalasca/Scalasca-2.6-iimpi-2021b.eb b/Golden_Repo/s/Scalasca/Scalasca-2.6-iimpi-2021b.eb
deleted file mode 100644
index c714022d2..000000000
--- a/Golden_Repo/s/Scalasca/Scalasca-2.6-iimpi-2021b.eb
+++ /dev/null
@@ -1,64 +0,0 @@
-##
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-# Copyright:: Copyright 2013-2021 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-#             Markus Geimer <m.geimer@fz-juelich.de>
-#             Christian Feld <c.feld@fz-juelich.de>
-# License::   3-clause BSD
-#
-# This work is based on experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-easyblock = 'EB_Score_minus_P'
-
-name = 'Scalasca'
-version = '2.6'
-
-homepage = 'https://www.scalasca.org/'
-description = """
-Scalasca is a software tool that supports the performance optimization of
-parallel programs by measuring and analyzing their runtime behavior. The
-analysis identifies potential performance bottlenecks -- in particular
-those concerning communication and synchronization -- and offers guidance
-in exploring their causes.
-"""
-
-toolchain = {'name': 'iimpi', 'version': '2021b'}
-
-source_urls = ['https://apps.fz-juelich.de/scalasca/releases/scalasca/%(version_major_minor)s/dist']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = [
-    'b3f9cb1d58f3e25090a39da777bae8ca2769fd10cbd6dfb9a4887d873ee2441e',  # scalasca-2.6.tar.gz
-]
-builddependencies = [
-    ('CubeWriter', '4.6'),
-]
-
-dependencies = [
-    ('CubeGUI', '4.6'),
-    ('CubeLib', '4.6'),
-    ('OTF2', '2.3'),
-    ('Score-P', '7.1'),
-]
-
-sanity_check_paths = {
-    'files': ['bin/scalasca', ('lib/libpearl.replay.a', 'lib64/libpearl.replay.a')],
-    'dirs': [],
-}
-
-# note that modextrapaths can be used for relative paths only
-modextrapaths = {
-    # Ensure that local metric documentation is found by CubeGUI
-    'CUBE_DOCPATH': 'share/doc/scalasca/patterns'
-}
-
-modextravars = {
-    # Specifies an optional list of colon separated paths identifying
-    # suitable file systems for tracing. If set, the file system of
-    # trace measurements has to match at least one of the specified
-    # file systems.
-    'SCAN_TRACE_FILESYS': '/p/project:/p/scratch:/p/cscratch:/p/fastdata:/p/largedata:/p/largedata2'
-}
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/s/Scalasca/Scalasca-2.6-iompi-2021b.eb b/Golden_Repo/s/Scalasca/Scalasca-2.6-iompi-2021b.eb
deleted file mode 100644
index c51a66aae..000000000
--- a/Golden_Repo/s/Scalasca/Scalasca-2.6-iompi-2021b.eb
+++ /dev/null
@@ -1,64 +0,0 @@
-##
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-# Copyright:: Copyright 2013-2021 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-#             Markus Geimer <m.geimer@fz-juelich.de>
-#             Christian Feld <c.feld@fz-juelich.de>
-# License::   3-clause BSD
-#
-# This work is based on experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-easyblock = 'EB_Score_minus_P'
-
-name = 'Scalasca'
-version = '2.6'
-
-homepage = 'https://www.scalasca.org/'
-description = """
-Scalasca is a software tool that supports the performance optimization of
-parallel programs by measuring and analyzing their runtime behavior. The
-analysis identifies potential performance bottlenecks -- in particular
-those concerning communication and synchronization -- and offers guidance
-in exploring their causes.
-"""
-
-toolchain = {'name': 'iompi', 'version': '2021b'}
-
-source_urls = ['https://apps.fz-juelich.de/scalasca/releases/scalasca/%(version_major_minor)s/dist']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = [
-    'b3f9cb1d58f3e25090a39da777bae8ca2769fd10cbd6dfb9a4887d873ee2441e',  # scalasca-2.6.tar.gz
-]
-builddependencies = [
-    ('CubeWriter', '4.6'),
-]
-
-dependencies = [
-    ('CubeGUI', '4.6'),
-    ('CubeLib', '4.6'),
-    ('OTF2', '2.3'),
-    ('Score-P', '7.1'),
-]
-
-sanity_check_paths = {
-    'files': ['bin/scalasca', ('lib/libpearl.replay.a', 'lib64/libpearl.replay.a')],
-    'dirs': [],
-}
-
-# note that modextrapaths can be used for relative paths only
-modextrapaths = {
-    # Ensure that local metric documentation is found by CubeGUI
-    'CUBE_DOCPATH': 'share/doc/scalasca/patterns'
-}
-
-modextravars = {
-    # Specifies an optional list of colon separated paths identifying
-    # suitable file systems for tracing. If set, the file system of
-    # trace measurements has to match at least one of the specified
-    # file systems.
-    'SCAN_TRACE_FILESYS': '/p/project:/p/scratch:/p/cscratch:/p/fastdata:/p/largedata:/p/largedata2'
-}
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/s/Scalasca/Scalasca-2.6-ipsmpi-2021b.eb b/Golden_Repo/s/Scalasca/Scalasca-2.6-ipsmpi-2021b.eb
deleted file mode 100644
index 2c906f051..000000000
--- a/Golden_Repo/s/Scalasca/Scalasca-2.6-ipsmpi-2021b.eb
+++ /dev/null
@@ -1,64 +0,0 @@
-##
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-# Copyright:: Copyright 2013-2021 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-#             Markus Geimer <m.geimer@fz-juelich.de>
-#             Christian Feld <c.feld@fz-juelich.de>
-# License::   3-clause BSD
-#
-# This work is based on experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-easyblock = 'EB_Score_minus_P'
-
-name = 'Scalasca'
-version = '2.6'
-
-homepage = 'https://www.scalasca.org/'
-description = """
-Scalasca is a software tool that supports the performance optimization of
-parallel programs by measuring and analyzing their runtime behavior. The
-analysis identifies potential performance bottlenecks -- in particular
-those concerning communication and synchronization -- and offers guidance
-in exploring their causes.
-"""
-
-toolchain = {'name': 'ipsmpi', 'version': '2021b'}
-
-source_urls = ['https://apps.fz-juelich.de/scalasca/releases/scalasca/%(version_major_minor)s/dist']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = [
-    'b3f9cb1d58f3e25090a39da777bae8ca2769fd10cbd6dfb9a4887d873ee2441e',  # scalasca-2.6.tar.gz
-]
-builddependencies = [
-    ('CubeWriter', '4.6'),
-]
-
-dependencies = [
-    ('CubeGUI', '4.6'),
-    ('CubeLib', '4.6'),
-    ('OTF2', '2.3'),
-    ('Score-P', '7.1'),
-]
-
-sanity_check_paths = {
-    'files': ['bin/scalasca', ('lib/libpearl.replay.a', 'lib64/libpearl.replay.a')],
-    'dirs': [],
-}
-
-# note that modextrapaths can be used for relative paths only
-modextrapaths = {
-    # Ensure that local metric documentation is found by CubeGUI
-    'CUBE_DOCPATH': 'share/doc/scalasca/patterns'
-}
-
-modextravars = {
-    # Specifies an optional list of colon separated paths identifying
-    # suitable file systems for tracing. If set, the file system of
-    # trace measurements has to match at least one of the specified
-    # file systems.
-    'SCAN_TRACE_FILESYS': '/p/project:/p/scratch:/p/cscratch:/p/fastdata:/p/largedata:/p/largedata2'
-}
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/s/Scalasca/Scalasca-2.6-npsmpic-2021b.eb b/Golden_Repo/s/Scalasca/Scalasca-2.6-npsmpic-2021b.eb
deleted file mode 100644
index b504b706c..000000000
--- a/Golden_Repo/s/Scalasca/Scalasca-2.6-npsmpic-2021b.eb
+++ /dev/null
@@ -1,64 +0,0 @@
-##
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-# Copyright:: Copyright 2013-2021 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-#             Markus Geimer <m.geimer@fz-juelich.de>
-#             Christian Feld <c.feld@fz-juelich.de>
-# License::   3-clause BSD
-#
-# This work is based on experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-easyblock = 'EB_Score_minus_P'
-
-name = 'Scalasca'
-version = '2.6'
-
-homepage = 'https://www.scalasca.org/'
-description = """
-Scalasca is a software tool that supports the performance optimization of
-parallel programs by measuring and analyzing their runtime behavior. The
-analysis identifies potential performance bottlenecks -- in particular
-those concerning communication and synchronization -- and offers guidance
-in exploring their causes.
-"""
-
-toolchain = {'name': 'npsmpic', 'version': '2021b'}
-
-source_urls = ['https://apps.fz-juelich.de/scalasca/releases/scalasca/%(version_major_minor)s/dist']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = [
-    'b3f9cb1d58f3e25090a39da777bae8ca2769fd10cbd6dfb9a4887d873ee2441e',  # scalasca-2.6.tar.gz
-]
-builddependencies = [
-    ('CubeWriter', '4.6'),
-]
-
-dependencies = [
-    ('CubeGUI', '4.6'),
-    ('CubeLib', '4.6'),
-    ('OTF2', '2.3'),
-    ('Score-P', '7.1'),
-]
-
-sanity_check_paths = {
-    'files': ['bin/scalasca', ('lib/libpearl.replay.a', 'lib64/libpearl.replay.a')],
-    'dirs': [],
-}
-
-# note that modextrapaths can be used for relative paths only
-modextrapaths = {
-    # Ensure that local metric documentation is found by CubeGUI
-    'CUBE_DOCPATH': 'share/doc/scalasca/patterns'
-}
-
-modextravars = {
-    # Specifies an optional list of colon separated paths identifying
-    # suitable file systems for tracing. If set, the file system of
-    # trace measurements has to match at least one of the specified
-    # file systems.
-    'SCAN_TRACE_FILESYS': '/p/project:/p/scratch:/p/cscratch:/p/fastdata:/p/largedata:/p/largedata2'
-}
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/s/Scalasca/Scalasca-2.6-nvompic-2021b.eb b/Golden_Repo/s/Scalasca/Scalasca-2.6-nvompic-2021b.eb
deleted file mode 100644
index e713e6f74..000000000
--- a/Golden_Repo/s/Scalasca/Scalasca-2.6-nvompic-2021b.eb
+++ /dev/null
@@ -1,64 +0,0 @@
-##
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-# Copyright:: Copyright 2013-2021 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-#             Markus Geimer <m.geimer@fz-juelich.de>
-#             Christian Feld <c.feld@fz-juelich.de>
-# License::   3-clause BSD
-#
-# This work is based on experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-easyblock = 'EB_Score_minus_P'
-
-name = 'Scalasca'
-version = '2.6'
-
-homepage = 'https://www.scalasca.org/'
-description = """
-Scalasca is a software tool that supports the performance optimization of
-parallel programs by measuring and analyzing their runtime behavior. The
-analysis identifies potential performance bottlenecks -- in particular
-those concerning communication and synchronization -- and offers guidance
-in exploring their causes.
-"""
-
-toolchain = {'name': 'nvompic', 'version': '2021b'}
-
-source_urls = ['https://apps.fz-juelich.de/scalasca/releases/scalasca/%(version_major_minor)s/dist']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = [
-    'b3f9cb1d58f3e25090a39da777bae8ca2769fd10cbd6dfb9a4887d873ee2441e',  # scalasca-2.6.tar.gz
-]
-builddependencies = [
-    ('CubeWriter', '4.6'),
-]
-
-dependencies = [
-    ('CubeGUI', '4.6'),
-    ('CubeLib', '4.6'),
-    ('OTF2', '2.3'),
-    ('Score-P', '7.1'),
-]
-
-sanity_check_paths = {
-    'files': ['bin/scalasca', ('lib/libpearl.replay.a', 'lib64/libpearl.replay.a')],
-    'dirs': [],
-}
-
-# note that modextrapaths can be used for relative paths only
-modextrapaths = {
-    # Ensure that local metric documentation is found by CubeGUI
-    'CUBE_DOCPATH': 'share/doc/scalasca/patterns'
-}
-
-modextravars = {
-    # Specifies an optional list of colon separated paths identifying
-    # suitable file systems for tracing. If set, the file system of
-    # trace measurements has to match at least one of the specified
-    # file systems.
-    'SCAN_TRACE_FILESYS': '/p/project:/p/scratch:/p/cscratch:/p/fastdata:/p/largedata:/p/largedata2'
-}
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/s/SciPy-Stack/SciPy-Stack-2021b-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/s/SciPy-Stack/SciPy-Stack-2021b-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index bcc5eec2b..000000000
--- a/Golden_Repo/s/SciPy-Stack/SciPy-Stack-2021b-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,21 +0,0 @@
-easyblock = 'Bundle'
-name = 'SciPy-Stack'
-version = '2021b'
-
-homepage = 'http://www.scipy.org'
-description = """SciPy Stack is a collection of open source software for scientific computing in Python.
-SciPy Stack includes SciPy-bundle/2021.10, matplotlib/3.4.3, Seaborn/0.11.2, sympy/1.8 and xarray/0.20.1.
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10'),
-    ('matplotlib', '3.4.3'),
-    ('Seaborn', '0.11.2'),
-    ('sympy', '1.8'),
-    ('xarray', '0.20.1'),
-]
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/s/SciPy-bundle/SciPy-bundle-2021.10-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/s/SciPy-bundle/SciPy-bundle-2021.10-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index 99c9e1eb0..000000000
--- a/Golden_Repo/s/SciPy-bundle/SciPy-bundle-2021.10-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,85 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'SciPy-bundle'
-version = '2021.10'
-
-homepage = 'https://python.org/'
-description = "Bundle of Python packages for scientific software"
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True, 'lowopt': True}
-
-builddependencies = [
-    ('hypothesis', '6.14.6'),
-    ('UnZip', '6.0'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('pybind11', '2.7.1'),  # required by scipy
-]
-
-use_pip = True
-
-# order is important!
-exts_list = [
-    ('numpy', '1.21.3', {
-        'sources': ['%(name)s-%(version)s.zip'],
-        'patches': [
-            'numpy-1.18.2-mkl.patch',
-            'numpy-1.20.3_disable-broken-override-test.patch',
-            'numpy-1.20.3_disable_fortran_callback_test.patch',
-        ],
-        'checksums': [
-            '63571bb7897a584ca3249c86dd01c10bcb5fe4296e3568b2e9c1a55356b6410e',  # numpy-1.21.3.zip
-            # numpy-1.18.2-mkl.patch
-            'ea25ad5c0148c1398d282f0424e642fb9815a1a80f4512659b018e2adc378bcf',
-            # numpy-1.20.3_disable-broken-override-test.patch
-            '43cc2e675c52db1776efcc6c84ebd5fc008b48e6355c81087420d5e790e4af9b',
-            # numpy-1.20.3_disable_fortran_callback_test.patch
-            '44975a944544fd0e771b7e63c32590d257a3713070f8f7fdf60105dc516f1d75',
-        ],
-    }),
-    ('ply', '3.11', {
-        'checksums': ['00c7c1aaa88358b9c765b6d3000c6eec0ba42abca5351b095321aef446081da3'],
-    }),
-    ('gast', '0.5.2', {
-        'checksums': ['f81fcefa8b982624a31c9e4ec7761325a88a0eba60d36d1da90e47f8fe3c67f7'],
-    }),
-    ('beniget', '0.4.1', {
-        'checksums': ['75554b3b8ad0553ce2f607627dad3d95c60c441189875b98e097528f8e23ac0c'],
-    }),
-    ('pythran', '0.10.0', {
-        'checksums': ['9dac8e1d50f33d4676003e350b1f0c878ce113e6f907920e92dc103352cac5bf'],
-    }),
-    ('scipy', '1.7.1', {
-        'checksums': ['6b47d5fa7ea651054362561a28b1ccc8da9368a39514c1bbf6c0977a1c376764'],
-        # compilation with Pythran enabled fails when using Intel compilers,
-        # see https://github.com/scipy/scipy/issues/14935
-        'prebuildopts': "export SCIPY_USE_PYTHRAN=0 && ",
-        'preinstallopts': "export SCIPY_USE_PYTHRAN=0 && ",
-    }),
-    # ('mpi4py', '3.1.1', {
-    #     'checksums': ['e11f8587a3b93bb24c8526addec664b586b965d83c0882b884c14dc3fd6b9f5c'],
-    # }),
-    ('numexpr', '2.7.3', {
-        'checksums': ['43616529f9b7d1afc83386f943dc66c4da5e052f00217ba7e3ad8dd1b5f3a825'],
-    }),
-    ('Bottleneck', '1.3.2', {
-        'checksums': ['20179f0b66359792ea283b69aa16366419132f3b6cf3adadc0c48e2e8118e573'],
-    }),
-    ('pandas', '1.3.4', {
-        'preinstallopts': """sed -i 's@extra_compile_args = \["-Werror"\]@extra_compile_args = []@g' setup.py && """,
-        'checksums': ['a2aa18d3f0b7d538e21932f637fbfe8518d085238b429e4790a35e1e44a96ffc'],
-    }),
-    ('mpmath', '1.2.1', {
-        'checksums': ['79ffb45cf9f4b101a807595bcb3e72e0396202e0b1d25d689134b48c4216a81a'],
-    }),
-    ('deap', '1.3.1', {
-        'checksums': ['11f54493ceb54aae10dde676577ef59fc52d52f82729d5a12c90b0813c857a2f'],
-    }),
-]
-
-sanity_pip_check = True
-
-moduleclass = 'lang'
diff --git a/Golden_Repo/s/Score-P/Score-P-7.1-gompi-2021b.eb b/Golden_Repo/s/Score-P/Score-P-7.1-gompi-2021b.eb
deleted file mode 100644
index fee64ad92..000000000
--- a/Golden_Repo/s/Score-P/Score-P-7.1-gompi-2021b.eb
+++ /dev/null
@@ -1,65 +0,0 @@
-##
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-# Copyright:: Copyright 2013-2021 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-#             Markus Geimer <m.geimer@fz-juelich.de>
-#             Christian Feld <c.feld@fz-juelich.de>
-# License::   3-clause BSD
-#
-# This work is based on experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-easyblock = 'EB_Score_minus_P'
-
-name = 'Score-P'
-version = '7.1'
-
-homepage = 'https://www.score-p.org'
-description = """
-The Score-P measurement infrastructure is a highly scalable and easy-to-use
-tool suite for profiling, event tracing, and online analysis of HPC
-applications.
-"""
-
-toolchain = {'name': 'gompi', 'version': '2021b'}
-
-source_urls = ['http://perftools.pages.jsc.fz-juelich.de/cicd/scorep/tags/scorep-%(version)s']
-sources = ['scorep-%(version)s.tar.gz']
-checksums = [
-    '98dea497982001fb82da3429ca55669b2917a0858c71abe2cfe7cd113381f1f7',  # scorep-7.1.tar.gz
-]
-
-builddependencies = [
-    ('CUDA', '11.5', '', SYSTEM),
-    ('CubeLib', '4.6'),
-    ('CubeWriter', '4.6'),
-    # Unwinding/sampling support (optional):
-    ('libunwind', '1.5.0'),
-]
-
-dependencies = [
-    # binutils is implicitly available via GCC toolchain
-    ('OPARI2', '2.0.6'),
-    ('OTF2', '2.3'),
-    # Hardware counter support (optional):
-    ('PAPI', '6.0.0.1'),
-    # PDT source-to-source instrumentation support (optional):
-    ('PDT', '3.25.1'),
-]
-
-configopts = '--enable-shared --with-machine-name=$SYSTEMNAME '
-# Enable CUDA support
-configopts += '--with-libOpenCL=$EBROOTCUDA/targets/x86_64-linux'
-
-sanity_check_paths = {
-    'files': ['bin/scorep', 'include/scorep/SCOREP_User.h',
-              ('lib/libscorep_adapter_mpi_event.a', 'lib64/libscorep_adapter_mpi_event.a'),
-              ('lib/libscorep_adapter_mpi_event.%s' % SHLIB_EXT, 'lib64/libscorep_adapter_mpi_event.%s' % SHLIB_EXT)],
-    'dirs': [],
-}
-
-# Ensure that local metric documentation is found by CubeGUI
-modextrapaths = {'CUBE_DOCPATH': 'share/doc/scorep/profile'}
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/s/Score-P/Score-P-7.1-gpsmpi-2021b.eb b/Golden_Repo/s/Score-P/Score-P-7.1-gpsmpi-2021b.eb
deleted file mode 100644
index 0f83d4adc..000000000
--- a/Golden_Repo/s/Score-P/Score-P-7.1-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,65 +0,0 @@
-##
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-# Copyright:: Copyright 2013-2021 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-#             Markus Geimer <m.geimer@fz-juelich.de>
-#             Christian Feld <c.feld@fz-juelich.de>
-# License::   3-clause BSD
-#
-# This work is based on experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-easyblock = 'EB_Score_minus_P'
-
-name = 'Score-P'
-version = '7.1'
-
-homepage = 'https://www.score-p.org'
-description = """
-The Score-P measurement infrastructure is a highly scalable and easy-to-use
-tool suite for profiling, event tracing, and online analysis of HPC
-applications.
-"""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-
-source_urls = ['http://perftools.pages.jsc.fz-juelich.de/cicd/scorep/tags/scorep-%(version)s']
-sources = ['scorep-%(version)s.tar.gz']
-checksums = [
-    '98dea497982001fb82da3429ca55669b2917a0858c71abe2cfe7cd113381f1f7',  # scorep-7.1.tar.gz
-]
-
-builddependencies = [
-    ('CUDA', '11.5', '', SYSTEM),
-    ('CubeLib', '4.6'),
-    ('CubeWriter', '4.6'),
-    # Unwinding/sampling support (optional):
-    ('libunwind', '1.5.0'),
-]
-
-dependencies = [
-    # binutils is implicitly available via GCC toolchain
-    ('OPARI2', '2.0.6'),
-    ('OTF2', '2.3'),
-    # Hardware counter support (optional):
-    ('PAPI', '6.0.0.1'),
-    # PDT source-to-source instrumentation support (optional):
-    ('PDT', '3.25.1'),
-]
-
-configopts = '--enable-shared --with-machine-name=$SYSTEMNAME '
-# Enable CUDA support
-configopts += '--with-libOpenCL=$EBROOTCUDA/targets/x86_64-linux'
-
-sanity_check_paths = {
-    'files': ['bin/scorep', 'include/scorep/SCOREP_User.h',
-              ('lib/libscorep_adapter_mpi_event.a', 'lib64/libscorep_adapter_mpi_event.a'),
-              ('lib/libscorep_adapter_mpi_event.%s' % SHLIB_EXT, 'lib64/libscorep_adapter_mpi_event.%s' % SHLIB_EXT)],
-    'dirs': [],
-}
-
-# Ensure that local metric documentation is found by CubeGUI
-modextrapaths = {'CUBE_DOCPATH': 'share/doc/scorep/profile'}
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/s/Score-P/Score-P-7.1-iimpi-2021b.eb b/Golden_Repo/s/Score-P/Score-P-7.1-iimpi-2021b.eb
deleted file mode 100644
index 738527417..000000000
--- a/Golden_Repo/s/Score-P/Score-P-7.1-iimpi-2021b.eb
+++ /dev/null
@@ -1,65 +0,0 @@
-##
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-# Copyright:: Copyright 2013-2021 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-#             Markus Geimer <m.geimer@fz-juelich.de>
-#             Christian Feld <c.feld@fz-juelich.de>
-# License::   3-clause BSD
-#
-# This work is based on experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-easyblock = 'EB_Score_minus_P'
-
-name = 'Score-P'
-version = '7.1'
-
-homepage = 'https://www.score-p.org'
-description = """
-The Score-P measurement infrastructure is a highly scalable and easy-to-use
-tool suite for profiling, event tracing, and online analysis of HPC
-applications.
-"""
-
-toolchain = {'name': 'iimpi', 'version': '2021b'}
-
-source_urls = ['http://perftools.pages.jsc.fz-juelich.de/cicd/scorep/tags/scorep-%(version)s']
-sources = ['scorep-%(version)s.tar.gz']
-checksums = [
-    '98dea497982001fb82da3429ca55669b2917a0858c71abe2cfe7cd113381f1f7',  # scorep-7.1.tar.gz
-]
-
-builddependencies = [
-    ('CUDA', '11.5', '', SYSTEM),
-    ('CubeLib', '4.6'),
-    ('CubeWriter', '4.6'),
-    # Unwinding/sampling support (optional):
-    ('libunwind', '1.5.0'),
-]
-
-dependencies = [
-    # binutils is implicitly available via GCC toolchain
-    ('OPARI2', '2.0.6'),
-    ('OTF2', '2.3'),
-    # Hardware counter support (optional):
-    ('PAPI', '6.0.0.1'),
-    # PDT source-to-source instrumentation support (optional):
-    ('PDT', '3.25.1'),
-]
-
-configopts = '--enable-shared --with-machine-name=$SYSTEMNAME '
-# Enable CUDA support
-configopts += '--with-libOpenCL=$EBROOTCUDA/targets/x86_64-linux'
-
-sanity_check_paths = {
-    'files': ['bin/scorep', 'include/scorep/SCOREP_User.h',
-              ('lib/libscorep_adapter_mpi_event.a', 'lib64/libscorep_adapter_mpi_event.a'),
-              ('lib/libscorep_adapter_mpi_event.%s' % SHLIB_EXT, 'lib64/libscorep_adapter_mpi_event.%s' % SHLIB_EXT)],
-    'dirs': [],
-}
-
-# Ensure that local metric documentation is found by CubeGUI
-modextrapaths = {'CUBE_DOCPATH': 'share/doc/scorep/profile'}
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/s/Score-P/Score-P-7.1-iompi-2021b.eb b/Golden_Repo/s/Score-P/Score-P-7.1-iompi-2021b.eb
deleted file mode 100644
index b9658c638..000000000
--- a/Golden_Repo/s/Score-P/Score-P-7.1-iompi-2021b.eb
+++ /dev/null
@@ -1,65 +0,0 @@
-##
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-# Copyright:: Copyright 2013-2021 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-#             Markus Geimer <m.geimer@fz-juelich.de>
-#             Christian Feld <c.feld@fz-juelich.de>
-# License::   3-clause BSD
-#
-# This work is based on experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-easyblock = 'EB_Score_minus_P'
-
-name = 'Score-P'
-version = '7.1'
-
-homepage = 'https://www.score-p.org'
-description = """
-The Score-P measurement infrastructure is a highly scalable and easy-to-use
-tool suite for profiling, event tracing, and online analysis of HPC
-applications.
-"""
-
-toolchain = {'name': 'iompi', 'version': '2021b'}
-
-source_urls = ['http://perftools.pages.jsc.fz-juelich.de/cicd/scorep/tags/scorep-%(version)s']
-sources = ['scorep-%(version)s.tar.gz']
-checksums = [
-    '98dea497982001fb82da3429ca55669b2917a0858c71abe2cfe7cd113381f1f7',  # scorep-7.1.tar.gz
-]
-
-builddependencies = [
-    ('CUDA', '11.5', '', SYSTEM),
-    ('CubeLib', '4.6'),
-    ('CubeWriter', '4.6'),
-    # Unwinding/sampling support (optional):
-    ('libunwind', '1.5.0'),
-]
-
-dependencies = [
-    # binutils is implicitly available via GCC toolchain
-    ('OPARI2', '2.0.6'),
-    ('OTF2', '2.3'),
-    # Hardware counter support (optional):
-    ('PAPI', '6.0.0.1'),
-    # PDT source-to-source instrumentation support (optional):
-    ('PDT', '3.25.1'),
-]
-
-configopts = '--enable-shared --with-machine-name=$SYSTEMNAME '
-# Enable CUDA support
-configopts += '--with-libOpenCL=$EBROOTCUDA/targets/x86_64-linux'
-
-sanity_check_paths = {
-    'files': ['bin/scorep', 'include/scorep/SCOREP_User.h',
-              ('lib/libscorep_adapter_mpi_event.a', 'lib64/libscorep_adapter_mpi_event.a'),
-              ('lib/libscorep_adapter_mpi_event.%s' % SHLIB_EXT, 'lib64/libscorep_adapter_mpi_event.%s' % SHLIB_EXT)],
-    'dirs': [],
-}
-
-# Ensure that local metric documentation is found by CubeGUI
-modextrapaths = {'CUBE_DOCPATH': 'share/doc/scorep/profile'}
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/s/Score-P/Score-P-7.1-ipsmpi-2021b.eb b/Golden_Repo/s/Score-P/Score-P-7.1-ipsmpi-2021b.eb
deleted file mode 100644
index 628b9e9d5..000000000
--- a/Golden_Repo/s/Score-P/Score-P-7.1-ipsmpi-2021b.eb
+++ /dev/null
@@ -1,65 +0,0 @@
-##
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-# Copyright:: Copyright 2013-2021 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-#             Markus Geimer <m.geimer@fz-juelich.de>
-#             Christian Feld <c.feld@fz-juelich.de>
-# License::   3-clause BSD
-#
-# This work is based on experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-easyblock = 'EB_Score_minus_P'
-
-name = 'Score-P'
-version = '7.1'
-
-homepage = 'https://www.score-p.org'
-description = """
-The Score-P measurement infrastructure is a highly scalable and easy-to-use
-tool suite for profiling, event tracing, and online analysis of HPC
-applications.
-"""
-
-toolchain = {'name': 'ipsmpi', 'version': '2021b'}
-
-source_urls = ['http://perftools.pages.jsc.fz-juelich.de/cicd/scorep/tags/scorep-%(version)s']
-sources = ['scorep-%(version)s.tar.gz']
-checksums = [
-    '98dea497982001fb82da3429ca55669b2917a0858c71abe2cfe7cd113381f1f7',  # scorep-7.1.tar.gz
-]
-
-builddependencies = [
-    ('CUDA', '11.5', '', SYSTEM),
-    ('CubeLib', '4.6'),
-    ('CubeWriter', '4.6'),
-    # Unwinding/sampling support (optional):
-    ('libunwind', '1.5.0'),
-]
-
-dependencies = [
-    # binutils is implicitly available via GCC toolchain
-    ('OPARI2', '2.0.6'),
-    ('OTF2', '2.3'),
-    # Hardware counter support (optional):
-    ('PAPI', '6.0.0.1'),
-    # PDT source-to-source instrumentation support (optional):
-    ('PDT', '3.25.1'),
-]
-
-configopts = '--enable-shared --with-machine-name=$SYSTEMNAME '
-# Enable CUDA support
-configopts += '--with-libOpenCL=$EBROOTCUDA/targets/x86_64-linux'
-
-sanity_check_paths = {
-    'files': ['bin/scorep', 'include/scorep/SCOREP_User.h',
-              ('lib/libscorep_adapter_mpi_event.a', 'lib64/libscorep_adapter_mpi_event.a'),
-              ('lib/libscorep_adapter_mpi_event.%s' % SHLIB_EXT, 'lib64/libscorep_adapter_mpi_event.%s' % SHLIB_EXT)],
-    'dirs': [],
-}
-
-# Ensure that local metric documentation is found by CubeGUI
-modextrapaths = {'CUBE_DOCPATH': 'share/doc/scorep/profile'}
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/s/Score-P/Score-P-7.1-npsmpic-2021b.eb b/Golden_Repo/s/Score-P/Score-P-7.1-npsmpic-2021b.eb
deleted file mode 100644
index 238001e7d..000000000
--- a/Golden_Repo/s/Score-P/Score-P-7.1-npsmpic-2021b.eb
+++ /dev/null
@@ -1,65 +0,0 @@
-##
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-# Copyright:: Copyright 2013-2021 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-#             Markus Geimer <m.geimer@fz-juelich.de>
-#             Christian Feld <c.feld@fz-juelich.de>
-# License::   3-clause BSD
-#
-# This work is based on experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-easyblock = 'EB_Score_minus_P'
-
-name = 'Score-P'
-version = '7.1'
-
-homepage = 'https://www.score-p.org'
-description = """
-The Score-P measurement infrastructure is a highly scalable and easy-to-use
-tool suite for profiling, event tracing, and online analysis of HPC
-applications.
-"""
-
-toolchain = {'name': 'npsmpic', 'version': '2021b'}
-
-source_urls = ['http://perftools.pages.jsc.fz-juelich.de/cicd/scorep/tags/scorep-%(version)s']
-sources = ['scorep-%(version)s.tar.gz']
-checksums = [
-    '98dea497982001fb82da3429ca55669b2917a0858c71abe2cfe7cd113381f1f7',  # scorep-7.1.tar.gz
-]
-
-builddependencies = [
-    ('CUDA', '11.5', '', SYSTEM),
-    ('CubeLib', '4.6'),
-    ('CubeWriter', '4.6'),
-    # Unwinding/sampling support (optional):
-    ('libunwind', '1.5.0'),
-]
-
-dependencies = [
-    # binutils is implicitly available via GCC toolchain
-    ('OPARI2', '2.0.6'),
-    ('OTF2', '2.3'),
-    # Hardware counter support (optional):
-    ('PAPI', '6.0.0.1'),
-    # PDT source-to-source instrumentation support (optional):
-    ('PDT', '3.25.1'),
-]
-
-configopts = '--enable-shared --with-machine-name=$SYSTEMNAME '
-# Enable CUDA support
-configopts += '--with-libOpenCL=$EBROOTCUDA/targets/x86_64-linux'
-
-sanity_check_paths = {
-    'files': ['bin/scorep', 'include/scorep/SCOREP_User.h',
-              ('lib/libscorep_adapter_mpi_event.a', 'lib64/libscorep_adapter_mpi_event.a'),
-              ('lib/libscorep_adapter_mpi_event.%s' % SHLIB_EXT, 'lib64/libscorep_adapter_mpi_event.%s' % SHLIB_EXT)],
-    'dirs': [],
-}
-
-# Ensure that local metric documentation is found by CubeGUI
-modextrapaths = {'CUBE_DOCPATH': 'share/doc/scorep/profile'}
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/s/Score-P/Score-P-7.1-nvompic-2021b.eb b/Golden_Repo/s/Score-P/Score-P-7.1-nvompic-2021b.eb
deleted file mode 100644
index 124c663f1..000000000
--- a/Golden_Repo/s/Score-P/Score-P-7.1-nvompic-2021b.eb
+++ /dev/null
@@ -1,65 +0,0 @@
-##
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-# Copyright:: Copyright 2013-2021 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-#             Markus Geimer <m.geimer@fz-juelich.de>
-#             Christian Feld <c.feld@fz-juelich.de>
-# License::   3-clause BSD
-#
-# This work is based on experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-easyblock = 'EB_Score_minus_P'
-
-name = 'Score-P'
-version = '7.1'
-
-homepage = 'https://www.score-p.org'
-description = """
-The Score-P measurement infrastructure is a highly scalable and easy-to-use
-tool suite for profiling, event tracing, and online analysis of HPC
-applications.
-"""
-
-toolchain = {'name': 'nvompic', 'version': '2021b'}
-
-source_urls = ['http://perftools.pages.jsc.fz-juelich.de/cicd/scorep/tags/scorep-%(version)s']
-sources = ['scorep-%(version)s.tar.gz']
-checksums = [
-    '98dea497982001fb82da3429ca55669b2917a0858c71abe2cfe7cd113381f1f7',  # scorep-7.1.tar.gz
-]
-
-builddependencies = [
-    ('CUDA', '11.5', '', SYSTEM),
-    ('CubeLib', '4.6'),
-    ('CubeWriter', '4.6'),
-    # Unwinding/sampling support (optional):
-    ('libunwind', '1.5.0'),
-]
-
-dependencies = [
-    # binutils is implicitly available via GCC toolchain
-    ('OPARI2', '2.0.6'),
-    ('OTF2', '2.3'),
-    # Hardware counter support (optional):
-    ('PAPI', '6.0.0.1'),
-    # PDT source-to-source instrumentation support (optional):
-    ('PDT', '3.25.1'),
-]
-
-configopts = '--enable-shared --with-machine-name=$SYSTEMNAME '
-# Enable CUDA support
-configopts += '--with-libOpenCL=$EBROOTCUDA/targets/x86_64-linux'
-
-sanity_check_paths = {
-    'files': ['bin/scorep', 'include/scorep/SCOREP_User.h',
-              ('lib/libscorep_adapter_mpi_event.a', 'lib64/libscorep_adapter_mpi_event.a'),
-              ('lib/libscorep_adapter_mpi_event.%s' % SHLIB_EXT, 'lib64/libscorep_adapter_mpi_event.%s' % SHLIB_EXT)],
-    'dirs': [],
-}
-
-# Ensure that local metric documentation is found by CubeGUI
-modextrapaths = {'CUBE_DOCPATH': 'share/doc/scorep/profile'}
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/s/Seaborn/Seaborn-0.11.2-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/s/Seaborn/Seaborn-0.11.2-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index 9a168ac36..000000000
--- a/Golden_Repo/s/Seaborn/Seaborn-0.11.2-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,24 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'Seaborn'
-version = '0.11.2'
-
-homepage = 'https://seaborn.pydata.org/'
-description = """ Seaborn is a Python visualization library based on matplotlib.
- It provides a high-level interface for drawing attractive statistical graphics. """
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['cf45e9286d40826864be0e3c066f98536982baf701a7caa386511792d61ff4f6']
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('matplotlib', '3.4.3'),
-]
-
-use_pip = True
-download_dep_fail = True
-sanity_pip_check = True
-
-moduleclass = 'bio'
diff --git a/Golden_Repo/s/Serf/Serf-1.3.9-GCCcore-11.2.0.eb b/Golden_Repo/s/Serf/Serf-1.3.9-GCCcore-11.2.0.eb
deleted file mode 100644
index 5f3af8ba8..000000000
--- a/Golden_Repo/s/Serf/Serf-1.3.9-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,40 +0,0 @@
-easyblock = 'SCons'
-name = 'Serf'
-version = '1.3.9'
-
-homepage = 'https://serf.apache.org/'
-description = """The serf library is a high performance C-based HTTP client library
- built upon the Apache Portable Runtime (APR) library"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://archive.apache.org/dist/%(namelower)s']
-sources = [SOURCELOWER_TAR_BZ2]
-patches = ['Serf-%(version)s_python3_scons.patch']
-checksums = [
-    '549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc',  # serf-1.3.9.tar.bz2
-    # Serf-1.3.9_python3_scons.patch
-    'db401893bfb464ddcf369b543cacb9a165a21f8ff9bf1a819e4b61550bb9d3d0',
-]
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Python', '3.9.6'),
-    ('SCons', '4.2.0'),
-]
-
-dependencies = [
-    ('APR', '1.7.0'),
-    ('APR-util', '1.6.1'),
-    ('OpenSSL', '1.1', '', True),
-]
-
-buildopts = "APR=$EBROOTAPR/bin/apr-1-config APU=$EBROOTAPRMINUTIL/bin/apu-1-config"
-
-sanity_check_paths = {
-    'files': ['include/serf-1/serf.h'] +
-             ['lib/libserf-1.%s' % x for x in ['a', 'so']],
-    'dirs': [],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/s/Shapely/Shapely-1.8.0-GCCcore-11.2.0.eb b/Golden_Repo/s/Shapely/Shapely-1.8.0-GCCcore-11.2.0.eb
deleted file mode 100644
index f88910b89..000000000
--- a/Golden_Repo/s/Shapely/Shapely-1.8.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,25 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'Shapely'
-version = '1.8.0'
-
-homepage = 'https://github.com/Toblerity/Shapely'
-description = """Shapely is a BSD-licensed Python package for manipulation and analysis of planar geometric objects.
-It is based on the widely deployed GEOS (the engine of PostGIS) and JTS (from which GEOS is ported) libraries."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [PYPI_SOURCE]
-sources = [SOURCE_TAR_GZ]
-checksums = ['f5307ee14ba4199f8bbcf6532ca33064661c1433960c432c84f0daa73b47ef9c']
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('GEOS', '3.9.1'),
-]
-
-download_dep_fail = True
-use_pip = True
-sanity_pip_check = True
-
-moduleclass = 'math'
diff --git a/Golden_Repo/s/Siesta/Siesta-4.1.5-intel-2021b.eb b/Golden_Repo/s/Siesta/Siesta-4.1.5-intel-2021b.eb
deleted file mode 100644
index ca96c69b3..000000000
--- a/Golden_Repo/s/Siesta/Siesta-4.1.5-intel-2021b.eb
+++ /dev/null
@@ -1,27 +0,0 @@
-name = 'Siesta'
-version = '4.1.5'
-
-homepage = 'http://departments.icmab.es/leem/siesta'
-description = """SIESTA is both a method and its computer program implementation, to perform efficient electronic
- structure calculations and ab initio molecular dynamics simulations of molecules and solids."""
-
-toolchain = {'name': 'intel', 'version': '2021b'}
-toolchainopts = {'usempi': True, 'precise': True}
-
-source_urls = [
-    'https://gitlab.com/siesta-project/siesta/-/releases/v%(version)s/downloads']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['518df31aa6213af5e24cc73abb537b2c89a925b487171f5339d743d0c7140b3f']
-
-dependencies = [
-    ('netCDF-Fortran', '4.5.3'),
-    ('METIS', '5.1.0'),
-    ('ELPA', '2021.11.001'),
-]
-
-# transiesta is now siesta --electrode
-with_transiesta = False
-
-runtest = 'check'
-
-moduleclass = 'phys'
diff --git a/Golden_Repo/s/Siesta/Siesta-4.1.5-intel-para-2021b.eb b/Golden_Repo/s/Siesta/Siesta-4.1.5-intel-para-2021b.eb
deleted file mode 100644
index bc151e73d..000000000
--- a/Golden_Repo/s/Siesta/Siesta-4.1.5-intel-para-2021b.eb
+++ /dev/null
@@ -1,27 +0,0 @@
-name = 'Siesta'
-version = '4.1.5'
-
-homepage = 'http://departments.icmab.es/leem/siesta'
-description = """SIESTA is both a method and its computer program implementation, to perform efficient electronic
- structure calculations and ab initio molecular dynamics simulations of molecules and solids."""
-
-toolchain = {'name': 'intel-para', 'version': '2021b'}
-toolchainopts = {'usempi': True, 'precise': True}
-
-source_urls = [
-    'https://gitlab.com/siesta-project/siesta/-/releases/v%(version)s/downloads']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['518df31aa6213af5e24cc73abb537b2c89a925b487171f5339d743d0c7140b3f']
-
-dependencies = [
-    ('netCDF-Fortran', '4.5.3'),
-    ('METIS', '5.1.0'),
-    ('ELPA', '2021.11.001'),
-]
-
-# transiesta is now siesta --electrode
-with_transiesta = False
-
-runtest = 'check'
-
-moduleclass = 'phys'
diff --git a/Golden_Repo/s/Silo/Silo-4.11-gpsmpi-2021b.eb b/Golden_Repo/s/Silo/Silo-4.11-gpsmpi-2021b.eb
deleted file mode 100644
index fa7548d60..000000000
--- a/Golden_Repo/s/Silo/Silo-4.11-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'Silo'
-version = '4.11'
-
-homepage = 'https://wci.llnl.gov/simulation/computer-codes/silo/'
-description = 'Silo is a library for reading and writing a wide variety of scientific data to binary, disk files.'
-
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-toolchainopts = {'opt': True, 'pic': True, 'usempi': True}
-
-source_urls = ['https://wci.llnl.gov/sites/wci/files/2021-09/']
-sources = ['%(namelower)s-%(version)s.tgz']
-patches = ['silo-4.11-fix-hdf5.patch']
-checksums = [
-    'ab936c1f4fc158d9fdc4415965f7d9def7f4abeca596fe5a25bd8485654898ac',  # silo-4.11.tgz
-    '62ac2c76d2a4fc6562a5cbf1e11957174858b3b238c7dc5057865db0cce8bef1',  # silo-4.11-fix-hdf5.patch
-]
-
-dependencies = [
-    ('HDF5', '1.12.1'),
-    ('Szip', '2.1.1')
-]
-
-configopts = [
-    '--with-hdf5=$EBROOTHDF5/include,$EBROOTHDF5/lib --with-szlib=$EBROOTSZIP/lib --enable-shared --disable-silex',
-    '--with-szlib=$EBROOTSZIP/lib --enable-shared --disable-silex',
-]
-
-sanity_check_paths = {
-    'files': ['bin/browser', 'bin/silock', 'bin/silodiff', 'bin/silofile', 'lib/libsilo.a', 'lib/libsiloh5.a'],
-    'dirs': [],
-}
-
-moduleclass = 'data'
diff --git a/Golden_Repo/s/Silo/Silo-4.11-ipsmpi-2021b.eb b/Golden_Repo/s/Silo/Silo-4.11-ipsmpi-2021b.eb
deleted file mode 100644
index 5a66c4c5e..000000000
--- a/Golden_Repo/s/Silo/Silo-4.11-ipsmpi-2021b.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'Silo'
-version = '4.11'
-
-homepage = 'https://wci.llnl.gov/simulation/computer-codes/silo/'
-description = 'Silo is a library for reading and writing a wide variety of scientific data to binary, disk files.'
-
-
-toolchain = {'name': 'ipsmpi', 'version': '2021b'}
-toolchainopts = {'opt': True, 'pic': True, 'usempi': True}
-
-source_urls = ['https://wci.llnl.gov/sites/wci/files/2021-09/']
-sources = ['%(namelower)s-%(version)s.tgz']
-patches = ['silo-4.11-fix-hdf5.patch']
-checksums = [
-    'ab936c1f4fc158d9fdc4415965f7d9def7f4abeca596fe5a25bd8485654898ac',  # silo-4.11.tgz
-    '62ac2c76d2a4fc6562a5cbf1e11957174858b3b238c7dc5057865db0cce8bef1',  # silo-4.11-fix-hdf5.patch
-]
-
-dependencies = [
-    ('HDF5', '1.12.1'),
-    ('Szip', '2.1.1')
-]
-
-configopts = [
-    '--with-hdf5=$EBROOTHDF5/include,$EBROOTHDF5/lib --with-szlib=$EBROOTSZIP/lib --enable-shared --disable-silex',
-    '--with-szlib=$EBROOTSZIP/lib --enable-shared --disable-silex',
-]
-
-sanity_check_paths = {
-    'files': ['bin/browser', 'bin/silock', 'bin/silodiff', 'bin/silofile', 'lib/libsilo.a', 'lib/libsiloh5.a'],
-    'dirs': [],
-}
-
-moduleclass = 'data'
diff --git a/Golden_Repo/s/Silo/silo-4.11-fix-hdf5.patch b/Golden_Repo/s/Silo/silo-4.11-fix-hdf5.patch
deleted file mode 100644
index f772d4b9f..000000000
--- a/Golden_Repo/s/Silo/silo-4.11-fix-hdf5.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/src/hdf5_drv/H5FDsilo.c b/src/hdf5_drv/H5FDsilo.c
---- a/src/hdf5_drv/H5FDsilo.c
-+++ b/src/hdf5_drv/H5FDsilo.c
-@@ -243,6 +243,12 @@
-     return tmp;
- }
- 
-+#if HDF5_VERSION_GE(1,10,8)
-+#define H5EPR_SEMI_COLON ;
-+#else
-+#define H5EPR_SEMI_COLON
-+#endif
-+
- 
- #ifdef H5_HAVE_SNPRINTF
- #define H5E_PUSH_HELPER(Func,Cls,Maj,Min,Msg,Ret,Errno)			\
-@@ -252,13 +258,13 @@
-         snprintf(msg, sizeof(msg), Msg "(errno=%d, \"%s\")",	\
-             Errno, strerror(Errno));					\
-     ret_value = Ret;							\
--    H5Epush_ret(Func, Cls, Maj, Min, msg, Ret)				\
-+    H5Epush_ret(Func, Cls, Maj, Min, msg, Ret) H5EPR_SEMI_COLON		\
- }
- #else
- #define H5E_PUSH_HELPER(Func,Cls,Maj,Min,Msg,Ret,Errno)			\
- {									\
-     ret_value = Ret;							\
--    H5Epush_ret(Func, Cls, Maj, Min, Msg, Ret)				\
-+    H5Epush_ret(Func, Cls, Maj, Min, Msg, Ret) H5EPR_SEMI_COLON		\
- }
- #endif
- 
-@@ -1355,7 +1368,7 @@
-     assert(sizeof(hsize_t)<=8);
-     memcpy(p, &file->block_size, sizeof(hsize_t));
-     if (H5Tconvert(H5T_NATIVE_HSIZE, H5T_STD_U64LE, 1, buf+8, NULL, H5P_DEFAULT)<0)
--        H5Epush_ret(func, H5E_ERR_CLS, H5E_DATATYPE, H5E_CANTCONVERT, "can't convert superblock info", -1)
-+        H5Epush_ret(func, H5E_ERR_CLS, H5E_DATATYPE, H5E_CANTCONVERT, "can't convert superblock info", -1) H5EPR_SEMI_COLON
- 
-     return 0;
- }
-@@ -1383,14 +1396,14 @@
- 
-     /* Make sure the name/version number is correct */
-     if (strcmp(name, "LLNLsilo"))
--        H5Epush_ret(func, H5E_ERR_CLS, H5E_FILE, H5E_BADVALUE, "invalid silo superblock", -1)
-+        H5Epush_ret(func, H5E_ERR_CLS, H5E_FILE, H5E_BADVALUE, "invalid silo superblock", -1) H5EPR_SEMI_COLON
- 
-     buf += 8;
-     /* Decode block size */
-     assert(sizeof(hsize_t)<=8);
-     memcpy(x, buf, 8);
-     if (H5Tconvert(H5T_STD_U64LE, H5T_NATIVE_HSIZE, 1, x, NULL, H5P_DEFAULT)<0)
--        H5Epush_ret(func, H5E_ERR_CLS, H5E_DATATYPE, H5E_CANTCONVERT, "can't convert superblock info", -1)
-+        H5Epush_ret(func, H5E_ERR_CLS, H5E_DATATYPE, H5E_CANTCONVERT, "can't convert superblock info", -1) H5EPR_SEMI_COLON
-     ap = (hsize_t*)x;
-     /*file->block_size = *ap; ignore stored value for now */
- 
\ No newline at end of file
diff --git a/Golden_Repo/s/Singularity-Tools/Singularity-Tools-2022-GCCcore-11.2.0.eb b/Golden_Repo/s/Singularity-Tools/Singularity-Tools-2022-GCCcore-11.2.0.eb
deleted file mode 100644
index 6e1d77a29..000000000
--- a/Golden_Repo/s/Singularity-Tools/Singularity-Tools-2022-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,20 +0,0 @@
-easyblock = 'SystemBundle'
-name = 'Singularity-Tools'
-version = '2022'
-
-homepage = 'https://gitlab.version.fz-juelich.de/hps-public/container-build-system-cli'
-description = "Singularity-Tools is a deprecated module. Please use Apptainer-Tools instead"
-
-site_contacts = 'Ruben Simons <r.simons@fz-juelich.de>'
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [
-    ('Apptainer-Tools', version)
-]
-
-modloadmsg = description
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/s/SoX/SoX-14.4.2-GCCcore-11.2.0.eb b/Golden_Repo/s/SoX/SoX-14.4.2-GCCcore-11.2.0.eb
deleted file mode 100644
index ee5257534..000000000
--- a/Golden_Repo/s/SoX/SoX-14.4.2-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,27 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'SoX'
-version = '14.4.2'
-
-homepage = 'https://sourceforge.net/projects/sox'
-description = """SoX is the Swiss Army Knife of sound processing utilities. It can convert audio files
- to other popular audio file types and also apply sound effects and filters during the conversion."""
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [SOURCEFORGE_SOURCE]
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['b45f598643ffbd8e363ff24d61166ccec4836fea6d3888881b8df53e3bb55f6c']
-
-builddependencies = {
-    ('binutils', '2.37')
-}
-
-sanity_check_paths = {
-    'files': ['bin/play', 'bin/rec', 'bin/sox', 'bin/soxi', 'include/sox.h',
-              'lib/libsox.a', 'lib/libsox.%s' % SHLIB_EXT, 'lib/pkgconfig/sox.pc'],
-    'dirs': ['share/man'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/s/Subversion/Subversion-1.14.1-GCCcore-11.2.0.eb b/Golden_Repo/s/Subversion/Subversion-1.14.1-GCCcore-11.2.0.eb
deleted file mode 100644
index b9bb6a47e..000000000
--- a/Golden_Repo/s/Subversion/Subversion-1.14.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,51 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'Subversion'
-version = '1.14.1'
-
-homepage = 'https://subversion.apache.org/'
-description = " Subversion is an open source version control system."
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [
-    'https://apache.belnet.be/%(namelower)s',
-    'http://www.eu.apache.org/dist/%(namelower)s',
-    'http://www.us.apache.org/dist/%(namelower)s',
-    'https://archive.apache.org/dist/%(namelower)s',
-]
-sources = [SOURCELOWER_TAR_BZ2]
-patches = ['Subversion-1.12.0-no_swig.patch']
-checksums = [
-    # subversion-1.14.1.tar.bz2
-    '2c5da93c255d2e5569fa91d92457fdb65396b0666fad4fd59b22e154d986e1a9',
-    # Subversion-1.12.0-no_swig.patch
-    '539ea2118f958d152d78438c81649eb727ff0b2e8491295702ee98e1f922041f',
-]
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Autotools', '20210726'),
-]
-
-dependencies = [
-    ('APR', '1.7.0'),
-    ('APR-util', '1.6.1'),
-    ('SQLite', '3.36'),
-    ('zlib', '1.2.11'),
-    ('lz4', '1.9.3'),
-    ('utf8proc', '2.6.1'),
-    ('Serf', '1.3.9'),
-]
-
-preconfigopts = './autogen.sh && '
-
-configopts = "--with-apr=$EBROOTAPR/bin/apr-1-config --with-apr-util=$EBROOTAPRMINUTIL/bin/apu-1-config "
-configopts += "--with-zlib=$EBROOTZLIB --with-lz4=$EBROOTLZ4 --with-serf=$EBROOTSERF"
-
-sanity_check_paths = {
-    'files': ["bin/svn", "bin/svnversion"],
-    'dirs': [],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/s/SuiteSparse/SuiteSparse-5.10.1-gcccoremkl-11.2.0-2021.4.0-nompi.eb b/Golden_Repo/s/SuiteSparse/SuiteSparse-5.10.1-gcccoremkl-11.2.0-2021.4.0-nompi.eb
deleted file mode 100644
index 7e10d31aa..000000000
--- a/Golden_Repo/s/SuiteSparse/SuiteSparse-5.10.1-gcccoremkl-11.2.0-2021.4.0-nompi.eb
+++ /dev/null
@@ -1,30 +0,0 @@
-name = 'SuiteSparse'
-version = '5.10.1'
-versionsuffix = '-nompi'
-
-homepage = 'https://faculty.cse.tamu.edu/davis/suitesparse.html'
-description = """SuiteSparse is a collection of libraries manipulate sparse matrices."""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'unroll': True, 'pic': True}
-
-source_urls = ['https://github.com/DrTimothyAldenDavis/SuiteSparse/archive']
-sources = ['v%(version)s.tar.gz']
-checksums = ['acb4d1045f48a237e70294b950153e48dce5b5f9ca8190e86c2b8c54ce00a7ee']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1', '', SYSTEM),
-    ('M4', '1.4.19'),
-]
-
-dependencies = [
-    ('METIS', '5.1.0', '-IDX64'),
-    ('CUDA', '11.5', '', SYSTEM),
-    ('MPFR', '4.1.0'),
-]
-
-# make sure that bin/demo can find libsuitesparseconfig.so.5 during build
-prebuildopts = "export LD_LIBRARY_PATH=%(builddir)s/SuiteSparse-%(version)s/lib:$LD_LIBRARY_PATH && "
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/s/SuiteSparse/SuiteSparse-5.10.1-gomkl-2021b.eb b/Golden_Repo/s/SuiteSparse/SuiteSparse-5.10.1-gomkl-2021b.eb
deleted file mode 100644
index fe8c54fba..000000000
--- a/Golden_Repo/s/SuiteSparse/SuiteSparse-5.10.1-gomkl-2021b.eb
+++ /dev/null
@@ -1,28 +0,0 @@
-name = 'SuiteSparse'
-version = '5.10.1'
-
-homepage = 'https://faculty.cse.tamu.edu/davis/suitesparse.html'
-description = """SuiteSparse is a collection of libraries manipulate sparse matrices."""
-
-toolchain = {'name': 'gomkl', 'version': '2021b'}
-toolchainopts = {'unroll': True, 'pic': True}
-
-source_urls = ['https://github.com/DrTimothyAldenDavis/SuiteSparse/archive']
-sources = ['v%(version)s.tar.gz']
-checksums = ['acb4d1045f48a237e70294b950153e48dce5b5f9ca8190e86c2b8c54ce00a7ee']
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-    ('M4', '1.4.19'),
-]
-
-dependencies = [
-    ('METIS', '5.1.0', '-IDX64'),
-    ('CUDA', '11.5', '', SYSTEM),
-    ('MPFR', '4.1.0'),
-]
-
-# make sure that bin/demo can find libsuitesparseconfig.so.5 during build
-prebuildopts = "export LD_LIBRARY_PATH=%(builddir)s/SuiteSparse-%(version)s/lib:$LD_LIBRARY_PATH && "
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/s/SuiteSparse/SuiteSparse-5.10.1-gpsmkl-2021b.eb b/Golden_Repo/s/SuiteSparse/SuiteSparse-5.10.1-gpsmkl-2021b.eb
deleted file mode 100644
index 5812eaa07..000000000
--- a/Golden_Repo/s/SuiteSparse/SuiteSparse-5.10.1-gpsmkl-2021b.eb
+++ /dev/null
@@ -1,28 +0,0 @@
-name = 'SuiteSparse'
-version = '5.10.1'
-
-homepage = 'http://faculty.cse.tamu.edu/davis/suitesparse.html'
-description = """SuiteSparse is a collection of libraries manipulate sparse matrices."""
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-toolchainopts = {'unroll': True, 'pic': True}
-
-source_urls = ['https://github.com/DrTimothyAldenDavis/SuiteSparse/archive']
-sources = ['v%(version)s.tar.gz']
-checksums = ['acb4d1045f48a237e70294b950153e48dce5b5f9ca8190e86c2b8c54ce00a7ee']
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-    ('M4', '1.4.19'),
-]
-
-dependencies = [
-    ('METIS', '5.1.0', '-IDX64'),
-    ('CUDA', '11.5', '', SYSTEM),
-    ('MPFR', '4.1.0'),
-]
-
-# make sure that bin/demo can find libsuitesparseconfig.so.5 during build
-prebuildopts = "export LD_LIBRARY_PATH=%(builddir)s/SuiteSparse-%(version)s/lib:$LD_LIBRARY_PATH && "
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/s/SuiteSparse/SuiteSparse-5.10.1-intel-2021.eb b/Golden_Repo/s/SuiteSparse/SuiteSparse-5.10.1-intel-2021.eb
deleted file mode 100644
index b275b5419..000000000
--- a/Golden_Repo/s/SuiteSparse/SuiteSparse-5.10.1-intel-2021.eb
+++ /dev/null
@@ -1,28 +0,0 @@
-name = 'SuiteSparse'
-version = '5.10.1'
-
-homepage = 'http://faculty.cse.tamu.edu/davis/suitesparse.html'
-description = """SuiteSparse is a collection of libraries manipulate sparse matrices."""
-
-toolchain = {'name': 'intel', 'version': '2021b'}
-toolchainopts = {'unroll': True, 'pic': True}
-
-source_urls = ['https://github.com/DrTimothyAldenDavis/SuiteSparse/archive']
-sources = ['v%(version)s.tar.gz']
-checksums = ['acb4d1045f48a237e70294b950153e48dce5b5f9ca8190e86c2b8c54ce00a7ee']
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-    ('M4', '1.4.19'),
-]
-
-dependencies = [
-    ('METIS', '5.1.0', '-IDX64'),
-    ('CUDA', '11.5', '', SYSTEM),
-    ('MPFR', '4.1.0'),
-]
-
-# make sure that bin/demo can find libsuitesparseconfig.so.5 during build
-prebuildopts = "export LD_LIBRARY_PATH=%(builddir)s/SuiteSparse-%(version)s/lib:$LD_LIBRARY_PATH && "
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/s/SuiteSparse/SuiteSparse-5.10.1-intel-para-2021.eb b/Golden_Repo/s/SuiteSparse/SuiteSparse-5.10.1-intel-para-2021.eb
deleted file mode 100644
index 685bfeda2..000000000
--- a/Golden_Repo/s/SuiteSparse/SuiteSparse-5.10.1-intel-para-2021.eb
+++ /dev/null
@@ -1,28 +0,0 @@
-name = 'SuiteSparse'
-version = '5.10.1'
-
-homepage = 'http://faculty.cse.tamu.edu/davis/suitesparse.html'
-description = """SuiteSparse is a collection of libraries manipulate sparse matrices."""
-
-toolchain = {'name': 'intel-para', 'version': '2021b'}
-toolchainopts = {'unroll': True, 'pic': True}
-
-source_urls = ['https://github.com/DrTimothyAldenDavis/SuiteSparse/archive']
-sources = ['v%(version)s.tar.gz']
-checksums = ['acb4d1045f48a237e70294b950153e48dce5b5f9ca8190e86c2b8c54ce00a7ee']
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-    ('M4', '1.4.19'),
-]
-
-dependencies = [
-    ('METIS', '5.1.0', '-IDX64'),
-    ('CUDA', '11.5', '', SYSTEM),
-    ('MPFR', '4.1.0'),
-]
-
-# make sure that bin/demo can find libsuitesparseconfig.so.5 during build
-prebuildopts = "export LD_LIBRARY_PATH=%(builddir)s/SuiteSparse-%(version)s/lib:$LD_LIBRARY_PATH && "
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/s/SuiteSparse/SuiteSparse-5.10.1-iomkl-2021.eb b/Golden_Repo/s/SuiteSparse/SuiteSparse-5.10.1-iomkl-2021.eb
deleted file mode 100644
index 9169ab4a7..000000000
--- a/Golden_Repo/s/SuiteSparse/SuiteSparse-5.10.1-iomkl-2021.eb
+++ /dev/null
@@ -1,28 +0,0 @@
-name = 'SuiteSparse'
-version = '5.10.1'
-
-homepage = 'http://faculty.cse.tamu.edu/davis/suitesparse.html'
-description = """SuiteSparse is a collection of libraries manipulate sparse matrices."""
-
-toolchain = {'name': 'iomkl', 'version': '2021b'}
-toolchainopts = {'unroll': True, 'pic': True}
-
-source_urls = ['https://github.com/DrTimothyAldenDavis/SuiteSparse/archive']
-sources = ['v%(version)s.tar.gz']
-checksums = ['acb4d1045f48a237e70294b950153e48dce5b5f9ca8190e86c2b8c54ce00a7ee']
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-    ('M4', '1.4.19'),
-]
-
-dependencies = [
-    ('METIS', '5.1.0', '-IDX64'),
-    ('CUDA', '11.5', '', SYSTEM),
-    ('MPFR', '4.1.0'),
-]
-
-# make sure that bin/demo can find libsuitesparseconfig.so.5 during build
-prebuildopts = "export LD_LIBRARY_PATH=%(builddir)s/SuiteSparse-%(version)s/lib:$LD_LIBRARY_PATH && "
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/s/SuperLU/SuperLU-5.3.0-gpsmkl-2021b.eb b/Golden_Repo/s/SuperLU/SuperLU-5.3.0-gpsmkl-2021b.eb
deleted file mode 100644
index 930c2f2ed..000000000
--- a/Golden_Repo/s/SuperLU/SuperLU-5.3.0-gpsmkl-2021b.eb
+++ /dev/null
@@ -1,27 +0,0 @@
-easyblock = "EB_SuperLU"
-
-name = 'SuperLU'
-version = '5.3.0'
-
-homepage = 'https://portal.nersc.gov/project/sparse/superlu/'
-description = """SuperLU is a general purpose library for the direct solution of large, sparse, nonsymmetric systems
- of linear equations on high performance machines."""
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-toolchainopts = {'pic': True, 'openmp': True}
-
-github_account = 'xiaoyeli'
-source_urls = [GITHUB_LOWER_SOURCE]
-sources = ["v%(version)s.tar.gz"]
-checksums = ['3e464afa77335de200aeb739074a11e96d9bef6d0b519950cfa6684c4be1f350']
-
-builddependencies = [('CMake', '3.21.1', '', SYSTEM)]
-
-configopts = "-DUSE_XSDK_DEFAULTS=true"
-
-sanity_check_paths = {
-    'files': ['lib64/libsuperlu.a'],
-    'dirs': ['include']
-}
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/s/SuperLU/SuperLU-5.3.0-intel-para-2021b.eb b/Golden_Repo/s/SuperLU/SuperLU-5.3.0-intel-para-2021b.eb
deleted file mode 100644
index b022c0581..000000000
--- a/Golden_Repo/s/SuperLU/SuperLU-5.3.0-intel-para-2021b.eb
+++ /dev/null
@@ -1,27 +0,0 @@
-easyblock = "EB_SuperLU"
-
-name = 'SuperLU'
-version = '5.3.0'
-
-homepage = 'https://portal.nersc.gov/project/sparse/superlu/'
-description = """SuperLU is a general purpose library for the direct solution of large, sparse, nonsymmetric systems
- of linear equations on high performance machines."""
-
-toolchain = {'name': 'intel-para', 'version': '2021b'}
-toolchainopts = {'pic': True, 'openmp': True}
-
-github_account = 'xiaoyeli'
-source_urls = [GITHUB_LOWER_SOURCE]
-sources = ["v%(version)s.tar.gz"]
-checksums = ['3e464afa77335de200aeb739074a11e96d9bef6d0b519950cfa6684c4be1f350']
-
-builddependencies = [('CMake', '3.21.1', '', SYSTEM)]
-
-configopts = "-DUSE_XSDK_DEFAULTS=true"
-
-sanity_check_paths = {
-    'files': ['lib64/libsuperlu.a'],
-    'dirs': ['include']
-}
-
-moduleclass = 'numlib'
diff --git a/Golden_Repo/s/SymEngine-python/SymEngine-python-0.9.2-GCC-11.2.0.eb b/Golden_Repo/s/SymEngine-python/SymEngine-python-0.9.2-GCC-11.2.0.eb
deleted file mode 100644
index b97e5c250..000000000
--- a/Golden_Repo/s/SymEngine-python/SymEngine-python-0.9.2-GCC-11.2.0.eb
+++ /dev/null
@@ -1,30 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'SymEngine-python'
-version = '0.9.2'
-
-homepage = 'https://github.com/symengine/symengine.py'
-description = "Python wrappers to the C++ library SymEngine, a fast C++ symbolic manipulation library."
-
-toolchain = {'name': 'GCC', 'version': '11.2.0'}
-
-source_urls = ['https://github.com/symengine/symengine.py/archive/refs/tags/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['9da048692d741bb001d9947a0e2bdf8909600cb4e6f3b9273d518cf93300955d']
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-]
-
-dependencies = [
-    ('SymEngine', '0.9.0'),
-    ('Python', '3.9.6'),
-]
-
-use_pip = True
-download_dep_fail = True
-sanity_pip_check = True
-
-options = {'modulename': 'symengine'}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/s/SymEngine/SymEngine-0.9.0-GCC-11.2.0.eb b/Golden_Repo/s/SymEngine/SymEngine-0.9.0-GCC-11.2.0.eb
deleted file mode 100644
index 03c8957e0..000000000
--- a/Golden_Repo/s/SymEngine/SymEngine-0.9.0-GCC-11.2.0.eb
+++ /dev/null
@@ -1,39 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'SymEngine'
-version = '0.9.0'
-
-homepage = 'https://github.com/symengine/symengine'
-description = "SymEngine is a standalone fast C++ symbolic manipulation library"
-
-toolchain = {'name': 'GCC', 'version': '11.2.0'}
-toolchainopts = {'cstd': 'c++17', 'vectorize': True}
-
-source_urls = ['https://github.com/symengine/symengine/archive/refs/tags/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['dcf174ac708ed2acea46691f6e78b9eb946d8a2ba62f75e87cf3bf4f0d651724']
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-]
-
-dependencies = [
-    ('GMP', '6.2.1'),
-    ('MPFR', '4.1.0'),
-    ('MPC', '1.2.1'),
-    ('LLVM', '13.0.0'),
-    ('FLINT', '2.7.1'),
-]
-
-local_opts = '-DWITH_OPENMP=ON -DWITH_SYMENGINE_RCP=ON -DWITH_COTIRE=OFF '
-local_opts += '-DWITH_MPFR=ON -DWITH_MPC=ON -DWITH_LLVM=ON -DWITH_BFD=ON -DWITH_FLINT=ON '
-configopts = [local_opts + '-DBUILD_SHARED_LIBS=OFF', local_opts + '-DBUILD_SHARED_LIBS=ON']
-
-runtest = 'test'
-
-sanity_check_paths = {
-    'files': ['lib64/libsymengine.a', 'lib64/libsymengine.%s' % SHLIB_EXT],
-    'dirs': ['include/symengine/']
-}
-
-moduleclass = 'lib'
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
deleted file mode 100644
index 50df4ee90..000000000
--- a/Golden_Repo/s/Szip/Szip-2.1.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,30 +0,0 @@
-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/scikit-allel/scikit-allel-1.3.3-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/s/scikit-allel/scikit-allel-1.3.3-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index 276c3bc19..000000000
--- a/Golden_Repo/s/scikit-allel/scikit-allel-1.3.3-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-easyblock = "PythonPackage"
-
-name = 'scikit-allel'
-version = '1.3.3'
-
-homepage = 'https://scikit-allel.readthedocs.io/en/latest/'
-description = """This package provides utilities for exploratory analysis of large scale genetic variation data.
- It is based on numpy, scipy and other general-purpose Python scientific libraries."""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-sources = [SOURCE_TAR_GZ]
-checksums = ['550c2a1d00953c3d5d54eb128faf38b52ebd7a8717c1a6dc8ec711cdcada8ded']
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('Seaborn', '0.11.2'),
-    ('h5py', '3.5.0', '-serial'),
-    ('SciPy-bundle', '2021.10'),
-    ('scikit-learn', '1.0.1'),
-    ('dask', '2021.9.1'),
-    # Disabled owing to build with newer Python
-    # Cf. https://github.com/Blosc/bcolz/issues/409
-    # https://github.com/popsim-consortium/stdpopsim/issues/649
-    # ('bcolz', '1.2.1'),
-    ('zarr', '2.10.1'),
-]
-
-download_dep_fail = True
-use_pip = True
-
-options = {'modulename': 'allel'}
-
-sanity_pip_check = True
-
-moduleclass = 'bio'
diff --git a/Golden_Repo/s/scikit-bio/scikit-bio-0.5.6-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/s/scikit-bio/scikit-bio-0.5.6-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index 84adf3743..000000000
--- a/Golden_Repo/s/scikit-bio/scikit-bio-0.5.6-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,43 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'scikit-bio'
-version = '0.5.6'
-
-
-homepage = 'http://scikit-bio.org'
-description = """scikit-bio is an open-source, BSD-licensed Python 3 package providing data structures, algorithms
-and educational resources for bioinformatics."""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10'),
-    ('matplotlib', '3.4.3'),
-    ('scikit-learn', '1.0.1'),
-]
-
-use_pip = True
-
-exts_list = [
-    ('CacheControl', '0.12.6', {
-        'checksums': ['be9aa45477a134aee56c8fac518627e1154df063e85f67d4f83ce0ccc23688e8'],
-    }),
-    ('hdmedians', '0.14.1', {
-        'checksums': ['ccefaae26302afd843c941b3b662f1119d5a36dec118077310f811a7a1ed8871'],
-    }),
-    ('lockfile', '0.12.2', {
-        'checksums': ['6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799'],
-    }),
-    ('natsort', '7.0.1', {
-        'checksums': ['a633464dc3a22b305df0f27abcb3e83515898aa1fd0ed2f9726c3571a27258cf'],
-    }),
-    (name, version, {
-        'modulename': 'skbio',
-        'checksums': ['48b73ec53ce0ff2c2e3e05f3cfcf93527c1525a8d3e9dd4ae317b4219c37f0ea'],
-    }),
-]
-
-sanity_pip_check = True
-
-moduleclass = 'bio'
diff --git a/Golden_Repo/s/scikit-build/scikit-build-0.11.1-GCCcore-11.2.0.eb b/Golden_Repo/s/scikit-build/scikit-build-0.11.1-GCCcore-11.2.0.eb
deleted file mode 100755
index 98a7716c2..000000000
--- a/Golden_Repo/s/scikit-build/scikit-build-0.11.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,33 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'scikit-build'
-version = '0.11.1'
-
-homepage = 'https://scikit-build.readthedocs.io/en/latest'
-description = """Scikit-Build, or skbuild, is an improved build system generator
-for CPython C/C++/Fortran/Cython extensions."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-]
-
-use_pip = True
-sanity_pip_check = True
-
-exts_list = [
-    ('distro', '1.6.0', {
-        'checksums': ['83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424'],
-    }),
-    (name, version, {
-        'modulename': 'skbuild',
-        'checksums': ['da40dfd69b2456fad1349a894b90180b43712152b8a85d2a00f4ae2ce8ac9a5c'],
-    }),
-]
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/s/scikit-image/scikit-image-0.18.1_fix-README-cache-perms.patch b/Golden_Repo/s/scikit-image/scikit-image-0.18.1_fix-README-cache-perms.patch
deleted file mode 100644
index 36ecc27d0..000000000
--- a/Golden_Repo/s/scikit-image/scikit-image-0.18.1_fix-README-cache-perms.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-only copy README.txt to $HOME/.cache/scikit-image (which is triggered by 'import skimage') if it doesn't exist yet
-see https://github.com/scikit-image/scikit-image/pull/5249
-
-diff --git a/skimage/data/__init__.py b/skimage/data/__init__.py
-index b8644d503e..18e80648b8 100644
---- a/skimage/data/__init__.py
-+++ b/skimage/data/__init__.py
-@@ -18,6 +18,7 @@
- 
- import os.path as osp
- import os
-+import stat
- 
- __all__ = ['data_dir',
-            'download_all',
-@@ -254,8 +255,17 @@ def _fetch(data_filename):
- 
- def _init_pooch():
-     os.makedirs(data_dir, exist_ok=True)
--    shutil.copy2(osp.join(skimage_distribution_dir, 'data', 'README.txt'),
--                 osp.join(data_dir, 'README.txt'))
-+
-+    # Copy in the README.txt if it doesn't already exist.
-+    # If the file was originally copied to the data cache directory read-only
-+    # then we cannot overwrite it, nor do we need to copy on every init.
-+    # In general, as the data cache directory contains the scikit-image version
-+    # it should not be necessary to overwrite this file as it should not
-+    # change.
-+    dest_path = osp.join(data_dir, 'README.txt')
-+    if not os.path.isfile(dest_path):
-+        shutil.copy2(osp.join(skimage_distribution_dir, 'data', 'README.txt'),
-+                     dest_path)
- 
-     data_base_dir = osp.join(data_dir, '..')
-     # Fetch all legacy data so that it is available by default
diff --git a/Golden_Repo/s/scikit-image/scikit-image-0.18.3-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/s/scikit-image/scikit-image-0.18.3-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index 3d18e4660..000000000
--- a/Golden_Repo/s/scikit-image/scikit-image-0.18.3-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,50 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'scikit-image'
-version = '0.18.3'
-
-homepage = 'https://scikit-image.org/'
-description = "scikit-image is a collection of algorithms for image processing."
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('matplotlib', '3.4.3'),
-    ('Pillow-SIMD', '9.0.1'),
-    ('dask', '2021.9.1'),
-]
-
-use_pip = True
-sanity_pip_check = True
-
-exts_list = [
-    ('PyWavelets', '1.1.1', {
-        'modulename': 'pywt',
-        'checksums': ['1a64b40f6acb4ffbaccce0545d7fc641744f95351f62e4c6aaa40549326008c9'],
-    }),
-    ('imageio', '2.9.0', {
-        'checksums': ['52ddbaeca2dccf53ba2d6dec5676ca7bc3b2403ef8b37f7da78b7654bb3e10f0'],
-    }),
-    ('imread', '0.7.4', {
-        'checksums': ['0487adef11a22168700968c1727020361a72f6132b6ced2b8826b02d8cbf744f'],
-    }),
-    ('pooch', '1.5.2', {
-        'checksums': ['5969b2f1defbdc405df932767e05e0b536e2771c27f1f95d7f260bc99bf13581'],
-    }),
-    ('tifffile', '2021.10.12', {
-        'checksums': ['0a78268a2d844af94929512d28b39bd1ea6fe46de4124103840b5fe4e1c555cd'],
-    }),
-    (name, version, {
-        'modulename': 'skimage',
-        'patches': ['scikit-image-0.18.1_fix-README-cache-perms.patch'],
-        'checksums': [
-            # scikit-image-0.18.3.tar.gz
-            'ecae99f93f4c5e9b1bf34959f4dc596c41f2f6b2fc407d9d9ddf85aebd3137ca',
-            # scikit-image-0.18.1_fix-README-cache-perms.patch
-            '3a941401231403808963d488aaf498a712c428c3b19a1752652be9972d82b7b8',
-        ],
-    }),
-]
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/s/scikit-learn/scikit-learn-1.0.1-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/s/scikit-learn/scikit-learn-1.0.1-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index 0a6ab481e..000000000
--- a/Golden_Repo/s/scikit-learn/scikit-learn-1.0.1-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,28 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'scikit-learn'
-version = '1.0.1'
-
-homepage = 'https://scikit-learn.org/stable/index.html'
-description = """Scikit-learn integrates machine learning algorithms in the tightly-knit scientific Python world,
-building upon numpy, scipy, and matplotlib. As a machine-learning module,
-it provides versatile tools for data mining and analysis in any field of science and engineering.
-It strives to be simple and efficient, accessible to everybody, and reusable in various contexts."""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-sources = [SOURCE_TAR_GZ]
-checksums = ['ac2ca9dbb754d61cfe1c83ba8483498ef951d29b93ec09d6f002847f210a99da']
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10')
-]
-
-use_pip = True
-download_dep_fail = True
-sanity_pip_check = True
-
-options = {'modulename': 'sklearn'}
-
-moduleclass = 'data'
diff --git a/Golden_Repo/s/scikit-optimize/scikit-optimize-0.9.0-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/s/scikit-optimize/scikit-optimize-0.9.0-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index 40a526c52..000000000
--- a/Golden_Repo/s/scikit-optimize/scikit-optimize-0.9.0-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,29 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'scikit-optimize'
-version = '0.9.0'
-
-homepage = 'https://scikit-optimize.github.io'
-description = """Scikit-Optimize, or skopt, is a simple and efficient library to minimize (very) expensive
- and noisy black-box functions."""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-sources = [SOURCE_TAR_GZ]
-checksums = ['77d8c9e64947fc9f5cc05bbc6aed7b8a9907871ae26fe11997fd67be90f26008']
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10'),
-    ('scikit-learn', '1.0.1'),
-    ('matplotlib', '3.4.3'),
-    ('pretty-yaml', '20.4.0'),
-]
-
-options = {'modulename': 'skopt'}
-
-download_dep_fail = True
-use_pip = True
-sanity_pip_check = True
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/s/scikit-uplift/scikit-uplift-0.4.0-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/s/scikit-uplift/scikit-uplift-0.4.0-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index 71aaeca51..000000000
--- a/Golden_Repo/s/scikit-uplift/scikit-uplift-0.4.0-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'scikit-uplift'
-version = '0.4.0'
-
-homepage = 'https://github.com/maks-sh/scikit-uplift'
-description = """
-scikit-uplift is a Python module for classic approaches for uplift modeling built on top of scikit-learn.
-Uplift prediction aims to estimate the causal impact of a treatment at the individual level.
-"""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10'),
-    ('scikit-learn', '1.0.1'),
-    ('matplotlib', '3.4.3'),
-    ('tqdm', '4.62.3'),
-]
-
-use_pip = True
-
-# pypi source has missing Readme.rst file, using github source instead
-exts_list = [
-    (name, version, {
-        'modulename': 'sklift',
-        'source_tmpl': 'v%(version)s.tar.gz',
-        'source_urls': ['https://github.com/maks-sh/scikit-uplift/archive'],
-        'checksums': ['1992f0ac54c9a96dd1a0c1c0ced1be2d020fca8e85c7e6118336ff882ea4987f'],
-    }),
-]
-
-sanity_pip_check = True
-
-moduleclass = 'data'
diff --git a/Golden_Repo/s/shpc/shpc-0.1.12-GCCcore-11.2.0.eb b/Golden_Repo/s/shpc/shpc-0.1.12-GCCcore-11.2.0.eb
deleted file mode 100644
index 32218b234..000000000
--- a/Golden_Repo/s/shpc/shpc-0.1.12-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,70 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'shpc'
-version = '0.1.12'
-
-homepage = 'https://github.com/singularityhub/singularity-hpc'
-
-description = """Local filesystem registry for containers (intended for HPC) using Lmod or
-Environement Modules. Works for users and admins."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-#
-# sources = ['%(version)s.tar.gz']
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('Apptainer-Tools', '2022'),
-]
-
-use_pip = True
-download_dep_fail = True
-
-exts_list = [
-    ('spython', '0.2.1', {
-        'checksums': ['beb8866751268ebbc38e05ee7d14d99a144f2a9b21409b16e3bcab9ebd452a19'],
-    }),
-    ('ruamel.yaml.clib', '0.2.6', {
-        'modulename': False,
-        'checksums': ['4ff604ce439abb20794f05613c374759ce10e3595d1867764dd1ae675b85acbd'],
-    }),
-    ('ruamel.yaml', '0.17.21', {
-        'checksums': ['8b7ce697a2f212752a35c1ac414471dc16c424c9573be4926b56ff3f5d23b7af'],
-    }),
-    (name, version, {
-        'source_urls': ['https://github.com/singularityhub/singularity-hpc/archive/refs/tags/'],
-        'sources': ['%(version)s.tar.gz'],
-        'checksums': ['cdbca4dc82799d61fb369fbaa9c0cdf2cc625f822c402fee28c60d21bb9d1634'],
-    }),
-]
-
-allow_prepend_abs_path = True
-
-postinstallcmds = [
-    'mkdir -p $HOME/easybuild/$SYSTEMNAME/modules/containers',
-]
-
-modluafooter = """
-prepend_path("MODULEPATH", pathJoin(os.getenv("HOME"), "easybuild", os.getenv("SYSTEMNAME"), "modules", "containers"))
-"""
-
-sanity_pip_check = True
-
-sanity_check_paths = {
-    'files': ['bin/shpc'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-# Shpc needs to be installed so it can be configured. So I have to do it on sanity_check
-# instead of postinstallcmds. In any case, those commands are equally valid as sanity check
-
-sanity_check_commands = [
-    "shpc config --central set module_base:$HOME/easybuild/$SYSTEMNAME/modules/containers",
-    "shpc config --central set container_base:$HOME/easybuild/$SYSTEMNAME/modules/containers",
-    "shpc config --central set container_features:gpu:nvidia",
-]
-
-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
deleted file mode 100644
index 365086c0f..000000000
--- a/Golden_Repo/s/snappy/snappy-1.1.9-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-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/s/spdlog/spdlog-1.9.2-GCCcore-11.2.0.eb b/Golden_Repo/s/spdlog/spdlog-1.9.2-GCCcore-11.2.0.eb
deleted file mode 100644
index 8d3b1bdfa..000000000
--- a/Golden_Repo/s/spdlog/spdlog-1.9.2-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,25 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'spdlog'
-version = '1.9.2'
-
-homepage = "https://github.com/gabime/spdlog"
-description = """Very fast, header-only/compiled, C++ logging library. 
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/gabime/spdlog/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['6fff9215f5cb81760be4cc16d033526d1080427d236e86d70bb02994f85e3d38']
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-    ('binutils', '2.37')
-]
-
-sanity_check_paths = {
-    'files': [],
-    'dirs': [('include', 'lib64')]
-}
diff --git a/Golden_Repo/s/spglib-python/spglib-python-1.16.1-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/s/spglib-python/spglib-python-1.16.1-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index 1e4437a69..000000000
--- a/Golden_Repo/s/spglib-python/spglib-python-1.16.1-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,27 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'spglib-python'
-version = '1.16.1'
-
-homepage = 'https://pypi.python.org/pypi/spglib'
-description = "Spglib for Python. Spglib is a library for finding and handling crystal symmetries written in C."
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-source_urls = ['https://pypi.python.org/packages/source/%(nameletter)s/spglib']
-sources = ['spglib-%(version)s.tar.gz']
-checksums = ['9fd2fefbd83993b135877a69c498d8ddcf20a9980562b65b800cfb4cdadad003']
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10'),
-]
-
-download_dep_fail = True
-use_pip = True
-
-sanity_pip_check = True
-
-options = {'modulename': 'spglib'}
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/s/sprng/sprng-1-examples.patch b/Golden_Repo/s/sprng/sprng-1-examples.patch
deleted file mode 100644
index ee34062e1..000000000
--- a/Golden_Repo/s/sprng/sprng-1-examples.patch
+++ /dev/null
@@ -1,498 +0,0 @@
---- sprng/EXAMPLES/Makefile	1998-05-22 16:56:59.000000000 +0200
-+++ sprng1_ok/EXAMPLES/Makefile	2021-12-14 16:50:17.116680451 +0100
-@@ -25,12 +25,18 @@
- ############################################################################
- 
- SHELL = /bin/sh
-+PLAT = GENERIC
-+MPIDEF = -DSPRNG_MPI
-+MPIDIR =
-+MPILIB =
-+
-+PMLCGDEF = -DUSE_PMLCG
-+GMP_ROOT = $(EBROOTGMP)
-+GMPLIB = -Wl,-Bstatic -Wl,--start-group -L$(GMP_ROOT)/lib -lgmp -Wl,--end-group -Wl,-Bdynamic
- 
--include ../make.CHOICES
- 
--LIBDIR  = ../$(LIB_REL_DIR)
--SRCDIR = ../SRC
--INCDIR = ../include
-+LIBDIR  = $(EBROOTSPRNG)/lib
-+INCDIR = $(EBROOTSPRNG)/include
- 
- # use 'lfg' to get Lagged Fibonacci, 'lcg' to get Linear Congruential, etc. 
- SPRNGLIB=lcg
-@@ -47,7 +53,23 @@
-         sprngf-simple_mpi fsprngf-simple_mpi seedf-simple_mpi \
-         messagef-simple_mpi pi-simple_mpi
- 
--include $(SRCDIR)/make.$(PLAT)
-+CC = mpicc
-+CLD = $(CC)
-+F77 = mpif77
-+F77LD = $(F77)
-+FFXN = -DAdd_
-+FSUFFIX = F
-+
-+MPIF77 = mpif77
-+MPICC = mpicc
-+
-+CFLAGS = -O3 -DLittleEndian $(PMLCGDEF) $(MPIDEF) -D$(PLAT)
-+CLDFLAGS =  -O3
-+
-+FFLAGS = -O2 $(PMLCGDEF) $(MPIDEF) -D$(PLAT) -DPOINTER_SIZE=8
-+F77LDFLAGS =  -O3 
-+
-+CPP = cpp -P  -DPOINTER_SIZE=8
- 
- serial : $(EX)
- 
-@@ -55,123 +77,123 @@
- 
- mpi : $(MPIEX)
- 
--simple-simple : simple-simple.c $(LIBDIR)/lib$(SPRNGLIB).a
-+simple-simple : simple-simple.c 
- 	$(CC) $(CFLAGS) -I$(INCDIR) -o simple-simple simple-simple.c -L$(LIBDIR) -l$(SPRNGLIB)
- 
--sprng : sprng.c $(LIBDIR)/lib$(SPRNGLIB).a
-+sprng : sprng.c 
- 	$(CC) $(CFLAGS) $(CHK) -I$(INCDIR) -o sprng sprng.c -L$(LIBDIR) -l$(SPRNGLIB)
- 
--sprng-simple : sprng-simple.c $(LIBDIR)/lib$(SPRNGLIB).a
-+sprng-simple : sprng-simple.c 
- 	$(CC) $(CFLAGS) -I$(INCDIR) -o sprng-simple sprng-simple.c -L$(LIBDIR) -l$(SPRNGLIB)
- 
--sprng-simple_mpi : sprng-simple_mpi.c $(LIBDIR)/lib$(SPRNGLIB).a
-+sprng-simple_mpi : sprng-simple_mpi.c 
- 	$(MPICC) $(CFLAGS) -I$(INCDIR) -o sprng-simple_mpi sprng-simple_mpi.c -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB)
- 
--sprng_mpi : sprng_mpi.c $(LIBDIR)/lib$(SPRNGLIB).a
-+sprng_mpi : sprng_mpi.c
- 	$(MPICC) $(CFLAGS) $(CHK) -I$(INCDIR) -o sprng_mpi sprng_mpi.c -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB)
- 
--fsprng_mpi : fsprng_mpi.c $(LIBDIR)/lib$(SPRNGLIB).a
-+fsprng_mpi : fsprng_mpi.c
- 	$(MPICC) $(CFLAGS) $(CHK) -I$(INCDIR) -o fsprng_mpi fsprng_mpi.c -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB)
- 
--fsprng-simple_mpi : fsprng-simple_mpi.c $(LIBDIR)/lib$(SPRNGLIB).a
-+fsprng-simple_mpi : fsprng-simple_mpi.c
- 	$(MPICC) $(CFLAGS) -I$(INCDIR) -o fsprng-simple_mpi fsprng-simple_mpi.c -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB)
- 
--2streams_mpi : 2streams_mpi.c $(LIBDIR)/lib$(SPRNGLIB).a
-+2streams_mpi : 2streams_mpi.c
- 	$(MPICC) $(CFLAGS) $(CHK) -I$(INCDIR) -o 2streams_mpi 2streams_mpi.c -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB)
- 
--seed : seed.c $(LIBDIR)/lib$(SPRNGLIB).a
-+seed : seed.c
- 	$(CC) $(CFLAGS) $(CHK) -I$(INCDIR) -o seed seed.c -L$(LIBDIR) -l$(SPRNGLIB)
- 
--seed-simple : seed-simple.c $(LIBDIR)/lib$(SPRNGLIB).a
-+seed-simple : seed-simple.c
- 	$(CC) $(CFLAGS) -I$(INCDIR) -o seed-simple seed-simple.c -L$(LIBDIR) -l$(SPRNGLIB)
- 
--seed_mpi : seed_mpi.c $(LIBDIR)/lib$(SPRNGLIB).a
-+seed_mpi : seed_mpi.c
- 	$(MPICC) $(CFLAGS) $(CHK) -I$(INCDIR) -o seed_mpi seed_mpi.c -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB)
- 
--seed-simple_mpi : seed-simple_mpi.c $(LIBDIR)/lib$(SPRNGLIB).a
-+seed-simple_mpi : seed-simple_mpi.c
- 	$(MPICC) $(CFLAGS) -I$(INCDIR) -o seed-simple_mpi seed-simple_mpi.c -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB)
- 
--checkpoint : checkpoint.c $(LIBDIR)/lib$(SPRNGLIB).a
-+checkpoint : checkpoint.c
- 	$(CC) $(CFLAGS) $(CHK) -I$(INCDIR) -o checkpoint checkpoint.c -L$(LIBDIR) -l$(SPRNGLIB)
- 
--checkpoint-simple : checkpoint-simple.c $(LIBDIR)/lib$(SPRNGLIB).a
-+checkpoint-simple : checkpoint-simple.c
- 	$(CC) $(CFLAGS) -I$(INCDIR) -o checkpoint-simple checkpoint-simple.c -L$(LIBDIR) -l$(SPRNGLIB)
- 
--message_mpi : message_mpi.c $(LIBDIR)/lib$(SPRNGLIB).a
-+message_mpi : message_mpi.c
- 	$(MPICC) $(CFLAGS) $(CHK) -I$(INCDIR) -o message_mpi message_mpi.c -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB)
- 
--message-simple_mpi : message-simple_mpi.c $(LIBDIR)/lib$(SPRNGLIB).a
-+message-simple_mpi : message-simple_mpi.c
- 	$(MPICC) $(CFLAGS) -I$(INCDIR) -o message-simple_mpi message-simple_mpi.c -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB)
- 
--pi-simple : pi-simple.c $(LIBDIR)/lib$(SPRNGLIB).a
-+pi-simple : pi-simple.c
- 	$(CC) $(CFLAGS) $(CHK) -I$(INCDIR) -o pi-simple pi-simple.c -L$(LIBDIR) -l$(SPRNGLIB) -lm
- 
--pi-simple_mpi : pi-simple_mpi.c $(LIBDIR)/lib$(SPRNGLIB).a
-+pi-simple_mpi : pi-simple_mpi.c
- 	$(MPICC) $(CFLAGS) -I$(INCDIR) -o pi-simple_mpi pi-simple_mpi.c -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB) -lm
- 
--spawn : spawn.c $(LIBDIR)/lib$(SPRNGLIB).a
-+spawn : spawn.c
- 	$(CC) $(CFLAGS) -DCHECK_POINTERS -I$(INCDIR) -o spawn spawn.c -L$(LIBDIR) -l$(SPRNGLIB)
- 
--invalid_ID : invalid_ID.c $(LIBDIR)/lib$(SPRNGLIB).a
-+invalid_ID : invalid_ID.c
- 	$(CC) $(CFLAGS) -DCHECK_POINTERS -I$(INCDIR) -o invalid_ID invalid_ID.c -L$(LIBDIR) -l$(SPRNGLIB)
- 
--sprngf : sprngf.$(FSUFFIX) $(LIBDIR)/lib$(SPRNGLIB).a
-+sprngf : sprngf.$(FSUFFIX)
- 	$(F77) $(FFLAGS)  -I$(INCDIR) -o sprngf  sprngf.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB)
- 
--sprngf_mpi : sprngf_mpi.$(FSUFFIX) $(LIBDIR)/lib$(SPRNGLIB).a
-+sprngf_mpi : sprngf_mpi.$(FSUFFIX)
- 	$(MPIF77) $(FFLAGS)  -I$(INCDIR) -o sprngf_mpi  sprngf_mpi.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB)
- 
--fsprngf_mpi : fsprngf_mpi.$(FSUFFIX) $(LIBDIR)/lib$(SPRNGLIB).a
-+fsprngf_mpi : fsprngf_mpi.$(FSUFFIX)
- 	$(MPIF77) $(FFLAGS)  -I$(INCDIR) -o fsprngf_mpi  fsprngf_mpi.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB)
- 
--seedf : seedf.$(FSUFFIX) $(LIBDIR)/lib$(SPRNGLIB).a
-+seedf : seedf.$(FSUFFIX)
- 	$(F77) $(FFLAGS)  -I$(INCDIR) -o seedf  seedf.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB)
- 
--seedf_mpi : seedf_mpi.$(FSUFFIX) $(LIBDIR)/lib$(SPRNGLIB).a
-+seedf_mpi : seedf_mpi.$(FSUFFIX)
- 	$(MPIF77) $(FFLAGS)  -I$(INCDIR) -o seedf_mpi  seedf_mpi.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB)
- 
--checkpointf : checkpointf.$(FSUFFIX) $(LIBDIR)/lib$(SPRNGLIB).a
-+checkpointf : checkpointf.$(FSUFFIX)
- 	$(F77) $(FFLAGS)  -I$(INCDIR) -o checkpointf  checkpointf.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB) $(CMDDIR) $(CMDLIB)
- 
--messagef_mpi : messagef_mpi.$(FSUFFIX) $(LIBDIR)/lib$(SPRNGLIB).a
-+messagef_mpi : messagef_mpi.$(FSUFFIX)
- 	$(MPIF77) $(FFLAGS)  -I$(INCDIR) -o messagef_mpi  messagef_mpi.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB)
- 
- 
--2streamsf_mpi : 2streamsf_mpi.$(FSUFFIX) $(LIBDIR)/lib$(SPRNGLIB).a
-+2streamsf_mpi : 2streamsf_mpi.$(FSUFFIX)
- 	$(MPIF77) $(FFLAGS)  -I$(INCDIR) -o 2streamsf_mpi  2streamsf_mpi.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB)
- 
--invalid_IDf : invalid_IDf.$(FSUFFIX) $(LIBDIR)/lib$(SPRNGLIB).a
-+invalid_IDf : invalid_IDf.$(FSUFFIX)
- 	$(F77) $(FFLAGS)  -I$(INCDIR) -o invalid_IDf  invalid_IDf.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB)
- 
--spawnf : spawnf.$(FSUFFIX) $(LIBDIR)/lib$(SPRNGLIB).a
-+spawnf : spawnf.$(FSUFFIX)
- 	$(F77) $(FFLAGS)  -I$(INCDIR) -o spawnf  spawnf.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB)
- 
- 
--simplef-simple : simplef-simple.$(FSUFFIX) $(LIBDIR)/lib$(SPRNGLIB).a
-+simplef-simple : simplef-simple.$(FSUFFIX)
- 	$(F77) $(FFLAGS)  -I$(INCDIR) -o simplef-simple  simplef-simple.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB)
- 
--sprngf-simple : sprngf-simple.$(FSUFFIX) $(LIBDIR)/lib$(SPRNGLIB).a
-+sprngf-simple : sprngf-simple.$(FSUFFIX)
- 	$(F77) $(FFLAGS)  -I$(INCDIR) -o sprngf-simple  sprngf-simple.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB)
- 
--sprngf-simple_mpi : sprngf-simple_mpi.$(FSUFFIX) $(LIBDIR)/lib$(SPRNGLIB).a
-+sprngf-simple_mpi : sprngf-simple_mpi.$(FSUFFIX)
- 	$(MPIF77) $(FFLAGS)  -I$(INCDIR) -o sprngf-simple_mpi  sprngf-simple_mpi.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB)
- 
--fsprngf-simple_mpi : fsprngf-simple_mpi.$(FSUFFIX) $(LIBDIR)/lib$(SPRNGLIB).a
-+fsprngf-simple_mpi : fsprngf-simple_mpi.$(FSUFFIX)
- 	$(MPIF77) $(FFLAGS)  -I$(INCDIR) -o fsprngf-simple_mpi  fsprngf-simple_mpi.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB)
- 
--seedf-simple : seedf-simple.$(FSUFFIX) $(LIBDIR)/lib$(SPRNGLIB).a
-+seedf-simple : seedf-simple.$(FSUFFIX)
- 	$(F77) $(FFLAGS)  -I$(INCDIR) -o seedf-simple  seedf-simple.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB)
- 
--seedf-simple_mpi : seedf-simple_mpi.$(FSUFFIX) $(LIBDIR)/lib$(SPRNGLIB).a
-+seedf-simple_mpi : seedf-simple_mpi.$(FSUFFIX)
- 	$(MPIF77) $(FFLAGS)  -I$(INCDIR) -o seedf-simple_mpi  seedf-simple_mpi.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB)
- 
--checkpointf-simple : checkpointf-simple.$(FSUFFIX) $(LIBDIR)/lib$(SPRNGLIB).a
-+checkpointf-simple : checkpointf-simple.$(FSUFFIX)
- 	$(F77) $(FFLAGS)  -I$(INCDIR) -o checkpointf-simple  checkpointf-simple.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB) $(CMDDIR) $(CMDLIB)
- 
--messagef-simple_mpi : messagef-simple_mpi.$(FSUFFIX) $(LIBDIR)/lib$(SPRNGLIB).a
-+messagef-simple_mpi : messagef-simple_mpi.$(FSUFFIX)
- 	$(MPIF77) $(FFLAGS)  -I$(INCDIR) -o messagef-simple_mpi  messagef-simple_mpi.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB)
- 
--pif-simple : pif-simple.$(FSUFFIX) $(LIBDIR)/lib$(SPRNGLIB).a
-+pif-simple : pif-simple.$(FSUFFIX)
- 	$(F77) $(FFLAGS)  -I$(INCDIR) -o pif-simple  pif-simple.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB) -lm
- 
- 
---- sprng/EXAMPLES/Makefile_gnu	1970-01-01 01:00:00.000000000 +0100
-+++ sprng1_ok/EXAMPLES/Makefile_gnu	2022-01-13 16:10:47.892067562 +0100
-@@ -0,0 +1,217 @@
-+############################################################################
-+# This is a sample make file to compile some example programs
-+#
-+# We have set variables giving information on the archiver, the C compiler 
-+# and the FORTRAN compiler for certain machines in files make.xxx, where xxx 
-+# is the machine name, set using the PLAT variable in ../make.CHOICES. 
-+#
-+# Then typing the command below    => results in the following being created
-+#      make                        => Same as: make serial.
-+#      make serial                 => Single processor examples.
-+#
-+#      make mpi                    => Examples using MPI
-+#
-+#      make all                    => Single processor and MPI examples.
-+#
-+#
-+# Object files created during the compilation process can be deleted 
-+# by typing
-+#       make clean
-+#
-+# Set 'LIBDIR' to the directory where the SPRNG libraries are. 
-+# Set 'INCDIR' to the directory where the SPRNG include files are. 
-+# We have already set these correctly, unless whoever installed the libraries
-+# changed the locations.
-+############################################################################
-+
-+SHELL = /bin/sh
-+PLAT = GENERIC
-+MPIDEF = -DSPRNG_MPI
-+MPIDIR =
-+MPILIB =
-+
-+PMLCGDEF = -DUSE_PMLCG
-+GMP_ROOT = $(EBROOTGMP)
-+GMPLIB = -Wl,-Bstatic -Wl,--start-group -L$(GMP_ROOT)/lib -lgmp -Wl,--end-group -Wl,-Bdynamic
-+
-+
-+LIBDIR  = $(EBROOTSPRNG)/lib
-+INCDIR = $(EBROOTSPRNG)/include
-+
-+# use 'lfg' to get Lagged Fibonacci, 'lcg' to get Linear Congruential, etc. 
-+SPRNGLIB=lcg
-+##########################################################################
-+
-+EX = sprng seed checkpoint invalid_ID sprng-simple simple-simple seed-simple \
-+     checkpoint-simple spawn sprngf seedf checkpointf invalid_IDf \
-+     spawnf sprngf-simple simplef-simple seedf-simple checkpointf-simple \
-+     pi-simple  pif-simple
-+
-+MPIEX = sprng_mpi fsprng_mpi 2streams_mpi seed_mpi message_mpi \
-+        sprng-simple_mpi fsprng-simple_mpi seed-simple_mpi message-simple_mpi \
-+        sprngf_mpi fsprngf_mpi seedf_mpi messagef_mpi 2streamsf_mpi  \
-+        sprngf-simple_mpi fsprngf-simple_mpi seedf-simple_mpi \
-+        messagef-simple_mpi pi-simple_mpi
-+
-+CC = mpicc
-+CLD = $(CC)
-+F77 = mpif77
-+F77LD = $(F77)
-+FFXN = -DAdd_
-+FSUFFIX = F
-+
-+MPIF77 = mpif77
-+MPICC = mpicc
-+
-+CFLAGS = -O3 -DLittleEndian $(PMLCGDEF) $(MPIDEF) -D$(PLAT)
-+CLDFLAGS =  -O3
-+
-+FFLAGS = -O2 $(PMLCGDEF) $(MPIDEF) -D$(PLAT) -DPOINTER_SIZE=8 --allow-argument-mismatch
-+F77LDFLAGS =  -O3 
-+
-+CPP = cpp -P  -DPOINTER_SIZE=8
-+
-+serial : $(EX)
-+
-+all: $(EX) $(MPIEX)
-+
-+mpi : $(MPIEX)
-+
-+simple-simple : simple-simple.c 
-+	$(CC) $(CFLAGS) -I$(INCDIR) -o simple-simple simple-simple.c -L$(LIBDIR) -l$(SPRNGLIB)
-+
-+sprng : sprng.c 
-+	$(CC) $(CFLAGS) $(CHK) -I$(INCDIR) -o sprng sprng.c -L$(LIBDIR) -l$(SPRNGLIB)
-+
-+sprng-simple : sprng-simple.c 
-+	$(CC) $(CFLAGS) -I$(INCDIR) -o sprng-simple sprng-simple.c -L$(LIBDIR) -l$(SPRNGLIB)
-+
-+sprng-simple_mpi : sprng-simple_mpi.c 
-+	$(MPICC) $(CFLAGS) -I$(INCDIR) -o sprng-simple_mpi sprng-simple_mpi.c -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB)
-+
-+sprng_mpi : sprng_mpi.c
-+	$(MPICC) $(CFLAGS) $(CHK) -I$(INCDIR) -o sprng_mpi sprng_mpi.c -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB)
-+
-+fsprng_mpi : fsprng_mpi.c
-+	$(MPICC) $(CFLAGS) $(CHK) -I$(INCDIR) -o fsprng_mpi fsprng_mpi.c -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB)
-+
-+fsprng-simple_mpi : fsprng-simple_mpi.c
-+	$(MPICC) $(CFLAGS) -I$(INCDIR) -o fsprng-simple_mpi fsprng-simple_mpi.c -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB)
-+
-+2streams_mpi : 2streams_mpi.c
-+	$(MPICC) $(CFLAGS) $(CHK) -I$(INCDIR) -o 2streams_mpi 2streams_mpi.c -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB)
-+
-+seed : seed.c
-+	$(CC) $(CFLAGS) $(CHK) -I$(INCDIR) -o seed seed.c -L$(LIBDIR) -l$(SPRNGLIB)
-+
-+seed-simple : seed-simple.c
-+	$(CC) $(CFLAGS) -I$(INCDIR) -o seed-simple seed-simple.c -L$(LIBDIR) -l$(SPRNGLIB)
-+
-+seed_mpi : seed_mpi.c
-+	$(MPICC) $(CFLAGS) $(CHK) -I$(INCDIR) -o seed_mpi seed_mpi.c -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB)
-+
-+seed-simple_mpi : seed-simple_mpi.c
-+	$(MPICC) $(CFLAGS) -I$(INCDIR) -o seed-simple_mpi seed-simple_mpi.c -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB)
-+
-+checkpoint : checkpoint.c
-+	$(CC) $(CFLAGS) $(CHK) -I$(INCDIR) -o checkpoint checkpoint.c -L$(LIBDIR) -l$(SPRNGLIB)
-+
-+checkpoint-simple : checkpoint-simple.c
-+	$(CC) $(CFLAGS) -I$(INCDIR) -o checkpoint-simple checkpoint-simple.c -L$(LIBDIR) -l$(SPRNGLIB)
-+
-+message_mpi : message_mpi.c
-+	$(MPICC) $(CFLAGS) $(CHK) -I$(INCDIR) -o message_mpi message_mpi.c -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB)
-+
-+message-simple_mpi : message-simple_mpi.c
-+	$(MPICC) $(CFLAGS) -I$(INCDIR) -o message-simple_mpi message-simple_mpi.c -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB)
-+
-+pi-simple : pi-simple.c
-+	$(CC) $(CFLAGS) $(CHK) -I$(INCDIR) -o pi-simple pi-simple.c -L$(LIBDIR) -l$(SPRNGLIB) -lm
-+
-+pi-simple_mpi : pi-simple_mpi.c
-+	$(MPICC) $(CFLAGS) -I$(INCDIR) -o pi-simple_mpi pi-simple_mpi.c -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB) -lm
-+
-+spawn : spawn.c
-+	$(CC) $(CFLAGS) -DCHECK_POINTERS -I$(INCDIR) -o spawn spawn.c -L$(LIBDIR) -l$(SPRNGLIB)
-+
-+invalid_ID : invalid_ID.c
-+	$(CC) $(CFLAGS) -DCHECK_POINTERS -I$(INCDIR) -o invalid_ID invalid_ID.c -L$(LIBDIR) -l$(SPRNGLIB)
-+
-+sprngf : sprngf.$(FSUFFIX)
-+	$(F77) $(FFLAGS)  -I$(INCDIR) -o sprngf  sprngf.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB)
-+
-+sprngf_mpi : sprngf_mpi.$(FSUFFIX)
-+	$(MPIF77) $(FFLAGS)  -I$(INCDIR) -o sprngf_mpi  sprngf_mpi.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB)
-+
-+fsprngf_mpi : fsprngf_mpi.$(FSUFFIX)
-+	$(MPIF77) $(FFLAGS)  -I$(INCDIR) -o fsprngf_mpi  fsprngf_mpi.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB)
-+
-+seedf : seedf.$(FSUFFIX)
-+	$(F77) $(FFLAGS)  -I$(INCDIR) -o seedf  seedf.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB)
-+
-+seedf_mpi : seedf_mpi.$(FSUFFIX)
-+	$(MPIF77) $(FFLAGS)  -I$(INCDIR) -o seedf_mpi  seedf_mpi.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB)
-+
-+checkpointf : checkpointf.$(FSUFFIX)
-+	$(F77) $(FFLAGS)  -I$(INCDIR) -o checkpointf  checkpointf.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB) $(CMDDIR) $(CMDLIB)
-+
-+messagef_mpi : messagef_mpi.$(FSUFFIX)
-+	$(MPIF77) $(FFLAGS)  -I$(INCDIR) -o messagef_mpi  messagef_mpi.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB)
-+
-+
-+2streamsf_mpi : 2streamsf_mpi.$(FSUFFIX)
-+	$(MPIF77) $(FFLAGS)  -I$(INCDIR) -o 2streamsf_mpi  2streamsf_mpi.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB)
-+
-+invalid_IDf : invalid_IDf.$(FSUFFIX)
-+	$(F77) $(FFLAGS)  -I$(INCDIR) -o invalid_IDf  invalid_IDf.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB)
-+
-+spawnf : spawnf.$(FSUFFIX)
-+	$(F77) $(FFLAGS)  -I$(INCDIR) -o spawnf  spawnf.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB)
-+
-+
-+simplef-simple : simplef-simple.$(FSUFFIX)
-+	$(F77) $(FFLAGS)  -I$(INCDIR) -o simplef-simple  simplef-simple.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB)
-+
-+sprngf-simple : sprngf-simple.$(FSUFFIX)
-+	$(F77) $(FFLAGS)  -I$(INCDIR) -o sprngf-simple  sprngf-simple.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB)
-+
-+sprngf-simple_mpi : sprngf-simple_mpi.$(FSUFFIX)
-+	$(MPIF77) $(FFLAGS)  -I$(INCDIR) -o sprngf-simple_mpi  sprngf-simple_mpi.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB)
-+
-+fsprngf-simple_mpi : fsprngf-simple_mpi.$(FSUFFIX)
-+	$(MPIF77) $(FFLAGS)  -I$(INCDIR) -o fsprngf-simple_mpi  fsprngf-simple_mpi.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB)
-+
-+seedf-simple : seedf-simple.$(FSUFFIX)
-+	$(F77) $(FFLAGS)  -I$(INCDIR) -o seedf-simple  seedf-simple.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB)
-+
-+seedf-simple_mpi : seedf-simple_mpi.$(FSUFFIX)
-+	$(MPIF77) $(FFLAGS)  -I$(INCDIR) -o seedf-simple_mpi  seedf-simple_mpi.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB)
-+
-+checkpointf-simple : checkpointf-simple.$(FSUFFIX)
-+	$(F77) $(FFLAGS)  -I$(INCDIR) -o checkpointf-simple  checkpointf-simple.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB) $(CMDDIR) $(CMDLIB)
-+
-+messagef-simple_mpi : messagef-simple_mpi.$(FSUFFIX)
-+	$(MPIF77) $(FFLAGS)  -I$(INCDIR) -o messagef-simple_mpi  messagef-simple_mpi.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB) $(MPIDIR) $(MPILIB)
-+
-+pif-simple : pif-simple.$(FSUFFIX)
-+	$(F77) $(FFLAGS)  -I$(INCDIR) -o pif-simple  pif-simple.$(FSUFFIX) -L$(LIBDIR) -l$(SPRNGLIB) -lm
-+
-+
-+.SUFFIXES : 
-+
-+.SUFFIXES : .f .F
-+
-+.F.f : 
-+	@if [ -f $*.i ] ; then \
-+	rm $*.i ;\
-+	fi 
-+	$(CPP) -I$(INCDIR) $*.F
-+	@if [ -f $*.i ] ; then \
-+	mv $*.i  $*.f ;\
-+	fi 
-+
-+clean :
-+	rm -f *.o
-+
-+realclean :
-+	rm -f *.o $(EX) $(MPIEX) *~ *.i core a.out
---- sprng/EXAMPLES/batchseq	1970-01-01 01:00:00.000000000 +0100
-+++ sprng1_ok/EXAMPLES/batchseq	2014-11-25 11:15:22.000000000 +0100
-@@ -0,0 +1,21 @@
-+./checkpoint < checkpoint.in >> checkpoint_out
-+./checkpoint-simple < checkpoint.in >> checkpoint-simple_out
-+./checkpointf < checkpoint.in >> checkpointf_out
-+./checkpointf-simple < checkpoint.in >> checkpointf-simple_out
-+./invalid_ID >> invalid_ID_out
-+./invalid_IDf >> invalid_IDf_out
-+./pi-simple < pi.in  >> pi-simple_out
-+./pif-simple < pi.in  >> pif-simple_out
-+./seed >> seed_out0
-+./seed-simple >> seed-simple_out
-+./seedf  >> seedf_out
-+./seed-simple >> seed-simple_out
-+./simple-simple >> simple-simple_out
-+./simplef-simple >> simplef-simple_out
-+./spawn >> spawn_out
-+./spawnf >> spawnf_out
-+./sprng  >> sprng_out
-+./sprng-simple >> sprng-simple_out
-+./sprngf >> sprngf_out
-+./sprngf-simple >> sprngf-simple_out
-+
---- sprng/EXAMPLES/batchmpi	1970-01-01 01:00:00.000000000 +0100
-+++ sprng1_ok/EXAMPLES/batchmpi	2015-08-06 10:07:07.000000000 +0200
-@@ -0,0 +1,25 @@
-+#!/bin/bash -x
-+#SBATCH --nodes=1
-+#SBATCH --ntasks=4
-+#SBATCH --time=00:10:00
-+#SBATCH --partition=batch
-+srun -n 4 ./2streams_mpi >> 2streams_mpi_out
-+srun -n 4 ./2streamsf_mpi >> 2streamsf_mpi_out
-+srun -n 4 ./fsprng_mpi >> fsprng_mpi_out
-+srun -n 4 ./fsprng-simple_mpi >> fsprng-simple_mpi_out
-+srun -n 4 ./fsprngf_mpi >> fsprngf_mpi_out
-+srun -n 4 ./fsprngf-simple_mpi >> fsprngf-simple_mpi_out
-+srun -n 4 ./message_mpi >> message_mpi_out
-+srun -n 4 ./message-simple_mpi >> message-simple_mpi_out0
-+srun -n 4 ./messagef_mpi >> messagef_mpi_out
-+srun -n 4 ./messagef_mpi >> messagef_mpi_out
-+srun -n 4 ./messagef-simple_mpi >> messagef-simple_mpi_out
-+srun -n 4 ./seed_mpi >> seed_mpi_out
-+srun -n 4 ./seed-simple_mpi >> seed-simple_mpi_out
-+srun -n 4 ./seedf_mpi >> seedf_mpi_out
-+srun -n 4 ./seedf-simple_mpi >> seedf-simple_mpi_out
-+srun -n 4 ./sprng_mpi >> sprng_mpi_out
-+srun -n 4 ./sprng-simple_mpi >> sprng-simple_mpi_out
-+srun -n 4 ./sprngf_mpi  >> sprngf_mpi_out
-+srun -n 4 ./sprngf-simple_mpi >> sprngf-simple_mpi_out
-+srun -n 4 ./pi-simple_mpi < pi.in  >> pi-simple_mpi_out
---- sprng/EXAMPLES/checkpoint.in	1970-01-01 01:00:00.000000000 +0100
-+++ sprng1_ok/EXAMPLES/checkpoint.in	2014-11-25 11:15:22.000000000 +0100
-@@ -0,0 +1,3 @@
-+outstr0
-+9
-+
---- sprng/EXAMPLES/pi.in	1970-01-01 01:00:00.000000000 +0100
-+++ sprng1_ok/EXAMPLES/pi.in	2014-11-25 11:15:22.000000000 +0100
-@@ -0,0 +1,4 @@
-+9
-+pi_store_0
-+10
-+
diff --git a/Golden_Repo/s/sprng/sprng-1-gompi-2021b.eb b/Golden_Repo/s/sprng/sprng-1-gompi-2021b.eb
deleted file mode 100644
index c44ded601..000000000
--- a/Golden_Repo/s/sprng/sprng-1-gompi-2021b.eb
+++ /dev/null
@@ -1,104 +0,0 @@
-easyblock = "MakeCp"
-
-name = 'sprng'
-version = '1'
-
-homepage = 'http://www.sprng.org/'
-description = """The Scalable Parallel Random Number Generators Library (SPRNG) version 1 has been installed as module in
-
-$EBROOTSPRNG or $SPRNG1_ROOT
-
-This version has a different library for each random number generator.
-"""
-
-examples = """
-Examples can be found in $EBROOTSPRNG/EXAMPLES
-To compile and execute the examples say
-
-cp -r $EBROOTSPRNG/EXAMPLES .
-make all
-
-and for execution:
-
-./batchseq  for the sequential examples
-./batchmpi on an interactive node for the parallel examples
-
-For more information read EXAMPLES/README and README
-"""
-
-toolchain = {'name': 'gompi', 'version': '2021b'}
-toolchainopts = {'optarch': True, 'usempi': True}
-
-source_urls = ['http://www.sprng.org/Version1.0']
-sources = ['sprng.tar.Z']
-patches = [
-    'sprng-%(version)s.patch',
-    'sprng-%(version)s-examples.patch',
-]
-checksums = [
-    '69f5dbab03c5350315c7b33cf12693c8d3feb36b5dbe32b245bd5fcd9bacc5a8',  # sprng.tar.Z
-    'dcbb3d03c185e1bc5a098db211c5c945df4b3773bb026172b14bb7f75aedeabf',  # sprng-1.patch
-    '70a1b07bd2ebb59bd1fcc61fdd2409d263c9b960c020ad89ea591c1894980d05',  # sprng-1-examples.patch
-]
-
-dependencies = [
-    ('GMP', '6.2.1')
-]
-
-files_to_copy = [
-    (['lib/libcmrg.a',
-      'lib/liblcg.a',
-      'lib/liblcg64.a',
-      'lib/liblfg.a',
-      'lib/libmlfg.a',
-      'lib/libsprngtest.a'],
-     'lib'),
-    (['include/interface.h',
-      'include/sprng.h',
-      'include/sprng_f.h'],
-     'include'),
-    (['EXAMPLES/README',
-      'EXAMPLES/*.c',
-      'EXAMPLES/*.C',
-      'EXAMPLES/*.F',
-      'EXAMPLES/batch*',
-      'EXAMPLES/*in',
-      'EXAMPLES/Makefile_gnu'],
-     'EXAMPLES'),
-    (['DOCS/README',
-      'DOCS/sprng.html.tar.Z'],
-     'DOCS'),
-    (['README',
-      'VERSION',
-      'CHANGES.TEXT'],
-     'share')
-]
-
-sanity_check_paths = {
-    'files': ["lib/libcmrg.a", "lib/liblcg.a", "lib/liblcg64.a", "lib/liblfg.a", "lib/libmlfg.a", "lib/libsprngtest.a"],
-    'dirs': ["include"],
-}
-
-postinstallcmds = [
-    "chmod 644 %(installdir)s/EXAMPLES/README",
-    "chmod 644 %(installdir)s/EXAMPLES/Makefile_gnu",
-    "chmod 644 %(installdir)s/EXAMPLES/*.c",
-    "chmod 644 %(installdir)s/EXAMPLES/*.C",
-    "chmod 644 %(installdir)s/EXAMPLES/*.F",
-    "chmod 644 %(installdir)s/EXAMPLES/*in",
-    "chmod 755 %(installdir)s/EXAMPLES/batch*",
-    "chmod 644 %(installdir)s/include/*",
-    "chmod 644 %(installdir)s/share/*",
-    "chmod 644 %(installdir)s/DOCS/*",
-    "rm %(installdir)s/EXAMPLES/*.orig"
-]
-
-modextravars = {
-    'SPRNG1_ROOT': '%(installdir)s',
-    'SPRNG1_LIB': '%(installdir)s/lib',
-    'SPRNG1_INCLUDE': '%(installdir)s/include'
-}
-
-parallel = 1
-
-moduleclass = 'math'
diff --git a/Golden_Repo/s/sprng/sprng-1-gpsmpi-2021b.eb b/Golden_Repo/s/sprng/sprng-1-gpsmpi-2021b.eb
deleted file mode 100644
index f71d2771f..000000000
--- a/Golden_Repo/s/sprng/sprng-1-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,104 +0,0 @@
-easyblock = "MakeCp"
-
-name = 'sprng'
-version = '1'
-
-homepage = 'http://www.sprng.org/'
-description = """The Scalable Parallel Random Number Generators Library (SPRNG) version 1 has been installed as module in
-
-$EBROOTSPRNG or $SPRNG1_ROOT
-
-This version has a different library for each random number generator.
-"""
-
-examples = """
-Examples can be found in $EBROOTSPRNG/EXAMPLES
-To compile and execute the examples say
-
-cp -r $EBROOTSPRNG/EXAMPLES .
-make all
-
-and for execution:
-
-./batchseq  for the sequential examples
-./batchmpi on an interactive node for the parallel examples
-
-For more information read EXAMPLES/README and README
-"""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-toolchainopts = {'optarch': True, 'usempi': True}
-
-source_urls = ['http://www.sprng.org/Version1.0']
-sources = ['sprng.tar.Z']
-patches = [
-    'sprng-%(version)s.patch',
-    'sprng-%(version)s-examples.patch',
-]
-checksums = [
-    '69f5dbab03c5350315c7b33cf12693c8d3feb36b5dbe32b245bd5fcd9bacc5a8',  # sprng.tar.Z
-    'dcbb3d03c185e1bc5a098db211c5c945df4b3773bb026172b14bb7f75aedeabf',  # sprng-1.patch
-    '70a1b07bd2ebb59bd1fcc61fdd2409d263c9b960c020ad89ea591c1894980d05',  # sprng-1-examples.patch
-]
-
-dependencies = [
-    ('GMP', '6.2.1')
-]
-
-files_to_copy = [
-    (['lib/libcmrg.a',
-      'lib/liblcg.a',
-      'lib/liblcg64.a',
-      'lib/liblfg.a',
-      'lib/libmlfg.a',
-      'lib/libsprngtest.a'],
-     'lib'),
-    (['include/interface.h',
-      'include/sprng.h',
-      'include/sprng_f.h'],
-     'include'),
-    (['EXAMPLES/README',
-      'EXAMPLES/*.c',
-      'EXAMPLES/*.C',
-      'EXAMPLES/*.F',
-      'EXAMPLES/batch*',
-      'EXAMPLES/*in',
-      'EXAMPLES/Makefile_gnu'],
-     'EXAMPLES'),
-    (['DOCS/README',
-      'DOCS/sprng.html.tar.Z'],
-     'DOCS'),
-    (['README',
-      'VERSION',
-      'CHANGES.TEXT'],
-     'share')
-]
-
-sanity_check_paths = {
-    'files': ["lib/libcmrg.a", "lib/liblcg.a", "lib/liblcg64.a", "lib/liblfg.a", "lib/libmlfg.a", "lib/libsprngtest.a"],
-    'dirs': ["include"],
-}
-
-postinstallcmds = [
-    "chmod 644 %(installdir)s/EXAMPLES/README",
-    "chmod 644 %(installdir)s/EXAMPLES/Makefile_gnu",
-    "chmod 644 %(installdir)s/EXAMPLES/*.c",
-    "chmod 644 %(installdir)s/EXAMPLES/*.C",
-    "chmod 644 %(installdir)s/EXAMPLES/*.F",
-    "chmod 644 %(installdir)s/EXAMPLES/*in",
-    "chmod 755 %(installdir)s/EXAMPLES/batch*",
-    "chmod 644 %(installdir)s/include/*",
-    "chmod 644 %(installdir)s/share/*",
-    "chmod 644 %(installdir)s/DOCS/*",
-    "rm %(installdir)s/EXAMPLES/*.orig"
-]
-
-modextravars = {
-    'SPRNG1_ROOT': '%(installdir)s',
-    'SPRNG1_LIB': '%(installdir)s/lib',
-    'SPRNG1_INCLUDE': '%(installdir)s/include'
-}
-
-parallel = 1
-
-moduleclass = 'math'
diff --git a/Golden_Repo/s/sprng/sprng-1-iimpi-2021b.eb b/Golden_Repo/s/sprng/sprng-1-iimpi-2021b.eb
deleted file mode 100644
index e6a6e9520..000000000
--- a/Golden_Repo/s/sprng/sprng-1-iimpi-2021b.eb
+++ /dev/null
@@ -1,104 +0,0 @@
-easyblock = "MakeCp"
-
-name = 'sprng'
-version = '1'
-
-homepage = 'http://www.sprng.org/'
-description = """The Scalable Parallel Random Number Generators Library (SPRNG) version 1 has been installed as module in
-
-$EBROOTSPRNG or $SPRNG1_ROOT
-
-This version has a different library for each random number generator.
-"""
-
-examples = """
-Examples can be found in $EBROOTSPRNG/EXAMPLES
-To compile and execute the examples say
-
-cp -r $EBROOTSPRNG/EXAMPLES .
-make all
-
-and for execution:
-
-./batchseq  for the sequential examples
-./batchmpi on an interactive node for the parallel examples
-
-For more information read EXAMPLES/README and README
-"""
-
-toolchain = {'name': 'iimpi', 'version': '2021b'}
-toolchainopts = {'optarch': True, 'usempi': True}
-
-source_urls = ['http://www.sprng.org/Version1.0']
-sources = ['sprng.tar.Z']
-patches = [
-    'sprng-%(version)s.patch',
-    'sprng-%(version)s-examples.patch',
-]
-checksums = [
-    '69f5dbab03c5350315c7b33cf12693c8d3feb36b5dbe32b245bd5fcd9bacc5a8',  # sprng.tar.Z
-    'dcbb3d03c185e1bc5a098db211c5c945df4b3773bb026172b14bb7f75aedeabf',  # sprng-1.patch
-    '70a1b07bd2ebb59bd1fcc61fdd2409d263c9b960c020ad89ea591c1894980d05',  # sprng-1-examples.patch
-]
-
-dependencies = [
-    ('GMP', '6.2.1')
-]
-
-files_to_copy = [
-    (['lib/libcmrg.a',
-      'lib/liblcg.a',
-      'lib/liblcg64.a',
-      'lib/liblfg.a',
-      'lib/libmlfg.a',
-      'lib/libsprngtest.a'],
-     'lib'),
-    (['include/interface.h',
-      'include/sprng.h',
-      'include/sprng_f.h'],
-     'include'),
-    (['EXAMPLES/README',
-      'EXAMPLES/*.c',
-      'EXAMPLES/*.C',
-      'EXAMPLES/*.F',
-      'EXAMPLES/batch*',
-      'EXAMPLES/*in',
-      'EXAMPLES/Makefile'],
-     'EXAMPLES'),
-    (['DOCS/README',
-      'DOCS/sprng.html.tar.Z'],
-     'DOCS'),
-    (['README',
-      'VERSION',
-      'CHANGES.TEXT'],
-     'share')
-]
-
-sanity_check_paths = {
-    'files': ["lib/libcmrg.a", "lib/liblcg.a", "lib/liblcg64.a", "lib/liblfg.a", "lib/libmlfg.a", "lib/libsprngtest.a"],
-    'dirs': ["include"],
-}
-
-postinstallcmds = [
-    "chmod 644 %(installdir)s/EXAMPLES/README",
-    "chmod 644 %(installdir)s/EXAMPLES/Makefile",
-    "chmod 644 %(installdir)s/EXAMPLES/*.c",
-    "chmod 644 %(installdir)s/EXAMPLES/*.C",
-    "chmod 644 %(installdir)s/EXAMPLES/*.F",
-    "chmod 644 %(installdir)s/EXAMPLES/*in",
-    "chmod 755 %(installdir)s/EXAMPLES/batch*",
-    "chmod 644 %(installdir)s/include/*",
-    "chmod 644 %(installdir)s/share/*",
-    "chmod 644 %(installdir)s/DOCS/*",
-    "rm %(installdir)s/EXAMPLES/*.orig"
-]
-
-modextravars = {
-    'SPRNG1_ROOT': '%(installdir)s',
-    'SPRNG1_LIB': '%(installdir)s/lib',
-    'SPRNG1_INCLUDE': '%(installdir)s/include'
-}
-
-parallel = 1
-
-moduleclass = 'math'
diff --git a/Golden_Repo/s/sprng/sprng-1-iompi-2021b.eb b/Golden_Repo/s/sprng/sprng-1-iompi-2021b.eb
deleted file mode 100644
index 115c0fec2..000000000
--- a/Golden_Repo/s/sprng/sprng-1-iompi-2021b.eb
+++ /dev/null
@@ -1,104 +0,0 @@
-easyblock = "MakeCp"
-
-name = 'sprng'
-version = '1'
-
-homepage = 'http://www.sprng.org/'
-description = """The Scalable Parallel Random Number Generators Library (SPRNG) version 1 has been installed as module in
-
-$EBROOTSPRNG or $SPRNG1_ROOT
-
-This version has a different library for each random number generator.
-"""
-
-examples = """
-Examples can be found in $EBROOTSPRNG/EXAMPLES
-To compile and execute the examples say
-
-cp -r $EBROOTSPRNG/EXAMPLES .
-make all
-
-and for execution:
-
-./batchseq  for the sequential examples
-./batchmpi on an interactive node for the parallel examples
-
-For more information read EXAMPLES/README and README
-"""
-
-toolchain = {'name': 'iompi', 'version': '2021b'}
-toolchainopts = {'optarch': True, 'usempi': True}
-
-source_urls = ['http://www.sprng.org/Version1.0']
-sources = ['sprng.tar.Z']
-patches = [
-    'sprng-%(version)s.patch',
-    'sprng-%(version)s-examples.patch',
-]
-checksums = [
-    '69f5dbab03c5350315c7b33cf12693c8d3feb36b5dbe32b245bd5fcd9bacc5a8',  # sprng.tar.Z
-    'dcbb3d03c185e1bc5a098db211c5c945df4b3773bb026172b14bb7f75aedeabf',  # sprng-1.patch
-    '70a1b07bd2ebb59bd1fcc61fdd2409d263c9b960c020ad89ea591c1894980d05',  # sprng-1-examples.patch
-]
-
-dependencies = [
-    ('GMP', '6.2.1')
-]
-
-files_to_copy = [
-    (['lib/libcmrg.a',
-      'lib/liblcg.a',
-      'lib/liblcg64.a',
-      'lib/liblfg.a',
-      'lib/libmlfg.a',
-      'lib/libsprngtest.a'],
-     'lib'),
-    (['include/interface.h',
-      'include/sprng.h',
-      'include/sprng_f.h'],
-     'include'),
-    (['EXAMPLES/README',
-      'EXAMPLES/*.c',
-      'EXAMPLES/*.C',
-      'EXAMPLES/*.F',
-      'EXAMPLES/batch*',
-      'EXAMPLES/*in',
-      'EXAMPLES/Makefile'],
-     'EXAMPLES'),
-    (['DOCS/README',
-      'DOCS/sprng.html.tar.Z'],
-     'DOCS'),
-    (['README',
-      'VERSION',
-      'CHANGES.TEXT'],
-     'share')
-]
-
-sanity_check_paths = {
-    'files': ["lib/libcmrg.a", "lib/liblcg.a", "lib/liblcg64.a", "lib/liblfg.a", "lib/libmlfg.a", "lib/libsprngtest.a"],
-    'dirs': ["include"],
-}
-
-postinstallcmds = [
-    "chmod 644 %(installdir)s/EXAMPLES/README",
-    "chmod 644 %(installdir)s/EXAMPLES/Makefile",
-    "chmod 644 %(installdir)s/EXAMPLES/*.c",
-    "chmod 644 %(installdir)s/EXAMPLES/*.C",
-    "chmod 644 %(installdir)s/EXAMPLES/*.F",
-    "chmod 644 %(installdir)s/EXAMPLES/*in",
-    "chmod 755 %(installdir)s/EXAMPLES/batch*",
-    "chmod 644 %(installdir)s/include/*",
-    "chmod 644 %(installdir)s/share/*",
-    "chmod 644 %(installdir)s/DOCS/*",
-    "rm %(installdir)s/EXAMPLES/*.orig"
-]
-
-modextravars = {
-    'SPRNG1_ROOT': '%(installdir)s',
-    'SPRNG1_LIB': '%(installdir)s/lib',
-    'SPRNG1_INCLUDE': '%(installdir)s/include'
-}
-
-parallel = 1
-
-moduleclass = 'math'
diff --git a/Golden_Repo/s/sprng/sprng-1-ipsmpi-2021b.eb b/Golden_Repo/s/sprng/sprng-1-ipsmpi-2021b.eb
deleted file mode 100644
index 87670acd4..000000000
--- a/Golden_Repo/s/sprng/sprng-1-ipsmpi-2021b.eb
+++ /dev/null
@@ -1,104 +0,0 @@
-easyblock = "MakeCp"
-
-name = 'sprng'
-version = '1'
-
-homepage = 'http://www.sprng.org/'
-description = """The Scalable Parallel Random Number Generators Library (SPRNG) version 1 has been installed as module in
-
-$EBROOTSPRNG or $SPRNG1_ROOT
-
-This version has a different library for each random number generator.
-"""
-
-examples = """
-Examples can be found in $EBROOTSPRNG/EXAMPLES
-To compile and execute the examples say
-
-cp -r $EBROOTSPRNG/EXAMPLES .
-make all
-
-and for execution:
-
-./batchseq  for the sequential examples
-./batchmpi on an interactive node for the parallel examples
-
-For more information read EXAMPLES/README and README
-"""
-
-toolchain = {'name': 'ipsmpi', 'version': '2021b'}
-toolchainopts = {'optarch': True, 'usempi': True}
-
-source_urls = ['http://www.sprng.org/Version1.0']
-sources = ['sprng.tar.Z']
-patches = [
-    'sprng-%(version)s.patch',
-    'sprng-%(version)s-examples.patch',
-]
-checksums = [
-    '69f5dbab03c5350315c7b33cf12693c8d3feb36b5dbe32b245bd5fcd9bacc5a8',  # sprng.tar.Z
-    'dcbb3d03c185e1bc5a098db211c5c945df4b3773bb026172b14bb7f75aedeabf',  # sprng-1.patch
-    '70a1b07bd2ebb59bd1fcc61fdd2409d263c9b960c020ad89ea591c1894980d05',  # sprng-1-examples.patch
-]
-
-dependencies = [
-    ('GMP', '6.2.1')
-]
-
-files_to_copy = [
-    (['lib/libcmrg.a',
-      'lib/liblcg.a',
-      'lib/liblcg64.a',
-      'lib/liblfg.a',
-      'lib/libmlfg.a',
-      'lib/libsprngtest.a'],
-     'lib'),
-    (['include/interface.h',
-      'include/sprng.h',
-      'include/sprng_f.h'],
-     'include'),
-    (['EXAMPLES/README',
-      'EXAMPLES/*.c',
-      'EXAMPLES/*.C',
-      'EXAMPLES/*.F',
-      'EXAMPLES/batch*',
-      'EXAMPLES/*in',
-      'EXAMPLES/Makefile'],
-     'EXAMPLES'),
-    (['DOCS/README',
-      'DOCS/sprng.html.tar.Z'],
-     'DOCS'),
-    (['README',
-      'VERSION',
-      'CHANGES.TEXT'],
-     'share')
-]
-
-sanity_check_paths = {
-    'files': ["lib/libcmrg.a", "lib/liblcg.a", "lib/liblcg64.a", "lib/liblfg.a", "lib/libmlfg.a", "lib/libsprngtest.a"],
-    'dirs': ["include"],
-}
-
-postinstallcmds = [
-    "chmod 644 %(installdir)s/EXAMPLES/README",
-    "chmod 644 %(installdir)s/EXAMPLES/Makefile",
-    "chmod 644 %(installdir)s/EXAMPLES/*.c",
-    "chmod 644 %(installdir)s/EXAMPLES/*.C",
-    "chmod 644 %(installdir)s/EXAMPLES/*.F",
-    "chmod 644 %(installdir)s/EXAMPLES/*in",
-    "chmod 755 %(installdir)s/EXAMPLES/batch*",
-    "chmod 644 %(installdir)s/include/*",
-    "chmod 644 %(installdir)s/share/*",
-    "chmod 644 %(installdir)s/DOCS/*",
-    "rm %(installdir)s/EXAMPLES/*.orig"
-]
-
-modextravars = {
-    'SPRNG1_ROOT': '%(installdir)s',
-    'SPRNG1_LIB': '%(installdir)s/lib',
-    'SPRNG1_INCLUDE': '%(installdir)s/include'
-}
-
-parallel = 1
-
-moduleclass = 'math'
diff --git a/Golden_Repo/s/sprng/sprng-1.patch b/Golden_Repo/s/sprng/sprng-1.patch
deleted file mode 100644
index 223d18cdc..000000000
--- a/Golden_Repo/s/sprng/sprng-1.patch
+++ /dev/null
@@ -1,111 +0,0 @@
---- sprng/make.CHOICES	1998-05-28 16:55:52.000000000 +0200
-+++ sprng1_ok/make.CHOICES	2015-08-06 09:33:55.362818441 +0200
-@@ -24,12 +24,19 @@
- #PLAT = HP
- #PLAT = LINUX
- #PLAT = O2K
--PLAT  = SGI
-+#PLAT  = SGI
- #PLAT = SOLARIS
- #PLAT = SP2		# IBM SP2
- #PLAT = SUN
- # For T3D, Use PLAT=T3E instead
- #PLAT =  T3E
--#PLAT  = GENERIC
-+PLAT  = GENERIC
- 
- LIB_REL_DIR = lib
-+
-+PMLCGDEF = -DUSE_PMLCG
-+#GMP_ROOT = /usr/local/software/jureca/Stage3/software/Toolchain/intel-para/2015.07/GMP/6.0.0a
-+GMP_ROOT = $(EBROOTGMP)
-+GMPLIB = -Wl,-Bstatic -Wl,--start-group -L$(GMP_ROOT)/lib -lgmp -Wl,--end-group -Wl,-Bdynamic
-+
-+MPIDEF = -DSPRNG_MPI
---- sprng/SRC/make.GENERIC	1998-07-03 20:33:16.000000000 +0200
-+++ sprng1_ok/SRC/make.GENERIC	2014-11-25 12:58:53.000000000 +0100
-@@ -1,36 +1,35 @@
- AR = ar
--ARFLAGS = cr
--#If your system has ranlib, then replace next statement with the one after it.
--RANLIB = echo
--#RANLIB = ranlib
--CC = gcc
-+ARFLAGS = -cr
-+#If your system does not have ranlib, then replace next statement with 
-+#RANLIB = echo
-+RANLIB = ranlib
-+CC = mpicc
- CLD = $(CC)
--F77 = f77
-+# Set f77 to echo if you do not have a FORTRAN compiler
-+F77 = mpif77
-+#F77 = echo
- F77LD = $(F77)
--FFXN =  -DAdd_
-+FFXN = -DAdd_
- FSUFFIX = F
- 
--MPIF77 = $(F77) 
--MPICC = $(CC)
-+MPIF77 = mpif77
-+MPICC = mpicc
- 
- # To use MPI, set the MPIDIR to location of mpi library, and MPILIB 
- # to name of mpi library. Remove # signs from beginning of next 3 lines.
- # Also, if the previous compilation was without MPI, type: make realclean
- # before compiling for mpi.
- #
--#MPIDEF = -DSPRNG_MPI #Only if you plan to use MPI
--MPIDIR = 
--MPILIB = 
--
--# If _LONG_LONG type is available, then you can use the addition flag
--# -D_LONG_LONG. Set F77 to echo to compile the C version alone. 
--# Try adding: -DGENERIC to CFLAGS. This can improve speed, but may give
--# incorrect values. Check with 'checksprng' to see if it works.
--
--CFLAGS = -O $(MPIDEF)
--CLDFLAGS = -O
--FFLAGS = -O $(MPIDEF)
--F77LDFLAGS = -O
--
--CPP = f77 -F
-+# COMMENTED BY ME
-+#MPIDIR = -L/usr/local/mpi/build/LINUX/ch_p4/lib
-+#MPILIB = -lmpich
-+
-+# Please include mpi header file path, if needed
-+
-+CFLAGS = -O3 -DLittleEndian $(PMLCGDEF) $(MPIDEF) -D$(PLAT)  
-+CLDFLAGS =  -O3
-+#FFLAGS = -O3 $(PMLCGDEF) $(MPIDEF) -D$(PLAT)  -I/usr/local/mpi/include -I/usr/local/mpi/build/LINUX/ch_p4/include -I.
-+FFLAGS = -O2 $(PMLCGDEF) $(MPIDEF) -D$(PLAT) -DPOINTER_SIZE=8
-+F77LDFLAGS =  -O3 
- 
-+CPP = cpp -P  -DPOINTER_SIZE=8
---- sprng/Makefile	1998-03-23 21:45:33.000000000 +0100
-+++ sprng1_ok/Makefile	2014-11-28 16:08:51.000000000 +0100
-@@ -24,17 +24,18 @@
- 
- include $(SRCDIR)/make.$(PLAT)
- 
--all : src examples tests
-+#all : src examples tests
-+all : src tests
- 
- #---------------------------------------------------------------------------
- src :
--	(cd SRC; $(MAKE) LIBDIR=../$(LIBDIR) SRCDIR=../$(SRCDIR) PLAT=$(PLAT); cd ..)
-+	(cd SRC; $(MAKE) PLAT=$(PLAT); cd ..)
- 
- examples : 
--	(cd EXAMPLES; $(MAKE) LIBDIR=../$(LIBDIR) SRCDIR=../$(SRCDIR) PLAT=$(PLAT))
-+	(cd EXAMPLES; $(MAKE) all PLAT=$(PLAT))
- 
- tests : 
--	(cd TESTS; $(MAKE) LIBDIR=../$(LIBDIR) SRCDIR=../$(SRCDIR) PLAT=$(PLAT))
-+	(cd TESTS; $(MAKE) PLAT=$(PLAT) BASE=foo LIB=bar)
- 
- #---------------------------------------------------------------------------
- clean :
diff --git a/Golden_Repo/s/sprng/sprng-5-10062021-examples.patch b/Golden_Repo/s/sprng/sprng-5-10062021-examples.patch
deleted file mode 100644
index e4ebe1ba3..000000000
--- a/Golden_Repo/s/sprng/sprng-5-10062021-examples.patch
+++ /dev/null
@@ -1,533 +0,0 @@
---- sprng5/configure	2021-06-08 18:40:23.000000000 +0200
-+++ sprng5_ok/configure	2021-12-09 11:47:35.147329875 +0100
-@@ -6530,7 +6530,7 @@
- 
- if test $use_mpi = y; then
-   MPI_DEF="-DSPRNG_MPI"
--  MPI_CXXLIB="-lmpi_cxx"
-+  MPI_CXXLIB=""
- else
-   MPI_DEF=""
-   MPI_CXXLIB=""
---- sprng5/EXAMPLES/Makefile_gnu	1970-01-01 01:00:00.000000000 +0100
-+++ sprng5_ok/EXAMPLES/Makefile_gnu	2021-12-09 11:49:05.099996000 +0100
-@@ -0,0 +1,60 @@
-+#####
-+
-+SHELL = /bin/sh
-+MPIDEF = -DSPRNG_MPI
-+
-+CC = mpicc
-+CLD = $(CC)
-+F77 = mpif90
-+F77LD = $(F77)
-+FFXN = -DAdd_
-+FSUFFIX = F
-+CXX = mpicxx
-+CXXLD = $(CXX)
-+
-+DEFS = -DHAVE_CONFIG_H -DLONG64=long
-+CFLAGS = -O3 -DLittleEndian $(MPIDEF)
-+CLDFLAGS =  -O3
-+
-+FFLAGS = -O2 $(MPIDEF) -DPOINTER_SIZE=8 -DLONG64=long -DINTEGER_STAR_8
-+F77LDFLAGS =  -O3 
-+
-+CPP = cpp -P  -DPOINTER_SIZE=8
-+
-+LIBDIR  = $(EBROOTSPRNG)/lib
-+INCDIR = $(EBROOTSPRNG)/include
-+
-+##########################################################################
-+
-+EX = sprng seed sprng-simple simple-simple seed-simple \
-+     spawn convert displaybytes pi-simple
-+
-+all : $(EX)
-+
-+sprng : sprng.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o sprng sprng.cpp -L$(LIBDIR) -lsprng
-+
-+seed : seed.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o seed seed.cpp -L$(LIBDIR) -lsprng
-+
-+sprng-simple : sprng-simple.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o sprng-simple sprng-simple.cpp -L$(LIBDIR) -lsprng
-+
-+simple-simple : simple-simple.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o simple-simple simple-simple.cpp -L$(LIBDIR) -lsprng
-+
-+seed-simple : seed-simple.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o seed-simple seed-simple.cpp -L$(LIBDIR) -lsprng
-+
-+spawn : spawn.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o spawn spawn.cpp -L$(LIBDIR) -lsprng
-+
-+convert : convert.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o convert convert.cpp -L$(LIBDIR) -lsprng
-+
-+displaybytes : displaybytes.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o displaybytes displaybytes.cpp -L$(LIBDIR) -lsprng
-+
-+pi-simple : pi-simple.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o pi-simple pi-simple.cpp -L$(LIBDIR) -lsprng
-+
---- sprng5/EXAMPLES/Makefile_Intel	1970-01-01 01:00:00.000000000 +0100
-+++ sprng5_ok/EXAMPLES/Makefile_Intel	2021-12-17 15:03:49.365999000 +0100
-@@ -0,0 +1,60 @@
-+#####
-+
-+SHELL = /bin/sh
-+MPIDEF = -DSPRNG_MPI
-+
-+CC = mpicc
-+CLD = $(CC)
-+F77 = mpif90
-+F77LD = $(F77)
-+FFXN = -DAdd_
-+FSUFFIX = F
-+CXX = mpicxx
-+CXXLD = $(CXX)
-+
-+DEFS = -DHAVE_CONFIG_H -DLONG64=long
-+CFLAGS = -O3 -DLittleEndian $(MPIDEF)
-+CLDFLAGS =  -O3
-+
-+FFLAGS = -O2 $(MPIDEF) -DPOINTER_SIZE=8 -DLONG64=long -DINTEGER_STAR_8
-+F77LDFLAGS =  -O3 
-+
-+CPP = cpp -P  -DPOINTER_SIZE=8
-+
-+LIBDIR  = $(EBROOTSPRNG)/lib
-+INCDIR = $(EBROOTSPRNG)/include
-+
-+##########################################################################
-+
-+EX = sprng seed sprng-simple simple-simple seed-simple \
-+     spawn convert displaybytes pi-simple
-+
-+all : $(EX)
-+
-+sprng : sprng.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o sprng sprng.cpp -L$(LIBDIR) -lsprng -lirc
-+
-+seed : seed.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o seed seed.cpp -L$(LIBDIR) -lsprng -lirc
-+
-+sprng-simple : sprng-simple.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o sprng-simple sprng-simple.cpp -L$(LIBDIR) -lsprng -lirc
-+
-+simple-simple : simple-simple.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o simple-simple simple-simple.cpp -L$(LIBDIR) -lsprng -lirc
-+
-+seed-simple : seed-simple.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o seed-simple seed-simple.cpp -L$(LIBDIR) -lsprng -lirc
-+
-+spawn : spawn.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o spawn spawn.cpp -L$(LIBDIR) -lsprng -lirc
-+
-+convert : convert.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o convert convert.cpp -L$(LIBDIR) -lsprng -lirc
-+
-+displaybytes : displaybytes.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o displaybytes displaybytes.cpp -L$(LIBDIR) -lsprng -lirc
-+
-+pi-simple : pi-simple.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o pi-simple pi-simple.cpp -L$(LIBDIR) -lsprng -lirc
-+
---- sprng5/EXAMPLES/F77/Makefile_gnu	1970-01-01 01:00:00.000000000 +0100
-+++ sprng5_ok/EXAMPLES/F77/Makefile_gnu	2021-12-09 11:51:48.380940000 +0100
-@@ -0,0 +1,61 @@
-+##########################################################################
-+
-+SHELL = /bin/sh
-+MPIDEF = -DSPRNG_MPI
-+
-+CC = mpicc
-+CLD = $(CC)
-+F77 = mpif77
-+F77LD = $(F77)
-+FFXN = -DAdd_
-+FSUFFIX = F
-+CXX = mpicxx
-+CXXLD = $(CXX)
-+
-+DEFS = -DHAVE_CONFIG_H -DLONG64=long
-+CFLAGS = -O3 -DLittleEndian $(MPIDEF)
-+CLDFLAGS =  -O3
-+
-+FFLAGS = -O2 $(MPIDEF) -DPOINTER_SIZE=8 -DLONG64=long -DINTEGER_STAR_8
-+F77LDFLAGS =  -O3 
-+
-+CPP = cpp -P  -DPOINTER_SIZE=8
-+
-+LIBDIR  = $(EBROOTSPRNG)/lib
-+INCDIR = $(EBROOTSPRNG)/include
-+C++LIBS = -lstdc++ -lm -lgomp -lpthread
-+
-+##########################################################################
-+
-+FORTRAN = convertf pif-simple seedf-simple seedf simplef-simple spawnf \
-+          sprngf-simple sprngf subroutinef
-+
-+all : $(FORTRAN)
-+
-+convertf : convertf.F
-+	$(F77) $(FFLAGS) -I$(INCDIR) -o convertf convertf.F -L$(LIBDIR) -lsprng $(C++LIBS)
-+
-+pif-simple : pif-simple.F
-+	$(F77) $(FFLAGS) -I$(INCDIR) -o pif-simple pif-simple.F -L$(LIBDIR) -lsprng $(C++LIBS)
-+
-+seedf-simple : seedf-simple.F
-+	$(F77) $(FFLAGS) -I$(INCDIR) -o seedf-simple seedf-simple.F -L$(LIBDIR) -lsprng $(C++LIBS)
-+
-+seedf : seedf.F
-+	$(F77) $(FFLAGS) -I$(INCDIR) -o seedf seedf.F -L$(LIBDIR) -lsprng $(C++LIBS)
-+
-+simplef-simple : simplef-simple.F
-+	$(F77) $(FFLAGS) -I$(INCDIR) -o simplef-simple simplef-simple.F -L$(LIBDIR) -lsprng $(C++LIBS)
-+
-+spawnf : spawnf.F
-+	$(F77) $(FFLAGS) -I$(INCDIR) -o spawnf spawnf.F -L$(LIBDIR) -lsprng $(C++LIBS)
-+
-+sprngf-simple : sprngf-simple.F
-+	$(F77) $(FFLAGS) -I$(INCDIR) -o sprngf-simple sprngf-simple.F -L$(LIBDIR) -lsprng $(C++LIBS)
-+
-+sprngf : sprngf.F
-+	$(F77) $(FFLAGS) -I$(INCDIR) -o sprngf sprngf.F -L$(LIBDIR) -lsprng $(C++LIBS)
-+
-+subroutinef : subroutinef.F
-+	$(F77) $(FFLAGS) -I$(INCDIR) -o subroutinef subroutinef.F -L$(LIBDIR) -lsprng $(C++LIBS)
-+
---- sprng5/EXAMPLES/F77/Makefile_Intel	1970-01-01 01:00:00.000000000 +0100
-+++ sprng5_ok/EXAMPLES/F77/Makefile_Intel	2021-12-17 15:31:14.215284000 +0100
-@@ -0,0 +1,61 @@
-+##########################################################################
-+
-+SHELL = /bin/sh
-+MPIDEF = -DSPRNG_MPI
-+
-+CC = mpicc
-+CLD = $(CC)
-+F77 = mpif77
-+F77LD = $(F77)
-+FFXN = -DAdd_
-+FSUFFIX = F
-+CXX = mpicxx
-+CXXLD = $(CXX)
-+
-+DEFS = -DHAVE_CONFIG_H -DLONG64=long
-+CFLAGS = -O3 -DLittleEndian $(MPIDEF)
-+CLDFLAGS =  -O3
-+
-+FFLAGS = -O2 $(MPIDEF) -DPOINTER_SIZE=8 -DLONG64=long -DINTEGER_STAR_8
-+F77LDFLAGS =  -O3 
-+
-+CPP = cpp -P  -DPOINTER_SIZE=8
-+
-+LIBDIR  = $(EBROOTSPRNG)/lib
-+INCDIR = $(EBROOTSPRNG)/include
-+C++LIBS = -lstdc++ -lm -liomp5 -lpthread -lirc
-+
-+##########################################################################
-+
-+FORTRAN = convertf pif-simple seedf-simple seedf simplef-simple spawnf \
-+          sprngf-simple sprngf subroutinef
-+
-+all : $(FORTRAN)
-+
-+convertf : convertf.F
-+	$(F77) $(FFLAGS) -I$(INCDIR) -o convertf convertf.F -L$(LIBDIR) -lsprng $(C++LIBS)
-+
-+pif-simple : pif-simple.F
-+	$(F77) $(FFLAGS) -I$(INCDIR) -o pif-simple pif-simple.F -L$(LIBDIR) -lsprng $(C++LIBS)
-+
-+seedf-simple : seedf-simple.F
-+	$(F77) $(FFLAGS) -I$(INCDIR) -o seedf-simple seedf-simple.F -L$(LIBDIR) -lsprng $(C++LIBS)
-+
-+seedf : seedf.F
-+	$(F77) $(FFLAGS) -I$(INCDIR) -o seedf seedf.F -L$(LIBDIR) -lsprng $(C++LIBS)
-+
-+simplef-simple : simplef-simple.F
-+	$(F77) $(FFLAGS) -I$(INCDIR) -o simplef-simple simplef-simple.F -L$(LIBDIR) -lsprng $(C++LIBS)
-+
-+spawnf : spawnf.F
-+	$(F77) $(FFLAGS) -I$(INCDIR) -o spawnf spawnf.F -L$(LIBDIR) -lsprng $(C++LIBS)
-+
-+sprngf-simple : sprngf-simple.F
-+	$(F77) $(FFLAGS) -I$(INCDIR) -o sprngf-simple sprngf-simple.F -L$(LIBDIR) -lsprng $(C++LIBS)
-+
-+sprngf : sprngf.F
-+	$(F77) $(FFLAGS) -I$(INCDIR) -o sprngf sprngf.F -L$(LIBDIR) -lsprng $(C++LIBS)
-+
-+subroutinef : subroutinef.F
-+	$(F77) $(FFLAGS) -I$(INCDIR) -o subroutinef subroutinef.F -L$(LIBDIR) -lsprng $(C++LIBS)
-+
---- sprng5/EXAMPLES/mpisprng/Makefile_mpi_gnu	1970-01-01 01:00:00.000000000 +0100
-+++ sprng5_ok/EXAMPLES/mpisprng/Makefile_mpi_gnu	2021-12-09 12:35:27.395853000 +0100
-@@ -0,0 +1,64 @@
-+#####
-+
-+SHELL = /bin/sh
-+MPIDEF = -DSPRNG_MPI
-+
-+CC = mpicc
-+CLD = $(CC)
-+F77 = mpif90
-+F77LD = $(F77)
-+FFXN = -DAdd_
-+FSUFFIX = F
-+CXX = mpicxx
-+CXXLD = $(CXX)
-+
-+DEFS = -DHAVE_CONFIG_H -DLONG64=long
-+CFLAGS = -O3 -DLittleEndian $(MPIDEF)
-+CLDFLAGS =  -O3
-+
-+FFLAGS = -O2 $(MPIDEF) -DPOINTER_SIZE=8 -DLONG64=long -DINTEGER_STAR_8
-+F77LDFLAGS =  -O3 
-+
-+CPP = cpp -P  -DPOINTER_SIZE=8
-+
-+LIBDIR  = $(EBROOTSPRNG)/lib
-+INCDIR = $(EBROOTSPRNG)/include
-+
-+##########################################################################
-+
-+MPIEX = 2streams_mpi fsprng-simple_mpi fsprng_mpi message-simple_mpi \
-+        message_mpi pi-simple_mpi seed-simple_mpi seed_mpi \
-+        sprng-simple_mpi sprng_mpi
-+
-+all : $(MPIEX)
-+
-+2streams_mpi : 2streams_mpi.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o 2streams_mpi 2streams_mpi.cpp -L$(LIBDIR) -lsprng
-+
-+fsprng-simple_mpi : fsprng-simple_mpi.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o fsprng-simple_mpi fsprng-simple_mpi.cpp -L$(LIBDIR) -lsprng
-+
-+fsprng_mpi : fsprng_mpi.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o fsprng_mpi fsprng_mpi.cpp -L$(LIBDIR) -lsprng
-+
-+message-simple_mpi : message-simple_mpi.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o message-simple_mpi message-simple_mpi.cpp -L$(LIBDIR) -lsprng
-+
-+message_mpi : message_mpi.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o message_mpi message_mpi.cpp -L$(LIBDIR) -lsprng
-+
-+pi-simple_mpi : pi-simple_mpi.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o pi-simple_mpi pi-simple_mpi.cpp -L$(LIBDIR) -lsprng
-+
-+seed-simple_mpi : seed-simple_mpi.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o seed-simple_mpi seed-simple_mpi.cpp -L$(LIBDIR) -lsprng
-+
-+seed_mpi : seed_mpi.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o seed_mpi seed_mpi.cpp -L$(LIBDIR) -lsprng
-+
-+sprng-simple_mpi : sprng-simple_mpi.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o sprng-simple_mpi sprng-simple_mpi.cpp -L$(LIBDIR) -lsprng
-+
-+sprng_mpi : sprng_mpi.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o sprng_mpi sprng_mpi.cpp -L$(LIBDIR) -lsprng
-+
---- sprng5/EXAMPLES/mpisprng/Makefile_mpi_Intel	1970-01-01 01:00:00.000000000 +0100
-+++ sprng5_ok/EXAMPLES/mpisprng/Makefile_mpi_Intel	2021-12-17 15:05:44.990180000 +0100
-@@ -0,0 +1,64 @@
-+#####
-+
-+SHELL = /bin/sh
-+MPIDEF = -DSPRNG_MPI
-+
-+CC = mpicc
-+CLD = $(CC)
-+F77 = mpif90
-+F77LD = $(F77)
-+FFXN = -DAdd_
-+FSUFFIX = F
-+CXX = mpicxx
-+CXXLD = $(CXX)
-+
-+DEFS = -DHAVE_CONFIG_H -DLONG64=long
-+CFLAGS = -O3 -DLittleEndian $(MPIDEF)
-+CLDFLAGS =  -O3
-+
-+FFLAGS = -O2 $(MPIDEF) -DPOINTER_SIZE=8 -DLONG64=long -DINTEGER_STAR_8
-+F77LDFLAGS =  -O3 
-+
-+CPP = cpp -P  -DPOINTER_SIZE=8
-+
-+LIBDIR  = $(EBROOTSPRNG)/lib
-+INCDIR = $(EBROOTSPRNG)/include
-+
-+##########################################################################
-+
-+MPIEX = 2streams_mpi fsprng-simple_mpi fsprng_mpi message-simple_mpi \
-+        message_mpi pi-simple_mpi seed-simple_mpi seed_mpi \
-+        sprng-simple_mpi sprng_mpi
-+
-+all : $(MPIEX)
-+
-+2streams_mpi : 2streams_mpi.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o 2streams_mpi 2streams_mpi.cpp -L$(LIBDIR) -lsprng -lirc
-+
-+fsprng-simple_mpi : fsprng-simple_mpi.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o fsprng-simple_mpi fsprng-simple_mpi.cpp -L$(LIBDIR) -lsprng -lirc
-+
-+fsprng_mpi : fsprng_mpi.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o fsprng_mpi fsprng_mpi.cpp -L$(LIBDIR) -lsprng -lirc
-+
-+message-simple_mpi : message-simple_mpi.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o message-simple_mpi message-simple_mpi.cpp -L$(LIBDIR) -lsprng -lirc
-+
-+message_mpi : message_mpi.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o message_mpi message_mpi.cpp -L$(LIBDIR) -lsprng -lirc
-+
-+pi-simple_mpi : pi-simple_mpi.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o pi-simple_mpi pi-simple_mpi.cpp -L$(LIBDIR) -lsprng -lirc
-+
-+seed-simple_mpi : seed-simple_mpi.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o seed-simple_mpi seed-simple_mpi.cpp -L$(LIBDIR) -lsprng -lirc
-+
-+seed_mpi : seed_mpi.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o seed_mpi seed_mpi.cpp -L$(LIBDIR) -lsprng -lirc
-+
-+sprng-simple_mpi : sprng-simple_mpi.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o sprng-simple_mpi sprng-simple_mpi.cpp -L$(LIBDIR) -lsprng -lirc
-+
-+sprng_mpi : sprng_mpi.cpp
-+	$(CXX) $(CXXFLAGS) -I$(INCDIR) -o sprng_mpi sprng_mpi.cpp -L$(LIBDIR) -lsprng -lirc
-+
---- sprng5/EXAMPLES/mpisprng/F77/Makefile_mpi_gnu	1970-01-01 01:00:00.000000000 +0100
-+++ sprng5_ok/EXAMPLES/mpisprng/F77/Makefile_mpi_gnu	2022-01-11 13:13:43.951437000 +0100
-@@ -0,0 +1,64 @@
-+##########################################################################
-+
-+SHELL = /bin/sh
-+MPIDEF = -DSPRNG_MPI
-+
-+CC = mpicc
-+CLD = $(CC)
-+F77 = mpif77
-+F77LD = $(F77)
-+FFXN = -DAdd_
-+FSUFFIX = F
-+CXX = mpicxx
-+CXXLD = $(CXX)
-+
-+DEFS = -DHAVE_CONFIG_H -DLONG64=long
-+CFLAGS = -O3 -DLittleEndian $(MPIDEF)
-+CLDFLAGS =  -O3
-+
-+FFLAGS = -O2 $(MPIDEF) -DPOINTER_SIZE=8 -DLONG64=long -DINTEGER_STAR_8 --allow-argument-mismatch
-+F77LDFLAGS =  -O3 
-+
-+CPP = cpp -P  -DPOINTER_SIZE=8
-+
-+LIBDIR  = $(EBROOTSPRNG)/lib
-+INCDIR = $(EBROOTSPRNG)/include
-+INCLUDE = -I$(INCDIR) -I../../F77
-+C++LIBS = -lstdc++ -lm -lgomp -lpthread
-+
-+##########################################################################
-+
-+MPIFORTRAN = 2streamsf_mpi fsprngf-simple_mpi fsprngf_mpi \
-+             messagef-simple_mpi messagef_mpi \
-+             seedf-simple_mpi seedf_mpi \
-+             sprngf-simple_mpi sprngf_mpi
-+
-+all : $(MPIFORTRAN)
-+
-+fsprngf-simple_mpi : fsprngf-simple_mpi.F
-+	$(F77) $(FFLAGS) $(INCLUDE) -o fsprngf-simple_mpi fsprngf-simple_mpi.F -L$(LIBDIR) -lsprng $(C++LIBS)
-+
-+fsprngf_mpi : fsprngf_mpi.F
-+	$(F77) $(FFLAGS) $(INCLUDE)  -o fsprngf_mpi fsprngf_mpi.F -L$(LIBDIR) -lsprng $(C++LIBS)
-+
-+messagef-simple_mpi : messagef-simple_mpi.F
-+	$(F77) $(FFLAGS) $(INCLUDE) -o messagef-simple_mpi messagef-simple_mpi.F -L$(LIBDIR) -lsprng $(C++LIBS)
-+
-+messagef_mpi : messagef_mpi.F
-+	$(F77) $(FFLAGS) $(INCLUDE) -o messagef_mpi messagef_mpi.F -L$(LIBDIR) -lsprng $(C++LIBS)
-+
-+seedf-simple_mpi : seedf-simple_mpi.F
-+	$(F77) $(FFLAGS) $(INCLUDE) -o seedf-simple_mpi seedf-simple_mpi.F -L$(LIBDIR) -lsprng $(C++LIBS)
-+
-+seedf_mpi : seedf_mpi.F
-+	$(F77) $(FFLAGS) $(INCLUDE) -o seedf_mpi seedf_mpi.F -L$(LIBDIR) -lsprng $(C++LIBS)
-+
-+sprngf-simple_mpi : sprngf-simple_mpi.F
-+	$(F77) $(FFLAGS) $(INCLUDE) -o sprngf-simple_mpi sprngf-simple_mpi.F -L$(LIBDIR) -lsprng $(C++LIBS)
-+
-+sprngf_mpi : sprngf_mpi.F
-+	$(F77) $(FFLAGS) $(INCLUDE) -o sprngf_mpi sprngf_mpi.F -L$(LIBDIR) -lsprng $(C++LIBS)
-+
-+2streamsf_mpi : 2streamsf_mpi.F
-+	$(F77) $(FFLAGS) $(INCLUDE) -o 2streamsf_mpi 2streamsf_mpi.F -L$(LIBDIR) -lsprng $(C++LIBS)
-+
---- sprng5/EXAMPLES/mpisprng/F77/Makefile_mpi_Intel	1970-01-01 01:00:00.000000000 +0100
-+++ sprng5_ok/EXAMPLES/mpisprng/F77/Makefile_mpi_Intel	2021-12-17 15:31:56.737183000 +0100
-@@ -0,0 +1,64 @@
-+##########################################################################
-+
-+SHELL = /bin/sh
-+MPIDEF = -DSPRNG_MPI
-+
-+CC = mpicc
-+CLD = $(CC)
-+F77 = mpif77
-+F77LD = $(F77)
-+FFXN = -DAdd_
-+FSUFFIX = F
-+CXX = mpicxx
-+CXXLD = $(CXX)
-+
-+DEFS = -DHAVE_CONFIG_H -DLONG64=long
-+CFLAGS = -O3 -DLittleEndian $(MPIDEF)
-+CLDFLAGS =  -O3
-+
-+FFLAGS = -O2 $(MPIDEF) -DPOINTER_SIZE=8 -DLONG64=long -DINTEGER_STAR_8
-+F77LDFLAGS =  -O3 
-+
-+CPP = cpp -P  -DPOINTER_SIZE=8
-+
-+LIBDIR  = $(EBROOTSPRNG)/lib
-+INCDIR = $(EBROOTSPRNG)/include
-+INCLUDE = -I$(INCDIR) -I../../F77
-+C++LIBS = -lstdc++ -lm -liomp5 -lpthread -lirc
-+
-+##########################################################################
-+
-+MPIFORTRAN = 2streamsf_mpi fsprngf-simple_mpi fsprngf_mpi \
-+             messagef-simple_mpi messagef_mpi \
-+             seedf-simple_mpi seedf_mpi \
-+             sprngf-simple_mpi sprngf_mpi
-+
-+all : $(MPIFORTRAN)
-+
-+fsprngf-simple_mpi : fsprngf-simple_mpi.F
-+	$(F77) $(FFLAGS) $(INCLUDE) -o fsprngf-simple_mpi fsprngf-simple_mpi.F -L$(LIBDIR) -lsprng $(C++LIBS)
-+
-+fsprngf_mpi : fsprngf_mpi.F
-+	$(F77) $(FFLAGS) $(INCLUDE)  -o fsprngf_mpi fsprngf_mpi.F -L$(LIBDIR) -lsprng $(C++LIBS)
-+
-+messagef-simple_mpi : messagef-simple_mpi.F
-+	$(F77) $(FFLAGS) $(INCLUDE) -o messagef-simple_mpi messagef-simple_mpi.F -L$(LIBDIR) -lsprng $(C++LIBS)
-+
-+messagef_mpi : messagef_mpi.F
-+	$(F77) $(FFLAGS) $(INCLUDE) -o messagef_mpi messagef_mpi.F -L$(LIBDIR) -lsprng $(C++LIBS)
-+
-+seedf-simple_mpi : seedf-simple_mpi.F
-+	$(F77) $(FFLAGS) $(INCLUDE) -o seedf-simple_mpi seedf-simple_mpi.F -L$(LIBDIR) -lsprng $(C++LIBS)
-+
-+seedf_mpi : seedf_mpi.F
-+	$(F77) $(FFLAGS) $(INCLUDE) -o seedf_mpi seedf_mpi.F -L$(LIBDIR) -lsprng $(C++LIBS)
-+
-+sprngf-simple_mpi : sprngf-simple_mpi.F
-+	$(F77) $(FFLAGS) $(INCLUDE) -o sprngf-simple_mpi sprngf-simple_mpi.F -L$(LIBDIR) -lsprng $(C++LIBS)
-+
-+sprngf_mpi : sprngf_mpi.F
-+	$(F77) $(FFLAGS) $(INCLUDE) -o sprngf_mpi sprngf_mpi.F -L$(LIBDIR) -lsprng $(C++LIBS)
-+
-+2streamsf_mpi : 2streamsf_mpi.F
-+	$(F77) $(FFLAGS) $(INCLUDE) -o 2streamsf_mpi 2streamsf_mpi.F -L$(LIBDIR) -lsprng $(C++LIBS)
-+
diff --git a/Golden_Repo/s/sprng/sprng-5-gompi-2021b-10062021.eb b/Golden_Repo/s/sprng/sprng-5-gompi-2021b-10062021.eb
deleted file mode 100644
index ce90b1c8f..000000000
--- a/Golden_Repo/s/sprng/sprng-5-gompi-2021b-10062021.eb
+++ /dev/null
@@ -1,72 +0,0 @@
-##
-# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
-#
-# Authors::  Inge Gutheil <i.gutheil@fz-juelich.de>
-#
-# This work implements sprng5
-# http://www.sprng.org/
-##
-
-easyblock = 'ConfigureMake'
-name = 'sprng'
-version = '5'
-versionsuffix = '-10062021'
-
-homepage = 'http://www.sprng.org/'
-description = """The Scalable Parallel Random Number Generators Library (SPRNG) version 5 has been installed as module in
-
-$EBROOTSPRNG
-
-This version contains all different random number generators in one library,
-the generator has to be chosen via an input parameter.
-"""
-
-toolchain = {'name': 'gompi', 'version': '2021b'}
-toolchainopts = {'optarch': True, 'usempi': True}
-
-source_urls = ['http://www.sprng.org/Version5.0']
-sources = ['%(name)s%(version)s%(versionsuffix)s.tar.bz2']
-patches = [
-    'sprng-%(version)s%(versionsuffix)s-examples.patch',
-]
-checksums = [
-    '696ef452bdd998d2e66586e73d81dac875082e35d08de419cede1a1bb2555b59',  # sprng5-10062021.tar.bz2
-    'e2a928527d2688ca2ebe7554a0a307f1991e64b7975783f03dad472b418a2f27',  # sprng-5-10062021-examples.patch
-]
-
-configopts = '--with-mpi --with-fortran'
-
-parallel = 1
-
-postinstallcmds = [
-    "cp -r include %(installdir)s/",
-    "cp -r EXAMPLES %(installdir)s",
-    "cp DOCS/README %(installdir)s",
-    "cp AUTHORS %(installdir)s",
-    "cp COPYING %(installdir)s",
-    "cp LICENSE %(installdir)s",
-    "mv %(installdir)s/EXAMPLES/Makefile_gnu %(installdir)s/EXAMPLES/Makefile",
-    "rm %(installdir)s/EXAMPLES/Makefile*.*",
-    "rm %(installdir)s/EXAMPLES/Makefile_Intel",
-    "rm %(installdir)s/EXAMPLES/*.sprng",
-    "mv %(installdir)s/EXAMPLES/F77/Makefile_gnu %(installdir)s/EXAMPLES/F77/Makefile",
-    "rm %(installdir)s/EXAMPLES/F77/Makefile*.*",
-    "rm %(installdir)s/EXAMPLES/F77/Makefile_Intel",
-    "rm %(installdir)s/EXAMPLES/F77/*.sprng",
-    "mv %(installdir)s/EXAMPLES/mpisprng/Makefile_mpi_gnu %(installdir)s/EXAMPLES/mpisprng/Makefile",
-    "rm %(installdir)s/EXAMPLES/mpisprng/Makefile*.*",
-    "rm %(installdir)s/EXAMPLES/mpisprng/Makefile_mpi_Intel",
-    "rm %(installdir)s/EXAMPLES/mpisprng/*.sprng",
-    "mv %(installdir)s/EXAMPLES/mpisprng/F77/Makefile_mpi_gnu %(installdir)s/EXAMPLES/mpisprng/F77/Makefile",
-    "rm %(installdir)s/EXAMPLES/mpisprng/F77/Makefile*.*",
-    "rm %(installdir)s/EXAMPLES/mpisprng/F77/Makefile_mpi_Intel",
-]
-
-modextravars = {
-    'SPRNG5_ROOT': '%(installdir)s',
-    'SPRNG5ROOT': '%(installdir)s',
-    'SPRNG5_LIB': '%(installdir)s/lib',
-    'SPRNG5_INCLUDE': '%(installdir)s/include'
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/s/sprng/sprng-5-gpsmpi-2021b-10062021.eb b/Golden_Repo/s/sprng/sprng-5-gpsmpi-2021b-10062021.eb
deleted file mode 100644
index 5d9a3aa21..000000000
--- a/Golden_Repo/s/sprng/sprng-5-gpsmpi-2021b-10062021.eb
+++ /dev/null
@@ -1,72 +0,0 @@
-##
-# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
-#
-# Authors::  Inge Gutheil <i.gutheil@fz-juelich.de>
-#
-# This work implements sprng5
-# http://www.sprng.org/
-##
-
-easyblock = 'ConfigureMake'
-name = 'sprng'
-version = '5'
-versionsuffix = '-10062021'
-
-homepage = 'http://www.sprng.org/'
-description = """The Scalable Parallel Random Number Generators Library (SPRNG) version 5 has been installed as module in
-
-$EBROOTSPRNG
-
-This version contains all different random number generators in one library,
-the generator has to be chosen via an input parameter.
-"""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-toolchainopts = {'optarch': True, 'usempi': True}
-
-source_urls = ['http://www.sprng.org/Version5.0']
-sources = ['%(name)s%(version)s%(versionsuffix)s.tar.bz2']
-patches = [
-    'sprng-%(version)s%(versionsuffix)s-examples.patch',
-]
-checksums = [
-    '696ef452bdd998d2e66586e73d81dac875082e35d08de419cede1a1bb2555b59',  # sprng5-10062021.tar.bz2
-    'e2a928527d2688ca2ebe7554a0a307f1991e64b7975783f03dad472b418a2f27',  # sprng-5-10062021-examples.patch
-]
-
-configopts = '--with-mpi --with-fortran'
-
-parallel = 1
-
-postinstallcmds = [
-    "cp -r include %(installdir)s/",
-    "cp -r EXAMPLES %(installdir)s",
-    "cp DOCS/README %(installdir)s",
-    "cp AUTHORS %(installdir)s",
-    "cp COPYING %(installdir)s",
-    "cp LICENSE %(installdir)s",
-    "mv %(installdir)s/EXAMPLES/Makefile_gnu %(installdir)s/EXAMPLES/Makefile",
-    "rm %(installdir)s/EXAMPLES/Makefile*.*",
-    "rm %(installdir)s/EXAMPLES/Makefile_Intel",
-    "rm %(installdir)s/EXAMPLES/*.sprng",
-    "mv %(installdir)s/EXAMPLES/F77/Makefile_gnu %(installdir)s/EXAMPLES/F77/Makefile",
-    "rm %(installdir)s/EXAMPLES/F77/Makefile*.*",
-    "rm %(installdir)s/EXAMPLES/F77/Makefile_Intel",
-    "rm %(installdir)s/EXAMPLES/F77/*.sprng",
-    "mv %(installdir)s/EXAMPLES/mpisprng/Makefile_mpi_gnu %(installdir)s/EXAMPLES/mpisprng/Makefile",
-    "rm %(installdir)s/EXAMPLES/mpisprng/Makefile*.*",
-    "rm %(installdir)s/EXAMPLES/mpisprng/Makefile_mpi_Intel",
-    "rm %(installdir)s/EXAMPLES/mpisprng/*.sprng",
-    "mv %(installdir)s/EXAMPLES/mpisprng/F77/Makefile_mpi_gnu %(installdir)s/EXAMPLES/mpisprng/F77/Makefile",
-    "rm %(installdir)s/EXAMPLES/mpisprng/F77/Makefile*.*",
-    "rm %(installdir)s/EXAMPLES/mpisprng/F77/Makefile_mpi_Intel",
-]
-
-modextravars = {
-    'SPRNG5_ROOT': '%(installdir)s',
-    'SPRNG5ROOT': '%(installdir)s',
-    'SPRNG5_LIB': '%(installdir)s/lib',
-    'SPRNG5_INCLUDE': '%(installdir)s/include'
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/s/sprng/sprng-5-iimpi-2021b-10062021.eb b/Golden_Repo/s/sprng/sprng-5-iimpi-2021b-10062021.eb
deleted file mode 100644
index b58a9c3a8..000000000
--- a/Golden_Repo/s/sprng/sprng-5-iimpi-2021b-10062021.eb
+++ /dev/null
@@ -1,72 +0,0 @@
-##
-# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
-#
-# Authors::  Inge Gutheil <i.gutheil@fz-juelich.de>
-#
-# This work implements sprng5
-# http://www.sprng.org/
-##
-
-easyblock = 'ConfigureMake'
-name = 'sprng'
-version = '5'
-versionsuffix = '-10062021'
-
-homepage = 'http://www.sprng.org/'
-description = """The Scalable Parallel Random Number Generators Library (SPRNG) version 5 has been installed as module in
-
-$EBROOTSPRNG
-
-This version contains all different random number generators in one library,
-the generator has to be chosen via an input parameter.
-"""
-
-toolchain = {'name': 'iimpi', 'version': '2021b'}
-toolchainopts = {'optarch': True, 'usempi': True}
-
-source_urls = ['http://www.sprng.org/Version5.0']
-sources = ['%(name)s%(version)s%(versionsuffix)s.tar.bz2']
-patches = [
-    'sprng-%(version)s%(versionsuffix)s-examples.patch',
-]
-checksums = [
-    '696ef452bdd998d2e66586e73d81dac875082e35d08de419cede1a1bb2555b59',  # sprng5-10062021.tar.bz2
-    'e2a928527d2688ca2ebe7554a0a307f1991e64b7975783f03dad472b418a2f27',  # sprng-5-10062021-examples.patch
-]
-
-configopts = '--with-mpi --with-fortran'
-
-parallel = 1
-
-postinstallcmds = [
-    "cp -r include %(installdir)s/",
-    "cp -r EXAMPLES %(installdir)s",
-    "cp DOCS/README %(installdir)s",
-    "cp AUTHORS %(installdir)s",
-    "cp COPYING %(installdir)s",
-    "cp LICENSE %(installdir)s",
-    "mv %(installdir)s/EXAMPLES/Makefile_Intel %(installdir)s/EXAMPLES/Makefile",
-    "rm %(installdir)s/EXAMPLES/Makefile*.*",
-    "rm %(installdir)s/EXAMPLES/Makefile_gnu",
-    "rm %(installdir)s/EXAMPLES/*.sprng",
-    "mv %(installdir)s/EXAMPLES/F77/Makefile_Intel %(installdir)s/EXAMPLES/F77/Makefile",
-    "rm %(installdir)s/EXAMPLES/F77/Makefile*.*",
-    "rm %(installdir)s/EXAMPLES/F77/Makefile_gnu",
-    "rm %(installdir)s/EXAMPLES/F77/*.sprng",
-    "mv %(installdir)s/EXAMPLES/mpisprng/Makefile_mpi_Intel %(installdir)s/EXAMPLES/mpisprng/Makefile",
-    "rm %(installdir)s/EXAMPLES/mpisprng/Makefile*.*",
-    "rm %(installdir)s/EXAMPLES/mpisprng/Makefile_mpi_gnu",
-    "rm %(installdir)s/EXAMPLES/mpisprng/*.sprng",
-    "mv %(installdir)s/EXAMPLES/mpisprng/F77/Makefile_mpi_Intel %(installdir)s/EXAMPLES/mpisprng/F77/Makefile",
-    "rm %(installdir)s/EXAMPLES/mpisprng/F77/Makefile*.*",
-    "rm %(installdir)s/EXAMPLES/mpisprng/F77/Makefile_mpi_gnu",
-]
-
-modextravars = {
-    'SPRNG5_ROOT': '%(installdir)s',
-    'SPRNG5ROOT': '%(installdir)s',
-    'SPRNG5_LIB': '%(installdir)s/lib',
-    'SPRNG5_INCLUDE': '%(installdir)s/include'
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/s/sprng/sprng-5-iompi-2021b-10062021.eb b/Golden_Repo/s/sprng/sprng-5-iompi-2021b-10062021.eb
deleted file mode 100644
index 455304a36..000000000
--- a/Golden_Repo/s/sprng/sprng-5-iompi-2021b-10062021.eb
+++ /dev/null
@@ -1,72 +0,0 @@
-##
-# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
-#
-# Authors::  Inge Gutheil <i.gutheil@fz-juelich.de>
-#
-# This work implements sprng5
-# http://www.sprng.org/
-##
-
-easyblock = 'ConfigureMake'
-name = 'sprng'
-version = '5'
-versionsuffix = '-10062021'
-
-homepage = 'http://www.sprng.org/'
-description = """The Scalable Parallel Random Number Generators Library (SPRNG) version 5 has been installed as module in
-
-$EBROOTSPRNG
-
-This version contains all different random number generators in one library,
-the generator has to be chosen via an input parameter.
-"""
-
-toolchain = {'name': 'iompi', 'version': '2021b'}
-toolchainopts = {'optarch': True, 'usempi': True}
-
-source_urls = ['http://www.sprng.org/Version5.0']
-sources = ['%(name)s%(version)s%(versionsuffix)s.tar.bz2']
-patches = [
-    'sprng-%(version)s%(versionsuffix)s-examples.patch',
-]
-checksums = [
-    '696ef452bdd998d2e66586e73d81dac875082e35d08de419cede1a1bb2555b59',  # sprng5-10062021.tar.bz2
-    'e2a928527d2688ca2ebe7554a0a307f1991e64b7975783f03dad472b418a2f27',  # sprng-5-10062021-examples.patch
-]
-
-configopts = '--with-mpi --with-fortran'
-
-parallel = 1
-
-postinstallcmds = [
-    "cp -r include %(installdir)s/",
-    "cp -r EXAMPLES %(installdir)s",
-    "cp DOCS/README %(installdir)s",
-    "cp AUTHORS %(installdir)s",
-    "cp COPYING %(installdir)s",
-    "cp LICENSE %(installdir)s",
-    "mv %(installdir)s/EXAMPLES/Makefile_Intel %(installdir)s/EXAMPLES/Makefile",
-    "rm %(installdir)s/EXAMPLES/Makefile*.*",
-    "rm %(installdir)s/EXAMPLES/Makefile_gnu",
-    "rm %(installdir)s/EXAMPLES/*.sprng",
-    "mv %(installdir)s/EXAMPLES/F77/Makefile_Intel %(installdir)s/EXAMPLES/F77/Makefile",
-    "rm %(installdir)s/EXAMPLES/F77/Makefile*.*",
-    "rm %(installdir)s/EXAMPLES/F77/Makefile_gnu",
-    "rm %(installdir)s/EXAMPLES/F77/*.sprng",
-    "mv %(installdir)s/EXAMPLES/mpisprng/Makefile_mpi_Intel %(installdir)s/EXAMPLES/mpisprng/Makefile",
-    "rm %(installdir)s/EXAMPLES/mpisprng/Makefile*.*",
-    "rm %(installdir)s/EXAMPLES/mpisprng/Makefile_mpi_gnu",
-    "rm %(installdir)s/EXAMPLES/mpisprng/*.sprng",
-    "mv %(installdir)s/EXAMPLES/mpisprng/F77/Makefile_mpi_Intel %(installdir)s/EXAMPLES/mpisprng/F77/Makefile",
-    "rm %(installdir)s/EXAMPLES/mpisprng/F77/Makefile*.*",
-    "rm %(installdir)s/EXAMPLES/mpisprng/F77/Makefile_mpi_gnu",
-]
-
-modextravars = {
-    'SPRNG5_ROOT': '%(installdir)s',
-    'SPRNG5ROOT': '%(installdir)s',
-    'SPRNG5_LIB': '%(installdir)s/lib',
-    'SPRNG5_INCLUDE': '%(installdir)s/include'
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/s/sprng/sprng-5-ipsmpi-2021b-10062021.eb b/Golden_Repo/s/sprng/sprng-5-ipsmpi-2021b-10062021.eb
deleted file mode 100644
index c4fbd7e35..000000000
--- a/Golden_Repo/s/sprng/sprng-5-ipsmpi-2021b-10062021.eb
+++ /dev/null
@@ -1,72 +0,0 @@
-##
-# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
-#
-# Authors::  Inge Gutheil <i.gutheil@fz-juelich.de>
-#
-# This work implements sprng5
-# http://www.sprng.org/
-##
-
-easyblock = 'ConfigureMake'
-name = 'sprng'
-version = '5'
-versionsuffix = '-10062021'
-
-homepage = 'http://www.sprng.org/'
-description = """The Scalable Parallel Random Number Generators Library (SPRNG) version 5 has been installed as module in
-
-$EBROOTSPRNG
-
-This version contains all different random number generators in one library,
-the generator has to be chosen via an input parameter.
-"""
-
-toolchain = {'name': 'ipsmpi', 'version': '2021b'}
-toolchainopts = {'optarch': True, 'usempi': True}
-
-source_urls = ['http://www.sprng.org/Version5.0']
-sources = ['%(name)s%(version)s%(versionsuffix)s.tar.bz2']
-patches = [
-    'sprng-%(version)s%(versionsuffix)s-examples.patch',
-]
-checksums = [
-    '696ef452bdd998d2e66586e73d81dac875082e35d08de419cede1a1bb2555b59',  # sprng5-10062021.tar.bz2
-    'e2a928527d2688ca2ebe7554a0a307f1991e64b7975783f03dad472b418a2f27',  # sprng-5-10062021-examples.patch
-]
-
-configopts = '--with-mpi --with-fortran'
-
-parallel = 1
-
-postinstallcmds = [
-    "cp -r include %(installdir)s/",
-    "cp -r EXAMPLES %(installdir)s",
-    "cp DOCS/README %(installdir)s",
-    "cp AUTHORS %(installdir)s",
-    "cp COPYING %(installdir)s",
-    "cp LICENSE %(installdir)s",
-    "mv %(installdir)s/EXAMPLES/Makefile_Intel %(installdir)s/EXAMPLES/Makefile",
-    "rm %(installdir)s/EXAMPLES/Makefile*.*",
-    "rm %(installdir)s/EXAMPLES/Makefile_gnu",
-    "rm %(installdir)s/EXAMPLES/*.sprng",
-    "mv %(installdir)s/EXAMPLES/F77/Makefile_Intel %(installdir)s/EXAMPLES/F77/Makefile",
-    "rm %(installdir)s/EXAMPLES/F77/Makefile*.*",
-    "rm %(installdir)s/EXAMPLES/F77/Makefile_gnu",
-    "rm %(installdir)s/EXAMPLES/F77/*.sprng",
-    "mv %(installdir)s/EXAMPLES/mpisprng/Makefile_mpi_Intel %(installdir)s/EXAMPLES/mpisprng/Makefile",
-    "rm %(installdir)s/EXAMPLES/mpisprng/Makefile*.*",
-    "rm %(installdir)s/EXAMPLES/mpisprng/Makefile_mpi_gnu",
-    "rm %(installdir)s/EXAMPLES/mpisprng/*.sprng",
-    "mv %(installdir)s/EXAMPLES/mpisprng/F77/Makefile_mpi_Intel %(installdir)s/EXAMPLES/mpisprng/F77/Makefile",
-    "rm %(installdir)s/EXAMPLES/mpisprng/F77/Makefile*.*",
-    "rm %(installdir)s/EXAMPLES/mpisprng/F77/Makefile_mpi_gnu",
-]
-
-modextravars = {
-    'SPRNG5_ROOT': '%(installdir)s',
-    'SPRNG5ROOT': '%(installdir)s',
-    'SPRNG5_LIB': '%(installdir)s/lib',
-    'SPRNG5_INCLUDE': '%(installdir)s/include'
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/s/strace/strace-5.14-GCCcore-11.2.0.eb b/Golden_Repo/s/strace/strace-5.14-GCCcore-11.2.0.eb
deleted file mode 100644
index fbaef7285..000000000
--- a/Golden_Repo/s/strace/strace-5.14-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,28 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'strace'
-version = '5.14'
-
-homepage = 'https://strace.io/'
-description = """
-strace is a diagnostic, debugging and instructional userspace utility for Linux. It is used to monitor and tamper with
-interactions between processes and the Linux kernel, which include system calls, signal deliveries, and changes of
-process state.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://github.com/strace/strace/releases/download/v%(version)s/']
-sources = [SOURCE_TAR_XZ]
-checksums = ['901bee6db5e17debad4530dd9ffb4dc9a96c4a656edbe1c3141b7cb307b11e73']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-sanity_check_paths = {
-    'files': ['bin/strace-log-merge', 'bin/strace'],
-    'dirs': ['share']
-}
-
-moduleclass = 'system'
diff --git a/Golden_Repo/s/sympy/sympy-1.8-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/s/sympy/sympy-1.8-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index d5613183e..000000000
--- a/Golden_Repo/s/sympy/sympy-1.8-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,35 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'sympy'
-version = '1.8'
-
-homepage = 'https://sympy.org/'
-description = """SymPy is a Python library for symbolic mathematics. It aims to
- become a full-featured computer algebra system (CAS) while keeping the code as
- simple as possible in order to be comprehensible and easily extensible. SymPy
- is written entirely in Python and does not require any external libraries."""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-sources = [SOURCE_TAR_GZ]
-checksums = ['1ca588a9f6ce6a323c5592f9635159c2093572826668a1022c75c75bdf0297cb']
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10'),
-    ('gmpy2', '2.1.0b5'),
-]
-
-download_dep_fail = True
-use_pip = True
-
-runtest = 'python setup.py test'
-
-sanity_pip_check = True
-
-sanity_check_paths = {
-    'files': ['bin/isympy'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages/sympy'],
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/t/Tcl/Tcl-8.6.11-GCCcore-11.2.0.eb b/Golden_Repo/t/Tcl/Tcl-8.6.11-GCCcore-11.2.0.eb
deleted file mode 100644
index 57d19853c..000000000
--- a/Golden_Repo/t/Tcl/Tcl-8.6.11-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,42 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'Tcl'
-version = '8.6.11'
-
-homepage = 'https://www.tcl.tk/'
-description = """
- Tcl (Tool Command Language) is a very powerful but easy to learn dynamic
- programming language, suitable for a very wide range of uses, including web
- and desktop applications, networking, administration, testing and many more.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
-sources = ['%(namelower)s%(version)s-src.tar.gz']
-checksums = ['8c0486668586672c5693d7d95817cb05a18c5ecca2f40e2836b9578064088258']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-dependencies = [
-    ('zlib', '1.2.11'),
-]
-
-configopts = '--enable-threads EXTRA_INSTALL="install-private-headers"'
-
-runtest = 'test'
-
-start_dir = 'unix'
-
-postinstallcmds = [
-    'ln -s %(installdir)s/bin/tclsh%(version_major)s.%(version_minor)s %(installdir)s/bin/tclsh']
-
-sanity_check_paths = {
-    'files': ['bin/tclsh%(version_major)s.%(version_minor)s', 'bin/tclsh',
-              'include/tcl.h', 'lib/libtcl%%(version_major)s.%%(version_minor)s.%s' % SHLIB_EXT,
-              'lib/tclConfig.sh', 'man/man1/tclsh.1'],
-    'dirs': ['share'],
-}
-
-moduleclass = 'lang'
diff --git a/Golden_Repo/t/TensorFlow/TensorFlow-2.1.0_fix-cuda-build.patch b/Golden_Repo/t/TensorFlow/TensorFlow-2.1.0_fix-cuda-build.patch
deleted file mode 100644
index 5873bdc5e..000000000
--- a/Golden_Repo/t/TensorFlow/TensorFlow-2.1.0_fix-cuda-build.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-fix for "undeclared inclusion(s) in rule" errors when building TensorFlow 1.14.0 with CUDA support,
-if the installation directory for GCC is hosted in a path that is a symlink to another path;
-the symlinked path is resolved in several places (both by 'gcc' itself and by the TF build process),
-which makes hard comparisons between paths fail
-author: Alexander Grund based on original patch by Kenneth Hoste (HPC-UGent)
-diff --git a/third_party/gpus/cuda_configure.bzl b/third_party/gpus/cuda_configure.bzl
-index ba4bd8ad75..dab492ecda 100644
---- a/third_party/gpus/cuda_configure.bzl
-+++ b/third_party/gpus/cuda_configure.bzl
-@@ -303,11 +303,36 @@ def _get_cxx_inc_directories_impl(repository_ctx, cc, lang_is_cpp):
-     else:
-         inc_dirs = result.stderr[index1 + 1:index2].strip()
-
--    return [
-+    compiler_includes = [
-         _normalize_include_path(repository_ctx, _cxx_inc_convert(p))
-         for p in inc_dirs.split("\n")
-     ]
-
-+    # fix include path by also including paths where resolved symlink is replaced by original path
-+    # Try to find real path to CC installation to "see through" compiler wrappers
-+    # GCC has the path to g++
-+    index1 = result.stderr.find("COLLECT_GCC=")
-+    if index1 != -1:
-+      index1 = result.stderr.find("=", index1)
-+      index2 = result.stderr.find("\n", index1)
-+      cc_topdir = repository_ctx.path(result.stderr[index1 + 1 : index2]).dirname.dirname
-+    else:
-+      # Clang has the directory
-+      index1 = result.stderr.find("InstalledDir: ")
-+      if index1 != -1:
-+        index1 = result.stderr.find(" ", index1)
-+        index2 = result.stderr.find("\n", index1)
-+        cc_topdir = repository_ctx.path(result.stderr[index1 + 1 : index2]).dirname
-+      else:
-+        # Fallback to the CC path
-+        cc_topdir = repository_ctx.path(cc).dirname.dirname
-+    cc_topdir_resolved = str(cc_topdir.realpath).strip()
-+    cc_topdir = str(cc_topdir).strip()
-+    if cc_topdir_resolved != cc_topdir:
-+        original_compiler_includes = [p.replace(cc_topdir_resolved, cc_topdir) for p in compiler_includes]
-+        compiler_includes = compiler_includes + original_compiler_includes
-+    return compiler_includes
-+
- def get_cxx_inc_directories(repository_ctx, cc, tf_sysroot):
-     """Compute the list of default C and C++ include directories."""
-
diff --git a/Golden_Repo/t/TensorFlow/TensorFlow-2.4.0_add-ldl.patch b/Golden_Repo/t/TensorFlow/TensorFlow-2.4.0_add-ldl.patch
deleted file mode 100644
index 611b44144..000000000
--- a/Golden_Repo/t/TensorFlow/TensorFlow-2.4.0_add-ldl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-The stacktrace library uses dladdr and friends but doesn't link libdl
-See https://github.com/tensorflow/tensorflow/issues/45013
-
-Author: Alexander Grund (TU Dresden)
-
-diff --git a/tensorflow/core/platform/BUILD b/tensorflow/core/platform/BUILD
-index 0a324f31023..56a9c9e2455 100644
---- a/tensorflow/core/platform/BUILD
-+++ b/tensorflow/core/platform/BUILD
-@@ -961,7 +961,8 @@ cc_library(
-     copts = tf_copts(),
-     linkopts = select({
-         "//tensorflow:windows": [],
--        "//conditions:default": ["-lm"],
-+        "//tensorflow:freebsd": ["-lm"],
-+        "//conditions:default": ["-lm", "-ldl"],
-     }),
-     deps = [
-         ":platform",
diff --git a/Golden_Repo/t/TensorFlow/TensorFlow-2.4.0_dont-use-var-lock.patch b/Golden_Repo/t/TensorFlow/TensorFlow-2.4.0_dont-use-var-lock.patch
deleted file mode 100644
index e33d0028a..000000000
--- a/Golden_Repo/t/TensorFlow/TensorFlow-2.4.0_dont-use-var-lock.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/tensorflow/tools/ci_build/gpu_build/parallel_gpu_execute.sh b/tensorflow/tools/ci_build/gpu_build/parallel_gpu_execute.sh
-index ee70f2f608b..ab5cbe7d7b5 100755
---- a/tensorflow/tools/ci_build/gpu_build/parallel_gpu_execute.sh
-+++ b/tensorflow/tools/ci_build/gpu_build/parallel_gpu_execute.sh
-@@ -53,7 +53,7 @@ TEST_BINARY="$(rlocation $TEST_WORKSPACE/${1#./})"
- shift
- # *******************************************************************
- 
--mkdir -p /var/lock
-+mkdir -p /tmp/tf-test-lock
- # Try to acquire any of the TF_GPU_COUNT * TF_TESTS_PER_GPU
- # slots to run a test at.
- #
-@@ -61,7 +61,7 @@ mkdir -p /var/lock
- # So, we iterate over TF_TESTS_PER_GPU first.
- for j in `seq 0 $((TF_TESTS_PER_GPU-1))`; do
-   for i in `seq 0 $((TF_GPU_COUNT-1))`; do
--    exec {lock_fd}>/var/lock/gpulock${i}_${j} || exit 1
-+    exec {lock_fd}>/tmp/tf-test-lock/gpulock${i}_${j} || exit 1
-     if flock -n "$lock_fd";
-     then
-       (
-@@ -70,6 +70,7 @@ for j in `seq 0 $((TF_TESTS_PER_GPU-1))`; do
-         export CUDA_VISIBLE_DEVICES=$i
-         export HIP_VISIBLE_DEVICES=$i
-         echo "Running test $TEST_BINARY $* on GPU $CUDA_VISIBLE_DEVICES"
-+        set +e
-         "$TEST_BINARY" $@
-       )
-       return_code=$?
-@@ -79,5 +80,5 @@ for j in `seq 0 $((TF_TESTS_PER_GPU-1))`; do
-   done
- done
- 
--echo "Cannot find a free GPU to run the test $* on, exiting with failure..."
-+echo "Cannot find a free GPU to run the test $TEST_BINARY $* on, exiting with failure..."
- exit 1
diff --git a/Golden_Repo/t/TensorFlow/TensorFlow-2.5.0-fix-alias-violation-in-absl.patch b/Golden_Repo/t/TensorFlow/TensorFlow-2.5.0-fix-alias-violation-in-absl.patch
deleted file mode 100644
index 427f7555e..000000000
--- a/Golden_Repo/t/TensorFlow/TensorFlow-2.5.0-fix-alias-violation-in-absl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-The behavior relied on by Abseil is unsupported by GCC and leads to misoptimizations.
-See https://github.com/tensorflow/tensorflow/issues/47179
-
-Author: Alexander Grund
-
-diff --git a/third_party/absl/com_google_absl_fix_mac_and_nvcc_build.patch b/third_party/absl/com_google_absl_fix_mac_and_nvcc_build.patch
-index 6301119ab2c..0b8b4838726 100644
---- a/third_party/absl/com_google_absl_fix_mac_and_nvcc_build.patch
-+++ b/third_party/absl/com_google_absl_fix_mac_and_nvcc_build.patch
-@@ -1,3 +1,16 @@
-+diff --git a/absl/container/internal/container_memory.h b/absl/container/internal/container_memory.h
-+index d24b0f8..f8847b5 100644
-+--- a/absl/container/internal/container_memory.h
-++++ b/absl/container/internal/container_memory.h
-+@@ -338,7 +338,7 @@ struct map_slot_policy {
-+   // If pair<const K, V> and pair<K, V> are layout-compatible, we can accept one
-+   // or the other via slot_type. We are also free to access the key via
-+   // slot_type::key in this case.
-+-  using kMutableKeys = memory_internal::IsLayoutCompatible<K, V>;
-++  using kMutableKeys = std::false_type;
-+
-+  public:
-+   static value_type& element(slot_type* slot) { return slot->value; }
- diff --git a/absl/container/internal/compressed_tuple.h b/absl/container/internal/compressed_tuple.h
- index 4bfe92f..01db713 100644
- --- a/absl/container/internal/compressed_tuple.h
diff --git a/Golden_Repo/t/TensorFlow/TensorFlow-2.5.0_add-support-for-large-core-systems.patch b/Golden_Repo/t/TensorFlow/TensorFlow-2.5.0_add-support-for-large-core-systems.patch
deleted file mode 100644
index 673d76d12..000000000
--- a/Golden_Repo/t/TensorFlow/TensorFlow-2.5.0_add-support-for-large-core-systems.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Enhance NumSchedulableCPUs to allow for nodes with more than 1024 cores
-See https://github.com/tensorflow/tensorflow/issues/49833
-
-Author: Alexander Grund (TU Dresden)
-
-diff --git a/tensorflow/core/platform/default/port.cc b/tensorflow/core/platform/default/port.cc
-index 8c8c8641b2c..e648f99c7f4 100644
---- a/tensorflow/core/platform/default/port.cc
-+++ b/tensorflow/core/platform/default/port.cc
-@@ -71,9 +71,19 @@ string JobName() {
- 
- int NumSchedulableCPUs() {
- #if defined(__linux__) && !defined(__ANDROID__)
--  cpu_set_t cpuset;
--  if (sched_getaffinity(0, sizeof(cpu_set_t), &cpuset) == 0) {
--    return CPU_COUNT(&cpuset);
-+  for(int ncpus = 1024; ncpus < std::numeric_limits<int>::max() / 2; ncpus *= 2) {
-+      size_t setsize = CPU_ALLOC_SIZE(ncpus);
-+      cpu_set_t* mask = CPU_ALLOC(ncpus);
-+      if (!mask)
-+        break;
-+      if (sched_getaffinity(0, setsize, mask) == 0) {
-+        int result = CPU_COUNT_S(setsize, mask);
-+        CPU_FREE(mask);
-+        return result;
-+      }
-+      CPU_FREE(mask);
-+      if (errno != EINVAL)
-+        break;
-   }
-   perror("sched_getaffinity");
- #endif
diff --git a/Golden_Repo/t/TensorFlow/TensorFlow-2.5.0_disable-avx512-extensions.patch b/Golden_Repo/t/TensorFlow/TensorFlow-2.5.0_disable-avx512-extensions.patch
deleted file mode 100644
index bbfad786f..000000000
--- a/Golden_Repo/t/TensorFlow/TensorFlow-2.5.0_disable-avx512-extensions.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-(Some of the) AVX512 extensions to Eigen introduced by TensorFlow are broken and return wrong values.
-So disable them for now to keep AVX512 in the other code parts working.
-See https://github.com/tensorflow/tensorflow/issues/49944
-
-Author: Alexander Grund (TU Dresden)
-
-diff --git a/third_party/eigen3/unsupported/Eigen/CXX11/FixedPoint b/third_party/eigen3/unsupported/Eigen/CXX11/FixedPoint
-index 67cb111db80..0f3593b6c78 100644
---- a/third_party/eigen3/unsupported/Eigen/CXX11/FixedPoint
-+++ b/third_party/eigen3/unsupported/Eigen/CXX11/FixedPoint
-@@ -31,7 +31,7 @@
- #include "src/FixedPoint/FixedPointTypes.h"
- 
- // Use optimized implementations whenever available
--#if defined (EIGEN_VECTORIZE_AVX512DQ) || defined (EIGEN_VECTORIZE_AVX512BW)
-+#if 0
- #include "src/FixedPoint/PacketMathAVX512.h"
- #include "src/FixedPoint/TypeCastingAVX512.h"
- 
diff --git a/Golden_Repo/t/TensorFlow/TensorFlow-2.5.0_fix-arm-vector-intrinsics.patch b/Golden_Repo/t/TensorFlow/TensorFlow-2.5.0_fix-arm-vector-intrinsics.patch
deleted file mode 100644
index 5d80e47df..000000000
--- a/Golden_Repo/t/TensorFlow/TensorFlow-2.5.0_fix-arm-vector-intrinsics.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-The comment is not true, the function actually takes the arguments as it should
-Hence just redefine the function
-
-Author: Alexander Grund (TU Dresden)
-
-diff --git a/tensorflow/lite/kernels/internal/optimized/depthwiseconv_3x3_filter_common.h b/tensorflow/lite/kernels/internal/optimized/depthwiseconv_3x3_filter_common.h
-index 916edd561ff..9c8025dac49 100644
---- a/tensorflow/lite/kernels/internal/optimized/depthwiseconv_3x3_filter_common.h
-+++ b/tensorflow/lite/kernels/internal/optimized/depthwiseconv_3x3_filter_common.h
-@@ -122,26 +122,7 @@ inline int32x4_t vpaddq_s32(int32x4_t a, int32x4_t b) {
- #endif  // !__aarch64__
- 
- #ifdef __ARM_FEATURE_DOTPROD
--// The vdotq_lane_s32 takes int8x8t for the rhs parameter, whereas the actual
--// instruction selects from between 4 32-bit (4x8-bit packed) sub-registers, an
--// unusual interpretation of "lane".
--inline int32x4_t vdotq_four_lane_s32(int32x4_t acc, int8x16_t lhs,
--                                     int8x16_t rhs, const int lane) {
--  switch (lane) {
--    case 0:
--      return vdotq_lane_s32(acc, lhs, vreinterpret_s32_s8(vget_low_s8(rhs)), 0);
--    case 1:
--      return vdotq_lane_s32(acc, lhs, vreinterpret_s32_s8(vget_low_s8(rhs)), 1);
--    case 2:
--      return vdotq_lane_s32(acc, lhs, vreinterpret_s32_s8(vget_high_s8(rhs)),
--                            0);
--    case 3:
--    default:
--      return vdotq_lane_s32(acc, lhs, vreinterpret_s32_s8(vget_high_s8(rhs)),
--                            1);
--  }
--}
--
-+#define vdotq_four_lane_s32 vdotq_lane_s32
- #else
- 
- inline int32x4_t vdotq_s32(int32x4_t acc, int8x16_t lhs, int8x16_t rhs) {
diff --git a/Golden_Repo/t/TensorFlow/TensorFlow-2.5.0_fix-crash-on-shutdown.patch b/Golden_Repo/t/TensorFlow/TensorFlow-2.5.0_fix-crash-on-shutdown.patch
deleted file mode 100644
index 18021a240..000000000
--- a/Golden_Repo/t/TensorFlow/TensorFlow-2.5.0_fix-crash-on-shutdown.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Releasing and reaquiring the GIL during Python shutdown is not possible and leads to force termination.
-Remove that.
-See https://github.com/tensorflow/tensorflow/issues/50853
-
-Author: Alexander Grund
-
-diff --git a/tensorflow/python/client/tf_session_wrapper.cc b/tensorflow/python/client/tf_session_wrapper.cc
-index 306381347c7..1208aa2ce61 100644
---- a/tensorflow/python/client/tf_session_wrapper.cc
-+++ b/tensorflow/python/client/tf_session_wrapper.cc
-@@ -557,8 +557,7 @@ PYBIND11_MODULE(_pywrap_tf_session, m) {
- 
-   m.def("TF_NewGraph", TF_NewGraph, py::return_value_policy::reference,
-         py::call_guard<py::gil_scoped_release>());
--  m.def("TF_DeleteGraph", TF_DeleteGraph,
--        py::call_guard<py::gil_scoped_release>());
-+  m.def("TF_DeleteGraph", TF_DeleteGraph);
- 
-   m.def("TF_GraphGetOpDef",
-         [](TF_Graph* graph, const char* op_name, TF_Buffer* output_op_def) {
diff --git a/Golden_Repo/t/TensorFlow/TensorFlow-2.5.0_fix_numpy_1.20_compatibility.patch b/Golden_Repo/t/TensorFlow/TensorFlow-2.5.0_fix_numpy_1.20_compatibility.patch
deleted file mode 100644
index d05986a8e..000000000
--- a/Golden_Repo/t/TensorFlow/TensorFlow-2.5.0_fix_numpy_1.20_compatibility.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-TF-2.5.0 and 2.6.0 are not compatible with numpy > 1.20
-During the testing phase, TensorFlow throws errors like this
-"Cannot convert a symbolic Tensor (lstm/strided_slice:0) to a numpy array.
-This error may indicate that you're trying to pass a Tensor to a NumPy call, which is not supported"
-See https://github.com/tensorflow/tensorflow/pull/48935
-
-Author: Alexander Grund (TU Dresden)
-
-diff --git a/tensorflow/python/framework/ops.py b/tensorflow/python/framework/ops.py
-index 4e12a8a1d17..73afdd4ed8a 100644
---- a/tensorflow/python/framework/ops.py
-+++ b/tensorflow/python/framework/ops.py
-@@ -864,7 +864,7 @@ class Tensor(internal.NativeObject, core_tf_types.Tensor):
-   __array_priority__ = 100
- 
-   def __array__(self):
--    raise NotImplementedError(
-+    raise TypeError(
-         "Cannot convert a symbolic Tensor ({}) to a numpy array."
-         " This error may indicate that you're trying to pass a Tensor to"
-         " a NumPy call, which is not supported".format(self.name))
-diff --git a/tensorflow/python/framework/ops_test.py b/tensorflow/python/framework/ops_test.py
-index c72b18e8df5..f69ec4a9ae2 100644
---- a/tensorflow/python/framework/ops_test.py
-+++ b/tensorflow/python/framework/ops_test.py
-@@ -188,7 +188,7 @@ class TensorAndShapeTest(test_util.TensorFlowTestCase):
-     with ops.Graph().as_default():
-       x = array_ops.ones((3, 4), name="test_ones")
- 
--    with self.assertRaisesRegex(NotImplementedError,
-+    with self.assertRaisesRegex(TypeError,
-                                 r"Cannot convert a symbolic.+test_ones"):
-       np.array(x)
- 
-diff --git a/tensorflow/python/ops/array_ops.py b/tensorflow/python/ops/array_ops.py
-index 77cebdad660..3c650d7808f 100644
---- a/tensorflow/python/ops/array_ops.py
-+++ b/tensorflow/python/ops/array_ops.py
-@@ -36,6 +36,7 @@ from tensorflow.python.framework import tensor_util
- from tensorflow.python.framework.constant_op import constant
- from tensorflow.python.ops import gen_array_ops
- from tensorflow.python.ops import gen_math_ops
-+from tensorflow.python.ops import math_ops
- # go/tf-wildcard-import
- # pylint: disable=wildcard-import
- from tensorflow.python.ops.gen_array_ops import *
-@@ -2897,7 +2898,7 @@ def matrix_set_diag(
- 
- def _constant_if_small(value, shape, dtype, name):
-   try:
--    if np.prod(shape) < 1000:
-+    if math_ops.reduce_prod(shape) < 1000:
-       return constant(value, shape=shape, dtype=dtype, name=name)
-   except (NotImplementedError, TypeError):
-     # Happens when shape is a Tensor, list with Tensor elements, etc.
diff --git a/Golden_Repo/t/TensorFlow/TensorFlow-2.5.0_fix_protobuf_error_message.patch b/Golden_Repo/t/TensorFlow/TensorFlow-2.5.0_fix_protobuf_error_message.patch
deleted file mode 100644
index addc55bd7..000000000
--- a/Golden_Repo/t/TensorFlow/TensorFlow-2.5.0_fix_protobuf_error_message.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Fix an issue where TensorFlow 2.5/2.6 won't build with a protobuf newer than 3.14
-Additionally, a TypeError ("expected tensorflow.TensorShapeProto got tensorflow.TensorShapeProto")
-is fixed by inverting the import statements.
-Solution/patch obtained from https://bugs.gentoo.org/800824
-
-diff -Nrup tensorflow-2.5.0_old/tensorflow/core/kernels/example_parsing_ops.cc tensorflow-2.5.0/tensorflow/core/kernels/example_parsing_ops.cc
---- tensorflow-2.5.0_old/tensorflow/core/kernels/example_parsing_ops.cc	2021-05-12 15:26:41.000000000 +0200
-+++ tensorflow-2.5.0/tensorflow/core/kernels/example_parsing_ops.cc	2021-07-14 08:09:39.927536430 +0200
-@@ -1218,7 +1218,7 @@ class DecodeJSONExampleOp : public OpKer
-           resolver_.get(), "type.googleapis.com/tensorflow.Example", &in, &out);
-       OP_REQUIRES(ctx, status.ok(),
-                   errors::InvalidArgument("Error while parsing JSON: ",
--                                          string(status.error_message())));
-+                                          string(status.message())));
-     }
-   }
- 
-diff -Nrup tensorflow-2.5.0_old/tensorflow/python/__init__.py tensorflow-2.5.0/tensorflow/python/__init__.py
---- tensorflow-2.5.0_old/tensorflow/python/__init__.py	2021-05-12 15:26:41.000000000 +0200
-+++ tensorflow-2.5.0/tensorflow/python/__init__.py	2021-07-14 08:09:55.696294764 +0200
-@@ -37,8 +37,8 @@ import traceback
- # go/tf-wildcard-import
- # pylint: disable=wildcard-import,g-bad-import-order,g-import-not-at-top
- 
--from tensorflow.python.eager import context
- from tensorflow.python import pywrap_tensorflow as _pywrap_tensorflow
-+from tensorflow.python.eager import context
- 
- # pylint: enable=wildcard-import
- 
diff --git a/Golden_Repo/t/TensorFlow/TensorFlow-2.5.0_remove-duplicate-gpu-tests.patch b/Golden_Repo/t/TensorFlow/TensorFlow-2.5.0_remove-duplicate-gpu-tests.patch
deleted file mode 100644
index 4e40a81b1..000000000
--- a/Golden_Repo/t/TensorFlow/TensorFlow-2.5.0_remove-duplicate-gpu-tests.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-TensorFlow adds some GPU tests twice increasing the runtime of the test suite.
-This filters out the test part meant for CPU.
-
-See https://github.com/tensorflow/tensorflow/issues/47081
-
-Author: Alexander Grund (TU Dresden)
-
-diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl
-index a4be1fea8bb..2343b8985f8 100644
---- a/tensorflow/tensorflow.bzl
-+++ b/tensorflow/tensorflow.bzl
-@@ -1116,19 +1116,20 @@ def tf_gpu_cc_test(
-         args = [],
-         kernels = [],
-         linkopts = []):
--    tf_cc_test(
--        name = name,
--        size = size,
--        srcs = srcs,
--        args = args,
--        data = data,
--        extra_copts = extra_copts + if_cuda(["-DNV_CUDNN_DISABLE_EXCEPTION"]),
--        kernels = kernels,
--        linkopts = linkopts,
--        linkstatic = linkstatic,
--        tags = tags,
--        deps = deps,
--    )
-+    if 'gpu' not in tags:
-+        tf_cc_test(
-+            name = name,
-+            size = size,
-+            srcs = srcs,
-+            args = args,
-+            data = data,
-+            extra_copts = extra_copts + if_cuda(["-DNV_CUDNN_DISABLE_EXCEPTION"]),
-+            kernels = kernels,
-+            linkopts = linkopts,
-+            linkstatic = linkstatic,
-+            tags = tags,
-+            deps = deps,
-+        )
-     tf_cc_test(
-         name = name,
-         size = size,
diff --git a/Golden_Repo/t/TensorFlow/TensorFlow-2.6.0-gcccoremkl-11.2.0-2021.4.0-CUDA-11.5.eb b/Golden_Repo/t/TensorFlow/TensorFlow-2.6.0-gcccoremkl-11.2.0-2021.4.0-CUDA-11.5.eb
deleted file mode 100644
index 20c7bad30..000000000
--- a/Golden_Repo/t/TensorFlow/TensorFlow-2.6.0-gcccoremkl-11.2.0-2021.4.0-CUDA-11.5.eb
+++ /dev/null
@@ -1,264 +0,0 @@
-easyblock = 'PythonBundle'
-
-name = 'TensorFlow'
-version = '2.6.0'
-versionsuffix = '-CUDA-%(cudaver)s'
-
-homepage = 'https://www.tensorflow.org/'
-description = "An open-source software library for Machine Intelligence"
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('Bazel', '3.7.2'),
-    ('protobuf', '3.17.3'),
-    # git 2.x required, see also https://github.com/tensorflow/tensorflow/issues/29053
-    ('git', '2.33.1', '-nodocs'),
-    ('pybind11', '2.7.1'),
-    ('UnZip', '6.0'),
-]
-dependencies = [
-    ('CUDA', '11.5', '', True),
-    ('cuDNN', '8.3.1.22', versionsuffix, True),
-    ('NCCL', '2.12.7-1', '-GCCcore-11.2.0%s' % versionsuffix, True),
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10'),
-    ('h5py', '3.5.0', '-serial'),
-    ('cURL', '7.78.0'),
-    ('double-conversion', '3.1.6'),
-    ('flatbuffers', '2.0.0'),
-    ('giflib', '5.2.1'),
-    ('hwloc', '2.5.0'),
-    ('ICU', '70.1'),
-    ('JsonCpp', '1.9.4'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('LMDB', '0.9.29'),
-    ('NASM', '2.15.05'),
-    ('nsync', '1.24.0'),
-    ('SQLite', '3.36'),
-    ('protobuf-python', '3.17.3'),
-    ('flatbuffers-python', '2.0'),
-    ('typing-extensions', '3.10.0.0'),
-    ('libpng', '1.6.37'),
-    ('snappy', '1.1.9'),
-    ('zlib', '1.2.11'),
-]
-
-use_pip = True
-sanity_pip_check = True
-
-postinstallcmds = [
-    'patch -p0 -d %(installdir)s < %(builddir)s/TensorFlow/tensorflow-2.6.0/tools/tensorboard-2.6.0-jupyter.fix']
-
-# Dependencies created and updated using findPythonDeps.sh:
-# https://gist.github.com/Flamefire/49426e502cd8983757bd01a08a10ae0d
-exts_list = [
-    ('Markdown', '3.3.4', {
-        'checksums': ['31b5b491868dcc87d6c24b7e3d19a0d730d59d3e46f4eea6430a321bed387a49'],
-    }),
-    ('pyasn1-modules', '0.2.8', {
-        'checksums': ['905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e'],
-    }),
-    ('rsa', '4.7.2', {
-        'checksums': ['9d689e6ca1b3038bc82bf8d23e944b6b6037bc02301a574935b2dd946e0353b9'],
-    }),
-    ('cachetools', '4.2.2', {
-        'checksums': ['61b5ed1e22a0924aed1d23b478f37e8d52549ff8a961de2909c69bf950020cff'],
-    }),
-    ('google-auth', '1.35.0', {
-        'modulename': 'google.auth',
-        'checksums': ['b7033be9028c188ee30200b204ea00ed82ea1162e8ac1df4aa6ded19a191d88e'],
-    }),
-    ('oauthlib', '3.1.1', {
-        'checksums': ['8f0215fcc533dd8dd1bee6f4c412d4f0cd7297307d43ac61666389e3bc3198a3'],
-    }),
-    ('requests-oauthlib', '1.3.0', {
-        'checksums': ['b4261601a71fd721a8bd6d7aa1cc1d6a8a93b4a9f5e96626f8e4d91e8beeaa6a'],
-    }),
-    ('google-auth-oauthlib', '0.4.5', {
-        'checksums': ['4ab58e6c3dc6ccf112f921fcced40e5426fba266768986ea502228488276eaba'],
-    }),
-    ('absl-py', '0.13.0', {
-        'modulename': 'absl',
-        'checksums': ['6953272383486044699fd0e9f00aad167a27e08ce19aae66c6c4b10e7e767793'],
-    }),
-    ('astunparse', '1.6.3', {
-        'checksums': ['5ad93a8456f0d084c3456d059fd9a92cce667963232cbf763eac3bc5b7940872'],
-    }),
-    ('grpcio', '1.39.0', {
-        'modulename': 'grpc',
-        'checksums': ['57974361a459d6fe04c9ae0af1845974606612249f467bbd2062d963cb90f407'],
-    }),
-    ('gviz-api', '1.9.0', {
-        'source_tmpl': 'gviz_api-%(version)s.tar.gz',
-        'checksums': ['43d13ccc21834d0501b33a291ef3265e933dbb4bbdca3d34b1ed0a048c0ef640'],
-    }),
-    ('tensorboard_data_server', '0.6.1', {
-        'source_tmpl': '%(name)s-%(version)s-py3-none-any.whl',
-        'checksums': ['809fe9887682d35c1f7d1f54f0f40f98bb1f771b14265b453ca051e2ce58fca7'],
-    }),
-    ('tensorboard', version, {
-        'source_tmpl': '%(name)s-%(version)s-py3-none-any.whl',
-        'checksums': ['f7dac4cdfb52d14c9e3f74585ce2aaf8e6203620a864e51faf84988b09f7bbdb'],
-    }),
-    ('tensorboard_plugin_wit', '1.8.0', {
-        'source_tmpl': '%(name)s-%(version)s-py3-none-any.whl',
-        'checksums': ['2a80d1c551d741e99b2f197bb915d8a133e24adb8da1732b840041860f91183a'],
-    }),
-    ('tensorboard_plugin_profile', '2.5.0', {
-        'checksums': ['f832698d87a773b9a017fc4dd5cf598a1ff942ccfbf3392c83fe12c949ab9f52'],
-    }),
-    ('google-pasta', '0.2.0', {
-        'modulename': 'pasta',
-        'checksums': ['c9f2c8dfc8f96d0d5808299920721be30c9eec37f2389f28904f454565c8a16e'],
-    }),
-    ('termcolor', '1.1.0', {
-        'checksums': ['1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b'],
-    }),
-    ('tensorflow_estimator', version, {
-        'source_tmpl': '%(name)s-%(version)s-py2.py3-none-any.whl',
-        'checksums': ['cf78528998efdb637ac0abaf525c929bf192767544eb24ae20d9266effcf5afd'],
-    }),
-    ('astor', '0.8.1', {
-        'checksums': ['6a6effda93f4e1ce9f618779b2dd1d9d84f1e32812c23a29b3fff6fd7f63fa5e'],
-    }),
-    ('gast', '0.4.0', {
-        'checksums': ['40feb7b8b8434785585ab224d1568b857edb18297e5a3047f1ba012bc83b42c1'],
-    }),
-    ('pythran', '0.9.11', {
-        'checksums': ['a317f91e2aade9f6550dc3bf40b5caeb45b7e012daf27e2b3e4ad928edb01667'],
-    }),
-    ('beniget', '0.3.0', {
-        'checksums': ['062c893be9cdf87c3144fb15041cce4d81c67107c1591952cd45fdce789a0ff1'],
-    }),
-    ('clang', '5.0', {
-        'checksums': ['ceccae97eda0225a5b44d42ffd61102e248325c2865ca53e4407746464a5333a'],
-    }),
-    ('opt_einsum', '3.3.0', {
-        'checksums': ['59f6475f77bbc37dcf7cd748519c0ec60722e91e63ca114e68821c0c54a46549'],
-    }),
-    ('wrapt', '1.12.1', {
-        'checksums': ['b62ffa81fb85f4332a4f609cab4ac40709470da05643a082ec1eb88e6d9b97d7'],
-    }),
-    ('Keras_Preprocessing', '1.1.2', {
-        'checksums': ['add82567c50c8bc648c14195bf544a5ce7c1f76761536956c3d2978970179ef3'],
-    }),
-    ('dill', '0.3.3', {
-        'source_tmpl': '%(name)s-%(version)s.zip',
-        'checksums': ['efb7f6cb65dba7087c1e111bb5390291ba3616741f96840bfc75792a1a9b5ded'],
-    }),
-    ('tblib', '1.7.0', {
-        'checksums': ['059bd77306ea7b419d4f76016aef6d7027cc8a0785579b5aad198803435f882c'],
-    }),
-    ('portpicker', '1.4.0', {
-        'checksums': ['c2831ff4328a21e928ffc9e52124bcafacaf5816d38a1a72dc329680dc1bb7ba'],
-    }),
-    ('keras', version, {
-        'source_tmpl': '%(name)s-%(version)s-py2.py3-none-any.whl',
-        'checksums': ['504af5656a9829fe803ce48a8580ef16916e89906aceddad9e098614269437e7'],
-    }),
-    (name, version, {
-        'patches': [
-            'TensorFlow-2.1.0_fix-cuda-build.patch',
-            'TensorFlow-2.4.0_add-ldl.patch',
-            'TensorFlow-2.4.0_dont-use-var-lock.patch',
-            'TensorFlow-2.5.0_add-support-for-large-core-systems.patch',
-            'TensorFlow-2.5.0_disable-avx512-extensions.patch',
-            'TensorFlow-2.5.0-fix-alias-violation-in-absl.patch',
-            'TensorFlow-2.5.0_fix-arm-vector-intrinsics.patch',
-            'TensorFlow-2.5.0_fix-crash-on-shutdown.patch',
-            'TensorFlow-2.5.0_fix_numpy_1.20_compatibility.patch',
-            'TensorFlow-2.5.0_fix_protobuf_error_message.patch',
-            'TensorFlow-2.5.0_remove-duplicate-gpu-tests.patch',
-            'TensorFlow-2.6.0_add-default-shell-env.patch',
-            'TensorFlow-2.6.0_downgrade-required-versions.patch',
-            ('tensorboard-2.6.0-jupyter.fix', 'tools'),
-        ],
-        'source_tmpl': 'v%(version)s.tar.gz',
-        'source_urls': ['https://github.com/tensorflow/tensorflow/archive/'],
-        'test_script': 'TensorFlow-2.x_mnist-test.py',
-        'test_tag_filters_cpu': '-gpu,-tpu,-no_cuda_on_cpu_tap,-no_pip,-no_oss,-oss_serial,-benchmark-test,-v1only',
-        'test_tag_filters_gpu': "gpu,-no_gpu,-nogpu,-gpu_cupti,-no_cuda11,-no_pip,-no_oss,-oss_serial, \
-                                   -benchmark-test,-v1only",
-        'test_targets': [
-            '//tensorflow/core/...',
-            '-//tensorflow/core:example_java_proto',
-            '-//tensorflow/core/example:example_protos_closure',
-            '//tensorflow/cc/...',
-            '//tensorflow/c/...',
-            '//tensorflow/python/...',
-            '-//tensorflow/c/eager:c_api_test_gpu',
-            '-//tensorflow/c/eager:c_api_distributed_test',
-            '-//tensorflow/c/eager:c_api_distributed_test_gpu',
-            '-//tensorflow/c/eager:c_api_cluster_test_gpu',
-            '-//tensorflow/c/eager:c_api_remote_function_test_gpu',
-            '-//tensorflow/c/eager:c_api_remote_test_gpu',
-            '-//tensorflow/core/common_runtime:collective_param_resolver_local_test',
-            '-//tensorflow/core/common_runtime:mkl_layout_pass_test',
-            '-//tensorflow/core/kernels/mkl:mkl_fused_ops_test',
-            '-//tensorflow/core/kernels/mkl:mkl_fused_batch_norm_op_test',
-            '-//tensorflow/python/kernel_tests/distributions:beta_test',
-            '-//tensorflow/python/kernel_tests:unique_op_test',
-            '-//tensorflow/python/kernel_tests/distributions:beta_test_gpu',
-            '-//tensorflow/python/kernel_tests:unique_op_test_gpu',
-            '-//tensorflow/python/keras/preprocessing:image_dataset_test',
-            '-//tensorflow/python/data/kernel_tests:placement_test',
-            '-//tensorflow/python/distribute:distribute_lib_test',
-            '-//tensorflow/python/kernel_tests:list_ops_test',
-            '-//tensorflow/python/kernel_tests:map_fn_test',
-            '-//tensorflow/python/data/kernel_tests:batch_test',
-            '-//tensorflow/python/data/experimental/kernel_tests:parallel_interleave_test',
-            '-//tensorflow/python/data/kernel_tests:map_test',
-            '-//tensorflow/python/data/kernel_tests:interleave_test',
-            '-//tensorflow/python/data/kernel_tests:dataset_test',
-            '-//tensorflow/python/data/kernel_tests:shuffle_test',
-            '-//tensorflow/python/data/kernel_tests:reduce_test',
-            '-//tensorflow/python/data/kernel_tests:iterator_test',
-            '-//tensorflow/c/eager:c_api_experimental_test_gpu',
-            '-//tensorflow/core/common_runtime/gpu:pool_allocator_test_gpu',
-            '-//tensorflow/core/kernels:diag_op_test_gpu',
-            '-//tensorflow/python/data/kernel_tests:iterator_test_gpu',
-            '-//tensorflow/python/data/kernel_tests:placement_test_gpu',
-            '-//tensorflow/python/kernel_tests:list_ops_test_gpu',
-            '-//tensorflow/python/kernel_tests:map_fn_test_gpu',
-            '-//tensorflow/python/data/kernel_tests:memory_cleanup_test_gpu',
-            '-//tensorflow/python/data/kernel_tests:reduce_test_gpu',
-        ],
-        'testopts': "--test_timeout=3600 --test_size_filters=small",
-        'testopts_gpu': "--test_timeout=3600 --test_size_filters=small \
-                           --run_under=//tensorflow/tools/ci_build/gpu_build:parallel_gpu_execute",
-        'with_xla': True,
-        'checksums': [
-            '41b32eeaddcbc02b0583660bcf508469550e4cd0f86b22d2abe72dfebeacde0f',  # v2.6.0.tar.gz
-            '78c20aeaa7784b8ceb46238a81e8c2461137d28e0b576deeba8357d23fbe1f5a',  # TensorFlow-2.1.0_fix-cuda-build.patch
-            '917ee7282e782e48673596d8917c3207e60e0851bb9acf230a2a439b067af2e3',  # TensorFlow-2.4.0_add-ldl.patch
-            # TensorFlow-2.4.0_dont-use-var-lock.patch
-            'b14f2493fd2edf79abd1c4f2dde6c98a3e7d5cb9c25ab9386df874d5f072d6b5',
-            # TensorFlow-2.5.0_add-support-for-large-core-systems.patch
-            '915f3477d6407fafd48269fe1e684a05ce361d9b9b85e58686682df87760f636',
-            # TensorFlow-2.5.0_disable-avx512-extensions.patch
-            '3655ce24c97569ac9738c07cac85347ba6f5c815ada95b19b606ffa46d4dda03',
-            # TensorFlow-2.5.0-fix-alias-violation-in-absl.patch
-            '12454fda3330fb45cd380377e283f04488b40e0b8ae7378e786ddf731a581f75',
-            # TensorFlow-2.5.0_fix-arm-vector-intrinsics.patch
-            '6abfadc0f67ff3b510d70430843201cb46d7bd65db045ec9b482af70e0c8c0c8',
-            # TensorFlow-2.5.0_fix-crash-on-shutdown.patch
-            '578c7493221ebd3dc25ca43d63a72cbb28fdf4112b1e2baa7390f25781bd78fd',
-            # TensorFlow-2.5.0_fix_numpy_1.20_compatibility.patch
-            '4c32aba417e6ecb2642d5828b4ac618f1e4395f6c217cd621fa08a74433faa55',
-            # TensorFlow-2.5.0_fix_protobuf_error_message.patch
-            '4ca80aac8f7394f4c83af5e8b237f6264dde3d55d10bf0dcb93e49ee5e1c5697',
-            # TensorFlow-2.5.0_remove-duplicate-gpu-tests.patch
-            'b940d438e036faac24453bff2cf1834c5e1359e87e84d1f1999fa7a30b278fec',
-            # TensorFlow-2.6.0_add-default-shell-env.patch
-            '8cc54ff4bc8e5fc8edd3a5e41ad338532e16db5c64a941cc45e1011d4b40dba7',
-            # TensorFlow-2.6.0_downgrade-required-versions.patch
-            'e941df7025d39a6b57f508779775cf896691c34abe61d5f2eba9b891ef20d51a',
-            # Fix for tensorboard
-            '1c8071708c8d28635ecd419b136594fd39124fda58ff389115398fd7ea1207c8',
-        ],
-    }),
-]
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/t/TensorFlow/TensorFlow-2.6.0_add-default-shell-env.patch b/Golden_Repo/t/TensorFlow/TensorFlow-2.6.0_add-default-shell-env.patch
deleted file mode 100644
index b80d92f02..000000000
--- a/Golden_Repo/t/TensorFlow/TensorFlow-2.6.0_add-default-shell-env.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-Make TensorFlow use the environment as set by EasyBuild
-
-From https://github.com/tensorflow/tensorflow/pull/44549
-
-Author: Alexander Grund (TU Dresden)
-
-diff --git a/tensorflow/core/kernels/mlir_generated/build_defs.bzl b/tensorflow/core/kernels/mlir_generated/build_defs.bzl
-index a6a136b8e38..e614b20bb02 100644
---- a/tensorflow/core/kernels/mlir_generated/build_defs.bzl
-+++ b/tensorflow/core/kernels/mlir_generated/build_defs.bzl
-@@ -68,6 +68,7 @@ def _gen_mlir_op_impl(ctx):
-                 ctx.outputs.out.path,
-             )
-         ),
-+        use_default_shell_env = True,
-     )
- 
- _gen_mlir_op_rule = rule(
-@@ -157,6 +158,7 @@ def _gen_kernel_bin_impl(ctx):
-             "--enable_ftz=%s" % (ctx.attr.data_type == "f32"),
-             "--cpu_codegen=%s" % ctx.attr.cpu_codegen,
-         ],
-+        use_default_shell_env = True,
-         mnemonic = "compile",
-     )
-     compilation_outputs = cc_common.create_compilation_outputs(
-diff --git a/third_party/flatbuffers/build_defs.bzl b/third_party/flatbuffers/build_defs.bzl
-index d409f836cb0..754db3f5d86 100644
---- a/third_party/flatbuffers/build_defs.bzl
-+++ b/third_party/flatbuffers/build_defs.bzl
-@@ -394,6 +394,7 @@ def _concat_flatbuffer_py_srcs_impl(ctx):
-             ctx.attr.deps[0].files.to_list()[0].path,
-             ctx.outputs.out.path,
-         ),
-+        use_default_shell_env = True,
-     )
- 
- _concat_flatbuffer_py_srcs = rule(
-diff --git a/third_party/mlir/tblgen.bzl b/third_party/mlir/tblgen.bzl
-index 37577ed31ef..448284daefe 100644
---- a/third_party/mlir/tblgen.bzl
-+++ b/third_party/mlir/tblgen.bzl
-@@ -154,6 +154,7 @@ def _gentbl_rule_impl(ctx):
-         executable = ctx.executable.tblgen,
-         arguments = [args],
-         mnemonic = "TdGenerate",  # Kythe extractor hook.
-+        use_default_shell_env = True,
-     )
- 
-     return [DefaultInfo()]
-diff --git a/third_party/nccl/build_defs.bzl.tpl b/third_party/nccl/build_defs.bzl.tpl
-index c8757174038..fe163741f87 100644
---- a/third_party/nccl/build_defs.bzl.tpl
-+++ b/third_party/nccl/build_defs.bzl.tpl
-@@ -100,6 +100,7 @@ def _device_link_impl(ctx):
-                 "--output-file=%s" % cubin.path,
-             ] + [file.path for file in inputs],
-             mnemonic = "nvlink",
-+            use_default_shell_env = True,
-         )
-         cubins.append(cubin)
-         images.append("--image=profile=%s,file=%s" % (arch, cubin.path))
-@@ -125,6 +126,7 @@ def _device_link_impl(ctx):
-         arguments = arguments_list + images,
-         tools = [bin2c],
-         mnemonic = "fatbinary",
-+        use_default_shell_env = True,
-     )
- 
-     # Generate the source file #including the headers generated above.
-@@ -203,6 +205,7 @@ def _prune_relocatable_code_impl(ctx):
-             executable = ctx.file._nvprune,
-             arguments = arguments,
-             mnemonic = "nvprune",
-+            use_default_shell_env = True,
-         )
-         outputs.append(output)
- 
-@@ -236,6 +239,7 @@ def _merge_archive_impl(ctx):
-         inputs = ctx.files.srcs,  # + ctx.files._crosstool,
-         outputs = [ctx.outputs.out],
-         command = "echo -e \"%s\" | %s -M" % (mri_script, cc_toolchain.ar_executable),
-+        use_default_shell_env = True,
-     )
- 
- _merge_archive = rule(
-diff --git a/third_party/systemlibs/grpc.bazel.generate_cc.bzl b/third_party/systemlibs/grpc.bazel.generate_cc.bzl
-index 1534e526fd1..cd7304a9515 100644
---- a/third_party/systemlibs/grpc.bazel.generate_cc.bzl
-+++ b/third_party/systemlibs/grpc.bazel.generate_cc.bzl
-@@ -140,6 +140,7 @@ def generate_cc_impl(ctx):
-         outputs = out_files,
-         executable = ctx.executable._protoc,
-         arguments = arguments,
-+        use_default_shell_env = True,
-     )
- 
-     return struct(files = depset(out_files))
diff --git a/Golden_Repo/t/TensorFlow/TensorFlow-2.6.0_downgrade-required-versions.patch b/Golden_Repo/t/TensorFlow/TensorFlow-2.6.0_downgrade-required-versions.patch
deleted file mode 100644
index 15ec38598..000000000
--- a/Golden_Repo/t/TensorFlow/TensorFlow-2.6.0_downgrade-required-versions.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-TF introduced a change pinning versions to fixed major.minor or even patch versions
-Loosen those a bit so we can build it with our versions.
-See https://github.com/tensorflow/tensorflow/issues/44654
-
-Author: Alexander Grund (TU Dresden)
-
-diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py
-index 3d4a64de2b4..b89d077a150 100644
---- a/tensorflow/tools/pip_package/setup.py
-+++ b/tensorflow/tools/pip_package/setup.py
-@@ -78,20 +78,20 @@ REQUIRED_PACKAGES = [
-     # NOTE: As numpy has releases that break semver guarantees and several other
-     # deps depend on numpy without an upper bound, we must install numpy before
-     # everything else.
--    'numpy ~= 1.19.2',
-+    'numpy >= 1.19.2',
-     # Install other dependencies
-     'absl-py ~= 0.10',
-     'astunparse ~= 1.6.3',
-     'clang ~= 5.0',
--    'flatbuffers ~= 1.12.0',
-+    'flatbuffers >= 1.12.0',
-     'google_pasta ~= 0.2',
--    'h5py ~= 3.1.0',
-+    'h5py ~= 3.1',
-     'keras_preprocessing ~= 1.1.2',
-     'opt_einsum ~= 3.3.0',
-     'protobuf >= 3.9.2',
--    'six ~= 1.15.0',
-+    'six >= 1.15.0',
-     'termcolor ~= 1.1.0',
--    'typing_extensions ~= 3.7.4',
-+    'typing_extensions >= 3.7.4',
-     'wheel ~= 0.35',
-     'wrapt ~= 1.12.1',
-     # These packages need to be pinned exactly as newer versions are
diff --git a/Golden_Repo/t/TensorFlow/h5py-2.10.0_avoid-mpi-init.patch b/Golden_Repo/t/TensorFlow/h5py-2.10.0_avoid-mpi-init.patch
deleted file mode 100644
index 980347764..000000000
--- a/Golden_Repo/t/TensorFlow/h5py-2.10.0_avoid-mpi-init.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-avoid that 'import h5py' triggers MPI_Init via mpi4py
-
-backported to h5py 2.10.0 from https://github.com/h5py/h5py/pull/1552 by Kenneth Hoste (HPC-UGent)
-
-diff -ru h5py-2.10.0.orig/h5py/api_types_ext.pxd h5py-2.10.0/h5py/api_types_ext.pxd
---- h5py-2.10.0.orig/h5py/api_types_ext.pxd	2019-09-06 23:29:33.000000000 +0200
-+++ h5py-2.10.0/h5py/api_types_ext.pxd	2020-05-25 19:30:30.000000000 +0200
-@@ -12,7 +12,7 @@
- include 'config.pxi'
- 
- IF MPI:
--    from mpi4py.MPI cimport MPI_Comm, MPI_Info, Comm, Info
-+    from mpi4py.libmpi cimport MPI_Comm, MPI_Info
- 
- cdef extern from "stdlib.h":
-   ctypedef long size_t
-@@ -52,6 +52,7 @@
- cdef extern from "Python.h":
-   ctypedef void PyObject
-   ctypedef ssize_t Py_ssize_t
-+  ctypedef size_t Py_uintptr_t
- 
-   PyObject* PyErr_Occurred()
-   void PyErr_SetString(object type, char *message)
-diff -ru h5py-2.10.0.orig/h5py/h5p.pyx h5py-2.10.0/h5py/h5p.pyx
---- h5py-2.10.0.orig/h5py/h5p.pyx	2019-09-06 23:29:33.000000000 +0200
-+++ h5py-2.10.0/h5py/h5p.pyx	2020-05-25 19:33:24.000000000 +0200
-@@ -17,6 +17,7 @@
- from cpython.buffer cimport PyObject_CheckBuffer, \
-                             PyObject_GetBuffer, PyBuffer_Release, \
-                             PyBUF_SIMPLE
-+from cpython.long cimport PyLong_AsVoidPtr
- 
- from utils cimport  require_tuple, convert_dims, convert_tuple, \
-                     emalloc, efree, \
-@@ -1161,7 +1162,7 @@
- 
-     IF MPI:
-         @with_phil
--        def set_fapl_mpio(self, Comm comm not None, Info info not None):
-+        def set_fapl_mpio(self, comm, info):
-             """ (Comm comm, Info info)
- 
-             Set MPI-I/O Parallel HDF5 driver.
-@@ -1169,7 +1170,12 @@
-             Comm: An mpi4py.MPI.Comm instance
-             Info: An mpi4py.MPI.Info instance
-             """
--            H5Pset_fapl_mpio(self.id, comm.ob_mpi, info.ob_mpi)
-+            from mpi4py.MPI import Comm, Info, _handleof
-+            assert isinstance(comm, Comm)
-+            assert isinstance(info, Info)
-+            cdef Py_uintptr_t _comm = _handleof(comm)
-+            cdef Py_uintptr_t _info = _handleof(info)
-+            H5Pset_fapl_mpio(self.id, <MPI_Comm>_comm, <MPI_Info>_info)
- 
- 
-         @with_phil
-@@ -1183,20 +1189,22 @@
-             """
-             cdef MPI_Comm comm
-             cdef MPI_Info info
-+            from mpi4py.MPI import Comm, Info, _addressof
- 
-             H5Pget_fapl_mpio(self.id, &comm, &info)
-             pycomm = Comm()
--            pyinfo = Info()
--            MPI_Comm_dup(comm, &pycomm.ob_mpi)
--            MPI_Info_dup(info, &pyinfo.ob_mpi)
-+            MPI_Comm_dup(comm, <MPI_Comm *>PyLong_AsVoidPtr(_addressof(pycomm)))
-             MPI_Comm_free(&comm)
-+
-+            pyinfo = Info()
-+            MPI_Info_dup(info, <MPI_Info *>PyLong_AsVoidPtr(_addressof(pyinfo)))
-             MPI_Info_free(&info)
- 
-             return (pycomm, pyinfo)
- 
- 
-         @with_phil
--        def set_fapl_mpiposix(self, Comm comm not None, bint use_gpfs_hints=0):
-+        def set_fapl_mpiposix(self, comm, bint use_gpfs_hints=0):
-             """ Obsolete.
-             """
-             raise RuntimeError("MPI-POSIX driver is broken; removed in h5py 2.3.1")
diff --git a/Golden_Repo/t/TensorFlow/scipy-1.4.1-fix-pthread.patch b/Golden_Repo/t/TensorFlow/scipy-1.4.1-fix-pthread.patch
deleted file mode 100644
index d399b2ba4..000000000
--- a/Golden_Repo/t/TensorFlow/scipy-1.4.1-fix-pthread.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From https://github.com/scipy/scipy/pull/11324
-Author: Peter Bell <peterbell10@live.co.uk>
-diff --git a/scipy/fft/_pocketfft/setup.py b/scipy/fft/_pocketfft/setup.py
-index a4411bdedb1..493387d9719 100644
---- a/scipy/fft/_pocketfft/setup.py
-+++ b/scipy/fft/_pocketfft/setup.py
-@@ -5,20 +5,28 @@ def pre_build_hook(build_ext, ext):
-     cc = build_ext._cxx_compiler
-     args = ext.extra_compile_args
- 
--    std_flag = get_cxx_std_flag(build_ext._cxx_compiler)
-+    std_flag = get_cxx_std_flag(cc)
-     if std_flag is not None:
-         args.append(std_flag)
- 
-     if cc.compiler_type == 'msvc':
-         args.append('/EHsc')
-     else:
--        try_add_flag(args, cc, '-fvisibility=hidden')
--
-+        # Use pthreads if available
-         has_pthreads = try_compile(cc, code='#include <pthread.h>\n'
-                                    'int main(int argc, char **argv) {}')
-         if has_pthreads:
-             ext.define_macros.append(('POCKETFFT_PTHREADS', None))
--
-+            if has_flag(cc, '-pthread'):
-+                args.append('-pthread')
-+                ext.extra_link_args.append('-pthread')
-+            else:
-+                raise RuntimeError("Build failed: System has pthreads header "
-+                                   "but could not compile with -pthread option")
-+
-+        # Don't export library symbols
-+        try_add_flag(args, cc, '-fvisibility=hidden')
-+        # Set min macOS version
-         min_macos_flag = '-mmacosx-version-min=10.9'
-         import sys
-         if sys.platform == 'darwin' and has_flag(cc, min_macos_flag):
diff --git a/Golden_Repo/t/TensorFlow/tensorboard-2.6.0-jupyter.fix b/Golden_Repo/t/TensorFlow/tensorboard-2.6.0-jupyter.fix
deleted file mode 100644
index c85388702..000000000
--- a/Golden_Repo/t/TensorFlow/tensorboard-2.6.0-jupyter.fix
+++ /dev/null
@@ -1,93 +0,0 @@
---- lib/python3.9/site-packages/tensorboard/notebook.py.orig	2022-04-04 15:13:24.242666542 +0200
-+++ lib/python3.9/site-packages/tensorboard/notebook.py	2022-04-04 15:22:16.791830780 +0200
-@@ -34,6 +34,7 @@
- # details).
- _CONTEXT_COLAB = "_CONTEXT_COLAB"
- _CONTEXT_IPYTHON = "_CONTEXT_IPYTHON"
-+_CONTEXT_JUPYTERHUB = "_CONTEXT_JUPYTERHUB"
- _CONTEXT_NONE = "_CONTEXT_NONE"
- 
- 
-@@ -70,11 +71,27 @@
-     else:
-         ipython = IPython.get_ipython()
-         if ipython is not None and ipython.has_trait("kernel"):
-+            if os.environ.get("JUPYTERHUB_SERVICE_PREFIX") is not None:
-+                return _CONTEXT_JUPYTERHUB
-             return _CONTEXT_IPYTHON
- 
-     # Otherwise, we're not in a known notebook context.
-     return _CONTEXT_NONE
- 
-+def _prefix_jupyterhub(port):
-+    prefix = os.path.join(os.environ["JUPYTERHUB_SERVICE_PREFIX"], 'proxy/absolute')
-+    return "%s/%d/" % (prefix, port)
-+
-+
-+def _patch_args_jupyterhub(parsed_args):
-+    if "--port" in parsed_args:
-+        arg_idx = parsed_args.index("--port")
-+        port = int(parsed_args[arg_idx+1])
-+    else:
-+        port = 6006
-+        parsed_args += ["--port", str(port)]
-+    return parsed_args + ["--path_prefix", _prefix_jupyterhub(port)]
-+
- 
- def load_ipython_extension(ipython):
-     """Deprecated: use `%load_ext tensorboard` instead.
-@@ -149,6 +166,9 @@
-             handle.update(IPython.display.Pretty(message))
- 
-     parsed_args = shlex.split(args_string, comments=True, posix=True)
-+    if context == _CONTEXT_JUPYTERHUB:
-+        parsed_args = _patch_args_jupyterhub(parsed_args)
-+
-     start_result = manager.start(parsed_args)
- 
-     if isinstance(start_result, manager.StartLaunched):
-@@ -305,6 +325,7 @@
-     fn = {
-         _CONTEXT_COLAB: _display_colab,
-         _CONTEXT_IPYTHON: _display_ipython,
-+        _CONTEXT_JUPYTERHUB: _display_jupyterhub,
-         _CONTEXT_NONE: _display_cli,
-     }[_get_context()]
-     return fn(port=port, height=height, display_handle=display_handle)
-@@ -401,6 +422,36 @@
-     for (k, v) in replacements:
-         shell = shell.replace(k, v)
-     iframe = IPython.display.HTML(shell)
-+    if display_handle:
-+        display_handle.update(iframe)
-+    else:
-+        IPython.display.display(iframe)
-+
-+
-+def _display_jupyterhub(port, height, display_handle):
-+    import IPython.display
-+
-+    frame_id = "tensorboard-frame-{:08x}".format(random.getrandbits(64))
-+    shell = """
-+      <iframe id="%HTML_ID%" width="100%" height="%HEIGHT%" frameborder="0">
-+      </iframe>
-+      <script>
-+        (function() {
-+          const frame = document.getElementById(%JSON_ID%);
-+          const url = new URL("%PREFIX%", window.location);
-+          frame.src = url;
-+        })();
-+      </script>
-+  """
-+    replacements = [
-+        ("%HTML_ID%", html.escape(frame_id, quote=True)),
-+        ("%JSON_ID%", json.dumps(frame_id)),
-+        ("%PREFIX%", _prefix_jupyterhub(port)),
-+        ("%HEIGHT%", "%d" % height),
-+    ]
-+    for (k, v) in replacements:
-+        shell = shell.replace(k, v)
-+    iframe = IPython.display.HTML(shell)
-     if display_handle:
-         display_handle.update(iframe)
-     else:
diff --git a/Golden_Repo/t/Tk/Tk-8.6.11-GCCcore-11.2.0.eb b/Golden_Repo/t/Tk/Tk-8.6.11-GCCcore-11.2.0.eb
deleted file mode 100644
index 26db23845..000000000
--- a/Golden_Repo/t/Tk/Tk-8.6.11-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,41 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'Tk'
-version = '8.6.11'
-
-homepage = 'https://www.tcl.tk/'
-description = """Tk is an open source, cross-platform widget toolchain that provides a library of basic elements for
- building a graphical user interface (GUI) in many different programming languages."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ["https://prdownloads.sourceforge.net/tcl"]
-sources = ['%(namelower)s%(version)s-src.tar.gz']
-patches = ['Tk-8.6.4_different-prefix-with-tcl.patch']
-checksums = [
-    '5228a8187a7f70fa0791ef0f975270f068ba9557f57456f51eb02d9d4ea31282',  # tk8.6.11-src.tar.gz
-    # Tk-8.6.4_different-prefix-with-tcl.patch
-    '7a6daa8349393af3d340e774aebf07c7410c51e01bc654ceb3679877063b961d',
-]
-
-builddependencies = [('binutils', '2.37')]
-dependencies = [
-    ('Tcl', version),
-    ('X11', '20210802'),
-    ('zlib', '1.2.11'),
-]
-
-configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib CFLAGS="-I$EBROOTTCL/include"'
-
-installopts = "&& make install-private-headers"
-
-postinstallcmds = ["ln -s wish%(version_major_minor)s %(installdir)s/bin/wish"]
-
-sanity_check_paths = {
-    'files': ["bin/wish", "lib/tkConfig.sh", "include/tkInt.h"],
-    'dirs': [],
-}
-
-start_dir = 'unix'
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/t/Tk/Tk-8.6.4_different-prefix-with-tcl.patch b/Golden_Repo/t/Tk/Tk-8.6.4_different-prefix-with-tcl.patch
deleted file mode 100644
index d3f88c40c..000000000
--- a/Golden_Repo/t/Tk/Tk-8.6.4_different-prefix-with-tcl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-fix for:
-    _tkinter.TclError: Can't find a usable tk.tcl in the following directories: ...
-based on https://github.com/NixOS/nixpkgs/commit/decd2feb0a1bc80940e697fa66e3b25383360c30
-see also https://github.com/NixOS/nixpkgs/issues/1479
-author: Kenneth Hoste (HPC-UGent)
---- tk8.6.4/unix/Makefile.in.orig	2015-10-29 18:57:12.213525347 +0100
-+++ tk8.6.4/unix/Makefile.in	2015-10-29 19:06:19.397015702 +0100
-@@ -1029,7 +1029,8 @@
- 	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkVisual.c
- 
- tkWindow.o: $(GENERIC_DIR)/tkWindow.c
--	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkWindow.c
-+	$(CC) -c $(CC_SWITCHES) -DTK_LIBRARY=\"${TK_LIBRARY}\" \
-+       $(GENERIC_DIR)/tkWindow.c
- 
- tkButton.o: $(GENERIC_DIR)/tkButton.c
- 	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkButton.c
---- tk8.6.4/generic/tkWindow.c.orig	2015-10-29 18:57:12.213525347 +0100
-+++ tk8.6.4/generic/tkWindow.c	2015-10-29 19:03:30.156190540 +0100
-@@ -988,6 +988,7 @@
- 
-     Tcl_SetVar2(interp, "tk_patchLevel", NULL, TK_PATCH_LEVEL, TCL_GLOBAL_ONLY);
-     Tcl_SetVar2(interp, "tk_version",    NULL, TK_VERSION,     TCL_GLOBAL_ONLY);
-+    Tcl_SetVar2(interp, "tk_library",    NULL, TK_LIBRARY,     TCL_GLOBAL_ONLY);
- 
-     tsdPtr->numMainWindows++;
-     return tkwin;
diff --git a/Golden_Repo/t/Tkinter/Tkinter-3.9.6-GCCcore-11.2.0.eb b/Golden_Repo/t/Tkinter/Tkinter-3.9.6-GCCcore-11.2.0.eb
deleted file mode 100644
index 36acc1886..000000000
--- a/Golden_Repo/t/Tkinter/Tkinter-3.9.6-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,25 +0,0 @@
-name = 'Tkinter'
-version = '3.9.6'
-
-homepage = 'https://python.org/'
-description = "Tkinter module, built with the Python buildsystem"
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://www.python.org/ftp/python/%(version)s/']
-sources = ['Python-%(version)s.tgz']
-checksums = ['d0a35182e19e416fc8eae25a3dcd4d02d4997333e4ad1f2eee6010aadc3fe866']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('libffi', '3.4.2'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('Tk', '8.6.11'),
-    ('zlib', '1.2.11'),
-]
-
-moduleclass = 'lang'
diff --git a/Golden_Repo/t/TotalView/TotalView-2021.4.10-GCCcore-11.2.0.eb b/Golden_Repo/t/TotalView/TotalView-2021.4.10-GCCcore-11.2.0.eb
deleted file mode 100644
index d29655489..000000000
--- a/Golden_Repo/t/TotalView/TotalView-2021.4.10-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,66 +0,0 @@
-# This is an easyconfig file for EasyBuild, see
-# https://github.com/hpcugent/easybuild
-# Copyright:: Copyright 2014 Juelich Supercomputing Centre, Germany
-# Authors::   Alexandre Strube <surak@surak.eti.br>
-# License::   New BSD
-#
-# This work is based from experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-name = "TotalView"
-version = "2021.4.10"
-
-homepage = 'http://www.roguewave.com/products-services/totalview'
-
-description = """TotalView breaks down barriers to understanding what's going
- on with your high-performance computing (HPC) and supercomputing applications.
- Purpose-built for multicore and parallel computing, TotalView provides a set
- of tools providing unprecedented control over processes and thread execution,
- along with deep visibility into program states and data.
-
- By allowing the simultaneous debugging of many processes and threads in a
- single window, you get complete control over program execution: running,
- stepping, and halting line-by-line through code within a single thread or
- within arbitrary groups of processes or threads. You can also work backwards
- from failure through reverse debugging, isolating the root cause faster by
- eliminating the need to repeatedly restart the application, reproduce and
- troubleshoot difficult problems that can occur in concurrent programs that
- take advantage of threads, OpenMP, MPI, GPUs, or coprocessors.
-
- With customizable displays of the state of your running program, memory leaks,
- deadlocks, and race conditions are things of the past. Whether you're a
- scientific and technical computing veteran, or new to the development
- challenges of multicore or parallel applications, TotalView gives you the
- insight to find and correct errors quickly, validate prototypes early, verify
- calculations accurately, and above all, certify code correctly.
-
- TotalView works with C, C++, and Fortran applications written for Linux
- (including the Cray and Blue Gene platforms), UNIX, Mac OS X, and Xeon Phi
- coprocessor, and supports OpenMP, MPI, and OpenACC / CUDA.
- """
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-
-dependencies = [
-    ('X11', '20210802'),
-]
-
-sources = [
-    '%(namelower)s_%(version)s_linux_x86-64.tar',
-    '%(namelower)s.%(version)s-doc.tar',
-]
-checksums = [
-    # totalview_2021.4.10_linux_x86-64.tar
-    '7e5509b2cfb219100b0032304bdad7d422657c0736c386ba64bdb1bf11d10a1d',
-    # totalview.2021.4.10-doc.tar
-    'c476288ebe1964e0803c7316975c71a957e52f45187b135bc1dc3b65491bb61d',
-]
-
-sanity_check_paths = {
-    'files': ["toolworks/%(namelower)s.%(version)s/bin/totalview"],
-    'dirs': []
-}
-
-moduleclass = 'debugger'
diff --git a/Golden_Repo/t/TotalView/TotalView-2022.1.11-GCCcore-11.2.0.eb b/Golden_Repo/t/TotalView/TotalView-2022.1.11-GCCcore-11.2.0.eb
deleted file mode 100644
index 2b27cf286..000000000
--- a/Golden_Repo/t/TotalView/TotalView-2022.1.11-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,64 +0,0 @@
-# This is an easyconfig file for EasyBuild, see
-# https://github.com/hpcugent/easybuild
-# Copyright:: Copyright 2014 Juelich Supercomputing Centre, Germany
-# Authors::   Alexandre Strube <surak@surak.eti.br>
-# License::   New BSD
-#
-# This work is based from experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-name = "TotalView"
-version = "2022.1.11"
-
-homepage = 'http://www.roguewave.com/products-services/totalview'
-
-description = """TotalView breaks down barriers to understanding what's going
- on with your high-performance computing (HPC) and supercomputing applications.
- Purpose-built for multicore and parallel computing, TotalView provides a set
- of tools providing unprecedented control over processes and thread execution,
- along with deep visibility into program states and data.
-
- By allowing the simultaneous debugging of many processes and threads in a
- single window, you get complete control over program execution: running,
- stepping, and halting line-by-line through code within a single thread or
- within arbitrary groups of processes or threads. You can also work backwards
- from failure through reverse debugging, isolating the root cause faster by
- eliminating the need to repeatedly restart the application, reproduce and
- troubleshoot difficult problems that can occur in concurrent programs that
- take advantage of threads, OpenMP, MPI, GPUs, or coprocessors.
-
- With customizable displays of the state of your running program, memory leaks,
- deadlocks, and race conditions are things of the past. Whether you're a
- scientific and technical computing veteran, or new to the development
- challenges of multicore or parallel applications, TotalView gives you the
- insight to find and correct errors quickly, validate prototypes early, verify
- calculations accurately, and above all, certify code correctly.
-
- TotalView works with C, C++, and Fortran applications written for Linux
- (including the Cray and Blue Gene platforms), UNIX, Mac OS X, and Xeon Phi
- coprocessor, and supports OpenMP, MPI, and OpenACC / CUDA.
- """
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-
-dependencies = [
-    ('X11', '20210802'),
-]
-
-sources = [
-    '%(namelower)s_%(version)s_linux_x86-64.tar',
-    '%(namelower)s.%(version)s-doc.tar',
-]
-checksums = [
-    '3ec9a7d702572dbbafa41726a036c94b549f9a5911ed6fd6aa55f7b377554bac',  # totalview_2022.1.11_linux_x86-64.tar
-    '0042afdbb024b99350c395decf2606b6913479ab0117bfd7bd4252d91843ef69',  # totalview.2022.1.11-doc.tar
-]
-
-sanity_check_paths = {
-    'files': ["toolworks/%(namelower)s.%(version)s/bin/totalview"],
-    'dirs': []
-}
-
-moduleclass = 'debugger'
diff --git a/Golden_Repo/t/tbb/tbb-2020.3-GCCcore-11.2.0.eb b/Golden_Repo/t/tbb/tbb-2020.3-GCCcore-11.2.0.eb
deleted file mode 100644
index 61f78dd0c..000000000
--- a/Golden_Repo/t/tbb/tbb-2020.3-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,19 +0,0 @@
-name = 'tbb'
-version = '2020.3'
-
-homepage = 'https://github.com/oneapi-src/oneTBB'
-description = """Intel(R) Threading Building Blocks (Intel(R) TBB) lets you easily write parallel C++ programs that
- take full advantage of multicore performance, that are portable, composable and have future-proof scalability."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://github.com/oneapi-src/oneTBB/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['ebc4f6aa47972daed1f7bf71d100ae5bf6931c2e3144cf299c8cc7d041dca2f3']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1'),
-]
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/t/tbb/tbb-2021.4.0-GCCcore-11.2.0.eb b/Golden_Repo/t/tbb/tbb-2021.4.0-GCCcore-11.2.0.eb
deleted file mode 100644
index 241b682f7..000000000
--- a/Golden_Repo/t/tbb/tbb-2021.4.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,26 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'tbb'
-version = '2021.4.0'
-
-homepage = 'https://github.com/oneapi-src/oneTBB'
-description = """Intel(R) Threading Building Blocks (Intel(R) TBB) lets you easily write parallel C++ programs that
- take full advantage of multicore performance, that are portable, composable and have future-proof scalability."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://github.com/oneapi-src/oneTBB/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['021796c7845e155e616f5ecda16daa606ebb4c6f90b996e5c08aebab7a8d3de3']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1'),
-]
-
-sanity_check_paths = {
-    'files': ['lib/libtbb.%s' % SHLIB_EXT, 'lib/libtbbmalloc.%s' % SHLIB_EXT],
-    'dirs': ['lib', 'include', 'share'],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/t/tcsh/tcsh-6.22.04-GCCcore-11.2.0.eb b/Golden_Repo/t/tcsh/tcsh-6.22.04-GCCcore-11.2.0.eb
deleted file mode 100644
index da32d1961..000000000
--- a/Golden_Repo/t/tcsh/tcsh-6.22.04-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,43 +0,0 @@
-##
-# This file is an EasyBuild reciPY as per https://github.com/easybuilders/easybuild
-#
-# Copyright:: Copyright 2012-2013 University of Luxembourg/Computer Science and Communications Research Unit
-# Authors::   Valentin Plugaru <valentin.plugaru@gmail.com>
-# 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_05-06.html
-##
-easyblock = 'ConfigureMake'
-
-name = 'tcsh'
-version = '6.22.04'
-
-homepage = 'https://www.tcsh.org'
-description = """Tcsh is an enhanced, but completely compatible version of the Berkeley UNIX C shell (csh).
- It is a command language interpreter usable both as an interactive login shell and a shell script command
- processor. It includes a command-line editor, programmable word completion, spelling correction, a history
- mechanism, job control and a C-like syntax."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [
-    'https://astron.com/pub/%(namelower)s',
-    'https://astron.com/pub/%(namelower)s/old',
-    'ftp://ftp.astron.com/pub/%(namelower)s',
-    'ftp://ftp.astron.com/pub/%(namelower)s/old',
-]
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['eb16356243218c32f39e07258d72bf8b21e62ce94bb0e8a95e318b151397e231']
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [('ncurses', '6.2')]
-
-sanity_check_paths = {
-    'files': ["bin/tcsh"],
-    'dirs': []
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/t/texinfo/texinfo-6.8-GCCcore-11.2.0.eb b/Golden_Repo/t/texinfo/texinfo-6.8-GCCcore-11.2.0.eb
deleted file mode 100644
index 0e5a6da71..000000000
--- a/Golden_Repo/t/texinfo/texinfo-6.8-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,41 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'texinfo'
-version = '6.8'
-
-homepage = 'https://www.gnu.org/software/texinfo/'
-description = """Texinfo is the official documentation format of the GNU project."""
-
-
-source_urls = [GNU_SOURCE]
-sources = [SOURCELOWER_TAR_XZ]
-checksums = ['8eb753ed28bca21f8f56c1a180362aed789229bd62fff58bf8368e9beb59fec4']
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('ncurses', '6.2'),
-    ('texlive', '20200406'),
-]
-
-preinstallopts = "make TEXMF=%(installdir)s/texmf install-tex && "
-
-# This will overwrite a users $TEXMFHOME so this module is best used as a build dependency
-modextravars = {'TEXMFHOME': '%(installdir)s/texmf'}
-modloadmsg = "\\n"
-modloadmsg += "WARNING: This texinfo module has (re)defined the value for the environment variable \\$TEXMFHOME.\\n"
-modloadmsg += "If you use a custom texmf directory (such as ~/texmf) you should copy files found in the\\n"
-modloadmsg += "new \\$TEXMFHOME to your custom directory and reset the value of \\$TEXMFHOME to point to that space:\\n"
-modloadmsg += "\\tcp -r \\$TEXMFHOME/* /path/to/your/texmf\\n"
-modloadmsg += "\\texport TEXMFHOME=/path/to/your/texmf\\n"
-
-sanity_check_paths = {
-    'files': ['bin/info', 'bin/makeinfo', 'bin/pod2texi', 'bin/texi2pdf', 'texmf/tex/texinfo/texinfo.tex'],
-    'dirs': [],
-}
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/t/texlive/texlive-20200406-GCCcore-11.2.0.eb b/Golden_Repo/t/texlive/texlive-20200406-GCCcore-11.2.0.eb
deleted file mode 100644
index 9a3d99558..000000000
--- a/Golden_Repo/t/texlive/texlive-20200406-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,66 +0,0 @@
-# Based off the 2017 version by John Dey jfdey@fredhutch.org
-# https://github.com/easybuilders/easybuild-easyconfigs/pull/5085
-easyblock = 'Tarball'
-
-name = 'texlive'
-version = '20200406'
-local_repo = 'ftp://tug.org/historic/systems/texlive/2020/tlnet-final'
-
-homepage = 'https://tug.org'
-description = """TeX is a typesetting language. Instead of visually formatting your text, you enter your manuscript
- text intertwined with TeX commands in a plain text file. You then run TeX to produce formatted output, such as a
- PDF file. Thus, in contrast to standard word processors, your document is a separate file that does not pretend to
- be a representation of the final typeset output, and so can be easily edited and manipulated."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['ftp://tug.org/texlive/historic/2020/']
-sources = [
-    {
-        'download_filename': 'install-tl-unx.tar.gz',
-        'filename': 'install-tl-unx-%(version)s.tar.gz',
-    }
-]
-checksums = ['7c90a50e55533d57170cbc7c0370a010019946eb18570282948e1af6f809382d']
-
-dependencies = [
-    ('X11', '20210802'),
-    ('libpng', '1.6.37'),
-    ('OpenGL', '2021b'),
-    ('Perl', '5.34.0'),
-    ('HarfBuzz', '2.8.2'),
-    # Poppler, optional - PDF rendering library
-    # ('poppler', '0.90.1'),
-    ('cairo', '1.16.0'),
-    ('fontconfig', '2.13.94'),
-    ('zlib', '1.2.11'),
-    # Graphite2, optional - font system for lesser-known languages
-    # ('graphite2', '1.3.14'),
-]
-
-postinstallcmds = [
-    (
-        'echo "TEXDIR         %%(installdir)s/" > %%(installdir)s/texlive.profile && '
-        'echo "TEXMFLOCAL     %%(installdir)s/texmf-local" >> %%(installdir)s/texlive.profile && '
-        'echo "TEXMFSYSCONFIG %%(installdir)s/texmf-config" >> %%(installdir)s/texlive.profile && '
-        'echo "TEXMFSYSVAR    %%(installdir)s/texmf-var" >> %%(installdir)s/texlive.profile && '
-        '%%(builddir)s/install-tl-%%(version)s/install-tl -profile %%(installdir)s/texlive.profile '
-        '--repository %s'
-    ) % (local_repo),
-]
-
-modextrapaths = {
-    'PATH': 'bin/x86_64-linux',
-    'INFOPATH': 'texmf-dist/doc/info',
-    'MANPATH': 'texmf-dist/doc/man',
-}
-modextravars = {
-    'TEXMFHOME': '%(installdir)s/texmf-dist'
-}
-
-sanity_check_paths = {
-    'files': ['bin/x86_64-linux/tex', 'bin/x86_64-linux/latex'],
-    'dirs': ['bin/x86_64-linux', 'texmf-dist'],
-}
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/t/tmux/tmux-3.2-GCCcore-11.2.0.eb b/Golden_Repo/t/tmux/tmux-3.2-GCCcore-11.2.0.eb
deleted file mode 100644
index 25c9c0387..000000000
--- a/Golden_Repo/t/tmux/tmux-3.2-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,32 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'tmux'
-version = '3.2a'
-
-homepage = 'http://tmux.sourceforge.net/'
-description = """tmux is a terminal multiplexer. It lets you switch easily between several programs in one terminal,
-detach them (they keep running in the background) and reattach them to a different terminal.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [
-    'https://github.com/%(name)s/%(name)s/releases/download/%(version)s/']
-sources = [SOURCE_TAR_GZ]
-checksums = ['551553a4f82beaa8dadc9256800bcc284d7c000081e47aa6ecbb6ff36eacd05f']
-
-dependencies = [
-    ('ncurses', '6.2'),
-    ('libevent', '2.1.12', '', ('GCCcore', '11.2.0'))
-]
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-sanity_check_paths = {
-    'files': ['bin/tmux'],
-    'dirs': []
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/t/torchaudio/standard-libs-deps.patch b/Golden_Repo/t/torchaudio/standard-libs-deps.patch
deleted file mode 100644
index 0dd03282e..000000000
--- a/Golden_Repo/t/torchaudio/standard-libs-deps.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- audio/setup.py.orig	2022-08-23 14:56:12.672462283 +0200
-+++ audio/setup.py	2022-08-23 14:56:30.086523956 +0200
-@@ -105,7 +105,7 @@
- 
- def _parse_sources():
-     third_party_dir = ROOT_DIR / "third_party"
--    libs = ["zlib", "bzip2", "lzma", "boost", "sox"]
-+    libs = ["lzma"]
-     archive_dir = third_party_dir / "archives"
-     archive_dir.mkdir(exist_ok=True)
-     for lib in libs:
diff --git a/Golden_Repo/t/torchaudio/torchaudio-0.11-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/t/torchaudio/torchaudio-0.11-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index 2c3500261..000000000
--- a/Golden_Repo/t/torchaudio/torchaudio-0.11-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,48 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'torchaudio'
-version = '0.11.0'
-
-homepage = 'https://github.com/pytorch/audio'
-description = """ Data manipulation and transformation for audio signal
-processing, powered by PyTorch """
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-sources = [{
-    'filename': '%(name)s-%(version)s.tar.gz',
-    'git_config': {
-        'url': 'https://github.com/pytorch',
-        'repo_name': 'audio',
-        'tag': 'v%(version)s',
-        'recursive': True,
-        'keep_git_dir': True,
-    },
-}]
-patches = ['standard-libs-deps.patch']
-checksums = [
-    '02da1ecb81a36664b1ec40fb534b7c1c2498a4c94331ea92b2b09bba9743a50a',  # torchaudio-0.11.0.tar.gz
-    '8f609b9712893a0b146ffb565c9a34631c7b0ef84b922b7ad93e1ce303b093b1',  # standard-libs-deps.patch
-]
-
-builddependencies = [
-    ('Boost', '1.78.0'),
-    ('CMake', '3.21.1'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10'),
-    ('CUDA', '11.5', '', SYSTEM),
-    ('PyTorch', '1.11', '-CUDA-%(cudaver)s', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('SoX', '14.4.2'),
-    ('zlib', '1.2.11'),
-    ('bzip2', '1.0.8'),
-    ('librosa', '0.9.2'),
-]
-
-download_dep_fail = True
-use_pip = True
-sanity_pip_check = True
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/t/torchvision/torchvision-0.12.0-gcccoremkl-11.2.0-2021.4.0-CUDA-11.5.eb b/Golden_Repo/t/torchvision/torchvision-0.12.0-gcccoremkl-11.2.0-2021.4.0-CUDA-11.5.eb
deleted file mode 100644
index 4d15d9bec..000000000
--- a/Golden_Repo/t/torchvision/torchvision-0.12.0-gcccoremkl-11.2.0-2021.4.0-CUDA-11.5.eb
+++ /dev/null
@@ -1,23 +0,0 @@
-name = 'torchvision'
-version = '0.12.0'
-versionsuffix = '-CUDA-%(cudaver)s'
-
-homepage = 'https://github.com/pytorch/vision'
-description = " Datasets, Transforms and Models specific to Computer Vision"
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-source_urls = ['https://github.com/pytorch/vision/archive']
-sources = ['v%(version)s.tar.gz']
-checksums = ['99e6d3d304184895ff4f6152e2d2ec1cbec89b3e057d9c940ae0125546b04e91']
-
-builddependencies = [('CMake', '3.21.1')]
-
-dependencies = [
-    ('CUDA', '11.5', '', True),
-    ('Python', '3.9.6'),
-    ('Pillow-SIMD', '9.0.1'),
-    ('PyTorch', '1.11', '-CUDA-%(cudaver)s'),
-]
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/t/tqdm/tqdm-4.62.3-GCCcore-11.2.0.eb b/Golden_Repo/t/tqdm/tqdm-4.62.3-GCCcore-11.2.0.eb
deleted file mode 100644
index df7cdafe6..000000000
--- a/Golden_Repo/t/tqdm/tqdm-4.62.3-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,23 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'tqdm'
-version = '4.62.3'
-
-
-homepage = 'https://github.com/tqdm/tqdm'
-description = """Instantly make your loops show a smart progress meter."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-sources = [SOURCE_TAR_GZ]
-checksums = ['d359de7217506c9851b7869f3708d8ee53ed70a1b8edbba4dbcb47442592920d']
-
-download_dep_fail = True
-use_pip = True
-sanity_pip_check = True
-
-dependencies = [
-    ('Python', '3.9.6'),
-]
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/t/tree-sitter/tree-sitter-0.20.6-GCCcore-11.2.0.eb b/Golden_Repo/t/tree-sitter/tree-sitter-0.20.6-GCCcore-11.2.0.eb
deleted file mode 100644
index 22df38300..000000000
--- a/Golden_Repo/t/tree-sitter/tree-sitter-0.20.6-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,39 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'tree-sitter'
-version = '0.20.6'
-
-homepage = 'https://github.com/tree-sitter/tree-sitter'
-description = "Tree-sitter is a parser generator tool and an incremental parsing library."
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-github_account = 'tree-sitter'
-source_urls = [GITHUB_SOURCE]
-sources = [
-    {
-        'download_filename': 'v%(version)s.tar.gz',
-        'filename': SOURCELOWER_TAR_GZ
-    }
-]
-checksums = ['4d37eaef8a402a385998ff9aca3e1043b4a3bba899bceeff27a7178e1165b9de']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Autotools', '20210726'),
-]
-
-skipsteps = ['configure']
-
-installopts = 'PREFIX="%(installdir)s"'
-
-sanity_check_paths = {
-    'files': ['include/tree_sitter/api.h',
-              'include/tree_sitter/parser.h',
-              'lib/libtree-sitter.a',
-              'lib/libtree-sitter.%s' % SHLIB_EXT,
-              'lib/pkgconfig/tree-sitter.pc'],
-    'dirs': ['include/tree_sitter']
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/t/trimesh/trimesh-3.9.36-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/t/trimesh/trimesh-3.9.36-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index 5d17bfcb6..000000000
--- a/Golden_Repo/t/trimesh/trimesh-3.9.36-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,33 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'trimesh'
-version = '3.9.36'
-
-homepage = 'https://trimsh.org/'
-description = """Trimesh is a Python (2.7- 3.3+) library for loading and using triangular meshes with an emphasis on
-watertight meshes. The goal of the library is to provide a fully featured Trimesh object which allows for easy
-manipulation and analysis, in the style of the excellent Polygon object in the Shapely library."""
-
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-source_urls = [PYPI_SOURCE]
-sources = [SOURCE_TAR_GZ]
-use_pip = True
-download_dep_fail = True
-sanity_pip_check = True
-
-checksums = ['f01e8edab14d1999700c980c21a1546f37417216ad915a53be649d263130181e']
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10'),  # numpy required
-]
-
-sanity_check_paths = {
-    'files': [],
-    'dirs': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/t/typing-extensions/typing-extensions-3.10.0.0-GCCcore-11.2.0.eb b/Golden_Repo/t/typing-extensions/typing-extensions-3.10.0.0-GCCcore-11.2.0.eb
deleted file mode 100644
index 13af6cb81..000000000
--- a/Golden_Repo/t/typing-extensions/typing-extensions-3.10.0.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,22 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'typing-extensions'
-version = '3.10.0.0'
-
-homepage = 'https://github.com/python/typing/blob/master/typing_extensions/README.rst'
-description = 'Typing Extensions – Backported and Experimental Type Hints for Python'
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-sources = ['typing_extensions-%(version)s.tar.gz']
-checksums = ['50b6f157849174217d0656f99dc82fe932884fb250826c18350e159ec6cdf342']
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [('Python', '3.9.6')]
-
-use_pip = True
-download_dep_fail = True
-sanity_pip_check = True
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/u/UCX-settings/UCX-settings-DC-CUDA.eb b/Golden_Repo/u/UCX-settings/UCX-settings-DC-CUDA.eb
deleted file mode 100644
index 10736b393..000000000
--- a/Golden_Repo/u/UCX-settings/UCX-settings-DC-CUDA.eb
+++ /dev/null
@@ -1,27 +0,0 @@
-easyblock = 'SystemBundle'
-
-name = 'UCX-settings'
-version = 'DC-CUDA'
-
-homepage = ''
-description = '''
-This module sets UCX to use DC as the transport layer, together with the CUWA-aware transports.
-The maximum number of rails is limited to 1 to avoid pitfalls of blindly using multiple rails.
-'''
-
-site_contacts = 'd.alvarez@fz-juelich.de'
-
-toolchain = SYSTEM
-
-source_urls = []
-
-sources = []
-modextravars = {
-    'UCX_TLS': 'dc_x,self,sm,cuda_ipc,gdr_copy,cuda_copy',
-    # Since most users do not share HCAs for a single process, it does not make sense to enable this in most cases.
-    # It actually has the side effect of using Ethernet and IB ports on JUSUF, which end up saturating the ethernet
-    # fabric and result in a slow down
-    'UCX_MAX_RNDV_RAILS': '1',
-}
-
-moduleclass = 'system'
diff --git a/Golden_Repo/u/UCX-settings/UCX-settings-DC.eb b/Golden_Repo/u/UCX-settings/UCX-settings-DC.eb
deleted file mode 100644
index b90e9b8d2..000000000
--- a/Golden_Repo/u/UCX-settings/UCX-settings-DC.eb
+++ /dev/null
@@ -1,27 +0,0 @@
-easyblock = 'SystemBundle'
-
-name = 'UCX-settings'
-version = 'DC'
-
-homepage = ''
-description = '''
-This module sets UCX to use DC as the transport layer.
-The maximum number of rails is limited to 1 to avoid pitfalls of blindly using multiple rails.
-'''
-
-site_contacts = 'd.alvarez@fz-juelich.de'
-
-toolchain = SYSTEM
-
-source_urls = []
-
-sources = []
-modextravars = {
-    'UCX_TLS': 'dc_x,self,sm',
-    # Since most users do not share HCAs for a single process, it does not make sense to enable this in most cases.
-    # It actually has the side effect of using Ethernet and IB ports on JUSUF, which end up saturating the ethernet
-    # fabric and result in a slow down
-    'UCX_MAX_RNDV_RAILS': '1',
-}
-
-moduleclass = 'system'
diff --git a/Golden_Repo/u/UCX-settings/UCX-settings-RC-CUDA.eb b/Golden_Repo/u/UCX-settings/UCX-settings-RC-CUDA.eb
deleted file mode 100644
index ffeddf594..000000000
--- a/Golden_Repo/u/UCX-settings/UCX-settings-RC-CUDA.eb
+++ /dev/null
@@ -1,27 +0,0 @@
-easyblock = 'SystemBundle'
-
-name = 'UCX-settings'
-version = 'RC-CUDA'
-
-homepage = ''
-description = '''
-This module sets UCX to use RC as the transport layer, together with the CUWA-aware transports.
-The maximum number of rails is limited to 1 to avoid pitfalls of blindly using multiple rails.
-'''
-
-site_contacts = 'd.alvarez@fz-juelich.de'
-
-toolchain = SYSTEM
-
-source_urls = []
-
-sources = []
-modextravars = {
-    'UCX_TLS': 'rc_x,self,sm,cuda_ipc,gdr_copy,cuda_copy',
-    # Since most users do not share HCAs for a single process, it does not make sense to enable this in most cases.
-    # It actually has the side effect of using Ethernet and IB ports on JUSUF, which end up saturating the ethernet
-    # fabric and result in a slow down
-    'UCX_MAX_RNDV_RAILS': '1',
-}
-
-moduleclass = 'system'
diff --git a/Golden_Repo/u/UCX-settings/UCX-settings-RC.eb b/Golden_Repo/u/UCX-settings/UCX-settings-RC.eb
deleted file mode 100644
index b9ca3f790..000000000
--- a/Golden_Repo/u/UCX-settings/UCX-settings-RC.eb
+++ /dev/null
@@ -1,27 +0,0 @@
-easyblock = 'SystemBundle'
-
-name = 'UCX-settings'
-version = 'RC'
-
-homepage = ''
-description = '''
-This module sets UCX to use RC as the transport layer.
-The maximum number of rails is limited to 1 to avoid pitfalls of blindly using multiple rails.
-'''
-
-site_contacts = 'd.alvarez@fz-juelich.de'
-
-toolchain = SYSTEM
-
-source_urls = []
-
-sources = []
-modextravars = {
-    'UCX_TLS': 'rc_x,self,sm',
-    # Since most users do not share HCAs for a single process, it does not make sense to enable this in most cases.
-    # It actually has the side effect of using Ethernet and IB ports on JUSUF, which end up saturating the ethernet
-    # fabric and result in a slow down
-    'UCX_MAX_RNDV_RAILS': '1',
-}
-
-moduleclass = 'system'
diff --git a/Golden_Repo/u/UCX-settings/UCX-settings-UD-CUDA.eb b/Golden_Repo/u/UCX-settings/UCX-settings-UD-CUDA.eb
deleted file mode 100644
index b5d411e10..000000000
--- a/Golden_Repo/u/UCX-settings/UCX-settings-UD-CUDA.eb
+++ /dev/null
@@ -1,27 +0,0 @@
-easyblock = 'SystemBundle'
-
-name = 'UCX-settings'
-version = 'UD-CUDA'
-
-homepage = ''
-description = '''
-This module sets UCX to use UD as the transport layer, together with the CUWA-aware transports.
-The maximum number of rails is limited to 1 to avoid pitfalls of blindly using multiple rails.
-'''
-
-site_contacts = 'd.alvarez@fz-juelich.de'
-
-toolchain = SYSTEM
-
-source_urls = []
-
-sources = []
-modextravars = {
-    'UCX_TLS': 'ud_x,self,sm,cuda_ipc,gdr_copy,cuda_copy',
-    # Since most users do not share HCAs for a single process, it does not make sense to enable this in most cases.
-    # It actually has the side effect of using Ethernet and IB ports on JUSUF, which end up saturating the ethernet
-    # fabric and result in a slow down
-    'UCX_MAX_RNDV_RAILS': '1',
-}
-
-moduleclass = 'system'
diff --git a/Golden_Repo/u/UCX-settings/UCX-settings-UD.eb b/Golden_Repo/u/UCX-settings/UCX-settings-UD.eb
deleted file mode 100644
index 0d0e25b21..000000000
--- a/Golden_Repo/u/UCX-settings/UCX-settings-UD.eb
+++ /dev/null
@@ -1,27 +0,0 @@
-easyblock = 'SystemBundle'
-
-name = 'UCX-settings'
-version = 'UD'
-
-homepage = ''
-description = '''
-This module sets UCX to use UD as the transport layer.
-The maximum number of rails is limited to 1 to avoid pitfalls of blindly using multiple rails.
-'''
-
-site_contacts = 'd.alvarez@fz-juelich.de'
-
-toolchain = SYSTEM
-
-source_urls = []
-
-sources = []
-modextravars = {
-    'UCX_TLS': 'ud_x,self,sm',
-    # Since most users do not share HCAs for a single process, it does not make sense to enable this in most cases.
-    # It actually has the side effect of using Ethernet and IB ports on JUSUF, which end up saturating the ethernet
-    # fabric and result in a slow down
-    'UCX_MAX_RNDV_RAILS': '1',
-}
-
-moduleclass = 'system'
diff --git a/Golden_Repo/u/UCX-settings/UCX-settings-plain.eb b/Golden_Repo/u/UCX-settings/UCX-settings-plain.eb
deleted file mode 100644
index ed48dda86..000000000
--- a/Golden_Repo/u/UCX-settings/UCX-settings-plain.eb
+++ /dev/null
@@ -1,17 +0,0 @@
-easyblock = 'SystemBundle'
-
-name = 'UCX-settings'
-version = 'plain'
-
-homepage = ''
-description = 'This module sets UCX to rely on its internal heuristics for transport selection.'
-
-site_contacts = 'd.alvarez@fz-juelich.de'
-
-toolchain = SYSTEM
-
-source_urls = []
-
-sources = []
-
-moduleclass = 'system'
diff --git a/Golden_Repo/u/UCX/UCX-1.11.2.eb b/Golden_Repo/u/UCX/UCX-1.11.2.eb
deleted file mode 100644
index 51b9f5d34..000000000
--- a/Golden_Repo/u/UCX/UCX-1.11.2.eb
+++ /dev/null
@@ -1,78 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'UCX'
-version = '1.11.2'
-
-homepage = 'https://www.openucx.org/'
-description = """Unified Communication X
-An open-source production grade communication framework for data centric
-and high-performance applications
-"""
-
-toolchain = SYSTEM
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/openucx/ucx/releases/download/v%(version)s']
-sources = ['%(namelower)s-%(version)s.tar.gz']
-checksums = [
-    'deebf86a5344fc2bd9e55449f88c650c4514928592807c9bc6fe4190e516c6df',  # ucx-1.11.2.tar.gz
-]
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2'),
-]
-
-osdependencies = [OS_PKG_IBVERBS_DEV]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('numactl', '2.0.14'),
-    ('CUDA', '11.5'),
-]
-
-configopts = '--with-verbs '  # Build OpenFabrics support
-configopts += '--without-java '
-configopts += '--disable-doxygen-doc '
-
-# Enable machine-specific optimizations, default: NO
-configopts += '--enable-optimizations '
-# configopts += '--enable-tuning '       # Enable parameter tuning in run-time, default: NO
-# Enable thread support in UCP and UCT, default: NO
-configopts += '--enable-mt '
-configopts += '--disable-debug '
-configopts += '--disable-logging '
-configopts += '--disable-assertions '
-configopts += '--disable-params-check '
-configopts += '--disable-dependency-tracking '
-configopts += '--with-cuda=$EBROOTCUDA '
-
-configopts += '--enable-cma '           # Enable Cross Memory Attach
-
-# Compile with IB Reliable Connection support
-configopts += '--with-rc '
-# Compile with IB Unreliable Datagram support
-configopts += '--with-ud '
-# Compile with IB Dynamic Connection support
-configopts += '--with-dc '
-configopts += '--with-mlx5-dv '         # Compile with mlx5 Direct Verbs support
-configopts += '--with-ib-hw-tm '        # Compile with IB Tag Matching support
-configopts += '--with-dm '              # Compile with Device Memory support
-
-configopts += '--with-avx '             # Compile with AVX
-configopts += '--with-gdrcopy '         # Compile with GDRCopy
-
-# Compile without IB Connection Manager support
-configopts += '--without-cm '
-
-buildopts = 'V=1'
-
-sanity_check_paths = {
-    'files': ['bin/ucx_info', 'bin/ucx_perftest', 'bin/ucx_read_profile'],
-    'dirs': ['include', 'lib', 'share']
-}
-
-sanity_check_commands = ["ucx_info -d"]
-
-moduleclass = 'system'
diff --git a/Golden_Repo/u/UCX/UCX-1.12.1.eb b/Golden_Repo/u/UCX/UCX-1.12.1.eb
deleted file mode 100644
index 70f33c6b2..000000000
--- a/Golden_Repo/u/UCX/UCX-1.12.1.eb
+++ /dev/null
@@ -1,76 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'UCX'
-version = '1.12.1'
-
-homepage = 'https://www.openucx.org/'
-description = """Unified Communication X
-An open-source production grade communication framework for data centric
-and high-performance applications
-"""
-
-toolchain = SYSTEM
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/openucx/ucx/releases/download/v%(version)s']
-sources = ['%(namelower)s-%(version)s.tar.gz']
-checksums = ['40b447c8e7da94a253f2828001b2d76021eb4ad39647107d433d62d61e18ae8e']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2'),
-]
-
-osdependencies = [OS_PKG_IBVERBS_DEV]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('numactl', '2.0.14'),
-    ('CUDA', '11.5'),
-]
-
-configopts = '--with-verbs '  # Build OpenFabrics support
-configopts += '--without-java '
-configopts += '--disable-doxygen-doc '
-
-# Enable machine-specific optimizations, default: NO
-configopts += '--enable-optimizations '
-# configopts += '--enable-tuning '       # Enable parameter tuning in run-time, default: NO
-# Enable thread support in UCP and UCT, default: NO
-configopts += '--enable-mt '
-configopts += '--disable-debug '
-configopts += '--disable-logging '
-configopts += '--disable-assertions '
-configopts += '--disable-params-check '
-configopts += '--disable-dependency-tracking '
-configopts += '--with-cuda=$EBROOTCUDA '
-
-configopts += '--enable-cma '           # Enable Cross Memory Attach
-
-# Compile with IB Reliable Connection support
-configopts += '--with-rc '
-# Compile with IB Unreliable Datagram support
-configopts += '--with-ud '
-# Compile with IB Dynamic Connection support
-configopts += '--with-dc '
-configopts += '--with-mlx5-dv '         # Compile with mlx5 Direct Verbs support
-configopts += '--with-ib-hw-tm '        # Compile with IB Tag Matching support
-configopts += '--with-dm '              # Compile with Device Memory support
-
-configopts += '--with-avx '             # Compile with AVX
-configopts += '--with-gdrcopy '         # Compile with GDRCopy
-
-# Compile without IB Connection Manager support
-configopts += '--without-cm '
-
-buildopts = 'V=1'
-
-sanity_check_paths = {
-    'files': ['bin/ucx_info', 'bin/ucx_perftest', 'bin/ucx_read_profile'],
-    'dirs': ['include', 'lib', 'share']
-}
-
-sanity_check_commands = ["ucx_info -d"]
-
-moduleclass = 'system'
diff --git a/Golden_Repo/u/UCX/UCX-default.eb b/Golden_Repo/u/UCX/UCX-default.eb
deleted file mode 100644
index b1ab47d27..000000000
--- a/Golden_Repo/u/UCX/UCX-default.eb
+++ /dev/null
@@ -1,77 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'UCX'
-version = 'default'
-local_realversion = '1.12.0'
-
-homepage = 'https://www.openucx.org/'
-description = """Unified Communication X
-An open-source production grade communication framework for data centric
-and high-performance applications
-"""
-
-toolchain = SYSTEM
-toolchainopts = {'pic': True}
-
-source_urls = [f'https://github.com/openucx/ucx/releases/download/v{local_realversion}']
-sources = ['%%(namelower)s-%s.tar.gz' % local_realversion]
-checksums = ['93e994de2d1a4df32381ea92ba4c98a249010d1720eb0f6110dc72c9a7d25db6']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2'),
-]
-
-osdependencies = [OS_PKG_IBVERBS_DEV]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('numactl', '2.0.14'),
-    ('CUDA', '11.5'),
-]
-
-configopts = '--with-verbs '  # Build OpenFabrics support
-configopts += '--without-java '
-configopts += '--disable-doxygen-doc '
-
-# Enable machine-specific optimizations, default: NO
-configopts += '--enable-optimizations '
-# configopts += '--enable-tuning '       # Enable parameter tuning in run-time, default: NO
-# Enable thread support in UCP and UCT, default: NO
-configopts += '--enable-mt '
-configopts += '--disable-debug '
-configopts += '--disable-logging '
-configopts += '--disable-assertions '
-configopts += '--disable-params-check '
-configopts += '--disable-dependency-tracking '
-configopts += '--with-cuda=$EBROOTCUDA '
-
-configopts += '--enable-cma '           # Enable Cross Memory Attach
-
-# Compile with IB Reliable Connection support
-configopts += '--with-rc '
-# Compile with IB Unreliable Datagram support
-configopts += '--with-ud '
-# Compile with IB Dynamic Connection support
-configopts += '--with-dc '
-configopts += '--with-mlx5-dv '         # Compile with mlx5 Direct Verbs support
-configopts += '--with-ib-hw-tm '        # Compile with IB Tag Matching support
-configopts += '--with-dm '              # Compile with Device Memory support
-
-configopts += '--with-avx '             # Compile with AVX
-configopts += '--with-gdrcopy '         # Compile with GDRCopy
-
-# Compile without IB Connection Manager support
-configopts += '--without-cm '
-
-buildopts = 'V=1'
-
-sanity_check_paths = {
-    'files': ['bin/ucx_info', 'bin/ucx_perftest', 'bin/ucx_read_profile'],
-    'dirs': ['include', 'lib', 'share']
-}
-
-sanity_check_commands = ["ucx_info -d"]
-
-moduleclass = 'system'
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
deleted file mode 100644
index 67c01b52a..000000000
--- a/Golden_Repo/u/UDUNITS/UDUNITS-2.2.28-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,44 +0,0 @@
-##
-# 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/u/UnZip/UnZip-6.0-GCCcore-11.2.0.eb b/Golden_Repo/u/UnZip/UnZip-6.0-GCCcore-11.2.0.eb
deleted file mode 100644
index 60bf6654f..000000000
--- a/Golden_Repo/u/UnZip/UnZip-6.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,52 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'UnZip'
-version = '6.0'
-
-homepage = 'http://www.info-zip.org/UnZip.html'
-description = """UnZip is an extraction utility for archives compressed
-in .zip format (also called "zipfiles"). Although highly compatible both
-with PKWARE's PKZIP and PKUNZIP utilities for MS-DOS and with Info-ZIP's
-own Zip program, our primary objectives have been portability and
-non-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']
-patches = [
-    'UnZip-%(version)s_various-security-and-other-fixes-from-Ubuntu.patch',
-]
-checksums = [
-    '036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37',  # unzip60.tar.gz
-    # UnZip-6.0_various-security-and-other-fixes-from-Ubuntu.patch
-    '06b9307fd5aa018896bd4126818c00c1fd284a06cc3681cf0492f951ebb57ffe',
-]
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('bzip2', '1.0.8'),
-]
-
-skipsteps = ['configure']
-
-buildopts = '-f unix/Makefile CC="$CC" D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2 '
-buildopts += 'LF2="$LDFLAGS" '
-# Note: CF is multiple lines
-buildopts += 'CF="$CFLAGS $CPPFLAGS -I. -DACORN_FTYPE_NFS -DWILD_STOP_AT_DIR -DLARGE_FILE_SUPPORT '
-buildopts += '-DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DNO_LCHMOD '
-buildopts += '-DDATE_FORMAT=DF_YMD -DUSE_BZIP2 -DIZ_HAVE_UXUIDGID -DNOMEMCPY -DNO_WORKING_ISPRINT" unzips '
-
-installopts = '-f unix/Makefile prefix=%(installdir)s '
-
-sanity_check_paths = {
-    'files': ['bin/unzip', 'bin/zipinfo'],
-    'dirs': ['man/man1']
-}
-
-sanity_check_commands = ["unzip -v"]
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/u/UnZip/UnZip-6.0_various-security-and-other-fixes-from-Ubuntu.patch b/Golden_Repo/u/UnZip/UnZip-6.0_various-security-and-other-fixes-from-Ubuntu.patch
deleted file mode 100644
index 296ad83f7..000000000
--- a/Golden_Repo/u/UnZip/UnZip-6.0_various-security-and-other-fixes-from-Ubuntu.patch
+++ /dev/null
@@ -1,1188 +0,0 @@
-From: Santiago Vila <sanvila@debian.org>
-Subject: In Debian, manpages are in section 1, not in section 1L
-X-Debian-version: 5.52-3
-
---- a/man/funzip.1
-+++ b/man/funzip.1
-@@ -20,7 +20,7 @@
- .in -4n
- ..
- .\" =========================================================================
--.TH FUNZIP 1L "20 April 2009 (v3.95)" "Info-ZIP"
-+.TH FUNZIP 1 "20 April 2009 (v3.95)" "Info-ZIP"
- .SH NAME
- funzip \- filter for extracting from a ZIP archive in a pipe
- .PD
-@@ -78,7 +78,7 @@
- .EE
- .PP
- To use \fIzip\fP and \fIfunzip\fP in place of \fIcompress\fP(1) and
--\fIzcat\fP(1) (or \fIgzip\fP(1L) and \fIgzcat\fP(1L)) for tape backups:
-+\fIzcat\fP(1) (or \fIgzip\fP(1) and \fIgzcat\fP(1)) for tape backups:
- .PP
- .EX
- tar cf \- . | zip \-7 | dd of=/dev/nrst0 obs=8k
-@@ -108,8 +108,8 @@
- .PD
- .\" =========================================================================
- .SH "SEE ALSO"
--\fIgzip\fP(1L), \fIunzip\fP(1L), \fIunzipsfx\fP(1L), \fIzip\fP(1L),
--\fIzipcloak\fP(1L), \fIzipinfo\fP(1L), \fIzipnote\fP(1L), \fIzipsplit\fP(1L)
-+\fIgzip\fP(1), \fIunzip\fP(1), \fIunzipsfx\fP(1), \fIzip\fP(1),
-+\fIzipcloak\fP(1), \fIzipinfo\fP(1), \fIzipnote\fP(1), \fIzipsplit\fP(1)
- .PD
- .\" =========================================================================
- .SH URL
---- a/man/unzip.1
-+++ b/man/unzip.1
-@@ -20,7 +20,7 @@
- .in -4n
- ..
- .\" =========================================================================
--.TH UNZIP 1L "20 April 2009 (v6.0)" "Info-ZIP"
-+.TH UNZIP 1 "20 April 2009 (v6.0)" "Info-ZIP"
- .SH NAME
- unzip \- list, test and extract compressed files in a ZIP archive
- .PD
-@@ -34,7 +34,7 @@
- \fIunzip\fP will list, test, or extract files from a ZIP archive, commonly
- found on MS-DOS systems.  The default behavior (with no options) is to extract
- into the current directory (and subdirectories below it) all files from the
--specified ZIP archive.  A companion program, \fIzip\fP(1L), creates ZIP
-+specified ZIP archive.  A companion program, \fIzip\fP(1), creates ZIP
- archives; both programs are compatible with archives created by PKWARE's
- \fIPKZIP\fP and \fIPKUNZIP\fP for MS-DOS, but in many cases the program
- options or default behaviors differ.
-@@ -105,8 +105,8 @@
- list of all possible flags.  The exhaustive list follows:
- .TP
- .B \-Z
--\fIzipinfo\fP(1L) mode.  If the first option on the command line is \fB\-Z\fP,
--the remaining options are taken to be \fIzipinfo\fP(1L) options.  See the
-+\fIzipinfo\fP(1) mode.  If the first option on the command line is \fB\-Z\fP,
-+the remaining options are taken to be \fIzipinfo\fP(1) options.  See the
- appropriate manual page for a description of these options.
- .TP
- .B \-A
-@@ -178,7 +178,7 @@
- compressed size and compression ratio figures are independent of the entry's
- encryption status and show the correct compression performance.  (The complete
- size of the encrypted compressed data stream for zipfile entries is reported
--by the more verbose \fIzipinfo\fP(1L) reports, see the separate manual.)
-+by the more verbose \fIzipinfo\fP(1) reports, see the separate manual.)
- When no zipfile is specified (that is, the complete command is simply
- ``\fCunzip \-v\fR''), a diagnostic screen is printed.  In addition to
- the normal header with release date and version, \fIunzip\fP lists the
-@@ -379,8 +379,8 @@
- .TP
- .B \-N
- [Amiga] extract file comments as Amiga filenotes.  File comments are created
--with the \-c option of \fIzip\fP(1L), or with the \-N option of the Amiga port
--of \fIzip\fP(1L), which stores filenotes as comments.
-+with the \-c option of \fIzip\fP(1), or with the \-N option of the Amiga port
-+of \fIzip\fP(1), which stores filenotes as comments.
- .TP
- .B \-o
- overwrite existing files without prompting.  This is a dangerous option, so
-@@ -598,7 +598,7 @@
- As suggested by the examples above, the default variable names are UNZIP_OPTS
- for VMS (where the symbol used to install \fIunzip\fP as a foreign command
- would otherwise be confused with the environment variable), and UNZIP
--for all other operating systems.  For compatibility with \fIzip\fP(1L),
-+for all other operating systems.  For compatibility with \fIzip\fP(1),
- UNZIPOPT is also accepted (don't ask).  If both UNZIP and UNZIPOPT
- are defined, however, UNZIP takes precedence.  \fIunzip\fP's diagnostic
- option (\fB\-v\fP with no zipfile name) can be used to check the values
-@@ -648,8 +648,8 @@
- a password is not known, entering a null password (that is, just a carriage
- return or ``Enter'') is taken as a signal to skip all further prompting.
- Only unencrypted files in the archive(s) will thereafter be extracted.  (In
--fact, that's not quite true; older versions of \fIzip\fP(1L) and
--\fIzipcloak\fP(1L) allowed null passwords, so \fIunzip\fP checks each encrypted
-+fact, that's not quite true; older versions of \fIzip\fP(1) and
-+\fIzipcloak\fP(1) allowed null passwords, so \fIunzip\fP checks each encrypted
- file to see if the null password works.  This may result in ``false positives''
- and extraction errors, as noted above.)
- .PP
-@@ -943,8 +943,8 @@
- .PD
- .\" =========================================================================
- .SH "SEE ALSO"
--\fIfunzip\fP(1L), \fIzip\fP(1L), \fIzipcloak\fP(1L), \fIzipgrep\fP(1L),
--\fIzipinfo\fP(1L), \fIzipnote\fP(1L), \fIzipsplit\fP(1L)
-+\fIfunzip\fP(1), \fIzip\fP(1), \fIzipcloak\fP(1), \fIzipgrep\fP(1),
-+\fIzipinfo\fP(1), \fIzipnote\fP(1), \fIzipsplit\fP(1)
- .PD
- .\" =========================================================================
- .SH URL
---- a/man/unzipsfx.1
-+++ b/man/unzipsfx.1
-@@ -20,7 +20,7 @@
- .in -4n
- ..
- .\" =========================================================================
--.TH UNZIPSFX 1L "20 April 2009 (v6.0)" "Info-ZIP"
-+.TH UNZIPSFX 1 "20 April 2009 (v6.0)" "Info-ZIP"
- .SH NAME
- unzipsfx \- self-extracting stub for prepending to ZIP archives
- .PD
-@@ -30,7 +30,7 @@
- .PD
- .\" =========================================================================
- .SH DESCRIPTION
--\fIunzipsfx\fP is a modified version of \fIunzip\fP(1L) designed to be
-+\fIunzipsfx\fP is a modified version of \fIunzip\fP(1) designed to be
- prepended to existing ZIP archives in order to form self-extracting archives.
- Instead of taking its first non-flag argument to be the zipfile(s) to be
- extracted, \fIunzipsfx\fP seeks itself under the name by which it was invoked
-@@ -109,7 +109,7 @@
- .PD
- .\" =========================================================================
- .SH OPTIONS
--\fIunzipsfx\fP supports the following \fIunzip\fP(1L) options:  \fB\-c\fP
-+\fIunzipsfx\fP supports the following \fIunzip\fP(1) options:  \fB\-c\fP
- and \fB\-p\fP (extract to standard output/screen), \fB\-f\fP and \fB\-u\fP
- (freshen and update existing files upon extraction), \fB\-t\fP (test
- archive) and \fB\-z\fP (print archive comment).  All normal listing options
-@@ -118,11 +118,11 @@
- those creating self-extracting archives may wish to include a short listing
- in the zipfile comment.
- .PP
--See \fIunzip\fP(1L) for a more complete description of these options.
-+See \fIunzip\fP(1) for a more complete description of these options.
- .PD
- .\" =========================================================================
- .SH MODIFIERS
--\fIunzipsfx\fP currently supports all \fIunzip\fP(1L) modifiers:  \fB\-a\fP
-+\fIunzipsfx\fP currently supports all \fIunzip\fP(1) modifiers:  \fB\-a\fP
- (convert text files), \fB\-n\fP (never overwrite), \fB\-o\fP (overwrite
- without prompting), \fB\-q\fP (operate quietly), \fB\-C\fP (match names
- case-insensitively), \fB\-L\fP (convert uppercase-OS names to lowercase),
-@@ -137,18 +137,18 @@
- of course continue to be supported since the zipfile format implies ASCII
- storage of text files.)
- .PP
--See \fIunzip\fP(1L) for a more complete description of these modifiers.
-+See \fIunzip\fP(1) for a more complete description of these modifiers.
- .PD
- .\" =========================================================================
- .SH "ENVIRONMENT OPTIONS"
--\fIunzipsfx\fP uses the same environment variables as \fIunzip\fP(1L) does,
-+\fIunzipsfx\fP uses the same environment variables as \fIunzip\fP(1) does,
- although this is likely to be an issue only for the person creating and
--testing the self-extracting archive.  See \fIunzip\fP(1L) for details.
-+testing the self-extracting archive.  See \fIunzip\fP(1) for details.
- .PD
- .\" =========================================================================
- .SH DECRYPTION
--Decryption is supported exactly as in \fIunzip\fP(1L); that is, interactively
--with a non-echoing prompt for the password(s).  See \fIunzip\fP(1L) for
-+Decryption is supported exactly as in \fIunzip\fP(1); that is, interactively
-+with a non-echoing prompt for the password(s).  See \fIunzip\fP(1) for
- details.  Once again, note that if the archive has no encrypted files there
- is no reason to use a version of \fIunzipsfx\fP with decryption support;
- that only adds to the size of the archive.
-@@ -286,7 +286,7 @@
- from anywhere in the user's path.  The situation is not known for AmigaDOS,
- Atari TOS, MacOS, etc.
- .PP
--As noted above, a number of the normal \fIunzip\fP(1L) functions have
-+As noted above, a number of the normal \fIunzip\fP(1) functions have
- been removed in order to make \fIunzipsfx\fP smaller:  usage and diagnostic
- info, listing functions and extraction to other directories.  Also, only
- stored and deflated files are supported.  The latter limitation is mainly
-@@ -303,17 +303,17 @@
- defined as a ``debug hunk.'')  There may be compatibility problems between
- the ROM levels of older Amigas and newer ones.
- .PP
--All current bugs in \fIunzip\fP(1L) exist in \fIunzipsfx\fP as well.
-+All current bugs in \fIunzip\fP(1) exist in \fIunzipsfx\fP as well.
- .PD
- .\" =========================================================================
- .SH DIAGNOSTICS
- \fIunzipsfx\fP's exit status (error level) is identical to that of
--\fIunzip\fP(1L); see the corresponding man page.
-+\fIunzip\fP(1); see the corresponding man page.
- .PD
- .\" =========================================================================
- .SH "SEE ALSO"
--\fIfunzip\fP(1L), \fIunzip\fP(1L), \fIzip\fP(1L), \fIzipcloak\fP(1L),
--\fIzipgrep\fP(1L), \fIzipinfo\fP(1L), \fIzipnote\fP(1L), \fIzipsplit\fP(1L)
-+\fIfunzip\fP(1), \fIunzip\fP(1), \fIzip\fP(1), \fIzipcloak\fP(1),
-+\fIzipgrep\fP(1), \fIzipinfo\fP(1), \fIzipnote\fP(1), \fIzipsplit\fP(1)
- .PD
- .PD
- .\" =========================================================================
-@@ -330,7 +330,7 @@
- .\" =========================================================================
- .SH AUTHORS
- Greg Roelofs was responsible for the basic modifications to UnZip necessary
--to create UnZipSFX.  See \fIunzip\fP(1L) for the current list of Zip-Bugs
-+to create UnZipSFX.  See \fIunzip\fP(1) for the current list of Zip-Bugs
- authors, or the file CONTRIBS in the UnZip source distribution for the
- full list of Info-ZIP contributors.
- .PD
---- a/man/zipgrep.1
-+++ b/man/zipgrep.1
-@@ -8,7 +8,7 @@
- .\" zipgrep.1 by Greg Roelofs.
- .\"
- .\" =========================================================================
--.TH ZIPGREP 1L "20 April 2009" "Info-ZIP"
-+.TH ZIPGREP 1 "20 April 2009" "Info-ZIP"
- .SH NAME
- zipgrep \- search files in a ZIP archive for lines matching a pattern
- .PD
-@@ -21,7 +21,7 @@
- .SH DESCRIPTION
- \fIzipgrep\fP will search files within a ZIP archive for lines matching
- the given string or pattern.  \fIzipgrep\fP is a shell script and requires
--\fIegrep\fP(1) and \fIunzip\fP(1L) to function.  Its output is identical to
-+\fIegrep\fP(1) and \fIunzip\fP(1) to function.  Its output is identical to
- that of \fIegrep\fP(1).
- .PD
- .\" =========================================================================
-@@ -69,8 +69,8 @@
- .PD
- .\" =========================================================================
- .SH "SEE ALSO"
--\fIegrep\fP(1), \fIunzip\fP(1L), \fIzip\fP(1L), \fIfunzip\fP(1L),
--\fIzipcloak\fP(1L), \fIzipinfo\fP(1L), \fIzipnote\fP(1L), \fIzipsplit\fP(1L)
-+\fIegrep\fP(1), \fIunzip\fP(1), \fIzip\fP(1), \fIfunzip\fP(1),
-+\fIzipcloak\fP(1), \fIzipinfo\fP(1), \fIzipnote\fP(1), \fIzipsplit\fP(1)
- .PD
- .\" =========================================================================
- .SH URL
---- a/man/zipinfo.1
-+++ b/man/zipinfo.1
-@@ -34,7 +34,7 @@
- .in -4n
- ..
- .\" =========================================================================
--.TH ZIPINFO 1L "20 April 2009 (v3.0)" "Info-ZIP"
-+.TH ZIPINFO 1 "20 April 2009 (v3.0)" "Info-ZIP"
- .SH NAME
- zipinfo \- list detailed information about a ZIP archive
- .PD
-@@ -272,7 +272,7 @@
- Note that because of limitations in the MS-DOS format used to store file
- times, the seconds field is always rounded to the nearest even second.
- For Unix files this is expected to change in the next major releases of
--\fIzip\fP(1L) and \fIunzip\fP.
-+\fIzip\fP(1) and \fIunzip\fP.
- .PP
- In addition to individual file information, a default zipfile listing
- also includes header and trailer lines:
-@@ -361,7 +361,7 @@
- As suggested above, the default variable names are ZIPINFO_OPTS for VMS
- (where the symbol used to install \fIzipinfo\fP as a foreign command
- would otherwise be confused with the environment variable), and ZIPINFO
--for all other operating systems.  For compatibility with \fIzip\fP(1L),
-+for all other operating systems.  For compatibility with \fIzip\fP(1),
- ZIPINFOOPT is also accepted (don't ask).  If both ZIPINFO and ZIPINFOOPT
- are defined, however, ZIPINFO takes precedence.  \fIunzip\fP's diagnostic
- option (\fB\-v\fP with no zipfile name) can be used to check the values
-@@ -496,8 +496,8 @@
- .PP
- .\" =========================================================================
- .SH "SEE ALSO"
--\fIls\fP(1), \fIfunzip\fP(1L), \fIunzip\fP(1L), \fIunzipsfx\fP(1L),
--\fIzip\fP(1L), \fIzipcloak\fP(1L), \fIzipnote\fP(1L), \fIzipsplit\fP(1L)
-+\fIls\fP(1), \fIfunzip\fP(1), \fIunzip\fP(1), \fIunzipsfx\fP(1),
-+\fIzip\fP(1), \fIzipcloak\fP(1), \fIzipnote\fP(1), \fIzipsplit\fP(1)
- .PD
- .\" =========================================================================
- .SH URL
-================================================
-From: Aurelien Jarno <aurel32@debian.org>
-Subject: #include <unistd.h> for kFreeBSD
-Bug-Debian: http://bugs.debian.org/340693
-X-Debian-version: 5.52-8
-
---- a/unix/unxcfg.h
-+++ b/unix/unxcfg.h
-@@ -52,6 +52,7 @@
- 
- #include <sys/types.h>          /* off_t, time_t, dev_t, ... */
- #include <sys/stat.h>
-+#include <unistd.h>
- 
- #ifdef NO_OFF_T
-   typedef long zoff_t;
-================================================
-From: Steven Schweda
-Subject: Handle the PKWare verification bit of internal attributes
-Bug-Debian: http://bugs.debian.org/630078
-X-Debian-version: 6.0-5
-
---- a/process.c
-+++ b/process.c
-@@ -1729,6 +1729,13 @@
-     else if (uO.L_flag > 1)   /* let -LL force lower case for all names */
-         G.pInfo->lcflag = 1;
- 
-+    /* Handle the PKWare verification bit, bit 2 (0x0004) of internal
-+       attributes.  If this is set, then a verification checksum is in the
-+       first 3 bytes of the external attributes.  In this case all we can use
-+       for setting file attributes is the last external attributes byte. */
-+    if (G.crec.internal_file_attributes & 0x0004)
-+      G.crec.external_file_attributes &= (ulg)0xff;
-+
-     /* do Amigas (AMIGA_) also have volume labels? */
-     if (IS_VOLID(G.crec.external_file_attributes) &&
-         (G.pInfo->hostnum == FS_FAT_ || G.pInfo->hostnum == FS_HPFS_ ||
-================================================
-From: sms
-Subject: Restore uid and gid information when requested
-Bug-Debian: http://bugs.debian.org/689212
-X-Debian-version: 6.0-8
-
---- a/process.c
-+++ b/process.c
-@@ -2904,7 +2904,7 @@
- #ifdef IZ_HAVE_UXUIDGID
-             if (eb_len >= EB_UX3_MINLEN
-                 && z_uidgid != NULL
--                && (*((EB_HEADSIZE + 0) + ef_buf) == 1)
-+                && (*((EB_HEADSIZE + 0) + ef_buf) == 1))
-                     /* only know about version 1 */
-             {
-                 uch uid_size;
-@@ -2916,10 +2916,10 @@
-                 flags &= ~0x0ff;      /* ignore any previous UNIX field */
- 
-                 if ( read_ux3_value((EB_HEADSIZE + 2) + ef_buf,
--                                    uid_size, z_uidgid[0])
-+                                    uid_size, &z_uidgid[0])
-                     &&
-                      read_ux3_value((EB_HEADSIZE + uid_size + 3) + ef_buf,
--                                    gid_size, z_uidgid[1]) )
-+                                    gid_size, &z_uidgid[1]) )
-                 {
-                     flags |= EB_UX2_VALID;   /* signal success */
-                 }
-================================================
-From: Andreas Schwab <schwab@linux-m68k.org>
-Subject: Initialize the symlink flag
-Bug-Debian: http://bugs.debian.org/717029
-X-Debian-version: 6.0-10
-
---- a/process.c
-+++ b/process.c
-@@ -1758,6 +1758,12 @@
-         = (G.crec.general_purpose_bit_flag & (1 << 11)) == (1 << 11);
- #endif
- 
-+#ifdef SYMLINKS
-+    /* Initialize the symlink flag, may be set by the platform-specific
-+       mapattr function.  */
-+    G.pInfo->symlink = 0;
-+#endif
-+
-     return PK_COOL;
- 
- } /* end function process_cdir_file_hdr() */
-================================================
-From: sms
-Subject: Increase size of cfactorstr array to avoid buffer overflow
-Bug-Debian: http://bugs.debian.org/741384
-X-Debian-version: 6.0-11
-
---- a/list.c
-+++ b/list.c
-@@ -97,7 +97,7 @@
- {
-     int do_this_file=FALSE, cfactor, error, error_in_archive=PK_COOL;
- #ifndef WINDLL
--    char sgn, cfactorstr[10];
-+    char sgn, cfactorstr[12];
-     int longhdr=(uO.vflag>1);
- #endif
-     int date_format;
-================================================
-From: Santiago Vila <sanvila@debian.org>
-Subject: zipinfo.c: Do not crash when hostver byte is >= 100
-
---- a/zipinfo.c
-+++ b/zipinfo.c
-@@ -2114,7 +2114,7 @@
-             else
-                 attribs[9] = (xattr & UNX_ISVTX)? 'T' : '-';  /* T==undefined */
- 
--            sprintf(&attribs[12], "%u.%u", hostver/10, hostver%10);
-+            sprintf(&attribs[11], "%2u.%u", hostver/10, hostver%10);
-             break;
- 
-     } /* end switch (hostnum: external attributes format) */
-================================================
-From: sms
-Subject: Fix CVE-2014-8139: CRC32 verification heap-based overflow
-Bug-Debian: http://bugs.debian.org/773722
-
---- a/extract.c
-+++ b/extract.c
-@@ -1,5 +1,5 @@
- /*
--  Copyright (c) 1990-2009 Info-ZIP.  All rights reserved.
-+  Copyright (c) 1990-2014 Info-ZIP.  All rights reserved.
- 
-   See the accompanying file LICENSE, version 2009-Jan-02 or later
-   (the contents of which are also included in unzip.h) for terms of use.
-@@ -298,6 +298,8 @@
- #ifndef SFX
-    static ZCONST char Far InconsistEFlength[] = "bad extra-field entry:\n \
-      EF block length (%u bytes) exceeds remaining EF data (%u bytes)\n";
-+   static ZCONST char Far TooSmallEBlength[] = "bad extra-field entry:\n \
-+     EF block length (%u bytes) invalid (< %d)\n";
-    static ZCONST char Far InvalidComprDataEAs[] =
-      " invalid compressed data for EAs\n";
- #  if (defined(WIN32) && defined(NTSD_EAS))
-@@ -2023,7 +2025,8 @@
-         ebID = makeword(ef);
-         ebLen = (unsigned)makeword(ef+EB_LEN);
- 
--        if (ebLen > (ef_len - EB_HEADSIZE)) {
-+        if (ebLen > (ef_len - EB_HEADSIZE))
-+        {
-            /* Discovered some extra field inconsistency! */
-             if (uO.qflag)
-                 Info(slide, 1, ((char *)slide, "%-22s ",
-@@ -2158,11 +2161,19 @@
-                 }
-                 break;
-             case EF_PKVMS:
--                if (makelong(ef+EB_HEADSIZE) !=
-+                if (ebLen < 4)
-+                {
-+                    Info(slide, 1,
-+                     ((char *)slide, LoadFarString(TooSmallEBlength),
-+                     ebLen, 4));
-+                }
-+                else if (makelong(ef+EB_HEADSIZE) !=
-                     crc32(CRCVAL_INITIAL, ef+(EB_HEADSIZE+4),
-                           (extent)(ebLen-4)))
-+                {
-                     Info(slide, 1, ((char *)slide,
-                       LoadFarString(BadCRC_EAs)));
-+                }
-                 break;
-             case EF_PKW32:
-             case EF_PKUNIX:
-================================================
-From: sms
-Subject: Fix CVE-2014-8140: out-of-bounds write issue in test_compr_eb()
-Bug-Debian: http://bugs.debian.org/773722
-
---- a/extract.c
-+++ b/extract.c
-@@ -2232,10 +2232,17 @@
-     if (compr_offset < 4)                /* field is not compressed: */
-         return PK_OK;                    /* do nothing and signal OK */
- 
-+    /* Return no/bad-data error status if any problem is found:
-+     *    1. eb_size is too small to hold the uncompressed size
-+     *       (eb_ucsize).  (Else extract eb_ucsize.)
-+     *    2. eb_ucsize is zero (invalid).  2014-12-04 SMS.
-+     *    3. eb_ucsize is positive, but eb_size is too small to hold
-+     *       the compressed data header.
-+     */
-     if ((eb_size < (EB_UCSIZE_P + 4)) ||
--        ((eb_ucsize = makelong(eb+(EB_HEADSIZE+EB_UCSIZE_P))) > 0L &&
--         eb_size <= (compr_offset + EB_CMPRHEADLEN)))
--        return IZ_EF_TRUNC;               /* no compressed data! */
-+     ((eb_ucsize = makelong( eb+ (EB_HEADSIZE+ EB_UCSIZE_P))) == 0L) ||
-+     ((eb_ucsize > 0L) && (eb_size <= (compr_offset + EB_CMPRHEADLEN))))
-+        return IZ_EF_TRUNC;             /* no/bad compressed data! */
- 
-     if (
- #ifdef INT_16BIT
-================================================
-From: sms
-Subject: Fix CVE-2014-8141: out-of-bounds read issues in getZip64Data()
-Bug-Debian: http://bugs.debian.org/773722
-
---- a/fileio.c
-+++ b/fileio.c
-@@ -176,6 +176,8 @@
- #endif
- static ZCONST char Far ExtraFieldTooLong[] =
-   "warning:  extra field too long (%d).  Ignoring...\n";
-+static ZCONST char Far ExtraFieldCorrupt[] =
-+  "warning:  extra field (type: 0x%04x) corrupt.  Continuing...\n";
- 
- #ifdef WINDLL
-    static ZCONST char Far DiskFullQuery[] =
-@@ -2295,7 +2297,12 @@
-             if (readbuf(__G__ (char *)G.extra_field, length) == 0)
-                 return PK_EOF;
-             /* Looks like here is where extra fields are read */
--            getZip64Data(__G__ G.extra_field, length);
-+            if (getZip64Data(__G__ G.extra_field, length) != PK_COOL)
-+            {
-+                Info(slide, 0x401, ((char *)slide,
-+                 LoadFarString( ExtraFieldCorrupt), EF_PKSZ64));
-+                error = PK_WARN;
-+            }
- #ifdef UNICODE_SUPPORT
-             G.unipath_filename = NULL;
-             if (G.UzO.U_flag < 2) {
---- a/process.c
-+++ b/process.c
-@@ -1,5 +1,5 @@
- /*
--  Copyright (c) 1990-2009 Info-ZIP.  All rights reserved.
-+  Copyright (c) 1990-2014 Info-ZIP.  All rights reserved.
- 
-   See the accompanying file LICENSE, version 2009-Jan-02 or later
-   (the contents of which are also included in unzip.h) for terms of use.
-@@ -1901,48 +1901,82 @@
-     and a 4-byte version of disk start number.
-     Sets both local header and central header fields.  Not terribly clever,
-     but it means that this procedure is only called in one place.
-+
-+    2014-12-05 SMS.
-+    Added checks to ensure that enough data are available before calling
-+    makeint64() or makelong().  Replaced various sizeof() values with
-+    simple ("4" or "8") constants.  (The Zip64 structures do not depend
-+    on our variable sizes.)  Error handling is crude, but we should now
-+    stay within the buffer.
-   ---------------------------------------------------------------------------*/
- 
-+#define Z64FLGS 0xffff
-+#define Z64FLGL 0xffffffff
-+
-     if (ef_len == 0 || ef_buf == NULL)
-         return PK_COOL;
- 
-     Trace((stderr,"\ngetZip64Data: scanning extra field of length %u\n",
-       ef_len));
- 
--    while (ef_len >= EB_HEADSIZE) {
-+    while (ef_len >= EB_HEADSIZE)
-+    {
-         eb_id = makeword(EB_ID + ef_buf);
-         eb_len = makeword(EB_LEN + ef_buf);
- 
--        if (eb_len > (ef_len - EB_HEADSIZE)) {
--            /* discovered some extra field inconsistency! */
-+        if (eb_len > (ef_len - EB_HEADSIZE))
-+        {
-+            /* Extra block length exceeds remaining extra field length. */
-             Trace((stderr,
-               "getZip64Data: block length %u > rest ef_size %u\n", eb_len,
-               ef_len - EB_HEADSIZE));
-             break;
-         }
--        if (eb_id == EF_PKSZ64) {
--
-+        if (eb_id == EF_PKSZ64)
-+        {
-           int offset = EB_HEADSIZE;
- 
--          if (G.crec.ucsize == 0xffffffff || G.lrec.ucsize == 0xffffffff){
--            G.lrec.ucsize = G.crec.ucsize = makeint64(offset + ef_buf);
--            offset += sizeof(G.crec.ucsize);
-+          if ((G.crec.ucsize == Z64FLGL) || (G.lrec.ucsize == Z64FLGL))
-+          {
-+            if (offset+ 8 > ef_len)
-+              return PK_ERR;
-+
-+            G.crec.ucsize = G.lrec.ucsize = makeint64(offset + ef_buf);
-+            offset += 8;
-           }
--          if (G.crec.csize == 0xffffffff || G.lrec.csize == 0xffffffff){
--            G.csize = G.lrec.csize = G.crec.csize = makeint64(offset + ef_buf);
--            offset += sizeof(G.crec.csize);
-+
-+          if ((G.crec.csize == Z64FLGL) || (G.lrec.csize == Z64FLGL))
-+          {
-+            if (offset+ 8 > ef_len)
-+              return PK_ERR;
-+
-+            G.csize = G.crec.csize = G.lrec.csize = makeint64(offset + ef_buf);
-+            offset += 8;
-           }
--          if (G.crec.relative_offset_local_header == 0xffffffff){
-+
-+          if (G.crec.relative_offset_local_header == Z64FLGL)
-+          {
-+            if (offset+ 8 > ef_len)
-+              return PK_ERR;
-+
-             G.crec.relative_offset_local_header = makeint64(offset + ef_buf);
--            offset += sizeof(G.crec.relative_offset_local_header);
-+            offset += 8;
-           }
--          if (G.crec.disk_number_start == 0xffff){
-+
-+          if (G.crec.disk_number_start == Z64FLGS)
-+          {
-+            if (offset+ 4 > ef_len)
-+              return PK_ERR;
-+
-             G.crec.disk_number_start = (zuvl_t)makelong(offset + ef_buf);
--            offset += sizeof(G.crec.disk_number_start);
-+            offset += 4;
-           }
-+#if 0
-+          break;                /* Expect only one EF_PKSZ64 block. */
-+#endif /* 0 */
-         }
- 
--        /* Skip this extra field block */
-+        /* Skip this extra field block. */
-         ef_buf += (eb_len + EB_HEADSIZE);
-         ef_len -= (eb_len + EB_HEADSIZE);
-     }
-================================================
-From: mancha <mancha1 AT zoho DOT com>
-Date: Mon, 3 Nov 2014
-Subject: Info-ZIP UnZip buffer overflow
-Bug-Debian: http://bugs.debian.org/776589
-
-By carefully crafting a corrupt ZIP archive with "extra fields" that
-purport to have compressed blocks larger than the corresponding
-uncompressed blocks in STORED no-compression mode, an attacker can
-trigger a heap overflow that can result in application crash or
-possibly have other unspecified impact.
-
-This patch ensures that when extra fields use STORED mode, the
-"compressed" and uncompressed block sizes match.
-
---- a/extract.c
-+++ b/extract.c
-@@ -2228,6 +2228,7 @@
-     ulg eb_ucsize;
-     uch *eb_ucptr;
-     int r;
-+    ush eb_compr_method;
- 
-     if (compr_offset < 4)                /* field is not compressed: */
-         return PK_OK;                    /* do nothing and signal OK */
-@@ -2244,6 +2245,14 @@
-      ((eb_ucsize > 0L) && (eb_size <= (compr_offset + EB_CMPRHEADLEN))))
-         return IZ_EF_TRUNC;             /* no/bad compressed data! */
- 
-+    /* 2014-11-03 Michal Zalewski, SMS.
-+     * For STORE method, compressed and uncompressed sizes must agree.
-+     * http://www.info-zip.org/phpBB3/viewtopic.php?f=7&t=450
-+     */
-+    eb_compr_method = makeword( eb + (EB_HEADSIZE + compr_offset));
-+    if ((eb_compr_method == STORED) && (eb_size - compr_offset != eb_ucsize))
-+        return PK_ERR;
-+
-     if (
- #ifdef INT_16BIT
-         (((ulg)(extent)eb_ucsize) != eb_ucsize) ||
-================================================
-From: Jérémy Bobbio <lunar@debian.org>
-Subject: Remove build date
-Bug-Debian: http://bugs.debian.org/782851
- In order to make unzip build reproducibly, we remove the
- (already optional) build date from the binary.
-
---- a/unix/unix.c
-+++ b/unix/unix.c
-@@ -1705,7 +1705,7 @@
- #endif /* Sun */
- #endif /* SGI */
- 
--#ifdef __DATE__
-+#if 0
-       " on ", __DATE__
- #else
-       "", ""
-================================================
-From: Petr Stodulka <pstodulk@redhat.com>
-Date: Mon, 14 Sep 2015 18:23:17 +0200
-Subject: Upstream fix for heap overflow
-Bug-Debian: https://bugs.debian.org/802162
-Bug-RedHat: https://bugzilla.redhat.com/show_bug.cgi?id=1260944
-Origin: https://bugzilla.redhat.com/attachment.cgi?id=1073002
-Forwarded: yes
-
----
- crypt.c | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
---- a/crypt.c
-+++ b/crypt.c
-@@ -465,7 +465,17 @@
-     GLOBAL(pInfo->encrypted) = FALSE;
-     defer_leftover_input(__G);
-     for (n = 0; n < RAND_HEAD_LEN; n++) {
--        b = NEXTBYTE;
-+        /* 2012-11-23 SMS.  (OUSPG report.)
-+         * Quit early if compressed size < HEAD_LEN.  The resulting
-+         * error message ("unable to get password") could be improved,
-+         * but it's better than trying to read nonexistent data, and
-+         * then continuing with a negative G.csize.  (See
-+         * fileio.c:readbyte()).
-+         */
-+        if ((b = NEXTBYTE) == (ush)EOF)
-+        {
-+            return PK_ERR;
-+        }
-         h[n] = (uch)b;
-         Trace((stdout, " (%02x)", h[n]));
-     }
-================================================
-From: Kamil Dudka <kdudka@redhat.com>
-Date: Mon, 14 Sep 2015 18:24:56 +0200
-Subject: fix infinite loop when extracting empty bzip2 data
-Bug-Debian: https://bugs.debian.org/802160
-Bug-RedHat: https://bugzilla.redhat.com/show_bug.cgi?id=1260944
-Origin: other, https://bugzilla.redhat.com/attachment.cgi?id=1073339
-
----
- extract.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/extract.c
-+++ b/extract.c
-@@ -2728,6 +2728,12 @@
-     int repeated_buf_err;
-     bz_stream bstrm;
- 
-+    if (G.incnt <= 0 && G.csize <= 0L) {
-+        /* avoid an infinite loop */
-+        Trace((stderr, "UZbunzip2() got empty input\n"));
-+        return 2;
-+    }
-+
- #if (defined(DLL) && !defined(NO_SLIDE_REDIR))
-     if (G.redirect_slide)
-         wsize = G.redirect_size, redirSlide = G.redirect_buffer;
-================================================
-From: Kamil Dudka <kdudka@redhat.com>
-Date: Tue, 22 Sep 2015 18:52:23 +0200
-Subject: [PATCH] extract: prevent unsigned overflow on invalid input
-Origin: other, https://bugzilla.redhat.com/attachment.cgi?id=1075942
-Bug-RedHat: https://bugzilla.redhat.com/show_bug.cgi?id=1260944
-
-Suggested-by: Stefan Cornelius
----
- extract.c | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
---- a/extract.c
-+++ b/extract.c
-@@ -1257,8 +1257,17 @@
-         if (G.lrec.compression_method == STORED) {
-             zusz_t csiz_decrypted = G.lrec.csize;
- 
--            if (G.pInfo->encrypted)
-+            if (G.pInfo->encrypted) {
-+                if (csiz_decrypted < 12) {
-+                    /* handle the error now to prevent unsigned overflow */
-+                    Info(slide, 0x401, ((char *)slide,
-+                      LoadFarStringSmall(ErrUnzipNoFile),
-+                      LoadFarString(InvalidComprData),
-+                      LoadFarStringSmall2(Inflate)));
-+                    return PK_ERR;
-+                }
-                 csiz_decrypted -= 12;
-+            }
-             if (G.lrec.ucsize != csiz_decrypted) {
-                 Info(slide, 0x401, ((char *)slide,
-                   LoadFarStringSmall2(WrnStorUCSizCSizDiff),
-================================================
-From: Giovanni Scafora <giovanni.archlinux.org>
-Subject: unzip files encoded with non-latin, non-unicode file names
-Last-Update: 2015-02-11
-
-Updated 2015-02-11 by Marc Deslauriers <marc.deslauriers@canonical.com>
-to fix buffer overflow in charset_to_intern()
-
-Index: unzip-6.0/unix/unix.c
-===================================================================
---- unzip-6.0.orig/unix/unix.c	2015-02-11 08:46:43.675324290 -0500
-+++ unzip-6.0/unix/unix.c	2015-02-11 09:18:04.902081319 -0500
-@@ -30,6 +30,9 @@
- #define UNZIP_INTERNAL
- #include "unzip.h"
- 
-+#include <iconv.h>
-+#include <langinfo.h>
-+
- #ifdef SCO_XENIX
- #  define SYSNDIR
- #else  /* SCO Unix, AIX, DNIX, TI SysV, Coherent 4.x, ... */
-@@ -1874,3 +1877,102 @@
-     }
- }
- #endif /* QLZIP */
-+
-+
-+typedef struct {
-+    char *local_charset;
-+    char *archive_charset;
-+} CHARSET_MAP;
-+
-+/* A mapping of local <-> archive charsets used by default to convert filenames
-+ * of DOS/Windows Zip archives. Currently very basic. */
-+static CHARSET_MAP dos_charset_map[] = {
-+    { "ANSI_X3.4-1968", "CP850" },
-+    { "ISO-8859-1", "CP850" },
-+    { "CP1252", "CP850" },
-+    { "UTF-8", "CP866" },
-+    { "KOI8-R", "CP866" },
-+    { "KOI8-U", "CP866" },
-+    { "ISO-8859-5", "CP866" }
-+};
-+
-+char OEM_CP[MAX_CP_NAME] = "";
-+char ISO_CP[MAX_CP_NAME] = "";
-+
-+/* Try to guess the default value of OEM_CP based on the current locale.
-+ * ISO_CP is left alone for now. */
-+void init_conversion_charsets()
-+{
-+    const char *local_charset;
-+    int i;
-+
-+    /* Make a guess only if OEM_CP not already set. */ 
-+    if(*OEM_CP == '\0') {
-+    	local_charset = nl_langinfo(CODESET);
-+    	for(i = 0; i < sizeof(dos_charset_map)/sizeof(CHARSET_MAP); i++)
-+    		if(!strcasecmp(local_charset, dos_charset_map[i].local_charset)) {
-+    			strncpy(OEM_CP, dos_charset_map[i].archive_charset,
-+    					sizeof(OEM_CP));
-+    			break;
-+    		}
-+    }
-+}
-+
-+/* Convert a string from one encoding to the current locale using iconv().
-+ * Be as non-intrusive as possible. If error is encountered during covertion
-+ * just leave the string intact. */
-+static void charset_to_intern(char *string, char *from_charset)
-+{
-+    iconv_t cd;
-+    char *s,*d, *buf;
-+    size_t slen, dlen, buflen;
-+    const char *local_charset;
-+
-+    if(*from_charset == '\0')
-+    	return;
-+
-+    buf = NULL;
-+    local_charset = nl_langinfo(CODESET);
-+
-+    if((cd = iconv_open(local_charset, from_charset)) == (iconv_t)-1)
-+        return;
-+
-+    slen = strlen(string);
-+    s = string;
-+
-+    /*  Make sure OUTBUFSIZ + 1 never ends up smaller than FILNAMSIZ
-+     *  as this function also gets called with G.outbuf in fileio.c
-+     */
-+    buflen = FILNAMSIZ;
-+    if (OUTBUFSIZ + 1 < FILNAMSIZ)
-+    {
-+        buflen = OUTBUFSIZ + 1;
-+    }
-+
-+    d = buf = malloc(buflen);
-+    if(!d)
-+    	goto cleanup;
-+
-+    bzero(buf,buflen);
-+    dlen = buflen - 1;
-+
-+    if(iconv(cd, &s, &slen, &d, &dlen) == (size_t)-1)
-+    	goto cleanup;
-+    strncpy(string, buf, buflen);
-+
-+    cleanup:
-+    free(buf);
-+    iconv_close(cd);
-+}
-+
-+/* Convert a string from OEM_CP to the current locale charset. */
-+inline void oem_intern(char *string)
-+{
-+    charset_to_intern(string, OEM_CP);
-+}
-+
-+/* Convert a string from ISO_CP to the current locale charset. */
-+inline void iso_intern(char *string)
-+{
-+    charset_to_intern(string, ISO_CP);
-+}
-Index: unzip-6.0/unix/unxcfg.h
-===================================================================
---- unzip-6.0.orig/unix/unxcfg.h	2015-02-11 08:46:43.675324290 -0500
-+++ unzip-6.0/unix/unxcfg.h	2015-02-11 08:46:43.671324260 -0500
-@@ -228,4 +228,30 @@
- /* wild_dir, dirname, wildname, matchname[], dirnamelen, have_dirname, */
- /*    and notfirstcall are used by do_wild().                          */
- 
-+
-+#define MAX_CP_NAME 25 
-+   
-+#ifdef SETLOCALE
-+#  undef SETLOCALE
-+#endif
-+#define SETLOCALE(category, locale) setlocale(category, locale)
-+#include <locale.h>
-+   
-+#ifdef _ISO_INTERN
-+#  undef _ISO_INTERN
-+#endif
-+#define _ISO_INTERN(str1) iso_intern(str1)
-+
-+#ifdef _OEM_INTERN
-+#  undef _OEM_INTERN
-+#endif
-+#ifndef IZ_OEM2ISO_ARRAY
-+#  define IZ_OEM2ISO_ARRAY
-+#endif
-+#define _OEM_INTERN(str1) oem_intern(str1)
-+
-+void iso_intern(char *);
-+void oem_intern(char *);
-+void init_conversion_charsets(void);
-+   
- #endif /* !__unxcfg_h */
-Index: unzip-6.0/unzip.c
-===================================================================
---- unzip-6.0.orig/unzip.c	2015-02-11 08:46:43.675324290 -0500
-+++ unzip-6.0/unzip.c	2015-02-11 08:46:43.675324290 -0500
-@@ -327,11 +327,21 @@
-   -2  just filenames but allow -h/-t/-z  -l  long Unix \"ls -l\" format\n\
-                                          -v  verbose, multi-page format\n";
- 
-+#ifndef UNIX
- static ZCONST char Far ZipInfoUsageLine3[] = "miscellaneous options:\n\
-   -h  print header line       -t  print totals for listed files or for all\n\
-   -z  print zipfile comment   -T  print file times in sortable decimal format\
- \n  -C  be case-insensitive   %s\
-   -x  exclude filenames that follow from listing\n";
-+#else /* UNIX */
-+static ZCONST char Far ZipInfoUsageLine3[] = "miscellaneous options:\n\
-+  -h  print header line       -t  print totals for listed files or for all\n\
-+  -z  print zipfile comment  %c-T%c print file times in sortable decimal format\
-+\n %c-C%c be case-insensitive   %s\
-+  -x  exclude filenames that follow from listing\n\
-+  -O CHARSET  specify a character encoding for DOS, Windows and OS/2 archives\n\
-+  -I CHARSET  specify a character encoding for UNIX and other archives\n";
-+#endif /* !UNIX */
- #ifdef MORE
-    static ZCONST char Far ZipInfoUsageLine4[] =
-      "  -M  page output through built-in \"more\"\n";
-@@ -664,6 +674,17 @@
-   -U  use escapes for all non-ASCII Unicode  -UU ignore any Unicode fields\n\
-   -C  match filenames case-insensitively     -L  make (some) names \
- lowercase\n %-42s  -V  retain VMS version numbers\n%s";
-+#elif (defined UNIX)
-+static ZCONST char Far UnzipUsageLine4[] = "\
-+modifiers:\n\
-+  -n  never overwrite existing files         -q  quiet mode (-qq => quieter)\n\
-+  -o  overwrite files WITHOUT prompting      -a  auto-convert any text files\n\
-+  -j  junk paths (do not make directories)   -aa treat ALL files as text\n\
-+  -U  use escapes for all non-ASCII Unicode  -UU ignore any Unicode fields\n\
-+  -C  match filenames case-insensitively     -L  make (some) names \
-+lowercase\n %-42s  -V  retain VMS version numbers\n%s\
-+  -O CHARSET  specify a character encoding for DOS, Windows and OS/2 archives\n\
-+  -I CHARSET  specify a character encoding for UNIX and other archives\n\n";
- #else /* !VMS */
- static ZCONST char Far UnzipUsageLine4[] = "\
- modifiers:\n\
-@@ -802,6 +823,10 @@
- #endif /* UNICODE_SUPPORT */
- 
- 
-+#ifdef UNIX
-+    init_conversion_charsets();
-+#endif
-+
- #if (defined(__IBMC__) && defined(__DEBUG_ALLOC__))
-     extern void DebugMalloc(void);
- 
-@@ -1335,6 +1360,11 @@
-     argc = *pargc;
-     argv = *pargv;
- 
-+#ifdef UNIX
-+    extern char OEM_CP[MAX_CP_NAME];
-+    extern char ISO_CP[MAX_CP_NAME];
-+#endif
-+    
-     while (++argv, (--argc > 0 && *argv != NULL && **argv == '-')) {
-         s = *argv + 1;
-         while ((c = *s++) != 0) {    /* "!= 0":  prevent Turbo C warning */
-@@ -1516,6 +1546,35 @@
-                     }
-                     break;
- #endif  /* MACOS */
-+#ifdef UNIX
-+    			case ('I'):
-+                    if (negative) {
-+                        Info(slide, 0x401, ((char *)slide,
-+                          "error:  encodings can't be negated"));
-+                        return(PK_PARAM);
-+    				} else {
-+    					if(*s) { /* Handle the -Icharset case */
-+    						/* Assume that charsets can't start with a dash to spot arguments misuse */
-+    						if(*s == '-') { 
-+    	                        Info(slide, 0x401, ((char *)slide,
-+        		                  "error:  a valid character encoding should follow the -I argument"));
-+    	                        return(PK_PARAM); 
-+    						}
-+    						strncpy(ISO_CP, s, sizeof(ISO_CP));
-+    					} else { /* -I charset */
-+    						++argv;
-+    						if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
-+    	                        Info(slide, 0x401, ((char *)slide,
-+        		                  "error:  a valid character encoding should follow the -I argument"));
-+    	                        return(PK_PARAM); 
-+    						}
-+    						s = *argv;
-+    						strncpy(ISO_CP, s, sizeof(ISO_CP));
-+    					}
-+    					while(*(++s)); /* No params straight after charset name */
-+    				}
-+    				break;
-+#endif /* ?UNIX */
-                 case ('j'):    /* junk pathnames/directory structure */
-                     if (negative)
-                         uO.jflag = FALSE, negative = 0;
-@@ -1591,6 +1650,35 @@
-                     } else
-                         ++uO.overwrite_all;
-                     break;
-+#ifdef UNIX
-+    			case ('O'):
-+                    if (negative) {
-+                        Info(slide, 0x401, ((char *)slide,
-+                          "error:  encodings can't be negated"));
-+                        return(PK_PARAM);
-+    				} else {
-+    					if(*s) { /* Handle the -Ocharset case */
-+    						/* Assume that charsets can't start with a dash to spot arguments misuse */
-+    						if(*s == '-') { 
-+    	                        Info(slide, 0x401, ((char *)slide,
-+        		                  "error:  a valid character encoding should follow the -I argument"));
-+    	                        return(PK_PARAM); 
-+    						}
-+    						strncpy(OEM_CP, s, sizeof(OEM_CP));
-+    					} else { /* -O charset */
-+    						++argv;
-+    						if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
-+    	                        Info(slide, 0x401, ((char *)slide,
-+        		                  "error:  a valid character encoding should follow the -O argument"));
-+    	                        return(PK_PARAM); 
-+    						}
-+    						s = *argv;
-+    						strncpy(OEM_CP, s, sizeof(OEM_CP));
-+    					}
-+    					while(*(++s)); /* No params straight after charset name */
-+    				}
-+    				break;
-+#endif /* ?UNIX */
-                 case ('p'):    /* pipes:  extract to stdout, no messages */
-                     if (negative) {
-                         uO.cflag = FALSE;
-Index: unzip-6.0/unzpriv.h
-===================================================================
---- unzip-6.0.orig/unzpriv.h	2015-02-11 08:46:43.675324290 -0500
-+++ unzip-6.0/unzpriv.h	2015-02-11 08:46:43.675324290 -0500
-@@ -3008,7 +3008,7 @@
-          !(((islochdr) || (isuxatt)) && \
-            ((hostver) == 25 || (hostver) == 26 || (hostver) == 40))) || \
-         (hostnum) == FS_HPFS_ || \
--        ((hostnum) == FS_NTFS_ && (hostver) == 50)) { \
-+        ((hostnum) == FS_NTFS_ /* && (hostver) == 50 */ )) { \
-         _OEM_INTERN((string)); \
-     } else { \
-         _ISO_INTERN((string)); \
-Index: unzip-6.0/zipinfo.c
-===================================================================
---- unzip-6.0.orig/zipinfo.c	2015-02-11 08:46:43.675324290 -0500
-+++ unzip-6.0/zipinfo.c	2015-02-11 08:46:43.675324290 -0500
-@@ -457,6 +457,10 @@
-     int    tflag_slm=TRUE, tflag_2v=FALSE;
-     int    explicit_h=FALSE, explicit_t=FALSE;
- 
-+#ifdef UNIX
-+    extern char OEM_CP[MAX_CP_NAME];
-+    extern char ISO_CP[MAX_CP_NAME];
-+#endif
- 
- #ifdef MACOS
-     uO.lflag = LFLAG;         /* reset default on each call */
-@@ -501,6 +505,35 @@
-                             uO.lflag = 0;
-                     }
-                     break;
-+#ifdef UNIX
-+    			case ('I'):
-+                    if (negative) {
-+                        Info(slide, 0x401, ((char *)slide,
-+                          "error:  encodings can't be negated"));
-+                        return(PK_PARAM);
-+    				} else {
-+    					if(*s) { /* Handle the -Icharset case */
-+    						/* Assume that charsets can't start with a dash to spot arguments misuse */
-+    						if(*s == '-') { 
-+    	                        Info(slide, 0x401, ((char *)slide,
-+        		                  "error:  a valid character encoding should follow the -I argument"));
-+    	                        return(PK_PARAM); 
-+    						}
-+    						strncpy(ISO_CP, s, sizeof(ISO_CP));
-+    					} else { /* -I charset */
-+    						++argv;
-+    						if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
-+    	                        Info(slide, 0x401, ((char *)slide,
-+        		                  "error:  a valid character encoding should follow the -I argument"));
-+    	                        return(PK_PARAM); 
-+    						}
-+    						s = *argv;
-+    						strncpy(ISO_CP, s, sizeof(ISO_CP));
-+    					}
-+    					while(*(++s)); /* No params straight after charset name */
-+    				}
-+    				break;
-+#endif /* ?UNIX */
-                 case 'l':      /* longer form of "ls -l" type listing */
-                     if (negative)
-                         uO.lflag = -2, negative = 0;
-@@ -521,6 +554,35 @@
-                         G.M_flag = TRUE;
-                     break;
- #endif
-+#ifdef UNIX
-+    			case ('O'):
-+                    if (negative) {
-+                        Info(slide, 0x401, ((char *)slide,
-+                          "error:  encodings can't be negated"));
-+                        return(PK_PARAM);
-+    				} else {
-+    					if(*s) { /* Handle the -Ocharset case */
-+    						/* Assume that charsets can't start with a dash to spot arguments misuse */
-+    						if(*s == '-') { 
-+    	                        Info(slide, 0x401, ((char *)slide,
-+        		                  "error:  a valid character encoding should follow the -I argument"));
-+    	                        return(PK_PARAM); 
-+    						}
-+    						strncpy(OEM_CP, s, sizeof(OEM_CP));
-+    					} else { /* -O charset */
-+    						++argv;
-+    						if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
-+    	                        Info(slide, 0x401, ((char *)slide,
-+        		                  "error:  a valid character encoding should follow the -O argument"));
-+    	                        return(PK_PARAM); 
-+    						}
-+    						s = *argv;
-+    						strncpy(OEM_CP, s, sizeof(OEM_CP));
-+    					}
-+    					while(*(++s)); /* No params straight after charset name */
-+    				}
-+    				break;
-+#endif /* ?UNIX */
-                 case 's':      /* default:  shorter "ls -l" type listing */
-                     if (negative)
-                         uO.lflag = -2, negative = 0;
-================================================
diff --git a/Golden_Repo/u/uftp/uftp-1.4.3.eb b/Golden_Repo/u/uftp/uftp-1.4.3.eb
deleted file mode 100644
index 036378dec..000000000
--- a/Golden_Repo/u/uftp/uftp-1.4.3.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-easyblock = 'Tarball'
-
-name = 'uftp'
-version = '1.4.3'
-
-homepage = 'https://unicore-dev.zam.kfa-juelich.de/documentation/uftpclient-%(version)s/uftpclient-manual.html'
-description = """The UFTP standalone client provides high-performance file transfer."""
-
-toolchain = SYSTEM
-
-source_urls = [
-    'https://master.dl.sourceforge.net/project/unicore/Clients/UFTP-Client/%(version)s/']
-sources = ['uftp-client-%(version)s-all.zip']
-checksums = ['10a5db54cf90aea8ee752bdc9bfbde4e41be05b61363352c8a542e0f1f5f8db6']
-
-dependencies = [
-    ('Java', '15'),
-]
-
-postinstallcmds = [
-    'chmod +x %(installdir)s/bin/uftp',
-]
-
-modextravars = {
-    'UFTP_SHARE_URL': 'https://uftp.fz-juelich.de:7112/UFTP_Auth/rest/share/JUDAC',
-    'UFTP_JUDAC': 'https://uftp.fz-juelich.de:7112/UFTP_Auth/rest/auth/JUDAC:'
-}
-
-sanity_check_paths = {
-    'files': ['bin/uftp'],
-    'dirs': ['bin'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/u/uglifyjs/uglifyjs-3.14.3-GCCcore-11.2.0.eb b/Golden_Repo/u/uglifyjs/uglifyjs-3.14.3-GCCcore-11.2.0.eb
deleted file mode 100644
index 3fea3a67e..000000000
--- a/Golden_Repo/u/uglifyjs/uglifyjs-3.14.3-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,30 +0,0 @@
-easyblock = 'Binary'
-
-name = 'uglifyjs'
-version = '3.14.3'
-
-homepage = 'https://github.com/mishoo/UglifyJS'
-description = """UglifyJS is a JavaScript parser, minifier, compressor and beautifier toolkit."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-
-source_urls = ['https://github.com/mishoo/UglifyJS/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['43de653dceff53ee7b3d4a360f8e9e42e9f075441b9506ba651a1885850d0ef5']
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [
-    ('nodejs', '16.13.0'),
-]
-
-install_cmd = 'npm install --no-package-lock -g --prefix %(installdir)s uglify-js@%(version)s v%(version)s.tar.gz'
-
-sanity_check_paths = {
-    'files': ['bin/%(namelower)s'],
-    'dirs': ['lib/node_modules/uglify-js'],
-}
-sanity_check_commands = ['%(namelower)s --help']
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/u/unibilium/unibilium-2.1.1-GCCcore-11.2.0.eb b/Golden_Repo/u/unibilium/unibilium-2.1.1-GCCcore-11.2.0.eb
deleted file mode 100644
index 3eaddf762..000000000
--- a/Golden_Repo/u/unibilium/unibilium-2.1.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-# EasyConfig for Unibilium (NeoVim dependency)
-#
-# Copyright 2019-2022 Stepan Nassyr @ Forschungszentrum Juelich
-easyblock = 'CMakeNinja'
-
-name = 'unibilium'
-version = '2.1.1'
-
-homepage = 'https://github.com/neovim/unibilium'
-description = """Unibilium is a very basic terminfo library
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-github_account = 'neovim'
-source_urls = [GITHUB_SOURCE]
-sources = [
-    {
-        'download_filename': 'v%(version)s.tar.gz',
-        'filename': SOURCELOWER_TAR_GZ
-    }
-]
-checksums = ['6f0ee21c8605340cfbb458cbd195b4d074e6d16dd0c0e12f2627ca773f3cabf1']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.23.1'),
-    ('Ninja', '1.10.2'),
-]
-
-sanity_check_paths = {
-    'files': ['include/unibilium.h', 'lib/libunibilium.a'],
-    'dirs': []
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/u/utf8proc/utf8proc-2.6.1-GCCcore-11.2.0.eb b/Golden_Repo/u/utf8proc/utf8proc-2.6.1-GCCcore-11.2.0.eb
deleted file mode 100644
index b53f6ad6b..000000000
--- a/Golden_Repo/u/utf8proc/utf8proc-2.6.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,30 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'utf8proc'
-version = '2.6.1'
-
-homepage = 'https://github.com/JuliaStrings/utf8proc'
-description = """utf8proc is a small, clean C library that provides Unicode normalization, case-folding, 
-and other operations for data in the UTF-8 encoding."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://github.com/JuliaStrings/utf8proc/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['4c06a9dc4017e8a2438ef80ee371d45868bda2237a98b26554de7a95406b283b']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1'),
-]
-
-separate_build_dir = True
-
-configopts = ['', '-DBUILD_SHARED_LIBS=true']
-
-sanity_check_paths = {
-    'files': ['include/utf8proc.h', 'lib/libutf8proc.a', 'lib/libutf8proc.%s' % SHLIB_EXT],
-    'dirs': [],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/u/util-linux/util-linux-2.37-GCCcore-11.2.0.eb b/Golden_Repo/u/util-linux/util-linux-2.37-GCCcore-11.2.0.eb
deleted file mode 100644
index 0d322000a..000000000
--- a/Golden_Repo/u/util-linux/util-linux-2.37-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,41 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'util-linux'
-version = '2.37'
-
-homepage = 'https://www.kernel.org/pub/linux/utils/util-linux'
-
-description = "Set of Linux utilities"
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['%s/v%%(version_major_minor)s' % homepage]
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['faa8b46d080faa6f32c57da81eda871e38e1e27ba4e9b61cb2589334671aba50']
-
-# disable account related utilities (they need OS dependent pam-devel files)
-# disable wall and friends (requires group changing permissions for install user)
-# install systemd service files in install dir
-# install bash completion files in install dir
-configopts = "--disable-chfn-chsh --disable-login --disable-su --disable-rfkill "
-configopts += "--disable-wall --disable-use-tty-group "
-configopts += "--disable-makeinstall-chown --disable-makeinstall-setuid "
-configopts += "--with-systemdsystemunitdir='${prefix}/systemd' "
-configopts += "--with-bashcompletiondir='${prefix}/share/bash-completion/completions' "
-# disable building Python bindings (since we don't include Python as a dep)
-configopts += "--without-python "
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [
-    ('ncurses', '6.2'),
-    ('zlib', '1.2.11'),
-]
-
-sanity_check_paths = {
-    'files': ['lib/lib%s.a' % x for x in ['blkid', 'mount', 'uuid']],
-    'dirs': ['include', 'bin', 'share', 'sbin'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/v/VMD/VMD-1.9.3_plugins.patch b/Golden_Repo/v/VMD/VMD-1.9.3_plugins.patch
deleted file mode 100644
index f4cf63549..000000000
--- a/Golden_Repo/v/VMD/VMD-1.9.3_plugins.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Fix hard coded compiler, flags and tcl lib version for plugins
-
-Ake Sandgren, 20190823
---- plugins/Make-arch.orig	2016-10-21 23:34:39.000000000 +0200
-+++ plugins/Make-arch	2019-08-23 10:45:51.403545042 +0200
-@@ -337,17 +337,17 @@
- 	"ARCH = LINUXAMD64" \
- 	"COPTO = -fPIC -m64 -o " \
- 	"LOPTO = -fPIC -m64 -lstdc++ -o " \
--	"CC = gcc" \
--	"CXX = g++" \
-+	"CC = $(CC)" \
-+	"CXX = $(CXX)" \
- 	"DEF = -D" \
--	"CCFLAGS = -m64 -O2 -fPIC -Wall" \
--	"CXXFLAGS = -m64 -O2 -fPIC -Wall" \
--	"TCLLDFLAGS = -ltcl8.5 -ldl" \
-+	"CCFLAGS = $(CFLAGS)" \
-+	"CXXFLAGS = $(CXXFLAGS)" \
-+	"TCLLDFLAGS = $(TCLLDFLAGS)" \
- 	"NETCDFLDFLAGS = -lnetcdf " \
- 	"AR = ar" \
- 	"NM = nm -p" \
- 	"RANLIB = touch" \
--	"SHLD = gcc -shared"
-+	"SHLD = $(CC) -shared"
- 
- LINUXCARMA:
- 	$(MAKE) dynlibs staticlibs bins \
diff --git a/Golden_Repo/v/VMD/VMD-1.9.3_stride_MAX_AT_IN_RES.patch b/Golden_Repo/v/VMD/VMD-1.9.3_stride_MAX_AT_IN_RES.patch
deleted file mode 100644
index 9011384ef..000000000
--- a/Golden_Repo/v/VMD/VMD-1.9.3_stride_MAX_AT_IN_RES.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Increase number of atoms allowed per residues as per stride README from VMD
-
-Åke Sandgren, 2017-05-02
-diff -ru vmd-1.9.3.orig/lib/stride/stride.h vmd-1.9.3/lib/stride/stride.h
---- vmd-1.9.3.orig/lib/stride/stride.h	2017-05-02 13:47:26.484463970 +0200
-+++ vmd-1.9.3/lib/stride/stride.h	2017-05-02 13:47:43.748279797 +0200
-@@ -40,7 +40,7 @@
- #define MAX_BOND                  100
- #define MAX_ASSIGN                500
- #define MAX_INFO                  1000
--#define MAX_AT_IN_RES             75
-+#define MAX_AT_IN_RES             100
- #define MAX_AT_IN_HETERORES       200
- #define MAXRESDNR                 6
- #define MAXRESACC                 6 
diff --git a/Golden_Repo/v/VMD/VMD-1.9.3_stride_Makefile.patch b/Golden_Repo/v/VMD/VMD-1.9.3_stride_Makefile.patch
deleted file mode 100644
index 036430db8..000000000
--- a/Golden_Repo/v/VMD/VMD-1.9.3_stride_Makefile.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Make stride use CC, CFLAGS and LDFLAGS from EB.
-
-Åke Sandgren, 2017-05-02
-diff -ru vmd-1.9.3.orig/lib/stride/Makefile vmd-1.9.3/lib/stride/Makefile
---- vmd-1.9.3.orig/lib/stride/Makefile	2003-04-08 14:03:14.000000000 +0200
-+++ vmd-1.9.3/lib/stride/Makefile	2017-05-02 13:46:01.973365383 +0200
-@@ -1,13 +1,14 @@
- #FLAGS = -lm -L/usr/pub/lib -lefence -o
- #CC = cc -O2 -fullwarn -TENV:large_GOT
- #CC = cc -g -Wall
--CC = gcc -O2  # at least for SunOS
-+#CC = gcc -O2  # at least for SunOS
- #CC = cc -g
- 
- #CC = cc -O2 -fullwarn
- 
- #CC = cc -O2
--FLAGS = -lm  -o
-+#FLAGS = -lm  -o
-+LIBS = -lm
- 
- SOURCE = stride.c splitstr.c rdpdb.c initchn.c geometry.c thr2one.c one2thr.c filename.c tolostr.c strutil.c place_h.c hbenergy.c memory.c helix.c sheet.c rdmap.c phipsi.c command.c molscr.c die.c hydrbond.c mergepat.c fillasn.c escape.c p_jrnl.c p_rem.c p_atom.c p_helix.c p_sheet.c p_turn.c p_ssbond.c p_expdta.c p_model.c p_compnd.c report.c nsc.c area.c ssbond.c chk_res.c chk_atom.c turn.c pdbasn.c dssp.c outseq.c chkchain.c elem.c measure.c asngener.c p_endmdl.c stred.c contact_order.c contact_map.c
- 
-@@ -15,12 +16,9 @@
- 
- BINDIR = .
- 
--.c.o: 
--	$(CC) -c $< -o $@
--
- 
- stride : $(OBJECT)
--	$(CC) $(OBJECT) $(FLAGS)  $(BINDIR)/stride${ARCH}
-+	$(CC) $(LDFLAGS) $(OBJECT) $(LIBS) -o stride
- 
- $(OBJECT) : stride.h protot.h
- 
diff --git a/Golden_Repo/v/VMD/VMD-1.9.3_surf_Makefile.patch b/Golden_Repo/v/VMD/VMD-1.9.3_surf_Makefile.patch
deleted file mode 100644
index 93f430a64..000000000
--- a/Golden_Repo/v/VMD/VMD-1.9.3_surf_Makefile.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-Fix surf Makefile.
-Use CC, CFLAGS, etc from EB.
-Drop bad make depend lines.
-
-Åke Sandgren, 2017-05-02
-diff -ru vmd-1.9.3.orig/lib/surf/Makefile vmd-1.9.3/lib/surf/Makefile
---- vmd-1.9.3.orig/lib/surf/Makefile	1994-03-22 16:44:20.000000000 +0100
-+++ vmd-1.9.3/lib/surf/Makefile	2017-05-02 13:41:51.911991381 +0200
-@@ -1,12 +1,7 @@
- # Compilation flags
--#CC	    = cc
--CC	    = cc
- INCLUDE     = -I. 
--#LINCLUDE    = -lcurses -ltermcap -lm
--LINCLUDE    = -lm
--OPT_CFLAGS  = -O2 $(FLAGS) $(INCLUDE)
--#CFLAGS	    = -g $(FLAGS) $(INCLUDE)
--CFLAGS	    = -O2 $(FLAGS) $(INCLUDE)
-+LIBS    = -lm
-+CFLAGS	    = $(OPT) $(INCLUDE)
- 
- # These are the user object files in the application
- SRCS        = surf.c io.c compute.c dual.c utils.c lp.c chull.c tessel_cases.c \
-@@ -18,7 +13,7 @@
- 
- # make objects
- surf: $(OBJS) Makefile 
--	$(CC) $(CFLAGS) $(OBJS) -o surf $(LINCLUDE)
-+	$(CC) $(LDFLAGS) $(OBJS) -o surf $(LIBS)
- 
- lint:
- 	lint $(INCLUDE) $(SRCS)
-@@ -30,9 +25,6 @@
- 	tar -cvf surf.tar README *.[hc] Makefile
- 	compress surf.tar
- 
--.c.o: 
--	$(CC) $(CFLAGS) -c $*.c
--
- 
- # make depend makes the proper include file dependencies.  You _could_ run
- # it on a sun4, but there's a bug in the SunOS version of sed that causes
-@@ -61,48 +53,3 @@
- 	@ echo '  ' >> Makefile
- 
- # DO NOT DELETE THIS LINE -- make depend depends on it.
--  
-- 
--# DO NOT DELETE THIS LINE -- make depend depends on it.
--
--surf.o: surf.h /usr/include/stdio.h /usr/include/math.h /usr/include/stdlib.h
--surf.o: /usr/include/sgidefs.h /usr/include/string.h /usr/include/sys/time.h
--surf.o: linalg.h
--io.o: surf.h /usr/include/stdio.h /usr/include/math.h /usr/include/stdlib.h
--io.o: /usr/include/sgidefs.h /usr/include/string.h /usr/include/sys/time.h
--io.o: linalg.h
--compute.o: surf.h /usr/include/stdio.h /usr/include/math.h
--compute.o: /usr/include/stdlib.h /usr/include/sgidefs.h /usr/include/string.h
--compute.o: /usr/include/sys/time.h linalg.h chull.h dual.h
--dual.o: surf.h /usr/include/stdio.h /usr/include/math.h /usr/include/stdlib.h
--dual.o: /usr/include/sgidefs.h /usr/include/string.h /usr/include/sys/time.h
--dual.o: linalg.h dual.h chull.h
--utils.o: surf.h /usr/include/stdio.h /usr/include/math.h
--utils.o: /usr/include/stdlib.h /usr/include/sgidefs.h /usr/include/string.h
--utils.o: /usr/include/sys/time.h linalg.h
--lp.o: surf.h /usr/include/stdio.h /usr/include/math.h /usr/include/stdlib.h
--lp.o: /usr/include/sgidefs.h /usr/include/string.h /usr/include/sys/time.h
--lp.o: linalg.h
--chull.o: surf.h /usr/include/stdio.h /usr/include/math.h
--chull.o: /usr/include/stdlib.h /usr/include/sgidefs.h /usr/include/string.h
--chull.o: /usr/include/sys/time.h linalg.h chull.h
--tessel_cases.o: surf.h /usr/include/stdio.h /usr/include/math.h
--tessel_cases.o: /usr/include/stdlib.h /usr/include/sgidefs.h
--tessel_cases.o: /usr/include/string.h /usr/include/sys/time.h linalg.h dual.h
--tessel_patches.o: surf.h /usr/include/stdio.h /usr/include/math.h
--tessel_patches.o: /usr/include/stdlib.h /usr/include/sgidefs.h
--tessel_patches.o: /usr/include/string.h /usr/include/sys/time.h linalg.h
--tessel_convex.o: surf.h /usr/include/stdio.h /usr/include/math.h
--tessel_convex.o: /usr/include/stdlib.h /usr/include/sgidefs.h
--tessel_convex.o: /usr/include/string.h /usr/include/sys/time.h linalg.h
--tessel_concave.o: surf.h /usr/include/stdio.h /usr/include/math.h
--tessel_concave.o: /usr/include/stdlib.h /usr/include/sgidefs.h
--tessel_concave.o: /usr/include/string.h /usr/include/sys/time.h linalg.h
--tessel_torus.o: surf.h /usr/include/stdio.h /usr/include/math.h
--tessel_torus.o: /usr/include/stdlib.h /usr/include/sgidefs.h
--tessel_torus.o: /usr/include/string.h /usr/include/sys/time.h linalg.h
--  
--# DEPENDENCIES MUST END AT END OF FILE
--# IF YOU PUT STUFF HERE IT WILL GO AWAY
--# see make depend above
--  
-diff -ru vmd-1.9.3.orig/lib/surf/surf.c vmd-1.9.3/lib/surf/surf.c
---- vmd-1.9.3.orig/lib/surf/surf.c	1994-03-21 10:33:00.000000000 +0100
-+++ vmd-1.9.3/lib/surf/surf.c	2017-05-02 13:41:51.911991381 +0200
-@@ -7,7 +7,7 @@
- #define	EXTERN	
- #include "surf.h"
- 
--void
-+int
- main(ac,av)
- int	ac;
- char*	av[];
-@@ -56,6 +56,8 @@
-    if (Write_Option == 2) output_dataset();
- 
-    if (Write_Option) end_output_dataset();
-+
-+   return(0);
- }
- 
- 
diff --git a/Golden_Repo/v/VMD/VMD-1.9.3_surf_bad_printfs.patch b/Golden_Repo/v/VMD/VMD-1.9.3_surf_bad_printfs.patch
deleted file mode 100644
index 9b9db3889..000000000
--- a/Golden_Repo/v/VMD/VMD-1.9.3_surf_bad_printfs.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Fix some bad printfs in surf.
-
-Åke Sandgren, 2017-05-02
-diff -ru vmd-1.9.3.orig/lib/surf/chull.c vmd-1.9.3/lib/surf/chull.c
---- vmd-1.9.3.orig/lib/surf/chull.c	1994-03-19 06:50:54.000000000 +0100
-+++ vmd-1.9.3/lib/surf/chull.c	2017-05-02 13:44:07.046582827 +0200
-@@ -378,7 +378,7 @@
- print_out( v )
- struct tvertex *v;
- {
--	fprintf( stderr, "\nAdding vertex %6x :\n", v );
-+	fprintf( stderr, "\nAdding vertex %6p :\n", v );
- 	print_verts();
- 	print_edges();
- 	print_fs();
-@@ -398,11 +398,11 @@
- 	temp = vertices;
- 	fprintf (stderr, "Vertex List\n");
- 	if (vertices) do {
--            fprintf(stderr,"  addr %6x\t", vertices );
-+            fprintf(stderr,"  addr %6p\t", vertices );
-             fprintf(stderr,"(%g,%g,%g)",vertices->v[X],
-                     vertices->v[Y], vertices->v[Z] );
-             fprintf(stderr,"   active:%3d", vertices->active );
--            fprintf(stderr,"   duplicate:%5x", vertices->duplicate );
-+            fprintf(stderr,"   duplicate:%5p", vertices->duplicate );
-             fprintf(stderr,"   mark:%2d\n", vertices->mark );
-             vertices = vertices->next;
-             } while ( vertices != temp );
-@@ -424,13 +424,13 @@
- 	temp = edges;
- 	fprintf (stderr, "Edge List\n");
- 	if (edges) do {
--            fprintf( stderr, "  addr: %6x\t", edges );
-+            fprintf( stderr, "  addr: %6p\t", edges );
-             fprintf( stderr, "adj: ");
-             for (i=0; i<3; ++i) 
--                 fprintf( stderr, "%6x", edges->adjface[i] );
-+                 fprintf( stderr, "%6p", edges->adjface[i] );
-             fprintf( stderr, "  endpts:");
-             for (i=0; i<2; ++i) 
--                 fprintf( stderr, "%8x", edges->endpts[i]);
-+                 fprintf( stderr, "%8p", edges->endpts[i]);
-             fprintf( stderr, "  del:%3d\n", edges->deleted );
-             edges = edges->next; 
-             } while (edges != temp );
-@@ -452,13 +452,13 @@
- 	temp = faces;
- 	fprintf (stderr, "Face List\n");
- 	if (faces) do {
--            fprintf(stderr, "  addr: %6x\t", faces );
-+            fprintf(stderr, "  addr: %6p\t", faces );
-             fprintf(stderr, "  edges:");
-             for( i=0; i<3; ++i )
--                 fprintf(stderr, "%6x", faces->edg[i] );
-+                 fprintf(stderr, "%6p", faces->edg[i] );
-             fprintf(stderr, "  vert:");
-             for ( i=0; i<3; ++i)
--                  fprintf(stderr, "%6x", faces->vert[i] );
-+                  fprintf(stderr, "%6p", faces->vert[i] );
-             fprintf(stderr, "  vis: %d\n", faces->visible );
-             faces= faces->next;
-             } while ( faces != temp );
-@@ -552,8 +552,8 @@
-                 temp_v = temp_v->next;
-                 } while ( temp_v != vertices );
-              do {                           
--                printf("3%5d%6d%6d\n", temp_f->vert[0]->vnum,
--                        temp_f->vert[1]->vnum, temp_f->vert[2]->vnum );
-+                printf("3%5d%6d%6d\n", temp_f->vert[0]->vnum[0],
-+                        temp_f->vert[1]->vnum[0], temp_f->vert[2]->vnum[0] );
-                 temp_f = temp_f->next;
-                 } while ( temp_f != faces );
- }
diff --git a/Golden_Repo/v/VMD/VMD-1.9.4a51-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/v/VMD/VMD-1.9.4a51-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index d249ed270..000000000
--- a/Golden_Repo/v/VMD/VMD-1.9.4a51-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,73 +0,0 @@
-##
-# Author:    Robert Mijakovic <robert.mijakovic@lxp.lu>
-##
-name = 'VMD'
-version = '1.9.4a51'
-
-homepage = 'https://www.ks.uiuc.edu/Research/vmd'
-description = """VMD is a molecular visualization program for displaying, animating, and analyzing large biomolecular
- systems using 3-D graphics and built-in scripting."""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-source_urls = [
-    'https://www.ks.uiuc.edu/Research/vmd/vmd-1.9.4/files/alpha/',
-    'https://www.ks.uiuc.edu/Research/vmd/vmd-%(version)s/files/final',
-    'http://webclu.bio.wzw.tum.de/stride/'
-]
-sources = [
-    'vmd-%(version)s.src.tar.gz',
-    {'filename': 'stride.tar.gz', 'extract_cmd': "tar -C vmd-%(version)s/lib/stride -xf %s"},
-]
-patches = [
-    ('VMD-1.9.3_plugins.patch'),
-    ('VMD-1.9.3_surf_Makefile.patch', 'vmd-%(version)s'),
-    ('VMD-1.9.3_surf_bad_printfs.patch', 'vmd-%(version)s'),
-    ('VMD-1.9.3_stride_Makefile.patch', 'vmd-%(version)s'),
-    ('VMD-1.9.3_stride_MAX_AT_IN_RES.patch', 'vmd-%(version)s'),
-    ('VMD-%(version)s_configure.patch', 'vmd-%(version)s'),
-    ('VMD-%(version)s_extra_colors.patch', 'vmd-%(version)s'),
-]
-checksums = [
-    'b1c40b21111f5bab56d43d5e442c468d327159b07915af2ec175ba6b12842e5c',  # vmd-1.9.4a51.src.tar.gz
-    '51a8bc2988bb184bd08216124f61725225bb1a6f563bdf8cd35154cb5d621c1a',  # stride.tar.gz
-    '85760d6ae838e2b09801e34b36b484532383f7aaf2e8634b3ef808002a92baa3',  # VMD-1.9.3_plugins.patch
-    'd5cfa88064b7cffbc75accd69707d4e45fda974e8127de9ab606fdad501bd68a',  # VMD-1.9.3_surf_Makefile.patch
-    'f3c2a8c155e38db8e644cee6a01f6beaea5988e72ac74cde26b71670b151cc34',  # VMD-1.9.3_surf_bad_printfs.patch
-    'eb194ac0d8c086b73f87b29f7d732687f902431b1cdfa139c090401fefdee51e',  # VMD-1.9.3_stride_Makefile.patch
-    'eff1ca00cec637a6c8a156b2fb038e078d1835ba0eb15a571ed820bca5a866d9',  # VMD-1.9.3_stride_MAX_AT_IN_RES.patch
-    'dc9fc419e2e938f42d2e4784b0c9c7429317893f08d3ed170f949c3ee3aec062',  # VMD-1.9.4a51_configure.patch
-    '253eba282b570eb00e4764f46f77fd5ca898d10360d5707dd50ad1f14615af80',  # VMD-1.9.4a51_extra_colors.patch
-]
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('tcsh', '6.22.04'),
-    ('Tcl', '8.6.11'),
-    ('Tk', '8.6.11'),
-    ('FLTK', '1.3.7'),
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10'),
-    ('Tkinter', '%(pyver)s'),
-    ('X11', '20210802'),
-    ('fontconfig', '2.13.94'),
-    ('OpenGL', '2021b'),
-    ('netCDF', '4.8.1', '-serial'),
-    ('FFmpeg', '4.4.1'),
-    ('ImageMagick', '7.1.0-13'),
-    ('ACTC', '1.1'),
-    ('OptiX', '6.5.0', '', SYSTEM),
-    ('zlib', '1.2.11'),
-    ('libpng', '1.6.37'),
-    ('POV-Ray', '3.7.0.10'),
-    ('CUDA', '11.5', '', SYSTEM),
-]
-
-postinstallcmds = [
-    'sed -i "s%#!/bin/csh%#!$EBROOTTCSH/bin/tcsh%g" %(installdir)s/bin/vmd ',
-]
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/v/VMD/VMD-1.9.4a51_configure.patch b/Golden_Repo/v/VMD/VMD-1.9.4a51_configure.patch
deleted file mode 100644
index b0432661c..000000000
--- a/Golden_Repo/v/VMD/VMD-1.9.4a51_configure.patch
+++ /dev/null
@@ -1,177 +0,0 @@
---- configure	2021-05-10 14:04:56.826893000 +0200
-+++ configure	2021-05-10 14:08:01.893394000 +0200
-@@ -497,17 +497,16 @@
- 
- $arch_cc          = "cc";
- $arch_ccpp        = "CC";
--$arch_nvcc        = "/usr/local/cuda-10.2/bin/nvcc";
-+$arch_nvcc        = "$ENV{'EBROOTCUDA'}/bin/nvcc";
- $arch_nvccflags   = "-lineinfo --ptxas-options=-v " . 
--                    "-gencode arch=compute_30,code=compute_30 " .
--                    "-gencode arch=compute_30,code=sm_35 " .
--                    "-gencode arch=compute_30,code=sm_37 " .
-                     "-gencode arch=compute_50,code=compute_50 " .
-                     "-gencode arch=compute_50,code=sm_50 " .
-                     "-gencode arch=compute_60,code=compute_60 " .
-                     "-gencode arch=compute_60,code=sm_60 " .
-                     "-gencode arch=compute_70,code=compute_70 " .
-                     "-gencode arch=compute_70,code=sm_70 " .
-+                    "-gencode arch=compute_75,code=sm_75 " .
-+                    "-gencode arch=compute_80,code=sm_80 " .
-                     "--ftz=true ";
- #                    "-gencode arch=compute_75,code=sm_75 " .
- $arch_gcc         = "gcc";
-@@ -633,17 +632,17 @@
- # location of Mesa library and include files; basically does the same
- # as OpenGL.  This is based on the default instructions from the Mesa
- # README; the include files should by default be in /usr/local/include/GL.
--$mesa_dir         = "$vmd_library_dir/Mesa";
-+$mesa_dir         = $ENV{'EBROOTMESA'};
- $mesa_include     = "-I$mesa_dir/include";
- $mesa_library     = "-L$mesa_dir/lib_$config_arch";
- #$mesa_libs        = "-lMesaGL -lMesaGLU"; 
--$mesa_libs        = "-lMesaGL"; 
-+$mesa_libs        = "-lGL -lGLU"; 
- $mesa_defines     = "-DUSELINEAXES -DVMDMESA -DVMDOPENGL";
- @mesa_cc          = ();
- @mesa_cu          = ();
--@mesa_ccpp        = @opengl_ccpp;
--@mesa_h           = @opengl_h;
--@mesa_extra       = @opengl_extra;
-+@mesa_ccpp        = ();
-+@mesa_h           = ();
-+@mesa_extra       = ();
- 
- 
- #
-@@ -719,10 +718,10 @@
- 
- ################ FLTK GUI
- $fltk_defines     = "-DVMDGUI -DVMDFLTK";
--$fltk_dir         = "$vmd_library_dir/fltk";
-+$fltk_dir         = $ENV{'EBROOTFLTK'};
- $fltk_include     = "-I$fltk_dir/include";
- $fltk_library     = "-L$fltk_dir/$config_arch";
--$fltk_libs        = "-lfltk -lX11";
-+$fltk_libs        = "-lfltk -lX11 -lXfixes -lXcursor -lXinerama";
- #@fltk_cc          = ('forms_ui.c');
- @fltk_cu          = ();
- @fltk_ccpp        = ( 'ColorFltkMenu.C',
-@@ -764,7 +763,6 @@
- $stock_tcl_include_dir=$ENV{"TCL_INCLUDE_DIR"} || "$vmd_library_dir/tcl/include";
- $stock_tcl_library_dir=$ENV{"TCL_LIBRARY_DIR"} || "$vmd_library_dir/tcl/lib_$config_arch";
- 
--
- # location of Tk (for TK option)
- #$stock_tk_include_dir=$ENV{"TK_INCLUDE_DIR"} || "/usr/local/include";
- #$stock_tk_library_dir=$ENV{"TK_LIBRARY_DIR"} || "/usr/local/lib";
-@@ -782,8 +780,8 @@
- if ($config_tk) { $tcl_include .= " -I$stock_tk_include_dir"; }
- $tcl_library      = "-L$stock_tcl_library_dir";
- if ($config_tk) { $tcl_library .= " -L$stock_tk_library_dir"; }
--$tcl_libs         = "-ltcl8.5";  
--if ($config_tk) { $tcl_libs = "-ltk8.5 -lX11 " . $tcl_libs; }
-+$tcl_libs         = "-ltcl8.6";  
-+if ($config_tk) { $tcl_libs = "-ltk8.6 -lX11 " . $tcl_libs; }
- 
- @tcl_cc           = ();
- @tcl_cu           = ();
-@@ -992,7 +990,7 @@
- #   This option enables the use of CUDA GPU acceleration functions.
- #######################
- $cuda_defines     = "-DVMDCUDA -DMSMPOT_CUDA";
--$cuda_dir         = "/usr/local/cuda-10.2";
-+$cuda_dir         = "$ENV{'CUDA_HOME'}";
- $cuda_include     = "";
- $cuda_library     = "";
- $cuda_libs        = "-Wl,-rpath -Wl,\$\$ORIGIN/ -lcudart_static -lrt";
-@@ -1201,7 +1199,7 @@
- # $liboptix_dir         = "/usr/local/encap/NVIDIA-OptiX-SDK-5.0.1-linux64";
- # $liboptix_dir         = "/usr/local/encap/NVIDIA-OptiX-SDK-5.1.0-linux64";
- # $liboptix_dir         = "/usr/local/encap/NVIDIA-OptiX-SDK-6.0.0-linux64";
--$liboptix_dir         = "/usr/local/encap/NVIDIA-OptiX-SDK-6.5.0-linux64";
-+$liboptix_dir         = "$ENV{'EBROOTOPTIX'}";
- # $liboptix_dir         = "/usr/local/encap/NVIDIA-OptiX-SDK-7.0.0-linux64";
- 
- # NCSA Blue Waters
-@@ -1356,7 +1354,7 @@
-   die "LIBPNG option requires ZLIB!";
- }
- $libpng_defines     = "-DVMDLIBPNG";
--$libpng_dir         = "/Projects/vmd/vmd/lib/libpng";
-+$libpng_dir         = "$ENV{'EBROOTLIBPNG'}";
- $libpng_include     = "-I$libpng_dir/include";
- $libpng_library     = "-L$libpng_dir/lib_$config_arch";
- $libpng_libs        = "-lpng16";
-@@ -1384,7 +1382,7 @@
- # OPTIONAL COMPONENT: Data compresssion library 
- # This may be commented out if not required.
- $zlib_defines     = "-DVMDZLIB";
--$zlib_dir         = "/Projects/vmd/vmd/lib/zlib";
-+$zlib_dir         = "$ENV{'EBROOTZLIB'}";
- $zlib_include     = "-I$zlib_dir/include";
- $zlib_library     = "-L$zlib_dir/lib_$config_arch";
- $zlib_libs        = "-lz";
-@@ -1575,7 +1573,7 @@
- #   primitives.
- #######################
- $actc_defines     = "-DVMDACTC";
--$actc_dir         = "$vmd_library_dir/actc";
-+$actc_dir         = "$ENV{'EBROOTACTC'}";
- $actc_include     = "-I$actc_dir/include";
- $actc_library     = "-L$actc_dir/lib_$config_arch";
- $actc_libs        = "-lactc";
-@@ -1590,7 +1588,7 @@
- # OPTIONAL COMPONENT: NetCDF I/O Library (Used by cdfplugin)
- #######################
- $netcdf_defines     = "";
--$netcdf_dir         = "$vmd_library_dir/netcdf";
-+$netcdf_dir         = "$ENV{'EBROOTNETCDF'}";
- $netcdf_include     = "-I$netcdf_dir/include";
- $netcdf_library     = "-L$netcdf_dir/lib_$config_arch";
- $netcdf_libs        = "-lnetcdf";
-@@ -1648,7 +1646,7 @@
-   $stock_python_library_dir=$ENV{"PYTHON_LIBRARY_DIR"} || "$conda_root/lib/python3.7/config-3.7m-x86_64-linux-gnu";
-   $stock_numpy_include_dir=$ENV{"NUMPY_INCLUDE_DIR"} || "$conda_root/lib/python3.7/site-packages/numpy/core/include/numpy";
-   $stock_numpy_library_dir=$ENV{"NUMPY_LIBRARY_DIR"} || "$conda_root/lib/python-3.7/site-packages/numpy/core/include";
--  $python_libs        = "-fno-lto -lpython3.7m -lpthread";
-+  $python_libs        = "$ENV{'PYTHON_LIBRARIES'}" || "-fno-lto -lpython3.7m -lpthread";
- } else {
- #  $stock_python_include_dir=$ENV{"PYTHON_INCLUDE_DIR"} || "/usr/local/include";
- #  $stock_python_library_dir=$ENV{"PYTHON_LIBRARY_DIR"} || "/usr/local/lib";
-@@ -1659,7 +1657,7 @@
- #  $stock_numpy_library_dir=$ENV{"NUMPY_LIBRARY_DIR"} || "/usr/local/lib";
-   $stock_numpy_include_dir=$ENV{"NUMPY_INCLUDE_DIR"} || "$vmd_library_dir/numpy/lib_$config_arch/include";
-   $stock_numpy_library_dir=$ENV{"NUMPY_LIBRARY_DIR"} || "$vmd_library_dir/python/lib_$config_arch/lib/python2.5/site-packages/numpy/core/include";
--  $python_libs        = "-lpython2.5 -lpthread";
-+  $python_libs        = "$ENV{'PYTHON_LIBRARIES'}" || "-lpython2.5 -lpthread";
- }
- 
- $python_defines     = "-DVMDPYTHON";
-@@ -2573,7 +2571,7 @@
- 
-     if ($config_cuda) {
-       $arch_nvccflags   .= " --machine 64 -O3 $cuda_include";
--      $cuda_library     = "-L/usr/local/cuda-10.2/lib64";
-+      $cuda_library     = "-L/$ENV{'EBROOTCUDA'}/lib64";
-     }
- 
-     $arch_lex		= "flex"; # has problems with vendor lex
-@@ -2583,7 +2581,7 @@
-     # they likely serve no useful purpose going forward.
-     if (!$config_opengl_dispatch) {
-       $opengl_dep_libs	= "-L/usr/X11R6/lib64 -lGL -lX11";
--      $mesa_libs          = "-lMesaGL -L/usr/X11R6/lib64 -lXext -lX11";
-+      $mesa_libs          = "-lGL -lGLU -L/usr/X11R6/lib64 -lXext -lX11";
-     }
- 
-     # this is to make tcl happy
-@@ -3763,7 +3761,7 @@
- 
- .cu.ptx:
- 	\$(ECHO) "Compiling " \$< " --> " \$*.ptx " ..."; \\
--	\$(NVCC) \$(DEFINES) --use_fast_math $liboptix_include -gencode arch=compute_30,code=compute_30 -ptx \$< $arch_coptout$vmd_arch_dir/\$\@
-+	\$(NVCC) \$(DEFINES) --use_fast_math $liboptix_include -gencode arch=compute_80,code=compute_80 -ptx \$< $arch_coptout$vmd_arch_dir/\$\@
- 
- .y.o:
- 
diff --git a/Golden_Repo/v/VMD/VMD-1.9.4a51_extra_colors.patch b/Golden_Repo/v/VMD/VMD-1.9.4a51_extra_colors.patch
deleted file mode 100644
index 26e9ba954..000000000
--- a/Golden_Repo/v/VMD/VMD-1.9.4a51_extra_colors.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Add some additional colors, e.g. to allow for color blind compatible rendering.
-Bob Dröge, 2020-06-23
---- src/Scene.C.orig	2020-06-23 09:37:41.000000000 +0200
-+++ src/Scene.C		2020-06-23 09:40:59.000000000 +0200
-@@ -63,7 +63,10 @@
-  ,"yellow2",  "yellow3",   "green2",    "green3",
-   "cyan2",    "cyan3",     "blue2",     "blue3",
-   "violet",   "violet2",   "magenta",   "magenta2",  
--  "red2",     "red3",      "orange2",   "orange3"
-+  "red2",     "red3",      "orange2",   "orange3",
-+  "matisse", "flamenco", "forest_green", "punch",
-+  "wisteria", "spicy_mix", "orchid", "gray2",
-+  "lime_pie", "java"
- #endif
- 
- };
-@@ -89,7 +92,17 @@
-    0.27f, 0.00f, 0.98f,  0.45f, 0.00f, 0.90f, // violet
-    0.90f, 0.00f, 0.90f,  1.00f, 0.00f, 0.66f, // magenta
-    0.98f, 0.00f, 0.23f,  0.81f, 0.00f, 0.00f, // red
--   0.89f, 0.35f, 0.00f,  0.96f, 0.72f, 0.00f  // orange
-+   0.89f, 0.35f, 0.00f,  0.96f, 0.72f, 0.00f, // orange
-+   0.1f, 0.5f, 0.7f, // MPL1, matisse
-+   1.0f, 0.5f, 0.1f, // MPL2, flamenco
-+   0.2f, 0.6f, 0.2f, // MPL3, forest green
-+   0.8f, 0.2f, 0.2f, // MPL4, punch
-+   0.6f, 0.4f, 0.7f, // MPL5, wisteria
-+   0.5f, 0.3f, 0.3f, // MPL6, spicy mix
-+   0.9f, 0.5f, 0.8f, // MPL7, orchid
-+   0.5f, 0.5f, 0.5f, // MPL8, gray
-+   0.7f, 0.7f, 0.1f, // MPL9, key lime pie
-+   0.1f, 0.7f, 0.8f // MPL10, java
- #endif
- 
- };
---- src/Scene.h.orig	2020-06-23 09:37:45.000000000 +0200
-+++ src/Scene.h		2020-06-23 09:42:21.000000000 +0200
-@@ -37,7 +37,7 @@
- #define DISP_LIGHTS 4
- 
- // total number of colors defined here
--#define REGCLRS         33
-+#define REGCLRS         43
- #define EXTRACLRS       1
- #define VISCLRS         (REGCLRS - EXTRACLRS)
- #define MAPCLRS         1024    
diff --git a/Golden_Repo/v/VTK/VTK-9.1.0-GCCcore-11.2.0-nompi.eb b/Golden_Repo/v/VTK/VTK-9.1.0-GCCcore-11.2.0-nompi.eb
deleted file mode 100644
index c1c67b0e2..000000000
--- a/Golden_Repo/v/VTK/VTK-9.1.0-GCCcore-11.2.0-nompi.eb
+++ /dev/null
@@ -1,187 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'VTK'
-version = '9.1.0'
-versionsuffix = '-nompi'
-
-homepage = 'http://www.vtk.org'
-description = """The Visualization Toolkit (VTK) is an open-source, freely available software system for
- 3D computer graphics, image processing and visualization. VTK consists of a C++ class library and several
- interpreted interface layers including Tcl/Tk, Java, and Python. VTK supports a wide variety of visualization
- algorithms including: scalar, vector, tensor, texture, and volumetric methods; and advanced modeling techniques
- such as: implicit modeling, polygon reduction, mesh smoothing, cutting, contouring, and Delaunay triangulation."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://www.vtk.org/files/release/%(version_major_minor)s']
-sources = [
-    SOURCE_TAR_GZ,
-    '%(name)sData-%(version)s.tar.gz',
-]
-patches = [('vtk-version.egg-info', '.')]
-checksums = [
-    '8fed42f4f8f1eb8083107b68eaa9ad71da07110161a3116ad807f43e5ca5ce96',  # VTK-9.1.0.tar.gz
-    'b9442cf1c30e1e44502e6dc36d3c6c2dc3d3f7d03306ee1d10737e9abadaa85d',  # VTKData-9.1.0.tar.gz
-    '787b82415ae7a4a1f815b4db0e25f7abc809a05fc85d7d219627f3a7e5d3867b',  # vtk-version.egg-info
-]
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('HDF5', '1.12.1', '-serial'),
-    ('SciPy-Stack', '2021b', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    # ('libxc', '5.1.7'),  # not in GCCcore toolchain
-    ('netCDF', '4.8.1', '-serial'),
-    ('X11', '20210802'),
-    ('OpenGL', '2021b'),
-]
-
-separate_build_dir = True
-
-configopts = "-DCMAKE_INSTALL_LIBDIR=lib "
-
-configopts += "-DVTK_USE_SYSTEM_MPI4PY=OFF "
-configopts += "-DVTK_USE_SYSTEM_LZMA=ON "
-configopts += "-DVTK_USE_SYSTEM_HDF5=ON "
-configopts += "-DVTK_USE_SYSTEM_NETCDF=ON "
-
-configopts += "-DBUILD_SHARED_LIBS=ON "
-configopts += "-DBUILD_TESTING=OFF "
-
-configopts += "-DVTK_USE_MPI=OFF "
-configopts += "-DVTK_SMP_IMPLEMENTATION_TYPE=OPENMP "
-configopts += "-DVTK_Group_MPI:BOOL=OFF "
-configopts += "-DVTK_Group_Web:BOOL=ON "
-
-configopts += '-DOpenGL_GL_PREFERENCE=GLVND '  # "GLVND" or "LEGACY"
-configopts += "-DOPENGL_EGL_INCLUDE_DIR=$EBROOTOPENGL/include "
-configopts += "-DOPENGL_GLX_INCLUDE_DIR=$EBROOTOPENGL/include "
-configopts += "-DOPENGL_INCLUDE_DIR=$EBROOTOPENGL/include "
-configopts += "-DOPENGL_egl_LIBRARY=$EBROOTOPENGL/lib/libEGL.so.1 "
-configopts += "-DOPENGL_glx_LIBRARY=$EBROOTOPENGL/lib/libGLX.so.0 "
-configopts += "-DOPENGL_opengl_LIBRARY=$EBROOTOPENGL/lib/libOpenGL.so.0 "
-configopts += "-DOPENGL_glu_LIBRARY=$EBROOTOPENGL/lib/libGLU.so "
-
-configopts += "-DVTK_WRAP_PYTHON=ON "
-configopts += "-DVTK_PYTHON_OPTIONAL_LINK=OFF "
-configopts += "-DPYTHON_EXECUTABLE:PATH=$EBROOTPYTHON/bin/python%(pyshortver)s "
-configopts += "-DPYTHON_INCLUDE_DIR:PATH=$EBROOTPYTHON/include/python%(pyshortver)s "
-configopts += "-DPYTHON_LIBRARY:PATH=$EBROOTPYTHON/lib/libpython%%(pyshortver)s.%s " % SHLIB_EXT
-
-configopts += "-DHDF5_INCLUDE_DIRS=$EBROOTHDF5/include "
-
-configopts += "-DModule_vtkAcceleratorsVTKm:BOOL=ON "
-# configopts += "-DModule_vtkDomainsMicroscopy:BOOL=OFF "
-# configopts += "-DModule_vtkDomainsParallelChemistry:BOOL=OFF "
-# configopts += "-DModule_vtkFiltersOpenTurns:BOOL=OFF "
-# configopts += "-DModule_vtkFiltersParallelDIY2:BOOL=OFF "
-# configopts += "-DModule_vtkFiltersParallelFlowPaths:BOOL=OFF "
-configopts += "-DModule_vtkFiltersParallelGeometry:BOOL=ON "
-configopts += "-DModule_vtkFiltersParallelMPI:BOOL=OFF "
-configopts += "-DModule_vtkFiltersParallelStatistics:BOOL=ON "
-# configopts += "-DModule_vtkFiltersParallelVerdict:BOOL=OFF "
-# configopts += "-DModule_vtkFiltersReebGraph:BOOL=OFF "
-# configopts += "-DModule_vtkGUISupportQt:BOOL=OFF "
-# configopts += "-DModule_vtkGUISupportQtOpenGL:BOOL=OFF "
-# configopts += "-DModule_vtkGUISupportQtSQL:BOOL=OFF "
-# configopts += "-DModule_vtkGUISupportQtWebkit:BOOL=OFF "
-# configopts += "-DModule_vtkGeovisGDAL:BOOL=OFF "
-# configopts += "-DModule_vtkIOADIOS:BOOL=OFF "
-# configopts += "-DModule_vtkIOFFMPEG:BOOL=OFF "
-# configopts += "-DModule_vtkIOGDAL:BOOL=OFF "
-# configopts += "-DModule_vtkIOGeoJSON:BOOL=OFF "
-# configopts += "-DModule_vtkIOLAS:BOOL=OFF "
-# configopts += "-DModule_vtkIOMPIImage:BOOL=ON "
-# configopts += "-DModule_vtkIOMPIParallel:BOOL=ON "
-# configopts += "-DModule_vtkIOMotionFX:BOOL=OFF "
-# configopts += "-DModule_vtkIOMySQL:BOOL=OFF "
-# configopts += "-DModule_vtkIOODBC:BOOL=OFF "
-# configopts += "-DModule_vtkIOPDAL:BOOL=OFF "
-# configopts += "-DModule_vtkIOParallelExodus:BOOL=OFF "
-# configopts += "-DModule_vtkIOParallelLSDyna:BOOL=OFF "
-# configopts += "-DModule_vtkIOParallelNetCDF:BOOL=OFF "
-# configopts += "-DModule_vtkIOParallelXdmf3:BOOL=OFF "
-# configopts += "-DModule_vtkIOPostgreSQL:BOOL=OFF "
-# configopts += "-DModule_vtkIOTRUCHAS:BOOL=OFF "
-# configopts += "-DModule_vtkIOVPIC:BOOL=OFF "
-# configopts += "-DModule_vtkIOXdmf2:BOOL=OFF "
-# configopts += "-DModule_vtkIOXdmf3:BOOL=OFF "
-# configopts += "-DModule_vtkImagingOpenGL2:BOOL=OFF "
-# configopts += "-DModule_vtkInfovisBoost:BOOL=OFF "
-# configopts += "-DModule_vtkInfovisBoostGraphAlg:BOOL=OFF
-configopts += "-DModule_vtkParallelMPI:BOOL=OFF "
-configopts += "-DModule_vtkPython:BOOL=ON "
-# configopts += "-DModule_vtkPythonInterpreter:BOOL=OFF "
-# configopts += "-DModule_vtkRenderingExternal:BOOL=OFF "
-# configopts += "-DModule_vtkRenderingFreeTypeFontConfig:BOOL=OFF "
-# configopts += "-DModule_vtkRenderingLICOpenGL2:BOOL=OFF "
-# configopts += "-DModule_vtkRenderingMatplotlib:BOOL=OFF "
-# configopts += "-DModule_vtkRenderingOSPRay:BOOL=OFF "
-# configopts += "-DModule_vtkRenderingOpenVR:BOOL=OFF "
-# configopts += "-DModule_vtkRenderingOptiX:BOOL=OFF "
-configopts += "-DModule_vtkRenderingParallel:BOOL=ON "
-configopts += "-DModule_vtkRenderingParallelLIC:BOOL=ON "
-# configopts += "-DModule_vtkRenderingQt:BOOL=OFF "
-# configopts += "-DModule_vtkRenderingSceneGraph:BOOL=OFF "
-# configopts += "-DModule_vtkRenderingTk:BOOL=OFF "
-# configopts += "-DModule_vtkRenderingVolumeAMR:BOOL=OFF "
-# configopts += "-DModule_vtkTclTk:BOOL=OFF "
-# configopts += "-DModule_vtkTestingCore:BOOL=OFF "
-# configopts += "-DModule_vtkTestingGenericBridge:BOOL=OFF "
-# configopts += "-DModule_vtkTestingIOSQL:BOOL=OFF "
-# configopts += "-DModule_vtkTestingRendering:BOOL=OFF "
-# configopts += "-DModule_vtkUtilitiesBenchmarks:BOOL=OFF "
-# configopts += "-DModule_vtkUtilitiesEncodeString:BOOL=OFF "
-# configopts += "-DModule_vtkVPIC:BOOL=OFF "
-configopts += "-DModule_vtkVTKm:BOOL=ON "
-# configopts += "-DModule_vtkViewsGeovis:BOOL=OFF "
-# configopts += "-DModule_vtkViewsQt:BOOL=OFF "
-# configopts += "-DModule_vtkWebCore:BOOL=OFF "
-# configopts += "-DModule_vtkWebGLExporter:BOOL=OFF "
-# configopts += "-DModule_vtkWebPython:BOOL=OFF "
-# configopts += "-DModule_vtkWrappingJava:BOOL=OFF "
-# configopts += "-DModule_vtkWrappingPythonCore:BOOL=OFF "
-# configopts += "-DModule_vtkWrappingTools:BOOL=OFF "
-# configopts += "-DModule_vtkdiy2:BOOL=OFF "
-# configopts += "-DModule_vtkkissfft:BOOL=OFF "
-configopts += "-DModule_vtkmpi4py:BOOL=OFF "
-# configopts += "-DModule_vtkpegtl:BOOL=OFF "
-# configopts += "-DModule_vtkxdmf2:BOOL=OFF "
-# configopts += "-DModule_vtkxdmf3:BOOL=OFF "
-# configopts += "-DModule_vtkzfp:BOOL=OFF "
-
-preinstallopts = "export PYTHONPATH=%(installdir)s/lib/python%(pyshortver)s/site-packages:$PYTHONPATH && "
-
-# Install a egg-info file so VTK is more python friendly, required for mayavi
-local_egg_info_src = '%(builddir)s/VTK-%(version)s/vtk-version.egg-info'
-local_egg_info_dest = '%(installdir)s/lib/python%(pyshortver)s/site-packages/vtk-%(version)s.egg-info'
-postinstallcmds = [
-    'sed "s/#VTK_VERSION#/%%(version)s/" %s > %s' % (local_egg_info_src, local_egg_info_dest),
-]
-
-modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
-
-local_vtk_exec = ['vtk%s-%%(version_major_minor)s' % x
-                  for x in ['WrapJava', 'ParseJava', 'WrapPythonInit', 'WrapPython', 'WrapHierarchy']]
-local_vtk_exec += ['vtkpython']
-local_vtk_libs = ['CommonCore', 'IONetCDF', 'ParallelCore', 'RenderingOpenGL2']
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in local_vtk_exec] +
-             ['lib/libvtk%s-%%(version_major_minor)s.%s' % (l, SHLIB_EXT) for l in local_vtk_libs],
-    'dirs': ['lib/python%(pyshortver)s/site-packages/', 'include/vtk-%(version_major_minor)s'],
-}
-
-sanity_check_commands = [
-    "python -c 'import %(namelower)s'",
-    "python -c 'import pkg_resources; pkg_resources.get_distribution(\"vtk\")'",
-    # make sure that VTK Python libraries link to libpython (controlled via DVTK_PYTHON_OPTIONAL_LINK=OFF),
-    # see https://gitlab.kitware.com/vtk/vtk/-/issues/17881
-    "ldd $EBROOTVTK/lib/libvtkPythonContext2D-%%(version_major_minor)s.%s | grep /libpython" % SHLIB_EXT,
-]
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/v/VTK/VTK-9.1.0-gpsmpi-2022.eb b/Golden_Repo/v/VTK/VTK-9.1.0-gpsmpi-2022.eb
deleted file mode 100644
index 0f20c9541..000000000
--- a/Golden_Repo/v/VTK/VTK-9.1.0-gpsmpi-2022.eb
+++ /dev/null
@@ -1,188 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'VTK'
-version = '9.1.0'
-
-homepage = 'http://www.vtk.org'
-description = """The Visualization Toolkit (VTK) is an open-source, freely available software system for
- 3D computer graphics, image processing and visualization. VTK consists of a C++ class library and several
- interpreted interface layers including Tcl/Tk, Java, and Python. VTK supports a wide variety of visualization
- algorithms including: scalar, vector, tensor, texture, and volumetric methods; and advanced modeling techniques
- such as: implicit modeling, polygon reduction, mesh smoothing, cutting, contouring, and Delaunay triangulation."""
-
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-toolchainopts = {'pic': True, 'usempi': True}
-
-source_urls = ['https://www.vtk.org/files/release/%(version_major_minor)s']
-sources = [
-    SOURCE_TAR_GZ,
-    '%(name)sData-%(version)s.tar.gz',
-]
-patches = [('vtk-version.egg-info', '.')]
-checksums = [
-    '8fed42f4f8f1eb8083107b68eaa9ad71da07110161a3116ad807f43e5ca5ce96',  # VTK-9.1.0.tar.gz
-    'b9442cf1c30e1e44502e6dc36d3c6c2dc3d3f7d03306ee1d10737e9abadaa85d',  # VTKData-9.1.0.tar.gz
-    '787b82415ae7a4a1f815b4db0e25f7abc809a05fc85d7d219627f3a7e5d3867b',  # vtk-version.egg-info
-]
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('HDF5', '1.12.1'),
-    ('SciPy-Stack', '2021b', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('mpi4py', '3.1.3'),
-    ('libxc', '5.1.7'),
-    ('netCDF', '4.8.1', '-serial'),
-    ('X11', '20210802'),
-    ('OpenGL', '2021b'),
-]
-
-separate_build_dir = True
-
-configopts = "-DCMAKE_INSTALL_LIBDIR=lib "
-
-configopts += "-DVTK_USE_SYSTEM_MPI4PY=ON "
-configopts += "-DVTK_USE_SYSTEM_LZMA=ON "
-configopts += "-DVTK_USE_SYSTEM_HDF5=ON "
-configopts += "-DVTK_USE_SYSTEM_NETCDF=ON "
-
-configopts += "-DBUILD_SHARED_LIBS=ON "
-configopts += "-DBUILD_TESTING=OFF "
-
-configopts += "-DVTK_USE_MPI=ON "
-configopts += "-DVTK_SMP_IMPLEMENTATION_TYPE=OPENMP "
-configopts += "-DVTK_Group_MPI:BOOL=ON "
-configopts += "-DVTK_Group_Web:BOOL=ON "
-
-configopts += '-DOpenGL_GL_PREFERENCE=GLVND '  # "GLVND" or "LEGACY"
-configopts += "-DOPENGL_EGL_INCLUDE_DIR=$EBROOTOPENGL/include "
-configopts += "-DOPENGL_GLX_INCLUDE_DIR=$EBROOTOPENGL/include "
-configopts += "-DOPENGL_INCLUDE_DIR=$EBROOTOPENGL/include "
-configopts += "-DOPENGL_egl_LIBRARY=$EBROOTOPENGL/lib/libEGL.so.1 "
-configopts += "-DOPENGL_glx_LIBRARY=$EBROOTOPENGL/lib/libGLX.so.0 "
-configopts += "-DOPENGL_opengl_LIBRARY=$EBROOTOPENGL/lib/libOpenGL.so.0 "
-configopts += "-DOPENGL_glu_LIBRARY=$EBROOTOPENGL/lib/libGLU.so "
-
-configopts += "-DVTK_WRAP_PYTHON=ON "
-configopts += "-DVTK_PYTHON_OPTIONAL_LINK=OFF "
-configopts += "-DPYTHON_EXECUTABLE:PATH=$EBROOTPYTHON/bin/python%(pyshortver)s "
-configopts += "-DPYTHON_INCLUDE_DIR:PATH=$EBROOTPYTHON/include/python%(pyshortver)s "
-configopts += "-DPYTHON_LIBRARY:PATH=$EBROOTPYTHON/lib/libpython%%(pyshortver)s.%s " % SHLIB_EXT
-
-configopts += "-DHDF5_INCLUDE_DIRS=$EBROOTHDF5/include "
-
-configopts += "-DModule_vtkAcceleratorsVTKm:BOOL=ON "
-# configopts += "-DModule_vtkDomainsMicroscopy:BOOL=OFF "
-# configopts += "-DModule_vtkDomainsParallelChemistry:BOOL=OFF "
-# configopts += "-DModule_vtkFiltersOpenTurns:BOOL=OFF "
-# configopts += "-DModule_vtkFiltersParallelDIY2:BOOL=OFF "
-# configopts += "-DModule_vtkFiltersParallelFlowPaths:BOOL=OFF "
-configopts += "-DModule_vtkFiltersParallelGeometry:BOOL=ON "
-configopts += "-DModule_vtkFiltersParallelMPI:BOOL=ON "
-configopts += "-DModule_vtkFiltersParallelStatistics:BOOL=ON "
-# configopts += "-DModule_vtkFiltersParallelVerdict:BOOL=OFF "
-# configopts += "-DModule_vtkFiltersReebGraph:BOOL=OFF "
-# configopts += "-DModule_vtkGUISupportQt:BOOL=OFF "
-# configopts += "-DModule_vtkGUISupportQtOpenGL:BOOL=OFF "
-# configopts += "-DModule_vtkGUISupportQtSQL:BOOL=OFF "
-# configopts += "-DModule_vtkGUISupportQtWebkit:BOOL=OFF "
-# configopts += "-DModule_vtkGeovisGDAL:BOOL=OFF "
-# configopts += "-DModule_vtkIOADIOS:BOOL=OFF "
-# configopts += "-DModule_vtkIOFFMPEG:BOOL=OFF "
-# configopts += "-DModule_vtkIOGDAL:BOOL=OFF "
-# configopts += "-DModule_vtkIOGeoJSON:BOOL=OFF "
-# configopts += "-DModule_vtkIOLAS:BOOL=OFF "
-# configopts += "-DModule_vtkIOMPIImage:BOOL=ON "
-# configopts += "-DModule_vtkIOMPIParallel:BOOL=ON "
-# configopts += "-DModule_vtkIOMotionFX:BOOL=OFF "
-# configopts += "-DModule_vtkIOMySQL:BOOL=OFF "
-# configopts += "-DModule_vtkIOODBC:BOOL=OFF "
-# configopts += "-DModule_vtkIOPDAL:BOOL=OFF "
-# configopts += "-DModule_vtkIOParallelExodus:BOOL=OFF "
-# configopts += "-DModule_vtkIOParallelLSDyna:BOOL=OFF "
-# configopts += "-DModule_vtkIOParallelNetCDF:BOOL=OFF "
-# configopts += "-DModule_vtkIOParallelXdmf3:BOOL=OFF "
-# configopts += "-DModule_vtkIOPostgreSQL:BOOL=OFF "
-# configopts += "-DModule_vtkIOTRUCHAS:BOOL=OFF "
-# configopts += "-DModule_vtkIOVPIC:BOOL=OFF "
-# configopts += "-DModule_vtkIOXdmf2:BOOL=OFF "
-# configopts += "-DModule_vtkIOXdmf3:BOOL=OFF "
-# configopts += "-DModule_vtkImagingOpenGL2:BOOL=OFF "
-# configopts += "-DModule_vtkInfovisBoost:BOOL=OFF "
-# configopts += "-DModule_vtkInfovisBoostGraphAlg:BOOL=OFF
-configopts += "-DModule_vtkParallelMPI:BOOL=ON "
-configopts += "-DModule_vtkPython:BOOL=ON "
-# configopts += "-DModule_vtkPythonInterpreter:BOOL=OFF "
-# configopts += "-DModule_vtkRenderingExternal:BOOL=OFF "
-# configopts += "-DModule_vtkRenderingFreeTypeFontConfig:BOOL=OFF "
-# configopts += "-DModule_vtkRenderingLICOpenGL2:BOOL=OFF "
-# configopts += "-DModule_vtkRenderingMatplotlib:BOOL=OFF "
-# configopts += "-DModule_vtkRenderingOSPRay:BOOL=OFF "
-# configopts += "-DModule_vtkRenderingOpenVR:BOOL=OFF "
-# configopts += "-DModule_vtkRenderingOptiX:BOOL=OFF "
-configopts += "-DModule_vtkRenderingParallel:BOOL=ON "
-configopts += "-DModule_vtkRenderingParallelLIC:BOOL=ON "
-# configopts += "-DModule_vtkRenderingQt:BOOL=OFF "
-# configopts += "-DModule_vtkRenderingSceneGraph:BOOL=OFF "
-# configopts += "-DModule_vtkRenderingTk:BOOL=OFF "
-# configopts += "-DModule_vtkRenderingVolumeAMR:BOOL=OFF "
-# configopts += "-DModule_vtkTclTk:BOOL=OFF "
-# configopts += "-DModule_vtkTestingCore:BOOL=OFF "
-# configopts += "-DModule_vtkTestingGenericBridge:BOOL=OFF "
-# configopts += "-DModule_vtkTestingIOSQL:BOOL=OFF "
-# configopts += "-DModule_vtkTestingRendering:BOOL=OFF "
-# configopts += "-DModule_vtkUtilitiesBenchmarks:BOOL=OFF "
-# configopts += "-DModule_vtkUtilitiesEncodeString:BOOL=OFF "
-# configopts += "-DModule_vtkVPIC:BOOL=OFF "
-configopts += "-DModule_vtkVTKm:BOOL=ON "
-# configopts += "-DModule_vtkViewsGeovis:BOOL=OFF "
-# configopts += "-DModule_vtkViewsQt:BOOL=OFF "
-# configopts += "-DModule_vtkWebCore:BOOL=OFF "
-# configopts += "-DModule_vtkWebGLExporter:BOOL=OFF "
-# configopts += "-DModule_vtkWebPython:BOOL=OFF "
-# configopts += "-DModule_vtkWrappingJava:BOOL=OFF "
-# configopts += "-DModule_vtkWrappingPythonCore:BOOL=OFF "
-# configopts += "-DModule_vtkWrappingTools:BOOL=OFF "
-# configopts += "-DModule_vtkdiy2:BOOL=OFF "
-# configopts += "-DModule_vtkkissfft:BOOL=OFF "
-configopts += "-DModule_vtkmpi4py:BOOL=ON "
-# configopts += "-DModule_vtkpegtl:BOOL=OFF "
-# configopts += "-DModule_vtkxdmf2:BOOL=OFF "
-# configopts += "-DModule_vtkxdmf3:BOOL=OFF "
-# configopts += "-DModule_vtkzfp:BOOL=OFF "
-
-preinstallopts = "export PYTHONPATH=%(installdir)s/lib/python%(pyshortver)s/site-packages:$PYTHONPATH && "
-
-# Install a egg-info file so VTK is more python friendly, required for mayavi
-local_egg_info_src = '%(builddir)s/VTK-%(version)s/vtk-version.egg-info'
-local_egg_info_dest = '%(installdir)s/lib/python%(pyshortver)s/site-packages/vtk-%(version)s.egg-info'
-postinstallcmds = [
-    'sed "s/#VTK_VERSION#/%%(version)s/" %s > %s' % (local_egg_info_src, local_egg_info_dest),
-]
-
-modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
-
-local_vtk_exec = ['vtk%s-%%(version_major_minor)s' % x
-                  for x in ['WrapJava', 'ParseJava', 'WrapPythonInit', 'WrapPython', 'WrapHierarchy']]
-local_vtk_exec += ['vtkpython']
-local_vtk_libs = ['CommonCore', 'IONetCDF', 'ParallelCore', 'RenderingOpenGL2']
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in local_vtk_exec] + ['include/vtk-%(version_major_minor)s/vtkMPI.h'] +
-             ['lib/libvtk%s-%%(version_major_minor)s.%s' % (l, SHLIB_EXT) for l in local_vtk_libs],
-    'dirs': ['lib/python%(pyshortver)s/site-packages/', 'include/vtk-%(version_major_minor)s'],
-}
-
-sanity_check_commands = [
-    "python -c 'import %(namelower)s'",
-    "python -c 'import pkg_resources; pkg_resources.get_distribution(\"vtk\")'",
-    # make sure that VTK Python libraries link to libpython (controlled via DVTK_PYTHON_OPTIONAL_LINK=OFF),
-    # see https://gitlab.kitware.com/vtk/vtk/-/issues/17881
-    "ldd $EBROOTVTK/lib/libvtkPythonContext2D-%%(version_major_minor)s.%s | grep /libpython" % SHLIB_EXT,
-]
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/v/VTK/vtk-version.egg-info b/Golden_Repo/v/VTK/vtk-version.egg-info
deleted file mode 100644
index 9ddd689ea..000000000
--- a/Golden_Repo/v/VTK/vtk-version.egg-info
+++ /dev/null
@@ -1,5 +0,0 @@
-Metadata-Version: 2.1
-Name: vtk
-Version: #VTK_VERSION#
-Summary: VTK is an open-source toolkit for 3D computer graphics, image processing, and visualization
-Platform: UNKNOWN
diff --git a/Golden_Repo/v/VTKData/VTKData-9.1.0-GCCcore-11.2.0.eb b/Golden_Repo/v/VTKData/VTKData-9.1.0-GCCcore-11.2.0.eb
deleted file mode 100644
index b7bffaf58..000000000
--- a/Golden_Repo/v/VTKData/VTKData-9.1.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,30 +0,0 @@
-easyblock = 'Tarball'
-
-name = 'VTKData'
-version = '9.1.0'
-
-homepage = 'https://vtk.org'
-description = "Testdata for VTK"
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [('https://www.vtk.org/files/release/%(version_major_minor)s/')]
-sources = [
-    ('VTKData-%(version)s.tar.gz'),
-    ('VTKDataFiles-%(version)s.tar.gz'),
-    ('VTKLargeData-%(version)s.tar.gz'),
-    ('VTKLargeDataFiles-%(version)s.tar.gz'),
-]
-checksums = [
-    ('sha256', 'b9442cf1c30e1e44502e6dc36d3c6c2dc3d3f7d03306ee1d10737e9abadaa85d'),
-    ('sha256', 'c777b3d2e42e67b079170a8b0ab7aab5ab8f40d93332792c41cf20ada0cab17a'),
-    ('sha256', '23c86546d8cade8129e45fe23cee8b3ff448a992fd01708cce2019a01d534872'),
-    ('sha256', '79638c7caf247962e35aa17b1b7f5e746589ee266cb911695739b3677320c62d'),
-]
-
-sanity_check_paths = {
-    'files': ['.ExternalData/README.rst'],
-    'dirs': ['.ExternalData', 'Common', 'Examples', 'Filters', 'IO', 'Parallel', 'Rendering', 'Testing'],
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/v/VTune/VTune-2021.9.0.eb b/Golden_Repo/v/VTune/VTune-2021.9.0.eb
deleted file mode 100644
index 2b9a341a0..000000000
--- a/Golden_Repo/v/VTune/VTune-2021.9.0.eb
+++ /dev/null
@@ -1,25 +0,0 @@
-name = 'VTune'
-version = '2021.9.0'
-
-homepage = 'https://software.intel.com/en-us/vtune'
-description = """Intel VTune Amplifier XE is the premier performance profiler for C, C++, C#, Fortran,
- Assembly and Java."""
-
-toolchain = SYSTEM
-
-# By downloading, you accept the Intel End User License Agreement
-# (https://software.intel.com/content/www/us/en/develop/articles/end-user-license-agreement.html)
-# accept_eula = True
-source_urls = [
-    'https://registrationcenter-download.intel.com/akdlm/irc_nas/18302/']
-sources = ['l_oneapi_vtune_p_%(version)s.545_offline.sh']
-checksums = ['55c8ac25e685f03c849bb5383da249c7caaf2138a2b57a10c8975a38fa3828bc']
-
-sanity_check_paths = {
-    'files': ['%(namelower)s/%(version)s/bin64/amplxe-perf'],
-    'dirs': ['%(namelower)s/%(version)s/bin64',
-             '%(namelower)s/%(version)s/lib64',
-             '%(namelower)s/%(version)s/include/intel64']
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/v/Valgrind/Valgrind-3.18.1-gompi-2021b.eb b/Golden_Repo/v/Valgrind/Valgrind-3.18.1-gompi-2021b.eb
deleted file mode 100644
index 18aac1c35..000000000
--- a/Golden_Repo/v/Valgrind/Valgrind-3.18.1-gompi-2021b.eb
+++ /dev/null
@@ -1,31 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'Valgrind'
-version = '3.18.1'
-
-homepage = 'https://valgrind.org'
-description = "Valgrind: Debugging and profiling tools"
-
-toolchain = {'name': 'gompi', 'version': '2021b'}
-
-source_urls = [
-    'https://sourceware.org/pub/valgrind/',
-    'https://www.mirrorservice.org/sites/sourceware.org/pub/valgrind/',
-]
-sources = [SOURCELOWER_TAR_BZ2]
-checksums = ['00859aa13a772eddf7822225f4b46ee0d39afbe071d32778da4d99984081f7f5']
-
-configopts = ' --with-mpicc="$MPICC"'
-
-local_binaries = [
-    'callgrind_annotate', 'callgrind_control', 'cg_annotate', 'cg_diff',
-    'cg_merge', 'ms_print', 'valgrind', 'valgrind-listener', 'vgdb'
-]
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in local_binaries] +
-             ['lib/valgrind/libmpiwrap-amd64-linux.%s' % SHLIB_EXT],
-    'dirs': []
-}
-
-moduleclass = 'debugger'
diff --git a/Golden_Repo/v/Valgrind/Valgrind-3.18.1-gpsmpi-2021b.eb b/Golden_Repo/v/Valgrind/Valgrind-3.18.1-gpsmpi-2021b.eb
deleted file mode 100644
index 787b6fefd..000000000
--- a/Golden_Repo/v/Valgrind/Valgrind-3.18.1-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,31 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'Valgrind'
-version = '3.18.1'
-
-homepage = 'https://valgrind.org'
-description = "Valgrind: Debugging and profiling tools"
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-
-source_urls = [
-    'https://sourceware.org/pub/valgrind/',
-    'https://www.mirrorservice.org/sites/sourceware.org/pub/valgrind/',
-]
-sources = [SOURCELOWER_TAR_BZ2]
-checksums = ['00859aa13a772eddf7822225f4b46ee0d39afbe071d32778da4d99984081f7f5']
-
-configopts = ' --with-mpicc="$MPICC"'
-
-local_binaries = [
-    'callgrind_annotate', 'callgrind_control', 'cg_annotate', 'cg_diff',
-    'cg_merge', 'ms_print', 'valgrind', 'valgrind-listener', 'vgdb'
-]
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in local_binaries] +
-             ['lib/valgrind/libmpiwrap-amd64-linux.%s' % SHLIB_EXT],
-    'dirs': []
-}
-
-moduleclass = 'debugger'
diff --git a/Golden_Repo/v/Valgrind/Valgrind-3.18.1-iimpi-2021b.eb b/Golden_Repo/v/Valgrind/Valgrind-3.18.1-iimpi-2021b.eb
deleted file mode 100644
index 6d3cac194..000000000
--- a/Golden_Repo/v/Valgrind/Valgrind-3.18.1-iimpi-2021b.eb
+++ /dev/null
@@ -1,32 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'Valgrind'
-version = '3.18.1'
-
-homepage = 'https://valgrind.org'
-description = "Valgrind: Debugging and profiling tools"
-
-toolchain = {'name': 'iimpi', 'version': '2021b'}
-
-source_urls = [
-    'https://sourceware.org/pub/valgrind/',
-    'https://www.mirrorservice.org/sites/sourceware.org/pub/valgrind/',
-]
-sources = [SOURCELOWER_TAR_BZ2]
-checksums = ['00859aa13a772eddf7822225f4b46ee0d39afbe071d32778da4d99984081f7f5']
-
-preconfigopts = 'unset CC CFLAGS &&'
-configopts = ' --with-mpicc="$MPICC"'
-
-local_binaries = [
-    'callgrind_annotate', 'callgrind_control', 'cg_annotate', 'cg_diff',
-    'cg_merge', 'ms_print', 'valgrind', 'valgrind-listener', 'vgdb'
-]
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in local_binaries] +
-             ['lib/valgrind/libmpiwrap-amd64-linux.%s' % SHLIB_EXT],
-    'dirs': []
-}
-
-moduleclass = 'debugger'
diff --git a/Golden_Repo/v/Valgrind/Valgrind-3.18.1-iompi-2021b.eb b/Golden_Repo/v/Valgrind/Valgrind-3.18.1-iompi-2021b.eb
deleted file mode 100644
index 950a03660..000000000
--- a/Golden_Repo/v/Valgrind/Valgrind-3.18.1-iompi-2021b.eb
+++ /dev/null
@@ -1,32 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'Valgrind'
-version = '3.18.1'
-
-homepage = 'https://valgrind.org'
-description = "Valgrind: Debugging and profiling tools"
-
-toolchain = {'name': 'iompi', 'version': '2021b'}
-
-source_urls = [
-    'https://sourceware.org/pub/valgrind/',
-    'https://www.mirrorservice.org/sites/sourceware.org/pub/valgrind/',
-]
-sources = [SOURCELOWER_TAR_BZ2]
-checksums = ['00859aa13a772eddf7822225f4b46ee0d39afbe071d32778da4d99984081f7f5']
-
-preconfigopts = 'unset CC CFLAGS &&'
-configopts = ' --with-mpicc="$MPICC"'
-
-local_binaries = [
-    'callgrind_annotate', 'callgrind_control', 'cg_annotate', 'cg_diff',
-    'cg_merge', 'ms_print', 'valgrind', 'valgrind-listener', 'vgdb'
-]
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in local_binaries] +
-             ['lib/valgrind/libmpiwrap-amd64-linux.%s' % SHLIB_EXT],
-    'dirs': []
-}
-
-moduleclass = 'debugger'
diff --git a/Golden_Repo/v/Valgrind/Valgrind-3.18.1-ipsmpi-2021b.eb b/Golden_Repo/v/Valgrind/Valgrind-3.18.1-ipsmpi-2021b.eb
deleted file mode 100644
index 7eec2e97e..000000000
--- a/Golden_Repo/v/Valgrind/Valgrind-3.18.1-ipsmpi-2021b.eb
+++ /dev/null
@@ -1,32 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'Valgrind'
-version = '3.18.1'
-
-homepage = 'https://valgrind.org'
-description = "Valgrind: Debugging and profiling tools"
-
-toolchain = {'name': 'ipsmpi', 'version': '2021b'}
-
-source_urls = [
-    'https://sourceware.org/pub/valgrind/',
-    'https://www.mirrorservice.org/sites/sourceware.org/pub/valgrind/',
-]
-sources = [SOURCELOWER_TAR_BZ2]
-checksums = ['00859aa13a772eddf7822225f4b46ee0d39afbe071d32778da4d99984081f7f5']
-
-preconfigopts = 'unset CC CFLAGS &&'
-configopts = ' --with-mpicc="$MPICC"'
-
-local_binaries = [
-    'callgrind_annotate', 'callgrind_control', 'cg_annotate', 'cg_diff',
-    'cg_merge', 'ms_print', 'valgrind', 'valgrind-listener', 'vgdb'
-]
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in local_binaries] +
-             ['lib/valgrind/libmpiwrap-amd64-linux.%s' % SHLIB_EXT],
-    'dirs': []
-}
-
-moduleclass = 'debugger'
diff --git a/Golden_Repo/v/Vampir/Vampir-10.0.0.eb b/Golden_Repo/v/Vampir/Vampir-10.0.0.eb
deleted file mode 100644
index 96d54698e..000000000
--- a/Golden_Repo/v/Vampir/Vampir-10.0.0.eb
+++ /dev/null
@@ -1,45 +0,0 @@
-# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild
-# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-# License::   New BSD
-#
-# This work is based from experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-# For using $SYSTEMNAME to determine license path. The local prefix is to appease the checker
-import os as local_os
-
-easyblock = 'Binary'
-
-name = "Vampir"
-version = "10.0.0"
-local_archsuffix = "-linux-x86_64"
-
-homepage = 'http://www.vampir.eu'
-description = """The VAMPIR software tool provides an easy-to-use framework that enables
-developers to quickly display and analyze arbitrary program behavior at any level of detail.
-The tool suite implements optimized event analysis algorithms and customizable displays that
-enable fast and interactive rendering of very complex performance monitoring data.
-
-"""
-
-toolchain = SYSTEM
-
-sources = ['vampir-%s%s-setup.sh' % (version, local_archsuffix)]
-checksums = ['c8cdfb9bb2319b0b9f8ac99c3b35bc892479166c80777199472fce641794e147']
-
-install_cmd = './vampir-%(version)s-linux-x86_64-setup.sh --silent --instdir=%(installdir)s'
-
-sanity_check_paths = {
-    'files': ["bin/vampir", "doc/vampir-manual.pdf"],
-    'dirs': []
-}
-
-local_licdir = '/p/software/%s/licenses/vampir/vampir.license' % local_os.environ['SYSTEMNAME']
-
-modextravars = {
-    'VAMPIR_LICENSE': '/p/software/%s/licenses/vampir/vampir.license' % local_os.environ['SYSTEMNAME'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/v/Vampir/Vampir-9.11.3.eb b/Golden_Repo/v/Vampir/Vampir-9.11.3.eb
deleted file mode 100644
index 24d96fa03..000000000
--- a/Golden_Repo/v/Vampir/Vampir-9.11.3.eb
+++ /dev/null
@@ -1,44 +0,0 @@
-# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild
-# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-# License::   New BSD
-#
-# This work is based from experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-# For using $SYSTEMNAME to determine license path. The local prefix is to appease the checker
-import os as local_os
-
-easyblock = 'Binary'
-
-name = "Vampir"
-version = "9.11.3"
-local_archsuffix = "-linux-x86_64"
-
-homepage = 'http://www.vampir.eu'
-description = """The VAMPIR software tool provides an easy-to-use framework that enables
-developers to quickly display and analyze arbitrary program behavior at any level of detail.
-The tool suite implements optimized event analysis algorithms and customizable displays that
-enable fast and interactive rendering of very complex performance monitoring data.
-
-"""
-
-toolchain = SYSTEM
-
-sources = ['vampir-%s%s-setup.sh' % (version, local_archsuffix)]
-checksums = ['3e00f08ed9d1820df756755214acf0c2ead5a2e23bdef0fd4f2f701b6a2111ca']
-
-install_cmd = './vampir-%(version)s-linux-x86_64-setup.sh --silent --instdir=%(installdir)s'
-
-sanity_check_paths = {
-    'files': ["bin/vampir", "doc/vampir-manual.pdf"],
-    'dirs': []
-}
-
-
-modextravars = {
-    'VAMPIR_LICENSE': '/p/software/%s/licenses/vampir/vampir.license' % local_os.environ['SYSTEMNAME'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/v/VampirServer/VampirServer-10.0.0-gpsmpi-2021b.eb b/Golden_Repo/v/VampirServer/VampirServer-10.0.0-gpsmpi-2021b.eb
deleted file mode 100644
index dfa773255..000000000
--- a/Golden_Repo/v/VampirServer/VampirServer-10.0.0-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,64 +0,0 @@
-# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild
-# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-# License::   New BSD
-#
-# This work is based from experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-# For using $SYSTEMNAME to determine license path. The local prefix is to appease the checker
-import os as local_os
-
-easyblock = 'Binary'
-
-name = "VampirServer"
-version = "10.0.0"
-
-homepage = 'http://www.vampir.eu'
-description = """The VAMPIR software tool provides an easy-to-use framework that enables
-developers to quickly display and analyze arbitrary program behavior at any level of detail.
-The tool suite implements optimized event analysis algorithms and customizable displays that
-enable fast and interactive rendering of very complex performance monitoring data.
-"""
-
-usage = """
-To start VampirServer
-module load Vampir VampirServer
-vampir &
-BATCH_OPT="--account=<budget> --partition=<partition>" vampirserver start -n 4 mpi
-(note server + port + server_id)
-- Use it
-Vampir GUI-> open other -> remote file -> server + port
-- To stop VampirServer
-vampirserver stop <server_id>
-"""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-
-toolchainopts = {"usempi": True}
-
-sources = ['vampirserver-%s-linux-x86_64-setup.sh' % (version)]
-checksums = ['663911b545038b89dc447991f19a83f29524fd3c60f3c0875501421b7d395883']
-
-install_cmd = ('./vampirserver-%(version)s-linux-x86_64-setup.sh --silent --instdir=%(installdir)s '
-               '&& %(installdir)s/bin/vampirserver config --silent')
-
-sanity_check_paths = {
-    'files': ["bin/vampirserver", "doc/vampirserver-manual.pdf"],
-    'dirs': []
-}
-
-# Remove Cray-specific 'ap' launcher,
-# use SLURM launcher as MPI launcher and default
-postinstallcmds = [
-    'rm %(installdir)s/etc/server/launcher/ap',
-    '''sed -i s/'BATCH_OPT=""'/'#BATCH_OPT=""'/g %(installdir)s/etc/server/launcher/custom/slurm''',
-    'cp %(installdir)s/etc/server/launcher/custom/slurm %(installdir)s/etc/server/launcher/mpi',
-]
-
-modextravars = {
-    'VAMPIR_LICENSE': '/p/software/%s/licenses/vampir/vampir.license' % local_os.environ['SYSTEMNAME'],
-}
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/v/VampirServer/VampirServer-9.11.3-gpsmpi-2021b.eb b/Golden_Repo/v/VampirServer/VampirServer-9.11.3-gpsmpi-2021b.eb
deleted file mode 100644
index 4caa008a1..000000000
--- a/Golden_Repo/v/VampirServer/VampirServer-9.11.3-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,64 +0,0 @@
-# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild
-# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-# License::   New BSD
-#
-# This work is based from experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-# For using $SYSTEMNAME to determine license path. The local prefix is to appease the checker
-import os as local_os
-
-easyblock = 'Binary'
-
-name = "VampirServer"
-version = "9.11.3"
-
-homepage = 'http://www.vampir.eu'
-description = """The VAMPIR software tool provides an easy-to-use framework that enables
-developers to quickly display and analyze arbitrary program behavior at any level of detail.
-The tool suite implements optimized event analysis algorithms and customizable displays that
-enable fast and interactive rendering of very complex performance monitoring data.
-"""
-
-usage = """
-To start VampirServer
-module load Vampir VampirServer
-vampir &
-BATCH_OPT="--account=<budget> --partition=<partition>" vampirserver start -n 4 mpi
-(note server + port + server_id)
-- Use it
-Vampir GUI-> open other -> remote file -> server + port
-- To stop VampirServer
-vampirserver stop <server_id>
-"""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-
-toolchainopts = {"usempi": True}
-
-sources = ['vampirserver-%s-linux-x86_64-setup.sh' % (version)]
-checksums = ['61847b5b533b4fc9bf128bcade7911b7f4c919b940a4909f85f21ac17cac385b']
-
-install_cmd = ('./vampirserver-%(version)s-linux-x86_64-setup.sh --silent --instdir=%(installdir)s '
-               '&& %(installdir)s/bin/vampirserver config --silent')
-
-sanity_check_paths = {
-    'files': ["bin/vampirserver", "doc/vampirserver-manual.pdf"],
-    'dirs': []
-}
-
-# Remove Cray-specific 'ap' launcher,
-# use SLURM launcher as MPI launcher and default
-postinstallcmds = [
-    'rm %(installdir)s/etc/server/launcher/ap',
-    '''sed -i s/'BATCH_OPT=""'/'#BATCH_OPT=""'/g %(installdir)s/etc/server/launcher/custom/slurm''',
-    'cp %(installdir)s/etc/server/launcher/custom/slurm %(installdir)s/etc/server/launcher/mpi',
-]
-
-modextravars = {
-    'VAMPIR_LICENSE': '/p/software/%s/licenses/vampir/vampir.license' % local_os.environ['SYSTEMNAME'],
-}
-
-moduleclass = 'perf'
diff --git a/Golden_Repo/v/VirtualGL/VirtualGL-2.6.5-GCCcore-11.2.0.eb b/Golden_Repo/v/VirtualGL/VirtualGL-2.6.5-GCCcore-11.2.0.eb
deleted file mode 100644
index 0319ec084..000000000
--- a/Golden_Repo/v/VirtualGL/VirtualGL-2.6.5-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,50 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'VirtualGL'
-version = '2.6.5'
-
-homepage = 'https://virtualgl.org/'
-description = """VirtualGL is an open source toolkit that gives any Linux or 
-Unix remote display software the ability to run OpenGL applications with full 
-hardware acceleration."""
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/VirtualGL/virtualgl/archive/']
-sources = ['%(version)s.tar.gz']
-patches = [
-    'virtualgl_cmake_lib_path.patch',
-]
-checksums = [
-    'f1edd6b1c05d4892c4b9f612907eb572a00f332e1077d4933b89f666b6c68d96',  # 2.6.5.tar.gz
-    # virtualgl_cmake_lib_path.patch
-    'aa185d038f5e47957bd8a163107d352a1675a224b5a41f167e5b75ae42c87f1d',
-]
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1', '', SYSTEM)
-]
-
-dependencies = [
-    ('libjpeg-turbo', '2.1.1'),
-    ('OpenGL', '2021b'),
-]
-
-separate_build_dir = True
-configopts = '-DVGL_FAKEOPENCL=OFF'
-
-local_binaries = [
-    'cpustat', 'glreadtest', 'glxinfo', 'glxspheres64', 'nettest', 'tcbench',
-    'vglclient', 'vglconfig', 'vglconnect', 'vglgenkey', 'vgllogin', 'vglrun',
-    'vglserver_config'
-]
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in local_binaries],
-    'dirs': ['lib64', 'share', 'include'],
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/v/VirtualGL/VirtualGL-3.0-GCCcore-11.2.0.eb b/Golden_Repo/v/VirtualGL/VirtualGL-3.0-GCCcore-11.2.0.eb
deleted file mode 100644
index bb72af98e..000000000
--- a/Golden_Repo/v/VirtualGL/VirtualGL-3.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,50 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'VirtualGL'
-version = '3.0'
-
-homepage = 'https://virtualgl.org/'
-description = """VirtualGL is an open source toolkit that gives any Linux or 
-Unix remote display software the ability to run OpenGL applications with full 
-hardware acceleration."""
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/VirtualGL/virtualgl/archive/']
-sources = ['%(version)s.tar.gz']
-patches = [
-    'virtualgl_cmake_lib_path.patch',
-]
-checksums = [
-    'd6e00a8d0596cafa67955d6211e0dab6c8aa8239bd718f7eca6eb0b032711f9b',  # 3.0.tar.gz
-    # virtualgl_cmake_lib_path.patch
-    'aa185d038f5e47957bd8a163107d352a1675a224b5a41f167e5b75ae42c87f1d',
-]
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1', '', SYSTEM)
-]
-
-dependencies = [
-    ('libjpeg-turbo', '2.1.1'),
-    ('OpenGL', '2021b'),
-]
-
-separate_build_dir = True
-configopts = '-DVGL_FAKEOPENCL=OFF'
-
-local_binaries = [
-    'cpustat', 'glreadtest', 'glxinfo', 'glxspheres64', 'nettest', 'tcbench',
-    'vglclient', 'vglconfig', 'vglconnect', 'vglgenkey', 'vgllogin', 'vglrun',
-    'vglserver_config'
-]
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in local_binaries],
-    'dirs': ['lib64', 'share', 'include'],
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/v/VirtualGL/virtualgl_cmake_lib_path.patch b/Golden_Repo/v/VirtualGL/virtualgl_cmake_lib_path.patch
deleted file mode 100644
index f58d0cbe2..000000000
--- a/Golden_Repo/v/VirtualGL/virtualgl_cmake_lib_path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ruN virtualgl-2.5.2/CMakeLists.txt virtualgl-2.5.2.old/CMakeLists.txt
---- virtualgl-2.5.2/CMakeLists.txt	2017-03-03 00:13:45.000000000 +0100
-+++ virtualgl-2.5.2.old/CMakeLists.txt	2017-03-20 16:14:04.908614846 +0100
-@@ -261,9 +261,6 @@
- 
- else()
- 
--if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
--	set(CMAKE_LIBRARY_PATH /usr/lib/${CPU_TYPE}-linux-gnu;/usr/lib${BITS};/usr/lib)
--endif()
- include(FindX11)
- include(FindOpenGL)
- 
diff --git a/Golden_Repo/v/Voro++/Voro++-0.4.6-GCCcore-11.2.0.eb b/Golden_Repo/v/Voro++/Voro++-0.4.6-GCCcore-11.2.0.eb
deleted file mode 100644
index 4dc5cc511..000000000
--- a/Golden_Repo/v/Voro++/Voro++-0.4.6-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,41 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'Voro++'
-
-# Still the latest version available
-
-version = '0.4.6'
-
-homepage = 'http://math.lbl.gov/voro++/'
-description = """Voro++ is a software library for carrying out three-dimensional computations of the Voronoi
-tessellation. A distinguishing feature of the Voro++ library is that it carries out cell-based calculations,
-computing the Voronoi cell for each particle individually. It is particularly well-suited for applications that
-rely on cell-based statistics, where features of Voronoi cells (eg. volume, centroid, number of faces) can be used
-to analyze a system of particles."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['http://math.lbl.gov/%(namelower)s/download/dir/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['ef7970071ee2ce3800daa8723649ca069dc4c71cc25f0f7d22552387f3ea437e']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-# Override CXX and CFLAGS variables from Makefile
-buildopts = 'CXX="$CXX" CFLAGS="$CXXFLAGS"'
-
-# Override PREFIX variable from Makefile
-installopts = 'PREFIX=%(installdir)s'
-
-# No configure
-skipsteps = ['configure']
-
-sanity_check_paths = {
-    'files': ['bin/%(namelower)s', 'lib/libvoro++.a', 'include/%(namelower)s/%(namelower)s.hh'],
-    'dirs': [],
-}
-
-moduleclass = 'math'
diff --git a/Golden_Repo/w/Wannier90/Wannier90-1.2-gomkl-2021b.eb b/Golden_Repo/w/Wannier90/Wannier90-1.2-gomkl-2021b.eb
deleted file mode 100644
index c2aed8289..000000000
--- a/Golden_Repo/w/Wannier90/Wannier90-1.2-gomkl-2021b.eb
+++ /dev/null
@@ -1,39 +0,0 @@
-easyblock = 'MakeCp'
-
-name = 'Wannier90'
-version = '1.2'
-
-homepage = 'http://www.wannier.org'
-description = """A tool for obtaining maximally-localised Wannier functions"""
-
-toolchain = {'name': 'gomkl', 'version': '2021b'}
-toolchainopts = {'usempi': True}
-
-sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://www.wannier.org/code']
-
-patches = ['Wannier90_1x_ignore_makesys.patch']
-
-checksums = [
-    # wannier90-1.2.tar.gz
-    'a76f88eef01c5a40aaa2c74ee393ede8a57bd9085f6b7f2ab656b50c1a30ece4',
-    # Wannier90_1x_ignore_makesys.patch
-    '8d4c60cfba6722b7ddc0fad8f0d0e4028990162dca5ff5ffa894e7b11ca21a33',
-]
-
-prebuildopts = 'F90=$F90 FCOPTS="$FFLAGS" LDOPTS="$FFLAGS" LIBDIR="$LAPACK_LIB_DIR" LIBS="$LIBLAPACK" '
-
-# build program and library
-buildopts = 'all'
-
-files_to_copy = [(['wannier90.x'], 'bin'), (['libwannier.a'], 'lib')]
-
-sanity_check_paths = {
-    'files': ['bin/wannier90.x', 'lib/libwannier.a'],
-    'dirs': []
-}
-
-# parallel build tends to fail
-parallel = 1
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/w/Wannier90/Wannier90-1.2-gpsmkl-2021b.eb b/Golden_Repo/w/Wannier90/Wannier90-1.2-gpsmkl-2021b.eb
deleted file mode 100644
index 8958d8767..000000000
--- a/Golden_Repo/w/Wannier90/Wannier90-1.2-gpsmkl-2021b.eb
+++ /dev/null
@@ -1,39 +0,0 @@
-easyblock = 'MakeCp'
-
-name = 'Wannier90'
-version = '1.2'
-
-homepage = 'http://www.wannier.org'
-description = """A tool for obtaining maximally-localised Wannier functions"""
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-toolchainopts = {'usempi': True}
-
-sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://www.wannier.org/code']
-
-patches = ['Wannier90_1x_ignore_makesys.patch']
-
-checksums = [
-    # wannier90-1.2.tar.gz
-    'a76f88eef01c5a40aaa2c74ee393ede8a57bd9085f6b7f2ab656b50c1a30ece4',
-    # Wannier90_1x_ignore_makesys.patch
-    '8d4c60cfba6722b7ddc0fad8f0d0e4028990162dca5ff5ffa894e7b11ca21a33',
-]
-
-prebuildopts = 'F90=$F90 FCOPTS="$FFLAGS" LDOPTS="$FFLAGS" LIBDIR="$LAPACK_LIB_DIR" LIBS="$LIBLAPACK" '
-
-# build program and library
-buildopts = 'all'
-
-files_to_copy = [(['wannier90.x'], 'bin'), (['libwannier.a'], 'lib')]
-
-sanity_check_paths = {
-    'files': ['bin/wannier90.x', 'lib/libwannier.a'],
-    'dirs': []
-}
-
-# parallel build tends to fail
-parallel = 1
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/w/Wannier90/Wannier90-1.2-intel-2021b.eb b/Golden_Repo/w/Wannier90/Wannier90-1.2-intel-2021b.eb
deleted file mode 100644
index aabe3f0d1..000000000
--- a/Golden_Repo/w/Wannier90/Wannier90-1.2-intel-2021b.eb
+++ /dev/null
@@ -1,39 +0,0 @@
-easyblock = 'MakeCp'
-
-name = 'Wannier90'
-version = '1.2'
-
-homepage = 'http://www.wannier.org'
-description = """A tool for obtaining maximally-localised Wannier functions"""
-
-toolchain = {'name': 'intel', 'version': '2021b'}
-toolchainopts = {'usempi': True}
-
-sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://www.wannier.org/code']
-
-patches = ['Wannier90_1x_ignore_makesys.patch']
-
-checksums = [
-    # wannier90-1.2.tar.gz
-    'a76f88eef01c5a40aaa2c74ee393ede8a57bd9085f6b7f2ab656b50c1a30ece4',
-    # Wannier90_1x_ignore_makesys.patch
-    '8d4c60cfba6722b7ddc0fad8f0d0e4028990162dca5ff5ffa894e7b11ca21a33',
-]
-
-prebuildopts = 'F90=$F90 FCOPTS="$FFLAGS" LDOPTS="$FFLAGS" LIBDIR="$LAPACK_LIB_DIR" LIBS="$LIBLAPACK" '
-
-# build program and library
-buildopts = 'all'
-
-files_to_copy = [(['wannier90.x'], 'bin'), (['libwannier.a'], 'lib')]
-
-sanity_check_paths = {
-    'files': ['bin/wannier90.x', 'lib/libwannier.a'],
-    'dirs': []
-}
-
-# parallel build tends to fail
-parallel = 1
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/w/Wannier90/Wannier90-1.2-intel-para-2021b.eb b/Golden_Repo/w/Wannier90/Wannier90-1.2-intel-para-2021b.eb
deleted file mode 100644
index e306d68d4..000000000
--- a/Golden_Repo/w/Wannier90/Wannier90-1.2-intel-para-2021b.eb
+++ /dev/null
@@ -1,39 +0,0 @@
-easyblock = 'MakeCp'
-
-name = 'Wannier90'
-version = '1.2'
-
-homepage = 'http://www.wannier.org'
-description = """A tool for obtaining maximally-localised Wannier functions"""
-
-toolchain = {'name': 'intel-para', 'version': '2021b'}
-toolchainopts = {'usempi': True}
-
-sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://www.wannier.org/code']
-
-patches = ['Wannier90_1x_ignore_makesys.patch']
-
-checksums = [
-    # wannier90-1.2.tar.gz
-    'a76f88eef01c5a40aaa2c74ee393ede8a57bd9085f6b7f2ab656b50c1a30ece4',
-    # Wannier90_1x_ignore_makesys.patch
-    '8d4c60cfba6722b7ddc0fad8f0d0e4028990162dca5ff5ffa894e7b11ca21a33',
-]
-
-prebuildopts = 'F90=$F90 FCOPTS="$FFLAGS" LDOPTS="$FFLAGS" LIBDIR="$LAPACK_LIB_DIR" LIBS="$LIBLAPACK" '
-
-# build program and library
-buildopts = 'all'
-
-files_to_copy = [(['wannier90.x'], 'bin'), (['libwannier.a'], 'lib')]
-
-sanity_check_paths = {
-    'files': ['bin/wannier90.x', 'lib/libwannier.a'],
-    'dirs': []
-}
-
-# parallel build tends to fail
-parallel = 1
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/w/Wannier90/Wannier90-1.2-iomkl-2021b.eb b/Golden_Repo/w/Wannier90/Wannier90-1.2-iomkl-2021b.eb
deleted file mode 100644
index d6c3bf977..000000000
--- a/Golden_Repo/w/Wannier90/Wannier90-1.2-iomkl-2021b.eb
+++ /dev/null
@@ -1,39 +0,0 @@
-easyblock = 'MakeCp'
-
-name = 'Wannier90'
-version = '1.2'
-
-homepage = 'http://www.wannier.org'
-description = """A tool for obtaining maximally-localised Wannier functions"""
-
-toolchain = {'name': 'iomkl', 'version': '2021b'}
-toolchainopts = {'usempi': True}
-
-sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://www.wannier.org/code']
-
-patches = ['Wannier90_1x_ignore_makesys.patch']
-
-checksums = [
-    # wannier90-1.2.tar.gz
-    'a76f88eef01c5a40aaa2c74ee393ede8a57bd9085f6b7f2ab656b50c1a30ece4',
-    # Wannier90_1x_ignore_makesys.patch
-    '8d4c60cfba6722b7ddc0fad8f0d0e4028990162dca5ff5ffa894e7b11ca21a33',
-]
-
-prebuildopts = 'F90=$F90 FCOPTS="$FFLAGS" LDOPTS="$FFLAGS" LIBDIR="$LAPACK_LIB_DIR" LIBS="$LIBLAPACK" '
-
-# build program and library
-buildopts = 'all'
-
-files_to_copy = [(['wannier90.x'], 'bin'), (['libwannier.a'], 'lib')]
-
-sanity_check_paths = {
-    'files': ['bin/wannier90.x', 'lib/libwannier.a'],
-    'dirs': []
-}
-
-# parallel build tends to fail
-parallel = 1
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/w/Wannier90/Wannier90-3.1.0-gomkl-2021b.eb b/Golden_Repo/w/Wannier90/Wannier90-3.1.0-gomkl-2021b.eb
deleted file mode 100644
index 46b358b49..000000000
--- a/Golden_Repo/w/Wannier90/Wannier90-3.1.0-gomkl-2021b.eb
+++ /dev/null
@@ -1,39 +0,0 @@
-easyblock = 'MakeCp'
-
-name = 'Wannier90'
-version = '3.1.0'
-
-homepage = 'http://www.wannier.org'
-description = """A tool for obtaining maximally-localised Wannier functions"""
-
-toolchain = {'name': 'gomkl', 'version': '2021b'}
-toolchainopts = {'usempi': True}
-
-github_account = 'wannier-developers'
-source_urls = [GITHUB_LOWER_SOURCE]
-sources = [
-    {'download_filename': 'v%(version)s.tar.gz', 'filename': SOURCELOWER_TAR_GZ}]
-patches = ['Wannier90_3x_ignore_makeinc.patch']
-checksums = [
-    # wannier90-3.1.0.tar.gz
-    '40651a9832eb93dec20a8360dd535262c261c34e13c41b6755fa6915c936b254',
-    # Wannier90_3x_ignore_makeinc.patch
-    '561c0d296e0e30b8bb303702cd6e41ded54c153d9b9e6cd9cab73858e5e2945e',
-]
-
-# The -fallow-argument-mismatch allows MPI communication calls to be
-# called with arrays of different types at different places in the
-# code.  This otherwise cause an error in GCC 10.X
-buildopts = 'all F90=$F90 MPIF90=$MPIF90 FCOPTS="$FFLAGS -fallow-argument-mismatch" LDOPTS="$FFLAGS" '
-buildopts += 'LIBDIR="$LAPACK_LIB_DIR" LIBS="$LIBLAPACK" '
-buildopts += 'COMMS=mpi'
-
-files_to_copy = [(['wannier90.x', 'postw90.x'], 'bin'),
-                 (['libwannier.a'], 'lib')]
-
-sanity_check_paths = {
-    'files': ['bin/wannier90.x', 'bin/postw90.x', 'lib/libwannier.a'],
-    'dirs': []
-}
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/w/Wannier90/Wannier90-3.1.0-gpsmkl-2021b.eb b/Golden_Repo/w/Wannier90/Wannier90-3.1.0-gpsmkl-2021b.eb
deleted file mode 100644
index 85c20b5a7..000000000
--- a/Golden_Repo/w/Wannier90/Wannier90-3.1.0-gpsmkl-2021b.eb
+++ /dev/null
@@ -1,39 +0,0 @@
-easyblock = 'MakeCp'
-
-name = 'Wannier90'
-version = '3.1.0'
-
-homepage = 'http://www.wannier.org'
-description = """A tool for obtaining maximally-localised Wannier functions"""
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-toolchainopts = {'usempi': True}
-
-github_account = 'wannier-developers'
-source_urls = [GITHUB_LOWER_SOURCE]
-sources = [
-    {'download_filename': 'v%(version)s.tar.gz', 'filename': SOURCELOWER_TAR_GZ}]
-patches = ['Wannier90_3x_ignore_makeinc.patch']
-checksums = [
-    # wannier90-3.1.0.tar.gz
-    '40651a9832eb93dec20a8360dd535262c261c34e13c41b6755fa6915c936b254',
-    # Wannier90_3x_ignore_makeinc.patch
-    '561c0d296e0e30b8bb303702cd6e41ded54c153d9b9e6cd9cab73858e5e2945e',
-]
-
-# The -fallow-argument-mismatch allows MPI communication calls to be
-# called with arrays of different types at different places in the
-# code.  This otherwise cause an error in GCC 10.X
-buildopts = 'all F90=$F90 MPIF90=$MPIF90 FCOPTS="$FFLAGS -fallow-argument-mismatch" LDOPTS="$FFLAGS" '
-buildopts += 'LIBDIR="$LAPACK_LIB_DIR" LIBS="$LIBLAPACK" '
-buildopts += 'COMMS=mpi'
-
-files_to_copy = [(['wannier90.x', 'postw90.x'], 'bin'),
-                 (['libwannier.a'], 'lib')]
-
-sanity_check_paths = {
-    'files': ['bin/wannier90.x', 'bin/postw90.x', 'lib/libwannier.a'],
-    'dirs': []
-}
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/w/Wannier90/Wannier90-3.1.0-intel-2021b.eb b/Golden_Repo/w/Wannier90/Wannier90-3.1.0-intel-2021b.eb
deleted file mode 100644
index 453bedcca..000000000
--- a/Golden_Repo/w/Wannier90/Wannier90-3.1.0-intel-2021b.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-easyblock = 'MakeCp'
-
-name = 'Wannier90'
-version = '3.1.0'
-
-homepage = 'http://www.wannier.org'
-description = """A tool for obtaining maximally-localised Wannier functions"""
-
-toolchain = {'name': 'intel', 'version': '2021b'}
-toolchainopts = {'usempi': True}
-
-github_account = 'wannier-developers'
-source_urls = [GITHUB_LOWER_SOURCE]
-sources = [
-    {'download_filename': 'v%(version)s.tar.gz', 'filename': SOURCELOWER_TAR_GZ}]
-patches = ['Wannier90_3x_ignore_makeinc.patch']
-checksums = [
-    # wannier90-3.1.0.tar.gz
-    '40651a9832eb93dec20a8360dd535262c261c34e13c41b6755fa6915c936b254',
-    # Wannier90_3x_ignore_makeinc.patch
-    '561c0d296e0e30b8bb303702cd6e41ded54c153d9b9e6cd9cab73858e5e2945e',
-]
-
-buildopts = 'all F90=$F90 MPIF90=$MPIF90 FCOPTS="$FFLAGS" LDOPTS="$FFLAGS" '
-buildopts += 'LIBDIR="$LAPACK_LIB_DIR" LIBS="$LIBLAPACK" '
-buildopts += 'COMMS=mpi'
-
-files_to_copy = [(['wannier90.x', 'postw90.x'], 'bin'),
-                 (['libwannier.a'], 'lib')]
-
-sanity_check_paths = {
-    'files': ['bin/wannier90.x', 'bin/postw90.x', 'lib/libwannier.a'],
-    'dirs': []
-}
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/w/Wannier90/Wannier90-3.1.0-intel-para-2021b.eb b/Golden_Repo/w/Wannier90/Wannier90-3.1.0-intel-para-2021b.eb
deleted file mode 100644
index ab5221d58..000000000
--- a/Golden_Repo/w/Wannier90/Wannier90-3.1.0-intel-para-2021b.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-easyblock = 'MakeCp'
-
-name = 'Wannier90'
-version = '3.1.0'
-
-homepage = 'http://www.wannier.org'
-description = """A tool for obtaining maximally-localised Wannier functions"""
-
-toolchain = {'name': 'intel-para', 'version': '2021b'}
-toolchainopts = {'usempi': True}
-
-github_account = 'wannier-developers'
-source_urls = [GITHUB_LOWER_SOURCE]
-sources = [
-    {'download_filename': 'v%(version)s.tar.gz', 'filename': SOURCELOWER_TAR_GZ}]
-patches = ['Wannier90_3x_ignore_makeinc.patch']
-checksums = [
-    # wannier90-3.1.0.tar.gz
-    '40651a9832eb93dec20a8360dd535262c261c34e13c41b6755fa6915c936b254',
-    # Wannier90_3x_ignore_makeinc.patch
-    '561c0d296e0e30b8bb303702cd6e41ded54c153d9b9e6cd9cab73858e5e2945e',
-]
-
-buildopts = 'all F90=$F90 MPIF90=$MPIF90 FCOPTS="$FFLAGS" LDOPTS="$FFLAGS" '
-buildopts += 'LIBDIR="$LAPACK_LIB_DIR" LIBS="$LIBLAPACK" '
-buildopts += 'COMMS=mpi'
-
-files_to_copy = [(['wannier90.x', 'postw90.x'], 'bin'),
-                 (['libwannier.a'], 'lib')]
-
-sanity_check_paths = {
-    'files': ['bin/wannier90.x', 'bin/postw90.x', 'lib/libwannier.a'],
-    'dirs': []
-}
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/w/Wannier90/Wannier90-3.1.0-iomkl-2021b.eb b/Golden_Repo/w/Wannier90/Wannier90-3.1.0-iomkl-2021b.eb
deleted file mode 100644
index 9c41a6af9..000000000
--- a/Golden_Repo/w/Wannier90/Wannier90-3.1.0-iomkl-2021b.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-easyblock = 'MakeCp'
-
-name = 'Wannier90'
-version = '3.1.0'
-
-homepage = 'http://www.wannier.org'
-description = """A tool for obtaining maximally-localised Wannier functions"""
-
-toolchain = {'name': 'iomkl', 'version': '2021b'}
-toolchainopts = {'usempi': True}
-
-github_account = 'wannier-developers'
-source_urls = [GITHUB_LOWER_SOURCE]
-sources = [
-    {'download_filename': 'v%(version)s.tar.gz', 'filename': SOURCELOWER_TAR_GZ}]
-patches = ['Wannier90_3x_ignore_makeinc.patch']
-checksums = [
-    # wannier90-3.1.0.tar.gz
-    '40651a9832eb93dec20a8360dd535262c261c34e13c41b6755fa6915c936b254',
-    # Wannier90_3x_ignore_makeinc.patch
-    '561c0d296e0e30b8bb303702cd6e41ded54c153d9b9e6cd9cab73858e5e2945e',
-]
-
-buildopts = 'all F90=$F90 MPIF90=$MPIF90 FCOPTS="$FFLAGS" LDOPTS="$FFLAGS" '
-buildopts += 'LIBDIR="$LAPACK_LIB_DIR" LIBS="$LIBLAPACK" '
-buildopts += 'COMMS=mpi'
-
-files_to_copy = [(['wannier90.x', 'postw90.x'], 'bin'),
-                 (['libwannier.a'], 'lib')]
-
-sanity_check_paths = {
-    'files': ['bin/wannier90.x', 'bin/postw90.x', 'lib/libwannier.a'],
-    'dirs': []
-}
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/w/Wannier90/Wannier90_1x_ignore_makesys.patch b/Golden_Repo/w/Wannier90/Wannier90_1x_ignore_makesys.patch
deleted file mode 100644
index 07fb60558..000000000
--- a/Golden_Repo/w/Wannier90/Wannier90_1x_ignore_makesys.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-avoid including make.sys, which contains hardcoding settings we don't need/want
-author: Miguel Dias Costa (National University of Singapore)
---- src/Makefile.orig	2016-04-19 15:26:27.373047000 +0800
-+++ src/Makefile	2016-04-19 15:26:32.414229150 +0800
-@@ -1,7 +1,7 @@
- #  Should be no need to change below this line
- #
- 
--include ../make.sys
-+#include ../make.sys
- 
- OBJS  =  constants.o io.o utility.o parameters.o hamiltonian.o overlap.o \
- 	 kmesh.o disentangle.o wannierise.o plot.o transport.o
diff --git a/Golden_Repo/w/Wannier90/Wannier90_3x_ignore_makeinc.patch b/Golden_Repo/w/Wannier90/Wannier90_3x_ignore_makeinc.patch
deleted file mode 100644
index 03ccb352e..000000000
--- a/Golden_Repo/w/Wannier90/Wannier90_3x_ignore_makeinc.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-avoid including make.inc, which contains hardcoding settings we don't need/want
-author: J-M Beuken
-diff -Nru wannier90-3.0.0.orig/src/Makefile.2 wannier90-3.0.0/src/Makefile.2
---- wannier90-3.0.0.orig/src/Makefile.2	2019-06-26 22:47:08.067494977 +0200
-+++ wannier90-3.0.0/src/Makefile.2	2019-06-26 22:47:35.313193842 +0200
-@@ -2,7 +2,7 @@
- #  Should be no need to change below this line
- #
- 
--include ../../make.inc
-+#include ../../make.inc
- 
- # Contains definition of OBJS, OBJSLIB, OBJS_POST, LIBRARY, DYNLIBRARY
- include ../Makefile.header
-diff -Nru wannier90-3.0.0.orig/utility/w90pov/Makefile wannier90-3.0.0/utility/w90pov/Makefile
---- wannier90-3.0.0.orig/utility/w90pov/Makefile	2019-06-26 22:47:08.148494082 +0200
-+++ wannier90-3.0.0/utility/w90pov/Makefile	2019-06-26 23:02:34.442673824 +0200
-@@ -1,4 +1,4 @@
--include ../../make.inc
-+#include ../../make.inc
- 
- SRC=src
- OBJ=obj
-diff -Nru wannier90-3.0.0.orig/utility/w90vdw/Makefile wannier90-3.0.0/utility/w90vdw/Makefile
---- wannier90-3.0.0.orig/utility/w90vdw/Makefile	2019-06-26 22:47:08.153494027 +0200
-+++ wannier90-3.0.0/utility/w90vdw/Makefile	2019-06-26 23:03:01.118385092 +0200
-@@ -1,4 +1,4 @@
--include ../../make.inc
-+#include ../../make.inc
- 
- w90vdw.x: w90vdw.f90
- 	$(F90) $(FCOPTS) $< -o $@
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
deleted file mode 100644
index 607744625..000000000
--- a/Golden_Repo/x/X11/X11-20210802-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,221 +0,0 @@
-easyblock = 'Bundle'
-
-name = 'X11'
-version = '20210802'
-
-homepage = 'https://www.x.org'
-description = "The X Window System (X11) is a windowing system for bitmap displays"
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [
-    XORG_LIB_SOURCE,
-    XORG_PROTO_SOURCE,
-    'https://xcb.freedesktop.org/dist/',
-    'https://xkbcommon.org/download/',
-    XORG_DATA_SOURCE + '/xkeyboard-config',
-    XORG_DATA_SOURCE,
-    'https://www.x.org/archive/individual/app/',
-    'https://www.x.org/archive/individual/font/'
-]
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Autotools', '20210726'),
-    ('Bison', '3.7.6'),
-    ('gettext', '0.21'),
-    ('pkg-config', '0.29.2'),
-    ('intltool', '0.51.0'),
-    ('Meson', '0.58.2'),
-    ('Ninja', '1.10.2'),
-]
-
-dependencies = [
-    ('bzip2', '1.0.8'),
-    ('fontconfig', '2.13.94'),
-    ('freetype', '2.11.0'),
-    ('zlib', '1.2.11'),
-    ('xorg-macros', '1.19.3'),
-    ('libpciaccess', '0.16'),
-]
-
-default_easyblock = 'ConfigureMake'
-
-default_component_specs = {
-    'sources': [SOURCE_TAR_GZ],
-    'start_dir': '%(name)s-%(version)s',
-}
-
-components = [
-    ('libpthread-stubs', '0.4', {  # 2017-03-14
-        'checksums': ['50d5686b79019ccea08bcbd7b02fe5a40634abcfd4146b6e75c6420cc170e9d9'],
-    }),
-    ('xorgproto', '2021.4.99.2', {  # 2021-05-30
-        'checksums': ['179531d0a797eb464076bd8a1a698ea9c1cba4e67fcac65cc73758dd2712d892'],
-    }),
-    ('libXau', '1.0.9', {  # 2019-02-10
-        'checksums': ['1f123d8304b082ad63a9e89376400a3b1d4c29e67e3ea07b3f659cccca690eea'],
-    }),
-    ('libXdmcp', '1.1.3', {  # 2019-03-16
-        'checksums': ['2ef9653d32e09d1bf1b837d0e0311024979653fe755ad3aaada8db1aa6ea180c'],
-    }),
-    ('xcb-proto', '1.14.1', {  # 2020-10-08
-        'checksums': ['85cd21e9d9fbc341d0dbf11eace98d55d7db89fda724b0e598855fcddf0944fd'],
-    }),
-    ('libxcb', '1.14', {  # 2020-02-22
-        'sources': [SOURCE_TAR_GZ],
-        'checksums': ['2c7fcddd1da34d9b238c9caeda20d3bd7486456fc50b3cc6567185dbd5b0ad02'],
-    }),
-    ('xtrans', '1.4.0', {  # 2019-03-16
-        'checksums': ['48ed850ce772fef1b44ca23639b0a57e38884045ed2cbb18ab137ef33ec713f9'],
-    }),
-    ('libxkbcommon', '1.3.0', {  # 2021-05-01
-        'easyblock': 'MesonNinja',
-        'sources': ['libxkbcommon-%(version)s.tar.xz'],
-        'checksums': ['7b09e098ea69bc3054f0c57a9a25fda571c4df22398811606e32b5fffeb75e7b'],
-        'preconfigopts': '',
-        'configopts': '-Denable-wayland=false -Denable-docs=false ',
-    }),
-    ('libX11', '1.7.2', {  # 2021-06-06
-        'checksums': ['2c26ccd08f43a6214de89110554fbe97c71692eeb7e7d4829f3004ae6fafd2c0'],
-    }),
-    ('libXext', '1.3.4', {  # 2019-03-16
-        'checksums': ['8ef0789f282826661ff40a8eef22430378516ac580167da35cc948be9041aac1'],
-    }),
-    ('libFS', '1.0.8', {  # 2019-03-10
-        'checksums': ['e3da723257f4f4c0c629aec402e0a36fbec66a9418f70d24a159cb0470ec83d2'],
-    }),
-    ('libICE', '1.0.10', {  # 2019-07-14
-        'checksums': ['1116bc64c772fd127a0d0c0ffa2833479905e3d3d8197740b3abd5f292f22d2d'],
-    }),
-    ('libSM', '1.2.3', {  # 2018-10-10
-        'checksums': ['1e92408417cb6c6c477a8a6104291001a40b3bb56a4a60608fdd9cd2c5a0f320'],
-    }),
-    ('libXScrnSaver', '1.2.3', {  # 2018-07-05
-        'checksums': ['4f74e7e412144591d8e0616db27f433cfc9f45aae6669c6c4bb03e6bf9be809a'],
-    }),
-    ('libXt', '1.2.1', {  # 2021-01-24
-        'checksums': ['6da1bfa9dd0ed87430a5ce95b129485086394df308998ebe34d98e378e3dfb33'],
-    }),
-    ('libXmu', '1.1.3', {  # 2019-03-16
-        'checksums': ['5bd9d4ed1ceaac9ea023d86bf1c1632cd3b172dce4a193a72a94e1d9df87a62e'],
-    }),
-    ('libXpm', '3.5.13', {  # 2019-12-13
-        'checksums': ['e3dfb0fb8c1f127432f2a498c7856b37ce78a61e8da73f1aab165a73dd97ad00'],
-    }),
-    ('libXaw', '1.0.14', {  # 2021-03-27
-        'checksums': ['59cfed2712cc80bbfe62dd1aacf24f58d74a76dd08329a922077b134a8d8048f'],
-    }),
-    ('libXfixes', '6.0.0', {  # 2021-05-11
-        'checksums': ['82045da5625350838390c9440598b90d69c882c324ca92f73af9f0e992cb57c7'],
-    }),
-    ('libXcomposite', '0.4.5', {  # 2019-03-11
-        'checksums': ['581c7fc0f41a99af38b1c36b9be64bc13ef3f60091cd3f01105bbc7c01617d6c'],
-    }),
-    ('libXrender', '0.9.10', {  # 2016-10-04
-        'checksums': ['770527cce42500790433df84ec3521e8bf095dfe5079454a92236494ab296adf'],
-    }),
-    ('libXcursor', '1.2.0', {  # 2019-03-11
-        'checksums': ['ad5b2574fccaa4c3fa67b9874fbed863d29ad230c784e9a08b20692418f6a1f8'],
-    }),
-    ('libXdamage', '1.1.5', {  # 2019-03-11
-        'checksums': ['630ec53abb8c2d6dac5cd9f06c1f73ffb4a3167f8118fdebd77afd639dbc2019'],
-    }),
-    ('libfontenc', '1.1.4', {  # 2019-02-20
-        'checksums': ['895ee0986b32fbfcda7f4f25ef6cbacfa760e1690bf59f02085ce0e7d1eebb41'],
-    }),
-    ('libXfont', '1.5.4', {  # 2017-11-28
-        'checksums': ['59be6eab53f7b0feb6b7933c11d67d076ae2c0fd8921229c703fc7a4e9a80d6e'],
-    }),
-    ('libXfont2', '2.0.5', {  # 2021-08-02
-        'checksums': ['d7544aa35ea67a87840ff0b1bd15130b102e473de3611b7d78604ba635fd6d94'],
-    }),
-    ('libXft', '2.3.4', {  # 2021-08-02
-        'checksums': ['1eca71bec9cb483165ce1ab94f5cd3036269f5268651df6a2d99c4a7ab644d79'],
-    }),
-    ('libXi', '1.7.99.2', {  # 2021-06-01
-        'checksums': ['991d212bb9583b1dbe429e2c8fc510fcab3c820b3d7fba07e1e8b9fefcf9ac76'],
-    }),
-    ('libXinerama', '1.1.4', {  # 2018-07-05
-        'checksums': ['64de45e18cc76b8e703cb09b3c9d28bd16e3d05d5cd99f2d630de2d62c3acc18'],
-    }),
-    ('libXrandr', '1.5.2', {  # 2019-03-16
-        'checksums': ['3f10813ab355e7a09f17e147d61b0ce090d898a5ea5b5519acd0ef68675dcf8e'],
-    }),
-    ('libXres', '1.2.1', {  # 2021-03-31
-        'checksums': ['918fb33c3897b389a1fbb51571c5c04c6b297058df286d8b48faa5af85e88bcc'],
-    }),
-    ('libXtst', '1.2.3', {  # 2016-10-04
-        'checksums': ['a0c83acce02d4923018c744662cb28eb0dbbc33b4adc027726879ccf68fbc2c2'],
-    }),
-    ('libXv', '1.0.11', {  # 2016-10-04
-        'checksums': ['c4112532889b210e21cf05f46f0f2f8354ff7e1b58061e12d7a76c95c0d47bb1'],
-    }),
-    ('libXvMC', '1.0.12', {  # 2019-09-24
-        'checksums': ['024c9ec4f001f037eeca501ee724c7e51cf287eb69ced8c6126e16e7fa9864b5'],
-    }),
-    ('libXxf86dga', '1.1.5', {  # 2019-03-16
-        'checksums': ['715e2bf5caf6276f0858eb4b11a1aef1a26beeb40dce2942387339da395bef69'],
-    }),
-    ('libXxf86vm', '1.1.4', {  # 2015-02-24
-        'checksums': ['5108553c378a25688dcb57dca383664c36e293d60b1505815f67980ba9318a99'],
-    }),
-    ('libdmx', '1.1.4', {  # 2018-05-14
-        'checksums': ['4d05bd5b248c1f46729fa1536b7a5e4d692567327ad41564c36742fb327af925'],
-    }),
-    ('libxkbfile', '1.1.0', {  # 2019-03-16
-        'checksums': ['2a92adda3992aa7cbad758ef0b8dfeaedebb49338b772c64ddf369d78c1c51d3'],
-    }),
-    ('libxshmfence', '1.3', {  # 2018-02-26
-        'checksums': ['7eb3d46ad91bab444f121d475b11b39273142d090f7e9ac43e6a87f4ff5f902c'],
-    }),
-    ('xcb-util', '0.4.0', {  # 2014-10-15
-        'checksums': ['0ed0934e2ef4ddff53fcc70fc64fb16fe766cd41ee00330312e20a985fd927a7'],
-    }),
-    ('xcb-util-image', '0.4.0', {  # 2014-10-15
-        'checksums': ['cb2c86190cf6216260b7357a57d9100811bb6f78c24576a3a5bfef6ad3740a42'],
-    }),
-    ('xcb-util-keysyms', '0.4.0', {  # 2014-10-01
-        'checksums': ['0807cf078fbe38489a41d755095c58239e1b67299f14460dec2ec811e96caa96'],
-    }),
-    ('xcb-util-renderutil', '0.3.9', {  # 2014-06-13
-        'checksums': ['55eee797e3214fe39d0f3f4d9448cc53cffe06706d108824ea37bb79fcedcad5'],
-    }),
-    ('xcb-util-wm', '0.4.1', {  # 2014-02-19
-        'checksums': ['038b39c4bdc04a792d62d163ba7908f4bb3373057208c07110be73c1b04b8334'],
-    }),
-    ('xcb-util-cursor', '0.1.3', {  # 2016-05-12
-        'checksums': ['a322332716a384c94d3cbf98f2d8fe2ce63c2fe7e2b26664b6cea1d411723df8'],
-    }),
-    ('xkeyboard-config', '2.33', {  # 2021-06-08
-        'checksums': ['112df68e1150e8da421bc0abe79eebeacca16a91e54e1877cb39fc878d17b365'],
-    }),
-    ('printproto', '1.0.5', {  # 2011-01-06
-        'checksums': ['e8b6f405fd865f0ea7a3a2908dfbf06622f57f2f91359ec65d13b955e49843fc'],
-    }),
-    ('libXp', '1.0.3', {  # 2015-02-21
-        'checksums': ['f6b8cc4ef05d3eafc9ef5fc72819dd412024b4ed60197c0d5914758125817e9c'],
-    }),
-    ('xbitmaps', '1.1.2', {  # 2018-03-10
-        'checksums': ['27e700e8ee02c43f7206f4eca8f1953ad15236cac95d7a0f08505c3f7d99c265'],
-    }),
-    ('xkbcomp', '1.4.5', {  # 2021-03-17
-        'checksums': ['e88a4d86b9925ea1e8685dd5ea29c815abafb8ddf19bf5f1a1e0650839252c23'],
-    }),
-    ('font-util', '1.3.2', {
-        'checksums': ['f115a3735604de1e852a4bf669be0269d8ce8f21f8e0e74ec5934b31dadc1e76'],
-    }),
-    ('xauth', '1.1', {  # 2019-07-11
-        'checksums': ['e9fce796c8c5c9368594b9e8bbba237fb54b6615f5fd60e8d0a5b3c52a92c5ef'],
-    }),
-]
-
-preconfigopts = "if [ ! -f configure ]; then ./autogen.sh; fi && "
-
-sanity_check_paths = {
-    'files': ['include/X11/Xlib.h', 'include/X11/Xutil.h'],
-    'dirs': ['include/GL', 'include/X11', 'include/X11/extensions', 'lib/pkgconfig',
-             'share/pkgconfig', 'share/X11/xkb'],
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/x/XCFun/XCFun-2.1.1-GCCcore-11.2.0.eb b/Golden_Repo/x/XCFun/XCFun-2.1.1-GCCcore-11.2.0.eb
deleted file mode 100644
index eed15d166..000000000
--- a/Golden_Repo/x/XCFun/XCFun-2.1.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,30 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'XCFun'
-version = '2.1.1'
-
-homepage = 'https://xcfun.readthedocs.io'
-description = """Arbitrary order exchange-correlation functional library"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://github.com/dftlibs/xcfun/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['8b602df74c7be83d501532565deafd1b7881946d94789122f24c309a669298ab']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1')
-]
-
-separate_build_dir = True
-build_type = 'release'
-
-modextravars = {'XCFun_DIR': '%(installdir)s/share/cmake/XCFun/'}
-
-sanity_check_paths = {
-    'files': ['lib/libxcfun.%s' % SHLIB_EXT],
-    'dirs': ['include/XCFun']
-}
-
-moduleclass = 'chem'
diff --git a/Golden_Repo/x/XGBoost/XGBoost-1.5.1-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/x/XGBoost/XGBoost-1.5.1-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index 58b901477..000000000
--- a/Golden_Repo/x/XGBoost/XGBoost-1.5.1-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'XGBoost'
-version = '1.2.0'
-
-homepage = 'https://github.com/dmlc/xgboost'
-description = """XGBoost is an optimized distributed gradient boosting library designed to be highly efficient,
- flexible and portable."""
-
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-toolchainopts = {'pic': True}
-
-
-source_urls = [PYPI_SOURCE]
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['e5f4abcd5df6767293f31b7c58d67ea38b2689641a95b2cd8ca8935295097a36']
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-    ('Ninja', '1.10.2'),
-    ('Ninja-Python', '1.10.2'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10'),
-]
-
-use_pip = True
-download_dep_fail = True
-sanity_pip_check = True
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/x/XServer/0002-Constant-DPI.patch b/Golden_Repo/x/XServer/0002-Constant-DPI.patch
deleted file mode 100644
index f91e53d1e..000000000
--- a/Golden_Repo/x/XServer/0002-Constant-DPI.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- a/src/dummy.h	2016-12-17 23:02:53.396287041 +0100
-+++ b/src/dummy.h	2016-12-17 23:03:30.319616550 +0100
-@@ -51,6 +51,7 @@
-     /* options */
-     OptionInfoPtr Options;
-     Bool swCursor;
-+    Bool constantDPI;
-     /* proc pointer */
-     CloseScreenProcPtr CloseScreen;
-     xf86CursorInfoPtr CursorInfo;
---- a/src/dummy_driver.c	2016-12-14 21:54:20.000000000 +0100
-+++ b/src/dummy_driver.c	2016-12-17 23:04:59.916416126 +0100
-@@ -17,6 +17,12 @@
- /* All drivers using the mi colormap manipulation need this */
- #include "micmap.h"
- 
-+#ifdef RANDR
-+#include "randrstr.h"
-+#endif
-+
-+#include "windowstr.h"
-+
- /* identifying atom needed by magnifiers */
- #include <X11/Xatom.h>
- #include "property.h"
-@@ -115,11 +121,15 @@
- };
- 
- typedef enum {
--    OPTION_SW_CURSOR
-+    OPTION_SW_CURSOR,
-+    OPTION_CONSTANT_DPI
- } DUMMYOpts;
- 
- static const OptionInfoRec DUMMYOptions[] = {
-     { OPTION_SW_CURSOR,	"SWcursor",	OPTV_BOOLEAN,	{0}, FALSE },
-+#ifdef RANDR
-+    { OPTION_CONSTANT_DPI,	"ConstantDPI",	OPTV_BOOLEAN,	{0}, FALSE },
-+#endif
-     { -1,                  NULL,           OPTV_NONE,	{0}, FALSE }
- };
- 
-@@ -359,6 +369,7 @@
-     xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, dPtr->Options);
- 
-     xf86GetOptValBool(dPtr->Options, OPTION_SW_CURSOR,&dPtr->swCursor);
-+    xf86GetOptValBool(dPtr->Options, OPTION_CONSTANT_DPI, &dPtr->constantDPI);
- 
-     if (device->videoRam != 0) {
- 	pScrn->videoRam = device->videoRam;
-@@ -639,10 +650,45 @@
-     return TRUE;
- }
- 
-+const char *XDPY_PROPERTY = "dummy-constant-xdpi";
-+const char *YDPY_PROPERTY = "dummy-constant-ydpi";
-+static int get_dpi_value(WindowPtr root, const char *property_name, int default_dpi)
-+{
-+    PropertyPtr prop;
-+    Atom type_atom = MakeAtom("CARDINAL", 8, TRUE);
-+    Atom prop_atom = MakeAtom(property_name, strlen(property_name), FALSE);
-+
-+    for (prop = wUserProps(root); prop; prop = prop->next) {
-+       if (prop->propertyName == prop_atom && prop->type == type_atom && prop->data) {
-+           int v = (int) (*((CARD32 *) prop->data));
-+           if ((v>0) && (v<4096)) {
-+               xf86DrvMsg(0, X_INFO, "get_constant_dpi_value() found property \"%s\" with value=%i\n", property_name, (int) v);
-+               return (int) v;
-+           }
-+           break;
-+       }
-+    }
-+    return default_dpi;
-+}
-+
- /* Mandatory */
- Bool
- DUMMYSwitchMode(SWITCH_MODE_ARGS_DECL)
- {
-+    SCRN_INFO_PTR(arg);
-+#ifdef RANDR
-+    DUMMYPtr dPtr = DUMMYPTR(pScrn);
-+    if (dPtr->constantDPI) {
-+        int xDpi = get_dpi_value(pScrn->pScreen->root, XDPY_PROPERTY, pScrn->xDpi);
-+        int yDpi = get_dpi_value(pScrn->pScreen->root, YDPY_PROPERTY, pScrn->yDpi);
-+        //25.4 mm per inch: (254/10)
-+        pScrn->pScreen->mmWidth = mode->HDisplay * 254 / xDpi / 10;
-+        pScrn->pScreen->mmHeight = mode->VDisplay * 254 / yDpi / 10;
-+        xf86DrvMsg(pScrn->scrnIndex, X_INFO, "mm(dpi %ix%i)=%ix%i\n", xDpi, yDpi, pScrn->pScreen->mmWidth, pScrn->pScreen->mmHeight);
-+        RRScreenSizeNotify(pScrn->pScreen);
-+        RRTellChanged(pScrn->pScreen);
-+    }
-+#endif
-     return TRUE;
- }
- 
diff --git a/Golden_Repo/x/XServer/0003-fix-pointer-limits.patch b/Golden_Repo/x/XServer/0003-fix-pointer-limits.patch
deleted file mode 100644
index 3dbb6fd17..000000000
--- a/Golden_Repo/x/XServer/0003-fix-pointer-limits.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- xf86-video-dummy-0.3.6/src/dummy_driver.c	2014-11-05 19:24:02.668656601 +0700
-+++ xf86-video-dummy-0.3.6.new/src/dummy_driver.c	2014-11-05 19:37:53.076061853 +0700
-@@ -55,6 +55,9 @@
- #include <X11/extensions/xf86dgaproto.h>
- #endif
- 
-+/* Needed for fixing pointer limits on resize */
-+#include "inputstr.h"
-+
- /* Mandatory functions */
- static const OptionInfoRec *	DUMMYAvailableOptions(int chipid, int busid);
- static void     DUMMYIdentify(int flags);
-@@ -713,6 +716,26 @@
-         RRTellChanged(pScrn->pScreen);
-     }
- #endif
-+    //ensure the screen dimensions are also updated:
-+    pScrn->pScreen->width = mode->HDisplay;
-+    pScrn->pScreen->height = mode->VDisplay;
-+    pScrn->virtualX = mode->HDisplay;
-+    pScrn->virtualY = mode->VDisplay;
-+    pScrn->frameX1 = mode->HDisplay;
-+    pScrn->frameY1 = mode->VDisplay;
-+
-+    //ensure the pointer uses the new limits too:
-+    DeviceIntPtr pDev;
-+    SpritePtr pSprite;
-+    for (pDev = inputInfo.devices; pDev; pDev = pDev->next) {
-+        if (pDev->spriteInfo!=NULL && pDev->spriteInfo->sprite!=NULL) {
-+            pSprite = pDev->spriteInfo->sprite;
-+            pSprite->hotLimits.x2 = mode->HDisplay;
-+            pSprite->hotLimits.y2 = mode->VDisplay;
-+            pSprite->physLimits.x2 = mode->HDisplay;
-+            pSprite->physLimits.y2 = mode->VDisplay;
-+        }
-+    }
-     return TRUE;
- }
- 
diff --git a/Golden_Repo/x/XServer/0005-support-for-30-bit-depth-in-dummy-driver.patch b/Golden_Repo/x/XServer/0005-support-for-30-bit-depth-in-dummy-driver.patch
deleted file mode 100644
index 567db3fc3..000000000
--- a/Golden_Repo/x/XServer/0005-support-for-30-bit-depth-in-dummy-driver.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/src/dummy.h	2016-12-17 23:33:33.279533389 +0100
-+++ b/src/dummy.h	2016-12-17 23:33:56.695739166 +0100
-@@ -69,7 +69,7 @@
-     int overlay_offset;
-     int videoKey;
-     int interlace;
--    dummy_colors colors[256];
-+    dummy_colors colors[1024];
-     pointer* FBBase;
-     Bool        (*CreateWindow)() ;     /* wrapped CreateWindow */
-     Bool prop;
---- a/src/dummy_driver.c	2016-12-17 23:33:47.446657886 +0100
-+++ b/src/dummy_driver.c	2016-12-17 23:33:56.696739175 +0100
-@@ -317,6 +317,7 @@
- 	case 15:
- 	case 16:
- 	case 24:
-+        case 30:
- 	    break;
- 	default:
- 	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-@@ -331,8 +332,8 @@
- 	pScrn->rgbBits = 8;
- 
-     /* Get the depth24 pixmap format */
--    if (pScrn->depth == 24 && pix24bpp == 0)
--	pix24bpp = xf86GetBppFromDepth(pScrn, 24);
-+    if (pScrn->depth >= 24 && pix24bpp == 0)
-+	pix24bpp = xf86GetBppFromDepth(pScrn, pScrn->depth);
- 
-     /*
-      * This must happen after pScrn->display has been set because
-@@ -623,7 +624,7 @@
-     if(!miCreateDefColormap(pScreen))
- 	return FALSE;
- 
--    if (!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits,
-+    if (!xf86HandleColormaps(pScreen, 1024, pScrn->rgbBits,
-                          DUMMYLoadPalette, NULL, 
-                          CMAP_PALETTED_TRUECOLOR 
- 			     | CMAP_RELOAD_ON_MODE_SWITCH))
diff --git a/Golden_Repo/x/XServer/XServer-1.20.13-GCCcore-11.2.0.eb b/Golden_Repo/x/XServer/XServer-1.20.13-GCCcore-11.2.0.eb
deleted file mode 100644
index bb3826b2a..000000000
--- a/Golden_Repo/x/XServer/XServer-1.20.13-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,274 +0,0 @@
-easyblock = 'Bundle'
-
-name = 'XServer'
-version = '1.20.13'
-
-homepage = 'https://www.x.org'
-
-description = """
-XServer: X Window System display server.
-
-This module provides a stripped-down installation with minimal driver support.
-"""
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [
-    'https://www.x.org/archive/individual/xserver/',
-    'https://www.x.org/archive/individual/driver/'
-]
-
-# OS dependency should be preferred for security reasons
-osdependencies = [
-    ('openssl-devel', 'libssl-dev', 'libopenssl-devel'),
-]
-
-builddependencies = [
-    ('pkg-config', '0.29.2'),
-    # use same binutils version that was used when building GCCcore toolchain
-    ('binutils', '2.37'),
-    ('Bison', '3.7.6'),
-    ('Meson', '0.58.2'),
-    ('Ninja', '1.10.2'),
-    ('flex', '2.6.4'),
-    ('Bison', '3.7.6'),
-]
-
-dependencies = [
-    ('libdrm', '2.4.108'),
-    ('OpenGL', '2021b'),
-    ('pixman', '0.40.0'),
-    ('X11', '20210802'),
-    ('freetype', '2.11.0'),
-    ('fontconfig', '2.13.94'),
-    ('ncurses', '6.2'),
-    ('libepoxy', '1.5.9'),
-    ('eudev', '3.2.9'),
-]
-
-local_font_preconfigopts = "export PKG_CONFIG_PATH=%(installdir)s/lib/pkgconfig:$PKG_CONFIG_PATH && "
-local_font_preconfigopts += "export PATH=%(installdir)s/bin:$PATH && "
-local_font_preconfigopts += "export FONTCONFIG_FILE=%(installdir)s/config/fontconfig/fonts.conf && "
-
-# https://github.com/freedesktop/xorg-xserver/blob/master/meson_options.txt
-local_xorg_configopts = "-D default_font_path=%(installdir)s/share/fonts/X11 "
-local_xorg_configopts += "-D xorg=true "
-local_xorg_configopts += "-D xvfb=true "
-local_xorg_configopts += "-D xnest=true "
-local_xorg_configopts += "-D xephyr=true "
-local_xorg_configopts += "-D dmx=true "
-local_xorg_configopts += "-D udev=true "
-local_xorg_configopts += "-D glamor=true "
-local_xorg_configopts += "-D systemd_logind=false "
-# local_xorg_configopts += "-D suid_wrapper=true "
-local_xorg_configopts += "-D xkb_dir=%(installdir)s/share/X11/xkb "
-# local_xorg_configopts += "-D xkb_output_dir=/var/lib/xkb "
-
-default_easyblock = 'ConfigureMake'
-
-default_component_specs = {
-    'sources': [SOURCE_TAR_GZ],
-    'start_dir': '%(name)s-%(version)s',
-}
-
-components = [
-    ('fontconfig-config', '1.0.0', {
-        'easyblock': 'Binary',
-        'source_urls': ['https://gitlab.version.fz-juelich.de/goebbert1/fontconfig-config/-/archive/v%(version)s/'],
-        'sources': ['%(name)s-v%(version)s.tar.gz'],
-        'start_dir': '%(name)s-v%(version)s',
-        'extract_sources': True,
-        'install_cmd': (
-            'cp -a %(builddir)s/%(name)s-v%(version)s/* %(installdir)s/ && '
-            'sed -i \'s@$EBROOTXSERVER@\'"%(installdir)s"\'@g\' %(installdir)s/share/X11/xorg.conf.d/99-fonts.conf'
-        ),
-        'checksums': [('sha256', '68544c183d153f34105fa08573174650bfe643a6d750bd9da4accac399d375db')],
-        # to activate this fontconfig you need to export FONTCONFIG_FILE=${EBROOTXSERVER}/config/fontconfig/fonts.conf
-    }),
-    ('mkfontscale', '1.2.1', {
-        'source_urls': ['https://www.x.org/archive/individual/app/'],
-        'checksums': ['e5b687029e44d0bd3ccd254a4da6a5cbfc40350aa8b43fcca16ef6e9b9bb9f22'],
-    }),
-    ('mkfontdir', '1.0.7', {
-        'source_urls': ['https://www.x.org/archive/individual/app/'],
-        'checksums': ['bccc5fb7af1b614eabe4a22766758c87bfc36d66191d08c19d2fa97674b7b5b7'],
-    }),
-    ('bdftopcf', '1.1', {
-        'source_urls': ['https://www.x.org/archive/individual/app/'],
-        'checksums': ['699d1a62012035b1461c7f8e3f05a51c8bd6f28f348983249fb89bbff7309b47'],
-    }),
-    ('font-util', '1.3.2', {
-        'source_urls': ['https://www.x.org/pub/individual/font/'],
-        'sources': ['%(name)s-%(version)s.tar.gz'],
-        'checksums': [('sha256', 'f115a3735604de1e852a4bf669be0269d8ce8f21f8e0e74ec5934b31dadc1e76')],
-    }),
-    ('encodings', '1.0.5', {
-        'source_urls': ['https://www.x.org/pub/individual/font/'],
-        'sources': ['%(name)s-%(version)s.tar.gz'],
-        'checksums': [('sha256', '66f524ab53acdd0823265e1b1a894f8652c928ae75a18b39aafd6a2d4a5577b0')],
-    }),
-    ('font-alias', '1.0.4', {
-        'source_urls': ['https://www.x.org/pub/individual/font/'],
-        'sources': ['%(name)s-%(version)s.tar.gz'],
-        'checksums': [('sha256', '49525fa6f2c3f3b54f461b2e0649b0ac61af50c36bf40069355a25ced8ce2028')],
-    }),
-    ('dejavu', '2.37', {
-        'easyblock': 'Binary',
-        'source_urls': [SOURCEFORGE_SOURCE],
-        'sources': ['%(name)s-fonts-ttf-%(version)s.tar.bz2'],
-        'extract_sources': True,
-        'start_dir': 'dejavu-fonts-ttf-2.37',
-        'install_cmd': ('install -v -d -m755 %(installdir)s/share/fonts/dejavu && '
-                        'install -v -m644 ttf/*.ttf %(installdir)s/share/fonts/dejavu'),
-        'checksums': [('sha256', 'fa9ca4d13871dd122f61258a80d01751d603b4d3ee14095d65453b4e846e17d7')],
-        'preconfigopts': local_font_preconfigopts,
-    }),
-    ('font-adobe-75dpi', '1.0.3', {
-        'source_urls': ['https://www.x.org/pub/individual/font/'],
-        'sources': ['%(name)s-%(version)s.tar.gz'],
-        'checksums': [('sha256', '61eb1fcfec89f7435cb92cd68712fbe4ba412ca562b1f5feec1f6daa1b8544f6')],
-        'preconfigopts': local_font_preconfigopts,
-    }),
-    ('font-adobe-100dpi', '1.0.3', {
-        'source_urls': ['https://www.x.org/pub/individual/font/'],
-        'sources': ['%(name)s-%(version)s.tar.gz'],
-        'checksums': [('sha256', '97d9c1e706938838e4134d74f0836ae9d9ca6705ecb405c9a0ac8fdcbd9c2159')],
-        'preconfigopts': local_font_preconfigopts,
-    }),
-    ('font-cursor-misc', '1.0.3', {
-        'source_urls': ['https://www.x.org/pub/individual/font/'],
-        'sources': ['%(name)s-%(version)s.tar.gz'],
-        'checksums': [('sha256', 'a0b146139363dd0a704c7265ff9cd9150d4ae7c0d248091a9a42093e1618c427')],
-        'preconfigopts': local_font_preconfigopts,
-    }),
-    ('font-adobe-utopia-type1', '1.0.4', {
-        'source_urls': ['https://www.x.org/pub/individual/font/'],
-        'sources': ['%(name)s-%(version)s.tar.gz'],
-        'checksums': [('sha256', 'd9e86a8805b0fb78222409169d839a8531a1f5c7284ee117ff2a0af2e5016c3f')],
-        'preconfigopts': local_font_preconfigopts,
-    }),
-    ('font-misc-misc', '1.1.2', {
-        'source_urls': ['https://www.x.org/pub/individual/font/'],
-        'sources': ['%(name)s-%(version)s.tar.gz'],
-        'checksums': [('sha256', '46142c876e176036c61c0c24c0a689079704d5ca5b510d48c025861ee2dbf829')],
-        'preconfigopts': local_font_preconfigopts,
-    }),
-    #  Fails because it tries to create a directory outside of %(installdir)s
-    #  => test -z "<PKG_CONFIG-Fontconfig>/etc/fonts/conf.avail" ||
-    #              /usr/bin/mkdir -p "<PKG_CONFIG-Fontconfig>/etc/fonts/conf.avail"
-    # ('font-bh-ttf', '1.0.3', {
-    #     'source_urls': ['https://www.x.org/pub/individual/font/'],
-    #     'sources': ['%(name)s-%(version)s.tar.gz'],
-    #     'checksums': [('sha256', 'c583b4b968ffae6ea30d5b74041afeac83126682c490a9624b770d60d0e63d59')],
-    #     'preconfigopts': local_font_preconfigopts,
-    # }),
-    ('font-bh-type1', '1.0.3', {
-        'source_urls': ['https://www.x.org/pub/individual/font/'],
-        'sources': ['%(name)s-%(version)s.tar.gz'],
-        'checksums': [('sha256', 'd5602f1d749ccd31d3bc1bb6f0c5d77400de0e5e3ac5abebd2a867aa2a4081a4')],
-        'preconfigopts': local_font_preconfigopts,
-    }),
-    ('font-ibm-type1', '1.0.3', {
-        'source_urls': ['https://www.x.org/pub/individual/font/'],
-        'sources': ['%(name)s-%(version)s.tar.gz'],
-        'checksums': [('sha256', '4509703e9e581061309cf4823bffd4a93f10f48fe192a1d8be1f183fd6ab9711')],
-        'preconfigopts': local_font_preconfigopts,
-    }),
-    ('font-misc-ethiopic', '1.0.4', {
-        'source_urls': ['https://www.x.org/pub/individual/font/'],
-        'sources': ['%(name)s-%(version)s.tar.gz'],
-        'checksums': [('sha256', 'f7901250fb746815065cfe13a814d92260348fede28d61dcab0d05c5d8eafd54')],
-        'preconfigopts': local_font_preconfigopts,
-    }),
-    ('font-xfree86-type1', '1.0.4', {
-        'source_urls': ['https://www.x.org/pub/individual/font/'],
-        'sources': ['%(name)s-%(version)s.tar.gz'],
-        'checksums': [('sha256', '02b3839ae79ba6a7750525bb3b0c281305664b95bf63b4a0baa230a277b4f928')],
-        'preconfigopts': local_font_preconfigopts,
-    }),
-    ('xkbcomp', '1.4.5', {
-        'source_urls': ['https://www.x.org/archive//individual/app/'],
-        'checksums': ['e88a4d86b9925ea1e8685dd5ea29c815abafb8ddf19bf5f1a1e0650839252c23'],
-    }),
-    ('xkeyboard-config', '2.34', {
-        'source_urls': ['https://www.x.org/archive//individual/data/xkeyboard-config/'],
-        'checksums': ['a5882238b4199ca90428aea102790aaa847e6e214653d956bf2abba3027107ba'],
-        'configopts': '--with-xkb-rules-symlink=xorg',
-    }),
-    ('xauth', '1.1', {
-        'source_urls': ['https://www.x.org/releases/individual/app/'],
-        'checksums': ['e9fce796c8c5c9368594b9e8bbba237fb54b6615f5fd60e8d0a5b3c52a92c5ef'],
-    }),
-    ('xorg-server', version, {
-        'easyblock': 'MesonNinja',
-        'patches': [('xvfb-run', '.')],
-        'checksums': [
-            ('sha256', '26f801f4d92216995f389873cf3b4e90069cf63e94bc5dd09ebbf7fd7e1ddcc2'),
-            ('sha256', 'fd6d13182b77871d4f65fccdaebb8a72387a726426066d3f8e6aa26b010ea0e8'),
-        ],
-        'configopts': local_xorg_configopts,
-    }),
-    ('xf86-video-dummy', '0.3.8', {
-        'preconfigopts': 'PKG_CONFIG_PATH=$PKG_CONFIG_PATH:%(installdir)s/lib/pkgconfig',
-        'checksums': [
-            # xf86-video-dummy-0.3.8.tar.gz
-            ('sha256', 'ee5ad51e80c8cc90d4c76ac3dec2269a3c769f4232ed418b29d60d618074631b'),
-            # 0002-Constant-DPI.patch
-            ('sha256', '3add13392168d271822e694aba21327dc3219f61f2091a12ef7009d3f090c662'),
-            # 0003-fix-pointer-limits.patch
-            ('sha256', '8af95b0b0e7f4d7de3bd1654260c3677d76ef91b8d6a66cb57b9c3af1e024fa2'),
-            # 0005-support-for-30-bit-depth-in-dummy-driver.patch
-            ('sha256', 'b5109de020e2c416fddedc26ba5ac4b375c15e3675b7f951b23b03aab4af3472'),
-        ],
-        'patches': [
-            '0002-Constant-DPI.patch',
-            '0003-fix-pointer-limits.patch',
-            '0005-support-for-30-bit-depth-in-dummy-driver.patch'
-        ],
-    }),
-    ('xterm', '369', {
-        'source_urls': ['http://invisible-mirror.net/archives/xterm/'],
-        'sources': ['%(name)s-%(version)s.tgz'],
-        'checksums': [
-            # xterm-369.tgz
-            ('sha256', '71ed6a48d064893d2149741a002781a973496fd24d52dadd364f63439a764e26'),
-            # xterm-cursesloc.patch
-            ('sha256', 'ff15331ba1a2c67f68e3da3595ffc457d7aea5392a75d8cdfe40e2126ece99a2'),
-        ],
-        'patches': ['xterm-cursesloc.patch'],
-        'configopts': " --with-app-defaults=%(installdir)s/app-defaults ",
-    }),
-]
-
-# we need to set the permissions our self to ensure no-one messes in this directory
-# FIXME: easybuild does not support this in 4.3.0 -> hence you have to do it manually
-skipsteps = ['permissions']
-postinstallcmds = [
-    'chmod -R ugo-w %(installdir)s/config',
-    'chmod -R ugo-w %(installdir)s/share',
-    'install -m 0755 %(builddir)s/xorg-server-%(version)s/xvfb-run %(installdir)s/bin/',
-]
-
-modextrapaths = {
-    'XDG_CONFIG_DIRS': 'config',
-    'XUSERFILESEARCHPATH': 'app-defaults/%N-%C',
-}
-
-# FONTCONFIG_FILE is used to override the default configuration file
-modextravars = {
-    'FONTCONFIG_FILE': '%(installdir)s/config/fontconfig/fonts.conf'}
-
-sanity_check_paths = {
-    'files': ['bin/Xorg', 'bin/Xvfb', 'bin/xvfb-run',
-              'lib/xorg/modules/drivers/dummy_drv.la', 'lib/xorg/modules/drivers/dummy_drv.so',
-              'bin/xterm'],
-    'dirs': [],
-}
-
-sanity_check_commands = [
-    "xvfb-run --help",
-    "xvfb-run --error-file %(builddir)s/xvfb-run-test.err echo hello",
-]
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/x/XServer/xterm-cursesloc.patch b/Golden_Repo/x/XServer/xterm-cursesloc.patch
deleted file mode 100644
index 033c2776b..000000000
--- a/Golden_Repo/x/XServer/xterm-cursesloc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur xterm-362.orig/xtermcap.h xterm-362/xtermcap.h
---- xterm-362.orig/xtermcap.h	2013-06-23 17:34:37.000000000 +0200
-+++ xterm-362/xtermcap.h	2021-02-16 14:00:48.976219215 +0100
-@@ -59,7 +59,7 @@
- #undef ERR			/* workaround for glibc 2.1.3 */
- 
- #ifdef HAVE_NCURSES_CURSES_H
--#include <ncurses/curses.h>
-+#include <curses.h>
- #else
- #include <curses.h>
- #endif
diff --git a/Golden_Repo/x/XServer/xvfb-run b/Golden_Repo/x/XServer/xvfb-run
deleted file mode 100644
index 237e0dfc5..000000000
--- a/Golden_Repo/x/XServer/xvfb-run
+++ /dev/null
@@ -1,194 +0,0 @@
-#!/bin/sh
-
-# extracted from Debian package for xorg-server,
-# via http://deb.debian.org/debian/pool/main/x/xorg-server/xorg-server_1.20.4-1.diff.gz
-
-# This script starts an instance of Xvfb, the "fake" X server, runs a command
-# with that server available, and kills the X server when done.  The return
-# value of the command becomes the return value of this script.
-#
-# If anyone is using this to build a Debian package, make sure the package
-# Build-Depends on xvfb and xauth.
-
-set -e
-
-PROGNAME=xvfb-run
-SERVERNUM=99
-AUTHFILE=
-ERRORFILE=/dev/null
-XVFBARGS="-screen 0 1280x1024x24"
-LISTENTCP="-nolisten tcp"
-XAUTHPROTO=.
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user.  This is used only as a fallback in the event
-# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
-# script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
-case "$DEFCOLUMNS" in
-    *[!0-9]*|'') DEFCOLUMNS=80 ;;
-esac
-
-# Display a message, wrapping lines at the terminal width.
-message () {
-    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
-}
-
-# Display an error message.
-error () {
-    message "error: $*" >&2
-}
-
-# Display a usage message.
-usage () {
-    if [ -n "$*" ]; then
-        message "usage error: $*"
-    fi
-    cat <<EOF
-Usage: $PROGNAME [OPTION ...] COMMAND
-Run COMMAND (usually an X client) in a virtual X server environment.
-Options:
--a        --auto-servernum          try to get a free server number, starting at
-                                    --server-num
--e FILE   --error-file=FILE         file used to store xauth errors and Xvfb
-                                    output (default: $ERRORFILE)
--f FILE   --auth-file=FILE          file used to store auth cookie
-                                    (default: ./.Xauthority)
--h        --help                    display this usage message and exit
--n NUM    --server-num=NUM          server number to use (default: $SERVERNUM)
--l        --listen-tcp              enable TCP port listening in the X server
--p PROTO  --xauth-protocol=PROTO    X authority protocol name to use
-                                    (default: xauth command's default)
--s ARGS   --server-args=ARGS        arguments (other than server number and
-                                    "-nolisten tcp") to pass to the Xvfb server
-                                    (default: "$XVFBARGS")
-EOF
-}
-
-# Find a free server number by looking at .X*-lock files in /tmp.
-find_free_servernum() {
-    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
-    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
-    # anyway.
-    #local i
-
-    i=$SERVERNUM
-    while [ -f /tmp/.X$i-lock ]; do
-        i=$(($i + 1))
-    done
-    echo $i
-}
-
-# Clean up files
-clean_up() {
-    if [ -e "$AUTHFILE" ]; then
-        XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >>"$ERRORFILE" 2>&1
-    fi
-    if [ -n "$XVFB_RUN_TMPDIR" ]; then
-        if ! rm -r "$XVFB_RUN_TMPDIR"; then
-            error "problem while cleaning up temporary directory"
-            exit 5
-        fi
-    fi
-    if [ -n "$XVFBPID" ]; then
-        kill "$XVFBPID" >>"$ERRORFILE" 2>&1
-    fi
-}
-
-# Parse the command line.
-ARGS=$(getopt --options +ae:f:hn:lp:s:w: \
-       --long auto-servernum,error-file:,auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
-       --name "$PROGNAME" -- "$@")
-GETOPT_STATUS=$?
-
-if [ $GETOPT_STATUS -ne 0 ]; then
-    error "internal error; getopt exited with status $GETOPT_STATUS"
-    exit 6
-fi
-
-eval set -- "$ARGS"
-
-while :; do
-    case "$1" in
-        -a|--auto-servernum) SERVERNUM=$(find_free_servernum); AUTONUM="yes" ;;
-        -e|--error-file) ERRORFILE="$2"; shift ;;
-        -f|--auth-file) AUTHFILE="$2"; shift ;;
-        -h|--help) SHOWHELP="yes" ;;
-        -n|--server-num) SERVERNUM="$2"; shift ;;
-        -l|--listen-tcp) LISTENTCP="" ;;
-        -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
-        -s|--server-args) XVFBARGS="$2"; shift ;;
-        -w|--wait) shift ;;
-        --) shift; break ;;
-        *) error "internal error; getopt permitted \"$1\" unexpectedly"
-           exit 6
-           ;;
-    esac
-    shift
-done
-
-if [ "$SHOWHELP" ]; then
-    usage
-    exit 0
-fi
-
-if [ -z "$*" ]; then
-    usage "need a command to run" >&2
-    exit 2
-fi
-
-if ! command -v xauth >/dev/null; then
-    error "xauth command not found"
-    exit 3
-fi
-
-# tidy up after ourselves
-trap clean_up EXIT
-
-# If the user did not specify an X authorization file to use, set up a temporary
-# directory to house one.
-if [ -z "$AUTHFILE" ]; then
-    XVFB_RUN_TMPDIR="$(mktemp -d -t $PROGNAME.XXXXXX)"
-    AUTHFILE="$XVFB_RUN_TMPDIR/Xauthority"
-    # Create empty file to avoid xauth warning
-    touch "$AUTHFILE"
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-tries=10
-while [ $tries -gt 0 ]; do
-    tries=$(( $tries - 1 ))
-    XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
-add :$SERVERNUM $XAUTHPROTO $MCOOKIE
-EOF
-    # handle SIGUSR1 so Xvfb knows to send a signal when it's ready to accept
-    # connections
-    trap : USR1
-    (trap '' USR1; exec Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP -auth $AUTHFILE >>"$ERRORFILE" 2>&1) &
-    XVFBPID=$!
-
-    wait || :
-    if kill -0 $XVFBPID 2>/dev/null; then
-        break
-    elif [ -n "$AUTONUM" ]; then
-        # The display is in use so try another one (if '-a' was specified).
-        SERVERNUM=$((SERVERNUM + 1))
-        SERVERNUM=$(find_free_servernum)
-        continue
-    fi
-    error "Xvfb failed to start" >&2
-    XVFBPID=
-    exit 1
-done
-
-# Start the command and save its exit status.
-set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@"
-RETVAL=$?
-set -e
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:
diff --git a/Golden_Repo/x/XZ/XZ-5.2.5-GCCcore-11.2.0.eb b/Golden_Repo/x/XZ/XZ-5.2.5-GCCcore-11.2.0.eb
deleted file mode 100644
index dab0fc80a..000000000
--- a/Golden_Repo/x/XZ/XZ-5.2.5-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,38 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'XZ'
-version = '5.2.5'
-
-homepage = 'https://tukaani.org/xz/'
-description = "xz: XZ utilities"
-
-site_contacts = 'sc@fz-juelich.de'
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://tukaani.org/xz/']
-sources = [SOURCELOWER_TAR_BZ2]
-checksums = [
-    '5117f930900b341493827d63aa910ff5e011e0b994197c3b71c08a20228a42df',  # xz-5.2.5.tar.bz2
-]
-
-builddependencies = [
-    # use gettext built with system toolchain as build dep to avoid cyclic dependency (XZ -> gettext -> libxml2 -> XZ)
-    ('gettext', '0.21', '', SYSTEM),
-    ('binutils', '2.37'),
-]
-
-# may become useful in non-x86 archs
-# configopts = ' --disable-assembler '
-
-sanity_check_paths = {
-    'files': ['bin/lzmainfo', 'bin/unxz', 'bin/xz'],
-    'dirs': []
-}
-
-sanity_check_commands = [
-    "xz --help",
-    "unxz --help",
-]
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/x/x264/x264-20210613-GCCcore-11.2.0.eb b/Golden_Repo/x/x264/x264-20210613-GCCcore-11.2.0.eb
deleted file mode 100644
index fa5816092..000000000
--- a/Golden_Repo/x/x264/x264-20210613-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,37 +0,0 @@
-# Built with EasyBuild version 4.4.0 on 2021-06-21_11-34-32
-easyblock = 'ConfigureMake'
-
-name = 'x264'
-version = '20210613'
-
-homepage = 'http://www.videolan.org/developers/x264.html'
-description = """x264 is a free software library and application for encoding video streams into the H.264/MPEG-4
- AVC compression format, and is released under the terms of the GNU GPL.
-"""
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [
-    'https://code.videolan.org/videolan/x264/-/archive/5db6aa6cab1b146e07b60cc1736a01f21da01154/']
-sources = ['x264-5db6aa6cab1b146e07b60cc1736a01f21da01154.tar.gz']
-checksums = ['e55e5ab8bec0897ef83ddf71b2c8969ea377a9cd4cb097ba5dca115a23e18ef9']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('NASM', '2.15.05'),
-]
-
-configopts = "  --enable-shared --enable-static --bashcompletionsdir=%(installdir)s/share/bash-completion/completions "
-
-sanity_check_paths = {
-    'files': ['bin/x264', 'include/x264_config.h', 'include/x264.h', 'lib/libx264.a', 'lib/libx264.%s' % SHLIB_EXT],
-    'dirs': [],
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/x/x265/x265-3.4-GCCcore-11.2.0.eb b/Golden_Repo/x/x265/x265-3.4-GCCcore-11.2.0.eb
deleted file mode 100644
index d00ffab2a..000000000
--- a/Golden_Repo/x/x265/x265-3.4-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,40 +0,0 @@
-# Built with EasyBuild version 4.4.0 on 2021-06-21_13-49-26
-easyblock = 'CMakeMake'
-
-name = 'x265'
-version = '3.4'
-
-homepage = 'https://www.videolan.org/developers/x265.html'
-description = """x265 is a free software library and application for encoding video streams
- into the H.265/MPEG-H HEVC compression format, and is released under the terms of the GNU GPL.
-"""
-
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/videolan/x265/archive/']
-sources = ['%(version)s.tar.gz']
-checksums = ['544d147bf146f8994a7bf8521ed878c93067ea1c7c6e93ab602389be3117eaaf']
-
-builddependencies = [
-    ('CMake', '3.21.1', '', SYSTEM),
-    ('binutils', '2.37'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('NASM', '2.15.05'),
-]
-
-separate_build_dir = True
-srcdir = '../x265-%(version)s/source'
-
-configopts = '-DCMAKE_VERBOSE_MAKEFILE=ON '
-
-sanity_check_paths = {
-    'files': ['bin/x265', 'include/x265_config.h', 'include/x265.h', 'lib/libx265.a', 'lib/libx265.%s' % SHLIB_EXT],
-    'dirs': [],
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/x/xarray/xarray-0.20.1-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/x/xarray/xarray-0.20.1-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index e4c9cfa1f..000000000
--- a/Golden_Repo/x/xarray/xarray-0.20.1-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,25 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'xarray'
-version = '0.20.1'
-
-homepage = 'https://github.com/pydata/xarray'
-description = """xarray (formerly xray) is an open source project and Python package that aims to bring
- the labeled data power of pandas to the physical sciences, by providing N-dimensional variants of the
- core pandas data structures."""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-sources = [SOURCE_TAR_GZ]
-checksums = ['9c0bffd8b55fdef277f8f6c817153eb51fa4e58653a7ad92eaed9984164b7bdb']
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10'),  # required for numpy, pandas
-]
-
-download_dep_fail = True
-use_pip = True
-sanity_pip_check = True
-
-moduleclass = 'data'
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
deleted file mode 100644
index 5b6753c1e..000000000
--- a/Golden_Repo/x/xorg-macros/xorg-macros-1.19.3-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,31 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'xorg-macros'
-version = '1.19.3'
-
-homepage = 'https://cgit.freedesktop.org/xorg/util/macros'
-description = """X.org macros utilities."""
-
-site_contacts = 'sc@fz-juelich.de'
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [
-    'https://gitlab.freedesktop.org/xorg/util/macros/-/archive/util-macros-%(version)s'
-]
-sources = ['macros-util-macros-%(version)s.tar.gz']
-checksums = ['8205d210a580da0938f5ce4392a96b60cf1d9a5f792eaa1474fa4c1977aef4d0']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Autotools', '20210726'),
-]
-
-preconfigopts = './autogen.sh && '
-
-sanity_check_paths = {
-    'files': ['share/pkgconfig/xorg-macros.pc'],
-    'dirs': [],
-}
-
-moduleclass = 'devel'
diff --git a/Golden_Repo/x/xpra/xpra-4.0.4-use_Xorg_on_PATH_first.patch b/Golden_Repo/x/xpra/xpra-4.0.4-use_Xorg_on_PATH_first.patch
deleted file mode 100644
index dadb13492..000000000
--- a/Golden_Repo/x/xpra/xpra-4.0.4-use_Xorg_on_PATH_first.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naur xpra-4.0.4.orig/xpra/scripts/config.py xpra-4.0.4/xpra/scripts/config.py
---- xpra-4.0.4.orig/xpra/scripts/config.py      2020-09-27 20:11:39.000000000 +0200
-+++ xpra-4.0.4/xpra/scripts/config.py   2020-11-11 19:18:28.619408000 +0100
-@@ -60,6 +60,13 @@
-
- def get_xorg_bin():
-     # Detect Xorg Binary
-+
-+    #look for it in $PATH:
-+    for x in os.environ.get("PATH").split(os.pathsep): # pragma: no cover
-+        xorg = os.path.join(x, "Xorg")
-+        if os.path.isfile(xorg):
-+            return xorg
-+
-     if is_arm() and is_Debian() and os.path.exists("/usr/bin/Xorg"):
-         #Raspbian breaks if we use a different binary..
-         return "/usr/bin/Xorg"
-@@ -72,11 +79,6 @@
-               ):
-         if os.path.exists(p):
-             return p
--    #look for it in $PATH:
--    for x in os.environ.get("PATH").split(os.pathsep): # pragma: no cover
--        xorg = os.path.join(x, "Xorg")
--        if os.path.isfile(xorg):
--            return xorg
-     return None
-
diff --git a/Golden_Repo/x/xpra/xpra-4.3.3-GCCcore-11.2.0.eb b/Golden_Repo/x/xpra/xpra-4.3.3-GCCcore-11.2.0.eb
deleted file mode 100644
index b3f07b5d0..000000000
--- a/Golden_Repo/x/xpra/xpra-4.3.3-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,162 +0,0 @@
-easyblock = 'Bundle'
-
-name = 'xpra'
-version = '4.3.3'
-
-homepage = "http://www.xpra.org"
-description = """Xpra is an open-source multi-platform persistent remote display server and client
-for forwarding applications and desktop screens.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('pkg-config', '0.29.2'),
-    ('Brotli', '1.0.9'),
-    ('uglifyjs', '3.14.3'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('X11', '20210802'),
-    ('OpenGL', '2021b'),
-    ('SciPy-Stack', '2021b', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('PyCairo', '1.20.1'),
-    ('PyGObject', '3.42.0'),
-    ('Pandoc', '2.16.1', '', SYSTEM),
-    ('GTK+', '3.24.23'),
-    ('rencode', '1.0.5'),
-    ('lz4', '1.9.3'),
-    ('yuicompressor', '2.4.8'),
-    ('x264', '20210613'),
-    ('x265', '3.4'),
-    ('libvpx', '1.11.0'),
-    ('FFmpeg', '4.4.1'),
-    ('GStreamer', '1.18.6'),
-    ('libwebp', '1.2.0'),
-    ('libpng', '1.6.37'),
-    ('libspng', '0.7.1'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('zlib', '1.2.11'),
-    ('LibTIFF', '4.3.0'),
-    ('nvidia-Video_Codec_SDK', '11.1.5', '', SYSTEM),
-    ('freetype', '2.11.0'),
-    ('libyuv', '20210428'),
-    ('DBus', '1.13.18'),
-    ('XServer', '1.20.13'),
-    ('CUDA', '11.5', '', SYSTEM),
-]
-
-prebuildopts = 'export CFLAGS="-Wno-error=unused-function" && '
-
-# this is a bundle of Python packages
-exts_defaultclass = 'PythonPackage'
-exts_default_options = {
-    'use_pip': True,
-    'source_urls': [PYPI_SOURCE],
-    'sanity_pip_check':  True,
-    'use_pip_for_deps': False,
-    'download_dep_fail': True,
-}
-
-exts_list = [
-    ('pyinotify', '0.9.6', {
-        'checksums': ['9c998a5d7606ca835065cdabc013ae6c66eb9ea76a00a1e3bc6e0cfe2b4f71f4'],
-    }),
-    ('dbus-python', '1.2.18', {
-        'checksums': ['92bdd1e68b45596c833307a5ff4b217ee6929a1502f5341bae28fd120acf7260'],
-        'modulename': 'dbus',
-    }),
-    ('pyxdg', '0.27', {
-        'checksums': ['80bd93aae5ed82435f20462ea0208fb198d8eec262e831ee06ce9ddb6b91c5a5'],
-        'modulename': 'xdg',
-    }),
-    ('python-uinput', '0.11.2', {
-        'checksums': ['99392b676c77b5795b86b7d75274db33fe754fd1e06fb3d58b167c797dc47f0c'],
-        'modulename': 'uinput',
-    }),
-    ('ifaddr', '0.1.7', {
-        'checksums': ['1f9e8a6ca6f16db5a37d3356f07b6e52344f6f9f7e806d618537731669eb1a94'],
-    }),
-    ('zeroconf', '0.38.4', {
-        'checksums': ['080c540ea4b8b9defa9f3ac05823c1725ea2c8aacda917bfc0193f6758b95aeb'],
-    }),
-    ('xpra', '4.3.3', {
-        'source_urls': ['https://github.com/Xpra-org/%(name)s/archive/'],
-        'source_tmpl': 'v%(version)s.tar.gz',
-        'patches': [
-            'xpra-4.0.4-use_Xorg_on_PATH_first.patch',
-            'xpra-iconsearch-XDG_DATA_DIRS.patch',
-        ],
-        'checksums': [
-            '06009ea2cd41b3ffaab51b01e29bb4d9e635ead795d378575f5379e5cb166a83',
-            '83053938421de4dfd4ff8cd5430414180e9f33d5c59b4f1c1428095db6b1fa71',
-            '7bb677302308dacdc55f9a862b6eee43f0a8d2b4524a8dec6d80bcdf3982d6af',
-        ],
-        'use_pip': False,
-        'buildopts': '--without-strict --with-nvenc --with-nvjpeg --with-Xdummy',
-        'installopts': '--with-tests --without-service',
-    }),
-    ('xpra-html5', '5.0', {
-        'source_urls': ['https://github.com/Xpra-org/%(name)s/archive/'],
-        'source_tmpl': 'v%(version)s.tar.gz',
-        'checksums': ['0e70566bfd91eb4eaae1deb2746812efeebce2ba8140ef3a3bb0be3dd0d0b230'],
-        'use_pip': False,
-        'skipsteps': ['configure', 'build', 'install'],  # install in postinstallcmds
-        'modulename': 'xpra',
-    }),
-]
-
-postinstallcmds = [
-    (
-        # installing xpra-html5
-        'pushd %(builddir)s/xprahtml5/xpra-html5-5.0 && '
-        './setup.py install %(installdir)s /share/xpra/www /etc/xpra/html5-client && '
-        'popd'
-    ),
-    # set specific configurations
-    (
-        # server config
-        'touch %(installdir)s/etc/xpra/server.env && '
-        "sed -i 's!^source =.*!source = %(installdir)s/etc/xpra/server.env!' "
-        "       %(installdir)s/etc/xpra/conf.d/60_server.conf"
-    ),
-    # make Xpra randomly choose a GPU for acceleration if present
-    'mv %(installdir)s/bin/xpra %(installdir)s/bin/xpra.orig',
-    'head -1 %(installdir)s/bin/xpra.orig > %(installdir)s/bin/xpra',
-    (
-        '{ cat >> %(installdir)s/bin/xpra; } << \'EOF\'\n'
-        'from os import environ \n'
-        'if not \'CUDA_VISIBLE_DEVICES\' in environ: \n'
-        '  try: \n'
-        '    from pycuda import driver \n'
-        '    driver.init() \n'
-        '    num_gpus = driver.Device.count() \n'
-        '  except: \n'
-        '    num_gpus = 0 \n'
-        '\n'
-        '  if num_gpus > 0: \n'
-        '    from random import randint \n'
-        '    active_gpuid=randint(0,num_gpus-1) \n'
-        '    environ[\'CUDA_VISIBLE_DEVICES\'] = str(active_gpuid) \n'
-        'EOF'
-    ),
-    'tail -n +2 %(installdir)s/bin/xpra.orig >> %(installdir)s/bin/xpra',
-    'chmod +x %(installdir)s/bin/xpra',
-]
-
-modextravars = {
-    'XPRA_SYSTEM_CONF_DIRS': '%(installdir)s/etc/xpra',
-}
-modextrapaths = {
-    'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-sanity_check_paths = {
-    'files': ['bin/xpra'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/x/xpra/xpra-4.3.4-GCCcore-11.2.0.eb b/Golden_Repo/x/xpra/xpra-4.3.4-GCCcore-11.2.0.eb
deleted file mode 100644
index edf929514..000000000
--- a/Golden_Repo/x/xpra/xpra-4.3.4-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,162 +0,0 @@
-easyblock = 'Bundle'
-
-name = 'xpra'
-version = '4.3.4'
-
-homepage = "http://www.xpra.org"
-description = """Xpra is an open-source multi-platform persistent remote display server and client
-for forwarding applications and desktop screens.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('pkg-config', '0.29.2'),
-    ('Brotli', '1.0.9'),
-    ('uglifyjs', '3.14.3'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('X11', '20210802'),
-    ('OpenGL', '2021b'),
-    ('SciPy-Stack', '2021b', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('PyCairo', '1.20.1'),
-    ('PyGObject', '3.42.0'),
-    ('Pandoc', '2.16.1', '', SYSTEM),
-    ('GTK+', '3.24.23'),
-    ('rencode', '1.0.5'),
-    ('lz4', '1.9.3'),
-    ('yuicompressor', '2.4.8'),
-    ('x264', '20210613'),
-    ('x265', '3.4'),
-    ('libvpx', '1.11.0'),
-    ('FFmpeg', '4.4.1'),
-    ('GStreamer', '1.18.6'),
-    ('libwebp', '1.2.0'),
-    ('libpng', '1.6.37'),
-    ('libspng', '0.7.1'),
-    ('libjpeg-turbo', '2.1.1'),
-    ('zlib', '1.2.11'),
-    ('LibTIFF', '4.3.0'),
-    ('nvidia-Video_Codec_SDK', '11.1.5', '', SYSTEM),
-    ('freetype', '2.11.0'),
-    ('libyuv', '20210428'),
-    ('DBus', '1.13.18'),
-    ('XServer', '1.20.13'),
-    ('CUDA', '11.5', '', SYSTEM),
-]
-
-prebuildopts = 'export CFLAGS="-Wno-error=unused-function" && '
-
-# this is a bundle of Python packages
-exts_defaultclass = 'PythonPackage'
-exts_default_options = {
-    'use_pip': True,
-    'source_urls': [PYPI_SOURCE],
-    'sanity_pip_check':  True,
-    'use_pip_for_deps': False,
-    'download_dep_fail': True,
-}
-
-exts_list = [
-    ('pyinotify', '0.9.6', {
-        'checksums': ['9c998a5d7606ca835065cdabc013ae6c66eb9ea76a00a1e3bc6e0cfe2b4f71f4'],
-    }),
-    ('dbus-python', '1.2.18', {
-        'checksums': ['92bdd1e68b45596c833307a5ff4b217ee6929a1502f5341bae28fd120acf7260'],
-        'modulename': 'dbus',
-    }),
-    ('pyxdg', '0.27', {
-        'checksums': ['80bd93aae5ed82435f20462ea0208fb198d8eec262e831ee06ce9ddb6b91c5a5'],
-        'modulename': 'xdg',
-    }),
-    ('python-uinput', '0.11.2', {
-        'checksums': ['99392b676c77b5795b86b7d75274db33fe754fd1e06fb3d58b167c797dc47f0c'],
-        'modulename': 'uinput',
-    }),
-    ('ifaddr', '0.1.7', {
-        'checksums': ['1f9e8a6ca6f16db5a37d3356f07b6e52344f6f9f7e806d618537731669eb1a94'],
-    }),
-    ('zeroconf', '0.38.4', {
-        'checksums': ['080c540ea4b8b9defa9f3ac05823c1725ea2c8aacda917bfc0193f6758b95aeb'],
-    }),
-    ('xpra', version, {
-        'source_urls': ['https://github.com/Xpra-org/%(name)s/archive/'],
-        'source_tmpl': 'v%(version)s.tar.gz',
-        'patches': [
-            'xpra-4.0.4-use_Xorg_on_PATH_first.patch',
-            'xpra-iconsearch-XDG_DATA_DIRS.patch',
-        ],
-        'checksums': [
-            '11a213afaa012667957ff2f1368f11068d49daf654a7ab0c73d71ba1ef75e2b2',
-            '83053938421de4dfd4ff8cd5430414180e9f33d5c59b4f1c1428095db6b1fa71',
-            '7bb677302308dacdc55f9a862b6eee43f0a8d2b4524a8dec6d80bcdf3982d6af',
-        ],
-        'use_pip': False,
-        'buildopts': '--without-strict --with-nvenc --with-nvjpeg --with-Xdummy',
-        'installopts': '--with-tests --without-service',
-    }),
-    ('xpra-html5', '5.0', {
-        'source_urls': ['https://github.com/Xpra-org/%(name)s/archive/'],
-        'source_tmpl': 'v%(version)s.tar.gz',
-        'checksums': ['0e70566bfd91eb4eaae1deb2746812efeebce2ba8140ef3a3bb0be3dd0d0b230'],
-        'use_pip': False,
-        'skipsteps': ['configure', 'build', 'install'],  # install in postinstallcmds
-        'modulename': 'xpra',
-    }),
-]
-
-postinstallcmds = [
-    (
-        # installing xpra-html5
-        'pushd %(builddir)s/xprahtml5/xpra-html5-5.0 && '
-        './setup.py install %(installdir)s /share/xpra/www /etc/xpra/html5-client && '
-        'popd'
-    ),
-    # set specific configurations
-    (
-        # server config
-        'touch %(installdir)s/etc/xpra/server.env && '
-        "sed -i 's!^source =.*!source = %(installdir)s/etc/xpra/server.env!' "
-        "       %(installdir)s/etc/xpra/conf.d/60_server.conf"
-    ),
-    # make Xpra randomly choose a GPU for acceleration if present
-    'mv %(installdir)s/bin/xpra %(installdir)s/bin/xpra.orig',
-    'head -1 %(installdir)s/bin/xpra.orig > %(installdir)s/bin/xpra',
-    (
-        '{ cat >> %(installdir)s/bin/xpra; } << \'EOF\'\n'
-        'from os import environ \n'
-        'if not \'CUDA_VISIBLE_DEVICES\' in environ: \n'
-        '  try: \n'
-        '    from pycuda import driver \n'
-        '    driver.init() \n'
-        '    num_gpus = driver.Device.count() \n'
-        '  except: \n'
-        '    num_gpus = 0 \n'
-        '\n'
-        '  if num_gpus > 0: \n'
-        '    from random import randint \n'
-        '    active_gpuid=randint(0,num_gpus-1) \n'
-        '    environ[\'CUDA_VISIBLE_DEVICES\'] = str(active_gpuid) \n'
-        'EOF'
-    ),
-    'tail -n +2 %(installdir)s/bin/xpra.orig >> %(installdir)s/bin/xpra',
-    'chmod +x %(installdir)s/bin/xpra',
-]
-
-modextravars = {
-    'XPRA_SYSTEM_CONF_DIRS': '%(installdir)s/etc/xpra',
-}
-modextrapaths = {
-    'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-sanity_check_paths = {
-    'files': ['bin/xpra'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/x/xpra/xpra-iconsearch-XDG_DATA_DIRS.patch b/Golden_Repo/x/xpra/xpra-iconsearch-XDG_DATA_DIRS.patch
deleted file mode 100644
index f5afb0bbd..000000000
--- a/Golden_Repo/x/xpra/xpra-iconsearch-XDG_DATA_DIRS.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur xpra.orig/xpra/platform/xposix/menu_helper.py xpra/xpra/platform/xposix/menu_helper.py
---- a/xpra.orig/xpra/platform/xposix/menu_helper.py	2022-03-30 23:59:37.274275428 +0200
-+++ a/xpra/xpra/platform/xposix/menu_helper.py	2022-03-31 00:06:49.279245408 +0200
-@@ -177,8 +177,9 @@
- def find_pixmap_icon(*names):
-     if not LOAD_FROM_PIXMAPS:
-         return None
-+    pixmaps_dirs = [d + '/icons' for d in os.environ.get("XDG_DATA_DIRS").split(":")]
-     pixmaps_dir = "%s/share/pixmaps" % sys.prefix
--    pixmaps_dirs = (pixmaps_dir, os.path.join(pixmaps_dir, "comps"))
-+    pixmaps_dirs += (pixmaps_dir, os.path.join(pixmaps_dir, "comps"))
-     for d in pixmaps_dirs:
-         if not os.path.exists(d) or not os.path.isdir(d):
-             return None
-@@ -411,6 +412,8 @@
-         from xdg.Menu import MenuEntry
-         entries = {}
-         for d in LOAD_APPLICATIONS:
-+            if not os.path.exists(d):
-+                continue
-             for f in os.listdir(d):
-                 if not f.endswith(".desktop"):
-                     continue
diff --git a/Golden_Repo/x/xpra/xprahtml-4.5.2-encryptionfix.patch b/Golden_Repo/x/xpra/xprahtml-4.5.2-encryptionfix.patch
deleted file mode 100644
index 40ec1ed1d..000000000
--- a/Golden_Repo/x/xpra/xprahtml-4.5.2-encryptionfix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/html5/js/Protocol.js.orig    2022-03-28 12:59:40.198667996 +0200
-+++ b/html5/js/Protocol.js 2022-03-28 13:02:38.099943598 +0200
-@@ -631,6 +631,10 @@
- 		throw "unsupported encryption specified: '"+cipher+"'";
- 	}
- 	const key_salt = caps["cipher.key_salt"];
-+	let key_salt = caps["cipher.key_salt"];
-+	if (typeof key_salt !== 'string') {
-+		key_salt = String.fromCharCode.apply(null, key_salt);
-+	}
- 	const iterations = caps["cipher.key_stretch_iterations"];
- 	if (iterations<0) {
- 		throw "invalid number of iterations: "+iterations;
diff --git a/Golden_Repo/x/xprop/xprop-1.2.5-GCCcore-11.2.0.eb b/Golden_Repo/x/xprop/xprop-1.2.5-GCCcore-11.2.0.eb
deleted file mode 100644
index 6681455aa..000000000
--- a/Golden_Repo/x/xprop/xprop-1.2.5-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,32 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'xprop'
-version = '1.2.5'
-
-homepage = "https://www.x.org/wiki/"
-description = """The xprop utility is for displaying window and font properties in an X server.
- One window or font is selected using the command line arguments or possibly
- in the case of a window, by clicking on the desired window. A list of
- properties is then given, possibly with formatting information."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://ftp.x.org/archive/individual/app/']
-sources = [SOURCE_TAR_GZ]
-checksums = ['b7bf6b6be6cf23e7966a153fc84d5901c14f01ee952fbd9d930aa48e2385d670']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('X11', '20210802'),
-]
-
-sanity_check_paths = {
-    'files': ['bin/xprop'],
-    'dirs': [],
-}
-
-moduleclass = 'vis'
diff --git a/Golden_Repo/y/YACS/YACS-0.1.8-GCCcore-11.2.0.eb b/Golden_Repo/y/YACS/YACS-0.1.8-GCCcore-11.2.0.eb
deleted file mode 100644
index c38fe7797..000000000
--- a/Golden_Repo/y/YACS/YACS-0.1.8-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,31 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'YACS'
-version = '0.1.8'
-
-homepage = "https://github.com/rbgirshick/yacs"
-description = """YACS was created as a lightweight library to define and
-manage system configurations, such as those commonly found in software
-designed for scientific experimentation. These "configurations"
-typically cover concepts like hyperparameters used in training a machine
-learning model or configurable model hyperparameters, such as the depth
-of a convolutional neural network."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['efc4c732942b3103bea904ee89af98bcd27d01f0ac12d8d4d369f1e7a2914384']
-
-builddependencies = [('binutils', '2.37')]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('PyYAML', '5.4.1'),
-]
-
-use_pip = True
-download_dep_fail = True
-
-sanity_pip_check = True
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/y/YAXT/YAXT-0.9.1-gompi-2021b.eb b/Golden_Repo/y/YAXT/YAXT-0.9.1-gompi-2021b.eb
deleted file mode 100644
index 1a29499f3..000000000
--- a/Golden_Repo/y/YAXT/YAXT-0.9.1-gompi-2021b.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-# Warning: YAXT needs to be run from within an salloc, with a shared buildpath
-# Example:
-# ***** on clsuter *****
-# salloc --partition=devel --nodes=1 --time=01:30:00 --account=<  >
-# srun --cpu_bind=none --nodes=1 --pty /bin/bash -i
-# eb --buildpath=$HOME/temp  YAXT-0.9.1-ipsmpi-2020.eb
-# ***** on booster****
-# salloc --partition=develbooster --nodes=1 --gres=gpu:4 --account=< > --time=01:00:00
-#
-easyblock = 'ConfigureMake'
-
-name = 'YAXT'
-version = '0.9.1'
-
-homepage = 'https://www.dkrz.de/redmine/projects/yaxt'
-description = """Yet Another eXchange Tool"""
-
-toolchain = {'name': 'gompi', 'version': '2021b'}
-toolchainopts = {'usempi': True}
-
-source_urls = ['https://www.dkrz.de/redmine/attachments/download/506/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['c87ec59e29b3e4965ce2f8e614bd7f1597012b89af0fda4242f2eef06460794c']
-
-configopts = 'FC="$F90" FCFLAGS="$F90FLAGS -cpp"'
-
-preconfigopts = 'MPI_LAUNCH="$(which srun)"'
-
-sanity_check_paths = {
-    'files': ['include/yaxt.h', 'include/yaxt.mod', 'lib/libyaxt.a', 'lib/libyaxt.%s' % SHLIB_EXT],
-    'dirs': ['include/xt'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/y/YAXT/YAXT-0.9.1-gpsmpi-2021b.eb b/Golden_Repo/y/YAXT/YAXT-0.9.1-gpsmpi-2021b.eb
deleted file mode 100644
index cd051c1bf..000000000
--- a/Golden_Repo/y/YAXT/YAXT-0.9.1-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-# Warning: YAXT needs to be run from within an salloc, with a shared buildpath
-# Example:
-# ***** on clsuter *****
-# salloc --partition=devel --nodes=1 --time=01:30:00 --account=<  >
-# srun --cpu_bind=none --nodes=1 --pty /bin/bash -i
-# eb --buildpath=$HOME/temp  YAXT-0.9.1-ipsmpi-2020.eb
-# ***** on booster****
-# salloc --partition=develbooster --nodes=1 --gres=gpu:4 --account=< > --time=01:00:00
-#
-easyblock = 'ConfigureMake'
-
-name = 'YAXT'
-version = '0.9.1'
-
-homepage = 'https://www.dkrz.de/redmine/projects/yaxt'
-description = """Yet Another eXchange Tool"""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-toolchainopts = {'usempi': True}
-
-source_urls = ['https://www.dkrz.de/redmine/attachments/download/506/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['c87ec59e29b3e4965ce2f8e614bd7f1597012b89af0fda4242f2eef06460794c']
-
-configopts = 'FC="$F90" FCFLAGS="$F90FLAGS -cpp"'
-
-preconfigopts = 'MPI_LAUNCH="$(which srun)"'
-
-sanity_check_paths = {
-    'files': ['include/yaxt.h', 'include/yaxt.mod', 'lib/libyaxt.a', 'lib/libyaxt.%s' % SHLIB_EXT],
-    'dirs': ['include/xt'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/y/YAXT/YAXT-0.9.1-iimpi-2021b.eb b/Golden_Repo/y/YAXT/YAXT-0.9.1-iimpi-2021b.eb
deleted file mode 100644
index c83df3ff0..000000000
--- a/Golden_Repo/y/YAXT/YAXT-0.9.1-iimpi-2021b.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-# Warning: YAXT needs to be run from within an salloc, with a shared buildpath
-# Example:
-# ***** on clsuter *****
-# salloc --partition=devel --nodes=1 --time=01:30:00 --account=<  >
-# srun --cpu_bind=none --nodes=1 --pty /bin/bash -i
-# eb --buildpath=$HOME/temp  YAXT-0.9.1-ipsmpi-2020.eb
-# ***** on booster****
-# salloc --partition=develbooster --nodes=1 --gres=gpu:4 --account=< > --time=01:00:00
-#
-easyblock = 'ConfigureMake'
-
-name = 'YAXT'
-version = '0.9.1'
-
-homepage = 'https://www.dkrz.de/redmine/projects/yaxt'
-description = """Yet Another eXchange Tool"""
-
-toolchain = {'name': 'iimpi', 'version': '2021b'}
-toolchainopts = {'usempi': True}
-
-source_urls = ['https://www.dkrz.de/redmine/attachments/download/506/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['c87ec59e29b3e4965ce2f8e614bd7f1597012b89af0fda4242f2eef06460794c']
-
-configopts = 'FC="$F90" FCFLAGS="$F90FLAGS -cpp"'
-
-preconfigopts = 'MPI_LAUNCH="$(which srun)"'
-
-sanity_check_paths = {
-    'files': ['include/yaxt.h', 'include/yaxt.mod', 'lib/libyaxt.a', 'lib/libyaxt.%s' % SHLIB_EXT],
-    'dirs': ['include/xt'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/y/YAXT/YAXT-0.9.1-iompi-2021b.eb b/Golden_Repo/y/YAXT/YAXT-0.9.1-iompi-2021b.eb
deleted file mode 100644
index 66116a41e..000000000
--- a/Golden_Repo/y/YAXT/YAXT-0.9.1-iompi-2021b.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-# Warning: YAXT needs to be run from within an salloc, with a shared buildpath
-# Example:
-# ***** on clsuter *****
-# salloc --partition=devel --nodes=1 --time=01:30:00 --account=<  >
-# srun --cpu_bind=none --nodes=1 --pty /bin/bash -i
-# eb --buildpath=$HOME/temp  YAXT-0.9.1-ipsmpi-2020.eb
-# ***** on booster****
-# salloc --partition=develbooster --nodes=1 --gres=gpu:4 --account=< > --time=01:00:00
-#
-easyblock = 'ConfigureMake'
-
-name = 'YAXT'
-version = '0.9.1'
-
-homepage = 'https://www.dkrz.de/redmine/projects/yaxt'
-description = """Yet Another eXchange Tool"""
-
-toolchain = {'name': 'iompi', 'version': '2021b'}
-toolchainopts = {'usempi': True}
-
-source_urls = ['https://www.dkrz.de/redmine/attachments/download/506/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['c87ec59e29b3e4965ce2f8e614bd7f1597012b89af0fda4242f2eef06460794c']
-
-configopts = 'FC="$F90" FCFLAGS="$F90FLAGS -cpp"'
-
-preconfigopts = 'MPI_LAUNCH="$(which srun)"'
-
-sanity_check_paths = {
-    'files': ['include/yaxt.h', 'include/yaxt.mod', 'lib/libyaxt.a', 'lib/libyaxt.%s' % SHLIB_EXT],
-    'dirs': ['include/xt'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/y/YAXT/YAXT-0.9.1-ipsmpi-2021b.eb b/Golden_Repo/y/YAXT/YAXT-0.9.1-ipsmpi-2021b.eb
deleted file mode 100644
index 46a7f05ad..000000000
--- a/Golden_Repo/y/YAXT/YAXT-0.9.1-ipsmpi-2021b.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-# Warning: YAXT needs to be run from within an salloc, with a shared buildpath
-# Example:
-# ***** on clsuter *****
-# salloc --partition=devel --nodes=1 --time=01:30:00 --account=<  >
-# srun --cpu_bind=none --nodes=1 --pty /bin/bash -i
-# eb --buildpath=$HOME/temp  YAXT-0.9.1-ipsmpi-2020.eb
-# ***** on booster****
-# salloc --partition=develbooster --nodes=1 --gres=gpu:4 --account=< > --time=01:00:00
-#
-easyblock = 'ConfigureMake'
-
-name = 'YAXT'
-version = '0.9.1'
-
-homepage = 'https://www.dkrz.de/redmine/projects/yaxt'
-description = """Yet Another eXchange Tool"""
-
-toolchain = {'name': 'ipsmpi', 'version': '2021b'}
-toolchainopts = {'usempi': True}
-
-source_urls = ['https://www.dkrz.de/redmine/attachments/download/506/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['c87ec59e29b3e4965ce2f8e614bd7f1597012b89af0fda4242f2eef06460794c']
-
-configopts = 'FC="$F90" FCFLAGS="$F90FLAGS -cpp"'
-
-preconfigopts = 'MPI_LAUNCH="$(which srun)"'
-
-sanity_check_paths = {
-    'files': ['include/yaxt.h', 'include/yaxt.mod', 'lib/libyaxt.a', 'lib/libyaxt.%s' % SHLIB_EXT],
-    'dirs': ['include/xt'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/y/YAXT/YAXT-0.9.1-npsmpic-2021b.eb b/Golden_Repo/y/YAXT/YAXT-0.9.1-npsmpic-2021b.eb
deleted file mode 100644
index 40a3ce06e..000000000
--- a/Golden_Repo/y/YAXT/YAXT-0.9.1-npsmpic-2021b.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-# Warning: YAXT needs to be run from within an salloc, with a shared buildpath
-# Example:
-# ***** on clsuter *****
-# salloc --partition=devel --nodes=1 --time=01:30:00 --account=<  >
-# srun --cpu_bind=none --nodes=1 --pty /bin/bash -i
-# eb --buildpath=$HOME/temp  YAXT-0.9.1-ipsmpi-2020.eb
-# ***** on booster****
-# salloc --partition=develbooster --nodes=1 --gres=gpu:4 --account=< > --time=01:00:00
-#
-easyblock = 'ConfigureMake'
-
-name = 'YAXT'
-version = '0.9.1'
-
-homepage = 'https://www.dkrz.de/redmine/projects/yaxt'
-description = """Yet Another eXchange Tool"""
-
-toolchain = {'name': 'npsmpic', 'version': '2021b'}
-toolchainopts = {'usempi': True}
-
-source_urls = ['https://www.dkrz.de/redmine/attachments/download/506/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['c87ec59e29b3e4965ce2f8e614bd7f1597012b89af0fda4242f2eef06460794c']
-
-configopts = 'FC="$F90" FCFLAGS="$F90FLAGS -cpp"'
-
-preconfigopts = 'MPI_LAUNCH="$(which srun)"'
-
-sanity_check_paths = {
-    'files': ['include/yaxt.h', 'include/yaxt.mod', 'lib/libyaxt.a', 'lib/libyaxt.%s' % SHLIB_EXT],
-    'dirs': ['include/xt'],
-}
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/y/YAXT/YAXT-0.9.1-nvompic-2021b.eb b/Golden_Repo/y/YAXT/YAXT-0.9.1-nvompic-2021b.eb
deleted file mode 100644
index e65ef03c7..000000000
--- a/Golden_Repo/y/YAXT/YAXT-0.9.1-nvompic-2021b.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-# Warning: YAXT needs to be run from within an salloc, with a shared buildpath
-# Example:
-# ***** on clsuter *****
-# salloc --partition=devel --nodes=1 --time=01:30:00 --account=<  >
-# srun --cpu_bind=none --nodes=1 --pty /bin/bash -i
-# eb --buildpath=$HOME/temp  YAXT-0.9.1-ipsmpi-2020.eb
-# ***** on booster****
-# salloc --partition=develbooster --nodes=1 --gres=gpu:4 --account=< > --time=01:00:00
-#
-easyblock = 'ConfigureMake'
-
-name = 'YAXT'
-version = '0.9.1'
-
-homepage = 'https://www.dkrz.de/redmine/projects/yaxt'
-description = """Yet Another eXchange Tool"""
-
-toolchain = {'name': 'nvompic', 'version': '2021b'}
-toolchainopts = {'usempi': True}
-
-source_urls = ['https://www.dkrz.de/redmine/attachments/download/506/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['c87ec59e29b3e4965ce2f8e614bd7f1597012b89af0fda4242f2eef06460794c']
-
-configopts = 'FC="$F90" FCFLAGS="$F90FLAGS -cpp"'
-
-preconfigopts = 'MPI_LAUNCH="$(which srun)"'
-
-sanity_check_paths = {
-    'files': ['include/yaxt.h', 'include/yaxt.mod', 'lib/libyaxt.a', 'lib/libyaxt.%s' % SHLIB_EXT],
-    'dirs': ['include/xt'],
-}
-
-moduleclass = 'tools'
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
deleted file mode 100644
index 93a7e18fb..000000000
--- a/Golden_Repo/y/Yasm/Yasm-1.3.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,23 +0,0 @@
-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/y/yarn/yarn-1.22.17-GCCcore-11.2.0.eb b/Golden_Repo/y/yarn/yarn-1.22.17-GCCcore-11.2.0.eb
deleted file mode 100644
index d0061d9f3..000000000
--- a/Golden_Repo/y/yarn/yarn-1.22.17-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,35 +0,0 @@
-easyblock = 'Binary'
-
-name = 'yarn'
-version = '1.22.17'
-
-homepage = "https://yarnpkg.com"
-description = "Yarn is a package manager that doubles down as project manager."
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://github.com/yarnpkg/yarn/releases/download/v%(version)s/']
-sources = [{
-    'filename': 'yarn-v%(version)s.tar.gz',
-    'extract_cmd': "cp %s .",
-}]
-checksums = ['267982c61119a055ba2b23d9cf90b02d3d16c202c03cb0c3a53b9633eae37249']
-
-dependencies = [
-    ('nodejs', '16.13.0'),
-]
-
-# Don't ever try to install unpacked source of nodejs globally!
-# Always use 'npm install -g downloaded_file.tar.gz` or you will end up having broken links and installation will fail.
-# -d (debug) and --timing can show errors while downloading dependencies
-install_cmd = "npm install -d --timing --prefix %(installdir)s -g yarn-v%(version)s.tar.gz"
-
-sanity_check_paths = {
-    'files': ['bin/yarn'],
-    'dirs': ['lib/node_modules/yarn'],
-}
-sanity_check_commands = [
-    'yarn --help'
-]
-
-moduleclass = 'tools'
diff --git a/Golden_Repo/y/yuicompressor/yuicompressor-2.4.8-GCCcore-11.2.0.eb b/Golden_Repo/y/yuicompressor/yuicompressor-2.4.8-GCCcore-11.2.0.eb
deleted file mode 100644
index be4d7f161..000000000
--- a/Golden_Repo/y/yuicompressor/yuicompressor-2.4.8-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'yuicompressor'
-version = '2.4.8'
-
-homepage = 'https://github.com/sprat/yuicompressor'
-description = """YUI Compressor is a JavaScript and CSS minifier written in Java."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://github.com/sprat/yuicompressor/archive/']
-sources = ['%(version)s.tar.gz']
-checksums = ['0054abb77cc151147597aeaa5b47b6843925d3293e2e44d5b36e68ee54a1154f']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('Java', '15', '', SYSTEM),
-]
-
-use_pip = True
-sanity_pip_check = True
-download_dep_fail = True
-
-sanity_check_paths = {
-    'files': ['bin/%(name)s'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages/%(name)s'],
-}
-
-moduleclass = 'vis'
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
deleted file mode 100644
index e5532af39..000000000
--- a/Golden_Repo/z/Z3/Z3-4.8.12-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,33 +0,0 @@
-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
deleted file mode 100644
index 52b658123..000000000
--- a/Golden_Repo/z/ZeroMQ/ZeroMQ-4.3.4-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,41 +0,0 @@
-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
deleted file mode 100644
index f376553d7..000000000
--- a/Golden_Repo/z/Zip/Zip-3.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,40 +0,0 @@
-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/zarr/zarr-2.10.1-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/z/zarr/zarr-2.10.1-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index 2077a4ba4..000000000
--- a/Golden_Repo/z/zarr/zarr-2.10.1-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,41 +0,0 @@
-easyblock = "PythonBundle"
-
-name = 'zarr'
-version = '2.10.1'
-
-homepage = 'https://zarr.readthedocs.io/en/stable/'
-description = """Zarr is a Python package providing an implementation of compressed, chunked, N-dimensional arrays,
- designed for use in parallel computing."""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-dependencies = [
-    ('Python', '3.9.6'),
-    ('SciPy-bundle', '2021.10'),
-]
-
-use_pip = True
-
-exts_list = [
-    ('asciitree', '0.3.3', {
-        'checksums': ['4aa4b9b649f85e3fcb343363d97564aa1fb62e249677f2e18a96765145cc0f6e'],
-    }),
-    ('fasteners', '0.16.3', {
-        'checksums': ['b1ab4e5adfbc28681ce44b3024421c4f567e705cc3963c732bf1cba3348307de'],
-    }),
-    ('monotonic', '1.6', {
-        'source_tmpl': '%(version)s.tar.gz',
-        'source_urls': ['https://github.com/atdt/monotonic/archive'],
-        'checksums': ['9609c249aed584fd714811014870650d08d6f6414402b5a190663c49bf83b221'],
-    }),
-    ('numcodecs', '0.9.1', {
-        'checksums': ['35adbcc746b95e3ac92e949a161811f5aa2602b9eb1ef241b5ea6f09bb220997'],
-    }),
-    (name, version, {
-        'checksums': ['29e90114f037d433752b3cf951e4a3cb6c6f67b6501a273439b4be4a824e4caf'],
-    }),
-]
-
-sanity_pip_check = True
-
-moduleclass = 'data'
diff --git a/Golden_Repo/z/zfp/zfp-0.5.5-GCCcore-11.2.0.eb b/Golden_Repo/z/zfp/zfp-0.5.5-GCCcore-11.2.0.eb
deleted file mode 100644
index f63e62786..000000000
--- a/Golden_Repo/z/zfp/zfp-0.5.5-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,59 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'zfp'
-version = '0.5.5'
-
-homepage = "https://github.com/LLNL/zfp"
-description = """Optionally error-bounded lossy compressor for HPC data
-with high throughput read and write random access to individual array elements."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-github_account = 'LLNL'
-source_urls = [GITHUB_SOURCE]
-sources = ['%(version)s.tar.gz']
-checksums = ['6a7f4934489087d9c117a4af327fd6495ea757924f4df467b9c537abf8bd86c4']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1'),
-    ('pkg-config', '0.29.2'),
-]
-
-separate_build_dir = True
-
-configopts = '-DBUILD_SHARED_LIBS:BOOL=ON '
-configopts += '-DBUILD_EXAMPLES:BOOL=OFF '
-configopts += '-DBUILD_TESTING:BOOL=OFF '
-
-configopts += '-DZFP_WITH_OPENMP:BOOL=ON '
-configopts += '-DZFP_WITH_CUDA:BOOL=OFF '
-
-configopts += '-DBUILD_CFP:BOOL=ON '
-configopts += '-DBUILD_ZFPY:BOOL=OFF '  # fails
-configopts += '-DBUILD_ZFORP:BOOL=ON '
-
-configopts += '-DBUILD_UTILITIES:BOOL=ON '
-configopts += '-DCMAKE_C_STANDARD_LIBRARIES="-lm" '  # needed to link UTILITIES
-
-# create pkgconfig file
-postinstallcmds = [
-    "mkdir -p %(installdir)s/lib/pkgconfig",
-    """echo -e "prefix=%(installdir)s
-libdir=\${prefix}/lib64
-includedir=\${prefix}/include
-Name: %(name)s
-Description: %(name)s compression library
-Version: %(version)s
-Requires:
-Libs: -L\${libdir} -lzfp -lcfp
-Cflags: -I\${includedir}" > %(installdir)s/lib/pkgconfig/%(name)s.pc""",
-]
-
-sanity_check_paths = {
-    'files': ['lib64/libzfp.so', 'lib64/libcfp.so', 'include/zfp.h'],
-    'dirs': ['lib/pkgconfig'],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/z/zlib/zlib-1.2.11-GCCcore-11.2.0.eb b/Golden_Repo/z/zlib/zlib-1.2.11-GCCcore-11.2.0.eb
deleted file mode 100644
index 3c038ed41..000000000
--- a/Golden_Repo/z/zlib/zlib-1.2.11-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,29 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'zlib'
-version = '1.2.11'
-
-homepage = 'https://www.zlib.net/'
-description = """zlib is designed to be a free, general-purpose, legally unencumbered -- that is,
- not covered by any patents -- lossless data-compression library for use on virtually any
- computer hardware and operating system.
-"""
-
-site_contacts = 'sc@fz-juelich.de'
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://zlib.net/fossils']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1']
-
-# use same binutils version that was used when building GCC toolchain
-builddependencies = [('binutils', '2.37', '', SYSTEM)]
-
-sanity_check_paths = {
-    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
-    'dirs': [],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/z/zlib/zlib-1.2.11.eb b/Golden_Repo/z/zlib/zlib-1.2.11.eb
deleted file mode 100644
index 7d59504ff..000000000
--- a/Golden_Repo/z/zlib/zlib-1.2.11.eb
+++ /dev/null
@@ -1,31 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'zlib'
-version = '1.2.11'
-
-homepage = 'https://www.zlib.net/'
-description = """zlib is designed to be a free, general-purpose, legally unencumbered -- that is,
- not covered by any patents -- lossless data-compression library for use on virtually any
- computer hardware and operating system.
-"""
-
-site_contacts = 'sc@fz-juelich.de'
-
-toolchain = SYSTEM
-toolchainopts = {'pic': True}
-
-source_urls = ['https://zlib.net/fossils/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1']
-
-# need to take care of $CFLAGS ourselves with system toolchain
-# we need to add -fPIC, but should also include -O* option to avoid compiling with -O0 (default for GCC)
-buildopts = 'CFLAGS="-O2 -fPIC"'
-
-sanity_check_paths = {
-    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a',
-              'lib/libz.%s' % SHLIB_EXT],
-    'dirs': [],
-}
-
-moduleclass = 'lib'
diff --git a/Golden_Repo/z/zsh/zsh-5.8-GCCcore-11.2.0.eb b/Golden_Repo/z/zsh/zsh-5.8-GCCcore-11.2.0.eb
deleted file mode 100644
index 92fd40dc4..000000000
--- a/Golden_Repo/z/zsh/zsh-5.8-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,31 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'zsh'
-
-# latest version hasn't changed
-version = '5.8'
-
-homepage = 'http://www.zsh.org/'
-description = """
-Zsh is a shell designed for interactive use, although it is also a powerful scripting language.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
-sources = [SOURCELOWER_TAR_XZ]
-checksums = ['dcc4b54cc5565670a65581760261c163d720991f0d06486da61f8d839b52de27']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('ncurses', '6.2'),
-]
-
-modextrapaths = {
-    'FPATH': 'share/zsh/%(version)s/functions'
-}
-
-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
deleted file mode 100644
index 39a21b894..000000000
--- a/Golden_Repo/z/zstd/zstd-1.5.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,41 +0,0 @@
-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/deep_overlay/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb b/Overlays/deep_overlay/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb
deleted file mode 100644
index 5c624b73d..000000000
--- a/Overlays/deep_overlay/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb
+++ /dev/null
@@ -1,62 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'OpenMPI'
-version = '4.1.1'
-
-homepage = 'https://www.open-mpi.org/'
-description = """The Open MPI Project is an open source MPI-3 implementation."""
-
-toolchain = {'name': 'GCC', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [
-    'https://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
-sources = [SOURCELOWER_TAR_BZ2]
-checksums = ['e24f7a778bd11a71ad0c14587a7f5b00e68a71aa5623e2157bafee3d44c07cda']
-
-osdependencies = [
-    # needed for --with-verbs
-    ('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel'),
-    # needed for --with-pmix
-    ('pmix-devel'),
-]
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('hwloc', '2.5.0'),
-    ('UCX', '1.11.2', '', SYSTEM),
-    ('CUDA', '11.5', '', SYSTEM),
-    ('libevent', '2.1.12'),
-]
-
-configopts = '--enable-shared '
-configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
-configopts += '--with-ucx=$EBROOTUCX '
-configopts += '--with-verbs '
-configopts += '--with-libevent=$EBROOTLIBEVENT '
-configopts += '--without-orte '
-configopts += '--without-psm2 '
-configopts += '--disable-oshmem '
-configopts += '--with-cuda=$EBROOTCUDA '
-# No IME in DEEP
-# configopts += '--with-ime=/opt/ddn/ime '
-# configopts += '--with-gpfs '
-
-# to enable SLURM integration (site-specific)
-configopts += '--with-slurm --with-pmix=external --with-libevent=external --with-ompi-pmix-rte'
-
-local_libs = ["mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte"]
-sanity_check_paths = {
-    'files': ["bin/%s" % local_binfile for local_binfile in ["ompi_info", "opal_wrapper"]] +
-             ["lib/lib%s.%s" % (local_libfile, SHLIB_EXT) for local_libfile in local_libs] +
-             ["include/%s.h" % x for x in ["mpi-ext", "mpif-config",
-                                           "mpif", "mpi", "mpi_portable_platform"]],
-    'dirs': [],
-}
-
-moduleclass = 'mpi'
diff --git a/Overlays/deep_overlay/o/OpenMPI/OpenMPI-4.1.1-intel-compilers-2021.4.0.eb b/Overlays/deep_overlay/o/OpenMPI/OpenMPI-4.1.1-intel-compilers-2021.4.0.eb
deleted file mode 100644
index ce0fe23c8..000000000
--- a/Overlays/deep_overlay/o/OpenMPI/OpenMPI-4.1.1-intel-compilers-2021.4.0.eb
+++ /dev/null
@@ -1,62 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'OpenMPI'
-version = '4.1.1'
-
-homepage = 'https://www.open-mpi.org/'
-description = """The Open MPI Project is an open source MPI-3 implementation."""
-
-toolchain = {'name': 'intel-compilers', 'version': '2021.4.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [
-    'https://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
-sources = [SOURCELOWER_TAR_BZ2]
-checksums = ['e24f7a778bd11a71ad0c14587a7f5b00e68a71aa5623e2157bafee3d44c07cda']
-
-osdependencies = [
-    # needed for --with-verbs
-    ('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel'),
-    # needed for --with-pmix
-    ('pmix-devel'),
-]
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('hwloc', '2.5.0'),
-    ('UCX', '1.11.2', '', SYSTEM),
-    ('CUDA', '11.5', '', SYSTEM),
-    ('libevent', '2.1.12'),
-]
-
-configopts = '--enable-shared '
-configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
-configopts += '--with-ucx=$EBROOTUCX '
-configopts += '--with-verbs '
-configopts += '--with-libevent=$EBROOTLIBEVENT '
-configopts += '--without-orte '
-configopts += '--without-psm2 '
-configopts += '--disable-oshmem '
-configopts += '--with-cuda=$EBROOTCUDA '
-# No IME in DEEP
-# configopts += '--with-ime=/opt/ddn/ime '
-# configopts += '--with-gpfs '
-
-# to enable SLURM integration (site-specific)
-configopts += '--with-slurm --with-pmix=external --with-libevent=external --with-ompi-pmix-rte'
-
-local_libs = ["mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte"]
-sanity_check_paths = {
-    'files': ["bin/%s" % local_binfile for local_binfile in ["ompi_info", "opal_wrapper"]] +
-             ["lib/lib%s.%s" % (local_libfile, SHLIB_EXT) for local_libfile in local_libs] +
-             ["include/%s.h" % x for x in ["mpi-ext", "mpif-config",
-                                           "mpif", "mpi", "mpi_portable_platform"]],
-    'dirs': [],
-}
-
-moduleclass = 'mpi'
diff --git a/Overlays/deep_overlay/o/OpenMPI/OpenMPI-4.1.2-GCC-11.2.0.eb b/Overlays/deep_overlay/o/OpenMPI/OpenMPI-4.1.2-GCC-11.2.0.eb
deleted file mode 100644
index 3b582b240..000000000
--- a/Overlays/deep_overlay/o/OpenMPI/OpenMPI-4.1.2-GCC-11.2.0.eb
+++ /dev/null
@@ -1,62 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'OpenMPI'
-version = '4.1.2'
-
-homepage = 'https://www.open-mpi.org/'
-description = """The Open MPI Project is an open source MPI-3 implementation."""
-
-toolchain = {'name': 'GCC', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [
-    'https://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
-sources = [SOURCELOWER_TAR_BZ2]
-checksums = ['9b78c7cf7fc32131c5cf43dd2ab9740149d9d87cadb2e2189f02685749a6b527']
-
-osdependencies = [
-    # needed for --with-verbs
-    ('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel'),
-    # needed for --with-pmix
-    ('pmix-devel'),
-]
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('hwloc', '2.5.0'),
-    ('UCX', '1.11.2', '', SYSTEM),
-    ('CUDA', '11.5', '', SYSTEM),
-    ('libevent', '2.1.12'),
-]
-
-configopts = '--enable-shared '
-configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
-configopts += '--with-ucx=$EBROOTUCX '
-configopts += '--with-verbs '
-configopts += '--with-libevent=$EBROOTLIBEVENT '
-configopts += '--without-orte '
-configopts += '--without-psm2 '
-configopts += '--disable-oshmem '
-configopts += '--with-cuda=$EBROOTCUDA '
-# No IME in DEEP
-# configopts += '--with-ime=/opt/ddn/ime '
-# configopts += '--with-gpfs '
-
-# to enable SLURM integration (site-specific)
-configopts += '--with-slurm --with-pmix=external --with-libevent=external --with-ompi-pmix-rte'
-
-local_libs = ["mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte"]
-sanity_check_paths = {
-    'files': ["bin/%s" % local_binfile for local_binfile in ["ompi_info", "opal_wrapper"]] +
-             ["lib/lib%s.%s" % (local_libfile, SHLIB_EXT) for local_libfile in local_libs] +
-             ["include/%s.h" % x for x in ["mpi-ext", "mpif-config",
-                                           "mpif", "mpi", "mpi_portable_platform"]],
-    'dirs': [],
-}
-
-moduleclass = 'mpi'
diff --git a/Overlays/deep_overlay/o/OpenMPI/OpenMPI-4.1.2-NVHPC-22.1.eb b/Overlays/deep_overlay/o/OpenMPI/OpenMPI-4.1.2-NVHPC-22.1.eb
deleted file mode 100644
index 6a29134b5..000000000
--- a/Overlays/deep_overlay/o/OpenMPI/OpenMPI-4.1.2-NVHPC-22.1.eb
+++ /dev/null
@@ -1,62 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'OpenMPI'
-version = '4.1.2'
-
-homepage = 'https://www.open-mpi.org/'
-description = """The Open MPI Project is an open source MPI-3 implementation."""
-
-toolchain = {'name': 'NVHPC', 'version': '22.1'}
-toolchainopts = {'pic': True}
-
-source_urls = [
-    'https://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
-sources = [SOURCELOWER_TAR_BZ2]
-checksums = ['9b78c7cf7fc32131c5cf43dd2ab9740149d9d87cadb2e2189f02685749a6b527']
-
-osdependencies = [
-    # needed for --with-verbs
-    ('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel'),
-    # needed for --with-pmix
-    ('pmix-devel'),
-]
-
-builddependencies = [
-    ('Autotools', '20210726', '', SYSTEM),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('hwloc', '2.5.0'),
-    ('UCX', '1.11.2', '', SYSTEM),
-    ('CUDA', '11.5', '', SYSTEM),
-    ('libevent', '2.1.12'),
-]
-
-configopts = '--enable-shared '
-configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
-configopts += '--with-ucx=$EBROOTUCX '
-configopts += '--with-verbs '
-configopts += '--with-libevent=$EBROOTLIBEVENT '
-configopts += '--without-orte '
-configopts += '--without-psm2 '
-configopts += '--disable-oshmem '
-configopts += '--with-cuda=$EBROOTCUDA '
-# No IME in DEEP
-# configopts += '--with-ime=/opt/ddn/ime '
-# configopts += '--with-gpfs '
-
-# to enable SLURM integration (site-specific)
-configopts += '--with-slurm --with-pmix=external --with-libevent=external --with-ompi-pmix-rte'
-
-local_libs = ["mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte"]
-sanity_check_paths = {
-    'files': ["bin/%s" % local_binfile for local_binfile in ["ompi_info", "opal_wrapper"]] +
-             ["lib/lib%s.%s" % (local_libfile, SHLIB_EXT) for local_libfile in local_libs] +
-             ["include/%s.h" % x for x in ["mpi-ext", "mpif-config",
-                                           "mpif", "mpi", "mpi_portable_platform"]],
-    'dirs': [],
-}
-
-moduleclass = 'mpi'
diff --git a/Overlays/deep_overlay/o/OpenMPI/OpenMPI-4.1.2-intel-compilers-2021.4.0.eb b/Overlays/deep_overlay/o/OpenMPI/OpenMPI-4.1.2-intel-compilers-2021.4.0.eb
deleted file mode 100644
index 5f0dc6446..000000000
--- a/Overlays/deep_overlay/o/OpenMPI/OpenMPI-4.1.2-intel-compilers-2021.4.0.eb
+++ /dev/null
@@ -1,62 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'OpenMPI'
-version = '4.1.2'
-
-homepage = 'https://www.open-mpi.org/'
-description = """The Open MPI Project is an open source MPI-3 implementation."""
-
-toolchain = {'name': 'intel-compilers', 'version': '2021.4.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [
-    'https://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
-sources = [SOURCELOWER_TAR_BZ2]
-checksums = ['9b78c7cf7fc32131c5cf43dd2ab9740149d9d87cadb2e2189f02685749a6b527']
-
-osdependencies = [
-    # needed for --with-verbs
-    ('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel'),
-    # needed for --with-pmix
-    ('pmix-devel'),
-]
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('hwloc', '2.5.0'),
-    ('UCX', '1.11.2', '', SYSTEM),
-    ('CUDA', '11.5', '', SYSTEM),
-    ('libevent', '2.1.12'),
-]
-
-configopts = '--enable-shared '
-configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
-configopts += '--with-ucx=$EBROOTUCX '
-configopts += '--with-verbs '
-configopts += '--with-libevent=$EBROOTLIBEVENT '
-configopts += '--without-orte '
-configopts += '--without-psm2 '
-configopts += '--disable-oshmem '
-configopts += '--with-cuda=$EBROOTCUDA '
-# No IME in DEEP
-# configopts += '--with-ime=/opt/ddn/ime '
-# configopts += '--with-gpfs '
-
-# to enable SLURM integration (site-specific)
-configopts += '--with-slurm --with-pmix=external --with-libevent=external --with-ompi-pmix-rte'
-
-local_libs = ["mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte"]
-sanity_check_paths = {
-    'files': ["bin/%s" % local_binfile for local_binfile in ["ompi_info", "opal_wrapper"]] +
-             ["lib/lib%s.%s" % (local_libfile, SHLIB_EXT) for local_libfile in local_libs] +
-             ["include/%s.h" % x for x in ["mpi-ext", "mpif-config",
-                                           "mpif", "mpi", "mpi_portable_platform"]],
-    'dirs': [],
-}
-
-moduleclass = 'mpi'
diff --git a/Overlays/deep_overlay/p/PAPI/PAPI-6.0.0.1-GCCcore-11.2.0.eb b/Overlays/deep_overlay/p/PAPI/PAPI-6.0.0.1-GCCcore-11.2.0.eb
deleted file mode 100644
index 1cfb37a8a..000000000
--- a/Overlays/deep_overlay/p/PAPI/PAPI-6.0.0.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,50 +0,0 @@
-##
-# Author:    Robert Mijakovic <robert.mijakovic@lxp.lu>
-##
-
-easyblock = 'ConfigureMake'
-
-name = 'PAPI'
-version = '6.0.0.1'
-
-homepage = 'https://icl.cs.utk.edu/projects/papi/'
-
-description = """
- PAPI provides the tool designer and application engineer with a consistent
- interface and methodology for use of the performance counter hardware found
- in most major microprocessors. PAPI enables software engineers to see, in near
- real time, the relation between software performance and processor events.
- In addition Component PAPI provides access to a collection of components
- that expose performance measurement opportunites across the hardware and
- software stack.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://icl.cs.utk.edu/projects/papi/downloads/']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['3cd7ed50c65b0d21d66e46d0ba34cd171178af4bbf9d94e693915c1aca1e287f']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-start_dir = 'src'
-
-configopts = "--with-components=rapl "  # for energy measurements
-
-parallel = 1
-
-# Deep neither passes nor fails any test
-# runtest = 'fulltest'
-
-sanity_check_paths = {
-    'files': ["bin/papi_%s" % x
-              for x in ["avail", "clockres", "command_line", "component_avail",
-                        "cost", "decode", "error_codes", "event_chooser",
-                        "mem_info", "multiplex_cost", "native_avail",
-                        "version", "xml_event_info"]],
-    'dirs': [],
-}
-
-moduleclass = 'perf'
diff --git a/Overlays/deep_overlay/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb b/Overlays/deep_overlay/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
deleted file mode 100644
index ab6157539..000000000
--- a/Overlays/deep_overlay/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
+++ /dev/null
@@ -1,56 +0,0 @@
-name = 'psmpi'
-version = '5.5.0-1'
-
-homepage = 'https://github.com/ParaStation/psmpi2'
-description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
-based on MPICH v3. It provides extra low level communication libraries and integration with
-various batch systems for tighter process control.
-"""
-
-toolchain = {'name': 'GCC', 'version': '11.2.0'}
-
-sources = [SOURCE_TAR_BZ2]
-source_urls = ['https://github.com/ParaStation/psmpi/archive/']
-checksums = [
-    # psmpi-5.5.0-1.tar.bz2
-    'c178bf618f139857c1bc191938677145cf4fdbec5b8d3afa2ca1de666c791b48',
-    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
-]
-
-builddependencies = [
-    # needed for autogen.sh on CentOS 7
-    ('Autotools', '20210726'),
-    # Autoconf >2.69 is generating a buggy configure script, so take it down to the one that works
-    ('Autoconf', '2.69'),
-]
-dependencies = [
-    ('pscom', '5.4-default', '', SYSTEM),
-    # needed due to the inclusion of hwloc
-    ('libxml2', '2.9.10'),
-    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
-    ('CUDA', '11.5', '', SYSTEM)
-]
-
-patches = [
-    'psmpi_shebang.patch',
-    # We don't have IME in HDFML so we skip this
-    # 'psmpi-5.5.0-1_ime.patch'
-]
-
-# We don't have IME in HDFML so we skip this
-# mpich_opts = '--enable-static --with-file-system=ime+ufs --enable-romio'
-#
-# preconfigopts += 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
-# preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
-# mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
-# We disable gpfs support, since it seems to be problematic under some circumstances. One can disable it by setting
-# ROMIO_FSTYPE_FORCE="ufs:", but then we loose IME support
-mpich_opts = '--enable-static --with-file-system=ufs --enable-romio'
-
-preconfigopts = "./autogen.sh && "
-
-threaded = False
-
-cuda = True
-
-moduleclass = 'mpi'
diff --git a/Overlays/deep_overlay/p/psmpi/psmpi-5.5.0-1-NVHPC-22.1-mt.eb b/Overlays/deep_overlay/p/psmpi/psmpi-5.5.0-1-NVHPC-22.1-mt.eb
deleted file mode 100644
index 8a708fe11..000000000
--- a/Overlays/deep_overlay/p/psmpi/psmpi-5.5.0-1-NVHPC-22.1-mt.eb
+++ /dev/null
@@ -1,57 +0,0 @@
-name = 'psmpi'
-version = '5.5.0-1'
-versionsuffix = '-mt'
-
-homepage = 'https://github.com/ParaStation/psmpi2'
-description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
-based on MPICH v3. It provides extra low level communication libraries and integration with
-various batch systems for tighter process control.
-"""
-
-toolchain = {'name': 'NVHPC', 'version': '22.1'}
-
-sources = [SOURCE_TAR_BZ2]
-source_urls = ['https://github.com/ParaStation/psmpi/archive/']
-checksums = [
-    # psmpi-5.5.0-1.tar.bz2
-    'c178bf618f139857c1bc191938677145cf4fdbec5b8d3afa2ca1de666c791b48',
-    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
-]
-
-builddependencies = [
-    # needed for autogen.sh on CentOS 7
-    ('Autotools', '20210726'),
-    # Autoconf >2.69 is generating a buggy configure script, so take it down to the one that works
-    ('Autoconf', '2.69'),
-]
-dependencies = [
-    ('pscom', '5.4-default', '', SYSTEM),
-    # needed due to the inclusion of hwloc
-    ('libxml2', '2.9.10'),
-    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
-    ('CUDA', '11.5', '', SYSTEM)
-]
-
-patches = [
-    'psmpi_shebang.patch',
-    # We don't have IME in HDFML so we skip this
-    # 'psmpi-5.5.0-1_ime.patch'
-]
-
-# We don't have IME in HDFML so we skip this
-# mpich_opts = '--enable-static --with-file-system=ime+ufs --enable-romio'
-#
-# preconfigopts += 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
-# preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
-# mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
-# We disable gpfs support, since it seems to be problematic under some circumstances. One can disable it by setting
-# ROMIO_FSTYPE_FORCE="ufs:", but then we loose IME support
-mpich_opts = '--enable-static --with-file-system=ufs --enable-romio'
-
-preconfigopts = "./autogen.sh && "
-
-threaded = True
-
-cuda = True
-
-moduleclass = 'mpi'
diff --git a/Overlays/deep_overlay/p/psmpi/psmpi-5.5.0-1-NVHPC-22.1.eb b/Overlays/deep_overlay/p/psmpi/psmpi-5.5.0-1-NVHPC-22.1.eb
deleted file mode 100644
index f273c7a9a..000000000
--- a/Overlays/deep_overlay/p/psmpi/psmpi-5.5.0-1-NVHPC-22.1.eb
+++ /dev/null
@@ -1,56 +0,0 @@
-name = 'psmpi'
-version = '5.5.0-1'
-
-homepage = 'https://github.com/ParaStation/psmpi2'
-description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
-based on MPICH v3. It provides extra low level communication libraries and integration with
-various batch systems for tighter process control.
-"""
-
-toolchain = {'name': 'NVHPC', 'version': '22.1'}
-
-sources = [SOURCE_TAR_BZ2]
-source_urls = ['https://github.com/ParaStation/psmpi/archive/']
-checksums = [
-    # psmpi-5.5.0-1.tar.bz2
-    'c178bf618f139857c1bc191938677145cf4fdbec5b8d3afa2ca1de666c791b48',
-    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
-]
-
-builddependencies = [
-    # needed for autogen.sh on CentOS 7
-    ('Autotools', '20210726'),
-    # Autoconf >2.69 is generating a buggy configure script, so take it down to the one that works
-    ('Autoconf', '2.69'),
-]
-dependencies = [
-    ('pscom', '5.4-default', '', SYSTEM),
-    # needed due to the inclusion of hwloc
-    ('libxml2', '2.9.10'),
-    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
-    ('CUDA', '11.5', '', SYSTEM)
-]
-
-patches = [
-    'psmpi_shebang.patch',
-    # We don't have IME in HDFML so we skip this
-    # 'psmpi-5.5.0-1_ime.patch'
-]
-
-# We don't have IME in HDFML so we skip this
-# mpich_opts = '--enable-static --with-file-system=ime+ufs --enable-romio'
-#
-# preconfigopts += 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
-# preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
-# mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
-# We disable gpfs support, since it seems to be problematic under some circumstances. One can disable it by setting
-# ROMIO_FSTYPE_FORCE="ufs:", but then we loose IME support
-mpich_opts = '--enable-static --with-file-system=ufs --enable-romio'
-
-preconfigopts = "./autogen.sh && "
-
-threaded = False
-
-cuda = True
-
-moduleclass = 'mpi'
diff --git a/Overlays/deep_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb b/Overlays/deep_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
deleted file mode 100644
index 42b37f822..000000000
--- a/Overlays/deep_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
+++ /dev/null
@@ -1,57 +0,0 @@
-name = 'psmpi'
-version = '5.5.0-1'
-versionsuffix = '-mt'
-
-homepage = 'https://github.com/ParaStation/psmpi2'
-description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
-based on MPICH v3. It provides extra low level communication libraries and integration with 
-various batch systems for tighter process control.
-"""
-
-toolchain = {'name': 'intel-compilers', 'version': '2021.4.0'}
-
-sources = [SOURCE_TAR_BZ2]
-source_urls = ['https://github.com/ParaStation/psmpi/archive/']
-checksums = [
-    # psmpi-5.5.0-1.tar.bz2
-    'c178bf618f139857c1bc191938677145cf4fdbec5b8d3afa2ca1de666c791b48',
-    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
-]
-
-builddependencies = [
-    # needed for autogen.sh on CentOS 7
-    ('Autotools', '20210726'),
-    # Autoconf >2.69 is generating a buggy configure script, so take it down to the one that works
-    ('Autoconf', '2.69'),
-]
-dependencies = [
-    ('pscom', '5.4-default', '', SYSTEM),
-    # needed due to the inclusion of hwloc
-    ('libxml2', '2.9.10'),
-    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
-    ('CUDA', '11.5', '', SYSTEM)
-]
-
-patches = [
-    'psmpi_shebang.patch',
-    # We don't have IME in HDFML so we skip this
-    # 'psmpi-5.5.0-1_ime.patch'
-]
-
-# We don't have IME in HDFML so we skip this
-# mpich_opts = '--enable-static --with-file-system=ime+ufs --enable-romio'
-#
-# preconfigopts += 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
-# preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
-# mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
-# We disable gpfs support, since it seems to be problematic under some circumstances. One can disable it by setting
-# ROMIO_FSTYPE_FORCE="ufs:", but then we loose IME support
-mpich_opts = '--enable-static --with-file-system=ufs --enable-romio'
-
-preconfigopts = "./autogen.sh && "
-
-threaded = True
-
-cuda = True
-
-moduleclass = 'mpi'
diff --git a/Overlays/deep_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb b/Overlays/deep_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
deleted file mode 100644
index 7503bf379..000000000
--- a/Overlays/deep_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
+++ /dev/null
@@ -1,56 +0,0 @@
-name = 'psmpi'
-version = '5.5.0-1'
-
-homepage = 'https://github.com/ParaStation/psmpi2'
-description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
-based on MPICH v3. It provides extra low level communication libraries and integration with 
-various batch systems for tighter process control.
-"""
-
-toolchain = {'name': 'intel-compilers', 'version': '2021.4.0'}
-
-sources = [SOURCE_TAR_BZ2]
-source_urls = ['https://github.com/ParaStation/psmpi/archive/']
-checksums = [
-    # psmpi-5.5.0-1.tar.bz2
-    'c178bf618f139857c1bc191938677145cf4fdbec5b8d3afa2ca1de666c791b48',
-    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
-]
-
-builddependencies = [
-    # needed for autogen.sh on CentOS 7
-    ('Autotools', '20210726'),
-    # Autoconf >2.69 is generating a buggy configure script, so take it down to the one that works
-    ('Autoconf', '2.69'),
-]
-dependencies = [
-    ('pscom', '5.4-default', '', SYSTEM),
-    # needed due to the inclusion of hwloc
-    ('libxml2', '2.9.10'),
-    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
-    ('CUDA', '11.5', '', SYSTEM)
-]
-
-patches = [
-    'psmpi_shebang.patch',
-    # We don't have IME in HDFML so we skip this
-    # 'psmpi-5.5.0-1_ime.patch'
-]
-
-# We don't have IME in HDFML so we skip this
-# mpich_opts = '--enable-static --with-file-system=ime+ufs --enable-romio'
-#
-# preconfigopts += 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
-# preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
-# mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
-# We disable gpfs support, since it seems to be problematic under some circumstances. One can disable it by setting
-# ROMIO_FSTYPE_FORCE="ufs:", but then we loose IME support
-mpich_opts = '--enable-static --with-file-system=ufs --enable-romio'
-
-preconfigopts = "./autogen.sh && "
-
-threaded = False
-
-cuda = True
-
-moduleclass = 'mpi'
diff --git a/Overlays/hdfml_overlay/n/nvidia-driver/nvidia-driver-default.eb b/Overlays/hdfml_overlay/n/nvidia-driver/nvidia-driver-default.eb
deleted file mode 100644
index 9008c439a..000000000
--- a/Overlays/hdfml_overlay/n/nvidia-driver/nvidia-driver-default.eb
+++ /dev/null
@@ -1,23 +0,0 @@
-name = 'nvidia-driver'
-version = 'default'
-realversion = '510.47.03'
-
-homepage = 'https://developer.nvidia.com/cuda-toolkit'
-description = """This is a set of libraries normally installed by the NVIDIA driver installer."""
-
-site_contacts = 'sc@fz-juelich.de'
-
-toolchain = SYSTEM
-
-source_urls = ['http://us.download.nvidia.com/tesla/%s/' % realversion]
-sources = ['NVIDIA-Linux-x86_64-%s.run' % realversion]
-checksums = ['f2a421dae836318d3c0d96459ccb3af27e90e50c95b0faa4288af76279e5d690']
-
-# To avoid conflicts between NVML and the kernel driver
-postinstallcmds = ['rm %(installdir)s/lib64/libnvidia-ml.so*']
-
-modluafooter = '''
-add_property("arch","gpu")
-'''
-
-moduleclass = 'system'
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
deleted file mode 100644
index e2872cecd..000000000
--- a/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb
+++ /dev/null
@@ -1,62 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'OpenMPI'
-version = '4.1.1'
-
-homepage = 'https://www.open-mpi.org/'
-description = """The Open MPI Project is an open source MPI-3 implementation."""
-
-toolchain = {'name': 'GCC', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [
-    'https://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
-sources = [SOURCELOWER_TAR_BZ2]
-checksums = ['e24f7a778bd11a71ad0c14587a7f5b00e68a71aa5623e2157bafee3d44c07cda']
-
-osdependencies = [
-    # needed for --with-verbs
-    ('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel'),
-    # needed for --with-pmix
-    ('pmix-devel'),
-]
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('hwloc', '2.5.0'),
-    ('UCX', '1.11.2', '', SYSTEM),
-    ('CUDA', '11.5', '', SYSTEM),
-    ('libevent', '2.1.12'),
-]
-
-configopts = '--enable-shared '
-configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
-configopts += '--with-ucx=$EBROOTUCX '
-configopts += '--with-verbs '
-configopts += '--with-libevent=$EBROOTLIBEVENT '
-configopts += '--without-orte '
-configopts += '--without-psm2 '
-configopts += '--disable-oshmem '
-configopts += '--with-cuda=$EBROOTCUDA '
-# No IME in HDFML
-# configopts += '--with-ime=/opt/ddn/ime '
-configopts += '--with-gpfs '
-
-# to enable SLURM integration (site-specific)
-configopts += '--with-slurm --with-pmix=external --with-libevent=external --with-ompi-pmix-rte'
-
-local_libs = ["mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte"]
-sanity_check_paths = {
-    'files': ["bin/%s" % local_binfile for local_binfile in ["ompi_info", "opal_wrapper"]] +
-             ["lib/lib%s.%s" % (local_libfile, SHLIB_EXT) for local_libfile in local_libs] +
-             ["include/%s.h" % x for x in ["mpi-ext", "mpif-config",
-                                           "mpif", "mpi", "mpi_portable_platform"]],
-    'dirs': [],
-}
-
-moduleclass = 'mpi'
diff --git a/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.1-intel-compilers-2021.4.0.eb b/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.1-intel-compilers-2021.4.0.eb
deleted file mode 100644
index 6880d77a8..000000000
--- a/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.1-intel-compilers-2021.4.0.eb
+++ /dev/null
@@ -1,62 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'OpenMPI'
-version = '4.1.1'
-
-homepage = 'https://www.open-mpi.org/'
-description = """The Open MPI Project is an open source MPI-3 implementation."""
-
-toolchain = {'name': 'intel-compilers', 'version': '2021.4.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [
-    'https://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
-sources = [SOURCELOWER_TAR_BZ2]
-checksums = ['e24f7a778bd11a71ad0c14587a7f5b00e68a71aa5623e2157bafee3d44c07cda']
-
-osdependencies = [
-    # needed for --with-verbs
-    ('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel'),
-    # needed for --with-pmix
-    ('pmix-devel'),
-]
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('hwloc', '2.5.0'),
-    ('UCX', '1.11.2', '', SYSTEM),
-    ('CUDA', '11.5', '', SYSTEM),
-    ('libevent', '2.1.12'),
-]
-
-configopts = '--enable-shared '
-configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
-configopts += '--with-ucx=$EBROOTUCX '
-configopts += '--with-verbs '
-configopts += '--with-libevent=$EBROOTLIBEVENT '
-configopts += '--without-orte '
-configopts += '--without-psm2 '
-configopts += '--disable-oshmem '
-configopts += '--with-cuda=$EBROOTCUDA '
-# No IME in HDFML
-# configopts += '--with-ime=/opt/ddn/ime '
-configopts += '--with-gpfs '
-
-# to enable SLURM integration (site-specific)
-configopts += '--with-slurm --with-pmix=external --with-libevent=external --with-ompi-pmix-rte'
-
-local_libs = ["mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte"]
-sanity_check_paths = {
-    'files': ["bin/%s" % local_binfile for local_binfile in ["ompi_info", "opal_wrapper"]] +
-             ["lib/lib%s.%s" % (local_libfile, SHLIB_EXT) for local_libfile in local_libs] +
-             ["include/%s.h" % x for x in ["mpi-ext", "mpif-config",
-                                           "mpif", "mpi", "mpi_portable_platform"]],
-    'dirs': [],
-}
-
-moduleclass = 'mpi'
diff --git a/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.2-GCC-11.2.0.eb b/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.2-GCC-11.2.0.eb
deleted file mode 100644
index 4e156642b..000000000
--- a/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.2-GCC-11.2.0.eb
+++ /dev/null
@@ -1,62 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'OpenMPI'
-version = '4.1.2'
-
-homepage = 'https://www.open-mpi.org/'
-description = """The Open MPI Project is an open source MPI-3 implementation."""
-
-toolchain = {'name': 'GCC', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [
-    'https://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
-sources = [SOURCELOWER_TAR_BZ2]
-checksums = ['9b78c7cf7fc32131c5cf43dd2ab9740149d9d87cadb2e2189f02685749a6b527']
-
-osdependencies = [
-    # needed for --with-verbs
-    ('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel'),
-    # needed for --with-pmix
-    ('pmix-devel'),
-]
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('hwloc', '2.5.0'),
-    ('UCX', '1.11.2', '', SYSTEM),
-    ('CUDA', '11.5', '', SYSTEM),
-    ('libevent', '2.1.12'),
-]
-
-configopts = '--enable-shared '
-configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
-configopts += '--with-ucx=$EBROOTUCX '
-configopts += '--with-verbs '
-configopts += '--with-libevent=$EBROOTLIBEVENT '
-configopts += '--without-orte '
-configopts += '--without-psm2 '
-configopts += '--disable-oshmem '
-configopts += '--with-cuda=$EBROOTCUDA '
-# No IME in HDFML
-# configopts += '--with-ime=/opt/ddn/ime '
-configopts += '--with-gpfs '
-
-# to enable SLURM integration (site-specific)
-configopts += '--with-slurm --with-pmix=external --with-libevent=external --with-ompi-pmix-rte'
-
-local_libs = ["mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte"]
-sanity_check_paths = {
-    'files': ["bin/%s" % local_binfile for local_binfile in ["ompi_info", "opal_wrapper"]] +
-             ["lib/lib%s.%s" % (local_libfile, SHLIB_EXT) for local_libfile in local_libs] +
-             ["include/%s.h" % x for x in ["mpi-ext", "mpif-config",
-                                           "mpif", "mpi", "mpi_portable_platform"]],
-    'dirs': [],
-}
-
-moduleclass = 'mpi'
diff --git a/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.2-NVHPC-22.1.eb b/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.2-NVHPC-22.1.eb
deleted file mode 100644
index 7ef6b673f..000000000
--- a/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.2-NVHPC-22.1.eb
+++ /dev/null
@@ -1,62 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'OpenMPI'
-version = '4.1.2'
-
-homepage = 'https://www.open-mpi.org/'
-description = """The Open MPI Project is an open source MPI-3 implementation."""
-
-toolchain = {'name': 'NVHPC', 'version': '22.1'}
-toolchainopts = {'pic': True}
-
-source_urls = [
-    'https://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
-sources = [SOURCELOWER_TAR_BZ2]
-checksums = ['9b78c7cf7fc32131c5cf43dd2ab9740149d9d87cadb2e2189f02685749a6b527']
-
-osdependencies = [
-    # needed for --with-verbs
-    ('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel'),
-    # needed for --with-pmix
-    ('pmix-devel'),
-]
-
-builddependencies = [
-    ('Autotools', '20210726', '', SYSTEM),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('hwloc', '2.5.0'),
-    ('UCX', '1.11.2', '', SYSTEM),
-    ('CUDA', '11.5', '', SYSTEM),
-    ('libevent', '2.1.12'),
-]
-
-configopts = '--enable-shared '
-configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
-configopts += '--with-ucx=$EBROOTUCX '
-configopts += '--with-verbs '
-configopts += '--with-libevent=$EBROOTLIBEVENT '
-configopts += '--without-orte '
-configopts += '--without-psm2 '
-configopts += '--disable-oshmem '
-configopts += '--with-cuda=$EBROOTCUDA '
-# No IME in HDFML
-# configopts += '--with-ime=/opt/ddn/ime '
-configopts += '--with-gpfs '
-
-# to enable SLURM integration (site-specific)
-configopts += '--with-slurm --with-pmix=external --with-libevent=external --with-ompi-pmix-rte'
-
-local_libs = ["mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte"]
-sanity_check_paths = {
-    'files': ["bin/%s" % local_binfile for local_binfile in ["ompi_info", "opal_wrapper"]] +
-             ["lib/lib%s.%s" % (local_libfile, SHLIB_EXT) for local_libfile in local_libs] +
-             ["include/%s.h" % x for x in ["mpi-ext", "mpif-config",
-                                           "mpif", "mpi", "mpi_portable_platform"]],
-    'dirs': [],
-}
-
-moduleclass = 'mpi'
diff --git a/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.2-intel-compilers-2021.4.0.eb b/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.2-intel-compilers-2021.4.0.eb
deleted file mode 100644
index 00c80316f..000000000
--- a/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.2-intel-compilers-2021.4.0.eb
+++ /dev/null
@@ -1,62 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'OpenMPI'
-version = '4.1.2'
-
-homepage = 'https://www.open-mpi.org/'
-description = """The Open MPI Project is an open source MPI-3 implementation."""
-
-toolchain = {'name': 'intel-compilers', 'version': '2021.4.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [
-    'https://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
-sources = [SOURCELOWER_TAR_BZ2]
-checksums = ['9b78c7cf7fc32131c5cf43dd2ab9740149d9d87cadb2e2189f02685749a6b527']
-
-osdependencies = [
-    # needed for --with-verbs
-    ('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel'),
-    # needed for --with-pmix
-    ('pmix-devel'),
-]
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('hwloc', '2.5.0'),
-    ('UCX', '1.11.2', '', SYSTEM),
-    ('CUDA', '11.5', '', SYSTEM),
-    ('libevent', '2.1.12'),
-]
-
-configopts = '--enable-shared '
-configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
-configopts += '--with-ucx=$EBROOTUCX '
-configopts += '--with-verbs '
-configopts += '--with-libevent=$EBROOTLIBEVENT '
-configopts += '--without-orte '
-configopts += '--without-psm2 '
-configopts += '--disable-oshmem '
-configopts += '--with-cuda=$EBROOTCUDA '
-# No IME in HDFML
-# configopts += '--with-ime=/opt/ddn/ime '
-configopts += '--with-gpfs '
-
-# to enable SLURM integration (site-specific)
-configopts += '--with-slurm --with-pmix=external --with-libevent=external --with-ompi-pmix-rte'
-
-local_libs = ["mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte"]
-sanity_check_paths = {
-    'files': ["bin/%s" % local_binfile for local_binfile in ["ompi_info", "opal_wrapper"]] +
-             ["lib/lib%s.%s" % (local_libfile, SHLIB_EXT) for local_libfile in local_libs] +
-             ["include/%s.h" % x for x in ["mpi-ext", "mpif-config",
-                                           "mpif", "mpi", "mpi_portable_platform"]],
-    'dirs': [],
-}
-
-moduleclass = 'mpi'
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
deleted file mode 100644
index ab6157539..000000000
--- a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
+++ /dev/null
@@ -1,56 +0,0 @@
-name = 'psmpi'
-version = '5.5.0-1'
-
-homepage = 'https://github.com/ParaStation/psmpi2'
-description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
-based on MPICH v3. It provides extra low level communication libraries and integration with
-various batch systems for tighter process control.
-"""
-
-toolchain = {'name': 'GCC', 'version': '11.2.0'}
-
-sources = [SOURCE_TAR_BZ2]
-source_urls = ['https://github.com/ParaStation/psmpi/archive/']
-checksums = [
-    # psmpi-5.5.0-1.tar.bz2
-    'c178bf618f139857c1bc191938677145cf4fdbec5b8d3afa2ca1de666c791b48',
-    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
-]
-
-builddependencies = [
-    # needed for autogen.sh on CentOS 7
-    ('Autotools', '20210726'),
-    # Autoconf >2.69 is generating a buggy configure script, so take it down to the one that works
-    ('Autoconf', '2.69'),
-]
-dependencies = [
-    ('pscom', '5.4-default', '', SYSTEM),
-    # needed due to the inclusion of hwloc
-    ('libxml2', '2.9.10'),
-    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
-    ('CUDA', '11.5', '', SYSTEM)
-]
-
-patches = [
-    'psmpi_shebang.patch',
-    # We don't have IME in HDFML so we skip this
-    # 'psmpi-5.5.0-1_ime.patch'
-]
-
-# We don't have IME in HDFML so we skip this
-# mpich_opts = '--enable-static --with-file-system=ime+ufs --enable-romio'
-#
-# preconfigopts += 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
-# preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
-# mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
-# We disable gpfs support, since it seems to be problematic under some circumstances. One can disable it by setting
-# ROMIO_FSTYPE_FORCE="ufs:", but then we loose IME support
-mpich_opts = '--enable-static --with-file-system=ufs --enable-romio'
-
-preconfigopts = "./autogen.sh && "
-
-threaded = False
-
-cuda = True
-
-moduleclass = 'mpi'
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-NVHPC-22.1-mt.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-NVHPC-22.1-mt.eb
deleted file mode 100644
index 8a708fe11..000000000
--- a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-NVHPC-22.1-mt.eb
+++ /dev/null
@@ -1,57 +0,0 @@
-name = 'psmpi'
-version = '5.5.0-1'
-versionsuffix = '-mt'
-
-homepage = 'https://github.com/ParaStation/psmpi2'
-description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
-based on MPICH v3. It provides extra low level communication libraries and integration with
-various batch systems for tighter process control.
-"""
-
-toolchain = {'name': 'NVHPC', 'version': '22.1'}
-
-sources = [SOURCE_TAR_BZ2]
-source_urls = ['https://github.com/ParaStation/psmpi/archive/']
-checksums = [
-    # psmpi-5.5.0-1.tar.bz2
-    'c178bf618f139857c1bc191938677145cf4fdbec5b8d3afa2ca1de666c791b48',
-    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
-]
-
-builddependencies = [
-    # needed for autogen.sh on CentOS 7
-    ('Autotools', '20210726'),
-    # Autoconf >2.69 is generating a buggy configure script, so take it down to the one that works
-    ('Autoconf', '2.69'),
-]
-dependencies = [
-    ('pscom', '5.4-default', '', SYSTEM),
-    # needed due to the inclusion of hwloc
-    ('libxml2', '2.9.10'),
-    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
-    ('CUDA', '11.5', '', SYSTEM)
-]
-
-patches = [
-    'psmpi_shebang.patch',
-    # We don't have IME in HDFML so we skip this
-    # 'psmpi-5.5.0-1_ime.patch'
-]
-
-# We don't have IME in HDFML so we skip this
-# mpich_opts = '--enable-static --with-file-system=ime+ufs --enable-romio'
-#
-# preconfigopts += 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
-# preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
-# mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
-# We disable gpfs support, since it seems to be problematic under some circumstances. One can disable it by setting
-# ROMIO_FSTYPE_FORCE="ufs:", but then we loose IME support
-mpich_opts = '--enable-static --with-file-system=ufs --enable-romio'
-
-preconfigopts = "./autogen.sh && "
-
-threaded = True
-
-cuda = True
-
-moduleclass = 'mpi'
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-NVHPC-22.1.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-NVHPC-22.1.eb
deleted file mode 100644
index f273c7a9a..000000000
--- a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-NVHPC-22.1.eb
+++ /dev/null
@@ -1,56 +0,0 @@
-name = 'psmpi'
-version = '5.5.0-1'
-
-homepage = 'https://github.com/ParaStation/psmpi2'
-description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
-based on MPICH v3. It provides extra low level communication libraries and integration with
-various batch systems for tighter process control.
-"""
-
-toolchain = {'name': 'NVHPC', 'version': '22.1'}
-
-sources = [SOURCE_TAR_BZ2]
-source_urls = ['https://github.com/ParaStation/psmpi/archive/']
-checksums = [
-    # psmpi-5.5.0-1.tar.bz2
-    'c178bf618f139857c1bc191938677145cf4fdbec5b8d3afa2ca1de666c791b48',
-    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
-]
-
-builddependencies = [
-    # needed for autogen.sh on CentOS 7
-    ('Autotools', '20210726'),
-    # Autoconf >2.69 is generating a buggy configure script, so take it down to the one that works
-    ('Autoconf', '2.69'),
-]
-dependencies = [
-    ('pscom', '5.4-default', '', SYSTEM),
-    # needed due to the inclusion of hwloc
-    ('libxml2', '2.9.10'),
-    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
-    ('CUDA', '11.5', '', SYSTEM)
-]
-
-patches = [
-    'psmpi_shebang.patch',
-    # We don't have IME in HDFML so we skip this
-    # 'psmpi-5.5.0-1_ime.patch'
-]
-
-# We don't have IME in HDFML so we skip this
-# mpich_opts = '--enable-static --with-file-system=ime+ufs --enable-romio'
-#
-# preconfigopts += 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
-# preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
-# mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
-# We disable gpfs support, since it seems to be problematic under some circumstances. One can disable it by setting
-# ROMIO_FSTYPE_FORCE="ufs:", but then we loose IME support
-mpich_opts = '--enable-static --with-file-system=ufs --enable-romio'
-
-preconfigopts = "./autogen.sh && "
-
-threaded = False
-
-cuda = True
-
-moduleclass = 'mpi'
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
deleted file mode 100644
index 1235961b3..000000000
--- a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
+++ /dev/null
@@ -1,57 +0,0 @@
-name = 'psmpi'
-version = '5.5.0-1'
-versionsuffix = '-mt'
-
-homepage = 'https://github.com/ParaStation/psmpi2'
-description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
-based on MPICH v3. It provides extra low level communication libraries and integration with
-various batch systems for tighter process control.
-"""
-
-toolchain = {'name': 'intel-compilers', 'version': '2021.4.0'}
-
-sources = [SOURCE_TAR_BZ2]
-source_urls = ['https://github.com/ParaStation/psmpi/archive/']
-checksums = [
-    # psmpi-5.5.0-1.tar.bz2
-    'c178bf618f139857c1bc191938677145cf4fdbec5b8d3afa2ca1de666c791b48',
-    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
-]
-
-builddependencies = [
-    # needed for autogen.sh on CentOS 7
-    ('Autotools', '20210726'),
-    # Autoconf >2.69 is generating a buggy configure script, so take it down to the one that works
-    ('Autoconf', '2.69'),
-]
-dependencies = [
-    ('pscom', '5.4-default', '', SYSTEM),
-    # needed due to the inclusion of hwloc
-    ('libxml2', '2.9.10'),
-    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
-    ('CUDA', '11.5', '', SYSTEM)
-]
-
-patches = [
-    'psmpi_shebang.patch',
-    # We don't have IME in HDFML so we skip this
-    # 'psmpi-5.5.0-1_ime.patch'
-]
-
-# We don't have IME in HDFML so we skip this
-# mpich_opts = '--enable-static --with-file-system=ime+ufs --enable-romio'
-#
-# preconfigopts += 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
-# preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
-# mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
-# We disable gpfs support, since it seems to be problematic under some circumstances. One can disable it by setting
-# ROMIO_FSTYPE_FORCE="ufs:", but then we loose IME support
-mpich_opts = '--enable-static --with-file-system=ufs --enable-romio'
-
-preconfigopts = "./autogen.sh && "
-
-threaded = True
-
-cuda = True
-
-moduleclass = 'mpi'
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
deleted file mode 100644
index 7503bf379..000000000
--- a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
+++ /dev/null
@@ -1,56 +0,0 @@
-name = 'psmpi'
-version = '5.5.0-1'
-
-homepage = 'https://github.com/ParaStation/psmpi2'
-description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
-based on MPICH v3. It provides extra low level communication libraries and integration with 
-various batch systems for tighter process control.
-"""
-
-toolchain = {'name': 'intel-compilers', 'version': '2021.4.0'}
-
-sources = [SOURCE_TAR_BZ2]
-source_urls = ['https://github.com/ParaStation/psmpi/archive/']
-checksums = [
-    # psmpi-5.5.0-1.tar.bz2
-    'c178bf618f139857c1bc191938677145cf4fdbec5b8d3afa2ca1de666c791b48',
-    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
-]
-
-builddependencies = [
-    # needed for autogen.sh on CentOS 7
-    ('Autotools', '20210726'),
-    # Autoconf >2.69 is generating a buggy configure script, so take it down to the one that works
-    ('Autoconf', '2.69'),
-]
-dependencies = [
-    ('pscom', '5.4-default', '', SYSTEM),
-    # needed due to the inclusion of hwloc
-    ('libxml2', '2.9.10'),
-    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
-    ('CUDA', '11.5', '', SYSTEM)
-]
-
-patches = [
-    'psmpi_shebang.patch',
-    # We don't have IME in HDFML so we skip this
-    # 'psmpi-5.5.0-1_ime.patch'
-]
-
-# We don't have IME in HDFML so we skip this
-# mpich_opts = '--enable-static --with-file-system=ime+ufs --enable-romio'
-#
-# preconfigopts += 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
-# preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
-# mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
-# We disable gpfs support, since it seems to be problematic under some circumstances. One can disable it by setting
-# ROMIO_FSTYPE_FORCE="ufs:", but then we loose IME support
-mpich_opts = '--enable-static --with-file-system=ufs --enable-romio'
-
-preconfigopts = "./autogen.sh && "
-
-threaded = False
-
-cuda = True
-
-moduleclass = 'mpi'
diff --git a/Overlays/jureca_arm_overlay/h/hwloc/hwloc-2.5.0-GCCcore-11.2.0.eb b/Overlays/jureca_arm_overlay/h/hwloc/hwloc-2.5.0-GCCcore-11.2.0.eb
deleted file mode 100644
index fa89c5df1..000000000
--- a/Overlays/jureca_arm_overlay/h/hwloc/hwloc-2.5.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,53 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'hwloc'
-version = '2.5.0'
-
-homepage = 'https://www.open-mpi.org/projects/hwloc/'
-
-description = """
- The Portable Hardware Locality (hwloc) software package provides a portable
- abstraction (across OS, versions, architectures, ...) of the hierarchical
- topology of modern architectures, including NUMA memory nodes, sockets, shared
- caches, cores and simultaneous multithreading. It also gathers various system
- attributes such as cache and memory information as well as the locality of I/O
- devices such as network interfaces, InfiniBand HCAs or GPUs. It primarily
- aims at helping applications with gathering information about modern computing
- hardware so as to exploit it accordingly and efficiently.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-# need to build with -fno-tree-vectorize to avoid segfaulting lstopo on Intel Skylake
-# cfr. https://github.com/open-mpi/hwloc/issues/315
-toolchainopts = {'vectorize': False}
-
-source_urls = [
-    'https://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
-sources = [SOURCE_TAR_GZ]
-checksums = ['38aa8102faec302791f6b4f0d23960a3ffa25af3af6af006c64dbecac23f852c']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('numactl', '2.0.14', '', SYSTEM),
-    ('libxml2', '2.9.10'),
-    ('libpciaccess', '0.16'),
-    ('CUDA', '11.5', '', SYSTEM),
-]
-
-configopts = "--enable-libnuma=$EBROOTNUMACTL --enable-cuda --enable-nvml --disable-opencl "
-configopts += "--disable-cairo --disable-gl --disable-libudev "
-
-sanity_check_paths = {
-    'files': ['bin/lstopo', 'include/hwloc/linux.h',
-              'lib/libhwloc.%s' % SHLIB_EXT],
-    'dirs': ['share/man/man3'],
-}
-sanity_check_commands = ['lstopo']
-
-modluafooter = '''
-add_property("arch","gpu")
-'''
-moduleclass = 'system'
diff --git a/Overlays/jureca_arm_overlay/o/OpenMPI/OpenMPI-4.1.2-GCC-11.2.0.eb b/Overlays/jureca_arm_overlay/o/OpenMPI/OpenMPI-4.1.2-GCC-11.2.0.eb
deleted file mode 100644
index 38b43e255..000000000
--- a/Overlays/jureca_arm_overlay/o/OpenMPI/OpenMPI-4.1.2-GCC-11.2.0.eb
+++ /dev/null
@@ -1,61 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'OpenMPI'
-version = '4.1.2'
-
-homepage = 'https://www.open-mpi.org/'
-description = """The Open MPI Project is an open source MPI-3 implementation."""
-
-toolchain = {'name': 'GCC', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [
-    'https://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
-sources = [SOURCELOWER_TAR_BZ2]
-checksums = ['9b78c7cf7fc32131c5cf43dd2ab9740149d9d87cadb2e2189f02685749a6b527']
-
-osdependencies = [
-    # needed for --with-verbs
-    ('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel'),
-    # needed for --with-pmix
-    ('pmix-devel'),
-]
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('hwloc', '2.5.0'),
-    ('UCX', '1.11.2', '', SYSTEM),
-    ('CUDA', '11.5', '', SYSTEM),
-    ('libevent', '2.1.12'),
-]
-
-configopts = '--enable-shared '
-configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
-configopts += '--with-ucx=$EBROOTUCX '
-configopts += '--with-verbs '
-configopts += '--with-libevent=$EBROOTLIBEVENT '
-configopts += '--without-orte '
-configopts += '--without-psm2 '
-configopts += '--disable-oshmem '
-configopts += '--with-cuda=$EBROOTCUDA '
-# configopts += '--with-ime=/opt/ddn/ime '
-# configopts += '--with-gpfs '
-
-# to enable SLURM integration (site-specific)
-configopts += '--with-slurm --with-pmix=external --with-libevent=external --with-ompi-pmix-rte'
-
-local_libs = ["mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte"]
-sanity_check_paths = {
-    'files': ["bin/%s" % local_binfile for local_binfile in ["ompi_info", "opal_wrapper"]] +
-             ["lib/lib%s.%s" % (local_libfile, SHLIB_EXT) for local_libfile in local_libs] +
-             ["include/%s.h" % x for x in ["mpi-ext", "mpif-config",
-                                           "mpif", "mpi", "mpi_portable_platform"]],
-    'dirs': [],
-}
-
-moduleclass = 'mpi'
diff --git a/Overlays/jureca_arm_overlay/o/OpenMPI/OpenMPI-4.1.2-NVHPC-22.1.eb b/Overlays/jureca_arm_overlay/o/OpenMPI/OpenMPI-4.1.2-NVHPC-22.1.eb
deleted file mode 100644
index a08ee1729..000000000
--- a/Overlays/jureca_arm_overlay/o/OpenMPI/OpenMPI-4.1.2-NVHPC-22.1.eb
+++ /dev/null
@@ -1,61 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'OpenMPI'
-version = '4.1.2'
-
-homepage = 'https://www.open-mpi.org/'
-description = """The Open MPI Project is an open source MPI-3 implementation."""
-
-toolchain = {'name': 'NVHPC', 'version': '22.1'}
-toolchainopts = {'pic': True}
-
-source_urls = [
-    'https://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
-sources = [SOURCELOWER_TAR_BZ2]
-checksums = ['9b78c7cf7fc32131c5cf43dd2ab9740149d9d87cadb2e2189f02685749a6b527']
-
-osdependencies = [
-    # needed for --with-verbs
-    ('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel'),
-    # needed for --with-pmix
-    ('pmix-devel'),
-]
-
-builddependencies = [
-    ('Autotools', '20210726', '', SYSTEM),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('hwloc', '2.5.0'),
-    ('UCX', '1.11.2', '', SYSTEM),
-    ('CUDA', '11.5', '', SYSTEM),
-    ('libevent', '2.1.12'),
-]
-
-configopts = '--enable-shared '
-configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
-configopts += '--with-ucx=$EBROOTUCX '
-configopts += '--with-verbs '
-configopts += '--with-libevent=$EBROOTLIBEVENT '
-configopts += '--without-orte '
-configopts += '--without-psm2 '
-configopts += '--disable-oshmem '
-configopts += '--with-cuda=$EBROOTCUDA '
-# configopts += '--with-ime=/opt/ddn/ime '
-# configopts += '--with-gpfs '
-
-# to enable SLURM integration (site-specific)
-configopts += '--with-slurm --with-pmix=external --with-libevent=external --with-ompi-pmix-rte'
-
-local_libs = ["mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte"]
-sanity_check_paths = {
-    'files': ["bin/%s" % local_binfile for local_binfile in ["ompi_info", "opal_wrapper"]] +
-             ["lib/lib%s.%s" % (local_libfile, SHLIB_EXT) for local_libfile in local_libs] +
-             ["include/%s.h" % x for x in ["mpi-ext", "mpif-config",
-                                           "mpif", "mpi", "mpi_portable_platform"]],
-    'dirs': [],
-}
-
-moduleclass = 'mpi'
diff --git a/Overlays/jureca_mi200_overlay/b/BLIS/BLIS-0.8.1-GCCcore-11.2.0.eb b/Overlays/jureca_mi200_overlay/b/BLIS/BLIS-0.8.1-GCCcore-11.2.0.eb
deleted file mode 100644
index 96688e4b6..000000000
--- a/Overlays/jureca_mi200_overlay/b/BLIS/BLIS-0.8.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,41 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'BLIS'
-version = '0.8.1'
-
-homepage = 'https://github.com/flame/blis/'
-description = """BLIS is a portable software framework for instantiating high-performance
-BLAS-like dense linear algebra libraries."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://github.com/flame/blis/archive/']
-sources = ['%(version)s.tar.gz']
-patches = [
-    '%(name)s-%(version)s_fix_dgemm-fpe-signalling-on-broadwell.patch',
-]
-checksums = [
-    '729694128719801e82fae7b5f2489ab73e4a467f46271beff09588c9265a697b',  # 0.8.1.tar.gz
-    # BLIS-0.8.1_fix_dgemm-fpe-signalling-on-broadwell.patch
-    '345fa39933e9d1442d2eb1e4ed9129df3fe4aefecf4d104e5d4f25b3bca24d0d',
-]
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Python', '3.9.6'),
-    ('Perl', '5.34.0'),
-]
-
-configopts = '--enable-cblas --enable-threading=openmp --enable-shared CC="$CC" auto'
-
-runtest = 'check'
-
-sanity_check_paths = {
-    'files': ['include/blis/cblas.h', 'include/blis/blis.h',
-              'lib/libblis.a', 'lib/libblis.%s' % SHLIB_EXT],
-    'dirs': [],
-}
-
-modextrapaths = {'CPATH': 'include/blis'}
-
-moduleclass = 'numlib'
diff --git a/Overlays/jureca_mi200_overlay/b/BLIS/BLIS-0.8.1_fix_dgemm-fpe-signalling-on-broadwell.patch b/Overlays/jureca_mi200_overlay/b/BLIS/BLIS-0.8.1_fix_dgemm-fpe-signalling-on-broadwell.patch
deleted file mode 100644
index ad6dee6c3..000000000
--- a/Overlays/jureca_mi200_overlay/b/BLIS/BLIS-0.8.1_fix_dgemm-fpe-signalling-on-broadwell.patch
+++ /dev/null
@@ -1,2219 +0,0 @@
-Taken from https://github.com/flame/blis/pull/544
-Fixes a problem with DGEMM causing FPR signalling on Broadwell
-See https://github.com/flame/blis/issues/486
-
-Åke Sandgren, 20210916
-
-commit 5191c43faccf45975f577c60b9089abee25722c9
-Author: Devin Matthews <damatthews@smu.edu>
-Date:   Thu Sep 16 10:16:17 2021 -0500
-
-    Fix more copy-paste errors in the haswell gemmsup code.
-    
-    Fixes #486.
-
-diff --git a/kernels/haswell/3/sup/d6x8/bli_gemmsup_rd_haswell_asm_dMx4.c b/kernels/haswell/3/sup/d6x8/bli_gemmsup_rd_haswell_asm_dMx4.c
-index 4c6094b1..21dd3b89 100644
---- a/kernels/haswell/3/sup/d6x8/bli_gemmsup_rd_haswell_asm_dMx4.c
-+++ b/kernels/haswell/3/sup/d6x8/bli_gemmsup_rd_haswell_asm_dMx4.c
-@@ -101,7 +101,7 @@ void bli_dgemmsup_rd_haswell_asm_6x4
- 	begin_asm()
- 
- 	//vzeroall()                         // zero all xmm/ymm registers.
--	
-+
- 	mov(var(a), r14)                   // load address of a.
- 	mov(var(rs_a), r8)                 // load rs_a
- 	//mov(var(cs_a), r9)                 // load cs_a
-@@ -119,7 +119,7 @@ void bli_dgemmsup_rd_haswell_asm_6x4
- 
- 	lea(mem(r11, r11, 2), r13)         // r13 = 3*cs_b
- 	lea(mem(r8,  r8,  2), r10)         // r10 = 3*rs_a
--	
-+
- 
- 	mov(var(c), r12)                   // load address of c
- 	mov(var(rs_c), rdi)                // load rs_c
-@@ -172,19 +172,19 @@ void bli_dgemmsup_rd_haswell_asm_6x4
- 	prefetch(0, mem(rcx, rdi, 2, 3*8)) // prefetch c + 2*rs_c
- #endif
- 	lea(mem(r8,  r8,  4), rbp)         // rbp = 5*rs_a
--	
- 
--	
--	
-+
-+
-+
- 	mov(var(k_iter16), rsi)            // i = k_iter16;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DCONSIDKITER4)                 // if i == 0, jump to code that
- 	                                   // contains the k_iter4 loop.
--	
--	
-+
-+
- 	label(.DLOOPKITER16)               // MAIN LOOP
--	
--	
-+
-+
- 	// ---------------------------------- iteration 0
- 
- #if 0
-@@ -219,7 +219,7 @@ void bli_dgemmsup_rd_haswell_asm_6x4
- 	vfmadd231pd(ymm1, ymm3, ymm14)
- 	vfmadd231pd(ymm2, ymm3, ymm15)
- 
--	
-+
- 	// ---------------------------------- iteration 1
- 
- 	vmovupd(mem(rax       ), ymm0)
-@@ -250,7 +250,7 @@ void bli_dgemmsup_rd_haswell_asm_6x4
- 
- 
- 	// ---------------------------------- iteration 2
--	
-+
- #if 0
- 	prefetch(0, mem(rax, r10, 1, 0*8)) // prefetch rax + 3*cs_a
- 	prefetch(0, mem(rax, r8,  4, 0*8)) // prefetch rax + 4*cs_a
-@@ -312,27 +312,27 @@ void bli_dgemmsup_rd_haswell_asm_6x4
- 	vfmadd231pd(ymm1, ymm3, ymm14)
- 	vfmadd231pd(ymm2, ymm3, ymm15)
- 
--	
-+
- 
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKITER16)                 // iterate again if i != 0.
--	
--	
--	
--	
--	
--	
-+
-+
-+
-+
-+
-+
- 	label(.DCONSIDKITER4)
--	
-+
- 	mov(var(k_iter4), rsi)             // i = k_iter4;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DCONSIDKLEFT1)                 // if i == 0, jump to code that
- 	                                   // considers k_left1 loop.
- 	                                   // else, we prepare to enter k_iter4 loop.
--	
--	
-+
-+
- 	label(.DLOOPKITER4)                // EDGE LOOP (ymm)
--	
-+
- #if 0
- 	prefetch(0, mem(rax, r10, 1, 0*8)) // prefetch rax + 3*cs_a
- 	prefetch(0, mem(rax, r8,  4, 0*8)) // prefetch rax + 4*cs_a
-@@ -343,7 +343,7 @@ void bli_dgemmsup_rd_haswell_asm_6x4
- 	vmovupd(mem(rax, r8, 1), ymm1)
- 	vmovupd(mem(rax, r8, 2), ymm2)
- 	add(imm(4*8), rax)                 // a += 4*cs_b = 4*8;
--	
-+
- 	vmovupd(mem(rbx        ), ymm3)
- 	vfmadd231pd(ymm0, ymm3, ymm4)
- 	vfmadd231pd(ymm1, ymm3, ymm5)
-@@ -365,21 +365,21 @@ void bli_dgemmsup_rd_haswell_asm_6x4
- 	vfmadd231pd(ymm1, ymm3, ymm14)
- 	vfmadd231pd(ymm2, ymm3, ymm15)
- 
--	
-+
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKITER4)                  // iterate again if i != 0.
--	
--	
--	
-+
-+
-+
- 
- 	label(.DCONSIDKLEFT1)
--	
-+
- 	mov(var(k_left1), rsi)             // i = k_left1;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DPOSTACCUM)                    // if i == 0, we're done; jump to end.
- 	                                   // else, we prepare to enter k_left1 loop.
--	
--	
-+
-+
- 
- 
- 	label(.DLOOPKLEFT1)                // EDGE LOOP (scalar)
-@@ -387,12 +387,12 @@ void bli_dgemmsup_rd_haswell_asm_6x4
- 	                                   // using the xmm registers would zero out the
- 	                                   // high bits of the destination registers,
- 	                                   // which would destory intermediate results.
--	
-+
- 	vmovsd(mem(rax       ), xmm0)
- 	vmovsd(mem(rax, r8, 1), xmm1)
- 	vmovsd(mem(rax, r8, 2), xmm2)
- 	add(imm(1*8), rax)                 // a += 1*cs_a = 1*8;
--	
-+
- 	vmovsd(mem(rbx        ), xmm3)
- 	vfmadd231pd(ymm0, ymm3, ymm4)
- 	vfmadd231pd(ymm1, ymm3, ymm5)
-@@ -414,12 +414,12 @@ void bli_dgemmsup_rd_haswell_asm_6x4
- 	vfmadd231pd(ymm1, ymm3, ymm14)
- 	vfmadd231pd(ymm2, ymm3, ymm15)
- 
--	
-+
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKLEFT1)                  // iterate again if i != 0.
--	
--	
--	
-+
-+
-+
- 
- 
- 
-@@ -427,11 +427,11 @@ void bli_dgemmsup_rd_haswell_asm_6x4
- 	label(.DPOSTACCUM)
- 
- 
--	
--	                                   // ymm4  ymm7  ymm10 ymm13  
-+
-+	                                   // ymm4  ymm7  ymm10 ymm13
- 	                                   // ymm5  ymm8  ymm11 ymm14
- 	                                   // ymm6  ymm9  ymm12 ymm15
--	
-+
- 	vhaddpd( ymm7, ymm4, ymm0 )
- 	vextractf128(imm(1), ymm0, xmm1 )
- 	vaddpd( xmm0, xmm1, xmm0 )
-@@ -469,7 +469,7 @@ void bli_dgemmsup_rd_haswell_asm_6x4
- 	                                   // xmm6[0:3] = sum(ymm6) sum(ymm9) sum(ymm12) sum(ymm15)
- 
- 
--	
-+
- 	//mov(var(rs_c), rdi)                // load rs_c
- 	//lea(mem(, rdi, 8), rdi)            // rs_c *= sizeof(double)
- 
-@@ -477,73 +477,73 @@ void bli_dgemmsup_rd_haswell_asm_6x4
- 	mov(var(beta), rbx)                // load address of beta
- 	vbroadcastsd(mem(rax), ymm0)       // load alpha and duplicate
- 	vbroadcastsd(mem(rbx), ymm3)       // load beta and duplicate
--	
-+
- 	vmulpd(ymm0, ymm4, ymm4)           // scale by alpha
- 	vmulpd(ymm0, ymm5, ymm5)
- 	vmulpd(ymm0, ymm6, ymm6)
--	
--	
--	
--	
--	
--	
-+
-+
-+
-+
-+
-+
- 	//mov(var(cs_c), rsi)                // load cs_c
- 	//lea(mem(, rsi, 8), rsi)            // rsi = cs_c * sizeof(double)
--	
--	
--	
-+
-+
-+
- 	                                   // now avoid loading C if beta == 0
--	
-+
- 	vxorpd(ymm0, ymm0, ymm0)           // set ymm0 to zero.
- 	vucomisd(xmm0, xmm3)               // set ZF if beta == 0.
- 	je(.DBETAZERO)                     // if ZF = 1, jump to beta == 0 case
--	
- 
--	
-+
-+
- 	label(.DROWSTORED)
--	
--	
-+
-+
- 	vfmadd231pd(mem(rcx), ymm3, ymm4)
- 	vmovupd(ymm4, mem(rcx))
- 	add(rdi, rcx)
--	
-+
- 	vfmadd231pd(mem(rcx), ymm3, ymm5)
- 	vmovupd(ymm5, mem(rcx))
- 	add(rdi, rcx)
--	
-+
- 	vfmadd231pd(mem(rcx), ymm3, ymm6)
- 	vmovupd(ymm6, mem(rcx))
- 	//add(rdi, rcx)
--	
--	
--	
-+
-+
-+
- 	jmp(.DDONE)                        // jump to end.
--	
--	
--	
--	
-+
-+
-+
-+
- 	label(.DBETAZERO)
--	
- 
--	
-+
-+
- 	label(.DROWSTORBZ)
--	
--	
-+
-+
- 	vmovupd(ymm4, mem(rcx))
- 	add(rdi, rcx)
--	
-+
- 	vmovupd(ymm5, mem(rcx))
- 	add(rdi, rcx)
--	
-+
- 	vmovupd(ymm6, mem(rcx))
- 	//add(rdi, rcx)
--	
--	
--	
--	
-+
-+
-+
-+
- 	label(.DDONE)
--	
--	
-+
-+
- 
- 
- 	lea(mem(r12, rdi, 2), r12)         //
-@@ -560,7 +560,7 @@ void bli_dgemmsup_rd_haswell_asm_6x4
- 
- 	label(.DRETURN)
- 
--	
-+
- 
-     end_asm(
- 	: // output operands (none)
-@@ -629,7 +629,7 @@ void bli_dgemmsup_rd_haswell_asm_2x4
- 	// -------------------------------------------------------------------------
- 
- 	begin_asm()
--	
-+
- 	//vzeroall()                         // zero all xmm/ymm registers.
- 
- 	mov(var(a), rax)                   // load address of a.
-@@ -649,7 +649,7 @@ void bli_dgemmsup_rd_haswell_asm_2x4
- 
- 	lea(mem(r11, r11, 2), r13)         // r13 = 3*cs_b
- 	//lea(mem(r8,  r8,  2), r10)         // r10 = 3*rs_a
--	
-+
- 
- 	mov(var(c), rcx)                   // load address of c
- 	mov(var(rs_c), rdi)                // load rs_c
-@@ -682,7 +682,7 @@ void bli_dgemmsup_rd_haswell_asm_2x4
- 	//lea(mem(r14), rax)                 // rax = a;
- 	//lea(mem(rdx), rbx)                 // rbx = b;
- 
--	
-+
- #if 1
- 	//mov(var(rs_c), rdi)                // load rs_c
- 	//lea(mem(, rdi, 8), rdi)            // rs_c *= sizeof(double)
-@@ -690,18 +690,18 @@ void bli_dgemmsup_rd_haswell_asm_2x4
- 	prefetch(0, mem(rcx, rdi, 1, 3*8)) // prefetch c + 1*rs_c
- #endif
- 
--	
--	
--	
-+
-+
-+
- 	mov(var(k_iter16), rsi)            // i = k_iter16;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DCONSIDKITER4)                 // if i == 0, jump to code that
- 	                                   // contains the k_iter4 loop.
--	
--	
-+
-+
- 	label(.DLOOPKITER16)               // MAIN LOOP
--	
--	
-+
-+
- 	// ---------------------------------- iteration 0
- 
- #if 0
-@@ -730,7 +730,7 @@ void bli_dgemmsup_rd_haswell_asm_2x4
- 	vfmadd231pd(ymm0, ymm3, ymm13)
- 	vfmadd231pd(ymm1, ymm3, ymm14)
- 
--	
-+
- 	// ---------------------------------- iteration 1
- 
- 	vmovupd(mem(rax       ), ymm0)
-@@ -756,7 +756,7 @@ void bli_dgemmsup_rd_haswell_asm_2x4
- 
- 
- 	// ---------------------------------- iteration 2
--	
-+
- #if 0
- 	prefetch(0, mem(rax, r10, 1, 0*8)) // prefetch rax + 3*cs_a
- 	prefetch(0, mem(rax, r8,  4, 0*8)) // prefetch rax + 4*cs_a
-@@ -807,27 +807,27 @@ void bli_dgemmsup_rd_haswell_asm_2x4
- 	vfmadd231pd(ymm0, ymm3, ymm13)
- 	vfmadd231pd(ymm1, ymm3, ymm14)
- 
--	
-+
- 
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKITER16)                 // iterate again if i != 0.
--	
--	
--	
--	
--	
--	
-+
-+
-+
-+
-+
-+
- 	label(.DCONSIDKITER4)
--	
-+
- 	mov(var(k_iter4), rsi)             // i = k_iter4;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DCONSIDKLEFT1)                 // if i == 0, jump to code that
- 	                                   // considers k_left1 loop.
- 	                                   // else, we prepare to enter k_iter4 loop.
--	
--	
-+
-+
- 	label(.DLOOPKITER4)                // EDGE LOOP (ymm)
--	
-+
- #if 0
- 	prefetch(0, mem(rax, r10, 1, 0*8)) // prefetch rax + 3*cs_a
- 	prefetch(0, mem(rax, r8,  4, 0*8)) // prefetch rax + 4*cs_a
-@@ -836,7 +836,7 @@ void bli_dgemmsup_rd_haswell_asm_2x4
- 	vmovupd(mem(rax       ), ymm0)
- 	vmovupd(mem(rax, r8, 1), ymm1)
- 	add(imm(4*8), rax)                 // a += 4*cs_b = 4*8;
--	
-+
- 	vmovupd(mem(rbx        ), ymm3)
- 	vfmadd231pd(ymm0, ymm3, ymm4)
- 	vfmadd231pd(ymm1, ymm3, ymm5)
-@@ -854,21 +854,21 @@ void bli_dgemmsup_rd_haswell_asm_2x4
- 	vfmadd231pd(ymm0, ymm3, ymm13)
- 	vfmadd231pd(ymm1, ymm3, ymm14)
- 
--	
-+
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKITER4)                  // iterate again if i != 0.
--	
--	
--	
-+
-+
-+
- 
- 	label(.DCONSIDKLEFT1)
--	
-+
- 	mov(var(k_left1), rsi)             // i = k_left1;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DPOSTACCUM)                    // if i == 0, we're done; jump to end.
- 	                                   // else, we prepare to enter k_left1 loop.
--	
--	
-+
-+
- 
- 
- 	label(.DLOOPKLEFT1)                // EDGE LOOP (scalar)
-@@ -876,11 +876,11 @@ void bli_dgemmsup_rd_haswell_asm_2x4
- 	                                   // using the xmm registers would zero out the
- 	                                   // high bits of the destination registers,
- 	                                   // which would destory intermediate results.
--	
-+
- 	vmovsd(mem(rax       ), xmm0)
- 	vmovsd(mem(rax, r8, 1), xmm1)
- 	add(imm(1*8), rax)                 // a += 1*cs_a = 1*8;
--	
-+
- 	vmovsd(mem(rbx        ), xmm3)
- 	vfmadd231pd(ymm0, ymm3, ymm4)
- 	vfmadd231pd(ymm1, ymm3, ymm5)
-@@ -898,12 +898,12 @@ void bli_dgemmsup_rd_haswell_asm_2x4
- 	vfmadd231pd(ymm0, ymm3, ymm13)
- 	vfmadd231pd(ymm1, ymm3, ymm14)
- 
--	
-+
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKLEFT1)                  // iterate again if i != 0.
--	
--	
--	
-+
-+
-+
- 
- 
- 
-@@ -911,10 +911,10 @@ void bli_dgemmsup_rd_haswell_asm_2x4
- 	label(.DPOSTACCUM)
- 
- 
--	
--	                                   // ymm4  ymm7  ymm10 ymm13  
-+
-+	                                   // ymm4  ymm7  ymm10 ymm13
- 	                                   // ymm5  ymm8  ymm11 ymm14
--	
-+
- 	vhaddpd( ymm7, ymm4, ymm0 )
- 	vextractf128(imm(1), ymm0, xmm1 )
- 	vaddpd( xmm0, xmm1, xmm0 )
-@@ -943,75 +943,75 @@ void bli_dgemmsup_rd_haswell_asm_2x4
- 
- 	//mov(var(rs_c), rdi)                // load rs_c
-     //lea(mem(, rdi, 4), rdi)            // rs_c *= sizeof(float)
--	
-+
- 	mov(var(alpha), rax)               // load address of alpha
- 	mov(var(beta), rbx)                // load address of beta
- 	vbroadcastsd(mem(rax), ymm0)       // load alpha and duplicate
- 	vbroadcastsd(mem(rbx), ymm3)       // load beta and duplicate
--	
-+
- 	vmulpd(ymm0, ymm4, ymm4)           // scale by alpha
- 	vmulpd(ymm0, ymm5, ymm5)
--	
--	
--	
--	
--	
--	
-+
-+
-+
-+
-+
-+
- 	//mov(var(cs_c), rsi)                // load cs_c
- 	//lea(mem(, rsi, 8), rsi)            // rsi = cs_c * sizeof(double)
--	
--	
--	
-+
-+
-+
- 	                                   // now avoid loading C if beta == 0
--	
-+
- 	vxorpd(ymm0, ymm0, ymm0)           // set ymm0 to zero.
- 	vucomisd(xmm0, xmm3)               // set ZF if beta == 0.
- 	je(.DBETAZERO)                     // if ZF = 1, jump to beta == 0 case
--	
- 
--	
-+
-+
- 	label(.DROWSTORED)
--	
--	
-+
-+
- 	vfmadd231pd(mem(rcx), ymm3, ymm4)
- 	vmovupd(ymm4, mem(rcx))
- 	add(rdi, rcx)
--	
-+
- 	vfmadd231pd(mem(rcx), ymm3, ymm5)
- 	vmovupd(ymm5, mem(rcx))
- 	//add(rdi, rcx)
--	
--	
--	
-+
-+
-+
- 	jmp(.DDONE)                        // jump to end.
--	
--	
--	
--	
-+
-+
-+
-+
- 	label(.DBETAZERO)
--	
- 
--	
-+
-+
- 	label(.DROWSTORBZ)
--	
--	
-+
-+
- 	vmovupd(ymm4, mem(rcx))
- 	add(rdi, rcx)
--	
-+
- 	vmovupd(ymm5, mem(rcx))
- 	//add(rdi, rcx)
--	
--	
--	
--	
-+
-+
-+
-+
- 	label(.DDONE)
- 
- 
- 
- 
- 	label(.DRETURN)
--	
--	
-+
-+
- 
-     end_asm(
- 	: // output operands (none)
-@@ -1079,7 +1079,7 @@ void bli_dgemmsup_rd_haswell_asm_1x4
- 	// -------------------------------------------------------------------------
- 
- 	begin_asm()
--	
-+
- 	//vzeroall()                         // zero all xmm/ymm registers.
- 
- 	mov(var(a), rax)                   // load address of a.
-@@ -1099,7 +1099,7 @@ void bli_dgemmsup_rd_haswell_asm_1x4
- 
- 	lea(mem(r11, r11, 2), r13)         // r13 = 3*cs_b
- 	//lea(mem(r8,  r8,  2), r10)         // r10 = 3*rs_a
--	
-+
- 
- 	mov(var(c), rcx)                   // load address of c
- 	mov(var(rs_c), rdi)                // load rs_c
-@@ -1128,26 +1128,26 @@ void bli_dgemmsup_rd_haswell_asm_1x4
- 	//lea(mem(r14), rax)                 // rax = a;
- 	//lea(mem(rdx), rbx)                 // rbx = b;
- 
--	
-+
- #if 1
- 	//mov(var(rs_c), rdi)                // load rs_c
- 	//lea(mem(, rdi, 8), rdi)            // rs_c *= sizeof(double)
- 	prefetch(0, mem(rcx,         3*8)) // prefetch c + 0*rs_c
--	prefetch(0, mem(rcx, rdi, 1, 3*8)) // prefetch c + 1*rs_c
-+	//prefetch(0, mem(rcx, rdi, 1, 3*8)) // prefetch c + 1*rs_c
- #endif
- 
--	
--	
--	
-+
-+
-+
- 	mov(var(k_iter16), rsi)            // i = k_iter16;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DCONSIDKITER4)                 // if i == 0, jump to code that
- 	                                   // contains the k_iter4 loop.
--	
--	
-+
-+
- 	label(.DLOOPKITER16)               // MAIN LOOP
--	
--	
-+
-+
- 	// ---------------------------------- iteration 0
- 
- #if 0
-@@ -1170,7 +1170,7 @@ void bli_dgemmsup_rd_haswell_asm_1x4
- 	add(imm(4*8), rbx)                 // b += 4*rs_b = 4*8;
- 	vfmadd231pd(ymm0, ymm3, ymm13)
- 
--	
-+
- 	// ---------------------------------- iteration 1
- 
- 	vmovupd(mem(rax       ), ymm0)
-@@ -1191,7 +1191,7 @@ void bli_dgemmsup_rd_haswell_asm_1x4
- 
- 
- 	// ---------------------------------- iteration 2
--	
-+
- #if 0
- 	prefetch(0, mem(rax, r10, 1, 0*8)) // prefetch rax + 3*cs_a
- #endif
-@@ -1231,27 +1231,27 @@ void bli_dgemmsup_rd_haswell_asm_1x4
- 	add(imm(4*8), rbx)                 // b += 4*rs_b = 4*8;
- 	vfmadd231pd(ymm0, ymm3, ymm13)
- 
--	
-+
- 
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKITER16)                 // iterate again if i != 0.
--	
--	
--	
--	
--	
--	
-+
-+
-+
-+
-+
-+
- 	label(.DCONSIDKITER4)
--	
-+
- 	mov(var(k_iter4), rsi)             // i = k_iter4;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DCONSIDKLEFT1)                 // if i == 0, jump to code that
- 	                                   // considers k_left1 loop.
- 	                                   // else, we prepare to enter k_iter4 loop.
--	
--	
-+
-+
- 	label(.DLOOPKITER4)                // EDGE LOOP (ymm)
--	
-+
- #if 0
- 	prefetch(0, mem(rax, r10, 1, 0*8)) // prefetch rax + 3*cs_a
- 	prefetch(0, mem(rax, r8,  4, 0*8)) // prefetch rax + 4*cs_a
-@@ -1259,7 +1259,7 @@ void bli_dgemmsup_rd_haswell_asm_1x4
- 
- 	vmovupd(mem(rax       ), ymm0)
- 	add(imm(4*8), rax)                 // a += 4*cs_b = 4*8;
--	
-+
- 	vmovupd(mem(rbx        ), ymm3)
- 	vfmadd231pd(ymm0, ymm3, ymm4)
- 
-@@ -1273,21 +1273,21 @@ void bli_dgemmsup_rd_haswell_asm_1x4
- 	add(imm(4*8), rbx)                 // b += 4*rs_b = 4*8;
- 	vfmadd231pd(ymm0, ymm3, ymm13)
- 
--	
-+
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKITER4)                  // iterate again if i != 0.
--	
--	
--	
-+
-+
-+
- 
- 	label(.DCONSIDKLEFT1)
--	
-+
- 	mov(var(k_left1), rsi)             // i = k_left1;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DPOSTACCUM)                    // if i == 0, we're done; jump to end.
- 	                                   // else, we prepare to enter k_left1 loop.
--	
--	
-+
-+
- 
- 
- 	label(.DLOOPKLEFT1)                // EDGE LOOP (scalar)
-@@ -1295,10 +1295,10 @@ void bli_dgemmsup_rd_haswell_asm_1x4
- 	                                   // using the xmm registers would zero out the
- 	                                   // high bits of the destination registers,
- 	                                   // which would destory intermediate results.
--	
-+
- 	vmovsd(mem(rax       ), xmm0)
- 	add(imm(1*8), rax)                 // a += 1*cs_a = 1*8;
--	
-+
- 	vmovsd(mem(rbx        ), xmm3)
- 	vfmadd231pd(ymm0, ymm3, ymm4)
- 
-@@ -1312,12 +1312,12 @@ void bli_dgemmsup_rd_haswell_asm_1x4
- 	add(imm(1*8), rbx)                 // b += 1*rs_b = 1*8;
- 	vfmadd231pd(ymm0, ymm3, ymm13)
- 
--	
-+
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKLEFT1)                  // iterate again if i != 0.
--	
--	
--	
-+
-+
-+
- 
- 
- 
-@@ -1325,9 +1325,9 @@ void bli_dgemmsup_rd_haswell_asm_1x4
- 	label(.DPOSTACCUM)
- 
- 
--	
--	                                   // ymm4  ymm7  ymm10 ymm13  
--	
-+
-+	                                   // ymm4  ymm7  ymm10 ymm13
-+
- 	vhaddpd( ymm7, ymm4, ymm0 )
- 	vextractf128(imm(1), ymm0, xmm1 )
- 	vaddpd( xmm0, xmm1, xmm0 )
-@@ -1339,15 +1339,15 @@ void bli_dgemmsup_rd_haswell_asm_1x4
- 	vperm2f128(imm(0x20), ymm2, ymm0, ymm4 )
- 
- 
--	vhaddpd( ymm8, ymm5, ymm0 )
--	vextractf128(imm(1), ymm0, xmm1 )
--	vaddpd( xmm0, xmm1, xmm0 )
-+	//vhaddpd( ymm8, ymm5, ymm0 )
-+	//vextractf128(imm(1), ymm0, xmm1 )
-+	//vaddpd( xmm0, xmm1, xmm0 )
- 
--	vhaddpd( ymm14, ymm11, ymm2 )
--	vextractf128(imm(1), ymm2, xmm1 )
--	vaddpd( xmm2, xmm1, xmm2 )
-+	//vhaddpd( ymm14, ymm11, ymm2 )
-+	//vextractf128(imm(1), ymm2, xmm1 )
-+	//vaddpd( xmm2, xmm1, xmm2 )
- 
--	vperm2f128(imm(0x20), ymm2, ymm0, ymm5 )
-+	//vperm2f128(imm(0x20), ymm2, ymm0, ymm5 )
- 
- 	                                   // xmm4[0:3] = sum(ymm4) sum(ymm7) sum(ymm10) sum(ymm13)
- 
-@@ -1355,67 +1355,67 @@ void bli_dgemmsup_rd_haswell_asm_1x4
- 
- 	//mov(var(rs_c), rdi)                // load rs_c
-     //lea(mem(, rdi, 4), rdi)            // rs_c *= sizeof(float)
--	
-+
- 	mov(var(alpha), rax)               // load address of alpha
- 	mov(var(beta), rbx)                // load address of beta
- 	vbroadcastsd(mem(rax), ymm0)       // load alpha and duplicate
- 	vbroadcastsd(mem(rbx), ymm3)       // load beta and duplicate
--	
-+
- 	vmulpd(ymm0, ymm4, ymm4)           // scale by alpha
--	
--	
--	
--	
--	
--	
-+
-+
-+
-+
-+
-+
- 	//mov(var(cs_c), rsi)                // load cs_c
- 	//lea(mem(, rsi, 8), rsi)            // rsi = cs_c * sizeof(double)
--	
--	
--	
-+
-+
-+
- 	                                   // now avoid loading C if beta == 0
--	
-+
- 	vxorpd(ymm0, ymm0, ymm0)           // set ymm0 to zero.
- 	vucomisd(xmm0, xmm3)               // set ZF if beta == 0.
- 	je(.DBETAZERO)                     // if ZF = 1, jump to beta == 0 case
--	
- 
--	
-+
-+
- 	label(.DROWSTORED)
--	
--	
-+
-+
- 	vfmadd231pd(mem(rcx), ymm3, ymm4)
- 	vmovupd(ymm4, mem(rcx))
- 	//add(rdi, rcx)
--	
--	
--	
-+
-+
-+
- 	jmp(.DDONE)                        // jump to end.
--	
--	
--	
--	
-+
-+
-+
-+
- 	label(.DBETAZERO)
--	
- 
--	
-+
-+
- 	label(.DROWSTORBZ)
--	
--	
-+
-+
- 	vmovupd(ymm4, mem(rcx))
- 	//add(rdi, rcx)
--	
--	
--	
--	
-+
-+
-+
-+
- 	label(.DDONE)
- 
- 
- 
- 
- 	label(.DRETURN)
--	
--	
-+
-+
- 
-     end_asm(
- 	: // output operands (none)
-commit e3dc1954ffb5eee2a8b41fce85ba589f75770eea
-Author: Devin Matthews <damatthews@smu.edu>
-Date:   Thu Sep 16 10:59:37 2021 -0500
-
-    Fix problem where uninitialized registers are included in vhaddpd in the Mx1 gemmsup kernels for haswell.
-    
-    The fix is to use the same (valid) source register twice in the horizontal addition.
-
-diff --git a/kernels/haswell/3/sup/d6x8/bli_gemmsup_rd_haswell_asm_dMx1.c b/kernels/haswell/3/sup/d6x8/bli_gemmsup_rd_haswell_asm_dMx1.c
-index 6e3c1a0e..457ef9f2 100644
---- a/kernels/haswell/3/sup/d6x8/bli_gemmsup_rd_haswell_asm_dMx1.c
-+++ b/kernels/haswell/3/sup/d6x8/bli_gemmsup_rd_haswell_asm_dMx1.c
-@@ -99,9 +99,9 @@ void bli_dgemmsup_rd_haswell_asm_6x1
- 	// -------------------------------------------------------------------------
- 
- 	begin_asm()
--	
-+
- 	//vzeroall()                         // zero all xmm/ymm registers.
--	
-+
- 	mov(var(a), rax)                   // load address of a.
- 	mov(var(rs_a), r8)                 // load rs_a
- 	//mov(var(cs_a), r9)                 // load cs_a
-@@ -119,7 +119,7 @@ void bli_dgemmsup_rd_haswell_asm_6x1
- 
- 	//lea(mem(r11, r11, 2), r13)         // r13 = 3*cs_b
- 	//lea(mem(r8,  r8,  2), r10)         // r10 = 3*rs_a
--	
-+
- 
- 	mov(var(c), rcx)                   // load address of c
- 	mov(var(rs_c), rdi)                // load rs_c
-@@ -163,19 +163,19 @@ void bli_dgemmsup_rd_haswell_asm_6x1
- 	prefetch(0, mem(r10, rdi, 1, 1*8)) // prefetch c + 4*rs_c
- 	prefetch(0, mem(r10, rdi, 2, 1*8)) // prefetch c + 5*rs_c
- #endif
--	
- 
--	
--	
-+
-+
-+
- 	mov(var(k_iter16), rsi)            // i = k_iter16;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DCONSIDKITER4)                 // if i == 0, jump to code that
- 	                                   // contains the k_iter4 loop.
--	
--	
-+
-+
- 	label(.DLOOPKITER16)               // MAIN LOOP
--	
--	
-+
-+
- 	// ---------------------------------- iteration 0
- 
- #if 0
-@@ -206,7 +206,7 @@ void bli_dgemmsup_rd_haswell_asm_6x1
- 	add(imm(4*8), rax)                 // a += 4*cs_a = 4*8;
- 	vfmadd231pd(ymm0, ymm3, ymm14)
- 
--	
-+
- 	// ---------------------------------- iteration 1
- 
- 	vmovupd(mem(rbx        ), ymm0)
-@@ -233,7 +233,7 @@ void bli_dgemmsup_rd_haswell_asm_6x1
- 
- 
- 	// ---------------------------------- iteration 2
--	
-+
- #if 0
- 	prefetch(0, mem(rax, r10, 1, 0*8)) // prefetch rax + 3*cs_a
- 	prefetch(0, mem(rax, r8,  4, 0*8)) // prefetch rax + 4*cs_a
-@@ -287,27 +287,27 @@ void bli_dgemmsup_rd_haswell_asm_6x1
- 	add(imm(4*8), rax)                 // a += 4*cs_a = 4*8;
- 	vfmadd231pd(ymm0, ymm3, ymm14)
- 
--	
-+
- 
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKITER16)                 // iterate again if i != 0.
--	
--	
--	
--	
--	
--	
-+
-+
-+
-+
-+
-+
- 	label(.DCONSIDKITER4)
--	
-+
- 	mov(var(k_iter4), rsi)             // i = k_iter4;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DCONSIDKLEFT1)                 // if i == 0, jump to code that
- 	                                   // considers k_left1 loop.
- 	                                   // else, we prepare to enter k_iter4 loop.
--	
--	
-+
-+
- 	label(.DLOOPKITER4)                // EDGE LOOP (ymm)
--	
-+
- #if 0
- 	prefetch(0, mem(rax, r10, 1, 0*8)) // prefetch rax + 3*cs_a
- 	prefetch(0, mem(rax, r8,  4, 0*8)) // prefetch rax + 4*cs_a
-@@ -336,21 +336,21 @@ void bli_dgemmsup_rd_haswell_asm_6x1
- 	add(imm(4*8), rax)                 // a += 4*cs_a = 4*8;
- 	vfmadd231pd(ymm0, ymm3, ymm14)
- 
--	
-+
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKITER4)                  // iterate again if i != 0.
--	
--	
--	
-+
-+
-+
- 
- 	label(.DCONSIDKLEFT1)
--	
-+
- 	mov(var(k_left1), rsi)             // i = k_left1;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DPOSTACCUM)                    // if i == 0, we're done; jump to end.
- 	                                   // else, we prepare to enter k_left1 loop.
--	
--	
-+
-+
- 
- 
- 	label(.DLOOPKLEFT1)                // EDGE LOOP (scalar)
-@@ -358,7 +358,7 @@ void bli_dgemmsup_rd_haswell_asm_6x1
- 	                                   // using the xmm registers would zero out the
- 	                                   // high bits of the destination registers,
- 	                                   // which would destory intermediate results.
--	
-+
- 	vmovsd(mem(rbx        ), xmm0)
- 	add(imm(1*8), rbx)                 // b += 1*rs_b = 1*8;
- 
-@@ -381,12 +381,12 @@ void bli_dgemmsup_rd_haswell_asm_6x1
- 	add(imm(1*8), rax)                 // a += 1*cs_a = 1*8;
- 	vfmadd231pd(ymm0, ymm3, ymm14)
- 
--	
-+
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKLEFT1)                  // iterate again if i != 0.
--	
--	
--	
-+
-+
-+
- 
- 
- 
-@@ -399,28 +399,28 @@ void bli_dgemmsup_rd_haswell_asm_6x1
- 	                                   // ymm10
- 	                                   // ymm12
- 	                                   // ymm14
--	
--	vhaddpd( ymm5, ymm4, ymm0 )
-+
-+	vhaddpd( ymm4, ymm4, ymm0 )
- 	vextractf128(imm(1), ymm0, xmm1 )
- 	vaddpd( xmm0, xmm1, xmm4 )
- 
--	vhaddpd( ymm7, ymm6, ymm0 )
-+	vhaddpd( ymm6, ymm6, ymm0 )
- 	vextractf128(imm(1), ymm0, xmm1 )
- 	vaddpd( xmm0, xmm1, xmm6 )
- 
--	vhaddpd( ymm9, ymm8, ymm0 )
-+	vhaddpd( ymm8, ymm8, ymm0 )
- 	vextractf128(imm(1), ymm0, xmm1 )
- 	vaddpd( xmm0, xmm1, xmm8 )
- 
--	vhaddpd( ymm11, ymm10, ymm0 )
-+	vhaddpd( ymm10, ymm10, ymm0 )
- 	vextractf128(imm(1), ymm0, xmm1 )
- 	vaddpd( xmm0, xmm1, xmm10 )
- 
--	vhaddpd( ymm13, ymm12, ymm0 )
-+	vhaddpd( ymm12, ymm12, ymm0 )
- 	vextractf128(imm(1), ymm0, xmm1 )
- 	vaddpd( xmm0, xmm1, xmm12 )
- 
--	vhaddpd( ymm15, ymm14, ymm0 )
-+	vhaddpd( ymm14, ymm14, ymm0 )
- 	vextractf128(imm(1), ymm0, xmm1 )
- 	vaddpd( xmm0, xmm1, xmm14 )
- 
-@@ -435,114 +435,114 @@ void bli_dgemmsup_rd_haswell_asm_6x1
- 
- 	//mov(var(rs_c), rdi)                // load rs_c
- 	//lea(mem(, rdi, 4), rdi)            // rs_c *= sizeof(double)
--	
-+
- 	mov(var(alpha), rax)               // load address of alpha
- 	mov(var(beta), rbx)                // load address of beta
- 	vbroadcastsd(mem(rax), ymm0)       // load alpha and duplicate
- 	vbroadcastsd(mem(rbx), ymm3)       // load beta and duplicate
--	
-+
- 	vmulpd(xmm0, xmm4,  xmm4)          // scale by alpha
- 	vmulpd(xmm0, xmm6,  xmm6)
- 	vmulpd(xmm0, xmm8,  xmm8)
- 	vmulpd(xmm0, xmm10, xmm10)
- 	vmulpd(xmm0, xmm12, xmm12)
- 	vmulpd(xmm0, xmm14, xmm14)
--	
--	
--	
--	
--	
--	
-+
-+
-+
-+
-+
-+
- 	//mov(var(cs_c), rsi)                // load cs_c
- 	//lea(mem(, rsi, 8), rsi)            // rsi = cs_c * sizeof(double)
--	
--	
--	
-+
-+
-+
- 	                                   // now avoid loading C if beta == 0
--	
-+
- 	vxorpd(ymm0, ymm0, ymm0)           // set ymm0 to zero.
- 	vucomisd(xmm0, xmm3)               // set ZF if beta == 0.
- 	je(.DBETAZERO)                     // if ZF = 1, jump to beta == 0 case
--	
- 
--	
-+
-+
- 	label(.DROWSTORED)
--	
- 
--	vmovsd(mem(rcx), xmm0)	
-+
-+	vmovsd(mem(rcx), xmm0)
- 	vfmadd231pd(xmm0, xmm3, xmm4)
- 	vmovsd(xmm4, mem(rcx))
- 	add(rdi, rcx)
--	
--	vmovsd(mem(rcx), xmm0)	
-+
-+	vmovsd(mem(rcx), xmm0)
- 	vfmadd231pd(xmm0, xmm3, xmm6)
- 	vmovsd(xmm6, mem(rcx))
- 	add(rdi, rcx)
--	
--	vmovsd(mem(rcx), xmm0)	
-+
-+	vmovsd(mem(rcx), xmm0)
- 	vfmadd231pd(xmm0, xmm3, xmm8)
- 	vmovsd(xmm8, mem(rcx))
- 	add(rdi, rcx)
--	
--	vmovsd(mem(rcx), xmm0)	
-+
-+	vmovsd(mem(rcx), xmm0)
- 	vfmadd231pd(xmm0, xmm3, xmm10)
- 	vmovsd(xmm10, mem(rcx))
- 	add(rdi, rcx)
--	
--	vmovsd(mem(rcx), xmm0)	
-+
-+	vmovsd(mem(rcx), xmm0)
- 	vfmadd231pd(xmm0, xmm3, xmm12)
- 	vmovsd(xmm12, mem(rcx))
- 	add(rdi, rcx)
--	
--	vmovsd(mem(rcx), xmm0)	
-+
-+	vmovsd(mem(rcx), xmm0)
- 	vfmadd231pd(xmm0, xmm3, xmm14)
- 	vmovsd(xmm14, mem(rcx))
- 	//add(rdi, rcx)
--	
--	
--	
-+
-+
-+
- 	jmp(.DDONE)                        // jump to end.
--	
--	
--	
--	
-+
-+
-+
-+
- 	label(.DBETAZERO)
--	
- 
--	
-+
-+
- 	label(.DROWSTORBZ)
--	
--	
-+
-+
- 	vmovsd(xmm4, mem(rcx))
- 	add(rdi, rcx)
--	
-+
- 	vmovsd(xmm6, mem(rcx))
- 	add(rdi, rcx)
--	
-+
- 	vmovsd(xmm8, mem(rcx))
- 	add(rdi, rcx)
--	
-+
- 	vmovsd(xmm10, mem(rcx))
- 	add(rdi, rcx)
--	
-+
- 	vmovsd(xmm12, mem(rcx))
- 	add(rdi, rcx)
--	
-+
- 	vmovsd(xmm14, mem(rcx))
- 	//add(rdi, rcx)
--	
- 
--	
--	
--	
-+
-+
-+
-+
- 	label(.DDONE)
--	
-+
- 
- 
- 
- 	label(.DRETURN)
- 
--	
-+
- 
-     end_asm(
- 	: // output operands (none)
-@@ -613,9 +613,9 @@ void bli_dgemmsup_rd_haswell_asm_3x1
- 	// -------------------------------------------------------------------------
- 
- 	begin_asm()
--	
-+
- 	//vzeroall()                         // zero all xmm/ymm registers.
--	
-+
- 	mov(var(a), rax)                   // load address of a.
- 	mov(var(rs_a), r8)                 // load rs_a
- 	//mov(var(cs_a), r9)                 // load cs_a
-@@ -633,7 +633,7 @@ void bli_dgemmsup_rd_haswell_asm_3x1
- 
- 	//lea(mem(r11, r11, 2), r13)         // r13 = 3*cs_b
- 	//lea(mem(r8,  r8,  2), r10)         // r10 = 3*rs_a
--	
-+
- 
- 	mov(var(c), rcx)                   // load address of c
- 	mov(var(rs_c), rdi)                // load rs_c
-@@ -671,19 +671,19 @@ void bli_dgemmsup_rd_haswell_asm_3x1
- 	prefetch(0, mem(rcx, rdi, 1, 1*8)) // prefetch c + 1*rs_c
- 	prefetch(0, mem(rcx, rdi, 2, 1*8)) // prefetch c + 2*rs_c
- #endif
--	
- 
--	
--	
-+
-+
-+
- 	mov(var(k_iter16), rsi)            // i = k_iter16;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DCONSIDKITER4)                 // if i == 0, jump to code that
- 	                                   // contains the k_iter4 loop.
--	
--	
-+
-+
- 	label(.DLOOPKITER16)               // MAIN LOOP
--	
--	
-+
-+
- 	// ---------------------------------- iteration 0
- 
- #if 0
-@@ -705,7 +705,7 @@ void bli_dgemmsup_rd_haswell_asm_3x1
- 	add(imm(4*8), rax)                 // a += 4*cs_a = 4*8;
- 	vfmadd231pd(ymm0, ymm3, ymm8)
- 
--	
-+
- 	// ---------------------------------- iteration 1
- 
- 	vmovupd(mem(rbx        ), ymm0)
-@@ -723,7 +723,7 @@ void bli_dgemmsup_rd_haswell_asm_3x1
- 
- 
- 	// ---------------------------------- iteration 2
--	
-+
- #if 0
- 	prefetch(0, mem(rax, r10, 1, 0*8)) // prefetch rax + 3*cs_a
- 	prefetch(0, mem(rax, r8,  4, 0*8)) // prefetch rax + 4*cs_a
-@@ -759,27 +759,27 @@ void bli_dgemmsup_rd_haswell_asm_3x1
- 	add(imm(4*8), rax)                 // a += 4*cs_a = 4*8;
- 	vfmadd231pd(ymm0, ymm3, ymm8)
- 
--	
-+
- 
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKITER16)                 // iterate again if i != 0.
--	
--	
--	
--	
--	
--	
-+
-+
-+
-+
-+
-+
- 	label(.DCONSIDKITER4)
--	
-+
- 	mov(var(k_iter4), rsi)             // i = k_iter4;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DCONSIDKLEFT1)                 // if i == 0, jump to code that
- 	                                   // considers k_left1 loop.
- 	                                   // else, we prepare to enter k_iter4 loop.
--	
--	
-+
-+
- 	label(.DLOOPKITER4)                // EDGE LOOP (ymm)
--	
-+
- #if 0
- 	prefetch(0, mem(rax, r10, 1, 0*8)) // prefetch rax + 3*cs_a
- 	prefetch(0, mem(rax, r8,  4, 0*8)) // prefetch rax + 4*cs_a
-@@ -799,21 +799,21 @@ void bli_dgemmsup_rd_haswell_asm_3x1
- 	add(imm(4*8), rax)                 // a += 4*cs_a = 4*8;
- 	vfmadd231pd(ymm0, ymm3, ymm8)
- 
--	
-+
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKITER4)                  // iterate again if i != 0.
--	
--	
--	
-+
-+
-+
- 
- 	label(.DCONSIDKLEFT1)
--	
-+
- 	mov(var(k_left1), rsi)             // i = k_left1;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DPOSTACCUM)                    // if i == 0, we're done; jump to end.
- 	                                   // else, we prepare to enter k_left1 loop.
--	
--	
-+
-+
- 
- 
- 	label(.DLOOPKLEFT1)                // EDGE LOOP (scalar)
-@@ -821,7 +821,7 @@ void bli_dgemmsup_rd_haswell_asm_3x1
- 	                                   // using the xmm registers would zero out the
- 	                                   // high bits of the destination registers,
- 	                                   // which would destory intermediate results.
--	
-+
- 	vmovsd(mem(rbx        ), xmm0)
- 	add(imm(1*8), rbx)                 // b += 1*rs_b = 1*8;
- 
-@@ -835,12 +835,12 @@ void bli_dgemmsup_rd_haswell_asm_3x1
- 	add(imm(1*8), rax)                 // a += 1*cs_a = 1*8;
- 	vfmadd231pd(ymm0, ymm3, ymm8)
- 
--	
-+
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKLEFT1)                  // iterate again if i != 0.
--	
--	
--	
-+
-+
-+
- 
- 
- 
-@@ -850,16 +850,16 @@ void bli_dgemmsup_rd_haswell_asm_3x1
- 	                                   // ymm4
- 	                                   // ymm6
- 	                                   // ymm8
--	
--	vhaddpd( ymm5, ymm4, ymm0 )
-+
-+	vhaddpd( ymm4, ymm4, ymm0 )
- 	vextractf128(imm(1), ymm0, xmm1 )
- 	vaddpd( xmm0, xmm1, xmm4 )
- 
--	vhaddpd( ymm7, ymm6, ymm0 )
-+	vhaddpd( ymm6, ymm6, ymm0 )
- 	vextractf128(imm(1), ymm0, xmm1 )
- 	vaddpd( xmm0, xmm1, xmm6 )
- 
--	vhaddpd( ymm9, ymm8, ymm0 )
-+	vhaddpd( ymm8, ymm8, ymm0 )
- 	vextractf128(imm(1), ymm0, xmm1 )
- 	vaddpd( xmm0, xmm1, xmm8 )
- 
-@@ -871,87 +871,87 @@ void bli_dgemmsup_rd_haswell_asm_3x1
- 
- 	//mov(var(rs_c), rdi)                // load rs_c
- 	//lea(mem(, rdi, 4), rdi)            // rs_c *= sizeof(double)
--	
-+
- 	mov(var(alpha), rax)               // load address of alpha
- 	mov(var(beta), rbx)                // load address of beta
- 	vbroadcastsd(mem(rax), ymm0)       // load alpha and duplicate
- 	vbroadcastsd(mem(rbx), ymm3)       // load beta and duplicate
--	
-+
- 	vmulpd(xmm0, xmm4,  xmm4)          // scale by alpha
- 	vmulpd(xmm0, xmm6,  xmm6)
- 	vmulpd(xmm0, xmm8,  xmm8)
--	
--	
--	
--	
--	
--	
-+
-+
-+
-+
-+
-+
- 	//mov(var(cs_c), rsi)                // load cs_c
- 	//lea(mem(, rsi, 8), rsi)            // rsi = cs_c * sizeof(double)
--	
--	
--	
-+
-+
-+
- 	                                   // now avoid loading C if beta == 0
--	
-+
- 	vxorpd(ymm0, ymm0, ymm0)           // set ymm0 to zero.
- 	vucomisd(xmm0, xmm3)               // set ZF if beta == 0.
- 	je(.DBETAZERO)                     // if ZF = 1, jump to beta == 0 case
--	
- 
--	
-+
-+
- 	label(.DROWSTORED)
--	
- 
--	vmovsd(mem(rcx), xmm0)	
-+
-+	vmovsd(mem(rcx), xmm0)
- 	vfmadd231pd(xmm0, xmm3, xmm4)
- 	vmovsd(xmm4, mem(rcx))
- 	add(rdi, rcx)
--	
--	vmovsd(mem(rcx), xmm0)	
-+
-+	vmovsd(mem(rcx), xmm0)
- 	vfmadd231pd(xmm0, xmm3, xmm6)
- 	vmovsd(xmm6, mem(rcx))
- 	add(rdi, rcx)
--	
--	vmovsd(mem(rcx), xmm0)	
-+
-+	vmovsd(mem(rcx), xmm0)
- 	vfmadd231pd(xmm0, xmm3, xmm8)
- 	vmovsd(xmm8, mem(rcx))
- 	//add(rdi, rcx)
--	
--	
--	
-+
-+
-+
- 	jmp(.DDONE)                        // jump to end.
--	
--	
--	
--	
-+
-+
-+
-+
- 	label(.DBETAZERO)
--	
- 
--	
-+
-+
- 	label(.DROWSTORBZ)
--	
--	
-+
-+
- 	vmovsd(xmm4, mem(rcx))
- 	add(rdi, rcx)
--	
-+
- 	vmovsd(xmm6, mem(rcx))
- 	add(rdi, rcx)
--	
-+
- 	vmovsd(xmm8, mem(rcx))
- 	//add(rdi, rcx)
--	
- 
--	
--	
--	
-+
-+
-+
-+
- 	label(.DDONE)
--	
-+
- 
- 
- 
- 	label(.DRETURN)
- 
--	
-+
- 
-     end_asm(
- 	: // output operands (none)
-@@ -1022,9 +1022,9 @@ void bli_dgemmsup_rd_haswell_asm_2x1
- 	// -------------------------------------------------------------------------
- 
- 	begin_asm()
--	
-+
- 	//vzeroall()                         // zero all xmm/ymm registers.
--	
-+
- 	mov(var(a), rax)                   // load address of a.
- 	mov(var(rs_a), r8)                 // load rs_a
- 	//mov(var(cs_a), r9)                 // load cs_a
-@@ -1042,7 +1042,7 @@ void bli_dgemmsup_rd_haswell_asm_2x1
- 
- 	//lea(mem(r11, r11, 2), r13)         // r13 = 3*cs_b
- 	//lea(mem(r8,  r8,  2), r10)         // r10 = 3*rs_a
--	
-+
- 
- 	mov(var(c), rcx)                   // load address of c
- 	mov(var(rs_c), rdi)                // load rs_c
-@@ -1078,19 +1078,19 @@ void bli_dgemmsup_rd_haswell_asm_2x1
- 	prefetch(0, mem(rcx,         1*8)) // prefetch c + 0*rs_c
- 	prefetch(0, mem(rcx, rdi, 1, 1*8)) // prefetch c + 1*rs_c
- #endif
--	
- 
--	
--	
-+
-+
-+
- 	mov(var(k_iter16), rsi)            // i = k_iter16;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DCONSIDKITER4)                 // if i == 0, jump to code that
- 	                                   // contains the k_iter4 loop.
--	
--	
-+
-+
- 	label(.DLOOPKITER16)               // MAIN LOOP
--	
--	
-+
-+
- 	// ---------------------------------- iteration 0
- 
- #if 0
-@@ -1109,7 +1109,7 @@ void bli_dgemmsup_rd_haswell_asm_2x1
- 	add(imm(4*8), rax)                 // a += 4*cs_a = 4*8;
- 	vfmadd231pd(ymm0, ymm3, ymm6)
- 
--	
-+
- 	// ---------------------------------- iteration 1
- 
- 	vmovupd(mem(rbx        ), ymm0)
-@@ -1124,7 +1124,7 @@ void bli_dgemmsup_rd_haswell_asm_2x1
- 
- 
- 	// ---------------------------------- iteration 2
--	
-+
- #if 0
- 	prefetch(0, mem(rax, r10, 1, 0*8)) // prefetch rax + 3*cs_a
- 	prefetch(0, mem(rax, r8,  4, 0*8)) // prefetch rax + 4*cs_a
-@@ -1154,27 +1154,27 @@ void bli_dgemmsup_rd_haswell_asm_2x1
- 	add(imm(4*8), rax)                 // a += 4*cs_a = 4*8;
- 	vfmadd231pd(ymm0, ymm3, ymm6)
- 
--	
-+
- 
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKITER16)                 // iterate again if i != 0.
--	
--	
--	
--	
--	
--	
-+
-+
-+
-+
-+
-+
- 	label(.DCONSIDKITER4)
--	
-+
- 	mov(var(k_iter4), rsi)             // i = k_iter4;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DCONSIDKLEFT1)                 // if i == 0, jump to code that
- 	                                   // considers k_left1 loop.
- 	                                   // else, we prepare to enter k_iter4 loop.
--	
--	
-+
-+
- 	label(.DLOOPKITER4)                // EDGE LOOP (ymm)
--	
-+
- #if 0
- 	prefetch(0, mem(rax, r10, 1, 0*8)) // prefetch rax + 3*cs_a
- 	prefetch(0, mem(rax, r8,  4, 0*8)) // prefetch rax + 4*cs_a
-@@ -1191,21 +1191,21 @@ void bli_dgemmsup_rd_haswell_asm_2x1
- 	add(imm(4*8), rax)                 // a += 4*cs_a = 4*8;
- 	vfmadd231pd(ymm0, ymm3, ymm6)
- 
--	
-+
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKITER4)                  // iterate again if i != 0.
--	
--	
--	
-+
-+
-+
- 
- 	label(.DCONSIDKLEFT1)
--	
-+
- 	mov(var(k_left1), rsi)             // i = k_left1;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DPOSTACCUM)                    // if i == 0, we're done; jump to end.
- 	                                   // else, we prepare to enter k_left1 loop.
--	
--	
-+
-+
- 
- 
- 	label(.DLOOPKLEFT1)                // EDGE LOOP (scalar)
-@@ -1213,7 +1213,7 @@ void bli_dgemmsup_rd_haswell_asm_2x1
- 	                                   // using the xmm registers would zero out the
- 	                                   // high bits of the destination registers,
- 	                                   // which would destory intermediate results.
--	
-+
- 	vmovsd(mem(rbx        ), xmm0)
- 	add(imm(1*8), rbx)                 // b += 1*rs_b = 1*8;
- 
-@@ -1224,12 +1224,12 @@ void bli_dgemmsup_rd_haswell_asm_2x1
- 	add(imm(1*8), rax)                 // a += 1*cs_a = 1*8;
- 	vfmadd231pd(ymm0, ymm3, ymm6)
- 
--	
-+
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKLEFT1)                  // iterate again if i != 0.
--	
--	
--	
-+
-+
-+
- 
- 
- 
-@@ -1238,12 +1238,12 @@ void bli_dgemmsup_rd_haswell_asm_2x1
- 
- 	                                   // ymm4
- 	                                   // ymm6
--	
--	vhaddpd( ymm5, ymm4, ymm0 )
-+
-+	vhaddpd( ymm4, ymm4, ymm0 )
- 	vextractf128(imm(1), ymm0, xmm1 )
- 	vaddpd( xmm0, xmm1, xmm4 )
- 
--	vhaddpd( ymm7, ymm6, ymm0 )
-+	vhaddpd( ymm6, ymm6, ymm0 )
- 	vextractf128(imm(1), ymm0, xmm1 )
- 	vaddpd( xmm0, xmm1, xmm6 )
- 
-@@ -1254,78 +1254,78 @@ void bli_dgemmsup_rd_haswell_asm_2x1
- 
- 	//mov(var(rs_c), rdi)                // load rs_c
- 	//lea(mem(, rdi, 4), rdi)            // rs_c *= sizeof(double)
--	
-+
- 	mov(var(alpha), rax)               // load address of alpha
- 	mov(var(beta), rbx)                // load address of beta
- 	vbroadcastsd(mem(rax), ymm0)       // load alpha and duplicate
- 	vbroadcastsd(mem(rbx), ymm3)       // load beta and duplicate
--	
-+
- 	vmulpd(xmm0, xmm4,  xmm4)          // scale by alpha
- 	vmulpd(xmm0, xmm6,  xmm6)
--	
--	
--	
--	
--	
--	
-+
-+
-+
-+
-+
-+
- 	//mov(var(cs_c), rsi)                // load cs_c
- 	//lea(mem(, rsi, 8), rsi)            // rsi = cs_c * sizeof(double)
--	
--	
--	
-+
-+
-+
- 	                                   // now avoid loading C if beta == 0
--	
-+
- 	vxorpd(ymm0, ymm0, ymm0)           // set ymm0 to zero.
- 	vucomisd(xmm0, xmm3)               // set ZF if beta == 0.
- 	je(.DBETAZERO)                     // if ZF = 1, jump to beta == 0 case
--	
- 
--	
-+
-+
- 	label(.DROWSTORED)
--	
- 
--	vmovsd(mem(rcx), xmm0)	
-+
-+	vmovsd(mem(rcx), xmm0)
- 	vfmadd231pd(xmm0, xmm3, xmm4)
- 	vmovsd(xmm4, mem(rcx))
- 	add(rdi, rcx)
--	
--	vmovsd(mem(rcx), xmm0)	
-+
-+	vmovsd(mem(rcx), xmm0)
- 	vfmadd231pd(xmm0, xmm3, xmm6)
- 	vmovsd(xmm6, mem(rcx))
- 	//add(rdi, rcx)
--	
--	
--	
-+
-+
-+
- 	jmp(.DDONE)                        // jump to end.
--	
--	
--	
--	
-+
-+
-+
-+
- 	label(.DBETAZERO)
--	
- 
--	
-+
-+
- 	label(.DROWSTORBZ)
--	
--	
-+
-+
- 	vmovsd(xmm4, mem(rcx))
- 	add(rdi, rcx)
--	
-+
- 	vmovsd(xmm6, mem(rcx))
- 	//add(rdi, rcx)
--	
- 
--	
--	
--	
-+
-+
-+
-+
- 	label(.DDONE)
--	
-+
- 
- 
- 
- 	label(.DRETURN)
- 
--	
-+
- 
-     end_asm(
- 	: // output operands (none)
-@@ -1396,9 +1396,9 @@ void bli_dgemmsup_rd_haswell_asm_1x1
- 	// -------------------------------------------------------------------------
- 
- 	begin_asm()
--	
-+
- 	//vzeroall()                         // zero all xmm/ymm registers.
--	
-+
- 	mov(var(a), rax)                   // load address of a.
- 	mov(var(rs_a), r8)                 // load rs_a
- 	//mov(var(cs_a), r9)                 // load cs_a
-@@ -1416,7 +1416,7 @@ void bli_dgemmsup_rd_haswell_asm_1x1
- 
- 	//lea(mem(r11, r11, 2), r13)         // r13 = 3*cs_b
- 	//lea(mem(r8,  r8,  2), r10)         // r10 = 3*rs_a
--	
-+
- 
- 	mov(var(c), rcx)                   // load address of c
- 	mov(var(rs_c), rdi)                // load rs_c
-@@ -1450,19 +1450,19 @@ void bli_dgemmsup_rd_haswell_asm_1x1
- 	//lea(mem(r10, rdi, 1), r10)         // rdx = c + 3*rs_c;
- 	prefetch(0, mem(rcx,         1*8)) // prefetch c + 0*rs_c
- #endif
--	
- 
--	
--	
-+
-+
-+
- 	mov(var(k_iter16), rsi)            // i = k_iter16;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DCONSIDKITER4)                 // if i == 0, jump to code that
- 	                                   // contains the k_iter4 loop.
--	
--	
-+
-+
- 	label(.DLOOPKITER16)               // MAIN LOOP
--	
--	
-+
-+
- 	// ---------------------------------- iteration 0
- 
- #if 0
-@@ -1478,7 +1478,7 @@ void bli_dgemmsup_rd_haswell_asm_1x1
- 	add(imm(4*8), rax)                 // a += 4*cs_a = 4*8;
- 	vfmadd231pd(ymm0, ymm3, ymm4)
- 
--	
-+
- 	// ---------------------------------- iteration 1
- 
- 	vmovupd(mem(rbx        ), ymm0)
-@@ -1490,7 +1490,7 @@ void bli_dgemmsup_rd_haswell_asm_1x1
- 
- 
- 	// ---------------------------------- iteration 2
--	
-+
- #if 0
- 	prefetch(0, mem(rax, r10, 1, 0*8)) // prefetch rax + 3*cs_a
- 	prefetch(0, mem(rax, r8,  4, 0*8)) // prefetch rax + 4*cs_a
-@@ -1514,27 +1514,27 @@ void bli_dgemmsup_rd_haswell_asm_1x1
- 	add(imm(4*8), rax)                 // a += 4*cs_a = 4*8;
- 	vfmadd231pd(ymm0, ymm3, ymm4)
- 
--	
-+
- 
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKITER16)                 // iterate again if i != 0.
--	
--	
--	
--	
--	
--	
-+
-+
-+
-+
-+
-+
- 	label(.DCONSIDKITER4)
--	
-+
- 	mov(var(k_iter4), rsi)             // i = k_iter4;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DCONSIDKLEFT1)                 // if i == 0, jump to code that
- 	                                   // considers k_left1 loop.
- 	                                   // else, we prepare to enter k_iter4 loop.
--	
--	
-+
-+
- 	label(.DLOOPKITER4)                // EDGE LOOP (ymm)
--	
-+
- #if 0
- 	prefetch(0, mem(rax, r10, 1, 0*8)) // prefetch rax + 3*cs_a
- 	prefetch(0, mem(rax, r8,  4, 0*8)) // prefetch rax + 4*cs_a
-@@ -1548,21 +1548,21 @@ void bli_dgemmsup_rd_haswell_asm_1x1
- 	add(imm(4*8), rax)                 // a += 4*cs_a = 4*8;
- 	vfmadd231pd(ymm0, ymm3, ymm4)
- 
--	
-+
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKITER4)                  // iterate again if i != 0.
--	
--	
--	
-+
-+
-+
- 
- 	label(.DCONSIDKLEFT1)
--	
-+
- 	mov(var(k_left1), rsi)             // i = k_left1;
- 	test(rsi, rsi)                     // check i via logical AND.
- 	je(.DPOSTACCUM)                    // if i == 0, we're done; jump to end.
- 	                                   // else, we prepare to enter k_left1 loop.
--	
--	
-+
-+
- 
- 
- 	label(.DLOOPKLEFT1)                // EDGE LOOP (scalar)
-@@ -1570,7 +1570,7 @@ void bli_dgemmsup_rd_haswell_asm_1x1
- 	                                   // using the xmm registers would zero out the
- 	                                   // high bits of the destination registers,
- 	                                   // which would destory intermediate results.
--	
-+
- 	vmovsd(mem(rbx        ), xmm0)
- 	add(imm(1*8), rbx)                 // b += 1*rs_b = 1*8;
- 
-@@ -1578,12 +1578,12 @@ void bli_dgemmsup_rd_haswell_asm_1x1
- 	add(imm(1*8), rax)                 // a += 1*cs_a = 1*8;
- 	vfmadd231pd(ymm0, ymm3, ymm4)
- 
--	
-+
- 	dec(rsi)                           // i -= 1;
- 	jne(.DLOOPKLEFT1)                  // iterate again if i != 0.
--	
--	
--	
-+
-+
-+
- 
- 
- 
-@@ -1591,8 +1591,8 @@ void bli_dgemmsup_rd_haswell_asm_1x1
- 	label(.DPOSTACCUM)
- 
- 	                                   // ymm4
--	
--	vhaddpd( ymm5, ymm4, ymm0 )
-+
-+	vhaddpd( ymm4, ymm4, ymm0 )
- 	vextractf128(imm(1), ymm0, xmm1 )
- 	vaddpd( xmm0, xmm1, xmm4 )
- 
-@@ -1602,69 +1602,69 @@ void bli_dgemmsup_rd_haswell_asm_1x1
- 
- 	//mov(var(rs_c), rdi)                // load rs_c
- 	//lea(mem(, rdi, 4), rdi)            // rs_c *= sizeof(double)
--	
-+
- 	mov(var(alpha), rax)               // load address of alpha
- 	mov(var(beta), rbx)                // load address of beta
- 	vbroadcastsd(mem(rax), ymm0)       // load alpha and duplicate
- 	vbroadcastsd(mem(rbx), ymm3)       // load beta and duplicate
--	
-+
- 	vmulpd(xmm0, xmm4,  xmm4)          // scale by alpha
--	
--	
--	
--	
--	
--	
-+
-+
-+
-+
-+
-+
- 	//mov(var(cs_c), rsi)                // load cs_c
- 	//lea(mem(, rsi, 8), rsi)            // rsi = cs_c * sizeof(double)
--	
--	
--	
-+
-+
-+
- 	                                   // now avoid loading C if beta == 0
--	
-+
- 	vxorpd(ymm0, ymm0, ymm0)           // set ymm0 to zero.
- 	vucomisd(xmm0, xmm3)               // set ZF if beta == 0.
- 	je(.DBETAZERO)                     // if ZF = 1, jump to beta == 0 case
--	
- 
--	
-+
-+
- 	label(.DROWSTORED)
--	
- 
--	vmovsd(mem(rcx), xmm0)	
-+
-+	vmovsd(mem(rcx), xmm0)
- 	vfmadd231pd(xmm0, xmm3, xmm4)
- 	vmovsd(xmm4, mem(rcx))
- 	//add(rdi, rcx)
--	
--	
--	
-+
-+
-+
- 	jmp(.DDONE)                        // jump to end.
--	
--	
--	
--	
-+
-+
-+
-+
- 	label(.DBETAZERO)
--	
- 
--	
-+
-+
- 	label(.DROWSTORBZ)
--	
--	
-+
-+
- 	vmovsd(xmm4, mem(rcx))
- 	//add(rdi, rcx)
--	
- 
--	
--	
--	
-+
-+
-+
-+
- 	label(.DDONE)
--	
-+
- 
- 
- 
- 	label(.DRETURN)
- 
--	
-+
- 
-     end_asm(
- 	: // output operands (none)
-diff --git a/kernels/haswell/3/sup/d6x8/bli_gemmsup_rd_haswell_asm_dMx4.c b/kernels/haswell/3/sup/d6x8/bli_gemmsup_rd_haswell_asm_dMx4.c
-index 21dd3b89..516bfced 100644
---- a/kernels/haswell/3/sup/d6x8/bli_gemmsup_rd_haswell_asm_dMx4.c
-+++ b/kernels/haswell/3/sup/d6x8/bli_gemmsup_rd_haswell_asm_dMx4.c
-@@ -1338,17 +1338,6 @@ void bli_dgemmsup_rd_haswell_asm_1x4
- 
- 	vperm2f128(imm(0x20), ymm2, ymm0, ymm4 )
- 
--
--	//vhaddpd( ymm8, ymm5, ymm0 )
--	//vextractf128(imm(1), ymm0, xmm1 )
--	//vaddpd( xmm0, xmm1, xmm0 )
--
--	//vhaddpd( ymm14, ymm11, ymm2 )
--	//vextractf128(imm(1), ymm2, xmm1 )
--	//vaddpd( xmm2, xmm1, xmm2 )
--
--	//vperm2f128(imm(0x20), ymm2, ymm0, ymm5 )
--
- 	                                   // xmm4[0:3] = sum(ymm4) sum(ymm7) sum(ymm10) sum(ymm13)
- 
- 
diff --git a/Overlays/jureca_mi200_overlay/b/BLIS/BLIS-3.1-GCCcore-11.2.0-amd.eb b/Overlays/jureca_mi200_overlay/b/BLIS/BLIS-3.1-GCCcore-11.2.0-amd.eb
deleted file mode 100644
index 70fc18ddb..000000000
--- a/Overlays/jureca_mi200_overlay/b/BLIS/BLIS-3.1-GCCcore-11.2.0-amd.eb
+++ /dev/null
@@ -1,45 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'BLIS'
-version = '3.1'
-versionsuffix = '-amd'
-
-homepage = 'https://developer.amd.com/amd-cpu-libraries/blas-library/'
-description = """AMD's fork of BLIS. BLIS is a portable software framework for instantiating high-performance
-BLAS-like dense linear algebra libraries."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://github.com/amd/blis/archive/']
-sources = ['%(version)s.tar.gz']
-patches = [
-    '%(name)s-0.8.1_fix_dgemm-fpe-signalling-on-broadwell.patch',
-]
-checksums = [
-    '2891948925b9db99eec02a1917d9887a7bee9ad2afc5421c9ba58602a620f2bf',  # 3.1.tar.gz
-    # BLIS-0.8.1_fix_dgemm-fpe-signalling-on-broadwell.patch
-    '345fa39933e9d1442d2eb1e4ed9129df3fe4aefecf4d104e5d4f25b3bca24d0d',
-]
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Python', '3.9.6'),
-    ('Perl', '5.34.0'),
-]
-
-# Build Serial and multithreaded library
-configopts = ['--enable-cblas --enable-shared CC="$CC" auto',
-              '--enable-cblas --enable-threading=openmp --enable-shared CC="$CC" auto']
-
-runtest = 'check'
-
-sanity_check_paths = {
-    'files': ['include/blis/cblas.h', 'include/blis/blis.h',
-              'lib/libblis.a', 'lib/libblis.%s' % SHLIB_EXT,
-              'lib/libblis-mt.a', 'lib/libblis-mt.%s' % SHLIB_EXT],
-    'dirs': [],
-}
-
-modextrapaths = {'CPATH': 'include/blis'}
-
-moduleclass = 'numlib'
diff --git a/Overlays/jureca_mi200_overlay/b/Blaze/Blaze-3.8.1-gomkl-2021b.eb b/Overlays/jureca_mi200_overlay/b/Blaze/Blaze-3.8.1-gomkl-2021b.eb
deleted file mode 100644
index 3d093603a..000000000
--- a/Overlays/jureca_mi200_overlay/b/Blaze/Blaze-3.8.1-gomkl-2021b.eb
+++ /dev/null
@@ -1,39 +0,0 @@
-# Stepan Nassyr, JSC/Forschungszentrum Juelich GmbH, s.nassyr@fz-juelich.de, 2022/06
-easyblock = 'CMakeNinja'
-
-name = 'Blaze'
-version = '3.8.1'
-
-homepage = 'https://bitbucket.org/blaze-lib/blaze'
-description = """Blaze is an open-source, high-performance C++ math library for dense and sparse arithmetic."""
-
-toolchain = {'name': 'gomkl', 'version': '2021b'}
-
-source_urls = ['https://bitbucket.org/blaze-lib/blaze/get']
-sources = ['v%(version)s.tar.gz']
-checksums = ['4ad32a786c45285a66a1375b39e65908e604d10596f5863c63b7ef9a13808187']
-
-builddependencies = [
-    ('CMake', '3.23.1'),
-    ('Ninja', '1.10.2'),
-    ('binutils', '2.37'),
-]
-# dependencies = [
-#     ('imkl', '2021.4.0', '', 'gompi-2021b'),
-# ]
-
-# BLAZE_CACHE_SIZE is calculated from /sys/devices/system/cpu/cpu0/cache/index3/size
-configopts = (" -DBLAZE_CACHE_SIZE=33554432 "
-              " -DBLAZE_BLAS_MODE=ON "
-              " -DBLAZE_BLAS_IS_64BIT=1 "
-              " -DBLAZE_BLAS_IS_PARALLEL=1 "
-              " -DBLAZE_BLAS_INCLUDE_FILE=\"<mkl_cblas.h>\" ")
-
-sanity_check_paths = {
-    'files': [
-        ['include/blaze/Blaze.h']
-    ],
-    'dirs': ['share/blaze/cmake', 'include/blaze'],
-}
-
-moduleclass = 'lib'
diff --git a/Overlays/jureca_mi200_overlay/b/babeltrace/babeltrace-1.5.8-GCCcore-11.2.0.eb b/Overlays/jureca_mi200_overlay/b/babeltrace/babeltrace-1.5.8-GCCcore-11.2.0.eb
deleted file mode 100644
index 006b04ed1..000000000
--- a/Overlays/jureca_mi200_overlay/b/babeltrace/babeltrace-1.5.8-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,52 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'babeltrace'
-version = '1.5.8'
-
-homepage = 'https://babeltrace.org/'
-description = "Babeltrace /ˈbæbəltreɪs/ is an open-source trace manipulation toolkit. "
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'optarch': True, 'pic': True}
-
-github_account = 'efficios'
-source_urls = [GITHUB_SOURCE]
-sources = [{
-    'download_filename': 'v%(version)s.tar.gz',
-    'filename':          SOURCELOWER_TAR_GZ
-}]
-checksums = ['e76fcc4a4fd1001281ee90532a078e9ccc2f71673966d28dbebb05eca8a0febe']
-
-builddependencies = [
-    ('flex', '2.6.4'),
-    ('Bison', '3.7.6'),
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('popt', '1.18', '', SYSTEM),
-    ('Python', '3.9.6'),
-    ('elfutils', '0.185'),
-    ('GLib', '2.69.1'),
-    ('SWIG', '4.0.2'),
-]
-
-preconfigopts = "autoreconf --install; PYTHON=$EBROOTPYTHON/bin/python3 PYTHON_CONFIG=$EBROOTPYTHON/bin/python3-config "
-configopts = "--enable-python-bindings --disable-man-pages"
-
-local_libs = ["libbabeltrace", "libbabeltrace-ctf", "libbabeltrace-ctf-metadata",
-              "libbabeltrace-ctf-text", "libbabeltrace-dummy", "libbabeltrace-lttng-live"]
-sanity_check_paths = {
-    'files': ["bin/babeltrace"] +
-             ["lib/%s.a" % library for library in local_libs] +
-             ["lib/%s.%s" % (library, SHLIB_EXT) for library in local_libs] +
-             ["include/babeltrace/babeltrace.h"],
-    'dirs': ["lib/pkgconfig"],
-}
-
-modextrapaths = {
-    'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']
-}
-
-moduleclass = 'tools'
diff --git a/Overlays/jureca_mi200_overlay/c/CppHeaderParser/CppHeaderParser-2.7.4-GCCcore-11.2.0.eb b/Overlays/jureca_mi200_overlay/c/CppHeaderParser/CppHeaderParser-2.7.4-GCCcore-11.2.0.eb
deleted file mode 100644
index b590bc839..000000000
--- a/Overlays/jureca_mi200_overlay/c/CppHeaderParser/CppHeaderParser-2.7.4-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,33 +0,0 @@
-easyblock = 'PythonPackage'
-
-name = 'CppHeaderParser'
-version = '2.7.4'
-
-homepage = 'http://senexcanis.com/open-source/cppheaderparser/'
-description = """CppHeaderParser is a pure python C++ header parser that parses C++ headers 
-                 and creates a data structure that you can use to do many types of things."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = [PYPI_SOURCE]
-sources = [SOURCE_TAR_GZ]
-checksums = [
-    # CppHeaderParser-2.7.4.tar.gz
-    '382b30416d95b0a5e8502b214810dcac2a56432917e2651447d3abe253e3cc42',
-]
-
-builddependencies = [('binutils', '2.37')]
-dependencies = [('Python', '3.9.6')]
-
-download_dep_fail = True
-use_pip = True
-sanity_pip_check = True
-
-options = {'modulename': 'CppHeaderParser'}
-
-sanity_check_paths = {
-    'files': [],
-    'dirs': ['lib/python%(pyshortver)s/site-packages'],
-}
-
-moduleclass = 'tools'
diff --git a/Overlays/jureca_mi200_overlay/g/gfxreconstruct/gfxreconstruct-1.3.213-GCCcore-11.2.0.eb b/Overlays/jureca_mi200_overlay/g/gfxreconstruct/gfxreconstruct-1.3.213-GCCcore-11.2.0.eb
deleted file mode 100644
index f8577c86a..000000000
--- a/Overlays/jureca_mi200_overlay/g/gfxreconstruct/gfxreconstruct-1.3.213-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,53 +0,0 @@
-easyblock = 'CMakeNinja'
-
-name = 'gfxreconstruct'
-version = '1.3.213'
-
-homepage = 'https://www.khronos.org/registry/SPIR-V/'
-description = """Graphics API Capture and Replay Tools for Reconstructing Graphics Application Behavior """
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-github_account = 'LunarG'
-
-source_urls = [GITHUB_SOURCE]
-sources = [{
-    'filename': SOURCELOWER_TAR_GZ,
-    # 'download_filename': 'sdk-%(version)s.tar.gz'
-    'download_filename': '365757b47e32cf8346c00300fc82deb47969b76f.tar.gz'
-}]
-checksums = ['1a72841d57cb81efea0a47797c6d4d64be449ba304e471341137d3a90a94917a']
-
-builddependencies = [
-    ('CMake', '3.21.1'),
-    ('Ninja', '1.10.2'),
-]
-
-dependencies = [
-    ('Vulkan-Headers', version),
-    ('Vulkan-Loader', version),
-]
-
-configopts = '-DVULKAN_HEADER=$EBROOTVULKANMINHEADERS/include/vulkan/vulkan_core.h'
-
-modextrapaths = {
-    'VK_LAYER_PATH': ['share/vulkan/explicit_layer.d/']
-}
-
-
-sanity_check_paths = {
-    'files': [
-        'bin/gfxrecon-info',
-        'bin/gfxrecon-compress',
-        'bin/gfxrecon-capture.py',
-        'bin/gfxrecon.py',
-        'bin/gfxrecon-extract',
-        'bin/gfxrecon-optimize',
-        'bin/gfxrecon-replay',
-        'share/vulkan/explicit_layer.d/VkLayer_gfxreconstruct.json',
-        'lib64/libVkLayer_gfxreconstruct.so',
-    ],
-    'dirs': [],
-}
-
-moduleclass = 'devel'
diff --git a/Overlays/jureca_mi200_overlay/g/glslang/glslang-1.3.213-GCCcore-11.2.0.eb b/Overlays/jureca_mi200_overlay/g/glslang/glslang-1.3.213-GCCcore-11.2.0.eb
deleted file mode 100644
index 6ae18fbca..000000000
--- a/Overlays/jureca_mi200_overlay/g/glslang/glslang-1.3.213-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,41 +0,0 @@
-easyblock = 'CMakeNinja'
-
-name = 'glslang'
-version = '1.3.213'
-
-homepage = 'https://github.com/KhronosGroup/glslang'
-description = """Khronos-reference front end for GLSL/ESSL, partial front end for HLSL, and a SPIR-V generator."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-github_account = 'KhronosGroup'
-
-source_urls = [GITHUB_SOURCE]
-sources = [{
-    'filename':          SOURCELOWER_TAR_GZ,
-    'download_filename': '2439e6d56dff55d1c9e0fc2dbfe70a0f44c26832.tar.gz'
-}]
-checksums = ['f2fffa32a2e7744123b5d7a50df354854c2a5d6ca779a1525dbb35e12a74abcb']
-
-builddependencies = [
-    ('CMake', '3.21.1'),
-    ('Python', '3.9.6'),
-    ('Ninja', '1.10.2'),
-]
-
-sanity_check_paths = {
-    'files': [
-        'include/glslang/Include/glslang_c_interface.h',
-        'bin/glslangValidator',
-        'bin/spirv-remap',
-        'lib/libSPVRemapper.a',
-        'lib/libglslang-default-resource-limits.a',
-        'lib/libOSDependent.a',
-        'lib/libHLSL.a',
-        'lib/libglslang.a',
-        'lib/libSPIRV.a',
-    ],
-    'dirs': ['lib/cmake'],
-}
-
-moduleclass = 'devel'
diff --git a/Overlays/jureca_mi200_overlay/h/hwloc/hwloc-2.5.0-GCCcore-11.2.0.eb b/Overlays/jureca_mi200_overlay/h/hwloc/hwloc-2.5.0-GCCcore-11.2.0.eb
deleted file mode 100644
index 25fe0a8e8..000000000
--- a/Overlays/jureca_mi200_overlay/h/hwloc/hwloc-2.5.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,52 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'hwloc'
-version = '2.5.0'
-
-homepage = 'https://www.open-mpi.org/projects/hwloc/'
-
-description = """
- The Portable Hardware Locality (hwloc) software package provides a portable
- abstraction (across OS, versions, architectures, ...) of the hierarchical
- topology of modern architectures, including NUMA memory nodes, sockets, shared
- caches, cores and simultaneous multithreading. It also gathers various system
- attributes such as cache and memory information as well as the locality of I/O
- devices such as network interfaces, InfiniBand HCAs or GPUs. It primarily
- aims at helping applications with gathering information about modern computing
- hardware so as to exploit it accordingly and efficiently.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-# need to build with -fno-tree-vectorize to avoid segfaulting lstopo on Intel Skylake
-# cfr. https://github.com/open-mpi/hwloc/issues/315
-toolchainopts = {'vectorize': False}
-
-source_urls = [
-    'https://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
-sources = [SOURCE_TAR_GZ]
-checksums = ['38aa8102faec302791f6b4f0d23960a3ffa25af3af6af006c64dbecac23f852c']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('numactl', '2.0.14', '', SYSTEM),
-    ('libxml2', '2.9.10'),
-    ('libpciaccess', '0.16'),
-]
-
-configopts = "--enable-libnuma=$EBROOTNUMACTL --with-rocm=/opt/rocm "
-configopts += "--disable-cairo --disable-gl --disable-libudev "
-
-sanity_check_paths = {
-    'files': ['bin/lstopo', 'include/hwloc/linux.h',
-              'lib/libhwloc.%s' % SHLIB_EXT],
-    'dirs': ['share/man/man3'],
-}
-sanity_check_commands = ['lstopo']
-
-modluafooter = '''
-add_property("arch","gpu")
-'''
-moduleclass = 'system'
diff --git a/Overlays/jureca_mi200_overlay/l/LAPACK/LAPACK-3.10.1-GCC-11.2.0.eb b/Overlays/jureca_mi200_overlay/l/LAPACK/LAPACK-3.10.1-GCC-11.2.0.eb
deleted file mode 100644
index 3496ab88e..000000000
--- a/Overlays/jureca_mi200_overlay/l/LAPACK/LAPACK-3.10.1-GCC-11.2.0.eb
+++ /dev/null
@@ -1,16 +0,0 @@
-name = 'LAPACK'
-version = '3.10.1'
-
-homepage = 'https://www.netlib.org/lapack/'
-description = """LAPACK is written in Fortran90 and provides routines for solving systems of
- simultaneous linear equations, least-squares solutions of linear systems of equations, eigenvalue
- problems, and singular value problems."""
-
-toolchain = {'name': 'GCC', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/Reference-LAPACK/lapack/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['cd005cd021f144d7d5f7f33c943942db9f03a28d110d6a3b80d718a295f7f714']
-
-moduleclass = 'numlib'
diff --git a/Overlays/jureca_mi200_overlay/l/LLVM/LLVM-14.0.3-GCCcore-11.2.0.eb b/Overlays/jureca_mi200_overlay/l/LLVM/LLVM-14.0.3-GCCcore-11.2.0.eb
deleted file mode 100644
index cdc91ac09..000000000
--- a/Overlays/jureca_mi200_overlay/l/LLVM/LLVM-14.0.3-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,44 +0,0 @@
-name = 'LLVM'
-easyblock = 'EB_LLVM_AMDGPU'
-version = '14.0.3'
-
-homepage = "https://llvm.org/"
-description = """The LLVM Core libraries provide a modern source- and target-independent
-optimizer, along with code generation support for many popular CPUs
-(as well as some less common ones!) These libraries are built around a well
-specified code representation known as the LLVM intermediate representation
-("LLVM IR"). The LLVM Core libraries are well documented, and it is
-particularly easy to invent your own language (or port an existing compiler)
-to use LLVM as an optimizer and code generator."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'cstd': 'gnu++11', 'pic': 'True'}
-
-source_urls = [
-    'https://github.com/llvm/llvm-project/releases/download/llvmorg-%(version)s/']
-sources = ['llvm-%(version)s.src.tar.xz']
-checksums = ['1e09e8c26e1b67bc94a128b62e9b9c24b70c697a2436a479c9e5eedc4ae29654']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('CMake', '3.21.1', '', SYSTEM),
-    ('Python', '3.9.6'),
-]
-
-dependencies = [
-    ('ncurses', '6.2'),
-    ('zlib', '1.2.11'),
-]
-
-build_shared_libs = True
-
-build_targets = ["AMDGPU", "X86"]
-
-sanity_check_paths = {
-    'files': ['bin/llvm-ar', 'bin/FileCheck'],
-    'dirs': ['include/llvm', 'include/llvm-c'],
-}
-
-sanity_check_commands = ["llvm-ar --help"]
-
-moduleclass = 'compiler'
diff --git a/Overlays/jureca_mi200_overlay/l/libdrm/libdrm-2.4.107-GCCcore-11.2.0.eb b/Overlays/jureca_mi200_overlay/l/libdrm/libdrm-2.4.107-GCCcore-11.2.0.eb
deleted file mode 100644
index 842abee08..000000000
--- a/Overlays/jureca_mi200_overlay/l/libdrm/libdrm-2.4.107-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,32 +0,0 @@
-easyblock = 'MesonNinja'
-
-name = 'libdrm'
-version = '2.4.107'
-
-homepage = 'https://dri.freedesktop.org'
-description = """Direct Rendering Manager runtime library."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://dri.freedesktop.org/libdrm/']
-sources = [SOURCELOWER_TAR_XZ]
-checksums = ['c554cef03b033636a975543eab363cc19081cb464595d3da1ec129f87370f888']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('pkg-config', '0.29.2'),
-    ('Meson', '0.58.2'),
-    ('Ninja', '1.10.2'),
-]
-dependencies = [('X11', '20210802')]
-
-# installing manpages requires an extra build dependency (docbook xsl)
-configopts = '-Dman-pages=false'
-
-sanity_check_paths = {
-    'files': ['lib/libdrm.%s' % SHLIB_EXT, 'include/libdrm/drm.h'],
-    'dirs': ['include', 'lib'],
-}
-
-
-moduleclass = 'lib'
diff --git a/Overlays/jureca_mi200_overlay/l/libdrm/libdrm-2.4.108-GCCcore-11.2.0.eb b/Overlays/jureca_mi200_overlay/l/libdrm/libdrm-2.4.108-GCCcore-11.2.0.eb
deleted file mode 100644
index 6ecd87421..000000000
--- a/Overlays/jureca_mi200_overlay/l/libdrm/libdrm-2.4.108-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-easyblock = 'MesonNinja'
-
-name = 'libdrm'
-version = '2.4.108'
-
-homepage = 'https://dri.freedesktop.org'
-description = """Direct Rendering Manager runtime library."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://dri.freedesktop.org/libdrm/']
-sources = [SOURCELOWER_TAR_XZ]
-checksums = ['a1d7948cbc536763fde14b4beb5e4da7867607966d4cf46301087e8b8fe3d6a0']
-
-# checksums = ['92d8ac54429b171e087e61c2894dc5399fe6a549b1fbba09fa6a3cb9d4e57bd4']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('pkg-config', '0.29.2'),
-    ('Meson', '0.58.2'),
-    ('Ninja', '1.10.2'),
-]
-dependencies = [('X11', '20210802')]
-
-# installing manpages requires an extra build dependency (docbook xsl)
-configopts = '-Dman-pages=false'
-
-sanity_check_paths = {
-    'files': ['lib/libdrm.%s' % SHLIB_EXT, 'include/libdrm/drm.h'],
-    'dirs': ['include', 'lib'],
-}
-
-
-moduleclass = 'lib'
diff --git a/Overlays/jureca_mi200_overlay/l/libdrm/libdrm-2.4.110-GCCcore-11.2.0.eb b/Overlays/jureca_mi200_overlay/l/libdrm/libdrm-2.4.110-GCCcore-11.2.0.eb
deleted file mode 100644
index 528f05768..000000000
--- a/Overlays/jureca_mi200_overlay/l/libdrm/libdrm-2.4.110-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,34 +0,0 @@
-easyblock = 'MesonNinja'
-
-name = 'libdrm'
-version = '2.4.110'
-
-homepage = 'https://dri.freedesktop.org'
-description = """Direct Rendering Manager runtime library."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://dri.freedesktop.org/libdrm/']
-sources = [SOURCELOWER_TAR_XZ]
-checksums = ['eecee4c4b47ed6d6ce1a9be3d6d92102548ea35e442282216d47d05293cf9737']
-
-# checksums = ['92d8ac54429b171e087e61c2894dc5399fe6a549b1fbba09fa6a3cb9d4e57bd4']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('pkg-config', '0.29.2'),
-    ('Meson', '0.58.2'),
-    ('Ninja', '1.10.2'),
-]
-dependencies = [('X11', '20210802')]
-
-# installing manpages requires an extra build dependency (docbook xsl)
-configopts = '-Dman-pages=false'
-
-sanity_check_paths = {
-    'files': ['lib/libdrm.%s' % SHLIB_EXT, 'include/libdrm/drm.h'],
-    'dirs': ['include', 'lib'],
-}
-
-
-moduleclass = 'lib'
diff --git a/Overlays/jureca_mi200_overlay/m/msgpack-cpp/msgpack-cpp-4.1.1-GCCcore-11.2.0.eb b/Overlays/jureca_mi200_overlay/m/msgpack-cpp/msgpack-cpp-4.1.1-GCCcore-11.2.0.eb
deleted file mode 100644
index ada77bc81..000000000
--- a/Overlays/jureca_mi200_overlay/m/msgpack-cpp/msgpack-cpp-4.1.1-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,44 +0,0 @@
-# Thomas Hoffmann, EMBL Heidelberg, structures-it@embl.de, 2021/04
-# Stepan Nassyr, JSC/Forschungszentrum Juelich GmbH, s.nassyr@fz-juelich.de, 2022/05
-easyblock = 'CMakeNinja'
-
-name = 'msgpack-cpp'
-version = '4.1.1'
-
-homepage = 'http://msgpack.org/'
-description = """MessagePack is an efficient binary serialization format, which lets you exchange
-data among multiple languages like JSON, except that it's faster and smaller.   
-Small integers are encoded into a single byte while typical short strings       
-require only one extra byte in addition to the strings themselves."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://github.com/msgpack/msgpack-c/archive']
-sources = ['cpp-%(version)s.tar.gz']
-checksums = ['221cc539e77f5ca02f4f0bbb1edafa9ca8c08de7ba8072d7baf2139930d99182']
-
-builddependencies = [
-    ('CMake', '3.23.1'),
-    ('Ninja', '1.10.2'),
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('Boost', '1.78.0')
-]
-
-configopts = (
-    "-DBUILD_SHARED_LIBS=ON "
-    "-DMSGPACK_CXX17=ON "
-    "-DMSGPACK_BUILD_EXAMPLES=OFF "
-    "-DMSGPACK_BUILD_TESTS=ON "
-)
-
-sanity_check_paths = {
-    'files': [
-        ['include/msgpack.%s' % x for x in ['h', 'hpp']]  # check for both, C and C++ headers
-    ],
-    'dirs': ['lib/cmake', 'include/msgpack'],
-}
-
-moduleclass = 'lib'
diff --git a/Overlays/jureca_mi200_overlay/o/OpenCL-Headers/OpenCL-Headers-2022.05.18-GCCcore-11.2.0.eb b/Overlays/jureca_mi200_overlay/o/OpenCL-Headers/OpenCL-Headers-2022.05.18-GCCcore-11.2.0.eb
deleted file mode 100644
index a28b5f315..000000000
--- a/Overlays/jureca_mi200_overlay/o/OpenCL-Headers/OpenCL-Headers-2022.05.18-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,31 +0,0 @@
-easyblock = 'CMakeNinja'
-
-name = 'OpenCL-Headers'
-version = '2022.05.18'
-
-homepage = 'https://github.com/KhronosGroup/OpenCL-Headers'
-description = "Headers for Khronos' OpenCL API"
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-github_account = 'KhronosGroup'
-
-source_urls = [GITHUB_SOURCE]
-sources = ['v%(version)s.tar.gz']
-checksums = ['88a1177853b279eaf574e2aafad26a84be1a6f615ab1b00c20d5af2ace95c42e']
-
-builddependencies = [
-    ('CMake', '3.23.1'),
-    ('Ninja', '1.10.2'),
-    ('binutils', '2.37')
-]
-
-separate_build_dir = True
-
-sanity_check_paths = {
-    'files': ['include/CL/cl.h'],
-    'dirs': ['include/CL', 'share/cmake'],
-}
-
-moduleclass = 'lib'
diff --git a/Overlays/jureca_mi200_overlay/o/OpenCL-ICD-Loader/OpenCL-ICD-Loader-2022.05.18-GCCcore-11.2.0.eb b/Overlays/jureca_mi200_overlay/o/OpenCL-ICD-Loader/OpenCL-ICD-Loader-2022.05.18-GCCcore-11.2.0.eb
deleted file mode 100644
index 5c9bb793b..000000000
--- a/Overlays/jureca_mi200_overlay/o/OpenCL-ICD-Loader/OpenCL-ICD-Loader-2022.05.18-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,37 +0,0 @@
-easyblock = 'CMakeNinja'
-
-name = 'OpenCL-ICD-Loader'
-version = '2022.05.18'
-
-homepage = 'https://github.com/KhronosGroup/OpenCL-ICD-Loader'
-description = """ OpenCL defines an Installable Client Driver (ICD) mechanism to allow developers to build 
-                  applications against an Installable Client Driver loader (ICD loader) rather than linking their 
-                  applications against a specific OpenCL implementation."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-github_account = 'KhronosGroup'
-
-source_urls = [GITHUB_SOURCE]
-sources = ['v%(version)s.tar.gz']
-checksums = ['71f70bba797a501b13b6b0905dc852f3fd6e264d74ce294f2df98d29914c4303']
-
-builddependencies = [
-    ('CMake', '3.23.1'),
-    ('Ninja', '1.10.2'),
-    ('binutils', '2.37')
-]
-
-dependencies = [
-    ('OpenCL-Headers', version)
-]
-
-separate_build_dir = True
-
-sanity_check_paths = {
-    'files': ['lib/libOpenCL.%s' % SHLIB_EXT],
-    'dirs': [],
-}
-
-moduleclass = 'lib'
diff --git a/Overlays/jureca_mi200_overlay/o/OpenGL/OpenGL-2021b-GCCcore-11.2.0.eb b/Overlays/jureca_mi200_overlay/o/OpenGL/OpenGL-2021b-GCCcore-11.2.0.eb
deleted file mode 100644
index 3cbf88df8..000000000
--- a/Overlays/jureca_mi200_overlay/o/OpenGL/OpenGL-2021b-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,210 +0,0 @@
-easyblock = 'Bundle'
-
-name = 'OpenGL'
-version = '2021b'
-
-homepage = 'http://www.opengl.org/'
-description = """
-Open Graphics Library (OpenGL) is a cross-language, cross-platform application programming interface (API) for rendering
-2D and 3D vector graphics. Mesa is an open-source implementation of the OpenGL specification - a system for rendering
-interactive 3D graphics. NVIDIA supports OpenGL and a complete set of OpenGL extensions, designed to give a maximum
-performance on NVIDIA GPUs.
-
-This is a GL vendor neutral dispatch (GLVND) installation with Mesa and NVIDIA in the same lib-directory. Mesa or NVIDIA
-OpenGL is set individually for each XScreen.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-# swr detects and builds parts specific for AVX and AVX2. If we use
-# -xHost, this always gets overwritten and will fail.
-toolchainopts = {'optarch': False}
-
-builddependencies = [
-    ('Python', '3.9.6'),
-    ('binutils', '2.37'),
-    ('flex', '2.6.4'),
-    ('Bison', '3.7.6'),
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2'),
-    ('expat', '2.4.1'),
-    ('libxml2', '2.9.10'),
-    ('Meson', '0.58.2'),
-    ('Ninja', '1.10.2'),
-    ('CMake', '3.21.1', '', SYSTEM),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('nettle', '3.7.3'),
-    ('libdrm', '2.4.110'),
-    ('LLVM', '14.0.3'),
-    ('X11', '20210802'),
-    ('libunwind', '1.5.0'),
-    ('Vulkan-Headers', '1.3.213'),
-    ('Vulkan-Loader', '1.3.213'),
-]
-
-default_easyblock = 'ConfigureMake'
-
-default_component_specs = {
-    'sources': [SOURCE_TAR_GZ],
-    'start_dir': '%(name)s-%(version)s',
-}
-
-local_pkg_config = ('export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:%(installdir)s/lib/pkgconfig && '
-                    'export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:%(installdir)s/lib64/pkgconfig && ')
-
-components = [
-    # A vendor neutral dispatch layer
-    ('libglvnd', '1.3.4', {
-        'source_urls': [
-            'https://gitlab.freedesktop.org/glvnd/libglvnd/-/archive/v%(version)s/'
-        ],
-        'sources':   ['%(name)s-v%(version)s.tar.gz'],
-        'start_dir':  '%(name)s-v%(version)s',
-        'checksums': ['c42061da999f75234f9bca501c21144d9a5768c5911d674eceb8650ce3fb94bb'],
-        'preconfigopts': './autogen.sh && '
-    }),
-    # Mesa for software rendering, not hardware rendering.
-    ('Mesa', '22.1.0', {
-        # We build:
-        # - llvmpipe: the high-performance Gallium LLVM driver (only possible with glx=gallium-xlib)
-        # - swr: Intel's OpenSWR
-        'easyblock': 'MesonNinja',
-        'source_urls': [
-            'https://mesa.freedesktop.org/archive/',
-            'https://mesa.freedesktop.org/archive/%(version)s',
-            'ftp://ftp.freedesktop.org/pub/mesa/%(version)s',
-            'ftp://ftp.freedesktop.org/pub/mesa/older-versions/%(version_major)s.x/%(version)s',
-            'ftp://ftp.freedesktop.org/pub/mesa/older-versions/%(version_major)s.x',
-        ],
-        'sources': [SOURCELOWER_TAR_XZ],
-        'checksums': [
-            'df6270c1371eaa2aa6eb65b95cbbb2a98b14fa4b7ba0ed45e4ca2fd32df60477',
-        ],
-        'start_dir': '%(namelower)s-%(version)s',
-        'separate_build_dir': True,
-        'preconfigopts': local_pkg_config,
-        # https://gitlab.freedesktop.org/mesa/mesa/-/blob/master/meson_options.txt
-        'configopts': (' -D libdir=%(installdir)s/lib'
-                       ' -D gbm=enabled'
-                       ' -D glx=auto'
-                       ' -D osmesa=true'
-                       ' -D llvm=enabled'
-                       ' -D shared-llvm=enabled'
-                       ' -D dri-drivers=""'
-                       ' -D vulkan-drivers="amd,swrast"'
-                       ' -D gallium-drivers="radeonsi,zink,swrast"'
-                       ' -D platforms=x11'  # surfaceless taken automatically, see logs
-                       ' -D glvnd=true'
-                       ' -D libunwind=disabled'
-                       ' -D valgrind=disabled'
-                       ' -D egl=enabled'
-                       ' -D gles1=enabled -Dgles2=enabled'
-                       ' -D shared-glapi=enabled'
-                       ' -D gallium-vdpau=disabled'  # only for r300, r600, radeonsi, nouveau
-                       ' -D buildtype=release'),
-    }),
-    # OpenGL Utility Library - offers higher level GL-graphics functions
-    ('glu', '9.0.2', {
-        'preconfigopts': local_pkg_config,
-        'source_urls': [
-            'ftp://ftp.freedesktop.org/pub/mesa/glu/'
-        ],
-        'sources': [
-            'glu-%(version)s.tar.gz'
-        ],
-        'checksums': [
-            '24effdfb952453cc00e275e1c82ca9787506aba0282145fff054498e60e19a65',
-        ],
-    }),
-    # OpenGL Extension Wrangler Library - determines which OpenGL extensions are supported at run-time
-    # This is just GLEW for GLX (which requires DISPLAY to be set) and not GLEW for EGL as GLEW selects GLX/EGL at
-    # compile-time and not run-time (https://github.com/nigels-com/glew/issues/172#issuecomment-357400019)
-    # Compile+Load GLEW-EGL on top to enable GLEW for EGL
-    ('glew', '2.2.0', {
-        'source_urls': [
-            'https://sourceforge.net/projects/glew/files/glew/snapshots/',
-        ],
-        'sources': [
-            'glew-20200115.tgz',
-        ],
-        'checksums': [
-            '314219ba1db50d49b99705e8eb00e83b230ee7e2135289a00b5b570e4a4db43a',
-        ],
-        'skipsteps': ['configure'],
-        'buildopts': ('GLEW_PREFIX=%(installdir)s GLEW_DEST=%(installdir)s LIBDIR=%(installdir)s/lib '
-                      'LDFLAGS.EXTRA="-L${EBROOTX11}/lib/ -lX11" LDFLAGS.GL="-L%(installdir)s/lib -lGL"'),
-        'installopts': 'GLEW_PREFIX=%(installdir)s GLEW_DEST=%(installdir)s LIBDIR=%(installdir)s/lib ',
-        'install_cmd': 'make install.all ',
-    }),
-    # MESA demos - offers the important command 'eglinfo'
-    ('demos', '95c1a57cfdd1ef2852c828cba4659a72575c5c5d', {
-        'source_urls': [
-            'https://gitlab.freedesktop.org/mesa/demos/-/archive/%(version)s/',
-        ],
-        'sources': [SOURCELOWER_TAR_GZ],
-        'checksums': [
-            '7738beca8f6f6981ba04c8a22fde24d69d6b2aaab1758ac695c9475bf704249c',
-        ],
-        'preconfigopts': ('./autogen.sh && ' +
-                          local_pkg_config +
-                          'GLEW_CFLAGS="-I%(installdir)s/include/" GLEW_LIBS="-L%(installdir)s/lib/ -lGLEW -lGL" '
-                          'EGL_CFLAGS="-I%(installdir)s/include/" EGL_LIBS="-L%(installdir)s/lib/ -lEGL" '),
-        'configopts': '--disable-osmesa ',
-    }),
-]
-
-postinstallcmds = [
-    'cd %(installdir)s/lib && ln -sf libGL.so.1.7.0 libGL.so.1',
-    'rm %(installdir)s/lib/*.la',
-    'cd %(installdir)s/lib && ln -sf libGLX_mesa.so.0 libGLX_indirect.so.0',
-    # EGL vendor ICDs
-    (
-        '{ cat > %(installdir)s/share/glvnd/egl_vendor.d/50_mesa.json; } << \'EOF\'\n'
-        '{\n'
-        '  \"file_format_version\" : \"1.0.0\",\n'
-        '  \"ICD\" : {\n'
-        '     \"library_path\" : \"libEGL_mesa.so.0\"\n'
-        '  }\n'
-        '}\n'
-        'EOF'
-    ),
-    # correct pkg-config of GLEW
-    'sed -i "/^libdir=/c\\libdir=\\${exec_prefix}\\/lib" %(installdir)s/lib/pkgconfig/glew.pc',
-    'sed -i "/^prefix=/c\\prefix=%(installdir)s"       %(installdir)s/lib/pkgconfig/glew.pc',
-]
-
-modextravars = {
-    # '__GLX_VENDOR_LIBRARY_NAME': 'mesa'
-    '__EGL_VENDOR_LIBRARY_FILENAMES': ('%(installdir)s/share/glvnd/egl_vendor.d/50_mesa.json'),
-    'EGL_PLATFORM': 'surfaceless',
-    'EGL_DRIVER': 'radeonsi',
-    'EGL_LOG_LEVEL': 'fatal',
-    'GALLIUM_DRIVER': 'radeonsi',
-    'KNOB_MAX_WORKER_THREADS': '65535',
-}
-
-modluafooter = '''
-add_property("arch","gpu")
-
-conflict("Mesa")
-conflict("libGLU")
-'''
-
-sanity_check_paths = {
-    'files': [
-        'lib/libEGL_mesa.%s' % SHLIB_EXT, 'lib/libOSMesa.%s' % SHLIB_EXT,
-        'lib/libGLESv1_CM.%s' % SHLIB_EXT, 'lib/libGLESv2.%s' % SHLIB_EXT,
-        'include/GL/glext.h', 'include/GL/glx.h',
-        'include/GL/osmesa.h', 'include/GL/gl.h', 'include/GL/glxext.h',
-        'include/GLES/gl.h', 'include/GLES2/gl2.h', 'include/GLES3/gl3.h',
-        'lib/libOpenGL.%s' % SHLIB_EXT,
-        'lib/libGLEW.a', 'lib/libGLEW.%s' % SHLIB_EXT,
-        'bin/glewinfo', 'bin/visualinfo',
-        'include/GL/glew.h', 'include/GL/glxew.h', 'include/GL/wglew.h',
-    ],
-    'dirs': []
-}
-
-moduleclass = 'vis'
diff --git a/Overlays/jureca_mi200_overlay/o/OpenMPI/OpenMPI-4.1.2-GCC-11.2.0.eb b/Overlays/jureca_mi200_overlay/o/OpenMPI/OpenMPI-4.1.2-GCC-11.2.0.eb
deleted file mode 100644
index 9f2f803ce..000000000
--- a/Overlays/jureca_mi200_overlay/o/OpenMPI/OpenMPI-4.1.2-GCC-11.2.0.eb
+++ /dev/null
@@ -1,62 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'OpenMPI'
-version = '4.1.2'
-
-homepage = 'https://www.open-mpi.org/'
-description = """The Open MPI Project is an open source MPI-3 implementation."""
-
-toolchain = {'name': 'GCC', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-source_urls = [
-    'https://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
-sources = [SOURCELOWER_TAR_BZ2]
-checksums = ['9b78c7cf7fc32131c5cf43dd2ab9740149d9d87cadb2e2189f02685749a6b527']
-
-osdependencies = [
-    # needed for --with-verbs
-    ('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel'),
-    # needed for --with-pmix
-    ('pmix-devel'),
-]
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('hwloc', '2.5.0'),
-    ('UCX', 'default', '', SYSTEM),
-    ('libevent', '2.1.12'),
-]
-
-configopts = '--enable-shared '
-configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
-configopts += '--with-ucx=$EBROOTUCX '
-configopts += '--with-verbs '
-configopts += '--with-libevent=$EBROOTLIBEVENT '
-configopts += '--without-orte '
-configopts += '--without-psm2 '
-configopts += '--disable-oshmem '
-configopts += '--without-cuda '
-configopts += '--with-rocm=/opt/rocm '
-# configopts += '--with-cuda=$EBROOTCUDA '
-configopts += '--with-ime=/opt/ddn/ime '
-configopts += '--with-gpfs '
-
-# to enable SLURM integration (site-specific)
-configopts += '--with-slurm --with-pmix=external --with-libevent=external --with-ompi-pmix-rte'
-
-local_libs = ["mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte"]
-sanity_check_paths = {
-    'files': ["bin/%s" % local_binfile for local_binfile in ["ompi_info", "opal_wrapper"]] +
-             ["lib/lib%s.%s" % (local_libfile, SHLIB_EXT) for local_libfile in local_libs] +
-             ["include/%s.h" % x for x in ["mpi-ext", "mpif-config",
-                                           "mpif", "mpi", "mpi_portable_platform"]],
-    'dirs': [],
-}
-
-moduleclass = 'mpi'
diff --git a/Overlays/jureca_mi200_overlay/r/ROCm/MIOpen-disable-pch-until-5.3.patch b/Overlays/jureca_mi200_overlay/r/ROCm/MIOpen-disable-pch-until-5.3.patch
deleted file mode 100644
index 1c4046934..000000000
--- a/Overlays/jureca_mi200_overlay/r/ROCm/MIOpen-disable-pch-until-5.3.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/comgr.cpp b/src/comgr.cpp
-index cf108f247..0a1d3791f 100644
---- a/src/comgr.cpp
-+++ b/src/comgr.cpp
-@@ -119,7 +119,7 @@ MIOPEN_DECLARE_ENV_VAR(MIOPEN_DEBUG_OPENCL_WAVE64_NOWGP)
- 
- // '__hipGetPCH' is not available in [4.4, 5.0). See SWDEV-308265.
- #if HIP_SUPPORTS_PCH && (HIP_PACKAGE_VERSION_FLAT >= 4004000000ULL) && \
--    (HIP_PACKAGE_VERSION_FLAT < 5000000000ULL)
-+    (HIP_PACKAGE_VERSION_FLAT < 5003000000ULL)
- #undef HIP_SUPPORTS_PCH
- #define HIP_SUPPORTS_PCH 0
- #endif
diff --git a/Overlays/jureca_mi200_overlay/r/ROCm/ROCm-5.1.3-GCCcore-11.2.0.eb b/Overlays/jureca_mi200_overlay/r/ROCm/ROCm-5.1.3-GCCcore-11.2.0.eb
deleted file mode 100644
index 17e9a0cb3..000000000
--- a/Overlays/jureca_mi200_overlay/r/ROCm/ROCm-5.1.3-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,1070 +0,0 @@
-# Bundle containing ROCm framework and libraries
-#
-# The Arch Linux AUR recipes are the reference: https://github.com/rocm-arch/rocm-arch
-#
-# TODO: hipify-clang needs CUDA (headers?), right now CUDA is excluded in the mi200 partition. Maybe hidden CUDA or
-#       allow installation or make a custom package?
-# TODO: missing: hipify-clang (see above)
-#                miopen-opencl (I think it's either miopen-hip or miopen-opencl but not both)
-#                mivisionx (started writing component, but it needs Qt5,OpenCV,FFmpeg and would pull in
-#                           CUDA which is disallowed)
-#                rocm-validation-suite (started writing component, but need to install pciutils-devel rpm)
-#                gpufort (github.com/RocmSoftwarePlatform/openacc-fortran-interfaces.git is required but
-#                         is private, ask AMD for access? )
-#                        NOTE: This might actually be outdated, but gpufort seems like just a python script?
-#
-# TODO: missing pkgs that just provide some version numbers:
-#       rocm-core
-#       rocm-hip-libraries
-#       rocm-hip-runtime
-#       rocm-hip-sdk
-#       rocm-language-runtime
-#       rocm-opencl-sdk
-# TODO: sanity-check existence of all the libraries
-# TODO: some modextrapaths, modextravars might need to be set?
-# TODO: Some components are a bit hacked together, writing an easyblock might be better (hipamd, openmp-extras, ...)
-# TODO: check if any package is unusable when not compiled on a system with a GPU (code auto-detects GPU).
-#       There are some tricks wrt rocm_agent_enumerator (ROCM_TARGET_LST env. var. or target.lst in the same dir)
-#
-# Other notes:
-#  - MIOpen __hipGetPCH missing might be due to some flag in hipamd, for now the patch disables PCH until v5.3
-#  - AMDMIGraphX is made to link explicitly against mkl through configopts - this should be handled by cmake
-#    either in Blaze or AMDMIGraphX. maybe a patch?
-
-easyblock = 'Bundle'
-name = 'ROCm'
-version = '5.1.3'
-
-homepage = 'https://github.com/RadeonOpenCompute/ROCm'
-description = """AMD ROCm - Open Source Platform for HPC and Ultrascale GPU Computing."""
-
-site_contacts = 's.nassyr@fz-juelich.de'
-
-# toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-# rocALUTION asks for mpi (I think it can build without it though)
-# OpenMPI needs ROCm at compile time to support it, so this might be problematic ("ROCm-Bare" package containing only
-# what OpenMPI needs?)
-toolchain = {'name': 'gompi', 'version': '2021b'}
-
-
-builddependencies = [
-    ("binutils", "2.37"),
-    ("CMake",    "3.23.1"),
-    ("Ninja",    "1.10.2"),
-    ("makeinfo", "6.8"),           # ROCgdb complains about it missing
-    # roctracer breaks without this (also the newer robotpy-cppheaderparser doesn't seem to work)
-    ("CppHeaderParser", "2.7.4"),
-]
-
-dependencies = [
-    ("libdrm", "2.4.110"),  # ROCT complains about libdrm not being found
-    ("OpenGL", "2021b"),    # hip needs mesa
-    ("Python", "3.9.6"),    # rocFFT asks for python headers
-    ("guile",  "2.0.14"),   # ROCgdb wants guile-2.0
-    ("MPFR",   "4.1.0"),    # also ROCgdb
-    ("source-highlight",  "3.1.9"),      # also ROCgdb
-    ("babeltrace",        "1.5.8"),      # also ROCgdb
-    ("fmt",               "8.1.1"),      # rocSOLVER uses fmt for something
-    ("protobuf",          "3.17.3"),     # AMDMIGraphX and some others
-    ("nlohmann-json",     "3.10.4"),     # AMDMIGraphX
-    ("msgpack-c",         "4.0.0"),      # AMDMIGraphX
-    ("msgpack-cpp",       "4.1.1"),      # AMDMIGraphX
-    ("pybind11",          "2.7.1"),      # AMDMIGraphX
-    ("Blaze",             "3.8.1",
-     '', ('gomkl', '2021b')),            # AMDMIGraphX
-    # AMDMIGraphX, probably getting it from Blaze, but better to put explicit
-    ("imkl",              "2021.4.0"),
-    # dependency
-    # ("FFmpeg",            "4.4.1"),                              # MIVisionX
-    # ("OpenCV",            "4.5.4", '', ('gcccoremkl','2021b')),  # MIVisionX
-    # ("Qt5",               "5.15.2"),                             # MIVisionX
-    ("OpenCL-Headers",    "2022.05.18"),  # OpenCL runtime and miopengemm
-    ("OpenCL-ICD-Loader", "2022.05.18"),  # OpenCL runtime and miopengemm
-]
-
-default_easyblock = 'CMakeNinja'
-github_account = "RadeonOpenCompute"
-
-local_amdgpu_targets = "gfx90a"
-
-components = [
-    ('ROCT-Thunk-Interface', version,
-     {
-         'source_urls': [GITHUB_SOURCE],
-         'sources':     [{
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums':  ['3c66b1aa7451571ce8bee10e601d34b93c9416b9be476610ee5685dbad81034a'],
-         'srcdir':     '%(name)s-rocm-%(version)s'
-     }),
-    ('rocm-cmake', version,
-     {
-         'source_urls': [GITHUB_SOURCE],
-         'sources':     [{
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums': ['19b2da0d56300aab454655b57435ab3ed9e101ecb96561336ea8865bbd993c23'],
-         'srcdir':    '%(name)s-rocm-%(version)s'
-     }),
-    ('llvm-project', version,
-     {
-         'source_urls': [GITHUB_SOURCE],
-         'sources':     [{
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          'rocm-llvm-%(version)s.tar.gz',
-         }],
-         'checksums': ['d236a2064363c0278f7ba1bb2ff1545ee4c52278c50640e8bb2b9cfef8a2f128'],
-         'srcdir':    '%(name)s-rocm-%(version)s/llvm',
-         'install_target_subdir': 'llvm',
-         'configopts': (" -DLLVM_HOST_TRIPLE=x86_64-linux-gnu "
-                        " -DLLVM_BUILD_UTILS=ON "
-                        " -DLLVM_ENABLE_BINDINGS=OFF "
-                        " -DOCAMLFIND=NO "
-                        " -DLLVM_ENABLE_OCAMLDOC=OFF "
-                        " -DLLVM_INCLUDE_BENCHMARKS=OFF "
-                        " -DLLVM_BUILD_TESTS=OFF "
-                        " -DLLVM_ENABLE_PROJECTS='llvm;clang;compiler-rt;lld' "
-                        " -DLLVM_TARGETS_TO_BUILD='AMDGPU;X86' "
-                        " -DLLVM_BINUTILS_INCDIR=$EBROOTBINUTILS/include ")
-     }),
-    ('ROCm-Device-Libs', version,
-     {
-         'source_urls': [GITHUB_SOURCE],
-         'sources':     [{
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums':  ['c41958560ec29c8bf91332b9f668793463904a2081c330c0d828bf2f91d4f04e'],
-         'srcdir':     '%(name)s-rocm-%(version)s',
-         'configopts': " -DLLVM_DIR=%(installdir)s/llvm/lib/cmake/llvm "
-     }),
-    ('ROCm-CompilerSupport', version,
-     {
-         'source_urls': [GITHUB_SOURCE],
-         'sources':     [{
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums':  ['3078c10e9a852fe8357712a263ad775b15944e083f93a879935c877511066ac9'],
-         'srcdir':     '%(name)s-rocm-%(version)s/lib/comgr',
-         'configopts': " -DCMAKE_PREFIX_PATH=\"%(installdir)s/llvm;%(installdir)s\" "
-     }),
-    ('hsa-amd-aqlprofile', version,
-     {
-         'easyblock':   "Binary",
-         'source_urls': ['http://repo.radeon.com/rocm/apt/%(version)s/pool/main/h/hsa-amd-aqlprofile/'],
-         'sources':     [{
-             'download_filename': 'hsa-amd-aqlprofile_1.0.0.50103-66_amd64.deb',
-             'filename':          '%(name)s-%(version)s.deb',
-             'extract_cmd':       'ar x %s'
-         }],
-         'checksums':   ['ba76a30f078cfd2d4927fd43840f22265ebc0dfd1c03ac3bc36f637b67ec4119'],
-         'install_cmd': """
-             mkdir -p %(builddir)s/%(name)s
-             tar -C "%(builddir)s/%(name)s" -xf data.tar.gz;
-             cp -r %(builddir)s/%(name)s/opt/rocm-%(version)s/%(name)s/ %(installdir)s/hsa
-             cp -r %(builddir)s/%(name)s/opt/rocm-%(version)s/lib/ %(installdir)s/lib
-             cp -r %(builddir)s/%(name)s/opt/rocm-%(version)s/share/ %(installdir)s/share
-             ln -sf %(installdir)s/hsa/lib/lib%(name)s64.so %(installdir)s/lib/lib%(name)s64.so
-         """
-     }),
-    ('ROCR-Runtime', version,
-     {
-         'source_urls': [GITHUB_SOURCE],
-         'sources':     [{
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums':  ['479340ec34cdffbbdb1002c85a47d1fccd23e8394631a1f001ef6130be08287d'],
-         'srcdir':     '%(name)s-rocm-%(version)s/src',
-         'configopts': (" -DCMAKE_PREFIX_PATH=\"%(installdir)s/llvm;%(installdir)s\" "
-                        " -DCMAKE_CXX_FLAGS='-DNDEBUG' ")
-     }),
-    ('rocminfo', version,
-     {
-         'source_urls': [GITHUB_SOURCE],
-         'sources':     [{
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'patches': [
-             ('https://patch-diff.githubusercontent.com/raw/RadeonOpenCompute/rocminfo/pull/53.patch',
-              '%(name)s-rocm-%(version)s')],
-         'checksums': [
-             '7aecd7b189e129b77c8f2af70be2926a0f3a5ee89814879bc8477924a7e6f2ae',
-             '95d6f679a7ad45ee663222c85dd5e7d456c9cf5da3cd43455c3c2fe2ee36f0a0',
-         ],
-         'srcdir':     '%(name)s-rocm-%(version)s',
-         'configopts': (" -DCMAKE_PREFIX_PATH=\"%(installdir)s/llvm;%(installdir)s\" "
-                        " -DROCRTST_BLD_TYPE=Release "
-                        " -DCMAKE_INSTALL_LIBDIR=lib ")
-     }),
-    ('hipamd', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCm-Developer-Tools/HIP/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          'hip-%(version)s.tar.gz',
-         }, {
-             'source_urls':       ['https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          'rocm-opencl-%(version)s.tar.gz',
-         }, {
-             'source_urls':       ['https://github.com/ROCm-Developer-Tools/ROCclr/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          'rocclr-%(version)s.tar.gz',
-         }, {
-             'source_urls':       ['https://github.com/ROCm-Developer-Tools/hipamd/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          'hipamd-%(version)s.tar.gz',
-         }],
-         'patches': [
-             ('https://github.com/ROCm-Developer-Tools/HIP/commit/d221fb6ebbe24d66855af8160687aa01b0112dec.patch',
-              'HIP-rocm-%(version)s'),
-             ('hipamd-5.1.3-git-hash.patch', 'hipamd-rocm-%(version)s')
-         ],
-         'checksums': [
-             'ce755ee6e407904eba3f6b3c9efcdd48eb4f58a26b06e1892166d05f19a75973',
-             '44a7fac721abcd93470e1a7e466bdea0c668c253dee93e4f1ea9a72dbce4ba31',
-             'ddee63cdc6515c90bab89572b13e1627b145916cb8ede075ef8446cbb83f0a48',
-             '707f2217f0e7aeb62d7b76830a271056d665542bf5f7a54e40adf4d5f299ca93',
-             'a7991885288152633f2d058c874278fd4e61eafa1992771b8d122c3a3ad9da35',
-             'bf5429dfb95e11844c14fe4d2aced3a023ff4bcc7dd5ded78d81ce3df1f08249',
-         ],
-         'srcdir':                'hipamd-rocm-%(version)s/',
-         'install_target_subdir': 'hip',
-         'configopts': (" -DCMAKE_PREFIX_PATH=\"%(installdir)s/llvm;%(installdir)s\" "
-                        " -DHIP_COMMON_DIR=%(builddir)s/HIP-rocm-%(version)s/ "
-                        " -DAMD_OPENCL_PATH=%(builddir)s/ROCm-OpenCL-Runtime-rocm-%(version)s/ "
-                        " -DROCCLR_PATH=%(builddir)s/ROCclr-rocm-%(version)s/ "
-                        " -DROCCLR_INCLUDE_PATH=%(builddir)s/ROCclr-rocm-%(version)s "
-                        " -DHIP_PLATFORM=amd "
-                        " -DCMAKE_INSTALL_LIBDIR=lib "),
-         'installopts': "install && " + "\n".join([
-             "sed -i '/__noinline__/d' %(installdir)s/hip/include/hip/amd_detail/host_defines.h",
-             "install -d %(installdir)s/bin",
-             "install -d %(installdir)s/include",
-             "install -d %(installdir)s/lib/cmake",
-             ("for binary in hipcc hipconfig hipcc.pl hipconfig.pl; "
-              "  do ln -s %(installdir)s/hip/bin/$binary %(installdir)s/bin/$binary; "
-              "done"),
-             "ln -s %(installdir)s/hip/lib/libamdhip64.so %(installdir)s/lib/libamdhip64.so",
-             "ln -s %(installdir)s/hip/include/hip %(installdir)s/include/hip",
-             "ln -s %(installdir)s/hip/lib/cmake/hip %(installdir)s/lib/cmake/hip",
-             "ln -s %(installdir)s/hip/lib/cmake/hip-lang %(installdir)s/lib/cmake/hip-lang",
-         ]) + "\n echo "
-     }),
-    ('llvm-project-mlir', version,
-     {
-         'source_urls': ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-         'sources':     [{
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         # fix stray ";" in linker flags
-         'patches':   [('llvm-project-mlir-fix-rpath-flags.patch', '%(name)s-rocm-%(version)s')],
-         'checksums': [
-             '936f92707ffe9a1973728503db6365bb7f14e5aeccfaef9f0924e54d25080c69',
-             '53c05fab666019860a60e8a32fdc99046177a1f0dd76a4a5ec9fc3dab7b5bba5',
-         ],
-         'srcdir':         '%(name)s-rocm-%(version)s',
-         'preconfigopts':  'export ROCM_PATH=%(installdir)s; export HIP_PATH=%(installdir)s/hip;  ',
-         'prebuildopts':   'export ROCM_PATH=%(installdir)s; export HIP_PATH=%(installdir)s/hip;  ',
-         'preinstallopts': 'export ROCM_PATH=%(installdir)s; export HIP_PATH=%(installdir)s/hip;  ',
-         'configopts': (
-             " -DMLIR_MIOPEN_SQLITE_ENABLED=On "
-             " -DBUILD_FAT_LIBMLIRMIOPEN=1 "
-             " -DROCM_PATH=%(installdir)s "
-             " -DLLVM_TARGETS_TO_BUILD='AMDGPU;X86' ")
-     }),
-    ('rocm_smi_lib', version,
-     {
-         'source_urls': [GITHUB_SOURCE],
-         'sources':     [{
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'patches': [
-             ('https://patch-diff.githubusercontent.com/raw/RadeonOpenCompute/rocm_smi_lib/pull/107.patch',
-              '%(name)s-rocm-%(version)s')],
-         'checksums': [
-             '8a19ce60dc9221545aa50e83e88d8c4be9bf7cde2425cefb13710131dc1d7b1b',
-             'f1d66af131833a55bcfcac63e9af7194cc38cb1bb583fb74427e4f0f89719910',
-         ],
-         'srcdir':     '%(name)s-rocm-%(version)s',
-         'configopts': (" -DCMAKE_SHARED_LINKER_FLAGS=\"-fuse-ld=bfd\" "
-                        " -DCMAKE_MODULE_LINKER_FLAGS=\"-fuse-ld=bfd\" "
-                        " -DCMAKE_EXE_LINKER_FLAGS=\"-fuse-ld=bfd\" ")
-     }),
-    ('atmi', version,
-     {
-         'easyblock': 'CMakeMake',  # Uses cmake in a crappy way breaking ninja
-         'sources':   [{
-             'source_urls':       [GITHUB_SOURCE],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums': [
-             'a43448d77705b2b07e1758ffe8035aa6ba146abc2167984e8cb0f1615797b341',
-         ],
-         'srcdir':                '%(name)s-rocm-%(version)s/src',
-         'install_target_subdir': 'atmi',
-         'preconfigopts': "export ROCM_PATH=%(installdir)s; ",
-         'configopts':    " -DROCM_VERSION=\"%(version)s\" " +\
-                          " -DAMDGPU_TARGETS=%s " % local_amdgpu_targets,
-         'prebuildopts':  "export ROCM_PATH=%(installdir)s; "
-     }),
-    ('ROCdbgapi', version,
-     {
-         'source_urls': ['https://github.com/ROCm-Developer-Tools/%(name)s/archive'],
-         'sources':     [{
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'patches': [
-             ('https://patch-diff.githubusercontent.com/raw/ROCm-Developer-Tools/ROCdbgapi/pull/4.patch',
-              '%(name)s-rocm-%(version)s')],
-         'checksums': [
-             '880f80ebf741e3451676837f720551e02cffd0b9346ca4dfa6cf7f7043282f2b',
-             '91b29cafec79441e6c311d50ca5653ec8315c401b1cc0f93ce65bfdfdda2e04e',
-         ],
-         'srcdir': '%(name)s-rocm-%(version)s',
-     }),
-    ('rocr_debug_agent', version,
-     {
-         'source_urls': ['https://github.com/ROCm-Developer-Tools/%(name)s/archive'],
-         'sources':     [{
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums':     ['ef26130829f3348d503669467ab1ea39fb67d943d88d64e7ac04b9617ec6067d'],
-         'srcdir':         '%(name)s-rocm-%(version)s',
-         'preconfigopts':  'export ROCM_PATH=%(installdir)s; export HIP_PATH=%(installdir)s/hip;  ',
-         'prebuildopts':   'export ROCM_PATH=%(installdir)s; export HIP_PATH=%(installdir)s/hip;  ',
-         'preinstallopts': 'export ROCM_PATH=%(installdir)s; export HIP_PATH=%(installdir)s/hip;  ',
-         'configopts':     " -DCMAKE_HIP_ARCHITECTURES=\"%s\" " % local_amdgpu_targets +\
-                           (" -DCMAKE_PREFIX_PATH=\"%(installdir)s;%(installdir)s/hip\" "
-                            " -DCMAKE_MODULE_PATH=\"%(installdir)s/hip/cmake\" ")
-     }),
-    ('ROCgdb', version,
-     {
-         'easyblock':   'ConfigureMake',
-         'source_urls': ['https://github.com/ROCm-Developer-Tools/%(name)s/archive'],
-         'sources':     [{
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums':      ['81f5e368facdcc424a37cb5809f0b436bedb9a6d9af4d17785b3c446ab0a7821'],
-         'preconfigopts':  'cd %(name)s-rocm-%(version)s && ',
-         'prebuildopts':   'cd %(name)s-rocm-%(version)s && ',
-         'preinstallopts': 'cd %(name)s-rocm-%(version)s && ',
-         'configopts': (
-             "  --program-prefix=roc "
-             "  --disable-shared "
-             "  --disable-nls "
-             "  --enable-source-highlight "
-             "  --enable-tui "
-             "  --enable-64-bit-bfd "
-             "  --enable-targets=\"x86_64-linux-gnu,amdgcn-amd-amdhsa\" "
-             "  --with-system-readline "
-             "  --with-python=$EBROOTPYTHON/bin/python3 "
-             "  --with-rocm-dbgapi=%(installdir)s "
-             "  --with-guile=guile-2.0 "
-             "  --with-expat "
-             "  --with-system-zlib "
-             "  --with-babeltrace "
-             "  --with-lzma "
-             "  --disable-gdbtk "
-             "  --disable-ld "
-             "  --disable-gas "
-             "  --disable-gdbserver "
-             "  --disable-sim "
-         )
-     }),
-    ('rocprofiler', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCm-Developer-Tools/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }, {
-             'source_urls':       ['https://github.com/ROCm-Developer-Tools/roctracer/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          'roctracer-%(version)s.tar.gz',
-         }],
-         'checksums': [
-             'eca7be451c7bf000fd9c75683e7f5dfbed32dbb385b5ac685d2251ee8c3abc96',
-             '45f19875c15eb609b993788b47fd9c773b4216074749d7744f3a671be17ef33c',
-         ],
-         'srcdir':        '%(name)s-rocm-%(version)s',
-         'preconfigopts': 'export ROCM_PATH=%(installdir)s; export HIP_PATH=%(installdir)s/hip;  ',
-         'prebuildopts':  'export ROCM_PATH=%(installdir)s; export HIP_PATH=%(installdir)s/hip;  ',
-         'configopts':    " -DPROF_API_HEADER_PATH=%(builddir)s/roctracer-rocm-%(version)s/inc/ext",
-         'installopts':   "install && " + "\n".join([
-             "install -d %(installdir)s/bin",
-             "ln -s %(installdir)s/rocprofiler/bin/rocprof %(installdir)s/bin/rocprof",
-         ]) + "\n echo "
-     }),
-    ('roctracer', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCm-Developer-Tools/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'patches': [
-             ('https://patch-diff.githubusercontent.com/raw/ROCm-Developer-Tools/roctracer/pull/63.patch',
-              '%(name)s-rocm-%(version)s'),
-             ('roctracer-hsa_ostream_ops-include.patch',
-              '%(name)s-rocm-%(version)s'),
-         ],
-         'checksums': [
-             '45f19875c15eb609b993788b47fd9c773b4216074749d7744f3a671be17ef33c',
-             '937e040a045eceddb609f18df1106f17fbe69b0ca479dea43fb794d58cacf7c2',
-             '1a614b3416a50ddcd6fcfa80730a9beb856ca3314b522aef353f0ad7baf593da',
-         ],
-         'preconfigopts': 'export ROCM_PATH=%(installdir)s; export HIP_PATH=%(installdir)s/hip; ',
-         'prebuildopts':  'export ROCM_PATH=%(installdir)s; export HIP_PATH=%(installdir)s/hip;  ',
-         'srcdir':        '%(name)s-rocm-%(version)s',
-     }),
-    ('rccl', version,
-     {
-         'source_urls': ['https://github.com/ROCmSoftwarePlatform/rccl/archive'],
-         'sources':     [{
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums':     ['56491257f27b48bf85f4b91434a2a6e49a448337c889db181b02c8a4a260a4bc'],
-         'srcdir':        '%(name)s-rocm-%(version)s',
-         'preconfigopts': "export ROCM_PATH=%(installdir)s; ",
-         'configopts':    " -DCMAKE_CXX_COMPILER=%(installdir)s/hip/bin/hipcc " +\
-                          " -DAMDGPU_TARGETS=%s " % local_amdgpu_targets,
-         'prebuildopts':  "export ROCM_PATH=%(installdir)s; "
-     }),
-    ('ROCclr', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          'rocm-opencl-%(version)s.tar.gz',
-         }, {
-             'source_urls':       ['https://github.com/ROCm-Developer-Tools/ROCclr/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          'rocclr-%(version)s.tar.gz',
-         }],
-         'checksums': [
-             '44a7fac721abcd93470e1a7e466bdea0c668c253dee93e4f1ea9a72dbce4ba31',
-             'ddee63cdc6515c90bab89572b13e1627b145916cb8ede075ef8446cbb83f0a48',
-         ],
-         'srcdir':      '%(name)s-rocm-%(version)s/',
-         'configopts':  (" -DAMD_OPENCL_PATH=%(builddir)s/ROCm-OpenCL-Runtime-rocm-%(version)s/ "),
-         'installopts': ' && echo ',  # install nothing, just build and use for OpenCL later
-     }),
-    ('ROCm-OpenCL-Runtime', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          'rocm-opencl-%(version)s.tar.gz',
-         }],
-         'checksums': [
-             '44a7fac721abcd93470e1a7e466bdea0c668c253dee93e4f1ea9a72dbce4ba31',
-         ],
-         'srcdir':     '%(name)s-rocm-%(version)s/',
-         'configopts': (" -DCMAKE_PREFIX_PATH=\"%(builddir)s/ROCclr-rocm-%(version)s/;%(installdir)s\" "
-                        " -DROCCLR_PATH=%(builddir)s/ROCclr-rocm-%(version)s/ "
-                        " -DROCCLR_INCLUDE_PATH=%(builddir)s/ROCclr-rocm-%(version)s "
-                        " -DROCM_PATH=%(installdir)s"
-                        " -DAMD_OPENCL_PATH=%(builddir)s/ROCm-OpenCL-Runtime-rocm-%(version)s/ "),
-     }),
-    ('clang-ocl', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/RadeonOpenCompute/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums': [
-             'e19ee15f26fc03309398ac73cc738508c0e1617deccfd667d369a3948b5d3552',
-         ],
-         'srcdir':     '%(name)s-rocm-%(version)s/',
-         'configopts': (" -DCLANG_BIN=\"%(installdir)s/llvm/bin\" "
-                        " -DBITCODE_DIR=\"%(installdir)s/amdgcn/bitcode\" "),
-     }),
-    ('MIOpenGEMM', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'patches': [
-             ('https://patch-diff.githubusercontent.com/raw/ROCmSoftwarePlatform/MIOpenGEMM/pull/46.patch',
-              '%(name)s-rocm-%(version)s'),
-         ],
-         'checksums': [
-             'c70fc9e2a6d47356a612e24f5757bf16fdf26e671bd53a0975c1a0978da740b6',
-             '4d54249ca45623328721ec0648b7ba18697ad9f7ef0c0bd01c96b9ed5670fa33',
-         ],
-         'srcdir': '%(name)s-rocm-%(version)s/',
-     }),
-    ('openmp-extras', version,
-     # Very hacky, needs easyblock
-     {
-         'easyblock': 'ConfigureMake',
-         'sources':   [{
-             'source_urls':       ['https://github.com/ROCm-Developer-Tools/aomp/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          'aomp-%(version)s.tar.gz',
-         }, {
-             'source_urls':       ['https://github.com/RadeonOpenCompute/llvm-project/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          'rocm-llvm-%(version)s.tar.gz',
-         }, {
-             'source_urls':       ['https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          'rocm-device-libs-%(version)s.tar.gz',
-         }, {
-             'source_urls':       ['https://github.com/ROCm-Developer-Tools/flang/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          'flang-%(version)s.tar.gz',
-         }, {
-             'source_urls':       ['https://github.com/ROCm-Developer-Tools/aomp-extras/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          'aomp-extras-%(version)s.tar.gz',
-         }],
-         'patches': [
-             ('llvm-project-hostrpc-fprintf-decl.patch',
-              'llvm-project-rocm-%(version)s'),
-             ('aomp-gcc8-only-for-cuda.patch',
-              'aomp-rocm-%(version)s'),
-             ('aomp-openmp-buildpath.patch',
-              'aomp-rocm-%(version)s'),
-             ('aomp-openmp-llvm.patch',
-              'aomp-rocm-%(version)s'),
-             ('aomp-flang-decouple-out-dir-and-rocm-install.patch',
-              'aomp-rocm-%(version)s'),
-             ('aomp-flang-libomp-path.patch',
-              'aomp-rocm-%(version)s'),
-             ('aomp-flang-alarm-signature.patch',
-              'flang-rocm-%(version)s'),
-             ('aomp-extras-compiler-in-rocm-dir.patch',
-              'aomp-extras-rocm-%(version)s'),
-         ],
-         'checksums': [
-             '8bab3d621343f419b29043ac0cb56e062f114991dc3ec1e33e786f771deecc8f',
-             'd236a2064363c0278f7ba1bb2ff1545ee4c52278c50640e8bb2b9cfef8a2f128',
-             'c41958560ec29c8bf91332b9f668793463904a2081c330c0d828bf2f91d4f04e',
-             'd7847b5c6e1344dc0b4723dbe76a859257b4c242644dedb34e425f07738530d4',
-             '2e3151a47d77166d071213af2a1691487691aae0abd5c1718d818a6d7d09cb2d',
-
-             'c846bac17580e939492b843bee092c2e1b2b414a683bdb6be2973ae044642424',
-             '705a7103c3aeff514e5645c130786172961c54673dfdd772caece3b5e7536088',
-             'f7ed1704ffb095bbe8512b1c567a111936685d35f64123c786194e4239277251',
-             '6efb9538e016e1e6e2fb6ce52408bb6317c213ebdd46a60925447d0b43f42ee6',
-             'e82a4f065cc259095bf96778b913b97fe39d7c207e4e25ccf59d8fa264014262',
-             'ff3c3e56bfc11c0c9a6ab5c5392168da06aed3b4a21cdfcf7a149d12a69e2906',
-             '7c796d44952da8f089dc3ee013970dba7be43c60eb90131f86ce7d15c67b4b9b',
-             'f8f57cdcc4ddf535323f4f84a4a4a4fa830fbad72b19c7ea45d74fa5579ee72f',
-         ],
-         'configure_cmd': ("ln -fs %(builddir)s/llvm-project-rocm-%(version)s %(builddir)s/llvm-project;"
-                           "ln -fs %(builddir)s/flang-rocm-%(version)s %(builddir)s/flang;"
-                           "ln -fs %(builddir)s/aomp-extras-rocm-%(version)s %(builddir)s/aomp-extras;"
-                           " echo "),  # echo --prefix=...
-         'build_cmd': ("export OMPEXTRA_DIR=\"%(builddir)s/openmp-extras\";"
-                       "export OUT_DIR=\"$OMPEXTRA_DIR\";"
-                       "export AOMP=\"$OUT_DIR/llvm\";"
-                       "export AOMP_STANDALONE_BUILD=0;"
-                       "export AOMP_REPOS=\"%(builddir)s\";"
-                       "export ROCM_DIR=\"%(installdir)s\";"
-                       "export DEVICELIBS_ROOT=\"%(builddir)s/ROCm-Device-Libs-rocm-%(version)s\";"
-                       "export LLVM_PROJECT_ROOT=\"%(builddir)s/llvm-project\";"
-                       "cd \"%(builddir)s/aomp-rocm-%(version)s/bin\";"
-                       "./build_extras.sh && "
-                       "./build_extras.sh install && "
-                       "./build_openmp.sh && "
-                       "./build_openmp.sh install && "
-                       "./build_pgmath.sh && "
-                       "./build_pgmath.sh install && "
-                       "./build_flang.sh && "
-                       "./build_flang.sh install && "
-                       "./build_flang_runtime.sh && "
-                       "./build_flang_runtime.sh install && echo "),  # echo -j 64 ...
-         # echo install ?
-         'install_cmd': "cp -r %(builddir)s/openmp-extras/* %(installdir)s/; echo "
-     }),
-    ('rocPRIM', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums': [
-             'b5a08d2e76388bd1ffa6c946009928fe95de846ab6b65a6475998070c0cf6dc1',
-         ],
-         'srcdir':        '%(name)s-rocm-%(version)s/',
-         'preconfigopts': "export ROCM_PATH=%(installdir)s; ",
-         'configopts':    (" -Damd_comgr_DIR=%(installdir)s/lib/cmake/amd_comgr "
-                           " -DCMAKE_CXX_COMPILER=%(installdir)s/hip/bin/hipcc "
-                           " -DBUILD_TEST=OFF "
-                           " -DBUILD_BENCHMARK=OFF ") +\
-                          " -DAMDGPU_TARGETS=%s " % local_amdgpu_targets,
-         'prebuildopts': "export ROCM_PATH=%(installdir)s; "
-     }),
-    ('rocFFT', version,
-     {
-         'source_urls': ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-         'sources':     [{
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'patches': [
-             ('https://github.com/ROCmSoftwarePlatform/rocFFT/commit/31589ce749a7dc27158e98dcbfbb33ab0a288fa5.patch',
-              '%(name)s-rocm-%(version)s')],
-         'checksums': [
-             'b4fcd03c1b07d465bb307ec33cc7fb50036dff688e497c5e52b2dec37f4cb618',
-             '9a8a7eae7d529eab197e3df0c6553d952633ef38ab805857140a7f98e856b030',
-         ],
-         'srcdir':        '%(name)s-rocm-%(version)s',
-         'preconfigopts': "export ROCM_PATH=%(installdir)s; ",
-         'configopts':    " -DCMAKE_CXX_COMPILER=%(installdir)s/hip/bin/hipcc " +\
-                          " -DAMDGPU_TARGETS=%s " % local_amdgpu_targets,
-         'prebuildopts':  "export ROCM_PATH=%(installdir)s; "
-     }),
-    ('rocRAND', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }, {
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/hipRAND/archive'],
-             'download_filename': '20ac3db9d7462c15a3e96a6f0507cd5f2ee089c4.tar.gz',
-             'filename':          'hiprand-%(version)s.tar.gz',
-         }],
-         'checksums': [
-             '4a19e1bcb60955a02a73ad64594c23886d6749afe06b0104e2b877dbe02c8d1c',
-             'ee38a68c9e88056b7ecd41553e496e455dbb3fe08871ff3545430d6733070e6b',
-         ],
-         'srcdir':        '%(name)s-rocm-%(version)s',
-         'preconfigopts': ("export ROCM_PATH=%(installdir)s; "
-                           "rm -rf %(builddir)s/%(name)s-rocm-%(version)s/hipRAND; "
-                           "ln -sf %(builddir)s/hipRAND-20ac3db9d7462c15a3e96a6f0507cd5f2ee089c4 "
-                           " %(builddir)s/%(name)s-rocm-%(version)s/hipRAND && "),
-         'configopts':    " -DCMAKE_CXX_COMPILER=%(installdir)s/hip/bin/hipcc " +\
-                          " -DAMDGPU_TARGETS=%s " % local_amdgpu_targets +\
-                          " -DBUILD_TEST=OFF ",
-         'prebuildopts':  "export ROCM_PATH=%(installdir)s; ",
-         'installopts':   "install && " + "\n".join([
-             "install -d %(installdir)s/include",
-             "ln -s %(installdir)s/hiprand/include %(installdir)s/include/hiprand",
-             "ln -s %(installdir)s/rocrand/include %(installdir)s/include/rocrand",
-         ]) + "\n echo "
-     }),
-    ('rocBLAS', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums': [
-             '915374431db8f0cecdc2bf318a0ad33c3a8eceedc461d7a06b92ccb02b07313c',
-         ],
-         'srcdir':        '%(name)s-rocm-%(version)s',
-         'preconfigopts': "export ROCM_PATH=%(installdir)s; ",
-         'configopts':    " -DAMDGPU_TARGETS=%s " % local_amdgpu_targets +\
-                          (" -DCMAKE_PREFIX_PATH=%(installdir)s/llvm/lib/cmake/llvm "
-                           " -DCMAKE_CXX_COMPILER=%(installdir)s/hip/bin/hipcc "
-                           " -Damd_comgr_DIR=%(installdir)s/lib/cmake/amd_comgr "
-                           " -DBUILD_WITH_TENSILE=ON "
-                           " -DBUILD_WITH_TENSILE_HOST=ON "
-                           " -DTensile_LIBRARY_FORMAT=yaml "
-                           " -DTensile_COMPILER=hipcc "
-                           " -DTensile_LOGIC=asm_full "
-                           " -DTensile_CODE_OBJECT_VERSION=V3 "
-                           " -DBUILD_CLIENTS_TESTS=OFF "
-                           " -DBUILD_CLIENTS_BENCHMARKS=OFF "
-                           " -DBUILD_CLIENTS_SAMPLES=OFF "
-                           " -DBUILD_TESTING=OFF "),
-         'prebuildopts':   "export ROCM_PATH=%(installdir)s; ",
-     }),
-    ('MIOpen', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }, {
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/half/archive'],
-             'download_filename': '1.12.0.tar.gz',
-             'filename':          'half-1.12.0.tar.gz',
-         }],
-         'patches': [
-             ('https://github.com/ROCmSoftwarePlatform/MIOpen/pull/1490.patch',
-              '%(name)s-rocm-%(version)s'),
-             ('https://github.com/ROCmSoftwarePlatform/MIOpen/pull/1469.patch',
-              '%(name)s-rocm-%(version)s'),
-             # This might actually be some missing flag in hipamd, but disable for now
-             ('MIOpen-disable-pch-until-5.3.patch',
-              '%(name)s-rocm-%(version)s'),
-         ],
-         'checksums': [
-             '510461f5c5bdbcf8dc889099d1e5960b9f84bd845a9fc9154588a9898c701c1d',
-             '0a08660b68abb176ebc2a0cdf8de46e3182a7f46c66443bb80dbfaaec98cf969',
-
-             '1d909db4a12832b4024ba3fdd709f6f1dc0e76078dae37c395ceb5edccd1b073',
-             '31202f23f001a27abf274d08dcfa50aee6c77f7efe8a74c800b9773ce2d7916a',
-             '2241a0ff476336947c9eccbe144169a23c7da0734737b40372d499d980bf924f',
-         ],
-         'preconfigopts': (
-             # This is just completely broken. I think the only dependency missing as of 5.1.3 is "half",
-             # which is a single header, so download and copy it
-             # " sed -i 's|^sqlite|#\\0|' "
-             # " %(builddir)s/%(name)s-rocm-%(version)s/{,min-}requirements.txt; "
-             # " sed -i 's|^boost|#\\0|' "
-             # " %(builddir)s/%(name)s-rocm-%(version)s/{,min-}requirements.txt; "
-             # " sed -i 's|^ROCmSoftwarePlatform/llvm-project-mlir|#\\0|' "
-             # " %(builddir)s/%(name)s-rocm-%(version)s/{,min-}requirements.txt; "
-             # " cmake -P %(builddir)s/%(name)s-rocm-%(version)s/install_deps.cmake "
-             # "--minimum --prefix \"%(builddir)s/%(name)s-rocm-%(version)s/deps\"; "
-             " install -d %(builddir)s/%(name)s-rocm-%(version)s/deps/half/include; "
-             " cp %(builddir)s/half-1.12.0/include/half.hpp %(builddir)s/%(name)s-rocm-%(version)s/deps/half/include/; "
-             " export ROCM_PATH=%(installdir)s; "
-             " export MIOPEN_DEBUG_COMGR_HIP_PCH_ENFORCE=0; "
-         ),
-         'srcdir':     '%(name)s-rocm-%(version)s/',
-         'configopts': " -DAMDGPU_TARGETS=%s " % local_amdgpu_targets +\
-                       (" -DCMAKE_CXX_COMPILER=%(installdir)s/llvm/bin/clang++ "
-                        " -DCMAKE_C_COMPILER=%(installdir)s/llvm/bin/clang "
-                        " -DHALF_INCLUDE_DIR=%(builddir)s/%(name)s-rocm-%(version)s/deps/half/include "
-                        " -DMIOPEN_BACKEND=HIP "),
-         'prebuildopts': "export ROCM_PATH=%(installdir)s; ",
-     }),
-    ('AMDMIGraphX', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }, {
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/half/archive'],
-             'download_filename': '1.12.0.tar.gz',
-             'filename':          'half-1.12.0.tar.gz',
-         }],
-         'checksums': [
-             '686e068774500a46b6e6488370bbf5bd0bba6d19ecdb00636f951704d19c9ef2',
-             '0a08660b68abb176ebc2a0cdf8de46e3182a7f46c66443bb80dbfaaec98cf969',
-         ],
-         'preconfigopts': (
-             " install -d %(builddir)s/%(name)s-rocm-%(version)s/deps/half/include; "
-             " cp %(builddir)s/half-1.12.0/include/half.hpp %(builddir)s/%(name)s-rocm-%(version)s/deps/half/include/; "
-             " export ROCM_PATH=%(installdir)s; "
-         ),
-         'srcdir':     '%(name)s-rocm-%(version)s/',
-         'configopts': " -DAMDGPU_TARGETS=%s " % local_amdgpu_targets +\
-                       (" -DHALF_INCLUDE_DIR=%(builddir)s/%(name)s-rocm-%(version)s/deps/half/include "
-                        " -DCMAKE_SHARED_LINKER_FLAGS=\"$LDFLAGS "
-                        "$EBROOTIMKL/mkl/$EBVERSIONIMKL/lib/intel64/libmkl_avx2.so.1\" "),  # explicitly link mkl
-         'prebuildopts': "export ROCM_PATH=%(installdir)s; ",
-     }),
-    # ('MIVisionX', version,
-    #  {
-    #      'sources' : [{
-    #         'source_urls'       : ['https://github.com/GPUOpen-ProfessionalCompute-Libraries/%(name)s/archive'],
-    #         'download_filename' : 'rocm-%(version)s.tar.gz',
-    #         'filename'          : '%(namelower)s-%(version)s.tar.gz',
-    #      }],
-    #      'checksums'  : [
-    #          '62591d5caedc13832c3ccef629a88d9c2a43c884daad1124ddcb9c5f7d5470e9',
-    #      ],
-    #      'preconfigopts' : (
-    #          " install -d %(builddir)s/%(name)s-rocm-%(version)s/deps/half/include; "
-    #          " cp %(builddir)s/half-1.12.0/include/half.hpp "
-    #          " %(builddir)s/%(name)s-rocm-%(version)s/deps/half/include/; "
-    #          " export ROCM_PATH=%(installdir)s; "
-    #      ),
-    #      'srcdir'        : '%(name)s-rocm-%(version)s/',
-    #      'install_target_subdir' : 'mivisionx',
-    #      'configopts'    : " -DAMDGPU_TARGETS=%s " % local_amdgpu_targets +\
-    #                        (
-    #                            " -DHALF_INCLUDE_DIR=%(builddir)s/%(name)s-rocm-%(version)s/deps/half/include "
-    #                            " -DBACKEND=HIP "
-    #                            " -DCMAKE_CXX_FLAGS=\"$CXXFLAGS -isystem $EBROOTFFMPEG/include/ffmpeg4.4\" "
-    #                            # Not sure why explicit ffmpeg include dir is necessary
-    #                        ),
-    #      'prebuildopts'  : "export ROCM_PATH=%(installdir)s; ",
-    #  }),
-    ('rocSOLVER', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'patches': [
-             ('https://github.com/acxz/rocSOLVER/commit/0f4658e04ac7b48fea213f29b209a0206b67c43f.patch',
-              '%(name)s-rocm-%(version)s')],
-         'checksums': [
-             '5a8f3b95ac9a131c31538196e954ea53b863009c092cce0c0ef869a0cd5dd554',
-             '1f2ad0256013dcc3f3d6a494b864326d2ac0e79b528102cd5b235f55f8069c61',
-         ],
-         'srcdir':        '%(name)s-rocm-%(version)s',
-         'preconfigopts': "export ROCM_PATH=%(installdir)s; ",
-         'configopts':    " -DCMAKE_CXX_COMPILER=%(installdir)s/hip/bin/hipcc " +\
-                          " -DAMDGPU_TARGETS=%s " % local_amdgpu_targets,
-         'prebuildopts':  "export ROCM_PATH=%(installdir)s; ",
-     }),
-    ('rocSPARSE', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums': [
-             'ef9641045b36c9aacc87e4fe7717b41b1e29d97e21432678dce7aca633a8edc2',
-         ],
-         'srcdir':        '%(name)s-rocm-%(version)s',
-         'preconfigopts': "export ROCM_PATH=%(installdir)s; ",
-         'configopts':    " -DAMDGPU_TARGETS=%s " % local_amdgpu_targets +\
-                          (" -Drocprim_DIR=\"%(installdir)s/rocprim/rocprim/lib/cmake/rocprim\" "
-                           " -DCMAKE_CXX_COMPILER=%(installdir)s/hip/bin/hipcc "
-                           " -DBUILD_CLIENT_SAMPLES=OFF "),
-         'prebuildopts':  "export ROCM_PATH=%(installdir)s; ",
-     }),
-    ('rocThrust', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums': [
-             '8d92de1e69815d92a423b7657f2f37c90f1d427f5bc92915c202d4c266254dad',
-         ],
-         'srcdir':        '%(name)s-rocm-%(version)s',
-         'preconfigopts': "export ROCM_PATH=%(installdir)s; ",
-         'configopts':    " -DAMDGPU_TARGETS=%s " % local_amdgpu_targets +\
-                          (" -Damd_comgr_DIR=\"%(installdir)s/lib/cmake/amd_comgr\" "
-                           " -DCMAKE_CXX_COMPILER=%(installdir)s/hip/bin/hipcc "
-                           " -DBUILD_TEST=OFF "),
-         'prebuildopts':  "export ROCM_PATH=%(installdir)s; ",
-     }),
-    ('rocALUTION', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'patches':        [('rocALUTION-complex.patch', '%(name)s-rocm-%(version)s')],
-         'checksums':      [
-             '7febe8179f120cbe58ea255bc233ad5d1b4c106f3934eb8e670135a8b7bd09c7',
-             '870c69bca23a3cff3741a54e8222fefb329f9ab62fd9d0f47a3f14bfabda76b8',
-         ],
-         'srcdir':         '%(name)s-rocm-%(version)s',
-         'preconfigopts':  "export ROCM_PATH=%(installdir)s; ",
-         'configopts':     " -DAMDGPU_TARGETS=%s " % local_amdgpu_targets +\
-                           " -DROCM_PATH=\"%(installdir)s\" ",
-         'prebuildopts':   "export ROCM_PATH=%(installdir)s; ",
-         'preinstallopts': "export ROCM_PATH=%(installdir)s; ",
-     }),
-    ('hipCUB', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums': [
-             'dc75640689b6a5e15dd3acea643266bdf114ea63efc60be8272f484cf8f04494',
-         ],
-         'srcdir':        '%(name)s-rocm-%(version)s',
-         'preconfigopts': "export ROCM_PATH=%(installdir)s; ",
-         'configopts':    " -DAMDGPU_TARGETS=%s " % local_amdgpu_targets +\
-                          (" -DROCM_PATH=\"%(installdir)s\" "
-                           " -DCMAKE_CXX_COMPILER=%(installdir)s/hip/bin/hipcc "
-                           " -Damd_comgr_DIR=\"%(installdir)s/lib/cmake/amd_comgr\" "),
-         'prebuildopts':   "export ROCM_PATH=%(installdir)s; ",
-         'preinstallopts': "export ROCM_PATH=%(installdir)s; ",
-     }),
-    ('hipBLAS', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums': [
-             'f0fdaa851971b41b48ec2e7d640746fbd6f9f433da2020c5fd95c91a7473d9e1',
-         ],
-         'srcdir':        '%(name)s-rocm-%(version)s',
-         'preconfigopts': "export ROCM_PATH=%(installdir)s; ",
-         'configopts':    " -DAMDGPU_TARGETS=%s " % local_amdgpu_targets +\
-                          (" -DROCM_PATH=\"%(installdir)s\" "
-                           " -DCMAKE_CXX_COMPILER=%(installdir)s/hip/bin/hipcc "
-                           " -Damd_comgr_DIR=\"%(installdir)s/lib/cmake/amd_comgr\" "
-                           " -DBUILD_CLIENTS_TESTS=OFF "
-                           " -DBUILD_CLIENTS_SAMPLES=OFF "),
-         'prebuildopts':   "export ROCM_PATH=%(installdir)s; ",
-         'preinstallopts': "export ROCM_PATH=%(installdir)s; ",
-     }),
-    ('hipFFT', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums': [
-             'c26fa64499293b25d0686bed04feb61378c878a4bb4a6d559e6cb7be1f6bf2ec',
-         ],
-         'srcdir':        '%(name)s-rocm-%(version)s',
-         'preconfigopts': "export ROCM_PATH=%(installdir)s; ",
-         'configopts':    " -DAMDGPU_TARGETS=%s " % local_amdgpu_targets +\
-                          (" -DROCM_PATH=\"%(installdir)s\" "
-                           " -DCMAKE_CXX_COMPILER=%(installdir)s/hip/bin/hipcc "
-                           " -Damd_comgr_DIR=\"%(installdir)s/lib/cmake/amd_comgr\" "
-                           " -DCMAKE_MODULE_PATH=\"%(installdir)s/hip/cmake\" "
-                           " -DBUILD_CLIENTS_TESTS=OFF "
-                           " -DBUILD_CLIENTS_SAMPLES=OFF "),
-         'prebuildopts':   "export ROCM_PATH=%(installdir)s; ",
-         'preinstallopts': "export ROCM_PATH=%(installdir)s; ",
-     }),
-    ('hipfort', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums': [
-             '8f8849d8d0972366bafa41be35cf6a7a59480ed584d1ddff39768cb14247e9d4',
-         ],
-         'install_target_subdir': 'hipfort',
-         'srcdir':        '%(name)s-rocm-%(version)s',
-         'preconfigopts': "export ROCM_PATH=%(installdir)s; ",
-         'configopts':    " -DAMDGPU_TARGETS=%s " % local_amdgpu_targets +\
-                          " -DROCM_PATH=\"%(installdir)s\" ",
-         'prebuildopts':   "export ROCM_PATH=%(installdir)s; ",
-         'preinstallopts': "export ROCM_PATH=%(installdir)s; ",
-     }),
-    ('hipSOLVER', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums': [
-             '96faa799a2db8078b72f9c3b5c199179875a7c20dc1064371b22a6a63397c145',
-         ],
-         'srcdir':        '%(name)s-rocm-%(version)s',
-         'preconfigopts': "export ROCM_PATH=%(installdir)s; ",
-         'configopts':    " -DAMDGPU_TARGETS=%s " % local_amdgpu_targets +\
-                          (" -DROCM_PATH=\"%(installdir)s\" "
-                           " -DCMAKE_CXX_COMPILER=%(installdir)s/hip/bin/hipcc "),
-         'prebuildopts':   "export ROCM_PATH=%(installdir)s; ",
-         'preinstallopts': "export ROCM_PATH=%(installdir)s; ",
-     }),
-    ('hipSPARSE', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums': [
-             '6e6a0752654f0d391533df8cedf4b630a78ad34c99087741520c582963ce1602',
-         ],
-         'srcdir':        '%(name)s-rocm-%(version)s',
-         'preconfigopts': "export ROCM_PATH=%(installdir)s; ",
-         'configopts':    " -DAMDGPU_TARGETS=%s " % local_amdgpu_targets +\
-                          (" -DROCM_PATH=\"%(installdir)s\" "
-                           " -DCMAKE_CXX_COMPILER=%(installdir)s/hip/bin/hipcc "
-                           " -DCMAKE_CXX_STANDARD=20 "
-                           " -Damd_comgr_DIR=\"%(installdir)s/lib/cmake/amd_comgr\" "
-                           " -DAMDDeviceLibs_DIR=\"%(installdir)s/lib/cmake/AMDDeviceLibs\" "
-                           " -Dhip_DIR=\"%(installdir)s/hip/lib/cmake/hip\" "
-                           " -Drocsparse_DIR=\"%(installdir)s/rocsparse/lib/cmake/rocsparse\" "
-                           " -DBUILD_CLIENTS_TESTS=OFF "
-                           " -DBUILD_CLIENTS_SAMPLES=OFF "),
-         'prebuildopts':   "export ROCM_PATH=%(installdir)s; ",
-         'preinstallopts': "export ROCM_PATH=%(installdir)s; ",
-     }),
-    # ('ROCmValidationSuite', version,
-    #  {
-    #      'sources' : [{
-    #         'source_urls'       : ['https://github.com/ROCm-Developer-Tools/%(name)s/archive'],
-    #         'download_filename' : 'rocm-%(version)s.tar.gz',
-    #         'filename'          : '%(namelower)s-%(version)s.tar.gz',
-    #      }],
-    #      # This just adds detection of Arch Linux, so probably not important?
-    #      'patches'       : [
-    #          ('https://github.com/acxz/ROCmValidationSuite/commit/eb1a4bf5de8d8ba25f21ee13d6af1c46416e3961.patch',
-    #           '%(name)s-rocm-%(version)s')],
-    #      'checksums'     : [
-    #         '0140a4128c31749c078d9e1dc863cbbd690efc65843c34a4b80f0056e5b8c7b6',
-    #      ],
-    #      'srcdir'        : '%(name)s-rocm-%(version)s',
-    #      'preconfigopts' : ("export ROCM_PATH=%(installdir)s; "
-    #                        ),
-    #      'configopts'    : " -DAMDGPU_TARGETS=%s " % local_amdgpu_targets +\
-    #                         (" -DROCM_PATH=\"%(installdir)s\" "
-    #                         ),
-    #      'prebuildopts'  : "export ROCM_PATH=%(installdir)s; ",
-    #      'preinstallopts': "export ROCM_PATH=%(installdir)s; ",
-    #  }),
-]
-
-modextrapaths = {
-    'PATH': [
-        # TODO: more binaries
-        'mivisionx/bin',
-        'rvs/bin',
-    ],
-    'LD_LIBRARY_PATH': [
-        'hip/lib',
-        'hipblas/lib',
-        'hipfft/lib',
-        'hipfort/lib',
-        'hipsolver/lib',
-        'hipsparse/lib',
-        'hsa/lib',
-        'llvm/lib',
-        'miopen/lib',
-        'oam/lib',
-        'rccl/lib',
-        'rocblas/lib',
-        'rocfft/lib',
-        'rocm_smi/lib',
-        'rocprim/lib',
-        'rocsolver/lib',
-        'rocsparse/lib',
-    ],
-    'LIBRARY_PATH': [
-        'hip/lib',
-        'hipblas/lib',
-        'hipfft/lib',
-        'hipfort/lib',
-        'hipsolver/lib',
-        'hipsparse/lib',
-        'hsa/lib',
-        'llvm/lib',
-        'miopen/lib',
-        'oam/lib',
-        'rccl/lib',
-        'rocblas/lib',
-        'rocfft/lib',
-        'rocm_smi/lib',
-        'rocprim/lib',
-        'rocsolver/lib',
-        'rocsparse/lib',
-    ],
-}
-
-moduleclass = 'devel'
diff --git a/Overlays/jureca_mi200_overlay/r/ROCm/ROCm-5.2.0-GCCcore-11.2.0.eb b/Overlays/jureca_mi200_overlay/r/ROCm/ROCm-5.2.0-GCCcore-11.2.0.eb
deleted file mode 100644
index 14cc1d054..000000000
--- a/Overlays/jureca_mi200_overlay/r/ROCm/ROCm-5.2.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,1098 +0,0 @@
-# Bundle containing ROCm framework and libraries
-#
-# The Arch Linux AUR recipes are the reference: https://github.com/rocm-arch/rocm-arch
-#
-# TODO: hipify-clang needs CUDA (headers?), right now CUDA is excluded in the mi200 partition. Maybe hidden CUDA or
-#       allow installation or make a custom package?
-# TODO: missing: hipify-clang (see above)
-#                miopen-opencl (I think it's either miopen-hip or miopen-opencl but not both)
-#                mivisionx (started writing component, but it needs Qt5,OpenCV,FFmpeg and would pull in
-#                           CUDA which is disallowed)
-#                rocm-validation-suite (started writing component, but need to install pciutils-devel rpm)
-#                gpufort (github.com/RocmSoftwarePlatform/openacc-fortran-interfaces.git is required but
-#                         is private, ask AMD for access? )
-#                        NOTE: This might actually be outdated, but gpufort seems like just a python script?
-#
-# TODO: missing pkgs that just provide some version numbers:
-#       rocm-core
-#       rocm-hip-libraries
-#       rocm-hip-runtime
-#       rocm-hip-sdk
-#       rocm-language-runtime
-#       rocm-opencl-sdk
-# TODO: sanity-check existence of all the libraries
-# TODO: some modextrapaths, modextravars might need to be set?
-# TODO: Some components are a bit hacked together, writing an easyblock might be better (hipamd, openmp-extras, ...)
-# TODO: check if any package is unusable when not compiled on a system with a GPU (code auto-detects GPU).
-#       There are some tricks wrt rocm_agent_enumerator (ROCM_TARGET_LST env. var. or target.lst in the same dir)
-#
-# Other notes:
-#  - MIOpen __hipGetPCH missing might be due to some flag in hipamd, for now the patch disables PCH until v5.3
-#  - AMDMIGraphX is made to link explicitly against mkl through configopts - this should be handled by cmake
-#    either in Blaze or AMDMIGraphX. maybe a patch?
-
-easyblock = 'Bundle'
-name = 'ROCm'
-version = '5.2.0'
-
-homepage = 'https://github.com/RadeonOpenCompute/ROCm'
-description = """AMD ROCm - Open Source Platform for HPC and Ultrascale GPU Computing."""
-
-site_contacts = 's.nassyr@fz-juelich.de'
-
-# toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-# rocALUTION asks for mpi (I think it can build without it though)
-# OpenMPI needs ROCm at compile time to support it, so this might be problematic ("ROCm-Bare" package containing only
-# what OpenMPI needs?)
-toolchain = {'name': 'gompi', 'version': '2021b'}
-
-
-builddependencies = [
-    ("binutils", "2.37"),
-    ("CMake",    "3.23.1"),
-    ("Ninja",    "1.10.2"),
-    ("makeinfo", "6.8"),           # ROCgdb complains about it missing
-    # roctracer breaks without this (also the newer robotpy-cppheaderparser doesn't seem to work)
-    ("CppHeaderParser", "2.7.4"),
-]
-
-dependencies = [
-    ("libdrm", "2.4.110"),  # ROCT complains about libdrm not being found
-    ("OpenGL", "2021b"),    # hip needs mesa
-    ("Python", "3.9.6"),    # rocFFT asks for python headers
-    ("guile",  "2.0.14"),   # ROCgdb wants guile-2.0
-    ("MPFR",   "4.1.0"),    # also ROCgdb
-    ("source-highlight",  "3.1.9"),      # also ROCgdb
-    ("babeltrace",        "1.5.8"),      # also ROCgdb
-    ("fmt",               "8.1.1"),      # rocSOLVER uses fmt for something
-    ("protobuf",          "3.17.3"),     # AMDMIGraphX and some others
-    ("nlohmann-json",     "3.10.4"),     # AMDMIGraphX
-    ("msgpack-c",         "4.0.0"),      # AMDMIGraphX
-    ("msgpack-cpp",       "4.1.1"),      # AMDMIGraphX
-    ("pybind11",          "2.7.1"),      # AMDMIGraphX
-    ("Blaze",             "3.8.1",
-     '', ('gomkl', '2021b')),            # AMDMIGraphX
-    # AMDMIGraphX, probably getting it from Blaze, but better to put explicit
-    ("imkl",              "2021.4.0"),
-    # dependency
-    # ("FFmpeg",            "4.4.1"),                              # MIVisionX
-    # ("OpenCV",            "4.5.4", '', ('gcccoremkl','2021b')),  # MIVisionX
-    # ("Qt5",               "5.15.2"),                             # MIVisionX
-    ("OpenCL-Headers",    "2022.05.18"),  # OpenCL runtime and miopengemm
-    ("OpenCL-ICD-Loader", "2022.05.18"),  # OpenCL runtime and miopengemm
-]
-
-default_easyblock = 'CMakeNinja'
-github_account = "RadeonOpenCompute"
-
-local_gpus = ["gfx90a:xnack-", "gfx90a:xnack+"]
-local_amdgpu_targets = ";".join(local_gpus)
-local_hip_targets = " ".join(local_gpus)
-
-components = [
-    ('ROCT-Thunk-Interface', version,
-     {
-         'source_urls': [GITHUB_SOURCE],
-         'sources':     [{
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums':  ['3797cb0eafbec3fd3d4a2b53f789eb8cdbab30729f13dbcca0a10bc1bafd2187'],
-         'srcdir':     '%(name)s-rocm-%(version)s'
-     }),
-    ('rocm-cmake', version,
-     {
-         'source_urls': [GITHUB_SOURCE],
-         'sources':     [{
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums': ['be8646c4f7babfe9a103c97d0e9f369322f8ac6cfa528edacdbdcf7f3ef44943'],
-         'srcdir':    '%(name)s-rocm-%(version)s'
-     }),
-    ('llvm-project', version,
-     {
-         'source_urls': [GITHUB_SOURCE],
-         'sources':     [{
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          'rocm-llvm-%(version)s.tar.gz',
-         }],
-         'checksums': ['0f892174111b78a02d1a00f8f46d9f80b9abb95513a7af38ecf2a5a0882fe87f'],
-         'srcdir':    '%(name)s-rocm-%(version)s/llvm',
-         'install_target_subdir': 'llvm',
-         'configopts': (" -DLLVM_HOST_TRIPLE=x86_64-linux-gnu "
-                        " -DLLVM_BUILD_UTILS=ON "
-                        " -DLLVM_ENABLE_BINDINGS=OFF "
-                        " -DOCAMLFIND=NO "
-                        " -DLLVM_ENABLE_OCAMLDOC=OFF "
-                        " -DLLVM_INCLUDE_BENCHMARKS=OFF "
-                        " -DLLVM_BUILD_TESTS=OFF "
-                        " -DLLVM_ENABLE_PROJECTS='llvm;clang;compiler-rt;lld' "
-                        " -DLLVM_TARGETS_TO_BUILD='AMDGPU;X86' "
-                        " -DLLVM_BINUTILS_INCDIR=$EBROOTBINUTILS/include ")
-     }),
-    ('ROCm-Device-Libs', version,
-     {
-         'source_urls': [GITHUB_SOURCE],
-         'sources':     [{
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums':  ['901674bc941115c72f82c5def61d42f2bebee687aefd30a460905996f838e16c'],
-         'srcdir':     '%(name)s-rocm-%(version)s',
-         'configopts': " -DLLVM_DIR=%(installdir)s/llvm/lib/cmake/llvm "
-     }),
-    ('ROCm-CompilerSupport', version,
-     {
-         'source_urls': [GITHUB_SOURCE],
-         'sources':     [{
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums':  ['5f63fa93739ee9230756ef93c53019474b6cdddea3b588492d785dae1b08c087'],
-         'srcdir':     '%(name)s-rocm-%(version)s/lib/comgr',
-         'configopts': " -DCMAKE_PREFIX_PATH=\"%(installdir)s/llvm;%(installdir)s\" "
-     }),
-    ('hsa-amd-aqlprofile', version,
-     {
-         'easyblock':   "Binary",
-         'source_urls': ['http://repo.radeon.com/rocm/apt/%(version_major_minor)s/pool/main/h/hsa-amd-aqlprofile/'],
-         'sources':     [{
-             'download_filename': 'hsa-amd-aqlprofile_1.0.0.50200-65_amd64.deb',
-             'filename':          '%(name)s-%(version)s.deb',
-             'extract_cmd':       'ar x %s'
-         }],
-         'checksums':   ['4730b61c61d7caf349a3fe82f93acca708e2da760762213111e0b3100f0bc3f4'],
-         'install_cmd': """
-             mkdir -p %(builddir)s/%(name)s
-             tar -C "%(builddir)s/%(name)s" -xf data.tar.gz;
-             cp -r %(builddir)s/%(name)s/opt/rocm-%(version)s/%(name)s/ %(installdir)s/hsa
-             cp -r %(builddir)s/%(name)s/opt/rocm-%(version)s/lib/ %(installdir)s/lib
-             cp -r %(builddir)s/%(name)s/opt/rocm-%(version)s/share/ %(installdir)s/share
-             ln -sf %(installdir)s/hsa/lib/lib%(name)s64.so %(installdir)s/lib/lib%(name)s64.so
-         """
-     }),
-    ('ROCR-Runtime', version,
-     {
-         'source_urls': [GITHUB_SOURCE],
-         'sources':     [{
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums':  ['529e49693dd9f6459586dd0a26f14dd77dbdf8c0b45fb54830b294eba7babd27'],
-         'srcdir':     '%(name)s-rocm-%(version)s/src',
-         'configopts': (" -DCMAKE_PREFIX_PATH=\"%(installdir)s/llvm;%(installdir)s\" "
-                        " -DCMAKE_CXX_FLAGS='-DNDEBUG' ")
-     }),
-    ('rocminfo', version,
-     {
-         'source_urls': [GITHUB_SOURCE],
-         'sources':     [{
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'patches': [
-             ('https://patch-diff.githubusercontent.com/raw/RadeonOpenCompute/rocminfo/pull/53.patch',
-              '%(name)s-rocm-%(version)s')],
-         'checksums': [
-             'e721eb81efd384abd22ff01cdcbb6245b11084dc11a867c74c8ad6b028aa0404',
-             '95d6f679a7ad45ee663222c85dd5e7d456c9cf5da3cd43455c3c2fe2ee36f0a0',
-         ],
-         'srcdir':     '%(name)s-rocm-%(version)s',
-         'configopts': (" -DCMAKE_PREFIX_PATH=\"%(installdir)s/llvm;%(installdir)s\" "
-                        " -DROCRTST_BLD_TYPE=Release "
-                        " -DCMAKE_INSTALL_LIBDIR=lib ")
-     }),
-    ('hipamd', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCm-Developer-Tools/HIP/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          'hip-%(version)s.tar.gz',
-         }, {
-             'source_urls':       ['https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          'rocm-opencl-%(version)s.tar.gz',
-         }, {
-             'source_urls':       ['https://github.com/ROCm-Developer-Tools/ROCclr/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          'rocclr-%(version)s.tar.gz',
-         }, {
-             'source_urls':       ['https://github.com/ROCm-Developer-Tools/hipamd/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          'hipamd-%(version)s.tar.gz',
-         }],
-         'patches': [
-             ('hipamd-5.1.3-git-hash.patch', 'hipamd-rocm-%(version)s')
-         ],
-         'checksums': [
-             'a6e0515d4d25865c037b546035df9c51f0882cd2700e759c266ff7e199f37c3a',
-             '80f73387effdcd987a150978775a87049a976aa74f5770d4420847b004dd59f0',
-             '37f5fce04348183bce2ece8bac1117f6ef7e710ca68371ff82ab08e93368bafb',
-             '8774958bebc29a4b7eb9dc2d38808d79d9a24bf9c1f44e801ff99d2d5ba82240',
-             'bf5429dfb95e11844c14fe4d2aced3a023ff4bcc7dd5ded78d81ce3df1f08249',
-         ],
-         'srcdir':                'hipamd-rocm-%(version)s/',
-         'install_target_subdir': 'hip',
-         'configopts': (" -DCMAKE_PREFIX_PATH=\"%(installdir)s/llvm;%(installdir)s\" "
-                        " -DHIP_COMMON_DIR=%(builddir)s/HIP-rocm-%(version)s/ "
-                        " -DAMD_OPENCL_PATH=%(builddir)s/ROCm-OpenCL-Runtime-rocm-%(version)s/ "
-                        " -DROCCLR_PATH=%(builddir)s/ROCclr-rocm-%(version)s/ "
-                        " -DROCCLR_INCLUDE_PATH=%(builddir)s/ROCclr-rocm-%(version)s "
-                        " -DHIP_PLATFORM=amd "
-                        " -DCMAKE_INSTALL_LIBDIR=lib "),
-         'installopts': "install && " + "\n".join([
-             "sed -i '/__noinline__/d' %(installdir)s/hip/include/hip/amd_detail/host_defines.h",
-             "install -d %(installdir)s/bin",
-             "install -d %(installdir)s/include",
-             "install -d %(installdir)s/lib/cmake",
-             ("for binary in hipcc hipconfig hipcc.pl hipconfig.pl; "
-              "  do ln -s %(installdir)s/hip/bin/$binary %(installdir)s/bin/$binary; "
-              "done"),
-             "ln -s %(installdir)s/hip/lib/libamdhip64.so %(installdir)s/lib/libamdhip64.so",
-             "ln -s %(installdir)s/hip/include/hip %(installdir)s/include/hip",
-             "ln -s %(installdir)s/hip/lib/cmake/hip %(installdir)s/lib/cmake/hip",
-             "ln -s %(installdir)s/hip/lib/cmake/hip-lang %(installdir)s/lib/cmake/hip-lang",
-         ]) + "\n echo "
-     }),
-    ('llvm-project-mlir', version,
-     {
-         'source_urls': ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-         'sources':     [{
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         # fix stray ";" in linker flags
-         'patches':   [
-             ('llvm-project-mlir-fix-rpath-flags.patch',
-              '%(name)s-rocm-%(version)s')
-         ],
-         'checksums': [
-             '546121f203e7787d3501fbaf6673bdbeefbb39e0446b02c480454338362a1f01',
-             '53c05fab666019860a60e8a32fdc99046177a1f0dd76a4a5ec9fc3dab7b5bba5',
-         ],
-         'srcdir':         '%(name)s-rocm-%(version)s',
-         'preconfigopts':  'export ROCM_PATH=%(installdir)s; export HIP_PATH=%(installdir)s/hip;  ',
-         'prebuildopts':   'export ROCM_PATH=%(installdir)s; export HIP_PATH=%(installdir)s/hip;  ',
-         'preinstallopts': 'export ROCM_PATH=%(installdir)s; export HIP_PATH=%(installdir)s/hip;  ',
-         'configopts': (
-             " -DMLIR_MIOPEN_SQLITE_ENABLED=On "
-             " -DBUILD_FAT_LIBMLIRMIOPEN=1 "
-             " -DROCM_PATH=%(installdir)s "
-             " -DLLVM_TARGETS_TO_BUILD='AMDGPU;X86' ")
-     }),
-    ('rocm_smi_lib', version,
-     {
-         'source_urls': [GITHUB_SOURCE],
-         'sources':     [{
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'patches': [
-             ('https://patch-diff.githubusercontent.com/raw/RadeonOpenCompute/rocm_smi_lib/pull/107.patch',
-              '%(name)s-rocm-%(version)s')],
-         'checksums': [
-             '7bce567ff4e087598eace2cae72d24c98b2bcc93af917eafa61ec9d1e8ef4477',
-             'f1d66af131833a55bcfcac63e9af7194cc38cb1bb583fb74427e4f0f89719910',
-         ],
-         'srcdir':     '%(name)s-rocm-%(version)s',
-         'configopts': (" -DCMAKE_SHARED_LINKER_FLAGS=\"-fuse-ld=bfd\" "
-                        " -DCMAKE_MODULE_LINKER_FLAGS=\"-fuse-ld=bfd\" "
-                        " -DCMAKE_EXE_LINKER_FLAGS=\"-fuse-ld=bfd\" ")
-     }),
-    ('atmi', version,
-     {
-         'easyblock': 'CMakeMake',  # Uses cmake in a crappy way breaking ninja
-         'sources':   [{
-             'source_urls':       [GITHUB_SOURCE],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums': [
-             '33e77905a607734157d46c736c924c7c50b6b13f2b2ddbf711cb08e37f2efa4f',
-         ],
-         'srcdir':                '%(name)s-rocm-%(version)s/src',
-         'install_target_subdir': 'atmi',
-         'preconfigopts': "export ROCM_PATH=%(installdir)s; ",
-         'configopts':    " -DROCM_VERSION=\"%(version)s\" " +\
-                          " -DAMDGPU_TARGETS=\"%s\" " % local_amdgpu_targets,
-         'prebuildopts':  "export ROCM_PATH=%(installdir)s; "
-     }),
-    ('ROCdbgapi', version,
-     {
-         'source_urls': ['https://github.com/ROCm-Developer-Tools/%(name)s/archive'],
-         'sources':     [{
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'patches': [
-             ('https://patch-diff.githubusercontent.com/raw/ROCm-Developer-Tools/ROCdbgapi/pull/4.patch',
-              '%(name)s-rocm-%(version)s')],
-         'checksums': [
-             '44f0528a7583bc59b6585166d2289970b20115c4c70e3bcc218aff19fc242b3f',
-             '91b29cafec79441e6c311d50ca5653ec8315c401b1cc0f93ce65bfdfdda2e04e',
-         ],
-         'srcdir': '%(name)s-rocm-%(version)s',
-     }),
-    ('rocr_debug_agent', version,
-     {
-         'source_urls': ['https://github.com/ROCm-Developer-Tools/%(name)s/archive'],
-         'sources':     [{
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums':     ['f8e8d5ad691033d0c0f1850d69f35c98ba9722ab4adc66c4251f22257f56f0a2'],
-         'srcdir':         '%(name)s-rocm-%(version)s',
-         'preconfigopts':  'export ROCM_PATH=%(installdir)s; export HIP_PATH=%(installdir)s/hip;  ',
-         'prebuildopts':   'export ROCM_PATH=%(installdir)s; export HIP_PATH=%(installdir)s/hip;  ',
-         'preinstallopts': 'export ROCM_PATH=%(installdir)s; export HIP_PATH=%(installdir)s/hip;  ',
-         'configopts':     " -DCMAKE_HIP_ARCHITECTURES=\"%s\" " % local_hip_targets +\
-                           (" -DCMAKE_PREFIX_PATH=\"%(installdir)s;%(installdir)s/hip\" "
-                            " -DCMAKE_MODULE_PATH=\"%(installdir)s/hip/cmake;%(installdir)s/hip/lib/cmake/hip\" ")
-     }),
-    ('ROCgdb', version,
-     {
-         'easyblock':   'ConfigureMake',
-         'source_urls': ['https://github.com/ROCm-Developer-Tools/%(name)s/archive'],
-         'sources':     [{
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums':      ['70c5b443292b9bb114844eb63b72cfab1b65f083511ee39d55db7a633c63bf5a'],
-         'preconfigopts':  'cd %(name)s-rocm-%(version)s && ',
-         'prebuildopts':   'cd %(name)s-rocm-%(version)s && ',
-         'preinstallopts': 'cd %(name)s-rocm-%(version)s && ',
-         'configopts': (
-             "  --program-prefix=roc "
-             "  --disable-shared "
-             "  --disable-nls "
-             "  --enable-source-highlight "
-             "  --enable-tui "
-             "  --enable-64-bit-bfd "
-             "  --enable-targets=\"x86_64-linux-gnu,amdgcn-amd-amdhsa\" "
-             "  --with-system-readline "
-             "  --with-python=$EBROOTPYTHON/bin/python3 "
-             "  --with-rocm-dbgapi=%(installdir)s "
-             "  --with-guile=guile-2.0 "
-             "  --with-expat "
-             "  --with-system-zlib "
-             "  --with-babeltrace "
-             "  --with-lzma "
-             "  --disable-gdbtk "
-             "  --disable-ld "
-             "  --disable-gas "
-             "  --disable-gdbserver "
-             "  --disable-sim "
-         )
-     }),
-    ('rocprofiler', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCm-Developer-Tools/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }, {
-             'source_urls':       ['https://github.com/ROCm-Developer-Tools/roctracer/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          'roctracer-%(version)s.tar.gz',
-         }],
-         'checksums': [
-             '1f4db27b56ef1863d4c9e1d96bac9117d66be45156d0637cfe4fd38cae61a23a',
-             '9747356ce61c57d22c2e0a6c90b66a055e435d235ba3459dc3e3f62aabae6a03',
-         ],
-         'srcdir':        '%(name)s-rocm-%(version)s',
-         'preconfigopts': 'export ROCM_PATH=%(installdir)s; export HIP_PATH=%(installdir)s/hip;  ',
-         'prebuildopts':  'export ROCM_PATH=%(installdir)s; export HIP_PATH=%(installdir)s/hip;  ',
-         'configopts':    " -DPROF_API_HEADER_PATH=%(builddir)s/roctracer-rocm-%(version)s/inc/ext",
-         'installopts':   "install && " + "\n".join([
-             "install -d %(installdir)s/bin",
-             "ln -s %(installdir)s/rocprofiler/bin/rocprof %(installdir)s/bin/rocprof",
-         ]) + "\n echo "
-     }),
-    ('roctracer', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCm-Developer-Tools/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'patches': [
-             ('roctracer-hsa_ostream_ops-include.patch',
-              '%(name)s-rocm-%(version)s'),
-         ],
-         'checksums': [
-             '9747356ce61c57d22c2e0a6c90b66a055e435d235ba3459dc3e3f62aabae6a03',
-             '1a614b3416a50ddcd6fcfa80730a9beb856ca3314b522aef353f0ad7baf593da',
-         ],
-         'preconfigopts': 'export ROCM_PATH=%(installdir)s; export HIP_PATH=%(installdir)s/hip; ',
-         'prebuildopts':  'export ROCM_PATH=%(installdir)s; export HIP_PATH=%(installdir)s/hip;  ',
-         'srcdir':        '%(name)s-rocm-%(version)s',
-     }),
-    ('rccl', version,
-     {
-         'source_urls': ['https://github.com/ROCmSoftwarePlatform/rccl/archive'],
-         'sources':     [{
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums':     ['6ee3a04da0d16eb53f768a088633a7d8ecc4416a2d0c07f7ba8426ab7892b060'],
-         'srcdir':        '%(name)s-rocm-%(version)s',
-         'preconfigopts': "export ROCM_PATH=%(installdir)s; ",
-         'configopts':    " -DCMAKE_CXX_COMPILER=%(installdir)s/hip/bin/hipcc " +\
-                          " -DAMDGPU_TARGETS=\"%s\" " % local_amdgpu_targets,
-         'prebuildopts':  "export ROCM_PATH=%(installdir)s; "
-     }),
-    ('ROCclr', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          'rocm-opencl-%(version)s.tar.gz',
-         }, {
-             'source_urls':       ['https://github.com/ROCm-Developer-Tools/ROCclr/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          'rocclr-%(version)s.tar.gz',
-         }],
-         'checksums': [
-             '80f73387effdcd987a150978775a87049a976aa74f5770d4420847b004dd59f0',
-             '37f5fce04348183bce2ece8bac1117f6ef7e710ca68371ff82ab08e93368bafb',
-         ],
-         'srcdir':      '%(name)s-rocm-%(version)s/',
-         'configopts':  (" -DAMD_OPENCL_PATH=%(builddir)s/ROCm-OpenCL-Runtime-rocm-%(version)s/ "),
-         'installopts': ' && echo ',  # install nothing, just build and use for OpenCL later
-     }),
-    ('ROCm-OpenCL-Runtime', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          'rocm-opencl-%(version)s.tar.gz',
-         }],
-         'checksums': [
-             '80f73387effdcd987a150978775a87049a976aa74f5770d4420847b004dd59f0',
-         ],
-         'srcdir':     '%(name)s-rocm-%(version)s/',
-         'configopts': (" -DCMAKE_PREFIX_PATH=\"%(builddir)s/ROCclr-rocm-%(version)s/;%(installdir)s\" "
-                        " -DROCCLR_PATH=%(builddir)s/ROCclr-rocm-%(version)s/ "
-                        " -DROCCLR_INCLUDE_PATH=%(builddir)s/ROCclr-rocm-%(version)s "
-                        " -DROCM_PATH=%(installdir)s"
-                        " -DAMD_OPENCL_PATH=%(builddir)s/ROCm-OpenCL-Runtime-rocm-%(version)s/ "),
-     }),
-    ('clang-ocl', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/RadeonOpenCompute/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums': [
-             'a2059f6aeccc119abbd444cb37128e00e4854e22a88a47f120f8f8b947d862c5',
-         ],
-         'srcdir':     '%(name)s-rocm-%(version)s/',
-         'configopts': (" -DCLANG_BIN=\"%(installdir)s/llvm/bin\" "
-                        " -DBITCODE_DIR=\"%(installdir)s/amdgcn/bitcode\" "),
-     }),
-    ('MIOpenGEMM', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'patches': [
-             ('https://patch-diff.githubusercontent.com/raw/ROCmSoftwarePlatform/MIOpenGEMM/pull/46.patch',
-              '%(name)s-rocm-%(version)s'),
-         ],
-         'checksums': [
-             '10458fb07b56a7fbe165595d588b7bf5f1300c57bda2f3133c3687c7bae39ea8',
-             '4d54249ca45623328721ec0648b7ba18697ad9f7ef0c0bd01c96b9ed5670fa33',
-         ],
-         'srcdir': '%(name)s-rocm-%(version)s/',
-     }),
-    ('openmp-extras', version,
-     # Very hacky, needs easyblock
-     {
-         'easyblock': 'ConfigureMake',
-         'sources':   [{
-             'source_urls':       ['https://github.com/ROCm-Developer-Tools/aomp/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          'aomp-%(version)s.tar.gz',
-         }, {
-             'source_urls':       ['https://github.com/RadeonOpenCompute/llvm-project/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          'rocm-llvm-%(version)s.tar.gz',
-         }, {
-             'source_urls':       ['https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          'rocm-device-libs-%(version)s.tar.gz',
-         }, {
-             'source_urls':       ['https://github.com/ROCm-Developer-Tools/flang/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          'flang-%(version)s.tar.gz',
-         }, {
-             'source_urls':       ['https://github.com/ROCm-Developer-Tools/aomp-extras/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          'aomp-extras-%(version)s.tar.gz',
-         }],
-         'patches': [
-             ('llvm-project-hostrpc-fprintf-decl.patch',
-              'llvm-project-rocm-%(version)s'),
-             ('aomp-openmp-buildpath.patch',
-              'aomp-rocm-%(version)s'),
-             ('aomp-5.2.0-openmp-rocm_dir.patch',
-              'aomp-rocm-%(version)s'),
-             ('aomp-flang-decouple-out-dir-and-rocm-install.patch',
-              'aomp-rocm-%(version)s'),
-             ('aomp-flang-libomp-path.patch',
-              'aomp-rocm-%(version)s'),
-             # ('aomp-flang-alarm-signature.patch',
-             #  'flang-rocm-%(version)s'),
-             ('aomp-extras-5.2.0-rocm-dir-llvm.patch',
-              'aomp-extras-rocm-%(version)s'),
-             ('aomp-5.2.0-extras-version-string.patch',
-              'aomp-rocm-%(version)s'),
-         ],
-         'checksums': [
-             '20e21312816272222d1f427ea72a99a9a67077078552f5e2638a40860d161d25',
-             '0f892174111b78a02d1a00f8f46d9f80b9abb95513a7af38ecf2a5a0882fe87f',
-             '901674bc941115c72f82c5def61d42f2bebee687aefd30a460905996f838e16c',
-             '20f48cac9b58496230fa2428eba4e15ec0a6e92d429569b154a328b7a8c5da17',
-             '817c2e8975e56a8875ff56f9d1ea34d5e7e50f1b541b7f1236e3e5c8d9eee47f',
-
-             'c846bac17580e939492b843bee092c2e1b2b414a683bdb6be2973ae044642424',
-             'f7ed1704ffb095bbe8512b1c567a111936685d35f64123c786194e4239277251',
-             '0d91c5408192dcceacde986c3419592efc67ad40d359d127604ee9bfbdba477a',
-             'e82a4f065cc259095bf96778b913b97fe39d7c207e4e25ccf59d8fa264014262',
-             'ff3c3e56bfc11c0c9a6ab5c5392168da06aed3b4a21cdfcf7a149d12a69e2906',
-             # '7c796d44952da8f089dc3ee013970dba7be43c60eb90131f86ce7d15c67b4b9b',
-             'bae31efe2dd3f6813e9198c210ba3390028ed89e0d47e86366bef741c70c4db7',
-             '7c5372078c74facbd7cae451c3a717bf281344dcd5c4103e1c837d980e79ccc9',
-         ],
-         'configure_cmd': ("ln -fs %(builddir)s/llvm-project-rocm-%(version)s %(builddir)s/llvm-project;"
-                           "ln -fs %(builddir)s/flang-rocm-%(version)s %(builddir)s/flang;"
-                           "ln -fs %(builddir)s/aomp-extras-rocm-%(version)s %(builddir)s/aomp-extras;"
-                           " echo "),  # echo --prefix=...
-         'build_cmd': ("export OMPEXTRA_DIR=\"%(builddir)s/openmp-extras\";"
-                       "export OUT_DIR=\"$OMPEXTRA_DIR\";"
-                       "export AOMP=\"$OUT_DIR/llvm\";"
-                       "export AOMP_STANDALONE_BUILD=0;"
-                       "export AOMP_REPOS=\"%(builddir)s\";"
-                       "export ROCM_DIR=\"%(installdir)s\";"
-                       "export DEVICELIBS_ROOT=\"%(builddir)s/ROCm-Device-Libs-rocm-%(version)s\";"
-                       "export LLVM_PROJECT_ROOT=\"%(builddir)s/llvm-project\";"
-                       "cd \"%(builddir)s/aomp-rocm-%(version)s/bin\";"
-                       "./build_extras.sh && "
-                       "./build_extras.sh install && "
-                       "./build_openmp.sh && "
-                       "./build_openmp.sh install && "
-                       "./build_pgmath.sh && "
-                       "./build_pgmath.sh install && "
-                       "./build_flang.sh && "
-                       "./build_flang.sh install && "
-                       "./build_flang_runtime.sh && "
-                       "./build_flang_runtime.sh install && echo "),  # echo -j 64 ...
-         # echo install ?
-         'install_cmd': "cp -r %(builddir)s/openmp-extras/* %(installdir)s/; echo "
-     }),
-    ('rocPRIM', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums': [
-             'f99eb7d2f6b1445742fba631a0dc8bb0d464a767a9c4fb79ac865d9570fe747b',
-         ],
-         'srcdir':        '%(name)s-rocm-%(version)s/',
-         'preconfigopts': "export ROCM_PATH=%(installdir)s; ",
-         'configopts':    (" -Damd_comgr_DIR=%(installdir)s/lib/cmake/amd_comgr "
-                           " -DCMAKE_CXX_COMPILER=%(installdir)s/hip/bin/hipcc "
-                           " -DBUILD_TEST=OFF "
-                           " -DBUILD_BENCHMARK=OFF ") +\
-                          " -DAMDGPU_TARGETS=\"%s\" " % local_amdgpu_targets,
-         'prebuildopts': "export ROCM_PATH=%(installdir)s; "
-     }),
-    ('rocFFT', version,
-     {
-         'source_urls': ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-         'sources':     [{
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'patches': [],
-         'checksums': [
-             'ebba280b7879fb4bc529a68072b98d4e815201f90d24144d672094bc241743d4',
-         ],
-         'srcdir':        '%(name)s-rocm-%(version)s',
-         'preconfigopts': "export ROCM_PATH=%(installdir)s; ",
-         'configopts':    " -DCMAKE_CXX_COMPILER=%(installdir)s/hip/bin/hipcc " +\
-                          " -DAMDGPU_TARGETS=\"%s\" " % local_amdgpu_targets,
-         'prebuildopts':  "export ROCM_PATH=%(installdir)s; "
-     }),
-    ('rocRAND', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }, {
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/hipRAND/archive'],
-             'download_filename': '12e2f070337945318295c330bf69c6c060928b9e.tar.gz',
-             'filename':          'hiprand-%(version)s.tar.gz',
-         }],
-         'checksums': [
-             'ab3057e7c17a9fbe584f89ef98ec92a74d638a98d333e7d0f64daf7bc9051e38',
-             '6a891b7a420ee629776b2eca792b0f0cf92a35e99f7046515ecc9fd2359eadd3',
-         ],
-         'srcdir':        '%(name)s-rocm-%(version)s',
-         'preconfigopts': ("export ROCM_PATH=%(installdir)s; "
-                           "rm -rf %(builddir)s/%(name)s-rocm-%(version)s/hipRAND; "
-                           "ln -sf %(builddir)s/hipRAND-12e2f070337945318295c330bf69c6c060928b9e "
-                           " %(builddir)s/%(name)s-rocm-%(version)s/hipRAND && "),
-         'configopts':    " -DCMAKE_CXX_COMPILER=%(installdir)s/hip/bin/hipcc " +\
-                          " -DAMDGPU_TARGETS=\"%s\" " % local_amdgpu_targets +\
-                          " -DBUILD_TEST=OFF ",
-         'prebuildopts':  "export ROCM_PATH=%(installdir)s; ",
-         'installopts':   "install && " + "\n".join([
-             "install -d %(installdir)s/include",
-             "ln -s %(installdir)s/hiprand/include %(installdir)s/include/hiprand",
-             "ln -s %(installdir)s/rocrand/include %(installdir)s/include/rocrand",
-         ]) + "\n echo "
-     }),
-    ('rocBLAS', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'patches': [
-             ('rocBLAS-5.2.0-find-python-if-undefined.patch',
-              '%(name)s-rocm-%(version)s'),
-             ('rocblas-5.2.0-internal-rocblas-include-fix.patch',
-              '%(name)s-rocm-%(version)s')
-         ],
-         'checksums': [
-             'b178b7db5f0af55b21b5f744b8825f5e002daec69b4688e50df2bca2fac155bd',
-             'c01d9235e055a00859bf3571e5afe33e296959296ff895d89a36cd1627d15d71',
-             '97a068c162f5f3117150cb81ebe9d0f96cc96f5b2be2de6594afb25d6cceae3b',
-         ],
-         'srcdir':        '%(name)s-rocm-%(version)s',
-         'preconfigopts': "export ROCM_PATH=%(installdir)s; ",
-         'configopts':    " -DAMDGPU_TARGETS=\"%s\" " % local_amdgpu_targets +\
-                          (" -DCMAKE_PREFIX_PATH=%(installdir)s/llvm/lib/cmake/llvm "
-                           " -DCMAKE_CXX_COMPILER=%(installdir)s/hip/bin/hipcc "
-                           " -Damd_comgr_DIR=%(installdir)s/lib/cmake/amd_comgr "
-                           " -DBUILD_WITH_TENSILE=ON "
-                           " -DBUILD_WITH_TENSILE_HOST=ON "
-                           " -DTensile_LIBRARY_FORMAT=yaml "
-                           " -DTensile_COMPILER=hipcc "
-                           " -DTensile_LOGIC=asm_full "
-                           " -DTensile_CODE_OBJECT_VERSION=V3 "
-                           " -DBUILD_CLIENTS_TESTS=OFF "
-                           " -DBUILD_CLIENTS_BENCHMARKS=OFF "
-                           " -DBUILD_CLIENTS_SAMPLES=OFF "
-                           " -DBUILD_TESTING=OFF "),
-         'prebuildopts':   "export ROCM_PATH=%(installdir)s; ",
-     }),
-    ('rocWMMA', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'patches': [],
-         'checksums': [
-             '257ccd1cf2bc1d8064e72e78d276ef7446b2cb7e2dec05ff8331bb44eff2b7cb',
-         ],
-         'srcdir':        '%(name)s-rocm-%(version)s',
-         'preconfigopts': "export ROCM_PATH=%(installdir)s; ",
-         'configopts':    (" -DROCWMMA_BUILD_TESTS=OFF "
-                           " -DROCWMMA_BUILD_SAMPLES=OFF "
-                           " -DCMAKE_CXX_COMPILER=%(installdir)s/hip/bin/hipcc ") +\
-                          " -DAMDGPU_TARGETS=\"%s\" " % local_amdgpu_targets,
-         'prebuildopts':  "export ROCM_PATH=%(installdir)s; ",
-     }),
-    ('MIOpen', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }, {
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/half/archive'],
-             'download_filename': '1.12.0.tar.gz',
-             'filename':          'half-1.12.0.tar.gz',
-         }],
-         'patches': [
-             # This might actually be some missing flag in hipamd, but disable for now
-             ('MIOpen-disable-pch-until-5.3.patch',
-              '%(name)s-rocm-%(version)s'),
-             ('miopen-5.2.0-rocblas-include-fix.patch',
-              '%(name)s-rocm-%(version)s'),
-         ],
-         'checksums': [
-             '5fda69426e81df9f8fb6658e579176b9c4fcce3516fc8488d3cfd2b6f6f2b3b4',
-             '0a08660b68abb176ebc2a0cdf8de46e3182a7f46c66443bb80dbfaaec98cf969',
-
-             '2241a0ff476336947c9eccbe144169a23c7da0734737b40372d499d980bf924f',
-             'f2c98f50cf9a7c1468f563987c7a86047dfadfc01e4004a1323a39d7b8d592ab',
-         ],
-         'preconfigopts': (
-             # This is just completely broken. I think the only dependency missing as of 5.1.3 is "half",
-             # which is a single header, so download and copy it
-             # " sed -i 's|^sqlite|#\\0|' "
-             # " %(builddir)s/%(name)s-rocm-%(version)s/{,min-}requirements.txt; "
-             # " sed -i 's|^boost|#\\0|' "
-             # " %(builddir)s/%(name)s-rocm-%(version)s/{,min-}requirements.txt; "
-             # " sed -i 's|^ROCmSoftwarePlatform/llvm-project-mlir|#\\0|' "
-             # " %(builddir)s/%(name)s-rocm-%(version)s/{,min-}requirements.txt; "
-             # " cmake -P %(builddir)s/%(name)s-rocm-%(version)s/install_deps.cmake "
-             # "--minimum --prefix \"%(builddir)s/%(name)s-rocm-%(version)s/deps\"; "
-             " install -d %(builddir)s/%(name)s-rocm-%(version)s/deps/half/include; "
-             " cp %(builddir)s/half-1.12.0/include/half.hpp %(builddir)s/%(name)s-rocm-%(version)s/deps/half/include/; "
-             " export ROCM_PATH=%(installdir)s; "
-             " export MIOPEN_DEBUG_COMGR_HIP_PCH_ENFORCE=0; "
-         ),
-         'srcdir':     '%(name)s-rocm-%(version)s/',
-         'configopts': " -DAMDGPU_TARGETS=\"%s\" " % local_amdgpu_targets +\
-                       (" -DCMAKE_CXX_COMPILER=%(installdir)s/llvm/bin/clang++ "
-                        " -DCMAKE_C_COMPILER=%(installdir)s/llvm/bin/clang "
-                        " -DHALF_INCLUDE_DIR=%(builddir)s/%(name)s-rocm-%(version)s/deps/half/include "
-                        " -DMIOPEN_BACKEND=HIP "),
-         'prebuildopts': "export ROCM_PATH=%(installdir)s; ",
-     }),
-    ('AMDMIGraphX', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }, {
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/half/archive'],
-             'download_filename': '1.12.0.tar.gz',
-             'filename':          'half-1.12.0.tar.gz',
-         }],
-         'checksums': [
-             '33afcdf52c6e0e3a2f939fcf30e87f712b8e8ef3633a3dc03a19fea359704925',
-             '0a08660b68abb176ebc2a0cdf8de46e3182a7f46c66443bb80dbfaaec98cf969',
-         ],
-         'preconfigopts': (
-             " install -d %(builddir)s/%(name)s-rocm-%(version)s/deps/half/include; "
-             " cp %(builddir)s/half-1.12.0/include/half.hpp %(builddir)s/%(name)s-rocm-%(version)s/deps/half/include/; "
-             " export ROCM_PATH=%(installdir)s; "
-         ),
-         'srcdir':     '%(name)s-rocm-%(version)s/',
-         'configopts': " -DAMDGPU_TARGETS=\"%s\" " % local_amdgpu_targets +\
-                       (" -DHALF_INCLUDE_DIR=%(builddir)s/%(name)s-rocm-%(version)s/deps/half/include "
-                        " -DCMAKE_SHARED_LINKER_FLAGS=\"$LDFLAGS "
-                        "$EBROOTIMKL/mkl/$EBVERSIONIMKL/lib/intel64/libmkl_avx2.so.1\" "),  # explicitly link mkl
-         'prebuildopts': "export ROCM_PATH=%(installdir)s; ",
-     }),
-    # ('MIVisionX', version,
-    #  {
-    #      'sources' : [{
-    #         'source_urls'       : ['https://github.com/GPUOpen-ProfessionalCompute-Libraries/%(name)s/archive'],
-    #         'download_filename' : 'rocm-%(version)s.tar.gz',
-    #         'filename'          : '%(namelower)s-%(version)s.tar.gz',
-    #      }],
-    #      'checksums'  : [
-    #          '62591d5caedc13832c3ccef629a88d9c2a43c884daad1124ddcb9c5f7d5470e9',
-    #      ],
-    #      'preconfigopts' : (
-    #          " install -d %(builddir)s/%(name)s-rocm-%(version)s/deps/half/include; "
-    #          " cp %(builddir)s/half-1.12.0/include/half.hpp "
-    #          " %(builddir)s/%(name)s-rocm-%(version)s/deps/half/include/; "
-    #          " export ROCM_PATH=%(installdir)s; "
-    #      ),
-    #      'srcdir'        : '%(name)s-rocm-%(version)s/',
-    #      'install_target_subdir' : 'mivisionx',
-    #      'configopts'    : " -DAMDGPU_TARGETS=\"%s\" " % local_amdgpu_targets +\
-    #                        (
-    #                            " -DHALF_INCLUDE_DIR=%(builddir)s/%(name)s-rocm-%(version)s/deps/half/include "
-    #                            " -DBACKEND=HIP "
-    #                            " -DCMAKE_CXX_FLAGS=\"$CXXFLAGS -isystem $EBROOTFFMPEG/include/ffmpeg4.4\" "
-    #                            # Not sure why explicit ffmpeg include dir is necessary
-    #                        ),
-    #      'prebuildopts'  : "export ROCM_PATH=%(installdir)s; ",
-    #  }),
-    ('rocSOLVER', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'patches': [],
-         'checksums': [
-             '94d46ebe1266eaa05df50c1789dc27d3f2dbf3cb5af156e757777a82ed6ef356',
-         ],
-         'srcdir':        '%(name)s-rocm-%(version)s',
-         'preconfigopts': "export ROCM_PATH=%(installdir)s; ",
-         'configopts':    " -DCMAKE_CXX_COMPILER=%(installdir)s/hip/bin/hipcc " +\
-                          " -DAMDGPU_TARGETS=\"%s\" " % local_amdgpu_targets,
-         'prebuildopts':  "export ROCM_PATH=%(installdir)s; ",
-     }),
-    ('rocSPARSE', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums': [
-             '7ed929af16d2502135024a6463997d9a95f03899b8a33aa95db7029575c89572',
-         ],
-         'srcdir':        '%(name)s-rocm-%(version)s',
-         'preconfigopts': "export ROCM_PATH=%(installdir)s; ",
-         'configopts':    " -DAMDGPU_TARGETS=\"%s\" " % local_amdgpu_targets +\
-                          (" -Drocprim_DIR=\"%(installdir)s/rocprim/rocprim/lib/cmake/rocprim\" "
-                           " -DCMAKE_CXX_COMPILER=%(installdir)s/hip/bin/hipcc "
-                           " -DBUILD_CLIENTS_SAMPLES=OFF "),
-         'prebuildopts':  "export ROCM_PATH=%(installdir)s; ",
-     }),
-    ('rocThrust', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums': [
-             'afa126218485586682c78e97df8025ae4efd32f3751c340e84c436e08868c326',
-         ],
-         'srcdir':        '%(name)s-rocm-%(version)s',
-         'preconfigopts': "export ROCM_PATH=%(installdir)s; ",
-         'configopts':    " -DAMDGPU_TARGETS=\"%s\" " % local_amdgpu_targets +\
-                          (" -Damd_comgr_DIR=\"%(installdir)s/lib/cmake/amd_comgr\" "
-                           " -DCMAKE_CXX_COMPILER=%(installdir)s/hip/bin/hipcc "
-                           " -DBUILD_TEST=OFF "),
-         'prebuildopts':  "export ROCM_PATH=%(installdir)s; ",
-     }),
-    ('rocALUTION', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'patches':        [
-             ('rocALUTION-5.2.0-rocblas-include-fix.patch',
-              '%(name)s-rocm-%(version)s'),
-             ('rocALUTION-5.2.0-fix-complex-device-operators.patch',
-              '%(name)s-rocm-%(version)s'),
-         ],
-         'checksums':      [
-             'a5aac471bbec87d019ad7c6db779c73327ad40ecdea09dc5ab2106e62cd6b7eb',
-             '030a7bfe49aeb20b0f72f7e4a1aed9ac2e1d9a901355ebfb58042409f3eebae9',
-             'ae7fb5eeba68f7e8af2b81a1b1587c33efeee7d67d3b91cbad8886130e107720',
-         ],
-         'srcdir':         '%(name)s-rocm-%(version)s',
-         'preconfigopts':  "export ROCM_PATH=%(installdir)s; ",
-         'configopts':     " -DAMDGPU_TARGETS=\"%s\" " % local_amdgpu_targets +\
-                           " -DROCM_PATH=\"%(installdir)s\" ",
-         'prebuildopts':   "export ROCM_PATH=%(installdir)s; ",
-         'preinstallopts': "export ROCM_PATH=%(installdir)s; ",
-     }),
-    ('hipCUB', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums': [
-             'ac4dc2310f0eb657e1337c93d8cc4a5d8396f9544a7336eeceb455678a1f9139',
-         ],
-         'srcdir':        '%(name)s-rocm-%(version)s',
-         'preconfigopts': "export ROCM_PATH=%(installdir)s; ",
-         'configopts':    " -DAMDGPU_TARGETS=\"%s\" " % local_amdgpu_targets +\
-                          (" -DROCM_PATH=\"%(installdir)s\" "
-                           " -DCMAKE_CXX_COMPILER=%(installdir)s/hip/bin/hipcc "
-                           " -Damd_comgr_DIR=\"%(installdir)s/lib/cmake/amd_comgr\" "),
-         'prebuildopts':   "export ROCM_PATH=%(installdir)s; ",
-         'preinstallopts': "export ROCM_PATH=%(installdir)s; ",
-     }),
-    ('hipBLAS', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'patches': [
-             ('hipBLAS-5.2.0-rocblas-include-fix.patch',
-              '%(name)s-rocm-%(version)s'),
-         ],
-         'checksums': [
-             '5e9091dc4ef83896f5c3bc5ade1cb5db8e1a6afc451dbba4da19d8a7ec2b6f29',
-             'a499d593cf4186be9236895df470610e26791ea27cf498eb03900e884e1f23ca',
-         ],
-         'srcdir':        '%(name)s-rocm-%(version)s',
-         'preconfigopts': "export ROCM_PATH=%(installdir)s; ",
-         'configopts':    " -DAMDGPU_TARGETS=\"%s\" " % local_amdgpu_targets +\
-                          (" -DROCM_PATH=\"%(installdir)s\" "
-                           " -DCMAKE_CXX_COMPILER=%(installdir)s/hip/bin/hipcc "
-                           " -Damd_comgr_DIR=\"%(installdir)s/lib/cmake/amd_comgr\" "
-                           " -DBUILD_CLIENTS_TESTS=OFF "
-                           " -DBUILD_CLIENTS_SAMPLES=OFF "),
-         'prebuildopts':   "export ROCM_PATH=%(installdir)s; ",
-         'preinstallopts': "export ROCM_PATH=%(installdir)s; ",
-     }),
-    ('hipFFT', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums': [
-             'ec37edcd61837281c403802ccc1cb01ec3fa3ba135b5ab16617961b66d4cc3e2',
-         ],
-         'srcdir':        '%(name)s-rocm-%(version)s',
-         'preconfigopts': "export ROCM_PATH=%(installdir)s; ",
-         'configopts':    " -DAMDGPU_TARGETS=\"%s\" " % local_amdgpu_targets +\
-                          (" -DROCM_PATH=\"%(installdir)s\" "
-                           " -DCMAKE_CXX_COMPILER=%(installdir)s/hip/bin/hipcc "
-                           " -Damd_comgr_DIR=\"%(installdir)s/lib/cmake/amd_comgr\" "
-                           " -DCMAKE_MODULE_PATH=\"%(installdir)s/hip/cmake\" "
-                           " -DBUILD_CLIENTS_TESTS=OFF "
-                           " -DBUILD_CLIENTS_SAMPLES=OFF "),
-         'prebuildopts':   "export ROCM_PATH=%(installdir)s; ",
-         'preinstallopts': "export ROCM_PATH=%(installdir)s; ",
-     }),
-    ('hipfort', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums': [
-             'a0af1fe62757993600a41af6bb6c4b8c6cfdfba650389645ac1f995f7623785c',
-         ],
-         'install_target_subdir': 'hipfort',
-         'srcdir':        '%(name)s-rocm-%(version)s',
-         'preconfigopts': "export ROCM_PATH=%(installdir)s; ",
-         'configopts':    " -DAMDGPU_TARGETS=\"%s\" " % local_amdgpu_targets +\
-                          " -DROCM_PATH=\"%(installdir)s\" ",
-         'prebuildopts':   "export ROCM_PATH=%(installdir)s; ",
-         'preinstallopts': "export ROCM_PATH=%(installdir)s; ",
-     }),
-    ('hipSOLVER', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums': [
-             '96927410e0a2cc0f50172604ef6437e15d2cf4b62d22b2035f13aae21f43dc82',
-         ],
-         'srcdir':        '%(name)s-rocm-%(version)s',
-         'preconfigopts': "export ROCM_PATH=%(installdir)s; ",
-         'configopts':    " -DAMDGPU_TARGETS=\"%s\" " % local_amdgpu_targets +\
-                          (" -DROCM_PATH=\"%(installdir)s\" "
-                           " -DCMAKE_CXX_COMPILER=%(installdir)s/hip/bin/hipcc "),
-         'prebuildopts':   "export ROCM_PATH=%(installdir)s; ",
-         'preinstallopts': "export ROCM_PATH=%(installdir)s; ",
-     }),
-    ('hipSPARSE', version,
-     {
-         'sources': [{
-             'source_urls':       ['https://github.com/ROCmSoftwarePlatform/%(name)s/archive'],
-             'download_filename': 'rocm-%(version)s.tar.gz',
-             'filename':          '%(namelower)s-%(version)s.tar.gz',
-         }],
-         'checksums': [
-             '4fdab6ec953c6d2d000687c5979077deafd37208cd722554b5a6ede1e5ba170c',
-         ],
-         'srcdir':        '%(name)s-rocm-%(version)s',
-         'preconfigopts': "export ROCM_PATH=%(installdir)s; ",
-         'configopts':    " -DAMDGPU_TARGETS=\"%s\" " % local_amdgpu_targets +\
-                          (" -DROCM_PATH=\"%(installdir)s\" "
-                           " -DCMAKE_CXX_COMPILER=%(installdir)s/hip/bin/hipcc "
-                           " -DCMAKE_CXX_STANDARD=20 "
-                           " -Damd_comgr_DIR=\"%(installdir)s/lib/cmake/amd_comgr\" "
-                           " -DAMDDeviceLibs_DIR=\"%(installdir)s/lib/cmake/AMDDeviceLibs\" "
-                           " -Dhip_DIR=\"%(installdir)s/hip/lib/cmake/hip\" "
-                           " -Drocsparse_DIR=\"%(installdir)s/rocsparse/lib/cmake/rocsparse\" "
-                           " -DBUILD_CLIENTS_TESTS=OFF "
-                           " -DBUILD_CLIENTS_SAMPLES=OFF "),
-         'prebuildopts':   "export ROCM_PATH=%(installdir)s; ",
-         'preinstallopts': "export ROCM_PATH=%(installdir)s; ",
-     }),
-    # ('ROCmValidationSuite', version,
-    #  {
-    #      'sources' : [{
-    #         'source_urls'       : ['https://github.com/ROCm-Developer-Tools/%(name)s/archive'],
-    #         'download_filename' : 'rocm-%(version)s.tar.gz',
-    #         'filename'          : '%(namelower)s-%(version)s.tar.gz',
-    #      }],
-    #      # This just adds detection of Arch Linux, so probably not important?
-    #      'patches'       : [
-    #          ('https://github.com/acxz/ROCmValidationSuite/commit/eb1a4bf5de8d8ba25f21ee13d6af1c46416e3961.patch',
-    #           '%(name)s-rocm-%(version)s')],
-    #      'checksums'     : [
-    #         '0140a4128c31749c078d9e1dc863cbbd690efc65843c34a4b80f0056e5b8c7b6',
-    #      ],
-    #      'srcdir'        : '%(name)s-rocm-%(version)s',
-    #      'preconfigopts' : ("export ROCM_PATH=%(installdir)s; "
-    #                        ),
-    #      'configopts'    : " -DAMDGPU_TARGETS=\"%s\" " % local_amdgpu_targets +\
-    #                         (" -DROCM_PATH=\"%(installdir)s\" "
-    #                         ),
-    #      'prebuildopts'  : "export ROCM_PATH=%(installdir)s; ",
-    #      'preinstallopts': "export ROCM_PATH=%(installdir)s; ",
-    #  }),
-]
-
-modextrapaths = {
-    'PATH': [
-        # TODO: more binaries
-        'mivisionx/bin',
-        'rvs/bin',
-    ],
-    'LD_LIBRARY_PATH': [
-        'hip/lib',
-        'hipblas/lib',
-        'hipfft/lib',
-        'hipfort/lib',
-        'hipsolver/lib',
-        'hipsparse/lib',
-        'hsa/lib',
-        'llvm/lib',
-        'miopen/lib',
-        'oam/lib',
-        'rccl/lib',
-        'rocblas/lib',
-        'rocfft/lib',
-        'rocm_smi/lib',
-        'rocprim/lib',
-        'rocsolver/lib',
-        'rocsparse/lib',
-    ],
-    'LIBRARY_PATH': [
-        'hip/lib',
-        'hipblas/lib',
-        'hipfft/lib',
-        'hipfort/lib',
-        'hipsolver/lib',
-        'hipsparse/lib',
-        'hsa/lib',
-        'llvm/lib',
-        'miopen/lib',
-        'oam/lib',
-        'rccl/lib',
-        'rocblas/lib',
-        'rocfft/lib',
-        'rocm_smi/lib',
-        'rocprim/lib',
-        'rocsolver/lib',
-        'rocsparse/lib',
-    ],
-}
-
-moduleclass = 'devel'
diff --git a/Overlays/jureca_mi200_overlay/r/ROCm/aomp-5.2.0-extras-version-string.patch b/Overlays/jureca_mi200_overlay/r/ROCm/aomp-5.2.0-extras-version-string.patch
deleted file mode 100644
index 8d2b26be3..000000000
--- a/Overlays/jureca_mi200_overlay/r/ROCm/aomp-5.2.0-extras-version-string.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/bin/build_extras.sh b/bin/build_extras.sh
-index c8f35e3e..e98422c6 100755
---- a/bin/build_extras.sh
-+++ b/bin/build_extras.sh
-@@ -121,6 +121,7 @@ if [ "$1" != "nocmake" ] && [ "$1" != "install" ] ; then
-   -DCMAKE_BUILD_TYPE=Release \
-   -DROCM_DIR=$ROCM_DIR \
-   -DAOMP_STANDALONE_BUILD=0 \
-+  -DAOMP_VERSION_STRING=\"5.2.0\" \
-   -DDEVICELIBS_ROOT=$DEVICELIBS_ROOT \
-   -DNEW_BC_PATH=1 \
-   -DCMAKE_INSTALL_PREFIX=$INSTALL_EXTRAS \
diff --git a/Overlays/jureca_mi200_overlay/r/ROCm/aomp-5.2.0-openmp-rocm_dir.patch b/Overlays/jureca_mi200_overlay/r/ROCm/aomp-5.2.0-openmp-rocm_dir.patch
deleted file mode 100644
index e9aa2267f..000000000
--- a/Overlays/jureca_mi200_overlay/r/ROCm/aomp-5.2.0-openmp-rocm_dir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/bin/build_openmp.sh b/bin/build_openmp.sh
-index 99b58ea6..d456bd8c 100755
---- a/bin/build_openmp.sh
-+++ b/bin/build_openmp.sh
-@@ -91,14 +91,14 @@ COMMON_CMAKE_OPTS="-DDEVICELIBS_ROOT=$DEVICELIBS_ROOT
- -DROCM_DIR=$ROCM_DIR
- -DLIBOMPTARGET_ENABLE_DEBUG=ON
- -DCMAKE_INSTALL_PREFIX=$INSTALL_OPENMP
---DLLVM_INSTALL_PREFIX=$OUT_DIR/llvm
-+-DLLVM_INSTALL_PREFIX=$ROCM_DIR/llvm
- -DLLVM_MAIN_INCLUDE_DIR=$LLVM_PROJECT_ROOT/llvm/include
- -DLIBOMPTARGET_LLVM_INCLUDE_DIRS=$LLVM_PROJECT_ROOT/llvm/include
- -DCMAKE_PREFIX_PATH=$OUT_DIR/build/devicelibs;$ROCM_DIR;$ROCM_DIR/include/hsa
---DCMAKE_C_COMPILER=$OUT_DIR/llvm/bin/clang
---DCMAKE_CXX_COMPILER=$OUT_DIR/llvm/bin/clang++
---DOPENMP_TEST_C_COMPILER=$OUT_DIR/llvm/bin/clang
---DOPENMP_TEST_CXX_COMPILER=$OUT_DIR/llvm/bin/clang++"
-+-DCMAKE_C_COMPILER=$ROCM_DIR/llvm/bin/clang
-+-DCMAKE_CXX_COMPILER=$ROCM_DIR/llvm/bin/clang++
-+-DOPENMP_TEST_C_COMPILER=$ROCM_DIR/llvm/bin/clang
-+-DOPENMP_TEST_CXX_COMPILER=$ROCM_DIR/llvm/bin/clang++"
- 
- if [ "$AOMP_BUILD_CUDA" == 1 ] ; then
-    COMMON_CMAKE_OPTS="$COMMON_CMAKE_OPTS
diff --git a/Overlays/jureca_mi200_overlay/r/ROCm/aomp-extras-5.2.0-rocm-dir-llvm.patch b/Overlays/jureca_mi200_overlay/r/ROCm/aomp-extras-5.2.0-rocm-dir-llvm.patch
deleted file mode 100644
index 5acba29e8..000000000
--- a/Overlays/jureca_mi200_overlay/r/ROCm/aomp-extras-5.2.0-rocm-dir-llvm.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
-index 4f9208a..ca46a91 100644
---- a/utils/CMakeLists.txt
-+++ b/utils/CMakeLists.txt
-@@ -19,7 +19,7 @@ add_custom_target(aomputils ALL)
- 
- find_package(LLVM QUIET CONFIG
-   PATHS
--  $ENV{AOMP}
-+  $ENV{ROCM_DIR}/llvm
-   ${LLVM_DIR}
-   NO_DEFAULT_PATH
- )
diff --git a/Overlays/jureca_mi200_overlay/r/ROCm/aomp-extras-compiler-in-rocm-dir.patch b/Overlays/jureca_mi200_overlay/r/ROCm/aomp-extras-compiler-in-rocm-dir.patch
deleted file mode 100644
index d5a26d9a2..000000000
--- a/Overlays/jureca_mi200_overlay/r/ROCm/aomp-extras-compiler-in-rocm-dir.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- aomp-extras-rocm-4.5.0/aomp-device-libs/aompextras/CMakeLists.txt	2021-08-09 23:36:08.000000000 +0200
-+++ aomp-extras-rocm-4.5.0-patched/aomp-device-libs/aompextras/CMakeLists.txt	2021-11-19 19:56:06.737469951 +0100
-@@ -13,7 +13,7 @@
- #  Try to get LLVM_COMPILER from HIP, then AOMP , then default /usr/local/hip
- set(AOMP $ENV{AOMP})
- if(AOMP)
--  set(LLVM_COMPILER ${AOMP})
-+  set(LLVM_COMPILER ${ROCM_DIR}/llvm)
- else()
-   set(LLVM_COMPILER "$ENV{HOME}/rocm/aomp")
- endif()
---- aomp-extras-rocm-4.5.0/utils/CMakeLists.txt	2021-08-09 23:36:08.000000000 +0200
-+++ aomp-extras-rocm-4.5.0-patched/utils/CMakeLists.txt	2021-11-19 19:39:53.406512322 +0100
-@@ -19,7 +19,7 @@
- 
- find_package(LLVM QUIET CONFIG
-   PATHS
--  $ENV{AOMP}
-+  $ENV{ROCM_DIR}/llvm
-   ${LLVM_DIR}
-   NO_DEFAULT_PATH
- )
diff --git a/Overlays/jureca_mi200_overlay/r/ROCm/aomp-flang-alarm-signature.patch b/Overlays/jureca_mi200_overlay/r/ROCm/aomp-flang-alarm-signature.patch
deleted file mode 100644
index abb165597..000000000
--- a/Overlays/jureca_mi200_overlay/r/ROCm/aomp-flang-alarm-signature.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --color -urN flang-rocm-5.0.1-unpatched/runtime/flang/alarm3f.c flang-rocm-5.0.1/runtime/flang/alarm3f.c
---- flang-rocm-5.0.1-unpatched/runtime/flang/alarm3f.c  2022-03-01 13:57:36.463305752 +0100
-+++ flang-rocm-5.0.1/runtime/flang/alarm3f.c    2022-03-01 13:59:55.300264387 +0100
-@@ -16,7 +16,7 @@
- /*
- extern void (*signal(int, void (*)(int)))(int);
- */
--extern int alarm();
-+extern unsigned int alarm(unsigned int __seconds);
-
- int ENT3F(ALARM, alarm)(int *time, void (*proc)())
- {
diff --git a/Overlays/jureca_mi200_overlay/r/ROCm/aomp-flang-decouple-out-dir-and-rocm-install.patch b/Overlays/jureca_mi200_overlay/r/ROCm/aomp-flang-decouple-out-dir-and-rocm-install.patch
deleted file mode 100644
index ae47c7ea6..000000000
--- a/Overlays/jureca_mi200_overlay/r/ROCm/aomp-flang-decouple-out-dir-and-rocm-install.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --color -urN aomp-rocm-4.5.0-unpatched/bin/build_flang_runtime.sh aomp-rocm-4.5.0/bin/build_flang_runtime.sh
---- aomp-rocm-4.5.0-unpatched/bin/build_flang_runtime.sh	2021-11-16 16:50:07.010969269 +0100
-+++ aomp-rocm-4.5.0/bin/build_flang_runtime.sh	2021-11-16 16:57:38.658874349 +0100
-@@ -59,10 +59,10 @@
- MYCMAKEOPTS="-DCMAKE_BUILD_TYPE=$BUILD_TYPE \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_FLANG \
- -DLLVM_ENABLE_ASSERTIONS=ON \
---DLLVM_CONFIG=$OUT_DIR/llvm/bin/llvm-config \
---DCMAKE_CXX_COMPILER=$OUT_DIR/llvm/bin/clang++ \
---DCMAKE_C_COMPILER=$OUT_DIR/llvm/bin/clang \
---DCMAKE_Fortran_COMPILER=$OUT_DIR/llvm/bin/flang \
-+-DLLVM_CONFIG=$ROCM_DIR/llvm/bin/llvm-config \
-+-DCMAKE_CXX_COMPILER=$ROCM_DIR/llvm/bin/clang++ \
-+-DCMAKE_C_COMPILER=$ROCM_DIR/llvm/bin/clang \
-+-DCMAKE_Fortran_COMPILER=$ROCM_DIR/llvm/bin/flang \
- -DLLVM_TARGETS_TO_BUILD=$TARGETS_TO_BUILD \
- -DLLVM_INSTALL_RUNTIME=ON \
- -DFLANG_BUILD_RUNTIME=ON \
-diff --color -urN aomp-rocm-4.5.0-unpatched/bin/build_flang.sh aomp-rocm-4.5.0/bin/build_flang.sh
---- aomp-rocm-4.5.0-unpatched/bin/build_flang.sh	2021-11-16 16:50:07.010969269 +0100
-+++ aomp-rocm-4.5.0/bin/build_flang.sh	2021-11-16 16:55:45.538909397 +0100
-@@ -50,9 +50,9 @@
- MYCMAKEOPTS="-DCMAKE_BUILD_TYPE=$BUILD_TYPE \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_FLANG \
- -DLLVM_ENABLE_ASSERTIONS=ON \
---DLLVM_CONFIG=$OUT_DIR/llvm/bin/llvm-config \
---DCMAKE_CXX_COMPILER=$OUT_DIR/llvm/bin/clang++ \
---DCMAKE_C_COMPILER=$OUT_DIR/llvm/bin/clang \
-+-DLLVM_CONFIG=$ROCM_DIR/llvm/bin/llvm-config \
-+-DCMAKE_CXX_COMPILER=$ROCM_DIR/llvm/bin/clang++ \
-+-DCMAKE_C_COMPILER=$ROCM_DIR/llvm/bin/clang \
- -DCMAKE_Fortran_COMPILER=gfortran \
- -DLLVM_TARGETS_TO_BUILD=$TARGETS_TO_BUILD \
- -DCMAKE_C_FLAGS=-I$COMP_INC_DIR \
-diff --color -urN aomp-rocm-4.5.0-unpatched/bin/build_pgmath.sh aomp-rocm-4.5.0/bin/build_pgmath.sh
---- aomp-rocm-4.5.0-unpatched/bin/build_pgmath.sh	2021-11-16 18:52:19.761286900 +0100
-+++ aomp-rocm-4.5.0/bin/build_pgmath.sh	2021-11-16 18:53:21.787423127 +0100
-@@ -41,7 +41,7 @@
-    fi
- fi
- 
--COMP_INC_DIR=$(ls -d $OUT_DIR/llvm/lib/clang/*/include )
-+COMP_INC_DIR=$(ls -d $ROCM_DIR/llvm/lib/clang/*/include )
- 
- if [ "$AOMP_PROC" == "ppc64le" ] ; then
-     MYCMAKEOPTS="-DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX=$INSTALL_FLANG -DLLVM_ENABLE_ASSERTIONS=ON $AOMP_ORIGIN_RPATH -DCMAKE_Fortran_COMPILER=$AOMP_INSTALL_DIR/bin/flang -DLLVM_TARGETS_TO_BUILD=$TARGETS_TO_BUILD -DCMAKE_C_FLAGS=-I$COMP_INC_DIR -DCMAKE_CXX_FLAGS=-I$COMP_INC_DIR"
-@@ -51,8 +51,8 @@
-     -DCMAKE_INSTALL_PREFIX=$INSTALL_FLANG \
-     -DLLVM_ENABLE_ASSERTIONS=ON \
-     -DLLVM_CONFIG=$INSTALL_FLANG/bin/llvm-config \
--    -DCMAKE_CXX_COMPILER=$OUT_DIR/llvm/bin/clang++ \
--    -DCMAKE_C_COMPILER=$OUT_DIR/llvm/bin/clang \
-+    -DCMAKE_CXX_COMPILER=$ROCM_DIR/llvm/bin/clang++ \
-+    -DCMAKE_C_COMPILER=$ROCM_DIR/llvm/bin/clang \
-     -DLLVM_TARGETS_TO_BUILD=$TARGETS_TO_BUILD \
-     -DCMAKE_C_FLAGS=-I$COMP_INC_DIR \
-     -DCMAKE_CXX_FLAGS=-I$COMP_INC_DIR \
diff --git a/Overlays/jureca_mi200_overlay/r/ROCm/aomp-flang-libomp-path.patch b/Overlays/jureca_mi200_overlay/r/ROCm/aomp-flang-libomp-path.patch
deleted file mode 100644
index 948ac436e..000000000
--- a/Overlays/jureca_mi200_overlay/r/ROCm/aomp-flang-libomp-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --color -urN aomp-rocm-4.5.0-unpatched/bin/build_flang_runtime.sh aomp-rocm-4.5.0/bin/build_flang_runtime.sh
---- aomp-rocm-4.5.0-unpatched/bin/build_flang_runtime.sh	2021-11-16 20:57:05.189706370 +0100
-+++ aomp-rocm-4.5.0/bin/build_flang_runtime.sh	2021-11-16 20:58:20.012150723 +0100
-@@ -66,6 +66,7 @@
- -DLLVM_TARGETS_TO_BUILD=$TARGETS_TO_BUILD \
- -DLLVM_INSTALL_RUNTIME=ON \
- -DFLANG_BUILD_RUNTIME=ON \
-+-DFLANG_LIBOMP=$OMPEXTRA_DIR/llvm/lib/libomp.so \
- -DCMAKE_C_FLAGS=-I$COMP_INC_DIR \
- -DCMAKE_CXX_FLAGS=-I$COMP_INC_DIR \
- -DOPENMP_BUILD_DIR=$OPENMP_BUILD_DIR \
diff --git a/Overlays/jureca_mi200_overlay/r/ROCm/aomp-gcc8-only-for-cuda.patch b/Overlays/jureca_mi200_overlay/r/ROCm/aomp-gcc8-only-for-cuda.patch
deleted file mode 100644
index 812098ac6..000000000
--- a/Overlays/jureca_mi200_overlay/r/ROCm/aomp-gcc8-only-for-cuda.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --color -urN aomp-rocm-4.3.1/bin/build_openmp.sh aomp-rocm-4.3.1-patched/bin/build_openmp.sh
---- aomp-rocm-4.3.1/bin/build_openmp.sh	2021-08-27 05:56:05.000000000 +0200
-+++ aomp-rocm-4.3.1-patched/bin/build_openmp.sh	2021-10-29 19:43:56.338668126 +0200
-@@ -99,21 +99,11 @@
- 
- GCCLOC=$(getgcc8orless)
- GXXLOC=$(getgxx8orless)
--if [ "$GCCLOC" == "" ] ; then
--   echo "ERROR: NO ADEQUATE gcc"
--   echo "       Please install gcc-5, gcc-7, or gcc-8"
--   exit 1
--fi
--if [ "$GXXLOC" == "" ] ; then
--   echo "ERROR: NO ADEQUATE g++"
--   echo "       Please install g++-5, g++-7, or g++-8"
--   exit 1
--fi
- 
- GFXSEMICOLONS=`echo $GFXLIST | tr ' ' ';' `
- #COMMON_CMAKE_OPTS="#-DOPENMP_TEST_C_COMPILER=$AOMP/bin/clang
- #-DOPENMP_TEST_CXX_COMPILER=$AOMP/bin/clang++
- 
- COMMON_CMAKE_OPTS="-DDEVICELIBS_ROOT=$DEVICELIBS_ROOT
- -DOPENMP_ENABLE_LIBOMPTARGET=1
- -DOPENMP_ENABLE_LIBOMPTARGET_HSA=1
-@@ -127,6 +119,16 @@
- -DCMAKE_PREFIX_PATH=$ROCM_DIR;$ROCM_DIR/include/hsa"
- 
- if [ "$AOMP_BUILD_CUDA" == 1 ] ; then
-+  if [ "$GCCLOC" == "" ] ; then
-+     echo "ERROR: NO ADEQUATE gcc"
-+     echo "       Please install gcc-5, gcc-7, or gcc-8"
-+     exit 1
-+  fi
-+  if [ "$GXXLOC" == "" ] ; then
-+     echo "ERROR: NO ADEQUATE g++"
-+     echo "       Please install g++-5, g++-7, or g++-8"
-+     exit 1
-+  fi
-    COMMON_CMAKE_OPTS="$COMMON_CMAKE_OPTS
- -DLIBOMPTARGET_NVPTX_ENABLE_BCLIB=ON
- -DLIBOMPTARGET_NVPTX_CUDA_COMPILER=$AOMP/bin/clang++
diff --git a/Overlays/jureca_mi200_overlay/r/ROCm/aomp-openmp-buildpath.patch b/Overlays/jureca_mi200_overlay/r/ROCm/aomp-openmp-buildpath.patch
deleted file mode 100644
index e1cf3c364..000000000
--- a/Overlays/jureca_mi200_overlay/r/ROCm/aomp-openmp-buildpath.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --color -urN aomp-rocm-4.3.1/bin/build_openmp.sh aomp-rocm-4.3.1-patched/bin/build_openmp.sh
---- aomp-rocm-4.3.1/bin/build_openmp.sh	2021-08-27 05:56:05.000000000 +0200
-+++ aomp-rocm-4.3.1-patched/bin/build_openmp.sh	2021-10-29 19:43:56.338668126 +0200
-@@ -166,7 +168,7 @@
-          env "$@" ${AOMP_CMAKE} $MYCMAKEOPTS  $BUILD_DIR/$AOMP_PROJECT_REPO_NAME/openmp
-       else
-          echo ${AOMP_CMAKE} $MYCMAKEOPTS  $AOMP_REPOS/$AOMP_PROJECT_REPO_NAME/openmp
--         env "$@" ${AOMP_CMAKE} $MYCMAKEOPTS  $AOMP_REPOS/../$AOMP_PROJECT_REPO_NAME/openmp
-+         env "$@" ${AOMP_CMAKE} $MYCMAKEOPTS  $AOMP_REPOS/$AOMP_PROJECT_REPO_NAME/openmp
-       fi
-       if [ $? != 0 ] ; then 
-          echo "ERROR openmp cmake failed. Cmake flags"
-@@ -202,8 +202,8 @@
-          echo ${AOMP_CMAKE} $MYCMAKEOPTS  $BUILD_DIR/$AOMP_PROJECT_REPO_NAME/openmp
-          env "$@" ${AOMP_CMAKE} $MYCMAKEOPTS  $BUILD_DIR/$AOMP_PROJECT_REPO_NAME/openmp
-       else
--         echo ${AOMP_CMAKE} $MYCMAKEOPTS  $AOMP_REPOS/../$AOMP_PROJECT_REPO_NAME/openmp
--         env "$@" ${AOMP_CMAKE} $MYCMAKEOPTS  $AOMP_REPOS/../$AOMP_PROJECT_REPO_NAME/openmp
-+         echo ${AOMP_CMAKE} $MYCMAKEOPTS  $AOMP_REPOS/$AOMP_PROJECT_REPO_NAME/openmp
-+         env "$@" ${AOMP_CMAKE} $MYCMAKEOPTS  $AOMP_REPOS/$AOMP_PROJECT_REPO_NAME/openmp
-       fi
-       if [ $? != 0 ] ; then 
-          echo "ERROR openmp debug cmake failed. Cmake flags"
diff --git a/Overlays/jureca_mi200_overlay/r/ROCm/aomp-openmp-llvm.patch b/Overlays/jureca_mi200_overlay/r/ROCm/aomp-openmp-llvm.patch
deleted file mode 100644
index ea0e983cc..000000000
--- a/Overlays/jureca_mi200_overlay/r/ROCm/aomp-openmp-llvm.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/bin/build_openmp.sh 2022-03-01 13:10:36.609965678 +0100
-+++ b/bin/build_openmp.sh 2022-03-01 13:17:30.403456565 +0100
-@@ -113,14 +113,14 @@
- -DROCM_DIR=$ROCM_DIR
- -DLIBOMPTARGET_ENABLE_DEBUG=ON
- -DCMAKE_INSTALL_PREFIX=$INSTALL_OPENMP
---DLLVM_INSTALL_PREFIX=$OUT_DIR/llvm
-+-DLLVM_INSTALL_PREFIX=$ROCM_DIR/llvm
- -DLLVM_MAIN_INCLUDE_DIR=$LLVM_PROJECT_ROOT/llvm/include
- -DLIBOMPTARGET_LLVM_INCLUDE_DIRS=$LLVM_PROJECT_ROOT/llvm/include
- -DCMAKE_PREFIX_PATH=$ROCM_DIR;$ROCM_DIR/include/hsa;$DEVICELIBS_BUILD_PATH;$OUT_DIR/build/devicelibs
---DCMAKE_C_COMPILER=$OUT_DIR/llvm/bin/clang
---DCMAKE_CXX_COMPILER=$OUT_DIR/llvm/bin/clang++
---DOPENMP_TEST_C_COMPILER=$OUT_DIR/llvm/bin/clang
---DOPENMP_TEST_CXX_COMPILER=$OUT_DIR/llvm/bin/clang++"
-+-DCMAKE_C_COMPILER=$ROCM_DIR/llvm/bin/clang
-+-DCMAKE_CXX_COMPILER=$ROCM_DIR/llvm/bin/clang++
-+-DOPENMP_TEST_C_COMPILER=$ROCM_DIR/llvm/bin/clang
-+-DOPENMP_TEST_CXX_COMPILER=$ROCM_DIR/llvm/bin/clang++"
-
- if [ "$AOMP_BUILD_CUDA" == 1 ] ; then
-   if [ "$GCCLOC" == "" ] ; then
-
diff --git a/Overlays/jureca_mi200_overlay/r/ROCm/hipBLAS-5.2.0-rocblas-include-fix.patch b/Overlays/jureca_mi200_overlay/r/ROCm/hipBLAS-5.2.0-rocblas-include-fix.patch
deleted file mode 100644
index 0b2fac75a..000000000
--- a/Overlays/jureca_mi200_overlay/r/ROCm/hipBLAS-5.2.0-rocblas-include-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/library/src/hcc_detail/hipblas.cpp b/library/src/hcc_detail/hipblas.cpp
-index 78faf10..ea95d33 100644
---- a/library/src/hcc_detail/hipblas.cpp
-+++ b/library/src/hcc_detail/hipblas.cpp
-@@ -4,7 +4,7 @@
- #include "hipblas.h"
- #include "exceptions.hpp"
- #include "limits.h"
--#include "rocblas.h"
-+#include <rocblas/rocblas.h>
- #ifdef __HIP_PLATFORM_SOLVER__
- #include "rocsolver.h"
- #endif
diff --git a/Overlays/jureca_mi200_overlay/r/ROCm/hipamd-5.1.3-git-hash.patch b/Overlays/jureca_mi200_overlay/r/ROCm/hipamd-5.1.3-git-hash.patch
deleted file mode 100644
index a3ffb7f47..000000000
--- a/Overlays/jureca_mi200_overlay/r/ROCm/hipamd-5.1.3-git-hash.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a53ab0d2..d40143f5 100755
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -188,7 +188,7 @@ set (HIP_LIB_VERSION_MINOR ${HIP_VERSION_MINOR})
- if (${ROCM_PATCH_VERSION} )
-    set (HIP_LIB_VERSION_PATCH ${ROCM_PATCH_VERSION})
- else ()
--   set (HIP_LIB_VERSION_PATCH ${HIP_VERSION_PATCH}-${HIP_VERSION_GITHASH})
-+   set (HIP_LIB_VERSION_PATCH ${HIP_VERSION_PATCH})
- endif ()
- set (HIP_LIB_VERSION_STRING "${HIP_LIB_VERSION_MAJOR}.${HIP_LIB_VERSION_MINOR}.${HIP_LIB_VERSION_PATCH}")
- if (DEFINED ENV{ROCM_RPATH})
diff --git a/Overlays/jureca_mi200_overlay/r/ROCm/llvm-project-hostrpc-fprintf-decl.patch b/Overlays/jureca_mi200_overlay/r/ROCm/llvm-project-hostrpc-fprintf-decl.patch
deleted file mode 100644
index da482be71..000000000
--- a/Overlays/jureca_mi200_overlay/r/ROCm/llvm-project-hostrpc-fprintf-decl.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --color -urN llvm-project-rocm-5.0.1-unpatched/openmp/libomptarget/hostrpc/src/hostrpc.h llvm-project-rocm-5.0.1/openmp/libomptarget/hostrpc/src/hostrpc.h
---- llvm-project-rocm-5.0.1-unpatched/openmp/libomptarget/hostrpc/src/hostrpc.h 2022-03-01 13:37:53.355306931 +0100
-+++ llvm-project-rocm-5.0.1/openmp/libomptarget/hostrpc/src/hostrpc.h   2022-03-01 13:54:46.401334335 +0100
-@@ -41,6 +41,14 @@
- #include <stdint.h>
- #include <stdio.h>
-
-+#if defined(fprintf)
-+    #undef fprintf
-+#endif
-+
-+#if defined(printf)
-+    #undef printf
-+#endif
-+
- //  These are the interfaces for the device stubs */
- EXTERN int fprintf(FILE *, const char *, ...);
- EXTERN char *fprintf_allocate(uint32_t bufsz);
diff --git a/Overlays/jureca_mi200_overlay/r/ROCm/llvm-project-mlir-fix-rpath-flags.patch b/Overlays/jureca_mi200_overlay/r/ROCm/llvm-project-mlir-fix-rpath-flags.patch
deleted file mode 100644
index 1a8c7fa81..000000000
--- a/Overlays/jureca_mi200_overlay/r/ROCm/llvm-project-mlir-fix-rpath-flags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/cmake/llvm-project.cmake b/cmake/llvm-project.cmake
-index 94bfdd0e932c..89dce472afc6 100644
---- a/cmake/llvm-project.cmake
-+++ b/cmake/llvm-project.cmake
-@@ -48,8 +48,6 @@ list(APPEND LLVM_INCLUDE_DIRS
- )
- 
- # Linker flags
--list(APPEND CMAKE_EXE_LINKER_FLAGS
--  " -Wl,-rpath -Wl,${CMAKE_CURRENT_BINARY_DIR}/external/llvm-project/llvm/lib"
--)
-+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath -Wl,${CMAKE_CURRENT_BINARY_DIR}/external/llvm-project/llvm/lib")
- 
- add_subdirectory("${LLVM_PROJ_SRC}/llvm" "external/llvm-project/llvm" EXCLUDE_FROM_ALL)
diff --git a/Overlays/jureca_mi200_overlay/r/ROCm/llvm-project-mlir-no-append-rpath-do-it-via-commandline-instead.patch b/Overlays/jureca_mi200_overlay/r/ROCm/llvm-project-mlir-no-append-rpath-do-it-via-commandline-instead.patch
deleted file mode 100644
index ebe2b869e..000000000
--- a/Overlays/jureca_mi200_overlay/r/ROCm/llvm-project-mlir-no-append-rpath-do-it-via-commandline-instead.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/cmake/llvm-project.cmake b/cmake/llvm-project.cmake
-index 94bfdd0e932c..abfd91f05ae2 100644
---- a/cmake/llvm-project.cmake
-+++ b/cmake/llvm-project.cmake
-@@ -48,8 +48,8 @@ list(APPEND LLVM_INCLUDE_DIRS
- )
- 
- # Linker flags
--list(APPEND CMAKE_EXE_LINKER_FLAGS
--  " -Wl,-rpath -Wl,${CMAKE_CURRENT_BINARY_DIR}/external/llvm-project/llvm/lib"
--)
-+#list(APPEND CMAKE_EXE_LINKER_FLAGS
-+#  " -Wl,-rpath -Wl,${CMAKE_CURRENT_BINARY_DIR}/external/llvm-project/llvm/lib"
-+#)
- 
- add_subdirectory("${LLVM_PROJ_SRC}/llvm" "external/llvm-project/llvm" EXCLUDE_FROM_ALL)
diff --git a/Overlays/jureca_mi200_overlay/r/ROCm/miopen-5.2.0-rocblas-include-fix.patch b/Overlays/jureca_mi200_overlay/r/ROCm/miopen-5.2.0-rocblas-include-fix.patch
deleted file mode 100644
index 733db49ea..000000000
--- a/Overlays/jureca_mi200_overlay/r/ROCm/miopen-5.2.0-rocblas-include-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/gemm_v2.cpp b/src/gemm_v2.cpp
-index fc8b3222c..f95337dc0 100644
---- a/src/gemm_v2.cpp
-+++ b/src/gemm_v2.cpp
-@@ -40,7 +40,7 @@
- 
- #if MIOPEN_USE_ROCBLAS
- #include <half.hpp>
--#include <rocblas.h>
-+#include <rocblas/rocblas.h>
- #include <miopen/perf_field.hpp>
- #endif
- 
-diff --git a/src/include/miopen/handle.hpp b/src/include/miopen/handle.hpp
-index ee45ae2a0..b99883f5f 100644
---- a/src/include/miopen/handle.hpp
-+++ b/src/include/miopen/handle.hpp
-@@ -52,7 +52,7 @@
- 
- #if MIOPEN_USE_ROCBLAS
- #include <miopen/manage_ptr.hpp>
--#include <rocblas.h>
-+#include <rocblas/rocblas.h>
- #endif
- 
- namespace miopen {
diff --git a/Overlays/jureca_mi200_overlay/r/ROCm/rocALUTION-5.2.0-fix-complex-device-operators.patch b/Overlays/jureca_mi200_overlay/r/ROCm/rocALUTION-5.2.0-fix-complex-device-operators.patch
deleted file mode 100644
index 550f8db1f..000000000
--- a/Overlays/jureca_mi200_overlay/r/ROCm/rocALUTION-5.2.0-fix-complex-device-operators.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-diff --git a/src/base/hip/hip_vector.hpp b/src/base/hip/hip_vector.hpp
-index 0444528..06f2b97 100644
---- a/src/base/hip/hip_vector.hpp
-+++ b/src/base/hip/hip_vector.hpp
-@@ -30,11 +30,108 @@
- #include "../base_vector.hpp"
- 
- #include <hip/hip_runtime.h>
-+#include <hip/amd_detail/amd_hip_complex.h>
- 
- #include <complex>
- 
- #include "hip_rand.hpp"
- 
-+#if defined(__HIPCC_RTC__)
-+#define __HOST_DEVICE__ __device__
-+#else
-+#define __HOST_DEVICE__ __host__ __device__
-+#endif // !defined(__HIPCC_RTC__)
-+
-+// Gotta put these somewhere
-+__HOST_DEVICE__ inline std::complex<float> operator+(const std::complex<float> a, const std::complex<float> b)
-+{
-+    auto res = a+b;
-+    return res;
-+}
-+__HOST_DEVICE__ inline std::complex<float>& operator+=(std::complex<float>& a, const std::complex<float> b)
-+{
-+    a = a+b;
-+    return a;
-+}
-+__HOST_DEVICE__ inline std::complex<float> operator-(const std::complex<float> a, const std::complex<float> b)
-+{
-+    auto res = a-b;
-+    return res;
-+}
-+__HOST_DEVICE__ inline std::complex<float> operator-(const std::complex<float> a)
-+{
-+    return -a;
-+}
-+__HOST_DEVICE__ inline std::complex<float>& operator-=(std::complex<float>& a, const std::complex<float> b)
-+{
-+    a = a-b;
-+    return a;
-+}
-+__HOST_DEVICE__ inline std::complex<float> operator*(const std::complex<float> a, const std::complex<float> b)
-+{
-+    auto res = a*b;
-+    return res;
-+}
-+__HOST_DEVICE__ inline std::complex<float>& operator*=(std::complex<float>& a, const std::complex<float> b)
-+{
-+    a = a*b;
-+    return a;
-+}
-+__HOST_DEVICE__ inline std::complex<float> operator/(const std::complex<float> a, const std::complex<float> b)
-+{
-+    auto res = a/b;
-+    return res;
-+}
-+__HOST_DEVICE__ inline float abs(const std::complex<float> a)
-+{
-+    return abs(a);
-+}
-+
-+
-+__HOST_DEVICE__ inline std::complex<double> operator+(const std::complex<double> a, const std::complex<double> b)
-+{
-+    auto res = a+b;
-+    return res;
-+}
-+__HOST_DEVICE__ inline std::complex<double>& operator+=(std::complex<double>& a, const std::complex<double> b)
-+{
-+    a = a+b;
-+    return a;
-+}
-+__HOST_DEVICE__ inline std::complex<double> operator-(const std::complex<double> a, const std::complex<double> b)
-+{
-+    auto res = a-b;
-+    return res;
-+}
-+__HOST_DEVICE__ inline std::complex<double> operator-(const std::complex<double> a)
-+{
-+    return -a;
-+}
-+__HOST_DEVICE__ inline std::complex<double>& operator-=(std::complex<double>& a, const std::complex<double> b)
-+{
-+    a = a-b;
-+    return a;
-+}
-+__HOST_DEVICE__ inline std::complex<double> operator*(const std::complex<double> a, const std::complex<double> b)
-+{
-+    auto res = a*b;
-+    return res;
-+}
-+__HOST_DEVICE__ inline std::complex<double>& operator*=(std::complex<double>& a, const std::complex<double> b)
-+{
-+    a = a*b;
-+    return a;
-+}
-+__HOST_DEVICE__ inline std::complex<double> operator/(const std::complex<double> a, const std::complex<double> b)
-+{
-+    auto res = a/b;
-+    return res;
-+}
-+__HOST_DEVICE__ inline double abs(const std::complex<double> a)
-+{
-+    return abs(a);
-+}
-+
- namespace rocalution
- {
-     template <typename ValueType>
diff --git a/Overlays/jureca_mi200_overlay/r/ROCm/rocALUTION-5.2.0-rocblas-include-fix.patch b/Overlays/jureca_mi200_overlay/r/ROCm/rocALUTION-5.2.0-rocblas-include-fix.patch
deleted file mode 100644
index 16fb1d104..000000000
--- a/Overlays/jureca_mi200_overlay/r/ROCm/rocALUTION-5.2.0-rocblas-include-fix.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/src/base/hip/backend_hip.cpp b/src/base/hip/backend_hip.cpp
-index 72424a9..082cdb1 100644
---- a/src/base/hip/backend_hip.cpp
-+++ b/src/base/hip/backend_hip.cpp
-@@ -40,7 +40,7 @@
- #include "hip_vector.hpp"
- 
- #include <hip/hip_runtime_api.h>
--#include <rocblas.h>
-+#include <rocblas/rocblas.h>
- #include <rocsparse.h>
- 
- #include <complex>
-diff --git a/src/base/hip/hip_blas.cpp b/src/base/hip/hip_blas.cpp
-index db67352..9979d16 100644
---- a/src/base/hip/hip_blas.cpp
-+++ b/src/base/hip/hip_blas.cpp
-@@ -27,7 +27,7 @@
- 
- #include <hip/hip_complex.h>
- #include <hip/hip_runtime_api.h>
--#include <rocblas.h>
-+#include <rocblas/rocblas.h>
- #include <rocprim/rocprim.hpp>
- 
- #include <complex>
-diff --git a/src/base/hip/hip_blas.hpp b/src/base/hip/hip_blas.hpp
-index 002a796..5a0afc5 100644
---- a/src/base/hip/hip_blas.hpp
-+++ b/src/base/hip/hip_blas.hpp
-@@ -25,7 +25,7 @@
- #define ROCALUTION_HIP_HIP_BLAS_HPP_
- 
- #include <hip/hip_runtime_api.h>
--#include <rocblas.h>
-+#include <rocblas/rocblas.h>
- 
- namespace rocalution
- {
-diff --git a/src/base/hip/hip_conversion.hpp b/src/base/hip/hip_conversion.hpp
-index 8c3fa3f..c67a7c8 100644
---- a/src/base/hip/hip_conversion.hpp
-+++ b/src/base/hip/hip_conversion.hpp
-@@ -27,7 +27,7 @@
- #include "../backend_manager.hpp"
- #include "../matrix_formats.hpp"
- 
--#include <rocblas.h>
-+#include <rocblas/rocblas.h>
- #include <rocsparse.h>
- 
- namespace rocalution
-diff --git a/src/base/hip/hip_utils.hpp b/src/base/hip/hip_utils.hpp
-index 550beb7..3c3b68b 100644
---- a/src/base/hip/hip_utils.hpp
-+++ b/src/base/hip/hip_utils.hpp
-@@ -29,7 +29,7 @@
- #include "backend_hip.hpp"
- 
- #include <hip/hip_runtime.h>
--#include <rocblas.h>
-+#include <rocblas/rocblas.h>
- #include <rocsparse.h>
- 
- #ifdef SUPPORT_COMPLEX
diff --git a/Overlays/jureca_mi200_overlay/r/ROCm/rocALUTION-complex.patch b/Overlays/jureca_mi200_overlay/r/ROCm/rocALUTION-complex.patch
deleted file mode 100644
index d8b583b23..000000000
--- a/Overlays/jureca_mi200_overlay/r/ROCm/rocALUTION-complex.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff --git a/src/base/hip/hip_vector.hpp b/src/base/hip/hip_vector.hpp
-index 0444528..a432359 100644
---- a/src/base/hip/hip_vector.hpp
-+++ b/src/base/hip/hip_vector.hpp
-@@ -30,11 +30,77 @@
- #include "../base_vector.hpp"
- 
- #include <hip/hip_runtime.h>
-+#include <hip/amd_detail/amd_hip_complex.h>
- 
- #include <complex>
- 
- #include "hip_rand.hpp"
- 
-+#if defined(__HIPCC_RTC__)
-+#define __HOST_DEVICE__ __device__
-+#else
-+#define __HOST_DEVICE__ __host__ __device__
-+#endif // !defined(__HIPCC_RTC__)
-+
-+// Gotta put these somewhere
-+__HOST_DEVICE__ inline std::complex<float> operator+(const std::complex<float> a, const std::complex<float> b)
-+{
-+    auto ahip = make_hipFloatComplex(a.real(), a.imag());
-+    auto bhip = make_hipFloatComplex(b.real(), b.imag());
-+    auto res = a+b;
-+    return res;
-+}
-+__HOST_DEVICE__ inline std::complex<float> operator-(const std::complex<float> a, const std::complex<float> b)
-+{
-+    auto ahip = make_hipFloatComplex(a.real(), a.imag());
-+    auto bhip = make_hipFloatComplex(b.real(), b.imag());
-+    auto res = a-b;
-+    return res;
-+}
-+__HOST_DEVICE__ inline std::complex<float> operator*(const std::complex<float> a, const std::complex<float> b)
-+{
-+    auto ahip = make_hipFloatComplex(a.real(), a.imag());
-+    auto bhip = make_hipFloatComplex(b.real(), b.imag());
-+    auto res = a*b;
-+    return res;
-+}
-+__HOST_DEVICE__ inline std::complex<float> operator/(const std::complex<float> a, const std::complex<float> b)
-+{
-+    auto ahip = make_hipFloatComplex(a.real(), a.imag());
-+    auto bhip = make_hipFloatComplex(b.real(), b.imag());
-+    auto res = a/b;
-+    return res;
-+}
-+
-+__HOST_DEVICE__ inline std::complex<double> operator+(const std::complex<double> a, const std::complex<double> b)
-+{
-+    auto ahip = make_hipDoubleComplex(a.real(), a.imag());
-+    auto bhip = make_hipDoubleComplex(b.real(), b.imag());
-+    auto res = a+b;
-+    return res;
-+}
-+__HOST_DEVICE__ inline std::complex<double> operator-(const std::complex<double> a, const std::complex<double> b)
-+{
-+    auto ahip = make_hipDoubleComplex(a.real(), a.imag());
-+    auto bhip = make_hipDoubleComplex(b.real(), b.imag());
-+    auto res = a-b;
-+    return res;
-+}
-+__HOST_DEVICE__ inline std::complex<double> operator*(const std::complex<double> a, const std::complex<double> b)
-+{
-+    auto ahip = make_hipDoubleComplex(a.real(), a.imag());
-+    auto bhip = make_hipDoubleComplex(b.real(), b.imag());
-+    auto res = a*b;
-+    return res;
-+}
-+__HOST_DEVICE__ inline std::complex<double> operator/(const std::complex<double> a, const std::complex<double> b)
-+{
-+    auto ahip = make_hipDoubleComplex(a.real(), a.imag());
-+    auto bhip = make_hipDoubleComplex(b.real(), b.imag());
-+    auto res = a/b;
-+    return res;
-+}
-+
- namespace rocalution
- {
-     template <typename ValueType>
diff --git a/Overlays/jureca_mi200_overlay/r/ROCm/rocBLAS-5.2.0-find-python-if-undefined.patch b/Overlays/jureca_mi200_overlay/r/ROCm/rocBLAS-5.2.0-find-python-if-undefined.patch
deleted file mode 100644
index df052ae53..000000000
--- a/Overlays/jureca_mi200_overlay/r/ROCm/rocBLAS-5.2.0-find-python-if-undefined.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/library/src/CMakeLists.txt b/library/src/CMakeLists.txt
-index 79f54f21..ace140f6 100755
---- a/library/src/CMakeLists.txt
-+++ b/library/src/CMakeLists.txt
-@@ -493,6 +493,11 @@ include( GenerateExportHeader )
- set_target_properties( rocblas PROPERTIES CXX_VISIBILITY_PRESET "hidden" C_VISIBILITY_PRESET "hidden" VISIBILITY_INLINES_HIDDEN ON )
- generate_export_header( rocblas EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/include/rocblas/internal/rocblas-export.h )
- 
-+if (NOT python)
-+    find_package(Python COMPONENTS Interpreter)
-+    set(python ${Python_EXECUTABLE})
-+endif()
-+
- # generate header with prototypes for export reuse
- file( GLOB rocblas_prototype_inputs
-   LIST_DIRECTORIES OFF
diff --git a/Overlays/jureca_mi200_overlay/r/ROCm/rocblas-5.2.0-internal-rocblas-include-fix.patch b/Overlays/jureca_mi200_overlay/r/ROCm/rocblas-5.2.0-internal-rocblas-include-fix.patch
deleted file mode 100644
index 9ed2a2ea1..000000000
--- a/Overlays/jureca_mi200_overlay/r/ROCm/rocblas-5.2.0-internal-rocblas-include-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/library/src/include/rocblas_device_malloc.hpp b/library/src/include/rocblas_device_malloc.hpp
-index e82f8d4a..1f65d54f 100644
---- a/library/src/include/rocblas_device_malloc.hpp
-+++ b/library/src/include/rocblas_device_malloc.hpp
-@@ -19,7 +19,7 @@
- // This header should be included in other projects to use the rocblas_handle
- // C++ device memory allocation API. It is unlikely to change very often.
- 
--#include "rocblas.h"
-+#include <rocblas/rocblas.h>
- #include <new>
- #include <type_traits>
- 
diff --git a/Overlays/jureca_mi200_overlay/r/ROCm/roctracer-hsa_ostream_ops-include.patch b/Overlays/jureca_mi200_overlay/r/ROCm/roctracer-hsa_ostream_ops-include.patch
deleted file mode 100644
index 8338ef5b1..000000000
--- a/Overlays/jureca_mi200_overlay/r/ROCm/roctracer-hsa_ostream_ops-include.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/inc/roctracer_hsa.h b/inc/roctracer_hsa.h
-index 1e50c3a..e62e0c0 100644
---- a/inc/roctracer_hsa.h
-+++ b/inc/roctracer_hsa.h
-@@ -64,7 +64,7 @@ struct ops_properties_t {
- typedef hsa_support::ops_properties_t hsa_ops_properties_t;
- }; // namespace roctracer
- 
--#include "hsa_ostream_ops.h"
-+#include <hsa_ostream_ops.h>
- 
- 
- #else // !__cplusplus
diff --git a/Overlays/jureca_mi200_overlay/r/ROCm/roctracer-preprocess-no-linemarkers.patch b/Overlays/jureca_mi200_overlay/r/ROCm/roctracer-preprocess-no-linemarkers.patch
deleted file mode 100644
index bcc8c66c5..000000000
--- a/Overlays/jureca_mi200_overlay/r/ROCm/roctracer-preprocess-no-linemarkers.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 82250d8..f60b1ae 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -3,12 +3,12 @@ set ( GEN_INC_DIR ${PROJECT_BINARY_DIR}/inc )
- set ( GEN_SRC_DIR ${PROJECT_BINARY_DIR}/src )
- execute_process ( COMMAND sh -xc "mkdir -p ${GEN_INC_DIR}" )
- execute_process ( COMMAND sh -xc "mkdir -p ${GEN_SRC_DIR}" )
--execute_process ( COMMAND sh -xc "${CMAKE_C_COMPILER} -E ${HSA_RUNTIME_INC_PATH}/hsa.h > ${GEN_INC_DIR}/hsa_pp.h" )
--execute_process ( COMMAND sh -xc "${CMAKE_C_COMPILER} -E ${HSA_RUNTIME_INC_PATH}/hsa_ext_amd.h > ${GEN_INC_DIR}/hsa_ext_amd_pp.h" )
-+execute_process ( COMMAND sh -xc "${CMAKE_C_COMPILER} -E -P ${HSA_RUNTIME_INC_PATH}/hsa.h > ${GEN_INC_DIR}/hsa_pp.h" )
-+execute_process ( COMMAND sh -xc "${CMAKE_C_COMPILER} -E -P ${HSA_RUNTIME_INC_PATH}/hsa_ext_amd.h > ${GEN_INC_DIR}/hsa_ext_amd_pp.h" )
- execute_process ( COMMAND sh -xc "python3 ${ROOT_DIR}/script/gen_ostream_ops.py -in ${GEN_INC_DIR}/hsa_pp.h,${GEN_INC_DIR}/hsa_ext_amd_pp.h -out ${GEN_INC_DIR}/hsa_ostream_ops.h" )
- execute_process ( COMMAND sh -xc "python3 ${ROOT_DIR}/script/hsaap.py ${PROJECT_BINARY_DIR} ${HSA_RUNTIME_INC_PATH}" )
--execute_process ( COMMAND sh -xc "${CMAKE_C_COMPILER} -E ${HSA_KMT_INC_PATH}/hsakmttypes.h > ${GEN_INC_DIR}/hsakmttypes_pp.h" )
--execute_process ( COMMAND sh -xc "${CMAKE_C_COMPILER} -E ${HIP_PATH}/include/hip/hip_runtime_api.h ${HIP_DEFINES} -I${HIP_PATH}/include -I${ROCM_ROOT_DIR}/hsa/include > ${GEN_INC_DIR}/hip_runtime_api_pp.h" )
-+execute_process ( COMMAND sh -xc "${CMAKE_C_COMPILER} -E -P ${HSA_KMT_INC_PATH}/hsakmttypes.h > ${GEN_INC_DIR}/hsakmttypes_pp.h" )
-+execute_process ( COMMAND sh -xc "${CMAKE_C_COMPILER} -E -P ${HIP_PATH}/include/hip/hip_runtime_api.h ${HIP_DEFINES} -I${HIP_PATH}/include -I${ROCM_ROOT_DIR}/hsa/include > ${GEN_INC_DIR}/hip_runtime_api_pp.h" )
- execute_process ( COMMAND sh -xc "python3 ${ROOT_DIR}/script/gen_ostream_ops.py -in ${GEN_INC_DIR}/hip_runtime_api_pp.h -out ${GEN_INC_DIR}/hip_ostream_ops.h" )
- execute_process ( COMMAND sh -xc "mkdir ${GEN_INC_DIR}/rocprofiler" )
- execute_process ( COMMAND sh -xc "ln -s ${ROOT_DIR}/../rocprofiler/inc/rocprofiler.h ${GEN_INC_DIR}/rocprofiler/rocprofiler.h" )
diff --git a/Overlays/jureca_mi200_overlay/r/robin-hood-hashing/robin-hood-hashing-3.11.5-GCCcore-11.2.0.eb b/Overlays/jureca_mi200_overlay/r/robin-hood-hashing/robin-hood-hashing-3.11.5-GCCcore-11.2.0.eb
deleted file mode 100644
index 5763b5ca5..000000000
--- a/Overlays/jureca_mi200_overlay/r/robin-hood-hashing/robin-hood-hashing-3.11.5-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,32 +0,0 @@
-easyblock = 'CMakeNinja'
-
-name = 'robin-hood-hashing'
-version = '3.11.5'
-
-homepage = 'https://gitter.im/martinus/robin-hood-hashing'
-description = """Fast & memory efficient hashtable based on robin hood hashing for C++11/14/17/20"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-github_account = 'martinus'
-
-source_urls = [GITHUB_SOURCE]
-sources = [{
-    'filename':          SOURCELOWER_TAR_GZ,
-    'download_filename': '%(version)s.tar.gz'
-}]
-checksums = ['3693e44dda569e9a8b87ce8263f7477b23af448a3c3600c8ab9004fe79c20ad0']
-
-builddependencies = [
-    ('CMake', '3.21.1'),
-    ('Ninja', '1.10.2'),
-]
-
-configopts = '-DRH_STANDALONE_PROJECT=OFF'
-
-sanity_check_paths = {
-    'files': ['include/robin_hood.h'],
-    'dirs': ['lib/cmake'],
-}
-
-moduleclass = 'devel'
diff --git a/Overlays/jureca_mi200_overlay/s/SPIRV-Cross/SPIRV-Cross-1.3.213-GCCcore-11.2.0.eb b/Overlays/jureca_mi200_overlay/s/SPIRV-Cross/SPIRV-Cross-1.3.213-GCCcore-11.2.0.eb
deleted file mode 100644
index fe6bfafb5..000000000
--- a/Overlays/jureca_mi200_overlay/s/SPIRV-Cross/SPIRV-Cross-1.3.213-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,36 +0,0 @@
-easyblock = 'CMakeNinja'
-
-name = 'SPIRV-Cross'
-version = '1.3.213'
-
-homepage = 'https://www.khronos.org/registry/SPIR-V/'
-description = """SPIRV-Cross is a practical tool and library for performing reflection
-                 on SPIR-V and disassembling SPIR-V back to high level languages."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-github_account = 'KhronosGroup'
-
-source_urls = [GITHUB_SOURCE]
-sources = [{
-    'filename': SOURCELOWER_TAR_GZ,
-    # 'download_filename': 'sdk-%(version)s.tar.gz'
-    'download_filename': 'b3ff97d0feafd2b7ca72aec7215cfc3d0998fb79.tar.gz'
-}]
-checksums = ['088fd4fac6d880077e01ee89ed0c25cfda0cf7baf2558f374d6b6a431d570509']
-
-builddependencies = [
-    ('CMake', '3.21.1'),
-    ('Ninja', '1.10.2'),
-]
-
-sanity_check_paths = {
-    'files': [
-        'include/spirv_cross/spirv_cross.hpp',
-        'bin/spirv-cross',
-        'lib/libspirv-cross-core.a',
-    ],
-    'dirs': ['share/spirv_cross_core/cmake'],
-}
-
-moduleclass = 'devel'
diff --git a/Overlays/jureca_mi200_overlay/s/SPIRV-Headers/SPIRV-Headers-1.3.213-GCCcore-11.2.0.eb b/Overlays/jureca_mi200_overlay/s/SPIRV-Headers/SPIRV-Headers-1.3.213-GCCcore-11.2.0.eb
deleted file mode 100644
index 3f3700841..000000000
--- a/Overlays/jureca_mi200_overlay/s/SPIRV-Headers/SPIRV-Headers-1.3.213-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,32 +0,0 @@
-easyblock = 'CMakeNinja'
-
-name = 'SPIRV-Headers'
-version = '1.3.213'
-
-homepage = 'https://www.khronos.org/registry/SPIR-V/'
-description = """Machine-readable files for the SPIR-V Registry"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-github_account = 'KhronosGroup'
-
-source_urls = [GITHUB_SOURCE]
-sources = [{
-    'filename': SOURCELOWER_TAR_GZ,
-    # 'download_filename': 'sdk-%(version)s.tar.gz'
-    'download_filename': 'b765c355f488837ca4c77980ba69484f3ff277f5.tar.gz'
-}]
-checksums = ['aabcd80a10cd5004fd99f480c1b5d74d61a44caeed805f11a49843143b49d883']
-
-builddependencies = [
-    ('CMake', '3.21.1'),
-    ('Ninja', '1.10.2'),
-]
-
-local_spirv_versions = ['1.0', '1.1', '1.2']
-sanity_check_paths = {
-    'files': ['include/spirv/%s/spirv.h' % ver for ver in local_spirv_versions],
-    'dirs': ['share/cmake', 'share/pkgconfig'],
-}
-
-moduleclass = 'devel'
diff --git a/Overlays/jureca_mi200_overlay/s/SPIRV-Reflect/SPIRV-Reflect-1.3.213-GCCcore-11.2.0.eb b/Overlays/jureca_mi200_overlay/s/SPIRV-Reflect/SPIRV-Reflect-1.3.213-GCCcore-11.2.0.eb
deleted file mode 100644
index b280792f9..000000000
--- a/Overlays/jureca_mi200_overlay/s/SPIRV-Reflect/SPIRV-Reflect-1.3.213-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,49 +0,0 @@
-easyblock = 'CMakeNinja'
-
-name = 'SPIRV-Reflect'
-version = '1.3.213'
-
-homepage = 'https://www.khronos.org/registry/SPIR-V/'
-description = """SPIRV-Reflect is a lightweight library that provides a C/C++ reflection 
-                 API for SPIR-V shader bytecode in Vulkan applications"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-github_account = 'KhronosGroup'
-
-local_commit_hash = '0f142bbfe9bd7aeeae6b3c703bcaf837dba8df9d'
-source_urls = [GITHUB_SOURCE]
-sources = [{
-    'filename': SOURCELOWER_TAR_GZ,
-    # 'download_filename': 'sdk-%(version)s.tar.gz'
-    'download_filename': local_commit_hash + '.tar.gz'
-}]
-checksums = ['1799e94629a2370d0d8a7481e2a31cc23099269b661569a49ef045e6b1911870']
-
-builddependencies = [
-    ('CMake', '3.21.1'),
-    ('Ninja', '1.10.2'),
-]
-
-dependencies = [
-    ('SPIRV-Headers', version)
-]
-
-configopts = "-DSPIRV_REFLECT_STATIC_LIB=ON -DSPIRV_REFLECT_STRIPPER=ON"
-
-postinstallcmds = [
-    'mkdir %(installdir)s/include',
-    'cp %%(builddir)s/SPIRV-Reflect-%s/spirv_reflect.h %%(installdir)s/include' % local_commit_hash
-]
-
-
-sanity_check_paths = {
-    'files': [
-        'include/spirv_reflect.h',
-        'bin/spirv-reflect-pp',
-        'bin/spirv-reflect',
-        'lib/libspirv-reflect-static.a'],
-    'dirs': [],
-}
-
-moduleclass = 'devel'
diff --git a/Overlays/jureca_mi200_overlay/s/SPIRV-Tools/SPIRV-Tools-2022.2-GCCcore-11.2.0.eb b/Overlays/jureca_mi200_overlay/s/SPIRV-Tools/SPIRV-Tools-2022.2-GCCcore-11.2.0.eb
deleted file mode 100644
index a91bb01bb..000000000
--- a/Overlays/jureca_mi200_overlay/s/SPIRV-Tools/SPIRV-Tools-2022.2-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,51 +0,0 @@
-easyblock = 'CMakeNinja'
-
-name = 'SPIRV-Tools'
-version = '2022.2'
-
-homepage = 'https://www.khronos.org/registry/SPIR-V/'
-description = """The SPIR-V Tools project provides an API and commands for processing SPIR-V modules."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-github_account = 'KhronosGroup'
-
-source_urls = [GITHUB_SOURCE]
-sources = [{
-    'filename':          SOURCELOWER_TAR_GZ,
-    'download_filename': 'v%(version)s.tar.gz'
-}]
-patches = [
-    'https://github.com/KhronosGroup/SPIRV-Tools/commit/58dc37ea6af7ec09f32f7b13ff60071e3ba2bd24.patch',
-    'https://github.com/KhronosGroup/SPIRV-Tools/commit/9e377b0f974bd1f048e20dda1d52da900b3246cb.patch'
-]
-checksums = [
-    '909fc7e68049dca611ca2d57828883a86f503b0353ff78bc594eddc65eb882b9',
-    'c5836accfa2d0ff80214074c6efffeafe5c7f13ace3e64b9c4270a0ed4343591',
-    'f68f382108746c9a6dc0708f6898d7145c1998901d568bb48eeb1ae2758e0642'
-]
-
-builddependencies = [
-    ('CMake', '3.21.1'),
-    ('Ninja', '1.10.2'),
-]
-
-dependencies = [
-    ('SPIRV-Headers', '1.3.213')
-]
-
-configopts = "-DSPIRV-Headers_SOURCE_DIR=$EBROOTSPIRVMINHEADERS"
-
-local_programs = ['spirv-as', 'spirv-cfg', 'spirv-dis',
-                  'spirv-lesspipe.sh', 'spirv-link',
-                  'spirv-lint', 'spirv-opt',
-                  'spirv-reduce', 'spirv-val']
-sanity_check_paths = {
-    'files': ["bin/%s" % prog for prog in local_programs] +
-             ["lib/libSPIRV-Tools.a",
-              "lib/libSPIRV-Tools-shared.so",
-              "include/spirv-tools/libspirv.h"],
-    'dirs': ['lib/cmake'],
-}
-
-moduleclass = 'devel'
diff --git a/Overlays/jureca_mi200_overlay/s/source-highlight/source-highlight-3.1.9-GCCcore-11.2.0.eb b/Overlays/jureca_mi200_overlay/s/source-highlight/source-highlight-3.1.9-GCCcore-11.2.0.eb
deleted file mode 100644
index 909eee08b..000000000
--- a/Overlays/jureca_mi200_overlay/s/source-highlight/source-highlight-3.1.9-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,38 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'source-highlight'
-version = '3.1.9'
-
-homepage = 'https://www.gnu.org/software/src-highlite/'
-description = "This program, given a source file, produces a document with syntax highlighting"
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-toolchainopts = {'optarch': True, 'pic': True}
-
-source_urls = ['ftp://ftp.gnu.org/gnu/src-highlite/']
-sources = [SOURCELOWER_TAR_GZ]
-patches = ['source-highlight-gcc11.patch']
-checksums = [
-    '3a7fd28378cb5416f8de2c9e77196ec915145d44e30ff4e0ee8beb3fe6211c91',
-    '7dbbdb7a1363d650aee75337f1204761754d9ad82a7c873c3f8b3f0ba07e814d'
-]
-
-dependencies = [
-    ('Boost', '1.78.0'),
-]
-
-configopts = "--with-pic --with-boost=$EBROOTBOOST --with-boost-libdir=$EBROOTBOOST/lib64"
-
-local_binaries = ["check-regexp", "cpp2html", "java2html",
-                  "source-highlight", "source-highlight-esc.sh",
-                  "source-highlight-settings", "src-hilite-lesspipe.sh"]
-local_libs = ["libsource-highlight.a", "libsource-highlight.so"]
-sanity_check_paths = {
-    'files': ["bin/%s" % b for b in local_binaries] +
-             ["lib/libsource-highlight.a",
-              "lib/libsource-highlight.%s" % SHLIB_EXT] +
-             ["include/srchilite/sourcehighlight.h"],
-    'dirs': ["lib/pkgconfig"],
-}
-
-moduleclass = 'tools'
diff --git a/Overlays/jureca_mi200_overlay/s/source-highlight/source-highlight-gcc11.patch b/Overlays/jureca_mi200_overlay/s/source-highlight/source-highlight-gcc11.patch
deleted file mode 100644
index 1e5b0dd8d..000000000
--- a/Overlays/jureca_mi200_overlay/s/source-highlight/source-highlight-gcc11.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 904949c9026cb772dc93fbe0947a252ef47127f4 Mon Sep 17 00:00:00 2001
-From: Tom Tromey <tom@tromey.com>
-Date: Wed, 10 Jun 2020 20:38:27 -0600
-Subject: Remove "throw" specifications
-
-diff --git a/lib/srchilite/fileutil.cc b/lib/srchilite/fileutil.cc
-index 59a6d64..963178c 100644
---- a/lib/srchilite/fileutil.cc
-+++ b/lib/srchilite/fileutil.cc
-@@ -48,7 +48,7 @@ void set_file_util_verbose(bool b) {
- // FIXME avoid using a global variable
- std::string start_path;
- 
--string readFile(const string &fileName) throw (IOException) {
-+string readFile(const string &fileName) {
-     ifstream file(fileName.c_str());
- 
-     if (!file.is_open()) {
-diff --git a/lib/srchilite/fileutil.h b/lib/srchilite/fileutil.h
-index 7335a9b..042eb56 100644
---- a/lib/srchilite/fileutil.h
-+++ b/lib/srchilite/fileutil.h
-@@ -27,7 +27,7 @@ extern std::string start_path;
-  * @return the contents of the file
-  * @throw IOException
-  */
--string readFile(const string &fileName) throw (IOException);
-+string readFile(const string &fileName);
- 
- //char *read_file(const string &fileName);
- 
--- 
-cgit v1.2.1
-
diff --git a/Overlays/jureca_mi200_overlay/u/UCX-settings/UCX-settings-RC-ROCm.eb b/Overlays/jureca_mi200_overlay/u/UCX-settings/UCX-settings-RC-ROCm.eb
deleted file mode 100644
index 41161745b..000000000
--- a/Overlays/jureca_mi200_overlay/u/UCX-settings/UCX-settings-RC-ROCm.eb
+++ /dev/null
@@ -1,27 +0,0 @@
-easyblock = 'SystemBundle'
-
-name = 'UCX-settings'
-version = 'RC-ROCm'
-
-homepage = ''
-description = '''
-This module sets UCX to use RC as the transport layer, together with the ROCm-aware transports.
-The maximum number of rails is limited to 1 to avoid pitfalls of blindly using multiple rails.
-'''
-
-site_contacts = 'd.alvarez@fz-juelich.de'
-
-toolchain = SYSTEM
-
-source_urls = []
-
-sources = []
-modextravars = {
-    'UCX_TLS': 'rc_x,self,sm,rocm_copy,rocm_ipc',
-    # Since most users do not share HCAs for a single process, it does not make sense to enable this in most cases.
-    # It actually has the side effect of using Ethernet and IB ports on JUSUF, which end up saturating the ethernet
-    # fabric and result in a slow down
-    'UCX_MAX_RNDV_RAILS': '1',
-}
-
-moduleclass = 'system'
diff --git a/Overlays/jureca_mi200_overlay/u/UCX/UCX-1.11.2.eb b/Overlays/jureca_mi200_overlay/u/UCX/UCX-1.11.2.eb
deleted file mode 100644
index e1c087257..000000000
--- a/Overlays/jureca_mi200_overlay/u/UCX/UCX-1.11.2.eb
+++ /dev/null
@@ -1,79 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'UCX'
-version = '1.11.2'
-
-homepage = 'https://www.openucx.org/'
-description = """Unified Communication X
-An open-source production grade communication framework for data centric
-and high-performance applications
-"""
-
-toolchain = SYSTEM
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/openucx/ucx/releases/download/v%(version)s']
-sources = ['%(namelower)s-%(version)s.tar.gz']
-checksums = [
-    'deebf86a5344fc2bd9e55449f88c650c4514928592807c9bc6fe4190e516c6df',  # ucx-1.11.2.tar.gz
-]
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2'),
-]
-
-osdependencies = [OS_PKG_IBVERBS_DEV]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('numactl', '2.0.14'),
-]
-
-configopts = '--with-verbs '  # Build OpenFabrics support
-configopts += '--without-java '
-configopts += '--disable-doxygen-doc '
-
-# Enable machine-specific optimizations, default: NO
-configopts += '--enable-optimizations '
-# configopts += '--enable-tuning '       # Enable parameter tuning in run-time, default: NO
-# Enable thread support in UCP and UCT, default: NO
-configopts += '--enable-mt '
-configopts += '--disable-debug '
-configopts += '--disable-logging '
-configopts += '--disable-assertions '
-configopts += '--disable-params-check '
-configopts += '--disable-dependency-tracking '
-# configopts += '--with-cuda=$EBROOTCUDA '
-configopts += '--without-cuda '
-configopts += '--with-rocm=/opt/rocm '
-
-configopts += '--enable-cma '           # Enable Cross Memory Attach
-
-# Compile with IB Reliable Connection support
-configopts += '--with-rc '
-# Compile with IB Unreliable Datagram support
-configopts += '--with-ud '
-# Compile with IB Dynamic Connection support
-configopts += '--with-dc '
-configopts += '--with-mlx5-dv '         # Compile with mlx5 Direct Verbs support
-configopts += '--with-ib-hw-tm '        # Compile with IB Tag Matching support
-configopts += '--with-dm '              # Compile with Device Memory support
-
-configopts += '--with-avx '             # Compile with AVX
-# configopts += '--with-gdrcopy '         # Compile with GDRCopy
-
-# Compile without IB Connection Manager support
-configopts += '--without-cm '
-
-buildopts = 'V=1'
-
-sanity_check_paths = {
-    'files': ['bin/ucx_info', 'bin/ucx_perftest', 'bin/ucx_read_profile'],
-    'dirs': ['include', 'lib', 'share']
-}
-
-sanity_check_commands = ["ucx_info -d"]
-
-moduleclass = 'system'
diff --git a/Overlays/jureca_mi200_overlay/u/UCX/UCX-1.12.0.eb b/Overlays/jureca_mi200_overlay/u/UCX/UCX-1.12.0.eb
deleted file mode 100644
index 53adf3b63..000000000
--- a/Overlays/jureca_mi200_overlay/u/UCX/UCX-1.12.0.eb
+++ /dev/null
@@ -1,77 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'UCX'
-version = '1.12.0'
-
-homepage = 'https://www.openucx.org/'
-description = """Unified Communication X
-An open-source production grade communication framework for data centric
-and high-performance applications
-"""
-
-toolchain = SYSTEM
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/openucx/ucx/releases/download/v%(version)s']
-sources = ['%(namelower)s-%(version)s.tar.gz']
-checksums = ['93e994de2d1a4df32381ea92ba4c98a249010d1720eb0f6110dc72c9a7d25db6']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2'),
-]
-
-osdependencies = [OS_PKG_IBVERBS_DEV]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('numactl', '2.0.14'),
-]
-
-configopts = '--with-verbs '  # Build OpenFabrics support
-configopts += '--without-java '
-configopts += '--disable-doxygen-doc '
-
-# Enable machine-specific optimizations, default: NO
-configopts += '--enable-optimizations '
-# configopts += '--enable-tuning '       # Enable parameter tuning in run-time, default: NO
-# Enable thread support in UCP and UCT, default: NO
-configopts += '--enable-mt '
-configopts += '--disable-debug '
-configopts += '--disable-logging '
-configopts += '--disable-assertions '
-configopts += '--disable-params-check '
-configopts += '--disable-dependency-tracking '
-# configopts += '--with-cuda=$EBROOTCUDA '
-configopts += '--without-cuda '
-configopts += '--with-rocm=/opt/rocm '
-
-configopts += '--enable-cma '           # Enable Cross Memory Attach
-
-# Compile with IB Reliable Connection support
-configopts += '--with-rc '
-# Compile with IB Unreliable Datagram support
-configopts += '--with-ud '
-# Compile with IB Dynamic Connection support
-configopts += '--with-dc '
-configopts += '--with-mlx5-dv '         # Compile with mlx5 Direct Verbs support
-configopts += '--with-ib-hw-tm '        # Compile with IB Tag Matching support
-configopts += '--with-dm '              # Compile with Device Memory support
-
-configopts += '--with-avx '             # Compile with AVX
-# configopts += '--with-gdrcopy '         # Compile with GDRCopy
-
-# Compile without IB Connection Manager support
-configopts += '--without-cm '
-
-buildopts = 'V=1'
-
-sanity_check_paths = {
-    'files': ['bin/ucx_info', 'bin/ucx_perftest', 'bin/ucx_read_profile'],
-    'dirs': ['include', 'lib', 'share']
-}
-
-sanity_check_commands = ["ucx_info -d"]
-
-moduleclass = 'system'
diff --git a/Overlays/jureca_mi200_overlay/u/UCX/UCX-1.12.1.eb b/Overlays/jureca_mi200_overlay/u/UCX/UCX-1.12.1.eb
deleted file mode 100644
index b4f91db4c..000000000
--- a/Overlays/jureca_mi200_overlay/u/UCX/UCX-1.12.1.eb
+++ /dev/null
@@ -1,77 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'UCX'
-version = '1.12.1'
-
-homepage = 'https://www.openucx.org/'
-description = """Unified Communication X
-An open-source production grade communication framework for data centric
-and high-performance applications
-"""
-
-toolchain = SYSTEM
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/openucx/ucx/releases/download/v%(version)s']
-sources = ['%(namelower)s-%(version)s.tar.gz']
-checksums = ['40b447c8e7da94a253f2828001b2d76021eb4ad39647107d433d62d61e18ae8e']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2'),
-]
-
-osdependencies = [OS_PKG_IBVERBS_DEV]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('numactl', '2.0.14'),
-]
-
-configopts = '--with-verbs '  # Build OpenFabrics support
-configopts += '--without-java '
-configopts += '--disable-doxygen-doc '
-
-# Enable machine-specific optimizations, default: NO
-configopts += '--enable-optimizations '
-# configopts += '--enable-tuning '       # Enable parameter tuning in run-time, default: NO
-# Enable thread support in UCP and UCT, default: NO
-configopts += '--enable-mt '
-configopts += '--disable-debug '
-configopts += '--disable-logging '
-configopts += '--disable-assertions '
-configopts += '--disable-params-check '
-configopts += '--disable-dependency-tracking '
-# configopts += '--with-cuda=$EBROOTCUDA '
-configopts += '--without-cuda '
-configopts += '--with-rocm=/opt/rocm '
-
-configopts += '--enable-cma '           # Enable Cross Memory Attach
-
-# Compile with IB Reliable Connection support
-configopts += '--with-rc '
-# Compile with IB Unreliable Datagram support
-configopts += '--with-ud '
-# Compile with IB Dynamic Connection support
-configopts += '--with-dc '
-configopts += '--with-mlx5-dv '         # Compile with mlx5 Direct Verbs support
-configopts += '--with-ib-hw-tm '        # Compile with IB Tag Matching support
-configopts += '--with-dm '              # Compile with Device Memory support
-
-configopts += '--with-avx '             # Compile with AVX
-# configopts += '--with-gdrcopy '         # Compile with GDRCopy
-
-# Compile without IB Connection Manager support
-configopts += '--without-cm '
-
-buildopts = 'V=1'
-
-sanity_check_paths = {
-    'files': ['bin/ucx_info', 'bin/ucx_perftest', 'bin/ucx_read_profile'],
-    'dirs': ['include', 'lib', 'share']
-}
-
-sanity_check_commands = ["ucx_info -d"]
-
-moduleclass = 'system'
diff --git a/Overlays/jureca_mi200_overlay/u/UCX/UCX-1.13.0-5879c44.eb b/Overlays/jureca_mi200_overlay/u/UCX/UCX-1.13.0-5879c44.eb
deleted file mode 100644
index 61d6a608d..000000000
--- a/Overlays/jureca_mi200_overlay/u/UCX/UCX-1.13.0-5879c44.eb
+++ /dev/null
@@ -1,92 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'UCX'
-version = '1.13.0'
-local_commit = '5879c44'
-versionsuffix = '-%s' % local_commit
-
-homepage = 'https://www.openucx.org/'
-description = """Unified Communication X
-An open-source production grade communication framework for data centric
-and high-performance applications
-"""
-
-toolchain = SYSTEM
-toolchainopts = {'pic': True}
-
-# source_urls = ['https://github.com/openucx/ucx/releases/download/v%(version)s']
-# sources = ['%(namelower)s-%(version)s.tar.gz']
-github_account = 'openucx'
-sources = [{
-    'filename': '%(namelower)s-%(version)s%(versionsuffix)s.tar.gz',
-    'git_config': {
-        'url': 'https://github.com/%(github_account)s',
-        'repo_name': 'ucx',
-        'commit': local_commit,
-        'keep_git_dir': True,
-    },
-}]
-checksums = ['5ed778899f916a643239ae7f66c732dd8b0f38cc340621a78048ae64084a1928']
-# checksums = [None]
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2'),
-]
-
-osdependencies = [OS_PKG_IBVERBS_DEV]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('numactl', '2.0.14'),
-]
-
-preconfigopts = "./autogen.sh && "
-
-configopts = '--with-verbs '  # Build OpenFabrics support
-configopts += '--without-java '
-configopts += '--disable-doxygen-doc '
-
-# Enable machine-specific optimizations, default: NO
-configopts += '--enable-optimizations '
-# configopts += '--enable-tuning '       # Enable parameter tuning in run-time, default: NO
-# Enable thread support in UCP and UCT, default: NO
-configopts += '--enable-mt '
-configopts += '--disable-debug '
-configopts += '--disable-logging '
-configopts += '--disable-assertions '
-configopts += '--disable-params-check '
-configopts += '--disable-dependency-tracking '
-# configopts += '--with-cuda=$EBROOTCUDA '
-configopts += '--without-cuda '
-configopts += '--with-rocm=/opt/rocm '
-
-configopts += '--enable-cma '           # Enable Cross Memory Attach
-
-# Compile with IB Reliable Connection support
-configopts += '--with-rc '
-# Compile with IB Unreliable Datagram support
-configopts += '--with-ud '
-# Compile with IB Dynamic Connection support
-configopts += '--with-dc '
-configopts += '--with-mlx5-dv '         # Compile with mlx5 Direct Verbs support
-configopts += '--with-ib-hw-tm '        # Compile with IB Tag Matching support
-configopts += '--with-dm '              # Compile with Device Memory support
-
-configopts += '--with-avx '             # Compile with AVX
-# configopts += '--with-gdrcopy '         # Compile with GDRCopy
-
-# Compile without IB Connection Manager support
-configopts += '--without-cm '
-
-buildopts = 'V=1'
-
-sanity_check_paths = {
-    'files': ['bin/ucx_info', 'bin/ucx_perftest', 'bin/ucx_read_profile'],
-    'dirs': ['include', 'lib', 'share']
-}
-
-sanity_check_commands = ["ucx_info -d"]
-
-moduleclass = 'system'
diff --git a/Overlays/jureca_mi200_overlay/u/UCX/UCX-1.13.0.eb b/Overlays/jureca_mi200_overlay/u/UCX/UCX-1.13.0.eb
deleted file mode 100644
index 2fef862d5..000000000
--- a/Overlays/jureca_mi200_overlay/u/UCX/UCX-1.13.0.eb
+++ /dev/null
@@ -1,77 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'UCX'
-version = '1.13.0'
-
-homepage = 'https://www.openucx.org/'
-description = """Unified Communication X
-An open-source production grade communication framework for data centric
-and high-performance applications
-"""
-
-toolchain = SYSTEM
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/openucx/ucx/releases/download/v%(version)s']
-sources = ['%(namelower)s-%(version)s.tar.gz']
-checksums = ['8a3881f21fe2788113789f5bae1c8174e931f7542de0a934322a96ef354e5e3d']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2'),
-]
-
-osdependencies = [OS_PKG_IBVERBS_DEV]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('numactl', '2.0.14'),
-]
-
-configopts = '--with-verbs '  # Build OpenFabrics support
-configopts += '--without-java '
-configopts += '--disable-doxygen-doc '
-
-# Enable machine-specific optimizations, default: NO
-configopts += '--enable-optimizations '
-# configopts += '--enable-tuning '       # Enable parameter tuning in run-time, default: NO
-# Enable thread support in UCP and UCT, default: NO
-configopts += '--enable-mt '
-configopts += '--disable-debug '
-configopts += '--disable-logging '
-configopts += '--disable-assertions '
-configopts += '--disable-params-check '
-configopts += '--disable-dependency-tracking '
-# configopts += '--with-cuda=$EBROOTCUDA '
-configopts += '--without-cuda '
-configopts += '--with-rocm=/opt/rocm '
-
-configopts += '--enable-cma '           # Enable Cross Memory Attach
-
-# Compile with IB Reliable Connection support
-configopts += '--with-rc '
-# Compile with IB Unreliable Datagram support
-configopts += '--with-ud '
-# Compile with IB Dynamic Connection support
-configopts += '--with-dc '
-configopts += '--with-mlx5-dv '         # Compile with mlx5 Direct Verbs support
-configopts += '--with-ib-hw-tm '        # Compile with IB Tag Matching support
-configopts += '--with-dm '              # Compile with Device Memory support
-
-configopts += '--with-avx '             # Compile with AVX
-# configopts += '--with-gdrcopy '         # Compile with GDRCopy
-
-# Compile without IB Connection Manager support
-configopts += '--without-cm '
-
-buildopts = 'V=1'
-
-sanity_check_paths = {
-    'files': ['bin/ucx_info', 'bin/ucx_perftest', 'bin/ucx_read_profile'],
-    'dirs': ['include', 'lib', 'share']
-}
-
-sanity_check_commands = ["ucx_info -d"]
-
-moduleclass = 'system'
diff --git a/Overlays/jureca_mi200_overlay/u/UCX/UCX-default.eb b/Overlays/jureca_mi200_overlay/u/UCX/UCX-default.eb
deleted file mode 100644
index 900677997..000000000
--- a/Overlays/jureca_mi200_overlay/u/UCX/UCX-default.eb
+++ /dev/null
@@ -1,79 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'UCX'
-version = 'default'
-local_realversion = '1.12.1'
-
-homepage = 'https://www.openucx.org/'
-description = """Unified Communication X
-An open-source production grade communication framework for data centric
-and high-performance applications
-"""
-
-toolchain = SYSTEM
-toolchainopts = {'pic': True}
-
-source_urls = [
-    f'https://github.com/openucx/ucx/releases/download/v{local_realversion}']
-sources = ['%%(namelower)s-%s.tar.gz' % local_realversion]
-checksums = ['40b447c8e7da94a253f2828001b2d76021eb4ad39647107d433d62d61e18ae8e']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2'),
-]
-
-osdependencies = [OS_PKG_IBVERBS_DEV]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('numactl', '2.0.14'),
-]
-
-configopts = '--with-verbs '  # Build OpenFabrics support
-configopts += '--without-java '
-configopts += '--disable-doxygen-doc '
-
-# Enable machine-specific optimizations, default: NO
-configopts += '--enable-optimizations '
-# configopts += '--enable-tuning '       # Enable parameter tuning in run-time, default: NO
-# Enable thread support in UCP and UCT, default: NO
-configopts += '--enable-mt '
-configopts += '--disable-debug '
-configopts += '--disable-logging '
-configopts += '--disable-assertions '
-configopts += '--disable-params-check '
-configopts += '--disable-dependency-tracking '
-# configopts += '--with-cuda=$EBROOTCUDA '
-configopts += '--without-cuda '
-configopts += '--with-rocm=/opt/rocm '
-
-configopts += '--enable-cma '           # Enable Cross Memory Attach
-
-# Compile with IB Reliable Connection support
-configopts += '--with-rc '
-# Compile with IB Unreliable Datagram support
-configopts += '--with-ud '
-# Compile with IB Dynamic Connection support
-configopts += '--with-dc '
-configopts += '--with-mlx5-dv '         # Compile with mlx5 Direct Verbs support
-configopts += '--with-ib-hw-tm '        # Compile with IB Tag Matching support
-configopts += '--with-dm '              # Compile with Device Memory support
-
-configopts += '--with-avx '             # Compile with AVX
-# configopts += '--with-gdrcopy '         # Compile with GDRCopy
-
-# Compile without IB Connection Manager support
-configopts += '--without-cm '
-
-buildopts = 'V=1'
-
-sanity_check_paths = {
-    'files': ['bin/ucx_info', 'bin/ucx_perftest', 'bin/ucx_read_profile'],
-    'dirs': ['include', 'lib', 'share']
-}
-
-sanity_check_commands = ["ucx_info -d"]
-
-moduleclass = 'system'
diff --git a/Overlays/jureca_mi200_overlay/v/Vulkan-Headers/Vulkan-Headers-1.3.213-GCCcore-11.2.0.eb b/Overlays/jureca_mi200_overlay/v/Vulkan-Headers/Vulkan-Headers-1.3.213-GCCcore-11.2.0.eb
deleted file mode 100644
index fdfe1b512..000000000
--- a/Overlays/jureca_mi200_overlay/v/Vulkan-Headers/Vulkan-Headers-1.3.213-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,30 +0,0 @@
-easyblock = 'CMakeNinja'
-
-name = 'Vulkan-Headers'
-version = '1.3.213'
-
-homepage = 'https://www.vulkan.org/'
-description = """Vulkan header files and API registry"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-github_account = 'KhronosGroup'
-
-source_urls = [GITHUB_SOURCE]
-sources = [{
-    'filename':          SOURCELOWER_TAR_GZ,
-    'download_filename': 'v%(version)s.tar.gz'
-}]
-checksums = ['7f4a6118dc3524703c1ce0a44089379e89eeb930fbe28188b90fdac1f10ef676']
-
-builddependencies = [
-    ('CMake', '3.21.1'),
-    ('Ninja', '1.10.2'),
-]
-
-sanity_check_paths = {
-    'files': ['include/vulkan/vulkan.h'],
-    'dirs': [],
-}
-
-moduleclass = 'devel'
diff --git a/Overlays/jureca_mi200_overlay/v/Vulkan-Loader/Vulkan-Loader-1.3.213-GCCcore-11.2.0.eb b/Overlays/jureca_mi200_overlay/v/Vulkan-Loader/Vulkan-Loader-1.3.213-GCCcore-11.2.0.eb
deleted file mode 100644
index f7c702d3a..000000000
--- a/Overlays/jureca_mi200_overlay/v/Vulkan-Loader/Vulkan-Loader-1.3.213-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,37 +0,0 @@
-easyblock = 'CMakeNinja'
-
-name = 'Vulkan-Loader'
-version = '1.3.213'
-
-homepage = 'https://www.vulkan.org/'
-description = """Provides the Khronos official Vulkan ICD desktop loader for Windows, Linux, and MacOS"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-github_account = 'KhronosGroup'
-
-source_urls = [GITHUB_SOURCE]
-sources = [{
-    'filename':          SOURCELOWER_TAR_GZ,
-    'download_filename': 'v%(version)s.tar.gz'
-}]
-checksums = ['3cacac2a39026ce74ff96d2bf5d2c85f2729218182cf0be07ae62f58a5301a39']
-
-builddependencies = [
-    ('CMake', '3.21.1'),
-    ('Ninja', '1.10.2'),
-]
-
-dependencies = [
-    ('Vulkan-Headers', version),
-    ('X11', '20210802'),
-]
-
-configopts = '-DBUILD_WSI_WAYLAND_SUPPORT=OFF'
-
-sanity_check_paths = {
-    'files': ['lib/libvulkan.so'],
-    'dirs': ['lib/pkgconfig'],
-}
-
-moduleclass = 'devel'
diff --git a/Overlays/jureca_mi200_overlay/v/Vulkan-Tools/Vulkan-Tools-1.3.213-GCCcore-11.2.0.eb b/Overlays/jureca_mi200_overlay/v/Vulkan-Tools/Vulkan-Tools-1.3.213-GCCcore-11.2.0.eb
deleted file mode 100644
index b21e7b632..000000000
--- a/Overlays/jureca_mi200_overlay/v/Vulkan-Tools/Vulkan-Tools-1.3.213-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,38 +0,0 @@
-easyblock = 'CMakeNinja'
-
-name = 'Vulkan-Tools'
-version = '1.3.213'
-
-homepage = 'https://www.vulkan.org/'
-description = """Provides Khronos official Vulkan Tools and Utilities"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-github_account = 'KhronosGroup'
-
-source_urls = [GITHUB_SOURCE]
-sources = [{
-    'filename':          SOURCELOWER_TAR_GZ,
-    'download_filename': 'v%(version)s.tar.gz'
-}]
-checksums = ['2b20b9c8cefe26f8d7df5f6b270c6a6d4dcf5fe0995f779abac2f0fa658c5798']
-
-builddependencies = [
-    ('CMake', '3.21.1'),
-    ('Ninja', '1.10.2'),
-]
-
-dependencies = [
-    ('Vulkan-Headers', version),
-    ('Vulkan-Loader', version),
-    ('X11', '20210802'),
-]
-
-configopts = '-DBUILD_WSI_WAYLAND_SUPPORT=OFF'
-
-sanity_check_paths = {
-    'files': ['bin/%s' % f for f in ['vkcube', 'vkcubepp', 'vulkaninfo']],
-    'dirs': [],
-}
-
-moduleclass = 'devel'
diff --git a/Overlays/jureca_mi200_overlay/v/Vulkan-ValidationLayers/Vulkan-ValidationLayers-1.3.213-GCCcore-11.2.0.eb b/Overlays/jureca_mi200_overlay/v/Vulkan-ValidationLayers/Vulkan-ValidationLayers-1.3.213-GCCcore-11.2.0.eb
deleted file mode 100644
index e7e1cdf00..000000000
--- a/Overlays/jureca_mi200_overlay/v/Vulkan-ValidationLayers/Vulkan-ValidationLayers-1.3.213-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,45 +0,0 @@
-easyblock = 'CMakeNinja'
-
-name = 'Vulkan-ValidationLayers'
-version = '1.3.213'
-
-homepage = 'https://www.vulkan.org/'
-description = """Provides the Khronos official Vulkan validation layers"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-github_account = 'KhronosGroup'
-
-source_urls = [GITHUB_SOURCE]
-sources = [{
-    'filename':          SOURCELOWER_TAR_GZ,
-    'download_filename': 'v%(version)s.tar.gz'
-}]
-checksums = ['26199bde8d7c499867d2fde95aea139815d30fd8a3548d95ebd401224a8ce02c']
-
-builddependencies = [
-    ('CMake', '3.21.1'),
-    ('Ninja', '1.10.2'),
-]
-
-dependencies = [
-    ('Vulkan-Headers', version),
-    ('robin-hood-hashing', '3.11.5'),
-    ('SPIRV-Tools', '2022.2'),
-    ('X11', '20210802'),
-]
-
-configopts = '-DBUILD_WSI_WAYLAND_SUPPORT=OFF'
-
-modextrapaths = {
-    "VK_LAYER_PATH": ['share/vulkan/explicit_layer.d/']
-}
-
-sanity_check_paths = {
-    'files': ['share/vulkan/explicit_layer.d/VkLayer_khronos_validation.json',
-              'lib/libVkLayer_khronos_validation.so',
-              'lib/libVkLayer_utils.a'],
-    'dirs': [],
-}
-
-moduleclass = 'devel'
diff --git a/Overlays/jurecabooster_overlay/g/GCC/GCC-11.2.0.eb b/Overlays/jurecabooster_overlay/g/GCC/GCC-11.2.0.eb
deleted file mode 100644
index 909766b96..000000000
--- a/Overlays/jurecabooster_overlay/g/GCC/GCC-11.2.0.eb
+++ /dev/null
@@ -1,25 +0,0 @@
-easyblock = 'Bundle'
-
-name = 'GCC'
-version = '11.2.0'
-
-homepage = 'https://gcc.gnu.org/'
-description = """The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran, Java, and Ada,
-as well as libraries for these languages (libstdc++, libgcj,...).
-"""
-
-site_contacts = 'Damian Alvarez <d.alvarez@fz-juelich.de>'
-
-toolchain = SYSTEM
-
-dependencies = [
-    ('GCCcore', version),
-    # binutils built on top of GCCcore, which was built on top of (dummy-built) binutils
-    ('binutils', '2.37', '', ('GCCcore', version)),
-]
-
-altroot = 'GCCcore'
-altversion = 'GCCcore'
-
-# this bundle serves as a compiler-only toolchain, so it should be marked as compiler (important for HMNS)
-moduleclass = 'compiler'
diff --git a/Overlays/jurecabooster_overlay/g/GCCcore/GCCcore-11.2.0.eb b/Overlays/jurecabooster_overlay/g/GCCcore/GCCcore-11.2.0.eb
deleted file mode 100644
index bc21042bc..000000000
--- a/Overlays/jurecabooster_overlay/g/GCCcore/GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,73 +0,0 @@
-easyblock = 'EB_GCC'
-
-name = 'GCCcore'
-version = '11.2.0'
-
-homepage = 'https://gcc.gnu.org/'
-description = """The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran, Java, and Ada,
-as well as libraries for these languages (libstdc++, libgcj,...).
-"""
-
-site_contacts = 'Damian Alvarez <d.alvarez@fz-juelich.de>'
-
-toolchain = SYSTEM
-
-source_urls = [
-    # GCC auto-resolving HTTP mirror
-    'https://ftpmirror.gnu.org/gnu/gcc/gcc-%(version)s',
-    'https://ftpmirror.gnu.org/gnu/gmp',  # idem for GMP
-    'https://ftpmirror.gnu.org/gnu/mpfr',  # idem for MPFR
-    'https://ftpmirror.gnu.org/gnu/mpc',  # idem for MPC
-    'ftp://gcc.gnu.org/pub/gcc/infrastructure/',  # GCC dependencies
-    'http://gcc.cybermirror.org/infrastructure/',  # HTTP mirror for GCC dependencies
-    'http://isl.gforge.inria.fr/',  # original HTTP source for ISL
-    'https://sourceware.org/pub/newlib/',  # for newlib
-    'https://github.com/MentorEmbedded/nvptx-tools/archive',  # for nvptx-tools
-]
-sources = [
-    'gcc-%(version)s.tar.gz',
-    'gmp-6.2.1.tar.bz2',
-    'mpfr-4.1.0.tar.bz2',
-    'mpc-1.2.1.tar.gz',
-    'isl-0.24.tar.bz2',
-    'newlib-4.1.0.tar.gz',
-    {'download_filename': 'd0524fb.tar.gz',
-        'filename': 'nvptx-tools-20210115.tar.gz'},
-]
-patches = [
-    'GCCcore-6.2.0-fix-find-isl.patch',
-    'GCCcore-9.3.0_gmp-c99.patch',
-]
-checksums = [
-    'f0837f1bf8244a5cc23bd96ff6366712a791cfae01df8e25b137698aca26efc1',  # gcc-11.2.0.tar.gz
-    'eae9326beb4158c386e39a356818031bd28f3124cf915f8c5b1dc4c7a36b4d7c',  # gmp-6.2.1.tar.bz2
-    'feced2d430dd5a97805fa289fed3fc8ff2b094c02d05287fd6133e7f1f0ec926',  # mpfr-4.1.0.tar.bz2
-    '17503d2c395dfcf106b622dc142683c1199431d095367c6aacba6eec30340459',  # mpc-1.2.1.tar.gz
-    'fcf78dd9656c10eb8cf9fbd5f59a0b6b01386205fe1934b3b287a0a1898145c0',  # isl-0.24.tar.bz2
-    'f296e372f51324224d387cc116dc37a6bd397198756746f93a2b02e9a5d40154',  # newlib-4.1.0.tar.gz
-    # nvptx-tools-20210115.tar.gz
-    '466abe1cef9cf294318ecb3c221593356f7a9e1674be987d576bc70d833d84a2',
-    # GCCcore-6.2.0-fix-find-isl.patch
-    '5ad909606d17d851c6ad629b4fddb6c1621844218b8d139fed18c502a7696c68',
-    # GCCcore-9.3.0_gmp-c99.patch
-    '0e135e1cc7cec701beea9d7d17a61bab34cfd496b4b555930016b98db99f922e',
-]
-
-builddependencies = [
-    ('M4', '1.4.19'),
-    ('binutils', '2.37'),
-]
-
-languages = ['c', 'c++', 'fortran']
-
-withisl = True
-withnvptx = False
-
-# Perl is only required when building with NVPTX support
-if withnvptx:
-    osdependencies = ['perl']
-
-# Make sure we replace the system cc with gcc with an alias
-modaliases = {'cc': 'gcc'}
-
-moduleclass = 'compiler'
diff --git a/Overlays/jurecabooster_overlay/h/Hypre/Hypre-2.23.0-gpsmkl-2021b-mixedint.eb b/Overlays/jurecabooster_overlay/h/Hypre/Hypre-2.23.0-gpsmkl-2021b-mixedint.eb
deleted file mode 100644
index 5b473d269..000000000
--- a/Overlays/jurecabooster_overlay/h/Hypre/Hypre-2.23.0-gpsmkl-2021b-mixedint.eb
+++ /dev/null
@@ -1,55 +0,0 @@
-name = "Hypre"
-version = "2.23.0"
-versionsuffix = "-mixedint"
-
-homepage = "https://computation.llnl.gov/casc/linear_solvers/sls_hypre.html"
-description = """Hypre is a library for solving large, sparse linear 
-systems of equations on massively parallel computers.
-The problems of interest arise in the simulation codes being developed 
-at LLNL and elsewhere to study physical phenomena in the defense, 
-environmental, energy, and biological sciences.
-"""
-
-examples = """Examples can be found in $EBROOTHYPRE/examples."""
-
-usage = """
-Hypre uses LAPACK, programs using Hypre can be linked with
--L$HYPRE_LIB -lHYPRE -lm -lmkl_gf_lp64 -lmkl_gnu_thread -lmkl_core -lgomp -lpthread
-"""
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-
-toolchainopts = {'pic': True, 'usempi': True, 'openmp': True}
-
-source_urls = ["https://github.com/hypre-space/hypre/archive/"]
-sources = ['v%(version)s.tar.gz']
-patches = ["hypre-%(version)s_examples_mkl.patch"]
-checksums = [
-    '8a9f9fb6f65531b77e4c319bf35bfc9d34bf529c36afe08837f56b635ac052e2',  # v2.23.0.tar.gz
-    '20d6e0652173b305970e2870ae04de7f3505d131deccf2f5d40b11eae72da886',  # hypre-2.23.0_examples_mkl.patch
-]
-
-start_dir = 'src'
-
-configopts = '--with-openmp '
-configopts += 'enable-mixedint '
-
-withcuda = False
-
-postinstallcmds = [
-    "cp -r %(builddir)s/hypre-%(version)s/src/examples %(installdir)s/examples",
-    "mv %(installdir)s/examples/Makefile_gnu %(installdir)s/examples/Makefile",
-    "rm %(installdir)s/examples/Makefile*orig",
-    "rm %(installdir)s/examples/Makefile_*",
-    "cp %(builddir)s/hypre-%(version)s/src/HYPRE_config.h %(installdir)s/include",
-    "chmod 755 %(installdir)s/examples/vis",
-    "chmod 755 %(installdir)s/examples/docs",
-]
-
-modextravars = {
-    'HYPRE_ROOT': '%(installdir)s',
-    'HYPRE_LIB': '%(installdir)s/lib',
-    'HYPRE_INCLUDE': '%(installdir)s/include/'
-}
-
-moduleclass = 'numlib'
diff --git a/Overlays/jurecabooster_overlay/h/Hypre/Hypre-2.23.0-gpsmkl-2021b.eb b/Overlays/jurecabooster_overlay/h/Hypre/Hypre-2.23.0-gpsmkl-2021b.eb
deleted file mode 100644
index e775483f8..000000000
--- a/Overlays/jurecabooster_overlay/h/Hypre/Hypre-2.23.0-gpsmkl-2021b.eb
+++ /dev/null
@@ -1,53 +0,0 @@
-name = "Hypre"
-version = "2.23.0"
-
-homepage = "https://computation.llnl.gov/casc/linear_solvers/sls_hypre.html"
-description = """Hypre is a library for solving large, sparse linear 
-systems of equations on massively parallel computers.
-The problems of interest arise in the simulation codes being developed 
-at LLNL and elsewhere to study physical phenomena in the defense, 
-environmental, energy, and biological sciences.
-"""
-
-examples = """Examples can be found in $EBROOTHYPRE/examples."""
-
-usage = """
-Hypre uses LAPACK, programs using Hypre can be linked with
--L$HYPRE_LIB -lHYPRE -lm -lmkl_gf_lp64 -lmkl_gnu_thread -lmkl_core -lgomp -lpthread
-"""
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-
-toolchainopts = {'pic': True, 'usempi': True, 'openmp': True}
-
-source_urls = ["https://github.com/hypre-space/hypre/archive/"]
-sources = ['v%(version)s.tar.gz']
-patches = ["hypre-%(version)s_examples_mkl.patch"]
-checksums = [
-    '8a9f9fb6f65531b77e4c319bf35bfc9d34bf529c36afe08837f56b635ac052e2',  # v2.23.0.tar.gz
-    '20d6e0652173b305970e2870ae04de7f3505d131deccf2f5d40b11eae72da886',  # hypre-2.23.0_examples_mkl.patch
-]
-
-start_dir = 'src'
-
-configopts = '--with-openmp '
-
-withcuda = False
-
-postinstallcmds = [
-    "cp -r %(builddir)s/hypre-%(version)s/src/examples %(installdir)s/examples",
-    "mv %(installdir)s/examples/Makefile_gnu %(installdir)s/examples/Makefile",
-    "rm %(installdir)s/examples/Makefile*orig",
-    "rm %(installdir)s/examples/Makefile_*",
-    "cp %(builddir)s/hypre-%(version)s/src/HYPRE_config.h %(installdir)s/include",
-    "chmod 755 %(installdir)s/examples/vis",
-    "chmod 755 %(installdir)s/examples/docs",
-]
-
-modextravars = {
-    'HYPRE_ROOT': '%(installdir)s',
-    'HYPRE_LIB': '%(installdir)s/lib',
-    'HYPRE_INCLUDE': '%(installdir)s/include/'
-}
-
-moduleclass = 'numlib'
diff --git a/Overlays/jurecabooster_overlay/h/Hypre/Hypre-2.23.0-intel-2021b-mixedint.eb b/Overlays/jurecabooster_overlay/h/Hypre/Hypre-2.23.0-intel-2021b-mixedint.eb
deleted file mode 100644
index 04bd058bf..000000000
--- a/Overlays/jurecabooster_overlay/h/Hypre/Hypre-2.23.0-intel-2021b-mixedint.eb
+++ /dev/null
@@ -1,52 +0,0 @@
-name = "Hypre"
-version = "2.23.0"
-versionsuffix = "-mixedint"
-
-homepage = "https://computation.llnl.gov/casc/linear_solvers/sls_hypre.html"
-description = """Hypre is a library for solving large, sparse linear 
-systems of equations on massively parallel computers.
-The problems of interest arise in the simulation codes being developed 
-at LLNL and elsewhere to study physical phenomena in the defense, 
-environmental, energy, and biological sciences.
-"""
-
-examples = """Examples can be found in $EBROOTHYPRE/examples."""
-
-usage = """
-Hypre uses LAPACK, programs using Hypre can be linked with
--L$HYPRE_LIB -lHYPRE -lm -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lpthread
-"""
-
-toolchain = {'name': 'intel', 'version': '2021b'}
-
-toolchainopts = {'pic': True, 'usempi': True, 'openmp': True}
-
-source_urls = ["https://github.com/hypre-space/hypre/archive/"]
-sources = ['v%(version)s.tar.gz']
-patches = ["hypre-%(version)s_examples_mkl.patch"]
-checksums = [
-    '8a9f9fb6f65531b77e4c319bf35bfc9d34bf529c36afe08837f56b635ac052e2',  # v2.23.0.tar.gz
-    '20d6e0652173b305970e2870ae04de7f3505d131deccf2f5d40b11eae72da886',  # hypre-2.23.0_examples_mkl.patch
-]
-
-start_dir = 'src'
-
-configopts = '--with-openmp '
-configopts += 'enable-mixedint '
-
-postinstallcmds = [
-    "cp -r %(builddir)s/hypre-%(version)s/src/examples %(installdir)s/examples",
-    "rm %(installdir)s/examples/Makefile_gnu*",
-    "rm %(installdir)s/examples/Makefile*orig",
-    "cp %(builddir)s/hypre-%(version)s/src/HYPRE_config.h %(installdir)s/include",
-    "chmod 755 %(installdir)s/examples/vis",
-    "chmod 755 %(installdir)s/examples/docs",
-]
-
-modextravars = {
-    'HYPRE_ROOT': '%(installdir)s',
-    'HYPRE_LIB': '%(installdir)s/lib',
-    'HYPRE_INCLUDE': '%(installdir)s/include/'
-}
-
-moduleclass = 'numlib'
diff --git a/Overlays/jurecabooster_overlay/h/Hypre/Hypre-2.23.0-intel-2021b.eb b/Overlays/jurecabooster_overlay/h/Hypre/Hypre-2.23.0-intel-2021b.eb
deleted file mode 100644
index 91bfca366..000000000
--- a/Overlays/jurecabooster_overlay/h/Hypre/Hypre-2.23.0-intel-2021b.eb
+++ /dev/null
@@ -1,50 +0,0 @@
-name = "Hypre"
-version = "2.23.0"
-
-homepage = "https://computation.llnl.gov/casc/linear_solvers/sls_hypre.html"
-description = """Hypre is a library for solving large, sparse linear 
-systems of equations on massively parallel computers.
-The problems of interest arise in the simulation codes being developed 
-at LLNL and elsewhere to study physical phenomena in the defense, 
-environmental, energy, and biological sciences.
-"""
-
-examples = """Examples can be found in $EBROOTHYPRE/examples."""
-
-usage = """
-Hypre uses LAPACK, programs using Hypre can be linked with
--L$HYPRE_LIB -lHYPRE -lm -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lpthread
-"""
-
-toolchain = {'name': 'intel', 'version': '2021b'}
-
-toolchainopts = {'pic': True, 'usempi': True, 'openmp': True}
-
-source_urls = ["https://github.com/hypre-space/hypre/archive/"]
-sources = ['v%(version)s.tar.gz']
-patches = ["hypre-%(version)s_examples_mkl.patch"]
-checksums = [
-    '8a9f9fb6f65531b77e4c319bf35bfc9d34bf529c36afe08837f56b635ac052e2',  # v2.23.0.tar.gz
-    '20d6e0652173b305970e2870ae04de7f3505d131deccf2f5d40b11eae72da886',  # hypre-2.23.0_examples_mkl.patch
-]
-
-start_dir = 'src'
-
-configopts = '--with-openmp '
-
-postinstallcmds = [
-    "cp -r %(builddir)s/hypre-%(version)s/src/examples %(installdir)s/examples",
-    "rm %(installdir)s/examples/Makefile_gnu*",
-    "rm %(installdir)s/examples/Makefile*orig",
-    "cp %(builddir)s/hypre-%(version)s/src/HYPRE_config.h %(installdir)s/include",
-    "chmod 755 %(installdir)s/examples/vis",
-    "chmod 755 %(installdir)s/examples/docs",
-]
-
-modextravars = {
-    'HYPRE_ROOT': '%(installdir)s',
-    'HYPRE_LIB': '%(installdir)s/lib',
-    'HYPRE_INCLUDE': '%(installdir)s/include/'
-}
-
-moduleclass = 'numlib'
diff --git a/Overlays/jurecabooster_overlay/h/Hypre/Hypre-2.23.0-intel-para-2021b-mixedint.eb b/Overlays/jurecabooster_overlay/h/Hypre/Hypre-2.23.0-intel-para-2021b-mixedint.eb
deleted file mode 100644
index b7913a21b..000000000
--- a/Overlays/jurecabooster_overlay/h/Hypre/Hypre-2.23.0-intel-para-2021b-mixedint.eb
+++ /dev/null
@@ -1,52 +0,0 @@
-name = "Hypre"
-version = "2.23.0"
-versionsuffix = "-mixedint"
-
-homepage = "https://computation.llnl.gov/casc/linear_solvers/sls_hypre.html"
-description = """Hypre is a library for solving large, sparse linear 
-systems of equations on massively parallel computers.
-The problems of interest arise in the simulation codes being developed 
-at LLNL and elsewhere to study physical phenomena in the defense, 
-environmental, energy, and biological sciences.
-"""
-
-examples = """Examples can be found in $EBROOTHYPRE/examples."""
-
-usage = """
-Hypre uses LAPACK, programs using Hypre can be linked with
--L$HYPRE_LIB -lHYPRE -lm -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lpthread
-"""
-
-toolchain = {'name': 'intel-para', 'version': '2021b'}
-
-toolchainopts = {'pic': True, 'usempi': True, 'openmp': True}
-
-source_urls = ["https://github.com/hypre-space/hypre/archive/"]
-sources = ['v%(version)s.tar.gz']
-patches = ["hypre-%(version)s_examples_mkl.patch"]
-checksums = [
-    '8a9f9fb6f65531b77e4c319bf35bfc9d34bf529c36afe08837f56b635ac052e2',  # v2.23.0.tar.gz
-    '20d6e0652173b305970e2870ae04de7f3505d131deccf2f5d40b11eae72da886',  # hypre-2.23.0_examples_mkl.patch
-]
-
-start_dir = 'src'
-
-configopts = '--with-openmp '
-configopts += 'enable-mixedint '
-
-postinstallcmds = [
-    "cp -r %(builddir)s/hypre-%(version)s/src/examples %(installdir)s/examples",
-    "rm %(installdir)s/examples/Makefile_gnu*",
-    "rm %(installdir)s/examples/Makefile*orig",
-    "cp %(builddir)s/hypre-%(version)s/src/HYPRE_config.h %(installdir)s/include",
-    "chmod 755 %(installdir)s/examples/vis",
-    "chmod 755 %(installdir)s/examples/docs",
-]
-
-modextravars = {
-    'HYPRE_ROOT': '%(installdir)s',
-    'HYPRE_LIB': '%(installdir)s/lib',
-    'HYPRE_INCLUDE': '%(installdir)s/include/'
-}
-
-moduleclass = 'numlib'
diff --git a/Overlays/jurecabooster_overlay/h/Hypre/Hypre-2.23.0-intel-para-2021b.eb b/Overlays/jurecabooster_overlay/h/Hypre/Hypre-2.23.0-intel-para-2021b.eb
deleted file mode 100644
index 14e09635f..000000000
--- a/Overlays/jurecabooster_overlay/h/Hypre/Hypre-2.23.0-intel-para-2021b.eb
+++ /dev/null
@@ -1,50 +0,0 @@
-name = "Hypre"
-version = "2.23.0"
-
-homepage = "https://computation.llnl.gov/casc/linear_solvers/sls_hypre.html"
-description = """Hypre is a library for solving large, sparse linear 
-systems of equations on massively parallel computers.
-The problems of interest arise in the simulation codes being developed 
-at LLNL and elsewhere to study physical phenomena in the defense, 
-environmental, energy, and biological sciences.
-"""
-
-examples = """Examples can be found in $EBROOTHYPRE/examples."""
-
-usage = """
-Hypre uses LAPACK, programs using Hypre can be linked with
--L$HYPRE_LIB -lHYPRE -lm -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lpthread
-"""
-
-toolchain = {'name': 'intel-para', 'version': '2021b'}
-
-toolchainopts = {'pic': True, 'usempi': True, 'openmp': True}
-
-source_urls = ["https://github.com/hypre-space/hypre/archive/"]
-sources = ['v%(version)s.tar.gz']
-patches = ["hypre-%(version)s_examples_mkl.patch"]
-checksums = [
-    '8a9f9fb6f65531b77e4c319bf35bfc9d34bf529c36afe08837f56b635ac052e2',  # v2.23.0.tar.gz
-    '20d6e0652173b305970e2870ae04de7f3505d131deccf2f5d40b11eae72da886',  # hypre-2.23.0_examples_mkl.patch
-]
-
-start_dir = 'src'
-
-configopts = '--with-openmp '
-
-postinstallcmds = [
-    "cp -r %(builddir)s/hypre-%(version)s/src/examples %(installdir)s/examples",
-    "rm %(installdir)s/examples/Makefile_gnu*",
-    "rm %(installdir)s/examples/Makefile*orig",
-    "cp %(builddir)s/hypre-%(version)s/src/HYPRE_config.h %(installdir)s/include",
-    "chmod 755 %(installdir)s/examples/vis",
-    "chmod 755 %(installdir)s/examples/docs",
-]
-
-modextravars = {
-    'HYPRE_ROOT': '%(installdir)s',
-    'HYPRE_LIB': '%(installdir)s/lib',
-    'HYPRE_INCLUDE': '%(installdir)s/include/'
-}
-
-moduleclass = 'numlib'
diff --git a/Overlays/jurecabooster_overlay/h/Hypre/Hypre-2.23.0-iomkl-2021b-mixedint.eb b/Overlays/jurecabooster_overlay/h/Hypre/Hypre-2.23.0-iomkl-2021b-mixedint.eb
deleted file mode 100644
index 066ef135a..000000000
--- a/Overlays/jurecabooster_overlay/h/Hypre/Hypre-2.23.0-iomkl-2021b-mixedint.eb
+++ /dev/null
@@ -1,52 +0,0 @@
-name = "Hypre"
-version = "2.23.0"
-versionsuffix = "-mixedint"
-
-homepage = "https://computation.llnl.gov/casc/linear_solvers/sls_hypre.html"
-description = """Hypre is a library for solving large, sparse linear 
-systems of equations on massively parallel computers.
-The problems of interest arise in the simulation codes being developed 
-at LLNL and elsewhere to study physical phenomena in the defense, 
-environmental, energy, and biological sciences.
-"""
-
-examples = """Examples can be found in $EBROOTHYPRE/examples."""
-
-usage = """
-Hypre uses LAPACK, programs using Hypre can be linked with
--L$HYPRE_LIB -lHYPRE -lm -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lpthread
-"""
-
-toolchain = {'name': 'iomkl', 'version': '2021b'}
-
-toolchainopts = {'pic': True, 'usempi': True, 'openmp': True}
-
-source_urls = ["https://github.com/hypre-space/hypre/archive/"]
-sources = ['v%(version)s.tar.gz']
-patches = ["hypre-%(version)s_examples_mkl.patch"]
-checksums = [
-    '8a9f9fb6f65531b77e4c319bf35bfc9d34bf529c36afe08837f56b635ac052e2',  # v2.23.0.tar.gz
-    '20d6e0652173b305970e2870ae04de7f3505d131deccf2f5d40b11eae72da886',  # hypre-2.23.0_examples_mkl.patch
-]
-
-start_dir = 'src'
-
-configopts = '--with-openmp '
-configopts += 'enable-mixedint '
-
-postinstallcmds = [
-    "cp -r %(builddir)s/hypre-%(version)s/src/examples %(installdir)s/examples",
-    "rm %(installdir)s/examples/Makefile_gnu*",
-    "rm %(installdir)s/examples/Makefile*orig",
-    "cp %(builddir)s/hypre-%(version)s/src/HYPRE_config.h %(installdir)s/include",
-    "chmod 755 %(installdir)s/examples/vis",
-    "chmod 755 %(installdir)s/examples/docs",
-]
-
-modextravars = {
-    'HYPRE_ROOT': '%(installdir)s',
-    'HYPRE_LIB': '%(installdir)s/lib',
-    'HYPRE_INCLUDE': '%(installdir)s/include/'
-}
-
-moduleclass = 'numlib'
diff --git a/Overlays/jurecabooster_overlay/h/Hypre/Hypre-2.23.0-iomkl-2021b.eb b/Overlays/jurecabooster_overlay/h/Hypre/Hypre-2.23.0-iomkl-2021b.eb
deleted file mode 100644
index 0edb9a2f1..000000000
--- a/Overlays/jurecabooster_overlay/h/Hypre/Hypre-2.23.0-iomkl-2021b.eb
+++ /dev/null
@@ -1,50 +0,0 @@
-name = "Hypre"
-version = "2.23.0"
-
-homepage = "https://computation.llnl.gov/casc/linear_solvers/sls_hypre.html"
-description = """Hypre is a library for solving large, sparse linear 
-systems of equations on massively parallel computers.
-The problems of interest arise in the simulation codes being developed 
-at LLNL and elsewhere to study physical phenomena in the defense, 
-environmental, energy, and biological sciences.
-"""
-
-examples = """Examples can be found in $EBROOTHYPRE/examples."""
-
-usage = """
-Hypre uses LAPACK, programs using Hypre can be linked with
--L$HYPRE_LIB -lHYPRE -lm -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lpthread
-"""
-
-toolchain = {'name': 'iomkl', 'version': '2021b'}
-
-toolchainopts = {'pic': True, 'usempi': True, 'openmp': True}
-
-source_urls = ["https://github.com/hypre-space/hypre/archive/"]
-sources = ['v%(version)s.tar.gz']
-patches = ["hypre-%(version)s_examples_mkl.patch"]
-checksums = [
-    '8a9f9fb6f65531b77e4c319bf35bfc9d34bf529c36afe08837f56b635ac052e2',  # v2.23.0.tar.gz
-    '20d6e0652173b305970e2870ae04de7f3505d131deccf2f5d40b11eae72da886',  # hypre-2.23.0_examples_mkl.patch
-]
-
-start_dir = 'src'
-
-configopts = '--with-openmp '
-
-postinstallcmds = [
-    "cp -r %(builddir)s/hypre-%(version)s/src/examples %(installdir)s/examples",
-    "rm %(installdir)s/examples/Makefile_gnu*",
-    "rm %(installdir)s/examples/Makefile*orig",
-    "cp %(builddir)s/hypre-%(version)s/src/HYPRE_config.h %(installdir)s/include",
-    "chmod 755 %(installdir)s/examples/vis",
-    "chmod 755 %(installdir)s/examples/docs",
-]
-
-modextravars = {
-    'HYPRE_ROOT': '%(installdir)s',
-    'HYPRE_LIB': '%(installdir)s/lib',
-    'HYPRE_INCLUDE': '%(installdir)s/include/'
-}
-
-moduleclass = 'numlib'
diff --git a/Overlays/jurecabooster_overlay/h/Hypre/hypre-2.23.0_examples_mkl.patch b/Overlays/jurecabooster_overlay/h/Hypre/hypre-2.23.0_examples_mkl.patch
deleted file mode 100644
index 6fa30fb13..000000000
--- a/Overlays/jurecabooster_overlay/h/Hypre/hypre-2.23.0_examples_mkl.patch
+++ /dev/null
@@ -1,535 +0,0 @@
-diff -Nru hypre-2.23.0/src/examples/Makefile hypre-2.23.0_ok_booster/src/examples/Makefile
---- hypre-2.23.0/src/examples/Makefile	2021-10-01 00:54:27.000000000 +0200
-+++ hypre-2.23.0_ok_booster/src/examples/Makefile	2021-12-07 20:01:31.600616000 +0100
-@@ -10,15 +10,16 @@
- F77       = mpif77
- CXX       = mpicxx
- F90       = mpifort
--HYPRE_DIR = ../hypre
-+HYPRE_DIR = $(EBROOTHYPRE)
-+BLASLAPACKLIB = -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -liomp5 -lpthread
- 
- ########################################################################
- # Compiling and linking options
- ########################################################################
--COPTS     = -g -Wall
-+COPTS     = -g 
- CINCLUDES = -I$(HYPRE_DIR)/include
- #CDEFS     = -DHYPRE_EXVIS
--CDEFS     = 
-+CDEFS     = -DHAVE_CONFIG_H -DHYPRE_TIMING
- CFLAGS    = $(COPTS) $(CINCLUDES) $(CDEFS)
- FOPTS     = -g
- FINCLUDES = $(CINCLUDES)
-@@ -33,7 +34,7 @@
- 
- 
- LINKOPTS  = $(COPTS)
--LIBS      = -L$(HYPRE_DIR)/lib -lHYPRE -lm
-+LIBS      = -L$(HYPRE_DIR)/lib -lHYPRE $(BLASLAPACKLIB) -lm
- LFLAGS    = $(LINKOPTS) $(LIBS) -lstdc++
- LFLAGS_B =\
-  -L${HYPRE_DIR}/lib\
-diff -Nru hypre-2.23.0/src/examples/Makefile_gnu hypre-2.23.0_ok_booster/src/examples/Makefile_gnu
---- hypre-2.23.0/src/examples/Makefile_gnu	1970-01-01 01:00:00.000000000 +0100
-+++ hypre-2.23.0_ok_booster/src/examples/Makefile_gnu	2021-12-07 20:03:41.281924000 +0100
-@@ -0,0 +1,237 @@
-+# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
-+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
-+#
-+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-+
-+########################################################################
-+# Compiler and external dependences
-+########################################################################
-+CC        = mpicc
-+F77       = mpif77
-+CXX       = mpicxx
-+F90       = mpifort
-+HYPRE_DIR = $(EBROOTHYPRE)
-+BLASLAPACKLIB = -lmkl_gf_lp64 -lmkl_gnu_thread -lmkl_core -lgomp -lpthread -lm -ldl
-+
-+########################################################################
-+# Compiling and linking options
-+########################################################################
-+COPTS     = -g 
-+CINCLUDES = -I$(HYPRE_DIR)/include
-+#CDEFS     = -DHYPRE_EXVIS
-+CDEFS     = -DHAVE_CONFIG_H -DHYPRE_TIMING
-+CFLAGS    = $(COPTS) $(CINCLUDES) $(CDEFS)
-+FOPTS     = -g
-+FINCLUDES = $(CINCLUDES)
-+FFLAGS    = $(FOPTS) $(FINCLUDES)
-+CXXOPTS   = $(COPTS) -Wno-deprecated
-+CXXINCLUDES = $(CINCLUDES) -I..
-+CXXDEFS   = $(CDEFS)
-+IFLAGS_BXX = 
-+CXXFLAGS  = $(CXXOPTS) $(CXXINCLUDES) $(CXXDEFS) $(IFLAGS_BXX)
-+IF90FLAGS = 
-+F90FLAGS = $(FFLAGS) $(IF90FLAGS)
-+
-+
-+LINKOPTS  = $(COPTS)
-+LIBS      = -L$(HYPRE_DIR)/lib -lHYPRE $(BLASLAPACKLIB) -lm
-+LFLAGS    = $(LINKOPTS) $(LIBS) -lstdc++
-+LFLAGS_B =\
-+ -L${HYPRE_DIR}/lib\
-+ -lbHYPREClient-C\
-+ -lbHYPREClient-CX\
-+ -lbHYPREClient-F\
-+ -lbHYPRE\
-+ -lsidl -ldl -lxml2
-+LFLAGS77 = $(LFLAGS)
-+LFLAGS90 =
-+
-+########################################################################
-+# Rules for compiling the source files
-+########################################################################
-+.SUFFIXES: .c .f .cxx .f90
-+
-+.c.o:
-+	$(CC) $(CFLAGS) -c $<
-+.f.o:
-+	$(F77) $(FFLAGS) -c $<
-+.cxx.o:
-+	$(CXX) $(CXXFLAGS) -c $<
-+
-+########################################################################
-+# List of all programs to be compiled
-+########################################################################
-+ALLPROGS = ex1 ex2 ex3 ex4 ex5 ex5f ex6 ex7 ex8 ex9 ex11 ex12 ex12f \
-+           ex13 ex14 ex15 ex16
-+BIGINTPROGS = ex5big ex15big
-+FORTRANPROGS = ex5f ex12f
-+MAXDIMPROGS = ex17 ex18
-+COMPLEXPROGS = ex18comp
-+
-+all: $(ALLPROGS)
-+
-+default: all
-+
-+bigint: $(BIGINTPROGS)
-+
-+fortran: $(FORTRANPROGS)
-+
-+maxdim: $(MAXDIMPROGS)
-+
-+complex: $(COMPLEXPROGS)
-+
-+########################################################################
-+# Example 1
-+########################################################################
-+ex1: ex1.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 2
-+########################################################################
-+ex2: ex2.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 3
-+########################################################################
-+ex3: ex3.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 4
-+########################################################################
-+ex4: ex4.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 5
-+########################################################################
-+ex5: ex5.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 5 with 64-bit integers
-+########################################################################
-+ex5big: ex5big.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 5 Fortran 77
-+########################################################################
-+ex5f: ex5f.o
-+	$(F77) -o $@ $^ $(LFLAGS77)
-+
-+########################################################################
-+# Example 6
-+########################################################################
-+ex6: ex6.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 7
-+########################################################################
-+ex7: ex7.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 8
-+########################################################################
-+ex8: ex8.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 9
-+########################################################################
-+ex9: ex9.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 10
-+########################################################################
-+ex10: ex10.o
-+	$(CXX) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 11
-+########################################################################
-+ex11: ex11.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 12
-+########################################################################
-+ex12: ex12.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 12 Fortran 77
-+########################################################################
-+ex12f: ex12f.o
-+	$(F77) -o $@ $^ $(LFLAGS77)
-+
-+########################################################################
-+# Example 13
-+########################################################################
-+ex13: ex13.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 14
-+########################################################################
-+ex14: ex14.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 15
-+########################################################################
-+ex15: ex15.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 15 with 64-bit integers
-+########################################################################
-+ex15big: ex15big.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 16
-+########################################################################
-+ex16: ex16.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 17
-+########################################################################
-+ex17: ex17.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 18
-+########################################################################
-+ex18: ex18.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 18 (complex)
-+########################################################################
-+ex18comp: ex18comp.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Clean up
-+########################################################################
-+clean:
-+	rm -f $(ALLPROGS:=.o)
-+	rm -f $(BIGINTPROGS:=.o)
-+	rm -f $(FORTRANPROGS:=.o)
-+	rm -f $(MAXDIMPROGS:=.o)
-+	rm -f $(COMPLEXPROGS:=.o)
-+	cd vis; make clean
-+distclean: clean
-+	rm -f $(ALLPROGS) $(ALLPROGS:=*~)
-+	rm -f $(BIGINTPROGS) $(BIGINTPROGS:=*~)
-+	rm -f $(FORTRANLPROGS) $(FORTRANPROGS:=*~)
-+	rm -f $(MAXDIMPROGS) $(MAXDIMPROGS:=*~)
-+	rm -f $(COMPLEXPROGS) $(COMPLEXPROGS:=*~)
-+	rm -fr README*
-diff -Nru hypre-2.23.0/src/examples/Makefile_gnu_cuda hypre-2.23.0_ok_booster/src/examples/Makefile_gnu_cuda
---- hypre-2.23.0/src/examples/Makefile_gnu_cuda	1970-01-01 01:00:00.000000000 +0100
-+++ hypre-2.23.0_ok_booster/src/examples/Makefile_gnu_cuda	2021-12-07 20:03:09.727408000 +0100
-@@ -0,0 +1,238 @@
-+# Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
-+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
-+#
-+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-+
-+########################################################################
-+# Compiler and external dependences
-+########################################################################
-+CC        = mpicc
-+F77       = mpif77
-+CXX       = mpicxx
-+F90       = mpifort
-+HYPRE_DIR = $(EBROOTHYPRE)
-+BLASLAPACKLIB = -lmkl_gf_lp64 -lmkl_gnu_thread -lmkl_core -lgomp -lpthread -lm -ldl
-+
-+########################################################################
-+# Compiling and linking options
-+########################################################################
-+COPTS     = -g 
-+CINCLUDES = -I$(HYPRE_DIR)/include
-+#CDEFS     = -DHYPRE_EXVIS
-+CDEFS     = -DHAVE_CONFIG_H -DHYPRE_TIMING
-+CFLAGS    = $(COPTS) $(CINCLUDES) $(CDEFS)
-+FOPTS     = -g
-+FINCLUDES = $(CINCLUDES)
-+FFLAGS    = $(FOPTS) $(FINCLUDES)
-+CXXOPTS   = $(COPTS) -Wno-deprecated
-+CXXINCLUDES = $(CINCLUDES) -I..
-+CXXDEFS   = $(CDEFS)
-+IFLAGS_BXX = 
-+CXXFLAGS  = $(CXXOPTS) $(CXXINCLUDES) $(CXXDEFS) $(IFLAGS_BXX)
-+IF90FLAGS = 
-+F90FLAGS = $(FFLAGS) $(IF90FLAGS)
-+
-+
-+LINKOPTS  = $(COPTS)
-+LIBS      = -L$(HYPRE_DIR)/lib -lHYPRE $(BLASLAPACKLIB) -lm
-+LFLAGS    = $(LINKOPTS) $(LIBS) -lstdc++
-+LFLAGS_B =\
-+ -L${HYPRE_DIR}/lib\
-+ -lbHYPREClient-C\
-+ -lbHYPREClient-CX\
-+ -lbHYPREClient-F\
-+ -lbHYPRE\
-+ -lsidl -ldl -lxml2
-+LFLAGS77 = $(LFLAGS)
-+LFLAGS90 =
-+
-+########################################################################
-+# Rules for compiling the source files
-+########################################################################
-+.SUFFIXES: .c .f .cxx .f90
-+
-+.c.o:
-+	$(CC) $(CFLAGS) -c $<
-+.f.o:
-+	$(F77) $(FFLAGS) -c $<
-+.cxx.o:
-+	$(CXX) $(CXXFLAGS) -c $<
-+
-+########################################################################
-+# List of all programs to be compiled
-+########################################################################
-+ALLPROGS = ex1 ex2 ex3 ex4 ex5 ex5f ex6 ex7 ex8 ex9 ex11 ex12 ex12f \
-+           ex13 ex14 ex15 ex16
-+BIGINTPROGS = ex5big ex15big
-+FORTRANPROGS = ex5f ex12f
-+MAXDIMPROGS = ex17 ex18
-+COMPLEXPROGS = ex18comp
-+
-+all: $(ALLPROGS)
-+
-+default: all
-+
-+bigint: $(BIGINTPROGS)
-+
-+fortran: $(FORTRANPROGS)
-+
-+maxdim: $(MAXDIMPROGS)
-+
-+complex: $(COMPLEXPROGS)
-+
-+########################################################################
-+# Example 1
-+########################################################################
-+ex1: ex1.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 2
-+########################################################################
-+ex2: ex2.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 3
-+########################################################################
-+ex3: ex3.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 4
-+########################################################################
-+ex4: ex4.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 5
-+########################################################################
-+ex5: ex5.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 5 with 64-bit integers
-+########################################################################
-+ex5big: ex5big.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 5 Fortran 77
-+########################################################################
-+ex5f: ex5f.o
-+	$(F77) -o $@ $^ $(LFLAGS77)
-+
-+########################################################################
-+# Example 6
-+########################################################################
-+ex6: ex6.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 7
-+########################################################################
-+ex7: ex7.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 8
-+########################################################################
-+ex8: ex8.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 9
-+########################################################################
-+ex9: ex9.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 10
-+########################################################################
-+ex10: ex10.o
-+	$(CXX) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 11
-+########################################################################
-+ex11: ex11.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 12
-+########################################################################
-+ex12: ex12.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 12 Fortran 77
-+########################################################################
-+ex12f: ex12f.o
-+	$(F77) -o $@ $^ $(LFLAGS77)
-+
-+########################################################################
-+# Example 13
-+########################################################################
-+ex13: ex13.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 14
-+########################################################################
-+ex14: ex14.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 15
-+########################################################################
-+ex15: ex15.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 15 with 64-bit integers
-+########################################################################
-+ex15big: ex15big.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 16
-+########################################################################
-+ex16: ex16.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 17
-+########################################################################
-+ex17: ex17.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 18
-+########################################################################
-+ex18: ex18.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Example 18 (complex)
-+########################################################################
-+ex18comp: ex18comp.o
-+	$(CC) -o $@ $^ $(LFLAGS)
-+
-+########################################################################
-+# Clean up
-+########################################################################
-+clean:
-+	rm -f $(ALLPROGS:=.o)
-+	rm -f $(BIGINTPROGS:=.o)
-+	rm -f $(FORTRANPROGS:=.o)
-+	rm -f $(MAXDIMPROGS:=.o)
-+	rm -f $(COMPLEXPROGS:=.o)
-+	cd vis; make clean
-+distclean: clean
-+	rm -f $(ALLPROGS) $(ALLPROGS:=*~)
-+	rm -f $(BIGINTPROGS) $(BIGINTPROGS:=*~)
-+	rm -f $(FORTRANLPROGS) $(FORTRANPROGS:=*~)
-+	rm -f $(MAXDIMPROGS) $(MAXDIMPROGS:=*~)
-+	rm -f $(COMPLEXPROGS) $(COMPLEXPROGS:=*~)
-+	rm -fr README*
-+
-diff -Nru hypre-2.23.0/src/examples/Makefile_gpu hypre-2.23.0_ok_booster/src/examples/Makefile_gpu
---- hypre-2.23.0/src/examples/Makefile_gpu	2021-12-02 09:45:27.675453000 +0100
-+++ hypre-2.23.0_ok_booster/src/examples/Makefile_gpu	2021-12-07 20:02:32.864395000 +0100
-@@ -19,14 +19,14 @@
- # CUDA
- ########################################################################
- CUDA_INCL = -I${CUDA_HOME}/include
--CUDA_LIBS = -L${CUDA_HOME}lib64 -lcudart -lcusparse -lcurand
-+CUDA_LIBS = -L${CUDA_HOME}lib64 
- CUDA_ARCH = -gencode arch=compute_60,code=sm_60 -gencode arch=compute_70,code=sm_70
- NVCC_LDFLAGS = -ccbin=${CXX} ${CUDA_ARCH}
- 
- ########################################################################
- # Compiling and linking options
- ########################################################################
--COPTS     = -g -Wall
-+COPTS     = -g 
- CINCLUDES = -I$(HYPRE_DIR)/include $(CUDA_INCL)
- #CDEFS     = -DHYPRE_EXVIS
- CDEFS     = 
diff --git a/Overlays/jurecabooster_overlay/h/hwloc/hwloc-2.5.0-GCCcore-11.2.0.eb b/Overlays/jurecabooster_overlay/h/hwloc/hwloc-2.5.0-GCCcore-11.2.0.eb
deleted file mode 100644
index c2cea29c3..000000000
--- a/Overlays/jurecabooster_overlay/h/hwloc/hwloc-2.5.0-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,51 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'hwloc'
-version = '2.5.0'
-
-homepage = 'https://www.open-mpi.org/projects/hwloc/'
-
-description = """
- The Portable Hardware Locality (hwloc) software package provides a portable
- abstraction (across OS, versions, architectures, ...) of the hierarchical
- topology of modern architectures, including NUMA memory nodes, sockets, shared
- caches, cores and simultaneous multithreading. It also gathers various system
- attributes such as cache and memory information as well as the locality of I/O
- devices such as network interfaces, InfiniBand HCAs or GPUs. It primarily
- aims at helping applications with gathering information about modern computing
- hardware so as to exploit it accordingly and efficiently.
-"""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-# need to build with -fno-tree-vectorize to avoid segfaulting lstopo on Intel Skylake
-# cfr. https://github.com/open-mpi/hwloc/issues/315
-toolchainopts = {'vectorize': False}
-
-source_urls = ['https://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
-sources = [SOURCE_TAR_GZ]
-checksums = ['38aa8102faec302791f6b4f0d23960a3ffa25af3af6af006c64dbecac23f852c']
-
-builddependencies = [
-    ('binutils', '2.37'),
-]
-
-dependencies = [
-    ('numactl', '2.0.14', '', SYSTEM),
-    ('libxml2', '2.9.10'),
-    ('libpciaccess', '0.16'),
-]
-
-configopts = "--enable-libnuma=$EBROOTNUMACTL "
-configopts += "--disable-cairo --disable-gl --disable-libudev "
-
-sanity_check_paths = {
-    'files': ['bin/lstopo', 'include/hwloc/linux.h',
-              'lib/libhwloc.%s' % SHLIB_EXT],
-    'dirs': ['share/man/man3'],
-}
-sanity_check_commands = ['lstopo']
-
-modluafooter = '''
-add_property("arch","gpu")
-'''
-moduleclass = 'system'
diff --git a/Overlays/jurecabooster_overlay/i/impi/impi-2021.4.0-intel-compilers-2021.4.0.eb b/Overlays/jurecabooster_overlay/i/impi/impi-2021.4.0-intel-compilers-2021.4.0.eb
deleted file mode 100644
index 5937f49ca..000000000
--- a/Overlays/jurecabooster_overlay/i/impi/impi-2021.4.0-intel-compilers-2021.4.0.eb
+++ /dev/null
@@ -1,15 +0,0 @@
-name = 'impi'
-version = '2021.4.0'
-
-homepage = 'https://software.intel.com/content/www/us/en/develop/tools/mpi-library.html'
-description = "Intel MPI Library, compatible with MPICH ABI"
-
-toolchain = {'name': 'intel-compilers', 'version': '2021.4.0'}
-
-# see https://software.intel.com/content/www/us/en/develop/articles/oneapi-standalone-components.html
-source_urls = [
-    'https://registrationcenter-download.intel.com/akdlm/irc_nas/18186/']
-sources = ['l_mpi_oneapi_p_%(version)s.441_offline.sh']
-checksums = ['cc4b7072c61d0bd02b1c431b22d2ea3b84b967b59d2e587e77a9e7b2c24f2a29']
-
-moduleclass = 'mpi'
diff --git a/Overlays/jurecabooster_overlay/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb b/Overlays/jurecabooster_overlay/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
deleted file mode 100644
index 6159e9933..000000000
--- a/Overlays/jurecabooster_overlay/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
+++ /dev/null
@@ -1,56 +0,0 @@
-name = 'psmpi'
-version = '5.5.0-1'
-local_pscom_version = '5.4.8-1_gw'
-
-homepage = 'https://github.com/ParaStation/psmpi2'
-description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
-based on MPICH v3. It provides extra low level communication libraries and integration with
-various batch systems for tighter process control.
-"""
-
-toolchain = {'name': 'GCC', 'version': '11.2.0'}
-
-source_urls = [
-    'https://github.com/ParaStation/psmpi/archive/',
-    'https://github.com/ParaStation/pscom/archive/'
-]
-sources = [
-    SOURCE_TAR_BZ2,
-    'pscom-%s.tar.gz' % local_pscom_version
-]
-checksums = [
-    # psmpi-5.5.0-1.tar.bz2
-    'c178bf618f139857c1bc191938677145cf4fdbec5b8d3afa2ca1de666c791b48',
-    # pscom-5.4.8-1_gw.tar.gz
-    'bfb43102738d45b64d8301eaea2527885369d3e93c7e9638ef4ad1934909b11f',
-    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
-]
-
-patches = [
-    'psmpi_shebang.patch',
-]
-
-builddependencies = [
-    ('popt', '1.18', '', SYSTEM),
-    ('Autotools', '20210726'),
-    # Autoconf >2.69 is generating a buggy configure script, so take it down to the one that works
-    ('Autoconf', '2.69'),
-    # autogen also needs perl
-    ('Perl', '5.34.0'),
-]
-
-dependencies = [
-    # needed due to the inclusion of hwloc
-    ('libxml2', '2.9.10'),
-]
-
-mpich_opts = '--enable-static'
-preconfigopts = './autogen.sh && '
-configopts = '--with-pscom-builtin=psm2'
-
-pscom_allin_path = '%%(builddir)s/pscom-%s ' % local_pscom_version
-pgo = True
-
-threaded = False
-
-moduleclass = 'mpi'
diff --git a/Overlays/jurecabooster_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb b/Overlays/jurecabooster_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
deleted file mode 100644
index d98b24b3f..000000000
--- a/Overlays/jurecabooster_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
+++ /dev/null
@@ -1,57 +0,0 @@
-name = 'psmpi'
-version = '5.5.0-1'
-versionsuffix = '-mt'
-local_pscom_version = '5.4.8-1_gw'
-
-homepage = 'https://github.com/ParaStation/psmpi2'
-description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
-based on MPICH v3. It provides extra low level communication libraries and integration with
-various batch systems for tighter process control.
-"""
-
-toolchain = {'name': 'intel-compilers', 'version': '2021.4.0'}
-
-source_urls = [
-    'https://github.com/ParaStation/psmpi/archive/',
-    'https://github.com/ParaStation/pscom/archive/'
-]
-sources = [
-    SOURCE_TAR_BZ2,
-    'pscom-%s.tar.gz' % local_pscom_version
-]
-checksums = [
-    # psmpi-5.5.0-1.tar.bz2
-    'c178bf618f139857c1bc191938677145cf4fdbec5b8d3afa2ca1de666c791b48',
-    # pscom-5.4.8-1_gw.tar.gz
-    'bfb43102738d45b64d8301eaea2527885369d3e93c7e9638ef4ad1934909b11f',
-    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
-]
-
-patches = [
-    'psmpi_shebang.patch',
-]
-
-builddependencies = [
-    ('popt', '1.18', '', SYSTEM),
-    ('Autotools', '20210726'),
-    # Autoconf >2.69 is generating a buggy configure script, so take it down to the one that works
-    ('Autoconf', '2.69'),
-    # autogen also needs perl
-    ('Perl', '5.34.0'),
-]
-
-dependencies = [
-    # needed due to the inclusion of hwloc
-    ('libxml2', '2.9.10'),
-]
-
-mpich_opts = '--enable-static'
-preconfigopts = './autogen.sh && '
-configopts = '--with-pscom-builtin=psm2'
-
-pscom_allin_path = '%%(builddir)s/pscom-%s ' % local_pscom_version
-pgo = True
-
-threaded = True
-
-moduleclass = 'mpi'
diff --git a/Overlays/jurecabooster_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb b/Overlays/jurecabooster_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
deleted file mode 100644
index 7a789088a..000000000
--- a/Overlays/jurecabooster_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
+++ /dev/null
@@ -1,56 +0,0 @@
-name = 'psmpi'
-version = '5.5.0-1'
-local_pscom_version = '5.4.8-1_gw'
-
-homepage = 'https://github.com/ParaStation/psmpi2'
-description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
-based on MPICH v3. It provides extra low level communication libraries and integration with
-various batch systems for tighter process control.
-"""
-
-toolchain = {'name': 'intel-compilers', 'version': '2021.4.0'}
-
-source_urls = [
-    'https://github.com/ParaStation/psmpi/archive/',
-    'https://github.com/ParaStation/pscom/archive/'
-]
-sources = [
-    SOURCE_TAR_BZ2,
-    'pscom-%s.tar.gz' % local_pscom_version
-]
-checksums = [
-    # psmpi-5.5.0-1.tar.bz2
-    'c178bf618f139857c1bc191938677145cf4fdbec5b8d3afa2ca1de666c791b48',
-    # pscom-5.4.8-1_gw.tar.gz
-    'bfb43102738d45b64d8301eaea2527885369d3e93c7e9638ef4ad1934909b11f',
-    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
-]
-
-patches = [
-    'psmpi_shebang.patch',
-]
-
-builddependencies = [
-    ('popt', '1.18', '', SYSTEM),
-    ('Autotools', '20210726'),
-    # Autoconf >2.69 is generating a buggy configure script, so take it down to the one that works
-    ('Autoconf', '2.69'),
-    # autogen also needs perl
-    ('Perl', '5.34.0'),
-]
-
-dependencies = [
-    # needed due to the inclusion of hwloc
-    ('libxml2', '2.9.10'),
-]
-
-mpich_opts = '--enable-static'
-preconfigopts = './autogen.sh && '
-configopts = '--with-pscom-builtin=psm2'
-
-pscom_allin_path = '%%(builddir)s/pscom-%s ' % local_pscom_version
-pgo = True
-
-threaded = False
-
-moduleclass = 'mpi'
diff --git a/Overlays/jurecabooster_overlay/s/Scalasca/Scalasca-2.6-gpsmpi-2021b.eb b/Overlays/jurecabooster_overlay/s/Scalasca/Scalasca-2.6-gpsmpi-2021b.eb
deleted file mode 100644
index b84a5deeb..000000000
--- a/Overlays/jurecabooster_overlay/s/Scalasca/Scalasca-2.6-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,56 +0,0 @@
-##
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-# Copyright:: Copyright 2013-2021 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-#             Markus Geimer <m.geimer@fz-juelich.de>
-#             Christian Feld <c.feld@fz-juelich.de>
-# License::   3-clause BSD
-#
-# This work is based on experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-easyblock = 'EB_Score_minus_P'
-
-name = 'Scalasca'
-version = '2.6'
-
-homepage = 'https://www.scalasca.org/'
-description = """
-Scalasca is a software tool that supports the performance optimization of
-parallel programs by measuring and analyzing their runtime behavior. The
-analysis identifies potential performance bottlenecks -- in particular
-those concerning communication and synchronization -- and offers guidance
-in exploring their causes.
-"""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-# Building with architectural optimizations on the KNL booster prevents
-# using the frontend tools on the frontend, and thus cross-compilation.
-# But Score-P/Scalasca does not benefit much from vectorization anyway.
-toolchainopts = {'optarch': False}
-
-source_urls = ['https://apps.fz-juelich.de/scalasca/releases/scalasca/%(version_major_minor)s/dist']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = [
-    'b3f9cb1d58f3e25090a39da777bae8ca2769fd10cbd6dfb9a4887d873ee2441e',  # scalasca-2.6.tar.gz
-]
-builddependencies = [
-    ('CubeWriter', '4.6'),
-]
-
-dependencies = [
-    ('CubeLib', '4.6'),
-    ('OTF2', '2.3'),
-    ('Score-P', '7.1'),
-]
-
-sanity_check_paths = {
-    'files': ['bin/scalasca', ('lib/libpearl.replay.a', 'lib64/libpearl.replay.a')],
-    'dirs': [],
-}
-
-# Ensure that local metric documentation is found by CubeGUI
-modextrapaths = {'CUBE_DOCPATH': 'share/doc/scalasca/patterns'}
-
-moduleclass = 'perf'
diff --git a/Overlays/jurecabooster_overlay/s/Scalasca/Scalasca-2.6-iimpi-2021b.eb b/Overlays/jurecabooster_overlay/s/Scalasca/Scalasca-2.6-iimpi-2021b.eb
deleted file mode 100644
index 5d1857c81..000000000
--- a/Overlays/jurecabooster_overlay/s/Scalasca/Scalasca-2.6-iimpi-2021b.eb
+++ /dev/null
@@ -1,56 +0,0 @@
-##
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-# Copyright:: Copyright 2013-2021 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-#             Markus Geimer <m.geimer@fz-juelich.de>
-#             Christian Feld <c.feld@fz-juelich.de>
-# License::   3-clause BSD
-#
-# This work is based on experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-easyblock = 'EB_Score_minus_P'
-
-name = 'Scalasca'
-version = '2.6'
-
-homepage = 'https://www.scalasca.org/'
-description = """
-Scalasca is a software tool that supports the performance optimization of
-parallel programs by measuring and analyzing their runtime behavior. The
-analysis identifies potential performance bottlenecks -- in particular
-those concerning communication and synchronization -- and offers guidance
-in exploring their causes.
-"""
-
-toolchain = {'name': 'iimpi', 'version': '2021b'}
-# Building with architectural optimizations on the KNL booster prevents
-# using the frontend tools on the frontend, and thus cross-compilation.
-# But Score-P/Scalasca does not benefit much from vectorization anyway.
-toolchainopts = {'optarch': False}
-
-source_urls = ['https://apps.fz-juelich.de/scalasca/releases/scalasca/%(version_major_minor)s/dist']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = [
-    'b3f9cb1d58f3e25090a39da777bae8ca2769fd10cbd6dfb9a4887d873ee2441e',  # scalasca-2.6.tar.gz
-]
-builddependencies = [
-    ('CubeWriter', '4.6'),
-]
-
-dependencies = [
-    ('CubeLib', '4.6'),
-    ('OTF2', '2.3'),
-    ('Score-P', '7.1'),
-]
-
-sanity_check_paths = {
-    'files': ['bin/scalasca', ('lib/libpearl.replay.a', 'lib64/libpearl.replay.a')],
-    'dirs': [],
-}
-
-# Ensure that local metric documentation is found by CubeGUI
-modextrapaths = {'CUBE_DOCPATH': 'share/doc/scalasca/patterns'}
-
-moduleclass = 'perf'
diff --git a/Overlays/jurecabooster_overlay/s/Scalasca/Scalasca-2.6-ipsmpi-2021b.eb b/Overlays/jurecabooster_overlay/s/Scalasca/Scalasca-2.6-ipsmpi-2021b.eb
deleted file mode 100644
index 3a8a8abe5..000000000
--- a/Overlays/jurecabooster_overlay/s/Scalasca/Scalasca-2.6-ipsmpi-2021b.eb
+++ /dev/null
@@ -1,56 +0,0 @@
-##
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-# Copyright:: Copyright 2013-2021 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-#             Markus Geimer <m.geimer@fz-juelich.de>
-#             Christian Feld <c.feld@fz-juelich.de>
-# License::   3-clause BSD
-#
-# This work is based on experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-easyblock = 'EB_Score_minus_P'
-
-name = 'Scalasca'
-version = '2.6'
-
-homepage = 'https://www.scalasca.org/'
-description = """
-Scalasca is a software tool that supports the performance optimization of
-parallel programs by measuring and analyzing their runtime behavior. The
-analysis identifies potential performance bottlenecks -- in particular
-those concerning communication and synchronization -- and offers guidance
-in exploring their causes.
-"""
-
-toolchain = {'name': 'ipsmpi', 'version': '2021b'}
-# Building with architectural optimizations on the KNL booster prevents
-# using the frontend tools on the frontend, and thus cross-compilation.
-# But Score-P/Scalasca does not benefit much from vectorization anyway.
-toolchainopts = {'optarch': False}
-
-source_urls = ['https://apps.fz-juelich.de/scalasca/releases/scalasca/%(version_major_minor)s/dist']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = [
-    'b3f9cb1d58f3e25090a39da777bae8ca2769fd10cbd6dfb9a4887d873ee2441e',  # scalasca-2.6.tar.gz
-]
-builddependencies = [
-    ('CubeWriter', '4.6'),
-]
-
-dependencies = [
-    ('CubeLib', '4.6'),
-    ('OTF2', '2.3'),
-    ('Score-P', '7.1'),
-]
-
-sanity_check_paths = {
-    'files': ['bin/scalasca', ('lib/libpearl.replay.a', 'lib64/libpearl.replay.a')],
-    'dirs': [],
-}
-
-# Ensure that local metric documentation is found by CubeGUI
-modextrapaths = {'CUBE_DOCPATH': 'share/doc/scalasca/patterns'}
-
-moduleclass = 'perf'
diff --git a/Overlays/jurecabooster_overlay/s/Score-P/Score-P-7.1-gpsmpi-2021b.eb b/Overlays/jurecabooster_overlay/s/Score-P/Score-P-7.1-gpsmpi-2021b.eb
deleted file mode 100644
index cf358d946..000000000
--- a/Overlays/jurecabooster_overlay/s/Score-P/Score-P-7.1-gpsmpi-2021b.eb
+++ /dev/null
@@ -1,66 +0,0 @@
-##
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-# Copyright:: Copyright 2013-2021 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-#             Markus Geimer <m.geimer@fz-juelich.de>
-#             Christian Feld <c.feld@fz-juelich.de>
-# License::   3-clause BSD
-#
-# This work is based on experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-easyblock = 'EB_Score_minus_P'
-
-name = 'Score-P'
-version = '7.1'
-
-homepage = 'https://www.score-p.org'
-description = """
-The Score-P measurement infrastructure is a highly scalable and easy-to-use
-tool suite for profiling, event tracing, and online analysis of HPC
-applications.
-"""
-
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-# Building with architectural optimizations on the KNL booster prevents
-# using the frontend tools on the frontend, and thus cross-compilation.
-# But Score-P/Scalasca does not benefit much from vectorization anyway.
-toolchainopts = {'optarch': False}
-
-source_urls = ['http://perftools.pages.jsc.fz-juelich.de/cicd/scorep/tags/scorep-%(version)s']
-sources = ['scorep-%(version)s.tar.gz']
-checksums = [
-    '98dea497982001fb82da3429ca55669b2917a0858c71abe2cfe7cd113381f1f7',  # scorep-7.1.tar.gz
-]
-
-builddependencies = [
-    ('CubeLib', '4.6'),
-    ('CubeWriter', '4.6'),
-    # Unwinding/sampling support (optional):
-    ('libunwind', '1.5.0'),
-]
-
-dependencies = [
-    # binutils is implicitly available via GCC toolchain
-    ('OPARI2', '2.0.6'),
-    ('OTF2', '2.3'),
-    # Hardware counter support (optional):
-    ('PAPI', '6.0.0.1'),
-    # PDT source-to-source instrumentation support (optional):
-    ('PDT', '3.25.1'),
-]
-
-configopts = '--enable-shared '
-
-sanity_check_paths = {
-    'files': ['bin/scorep', 'include/scorep/SCOREP_User.h',
-              ('lib/libscorep_adapter_mpi_event.a', 'lib64/libscorep_adapter_mpi_event.a'),
-              ('lib/libscorep_adapter_mpi_event.%s' % SHLIB_EXT, 'lib64/libscorep_adapter_mpi_event.%s' % SHLIB_EXT)],
-    'dirs': [],
-}
-
-# Ensure that local metric documentation is found by CubeGUI
-modextrapaths = {'CUBE_DOCPATH': 'share/doc/scorep/profile'}
-
-moduleclass = 'perf'
diff --git a/Overlays/jurecabooster_overlay/s/Score-P/Score-P-7.1-iimpi-2021b.eb b/Overlays/jurecabooster_overlay/s/Score-P/Score-P-7.1-iimpi-2021b.eb
deleted file mode 100644
index 530a8f032..000000000
--- a/Overlays/jurecabooster_overlay/s/Score-P/Score-P-7.1-iimpi-2021b.eb
+++ /dev/null
@@ -1,66 +0,0 @@
-##
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-# Copyright:: Copyright 2013-2021 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-#             Markus Geimer <m.geimer@fz-juelich.de>
-#             Christian Feld <c.feld@fz-juelich.de>
-# License::   3-clause BSD
-#
-# This work is based on experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-easyblock = 'EB_Score_minus_P'
-
-name = 'Score-P'
-version = '7.1'
-
-homepage = 'https://www.score-p.org'
-description = """
-The Score-P measurement infrastructure is a highly scalable and easy-to-use
-tool suite for profiling, event tracing, and online analysis of HPC
-applications.
-"""
-
-toolchain = {'name': 'iimpi', 'version': '2021b'}
-# Building with architectural optimizations on the KNL booster prevents
-# using the frontend tools on the frontend, and thus cross-compilation.
-# But Score-P/Scalasca does not benefit much from vectorization anyway.
-toolchainopts = {'optarch': False}
-
-source_urls = ['http://perftools.pages.jsc.fz-juelich.de/cicd/scorep/tags/scorep-%(version)s']
-sources = ['scorep-%(version)s.tar.gz']
-checksums = [
-    '98dea497982001fb82da3429ca55669b2917a0858c71abe2cfe7cd113381f1f7',  # scorep-7.1.tar.gz
-]
-
-builddependencies = [
-    ('CubeLib', '4.6'),
-    ('CubeWriter', '4.6'),
-    # Unwinding/sampling support (optional):
-    ('libunwind', '1.5.0'),
-]
-
-dependencies = [
-    # binutils is implicitly available via GCC toolchain
-    ('OPARI2', '2.0.6'),
-    ('OTF2', '2.3'),
-    # Hardware counter support (optional):
-    ('PAPI', '6.0.0.1'),
-    # PDT source-to-source instrumentation support (optional):
-    ('PDT', '3.25.1'),
-]
-
-configopts = '--enable-shared '
-
-sanity_check_paths = {
-    'files': ['bin/scorep', 'include/scorep/SCOREP_User.h',
-              ('lib/libscorep_adapter_mpi_event.a', 'lib64/libscorep_adapter_mpi_event.a'),
-              ('lib/libscorep_adapter_mpi_event.%s' % SHLIB_EXT, 'lib64/libscorep_adapter_mpi_event.%s' % SHLIB_EXT)],
-    'dirs': [],
-}
-
-# Ensure that local metric documentation is found by CubeGUI
-modextrapaths = {'CUBE_DOCPATH': 'share/doc/scorep/profile'}
-
-moduleclass = 'perf'
diff --git a/Overlays/jurecabooster_overlay/s/Score-P/Score-P-7.1-ipsmpi-2021b.eb b/Overlays/jurecabooster_overlay/s/Score-P/Score-P-7.1-ipsmpi-2021b.eb
deleted file mode 100644
index 66310e93b..000000000
--- a/Overlays/jurecabooster_overlay/s/Score-P/Score-P-7.1-ipsmpi-2021b.eb
+++ /dev/null
@@ -1,66 +0,0 @@
-##
-# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
-# Copyright:: Copyright 2013-2021 Juelich Supercomputing Centre, Germany
-# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
-#             Markus Geimer <m.geimer@fz-juelich.de>
-#             Christian Feld <c.feld@fz-juelich.de>
-# License::   3-clause BSD
-#
-# This work is based on experiences from the UNITE project
-# http://apps.fz-juelich.de/unite/
-##
-
-easyblock = 'EB_Score_minus_P'
-
-name = 'Score-P'
-version = '7.1'
-
-homepage = 'https://www.score-p.org'
-description = """
-The Score-P measurement infrastructure is a highly scalable and easy-to-use
-tool suite for profiling, event tracing, and online analysis of HPC
-applications.
-"""
-
-toolchain = {'name': 'ipsmpi', 'version': '2021b'}
-# Building with architectural optimizations on the KNL booster prevents
-# using the frontend tools on the frontend, and thus cross-compilation.
-# But Score-P/Scalasca does not benefit much from vectorization anyway.
-toolchainopts = {'optarch': False}
-
-source_urls = ['http://perftools.pages.jsc.fz-juelich.de/cicd/scorep/tags/scorep-%(version)s']
-sources = ['scorep-%(version)s.tar.gz']
-checksums = [
-    '98dea497982001fb82da3429ca55669b2917a0858c71abe2cfe7cd113381f1f7',  # scorep-7.1.tar.gz
-]
-
-builddependencies = [
-    ('CubeLib', '4.6'),
-    ('CubeWriter', '4.6'),
-    # Unwinding/sampling support (optional):
-    ('libunwind', '1.5.0'),
-]
-
-dependencies = [
-    # binutils is implicitly available via GCC toolchain
-    ('OPARI2', '2.0.6'),
-    ('OTF2', '2.3'),
-    # Hardware counter support (optional):
-    ('PAPI', '6.0.0.1'),
-    # PDT source-to-source instrumentation support (optional):
-    ('PDT', '3.25.1'),
-]
-
-configopts = '--enable-shared '
-
-sanity_check_paths = {
-    'files': ['bin/scorep', 'include/scorep/SCOREP_User.h',
-              ('lib/libscorep_adapter_mpi_event.a', 'lib64/libscorep_adapter_mpi_event.a'),
-              ('lib/libscorep_adapter_mpi_event.%s' % SHLIB_EXT, 'lib64/libscorep_adapter_mpi_event.%s' % SHLIB_EXT)],
-    'dirs': [],
-}
-
-# Ensure that local metric documentation is found by CubeGUI
-modextrapaths = {'CUBE_DOCPATH': 'share/doc/scorep/profile'}
-
-moduleclass = 'perf'
diff --git a/Overlays/jurecadc_overlay/b/BLIS/BLIS-3.1-GCCcore-11.2.0-amd.eb b/Overlays/jurecadc_overlay/b/BLIS/BLIS-3.1-GCCcore-11.2.0-amd.eb
deleted file mode 100644
index 70fc18ddb..000000000
--- a/Overlays/jurecadc_overlay/b/BLIS/BLIS-3.1-GCCcore-11.2.0-amd.eb
+++ /dev/null
@@ -1,45 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'BLIS'
-version = '3.1'
-versionsuffix = '-amd'
-
-homepage = 'https://developer.amd.com/amd-cpu-libraries/blas-library/'
-description = """AMD's fork of BLIS. BLIS is a portable software framework for instantiating high-performance
-BLAS-like dense linear algebra libraries."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://github.com/amd/blis/archive/']
-sources = ['%(version)s.tar.gz']
-patches = [
-    '%(name)s-0.8.1_fix_dgemm-fpe-signalling-on-broadwell.patch',
-]
-checksums = [
-    '2891948925b9db99eec02a1917d9887a7bee9ad2afc5421c9ba58602a620f2bf',  # 3.1.tar.gz
-    # BLIS-0.8.1_fix_dgemm-fpe-signalling-on-broadwell.patch
-    '345fa39933e9d1442d2eb1e4ed9129df3fe4aefecf4d104e5d4f25b3bca24d0d',
-]
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Python', '3.9.6'),
-    ('Perl', '5.34.0'),
-]
-
-# Build Serial and multithreaded library
-configopts = ['--enable-cblas --enable-shared CC="$CC" auto',
-              '--enable-cblas --enable-threading=openmp --enable-shared CC="$CC" auto']
-
-runtest = 'check'
-
-sanity_check_paths = {
-    'files': ['include/blis/cblas.h', 'include/blis/blis.h',
-              'lib/libblis.a', 'lib/libblis.%s' % SHLIB_EXT,
-              'lib/libblis-mt.a', 'lib/libblis-mt.%s' % SHLIB_EXT],
-    'dirs': [],
-}
-
-modextrapaths = {'CPATH': 'include/blis'}
-
-moduleclass = 'numlib'
diff --git a/Overlays/jurecadc_overlay/b/BullMPI-settings/BullMPI-settings-4.1-plain.eb b/Overlays/jurecadc_overlay/b/BullMPI-settings/BullMPI-settings-4.1-plain.eb
deleted file mode 100644
index fb3f863a2..000000000
--- a/Overlays/jurecadc_overlay/b/BullMPI-settings/BullMPI-settings-4.1-plain.eb
+++ /dev/null
@@ -1,42 +0,0 @@
-easyblock = 'SystemBundle'
-
-name = 'BullMPI-settings'
-version = '4.1'
-versionsuffix = 'plain'
-
-homepage = ''
-description = 'This module loads the default BullMPI configuration'
-
-site_contacts = 'd.alvarez@fz-juelich.de'
-
-toolchain = SYSTEM
-
-source_urls = []
-
-sources = []
-modextravars = {
-    'SLURM_MPI_TYPE': 'pspmix',
-    'OMPI_MCA_mca_base_component_show_load_errors': '1',
-    'OMPI_MCA_mpi_param_check': '1',
-    'OMPI_MCA_mpi_show_handle_leaks': '1',
-    'OMPI_MCA_mpi_warn_on_fork': '1',
-    # Disable uct for the time being due to:
-    # https://github.com/openucx/ucx/wiki/BullMPI-and-OpenSHMEM-installation-with-UCX#running-open-mpi-with-ucx
-    # Also openib, since it is deprecated and should be substituted by the UCX support in the pml
-    'OMPI_MCA_btl': '^uct,openib',
-    'OMPI_MCA_btl_openib_allow_ib': '1',
-    'OMPI_MCA_bml_r2_show_unreach_errors': '0',
-    'OMPI_MCA_coll': '^ml',
-    'OMPI_MCA_coll_hcoll_enable': '1',
-    'OMPI_MCA_coll_hcoll_np': '0',
-    'OMPI_MCA_pml': 'ucx',
-    'OMPI_MCA_osc': '^rdma',
-    'OMPI_MCA_opal_abort_print_stack': '1',
-    'OMPI_MCA_opal_set_max_sys_limits': '1',
-    'OMPI_MCA_opal_event_include': 'epoll',
-    'OMPI_MCA_btl_openib_warn_default_gid_prefix': '0',
-    # OMPIO does not seem to work reliably on our system
-    'OMPI_MCA_io': 'romio321',
-}
-
-moduleclass = 'system'
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
deleted file mode 100644
index 3b86e2083..000000000
--- a/Overlays/jurecadc_overlay/b/BullMPI/BullMPI-4.1.0-GCC-11.2.0.eb
+++ /dev/null
@@ -1,72 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'BullMPI'
-version = '4.1.0'
-
-homepage = 'https://www.open-mpi.org/'
-description = """BullMPI is an MPI runtime based on OpenMPI with specific optimizations"""
-
-toolchain = {'name': 'GCC', 'version': '11.2.0'}
-toolchainopts = {'pic': True}
-
-sources = [f'{name}_{version}.tar']
-checksums = ['e08cce34ce6388bd7c8203a283f48c344f25044c9efbff6a27e5f1e0cbd01b14']
-
-osdependencies = [
-    # needed for --with-verbs
-    ('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel'),
-    # needed for --with-pmix
-    ('pmix-devel'),
-]
-
-builddependencies = [
-    ('Autotools', '20210726'),
-    ('pkg-config', '0.29.2'),
-]
-
-dependencies = [
-    ('zlib', '1.2.11'),
-    ('hwloc', '2.5.0'),
-    ('UCX', '1.11.2', '', SYSTEM),
-    ('CUDA', '11.5', '', SYSTEM),
-    ('libevent', '2.1.12'),
-]
-
-start_dir = f'openmpi-{version}'
-
-unpack_options = f'&& rpm2cpio openmpi-bull-gnu-{version}-1.Bull.2.0.src.rpm | cpio -idmv && '
-unpack_options += f'tar zxvf openmpi-{version}.tar.gz'
-
-# We need to remove -march=native from CFLAGS, otherwise the compilation fails when trying to compile the op:avx
-# component, due to lack of avx512 support. avx512 is safe to enable, even on non-avx512 architectures, since it is used
-# in just one file, and the execution of that code is determined at runtime, depending on the processor ISA
-preconfigopts = 'CFLAGS="-O2 -ftree-vectorize -fno-math-errno -fPIC" '
-prebuildopts = preconfigopts
-
-# General OpenMPI options
-configopts = '--enable-shared '
-configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
-configopts += '--with-ucx=$EBROOTUCX '
-configopts += '--with-verbs '
-configopts += '--with-libevent=$EBROOTLIBEVENT '
-configopts += '--without-orte '
-configopts += '--without-psm2 '
-configopts += '--disable-oshmem '
-configopts += '--with-cuda=$EBROOTCUDA '
-configopts += '--with-ime=/opt/ddn/ime '
-configopts += '--with-gpfs '
-configopts += '--with-hcoll=$(pkg-config --variable prefix hcoll) '
-
-# to enable SLURM integration (site-specific)
-configopts += '--with-slurm --with-pmix=external --with-libevent=external --with-ompi-pmix-rte'
-
-local_libs = ["mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte"]
-sanity_check_paths = {
-    'files': ["bin/%s" % local_binfile for local_binfile in ["ompi_info", "opal_wrapper"]] +
-             ["lib/lib%s.%s" % (local_libfile, SHLIB_EXT) for local_libfile in local_libs] +
-             ["include/%s.h" % x for x in ["mpi-ext", "mpif-config",
-                                           "mpif", "mpi", "mpi_portable_platform"]],
-    'dirs': [],
-}
-
-moduleclass = 'mpi'
diff --git a/Overlays/jurecadc_overlay/l/LWP-MPI/LWP-MPI-1.7.0-gompi-2021b.eb b/Overlays/jurecadc_overlay/l/LWP-MPI/LWP-MPI-1.7.0-gompi-2021b.eb
deleted file mode 100644
index 2fa246987..000000000
--- a/Overlays/jurecadc_overlay/l/LWP-MPI/LWP-MPI-1.7.0-gompi-2021b.eb
+++ /dev/null
@@ -1,51 +0,0 @@
-easyblock = 'Rpm'
-
-name = 'LWP-MPI'
-version = '1.7.0'
-local_lwp_timestamp = '20210730182932'
-local_lwp_lib_name = 'libatos-lwp-mpi-openmpi-gcc.so'
-
-homepage = ''
-description = 'Loads the atos-lwp-mpi-openmpi-gcc 1.7.0 environment'
-
-toolchain = {'name': 'gompi', 'version': '2021b'}
-
-sources = [
-    f'atos-lwp-mpi-openmpi-gcc-{version}-Atos.{local_lwp_timestamp}.el8.x86_64.rpm',
-]
-checksums = ['4b16e726c8166ce289d0a2f03433a7172d61d79bc30e4fd9967b487ba0c6bd01']
-
-builddependencies = [
-    ('rpmrebuild', '2.16', '', SYSTEM)
-]
-
-dependencies = [
-    ('LWP', '1.1.3', '', SYSTEM),
-]
-
-modextravars = {
-    'LWP_MPI': f'%(installdir)s/lib/{local_lwp_lib_name}',
-    'atos_lwp_module_mpi': '1',
-}
-
-modextrapaths = {
-    'LWP_LIBS': f'lib/{local_lwp_lib_name}'
-}
-
-local_path_to_fix = f'/opt/tools/profilers/atos-lwp/atos-lwp-mpi-openmpi-gcc'
-
-sanity_check_paths = {
-    'dirs': ['lib', 'share'],
-    'files': [f'lib/{local_lwp_lib_name}']
-}
-
-postinstallcmds = [
-    # Move to bin/ lib64/ include/ libexec/ and share/ to the correct directory
-    f'mv %(installdir)s{local_path_to_fix}/* %(installdir)s',
-    # Clean the unneded directories
-    f'rm -Rf %(installdir)s/usr',
-    f'rm -Rf %(installdir)s/opt',
-    f'rm -Rf %(installdir)s/rpm',
-]
-
-moduleclass = 'tools'
diff --git a/Overlays/jurecadc_overlay/l/LWP-MPI/LWP-MPI-1.7.0-iimpi-2021b.eb b/Overlays/jurecadc_overlay/l/LWP-MPI/LWP-MPI-1.7.0-iimpi-2021b.eb
deleted file mode 100644
index cfc72d479..000000000
--- a/Overlays/jurecadc_overlay/l/LWP-MPI/LWP-MPI-1.7.0-iimpi-2021b.eb
+++ /dev/null
@@ -1,51 +0,0 @@
-easyblock = 'Rpm'
-
-name = 'LWP-MPI'
-version = '1.7.0'
-local_lwp_timestamp = '20210730183006'
-local_lwp_lib_name = 'libatos-lwp-mpi-intelmpi-icc.so'
-
-homepage = ''
-description = 'Loads the atos-lwp-mpi-intelmpi-icc 1.7.0 environment'
-
-toolchain = {'name': 'iimpi', 'version': '2021b'}
-
-sources = [
-    f'atos-lwp-mpi-intelmpi-icc-{version}-Atos.{local_lwp_timestamp}.el8.x86_64.rpm',
-]
-checksums = ['e7eeaad6f17a981b38d345dba101fbee6324e56f19f50397521b8647a769b3e2']
-
-builddependencies = [
-    ('rpmrebuild', '2.16', '', SYSTEM)
-]
-
-dependencies = [
-    ('LWP', '1.1.3', '', SYSTEM),
-]
-
-modextravars = {
-    'LWP_MPI': f'%(installdir)s/lib/{local_lwp_lib_name}',
-    'atos_lwp_module_mpi': '1',
-}
-
-modextrapaths = {
-    'LWP_LIBS': f'lib/{local_lwp_lib_name}'
-}
-
-local_path_to_fix = f'/opt/tools/profilers/atos-lwp/atos-lwp-mpi-intelmpi-icc'
-
-sanity_check_paths = {
-    'dirs': ['lib', 'share'],
-    'files': [f'lib/{local_lwp_lib_name}']
-}
-
-postinstallcmds = [
-    # Move to bin/ lib64/ include/ libexec/ and share/ to the correct directory
-    f'mv %(installdir)s{local_path_to_fix}/* %(installdir)s',
-    # Clean the unneded directories
-    f'rm -Rf %(installdir)s/usr',
-    f'rm -Rf %(installdir)s/opt',
-    f'rm -Rf %(installdir)s/rpm',
-]
-
-moduleclass = 'tools'
diff --git a/Overlays/jurecadc_overlay/l/LWP-settings/LWP-settings-LWP-omp.eb b/Overlays/jurecadc_overlay/l/LWP-settings/LWP-settings-LWP-omp.eb
deleted file mode 100644
index 84918c99d..000000000
--- a/Overlays/jurecadc_overlay/l/LWP-settings/LWP-settings-LWP-omp.eb
+++ /dev/null
@@ -1,23 +0,0 @@
-easyblock = 'SystemBundle'
-
-name = 'LWP-settings'
-version = 'LWP-omp'
-
-homepage = ''
-description = 'Loads the LWP-omp module for LWP'
-
-toolchain = SYSTEM
-
-modextravars = {
-    'atos_lwp_module_omp': '1',
-    'LWP_MODULE_OMPT_VERBOSE_LEVEL': '0',
-}
-
-# Ugly hack, since otherwise we can't add paths from the main installation without
-# writting an easyblock
-modluafooter = '''
-prepend_path("LWP_LIBS",pathJoin(os.getenv("EBROOTLWP") or "PATH_NOT_FOUND","lib64/liblwp_omp_gather.so"))
-setenv("LWP_OMP",pathJoin(os.getenv("EBROOTLWP") or "PATH_NOT_FOUND","lib64/liblwp_omp_publish.so"))
-'''
-
-moduleclass = 'system'
diff --git a/Overlays/jurecadc_overlay/l/LWP-settings/LWP-settings-LWP-procstat.eb b/Overlays/jurecadc_overlay/l/LWP-settings/LWP-settings-LWP-procstat.eb
deleted file mode 100644
index 4d7eee351..000000000
--- a/Overlays/jurecadc_overlay/l/LWP-settings/LWP-settings-LWP-procstat.eb
+++ /dev/null
@@ -1,16 +0,0 @@
-easyblock = 'SystemBundle'
-
-name = 'LWP-settings'
-version = 'LWP-procstat'
-
-homepage = ''
-description = 'Loads the LWP-procstat module for LWP'
-
-toolchain = SYSTEM
-
-modextravars = {
-    'atos_lwp_module_procstat': '1',
-    'LWP_MODULE_PROCSTAT_VERBOSE_LEVEL': '0',
-}
-
-moduleclass = 'system'
diff --git a/Overlays/jurecadc_overlay/l/LWP-settings/LWP-settings-LWP-sysinfo.eb b/Overlays/jurecadc_overlay/l/LWP-settings/LWP-settings-LWP-sysinfo.eb
deleted file mode 100644
index 6d13866c2..000000000
--- a/Overlays/jurecadc_overlay/l/LWP-settings/LWP-settings-LWP-sysinfo.eb
+++ /dev/null
@@ -1,16 +0,0 @@
-easyblock = 'SystemBundle'
-
-name = 'LWP-settings'
-version = 'LWP-sysinfo'
-
-homepage = ''
-description = 'Loads the LWP-sysinfo module for LWP'
-
-toolchain = SYSTEM
-
-modextravars = {
-    'atos_lwp_module_sysinfo': '1',
-    'LWP_MODULE_SYSINFO_VERBOSE_LEVEL': '0',
-}
-
-moduleclass = 'system'
diff --git a/Overlays/jurecadc_overlay/l/LWP-settings/LWP-settings-LWP-vmstat.eb b/Overlays/jurecadc_overlay/l/LWP-settings/LWP-settings-LWP-vmstat.eb
deleted file mode 100644
index d23f271ac..000000000
--- a/Overlays/jurecadc_overlay/l/LWP-settings/LWP-settings-LWP-vmstat.eb
+++ /dev/null
@@ -1,16 +0,0 @@
-easyblock = 'SystemBundle'
-
-name = 'LWP-settings'
-version = 'LWP-vmstat'
-
-homepage = ''
-description = 'Loads the LWP-vmstat module for LWP'
-
-toolchain = SYSTEM
-
-modextravars = {
-    'atos_lwp_module_vmstat': '1',
-    'LWP_MODULE_VMSTAT_VERBOSE_LEVEL': '0',
-}
-
-moduleclass = 'system'
diff --git a/Overlays/jurecadc_overlay/l/LWP/LWP-1.1.3.eb b/Overlays/jurecadc_overlay/l/LWP/LWP-1.1.3.eb
deleted file mode 100644
index 2a4c7c8fa..000000000
--- a/Overlays/jurecadc_overlay/l/LWP/LWP-1.1.3.eb
+++ /dev/null
@@ -1,67 +0,0 @@
-easyblock = 'Rpm'
-
-name = 'LWP'
-version = '1.1.3'
-local_lwp_omp_version = '1.0.4'
-local_lwp_timestamp = '20210730182824'
-
-homepage = ''
-description = """Lightweight Profiler (LWP) is a lightweight tool for monitoring applications running on supercomputers.
-It was designed to collect different kinds of useful data like CPU metrics, memory utilization, energy consumption, MPI
-communication events, etc. It is used as a wrapper for an application; the user invokes LWP explicitly via the command
-line. LWP is modular by its nature, so each type of data is collected by a specific component."""
-
-toolchain = SYSTEM
-
-sources = [
-    f'atos-lwp-{version}-Atos.{local_lwp_timestamp}.el8.x86_64.rpm',
-    f'atos-lwp-doc-{version}-Atos.{local_lwp_timestamp}.el8.noarch.rpm',
-    f'atos-lwp-omp-{local_lwp_omp_version}-Atos.20210730183139.el8.x86_64.rpm',
-    f'atos-lwp-procstat_module-{version}-Atos.{local_lwp_timestamp}.el8.x86_64.rpm',
-    f'atos-lwp-sysinfo_module-{version}-Atos.{local_lwp_timestamp}.el8.x86_64.rpm',
-    f'atos-lwp-vmstat_module-{version}-Atos.{local_lwp_timestamp}.el8.x86_64.rpm',
-]
-checksums = [
-    # atos-lwp-1.1.3-Atos.20210730182824.el8.x86_64.rpm
-    '4050a2ee0bd602a749a853df6628101e772df75a7f8a0f38967d2766f276c2d5',
-    # atos-lwp-doc-1.1.3-Atos.20210730182824.el8.noarch.rpm
-    '2336fd8b1fa33b6969b145fd1eec06bf54fe2bdfea170e9c3b6b452cdd4c535a',
-    # atos-lwp-omp-1.0.4-Atos.20210730183139.el8.x86_64.rpm
-    '92ea8528c2e9a82cd6824cd5c8630845246fe72298b03154379b4220e6fc6763',
-    # atos-lwp-procstat_module-1.1.3-Atos.20210730182824.el8.x86_64.rpm
-    'a4e8f9b8bde6b96718bb586a11c3fc5de5e9c0f4aaf4aabeb974f92717f0adb5',
-    # atos-lwp-sysinfo_module-1.1.3-Atos.20210730182824.el8.x86_64.rpm
-    '7f0cabf5a564eb38aaae2c0f05364dea60a371c2d94fe147674bfa7af5bd610d',
-    # atos-lwp-vmstat_module-1.1.3-Atos.20210730182824.el8.x86_64.rpm
-    '68fe0b5b9b054096c28e92e43aefb292c8c8c064c1baca8449e22c35b1aee441',
-]
-
-builddependencies = [
-    ('rpmrebuild', '2.16', '', SYSTEM)
-]
-
-modextravars = {
-    'LWP_MODULES_DIR': f'%(installdir)s/lib64/atos-lwp',
-    'LWP': '%(installdir)s/lib64/liblwp_envmodule.so',
-    'LWP_VERBOSE_LEVEL': '0',
-    'LWP_DELAY': '5',
-    'MPI_AS_MODULE': '0',
-}
-
-modextrapaths = {
-    'LWP_LIBS': 'lib64/liblwp_envmodule.so'
-}
-
-local_path_to_fix = f'/opt/tools/profilers/atos-lwp'
-
-postinstallcmds = [
-    # Move to bin/ lib64/ include/ libexec/ and share/ to the correct directory
-    f'mv %(installdir)s{local_path_to_fix}/* %(installdir)s',
-    # Clean the unneded directories
-    f'rm -Rf %(installdir)s/usr',
-    f'rm -Rf %(installdir)s/opt',
-    f'rm -Rf %(installdir)s/scripts',
-    f'rm -Rf %(installdir)s/rpm',
-]
-
-moduleclass = 'tools'
diff --git a/Overlays/jurecadc_overlay/p/pscom/pscom-5.4-default.eb b/Overlays/jurecadc_overlay/p/pscom/pscom-5.4-default.eb
deleted file mode 100644
index 34e52dbb2..000000000
--- a/Overlays/jurecadc_overlay/p/pscom/pscom-5.4-default.eb
+++ /dev/null
@@ -1,50 +0,0 @@
-easyblock = 'CMakeMake'
-
-name = 'pscom'
-# Create drop-in replacement version that ensures overriding behaviour
-version = '5.4-default'
-local_realversion = '5.4.8-1_gw'
-homepage = 'http://www.par-tec.com'
-description = """ParaStation is a robust and efficient cluster middleware, consisting of a high-performance
-communication layer (MPI) and a sophisticated management layer.
-"""
-
-toolchain = SYSTEM
-
-sources = ['%%(name)s-%s.tar.gz' % local_realversion]
-checksums = ['bfb43102738d45b64d8301eaea2527885369d3e93c7e9638ef4ad1934909b11f']
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('popt', '1.18'),
-    ('CUDA', '11.5'),
-    ('CMake', '3.21.1'),
-]
-
-dependencies = [
-    ('UCX', '1.11.2'),
-]
-
-build_type = 'RelWithDebInfo'
-
-preconfigopts = 'export UCP_LDFLAGS="-L$EBROOTUCX/lib" && '
-preconfigopts += 'export CUDA_LDFLAGS="-L$EBROOTNVIDIA/lib64" &&'
-
-configopts = '-DCUDA_ENABLED=ON'
-
-sanity_check_paths = {
-    'files': [
-        'include/%(name)s.h',
-        ('lib/libpscom.so', 'lib64/libpscom.so'),
-        ('lib/libpscom4ucp.so', 'lib64/libpscom4ucp.so'),
-        ('lib/libpscom4openib.so', 'lib64/libpscom4openib.so'),
-        ('lib/libpscom4gateway.so', 'lib64/libpscom4gateway.so'),
-    ],
-    'dirs': [],
-}
-
-modextravars = {
-    'PSCOMVERSION': '%s' % local_realversion,
-}
-
-moduleclass = 'tools'
diff --git a/Overlays/jusuf_overlay/b/BLIS/BLIS-3.1-GCCcore-11.2.0-amd.eb b/Overlays/jusuf_overlay/b/BLIS/BLIS-3.1-GCCcore-11.2.0-amd.eb
deleted file mode 100644
index 70fc18ddb..000000000
--- a/Overlays/jusuf_overlay/b/BLIS/BLIS-3.1-GCCcore-11.2.0-amd.eb
+++ /dev/null
@@ -1,45 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'BLIS'
-version = '3.1'
-versionsuffix = '-amd'
-
-homepage = 'https://developer.amd.com/amd-cpu-libraries/blas-library/'
-description = """AMD's fork of BLIS. BLIS is a portable software framework for instantiating high-performance
-BLAS-like dense linear algebra libraries."""
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://github.com/amd/blis/archive/']
-sources = ['%(version)s.tar.gz']
-patches = [
-    '%(name)s-0.8.1_fix_dgemm-fpe-signalling-on-broadwell.patch',
-]
-checksums = [
-    '2891948925b9db99eec02a1917d9887a7bee9ad2afc5421c9ba58602a620f2bf',  # 3.1.tar.gz
-    # BLIS-0.8.1_fix_dgemm-fpe-signalling-on-broadwell.patch
-    '345fa39933e9d1442d2eb1e4ed9129df3fe4aefecf4d104e5d4f25b3bca24d0d',
-]
-
-builddependencies = [
-    ('binutils', '2.37'),
-    ('Python', '3.9.6'),
-    ('Perl', '5.34.0'),
-]
-
-# Build Serial and multithreaded library
-configopts = ['--enable-cblas --enable-shared CC="$CC" auto',
-              '--enable-cblas --enable-threading=openmp --enable-shared CC="$CC" auto']
-
-runtest = 'check'
-
-sanity_check_paths = {
-    'files': ['include/blis/cblas.h', 'include/blis/blis.h',
-              'lib/libblis.a', 'lib/libblis.%s' % SHLIB_EXT,
-              'lib/libblis-mt.a', 'lib/libblis-mt.%s' % SHLIB_EXT],
-    'dirs': [],
-}
-
-modextrapaths = {'CPATH': 'include/blis'}
-
-moduleclass = 'numlib'
diff --git a/Overlays/jusuf_overlay/x/XZ/XZ-5.2.5-GCCcore-11.2.0.eb b/Overlays/jusuf_overlay/x/XZ/XZ-5.2.5-GCCcore-11.2.0.eb
deleted file mode 100644
index 3b89a6b57..000000000
--- a/Overlays/jusuf_overlay/x/XZ/XZ-5.2.5-GCCcore-11.2.0.eb
+++ /dev/null
@@ -1,41 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'XZ'
-version = '5.2.5'
-
-homepage = 'https://tukaani.org/xz/'
-description = "xz: XZ utilities"
-
-site_contacts = 'sc@fz-juelich.de'
-
-toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
-
-source_urls = ['https://tukaani.org/xz/']
-sources = [SOURCELOWER_TAR_BZ2]
-patches = ['XZ-5.2.2_compat-libs.patch']
-checksums = [
-    '5117f930900b341493827d63aa910ff5e011e0b994197c3b71c08a20228a42df',  # xz-5.2.5.tar.bz2
-    # XZ-5.2.2_compat-libs.patch
-    '578da3ea2ddb551972891a60fe31478b16a516d6ea8b6aa3af89e1d558adb703',
-]
-
-builddependencies = [
-    # use gettext built with system toolchain as build dep to avoid cyclic dependency (XZ -> gettext -> libxml2 -> XZ)
-    ('gettext', '0.21', '', SYSTEM),
-    ('binutils', '2.37'),
-]
-
-# may become useful in non-x86 archs
-# configopts = ' --disable-assembler '
-
-sanity_check_paths = {
-    'files': ['bin/lzmainfo', 'bin/unxz', 'bin/xz'],
-    'dirs': []
-}
-
-sanity_check_commands = [
-    "xz --help",
-    "unxz --help",
-]
-
-moduleclass = 'tools'
diff --git a/Overlays/juwels_overlay/r/R/R-4.1.2-gcccoremkl-11.2.0-2021.4.0.eb b/Overlays/juwels_overlay/r/R/R-4.1.2-gcccoremkl-11.2.0-2021.4.0.eb
deleted file mode 100644
index 5f4b2522a..000000000
--- a/Overlays/juwels_overlay/r/R/R-4.1.2-gcccoremkl-11.2.0-2021.4.0.eb
+++ /dev/null
@@ -1,3198 +0,0 @@
-name = 'R'
-version = '4.1.2'
-
-homepage = 'https://www.r-project.org/'
-description = """R is a free software environment for statistical computing
- and graphics."""
-
-toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
-
-source_urls = ['https://cloud.r-project.org/src/base/R-%(version_major)s']
-sources = [SOURCE_TAR_GZ]
-patches = ['%(name)s-4.1.0_identify-flexiblas-in-configure.patch']
-checksums = [
-    '2036225e9f7207d4ce097e54972aecdaa8b40d7d9911cd26491fac5a0fab38af',  # R-4.1.2.tar.gz
-    '2c6720e2e144ae4fe00842daab0ebba72241080603e0ff1a6ca758738041b257',  # R-4.1.0_identify-flexiblas-in-configure.patch
-]
-
-builddependencies = [
-    ('pkg-config', '0.29.2'),
-    ('XServer', '1.20.13'),
-]
-
-dependencies = [
-    ('Java', '15', '', SYSTEM),
-    ('X11', '20210802'),
-    ('OpenGL', '2021b'),
-    ('cairo', '1.16.0'),
-    ('libreadline', '8.1'),
-    ('ncurses', '6.2'),
-    ('bzip2', '1.0.8'),
-    ('XZ', '5.2.5'),
-    ('zlib', '1.2.11'),
-    ('SQLite', '3.36'),
-    ('PCRE2', '10.37'),
-    ('libpng', '1.6.37'),  # for plotting in R
-    ('libjpeg-turbo', '2.1.1'),  # for plottting in R
-    ('LibTIFF', '4.3.0'),
-    ('Tk', '8.6.11'),  # for tcltk
-    ('cURL', '7.78.0'),  # for RCurl
-    ('libxml2', '2.9.10'),  # for XML
-    ('PROJ', '8.1.0'),  # for rgdal
-    ('GMP', '6.2.1'),  # for igraph
-    ('NLopt', '2.7.0'),  # for nloptr
-    ('FFTW', '3.3.10', '-nompi'),  # for fftw
-    ('libsndfile', '1.0.31'),  # for seewave
-    ('ICU', '70.1'),  # for rJava & gdsfmt
-    ('HDF5', '1.12.1', '-serial'),  # for hdf5r
-    ('UDUNITS', '2.2.28'),  # for units
-    ('GSL', '2.7'),  # for RcppGSL
-    ('ImageMagick', '7.1.0-13'),  # for animation
-    ('GLPK', '5.0'),  # for Rglpk
-    ('netCDF', '4.8.1', '-serial'),  # the ndf4 needs it
-    ('GEOS', '3.9.1'),  # for rgeos
-    ('nodejs', '16.13.0'),  # for V8 (required by rstan)
-    ('GDAL', '3.3.2'),  # for sf
-    ('MPFR', '4.1.0'),  # for Rmpfr
-    ('libgit2', '1.1.1'),
-    ('ZeroMQ', '4.3.4'),  # for pbdZMQ needed by IRkernel
-    ('OpenSSL', '1.1', '', True),
-    ('texlive', '20200406'),
-]
-
-
-# Some R extensions (mclust, quantreg, waveslim for example) require the math library (-lm) to avoid undefined symbols.
-# Adding it to FLIBS makes sure it is present when needed.
-preconfigopts = 'export FLIBS="$FLIBS -lm" && '
-
-configopts = "--with-pic --enable-threads --enable-R-shlib"
-# some recommended packages may fail in a parallel build (e.g. Matrix), and
-# we're installing them anyway below
-configopts += " --with-recommended-packages=no"
-
-# specify that at least EasyBuild v3.5.0 is required,
-# since we rely on the updated easyblock for R to configure correctly w.r.t. BLAS/LAPACK
-easybuild_version = '3.5.0'
-
-exts_default_options = {
-    'source_urls': [
-        'https://cran.r-project.org/src/contrib/Archive/%(name)s',  # package archive
-        'https://cran.r-project.org/src/contrib/',  # current version of packages
-        'https://cran.freestatistics.org/src/contrib',  # mirror alternative for current packages
-    ],
-    'source_tmpl': '%(name)s_%(version)s.tar.gz',
-}
-
-# !! order of packages is important !!
-# packages updated on 1st November 2021
-exts_list = [
-    'base',
-    'compiler',
-    'datasets',
-    'graphics',
-    'grDevices',
-    'grid',
-    'methods',
-    'parallel',
-    'splines',
-    'stats',
-    'stats4',
-    'tcltk',
-    'tools',
-    'utils',
-    # ('Rmpi', '0.6-9.2', {
-    #     'checksums': ['358ac1af97402e676f209261a231f36a35e60f0301edf8ca53dac11af3c3bd1a'],
-    # }),
-    ('abind', '1.4-5', {
-        'checksums': ['3a3ace5afbcb86e56889efcebf3bf5c3bb042a282ba7cc4412d450bb246a3f2c'],
-    }),
-    ('magic', '1.5-9', {
-        'checksums': ['fa1d5ef2d39e880f262d31b77006a2a7e76ea38e306aae4356e682b90d6cd56a'],
-    }),
-    ('Rcpp', '1.0.7', {
-        'checksums': ['15e5a4732216daed16263c79fb37017c2ada84a2d4e785e3b76445d0eba3dc1d'],
-    }),
-    ('RcppProgress', '0.4.2', {
-        'checksums': ['b1624b21b7aeb1dafb30f092b2a4bef4c3504efd2d6b00b2cdf55dc9df194b48'],
-    }),
-    ('lpSolve', '5.6.15', {
-        'checksums': ['4627be4178abad34fc85a7d264c2eb5e27506f007e46687b0b8a4f8fbdf4f3ba'],
-    }),
-    ('linprog', '0.9-2', {
-        'checksums': ['8937b2e30692e38de1713f1513b78f505f73da6f5b4a576d151ad60bac2221ce'],
-    }),
-    ('geometry', '0.4.5', {
-        'checksums': ['8fedd17c64468721d398e3c17a39706321ab71098b29f5e8d8039dd115a220d8'],
-    }),
-    ('bit', '4.0.4', {
-        'checksums': ['e404841fbe4ebefe4ecd4392effe673a8c9fa05f97952c4ce6e2f6159bd2f168'],
-    }),
-    ('filehash', '2.4-2', {
-        'checksums': ['b6d056f75d45e315943a4618f5f62802612cd8931ba3f9f474b595140a3cfb93'],
-    }),
-    ('ff', '4.0.5', {
-        'checksums': ['9aba9e271144ec224063ddba0d791e2fcdb9c912d48fdc49e204fce628355037'],
-    }),
-    ('bnlearn', '4.7', {
-        'checksums': ['2e1dd7ba9b7cf07e51eec3238684310edbeb0573d9b907049fb6b28db3022817'],
-    }),
-    ('bootstrap', '2019.6', {
-        'checksums': ['5252fdfeb944cf1fae35016d35f9333b1bd1fc8c6d4a14e33901160e21968694'],
-    }),
-    ('combinat', '0.0-8', {
-        'checksums': ['1513cf6b6ed74865bfdd9f8ca58feae12b62f38965d1a32c6130bef810ca30c1'],
-    }),
-    ('deal', '1.2-39', {
-        'checksums': ['a349db8f1c86cbd8315c068da49314ce9eb585dbb50d2e5ff09300506bd8806b'],
-    }),
-    ('fdrtool', '1.2.16', {
-        'checksums': ['e7dea648ee018e2c8c8834084051c76f7e8b2b42067772c62035a941c32457a9'],
-    }),
-    ('formatR', '1.11', {
-        'checksums': ['bd81662d09cf363652761e63ba5969c71be4dd5ae6fc9098f440d6729254a30c'],
-    }),
-    ('gtools', '3.9.2', {
-        'checksums': ['03b1898bf581f6d12fa90e23ff700cfa7c834ac10c6654bdac42d7ec943fa953'],
-    }),
-    ('gdata', '2.18.0', {
-        'checksums': ['4b287f59f5bbf5fcbf18db16477852faac4a605b10c5284c46b93fa6e9918d7f'],
-    }),
-    ('GSA', '1.03.1', {
-        'checksums': ['e192d4383f53680dbd556223ea5f8cad6bae62a80a337ba5fd8d05a8aee6a917'],
-    }),
-    ('xfun', '0.27', {
-        'checksums': ['c775bf33a6bc57f8022960cbf7dc20a4e82175a9c71807b2723f46ade6805485'],
-    }),
-    ('highr', '0.9', {
-        'checksums': ['beff11390d936c90fdcc00e7ed0eb72220f3de403a51b56659e3d3e0b6d8ed4d'],
-    }),
-    ('infotheo', '1.2.0', {
-        'checksums': ['9b47ebc3db5708c88dc014b4ffec6734053a9c255a9241fcede30fec3e63aaa3'],
-    }),
-    ('lars', '1.2', {
-        'checksums': ['64745b568f20b2cfdae3dad02fba92ebf78ffee466a71aaaafd4f48c3921922e'],
-    }),
-    ('lazy', '1.2-16', {
-        'checksums': ['c796c8b987ed1bd9dfddd593e17312ed681fc4fa3a1ecfe51da2def0ac1e50df'],
-    }),
-    ('kernlab', '0.9-29', {
-        'checksums': ['c3da693a0041dd34f869e7b63a8d8cf7d4bc588ac601bcdddcf7d44f68b3106f'],
-    }),
-    ('mime', '0.12', {
-        'checksums': ['a9001051d6c1e556e881910b1816b42872a1ee41ab76d0040ce66a27135e3849'],
-    }),
-    ('markdown', '1.1', {
-        'checksums': ['8d8cd47472a37362e615dbb8865c3780d7b7db694d59050e19312f126e5efc1b'],
-    }),
-    ('mlbench', '2.1-3', {
-        'checksums': ['b1f92be633243185ab86e880a1e1ac5a4dd3c535d01ebd187a4872d0a8c6f194'],
-    }),
-    ('NLP', '0.2-1', {
-        'checksums': ['05eaa453ad2757311c073fd30093c738b20a977c5089031eb454345a1d01f2b6'],
-    }),
-    ('mclust', '5.4.7', {
-        'checksums': ['45f5a666caee5bebd3160922b8655295a25e37f624741f6574365e4ac5a14c23'],
-    }),
-    ('RANN', '2.6.1', {
-        'checksums': ['b299c3dfb7be17aa41e66eff5674fddd2992fb6dd3b10bc59ffbf0c401697182'],
-    }),
-    ('rmeta', '3.0', {
-        'checksums': ['b9f9d405935cffcd7a5697ff13b033f9725de45f4dc7b059fd68a7536eb76b6e'],
-    }),
-    ('segmented', '1.3-4', {
-        'checksums': ['8276bfbb3e5c1d7a9a61098f72ac9b2b0f52c89ae9f9b715f76b22303cc3902d'],
-    }),
-    ('som', '0.3-5.1', {
-        'checksums': ['a6f4c0e5b36656b7a8ea144b057e3d7642a8b71972da387a7133f3dd65507fb9'],
-    }),
-    ('SuppDists', '1.1-9.5', {
-        'checksums': ['680b67145c07d44e200275e08e48602fe19cd99fb106c05422b3f4a244c071c4'],
-    }),
-    ('stabledist', '0.7-1', {
-        'checksums': ['06c5704d3a3c179fa389675c537c39a006867bc6e4f23dd7e406476ed2c88a69'],
-    }),
-    ('survivalROC', '1.0.3', {
-        'checksums': ['1449e7038e048e6ad4d3f7767983c0873c9c7a7637ffa03a4cc7f0e25c31cd72'],
-    }),
-    ('pspline', '1.0-18', {
-        'checksums': ['f71cf293bd5462e510ac5ad16c4a96eda18891a0bfa6447dd881c65845e19ac7'],
-    }),
-    ('timeDate', '3043.102', {
-        'checksums': ['377cba03cddab8c6992e31d0683c1db3a73afa9834eee3e95b3b0723f02d7473'],
-    }),
-    ('longmemo', '1.1-2', {
-        'checksums': ['7964e982287427dd58f98e1144e468ae0cbd572d25a4bea6ca9ae9c7522f3207'],
-    }),
-    ('ADGofTest', '0.3', {
-        'checksums': ['9cd9313954f6ecd82480d373f6c5371ca84ab33e3f5c39d972d35cfcf1096846'],
-    }),
-    ('MASS', '7.3-54', {
-        'checksums': ['eb644c0e94b447c46387aa22436ef5a43192960ee9cfd0df2940f4a4116179ae'],
-    }),
-    ('pixmap', '0.4-12', {
-        'checksums': ['893ba894d4348ba05e6edf9c1b4fd201191816b444a214f7a6b2c0a79b0a2aec'],
-    }),
-    ('lattice', '0.20-45', {
-        'checksums': ['22388d92bdb7d3959da84d7308d9026dd8226ef07580783729e8ad2f7d7507ad'],
-    }),
-    ('sp', '1.4-5', {
-        'checksums': ['6beeb216d540475cdead5f2c72d6c7ee400fe2423c1882d72cf57f6df58f09da'],
-    }),
-    ('pkgconfig', '2.0.3', {
-        'checksums': ['330fef440ffeb842a7dcfffc8303743f1feae83e8d6131078b5a44ff11bc3850'],
-    }),
-    ('rlang', '0.4.12', {
-        'checksums': ['2a26915738be120a56ec93e781bcb50ffa1031e11904544198b4a15c35029915'],
-    }),
-    ('ellipsis', '0.3.2', {
-        'checksums': ['a90266e5eb59c7f419774d5c6d6bd5e09701a26c9218c5933c9bce6765aa1558'],
-    }),
-    ('digest', '0.6.28', {
-        'checksums': ['4a328c75e95f8522fc07390d1dd00c19fb643f558e761a8aed04f99c1dc7db00'],
-    }),
-    ('glue', '1.4.2', {
-        'checksums': ['9f7354132a26e9a876428fa87629b9aaddcd558f9932328e6ac065b95b8ef7ad'],
-    }),
-    ('vctrs', '0.3.8', {
-        'checksums': ['7f4e8b75eda115e69dddf714f0643eb889ad61017cdc13af24389aab2a2d1bb1'],
-    }),
-    ('lifecycle', '1.0.1', {
-        'checksums': ['1da76e1c00f1be96ca34e122ae611259430bf99d6a1b999fdef70c00c30f7ba0'],
-    }),
-    ('hms', '1.1.1', {
-        'checksums': ['6b5f30db1845c70d27b5de33f31caa487cdd0787cd80a4073375e5f482269062'],
-    }),
-    ('prettyunits', '1.1.1', {
-        'checksums': ['9a199aa80c6d5e50fa977bc724d6e39dae1fc597a96413053609156ee7fb75c5'],
-    }),
-    ('R6', '2.5.1', {
-        'checksums': ['8d92bd29c2ed7bf15f2778618ffe4a95556193d21d8431a7f75e7e5fc102bf48'],
-    }),
-    ('crayon', '1.4.2', {
-        'checksums': ['ee34397f643e76e30588068d4c93bd3c9afd2193deacccacb3bffcadf141b857'],
-    }),
-    ('progress', '1.2.2', {
-        'checksums': ['b4a4d8ed55db99394b036a29a0fb20b5dd2a91c211a1d651c52a1023cc58ff35'],
-    }),
-    ('ade4', '1.7-18', {
-        'checksums': ['ecb6f4c42c60f39702aa96f454bb536a333049c9608ee2b6bdf8795e059cc525'],
-    }),
-    ('AlgDesign', '1.2.0', {
-        'checksums': ['ff86c9e19505770520e7614970ad19c698664d08001ce888b8603e44c2a3b52a'],
-    }),
-    ('base64enc', '0.1-3', {
-        'checksums': ['6d856d8a364bcdc499a0bf38bfd283b7c743d08f0b288174fba7dbf0a04b688d'],
-    }),
-    ('BH', '1.75.0-0', {
-        'checksums': ['ae4c10992607dd697663f60675a46a5770851da159330bb63c4a68890bdd6f5a'],
-    }),
-    ('brew', '1.0-6', {
-        'checksums': ['d70d1a9a01cf4a923b4f11e4374ffd887ad3ff964f35c6f9dc0f29c8d657f0ed'],
-    }),
-    ('Brobdingnag', '1.2-6', {
-        'checksums': ['19eccaed830ce9d93b70642f6f126ac66722a98bbd48586899cc613dd9966ad4'],
-    }),
-    ('corpcor', '1.6.10', {
-        'checksums': ['71a04c503c93ec95ddde09abe8c7ddeb36175b7da76365a14b27066383e10e09'],
-    }),
-    ('longitudinal', '1.1.12', {
-        'checksums': ['d4f894c38373ba105b1bdc89e3e7c1b215838e2fb6b4470b9f23768b84e603b5'],
-    }),
-    ('backports', '1.3.0', {
-        'checksums': ['4f231e91ca8298fb1a27810ef5dd4c84e05c2b2b6f6748eab68f70ff4827812d'],
-    }),
-    ('checkmate', '2.0.0', {
-        'checksums': ['0dc25b0e20c04836359df1885d099c6e4ad8ae0e585a9e4107f7ea945d9c6fa4'],
-    }),
-    ('cubature', '2.0.4.2', {
-        'checksums': ['605bdd9d90fb6645359cccd1b289c5afae235b46360ef5bdd2001aa307a7694e'],
-    }),
-    ('DEoptimR', '1.0-9', {
-        'checksums': ['6151aa74f52ff4be664343e3992749e63235ebba51c9fded3775c1a2407c6512'],
-    }),
-    ('fastmatch', '1.1-3', {
-        'checksums': ['1defa0b08bc3f48e4c3e4ba8df4f1b9e8299932fd8c747c67d32de44f90b9861'],
-    }),
-    ('ffbase', '0.13.3', {
-        'checksums': ['b3f61f80ba6851130247779786903d42a24ee5219aa24556c8470aece8a2e6b6'],
-    }),
-    ('iterators', '1.0.13', {
-        'checksums': ['778e30e4c292da9f94d62acc637cf55273dae258199d847e62658f44840f11a4'],
-    }),
-    ('maps', '3.4.0', {
-        'checksums': ['7918ccb2393ca19589d4c4e77d9ebe863dc6317ebfc1ff41869dbfaf439f5747'],
-    }),
-    ('nnls', '1.4', {
-        'checksums': ['0e5d77abae12bc50639d34354f96a8e079408c9d7138a360743b73bd7bce6c1f'],
-    }),
-    ('sendmailR', '1.2-1', {
-        'checksums': ['04feb08c6c763d9c58b2db24b1222febe01e28974eac4fe87670be6fb9bff17c'],
-    }),
-    ('dotCall64', '1.0-1', {
-        'checksums': ['f10b28fcffb9453b1d8888a72c8fd2112038b5ac33e02a481492c7bd249aa5c6'],
-    }),
-    ('spam', '2.7-0', {
-        'checksums': ['632b5c48f587a34c997a487b72099c9c89d76a43f2cd9a36cb95fdec1d07850d'],
-    }),
-    ('subplex', '1.6', {
-        'checksums': ['0d05da1622fffcd20a01cc929fc6c2b7df40a8246e7018f7f1f3c175b774cbf9'],
-    }),
-    ('stringi', '1.7.5', {
-        'checksums': ['2914cc34e1cbfb65147090263b0e1bf2727ad32bc9bb860732094fecff4b2565'],
-    }),
-    ('magrittr', '2.0.1', {
-        'checksums': ['75c265d51cc2b34beb27040edb09823c7b954d3990a7a931e40690b75d4aad5f'],
-    }),
-    ('stringr', '1.4.0', {
-        'checksums': ['87604d2d3a9ad8fd68444ce0865b59e2ffbdb548a38d6634796bbd83eeb931dd'],
-    }),
-    ('evaluate', '0.14', {
-        'checksums': ['a8c88bdbe4e60046d95ddf7e181ee15a6f41cdf92127c9678f6f3d328a3c5e28'],
-    }),
-    ('logspline', '2.1.16', {
-        'checksums': ['7418491b8c778483c24e4354ee47b1e1b1d68b0057c12d6e012cce7d4e6c138a'],
-    }),
-    ('ncbit', '2013.03.29', {
-        'checksums': ['4480271f14953615c8ddc2e0666866bb1d0964398ba0fab6cc29046436820738'],
-    }),
-    ('permute', '0.9-5', {
-        'checksums': ['d2885384a07497e8df273689d6713fc7c57a7c161f6935f3572015e16ab94865'],
-    }),
-    ('plotrix', '3.8-2', {
-        'checksums': ['bb72953102889cea41cd6521874e35d2458ebd10aab97ba6f262e102cac0bc1f'],
-    }),
-    ('randomForest', '4.6-14', {
-        'checksums': ['f4b88920419eb0a89d0bc5744af0416d92d112988702dc726882394128a8754d'],
-    }),
-    ('scatterplot3d', '0.3-41', {
-        'checksums': ['4c8326b70a3b2d37126ca806771d71e5e9fe1201cfbe5b0d5a0a83c3d2c75d94'],
-    }),
-    ('SparseM', '1.81', {
-        'checksums': ['bd838f381ace680fa38508ff70b3d83cb9ffa28ac1ab568509249bca53c34b33'],
-    }),
-    ('tripack', '1.3-9.1', {
-        'checksums': ['7f82f8d63741c468767acc6fb35281bd9903f6c3c52e8fada60a6ae317511fbe'],
-    }),
-    ('irace', '3.4.1', {
-        'checksums': ['7eea92ba42e6ba320fa8bdca3c53091ae42f26a0f097244f65e7e117f6d514b6'],
-    }),
-    ('rJava', '1.0-5', {
-        'checksums': ['2fdba5774f6333440e0ef6d96567b37f9f382820242a4d885f2891796fb36fde'],
-    }),
-    ('RColorBrewer', '1.1-2', {
-        'checksums': ['f3e9781e84e114b7a88eb099825936cc5ae7276bbba5af94d35adb1b3ea2ccdd'],
-    }),
-    ('png', '0.1-7', {
-        'checksums': ['e269ff968f04384fc9421d17cfc7c10cf7756b11c2d6d126e9776f5aca65553c'],
-    }),
-    ('jpeg', '0.1-9', {
-        'checksums': ['01a175442ec209b838a56a66a3908193aca6f040d537da7838d9368e46913072'],
-    }),
-    ('latticeExtra', '0.6-29', {
-        'checksums': ['6cadc31d56f73d926e2e8d72e43ae17ac03607a4d1a374719999a4a231e3df11'],
-    }),
-    ('Matrix', '1.3-4', {
-        'checksums': ['ab42179d44545e99bbdf44bb6d04cab051dd2aba552b1f6edd51ed71b55f6c39'],
-    }),
-    ('RcppArmadillo', '0.10.7.0.0', {
-        'checksums': ['01a8eac49d5b2bcefcba076f0ee7b234bee3d22d54d7f4d56d9a6ae7cbea65f4'],
-    }),
-    ('plyr', '1.8.6', {
-        'checksums': ['ea55d26f155443e9774769531daa5d4c20a0697bb53abd832e891b126c935287'],
-    }),
-    ('gtable', '0.3.0', {
-        'checksums': ['fd386cc4610b1cc7627dac34dba8367f7efe114b968503027fb2e1265c67d6d3'],
-    }),
-    ('reshape2', '1.4.4', {
-        'checksums': ['d88dcf9e2530fa9695fc57d0c78adfc5e361305fe8919fe09410b17da5ca12d8'],
-    }),
-    ('dichromat', '2.0-0', {
-        'checksums': ['31151eaf36f70bdc1172da5ff5088ee51cc0a3db4ead59c7c38c25316d580dd1'],
-    }),
-    ('colorspace', '2.0-2', {
-        'checksums': ['b891cd2ec129ed5f116429345947bcaadc33969758a108521eb0cf36bd12183a'],
-    }),
-    ('munsell', '0.5.0', {
-        'checksums': ['d0f3a9fb30e2b5d411fa61db56d4be5733a2621c0edf017d090bdfa5e377e199'],
-    }),
-    ('labeling', '0.4.2', {
-        'checksums': ['e022d79276173e0d62bf9e37d7574db65ab439eb2ae1833e460b1cff529bd165'],
-    }),
-    ('viridisLite', '0.4.0', {
-        'checksums': ['849955dc8ad9bc52bdc50ed4867fd92a510696fc8294e6971efa018437c83c6a'],
-    }),
-    ('farver', '2.1.0', {
-        'checksums': ['e5c8630607049f682fb3002b99ca4f5e7c6b94f8b2a4342df594e7853b77cef4'],
-    }),
-    ('scales', '1.1.1', {
-        'checksums': ['40b2b66522f1f314a20fd09426011b0cdc9d16b23ee2e765fe1930292dd03705'],
-    }),
-    ('utf8', '1.2.2', {
-        'checksums': ['a71aee87d43a9bcf29249c7a5a2e9ca1d2a836e8d5ee3a264d3062f25378d8f4'],
-    }),
-    ('zeallot', '0.1.0', {
-        'checksums': ['439f1213c97c8ddef9a1e1499bdf81c2940859f78b76bc86ba476cebd88ba1e9'],
-    }),
-    ('assertthat', '0.2.1', {
-        'checksums': ['85cf7fcc4753a8c86da9a6f454e46c2a58ffc70c4f47cac4d3e3bcefda2a9e9f'],
-    }),
-    ('fansi', '0.5.0', {
-        'checksums': ['9d1bf8c316969c163abd3dd41cc1425b2671df9471fe806bf8783794a19ca54f'],
-    }),
-    ('cli', '3.1.0', {
-        'checksums': ['c70a61830bf706a84c59eb74a809978846cee93742198ab4192742a5df1ace11'],
-    }),
-    ('pillar', '1.6.4', {
-        'checksums': ['033a92a271ddeec2a17323d070de8257b9ca4d57f5be6181e2ad35fe7e1ea19e'],
-    }),
-    ('tibble', '3.1.5', {
-        'checksums': ['da6387ba683a67cd7fc2a111f6b62468e480a8078bc1867d433a40c5460edbe7'],
-    }),
-    ('lazyeval', '0.2.2', {
-        'checksums': ['d6904112a21056222cfcd5eb8175a78aa063afe648a562d9c42c6b960a8820d4'],
-    }),
-    ('withr', '2.4.2', {
-        'checksums': ['48f96a4cb780cf6fd5fbbea1f1eb04ea3102d7a4a644cae1ed1e91139dcbbac8'],
-    }),
-    ('nlme', '3.1-153', {
-        'checksums': ['3d27a98edf1b16ee868949e823ac0babbf10c937a7220d648b7ef9480cd680e3'],
-    }),
-    ('mgcv', '1.8-38', {
-        'checksums': ['cd12ed5787d6fdcead34e782e48b62b3f9efd523616c906e2da77bd9c142ddbb'],
-    }),
-    ('rprojroot', '2.0.2', {
-        'checksums': ['5fa161f0d4ac3b7a99dc6aa2d832251001dc92e93c828593a51fe90afd019e1f'],
-    }),
-    ('desc', '1.4.0', {
-        'checksums': ['8220e4c706449b8121b822e70b1414f391ef419aed574836a234c63b83e5d649'],
-    }),
-    ('ps', '1.6.0', {
-        'checksums': ['89ad7ddc5e0818bccacfd0673ddf2da0892ac2a3b4d3a821e40884ab1e96bf31'],
-    }),
-    ('processx', '3.5.2', {
-        'checksums': ['ed6f2d1047461c6061e6ed58fb6de65a289b56009867892abad76c6bba46fc2b'],
-    }),
-    ('callr', '3.7.0', {
-        'checksums': ['d67255148595c6d0ba4c4d241bc9f6b5e00cafe25fdc13e38c10acc38653360a'],
-    }),
-    ('pkgbuild', '1.2.0', {
-        'checksums': ['2e19308d3271fefd5e118c6d132d6a2511253b903620b5417892c72d2010a963'],
-    }),
-    ('rstudioapi', '0.13', {
-        'checksums': ['aac35bbdcb4a8e8caba943bc8a2b98120e8940b80cd1020224bb1a26ff776d8b'],
-    }),
-    ('pkgload', '1.2.3', {
-        'checksums': ['105ae5b2caca495bd0702757c5c676353cca8525954d0822f07103ca8a54b349'],
-    }),
-    ('praise', '1.0.0', {
-        'checksums': ['5c035e74fd05dfa59b03afe0d5f4c53fbf34144e175e90c53d09c6baedf5debd'],
-    }),
-    ('brio', '1.1.2', {
-        'checksums': ['42dde6953151e31cc38bbec72335c01ac9e755cc07d11e26f4e1fcd0f9f471ef'],
-    }),
-    ('jsonlite', '1.7.2', {
-        'checksums': ['06354b50435942f67ba264f79831e577809ef89e5f9a5a2201985396fe651fd2'],
-    }),
-    ('diffobj', '0.3.5', {
-        'checksums': ['d860a79b1d4c9e369282d7391b539fe89228954854a65ba47181407c53e3cf60'],
-    }),
-    ('rematch2', '2.1.2', {
-        'checksums': ['fe9cbfe99dd7731a0a2a310900d999f80e7486775b67f3f8f388c30737faf7bb'],
-    }),
-    ('waldo', '0.3.1', {
-        'checksums': ['ec2c8c1afbc413f8db8b6b0c6970194a875f616ad18e1e72a004bc4497ec019b'],
-    }),
-    ('testthat', '3.1.0', {
-        'checksums': ['e714b105891a766d03d5bab09d705b1f6c23f04db56dfe310bff8cfa00464987'],
-    }),
-    ('isoband', '0.2.5', {
-        'checksums': ['46f53fa066f0966f02cb2bf050190c0d5e950dab2cdf565feb63fc092c886ba5'],
-    }),
-    ('ggplot2', '3.3.5', {
-        'checksums': ['b075294faf3af31b18e415f260c62d6000b218770e430484fe38819bdc3224ea'],
-    }),
-    ('pROC', '1.18.0', {
-        'checksums': ['d5ef54b384176ece6d6448014ba40570a98181b58fee742f315604addb5f7ba9'],
-    }),
-    ('quadprog', '1.5-8', {
-        'checksums': ['22128dd6b08d3516c44ff89276719ad4fe46b36b23fdd585274fa3a93e7a49cd'],
-    }),
-    ('BB', '2019.10-1', {
-        'checksums': ['04d0b6ce6e5f070b109478a6005653dbe78613bb4e3ea4903203d851b5d3c94d'],
-    }),
-    ('BBmisc', '1.11', {
-        'checksums': ['1ea48c281825349d8642a661bb447e23bfd651db3599bf72593bfebe17b101d2'],
-    }),
-    ('fail', '1.3', {
-        'checksums': ['ede8aa2a9f2371aff5874cd030ac625adb35c33954835b54ab4abf7aeb34d56d'],
-    }),
-    ('rlecuyer', '0.3-5', {
-        'checksums': ['4723434ff7624d4f404a6854ffa0673fc43daa46f58f064dbeeaa17da28ab626'],
-    }),
-    ('snow', '0.4-4', {
-        'checksums': ['84587f46f222a96f3e2fde10ad6ec6ddbd878f4e917cd926d632f61a87db13c9'],
-    }),
-    ('tree', '1.0-41', {
-        'checksums': ['21cf995b187d97de0bce8330973a52c46235db0fc09a133cad26283b7a6f5c8e'],
-    }),
-    ('pls', '2.8-0', {
-        'checksums': ['eff3a92756ca34cdc1661fa36d2bf7fc8e9f4132d2f1ef9ed0105c83594618bf'],
-    }),
-    ('class', '7.3-19', {
-        'checksums': ['9012f5c65384b441b5738ed7bd18ea735884bab32b31776e80cf3679f38a3769'],
-    }),
-    ('proxy', '0.4-26', {
-        'checksums': ['676bad821343974e0297a0566c4bf0cf0ea890104906a745b87d3b5989c81a4d'],
-    }),
-    ('e1071', '1.7-9', {
-        'checksums': ['9bf9a15e7ce0b9b1a57ce3048d29cbea7f2a5bb2e91271b1b6aaafe07c852226'],
-    }),
-    ('nnet', '7.3-16', {
-        'checksums': ['c5b73eb4fff0d225e14f898cec987a7a88796b6e70cde4cf277374428f2d5c13'],
-    }),
-    ('minqa', '1.2.4', {
-        'checksums': ['cfa193a4a9c55cb08f3faf4ab09c11b70412523767f19894e4eafc6e94cccd0c'],
-    }),
-    ('RcppEigen', '0.3.3.9.1', {
-        'checksums': ['8a0486249b778a4275a1168fc89fc7fc49c2bb031cb14b50a50089acae7fe962'],
-    }),
-    ('MatrixModels', '0.5-0', {
-        'checksums': ['a87faf1a185219f79ea2307e6787d293e1d30bf3af9398e8cfe1e079978946ed'],
-    }),
-    ('matrixStats', '0.61.0', {
-        'checksums': ['dbd3c0ec59b1ae62ff9b4c2c90c4687cbd680d1796f6fdd672319458d4d2fd9a'],
-    }),
-    ('codetools', '0.2-18', {
-        'checksums': ['1a9ea6b9792dbd1688078455929385acc3a5e4bef945c77bec1261fa4a084c28'],
-    }),
-    ('foreach', '1.5.1', {
-        'checksums': ['fb5ad69e295618c52b2ac7dff84a0771462870a97345374d43b3de2dc31a68e1'],
-    }),
-    ('data.table', '1.14.2', {
-        'checksums': ['f741b951e5937440139514aedbae78dbd6862d825066848bdb006aa02c2f3d2b'],
-    }),
-    ('ModelMetrics', '1.2.2.2', {
-        'checksums': ['5e06f1926aebca5654e1329c66ef19b04058376b2277ebb16e3bf8c208d73457'],
-    }),
-    ('generics', '0.1.1', {
-        'checksums': ['a2478ebf1a0faa8855a152f4e747ad969a800597434196ed1f71975a9eb11912'],
-    }),
-    ('purrr', '0.3.4', {
-        'checksums': ['23ebc93bc9aed9e7575e8eb9683ff4acc0270ef7d6436cc2ef4236a9734840b2'],
-    }),
-    ('tidyselect', '1.1.1', {
-        'checksums': ['18eb6a6746196a81ce19ee6cbf1db0c33f494177b97e2419312ef25a00ae486b'],
-    }),
-    ('dplyr', '1.0.7', {
-        'checksums': ['d2fe3aedbce02fdddce09a8a80f85f5918a9d1f15f792ad4a98f254959d7123d'],
-    }),
-    ('gower', '0.2.2', {
-        'checksums': ['3f022010199fafe34f6e7431730642a76893e6b4249b84e5a61012cb83483631'],
-    }),
-    ('rpart', '4.1-15', {
-        'checksums': ['2b8ebe0e9e11592debff893f93f5a44a6765abd0bd956b0eb1f70e9394cfae5c'],
-    }),
-    ('survival', '3.2-13', {
-        'checksums': ['3fab9c0ba2c4e2b6a475207e2629a7f06a104c70093dfb768f50a7caac9a317f'],
-    }),
-    ('KernSmooth', '2.23-20', {
-        'checksums': ['20eb75051e2473933d41eedc9945b03c632847fd581e2207d452cf317fa5ec39'],
-    }),
-    ('globals', '0.14.0', {
-        'checksums': ['203dbccb829ca9cc6aedb6f5e79cb126ea31f8dd379dff9111ec66e3628c32f3'],
-    }),
-    ('listenv', '0.8.0', {
-        'checksums': ['fd2aaf3ff2d8d546ce33d1cb38e68401613975117c1f9eb98a7b41facf5c485f'],
-    }),
-    ('parallelly', '1.28.1', {
-        'checksums': ['f4ae883b18409adb83c561ed69427e740e1b50bf85ef57f48c3f2edf837cc663'],
-    }),
-    ('future', '1.23.0', {
-        'checksums': ['d869c80e837c0937a414b8050deff081aefeac586b796f3d634d64f0f4fdb8f8'],
-    }),
-    ('future.apply', '1.8.1', {
-        'checksums': ['0d5bc3cb0289665bb27ae4ccad51fcc5ebf6dca46872b0a4e57790b9dc0aa6c7'],
-    }),
-    ('progressr', '0.9.0', {
-        'checksums': ['cfe70f8423041ea5b5a2a39122c166462e58b1bba84df935858a7b86362b530f'],
-    }),
-    ('numDeriv', '2016.8-1.1', {
-        'checksums': ['d8c4d19ff9aeb31b0c628bd4a16378e51c1c9a3813b525469a31fe89af00b345'],
-    }),
-    ('SQUAREM', '2021.1', {
-        'checksums': ['66e5e18ca29903e4950750bbd810f0f9df85811ee4195ce0a86d939ba8183a58'],
-    }),
-    ('lava', '1.6.10', {
-        'checksums': ['7a88f8a885872e2abb3011c446e9e1c4884cd4dbe6ab4cfe9207538e5560232e'],
-    }),
-    ('prodlim', '2019.11.13', {
-        'checksums': ['6809924f503a14681de84730489cdaf9240d7951c64f5b98ca37dc1ce7809b0f'],
-    }),
-    ('ipred', '0.9-12', {
-        'checksums': ['d6e1535704d39415a799d7643141ffa4f6f55597f03e763f4ccd5d8106005843'],
-    }),
-    ('cpp11', '0.4.0', {
-        'checksums': ['1768fd07dc30dfbbf8f3fb1a1183947cb7e1dfd909165c4d612a63c163a41e87'],
-    }),
-    ('lubridate', '1.8.0', {
-        'checksums': ['87d66efdb1f3d680db381d7e40a202d35645865a0542e2f270ef008a19002ba5'],
-    }),
-    ('tidyr', '1.1.4', {
-        'checksums': ['0b0c98be98a433e15a2550f60330b31a58529a9c58bc2abd7bff6462ab761241'],
-    }),
-    ('recipes', '0.1.17', {
-        'checksums': ['ed20ba0ea0165310e31864ed7d2e005a2a37b76c7913977fd124d8b567616d3d'],
-    }),
-    ('caret', '6.0-90', {
-        'checksums': ['e851a4ed7d939c665e57e3551a5464b09fe4285e7c951236efdd890b0da866bc'],
-    }),
-    ('conquer', '1.2.0', {
-        'checksums': ['10451223658e02b31b87f7f86a14e3d8c71bfbff62ea30f85b89cdef829f07f9'],
-    }),
-    ('quantreg', '5.86', {
-        'checksums': ['71d1c829af7574ca00575cc0375376ac3ecd54b3d6d36e8eecd71ed8acb9d605'],
-    }),
-    ('robustbase', '0.93-9', {
-        'checksums': ['d75fb5075463fec61d063bced7003936e9198492328b6fae15f67e8415713c45'],
-    }),
-    ('zoo', '1.8-9', {
-        'checksums': ['b7be259067a8b9d4a8f5d387e0946a5ba1eb43474baa67ccf4f8bf4b15f772a3'],
-    }),
-    ('lmtest', '0.9-38', {
-        'checksums': ['32a22cea45398ffc5732d9f5c0391431d0cdd3a9e29cc7b77bea32c1eb4a216b'],
-    }),
-    ('vcd', '1.4-9', {
-        'checksums': ['a5b420ad5ff1a27fa92f98099a8b43f2dded7e5f60297b3e4d947ad6f039568f'],
-    }),
-    ('snowfall', '1.84-6.1', {
-        'checksums': ['5c446df3a931e522a8b138cf1fb7ca5815cc82fcf486dbac964dcbc0690e248d'],
-    }),
-    ('bindr', '0.1.1', {
-        'checksums': ['7c785ca77ceb3ab9282148bcecf64d1857d35f5b800531d49483622fe67505d0'],
-    }),
-    ('plogr', '0.2.0', {
-        'checksums': ['0e63ba2e1f624005fe25c67cdd403636a912e063d682eca07f2f1d65e9870d29'],
-    }),
-    ('bindrcpp', '0.2.2', {
-        'checksums': ['48130709eba9d133679a0e959e49a7b14acbce4f47c1e15c4ab46bd9e48ae467'],
-    }),
-    ('tmvnsim', '1.0-2', {
-        'checksums': ['97f63d0bab3b240cc7bdbe6e6e74e90ad25a4382a345ee51a26fe3959edeba0f'],
-    }),
-    ('mnormt', '2.0.2', {
-        'checksums': ['5c6aa036d3f1035ffe8f9a8e95bb908b191b126b016591cf893c50472851f334'],
-    }),
-    ('foreign', '0.8-81', {
-        'checksums': ['1ae8f9f18f2a037697fa1a9060417ff255c71764f0145080b2bd23ba8262992c'],
-    }),
-    ('psych', '2.1.9', {
-        'checksums': ['1475e03a17f1ae6837834f01c2472aed68887c89d90a84a3e09a532ce218500c'],
-    }),
-    ('broom', '0.7.10', {
-        'checksums': ['129fd5a53abef7f42b7efac6c64ebd71269b136aa648846d640562357927464f'],
-    }),
-    ('nloptr', '1.2.2.2', {
-        'checksums': ['e80ea9619ac18f4bfe44812198b40b9ae5c0ddf3f9cc91778f9ccc82168d1372'],
-    }),
-    ('boot', '1.3-28', {
-        'checksums': ['9f7158fd2714659f590c3955651893dc24bd8f39196bc5a4cc35b0b031744a32'],
-    }),
-    ('statmod', '1.4.36', {
-        'checksums': ['14e897c83d426caca4d920d3d5bead7ae9a679276b3cb2e227f299ad189d7bc2'],
-    }),
-    ('lme4', '1.1-27.1', {
-        'checksums': ['25fa873e39b8192e48c15eec93db8c8bf6f03baf3bd8d5ca9188482ce8442ec5'],
-    }),
-    ('ucminf', '1.1-4', {
-        'checksums': ['a2eb382f9b24e949d982e311578518710f8242070b3aa3314a331c1e1e7f6f07'],
-    }),
-    ('ordinal', '2019.12-10', {
-        'checksums': ['7a41e7b7e852a8fa3e911f8859d36e5709ccec5ca42ee3de14a813b7aaac7725'],
-    }),
-    ('jomo', '2.7-2', {
-        'checksums': ['3962d5cbecc60e72670329dbef0dd74303080f5ea2a79c91e27f75db99ba6ce9'],
-    }),
-    ('clipr', '0.7.1', {
-        'checksums': ['ffad477b07847e3b68f7e4406bbd323025a8dae7e3c768943d4d307ee3248afb'],
-    }),
-    ('tzdb', '0.2.0', {
-        'checksums': ['c335905d452b400af7ed54b916b5246cb3f47ede0602911a2bcb25a1cf56d5a9'],
-    }),
-    ('bit64', '4.0.5', {
-        'checksums': ['25df6826ea5e93241c4874cad4fa8dadc87a40f4ff74c9107aa12a9e033e1578'],
-    }),
-    ('vroom', '1.5.5', {
-        'checksums': ['1d45688c08f162a3300eda532d9e87d144f4bc686769a521bf9a12e3d3b465fe'],
-    }),
-    ('readr', '2.0.2', {
-        'checksums': ['98b05ed751dda2bcf7a29d070ce3d3e8475e0138a3e3ec68941dc45218db7615'],
-    }),
-    ('forcats', '0.5.1', {
-        'checksums': ['c4fb96e874e2bedaa8a1aa32ea22abdee7906d93b5c5c7b42c0894c0c5b6a289'],
-    }),
-    ('haven', '2.4.3', {
-        'checksums': ['95b70f47e77792bed4312441787299d2e3e27d79a176f0638a37e5301b93295f'],
-    }),
-    ('pan', '1.6', {
-        'checksums': ['adc0df816ae38bc188bce0aef3aeb71d19c0fc26e063107eeee71a81a49463b6'],
-    }),
-    ('mitml', '0.4-3', {
-        'checksums': ['49bd3eb68a60fb2a269e7ddca8b862e1e81e0651e2b29759482fb7bcad452102'],
-    }),
-    ('mice', '3.13.0', {
-        'checksums': ['5108e4673512c96ced19c23fdbb0feea2b2a655a4c7dc9afb06a2a1a29f69785'],
-    }),
-    ('urca', '1.3-0', {
-        'checksums': ['621cc82398e25b58b4a16edf000ed0a1484d9a0bc458f734e97b6f371cc76aaa'],
-    }),
-    ('fracdiff', '1.5-1', {
-        'checksums': ['b8103b32a4ca3a59dda1624c07da08ecd144c7a91a747d1f4663e99421950eb6'],
-    }),
-    ('operator.tools', '1.6.3', {
-        'checksums': ['e5b74018fb75bfa02820dec4b822312f1640422f01d9fec1b58d880ffb798dec'],
-    }),
-    ('formula.tools', '1.7.1', {
-        'checksums': ['4fe0e72d9d96f2398e86cbd8536d0c84de38e5583d4ff7dcd73f415ddd8ca395'],
-    }),
-    ('logistf', '1.24', {
-        'checksums': ['6561d311fe21b789954cb33c008b86abdd6509b2a2900385dd6046163679d96b'],
-    }),
-    ('akima', '0.6-2.2', {
-        'checksums': ['deefc9ff82f78e68b7333c2fc88bd23863da9919493f2b73658044436f6b8742'],
-    }),
-    ('bitops', '1.0-7', {
-        'checksums': ['e9b5fc92c39f94a10cd0e13f3d6e2a9c17b75ea01467077a51d47a5f708517c4'],
-    }),
-    ('mixtools', '1.2.0', {
-        'checksums': ['ef033ef13625209065d26767bf70d129972e6808927f755629f1d70a118b9023'],
-    }),
-    ('cluster', '2.1.2', {
-        'checksums': ['5c8aa760fb6dda4fcfe6196e561ffcd2dc12b1a6c7659cb90be2cde747311499'],
-    }),
-    ('gclus', '1.3.2', {
-        'checksums': ['9cc61cdff206c11213e73afca3d570a7234250cf6044a9202c2589932278e0b3'],
-    }),
-    ('coda', '0.19-4', {
-        'checksums': ['422d3cfd34797a3631e9c4812431940599c0ca4bb9937797bed07b7b1d6fe58f'],
-    }),
-    ('doMC', '1.3.7', {
-        'checksums': ['defab27adc298a6746896d83251f8355d62c01012d51ef96d491875a2e74b54d'],
-    }),
-    ('DBI', '1.1.1', {
-        'checksums': ['572ab3b8a6421d0ac3e7665c4c842826f1723af98fca25d4f43edb419e771344'],
-    }),
-    ('gam', '1.20', {
-        'checksums': ['91eb416ba06aa1c3f611661530467f4513992f6c168e3f6e474cf57bae131efe'],
-    }),
-    ('gamlss.data', '6.0-1', {
-        'checksums': ['98fdec571aeacea4318c9e1c9d56b74716f3dc6acce385cbaad0d6128b154bb2'],
-    }),
-    ('gamlss.dist', '5.3-2', {
-        'checksums': ['0caa92cd20c3d2d11b1af4656fd0de09adf145992345cba07fdcd33b7716ced3'],
-    }),
-    ('gamlss', '5.3-4', {
-        'checksums': ['72707187471fd35c5379ae8c9b7b0ca87e302557f09cb3979d1cdb2e2500b01a'],
-    }),
-    ('gamlss.tr', '5.1-7', {
-        'checksums': ['8f9975bceaf8000b1d39317daf490e59c8385b5291326ed6a2630be11dae3137'],
-    }),
-    ('hwriter', '1.3.2', {
-        'checksums': ['6b3531d2e7a239be9d6e3a1aa3256b2745eb68aa0bdffd2076d36552d0d7322b'],
-    }),
-    ('xts', '0.12.1', {
-        'checksums': ['d680584af946fc30be0b2046e838cff7b3a65e00df1eadba325ca5e96f3dca2c'],
-    }),
-    ('curl', '4.3.2', {
-        'checksums': ['90b1facb4be8b6315bb3d272ba2dd90b88973f6ea1ab7f439550230f8500a568'],
-    }),
-    ('TTR', '0.24.2', {
-        'checksums': ['2587b988d9199474a19470b9b999b99133d0d8aa45410813e05c5f0ed763711b'],
-    }),
-    ('quantmod', '0.4.18', {
-        'checksums': ['aa40448e93a1facf399213ac691784007731e869ad243fe762381ab099cd6c35'],
-    }),
-    ('mvtnorm', '1.1-3', {
-        'checksums': ['ff4e302139ba631280fc9c4a2ab168596bfd09e17a805974199b043697c02448'],
-    }),
-    ('pcaPP', '1.9-74', {
-        'checksums': ['50837b434d67e4b5fcec34c689a9e30c7a9fb94c561b39f24e68a1456ff999b6'],
-    }),
-    ('pscl', '1.5.5', {
-        'checksums': ['054c9b88a991abdec3338688f58e81b6ba55f91edb988621864b24fd152fee6f'],
-    }),
-    ('fastmap', '1.1.0', {
-        'checksums': ['9113e526b4c096302cfeae660a06de2c4c82ae4e2d3d6ef53af6de812d4c822b'],
-    }),
-    ('cachem', '1.0.6', {
-        'checksums': ['9a9452f7bcf3f79436c418b3c3290449fb8fd338714d9b992153754d112f1864'],
-    }),
-    ('memoise', '2.0.0', {
-        'checksums': ['ff9ae3a1a95ad6271d98e6eca016768b790e44bd613356b8e86b685aefd9ecaf'],
-    }),
-    ('blob', '1.2.2', {
-        'checksums': ['4976053c65994c769a4c22b4553bea0bd9c623b3b991dbaf023d2a164770c7fa'],
-    }),
-    ('RSQLite', '2.2.8', {
-        'checksums': ['1b8adc1b7ed4bc5ec070b8765837cd4104fcdda482a1d335c030f51b427c4cc3'],
-    }),
-    ('BatchJobs', '1.8', {
-        'checksums': ['35cc2dae31994b1df982d11939509ce965e12578418c4fbb8cd7a422afd6e4ff'],
-    }),
-    ('sandwich', '3.0-1', {
-        'checksums': ['f6584b7084f3223bbc0c4722f53280496be73849747819b0cb4e8f3910284a89'],
-    }),
-    ('sfsmisc', '1.1-12', {
-        'checksums': ['9b12184a28fff87cacd0c3602d0cf63acb4d0f3049ad3a6ff16177f6df350782'],
-    }),
-    ('spatial', '7.3-14', {
-        'checksums': ['50e6daacbacff6c716485d20b15eb7fff7b8108dc5ea0ff508024beb4f0a8b9b'],
-    }),
-    ('VGAM', '1.1-5', {
-        'checksums': ['30190b150f3e5478137d288a45f575b2654ad7c29254b0a1fe5c954ee010a1bb'],
-    }),
-    ('waveslim', '1.8.2', {
-        'checksums': ['133c4f7a027282742fe99b583ca65f178fc7a3df2ce75cb4d60650f0a1dd7145'],
-    }),
-    ('xtable', '1.8-4', {
-        'checksums': ['5abec0e8c27865ef0880f1d19c9f9ca7cc0fd24eadaa72bcd270c3fb4075fd1c'],
-    }),
-    ('profileModel', '0.6.1', {
-        'checksums': ['91dc25e81f52506593f5c8d80a6131510b14525262f65b4ac10ae0cad0b2a506'],
-    }),
-    ('brglm', '0.7.2', {
-        'checksums': ['56098d2ce238478e7a27cacc4cdec0bc65f287fe746b38fbb1edda20c1675023'],
-    }),
-    ('deSolve', '1.30', {
-        'checksums': ['39f65d7af6b4d85eb023cce2a200c2de470644b22d45e210c5b7d558c3abf548'],
-    }),
-    ('tseriesChaos', '0.1-13.1', {
-        'checksums': ['23cb5fea56409a305e02a523ff8b7642ec383942d415c9cffdc92208dacfd961'],
-    }),
-    ('tseries', '0.10-48', {
-        'checksums': ['53bd22708c936205c5f839a10f2e302524d2cc54dc309e7d885ebd081ccb4471'],
-    }),
-    ('fastICA', '1.2-3', {
-        'checksums': ['e9ef82644cb64bb49ae3b7b6e0885f4fb2dc08ae030f8c76fe8dd8507b658950'],
-    }),
-    ('R.methodsS3', '1.8.1', {
-        'checksums': ['8a98fb81bcfa78193450f855f614f6f64e6c65daf115f301d97d1f474f5e619b'],
-    }),
-    ('R.oo', '1.24.0', {
-        'checksums': ['37a1dab8dd668ceba69a1ba36c0c60e9809e29b74bd56d1e8ed519e19c8e3bb6'],
-    }),
-    ('sys', '3.4', {
-        'checksums': ['17f88fbaf222f1f8fd07919461093dac0e7175ae3c3b3264b88470617afd0487'],
-    }),
-    ('askpass', '1.1', {
-        'checksums': ['db40827d1bdbb90c0aa2846a2961d3bf9d76ad1b392302f9dd84cc2fd18c001f'],
-    }),
-    ('openssl', '1.4.5', {
-        'checksums': ['4fc141aba8e94e9f5ecce6eda07e45a5e7048d8609ba909ede4f7f4933e0c1f7'],
-    }),
-    ('httr', '1.4.2', {
-        'checksums': ['462bed6ed0d92f811d5df4d294336025f1dbff357286999d9269bfd9c20b1ef9'],
-    }),
-    ('cgdsr', '1.3.0', {
-        'checksums': ['4aa2a3564cee2449c3ff39ab2ad631deb165d4c78b8107e0ff77a9095340cc1f'],
-    }),
-    ('R.utils', '2.11.0', {
-        'checksums': ['622860f995f78be3a6e439f29d945874c5cb0866f6a73a9b43ac1d4d7f23fed8'],
-    }),
-    ('R.matlab', '3.6.2', {
-        'checksums': ['1ba338f470a24b7f6ef68cadbd04eb468ead4a689f263d2642408ad591b786bb'],
-    }),
-    ('gridExtra', '2.3', {
-        'checksums': ['81b60ce6f237ec308555471ae0119158b115463df696d2eca9b177ded8988e3b'],
-    }),
-    ('gbm', '2.1.8', {
-        'checksums': ['7d5de3b980b8f23275e86ac9bed48a497c9aa53c58e407dfd676309f38272ec1'],
-    }),
-    ('Formula', '1.2-4', {
-        'checksums': ['cb70e373b5ed2fc8450937fb3321d37dfd22dcc6f07cb872a419d51205125caf'],
-    }),
-    ('acepack', '1.4.1', {
-        'checksums': ['82750507926f02a696f6cc03693e8d4a5ee7e92500c8c15a16a9c12addcd28b9'],
-    }),
-    ('proto', '1.0.0', {
-        'checksums': ['9294d9a3b2b680bb6fac17000bfc97453d77c87ef68cfd609b4c4eb6d11d04d1'],
-    }),
-    ('chron', '2.3-56', {
-        'checksums': ['863ecbb951a3da994761ea9062fa96d34e94e19fbc4122521ac179274dfa3f5d'],
-    }),
-    ('viridis', '0.6.2', {
-        'checksums': ['69b58cd1d992710a08b0b227fd0a9590430eea3ed4858099412f910617e41311'],
-    }),
-    ('yaml', '2.2.1', {
-        'checksums': ['1115b7bc2a397fa724956eec916df5160c600c99a3be186d21558dd38d782783'],
-    }),
-    ('htmltools', '0.5.2', {
-        'checksums': ['7dc7d50436e5a82a5801f85bcd2f572a06a98b4027d71aa17b4854ec9b2767fb'],
-    }),
-    ('htmlwidgets', '1.5.4', {
-        'checksums': ['1a3fc60f40717de7f1716b754fd1c31a132e489a2560a278636ee78eba46ffc1'],
-    }),
-    ('knitr', '1.36', {
-        'checksums': ['6ecef5b428d135e95a05f24f9f194d0d828b1180c61be44ad89b6210e32b8e41'],
-    }),
-    ('htmlTable', '2.3.0', {
-        'checksums': ['070d9a0ef6311304f6739d81f7690d8f19899451524b376b403d6a40d477a577'],
-    }),
-    ('Hmisc', '4.6-0', {
-        'checksums': ['2c1ce906b2333c6dc946dc7f10b74cfa552bce2b12dbebf295d143163562a1ad'],
-    }),
-    ('fastcluster', '1.2.3', {
-        'checksums': ['1f229129e1cddc78c7bb5ecc90c4d28ed810ee68cf210004c7cdfa12cfaf2a01'],
-    }),
-    ('registry', '0.5-1', {
-        'checksums': ['dfea36edb0a703ec57e111016789b47a1ba21d9c8ff30672555c81327a3372cc'],
-    }),
-    ('bibtex', '0.4.2.3', {
-        'checksums': ['7bad194920b412781ac9754ad41058d52d3cd7186e1851c2bce3640490e9bc6d'],
-    }),
-    ('pkgmaker', '0.32.2', {
-        'checksums': ['ce45b22def771a9c90a414093823e6befe7e23489c500eeccee5154b44d3ef91'],
-    }),
-    ('rngtools', '1.5.2', {
-        'checksums': ['7f8c76ca4c7851b69a86e27be09b02ddc86357f0388659ef8787634682e8a74d'],
-    }),
-    ('doParallel', '1.0.16', {
-        'checksums': ['f1bb26f964f30d47ae4d6cf2b0a2ca0c2122d376424875e82d9abe9e7b054eb2'],
-    }),
-    ('gridBase', '0.4-7', {
-        'checksums': ['be8718d24cd10f6e323dce91b15fc40ed88bccaa26acf3192d5e38fe33e15f26'],
-    }),
-    ('irlba', '2.3.3', {
-        'checksums': ['6ee233697bcd579813bd0af5e1f4e6dd1eea971e8919c748408130d970fef5c0'],
-    }),
-    ('igraph', '1.2.7', {
-        'checksums': ['25c1a03273359e012e2625d0d8826264c805037f247785e0b432e02c2aae1be5'],
-    }),
-    ('GeneNet', '1.2.15', {
-        'checksums': ['555ac4e1d6c53c099b94b9298b6a8893a07797886a21ce3655a98fa9a1326a85'],
-    }),
-    ('ape', '5.5', {
-        'checksums': ['a3aa01c74b99eafec7d98284e05957b6487b6971ced93f26881f2479bcd5299a'],
-    }),
-    ('RJSONIO', '1.3-1.6', {
-        'checksums': ['82d1c9ea7758b2a64ad683f9c46223dcba9aa8146b43c1115bf9aa76a657a09f'],
-    }),
-    ('caTools', '1.18.2', {
-        'checksums': ['75d61115afec754b053ed1732cc034f2aeb27b13e6e1932aa0f26bf590cf0293'],
-    }),
-    ('gplots', '3.1.1', {
-        'checksums': ['f9ae19c2574b6d41adbeccaf7bc66cf56d7b2769004daba7e0038d5fbd821339'],
-    }),
-    ('ROCR', '1.0-11', {
-        'checksums': ['57385a773220a3aaef5b221a68b2d9c2a94794d4f9e9fc3c1eb9521767debb2a'],
-    }),
-    ('later', '1.3.0', {
-        'checksums': ['08f50882ca3cfd2bb68c83f1fcfbc8f696f5cfb5a42c1448c051540693789829'],
-    }),
-    ('promises', '1.2.0.1', {
-        'checksums': ['8d3a8217909e91f4c2a2eebba5ac8fc902a9ac1a9e9d8a30815c9dc0f162c4b7'],
-    }),
-    ('httpuv', '1.6.3', {
-        'checksums': ['bfe338c86cc09968c5ec2fd1023040db323d3c3aa413d8d3e5ad4b320bf00876'],
-    }),
-    ('rjson', '0.2.20', {
-        'checksums': ['3a287c1e5ee7c333ed8385913c0a307daf99335fbdf803e9dcca6e3d5adb3f6c'],
-    }),
-    ('sourcetools', '0.1.7', {
-        'checksums': ['47984406efb3b3face133979ccbae9fefb7360b9a6ca1a1c11473681418ed2ca'],
-    }),
-    ('xml2', '1.3.2', {
-        'checksums': ['df22f9e7e3189d8c9b8804eaf0105324fdac983cffe743552f6d76613600a4cf'],
-    }),
-    ('commonmark', '1.7', {
-        'checksums': ['d14a767a3ea9778d6165f44f980dd257423ca6043926e3cd8f664f7171f89108'],
-    }),
-    ('jquerylib', '0.1.4', {
-        'checksums': ['f0bcc11dcde3a6ff180277e45c24642d3da3c8690900e38f44495efbc9064411'],
-    }),
-    ('rappdirs', '0.3.3', {
-        'checksums': ['49959f65b45b0b189a2792d6c1339bef59674ecae92f8c2ed9f26ff9e488c184'],
-    }),
-    ('fs', '1.5.0', {
-        'checksums': ['36df1653571de3c628a4f769c4627f6ac53d0f9e4106d9d476afb22ae9603897'],
-    }),
-    ('sass', '0.4.0', {
-        'checksums': ['7d06ca15239142a49e88bb3be494515abdd8c75f00f3f1b0ee7bccb55019bc2b'],
-    }),
-    ('bslib', '0.3.1', {
-        'checksums': ['5f5cb56e5cab9039a24cd9d70d73b69c2cab5b2f5f37afc15f71dae0339d9849'],
-    }),
-    ('fontawesome', '0.2.2', {
-        'checksums': ['572db64d1b3c9be301935e0ca7baec69f3a6e0aa802e23f1f224b3724259df64'],
-    }),
-    ('shiny', '1.7.1', {
-        'checksums': ['c03b2056fb41430352c7c0e812bcc8632e6ec4caef077d2f7633512d91721d00'],
-    }),
-    ('seqinr', '4.2-8', {
-        'checksums': ['584b34e9dec0320cef02096eb356a0f6115bbd24356cf62e67356963e9d5e9f7'],
-    }),
-    ('LearnBayes', '2.15.1', {
-        'checksums': ['9b110858456523ca0b2a63f22013c4e1fbda6674b9d84dc1f4de8bffc5260532'],
-    }),
-    ('deldir', '1.0-6', {
-        'checksums': ['6df6d8325c607e0b7d63cbc53c29e774eff95ad4acf9c7ec8f70693b0505f8c5'],
-    }),
-    ('gmodels', '2.18.1', {
-        'checksums': ['626140a34eb8c53dd0a06511a76c71bc61c48777fa76fcc5e6934c9c276a1369'],
-    }),
-    ('expm', '0.999-6', {
-        'checksums': ['2c79912fd2e03fcf89c29f09555880934402fcb2359af8b4579d79b4f955addc'],
-    }),
-    ('terra', '1.4-11', {
-        'checksums': ['0a8fc0deffd4f2d0065ac6b70ae5cda079a38fe86e40861df94d01d01412fd21'],
-    }),
-    ('raster', '3.5-2', {
-        'checksums': ['99565167f3ef41ade08b8466a172fc471c73184815c9fb199f9555db63e03d72'],
-    }),
-    ('spData', '2.0.1', {
-        'checksums': ['c635a3e2e5123b4cdb2e6877b9b09e3d50169e1512a53b2ba2db7fbe63b990fc'],
-    }),
-    ('units', '0.7-2', {
-        'checksums': ['b90be023431100632b3081747af9e743e615452b4ad38810991f7b024b7040eb'],
-    }),
-    ('classInt', '0.4-3', {
-        'checksums': ['9ede7a2a7a6b6c114919a3315a884fb592e33b037a50a4fe45cbd4fe2fc434ac'],
-    }),
-    ('vegan', '2.5-7', {
-        'checksums': ['e63b586951ea7d8b0118811f329c700212892ec1db3b93951603ce1d68aa462a'],
-    }),
-    ('rncl', '0.8.4', {
-        'checksums': ['6b19d0dd9bb08ecf99766be5ad684bcd1894d1cd9291230bdd709dbd3396496b'],
-    }),
-    ('XML', '3.99-0.8', {
-        'checksums': ['081f691c2ee8ad39c7c95281e7d9153ec04cee79ca2d41f5d82c2ec2f1d36b50'],
-    }),
-    ('tinytex', '0.34', {
-        'checksums': ['1d059397b70579c325b64bfd548ef7b985a7558bd1e3d95716e0ed7a0dd8e69b'],
-    }),
-    ('rmarkdown', '2.11', {
-        'checksums': ['9371255300e7ea4cd936978ad2ca3d205d8605e09f4913cb0d4725005a7a9775'],
-    }),
-    ('reshape', '0.8.8', {
-        'checksums': ['4d5597fde8511e8fe4e4d1fd7adfc7ab37ff41ac68c76a746f7487d7b106d168'],
-    }),
-    ('triebeard', '0.3.0', {
-        'checksums': ['bf1dd6209cea1aab24e21a85375ca473ad11c2eff400d65c6202c0fb4ef91ec3'],
-    }),
-    ('urltools', '1.7.3', {
-        'checksums': ['6020355c1b16a9e3956674e5dea9ac5c035c8eb3eb6bbdd841a2b5528cafa313'],
-    }),
-    ('httpcode', '0.3.0', {
-        'checksums': ['593a030a4f94c3df8c15576837c17344701bac023ae108783d0f06c476062f76'],
-    }),
-    ('crul', '1.1.0', {
-        'checksums': ['f0b6cfd19f7470a8aacc7621530315f83796aa64e24a47b96365963e5f615ace'],
-    }),
-    ('bold', '1.2.0', {
-        'checksums': ['8f1597f04acbe6b090232929325734c802049d82649ae102b438e1fa3af5a464'],
-    }),
-    ('rredlist', '0.7.0', {
-        'checksums': ['d2e66b655c43565a4cc0984dc3fcc9732652cb9677baaa9bb2b82e9f9d65e7f0'],
-    }),
-    ('rentrez', '1.2.3', {
-        'checksums': ['fb256597ebe7780e38bef9c4c2626b3feacd60c7a5a29fc6a218cf0d8d132f74'],
-    }),
-    ('rotl', '3.0.11', {
-        'checksums': ['339bf0b7527449eb495673e406b76a0831aa529fe05952c3448b455cd2c91c2c'],
-    }),
-    ('solrium', '1.2.0', {
-        'checksums': ['7ec64199497cc69f542fded955b709fc548cf8e2734c9db0f4a99a0ea67ca49b'],
-    }),
-    ('ritis', '1.0.0', {
-        'checksums': ['327b221872408b1f0fe0cce953685535b66d2fa5d6cac628e1142a26e4856136'],
-    }),
-    ('worrms', '0.4.2', {
-        'checksums': ['1ab228ea762a431a5e3a565b589b804fcb2865ceaa2b1459bd2ab3ebe8f5ebbe'],
-    }),
-    ('natserv', '1.0.0', {
-        'checksums': ['30f90f938e963191ef19b1433db1e265f67d8efe29c92a1d3603c3dc9a03d5c8'],
-    }),
-    ('WikipediR', '1.5.0', {
-        'checksums': ['f8d0e6f04fb65f7ad9c1c068852a6a8b699ffe8d39edf1f3fa07d32d087e8ff0'],
-    }),
-    ('ratelimitr', '0.4.1', {
-        'checksums': ['2b21e4574521c5336feeb3041eaf096bde7857b140049cdeb6ec97dc652aa71b'],
-    }),
-    ('rex', '1.2.0', {
-        'checksums': ['06b491f1469078862e40543fd74e1d38b2e0fb61fdf01c8083add4b11ac2eb54'],
-    }),
-    ('WikidataQueryServiceR', '1.0.0', {
-        'checksums': ['0e14eec8471a72227f800b41b331cfc49a94b4d4f49e68936448ebbae0b281ae'],
-    }),
-    ('pbapply', '1.5-0', {
-        'checksums': ['effdfee286e5ba9534dc2ac3cee96590a37f5cd2af28c836d00c25ca9f070a55'],
-    }),
-    ('WikidataR', '2.3.1', {
-        'checksums': ['dd349d160c1c0bae9e3efa336efc622ea9dd481cc0a449ceab49852d220eb2da'],
-    }),
-    ('wikitaxa', '0.4.0', {
-        'checksums': ['ba872853af59fdc8f1121d6e205f15e5bf4f2ec5ad68cd5755a423fa783bf7fc'],
-    }),
-    ('phangorn', '2.7.1', {
-        'checksums': ['d8a9d67851f16c3947575eb3344b9ce7ef856354e691211ef23c92b7889e1398'],
-    }),
-    ('uuid', '1.0-2', {
-        'checksums': ['0bed1a3fe298123e818b631c1a2d8bcf5c6ab334f625a482197324a877a6387a'],
-    }),
-    ('conditionz', '0.1.0', {
-        'checksums': ['ccd81e4f2534d29cddf44cf697f76ff01417cbeb22001a93477edc61cdd35646'],
-    }),
-    ('taxize', '0.9.99', {
-        'checksums': ['1a5d2783a82db4b6dd13df3639c7cd07112c1d83ddaabc83706ff235d977681c'],
-    }),
-    ('RNeXML', '2.4.5', {
-        'checksums': ['2b667ecb6400e4c0c125ca73a98cde81330cde3a85b764261f77159e702754f3'],
-    }),
-    ('phylobase', '0.8.10', {
-        'checksums': ['5a44380ff49bab333a56f6f96157324ade8afb4af0730e013194c4badb0bf94b'],
-    }),
-    ('magick', '2.7.3', {
-        'checksums': ['83877b2e23ea43fbc1164de9c2422eafbe7858393ac384df5adf3a7eec122441'],
-    }),
-    ('animation', '2.7', {
-        'checksums': ['88418f1b04ec785963bad492f30eb48b05914e9e5d88c7eef705d949cbd7e469'],
-    }),
-    ('bigmemory.sri', '0.1.3', {
-        'checksums': ['55403252d8bae9627476d1f553236ea5dc7aa6e54da6980526a6cdc66924e155'],
-    }),
-    ('bigmemory', '4.5.36', {
-        'checksums': ['18c67fbe6344b2f8223456c4f19ceebcf6c1166255eab81311001fd67a45ef0e'],
-    }),
-    ('calibrate', '1.7.7', {
-        'checksums': ['713b09b415c954e1ef5216088acd40621b0546c45afbb8c2c6f118ecb5cd6fa6'],
-    }),
-    ('clusterGeneration', '1.3.7', {
-        'checksums': ['534f29d8f7ed11e6e9a496f15845b588ec7133f3da5e6def8140b88500e52d5c'],
-    }),
-    ('dismo', '1.3-5', {
-        'checksums': ['812e1932d42c0f40acf2ab5c5b2d068f93128caf648626e1d11baf1a09340ee7'],
-    }),
-    ('extrafontdb', '1.0', {
-        'checksums': ['faa1bafee5d4fbc24d03ed237f29f1179964ebac6e3a46ac25b0eceda020b684'],
-    }),
-    ('Rttf2pt1', '1.3.9', {
-        'checksums': ['8667e48ed639c80180b1c1b65eff6ca2031bc9633a4fe79b50772f92375e3e71'],
-    }),
-    ('extrafont', '0.17', {
-        'checksums': ['2f6d7d79a890424b56ddbdced361f8b9ddede5edd33e090b816b88a99315332d'],
-    }),
-    ('fields', '13.3', {
-        'checksums': ['c652838b1ae7eb368831522824bfbc1d1db7b9d1db5e9bb52b194098549944c3'],
-    }),
-    ('shapefiles', '0.7', {
-        'checksums': ['eeb18ea4165119519a978d4a2ba1ecbb47649deb96a7f617f5b3100d63b3f021'],
-    }),
-    ('fossil', '0.4.0', {
-        'checksums': ['37c082fa15ebae89db99d6071b2bb2cad6a97a0405e9b4ef77f62a8f6ad274c1'],
-    }),
-    ('phytools', '0.7-90', {
-        'checksums': ['48615a709760af5f298f0af6615d238c96cad7d26e997fb65467520aad37e0d1'],
-    }),
-    ('geiger', '2.0.7', {
-        'checksums': ['d200736c4ad7ed4bc55a13e7d0126ddc7fed88e245cd5706d4692aaa437e9596'],
-    }),
-    ('shape', '1.4.6', {
-        'checksums': ['b9103e5ed05c223c8147dbe3b87a0d73184697343634a353a2ae722f7ace0b7b'],
-    }),
-    ('glmnet', '4.1-2', {
-        'checksums': ['06ab2b58c0b431736605aee2d42e517e0e2640d16b5a6c7867a25f05dd44cdcd'],
-    }),
-    ('crosstalk', '1.1.1', {
-        'checksums': ['ed3234f7f000fb607cc42e005d68be1dd598d95fa687a3f6e6b17ba38e36ccd8'],
-    }),
-    ('miniUI', '0.1.1.1', {
-        'checksums': ['452b41133289f630d8026507263744e385908ca025e9a7976925c1539816b0c0'],
-    }),
-    ('webshot', '0.5.2', {
-        'checksums': ['f183dc970157075b51ac543550a7a48fa3428b9c6838abb72fe987c21982043f'],
-    }),
-    ('shinyjs', '2.0.0', {
-        'checksums': ['c2cdd9fab41f6b46bb41b288cd9b3fb3a7fe9627b664e3a58a0cb5dd4c19f8ff'],
-    }),
-    ('manipulateWidget', '0.11.1', {
-        'checksums': ['5b73728d7d6dcc32f32d861375074cd65112c03a01e4ee4fa94e21b063fdefb6'],
-    }),
-    # ('rgl', '0.107.14', {
-    #    'checksums': ['67213c3215bcadb56e15922fbf0dc7f6a6642cc3d924363dcb1705291727b0fc'],
-    # }),
-    ('Rtsne', '0.15', {
-        'checksums': ['56376e4f0a382fad3d3d40e2cb0562224be5265b827622bcd235e8fc63df276c'],
-    }),
-    ('labdsv', '2.0-1', {
-        'checksums': ['5a4d55e9be18222dc47e725008b450996448ab117d83e7caaa191c0f13fd3925'],
-    }),
-    ('stabs', '0.6-4', {
-        'checksums': ['f8507337789f668e421a6ee7b11dd5ea331bf8bff0f9702dd1b93f46c2f3c1d9'],
-    }),
-    ('modeltools', '0.2-23', {
-        'checksums': ['6b3e8d5af1a039db5c178498dbf354ed1c5627a8cea9229726644053443210ef'],
-    }),
-    ('strucchange', '1.5-2', {
-        'checksums': ['7d247c5ae6f5a63c80e478799d009c57fb8803943aa4286d05f71235cc1002f8'],
-    }),
-    ('TH.data', '1.1-0', {
-        'checksums': ['21b37e251da5635ae91668f64b4c6f6a7ccedbe1f01af769d30fb532af83113e'],
-    }),
-    ('multcomp', '1.4-17', {
-        'checksums': ['41509d8457cfad9ce579115e6e0ed1f7c0244455a8639cbd38a6d755d338fb0b'],
-    }),
-    ('libcoin', '1.0-9', {
-        'checksums': ['2d7dd0b7c6dfc20472430570419ea36a714da7bbafd336da1fb53c5c6463d9eb'],
-    }),
-    ('coin', '1.4-2', {
-        'checksums': ['7546d1f27a82d98b4b3e43e4659eba0f74a67d5919ce85d2fb360282ba3cfbb2'],
-    }),
-    ('party', '1.3-9', {
-        'checksums': ['29a1fefdb86369285ebf5d48ab51268a83e2011fb9d9f609a2250b5f0b169089'],
-    }),
-    ('inum', '1.0-4', {
-        'checksums': ['5febef69c43a4b95b376c1418550a949d988a5f26b1383ca01c9728a94fc13ce'],
-    }),
-    ('partykit', '1.2-15', {
-        'checksums': ['b2e9454b2f4b9a39c9581c5871462f00acef4eeee5696ce3e32cfa1468d1e3ac'],
-    }),
-    ('mboost', '2.9-5', {
-        'checksums': ['cf9b13e00efe0b25702cb33151e8c11eff2de07db805db217472e9d09a3be079'],
-    }),
-    ('msm', '1.6.9', {
-        'checksums': ['aefcd9bb40b0167311d088d6fe23fdf7aa35deaac0f8b47ef02377cff5577023'],
-    }),
-    ('nor1mix', '1.3-0', {
-        'checksums': ['9ce4ee92f889a4a4041b5ea1ff09396780785a9f12ac46f40647f74a37e327a0'],
-    }),
-    ('np', '0.60-11', {
-        'checksums': ['a3b31b8ad70c42826076786b2b1b63b79cdbadfa55fe126773bc357686fd33a9'],
-    }),
-    ('polynom', '1.4-0', {
-        'checksums': ['c5b788b26f7118a18d5d8e7ba93a0abf3efa6603fa48603c70ed63c038d3d4dd'],
-    }),
-    ('polspline', '1.1.19', {
-        'checksums': ['953e3c4d007c3ef86ac2af3c71b272a99e8e35b194bdd58575785558c6711f66'],
-    }),
-    ('rms', '6.2-0', {
-        'checksums': ['10d58cbfe39fb434223834e29e5248c9384cded23e6267cfc99367d0f5ee24b6'],
-    }),
-    ('RWekajars', '3.9.3-2', {
-        'checksums': ['16e6b019aab1646f89c5203f0d6fc1cb800129e5169b15aaef30fd6236f5da1a'],
-    }),
-    ('RWeka', '0.4-43', {
-        'checksums': ['8c227a5935cff180d03c30eb73bdd00b16737579c8b8503ec7fccc17e746179a'],
-    }),
-    ('slam', '0.1-48', {
-        'checksums': ['0a0b32d35fd6b8d1ac021b1358e73d32ab942d274a84fbba732d6c02efdcfade'],
-    }),
-    ('tm', '0.7-8', {
-        'checksums': ['b1eb1683d956db1a207b61cc086ae08b3ca7f46b6b8bc46d09ba5a4fafa66256'],
-    }),
-    ('leaps', '3.1', {
-        'checksums': ['3d7c3a102ce68433ecf167ece96a7ebb4207729e4defd0ac8fc00e7003f5c3b6'],
-    }),
-    ('cNORM', '2.1.0', {
-        'checksums': ['52d0f831c2bfac93999b004c6f9ef84fe8230dc954da7b3d10030640fb7e3106'],
-    }),
-    ('TraMineR', '2.2-2', {
-        'checksums': ['0c0823e2f591bb669f8f36dac22199c0d2e2dfb20fc89d62e4a44575d57397a9'],
-    }),
-    ('chemometrics', '1.4.2', {
-        'checksums': ['b705832fa167dc24b52b642f571ed1efd24c5f53ba60d02c7797986481b6186a'],
-    }),
-    ('FNN', '1.1.3', {
-        'checksums': ['de763a25c9cfbd19d144586b9ed158135ec49cf7b812938954be54eb2dc59432'],
-    }),
-    ('miscTools', '0.6-26', {
-        'checksums': ['be3c5a63ca12ce7ce4d43767a1815cd3dcf32664728ade251cfb03ea6f77fc9a'],
-    }),
-    ('maxLik', '1.5-2', {
-        'checksums': ['7cee05be0624b6a76911fa7b0d66f3e1b78460e0c55ed8bc904ce1e8af7bb15d'],
-    }),
-    ('gbRd', '0.4-11', {
-        'checksums': ['0251f6dd6ca987a74acc4765838b858f1edb08b71dbad9e563669b58783ea91b'],
-    }),
-    ('rbibutils', '2.2.4', {
-        'checksums': ['bb9e7bd0ca472f7851704bd9a52ef7eca7540db32523f1b1f7e3bf06268cde97'],
-    }),
-    ('Rdpack', '2.1.2', {
-        'checksums': ['714897ec115344d9a9d423519f4c289e71038f80abccced02a47cdc05d61a168'],
-    }),
-    ('dfidx', '0.0-4', {
-        'checksums': ['04255de9b002b2f89db04144edcd72e21804e0c129a3e5082b4a21630c850702'],
-    }),
-    ('mlogit', '1.1-1', {
-        'checksums': ['6f3ea97db410be929a3078422f3d354d2f17855a21bbdc7c2c09d901e233d143'],
-    }),
-    ('getopt', '1.20.3', {
-        'checksums': ['531f5fdfdcd6b96a73df2b39928418de342160ac1b0043861e9ea844f9fbf57f'],
-    }),
-    ('gsalib', '2.1', {
-        'checksums': ['e1b23b986c18b89a94c58d9db45e552d1bce484300461803740dacdf7c937fcc'],
-    }),
-    ('optparse', '1.7.1', {
-        'checksums': ['324e304c13efd565d766766193d4ccd75e2cd949dfcfb416afc3939489071fe7'],
-    }),
-    ('labelled', '2.9.0', {
-        'checksums': ['36ac0e169ee065a8bced9417efeb85d62e1504a590d4321667d8a6213285d639'],
-    }),
-    ('R.cache', '0.15.0', {
-        'checksums': ['adb4d3b08f7917e10fe6188c7b90a3318701a974c58eaa09943b929382bdf126'],
-    }),
-    ('styler', '1.6.2', {
-        'checksums': ['a62fcc76aac851069f33874f9eaabdd580973b619cfc625d6ec910476015f75c'],
-    }),
-    ('questionr', '0.7.5', {
-        'checksums': ['a1a25d8ab228a8d3bdb6c37d50db3964fe33a3fe1c46a95331b029261977d4a3'],
-    }),
-    ('klaR', '0.6-15', {
-        'checksums': ['5bfe5bc643f8a64b222317732c26e9f93be297cdc318a869f15cc9ab0d9e0fae'],
-    }),
-    ('neuRosim', '0.2-12', {
-        'checksums': ['f4f718c7bea2f4b61a914023015f4c71312f8a180124dcbc2327b71b7be256c3'],
-    }),
-    ('locfit', '1.5-9.4', {
-        'checksums': ['d9d3665c5f3d49f698fb4675daf40a0550601e86db3dc00f296413ceb1099ced'],
-    }),
-    ('GGally', '2.1.2', {
-        'checksums': ['30352f36bf061bc98bdd5fa373ea0f23d007040bd908c7c018c8e627e0fb28e5'],
-    }),
-    ('beanplot', '1.2', {
-        'checksums': ['49da299139a47171c5b4ccdea79ffbbc152894e05d552e676f135147c0c9b372'],
-    }),
-    ('clValid', '0.7', {
-        'checksums': ['037da469891462021eb177f9c9e18caefa8532f08c68fb576fae1668a1f451a1'],
-    }),
-    ('DiscriMiner', '0.1-29', {
-        'checksums': ['5aab7671086ef9940e030324651976456f0e84dab35edb7048693ade885228c6'],
-    }),
-    ('ellipse', '0.4.2', {
-        'checksums': ['1719ce9a00b9ac4d56dbf961803085b892d3359726fda3567bb989ddfed9a5f2'],
-    }),
-    ('pbkrtest', '0.5.1', {
-        'checksums': ['b2a3452003d93890f122423b3f2487dcb6925440f5b8a05578509e98b6aec7c5'],
-    }),
-    ('carData', '3.0-4', {
-        'checksums': ['cda6f5e3efc1d955a4a0625e9c33f90d49f5455840e88b3bd757129b86044724'],
-    }),
-    ('maptools', '1.1-2', {
-        'checksums': ['3995c96e8472cd6717fe3cbd3506358ff460b6c2cf92dbe4b00f75f507514439'],
-    }),
-    ('zip', '2.2.0', {
-        'checksums': ['9f95987c964039834f770ecda2d5f7e3d3a9de553c89db2a5926c4219bf4b9d8'],
-    }),
-    ('openxlsx', '4.2.4', {
-        'checksums': ['af571b3c60cea2a5975f6a394469f1c50266d4a5c5c91896b991b1b3ba8bc86e'],
-    }),
-    ('rematch', '1.0.1', {
-        'checksums': ['a409dec978cd02914cdddfedc974d9b45bd2975a124d8870d52cfd7d37d47578'],
-    }),
-    ('cellranger', '1.1.0', {
-        'checksums': ['5d38f288c752bbb9cea6ff830b8388bdd65a8571fd82d8d96064586bd588cf99'],
-    }),
-    ('readxl', '1.3.1', {
-        'checksums': ['24b441713e2f46a3e7c6813230ad6ea4d4ddf7e0816ad76614f33094fbaaaa96'],
-    }),
-    ('rio', '0.5.27', {
-        'checksums': ['e0eb616cdbba9f2d5c4489ae05336201d717ce65b0ea6854023054d1c2e3dd0a'],
-    }),
-    ('car', '3.0-11', {
-        'checksums': ['b32c927206f515631ff276dbb337b0f22e9b2d851f4abb1d2c272e534c19542c'],
-    }),
-    ('flashClust', '1.01-2', {
-        'checksums': ['48a7849bb86530465ff3fbfac1c273f0df4b846e67d5eee87187d250c8bf9450'],
-    }),
-    ('ggrepel', '0.9.1', {
-        'checksums': ['29fb916d4799ba6503a5dd019717ffdf154d2aaae9ff1736f03e2be24af6bdfc'],
-    }),
-    ('DT', '0.19', {
-        'checksums': ['baa6bdae215ab84a5dee9c0a6c55dd92135c795d13dfce3c3485519c6f0e3b13'],
-    }),
-    ('FactoMineR', '2.4', {
-        'checksums': ['b9e3adce9a66b4daccc85fa67cb0769d6be230beeb126921b386ccde5db2e851'],
-    }),
-    ('flexclust', '1.4-0', {
-        'checksums': ['82fe445075a795c724644864c7ee803c5dd332a89ea9e6ccf7cd1ae2d1ecfc74'],
-    }),
-    ('flexmix', '2.3-17', {
-        'checksums': ['36019b7833032409ac61720dd625fa5a581a1d8bcba9045b04979c90907b5649'],
-    }),
-    ('prabclus', '2.3-2', {
-        'checksums': ['f421bcbcb557281e0de4a06b15f9a496adb5c640e883c0f7bb12051efc69e441'],
-    }),
-    ('diptest', '0.76-0', {
-        'checksums': ['508a5ebb161519cd0fcd156dc047b51becb216d545d62c6522496463f94ec280'],
-    }),
-    ('trimcluster', '0.1-5', {
-        'checksums': ['9239f20e4a06ac2fa89e5d5d89b23a45c8c534a7264d89bede8a35d43dda518b'],
-    }),
-    ('fpc', '2.2-9', {
-        'checksums': ['29b0006e96c8645645d215d3378551bd6525aaf45abde2d9f12933cf6e75fa38'],
-    }),
-    ('BiasedUrn', '1.07', {
-        'checksums': ['2377c2e59d68e758a566452d7e07e88663ae61a182b9ee455d8b4269dda3228e'],
-    }),
-    ('TeachingDemos', '2.12', {
-        'checksums': ['3e75405ce1affa406d6df85e06f96381412bc7a2810b25d8c81bfe64c4698644'],
-    }),
-    ('kohonen', '3.0.10', {
-        'checksums': ['996956ea46a827c9f214e4f940a19304a0ff35bda707d4d7312f80d3479067b2'],
-    }),
-    ('base64', '2.0', {
-        'checksums': ['8e259c2b12446197d1152b83a81bab84ccb5a5b77021a9b5645dd4c63c804bd1'],
-    }),
-    ('doRNG', '1.8.2', {
-        'checksums': ['33e9d45b91b0fde2e35e911b9758d0c376049121a98a1e4c73a1edfcff11cec9'],
-    }),
-    ('nleqslv', '3.3.2', {
-        'checksums': ['f54956cf67f9970bb3c6803684c84a27ac78165055745e444efc45cfecb63fed'],
-    }),
-    ('Deriv', '4.1.3', {
-        'checksums': ['dbdbf5ed8babf706373ae33a937d013c46110a490aa821bcd158a70f761d0f8c'],
-    }),
-    ('RGCCA', '2.1.2', {
-        'checksums': ['20f341fca8f616c556699790814debdf2ac7aa4dd9ace2071100c66af1549d7d'],
-    }),
-    ('pheatmap', '1.0.12', {
-        'checksums': ['579d96ee0417203b85417780eca921969cda3acc210c859bf9dfeff11539b0c1'],
-    }),
-    ('pvclust', '2.2-0', {
-        'checksums': ['7892853bacd413b5a921006429641ad308a344ca171b3081c15e4c522a8b0201'],
-    }),
-    ('RCircos', '1.2.1', {
-        'checksums': ['3b9489ab05ea83ead99ca6e4a1e6830467a2064779834aff1317b42bd41bb8fd'],
-    }),
-    ('lambda.r', '1.2.4', {
-        'checksums': ['d252fee39065326c6d9f45ad798076522cec05e73b8905c1b30f95a61f7801d6'],
-    }),
-    ('futile.options', '1.0.1', {
-        'checksums': ['7a9cc974e09598077b242a1069f7fbf4fa7f85ffe25067f6c4c32314ef532570'],
-    }),
-    ('futile.logger', '1.4.3', {
-        'checksums': ['5e8b32d65f77a86d17d90fd8690fc085aa0612df8018e4d6d6c1a60fa65776e4'],
-    }),
-    ('VennDiagram', '1.7.0', {
-        'checksums': ['7537566ae94ea4bde97ca819ce5ec477943f33847a8eb0042d0859ce11ab35d1'],
-    }),
-    ('xlsxjars', '0.6.1', {
-        'checksums': ['37c1517f95f8bca6e3514429394d2457b9e62383305eba288416fb53ab2e6ae6'],
-    }),
-    ('xlsx', '0.6.5', {
-        'checksums': ['378c5ed475a3d7631ea1ea13e0a69d619c1a52260922abda42818752dbb32107'],
-    }),
-    ('uroot', '2.1-2', {
-        'checksums': ['bd7fd9e35928d09d0e8fae9e4359a2b2bca6e6865b278436319e2f91db0e4b37'],
-    }),
-    ('forecast', '8.15', {
-        'checksums': ['c73aabed083095b457ed875c240716686fbd41d1cbafa116b7b890a54b919174'],
-    }),
-    ('fma', '2.4', {
-        'checksums': ['69a94c3bd464176a80232d49fcd04d478d4dd59f9bf128d6a9f46e49612d27f4'],
-    }),
-    ('expsmooth', '2.3', {
-        'checksums': ['ac7da36347f983d6ec71715daefd2797fe2fc505c019f4965cff9f77ce79982a'],
-    }),
-    ('fpp', '0.5', {
-        'checksums': ['9c87dd8591b8a87327cae7a03fd362a5492495a96609e5845ccbeefb96e916cb'],
-    }),
-    ('tensor', '1.5', {
-        'checksums': ['e1dec23e3913a82e2c79e76313911db9050fb82711a0da227f94fc6df2d3aea6'],
-    }),
-    ('polyclip', '1.10-0', {
-        'checksums': ['74dabc0dfe5a527114f0bb8f3d22f5d1ae694e6ea9345912909bae885525d34b'],
-    }),
-    ('goftest', '1.2-3', {
-        'checksums': ['3a5f74b6ae7ece5b294781ae57782abe12375d61789c55ff5e92e4aacf347f19'],
-    }),
-    ('spatstat.utils', '2.2-0', {
-        'checksums': ['5ad87e524285621dc4ef75c941eba933d980125293ee8f2bef5b7db02f63d7ab'],
-    }),
-    ('spatstat.data', '2.1-0', {
-        'checksums': ['1b9840ad0ec7eddfa98a01e8b8a5291e5cb447c3082aa7d7b4df762577f95533'],
-    }),
-    ('spatstat.geom', '2.3-0', {
-        'checksums': ['7b1746a44509a6d518799332477fffa3474217c6cb3c6b92a325525b48fce9c7'],
-    }),
-    ('spatstat.sparse', '2.0-0', {
-        'checksums': ['27fbce64e21f095a5e9ac54c86f91c9f4b45eac3c2358580e04423b4beba19c7'],
-    }),
-    ('spatstat.core', '2.3-0', {
-        'checksums': ['5795ec6db2961dce740c7cd39a9c1b855d92a4af351a794a9bfd634a3f1526c9'],
-    }),
-    ('spatstat.linnet', '2.3-0', {
-        'checksums': ['f0c089c41db8fe83d09ecb396ce8952a593c265411fb997847201d9784f9a2f9'],
-    }),
-    ('spatstat', '2.2-0', {
-        'checksums': ['8f0f90e8d5af1e2e97ef5f01e595511916290d554fc1ae3ad7b217605bd4e353'],
-    }),
-    ('pracma', '2.3.3', {
-        'checksums': ['cf1f8d7724a385d9a2e1a5496d9ba0e9908940b85669fb2c506b9059722cb93c'],
-    }),
-    ('RCurl', '1.98-1.5', {
-        'checksums': ['73187c9a039188ffdc255fb7fa53811a6abfb31e6375a51eae8c763b37dd698d'],
-    }),
-    ('bio3d', '2.4-2', {
-        'checksums': ['91415766cda0f96557e6bc568dbce8d44254a9460f2e2d0beed0ce14ffad6ccb'],
-    }),
-    ('AUC', '0.3.0', {
-        'checksums': ['e705f2c63d336249d19187f3401120d738d42d323fce905f3e157c2c56643766'],
-    }),
-    ('interpretR', '0.2.4', {
-        'checksums': ['4c08a6dffd6fd5764f27812f3a085c53e6a21d59ae82d903c9c0da93fd1dd059'],
-    }),
-    ('cvAUC', '1.1.0', {
-        'checksums': ['c4d8ed53b93869650aa2f666cf6d1076980cbfea7fa41f0b8227595be849738d'],
-    }),
-    ('SuperLearner', '2.0-28', {
-        'checksums': ['5f42233abd48f1740c33aae1ec4ad8e9952fddb5df1ee49ff2d43d5d89f05601'],
-    }),
-    ('mediation', '4.5.0', {
-        'checksums': ['210206618787c395a67689be268283df044deec7199d9860ed95218ef1e60845'],
-    }),
-    ('CVST', '0.2-2', {
-        'checksums': ['854b8c983427ecf9f2f7798c4fd1c1d06762b5b0bcb1045502baadece6f78316'],
-    }),
-    ('DRR', '0.0.4', {
-        'checksums': ['93e365a4907e301ae01f7d943e6bdcda71ef23c51a4759ba3c94bcf842d4e0f8'],
-    }),
-    ('dimRed', '0.2.3', {
-        'checksums': ['e6e56e3f6999ebdc326e64ead5269f3aaf61dd587beefafb7536ac3890370d84'],
-    }),
-    ('ddalpha', '1.3.11', {
-        'checksums': ['c30b4a3a9549cb4dc0a8e51e06f5b6e4c457c5326acc8f4680968c920f59b6e9'],
-    }),
-    ('RcppRoll', '0.3.0', {
-        'checksums': ['cbff2096443a8a38a6f1dabf8c90b9e14a43d2196b412b5bfe5390393f743f6b'],
-    }),
-    ('adabag', '4.2', {
-        'checksums': ['47019eb8cefc8372996fbb2642f64d4a91d7cedc192690a8d8be6e7e03cd3c81'],
-    }),
-    ('parallelMap', '1.5.1', {
-        'checksums': ['c108a634a335ed47b0018f532a52b032487e239c5061f939ba32355dfefde7e1'],
-    }),
-    ('ParamHelpers', '1.14', {
-        'checksums': ['b17652d0a69de3241a69f20be4ad1bfe02c413328a17f3c1ac7b73886a6ba2eb'],
-    }),
-    ('ggvis', '0.4.7', {
-        'checksums': ['9e6b067e11d497c796d42156570e2481afb554c5db265f42afbb74d2ae0865e3'],
-    }),
-    ('mlr', '2.19.0', {
-        'checksums': ['1149c9b453896481c85906045aa82d511d96979ddecbe5a3faf04f9f4a5e6113'],
-    }),
-    ('unbalanced', '2.0', {
-        'checksums': ['9be32b1ce9d972f1abfff2fbe18f5bb5ba9c3f4fb1282063dc410b82ad4d1ea2'],
-    }),
-    ('RSNNS', '0.4-14', {
-        'checksums': ['7f6262cb2b49b5d5979ccce9ded9cbb2c0b348fd7c9eabc1ea1d31c51a102c20'],
-    }),
-    ('abc.data', '1.0', {
-        'checksums': ['b242f43c3d05de2e8962d25181c6b1bb6ca1852d4838868ae6241ca890b161af'],
-    }),
-    ('abc', '2.1', {
-        'checksums': ['0bd2dcd4ee1915448d325fb5e66bee68e0497cbd91ef67a11b400b2fbe52ff59'],
-    }),
-    ('lhs', '1.1.3', {
-        'checksums': ['e43b8d48db1cf26013697e2a798ed1d31d1ee1790f2ebfecb280176c0e0c06d1'],
-    }),
-    ('tensorA', '0.36.2', {
-        'checksums': ['8e8947566bd3b65a54de4269df1abaa3d49cf5bfd2a963c3274a524c8a819ca7'],
-    }),
-    ('EasyABC', '1.5', {
-        'checksums': ['1dd7b1383a7c891cafb34d9cec65d92f1511a336cff1b219e63c0aa791371b9f'],
-    }),
-    ('whisker', '0.4', {
-        'checksums': ['7a86595be4f1029ec5d7152472d11b16175737e2777134e296ae97341bf8fba8'],
-    }),
-    ('roxygen2', '7.1.2', {
-        'checksums': ['b3693d1eb57bb1c27134447ea7f64c353c085dd2237af7cfacc75fca3d2fc5fd'],
-    }),
-    ('git2r', '0.28.0', {
-        'checksums': ['ce6d148d21d2c87757e98ef4474b2d09faded9b9b866f046bd26d4ca925e55f2'],
-    }),
-    ('rversions', '2.1.1', {
-        'checksums': ['79aaacf5a1258d91ac0ddedf3c8c16a2d10d39010993dcc7b0a2638afee27cb1'],
-    }),
-    ('xopen', '1.0.0', {
-        'checksums': ['e207603844d69c226142be95281ba2f4a056b9d8cbfae7791ba60535637b3bef'],
-    }),
-    ('sessioninfo', '1.2.0', {
-        'checksums': ['adebf738ad3d3af9e018302d949994240311ef06c0a77c645b2f761c1a8c07df'],
-    }),
-    ('rcmdcheck', '1.4.0', {
-        'checksums': ['bbd4ef7d514b8c2076196a7c4a6041d34623d55fbe73f2771758ce61fd32c9d0'],
-    }),
-    ('remotes', '2.4.1', {
-        'checksums': ['d5d777b2e10d70fd0670166d539eab88ec4f7fe030f54ec5cd2703f548473276'],
-    }),
-    ('clisymbols', '1.2.0', {
-        'checksums': ['0649f2ce39541820daee3ed408d765eddf83db5db639b493561f4e5fbf88efe0'],
-    }),
-    ('ini', '0.3.1', {
-        'checksums': ['7b191a54019c8c52d6c2211c14878c95564154ec4865f57007953742868cd813'],
-    }),
-    ('gitcreds', '0.1.1', {
-        'checksums': ['b14aaf4e910a9d2d6c65c93e645f0b0159c00898e669f917f83c03dfedb1dfea'],
-    }),
-    ('gh', '1.3.0', {
-        'checksums': ['a44039054e8ca56496f2d9c7a10cdadf4a7383bc91086e768ba7e7f1fbcaed1c'],
-    }),
-    ('credentials', '1.3.1', {
-        'checksums': ['8795a73a65d1ce2e9f0be66546e85231c846ba6445a11948b9816fbee20a7a60'],
-    }),
-    ('gert', '1.4.1', {
-        'checksums': ['623b58f12c5530b101e91a352269fe011814b074cf7a7ed0b3cd4506390a63f8'],
-    }),
-    ('usethis', '2.1.3', {
-        'checksums': ['2db075980247d854110de60e7afe6f6e0b654a3ba49d0699ff40dd516e8e9bbf'],
-    }),
-    ('covr', '3.5.1', {
-        'checksums': ['a54cfc3623ea56084158ac5d7fe33f216f45191f6dcddab9c9ed4ec1d9d8ac6c'],
-    }),
-    ('devtools', '2.4.2', {
-        'checksums': ['71f0a55054d293fb553702b21b91941bc5c83a933610fad6f9662bf0a6178f05'],
-    }),
-    ('Rook', '1.1-1', {
-        'checksums': ['00f4ecfa4c5c57018acbb749080c07154549a6ecaa8d4130dd9de79427504903'],
-    }),
-    ('Cairo', '1.5-12.2', {
-        'checksums': ['dd524105c83b82b5c3b3ee2583ef90d4cafa54b0c29817dac48b425b79f90f92'],
-    }),
-    ('RMTstat', '0.3', {
-        'checksums': ['81eb4c5434d04cb66c749a434c33ceb1c07d92ba79765d4e9233c13a092ec2da'],
-    }),
-    ('Lmoments', '1.3-1', {
-        'checksums': ['7c9d489a08f93fa5877e2f233ab9732e0d1b2761596b3f6ac91f2295e41a865d'],
-    }),
-    ('distillery', '1.2-1', {
-        'checksums': ['4b88f0b34e472b9134ad403fb32283424f1883a5943e52c55f1fe05995efb5fa'],
-    }),
-    ('extRemes', '2.1-1', {
-        'checksums': ['5a1927bb21f178ec5a3e3f862d792e690e45c16c88190e64e83aa1fb9e3ffa02'],
-    }),
-    ('tkrplot', '0.0-26', {
-        'checksums': ['dd66264c2553f6927aff297c6b1c3b61867d6c63aec080f40a1e9d53cfc9d120'],
-    }),
-    ('misc3d', '0.9-1', {
-        'checksums': ['a07bbb0de153e806cd79675ed478d2d9221cff825654f59a71a9cf61f4293d65'],
-    }),
-    ('multicool', '0.1-12', {
-        'checksums': ['487d28d9c3c606be0cf56e2d8f8b0d79fb71949c68886ea9251fbb1c01664a36'],
-    }),
-    ('plot3D', '1.4', {
-        'checksums': ['d04a45197646fb36bc38870c1c2351cb56b912bd772b1ebfa25eaeef35fda9c0'],
-    }),
-    # ('plot3Drgl', '1.0.2', {
-    #    'checksums': ['aa874891446a395f01791d80a5a0f1f9a1c2c41f029de3a8d5af9aa47f46a496'],
-    # }),
-    # ('OceanView', '1.0.6', {
-    #    'checksums': ['2c5165975d6c49fdc83a892cb0406584928dd44000c9774fffc00fbd2fec86f3'],
-    # }),
-    ('ks', '1.13.2', {
-        'checksums': ['7c9e4e178adcecb0817213c0210b82d91647f4acf5c4d4056d46d286a5bff609'],
-    }),
-    ('logcondens', '2.1.6', {
-        'checksums': ['785bbda00b9a25e56440e11356ac219cfbf0fdf8b08c7b0728e53a9febe7a365'],
-    }),
-    ('Iso', '0.0-18.1', {
-        'checksums': ['2fa5f78a7603cbae94a5e38e791938596a053d48c609a7c120a19cbb7d93c66f'],
-    }),
-    ('penalized', '0.9-51', {
-        'checksums': ['eaa80dca99981fb9eb576261f30046cfe492d014cc2bf286c447b03a92e299fd'],
-    }),
-    ('clusterRepro', '0.9', {
-        'checksums': ['940d84529ff429b315cf4ad25700f93e1156ccacee7b6c38e4bdfbe2d4c6f868'],
-    }),
-    ('data.tree', '1.0.0', {
-        'checksums': ['40674c90a5bd00f5185db9adbd221c6f1114043e69095249f5fa8b3044af3f5e'],
-    }),
-    ('influenceR', '0.1.0.1', {
-        'checksums': ['63c46f1175fced33fb1b78d4d56e37fbee09b408945b0106dac36e3344cd4766'],
-    }),
-    ('visNetwork', '2.1.0', {
-        'checksums': ['a2b91e7fbbd9d08a9929a5b2c891d9c0bca5977ad772fa37510d96656af1152f'],
-    }),
-    ('downloader', '0.4', {
-        'checksums': ['1890e75b028775154023f2135cafb3e3eed0fe908138ab4f7eff1fc1b47dafab'],
-    }),
-    ('DiagrammeR', '1.0.6.1', {
-        'checksums': ['be4e4c520a3692902ce405e8225aef9f3d5f0cd11fcde614f6541e981b63673d'],
-    }),
-    ('randomForestSRC', '2.13.0', {
-        'checksums': ['beb981cae3a8c7232a2ca67f0a7bf3293eb44d5f1ac14913632ca8f8d4728abd'],
-    }),
-    ('sm', '2.2-5.7', {
-        'checksums': ['2607a2cafc68d7e99005daf99e36f4a66eaf569ebb6b7500e962642cf58be80f'],
-    }),
-    ('pbivnorm', '0.6.0', {
-        'checksums': ['07c37d507cb8f8d2d9ae51a9a6d44dfbebd8a53e93c242c4378eaddfb1cc5f16'],
-    }),
-    ('lavaan', '0.6-9', {
-        'checksums': ['d404c4eb40686534f9c05f24f908cd954041f66d1072caea4a3adfa83a5f108a'],
-    }),
-    ('matrixcalc', '1.0-5', {
-        'checksums': ['5906e1ef06dbc18efc7a4b370adc180ef8941b5438119703bd981d1c76a06fca'],
-    }),
-    ('arm', '1.12-2', {
-        'checksums': ['816ba1c31eec00feef472c57e280488d3d233b592f6f0a1a30e4abb903cb4f5d'],
-    }),
-    ('mi', '1.0', {
-        'checksums': ['34f44353101e8c3cb6bf59c5f4ff5b2391d884dcbb9d23066a11ee756b9987c0'],
-    }),
-    ('servr', '0.23', {
-        'checksums': ['4492d1dabc8f62cf7f7a53c97413a664823a3916dcaf99a7b04bcb279f7b2eb8'],
-    }),
-    ('rgexf', '0.16.2', {
-        'checksums': ['6ee052b0de99d0c7492366b991d345a51b3d0cc890d10a68b8670e1bd4fc8201'],
-    }),
-    ('sem', '3.1-13', {
-        'checksums': ['07749f710ad800f43cacdff8f1aa4f20105a619c72be4465f29860c381242f65'],
-    }),
-    ('statnet.common', '4.5.0', {
-        'checksums': ['3cdb23db86f3080462f15e29bcf3e941590bc17ea719993b301199b22d6f882f'],
-    }),
-    ('network', '1.17.1', {
-        'checksums': ['fc3c3a0014f8895a11c33994c9b44c6ef6cc49c7d026cd41ae6bba5ef63005a7'],
-    }),
-    ('rle', '0.9.2', {
-        'checksums': ['803cbe310af6e882e27be61d37d660dbe5910ac1ee1eff61a480bcf724a04f69'],
-    }),
-    ('sna', '2.6', {
-        'checksums': ['3a016550d9f424a0613c3f5b0b680dbd3a1f20a343173d39a96034340ad9202a'],
-    }),
-    ('glasso', '1.11', {
-        'checksums': ['4c37844b26f55985184a734e16b8fe880b192e3d2763614b0ab3f99b4530e30a'],
-    }),
-    ('huge', '1.3.5', {
-        'checksums': ['9240866e2f773cd0ac8a02514871149d2babaa162a49e151eab9591ad42984ea'],
-    }),
-    ('d3Network', '0.5.2.1', {
-        'checksums': ['5c798dc0c87c6d574abb7c1f1903346e6b0fec8adfd1df7aef5e4f9e7e3a09be'],
-    }),
-    ('BDgraph', '2.64', {
-        'checksums': ['243f3af3724552049f8f4f55dd425e3313adab95e1128ae4d6551d96005fdf5e'],
-    }),
-    ('graphlayouts', '0.7.1', {
-        'checksums': ['380f8ccb0b08735694e83f661fd56a0d592a78448ae91b89c290ba8582d66717'],
-    }),
-    ('tweenr', '1.0.2', {
-        'checksums': ['1805f575da6705ca4e5ec1c4605222fc826ba806d9ff9af41770294fe08ff69f'],
-    }),
-    ('ggforce', '0.3.3', {
-        'checksums': ['2a283bb409da6b96929863a926b153bcc59b2c6f00551805db1d1d43e5929f2f'],
-    }),
-    ('tidygraph', '1.2.0', {
-        'checksums': ['057d6c42fc0144109f3ace7f5058cca7b2fe493c761daa991448b23f86b6129f'],
-    }),
-    ('ggraph', '2.0.5', {
-        'checksums': ['e36ad49dba92ee8652e18b1fb197be0ceb9f0a2f8faee2194453a62578449654'],
-    }),
-    ('qgraph', '1.9', {
-        'checksums': ['e1d7489c4db47878dccd34ded7e8173d58a190ad453d2e6e89f33549ccfd10aa'],
-    }),
-    ('HWxtest', '1.1.9', {
-        'patches': ['HWxtest-1.1.9_add-fcommon.patch'],
-        'checksums': [
-            'a37309bed4a99212ca104561239d834088217e6c5e5e136ff022544c706f25e6',  # HWxtest_1.1.9.tar.gz
-            '4ce08c35035dbcc4edf092cdb405ae32c21c05b3786c15c0aa4bfe13bd81f451',  # HWxtest-1.1.9_add-fcommon.patch
-        ],
-    }),
-    ('diveRsity', '1.9.90', {
-        'checksums': ['b8f49cdbfbd82805206ad293fcb2dad65b962fb5523059a3e3aecaedf5c0ee86'],
-    }),
-    ('doSNOW', '1.0.19', {
-        'checksums': ['4cd2d080628482f4c6ecab593313d7e42516f5ff13fbf9f90e461fcad0580738'],
-    }),
-    ('geepack', '1.3-2', {
-        'checksums': ['99b53e40f7e5fda7422b143e6fee16513e2f880cb04a97cd403e98c4760670a6'],
-    }),
-    ('biom', '0.3.12', {
-        'checksums': ['4ad17f7811c7346dc4923bd6596a007c177eebb1944a9f46e5674afcc5fdd5a1'],
-    }),
-    ('pim', '2.0.2', {
-        'checksums': ['1195dbdbd67348dfef4b6fc34fcec643da685ebe58d34bbe049ab121aca9944f'],
-    }),
-    ('minpack.lm', '1.2-1', {
-        'checksums': ['14cb7dba3ef2b46da0479b46d46c76198e129a31f6157cd8b37f178adb15d5a3'],
-    }),
-    ('rootSolve', '1.8.2.3', {
-        'checksums': ['b5b3d1641642a3fd1279dbd1245f968d2331ac9588d77f872b113f7dc4594ba0'],
-    }),
-    ('diagram', '1.6.5', {
-        'checksums': ['e9c03e7712e0282c5d9f2b760bafe2aac9e99a9723578d9e6369d60301f574e4'],
-    }),
-    ('FME', '1.3.6.2', {
-        'checksums': ['65a200f8171e27f0a3d7ffce3e49b01561f219a11f3cb515ff613a45927ff618'],
-    }),
-    ('bmp', '0.3', {
-        'checksums': ['bdf790249b932e80bc3a188a288fef079d218856cf64ffb88428d915423ea649'],
-    }),
-    ('tiff', '0.1-8', {
-        'checksums': ['4b7482f70d8ecef9596b766ef1c64102c8b09208cb769c39d9e4db81cb3ba1a2'],
-    }),
-    ('readbitmap', '0.1.5', {
-        'checksums': ['737d7d585eb33de2c200da64d16781e3c9522400fe2af352e1460c6a402a0291'],
-    }),
-    ('imager', '0.42.10', {
-        'checksums': ['01939eb03ad2e1369a4240a128c3b246a4c56f572f1ea4967f1acdc555adaeee'],
-    }),
-    ('signal', '0.7-7', {
-        'checksums': ['67a015c46d67de7548c3adb83a1b22524de75501a861d91668c3c2ea761a4e61'],
-    }),
-    ('tuneR', '1.3.3.1', {
-        'checksums': ['cdcbf04ab5b547002ee5b1d3bc46145882c5a551f164cac43df71596f1edd18a'],
-    }),
-    ('pastecs', '1.3.21', {
-        'checksums': ['8c1ef2affe88627f0b23295aa5edb758b8fd6089ef09f60f37c46445128b8d7c'],
-    }),
-    ('audio', '0.1-8', {
-        'checksums': ['1a1c78bca63ed1fb5e30e00c593b67e1230b408e6a77c67082b41373d79b5bb4'],
-    }),
-    ('fftw', '1.0-6', {
-        'checksums': ['397ef5ec354b919884f74fba4202bfc13ad11a70b16285c41677aad1d3b170ce'],
-    }),
-    ('seewave', '2.1.8', {
-        'checksums': ['10e6487325ccd1c3cd64617182733f1472f3170974b32bb61a6b12ba7ddeeceb'],
-    }),
-    ('gsw', '1.0-6', {
-        'checksums': ['147ce73da75777799af9cb712862ef25b52fcae146a64ce0a525460ddfea1deb'],
-    }),
-    ('wk', '0.5.0', {
-        'checksums': ['71d500e0beaeed40501702adf214054d30278acb3171af6db4ae8dcdf5e7423a'],
-    }),
-    ('s2', '1.0.7', {
-        'checksums': ['2010c1c6ae29938ec9cd153a8b2c06a333ea4d647932369b2fc7d0c68d6d9e3f'],
-    }),
-    ('sf', '1.0-3', {
-        'checksums': ['2ee3ece4e5056fe267d76a785912a2285ddfc235b1be67b4c21b74dc39a831f8'],
-    }),
-    ('oce', '1.4-0', {
-        'checksums': ['3b341448001164dc62b54a26c8f86adf50e68705ddc47615b290b950da734408'],
-    }),
-    ('ineq', '0.2-13', {
-        'checksums': ['e0876403f59a3dfc2ea7ffc0d965416e1ecfdecf154e5856e5f54800b3efda25'],
-    }),
-    ('soundecology', '1.3.3', {
-        'checksums': ['276164d5eb92c78726c647be16232d2443acbf7061371ddde2672b4fdb7a069a'],
-    }),
-    ('memuse', '4.2-1', {
-        'checksums': ['f5e9dbaad4efbbfe219a93f446e318a00cad5b294bfc60ca2146eca894b47cf3'],
-    }),
-    ('pinfsc50', '1.2.0', {
-        'checksums': ['ed1fe214b9261feef8abfbf724c2bd9070d68e99a6ea95208aff2c57bbef8794'],
-    }),
-    ('vcfR', '1.12.0', {
-        'checksums': ['dd87ff010365de363864a44ca49887c0fdad0dd18d0d9c66e44e39c2d4581d52'],
-    }),
-    ('glmmML', '1.1.1', {
-        'checksums': ['255fe2640933d83ef7ea5813ba8006038c18195147d1f34f47a759210a674dd4'],
-    }),
-    ('cowplot', '1.1.1', {
-        'checksums': ['c7dce625b456dffc59ba100c816e16226048d12fdd29a7335dc1f6f6e12eed48'],
-    }),
-    ('tsne', '0.1-3', {
-        'checksums': ['66fdf5d73e69594af529a9c4f261d972872b9b7bffd19f85c1adcd66afd80c69'],
-    }),
-    ('sn', '2.0.0', {
-        'checksums': ['abd6ccdb3719b482db43ff2d5b12f2efcb8244792ec08e1176c5eb98fcc7886a'],
-    }),
-    ('tclust', '1.4-2', {
-        'checksums': ['95dcd07dbd16383f07f5cea8561e7f3bf314e4a7483879841103b149fc8c65d9'],
-    }),
-    ('ranger', '0.13.1', {
-        'checksums': ['60934f0accc21edeefddbb4ddebfdd7cd10a3d3e90b31aa2e6e4b7f50d632d0a'],
-    }),
-    ('hexbin', '1.28.2', {
-        'checksums': ['6241f8d3a6c6be2c1c693c3ddb99554bc103e3c6cf602d0c2787c0ce6fd1702d'],
-    }),
-    ('lobstr', '1.1.1', {
-        'checksums': ['b8c9ce00095bd4f304b4883ef71da24572022f0632a18c3e1ba317814e70716e'],
-    }),
-    ('pryr', '0.1.5', {
-        'checksums': ['7b1653ec51850f4633cee8e2eb7d0b2724fb587b801539488b426cf88f0f770b'],
-    }),
-    ('moments', '0.14', {
-        'checksums': ['2a3b81e60dafdd092d2bdd3513d7038855ca7d113dc71df1229f7518382a3e39'],
-    }),
-    ('laeken', '0.5.2', {
-        'checksums': ['22790f7157f23eb0b7b0b89e2ea53478fb3c0d15b5be8ad11525d3e6d5626cdc'],
-    }),
-    ('VIM', '6.1.1', {
-        'checksums': ['7581adca64cf20b93d5a111da83f663215b4529868b065b3463c4238bca97739'],
-    }),
-    ('smoother', '1.1', {
-        'checksums': ['91b55b82f805cfa1deedacc0a4e844a2132aa59df593f3b05676954cf70a195b'],
-    }),
-    ('dynamicTreeCut', '1.63-1', {
-        'checksums': ['831307f64eddd68dcf01bbe2963be99e5cde65a636a13ce9de229777285e4db9'],
-    }),
-    ('beeswarm', '0.4.0', {
-        'checksums': ['51f4339bf4080a2be84bb49a844c636625657fbed994abeaa42aead916c3d504'],
-    }),
-    ('vipor', '0.4.5', {
-        'checksums': ['7d19251ac37639d6a0fed2d30f1af4e578785677df5e53dcdb2a22771a604f84'],
-    }),
-    ('ggbeeswarm', '0.6.0', {
-        'checksums': ['bbac8552f67ff1945180fbcda83f7f1c47908f27ba4e84921a39c45d6e123333'],
-    }),
-    ('shinydashboard', '0.7.2', {
-        'checksums': ['a56ee48572649830cd8d82f1caa2099411461e19e19223cbad36a375299f3843'],
-    }),
-    ('rrcov', '1.6-0', {
-        'checksums': ['795f3a49b3e17c9c6e0fdd865e81a0402cefda970032c8299bcf2056ca7ec944'],
-    }),
-    ('WriteXLS', '6.3.0', {
-        'checksums': ['0b1d987abe4b08f6a32003b77d1cfc2eefdc5a478382e77ca0da98bccf6e526b'],
-    }),
-    ('bst', '0.3-23', {
-        'checksums': ['70957f1db8800bf0d628a9e6f72b7273329786dd119427790b326844591aa0f3'],
-    }),
-    ('pamr', '1.56.1', {
-        'checksums': ['d0e527f2336ee4beee91eefb2a8f0dfa96413d9b5a5841d6fc7ff821e67c9779'],
-    }),
-    ('WeightSVM', '1.7-9', {
-        'checksums': ['983733b618631d9ad754fb12f5e576912aff1f529cafdee4fddfd38d81ccc710'],
-    }),
-    ('mpath', '0.4-2.19', {
-        'checksums': ['fa0d92984910b8f556677850e3d899bc675724f0e2a3a73629d2700040335afe'],
-    }),
-    ('timereg', '2.0.1', {
-        'checksums': ['38429ae21d9d090ed968d2e0c06cd0310cc304e974c353a97cde3d2e49f138d7'],
-    }),
-    ('peperr', '1.3', {
-        'checksums': ['64d30b0ec09bf9b8f7b6edce67dd0f9e0e3dbe665fec8f5411f74142e53e9f5d'],
-    }),
-    ('heatmap3', '1.1.9', {
-        'checksums': ['594c33947b2be2cc8a592075f41a0df2398c892add7d63a15c613a5eeb8fdb69'],
-    }),
-    ('GlobalOptions', '0.1.2', {
-        'checksums': ['47890699668cfa9900a829c51f8a32e02a7a7764ad07cfac972aad66f839753e'],
-    }),
-    ('circlize', '0.4.13', {
-        'checksums': ['6cbadbf8e8b1abbd71a79080677d2b95f2bdd18f2e4d707c32d5c2ff26c5369b'],
-    }),
-    ('GetoptLong', '1.0.5', {
-        'checksums': ['8c237986ed3dfb72d956ad865ef7768644eebf144675ad66140acfd1aca9d701'],
-    }),
-    ('dendextend', '1.15.2', {
-        'checksums': ['4ba3885b66694589d455ffef31c218fe653fa25aff3efb7e8db6c25008d2921b'],
-    }),
-    ('RInside', '0.2.16', {
-        'checksums': ['7ae4ade128ea05f37068d59e610822ff0b277f9d39d8900f7eb31759ad5a2a0e'],
-    }),
-    ('limSolve', '1.5.6', {
-        'checksums': ['b97ea9930383634c8112cdbc42f71c4e93fe0e7bfaa8f401921835cb44cb49a0'],
-    }),
-    ('dbplyr', '2.1.1', {
-        'checksums': ['aba4cf47b85ab240fd3ec4cd8d512f6e1958201e151577c1a2ebc3d6ebc5bc08'],
-    }),
-    ('modelr', '0.1.8', {
-        'checksums': ['825ba77d95d60cfb94920bec910872ca2ffe7790a44148b2992be2759cb361c4'],
-    }),
-    ('debugme', '1.1.0', {
-        'checksums': ['4dae0e2450d6689a6eab560e36f8a7c63853abbab64994028220b8fd4b793ab1'],
-    }),
-    ('reprex', '2.0.1', {
-        'checksums': ['0e6d8667cacb63135476a766fba3a4f91e5ad86274ea66d2b1e6d773b5ca6426'],
-    }),
-    ('selectr', '0.4-2', {
-        'checksums': ['5588aed05f3f5ee63c0d29953ef53da5dac7afccfdd04b7b22ef24e1e3b0c127'],
-    }),
-    ('rvest', '1.0.2', {
-        'checksums': ['89bb477e0944c80298a52ccf650db8f6377fd7ed3c1bc7034d000f695fdf05a4'],
-    }),
-    ('dtplyr', '1.1.0', {
-        'checksums': ['99681b7285d7d5086e5595ca6bbeebf7f4e2ee358a32b694cd9d35916cdfc732'],
-    }),
-    ('gargle', '1.2.0', {
-        'checksums': ['4d46ca2933f19429ca5a2cfe47b4130a75c7cd9931c7758ade55bac0c091d73b'],
-    }),
-    ('googledrive', '2.0.0', {
-        'checksums': ['605c469a6a086ef4b049909c2e20a35411c165ce7ce4f62d68fd39ffed8c5a26'],
-    }),
-    ('ids', '1.0.1', {
-        'checksums': ['b6212a186063c23116c5cbd3cca65dbb8977dd737261e4526ebee8f64852cfe8'],
-    }),
-    ('googlesheets4', '1.0.0', {
-        'checksums': ['0a107d76aac99d6db48d97ce55810c1412b2197f457b8476f676169a36c7cc7a'],
-    }),
-    ('tidyverse', '1.3.1', {
-        'checksums': ['83cf95109d4606236274f5a8ec2693855bf75d3a1b3bc1ab4426dcc275ed6632'],
-    }),
-    ('R.rsp', '0.44.0', {
-        'checksums': ['8969075bdcabd43bad40eef6b82223e119426279fded041163fd41e55cee3a59'],
-    }),
-    ('gdistance', '1.3-6', {
-        'checksums': ['2ccabeb2f8cf44630c0bd2da79815fe357b812737ebece1bed8f90b27c126a24'],
-    }),
-    ('vioplot', '0.3.7', {
-        'checksums': ['06475d9a47644245ec91598e9aaef7db1c393802d9fc314420ac5139ae56adb6'],
-    }),
-    ('emulator', '1.2-21', {
-        'checksums': ['9b50b2c1e673dbc5e846a4fa72e8bd03434add9f659bde6d7b0c4f1bbd713346'],
-    }),
-    ('gmm', '1.6-6', {
-        'checksums': ['b1b321ad1b4a4a14a2825a2c3eb939ce2f2bcef995247a1d638eca250e59739b'],
-    }),
-    ('tmvtnorm', '1.4-10', {
-        'checksums': ['1a9f35e9b4899672e9c0b263affdc322ecb52ec198b2bb015af9d022faad73f0'],
-    }),
-    ('IDPmisc', '1.1.20', {
-        'checksums': ['bcb9cd7b8097e5089d1936286ef310ac2030ea7791350df706382ba470afc67f'],
-    }),
-    ('gap', '1.2.3-1', {
-        'checksums': ['343ae58ca91e75147ae3961285c3413bdf6dedf7cb4743a822a6c5b16d1b89e7'],
-    }),
-    ('qrnn', '2.0.5', {
-        'checksums': ['3bd83ee8bd83941f9defdab1b5573d0ceca02bf06759a67665e5b9358ff92f52'],
-    }),
-    ('TMB', '1.7.22', {
-        'checksums': ['c24125e1a37ed2b3c2554133183465cb6f3c0021cd4d4609c61336f59c3bd384'],
-    }),
-    ('glmmTMB', '1.1.2.3', {
-        'checksums': ['55631e001ff3f1d8e419e3b0b5555317713c733c11a2f7d4db6434d8c4e7dcf9'],
-    }),
-    ('gmp', '0.6-2', {
-        'checksums': ['6bfcb45b3f1e7da27d8773f911027355cab371d150c3dabf7dbaf8fba85b7f0e'],
-    }),
-    ('ROI', '1.0-0', {
-        'checksums': ['b0d87fb4ed2137d982734f3c5cdc0305aabe6e80f95de29655d02a9e82a0a341'],
-    }),
-    ('Rglpk', '0.6-4', {
-        'checksums': ['a28dbc3130b9618d6ed2ef718d2c55df8ed8c44a47161097c53fe15fa3bfbfa6'],
-    }),
-    ('ROI.plugin.glpk', '1.0-0', {
-        'checksums': ['b361b0d4222d74b21432cdc6990762affecdbcec8fd6bbdb13b78b59cb04b444'],
-    }),
-    ('spaMM', '3.9.13', {
-        'checksums': ['f9ded29106c656ff15ddc2564c16d44b77f08dac1f2dea5720028923e83e2514'],
-    }),
-    ('qgam', '1.3.3', {
-        'checksums': ['9a68fe4e74f4188862f7c01d682d50ffadd96ce7b98383404472309c87e3a26f'],
-    }),
-    ('DHARMa', '0.4.4', {
-        'checksums': ['b5a073f84faf7144f2074a43f619f8f264773afb0e09ca0294735e792552edca'],
-    }),
-    ('mvnfast', '0.2.7', {
-        'checksums': ['b67d50936c9a466977669ef6bb7b23df8e7c90a820ac916328c20e41ef8e0b72'],
-    }),
-    ('bridgesampling', '1.1-2', {
-        'checksums': ['54ecd39aa2e36d4d521d3d36425f9fe56a3f8547df6048c814c5931d790f3e6b'],
-    }),
-    ('BayesianTools', '0.1.7', {
-        'checksums': ['af49389bdeb794da3c39e1d63f59e6219438ecb8613c5ef523b00c6fed5a600c'],
-    }),
-    ('gomms', '1.0', {
-        'checksums': ['52828c6fe9b78d66bde5474e45ff153efdb153f2bd9f0e52a20a668e842f2dc5'],
-    }),
-    ('feather', '0.3.5', {
-        'checksums': ['50ff06d5e24d38b5d5d62f84582861bd353b82363e37623f95529b520504adbf'],
-    }),
-    ('dummies', '1.5.6', {
-        'checksums': ['7551bc2df0830b98c53582cac32145d5ce21f5a61d97e2bb69fd848e3323c805'],
-    }),
-    ('SimSeq', '1.4.0', {
-        'checksums': ['5ab9d4fe2cb1b7634432ff125a9e04d2f574fed06246a93859f8004e10790f19'],
-    }),
-    ('uniqueAtomMat', '0.1-3-2', {
-        'checksums': ['f7024e73274e1e76a870ce5e26bd58f76e8f6df0aa9775c631b861d83f4f53d7'],
-    }),
-    ('PoissonSeq', '1.1.2', {
-        'checksums': ['6f3dc30ad22e33e4fcfa37b3427c093d591c02f1b89a014d85e63203f6031dc2'],
-    }),
-    ('aod', '1.3.1', {
-        'checksums': ['052d8802500fcfdb3b37a8e3e6f3fbd5c3a54e48c3f68122402d2ea3a15403bc'],
-    }),
-    ('cghFLasso', '0.2-1', {
-        'checksums': ['6e697959b35a3ceb2baa1542ef81f0335006a5a9c937f0173c6483979cb4302c'],
-    }),
-    ('svd', '0.5', {
-        'checksums': ['d042d448671355d0664d37fd64dc90932eb780e6494c479d4431d1faae2071a1'],
-    }),
-    ('Rssa', '1.0.4', {
-        'checksums': ['4115b516f6782d52f02695bbbd52921a474aafc7232d49aca85010f1c33b08a7'],
-    }),
-    ('JBTools', '0.7.2.9', {
-        'checksums': ['b33cfa17339df7113176ad1832cbb0533acf5d25c36b95e888f561d586c5d62f'],
-    }),
-    ('RUnit', '0.4.32', {
-        'checksums': ['23a393059989000734898685d0d5509ece219879713eb09083f7707f167f81f1'],
-    }),
-    ('DistributionUtils', '0.6-0', {
-        'checksums': ['7443d6cd154760d55b6954142908eae30385672c4f3f838dd49876ec2f297823'],
-    }),
-    ('gapfill', '0.9.6-1', {
-        'checksums': ['22f04755873e34a9077bb1b1de8d16f5bc56cb8c395c4f797f9ad0b209b1b996'],
-    }),
-    ('gee', '4.13-20', {
-        'checksums': ['53014cee059bd87dc22f9679dfbf18fe6813b9ab41dfe90361921159edfbf798'],
-    }),
-    ('Matching', '4.9-11', {
-        'checksums': ['1c71ca8462b3168839bf446ee8e5b4baa6288a72f8c8590c9d7565c91fba7688'],
-    }),
-    ('MatchIt', '4.3.0', {
-        'checksums': ['ca897ab81a7c19ebd4cbc67011c6223668ad5a8876b10f665a86f5f79ed85446'],
-    }),
-    ('RItools', '0.1-17', {
-        'checksums': ['75654780e9ca39cb3c43acfaca74080ad74de50f92c5e36e95694aafdfdc0cea'],
-    }),
-    ('mitools', '2.4', {
-        'checksums': ['f204f3774e29d79810f579f128de892539518f2cbe6ed237e08c8e7283155d30'],
-    }),
-    ('survey', '4.1-1', {
-        'checksums': ['05e89a1678a39e32bfb41af8a31d643b04fc4d2660a96e701825e6bffcd75a52'],
-    }),
-    ('optmatch', '0.9-15', {
-        'checksums': ['7500fdbed939b7f16603a097d734a332793a3ac68e6a80c7957bef2a567691d8'],
-    }),
-    ('SPAtest', '3.1.2', {
-        'checksums': ['b3d74ed2b0a6475a9966dd50eb5d363d0b2985636271dfbf82f0472b8d22b9f4'],
-    }),
-    ('SKAT', '2.0.1', {
-        'checksums': ['c8637cf5786b926f6bbef3f4ef1d3af5130cc0cfd9094d4835839724b2d0e8c7'],
-    }),
-    ('GillespieSSA', '0.6.1', {
-        'checksums': ['272e9b6b26001d166fd7ce8d04f32831ba23c676075fbd1e922e27ba2c962052'],
-    }),
-    ('startupmsg', '0.9.6', {
-        'checksums': ['1d60ff13bb260630f797bde66a377a5d4cd65d78ae81a3936dc4374572ec786e'],
-    }),
-    ('distr', '2.8.0', {
-        'checksums': ['bb7df05d6b946bcdbbec2e3397c7c7e349b537cabfcbb13a34bcf6312a71ceb7'],
-    }),
-    ('distrEx', '2.8.0', {
-        'checksums': ['b064cde7d63ce93ec9969c8c4463c1e327758b6f8ea7765217d77f9ba9d590bf'],
-    }),
-    ('minerva', '1.5.10', {
-        'checksums': ['2f26353d8fcc989ac698c4e45bb683801b1a7bb60b14903d05a4d73c629c590f'],
-    }),
-    ('KODAMA', '1.8', {
-        'checksums': ['1ed9c14826c3c549c7323672cee04a71048c505c130e739ef5a95ed9bfe43444'],
-    }),
-    ('locfdr', '1.1-8', {
-        'checksums': ['42d6e12593ae6d541e6813a140b92591dabeb1df94432a515507fc2eee9a54b9'],
-    }),
-    ('ica', '1.0-2', {
-        'checksums': ['e721596fc6175d3270a60d5e0b5b98be103a8fd0dd93ef16680af21fe0b54179'],
-    }),
-    ('dtw', '1.22-3', {
-        'checksums': ['df7cf9adf613422ddb22a160597eb5f5475ab6c67c0d790092edb7f72ba98f00'],
-    }),
-    ('SDMTools', '1.1-221.2', {
-        'checksums': ['f0dd8c5f98d2f2c012536fa56d8f7a58aaf0c11cbe3527e66d4ee3194f6a6cf7'],
-    }),
-    ('ggridges', '0.5.3', {
-        'checksums': ['f5eafab17f2d4a8a2a83821ad3e96ae7c26b62bbce9de414484c657383c7b42e'],
-    }),
-    ('TFisher', '0.2.0', {
-        'checksums': ['bd9b7484d6fba0165841596275b446f85ba446d40e92f3b9cb37381a3827e76f'],
-    }),
-    ('lsei', '1.3-0', {
-        'checksums': ['6289058f652989ca8a5ad6fa324ce1762cc9e36c42559c00929b70f762066ab6'],
-    }),
-    ('npsurv', '0.5-0', {
-        'checksums': ['bc87db76e7017e178c2832a684fcd49c42e20054644b21b586413d26c8821dc6'],
-    }),
-    ('fitdistrplus', '1.1-6', {
-        'checksums': ['17c2990041a3bb7479f3c3a6d13d96c989db8eaddab17eff7e1fbe172a5b96be'],
-    }),
-    ('here', '1.0.1', {
-        'checksums': ['08ed908033420d3d665c87248b3a14d1b6e2b37844bf736be620578c20ca346b'],
-    }),
-    ('reticulate', '1.22', {
-        'checksums': ['b06e7b39abf08ae9604ea26d02e3c6e4ef6dcc4b6c7c98118fd85192f615f56c'],
-    }),
-    ('hdf5r', '1.3.4', {
-        'installopts': '--configure-args="--with-hdf5=$EBROOTHDF5/bin/h5cc"',
-        'preinstallopts': "unset LIBS && ",
-        'checksums': ['64d057601841b604e04e8514d33a1e5e515dcbfd9cc8369d40d717d7036fab53'],
-    }),
-    ('DTRreg', '1.7', {
-        'checksums': ['f0fad2244d960cec8fc33d9a1078df359ceb0aadff980ce6149aa9f01c62223b'],
-    }),
-    ('pulsar', '0.3.7', {
-        'checksums': ['78c9f7e3b2bf8a8d16a81d6ee43bb05b0c360219be473d920c8c8ccb2aba4e3d'],
-    }),
-    ('bayesm', '3.1-4', {
-        'checksums': ['061b216c62bc72eab8d646ad4075f2f78823f9913344a781fa53ea7cf4a48f94'],
-    }),
-    ('gsl', '2.1-7', {
-        'checksums': ['1a86af59d9864ecf2a85d5371076786e7a0491d6d6b4d5c1a7590ea8919f3b17'],
-    }),
-    ('energy', '1.7-8', {
-        'checksums': ['de08e8de037bb30068bbf0c1880b153a586d342304681f4ba103ab808c7f4789'],
-    }),
-    ('compositions', '2.0-2', {
-        'checksums': ['b5e47a14a1bb010b47b4ad7fbfabfead1a08b009b92e1f7d4bd3bd7f8589f216'],
-    }),
-    ('clustree', '0.4.3', {
-        'checksums': ['5ff3afc3fb3e1d20d033328935084de574250d29545c0a5b69180fe4846fbe53'],
-    }),
-    ('plotly', '4.10.0', {
-        'checksums': ['bd995c654dbc8c09a84adaba8def99766919e3894caf18b551bb26b2f591389a'],
-    }),
-    ('tweedie', '2.3.3', {
-        'checksums': ['a032cad512dac37a8619e6f66cb513eb82a88a5a2ffbe91e92c2d44d1756d0d9'],
-    }),
-    ('RcppGSL', '0.3.10', {
-        'checksums': ['8612087da02fb791f427fed310c23d0482a8eb60fb089119f018878143f95451'],
-    }),
-    ('mvabund', '4.1.12', {
-        'checksums': ['c1af39dbfd048c9bb367765ee266be49622e1a5d964186920a2d47bec4e6f780'],
-    }),
-    ('fishMod', '0.29', {
-        'checksums': ['5989e49ca6d6b2c5d514655e61f75b019528a8c975f0d6056143f17dc4277a5d'],
-    }),
-    ('gllvm', '1.3.1', {
-        'checksums': ['cd3f72b84f0c722e9c0b21c2b2de7683ec742345d7f8e62f67c8c93342c1a5c6'],
-    }),
-    ('grpreg', '3.4.0', {
-        'checksums': ['fd57d20baf63d2cc5821998bca5c3fdcbe46c933c9553caa492911b12654d6ad'],
-    }),
-    ('trust', '0.1-8', {
-        'checksums': ['952e348b62aec35988b103fd152329662cb6a451538f184549252fbf49d7dcac'],
-    }),
-    ('lpSolveAPI', '5.5.2.0-17.7', {
-        'checksums': ['9ebc8e45ad73eb51e0b25049598a5bc758370cf89508e2328cf4bd93d68d55bb'],
-    }),
-    ('ergm', version, {
-        'checksums': ['1abc6ef53376a4132530c376ce477ae7a2590e95fe8feb011c0da9cfb4d49ba0'],
-    }),
-    ('networkDynamic', '0.11.0', {
-        'checksums': ['aa21caaddce75c22e08b94adfb6036f5ee151ffb79d174ad250fe4592d27dad2'],
-    }),
-    ('tergm', '4.0.2', {
-        'checksums': ['5ab1d61166c90f90c77edd12544b5946e01a933cc3e7ca609cae72075b742a64'],
-    }),
-    ('ergm.count', '4.0.2', {
-        'checksums': ['316ed3cbe4b472eec79e8a5fd4183ce953070f6d98056d87423bd6d9ac155bd1'],
-    }),
-    ('tsna', '0.3.4', {
-        'checksums': ['08fd9612388b86077cd877a48f81068d63f20291836eedbc727c9e00c1a2b4d2'],
-    }),
-    ('statnet', '2019.6', {
-        'checksums': ['0903e1a81ed1b6289359cefd12da1424c92456d19e062c3f74197b69e536b29d'],
-    }),
-    ('aggregation', '1.0.1', {
-        'checksums': ['86f88a02479ddc8506bafb154117ebc3b1a4a44fa308e0193c8c315109302f49'],
-    }),
-    ('ComICS', '1.0.4', {
-        'checksums': ['0af7901215876f95f309d7da6e633c38e4d7faf04112dd6fd343bc15fc593a2f'],
-    }),
-    ('dtangle', '2.0.9', {
-        'checksums': ['c375068c1877c2e8cdc5601cfd5a9c821645c3dff90ddef64817f788f372e179'],
-    }),
-    ('mcmc', '0.9-7', {
-        'checksums': ['b7c4d3d5f9364c67a4a3cd49296a61c315ad9bd49324a22deccbacb314aa8260'],
-    }),
-    ('MCMCpack', '1.6-0', {
-        'checksums': ['b5b9493457d11d4dca12f7732bd1b3eb1443852977c8ee78393126f13deaf29b'],
-    }),
-    ('shinythemes', '1.2.0', {
-        'checksums': ['37d68569ce838c7da9f0ea7e2b162ecf38fba2ae448a4888b6dd29c4bb5b2963'],
-    }),
-    ('csSAM', '1.2.4', {
-        'checksums': ['3d6442ad8c41fa84633cbbc275cd67e88490a160927a5c55d29da55a36e148d7'],
-    }),
-    ('bridgedist', '0.1.0', {
-        'checksums': ['dc7c1c8874d6cfa34d550d9af194389e13471dfbc55049a1ab66db112fbf1343'],
-    }),
-    ('asnipe', '1.1.16', {
-        'checksums': ['be50f9fdef0f4bf9676b9c3c2906d0431afc678af55cf48b1119f9fc0adac44f'],
-    }),
-    ('liquidSVM', '1.2.4', {
-        'patches': ['liquidSVM-1.2.4-fix_ppc_and_aarch64_build.patch'],
-        'preinstallopts': 'LIQUIDSVM_TARGET="empty"',
-        'checksums': [
-            '15a9c7f2930e2ed3f4c5bcd9b042884ea580d2b2e52e1c68041600c196046aba',  # liquidSVM_1.2.4.tar.gz
-            # liquidSVM-1.2.4-fix_ppc_and_aarch64_build.patch
-            '46b09e441c3b59af535f20d8db0dee7f1d6a7ddd511175d252115b53cb8b86f8',
-        ],
-    }),
-    ('oddsratio', '2.0.1', {
-        'checksums': ['2097e7a8bf623379d55652de5dce4946d05163e85d30df50dc19055962bf60b5'],
-    }),
-    ('mltools', '0.3.5', {
-        'checksums': ['7093ffceccdf5d4c3f045d8c8143deaa8ab79935cc6d5463973ffc7d3812bb10'],
-    }),
-    ('h2o', '3.34.0.3', {
-        'checksums': ['2a707b9f7271eae611c9e81b13d2024b8829f6b06b3c41c5b97de1aef591931e'],
-    }),
-    ('mlegp', '3.1.8', {
-        'checksums': ['eac1df085a608451828575028ca05b78dc6b5035da14cabc141bfee5ef986de9'],
-    }),
-    ('itertools', '0.1-3', {
-        'checksums': ['b69b0781318e175532ad2d4f2840553bade9637e04de215b581704b5635c45d3'],
-    }),
-    ('missForest', '1.4', {
-        'checksums': ['f785804b03bdf424e1c76095989a803afb3b47d6bebca9a6832074b6326c0278'],
-    }),
-    ('bartMachineJARs', '1.1', {
-        'checksums': ['f2c31cb94d7485174a2519771127a102e35b9fe7f665e27beda3e76a56feeef2'],
-    }),
-    ('bartMachine', '1.2.6', {
-        'checksums': ['5e1ac0033da5b41a96d95782886a167e51ff8e43822800e8d40874ff9c13847f'],
-    }),
-    ('lqa', '1.0-3', {
-        'checksums': ['3889675dc4c8cbafeefe118f4f20c3bd3789d4875bb725933571f9991a133990'],
-    }),
-    ('PresenceAbsence', '1.1.9', {
-        'checksums': ['1a30b0a4317ea227d674ac873ab94f87f8326490304e5b08ad58953cdf23169f'],
-    }),
-    ('GUTS', '1.1.1', {
-        'checksums': ['094b8f51719cc36ddc56e3412dbb146eafc93c5e8fbb2c5999c2e80ea7a7d216'],
-    }),
-    ('GenSA', '1.1.7', {
-        'checksums': ['9d99d3d0a4b7770c3c3a6de44206811272d78ab94481713a8c369f7d6ae7b80f'],
-    }),
-    ('parsedate', '1.2.1', {
-        'checksums': ['6b078da4a47904194bfe29e2c3b6fbbf6e3ad190e33979f840a3ea366c708616'],
-    }),
-    ('circular', '0.4-93', {
-        'checksums': ['76cee2393757390ad91d3db3e5aeb2c2d34c0a46822b7941498571a473417142'],
-    }),
-    ('cobs', '1.3-4', {
-        'checksums': ['a1c7b77e4ca097349884fd1c0d863d74f9092766131094d603f34d33ab2e3c42'],
-    }),
-    ('resample', '0.4', {
-        'checksums': ['f0d5f735e1b812612720845d79167a19f713a438fd10a6a3206e667045fd93e5'],
-    }),
-    ('MIIVsem', '0.5.8', {
-        'checksums': ['a908f51e1598290d25864c358d57201bd50c1c40775d4d0405cbc8077bee61e1'],
-    }),
-    ('medflex', '0.6-7', {
-        'checksums': ['d28107a4bbbb0ace1d571f0aa6884ee4c50d7731c04bceba207fd55a39b83b9c'],
-    }),
-    ('Rserve', '1.7-3.1', {
-        'checksums': ['3ba1e919706e16a8632def5f45d666b6e44eafa6c14b57064d6ddf3415038f99'],
-    }),
-    ('spls', '2.2-3', {
-        'checksums': ['bbd693da80487eef2939c37aba199f6d811ec289828c763d9416a05fa202ab2e'],
-    }),
-    ('Boruta', '7.0.0', {
-        'checksums': ['6ff520d27d68637058c33a34c547a656bb44d5e351b7cc7afed6cd4216275c78'],
-    }),
-    ('dr', '3.0.10', {
-        'checksums': ['ce523c1bdb62a9dda30afc12b1dd96975cc34695c61913012236f3b80e24bf36'],
-    }),
-    ('CovSel', '1.2.1', {
-        'checksums': ['b375d00cc567e125ff106b4357654f43bba3abcadeed2238b6dea4b7a68fda09'],
-    }),
-    ('tmle', '1.5.0.2', {
-        'checksums': ['4772c352e8d3d9b5a0b7480c0e0962de4f5060fb7bf3fcb8ee4fa1cb10f93fd4'],
-    }),
-    ('ctmle', '0.1.2', {
-        'checksums': ['e3fa0722cd87aa0e0b209c2dddf3fc44c6d09993f1e66a6c43285fe950948161'],
-    }),
-    ('BayesPen', '1.0', {
-        'checksums': ['772df9ae12cd8a3da1d5b7d1f1629602c7693f0eb03945784df2809e2bb061b0'],
-    }),
-    ('inline', '0.3.19', {
-        'checksums': ['0ee9309bb7dab0b97761ddd18381aa12bd7d54678ccd7bec00784e831f4c99d5'],
-    }),
-    ('BMA', '3.18.15', {
-        'checksums': ['4be0d52f433503631e9574944067f613bafba129ebe27396bcfccb3b95992b1a'],
-    }),
-    ('BCEE', '1.3.0', {
-        'checksums': ['82afc9b8c6d617f5f728341960ae32922194f637c550916b3bea12c231414fa7'],
-    }),
-    ('bacr', '1.0.1', {
-        'checksums': ['c847272e2c03fd08ed79b3b739f57fe881af77404b6fd087caa0c398c90ef993'],
-    }),
-    ('clue', '0.3-60', {
-        'checksums': ['6d21ddfd0d621ed3bac861890c600884b6ed5ff7d2a36c9778b892636dbbef2a'],
-    }),
-    ('bdsmatrix', '1.3-4', {
-        'checksums': ['251e21f433a016ec85e478811ea3ad34c572eb26137447f48d1bbf3cc8bb06ea'],
-    }),
-    ('fftwtools', '0.9-11', {
-        'checksums': ['f1f0c9a9086c7b2f72c5fb0334717cc917213a004eaef8448eab4940c9852c7f'],
-    }),
-    ('imagerExtra', '1.3.2', {
-        'checksums': ['0ebfa1eabb89459d774630ab73c7a97a93b9481ea5afc55482975475acebd5b8'],
-    }),
-    ('MALDIquant', '1.20', {
-        'checksums': ['fff39d5df295b937cdad57b73d4e06e925f69e68784ef58b5dfcd3cf500931c1'],
-    }),
-    ('threejs', '0.3.3', {
-        'checksums': ['76c759c8b20fb34f4f7a01cbd1b961296e1f19f4df6dded69aae7f1bca80219c'],
-    }),
-    ('LaplacesDemon', '16.1.6', {
-        'checksums': ['57b53882fd7a195b38bbdbbf0b17745405eb3159b1b42f7f11ce80c78ab94eb7'],
-    }),
-    ('rda', '1.0.2-2.1', {
-        'checksums': ['eea3a51a2e132a023146bfbc0c384f5373eb3ea2b61743d7658be86a5b04949e'],
-    }),
-    ('sampling', '2.9', {
-        'checksums': ['7f5ba5978f6cdbbbdb6f51958197b28b6fc63e7eeee59e6845ea09fb37d1b187'],
-    }),
-    ('lda', '1.4.2', {
-        'checksums': ['5606a1e1bc24706988853528023f7a004c725791ae1a7309f1aea2fc6681240f'],
-    }),
-    ('jiebaRD', '0.1', {
-        'checksums': ['045ee670f5378fe325a45b40fd55136b355cbb225e088cb229f512c51abb4df1'],
-    }),
-    ('jiebaR', '0.11', {
-        'checksums': ['adde8b0b21c01ec344735d49cd33929511086719c99f8e10dce4ca9479276623'],
-    }),
-    ('hdm', '0.3.1', {
-        'checksums': ['ba087565e9e0a8ea30a6095919141895fd76b7f3c05a03e60e9e24e602732bce'],
-    }),
-    ('abe', '3.0.1', {
-        'checksums': ['66d2e9ac78ba64b7d27b22b647fc00378ea832f868e51c18df50d6fffb8029b8'],
-    }),
-    ('SignifReg', '4.2', {
-        'checksums': ['53d2ff3ddbb398655b245ad3a19c028d6fb6bb1d59adeb30bb3497606733fc2d'],
-    }),
-    ('bbmle', '1.0.24', {
-        'checksums': ['01edc00479fabf7491e47ff59bc4adbe6f0d4c23d22e76d1d49c4c1b6b4693ad'],
-    }),
-    ('emdbook', '1.3.12', {
-        'checksums': ['0646caf9e15aaa61ff917a4b5fdf82c06ac17ef221a61dec3fbb554e7bff4353'],
-    }),
-    ('SOAR', '0.99-11', {
-        'checksums': ['d5a0fba3664087308ce5295a1d57d10bad149eb9771b4fe67478deae4b7f68d8'],
-    }),
-    ('rasterVis', '0.51.0', {
-        'checksums': ['5225334add4dd3502044cf80a00543b766568c2d93c47af180f66a76942d76be'],
-    }),
-    ('tictoc', '1.0.1', {
-        'checksums': ['a09a1535c417ddf6637bbbda5fca6edab6c7f7b252a64e57e99d4d0748712705'],
-    }),
-    ('ISOcodes', '2021.02.24', {
-        'checksums': ['152769bcb4ae99d06a767384541c2000c94990a2c6983780837f85e885b539a6'],
-    }),
-    ('stopwords', '2.3', {
-        'checksums': ['c5ec1c6ab1bad1786d87d7823d4b63abc94d2fd84ed7d8e985906e96fb6321b2'],
-    }),
-    ('janeaustenr', '0.1.5', {
-        'checksums': ['992f6673653daf7010fe176993a01cd4127d9a88be428da8da7a28241826d6f3'],
-    }),
-    ('SnowballC', '0.7.0', {
-        'checksums': ['b10fee9d322f567a22c580b49b5d4ba1c86eae40a71794ca92552c726b3895f3'],
-    }),
-    ('tokenizers', '0.2.1', {
-        'checksums': ['28617cdc5ddef5276abfe14a2642999833322b6c34697de1d4e9d6dc7670dd00'],
-    }),
-    ('hunspell', '3.0.1', {
-        'checksums': ['1fedbb913bc13c790d2fabfe4edda0a987db3a078bea8c0ca9b777d20af08662'],
-    }),
-    ('topicmodels', '0.2-12', {
-        'checksums': ['afd83a4381bf39e470446ebefd41ed03f314be400c1b2f702a4b1060eb8fd1b4'],
-    }),
-    ('tidytext', '0.3.2', {
-        'checksums': ['6fe0ada78ee2cdf77c16e519a29b9baff61d8e23ab56aa0a9adc1b2a99a6472b'],
-    }),
-    ('splitstackshape', '1.4.8', {
-        'checksums': ['656032c3f1e3dd5b8a3ee19ffcae617e07104c0e342fc3da4d863637a770fe56'],
-    }),
-    ('grImport2', '0.2-0', {
-        'checksums': ['a102a2d877e42cd4e4e346e5510a77b2f3e57b43ae3c6d5c272fdceb506b00a7'],
-    }),
-    ('preseqR', '4.0.0', {
-        'checksums': ['0143db473fb9a811f9cf582a348226a5763e62d9857ce3ef4ec41412abb559bc'],
-    }),
-    ('idr', '1.2', {
-        'checksums': ['8bbfdf82c8c2b5c73eb079127e198b6cb65c437bb36729f502c7bcd6037fdb16'],
-    }),
-    ('entropy', '1.3.1', {
-        'checksums': ['6f5a89f5ce0e90cbed1695b81259326c976e7a8f538157e223ee5f63b54412b8'],
-    }),
-    ('kedd', '1.0.3', {
-        'checksums': ['38760abd8c8e8f69ad85ca7992803060acc44ce68358de1763bd2415fdf83c9f'],
-    }),
-    ('HiddenMarkov', '1.8-13', {
-        'checksums': ['7186d23e561818f3e1f01376a4fb2af9ccee775ce5afc1e3175f3b07a81db515'],
-    }),
-    ('lmerTest', '3.1-3', {
-        'checksums': ['35aa75e9f5f2871398ff56a482b013e6828135ef04916ced7d1d7e35257ea8fd'],
-    }),
-    ('loo', '2.4.1', {
-        'checksums': ['bc21fb6b4a93a7e95ee1be57e4e787d731895fb8b4743c26b30b43adee475b50'],
-    }),
-    ('RcppParallel', '5.1.4', {
-        'checksums': ['76b545a6878c55edba780183fd89a76fe723b7f19709c5243495dcf3d54eea82'],
-    }),
-    ('StanHeaders', '2.21.0-7', {
-        'checksums': ['27546e064f0e907e031d9185ad55245d118d82fbe3074ecb1d76fae8b9f2336b'],
-    }),
-    ('V8', '3.4.2', {
-        'installopts': '--configure-vars="INCLUDE_DIR=$CPATH LIB_DIR=$LIBRARY_PATH"',
-        'preinstallopts': "export CPATH=$EBROOTNODEJS/include/node:$CPATH && ",
-        'checksums': ['210643473ca8bf423fae34ce72ceb37a3e44c3315ec4abae59a77f077542d2ed'],
-    }),
-    ('rstan', '2.21.2', {
-        'checksums': ['e30e04d38a612e2cb3ac69b53eaa19f7ede8b3548bf82f7892a2e9991d46054a'],
-    }),
-    ('Rborist', '0.2-3', {
-        'checksums': ['f3b3f953ca99e0d17425ac6ba9a7b1e9d6098343abace575cdb492bca2a9c461'],
-    }),
-    ('VSURF', '1.1.0', {
-        'checksums': ['eee99e0c441795c2ccb21cc6e0a37b24f580241e494c83e811b726b43469eeab'],
-    }),
-    ('mRMRe', '2.1.2', {
-        'checksums': ['a59a3cb3cca89f51d9ee6702cd479fd7db8bc2e25b72f45cb6712da983777ca0'],
-    }),
-    ('dHSIC', '2.1', {
-        'checksums': ['94c86473790cf69f11c68ed8ba9d6ae98218c7c69b7a9a093f235d175cf83db0'],
-    }),
-    ('ggsci', '2.9', {
-        'checksums': ['4af14e6f3657134c115d5ac5e65a2ed74596f9a8437c03255447cd959fe9e33c'],
-    }),
-    ('ggsignif', '0.6.3', {
-        'checksums': ['ca8545b25590e531512a90a18449a2cbab945f7434a1d60188c41f7d1839a7a9'],
-    }),
-    ('corrplot', '0.90', {
-        'checksums': ['d9871f219351f443f879ae93c45e3a364eb32cc6f41491a801e7b8a91e96d5dd'],
-    }),
-    ('rstatix', '0.7.0', {
-        'checksums': ['a5ae17dc32cc26fc5dcab9ff0a9747ce3786c9fe091699247ad8b9f823f2600c'],
-    }),
-    ('ggfan', '0.1.3', {
-        'checksums': ['5c888b203ecf5e3dc7a317a790ca059c733002fbca4b4bc1a4f62b7ded5f70dc'],
-    }),
-    ('ggpubr', '0.4.0', {
-        'checksums': ['abb21ec0b1ae3fa1c58eedca2d59b9b009621b30e3660f1247b3880c5fa50675'],
-    }),
-    ('yaImpute', '1.0-32', {
-        'checksums': ['08eee5d851b80aad9c7c80f9531aadd50d60e4b16b3a80657a50212269cd73ff'],
-    }),
-    ('intrinsicDimension', '1.2.0', {
-        'checksums': ['6cc9180a83aa0d123f1e420136bb959c0d5877867fa170b79536f5ee22106a32'],
-    }),
-    ('patchwork', '1.1.1', {
-        'checksums': ['cf0d7d9f92945729b499d6e343441c55007d5b371206d5389b9e5154dc7cf481'],
-    }),
-    ('leiden', '0.3.9', {
-        'checksums': ['81754276e026a9a8436476365bbadf0f15a403a525a349cb56418da5d8edea0d'],
-    }),
-    ('sctransform', '0.3.2', {
-        'checksums': ['5dbb0a045e514c19f51bbe11c2dba0b72dca1942d6eb044c36b0538b443475dc'],
-    }),
-    ('packrat', '0.7.0', {
-        'checksums': ['e8bce1fd78f28f3a7bf56e65a2ae2c6802e69bf55466c24e1d1a4b8a5f83dcc2'],
-    }),
-    ('colourpicker', '1.1.1', {
-        'checksums': ['a0d09982b048b143e2c3438ccec039dd20d6f892fa0dedc9fdcb0d40de883ce0'],
-    }),
-    ('ggExtra', '0.9', {
-        'checksums': ['f22db92d6e3e610901998348acbcaa6652fa6c62a285a622d3b962ba9e89aba2'],
-    }),
-    ('findpython', '1.0.7', {
-        'checksums': ['59f904b9c2ec84b589380de59d13afbf14d1ec3b670e3a07e820298aaf04c149'],
-    }),
-    ('argparse', '2.1.2', {
-        'checksums': ['9997359a735359580ab6b054672388a55701fca71c80b54bab1aedc13bc5e5b3'],
-    }),
-    ('intergraph', '2.0-2', {
-        'checksums': ['6cbe77f1e87fa1c110db2d46010f2f3ae72bfdb708ce2ca84c1cdc2cd6eb47a1'],
-    }),
-    ('ggnetwork', '0.5.10', {
-        'checksums': ['1b655dbab8eed8d0aa3ab2148aac8e0e5bfa190468f5e3c06b001ce88b7f0d3f'],
-    }),
-    ('qqman', '0.1.8', {
-        'checksums': ['58da8317df8d726d1fde4805919da5d64f880894a423ee20937cafb479b9d8a8'],
-    }),
-    ('rstantools', '2.1.1', {
-        'checksums': ['c95b15de8ec577eeb24bb5206e7b685d882f88b5e6902efda924b7217f463d2d'],
-    }),
-    ('bayesplot', '1.8.1', {
-        'checksums': ['d8d74201ea91fa5438714686ca22a947ec9375b6c12b0cfef010c57104b1aa2a'],
-    }),
-    ('dygraphs', '1.1.1.6', {
-        'checksums': ['c3d331f30012e721a048e04639f60ea738cd7e54e4f930ac9849b95f0f005208'],
-    }),
-    ('rsconnect', '0.8.24', {
-        'checksums': ['cf6bef1e073d6fa95c8be8a00e9e4982b88f4bab0e8ecd77db816a585be2e4a6'],
-    }),
-    ('shinystan', '2.5.0', {
-        'checksums': ['45f9c552a31035c5de8658bb9e5d72da7ec1f88fbddb520d15fe701c677154a1'],
-    }),
-    ('optimx', '2021-10.12', {
-        'checksums': ['39384c856b5efa3992cd230548b60eff936d428111ad6ad5b8fb98a3bcbb7943'],
-    }),
-    ('gamm4', '0.2-6', {
-        'checksums': ['57c5b66582b2adc32f6a3bb6a259f5b95198e283a96d966a6007e8e48b380c89'],
-    }),
-    ('projpred', '2.0.2', {
-        'checksums': ['af0a9fb53f706090fe81b6381b27b0b6bd3f7ae1e1e44b0ada6f40972b09a55b'],
-    }),
-    ('distributional', '0.2.2', {
-        'checksums': ['028e5a91aabe3a676eb7b7f3dc907f7f34735a123fe0d9adcabc03476504435f'],
-    }),
-    ('posterior', '1.1.0', {
-        'checksums': ['eff6262dbcc1bf18337f535b0c75ba2fe360322e8b170c466e24ed3ee76cf4d2'],
-    }),
-    ('brms', '2.16.1', {
-        'checksums': ['749efbd9fb061fe207cf2e729c1387d9a8538b922f12ceec4e82a9f8dd9c1bc4'],
-    }),
-    ('drgee', '1.1.10', {
-        'checksums': ['e684f07f7dfec922380d4202922c11094f859721f77b31ff38b0d35d0f42c743'],
-    }),
-    ('stdReg', '3.4.1', {
-        'checksums': ['285335dbe29b6898641e1151ab2f06acf76c6f4d6fbeadd66d151c25d7e38a74'],
-    }),
-    ('mcmcse', '1.5-0', {
-        'checksums': ['4a820dc22c48efd32b7f9d1e1b897b4b3f165cd64b2ff85ba7029621cf9e7463'],
-    }),
-    ('copCAR', '2.0-4', {
-        'checksums': ['8b4ed53c58a665f70e48bdca689a992a81d5ecb5a6051ca7361d3870e13c77f3'],
-    }),
-    ('batchmeans', '1.0-4', {
-        'checksums': ['8694573009d9070a76007281407d3314da78902e122a9d8aec1f819d3bbe562c'],
-    }),
-    ('ngspatial', '1.2-2', {
-        'checksums': ['3fa79e45d3a502a58c1454593ec83dfc73144e92b34c14f617a6126557dd0d26'],
-    }),
-    # ('BIGL', '1.6.5', {
-    #    'checksums': ['5be825734d76760723e2d5b8fbe03524a2b59d9163b33841d4a2c9ab2d4257cf'],
-    # }),
-    # ('drugCombo', '1.2.1', {
-    #    'checksums': ['9a605c655c159604033558d757711e6d83d33dfc286c1280f722d4cb7d130f80'],
-    # }),
-    ('betareg', '3.1-4', {
-        'checksums': ['5106986096a68b2b516215968158589b71969ce7912879253d6e930355a18101'],
-    }),
-    ('unmarked', '1.1.1', {
-        'checksums': ['48474f396c4a91e257490025ede6a998883683e8020a898fff5d4e23a3764bfd'],
-    }),
-    ('maxlike', '0.1-8', {
-        'checksums': ['90aaab9602f259cbfae61fe96e105cc4a0c2a385b42380f85c14f5d544107251'],
-    }),
-    ('coxme', '2.2-16', {
-        'checksums': ['a0ce4b5649c4c1abbfe2c2bf23089744d1f66eb8368dea16e74e090f366a5111'],
-    }),
-    ('AICcmodavg', '2.3-1', {
-        'checksums': ['d0517da15a38e9b1df20fa73f5342b586624e65792d266e7dff278ad7fc458b0'],
-    }),
-    ('pacman', '0.5.1', {
-        'checksums': ['9ec9a72a15eda5b8f727adc877a07c4b36f8372fe7ed80a1bc6c2068dab3ef7c'],
-    }),
-    ('spaa', '0.2.2', {
-        'checksums': ['a5a54454d4a7af473ce797875f849bd893005cb04325bf3e0dbddb19fe8d7198'],
-    }),
-    ('maxnet', '0.1.4', {
-        'checksums': ['fd21e5ecf3c1ac00ef1bbe79fab4cdd62789e0c4c45f126f1b64bda667238216'],
-    }),
-    ('oai', '0.3.2', {
-        'checksums': ['ebfa756e08f6ac0aa61556b1a5bbe611f407bfff8aef1f8d075a24c361678bfd'],
-    }),
-    ('wellknown', '0.7.4', {
-        'checksums': ['483e6fc43edf09ed583e74ce5ca7e2d7838ef8a32291e06d774c37546eed1a34'],
-    }),
-    ('rgbif', '3.6.0', {
-        'checksums': ['2941857c85d89ebaf614ed130ec2f68e326a8ca99e00263ac4e2a9c556917f20'],
-    }),
-    ('rgdal', '1.5-27', {
-        'checksums': ['62a555ed7b5424dd0252b3764e3542fb30c524d06e8245215bcfaedd84ee5756'],
-    }),
-    ('rgeos', '0.5-8', {
-        'checksums': ['0db35392146cefb5eea0392eecb6b0bfee53708222b98b06de54a3e1a04ea314'],
-    }),
-    ('mapproj', '1.2.7', {
-        'checksums': ['f0081281b08bf3cc7052c4f1360d6d3c20d9063be57754448ad9b48ab0d34c5b'],
-    }),
-    ('rbison', '1.0.0', {
-        'checksums': ['9957e5f85ce68f5dd0ddc3c4b2b3c9d2f52d6f37587e1022ab8a44863534a83c'],
-    }),
-    ('rebird', '1.3.0', {
-        'checksums': ['b238d3f246aa0249145894e1f3a90f46902f6615fc2f23b24c99bb5feecc55d3'],
-    }),
-    ('rvertnet', '0.8.2', {
-        'checksums': ['2de9a3ec33a213c7592b49cca1d510a25aef0625369376d9b1b4e5d0da519226'],
-    }),
-    ('ridigbio', '0.3.5', {
-        'checksums': ['e5cfb2e4dd8ddd1452a5afcf24fcc260889179d0f52eff4f41835adf99b64614'],
-    }),
-    ('spocc', '1.2.0', {
-        'checksums': ['4bac45db5e69bfa3bf6cebd1b0c9241214c95561f275cee6d31e00911aa79d84'],
-    }),
-    ('spThin', '0.2.0', {
-        'checksums': ['2e997afb79a2a990eded34c71afaac83986669cfa9ac51b15ae3f2b558902048'],
-    }),
-    ('rangeModelMetadata', '0.1.4', {
-        'checksums': ['529d529ca90437db3d1e45118443e27a920422806383c7edaa2102beb43f5f80'],
-    }),
-    ('ENMeval', '2.0.1', {
-        'checksums': ['2f7b7760ae70a45cd3c766aacf1e39f498de4f2e8c7b6dcde6b9adf6d8100250'],
-    }),
-    ('plotmo', '3.6.1', {
-        'checksums': ['245a0c87f0cca08746c6fdc60da2e3856cd69b1a2b7b5641293c620d4ae04343'],
-    }),
-    ('earth', '5.3.1', {
-        'checksums': ['0bbe06ba974ceb8ec5de1d59cb53f9487d1828d7130fe2503c48b6cb449c4b03'],
-    }),
-    ('mda', '0.5-2', {
-        'checksums': ['344f2053215ddf535d1554b4539e9b09067dac878887cc3eb995cef421fc00c3'],
-    }),
-    ('biomod2', '3.5.1', {
-        'checksums': ['30ed33ff980558a59782ec9e35f9c2c710a540718010654363f63878cdc0ac18'],
-    }),
-    ('poLCA', '1.4.1', {
-        'checksums': ['2e69975b5e7da8c36641bfa9453afdb4861523866b8799bec1d4eace9ab5762e'],
-    }),
-    ('PermAlgo', '1.1', {
-        'checksums': ['d7157b92241c34b71ad19901b52144973b49df453bf2a5edf4497d4bf26bd099'],
-    }),
-    ('coxed', '0.3.3', {
-        'checksums': ['d0d6cb8fea9516b3c63b34d0d81f3804c18a07f97a83e51555575c8ed4c75626'],
-    }),
-    ('testit', '0.13', {
-        'checksums': ['90d47168ab6bdbd1274b600b457626ac07697ce09792c92b2043be5f5b678d80'],
-    }),
-    ('NISTunits', '1.0.1', {
-        'checksums': ['eaccd68db5c73d6a089ce5b323cdd51bc6a6a58ce467987158ba8c9be6a0a94e'],
-    }),
-    ('celestial', '1.4.6', {
-        'checksums': ['9f647f41465ac65b254717698f1978871c378ad8e6ccaa693abf579437069abe'],
-    }),
-    ('fasterize', '1.0.3', {
-        'checksums': ['62b459625e9bdb00251ec5f6cb873e0c59713f3e86dc1e2c8332adc0cea17f81'],
-    }),
-    ('RPMM', '1.25', {
-        'checksums': ['f04a524b13918062616beda50c4e759ce2719ce14150a0e677d07132086c88c8'],
-    }),
-    ('RefFreeEWAS', '2.2', {
-        'checksums': ['de2812f166caabf6ea01c0533402e5cd9d8a525a2a7583e4757decf22319caab'],
-    }),
-    ('wordcloud', '2.6', {
-        'checksums': ['53716954430acd4f164bfd8eacd7068a908ee3358293ded6cd992d53b7f72649'],
-    }),
-    ('JADE', '2.0-3', {
-        'checksums': ['56d68a993fa16fc6dec758c843960eee840814c4ca2271e97681a9d2b9e242ba'],
-    }),
-    ('awsMethods', '1.1-1', {
-        'checksums': ['50934dc20cf4e015f1304a89de6703fed27e7bd54c6b9fc9fb253cdf2ecb7541'],
-    }),
-    ('aws', '2.5-1', {
-        'checksums': ['e8abadc5614f132edc3fb9cb1c82ce4dacc1315b727fbd49db7399aee24115ba'],
-    }),
-    ('ruv', '0.9.7.1', {
-        'checksums': ['a0c54e56ba3d8f6ae178ae4d0e417a79295abf5dcb68bbae26c4b874734d98d8'],
-    }),
-    ('mhsmm', '0.4.16', {
-        'checksums': ['fab573abdc0dd44e8c8bc7242a1428df20b3ec64c4c194e5f1f907393f902d01'],
-    }),
-    ('dbarts', '0.9-20', {
-        'checksums': ['1d75e795812819b7637d38fc909f4d7942bddf359acfb40a7b8e7cd167a5e92a'],
-    }),
-    ('proftools', '0.99-3', {
-        'checksums': ['e034eb1531af54013143da3e15229e1d4c2260f8eb79c93846014db3bdefb724'],
-    }),
-    ('NCmisc', '1.1.6', {
-        'checksums': ['2aa85997d5ec2222e610604022684c004a4925241761d9a0104919f1cf3a8c79'],
-    }),
-    ('reader', '1.0.6', {
-        'checksums': ['905c7c5a1b035ac8213fc533fa26e511abfeea40bd22e3edfde42a49074e88f4'],
-    }),
-    ('gnumeric', '0.7-8', {
-        'checksums': ['28b10c91d693b938ebca610933889095ca160b22e6ca750c46103dfd2b009447'],
-    }),
-    ('tcltk2', '1.2-11', {
-        'checksums': ['ad183ae3b7190501504a0589e0b3be480f04267303e3384fef00987446a37dc5'],
-    }),
-    ('readODS', '1.7.0', {
-        'checksums': ['f6a8ec724df68983c9b176a1b3b3b01239cc4e99aac4bfb42ce1c2b3d40922c2'],
-    }),
-    ('nortest', '1.0-4', {
-        'checksums': ['a3850a048181d5d059c1e74903437569873b430c915b709808237d71fee5209f'],
-    }),
-    ('EnvStats', '2.4.0', {
-        'checksums': ['49459e76412037b3d8021bd83ee93d140bc3e715a2a2282a347ef60061900514'],
-    }),
-    ('outliers', '0.14', {
-        'checksums': ['b6ce8f1db6442481546131def8253cabdf4472116d193daea7cb935d2b76986d'],
-    }),
-    ('elementR', '1.3.7', {
-        'checksums': ['4275f88f372a2efe96ccd0afc20f4f12be92f28c7db35c68b80bb0ffb2c2ab07'],
-    }),
-    ('gWidgets2', '1.0-8', {
-        'checksums': ['1615ce9ab07a251d06c68780be15ab5a4814df877a23aa93e0faf14ccd56d45c'],
-    }),
-    ('gWidgets2tcltk', '1.0-6', {
-        'modulename': False,
-        'preinstallopts': "xvfb-run ",
-        'checksums': ['aa3a2f4612116a652e5573a369e3d89c5939f7c06067c6826ba40ed3bb07302b'],
-    }),
-    ('mgsub', '1.7.3', {
-        'checksums': ['c9ae2560fe2690bedc5248af3fc89e7ef2bc6c147d46ced28f9824584c3791d5'],
-    }),
-    ('ie2misc', '0.8.6', {
-        'checksums': ['f3e2cc8a88f3789a5e339d2676455472a52a303c8273191f27aa2f2f02fdd8cd'],
-    }),
-    ('assertive.base', '0.0-9', {
-        'checksums': ['4bf0910b0eaa507e0e11c3c43c316b524500c548d307eb045d6f89047e6ba01e'],
-    }),
-    ('assertive.properties', '0.0-4', {
-        'checksums': ['5c0663fecb4b7c30f2e1d65da8644534fcfe97fb3d8b51f74c1327cd14291a6b'],
-    }),
-    ('assertive.types', '0.0-3', {
-        'checksums': ['ab6db2eb926e7bc885f2043fab679330aa336d07755375282d89bf9f9d0cb87f'],
-    }),
-    ('assertive.numbers', '0.0-2', {
-        'checksums': ['bae18c0b9e5b960a20636e127eb738ecd8a266e5fc29d8bc5ca712498cd68349'],
-    }),
-    ('assertive.strings', '0.0-3', {
-        'checksums': ['d541d608a01640347d661cc9a67af8202904142031a20caa270f1c83d0ccd258'],
-    }),
-    ('assertive.datetimes', '0.0-3', {
-        'checksums': ['014e2162f5a8d95138ed8330f7477e71c908a29341697c09a1b7198b7e012d94'],
-    }),
-    ('assertive.files', '0.0-2', {
-        'checksums': ['be6adda6f18a0427449249e44c2deff4444a123244b16fe82c92f15d24faee0a'],
-    }),
-    ('assertive.sets', '0.0-3', {
-        'checksums': ['876975a16ed911ea1ad12da284111c6eada6abfc0118585033abc0edb5801bb3'],
-    }),
-    ('assertive.matrices', '0.0-2', {
-        'checksums': ['3462a7a7e11d7cc24180330d48cc3067cf92eab1699b3e4813deec66d99f5e9b'],
-    }),
-    ('assertive.models', '0.0-2', {
-        'checksums': ['b9a6d8786f352d53371dbe8c5f2f2a62a7866e30313f268e69626d5c3691c42e'],
-    }),
-    ('assertive.data', '0.0-3', {
-        'checksums': ['5a00fb48ad870d9b3c872ce3d6aa20a7948687a980f49fe945b455339e789b01'],
-    }),
-    ('assertive.data.uk', '0.0-2', {
-        'checksums': ['ab48dab6977e8f43d6fffb33228d158865f68dde7026d123c693d77339dcf2bb'],
-    }),
-    ('assertive.data.us', '0.0-2', {
-        'checksums': ['180e64dfe6339d25dd27d7fe9e77619ef697ef6e5bb6a3cf4fb732a681bdfaad'],
-    }),
-    ('assertive.reflection', '0.0-5', {
-        'checksums': ['c2ca9b27cdddb9b9876351afd2ebfaf0fbe72c636cd12aa2af5d64e33fbf34bd'],
-    }),
-    ('assertive.code', '0.0-3', {
-        'checksums': ['ef80e8d1d683d776a7618e78ddccffca7f72ab4a0fcead90c670bb8f8cb90be2'],
-    }),
-    ('assertive', '0.3-6', {
-        'checksums': ['c403169e83c433b65e911f7fd640b378e2a4a4765a36063584b8458168a4ea0a'],
-    }),
-    ('rdrop2', '0.8.2.1', {
-        'checksums': ['b9add765fe8e7c966f0d36eef939a9e38f253958bd2a3c656b890cbb0366300b'],
-    }),
-    ('Exact', '3.0', {
-        'checksums': ['a76114e9780c86e4ea0a561300db024b95af9b0ebb6c3bf9a7598d276d009529'],
-    }),
-    ('lmom', '2.8', {
-        'checksums': ['cae2a925c39429d8e9f91bdb2682ea0d1343e9b2e5c9e8752c5929eb5f20d2d2'],
-    }),
-    ('gld', '2.6.2', {
-        'checksums': ['915860ac054ba4d29854c7d274e9c927995c5df2a7d4a6a0122b1fbc4a3c3cf3'],
-    }),
-    ('DescTools', '0.99.43', {
-        'checksums': ['8c3c4e5975428b9f2817907931449cd704d3df0e19e4337010f0dee333e7a4ff'],
-    }),
-    ('orthopolynom', '1.0-5', {
-        'checksums': ['6da4f437aae5c8fafdf791ce3c6a66f68198df4054af3aab8406402a4dc770bf'],
-    }),
-    ('gaussquad', '1.0-2', {
-        'checksums': ['ba3a1ab6ffe92f592c9f2bb1d4070f1fb1019325226dcb4863cf725eb59e9b2d'],
-    }),
-    ('nlsem', '0.8', {
-        'checksums': ['495a5d07aa5f59efdcd43acf429ae842453abd6c0720a80e2102d663fa997c60'],
-    }),
-    ('tableone', '0.13.0', {
-        'checksums': ['1c73a5a7595dc0ae2299d17c74738e077984af7d5429e4858b7be3c55e121346'],
-    }),
-    ('jstable', '1.0.7', {
-        'checksums': ['a8f66172973dc75d1d751d7015e0f028c441263f6649909bd25fa944be0042c3'],
-    }),
-    ('RCAL', '2.0', {
-        'checksums': ['10f5f938a8322d8737159e1e49ce9d12419a5130699b8a19c6ca53d6508da8cc'],
-    }),
-    ('stargazer', '5.2.2', {
-        'checksums': ['70eb4a13a6ac1bfb35af07cb8a63d501ad38dfd9817fc3fba6724260b23932de'],
-    }),
-    ('sensemakr', '0.1.4', {
-        'checksums': ['6a1354f05392fa9343b90f69a54022c995651fb3c3d05cb08fa088ef52258caf'],
-    }),
-    ('CompQuadForm', '1.4.3', {
-        'checksums': ['042fc56c800dd8f5f47a017e2efa832caf74f0602824abf7099898d9708660c4'],
-    }),
-    ('nonnest2', '0.5-5', {
-        'checksums': ['027f510e322122fc75c936251a95ddd392f96047ac86e0fae6cf8f883ac7aab5'],
-    }),
-    ('blavaan', '0.3-17', {
-        'checksums': ['ada14fcc665a22f11fc57392d70141c398d85dbb35f0a3373a501bc51d27f1e5'],
-    }),
-    ('mathjaxr', '1.4-0', {
-        'checksums': ['ba57378236d593a39c5839054adc5473526de0c8f05b7eeb87c99438496ddc67'],
-    }),
-    ('metafor', '3.0-2', {
-        'checksums': ['02df435197b225da736103edf73d19253a542bc31fc0b99610c02daec434138a'],
-    }),
-    ('fmri', '1.9.6', {
-        'checksums': ['7614290d880667512744d3450480a670cc38abdb270f3f776ac9a17a793f07f2'],
-    }),
-    ('AnalyzeFMRI', '1.1-24', {
-        'checksums': ['0d2acfe9ce8f25eb5cc9e6ef1db3ea8e232a31d46a95e50914489b1997e17062'],
-    }),
-    ('linkcomm', '1.0-14', {
-        'checksums': ['36f1557c65d862fc87635eedfad77f18a5deb66da00895e50e2d5eac0f23b597'],
-    }),
-    ('rnetcarto', '0.2.4', {
-        'checksums': ['266702330250e9fbeb8616d86edf1d50d63084a0731d17e84a04dc6faacf653a'],
-    }),
-    ('DEoptim', '2.2-6', {
-        'checksums': ['8c63397d83a067212d003ef3e639fd81f5f00bf61e3c271b4e4999031a69e2e1'],
-    }),
-    ('optextras', '2019-12.4', {
-        'checksums': ['59006383860826be502ea8757e39ed94338f04d246c4fc398a088e004d8b13eb'],
-    }),
-    ('setRNG', '2013.9-1', {
-        'checksums': ['1a1a399682a06a5fea3934985ebb1334005676c6a2a22d06f3c91c3923432908'],
-    }),
-    ('Rvmmin', '2018-4.17.1', {
-        'checksums': ['55000ac4ff57d42f172c46c7d6b0a603da3b65866d6440d6b32bac4d2b81814e'],
-    }),
-    ('Rcgmin', '2013-2.21', {
-        'checksums': ['a824a09c32d7565a3e30607c71333506d5b7197478fbe8b43f8a77dad6c12f0a'],
-    }),
-    ('optimr', '2019-12.16', {
-        'checksums': ['73b1ed560ffd74599517e8baa4c5b293aa062e9c8d50219a3a24b63e72fa7c00'],
-    }),
-    ('DMCfun', '2.0.2', {
-        'checksums': ['430cbc18f17db11a7941e6a8274a0eefbb8a6b0bdac8800970530d60d5881fde'],
-    }),
-    ('miceadds', '3.11-6', {
-        'checksums': ['121d03c812fbcf584a25585ac73f6c44f4b5d6cd21b05362ddd15395fb3909f6'],
-    }),
-    ('visdat', '0.5.3', {
-        'checksums': ['527c76b6643b8475a58516763ef40238cdc61ec62d2dcf690f7c316b93b878c6'],
-    }),
-    ('UpSetR', '1.4.0', {
-        'checksums': ['351e5fee64204cf77fd378cf2a2c0456cc19d4d98a2fd5f3dac74b69a505f100'],
-    }),
-    ('norm', '1.0-9.5', {
-        'checksums': ['305cbf007f3905cfd535ed9bf5ae3e2995e228cc8883d6482e5d3a2f02814106'],
-    }),
-    ('naniar', '0.6.1', {
-        'checksums': ['d546ca15bf6c224f3103eb1441abef91d34feebb7320c2398d598f5d50177450'],
-    }),
-    ('stringdist', '0.9.8', {
-        'checksums': ['efccd6ccc5c74c578be95b7dae1099c52b0d7805452ab14ee91ca34adb8261bb'],
-    }),
-    ('image.binarization', '0.1.2', {
-        'checksums': ['0621ca94a74264bb73f689b1a00484b5a3bbef93fc203d9c001d791a18fcc13f'],
-    }),
-    ('lassosum', '0.4.5', {
-        'source_urls': ['https://github.com/tshmak/%(name)s/releases/download/v%(version)s/'],
-        'sources': ['%(name)s_%(version)s.tar.gz'],
-        'checksums': ['18c0d0b5022bcf81a9bf1b3b6647da3e080f221828b473ea2a45a9bf98474fbc'],
-    }),
-    ('lslx', '0.6.10', {
-        'checksums': ['adc2b2a621625b52165245ab2f3a0bfba4f4db64fcc6ad48a3e5b219c3bd2fa1'],
-    }),
-    ('truncnorm', '1.0-8', {
-        'checksums': ['49564e8d87063cf9610201fbc833859ed01935cc0581b9e21c42a0d21a47c87e'],
-    }),
-    ('Rsolnp', '1.16', {
-        'checksums': ['3142776062beb8e2b45cdbc4fe6e5446b6d33505253d79f2890fe4178d9cf670'],
-    }),
-    ('regsem', '1.8.0', {
-        'checksums': ['28ff1c2dbddcafc6ed6c30154f46074aa0c8974757466680529b71a5f3e463ec'],
-    }),
-    ('semPLS', '1.0-10', {
-        'checksums': ['cb587ccfdaf970f426dc7146035c7e010b1c51c17bf4fc089fd796eda58db460'],
-    }),
-    ('GxEScanR', '2.0.2', {
-        'checksums': ['6d42fd15d83dd1491405b282d26fa472f9f9902a9dc68836d6a48b459ada6a4c'],
-    }),
-    ('alabama', '2015.3-1', {
-        'checksums': ['6600fcf4842488950e196d3f5a8fc4d69e8271b36292ce67ac3ab697449a8f56'],
-    }),
-    ('polycor', '0.7-10', {
-        'checksums': ['caea3beca2c889e12e5b976c20c19cf5a76d42e6329e9ab646112eeae8fcfc73'],
-    }),
-    ('multipol', '1.0-7', {
-        'checksums': ['0abe3c894c0d8e928a920e73708a397133386a0d73a1e7952c4075afe67879e6'],
-    }),
-    ('symmoments', '1.2.1', {
-        'checksums': ['9a6be1f8fe44f6ab5a1790e870fd8b18de1686a48a14a9fca2d035bfb5458672'],
-    }),
-    ('cSEM', '0.4.0', {
-        'checksums': ['7753ac7db9d2c0392e51dd31ec8638e1a7fcbb2546dd9103f5ecc03dd51836c1'],
-    }),
-    ('cubelyr', '1.0.1', {
-        'checksums': ['740a34100592b2c6b7bc89a31bddccf4c8fd95720caf68f530104f17aada77bc'],
-    }),
-    ('broom.mixed', '0.2.7', {
-        'checksums': ['ff29385557af239a41452ffb5ebe230630a2a30f4a91e95505c3178b62df01ba'],
-    }),
-    ('DiceKriging', '1.6.0', {
-        'checksums': ['ab5d1332809f2bb16d156ed234b102eb9fbd6de792e4291f9f6ea4652215cb49'],
-    }),
-    ('grf', '2.0.2', {
-        'checksums': ['043f21a057762a2d5e0febb37c1d9cb8d2f94d19f2eded20c672dec7ff54b505'],
-    }),
-    ('xgboost', '1.4.1.1', {
-        'checksums': ['9f986f3895ce5f6744335c82afe3a87d9ac2e473e60785295edf2be80d34e0c4'],
-    }),
-    ('twang', '2.5', {
-        'checksums': ['fc355527c57e4f6e0f60d26d7c690c4475fcd5fb165d125fea7cc6b9fafc4ce5'],
-    }),
-    ('neuralnet', '1.44.2', {
-        'checksums': ['5f66cd255db633322c0bd158b9320cac5ceff2d56f93e4864a0540f936028826'],
-    }),
-    ('PCAmatchR', '0.3.0', {
-        'checksums': ['73876c6d1cf42928a03a64aba197c67b4a4f4de2c431cfbc6fce615bbea32fa0'],
-    }),
-    ('origami', '1.0.5', {
-        'checksums': ['8d0d08aaecc428cbbf5db4615ad3623777c10c6d7947a1cc3ccc7f8db8cb5263'],
-    }),
-    ('hal9001', '0.4.1', {
-        'checksums': ['386fa93ae6c0f409a9137adc54da25a2770826fbed63787e33a36c95f3f89441'],
-    }),
-    ('cobalt', '4.3.1', {
-        'checksums': ['67e26a700ca083a39beb255df54c6ab495f34ea5847a0bf1c4bac895e980eef8'],
-    }),
-    ('CBPS', '0.22', {
-        'checksums': ['d19247e6765f02737d15a0a2ee86ae24e7206ae740dfaa61821622eb3a309aef'],
-    }),
-    ('SBdecomp', '1.1', {
-        'checksums': ['ad4e4f00bc58eafe551ad6288c0642a16e16ef8f73c2ae649f808b1e559df644'],
-    }),
-    ('naturalsort', '0.1.3', {
-        'checksums': ['cd38a9c5f323f61459e6096cdbf4493851d40497baf671af4f8dfe9a7c00e857'],
-    }),
-    ('lwgeom', '0.2-8', {
-        'checksums': ['f48a92de222da0590b37a30d5cbf2364555044a842795f6b488afecc650b8b34'],
-    }),
-    ('finalfit', '1.0.3', {
-        'checksums': ['bbfa841a2b1a7b1f8c153d773ff076a2e465e451815f8166ff0ce8c4018ff61e'],
-    }),
-    ('broom.helpers', '1.4.0', {
-        'checksums': ['7f6a5c0c79260b57cd31976bc216fffbc79a1641e01b74630dcd37d2c84e3f75'],
-    }),
-    ('gt', '0.3.1', {
-        'checksums': ['ddd1fee446f156d1b52bb2db83262aac2a896db93748e92e08407d317e126019'],
-    }),
-    ('gtsummary', '1.5.0', {
-        'checksums': ['54dd5e11c5b2a808ca93284760a5cd102f820332d2fa40474d5cedea030711a7'],
-    }),
-    ('ncdf4', '1.17', {
-        'checksums': ['db95c4729d3187d1a56dfd019958216f442be6221bd15e23cd597e6129219af6'],
-    }),
-    ('geex', '1.0.12', {
-        'checksums': ['037aece09bc0c4349897cd1d8f5dcf1e680598cdfdf72148b6d1506e02690e7f'],
-    }),
-    ('momentfit', '0.2', {
-        'checksums': ['a10d43ac23bb61b9c67efa4800e3e2b6a444c1afaca8bad351648accd7e003f6'],
-    }),
-    ('StatMatch', '1.4.0', {
-        'checksums': ['820091cd2213734ea16f5fcd616491bbf39d3e6c2bcfb34a7c9fe09f4fd1a459'],
-    }),
-    ('stars', '0.5-3', {
-        'checksums': ['44944a82af36bea09ac1874ff9647acbb7fef021ebdca5aae7c34794be929401'],
-    }),
-    ('rapidjsonr', '1.2.0', {
-        'checksums': ['62c94fcdcf5d0fbdfa2f6168affe526bf547c37c16d94e2e1b78d7bf608eed1f'],
-    }),
-    ('jsonify', '1.2.1', {
-        'checksums': ['929191ab32e34af6a02ad991e29314cc78ea40763fcf232388ef2d132137fbce'],
-    }),
-    ('geometries', '0.2.0', {
-        'checksums': ['8cf5094f3c2458fef5d755799c766afd27c66cd1c292574a6ab532d608360314'],
-    }),
-    ('sfheaders', '0.4.0', {
-        'checksums': ['86bcd61018a0491fc8a1e7fb0422c918296287b82be299a79ccee8fcb515e045'],
-    }),
-    ('geojsonsf', '2.0.1', {
-        'checksums': ['42df40433bfbece5a39cd97b5bd4690b4424855241fcc3e7322ee68a3988bfbf'],
-    }),
-    ('leaflet.providers', '1.9.0', {
-        'checksums': ['9e8fc75c83313ab24663c2e718135459599549ed6e7396086cacb44e36cfd67b'],
-    }),
-    ('leaflet', '2.0.4.1', {
-        'checksums': ['b0f038295f1de5d32d9ffa1d0dbc1562320190f2f1365f3a5e95863fff88901f'],
-    }),
-    ('leafsync', '0.1.0', {
-        'checksums': ['7d8fd8dbbbf66417cf32575f14c0fe68199762ecf1c036c7905c7c5ff859d75c'],
-    }),
-    ('leafem', '0.1.6', {
-        'checksums': ['ca50e0a699f564449248511857a2df0d48cd07de3157e099478a19b533088156'],
-    }),
-    ('widgetframe', '0.3.1', {
-        'checksums': ['44089a2cf8b0941a6f3da55da36353e2f44653ca58bfec7960ee5b71ea380d48'],
-    }),
-    ('tmaptools', '3.1-1', {
-        'checksums': ['fd89cb0d7fb44e0a5dd5311fa3e75a729746bf2e8e158d5ec423e5963f1b542d'],
-    }),
-    ('tmap', '3.3-2', {
-        'checksums': ['2bcb74c5c5546223d79abe5d633581fb2664b910f6246f4b8b7166b208b4629a'],
-    }),
-    ('collapse', '1.6.5', {
-        'checksums': ['1e232a3a62b5eb5ed5d81e7d92ce1bae34c3d877d593d47d7edbd3f515b95a46'],
-    }),
-    ('genoPlotR', '0.8.11', {
-        'checksums': ['f127f7fe8b19c899ecfdf98bf69d2e18926afb593a72fc40097acca66d401607'],
-    }),
-    ('VineCopula', '2.4.3', {
-        'checksums': ['42727aa7345ab544242182222eb97476f5dc04bc837f94f6fd3ea6ccac93ea17'],
-    }),
-    ('Rmpfr', '0.8-7', {
-        'checksums': ['93c2db785ff705dcfc6fa7f0373c2426cdc2ef72ceb5b294edeb2952775f57d2'],
-    }),
-    ('scam', '1.2-12', {
-        'checksums': ['0ce5f844221370884719424eb5b2b22c34a8a8ad64eac3de981e5539b6e88f4a'],
-    }),
-    ('copula', '1.0-1', {
-        'checksums': ['d09b2ccffc7379e48b00952aa6b282baf502feebaf55cc44e93f881d7b909742'],
-    }),
-    ('evd', '2.3-3', {
-        'checksums': ['2fc5ef2e0c3a2a9392425ddd45914445497433d90fb80b8c363877baee4559b4'],
-    }),
-    ('ismev', '1.42', {
-        'checksums': ['0d57fbeca83bd478e84fcff795967d51d8448c629abe7adc6c4c18c7fb8bf1a5'],
-    }),
-    ('GJRM', '0.2-5.1', {
-        'checksums': ['516dd73c70e5c8ab60b24027f94cab42603797c41cb7aa740882cb850f6d6ab4'],
-    }),
-    ('penfa', '0.1.1', {
-        'checksums': ['a22a8ac3d4a040c77e50ddc92328c1989eae536d79fe56013e9372ba27c114e5'],
-    }),
-    ('rngWELL', '0.10-7', {
-        'checksums': ['0c00c54e69d7d552cfa08d766e4854c01c6c1c8e2c558f387760b91a55ef2d38'],
-    }),
-    ('randtoolbox', '1.31.1', {
-        'checksums': ['30992e8156782542e9a2bffb75eb2e35f6d302a8c22cb7c3ed9004f0f0973bad'],
-    }),
-    ('kde1d', '1.0.3', {
-        'checksums': ['d645652d09f1981eb37be9f041034da9b9191885dd38be8a7e485e5e41eb050e'],
-    }),
-    ('RcppThread', '1.0.0', {
-        'checksums': ['544a48ee4ea381e2e1421d4edbec54365f17059084d94ded7c339de36deeccf5'],
-    }),
-    ('wdm', '0.2.2', {
-        'checksums': ['11c616f0896d62993f5eee1daf7b021d27f13751f6617067b57cf463aea32dde'],
-    }),
-    ('rvinecopulib', '0.6.1.1.1', {
-        'checksums': ['779fd288774ebb1a0adde6b960053e5c63750bfa66d5ddf349e0f1d8730f08cd'],
-    }),
-    ('PearsonDS', '1.2.1', {
-        'checksums': ['354be30b8df4e5432d1bc2b6162900522d4c08dc63b207331819d589fb069824'],
-    }),
-    ('covsim', '0.2.1', {
-        'checksums': ['57ca810c6950ab295078b745eb87fdd7f195e15082777eed9f1059b6302f13bf'],
-    }),
-    ('semTools', '0.5-5', {
-        'checksums': ['ddf883753c5964eae8313d7e8a4703be52e649f10d3bc1d12ede6d1707b1fab6'],
-    }),
-    ('GPArotation', '2014.11-1', {
-        'checksums': ['351bc15fc8dc6c8ea5045fbba22180d1e68314fc34d267545687748e312e5096'],
-    }),
-    ('dcurver', '0.9.2', {
-        'checksums': ['cc6c55090d3607910515981ea0c7221e40e7a29e0da0c5a5f42c3847012290ec'],
-    }),
-    ('mirt', '1.35.1', {
-        'checksums': ['788b7e499b7d48f5f590eb5cfdac260c4e993b94a3956d30bc2d8bce8cd2ba3e'],
-    }),
-    ('rpf', '1.0.11', {
-        'checksums': ['e1fd670ae7c3e947db08ce50d6b16ce1b3b8f63a9016b03baba760aee78921fb'],
-    }),
-    ('OpenMx', '2.19.8', {
-        'checksums': ['cb4be9850f61d320dcd47ef0ad7b20e5baafde558ebbc67301b13d883baf6760'],
-    }),
-]
-
-moduleclass = 'lang'
-- 
GitLab