gentoo auto-resync : 21:03:2025 - 00:31:16

author: V3n3RiX <venerix@koprulu.sector> 2025-03-21 00:31:17 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2025-03-21 00:31:17 +0000
commit: ae832415103492f73a8351ed7a91cb596392d779 (patch)
tree: 50b8927d2d57e707e7e3402895a997ebbc349dda /dev-lang
parent: 77684468238b8755c1aa3e72f3055f4e62fcf14c (diff)
45 files changed, 1114 insertions, 633 deletions
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index fe703a80da5f..f2cea1e174fa 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/haxe/Manifest b/dev-lang/haxe/Manifest
index 676c0a8c6348..a88aacb218ca 100644
--- a/dev-lang/haxe/Manifest
+++ b/dev-lang/haxe/Manifest
@@ -1,3 +1,3 @@
 DIST haxe-4.3.6.tar.gz 8409453 BLAKE2B 5240d9dc215b9636927d2461c6250acc566c7e314850a2804af8a3d4ae8ca6f7ea2c53da5b5852b3714da102c07e58fdfcc36a3104f5fca0612b55cfcfd3e4be SHA512 df8c93542102b359946507ab3b5d33b69556c57a491b0196d2ab51733fcfc03482867550a6f11543aee0c50ce685dfc89220f5d828b982219defcfec3508447c
-EBUILD haxe-4.3.6-r3.ebuild 1360 BLAKE2B 94a4ce7a0d1c2e076cd0ce37c899465a0d7d795af5ccbba93138f9364b1a11c3d5a59b3e600cbf322a83216205fc3f42bb15abed37d6434a66b3c94ebad41e6b SHA512 5faf8e91b688d04223b135c85ba6a4b97acd02180960a96a24a60965c99f3a432fe048345ab242d7b84a74589c76a8ea8702127e7e9f15054c4e13c243fcdb7d
+EBUILD haxe-4.3.6-r4.ebuild 1361 BLAKE2B cf5256f955b82c9d5545426d50f9dd0e09940c1b0124fddc79becb6b6dc5097804549645449cbd2ca65a58041ffd80263b81e861fe07a6aba6b40dc23799eefc SHA512 b5f68608efa23d0cdc1ab8a7fc5f1e377cf639d7fa0bb2115d36d3fb504f64c44cd8cf20df34489610000f22c06f15f17c49da5d7c75e0424d94405349edf2c9
 MISC metadata.xml 733 BLAKE2B 293f296fd51f93d0834ba3f9ad2815161313f2ee7fcc5ebb68f20090e76fd67b4845114c4c78959cd13d64146e9221d001e0be76b65323d1d5b3cf934085a1ec SHA512 6dd648666a0916f27edc70e637e426e03790d4fd50a43fd2696b62c69cdf0f8b1c831fd8dca03db844209a0a23952c5dc1bc1b929b42928f6608288f470f8399
diff --git a/dev-lang/haxe/haxe-4.3.6-r3.ebuild b/dev-lang/haxe/haxe-4.3.6-r4.ebuild
index 1d1e7e47a43d..98b14d86c840 100644
--- a/dev-lang/haxe/haxe-4.3.6-r3.ebuild
+++ b/dev-lang/haxe/haxe-4.3.6-r4.ebuild
@@ -28,7 +28,7 @@ RESTRICT="strip"
 RDEPEND="
 	=dev-ml/extlib-1.7.9*:=
 	>=dev-lang/ocaml-4:=[ocamlopt?]
-	~dev-ml/luv-0.5.12:=
+	>=dev-ml/luv-0.5.13:=
 
 	dev-ml/ocaml-sha:=
 	dev-ml/ptmap:=
diff --git a/dev-lang/mrustc/Manifest b/dev-lang/mrustc/Manifest
index ad23f3bee8a3..a6de5b20f02a 100644
--- a/dev-lang/mrustc/Manifest
+++ b/dev-lang/mrustc/Manifest
@@ -3,8 +3,11 @@ AUX mrustc-0.11.0-RUSTC_SRC_PROVIDED.patch 12164 BLAKE2B 213e8eceefaab33d99fdcf6
 AUX mrustc-0.11.0-default-to-rust-1_74.patch 419 BLAKE2B c727c94edef6cca8b719f1c1246a24834cc1b3bf44015094ddfc24f2174075a437ceb14b70612ab04d9db4c0e009f43e2fd458702e89752f4ae8e6578c992430 SHA512 9dfa01ae8958f9c07b8830639dfd43b2cd3efb51097dd010d4241d0e0c0a56d8405ff1a362e8ab61364cb0c9372221c741392f96ce3dc37427a6a5091a9eaa3b
 AUX mrustc-0.11.2-dont-strip-bins.patch 818 BLAKE2B 0da4dc48da58b9e3cb58594c4fb0392d8c3cc04a2b0f38bd28fc8a9468bffd888774f183ddadfe8290039363d1a1247171768d711af555444bcbf62e01356b26 SHA512 1024e384a8ef231017fe1b2407e1bf38b5af009a77b9bd04ec7d449922d45b6eecef1678b70931fe350b7ed95020429e959ef11971b9ccb99eaf1d72dd766ad7
 AUX mrustc-0.11.2-gcc15.patch 577 BLAKE2B b65dfa58abe5fe660f2c895425d311c8cd2951d40fbd2ee013f0022859a710c69a24a2e612dc994fae0e6e189e337205455ca89bd84722517e2d7feffb94e660 SHA512 cf08e0a12f96724e42f578c485701507bcabc5eb0d10f78c0bceeda46f40fc93d6b12ac56622c4147e959ca002ec2e1f30e7060355a5d3e4f6a2b430aae6a370
+AUX mrustc-0.11.2-no-glibcxx-assertions-workaround-more.patch 2553 BLAKE2B e6b7159490c8ef113eee7006416a435416cca29dba2e8b7b3290ffd94a753af4e7a3e635345669f1d3c3ecc565bb4c3daaa7464db2698285d320b9c8bcc8bc0a SHA512 eebfd30d462df055258b4c0a31b7a484a490a2cb1eabae45791dcfec79c9873d7634693d36c6afb7f5ad5ab34fbe3eb94107724e9a8092cf16310232758104f9
+AUX mrustc-0.11.2-no-glibcxx-assertions-workaround.patch 565 BLAKE2B d4c5aadb8ea46252c9aea3605bcdb18c45cca6009ff3f60a1d4a87ce9a379c04854dca50896d2961cad6f8ba2128619e4136b76273c86d3a9a1d22853e2fd797 SHA512 f7046792b8d590cb08e2ff812ad33c8b6224f08b7dbffd2d50e8f0b7c872ed75e6f1d12e10f9b020db20083f389ab7e7661cda0ce798dbe58c17cac41a9968a5
 DIST mrustc-0.11.2.tar.gz 1364024 BLAKE2B e68178d952b3afef526f99dda24def646ebefbf661200e7b57a7ea054c511075a1455e6456f3fbb0e4c1042660f716f92bcee990054dbe7c1ebc4185ce0e3899 SHA512 9a39249c38eee109c4f60af051df89aa5ab1e3408761d67d3ee8ae05cded03b9e4fd36b554a470e35c77d214bf02d39f172ab04fdcb8b03fac068d8af268ebf5
 DIST rustc-1.74.1-src.tar.xz 155968724 BLAKE2B e05f2379ac94b286f85791a138e1928e5b5b5a7749f0981d82c40c2a12860f55bf96bb2f0e924e35a0f8b2447b13052d38adea909aaa3199105787bb5a4861b3 SHA512 14c7e7ed2f38ab60299d8c7d41d78f042b6b57ef822d577b5138e60bdde31cf141eccd4332a25bc5da3d58eb5313d63c1448b5dfe9e11b8055bb8ea133a9038d
+EBUILD mrustc-0.11.2-r1.ebuild 3549 BLAKE2B b8a4a42761de7ea6038a39b5d332de5fca647c77c05c0f48bbecc85af8a8e605ddd1c55e21b97b1e71fb23bfe7316aeb952163fdde0ca9afc86e22fdb4947f91 SHA512 6768bddc1f36677938fbad8ebc55a75c340b582fdf4db9c3bfaeae508d2c41b6cb3c04d6e6d19a3871b11b77935dd359a0c8070464e67e591dbe410b89161972
 EBUILD mrustc-0.11.2.ebuild 3410 BLAKE2B 673b73aef3d9b51e7db11c51acb9ef14c1fc5c913f13352f1607d77f4499d3bc956e8dee9b377f7bf66390eca71153a558e9274343aac0a0a915d3566cfd2353 SHA512 0702489c7065e229aae6fc9e8b7a351519d3d7f60334c3ec6ebef6e3c1c0f25603b373094fc0d0a2e69f92db30d3a9c232901411e600ff04aa9b4e8395a2d4d1
-EBUILD mrustc-9999.ebuild 3274 BLAKE2B 5de926a9c79d70550daf554b94245e5aa4cedc5f747941fc1f52dfee8166ff247a55c510010909ce81c7cdad3cb7e7cf5975b03cbf39107fec3011ce2da16fc6 SHA512 ce9fd58a0f9a3e40927fdcc048cc9afc131de6ec06f783b2a6381914e30a3a7e6b0662e8105d6facc9a54e2e4c75c9d0c4891c896de4f04cbb9bf11740a67c3c
+EBUILD mrustc-9999.ebuild 3413 BLAKE2B de31ab94d6ccbd391272f1d3524a7770d1d94f45e879c94b2e60b334dd3b7d0bca3f333cb4305cfea99e1e730ed3e84cb4affb7766f2f5ce65d69c8305fcb110 SHA512 417403a2dd8dad2ebae10e450d0a43a93c56e560c087a81fb9f92cc347aecb97818fc851efc39ce499ff27ff7a354b21999f1cc666efb9531a1ed8ce37cf2bf2
 MISC metadata.xml 638 BLAKE2B a9895b9698a5e9a16593bbf79029144b3f9ab6d36ec06b6cbbb2212abfd63ae20e3c701e58f3b7a7354a151ebc72ff6d6317083baddc595dee57724d8232b4ea SHA512 0e8b903b76c07eb9aab81bc83370c64fb65d58b10a539a7b049383029f7bf8f3ec4557cb2177b4f3351d465c51f09744903fc55de94f7c32b05c5349e67a0625
diff --git a/dev-lang/mrustc/files/mrustc-0.11.2-no-glibcxx-assertions-workaround-more.patch b/dev-lang/mrustc/files/mrustc-0.11.2-no-glibcxx-assertions-workaround-more.patch
new file mode 100644
index 000000000000..a9207f79472a
--- /dev/null
+++ b/dev-lang/mrustc/files/mrustc-0.11.2-no-glibcxx-assertions-workaround-more.patch
@@ -0,0 +1,79 @@
+Pass -U_GLIBCXX_ASSERTIONS when building mrustc as a workaround (not yet
+reported, sorry).
+--- a/Makefile
++++ b/Makefile
+@@ -47,7 +47,7 @@ CXXFLAGS := -g -Wall
+ CXXFLAGS += -std=c++14
+ #CXXFLAGS += -Wextra
+ CXXFLAGS += -O2
+-CXXFLAGS += $(CXXFLAGS_EXTRA)
++CXXFLAGS += $(CXXFLAGS_EXTRA) -U_GLIBCXX_ASSERTIONS
+ 
+ CPPFLAGS := -I src/include/ -I src/
+ CPPFLAGS += -I tools/common/
+--- a/tools/common/Makefile
++++ b/tools/common/Makefile
+@@ -12,7 +12,7 @@ OBJS += jobserver.o
+ 
+ CXXFLAGS := -Wall -std=c++14 -g -O2
+ 
+-CXXFLAGS += $(CXXFLAGS_EXTRA)
++CXXFLAGS += $(CXXFLAGS_EXTRA) -U_GLIBCXX_ASSERTIONS
+ 
+ OBJS := $(OBJS:%=$(OBJDIR)%)
+ 
+--- a/tools/dump_hirfile/Makefile
++++ b/tools/dump_hirfile/Makefile
+@@ -16,7 +16,7 @@ OBJS := main.o
+ 
+ LINKFLAGS := -g -lpthread -lz
+ CXXFLAGS := -Wall -std=c++14 -g -O2
+-CXXFLAGS += -I ../common -I ../../src -I ../../src/include
++CXXFLAGS += -I ../common -I ../../src -I ../../src/include -U_GLIBCXX_ASSERTIONS
+ 
+ CXXFLAGS += $(CXXFLAGS_EXTRA)
+ LINKFLAGS += $(LINKFLAGS_EXTRA)
+--- a/tools/minicargo/Makefile
++++ b/tools/minicargo/Makefile
+@@ -23,7 +23,7 @@ OBJS += file_timestamp.o os.o
+ 
+ LINKFLAGS := -g -lpthread
+ CXXFLAGS := -Wall -std=c++14 -g -O2
+-CXXFLAGS += -I ../common
++CXXFLAGS += -I ../common -U_GLIBCXX_ASSERTIONS
+ 
+ CXXFLAGS += $(CXXFLAGS_EXTRA)
+ LINKFLAGS += $(LINKFLAGS_EXTRA)
+--- a/tools/mir_opt_test/Makefile
++++ b/tools/mir_opt_test/Makefile
+@@ -16,7 +16,7 @@ LIBS := ../../bin/mrustc.a ../../bin/common_lib.a
+ 
+ LINKFLAGS := -g -lpthread -lz
+ CXXFLAGS := -Wall -std=c++14 -g -O2
+-CXXFLAGS += -I ../common -I ../../src/include -I ../../src -I .
++CXXFLAGS += -I ../common -I ../../src/include -I ../../src -I . -U_GLIBCXX_ASSERTIONS
+ CXXFLAGS += -Wno-misleading-indentation	# Gets REALLY confused by the TU_ARM macro
+ 
+ CXXFLAGS += $(CXXFLAGS_EXTRA)
+--- a/tools/standalone_miri/Makefile
++++ b/tools/standalone_miri/Makefile
+@@ -16,7 +16,7 @@ OBJS += miri.o miri_extern.o miri_intrinsic.o
+ 
+ LINKFLAGS := -g -lpthread
+ CXXFLAGS := -Wall -std=c++14 -g -O2
+-CXXFLAGS += -I ../common -I ../../src/include -I .
++CXXFLAGS += -I ../common -I ../../src/include -I . -U_GLIBCXX_ASSERTIONS
+ CXXFLAGS += -Wno-misleading-indentation	# Gets REALLY confused by the TU_ARM macro
+ 
+ CXXFLAGS += $(CXXFLAGS_EXTRA)
+--- a/tools/testrunner/Makefile
++++ b/tools/testrunner/Makefile
+@@ -8,7 +8,7 @@ OBJS := main.o path.o
+ LINKFLAGS := -g
+ CXXFLAGS := -Wall -std=c++14 -g -O2
+ 
+-CXXFLAGS += $(CXXFLAGS_EXTRA)
++CXXFLAGS += $(CXXFLAGS_EXTRA) -U_GLIBCXX_ASSERTIONS
+ LINKFLAGS += $(LINKFLAGS_EXTRA)
+ 
+ OBJS := $(OBJS:%=$(OBJDIR)%)
diff --git a/dev-lang/mrustc/files/mrustc-0.11.2-no-glibcxx-assertions-workaround.patch b/dev-lang/mrustc/files/mrustc-0.11.2-no-glibcxx-assertions-workaround.patch
new file mode 100644
index 000000000000..516bca4ac13c
--- /dev/null
+++ b/dev-lang/mrustc/files/mrustc-0.11.2-no-glibcxx-assertions-workaround.patch
@@ -0,0 +1,12 @@
+We need this otherwise the built code will assert when building dev-lang/rust
+later. Not yet reported upstream.
+--- a/src/trans/codegen_c.cpp
++++ b/src/trans/codegen_c.cpp
+@@ -1274,6 +1274,7 @@ namespace {
+                 {
+                     args.push_back( a.c_str() );
+                 }
++                args.push_back("-U_GLIBCXX_ASSERTIONS"); // TODO
+                 args.push_back("-Wno-psabi");   // Suppress "note: the ABI for passing parameters with 128-byte alignment has changed in GCC 4.6"
+                 switch(opt.opt_level)
+                 {
diff --git a/dev-lang/mrustc/mrustc-0.11.2-r1.ebuild b/dev-lang/mrustc/mrustc-0.11.2-r1.ebuild
new file mode 100644
index 000000000000..12add5b79790
--- /dev/null
+++ b/dev-lang/mrustc/mrustc-0.11.2-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo multiprocessing rust-toolchain toolchain-funcs
+
+# The makefile needs to know the version of rust to build
+RUST_VERSION=1.74.1
+# We need to pretend to be this version of Rust for mrustc build and outputs
+MRUSTC_RUST_VER=1.74.0
+
+DESCRIPTION="Mutabah's Rust Compiler"
+HOMEPAGE="https://github.com/thepowersgang/mrustc"
+
+if [[ ${PV} == *"9999"* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/thepowersgang/mrustc.git"
+else
+	SRC_URI="https://github.com/thepowersgang/mrustc/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+		https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz
+	"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+DEPEND="sys-libs/zlib"
+# mrustc transpiles Rust to C, and currently the C code it generates doesn't currently work with clang
+RDEPEND="
+	${DEPEND}
+	sys-devel/gcc:*
+"
+BDEPEND="sys-devel/gcc:*"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.11.2-gcc15.patch"
+	"${FILESDIR}/${PN}-0.11.2-dont-strip-bins.patch"
+	"${FILESDIR}/${PN}-0.11.0-default-to-rust-1_74.patch"
+	"${FILESDIR}/${PN}-0.11.0-RUSTC_SRC_PROVIDED.patch"
+	"${FILESDIR}/${PN}-0.10.1-git-be-gone.patch"
+	"${FILESDIR}/${PN}-0.11.2-no-glibcxx-assertions-workaround.patch"
+	"${FILESDIR}/${PN}-0.11.2-no-glibcxx-assertions-workaround-more.patch"
+)
+
+QA_FLAGS_IGNORED="
+	usr/lib/rust/${P}/bin/mrustc
+	usr/lib/rust/${P}/bin/minicargo
+	usr/lib/rust/${P}/lib/rustlib/$(rust_abi)/lib/*.rlib
+"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] && ! tc-is-gcc; then
+		die "mrustc needs to be built using GCC."
+	fi
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	export PARLEVEL=$(makeopts_jobs)
+	export RUSTC_VERSION=${MRUSTC_RUST_VER} # Pretend that we're using upstream-supported Rust
+	export MRUSTC_TARGET_VER=${RUSTC_VERSION%.*}
+	export RUSTCSRC="${WORKDIR}/rustc-${RUST_VERSION}-src"
+	export RUSTC_SRC_PROVIDED=1
+	export V='' # echo build commands in makefiles (minicargo still writes commands to file)
+	# build mrustc & minicargo then use them to build the standard library
+	# emake -f minicargo.mk will do everything including a full bootstrap
+	emake all
+	emake -C tools/minicargo/
+	# It's not much, but it's enough to do a 'hello world' at least... and build dev-lang/rust!
+	emake -e -f minicargo.mk LIBS
+}
+
+src_test() {
+	# The main makefile test targets just do this, cut out the middleman
+	emake -e -f minicargo.mk local_tests
+	# build and run 'hello world' (this is called using 'test' in the makefile, but we can do it manually)
+	edo "${S}"/bin/mrustc -L "${S}"/output-${MRUSTC_RUST_VER}/ \
+		-g "${S}/../rustc-${RUST_VERSION}-src/tests/ui/hello_world/main.rs" -o "${T}"/hello
+	"${T}"/hello || die "Failed to run hello_world built with mrustc"
+}
+
+src_install() {
+	# If we're installing into /usr/lib/rust we may as well be consistent
+	into /usr/lib/rust/${P}
+	dobin bin/mrustc
+	dobin bin/minicargo
+	local lib patch
+	local libs=( "${S}"/output-*/*.rlib* )
+	insinto  "/usr/lib/rust/${P}/lib/rustlib/$(rust_abi)/lib"
+	# If we ever want to support mrustc stdlib for multiple rusts we'll need to
+	# do something more clever here.
+	for lib in "${libs[@]}"; do
+		# We only want .rlib{,.hir,o}
+		if [[ ${lib} != *.c && ${lib} != *.d && ${lib} != *.txt ]]; then
+			doins "${lib}"
+		fi
+	done
+	# For convenience, install files required to build various rusts
+	insinto /usr/share/${P}
+	doins -r "${S}/script-overrides/"
+	insinto /usr/share/${P}/patches
+	for patch in "${S}"/rustc-*.patch "${S}"/rustc-*-overrides.toml; do
+		doins "${patch}"
+	done
+}
diff --git a/dev-lang/mrustc/mrustc-9999.ebuild b/dev-lang/mrustc/mrustc-9999.ebuild
index 2d39a52cbcb6..8a3d460ca787 100644
--- a/dev-lang/mrustc/mrustc-9999.ebuild
+++ b/dev-lang/mrustc/mrustc-9999.ebuild
@@ -37,6 +37,8 @@ BDEPEND="sys-devel/gcc:*"
 PATCHES=(
 	"${FILESDIR}/${PN}-0.11.0-default-to-rust-1_74.patch"
 	"${FILESDIR}/${PN}-0.11.0-RUSTC_SRC_PROVIDED.patch"
+	"${FILESDIR}/${PN}-0.11.2-no-glibcxx-assertions-workaround.patch"
+	"${FILESDIR}/${PN}-0.11.2-no-glibcxx-assertions-workaround-more.patch"
 )
 
 QA_FLAGS_IGNORED="
diff --git a/dev-lang/pypy/Manifest b/dev-lang/pypy/Manifest
index 3285d1c23480..58324939511b 100644
--- a/dev-lang/pypy/Manifest
+++ b/dev-lang/pypy/Manifest
@@ -6,5 +6,5 @@ DIST pypy3.11-gentoo-patches-7.3.19_p4.tar.xz 7008 BLAKE2B b441decac64d3565cf1d8
 DIST pypy3.11-v7.3.19-src.tar.bz2 24916380 BLAKE2B febc61b3a1c5055b5ab92e7f3af2c307605c8510131437b12df27b58a13b29f6fd0a4bf82d101f7f8f441ca93b20cf70dbd540af11578be297ea871d59304ea3 SHA512 ab078e81e5eefe16823350bdc9adcc444e0ef6835ff2234197f9e5cb0903c5208deb6df60722e99aa529ffff703c5dcbc08eaa7f753c2e5c1185afea6358395a
 EBUILD pypy-2.7.7.3.19.ebuild 7390 BLAKE2B 0a2de7fe0cf184c8509edad7866a0642e154582b968987324c6a7deab7b8cc91a61283384b03554b55bbf5142fdfd4c2c32d734c67836f4079e8d23685845fe7 SHA512 a8e9978a6b27e54cf912083c10a6d3652d6e9b012e047434ae24a89a2cf0308df24e7f8b92e4008c1891c274d206201d68f915469a3f8b1ea786e054485e1d73
 EBUILD pypy-3.10.7.3.19_p1.ebuild 7154 BLAKE2B 7f9552092b1e5fde0ea58acee8ed657e644742784a7a4c359cc226c91344b40dca146a6ea54af3d0f4393ae4946456c390c3bc1894308873ff1d8c05c1cb648e SHA512 e2667579d7e7c032d08e1f1379b3462c398f681794ef121d9b8270125f51771d67d272dfcdee51691e6f1e75f32fd5773797b22b42063661ef33fc52c2a29056
-EBUILD pypy-3.11.7.3.19_p4-r1.ebuild 7108 BLAKE2B 95193522904c4fbf328320216c44b325e81902bbe5e6e06a489ea32276342d6a4ad7812a150aafc1b549dff48c9e7608d4e6c9dc42d3648c4d17f86b5f6d1978 SHA512 837f0f743512358cd5d3b3ccd6a56f1893dbe660a8bf17cdb639ff25c2b4aa32cd1c9510ff1e6ea31d8074e1655d1042ee63cc3e058be167e73b9cc25f83521d
+EBUILD pypy-3.11.7.3.19_p4-r1.ebuild 7106 BLAKE2B 4ac410c5186155023267a0f759c2e83659ad55d6ac9e4a78ba11e5cb2398ac8cdbd6b3fdda1f2dfd229426a5eabff18fabad057fae334e79fa0e39530a2fe2f4 SHA512 51c4180dc673dbc437afcf5a3e7eb0f7289780e2cb8bc9a9365a6efda30f68285e277e9dbe939400c7ab91839244763f63b940f887c9b383b8cecd3aac9ea761
 MISC metadata.xml 1124 BLAKE2B f1d09d26175cf20d1440a9a83352cf6f2f2e514d35d95116caf4a5ee86547f0165a6369e7a6b129ded75d28ba5a0c1c8f4da7d664d7c1e3c1e95153593057b3c SHA512 ae95400c9a1efc75372201c2353b128302355d1d087094953d73c325fa72bc24662d31c7287ae6a2583448ac345bb60744ac19391e07f8da8ef0327627e0e462
diff --git a/dev-lang/pypy/pypy-3.11.7.3.19_p4-r1.ebuild b/dev-lang/pypy/pypy-3.11.7.3.19_p4-r1.ebuild
index 1f0343dc478f..31fcfb75524a 100644
--- a/dev-lang/pypy/pypy-3.11.7.3.19_p4-r1.ebuild
+++ b/dev-lang/pypy/pypy-3.11.7.3.19_p4-r1.ebuild
@@ -28,7 +28,7 @@ LICENSE="MIT"
 # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
 # also check pypy/interpreter/pycode.py -> pypy_incremental_magic
 SLOT="${PYVER}/pypy311-pp73-416"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="+ensurepip gdbm +jit ncurses sqlite symlink +test-install tk"
 # many tests are failing upstream
 # see https://buildbot.pypy.org/summary?branch=py${PYVER}
diff --git a/dev-lang/pypy3-exe-bin/Manifest b/dev-lang/pypy3-exe-bin/Manifest
index 6fdd2199e38e..b8496f5d8a28 100644
--- a/dev-lang/pypy3-exe-bin/Manifest
+++ b/dev-lang/pypy3-exe-bin/Manifest
@@ -6,5 +6,5 @@ DIST pypy3-exe-3.11.7.3.19-1.ppc64le-musl.gpkg.tar 6973440 BLAKE2B 9f36dccbcd815
 DIST pypy3-exe-3.11.7.3.19-1.ppc64le.gpkg.tar 10741760 BLAKE2B 09a4888bc305ba8fa56de480abeaeb56ff05e479a72fdb1ab62cb89ab9ec7aac95511314c58e04b7fc670248f9f12e362e7733f757fadc32952f0b74ad6377f4 SHA512 021d5c45d414da4013b7e4469ee6b9eb87c8902ce63fef515de036d2c512ddfcba24a7c4405d681d025f820670001a21ddb94dcd25cd8d583bd091757a0e0f07
 DIST pypy3-exe-3.11.7.3.19-1.x86-musl.gpkg.tar 9359360 BLAKE2B 33cae43f868c09edf06c7c40da9fe81edeb1d14a50686ec7cdce38a16ed7d6473b88a4995d6b720330e311680b975e834ab4fddb18af140fb8289a4669a98af6 SHA512 9e66de09268dd3627c87b789d1667ebf2469c27183ec9ea1263e699a3e0aae49ccc300ab2148394f73db415674c45d50a149e506e7a155f72f65806e45485633
 DIST pypy3-exe-3.11.7.3.19-1.x86.gpkg.tar 9328640 BLAKE2B 5612778adf93329e6c691f0e6c5a311e3c401cef08e05ad978aa92d32f5b5cbc127efafefc76b16eaac1878a1c895094d8b53b853e4d90416751dbb7a3fa7d4c SHA512 fa6483c229c174fb9aa57cfe1b3839fd4b68d987ae50da492e8768a4635e99d1dd471dcba518a74b6264e3c5b58bde59614daf01a72f44a21a9038f0943f175d
-EBUILD pypy3-exe-bin-3.11.7.3.19.ebuild 2063 BLAKE2B 12be4a25869091c47f1534594659d53e34dafb76d73c491f8db0d53a9fa4858d5350172e124ef93c278d26fa0abeacca052aa1519892c5249c8b86a452d40e5d SHA512 cf1079da48a6b08ca0806373cd10e57b6fb2e974b7c51920c70e555881e6d16b84e66c021052ede7be01b8206f14d0faef70cc1860fba57d1b2014eb57f8dbde
+EBUILD pypy3-exe-bin-3.11.7.3.19.ebuild 2061 BLAKE2B 0ffd08d80783d11c456296ae1a1a7dbbc88a9b247fb049a3298bb4d840db72bdf842b46b4c9f9a8d682030d77825bed569b051e57377bbdc8ca45f9478f524a2 SHA512 6a0cd25fc2fed3d8cd40ce8a29e3a9bd02e123ea65865da2997c0994de73a419f8be8140e4728dd23d1d75ea9e3f2d24fcbc6c6a5e2c122d4a83a42ed4f5c05b
 MISC metadata.xml 315 BLAKE2B da5ed341c55250028587ffb479a27b7ec31eb0f8bd0e11b8a98a374e23d989f7d5bcce647ca9c78cd12f64b6b83dd0568c4f3a992a6c8c5089c52cef9de87441 SHA512 ebe1c4d655c49fd20127dd240b603f1b99d67c0a6d21c7eb37bee48f4ec6bba50648816ea2b1b746af58fcf8de576d24fe355ecfa2de07ebaa0265ade2ea38ba
diff --git a/dev-lang/pypy3-exe-bin/pypy3-exe-bin-3.11.7.3.19.ebuild b/dev-lang/pypy3-exe-bin/pypy3-exe-bin-3.11.7.3.19.ebuild
index 15481f9c5c4e..9dc0edf86dd2 100644
--- a/dev-lang/pypy3-exe-bin/pypy3-exe-bin-3.11.7.3.19.ebuild
+++ b/dev-lang/pypy3-exe-bin/pypy3-exe-bin-3.11.7.3.19.ebuild
@@ -57,7 +57,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="${PV%_p*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 # sys-devel/gcc for libgcc_s.so
 RDEPEND="
diff --git a/dev-lang/pypy3-exe/Manifest b/dev-lang/pypy3-exe/Manifest
index 6570b0c8d22d..57afb9ca19b4 100644
--- a/dev-lang/pypy3-exe/Manifest
+++ b/dev-lang/pypy3-exe/Manifest
@@ -1,4 +1,4 @@
 DIST pypy3.11-gentoo-patches-7.3.19.tar.xz 2216 BLAKE2B d0ee04576659c7dbc49fcb75e4442a91a1d3084689a756ac77de1c38090c2f9fbf8cc1cd8ebab28ce0e0d674506746439b356b1240c492a6f7ea036f3d25e2c3 SHA512 99d37e45ce20307e188398de517e415437e3ba7a6b8f1dbf1f74caed481bc96bd961298e4537086a7056e36624e477daaefc53229525875ba433b60bdcf63c5f
 DIST pypy3.11-v7.3.19-src.tar.bz2 24916380 BLAKE2B febc61b3a1c5055b5ab92e7f3af2c307605c8510131437b12df27b58a13b29f6fd0a4bf82d101f7f8f441ca93b20cf70dbd540af11578be297ea871d59304ea3 SHA512 ab078e81e5eefe16823350bdc9adcc444e0ef6835ff2234197f9e5cb0903c5208deb6df60722e99aa529ffff703c5dcbc08eaa7f753c2e5c1185afea6358395a
-EBUILD pypy3-exe-3.11.7.3.19.ebuild 2836 BLAKE2B 1deebc86c30a6737c1970f47d1ec7d3c584f07c14a14bd44662cf7d26a1d69b1da01a2e9de3d1ce37d06f5e0a4219080518fe43c71825c93a28e40e390524b3d SHA512 b3cbecfa4d2a1011c533610f9628f13e5f017c9d90f66f5c00fb30234d28f7d47a0ce69866838abbe2f638f7f36f82a52fe6b47252473765134935b5c20f90a4
+EBUILD pypy3-exe-3.11.7.3.19.ebuild 2834 BLAKE2B 8ea19638103b1ec0c0e8228c62a1907b3175171fc051f0fbc167dcda8b4e386a68c750fb526a3f0954a40457e4ec6908b8e8074fe2f9e9f155416cab34886f0b SHA512 b63a2c6fe8e2e85f1115ebd7047f843e22a4ee3a809f31ad9d3a3e77b4a36dba44283533835fb2fe72b069cadbb531fae406e65eab201a74dca919d9d5615497
 MISC metadata.xml 572 BLAKE2B cfcd1422ec312338fd876bc4747a962ac3c4bd06e28a3891489b065fba4c7be2daa6955f51e8136d9b8cf7b68bb7eb887b6f419ee9fd626ebd6db204acb7995d SHA512 c79250d47e3d5c99c2c903bfc185449cc41f88e2b923b8eae1401e83c0f23fa1a12ad85f50b6e25844e805e543ae897ccf43185a1bdf9f992dff765249e55bc1
diff --git a/dev-lang/pypy3-exe/pypy3-exe-3.11.7.3.19.ebuild b/dev-lang/pypy3-exe/pypy3-exe-3.11.7.3.19.ebuild
index 76bfdf01614c..ce614b348e91 100644
--- a/dev-lang/pypy3-exe/pypy3-exe-3.11.7.3.19.ebuild
+++ b/dev-lang/pypy3-exe/pypy3-exe-3.11.7.3.19.ebuild
@@ -26,7 +26,7 @@ S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 SLOT="${PV%_p*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+jit low-memory ncurses cpu_flags_x86_sse2"
 
 RDEPEND="
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 23cfa721de07..1aec024cf264 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -34,9 +34,9 @@ DIST python-gentoo-patches-3.9.20_p2.tar.xz 36140 BLAKE2B af0a9e08f3bfd8eb631760
 DIST python-gentoo-patches-3.9.21_p1.tar.xz 35404 BLAKE2B 7b5ac27e814b06791fa5f0566763711c1b65a7c82ba66f97e237eebc6076f0bfdad3d8269ece6c4d4c238b62cc75b01f68ea3a5d7c4fffc46e88f79b2ba3e7fc SHA512 92c8548b31100a921378c72cc94a81062c96fd795fa2cd001c57a71e4af39e91b21b99e9e84db12adb142d9c4bda809445519c5c8a35545bd10230926bd7eded
 EBUILD python-2.7.18_p16-r2.ebuild 8505 BLAKE2B feb4cf270dd478f2f7f16f969c9c8a28cf8121f3cc32f11407622afe0a1db79247d045cb6324b9b5f4939a6028164c655116fff98e2378eea7e23fe0b8ce1dda SHA512 cc3d964e6fd8577de2176cbf5832d8587e090158317e52fc42615b7494861b0a955983e0f8153401b6af44b1ba227cac87ae901cda524358518d2778fcd162f2
 EBUILD python-3.10.16_p1.ebuild 15531 BLAKE2B cec70438eef3917846e6d26035f33bf2a0e90515a916c4283c286744deaea86f26b33e0fe96f9fba34552bd5917750abac8ec9726cb12937140291cfab689c9f SHA512 edf67f6b68442b860d209a2216b5c72151c242972329bd62463ef9e29d172f64a7bd4d8eb708f8b6830eaaed35336ddda5343c1f30dc3199abe859d97ba4c948
-EBUILD python-3.10.16_p2.ebuild 15533 BLAKE2B 9b5bc81c3e679b1a7b5fd744f7437733cae9fb6cb74b6a0dce8fca1fc74aec1f0c230f62b4de73e4505aca07953788ad4d8559d8906193cf2036a39d8bd7a739 SHA512 c0d3eedafab5e44d3d110ad9efc13ab264b568218b2e0d45fc54ac0fdce72ad1ed5ca3aff82593e8806b9d20508736244395f3d4c65040e9aaf96e7fd9c9920e
+EBUILD python-3.10.16_p2.ebuild 15532 BLAKE2B 58a941c50c21b527c049b843919d690a07bbbc98e3d566bb544c473087019a7944474e710079d062c0ddf203b0e79279a5bcdaf54fb3fde2731d77f79405bbb1 SHA512 e6ec9e5b459feb3aafab58be91d387d08921de1ccd1a4bc7a3356b012bf47332dc7d15b1fda25646a031d38da361062ae34c5e0fb9fdccc2f17619676a14dad5
 EBUILD python-3.11.11_p1.ebuild 16699 BLAKE2B 5797ee3ec52e380d7f95373fde3130854506f13db4e4dadb07d7159dd290a7c41add2687ea51d79dc1afbee5cc700251ee8799a43440885803e82796407077a9 SHA512 44d5ba374441fd55830c89501cc00f9a9faab36f7a5c9c7dbd0bd2f65a633e0a93cb5aa57f3b5e57788d103a109f08e68a9f1a68bf65a6f97b7ffeb6f1f8a7e4
-EBUILD python-3.11.11_p2.ebuild 16701 BLAKE2B 550e38f5f867448afd2fa2e54adf0f2f6d5d1bcb40bb084e5ddff027a090797b0c40a9dce4437089ca950bb2b0657fc04b0319d6dccd0cf63892626d043e78be SHA512 9a6a03bb3ddd344269b6c05369a2ff9da600fa891b61aa8c6a886a44af6a001f249406077682de2dec96427929259b13a996d4eb8be972bbab75a9b71b66f3fd
+EBUILD python-3.11.11_p2.ebuild 16700 BLAKE2B 1fcdfeef5d21bd4ae0239fa9290b2b26b889d0dfdfcd495a69bb1a3d00cd06bbf5fb006d5bd9af3c6516ba123dca711db409d2ce3126c43cf79997ebbce6658e SHA512 9ac4180b156f8c7ef4b0002eb359a6016fd26dfb8077250505b5c5b31160d5f37230ac1f07814ca14ebbe259bf40dad01d4bf8ce7811836ca022b9fc37f91654
 EBUILD python-3.12.9.ebuild 15671 BLAKE2B 7b4dbd1c4b60b57c12ca33c2523230a3d52f9d5ec6ef56b922e34c369476d07f31fc9aa93b6b3346c092dfefa6631c86d2f498c4f69fc88cc1e4b42dc0698435 SHA512 c53dabbaf74fe6e19525865b42b43b4754171df43c6295183debf108ee43365fd409b302ec6febc90c10e7ef3b42564d11084df746cf37824f437d1ed3e58311
 EBUILD python-3.13.2-r100.ebuild 16678 BLAKE2B f70e5c4541719979f5588c97e9b19b5be0f2566783fdfdac558820bd94dcc5f34ec15485db5836587f28dd93c09af046aad91ff1be2855ebde82e518a1e337fe SHA512 e73f5893d2fef16bd668124f918c50ef58ad50307182800598824f782a95928788aa57e18db9f550427c5e8bb958024151cc7bf4c18556d84c8359241b7304c2
 EBUILD python-3.13.2.ebuild 16361 BLAKE2B 139a6204daab762327d366d6dc9806a81e1e31c28510b6460883233c488cdd82a06019dca27bde975e63ff68fd011e8fcc77d295b86a5173dd213d3119de1b76 SHA512 a850739e65cfe3d283b94e7b28d190ec026c2f30477368d157daf430530276975ec5c26bec22e3774ee0c380a55a427af08fdf9842e8c1327550aaf6146fe0b3
diff --git a/dev-lang/python/python-3.10.16_p2.ebuild b/dev-lang/python/python-3.10.16_p2.ebuild
index 4359116e4dca..678a928ecbe6 100644
--- a/dev-lang/python/python-3.10.16_p2.ebuild
+++ b/dev-lang/python/python-3.10.16_p2.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="
 	bluetooth build debug +ensurepip examples gdbm libedit
 	+ncurses pgo +readline +sqlite +ssl test tk valgrind
diff --git a/dev-lang/python/python-3.11.11_p2.ebuild b/dev-lang/python/python-3.11.11_p2.ebuild
index f2e7f82999a3..d8b04bb1a53c 100644
--- a/dev-lang/python/python-3.11.11_p2.ebuild
+++ b/dev-lang/python/python-3.11.11_p2.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="
 	bluetooth build debug +ensurepip examples gdbm libedit
 	+ncurses pgo +readline +sqlite +ssl test tk valgrind
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 5484643adb13..2b837ec3df7b 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -29,9 +29,7 @@ DIST ruby-3.3.6.tar.xz 16398228 BLAKE2B 7e2fb58ca1f5ee7ab9c2fd7b24fdbf9eef980532
 DIST ruby-3.3.7.tar.xz 16379504 BLAKE2B 33bd05d8462ec7e33872a31bcbfabcfc65a0245dc6519248e474085f3255dc3ad67210400ac314b291f16d3eb261459cadba180dfccc510a2b2c978035435347 SHA512 4082a7684c1b0d53a0ce493f79568e851d37a864f59c58b2e0c273b2659e0ca75318ddff939fdf5e9d0a3eeba1b6d8f03bf88afb49a5ffd77714f1c8a7dfdd55
 DIST ruby-3.4.1.tar.xz 17222800 BLAKE2B 949cb57aeb6af4ca70d6638a2cd38ec9d067a3798ec27e02ee5934c902b74684b9f96d9fc00c1b22932de20b38b5bd3403a9a1a1bfe0c1caa380327d376d4c45 SHA512 8d2e34117696f9debf463ae1eed288fdbb5c1a12e32800e901b69218e3b7302a0066052077e2ebca851e3a635296199bd5a10437eea1d6f787f69a77bb865680
 DIST ruby-3.4.2.tar.xz 17218200 BLAKE2B b0054a6f2db9cd6d5c92550b25ddaf131d0f83e33765bcf38e9ffbfcfac090828563f622e7e786467f55e2ac5a9d9779e07ad7942b0e33c9a394d67e4420f0ea SHA512 cb8b5023bce316393716548c5f0a44c7d0240724ff79b995517641266af30bedc6f402c1c8fa27368ea607e2aa6d36bbb201e00c6e9dd2a80d837431d32343b5
-EBUILD ruby-3.1.6-r1.ebuild 8908 BLAKE2B d1f784e2ed287491e3163fd02cc67e60041e0f4b88d0b090db33b47e0f240596739637dcaea2b1d2b1fa8e48696151a03995e851b8d8d13ba0a5669a0d833f05 SHA512 4ab34e37f0e70b48475ae4e865f01ec5b1db309dd634821d77bb765f0e26cd24e91d58532b0bc20fb2aa3e3589a29bcbbd736ca2f8acfe7dbb7d15b6d0eec831
 EBUILD ruby-3.1.6-r3.ebuild 9203 BLAKE2B 216ceb045e2392a8e3966e80ef2fec25b6d7c534ec8cd69941ae4f74eab284899b71392f5c2fbd554b8eea7757816f90cb507afbde415aaee34c96e6a8933219 SHA512 dd4e8e81d6520c662cc5cd2fa2f3533c273f002644489e4cebc6291c8c7e858661d70d3e7d9bbf19460e23ecb52443757c2c970e40b7fe2da54b037cc1ce2ce1
-EBUILD ruby-3.2.6-r2.ebuild 9380 BLAKE2B 6aeffba44f299f96c4e40ef626ad764bbb53674065108ccd64c92083107d2bb2ff43dca95efbbe5507011263b7a0cbec15b51557c8af5ea762af1f27b7e21e0c SHA512 dd3ec646360dea6eec0db0171fac65e1c05aa56e557b424684daf2efe6c9376fe410a8f9e218a1452340fc668966cfddf33c0d9a65c4511ff3f35cf7a03413ef
 EBUILD ruby-3.2.6-r4.ebuild 9539 BLAKE2B ecac6bd70da9bbd450ef5527b1528a675e53924cf76f213b4fca961fb3b9a8961b41d83e6619930bf3070e5fe84606e9ea974a70804a58d24efba320d44d4fc3 SHA512 9727b97df85dcc1b0ae184e9c1bad66f8fcce1cfaf14da114401341c2a37a283ed48e2c807790d13d4fc418fbcfcac250b62c794fb089a2455498210d429eede
 EBUILD ruby-3.2.7.ebuild 9563 BLAKE2B d67f4bdb6c1c68562b14b5601d1f15ea2a539a38765a88783faaf61bf2db80bc6481c45c5187d774b6539e3ee1e6de24ad3fca808c7e8262e1b3aecf530af3af SHA512 8e49eff72049bbd896afee342e6bd4f75b2b39ab89eb77bd6af24c2a2cb68cb2cada9ed82cc1f593af5335c3ee95e93ab18c2bf2ad77f731c18b43bb4257d5dc
 EBUILD ruby-3.3.6-r1.ebuild 9566 BLAKE2B afce954e3ebc1bc8d3f3890cb21ee92a6349d1b9752a54d55d0a5cef67d2ce47aa779d658fe5b7574eb82294490c120b9cabb511d72332d9c41f9207fa93dda1 SHA512 47583e13a082a7e9600558108b66f07f20905ee3ea8dddbe2f7008ebc2389d6b0946a5cf3423e9da7e1c91f161d424a003d6b6ed5d0720a2db525488f8b97825
diff --git a/dev-lang/ruby/ruby-3.1.6-r1.ebuild b/dev-lang/ruby/ruby-3.1.6-r1.ebuild
deleted file mode 100644
index e6ef028a34d2..000000000000
--- a/dev-lang/ruby/ruby-3.1.6-r1.ebuild
+++ /dev/null
@@ -1,280 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic multiprocessing
-
-MY_P="${PN}-$(ver_cut 1-3)"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(ver_cut 1-2)
-MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
-RUBYVERSION=${SLOT}.0
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="https://www.ruby-lang.org/"
-SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm:= )
-	jemalloc? ( dev-libs/jemalloc:= )
-	jit? ( || ( sys-devel/gcc:* llvm-core/clang:* ) )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	systemtap? ( dev-debug/systemtap )
-	tk? (
-		dev-lang/tcl:0=[threads]
-		dev-lang/tk:0=[threads]
-	)
-	dev-libs/libyaml
-	dev-libs/libffi:=
-	sys-libs/readline:0=
-	sys-libs/zlib
-	virtual/libcrypt:=
-	>=app-eselect/eselect-ruby-20231008
-"
-
-DEPEND="
-	${RDEPEND}
-	valgrind? ( dev-debug/valgrind )
-"
-
-BUNDLED_GEMS="
-	>=dev-ruby/irb-1.4.1[ruby_targets_ruby31(-)]
-	>=dev-ruby/minitest-5.15.0[ruby_targets_ruby31(-)]
-	>=dev-ruby/power_assert-2.0.1[ruby_targets_ruby31(-)]
-	>=dev-ruby/rake-13.0.6-r2[ruby_targets_ruby31(-)]
-	>=dev-ruby/rbs-2.1.0[ruby_targets_ruby31(-)]
-	>=dev-ruby/rexml-3.2.5[ruby_targets_ruby31(-)]
-	>=dev-ruby/rss-0.2.9[ruby_targets_ruby31(-)]
-	>=dev-ruby/test-unit-3.5.3[ruby_targets_ruby31(-)]
-	>=dev-ruby/typeprof-0.12.2[ruby_targets_ruby31(-)]
-"
-
-PDEPEND="
-	${BUNDLED_GEMS}
-	virtual/rubygems[ruby_targets_ruby31(-)]
-	>=dev-ruby/bundler-2.3.3[ruby_targets_ruby31(-)]
-	>=dev-ruby/did_you_mean-1.6.1[ruby_targets_ruby31(-)]
-	>=dev-ruby/json-2.6.1[ruby_targets_ruby31(-)]
-	>=dev-ruby/rdoc-6.3.3[ruby_targets_ruby31(-)]
-	xemacs? ( app-xemacs/ruby-modes )
-"
-
-src_prepare() {
-	eapply "${FILESDIR}"/"${SLOT}"/011*.patch
-	eapply "${FILESDIR}"/"${SLOT}"/012*.patch
-	eapply "${FILESDIR}"/"${SLOT}"/013*.patch
-	eapply "${FILESDIR}"/"${SLOT}"/020*.patch
-	eapply "${FILESDIR}"/"${SLOT}"/902*.patch
-
-	if use elibc_musl ; then
-		eapply "${FILESDIR}"/3.1/901-musl-*.patch
-	fi
-
-	einfo "Unbundling gems..."
-	cd "$S"
-	# Remove bundled gems that we will install via PDEPEND, bug
-	# 539700.
-	rm -fr gems/* || die
-	touch gems/bundled_gems || die
-	# Don't install CLI tools since they will clash with the gem
-	rm -f bin/{racc,racc2y,y2racc} || die
-	sed -i -e '/executables/ s:^:#:' lib/racc/racc.gemspec || die
-
-	einfo "Removing bundled libraries..."
-	rm -fr ext/fiddle/libffi-3.2.1 || die
-
-	# Remove webrick tests because setting LD_LIBRARY_PATH does not work for them.
-	rm -rf tool/test/webrick || die
-
-	# Remove tests that are known to fail or require a network connection
-	rm -f test/ruby/test_process.rb test/rubygems/test_gem{,_path_support}.rb || die
-	rm -f test/rinda/test_rinda.rb test/socket/test_tcp.rb test/fiber/test_address_resolve.rb test/resolv/test_addr.rb \
-	   spec/ruby/library/socket/tcpsocket/{initialize,open}_spec.rb|| die
-	sed -i -e '/def test_test/askip "Depends on system setup"' test/ruby/test_file_exhaustive.rb || die
-
-	# MJIT is broken and removed in later ruby versions.
-	rm -f test/ruby/test_jit.rb || die
-
-	# This test calls out to the system ruby which is not being tested
-	# and may not be the same version.
-	sed -e '/test_without_tty/aomit "Calls system ruby"' \
-		-i test/readline/test_readline.rb || die
-
-	if use prefix ; then
-		# Fix hardcoded SHELL var in mkmf library
-		sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb || die
-	fi
-
-	eapply_user
-
-	eautoreconf
-}
-
-src_configure() {
-	local modules="win32,win32ole" myconf=
-
-	# Ruby's build system does interesting things with MAKEOPTS and doesn't
-	# handle MAKEOPTS="-Oline" or similar well. Just filter it all out
-	# and use -j/-l parsed out from the original MAKEOPTS, then use that.
-	# Newer Portage sets this option by default in GNUMAKEFLAGS if nothing
-	# is set by the user in MAKEOPTS. See bug #900929 and bug #728424.
-	local makeopts_tmp="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
-	unset MAKEOPTS MAKEFLAGS GNUMAKEFLAGS
-	export MAKEOPTS="${makeopts_tmp}"
-
-	# Avoid a hardcoded path to mkdir to avoid issues with mixed
-	# usr-merge and normal binary packages, bug #932386.
-	export ac_cv_path_mkdir=mkdir
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-frame-pointer
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-
-	# Workaround for bug #938302
-	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
-		export DTRACE="${BROOT}"/usr/bin/stap-dtrace
-	fi
-
-	# Socks support via dante
-	if use socks5 ; then
-		# Socks support can't be disabled as long as SOCKS_SERVER is
-		# set and socks library is present, so need to unset
-		# SOCKS_SERVER in that case.
-		unset SOCKS_SERVER
-	fi
-
-	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
-	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-	fi
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-	# Determine which modules *not* to build depending in the USE flags.
-	if ! use berkdb ; then
-		modules="${modules},dbm"
-	fi
-	if ! use gdbm ; then
-		modules="${modules},gdbm"
-	fi
-	if ! use ssl ; then
-		modules="${modules},openssl"
-	fi
-	if ! use tk ; then
-		modules="${modules},tk"
-	fi
-
-	# Provide an empty LIBPATHENV because we disable rpath but we do not
-	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
-	# #564272
-	# except on Darwin, where we really need LIBPATHENV to set the right
-	# DYLD_ stuff during the invocation of miniruby for it to work
-	[[ ${CHOST} == *-darwin* ]] || export LIBPATHENV=""
-	INSTALL="${EPREFIX}/usr/bin/install -c" econf \
-		--program-suffix=${MY_SUFFIX} \
-		--with-soname=ruby${MY_SUFFIX} \
-		--with-readline-dir="${EPREFIX}"/usr \
-		--enable-shared \
-		--enable-pthread \
-		--disable-rpath \
-		--without-baseruby \
-		--with-compress-debug-sections=no \
-		--enable-mkmf-verbose \
-		--with-out-ext="${modules}" \
-		$(use_with jemalloc jemalloc) \
-		$(use_enable jit jit-support ) \
-		$(use_enable socks5 socks) \
-		$(use_enable systemtap dtrace) \
-		$(use_enable doc install-doc) \
-		--enable-ipv6 \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs install-static-library) \
-		$(use_with static-libs static-linked-ext) \
-		$(use_enable debug) \
-		$(use_with valgrind) \
-		${myconf} \
-		--enable-option-checking=no
-
-	# Makefile is broken because it lacks -ldl
-	rm -rf ext/-test-/popen_deadlock || die
-}
-
-src_compile() {
-	local -x LD_LIBRARY_PATH="${S}${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS=""
-}
-
-src_test() {
-	local -x LD_LIBRARY_PATH="${S}${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	emake V=1 check
-}
-
-src_install() {
-	# Remove the remaining bundled gems. We do this late in the process
-	# since they are used during the build to e.g. create the
-	# documentation.
-	einfo "Removing default gems before installation"
-	rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || die
-
-	# Ruby is involved in the install process, we don't want interference here.
-	unset RUBYOPT
-
-	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
-	local -x LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-
-	local -x RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-
-	# Create directory for the default gems
-	local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}"
-	mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed"
-
-	emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install
-
-	# Remove installed rubygems and rdoc copy
-	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
-	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
-	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
-	rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
-	if use doc; then
-		emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc
-	fi
-
-	if use examples; then
-		dodoc -r sample
-	fi
-
-	dodoc ChangeLog NEWS.md doc/NEWS* README*
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(30|31|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
diff --git a/dev-lang/ruby/ruby-3.2.6-r2.ebuild b/dev-lang/ruby/ruby-3.2.6-r2.ebuild
deleted file mode 100644
index 648fd0744bb5..000000000000
--- a/dev-lang/ruby/ruby-3.2.6-r2.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-RUST_OPTIONAL="yes"
-
-inherit autotools flag-o-matic multiprocessing rust
-
-MY_P="${PN}-$(ver_cut 1-3)"
-MY_SLOT=$(ver_cut 1-2)
-MY_SUFFIX=$(ver_rs 1 '' ${MY_SLOT})
-RUBYVERSION=${MY_SLOT}.0
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="https://www.ruby-lang.org/"
-SRC_URI="https://cache.ruby-lang.org/pub/ruby/${MY_SLOT}/${MY_P}.tar.xz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-SLOT=${MY_SLOT}
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="berkdb debug doc examples gdbm jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm:= )
-	jemalloc? ( dev-libs/jemalloc:= )
-	jit? ( ${RUST_DEPEND} )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	systemtap? ( dev-debug/systemtap )
-	tk? (
-		dev-lang/tcl:0=[threads]
-		dev-lang/tk:0=[threads]
-	)
-	dev-libs/libyaml
-	dev-libs/libffi:=
-	sys-libs/readline:0=
-	sys-libs/zlib
-	virtual/libcrypt:=
-	>=app-eselect/eselect-ruby-20231008
-"
-
-DEPEND="
-	${RDEPEND}
-	valgrind? ( dev-debug/valgrind )
-"
-
-BUNDLED_GEMS="
-	>=dev-ruby/debug-1.7.1[ruby_targets_ruby32(-)]
-	>=dev-ruby/irb-1.6.2[ruby_targets_ruby32(-)]
-	>=dev-ruby/matrix-0.4.2[ruby_targets_ruby32(-)]
-	>=dev-ruby/minitest-5.16.3[ruby_targets_ruby32(-)]
-	>=dev-ruby/net-ftp-0.2.1[ruby_targets_ruby32(-)]
-	>=dev-ruby/net-imap-0.3.4.1[ruby_targets_ruby32(-)]
-	>=dev-ruby/net-pop-0.1.2[ruby_targets_ruby32(-)]
-	>=dev-ruby/net-smtp-0.3.4[ruby_targets_ruby32(-)]
-	>=dev-ruby/power_assert-2.0.3[ruby_targets_ruby32(-)]
-	>=dev-ruby/prime-0.1.2[ruby_targets_ruby32(-)]
-	>=dev-ruby/rake-13.0.6-r2[ruby_targets_ruby32(-)]
-	>=dev-ruby/rbs-2.8.2[ruby_targets_ruby32(-)]
-	>=dev-ruby/rexml-3.3.9[ruby_targets_ruby32(-)]
-	>=dev-ruby/rss-0.3.1[ruby_targets_ruby32(-)]
-	>=dev-ruby/test-unit-3.5.7[ruby_targets_ruby32(-)]
-	>=dev-ruby/typeprof-0.21.3[ruby_targets_ruby32(-)]
-"
-
-PDEPEND="
-	${BUNDLED_GEMS}
-	virtual/rubygems[ruby_targets_ruby32(-)]
-	>=dev-ruby/bundler-2.3.3[ruby_targets_ruby32(-)]
-	>=dev-ruby/did_you_mean-1.6.1[ruby_targets_ruby32(-)]
-	>=dev-ruby/json-2.6.1[ruby_targets_ruby32(-)]
-	>=dev-ruby/rdoc-6.3.3[ruby_targets_ruby32(-)]
-	xemacs? ( app-xemacs/ruby-modes )
-"
-
-pkg_setup() {
-	use jit && rust_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/"${SLOT}"/010*.patch
-	eapply "${FILESDIR}"/"${SLOT}"/011*.patch
-	eapply "${FILESDIR}"/"${SLOT}"/013*.patch
-	eapply "${FILESDIR}"/"${SLOT}"/902*.patch
-
-	if use elibc_musl ; then
-		eapply "${FILESDIR}"/${SLOT}/901-musl-*.patch
-	fi
-
-	einfo "Unbundling gems..."
-	cd "$S"
-	# Remove bundled gems that we will install via PDEPEND, bug
-	# 539700.
-	rm -fr gems/* || die
-	touch gems/bundled_gems || die
-	# Don't install CLI tools since they will clash with the gem
-	rm -f bin/{racc,racc2y,y2racc} || die
-	sed -i -e '/executables/ s:^:#:' lib/racc/racc.gemspec || die
-
-	# Remove tests that are known to fail or require a network connection
-	rm -f test/ruby/test_process.rb test/rubygems/test_gem{,_path_support}.rb || die
-	rm -f test/rinda/test_rinda.rb test/socket/test_tcp.rb test/fiber/test_address_resolve.rb spec/ruby/library/socket/tcpsocket/{initialize,open}_spec.rb|| die
-
-	# Remove webrick tests because setting LD_LIBRARY_PATH does not work for them.
-	rm -rf tool/test/webrick || die
-
-	# Avoid test using the system ruby
-	sed -i -e '/test_dumb_terminal/aomit "Uses system ruby"' test/reline/test_reline.rb || die
-
-	# Avoid testing against hard-coded blockdev devices that most likely are not available
-	sed -i -e '/def blockdev/a@blockdev = nil' test/ruby/test_file_exhaustive.rb || die
-
-	# Avoid tests that require gem downloads
-	sed -i -e '/^test-syntax-suggest/ s/\$(TEST_RUNNABLE)/no/' common.mk || die
-	sed -i -e '/^check:/ s/\$(TEST_RUNNABLE)-\$(PREPARE_SYNTAX_SUGGEST) test-syntax-suggest//' common.mk || die
-
-	# Avoid test that fails intermittently
-	sed -i -e '/test_gem_exec_gem_uninstall/aomit "Fails intermittently"' test/rubygems/test_gem_commands_exec_command.rb || die
-
-	if use prefix ; then
-		# Fix hardcoded SHELL var in mkmf library
-		sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb || die
-	fi
-
-	eapply_user
-
-	eautoreconf
-}
-
-src_configure() {
-	local modules="win32,win32ole" myconf=
-
-	# Ruby's build system does interesting things with MAKEOPTS and doesn't
-	# handle MAKEOPTS="-Oline" or similar well. Just filter it all out
-	# and use -j/-l parsed out from the original MAKEOPTS, then use that.
-	# Newer Portage sets this option by default in GNUMAKEFLAGS if nothing
-	# is set by the user in MAKEOPTS. See bug #900929 and bug #728424.
-	local makeopts_tmp="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
-	unset MAKEOPTS MAKEFLAGS GNUMAKEFLAGS
-	export MAKEOPTS="${makeopts_tmp}"
-
-	# Avoid a hardcoded path to mkdir to avoid issues with mixed
-	# usr-merge and normal binary packages, bug #932386.
-	export ac_cv_path_mkdir=mkdir
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-frame-pointer
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-
-	# Workaround for bug #938302
-	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
-		export DTRACE="${BROOT}"/usr/bin/stap-dtrace
-	fi
-
-	# Socks support via dante
-	if use socks5 ; then
-		# Socks support can't be disabled as long as SOCKS_SERVER is
-		# set and socks library is present, so need to unset
-		# SOCKS_SERVER in that case.
-		unset SOCKS_SERVER
-	fi
-
-	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
-	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-	fi
-
-	# Determine which modules *not* to build depending in the USE flags.
-	if ! use berkdb ; then
-		modules="${modules},dbm"
-	fi
-	if ! use gdbm ; then
-		modules="${modules},gdbm"
-	fi
-	if ! use ssl ; then
-		modules="${modules},openssl"
-	fi
-	if ! use tk ; then
-		modules="${modules},tk"
-	fi
-
-	# Provide an empty LIBPATHENV because we disable rpath but we do not
-	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
-	# #564272
-	# except on Darwin, where we really need LIBPATHENV to set the right
-	# DYLD_ stuff during the invocation of miniruby for it to work
-	[[ ${CHOST} == *-darwin* ]] || export LIBPATHENV=""
-	INSTALL="${EPREFIX}/usr/bin/install -c" econf \
-		--program-suffix=${MY_SUFFIX} \
-		--with-soname=ruby${MY_SUFFIX} \
-		--with-readline-dir="${EPREFIX}"/usr \
-		--enable-shared \
-		--enable-pthread \
-		--disable-rpath \
-		--without-baseruby \
-		--with-compress-debug-sections=no \
-		--enable-mkmf-verbose \
-		--with-out-ext="${modules}" \
-		$(use_with jemalloc jemalloc) \
-		$(use_enable jit jit-support) \
-		$(use_enable jit yjit) \
-		$(use_enable socks5 socks) \
-		$(use_enable systemtap dtrace) \
-		$(use_enable doc install-doc) \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs install-static-library) \
-		$(use_with static-libs static-linked-ext) \
-		$(use_enable debug) \
-		${myconf} \
-		$(use_with valgrind) \
-		--enable-option-checking=no
-
-	# Makefile is broken because it lacks -ldl
-	rm -rf ext/-test-/popen_deadlock || die
-}
-
-src_compile() {
-	local -x LD_LIBRARY_PATH="${S}${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS=""
-}
-
-src_test() {
-	local -x LD_LIBRARY_PATH="${S}${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	emake V=1 check
-}
-
-src_install() {
-	# Remove the remaining bundled gems. We do this late in the process
-	# since they are used during the build to e.g. create the
-	# documentation.
-	einfo "Removing default gems before installation"
-	rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || die
-
-	# Ruby is involved in the install process, we don't want interference here.
-	unset RUBYOPT
-
-	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
-	local -x LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-
-	local -x RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-
-	# Create directory for the default gems
-	local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}"
-	mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed"
-
-	emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install
-
-	# Remove installed rubygems and rdoc copy
-	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
-	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
-	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
-	rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
-	if use doc; then
-		emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc
-	fi
-
-	if use examples; then
-		dodoc -r sample
-	fi
-
-	dodoc ChangeLog NEWS.md README*
-	dodoc -r doc
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(30|31|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index 29a3d57276be..31a544e2f4a5 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -479,6 +479,43 @@ DIST rust-1.85.0-x86_64-unknown-linux-gnu.tar.xz 182464920 BLAKE2B 42169d926f43b
 DIST rust-1.85.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 7c84bfee06171633feecb2a3be2e85a9fff8941098cbe2b42c4b77b5c8d253f09a0e954fc6ac3c1073aa2999211f059ea5c20a483e5fe2c075997fe1c942b4f5 SHA512 7b4a698cfc41b23c9015e0b00d4ef377cb452992e15ae8d2faac6d1ad7dca3d59e80993be30c1d240fd2e732355d1941b348069c3da27f0a9df6dee637175967
 DIST rust-1.85.0-x86_64-unknown-linux-musl.tar.xz 263244196 BLAKE2B 5e8391ab184a3ac641aef3c4e8a6a4c90ecb12fcfd1264d2dd6c1a062af96bf40c0e7940521eff5f86614b6e8b6ee9a1d6dab4240be9accd8a4316403bd46841 SHA512 18c8a3cdf4f57465417930c6dc83cb51410b4b882e80f86b959c945167e1e0c04f4b5feb3c65ef9f2f9be1f10975d8e7424a8ad4e92ca4de843d0c7c83c9dbed
 DIST rust-1.85.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 123423d989204841da45e388589a0c1a4fa4d9102f691686d79502288f7a6d882055497f22f3ed63229d78c22c843a802abad31089035769123618d35da915a6 SHA512 da076d70fe804ebbc02df656fc6e384b03ac2d2f0fc36fb536b877b81a81fb45b5faf1a60e5a4d7b99d6d9b873382f67a3242d6299c2e85321a2842d6ae08c55
+DIST rust-1.85.1-aarch64-unknown-linux-gnu.tar.xz 241899836 BLAKE2B a67e4174871e0667dcd600dda9f1559cd75eca3dc44879d9302ca266ff34d42b98b39c3000a6d5aad1624ff2b367583512aa36b4eb293a6039ff4f4d68c36a42 SHA512 7658b6cb663f173e3f7d7da42e5a6dbf193b4d5f5aaa267f4f57fb2cd08534923278a6ef402fdca0efedfca28f10cbc34c2e6138a870e1a98572feb16c796b71
+DIST rust-1.85.1-aarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 69c0e455a830cc2d1302e9d80e87831c7ddc57c20cb1ca8087b977329049106bb69cd17734d41f4a00e39981db94962c33bf679202e947a6921e3d2eca97d635 SHA512 4922f2bc82ae64496c06516418ccf06698d70c53f383e9c004bb8edbe6488ed967255c69033843029c1737eb4de9d2998cd165e2717af3cde651058113bee03c
+DIST rust-1.85.1-aarch64-unknown-linux-musl.tar.xz 218838184 BLAKE2B eae06b23bf294ecc96e052f15886b76909f1c07d1943dcfdbe3d5809cd71b7b6be8bf70b0c73e3dc66318d12d14ae018a8ea24e79ddc1ae54ed988f666d13b06 SHA512 640d6facc63b5ce6f97c3562c5869846f8412ac1830419878d690778921d1a30f013384580f2007a2c65414e5c1c833f83e640b8d7e5ef7a5503d7751323e5c2
+DIST rust-1.85.1-aarch64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 8bee75a90cfc5b3d63e5d41a5400cac3e94980d9acae6d5725b4091e2c0c82127ea98b824c95f501c9979c0da904904d0bde6cbb215d06d429e379f68230bdc2 SHA512 fc7599a0136f0010899df4a4764f706c252f5205a8cebd8f18f14e6f3151b34b6d67c3d2fa9b45fb1222e93a2582a3e3567e62aafe84a1360d66c94eb9fccebc
+DIST rust-1.85.1-arm-unknown-linux-gnueabi.tar.xz 203435192 BLAKE2B 40cfe60009cb18d94b6ba664c87ca085c4f0b8450786fdcdc3c87444514649fa13adeba3fa1684bf21e3ea1b3c30749217ebe695248688815d438614ecc11312 SHA512 f553df6c62ca1c30b80370b2bbbb62c78e7ab62297beb9b3e2ca503f2c61759ba5d10994039d1e001ff3db8ebc9cc5fdf008d182cd2c182ffef005183080f907
+DIST rust-1.85.1-arm-unknown-linux-gnueabi.tar.xz.asc 801 BLAKE2B d3891690de72fcaf44233a70c2d6c02f006bd3af13d831ce86495fa20ffd297bfb9dec5d4e9984722c71986b82dc7b637cf62c24b878a649903a0305ac5cb187 SHA512 dc0eb767441e9f6b2fef32162fe8fc855ff3c1552bfc515d992c89e47c43fac1f5d226f33c5e31d1f90bacf1cfd7dff476a516c09fd4fdcdde6dc6490bde986c
+DIST rust-1.85.1-arm-unknown-linux-gnueabihf.tar.xz 204291948 BLAKE2B 933e0ed70bd2558a2a90c0f73df5932b8897092473ac3fa6f8b85b98bf1bad504ef3264d8d518e6acb3ce1b4ec55b6ada5d279eb1a99233b974f1099d07dba92 SHA512 15b63a55049a64ee95025eddfca3f002dbe74bc8260d748b7c2d91bb558375988bb09f046e5e36b190cf3854c4a19e0d8f2ba021e7b3a752bd97b618bbc3d4c0
+DIST rust-1.85.1-arm-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B d95d2cf3a9b048b18ad50ff1f8efca7589adf1caeb6a6bc981ad99af8a240d2e26def681838a12030fbd0050eb88765d8969ffe29c836541783cb85474a66370 SHA512 b72fda3f390b46d83c5995f4e28a41e17649bc1fdde03e514ad83580ca3d036642d026f8892d6e206336097bea3a17d94092dd1ab70155cf0a9c98376be88970
+DIST rust-1.85.1-armv7-unknown-linux-gnueabihf.tar.xz 209597268 BLAKE2B 1a32f55193fae11ed799ad241c43409867ff7765c6b2957ffea6cc142c8946b7156245b5cbfad09a3a260103b3f5dfc6bc9b75b07f9870f9d5dca5c734bf1f4e SHA512 8a637f8b967d2a8c55af278f9510bb132e0f704fd64483d2ac0381c2dd2385877eebd4c366785af2cef4c09fd9f4aa5cbbc8813764efb6af2904210f495e1347
+DIST rust-1.85.1-armv7-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B 82c5a73528a13c3f06fe9e0a8f07f849d5819bef828b742848e3a82da2600732441bffd01f2c592ba4977d07202117139572b77a8dec807bbb6877bdf3f33ad5 SHA512 11d4cf8613d754311b51dabef74710d5bd2c06a609ac862837bdc7f6b26e2d534ceb0c6b8bb9ece6af9038ce17cf7fe5f90b450c81fea0f0bbf62e4ef9b3958f
+DIST rust-1.85.1-i686-unknown-linux-gnu.tar.xz 236496844 BLAKE2B dc6f9272af0e481bb40bb914cb0f17f9f48ce893761769c1a9d81da0c60e13e6a72d4ad7a632e251253f7c319c078be3b34a7b2cf4e75644572157daf563bb1c SHA512 2684710e78138ffd23ea348386e02062b23fec4522580cdcd9a72855719c1cf9e8b389639948018b0d296cb83e34eb3c4c051697b2456f6f1ccdaf1c0925e095
+DIST rust-1.85.1-i686-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 77a409a9297f9b8e001de5c6c35ef608636de1ffe57f2e5a9d44e8fc6e26cc336d312c1f5e98ddba9fa0011cbd9a57e34b60e7a459a11a43eef27a57070e1e44 SHA512 90cf37037220a0b2b3640907070892a598d6ca4288734fecf836af29883ac7c3c563aeec382b2cd0247e6555606d9d15eb2a686f6bf907ecff2189f0825aa0bf
+DIST rust-1.85.1-loongarch64-unknown-linux-gnu.tar.xz 234511720 BLAKE2B 58fad76f102156042c65b1219ee0f936fd5dd0f978781856f335c41464eb25cfe9ea9539d2588ca29e063c2f03c10d3c3fce755e1dda63d05bb238550e5aa636 SHA512 c84904fe15671920a7f6ca5b3dda2e0bd473d5e7911ee2ef974410daa68b1d40dca1ff7e156145f3a77b01ce83bb3cb10f366b3bf9f428fa75855016a6f2d580
+DIST rust-1.85.1-loongarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 4e11d752e9769053239e73ad63a34560637e16d82e8b586e571e536899066fbeaee0453f47b6513c090d519ba2b0c3535943fbb8e3acc5afd69cd6580ef96e11 SHA512 e10f1343ef9f924a36a19adbded8501ab97e3b25c0080cfe25b4c8cb1cb1ba2f6bf371c66cfaf9e1e876bd11b76b64f0f32e7f4cea917e419c462521b3191b48
+DIST rust-1.85.1-mips-unknown-linux-gnu.tar.xz 75817800 BLAKE2B 077fc41cc50939f35c0b376474275d04f2bad874f441f753319a41f95e8e18761a972fdf4365ddb1c03b3933d42041c5801f3b3b2449437406a398f32f7d95e3 SHA512 c025bb2f5d2fa2075142e53db540449271e5a6e6d0e2f36d3bc3a8e88af31b026cb1625b060e1c6d5535a3b3ba077ed912546d57656707aa7ac0cfa9bd12e74e
+DIST rust-1.85.1-mips64-unknown-linux-gnuabi64.tar.xz 75513560 BLAKE2B 08716f49c784f30f018048749049cea299c6de997fdd2eca805cc790307515ad8b6ff711d9b415de312120e74e251c4833555e8c043f3c72fcd838a1791f4ab8 SHA512 6c3c3e4f52620ccd07a0c38ae8085d57f37072a24aba63bb16fb2f067096b3a4dfb71e5e5a3e5d939075d4c107d716e6af12c35cfd41e1b8f3f25b439ac086d9
+DIST rust-1.85.1-mips64el-unknown-linux-gnuabi64.tar.xz 77135980 BLAKE2B 0c8e17925feb025cb3fab3bb98112703977bbf9f5301241f9c541ed3b2cee5d0b712555fbe6a608f98d7ff09cfd96bf27169ba8e3eb45df5894587d982257252 SHA512 770825c2ad0c7cc7ff2b6a3196349ab0c04ed6b36b5497abd3c573d836d93b4924f45db71568a087a93e6236f342ef69f3466abd63661082e30b61b9e30a0180
+DIST rust-1.85.1-mipsel-unknown-linux-gnu.tar.xz 77489772 BLAKE2B 8644253c388451e8df20ea4e3f4d39baf4dd25783a4dace381382af1d465196ea3e93972b3346e8444f2500b36cb3a32efe430c0760e1bd2c6dd5e3f7d9c42d7 SHA512 a6aea2114a3c9de7852d27059dcd96eeea1165841fe730eddd4d7a1c63a610676f8edddd9659f4871058dca4c58312da721cbd8d57d0b3b0d40530a4b866ba7b
+DIST rust-1.85.1-powerpc-unknown-linux-gnu.tar.xz 225991296 BLAKE2B a01f041fdf989cba65cf1440340cac9ff265cfc523cb5aa8ac2a269c95d3cb91be3f17b3de82d1538f6b590ffb6dca5cc4f8734343de5cb3d3191cc1408f068c SHA512 bfdd77220666490bff2d29abc4797d7aa20c299ac2171595a9d988397c25f6982780772c8f33273666a454a8f97ff49e7319c23387202d7ec79820a861617d70
+DIST rust-1.85.1-powerpc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B deb26727e4852b44377eb139be38ebdf06485c3e96d4295ca0e07e798e7da6b3aa44c196822318283db4aabf0723e002f7fc8adb11008a9faa390df165c37fbd SHA512 9d8334c8db1c137b9ede1e3538ccb8ad5d22cf632722ebf061fa0709a86d3c880e7621b09d70ef09494224da77542f87611a9add7caaaf3d9de17bdfab91cf9f
+DIST rust-1.85.1-powerpc64-unknown-linux-gnu.tar.xz 222758020 BLAKE2B ad00b033d5ee08867cf733a3493998168e3357801bccb3bf3ebbaa742cb885abd51f6d0d02372e11ec45ecd951e695e3fa61c7b5f9cbb241be60981783217948 SHA512 b6b09358f57ffa50ab34c39275dd60ba8cdfdee3954ab75a3a3bc67b5818d3ffc26cc36ccbbec8be5a1146f3a19e9e04e0cd0d8df4cbc1d8be1e67dc42f03c7b
+DIST rust-1.85.1-powerpc64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 4370117112ce508282c0553af845719f74451798f7e766eba67866e6c076ab9d8dba4c63c214becea4005ba47b7784c6d7cf8caf90424594a37964539f697a79 SHA512 0ebf39a0a31b78ea041f5683b55f40faaf4ae875711e08c513e1416c4939b1c388f29e87cce7c0e84146e09b40f20604fd5e90a720bc4297e59f243bec3d090b
+DIST rust-1.85.1-powerpc64-unknown-linux-musl.tar.xz 78247440 BLAKE2B 999536e9bd00dbd08cbf99f698efecacafaa27ce5bf96d9f40c21d7027c1ea4904c4814c75609ca5ff2b9ffc5412145b43c1081d056b1a12903ad0f426584357 SHA512 c7943d08a8f27c9cf97e6d4cbca24efc27a7073e1fbfdb32b0a40365785d5ac9ea546a0df8550881045b1fdb105064502efa5cbc330c6b679313991750af2769
+DIST rust-1.85.1-powerpc64le-unknown-linux-gnu.tar.xz 235436220 BLAKE2B 93eaf0b9add5d4e697ff17203a10d91e9abd675883f8fc8478a36223cb6a7859adb2e9f18f386646a76c56c4d9ca8dff590e98bd22e0d4f7226f7b57dd78d8a0 SHA512 2e8ad5931533c79e46b8fd29ffe0250c91bedca6fd5b8177bfaff2531fd7b45419d32c6185919cde6a06d9c0fbfbe2e8f8b4c7eae0f7c8c6cf216060d6087179
+DIST rust-1.85.1-powerpc64le-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 46dab390e629ef1f9d1304f0e6460695da591c7af9e6d4464f4e96102997ba669e6fe419edc0b99674e75eefe53e098e200feffe66a4a65891fa94e8e3309bea SHA512 897ac9a93645c02832831cfeb5c4a6ecd062f96b151be92540b3e6d33cff1da97386303594f13f4bd564e37e852138ea79cdbc7ab96474bc6f4d158b4910150a
+DIST rust-1.85.1-powerpc64le-unknown-linux-musl.tar.xz 239163456 BLAKE2B 141daf887db9d554066a8bd43b477730d9cc6cc7f92692867e170c754a4f3bd48a6cfd7d9c1fdc0e4251ea3960bb767139dc58a7ca62e0346f1dc86b8df4c21b SHA512 f0b971b7d743e2ee8e377a5ae72c0eec2ce2550a1a03c9f591d2b677555e8c95c7b7f8a0e8b43ab1fb459f2d64e36d066b07de1d806c3b6632d8fcf6edda567d
+DIST rust-1.85.1-powerpc64le-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 758665a047851e1415b6cfcbf3763bb44fcd5dad3713fd028d1f19d1ce3d39254c74b1af8027b8cf54ebc2e6effab3e0cb594a292521f7a96635ad1416220182 SHA512 45c5b674d9d0c368714fbc478d307fafcf213b4f188965afae05a70afc77de02338c7037992235f22456f5189e744ec4c2f2d6e288374fefdca6aa85a920c877
+DIST rust-1.85.1-riscv64gc-unknown-linux-gnu.tar.xz 221683940 BLAKE2B 57dafd510ca6c801fcf9e9d4572e3f1614dd291374d7e5f099896f245864f7b21a6897c31d6a0c3d40eb3a2bc57897136ed9ab792d56f0ed81bec9a48f0d4b7f SHA512 eda63ce47f6a55f5888ebae1814de3a7cfcca6a264b568a23291eb5ffa790c0d9119dd240615f24f33378d2e23646644e3c0dfaa8349e1b0fd21fc09df5b4002
+DIST rust-1.85.1-riscv64gc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B b0699a5b4750e4aeb99b6aefa18ad425ecdd41bdd5f33091bddd6bc1c14b66afa095530d1e851d79339f0a91d15825a0134000f97b7d63d94716f1bb6b2e3a1c SHA512 dcc85de56863cbabb22b8b396de24f38e3fb5dde0580a5ca6abd87d58525ec0480ec1b2122253a9a53af3c9f604e02c19c20a4f934de35f6706477e5daf0d6e9
+DIST rust-1.85.1-riscv64gc-unknown-linux-musl.tar.xz 82068332 BLAKE2B c1d6c26dd6541c5f9af1e478688a5e10e05223cd77c49f53e698643a68f98a6df356666125f468c89ec29ac2cbf89398718aebdb3d84b21230d8e5574452fbb7 SHA512 726dc6a3b8847ef11d581dddf99c6b751d9585a501913a287199291fb60e856feb79b40cb8a86c559cd69698cddb21806565b2fbcdc13e157b420cfc2905adfe
+DIST rust-1.85.1-s390x-unknown-linux-gnu.tar.xz 224750504 BLAKE2B db2023f89b3298adffcd9c0f53dfbf7c26e5ecdcbc0640fbe54db7e69247871644a50916778c9229a25f86ded2fc3a72e62e51dfc16a63f96dee9d210b687c71 SHA512 243115b334939371562a0e57080c57642610646a5d4632bc016618b42be20077a3593ed64d56cc98a794f010cf09817548d40d6e9c0d27bbb6feef02dfe0346b
+DIST rust-1.85.1-s390x-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 7d8addceaf42c9506955d145be6fa2d64491f83839e1d82aad0a5f943917b8e8f7c1aaa4e5342128d1c37bfa2ca206fda5bcbdaf86f787d360d0b6ed34271675 SHA512 aea826ce0b42e3630ba3184ebb8182bccbf8175339718981979e28421d3e1d0634d1b70678955fb16d26db79563bb7b5bd8ba247b761d48df1f0cd62f0bf58da
+DIST rust-1.85.1-sparc64-unknown-linux-gnu.tar.xz 73939080 BLAKE2B 66370a754c333f73c15d71a2c6847b01a31c553de94764746e08da044d260ce2d167924626ae6963024031d147572096f831ee7179066c6a1df42f8a88556413 SHA512 512081689d9158af5c985f2f60fb8b4071a4d696e2a0ada62cb7e5ae0f6adb59240761b45b93d723fd524dc917a0dddda1b82cb4f5592195cda020d0d301566f
+DIST rust-1.85.1-x86_64-unknown-linux-gnu.tar.xz 182566732 BLAKE2B 8c776fcb1a2f9c7249a97560b555051927cdfc38cbee23e93bb754c3929a674ee83eba8d899a23310b0945cedf57acd926fe3aabee131fec91365c02f4fbca2d SHA512 00ccc4feda5043f44193ad151333b40bbed2ef80eefd18c5ba257d9752453002b7eea01ae62b328806b5c8164813099274aa9b7e2f60acfa7fe4f5704b5c884a
+DIST rust-1.85.1-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 68d7bf6ddcfe5dcc25c857be305e650222507bd6015b24611fe983d85be48e38b4e3529db72a41ff13d1e3331a7138e86ff4b56a8344a1e459421e9555ed14c1 SHA512 792520a1de8c9b6ac6bc12e74a1182dd30edd8668d0c6fa5f3709bfa6ed3981eb378f079794459caf4e9fd982b71ba0296a7e515f56e5ac45cf7925e7cc296c7
+DIST rust-1.85.1-x86_64-unknown-linux-musl.tar.xz 262611472 BLAKE2B 9f6efc6ae4bbe97469bbb80e3d6fbb74a4ad63142af150d0c1f8867cd81f9a2b41f96787408681b79ba7b37b1b9f0d67089796eedfee5f0e228a30bed441a84a SHA512 8f3e60a6d83ed0ce0d31967707ba51eb7b9a8b2fb981b37aeb03ef4142965c3086a21768b08b4f26b81edceb7eecd10f83bd76e5c7bd12030774d916ac5a45c4
+DIST rust-1.85.1-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B ac25b4ccc84cb0c06708c7164b0a7b926478b3794683e2ca5e1de26a17b5098892c8633c9b8b8cde18040d2c6f195941b9093162594e39c04dd3b0e4a45f1204 SHA512 0df04cb4bd584efa1f6a63649ddc44bf4a30d018a2b60ec83b6defe4c25bfd8b61c8acb6c93783e9d110abc114be859542116d45b3087090f88743761149ad6b
 DIST rust-1.86.0_beta20250218-aarch64-unknown-linux-gnu.tar.xz 241961984 BLAKE2B 9553edf94165922470e138a62f2baead6e04aaa81384d22f5b6628462a1c5bbc2387fff5ff05a9efbb81aec5f28301f94d3c9b53899e80afc7997323dd44e089 SHA512 c846832d71d7203759749d8e3aca6c718b91b7e075e02a0a0eac71302d5ed2e23a23c611efc93c3dedec26e9e8931e819eb1d9fe757e9c7b51a6abc1cd6f0598
 DIST rust-1.86.0_beta20250218-aarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 0323dc2fc992e29d8619978d560c888f1873df3b403a7e2a25ab06ae5979d2eb6c42481612f9fcf0b5e435ede3735603d8c1eda733e0f3523b3bddb055d6662b SHA512 f17268a0c2b6568da4c621c23a2b43f2645a3cf2355d4eb7af22be6c6b11df23053eed35fb891f7bcaaff0400910bb7d0e7749d87b0541c401b8ece37d994c90
 DIST rust-1.86.0_beta20250218-aarch64-unknown-linux-musl.tar.xz 218887600 BLAKE2B a2be264a1d7c9b78209484d175c959278a9b9596a1a917c1033d04061ffa42d3e1aac491ea02fef1d5d2c3642be72ca04c912f581a5fdcf216a9bd86b3567d3c SHA512 d391a7cb96dc34cd95b862c888d7c5fa199de6924726c3e5b82de96296e890913716083b11f9e7ecb153531b07bc98fec753be4d94cbc57f27c7bff4f31db203
@@ -549,6 +586,7 @@ DIST rust-src-1.83.0.tar.xz 2998424 BLAKE2B de758c5bfb29865a3ab7ab02d17b0282272f
 DIST rust-src-1.84.0.tar.xz 3016148 BLAKE2B e948d4edb88f81ecfb49f56a3ca6331c4e9de17bd9f56af823e1cefdc5098abebc2bb013d7c12ca1713a43fec588f33befcb7146713eeade1511914f70146d62 SHA512 ccb45d57c7cdac311478a5b4689144297717e6404f9c4fb168127804f13f72c15433b32765f90ce56e6f34435229e754241cb3656b28a4b33c6070b6f79b7c53
 DIST rust-src-1.84.1.tar.xz 3016012 BLAKE2B c9edeaf0797a22e384c54b3fe3e7c833464c09f8828474e05400a561a369d836626387caa495689e4b14fad691a85d6859098c84347211a6f79e2ef2c8d9d6f2 SHA512 564c440a05b67fd3a5dcb4dea21800d32ae65ca12230b804b5efa4bd468fe1b185bd7ed89041782018f70f60afd7554d7755edbe20e9cdc930a9fad390deb317
 DIST rust-src-1.85.0.tar.xz 3036988 BLAKE2B b7281b23eef60cf052e1641a29915c02c590166a73e5ae75890072ce80f95a2ab71cead3e3da7adf757ec0352d1dcc87ba4c3070282a27657b34420fe24a0c16 SHA512 613cfa603dc457cee34b154acef9573d766ce5757c9e8342b13d362f2e62b4cee47071a59df9fd5fa42ecade1a9efdada5784402aaf7254d5996558533bff8db
+DIST rust-src-1.85.1.tar.xz 3036412 BLAKE2B f137ffcebd2d231d8b3dc5c9072f6afe39a071bc9608ac468bca364fafaa9c277b91e40da870a083c802cc13b9b876a548d7fa8ae67ad9552321a7412b7d8cd8 SHA512 d230cbb1daae3e2f5168abef94c5b99fb118c34a980f018d5df3e43f6ead4e0a17d6ea29bcfbcd0fb745e215f7a4d0282a99a714dba77b98a16254bb27c2d2ad
 DIST rust-src-1.86.0_beta20250218.tar.xz 3035860 BLAKE2B 506df30188382d43798c6661a8b730c10a74a230bf5ceb7c04f2892f14a45630182ee174f79b564dc5a6dd8e3bc84963b8391fc9641efc57d0ed90e69b89d545 SHA512 4c7cc4d1860f7d97f615ff5dc030754a7fb72d1eb47b27a2e25dbb5a9b0326b8a1b82b6b60a784da910c4730d3b728bb27e1d27f30dabdb7e455143550f0c424
 DIST rust-src-1.86.0_beta20250225.tar.xz 3053616 BLAKE2B 19abffb74a9926c73fd112589be340b2955e3117d4344f4185de08899be5a5ac9835395e601224f21e63fa0f91053fb39ca02e98a6442570dd54c6b0a39f85a9 SHA512 57b8eb0fa06e5ee37d89ee486375b7022d2085fcd88061a20c3e8406c312fa912bc0b52c9259bb3682bbba1e2ea4b044eab9f9ae66262a67c19657033fe918e1
 EBUILD rust-bin-1.71.1-r102.ebuild 7569 BLAKE2B 6a90be3ab0cd5104b2ec5b9dca4f75b806cc48576f27a3cb84475ce4c8c6b7eaaa09a090d2f203675835b4197bd135491449278a2f8e1f65d34a5b0151c65174 SHA512 f9e1aad059225a6cb45d88c733c6c58b12db1cf046171c9be59f39b7904013b1a67b949bf8bbaa8285b20f7f45037b29a11ffc99e24a087cc9f19f93b25aca1d
@@ -564,8 +602,8 @@ EBUILD rust-bin-1.82.0-r103.ebuild 7796 BLAKE2B 0deef6089e8367ecd6d00bedf195e89e
 EBUILD rust-bin-1.83.0-r2.ebuild 7778 BLAKE2B 1c5bbb409a74d5d4c80f41cc909635e0c8eb6d8ebf83388c56216f5f5be5cf8c99ef719154a2091508620bc7f765b5098b86ec2a9a31f89fef22a8c563d4bcf1 SHA512 4bc009b4bd35c828eed84e1ed645ce7ff097ffbe03feb3b8d2350b895d9147f1925ff48423a4a86efe5747fc2d83398b17fd446c4f86b945295c2656e8d9cba7
 EBUILD rust-bin-1.84.0-r2.ebuild 7785 BLAKE2B 3c77531f6388de3063f4c34b7fdfebe6f1806fc8e9e4546ef683aa53b9754baef480be52ef08ca84f139312f8d620d2632be8ade920f006fe24386e1a3fe2a10 SHA512 37639ee057c9ac217416e9bf09e32be3f8436ab280a5afe7b7510b8e1efddc695a6ddf800661d382760320850ff101a6e214c686cb8b48c58aa5864233727862
 EBUILD rust-bin-1.84.1-r2.ebuild 7778 BLAKE2B e00b6cda1cbdc70ad3b33ae2625df528214e0975f5e12ec07baec5808eeed6e1de01d34334875efd9059fa3084b699c469afe4e4cec50e43bb5a1ce6f291d51f SHA512 b996e931d7fa1bf7b7c2984316c6cf7f512cdc13c20c059db8bf55621a88140b093961777b2cee6429fa0bed0b66fe8fae8468afa130da0dbdd160c352d33a99
-EBUILD rust-bin-1.85.0-r1.ebuild 10842 BLAKE2B c2f2fe8b83e74402ea3064d4b1a9ee195b43c3f7762a38a77215e5f13df30acef8f0699692c7260f732147ea969bfef41f592a2711522213fb087691085922bb SHA512 54508d439129bf47dad37ad70169fabc102c86f43626f8d8bd390f458924193ed72ce8463a3887af3cd5d78bdbfdb16a9977b3874779cf56c8d5adaf3925cbb5
-EBUILD rust-bin-1.85.0.ebuild 10809 BLAKE2B e55e9cf45d34ba2369e9fdb5b8ace0efed19d897ef51fd68550e12e02193a55309c8c320e6c9f2704635d58a458dcdcacb1521449cc47622d40d67e6235f6e97 SHA512 37a008f404b5fc4f7233d3268a1e7c764c5c4ec30f7d27a839f0a9f64093b0a24a95284044b0b0b9c83615d29b3da0bb09da6cbc391a59709181aade8b8f30c3
+EBUILD rust-bin-1.85.0-r1.ebuild 10855 BLAKE2B ceb4cb4039ba3120962ccc0cd36cf9964925a0dd53b48e4c7532cdf5b36f864a3bbb2f1a64ca532b7e24e0b4651d58e957036332ba138b871c876c2198f46abf SHA512 aaee56b5a800b25ec016f34413ecd84fe2bca179d2df11a8909d32a846528004a7e40dd32b7c53aa821b4747556ef13e7259c38bb1030960503601b8e3ad4563
+EBUILD rust-bin-1.85.1.ebuild 10855 BLAKE2B 5b78dc491547ebdd31a00db0ba489d7f435f3e2398ac632da90e04762af6815731bb5aa761a46228c20e9649672144eab7656fe112f56b44f8b1b596e7198559 SHA512 ff3300ed97ab618276072416c746f1317decfc0dd37741d647e32107756c507e9b841f055ad5d2d3019c6efe366ff38a405597965abd22051242a0df888851a4
 EBUILD rust-bin-1.86.0_beta20250218-r1.ebuild 10831 BLAKE2B 6676174f4042a57ec5491ab76c7289d9c6d327be0384446a92e38ae002c8687be6006c29ca1daa2fd8d5da022e301ffc54725bbab1bc6279c7e729f17d6147cc SHA512 a7ecaf5e566dd65d962c2ca8b8659e00bc1430263e7298929d6d581638fb2af731d9e5247341440542b80fa6164fa81b7408619067099ff9586dae921c4a7600
 EBUILD rust-bin-1.86.0_beta20250218.ebuild 10798 BLAKE2B 671d50e2ffcead1bbb5731ae3a78fd5d688b3070885ab8ad20a39a7b5b0db4e3c8b39a4651c03b2fc15b4ba662c227ac65a1cb0a7cb894a7f1b9c128e0005267 SHA512 116b3e538b32f80472e7966db8f9c6253571eec6a403146632b322cd0d4f6dd1571f1d83f47afb644ff594ca50d8325ff05093b0cae4d794a14879869cd87a26
 EBUILD rust-bin-1.86.0_beta20250225.ebuild 10798 BLAKE2B 671d50e2ffcead1bbb5731ae3a78fd5d688b3070885ab8ad20a39a7b5b0db4e3c8b39a4651c03b2fc15b4ba662c227ac65a1cb0a7cb894a7f1b9c128e0005267 SHA512 116b3e538b32f80472e7966db8f9c6253571eec6a403146632b322cd0d4f6dd1571f1d83f47afb644ff594ca50d8325ff05093b0cae4d794a14879869cd87a26
diff --git a/dev-lang/rust-bin/rust-bin-1.85.0-r1.ebuild b/dev-lang/rust-bin/rust-bin-1.85.0-r1.ebuild
index e37377ab23b7..f76a83693d43 100644
--- a/dev-lang/rust-bin/rust-bin-1.85.0-r1.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.85.0-r1.ebuild
@@ -173,13 +173,15 @@ patchelf_for_bin() {
 
 rust_native_abi_install() {
 	pushd "${S}" >/dev/null || die
-	local analysis="$(grep 'analysis' ./components || die "analysis not found in components")"
 	local std="$(grep 'std' ./components || die "std not found in components")"
 	local components=( "rustc" "cargo" "${std}" )
 	use doc && components+=( "rust-docs" )
 	use clippy && components+=( "clippy-preview" )
 	use rustfmt && components+=( "rustfmt-preview" )
-	use rust-analyzer && components+=( "rust-analyzer-preview" "${analysis}" )
+	if use rust-analyzer; then
+		local analysis="$(grep 'analysis' ./components || die "analysis not found in components")"
+		components+=( "rust-analyzer-preview" "${analysis}" )
+	fi
 	# Rust component 'rust-src' is extracted from separate archive
 	if use rust-src; then
 		einfo "Combining rust and rust-src installers"
diff --git a/dev-lang/rust-bin/rust-bin-1.85.0.ebuild b/dev-lang/rust-bin/rust-bin-1.85.1.ebuild
index 29341043072b..614b762194a8 100644
--- a/dev-lang/rust-bin/rust-bin-1.85.0.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.85.1.ebuild
@@ -22,7 +22,7 @@ elif [[ ${PV} == *beta* ]]; then
 else
 	# curl -Ls static.rust-lang.org/dist/channel-rust-${PV}.toml | grep "xz_url.*rust-src"
 	SRC_URI="$(rust_all_arch_uris "rust-${PV}")
-		rust-src? ( ${RUST_TOOLCHAIN_BASEURL%/}/2025-02-20/rust-src-${PV}.tar.xz )
+		rust-src? ( ${RUST_TOOLCHAIN_BASEURL%/}/2025-03-18/rust-src-${PV}.tar.xz )
 		ppc64? ( elibc_musl? ( !big-endian? (
 			$(rust_arch_uri powerpc64le-unknown-linux-musl rust-${PV})
 		) ) )
@@ -64,7 +64,10 @@ RDEPEND="
 	>=app-eselect/eselect-rust-20190311
 	dev-libs/openssl
 	sys-apps/lsb-release
-	sys-devel/gcc:*
+	|| (
+		llvm-runtimes/libgcc
+		sys-devel/gcc:*
+	)
 	!dev-lang/rust:stable
 	!dev-lang/rust-bin:stable
 "
@@ -170,13 +173,15 @@ patchelf_for_bin() {
 
 rust_native_abi_install() {
 	pushd "${S}" >/dev/null || die
-	local analysis="$(grep 'analysis' ./components || die "analysis not found in components")"
 	local std="$(grep 'std' ./components || die "std not found in components")"
 	local components=( "rustc" "cargo" "${std}" )
 	use doc && components+=( "rust-docs" )
 	use clippy && components+=( "clippy-preview" )
 	use rustfmt && components+=( "rustfmt-preview" )
-	use rust-analyzer && components+=( "rust-analyzer-preview" "${analysis}" )
+	if use rust-analyzer; then
+		local analysis="$(grep 'analysis' ./components || die "analysis not found in components")"
+		components+=( "rust-analyzer-preview" "${analysis}" )
+	fi
 	# Rust component 'rust-src' is extracted from separate archive
 	if use rust-src; then
 		einfo "Combining rust and rust-src installers"
diff --git a/dev-lang/rust-common/Manifest b/dev-lang/rust-common/Manifest
index 9e317733bbf3..73cedecfa66f 100644
--- a/dev-lang/rust-common/Manifest
+++ b/dev-lang/rust-common/Manifest
@@ -6,15 +6,15 @@ DIST rustc-1.83.0-src.tar.xz 353808388 BLAKE2B 217c85f7351a7c57a2684da2c7c81a320
 DIST rustc-1.83.0-src.tar.xz.asc 801 BLAKE2B 3bacb43d50ebba579dc2d4f1726298a7887e303e15f039ef72b840e30d90bc2cf9cdbe4617a9ee113a2b1a48f1982e72cf30323d72cdfb9a65b5b4d734ca0024 SHA512 84b252ccaddc06cb05858ff64f582dd25823818c81b1e3a00362deeda06f09e6c36948fd316d5f0ca5e24949e6f99bb14a14dbd2af1cfbb85e679e27ab0a813c
 DIST rustc-1.84.1-src.tar.xz 355078168 BLAKE2B 849e8c909493bf76ce9749b9dcb1967180223b91a41d690bc477e78557d4e24949c9a8d8276d824af8c54ad62bc4a998e7a8efbc0bbd2008a4f64f51a7690d48 SHA512 f1cc4765736551508408126e44086988e8ddc30c1a929bf7b61c6be85ad0d65928dd5fb1041cfaeee8eb37d2208f2c1917e276aef2bc9a8e40e34f6713b349e1
 DIST rustc-1.84.1-src.tar.xz.asc 801 BLAKE2B f3decd3470fd1eff33adbb376490a30eb8db28dd4176bde0fefe4f60acf79c3dd0e1a330d519b5319360136ea7d0a124f6720dea08617202d9e9298da992ccf6 SHA512 a241fe3efba293f3e872b74f09dd0d184e0239afd1416326d57bf1134d92721c65b187f5c99962b51671877a539f18e82d2d797c76af42615c11a8bb3905f796
-DIST rustc-1.85.0-src.tar.xz 274011696 BLAKE2B 9cb1c5b9fa9b0ee8a3150d634b58f4d14c38342f19cffbdcaa4e783150f9b3c516763d549d9998d90e11377cd59e9d9442a99079aafccdc005739b075574447a SHA512 3e9c933d1d9b6e5fb081837cf07eb1638b1a6b4fd1cb607dd860c5021ba7b521edbaf8ba0fa8f182f62178b72a3e1a3e6b26675e8fb6530871137852a074443c
-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_beta20250218-src.tar.xz 280540916 BLAKE2B ed3fe1b1ce392ffd264dd78c00e43b478d14c6bf9bc7120aa484c46a72ff904abf3ed1d1d539828a22071997860d186ecf9d5d4abed25f14cbbe0068dee06a5e SHA512 bd8982d6adee08e0b39a58786741594e0c651cd107818178aca0ded3c3272239be3c4f0f6b617679bc8b1cea67e4b5924d6bb1ae8a9d5903fb77245dd8ac528b
 DIST rustc-1.86.0_beta20250218-src.tar.xz.asc 801 BLAKE2B 8a7c489f9087342074262c64089922b97e886aa6d3f89c2a0ed1185e084c8bed07d57c363608f26536ca884d764aa43e3ade214ab4fe4e67e9c6d7e1338e93aa SHA512 d34b536200fdb4c7e85af005b1753ce88f32a1faa418a01de21de992679d744ec396fd0f9aaaf851569de1f4f06f14a6481b68b1378659b3475d30818421ea3a
 EBUILD rust-common-1.81.0.ebuild 1442 BLAKE2B 2fca9110584bab02d27116bb7384ef4cdc0cc42323b469473f76fa09bd15fd4dd24a4597769d453d12c8e06b4305614d50120099feaeb142c2aafe29dd610348 SHA512 b948bc84b48deb6249c61d977dde1489374f5e0df679540a254ce4211f148eb5fff00fa4970bc63a07d4d08328fa821cee1172c388ddd8b48c1c0117a1c0259d
 EBUILD rust-common-1.82.0.ebuild 1442 BLAKE2B 04d044c0a244ce4e62fd4a8ae096c29c1972677e61ea3c8dd267817deafcdfc305087dc17b021e82376f96888d2374a9de774dbeb6067ee335a2f41dc87918c3 SHA512 279e84b9fba7fcf68c7b8666882411dff77d056258f8e315c141b736a910377bec28020d11fe09ec42921ddeb746e34cf2b8ef3f0503d4578cd8faeb416f257e
 EBUILD rust-common-1.83.0.ebuild 1442 BLAKE2B 04d044c0a244ce4e62fd4a8ae096c29c1972677e61ea3c8dd267817deafcdfc305087dc17b021e82376f96888d2374a9de774dbeb6067ee335a2f41dc87918c3 SHA512 279e84b9fba7fcf68c7b8666882411dff77d056258f8e315c141b736a910377bec28020d11fe09ec42921ddeb746e34cf2b8ef3f0503d4578cd8faeb416f257e
 EBUILD rust-common-1.84.1.ebuild 1442 BLAKE2B 04d044c0a244ce4e62fd4a8ae096c29c1972677e61ea3c8dd267817deafcdfc305087dc17b021e82376f96888d2374a9de774dbeb6067ee335a2f41dc87918c3 SHA512 279e84b9fba7fcf68c7b8666882411dff77d056258f8e315c141b736a910377bec28020d11fe09ec42921ddeb746e34cf2b8ef3f0503d4578cd8faeb416f257e
-EBUILD rust-common-1.85.0.ebuild 2243 BLAKE2B 554160cc1aab204f2102f1925cf5709e60f09dacb098f8f78e007b1b443fe26d6ef1714e6b9eeae33bfd50873f7f7dcb3435ad6431098479310da2752b39e6ff SHA512 8fd4d239e68e534c432e8f260d7e30a22a0a6206563c7baed353473564253197a1ce9b778da53b4c54be31913aebe0e66f770c2649b118ff5c8513c27e874b08
+EBUILD rust-common-1.85.1.ebuild 2243 BLAKE2B 554160cc1aab204f2102f1925cf5709e60f09dacb098f8f78e007b1b443fe26d6ef1714e6b9eeae33bfd50873f7f7dcb3435ad6431098479310da2752b39e6ff SHA512 8fd4d239e68e534c432e8f260d7e30a22a0a6206563c7baed353473564253197a1ce9b778da53b4c54be31913aebe0e66f770c2649b118ff5c8513c27e874b08
 EBUILD rust-common-1.86.0_beta20250218.ebuild 2243 BLAKE2B 554160cc1aab204f2102f1925cf5709e60f09dacb098f8f78e007b1b443fe26d6ef1714e6b9eeae33bfd50873f7f7dcb3435ad6431098479310da2752b39e6ff SHA512 8fd4d239e68e534c432e8f260d7e30a22a0a6206563c7baed353473564253197a1ce9b778da53b4c54be31913aebe0e66f770c2649b118ff5c8513c27e874b08
 EBUILD rust-common-9999.ebuild 2243 BLAKE2B 554160cc1aab204f2102f1925cf5709e60f09dacb098f8f78e007b1b443fe26d6ef1714e6b9eeae33bfd50873f7f7dcb3435ad6431098479310da2752b39e6ff SHA512 8fd4d239e68e534c432e8f260d7e30a22a0a6206563c7baed353473564253197a1ce9b778da53b4c54be31913aebe0e66f770c2649b118ff5c8513c27e874b08
 MISC metadata.xml 324 BLAKE2B 25e471eacc689a8af7e0251146bf712b020a10d55e3cb48285f174996ec66db8bbd146d4737db15ac3b2abf3e1f0415277b9bdca84d94f9b08a56e9242a4fcbf SHA512 723c102ec7017eeb72bfd6f37c16e2705e61bb626a93e5127eca2275a9367cefbccdd846fe8a699bc1192ae52cafe236f3fb6261fa6db361564b34880a9db2fb
diff --git a/dev-lang/rust-common/rust-common-1.85.0.ebuild b/dev-lang/rust-common/rust-common-1.85.1.ebuild
index 223c50f26f33..223c50f26f33 100644
--- a/dev-lang/rust-common/rust-common-1.85.0.ebuild
+++ b/dev-lang/rust-common/rust-common-1.85.1.ebuild
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 3d5d9296335a..b277c7ee8476 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -50,26 +50,29 @@ DIST rustc-1.84.1-src.tar.xz 355078168 BLAKE2B 849e8c909493bf76ce9749b9dcb196718
 DIST rustc-1.84.1-src.tar.xz.asc 801 BLAKE2B f3decd3470fd1eff33adbb376490a30eb8db28dd4176bde0fefe4f60acf79c3dd0e1a330d519b5319360136ea7d0a124f6720dea08617202d9e9298da992ccf6 SHA512 a241fe3efba293f3e872b74f09dd0d184e0239afd1416326d57bf1134d92721c65b187f5c99962b51671877a539f18e82d2d797c76af42615c11a8bb3905f796
 DIST rustc-1.85.0-src.tar.xz 274011696 BLAKE2B 9cb1c5b9fa9b0ee8a3150d634b58f4d14c38342f19cffbdcaa4e783150f9b3c516763d549d9998d90e11377cd59e9d9442a99079aafccdc005739b075574447a SHA512 3e9c933d1d9b6e5fb081837cf07eb1638b1a6b4fd1cb607dd860c5021ba7b521edbaf8ba0fa8f182f62178b72a3e1a3e6b26675e8fb6530871137852a074443c
 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_beta20250218-src.tar.xz 280540916 BLAKE2B ed3fe1b1ce392ffd264dd78c00e43b478d14c6bf9bc7120aa484c46a72ff904abf3ed1d1d539828a22071997860d186ecf9d5d4abed25f14cbbe0068dee06a5e SHA512 bd8982d6adee08e0b39a58786741594e0c651cd107818178aca0ded3c3272239be3c4f0f6b617679bc8b1cea67e4b5924d6bb1ae8a9d5903fb77245dd8ac528b
 DIST rustc-1.86.0_beta20250218-src.tar.xz.asc 801 BLAKE2B 8a7c489f9087342074262c64089922b97e886aa6d3f89c2a0ed1185e084c8bed07d57c363608f26536ca884d764aa43e3ade214ab4fe4e67e9c6d7e1338e93aa SHA512 d34b536200fdb4c7e85af005b1753ce88f32a1faa418a01de21de992679d744ec396fd0f9aaaf851569de1f4f06f14a6481b68b1378659b3475d30818421ea3a
 DIST rustc-1.86.0_beta20250225-src.tar.xz 280546668 BLAKE2B ea1956a83175a2cda21b6ad1ead38d8d0f6c95559d2e329bf0e4ca13d0ff6562d017d5bffbb57f9d6d232b1f87f3d190718bc0b90c6938b06763526fac083ada SHA512 782fafa305b8766db3d23796014a5897470988c9447baf4bee35d98b90382b5a727d0aecc3dabbdab0f82b6d862def8be23d8a6cf3d98cc96f18cf4a2bc38f66
 DIST rustc-1.86.0_beta20250225-src.tar.xz.asc 801 BLAKE2B 517f8d88edc1ef4ebd25d66a1be4f37718bfa361f8ae1001aca85ba626dacfef6ae27a327f33dd1ae9db7e57a91eab2d8bbfe910b5789df0998dd18026c75726 SHA512 50e3c85b7c6a7f42e094e63f4ee554d2d944a8e153ab5dbd1c2a09a1f44c6ee53cb1c4985080a373c5cb09681bc5b987e8a8e2f56a0a0053ccea99f22dc92986
-EBUILD rust-1.71.1-r101.ebuild 22398 BLAKE2B 16a62b7042971b2a653e078cadc701e597f8cdfdc0d9381502e1a6763c7752c86d735e7ae5a6c69630a21f3b0b964d7f291640458dff0055d052a0ca0e99ebf0 SHA512 d58ebb8d7c8bd40ad91416993fb0aae63b60406b2ac7a21c2b434d45ccc2cfa38090e311084336580827a1e5d545deb46545c8df4b2b389cdbeac2564eb09c79
-EBUILD rust-1.74.1-r101.ebuild 38047 BLAKE2B 2c7e55c4b16b4ac990423970942b0d0344b2a41e9b68590112a734a7170a824054066da09315c9e647ba76c5f7fb6d192320113705c10bd789e625df70b60d5c SHA512 e3683ca91e3efbe3ca7bd3611834d1d727c5b13a4de1b5f2f34f8fa6780af2d96fc1a48dde6d2eb1d38910bd0eba037990a9785b5eedd847a22e60f1792bb0e2
-EBUILD rust-1.75.0-r101.ebuild 23941 BLAKE2B 1a19ef8ee5b2dbbf2f5758a3b249ad50753e0e69a8b45f008f3ba588627a9ca0760254ed9d7e5594b3a18931f73b70e3f5082a32aa05f627c0bcaeb2bc2eb138 SHA512 8caa84f0c16a39a3c67a9eda9d00e963a20c7c20e9b3dc71dcf164dd7528624adb913b22c3b9e228ebd28cfc6d8c8080bb0d5223ef68e9cb5ba3074d84f68ba8
-EBUILD rust-1.76.0-r101.ebuild 20449 BLAKE2B a05002c2f08e2705563cdfbbac2d39069282c4034087be5aad0631177c91bea90f03bab97e21006f1caa8ff98d3a146f395eac56b204732f0768944d7231ed5d SHA512 b497de82c830a225bb2cf897e04126034427544e86011f4a7367168b7f398d19c6f53b9384fd47efc78d523bc90d47cd336787c177e1361304efc80647d7356a
-EBUILD rust-1.77.1-r101.ebuild 23905 BLAKE2B 4112869889591b4b1dce8aecdcfcfd2c126235579b7e005cf6c556d554cebca16ff02731f487200c9d2b2522862071e160374608282ced7bd67333fb429ee4c3 SHA512 7234e384761ab82c0543e6f8be826ce3af1ad4a005595e7b613de066d9b213e81106f98dd42987d63608fd4a0f9200d513fede9e09bc4aaf8b36b10282819514
-EBUILD rust-1.78.0-r101.ebuild 24140 BLAKE2B 46645080f001be5cc4ff55578a6914a0a1a4c1cbac14e3fdef2375343becc002e41e288c8323673bb54291285f2892e50d6a8dbbf5973d59a5d6561d71482b88 SHA512 e9721c42fa937d1f0c0b0f13f8400ea4882a03400c0849dda2c9c1ab712077a673d44725813a40c0f8d76fa7f57c0ae2f5b71313b03d995c444b0894e6a89df9
-EBUILD rust-1.79.0-r101.ebuild 24140 BLAKE2B 84ac91990973405151c22bce62062270b96cddb9acb9ff596d05371d2cf78c8fd5d82b7e3f94ae68d137bf8aaaff29ff6fface78a25b95cc5380a0bea1f1d42d SHA512 e5bb89600df62cb000339c9d47cad713eee2002e57c44fd34e64a7d8f36427f15626205cfab3169fa53fd8a31a8fc7cb859ddd66e77a96186b419e481e8f8e29
-EBUILD rust-1.80.1-r101.ebuild 24012 BLAKE2B 5a8cdfcd1fb5553e6dcaaa98a5d817dec02b89356afea474d794f8c42dfd6b72bdfb63abad412f796939e493c6164da154db5d1f6bfe2ed0f1783a26cb7bb931 SHA512 657da54d0ccc0169e3ee4cc91b00383dfdf96049e5262413d77d881c6c04052fd83686207bc732ce2a680e31a5fd8bac6453015f8ada40f501e21ab6d081f45c
-EBUILD rust-1.81.0-r101.ebuild 24209 BLAKE2B 426b068e2682c88340de00e42891cb5f75e5a41dd6c902168946614bbcebb6f394872002014f2ff8fcf6c908d1d59b50fdf44bf3ecfed5da9608746d18af6dbd SHA512 461f02f3b3483cc9034ac0eb0f1be24ccf05919af378bcccb81fa06ac51bc37df0cd9d71b7c7117b326f228017bbd9b9cac09f2a02ab1c449510980c96516843
-EBUILD rust-1.82.0-r102.ebuild 24404 BLAKE2B 11d53de161ab3d656724c8fb4f32050abd7e4322dcc1046702f8b00fcf19fbe7ce7478fe94deb29c67c3a61bde92842aabe62e14005a0eec88cfee8b6647efdc SHA512 88d9e75bd72804b385ef651d268171e3dda6075e84c7591e7295089efe0ee864cc36ac98bb6c193eb17b2ea3e161972ecfe05f24eb03cbc943968dedefed1f17
-EBUILD rust-1.83.0-r2.ebuild 23637 BLAKE2B 4f015de1734b0ea942b0c6e3ea72815a5cb9608fd4e9bb59d81952f749cbda6e4bba700d503c5e5aa6a39cef72884dfac29c15eacee5b31118511bfefa851402 SHA512 c20809d2eceff7d7ed764c8082013fa7687ee2644eb6c6b10de220d62ed6fca85665ded9173c17507a933ada04ea40f2a999ebd9c3252d4ef484eeb674dfe8d0
-EBUILD rust-1.84.0-r1.ebuild 22248 BLAKE2B e10d56d1b712b1ede57ae72d2f97e29e7084721019d1541c4454230ffaaa0116117b5b6f7ffc393d09f4e6e03cf96ba9e73583b84f4cdc371d5328f2dc14ee04 SHA512 deacba9fc98a02d9ea6d8c50fe2ef5099e60a69bad562421adfac1810cbfaae95dd7cdbcf2ab23c8f89d3321b074904a4279469825b22856fded0d0f6bacadc9
-EBUILD rust-1.84.1-r1.ebuild 22226 BLAKE2B 3bfd5379730cec0805baabb40b4d6dd018ab30cd47b597a8a8e21be3d920c898c6c747224880f6c8017e2e1f325a56551162d96983900fa15b0a6832f8c7594b SHA512 b5ec38df4a093732e0c6bb6bef6c69fa8e92f133bcd76055105c4b503b4b2a94664a2e1a993a4ffd5c405183b1ad55a97f184ad6e9783a22712946ef68b0e9d0
-EBUILD rust-1.85.0-r1.ebuild 25359 BLAKE2B 47f020237a54c20c997ee279dbec95adf7b03c36624c8fc5ffc93a5e40525a57e0edc2ec0cf4ca30aa71560784bec64237694b58060e91897a7ca9e50fd8b75e SHA512 d6e901e241114911d80ecf9f04598b18e81dec53d12c50ae77afdab4c79998dcb92ecd463448c4415a1039f0f8bc61198f56d18ae69d0d34436b82fd1433edaf
-EBUILD rust-1.85.0.ebuild 25310 BLAKE2B f58fed6c72cd54bcc608695aa67554ab8def3887408f7a7b17ad5e36a7fb3923f196f5b072e788edef11ab5ea7dc8a7b1301799ca29db44649615af38d686844 SHA512 2d3f1f627a4aa666034dff412db54d3e75854769c9bdb04827b306cef8a309200befcf547b12e66b25b6cb9c0b0f7a385a98b92e8ad7262cc2b61b1f22529f8b
-EBUILD rust-1.86.0_beta20250218-r1.ebuild 25723 BLAKE2B 28a40759c53e52142d47bc9a1b4b25f8801c3a88339ffcbc345f5175ccab74262126c7671b2be4ca699ef4c9ab29166771b9997cf3d4dff840c59aed48b4fb28 SHA512 eed6f384a9d6a223367a4b0b0d92d3b4a01d29224bdf56648e402028cd3a4ac11909d35be5f72d14ddc0e089b2bc389d03a598e03d1670dc7e59a6b25661640d
-EBUILD rust-1.86.0_beta20250225.ebuild 25724 BLAKE2B af803ea989b27248fcbf9abfc732167cc3517f28c4ffcb508d9f4ed27d03f2ba532014630e3a65b237454c67e3ca59d744f7ab389df4cd47a3af4ea0c15c1cad SHA512 a57883420023f44fc66fea988105580e6869c7ad4287456b12c67bf4bd39d373e5e382adb5e372ed748126039a2161ac6055d6580f8eaef347eacd6e8262b992
-EBUILD rust-9999.ebuild 25383 BLAKE2B 9f91287f2811ae43470bf728bafd545920d4ce07ac3a58825d5e048c895744810b9ac7ebdbbfa6d5ba372552e4dd7468cd0035945143e73b983ace7489ef4cc3 SHA512 62f103ee68203346293d60fc43bf7eb02322d81d772f06f56d0dabaa8f73d2ea98d3c11d2602c5a79e8288939ecdebfcf8443bcb08ddb102d45d773ad19da62b
+EBUILD rust-1.71.1-r101.ebuild 22398 BLAKE2B 14f409fb8a8cd5bab98003e46778c6b08cebb1e52fd141ca55edab79e0d466dd680a7a09c6d607f87af1e7ffc995e3984b46f62a74164bdc3925dd5a4e866e47 SHA512 3c5a8471b73f392e4f3da8ad1ddc585a8e5fb0621fcb5cc6686ce228a88b0d01cc611f3836ec36173f28e6b5ff8e591b56254bb3a49ef9b874820c4f241b6cc6
+EBUILD rust-1.74.1-r101.ebuild 38047 BLAKE2B 635e4abbd3b4adb9c82c1ddc7554ee417beed44d0aee61df98255175083d98a9ba0a3f091d8a273da36f4f7fc0476d3ce46d760504a37c8231c73df445238cfb SHA512 8d7fa2a8b28211e6470b3f6a1a27aeec0d3c3f8e99420ca5996bf4e26d5012aab480e669632b4ca1736b8118b38722e5d324ee12cbe6558ff114e7a21fc4726f
+EBUILD rust-1.75.0-r101.ebuild 23941 BLAKE2B 2f4bab4676bf7d52fb03a0265b2efcae3ce309598009decb8609b69040eb5863dc6e767564bb457d933c1045afb8245b3d9f612920ffd72265ac09777b9a051a SHA512 a3a3a4c6ffa2e9fa8b4c3fe0f58b73ef7f08d837cfcbd3c3354ba825c432f7dd19481e668ef7228e18ba78cfd797267d8de45dcd4697e6204cb15bfd0287ca9f
+EBUILD rust-1.76.0-r101.ebuild 20449 BLAKE2B f9cbbc5df32370e246e3651fccd4c20b1ea095ca7ced8263ef92472558223d431deff5fbc40d77f9177ed25863334d9ccf1322ca9e56fe6a75ced6a2ac94c5e5 SHA512 3066945221ba5a29d20c549915df18f70a67621bd038ca51f1046f6ad4ddb1baaceb9e3f95130f2517f6319b3f17138186d7be8d0352af27b58ac0510daccec8
+EBUILD rust-1.77.1-r101.ebuild 23905 BLAKE2B 5c6c901805d2eee2691e34b2cbfa4ceac2b78ff5d5f9f23a4af0ba14583c8cf01ea8c3e200bba8eada3d4725fcc81d4c51cce0a122495175e25c7dd4e3ddc2a5 SHA512 50c96f971a49f41d68dfe224f5e67fef92035f206e750ac74757fc52c2ecb5319bb0bb6579076889e005b765473d2eac20dae6bf963659aa54035c76b35fb27f
+EBUILD rust-1.78.0-r101.ebuild 24140 BLAKE2B 2fc3649e119d92a29a8f9082861fa87f0788c30c0d1ae287c016c402475b96de90a720e5af8b089d2b7d2009917aad1e8d60a78bf8b024abed44853026145dd7 SHA512 0b5c3962e111f3d89dc10ce58fb0d98bd1a9533375ccbb96b561f672716c1f9fa10a449fab02c36e957bcf0d8d9d432568c09d9861692a78a9806b4b2e670228
+EBUILD rust-1.79.0-r101.ebuild 24140 BLAKE2B f2fe6d4c549d3c3f9204bca6ed264d5002ff5fe0eb098ba3cf1dde5abcf9bd787e4bf63003ade9a00a1f4a9f1be47a463b7cf94445483a3176aa1642f833647e SHA512 b84a614ac73a538bb030025f974bac09b226131c19646718f77dd042d040cec1c2bb35b43a7e6ca2f075df978c2efe3cb2b8d7bdeb4780efd9f3a0205f30c5e9
+EBUILD rust-1.80.1-r101.ebuild 24012 BLAKE2B af4e6fc7d9808ca8e557176e7f5249b69ab55e1e5ab50d340d215c79c0ea80a9b7329147e306956d0574c7a0bfaa4a8521a9c5f609c3cb0d3a0caae22d61ed4c SHA512 323415f9f12cc2b00aaa407606ef7f9bf87c0e0e8d1c20bbac1b85f57a59b436ea9146187e8e9c9b97901d47b53f5d4ec71881fe837fb586b586f9b242acc830
+EBUILD rust-1.81.0-r101.ebuild 24209 BLAKE2B 11af34b13f231dcfefb090200bf917e9033bb7ad7a1d569b9fc3ae416fb4e95d244b879d9b7bd8f07662f46f4e549734c957f86a91f3c2016e0344a7a787eb64 SHA512 95cad9fb46f341064a491a8a038a1e89619edab6828bb5fd8165c62eda2cbbb93100c2407027cac711fe1dcf667c79a83e0dfbc9d9dc767b48bdc8f3aed1ba85
+EBUILD rust-1.82.0-r102.ebuild 24404 BLAKE2B 8f40807cf5f02c5ff621cfc220dedb1e6f4266139b51a22e31cfd8fd8b1aaf19317f2331364c70f0489d4770321b497db258fc9d94770e04e486694d7382c4d3 SHA512 5f2825439e4363b9d83e379cc97a1a0133d4886875db06391f827b9e5e03ae83bcfa86fb309310f160db543fe647c4a51d94f16505734ddab6fce12e0fb93ab7
+EBUILD rust-1.83.0-r2.ebuild 23637 BLAKE2B c60d6cb5a7ab0be268648ac976040197de624d63e3935d89bfc946677860c6f8d8c41f347402afba3226f162f7c5c694834731fa343f9e83663d22fd3aa1aacd SHA512 2b0863f61d6dbab59893f0099df74f52be64f98355919e2f825ee67e79b8446cb414771aec8bb434f7dff52c500104d12c0876635489090f5a7e481bfc96d946
+EBUILD rust-1.84.0-r1.ebuild 22248 BLAKE2B 2905ea639293e16f92a1a15d7c476c1fd89a53f28d26b7e414c6f2910c3f14e6a12a9c74a702ade458bd330805a96e8011c24a2c3b381e23f61bf9848cb9de93 SHA512 17f671cae9f79cb1cb610f368c2bcf61470d26d4fbbc148772d9f4ae383dd28d890cf4266e474e600c6d19d66ee68ac2022f8407005f1ab9d0f7e7f6d609bc3e
+EBUILD rust-1.84.1-r1.ebuild 22226 BLAKE2B e10c8fa01d4ddeff4b121d643ee0a6e8866e52fcb520f90b9e3beca25260c10b58477085b8d6e95d704809ddbf9ab83e4cd2ba5e83f376d5080ffd5408495283 SHA512 8c34a3c20f64498048d6c46b54995f470e974b6289781af53c19d846163b53db4b0a3989f82fad5ba6661dac6d1aa4d180dfbcefbc947a5d8e108d4dcbd054aa
+EBUILD rust-1.85.0-r1.ebuild 25359 BLAKE2B a4e3081e92481315fb586536e5f8da9727107ff8c887e48b6cc402aefb1c5271b3f3fe9f07f1cbaf4779327ff778bfb5dd1249a7c532c9447a4b86157bb933b7 SHA512 7c5430e9de3d34c0eb2e07b75dd44f851f940826a1e3d3a955891bab0e69a040fe666cd13dce683d0cbc17ce74613c3cb52c0b1438263f5a9452ed487c752e50
+EBUILD rust-1.85.0.ebuild 25310 BLAKE2B 11f32ff0c8fdd276ec272deed54732eaea5c255c7695b40e49c451a4a41865c969b759df1bbc56b15c59f84380928e8d1e7a5771ec0739931ccfd5b4e54440c7 SHA512 f5efc2e1033b9a738913a5339a650418cb9cf01afd5156ba0db9495bd2aabc42d4758cee49fbdd999bf9d75fa03149ebd70be7a968bc7fba9da9200079be82e8
+EBUILD rust-1.85.1.ebuild 25359 BLAKE2B a4e3081e92481315fb586536e5f8da9727107ff8c887e48b6cc402aefb1c5271b3f3fe9f07f1cbaf4779327ff778bfb5dd1249a7c532c9447a4b86157bb933b7 SHA512 7c5430e9de3d34c0eb2e07b75dd44f851f940826a1e3d3a955891bab0e69a040fe666cd13dce683d0cbc17ce74613c3cb52c0b1438263f5a9452ed487c752e50
+EBUILD rust-1.86.0_beta20250218-r1.ebuild 25723 BLAKE2B abedbe347eaced0803ee3f9380ed3e596d9dd414003f6b2693c879b27741e998838f3ed01be86863e35cfa621969cbff6fb83308fbd43e93b93c82fc21a9357a SHA512 016a5887790379abc44dd0f255a1a2c6c72b5e10368386cfc37ce7f57225d402e74bda6fffd7b0777956eaec765f7dbbf95c15ee776a74b028b18e9adebe2c7f
+EBUILD rust-1.86.0_beta20250225.ebuild 25724 BLAKE2B 30d1ded795e903d397c9a419cb4730b744f3b0810afda47808b6f63e09ed5ebf09afe495c3c9079681e1cf298d8b113894ee07b3fdd50901d77f6fea2f415a2b SHA512 a2f3745de503edf376f37c1978ce0369006d65207598a35fb87b7176f0fb8fe613de02c52145b0965085665aa6b59c98bad61166d7c5258a07d0628ee140eca7
+EBUILD rust-9999.ebuild 25383 BLAKE2B 185b821fb069a9f8a3dc701166359fc00281b683ce265f7a28d2ed3d0ea1a37de9e34c62aec4d821a4751bb71e872e991e20d841c88d1673a8858223b4d0d1e0 SHA512 8bbff68b923b0b3c63b5416a43e3f038fd1f514c1025cfc635efeb09f1f0521c08c29b927077494df4130215ba03a3eb36de7bf79998e4f0272270aade5d5ca8
 MISC metadata.xml 1841 BLAKE2B 48a8167ae44a7f4892b917895298627ac920af6c488180980e65bdeec53b650455fc6d7dddad0a7a8257d473080082377fb6b6df6a834b294b6e6485e6784a1e SHA512 1f5fd792b65ccac89a61233004980d9f7cbaecea5d05f35f9cc2dc9cab4e3ccfcd46828e88770a1b8ba5ca23064b6a75eea72a0b32bcce52bb399b85ac95f755
diff --git a/dev-lang/rust/rust-1.71.1-r101.ebuild b/dev-lang/rust/rust-1.71.1-r101.ebuild
index ae1366fb5ce3..ec66165dfcf7 100644
--- a/dev-lang/rust/rust-1.71.1-r101.ebuild
+++ b/dev-lang/rust/rust-1.71.1-r101.ebuild
@@ -333,7 +333,7 @@ src_configure() {
 		debuginfo-level-tests = 0
 		backtrace = true
 		incremental = false
-		default-linker = "$(tc-getCC)"
+		default-linker = "${CHOST}-cc"
 		parallel-compiler = $(toml_usex parallel-compiler)
 		channel = "$(usex nightly nightly stable)"
 		description = "gentoo"
diff --git a/dev-lang/rust/rust-1.74.1-r101.ebuild b/dev-lang/rust/rust-1.74.1-r101.ebuild
index 3e8a2fb536d3..94eac9223808 100644
--- a/dev-lang/rust/rust-1.74.1-r101.ebuild
+++ b/dev-lang/rust/rust-1.74.1-r101.ebuild
@@ -399,7 +399,7 @@ src_configure() {
 		backtrace = true
 		incremental = false
 		$(if ! tc-is-cross-compiler; then
-			echo "default-linker = \"$(tc-getCC)\""
+			echo "default-linker = \"${CHOST}-cc\""
 		fi)
 		parallel-compiler = $(toml_usex parallel-compiler)
 		channel = "$(usex nightly nightly stable)"
diff --git a/dev-lang/rust/rust-1.75.0-r101.ebuild b/dev-lang/rust/rust-1.75.0-r101.ebuild
index c0b81f631aa2..a193ef225932 100644
--- a/dev-lang/rust/rust-1.75.0-r101.ebuild
+++ b/dev-lang/rust/rust-1.75.0-r101.ebuild
@@ -365,7 +365,7 @@ src_configure() {
 		backtrace = true
 		incremental = false
 		$(if ! tc-is-cross-compiler; then
-			echo "default-linker = \"$(tc-getCC)\""
+			echo "default-linker = \"${CHOST}-cc\""
 		fi)
 		parallel-compiler = $(toml_usex parallel-compiler)
 		channel = "$(usex nightly nightly stable)"
diff --git a/dev-lang/rust/rust-1.76.0-r101.ebuild b/dev-lang/rust/rust-1.76.0-r101.ebuild
index f6114fd34e18..c62b7eb8145c 100644
--- a/dev-lang/rust/rust-1.76.0-r101.ebuild
+++ b/dev-lang/rust/rust-1.76.0-r101.ebuild
@@ -364,7 +364,7 @@ src_configure() {
 		backtrace = true
 		incremental = false
 		$(if ! tc-is-cross-compiler; then
-			echo "default-linker = \"$(tc-getCC)\""
+			echo "default-linker = \"${CHOST}-cc\""
 		fi)
 		parallel-compiler = $(toml_usex parallel-compiler)
 		channel = "$(usex nightly nightly stable)"
diff --git a/dev-lang/rust/rust-1.77.1-r101.ebuild b/dev-lang/rust/rust-1.77.1-r101.ebuild
index 8ecaf535a291..c806ab1fe758 100644
--- a/dev-lang/rust/rust-1.77.1-r101.ebuild
+++ b/dev-lang/rust/rust-1.77.1-r101.ebuild
@@ -363,7 +363,7 @@ src_configure() {
 		backtrace = true
 		incremental = false
 		$(if ! tc-is-cross-compiler; then
-			echo "default-linker = \"$(tc-getCC)\""
+			echo "default-linker = \"${CHOST}-cc\""
 		fi)
 		parallel-compiler = $(toml_usex parallel-compiler)
 		channel = "$(usex nightly nightly stable)"
diff --git a/dev-lang/rust/rust-1.78.0-r101.ebuild b/dev-lang/rust/rust-1.78.0-r101.ebuild
index f87df749f847..20ec7fa25ee7 100644
--- a/dev-lang/rust/rust-1.78.0-r101.ebuild
+++ b/dev-lang/rust/rust-1.78.0-r101.ebuild
@@ -362,7 +362,7 @@ src_configure() {
 		backtrace = true
 		incremental = false
 		$(if ! tc-is-cross-compiler; then
-			echo "default-linker = \"$(tc-getCC)\""
+			echo "default-linker = \"${CHOST}-cc\""
 		fi)
 		parallel-compiler = $(toml_usex parallel-compiler)
 		channel = "$(usex nightly nightly stable)"
diff --git a/dev-lang/rust/rust-1.79.0-r101.ebuild b/dev-lang/rust/rust-1.79.0-r101.ebuild
index 96171bb99b28..7954db900f46 100644
--- a/dev-lang/rust/rust-1.79.0-r101.ebuild
+++ b/dev-lang/rust/rust-1.79.0-r101.ebuild
@@ -362,7 +362,7 @@ src_configure() {
 		backtrace = true
 		incremental = false
 		$(if ! tc-is-cross-compiler; then
-			echo "default-linker = \"$(tc-getCC)\""
+			echo "default-linker = \"${CHOST}-cc\""
 		fi)
 		parallel-compiler = $(toml_usex parallel-compiler)
 		channel = "$(usex nightly nightly stable)"
diff --git a/dev-lang/rust/rust-1.80.1-r101.ebuild b/dev-lang/rust/rust-1.80.1-r101.ebuild
index e535b914f811..a16db5442801 100644
--- a/dev-lang/rust/rust-1.80.1-r101.ebuild
+++ b/dev-lang/rust/rust-1.80.1-r101.ebuild
@@ -361,7 +361,7 @@ src_configure() {
 		backtrace = true
 		incremental = false
 		$(if ! tc-is-cross-compiler; then
-			echo "default-linker = \"$(tc-getCC)\""
+			echo "default-linker = \"${CHOST}-cc\""
 		fi)
 		parallel-compiler = $(toml_usex parallel-compiler)
 		channel = "$(usex nightly nightly stable)"
diff --git a/dev-lang/rust/rust-1.81.0-r101.ebuild b/dev-lang/rust/rust-1.81.0-r101.ebuild
index c6fee6b41ad7..d6ba0f33baa0 100644
--- a/dev-lang/rust/rust-1.81.0-r101.ebuild
+++ b/dev-lang/rust/rust-1.81.0-r101.ebuild
@@ -365,7 +365,7 @@ src_configure() {
 		backtrace = true
 		incremental = false
 		$(if ! tc-is-cross-compiler; then
-			echo "default-linker = \"$(tc-getCC)\""
+			echo "default-linker = \"${CHOST}-cc\""
 		fi)
 		parallel-compiler = $(toml_usex parallel-compiler)
 		channel = "$(usex nightly nightly stable)"
diff --git a/dev-lang/rust/rust-1.82.0-r102.ebuild b/dev-lang/rust/rust-1.82.0-r102.ebuild
index d68d0e8f12d8..d6ee9ac416de 100644
--- a/dev-lang/rust/rust-1.82.0-r102.ebuild
+++ b/dev-lang/rust/rust-1.82.0-r102.ebuild
@@ -373,7 +373,7 @@ src_configure() {
 		backtrace = true
 		incremental = false
 		$(if ! tc-is-cross-compiler; then
-			echo "default-linker = \"$(tc-getCC)\""
+			echo "default-linker = \"${CHOST}-cc\""
 		fi)
 		parallel-compiler = $(toml_usex parallel-compiler)
 		channel = "$(usex nightly nightly stable)"
diff --git a/dev-lang/rust/rust-1.83.0-r2.ebuild b/dev-lang/rust/rust-1.83.0-r2.ebuild
index 08cb004f06d1..b85f493c6ca7 100644
--- a/dev-lang/rust/rust-1.83.0-r2.ebuild
+++ b/dev-lang/rust/rust-1.83.0-r2.ebuild
@@ -373,7 +373,7 @@ src_configure() {
 		backtrace = true
 		incremental = false
 		$(if ! tc-is-cross-compiler; then
-			echo "default-linker = \"$(tc-getCC)\""
+			echo "default-linker = \"${CHOST}-cc\""
 		fi)
 		parallel-compiler = $(toml_usex parallel-compiler)
 		channel = "$(usex nightly nightly stable)"
diff --git a/dev-lang/rust/rust-1.84.0-r1.ebuild b/dev-lang/rust/rust-1.84.0-r1.ebuild
index 298a05164946..6fc4e46d7241 100644
--- a/dev-lang/rust/rust-1.84.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.84.0-r1.ebuild
@@ -374,7 +374,7 @@ src_configure() {
 		backtrace = true
 		incremental = false
 		$(if ! tc-is-cross-compiler; then
-			echo "default-linker = \"$(tc-getCC)\""
+			echo "default-linker = \"${CHOST}-cc\""
 		fi)
 		parallel-compiler = $(toml_usex parallel-compiler)
 		channel = "$(usex nightly nightly stable)"
diff --git a/dev-lang/rust/rust-1.84.1-r1.ebuild b/dev-lang/rust/rust-1.84.1-r1.ebuild
index ae4c72a90cf2..4dd53ebc8d05 100644
--- a/dev-lang/rust/rust-1.84.1-r1.ebuild
+++ b/dev-lang/rust/rust-1.84.1-r1.ebuild
@@ -374,7 +374,7 @@ src_configure() {
 		backtrace = true
 		incremental = false
 		$(if ! tc-is-cross-compiler; then
-			echo "default-linker = \"$(tc-getCC)\""
+			echo "default-linker = \"${CHOST}-cc\""
 		fi)
 		parallel-compiler = $(toml_usex parallel-compiler)
 		channel = "$(usex nightly nightly stable)"
diff --git a/dev-lang/rust/rust-1.85.0-r1.ebuild b/dev-lang/rust/rust-1.85.0-r1.ebuild
index 5a2b6ef48451..011b8572a939 100644
--- a/dev-lang/rust/rust-1.85.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.85.0-r1.ebuild
@@ -462,7 +462,7 @@ src_configure() {
 		backtrace = true
 		incremental = false
 		$(if ! tc-is-cross-compiler; then
-			echo "default-linker = \"$(tc-getCC)\""
+			echo "default-linker = \"${CHOST}-cc\""
 		fi)
 		channel = "${build_channel}"
 		description = "gentoo"
diff --git a/dev-lang/rust/rust-1.85.0.ebuild b/dev-lang/rust/rust-1.85.0.ebuild
index ce74a475077e..e7079ae7c11e 100644
--- a/dev-lang/rust/rust-1.85.0.ebuild
+++ b/dev-lang/rust/rust-1.85.0.ebuild
@@ -461,7 +461,7 @@ src_configure() {
 		backtrace = true
 		incremental = false
 		$(if ! tc-is-cross-compiler; then
-			echo "default-linker = \"$(tc-getCC)\""
+			echo "default-linker = \"${CHOST}-cc\""
 		fi)
 		channel = "${build_channel}"
 		description = "gentoo"
diff --git a/dev-lang/rust/rust-1.85.1.ebuild b/dev-lang/rust/rust-1.85.1.ebuild
new file mode 100644
index 000000000000..011b8572a939
--- /dev/null
+++ b/dev-lang/rust/rust-1.85.1.ebuild
@@ -0,0 +1,800 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 19 )
+PYTHON_COMPAT=( python3_{10..13} )
+
+RUST_MAX_VER=${PV%%_*}
+if [[ ${PV} == *9999* ]]; then
+	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
+	# in an older snapshot being unable to build a newer one without modifying the sources.
+	# 'stable' releases should always be able to build a beta snapshot so just use those.
+	RUST_MAX_VER="$(ver_cut 1).$(($(ver_cut 2) - 1)).1"
+	RUST_MIN_VER="$(ver_cut 1).$(($(ver_cut 2) - 1)).0"
+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
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/rust-lang/rust.git"
+	EGIT_SUBMODULES=(
+		"*"
+		"-src/gcc"
+	)
+elif [[ ${PV} == *beta* ]]; then
+	# Identify the snapshot date of the beta release:
+	# curl -Ls static.rust-lang.org/dist/channel-rust-beta.toml | grep beta-src.tar.xz
+	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-${PV}-src.tar.xz
+		verify-sig? ( https://static.rust-lang.org/dist/${BETA_SNAPSHOT}/rustc-beta-src.tar.xz.asc
+			-> rustc-${PV}-src.tar.xz.asc )
+	"
+	S="${WORKDIR}/${MY_P}-src"
+else
+	MY_P="rustc-${PV}"
+	SRC_URI="https://static.rust-lang.org/dist/${MY_P}-src.tar.xz
+		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
+
+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=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
+
+# https://github.com/rust-lang/llvm-project/blob/rustc-1.84.0/llvm/CMakeLists.txt
+_ALL_RUST_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+declare -A ALL_RUST_EXPERIMENTAL_TARGETS
+for _x in "${_ALL_RUST_EXPERIMENTAL_TARGETS[@]}"; do
+	ALL_RUST_EXPERIMENTAL_TARGETS["llvm_targets_${_x}"]=0
+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
+
+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[*]}"
+
+if [[ ${PV} = *9999* ]]; then
+	# These USE flags require nightly rust
+	IUSE+=" miri"
+fi
+
+LLVM_DEPEND=()
+# splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
+for _x in "${ALL_LLVM_TARGETS[@]}"; do
+	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "llvm-core/llvm:\${LLVM_SLOT}[${_x}]") )" )
+	if [[ -v ALL_RUST_EXPERIMENTAL_TARGETS["${_x}"] ]] ; then
+		ALL_RUST_EXPERIMENTAL_TARGETS["${_x}"]=1
+	fi
+done
+LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )" )
+LLVM_DEPEND+=( "	$(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')" )
+
+BDEPEND="${PYTHON_DEPS}
+	app-eselect/eselect-rust
+	|| (
+		>=sys-devel/gcc-4.7[cxx]
+		>=llvm-core/clang-3.5
+	)
+	!system-llvm? (
+		>=dev-build/cmake-3.13.4
+		app-alternatives/ninja
+	)
+	test? ( dev-debug/gdb )
+	verify-sig? ( sec-keys/openpgp-keys-rust )
+"
+
+DEPEND="
+	>=app-arch/xz-utils-5.2
+	net-misc/curl:=[http2,ssl]
+	sys-libs/zlib:=
+	dev-libs/openssl:0=
+	system-llvm? (
+		${LLVM_DEPEND[*]}
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
+	)
+	!system-llvm? (
+		!llvm-libunwind? (
+			elibc_musl? ( sys-libs/libunwind:= )
+		)
+	)
+"
+
+RDEPEND="${DEPEND}
+	app-eselect/eselect-rust
+	dev-lang/rust-common
+	sys-apps/lsb-release
+	!dev-lang/rust:stable
+	!dev-lang/rust-bin:stable
+"
+
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )
+	rust-analyzer? ( rust-src )
+	test? ( ${ALL_LLVM_TARGETS[*]} )
+	wasm? ( llvm_targets_WebAssembly )
+	x86? ( cpu_flags_x86_sse2 )
+"
+
+# we don't use cmake.eclass, but can get a warning
+CMAKE_WARN_UNUSED_CLI=no
+
+QA_FLAGS_IGNORED="
+	usr/lib/${PN}/${SLOT}/bin/.*
+	usr/lib/${PN}/${SLOT}/libexec/.*
+	usr/lib/${PN}/${SLOT}/lib/lib.*.so
+	usr/lib/${PN}/${SLOT}/lib/rustlib/.*/bin/.*
+	usr/lib/${PN}/${SLOT}/lib/rustlib/.*/lib/lib.*.so
+"
+
+QA_SONAME="
+	usr/lib/${PN}/${SLOT}/lib/lib.*.so.*
+	usr/lib/${PN}/${SLOT}/lib/rustlib/.*/lib/lib.*.so
+"
+
+QA_PRESTRIPPED="
+	usr/lib/${PN}/${SLOT}/lib/rustlib/.*/bin/rust-llvm-dwp
+	usr/lib/${PN}/${SLOT}/lib/rustlib/.*/lib/self-contained/crtn.o
+"
+
+# An rmeta file is custom binary format that contains the metadata for the crate.
+# rmeta files do not support linking, since they do not contain compiled object files.
+# so we can safely silence the warning for this QA check.
+QA_EXECSTACK="usr/lib/${PN}/${SLOT}/lib/rustlib/*/lib*.rlib:lib.rmeta"
+
+# causes double bootstrap
+RESTRICT="test"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/rust.asc
+
+PATCHES=(
+	"${FILESDIR}"/1.85.0-cross-compile-libz.patch
+	"${FILESDIR}"/1.85.0-musl-dynamic-linking.patch
+	"${FILESDIR}"/1.67.0-doc-wasm.patch
+)
+
+clear_vendor_checksums() {
+	sed -i 's/\("files":{\)[^}]*/\1/' "vendor/${1}/.cargo-checksum.json" || die
+}
+
+toml_usex() {
+	usex "${1}" true false
+}
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]]; then
+		git-r3_src_unpack
+		mkdir "${S}/.cargo" || die # The vendor script has a check for .cargo/config{,.toml}
+		touch "${S}/.cargo/config.toml" || die
+		local rust_stage0_root="$(${RUSTC} --print sysroot || die "Can't determine rust's sysroot")"
+		local rust_build=""
+		local rust_host=""
+		# Configure vendor to use the portage-provided toolchain. This prevents it from
+		# attempting to fetch a `beta` toolchain from the internet.
+		cat <<- _EOF_ > "${T}/vendor-config.toml"
+			[build]
+			build = "$(rust_abi "${CBUILD}")"
+			host = ["$(rust_abi "${CHOST}")"]
+			target = ["$(rust_abi "${CHOST}")"]
+			cargo = "${rust_stage0_root}/bin/cargo"
+			rustc = "${rust_stage0_root}/bin/rustc"
+			rustfmt = "${rust_stage0_root}/bin/rustfmt"
+		_EOF_
+		# We're using git sources so we need to run the Vendor script
+		# to ensure that all dependencies are present and up-to-date
+		mkdir "${S}/vendor" || die
+		# This also compiles the 'build helper', there's no way to avoid this.
+		${EPYTHON} "${S}"/x.py vendor -vvv --config="${T}"/vendor-config.toml -j$(makeopts_jobs) ||
+			die "Failed to vendor dependencies"
+		# TODO: This has to be generated somehow, this is from a 1.84.x tarball I had lying around.
+		cat <<- _EOF_ > "${S}/.cargo/config.toml"
+			[source.crates-io]
+			replace-with = "vendored-sources"
+
+			[source."git+https://github.com/rust-lang/team"]
+			git = "https://github.com/rust-lang/team"
+			replace-with = "vendored-sources"
+
+			[source.vendored-sources]
+			directory = "vendor"
+		_EOF_
+	else
+		verify-sig_src_unpack
+	fi
+}
+
+pre_build_checks() {
+	local M=9216
+	# multiply requirements by 1.3 if we are doing x86-multilib
+	if use amd64; then
+		M=$(( $(usex abi_x86_32 13 10) * ${M} / 10 ))
+	fi
+	M=$(( $(usex clippy 128 0) + ${M} ))
+	if [[ ${PV} == *9999* ]]; then
+		M=$(( $(usex miri 128 0) + ${M} ))
+	fi
+	M=$(( $(usex rustfmt 256 0) + ${M} ))
+	# add 2G if we compile llvm and 256M per llvm_target
+	if ! use system-llvm; then
+		M=$(( 2048 + ${M} ))
+		local ltarget
+		for ltarget in ${ALL_LLVM_TARGETS[@]}; do
+			M=$(( $(usex ${ltarget} 256 0) + ${M} ))
+		done
+	fi
+	M=$(( $(usex wasm 256 0) + ${M} ))
+	M=$(( $(usex debug 2 1) * ${M} ))
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		M=$(( 15 * ${M} / 10 ))
+	fi
+	eshopts_pop
+	M=$(( $(usex doc 256 0) + ${M} ))
+	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
+}
+
+llvm_check_deps() {
+	has_version -r "llvm-core/llvm:${LLVM_SLOT}[${LLVM_TARGET_USEDEPS// /,}]"
+}
+
+# Is LLVM being linked against libc++?
+is_libcxx_linked() {
+	local code='#include <ciso646>
+#if defined(_LIBCPP_VERSION)
+	HAVE_LIBCXX
+#endif
+'
+	local out=$($(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS} -x c++ -E -P - <<<"${code}") || return 1
+	[[ ${out} == *HAVE_LIBCXX* ]]
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+	python-any-r1_pkg_setup
+
+	export LIBGIT2_NO_PKG_CONFIG=1 #749381
+	if tc-is-cross-compiler; then
+		use system-llvm && die "USE=system-llvm not allowed when cross-compiling"
+		local cross_llvm_target="$(llvm_tuple_to_target "${CBUILD}")"
+		use "llvm_targets_${cross_llvm_target}" || \
+			die "Must enable LLVM_TARGETS=${cross_llvm_target} matching CBUILD=${CBUILD} when cross-compiling"
+	fi
+
+	rust_pkg_setup
+
+	if use system-llvm; then
+		llvm-r1_pkg_setup
+
+		local llvm_config="$(get_llvm_prefix)/bin/llvm-config"
+		export LLVM_LINK_SHARED=1
+		export RUSTFLAGS="${RUSTFLAGS} -Lnative=$("${llvm_config}" --libdir)"
+	fi
+}
+
+src_prepare() {
+	if [[ ${PV} = *9999* ]]; then
+		# We need to update / generate lockfiles for the workspace
+		${CARGO} generate-lockfile --offline
+
+	fi
+	# Rust baselines to Pentium4 on x86, this patch lowers the baseline to i586 when sse2 is not set.
+	if use x86; then
+		if ! use cpu_flags_x86_sse2; then
+			eapply "${FILESDIR}/1.82.0-i586-baseline.patch"
+			#grep -rl cmd.args.push\(\"-march=i686\" . | xargs sed  -i 's/march=i686/-march=i586/g' || die
+		fi
+	fi
+
+	default
+}
+
+src_configure() {
+	if tc-is-cross-compiler; then
+		export PKG_CONFIG_ALLOW_CROSS=1
+		export PKG_CONFIG_PATH="${ESYSROOT}/usr/$(get_libdir)/pkgconfig"
+		export OPENSSL_INCLUDE_DIR="${ESYSROOT}/usr/include"
+		export OPENSSL_LIB_DIR="${ESYSROOT}/usr/$(get_libdir)"
+	fi
+
+	filter-lto # https://bugs.gentoo.org/862109 https://bugs.gentoo.org/866231
+
+	local rust_target="" rust_targets="" arch_cflags
+
+	# Collect rust target names to compile standard libs for all ABIs.
+	for v in $(multilib_get_enabled_abi_pairs); do
+		rust_targets+=",\"$(rust_abi $(get_abi_CHOST ${v##*.}))\""
+	done
+	if use wasm; then
+		rust_targets+=",\"wasm32-unknown-unknown\""
+		if use system-llvm; then
+			# un-hardcode rust-lld linker for this target
+			# https://bugs.gentoo.org/715348
+			sed -i '/linker:/ s/rust-lld/wasm-ld/' compiler/rustc_target/src/spec/base/wasm.rs || die
+		fi
+	fi
+	rust_targets="${rust_targets#,}"
+
+	# cargo and rustdoc are mandatory and should always be included
+	local tools='"cargo","rustdoc"'
+	use clippy && tools+=',"clippy"'
+	use rustfmt && tools+=',"rustfmt"'
+	use rust-analyzer && tools+=',"rust-analyzer","rust-analyzer-proc-macro-srv"'
+	use rust-src && tools+=',"src"'
+
+	if [[ ${PV} == *9999* ]]; then
+		use miri && tools+=',"miri"'
+	fi
+
+	local rust_stage0_root="$(${RUSTC} --print sysroot || die "Can't determine rust's sysroot")"
+	# in case of prefix it will be already prefixed, as --print sysroot returns full path
+	[[ -d ${rust_stage0_root} ]] || die "${rust_stage0_root} is not a directory"
+
+	rust_target="$(rust_abi)"
+	rust_build="$(rust_abi "${CBUILD}")"
+	rust_host="$(rust_abi "${CHOST}")"
+
+	RUST_EXPERIMENTAL_TARGETS=()
+	for _x in "${!ALL_RUST_EXPERIMENTAL_TARGETS[@]}"; do
+		if [[ ${ALL_RUST_EXPERIMENTAL_TARGETS[${_x}]} == 1 ]] && use ${_x} ; then
+			RUST_EXPERIMENTAL_TARGETS+=( ${_x#llvm_targets_} )
+		fi
+	done
+	RUST_EXPERIMENTAL_TARGETS=${RUST_EXPERIMENTAL_TARGETS[@]}
+
+	local cm_btype="$(usex debug DEBUG RELEASE)"
+	local build_channel
+	local build_miri="false"
+	case "${PV}" in
+		*9999*)
+			build_channel="nightly"
+			;;
+		*beta*)
+			build_channel="beta"
+			;;
+		*)
+			build_channel="stable"
+			;;
+	esac
+	cat <<- _EOF_ > "${S}"/config.toml
+		# https://github.com/rust-lang/rust/issues/135358 (bug #947897)
+		profile = "dist"
+		[llvm]
+		download-ci-llvm = false
+		optimize = $(toml_usex !debug)
+		release-debuginfo = $(toml_usex debug)
+		assertions = $(toml_usex debug)
+		ninja = true
+		targets = "${LLVM_TARGETS// /;}"
+		experimental-targets = "${RUST_EXPERIMENTAL_TARGETS// /;}"
+		link-shared = $(toml_usex system-llvm)
+		$(if is_libcxx_linked; then
+			# https://bugs.gentoo.org/732632
+			echo "use-libcxx = true"
+			echo "static-libstdcpp = false"
+		fi)
+		$(case "${rust_target}" in
+			i586-*-linux-*)
+				# https://github.com/rust-lang/rust/issues/93059
+				echo 'cflags = "-fcf-protection=none"'
+				echo 'cxxflags = "-fcf-protection=none"'
+				echo 'ldflags = "-fcf-protection=none"'
+				;;
+			*)
+				;;
+		esac)
+		enable-warnings = false
+		[llvm.build-config]
+		CMAKE_VERBOSE_MAKEFILE = "ON"
+		$(if ! tc-is-cross-compiler; then
+			# When cross-compiling, LLVM is compiled twice, once for host and
+			# once for target.  Unfortunately, this build configuration applies
+			# to both, which means any flags applicable to one target but not
+			# the other will break.  Conditionally disable respecting user
+			# flags when cross-compiling.
+			echo "CMAKE_C_FLAGS_${cm_btype} = \"${CFLAGS}\""
+			echo "CMAKE_CXX_FLAGS_${cm_btype} = \"${CXXFLAGS}\""
+			echo "CMAKE_EXE_LINKER_FLAGS_${cm_btype} = \"${LDFLAGS}\""
+			echo "CMAKE_MODULE_LINKER_FLAGS_${cm_btype} = \"${LDFLAGS}\""
+			echo "CMAKE_SHARED_LINKER_FLAGS_${cm_btype} = \"${LDFLAGS}\""
+			echo "CMAKE_STATIC_LINKER_FLAGS_${cm_btype} = \"${ARFLAGS}\""
+		fi)
+		[build]
+		build-stage = 2
+		test-stage = 2
+		build = "${rust_build}"
+		host = ["${rust_host}"]
+		target = [${rust_targets}]
+		cargo = "${rust_stage0_root}/bin/cargo"
+		rustc = "${rust_stage0_root}/bin/rustc"
+		rustfmt = "${rust_stage0_root}/bin/rustfmt"
+		docs = $(toml_usex doc)
+		compiler-docs = false
+		submodules = false
+		python = "${EPYTHON}"
+		locked-deps = true
+		vendor = true
+		extended = true
+		tools = [${tools}]
+		verbose = 2
+		sanitizers = false
+		profiler = true
+		cargo-native-static = false
+		[install]
+		prefix = "${EPREFIX}/usr/lib/${PN}/${SLOT}"
+		sysconfdir = "etc"
+		docdir = "share/doc/rust"
+		bindir = "bin"
+		libdir = "lib"
+		mandir = "share/man"
+		[rust]
+		# https://github.com/rust-lang/rust/issues/54872
+		codegen-units-std = 1
+		optimize = true
+		debug = $(toml_usex debug)
+		debug-assertions = $(toml_usex debug)
+		debug-assertions-std = $(toml_usex debug)
+		debuginfo-level = $(usex debug 2 0)
+		debuginfo-level-rustc = $(usex debug 2 0)
+		debuginfo-level-std = $(usex debug 2 0)
+		debuginfo-level-tools = $(usex debug 2 0)
+		debuginfo-level-tests = 0
+		backtrace = true
+		incremental = false
+		$(if ! tc-is-cross-compiler; then
+			echo "default-linker = \"${CHOST}-cc\""
+		fi)
+		channel = "${build_channel}"
+		description = "gentoo"
+		rpath = true
+		verbose-tests = true
+		optimize-tests = $(toml_usex !debug)
+		codegen-tests = true
+		dist-src = false
+		remap-debuginfo = true
+		lld = $(usex system-llvm false $(toml_usex wasm))
+		# only deny warnings if doc+wasm are NOT requested, documenting stage0 wasm std fails without it
+		# https://github.com/rust-lang/rust/issues/74976
+		# https://github.com/rust-lang/rust/issues/76526
+		deny-warnings = $(usex wasm $(usex doc false true) true)
+		backtrace-on-ice = true
+		jemalloc = false
+		# See https://github.com/rust-lang/rust/issues/121124
+		lto = "$(usex lto thin off)"
+		[dist]
+		src-tarball = false
+		compression-formats = ["xz"]
+		compression-profile = "balanced"
+	_EOF_
+
+	for v in $(multilib_get_enabled_abi_pairs); do
+		rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
+		arch_cflags="$(get_abi_CFLAGS ${v##*.})"
+
+		export CFLAGS_${rust_target//-/_}="${arch_cflags}"
+
+		cat <<- _EOF_ >> "${S}"/config.toml
+			[target.${rust_target}]
+			ar = "$(tc-getAR)"
+			cc = "$(tc-getCC)"
+			cxx = "$(tc-getCXX)"
+			linker = "$(tc-getCC)"
+			ranlib = "$(tc-getRANLIB)"
+			llvm-libunwind = "$(usex llvm-libunwind $(usex system-llvm system in-tree) no)"
+		_EOF_
+		if use system-llvm; then
+			cat <<- _EOF_ >> "${S}"/config.toml
+				llvm-config = "$(get_llvm_prefix)/bin/llvm-config"
+			_EOF_
+		fi
+		# by default librustc_target/spec/linux_musl_base.rs sets base.crt_static_default = true;
+		# but we patch it and set to false here as well
+		if use elibc_musl; then
+			cat <<- _EOF_ >> "${S}"/config.toml
+				crt-static = false
+				musl-root = "$($(tc-getCC) -print-sysroot)/usr"
+			_EOF_
+		fi
+	done
+	if use wasm; then
+		wasm_target="wasm32-unknown-unknown"
+		export CFLAGS_${wasm_target//-/_}="$(filter-flags '-mcpu*' '-march*' '-mtune*'; echo "$CFLAGS")"
+		cat <<- _EOF_ >> "${S}"/config.toml
+			[target.wasm32-unknown-unknown]
+			linker = "$(usex system-llvm lld rust-lld)"
+			# wasm target does not have profiler_builtins https://bugs.gentoo.org/848483
+			profiler = false
+		_EOF_
+	fi
+
+	if [[ -n ${I_KNOW_WHAT_I_AM_DOING_CROSS} ]]; then # whitespace intentionally shifted below
+	# experimental cross support
+	# discussion: https://bugs.gentoo.org/679878
+	# TODO: c*flags, clang, system-llvm, cargo.eclass target support
+	# it would be much better if we could split out stdlib
+	# complilation to separate ebuild and abuse CATEGORY to
+	# just install to /usr/lib/rustlib/<target>
+
+	# extra targets defined as a bash array
+	# spec format:  <LLVM target>:<rust-target>:<CTARGET>
+	# best place would be /etc/portage/env/dev-lang/rust
+	# Example:
+	# RUST_CROSS_TARGETS=(
+	#	"AArch64:aarch64-unknown-linux-gnu:aarch64-unknown-linux-gnu"
+	# )
+	# no extra hand holding is done, no target transformations, all
+	# values are passed as-is with just basic checks, so it's up to user to supply correct values
+	# valid rust targets can be obtained with
+	# 	rustc --print target-list
+	# matching cross toolchain has to be installed
+	# matching LLVM_TARGET has to be enabled for both rust and llvm (if using system one)
+	# only gcc toolchains installed with crossdev are checked for now.
+
+	# BUG: we can't pass host flags to cross compiler, so just filter for now
+	# BUG: this should be more fine-grained.
+	filter-flags '-mcpu=*' '-march=*' '-mtune=*'
+
+	local cross_target_spec
+	for cross_target_spec in "${RUST_CROSS_TARGETS[@]}";do
+		# extracts first element form <LLVM target>:<rust-target>:<CTARGET>
+		local cross_llvm_target="${cross_target_spec%%:*}"
+		# extracts toolchain triples, <rust-target>:<CTARGET>
+		local cross_triples="${cross_target_spec#*:}"
+		# extracts first element after before : separator
+		local cross_rust_target="${cross_triples%%:*}"
+		# extracts last element after : separator
+		local cross_toolchain="${cross_triples##*:}"
+		use llvm_targets_${cross_llvm_target} || die "need llvm_targets_${cross_llvm_target} target enabled"
+		command -v ${cross_toolchain}-gcc > /dev/null 2>&1 || die "need ${cross_toolchain} cross toolchain"
+
+		cat <<- _EOF_ >> "${S}"/config.toml
+			[target.${cross_rust_target}]
+			ar = "${cross_toolchain}-ar"
+			cc = "${cross_toolchain}-gcc"
+			cxx = "${cross_toolchain}-g++"
+			linker = "${cross_toolchain}-gcc"
+			ranlib = "${cross_toolchain}-ranlib"
+		_EOF_
+		if use system-llvm; then
+			cat <<- _EOF_ >> "${S}"/config.toml
+				llvm-config = "$(get_llvm_prefix)/bin/llvm-config"
+			_EOF_
+		fi
+		if [[ "${cross_toolchain}" == *-musl* ]]; then
+			cat <<- _EOF_ >> "${S}"/config.toml
+				musl-root = "$(${cross_toolchain}-gcc -print-sysroot)/usr"
+			_EOF_
+		fi
+
+		# append cross target to "normal" target list
+		# example 'target = ["powerpc64le-unknown-linux-gnu"]'
+		# becomes 'target = ["powerpc64le-unknown-linux-gnu","aarch64-unknown-linux-gnu"]'
+
+		rust_targets="${rust_targets},\"${cross_rust_target}\""
+		sed -i "/^target = \[/ s#\[.*\]#\[${rust_targets}\]#" config.toml || die
+
+		ewarn
+		ewarn "Enabled ${cross_rust_target} rust target"
+		ewarn "Using ${cross_toolchain} cross toolchain"
+		ewarn
+		if ! has_version -b 'sys-devel/binutils[multitarget]' ; then
+			ewarn "'sys-devel/binutils[multitarget]' is not installed"
+			ewarn "'strip' will be unable to strip cross libraries"
+			ewarn "cross targets will be installed with full debug information"
+			ewarn "enable 'multitarget' USE flag for binutils to be able to strip object files"
+			ewarn
+			ewarn "Alternatively llvm-strip can be used, it supports stripping any target"
+			ewarn "define STRIP=\"llvm-strip\" to use it (experimental)"
+			ewarn
+		fi
+	done
+	fi # I_KNOW_WHAT_I_AM_DOING_CROSS
+
+	einfo "Rust configured with the following flags:"
+	echo
+	echo RUSTFLAGS="\"${RUSTFLAGS}\""
+	echo RUSTFLAGS_BOOTSTRAP="\"${RUSTFLAGS_BOOTSTRAP}\""
+	echo RUSTFLAGS_NOT_BOOTSTRAP="\"${RUSTFLAGS_NOT_BOOTSTRAP}\""
+	echo MAGIC_EXTRA_RUSTFLAGS="\"${MAGIC_EXTRA_RUSTFLAGS}\""
+	env | grep "CARGO_TARGET_.*_RUSTFLAGS="
+	env | grep "CFLAGS_.*"
+	echo
+	einfo "config.toml contents:"
+	cat "${S}"/config.toml || die
+	echo
+}
+
+src_compile() {
+	RUST_BACKTRACE=1 "${EPYTHON}" ./x.py build -vvv --config="${S}"/config.toml -j$(makeopts_jobs) || die
+}
+
+src_test() {
+	# https://rustc-dev-guide.rust-lang.org/tests/intro.html
+
+	# those are basic and codegen tests.
+	local tests=(
+		codegen
+		codegen-units
+		compile-fail
+		incremental
+		mir-opt
+		pretty
+		run-make
+	)
+
+	# fails if llvm is not built with ALL targets.
+	# and known to fail with system llvm sometimes.
+	use system-llvm || tests+=( assembly )
+
+	# fragile/expensive/less important tests
+	# or tests that require extra builds
+	# TODO: instead of skipping, just make some nonfatal.
+	if [[ ${ERUST_RUN_EXTRA_TESTS:-no} != no ]]; then
+		tests+=(
+			rustdoc
+			rustdoc-js
+			rustdoc-js-std
+			rustdoc-ui
+			run-make-fulldeps
+			ui
+			ui-fulldeps
+		)
+	fi
+
+	local i failed=()
+	einfo "rust_src_test: enabled tests ${tests[@]/#/src/test/}"
+	for i in "${tests[@]}"; do
+		local t="src/test/${i}"
+		einfo "rust_src_test: running ${t}"
+		if ! RUST_BACKTRACE=1 "${EPYTHON}" ./x.py test -vv --config="${S}"/config.toml \
+				-j$(makeopts_jobs) --no-doc --no-fail-fast "${t}"
+		then
+				failed+=( "${t}" )
+				eerror "rust_src_test: ${t} failed"
+		fi
+	done
+
+	if [[ ${#failed[@]} -ne 0 ]]; then
+		eerror "rust_src_test: failure summary: ${failed[@]}"
+		die "aborting due to test failures"
+	fi
+}
+
+src_install() {
+	DESTDIR="${D}" "${EPYTHON}" ./x.py install -vv --config="${S}"/config.toml -j$(makeopts_jobs) || die
+
+	docompress /usr/lib/${PN}/${SLOT}/share/man/
+
+	# bug #689562, #689160
+	rm -v "${ED}/usr/lib/${PN}/${SLOT}/etc/bash_completion.d/cargo" || die
+	rmdir -v "${ED}/usr/lib/${PN}/${SLOT}"/etc{/bash_completion.d,} || die
+
+	local symlinks=(
+		cargo
+		rustc
+		rustdoc
+		rust-gdb
+		rust-gdbgui
+		rust-lldb
+	)
+
+	use clippy && symlinks+=( clippy-driver cargo-clippy )
+	if [[ ${PV} = *9999* ]]; then
+		use miri && symlinks+=( miri cargo-miri )
+	fi
+	use rustfmt && symlinks+=( rustfmt cargo-fmt )
+	use rust-analyzer && symlinks+=( rust-analyzer )
+
+	einfo "installing eselect-rust symlinks and paths: ${symlinks[@]}"
+	local i
+	for i in "${symlinks[@]}"; do
+		# 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%%_*}"
+		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
+		else
+			ewarn "${i} symlink requested, but source file not found"
+			ewarn "please report this"
+		fi
+		dosym "../lib/${PN}/${SLOT}/bin/${ver_i}" "/usr/bin/${ver_i}"
+	done
+
+	# symlinks to switch components to active rust in eselect
+	dosym "${SLOT}/lib" "/usr/lib/${PN}/lib-${SLOT}"
+	use rust-analyzer && dosym "${SLOT}/libexec" "/usr/lib/${PN}/libexec-${SLOT}"
+	dosym "${SLOT}/share/man" "/usr/lib/${PN}/man-${SLOT}"
+	dosym "rust/${SLOT}/lib/rustlib" "/usr/lib/rustlib-${SLOT}"
+	dosym "../../lib/${PN}/${SLOT}/share/doc/rust" "/usr/share/doc/${P}"
+
+	newenvd - "50${P}" <<-_EOF_
+		MANPATH="${EPREFIX}/usr/lib/rust/man-${SLOT}"
+	_EOF_
+
+	rm -rf "${ED}/usr/lib/${PN}/${SLOT}"/*.old || die
+	rm -rf "${ED}/usr/lib/${PN}/${SLOT}/bin"/*.old || die
+	rm -rf "${ED}/usr/lib/${PN}/${SLOT}/doc"/*.old || die
+
+	# note: eselect-rust adds EROOT to all paths below
+	cat <<-_EOF_ > "${T}/provider-${PN}-${SLOT}"
+		/usr/bin/cargo
+		/usr/bin/rustdoc
+		/usr/bin/rust-gdb
+		/usr/bin/rust-gdbgui
+		/usr/bin/rust-lldb
+		/usr/lib/rustlib
+		/usr/lib/rust/lib
+		/usr/lib/rust/man
+		/usr/share/doc/rust
+	_EOF_
+
+	if use clippy; then
+		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
+	fi
+	if [[ ${SLOT} == *9999* ]] && use miri; then
+		echo /usr/bin/miri >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-miri >> "${T}/provider-${P}"
+	fi
+	if use rustfmt; then
+		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
+	fi
+	if use rust-analyzer; then
+		echo /usr/lib/rust/libexec >> "${T}/provider-${P}"
+		echo /usr/bin/rust-analyzer >> "${T}/provider-${P}"
+	fi
+
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${PN}-${SLOT}"
+
+	if use dist; then
+		"${EPYTHON}" ./x.py dist -vv --config="${S}"/config.toml -j$(makeopts_jobs) || die
+		insinto "/usr/lib/${PN}/${SLOT}/dist"
+		doins -r "${S}/build/dist/."
+	fi
+}
+
+pkg_postinst() {
+
+	eselect rust update
+
+	if has_version dev-debug/gdb || has_version llvm-core/lldb; then
+		elog "Rust installs helper scripts for calling GDB and LLDB,"
+		elog "for convenience they are installed under /usr/bin/rust-{gdb,lldb}-${PV}."
+	fi
+
+	if has_version app-editors/emacs; then
+		optfeature "emacs support for rust" app-emacs/rust-mode
+	fi
+
+	if has_version app-editors/gvim || has_version app-editors/vim; then
+		optfeature "vim support for rust" app-vim/rust-vim
+	fi
+}
+
+pkg_postrm() {
+	eselect rust cleanup
+}
diff --git a/dev-lang/rust/rust-1.86.0_beta20250218-r1.ebuild b/dev-lang/rust/rust-1.86.0_beta20250218-r1.ebuild
index c609ba084142..bbf7e2c95c8c 100644
--- a/dev-lang/rust/rust-1.86.0_beta20250218-r1.ebuild
+++ b/dev-lang/rust/rust-1.86.0_beta20250218-r1.ebuild
@@ -469,7 +469,7 @@ src_configure() {
 		backtrace = true
 		incremental = false
 		$(if ! tc-is-cross-compiler; then
-			echo "default-linker = \"$(tc-getCC)\""
+			echo "default-linker = \"${CHOST}-cc\""
 		fi)
 		channel = "${build_channel}"
 		description = "gentoo"
diff --git a/dev-lang/rust/rust-1.86.0_beta20250225.ebuild b/dev-lang/rust/rust-1.86.0_beta20250225.ebuild
index 83f444b7cb32..7ccdcd48b3d6 100644
--- a/dev-lang/rust/rust-1.86.0_beta20250225.ebuild
+++ b/dev-lang/rust/rust-1.86.0_beta20250225.ebuild
@@ -469,7 +469,7 @@ src_configure() {
 		backtrace = true
 		incremental = false
 		$(if ! tc-is-cross-compiler; then
-			echo "default-linker = \"$(tc-getCC)\""
+			echo "default-linker = \"${CHOST}-cc\""
 		fi)
 		channel = "${build_channel}"
 		description = "gentoo"
diff --git a/dev-lang/rust/rust-9999.ebuild b/dev-lang/rust/rust-9999.ebuild
index 97c665f7828d..d7dd9d8d660c 100644
--- a/dev-lang/rust/rust-9999.ebuild
+++ b/dev-lang/rust/rust-9999.ebuild
@@ -462,7 +462,7 @@ src_configure() {
 		backtrace = true
 		incremental = false
 		$(if ! tc-is-cross-compiler; then
-			echo "default-linker = \"$(tc-getCC)\""
+			echo "default-linker = \"${CHOST}-cc\""
 		fi)
 		channel = "${build_channel}"
 		description = "gentoo"
author	V3n3RiX <venerix@koprulu.sector>	2025-03-21 00:31:17 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2025-03-21 00:31:17 +0000
commit	ae832415103492f73a8351ed7a91cb596392d779 (patch)
tree	50b8927d2d57e707e7e3402895a997ebbc349dda /dev-lang
parent	77684468238b8755c1aa3e72f3055f4e62fcf14c (diff)