From c5a60234ac6cebff9b3e5e9bd57b4a523b791a83 Mon Sep 17 00:00:00 2001
From: Jonas Frei <freijon@pm.me>
Date: Sat, 9 Nov 2024 12:12:49 +0100
Subject: [PATCH] */*: update for slotted Rust

Signed-off-by: Jonas Frei <freijon@pm.me>
---
 ...d-satellite-0.5.ebuild => xwayland-satellite-0.5-r1.ebuild} | 3 ++-
 media-sound/mpvc/{mpvc-1.1.4.ebuild => mpvc-1.1.4-r1.ebuild}   | 3 +--
 x11-terms/rio/{rio-0.1.17.ebuild => rio-0.1.17-r1.ebuild}      | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)
 rename gui-apps/xwayland-satellite/{xwayland-satellite-0.5.ebuild => xwayland-satellite-0.5-r1.ebuild} (98%)
 rename media-sound/mpvc/{mpvc-1.1.4.ebuild => mpvc-1.1.4-r1.ebuild} (96%)
 rename x11-terms/rio/{rio-0.1.17.ebuild => rio-0.1.17-r1.ebuild} (99%)

diff --git a/gui-apps/xwayland-satellite/xwayland-satellite-0.5.ebuild b/gui-apps/xwayland-satellite/xwayland-satellite-0.5-r1.ebuild
similarity index 98%
rename from gui-apps/xwayland-satellite/xwayland-satellite-0.5.ebuild
rename to gui-apps/xwayland-satellite/xwayland-satellite-0.5-r1.ebuild
index 69dec7152a..b683731c90 100644
--- a/gui-apps/xwayland-satellite/xwayland-satellite-0.5.ebuild
+++ b/gui-apps/xwayland-satellite/xwayland-satellite-0.5-r1.ebuild
@@ -102,8 +102,9 @@ CRATES="
 "
 
 LLVM_COMPAT=( {17..19} )
+RUST_NEEDS_LLVM=1
 
-inherit cargo llvm-r1
+inherit llvm-r1 cargo
 
 DESCRIPTION="Xwayland outside your Wayland"
 HOMEPAGE="https://github.com/Supreeeme/xwayland-satellite"
diff --git a/media-sound/mpvc/mpvc-1.1.4.ebuild b/media-sound/mpvc/mpvc-1.1.4-r1.ebuild
similarity index 96%
rename from media-sound/mpvc/mpvc-1.1.4.ebuild
rename to media-sound/mpvc/mpvc-1.1.4-r1.ebuild
index c74dfdacba..39baa74a2c 100644
--- a/media-sound/mpvc/mpvc-1.1.4.ebuild
+++ b/media-sound/mpvc/mpvc-1.1.4-r1.ebuild
@@ -55,7 +55,7 @@ inherit cargo
 DESCRIPTION="mpc-like tool which connects to existing mpv instances through sockets."
 HOMEPAGE="https://gitlab.com/mpv-ipc/mpvc"
 SRC_URI="
-$(cargo_crate_uris ${CRATES})
+${CARGO_CRATE_URIS}
 https://gitlab.com/mpv-ipc/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2
 "
 
@@ -73,6 +73,5 @@ RESTRICT="mirror"
 
 DEPEND="media-video/mpv"
 RDEPEND="${DEPEND}"
-BDEPEND="virtual/rust"
 
 QA_FLAGS_IGNORED="usr/bin/mpvc"
diff --git a/x11-terms/rio/rio-0.1.17.ebuild b/x11-terms/rio/rio-0.1.17-r1.ebuild
similarity index 99%
rename from x11-terms/rio/rio-0.1.17.ebuild
rename to x11-terms/rio/rio-0.1.17-r1.ebuild
index 8fc2b44c45..ee9ff0d1f8 100644
--- a/x11-terms/rio/rio-0.1.17.ebuild
+++ b/x11-terms/rio/rio-0.1.17-r1.ebuild
@@ -418,6 +418,8 @@ CRATES="
 	zune-jpeg@0.4.13
 "
 
+RUST_MIN_VER="1.80.1"
+
 inherit cargo desktop
 
 DESCRIPTION="A hardware-accelerated GPU terminal emulator powered by WebGPU"