diff --git a/Libraries/gmp/build b/Libraries/gmp/build
index 5f4ffcc..6e021f3 100755
--- a/Libraries/gmp/build
+++ b/Libraries/gmp/build
@@ -1,12 +1,2 @@
 #!/usr/bin/env modbuild
 
-pbuild::set_download_url "https://gmplib.org/download/$P/$P-$V_PKG.tar.bz2"
-pbuild::add_to_group 'Libraries'
-
-# use system gcc to compile
-declare -rx CC=gcc
-declare -rx CPP=/usr/bin/cpp
-
-pbuild::add_configure_args "--disable-shared"
-pbuild::add_configure_args "--with-pic"
-
diff --git a/Libraries/gmp/files/config.yaml b/Libraries/gmp/files/config.yaml
new file mode 100644
index 0000000..4af444c
--- /dev/null
+++ b/Libraries/gmp/files/config.yaml
@@ -0,0 +1,37 @@
+format: 1
+gmp:
+  defaults:
+    group: Libraries
+    overlay: base 
+    relstage: stable
+    configure_args:
+      - --disable-shared
+      - --with-pic
+      - CC=gcc
+      - CPP=/usr/bin/cpp
+    docfiles: []
+    urls:
+      - url: https://gmplib.org/download/$P/$P-$V_PKG.tar.bz2
+  shasums:
+    gmp-6.3.0.tar.bz2: ac28211a7cfb609bae2e2c8d6058d66c8fe96434f740cf6fe2e47b000d1c20cb
+    gmp-6.2.1.tar.bz2: eae9326beb4158c386e39a356818031bd28f3124cf915f8c5b1dc4c7a36b4d7c
+    gmp-6.2.0.tar.bz2: f51c99cb114deb21a60075ffb494c1a210eb9d7cb729ed042ddb7de9534451ea
+    gmp-6.1.2.tar.gz: 97904147e7216a58cf5870a810aa1347488fe714d710f53d42f72247be7b77f7
+    gmp-6.1.2.tar.bz2: 5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2
+    gmp-6.1.2.tar.bz2.sig: 7de6a71ccadc8e1d761713a9fce2ef67de2dcc8cbaee51d464d360df07f5e951
+    gmp-6.1.2-1.tar.gz: 97904147e7216a58cf5870a810aa1347488fe714d710f53d42f72247be7b77f7
+    gmp-6.1.2-1.tar.bz2: 97904147e7216a58cf5870a810aa1347488fe714d710f53d42f72247be7b77f7
+    gmp-6.1.1.tar.lz: 2ac8d815c670bbfecc2e796b9bcd4869eecd31299868248b0b221bc64a2570b2
+    gmp-6.1.1.tar.bz2: a8109865f2893f1373b0a8ed5ff7429de8db696fc451b1036bd7bdf95bbeffd6
+    gmp-6.1.0.tar.bz2: 498449a994efeba527885c10405993427995d3f86b8768d8cdf8d9dd7c6b73e8
+    gmp-6.0.0.tar.bz2: 7f8e9a804b9c6d07164cf754207be838ece1219425d64e28cfa3e70d5c759aaf
+    gmp-5.1.3.tar.bz2: 752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
+    gmp-5.1.1.tar.bz2: a0d4779f48b36519dfaceb5f987a7c76fcac223258bebea3bb2244310970afad
+
+  versions:
+    6.2.1;6.3.0:
+
+    5.1.1;6.0.0;6.1.0;6.1.1;6.1.2;6.1.2-1;6.2.0:
+      config:
+        relstage: deprecated
+
diff --git a/Libraries/gmp/files/variants b/Libraries/gmp/files/variants
deleted file mode 100644
index 349dcfc..0000000
--- a/Libraries/gmp/files/variants
+++ /dev/null
@@ -1,8 +0,0 @@
-gmp/5.1.1	stable	
-gmp/6.0.0	stable	
-gmp/6.1.0	stable	
-gmp/6.1.1	stable	
-gmp/6.1.2	stable
-gmp/6.1.2-1	stable
-gmp/6.2.0       stable
-gmp/6.2.1       stable
diff --git a/Libraries/mpc/build b/Libraries/mpc/build
index 3257c64..6e021f3 100755
--- a/Libraries/mpc/build
+++ b/Libraries/mpc/build
@@ -1,11 +1,2 @@
 #!/usr/bin/env modbuild
 
-pbuild::set_download_url "http://ftp.gnu.org/gnu/${P}/${P}-${V_PKG}.tar.gz"
-pbuild::add_to_group 'Libraries'
-
-pbuild::pre_configure() {
-	pbuild::add_configure_args "--with-gmp=${GMP_PREFIX}"
-	pbuild::add_configure_args "--with-mpfr=${MPFR_PREFIX}"
-	pbuild::add_configure_args "--disable-shared"
-}
-
diff --git a/Libraries/mpc/files/config.yaml b/Libraries/mpc/files/config.yaml
new file mode 100644
index 0000000..aa6b00b
--- /dev/null
+++ b/Libraries/mpc/files/config.yaml
@@ -0,0 +1,30 @@
+format: 1
+mpc:
+  defaults:
+    group: Libraries
+    overlay: base 
+    relstage: stable
+    configure_args:
+      - --disable-shared
+      - --with-pic
+      - --with-gmp=${GMP_PREFIX}
+      - --with-mpfr=${MPFR_PREFIX}
+    docfiles: []
+    urls:
+      - url: http://ftp.gnu.org/gnu/${P}/${P}-${V_PKG}.tar.gz
+
+  shasums:
+    mpc-1.3.1.tar.gz: ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8
+    mpc-1.2.1.tar.gz: 17503d2c395dfcf106b622dc142683c1199431d095367c6aacba6eec30340459
+    mpc-1.1.0.tar.gz: 6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e
+    mpc-1.0.3.tar.gz: 617decc6ea09889fb08ede330917a00b16809b8db88c29c31bfbb49cbf88ecc3
+    mpc-1.0.2.tar.gz: b561f54d8a479cee3bc891ee52735f18ff86712ba30f036f8b8537bae380c488
+    mpc-1.0.1.tar.gz: ed5a815cfea525dc778df0cb37468b9c1b554aaf30d9328b1431ca705b7400ff
+
+  versions:
+    1.2.1;1.3.1-1:
+
+    1.0.{2,3};1.0.3-2;1.1.0-{1..4};1.3.1:
+      config:
+        relstage: deprecated
+
diff --git a/Libraries/mpc/files/variants b/Libraries/mpc/files/variants
deleted file mode 100644
index cd04296..0000000
--- a/Libraries/mpc/files/variants
+++ /dev/null
@@ -1,11 +0,0 @@
-mpc/1.0.2	stable		b:gmp/5.1.1 b:mpfr/3.1.2
-mpc/1.0.3	stable		b:gmp/6.1.0 b:mpfr/3.1.4
-mpc/1.0.3-1	stable		b:gmp/6.1.1 b:mpfr/3.1.4
-mpc/1.0.3-2	stable		b:gmp/6.1.2 b:mpfr/3.1.5
-mpc/1.1.0	stable		b:gmp/6.1.2 b:mpfr/4.0.0
-mpc/1.1.0-1	stable		b:gmp/6.1.2 b:mpfr/4.0.1
-mpc/1.1.0-2	stable		b:gmp/6.1.2-1 b:mpfr/4.0.1-1
-mpc/1.1.0-3	stable		b:gmp/6.1.2-1 b:mpfr/4.0.2
-mpc/1.1.0-4	stable		b:gmp/6.2.0 b:mpfr/4.0.2-1
-mpc/1.2.1	stable		b:gmp/6.2.1 b:mpfr/4.1.0
-mpc/1.3.1	stable		b:gmp/6.2.1 b:mpfr/4.2.0
diff --git a/Libraries/mpfr/build b/Libraries/mpfr/build
index 425992c..6e021f3 100755
--- a/Libraries/mpfr/build
+++ b/Libraries/mpfr/build
@@ -1,12 +1,2 @@
 #!/usr/bin/env modbuild
 
-pbuild::set_download_url "http://www.mpfr.org/$P-${V_PKG}/$P-${V_PKG}.tar.xz"
-pbuild::add_to_group 'Libraries'
-
-#module use 'Libraries'
-
-pbuild::pre_configure() {
-	pbuild::add_configure_args "--with-gmp=${GMP_PREFIX}"
-	pbuild::add_configure_args "--with-pic"
-	pbuild::add_configure_args "--disable-shared"
-}
diff --git a/Libraries/mpfr/files/config.yaml b/Libraries/mpfr/files/config.yaml
new file mode 100644
index 0000000..2773a97
--- /dev/null
+++ b/Libraries/mpfr/files/config.yaml
@@ -0,0 +1,35 @@
+format: 1
+mpfr:
+  defaults:
+    group: Libraries
+    overlay: base 
+    relstage: stable
+    configure_args:
+      - --disable-shared
+      - --with-pic
+      - --with-gmp=${GMP_PREFIX}
+    docfiles: []
+    urls:
+      - url: http://www.mpfr.org/$P-${V_PKG}/$P-${V_PKG}.tar.xz
+
+  shasums:
+    mpfr-4.2.1.tar.xz: 277807353a6726978996945af13e52829e3abd7a9a5b7fb2793894e18f1fcbb2
+    mpfr-4.2.0.tar.xz: 06a378df13501248c1b2db5aa977a2c8126ae849a9d9b7be2546fb4a9c26d993
+    mpfr-4.1.0.tar.xz: 0c98a3f1732ff6ca4ea690552079da9c597872d30e96ec28414ee23c95558a7f
+    mpfr-4.0.2.tar.xz: 1d3be708604eae0e42d578ba93b390c2a145f17743a744d8f3f8c2ad5855a38a
+    mpfr-4.0.2.tar.bz2: c05e3f02d09e0e9019384cdd58e0f19c64e6db1fd6f5ecf77b4b1c61ca253acc
+    mpfr-4.0.1.tar.xz: 67874a60826303ee2fb6affc6dc0ddd3e749e9bfcb4c8655e3953d0458a6e16e
+    mpfr-4.0.0.tar.bz2: 6aa31fbf3bd1f9f95bcfa241590a9d11cb0f874e2bb93b99c9e2de8eaea6d5fd
+    mpfr-3.1.5.tar.bz2: ca498c1c7a74dd37a576f353312d1e68d490978de4395fa28f1cbd46a364e658
+    mpfr-3.1.4.tar.gz: 0d4de7e1476f79d24c38d5bc04a06fcc9a1bb9cf35fd654ceada29af03ad1844
+    mpfr-3.1.3.tar.bz2: f63bb459157cacd223caac545cb816bcdb5a0de28b809e7748b82e9eb89b0afd
+    mpfr-3.1.2.tar.bz2: 79c73f60af010a30a5c27a955a1d2d01ba095b72537dab0ecaad57f5a7bb1b6b
+    mpfr-3.1.1.tar.bz2: 7b66c3f13dc8385f08264c805853f3e1a8eedab8071d582f3e661971c9acd5fd
+
+  versions:
+    4.1.0;4.2.0;4.2.1:
+
+    3.1.{2..5};4.0.{0..1};4.0.1-1;4.0.2;4.0.2-{1..2}:
+      config:
+        relstage: deprecated
+
diff --git a/Libraries/mpfr/files/variants b/Libraries/mpfr/files/variants
deleted file mode 100644
index 6f88c53..0000000
--- a/Libraries/mpfr/files/variants
+++ /dev/null
@@ -1,13 +0,0 @@
-mpfr/3.1.2	stable		b:gmp/5.1.1
-mpfr/3.1.3	stable		b:gmp/6.0.0
-mpfr/3.1.4	stable		b:gmp/6.1.0
-mpfr/3.1.4-1	stable		b:gmp/6.1.1
-mpfr/3.1.5	stable		b:gmp/6.1.2
-mpfr/4.0.0      stable          b:gmp/6.1.2
-mpfr/4.0.1      stable          b:gmp/6.1.2
-mpfr/4.0.1-1	stable          b:gmp/6.1.2-1
-mpfr/4.0.2      stable          b:gmp/6.1.2-1
-mpfr/4.0.2-1    stable		b:gmp/6.2.0
-mpfr/4.0.2-2    stable		b:gmp/6.2.0
-mpfr/4.1.0	stable		b:gmp/6.2.1
-mpfr/4.2.0	stable		b:gmp/6.2.1
diff --git a/Programming/gcc/build b/Programming/gcc/build
index 6cd3a30..6e021f3 100755
--- a/Programming/gcc/build
+++ b/Programming/gcc/build
@@ -1,14 +1,2 @@
 #!/usr/bin/env modbuild
 
-#pbuild::pre_prep() {
-#	if (( V_MAJOR == 10 && V_MINOR == 2 )); then
-#		pbuild::add_patch "files/gcc-10.2.0-cpp-__has_include.patch"
-#	fi
-#}
-
-
-#pbuild::pre_configure_Linux() {
-#	if (( V_MAJOR >= 8 )); then
-#		pbuild::add_configure_args "--enable-languages=c,c++,objc,obj-c++,lto,fortran,go"
-#	fi
-#}
diff --git a/Programming/gcc/files/config.yaml b/Programming/gcc/files/config.yaml
index 9ea5a50..03220ff 100644
--- a/Programming/gcc/files/config.yaml
+++ b/Programming/gcc/files/config.yaml
@@ -20,6 +20,7 @@ gcc:
       - --disable-multilib
       - --with-pkgversion=PSI Environment Module
       - --with-build-config=bootstrap-debug
+      - --enable-languages=c,c++,objc,obj-c++,lto,fortran,go'
     urls:
       - url: https://ftp.gnu.org/gnu/gcc/$P-$V/$P-$V.tar.gz
 
@@ -73,60 +74,271 @@ gcc:
     gcc-4.7.4.tar.gz: ddbaa583c5d4e4f0928bf15d9f6b6c283349e16eedc47bde71e1b813f6f37819
     gcc-4.7.3.tar.gz: 34a273937eb63ee710784b65bcf9fb3cfcd79d02848f80c75f8254abd14c79c8
     gcc-4.6.4.tar.gz: 53de33db01815914b3905a7d2cefac1ecf24ad081b82d93e4f526d8e62ff736f
+
   versions:
-    14.2.0:
-      config:
-        relstage: unstable
-        build_requires: [gmp/6.3.0, mpfr/4.2.0, mpc/1.3.1]
-        configure_args+: ['--enable-languages=c,c++,objc,obj-c++,lto,fortran,go']
-      variants:
-        - overlay: base
-          systems: [rhel.*]
-        - overlay: PSI
-          systems: [login.*.merlin7.psi.ch, cn.*.merlin7.psi.ch, gpu.*.merlin7.psi.ch]
-          use_overlays: [PSI]
-          runtime_deps: [cray/23.12, PrgEnv-gnu/8.5.0]
-
-    13.3.0:
-      config:
-        relstage: unstable
-        build_requires: [gmp/6.3.0, mpfr/4.2.0, mpc/1.3.1]
-        configure_args+: ['--enable-languages=c,c++,objc,obj-c++,lto,fortran,go']
-      variants:
-        - overlay: base
-          systems: [rhel.*]
-        - overlay: PSI
-          systems: [login.*.merlin7.psi.ch, cn.*.merlin7.psi.ch, gpu.*.merlin7.psi.ch]
-          use_overlays: [PSI]
-          runtime_deps: [cray/23.12, PrgEnv-gnu/8.5.0]
-
-    13.2.0:
-      config:
-        relstage: unstable
-        build_requires: [gmp/6.3.0, mpfr/4.2.1, mpc/1.3.1-1]
-        configure_args+: ['--enable-languages=c,c++,objc,obj-c++,lto,fortran,go']
-
-    12.4.0:
-      config:
-        relstage: unstable
-        build_requires: [gmp/6.3.0, mpfr/4.2.0, mpc/1.3.1]
-        configure_args+: ['--enable-languages=c,c++,objc,obj-c++,lto,fortran,go']
-      variants:
-        - overlay: base
-          systems: [rhel.*]
-        - overlay: PSI
-          systems: [login.*.merlin7.psi.ch, cn.*.merlin7.psi.ch, gpu.*.merlin7.psi.ch]
-          use_overlays: [PSI]
-          runtime_deps: [cray/23.12, PrgEnv-gnu/8.5.0]
-
-    12.3.0:
+    12.3.0;12.4.0;13.2.0;13.3.0;14.2.0:
       config:
         relstage: stable
-        build_requires: [gmp/6.2.1, mpfr/4.2.0, mpc/1.3.1]
-        configure_args+: ['--enable-languages=c,c++,objc,obj-c++,lto,fortran,go']
+        build_requires: [gcc/10.4.0, gmp/6.3.0, mpfr/4.2.0, mpc/1.3.1]
       variants:
+        - overlay: base
+          systems: [rhel.*]
         - overlay: PSI
           systems: [login.*.merlin7.psi.ch, cn.*.merlin7.psi.ch, gpu.*.merlin7.psi.ch]
-          use_overlays: [PSI]
-          runtime_deps: [cray/23.12, PrgEnv-gnu/8.5.0]
+        - overlay: base
+          systems: [rhel.*]
 
+    12.1.0:
+      config:
+        relstage: deprecated
+        build_requires: [gcc/11.3.0, gmp/6.2.1, mpfr/4.1.0, mpc/1.2.1]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    11.4.0:
+      config:
+        restage: stable
+        build_requires: [gcc/10.3.0, gmp/6.2.1, mpfr/4.2.0, mpc/1.3.1]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    11.3.0:
+      config:
+        restage: stable
+        build_requires: [gcc/10.3.0, gmp/6.2.1, mpfr/4.1.0, mpc/1.2.1]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    11.2.0:
+      config:
+        restage: deprecated
+        build_requires: [gcc/10.3.0, gmp/6.2.1, mpfr/4.1.0, mpc/1.2.1]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    10.4.0:
+      config:
+        restage: stable
+        build_requires: [gmp/6.2.1, mpfr/4.1.0, mpc/1.2.1]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    10.3.0:
+      config:
+        restage: stable
+        build_requires: [gmp/6.2.1, mpfr/4.1.0, mpc/1.2.1]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    10.1.0;10.2.0:
+      config:
+        restage: deprecated
+        build_requires: [gmp/6.2.0, mpfr/4.0.2-1, mpc/1.1.0-4]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    9.3.0:
+      config:
+        restage: stable
+        build_requires: [gmp/6.2.0, mpfr/4.0.2-1, mpc/1.1.0-4]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    9.2.0:
+      config:
+        restage: deprecated
+        build_requires: [gmp/6.1.2-1, mpfr/4.0.2, mpc/1.1.0-3, isl/0.21]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    9.1.0:
+      config:
+        restage: deprecated
+        build_requires: [gmp/6.1.2-1, mpfr/4.0.2, mpc/1.1.0-3]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    8.4.0:
+      config:
+        restage: stable
+        build_requires: [gmp/6.2.0, mpfr/4.0.2-1, mpc/1.1.0-4]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    8.3.0:
+      config:
+        restage: stable
+        build_requires: [gmp/6.1.2-1, mpfr/4.0.2, mpc/1.1.0-3]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    8.1.0;8.2.0:
+      config:
+        restage: deprecated
+        build_requires: [gmp/6.1.2, mpfr/4.0.1, mpc/1.1.0]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    7.5.0:
+      config:
+        restage: stable
+        build_requires: [gmp/6.2.0, mpfr/4.0.2-1, mpc/1.1.0-4]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    7.4.0:
+      config:
+        restage: stable
+        build_requires: [gmp/6.1.2-1, mpfr/4.0.1-1, mpc/1.1.0-2]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    7.3.0:
+      config:
+        restage: deprecated
+        build_requires: [gmp/6.1.2, mpfr/4.0.0, mpc/1.1.0]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    7.2.0:
+      config:
+        restage: deprecated
+        build_requires: [gmp/6.1.2, mpfr/3.1.5, mpc/1.0.3-2]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    7.1.0:
+      config:
+        restage: deprecated
+        build_requires: [gmp/6.1.2, mpfr/3.1.5, mpc/1.0.3]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    6.5.0:
+      config:
+        restage: stable
+        build_requires: [gmp/6.1.2-1, mpfr/4.0.1-1, mpc/1.1.0-2]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    6.4.0:
+      config:
+        restage: stable
+        build_requires: [gmp/6.1.2, mpfr/3.1.5, mpc/1.0.3]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    6.3.0:
+      config:
+        restage: deprecated
+        build_requires: [gmp/6.1.2, mpfr/3.1.5, mpc/1.0.3-2]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    6.2.0:
+      config:
+        restage: deprecated
+        build_requires: [gmp/6.1.1, mpfr/3.1.4, mpc/1.0.3]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    6.1.0:
+      config:
+        restage: deprecated
+        build_requires: [gmp/6.1.0, mpfr/3.1.4, mpc/1.0.3]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    5.5.0:
+      config:
+        restage: stable
+        build_requires: [gmp/6.1.2-1, mpfr/4.0.1, mpc/1.1.0-1]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    5.4.0:
+      config:
+        restage: stable
+        build_requires: [gmp/6.1.2, mpfr/3.1.5, mpc/1.0.3-2]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    5.2.0;5.3.0:
+      config:
+        restage: deprecated
+        build_requires: [gmp/6.0.0, mpfr/3.1.3, mpc/1.0.3]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    5.1.0:
+      config:
+        restage: deprecated
+        build_requires: [gmp/5.1.1, mpfr/3.1.2, mpc/1.0.2]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    4.9.4:
+      config:
+        restage: stable
+        build_requires: [gmp/6.1.1, mpfr/3.1.4, mpc/1.0.3]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    4.9.3:
+      config:
+        restage: stable
+        build_requires: [gmp/6.1.0, mpfr/3.1.4, mpc/1.0.3]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    4.9.0;4.9.2:
+      config:
+        restage: stable
+        build_requires: [gmp/5.1.1, mpfr/3.1.2, mpc/1.0.2]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+    4.8.5:
+      config:
+        restage: stable
+        build_requires: [gmp/6.0.0, mpfr/3.1.3, mpc/1.0.3]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    4.7.4;4.8.2;4.8.3;4.8.4:
+      config:
+        restage: stable
+        build_requires: [gmp/5.1.1, mpfr/3.1.2, mpc/1.0.2]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
diff --git a/Programming/gcc/files/gcc-10.2.0-cpp-__has_include.patch b/Programming/gcc/files/gcc-10.2.0-cpp-__has_include.patch
deleted file mode 100644
index fa1fb8a..0000000
--- a/Programming/gcc/files/gcc-10.2.0-cpp-__has_include.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From b7bb13d4a5fcb593dc745ca3b6180f8babb54893 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tiziano.mueller@chem.uzh.ch>
-Date: Mon, 27 Jul 2020 15:40:38 +0200
-Subject: [PATCH] libcpp: fix __has_include handling with traditional-cpp
-
-fixes #95889
----
- libcpp/init.c        | 3 +++
- libcpp/traditional.c | 4 +++-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/libcpp/init.c b/libcpp/init.c
-index 0aac5acd0a35..b0cf71192589 100644
---- a/libcpp/init.c
-+++ b/libcpp/init.c
-@@ -400,6 +400,9 @@ static const struct builtin_macro builtin_array[] =
-   B("__LINE__",		 BT_SPECLINE,      true),
-   B("__INCLUDE_LEVEL__", BT_INCLUDE_LEVEL, true),
-   B("__COUNTER__",	 BT_COUNTER,       true),
-+  /* Make sure to update the list of built-in
-+     function-like macros in traditional.c:
-+     fun_like_macro() when adding more following */
-   B("__has_attribute",	 BT_HAS_ATTRIBUTE, true),
-   B("__has_cpp_attribute", BT_HAS_ATTRIBUTE, true),
-   B("__has_builtin",	 BT_HAS_BUILTIN,   true),
-diff --git a/libcpp/traditional.c b/libcpp/traditional.c
-index 77adb3bf595f..b087072c9b4c 100644
---- a/libcpp/traditional.c
-+++ b/libcpp/traditional.c
-@@ -330,7 +330,9 @@ fun_like_macro (cpp_hashnode *node)
- {
-   if (cpp_builtin_macro_p (node))
-     return (node->value.builtin == BT_HAS_ATTRIBUTE
--	    || node->value.builtin == BT_HAS_BUILTIN);
-+	    || node->value.builtin == BT_HAS_BUILTIN
-+	    || node->value.builtin == BT_HAS_INCLUDE
-+	    || node->value.builtin == BT_HAS_INCLUDE_NEXT);
-   return node->value.macro->fun_like;
- }
- 
diff --git a/Programming/gcc/files/variants.macos10.14 b/Programming/gcc/files/variants.macos10.14
deleted file mode 100644
index 93046f5..0000000
--- a/Programming/gcc/files/variants.macos10.14
+++ /dev/null
@@ -1,22 +0,0 @@
-gcc/4.7.4	stable		b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
-gcc/4.8.3	deprecated	b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
-gcc/4.8.4	deprecated	b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
-gcc/4.8.5	stable		b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3
-gcc/4.9.0	deprecated	b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
-gcc/4.9.2	deprecated	b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
-gcc/4.9.3	stable		b:gmp/6.1.0 b:mpfr/3.1.4 b:mpc/1.0.3
-gcc/4.9.4	stable		b:gmp/6.1.1 b:mpfr/3.1.4 b:mpc/1.0.3
-
-gcc/5.1.0	deprecated	b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
-gcc/5.2.0	deprecated	b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3
-gcc/5.3.0	stable		b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3
-gcc/5.4.0	stable		b:gmp/6.1.2 b:mpfr/3.1.5 b:mpc/1.0.3-2
-
-gcc/6.1.0	stable		b:gmp/6.1.0 b:mpfr/3.1.4 b:mpc/1.0.3
-gcc/6.2.0	stable		b:gmp/6.1.1 b:mpfr/3.1.4 b:mpc/1.0.3
-gcc/6.3.0	stable		b:gmp/6.1.2 b:mpfr/3.1.5 b:mpc/1.0.3-2
-
-gcc/7.3.0	stable		b:gmp/6.1.2 b:mpfr/4.0.0 b:mpc/1.1.0
-
-gcc/8.3.0	stable		b:gmp/6.1.2-1 b:mpfr/4.0.2 b:mpc/1.1.0-3
-
diff --git a/Programming/gcc/files/variants.rhel6 b/Programming/gcc/files/variants.rhel6
deleted file mode 100644
index 71f29c9..0000000
--- a/Programming/gcc/files/variants.rhel6
+++ /dev/null
@@ -1,50 +0,0 @@
-gcc/4.7.4	stable		b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
-gcc/4.8.2	stable		b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
-gcc/4.8.3	stable		b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
-gcc/4.8.4	stable		b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
-gcc/4.8.5	stable		b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3
-gcc/4.9.0	deprecated	b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
-gcc/4.9.2	stable		b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
-gcc/4.9.3	stable		b:gmp/6.1.0 b:mpfr/3.1.4 b:mpc/1.0.3
-gcc/4.9.4	stable		b:gmp/6.1.1 b:mpfr/3.1.4 b:mpc/1.0.3
-
-gcc/5.1.0	deprecated	b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
-gcc/5.2.0	deprecated	b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3
-gcc/5.3.0	stable		b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3
-gcc/5.4.0	stable		b:gmp/6.1.2 b:mpfr/3.1.5 b:mpc/1.0.3-2
-gcc/5.5.0	stable		b:gmp/6.1.2-1 b:mpfr/4.0.1 b:mpc/1.1.0-1
-
-gcc/6.1.0	stable		b:gmp/6.1.0 b:mpfr/3.1.4 b:mpc/1.0.3
-gcc/6.2.0	stable		b:gmp/6.1.1 b:mpfr/3.1.4 b:mpc/1.0.3
-gcc/6.3.0	stable		b:gmp/6.1.2 b:mpfr/3.1.5 b:mpc/1.0.3-2
-gcc/6.4.0	stable		b:gmp/6.1.2 b:mpfr/3.1.5 b:mpc/1.0.3
-gcc/6.5.0	stable		b:gmp/6.1.2-1 b:mpfr/4.0.1-1 b:mpc/1.1.0-2
-
-gcc/7.1.0	stable		b:gmp/6.1.2 b:mpfr/3.1.5 b:mpc/1.0.3
-gcc/7.2.0	stable		b:gmp/6.1.2 b:mpfr/3.1.5 b:mpc/1.0.3-2
-gcc/7.3.0	stable		b:gmp/6.1.2 b:mpfr/4.0.0 b:mpc/1.1.0
-gcc/7.4.0	stable		b:gmp/6.1.2-1 b:mpfr/4.0.1-1 b:mpc/1.1.0-2
-gcc/7.5.0	stable		b:gmp/6.2.0 b:mpfr/4.0.2-1 b:mpc/1.1.0-4
-
-gcc/8.1.0	stable		b:gmp/6.1.2 b:mpfr/4.0.1 b:mpc/1.1.0
-gcc/8.2.0	stable		b:gmp/6.1.2 b:mpfr/4.0.1 b:mpc/1.1.0
-gcc/8.3.0	stable		b:gmp/6.1.2-1 b:mpfr/4.0.2 b:mpc/1.1.0-3
-gcc/8.4.0	stable		b:gmp/6.2.0 b:mpfr/4.0.2-1 b:mpc/1.1.0-4
-
-gcc/9.1.0	stable		b:gmp/6.1.2-1 b:mpfr/4.0.2 b:mpc/1.1.0-3
-gcc/9.2.0	stable		b:gmp/6.1.2-1 b:mpfr/4.0.2 b:mpc/1.1.0-3 b:isl/0.21
-gcc/9.3.0	stable		b:gmp/6.2.0 b:mpfr/4.0.2-1 b:mpc/1.1.0-4
-
-gcc/10.1.0	stable		b:gmp/6.2.0 b:mpfr/4.0.2-1 b:mpc/1.1.0-4
-gcc/10.2.0	stable		b:gmp/6.2.0 b:mpfr/4.0.2-1 b:mpc/1.1.0-4
-gcc/10.3.0	stable		b:gmp/6.2.1 b:mpfr/4.1.0 b:mpc/1.2.1
-gcc/10.4.0	stable		b:gmp/6.2.1 b:mpfr/4.1.0 b:mpc/1.2.1
-
-gcc/11.2.0      stable          b:gcc/10.3.0 b:gmp/6.2.1 b:mpfr/4.1.0 b:mpc/1.2.1
-gcc/11.3.0	stable		b:gcc/10.3.0 b:gmp/6.2.1 b:mpfr/4.1.0 b:mpc/1.2.1
-gcc/11.4.0	stable		b:gcc/10.3.0 b:gmp/6.2.1 b:mpfr/4.2.0 b:mpc/1.3.1
-
-gcc/12.1.0	stable		b:gcc/11.3.0 b:gmp/6.2.1 b:mpfr/4.1.0 b:mpc/1.2.1
-gcc/12.3.0	stable		b:gcc/10.3.0 b:gmp/6.2.1 b:mpfr/4.2.0 b:mpc/1.3.1
-
-gcc/13.1.0	stable		b:gcc/10.4.0 b:gmp/6.2.1 b:mpfr/4.2.0 b:mpc/1.3.1
diff --git a/Programming/gcc/files/variants.yaml b/Programming/gcc/files/variants.yaml
deleted file mode 100644
index 60b14e2..0000000
--- a/Programming/gcc/files/variants.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-overlay: base
-relstage: stable
-gcc/4.7.4:
-  - dependencies: b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
-
-gcc/4.8.5:
-  - dependencies: b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3
-
-gcc/4.9.4:
-  - dependencies: b:gmp/6.1.1 b:mpfr/3.1.4 b:mpc/1.0.3
-
-gcc/5.5.0:
-  - dependencies: b:gmp/6.1.2-1 b:mpfr/4.0.1 b:mpc/1.1.0-1
-
-gcc/6.5.0:
-  - dependencies: b:gmp/6.1.2-1 b:mpfr/4.0.1-1 b:mpc/1.1.0-2
-
-gcc/7.5.0:
-  - dependencies: b:gmp/6.2.0 b:mpfr/4.0.2-1 b:mpc/1.1.0-4
-
-gcc/8.4.0:
-  - dependencies: b:gmp/6.2.0 b:mpfr/4.0.2-1 b:mpc/1.1.0-4
-gcc/8.5.0:
-  - dependencies: b:gcc/7.5.0 b:gmp/6.2.1 b:mpfr/4.1.0 b:mpc/1.2.1
-
-gcc/9.3.0:
-  - dependencies: b:gmp/6.2.0 b:mpfr/4.0.2-1 b:mpc/1.1.0-4
-gcc/9.5.0:
-  - dependencies: b:gcc/8.5.0 b:gmp/6.2.1 b:mpfr/4.1.0 b:mpc/1.2.1 
-gcc/10.3.0:
-  - dependencies: b:gmp/6.2.1 b:mpfr/4.1.0 b:mpc/1.2.1
-
-gcc/11.2.0:
-  - dependencies: b:gcc/10.3.0 b:gmp/6.2.1 b:mpfr/4.1.0 b:mpc/1.2.1
-gcc/11.3.0:
-  - dependencies: b:gcc/10.3.0 b:gmp/6.2.1 b:mpfr/4.1.0 b:mpc/1.2.1
-
-gcc/12.1.0:
-  - dependencies: b:gcc/11.3.0 b:gmp/6.2.1 b:mpfr/4.1.0 b:mpc/1.2.1