diff --git a/app-crypt/rpm-sequoia/rpm-sequoia-1.10.0.ebuild b/app-crypt/rpm-sequoia/rpm-sequoia-1.10.0.ebuild index 833e3b023a6e6..6048a2b9985e9 100644 --- a/app-crypt/rpm-sequoia/rpm-sequoia-1.10.0.ebuild +++ b/app-crypt/rpm-sequoia/rpm-sequoia-1.10.0.ebuild @@ -258,7 +258,7 @@ LLVM_COMPAT=( {19..21} ) RUST_MIN_VER="1.85.0" RUST_NEEDS_LLVM=1 -inherit cargo llvm-r1 +inherit cargo llvm-r2 DESCRIPTION="Implementation of the RPM PGP interface using Sequoia" HOMEPAGE="https://sequoia-pgp.org/ https://github.com/rpm-software-management/rpm-sequoia" @@ -295,7 +295,7 @@ BDEPEND=" QA_FLAGS_IGNORED="usr/lib.*/librpm_sequoia.so.1" pkg_setup() { - llvm-r1_pkg_setup + llvm-r2_pkg_setup rust_pkg_setup } diff --git a/app-editors/zed/zed-1.14.2.ebuild b/app-editors/zed/zed-1.14.2.ebuild index 073104f475afd..4f8767c6a2aac 100644 --- a/app-editors/zed/zed-1.14.2.ebuild +++ b/app-editors/zed/zed-1.14.2.ebuild @@ -172,7 +172,7 @@ pkg_setup() { strip-unsupported-flags # flags from upstream export RUSTFLAGS="${RUSTFLAGS} -C symbol-mangling-version=v0 --cfg tokio_unstable -C link-args=-Wl,--disable-new-dtags,-rpath,\$ORIGIN/../lib" - llvm-r1_pkg_setup + llvm-r2_pkg_setup rust_pkg_setup } diff --git a/app-editors/zed/zed-1.15.0.ebuild b/app-editors/zed/zed-1.15.0.ebuild index 9821cc4947cf1..24dfaad8bc4dc 100644 --- a/app-editors/zed/zed-1.15.0.ebuild +++ b/app-editors/zed/zed-1.15.0.ebuild @@ -172,7 +172,7 @@ pkg_setup() { strip-unsupported-flags # flags from upstream export RUSTFLAGS="${RUSTFLAGS} -C symbol-mangling-version=v0 --cfg tokio_unstable -C link-args=-Wl,--disable-new-dtags,-rpath,\$ORIGIN/../lib" - llvm-r1_pkg_setup + llvm-r2_pkg_setup rust_pkg_setup } diff --git a/app-editors/zed/zed-1.21.0.ebuild b/app-editors/zed/zed-1.21.0.ebuild index c9374e1eb09e8..5832f6b527d77 100644 --- a/app-editors/zed/zed-1.21.0.ebuild +++ b/app-editors/zed/zed-1.21.0.ebuild @@ -168,7 +168,7 @@ pkg_setup() { strip-unsupported-flags # flags from upstream export RUSTFLAGS="${RUSTFLAGS} -C symbol-mangling-version=v0 --cfg tokio_unstable -C link-args=-Wl,--disable-new-dtags,-rpath,\$ORIGIN/../lib" - llvm-r1_pkg_setup + llvm-r2_pkg_setup rust_pkg_setup } diff --git a/app-editors/zed/zed-1.27.0.ebuild b/app-editors/zed/zed-1.27.0.ebuild index a304439e30766..a67e9b5125a33 100644 --- a/app-editors/zed/zed-1.27.0.ebuild +++ b/app-editors/zed/zed-1.27.0.ebuild @@ -185,7 +185,7 @@ pkg_setup() { strip-unsupported-flags # flags from upstream export RUSTFLAGS="${RUSTFLAGS} -C symbol-mangling-version=v0 --cfg tokio_unstable -C link-args=-Wl,--disable-new-dtags,-rpath,\$ORIGIN/../lib" - llvm-r1_pkg_setup + llvm-r2_pkg_setup rust_pkg_setup } diff --git a/dev-lang/spidermonkey/spidermonkey-128.14.0.ebuild b/dev-lang/spidermonkey/spidermonkey-128.14.0.ebuild index b36eab104836d..c41747675df3b 100644 --- a/dev-lang/spidermonkey/spidermonkey-128.14.0.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-128.14.0.ebuild @@ -14,7 +14,7 @@ PYTHON_REQ_USE="ncurses,ssl,xml(+)" WANT_AUTOCONF="2.1" -inherit autotools check-reqs flag-o-matic llvm-r1 multiprocessing python-any-r1 rust toolchain-funcs +inherit autotools check-reqs flag-o-matic llvm-r2 multiprocessing python-any-r1 rust toolchain-funcs MY_PN="mozjs" MY_PV="${PV/_pre*}" @@ -197,7 +197,7 @@ pkg_setup() { fi check-reqs_pkg_setup - llvm-r1_pkg_setup + llvm-r2_pkg_setup rust_pkg_setup python-any-r1_pkg_setup diff --git a/dev-lang/spidermonkey/spidermonkey-140.16.0.ebuild b/dev-lang/spidermonkey/spidermonkey-140.16.0.ebuild index 05781293a5f40..7f88cbf3f7caf 100644 --- a/dev-lang/spidermonkey/spidermonkey-140.16.0.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-140.16.0.ebuild @@ -16,7 +16,7 @@ PYTHON_REQ_USE="ncurses,ssl,xml(+)" WANT_AUTOCONF="2.1" -inherit check-reqs flag-o-matic llvm-r1 multiprocessing python-any-r1 rust toolchain-funcs +inherit check-reqs flag-o-matic llvm-r2 multiprocessing python-any-r1 rust toolchain-funcs MY_PN="mozjs" MY_PV="${PV/_pre*}" @@ -196,7 +196,7 @@ pkg_setup() { fi check-reqs_pkg_setup - llvm-r1_pkg_setup + llvm-r2_pkg_setup rust_pkg_setup python-any-r1_pkg_setup diff --git a/dev-lang/spidermonkey/spidermonkey-140.17.0.ebuild b/dev-lang/spidermonkey/spidermonkey-140.17.0.ebuild index da2c7a079596b..c71b52bcec37b 100644 --- a/dev-lang/spidermonkey/spidermonkey-140.17.0.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-140.17.0.ebuild @@ -16,7 +16,7 @@ PYTHON_REQ_USE="ncurses,ssl,xml(+)" WANT_AUTOCONF="2.1" -inherit check-reqs flag-o-matic llvm-r1 multiprocessing python-any-r1 rust toolchain-funcs +inherit check-reqs flag-o-matic llvm-r2 multiprocessing python-any-r1 rust toolchain-funcs MY_PN="mozjs" MY_PV="${PV/_pre*}" @@ -196,7 +196,7 @@ pkg_setup() { fi check-reqs_pkg_setup - llvm-r1_pkg_setup + llvm-r2_pkg_setup rust_pkg_setup python-any-r1_pkg_setup diff --git a/dev-lang/spidermonkey/spidermonkey-153.6.0.ebuild b/dev-lang/spidermonkey/spidermonkey-153.6.0.ebuild index b3fd379c4522e..c8734c7e5eec2 100644 --- a/dev-lang/spidermonkey/spidermonkey-153.6.0.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-153.6.0.ebuild @@ -16,7 +16,7 @@ PYTHON_REQ_USE="ncurses,ssl,xml(+)" WANT_AUTOCONF="2.1" -inherit check-reqs flag-o-matic llvm-r1 multiprocessing python-any-r1 rust toolchain-funcs +inherit check-reqs flag-o-matic llvm-r2 multiprocessing python-any-r1 rust toolchain-funcs MY_PN="mozjs" MY_PV="${PV/_pre*}" @@ -196,7 +196,7 @@ pkg_setup() { fi check-reqs_pkg_setup - llvm-r1_pkg_setup + llvm-r2_pkg_setup rust_pkg_setup python-any-r1_pkg_setup diff --git a/dev-util/bpf-linker/bpf-linker-0.11.1.ebuild b/dev-util/bpf-linker/bpf-linker-0.11.1.ebuild index dccb86e60b87a..5149795bc9b77 100644 --- a/dev-util/bpf-linker/bpf-linker-0.11.1.ebuild +++ b/dev-util/bpf-linker/bpf-linker-0.11.1.ebuild @@ -15,7 +15,7 @@ LLVM_COMPAT=( {21..23} ) RUST_REQ_USE="llvm_targets_BPF(+),rust_sysroots_bpf(-)" RUST_NEEDS_LLVM=1 -inherit cargo llvm-r1 toolchain-funcs +inherit cargo llvm-r2 toolchain-funcs DESCRIPTION="Simple BPF static linker" HOMEPAGE="https://github.com/aya-rs/bpf-linker/" diff --git a/dev-util/bpf-linker/bpf-linker-0.12.0.ebuild b/dev-util/bpf-linker/bpf-linker-0.12.0.ebuild index e5eb41dc535ef..191667685f7b1 100644 --- a/dev-util/bpf-linker/bpf-linker-0.12.0.ebuild +++ b/dev-util/bpf-linker/bpf-linker-0.12.0.ebuild @@ -15,7 +15,7 @@ LLVM_COMPAT=( {21..23} ) RUST_REQ_USE="llvm_targets_BPF(+),rust_sysroots_bpf(-)" RUST_NEEDS_LLVM=1 -inherit cargo llvm-r1 toolchain-funcs +inherit cargo llvm-r2 toolchain-funcs DESCRIPTION="Simple BPF static linker" HOMEPAGE="https://github.com/aya-rs/bpf-linker/" diff --git a/dev-util/bpf-linker/bpf-linker-0.13.0.ebuild b/dev-util/bpf-linker/bpf-linker-0.13.0.ebuild index e5eb41dc535ef..191667685f7b1 100644 --- a/dev-util/bpf-linker/bpf-linker-0.13.0.ebuild +++ b/dev-util/bpf-linker/bpf-linker-0.13.0.ebuild @@ -15,7 +15,7 @@ LLVM_COMPAT=( {21..23} ) RUST_REQ_USE="llvm_targets_BPF(+),rust_sysroots_bpf(-)" RUST_NEEDS_LLVM=1 -inherit cargo llvm-r1 toolchain-funcs +inherit cargo llvm-r2 toolchain-funcs DESCRIPTION="Simple BPF static linker" HOMEPAGE="https://github.com/aya-rs/bpf-linker/" diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass index 863e37a4dda3a..cde90e2836659 100644 --- a/eclass/cargo.eclass +++ b/eclass/cargo.eclass @@ -21,7 +21,7 @@ if [[ -z ${_CARGO_ECLASS} ]]; then _CARGO_ECLASS=1 if [[ -n ${RUST_NEEDS_LLVM} ]]; then - inherit llvm-r1 + inherit llvm-r2 fi if [[ -n ${CARGO_OPTIONAL} ]]; then diff --git a/eclass/rust.eclass b/eclass/rust.eclass index a8b5cc0f6171d..98d5de7df511b 100644 --- a/eclass/rust.eclass +++ b/eclass/rust.eclass @@ -52,7 +52,7 @@ if [[ -z ${_RUST_ECLASS} ]]; then _RUST_ECLASS=1 if [[ -n ${RUST_NEEDS_LLVM} ]]; then - inherit llvm-r1 + inherit llvm-r2 fi if [[ -n ${RUST_MULTILIB} ]]; then @@ -161,7 +161,7 @@ declare -a -g -r _RUST_SLOTS_ORDERED=( # packages that need a tight coupling between Rust and LLVM but don't # really care _which_ version of Rust is selected. Combine with # RUST_MAX_VER and RUST_MIN_VER to limit the range of Rust versions -# that are acceptable. Will `die` if llvm-r1 is not inherited or +# that are acceptable. Will `die` if llvm-r2 is not inherited or # an invalid combination of RUST and LLVM slots is detected; this probably # means that a LLVM slot in LLVM_COMPAT has had all of its Rust slots filtered. diff --git a/mail-client/thunderbird/thunderbird-153.6.0.ebuild b/mail-client/thunderbird/thunderbird-153.6.0.ebuild index 4c3a1de9ed71d..7979584e3200b 100644 --- a/mail-client/thunderbird/thunderbird-153.6.0.ebuild +++ b/mail-client/thunderbird/thunderbird-153.6.0.ebuild @@ -41,7 +41,7 @@ MOZ_P="${MOZ_PN}-${MOZ_PV}" MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}" MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}" -inherit check-reqs desktop eapi9-ver flag-o-matic gnome2-utils linux-info llvm-r1 \ +inherit check-reqs desktop eapi9-ver flag-o-matic gnome2-utils linux-info llvm-r2 \ multiprocessing optfeature pax-utils python-any-r1 rust toolchain-funcs virtualx xdg DESCRIPTION="Thunderbird Mail Client" @@ -395,7 +395,7 @@ pkg_setup() { fi check-reqs_pkg_setup - llvm-r1_pkg_setup + llvm-r2_pkg_setup rust_pkg_setup python-any-r1_pkg_setup diff --git a/mail-client/thunderbird/thunderbird-159.0.ebuild b/mail-client/thunderbird/thunderbird-159.0.ebuild index 0f2318a362528..d7e047c1d99dd 100644 --- a/mail-client/thunderbird/thunderbird-159.0.ebuild +++ b/mail-client/thunderbird/thunderbird-159.0.ebuild @@ -41,7 +41,7 @@ MOZ_P="${MOZ_PN}-${MOZ_PV}" MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}" MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}" -inherit check-reqs desktop eapi9-ver flag-o-matic gnome2-utils linux-info llvm-r1 \ +inherit check-reqs desktop eapi9-ver flag-o-matic gnome2-utils linux-info llvm-r2 \ multiprocessing optfeature pax-utils python-any-r1 rust toolchain-funcs virtualx xdg DESCRIPTION="Thunderbird Mail Client" @@ -395,7 +395,7 @@ pkg_setup() { fi check-reqs_pkg_setup - llvm-r1_pkg_setup + llvm-r2_pkg_setup rust_pkg_setup python-any-r1_pkg_setup diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.3.1.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.3.1.ebuild index debf527bd7080..f5a9a6d31bd96 100644 --- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.3.1.ebuild +++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -198,7 +198,7 @@ LLVM_COMPAT=( {19..21} ) RUST_MIN_VER="1.82.0" RUST_NEEDS_LLVM=1 -inherit cargo llvm-r1 +inherit cargo llvm-r2 DESCRIPTION="A suite of tools for thin provisioning on Linux" HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools" @@ -250,7 +250,7 @@ PATCHES=( ) pkg_setup() { - llvm-r1_pkg_setup + llvm-r2_pkg_setup rust_pkg_setup } diff --git a/www-client/firefox/firefox-153.6.0.ebuild b/www-client/firefox/firefox-153.6.0.ebuild index 810733d22c5e4..d7671ee47bcdb 100644 --- a/www-client/firefox/firefox-153.6.0.ebuild +++ b/www-client/firefox/firefox-153.6.0.ebuild @@ -49,7 +49,7 @@ MOZ_P="${MOZ_PN}-${MOZ_PV}" MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}" MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}" -inherit check-reqs desktop flag-o-matic gnome2-utils linux-info llvm-r1 multiprocessing \ +inherit check-reqs desktop flag-o-matic gnome2-utils linux-info llvm-r2 multiprocessing \ optfeature pax-utils python-any-r1 readme.gentoo-r1 rust toolchain-funcs virtualx xdg MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}" @@ -421,7 +421,7 @@ pkg_setup() { fi check-reqs_pkg_setup - llvm-r1_pkg_setup + llvm-r2_pkg_setup rust_pkg_setup python-any-r1_pkg_setup diff --git a/www-client/firefox/firefox-159.0.1.ebuild b/www-client/firefox/firefox-159.0.1.ebuild index 4ea28997c7a6f..c52466498c180 100644 --- a/www-client/firefox/firefox-159.0.1.ebuild +++ b/www-client/firefox/firefox-159.0.1.ebuild @@ -49,7 +49,7 @@ MOZ_P="${MOZ_PN}-${MOZ_PV}" MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}" MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}" -inherit check-reqs desktop flag-o-matic gnome2-utils linux-info llvm-r1 multiprocessing \ +inherit check-reqs desktop flag-o-matic gnome2-utils linux-info llvm-r2 multiprocessing \ optfeature pax-utils python-any-r1 readme.gentoo-r1 rust toolchain-funcs virtualx xdg MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}" @@ -421,7 +421,7 @@ pkg_setup() { fi check-reqs_pkg_setup - llvm-r1_pkg_setup + llvm-r2_pkg_setup rust_pkg_setup python-any-r1_pkg_setup diff --git a/www-client/firefox/firefox-159.0.ebuild b/www-client/firefox/firefox-159.0.ebuild index dcb67b0a3c04b..b5b472ebf4eb7 100644 --- a/www-client/firefox/firefox-159.0.ebuild +++ b/www-client/firefox/firefox-159.0.ebuild @@ -49,7 +49,7 @@ MOZ_P="${MOZ_PN}-${MOZ_PV}" MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}" MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}" -inherit check-reqs desktop flag-o-matic gnome2-utils linux-info llvm-r1 multiprocessing \ +inherit check-reqs desktop flag-o-matic gnome2-utils linux-info llvm-r2 multiprocessing \ optfeature pax-utils python-any-r1 readme.gentoo-r1 rust toolchain-funcs virtualx xdg MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}" @@ -421,7 +421,7 @@ pkg_setup() { fi check-reqs_pkg_setup - llvm-r1_pkg_setup + llvm-r2_pkg_setup rust_pkg_setup python-any-r1_pkg_setup