From 7227ad6abbf0ba9a67c385b1b5eb97acb746e245 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Thu, 2 Jun 2022 07:54:04 +0200
Subject: moved around some rust bootstrapping packages to disabled

---
 build-support/disabled/rust140/PKGBUILD            | 232 +++++++++++++++++++++
 build-support/disabled/rust140/config.toml.patch   | Bin 0 -> 660 bytes
 build-support/disabled/rust140/watcher.sh          |  27 +++
 build-support/disabled/rust141/PKGBUILD            | 218 +++++++++++++++++++
 build-support/disabled/rust141/config.toml.patch   | Bin 0 -> 660 bytes
 .../rust141/rustc-1.41.0-src-typenum-U1024.patch   | Bin 0 -> 4069 bytes
 build-support/disabled/rust148/PKGBUILD            | 203 ++++++++++++++++++
 build-support/disabled/rust148/config.toml.patch   | Bin 0 -> 660 bytes
 build-support/disabled/rust157-bin/PKGBUILD        |  37 ++++
 build-support/disabled/rust159-bin/PKGBUILD        |  37 ++++
 build-support/rust140/PKGBUILD                     | 232 ---------------------
 build-support/rust140/config.toml.patch            | Bin 660 -> 0 bytes
 build-support/rust140/watcher.sh                   |  27 ---
 build-support/rust141/PKGBUILD                     | 218 -------------------
 build-support/rust141/config.toml.patch            | Bin 660 -> 0 bytes
 .../rust141/rustc-1.41.0-src-typenum-U1024.patch   | Bin 4069 -> 0 bytes
 build-support/rust148/PKGBUILD                     | 203 ------------------
 build-support/rust148/config.toml.patch            | Bin 660 -> 0 bytes
 build-support/rust157-bin/PKGBUILD                 |  37 ----
 build-support/rust159-bin/PKGBUILD                 |  37 ----
 20 files changed, 754 insertions(+), 754 deletions(-)
 create mode 100644 build-support/disabled/rust140/PKGBUILD
 create mode 100644 build-support/disabled/rust140/config.toml.patch
 create mode 100755 build-support/disabled/rust140/watcher.sh
 create mode 100644 build-support/disabled/rust141/PKGBUILD
 create mode 100644 build-support/disabled/rust141/config.toml.patch
 create mode 100644 build-support/disabled/rust141/rustc-1.41.0-src-typenum-U1024.patch
 create mode 100644 build-support/disabled/rust148/PKGBUILD
 create mode 100644 build-support/disabled/rust148/config.toml.patch
 create mode 100644 build-support/disabled/rust157-bin/PKGBUILD
 create mode 100644 build-support/disabled/rust159-bin/PKGBUILD
 delete mode 100644 build-support/rust140/PKGBUILD
 delete mode 100644 build-support/rust140/config.toml.patch
 delete mode 100755 build-support/rust140/watcher.sh
 delete mode 100644 build-support/rust141/PKGBUILD
 delete mode 100644 build-support/rust141/config.toml.patch
 delete mode 100644 build-support/rust141/rustc-1.41.0-src-typenum-U1024.patch
 delete mode 100644 build-support/rust148/PKGBUILD
 delete mode 100644 build-support/rust148/config.toml.patch
 delete mode 100644 build-support/rust157-bin/PKGBUILD
 delete mode 100644 build-support/rust159-bin/PKGBUILD

(limited to 'build-support')

diff --git a/build-support/disabled/rust140/PKGBUILD b/build-support/disabled/rust140/PKGBUILD
new file mode 100644
index 00000000..6d05c3a7
--- /dev/null
+++ b/build-support/disabled/rust140/PKGBUILD
@@ -0,0 +1,232 @@
+# Maintainer: Johannes Löthberg <johannes@kyriasis.com>
+# Contributor: Alexander F Rødseth <xyproto@archlinux.org>
+# Contributor: Daniel Micay <danielmicay@gmail.com>
+# Contributor: userwithuid <userwithuid@gmail.com>
+
+pkgname=('rust140' 'rust140-docs')
+epoch=1
+pkgver=1.40.0
+pkgrel=1
+
+_llvm_ver=9.0.1
+
+pkgdesc='Systems programming language focused on safety, speed and concurrency'
+url='https://www.rust-lang.org/'
+arch=(i486 i686 pentium4 'x86_64')
+license=('MIT' 'Apache')
+
+makedepends=('rust=1:1.39.0' "llvm=$_llvm_ver" 'libffi' 'perl' 'python' 'curl' 'cmake')
+checkdepends=('procps-ng' 'gdb')
+
+options=('!emptydirs')
+
+source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc}
+        "https://github.com/llvm/llvm-project/releases/download/llvmorg-$_llvm_ver/compiler-rt-$_llvm_ver.src.tar.xz"{,.sig})
+
+sha256sums=('d2e8f931d16a0539faaaacd801e0d92c58df190269014b2360c6ab2a90ee3475'
+            'SKIP'
+            'c2bfab95c9986318318363d7f371a85a95e333bc0b34fbfa52edbd3f5e3a9077'
+            'SKIP')
+validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE'  # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org>
+              '474E22316ABF4785A88C6E8EA2C794A986419D8A'  # Tom Stellard <tstellar@redhat.com>
+              'B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans@chromium.org>
+
+prepare() {
+  cd "rustc-$pkgver-src"
+
+  cat >config.toml <<END
+[llvm]
+link-shared = true
+
+[build]
+target = ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu"]
+cargo = "/usr/bin/cargo"
+rustc = "/usr/bin/rustc"
+python = "/usr/bin/python"
+extended = true
+sanitizers = false
+profiler = true
+vendor = true
+
+[install]
+prefix = "/usr"
+
+[rust]
+# LLVM crashes when passing an object through ThinLTO twice.  This is triggered when using rust
+# code in cross-language LTO if libstd was built using ThinLTO.
+# http://blog.llvm.org/2019/09/closing-gap-cross-language-lto-between.html
+# https://github.com/rust-lang/rust/issues/54872
+codegen-units-std = 1
+
+debuginfo-level = 2
+
+channel = "stable"
+
+rpath = false
+
+[target.x86_64-unknown-linux-gnu]
+llvm-config = "/usr/bin/llvm-config"
+END
+}
+
+build() {
+  cd "rustc-$pkgver-src"
+
+  export RUST_BACKTRACE=1
+  export RUST_COMPILER_RT_ROOT="$srcdir/compiler-rt-$_llvm_ver.src"
+
+  python ./x.py dist -j "$(nproc)"
+  DESTDIR="$PWD"/dest-rust python ./x.py install -j "$(nproc)"
+
+  # move docs and lib32 libs out of the way for splitting
+  mv dest-rust/usr/lib/rustlib/i686-unknown-linux-gnu dest-i686
+  mv dest-rust/usr/share/doc dest-doc
+}
+
+package_rust140() {
+  depends=('gcc-libs' 'llvm-libs' 'curl' 'libssh2')
+  optdepends=('lldb: rust-lldb script'
+              'gdb: rust-gdb script')
+  provides=('cargo' 'rustfmt')
+  conflicts=('cargo' 'rustfmt')
+  replaces=('cargo' 'rustfmt')
+
+  cd "rustc-$pkgver-src"
+
+  mv dest-rust/* "$pkgdir"
+  install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE*
+
+  # delete unnecesary files, e.g. components and manifest files only used for the uninstall script
+  cd "$pkgdir"/usr/lib/rustlib
+  rm components install.log manifest-* rust-installer-version uninstall.sh
+
+  # rustbuild always installs copies of the shared libraries to /usr/lib,
+  # overwrite them with symlinks to the per-architecture versions
+  ln -srft "$pkgdir"/usr/lib x86_64-unknown-linux-gnu/lib/*.so
+
+  install -d "$pkgdir"/usr/share/bash-completion
+  mv "$pkgdir"/etc/bash_completion.d/ "$pkgdir"/usr/share/bash-completion/completions/
+}
+
+package_lib32-rust-libs() {
+  descriptino=('32-bit libraries for Rust')
+  depends=('lib32-gcc-libs')
+  provides=('lib32-rust')
+  conflicts=('lib32-rust')
+  replaces=('lib32-rust')
+
+  cd "rustc-$pkgver-src"
+  install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE*
+
+  install -d "$pkgdir"/usr/lib/rustlib/ "$pkgdir"/usr/lib32/
+  mv dest-i686 "$pkgdir"/usr/lib/rustlib/i686-unknown-linux-gnu
+  ln -srft "$pkgdir"/usr/lib32 "$pkgdir"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/*.so
+}
+
+package_rust140-docs() {
+  description=('Documentation for the Rust programming language')
+
+  cd "rustc-$pkgver-src"
+  install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE*
+
+  install -d "$pkgdir"/usr/share/doc
+  mv dest-doc/* "$pkgdir"/usr/share/doc
+}
+
+# vim:set ts=2 sw=2 et:
+# enable i686-unknown-linux-gnu target
+# and replace pentium4 (SSE2) with pentium3 (no SSE2) in the compiler spec file
+#
+# Also trying to reduce memory usage by building with
+# -debuginfo-level-std=1
+# see https://github.com/rust-lang/rust/issues/60294
+
+source+=(config.toml.patch)
+sha256sums+=('42e861ba90335d0e2e666e10b12d9ff85ea1bdb711176fb3c09e92375e193660')
+
+eval "$(
+  declare -f prepare | \
+    sed '
+      $ i patch -p1 -i "$srcdir/config.toml.patch"
+    '
+)"
+
+# stop insanity of nproc (see FS#62952)
+eval "$(
+  declare -f build | \
+    sed '
+      s/-j"$(nproc)"/-j16/
+    '
+)"
+
+if [ "${CARCH}" != 'pentium4' ]; then
+  eval "$(
+    declare -f prepare | \
+      sed '
+        $ i sed -i "s/pentium4/pentium3/g" "$srcdir/rustc-$pkgver-src/vendor/rustc-ap-rustc_target/spec/i686_unknown_linux_gnu.rs"
+        $ i sed -i "s/pentium4/pentium3/g" "$srcdir/rustc-$pkgver-src/src/librustc_target/spec/i686_unknown_linux_gnu.rs"
+        $ i sed -i "s/a75a6025d7e3424edf9baf3039056c0f8eea157631a175d00ac5a218aa54b510/484bf8be15015b330fa9a97b6dabb8c7627e59d5cddb2dd0e83478749f8aabad/g" "$srcdir/rustc-$pkgver-src/vendor/rustc-ap-rustc_target/.cargo-checksum.json"
+      '
+  )"
+fi
+
+# Don't move lib32 support into rust32-lib, we are on 32-bit in the end
+# and don't draw a symlink to 64-bit libraries (but to 32-bit instead)
+
+pkgname=(
+  $(
+    printf '%s\n' "${pkgname[@]}" | \
+      grep -v '^lib32-rust-libs'
+  )
+)
+
+eval "$(
+  declare -f package_rust140 | \
+    sed '
+      /mv.*i686-unknown-linux-gnu.*/d
+      /ln /s/x86_64-unknown-linux-gnu/i686-unknown-linux-gnu/g
+    '
+)"
+
+eval "$(
+  declare -f build | \
+    sed '
+      /mv.*i686-unknown-linux-gnu.*/d
+      /ln /s/x86_64-unknown-linux-gnu/i686-unknown-linux-gnu/g
+    '
+)"
+
+# watch for files changing which need patching during the x.py craziness!
+# currently this is duplicate U1024 and P1024 types (this is currently needed
+# for i686 and 1.38.0)
+source+=('watcher.sh')
+sha256sums+=('c91b55a428ef463fc1529724da0c7f3930bd9d4b32b4596a14be77cc3f1e0594')
+
+if [ "${CARCH}" = "i686" ]; then
+  makedepends+=('inotify-tools' 'procps-ng')
+  
+  eval "$(
+    declare -f build | \
+      sed '
+        /\.\/x.py/ i \
+          chmod u+x "$srcdir/watcher.sh" \
+          "$srcdir/watcher.sh" "$srcdir" & \
+          _kill_pid=$! \
+           sleep 10
+        /\.\/x.py/ a \
+          kill $_kill_pid || true
+      '
+  )"
+fi
+
+# Enable on demand, if your previous rust is broken, see also build-support and AUR
+# for rust-bin.
+#makedepends=(${makedepends[@]//rust/})
+#makedepends+=('rust-bin')
+sha256sums=('dd97005578defc10a482bff3e4e728350d2099c60ffcf1f5e189540c39a549ad'
+            'SKIP'
+            'c2bfab95c9986318318363d7f371a85a95e333bc0b34fbfa52edbd3f5e3a9077'
+            'SKIP'
+            '42e861ba90335d0e2e666e10b12d9ff85ea1bdb711176fb3c09e92375e193660'
+            'c91b55a428ef463fc1529724da0c7f3930bd9d4b32b4596a14be77cc3f1e0594')
+groups+=(build-shims)
diff --git a/build-support/disabled/rust140/config.toml.patch b/build-support/disabled/rust140/config.toml.patch
new file mode 100644
index 00000000..8d0762cd
Binary files /dev/null and b/build-support/disabled/rust140/config.toml.patch differ
diff --git a/build-support/disabled/rust140/watcher.sh b/build-support/disabled/rust140/watcher.sh
new file mode 100755
index 00000000..98228b5d
--- /dev/null
+++ b/build-support/disabled/rust140/watcher.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+term() {
+  echo "--> Got SIGTERM"
+  echo "--> killing inotifywait with PID $inotifywait"
+  kill -TERM "$inotifywait"
+  sleep 10
+  kill -9 "$inotifywait"
+}
+
+srcdir="$1"
+
+trap term SIGTERM
+
+inotifywait -mr -e close_write --format %w%f $srcdir | while read -r FILE; do
+  case "$FILE" in
+    *consts.rs)
+      echo "--> patching $FILE"
+      sed -i '/pub type U1024/d;/pub type P1024/d' $FILE
+      echo "--> finished patching $FILE"
+      ;;
+  esac
+done &
+inotifywait=$(ps -ef | grep inotifywait | grep -v grep | tr -s ' ' | cut -d ' ' -f2)
+echo "--> waiting for inotifywait $inotifywait"
+wait "$inotifywait"
+echo "--> watcher terminated"
diff --git a/build-support/disabled/rust141/PKGBUILD b/build-support/disabled/rust141/PKGBUILD
new file mode 100644
index 00000000..afa6ad96
--- /dev/null
+++ b/build-support/disabled/rust141/PKGBUILD
@@ -0,0 +1,218 @@
+# Maintainer: Johannes Löthberg <johannes@kyriasis.com>
+# Contributor: Alexander F Rødseth <xyproto@archlinux.org>
+# Contributor: Daniel Micay <danielmicay@gmail.com>
+# Contributor: userwithuid <userwithuid@gmail.com>
+
+pkgname=('rust141' 'rust141-docs')
+epoch=1
+pkgver=1.41.0
+pkgrel=1
+
+_llvm_ver=9.0.1
+
+pkgdesc='Systems programming language focused on safety, speed and concurrency'
+url='https://www.rust-lang.org/'
+arch=(i486 i686 pentium4 'x86_64')
+license=('MIT' 'Apache')
+
+makedepends=('rust140' "llvm=$_llvm_ver" 'libffi' 'perl' 'python' 'curl' 'cmake')
+checkdepends=('procps-ng' 'gdb')
+
+options=('!emptydirs')
+
+source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc}
+        "https://github.com/llvm/llvm-project/releases/download/llvmorg-$_llvm_ver/compiler-rt-$_llvm_ver.src.tar.xz"{,.sig})
+
+sha256sums=('5546822c09944c4d847968e9b7b3d0e299f143f307c00fa40e84a99fabf8d74b'
+            'SKIP'
+            'c2bfab95c9986318318363d7f371a85a95e333bc0b34fbfa52edbd3f5e3a9077'
+            'SKIP')
+validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE'  # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org>
+              '474E22316ABF4785A88C6E8EA2C794A986419D8A'  # Tom Stellard <tstellar@redhat.com>
+              'B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans@chromium.org>
+
+prepare() {
+  cd "rustc-$pkgver-src"
+
+  cat >config.toml <<END
+[llvm]
+link-shared = true
+
+[build]
+target = ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu"]
+cargo = "/usr/bin/cargo"
+rustc = "/usr/bin/rustc"
+python = "/usr/bin/python"
+extended = true
+sanitizers = false
+profiler = true
+vendor = true
+
+[install]
+prefix = "/usr"
+
+[rust]
+# LLVM crashes when passing an object through ThinLTO twice.  This is triggered when using rust
+# code in cross-language LTO if libstd was built using ThinLTO.
+# http://blog.llvm.org/2019/09/closing-gap-cross-language-lto-between.html
+# https://github.com/rust-lang/rust/issues/54872
+codegen-units-std = 1
+
+debuginfo-level = 2
+
+channel = "stable"
+
+rpath = false
+
+[target.x86_64-unknown-linux-gnu]
+llvm-config = "/usr/bin/llvm-config"
+END
+}
+
+build() {
+  cd "rustc-$pkgver-src"
+
+  export RUST_BACKTRACE=1
+  export RUST_COMPILER_RT_ROOT="$srcdir/compiler-rt-$_llvm_ver.src"
+
+  python ./x.py dist -j "$(nproc)"
+  DESTDIR="$PWD"/dest-rust python ./x.py install -j "$(nproc)"
+
+  # move docs and lib32 libs out of the way for splitting
+  mv dest-rust/usr/lib/rustlib/i686-unknown-linux-gnu dest-i686
+  mv dest-rust/usr/share/doc dest-doc
+}
+
+package_rust141() {
+  depends=('gcc-libs' 'llvm-libs' 'curl' 'libssh2')
+  optdepends=('lldb: rust-lldb script'
+              'gdb: rust-gdb script')
+  provides=('cargo' 'rustfmt')
+  conflicts=('cargo' 'rustfmt')
+  replaces=('cargo' 'rustfmt')
+
+  cd "rustc-$pkgver-src"
+
+  mv dest-rust/* "$pkgdir"
+  install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE*
+
+  # delete unnecesary files, e.g. components and manifest files only used for the uninstall script
+  cd "$pkgdir"/usr/lib/rustlib
+  rm components install.log manifest-* rust-installer-version uninstall.sh
+
+  # rustbuild always installs copies of the shared libraries to /usr/lib,
+  # overwrite them with symlinks to the per-architecture versions
+  ln -srft "$pkgdir"/usr/lib x86_64-unknown-linux-gnu/lib/*.so
+
+  install -d "$pkgdir"/usr/share/bash-completion
+  mv "$pkgdir"/etc/bash_completion.d/ "$pkgdir"/usr/share/bash-completion/completions/
+}
+
+package_lib32-rust-libs() {
+  descriptino=('32-bit libraries for Rust')
+  depends=('lib32-gcc-libs')
+  provides=('lib32-rust')
+  conflicts=('lib32-rust')
+  replaces=('lib32-rust')
+
+  cd "rustc-$pkgver-src"
+  install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE*
+
+  install -d "$pkgdir"/usr/lib/rustlib/ "$pkgdir"/usr/lib32/
+  mv dest-i686 "$pkgdir"/usr/lib/rustlib/i686-unknown-linux-gnu
+  ln -srft "$pkgdir"/usr/lib32 "$pkgdir"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/*.so
+}
+
+package_rust141-docs() {
+  description=('Documentation for the Rust programming language')
+
+  cd "rustc-$pkgver-src"
+  install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE*
+
+  install -d "$pkgdir"/usr/share/doc
+  mv dest-doc/* "$pkgdir"/usr/share/doc
+}
+
+# vim:set ts=2 sw=2 et:
+# enable i686-unknown-linux-gnu target
+# and replace pentium4 (SSE2) with pentium3 (no SSE2) in the compiler spec file
+#
+# Also trying to reduce memory usage by building with
+# -debuginfo-level-std=1
+# see https://github.com/rust-lang/rust/issues/60294
+
+source+=(config.toml.patch)
+sha256sums+=('42e861ba90335d0e2e666e10b12d9ff85ea1bdb711176fb3c09e92375e193660')
+
+eval "$(
+  declare -f prepare | \
+    sed '
+      $ i patch -p1 -i "$srcdir/config.toml.patch"
+    '
+)"
+
+# stop insanity of nproc (see FS#62952)
+eval "$(
+  declare -f build | \
+    sed '
+      s/-j"$(nproc)"/-j16/
+    '
+)"
+
+if [ "${CARCH}" != 'pentium4' ]; then
+  eval "$(
+    declare -f prepare | \
+      sed '
+        $ i sed -i "s/pentium4/pentium3/g" "$srcdir/rustc-$pkgver-src/vendor/rustc-ap-rustc_target/spec/i686_unknown_linux_gnu.rs"
+        $ i sed -i "s/pentium4/pentium3/g" "$srcdir/rustc-$pkgver-src/src/librustc_target/spec/i686_unknown_linux_gnu.rs"
+        $ i sed -i "s/a75a6025d7e3424edf9baf3039056c0f8eea157631a175d00ac5a218aa54b510/484bf8be15015b330fa9a97b6dabb8c7627e59d5cddb2dd0e83478749f8aabad/g" "$srcdir/rustc-$pkgver-src/vendor/rustc-ap-rustc_target/.cargo-checksum.json"
+      '
+  )"
+fi
+
+# Don't move lib32 support into rust32-lib, we are on 32-bit in the end
+# and don't draw a symlink to 64-bit libraries (but to 32-bit instead)
+
+pkgname=(
+  $(
+    printf '%s\n' "${pkgname[@]}" | \
+      grep -v '^lib32-rust-libs'
+  )
+)
+
+eval "$(
+  declare -f package_rust141 | \
+    sed '
+      /mv.*i686-unknown-linux-gnu.*/d
+      /ln /s/x86_64-unknown-linux-gnu/i686-unknown-linux-gnu/g
+    '
+)"
+
+eval "$(
+  declare -f build | \
+    sed '
+      /mv.*i686-unknown-linux-gnu.*/d
+      /ln /s/x86_64-unknown-linux-gnu/i686-unknown-linux-gnu/g
+    '
+)"
+
+# work around P1024, U1024 typenum bug for old rust releases (bundled
+# typenum version contains a buggy version)
+if [ "${CARCH}" = "i686" ]; then
+  source+=('rustc-1.41.0-src-typenum-U1024.patch')
+  sha256sums+=('5e5ff622332c9f3fc00ef200d2d14de00e8973ea09a35cd42631ac46264a358a')
+  eval "$(
+    declare -f prepare | \
+      sed '
+        /}/ i \
+          patch -Np1 < "$srcdir/rustc-1.41.0-src-typenum-U1024.patch"
+      '
+  )"
+
+fi
+
+# Enable on demand, if your previous rust is broken, see also build-support and AUR
+# for rust-bin.
+#makedepends=(${makedepends[@]//rust/})
+#makedepends+=('rust-bin')
+groups+=(build-shims)
diff --git a/build-support/disabled/rust141/config.toml.patch b/build-support/disabled/rust141/config.toml.patch
new file mode 100644
index 00000000..8d0762cd
Binary files /dev/null and b/build-support/disabled/rust141/config.toml.patch differ
diff --git a/build-support/disabled/rust141/rustc-1.41.0-src-typenum-U1024.patch b/build-support/disabled/rust141/rustc-1.41.0-src-typenum-U1024.patch
new file mode 100644
index 00000000..d1484d5c
Binary files /dev/null and b/build-support/disabled/rust141/rustc-1.41.0-src-typenum-U1024.patch differ
diff --git a/build-support/disabled/rust148/PKGBUILD b/build-support/disabled/rust148/PKGBUILD
new file mode 100644
index 00000000..9ed1cba8
--- /dev/null
+++ b/build-support/disabled/rust148/PKGBUILD
@@ -0,0 +1,203 @@
+# Maintainer: Johannes Löthberg <johannes@kyriasis.com>
+# Contributor: Alexander F Rødseth <xyproto@archlinux.org>
+# Contributor: Daniel Micay <danielmicay@gmail.com>
+# Contributor: userwithuid <userwithuid@gmail.com>
+
+pkgname=('rust148' 'rust148-docs')
+epoch=1
+pkgver=1.48.0
+pkgrel=1
+
+_llvm_ver=11.0.0
+
+pkgdesc='Systems programming language focused on safety, speed and concurrency'
+url='https://www.rust-lang.org/'
+arch=(i486 i686 pentium4 'x86_64')
+license=('MIT' 'Apache')
+
+makedepends=('rust=1:1.47.0' "llvm10-libs" "llvm=$_llvm_ver" 'libffi' 'perl' 'python' 'curl' 'cmake')
+checkdepends=('procps-ng' 'gdb')
+
+options=('!emptydirs')
+
+source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc}
+        "https://github.com/llvm/llvm-project/releases/download/llvmorg-$_llvm_ver/compiler-rt-$_llvm_ver.src.tar.xz"{,.sig})
+
+sha256sums=('0e763e6db47d5d6f91583284d2f989eacc49b84794d1443355b85c58d67ae43b'
+            'SKIP'
+            '374aff82ff573a449f9aabbd330a5d0a441181c535a3599996127378112db234'
+            'SKIP')
+validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE'  # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org>
+              '474E22316ABF4785A88C6E8EA2C794A986419D8A'  # Tom Stellard <tstellar@redhat.com>
+              'B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans@chromium.org>
+
+prepare() {
+  cd "rustc-$pkgver-src"
+
+  cat >config.toml <<END
+[llvm]
+link-shared = true
+
+[build]
+target = ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu"]
+cargo = "/usr/bin/cargo"
+rustc = "/usr/bin/rustc"
+python = "/usr/bin/python"
+extended = true
+sanitizers = false
+profiler = true
+vendor = true
+
+[install]
+prefix = "/usr"
+
+[rust]
+# LLVM crashes when passing an object through ThinLTO twice.  This is triggered when using rust
+# code in cross-language LTO if libstd was built using ThinLTO.
+# http://blog.llvm.org/2019/09/closing-gap-cross-language-lto-between.html
+# https://github.com/rust-lang/rust/issues/54872
+codegen-units-std = 1
+
+debuginfo-level = 2
+
+channel = "stable"
+
+rpath = false
+
+[target.x86_64-unknown-linux-gnu]
+llvm-config = "/usr/bin/llvm-config"
+END
+}
+
+build() {
+  cd "rustc-$pkgver-src"
+
+  export RUST_BACKTRACE=1
+  export RUST_COMPILER_RT_ROOT="$srcdir/compiler-rt-$_llvm_ver.src"
+
+  python ./x.py dist -j "$(nproc)"
+  DESTDIR="$PWD"/dest-rust python ./x.py install -j "$(nproc)"
+
+  # move docs and lib32 libs out of the way for splitting
+  mv dest-rust/usr/lib/rustlib/i686-unknown-linux-gnu dest-i686
+  mv dest-rust/usr/share/doc dest-doc
+}
+
+package_rust148() {
+  depends=('gcc-libs' 'llvm-libs' 'curl' 'libssh2')
+  optdepends=('lldb: rust-lldb script'
+              'gdb: rust-gdb script')
+  provides=('cargo' 'rustfmt')
+  conflicts=('cargo' 'rustfmt')
+  replaces=('cargo' 'rustfmt')
+
+  cd "rustc-$pkgver-src"
+
+  mv dest-rust/* "$pkgdir"
+  install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE*
+
+  # delete unnecesary files, e.g. components and manifest files only used for the uninstall script
+  cd "$pkgdir"/usr/lib/rustlib
+  rm components install.log manifest-* rust-installer-version uninstall.sh
+
+  # rustbuild always installs copies of the shared libraries to /usr/lib,
+  # overwrite them with symlinks to the per-architecture versions
+  ln -srft "$pkgdir"/usr/lib x86_64-unknown-linux-gnu/lib/*.so
+
+  install -d "$pkgdir"/usr/share/bash-completion
+  mv "$pkgdir"/etc/bash_completion.d/ "$pkgdir"/usr/share/bash-completion/completions/
+}
+
+package_lib32-rust-libs() {
+  descriptino=('32-bit libraries for Rust')
+  depends=('lib32-gcc-libs')
+  provides=('lib32-rust')
+  conflicts=('lib32-rust')
+  replaces=('lib32-rust')
+
+  cd "rustc-$pkgver-src"
+  install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE*
+
+  install -d "$pkgdir"/usr/lib/rustlib/ "$pkgdir"/usr/lib32/
+  mv dest-i686 "$pkgdir"/usr/lib/rustlib/i686-unknown-linux-gnu
+  ln -srft "$pkgdir"/usr/lib32 "$pkgdir"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/*.so
+}
+
+package_rust148-docs() {
+  description=('Documentation for the Rust programming language')
+
+  cd "rustc-$pkgver-src"
+  install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE*
+
+  install -d "$pkgdir"/usr/share/doc
+  mv dest-doc/* "$pkgdir"/usr/share/doc
+}
+
+# vim:set ts=2 sw=2 et:
+# enable i686-unknown-linux-gnu target
+# and replace pentium4 (SSE2) with pentium3 (no SSE2) in the compiler spec file
+#
+# Also trying to reduce memory usage by building with
+# -debuginfo-level-std=1
+# see https://github.com/rust-lang/rust/issues/60294
+
+source+=(config.toml.patch)
+sha256sums+=('42e861ba90335d0e2e666e10b12d9ff85ea1bdb711176fb3c09e92375e193660')
+
+eval "$(
+  declare -f prepare | \
+    sed '
+      $ i patch -p1 -i "$srcdir/config.toml.patch"
+    '
+)"
+
+# stop insanity of nproc (see FS#62952)
+eval "$(
+  declare -f build | \
+    sed '
+      s/-j"$(nproc)"/-j16/
+    '
+)"
+
+if [ "${CARCH}" != 'pentium4' ]; then
+  eval "$(
+    declare -f prepare | \
+      sed '
+        $ i sed -i "s/pentium4/pentium3/g" "$srcdir/rustc-$pkgver-src/vendor/rustc-ap-rustc_target/src/spec/i686_unknown_linux_gnu.rs"
+        $ i sed -i "s/pentium4/pentium3/g" "$srcdir/rustc-$pkgver-src/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs"
+        $ i sed -i "s/30f6a25d37d536c5734b9a7e1e9cc34167a013c5e0c49c3fe0a26d76f2e1ae6c/412f837953e4cc32ff14195bf2da7eb61cb43d602fdc2db1099997d906070521/g" "$srcdir/rustc-$pkgver-src/vendor/rustc-ap-rustc_target/.cargo-checksum.json"
+      '
+  )"
+fi
+
+# Don't move lib32 support into rust32-lib, we are on 32-bit in the end
+# and don't draw a symlink to 64-bit libraries (but to 32-bit instead)
+
+pkgname=(
+  $(
+    printf '%s\n' "${pkgname[@]}" | \
+      grep -v '^lib32-rust-libs'
+  )
+)
+
+eval "$(
+  declare -f package_rust148 | \
+    sed '
+      /mv.*i686-unknown-linux-gnu.*/d
+      /ln /s/x86_64-unknown-linux-gnu/i686-unknown-linux-gnu/g
+    '
+)"
+
+eval "$(
+  declare -f build | \
+    sed '
+      /mv.*i686-unknown-linux-gnu.*/d
+      /ln /s/x86_64-unknown-linux-gnu/i686-unknown-linux-gnu/g
+    '
+)"
+
+# Enable on demand, if your previous rust is broken, see also build-support and AUR
+# for rust-bin.
+#makedepends=(${makedepends[@]//rust/})
+#makedepends+=('rust-bin')
+groups+=(build-shims)
diff --git a/build-support/disabled/rust148/config.toml.patch b/build-support/disabled/rust148/config.toml.patch
new file mode 100644
index 00000000..8d0762cd
Binary files /dev/null and b/build-support/disabled/rust148/config.toml.patch differ
diff --git a/build-support/disabled/rust157-bin/PKGBUILD b/build-support/disabled/rust157-bin/PKGBUILD
new file mode 100644
index 00000000..01f3e801
--- /dev/null
+++ b/build-support/disabled/rust157-bin/PKGBUILD
@@ -0,0 +1,37 @@
+# Maintainer: Andreas Baumann <mail@andreasbaumann.cc>
+
+pkgname=rust157-bin
+pkgver=1.57.0
+pkgrel=1
+pkgdesc='Binary precompiled packages for Rust'
+url='https://www.rust-lang.org/'
+arch=(x86_64 pentium4 i686)
+license=('MIT' 'Apache')
+provides=('rust' 'cargo')
+conflicts=('rust' 'cargo')
+options=('!emptydirs')
+
+source_x86_64=("https://static.rust-lang.org/dist/rust-$pkgver-x86_64-unknown-linux-gnu.tar.gz"{,.asc})
+source_pentium4=("https://static.rust-lang.org/dist/rust-$pkgver-i686-unknown-linux-gnu.tar.gz"{,.asc})
+source_i686=("https://static.rust-lang.org/dist/rust-$pkgver-i686-unknown-linux-gnu.tar.gz"{,.asc})
+
+sha256sums_x86_64=('ea0253784b2e5c22659ff148d492a68d2e11da734491714ebc61cc93896efcda'
+                   'SKIP')
+sha256sums_pentium4=('7e4ac8ca2874897099a3ceb89039ceee170f474a98ee247589fd6bca8dda7cfa'
+                     'SKIP')
+sha256sums_i686=('7e4ac8ca2874897099a3ceb89039ceee170f474a98ee247589fd6bca8dda7cfa'
+                 'SKIP')
+
+validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE'  # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org>
+              '474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstellar@redhat.com>
+
+case "${CARCH}" in
+  x86_64)               _ARCH='x86_64-unknown-linux-gnu';;
+  i686|pentium4)   _ARCH='i686-unknown-linux-gnu';;
+esac
+
+package() {
+  cd "rust-$pkgver-$_ARCH"
+
+  ./install.sh --prefix=/usr --destdir="$pkgdir"
+}
diff --git a/build-support/disabled/rust159-bin/PKGBUILD b/build-support/disabled/rust159-bin/PKGBUILD
new file mode 100644
index 00000000..205e3d61
--- /dev/null
+++ b/build-support/disabled/rust159-bin/PKGBUILD
@@ -0,0 +1,37 @@
+# Maintainer: Andreas Baumann <mail@andreasbaumann.cc>
+
+pkgname=rust159-bin
+pkgver=1.59.0
+pkgrel=1
+pkgdesc='Binary precompiled packages for Rust'
+url='https://www.rust-lang.org/'
+arch=(x86_64 pentium4 i686)
+license=('MIT' 'Apache')
+provides=('rust' 'cargo')
+conflicts=('rust' 'cargo')
+options=('!emptydirs')
+
+source_x86_64=("https://static.rust-lang.org/dist/rust-$pkgver-x86_64-unknown-linux-gnu.tar.gz"{,.asc})
+source_pentium4=("https://static.rust-lang.org/dist/rust-$pkgver-i686-unknown-linux-gnu.tar.gz"{,.asc})
+source_i686=("https://static.rust-lang.org/dist/rust-$pkgver-i686-unknown-linux-gnu.tar.gz"{,.asc})
+
+sha256sums_x86_64=('0c1c2da3fa26372e5178123aa5bb0fdcd4933fbad9bfb268ffbd71807182ecae'
+                   'SKIP')
+sha256sums_pentium4=('f57ebfafed1e857b2b1dc1a22cf1133766f68a0759dc2f717dec54a8d4385dec'
+                     'SKIP')
+sha256sums_i686=('f57ebfafed1e857b2b1dc1a22cf1133766f68a0759dc2f717dec54a8d4385dec'
+                 'SKIP')
+
+validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE'  # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org>
+              '474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstellar@redhat.com>
+
+case "${CARCH}" in
+  x86_64)               _ARCH='x86_64-unknown-linux-gnu';;
+  i686|pentium4)   _ARCH='i686-unknown-linux-gnu';;
+esac
+
+package() {
+  cd "rust-$pkgver-$_ARCH"
+
+  ./install.sh --prefix=/usr --destdir="$pkgdir"
+}
diff --git a/build-support/rust140/PKGBUILD b/build-support/rust140/PKGBUILD
deleted file mode 100644
index 6d05c3a7..00000000
--- a/build-support/rust140/PKGBUILD
+++ /dev/null
@@ -1,232 +0,0 @@
-# Maintainer: Johannes Löthberg <johannes@kyriasis.com>
-# Contributor: Alexander F Rødseth <xyproto@archlinux.org>
-# Contributor: Daniel Micay <danielmicay@gmail.com>
-# Contributor: userwithuid <userwithuid@gmail.com>
-
-pkgname=('rust140' 'rust140-docs')
-epoch=1
-pkgver=1.40.0
-pkgrel=1
-
-_llvm_ver=9.0.1
-
-pkgdesc='Systems programming language focused on safety, speed and concurrency'
-url='https://www.rust-lang.org/'
-arch=(i486 i686 pentium4 'x86_64')
-license=('MIT' 'Apache')
-
-makedepends=('rust=1:1.39.0' "llvm=$_llvm_ver" 'libffi' 'perl' 'python' 'curl' 'cmake')
-checkdepends=('procps-ng' 'gdb')
-
-options=('!emptydirs')
-
-source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc}
-        "https://github.com/llvm/llvm-project/releases/download/llvmorg-$_llvm_ver/compiler-rt-$_llvm_ver.src.tar.xz"{,.sig})
-
-sha256sums=('d2e8f931d16a0539faaaacd801e0d92c58df190269014b2360c6ab2a90ee3475'
-            'SKIP'
-            'c2bfab95c9986318318363d7f371a85a95e333bc0b34fbfa52edbd3f5e3a9077'
-            'SKIP')
-validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE'  # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org>
-              '474E22316ABF4785A88C6E8EA2C794A986419D8A'  # Tom Stellard <tstellar@redhat.com>
-              'B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans@chromium.org>
-
-prepare() {
-  cd "rustc-$pkgver-src"
-
-  cat >config.toml <<END
-[llvm]
-link-shared = true
-
-[build]
-target = ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu"]
-cargo = "/usr/bin/cargo"
-rustc = "/usr/bin/rustc"
-python = "/usr/bin/python"
-extended = true
-sanitizers = false
-profiler = true
-vendor = true
-
-[install]
-prefix = "/usr"
-
-[rust]
-# LLVM crashes when passing an object through ThinLTO twice.  This is triggered when using rust
-# code in cross-language LTO if libstd was built using ThinLTO.
-# http://blog.llvm.org/2019/09/closing-gap-cross-language-lto-between.html
-# https://github.com/rust-lang/rust/issues/54872
-codegen-units-std = 1
-
-debuginfo-level = 2
-
-channel = "stable"
-
-rpath = false
-
-[target.x86_64-unknown-linux-gnu]
-llvm-config = "/usr/bin/llvm-config"
-END
-}
-
-build() {
-  cd "rustc-$pkgver-src"
-
-  export RUST_BACKTRACE=1
-  export RUST_COMPILER_RT_ROOT="$srcdir/compiler-rt-$_llvm_ver.src"
-
-  python ./x.py dist -j "$(nproc)"
-  DESTDIR="$PWD"/dest-rust python ./x.py install -j "$(nproc)"
-
-  # move docs and lib32 libs out of the way for splitting
-  mv dest-rust/usr/lib/rustlib/i686-unknown-linux-gnu dest-i686
-  mv dest-rust/usr/share/doc dest-doc
-}
-
-package_rust140() {
-  depends=('gcc-libs' 'llvm-libs' 'curl' 'libssh2')
-  optdepends=('lldb: rust-lldb script'
-              'gdb: rust-gdb script')
-  provides=('cargo' 'rustfmt')
-  conflicts=('cargo' 'rustfmt')
-  replaces=('cargo' 'rustfmt')
-
-  cd "rustc-$pkgver-src"
-
-  mv dest-rust/* "$pkgdir"
-  install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE*
-
-  # delete unnecesary files, e.g. components and manifest files only used for the uninstall script
-  cd "$pkgdir"/usr/lib/rustlib
-  rm components install.log manifest-* rust-installer-version uninstall.sh
-
-  # rustbuild always installs copies of the shared libraries to /usr/lib,
-  # overwrite them with symlinks to the per-architecture versions
-  ln -srft "$pkgdir"/usr/lib x86_64-unknown-linux-gnu/lib/*.so
-
-  install -d "$pkgdir"/usr/share/bash-completion
-  mv "$pkgdir"/etc/bash_completion.d/ "$pkgdir"/usr/share/bash-completion/completions/
-}
-
-package_lib32-rust-libs() {
-  descriptino=('32-bit libraries for Rust')
-  depends=('lib32-gcc-libs')
-  provides=('lib32-rust')
-  conflicts=('lib32-rust')
-  replaces=('lib32-rust')
-
-  cd "rustc-$pkgver-src"
-  install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE*
-
-  install -d "$pkgdir"/usr/lib/rustlib/ "$pkgdir"/usr/lib32/
-  mv dest-i686 "$pkgdir"/usr/lib/rustlib/i686-unknown-linux-gnu
-  ln -srft "$pkgdir"/usr/lib32 "$pkgdir"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/*.so
-}
-
-package_rust140-docs() {
-  description=('Documentation for the Rust programming language')
-
-  cd "rustc-$pkgver-src"
-  install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE*
-
-  install -d "$pkgdir"/usr/share/doc
-  mv dest-doc/* "$pkgdir"/usr/share/doc
-}
-
-# vim:set ts=2 sw=2 et:
-# enable i686-unknown-linux-gnu target
-# and replace pentium4 (SSE2) with pentium3 (no SSE2) in the compiler spec file
-#
-# Also trying to reduce memory usage by building with
-# -debuginfo-level-std=1
-# see https://github.com/rust-lang/rust/issues/60294
-
-source+=(config.toml.patch)
-sha256sums+=('42e861ba90335d0e2e666e10b12d9ff85ea1bdb711176fb3c09e92375e193660')
-
-eval "$(
-  declare -f prepare | \
-    sed '
-      $ i patch -p1 -i "$srcdir/config.toml.patch"
-    '
-)"
-
-# stop insanity of nproc (see FS#62952)
-eval "$(
-  declare -f build | \
-    sed '
-      s/-j"$(nproc)"/-j16/
-    '
-)"
-
-if [ "${CARCH}" != 'pentium4' ]; then
-  eval "$(
-    declare -f prepare | \
-      sed '
-        $ i sed -i "s/pentium4/pentium3/g" "$srcdir/rustc-$pkgver-src/vendor/rustc-ap-rustc_target/spec/i686_unknown_linux_gnu.rs"
-        $ i sed -i "s/pentium4/pentium3/g" "$srcdir/rustc-$pkgver-src/src/librustc_target/spec/i686_unknown_linux_gnu.rs"
-        $ i sed -i "s/a75a6025d7e3424edf9baf3039056c0f8eea157631a175d00ac5a218aa54b510/484bf8be15015b330fa9a97b6dabb8c7627e59d5cddb2dd0e83478749f8aabad/g" "$srcdir/rustc-$pkgver-src/vendor/rustc-ap-rustc_target/.cargo-checksum.json"
-      '
-  )"
-fi
-
-# Don't move lib32 support into rust32-lib, we are on 32-bit in the end
-# and don't draw a symlink to 64-bit libraries (but to 32-bit instead)
-
-pkgname=(
-  $(
-    printf '%s\n' "${pkgname[@]}" | \
-      grep -v '^lib32-rust-libs'
-  )
-)
-
-eval "$(
-  declare -f package_rust140 | \
-    sed '
-      /mv.*i686-unknown-linux-gnu.*/d
-      /ln /s/x86_64-unknown-linux-gnu/i686-unknown-linux-gnu/g
-    '
-)"
-
-eval "$(
-  declare -f build | \
-    sed '
-      /mv.*i686-unknown-linux-gnu.*/d
-      /ln /s/x86_64-unknown-linux-gnu/i686-unknown-linux-gnu/g
-    '
-)"
-
-# watch for files changing which need patching during the x.py craziness!
-# currently this is duplicate U1024 and P1024 types (this is currently needed
-# for i686 and 1.38.0)
-source+=('watcher.sh')
-sha256sums+=('c91b55a428ef463fc1529724da0c7f3930bd9d4b32b4596a14be77cc3f1e0594')
-
-if [ "${CARCH}" = "i686" ]; then
-  makedepends+=('inotify-tools' 'procps-ng')
-  
-  eval "$(
-    declare -f build | \
-      sed '
-        /\.\/x.py/ i \
-          chmod u+x "$srcdir/watcher.sh" \
-          "$srcdir/watcher.sh" "$srcdir" & \
-          _kill_pid=$! \
-           sleep 10
-        /\.\/x.py/ a \
-          kill $_kill_pid || true
-      '
-  )"
-fi
-
-# Enable on demand, if your previous rust is broken, see also build-support and AUR
-# for rust-bin.
-#makedepends=(${makedepends[@]//rust/})
-#makedepends+=('rust-bin')
-sha256sums=('dd97005578defc10a482bff3e4e728350d2099c60ffcf1f5e189540c39a549ad'
-            'SKIP'
-            'c2bfab95c9986318318363d7f371a85a95e333bc0b34fbfa52edbd3f5e3a9077'
-            'SKIP'
-            '42e861ba90335d0e2e666e10b12d9ff85ea1bdb711176fb3c09e92375e193660'
-            'c91b55a428ef463fc1529724da0c7f3930bd9d4b32b4596a14be77cc3f1e0594')
-groups+=(build-shims)
diff --git a/build-support/rust140/config.toml.patch b/build-support/rust140/config.toml.patch
deleted file mode 100644
index 8d0762cd..00000000
Binary files a/build-support/rust140/config.toml.patch and /dev/null differ
diff --git a/build-support/rust140/watcher.sh b/build-support/rust140/watcher.sh
deleted file mode 100755
index 98228b5d..00000000
--- a/build-support/rust140/watcher.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-term() {
-  echo "--> Got SIGTERM"
-  echo "--> killing inotifywait with PID $inotifywait"
-  kill -TERM "$inotifywait"
-  sleep 10
-  kill -9 "$inotifywait"
-}
-
-srcdir="$1"
-
-trap term SIGTERM
-
-inotifywait -mr -e close_write --format %w%f $srcdir | while read -r FILE; do
-  case "$FILE" in
-    *consts.rs)
-      echo "--> patching $FILE"
-      sed -i '/pub type U1024/d;/pub type P1024/d' $FILE
-      echo "--> finished patching $FILE"
-      ;;
-  esac
-done &
-inotifywait=$(ps -ef | grep inotifywait | grep -v grep | tr -s ' ' | cut -d ' ' -f2)
-echo "--> waiting for inotifywait $inotifywait"
-wait "$inotifywait"
-echo "--> watcher terminated"
diff --git a/build-support/rust141/PKGBUILD b/build-support/rust141/PKGBUILD
deleted file mode 100644
index afa6ad96..00000000
--- a/build-support/rust141/PKGBUILD
+++ /dev/null
@@ -1,218 +0,0 @@
-# Maintainer: Johannes Löthberg <johannes@kyriasis.com>
-# Contributor: Alexander F Rødseth <xyproto@archlinux.org>
-# Contributor: Daniel Micay <danielmicay@gmail.com>
-# Contributor: userwithuid <userwithuid@gmail.com>
-
-pkgname=('rust141' 'rust141-docs')
-epoch=1
-pkgver=1.41.0
-pkgrel=1
-
-_llvm_ver=9.0.1
-
-pkgdesc='Systems programming language focused on safety, speed and concurrency'
-url='https://www.rust-lang.org/'
-arch=(i486 i686 pentium4 'x86_64')
-license=('MIT' 'Apache')
-
-makedepends=('rust140' "llvm=$_llvm_ver" 'libffi' 'perl' 'python' 'curl' 'cmake')
-checkdepends=('procps-ng' 'gdb')
-
-options=('!emptydirs')
-
-source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc}
-        "https://github.com/llvm/llvm-project/releases/download/llvmorg-$_llvm_ver/compiler-rt-$_llvm_ver.src.tar.xz"{,.sig})
-
-sha256sums=('5546822c09944c4d847968e9b7b3d0e299f143f307c00fa40e84a99fabf8d74b'
-            'SKIP'
-            'c2bfab95c9986318318363d7f371a85a95e333bc0b34fbfa52edbd3f5e3a9077'
-            'SKIP')
-validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE'  # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org>
-              '474E22316ABF4785A88C6E8EA2C794A986419D8A'  # Tom Stellard <tstellar@redhat.com>
-              'B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans@chromium.org>
-
-prepare() {
-  cd "rustc-$pkgver-src"
-
-  cat >config.toml <<END
-[llvm]
-link-shared = true
-
-[build]
-target = ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu"]
-cargo = "/usr/bin/cargo"
-rustc = "/usr/bin/rustc"
-python = "/usr/bin/python"
-extended = true
-sanitizers = false
-profiler = true
-vendor = true
-
-[install]
-prefix = "/usr"
-
-[rust]
-# LLVM crashes when passing an object through ThinLTO twice.  This is triggered when using rust
-# code in cross-language LTO if libstd was built using ThinLTO.
-# http://blog.llvm.org/2019/09/closing-gap-cross-language-lto-between.html
-# https://github.com/rust-lang/rust/issues/54872
-codegen-units-std = 1
-
-debuginfo-level = 2
-
-channel = "stable"
-
-rpath = false
-
-[target.x86_64-unknown-linux-gnu]
-llvm-config = "/usr/bin/llvm-config"
-END
-}
-
-build() {
-  cd "rustc-$pkgver-src"
-
-  export RUST_BACKTRACE=1
-  export RUST_COMPILER_RT_ROOT="$srcdir/compiler-rt-$_llvm_ver.src"
-
-  python ./x.py dist -j "$(nproc)"
-  DESTDIR="$PWD"/dest-rust python ./x.py install -j "$(nproc)"
-
-  # move docs and lib32 libs out of the way for splitting
-  mv dest-rust/usr/lib/rustlib/i686-unknown-linux-gnu dest-i686
-  mv dest-rust/usr/share/doc dest-doc
-}
-
-package_rust141() {
-  depends=('gcc-libs' 'llvm-libs' 'curl' 'libssh2')
-  optdepends=('lldb: rust-lldb script'
-              'gdb: rust-gdb script')
-  provides=('cargo' 'rustfmt')
-  conflicts=('cargo' 'rustfmt')
-  replaces=('cargo' 'rustfmt')
-
-  cd "rustc-$pkgver-src"
-
-  mv dest-rust/* "$pkgdir"
-  install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE*
-
-  # delete unnecesary files, e.g. components and manifest files only used for the uninstall script
-  cd "$pkgdir"/usr/lib/rustlib
-  rm components install.log manifest-* rust-installer-version uninstall.sh
-
-  # rustbuild always installs copies of the shared libraries to /usr/lib,
-  # overwrite them with symlinks to the per-architecture versions
-  ln -srft "$pkgdir"/usr/lib x86_64-unknown-linux-gnu/lib/*.so
-
-  install -d "$pkgdir"/usr/share/bash-completion
-  mv "$pkgdir"/etc/bash_completion.d/ "$pkgdir"/usr/share/bash-completion/completions/
-}
-
-package_lib32-rust-libs() {
-  descriptino=('32-bit libraries for Rust')
-  depends=('lib32-gcc-libs')
-  provides=('lib32-rust')
-  conflicts=('lib32-rust')
-  replaces=('lib32-rust')
-
-  cd "rustc-$pkgver-src"
-  install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE*
-
-  install -d "$pkgdir"/usr/lib/rustlib/ "$pkgdir"/usr/lib32/
-  mv dest-i686 "$pkgdir"/usr/lib/rustlib/i686-unknown-linux-gnu
-  ln -srft "$pkgdir"/usr/lib32 "$pkgdir"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/*.so
-}
-
-package_rust141-docs() {
-  description=('Documentation for the Rust programming language')
-
-  cd "rustc-$pkgver-src"
-  install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE*
-
-  install -d "$pkgdir"/usr/share/doc
-  mv dest-doc/* "$pkgdir"/usr/share/doc
-}
-
-# vim:set ts=2 sw=2 et:
-# enable i686-unknown-linux-gnu target
-# and replace pentium4 (SSE2) with pentium3 (no SSE2) in the compiler spec file
-#
-# Also trying to reduce memory usage by building with
-# -debuginfo-level-std=1
-# see https://github.com/rust-lang/rust/issues/60294
-
-source+=(config.toml.patch)
-sha256sums+=('42e861ba90335d0e2e666e10b12d9ff85ea1bdb711176fb3c09e92375e193660')
-
-eval "$(
-  declare -f prepare | \
-    sed '
-      $ i patch -p1 -i "$srcdir/config.toml.patch"
-    '
-)"
-
-# stop insanity of nproc (see FS#62952)
-eval "$(
-  declare -f build | \
-    sed '
-      s/-j"$(nproc)"/-j16/
-    '
-)"
-
-if [ "${CARCH}" != 'pentium4' ]; then
-  eval "$(
-    declare -f prepare | \
-      sed '
-        $ i sed -i "s/pentium4/pentium3/g" "$srcdir/rustc-$pkgver-src/vendor/rustc-ap-rustc_target/spec/i686_unknown_linux_gnu.rs"
-        $ i sed -i "s/pentium4/pentium3/g" "$srcdir/rustc-$pkgver-src/src/librustc_target/spec/i686_unknown_linux_gnu.rs"
-        $ i sed -i "s/a75a6025d7e3424edf9baf3039056c0f8eea157631a175d00ac5a218aa54b510/484bf8be15015b330fa9a97b6dabb8c7627e59d5cddb2dd0e83478749f8aabad/g" "$srcdir/rustc-$pkgver-src/vendor/rustc-ap-rustc_target/.cargo-checksum.json"
-      '
-  )"
-fi
-
-# Don't move lib32 support into rust32-lib, we are on 32-bit in the end
-# and don't draw a symlink to 64-bit libraries (but to 32-bit instead)
-
-pkgname=(
-  $(
-    printf '%s\n' "${pkgname[@]}" | \
-      grep -v '^lib32-rust-libs'
-  )
-)
-
-eval "$(
-  declare -f package_rust141 | \
-    sed '
-      /mv.*i686-unknown-linux-gnu.*/d
-      /ln /s/x86_64-unknown-linux-gnu/i686-unknown-linux-gnu/g
-    '
-)"
-
-eval "$(
-  declare -f build | \
-    sed '
-      /mv.*i686-unknown-linux-gnu.*/d
-      /ln /s/x86_64-unknown-linux-gnu/i686-unknown-linux-gnu/g
-    '
-)"
-
-# work around P1024, U1024 typenum bug for old rust releases (bundled
-# typenum version contains a buggy version)
-if [ "${CARCH}" = "i686" ]; then
-  source+=('rustc-1.41.0-src-typenum-U1024.patch')
-  sha256sums+=('5e5ff622332c9f3fc00ef200d2d14de00e8973ea09a35cd42631ac46264a358a')
-  eval "$(
-    declare -f prepare | \
-      sed '
-        /}/ i \
-          patch -Np1 < "$srcdir/rustc-1.41.0-src-typenum-U1024.patch"
-      '
-  )"
-
-fi
-
-# Enable on demand, if your previous rust is broken, see also build-support and AUR
-# for rust-bin.
-#makedepends=(${makedepends[@]//rust/})
-#makedepends+=('rust-bin')
-groups+=(build-shims)
diff --git a/build-support/rust141/config.toml.patch b/build-support/rust141/config.toml.patch
deleted file mode 100644
index 8d0762cd..00000000
Binary files a/build-support/rust141/config.toml.patch and /dev/null differ
diff --git a/build-support/rust141/rustc-1.41.0-src-typenum-U1024.patch b/build-support/rust141/rustc-1.41.0-src-typenum-U1024.patch
deleted file mode 100644
index d1484d5c..00000000
Binary files a/build-support/rust141/rustc-1.41.0-src-typenum-U1024.patch and /dev/null differ
diff --git a/build-support/rust148/PKGBUILD b/build-support/rust148/PKGBUILD
deleted file mode 100644
index 9ed1cba8..00000000
--- a/build-support/rust148/PKGBUILD
+++ /dev/null
@@ -1,203 +0,0 @@
-# Maintainer: Johannes Löthberg <johannes@kyriasis.com>
-# Contributor: Alexander F Rødseth <xyproto@archlinux.org>
-# Contributor: Daniel Micay <danielmicay@gmail.com>
-# Contributor: userwithuid <userwithuid@gmail.com>
-
-pkgname=('rust148' 'rust148-docs')
-epoch=1
-pkgver=1.48.0
-pkgrel=1
-
-_llvm_ver=11.0.0
-
-pkgdesc='Systems programming language focused on safety, speed and concurrency'
-url='https://www.rust-lang.org/'
-arch=(i486 i686 pentium4 'x86_64')
-license=('MIT' 'Apache')
-
-makedepends=('rust=1:1.47.0' "llvm10-libs" "llvm=$_llvm_ver" 'libffi' 'perl' 'python' 'curl' 'cmake')
-checkdepends=('procps-ng' 'gdb')
-
-options=('!emptydirs')
-
-source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc}
-        "https://github.com/llvm/llvm-project/releases/download/llvmorg-$_llvm_ver/compiler-rt-$_llvm_ver.src.tar.xz"{,.sig})
-
-sha256sums=('0e763e6db47d5d6f91583284d2f989eacc49b84794d1443355b85c58d67ae43b'
-            'SKIP'
-            '374aff82ff573a449f9aabbd330a5d0a441181c535a3599996127378112db234'
-            'SKIP')
-validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE'  # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org>
-              '474E22316ABF4785A88C6E8EA2C794A986419D8A'  # Tom Stellard <tstellar@redhat.com>
-              'B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans@chromium.org>
-
-prepare() {
-  cd "rustc-$pkgver-src"
-
-  cat >config.toml <<END
-[llvm]
-link-shared = true
-
-[build]
-target = ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu"]
-cargo = "/usr/bin/cargo"
-rustc = "/usr/bin/rustc"
-python = "/usr/bin/python"
-extended = true
-sanitizers = false
-profiler = true
-vendor = true
-
-[install]
-prefix = "/usr"
-
-[rust]
-# LLVM crashes when passing an object through ThinLTO twice.  This is triggered when using rust
-# code in cross-language LTO if libstd was built using ThinLTO.
-# http://blog.llvm.org/2019/09/closing-gap-cross-language-lto-between.html
-# https://github.com/rust-lang/rust/issues/54872
-codegen-units-std = 1
-
-debuginfo-level = 2
-
-channel = "stable"
-
-rpath = false
-
-[target.x86_64-unknown-linux-gnu]
-llvm-config = "/usr/bin/llvm-config"
-END
-}
-
-build() {
-  cd "rustc-$pkgver-src"
-
-  export RUST_BACKTRACE=1
-  export RUST_COMPILER_RT_ROOT="$srcdir/compiler-rt-$_llvm_ver.src"
-
-  python ./x.py dist -j "$(nproc)"
-  DESTDIR="$PWD"/dest-rust python ./x.py install -j "$(nproc)"
-
-  # move docs and lib32 libs out of the way for splitting
-  mv dest-rust/usr/lib/rustlib/i686-unknown-linux-gnu dest-i686
-  mv dest-rust/usr/share/doc dest-doc
-}
-
-package_rust148() {
-  depends=('gcc-libs' 'llvm-libs' 'curl' 'libssh2')
-  optdepends=('lldb: rust-lldb script'
-              'gdb: rust-gdb script')
-  provides=('cargo' 'rustfmt')
-  conflicts=('cargo' 'rustfmt')
-  replaces=('cargo' 'rustfmt')
-
-  cd "rustc-$pkgver-src"
-
-  mv dest-rust/* "$pkgdir"
-  install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE*
-
-  # delete unnecesary files, e.g. components and manifest files only used for the uninstall script
-  cd "$pkgdir"/usr/lib/rustlib
-  rm components install.log manifest-* rust-installer-version uninstall.sh
-
-  # rustbuild always installs copies of the shared libraries to /usr/lib,
-  # overwrite them with symlinks to the per-architecture versions
-  ln -srft "$pkgdir"/usr/lib x86_64-unknown-linux-gnu/lib/*.so
-
-  install -d "$pkgdir"/usr/share/bash-completion
-  mv "$pkgdir"/etc/bash_completion.d/ "$pkgdir"/usr/share/bash-completion/completions/
-}
-
-package_lib32-rust-libs() {
-  descriptino=('32-bit libraries for Rust')
-  depends=('lib32-gcc-libs')
-  provides=('lib32-rust')
-  conflicts=('lib32-rust')
-  replaces=('lib32-rust')
-
-  cd "rustc-$pkgver-src"
-  install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE*
-
-  install -d "$pkgdir"/usr/lib/rustlib/ "$pkgdir"/usr/lib32/
-  mv dest-i686 "$pkgdir"/usr/lib/rustlib/i686-unknown-linux-gnu
-  ln -srft "$pkgdir"/usr/lib32 "$pkgdir"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/*.so
-}
-
-package_rust148-docs() {
-  description=('Documentation for the Rust programming language')
-
-  cd "rustc-$pkgver-src"
-  install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE*
-
-  install -d "$pkgdir"/usr/share/doc
-  mv dest-doc/* "$pkgdir"/usr/share/doc
-}
-
-# vim:set ts=2 sw=2 et:
-# enable i686-unknown-linux-gnu target
-# and replace pentium4 (SSE2) with pentium3 (no SSE2) in the compiler spec file
-#
-# Also trying to reduce memory usage by building with
-# -debuginfo-level-std=1
-# see https://github.com/rust-lang/rust/issues/60294
-
-source+=(config.toml.patch)
-sha256sums+=('42e861ba90335d0e2e666e10b12d9ff85ea1bdb711176fb3c09e92375e193660')
-
-eval "$(
-  declare -f prepare | \
-    sed '
-      $ i patch -p1 -i "$srcdir/config.toml.patch"
-    '
-)"
-
-# stop insanity of nproc (see FS#62952)
-eval "$(
-  declare -f build | \
-    sed '
-      s/-j"$(nproc)"/-j16/
-    '
-)"
-
-if [ "${CARCH}" != 'pentium4' ]; then
-  eval "$(
-    declare -f prepare | \
-      sed '
-        $ i sed -i "s/pentium4/pentium3/g" "$srcdir/rustc-$pkgver-src/vendor/rustc-ap-rustc_target/src/spec/i686_unknown_linux_gnu.rs"
-        $ i sed -i "s/pentium4/pentium3/g" "$srcdir/rustc-$pkgver-src/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs"
-        $ i sed -i "s/30f6a25d37d536c5734b9a7e1e9cc34167a013c5e0c49c3fe0a26d76f2e1ae6c/412f837953e4cc32ff14195bf2da7eb61cb43d602fdc2db1099997d906070521/g" "$srcdir/rustc-$pkgver-src/vendor/rustc-ap-rustc_target/.cargo-checksum.json"
-      '
-  )"
-fi
-
-# Don't move lib32 support into rust32-lib, we are on 32-bit in the end
-# and don't draw a symlink to 64-bit libraries (but to 32-bit instead)
-
-pkgname=(
-  $(
-    printf '%s\n' "${pkgname[@]}" | \
-      grep -v '^lib32-rust-libs'
-  )
-)
-
-eval "$(
-  declare -f package_rust148 | \
-    sed '
-      /mv.*i686-unknown-linux-gnu.*/d
-      /ln /s/x86_64-unknown-linux-gnu/i686-unknown-linux-gnu/g
-    '
-)"
-
-eval "$(
-  declare -f build | \
-    sed '
-      /mv.*i686-unknown-linux-gnu.*/d
-      /ln /s/x86_64-unknown-linux-gnu/i686-unknown-linux-gnu/g
-    '
-)"
-
-# Enable on demand, if your previous rust is broken, see also build-support and AUR
-# for rust-bin.
-#makedepends=(${makedepends[@]//rust/})
-#makedepends+=('rust-bin')
-groups+=(build-shims)
diff --git a/build-support/rust148/config.toml.patch b/build-support/rust148/config.toml.patch
deleted file mode 100644
index 8d0762cd..00000000
Binary files a/build-support/rust148/config.toml.patch and /dev/null differ
diff --git a/build-support/rust157-bin/PKGBUILD b/build-support/rust157-bin/PKGBUILD
deleted file mode 100644
index 01f3e801..00000000
--- a/build-support/rust157-bin/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Andreas Baumann <mail@andreasbaumann.cc>
-
-pkgname=rust157-bin
-pkgver=1.57.0
-pkgrel=1
-pkgdesc='Binary precompiled packages for Rust'
-url='https://www.rust-lang.org/'
-arch=(x86_64 pentium4 i686)
-license=('MIT' 'Apache')
-provides=('rust' 'cargo')
-conflicts=('rust' 'cargo')
-options=('!emptydirs')
-
-source_x86_64=("https://static.rust-lang.org/dist/rust-$pkgver-x86_64-unknown-linux-gnu.tar.gz"{,.asc})
-source_pentium4=("https://static.rust-lang.org/dist/rust-$pkgver-i686-unknown-linux-gnu.tar.gz"{,.asc})
-source_i686=("https://static.rust-lang.org/dist/rust-$pkgver-i686-unknown-linux-gnu.tar.gz"{,.asc})
-
-sha256sums_x86_64=('ea0253784b2e5c22659ff148d492a68d2e11da734491714ebc61cc93896efcda'
-                   'SKIP')
-sha256sums_pentium4=('7e4ac8ca2874897099a3ceb89039ceee170f474a98ee247589fd6bca8dda7cfa'
-                     'SKIP')
-sha256sums_i686=('7e4ac8ca2874897099a3ceb89039ceee170f474a98ee247589fd6bca8dda7cfa'
-                 'SKIP')
-
-validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE'  # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org>
-              '474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstellar@redhat.com>
-
-case "${CARCH}" in
-  x86_64)               _ARCH='x86_64-unknown-linux-gnu';;
-  i686|pentium4)   _ARCH='i686-unknown-linux-gnu';;
-esac
-
-package() {
-  cd "rust-$pkgver-$_ARCH"
-
-  ./install.sh --prefix=/usr --destdir="$pkgdir"
-}
diff --git a/build-support/rust159-bin/PKGBUILD b/build-support/rust159-bin/PKGBUILD
deleted file mode 100644
index 205e3d61..00000000
--- a/build-support/rust159-bin/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Andreas Baumann <mail@andreasbaumann.cc>
-
-pkgname=rust159-bin
-pkgver=1.59.0
-pkgrel=1
-pkgdesc='Binary precompiled packages for Rust'
-url='https://www.rust-lang.org/'
-arch=(x86_64 pentium4 i686)
-license=('MIT' 'Apache')
-provides=('rust' 'cargo')
-conflicts=('rust' 'cargo')
-options=('!emptydirs')
-
-source_x86_64=("https://static.rust-lang.org/dist/rust-$pkgver-x86_64-unknown-linux-gnu.tar.gz"{,.asc})
-source_pentium4=("https://static.rust-lang.org/dist/rust-$pkgver-i686-unknown-linux-gnu.tar.gz"{,.asc})
-source_i686=("https://static.rust-lang.org/dist/rust-$pkgver-i686-unknown-linux-gnu.tar.gz"{,.asc})
-
-sha256sums_x86_64=('0c1c2da3fa26372e5178123aa5bb0fdcd4933fbad9bfb268ffbd71807182ecae'
-                   'SKIP')
-sha256sums_pentium4=('f57ebfafed1e857b2b1dc1a22cf1133766f68a0759dc2f717dec54a8d4385dec'
-                     'SKIP')
-sha256sums_i686=('f57ebfafed1e857b2b1dc1a22cf1133766f68a0759dc2f717dec54a8d4385dec'
-                 'SKIP')
-
-validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE'  # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org>
-              '474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstellar@redhat.com>
-
-case "${CARCH}" in
-  x86_64)               _ARCH='x86_64-unknown-linux-gnu';;
-  i686|pentium4)   _ARCH='i686-unknown-linux-gnu';;
-esac
-
-package() {
-  cd "rust-$pkgver-$_ARCH"
-
-  ./install.sh --prefix=/usr --destdir="$pkgdir"
-}
-- 
cgit v1.2.3-54-g00ecf