[gentoo-commits] repo/proj/guru:dev commit in: media-libs/xrizer/

[James Le Cuirot]

commit:     01b3a8ecc1dfbf170c0bd2f1673c6660c771701f
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  6 22:02:41 2026 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Jan  6 22:02:41 2026 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=01b3a8ec

media-libs/xrizer: Simplify following cargo.eclass improvements

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 media-libs/xrizer/xrizer-0.3.0-r1.ebuild | 13 ++++---------
 media-libs/xrizer/xrizer-9999.ebuild     | 13 ++++---------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/media-libs/xrizer/xrizer-0.3.0-r1.ebuild 
b/media-libs/xrizer/xrizer-0.3.0-r1.ebuild
index f5b11b4e12..9586d638cb 100644
--- a/media-libs/xrizer/xrizer-0.3.0-r1.ebuild
+++ b/media-libs/xrizer/xrizer-0.3.0-r1.ebuild
@@ -355,17 +355,12 @@ src_prepare() {
 }
 
 multilib_src_compile() {
-       cargo_src_compile --target=$(rust_abi)
+       cargo_src_compile
 }
 
 multilib_src_install() {
        # OpenVR expects this particular directory structure.
-       if [[ ${ABI} == amd64 ]] ; then
-               exeinto "/opt/${PN}/bin/linux64"
-               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:-target}/$(rust_abi)/$(usex debug 
debug release)"/libxrizer.so vrclient.so || die
-       fi
-       touch "${D}/opt/${PN}/version.txt"
+       exeinto "/opt/${PN}/bin$(multilib_is_native_abi && echo /linux64)"
+       newexe "$(cargo_target_dir)"/libxrizer.so vrclient.so
+       touch "${ED}/opt/${PN}/version.txt"
 }

diff --git a/media-libs/xrizer/xrizer-9999.ebuild 
b/media-libs/xrizer/xrizer-9999.ebuild
index f5b11b4e12..9586d638cb 100644
--- a/media-libs/xrizer/xrizer-9999.ebuild
+++ b/media-libs/xrizer/xrizer-9999.ebuild
@@ -355,17 +355,12 @@ src_prepare() {
 }
 
 multilib_src_compile() {
-       cargo_src_compile --target=$(rust_abi)
+       cargo_src_compile
 }
 
 multilib_src_install() {
        # OpenVR expects this particular directory structure.
-       if [[ ${ABI} == amd64 ]] ; then
-               exeinto "/opt/${PN}/bin/linux64"
-               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:-target}/$(rust_abi)/$(usex debug 
debug release)"/libxrizer.so vrclient.so || die
-       fi
-       touch "${D}/opt/${PN}/version.txt"
+       exeinto "/opt/${PN}/bin$(multilib_is_native_abi && echo /linux64)"
+       newexe "$(cargo_target_dir)"/libxrizer.so vrclient.so
+       touch "${ED}/opt/${PN}/version.txt"
 }