From 961cb0078ce0fafab65a580aa715f8354f663f91 Mon Sep 17 00:00:00 2001
From: "Dustin C. Hatch" <dustin@hatch.name>
Date: Sat, 14 Dec 2024 14:02:18 -0600
Subject: [PATCH] lib: Disable emerge color

Although Jenkins is supposed to be able to decode ANSI escape sequences
for terminal colors, it doesn't do so in all cases and when it does, it
doesn't seem to produce the right result for output from `emerge`.
---
 lib/bootstrap.sh | 2 +-
 lib/crossdev.sh  | 2 +-
 lib/tools.sh     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/bootstrap.sh b/lib/bootstrap.sh
index 9dd0c76..e2fe3cd 100755
--- a/lib/bootstrap.sh
+++ b/lib/bootstrap.sh
@@ -15,7 +15,7 @@ emerge -kvnuUDj --rebuilt-binaries=y --root=/mnt/gentoo sys-apps/baselayout
 # At some point, we may end up with an Aimee OS profile for Portage.
 # If/when that happens, we can override @system to remove the stuff we
 # don't want, like virtual/service-manager and virtual/openssh.
-xargs emerge -kvnuUDj --rebuilt-binaries=y --root=/mnt/gentoo --color=y <<EOF
+xargs emerge -kvnuUDj --rebuilt-binaries=y --root=/mnt/gentoo <<EOF
 app-arch/gzip
 dev-build/make
 net-misc/wget
diff --git a/lib/crossdev.sh b/lib/crossdev.sh
index eefa441..1c73a6a 100755
--- a/lib/crossdev.sh
+++ b/lib/crossdev.sh
@@ -17,7 +17,7 @@ masters = gentoo
 auto-sync = no
 EOF
 
-emerge -kvnuUDj --rebuilt-binaries=y --color=y sys-devel/crossdev
+emerge -kvnuUDj --rebuilt-binaries=y sys-devel/crossdev
 
 crossdev --stable -t "$1"
 
diff --git a/lib/tools.sh b/lib/tools.sh
index eba0844..ac4d8fa 100755
--- a/lib/tools.sh
+++ b/lib/tools.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-xargs -r emerge -vnuUj --rebuilt-binaries=y --color=y <<EOF
+xargs -r emerge -vnuUj --rebuilt-binaries=y <<EOF
 sys-apps/shadow
 EOF
 
-xargs -r emerge -vnuUj --rebuilt-binaries=y --color=y <<EOF
+xargs -r emerge -vnuUj --rebuilt-binaries=y <<EOF
 app-emulation/qemu
 sec-policy/selinux-base
 sys-apps/policycoreutils