From df2ccc1fac2a96d04e6a14bdf7701455bf48e21a Mon Sep 17 00:00:00 2001
From: Sam Wilson <sam@binarycake.ca>
Date: Sun, 14 Dec 2025 20:22:22 -0500
Subject: [PATCH] media-libs/xrizer: fix 32 bit builds

Signed-off-by: Sam Wilson <sam@binarycake.ca>
---
 .../{xrizer-0.3.0.ebuild => xrizer-0.3.0-r1.ebuild}       | 8 ++++----
 media-libs/xrizer/xrizer-9999.ebuild                      | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename media-libs/xrizer/{xrizer-0.3.0.ebuild => xrizer-0.3.0-r1.ebuild} (96%)

diff --git a/media-libs/xrizer/xrizer-0.3.0.ebuild b/media-libs/xrizer/xrizer-0.3.0-r1.ebuild
similarity index 96%
rename from media-libs/xrizer/xrizer-0.3.0.ebuild
rename to media-libs/xrizer/xrizer-0.3.0-r1.ebuild
index b8e815113f..f5b11b4e12 100644
--- a/media-libs/xrizer/xrizer-0.3.0.ebuild
+++ b/media-libs/xrizer/xrizer-0.3.0-r1.ebuild
@@ -304,7 +304,7 @@ fi
 
 RUST_MULTILIB=1
 RUST_MIN_VER="1.83.0"
-inherit cargo multilib-minimal
+inherit cargo multilib-minimal rust-toolchain
 
 DESCRIPTION="OpenVR over OpenXR compatibility layer"
 HOMEPAGE="https://github.com/Supreeeme/xrizer/"
@@ -355,17 +355,17 @@ src_prepare() {
 }
 
 multilib_src_compile() {
-	cargo_src_compile
+	cargo_src_compile --target=$(rust_abi)
 }
 
 multilib_src_install() {
 	# OpenVR expects this particular directory structure.
 	if [[ ${ABI} == amd64 ]] ; then
 		exeinto "/opt/${PN}/bin/linux64"
-		newexe $(cargo_target_dir)/libxrizer.so vrclient.so || die
+		newexe "${CARGO_TARGET_DIR:-target}/$(rust_abi)/$(usex debug debug release)"/libxrizer.so vrclient.so || die
 	elif [[ ${ABI} == x86 ]] ; then
 		exeinto "/opt/${PN}/bin"
-		newexe $(cargo_target_dir)/libxrizer.so vrclient.so || die
+		newexe "${CARGO_TARGET_DIR:-target}/$(rust_abi)/$(usex debug debug release)"/libxrizer.so vrclient.so || die
 	fi
 	touch "${D}/opt/${PN}/version.txt"
 }
diff --git a/media-libs/xrizer/xrizer-9999.ebuild b/media-libs/xrizer/xrizer-9999.ebuild
index b8e815113f..f5b11b4e12 100644
--- a/media-libs/xrizer/xrizer-9999.ebuild
+++ b/media-libs/xrizer/xrizer-9999.ebuild
@@ -304,7 +304,7 @@ fi
 
 RUST_MULTILIB=1
 RUST_MIN_VER="1.83.0"
-inherit cargo multilib-minimal
+inherit cargo multilib-minimal rust-toolchain
 
 DESCRIPTION="OpenVR over OpenXR compatibility layer"
 HOMEPAGE="https://github.com/Supreeeme/xrizer/"
@@ -355,17 +355,17 @@ src_prepare() {
 }
 
 multilib_src_compile() {
-	cargo_src_compile
+	cargo_src_compile --target=$(rust_abi)
 }
 
 multilib_src_install() {
 	# OpenVR expects this particular directory structure.
 	if [[ ${ABI} == amd64 ]] ; then
 		exeinto "/opt/${PN}/bin/linux64"
-		newexe $(cargo_target_dir)/libxrizer.so vrclient.so || die
+		newexe "${CARGO_TARGET_DIR:-target}/$(rust_abi)/$(usex debug debug release)"/libxrizer.so vrclient.so || die
 	elif [[ ${ABI} == x86 ]] ; then
 		exeinto "/opt/${PN}/bin"
-		newexe $(cargo_target_dir)/libxrizer.so vrclient.so || die
+		newexe "${CARGO_TARGET_DIR:-target}/$(rust_abi)/$(usex debug debug release)"/libxrizer.so vrclient.so || die
 	fi
 	touch "${D}/opt/${PN}/version.txt"
 }