commit: 1cadd9ee290d278983d8eb596b58907cb344de86
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 3 18:13:02 2025 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 3 19:03:26 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cadd9ee
dev-lang/rust: add 1.86.0, SLOT=1.86
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-lang/rust/Manifest | 4 ++--
.../rust/{rust-1.86.0_beta20250323.ebuild => rust-1.86.0.ebuild} | 7 ++++---
eclass/rust.eclass | 4 ++--
profiles/base/package.use.force | 4 ++--
4 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 6ef69d0ca784..ce14b91a2c53 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -28,5 +28,5 @@ DIST rustc-1.85.0-src.tar.xz 274011696 BLAKE2B
9cb1c5b9fa9b0ee8a3150d634b58f4d14
DIST rustc-1.85.0-src.tar.xz.asc 801 BLAKE2B
8168c984f69356898f7a51199f3250a51c58a6512463cd5011acdff8c63754ba196bb050dba95b73d37c7e6d4bbcd3d1cb471d067a6615cd81b8969394e3539a
SHA512
b96fffde7eb3d98cca6abe44e671fd4752416357ab3180d2a09a60fc022ac03d10e64ae285ef6276b8d881d6154fd7398f46666f5a2ea6f3023ea38fd543f59e
DIST rustc-1.85.1-src.tar.xz 274028992 BLAKE2B
1dddbbc0d14fe9551fd2eb59a47521ac7eaf783b8ebf5e89d3e82b38f3f1539c14626a86b6530a47e5a967d47a04db7a3daef568eb5164f42d98b6826346cffe
SHA512
d61afb4f00d0c63eef132e10ca5369202064ecad8ab5bcf4fbd62e9a20b2bd71840b2a769dadcf43452fc0448865975c9de1c129752caa9928d2757027bacf7c
DIST rustc-1.85.1-src.tar.xz.asc 801 BLAKE2B
07409ef6c044b72394a28dfd5b5decb237ca540714010a4f81e4213a3bf7ffb2e14029789f930cea0dab115a6e986859f6cdefd3798be780c2ff21c3e5fa6593
SHA512
7f19653fd05c89390a4073f5184ca162863b7116cc4d8867a5aa4304568880707ebb9f9dda166d7d04f30b2df6ed223eedd98df1744f809773054edfcd2385ff
-DIST rustc-1.86.0_beta20250323-src.tar.xz 275676660 BLAKE2B
f86bc627ae6fc2abca4f274ef6b6b0702fe8c0f5f1b32af4a376992375786737da7f4c3b8f954b762ab04fae65f24afbd4658a286ddda1bacf0d3cf7d59f5168
SHA512
4768b2875f119e87a39596a45f7bbb02a00ea4d4516d080d6822934f8ff52f0af4430384d6a2366ddb2b0ddcaef4afb89438ecda829668522f2212f92d171b02
-DIST rustc-1.86.0_beta20250323-src.tar.xz.asc 801 BLAKE2B
f8a278f2ee4a9a9ab608a326a420523268efd2fbbd77c9517a585bca5c1a48cf6ff7df8a8ba6c529d910fa66b0fa132dd3b602d8c9eaf675ce2bf1a2538096ec
SHA512
20530c6cf689c43f96a8a6896d7eca46e225138708495b84422977e6d1a70ce7a3162c36d072b15b4c26e200576fe0a00cd937fb9a264f03492b64913a6d4985
+DIST rustc-1.86.0-src.tar.xz 275696736 BLAKE2B
9f33a710a3e567d92f56091920643f5ef2ddf2ad52acb5d9ee78496a7b5dbc10da5a51c72cf2a6f66d543a531d3138a49767c98501ae4e885e03988d2ccfbb59
SHA512
9ce195e24a03765f7163de16271e3d19d731d4b80fcc2bfd919106c9d42543eade018f712f6947ea3c6e57c6cb2e6841596aa668d608b8da15101a7da14f3097
+DIST rustc-1.86.0-src.tar.xz.asc 801 BLAKE2B
3e10a3894c7eee68d37bc5707d797548119f830667e27e652a199d13633199713bd01bd0f41a5f2af3c682561903e36abe27b36ef78d9a1d65bdf485527d2c15
SHA512
0b74dab9ee56d0a08e26e9cd40f722e4d99de63ac678f969f0c54d50737074fb28e170db5a36ce2627ec332e5ce3bb8a92167aefbccff7c70e4cb057bc0a94ac
diff --git a/dev-lang/rust/rust-1.86.0_beta20250323.ebuild
b/dev-lang/rust/rust-1.86.0.ebuild
similarity index 99%
rename from dev-lang/rust/rust-1.86.0_beta20250323.ebuild
rename to dev-lang/rust/rust-1.86.0.ebuild
index 320054bf1db1..41f407880eb4 100644
--- a/dev-lang/rust/rust-1.86.0_beta20250323.ebuild
+++ b/dev-lang/rust/rust-1.86.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{10..13} )
RUST_MAX_VER=${PV%%_*}
if [[ ${PV} == *9999* ]]; then
- RUST_MIN_VER="1.86.0" # Update this as new `beta` releases come out.
+ RUST_MIN_VER="1.85.0" # Update this as new `beta` releases come out.
elif [[ ${PV} == *beta* ]]; then
# Enforce that `beta` is built from `stable`.
# While uncommon it is possible for feature changes within `beta` to
result
@@ -68,7 +68,7 @@ for _x in "${_ALL_RUST_EXPERIMENTAL_TARGETS[@]}"; do
done
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
+SLOT="$(ver_cut 1-2)"
IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind lto
rustfmt rust-analyzer rust-src +system-llvm test wasm ${ALL_LLVM_TARGETS[*]}"
@@ -719,7 +719,7 @@ src_install() {
# we need realpath on /usr/bin/* symlink return
version-appended binary path.
# so /usr/bin/rustc should point to
/usr/lib/rust/<ver>/bin/rustc-<ver>
# need to fix eselect-rust to remove this hack.
- local ver_i="${i}-${PV%%_*}"
+ local ver_i="${i}-${SLOT}"
if [[ -f "${ED}/usr/lib/${PN}/${SLOT}/bin/${i}" ]]; then
einfo "Installing ${i} symlink"
ln -v "${ED}/usr/lib/${PN}/${SLOT}/bin/${i}"
"${ED}/usr/lib/${PN}/${SLOT}/bin/${ver_i}" || die
@@ -728,6 +728,7 @@ src_install() {
ewarn "please report this"
fi
dosym "../lib/${PN}/${SLOT}/bin/${ver_i}" "/usr/bin/${ver_i}"
+ dosym "../lib/${PN}/${SLOT}/bin/${ver_i}"
"/usr/bin/${i}-${PV%%_*}"
done
# symlinks to switch components to active rust in eselect
diff --git a/eclass/rust.eclass b/eclass/rust.eclass
index a9ccfed4cf8f..ae590284db33 100644
--- a/eclass/rust.eclass
+++ b/eclass/rust.eclass
@@ -68,7 +68,7 @@ fi
# Definitive list of Rust slots and the associated LLVM slot, newest first.
declare -A -g -r _RUST_LLVM_MAP=(
["9999"]=20
- ["1.86.0"]=19
+ ["1.86"]=19
["1.85.1"]=19
["1.85.0"]=19
["1.84.1"]=19
@@ -94,7 +94,7 @@ declare -A -g -r _RUST_LLVM_MAP=(
# this array is used to store the Rust slots in a more convenient order for
iteration.
declare -a -g -r _RUST_SLOTS_ORDERED=(
"9999"
- "1.86.0"
+ "1.86"
"1.85.1"
"1.85.0"
"1.84.1"
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 1b5b62934d84..e5f1d455a653 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -35,8 +35,8 @@ llvm-runtimes/libcxxabi clang
# 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.86.0 llvm_slot_19
-dev-lang/rust-bin:1.86.0 llvm_slot_19
+dev-lang/rust:1.86 llvm_slot_19
+dev-lang/rust-bin:1.86 llvm_slot_19
dev-lang/rust:1.85.1 llvm_slot_19
dev-lang/rust-bin:1.85.1 llvm_slot_19
dev-lang/rust:1.85.0 llvm_slot_19
