commit: 523218846a08d145e550821498bb36dfcbb190a5
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 11 21:33:05 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 11 21:51:59 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52321884
dev-lang/rust: style tweaks
Style tweaks I've been meaning to make. Mostly to avoid long lines and fix
some inconsistencies.
I'm making some more changes in a moment wrt patchset handling and want
this separate.
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/rust/rust-1.92.0_p1.ebuild | 40 ++++++++++++++++++++++++-------------
dev-lang/rust/rust-9999.ebuild | 40 ++++++++++++++++++++++++-------------
2 files changed, 52 insertions(+), 28 deletions(-)
diff --git a/dev-lang/rust/rust-1.92.0_p1.ebuild
b/dev-lang/rust/rust-1.92.0_p1.ebuild
index c24ef5c17c5f..5442203bcf3a 100644
--- a/dev-lang/rust/rust-1.92.0_p1.ebuild
+++ b/dev-lang/rust/rust-1.92.0_p1.ebuild
@@ -13,7 +13,8 @@ RUST_MAX_VER=${PV%%_*}
RUST_PV=${PV%%_p*}
if [[ ${PV} == *9999* ]]; then
- RUST_MIN_VER="1.88.0" # Update this as new `beta` releases come out.
+ # Update this as new `beta` releases come out.
+ RUST_MIN_VER="1.88.0"
elif [[ ${PV} == *beta* ]]; then
RUST_MAX_VER="$(ver_cut 1).$(ver_cut 2).0"
RUST_MIN_VER="$(ver_cut 1).$(($(ver_cut 2) - 1)).0"
@@ -21,8 +22,9 @@ else
RUST_MIN_VER="$(ver_cut 1).$(($(ver_cut 2) - 1)).0"
fi
-inherit check-reqs estack flag-o-matic llvm-r1 multiprocessing optfeature \
- multilib multilib-build python-any-r1 rust rust-toolchain
toolchain-funcs verify-sig
+inherit check-reqs estack flag-o-matic llvm-r1 multiprocessing optfeature
+inherit multilib multilib-build python-any-r1 rust rust-toolchain
toolchain-funcs
+inherit verify-sig
if [[ ${PV} = *9999* ]]; then
inherit git-r3
@@ -32,19 +34,24 @@ elif [[ ${PV} == *beta* ]]; then
betaver=${PV//*beta}
BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
MY_P="rustc-beta"
-
SRC_URI="https://static.rust-lang.org/dist/${BETA_SNAPSHOT}/rustc-beta-src.tar.xz
-> rustc-${RUST_PV}-src.tar.xz
+ SRC_URI="
+
https://static.rust-lang.org/dist/${BETA_SNAPSHOT}/rustc-beta-src.tar.xz ->
rustc-${RUST_PV}-src.tar.xz
https://gitweb.gentoo.org/proj/rust-patches.git/snapshot/rust-patches-${PV}.tar.bz2
- verify-sig? (
https://static.rust-lang.org/dist/${BETA_SNAPSHOT}/rustc-beta-src.tar.xz.asc
- -> rustc-${RUST_PV}-src.tar.xz.asc )
+ verify-sig? (
+
https://static.rust-lang.org/dist/${BETA_SNAPSHOT}/rustc-beta-src.tar.xz.asc
+ -> rustc-${RUST_PV}-src.tar.xz.asc
+ )
"
S="${WORKDIR}/${MY_P}-src"
else
MY_P="rustc-${RUST_PV}"
- SRC_URI="https://static.rust-lang.org/dist/${MY_P}-src.tar.xz
+ SRC_URI="
+ https://static.rust-lang.org/dist/${MY_P}-src.tar.xz
https://gitweb.gentoo.org/proj/rust-patches.git/snapshot/rust-patches-${PV}.tar.bz2
verify-sig? (
https://static.rust-lang.org/dist/${MY_P}-src.tar.xz.asc )
"
S="${WORKDIR}/${MY_P}-src"
+
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc
~x86"
fi
@@ -52,9 +59,9 @@ DESCRIPTION="Systems programming language originally
developed by Mozilla"
HOMEPAGE="https://www.rust-lang.org/";
# keep in sync with llvm ebuild of the same version as bundled one.
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARC ARM AVR BPF CSKY DirectX Hexagon Lanai
- LoongArch M68k Mips MSP430 NVPTX PowerPC RISCV Sparc SPIRV SystemZ VE
- WebAssembly X86 XCore Xtensa )
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARC ARM AVR BPF CSKY DirectX Hexagon Lanai )
+ALL_LLVM_TARGETS+=( LoongArch M68k Mips MSP430 NVPTX PowerPC RISCV Sparc SPIRV
)
+ALL_LLVM_TARGETS+=( SystemZ VE WebAssembly X86 XCore Xtensa )
ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
@@ -73,7 +80,9 @@ ALL_RUST_SYSROOTS=(
"${ALL_RUST_SYSROOTS[@]/#/rust_sysroots_}" )
LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
SLOT="${PV%%_*}" # Beta releases get to share the same SLOT as the eventual
stable
-IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind lto
rustfmt rust-analyzer rust-src +system-llvm test ${ALL_LLVM_TARGETS[*]}
${ALL_RUST_SYSROOTS[*]}"
+IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind lto"
+IUSE+=" rustfmt rust-analyzer rust-src +system-llvm test"
+IUSE+=" ${ALL_LLVM_TARGETS[*]} ${ALL_RUST_SYSROOTS[*]}"
if [[ ${PV} = *9999* ]]; then
# These USE flags require nightly rust
@@ -92,7 +101,8 @@ LLVM_DEPEND+=( " rust_sysroots_wasm? ( $(llvm_gen_dep
'llvm-core/lld:${LLVM_SLOT
LLVM_DEPEND+=( " $(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')" )
# dev-libs/oniguruma is used for documentation
-BDEPEND="${PYTHON_DEPS}
+BDEPEND="
+ ${PYTHON_DEPS}
app-eselect/eselect-rust
dev-libs/oniguruma
|| (
@@ -129,7 +139,8 @@ DEPEND="
)
"
-RDEPEND="${DEPEND}
+RDEPEND="
+ ${DEPEND}
app-eselect/eselect-rust
dev-lang/rust-common
sys-apps/lsb-release
@@ -137,7 +148,8 @@ RDEPEND="${DEPEND}
!dev-lang/rust-bin:stable
"
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )
+REQUIRED_USE="
+ || ( ${ALL_LLVM_TARGETS[*]} )
rust-analyzer? ( rust-src )
test? ( ${ALL_LLVM_TARGETS[*]} )
rust_sysroots_bpf? ( llvm_targets_BPF )
diff --git a/dev-lang/rust/rust-9999.ebuild b/dev-lang/rust/rust-9999.ebuild
index f7b0ecdb57a7..085cdd16a0fd 100644
--- a/dev-lang/rust/rust-9999.ebuild
+++ b/dev-lang/rust/rust-9999.ebuild
@@ -13,7 +13,8 @@ RUST_MAX_VER=${PV%%_*}
RUST_PV=${PV%%_p*}
if [[ ${PV} == *9999* ]]; then
- RUST_MIN_VER="1.91.0" # Update this as new `beta` releases come out.
+ # Update this as new `beta` releases come out.
+ RUST_MIN_VER="1.91.0"
elif [[ ${PV} == *beta* ]]; then
RUST_MAX_VER="$(ver_cut 1).$(ver_cut 2).0"
RUST_MIN_VER="$(ver_cut 1).$(($(ver_cut 2) - 1)).0"
@@ -21,8 +22,9 @@ else
RUST_MIN_VER="$(ver_cut 1).$(($(ver_cut 2) - 1)).0"
fi
-inherit check-reqs estack flag-o-matic llvm-r1 multiprocessing optfeature \
- multilib multilib-build python-any-r1 rust rust-toolchain
toolchain-funcs verify-sig
+inherit check-reqs estack flag-o-matic llvm-r1 multiprocessing optfeature
+inherit multilib multilib-build python-any-r1 rust rust-toolchain
toolchain-funcs
+inherit verify-sig
if [[ ${PV} = *9999* ]]; then
inherit git-r3
@@ -32,19 +34,24 @@ elif [[ ${PV} == *beta* ]]; then
betaver=${PV//*beta}
BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
MY_P="rustc-beta"
-
SRC_URI="https://static.rust-lang.org/dist/${BETA_SNAPSHOT}/rustc-beta-src.tar.xz
-> rustc-${RUST_PV}-src.tar.xz
+ SRC_URI="
+
https://static.rust-lang.org/dist/${BETA_SNAPSHOT}/rustc-beta-src.tar.xz ->
rustc-${RUST_PV}-src.tar.xz
https://gitweb.gentoo.org/proj/rust-patches.git/snapshot/rust-patches-${PV}.tar.bz2
- verify-sig? (
https://static.rust-lang.org/dist/${BETA_SNAPSHOT}/rustc-beta-src.tar.xz.asc
- -> rustc-${RUST_PV}-src.tar.xz.asc )
+ verify-sig? (
+
https://static.rust-lang.org/dist/${BETA_SNAPSHOT}/rustc-beta-src.tar.xz.asc
+ -> rustc-${RUST_PV}-src.tar.xz.asc
+ )
"
S="${WORKDIR}/${MY_P}-src"
else
MY_P="rustc-${RUST_PV}"
- SRC_URI="https://static.rust-lang.org/dist/${MY_P}-src.tar.xz
+ SRC_URI="
+ https://static.rust-lang.org/dist/${MY_P}-src.tar.xz
https://gitweb.gentoo.org/proj/rust-patches.git/snapshot/rust-patches-${PV}.tar.bz2
verify-sig? (
https://static.rust-lang.org/dist/${MY_P}-src.tar.xz.asc )
"
S="${WORKDIR}/${MY_P}-src"
+
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc
~x86"
fi
@@ -52,9 +59,9 @@ DESCRIPTION="Systems programming language originally
developed by Mozilla"
HOMEPAGE="https://www.rust-lang.org/";
# keep in sync with llvm ebuild of the same version as bundled one.
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARC ARM AVR BPF CSKY DirectX Hexagon Lanai
- LoongArch M68k Mips MSP430 NVPTX PowerPC RISCV Sparc SPIRV SystemZ VE
- WebAssembly X86 XCore Xtensa )
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARC ARM AVR BPF CSKY DirectX Hexagon Lanai )
+ALL_LLVM_TARGETS+=( LoongArch M68k Mips MSP430 NVPTX PowerPC RISCV Sparc SPIRV
)
+ALL_LLVM_TARGETS+=( SystemZ VE WebAssembly X86 XCore Xtensa )
ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
@@ -73,7 +80,9 @@ ALL_RUST_SYSROOTS=(
"${ALL_RUST_SYSROOTS[@]/#/rust_sysroots_}" )
LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
SLOT="${PV%%_*}" # Beta releases get to share the same SLOT as the eventual
stable
-IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind lto
rustfmt rust-analyzer rust-src +system-llvm test ${ALL_LLVM_TARGETS[*]}
${ALL_RUST_SYSROOTS[*]}"
+IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind lto"
+IUSE+=" rustfmt rust-analyzer rust-src +system-llvm test"
+IUSE+=" ${ALL_LLVM_TARGETS[*]} ${ALL_RUST_SYSROOTS[*]}"
if [[ ${PV} = *9999* ]]; then
# These USE flags require nightly rust
@@ -92,7 +101,8 @@ LLVM_DEPEND+=( " rust_sysroots_wasm? ( $(llvm_gen_dep
'llvm-core/lld:${LLVM_SLOT
LLVM_DEPEND+=( " $(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')" )
# dev-libs/oniguruma is used for documentation
-BDEPEND="${PYTHON_DEPS}
+BDEPEND="
+ ${PYTHON_DEPS}
app-eselect/eselect-rust
dev-libs/oniguruma
|| (
@@ -129,7 +139,8 @@ DEPEND="
)
"
-RDEPEND="${DEPEND}
+RDEPEND="
+ ${DEPEND}
app-eselect/eselect-rust
dev-lang/rust-common
sys-apps/lsb-release
@@ -137,7 +148,8 @@ RDEPEND="${DEPEND}
!dev-lang/rust-bin:stable
"
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )
+REQUIRED_USE="
+ || ( ${ALL_LLVM_TARGETS[*]} )
rust-analyzer? ( rust-src )
test? ( ${ALL_LLVM_TARGETS[*]} )
rust_sysroots_bpf? ( llvm_targets_BPF )
