mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-24 18:58:08 -07:00
*/*: fix rust eclass usedep/mutlilib handling; inherit order
The rust eclass has been updated to directly inject a required MULTILIB_USEDEP when requested. RUST_USEDEP has been renamed to RUST_REQUIRED_USE to be consistent with other eclasses. llvm-r1 should be imported after cargo and the eclass now enables this. Signed-off-by: Matt Jolly <kangie@gentoo.org>
This commit is contained in:
@@ -238,7 +238,7 @@ CRATES="
|
||||
LLVM_COMPAT=( 17 )
|
||||
RUST_NEEDS_LLVM=1
|
||||
|
||||
inherit llvm-r1 cargo
|
||||
inherit cargo llvm-r1
|
||||
|
||||
DESCRIPTION="Implementation of the RPM PGP interface using Sequoia"
|
||||
HOMEPAGE="https://sequoia-pgp.org/ https://github.com/rpm-software-management/rpm-sequoia"
|
||||
|
||||
@@ -252,7 +252,7 @@ LLVM_COMPAT=( 17 18 )
|
||||
RUST_MIN_VER="1.74.1"
|
||||
RUST_NEEDS_LLVM=1
|
||||
|
||||
inherit llvm-r1 cargo
|
||||
inherit cargo llvm-r1
|
||||
|
||||
DESCRIPTION="Implementation of the RPM PGP interface using Sequoia"
|
||||
HOMEPAGE="https://sequoia-pgp.org/ https://github.com/rpm-software-management/rpm-sequoia"
|
||||
|
||||
@@ -397,7 +397,7 @@ CRATES="
|
||||
LLVM_COMPAT=( 17 18 )
|
||||
RUST_NEEDS_LLVM=1
|
||||
|
||||
inherit llvm-r1 cargo xdg-utils
|
||||
inherit cargo llvm-r1 xdg-utils
|
||||
|
||||
DESCRIPTION="Sequoia's reimplementation of the GnuPG interface"
|
||||
HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/"
|
||||
|
||||
@@ -395,7 +395,7 @@ CRATES="
|
||||
LLVM_COMPAT=( 17 18 )
|
||||
RUST_NEEDS_LLVM=1
|
||||
|
||||
inherit llvm-r1 cargo xdg-utils
|
||||
inherit cargo llvm-r1 xdg-utils
|
||||
|
||||
DESCRIPTION="Sequoia's reimplementation of the GnuPG interface"
|
||||
HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/"
|
||||
|
||||
@@ -368,7 +368,7 @@ CRATES="
|
||||
LLVM_COMPAT=( 17 18 )
|
||||
RUST_NEEDS_LLVM=1
|
||||
|
||||
inherit llvm-r1 cargo xdg-utils
|
||||
inherit cargo llvm-r1 xdg-utils
|
||||
|
||||
DESCRIPTION="Sequoia's reimplementation of the GnuPG interface"
|
||||
HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/"
|
||||
|
||||
@@ -371,7 +371,7 @@ CRATES="
|
||||
LLVM_COMPAT=( 17 18 )
|
||||
RUST_NEEDS_LLVM=1
|
||||
|
||||
inherit llvm-r1 cargo xdg-utils
|
||||
inherit cargo llvm-r1 xdg-utils
|
||||
|
||||
DESCRIPTION="Sequoia's reimplementation of the GnuPG interface"
|
||||
HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/"
|
||||
|
||||
@@ -487,7 +487,7 @@ CRATES="
|
||||
|
||||
LLVM_COMPAT=( {16..17} )
|
||||
|
||||
inherit llvm-r1 cargo shell-completion
|
||||
inherit cargo llvm-r1 shell-completion
|
||||
|
||||
DESCRIPTION="CLI of the Sequoia OpenPGP implementation"
|
||||
HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-sq"
|
||||
|
||||
@@ -491,7 +491,7 @@ CRATES="
|
||||
|
||||
LLVM_COMPAT=( {16..18} )
|
||||
|
||||
inherit llvm-r1 cargo shell-completion
|
||||
inherit cargo llvm-r1 shell-completion
|
||||
|
||||
DESCRIPTION="CLI of the Sequoia OpenPGP implementation"
|
||||
HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-sq"
|
||||
|
||||
@@ -517,7 +517,7 @@ CRATES="
|
||||
|
||||
LLVM_COMPAT=( {16..18} )
|
||||
|
||||
inherit llvm-r1 cargo shell-completion
|
||||
inherit cargo llvm-r1 shell-completion
|
||||
|
||||
DESCRIPTION="CLI of the Sequoia OpenPGP implementation"
|
||||
HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-sq"
|
||||
|
||||
@@ -253,7 +253,7 @@ CRATES="
|
||||
LLVM_COMPAT=( {17..18} )
|
||||
RUST_NEEDS_LLVM=1
|
||||
|
||||
inherit bash-completion-r1 llvm-r1 cargo
|
||||
inherit bash-completion-r1 cargo llvm-r1
|
||||
|
||||
DESCRIPTION="A simple OpenPGP signature verification program"
|
||||
HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-sqv"
|
||||
|
||||
@@ -34,7 +34,7 @@ LLVM_COMPAT=( 18 )
|
||||
RUST_MIN_VER="1.80.1"
|
||||
RUST_NEEDS_LLVM=1
|
||||
|
||||
inherit llvm-r1 cargo check-reqs desktop flag-o-matic toolchain-funcs xdg
|
||||
inherit cargo check-reqs desktop flag-o-matic llvm-r1 toolchain-funcs xdg
|
||||
|
||||
DESCRIPTION="The fast, collaborative code editor"
|
||||
HOMEPAGE="https://zed.dev https://github.com/zed-industries/zed"
|
||||
|
||||
@@ -58,7 +58,7 @@ LLVM_COMPAT=( 18 )
|
||||
RUST_MIN_VER="1.80.1"
|
||||
RUST_NEEDS_LLVM=1
|
||||
|
||||
inherit llvm-r1 cargo check-reqs desktop flag-o-matic toolchain-funcs xdg
|
||||
inherit cargo check-reqs desktop flag-o-matic llvm-r1 toolchain-funcs xdg
|
||||
|
||||
DESCRIPTION="The fast, collaborative code editor"
|
||||
HOMEPAGE="https://zed.dev https://github.com/zed-industries/zed"
|
||||
|
||||
@@ -58,7 +58,7 @@ LLVM_COMPAT=( 18 )
|
||||
RUST_MIN_VER="1.80.1"
|
||||
RUST_NEEDS_LLVM=1
|
||||
|
||||
inherit llvm-r1 cargo check-reqs desktop flag-o-matic toolchain-funcs xdg
|
||||
inherit cargo check-reqs desktop flag-o-matic llvm-r1 toolchain-funcs xdg
|
||||
|
||||
DESCRIPTION="The fast, collaborative code editor"
|
||||
HOMEPAGE="https://zed.dev https://github.com/zed-industries/zed"
|
||||
|
||||
@@ -278,9 +278,9 @@ CRATES="
|
||||
yeslogic-fontconfig-sys@4.0.1
|
||||
"
|
||||
|
||||
RUST_USEDEP='${MULTILIB_USEDEP}'
|
||||
RUST_MULTILIB=1
|
||||
|
||||
inherit multilib-minimal cargo gnome2 python-any-r1 rust-toolchain vala
|
||||
inherit cargo gnome2 multilib-minimal python-any-r1 rust-toolchain vala
|
||||
|
||||
DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
|
||||
HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg https://gitlab.gnome.org/GNOME/librsvg"
|
||||
|
||||
@@ -289,9 +289,9 @@ CRATES="
|
||||
"
|
||||
|
||||
RUST_MIN_VER="1.71.1"
|
||||
RUST_USEDEP='${MULTILIB_USEDEP}'
|
||||
RUST_MULTILIB=1
|
||||
|
||||
inherit multilib-minimal cargo gnome2 python-any-r1 rust-toolchain vala
|
||||
inherit cargo gnome2 multilib-minimal python-any-r1 rust-toolchain vala
|
||||
|
||||
DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
|
||||
HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg https://gitlab.gnome.org/GNOME/librsvg"
|
||||
|
||||
@@ -288,9 +288,9 @@ CRATES="
|
||||
"
|
||||
|
||||
RUST_MIN_VER="1.71.1"
|
||||
RUST_USEDEP='${MULTILIB_USEDEP}'
|
||||
RUST_MULTILIB=1
|
||||
|
||||
inherit multilib-minimal cargo gnome2 python-any-r1 rust-toolchain vala
|
||||
inherit cargo gnome2 multilib-minimal python-any-r1 rust-toolchain vala
|
||||
|
||||
DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
|
||||
HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg https://gitlab.gnome.org/GNOME/librsvg"
|
||||
|
||||
@@ -89,8 +89,9 @@ CRATES="
|
||||
windows_x86_64_msvc@0.52.6
|
||||
wyz@0.5.1
|
||||
"
|
||||
RUST_USEDEP='${MULTILIB_USEDEP}'
|
||||
inherit multilib-minimal cargo edo rust-toolchain
|
||||
RUST_MULTILIB=1
|
||||
|
||||
inherit cargo edo multilib-minimal rust-toolchain
|
||||
|
||||
DESCRIPTION="Dolby Vision metadata parsing and writing"
|
||||
HOMEPAGE="https://github.com/quietvoid/dovi_tool/"
|
||||
|
||||
@@ -108,7 +108,7 @@ CRATES="
|
||||
|
||||
LLVM_COMPAT=( {16..18} )
|
||||
|
||||
inherit llvm-r1 cargo desktop xdg
|
||||
inherit cargo desktop llvm-r1 xdg
|
||||
|
||||
DESCRIPTION="A GTK patchbay for pipewire"
|
||||
HOMEPAGE="https://gitlab.freedesktop.org/pipewire/helvum"
|
||||
|
||||
@@ -111,7 +111,7 @@ CRATES="
|
||||
|
||||
LLVM_COMPAT=( {16..18} )
|
||||
|
||||
inherit llvm-r1 cargo desktop xdg
|
||||
inherit cargo desktop llvm-r1 xdg
|
||||
|
||||
DESCRIPTION="A GTK patchbay for pipewire"
|
||||
HOMEPAGE="https://gitlab.freedesktop.org/pipewire/helvum"
|
||||
|
||||
@@ -195,9 +195,9 @@ windows-targets@0.52.5
|
||||
ws2_32-sys@0.2.1
|
||||
"
|
||||
|
||||
RUST_USEDEP='${MULTILIB_USEDEP}'
|
||||
RUST_MULTILIB=1
|
||||
|
||||
inherit multilib-minimal cargo cmake flag-o-matic rust-toolchain
|
||||
inherit cargo cmake flag-o-matic multilib-minimal rust-toolchain
|
||||
|
||||
DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3"
|
||||
HOMEPAGE="https://github.com/cloudflare/quiche"
|
||||
|
||||
@@ -195,9 +195,9 @@ windows-targets@0.52.5
|
||||
ws2_32-sys@0.2.1
|
||||
"
|
||||
|
||||
RUST_USEDEP='${MULTILIB_USEDEP}'
|
||||
RUST_MULTILIB=1
|
||||
|
||||
inherit multilib-minimal cargo cmake flag-o-matic rust-toolchain
|
||||
inherit cargo cmake flag-o-matic multilib-minimal rust-toolchain
|
||||
|
||||
DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3"
|
||||
HOMEPAGE="https://github.com/cloudflare/quiche"
|
||||
|
||||
@@ -45,8 +45,9 @@ CRATES="
|
||||
winapi-x86_64-pc-windows-gnu@0.4.0
|
||||
winnow@0.4.1
|
||||
"
|
||||
RUST_USEDEP='${MULTILIB_USEDEP}'
|
||||
inherit multilib-minimal cargo flag-o-matic rust-toolchain
|
||||
RUST_MULTILIB=1
|
||||
|
||||
inherit cargo flag-o-matic multilib-minimal rust-toolchain
|
||||
|
||||
DESCRIPTION="C-to-rustls bindings"
|
||||
HOMEPAGE="https://github.com/rustls/rustls-ffi"
|
||||
|
||||
@@ -36,8 +36,9 @@ CRATES="
|
||||
windows_x86_64_msvc@0.48.5
|
||||
zeroize@1.7.0
|
||||
"
|
||||
RUST_USEDEP='${MULTILIB_USEDEP}'
|
||||
inherit multilib-minimal cargo flag-o-matic rust-toolchain
|
||||
RUST_MULTILIB=1
|
||||
|
||||
inherit cargo flag-o-matic multilib-minimal rust-toolchain
|
||||
|
||||
DESCRIPTION="C-to-rustls bindings"
|
||||
HOMEPAGE="https://github.com/rustls/rustls-ffi"
|
||||
|
||||
@@ -36,8 +36,9 @@ CRATES="
|
||||
windows_x86_64_msvc@0.48.5
|
||||
zeroize@1.7.0
|
||||
"
|
||||
RUST_USEDEP='${MULTILIB_USEDEP}'
|
||||
inherit multilib-minimal cargo flag-o-matic rust-toolchain
|
||||
RUST_MULTILIB=1
|
||||
|
||||
inherit cargo flag-o-matic multilib-minimal rust-toolchain
|
||||
|
||||
DESCRIPTION="C-to-rustls bindings"
|
||||
HOMEPAGE="https://github.com/rustls/rustls-ffi"
|
||||
|
||||
@@ -37,8 +37,9 @@ CRATES="
|
||||
windows_x86_64_msvc@0.48.5
|
||||
zeroize@1.7.0
|
||||
"
|
||||
RUST_USEDEP='${MULTILIB_USEDEP}'
|
||||
inherit multilib-minimal cargo flag-o-matic rust-toolchain
|
||||
RUST_MULTILIB=1
|
||||
|
||||
inherit cargo flag-o-matic multilib-minimal rust-toolchain
|
||||
|
||||
DESCRIPTION="C-to-rustls bindings"
|
||||
HOMEPAGE="https://github.com/rustls/rustls-ffi"
|
||||
|
||||
@@ -115,8 +115,9 @@ CRATES="
|
||||
windows_x86_64_msvc@0.52.4
|
||||
zeroize@1.7.0
|
||||
"
|
||||
RUST_USEDEP='${MULTILIB_USEDEP}'
|
||||
inherit multilib-minimal cargo flag-o-matic rust-toolchain
|
||||
RUST_MULTILIB=1
|
||||
|
||||
inherit cargo flag-o-matic multilib-minimal rust-toolchain
|
||||
|
||||
DESCRIPTION="C-to-rustls bindings"
|
||||
HOMEPAGE="https://github.com/rustls/rustls-ffi"
|
||||
|
||||
@@ -65,8 +65,9 @@ CRATES="
|
||||
winapi-i686-pc-windows-gnu@0.4.0
|
||||
winapi-x86_64-pc-windows-gnu@0.4.0
|
||||
"
|
||||
RUST_USEDEP='${MULTILIB_USEDEP}'
|
||||
inherit multilib-minimal cargo flag-o-matic rust-toolchain
|
||||
RUST_MULTILIB=1
|
||||
|
||||
inherit cargo flag-o-matic multilib-minimal rust-toolchain
|
||||
|
||||
DESCRIPTION="C-to-rustls bindings"
|
||||
HOMEPAGE="https://github.com/rustls/rustls-ffi"
|
||||
|
||||
@@ -7,7 +7,7 @@ CRATES=" "
|
||||
LLVM_COMPAT=( {17..18} )
|
||||
RUST_MIN_VER="1.77.1"
|
||||
|
||||
inherit edo llvm-r1 cargo
|
||||
inherit cargo edo llvm-r1
|
||||
|
||||
DESCRIPTION="pkgcraft-based tools for Gentoo"
|
||||
HOMEPAGE="https://pkgcraft.github.io/"
|
||||
|
||||
@@ -7,7 +7,7 @@ CRATES=" "
|
||||
LLVM_COMPAT=( {17..18} )
|
||||
RUST_MIN_VER="1.77.1"
|
||||
|
||||
inherit edo llvm-r1 cargo
|
||||
inherit cargo edo llvm-r1
|
||||
|
||||
DESCRIPTION="pkgcraft-based tools for Gentoo"
|
||||
HOMEPAGE="https://pkgcraft.github.io/"
|
||||
|
||||
@@ -7,7 +7,7 @@ CRATES=" "
|
||||
LLVM_COMPAT=( {17..18} )
|
||||
RUST_MIN_VER="1.77.1"
|
||||
|
||||
inherit edo llvm-r1 cargo
|
||||
inherit cargo edo llvm-r1
|
||||
|
||||
DESCRIPTION="pkgcraft-based tools for Gentoo"
|
||||
HOMEPAGE="https://pkgcraft.github.io/"
|
||||
|
||||
@@ -133,7 +133,7 @@ CRATES="
|
||||
"
|
||||
|
||||
LLVM_COMPAT=( {17..18} )
|
||||
inherit llvm-r1 cargo
|
||||
inherit cargo llvm-r1
|
||||
|
||||
DESCRIPTION="GNU findutils rewritten in Rust"
|
||||
HOMEPAGE="https://uutils.github.io/findutils/ https://github.com/uutils/findutils"
|
||||
|
||||
@@ -149,7 +149,7 @@ declare -A GIT_CRATES=(
|
||||
|
||||
LLVM_COMPAT=( {17..18} )
|
||||
|
||||
inherit llvm-r1 cargo
|
||||
inherit cargo llvm-r1
|
||||
|
||||
DESCRIPTION="A suite of tools for thin provisioning on Linux"
|
||||
HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools"
|
||||
|
||||
@@ -150,7 +150,7 @@ declare -A GIT_CRATES=(
|
||||
|
||||
LLVM_COMPAT=( {17..18} )
|
||||
|
||||
inherit llvm-r1 cargo
|
||||
inherit cargo llvm-r1
|
||||
|
||||
DESCRIPTION="A suite of tools for thin provisioning on Linux"
|
||||
HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools"
|
||||
|
||||
@@ -99,7 +99,7 @@ CRATES="
|
||||
LLVM_COMPAT=( {16..18} )
|
||||
PYTHON_COMPAT=( python3_{10..13} )
|
||||
|
||||
inherit llvm-r1 cargo flag-o-matic python-any-r1 shell-completion toolchain-funcs unpacker
|
||||
inherit cargo flag-o-matic llvm-r1 python-any-r1 shell-completion toolchain-funcs unpacker
|
||||
|
||||
DESCRIPTION="Tools for bcachefs"
|
||||
HOMEPAGE="https://bcachefs.org/"
|
||||
|
||||
@@ -91,7 +91,7 @@ LLVM_COMPAT=( {16..18} )
|
||||
PYTHON_COMPAT=( python3_{10..13} )
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kentoverstreet.asc
|
||||
|
||||
inherit llvm-r1 cargo flag-o-matic python-any-r1 shell-completion toolchain-funcs unpacker verify-sig
|
||||
inherit cargo flag-o-matic llvm-r1 python-any-r1 shell-completion toolchain-funcs unpacker verify-sig
|
||||
|
||||
DESCRIPTION="Tools for bcachefs"
|
||||
HOMEPAGE="https://bcachefs.org/"
|
||||
|
||||
@@ -95,7 +95,7 @@ CRATES="
|
||||
LLVM_COMPAT=( {16..18} )
|
||||
PYTHON_COMPAT=( python3_{10..12} )
|
||||
|
||||
inherit llvm-r1 cargo flag-o-matic multiprocessing python-any-r1 shell-completion toolchain-funcs unpacker
|
||||
inherit cargo flag-o-matic llvm-r1 multiprocessing python-any-r1 shell-completion toolchain-funcs unpacker
|
||||
|
||||
DESCRIPTION="Tools for bcachefs"
|
||||
HOMEPAGE="https://bcachefs.org/"
|
||||
|
||||
@@ -102,7 +102,7 @@ CRATES="
|
||||
LLVM_COMPAT=( {16..18} )
|
||||
PYTHON_COMPAT=( python3_{10..13} )
|
||||
|
||||
inherit llvm-r1 cargo flag-o-matic multiprocessing python-any-r1 shell-completion toolchain-funcs unpacker
|
||||
inherit cargo flag-o-matic llvm-r1 multiprocessing python-any-r1 shell-completion toolchain-funcs unpacker
|
||||
|
||||
DESCRIPTION="Tools for bcachefs"
|
||||
HOMEPAGE="https://bcachefs.org/"
|
||||
|
||||
@@ -296,7 +296,7 @@ CRATES="
|
||||
|
||||
RUST_MIN_VER="1.74.1"
|
||||
|
||||
inherit llvm-r1 cargo linux-info meson rust-toolchain
|
||||
inherit cargo linux-info llvm-r1 meson rust-toolchain
|
||||
|
||||
DESCRIPTION="sched_ext schedulers and tools"
|
||||
HOMEPAGE="https://github.com/sched-ext/scx"
|
||||
|
||||
@@ -294,7 +294,7 @@ CRATES="
|
||||
zstd@0.13.0
|
||||
"
|
||||
|
||||
RUST_USEDEP="rustfmt"
|
||||
RUST_REQ_USE="rustfmt"
|
||||
|
||||
inherit cargo systemd
|
||||
|
||||
|
||||
Reference in New Issue
Block a user