scripts/bootstrap-prefix: try and unify USE-flag disabling

As pointed out by hsk17, we have two places in which we disable
different sets of USE-flags, try to unify them.

In addition add http3, quic and curl_quic_openssl during bootstrap.

Bug: https://bugs.gentoo.org/936629
Signed-off-by: Fabian Groffen <grobian@gentoo.org>

1 files changed, 26 insertions, 14 deletions

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index a20af50355..1ee30e4b80 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1823,19 +1823,7 @@ do_emerge_pkgs() {
 		[[ -n ${pvdb} ]] && continue
 
 		local myuse=(
-			-acl
-			-berkdb
-			-fortran
-			-gdbm
-			-git
-			-libcxx
-			-http2
-			-nls
-			-pcre
-			-python
-			-qmanifest -qtegrity
-			-readline
-			-sanitize
+			"${DISABLE_USE[@]}"
 			bootstrap
 			clang
 			internal-glib
@@ -2472,7 +2460,7 @@ bootstrap_stage3() {
 
 	# Avoid installing git or encryption just for fun while completing @system
 	# e.g. bug #901101
-	export USE="-git -crypt -http2"
+	export USE="${DISABLE_USE[*]}"
 
 	# Portage should figure out itself what it needs to do, if anything.
 	local eflags=( "--deep" "--update" "--changed-use" "@system" )
@@ -2524,6 +2512,30 @@ set_helper_vars() {
 	SNAPSHOT_HOST=$(rapx http://distfiles.gentoo.org http://rsync.prefix.bitzolder.nl)
 	SNAPSHOT_URL=${SNAPSHOT_URL:-"${SNAPSHOT_HOST}/snapshots"}
 
+	# USE-flags to disable during bootstrap for they produce
+	# unnecessary, or worse: circular deps #901101, #936629
+	DISABLE_USE=(
+		"-acl"
+		"-berkdb"
+		"-crypt"
+		"-curl_quic_openssl"  # curl
+		"-fortran"            # gcc
+		"-gdbm"
+		"-git"
+		"-http2"              # curl
+		"-http3"              # curl
+		"-libcxx"
+		"-nls"
+		"-pcre"
+		"-python"
+		"-qmanifest"          # portage-utils
+		"-qtegrity"           # portage-utils
+		"-quic"               # curl
+		"-readline"           # bash
+		"-sanitize"
+	)
+
+
 	export MAKE CONFIG_SHELL
 }