Clean up amd64 17.1 builders

Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>

88 files changed, 0 insertions, 1040 deletions

diff --git a/builders/milou/binhost-update b/builders/milou/binhost-update
index cc4f410..3bd6b29 100755
--- a/builders/milou/binhost-update
+++ b/builders/milou/binhost-update
@@ -9,20 +9,6 @@ LOCKFILE="/root/.tmp-binhost-${_BINHOST_NAME}-lock"
 EMAIL_FROM=binhost@milou.amd64.dev.gentoo.org
 EMAIL_TO=gentoo-binhost-autobuilds@lists.gentoo.org
 
-NSPAWNS_x8664_17="
-	binhost-amd64-x86-64-kde
-	binhost-amd64-x86-64-gnome
-	binhost-amd64-x86-64-openrc
-	binhost-amd64-x86-64-server
-"
-
-NSPAWNS_x8664v3_17="
-	binhost-amd64-x86-64-v3-kde
-	binhost-amd64-x86-64-v3-gnome
-	binhost-amd64-x86-64-v3-openrc
-	binhost-amd64-x86-64-v3-server
-"
-
 NSPAWNS_x8664_23="
 	binhost-amd64-x86-64-kde-23
 	binhost-amd64-x86-64-gnome-23
@@ -138,8 +124,6 @@ for n in ${NSPAWN_NAMES} ; do
 done
 
 
-upsync_binpackages /var/lib/machines/binhost-amd64-x86-64-kde/var/cache/binpkgs amd64/17.1/x86-64 &>> ${TMPFILE}
-upsync_binpackages /var/lib/machines/binhost-amd64-x86-64-v3-kde/var/cache/binpkgs amd64/17.1/x86-64-v3 &>> ${TMPFILE}
 upsync_binpackages /var/lib/machines/binhost-amd64-x86-64-kde-23/var/cache/binpkgs amd64/23.0/x86-64 &>> ${TMPFILE}
 upsync_binpackages /var/lib/machines/binhost-amd64-x86-64-v3-kde-23/var/cache/binpkgs amd64/23.0/x86-64-v3 &>> ${TMPFILE}
 
diff --git a/builders/milou/fstab.inc b/builders/milou/fstab.inc
index 9961208..8027800 100644
--- a/builders/milou/fstab.inc
+++ b/builders/milou/fstab.inc
@@ -1,13 +1,5 @@
 # for the binhosts, mount package dirs together (per abi)
 
-/var/lib/machines/binhost-amd64-x86-64-kde/var/cache/binpkgs /var/lib/machines/binhost-amd64-x86-64-gnome/var/cache/binpkgs bind bind 0 0
-/var/lib/machines/binhost-amd64-x86-64-kde/var/cache/binpkgs /var/lib/machines/binhost-amd64-x86-64-server/var/cache/binpkgs bind bind 0 0
-/var/lib/machines/binhost-amd64-x86-64-kde/var/cache/binpkgs /var/lib/machines/binhost-amd64-x86-64-openrc/var/cache/binpkgs bind bind 0 0
-
-/var/lib/machines/binhost-amd64-x86-64-v3-kde/var/cache/binpkgs /var/lib/machines/binhost-amd64-x86-64-v3-gnome/var/cache/binpkgs bind bind 0 0
-/var/lib/machines/binhost-amd64-x86-64-v3-kde/var/cache/binpkgs /var/lib/machines/binhost-amd64-x86-64-v3-server/var/cache/binpkgs bind bind 0 0
-/var/lib/machines/binhost-amd64-x86-64-v3-kde/var/cache/binpkgs /var/lib/machines/binhost-amd64-x86-64-v3-openrc/var/cache/binpkgs bind bind 0 0
-
 /var/lib/machines/binhost-amd64-x86-64-kde-23/var/cache/binpkgs /var/lib/machines/binhost-amd64-x86-64-gnome-23/var/cache/binpkgs bind bind 0 0
 /var/lib/machines/binhost-amd64-x86-64-kde-23/var/cache/binpkgs /var/lib/machines/binhost-amd64-x86-64-server-23/var/cache/binpkgs bind bind 0 0
 /var/lib/machines/binhost-amd64-x86-64-kde-23/var/cache/binpkgs /var/lib/machines/binhost-amd64-x86-64-openrc-23/var/cache/binpkgs bind bind 0 0
diff --git a/builders/milou/gnome-v3/portage/make.conf b/builders/milou/gnome-v3/portage/make.conf
deleted file mode 100644
index 96913ff..0000000
--- a/builders/milou/gnome-v3/portage/make.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-# These settings were set by the catalyst build script that automatically
-# built this stage.
-# Please consult /usr/share/portage/config/make.conf.example for a more
-# detailed example.
-COMMON_FLAGS="-O2 -pipe -march=x86-64-v3"
-CFLAGS="${COMMON_FLAGS}"
-CXXFLAGS="${COMMON_FLAGS}"
-FCFLAGS="${COMMON_FLAGS}"
-FFLAGS="${COMMON_FLAGS}"
-
-# NOTE: This stage was built with the bindist Use flag enabled
-PORTDIR="/var/db/repos/gentoo"
-DISTDIR="/var/cache/distfiles"
-PKGDIR="/var/cache/binpkgs"
-
-# This sets the language of build output to English.
-# Please keep this setting intact when reporting bugs.
-LC_MESSAGES=C
-
-MAKEOPTS="-j32 -l64"
-
-EMERGE_DEFAULT_OPTS="--jobs 20 --load 64 --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner"
-
-FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox"
-
-BINPKG_FORMAT="gpkg"
-BINPKG_COMPRESS="xz"
-
-USE="bindist"
-
-ACCEPT_RESTRICT="* -bindist"
-
-ACCEPT_LICENSE="@FREE MPEG-4"
-
-LC_ALL="en_US.utf8"
-
-# x86-64-v1:
-CPU_FLAGS_X86_v1="cmov cx8 fpu fxsr mmx osfxsr sce mmxext sse sse2"
-
-# x86-64-v2:
-CPU_FLAGS_X86_v2="${CPU_FLAGS_X86_v1} cmpxchg16b lahf_sahf popcnt sse3 sse4_1 sse4_2 ssse3"
-
-# x86-64-v3:
-CPU_FLAGS_X86_v3="${CPU_FLAGS_X86_v2} avx avx2 bmi1 bmi2 f16c fma3 lzcnt movbe osxsave"
-
-CPU_FLAGS_X86=${CPU_FLAGS_X86_v3}
diff --git a/builders/milou/gnome-v3/portage/make.profile b/builders/milou/gnome-v3/portage/make.profile
deleted file mode 120000
index 4ac921c..0000000
--- a/builders/milou/gnome-v3/portage/make.profile
+++ /dev/null
@@ -1 +0,0 @@
-/var/db/repos/gentoo/profiles/default/linux/amd64/17.1/desktop/gnome/systemd
\ No newline at end of file
diff --git a/builders/milou/gnome-v3/portage/package.use/bindist b/builders/milou/gnome-v3/portage/package.use/bindist
deleted file mode 100644
index b75a197..0000000
--- a/builders/milou/gnome-v3/portage/package.use/bindist
+++ /dev/null
@@ -1,2 +0,0 @@
-
-net-voip/telepathy-gabble gnutls
diff --git a/builders/milou/gnome-v3/portage/package.use/blender b/builders/milou/gnome-v3/portage/package.use/blender
deleted file mode 100644
index a363b10..0000000
--- a/builders/milou/gnome-v3/portage/package.use/blender
+++ /dev/null
@@ -1,5 +0,0 @@
-media-libs/freetype brotli
-media-video/ffmpeg opus theora vpx
-
-# circ
-media-libs/opencolorio -opengl
diff --git a/builders/milou/gnome-v3/portage/package.use/dist-kernel b/builders/milou/gnome-v3/portage/package.use/dist-kernel
deleted file mode 100644
index 7e6ada4..0000000
--- a/builders/milou/gnome-v3/portage/package.use/dist-kernel
+++ /dev/null
@@ -1 +0,0 @@
-*/* dist-kernel
diff --git a/builders/milou/gnome-v3/portage/package.use/fixed b/builders/milou/gnome-v3/portage/package.use/fixed
deleted file mode 100644
index 9574ec7..0000000
--- a/builders/milou/gnome-v3/portage/package.use/fixed
+++ /dev/null
@@ -1,6 +0,0 @@
-# 26f47f5c7df6edda39ff1febc821f1f8e1803321
-sys-apps/dbus user-session
-
-
-# todo
-media-libs/freetype harfbuzz
diff --git a/builders/milou/gnome-v3/portage/package.use/inkscape b/builders/milou/gnome-v3/portage/package.use/inkscape
deleted file mode 100644
index 4b2df36..0000000
--- a/builders/milou/gnome-v3/portage/package.use/inkscape
+++ /dev/null
@@ -1 +0,0 @@
-dev-python/pillow webp
diff --git a/builders/milou/gnome-v3/portage/package.use/multilib b/builders/milou/gnome-v3/portage/package.use/multilib
deleted file mode 100644
index 9537596..0000000
--- a/builders/milou/gnome-v3/portage/package.use/multilib
+++ /dev/null
@@ -1,27 +0,0 @@
-dev-libs/icu abi_x86_32
-dev-libs/libclc abi_x86_32
-dev-libs/libffi abi_x86_32
-dev-libs/libxml2 abi_x86_32
-dev-ml/llvm-ocaml abi_x86_32
-dev-python/clang-python abi_x86_32
-dev-python/lit abi_x86_32
-dev-util/lldb abi_x86_32
-sys-devel/clang abi_x86_32
-sys-devel/clang-common abi_x86_32
-sys-devel/clang-runtime abi_x86_32
-sys-devel/clang-toolchain-symlinks abi_x86_32
-sys-devel/lld abi_x86_32
-sys-devel/lld-toolchain-symlinks abi_x86_32
-sys-devel/llvm abi_x86_32
-sys-devel/llvm-common abi_x86_32
-sys-devel/llvm-toolchain-symlinks abi_x86_32
-sys-devel/llvmgold abi_x86_32
-sys-libs/compiler-rt abi_x86_32
-sys-libs/compiler-rt-sanitizers abi_x86_32
-sys-libs/gpm abi_x86_32
-sys-libs/libcxx abi_x86_32
-sys-libs/libcxxabi abi_x86_32
-sys-libs/libomp abi_x86_32
-sys-libs/llvm-libunwind abi_x86_32
-sys-libs/ncurses abi_x86_32 -gpm
-sys-libs/zlib abi_x86_32
diff --git a/builders/milou/gnome-v3/portage/package.use/queued b/builders/milou/gnome-v3/portage/package.use/queued
deleted file mode 100644
index 49491b2..0000000
--- a/builders/milou/gnome-v3/portage/package.use/queued
+++ /dev/null
@@ -1 +0,0 @@
-media-libs/libvpx postproc
diff --git a/builders/milou/gnome-v3/portage/package.use/xfce4 b/builders/milou/gnome-v3/portage/package.use/xfce4
deleted file mode 100644
index 47dd0b9..0000000
--- a/builders/milou/gnome-v3/portage/package.use/xfce4
+++ /dev/null
@@ -1 +0,0 @@
-dev-libs/libdbusmenu gtk3
diff --git a/builders/milou/gnome-v3/portage/package.use/zlib b/builders/milou/gnome-v3/portage/package.use/zlib
deleted file mode 100644
index b934da8..0000000
--- a/builders/milou/gnome-v3/portage/package.use/zlib
+++ /dev/null
@@ -1 +0,0 @@
-sys-libs/zlib minizip
diff --git a/builders/milou/gnome-v3/run-update b/builders/milou/gnome-v3/run-update
deleted file mode 100755
index 02cdf8a..0000000
--- a/builders/milou/gnome-v3/run-update
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# if one thing fails, abort entirely
-set -e
-
-emerge -uDNkq --changed-deps --backtrack=100 --keep-going world
-
-emerge --depclean --quiet-unmerge-warn
diff --git a/builders/milou/gnome-v3/world b/builders/milou/gnome-v3/world
deleted file mode 100644
index 918c3d9..0000000
--- a/builders/milou/gnome-v3/world
+++ /dev/null
@@ -1,44 +0,0 @@
-app-admin/keepassxc
-app-containers/docker
-app-containers/earthly
-app-editors/emacs
-app-editors/nano
-app-editors/vim
-app-office/abiword
-app-office/gnucash
-app-office/libreoffice
-app-office/texstudio
-app-officeext/texmaths
-app-portage/eix
-app-portage/gentoolkit
-app-text/doxygen
-app-text/pdftk
-app-text/xournalpp
-dev-lang/mono
-dev-tex/latex-beamer
-gnome-base/gnome
-gnome-base/gnome-extra-apps
-lxqt-base/lxqt-meta
-mate-base/mate
-media-gfx/blender
-media-gfx/engauge
-media-gfx/gimp
-media-gfx/gnuclad
-media-gfx/inkscape
-media-gfx/povray
-media-sound/clementine
-net-firewall/fwbuilder
-net-irc/quassel
-net-misc/chrony
-net-misc/dhcpcd
-net-vpn/openvpn
-sci-libs/netcdf
-sci-visualization/gnuplot
-sci-visualization/gwyddion
-sci-visualization/spyview
-sys-apps/portage
-sys-cluster/openmpi
-sys-devel/clang
-dev-debug/gdb
-www-client/firefox
-xfce-base/xfce4-meta
diff --git a/builders/milou/gnome/portage/make.conf b/builders/milou/gnome/portage/make.conf
deleted file mode 100644
index 1ab00b0..0000000
--- a/builders/milou/gnome/portage/make.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-# These settings were set by the catalyst build script that automatically
-# built this stage.
-# Please consult /usr/share/portage/config/make.conf.example for a more
-# detailed example.
-COMMON_FLAGS="-O2 -pipe -march=x86-64 -mtune=generic"
-CFLAGS="${COMMON_FLAGS}"
-CXXFLAGS="${COMMON_FLAGS}"
-FCFLAGS="${COMMON_FLAGS}"
-FFLAGS="${COMMON_FLAGS}"
-
-# NOTE: This stage was built with the bindist Use flag enabled
-PORTDIR="/var/db/repos/gentoo"
-DISTDIR="/var/cache/distfiles"
-PKGDIR="/var/cache/binpkgs"
-
-# This sets the language of build output to English.
-# Please keep this setting intact when reporting bugs.
-LC_MESSAGES=C
-
-MAKEOPTS="-j32 -l64"
-
-EMERGE_DEFAULT_OPTS="--jobs 20 --load 64 --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner"
-
-FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox"
-
-BINPKG_FORMAT="gpkg"
-BINPKG_COMPRESS="xz"
-
-USE="bindist"
-
-ACCEPT_RESTRICT="* -bindist"
-
-ACCEPT_LICENSE="@FREE MPEG-4"
-
-LC_ALL="en_US.utf8"
-
diff --git a/builders/milou/gnome/portage/make.profile b/builders/milou/gnome/portage/make.profile
deleted file mode 120000
index 4ac921c..0000000
--- a/builders/milou/gnome/portage/make.profile
+++ /dev/null
@@ -1 +0,0 @@
-/var/db/repos/gentoo/profiles/default/linux/amd64/17.1/desktop/gnome/systemd
\ No newline at end of file
diff --git a/builders/milou/gnome/portage/package.use/bindist b/builders/milou/gnome/portage/package.use/bindist
deleted file mode 100644
index b75a197..0000000
--- a/builders/milou/gnome/portage/package.use/bindist
+++ /dev/null
@@ -1,2 +0,0 @@
-
-net-voip/telepathy-gabble gnutls
diff --git a/builders/milou/gnome/portage/package.use/blender b/builders/milou/gnome/portage/package.use/blender
deleted file mode 100644
index a363b10..0000000
--- a/builders/milou/gnome/portage/package.use/blender
+++ /dev/null
@@ -1,5 +0,0 @@
-media-libs/freetype brotli
-media-video/ffmpeg opus theora vpx
-
-# circ
-media-libs/opencolorio -opengl
diff --git a/builders/milou/gnome/portage/package.use/dist-kernel b/builders/milou/gnome/portage/package.use/dist-kernel
deleted file mode 100644
index 7e6ada4..0000000
--- a/builders/milou/gnome/portage/package.use/dist-kernel
+++ /dev/null
@@ -1 +0,0 @@
-*/* dist-kernel
diff --git a/builders/milou/gnome/portage/package.use/fixed b/builders/milou/gnome/portage/package.use/fixed
deleted file mode 100644
index 9574ec7..0000000
--- a/builders/milou/gnome/portage/package.use/fixed
+++ /dev/null
@@ -1,6 +0,0 @@
-# 26f47f5c7df6edda39ff1febc821f1f8e1803321
-sys-apps/dbus user-session
-
-
-# todo
-media-libs/freetype harfbuzz
diff --git a/builders/milou/gnome/portage/package.use/inkscape b/builders/milou/gnome/portage/package.use/inkscape
deleted file mode 100644
index 4b2df36..0000000
--- a/builders/milou/gnome/portage/package.use/inkscape
+++ /dev/null
@@ -1 +0,0 @@
-dev-python/pillow webp
diff --git a/builders/milou/gnome/portage/package.use/multilib b/builders/milou/gnome/portage/package.use/multilib
deleted file mode 100644
index 9537596..0000000
--- a/builders/milou/gnome/portage/package.use/multilib
+++ /dev/null
@@ -1,27 +0,0 @@
-dev-libs/icu abi_x86_32
-dev-libs/libclc abi_x86_32
-dev-libs/libffi abi_x86_32
-dev-libs/libxml2 abi_x86_32
-dev-ml/llvm-ocaml abi_x86_32
-dev-python/clang-python abi_x86_32
-dev-python/lit abi_x86_32
-dev-util/lldb abi_x86_32
-sys-devel/clang abi_x86_32
-sys-devel/clang-common abi_x86_32
-sys-devel/clang-runtime abi_x86_32
-sys-devel/clang-toolchain-symlinks abi_x86_32
-sys-devel/lld abi_x86_32
-sys-devel/lld-toolchain-symlinks abi_x86_32
-sys-devel/llvm abi_x86_32
-sys-devel/llvm-common abi_x86_32
-sys-devel/llvm-toolchain-symlinks abi_x86_32
-sys-devel/llvmgold abi_x86_32
-sys-libs/compiler-rt abi_x86_32
-sys-libs/compiler-rt-sanitizers abi_x86_32
-sys-libs/gpm abi_x86_32
-sys-libs/libcxx abi_x86_32
-sys-libs/libcxxabi abi_x86_32
-sys-libs/libomp abi_x86_32
-sys-libs/llvm-libunwind abi_x86_32
-sys-libs/ncurses abi_x86_32 -gpm
-sys-libs/zlib abi_x86_32
diff --git a/builders/milou/gnome/portage/package.use/queued b/builders/milou/gnome/portage/package.use/queued
deleted file mode 100644
index 49491b2..0000000
--- a/builders/milou/gnome/portage/package.use/queued
+++ /dev/null
@@ -1 +0,0 @@
-media-libs/libvpx postproc
diff --git a/builders/milou/gnome/portage/package.use/xfce4 b/builders/milou/gnome/portage/package.use/xfce4
deleted file mode 100644
index 47dd0b9..0000000
--- a/builders/milou/gnome/portage/package.use/xfce4
+++ /dev/null
@@ -1 +0,0 @@
-dev-libs/libdbusmenu gtk3
diff --git a/builders/milou/gnome/portage/package.use/zlib b/builders/milou/gnome/portage/package.use/zlib
deleted file mode 100644
index b934da8..0000000
--- a/builders/milou/gnome/portage/package.use/zlib
+++ /dev/null
@@ -1 +0,0 @@
-sys-libs/zlib minizip
diff --git a/builders/milou/gnome/run-update b/builders/milou/gnome/run-update
deleted file mode 100755
index 02cdf8a..0000000
--- a/builders/milou/gnome/run-update
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# if one thing fails, abort entirely
-set -e
-
-emerge -uDNkq --changed-deps --backtrack=100 --keep-going world
-
-emerge --depclean --quiet-unmerge-warn
diff --git a/builders/milou/gnome/world b/builders/milou/gnome/world
deleted file mode 100644
index 918c3d9..0000000
--- a/builders/milou/gnome/world
+++ /dev/null
@@ -1,44 +0,0 @@
-app-admin/keepassxc
-app-containers/docker
-app-containers/earthly
-app-editors/emacs
-app-editors/nano
-app-editors/vim
-app-office/abiword
-app-office/gnucash
-app-office/libreoffice
-app-office/texstudio
-app-officeext/texmaths
-app-portage/eix
-app-portage/gentoolkit
-app-text/doxygen
-app-text/pdftk
-app-text/xournalpp
-dev-lang/mono
-dev-tex/latex-beamer
-gnome-base/gnome
-gnome-base/gnome-extra-apps
-lxqt-base/lxqt-meta
-mate-base/mate
-media-gfx/blender
-media-gfx/engauge
-media-gfx/gimp
-media-gfx/gnuclad
-media-gfx/inkscape
-media-gfx/povray
-media-sound/clementine
-net-firewall/fwbuilder
-net-irc/quassel
-net-misc/chrony
-net-misc/dhcpcd
-net-vpn/openvpn
-sci-libs/netcdf
-sci-visualization/gnuplot
-sci-visualization/gwyddion
-sci-visualization/spyview
-sys-apps/portage
-sys-cluster/openmpi
-sys-devel/clang
-dev-debug/gdb
-www-client/firefox
-xfce-base/xfce4-meta
diff --git a/builders/milou/kde-v3/portage/make.conf b/builders/milou/kde-v3/portage/make.conf
deleted file mode 100644
index 96913ff..0000000
--- a/builders/milou/kde-v3/portage/make.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-# These settings were set by the catalyst build script that automatically
-# built this stage.
-# Please consult /usr/share/portage/config/make.conf.example for a more
-# detailed example.
-COMMON_FLAGS="-O2 -pipe -march=x86-64-v3"
-CFLAGS="${COMMON_FLAGS}"
-CXXFLAGS="${COMMON_FLAGS}"
-FCFLAGS="${COMMON_FLAGS}"
-FFLAGS="${COMMON_FLAGS}"
-
-# NOTE: This stage was built with the bindist Use flag enabled
-PORTDIR="/var/db/repos/gentoo"
-DISTDIR="/var/cache/distfiles"
-PKGDIR="/var/cache/binpkgs"
-
-# This sets the language of build output to English.
-# Please keep this setting intact when reporting bugs.
-LC_MESSAGES=C
-
-MAKEOPTS="-j32 -l64"
-
-EMERGE_DEFAULT_OPTS="--jobs 20 --load 64 --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner"
-
-FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox"
-
-BINPKG_FORMAT="gpkg"
-BINPKG_COMPRESS="xz"
-
-USE="bindist"
-
-ACCEPT_RESTRICT="* -bindist"
-
-ACCEPT_LICENSE="@FREE MPEG-4"
-
-LC_ALL="en_US.utf8"
-
-# x86-64-v1:
-CPU_FLAGS_X86_v1="cmov cx8 fpu fxsr mmx osfxsr sce mmxext sse sse2"
-
-# x86-64-v2:
-CPU_FLAGS_X86_v2="${CPU_FLAGS_X86_v1} cmpxchg16b lahf_sahf popcnt sse3 sse4_1 sse4_2 ssse3"
-
-# x86-64-v3:
-CPU_FLAGS_X86_v3="${CPU_FLAGS_X86_v2} avx avx2 bmi1 bmi2 f16c fma3 lzcnt movbe osxsave"
-
-CPU_FLAGS_X86=${CPU_FLAGS_X86_v3}
diff --git a/builders/milou/kde-v3/portage/make.profile b/builders/milou/kde-v3/portage/make.profile
deleted file mode 120000
index 4f9702d..0000000
--- a/builders/milou/kde-v3/portage/make.profile
+++ /dev/null
@@ -1 +0,0 @@
-/var/db/repos/gentoo/profiles/default/linux/amd64/17.1/desktop/plasma/systemd
\ No newline at end of file
diff --git a/builders/milou/kde-v3/portage/package.use/bindist b/builders/milou/kde-v3/portage/package.use/bindist
deleted file mode 100644
index b75a197..0000000
--- a/builders/milou/kde-v3/portage/package.use/bindist
+++ /dev/null
@@ -1,2 +0,0 @@
-
-net-voip/telepathy-gabble gnutls
diff --git a/builders/milou/kde-v3/portage/package.use/calibre b/builders/milou/kde-v3/portage/package.use/calibre
deleted file mode 100644
index 6f6c33c..0000000
--- a/builders/milou/kde-v3/portage/package.use/calibre
+++ /dev/null
@@ -1 +0,0 @@
-dev-python/PyQt6 quick
diff --git a/builders/milou/kde-v3/portage/package.use/dist-kernel b/builders/milou/kde-v3/portage/package.use/dist-kernel
deleted file mode 100644
index 7e6ada4..0000000
--- a/builders/milou/kde-v3/portage/package.use/dist-kernel
+++ /dev/null
@@ -1 +0,0 @@
-*/* dist-kernel
diff --git a/builders/milou/kde-v3/portage/package.use/ffmpeg b/builders/milou/kde-v3/portage/package.use/ffmpeg
deleted file mode 100644
index aad80a4..0000000
--- a/builders/milou/kde-v3/portage/package.use/ffmpeg
+++ /dev/null
@@ -1 +0,0 @@
-media-video/ffmpeg libass
diff --git a/builders/milou/kde-v3/portage/package.use/fixed b/builders/milou/kde-v3/portage/package.use/fixed
deleted file mode 100644
index 9574ec7..0000000
--- a/builders/milou/kde-v3/portage/package.use/fixed
+++ /dev/null
@@ -1,6 +0,0 @@
-# 26f47f5c7df6edda39ff1febc821f1f8e1803321
-sys-apps/dbus user-session
-
-
-# todo
-media-libs/freetype harfbuzz
diff --git a/builders/milou/kde-v3/portage/package.use/queued b/builders/milou/kde-v3/portage/package.use/queued
deleted file mode 100644
index f61935d..0000000
--- a/builders/milou/kde-v3/portage/package.use/queued
+++ /dev/null
@@ -1,3 +0,0 @@
-media-libs/libvpx postproc
-dev-qt/qtpositioning geoclue
-dev-python/pillow webp
diff --git a/builders/milou/kde-v3/run-update b/builders/milou/kde-v3/run-update
deleted file mode 100755
index 02cdf8a..0000000
--- a/builders/milou/kde-v3/run-update
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# if one thing fails, abort entirely
-set -e
-
-emerge -uDNkq --changed-deps --backtrack=100 --keep-going world
-
-emerge --depclean --quiet-unmerge-warn
diff --git a/builders/milou/kde-v3/world b/builders/milou/kde-v3/world
deleted file mode 100644
index c81d20e..0000000
--- a/builders/milou/kde-v3/world
+++ /dev/null
@@ -1,50 +0,0 @@
-app-admin/keepassxc
-app-containers/docker
-app-containers/earthly
-app-editors/emacs
-app-editors/kile
-app-editors/nano
-app-office/abiword
-app-office/gnucash
-app-office/kmymoney
-app-office/libreoffice
-app-office/scribus
-app-office/texstudio
-app-officeext/texmaths
-app-portage/eix
-app-portage/gentoolkit
-app-text/calibre
-app-text/pdftk
-app-text/xournalpp
-dev-lang/mono
-dev-tex/latex-beamer
-dev-util/kdevelop
-kde-apps/kde-apps-meta
-kde-apps/kdepim-meta
-kde-plasma/plasma-meta
-lxqt-base/lxqt-meta
-mate-base/mate
-media-gfx/engauge
-media-gfx/gimp
-media-gfx/gnuclad
-media-gfx/inkscape
-media-gfx/krita
-media-gfx/povray
-media-sound/strawberry
-media-video/kaffeine
-net-firewall/fwbuilder
-net-irc/quassel
-net-misc/chrony
-net-misc/dhcpcd
-net-vpn/openvpn
-sci-electronics/klayout
-sci-visualization/gnuplot
-sci-visualization/gwyddion
-sci-visualization/spyview
-sys-apps/portage
-sys-auth/AusweisApp
-sys-devel/clang
-dev-debug/gdb
-www-client/firefox
-www-client/qutebrowser
-www-servers/apache
diff --git a/builders/milou/kde/portage/make.conf b/builders/milou/kde/portage/make.conf
deleted file mode 100644
index 1ab00b0..0000000
--- a/builders/milou/kde/portage/make.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-# These settings were set by the catalyst build script that automatically
-# built this stage.
-# Please consult /usr/share/portage/config/make.conf.example for a more
-# detailed example.
-COMMON_FLAGS="-O2 -pipe -march=x86-64 -mtune=generic"
-CFLAGS="${COMMON_FLAGS}"
-CXXFLAGS="${COMMON_FLAGS}"
-FCFLAGS="${COMMON_FLAGS}"
-FFLAGS="${COMMON_FLAGS}"
-
-# NOTE: This stage was built with the bindist Use flag enabled
-PORTDIR="/var/db/repos/gentoo"
-DISTDIR="/var/cache/distfiles"
-PKGDIR="/var/cache/binpkgs"
-
-# This sets the language of build output to English.
-# Please keep this setting intact when reporting bugs.
-LC_MESSAGES=C
-
-MAKEOPTS="-j32 -l64"
-
-EMERGE_DEFAULT_OPTS="--jobs 20 --load 64 --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner"
-
-FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox"
-
-BINPKG_FORMAT="gpkg"
-BINPKG_COMPRESS="xz"
-
-USE="bindist"
-
-ACCEPT_RESTRICT="* -bindist"
-
-ACCEPT_LICENSE="@FREE MPEG-4"
-
-LC_ALL="en_US.utf8"
-
diff --git a/builders/milou/kde/portage/make.profile b/builders/milou/kde/portage/make.profile
deleted file mode 120000
index 4f9702d..0000000
--- a/builders/milou/kde/portage/make.profile
+++ /dev/null
@@ -1 +0,0 @@
-/var/db/repos/gentoo/profiles/default/linux/amd64/17.1/desktop/plasma/systemd
\ No newline at end of file
diff --git a/builders/milou/kde/portage/package.use/bindist b/builders/milou/kde/portage/package.use/bindist
deleted file mode 100644
index b75a197..0000000
--- a/builders/milou/kde/portage/package.use/bindist
+++ /dev/null
@@ -1,2 +0,0 @@
-
-net-voip/telepathy-gabble gnutls
diff --git a/builders/milou/kde/portage/package.use/calibre b/builders/milou/kde/portage/package.use/calibre
deleted file mode 100644
index 6f6c33c..0000000
--- a/builders/milou/kde/portage/package.use/calibre
+++ /dev/null
@@ -1 +0,0 @@
-dev-python/PyQt6 quick
diff --git a/builders/milou/kde/portage/package.use/dist-kernel b/builders/milou/kde/portage/package.use/dist-kernel
deleted file mode 100644
index 7e6ada4..0000000
--- a/builders/milou/kde/portage/package.use/dist-kernel
+++ /dev/null
@@ -1 +0,0 @@
-*/* dist-kernel
diff --git a/builders/milou/kde/portage/package.use/ffmpeg b/builders/milou/kde/portage/package.use/ffmpeg
deleted file mode 100644
index aad80a4..0000000
--- a/builders/milou/kde/portage/package.use/ffmpeg
+++ /dev/null
@@ -1 +0,0 @@
-media-video/ffmpeg libass
diff --git a/builders/milou/kde/portage/package.use/fixed b/builders/milou/kde/portage/package.use/fixed
deleted file mode 100644
index 9574ec7..0000000
--- a/builders/milou/kde/portage/package.use/fixed
+++ /dev/null
@@ -1,6 +0,0 @@
-# 26f47f5c7df6edda39ff1febc821f1f8e1803321
-sys-apps/dbus user-session
-
-
-# todo
-media-libs/freetype harfbuzz
diff --git a/builders/milou/kde/portage/package.use/queued b/builders/milou/kde/portage/package.use/queued
deleted file mode 100644
index f61935d..0000000
--- a/builders/milou/kde/portage/package.use/queued
+++ /dev/null
@@ -1,3 +0,0 @@
-media-libs/libvpx postproc
-dev-qt/qtpositioning geoclue
-dev-python/pillow webp
diff --git a/builders/milou/kde/run-update b/builders/milou/kde/run-update
deleted file mode 100755
index 02cdf8a..0000000
--- a/builders/milou/kde/run-update
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# if one thing fails, abort entirely
-set -e
-
-emerge -uDNkq --changed-deps --backtrack=100 --keep-going world
-
-emerge --depclean --quiet-unmerge-warn
diff --git a/builders/milou/kde/world b/builders/milou/kde/world
deleted file mode 100644
index c81d20e..0000000
--- a/builders/milou/kde/world
+++ /dev/null
@@ -1,50 +0,0 @@
-app-admin/keepassxc
-app-containers/docker
-app-containers/earthly
-app-editors/emacs
-app-editors/kile
-app-editors/nano
-app-office/abiword
-app-office/gnucash
-app-office/kmymoney
-app-office/libreoffice
-app-office/scribus
-app-office/texstudio
-app-officeext/texmaths
-app-portage/eix
-app-portage/gentoolkit
-app-text/calibre
-app-text/pdftk
-app-text/xournalpp
-dev-lang/mono
-dev-tex/latex-beamer
-dev-util/kdevelop
-kde-apps/kde-apps-meta
-kde-apps/kdepim-meta
-kde-plasma/plasma-meta
-lxqt-base/lxqt-meta
-mate-base/mate
-media-gfx/engauge
-media-gfx/gimp
-media-gfx/gnuclad
-media-gfx/inkscape
-media-gfx/krita
-media-gfx/povray
-media-sound/strawberry
-media-video/kaffeine
-net-firewall/fwbuilder
-net-irc/quassel
-net-misc/chrony
-net-misc/dhcpcd
-net-vpn/openvpn
-sci-electronics/klayout
-sci-visualization/gnuplot
-sci-visualization/gwyddion
-sci-visualization/spyview
-sys-apps/portage
-sys-auth/AusweisApp
-sys-devel/clang
-dev-debug/gdb
-www-client/firefox
-www-client/qutebrowser
-www-servers/apache
diff --git a/builders/milou/openrc-v3/portage/make.conf b/builders/milou/openrc-v3/portage/make.conf
deleted file mode 100644
index 96913ff..0000000
--- a/builders/milou/openrc-v3/portage/make.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-# These settings were set by the catalyst build script that automatically
-# built this stage.
-# Please consult /usr/share/portage/config/make.conf.example for a more
-# detailed example.
-COMMON_FLAGS="-O2 -pipe -march=x86-64-v3"
-CFLAGS="${COMMON_FLAGS}"
-CXXFLAGS="${COMMON_FLAGS}"
-FCFLAGS="${COMMON_FLAGS}"
-FFLAGS="${COMMON_FLAGS}"
-
-# NOTE: This stage was built with the bindist Use flag enabled
-PORTDIR="/var/db/repos/gentoo"
-DISTDIR="/var/cache/distfiles"
-PKGDIR="/var/cache/binpkgs"
-
-# This sets the language of build output to English.
-# Please keep this setting intact when reporting bugs.
-LC_MESSAGES=C
-
-MAKEOPTS="-j32 -l64"
-
-EMERGE_DEFAULT_OPTS="--jobs 20 --load 64 --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner"
-
-FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox"
-
-BINPKG_FORMAT="gpkg"
-BINPKG_COMPRESS="xz"
-
-USE="bindist"
-
-ACCEPT_RESTRICT="* -bindist"
-
-ACCEPT_LICENSE="@FREE MPEG-4"
-
-LC_ALL="en_US.utf8"
-
-# x86-64-v1:
-CPU_FLAGS_X86_v1="cmov cx8 fpu fxsr mmx osfxsr sce mmxext sse sse2"
-
-# x86-64-v2:
-CPU_FLAGS_X86_v2="${CPU_FLAGS_X86_v1} cmpxchg16b lahf_sahf popcnt sse3 sse4_1 sse4_2 ssse3"
-
-# x86-64-v3:
-CPU_FLAGS_X86_v3="${CPU_FLAGS_X86_v2} avx avx2 bmi1 bmi2 f16c fma3 lzcnt movbe osxsave"
-
-CPU_FLAGS_X86=${CPU_FLAGS_X86_v3}
diff --git a/builders/milou/openrc-v3/portage/make.profile b/builders/milou/openrc-v3/portage/make.profile
deleted file mode 120000
index e9a9efc..0000000
--- a/builders/milou/openrc-v3/portage/make.profile
+++ /dev/null
@@ -1 +0,0 @@
-/var/db/repos/gentoo/profiles/default/linux/amd64/17.1/desktop/gnome
\ No newline at end of file
diff --git a/builders/milou/openrc-v3/portage/package.use/bindist b/builders/milou/openrc-v3/portage/package.use/bindist
deleted file mode 100644
index b75a197..0000000
--- a/builders/milou/openrc-v3/portage/package.use/bindist
+++ /dev/null
@@ -1,2 +0,0 @@
-
-net-voip/telepathy-gabble gnutls
diff --git a/builders/milou/openrc-v3/portage/package.use/blender b/builders/milou/openrc-v3/portage/package.use/blender
deleted file mode 100644
index a363b10..0000000
--- a/builders/milou/openrc-v3/portage/package.use/blender
+++ /dev/null
@@ -1,5 +0,0 @@
-media-libs/freetype brotli
-media-video/ffmpeg opus theora vpx
-
-# circ
-media-libs/opencolorio -opengl
diff --git a/builders/milou/openrc-v3/portage/package.use/dist-kernel b/builders/milou/openrc-v3/portage/package.use/dist-kernel
deleted file mode 100644
index 7e6ada4..0000000
--- a/builders/milou/openrc-v3/portage/package.use/dist-kernel
+++ /dev/null
@@ -1 +0,0 @@
-*/* dist-kernel
diff --git a/builders/milou/openrc-v3/portage/package.use/fixed b/builders/milou/openrc-v3/portage/package.use/fixed
deleted file mode 100644
index 9574ec7..0000000
--- a/builders/milou/openrc-v3/portage/package.use/fixed
+++ /dev/null
@@ -1,6 +0,0 @@
-# 26f47f5c7df6edda39ff1febc821f1f8e1803321
-sys-apps/dbus user-session
-
-
-# todo
-media-libs/freetype harfbuzz
diff --git a/builders/milou/openrc-v3/portage/package.use/inkscape b/builders/milou/openrc-v3/portage/package.use/inkscape
deleted file mode 100644
index 4b2df36..0000000
--- a/builders/milou/openrc-v3/portage/package.use/inkscape
+++ /dev/null
@@ -1 +0,0 @@
-dev-python/pillow webp
diff --git a/builders/milou/openrc-v3/portage/package.use/kde b/builders/milou/openrc-v3/portage/package.use/kde
deleted file mode 100644
index 557e094..0000000
--- a/builders/milou/openrc-v3/portage/package.use/kde
+++ /dev/null
@@ -1,11 +0,0 @@
-kde-frameworks/* qml
-kde-plasma/kwin lock
-media-libs/opencv contrib contribdnn
-media-libs/mlt ffmpeg frei0r
-media-plugins/gst-plugins-meta theora v4l
-media-video/ffmpeg libass
-dev-qt/* qml
-dev-qt/qtwebengine widgets
-dev-qt/qtscript scripttools
-dev-qt/qtsql mysql
-dev-qt/qtpositioning geoclue
diff --git a/builders/milou/openrc-v3/portage/package.use/multilib b/builders/milou/openrc-v3/portage/package.use/multilib
deleted file mode 100644
index 9537596..0000000
--- a/builders/milou/openrc-v3/portage/package.use/multilib
+++ /dev/null
@@ -1,27 +0,0 @@
-dev-libs/icu abi_x86_32
-dev-libs/libclc abi_x86_32
-dev-libs/libffi abi_x86_32
-dev-libs/libxml2 abi_x86_32
-dev-ml/llvm-ocaml abi_x86_32
-dev-python/clang-python abi_x86_32
-dev-python/lit abi_x86_32
-dev-util/lldb abi_x86_32
-sys-devel/clang abi_x86_32
-sys-devel/clang-common abi_x86_32
-sys-devel/clang-runtime abi_x86_32
-sys-devel/clang-toolchain-symlinks abi_x86_32
-sys-devel/lld abi_x86_32
-sys-devel/lld-toolchain-symlinks abi_x86_32
-sys-devel/llvm abi_x86_32
-sys-devel/llvm-common abi_x86_32
-sys-devel/llvm-toolchain-symlinks abi_x86_32
-sys-devel/llvmgold abi_x86_32
-sys-libs/compiler-rt abi_x86_32
-sys-libs/compiler-rt-sanitizers abi_x86_32
-sys-libs/gpm abi_x86_32
-sys-libs/libcxx abi_x86_32
-sys-libs/libcxxabi abi_x86_32
-sys-libs/libomp abi_x86_32
-sys-libs/llvm-libunwind abi_x86_32
-sys-libs/ncurses abi_x86_32 -gpm
-sys-libs/zlib abi_x86_32
diff --git a/builders/milou/openrc-v3/portage/package.use/queued b/builders/milou/openrc-v3/portage/package.use/queued
deleted file mode 100644
index 49491b2..0000000
--- a/builders/milou/openrc-v3/portage/package.use/queued
+++ /dev/null
@@ -1 +0,0 @@
-media-libs/libvpx postproc
diff --git a/builders/milou/openrc-v3/portage/package.use/rust b/builders/milou/openrc-v3/portage/package.use/rust
deleted file mode 100644
index 99c95db..0000000
--- a/builders/milou/openrc-v3/portage/package.use/rust
+++ /dev/null
@@ -1 +0,0 @@
-dev-lang/rust clippy rustfmt
diff --git a/builders/milou/openrc-v3/portage/package.use/xfce4 b/builders/milou/openrc-v3/portage/package.use/xfce4
deleted file mode 100644
index 47dd0b9..0000000
--- a/builders/milou/openrc-v3/portage/package.use/xfce4
+++ /dev/null
@@ -1 +0,0 @@
-dev-libs/libdbusmenu gtk3
diff --git a/builders/milou/openrc-v3/portage/package.use/zlib b/builders/milou/openrc-v3/portage/package.use/zlib
deleted file mode 100644
index b934da8..0000000
--- a/builders/milou/openrc-v3/portage/package.use/zlib
+++ /dev/null
@@ -1 +0,0 @@
-sys-libs/zlib minizip
diff --git a/builders/milou/openrc-v3/run-update b/builders/milou/openrc-v3/run-update
deleted file mode 100755
index 02cdf8a..0000000
--- a/builders/milou/openrc-v3/run-update
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# if one thing fails, abort entirely
-set -e
-
-emerge -uDNkq --changed-deps --backtrack=100 --keep-going world
-
-emerge --depclean --quiet-unmerge-warn
diff --git a/builders/milou/openrc-v3/world b/builders/milou/openrc-v3/world
deleted file mode 100644
index e4ee9c0..0000000
--- a/builders/milou/openrc-v3/world
+++ /dev/null
@@ -1,45 +0,0 @@
-app-admin/keepassxc
-app-containers/docker
-app-containers/earthly
-app-editors/emacs
-app-editors/nano
-app-editors/vim
-app-office/abiword
-app-office/gnucash
-app-office/libreoffice
-app-office/texstudio
-app-officeext/texmaths
-app-portage/eix
-app-portage/gentoolkit
-app-text/pdftk
-app-text/xournalpp
-dev-lang/mono
-dev-lang/rust
-dev-tex/latex-beamer
-gnome-base/gnome
-gnome-base/gnome-extra-apps
-kde-apps/kde-apps-meta
-kde-apps/kdepim-meta
-kde-plasma/plasma-meta
-lxqt-base/lxqt-meta
-mate-base/mate
-media-gfx/blender
-media-gfx/engauge
-media-gfx/gimp
-media-gfx/gnuclad
-media-gfx/inkscape
-media-gfx/povray
-media-sound/clementine
-net-firewall/fwbuilder
-net-irc/quassel
-net-misc/chrony
-net-misc/dhcpcd
-net-vpn/openvpn
-sci-visualization/gnuplot
-sci-visualization/gwyddion
-sci-visualization/spyview
-sys-apps/portage
-sys-devel/clang
-dev-debug/gdb
-www-client/firefox
-xfce-base/xfce4-meta
diff --git a/builders/milou/openrc/portage/make.conf b/builders/milou/openrc/portage/make.conf
deleted file mode 100644
index 1ab00b0..0000000
--- a/builders/milou/openrc/portage/make.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-# These settings were set by the catalyst build script that automatically
-# built this stage.
-# Please consult /usr/share/portage/config/make.conf.example for a more
-# detailed example.
-COMMON_FLAGS="-O2 -pipe -march=x86-64 -mtune=generic"
-CFLAGS="${COMMON_FLAGS}"
-CXXFLAGS="${COMMON_FLAGS}"
-FCFLAGS="${COMMON_FLAGS}"
-FFLAGS="${COMMON_FLAGS}"
-
-# NOTE: This stage was built with the bindist Use flag enabled
-PORTDIR="/var/db/repos/gentoo"
-DISTDIR="/var/cache/distfiles"
-PKGDIR="/var/cache/binpkgs"
-
-# This sets the language of build output to English.
-# Please keep this setting intact when reporting bugs.
-LC_MESSAGES=C
-
-MAKEOPTS="-j32 -l64"
-
-EMERGE_DEFAULT_OPTS="--jobs 20 --load 64 --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner"
-
-FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox"
-
-BINPKG_FORMAT="gpkg"
-BINPKG_COMPRESS="xz"
-
-USE="bindist"
-
-ACCEPT_RESTRICT="* -bindist"
-
-ACCEPT_LICENSE="@FREE MPEG-4"
-
-LC_ALL="en_US.utf8"
-
diff --git a/builders/milou/openrc/portage/make.profile b/builders/milou/openrc/portage/make.profile
deleted file mode 120000
index e9a9efc..0000000
--- a/builders/milou/openrc/portage/make.profile
+++ /dev/null
@@ -1 +0,0 @@
-/var/db/repos/gentoo/profiles/default/linux/amd64/17.1/desktop/gnome
\ No newline at end of file
diff --git a/builders/milou/openrc/portage/package.use/bindist b/builders/milou/openrc/portage/package.use/bindist
deleted file mode 100644
index b75a197..0000000
--- a/builders/milou/openrc/portage/package.use/bindist
+++ /dev/null
@@ -1,2 +0,0 @@
-
-net-voip/telepathy-gabble gnutls
diff --git a/builders/milou/openrc/portage/package.use/blender b/builders/milou/openrc/portage/package.use/blender
deleted file mode 100644
index a363b10..0000000
--- a/builders/milou/openrc/portage/package.use/blender
+++ /dev/null
@@ -1,5 +0,0 @@
-media-libs/freetype brotli
-media-video/ffmpeg opus theora vpx
-
-# circ
-media-libs/opencolorio -opengl
diff --git a/builders/milou/openrc/portage/package.use/dist-kernel b/builders/milou/openrc/portage/package.use/dist-kernel
deleted file mode 100644
index 7e6ada4..0000000
--- a/builders/milou/openrc/portage/package.use/dist-kernel
+++ /dev/null
@@ -1 +0,0 @@
-*/* dist-kernel
diff --git a/builders/milou/openrc/portage/package.use/fixed b/builders/milou/openrc/portage/package.use/fixed
deleted file mode 100644
index 9574ec7..0000000
--- a/builders/milou/openrc/portage/package.use/fixed
+++ /dev/null
@@ -1,6 +0,0 @@
-# 26f47f5c7df6edda39ff1febc821f1f8e1803321
-sys-apps/dbus user-session
-
-
-# todo
-media-libs/freetype harfbuzz
diff --git a/builders/milou/openrc/portage/package.use/inkscape b/builders/milou/openrc/portage/package.use/inkscape
deleted file mode 100644
index 4b2df36..0000000
--- a/builders/milou/openrc/portage/package.use/inkscape
+++ /dev/null
@@ -1 +0,0 @@
-dev-python/pillow webp
diff --git a/builders/milou/openrc/portage/package.use/kde b/builders/milou/openrc/portage/package.use/kde
deleted file mode 100644
index 557e094..0000000
--- a/builders/milou/openrc/portage/package.use/kde
+++ /dev/null
@@ -1,11 +0,0 @@
-kde-frameworks/* qml
-kde-plasma/kwin lock
-media-libs/opencv contrib contribdnn
-media-libs/mlt ffmpeg frei0r
-media-plugins/gst-plugins-meta theora v4l
-media-video/ffmpeg libass
-dev-qt/* qml
-dev-qt/qtwebengine widgets
-dev-qt/qtscript scripttools
-dev-qt/qtsql mysql
-dev-qt/qtpositioning geoclue
diff --git a/builders/milou/openrc/portage/package.use/multilib b/builders/milou/openrc/portage/package.use/multilib
deleted file mode 100644
index 9537596..0000000
--- a/builders/milou/openrc/portage/package.use/multilib
+++ /dev/null
@@ -1,27 +0,0 @@
-dev-libs/icu abi_x86_32
-dev-libs/libclc abi_x86_32
-dev-libs/libffi abi_x86_32
-dev-libs/libxml2 abi_x86_32
-dev-ml/llvm-ocaml abi_x86_32
-dev-python/clang-python abi_x86_32
-dev-python/lit abi_x86_32
-dev-util/lldb abi_x86_32
-sys-devel/clang abi_x86_32
-sys-devel/clang-common abi_x86_32
-sys-devel/clang-runtime abi_x86_32
-sys-devel/clang-toolchain-symlinks abi_x86_32
-sys-devel/lld abi_x86_32
-sys-devel/lld-toolchain-symlinks abi_x86_32
-sys-devel/llvm abi_x86_32
-sys-devel/llvm-common abi_x86_32
-sys-devel/llvm-toolchain-symlinks abi_x86_32
-sys-devel/llvmgold abi_x86_32
-sys-libs/compiler-rt abi_x86_32
-sys-libs/compiler-rt-sanitizers abi_x86_32
-sys-libs/gpm abi_x86_32
-sys-libs/libcxx abi_x86_32
-sys-libs/libcxxabi abi_x86_32
-sys-libs/libomp abi_x86_32
-sys-libs/llvm-libunwind abi_x86_32
-sys-libs/ncurses abi_x86_32 -gpm
-sys-libs/zlib abi_x86_32
diff --git a/builders/milou/openrc/portage/package.use/queued b/builders/milou/openrc/portage/package.use/queued
deleted file mode 100644
index 49491b2..0000000
--- a/builders/milou/openrc/portage/package.use/queued
+++ /dev/null
@@ -1 +0,0 @@
-media-libs/libvpx postproc
diff --git a/builders/milou/openrc/portage/package.use/rust b/builders/milou/openrc/portage/package.use/rust
deleted file mode 100644
index 99c95db..0000000
--- a/builders/milou/openrc/portage/package.use/rust
+++ /dev/null
@@ -1 +0,0 @@
-dev-lang/rust clippy rustfmt
diff --git a/builders/milou/openrc/portage/package.use/xfce4 b/builders/milou/openrc/portage/package.use/xfce4
deleted file mode 100644
index 47dd0b9..0000000
--- a/builders/milou/openrc/portage/package.use/xfce4
+++ /dev/null
@@ -1 +0,0 @@
-dev-libs/libdbusmenu gtk3
diff --git a/builders/milou/openrc/portage/package.use/zlib b/builders/milou/openrc/portage/package.use/zlib
deleted file mode 100644
index b934da8..0000000
--- a/builders/milou/openrc/portage/package.use/zlib
+++ /dev/null
@@ -1 +0,0 @@
-sys-libs/zlib minizip
diff --git a/builders/milou/openrc/run-update b/builders/milou/openrc/run-update
deleted file mode 100755
index 02cdf8a..0000000
--- a/builders/milou/openrc/run-update
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# if one thing fails, abort entirely
-set -e
-
-emerge -uDNkq --changed-deps --backtrack=100 --keep-going world
-
-emerge --depclean --quiet-unmerge-warn
diff --git a/builders/milou/openrc/world b/builders/milou/openrc/world
deleted file mode 100644
index e4ee9c0..0000000
--- a/builders/milou/openrc/world
+++ /dev/null
@@ -1,45 +0,0 @@
-app-admin/keepassxc
-app-containers/docker
-app-containers/earthly
-app-editors/emacs
-app-editors/nano
-app-editors/vim
-app-office/abiword
-app-office/gnucash
-app-office/libreoffice
-app-office/texstudio
-app-officeext/texmaths
-app-portage/eix
-app-portage/gentoolkit
-app-text/pdftk
-app-text/xournalpp
-dev-lang/mono
-dev-lang/rust
-dev-tex/latex-beamer
-gnome-base/gnome
-gnome-base/gnome-extra-apps
-kde-apps/kde-apps-meta
-kde-apps/kdepim-meta
-kde-plasma/plasma-meta
-lxqt-base/lxqt-meta
-mate-base/mate
-media-gfx/blender
-media-gfx/engauge
-media-gfx/gimp
-media-gfx/gnuclad
-media-gfx/inkscape
-media-gfx/povray
-media-sound/clementine
-net-firewall/fwbuilder
-net-irc/quassel
-net-misc/chrony
-net-misc/dhcpcd
-net-vpn/openvpn
-sci-visualization/gnuplot
-sci-visualization/gwyddion
-sci-visualization/spyview
-sys-apps/portage
-sys-devel/clang
-dev-debug/gdb
-www-client/firefox
-xfce-base/xfce4-meta
diff --git a/builders/milou/server-v3/portage/make.conf b/builders/milou/server-v3/portage/make.conf
deleted file mode 100644
index 96913ff..0000000
--- a/builders/milou/server-v3/portage/make.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-# These settings were set by the catalyst build script that automatically
-# built this stage.
-# Please consult /usr/share/portage/config/make.conf.example for a more
-# detailed example.
-COMMON_FLAGS="-O2 -pipe -march=x86-64-v3"
-CFLAGS="${COMMON_FLAGS}"
-CXXFLAGS="${COMMON_FLAGS}"
-FCFLAGS="${COMMON_FLAGS}"
-FFLAGS="${COMMON_FLAGS}"
-
-# NOTE: This stage was built with the bindist Use flag enabled
-PORTDIR="/var/db/repos/gentoo"
-DISTDIR="/var/cache/distfiles"
-PKGDIR="/var/cache/binpkgs"
-
-# This sets the language of build output to English.
-# Please keep this setting intact when reporting bugs.
-LC_MESSAGES=C
-
-MAKEOPTS="-j32 -l64"
-
-EMERGE_DEFAULT_OPTS="--jobs 20 --load 64 --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner"
-
-FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox"
-
-BINPKG_FORMAT="gpkg"
-BINPKG_COMPRESS="xz"
-
-USE="bindist"
-
-ACCEPT_RESTRICT="* -bindist"
-
-ACCEPT_LICENSE="@FREE MPEG-4"
-
-LC_ALL="en_US.utf8"
-
-# x86-64-v1:
-CPU_FLAGS_X86_v1="cmov cx8 fpu fxsr mmx osfxsr sce mmxext sse sse2"
-
-# x86-64-v2:
-CPU_FLAGS_X86_v2="${CPU_FLAGS_X86_v1} cmpxchg16b lahf_sahf popcnt sse3 sse4_1 sse4_2 ssse3"
-
-# x86-64-v3:
-CPU_FLAGS_X86_v3="${CPU_FLAGS_X86_v2} avx avx2 bmi1 bmi2 f16c fma3 lzcnt movbe osxsave"
-
-CPU_FLAGS_X86=${CPU_FLAGS_X86_v3}
diff --git a/builders/milou/server-v3/portage/make.profile b/builders/milou/server-v3/portage/make.profile
deleted file mode 120000
index 228f629..0000000
--- a/builders/milou/server-v3/portage/make.profile
+++ /dev/null
@@ -1 +0,0 @@
-/var/db/repos/gentoo/profiles/default/linux/amd64/17.1/no-multilib
\ No newline at end of file
diff --git a/builders/milou/server-v3/portage/package.use/dist-kernel b/builders/milou/server-v3/portage/package.use/dist-kernel
deleted file mode 100644
index 7e6ada4..0000000
--- a/builders/milou/server-v3/portage/package.use/dist-kernel
+++ /dev/null
@@ -1 +0,0 @@
-*/* dist-kernel
diff --git a/builders/milou/server-v3/run-update b/builders/milou/server-v3/run-update
deleted file mode 100755
index 417f835..0000000
--- a/builders/milou/server-v3/run-update
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# if one thing fails, abort entirely
-set -e
-
-emerge -uDNkq --changed-deps --backtrack=100 --keep-going world
-
-emerge --depclean --quiet-unmerge-warn
-
-eclean-pkg
diff --git a/builders/milou/server-v3/world b/builders/milou/server-v3/world
deleted file mode 100644
index 354baa0..0000000
--- a/builders/milou/server-v3/world
+++ /dev/null
@@ -1,50 +0,0 @@
-app-accessibility/brltty
-app-accessibility/espeakup
-app-admin/hddtemp
-app-admin/rsyslog
-app-admin/sudo
-app-admin/syslog-ng
-app-admin/sysstat
-app-admin/testdisk
-app-arch/bzip2
-app-arch/bzip3
-app-arch/cpio
-app-arch/dpkg
-app-arch/deb2targz
-app-arch/gzip
-app-arch/mt-st
-app-arch/p7zip
-app-arch/pbzip2
-app-arch/rpm
-app-arch/tar
-app-arch/zip
-app-backup/fsarchiver
-app-benchmarks/bonnie++
-app-benchmarks/dbench
-app-benchmarks/stress
-app-benchmarks/tiobench
-app-cdr/dvd+rw-tools
-app-cdr/cdrtools
-app-containers/docker
-app-crypt/chntpw
-app-editors/emacs
-app-editors/hexedit
-app-editors/joe
-app-editors/mg
-app-editors/nano
-app-editors/neovim
-app-editors/vim
-app-emacs/ebuild-mode
-app-portage/gentoolkit
-dev-debug/gdb
-dev-debug/strace
-net-dialup/minicom
-net-misc/chrony
-net-misc/dhcpcd
-net-vpn/openvpn
-sci-libs/armadillo
-sci-mathematics/z3
-sys-apps/bat
-sys-apps/portage
-sys-devel/clang
-www-servers/apache
diff --git a/builders/milou/server/portage/make.conf b/builders/milou/server/portage/make.conf
deleted file mode 100644
index 1ab00b0..0000000
--- a/builders/milou/server/portage/make.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-# These settings were set by the catalyst build script that automatically
-# built this stage.
-# Please consult /usr/share/portage/config/make.conf.example for a more
-# detailed example.
-COMMON_FLAGS="-O2 -pipe -march=x86-64 -mtune=generic"
-CFLAGS="${COMMON_FLAGS}"
-CXXFLAGS="${COMMON_FLAGS}"
-FCFLAGS="${COMMON_FLAGS}"
-FFLAGS="${COMMON_FLAGS}"
-
-# NOTE: This stage was built with the bindist Use flag enabled
-PORTDIR="/var/db/repos/gentoo"
-DISTDIR="/var/cache/distfiles"
-PKGDIR="/var/cache/binpkgs"
-
-# This sets the language of build output to English.
-# Please keep this setting intact when reporting bugs.
-LC_MESSAGES=C
-
-MAKEOPTS="-j32 -l64"
-
-EMERGE_DEFAULT_OPTS="--jobs 20 --load 64 --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner"
-
-FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox"
-
-BINPKG_FORMAT="gpkg"
-BINPKG_COMPRESS="xz"
-
-USE="bindist"
-
-ACCEPT_RESTRICT="* -bindist"
-
-ACCEPT_LICENSE="@FREE MPEG-4"
-
-LC_ALL="en_US.utf8"
-
diff --git a/builders/milou/server/portage/make.profile b/builders/milou/server/portage/make.profile
deleted file mode 120000
index 228f629..0000000
--- a/builders/milou/server/portage/make.profile
+++ /dev/null
@@ -1 +0,0 @@
-/var/db/repos/gentoo/profiles/default/linux/amd64/17.1/no-multilib
\ No newline at end of file
diff --git a/builders/milou/server/portage/package.use/dist-kernel b/builders/milou/server/portage/package.use/dist-kernel
deleted file mode 100644
index 7e6ada4..0000000
--- a/builders/milou/server/portage/package.use/dist-kernel
+++ /dev/null
@@ -1 +0,0 @@
-*/* dist-kernel
diff --git a/builders/milou/server/run-update b/builders/milou/server/run-update
deleted file mode 100755
index 417f835..0000000
--- a/builders/milou/server/run-update
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# if one thing fails, abort entirely
-set -e
-
-emerge -uDNkq --changed-deps --backtrack=100 --keep-going world
-
-emerge --depclean --quiet-unmerge-warn
-
-eclean-pkg
diff --git a/builders/milou/server/world b/builders/milou/server/world
deleted file mode 100644
index 354baa0..0000000
--- a/builders/milou/server/world
+++ /dev/null
@@ -1,50 +0,0 @@
-app-accessibility/brltty
-app-accessibility/espeakup
-app-admin/hddtemp
-app-admin/rsyslog
-app-admin/sudo
-app-admin/syslog-ng
-app-admin/sysstat
-app-admin/testdisk
-app-arch/bzip2
-app-arch/bzip3
-app-arch/cpio
-app-arch/dpkg
-app-arch/deb2targz
-app-arch/gzip
-app-arch/mt-st
-app-arch/p7zip
-app-arch/pbzip2
-app-arch/rpm
-app-arch/tar
-app-arch/zip
-app-backup/fsarchiver
-app-benchmarks/bonnie++
-app-benchmarks/dbench
-app-benchmarks/stress
-app-benchmarks/tiobench
-app-cdr/dvd+rw-tools
-app-cdr/cdrtools
-app-containers/docker
-app-crypt/chntpw
-app-editors/emacs
-app-editors/hexedit
-app-editors/joe
-app-editors/mg
-app-editors/nano
-app-editors/neovim
-app-editors/vim
-app-emacs/ebuild-mode
-app-portage/gentoolkit
-dev-debug/gdb
-dev-debug/strace
-net-dialup/minicom
-net-misc/chrony
-net-misc/dhcpcd
-net-vpn/openvpn
-sci-libs/armadillo
-sci-mathematics/z3
-sys-apps/bat
-sys-apps/portage
-sys-devel/clang
-www-servers/apache