From 598ad9dfae7bd2b3cbfc427b773985965dfe3687 Mon Sep 17 00:00:00 2001 From: rain Date: Tue, 23 Jun 2026 17:01:44 -0400 Subject: [PATCH 1/2] Gentoo: add --autounmask=y to handle ~amd64 keyword unmask lazygit and most GURU packages are ~amd64 only. Without --autounmask=y, emerge fails with: =dev-vcs/lazygit-0.62.2 ~amd64 required. Applied to run_once_20-install-user-packages-gentoo.sh.tmpl and run_once_40-install-sway-gentoo.sh.tmpl. --- run_once_20-install-user-packages-gentoo.sh.tmpl | 5 ++++- run_once_40-install-sway-gentoo.sh.tmpl | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/run_once_20-install-user-packages-gentoo.sh.tmpl b/run_once_20-install-user-packages-gentoo.sh.tmpl index e5c1a5b..e524dce 100644 --- a/run_once_20-install-user-packages-gentoo.sh.tmpl +++ b/run_once_20-install-user-packages-gentoo.sh.tmpl @@ -139,8 +139,11 @@ if (( ${#MISSING_PKGS[@]} > 0 )); then # --quiet-build: only show errors during compile # --keep-going: don't abort if one package fails # --with-bdeps=y: include build deps so we don't accidentally skip them + # --autounmask=y: auto-write ~amd64 keyword unmask files (lazygit + # is ~amd64 only) + # --autounmask-license=y: auto-accept license unmask sudo emerge --ask=n --nospinner --quiet-build --keep-going \ - --with-bdeps=y --autounmask-license=y \ + --with-bdeps=y --autounmask=y --autounmask-license=y \ "${MISSING_PKGS[@]}" else log "all user packages already installed; skipping emerge" diff --git a/run_once_40-install-sway-gentoo.sh.tmpl b/run_once_40-install-sway-gentoo.sh.tmpl index 769414e..1506b74 100644 --- a/run_once_40-install-sway-gentoo.sh.tmpl +++ b/run_once_40-install-sway-gentoo.sh.tmpl @@ -71,7 +71,7 @@ if (( ${#MISSING_PKGS[@]} > 0 )); then log "missing: ${MISSING_PKGS[*]}" log "emerge sway stack (gentoo compiles from source; this may take a while)" sudo emerge --ask=n --nospinner --quiet-build --keep-going \ - --with-bdeps=y --autounmask-license=y \ + --with-bdeps=y --autounmask=y --autounmask-license=y \ "${MISSING_PKGS[@]}" else log "all sway packages already installed; skipping emerge" From 6ec6958a730bcb41103999c789e91ca4504d941d Mon Sep 17 00:00:00 2001 From: rain Date: Tue, 23 Jun 2026 17:49:37 -0400 Subject: [PATCH 2/2] Gentoo GURU emerge: add --autounmask=y to handle ~amd64 keyword The GURU emerge in run_once_20-install-user-packages-gentoo.sh.tmpl was missing --autounmask=y (only had --autounmask-license=y). Same fix as the main pkg loop: GURU packages like dev-vcs/lazygit are ~amd64-only and need the keyword unmask to be auto-written. Symptom: 'The following keyword changes are necessary to proceed: =dev-vcs/lazygit-0.62.2 ~amd64' even though --autounmask=y was already on the main pkg loop. Fix: add the same flag to the GURU loop. --- run_once_20-install-user-packages-gentoo.sh.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run_once_20-install-user-packages-gentoo.sh.tmpl b/run_once_20-install-user-packages-gentoo.sh.tmpl index e524dce..ee61aca 100644 --- a/run_once_20-install-user-packages-gentoo.sh.tmpl +++ b/run_once_20-install-user-packages-gentoo.sh.tmpl @@ -183,7 +183,7 @@ done if (( ${#GURU_MISSING[@]} > 0 )); then log "emerge GURU packages (missing: ${GURU_MISSING[*]})" sudo emerge --ask=n --nospinner --quiet-build --keep-going \ - --with-bdeps=y --autounmask-license=y \ + --with-bdeps=y --autounmask=y --autounmask-license=y \ "${GURU_MISSING[@]}" fi