[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     4d1e44303c0a968a1a2cdc6b5597e862bbfb81bd
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 16 07:09:20 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jul 16 07:09:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4d1e4430

scripts/bootstrap-prefix: make stable keyword impl a bit more generic

If we want to support more (Linux) arches in the future with stable
keywords, this should do the trick.

Closes: https://bugs.gentoo.org/759424
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 92a7facc36..c34842da77 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -321,6 +321,9 @@ bootstrap_setup() {
 			if is-rap ; then
 				echo "# sandbox does not work well on Prefix, bug 490246"
 				echo 'FEATURES="${FEATURES} -usersandbox -sandbox"'
+				# bug 759424
+				[[ -n ${STABLE_PREFIX} ]] && \
+					echo 'ACCEPT_KEYWORDS="${ARCH} -~${ARCH}"'
 			fi
 			if [[ ${FS_INSENSITIVE} == 1 ]] ; then
 				echo
@@ -331,8 +334,6 @@ bootstrap_setup() {
 				echo "PORTDIR_OVERLAY=\"\${PORTDIR_OVERLAY} ${PORTDIR_OVERLAY}\""
 			[[ -n ${MAKE_CONF_ADDITIONAL_USE} ]] &&
 				echo "USE=\"\${USE} ${MAKE_CONF_ADDITIONAL_USE}\""
-			[[ -n ${STABLE_PREFIX} ]] && \
-				echo "ACCEPT_KEYWORDS=\"amd64 -~amd64\""
 			[[ ${OFFLINE_MODE} ]] && \
 				echo 'FETCHCOMMAND="bash -c \"echo I need \${FILE} from \${URI} in \${DISTDIR}; read\""'
 		} > "${ROOT}"/etc/portage/make.conf
@@ -2720,7 +2721,7 @@ EOF
 				[Yy][Ee][Ss]|[Yy]|"")
 					echo "Okay, I'll disable ~amd64 by default."
 					export STABLE_PREFIX="yes"
-					: ;;
+					;;
 				*)
 					echo "Fine, I will not disable ~amd64, no problem."
 					;;