aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
l---------builders/demeter/gnome/portage/make.profile1
-rwxr-xr-xbuilders/demeter/gnome/run-update10
l---------builders/demeter/kde/portage/make.profile1
-rwxr-xr-xbuilders/demeter/kde/run-update12
l---------builders/demeter/server/portage/make.profile1
-rwxr-xr-xbuilders/demeter/server/run-update10
-rwxr-xr-xbuilders/jiji/binhost-update27
-rw-r--r--builders/jiji/gnome-23/portage/make.conf (renamed from builders/jiji/kde/portage/make.conf)7
l---------builders/jiji/gnome-23/portage/make.profile1
-rw-r--r--builders/jiji/gnome-23/portage/package.use/bindist (renamed from builders/demeter/gnome/portage/package.use/bindist)0
-rw-r--r--builders/jiji/gnome-23/portage/package.use/dist-kernel (renamed from builders/demeter/gnome/portage/package.use/dist-kernel)0
-rw-r--r--builders/jiji/gnome-23/portage/package.use/fixed (renamed from builders/demeter/gnome/portage/package.use/fixed)0
-rw-r--r--builders/jiji/gnome-23/portage/package.use/queued (renamed from builders/jiji/gnome/portage/package.use/queued)0
-rw-r--r--builders/jiji/gnome-23/portage/package.use/z-circ0
-rw-r--r--builders/jiji/gnome-23/portage/package.use/zlib (renamed from builders/demeter/gnome/portage/package.use/zlib)0
-rwxr-xr-xbuilders/jiji/gnome-23/run-update10
-rw-r--r--builders/jiji/gnome-23/world (renamed from builders/jiji/gnome/world)3
l---------builders/jiji/gnome/portage/make.profile1
-rwxr-xr-xbuilders/jiji/gnome/run-update10
-rw-r--r--builders/jiji/kde-23/portage/make.conf (renamed from builders/jiji/server/portage/make.conf)7
l---------builders/jiji/kde-23/portage/make.profile1
-rw-r--r--builders/jiji/kde-23/portage/package.use/bindist (renamed from builders/demeter/kde/portage/package.use/bindist)0
-rw-r--r--builders/jiji/kde-23/portage/package.use/dist-kernel (renamed from builders/demeter/kde/portage/package.use/dist-kernel)0
-rw-r--r--builders/jiji/kde-23/portage/package.use/ffmpeg (renamed from builders/demeter/kde/portage/package.use/ffmpeg)0
-rw-r--r--builders/jiji/kde-23/portage/package.use/fixed (renamed from builders/demeter/kde/portage/package.use/fixed)0
-rw-r--r--builders/jiji/kde-23/portage/package.use/queued3
-rwxr-xr-xbuilders/jiji/kde-23/run-update10
-rw-r--r--builders/jiji/kde-23/world (renamed from builders/jiji/kde/world)2
l---------builders/jiji/kde/portage/make.profile1
-rwxr-xr-xbuilders/jiji/kde/run-update12
-rw-r--r--builders/jiji/server-23/portage/make.conf (renamed from builders/jiji/gnome/portage/make.conf)7
l---------builders/jiji/server-23/portage/make.profile1
-rw-r--r--builders/jiji/server-23/portage/package.use/dist-kernel (renamed from builders/demeter/server/portage/package.use/dist-kernel)0
-rw-r--r--builders/jiji/server-23/portage/package.use/go (renamed from builders/jiji/server/portage/package.use/go)0
-rwxr-xr-xbuilders/jiji/server-23/run-update10
-rw-r--r--builders/jiji/server-23/world (renamed from builders/demeter/server/world)0
l---------builders/jiji/server/portage/make.profile1
-rwxr-xr-xbuilders/jiji/server/run-update10
-rw-r--r--builders/jiji/server/world9
-rwxr-xr-xbuilders/milou/binhost-update (renamed from builders/demeter/binhost-update)49
-rw-r--r--builders/milou/fstab.inc10
-rw-r--r--builders/milou/gnome-23/portage/make.conf (renamed from builders/demeter/kde/portage/make.conf)9
l---------builders/milou/gnome-23/portage/make.profile1
-rw-r--r--builders/milou/gnome-23/portage/package.use/bindist (renamed from builders/jiji/gnome/portage/package.use/bindist)0
-rw-r--r--builders/milou/gnome-23/portage/package.use/blender7
-rw-r--r--builders/milou/gnome-23/portage/package.use/dist-kernel (renamed from builders/jiji/gnome/portage/package.use/dist-kernel)0
-rw-r--r--builders/milou/gnome-23/portage/package.use/fixed (renamed from builders/jiji/gnome/portage/package.use/fixed)0
-rw-r--r--builders/milou/gnome-23/portage/package.use/inkscape1
-rw-r--r--builders/milou/gnome-23/portage/package.use/multilib31
-rw-r--r--builders/milou/gnome-23/portage/package.use/queued (renamed from builders/demeter/gnome/portage/package.use/queued)0
-rw-r--r--builders/milou/gnome-23/portage/package.use/xfce4 (renamed from builders/demeter/gnome/portage/package.use/xfce4)0
-rw-r--r--builders/milou/gnome-23/portage/package.use/zlib (renamed from builders/jiji/gnome/portage/package.use/zlib)0
-rwxr-xr-xbuilders/milou/gnome-23/run-update8
-rw-r--r--builders/milou/gnome-23/world (renamed from builders/demeter/gnome/world)12
-rw-r--r--builders/milou/gnome-v3-23/portage/make.conf46
l---------builders/milou/gnome-v3-23/portage/make.profile1
-rw-r--r--builders/milou/gnome-v3-23/portage/package.use/bindist (renamed from builders/jiji/kde/portage/package.use/bindist)0
-rw-r--r--builders/milou/gnome-v3-23/portage/package.use/blender7
-rw-r--r--builders/milou/gnome-v3-23/portage/package.use/dist-kernel (renamed from builders/jiji/kde/portage/package.use/dist-kernel)0
-rw-r--r--builders/milou/gnome-v3-23/portage/package.use/fixed (renamed from builders/jiji/kde/portage/package.use/fixed)0
-rw-r--r--builders/milou/gnome-v3-23/portage/package.use/inkscape1
-rw-r--r--builders/milou/gnome-v3-23/portage/package.use/multilib31
-rw-r--r--builders/milou/gnome-v3-23/portage/package.use/queued1
-rw-r--r--builders/milou/gnome-v3-23/portage/package.use/xfce41
-rw-r--r--builders/milou/gnome-v3-23/portage/package.use/zlib1
-rwxr-xr-xbuilders/milou/gnome-v3-23/run-update8
-rw-r--r--builders/milou/gnome-v3-23/world44
-rw-r--r--builders/milou/kde-23/portage/make.conf (renamed from builders/demeter/gnome/portage/make.conf)9
l---------builders/milou/kde-23/portage/make.profile1
-rw-r--r--builders/milou/kde-23/portage/package.use/bindist2
-rw-r--r--builders/milou/kde-23/portage/package.use/calibre1
-rw-r--r--builders/milou/kde-23/portage/package.use/dist-kernel (renamed from builders/jiji/server/portage/package.use/dist-kernel)0
-rw-r--r--builders/milou/kde-23/portage/package.use/ffmpeg (renamed from builders/jiji/kde/portage/package.use/ffmpeg)0
-rw-r--r--builders/milou/kde-23/portage/package.use/fixed6
-rw-r--r--builders/milou/kde-23/portage/package.use/mate1
-rw-r--r--builders/milou/kde-23/portage/package.use/queued (renamed from builders/demeter/kde/portage/package.use/queued)0
-rwxr-xr-xbuilders/milou/kde-23/run-update8
-rw-r--r--builders/milou/kde-23/world (renamed from builders/demeter/kde/world)6
-rw-r--r--builders/milou/kde-v3-23/portage/make.conf46
l---------builders/milou/kde-v3-23/portage/make.profile1
-rw-r--r--builders/milou/kde-v3-23/portage/package.use/bindist2
-rw-r--r--builders/milou/kde-v3-23/portage/package.use/calibre1
-rw-r--r--builders/milou/kde-v3-23/portage/package.use/dist-kernel1
-rw-r--r--builders/milou/kde-v3-23/portage/package.use/ffmpeg1
-rw-r--r--builders/milou/kde-v3-23/portage/package.use/fixed6
-rw-r--r--builders/milou/kde-v3-23/portage/package.use/mate1
-rw-r--r--builders/milou/kde-v3-23/portage/package.use/queued (renamed from builders/jiji/kde/portage/package.use/queued)1
-rwxr-xr-xbuilders/milou/kde-v3-23/run-update8
-rw-r--r--builders/milou/kde-v3-23/world50
-rw-r--r--builders/milou/openrc-23/portage/make.conf (renamed from builders/demeter/server/portage/make.conf)9
l---------builders/milou/openrc-23/portage/make.profile1
-rw-r--r--builders/milou/openrc-23/portage/package.use/bindist2
-rw-r--r--builders/milou/openrc-23/portage/package.use/blender7
-rw-r--r--builders/milou/openrc-23/portage/package.use/dist-kernel1
-rw-r--r--builders/milou/openrc-23/portage/package.use/fixed6
-rw-r--r--builders/milou/openrc-23/portage/package.use/inkscape1
-rw-r--r--builders/milou/openrc-23/portage/package.use/kde11
-rw-r--r--builders/milou/openrc-23/portage/package.use/llvm2
-rw-r--r--builders/milou/openrc-23/portage/package.use/multilib (renamed from builders/demeter/gnome/portage/package.use/multilib)0
-rw-r--r--builders/milou/openrc-23/portage/package.use/queued1
-rw-r--r--builders/milou/openrc-23/portage/package.use/rust1
-rw-r--r--builders/milou/openrc-23/portage/package.use/xfce41
-rw-r--r--builders/milou/openrc-23/portage/package.use/zlib1
-rwxr-xr-xbuilders/milou/openrc-23/run-update8
-rw-r--r--builders/milou/openrc-23/world44
-rw-r--r--builders/milou/openrc-v3-23/portage/make.conf46
l---------builders/milou/openrc-v3-23/portage/make.profile1
-rw-r--r--builders/milou/openrc-v3-23/portage/package.use/bindist2
-rw-r--r--builders/milou/openrc-v3-23/portage/package.use/blender5
-rw-r--r--builders/milou/openrc-v3-23/portage/package.use/dist-kernel1
-rw-r--r--builders/milou/openrc-v3-23/portage/package.use/fixed6
-rw-r--r--builders/milou/openrc-v3-23/portage/package.use/inkscape1
-rw-r--r--builders/milou/openrc-v3-23/portage/package.use/kde11
-rw-r--r--builders/milou/openrc-v3-23/portage/package.use/llvm2
-rw-r--r--builders/milou/openrc-v3-23/portage/package.use/multilib27
-rw-r--r--builders/milou/openrc-v3-23/portage/package.use/queued1
-rw-r--r--builders/milou/openrc-v3-23/portage/package.use/rust1
-rw-r--r--builders/milou/openrc-v3-23/portage/package.use/xfce41
-rw-r--r--builders/milou/openrc-v3-23/portage/package.use/zlib1
-rwxr-xr-xbuilders/milou/openrc-v3-23/run-update8
-rw-r--r--builders/milou/openrc-v3-23/world45
-rw-r--r--builders/milou/server-23/portage/make.conf36
l---------builders/milou/server-23/portage/make.profile1
-rw-r--r--builders/milou/server-23/portage/package.use/dist-kernel1
-rwxr-xr-xbuilders/milou/server-23/run-update10
-rw-r--r--builders/milou/server-23/world50
-rw-r--r--builders/milou/server-v3-23/portage/make.conf46
l---------builders/milou/server-v3-23/portage/make.profile1
-rw-r--r--builders/milou/server-v3-23/portage/package.use/dist-kernel1
-rwxr-xr-xbuilders/milou/server-v3-23/run-update10
-rw-r--r--builders/milou/server-v3-23/world50
131 files changed, 922 insertions, 128 deletions
diff --git a/builders/demeter/gnome/portage/make.profile b/builders/demeter/gnome/portage/make.profile
deleted file mode 120000
index 4ac921c..0000000
--- a/builders/demeter/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/demeter/gnome/run-update b/builders/demeter/gnome/run-update
deleted file mode 100755
index c9c4434..0000000
--- a/builders/demeter/gnome/run-update
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# if one thing fails, abort entirely
-set -e
-
-emerge --sync -q
-
-emerge -uDNkq --changed-deps --rebuild-if-new-slot=y --rebuild-if-new-rev=y --rebuild-if-new-ver=y --rebuild-if-unbuilt=y --backtrack=100 --keep-going world
-
-emerge --depclean --quiet-unmerge-warn
diff --git a/builders/demeter/kde/portage/make.profile b/builders/demeter/kde/portage/make.profile
deleted file mode 120000
index 4f9702d..0000000
--- a/builders/demeter/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/demeter/kde/run-update b/builders/demeter/kde/run-update
deleted file mode 100755
index 7756f64..0000000
--- a/builders/demeter/kde/run-update
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# if one thing fails, abort entirely
-set -e
-
-emerge --sync -q
-
-emerge -uDNkq --changed-deps --rebuild-if-new-slot=y --rebuild-if-new-rev=y --rebuild-if-new-ver=y --rebuild-if-unbuilt=y --backtrack=100 --keep-going world
-
-emerge --depclean --quiet-unmerge-warn
-
-eclean-pkg -C
diff --git a/builders/demeter/server/portage/make.profile b/builders/demeter/server/portage/make.profile
deleted file mode 120000
index 228f629..0000000
--- a/builders/demeter/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/demeter/server/run-update b/builders/demeter/server/run-update
deleted file mode 100755
index c9c4434..0000000
--- a/builders/demeter/server/run-update
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# if one thing fails, abort entirely
-set -e
-
-emerge --sync -q
-
-emerge -uDNkq --changed-deps --rebuild-if-new-slot=y --rebuild-if-new-rev=y --rebuild-if-new-ver=y --rebuild-if-unbuilt=y --backtrack=100 --keep-going world
-
-emerge --depclean --quiet-unmerge-warn
diff --git a/builders/jiji/binhost-update b/builders/jiji/binhost-update
index 880468e..49210eb 100755
--- a/builders/jiji/binhost-update
+++ b/builders/jiji/binhost-update
@@ -1,6 +1,6 @@
#!/bin/bash
-BINHOST_NAME=arm64/17.0/arm64
+BINHOST_NAME=arm64/23.0/arm64
_BINHOST_NAME=$(echo ${BINHOST_NAME}|sed -e 's:/:_:g')
TMPFILE="/root/.tmp-binhost-${_BINHOST_NAME}-update-$(date +%s)"
@@ -9,13 +9,13 @@ LOCKFILE="/root/.tmp-binhost-${_BINHOST_NAME}-lock"
EMAIL_FROM=binhost@jiji.arm.dev.gentoo.org
EMAIL_TO=gentoo-binhost-autobuilds@lists.gentoo.org
-NSPAWN_NAMES="binhost-arm64-kde binhost-arm64-gnome binhost-arm64-server"
-
-MAX_HARMLESS=200
+NSPAWN_NAMES="binhost-arm64-kde-23 binhost-arm64-gnome-23 binhost-arm64-server-23"
UPLOAD_USER=arm64
UPLOAD_KEY=/root/.ssh/id_ed25519
+TMPFS_SIZE=64
+
send_email() {
local subject="[binhost ${BINHOST_NAME}] $1"
@@ -55,6 +55,7 @@ upsync_binpackages() {
--omit-dir-times
--delay-updates
--mkpath
+ --stats
)
rsync "${RSYNC_OPTS[@]}" "$1"/* "${UPLOAD_USER}@releng-incoming.gentoo.org:/release/weekly/binpackages/$2/"
}
@@ -86,26 +87,30 @@ touch ${LOCKFILE} || exit 112
verify_dnssec
+echo Starting run at $(date -u) > ${TMPFILE}
+echo Syncing host &>> ${TMPFILE}
-echo Starting run at $(date -u) > ${TMPFILE}
+emerge --sync -q &>> ${TMPFILE}
+
+anyfail=0
for n in ${NSPAWN_NAMES} ; do
echo Machine ${n} &>> ${TMPFILE}
echo &>> ${TMPFILE}
cd /var/lib/machines/${n}/etc/binhost &>> ${TMPFILE}
+ git reset --hard &>> ${TMPFILE}
git pull -q &>> ${TMPFILE}
cd /root &>> ${TMPFILE}
- systemd-nspawn -M ${n} /root/bin/run-update &>> ${TMPFILE}
+ systemd-nspawn --bind /var/cache/distfiles --bind-ro /var/db/repos/gentoo --tmpfs=/var/tmp:mode=1777,size=${TMPFS_SIZE}g -M ${n} /root/bin/run-update &>> ${TMPFILE}
+ let "anyfail+=$?"
done
+upsync_binpackages /var/lib/machines/binhost-arm64-kde-23/var/cache/binpkgs arm64/23.0/arm64 &>> ${TMPFILE}
-upsync_binpackages /var/lib/machines/binhost-arm64-kde/var/cache/binpkgs arm64/17.0/arm64 &>> ${TMPFILE}
-
-
-if [[ $(wc -l ${TMPFILE} | sed -e 's: .*$::g') -gt ${MAX_HARMLESS} ]] ; then
+if [[ ${anyfail} -gt 0 ]] ; then
- send_email "Update possibly failed" "Binhost ${BINHOST_NAME} update produced long output" ${TMPFILE}
+ send_email "Update failed" "Binhost ${BINHOST_NAME} update failed in at least one nspawn" ${TMPFILE}
fi
diff --git a/builders/jiji/kde/portage/make.conf b/builders/jiji/gnome-23/portage/make.conf
index 3202bba..3f97c6b 100644
--- a/builders/jiji/kde/portage/make.conf
+++ b/builders/jiji/gnome-23/portage/make.conf
@@ -17,13 +17,14 @@ PKGDIR="/var/cache/binpkgs"
# Please keep this setting intact when reporting bugs.
LC_MESSAGES=C
-MAKEOPTS="-j80 --load 80.0"
+MAKEOPTS="-j80 --load 160.0"
-EMERGE_DEFAULT_OPTS="--jobs 10 --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner"
+EMERGE_DEFAULT_OPTS="--jobs 20 --load 160 --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner"
-FEATURES="binpkg-multi-instance buildpkg -network-sandbox"
+FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox"
BINPKG_FORMAT="gpkg"
+BINPKG_COMPRESS="xz"
USE="bindist"
diff --git a/builders/jiji/gnome-23/portage/make.profile b/builders/jiji/gnome-23/portage/make.profile
new file mode 120000
index 0000000..a1c5d77
--- /dev/null
+++ b/builders/jiji/gnome-23/portage/make.profile
@@ -0,0 +1 @@
+/var/db/repos/gentoo/profiles/default/linux/arm64/23.0/desktop/gnome/systemd \ No newline at end of file
diff --git a/builders/demeter/gnome/portage/package.use/bindist b/builders/jiji/gnome-23/portage/package.use/bindist
index b75a197..b75a197 100644
--- a/builders/demeter/gnome/portage/package.use/bindist
+++ b/builders/jiji/gnome-23/portage/package.use/bindist
diff --git a/builders/demeter/gnome/portage/package.use/dist-kernel b/builders/jiji/gnome-23/portage/package.use/dist-kernel
index 7e6ada4..7e6ada4 100644
--- a/builders/demeter/gnome/portage/package.use/dist-kernel
+++ b/builders/jiji/gnome-23/portage/package.use/dist-kernel
diff --git a/builders/demeter/gnome/portage/package.use/fixed b/builders/jiji/gnome-23/portage/package.use/fixed
index 9574ec7..9574ec7 100644
--- a/builders/demeter/gnome/portage/package.use/fixed
+++ b/builders/jiji/gnome-23/portage/package.use/fixed
diff --git a/builders/jiji/gnome/portage/package.use/queued b/builders/jiji/gnome-23/portage/package.use/queued
index 418ed2d..418ed2d 100644
--- a/builders/jiji/gnome/portage/package.use/queued
+++ b/builders/jiji/gnome-23/portage/package.use/queued
diff --git a/builders/jiji/gnome-23/portage/package.use/z-circ b/builders/jiji/gnome-23/portage/package.use/z-circ
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/builders/jiji/gnome-23/portage/package.use/z-circ
diff --git a/builders/demeter/gnome/portage/package.use/zlib b/builders/jiji/gnome-23/portage/package.use/zlib
index b934da8..b934da8 100644
--- a/builders/demeter/gnome/portage/package.use/zlib
+++ b/builders/jiji/gnome-23/portage/package.use/zlib
diff --git a/builders/jiji/gnome-23/run-update b/builders/jiji/gnome-23/run-update
new file mode 100755
index 0000000..fff9934
--- /dev/null
+++ b/builders/jiji/gnome-23/run-update
@@ -0,0 +1,10 @@
+#!/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 -C
diff --git a/builders/jiji/gnome/world b/builders/jiji/gnome-23/world
index fa3c24b..129ff1e 100644
--- a/builders/jiji/gnome/world
+++ b/builders/jiji/gnome-23/world
@@ -3,6 +3,7 @@ app-editors/nano
app-editors/vim
app-office/libreoffice
app-portage/eix
+app-portage/gentoolkit
dev-tex/latex-beamer
gnome-base/gnome
gnome-base/gnome-extra-apps
@@ -14,5 +15,5 @@ net-vpn/openvpn
sci-visualization/gnuplot
sys-apps/portage
sys-devel/clang
-sys-devel/gdb
+dev-debug/gdb
www-client/firefox
diff --git a/builders/jiji/gnome/portage/make.profile b/builders/jiji/gnome/portage/make.profile
deleted file mode 120000
index fc2c0f6..0000000
--- a/builders/jiji/gnome/portage/make.profile
+++ /dev/null
@@ -1 +0,0 @@
-/var/db/repos/gentoo/profiles/default/linux/arm64/17.0/desktop/gnome/systemd \ No newline at end of file
diff --git a/builders/jiji/gnome/run-update b/builders/jiji/gnome/run-update
deleted file mode 100755
index c9c4434..0000000
--- a/builders/jiji/gnome/run-update
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# if one thing fails, abort entirely
-set -e
-
-emerge --sync -q
-
-emerge -uDNkq --changed-deps --rebuild-if-new-slot=y --rebuild-if-new-rev=y --rebuild-if-new-ver=y --rebuild-if-unbuilt=y --backtrack=100 --keep-going world
-
-emerge --depclean --quiet-unmerge-warn
diff --git a/builders/jiji/server/portage/make.conf b/builders/jiji/kde-23/portage/make.conf
index 3202bba..3f97c6b 100644
--- a/builders/jiji/server/portage/make.conf
+++ b/builders/jiji/kde-23/portage/make.conf
@@ -17,13 +17,14 @@ PKGDIR="/var/cache/binpkgs"
# Please keep this setting intact when reporting bugs.
LC_MESSAGES=C
-MAKEOPTS="-j80 --load 80.0"
+MAKEOPTS="-j80 --load 160.0"
-EMERGE_DEFAULT_OPTS="--jobs 10 --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner"
+EMERGE_DEFAULT_OPTS="--jobs 20 --load 160 --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner"
-FEATURES="binpkg-multi-instance buildpkg -network-sandbox"
+FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox"
BINPKG_FORMAT="gpkg"
+BINPKG_COMPRESS="xz"
USE="bindist"
diff --git a/builders/jiji/kde-23/portage/make.profile b/builders/jiji/kde-23/portage/make.profile
new file mode 120000
index 0000000..6ec3220
--- /dev/null
+++ b/builders/jiji/kde-23/portage/make.profile
@@ -0,0 +1 @@
+/var/db/repos/gentoo/profiles/default/linux/arm64/23.0/desktop/plasma/systemd \ No newline at end of file
diff --git a/builders/demeter/kde/portage/package.use/bindist b/builders/jiji/kde-23/portage/package.use/bindist
index b75a197..b75a197 100644
--- a/builders/demeter/kde/portage/package.use/bindist
+++ b/builders/jiji/kde-23/portage/package.use/bindist
diff --git a/builders/demeter/kde/portage/package.use/dist-kernel b/builders/jiji/kde-23/portage/package.use/dist-kernel
index 7e6ada4..7e6ada4 100644
--- a/builders/demeter/kde/portage/package.use/dist-kernel
+++ b/builders/jiji/kde-23/portage/package.use/dist-kernel
diff --git a/builders/demeter/kde/portage/package.use/ffmpeg b/builders/jiji/kde-23/portage/package.use/ffmpeg
index aad80a4..aad80a4 100644
--- a/builders/demeter/kde/portage/package.use/ffmpeg
+++ b/builders/jiji/kde-23/portage/package.use/ffmpeg
diff --git a/builders/demeter/kde/portage/package.use/fixed b/builders/jiji/kde-23/portage/package.use/fixed
index 9574ec7..9574ec7 100644
--- a/builders/demeter/kde/portage/package.use/fixed
+++ b/builders/jiji/kde-23/portage/package.use/fixed
diff --git a/builders/jiji/kde-23/portage/package.use/queued b/builders/jiji/kde-23/portage/package.use/queued
new file mode 100644
index 0000000..5b32ab5
--- /dev/null
+++ b/builders/jiji/kde-23/portage/package.use/queued
@@ -0,0 +1,3 @@
+media-libs/libvpx postproc
+dev-qt/qtpositioning geoclue
+dev-libs/libpcre2 pcre32
diff --git a/builders/jiji/kde-23/run-update b/builders/jiji/kde-23/run-update
new file mode 100755
index 0000000..fff9934
--- /dev/null
+++ b/builders/jiji/kde-23/run-update
@@ -0,0 +1,10 @@
+#!/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 -C
diff --git a/builders/jiji/kde/world b/builders/jiji/kde-23/world
index b6dbdc3..5e6a2ec 100644
--- a/builders/jiji/kde/world
+++ b/builders/jiji/kde-23/world
@@ -16,6 +16,6 @@ net-vpn/openvpn
sci-visualization/gnuplot
sys-apps/portage
sys-devel/clang
-sys-devel/gdb
+dev-debug/gdb
www-client/firefox
www-servers/apache
diff --git a/builders/jiji/kde/portage/make.profile b/builders/jiji/kde/portage/make.profile
deleted file mode 120000
index 7af4278..0000000
--- a/builders/jiji/kde/portage/make.profile
+++ /dev/null
@@ -1 +0,0 @@
-/var/db/repos/gentoo/profiles/default/linux/arm64/17.0/desktop/plasma/systemd \ No newline at end of file
diff --git a/builders/jiji/kde/run-update b/builders/jiji/kde/run-update
deleted file mode 100755
index c53e20b..0000000
--- a/builders/jiji/kde/run-update
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# if one thing fails, abort entirely
-set -e
-
-emerge --sync -q
-
-emerge -uDNkq --changed-deps --rebuild-if-new-slot=y --rebuild-if-new-rev=y --rebuild-if-new-ver=y --rebuild-if-unbuilt=y --backtrack=100 --keep-going world
-
-emerge --depclean --quiet-unmerge-warn
-
-eclean-pkg -C -t2m
diff --git a/builders/jiji/gnome/portage/make.conf b/builders/jiji/server-23/portage/make.conf
index 3202bba..3f97c6b 100644
--- a/builders/jiji/gnome/portage/make.conf
+++ b/builders/jiji/server-23/portage/make.conf
@@ -17,13 +17,14 @@ PKGDIR="/var/cache/binpkgs"
# Please keep this setting intact when reporting bugs.
LC_MESSAGES=C
-MAKEOPTS="-j80 --load 80.0"
+MAKEOPTS="-j80 --load 160.0"
-EMERGE_DEFAULT_OPTS="--jobs 10 --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner"
+EMERGE_DEFAULT_OPTS="--jobs 20 --load 160 --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner"
-FEATURES="binpkg-multi-instance buildpkg -network-sandbox"
+FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox"
BINPKG_FORMAT="gpkg"
+BINPKG_COMPRESS="xz"
USE="bindist"
diff --git a/builders/jiji/server-23/portage/make.profile b/builders/jiji/server-23/portage/make.profile
new file mode 120000
index 0000000..da9a6db
--- /dev/null
+++ b/builders/jiji/server-23/portage/make.profile
@@ -0,0 +1 @@
+/var/db/repos/gentoo/profiles/default/linux/arm64/23.0 \ No newline at end of file
diff --git a/builders/demeter/server/portage/package.use/dist-kernel b/builders/jiji/server-23/portage/package.use/dist-kernel
index 7e6ada4..7e6ada4 100644
--- a/builders/demeter/server/portage/package.use/dist-kernel
+++ b/builders/jiji/server-23/portage/package.use/dist-kernel
diff --git a/builders/jiji/server/portage/package.use/go b/builders/jiji/server-23/portage/package.use/go
index 2b6a6d9..2b6a6d9 100644
--- a/builders/jiji/server/portage/package.use/go
+++ b/builders/jiji/server-23/portage/package.use/go
diff --git a/builders/jiji/server-23/run-update b/builders/jiji/server-23/run-update
new file mode 100755
index 0000000..fff9934
--- /dev/null
+++ b/builders/jiji/server-23/run-update
@@ -0,0 +1,10 @@
+#!/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 -C
diff --git a/builders/demeter/server/world b/builders/jiji/server-23/world
index 3555899..3555899 100644
--- a/builders/demeter/server/world
+++ b/builders/jiji/server-23/world
diff --git a/builders/jiji/server/portage/make.profile b/builders/jiji/server/portage/make.profile
deleted file mode 120000
index b26bce1..0000000
--- a/builders/jiji/server/portage/make.profile
+++ /dev/null
@@ -1 +0,0 @@
-/var/db/repos/gentoo/profiles/default/linux/arm64/17.0 \ No newline at end of file
diff --git a/builders/jiji/server/run-update b/builders/jiji/server/run-update
deleted file mode 100755
index c9c4434..0000000
--- a/builders/jiji/server/run-update
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# if one thing fails, abort entirely
-set -e
-
-emerge --sync -q
-
-emerge -uDNkq --changed-deps --rebuild-if-new-slot=y --rebuild-if-new-rev=y --rebuild-if-new-ver=y --rebuild-if-unbuilt=y --backtrack=100 --keep-going world
-
-emerge --depclean --quiet-unmerge-warn
diff --git a/builders/jiji/server/world b/builders/jiji/server/world
deleted file mode 100644
index 3555899..0000000
--- a/builders/jiji/server/world
+++ /dev/null
@@ -1,9 +0,0 @@
-app-containers/docker
-app-editors/nano
-app-portage/gentoolkit
-net-misc/chrony
-net-misc/dhcpcd
-net-vpn/openvpn
-sys-apps/portage
-sys-devel/clang
-www-servers/apache
diff --git a/builders/demeter/binhost-update b/builders/milou/binhost-update
index a3b0b33..3bd6b29 100755
--- a/builders/demeter/binhost-update
+++ b/builders/milou/binhost-update
@@ -1,20 +1,37 @@
#!/bin/bash
-BINHOST_NAME=amd64/17.1/x86-64
+BINHOST_NAME=amd64/xx.x/x86-64
_BINHOST_NAME=$(echo ${BINHOST_NAME}|sed -e 's:/:_:g')
TMPFILE="/root/.tmp-binhost-${_BINHOST_NAME}-update-$(date +%s)"
LOCKFILE="/root/.tmp-binhost-${_BINHOST_NAME}-lock"
-EMAIL_FROM=binhost@demeter.amd64.dev.gentoo.org
+EMAIL_FROM=binhost@milou.amd64.dev.gentoo.org
EMAIL_TO=gentoo-binhost-autobuilds@lists.gentoo.org
-NSPAWN_NAMES="binhost-amd64-x86-64 binhost-amd64-x86-64-gnome binhost-amd64-x86-64-server"
-
-MAX_HARMLESS=150
+NSPAWNS_x8664_23="
+ binhost-amd64-x86-64-kde-23
+ binhost-amd64-x86-64-gnome-23
+ binhost-amd64-x86-64-openrc-23
+ binhost-amd64-x86-64-server-23
+"
+
+NSPAWNS_x8664v3_23="
+ binhost-amd64-x86-64-v3-kde-23
+ binhost-amd64-x86-64-v3-gnome-23
+ binhost-amd64-x86-64-v3-openrc-23
+ binhost-amd64-x86-64-v3-server-23
+"
+
+NSPAWN_NAMES="
+ ${NSPAWNS_x8664_23}
+ ${NSPAWNS_x8664v3_23}
+"
UPLOAD_USER=amd64
-UPLOAD_KEY=/root/.ssh/id_rsa
+UPLOAD_KEY=/root/.ssh/id_ed25519
+
+TMPFS_SIZE=48
send_email() {
@@ -55,6 +72,7 @@ upsync_binpackages() {
--omit-dir-times
--delay-updates
--mkpath
+ --stats
)
rsync "${RSYNC_OPTS[@]}" "$1"/* "${UPLOAD_USER}@releng-incoming.gentoo.org:/release/weekly/binpackages/$2/"
}
@@ -86,26 +104,33 @@ touch ${LOCKFILE} || exit 112
verify_dnssec
+echo Starting run at $(date -u) > ${TMPFILE}
+echo Syncing host &>> ${TMPFILE}
-echo Starting run at $(date -u) > ${TMPFILE}
+emerge --sync -q &>> ${TMPFILE}
+
+anyfail=0
for n in ${NSPAWN_NAMES} ; do
echo Machine ${n} &>> ${TMPFILE}
echo &>> ${TMPFILE}
cd /var/lib/machines/${n}/etc/binhost &>> ${TMPFILE}
- git pull -q &>> ${TMPFILE}
+ git reset --hard &>> ${TMPFILE}
+ git pull &>> ${TMPFILE}
cd /root &>> ${TMPFILE}
- systemd-nspawn -M ${n} /root/bin/run-update &>> ${TMPFILE}
+ systemd-nspawn --bind /var/cache/distfiles --bind-ro /var/db/repos/gentoo --tmpfs=/var/tmp:mode=1777,size=${TMPFS_SIZE}g -M ${n} /root/bin/run-update &>> ${TMPFILE}
+ let "anyfail+=$?"
done
-upsync_binpackages /var/lib/machines/binhost-amd64-x86-64/var/cache/binpkgs amd64/17.1/x86-64 &>> ${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}
-if [[ $(wc -l ${TMPFILE} | sed -e 's: .*$::g') -gt ${MAX_HARMLESS} ]] ; then
+if [[ ${anyfail} -gt 0 ]] ; then
- send_email "Update possibly failed" "Binhost ${BINHOST_NAME} update produced long output" ${TMPFILE}
+ send_email "Update failed" "Binhost ${BINHOST_NAME} update failed in at least one nspawn" ${TMPFILE}
fi
diff --git a/builders/milou/fstab.inc b/builders/milou/fstab.inc
new file mode 100644
index 0000000..8027800
--- /dev/null
+++ b/builders/milou/fstab.inc
@@ -0,0 +1,10 @@
+# for the binhosts, mount package dirs together (per abi)
+
+/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
+
+/var/lib/machines/binhost-amd64-x86-64-v3-kde-23/var/cache/binpkgs /var/lib/machines/binhost-amd64-x86-64-v3-gnome-23/var/cache/binpkgs bind bind 0 0
+/var/lib/machines/binhost-amd64-x86-64-v3-kde-23/var/cache/binpkgs /var/lib/machines/binhost-amd64-x86-64-v3-server-23/var/cache/binpkgs bind bind 0 0
+/var/lib/machines/binhost-amd64-x86-64-v3-kde-23/var/cache/binpkgs /var/lib/machines/binhost-amd64-x86-64-v3-openrc-23/var/cache/binpkgs bind bind 0 0
+
diff --git a/builders/demeter/kde/portage/make.conf b/builders/milou/gnome-23/portage/make.conf
index d9bec57..537f5b4 100644
--- a/builders/demeter/kde/portage/make.conf
+++ b/builders/milou/gnome-23/portage/make.conf
@@ -17,15 +17,16 @@ PKGDIR="/var/cache/binpkgs"
# Please keep this setting intact when reporting bugs.
LC_MESSAGES=C
-MAKEOPTS="-j17 --load 17.0"
+MAKEOPTS="-j32 -l64"
-EMERGE_DEFAULT_OPTS="--jobs 5 --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner"
+EMERGE_DEFAULT_OPTS="--jobs 20 --load 64 --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner"
-FEATURES="binpkg-multi-instance buildpkg -network-sandbox"
+FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox"
BINPKG_FORMAT="gpkg"
+BINPKG_COMPRESS="xz"
-USE="bindist"
+USE="bindist cet"
ACCEPT_RESTRICT="* -bindist"
diff --git a/builders/milou/gnome-23/portage/make.profile b/builders/milou/gnome-23/portage/make.profile
new file mode 120000
index 0000000..2b817fe
--- /dev/null
+++ b/builders/milou/gnome-23/portage/make.profile
@@ -0,0 +1 @@
+/var/db/repos/gentoo/profiles/default/linux/amd64/23.0/desktop/gnome/systemd \ No newline at end of file
diff --git a/builders/jiji/gnome/portage/package.use/bindist b/builders/milou/gnome-23/portage/package.use/bindist
index b75a197..b75a197 100644
--- a/builders/jiji/gnome/portage/package.use/bindist
+++ b/builders/milou/gnome-23/portage/package.use/bindist
diff --git a/builders/milou/gnome-23/portage/package.use/blender b/builders/milou/gnome-23/portage/package.use/blender
new file mode 100644
index 0000000..50c800e
--- /dev/null
+++ b/builders/milou/gnome-23/portage/package.use/blender
@@ -0,0 +1,7 @@
+media-libs/freetype brotli
+media-video/ffmpeg opus theora vpx
+
+# circ
+media-libs/opencolorio -opengl
+
+sys-devel/gcc openmp
diff --git a/builders/jiji/gnome/portage/package.use/dist-kernel b/builders/milou/gnome-23/portage/package.use/dist-kernel
index 7e6ada4..7e6ada4 100644
--- a/builders/jiji/gnome/portage/package.use/dist-kernel
+++ b/builders/milou/gnome-23/portage/package.use/dist-kernel
diff --git a/builders/jiji/gnome/portage/package.use/fixed b/builders/milou/gnome-23/portage/package.use/fixed
index 9574ec7..9574ec7 100644
--- a/builders/jiji/gnome/portage/package.use/fixed
+++ b/builders/milou/gnome-23/portage/package.use/fixed
diff --git a/builders/milou/gnome-23/portage/package.use/inkscape b/builders/milou/gnome-23/portage/package.use/inkscape
new file mode 100644
index 0000000..4b2df36
--- /dev/null
+++ b/builders/milou/gnome-23/portage/package.use/inkscape
@@ -0,0 +1 @@
+dev-python/pillow webp
diff --git a/builders/milou/gnome-23/portage/package.use/multilib b/builders/milou/gnome-23/portage/package.use/multilib
new file mode 100644
index 0000000..44b292a
--- /dev/null
+++ b/builders/milou/gnome-23/portage/package.use/multilib
@@ -0,0 +1,31 @@
+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
+
+# for 23.0
+app-arch/xz-utils abi_x86_32
+app-arch/zstd abi_x86_32
diff --git a/builders/demeter/gnome/portage/package.use/queued b/builders/milou/gnome-23/portage/package.use/queued
index 49491b2..49491b2 100644
--- a/builders/demeter/gnome/portage/package.use/queued
+++ b/builders/milou/gnome-23/portage/package.use/queued
diff --git a/builders/demeter/gnome/portage/package.use/xfce4 b/builders/milou/gnome-23/portage/package.use/xfce4
index 47dd0b9..47dd0b9 100644
--- a/builders/demeter/gnome/portage/package.use/xfce4
+++ b/builders/milou/gnome-23/portage/package.use/xfce4
diff --git a/builders/jiji/gnome/portage/package.use/zlib b/builders/milou/gnome-23/portage/package.use/zlib
index b934da8..b934da8 100644
--- a/builders/jiji/gnome/portage/package.use/zlib
+++ b/builders/milou/gnome-23/portage/package.use/zlib
diff --git a/builders/milou/gnome-23/run-update b/builders/milou/gnome-23/run-update
new file mode 100755
index 0000000..02cdf8a
--- /dev/null
+++ b/builders/milou/gnome-23/run-update
@@ -0,0 +1,8 @@
+#!/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/demeter/gnome/world b/builders/milou/gnome-23/world
index 3c6854b..918c3d9 100644
--- a/builders/demeter/gnome/world
+++ b/builders/milou/gnome-23/world
@@ -1,10 +1,17 @@
+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
@@ -13,6 +20,7 @@ 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
@@ -24,11 +32,13 @@ 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
-sys-devel/gdb
+dev-debug/gdb
www-client/firefox
xfce-base/xfce4-meta
diff --git a/builders/milou/gnome-v3-23/portage/make.conf b/builders/milou/gnome-v3-23/portage/make.conf
new file mode 100644
index 0000000..18a732c
--- /dev/null
+++ b/builders/milou/gnome-v3-23/portage/make.conf
@@ -0,0 +1,46 @@
+# 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 cet"
+
+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-23/portage/make.profile b/builders/milou/gnome-v3-23/portage/make.profile
new file mode 120000
index 0000000..2b817fe
--- /dev/null
+++ b/builders/milou/gnome-v3-23/portage/make.profile
@@ -0,0 +1 @@
+/var/db/repos/gentoo/profiles/default/linux/amd64/23.0/desktop/gnome/systemd \ No newline at end of file
diff --git a/builders/jiji/kde/portage/package.use/bindist b/builders/milou/gnome-v3-23/portage/package.use/bindist
index b75a197..b75a197 100644
--- a/builders/jiji/kde/portage/package.use/bindist
+++ b/builders/milou/gnome-v3-23/portage/package.use/bindist
diff --git a/builders/milou/gnome-v3-23/portage/package.use/blender b/builders/milou/gnome-v3-23/portage/package.use/blender
new file mode 100644
index 0000000..50c800e
--- /dev/null
+++ b/builders/milou/gnome-v3-23/portage/package.use/blender
@@ -0,0 +1,7 @@
+media-libs/freetype brotli
+media-video/ffmpeg opus theora vpx
+
+# circ
+media-libs/opencolorio -opengl
+
+sys-devel/gcc openmp
diff --git a/builders/jiji/kde/portage/package.use/dist-kernel b/builders/milou/gnome-v3-23/portage/package.use/dist-kernel
index 7e6ada4..7e6ada4 100644
--- a/builders/jiji/kde/portage/package.use/dist-kernel
+++ b/builders/milou/gnome-v3-23/portage/package.use/dist-kernel
diff --git a/builders/jiji/kde/portage/package.use/fixed b/builders/milou/gnome-v3-23/portage/package.use/fixed
index 9574ec7..9574ec7 100644
--- a/builders/jiji/kde/portage/package.use/fixed
+++ b/builders/milou/gnome-v3-23/portage/package.use/fixed
diff --git a/builders/milou/gnome-v3-23/portage/package.use/inkscape b/builders/milou/gnome-v3-23/portage/package.use/inkscape
new file mode 100644
index 0000000..4b2df36
--- /dev/null
+++ b/builders/milou/gnome-v3-23/portage/package.use/inkscape
@@ -0,0 +1 @@
+dev-python/pillow webp
diff --git a/builders/milou/gnome-v3-23/portage/package.use/multilib b/builders/milou/gnome-v3-23/portage/package.use/multilib
new file mode 100644
index 0000000..44b292a
--- /dev/null
+++ b/builders/milou/gnome-v3-23/portage/package.use/multilib
@@ -0,0 +1,31 @@
+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
+
+# for 23.0
+app-arch/xz-utils abi_x86_32
+app-arch/zstd abi_x86_32
diff --git a/builders/milou/gnome-v3-23/portage/package.use/queued b/builders/milou/gnome-v3-23/portage/package.use/queued
new file mode 100644
index 0000000..49491b2
--- /dev/null
+++ b/builders/milou/gnome-v3-23/portage/package.use/queued
@@ -0,0 +1 @@
+media-libs/libvpx postproc
diff --git a/builders/milou/gnome-v3-23/portage/package.use/xfce4 b/builders/milou/gnome-v3-23/portage/package.use/xfce4
new file mode 100644
index 0000000..47dd0b9
--- /dev/null
+++ b/builders/milou/gnome-v3-23/portage/package.use/xfce4
@@ -0,0 +1 @@
+dev-libs/libdbusmenu gtk3
diff --git a/builders/milou/gnome-v3-23/portage/package.use/zlib b/builders/milou/gnome-v3-23/portage/package.use/zlib
new file mode 100644
index 0000000..b934da8
--- /dev/null
+++ b/builders/milou/gnome-v3-23/portage/package.use/zlib
@@ -0,0 +1 @@
+sys-libs/zlib minizip
diff --git a/builders/milou/gnome-v3-23/run-update b/builders/milou/gnome-v3-23/run-update
new file mode 100755
index 0000000..02cdf8a
--- /dev/null
+++ b/builders/milou/gnome-v3-23/run-update
@@ -0,0 +1,8 @@
+#!/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-23/world b/builders/milou/gnome-v3-23/world
new file mode 100644
index 0000000..918c3d9
--- /dev/null
+++ b/builders/milou/gnome-v3-23/world
@@ -0,0 +1,44 @@
+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/demeter/gnome/portage/make.conf b/builders/milou/kde-23/portage/make.conf
index d9bec57..537f5b4 100644
--- a/builders/demeter/gnome/portage/make.conf
+++ b/builders/milou/kde-23/portage/make.conf
@@ -17,15 +17,16 @@ PKGDIR="/var/cache/binpkgs"
# Please keep this setting intact when reporting bugs.
LC_MESSAGES=C
-MAKEOPTS="-j17 --load 17.0"
+MAKEOPTS="-j32 -l64"
-EMERGE_DEFAULT_OPTS="--jobs 5 --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner"
+EMERGE_DEFAULT_OPTS="--jobs 20 --load 64 --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner"
-FEATURES="binpkg-multi-instance buildpkg -network-sandbox"
+FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox"
BINPKG_FORMAT="gpkg"
+BINPKG_COMPRESS="xz"
-USE="bindist"
+USE="bindist cet"
ACCEPT_RESTRICT="* -bindist"
diff --git a/builders/milou/kde-23/portage/make.profile b/builders/milou/kde-23/portage/make.profile
new file mode 120000
index 0000000..536e7ef
--- /dev/null
+++ b/builders/milou/kde-23/portage/make.profile
@@ -0,0 +1 @@
+/var/db/repos/gentoo/profiles/default/linux/amd64/23.0/desktop/plasma/systemd \ No newline at end of file
diff --git a/builders/milou/kde-23/portage/package.use/bindist b/builders/milou/kde-23/portage/package.use/bindist
new file mode 100644
index 0000000..b75a197
--- /dev/null
+++ b/builders/milou/kde-23/portage/package.use/bindist
@@ -0,0 +1,2 @@
+
+net-voip/telepathy-gabble gnutls
diff --git a/builders/milou/kde-23/portage/package.use/calibre b/builders/milou/kde-23/portage/package.use/calibre
new file mode 100644
index 0000000..6f6c33c
--- /dev/null
+++ b/builders/milou/kde-23/portage/package.use/calibre
@@ -0,0 +1 @@
+dev-python/PyQt6 quick
diff --git a/builders/jiji/server/portage/package.use/dist-kernel b/builders/milou/kde-23/portage/package.use/dist-kernel
index 7e6ada4..7e6ada4 100644
--- a/builders/jiji/server/portage/package.use/dist-kernel
+++ b/builders/milou/kde-23/portage/package.use/dist-kernel
diff --git a/builders/jiji/kde/portage/package.use/ffmpeg b/builders/milou/kde-23/portage/package.use/ffmpeg
index aad80a4..aad80a4 100644
--- a/builders/jiji/kde/portage/package.use/ffmpeg
+++ b/builders/milou/kde-23/portage/package.use/ffmpeg
diff --git a/builders/milou/kde-23/portage/package.use/fixed b/builders/milou/kde-23/portage/package.use/fixed
new file mode 100644
index 0000000..9574ec7
--- /dev/null
+++ b/builders/milou/kde-23/portage/package.use/fixed
@@ -0,0 +1,6 @@
+# 26f47f5c7df6edda39ff1febc821f1f8e1803321
+sys-apps/dbus user-session
+
+
+# todo
+media-libs/freetype harfbuzz
diff --git a/builders/milou/kde-23/portage/package.use/mate b/builders/milou/kde-23/portage/package.use/mate
new file mode 100644
index 0000000..47dd0b9
--- /dev/null
+++ b/builders/milou/kde-23/portage/package.use/mate
@@ -0,0 +1 @@
+dev-libs/libdbusmenu gtk3
diff --git a/builders/demeter/kde/portage/package.use/queued b/builders/milou/kde-23/portage/package.use/queued
index f61935d..f61935d 100644
--- a/builders/demeter/kde/portage/package.use/queued
+++ b/builders/milou/kde-23/portage/package.use/queued
diff --git a/builders/milou/kde-23/run-update b/builders/milou/kde-23/run-update
new file mode 100755
index 0000000..02cdf8a
--- /dev/null
+++ b/builders/milou/kde-23/run-update
@@ -0,0 +1,8 @@
+#!/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/demeter/kde/world b/builders/milou/kde-23/world
index de6112c..c81d20e 100644
--- a/builders/demeter/kde/world
+++ b/builders/milou/kde-23/world
@@ -1,4 +1,6 @@
+app-admin/keepassxc
app-containers/docker
+app-containers/earthly
app-editors/emacs
app-editors/kile
app-editors/nano
@@ -40,9 +42,9 @@ sci-visualization/gnuplot
sci-visualization/gwyddion
sci-visualization/spyview
sys-apps/portage
-sys-auth/AusweisApp2
+sys-auth/AusweisApp
sys-devel/clang
-sys-devel/gdb
+dev-debug/gdb
www-client/firefox
www-client/qutebrowser
www-servers/apache
diff --git a/builders/milou/kde-v3-23/portage/make.conf b/builders/milou/kde-v3-23/portage/make.conf
new file mode 100644
index 0000000..18a732c
--- /dev/null
+++ b/builders/milou/kde-v3-23/portage/make.conf
@@ -0,0 +1,46 @@
+# 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 cet"
+
+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-23/portage/make.profile b/builders/milou/kde-v3-23/portage/make.profile
new file mode 120000
index 0000000..536e7ef
--- /dev/null
+++ b/builders/milou/kde-v3-23/portage/make.profile
@@ -0,0 +1 @@
+/var/db/repos/gentoo/profiles/default/linux/amd64/23.0/desktop/plasma/systemd \ No newline at end of file
diff --git a/builders/milou/kde-v3-23/portage/package.use/bindist b/builders/milou/kde-v3-23/portage/package.use/bindist
new file mode 100644
index 0000000..b75a197
--- /dev/null
+++ b/builders/milou/kde-v3-23/portage/package.use/bindist
@@ -0,0 +1,2 @@
+
+net-voip/telepathy-gabble gnutls
diff --git a/builders/milou/kde-v3-23/portage/package.use/calibre b/builders/milou/kde-v3-23/portage/package.use/calibre
new file mode 100644
index 0000000..6f6c33c
--- /dev/null
+++ b/builders/milou/kde-v3-23/portage/package.use/calibre
@@ -0,0 +1 @@
+dev-python/PyQt6 quick
diff --git a/builders/milou/kde-v3-23/portage/package.use/dist-kernel b/builders/milou/kde-v3-23/portage/package.use/dist-kernel
new file mode 100644
index 0000000..7e6ada4
--- /dev/null
+++ b/builders/milou/kde-v3-23/portage/package.use/dist-kernel
@@ -0,0 +1 @@
+*/* dist-kernel
diff --git a/builders/milou/kde-v3-23/portage/package.use/ffmpeg b/builders/milou/kde-v3-23/portage/package.use/ffmpeg
new file mode 100644
index 0000000..aad80a4
--- /dev/null
+++ b/builders/milou/kde-v3-23/portage/package.use/ffmpeg
@@ -0,0 +1 @@
+media-video/ffmpeg libass
diff --git a/builders/milou/kde-v3-23/portage/package.use/fixed b/builders/milou/kde-v3-23/portage/package.use/fixed
new file mode 100644
index 0000000..9574ec7
--- /dev/null
+++ b/builders/milou/kde-v3-23/portage/package.use/fixed
@@ -0,0 +1,6 @@
+# 26f47f5c7df6edda39ff1febc821f1f8e1803321
+sys-apps/dbus user-session
+
+
+# todo
+media-libs/freetype harfbuzz
diff --git a/builders/milou/kde-v3-23/portage/package.use/mate b/builders/milou/kde-v3-23/portage/package.use/mate
new file mode 100644
index 0000000..47dd0b9
--- /dev/null
+++ b/builders/milou/kde-v3-23/portage/package.use/mate
@@ -0,0 +1 @@
+dev-libs/libdbusmenu gtk3
diff --git a/builders/jiji/kde/portage/package.use/queued b/builders/milou/kde-v3-23/portage/package.use/queued
index 7c78837..f61935d 100644
--- a/builders/jiji/kde/portage/package.use/queued
+++ b/builders/milou/kde-v3-23/portage/package.use/queued
@@ -1,2 +1,3 @@
media-libs/libvpx postproc
dev-qt/qtpositioning geoclue
+dev-python/pillow webp
diff --git a/builders/milou/kde-v3-23/run-update b/builders/milou/kde-v3-23/run-update
new file mode 100755
index 0000000..02cdf8a
--- /dev/null
+++ b/builders/milou/kde-v3-23/run-update
@@ -0,0 +1,8 @@
+#!/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-23/world b/builders/milou/kde-v3-23/world
new file mode 100644
index 0000000..c81d20e
--- /dev/null
+++ b/builders/milou/kde-v3-23/world
@@ -0,0 +1,50 @@
+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/demeter/server/portage/make.conf b/builders/milou/openrc-23/portage/make.conf
index d9bec57..537f5b4 100644
--- a/builders/demeter/server/portage/make.conf
+++ b/builders/milou/openrc-23/portage/make.conf
@@ -17,15 +17,16 @@ PKGDIR="/var/cache/binpkgs"
# Please keep this setting intact when reporting bugs.
LC_MESSAGES=C
-MAKEOPTS="-j17 --load 17.0"
+MAKEOPTS="-j32 -l64"
-EMERGE_DEFAULT_OPTS="--jobs 5 --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner"
+EMERGE_DEFAULT_OPTS="--jobs 20 --load 64 --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner"
-FEATURES="binpkg-multi-instance buildpkg -network-sandbox"
+FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox"
BINPKG_FORMAT="gpkg"
+BINPKG_COMPRESS="xz"
-USE="bindist"
+USE="bindist cet"
ACCEPT_RESTRICT="* -bindist"
diff --git a/builders/milou/openrc-23/portage/make.profile b/builders/milou/openrc-23/portage/make.profile
new file mode 120000
index 0000000..52b8803
--- /dev/null
+++ b/builders/milou/openrc-23/portage/make.profile
@@ -0,0 +1 @@
+/var/db/repos/gentoo/profiles/default/linux/amd64/23.0/desktop/gnome \ No newline at end of file
diff --git a/builders/milou/openrc-23/portage/package.use/bindist b/builders/milou/openrc-23/portage/package.use/bindist
new file mode 100644
index 0000000..b75a197
--- /dev/null
+++ b/builders/milou/openrc-23/portage/package.use/bindist
@@ -0,0 +1,2 @@
+
+net-voip/telepathy-gabble gnutls
diff --git a/builders/milou/openrc-23/portage/package.use/blender b/builders/milou/openrc-23/portage/package.use/blender
new file mode 100644
index 0000000..50c800e
--- /dev/null
+++ b/builders/milou/openrc-23/portage/package.use/blender
@@ -0,0 +1,7 @@
+media-libs/freetype brotli
+media-video/ffmpeg opus theora vpx
+
+# circ
+media-libs/opencolorio -opengl
+
+sys-devel/gcc openmp
diff --git a/builders/milou/openrc-23/portage/package.use/dist-kernel b/builders/milou/openrc-23/portage/package.use/dist-kernel
new file mode 100644
index 0000000..7e6ada4
--- /dev/null
+++ b/builders/milou/openrc-23/portage/package.use/dist-kernel
@@ -0,0 +1 @@
+*/* dist-kernel
diff --git a/builders/milou/openrc-23/portage/package.use/fixed b/builders/milou/openrc-23/portage/package.use/fixed
new file mode 100644
index 0000000..9574ec7
--- /dev/null
+++ b/builders/milou/openrc-23/portage/package.use/fixed
@@ -0,0 +1,6 @@
+# 26f47f5c7df6edda39ff1febc821f1f8e1803321
+sys-apps/dbus user-session
+
+
+# todo
+media-libs/freetype harfbuzz
diff --git a/builders/milou/openrc-23/portage/package.use/inkscape b/builders/milou/openrc-23/portage/package.use/inkscape
new file mode 100644
index 0000000..4b2df36
--- /dev/null
+++ b/builders/milou/openrc-23/portage/package.use/inkscape
@@ -0,0 +1 @@
+dev-python/pillow webp
diff --git a/builders/milou/openrc-23/portage/package.use/kde b/builders/milou/openrc-23/portage/package.use/kde
new file mode 100644
index 0000000..557e094
--- /dev/null
+++ b/builders/milou/openrc-23/portage/package.use/kde
@@ -0,0 +1,11 @@
+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-23/portage/package.use/llvm b/builders/milou/openrc-23/portage/package.use/llvm
new file mode 100644
index 0000000..c75065b
--- /dev/null
+++ b/builders/milou/openrc-23/portage/package.use/llvm
@@ -0,0 +1,2 @@
+app-arch/xz-utils abi_x86_32
+app-arch/zstd abi_x86_32
diff --git a/builders/demeter/gnome/portage/package.use/multilib b/builders/milou/openrc-23/portage/package.use/multilib
index 9537596..9537596 100644
--- a/builders/demeter/gnome/portage/package.use/multilib
+++ b/builders/milou/openrc-23/portage/package.use/multilib
diff --git a/builders/milou/openrc-23/portage/package.use/queued b/builders/milou/openrc-23/portage/package.use/queued
new file mode 100644
index 0000000..49491b2
--- /dev/null
+++ b/builders/milou/openrc-23/portage/package.use/queued
@@ -0,0 +1 @@
+media-libs/libvpx postproc
diff --git a/builders/milou/openrc-23/portage/package.use/rust b/builders/milou/openrc-23/portage/package.use/rust
new file mode 100644
index 0000000..99c95db
--- /dev/null
+++ b/builders/milou/openrc-23/portage/package.use/rust
@@ -0,0 +1 @@
+dev-lang/rust clippy rustfmt
diff --git a/builders/milou/openrc-23/portage/package.use/xfce4 b/builders/milou/openrc-23/portage/package.use/xfce4
new file mode 100644
index 0000000..47dd0b9
--- /dev/null
+++ b/builders/milou/openrc-23/portage/package.use/xfce4
@@ -0,0 +1 @@
+dev-libs/libdbusmenu gtk3
diff --git a/builders/milou/openrc-23/portage/package.use/zlib b/builders/milou/openrc-23/portage/package.use/zlib
new file mode 100644
index 0000000..b934da8
--- /dev/null
+++ b/builders/milou/openrc-23/portage/package.use/zlib
@@ -0,0 +1 @@
+sys-libs/zlib minizip
diff --git a/builders/milou/openrc-23/run-update b/builders/milou/openrc-23/run-update
new file mode 100755
index 0000000..02cdf8a
--- /dev/null
+++ b/builders/milou/openrc-23/run-update
@@ -0,0 +1,8 @@
+#!/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-23/world b/builders/milou/openrc-23/world
new file mode 100644
index 0000000..5b8f3a6
--- /dev/null
+++ b/builders/milou/openrc-23/world
@@ -0,0 +1,44 @@
+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/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-v3-23/portage/make.conf b/builders/milou/openrc-v3-23/portage/make.conf
new file mode 100644
index 0000000..18a732c
--- /dev/null
+++ b/builders/milou/openrc-v3-23/portage/make.conf
@@ -0,0 +1,46 @@
+# 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 cet"
+
+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-23/portage/make.profile b/builders/milou/openrc-v3-23/portage/make.profile
new file mode 120000
index 0000000..52b8803
--- /dev/null
+++ b/builders/milou/openrc-v3-23/portage/make.profile
@@ -0,0 +1 @@
+/var/db/repos/gentoo/profiles/default/linux/amd64/23.0/desktop/gnome \ No newline at end of file
diff --git a/builders/milou/openrc-v3-23/portage/package.use/bindist b/builders/milou/openrc-v3-23/portage/package.use/bindist
new file mode 100644
index 0000000..b75a197
--- /dev/null
+++ b/builders/milou/openrc-v3-23/portage/package.use/bindist
@@ -0,0 +1,2 @@
+
+net-voip/telepathy-gabble gnutls
diff --git a/builders/milou/openrc-v3-23/portage/package.use/blender b/builders/milou/openrc-v3-23/portage/package.use/blender
new file mode 100644
index 0000000..a363b10
--- /dev/null
+++ b/builders/milou/openrc-v3-23/portage/package.use/blender
@@ -0,0 +1,5 @@
+media-libs/freetype brotli
+media-video/ffmpeg opus theora vpx
+
+# circ
+media-libs/opencolorio -opengl
diff --git a/builders/milou/openrc-v3-23/portage/package.use/dist-kernel b/builders/milou/openrc-v3-23/portage/package.use/dist-kernel
new file mode 100644
index 0000000..7e6ada4
--- /dev/null
+++ b/builders/milou/openrc-v3-23/portage/package.use/dist-kernel
@@ -0,0 +1 @@
+*/* dist-kernel
diff --git a/builders/milou/openrc-v3-23/portage/package.use/fixed b/builders/milou/openrc-v3-23/portage/package.use/fixed
new file mode 100644
index 0000000..9574ec7
--- /dev/null
+++ b/builders/milou/openrc-v3-23/portage/package.use/fixed
@@ -0,0 +1,6 @@
+# 26f47f5c7df6edda39ff1febc821f1f8e1803321
+sys-apps/dbus user-session
+
+
+# todo
+media-libs/freetype harfbuzz
diff --git a/builders/milou/openrc-v3-23/portage/package.use/inkscape b/builders/milou/openrc-v3-23/portage/package.use/inkscape
new file mode 100644
index 0000000..4b2df36
--- /dev/null
+++ b/builders/milou/openrc-v3-23/portage/package.use/inkscape
@@ -0,0 +1 @@
+dev-python/pillow webp
diff --git a/builders/milou/openrc-v3-23/portage/package.use/kde b/builders/milou/openrc-v3-23/portage/package.use/kde
new file mode 100644
index 0000000..557e094
--- /dev/null
+++ b/builders/milou/openrc-v3-23/portage/package.use/kde
@@ -0,0 +1,11 @@
+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-23/portage/package.use/llvm b/builders/milou/openrc-v3-23/portage/package.use/llvm
new file mode 100644
index 0000000..c75065b
--- /dev/null
+++ b/builders/milou/openrc-v3-23/portage/package.use/llvm
@@ -0,0 +1,2 @@
+app-arch/xz-utils abi_x86_32
+app-arch/zstd abi_x86_32
diff --git a/builders/milou/openrc-v3-23/portage/package.use/multilib b/builders/milou/openrc-v3-23/portage/package.use/multilib
new file mode 100644
index 0000000..9537596
--- /dev/null
+++ b/builders/milou/openrc-v3-23/portage/package.use/multilib
@@ -0,0 +1,27 @@
+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-23/portage/package.use/queued b/builders/milou/openrc-v3-23/portage/package.use/queued
new file mode 100644
index 0000000..49491b2
--- /dev/null
+++ b/builders/milou/openrc-v3-23/portage/package.use/queued
@@ -0,0 +1 @@
+media-libs/libvpx postproc
diff --git a/builders/milou/openrc-v3-23/portage/package.use/rust b/builders/milou/openrc-v3-23/portage/package.use/rust
new file mode 100644
index 0000000..99c95db
--- /dev/null
+++ b/builders/milou/openrc-v3-23/portage/package.use/rust
@@ -0,0 +1 @@
+dev-lang/rust clippy rustfmt
diff --git a/builders/milou/openrc-v3-23/portage/package.use/xfce4 b/builders/milou/openrc-v3-23/portage/package.use/xfce4
new file mode 100644
index 0000000..47dd0b9
--- /dev/null
+++ b/builders/milou/openrc-v3-23/portage/package.use/xfce4
@@ -0,0 +1 @@
+dev-libs/libdbusmenu gtk3
diff --git a/builders/milou/openrc-v3-23/portage/package.use/zlib b/builders/milou/openrc-v3-23/portage/package.use/zlib
new file mode 100644
index 0000000..b934da8
--- /dev/null
+++ b/builders/milou/openrc-v3-23/portage/package.use/zlib
@@ -0,0 +1 @@
+sys-libs/zlib minizip
diff --git a/builders/milou/openrc-v3-23/run-update b/builders/milou/openrc-v3-23/run-update
new file mode 100755
index 0000000..02cdf8a
--- /dev/null
+++ b/builders/milou/openrc-v3-23/run-update
@@ -0,0 +1,8 @@
+#!/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-23/world b/builders/milou/openrc-v3-23/world
new file mode 100644
index 0000000..e4ee9c0
--- /dev/null
+++ b/builders/milou/openrc-v3-23/world
@@ -0,0 +1,45 @@
+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-23/portage/make.conf b/builders/milou/server-23/portage/make.conf
new file mode 100644
index 0000000..537f5b4
--- /dev/null
+++ b/builders/milou/server-23/portage/make.conf
@@ -0,0 +1,36 @@
+# 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 cet"
+
+ACCEPT_RESTRICT="* -bindist"
+
+ACCEPT_LICENSE="@FREE MPEG-4"
+
+LC_ALL="en_US.utf8"
+
diff --git a/builders/milou/server-23/portage/make.profile b/builders/milou/server-23/portage/make.profile
new file mode 120000
index 0000000..6656efc
--- /dev/null
+++ b/builders/milou/server-23/portage/make.profile
@@ -0,0 +1 @@
+/var/db/repos/gentoo/profiles/default/linux/amd64/23.0/no-multilib \ No newline at end of file
diff --git a/builders/milou/server-23/portage/package.use/dist-kernel b/builders/milou/server-23/portage/package.use/dist-kernel
new file mode 100644
index 0000000..7e6ada4
--- /dev/null
+++ b/builders/milou/server-23/portage/package.use/dist-kernel
@@ -0,0 +1 @@
+*/* dist-kernel
diff --git a/builders/milou/server-23/run-update b/builders/milou/server-23/run-update
new file mode 100755
index 0000000..417f835
--- /dev/null
+++ b/builders/milou/server-23/run-update
@@ -0,0 +1,10 @@
+#!/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-23/world b/builders/milou/server-23/world
new file mode 100644
index 0000000..354baa0
--- /dev/null
+++ b/builders/milou/server-23/world
@@ -0,0 +1,50 @@
+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-v3-23/portage/make.conf b/builders/milou/server-v3-23/portage/make.conf
new file mode 100644
index 0000000..18a732c
--- /dev/null
+++ b/builders/milou/server-v3-23/portage/make.conf
@@ -0,0 +1,46 @@
+# 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 cet"
+
+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-23/portage/make.profile b/builders/milou/server-v3-23/portage/make.profile
new file mode 120000
index 0000000..6656efc
--- /dev/null
+++ b/builders/milou/server-v3-23/portage/make.profile
@@ -0,0 +1 @@
+/var/db/repos/gentoo/profiles/default/linux/amd64/23.0/no-multilib \ No newline at end of file
diff --git a/builders/milou/server-v3-23/portage/package.use/dist-kernel b/builders/milou/server-v3-23/portage/package.use/dist-kernel
new file mode 100644
index 0000000..7e6ada4
--- /dev/null
+++ b/builders/milou/server-v3-23/portage/package.use/dist-kernel
@@ -0,0 +1 @@
+*/* dist-kernel
diff --git a/builders/milou/server-v3-23/run-update b/builders/milou/server-v3-23/run-update
new file mode 100755
index 0000000..417f835
--- /dev/null
+++ b/builders/milou/server-v3-23/run-update
@@ -0,0 +1,10 @@
+#!/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-23/world b/builders/milou/server-v3-23/world
new file mode 100644
index 0000000..354baa0
--- /dev/null
+++ b/builders/milou/server-v3-23/world
@@ -0,0 +1,50 @@
+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