*/*: 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>

10 files changed, 64 insertions, 13 deletions

diff --git a/media-libs/glycin-loaders/glycin-loaders-1.1.0.ebuild b/media-libs/glycin-loaders/glycin-loaders-1.1.0-r1.ebuild
index 0775282f7108..0775282f7108 100644
--- a/media-libs/glycin-loaders/glycin-loaders-1.1.0.ebuild
+++ b/media-libs/glycin-loaders/glycin-loaders-1.1.0-r1.ebuild
diff --git a/media-libs/glycin-loaders/glycin-loaders-1.1.1.ebuild b/media-libs/glycin-loaders/glycin-loaders-1.1.1-r1.ebuild
index 0775282f7108..0775282f7108 100644
--- a/media-libs/glycin-loaders/glycin-loaders-1.1.1.ebuild
+++ b/media-libs/glycin-loaders/glycin-loaders-1.1.1-r1.ebuild
diff --git a/media-libs/libdovi/libdovi-3.3.1.ebuild b/media-libs/libdovi/libdovi-3.3.1-r1.ebuild
index c8d73ea5f7ba..ec94f2d7d11b 100644
--- a/media-libs/libdovi/libdovi-3.3.1.ebuild
+++ b/media-libs/libdovi/libdovi-3.3.1-r1.ebuild
@@ -89,7 +89,10 @@ CRATES="
 	windows_x86_64_msvc@0.52.6
 	wyz@0.5.1
 "
-inherit cargo edo multilib-minimal rust-toolchain
+
+RUST_USEDEP='${MULTILIB_USEDEP}'
+
+inherit multilib-minimal cargo edo rust-toolchain
 
 DESCRIPTION="Dolby Vision metadata parsing and writing"
 HOMEPAGE="https://github.com/quietvoid/dovi_tool/"
diff --git a/media-libs/libopenraw/libopenraw-0.3.7.ebuild b/media-libs/libopenraw/libopenraw-0.3.7-r1.ebuild
index cbe9f9abf592..4825810f5604 100644
--- a/media-libs/libopenraw/libopenraw-0.3.7.ebuild
+++ b/media-libs/libopenraw/libopenraw-0.3.7-r1.ebuild
@@ -4,6 +4,9 @@
 EAPI=8
 
 CRATES=" "
+# for stdsimd
+RUST_MAX_VER=1.77.1
+
 inherit autotools cargo gnome2-utils
 
 DESCRIPTION="RAW image formats decoding library"
diff --git a/media-libs/mesa/mesa-24.1.7.ebuild b/media-libs/mesa/mesa-24.1.7-r1.ebuild
index af5ee095a972..5d4171f71288 100644
--- a/media-libs/mesa/mesa-24.1.7.ebuild
+++ b/media-libs/mesa/mesa-24.1.7-r1.ebuild
@@ -20,6 +20,9 @@ CRATES="
 	paste@1.0.14
 "
 
+RUST_MIN_VER="1.74.1"
+RUST_OPTIONAL=1
+
 inherit cargo
 
 DESCRIPTION="OpenGL-like graphic library for Linux"
@@ -154,7 +157,7 @@ DEPEND="${RDEPEND}
 BDEPEND="
 	${PYTHON_DEPS}
 	opencl? (
-		>=virtual/rust-1.62.0
+		${RUST_DEPEND}
 		>=dev-util/bindgen-0.58.0
 	)
 	>=dev-build/meson-1.4.1
@@ -175,7 +178,7 @@ BDEPEND="
 		video_cards_nvk? (
 			>=dev-util/bindgen-0.68.1
 			>=dev-util/cbindgen-0.26.0
-			>=virtual/rust-1.74.1
+			${RUST_DEPEND}
 		)
 	)
 	wayland? ( dev-util/wayland-scanner )
@@ -291,6 +294,10 @@ pkg_setup() {
 
 	use llvm && llvm-r1_pkg_setup
 	python-any-r1_pkg_setup
+
+	if use opencl || use vulkan; then
+		rust_pkg_setup
+	fi
 }
 
 src_prepare() {
diff --git a/media-libs/mesa/mesa-24.2.4.ebuild b/media-libs/mesa/mesa-24.2.3-r1.ebuild
index a58a2652340e..d45bd4b23536 100644
--- a/media-libs/mesa/mesa-24.2.4.ebuild
+++ b/media-libs/mesa/mesa-24.2.3-r1.ebuild
@@ -20,6 +20,9 @@ CRATES="
 	paste@1.0.14
 "
 
+RUST_MIN_VER="1.74.1"
+RUST_OPTIONAL=1
+
 inherit cargo
 
 DESCRIPTION="OpenGL-like graphic library for Linux"
@@ -156,7 +159,7 @@ DEPEND="${RDEPEND}
 BDEPEND="
 	${PYTHON_DEPS}
 	opencl? (
-		>=virtual/rust-1.62.0
+		${RUST_DEPEND}
 		>=dev-util/bindgen-0.58.0
 	)
 	>=dev-build/meson-1.4.1
@@ -178,7 +181,7 @@ BDEPEND="
 		video_cards_nvk? (
 			>=dev-util/bindgen-0.68.1
 			>=dev-util/cbindgen-0.26.0
-			>=virtual/rust-1.74.1
+			${RUST_DEPEND}
 		)
 	)
 	wayland? ( dev-util/wayland-scanner )
@@ -295,6 +298,10 @@ pkg_setup() {
 
 	use llvm && llvm-r1_pkg_setup
 	python-any-r1_pkg_setup
+
+	if use opencl || use vulkan; then
+		rust_pkg_setup
+	fi
 }
 
 src_prepare() {
diff --git a/media-libs/mesa/mesa-24.2.5.ebuild b/media-libs/mesa/mesa-24.2.4-r1.ebuild
index a58a2652340e..d45bd4b23536 100644
--- a/media-libs/mesa/mesa-24.2.5.ebuild
+++ b/media-libs/mesa/mesa-24.2.4-r1.ebuild
@@ -20,6 +20,9 @@ CRATES="
 	paste@1.0.14
 "
 
+RUST_MIN_VER="1.74.1"
+RUST_OPTIONAL=1
+
 inherit cargo
 
 DESCRIPTION="OpenGL-like graphic library for Linux"
@@ -156,7 +159,7 @@ DEPEND="${RDEPEND}
 BDEPEND="
 	${PYTHON_DEPS}
 	opencl? (
-		>=virtual/rust-1.62.0
+		${RUST_DEPEND}
 		>=dev-util/bindgen-0.58.0
 	)
 	>=dev-build/meson-1.4.1
@@ -178,7 +181,7 @@ BDEPEND="
 		video_cards_nvk? (
 			>=dev-util/bindgen-0.68.1
 			>=dev-util/cbindgen-0.26.0
-			>=virtual/rust-1.74.1
+			${RUST_DEPEND}
 		)
 	)
 	wayland? ( dev-util/wayland-scanner )
@@ -295,6 +298,10 @@ pkg_setup() {
 
 	use llvm && llvm-r1_pkg_setup
 	python-any-r1_pkg_setup
+
+	if use opencl || use vulkan; then
+		rust_pkg_setup
+	fi
 }
 
 src_prepare() {
diff --git a/media-libs/mesa/mesa-24.2.6.ebuild b/media-libs/mesa/mesa-24.2.5-r1.ebuild
index a58a2652340e..d45bd4b23536 100644
--- a/media-libs/mesa/mesa-24.2.6.ebuild
+++ b/media-libs/mesa/mesa-24.2.5-r1.ebuild
@@ -20,6 +20,9 @@ CRATES="
 	paste@1.0.14
 "
 
+RUST_MIN_VER="1.74.1"
+RUST_OPTIONAL=1
+
 inherit cargo
 
 DESCRIPTION="OpenGL-like graphic library for Linux"
@@ -156,7 +159,7 @@ DEPEND="${RDEPEND}
 BDEPEND="
 	${PYTHON_DEPS}
 	opencl? (
-		>=virtual/rust-1.62.0
+		${RUST_DEPEND}
 		>=dev-util/bindgen-0.58.0
 	)
 	>=dev-build/meson-1.4.1
@@ -178,7 +181,7 @@ BDEPEND="
 		video_cards_nvk? (
 			>=dev-util/bindgen-0.68.1
 			>=dev-util/cbindgen-0.26.0
-			>=virtual/rust-1.74.1
+			${RUST_DEPEND}
 		)
 	)
 	wayland? ( dev-util/wayland-scanner )
@@ -295,6 +298,10 @@ pkg_setup() {
 
 	use llvm && llvm-r1_pkg_setup
 	python-any-r1_pkg_setup
+
+	if use opencl || use vulkan; then
+		rust_pkg_setup
+	fi
 }
 
 src_prepare() {
diff --git a/media-libs/mesa/mesa-24.2.3.ebuild b/media-libs/mesa/mesa-24.2.6-r1.ebuild
index a58a2652340e..d45bd4b23536 100644
--- a/media-libs/mesa/mesa-24.2.3.ebuild
+++ b/media-libs/mesa/mesa-24.2.6-r1.ebuild
@@ -20,6 +20,9 @@ CRATES="
 	paste@1.0.14
 "
 
+RUST_MIN_VER="1.74.1"
+RUST_OPTIONAL=1
+
 inherit cargo
 
 DESCRIPTION="OpenGL-like graphic library for Linux"
@@ -156,7 +159,7 @@ DEPEND="${RDEPEND}
 BDEPEND="
 	${PYTHON_DEPS}
 	opencl? (
-		>=virtual/rust-1.62.0
+		${RUST_DEPEND}
 		>=dev-util/bindgen-0.58.0
 	)
 	>=dev-build/meson-1.4.1
@@ -178,7 +181,7 @@ BDEPEND="
 		video_cards_nvk? (
 			>=dev-util/bindgen-0.68.1
 			>=dev-util/cbindgen-0.26.0
-			>=virtual/rust-1.74.1
+			${RUST_DEPEND}
 		)
 	)
 	wayland? ( dev-util/wayland-scanner )
@@ -295,6 +298,10 @@ pkg_setup() {
 
 	use llvm && llvm-r1_pkg_setup
 	python-any-r1_pkg_setup
+
+	if use opencl || use vulkan; then
+		rust_pkg_setup
+	fi
 }
 
 src_prepare() {
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index e6207cf1ea28..f78c0c4a32e4 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -20,6 +20,9 @@ CRATES="
 	paste@1.0.14
 "
 
+RUST_MIN_VER="1.74.1"
+RUST_OPTIONAL=1
+
 inherit cargo
 
 DESCRIPTION="OpenGL-like graphic library for Linux"
@@ -155,7 +158,7 @@ DEPEND="${RDEPEND}
 BDEPEND="
 	${PYTHON_DEPS}
 	opencl? (
-		>=virtual/rust-1.62.0
+		${RUST_DEPEND}
 		>=dev-util/bindgen-0.58.0
 	)
 	>=dev-build/meson-1.4.1
@@ -177,7 +180,7 @@ BDEPEND="
 		video_cards_nvk? (
 			>=dev-util/bindgen-0.68.1
 			>=dev-util/cbindgen-0.26.0
-			>=virtual/rust-1.74.1
+			${RUST_DEPEND}
 		)
 	)
 	wayland? ( dev-util/wayland-scanner )
@@ -294,6 +297,13 @@ pkg_setup() {
 
 	use llvm && llvm-r1_pkg_setup
 	python-any-r1_pkg_setup
+
+	if use opencl || use vulkan; then
+		rust_pkg_setup
+	fi
+	if use opencl || use vulkan; then
+		rust_pkg_setup
+	fi
 }
 
 src_prepare() {