From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2C0F1159C96 for ; Tue, 23 Jul 2024 14:08:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 02F092BC01A; Tue, 23 Jul 2024 14:08:04 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B49452BC01B for ; Tue, 23 Jul 2024 14:08:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B39DC340CB1 for ; Tue, 23 Jul 2024 14:08:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8033D1E77 for ; Tue, 23 Jul 2024 14:07:59 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1721743672.9f09b98ee6a5edce65e995c4701776e8e1c86d1d.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/llvm-r1.eclass X-VCS-Directories: eclass/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 9f09b98ee6a5edce65e995c4701776e8e1c86d1d X-VCS-Branch: master Date: Tue, 23 Jul 2024 14:07:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 71a2a280-1600-4cdc-84c4-7ebf78c13d30 X-Archives-Hash: 0502275ffa0e2b48ee1906ebf5eb0c35 commit: 9f09b98ee6a5edce65e995c4701776e8e1c86d1d Author: Michał Górny gentoo org> AuthorDate: Sun Jul 7 12:22:52 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Jul 23 14:07:52 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f09b98e llvm-r1.eclass: Do not default-enable unkeyworded slots Change the IUSE defaults logic to default-enable the *oldest* ~arch version rather than the newest one, when no stable slots are supported. Since we only except a single ~arch version to exist, this effectively prevents the eclass from default-enabling the unkeyworded snapshots. Closes: https://bugs.gentoo.org/935681 Signed-off-by: Michał Górny gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/37473 Signed-off-by: Michał Górny gentoo.org> eclass/llvm-r1.eclass | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/eclass/llvm-r1.eclass b/eclass/llvm-r1.eclass index 620697e6e045..0a53b9a3cb5e 100644 --- a/eclass/llvm-r1.eclass +++ b/eclass/llvm-r1.eclass @@ -123,11 +123,16 @@ _llvm_set_globals() { fi if [[ ${stable[@]} ]]; then + # If there is at least one stable slot supported, then enable + # the newest stable slot by default. IUSE="+llvm_slot_${stable[-1]}" unset 'stable[-1]' else - IUSE="+llvm_slot_${unstable[-1]}" - unset 'unstable[-1]' + # Otherwise, enable the "oldest" ~arch slot. We really only + # expect a single ~arch version, so this primarily prevents + # defaulting to non-keyworded slots. + IUSE="+llvm_slot_${unstable[0]}" + unset 'unstable[0]' fi local nondefault=( "${stable[@]}" "${unstable[@]}" ) IUSE+=" ${nondefault[*]/#/llvm_slot_}"