*/*: update for slotted Rust

Tidyups:

- $(cargo_crate_uris)
- Rust BDEPENDS come from the eclass except in very rare
  circumstances (RUST_OPTIONAL=1)
- RUST_M{AX,IN}_VER where required.
- Suboptimal crate separator (`-` -> `@`)

Signed-off-by: Matt Jolly <kangie@gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/39218
Signed-off-by: Matt Jolly <kangie@gentoo.org>

16 files changed, 126 insertions, 166 deletions

diff --git a/dev-lang/dafny/dafny-4.8.0.ebuild b/dev-lang/dafny/dafny-4.8.0.ebuild
index fc41fee57b24..d759dd478757 100644
--- a/dev-lang/dafny/dafny-4.8.0.ebuild
+++ b/dev-lang/dafny/dafny-4.8.0.ebuild
@@ -667,5 +667,5 @@ src_install() {
 
 pkg_postinst() {
 	optfeature "Dafny GO language backend" dev-go/go-tools
-	optfeature "Dafny Rust language backend" virtual/rust
+	optfeature "Dafny Rust language backend" dev-lang/rust dev-lang/rust-bin
 }
diff --git a/dev-lang/dafny/dafny-4.8.1.ebuild b/dev-lang/dafny/dafny-4.8.1.ebuild
index f1cba38874f6..0bf40a85c501 100644
--- a/dev-lang/dafny/dafny-4.8.1.ebuild
+++ b/dev-lang/dafny/dafny-4.8.1.ebuild
@@ -668,5 +668,5 @@ src_install() {
 
 pkg_postinst() {
 	optfeature "Dafny GO language backend" dev-go/go-tools
-	optfeature "Dafny Rust language backend" virtual/rust
+	optfeature "Dafny Rust language backend" dev-lang/rust dev-lang/rust-bin
 }
diff --git a/dev-lang/dafny/dafny-4.9.0.ebuild b/dev-lang/dafny/dafny-4.9.0.ebuild
index aad9495c760b..dd8da1ebd4cd 100644
--- a/dev-lang/dafny/dafny-4.9.0.ebuild
+++ b/dev-lang/dafny/dafny-4.9.0.ebuild
@@ -643,5 +643,5 @@ src_install() {
 
 pkg_postinst() {
 	optfeature "Dafny GO language backend" dev-go/go-tools
-	optfeature "Dafny Rust language backend" virtual/rust
+	optfeature "Dafny Rust language backend" dev-lang/rust dev-lang/rust-bin
 }
diff --git a/dev-lang/gleam/gleam-1.4.1.ebuild b/dev-lang/gleam/gleam-1.4.1-r1.ebuild
index 7151240a5284..7151240a5284 100644
--- a/dev-lang/gleam/gleam-1.4.1.ebuild
+++ b/dev-lang/gleam/gleam-1.4.1-r1.ebuild
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2021-r5.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2021-r5.ebuild
index 442fabf6223f..0b3ec6d0b5d2 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2021-r5.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2021-r5.ebuild
@@ -39,6 +39,7 @@ inherit flag-o-matic toolchain-funcs toolchain
 
 DESCRIPTION="GNAT Ada Compiler - GPL version"
 HOMEPAGE="http://libre.adacore.com/"
+S="${WORKDIR}"/${MYP}
 
 LICENSE+=" GPL-2 GPL-3"
 KEYWORDS="amd64 x86"
@@ -48,8 +49,6 @@ RESTRICT="test"
 RDEPEND="!=sys-devel/gcc-${TOOLCHAIN_GCC_PV}*"
 BDEPEND=sys-devel/binutils
 
-S="${WORKDIR}"/${MYP}
-
 pkg_pretend() {
 	toolchain_pkg_pretend
 	if tc-is-clang; then
diff --git a/dev-lang/ruby/ruby-3.2.4.ebuild b/dev-lang/ruby/ruby-3.2.4-r2.ebuild
index 524d5af27834..7d109feb42c6 100644
--- a/dev-lang/ruby/ruby-3.2.4.ebuild
+++ b/dev-lang/ruby/ruby-3.2.4-r2.ebuild
@@ -3,28 +3,30 @@
 
 EAPI=8
 
-inherit autotools flag-o-matic multiprocessing
+RUST_OPTIONAL="yes"
 
-MY_P="${PN}-$(ver_cut 1-3)"
-S=${WORKDIR}/${MY_P}
+inherit autotools flag-o-matic multiprocessing rust
 
-SLOT=$(ver_cut 1-2)
-MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
-RUBYVERSION=${SLOT}.0
+MY_P="${PN}-$(ver_cut 1-3)"
 
 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"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
+SLOT=$(ver_cut 1-2)
+MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
+RUBYVERSION=${SLOT}.0
+
 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"
+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? ( >=virtual/rust-1.58.1 )
+	jit? ( ${RUST_DEPEND} )
 	ssl? (
 		dev-libs/openssl:0=
 	)
@@ -76,6 +78,10 @@ PDEPEND="
 	xemacs? ( app-xemacs/ruby-modes )
 "
 
+pkg_setup() {
+	use jit && rust_pkg_setup
+}
+
 src_prepare() {
 	eapply "${FILESDIR}"/"${SLOT}"/010*.patch
 	eapply "${FILESDIR}"/"${SLOT}"/011*.patch
diff --git a/dev-lang/ruby/ruby-3.2.4-r1.ebuild b/dev-lang/ruby/ruby-3.2.4-r3.ebuild
index 7152cb0f52fc..76287f2c4584 100644
--- a/dev-lang/ruby/ruby-3.2.4-r1.ebuild
+++ b/dev-lang/ruby/ruby-3.2.4-r3.ebuild
@@ -3,28 +3,30 @@
 
 EAPI=8
 
-inherit autotools flag-o-matic multiprocessing
+RUST_OPTIONAL="yes"
 
-MY_P="${PN}-$(ver_cut 1-3)"
-S=${WORKDIR}/${MY_P}
+inherit autotools flag-o-matic multiprocessing rust
 
-SLOT=$(ver_cut 1-2)
-MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
-RUBYVERSION=${SLOT}.0
+MY_P="${PN}-$(ver_cut 1-3)"
 
 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"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
+SLOT=$(ver_cut 1-2)
+MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
+RUBYVERSION=${SLOT}.0
+
 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"
+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? ( >=virtual/rust-1.58.1 )
+	jit? ( ${RUST_DEPEND} )
 	ssl? (
 		dev-libs/openssl:0=
 	)
@@ -76,6 +78,10 @@ PDEPEND="
 	xemacs? ( app-xemacs/ruby-modes )
 "
 
+pkg_setup() {
+	use jit && rust_pkg_setup
+}
+
 src_prepare() {
 	eapply "${FILESDIR}"/"${SLOT}"/010*.patch
 	eapply "${FILESDIR}"/"${SLOT}"/011*.patch
diff --git a/dev-lang/ruby/ruby-3.2.5.ebuild b/dev-lang/ruby/ruby-3.2.5-r1.ebuild
index a7a40d60ef35..51a1833e9b4f 100644
--- a/dev-lang/ruby/ruby-3.2.5.ebuild
+++ b/dev-lang/ruby/ruby-3.2.5-r1.ebuild
@@ -3,28 +3,30 @@
 
 EAPI=8
 
-inherit autotools flag-o-matic multiprocessing
+RUST_OPTIONAL="yes"
 
-MY_P="${PN}-$(ver_cut 1-3)"
-S=${WORKDIR}/${MY_P}
+inherit autotools flag-o-matic multiprocessing rust
 
-SLOT=$(ver_cut 1-2)
-MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
-RUBYVERSION=${SLOT}.0
+MY_P="${PN}-$(ver_cut 1-3)"
 
 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"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
+SLOT=$(ver_cut 1-2)
+MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
+RUBYVERSION=${SLOT}.0
+
 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"
+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? ( >=virtual/rust-1.58.1 )
+	jit? ( ${RUST_DEPEND} )
 	ssl? (
 		dev-libs/openssl:0=
 	)
@@ -76,6 +78,10 @@ PDEPEND="
 	xemacs? ( app-xemacs/ruby-modes )
 "
 
+pkg_setup() {
+	use jit && rust_pkg_setup
+}
+
 src_prepare() {
 	eapply "${FILESDIR}"/"${SLOT}"/010*.patch
 	eapply "${FILESDIR}"/"${SLOT}"/011*.patch
diff --git a/dev-lang/ruby/ruby-3.2.6.ebuild b/dev-lang/ruby/ruby-3.2.6-r1.ebuild
index 988bb6012c76..74fa2ffc9b24 100644
--- a/dev-lang/ruby/ruby-3.2.6.ebuild
+++ b/dev-lang/ruby/ruby-3.2.6-r1.ebuild
@@ -3,28 +3,30 @@
 
 EAPI=8
 
-inherit autotools flag-o-matic multiprocessing
+RUST_OPTIONAL="yes"
 
-MY_P="${PN}-$(ver_cut 1-3)"
-S=${WORKDIR}/${MY_P}
+inherit autotools flag-o-matic multiprocessing rust
 
-SLOT=$(ver_cut 1-2)
-MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
-RUBYVERSION=${SLOT}.0
+MY_P="${PN}-$(ver_cut 1-3)"
 
 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"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
+SLOT=$(ver_cut 1-2)
+MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
+RUBYVERSION=${SLOT}.0
+
 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"
+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? ( >=virtual/rust-1.58.1 )
+	jit? ( ${RUST_DEPEND} )
 	ssl? (
 		dev-libs/openssl:0=
 	)
@@ -76,6 +78,10 @@ PDEPEND="
 	xemacs? ( app-xemacs/ruby-modes )
 "
 
+pkg_setup() {
+	use jit && rust_pkg_setup
+}
+
 src_prepare() {
 	eapply "${FILESDIR}"/"${SLOT}"/010*.patch
 	eapply "${FILESDIR}"/"${SLOT}"/011*.patch
diff --git a/dev-lang/ruby/ruby-3.3.5.ebuild b/dev-lang/ruby/ruby-3.3.4-r2.ebuild
index cac3085b6240..a48e45203585 100644
--- a/dev-lang/ruby/ruby-3.3.5.ebuild
+++ b/dev-lang/ruby/ruby-3.3.4-r2.ebuild
@@ -3,21 +3,22 @@
 
 EAPI=8
 
-inherit autotools flag-o-matic multiprocessing
+RUST_OPTIONAL="yes"
 
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="https://www.ruby-lang.org/"
+inherit autotools flag-o-matic multiprocessing rust
 
 MY_P="${PN}-$(ver_cut 1-3)"
+
+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"
 S=${WORKDIR}/${MY_P}
 
+LICENSE="|| ( Ruby-BSD BSD-2 )"
 SLOT=$(ver_cut 1-2)
 MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
 RUBYVERSION=${SLOT}.0
 
-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 jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
 
@@ -25,7 +26,7 @@ RDEPEND="
 	berkdb? ( sys-libs/db:= )
 	gdbm? ( sys-libs/gdbm:= )
 	jemalloc? ( dev-libs/jemalloc:= )
-	jit? ( >=virtual/rust-1.58.1 )
+	jit? ( ${RUST_DEPEND} )
 	ssl? (
 		dev-libs/openssl:0=
 	)
@@ -77,6 +78,10 @@ PDEPEND="
 	xemacs? ( app-xemacs/ruby-modes )
 "
 
+pkg_setup() {
+	use jit && rust_pkg_setup
+}
+
 src_prepare() {
 	eapply "${FILESDIR}"/"${SLOT}"/010*.patch
 	eapply "${FILESDIR}"/"${SLOT}"/013*.patch
diff --git a/dev-lang/ruby/ruby-3.3.4-r1.ebuild b/dev-lang/ruby/ruby-3.3.5-r1.ebuild
index cac3085b6240..a48e45203585 100644
--- a/dev-lang/ruby/ruby-3.3.4-r1.ebuild
+++ b/dev-lang/ruby/ruby-3.3.5-r1.ebuild
@@ -3,21 +3,22 @@
 
 EAPI=8
 
-inherit autotools flag-o-matic multiprocessing
+RUST_OPTIONAL="yes"
 
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="https://www.ruby-lang.org/"
+inherit autotools flag-o-matic multiprocessing rust
 
 MY_P="${PN}-$(ver_cut 1-3)"
+
+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"
 S=${WORKDIR}/${MY_P}
 
+LICENSE="|| ( Ruby-BSD BSD-2 )"
 SLOT=$(ver_cut 1-2)
 MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
 RUBYVERSION=${SLOT}.0
 
-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 jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
 
@@ -25,7 +26,7 @@ RDEPEND="
 	berkdb? ( sys-libs/db:= )
 	gdbm? ( sys-libs/gdbm:= )
 	jemalloc? ( dev-libs/jemalloc:= )
-	jit? ( >=virtual/rust-1.58.1 )
+	jit? ( ${RUST_DEPEND} )
 	ssl? (
 		dev-libs/openssl:0=
 	)
@@ -77,6 +78,10 @@ PDEPEND="
 	xemacs? ( app-xemacs/ruby-modes )
 "
 
+pkg_setup() {
+	use jit && rust_pkg_setup
+}
+
 src_prepare() {
 	eapply "${FILESDIR}"/"${SLOT}"/010*.patch
 	eapply "${FILESDIR}"/"${SLOT}"/013*.patch
diff --git a/dev-lang/ruby/ruby-3.3.6.ebuild b/dev-lang/ruby/ruby-3.3.6-r1.ebuild
index 9ea8087ae9f1..7680cec58196 100644
--- a/dev-lang/ruby/ruby-3.3.6.ebuild
+++ b/dev-lang/ruby/ruby-3.3.6-r1.ebuild
@@ -3,21 +3,22 @@
 
 EAPI=8
 
-inherit autotools flag-o-matic multiprocessing
+RUST_OPTIONAL="yes"
 
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="https://www.ruby-lang.org/"
+inherit autotools flag-o-matic multiprocessing rust
 
 MY_P="${PN}-$(ver_cut 1-3)"
+
+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"
 S=${WORKDIR}/${MY_P}
 
+LICENSE="|| ( Ruby-BSD BSD-2 )"
 SLOT=$(ver_cut 1-2)
 MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
 RUBYVERSION=${SLOT}.0
 
-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 jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
 
@@ -25,7 +26,7 @@ RDEPEND="
 	berkdb? ( sys-libs/db:= )
 	gdbm? ( sys-libs/gdbm:= )
 	jemalloc? ( dev-libs/jemalloc:= )
-	jit? ( >=virtual/rust-1.58.1 )
+	jit? ( ${RUST_DEPEND} )
 	ssl? (
 		dev-libs/openssl:0=
 	)
@@ -77,6 +78,10 @@ PDEPEND="
 	xemacs? ( app-xemacs/ruby-modes )
 "
 
+pkg_setup() {
+	use jit && rust_pkg_setup
+}
+
 src_prepare() {
 	eapply "${FILESDIR}"/"${SLOT}"/010*.patch
 	eapply "${FILESDIR}"/"${SLOT}"/013*.patch
diff --git a/dev-lang/spidermonkey/spidermonkey-102.15.0.ebuild b/dev-lang/spidermonkey/spidermonkey-102.15.0-r1.ebuild
index b1ab05478ed6..bf9a67de35f8 100644
--- a/dev-lang/spidermonkey/spidermonkey-102.15.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-102.15.0-r1.ebuild
@@ -7,14 +7,16 @@ EAPI="8"
 FIREFOX_PATCHSET="firefox-102esr-patches-13.tar.xz"
 SPIDERMONKEY_PATCHSET="spidermonkey-102-patches-05j.tar.xz"
 
-LLVM_MAX_SLOT=17
+LLVM_COMPAT=( 17 )
 
 PYTHON_COMPAT=( python3_{10..11} )
 PYTHON_REQ_USE="ssl,xml(+)"
 
+RUST_NEEDS_LLVM=1
+
 WANT_AUTOCONF="2.1"
 
-inherit autotools check-reqs flag-o-matic llvm multiprocessing prefix python-any-r1 toolchain-funcs
+inherit autotools check-reqs flag-o-matic llvm-r1 multiprocessing prefix python-any-r1 rust toolchain-funcs
 
 MY_PN="mozjs"
 MY_PV="${PV/_pre*}" # Handle Gentoo pre-releases
@@ -71,41 +73,13 @@ IUSE="clang cpu_flags_arm_neon debug +jit lto test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="${PYTHON_DEPS}
-	|| (
-		(
-			sys-devel/llvm:17
-			clang? (
-				sys-devel/clang:17
-				sys-devel/lld:17
-				virtual/rust:0/llvm-17
-			)
-		)
-		(
-			sys-devel/llvm:16
-			clang? (
-				sys-devel/clang:16
-				sys-devel/lld:16
-				virtual/rust:0/llvm-16
-			)
-		)
-		(
-			sys-devel/llvm:15
-			clang? (
-				sys-devel/clang:15
-				virtual/rust:0/llvm-15
-				lto? ( sys-devel/lld:15 )
-			)
-		)
-		(
-			sys-devel/llvm:14
-			clang? (
-				sys-devel/clang:14
-				virtual/rust:0/llvm-14
-				lto? ( sys-devel/lld:14 )
-			)
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}
+		sys-devel/llvm:${LLVM_SLOT}
+		clang? (
+			sys-devel/lld:${LLVM_SLOT}
 		)
-	)
-	!clang? ( virtual/rust )
+	')
 	virtual/pkgconfig
 	test? (
 		$(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]')
@@ -130,11 +104,6 @@ llvm_check_deps() {
 			return 1
 		fi
 
-		if ! has_version -b "virtual/rust:0/llvm-${LLVM_SLOT}" ; then
-			einfo "virtual/rust:0/llvm-${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
 		if use lto ; then
 			if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then
 				einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
@@ -172,7 +141,8 @@ pkg_setup() {
 
 		check-reqs_pkg_setup
 
-		llvm_pkg_setup
+		llvm-r1_pkg_setup
+		rust_pkg_setup
 
 		if use clang && use lto ; then
 			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
diff --git a/dev-lang/spidermonkey/spidermonkey-115.16.0.ebuild b/dev-lang/spidermonkey/spidermonkey-115.16.0-r1.ebuild
index ec49a5bdada9..b1444fb6dae3 100644
--- a/dev-lang/spidermonkey/spidermonkey-115.16.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-115.16.0-r1.ebuild
@@ -7,14 +7,16 @@ EAPI="8"
 FIREFOX_PATCHSET="firefox-115esr-patches-13.tar.xz"
 SPIDERMONKEY_PATCHSET="spidermonkey-115-patches-02.tar.xz"
 
-LLVM_MAX_SLOT=18
+LLVM_COMPAT=( 18 )
 
 PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="ncurses,ssl,xml(+)"
 
+RUST_NEEDS_LLVM="1"
+
 WANT_AUTOCONF="2.1"
 
-inherit autotools check-reqs flag-o-matic llvm multiprocessing prefix python-any-r1 toolchain-funcs
+inherit autotools check-reqs flag-o-matic llvm-r1 multiprocessing prefix python-any-r1 rust toolchain-funcs
 
 MY_PN="mozjs"
 MY_PV="${PV/_pre*}" # Handle Gentoo pre-releases
@@ -72,47 +74,13 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig
-	|| (
-		(
-			sys-devel/llvm:18
-			clang? (
-				sys-devel/lld:18
-				sys-devel/clang:18
-				virtual/rust:0/llvm-18
-			)
-		)
-		(
-			sys-devel/llvm:17
-			clang? (
-				sys-devel/lld:17
-				sys-devel/clang:17
-				virtual/rust:0/llvm-17
-			)
-		)
-		(
-			sys-devel/llvm:16
-			clang? (
-				sys-devel/lld:16
-				sys-devel/clang:16
-				virtual/rust:0/llvm-16
-			)
-		)
-		(
-			sys-devel/llvm:15
-			clang? (
-				sys-devel/lld:15
-				sys-devel/clang:15
-				virtual/rust:0/llvm-15
-			)
-		)
-	)
-	!clang? ( virtual/rust )
-	!elibc_glibc? (
-		|| (
-			dev-lang/rust
-			<dev-lang/rust-bin-1.73
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}
+		sys-devel/llvm:${LLVM_SLOT}
+		clang? (
+			sys-devel/lld:${LLVM_SLOT}
 		)
-	)
+	')
 	test? (
 		$(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]')
 	)"
@@ -136,11 +104,6 @@ llvm_check_deps() {
 			return 1
 		fi
 
-		if ! has_version -b "virtual/rust:0/llvm-${LLVM_SLOT}" ; then
-			einfo "virtual/rust:0/llvm-${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
 		if ! tc-ld-is-mold ; then
 			if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then
 				einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
@@ -212,7 +175,8 @@ pkg_setup() {
 
 		check-reqs_pkg_setup
 
-		llvm_pkg_setup
+		llvm-r1_pkg_setup
+		rust_pkg_setup
 
 		if use clang && use lto && tc-ld-is-lld ; then
 			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
diff --git a/dev-lang/spidermonkey/spidermonkey-128.3.0.ebuild b/dev-lang/spidermonkey/spidermonkey-128.3.0-r1.ebuild
index 77e9e3247dbd..9b70f62cf9c9 100644
--- a/dev-lang/spidermonkey/spidermonkey-128.3.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-128.3.0-r1.ebuild
@@ -11,9 +11,11 @@ LLVM_COMPAT=( 17 18 19 )
 PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="ncurses,ssl,xml(+)"
 
+RUST_NEEDS_LLVM=1
+
 WANT_AUTOCONF="2.1"
 
-inherit autotools check-reqs flag-o-matic llvm-r1 multiprocessing python-any-r1 toolchain-funcs
+inherit autotools check-reqs flag-o-matic llvm-r1 multiprocessing python-any-r1 rust toolchain-funcs
 
 MY_PN="mozjs"
 MY_PV="${PV/_pre*}"
@@ -73,11 +75,8 @@ BDEPEND="${PYTHON_DEPS}
 			sys-devel/clang:${LLVM_SLOT}
 			sys-devel/lld:${LLVM_SLOT}
 			sys-devel/llvm:${LLVM_SLOT}
-			virtual/rust:0/llvm-${LLVM_SLOT}
 		)
 	')
-	!clang? ( virtual/rust )
-	!elibc_glibc? ( dev-lang/rust )
 	>=dev-util/cbindgen-0.26.0
 	virtual/pkgconfig
 	test? (
@@ -103,11 +102,6 @@ llvm_check_deps() {
 			return 1
 		fi
 
-		if ! has_version -b "virtual/rust:0/llvm-${LLVM_SLOT}" ; then
-			einfo "virtual/rust:0/llvm-${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
 		if ! tc-ld-is-mold ; then
 			if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then
 				einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
@@ -189,6 +183,7 @@ pkg_setup() {
 		check-reqs_pkg_setup
 
 		llvm-r1_pkg_setup
+		rust_pkg_setup
 
 		if use clang && use lto && tc-ld-is-lld ; then
 			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
diff --git a/dev-lang/spidermonkey/spidermonkey-128.4.0.ebuild b/dev-lang/spidermonkey/spidermonkey-128.4.0-r1.ebuild
index 3915902d6caa..0bf52dabea6e 100644
--- a/dev-lang/spidermonkey/spidermonkey-128.4.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-128.4.0-r1.ebuild
@@ -13,7 +13,7 @@ PYTHON_REQ_USE="ncurses,ssl,xml(+)"
 
 WANT_AUTOCONF="2.1"
 
-inherit autotools check-reqs flag-o-matic llvm-r1 multiprocessing python-any-r1 toolchain-funcs
+inherit autotools check-reqs flag-o-matic llvm-r1 multiprocessing python-any-r1 rust toolchain-funcs
 
 MY_PN="mozjs"
 MY_PV="${PV/_pre*}"
@@ -73,11 +73,8 @@ BDEPEND="${PYTHON_DEPS}
 			sys-devel/clang:${LLVM_SLOT}
 			sys-devel/lld:${LLVM_SLOT}
 			sys-devel/llvm:${LLVM_SLOT}
-			virtual/rust:0/llvm-${LLVM_SLOT}
 		)
 	')
-	!clang? ( virtual/rust )
-	!elibc_glibc? ( dev-lang/rust )
 	>=dev-util/cbindgen-0.26.0
 	virtual/pkgconfig
 	test? (
@@ -103,11 +100,6 @@ llvm_check_deps() {
 			return 1
 		fi
 
-		if ! has_version -b "virtual/rust:0/llvm-${LLVM_SLOT}" ; then
-			einfo "virtual/rust:0/llvm-${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
 		if ! tc-ld-is-mold ; then
 			if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then
 				einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
@@ -189,6 +181,7 @@ pkg_setup() {
 		check-reqs_pkg_setup
 
 		llvm-r1_pkg_setup
+		rust_pkg_setup
 
 		if use clang && use lto && tc-ld-is-lld ; then
 			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')