From d3c7d3e5f9607edef1a795ccc502ab3eb3121165 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 14 Nov 2024 03:02:32 +0000 Subject: gentoo auto-resync : 14:11:2024 - 03:02:32 --- profiles/base/package.use.force | 27 +++++++++++++++++++++++++++ profiles/base/package.use.mask | 4 ---- profiles/base/package.use.stable.mask | 4 ---- profiles/base/use.mask | 7 +++++++ profiles/base/use.stable.mask | 2 -- 5 files changed, 34 insertions(+), 10 deletions(-) (limited to 'profiles/base') diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force index 6da238d69422..a5ba2145c048 100644 --- a/profiles/base/package.use.force +++ b/profiles/base/package.use.force @@ -1,6 +1,33 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Matt Jolly (2024-11-13) +# Force the use of the appropriate llvm_slot_x USE for Rust. +# This is strictly papercut prevention; the ebuild will enforce the correct +# selection via LLVM_REQUIRED_USE. This prevents users from deselecting +# the correct slot by (e.g.) setting -llvm_slot_# globally. +# source ../eclass/rust.eclass +# for slot in ${_RUST_SLOTS_ORDERED[@]}; do +# echo "dev-lang/rust:${slot} llvm_slot_${_RUST_LLVM_MAP[${slot}]}" +# echo "dev-lang/rust-bin:${slot} llvm_slot_${_RUST_LLVM_MAP[${slot}]}" +# done +dev-lang/rust:1.82.0 llvm_slot_19 +dev-lang/rust-bin:1.82.0 llvm_slot_19 +dev-lang/rust:1.81.0 llvm_slot_18 +dev-lang/rust-bin:1.81.0 llvm_slot_18 +dev-lang/rust:1.80.1 llvm_slot_18 +dev-lang/rust-bin:1.80.1 llvm_slot_18 +dev-lang/rust:1.79.0 llvm_slot_18 +dev-lang/rust-bin:1.79.0 llvm_slot_18 +dev-lang/rust:1.77.1 llvm_slot_17 +dev-lang/rust-bin:1.77.1 llvm_slot_17 +dev-lang/rust:1.75.0 llvm_slot_17 +dev-lang/rust-bin:1.75.0 llvm_slot_17 +dev-lang/rust:1.74.1 llvm_slot_17 +dev-lang/rust-bin:1.74.1 llvm_slot_17 +dev-lang/rust:1.71.1 llvm_slot_16 +dev-lang/rust-bin:1.71.1 llvm_slot_16 + # Sam James (2024-09-30) # gnat-gpl only exists for (bootstrapping) Ada. Until bug #940471 is handled, # force Ada on. Once it is split/moved/gutted, this won't be necessary diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 537a2a53ec8a..6aa00b80895d 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -62,10 +62,6 @@ app-alternatives/yacc reference # Causes crashes with e.g. dlz+samba (bug #938955) net-dns/bind jemalloc -# Andreas Sturmlechner (2024-09-01) -# Prepare for dev-util/kdevelop:5 removal -kde-apps/umbrello:5 php - # Andreas Sturmlechner (2024-08-31) # Prepare for KDE PIM 5 removal and avoid conflicts w/ KDE PIM 6 app-office/kmymoney:5 addressbook diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask index 02b9f1e3049f..2f013f1f828c 100644 --- a/profiles/base/package.use.stable.mask +++ b/profiles/base/package.use.stable.mask @@ -4,10 +4,6 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in package.use.mask -# Michał Górny (2024-10-26) -# Unblock the support in python-exec while the target is masked. -dev-lang/python-exec -python_targets_python3_13 - # Volkmar W. Pogatzki (2024-10-11) # No suitable version of dev-libs/protobuf available. =dev-java/protobuf-java-4.28.1 system-protoc diff --git a/profiles/base/use.mask b/profiles/base/use.mask index b4845b0b52e8..96c627eb030e 100644 --- a/profiles/base/use.mask +++ b/profiles/base/use.mask @@ -4,6 +4,13 @@ # This file is only for generic masks. For arch-specific masks (i.e. # mask everywhere, unmask on arch/*) use arch/base. +# Michael Orlitzky (2024-11-13) +# The 8.1 slot is masked, so the USE flag that pulls it in has to be +# masked too. The bare "php8-1" is for www-servers/nginx-unit which +# has a non-standard flag name. +php_targets_php8-1 +php8-1 + # Andreas K. Hüttel (2024-10-21) # Mechanism for coping with the time64 transition of 32bit arches # Will be unmasked in the time64 profiles diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask index d1197864f26b..e474311a509b 100644 --- a/profiles/base/use.stable.mask +++ b/profiles/base/use.stable.mask @@ -14,8 +14,6 @@ llvm_slot_19 # Michał Górny (2024-05-08) # Python implementations without stable keywords. -python_targets_python3_13 -python_single_target_python3_13 python_targets_python3_13t python_single_target_python3_13t python_targets_pypy3 -- cgit v1.2.3