Unify build settings somewhat

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

22 files changed, 54 insertions, 54 deletions

diff --git a/builders/jiji/gnome-23/portage/make.conf b/builders/jiji/gnome-23/portage/make.conf
index b8183c9..3f97c6b 100644
--- a/builders/jiji/gnome-23/portage/make.conf
+++ b/builders/jiji/gnome-23/portage/make.conf
@@ -19,7 +19,7 @@ LC_MESSAGES=C
 
 MAKEOPTS="-j80 --load 160.0"
 
-EMERGE_DEFAULT_OPTS="--jobs 20 --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 compress-index -network-sandbox"
 
diff --git a/builders/jiji/gnome/portage/make.conf b/builders/jiji/gnome/portage/make.conf
index b8183c9..3f97c6b 100644
--- a/builders/jiji/gnome/portage/make.conf
+++ b/builders/jiji/gnome/portage/make.conf
@@ -19,7 +19,7 @@ LC_MESSAGES=C
 
 MAKEOPTS="-j80 --load 160.0"
 
-EMERGE_DEFAULT_OPTS="--jobs 20 --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 compress-index -network-sandbox"
 
diff --git a/builders/jiji/kde-23/portage/make.conf b/builders/jiji/kde-23/portage/make.conf
index b8183c9..3f97c6b 100644
--- a/builders/jiji/kde-23/portage/make.conf
+++ b/builders/jiji/kde-23/portage/make.conf
@@ -19,7 +19,7 @@ LC_MESSAGES=C
 
 MAKEOPTS="-j80 --load 160.0"
 
-EMERGE_DEFAULT_OPTS="--jobs 20 --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 compress-index -network-sandbox"
 
diff --git a/builders/jiji/kde/portage/make.conf b/builders/jiji/kde/portage/make.conf
index b8183c9..3f97c6b 100644
--- a/builders/jiji/kde/portage/make.conf
+++ b/builders/jiji/kde/portage/make.conf
@@ -19,7 +19,7 @@ LC_MESSAGES=C
 
 MAKEOPTS="-j80 --load 160.0"
 
-EMERGE_DEFAULT_OPTS="--jobs 20 --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 compress-index -network-sandbox"
 
diff --git a/builders/jiji/server-23/portage/make.conf b/builders/jiji/server-23/portage/make.conf
index b8183c9..3f97c6b 100644
--- a/builders/jiji/server-23/portage/make.conf
+++ b/builders/jiji/server-23/portage/make.conf
@@ -19,7 +19,7 @@ LC_MESSAGES=C
 
 MAKEOPTS="-j80 --load 160.0"
 
-EMERGE_DEFAULT_OPTS="--jobs 20 --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 compress-index -network-sandbox"
 
diff --git a/builders/jiji/server/portage/make.conf b/builders/jiji/server/portage/make.conf
index b8183c9..3f97c6b 100644
--- a/builders/jiji/server/portage/make.conf
+++ b/builders/jiji/server/portage/make.conf
@@ -19,7 +19,7 @@ LC_MESSAGES=C
 
 MAKEOPTS="-j80 --load 160.0"
 
-EMERGE_DEFAULT_OPTS="--jobs 20 --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 compress-index -network-sandbox"
 
diff --git a/builders/milou/gnome-23/portage/make.conf b/builders/milou/gnome-23/portage/make.conf
index ce66fa5..1ab00b0 100644
--- a/builders/milou/gnome-23/portage/make.conf
+++ b/builders/milou/gnome-23/portage/make.conf
@@ -17,11 +17,11 @@ PKGDIR="/var/cache/binpkgs"
 # Please keep this setting intact when reporting bugs.
 LC_MESSAGES=C
 
-MAKEOPTS="-j32 -l48"
+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"
diff --git a/builders/milou/gnome-v3-23/portage/make.conf b/builders/milou/gnome-v3-23/portage/make.conf
index dcca105..96913ff 100644
--- a/builders/milou/gnome-v3-23/portage/make.conf
+++ b/builders/milou/gnome-v3-23/portage/make.conf
@@ -17,11 +17,11 @@ PKGDIR="/var/cache/binpkgs"
 # Please keep this setting intact when reporting bugs.
 LC_MESSAGES=C
 
-MAKEOPTS="-j32 -l48"
+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"
diff --git a/builders/milou/gnome-v3/portage/make.conf b/builders/milou/gnome-v3/portage/make.conf
index dcca105..96913ff 100644
--- a/builders/milou/gnome-v3/portage/make.conf
+++ b/builders/milou/gnome-v3/portage/make.conf
@@ -17,11 +17,11 @@ PKGDIR="/var/cache/binpkgs"
 # Please keep this setting intact when reporting bugs.
 LC_MESSAGES=C
 
-MAKEOPTS="-j32 -l48"
+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"
diff --git a/builders/milou/gnome/portage/make.conf b/builders/milou/gnome/portage/make.conf
index ce66fa5..1ab00b0 100644
--- a/builders/milou/gnome/portage/make.conf
+++ b/builders/milou/gnome/portage/make.conf
@@ -17,11 +17,11 @@ PKGDIR="/var/cache/binpkgs"
 # Please keep this setting intact when reporting bugs.
 LC_MESSAGES=C
 
-MAKEOPTS="-j32 -l48"
+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"
diff --git a/builders/milou/kde-23/portage/make.conf b/builders/milou/kde-23/portage/make.conf
index ce66fa5..1ab00b0 100644
--- a/builders/milou/kde-23/portage/make.conf
+++ b/builders/milou/kde-23/portage/make.conf
@@ -17,11 +17,11 @@ PKGDIR="/var/cache/binpkgs"
 # Please keep this setting intact when reporting bugs.
 LC_MESSAGES=C
 
-MAKEOPTS="-j32 -l48"
+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"
diff --git a/builders/milou/kde-v3-23/portage/make.conf b/builders/milou/kde-v3-23/portage/make.conf
index dcca105..96913ff 100644
--- a/builders/milou/kde-v3-23/portage/make.conf
+++ b/builders/milou/kde-v3-23/portage/make.conf
@@ -17,11 +17,11 @@ PKGDIR="/var/cache/binpkgs"
 # Please keep this setting intact when reporting bugs.
 LC_MESSAGES=C
 
-MAKEOPTS="-j32 -l48"
+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"
diff --git a/builders/milou/kde-v3/portage/make.conf b/builders/milou/kde-v3/portage/make.conf
index dcca105..96913ff 100644
--- a/builders/milou/kde-v3/portage/make.conf
+++ b/builders/milou/kde-v3/portage/make.conf
@@ -17,11 +17,11 @@ PKGDIR="/var/cache/binpkgs"
 # Please keep this setting intact when reporting bugs.
 LC_MESSAGES=C
 
-MAKEOPTS="-j32 -l48"
+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"
diff --git a/builders/milou/kde/portage/make.conf b/builders/milou/kde/portage/make.conf
index ce66fa5..1ab00b0 100644
--- a/builders/milou/kde/portage/make.conf
+++ b/builders/milou/kde/portage/make.conf
@@ -17,11 +17,11 @@ PKGDIR="/var/cache/binpkgs"
 # Please keep this setting intact when reporting bugs.
 LC_MESSAGES=C
 
-MAKEOPTS="-j32 -l48"
+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"
diff --git a/builders/milou/openrc-23/portage/make.conf b/builders/milou/openrc-23/portage/make.conf
index ce66fa5..1ab00b0 100644
--- a/builders/milou/openrc-23/portage/make.conf
+++ b/builders/milou/openrc-23/portage/make.conf
@@ -17,11 +17,11 @@ PKGDIR="/var/cache/binpkgs"
 # Please keep this setting intact when reporting bugs.
 LC_MESSAGES=C
 
-MAKEOPTS="-j32 -l48"
+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"
diff --git a/builders/milou/openrc-v3-23/portage/make.conf b/builders/milou/openrc-v3-23/portage/make.conf
index dcca105..96913ff 100644
--- a/builders/milou/openrc-v3-23/portage/make.conf
+++ b/builders/milou/openrc-v3-23/portage/make.conf
@@ -17,11 +17,11 @@ PKGDIR="/var/cache/binpkgs"
 # Please keep this setting intact when reporting bugs.
 LC_MESSAGES=C
 
-MAKEOPTS="-j32 -l48"
+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"
diff --git a/builders/milou/openrc-v3/portage/make.conf b/builders/milou/openrc-v3/portage/make.conf
index dcca105..96913ff 100644
--- a/builders/milou/openrc-v3/portage/make.conf
+++ b/builders/milou/openrc-v3/portage/make.conf
@@ -17,11 +17,11 @@ PKGDIR="/var/cache/binpkgs"
 # Please keep this setting intact when reporting bugs.
 LC_MESSAGES=C
 
-MAKEOPTS="-j32 -l48"
+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"
diff --git a/builders/milou/openrc/portage/make.conf b/builders/milou/openrc/portage/make.conf
index ce66fa5..1ab00b0 100644
--- a/builders/milou/openrc/portage/make.conf
+++ b/builders/milou/openrc/portage/make.conf
@@ -17,11 +17,11 @@ PKGDIR="/var/cache/binpkgs"
 # Please keep this setting intact when reporting bugs.
 LC_MESSAGES=C
 
-MAKEOPTS="-j32 -l48"
+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"
diff --git a/builders/milou/server-23/portage/make.conf b/builders/milou/server-23/portage/make.conf
index ce66fa5..1ab00b0 100644
--- a/builders/milou/server-23/portage/make.conf
+++ b/builders/milou/server-23/portage/make.conf
@@ -17,11 +17,11 @@ PKGDIR="/var/cache/binpkgs"
 # Please keep this setting intact when reporting bugs.
 LC_MESSAGES=C
 
-MAKEOPTS="-j32 -l48"
+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"
diff --git a/builders/milou/server-v3-23/portage/make.conf b/builders/milou/server-v3-23/portage/make.conf
index dcca105..96913ff 100644
--- a/builders/milou/server-v3-23/portage/make.conf
+++ b/builders/milou/server-v3-23/portage/make.conf
@@ -17,11 +17,11 @@ PKGDIR="/var/cache/binpkgs"
 # Please keep this setting intact when reporting bugs.
 LC_MESSAGES=C
 
-MAKEOPTS="-j32 -l48"
+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"
diff --git a/builders/milou/server-v3/portage/make.conf b/builders/milou/server-v3/portage/make.conf
index dcca105..96913ff 100644
--- a/builders/milou/server-v3/portage/make.conf
+++ b/builders/milou/server-v3/portage/make.conf
@@ -17,11 +17,11 @@ PKGDIR="/var/cache/binpkgs"
 # Please keep this setting intact when reporting bugs.
 LC_MESSAGES=C
 
-MAKEOPTS="-j32 -l48"
+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"
diff --git a/builders/milou/server/portage/make.conf b/builders/milou/server/portage/make.conf
index ce66fa5..1ab00b0 100644
--- a/builders/milou/server/portage/make.conf
+++ b/builders/milou/server/portage/make.conf
@@ -17,11 +17,11 @@ PKGDIR="/var/cache/binpkgs"
 # Please keep this setting intact when reporting bugs.
 LC_MESSAGES=C
 
-MAKEOPTS="-j32 -l48"
+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"