From 93a88e5acde471e714d2dc57cd6b737d00a6da79 Mon Sep 17 00:00:00 2001
From: Takuya Wakazono <pastalian46@gmail.com>
Date: Sat, 9 Nov 2024 19:50:05 +0900
Subject: [PATCH] gui-wm/niri: use slotted rust

Bindgen doesn't care about the Rust/LLVM version, so RUST_NEEDS_LLVM
shouldn't be necessary.

Signed-off-by: Takuya Wakazono <pastalian46@gmail.com>
---
 gui-wm/niri/{niri-0.1.9.ebuild => niri-0.1.9-r1.ebuild} | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
 rename gui-wm/niri/{niri-0.1.9.ebuild => niri-0.1.9-r1.ebuild} (94%)

diff --git a/gui-wm/niri/niri-0.1.9.ebuild b/gui-wm/niri/niri-0.1.9-r1.ebuild
similarity index 94%
rename from gui-wm/niri/niri-0.1.9.ebuild
rename to gui-wm/niri/niri-0.1.9-r1.ebuild
index 9cb46cfc1f..b9adbab1ed 100644
--- a/gui-wm/niri/niri-0.1.9.ebuild
+++ b/gui-wm/niri/niri-0.1.9-r1.ebuild
@@ -4,8 +4,9 @@
 EAPI=8
 
 LLVM_COMPAT=( {16..18} )
+RUST_MIN_VER="1.77.0"
 
-inherit cargo llvm-r1 systemd
+inherit llvm-r1 cargo systemd
 
 DESCRIPTION="Scrollable-tiling Wayland compositor"
 HOMEPAGE="https://github.com/YaLTeR/niri"
@@ -47,7 +48,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 # Clang is required for bindgen
 BDEPEND="
-	>=virtual/rust-1.77.0
 	screencast? ( $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}') )
 "
 
@@ -55,6 +55,11 @@ ECARGO_VENDOR="${WORKDIR}/vendor"
 
 QA_FLAGS_IGNORED="usr/bin/niri"
 
+pkg_setup() {
+	llvm-r1_pkg_setup
+	rust_pkg_setup
+}
+
 src_prepare() {
 	sed -i 's/git = "[^ ]*"/version = "*"/' Cargo.toml || die
 	default