From 54e8fad959d6a6e53e08c62ac3a3c4d4bdc6c957 Mon Sep 17 00:00:00 2001
From: Joel Challis
Date: Fri, 19 Dec 2025 02:23:29 +0000
Subject: Ignore merge commits on bootstrap testing PRs (#25884)

---
 util/env-bootstrap.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'util')

diff --git a/util/env-bootstrap.sh b/util/env-bootstrap.sh
index 6b0497ffae..07020ea371 100755
--- a/util/env-bootstrap.sh
+++ b/util/env-bootstrap.sh
@@ -230,7 +230,7 @@ __EOT__
             *debian* | *ubuntu*) echo "zstd build-essential clang-format diffutils wget unzip zip libhidapi-hidraw0 dos2unix git" ;;
             *fedora*) echo "zstd clang diffutils which gcc git wget unzip zip hidapi dos2unix libusb-devel libusb1-devel libusb-compat-0.1-devel libusb0-devel git epel-release" ;;
             *suse*) echo "zstd clang diffutils wget unzip zip libhidapi-hidraw0 dos2unix git libusb-1_0-devel gzip which" ;;
-            *gentoo*) echo "zstd diffutils wget unzip zip dev-libs/hidapi dos2unix dev-vcs/git dev-libs/libusb app-arch/gzip which" ;;
+            *gentoo*) echo "zstd sys-apps/diffutils wget unzip zip dev-libs/hidapi dos2unix dev-vcs/git dev-libs/libusb app-arch/gzip which" ;;
             *)
                 echo >&2
                 echo "Sorry, we don't recognize your distribution." >&2
-- 
cgit v1.2.3