commit:     f9b3019ce949c7f5773037ca8fae247e3ecde5b8
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 29 04:07:57 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Sun Sep 29 04:07:57 2024 +0000
URL:        https://gitweb.gentoo.org/proj/binhost.git/commit/?id=f9b3019c

lucky variant: autounmask can be simpler

--autounmask is a self-inflicted wound caused by misunderstanding the
confusing interplay of portage options. The default is already
autounmask for just USE flags, adding generic autounmask adds a bunch of
other autounmasks which we then disable.

Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 builders/milou/gnome-23/run-update    | 2 +-
 builders/milou/gnome-v3-23/run-update | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/builders/milou/gnome-23/run-update 
b/builders/milou/gnome-23/run-update
index 0d043c6..bc348cc 100755
--- a/builders/milou/gnome-23/run-update
+++ b/builders/milou/gnome-23/run-update
@@ -12,7 +12,7 @@ if [[ $1 = lucky ]]; then
        comm -23 /tmp/stable /tmp/installed > /tmp/uninstalled-stable
        sed -i 's/--binpkg-respect-use//' /etc/portage/make.conf
 
-       to_install=(--autounmask --autounmask-keep-keywords 
--autounmask-license n --autounmask-write --autounmask-continue $(shuf -n1 
/tmp/uninstalled-stable))
+       to_install=(--autounmask-write --autounmask-continue $(shuf -n1 
/tmp/uninstalled-stable))
 elif [[ $1 ]]; then
        pushd /etc/portage/variants/$1
        while read -r -d '' line; do

diff --git a/builders/milou/gnome-v3-23/run-update 
b/builders/milou/gnome-v3-23/run-update
index 0d043c6..bc348cc 100755
--- a/builders/milou/gnome-v3-23/run-update
+++ b/builders/milou/gnome-v3-23/run-update
@@ -12,7 +12,7 @@ if [[ $1 = lucky ]]; then
        comm -23 /tmp/stable /tmp/installed > /tmp/uninstalled-stable
        sed -i 's/--binpkg-respect-use//' /etc/portage/make.conf
 
-       to_install=(--autounmask --autounmask-keep-keywords 
--autounmask-license n --autounmask-write --autounmask-continue $(shuf -n1 
/tmp/uninstalled-stable))
+       to_install=(--autounmask-write --autounmask-continue $(shuf -n1 
/tmp/uninstalled-stable))
 elif [[ $1 ]]; then
        pushd /etc/portage/variants/$1
        while read -r -d '' line; do

Reply via email to